diff --git a/.htaccess b/.htaccess
index 747246c69..596c92996 100644
--- a/.htaccess
+++ b/.htaccess
@@ -9,7 +9,7 @@ RewriteRule ^(modules|addons|widgets)/(.+)/(conf|queries|schemas)/(.+)\.xml$ ./i
 RewriteCond %{SCRIPT_FILENAME} !-f
 RewriteRule ^(.+)/files/(member_extra_info|attach|cache|faceOff)/(.*) ./files/$2/$3 [L]
 RewriteCond %{SCRIPT_FILENAME} !-f
-RewriteRule ^(.+)/(files|modules|common|widgets|widgetstyles|layouts|m.layouts|addons)/(.*) ./$2/$3 [L]
+RewriteRule ^(.+)/(files|modules|widgets|widgetstyles|layouts|m.layouts|addons)/(.*) ./$2/$3 [L]
 
 # rss , blogAPI
 RewriteRule ^(rss|atom)$ ./index.php?module=rss&act=$1 [L]
@@ -24,22 +24,22 @@ RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)/(.+)/trackback$ ./index.php?vid=$1&documen
 RewriteRule ^admin/?$ ./index.php?module=admin [L]
 
 # document permanent link
-RewriteRule ^([0-9]+)$ ./index.php?document_srl=$1 [L]
+RewriteRule ^([0-9]+)$ ./index.php?document_srl=$1 [L,QSA]
 
 # mid link
 RewriteCond %{SCRIPT_FILENAME} !-d
-RewriteRule ^([a-zA-Z0-9_]+)/?$ ./index.php?mid=$1 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/?$ ./index.php?mid=$1 [L,QSA]
 # mid + document link
-RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?mid=$1&document_srl=$2 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?mid=$1&document_srl=$2 [L,QSA]
 
 # vid + mid link
 RewriteCond %{SCRIPT_FILENAME} !-d
-RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/?$ ./index.php?vid=$1&mid=$2 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/?$ ./index.php?vid=$1&mid=$2 [L,QSA]
 # vid + mid + document link
-RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?vid=$1&mid=$2&document_srl=$3 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/([0-9]+)$ ./index.php?vid=$1&mid=$2&document_srl=$3 [L,QSA]
 
 # mid + entry title
-RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?mid=$1&entry=$2 [L,QSA]
 # vid + mid + entry title
-RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?vid=$1&mid=$2&entry=$3 [L]
+RewriteRule ^([a-zA-Z0-9_]+)/([a-zA-Z0-9_]+)/entry/(.+)$ ./index.php?vid=$1&mid=$2&entry=$3 [L,QSA]
 
diff --git a/addons/adminlogging/adminlogging.addon.php b/addons/adminlogging/adminlogging.addon.php
new file mode 100644
index 000000000..a3eb4981a
--- /dev/null
+++ b/addons/adminlogging/adminlogging.addon.php
@@ -0,0 +1,17 @@
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file adminlogging.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Automatic link add-on
+ **/
+$logged_info = Context::get('logged_info');
+$act  = Context::get('act');
+$kind = strpos(strtolower($act),'admin')!==false?'admin':'';
+
+if($called_position == 'before_module_proc' && $kind == 'admin' && $logged_info->is_admin == 'Y') {
+	$oAdminloggingController = &getController('adminlogging');
+	$oAdminloggingController->insertLog($this->module, $this->act);
+}
+?>
diff --git a/addons/adminlogging/conf/info.xml b/addons/adminlogging/conf/info.xml
new file mode 100644
index 000000000..3fc29c2c4
--- /dev/null
+++ b/addons/adminlogging/conf/info.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">어드민 메뉴 접근 로깅</title>
+    <title xml:lang="en">admin menu access logging</title>
+    <description xml:lang="ko">
+		admin menu에 접근한 기록을 로깅하는 애드온입니다.
+    </description>
+    <version>0.1</version>
+    <date>2011-09-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/autolink/autolink.addon.php b/addons/autolink/autolink.addon.php
index 0463eb57a..b5910a76a 100644
--- a/addons/autolink/autolink.addon.php
+++ b/addons/autolink/autolink.addon.php
@@ -1,12 +1,12 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file autolink.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 자동 링크 애드온
-     **/
-    if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
-        Context::addJsFile('./addons/autolink/autolink.js', false ,'', null, 'body');
-    }
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file autolink.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Automatic link add-on
+ **/
+if($called_position == 'after_module_proc' && Context::getResponseMethod()!="XMLRPC") {
+	Context::loadFile(array('./addons/autolink/autolink.js', 'body', '', null), true);
+}
+?>
diff --git a/addons/autolink/autolink.js b/addons/autolink/autolink.js
index 5b03d4bd7..ad2dcecf6 100644
--- a/addons/autolink/autolink.js
+++ b/addons/autolink/autolink.js
@@ -1,80 +1,80 @@
-/**
- * @file autolink.js
- * @brief javascript code for autolink addon
- * @author NHN (developers@xpressengine.com)
- */
-(function($){
-	var protocol_re = '(https?|ftp|news|telnet|irc|mms)://';
-	var domain_re   = '(?:[\\w\\-]+\\.)+(?:[a-z]+)';
-	var max_255_re  = '(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])';
-	var ip_re       = '(?:'+max_255_re+'\\.){3}'+max_255_re;
-	var port_re     = '(?::([0-9]+))?';
-	var user_re     = '(?:/~[\\w-]+)?';
-	var path_re     = '((?:/[\\w!"$-/:-@]+)*)';
-	var hash_re     = '(?:#([\\w!-@]+))?';
-
-	var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+user_re+path_re+hash_re+')', 'ig');
-
-	var AutoLink = xe.createPlugin("autolink", {
-		targets : [],
-		init : function() {
-			this.targets = [];
-		},
-		API_ONREADY : function() {
-			var thisPlugin = this;
-
-			// extract target text nodes
-			this.extractTargets($('.xe_content'));
-
-			$(this.targets).each(function(){
-				thisPlugin.cast('AUTOLINK', [this]);
-			});
-		},
-		API_AUTOLINK : function(oSender, params) {
-			var textNode = params[0];
-			if(!$(textNode).parent().length || $(textNode).parent().get(0).nodeName.toLowerCase() == 'a') return;
-			var content  = textNode.nodeValue;
-			var dummy    = $('<span>');
-
-			content = content.replace(/</g, '&lt;').replace(/>/g, '&gt;');
-			content = content.replace(url_regex, '<a href="$1" target="_blank">$1</a>');
-
-			$(textNode).before(dummy);
-			$(textNode).replaceWith(content);
-			params[0] = dummy.next('a');
-			dummy.remove();
-		},
-		extractTargets : function(obj) {
-			var thisPlugin = this;
-			var wrap = $('.xe_content', obj);
-			if(wrap.length) {
-				this.extractTargets(wrap);
-				return;
-			}
-
-			$(obj)
-			.contents()
-			.each(function(){
-				var node_name = this.nodeName.toLowerCase();
-				if($.inArray(node_name, ['a', 'pre', 'xml', 'textarea', 'input', 'select', 'option', 'code', 'script', 'style', 'iframe', 'button', 'img', 'embed', 'object', 'ins']) != -1) return;
-
-				// FIX ME : When this meanless code wasn't executed, url_regex do not run correctly. why?
-				url_regex.exec('');
-
-				if(this.nodeType == 3) { // text node
-					var content = this.nodeValue;
-
-					if(content.length < 5) return;
-
-					if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(content)) return;
-
-					thisPlugin.targets.push(this);
-				} else {
-					thisPlugin.extractTargets(this);
-				}
-			});
-		}
-	});
-
-	xe.registerPlugin(new AutoLink());
+/**
+ * @file autolink.js
+ * @brief javascript code for autolink addon
+ * @author NHN (developers@xpressengine.com)
+ */
+(function($){
+	var protocol_re = '(https?|ftp|news|telnet|irc|mms)://';
+	var domain_re   = '(?:[\\w\\-]+\\.)+(?:[a-z]+)';
+	var max_255_re  = '(?:1[0-9]{2}|2[0-4][0-9]|25[0-5]|[1-9]?[0-9])';
+	var ip_re       = '(?:'+max_255_re+'\\.){3}'+max_255_re;
+	var port_re     = '(?::([0-9]+))?';
+	var user_re     = '(?:/~[\\w-]+)?';
+	var path_re     = '((?:/[\\w!"$-/:-@]+)*)';
+	var hash_re     = '(?:#([\\w!-@]+))?';
+
+	var url_regex = new RegExp('('+protocol_re+'('+domain_re+'|'+ip_re+'|localhost'+')'+port_re+user_re+path_re+hash_re+')', 'ig');
+
+	var AutoLink = xe.createPlugin("autolink", {
+		targets : [],
+		init : function() {
+			this.targets = [];
+		},
+		API_ONREADY : function() {
+			var thisPlugin = this;
+
+			// extract target text nodes
+			this.extractTargets($('.xe_content'));
+
+			$(this.targets).each(function(){
+				thisPlugin.cast('AUTOLINK', [this]);
+			});
+		},
+		API_AUTOLINK : function(oSender, params) {
+			var textNode = params[0];
+			if(!$(textNode).parent().length || $(textNode).parent().get(0).nodeName.toLowerCase() == 'a') return;
+			var content  = textNode.nodeValue;
+			var dummy    = $('<span>');
+
+			content = content.replace(/</g, '&lt;').replace(/>/g, '&gt;');
+			content = content.replace(url_regex, '<a href="$1" target="_blank">$1</a>');
+
+			$(textNode).before(dummy);
+			$(textNode).replaceWith(content);
+			params[0] = dummy.next('a');
+			dummy.remove();
+		},
+		extractTargets : function(obj) {
+			var thisPlugin = this;
+			var wrap = $('.xe_content', obj);
+			if(wrap.length) {
+				this.extractTargets(wrap);
+				return;
+			}
+
+			$(obj)
+			.contents()
+			.each(function(){
+				var node_name = this.nodeName.toLowerCase();
+				if($.inArray(node_name, ['a', 'pre', 'xml', 'textarea', 'input', 'select', 'option', 'code', 'script', 'style', 'iframe', 'button', 'img', 'embed', 'object', 'ins']) != -1) return;
+
+				// FIX ME : When this meanless code wasn't executed, url_regex do not run correctly. why?
+				url_regex.exec('');
+
+				if(this.nodeType == 3) { // text node
+					var content = this.nodeValue;
+
+					if(content.length < 5) return;
+
+					if(!/(http|https|ftp|news|telnet|irc|mms):\/\//i.test(content)) return;
+
+					thisPlugin.targets.push(this);
+				} else {
+					thisPlugin.extractTargets(this);
+				}
+			});
+		}
+	});
+
+	xe.registerPlugin(new AutoLink());
 })(jQuery);
\ No newline at end of file
diff --git a/addons/autolink/conf/info.xml b/addons/autolink/conf/info.xml
index 017183672..0790b8198 100644
--- a/addons/autolink/conf/info.xml
+++ b/addons/autolink/conf/info.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">자동 링크 애드온</title>
-    <title xml:lang="jp">自動リンクアドオン</title>
-    <title xml:lang="en">Auto Link</title>
-    <title xml:lang="vi">Auto Link</title>
-    <title xml:lang="zh-CN">自动链接插件</title>
-    <title xml:lang="es">auto vínculo addon</title>
-    <title xml:lang="ru">авто ссылка аддон</title>
-    <title xml:lang="ge">Auto-Link Addon</title>
-    <title xml:lang="zh-TW">自動連結</title>
-    <description xml:lang="ko">
-        글과 댓글의 내용 중 URL 문자열에 링크를 걸어주는 애드온입니다.
-    </description>
-    <description xml:lang="jp">
-        書き込み本文とコメントに登録された内容の中、httpで始まる一般文字列に自動にリンクを貼り付け、そのリンクにマウスオーバすると、別ウィンドウ、または同一ウィンドウに開くメニュが現れるアドオンです。
-    </description>
-    <description xml:lang="en">
-        This addon makes a link to a string that starts with http.
-    </description>
-    <description xml:lang="vi">
-        Addon này sẽ tự động tạo ra một đường Link khi gặp chuỗi kí tự 'http' có trong bài viết.
-    </description>
-    <description xml:lang="zh-CN">
-        主题及评论中以http开始的字符串，自动转换为链接。并且鼠标移到链接上方时，将出现可选(新窗/本页面)提示框。
-    </description>
-    <description xml:lang="es">
-        Los comentarios que comienzan con http naeyongjung tema común de la cadena para vincular automáticamente a colgar el puntero del ratón sobre cada uno de los vínculos y saechang Ciudad y aparecen en el menú de add-on de decoración.
-    </description>
-    <description xml:lang="ru">
-        Комментарии, которые начинаются с http naeyongjung темой общей строки автоматически ссылку повесить мышь над каждой ссылке и saechang Сити и появляться на меню добавить-на украшения.
-    </description>
-    <description xml:lang="ge">
-        Kommentare beginnen mit http naeyongjung Thema der gemeinsamen String automatisch Link zu hängen Sie mit der Maus über die einzelnen Links und saechang Stadt und auf dem Menü des Add-On Dekoration.
-    </description>
-    <description xml:lang="zh-TW">
-        是種可將主題和評論內容中的URL網址字串自動轉換成連結的附加元件。
-    </description>
-    <version>0.1</version>
-    <date>2008-04-22</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">자동 링크 애드온</title>
+    <title xml:lang="jp">自動リンクアドオン</title>
+    <title xml:lang="en">Auto Link Addon</title>
+    <title xml:lang="vi">Auto Link</title>
+    <title xml:lang="zh-CN">自动链接插件</title>
+    <title xml:lang="es">auto vínculo addon</title>
+    <title xml:lang="ru">Аддон авто-ссылки</title>
+    <title xml:lang="ge">Auto-Link Addon</title>
+    <title xml:lang="zh-TW">自動連結</title>
+    <description xml:lang="ko">
+        글과 댓글의 내용 중 URL 문자열에 링크를 걸어주는 애드온입니다.
+    </description>
+    <description xml:lang="jp">
+        書き込み本文とコメントに登録された内容の中、httpで始まる一般文字列に自動にリンクを貼り付け、そのリンクにマウスオーバすると、別ウィンドウ、または同一ウィンドウに開くメニュが現れるアドオンです。
+    </description>
+    <description xml:lang="en">
+        This addon automatically transforms text URLs encountered in posts and comments into linkable URLs.
+    </description>
+    <description xml:lang="vi">
+        Addon này sẽ tự động tạo ra một đường Link khi gặp chuỗi kí tự 'http' có trong bài viết.
+    </description>
+    <description xml:lang="zh-CN">
+        主题及评论中以http开始的字符串，自动转换为链接。并且鼠标移到链接上方时，将出现可选(新窗/本页面)提示框。
+    </description>
+    <description xml:lang="es">
+        Los comentarios que comienzan con http naeyongjung tema común de la cadena para vincular automáticamente a colgar el puntero del ratón sobre cada uno de los vínculos y saechang Ciudad y aparecen en el menú de add-on de decoración.
+    </description>
+    <description xml:lang="ru">
+        Этот аддон-дополнение переводит все неактивные ссылки, которые встречаются в статьях и комментариях, в рабочие ссылки.
+    </description>
+    <description xml:lang="ge">
+        Kommentare beginnen mit http naeyongjung Thema der gemeinsamen String automatisch Link zu hängen Sie mit der Maus über die einzelnen Links und saechang Stadt und auf dem Menü des Add-On Dekoration.
+    </description>
+    <description xml:lang="zh-TW">
+        是種可將主題和評論內容中的URL網址字串自動轉換成連結的附加元件。
+    </description>
+    <version>0.1</version>
+    <date>2008-04-22</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/blogapi/blogapi.addon.php b/addons/blogapi/blogapi.addon.php
index 7b294e8e3..e3e241d6f 100644
--- a/addons/blogapi/blogapi.addon.php
+++ b/addons/blogapi/blogapi.addon.php
@@ -1,468 +1,435 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file blogapicounter.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief blogAPI 애드온
-     *
-     * ms live writer, 파이어폭스의 performancing, zoundry 등의 외부 툴을 이용하여 글을 입력할 수 있게 합니다.
-     * 모듈 실행 이전(before_module_proc)에 호출이 되어야 하며 정상동작후에는 강제 종료를 한다.
-     **/
-
-    // called_position가 after_module_proc일때 rsd 태그 삽입
-    if($called_position == 'after_module_proc') {
-        // 현재 모듈의 rsd주소를 만듬
-        $site_module_info = Context::get('site_module_info');
-        $rsd_url = getFullSiteUrl($site_module_info->domain, '', 'mid',$site_module_info->mid, 'act','api');
-
-        // 헤더에 rsd태그 삽입
-        Context::addHtmlHeader("    ".'<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.$rsd_url.'" />');
-    }
-
-    // act가 api가 아니면 그냥 리턴~
-    if($_REQUEST['act']!='api') return;
-
-    // 관련 func 파일 읽음
-    require_once('./addons/blogapi/blogapi.func.php');
-
-    // xmlprc 파싱
-    // 요청된 xmlrpc를 파싱
-    $oXmlParser = new XmlParser();
-    $xmlDoc = $oXmlParser->parse();
-
-    $method_name = $xmlDoc->methodcall->methodname->body;
-    $params = $xmlDoc->methodcall->params->param;
-    if($params && !is_array($params)) $params = array($params);
-
-    // 일부 methodname에 대한 호환
-    if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo'))) {
-        $method_name = str_replace('metaWeblog.', 'blogger.', $method_name);
-    }
-
-    // blogger.deletePost일 경우 첫번째 인자 값 삭제
-    if($method_name == 'blogger.deletePost') array_shift($params);
-
-    // user_id, password를 구해서 로그인 시도
-    $user_id = trim($params[1]->value->string->body);
-    $password = trim($params[2]->value->string->body);
-
-    // 모듈 실행전이라면 인증을 처리한다.
-    if($called_position == 'before_module_init') {
-
-        // member controller을 이용해서 로그인 시도
-        if($user_id && $password) {
-            $oMemberController = &getController('member');
-            $output = $oMemberController->doLogin($user_id, $password);
-            // 로그인 실패시 에러 메시지 출력 
-            if(!$output->toBool()) {
-                $content = getXmlRpcFailure(1, $output->getMessage());
-                printContent($content);
-            }
-        } else {
-            $content = getXmlRpcFailure(1, 'not logged');
-            printContent($content);
-        }
-    }
-
-    // 모듈에서 무언가 작업을 하기 전에 blogapi tool의 요청에 대한 처리를 하고 강제 종료한다.
-    if($called_position == 'before_module_proc') {
-
-        // 글쓰기 권한 체크 (권한명의 경우 약속이 필요할듯..)
-        if(!$this->grant->write_document) {
-            printContent( getXmlRpcFailure(1, 'no permission') );
-        }
-
-        // 카테고리의 정보를 구해옴
-        $oDocumentModel = &getModel('document');
-        $category_list = $oDocumentModel->getCategoryList($this->module_srl);
-
-        // 임시 파일 저장 장소 지정
-        $tmp_uploaded_path = sprintf('./files/cache/blogapi/%s/%s/', $this->mid, $user_id);
-        $uploaded_target_path = sprintf('/files/cache/blogapi/%s/%s/', $this->mid, $user_id);
-
-        switch($method_name) {
-            // 블로그 정보
-            case 'blogger.getUsersBlogs' :
-                    $obj->url = getFullSiteUrl('');
-                    $obj->blogid = $this->mid;
-                    $obj->blogName = $this->module_info->browser_title;
-                    $blog_list = array($obj);
-
-                    $content = getXmlRpcResponse($blog_list);
-                    printContent($content);
-                break;
-
-            // 카테고리 목록 return
-            case 'metaWeblog.getCategories' :
-                    $category_obj_list = array();
-                    if($category_list) {
-                        foreach($category_list as $category_srl => $category_info) {
-                            unset($obj);
-                            $obj->description = $category_info->title;
-                            //$obj->htmlUrl = Context::getRequestUri().$this->mid.'/1'; 
-                            //$obj->rssUrl= Context::getRequestUri().'rss/'.$this->mid.'/1'; 
-                            $obj->title = $category_info->title;
-                            $obj->categoryid = $category_srl;
-                            $category_obj_list[] = $obj;
-                        }
-                    }
-
-                    $content = getXmlRpcResponse($category_obj_list);
-                    printContent($content);
-                break;
-
-            // 파일 업로드
-            case 'metaWeblog.newMediaObject' :
-                    // 파일 업로드 권한 체크
-                    $oFileModel = &getModel('file');
-                    $file_module_config = $oFileModel->getFileModuleConfig($this->module_srl);
-                    if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant)>0) {
-                        $logged_info = Context::get('logged_info');
-                        if($logged_info->is_admin != 'Y') {
-                            $is_permitted = false;
-                            for($i=0;$i<count($file_module_config->download_grant);$i++) {
-                                $group_srl = $file_module_config->download_grant[$i];
-                                if($logged_info->group_list[$group_srl]) {
-                                    $is_permitted = true;
-                                    break;
-                                }
-                            }
-                            if(!$is_permitted) printContent( getXmlRpcFailure(1, 'no permission') );
-                        }
-                    }
-
-                    $fileinfo = $params[3]->value->struct->member;
-                    foreach($fileinfo as $key => $val) {
-                        $nodename = $val->name->body;
-                        if($nodename == 'bits') $filedata = base64_decode($val->value->base64->body);
-                        elseif($nodename == 'name') $filename = $val->value->string->body;
-                    }
-
-                    $tmp_arr = explode('/',$filename);
-                    $filename = array_pop($tmp_arr);
-
-                    if(!is_dir($tmp_uploaded_path)) FileHandler::makeDir($tmp_uploaded_path);
-
-                    $target_filename = sprintf('%s%s', $tmp_uploaded_path, $filename);
-                    FileHandler::writeFile($target_filename, $filedata);
-                    $obj->url = Context::getRequestUri().$target_filename;
-
-                    $content = getXmlRpcResponse($obj);
-                    printContent($content);
-                break;
-
-            // 글 가져오기
-            case 'metaWeblog.getPost' :
-                    $document_srl = $params[0]->value->string->body;
-                    if(!$document_srl) {
-                        printContent( getXmlRpcFailure(1, 'no permission') );
-                    } else {
-                        $oDocumentModel = &getModel('document');
-                        $oDocument = $oDocumentModel->getDocument($document_srl);
-                        if(!$oDocument->isExists() || !$oDocument->isGranted()) {
-                            printContent( getXmlRpcFailure(1, 'no permission') );
-                        } else {
-                            // 카테고리를 사용하는지 확인후 사용시 카테고리 목록을 구해와서 Context에 세팅
-                            $category = "";
-                            if($oDocument->get('category_srl')) {
-                                $oDocumentModel = &getModel('document');
-                                $category_list = $oDocumentModel->getCategoryList($oDocument->get('module_srl'));
-                                if($category_list[$oDocument->get('category_srl')]) {
-                                    $category = $category_list[$oDocument->get('category_srl')]->title;
-                                }
-                            }
-                            
-                            $content = sprintf(
-                                    '<?xml version="1.0" encoding="utf-8"?>'.
-                                    '<methodResponse>'.
-                                    '<params>'.
-                                        '<param>'.
-                                            '<value>'.
-                                                '<struct>'.
-                                                    '<member><name>categories</name><value><array><data><value><![CDATA[%s]]></value></data></array></value></member>'.
-                                                    '<member><name>dateCreated</name><value><dateTime.iso8601>%s</dateTime.iso8601></value></member>'.
-                                                    '<member><name>description</name><value><![CDATA[%s]]></value></member>'.
-                                                    '<member><name>link</name><value>%s</value></member>'.
-                                                    '<member><name>postid</name><value><string>%s</string></value></member>'.
-                                                    '<member><name>title</name><value><![CDATA[%s]]></value></member>'.
-                                                    '<member><name>publish</name><value><boolean>1</boolean></value></member>'.
-                                                '</struct>'.
-                                            '</value>'.
-                                        '</param>'.
-                                    '</params>'.
-                                    '</methodResponse>',
-                                    $category,
-                                    date("Ymd", $oDocument->getRegdateTime()).'T'.date("H:i:s", $oDocument->getRegdateTime()),
-                                    $oDocument->getContent(false, false, true,false),
-                                    getFullUrl('','document_srl', $oDocument->document_srl),
-                                    $oDocument->document_srl,
-                                    $oDocument->getTitleText()
-                                );
-                            printContent($content);
-                        }
-                    }
-                break;
-
-            // 글작성
-            case 'metaWeblog.newPost' :
-                    unset($obj);
-                    $info = $params[3];
-                    // 글, 제목, 카테고리 정보 구함
-                    for($i=0;$i<count($info->value->struct->member);$i++) {
-                        $val = $info->value->struct->member[$i];
-                        switch($val->name->body) {
-                            case 'title' :
-                                    $obj->title = $val->value->string->body;
-                                break;
-                            case 'description' :
-                                    $obj->content = $val->value->string->body;
-                                break;
-                            case 'categories' :
-                                    $categories = $val->value->array->data->value;
-                                    if(!is_array($categories)) $categories = array($categories);
-                                    $category = $categories[0]->string->body;
-                                    if($category && $category_list) {
-                                        foreach($category_list as $category_srl => $category_info) {
-                                            if($category_info->title == $category) $obj->category_srl = $category_srl;
-                                        }
-                                    }
-                                break;
-                            case 'tagwords' :
-                                    $tags = $val->value->array->data->value;
-                                    if(!is_array($tags)) $tags = array($tags);
-                                    for($j=0;$j<count($tags);$j++) {
-                                        $tag_list[] = $tags[$j]->string->body;
-                                    }
-                                    if(count($tag_list)) $obj->tags = implode(',',$tag_list);
-                                break;
-                        }
-
-                    }
-
-                    // 문서 번호 설정
-                    $document_srl = getNextSequence();
-                    $obj->document_srl = $document_srl;
-                    $obj->module_srl = $this->module_srl;
-
-                    // 첨부파일 정리
-                    if(is_dir($tmp_uploaded_path)) {
-                        $file_list = FileHandler::readDir($tmp_uploaded_path);
-                        $file_count = count($file_list);
-                        if($file_count) {
-                            $oFileController = &getController('file');
-                            for($i=0;$i<$file_count;$i++) {
-                                $file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
-                                $file_info['name'] = $file_list[$i];
-                                $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
-                            }
-                            $obj->uploaded_count = $file_count;
-                        }
-                    }
-
-                    $obj->content = str_replace($uploaded_target_path,sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl,3), $filename), $obj->content);
-
-                    $oDocumentController = &getController('document');
-                    $obj->allow_comment = 'Y';
-                    $obj->allow_trackback = 'Y';
-                    $output = $oDocumentController->insertDocument($obj);
-
-                    if(!$output->toBool()) {
-                        $content = getXmlRpcFailure(1, $output->getMessage());
-                    } else {
-                        $content = getXmlRpcResponse(strval($document_srl));
-                    }
-                    FileHandler::removeDir($tmp_uploaded_path);
-
-                    printContent($content);
-                break;
-
-            // 글 수정
-            case 'metaWeblog.editPost' :
-                    $tmp_val = $params[0]->value->string->body;
-                    if(!$tmp_val) $tmp_val = $params[0]->value->i4->body;
-                    if(!$tmp_val) {
-                        $content = getXmlRpcFailure(1, 'no permission');
-                        break;
-                    }
-                    $tmp_arr = explode('/', $tmp_val);
-                    $document_srl = array_pop($tmp_arr);
-                    if(!$document_srl) {
-                        $content = getXmlRpcFailure(1, 'no permission');
-                        break;
-                    }
-
-                    $oDocumentModel = &getModel('document');
-                    $oDocument = $oDocumentModel->getDocument($document_srl);
-
-                    // 글 수정 권한 체크
-                    if(!$oDocument->isGranted()) {
-                        $content = getXmlRpcFailure(1, 'no permission');
-                        break;
-                    }
-
-                    $obj = $oDocument->getObjectVars();
-
-                    $info = $params[3];
-
-                    // 글, 제목, 카테고리 정보 구함
-                    for($i=0;$i<count($info->value->struct->member);$i++) {
-                        $val = $info->value->struct->member[$i];
-                        switch($val->name->body) {
-                            case 'title' :
-                                    $obj->title = $val->value->string->body;
-                                break;
-                            case 'description' :
-                                    $obj->content = $val->value->string->body;
-                                break;
-                            case 'categories' :
-                                    $categories = $val->value->array->data->value;
-                                    if(!is_array($categories)) $categories = array($categories);
-                                    $category = $categories[0]->string->body;
-                                    if($category && $category_list) {
-                                        foreach($category_list as $category_srl => $category_info) {
-                                            if($category_info->title == $category) $obj->category_srl = $category_srl;
-                                        }
-                                    }
-                                break;
-                            case 'tagwords' :
-                                    $tags = $val->value->array->data->value;
-                                    if(!is_array($tags)) $tags = array($tags);
-                                    for($j=0;$j<count($tags);$j++) {
-                                        $tag_list[] = $tags[$j]->string->body;
-                                    }
-                                    if(count($tag_list)) $obj->tags = implode(',',$tag_list);
-                                break;
-                        }
-
-                    }
-
-                    // 문서 번호 설정
-                    $obj->document_srl = $document_srl;
-                    $obj->module_srl = $this->module_srl;
-
-                    // 첨부파일 정리
-                    if(is_dir($tmp_uploaded_path)) {
-                        $file_list = FileHandler::readDir($tmp_uploaded_path);
-                        $file_count = count($file_list);
-                        if($file_count) {
-                            $oFileController = &getController('file');
-                            for($i=0;$i<$file_count;$i++) {
-                                $file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
-                                $file_info['name'] = $file_list[$i];
-
-                                $moved_filename = sprintf('./files/attach/images/%s/%s/%s', $this->module_srl, $document_srl, $file_info['name']);
-                                if(file_exists($moved_filename)) continue;
-
-                                $oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
-                            }
-                            $obj->uploaded_count += $file_count;
-                        }
-                    }
-
-                    $obj->content = str_replace($uploaded_target_path,sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl,3), $filename), $obj->content);
-
-                    $oDocumentController = &getController('document');
-                    $output = $oDocumentController->updateDocument($oDocument,$obj);
-
-                    if(!$output->toBool()) {
-                        $content = getXmlRpcFailure(1, $output->getMessage());
-                    } else {
-                        $content = getXmlRpcResponse(true);
-                        FileHandler::removeDir($tmp_uploaded_path);
-                    }
-
-                    printContent($content);
-                break;
-
-            // 글삭제
-            case 'blogger.deletePost' :
-                    $tmp_val = $params[0]->value->string->body;
-                    $tmp_arr = explode('/', $tmp_val);
-                    $document_srl = array_pop($tmp_arr);
-
-                    // 글 받아오기 
-                    $oDocumentModel = &getModel('document');
-                    $oDocument = $oDocumentModel->getDocument($document_srl);
-
-                    // 글 존재
-                    if(!$oDocument->isExists()) {
-                        $content = getXmlRpcFailure(1, 'not exists');
-
-                    // 글 삭제 권한 체크
-                    } elseif(!$oDocument->isGranted()) {
-                        $content = getXmlRpcFailure(1, 'no permission');
-                        break;
-
-                    // 삭제
-                    } else {
-                        $oDocumentController = &getController('document');
-                        $output = $oDocumentController->deleteDocument($document_srl);
-                        if(!$output->toBool()) $content = getXmlRpcFailure(1, $output->getMessage());
-                        else $content = getXmlRpcResponse(true);
-                    }
-
-                    printContent($content);
-                break;
-
-            // 최신글 받기
-            case 'metaWeblog.getRecentPosts' :
-                    // 목록을 구하기 위한 옵션
-                    $args->module_srl = $this->module_srl; ///< 현재 모듈의 module_srl
-                    $args->page = 1;
-                    $args->list_count = 20;
-                    $args->sort_index = 'list_order'; ///< 소팅 값
-                    $logged_info = Context::get('logged_info');
-                    $args->search_target = 'member_srl';
-                    $args->search_keyword = $logged_info->member_srl;
-                    $output = $oDocumentModel->getDocumentList($args);
-                    if(!$output->toBool() || !$output->data) {
-                        $content = getXmlRpcFailure(1, 'post not founded');
-                        printContent($content);
-                    } else {
-                        $oEditorController = &getController('editor');
-
-                        $posts = array();
-                        foreach($output->data as $key => $oDocument) {
-                            $post = null;
-                            $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)));
-                            $post->link = $post->permaLink = getFullUrl('','document_srl',$oDocument->document_srl);
-                            $post->postid = $oDocument->document_srl;
-                            $post->title = htmlspecialchars($oDocument->get('title'));
-                            $post->publish = 1;
-                            $post->userid = $oDocument->get('user_id');
-                            $post->mt_allow_pings = 0;
-                            $post->mt_allow_comments = $oDocument->allowComment()=='Y'?1:0;
-                            $posts[] = $post;
-                        }
-                        $content = getXmlRpcResponse($posts);
-                        printContent($content);
-                    }
-                break;
-
-            // 아무런 요청이 없을 경우 RSD 출력
-            default :
-
-                    $homepagelink = getUrl('','mid',$this->mid);
-                    $site_module_info = Context::get('site_module_info');
-                    $api_url = getFullSiteUrl($site_module_info->domain, '', 'mid',$site_module_info->mid, 'act','api');
-                    $content = <<<RSDContent
-<?xml version="1.0" ?>
-<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd" >
-<service>
-    <engineName>XpressEngine</engineName>
-    <engineLink>http://www.xpressengine.com/ </engineLink>
-    <homePageLink>{$homepagelink}</homePageLink>
-    <apis>
-        <api name="MetaWeblog" preferred="true" apiLink="{$api_url}" blogID="" />
-    </apis>
-</service>
-</rsd>
-RSDContent;
-                    printContent($content);
-                break;
-        }
-    }
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file blogapicounter.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Add blogAPI
+ *
+ * It enables to write a post by using an external tool such as ms live writer, firefox performancing, zoundry and so on.
+ * It should be called before executing the module(before_module_proc). If not, it is forced to shut down.
+ **/
+// Insert a rsd tag when called_position is after_module_proc
+if($called_position == 'after_module_proc') {
+	// Create rsd address of the current module
+	$site_module_info = Context::get('site_module_info');
+	$rsd_url = getFullSiteUrl($site_module_info->domain, '', 'mid',$site_module_info->mid, 'act','api');
+	// Insert rsd tag into the header
+	Context::addHtmlHeader("    ".'<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.$rsd_url.'" />');
+}
+// If act isnot api, just return
+if($_REQUEST['act']!='api') return;
+// Read func file
+require_once('./addons/blogapi/blogapi.func.php');
+// xmlprc parsing
+// Parse the requested xmlrpc
+$oXmlParser = new XmlParser();
+$xmlDoc = $oXmlParser->parse();
+
+$method_name = $xmlDoc->methodcall->methodname->body;
+$params = $xmlDoc->methodcall->params->param;
+if($params && !is_array($params)) $params = array($params);
+// Compatible with some of methodname
+if(in_array($method_name, array('metaWeblog.deletePost', 'metaWeblog.getUsersBlogs', 'metaWeblog.getUserInfo'))) {
+	$method_name = str_replace('metaWeblog.', 'blogger.', $method_name);
+}
+// Delete the first argument if it is blogger.deletePost
+if($method_name == 'blogger.deletePost') array_shift($params);
+// Get user_id, password and attempt log-in
+$user_id = trim($params[1]->value->string->body);
+$password = trim($params[2]->value->string->body);
+// Before executing the module, authentication is processed.
+if($called_position == 'before_module_init') {
+	// Attempt log-in by using member controller
+	if($user_id && $password) {
+		$oMemberController = &getController('member');
+		$output = $oMemberController->doLogin($user_id, $password);
+		// If login fails, an error message appears
+		if(!$output->toBool()) {
+			$content = getXmlRpcFailure(1, $output->getMessage());
+			printContent($content);
+		}
+	} else {
+		$content = getXmlRpcFailure(1, 'not logged');
+		printContent($content);
+	}
+}
+// Before module processing, handle requests from blogapi tool and then terminate.
+if($called_position == 'before_module_proc') {
+	// Check writing permission 
+	if(!$this->grant->write_document) {
+		printContent( getXmlRpcFailure(1, 'no permission') );
+	}
+	// Get information of the categories
+	$oDocumentModel = &getModel('document');
+	$category_list = $oDocumentModel->getCategoryList($this->module_srl);
+	// Specifies a temporary file storage
+	$tmp_uploaded_path = sprintf('./files/cache/blogapi/%s/%s/', $this->mid, $user_id);
+	$uploaded_target_path = sprintf('/files/cache/blogapi/%s/%s/', $this->mid, $user_id);
+
+	switch($method_name) {
+		// Blog information
+		case 'blogger.getUsersBlogs' :
+				$obj->url = getFullSiteUrl('');
+				$obj->blogid = $this->mid;
+				$obj->blogName = $this->module_info->browser_title;
+				$blog_list = array($obj);
+
+				$content = getXmlRpcResponse($blog_list);
+				printContent($content);
+			break;
+		// Return a list of categories
+		case 'metaWeblog.getCategories' :
+				$category_obj_list = array();
+				if($category_list) {
+					foreach($category_list as $category_srl => $category_info) {
+						unset($obj);
+						$obj->description = $category_info->title;
+						//$obj->htmlUrl = Context::getRequestUri().$this->mid.'/1'; 
+						//$obj->rssUrl= Context::getRequestUri().'rss/'.$this->mid.'/1'; 
+						$obj->title = $category_info->title;
+						$obj->categoryid = $category_srl;
+						$category_obj_list[] = $obj;
+					}
+				}
+
+				$content = getXmlRpcResponse($category_obj_list);
+				printContent($content);
+			break;
+		// Upload file
+		case 'metaWeblog.newMediaObject' :
+				// Check a file upload permission
+				$oFileModel = &getModel('file');
+				$file_module_config = $oFileModel->getFileModuleConfig($this->module_srl);
+				if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant)>0) {
+					$logged_info = Context::get('logged_info');
+					if($logged_info->is_admin != 'Y') {
+						$is_permitted = false;
+						for($i=0;$i<count($file_module_config->download_grant);$i++) {
+							$group_srl = $file_module_config->download_grant[$i];
+							if($logged_info->group_list[$group_srl]) {
+								$is_permitted = true;
+								break;
+							}
+						}
+						if(!$is_permitted) printContent( getXmlRpcFailure(1, 'no permission') );
+					}
+				}
+
+				$fileinfo = $params[3]->value->struct->member;
+				foreach($fileinfo as $key => $val) {
+					$nodename = $val->name->body;
+					if($nodename == 'bits') $filedata = base64_decode($val->value->base64->body);
+					elseif($nodename == 'name') $filename = $val->value->string->body;
+				}
+
+				$tmp_arr = explode('/',$filename);
+				$filename = array_pop($tmp_arr);
+
+				if(!is_dir($tmp_uploaded_path)) FileHandler::makeDir($tmp_uploaded_path);
+
+				$target_filename = sprintf('%s%s', $tmp_uploaded_path, $filename);
+				FileHandler::writeFile($target_filename, $filedata);
+				$obj->url = Context::getRequestUri().$target_filename;
+
+				$content = getXmlRpcResponse($obj);
+				printContent($content);
+			break;
+		// Get posts
+		case 'metaWeblog.getPost' :
+				$document_srl = $params[0]->value->string->body;
+				if(!$document_srl) {
+					printContent( getXmlRpcFailure(1, 'no permission') );
+				} else {
+					$oDocumentModel = &getModel('document');
+					$oDocument = $oDocumentModel->getDocument($document_srl);
+					if(!$oDocument->isExists() || !$oDocument->isGranted()) {
+						printContent( getXmlRpcFailure(1, 'no permission') );
+					} else {
+						// Get a list of categories and set Context
+						$category = "";
+						if($oDocument->get('category_srl')) {
+							$oDocumentModel = &getModel('document');
+							$category_list = $oDocumentModel->getCategoryList($oDocument->get('module_srl'));
+							if($category_list[$oDocument->get('category_srl')]) {
+								$category = $category_list[$oDocument->get('category_srl')]->title;
+							}
+						}
+						
+						$content = sprintf(
+								'<?xml version="1.0" encoding="utf-8"?>'.
+								'<methodResponse>'.
+								'<params>'.
+									'<param>'.
+										'<value>'.
+											'<struct>'.
+												'<member><name>categories</name><value><array><data><value><![CDATA[%s]]></value></data></array></value></member>'.
+												'<member><name>dateCreated</name><value><dateTime.iso8601>%s</dateTime.iso8601></value></member>'.
+												'<member><name>description</name><value><![CDATA[%s]]></value></member>'.
+												'<member><name>link</name><value>%s</value></member>'.
+												'<member><name>postid</name><value><string>%s</string></value></member>'.
+												'<member><name>title</name><value><![CDATA[%s]]></value></member>'.
+												'<member><name>publish</name><value><boolean>1</boolean></value></member>'.
+											'</struct>'.
+										'</value>'.
+									'</param>'.
+								'</params>'.
+								'</methodResponse>',
+								$category,
+								date("Ymd", $oDocument->getRegdateTime()).'T'.date("H:i:s", $oDocument->getRegdateTime()),
+								$oDocument->getContent(false, false, true,false),
+								getFullUrl('','document_srl', $oDocument->document_srl),
+								$oDocument->document_srl,
+								$oDocument->getTitleText()
+							);
+						printContent($content);
+					}
+				}
+			break;
+		// Write a new post
+		case 'metaWeblog.newPost' :
+				unset($obj);
+				$info = $params[3];
+				// Get information of post, title, and category
+				for($i=0;$i<count($info->value->struct->member);$i++) {
+					$val = $info->value->struct->member[$i];
+					switch($val->name->body) {
+						case 'title' :
+								$obj->title = $val->value->string->body;
+							break;
+						case 'description' :
+								$obj->content = $val->value->string->body;
+							break;
+						case 'categories' :
+								$categories = $val->value->array->data->value;
+								if(!is_array($categories)) $categories = array($categories);
+								$category = $categories[0]->string->body;
+								if($category && $category_list) {
+									foreach($category_list as $category_srl => $category_info) {
+										if($category_info->title == $category) $obj->category_srl = $category_srl;
+									}
+								}
+							break;
+						case 'tagwords' :
+								$tags = $val->value->array->data->value;
+								if(!is_array($tags)) $tags = array($tags);
+								for($j=0;$j<count($tags);$j++) {
+									$tag_list[] = $tags[$j]->string->body;
+								}
+								if(count($tag_list)) $obj->tags = implode(',',$tag_list);
+							break;
+					}
+
+				}
+				// Set document srl
+				$document_srl = getNextSequence();
+				$obj->document_srl = $document_srl;
+				$obj->module_srl = $this->module_srl;
+				// Attachment
+				if(is_dir($tmp_uploaded_path)) {
+					$file_list = FileHandler::readDir($tmp_uploaded_path);
+					$file_count = count($file_list);
+					if($file_count) {
+						$oFileController = &getController('file');
+						for($i=0;$i<$file_count;$i++) {
+							$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
+							$file_info['name'] = $file_list[$i];
+							$oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
+						}
+						$obj->uploaded_count = $file_count;
+					}
+				}
+
+				$obj->content = str_replace($uploaded_target_path,sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl,3), $filename), $obj->content);
+
+				$oDocumentController = &getController('document');
+				$obj->commentStatus = 'ALLOW';
+				$obj->allow_trackback = 'Y';
+				$output = $oDocumentController->insertDocument($obj);
+
+				if(!$output->toBool()) {
+					$content = getXmlRpcFailure(1, $output->getMessage());
+				} else {
+					$content = getXmlRpcResponse(strval($document_srl));
+				}
+				FileHandler::removeDir($tmp_uploaded_path);
+
+				printContent($content);
+			break;
+		// Edit post
+		case 'metaWeblog.editPost' :
+				$tmp_val = $params[0]->value->string->body;
+				if(!$tmp_val) $tmp_val = $params[0]->value->i4->body;
+				if(!$tmp_val) {
+					$content = getXmlRpcFailure(1, 'no permission');
+					break;
+				}
+				$tmp_arr = explode('/', $tmp_val);
+				$document_srl = array_pop($tmp_arr);
+				if(!$document_srl) {
+					$content = getXmlRpcFailure(1, 'no permission');
+					break;
+				}
+
+				$oDocumentModel = &getModel('document');
+				$oDocument = $oDocumentModel->getDocument($document_srl);
+				// Check if a permission to modify a document is granted
+				if(!$oDocument->isGranted()) {
+					$content = getXmlRpcFailure(1, 'no permission');
+					break;
+				}
+
+				$obj = $oDocument->getObjectVars();
+
+				$info = $params[3];
+				// Get information of post, title, and category
+				for($i=0;$i<count($info->value->struct->member);$i++) {
+					$val = $info->value->struct->member[$i];
+					switch($val->name->body) {
+						case 'title' :
+								$obj->title = $val->value->string->body;
+							break;
+						case 'description' :
+								$obj->content = $val->value->string->body;
+							break;
+						case 'categories' :
+								$categories = $val->value->array->data->value;
+								if(!is_array($categories)) $categories = array($categories);
+								$category = $categories[0]->string->body;
+								if($category && $category_list) {
+									foreach($category_list as $category_srl => $category_info) {
+										if($category_info->title == $category) $obj->category_srl = $category_srl;
+									}
+								}
+							break;
+						case 'tagwords' :
+								$tags = $val->value->array->data->value;
+								if(!is_array($tags)) $tags = array($tags);
+								for($j=0;$j<count($tags);$j++) {
+									$tag_list[] = $tags[$j]->string->body;
+								}
+								if(count($tag_list)) $obj->tags = implode(',',$tag_list);
+							break;
+					}
+
+				}
+				// Document srl
+				$obj->document_srl = $document_srl;
+				$obj->module_srl = $this->module_srl;
+				// Attachment
+				if(is_dir($tmp_uploaded_path)) {
+					$file_list = FileHandler::readDir($tmp_uploaded_path);
+					$file_count = count($file_list);
+					if($file_count) {
+						$oFileController = &getController('file');
+						for($i=0;$i<$file_count;$i++) {
+							$file_info['tmp_name'] = sprintf('%s%s', $tmp_uploaded_path, $file_list[$i]);
+							$file_info['name'] = $file_list[$i];
+
+							$moved_filename = sprintf('./files/attach/images/%s/%s/%s', $this->module_srl, $document_srl, $file_info['name']);
+							if(file_exists($moved_filename)) continue;
+
+							$oFileController->insertFile($file_info, $this->module_srl, $document_srl, 0, true);
+						}
+						$obj->uploaded_count += $file_count;
+					}
+				}
+
+				$obj->content = str_replace($uploaded_target_path,sprintf('/files/attach/images/%s/%s%s', $this->module_srl, getNumberingPath($document_srl,3), $filename), $obj->content);
+
+				$oDocumentController = &getController('document');
+				$output = $oDocumentController->updateDocument($oDocument,$obj);
+
+				if(!$output->toBool()) {
+					$content = getXmlRpcFailure(1, $output->getMessage());
+				} else {
+					$content = getXmlRpcResponse(true);
+					FileHandler::removeDir($tmp_uploaded_path);
+				}
+
+				printContent($content);
+			break;
+		// Delete the post
+		case 'blogger.deletePost' :
+				$tmp_val = $params[0]->value->string->body;
+				$tmp_arr = explode('/', $tmp_val);
+				$document_srl = array_pop($tmp_arr);
+				// Get a document
+				$oDocumentModel = &getModel('document');
+				$oDocument = $oDocumentModel->getDocument($document_srl);
+				// If the document exists
+				if(!$oDocument->isExists()) {
+					$content = getXmlRpcFailure(1, 'not exists');
+				// Check if a permission to delete a document is granted
+				} elseif(!$oDocument->isGranted()) {
+					$content = getXmlRpcFailure(1, 'no permission');
+					break;
+				// Delete
+				} else {
+					$oDocumentController = &getController('document');
+					$output = $oDocumentController->deleteDocument($document_srl);
+					if(!$output->toBool()) $content = getXmlRpcFailure(1, $output->getMessage());
+					else $content = getXmlRpcResponse(true);
+				}
+
+				printContent($content);
+			break;
+		// Get recent posts
+		case 'metaWeblog.getRecentPosts' :
+				// Options to get a list
+				$args->module_srl = $this->module_srl; // /< module_srl of the current module
+				$args->page = 1;
+				$args->list_count = 20;
+				$args->sort_index = 'list_order'; // /< Sorting values
+				$logged_info = Context::get('logged_info');
+				$args->search_target = 'member_srl';
+				$args->search_keyword = $logged_info->member_srl;
+				$output = $oDocumentModel->getDocumentList($args);
+				if(!$output->toBool() || !$output->data) {
+					$content = getXmlRpcFailure(1, 'post not founded');
+					printContent($content);
+				} else {
+					$oEditorController = &getController('editor');
+
+					$posts = array();
+					foreach($output->data as $key => $oDocument) {
+						$post = null;
+						$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)));
+						$post->link = $post->permaLink = getFullUrl('','document_srl',$oDocument->document_srl);
+						$post->postid = $oDocument->document_srl;
+						$post->title = htmlspecialchars($oDocument->get('title'));
+						$post->publish = 1;
+						$post->userid = $oDocument->get('user_id');
+						$post->mt_allow_pings = 0;
+						$post->mt_allow_comments = $oDocument->allowComment()?1:0;
+						$posts[] = $post;
+					}
+					$content = getXmlRpcResponse($posts);
+					printContent($content);
+				}
+			break;
+		// Display RSD if there is no request
+		default :
+				$homepagelink = getUrl('','mid',$this->mid);
+				$site_module_info = Context::get('site_module_info');
+				$api_url = getFullSiteUrl($site_module_info->domain, '', 'mid',$site_module_info->mid, 'act','api');
+				$content = <<<RSDContent
+<?xml version="1.0" ?>
+<rsd version="1.0" xmlns="http://archipelago.phrasewise.com/rsd" >
+<service>
+    <engineName>XpressEngine</engineName>
+    <engineLink>http://www.xpressengine.com/ </engineLink>
+    <homePageLink>{$homepagelink}</homePageLink>
+    <apis>
+        <api name="MetaWeblog" preferred="true" apiLink="{$api_url}" blogID="" />
+    </apis>
+</service>
+</rsd>
+RSDContent;
+				printContent($content);
+			break;
+	}
+}
+?>
diff --git a/addons/blogapi/blogapi.func.php b/addons/blogapi/blogapi.func.php
index 511ac44e3..2d289bf40 100644
--- a/addons/blogapi/blogapi.func.php
+++ b/addons/blogapi/blogapi.func.php
@@ -1,69 +1,66 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file ./addons/blogapi/blogapi.func.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief blogapi구현을 위한 함수 모음집
-     **/
-    
-    // 오류 표시
-    function getXmlRpcFailure($error, $message) {
-        return 
-            sprintf(
-                "<methodResponse>\n<fault><value><struct>\n<member>\n<name>faultCode</name>\n<value><int>%d</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>%s</string></value>\n</member>\n</struct></value></fault>\n</methodResponse>\n",
-                $error,
-                htmlspecialchars($message)
-            );
-    }
-
-    // 결과 표시
-    function getXmlRpcResponse($params) {
-        $buff = '<?xml version="1.0" encoding="utf-8"?>'."\n<methodResponse><params>";
-        $buff .= _getEncodedVal($params);
-        $buff .= "</params>\n</methodResponse>\n";
-
-        return $buff;
-    }
-
-    // 인코딩 처리 
-    function _getEncodedVal($val, $is_sub_set = false) {
-        if(is_int($val)) $buff = sprintf("<value><i4>%d</i4></value>", $val);
-        elseif(is_string($val)&&preg_match('/^([0-9]+)T([0-9\:]+)$/', $val)) $buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
-        elseif(is_double($val)) $buff = sprintf("<value><double>%f</double></value>", $val);
-        elseif(is_bool($val)) $buff = sprintf("<value><boolean>%d</boolean></value>", $val?1:0);
-        elseif(is_object($val)) {
-            $values = get_object_vars($val);
-            $val_count = count($values);
-            $buff = "<value><struct>";
-            foreach($values as $k => $v) {
-               $buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k), _getEncodedVal($v, true));
-            }
-            $buff .= "</struct></value>\n";
-        } elseif(is_array($val)) {
-            $val_count = count($val);
-            $buff = "<value><array>\n<data>";
-            for($i=0;$i<$val_count;$i++) {
-                $buff .= _getEncodedVal($val[$i], true);
-            }
-            $buff .= "</data>\n</array></value>";
-        } else {
-            $buff = sprintf("<value><string>%s</string></value>\n", $val);
-        }
-        if(!$is_sub_set) return sprintf("<param>\n%s</param>", $buff);
-        return $buff;
-    }
-
-    // 결과 출력
-    function printContent($content) {
-        header("Content-Type: text/xml; charset=UTF-8");
-        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-        header("Cache-Control: no-store, no-cache, must-revalidate");
-        header("Cache-Control: post-check=0, pre-check=0", false);
-        header("Pragma: no-cache");
-        print $content;
-        Context::close();
-        exit();
-    }
-?>
+<?php
+    if(!defined('__XE__')) exit();
+
+    /**
+     * @file ./addons/blogapi/blogapi.func.php
+     * @author NHN (developers@xpressengine.com)
+     * @brief Function collections for the implementation of blogapi
+     **/
+    
+    // Error messages
+    function getXmlRpcFailure($error, $message) {
+        return 
+            sprintf(
+                "<methodResponse>\n<fault><value><struct>\n<member>\n<name>faultCode</name>\n<value><int>%d</int></value>\n</member>\n<member>\n<name>faultString</name>\n<value><string>%s</string></value>\n</member>\n</struct></value></fault>\n</methodResponse>\n",
+                $error,
+                htmlspecialchars($message)
+            );
+    }
+    // Display results
+    function getXmlRpcResponse($params) {
+        $buff = '<?xml version="1.0" encoding="utf-8"?>'."\n<methodResponse><params>";
+        $buff .= _getEncodedVal($params);
+        $buff .= "</params>\n</methodResponse>\n";
+
+        return $buff;
+    }
+    // Encoding
+    function _getEncodedVal($val, $is_sub_set = false) {
+        if(is_int($val)) $buff = sprintf("<value><i4>%d</i4></value>", $val);
+        elseif(is_string($val)&&preg_match('/^([0-9]+)T([0-9\:]+)$/', $val)) $buff = sprintf("<value><dateTime.iso8601>%s</dateTime.iso8601></value>\n", $val);
+        elseif(is_double($val)) $buff = sprintf("<value><double>%f</double></value>", $val);
+        elseif(is_bool($val)) $buff = sprintf("<value><boolean>%d</boolean></value>", $val?1:0);
+        elseif(is_object($val)) {
+            $values = get_object_vars($val);
+            $val_count = count($values);
+            $buff = "<value><struct>";
+            foreach($values as $k => $v) {
+               $buff .= sprintf("<member>\n<name>%s</name>\n%s</member>\n", htmlspecialchars($k), _getEncodedVal($v, true));
+            }
+            $buff .= "</struct></value>\n";
+        } elseif(is_array($val)) {
+            $val_count = count($val);
+            $buff = "<value><array>\n<data>";
+            for($i=0;$i<$val_count;$i++) {
+                $buff .= _getEncodedVal($val[$i], true);
+            }
+            $buff .= "</data>\n</array></value>";
+        } else {
+            $buff = sprintf("<value><string>%s</string></value>\n", $val);
+        }
+        if(!$is_sub_set) return sprintf("<param>\n%s</param>", $buff);
+        return $buff;
+    }
+    // Display the result
+    function printContent($content) {
+        header("Content-Type: text/xml; charset=UTF-8");
+        header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+        header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+        header("Cache-Control: no-store, no-cache, must-revalidate");
+        header("Cache-Control: post-check=0, pre-check=0", false);
+        header("Pragma: no-cache");
+        print $content;
+        Context::close();
+        exit();
+    }
+?>
diff --git a/addons/blogapi/conf/info.xml b/addons/blogapi/conf/info.xml
index f533cd4a6..90ce15f96 100644
--- a/addons/blogapi/conf/info.xml
+++ b/addons/blogapi/conf/info.xml
@@ -1,80 +1,80 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">BlogAPI 애드온</title>
-    <title xml:lang="jp">BlogAPIアドオン</title>
-    <title xml:lang="zh-CN">BlogAPI</title>
-    <title xml:lang="en">Addon for BlogAPI</title>
-    <title xml:lang="vi">BlogAPI Addon</title>
-    <title xml:lang="ge">Addon für BlogAPI</title>
-    <title xml:lang="es">Addon para BlogAPI</title>
-    <title xml:lang="ru">Аддон для BlogAPI</title>
-    <title xml:lang="zh-TW">部落格 API</title>
-    <description xml:lang="ko">
-        metaWeblog를 지원하는 blogApi애드온입니다.
-        사용으로 설정하시면 각 모듈마다 RSD 태그를 노출합니다.
-        api의 주소는 http://설치주소/모듈명/api 입니다.
-        사용으로 하셔야 RSD태그 및 api가 동작을 합니다.
-    </description>
-    <description xml:lang="jp">
-        MetaWeblogをサポートするBlog APIアドオンです。
-        「使用する」にチェックすると各モジュールごとにRSDのアドレスを表示します。
-        APIのアドレスは「http://インストールURL/モジュール名/api」です。
-        「使用する」に設定してから、RSDタグ、およびAPIが作動します。
-    </description>
-    <description xml:lang="zh-CN">
-        支持metaWeblog的 blogApi插件。
-        设置为"启用"时,会使每个模块都会显示RSD标签。
-        api地址为http://安装地址/模块名/api。
-        把状态设置为"使用"时，才会激活RSD标签及api。
-    </description>
-    <description xml:lang="en">
-        This blogApi addon supports metaWeblog.
-        By using this option, it lets the RSD tag to be exposed to each module.
-        URL to the api is http://setup_path/module_name/api.
-        RSD tag and the api will work only if u use this addon.
-    </description>
-    <description xml:lang="vi">
-        Addon BlogAPI này hỗ trợ metaWeblog..
-        Bằng việc sử dụng tùy chọn này, Tag RSD sẽ được hiển thị đến mỗi Module.
-        URL cho API có dạng http://setup_path/module_name/api.
-        RSD Tag và API chỉ làm việc khi Addon này được kích hoạt.
-    </description>
-    <description xml:lang="ge">
-        Diese blogApi addon metaWeblog unterstützt.
-        Durch die Verwendung dieser Option, die es ermöglicht RSD Tag ausgesetzt werden jedes Modul.
-        URL der api ist http://setup_path/module_name/api.
-        RSD-Tag und dem API arbeiten und nur dann, wenn Sie über dieses Addon.
-    </description>
-    <description xml:lang="es">
-        Este blogApi addon soporta el metaWeblog.
-        Si seleccionas la optión usar, cada módulo entregará la etiqueta RSD.
-        La dirección de api es http://dirección de la instalación/nombre de módulo/api.
-        Sólo si seleccionas la opción usar, funcionará la etiqueta RSD y api.
-    </description>
-    <description xml:lang="ru">
-        Этот blogApi аддон поддерживает metaWeblog.
-        Используя этот аддон, RSD тег становится доступным для каждого модуля.
-        URL для api - http://setup_path/module_name/api.
-        тег RSD и api работают только при включенном аддоне.
-    </description>
-    <description xml:lang="zh-TW">
-        支援 MetaWeblog 的部落格 API 附加元件。
-        設置成"啟用"時，會使每個模組都顯示 RSD 圖示。
-        API網址是 http://安裝位置/模組名稱/api。
-        將狀態設置成"啟用"時，才可使用 RSD 和 API
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">BlogAPI 애드온</title>
+    <title xml:lang="jp">BlogAPIアドオン</title>
+    <title xml:lang="zh-CN">BlogAPI</title>
+    <title xml:lang="en">Addon for BlogAPI</title>
+    <title xml:lang="vi">BlogAPI Addon</title>
+    <title xml:lang="ge">Addon für BlogAPI</title>
+    <title xml:lang="es">Addon para BlogAPI</title>
+    <title xml:lang="ru">Аддон для BlogAPI</title>
+    <title xml:lang="zh-TW">部落格 API</title>
+    <description xml:lang="ko">
+        metaWeblog를 지원하는 blogApi애드온입니다.
+        사용으로 설정하시면 각 모듈마다 RSD 태그를 노출합니다.
+        api의 주소는 http://설치주소/모듈명/api 입니다.
+        사용으로 하셔야 RSD태그 및 api가 동작을 합니다.
+    </description>
+    <description xml:lang="jp">
+        MetaWeblogをサポートするBlog APIアドオンです。
+        「使用する」にチェックすると各モジュールごとにRSDのアドレスを表示します。
+        APIのアドレスは「http://インストールURL/モジュール名/api」です。
+        「使用する」に設定してから、RSDタグ、およびAPIが作動します。
+    </description>
+    <description xml:lang="zh-CN">
+        支持metaWeblog的 blogApi插件。
+        设置为"启用"时,会使每个模块都会显示RSD标签。
+        api地址为http://安装地址/模块名/api。
+        把状态设置为"使用"时，才会激活RSD标签及api。
+    </description>
+    <description xml:lang="en">
+        This blogAPI addon supports metaWeblog.
+        By using this option, it lets the RSD tag to be exposed to each module.
+        URL to the API is http://setup_path/module_name/api.
+        RSD tag and the api will work only if you use this addon.
+    </description>
+    <description xml:lang="vi">
+        Addon BlogAPI này hỗ trợ metaWeblog..
+        Bằng việc sử dụng tùy chọn này, Tag RSD sẽ được hiển thị đến mỗi Module.
+        URL cho API có dạng http://setup_path/module_name/api.
+        RSD Tag và API chỉ làm việc khi Addon này được kích hoạt.
+    </description>
+    <description xml:lang="ge">
+        Diese blogApi addon metaWeblog unterstützt.
+        Durch die Verwendung dieser Option, die es ermöglicht RSD Tag ausgesetzt werden jedes Modul.
+        URL der api ist http://setup_path/module_name/api.
+        RSD-Tag und dem API arbeiten und nur dann, wenn Sie über dieses Addon.
+    </description>
+    <description xml:lang="es">
+        Este blogApi addon soporta el metaWeblog.
+        Si seleccionas la optión usar, cada módulo entregará la etiqueta RSD.
+        La dirección de api es http://dirección de la instalación/nombre de módulo/api.
+        Sólo si seleccionas la opción usar, funcionará la etiqueta RSD y api.
+    </description>
+    <description xml:lang="ru">
+        Этот blogApi аддон поддерживает metaWeblog.
+        Используя этот аддон, RSD тег становится доступным для каждого модуля.
+        URL для api - http://setup_path/module_name/api.
+        тег RSD и api работают только при включенном аддоне.
+    </description>
+    <description xml:lang="zh-TW">
+        支援 MetaWeblog 的部落格 API 附加元件。
+        設置成"啟用"時，會使每個模組都顯示 RSD 圖示。
+        API網址是 http://安裝位置/模組名稱/api。
+        將狀態設置成"啟用"時，才可使用 RSD 和 API
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/captcha/captcha.addon.php b/addons/captcha/captcha.addon.php
index 83dc587f1..ad6520eec 100644
--- a/addons/captcha/captcha.addon.php
+++ b/addons/captcha/captcha.addon.php
@@ -1,263 +1,326 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file captcha.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 특정 action을 실행할때 captcha를 띄우도록 함
-	 *        영어 알파벳을 입력, 음성기능 추가
-     **/
-
-	if(!class_exists('AddonCaptcha'))
-	{
-		class AddonCaptcha
-		{
-			var $addon_info;
-
-			function setInfo(&$addon_info)
-			{
-				$this->addon_info = $addon_info;
-			}
-
-			function before_module_proc()
-			{
-			    if($this->addon_info->act_type == 'everytime' && $_SESSION['captcha_authed']) {
-			        unset($_SESSION['captcha_authed']);
-				}
-			}
-
-			function before_module_init(&$ModuleHandler)
-			{
-				$logged_info = Context::get('logged_info');
-				if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin) return false;
-				if($this->addon_info->target != 'all' && Context::get('is_logged')) return false;
-				if($_SESSION['captcha_authed']) return false;
-
-				$target_acts = array('procBoardInsertDocument','procBoardInsertComment','procIssuetrackerInsertIssue','procIssuetrackerInsertHistory','procTextyleInsertComment');
-				if($this->addon_info->apply_find_account=='apply') $target_acts[] = 'procMemberFindAccount';
-				if($this->addon_info->apply_resend_auth_mail=='apply') $target_acts[] = 'procMemberResendAuthMail';
-				if($this->addon_info->apply_signup=='apply') $target_acts[] = 'procMemberInsert';
-
-				if(Context::getRequestMethod()!='XMLRPC' && Context::getRequestMethod()!=='JSON')
-				{
-					Context::addHtmlHeader('<script type="text/javascript"> var captchaTargetAct = new Array("'.implode('","',$target_acts).'"); </script>');
-					Context::addJsFile('./addons/captcha/captcha.js',false, '', null, 'body');
-				}
-
-				// 게시판/ 이슈트래커의 글쓰기/댓글쓰기 액션 호출시 세션 비교
-				if(!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $target_acts)) {
-					Context::loadLang('./addons/captcha/lang');
-					$ModuleHandler->error = "captcha_denied";
-				}
-
-				return true;
-			}
-
-			function before_module_init_setCaptchaSession()
-			{
-				if($_SESSION['captcha_authed']) return false;
-
-				// 언어파일 로드
-				Context::loadLang(_XE_PATH_.'addons/captcha/lang');
-
-				// 키워드 생성
-				$arr = range('A','Y');
-				shuffle($arr);
-				$arr = array_slice($arr,0,6);
-                $_SESSION['captcha_keyword'] = join('', $arr);
-
-                $target = Context::getLang('target_captcha');
-                header("Content-Type: text/xml; charset=UTF-8");
-                header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-                header("Cache-Control: no-store, no-cache, must-revalidate");
-                header("Cache-Control: post-check=0, pre-check=0", false);
-                header("Pragma: no-cache");
-                printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
-						,Context::getLang('about_captcha')
-						,Context::getLang('captcha_reload')
-						,Context::getLang('captcha_play')
-						,Context::getLang('cmd_input')
-						,Context::getLang('cmd_cancel')
-						);
-                Context::close();
-                exit();
-			}
-
-			function before_module_init_captchaImage()
-			{
-				if($_SESSION['captcha_authed']) return false;
-
-			    $keyword = $_SESSION['captcha_keyword'];
-				$im = $this->createCaptchaImage($keyword);
-
-                header("Cache-Control: ");
-                header("Pragma: ");
-                header("Content-Type: image/png");
-
-				imagepng($im);
-				imagedestroy($im);
-
-				Context::close();
-                exit();
-			}
-
-			function createCaptchaImage($string)
-			{
-				$arr = array();
-				for($i=0,$c=strlen($string);$i<$c;$i++) $arr[] = $string{$i};
-
-				// 글자 하나 사이즈
-				$w = 18;
-				$h = 25;
-
-				// 글자 수
-				$c = count($arr);
-
-				// 글자 이미지
-				$im = array();
-
-				// 총사이즈로 바탕 이미지 생성
-				$im[] = imagecreate(($w+2)*count($arr), $h);
-
-				$deg = range(-30,30);
-				shuffle($deg);
-
-				// 글자별 이미지 생성
-				foreach($arr as $i => $str)
-				{
-					$im[$i+1] = @imagecreate($w, $h);
-					$background_color = imagecolorallocate($im[$i+1], 255, 255, 255);
-					$text_color = imagecolorallocate($im[$i+1], 0, 0, 0);
-
-					// 글자폰트(사이즈) 조절
-					$ran = range(1,20);
-					shuffle($ran);
-
-					if(function_exists('imagerotate'))
-					{
-						imagestring($im[$i+1], (array_pop($ran)%3)+3, 2, (array_pop($ran)%8),  $str, $text_color);
-						$im[$i+1] = imagerotate($im[$i+1], array_pop($deg), 0);
-
-						$background_color = imagecolorallocate($im[$i+1], 255, 255, 255);
-						imagecolortransparent($im[$i+1], $background_color);
-					}
-					else
-					{
-						imagestring($im[$i+1], (array_pop($ran)%3)+3, 2, (array_pop($ran)%4), $str, $text_color);
-					}
-				}
-				
-				// 각글자 이미지를 합침
-				for($i=1;$i<count($im);$i++)
-				{
-					imagecopy($im[0],$im[$i],(($w+2)*($i-1)),0,0,0,$w,$h);
-					imagedestroy($im[$i]);
-				}
-
-				// 이미지 확대
-				$big_count = 2;
-				$big = imagecreatetruecolor(($w+2)*$big_count*$c, $h*$big_count);
-				imagecopyresized($big, $im[0], 0, 0, 0, 0, ($w+2)*$big_count*$c, $h*$big_count, ($w+2)*$c, $h);
-				imagedestroy($im[0]);
-
-				if(function_exists('imageantialias')) imageantialias($big,true);
-
-				// 배경 라인 및 점찍기
-				$line_color = imagecolorallocate($big, 0, 0, 0);
-
-				$w = ($w+2)*$big_count*$c;
-				$h = $h*$big_count;
-				$d = array_pop($deg);
-
-				for($i=-abs($d);$i<$h+abs($d);$i=$i+7) imageline($big,0,$i+$d,$w,$i,$line_color);
-
-				$x = range(0,($w-10));
-				shuffle($x);
-
-				for($i=0;$i<200;$i++) imagesetpixel($big,$x[$i]%$w,$x[$i+1]%$h,$line_color);
-
-				return $big;
-			}
-
-			function before_module_init_captchaAudio()
-			{
-				if($_SESSION['captcha_authed']) return false;
-				
-				$keyword = strtoupper($_SESSION['captcha_keyword']);
-				$data = $this->createCaptchaAudio($keyword);
-
-				header('Content-type: audio/mpeg'); 
-				header("Content-Disposition: attachment; filename=\"captcha_audio.mp3\"");
-				header('Cache-Control: no-store, no-cache, must-revalidate');
-				header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
-				header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
-				header('Content-Length: ' . strlen($data));
-
-				echo $data;
-                Context::close();
-				exit();
-			}
-
-			function createCaptchaAudio($string)
-			{
-				$data = '';
-				$_audio = './addons/captcha/audio/F_%s.mp3';
-				for($i=0,$c=strlen($string);$i<$c;$i++)
-				{
-					$_data = FileHandler::readFile(sprintf($_audio, $string{$i}));
-
-					$start = rand(5, 68); // 해더 4바이트, 데이터 영역 64바이트 정도 랜덤하게 시작
-					$datalen = strlen($_data) - $start - 256; // 마지막 unchanged 256 바이트 
-
-					for($j=$start;$j<$datalen;$j+=64)
-					{
-						$ch = ord($_data{$j});
-						if($ch<9 || $ch>119) continue;
-						$_data{$j} = chr($ch+rand(-8,8));
-					}
-
-					$data .= $_data;
-				}
-
-				return $data;
-			}
-
-			function before_module_init_captchaCompare()
-			{
-				if($_SESSION['captcha_authed']) return false;
-
-                if(strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text'))) $_SESSION['captcha_authed'] = true;
-                else unset($_SESSION['captcha_authed']);
-
-                header("Content-Type: text/xml; charset=UTF-8");
-                header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-                header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-                header("Cache-Control: no-store, no-cache, must-revalidate");
-                header("Cache-Control: post-check=0, pre-check=0", false);
-                header("Pragma: no-cache");
-                print("<response>\r\n<error>0</error>\r\n<message>success</message>\r\n</response>");
-
-                Context::close();
-                exit();
-			}
-		}
-
-		$GLOBALS['__AddonCaptcha__'] = new AddonCaptcha;
-		$GLOBALS['__AddonCaptcha__']->setInfo($addon_info);
-	}
-
-	$oAddonCaptcha = &$GLOBALS['__AddonCaptcha__'];
-
-	if(method_exists(&$oAddonCaptcha, $called_position))
-	{
-		if(!call_user_func(array(&$oAddonCaptcha, $called_position), &$this)) return false;
-	}
-
-	$addon_act = Context::get('captcha_action');
-	if($addon_act && method_exists(&$oAddonCaptcha, $called_position.'_'.$addon_act))
-	{
-		if(!call_user_func(array(&$oAddonCaptcha, $called_position.'_'.$addon_act), &$this)) return false;
-	}
-
-?>
+<?php
+    if(!defined("__ZBXE__")) exit();
+
+    /**
+     * @file captcha.addon.php
+     * @author NHN (developers@xpressengine.com)
+     * @brief Captcha for a particular action
+	 * English alphabets and voice verification added
+     **/
+
+	if(!class_exists('AddonCaptcha'))
+	{
+		class AddonCaptcha
+		{
+			var $addon_info;
+
+			function setInfo(&$addon_info)
+			{
+				$this->addon_info = $addon_info;
+			}
+
+			function before_module_proc()
+			{
+			    if($this->addon_info->act_type == 'everytime' && $_SESSION['captcha_authed']) {
+			        unset($_SESSION['captcha_authed']);
+				}
+			}
+
+			function before_module_init(&$ModuleHandler)
+			{
+				$logged_info = Context::get('logged_info');
+				if($logged_info->is_admin == 'Y' || $logged_info->is_site_admin) return false;
+				if($this->addon_info->target != 'all' && Context::get('is_logged')) return false;
+				if($_SESSION['captcha_authed']) return false;
+
+				$type = Context::get('captchaType');
+
+				$target_acts = array('procBoardInsertDocument','procBoardInsertComment','procIssuetrackerInsertIssue','procIssuetrackerInsertHistory','procTextyleInsertComment');
+				if($this->addon_info->apply_find_account=='apply') $target_acts[] = 'procMemberFindAccount';
+				if($this->addon_info->apply_resend_auth_mail=='apply') $target_acts[] = 'procMemberResendAuthMail';
+				if($this->addon_info->apply_signup=='apply') $target_acts[] = 'procMemberInsert';
+
+				if(Context::getRequestMethod()!='XMLRPC' && Context::getRequestMethod()!=='JSON')
+				{
+					if($type == 'inline') {
+						$this->compareCaptcha();
+					}  else {
+						Context::addHtmlHeader('<script type="text/javascript"> var captchaTargetAct = new Array("'.implode('","',$target_acts).'"); </script>');
+						Context::loadFile(array('./addons/captcha/captcha.js', 'body', '', null), true);
+					}
+				}
+
+				// compare session when calling actions such as writing a post or a comment on the board/issue tracker module
+				if(!$_SESSION['captcha_authed'] && in_array(Context::get('act'), $target_acts)) {
+					Context::loadLang('./addons/captcha/lang');
+					$ModuleHandler->error = "captcha_denied";
+				}
+
+				return true;
+			}
+
+			function createKeyword()
+			{
+				$type = Context::get('captchaType');
+				if ($type == 'inline' && $_SESSION['captcha_keyword']) return;
+
+				$arr = range('A','Y');
+				shuffle($arr);
+				$arr = array_slice($arr,0,6);
+                $_SESSION['captcha_keyword'] = join('', $arr);
+			}
+
+			function before_module_init_setCaptchaSession()
+			{
+				if($_SESSION['captcha_authed']) return false;
+				// Load language files
+
+				Context::loadLang(_XE_PATH_.'addons/captcha/lang');
+				// Generate keywords
+
+				$this->createKeyword();
+
+                $target = Context::getLang('target_captcha');
+                header("Content-Type: text/xml; charset=UTF-8");
+                header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+                header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+                header("Cache-Control: no-store, no-cache, must-revalidate");
+                header("Cache-Control: post-check=0, pre-check=0", false);
+                header("Pragma: no-cache");
+                printf("<response>\r\n <error>0</error>\r\n <message>success</message>\r\n <about_captcha><![CDATA[%s]]></about_captcha>\r\n <captcha_reload><![CDATA[%s]]></captcha_reload>\r\n <captcha_play><![CDATA[%s]]></captcha_play>\r\n <cmd_input><![CDATA[%s]]></cmd_input>\r\n <cmd_cancel><![CDATA[%s]]></cmd_cancel>\r\n </response>"
+						,Context::getLang('about_captcha')
+						,Context::getLang('captcha_reload')
+						,Context::getLang('captcha_play')
+						,Context::getLang('cmd_input')
+						,Context::getLang('cmd_cancel')
+						);
+                Context::close();
+                exit();
+			}
+
+			function before_module_init_captchaImage()
+			{
+				if($_SESSION['captcha_authed']) return false;
+				if(Context::get('renew')) $this->createKeyword();
+
+			    $keyword = $_SESSION['captcha_keyword'];
+				$im = $this->createCaptchaImage($keyword);
+
+                header("Cache-Control: ");
+                header("Pragma: ");
+                header("Content-Type: image/png");
+
+				imagepng($im);
+				imagedestroy($im);
+
+				Context::close();
+                exit();
+			}
+
+			function createCaptchaImage($string)
+			{
+				$arr = array();
+				for($i=0,$c=strlen($string);$i<$c;$i++) $arr[] = $string{$i};
+				// Font site
+
+				$w = 18;
+				$h = 25;
+				// Character length
+
+				$c = count($arr);
+				// Character image
+
+				$im = array();
+				// Create an image by total size
+
+				$im[] = imagecreate(($w+2)*count($arr), $h);
+
+				$deg = range(-30,30);
+				shuffle($deg);
+				// Create an image for each letter
+
+				foreach($arr as $i => $str)
+				{
+					$im[$i+1] = @imagecreate($w, $h);
+					$background_color = imagecolorallocate($im[$i+1], 255, 255, 255);
+					$text_color = imagecolorallocate($im[$i+1], 0, 0, 0);
+					// Control font size
+
+					$ran = range(1,20);
+					shuffle($ran);
+
+					if(function_exists('imagerotate'))
+					{
+						imagestring($im[$i+1], (array_pop($ran)%3)+3, 2, (array_pop($ran)%8),  $str, $text_color);
+						$im[$i+1] = imagerotate($im[$i+1], array_pop($deg), 0);
+
+						$background_color = imagecolorallocate($im[$i+1], 255, 255, 255);
+						imagecolortransparent($im[$i+1], $background_color);
+					}
+					else
+					{
+						imagestring($im[$i+1], (array_pop($ran)%3)+3, 2, (array_pop($ran)%4), $str, $text_color);
+					}
+				}
+
+				// Combine images of each character
+
+				for($i=1;$i<count($im);$i++)
+				{
+					imagecopy($im[0],$im[$i],(($w+2)*($i-1)),0,0,0,$w,$h);
+					imagedestroy($im[$i]);
+				}
+				// Larger image
+
+				$big_count = 2;
+				$big = imagecreatetruecolor(($w+2)*$big_count*$c, $h*$big_count);
+				imagecopyresized($big, $im[0], 0, 0, 0, 0, ($w+2)*$big_count*$c, $h*$big_count, ($w+2)*$c, $h);
+				imagedestroy($im[0]);
+
+				if(function_exists('imageantialias')) imageantialias($big,true);
+				// Background line
+
+				$line_color = imagecolorallocate($big, 0, 0, 0);
+
+				$w = ($w+2)*$big_count*$c;
+				$h = $h*$big_count;
+				$d = array_pop($deg);
+
+				for($i=-abs($d);$i<$h+abs($d);$i=$i+7) imageline($big,0,$i+$d,$w,$i,$line_color);
+
+				$x = range(0,($w-10));
+				shuffle($x);
+
+				for($i=0;$i<200;$i++) imagesetpixel($big,$x[$i]%$w,$x[$i+1]%$h,$line_color);
+
+				return $big;
+			}
+
+			function before_module_init_captchaAudio()
+			{
+				if($_SESSION['captcha_authed']) return false;
+
+				$keyword = strtoupper($_SESSION['captcha_keyword']);
+				$data = $this->createCaptchaAudio($keyword);
+
+				header('Content-type: audio/mpeg');
+				header("Content-Disposition: attachment; filename=\"captcha_audio.mp3\"");
+				header('Cache-Control: no-store, no-cache, must-revalidate');
+				header('Expires: Sun, 1 Jan 2000 12:00:00 GMT');
+				header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . 'GMT');
+				header('Content-Length: ' . strlen($data));
+
+				echo $data;
+                Context::close();
+				exit();
+			}
+
+			function createCaptchaAudio($string)
+			{
+				$data = '';
+				$_audio = './addons/captcha/audio/F_%s.mp3';
+				for($i=0,$c=strlen($string);$i<$c;$i++)
+				{
+					$_data = FileHandler::readFile(sprintf($_audio, $string{$i}));
+
+					$start = rand(5, 68); // Random start in 4-byte header and 64 byte data
+					$datalen = strlen($_data) - $start - 256; // Last unchanged 256 bytes
+
+					for($j=$start;$j<$datalen;$j+=64)
+					{
+						$ch = ord($_data{$j});
+						if($ch<9 || $ch>119) continue;
+						$_data{$j} = chr($ch+rand(-8,8));
+					}
+
+					$data .= $_data;
+				}
+
+				return $data;
+			}
+
+			function compareCaptcha()
+			{
+				if($_SESSION['captcha_authed']) return true;
+
+                if(strtoupper($_SESSION['captcha_keyword']) == strtoupper(Context::get('secret_text'))) {
+					$_SESSION['captcha_authed'] = true;
+					return true;
+				}
+
+				unset($_SESSION['captcha_authed']);
+
+				return false;
+			}
+
+			function before_module_init_captchaCompare()
+			{
+				if(!$this->compareCaptcha()) return false;
+
+                header("Content-Type: text/xml; charset=UTF-8");
+                header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+                header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+                header("Cache-Control: no-store, no-cache, must-revalidate");
+                header("Cache-Control: post-check=0, pre-check=0", false);
+                header("Pragma: no-cache");
+                print("<response>\r\n<error>0</error>\r\n<message>success</message>\r\n</response>");
+
+                Context::close();
+                exit();
+			}
+
+			function inlineDisplay()
+			{
+				unset($_SESSION['captcha_authed']);
+				$this->createKeyword();
+
+				$swfURL = getUrl().'addons/captcha/swf/play.swf';
+				Context::unloadFile('./addons/captcha/captcha.js');
+				Context::loadFile(array('./addons/captcha/inline_captcha.js','body'));
+
+				global $lang;
+
+				$tags=<<<EOD
+<img src="%s" id="captcha_image" alt="CAPTCHA" width="240" height="50" style="width:240px; height:50px; border:1px solid #b0b0b0" />
+<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=7,0,0,0" width="0" height="0" id="captcha_audio" align="middle">
+	<param name="allowScriptAccess" value="always" />
+	<param name="quality" value="high" />
+	<param name="movie" value="%s" />
+	<param name="wmode" value="window" />
+	<param name="allowFullScreen" value="false">
+	<param name="bgcolor" value="#fffff" />
+	<embed src="%s" quality="high" wmode="window" allowFullScreen="false" bgcolor="#ffffff" width="0" height="0" name="captcha_audio" align="middle" allowScriptAccess="always" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
+</object>
+<button type="button" class="captchaReload text">%s</button>
+<button type="button" class="captchaPlay text">%s</button><br />
+<input type="hidden" name="captchaType" value="inline" />
+<input name="secret_text" type="text" id="secret_text" />
+EOD;
+				$tags = sprintf($tags, getUrl('captcha_action','captchaImage', 'rand', mt_rand(10000, 99999))
+								, $swfURL
+								, $swfURL
+								, $lang->reload
+								, $lang->play);
+				return $tags;
+			}
+		}
+
+		$GLOBALS['__AddonCaptcha__'] = new AddonCaptcha;
+		$GLOBALS['__AddonCaptcha__']->setInfo($addon_info);
+		Context::set('oCaptcha', &$GLOBALS['__AddonCaptcha__']);
+	}
+
+	$oAddonCaptcha = &$GLOBALS['__AddonCaptcha__'];
+
+	if(method_exists($oAddonCaptcha, $called_position))
+	{
+		if(!call_user_func_array(array(&$oAddonCaptcha, $called_position), array(&$this))) return false;
+	}
+
+	$addon_act = Context::get('captcha_action');
+	if($addon_act && method_exists($oAddonCaptcha, $called_position.'_'.$addon_act))
+	{
+		if(!call_user_func_array(array(&$oAddonCaptcha, $called_position.'_'.$addon_act), array(&$this))) return false;
+	}
+
+?>
diff --git a/addons/captcha/conf/info.xml b/addons/captcha/conf/info.xml
index e2353c16b..904baabf2 100644
--- a/addons/captcha/conf/info.xml
+++ b/addons/captcha/conf/info.xml
@@ -1,222 +1,221 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">Captcha 애드온</title>
-    <title xml:lang="en">CAPTCHA</title>
-    <title xml:lang="vi">Captcha Addon</title>
-    <title xml:lang="zh-CN">验证码插件</title>
-    <title xml:lang="jp">Captchaアドオン</title>
-    <title xml:lang="ru">Аддон Captcha</title>
-    <title xml:lang="zh-TW">圖形驗證</title>
-    <description xml:lang="ko">
-        프로그램 글 등록기를 막기 위해 게시판/ issueTracker에서 글/ 댓글을 입력하려 할 때 알파벳을 입력해야 글/댓글이 입력되는 애드온 입니다.
-        로그인하지 않은 경우에만 해당됩니다.
-    </description>
-    <description xml:lang="en">
-        To block spam written by programs, let users to choose a suitable image to text when writing a posting or comment.
-        This addon applies only to not-logged-in users.
-    </description>
-    <description xml:lang="vi">
-        Addon này tạo ra một hình ảnh xác nhận khi đăng kí, gửi bài, hay viết bình luận nếu thành viên không đăng nhập.
-        Addon này chỉ hoạt động khi được kích hoạt.
-    </description>
-    <description xml:lang="zh-CN">
-        为了解决互联网垃圾而开发的验证码机制。
-	非登录用户发布话题或评论时将会弹出验证图片选择框，选择正确的图片才可以正常发布(适用于版面/issueTracker)。
-    </description>
-    <description xml:lang="jp">
-        ボット(bot)がプログラムによるスパム行為を防ぐために、掲示板／issueTrackerで書き込み・コメントを登録する際、ランダムな文字や数字の列を画面に表示し、表示されたものと一致した情報を入力した時、登録が出来るようにするアドオンです。
-        ログインしてない時だけ、動作します。
-    </description>
-    <description xml:lang="ru">
-        To block spam written by programs, let users to choose a suitable image to text when writing a posting or comment.
-        This addon applies only to not-logged-in users.
-    </description>
-    <description xml:lang="zh-TW">
-        可防止機器人程式的垃圾留言，非用戶要發表主題或回覆時，必須要輸入正確圖片中所顯示的文字才能發表。
-    </description>
-    <version>1.0</version>
-    <date>2010-08-19</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-		<name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-		<name xml:lang="en">NHN</name>
-		<name xml:lang="ru">NHN</name>
-        <name xml:lang="vi">NHN</name>
-    </author>
-
-    <extra_vars>
-        <var name="target" type="select">
-            <title xml:lang="ko">Captcha 표시 대상</title>
-		    <title xml:lang="zh-CN">应用对象</title>
-		    <title xml:lang="jp">Captchaを表示する対象</title>
-		    <title xml:lang="zh-TW">選擇目標</title>
-            <title xml:lang="en">Captcha Target</title>
-            <title xml:lang="ru">Captcha Target</title>
-            <title xml:lang="vi">Mục tiêu Captcha hiển thị</title>
-            <description xml:lang="ko">글/댓글 등록시 captcha가 동작할 대상을 정할 수 있습니다. 관리자는 무조건 제외됩니다</description>
-	    	<description xml:lang="zh-CN">可以指定验证码应用对象(管理员除外)。</description>
-		    <description xml:lang="jp">管理者を除き、書き込み・コメントを入力する際にcaptchaイメージを見せる対象を設定します。</description>
-		    <description xml:lang="zh-TW">除了管理員，可以選擇圖形驗證應用的對象。</description>
-            <description xml:lang="en">You may specify targets CAPTCHA work. It's not applied when administrator writes.</description>
-            <description xml:lang="ru">You may specify targets CAPTCHA work. It's not applied when administrator writes.</description>
-            <description xml:lang="vi">Khi gửi bài, bình luận, Capcha sẽ hiển thị để xác nhận hành động của người sử dụng. Chức năng này không hoạt động với người quản lý.</description>
-            <options value="">
-                <title xml:lang="ko">로그인하지 않은 사용자</title>
-				<title xml:lang="zh-CN">非登录用户</title>
-				<title xml:lang="jp">ログインしてないユーザー</title>
-				<title xml:lang="zh-TW">非用戶</title>
-                <title xml:lang="en">Not logged-in users</title>
-				<title xml:lang="ru">Not logged-in users</title>
-                <title xml:lang="vi">Người dùng chưa đăng nhập</title>
-            </options>
-            <options value="all">
-                <title xml:lang="ko">모든 사용자</title>
-				<title xml:lang="zh-CN">所有用户</title>
-				<title xml:lang="jp">すべてのユーザー</title>
-            	<title xml:lang="zh-TW">所有用戶</title>
-                <title xml:lang="en">All users</title>
-				<title xml:lang="ru">All users</title>
-                <title xml:lang="vi">Tất cả mọi người</title>
-            </options>
-        </var>
-        <var name="act_type" type="select">
-            <title xml:lang="ko">동작 방식</title>
-            <title xml:lang="zh-CN">验证方式</title>
-            <title xml:lang="jp">動作方式</title>
-            <title xml:lang="zh-TW">驗證模式</title>
-            <title xml:lang="en">How it works</title>
-            <title xml:lang="ru">How it works</title>
-            <title xml:lang="vi">Sử dụng</title>
-            <description xml:lang="ko">"1번만 동작"을 선택하시면 1번만 동작후 상태를 저장해서 다음부터 물어보지 않고 그렇지 않으면 매번 물어보게 됩니다</description>
-	    	<description xml:lang="zh-CN">"一次"就是每个IP只出现一次验证。</description>
-            <description xml:lang="jp">「1回だけ表示」を選択すると、最初だけ動作した後、その情報を記憶して次回からはCaptchaを見せないようにします。また、もう一つのオプションは毎回Captchaを表示します。</description>
-            <description xml:lang="zh-TW">選擇"單次"，下次不會再顯示；選擇"每次"則會一直顯示。</description>
-            <description xml:lang="en">If you choose "Once", CAPTCHA works only once for the user by storing status. Otherwise, this addon would show an image every time the user writes.</description>
-	    	<description xml:lang="ru">If you choose "Once", CAPTCHA works only once for the user by storing status. Otherwise, this addon would show an image every time the user writes.</description>
-            <description xml:lang="vi">Nếu chọn "Chỉ một lần" thì sau lần hiển thị đó Capcha sẽ không hiển thị với người sử dụng đó nữa.</description>
-            <options value="onetime">
-                <title xml:lang="ko">1번만 동작</title>
-                <title xml:lang="zh-CN">一次</title>
-                <title xml:lang="jp">1回だけ表示</title>
-                <title xml:lang="zh-TW">單次</title>
-                <title xml:lang="vi">Chỉ một lần</title>
-                <title xml:lang="en">once</title>
-				<title xml:lang="ru">1 раз</title>
-            </options>
-            <options value="everytime">
-                <title xml:lang="ko">매번 동작</title>
-                <title xml:lang="zh-CN">每次</title>
-                <title xml:lang="jp">毎回表示</title>
-                <title xml:lang="zh-TW">每次</title>
-                <title xml:lang="en">every time</title>
-				<title xml:lang="ru">каждый раз</title>
-                <title xml:lang="vi">Luôn sử dụng</title>
-            </options>
-        </var>
-        <var name="apply_find_account" type="select">
-                <title xml:lang="ko">비밀번호 찾기 적용</title>
-                <title xml:lang="zh-CN">应用到查找密码功能</title>
-                <title xml:lang="jp">비밀번호 찾기 적용</title>
-                <title xml:lang="zh-TW">忘記密碼</title>
-                <title xml:lang="en">applying to an action finding account</title>
-				<title xml:lang="ru">applying to an action finding account</title>
-                <title xml:lang="vi">Khi lấy lại mật khẩu</title>
-                <description xml:lang="ko">적용으로 하시면 비밀번호 찾기 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
-                <description xml:lang="zh-CN">启用此项功能可以有效地拦截以查找密码名义发送的垃圾邮件。</description>
-                <description xml:lang="jp">적용으로 하시면 비밀번호찾기 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
-                <description xml:lang="zh-TW">開啟功能後在忘記密碼時會顯示驗證碼。</description>
-                <description xml:lang="en">If you set this option as apply, CAPTCHA will work for finding account action, too.</description>
-				<description xml:lang="ru">If you set this option as apply, CAPTCHA will work for finding account action, too.</description>
-                <description xml:lang="vi">Nếu áp dụng, khi thành viên cần lấy lại mật khẩu khi lỡ quên, Capcha sẽ hiện thị để xác nhận việc này.</description>
-            <options value="">
-                <title xml:lang="ko">적용하지 않음</title>
-                <title xml:lang="zh-CN">不启用</title>
-                <title xml:lang="jp">적용하지 않음</title>
-                <title xml:lang="zh-TW">關閉</title>
-                <title xml:lang="en">Not apply</title>
-				<title xml:lang="ru">Not apply</title>
-                <title xml:lang="vi">Không áp dụng</title>
-            </options>
-            <options value="apply">
-                <title xml:lang="ko">적용</title>
-                <title xml:lang="zh-CN">启用</title>
-                <title xml:lang="jp">적용</title>
-                <title xml:lang="zh-TW">開啟</title>
-                <title xml:lang="en">Apply</title>
-				<title xml:lang="ru">Apply</title>
-                <title xml:lang="vi">Áp dụng</title>
-            </options>
-        </var>
-        <var name="apply_resend_auth_mail" type="select">
-            <title xml:lang="ko">인증 메일 재발송 적용</title>
-            <title xml:lang="zh-CN">应用到认证邮件重新发送功能</title>
-            <title xml:lang="jp">인증 메일 재발송 적용</title>
-            <title xml:lang="zh-TW">重寄認證信</title>
-            <title xml:lang="en">apply to an action resending authmail</title>
-	    	<title xml:lang="ru">apply to an action resending authmail</title>
-            <title xml:lang="vi">Khi lấy lại mã kích hoạt</title>
-            <description xml:lang="ko">적용으로 하시면 인증 메일 재발송 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
-            <description xml:lang="zh-CN">启用此项功能可以有效地拦截以重新发送认证邮件名义发送的垃圾邮件。</description>
-            <description xml:lang="jp">적용으로 하시면 인증 메일 재발송 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
-            <description xml:lang="zh-TW">開啟功能後在重寄認證信時會顯示驗證碼。</description>
-            <description xml:lang="en">If you set this option as apply, CAPTCHA will work for resending authmail action, too.</description>
-	    	<description xml:lang="ru">If you set this option as apply, CAPTCHA will work for resending authmail action, too.</description>
-            <description xml:lang="vi">Nếu áp dụng, khi thành viên cần lấy lại mã kích hoạt thành viên, Capcha sẽ hiện thị để xác nhận việc này.</description>
-            <options value="">
-                <title xml:lang="ko">적용하지 않음</title>
-                <title xml:lang="zh-CN">不启用</title>
-                <title xml:lang="jp">적용하지 않음</title>
-                <title xml:lang="zh-TW">關閉</title>
-                <title xml:lang="en">Not apply</title>
-				<title xml:lang="ru">Not apply</title>
-                <title xml:lang="vi">Không áp dụng</title>
-            </options>
-            <options value="apply">
-                <title xml:lang="ko">적용</title>
-                <title xml:lang="zh-CN">启用</title>
-                <title xml:lang="jp">적용</title>
-                <title xml:lang="zh-TW">開啟</title>
-                <title xml:lang="en">Apply</title>
-				<title xml:lang="ru">Apply</title>
-                <title xml:lang="vi">Áp dụng</title>
-            </options>
-        </var>
-        <var name="apply_signup" type="select">
-            <title xml:lang="ko">회원 가입 적용</title>
-            <title xml:lang="zh-CN">应用到用户注册表单</title>
-            <title xml:lang="jp">인증 메일 재발송 적용</title>
-            <title xml:lang="zh-TW">會員註冊</title>
-            <title xml:lang="en">Apply to member signup</title>
-            <title xml:lang="ru">Apply to member signup</title>
-            <title xml:lang="vi">Apply to member signup</title>
-            <description xml:lang="ko">적용으로 하시면 회원가입 기능에도 적용되어 악의적인 봇(또는 프로그램)의 회원가입을 막을 수 있습니다.</description>
-            <description xml:lang="zh-CN">启用此项功能可以有效地拦截自动注册软件的施虐。</description>
-            <description xml:lang="jp">적용으로 하시면 회원가입 기능에도 적용되어 악의적인 봇(또는 프로그램)의 회원가입을 막을 수 있습니다.</description>
-            <description xml:lang="zh-TW">開啟功能後在註冊時會顯示驗證碼。</description>
-            <description xml:lang="en">If you set this option as apply, CAPTCHA will work for signup action, too.</description>
-            <description xml:lang="ru">If you set this option as apply, CAPTCHA will work for signup action, too.</description>
-            <description xml:lang="vi">If you set this option as apply, CAPTCHA will work for signup action, too.</description>
-            <options value="">
-                <title xml:lang="ko">적용하지 않음</title>
-                <title xml:lang="zh-CN">不启用</title>
-                <title xml:lang="jp">적용하지 않음</title>
-                <title xml:lang="zh-TW">關閉</title>
-                <title xml:lang="en">Not apply</title>
-				<title xml:lang="ru">Not apply</title>
-                <title xml:lang="vi">Không áp dụng</title>
-            </options>
-            <options value="apply">
-                <title xml:lang="ko">적용</title>
-                <title xml:lang="zh-CN">启用</title>
-                <title xml:lang="jp">적용</title>
-                <title xml:lang="zh-TW">開啟</title>
-                <title xml:lang="en">Apply</title>
-				<title xml:lang="ru">Apply</title>
-                <title xml:lang="vi">Áp dụng</title>
-            </options>
-        </var>
-    </extra_vars>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">Captcha 애드온</title>
+    <title xml:lang="en">CAPTCHA</title>
+    <title xml:lang="vi">Captcha Addon</title>
+    <title xml:lang="zh-CN">验证码插件</title>
+    <title xml:lang="jp">Captchaアドオン</title>
+    <title xml:lang="ru">Аддон Captcha</title>
+    <title xml:lang="zh-TW">圖形驗證</title>
+    <description xml:lang="ko">
+        프로그램 글 등록기를 막기 위해 게시판/ issueTracker에서 글/ 댓글을 입력하려 할 때 알파벳을 입력해야 글/댓글이 입력되는 애드온 입니다.
+        로그인하지 않은 경우에만 해당됩니다.
+    </description>
+    <description xml:lang="en">
+        This addon helps to prevent spam messages to be posted by requesting non-logged-in users to type characters displayed in the image before submitting comments or posts.
+    </description>
+    <description xml:lang="vi">
+        Addon này tạo ra một hình ảnh xác nhận khi đăng kí, gửi bài, hay viết bình luận nếu thành viên không đăng nhập.
+        Addon này chỉ hoạt động khi được kích hoạt.
+    </description>
+    <description xml:lang="zh-CN">
+        为了解决互联网垃圾而开发的验证码机制。
+	非登录用户发布话题或评论时将会弹出验证图片选择框，选择正确的图片才可以正常发布(适用于版面/issueTracker)。
+    </description>
+    <description xml:lang="jp">
+        ボット(bot)がプログラムによるスパム行為を防ぐために、掲示板／issueTrackerで書き込み・コメントを登録する際、ランダムな文字や数字の列を画面に表示し、表示されたものと一致した情報を入力した時、登録が出来るようにするアドオンです。
+        ログインしてない時だけ、動作します。
+    </description>
+    <description xml:lang="ru">
+        To block spam written by programs, let users to choose a suitable image to text when writing a posting or comment.
+        This addon applies only to not-logged-in users.
+    </description>
+    <description xml:lang="zh-TW">
+        可防止機器人程式的垃圾留言，非用戶要發表主題或回覆時，必須要輸入正確圖片中所顯示的文字才能發表。
+    </description>
+    <version>1.0</version>
+    <date>2010-08-19</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+		<name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+		<name xml:lang="en">NHN</name>
+		<name xml:lang="ru">NHN</name>
+        <name xml:lang="vi">NHN</name>
+    </author>
+
+    <extra_vars>
+        <var name="target" type="select">
+            <title xml:lang="ko">Captcha 표시 대상</title>
+		    <title xml:lang="zh-CN">应用对象</title>
+		    <title xml:lang="jp">Captchaを表示する対象</title>
+		    <title xml:lang="zh-TW">選擇目標</title>
+            <title xml:lang="en">Captcha Target</title>
+            <title xml:lang="ru">Captcha Target</title>
+            <title xml:lang="vi">Mục tiêu Captcha hiển thị</title>
+            <description xml:lang="ko">글/댓글 등록시 captcha가 동작할 대상을 정할 수 있습니다. 관리자는 무조건 제외됩니다</description>
+	    	<description xml:lang="zh-CN">可以指定验证码应用对象(管理员除外)。</description>
+		    <description xml:lang="jp">管理者を除き、書き込み・コメントを入力する際にcaptchaイメージを見せる対象を設定します。</description>
+		    <description xml:lang="zh-TW">除了管理員，可以選擇圖形驗證應用的對象。</description>
+            <description xml:lang="en">You can specify if CAPTCHA should be displayed when posting an article or comment. It will not apply to administrators.</description>
+            <description xml:lang="ru">You may specify targets CAPTCHA work. It's not applied when administrator writes.</description>
+            <description xml:lang="vi">Khi gửi bài, bình luận, Capcha sẽ hiển thị để xác nhận hành động của người sử dụng. Chức năng này không hoạt động với người quản lý.</description>
+            <options value="">
+                <title xml:lang="ko">로그인하지 않은 사용자</title>
+				<title xml:lang="zh-CN">非登录用户</title>
+				<title xml:lang="jp">ログインしてないユーザー</title>
+				<title xml:lang="zh-TW">非用戶</title>
+                <title xml:lang="en">Not logged-in users</title>
+				<title xml:lang="ru">Not logged-in users</title>
+                <title xml:lang="vi">Người dùng chưa đăng nhập</title>
+            </options>
+            <options value="all">
+                <title xml:lang="ko">모든 사용자</title>
+				<title xml:lang="zh-CN">所有用户</title>
+				<title xml:lang="jp">すべてのユーザー</title>
+            	<title xml:lang="zh-TW">所有用戶</title>
+                <title xml:lang="en">All users</title>
+				<title xml:lang="ru">All users</title>
+                <title xml:lang="vi">Tất cả mọi người</title>
+            </options>
+        </var>
+        <var name="act_type" type="select">
+            <title xml:lang="ko">동작 방식</title>
+            <title xml:lang="zh-CN">验证方式</title>
+            <title xml:lang="jp">動作方式</title>
+            <title xml:lang="zh-TW">驗證模式</title>
+            <title xml:lang="en">How it works</title>
+            <title xml:lang="ru">How it works</title>
+            <title xml:lang="vi">Sử dụng</title>
+            <description xml:lang="ko">"1번만 동작"을 선택하시면 1번만 동작후 상태를 저장해서 다음부터 물어보지 않고 그렇지 않으면 매번 물어보게 됩니다</description>
+	    	<description xml:lang="zh-CN">"一次"就是每个IP只出现一次验证。</description>
+            <description xml:lang="jp">「1回だけ表示」を選択すると、最初だけ動作した後、その情報を記憶して次回からはCaptchaを見せないようにします。また、もう一つのオプションは毎回Captchaを表示します。</description>
+            <description xml:lang="zh-TW">選擇"單次"，下次不會再顯示；選擇"每次"則會一直顯示。</description>
+            <description xml:lang="en">If you choose "Once", CAPTCHA works only once for the user by storing status. Otherwise, this addon would show an image every time the user writes.</description>
+	    	<description xml:lang="ru">If you choose "Once", CAPTCHA works only once for the user by storing status. Otherwise, this addon would show an image every time the user writes.</description>
+            <description xml:lang="vi">Nếu chọn "Chỉ một lần" thì sau lần hiển thị đó Capcha sẽ không hiển thị với người sử dụng đó nữa.</description>
+            <options value="onetime">
+                <title xml:lang="ko">1번만 동작</title>
+                <title xml:lang="zh-CN">一次</title>
+                <title xml:lang="jp">1回だけ表示</title>
+                <title xml:lang="zh-TW">單次</title>
+                <title xml:lang="vi">Chỉ một lần</title>
+                <title xml:lang="en">once</title>
+				<title xml:lang="ru">1 раз</title>
+            </options>
+            <options value="everytime">
+                <title xml:lang="ko">매번 동작</title>
+                <title xml:lang="zh-CN">每次</title>
+                <title xml:lang="jp">毎回表示</title>
+                <title xml:lang="zh-TW">每次</title>
+                <title xml:lang="en">every time</title>
+				<title xml:lang="ru">каждый раз</title>
+                <title xml:lang="vi">Luôn sử dụng</title>
+            </options>
+        </var>
+        <var name="apply_find_account" type="select">
+                <title xml:lang="ko">비밀번호 찾기 적용</title>
+                <title xml:lang="zh-CN">应用到查找密码功能</title>
+                <title xml:lang="jp">비밀번호 찾기 적용</title>
+                <title xml:lang="zh-TW">忘記密碼</title>
+                <title xml:lang="en">applying to an action finding account</title>
+				<title xml:lang="ru">applying to an action finding account</title>
+                <title xml:lang="vi">Khi lấy lại mật khẩu</title>
+                <description xml:lang="ko">적용으로 하시면 비밀번호 찾기 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
+                <description xml:lang="zh-CN">启用此项功能可以有效地拦截以查找密码名义发送的垃圾邮件。</description>
+                <description xml:lang="jp">적용으로 하시면 비밀번호찾기 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
+                <description xml:lang="zh-TW">開啟功能後在忘記密碼時會顯示驗證碼。</description>
+                <description xml:lang="en">If you set this option as apply, CAPTCHA will work for finding account action, too.</description>
+				<description xml:lang="ru">If you set this option as apply, CAPTCHA will work for finding account action, too.</description>
+                <description xml:lang="vi">Nếu áp dụng, khi thành viên cần lấy lại mật khẩu khi lỡ quên, Capcha sẽ hiện thị để xác nhận việc này.</description>
+            <options value="">
+                <title xml:lang="ko">적용하지 않음</title>
+                <title xml:lang="zh-CN">不启用</title>
+                <title xml:lang="jp">적용하지 않음</title>
+                <title xml:lang="zh-TW">關閉</title>
+                <title xml:lang="en">Not apply</title>
+				<title xml:lang="ru">Not apply</title>
+                <title xml:lang="vi">Không áp dụng</title>
+            </options>
+            <options value="apply">
+                <title xml:lang="ko">적용</title>
+                <title xml:lang="zh-CN">启用</title>
+                <title xml:lang="jp">적용</title>
+                <title xml:lang="zh-TW">開啟</title>
+                <title xml:lang="en">Apply</title>
+				<title xml:lang="ru">Apply</title>
+                <title xml:lang="vi">Áp dụng</title>
+            </options>
+        </var>
+        <var name="apply_resend_auth_mail" type="select">
+            <title xml:lang="ko">인증 메일 재발송 적용</title>
+            <title xml:lang="zh-CN">应用到认证邮件重新发送功能</title>
+            <title xml:lang="jp">인증 메일 재발송 적용</title>
+            <title xml:lang="zh-TW">重寄認證信</title>
+            <title xml:lang="en">apply to an action resending authmail</title>
+	    	<title xml:lang="ru">apply to an action resending authmail</title>
+            <title xml:lang="vi">Khi lấy lại mã kích hoạt</title>
+            <description xml:lang="ko">적용으로 하시면 인증 메일 재발송 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
+            <description xml:lang="zh-CN">启用此项功能可以有效地拦截以重新发送认证邮件名义发送的垃圾邮件。</description>
+            <description xml:lang="jp">적용으로 하시면 인증 메일 재발송 기능에도 적용되어 악의적인 봇(또는 프로그램)에 의한 메일 발송을 막을 수 있습니다.</description>
+            <description xml:lang="zh-TW">開啟功能後在重寄認證信時會顯示驗證碼。</description>
+            <description xml:lang="en">If you set this option as apply, CAPTCHA will work for resending authmail action, too.</description>
+	    	<description xml:lang="ru">If you set this option as apply, CAPTCHA will work for resending authmail action, too.</description>
+            <description xml:lang="vi">Nếu áp dụng, khi thành viên cần lấy lại mã kích hoạt thành viên, Capcha sẽ hiện thị để xác nhận việc này.</description>
+            <options value="">
+                <title xml:lang="ko">적용하지 않음</title>
+                <title xml:lang="zh-CN">不启用</title>
+                <title xml:lang="jp">적용하지 않음</title>
+                <title xml:lang="zh-TW">關閉</title>
+                <title xml:lang="en">Not apply</title>
+				<title xml:lang="ru">Not apply</title>
+                <title xml:lang="vi">Không áp dụng</title>
+            </options>
+            <options value="apply">
+                <title xml:lang="ko">적용</title>
+                <title xml:lang="zh-CN">启用</title>
+                <title xml:lang="jp">적용</title>
+                <title xml:lang="zh-TW">開啟</title>
+                <title xml:lang="en">Apply</title>
+				<title xml:lang="ru">Apply</title>
+                <title xml:lang="vi">Áp dụng</title>
+            </options>
+        </var>
+        <var name="apply_signup" type="select">
+            <title xml:lang="ko">회원 가입 적용</title>
+            <title xml:lang="zh-CN">应用到用户注册表单</title>
+            <title xml:lang="jp">인증 메일 재발송 적용</title>
+            <title xml:lang="zh-TW">會員註冊</title>
+            <title xml:lang="en">Apply to member signup</title>
+            <title xml:lang="ru">Apply to member signup</title>
+            <title xml:lang="vi">Apply to member signup</title>
+            <description xml:lang="ko">적용으로 하시면 회원가입 기능에도 적용되어 악의적인 봇(또는 프로그램)의 회원가입을 막을 수 있습니다.</description>
+            <description xml:lang="zh-CN">启用此项功能可以有效地拦截自动注册软件的施虐。</description>
+            <description xml:lang="jp">적용으로 하시면 회원가입 기능에도 적용되어 악의적인 봇(또는 프로그램)의 회원가입을 막을 수 있습니다.</description>
+            <description xml:lang="zh-TW">開啟功能後在註冊時會顯示驗證碼。</description>
+            <description xml:lang="en">If you set this option as apply, CAPTCHA will work for signup action, too.</description>
+            <description xml:lang="ru">If you set this option as apply, CAPTCHA will work for signup action, too.</description>
+            <description xml:lang="vi">If you set this option as apply, CAPTCHA will work for signup action, too.</description>
+            <options value="">
+                <title xml:lang="ko">적용하지 않음</title>
+                <title xml:lang="zh-CN">不启用</title>
+                <title xml:lang="jp">적용하지 않음</title>
+                <title xml:lang="zh-TW">關閉</title>
+                <title xml:lang="en">Not apply</title>
+				<title xml:lang="ru">Not apply</title>
+                <title xml:lang="vi">Không áp dụng</title>
+            </options>
+            <options value="apply">
+                <title xml:lang="ko">적용</title>
+                <title xml:lang="zh-CN">启用</title>
+                <title xml:lang="jp">적용</title>
+                <title xml:lang="zh-TW">開啟</title>
+                <title xml:lang="en">Apply</title>
+				<title xml:lang="ru">Apply</title>
+                <title xml:lang="vi">Áp dụng</title>
+            </options>
+        </var>
+    </extra_vars>
+</addon>
diff --git a/addons/captcha/inline_captcha.js b/addons/captcha/inline_captcha.js
new file mode 100644
index 000000000..26ff64a1b
--- /dev/null
+++ b/addons/captcha/inline_captcha.js
@@ -0,0 +1,17 @@
+jQuery(function($){
+	$('button.captchaPlay')
+		.click(function(){
+			var swf = document['captcha_audio'] || window['captcha_audio'];
+			var audio = current_url.setQuery('captcha_action','captchaAudio').setQuery('rand', (new Date).getTime());
+
+			if(swf.length > 1) swf = swf[0];
+
+			$('input[type=text]#secret_text').focus();
+			swf.setSoundTarget(audio,'1');
+		});
+
+	$('button.captchaReload')
+		.click(function(){
+			$("#captcha_image").attr("src", current_url.setQuery('captcha_action','captchaImage').setQuery('rand', (new Date).getTime()).setQuery('renew',1));
+		});
+});
diff --git a/addons/captcha/lang/en.lang.php b/addons/captcha/lang/en.lang.php
deleted file mode 100644
index e08259fde..000000000
--- a/addons/captcha/lang/en.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "Please type alphabets above in order. They are not case-sensitive.";
-	$lang->captcha_reload = 'Refresh Image';
-	$lang->captcha_play = 'Play sound of words';
-	$lang->captcha_denied = 'You have typed wrong alphabets.';
-?>
diff --git a/addons/captcha/lang/jp.lang.php b/addons/captcha/lang/jp.lang.php
deleted file mode 100644
index 791d6ad96..000000000
--- a/addons/captcha/lang/jp.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "위 영어 알파벳을 순서대로 입력해 주세요. 대소문자는 구분하지 않습니다.";
-	$lang->captcha_reload = '이미지 새로고침';
-	$lang->captcha_play = '음성으로 듣기';
-	$lang->captcha_denied = '잘못 입력하셨습니다';
-?>
diff --git a/addons/captcha/lang/ko.lang.php b/addons/captcha/lang/ko.lang.php
deleted file mode 100644
index 791d6ad96..000000000
--- a/addons/captcha/lang/ko.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "위 영어 알파벳을 순서대로 입력해 주세요. 대소문자는 구분하지 않습니다.";
-	$lang->captcha_reload = '이미지 새로고침';
-	$lang->captcha_play = '음성으로 듣기';
-	$lang->captcha_denied = '잘못 입력하셨습니다';
-?>
diff --git a/addons/captcha/lang/lang.xml b/addons/captcha/lang/lang.xml
new file mode 100644
index 000000000..d78bdd578
--- /dev/null
+++ b/addons/captcha/lang/lang.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="about_captcha">
+		<value xml:lang="ko"><![CDATA[위 영어 알파벳을 순서대로 입력해 주세요. 대소문자는 구분하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please type the characters you see in the picture above. They are not case-sensitive.]]></value>
+		<value xml:lang="jp"><![CDATA[アルファベット順に入力してください。大文字、小文字は区別しません。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請依序輸入圖片中的文字，不分大小寫。]]></value>
+	</item>
+	<item name="captcha_reload">
+		<value xml:lang="ko"><![CDATA[이미지 새로고침]]></value>
+		<value xml:lang="en"><![CDATA[Refresh the image]]></value>
+		<value xml:lang="jp"><![CDATA[リフレッシュ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更換]]></value>
+	</item>
+	<item name="captcha_play">
+		<value xml:lang="ko"><![CDATA[음성으로 듣기]]></value>
+		<value xml:lang="en"><![CDATA[Listen and type the letters you hear.]]></value>
+		<value xml:lang="en"><![CDATA[音声]]></value>
+		<value xml:lang="zh-TW"><![CDATA[播放]]></value>
+	</item>
+	<item name="captcha_denied">
+		<value xml:lang="ko"><![CDATA[잘못 입력하셨습니다]]></value>
+		<value xml:lang="en"><![CDATA[The characters you entered didn't match the word verification.]]></value>
+		<value xml:lang="jp"><![CDATA[正しく入力してください。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入錯誤]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/addons/captcha/lang/ru.lang.php b/addons/captcha/lang/ru.lang.php
deleted file mode 100644
index 791d6ad96..000000000
--- a/addons/captcha/lang/ru.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "위 영어 알파벳을 순서대로 입력해 주세요. 대소문자는 구분하지 않습니다.";
-	$lang->captcha_reload = '이미지 새로고침';
-	$lang->captcha_play = '음성으로 듣기';
-	$lang->captcha_denied = '잘못 입력하셨습니다';
-?>
diff --git a/addons/captcha/lang/vi.lang.php b/addons/captcha/lang/vi.lang.php
deleted file mode 100644
index 791d6ad96..000000000
--- a/addons/captcha/lang/vi.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "위 영어 알파벳을 순서대로 입력해 주세요. 대소문자는 구분하지 않습니다.";
-	$lang->captcha_reload = '이미지 새로고침';
-	$lang->captcha_play = '음성으로 듣기';
-	$lang->captcha_denied = '잘못 입력하셨습니다';
-?>
diff --git a/addons/captcha/lang/zh-CN.lang.php b/addons/captcha/lang/zh-CN.lang.php
deleted file mode 100644
index 791d6ad96..000000000
--- a/addons/captcha/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "위 영어 알파벳을 순서대로 입력해 주세요. 대소문자는 구분하지 않습니다.";
-	$lang->captcha_reload = '이미지 새로고침';
-	$lang->captcha_play = '음성으로 듣기';
-	$lang->captcha_denied = '잘못 입력하셨습니다';
-?>
diff --git a/addons/captcha/lang/zh-TW.lang.php b/addons/captcha/lang/zh-TW.lang.php
deleted file mode 100644
index 6e557f93d..000000000
--- a/addons/captcha/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-    $lang->about_captcha = "請依序輸入圖片中的文字，不分大小寫。";
-	$lang->captcha_reload = '更換';
-	$lang->captcha_play = '播放';
-	$lang->captcha_denied = '輸入錯誤';
-?>
diff --git a/addons/counter/conf/info.xml b/addons/counter/conf/info.xml
index 7114c2380..c3ea6dccb 100644
--- a/addons/counter/conf/info.xml
+++ b/addons/counter/conf/info.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">기본 카운터 애드온</title>
-    <title xml:lang="jp">アクセスカウンターアドオン</title>
-    <title xml:lang="zh-CN">网站访问统计</title>
-    <title xml:lang="en">Counter Addon</title>
-    <title xml:lang="vi">Counter Addon</title>
-    <title xml:lang="ge">Counter Addon</title>
-    <title xml:lang="es">Addon contador básico</title>
-    <title xml:lang="ru">Аддон счетчика</title>
-    <title xml:lang="zh-TW">網站訪問統計</title>
-    <description xml:lang="ko">
-        XE의 기본 카운터 모듈을 이용하여 접속 정보를 기록합니다.
-        이 애드온을 켜셔야 접속 정보 수집이 됩니다.
-    </description>
-    <description xml:lang="jp">
-        XEのアクセスカウンターモジュールで接続（アクセス）情報を記録します。
-        このアドオンを「使用」に設定してから、接続（アクセス）情報が記録されます。
-    </description>
-    <description xml:lang="zh-CN">
-        利用XE的网站访问统计模块记录网站访问信息。
-        把状态设置为"使用"时，才会记录网站访问信息.
-    </description>
-    <description xml:lang="en">
-        This addon logs access information based on the basic counter module within  XE.
-        The access information will be collected only if you turn on this addon.
-    </description>
-    <description xml:lang="vi">
-        Addon này sẽ tổng hợp tất cả những lượt truy cập vào Website qua Module Counter có sẵn bên trong XE.
-        Thông tin truy nhập chỉ được tập hợp khi bạn bật Addon này..
-    </description>
-    <description xml:lang="ge">
-        Dieses Addon-Logs Zugriff auf Informationen basiert auf den grundlegenden Zähler-Modul innerhalb  XE.
-        Der Zugang zu Informationen wird nur erhoben, wenn Sie über dieses Addon.
-    </description>
-    <description xml:lang="es">
-        Este addon contador básico de  XE permite llevar la información de acceso a la página web de los visitantes.
-        Es necesario activar este addon para agregar la información de acceso.
-    </description>
-    <description xml:lang="ru">
-        Этот аддон пишет в лог информацию о доступе к сайту, основанную на базовом модуле счетчика в  XE.
-        Для сбора информации необходимо включить этот аддон.
-    </description>
-    <description xml:lang="zh-TW">
-        使用XE的網站訪問統計模組記錄網站訪問資料。
-        將狀態設置成"使用"時，才會紀錄網站訪問資料。
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">기본 카운터 애드온</title>
+    <title xml:lang="jp">アクセスカウンターアドオン</title>
+    <title xml:lang="zh-CN">网站访问统计</title>
+    <title xml:lang="en">Counter Addon</title>
+    <title xml:lang="vi">Counter Addon</title>
+    <title xml:lang="ge">Counter Addon</title>
+    <title xml:lang="es">Addon contador básico</title>
+    <title xml:lang="ru">Аддон счетчика</title>
+    <title xml:lang="zh-TW">網站訪問統計</title>
+    <description xml:lang="ko">
+        XE의 기본 카운터 모듈을 이용하여 접속 정보를 기록합니다.
+        이 애드온을 켜셔야 접속 정보 수집이 됩니다.
+    </description>
+    <description xml:lang="jp">
+        XEのアクセスカウンターモジュールで接続（アクセス）情報を記録します。
+        このアドオンを「使用」に設定してから、接続（アクセス）情報が記録されます。
+    </description>
+    <description xml:lang="zh-CN">
+        利用XE的网站访问统计模块记录网站访问信息。
+        把状态设置为"使用"时，才会记录网站访问信息.
+    </description>
+    <description xml:lang="en">
+        This addon logs access information based on the basic counter module within XE.
+        The access information will be collected only if you enable this addon.
+    </description>
+    <description xml:lang="vi">
+        Addon này sẽ tổng hợp tất cả những lượt truy cập vào Website qua Module Counter có sẵn bên trong XE.
+        Thông tin truy nhập chỉ được tập hợp khi bạn bật Addon này..
+    </description>
+    <description xml:lang="ge">
+        Dieses Addon-Logs Zugriff auf Informationen basiert auf den grundlegenden Zähler-Modul innerhalb  XE.
+        Der Zugang zu Informationen wird nur erhoben, wenn Sie über dieses Addon.
+    </description>
+    <description xml:lang="es">
+        Este addon contador básico de  XE permite llevar la información de acceso a la página web de los visitantes.
+        Es necesario activar este addon para agregar la información de acceso.
+    </description>
+    <description xml:lang="ru">
+        Этот аддон пишет в лог информацию о доступе к сайту, основанную на базовом модуле счетчика в  XE.
+        Для сбора информации необходимо включить этот аддон.
+    </description>
+    <description xml:lang="zh-TW">
+        使用XE的網站訪問統計模組記錄網站訪問資料。
+        將狀態設置成"使用"時，才會紀錄網站訪問資料。
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/counter/counter.addon.php b/addons/counter/counter.addon.php
index d46ad7b9e..3d6c8115e 100644
--- a/addons/counter/counter.addon.php
+++ b/addons/counter/counter.addon.php
@@ -1,14 +1,14 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file counter.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 카운터 애드온
-     **/
-    // called_position가 before_display_content 일 경우 실행
-    if(Context::isInstalled() && $called_position == 'before_module_init' && Context::get('module')!='admin' && Context::getResponseMethod() == 'HTML') {
-        $oCounterController = &getController('counter');
-        $oCounterController->procCounterExecute();
-    }
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file counter.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Counter add-on
+ **/
+// Execute if called_position is before_display_content
+if(Context::isInstalled() && $called_position == 'before_module_init' && Context::get('module')!='admin' && Context::getResponseMethod() == 'HTML') {
+	$oCounterController = &getController('counter');
+	$oCounterController->counterExecute();
+}
+?>
diff --git a/addons/member_communication/conf/info.xml b/addons/member_communication/conf/info.xml
index 25f3b7677..8fc13b5a7 100644
--- a/addons/member_communication/conf/info.xml
+++ b/addons/member_communication/conf/info.xml
@@ -1,58 +1,58 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">커뮤니케이션</title>
-    <title xml:lang="jp">コミュニケーション</title>
-    <title xml:lang="zh-CN">会员交流</title>
-    <title xml:lang="en">Communication</title>
-    <title xml:lang="vi">Truyền thông</title>
-    <title xml:lang="ge">커뮤니케이션</title>
-    <title xml:lang="es">커뮤니케이션</title>
-    <title xml:lang="ru">Общение</title>
-    <title xml:lang="zh-TW">交流</title>
-    <description xml:lang="ko">
-        커뮤니케이션 모듈의 기능을 활성화 시켜 쪽지나 친구기능을 사용할 수 있도록 해줍니다.
-        쪽지, 친구기능등을 사용하기 위해서는 이 애드온을 사용으로 해주시면 됩니다.
-    </description>
-    <description xml:lang="jp">
-        メッセージ・友達機能を使うにはこのアドオンを「使用」にして下さい。
-    </description>
-    <description xml:lang="zh-CN">
-        此插件可激活短信箱及添加好友功能。
-    </description>
-    <description xml:lang="en">
-        This addon enables communication module in order to use message or friend function.
-        Please enable this addon in case you want to use those functions.
-    </description>
-    <description xml:lang="vi">
-        Addon này cho phép sử dụng Module truyền thông để sử dụng tin nhắn hay chức năng bạn bè.
-        Hãy kích hoạt nếu bạn muốn sử dụng chức năng này.
-    </description>
-    <description xml:lang="ge">
-        커뮤니케이션 모듈의 기능을 활성화 시켜 쪽지나 친구기능을 사용할 수 있도록 해줍니다.
-        쪽지, 친구기능등을 사용하기 위해서는 이 애드온을 사용으로 해주시면 됩니다.
-    </description>
-    <description xml:lang="es">
-        커뮤니케이션 모듈의 기능을 활성화 시켜 쪽지나 친구기능을 사용할 수 있도록 해줍니다.
-        쪽지, 친구기능등을 사용하기 위해서는 이 애드온을 사용으로 해주시면 됩니다.
-    </description>
-    <description xml:lang="ru">
-        Активизирует модуль Общение, позволяет использование сообщений между друзьями.
-    </description>
-    <description xml:lang="zh-TW">
-        讓會員擁有短訊和新增好友功能。
-    </description>
-    <version>0.1</version>
-    <date>2008-05-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">커뮤니케이션</title>
+    <title xml:lang="jp">コミュニケーション</title>
+    <title xml:lang="zh-CN">会员交流</title>
+    <title xml:lang="en">Communication</title>
+    <title xml:lang="vi">Truyền thông</title>
+    <title xml:lang="ge">커뮤니케이션</title>
+    <title xml:lang="es">커뮤니케이션</title>
+    <title xml:lang="ru">Общение</title>
+    <title xml:lang="zh-TW">交流</title>
+    <description xml:lang="ko">
+        커뮤니케이션 모듈의 기능을 활성화 시켜 쪽지나 친구기능을 사용할 수 있도록 해줍니다.
+        쪽지, 친구기능등을 사용하기 위해서는 이 애드온을 사용으로 해주시면 됩니다.
+    </description>
+    <description xml:lang="jp">
+        メッセージ・友達機能を使うにはこのアドオンを「使用」にして下さい。
+    </description>
+    <description xml:lang="zh-CN">
+        此插件可激活短信箱及添加好友功能。
+    </description>
+    <description xml:lang="en">
+        This addon enables the communication module in order to use messaging or friend functions.
+        Please enable this addon in case you want to use those functions.
+    </description>
+    <description xml:lang="vi">
+        Addon này cho phép sử dụng Module truyền thông để sử dụng tin nhắn hay chức năng bạn bè.
+        Hãy kích hoạt nếu bạn muốn sử dụng chức năng này.
+    </description>
+    <description xml:lang="ge">
+        커뮤니케이션 모듈의 기능을 활성화 시켜 쪽지나 친구기능을 사용할 수 있도록 해줍니다.
+        쪽지, 친구기능등을 사용하기 위해서는 이 애드온을 사용으로 해주시면 됩니다.
+    </description>
+    <description xml:lang="es">
+        커뮤니케이션 모듈의 기능을 활성화 시켜 쪽지나 친구기능을 사용할 수 있도록 해줍니다.
+        쪽지, 친구기능등을 사용하기 위해서는 이 애드온을 사용으로 해주시면 됩니다.
+    </description>
+    <description xml:lang="ru">
+        Активизирует модуль Общение, позволяет использование сообщений между друзьями.
+    </description>
+    <description xml:lang="zh-TW">
+        讓會員擁有短訊和新增好友功能。
+    </description>
+    <version>0.1</version>
+    <date>2008-05-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/member_communication/lang/en.lang.php b/addons/member_communication/lang/en.lang.php
deleted file mode 100644
index cc9cce249..000000000
--- a/addons/member_communication/lang/en.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = 'You have a new message. Do you want to check now?';
-?>
diff --git a/addons/member_communication/lang/es.lang.php b/addons/member_communication/lang/es.lang.php
deleted file mode 100644
index 51933d3f8..000000000
--- a/addons/member_communication/lang/es.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = 'Usted tiene un nuevo mensaje. Quiere comprobar ahora?';
-?>
diff --git a/addons/member_communication/lang/ge.lang.php b/addons/member_communication/lang/ge.lang.php
deleted file mode 100644
index d9b9dcb81..000000000
--- a/addons/member_communication/lang/ge.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = 'Sie haben eine neue Nachricht. Wollen Sie jetzt prüfen, ob?';
-?>
diff --git a/addons/member_communication/lang/jp.lang.php b/addons/member_communication/lang/jp.lang.php
deleted file mode 100644
index 7ff03c9fe..000000000
--- a/addons/member_communication/lang/jp.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = '%d個の新しいメッセージが届いています。 確認しますか？';
-?>
diff --git a/addons/member_communication/lang/ko.lang.php b/addons/member_communication/lang/ko.lang.php
deleted file mode 100644
index 697ef6d93..000000000
--- a/addons/member_communication/lang/ko.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = '%d개의 새로운 메시지가 도착하였습니다. 확인하시겠습니까?';
-?>
diff --git a/addons/member_communication/lang/lang.xml b/addons/member_communication/lang/lang.xml
new file mode 100644
index 000000000..0843743ac
--- /dev/null
+++ b/addons/member_communication/lang/lang.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="alert_new_message_arrived">
+		<value xml:lang="ko"><![CDATA[%d개의 새로운 메시지가 도착하였습니다. 확인하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[You have %d new message(s). Do you want to check it now?]]></value>
+		<value xml:lang="jp"><![CDATA[%d件の新しいメッセージがあります。確認しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您有新消息。要确认吗？]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您收到%d個新訊息。您想要檢視嗎?]]></value>
+		<value xml:lang="ru"><![CDATA[У Вас новые сообщения. Проверите сейчас?]]></value>
+		<value xml:lang="es"><![CDATA[Usted tiene un nuevo mensaje. Quiere comprobar ahora?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có một tin nhắn mới. bạn có muốn kiểm tra ngay bây giờ không?]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/addons/member_communication/lang/ru.lang.php b/addons/member_communication/lang/ru.lang.php
deleted file mode 100644
index 4e47c4c23..000000000
--- a/addons/member_communication/lang/ru.lang.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-	 
-    $lang->alert_new_message_arrived = 'У Вас новые сообщения. Проверите сейчас?';
-?>
diff --git a/addons/member_communication/lang/vi.lang.php b/addons/member_communication/lang/vi.lang.php
deleted file mode 100644
index 4015a8be0..000000000
--- a/addons/member_communication/lang/vi.lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-			
-    $lang->alert_new_message_arrived = 'Bạn có một tin nhắn mới. bạn có muốn kiểm tra ngay bây giờ không?';
-?>
diff --git a/addons/member_communication/lang/zh-CN.lang.php b/addons/member_communication/lang/zh-CN.lang.php
deleted file mode 100644
index 497b4ef68..000000000
--- a/addons/member_communication/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = '您有新消息。要确认吗？';
-?>
diff --git a/addons/member_communication/lang/zh-TW.lang.php b/addons/member_communication/lang/zh-TW.lang.php
deleted file mode 100644
index f2ffd16e8..000000000
--- a/addons/member_communication/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-    $lang->alert_new_message_arrived = '您收到%d個新訊息。您想要檢視嗎?';
-?>
diff --git a/addons/member_communication/member_communication.addon.php b/addons/member_communication/member_communication.addon.php
index c34822a62..519c7db47 100644
--- a/addons/member_communication/member_communication.addon.php
+++ b/addons/member_communication/member_communication.addon.php
@@ -1,85 +1,71 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file member_communication.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 사용자의 커뮤니케이션 기능을 활성화
-     *
-     * - 새로운 쪽지가 왔을 경우 팝업으로 띄움
-     * - MemberModel::getMemberMenu 호출시 대상이 회원일 경우 쪽지 보내기 기능 추가합니다.
-     * - MemberModel::getMemberMenu 호출시 친구 등록 메뉴를 추가합니다.
-     **/
-
-    // 비로그인 사용자면 중지
-    $logged_info = Context::get('logged_info');
-    if(!$logged_info) return;
-
-    /**
-     * 기능 수행 : 팝업 및 회원정보 보기에서 쪽지/친구 메뉴 추가. 시작할때 새쪽지가 왔는지 검사
-     **/
-    if($called_position == 'before_module_init' && $this->module != 'member') {
-
-        // 커뮤니케이션 모듈의 언어파일을 읽음
-        Context::loadLang('./modules/communication/lang');
-
-        // 회원 로그인 정보중에서 쪽지등의 메뉴를 추가
-        $oMemberController = &getController('member');
-        $oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
-        $oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
-
-        // 새로운 쪽지에 대한 플래그가 있으면 쪽지 보기 팝업 띄움
-        $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl);
-        $flag_file = sprintf('%s%s', $flag_path, $logged_info->member_srl);
-
-        if(file_exists($flag_file)) {
-            $new_message_count = FileHandler::readFile($flag_file);
-            FileHandler::removeFile($flag_file);
-            Context::loadLang('./addons/member_communication/lang');
-
-            $script =  sprintf('<script type="text/javascript"> jQuery(function() { if(confirm("%s")) { popopen("%s"); } }); </script>', sprintf(Context::getLang('alert_new_message_arrived'), $new_message_count), Context::getRequestUri().'?module=communication&act=dispCommunicationNewMessage');
-
-            Context::addHtmlHeader( $script );
-        }
-
-    /**
-     * 기능 수행 : 사용자 이름을 클릭시 요청되는 팝업메뉴의 메뉴에 쪽지 발송, 친구추가등의 링크 추가
-     **/
-    } elseif($called_position == 'before_module_proc' && $this->act == 'getMemberMenu') {
-
-        $oMemberController = &getController('member');
-        $member_srl = Context::get('target_srl');
-        $mid = Context::get('cur_mid');
-
-        // communication 모델 객체 생성
-        $oCommunicationModel = &getModel('communication');
-
-        // 자신이라면 쪽지함 보기 기능 추가
-        if($logged_info->member_srl == $member_srl) {
-
-            // 자신의 쪽지함 보기 기능 추가
-            $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', './modules/communication/tpl/images/icon_message_box.gif', 'self');
-
-            // 친구 목록 보기
-            $oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationFriend'), 'cmd_view_friend', './modules/communication/tpl/images/icon_friend_box.gif', 'self');
-
-        // 아니라면 쪽지 발송, 친구 등록 추가
-        } else {
-            // 대상 회원의 정보를 가져옴
-            $oMemberModel = &getModel('member'); 
-            $target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-            if(!$target_member_info->member_srl) return;
-
-            // 로그인된 사용자 정보를 구함
-            $logged_info = Context::get('logged_info');
-
-            // 쪽지 발송 메뉴를 만듬
-            if( $logged_info->is_admin == 'Y' || $target_member_info->allow_message =='Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
-                $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationSendMessage','receiver_srl',$member_srl), 'cmd_send_message', './modules/communication/tpl/images/icon_write_message.gif', 'popup');
-
-            // 친구 등록 메뉴를 만듬 (이미 등록된 친구가 아닐 경우)
-            if(!$oCommunicationModel->isAddedFriend($member_srl))
-                $oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', './modules/communication/tpl/images/icon_add_friend.gif', 'popup');
-        }
-    }
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file member_communication.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Promote user communication 
+ *
+ * - Pop-up the message if new message comes in
+ * - When calling MemberModel::getMemberMenu, feature to send a message is added
+ * - When caliing MemberModel::getMemberMenu, feature to add a friend is added
+ **/
+// Stop if non-logged-in user is
+$logged_info = Context::get('logged_info');
+if(!$logged_info) return;
+
+/**
+ * Message/Friend munus are added on the pop-up window and member profile. Check if a new message is received
+ **/
+if($called_position == 'before_module_init' && $this->module != 'member') {
+	// Load a language file from the communication module
+	Context::loadLang('./modules/communication/lang');
+	// Add menus on the member login information
+	$oMemberController = &getController('member');
+	$oMemberController->addMemberMenu('dispCommunicationFriend', 'cmd_view_friend');
+	$oMemberController->addMemberMenu('dispCommunicationMessages', 'cmd_view_message_box');
+	// Pop-up to display messages if a flag on new message is set
+	$flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl);
+	$flag_file = $flag_path.$logged_info->member_srl;
+
+	if(file_exists($flag_file)) {
+		$new_message_count = trim(FileHandler::readFile($flag_file));
+		FileHandler::removeFile($flag_file);
+		Context::loadLang('./addons/member_communication/lang');
+		Context::loadFile(array('./addons/member_communication/tpl/member_communication.js'), true);
+
+		$text   = preg_replace('@\r?\n@', '\\n', addslashes(Context::getLang('alert_new_message_arrived')));
+		$link   = Context::getRequestUri().'?module=communication&act=dispCommunicationNewMessage';
+		$script = "<script type=\"text/javascript\">jQuery(function(){ xeNotifyMessage('{$text}','{$new_message_count}'); });</script>";
+
+		Context::addHtmlFooter($script);
+	}
+} elseif($called_position == 'before_module_proc' && $this->act == 'getMemberMenu') {
+	$oMemberController = &getController('member');
+	$member_srl = Context::get('target_srl');
+	$mid = Context::get('cur_mid');
+	// Creates communication model object
+	$oCommunicationModel = &getModel('communication');
+	// Add a feature to display own message box. 
+	if($logged_info->member_srl == $member_srl) {
+		// Add your own viewing Note Template
+		$oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationMessages'), 'cmd_view_message_box', '', 'self');
+		// Display a list of friends
+		$oMemberController->addMemberPopupMenu(getUrl('','mid',$mid,'act','dispCommunicationFriend'), 'cmd_view_friend', '', 'self');
+	// If not, Add menus to send message and to add friends
+	} else {
+		// Get member information
+		$oMemberModel = &getModel('member'); 
+		$target_member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+		if(!$target_member_info->member_srl) return;
+		// Get logged-in user information
+		$logged_info = Context::get('logged_info');
+		// Add a menu for sending message
+		if( $logged_info->is_admin == 'Y' || $target_member_info->allow_message =='Y' || ($target_member_info->allow_message == 'F' && $oCommunicationModel->isFriend($member_srl)))
+			$oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationSendMessage','receiver_srl',$member_srl), 'cmd_send_message', '', 'popup');
+		// Add a menu for listing friends (if a friend is new)
+		if(!$oCommunicationModel->isAddedFriend($member_srl))
+			$oMemberController->addMemberPopupMenu(getUrl('','module','communication','act','dispCommunicationAddFriend','target_srl',$member_srl), 'cmd_add_friend', '', 'popup');
+	}
+}
+?>
diff --git a/addons/member_communication/tpl/member_communication.js b/addons/member_communication/tpl/member_communication.js
new file mode 100644
index 000000000..d2245efa0
--- /dev/null
+++ b/addons/member_communication/tpl/member_communication.js
@@ -0,0 +1,29 @@
+(function($){
+
+window.xeNotifyMessage = function(text, count){
+	var $bar;
+
+	$bar = $('div.notifyMessage');
+	if(!$bar.length) {
+		$bar = $('<div class="notifyMessage" />')
+			.hide()
+			.css({
+				position   : 'absolute',
+				background : '#ff0',
+				border     : '1px solid #990',
+				textAlign  : 'center'
+			})
+			.appendTo(document.body);
+	}
+
+	text = text.replace('%d', count);
+	h = $bar.html('<a href="'+current_url.setQuery('act','dispCommunicationMessages')+'">'+text+'</a>').height();
+	$bar.css('top', -h-4).show().animate({top:0});
+
+	// hide after 10 seconds
+	setTimeout(function(){
+		$bar.animate({top:-h-4}, function(){ $bar.hide() });
+	}, 10000);
+};
+
+})(jQuery);
diff --git a/addons/member_extra_info/conf/info.xml b/addons/member_extra_info/conf/info.xml
index 9a82ec315..f75c6d929 100644
--- a/addons/member_extra_info/conf/info.xml
+++ b/addons/member_extra_info/conf/info.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">회원 확장 정보 출력</title>
-    <title xml:lang="jp">会員情報拡張表示</title>
-    <title xml:lang="zh-CN">用户扩展信息</title>
-    <title xml:lang="en">Extra Member Info</title>
-    <title xml:lang="vi">Bổ xung thông tin thành viên</title>
-    <title xml:lang="ge">회원 확장 정보 출력</title>
-    <title xml:lang="es">회원 확장 정보 출력</title>
-    <title xml:lang="ru">Экстраинформация о пользователях</title>
-    <title xml:lang="zh-TW">用戶延伸資料</title>
-    <description xml:lang="ko">
-        회원이 등록한 이미지이름, 이미지마크를 사용하기 위해서는 이 애드온을 활성화 시키세요.
-    </description>
-    <description xml:lang="jp">
-        会員が登録したイメージニックネーム、イメージマークを使うためにはこのアドオンをオンにして下さい。
-    </description>
-    <description xml:lang="zh-CN">
-        此插件将把用户信息中的昵称图片，用户图标，签名等信息显示到页面当中。
-    </description>
-    <description xml:lang="en">
-        This addon displays a member's image name, image mark.
-    </description>
-    <description xml:lang="vi">
-        Addon này sẽ hiển thị hình ảnh thay thế tên và hình đánh dấu của thành viên.
-    </description>
-    <description xml:lang="ge">
-        This addon displays a member's image name, image mark.
-    </description>
-    <description xml:lang="es">
-        This addon displays a member's image name, image mark.
-    </description>
-    <description xml:lang="ru">
-        Аддон изображает имя, марку картинки пользователя.
-    </description>
-    <description xml:lang="zh-TW">
-        可將用戶資料中的暱稱圖片、用戶圖示、簽名檔等資料顯示到頁面當中。
-    </description>
-    <version>0.2</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">회원 확장 정보 출력</title>
+    <title xml:lang="jp">会員情報拡張表示</title>
+    <title xml:lang="zh-CN">用户扩展信息</title>
+    <title xml:lang="en">Extra Member Info</title>
+    <title xml:lang="vi">Bổ xung thông tin thành viên</title>
+    <title xml:lang="ge">회원 확장 정보 출력</title>
+    <title xml:lang="es">회원 확장 정보 출력</title>
+    <title xml:lang="ru">Экстраинформация о пользователях</title>
+    <title xml:lang="zh-TW">用戶延伸資料</title>
+    <description xml:lang="ko">
+        회원이 등록한 이미지이름, 이미지마크를 사용하기 위해서는 이 애드온을 활성화 시키세요.
+    </description>
+    <description xml:lang="jp">
+        会員が登録したイメージニックネーム、イメージマークを使うためにはこのアドオンをオンにして下さい。
+    </description>
+    <description xml:lang="zh-CN">
+        此插件将把用户信息中的昵称图片，用户图标，签名等信息显示到页面当中。
+    </description>
+    <description xml:lang="en">
+        This addon displays a member's image name, image mark.
+    </description>
+    <description xml:lang="vi">
+        Addon này sẽ hiển thị hình ảnh thay thế tên và hình đánh dấu của thành viên.
+    </description>
+    <description xml:lang="ge">
+        This addon displays a member's image name, image mark.
+    </description>
+    <description xml:lang="es">
+        This addon displays a member's image name, image mark.
+    </description>
+    <description xml:lang="ru">
+        Аддон изображает имя, марку картинки пользователя.
+    </description>
+    <description xml:lang="zh-TW">
+        可將用戶資料中的暱稱圖片、用戶圖示、簽名檔等資料顯示到頁面當中。
+    </description>
+    <version>0.2</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index 585cc3f86..a107faaa4 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -1,23 +1,21 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file image_name.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 사용자의 이미지이름/ 이미지마크등을 출력
-     *
-     * <div class="member_회원번호">....</div> 로 정의가 된 부분을 찾아 회원번호를 구해서 
-     * 이미지이름, 이미지마크가 있는지를 확인하여 있으면 내용을 변경해버립니다.
-     **/
-
-    /**
-     * 출력되기 바로 직전일 경우에 이미지이름/이미지마크등을 변경
-     **/
-    if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
-
-    // 회원 이미지이름/ 마크/ 찾아서 대체할 함수를 담고 있는 파일을 include
-    require_once('./addons/member_extra_info/member_extra_info.lib.php');
-
-    // 1. 출력문서중에서 <div class="member_번호">content</div>를 찾아 MemberController::transImageName() 를 이용하여 이미지이름/마크로 변경
-    $output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file image_name.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Display user image name/image mark
+ *
+ * Find member_srl in the part with <div class="member_MemberSerialNumber"> .... </div>
+ * Check if ther is image name and image mark. Then change it.
+ **/
+
+/**
+ * Just before displaying, change image name/ image mark
+ **/
+if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
+// Include a file having functions to replace member image name/mark
+require_once('./addons/member_extra_info/member_extra_info.lib.php');
+// 1. Find a part <div class="member_MemberSerialNumber"> content </div> in the output document, change it to image name/mark by using MemberController::transImageName()
+$output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'memberTransImageName', $output);
+?>
diff --git a/addons/member_extra_info/member_extra_info.lib.php b/addons/member_extra_info/member_extra_info.lib.php
index 75fe982ea..cf6af6c29 100644
--- a/addons/member_extra_info/member_extra_info.lib.php
+++ b/addons/member_extra_info/member_extra_info.lib.php
@@ -1,22 +1,19 @@
 <?php
     /**
-     * @brief div 또는 span에 member_번호 가 있을때 해당 회원 번호에 맞는 이미지이름이나 닉이미지를 대체
+     * @brief If member_srl exists in the div or span, replace to image name or nick image for each member_srl
      **/
     function memberTransImageName($matches) {
-
-        // 회원번호를 추출하여 0보다 찾으면 본문중 text만 return
+        // If member_srl < 0, then return text only in the body
         $member_srl = $matches[3];
         if($member_srl<0) return $matches[5];
 
         $site_module_info = Context::get('site_module_info');
         $oMemberModel = &getModel('member');
         $group_image = $oMemberModel->getGroupImageMark($member_srl,$site_module_info->site_srl);
-
-        // 회원이 아닐경우(member_srl = 0) 본문 전체를 return
+        // If member_srl=o(not a member), return the entire body
         $nick_name = $matches[5];
         if(!$member_srl) return $matches[0];
-
-        // 전역변수에 미리 설정한 데이터가 있다면 그걸 return
+        // If pre-defined data in the global variablesm return it
         if(!$GLOBALS['_transImageNameList'][$member_srl]->cached) {
             $GLOBALS['_transImageNameList'][$member_srl]->cached = true;
             $image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
@@ -29,14 +26,17 @@
             $image_name_file = $GLOBALS['_transImageNameList'][$member_srl]->image_name_file;
             $image_mark_file = $GLOBALS['_transImageNameList'][$member_srl]->image_mark_file;
         }
-
-        // 이미지이름이나 마크가 없으면 원본 정보를 세팅
+        // If image name and mark doesn't exist, set the original information
         if(!$image_name_file && !$image_mark_file && !$group_image) return $matches[0];
 
-        if($image_name_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id: %s" style="vertical-align:middle;margin-right:3px" />', Context::getRequestUri(),$image_name_file, strip_tags($nick_name), strip_tags($nick_name));
-        if($image_mark_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id : %s" style="vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(),$image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
+		// check member_config
+		
+		$config = $oMemberModel->getMemberConfig();
 
-        if($group_image) $nick_name = sprintf('<img src="%s" border="0" style="vertical-align:middle;margin-right:3px" alt="%s" title="%s" />%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);
+        if($config->image_name == 'Y' && $image_name_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id: %s" style="vertical-align:middle;margin-right:3px" />', Context::getRequestUri(),$image_name_file, strip_tags($nick_name), strip_tags($nick_name));
+        if($config->image_mark == 'Y' && $image_mark_file) $nick_name = sprintf('<img src="%s%s" border="0" alt="id: %s" title="id : %s" style="vertical-align:middle;margin-right:3px"/>%s', Context::getRequestUri(),$image_mark_file, strip_tags($nick_name), strip_tags($nick_name), $nick_name);
+
+        if($group_image) $nick_name = sprintf('<img src="%s" border="0" style="max-height:16px;vertical-align:middle;margin-right:3px" alt="%s" title="%s" />%s', $group_image->src, $group_image->title, $group_image->description, $nick_name);
 
 
         $orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
diff --git a/addons/mobile/classes/hdml.class.php b/addons/mobile/classes/hdml.class.php
index 1c3ee4262..fbad40d06 100644
--- a/addons/mobile/classes/hdml.class.php
+++ b/addons/mobile/classes/hdml.class.php
@@ -1,103 +1,103 @@
-<?php
-    /**
-     * HDML Library ver 0.1
-     * @author NHN (developers@xpressengine.com)
-     **/
-    class wap extends mobileXE {
-
-        /**
-         * @brief constructor
-         **/
-        function wap() {
-            parent::mobileXE();
-        }
-
-        /**
-         * @brief hdml 헤더 출력
-         **/
-        function printHeader() {
-            header("Content-Type:text/x-hdml; charset=".$this->charset);
-            header("Cache-Control: no-store, no-cache, must-revalidate");
-            header("Cache-Control: post-check=0, pre-check=0", false);
-            header("Pragma: no-cache");
-
-            print '<hdml version=3.0 ttl=0 markable=true>';
-            print "\n";
-            print $this->hasChilds()?'<choice name=main>':'<display>';
-            print "\n";
-
-            if($this->upperUrl) {
-                $url = $this->upperUrl;
-                printf('<action type=soft1 task=go dest="%s" label="%s">%s', $url->url, $url->text, "\n");
-            }
-        }
-
-        /**
-         * @brief 제목을 출력
-         **/
-        function printTitle() {
-            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-            printf('<b>&lt;%s%s&gt;%s', $this->title,$titlePageStr,"\n");
-        }
-
-        /**
-         * @brief 내용을 출력
-         * hasChilds()가 있으면 목록형을 그렇지 않으면 컨텐츠를 출력
-         **/
-        function printContent() {
-            if($this->hasChilds()) {
-                foreach($this->getChilds() as $key => $val) {
-                    if(!$val['link']) continue;
-                    printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
-                }
-            } else {
-                printf('<wrap>%s<br>%s', $this->getContent(),"\n");
-            } 
-        }
-
-        /**
-         * @brief 버튼을 출력함 
-         **/
-        function printBtn() {
-            // 메뉴 형식
-            if($this->hasChilds()) {
-                if($this->nextUrl) {
-                    $url = $this->nextUrl;
-                    printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
-                }
-                if($this->prevUrl) {
-                    $url = $this->prevUrl;
-                    printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
-                }
-                if($this->homeUrl) {
-                    $url = $this->homeUrl;
-                    printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
-                }
-            // 컨텐츠 형식
-            } else {
-                if($this->nextUrl) {
-                    $url = $this->nextUrl;
-                    printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
-                }
-                if($this->prevUrl) {
-                    $url = $this->prevUrl;
-                    printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
-                }
-                if($this->homeUrl) {
-                    $url = $this->homeUrl;
-                    printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
-                }
-            }
-        }
-
-        /**
-         * @brief 푸터 정보를 출력
-         **/
-        function printFooter() {
-            print $this->hasChilds()?'</choice>':'</display>';
-            print "\n";
-            print("</hdml>");
-        }
-
-    }
-?>
+<?php
+    /**
+     * HDML Library ver 0.1
+     * @author NHN (developers@xpressengine.com)
+     **/
+    class wap extends mobileXE {
+
+        /**
+         * @brief constructor
+         **/
+        function wap() {
+            parent::mobileXE();
+        }
+
+        /**
+         * @brief hdml header output
+         **/
+        function printHeader() {
+            header("Content-Type:text/x-hdml; charset=".$this->charset);
+            header("Cache-Control: no-store, no-cache, must-revalidate");
+            header("Cache-Control: post-check=0, pre-check=0", false);
+            header("Pragma: no-cache");
+
+            print '<hdml version=3.0 ttl=0 markable=true>';
+            print "\n";
+            print $this->hasChilds()?'<choice name=main>':'<display>';
+            print "\n";
+
+            if($this->upperUrl) {
+                $url = $this->upperUrl;
+                printf('<action type=soft1 task=go dest="%s" label="%s">%s', $url->url, $url->text, "\n");
+            }
+        }
+
+        /**
+         * @brief Output title
+         **/
+        function printTitle() {
+            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+            printf('<b>&lt;%s%s&gt;%s', $this->title,$titlePageStr,"\n");
+        }
+
+        /**
+         * @brief Output information
+         * hasChilds() if there is a list of content types, otherwise output
+         **/
+        function printContent() {
+            if($this->hasChilds()) {
+                foreach($this->getChilds() as $key => $val) {
+                    if(!$val['link']) continue;
+                    printf('<ce task=go label="%s" dest="%s">%s%s',Context::getLang('cmd_select'), $val['href'], $val['text'], "\n");
+                }
+            } else {
+                printf('<wrap>%s<br>%s', $this->getContent(),"\n");
+            } 
+        }
+
+        /**
+         * @brief Button to output
+         **/
+        function printBtn() {
+            // Menu Types
+            if($this->hasChilds()) {
+                if($this->nextUrl) {
+                    $url = $this->nextUrl;
+                    printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
+                }
+                if($this->prevUrl) {
+                    $url = $this->prevUrl;
+                    printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
+                }
+                if($this->homeUrl) {
+                    $url = $this->homeUrl;
+                    printf('<ce task=go label="%s" dest="%s">%s%s', $url->text, $url->url, $url->text, "\n");
+                }
+            // Content Types
+            } else {
+                if($this->nextUrl) {
+                    $url = $this->nextUrl;
+                    printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
+                }
+                if($this->prevUrl) {
+                    $url = $this->prevUrl;
+                    printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
+                }
+                if($this->homeUrl) {
+                    $url = $this->homeUrl;
+                    printf('<a task=gosub label="%s" dest="%s">%s</a>', $url->text, $url->url, $url->text);
+                }
+            }
+        }
+
+        /**
+         * @brief Footer information output
+         **/
+        function printFooter() {
+            print $this->hasChilds()?'</choice>':'</display>';
+            print "\n";
+            print("</hdml>");
+        }
+
+    }
+?>
diff --git a/addons/mobile/classes/mhtml.class.php b/addons/mobile/classes/mhtml.class.php
index 5b1b55ce6..a03ffb20b 100644
--- a/addons/mobile/classes/mhtml.class.php
+++ b/addons/mobile/classes/mhtml.class.php
@@ -1,82 +1,80 @@
-<?php
-    /**
-     * mhtml Library ver 0.1
-     * @author NHN (developers@xpressengine.com) / lang_select : misol
-     **/
-    class wap extends mobileXE {
-
-        /**
-         * @brief constructor
-         **/
-        function wap() {
-            parent::mobileXE();
-        }
-
-        /**
-         * @brief hdml 헤더 출력
-         **/
-        function printHeader() {
-            print("<html><head>\n");
-            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-            printf("<title>%s%s</title></head><body>\n", htmlspecialchars($this->title),htmlspecialchars($titlePageStr));
-        }
-
-        // 제목을 출력
-        function printTitle() {
-            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-            printf('&lt;%s%s&gt;<br>%s', htmlspecialchars($this->title),htmlspecialchars($titlePageStr),"\n");
-        }
-
-        /**
-         * @brief 내용을 출력
-         * hasChilds()가 있으면 목록형을 그렇지 않으면 컨텐츠를 출력
-         **/
-        function printContent() {
-            if($this->hasChilds()) {
-                foreach($this->getChilds() as $key => $val) {
-                    if(!$val['link']) continue;
-                    printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
-                    if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
-                }
-            } else {
-                print(str_replace('<br/>','<br>',$this->getContent())."\n");
-            }
-            print "<hr><br>";
-        }
-
-        /**
-         * @brief 버튼을 출력함
-         **/
-        function printBtn() {
-            if($this->nextUrl) {
-                $url = $this->nextUrl;
-                printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
-            }
-            if($this->prevUrl) {
-                $url = $this->prevUrl;
-                printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
-            }
-            // 언어선택
-            if(!parent::isLangChange()){
-                $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-                printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
-            }
-            else {
-                printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
-            }
-            if($this->upperUrl) {
-                $url = $this->upperUrl;
-                printf('<btn href="%s" name="%s">%s', $url->url, $url->text, "\n");
-            }
-            if($this->homeUrl) {
-                $url = $this->homeUrl;
-                printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");
-            }
-        }
-
-        // 푸터 정보를 출력
-        function printFooter() {
-            print("</body></html>\n");
-        }
-    }
-?>
+<?php
+    /**
+     * mhtml Library ver 0.1
+     * @author NHN (developers@xpressengine.com) / lang_select : misol
+     **/
+    class wap extends mobileXE {
+
+        /**
+         * @brief constructor
+         **/
+        function wap() {
+            parent::mobileXE();
+        }
+
+        /**
+         * @brief hdml header output
+         **/
+        function printHeader() {
+            print("<html><head>\n");
+            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+            printf("<title>%s%s</title></head><body>\n", htmlspecialchars($this->title),htmlspecialchars($titlePageStr));
+        }
+        // Output title
+        function printTitle() {
+            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+            printf('&lt;%s%s&gt;<br>%s', htmlspecialchars($this->title),htmlspecialchars($titlePageStr),"\n");
+        }
+
+        /**
+         * @brief Output information
+         * hasChilds() if there is a list of content types, otherwise output
+         **/
+        function printContent() {
+            if($this->hasChilds()) {
+                foreach($this->getChilds() as $key => $val) {
+                    if(!$val['link']) continue;
+                    printf('<a href="%s" accesskey="%s">%s</a><br>%s', $val['href'], $this->getNo(), $val['text'], "\n");
+                    if($val['extra']) printf("<br>%s\n",str_replace('<br/>','<br>',$val['extra']));
+                }
+            } else {
+                print(str_replace('<br/>','<br>',$this->getContent())."\n");
+            }
+            print "<hr><br>";
+        }
+
+        /**
+         * @brief Button to output
+         **/
+        function printBtn() {
+            if($this->nextUrl) {
+                $url = $this->nextUrl;
+                printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
+            }
+            if($this->prevUrl) {
+                $url = $this->prevUrl;
+                printf('<a href="%s">%s</a><br>%s', $url->url, $url->text, "\n");
+            }
+            // Select Language
+            if(!parent::isLangChange()){
+                $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
+                printf('<a href="%s">%s</a><br>%s', $url, 'Language : '.Context::getLang('select_lang'), "\n");
+            }
+            else {
+                printf('<a href="%s">%s</a><br>%s', Context::get('return_uri'), Context::getLang('lang_return'), "\n");
+            }
+            if($this->upperUrl) {
+                $url = $this->upperUrl;
+                printf('<btn href="%s" name="%s">%s', $url->url, $url->text, "\n");
+            }
+            if($this->homeUrl) {
+                $url = $this->homeUrl;
+                printf('<a btn="%s" href="%s">%s</a><br>%s', $url->text, $url->url, $url->text, "\n");
+            }
+        }
+        // Footer information output
+        function printFooter() {
+            print("</body></html>\n");
+        }
+    }
+?>
diff --git a/addons/mobile/classes/mobile.class.php b/addons/mobile/classes/mobile.class.php
index e6f7f6435..bd460da87 100644
--- a/addons/mobile/classes/mobile.class.php
+++ b/addons/mobile/classes/mobile.class.php
@@ -1,598 +1,565 @@
-<?php
-    /**
-     * Mobile XE Library Class ver 0.1
-     * @author NHN (developers@xpressengine.com) / lang_select : misol
-     * @brief WAP 태그 출력을 위한 XE 라이브러리
-     **/
-
-    class mobileXE {
-
-        // 기본 url
-        var $homeUrl = NULL;
-        var $upperUrl = NULL;
-        var $nextUrl = NULL;
-        var $prevUrl = NULL;
-        var $etcBtn = NULL;
-
-        // 메뉴 네비게이션을 위한 변수
-        var $childs = null;
-
-        // 기본 변수
-        var $title = NULL;
-        var $content = NULL;
-        var $mobilePage = 0;
-        var $totalPage = 1;
-        var $charset = 'UTF-8';
-        var $no = 0;
-
-        // 네비게이션 관련 변수
-        var $menu = null;
-        var $listed_items = null;
-        var $node_list = null;
-        var $index_mid = null;
-
-        // Navigation On/ Off 상태 값
-        var $navigationMode = 0;
-
-        // 현재 요청된 XE 모듈 정보 
-        var $module_info = null;
-
-        // 현재 실행중인 모듈의 instance
-        var $oModule = null;
-
-        // Deck size
-        var $deckSize = 1024;
-
-        // 언어 설정 변경
-        var $languageMode = 0;
-        var $lang = null;
-        /**
-         * @brief getInstance
-         **/
-        function &getInstance() {
-            static $instance = null;
-
-            if(!$instance) {
-
-                $browserType = mobileXE::getBrowserType();
-                if(!$browserType) return;
-
-                $class_file = sprintf('%saddons/mobile/classes/%s.class.php', _XE_PATH_, $browserType);
-                require_once($class_file);
-
-                // 모바일 언어설정 로드(쿠키가 안되어 생각해낸 방법...-캐시파일 재생성을 클릭하면 초기화된다..)
-                $this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-                if($this->lang) {
-                    $lang_supported = Context::get('lang_supported');
-                    $this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
-                    if(isset($lang_supported[$this->lang])) Context::setLangType($this->lang);
-                }
-                Context::loadLang(_XE_PATH_.'addons/mobile/lang');
-
-                $instance = new wap();
-
-                $mobilePage = (int)Context::get('mpage');
-                if(!$mobilePage) $mobilePage = 1;
-
-                $instance->setMobilePage($mobilePage);
-
-            }
-
-            return $instance;
-        }
-
-        /**
-         * @brief constructor
-         **/
-        function mobileXE() {
-            // navigation mode 체크
-            if(Context::get('nm')) {
-                $this->navigationMode = 1;
-                $this->cmid = (int)Context::get('cmid');
-            }
-
-            if(Context::get('lcm')) {
-                $this->languageMode = 1;
-                $this->lang = Context::get('sel_lang');
-            }
-        }
-
-        /**
-         * @brief navigation mode 체크
-         * navigationMode 세팅과 모듈 정보의 menu_srl이 있어야 navigation mode = true로 return
-         **/
-        function isNavigationMode() {
-            return ($this->navigationMode && $this->module_info->menu_srl)?true:false;
-        }
-
-        /**
-         * @brief langchange mode 체크
-         * languageMode 세팅 있어야 true return
-         **/
-        function isLangChange() {
-            if($this->languageMode) return true;
-            else return false;
-        }
-
-        /**
-         * @brief 언어 설정
-         * 쿠키가 안되기 때문에 휴대전화마다 고유한 파일로 언어설정을 저장하는 파일 생성
-         **/
-        function setLangType() {
-            $lang_supported = Context::get('lang_supported');
-            // 언어 변수가 있는지 확인하고 변수가 유효한지 확인
-            if($this->lang && isset($lang_supported[$this->lang])) {
-                $langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-                if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-                $langbuff = '<?php /**'.$this->lang.'**/ ?>';
-                FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
-            }
-        }
-
-        /**
-         * @brief 현재 요청된 모듈 정보 세팅
-         **/
-        function setModuleInfo(&$module_info) {
-            if($this->module_info) return; 
-            $this->module_info = $module_info;
-        }
-
-        /**
-         * @brief 현재 실행중인 모듈 instance 세팅
-         **/
-        function setModuleInstance(&$oModule) {
-            if($this->oModule) return;
-
-            // instance 저장
-            $this->oModule = $oModule;
-
-            // 현재 모듈의 메뉴가 설정되어 있으면 메뉴 정리
-            $menu_cache_file = sprintf(_XE_PATH_.'files/cache/menu/%d.php', $this->module_info->menu_srl);
-            if(!file_exists($menu_cache_file)) return;
-
-            include $menu_cache_file;
-
-            // 정리된 menu들을 1차원으로 변경
-            $this->getListedItems($menu->list, $listed_items, $node_list);
-
-            $this->listed_items = $listed_items;
-            $this->node_list = $node_list;
-            $this->menu = $menu->list;
-
-            $k = array_keys($node_list);
-            $v = array_values($node_list);
-            $this->index_mid = $k[0];
-
-            // 현재 메뉴의 depth가 1이상이면 상위 버튼을 지정
-            $cur_menu_item = $listed_items[$node_list[$this->module_info->mid]];
-            if($cur_menu_item['parent_srl']) {
-                $parent_srl = $cur_menu_item['parent_srl'];
-                if($parent_srl && $listed_items[$parent_srl]) {
-                    $parent_item = $listed_items[$parent_srl];
-                    if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
-                }
-            } elseif (!$this->isNavigationMode()) {
-                $this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
-            }
-        }
-
-        /**
-         * @brief 접속 브라우저의 헤더를 판단하여 브라우저 타입을 return
-         * 모바일 브라우저가 아닐 경우 null return
-         **/
-        function getBrowserType() {
-            if(Context::get('smartphone')) return null;
-            // 브라우저 타입을 판별
-            $browserAccept = $_SERVER['HTTP_ACCEPT'];
-            $userAgent = $_SERVER['HTTP_USER_AGENT'];
-            $wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
-
-            if(eregi("SKT11", $userAgent) || eregi("skt", $browserAccept)) {
-                Context::set('mobile_skt',1);
-                return "wml";
-            }
-            elseif(eregi("hdml", $browserAccept)) return "hdml";
-            elseif(eregi("CellPhone", $userAgent)) return  "mhtml";
-            return null;
-        }
-
-        /**
-         * @brief charset 지정
-         **/
-        function setCharSet($charset = 'UTF-8') {
-            if(!$charset) $charset = 'UTF-8';
-
-            //SKT는 euc-kr만 지원
-            if(Context::get('mobile_skt')==1) $charset = 'euc-kr';
-
-            $this->charset = $charset;
-        }
-
-        /**
-         * @brief 모바일 기기의 용량 제한에 다른 가상 페이지 지정
-         **/
-        function setMobilePage($page=1) {
-            if(!$page) $page = 1;
-            $this->mobilePage = $page;
-        }
-
-        /**
-         * @brief 목록형 데이터 설정을 위한 child menu지정
-         **/
-        function setChilds($childs) {
-            // menu개수가 9개 이상일 경우 자체 페이징 처리
-            $menu_count = count($childs);
-            if($menu_count>9) {
-                $startNum = ($this->mobilePage-1)*9;
-                $idx = 0;
-                $new_childs = array();
-                foreach($childs as $k => $v) {
-                    if($idx >= $startNum && $idx < $startNum+9) {
-                        $new_childs[$k] = $v;
-                    }
-                    $idx ++;
-                }
-                $childs = $new_childs;
-
-                $this->totalPage = (int)(($menu_count-1)/9)+1;
-
-                // next/prevUrl 지정
-                if($this->mobilePage>1) {
-                    $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-                    $text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
-                    $this->setPrevUrl($url, $text);
-                }
-
-                if($this->mobilePage<$this->totalPage) {
-                    $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-                    $text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
-                    $this->setNextUrl($url, $text);
-                }
-            } 
-            $this->childs = $childs;
-        }
-
-        /**
-         * @brief menu 출력대상이 있는지 확인
-         **/
-        function hasChilds() {
-            return count($this->childs)?true:0;
-        }
-
-        /**
-         * @brief child menu반환
-         **/
-        function getChilds() {
-            return $this->childs;
-        }
-
-        /**
-         * @brief title 지정
-         **/
-        function setTitle($title) {
-            $oModuleController = &getController('module');
-            $this->title = $title;
-            $oModuleController->replaceDefinedLangCode($this->title);
-        }
-
-        /**
-         * @brief title 반환
-         **/
-        function getTitle() {
-            return $this->title;
-        }
-
-        /**
-         * @brief 컨텐츠 정리
-         * HTML 컨텐츠에서 텍스트와 링크만 추출하는 기능
-         **/
-        function setContent($content) {
-            $oModuleController = &getController('module');
-            $allow_tag_array = array('<a>','<br>','<p>','<b>','<i>','<u>','<em>','<small>','<strong>','<big>','<table>','<tr>','<td>');
-
-
-            // 링크/ 줄바꿈, 강조만 제외하고 모든 태그 제거
-            $content = strip_tags($content, implode($allow_tag_array));
-
-            // 탭 여백 제거
-            $content = str_replace("\t", "", $content);
-
-            // 2번 이상 반복되는 공백과 줄나눔을 제거
-            $content = preg_replace('/( ){2,}/s', '', $content);
-            $content = preg_replace("/([\r\n]+)/s", "\r\n", $content);
-            $content = preg_replace(array("/<a/i","/<\/a/i","/<b/i","/<\/b/i","/<br/i"),array('<a','</a','<b','</b','<br'),$content);
-            $content = str_replace(array("<br>","<br />"), array("<br/>","<br/>"), $content);
-
-            while(strpos($content, '<br/><br/>')) {
-                $content = str_replace('<br/><br/>','<br/>',$content);
-            }
-
-            // 모바일의 경우 한 덱에 필요한 사이즈가 적어서 내용을 모두 페이지로 나눔
-            $contents = array();
-            while($content) {
-                $tmp = $this->cutStr($content, $this->deckSize, '');
-                $contents[] = $tmp;
-                $content = substr($content, strlen($tmp));
-
-                //$content = str_replace(array('&','<','>','"','&amp;nbsp;'), array('&amp;','&lt;','&gt;','&quot;',' '), $content);
-
-                foreach($allow_tag_array as $tag) {
-                    if($tag == '<br>') continue;
-                    $tag_open_pos = strpos($content, str_replace('>','',$tag));
-                    $tag_close_pos = strpos($content, str_replace('<','</',$tag));
-                    if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos) {
-                       $contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + strlen($tag) + 1);
-                       $content = substr($content, $tag_close_pos + strlen($tag) + 1);
-                    }
-                }
-
-                $tag_open_pos = strpos($content, '&');
-                $tag_close_pos = strpos($content, ';');
-                if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos) {
-                   $contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + 1);
-                   $content = substr($content, $tag_close_pos + 1);
-                }
-            }
-
-            $this->totalPage = count($contents);
-
-            // next/prevUrl 지정
-            if($this->mobilePage>1) {
-                $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
-                $text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
-                $this->setPrevUrl($url, $text);
-            }
-
-            if($this->mobilePage<$this->totalPage) {
-                $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
-                $text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
-                $this->setNextUrl($url, $text);
-            }
-
-            $this->content = $contents[$this->mobilePage-1];
-            $oModuleController->replaceDefinedLangCode($this->content);
-            $content = str_replace(array('$','\''), array('$$','&apos;'), $content);
-        }
-
-        /**
-         * @brief byte수로 자르는 함수
-         **/
-        function cutStr($string, $cut_size) {
-            return preg_match('/.{'.$cut_size.'}/su', $string, $arr) ? $arr[0] : $string; 
-        }
-
-        /**
-         * @brief 컨텐츠 반환
-         **/
-        function getContent() {
-            return $this->content;
-        }
-
-        /**
-         * @brief home url 지정
-         **/
-        function setHomeUrl($url, $text) {
-            if(!$url) $url = '#';
-            $this->homeUrl->url = $url;
-            $this->homeUrl->text = $text;
-        }
-
-        /**
-         * @brief upper url 지정
-         **/
-        function setUpperUrl($url, $text) {
-            if(!$url) $url = '#';
-            $this->upperUrl->url = $url;
-            $this->upperUrl->text = $text;
-        }
-
-        /**
-         * @brief prev url 지정
-         **/
-        function setPrevUrl($url, $text) {
-            if(!$url) $url = '#';
-            $this->prevUrl->url = $url;
-            $this->prevUrl->text = $text;
-        }
-
-        /**
-         * @brief next url 지정
-         **/
-        function setNextUrl($url, $text) {
-            if(!$url) $url = '#';
-            $this->nextUrl->url = $url;
-            $this->nextUrl->text = $text;
-        }
-
-        /**
-         * @brief 다음, 이전, 상위 이외에 기타 버튼 지정
-         **/
-        function setEtcBtn($url, $text) {
-            if(!$url) $url = '#';
-            $etc['url'] = $url;
-            $etc['text'] = htmlspecialchars($text);
-            $this->etcBtn[] = $etc;
-        }
-
-        /**
-         * @brief display
-         **/
-        function display() {
-            // 홈버튼 지정
-            $this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
-
-            // 제목 지정
-            if(!$this->title) $this->setTitle(Context::getBrowserTitle());
-
-            ob_start();
-
-            // 헤더를 출력
-            $this->printHeader();
-
-            // 제목을 출력
-            $this->printTitle();
-
-            // 내용 출력
-            $this->printContent();
-
-            // 버튼 출력
-            $this->printBtn();
-
-            // 푸터를 출력
-            $this->printFooter();
-
-            $content = ob_get_clean();
-
-            // 변환 후 출력
-            if(strtolower($this->charset) == 'utf-8') print $content;
-            else print iconv('UTF-8',$this->charset."//TRANSLIT//IGNORE", $content);
-
-            exit();
-        }
-
-        /**
-         * @brief 페이지 이동
-         **/
-        function movepage($url) {
-            header("location:$url");
-            exit();
-        }
-
-        /**
-         * @brief 목록등에서 일련 번호를 리턴한다
-         **/
-        function getNo() {
-            $this->no++;
-            $str = $this->no;
-            return $str;
-        }
-
-        /**
-         * @brief XE의 Menu 모듈이 값을 사용하기 쉽게 정리해주는 함수
-         **/
-        function getListedItems($menu, &$listed_items, &$node_list) {
-            if(!count($menu)) return;
-            foreach($menu as $node_srl => $item) {
-                if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $item['url'])) {
-                    $mid = $item['mid'] = $item['url'];
-                    $node_list[$mid] = $node_srl;
-                } else {
-                    $mid = $item['mid'] = null;
-                }
-
-                $listed_items[$node_srl] = $item;
-                $this->getListedItems($item['list'], $listed_items, $node_list);
-            }
-        }
-
-        /**
-         * @brief XE 네비게이션 출력
-         **/
-        function displayNavigationContent() {
-            $childs = array();
-
-            if($this->cmid) {
-                $cur_item = $this->listed_items[$this->cmid];
-                $upper_srl = $cur_item['parent_srl'];;
-                $list = $cur_item['list'];;
-                $this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper'));
-                if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url'])) {
-                    $obj = null;
-                    $obj['href'] = getUrl('','mid',$cur_item['url']);
-                    $obj['link'] = $obj['text'] = '['.$cur_item['text'].']';
-                    $childs[] = $obj;
-                }
-
-            } else {
-                $list = $this->menu;
-                $upper_srl = 0;
-            }
-
-
-            if(count($list)) {
-                foreach($list as $key => $val) {
-                    if(!$val['text']) continue;
-                    $obj = null;
-                    if(!count($val['list'])) {
-                        $obj['href'] = getUrl('','mid',$val['url']);
-                    } else {
-                        $obj['href'] = getUrl('cmid',$val['node_srl']);
-                    }
-                    $obj['link'] = $obj['text'] = $val['text'];
-                    $childs[] = $obj;
-                }
-                $this->setChilds($childs);
-            }
-
-            // 출력
-            $this->display();
-        }
-
-        /**
-         * @brief 언어설정 메뉴 출력
-         **/
-        function displayLangSelect() {
-            $childs = array();
-
-            $this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
-            if($this->lang) {
-                $this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
-                Context::setLangType($this->lang);
-            }
-            $lang_supported = Context::get('lang_supported');
-            $lang_type = Context::getLangType();
-            $obj = null;
-            $obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type];
-            $obj['href'] = getUrl('sel_lang',$lang_type);
-            $childs[] = $obj;
-
-            if(is_array($lang_supported)) {
-                foreach($lang_supported as $key => $val) {
-                    $obj = null;
-                    $obj['link'] = $obj['text'] = $val;
-                    $obj['href'] = getUrl('sel_lang',$key);
-                    $childs[] = $obj;
-                }
-            }
-
-            $this->setChilds($childs);
-
-            $this->display();
-        }
-
-        /**
-         * @brief 모듈의 WAP 클래스 객체 생성하여 WAP 준비
-         **/
-        function displayModuleContent() {
-            // 선택된 모듈의 WAP class 객체 생성
-            $oModule = &getWap($this->module_info->module);
-            if(!$oModule || !method_exists($oModule, 'procWAP') ) return;
-
-            $vars = get_object_vars($this->oModule);
-            if(count($vars)) foreach($vars as $key => $val) $oModule->{$key}  = $val;
-
-            // 실행
-            $oModule->procWAP($this);
-
-            // 출력
-            $this->display();
-        }
-
-        /**
-         * @brief WAP 컨텐츠를 별도로 구할 수 없으면 최종 결과물을 출력
-         **/
-        function displayContent() {
-            Context::set('layout','none');
-
-            // 템플릿 컴파일
-            $oTemplate = new TemplateHandler();
-            $oContext = &Context::getInstance();
-
-            $content = $oTemplate->compile($this->oModule->getTemplatePath(), $this->oModule->getTemplateFile());
-            $this->setContent($content);
-
-            // 출력
-            $this->display();
-        }
-    }
-?>
+<?php
+    /**
+     * Mobile XE Library Class ver 0.1
+     * @author NHN (developers@xpressengine.com) / lang_select : misol
+     * @brief XE library for WAP tag output
+     **/
+
+    class mobileXE {
+        // Base url
+        var $homeUrl = NULL;
+        var $upperUrl = NULL;
+        var $nextUrl = NULL;
+        var $prevUrl = NULL;
+        var $etcBtn = NULL;
+        // Variable for menu navigation
+        var $childs = null;
+        // Basic variable
+        var $title = NULL;
+        var $content = NULL;
+        var $mobilePage = 0;
+        var $totalPage = 1;
+        var $charset = 'UTF-8';
+        var $no = 0;
+        // Navigation-related variables
+        var $menu = null;
+        var $listed_items = null;
+        var $node_list = null;
+        var $index_mid = null;
+        // Navigation On/Off status value
+        var $navigationMode = 0;
+        // XE module information currently requested
+        var $module_info = null;
+        // Currently running instance of the module
+        var $oModule = null;
+
+        // Deck size
+        var $deckSize = 1024;
+        // Changing the language setting
+        var $languageMode = 0;
+        var $lang = null;
+        /**
+         * @brief getInstance
+         **/
+        function &getInstance() {
+            static $instance = null;
+
+            if(!$instance) {
+
+                $browserType = mobileXE::getBrowserType();
+                if(!$browserType) return;
+
+                $class_file = sprintf('%saddons/mobile/classes/%s.class.php', _XE_PATH_, $browserType);
+                require_once($class_file);
+                // Download mobile language settings (cookies, not willing to come up when you click create cache file ...- is initialized ..)
+                $this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+                if($this->lang) {
+                    $lang_supported = Context::get('lang_supported');
+                    $this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
+                    if(isset($lang_supported[$this->lang])) Context::setLangType($this->lang);
+                }
+                Context::loadLang(_XE_PATH_.'addons/mobile/lang');
+
+                $instance = new wap();
+
+                $mobilePage = (int)Context::get('mpage');
+                if(!$mobilePage) $mobilePage = 1;
+
+                $instance->setMobilePage($mobilePage);
+
+            }
+
+            return $instance;
+        }
+
+        /**
+         * @brief constructor
+         **/
+        function mobileXE() {
+            // Check navigation mode
+            if(Context::get('nm')) {
+                $this->navigationMode = 1;
+                $this->cmid = (int)Context::get('cmid');
+            }
+
+            if(Context::get('lcm')) {
+                $this->languageMode = 1;
+                $this->lang = Context::get('sel_lang');
+            }
+        }
+
+        /**
+         * @brief Check navigation mode
+         * navigationMode settings and modules of information must be menu_srl return to navigation mode = true
+         **/
+        function isNavigationMode() {
+            return ($this->navigationMode && $this->module_info->menu_srl)?true:false;
+        }
+
+        /**
+         * @brief Check langchange mode
+         * true return should be set languageMode
+         **/
+        function isLangChange() {
+            if($this->languageMode) return true;
+            else return false;
+        }
+
+        /**
+         * @brief Language settings
+         * Cookies Since you set your phone to store language-specific file, file creation
+         **/
+        function setLangType() {
+            $lang_supported = Context::get('lang_supported');
+            // Make sure that the language variables and parameters are valid
+            if($this->lang && isset($lang_supported[$this->lang])) {
+                $langbuff = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+                if($langbuff) FileHandler::removeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+                $langbuff = '<?php /**'.$this->lang.'**/ ?>';
+                FileHandler::writeFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php',$langbuff);
+            }
+        }
+
+        /**
+         * @brief Information currently requested module settings
+         **/
+        function setModuleInfo(&$module_info) {
+            if($this->module_info) return; 
+            $this->module_info = $module_info;
+        }
+
+        /**
+         * @brief Set the module instance is currently running
+         **/
+        function setModuleInstance(&$oModule) {
+            if($this->oModule) return;
+            // Save instance
+            $this->oModule = $oModule;
+            // Of the current module if there is a menu by menu
+            $menu_cache_file = sprintf(_XE_PATH_.'files/cache/menu/%d.php', $this->module_info->menu_srl);
+            if(!file_exists($menu_cache_file)) return;
+
+            include $menu_cache_file;
+            // One-dimensional arrangement of menu changes
+            $this->getListedItems($menu->list, $listed_items, $node_list);
+
+            $this->listed_items = $listed_items;
+            $this->node_list = $node_list;
+            $this->menu = $menu->list;
+
+            $k = array_keys($node_list);
+            $v = array_values($node_list);
+            $this->index_mid = $k[0];
+            // The depth of the current menu, the top button to specify if one or more
+            $cur_menu_item = $listed_items[$node_list[$this->module_info->mid]];
+            if($cur_menu_item['parent_srl']) {
+                $parent_srl = $cur_menu_item['parent_srl'];
+                if($parent_srl && $listed_items[$parent_srl]) {
+                    $parent_item = $listed_items[$parent_srl];
+                    if($parent_item) $this->setUpperUrl(getUrl('','mid',$parent_item['mid']), Context::getLang('cmd_go_upper'));
+                }
+            } elseif (!$this->isNavigationMode()) {
+                $this->setUpperUrl(getUrl('','mid',$this->index_mid,'nm','1','cmid',0), Context::getLang('cmd_view_sitemap'));
+            }
+        }
+
+        /**
+         * @brief Access the browser's header to determine the return type of the browser
+         * Mobile browser, if not null return
+         **/
+        function getBrowserType() {
+            if(Context::get('smartphone')) return null;
+            // Determine the type of browser
+            $browserAccept = $_SERVER['HTTP_ACCEPT'];
+            $userAgent = $_SERVER['HTTP_USER_AGENT'];
+            $wap_sid = $_SERVER['HTTP_X_UP_SUBNO'];
+
+            if(preg_match("/SKT11/i", $userAgent) || preg_match("/skt/i", $browserAccept)) {
+                Context::set('mobile_skt',1);
+                return "wml";
+            }
+            elseif(preg_match("/hdml/i", $browserAccept)) return "hdml";
+            elseif(preg_match("/CellPhone/i", $userAgent)) return  "mhtml";
+            return null;
+        }
+
+        /**
+         * @brief Specify charset
+         **/
+        function setCharSet($charset = 'UTF-8') {
+            if(!$charset) $charset = 'UTF-8';
+            // SKT supports the euc-kr
+            if(Context::get('mobile_skt')==1) $charset = 'euc-kr';
+
+            $this->charset = $charset;
+        }
+
+        /**
+         * @brief Limited capacity of mobile devices, specifying a different virtual page
+         **/
+        function setMobilePage($page=1) {
+            if(!$page) $page = 1;
+            $this->mobilePage = $page;
+        }
+
+        /**
+         * @brief Mokrokhyeong child menu for specifying the data set
+         **/
+        function setChilds($childs) {
+            // If more than nine the number of menu paging processing itself
+            $menu_count = count($childs);
+            if($menu_count>9) {
+                $startNum = ($this->mobilePage-1)*9;
+                $idx = 0;
+                $new_childs = array();
+                foreach($childs as $k => $v) {
+                    if($idx >= $startNum && $idx < $startNum+9) {
+                        $new_childs[$k] = $v;
+                    }
+                    $idx ++;
+                }
+                $childs = $new_childs;
+
+                $this->totalPage = (int)(($menu_count-1)/9)+1;
+                // next/prevUrl specify
+                if($this->mobilePage>1) {
+                    $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
+                    $text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
+                    $this->setPrevUrl($url, $text);
+                }
+
+                if($this->mobilePage<$this->totalPage) {
+                    $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
+                    $text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
+                    $this->setNextUrl($url, $text);
+                }
+            } 
+            $this->childs = $childs;
+        }
+
+        /**
+         * @brief Check the menu to be output
+         **/
+        function hasChilds() {
+            return count($this->childs)?true:0;
+        }
+
+        /**
+         * @brief Returns the child menu
+         **/
+        function getChilds() {
+            return $this->childs;
+        }
+
+        /**
+         * @brief Specify title
+         **/
+        function setTitle($title) {
+            $oModuleController = &getController('module');
+            $this->title = $title;
+            $oModuleController->replaceDefinedLangCode($this->title);
+        }
+
+        /**
+         * @brief return title
+         **/
+        function getTitle() {
+            return $this->title;
+        }
+
+        /**
+         * @brief Content Cleanup
+         * In HTML content, the ability to extract text and links
+         **/
+        function setContent($content) {
+            $oModuleController = &getController('module');
+            $allow_tag_array = array('<a>','<br>','<p>','<b>','<i>','<u>','<em>','<small>','<strong>','<big>','<table>','<tr>','<td>');
+            // Links/wrap, remove all tags except gangjoman
+            $content = strip_tags($content, implode($allow_tag_array));
+            // Margins tab removed
+            $content = str_replace("\t", "", $content);
+            // Repeat two more times the space and remove julnanumeul
+            $content = preg_replace('/( ){2,}/s', '', $content);
+            $content = preg_replace("/([\r\n]+)/s", "\r\n", $content);
+            $content = preg_replace(array("/<a/i","/<\/a/i","/<b/i","/<\/b/i","/<br/i"),array('<a','</a','<b','</b','<br'),$content);
+            $content = str_replace(array("<br>","<br />"), array("<br/>","<br/>"), $content);
+
+            while(strpos($content, '<br/><br/>')) {
+                $content = str_replace('<br/><br/>','<br/>',$content);
+            }
+            // If the required size of a deck of mobile content to write down all the dividing pages
+            $contents = array();
+            while($content) {
+                $tmp = $this->cutStr($content, $this->deckSize, '');
+                $contents[] = $tmp;
+                $content = substr($content, strlen($tmp));
+
+                //$content = str_replace(array('&','<','>','"','&amp;nbsp;'), array('&amp;','&lt;','&gt;','&quot;',' '), $content);
+
+                foreach($allow_tag_array as $tag) {
+                    if($tag == '<br>') continue;
+                    $tag_open_pos = strpos($content, str_replace('>','',$tag));
+                    $tag_close_pos = strpos($content, str_replace('<','</',$tag));
+                    if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos) {
+                       $contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + strlen($tag) + 1);
+                       $content = substr($content, $tag_close_pos + strlen($tag) + 1);
+                    }
+                }
+
+                $tag_open_pos = strpos($content, '&');
+                $tag_close_pos = strpos($content, ';');
+                if($tag_open_pos!==false && $tag_close_pos || $tag_close_pos < $tag_open_pos) {
+                   $contents[count($contents)-1] .= substr($content, 0, $tag_close_pos + 1);
+                   $content = substr($content, $tag_close_pos + 1);
+                }
+            }
+
+            $this->totalPage = count($contents);
+            // next/prevUrl specify
+            if($this->mobilePage>1) {
+                $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage-1);
+                $text = sprintf('%s (%d/%d)', Context::getLang('cmd_prev'), $this->mobilePage-1, $this->totalPage);
+                $this->setPrevUrl($url, $text);
+            }
+
+            if($this->mobilePage<$this->totalPage) {
+                $url = getUrl('mid',$_GET['mid'],'mpage',$this->mobilePage+1);
+                $text = sprintf('%s (%d/%d)', Context::getLang('cmd_next'), $this->mobilePage+1, $this->totalPage);
+                $this->setNextUrl($url, $text);
+            }
+
+            $this->content = $contents[$this->mobilePage-1];
+            $oModuleController->replaceDefinedLangCode($this->content);
+            $content = str_replace(array('$','\''), array('$$','&apos;'), $content);
+        }
+
+        /**
+         * @brief cutting the number of byte functions
+         **/
+        function cutStr($string, $cut_size) {
+            return preg_match('/.{'.$cut_size.'}/su', $string, $arr) ? $arr[0] : $string; 
+        }
+
+        /**
+         * @brief Return content
+         **/
+        function getContent() {
+            return $this->content;
+        }
+
+        /**
+         * @brief Specifies the home url
+         **/
+        function setHomeUrl($url, $text) {
+            if(!$url) $url = '#';
+            $this->homeUrl->url = $url;
+            $this->homeUrl->text = $text;
+        }
+
+        /**
+         * @brief Specify upper url
+         **/
+        function setUpperUrl($url, $text) {
+            if(!$url) $url = '#';
+            $this->upperUrl->url = $url;
+            $this->upperUrl->text = $text;
+        }
+
+        /**
+         * @brief Specify prev url
+         **/
+        function setPrevUrl($url, $text) {
+            if(!$url) $url = '#';
+            $this->prevUrl->url = $url;
+            $this->prevUrl->text = $text;
+        }
+
+        /**
+         * @brief Specify next url
+         **/
+        function setNextUrl($url, $text) {
+            if(!$url) $url = '#';
+            $this->nextUrl->url = $url;
+            $this->nextUrl->text = $text;
+        }
+
+        /**
+         * @brief Next, Previous, Top button assignments other than
+         **/
+        function setEtcBtn($url, $text) {
+            if(!$url) $url = '#';
+            $etc['url'] = $url;
+            $etc['text'] = htmlspecialchars($text);
+            $this->etcBtn[] = $etc;
+        }
+
+        /**
+         * @brief display
+         **/
+        function display() {
+            // Home button assignments
+            $this->setHomeUrl(getUrl(), Context::getLang('cmd_go_home'));
+            // Specify the title
+            if(!$this->title) $this->setTitle(Context::getBrowserTitle());
+
+            ob_start();
+            // Output header
+            $this->printHeader();
+            // Output title
+            $this->printTitle();
+            // Information output
+            $this->printContent();
+            // Button output
+            $this->printBtn();
+            // Footer output
+            $this->printFooter();
+
+            $content = ob_get_clean();
+            // After conversion output
+            if(strtolower($this->charset) == 'utf-8') print $content;
+            else print iconv('UTF-8',$this->charset."//TRANSLIT//IGNORE", $content);
+
+            exit();
+        }
+
+        /**
+         * @brief Move page
+         **/
+        function movepage($url) {
+            header("location:$url");
+            exit();
+        }
+
+        /**
+         * @brief And returns a list of serial numbers in
+         **/
+        function getNo() {
+            $this->no++;
+            $str = $this->no;
+            return $str;
+        }
+
+        /**
+         * @brief XE is easy to use Menu module is relieved during the function, value
+         **/
+        function getListedItems($menu, &$listed_items, &$node_list) {
+            if(!count($menu)) return;
+            foreach($menu as $node_srl => $item) {
+                if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $item['url'])) {
+                    $mid = $item['mid'] = $item['url'];
+                    $node_list[$mid] = $node_srl;
+                } else {
+                    $mid = $item['mid'] = null;
+                }
+
+                $listed_items[$node_srl] = $item;
+                $this->getListedItems($item['list'], $listed_items, $node_list);
+            }
+        }
+
+        /**
+         * @brief XE navigation output
+         **/
+        function displayNavigationContent() {
+            $childs = array();
+
+            if($this->cmid) {
+                $cur_item = $this->listed_items[$this->cmid];
+                $upper_srl = $cur_item['parent_srl'];;
+                $list = $cur_item['list'];;
+                $this->setUpperUrl(getUrl('cmid',$upper_srl), Context::getLang('cmd_go_upper'));
+                if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $cur_item['url'])) {
+                    $obj = null;
+                    $obj['href'] = getUrl('','mid',$cur_item['url']);
+                    $obj['link'] = $obj['text'] = '['.$cur_item['text'].']';
+                    $childs[] = $obj;
+                }
+
+            } else {
+                $list = $this->menu;
+                $upper_srl = 0;
+            }
+
+
+            if(count($list)) {
+                foreach($list as $key => $val) {
+                    if(!$val['text']) continue;
+                    $obj = null;
+                    if(!count($val['list'])) {
+                        $obj['href'] = getUrl('','mid',$val['url']);
+                    } else {
+                        $obj['href'] = getUrl('cmid',$val['node_srl']);
+                    }
+                    $obj['link'] = $obj['text'] = $val['text'];
+                    $childs[] = $obj;
+                }
+                $this->setChilds($childs);
+            }
+            // Output
+            $this->display();
+        }
+
+        /**
+         * @brief Language Settings menu, the output
+         **/
+        function displayLangSelect() {
+            $childs = array();
+
+            $this->lang = FileHandler::readFile('./files/cache/addons/mobile/setLangType/personal_settings/'.md5(trim($_SERVER['HTTP_USER_AGENT']).trim($_SERVER['HTTP_PHONE_NUMBER']).trim($_SERVER['HTTP_HTTP_PHONE_NUMBER'])).'.php');
+            if($this->lang) {
+                $this->lang = str_replace(array('<?php /**','**/ ?>'),array('',''),$this->lang);
+                Context::setLangType($this->lang);
+            }
+            $lang_supported = Context::get('lang_supported');
+            $lang_type = Context::getLangType();
+            $obj = null;
+            $obj['link'] = $obj['text'] = Context::getLang('president_lang').' : '.$lang_supported[$lang_type];
+            $obj['href'] = getUrl('sel_lang',$lang_type);
+            $childs[] = $obj;
+
+            if(is_array($lang_supported)) {
+                foreach($lang_supported as $key => $val) {
+                    $obj = null;
+                    $obj['link'] = $obj['text'] = $val;
+                    $obj['href'] = getUrl('sel_lang',$key);
+                    $childs[] = $obj;
+                }
+            }
+
+            $this->setChilds($childs);
+
+            $this->display();
+        }
+
+        /**
+         * @brief Module to create a class object of the WAP WAP ready
+         **/
+        function displayModuleContent() {
+            // Create WAP class objects of the selected module
+            $oModule = &getWap($this->module_info->module);
+            if(!$oModule || !method_exists($oModule, 'procWAP') ) return;
+
+            $vars = get_object_vars($this->oModule);
+            if(count($vars)) foreach($vars as $key => $val) $oModule->{$key}  = $val;
+            // Run
+            $oModule->procWAP($this);
+            // Output
+            $this->display();
+        }
+
+        /**
+         * @brief WAP content is available as a separate output if the final results
+         **/
+        function displayContent() {
+            Context::set('layout','none');
+            // Compile a template
+            $oTemplate = new TemplateHandler();
+            $oContext = &Context::getInstance();
+
+            $content = $oTemplate->compile($this->oModule->getTemplatePath(), $this->oModule->getTemplateFile());
+            $this->setContent($content);
+            // Output
+            $this->display();
+        }
+    }
+?>
diff --git a/addons/mobile/classes/wml.class.php b/addons/mobile/classes/wml.class.php
index 08103b37c..a9a91fb95 100644
--- a/addons/mobile/classes/wml.class.php
+++ b/addons/mobile/classes/wml.class.php
@@ -1,106 +1,104 @@
-<?php
-    /**
-     * WML Library ver 0.1
-     * @author NHN (developers@xpressengine.com) / lang_select : misol
-     **/
-    class wap extends mobileXE {
-
-        /**
-         * @brief constructor
-         **/
-        function wap() {
-            parent::mobileXE();
-        }
-
-        /**
-         * @brief wml 헤더 출력
-         **/
-        function printHeader() {
-            header("Content-Type: text/vnd.wap.wml");
-            header("charset: ".$this->charset);
-            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-            print("<?xml version=\"1.0\" encoding=\"".$this->charset."\"?><!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
-            // 카드제목
-            printf("<wml>\n<card title=\"%s%s\">\n<p>\n",htmlspecialchars($this->title),htmlspecialchars($titlePageStr));
-        }
-
-        /**
-         * @brief 제목을 출력
-         **/
-        function printTitle() {
-            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
-            printf('&lt;%s%s&gt;<br/>%s', htmlspecialchars($this->title),htmlspecialchars($titlePageStr),"\n");
-        }
-
-        /**
-         * @brief 내용을 출력
-         * hasChilds()가 있으면 목록형을 그렇지 않으면 컨텐츠를 출력
-         **/
-        function printContent() {
-            if($this->hasChilds()) {
-                foreach($this->getChilds() as $key => $val) {
-                    if(!$val['link']) continue;
-                    printf('<do type="%s" label="%s"><go href="%s" /></do>%s', $this->getNo(), htmlspecialchars($val['text']), $val['href'], "\n");
-                    if($val['extra']) printf("%s\n",$val['extra']);
-                }
-            } else {
-                printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
-            }
-            print('<br/>');
-        }
-
-        /**
-         * @brief 버튼을 출력함
-         **/
-        function printBtn() {
-            if($this->nextUrl) {
-                $url = $this->nextUrl;
-                printf('<do type="vnd.next" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-            }
-            if($this->prevUrl) {
-                $url = $this->prevUrl;
-                printf('<do type="vnd.prev" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-            }
-            // 기타 해당사항 없는 버튼 출력 담당 (array로 전달) type??
-            if($this->etcBtn) {
-                if(is_array($this->etcBtn)) {
-                    foreach($this->etcBtn as $key=>$val) {
-                        printf('<do type="vnd.btn%s" label="%s"><go href="%s"/></do>%s', $key, $val['text'], $val['url'], "\n");
-                    }
-                }
-            }
-            // 언어선택
-            if(!parent::isLangChange()){
-                $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
-                printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
-            }
-            else {
-                printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
-            }
-            if($this->homeUrl) {
-                $url = $this->homeUrl;
-                printf('<do type="access" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-            }
-            if($this->upperUrl) {
-                $url = $this->upperUrl;
-                printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
-            }
-        }
-
-        // 푸터 정보를 출력
-        function printFooter() {
-            print("</p>\n</card>\n</wml>");
-        }
-
-        // 목록등에서 일련 번호를 리턴한다
-        function getNo() {
-            if(Context::get('mobile_skt')==1) {
-                return "vnd.skmn".parent::getNo();
-            }
-            else {
-                return parent::getNo();
-            }
-            return $str;
-        }
-    }
-?>
+<?php
+    /**
+     * WML Library ver 0.1
+     * @author NHN (developers@xpressengine.com) / lang_select : misol
+     **/
+    class wap extends mobileXE {
+
+        /**
+         * @brief constructor
+         **/
+        function wap() {
+            parent::mobileXE();
+        }
+
+        /**
+         * @brief wml header output
+         **/
+        function printHeader() {
+            header("Content-Type: text/vnd.wap.wml");
+            header("charset: ".$this->charset);
+            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+            print("<?xml version=\"1.0\" encoding=\"".$this->charset."\"?><!DOCTYPE wml PUBLIC \"-//WAPFORUM//DTD WML 1.1//EN\" \"http://www.wapforum.org/DTD/wml_1.1.xml\">\n");
+            // Card Title
+            printf("<wml>\n<card title=\"%s%s\">\n<p>\n",htmlspecialchars($this->title),htmlspecialchars($titlePageStr));
+        }
+
+        /**
+         * @brief Output title
+         **/
+        function printTitle() {
+            if($this->totalPage > $this->mobilePage) $titlePageStr = sprintf("(%d/%d)",$this->mobilePage, $this->totalPage);
+            printf('&lt;%s%s&gt;<br/>%s', htmlspecialchars($this->title),htmlspecialchars($titlePageStr),"\n");
+        }
+
+        /**
+         * @brief Output information
+         * hasChilds() if there is a list of content types, otherwise output
+         **/
+        function printContent() {
+            if($this->hasChilds()) {
+                foreach($this->getChilds() as $key => $val) {
+                    if(!$val['link']) continue;
+                    printf('<do type="%s" label="%s"><go href="%s" /></do>%s', $this->getNo(), htmlspecialchars($val['text']), $val['href'], "\n");
+                    if($val['extra']) printf("%s\n",$val['extra']);
+                }
+            } else {
+                printf('%s<br/>%s', str_replace("<br>","<br/>",$this->getContent()),"\n");
+            }
+            print('<br/>');
+        }
+
+        /**
+         * @brief Button to output
+         **/
+        function printBtn() {
+            if($this->nextUrl) {
+                $url = $this->nextUrl;
+                printf('<do type="vnd.next" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
+            }
+            if($this->prevUrl) {
+                $url = $this->prevUrl;
+                printf('<do type="vnd.prev" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
+            }
+            // Others are not applicable in charge of the button output (array passed) type??
+            if($this->etcBtn) {
+                if(is_array($this->etcBtn)) {
+                    foreach($this->etcBtn as $key=>$val) {
+                        printf('<do type="vnd.btn%s" label="%s"><go href="%s"/></do>%s', $key, $val['text'], $val['url'], "\n");
+                    }
+                }
+            }
+            // Select Language
+            if(!parent::isLangChange()){
+                $url = getUrl('','lcm','1','sel_lang',Context::getLangType(),'return_uri',Context::get('current_url'));
+                printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', 'Language : '.Context::getLang('select_lang'), $url, "\n");
+            }
+            else {
+                printf('<do type="vnd.lang" label="%s"><go href="%s"/></do>%s', Context::getLang('lang_return'), Context::get('return_uri'), "\n");
+            }
+            if($this->homeUrl) {
+                $url = $this->homeUrl;
+                printf('<do type="access" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
+            }
+            if($this->upperUrl) {
+                $url = $this->upperUrl;
+                printf('<do type="vnd.up" label="%s"><go href="%s"/></do>%s', $url->text, $url->url, "\n");
+            }
+        }
+        // Footer information output
+        function printFooter() {
+            print("</p>\n</card>\n</wml>");
+        }
+        // And returns a list of serial numbers in
+        function getNo() {
+            if(Context::get('mobile_skt')==1) {
+                return "vnd.skmn".parent::getNo();
+            }
+            else {
+                return parent::getNo();
+            }
+            return $str;
+        }
+    }
+?>
diff --git a/addons/mobile/conf/info.xml b/addons/mobile/conf/info.xml
index 3dcee3654..d9f43b2a5 100644
--- a/addons/mobile/conf/info.xml
+++ b/addons/mobile/conf/info.xml
@@ -1,112 +1,112 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">모바일XE 애드온</title>
-    <title xml:lang="jp">モバイルXEアドオン</title>
-    <title xml:lang="zh-CN">手机XE插件</title>
-    <title xml:lang="en">Mobile XE</title>
-    <title xml:lang="vi">Mobile XE</title>
-    <title xml:lang="ru">Mobile XE</title>
-    <title xml:lang="zh-TW">XE行動上網</title>
-    <description xml:lang="ko">
-        모바일에서 접속시 헤더 정보를 분석하여 메뉴 - 모듈의 관계를 이용하여 WAP 태그로 출력하는 애드온입니다.
-        wml, hdml, mhtml를 지원하고 그 이외의 경우에는 동작하지 않습니다.
-    </description>
-    <description xml:lang="jp">
-        モバイル端末機からアクセス時、ヘッダー（header）情報を分析して「メニュー」と「モジュール」の関係を利用してWAPタグに変換表示するアドオンです。
-        wml, hdml, mhtmlをサポートし、その以外は対応していません。
-    </description>
-    <description xml:lang="zh-CN">
-        通过手机访问网站时将网页输出为WAP标签的插件。
-        支持语言：wml, hdml, mhtml
-    </description>
-    <description xml:lang="en">
-        This addon displays WAP tag by analyzing header information on mobile connection.
-        Only wml, hdml, mhtml formats are provided.
-    </description>
-    <description xml:lang="vi">
-        Addon này hiển thị WAP Tag bởi việc phân tích thông tin khi kết nối bằng di động.
-        Chỉ hỗ trợ cho các định dạng wml, hdml, mhtml.
-    </description>
-    <description xml:lang="ru">
-        Данный аддон показывает WAP теги, анализирую информацию мобильного соединения.
-        Поддерживаются только wml, hdml, mhtml форматы.
-    </description>
-    <description xml:lang="zh-TW">
-        透過行動工具上網時，會將網頁轉換為WAP標籤顯示。
-        只限於 wml, hdml, mhtml格式。
-    </description>
-    <version>0.1.1</version>
-    <date>2009-05-23</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-		<name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-
-    <history version="0.1.1" date="2009-05-23">
-        <author email_address="misol221@paran.com" link="http://www.imsoo.net">
-            <name xml:lang="ko">misol</name>
-            <name xml:lang="jp">misol</name>
-            <name xml:lang="zh-CN">misol</name>
-            <name xml:lang="en">misol</name>
-            <name xml:lang="vi">misol</name>
-	    	<name xml:lang="ru">misol</name>
-            <name xml:lang="zh-TW">misol</name>
-        </author>
-        <log>언어선택 추가(WML, mHTML)</log>
-        <log>인코딩 설정 개선</log>
-        <log>그 외 소소한 개선들</log>
-    </history>
-
-    <extra_vars>
-        <var name="charset">
-            <title xml:lang="ko">문자셋</title>
-            <title xml:lang="jp">文字コード</title>
-            <title xml:lang="zh-CN">编码</title>
-            <title xml:lang="en">Charset</title>
-            <title xml:lang="vi">Charset</title>
-	    	<title xml:lang="ru">Charset</title>
-            <title xml:lang="zh-TW">編碼</title>
-            <description xml:lang="ko">
-                모바일 기기의 경우 UTF-8 문자셋을 인식하지 못할 수 있습니다.
-                문자셋에 원하시는 문자셋을 입력하면 자동으로 변환하여 출력하여 모바일에서 이상없이 출력하도록 합니다.
-                기본값은 UTF-8입니다.
-                (*SK Telecom 휴대전화의 경우 euc-kr인코딩만 지원하므로, 강제로 euc-kr인코딩만 지원합니다.)
-            </description>
-            <description xml:lang="jp">
-                ある特定のモバイル機器ではutf-8文字コードの認識が出来ない場合があります。
-                文字コードを設定すると、（日本語だけの場合）該当文字コードに自動変換して正常に表示出来るようになります。
-                本アドオンのデフォルト値はUTF-8で、日本の携帯はshift-jisが一般的です。
-            </description>
-            <description xml:lang="zh-CN">
-                手机有时无法识别utf-8编码，这时输入相应的编码值即可自动转换。
-                默认编码为UTF-8。
-            </description>
-            <description xml:lang="en">
-                utf-8 may be read with mobile tools.
-                Mobile tools will display correct charset when you input charset you want.
-                Default charset is UTF-8.
-            </description>
-            <description xml:lang="vi">
-                UTF-8 không thể đọc được cho các công cụ di động.
-                Những công cụ di động sẽ trình bày Charset đúng khi bạn nhập vào Charset bạn muốn.
-                Charset mặc định là UTF-8.
-            </description>
-	    	<description xml:lang="ru">
-                utf-8 may be read with mobile tools.
-                Mobile tools will display correct charset when you input charset you want.
-                Default charset is UTF-8.
-            </description>
-            <description xml:lang="zh-TW">
-                行動工具無法讀取utf-8編碼。
-                當您輸入所想要的編碼時，行動工具將會正確的顯示。
-                預設編碼是UTF-8.
-            </description>
-        </var>
-    </extra_vars>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">모바일XE 애드온</title>
+    <title xml:lang="jp">モバイルXEアドオン</title>
+    <title xml:lang="zh-CN">手机XE插件</title>
+    <title xml:lang="en">Mobile XE</title>
+    <title xml:lang="vi">Mobile XE</title>
+    <title xml:lang="ru">Mobile XE</title>
+    <title xml:lang="zh-TW">XE行動上網</title>
+    <description xml:lang="ko">
+        모바일에서 접속시 헤더 정보를 분석하여 메뉴 - 모듈의 관계를 이용하여 WAP 태그로 출력하는 애드온입니다.
+        wml, hdml, mhtml를 지원하고 그 이외의 경우에는 동작하지 않습니다.
+    </description>
+    <description xml:lang="jp">
+        モバイル端末機からアクセス時、ヘッダー（header）情報を分析して「メニュー」と「モジュール」の関係を利用してWAPタグに変換表示するアドオンです。
+        wml, hdml, mhtmlをサポートし、その以外は対応していません。
+    </description>
+    <description xml:lang="zh-CN">
+        通过手机访问网站时将网页输出为WAP标签的插件。
+        支持语言：wml, hdml, mhtml
+    </description>
+    <description xml:lang="en">
+        This addon displays WAP tag by analyzing header information on mobile connection.
+        Only wml, hdml, mhtml formats are provided.
+    </description>
+    <description xml:lang="vi">
+        Addon này hiển thị WAP Tag bởi việc phân tích thông tin khi kết nối bằng di động.
+        Chỉ hỗ trợ cho các định dạng wml, hdml, mhtml.
+    </description>
+    <description xml:lang="ru">
+        Данный аддон показывает WAP теги, анализирую информацию мобильного соединения.
+        Поддерживаются только wml, hdml, mhtml форматы.
+    </description>
+    <description xml:lang="zh-TW">
+        透過行動工具上網時，會將網頁轉換為WAP標籤顯示。
+        只限於 wml, hdml, mhtml格式。
+    </description>
+    <version>0.1.1</version>
+    <date>2009-05-23</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+		<name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+
+    <history version="0.1.1" date="2009-05-23">
+        <author email_address="misol221@paran.com" link="http://www.imsoo.net">
+            <name xml:lang="ko">misol</name>
+            <name xml:lang="jp">misol</name>
+            <name xml:lang="zh-CN">misol</name>
+            <name xml:lang="en">misol</name>
+            <name xml:lang="vi">misol</name>
+	    	<name xml:lang="ru">misol</name>
+            <name xml:lang="zh-TW">misol</name>
+        </author>
+        <log>언어선택 추가(WML, mHTML)</log>
+        <log>인코딩 설정 개선</log>
+        <log>그 외 소소한 개선들</log>
+    </history>
+
+    <extra_vars>
+        <var name="charset">
+            <title xml:lang="ko">문자셋</title>
+            <title xml:lang="jp">文字コード</title>
+            <title xml:lang="zh-CN">编码</title>
+            <title xml:lang="en">Charset</title>
+            <title xml:lang="vi">Charset</title>
+	    	<title xml:lang="ru">Charset</title>
+            <title xml:lang="zh-TW">編碼</title>
+            <description xml:lang="ko">
+                모바일 기기의 경우 UTF-8 문자셋을 인식하지 못할 수 있습니다.
+                문자셋에 원하시는 문자셋을 입력하면 자동으로 변환하여 출력하여 모바일에서 이상없이 출력하도록 합니다.
+                기본값은 UTF-8입니다.
+                (*SK Telecom 휴대전화의 경우 euc-kr인코딩만 지원하므로, 강제로 euc-kr인코딩만 지원합니다.)
+            </description>
+            <description xml:lang="jp">
+                ある特定のモバイル機器ではutf-8文字コードの認識が出来ない場合があります。
+                文字コードを設定すると、（日本語だけの場合）該当文字コードに自動変換して正常に表示出来るようになります。
+                本アドオンのデフォルト値はUTF-8で、日本の携帯はshift-jisが一般的です。
+            </description>
+            <description xml:lang="zh-CN">
+                手机有时无法识别utf-8编码，这时输入相应的编码值即可自动转换。
+                默认编码为UTF-8。
+            </description>
+            <description xml:lang="en">
+                utf-8 may be read with mobile tools.
+                Mobile tools will display correct charset when you input charset you want.
+                Default charset is UTF-8.
+            </description>
+            <description xml:lang="vi">
+                UTF-8 không thể đọc được cho các công cụ di động.
+                Những công cụ di động sẽ trình bày Charset đúng khi bạn nhập vào Charset bạn muốn.
+                Charset mặc định là UTF-8.
+            </description>
+	    	<description xml:lang="ru">
+                utf-8 may be read with mobile tools.
+                Mobile tools will display correct charset when you input charset you want.
+                Default charset is UTF-8.
+            </description>
+            <description xml:lang="zh-TW">
+                行動工具無法讀取utf-8編碼。
+                當您輸入所想要的編碼時，行動工具將會正確的顯示。
+                預設編碼是UTF-8.
+            </description>
+        </var>
+    </extra_vars>
+</addon>
diff --git a/addons/mobile/lang/en.lang.php b/addons/mobile/lang/en.lang.php
deleted file mode 100644
index 806187185..000000000
--- a/addons/mobile/lang/en.lang.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-    /**
-     * @file   addons/mobile/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Basic Contents only)
-     **/
-    // lang select by misol
-    $lang->president_lang = 'selected Language';
-    $lang->select_lang = 'select Language';
-    $lang->lang_return = 'Go Back';
-
-    $lang->cmd_go_upper = 'Upper';
-    $lang->cmd_go_home = 'Go Home';
-    $lang->cmd_view_sitemap = 'View site map';
-?>
diff --git a/addons/mobile/lang/jp.lang.php b/addons/mobile/lang/jp.lang.php
deleted file mode 100644
index d9300e7e6..000000000
--- a/addons/mobile/lang/jp.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   addons/mobile/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：ミニミ
-     * @brief  日本語言語パッケージ
-     **/
-
-    // 言語選択部分 by misol
-    $lang->president_lang = '現在言語';
-    $lang->select_lang = '言語選択';
-    $lang->lang_return = '戻る';
-
-    $lang->cmd_go_upper = '上位メニュー';
-    $lang->cmd_go_home = 'トップへ';
-    $lang->cmd_view_sitemap = 'サイトマップ';
-
-?>
diff --git a/addons/mobile/lang/ko.lang.php b/addons/mobile/lang/ko.lang.php
deleted file mode 100644
index 48bf404a0..000000000
--- a/addons/mobile/lang/ko.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   addons/mobile/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    // 언어 선택부분 by misol
-    $lang->president_lang = '현재 언어';
-    $lang->select_lang = '언어 선택';
-    $lang->lang_return = '돌아가기';
-
-    $lang->cmd_go_upper = '상위';
-    $lang->cmd_go_home = '홈으로';
-    $lang->cmd_view_sitemap = '사이트맵 보기';
-
-?>
diff --git a/addons/mobile/lang/lang.xml b/addons/mobile/lang/lang.xml
new file mode 100644
index 000000000..fab31405b
--- /dev/null
+++ b/addons/mobile/lang/lang.xml
@@ -0,0 +1,54 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="president_lang">
+		<value xml:lang="ko"><![CDATA[현재 언어]]></value>
+		<value xml:lang="en"><![CDATA[Selected Language]]></value>
+		<value xml:lang="jp"><![CDATA[現在言語]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已選擇語言]]></value>
+		<value xml:lang="ru"><![CDATA[Дейсвующй язык]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn ngôn ngữ]]></value>
+	</item>
+	<item name="select_lang">
+		<value xml:lang="ko"><![CDATA[언어 선택]]></value>
+		<value xml:lang="en"><![CDATA[Select Language]]></value>
+		<value xml:lang="jp"><![CDATA[言語選択]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇語言]]></value>
+		<value xml:lang="ru"><![CDATA[Выбор языка]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn ngôn ngữ]]></value>
+	</item>
+	<item name="lang_return">
+		<value xml:lang="ko"><![CDATA[돌아가기]]></value>
+		<value xml:lang="en"><![CDATA[Go Back]]></value>
+		<value xml:lang="jp"><![CDATA[戻る]]></value>
+		<value xml:lang="zh-TW"><![CDATA[返回]]></value>
+		<value xml:lang="ru"><![CDATA[Вернуться]]></value>
+		<value xml:lang="vi"><![CDATA[Trở lại]]></value>
+	</item>
+	<item name="cmd_go_upper">
+		<value xml:lang="ko"><![CDATA[상위]]></value>
+		<value xml:lang="en"><![CDATA[Upper]]></value>
+		<value xml:lang="jp"><![CDATA[上位メニュー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上一级]]></value>
+		<value xml:lang="zh-TW"><![CDATA[回上頁]]></value>
+		<value xml:lang="ru"><![CDATA[Вверх]]></value>
+		<value xml:lang="vi"><![CDATA[Lên trên]]></value>
+	</item>
+	<item name="cmd_go_home">
+		<value xml:lang="ko"><![CDATA[홈으로]]></value>
+		<value xml:lang="en"><![CDATA[Go Home]]></value>
+		<value xml:lang="jp"><![CDATA[トップへ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[首页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[回首頁]]></value>
+		<value xml:lang="ru"><![CDATA[На главную страницу]]></value>
+		<value xml:lang="vi"><![CDATA[Về trang chủ]]></value>
+	</item>
+	<item name="cmd_view_sitemap">
+		<value xml:lang="ko"><![CDATA[사이트맵 보기]]></value>
+		<value xml:lang="en"><![CDATA[View site map]]></value>
+		<value xml:lang="jp"><![CDATA[サイトマップ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[网站地图]]></value>
+		<value xml:lang="zh-TW"><![CDATA[網站地圖]]></value>
+		<value xml:lang="ru"><![CDATA[Посмотреть карту сайта]]></value>
+		<value xml:lang="vi"><![CDATA[Xem sơ đồ Web]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/addons/mobile/lang/ru.lang.php b/addons/mobile/lang/ru.lang.php
deleted file mode 100644
index 87cc015cf..000000000
--- a/addons/mobile/lang/ru.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   addons/mobile/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    // 언어 선택부분 by misol
-    $lang->president_lang = 'Дейсвующй язык';
-    $lang->select_lang = 'Выбор языка';
-    $lang->lang_return = 'Вернуться';
-
-    $lang->cmd_go_upper = 'Вверх';
-    $lang->cmd_go_home = 'На главную страницу';
-    $lang->cmd_view_sitemap = 'Посмотреть карту сайта';
-
-?>
diff --git a/addons/mobile/lang/vi.lang.php b/addons/mobile/lang/vi.lang.php
deleted file mode 100644
index 1ed1fa8a5..000000000
--- a/addons/mobile/lang/vi.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-			
-    // lang select by misol
-    $lang->president_lang = 'Chọn ngôn ngữ';
-    $lang->select_lang = 'Chọn ngôn ngữ';
-    $lang->lang_return = 'Trở lại';
-
-    $lang->cmd_go_upper = 'Lên trên';
-    $lang->cmd_go_home = 'Về trang chủ';
-    $lang->cmd_view_sitemap = 'Xem sơ đồ Web';
-?>
diff --git a/addons/mobile/lang/zh-CN.lang.php b/addons/mobile/lang/zh-CN.lang.php
deleted file mode 100644
index 1610b859f..000000000
--- a/addons/mobile/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-    /**
-     * @file   addons/mobile/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com) 翻译：guny
-     * @brief  手机XE插件简体中文语言包
-     **/
-
-    $lang->cmd_go_upper = '上一级';
-    $lang->cmd_go_home = '首页';
-    $lang->cmd_view_sitemap = '网站地图';
-?>
diff --git a/addons/mobile/lang/zh-TW.lang.php b/addons/mobile/lang/zh-TW.lang.php
deleted file mode 100644
index 6de5fd45e..000000000
--- a/addons/mobile/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-    /**
-     * @file   addons/mobile/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  XE行動上網正體中文語言
-     **/
-    // lang select by misol
-    $lang->president_lang = '已選擇語言';
-    $lang->select_lang = '選擇語言';
-    $lang->lang_return = '返回';
-
-    $lang->cmd_go_upper = '回上頁';
-    $lang->cmd_go_home = '回首頁';
-    $lang->cmd_view_sitemap = '網站地圖';
-?>
diff --git a/addons/mobile/mobile.addon.php b/addons/mobile/mobile.addon.php
index fd55b714c..15bde8a8a 100644
--- a/addons/mobile/mobile.addon.php
+++ b/addons/mobile/mobile.addon.php
@@ -1,61 +1,50 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file mobile.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 모바일XE 애드온
-     *
-     * 헤더정보를 가로채서 모바일에서의 접속일 경우 WAP 태그로 컨텐츠를 출력함
-     *
-     * 동작 시점
-     *
-     * before_module_proc > 모바일 처리를 위해 모듈의 일반 설정을 변경해야 할 경우 호출
-     *
-     * after_module_proc > 모바일 컨텐츠 출력
-     * 동작 조건
-     **/
-
-    // 관리자 페이지는 무시
-    if(Context::get('module')=='admin') return;
-
-    // 동작 시점 관리
-    if($called_position != 'before_module_proc' && $called_position != 'after_module_proc' ) return;
-
-    // 모바일 브라우저가 아니라면 무시
-    require_once(_XE_PATH_.'addons/mobile/classes/mobile.class.php');
-    if(!mobileXE::getBrowserType()) return;
-
-    // mobile instance 생성
-    $oMobile = &mobileXE::getInstance();
-    if(!$oMobile) return;
-
-    // 애드온 설정에서 지정된 charset으로 지정
-    $oMobile->setCharSet($addon_info->charset);
-
-    // 모듈의 정보를 세팅
-    $oMobile->setModuleInfo($this->module_info);
-
-    // 현재 모듈 객체 등록
-    $oMobile->setModuleInstance($this);
-
-    // 네비게이트 모드이거나 WAP class가 있을 경우 미리 컨텐츠를 추출하여 출력/ 종료
-    if($called_position == 'before_module_proc') {
-
-        if($oMobile->isLangChange()) {
-            $oMobile->setLangType();
-            $oMobile->displayLangSelect();
-        }
-
-        // 네비게이트 모드이면 네비게이션 컨텐츠 출력
-        if($oMobile->isNavigationMode()) $oMobile->displayNavigationContent();
-
-        // WAP class가 있으면 WAP class를 통해 컨텐츠 출력
-        else $oMobile->displayModuleContent();
-
-    // 네비게이트 모드가 아니고 WAP 클래스가 아니면 모듈의 결과를 출력
-    } else if($called_position == 'after_module_proc')  {
-        // 내용 준비
-        $oMobile->displayContent();
-    }
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file mobile.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Mobile XE add-on
+ *
+ * If a mobile connection is made (see the header information), display contents with WAP tags
+ *
+ * Time to call
+ *
+ * before_module_proc > call when changing general settings for mobile
+ *
+ * after_module_proc > display mobile content
+ * Condition
+ **/
+// Ignore admin page
+if(Context::get('module')=='admin') return;
+// Manage when to call it
+if($called_position != 'before_module_proc' && $called_position != 'after_module_proc' ) return;
+// Ignore if not mobile browser
+require_once(_XE_PATH_.'addons/mobile/classes/mobile.class.php');
+if(!mobileXE::getBrowserType()) return;
+// Generate mobile instance
+$oMobile = &mobileXE::getInstance();
+if(!$oMobile) return;
+// Specify charset on the add-on settings 
+$oMobile->setCharSet($addon_info->charset);
+// Set module information
+$oMobile->setModuleInfo($this->module_info);
+// Register the current module object
+$oMobile->setModuleInstance($this);
+// Extract content and display/exit if navigate mode is or if WAP class exists
+if($called_position == 'before_module_proc') {
+
+	if($oMobile->isLangChange()) {
+		$oMobile->setLangType();
+		$oMobile->displayLangSelect();
+	}
+	// On navigation mode, display navigation content
+	if($oMobile->isNavigationMode()) $oMobile->displayNavigationContent();
+	// If you have a WAP class content output via WAP class
+	else $oMobile->displayModuleContent();
+// If neither navigation mode nor WAP class is, display the module's result
+} else if($called_position == 'after_module_proc')  {
+	// Display
+	$oMobile->displayContent();
+}
+?>
diff --git a/addons/openid_delegation_id/conf/info.xml b/addons/openid_delegation_id/conf/info.xml
index 796abb29e..9adf737f8 100644
--- a/addons/openid_delegation_id/conf/info.xml
+++ b/addons/openid_delegation_id/conf/info.xml
@@ -1,125 +1,125 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">OpenID delegation ID</title>
-    <title xml:lang="zh-CN">OpenID</title>
-    <title xml:lang="en">OpenID Delegation ID</title>
-    <title xml:lang="vi">OpenID Delegation ID</title>
-    <title xml:lang="ge">OpenID Delegation ID</title>
-    <title xml:lang="es">Delegación ID para OpenID</title>
-    <title xml:lang="jp">OpenIDアドオン</title>
-    <title xml:lang="ru">Открытый ID(OpenID)</title>
-    <title xml:lang="zh-TW">OpenID</title>
-    <description xml:lang="ko">
-        본인의 도메인을 사용하여 오픈아이디로 활용할 수 있도록 합니다.
-        꼭 설정을 통해서 openid provider관련 값을 입력후 사용해주세요.
-    </description>
-    <description xml:lang="zh-CN">
-        可以把本人的域名当分散式身份验证系统(OpenID)来使用。
-        必须在设置中输入openid provider相关值后再使用。
-    </description>
-    <description xml:lang="en">
-        This addon enables you to use your own domain name as an OpenID.
-        Just be sure to set the values related with openid provider before using.
-    </description>
-    <description xml:lang="vi">
-        Addon này cho phép bạn sử dụng tên miền của mình như một OpenID.
-        Hãy kiểm tra để đặt giá trị liên quan với OpenID trước khi sử dụng.
-    </description>
-    <description xml:lang="ge">
-        Dieses Addon ermöglicht es Ihnen, mit Ihrem eigenen Domain-Namen als OpenID.
-        Einfach sicher sein, dass die Werte im Zusammenhang mit OpenID-Provider, bevor Sie.
-    </description>
-    <description xml:lang="es">
-        Utlizando su propio dominio puede usar como OpenID.
-        Debe utilizar luego de ingresar los valores relacionado con openid provider a través de la configuracion.
-    </description>
-    <description xml:lang="jp">
-        保有しているオリジナルドメインをオープンＩＤとして活用することが出来ます。
-        必ず設定にて、OpenIDプロバイダーの関連情報を入力してから使用して下さい。
-    </description>
-    <description xml:lang="ru">
-        Этот аддон позволяет Вам использовать Ваше доменное имя как OpenID.
-        Прежде, чем использовать, установите значения, имеющие отношение к openid-провайдеру .
-    </description>
-    <description xml:lang="zh-TW">
-        可將原本的域名當做OpenID來使用。
-        必須在設置中輸入openid provider相關資料後再使用。
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-
-    <extra_vars>
-        <var name="server">
-            <title xml:lang="ko">server</title>
-            <title xml:lang="zh-CN">server</title>
-            <title xml:lang="en">server</title>
-            <title xml:lang="vi">Server</title>
-            <title xml:lang="ge">server</title>
-            <title xml:lang="es">Servidor</title>
-            <title xml:lang="jp">server</title>
-            <title xml:lang="ru">server</title>
-            <title xml:lang="zh-TW">server</title>
-            <description xml:lang="ko">openid.server 값을 입력해 주세요.</description>
-            <description xml:lang="zh-CN">请输入 openid.server 值。</description>
-            <description xml:lang="vi">Hãy nhập OpenID Server của bạn.</description>
-			<description xml:lang="en">Please input your openid.server value.</description>
-            <description xml:lang="ge">Bitte geben Sie Ihre openid.server Wert.</description>
-            <description xml:lang="es">Ingrese el valor del openid.server.</description>
-            <description xml:lang="jp">openid.server値を入力して下さい。</description>
-            <description xml:lang="ru">Пожалуйста, введите Ваше значение openid.server</description>
-            <description xml:lang="zh-TW">請輸入 openid.server 值。</description>
-        </var>
-        <var name="delegate">
-            <title xml:lang="ko">delegate</title>
-            <title xml:lang="en">delegate</title>
-            <title xml:lang="vi">Delegate</title>
-            <title xml:lang="ge">delegate</title>
-            <title xml:lang="zh-CN">delegate</title>
-            <title xml:lang="es">delegado</title>
-            <title xml:lang="jp">delegate</title>
-            <title xml:lang="ru">delegate</title>
-            <title xml:lang="zh-TW">delegate</title>
-            <description xml:lang="ko">openid.delegate값을 입력해주세요.</description>
-            <description xml:lang="zh-CN">请输入 openid.delegate 值。</description>
-            <description xml:lang="vi">Hãy nhập OpenID Delegate của bạn.</description>
-			<description xml:lang="en">Please input your openid.delegate value.</description>
-            <description xml:lang="ge">Bitte geben Sie Ihre openid.delegate Wert.</description>
-            <description xml:lang="es">Ingresar el valor del openid.delegate</description>
-            <description xml:lang="jp">openid.delegate値を入力して下さい。</description>
-            <description xml:lang="ru">Пожалуйста, введите Ваше значение openid.delegate</description>
-            <description xml:lang="zh-TW">請輸入 openid.delegate 值。</description>
-        </var>
-        <var name="xrds">
-            <title xml:lang="ko">xrds</title>
-            <title xml:lang="zh-CN">xrds</title>
-            <title xml:lang="en">xrds</title>
-            <title xml:lang="vi">xrds</title>
-            <title xml:lang="ge">xrds</title>
-            <title xml:lang="es">xrds</title>
-            <title xml:lang="jp">xrds</title>
-            <title xml:lang="ru">xrds</title>
-            <title xml:lang="zh-TW">xrds</title>
-            <description xml:lang="ko">X-XRDS-Location값을 입력해주세요.</description>
-            <description xml:lang="zh-CN">请输入 X-XRDS-Location 值。</description>
-            <description xml:lang="en">Please input your X-XRDS-Location value.</description>
-            <description xml:lang="vi">Hãy nhập X-XRDS-Location của bạn.</description>
-            <description xml:lang="ge">Bitte geben Sie Ihre X-XRDS-Standort Wert.</description>
-            <description xml:lang="es">Ingresar el valor de X-XRDS-Location</description>
-            <description xml:lang="jp">X-XRDS-Location値を入力して下さい。</description>
-            <description xml:lang="ru">Пожалуйста, введите Ваше значение X-XRDS-Локации.</description>
-            <description xml:lang="zh-TW">請輸入 X-XRDS-Location 值。</description>
-        </var>
-    </extra_vars>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">OpenID delegation ID</title>
+    <title xml:lang="zh-CN">OpenID</title>
+    <title xml:lang="en">OpenID Delegation ID</title>
+    <title xml:lang="vi">OpenID Delegation ID</title>
+    <title xml:lang="ge">OpenID Delegation ID</title>
+    <title xml:lang="es">Delegación ID para OpenID</title>
+    <title xml:lang="jp">OpenIDアドオン</title>
+    <title xml:lang="ru">Открытый ID(OpenID)</title>
+    <title xml:lang="zh-TW">OpenID</title>
+    <description xml:lang="ko">
+        본인의 도메인을 사용하여 오픈아이디로 활용할 수 있도록 합니다.
+        꼭 설정을 통해서 openid provider관련 값을 입력후 사용해주세요.
+    </description>
+    <description xml:lang="zh-CN">
+        可以把本人的域名当分散式身份验证系统(OpenID)来使用。
+        必须在设置中输入openid provider相关值后再使用。
+    </description>
+    <description xml:lang="en">
+        This addon enables you to use your own domain name as an OpenID.
+        Just be sure to set the values related with openid provider before using.
+    </description>
+    <description xml:lang="vi">
+        Addon này cho phép bạn sử dụng tên miền của mình như một OpenID.
+        Hãy kiểm tra để đặt giá trị liên quan với OpenID trước khi sử dụng.
+    </description>
+    <description xml:lang="ge">
+        Dieses Addon ermöglicht es Ihnen, mit Ihrem eigenen Domain-Namen als OpenID.
+        Einfach sicher sein, dass die Werte im Zusammenhang mit OpenID-Provider, bevor Sie.
+    </description>
+    <description xml:lang="es">
+        Utlizando su propio dominio puede usar como OpenID.
+        Debe utilizar luego de ingresar los valores relacionado con openid provider a través de la configuracion.
+    </description>
+    <description xml:lang="jp">
+        保有しているオリジナルドメインをオープンＩＤとして活用することが出来ます。
+        必ず設定にて、OpenIDプロバイダーの関連情報を入力してから使用して下さい。
+    </description>
+    <description xml:lang="ru">
+        Этот аддон позволяет Вам использовать Ваше доменное имя как OpenID.
+        Прежде, чем использовать, установите значения, имеющие отношение к openid-провайдеру .
+    </description>
+    <description xml:lang="zh-TW">
+        可將原本的域名當做OpenID來使用。
+        必須在設置中輸入openid provider相關資料後再使用。
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+
+    <extra_vars>
+        <var name="server">
+            <title xml:lang="ko">server</title>
+            <title xml:lang="zh-CN">server</title>
+            <title xml:lang="en">server</title>
+            <title xml:lang="vi">Server</title>
+            <title xml:lang="ge">server</title>
+            <title xml:lang="es">Servidor</title>
+            <title xml:lang="jp">server</title>
+            <title xml:lang="ru">server</title>
+            <title xml:lang="zh-TW">server</title>
+            <description xml:lang="ko">openid.server 값을 입력해 주세요.</description>
+            <description xml:lang="zh-CN">请输入 openid.server 值。</description>
+            <description xml:lang="vi">Hãy nhập OpenID Server của bạn.</description>
+			<description xml:lang="en">Please input your openid.server value.</description>
+            <description xml:lang="ge">Bitte geben Sie Ihre openid.server Wert.</description>
+            <description xml:lang="es">Ingrese el valor del openid.server.</description>
+            <description xml:lang="jp">openid.server値を入力して下さい。</description>
+            <description xml:lang="ru">Пожалуйста, введите Ваше значение openid.server</description>
+            <description xml:lang="zh-TW">請輸入 openid.server 值。</description>
+        </var>
+        <var name="delegate">
+            <title xml:lang="ko">delegate</title>
+            <title xml:lang="en">delegate</title>
+            <title xml:lang="vi">Delegate</title>
+            <title xml:lang="ge">delegate</title>
+            <title xml:lang="zh-CN">delegate</title>
+            <title xml:lang="es">delegado</title>
+            <title xml:lang="jp">delegate</title>
+            <title xml:lang="ru">delegate</title>
+            <title xml:lang="zh-TW">delegate</title>
+            <description xml:lang="ko">openid.delegate값을 입력해주세요.</description>
+            <description xml:lang="zh-CN">请输入 openid.delegate 值。</description>
+            <description xml:lang="vi">Hãy nhập OpenID Delegate của bạn.</description>
+			<description xml:lang="en">Please input your openid.delegate value.</description>
+            <description xml:lang="ge">Bitte geben Sie Ihre openid.delegate Wert.</description>
+            <description xml:lang="es">Ingresar el valor del openid.delegate</description>
+            <description xml:lang="jp">openid.delegate値を入力して下さい。</description>
+            <description xml:lang="ru">Пожалуйста, введите Ваше значение openid.delegate</description>
+            <description xml:lang="zh-TW">請輸入 openid.delegate 值。</description>
+        </var>
+        <var name="xrds">
+            <title xml:lang="ko">xrds</title>
+            <title xml:lang="zh-CN">xrds</title>
+            <title xml:lang="en">xrds</title>
+            <title xml:lang="vi">xrds</title>
+            <title xml:lang="ge">xrds</title>
+            <title xml:lang="es">xrds</title>
+            <title xml:lang="jp">xrds</title>
+            <title xml:lang="ru">xrds</title>
+            <title xml:lang="zh-TW">xrds</title>
+            <description xml:lang="ko">X-XRDS-Location값을 입력해주세요.</description>
+            <description xml:lang="zh-CN">请输入 X-XRDS-Location 值。</description>
+            <description xml:lang="en">Please input your X-XRDS-Location value.</description>
+            <description xml:lang="vi">Hãy nhập X-XRDS-Location của bạn.</description>
+            <description xml:lang="ge">Bitte geben Sie Ihre X-XRDS-Standort Wert.</description>
+            <description xml:lang="es">Ingresar el valor de X-XRDS-Location</description>
+            <description xml:lang="jp">X-XRDS-Location値を入力して下さい。</description>
+            <description xml:lang="ru">Пожалуйста, введите Ваше значение X-XRDS-Локации.</description>
+            <description xml:lang="zh-TW">請輸入 X-XRDS-Location 值。</description>
+        </var>
+    </extra_vars>
+</addon>
diff --git a/addons/openid_delegation_id/openid_delegation_id.addon.php b/addons/openid_delegation_id/openid_delegation_id.addon.php
index aa5a373dd..db1e90c88 100644
--- a/addons/openid_delegation_id/openid_delegation_id.addon.php
+++ b/addons/openid_delegation_id/openid_delegation_id.addon.php
@@ -1,29 +1,27 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file openid_delegation_id.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief OpenID Delegation ID 애드온
-     *
-     * 오픈아이디를 자신의 홈페이지나 블로그 주소로 이용할 수 있도록 해줍니다.
-     * 꼭 설정을 통해서 사용하시는 오픈아이디 서비스에 해당하는 정보를 입력해주세요.
-     **/
-
-    // called_position이 before_module_init일때만 실행
-    if($called_position != 'before_module_init') return;
-
-    // openid_delegation_id 애드온 설정 정보를 가져옴
-    if(!$addon_info->server||!$addon_info->delegate||!$addon_info->xrds) return;
-
-    $header_script = sprintf(
-        '<link rel="openid.server" href="%s" />'."\n".
-        '<link rel="openid.delegate" href="%s" />'."\n".
-        '<meta http-equiv="X-XRDS-Location" content="%s" />',
-        $addon_info->server,
-        $addon_info->delegate,
-        $addon_info->xrds
-    );
-
-    Context::addHtmlHeader($header_script);
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file openid_delegation_id.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief OpenID Delegation ID Add-on
+ *
+ * This enables to use openID as user's homepage or blog url.
+ * Enter your open ID service information on the configuration.
+ **/
+// Execute only wen called_position is before_module_init
+if($called_position != 'before_module_init') return;
+// Get add-on settings(openid_delegation_id)
+if(!$addon_info->server||!$addon_info->delegate||!$addon_info->xrds) return;
+
+$header_script = sprintf(
+	'<link rel="openid.server" href="%s" />'."\n".
+	'<link rel="openid.delegate" href="%s" />'."\n".
+	'<meta http-equiv="X-XRDS-Location" content="%s" />',
+	$addon_info->server,
+	$addon_info->delegate,
+	$addon_info->xrds
+);
+
+Context::addHtmlHeader($header_script);
+?>
diff --git a/addons/point_level_icon/conf/info.xml b/addons/point_level_icon/conf/info.xml
index adde6ae69..201cdfb7c 100644
--- a/addons/point_level_icon/conf/info.xml
+++ b/addons/point_level_icon/conf/info.xml
@@ -1,62 +1,62 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">포인트 레벨 아이콘 표시 애드온</title>
-    <title xml:lang="zh-CN">积分级别图标</title>
-    <title xml:lang="jp">ポイントレベルアイコン表示アドオン</title>
-    <title xml:lang="en">Point Level Icon</title>
-    <title xml:lang="vi">Icon cấp độ của điểm</title>
-    <title xml:lang="ge">Point-Level-Symbol</title>
-    <title xml:lang="es">Addon para mostar el nivel del ícono</title>
-    <title xml:lang="ru">Иконка уровня поинтов</title>
-    <title xml:lang="zh-TW">點數等級圖案</title>
-    <description xml:lang="ko">
-        포인트 시스템을 사용중일 경우 사용자 이름 앞에 레벨 아이콘을 표시하도록 합니다.
-        레벨 아이콘은 모듈 &gt; 포인트시스템에서 선택 가능합니다.
-    </description>
-    <description xml:lang="zh-CN">
-        使用积分系统时，可以在用户名前显示级别图标。
-        级别图标可以在模块 &gt; 积分系统中进行选择。
-    </description>
-    <description xml:lang="jp">
-        ポイントシステムを使用する場合、ユーザ名の前にレベルアイコンの表示します。
-        レベルアイコンは、「モジュール &gt; ポイントシステム」で選択します。
-    </description>
-    <description xml:lang="en">
-        This addon displays level icon in front of the user name when you are using the point system.
-        You can choose the level icon in Module &gt; Point System.
-    </description>
-    <description xml:lang="vi">
-        Addon này sẽ hiển thị Icon cấp độ trước tên người sử dụng khi bạn sử dụng hệ thống tính điểm.
-        Bạn có thể chọn Icon cấp độ tại Module &gt; cỉa hệ thống điểm.
-    </description>
-    <description xml:lang="ge">
-        Dieses Addon zeigt Level Icon vor dem Benutzernamen, wenn Sie die Punkte-System.
-        Sie können wählen, der Level Icon in Modul> Point-System.
-    </description>
-    <description xml:lang="es">
-        Este addon muestra el nivel del ícono delante del nombre del usuario cuando es usado el sistema de puntos.
-        Tu puedes elegir los icono de cada nivel en el módulo &gt; Sistema de Puntos.
-    </description>
-    <description xml:lang="ru">
-        Этот аддон отображает иконку уровня поинтов напротив имени пользователя, когда используется система поинтов.
-        Вы можете выбрать иконку уровня в Модуле Системы Поинтов.
-    </description>
-    <description xml:lang="zh-TW">
-        使用點數系統時，可以在用戶名前顯示等級圖案。
-        等級圖案可以在模組 &gt; 點數系統中進行選擇。
-    </description>
-    <version>0.1</version>
-    <date>2007-07-26</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">포인트 레벨 아이콘 표시 애드온</title>
+    <title xml:lang="zh-CN">积分级别图标</title>
+    <title xml:lang="jp">ポイントレベルアイコン表示アドオン</title>
+    <title xml:lang="en">Point Level Icon</title>
+    <title xml:lang="vi">Icon cấp độ của điểm</title>
+    <title xml:lang="ge">Point-Level-Symbol</title>
+    <title xml:lang="es">Addon para mostar el nivel del ícono</title>
+    <title xml:lang="ru">Иконка уровня поинтов</title>
+    <title xml:lang="zh-TW">點數等級圖案</title>
+    <description xml:lang="ko">
+        포인트 시스템을 사용중일 경우 사용자 이름 앞에 레벨 아이콘을 표시하도록 합니다.
+        레벨 아이콘은 모듈 &gt; 포인트시스템에서 선택 가능합니다.
+    </description>
+    <description xml:lang="zh-CN">
+        使用积分系统时，可以在用户名前显示级别图标。
+        级别图标可以在模块 &gt; 积分系统中进行选择。
+    </description>
+    <description xml:lang="jp">
+        ポイントシステムを使用する場合、ユーザ名の前にレベルアイコンの表示します。
+        レベルアイコンは、「モジュール &gt; ポイントシステム」で選択します。
+    </description>
+    <description xml:lang="en">
+        This addon displays level icon in front of the user name when you are using the point system.
+        You can choose the level icon in Module &gt; Point System.
+    </description>
+    <description xml:lang="vi">
+        Addon này sẽ hiển thị Icon cấp độ trước tên người sử dụng khi bạn sử dụng hệ thống tính điểm.
+        Bạn có thể chọn Icon cấp độ tại Module &gt; cỉa hệ thống điểm.
+    </description>
+    <description xml:lang="ge">
+        Dieses Addon zeigt Level Icon vor dem Benutzernamen, wenn Sie die Punkte-System.
+        Sie können wählen, der Level Icon in Modul> Point-System.
+    </description>
+    <description xml:lang="es">
+        Este addon muestra el nivel del ícono delante del nombre del usuario cuando es usado el sistema de puntos.
+        Tu puedes elegir los icono de cada nivel en el módulo &gt; Sistema de Puntos.
+    </description>
+    <description xml:lang="ru">
+        Этот аддон отображает иконку уровня поинтов напротив имени пользователя, когда используется система поинтов.
+        Вы можете выбрать иконку уровня в Модуле Системы Поинтов.
+    </description>
+    <description xml:lang="zh-TW">
+        使用點數系統時，可以在用戶名前顯示等級圖案。
+        等級圖案可以在模組 &gt; 點數系統中進行選擇。
+    </description>
+    <version>0.1</version>
+    <date>2007-07-26</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/point_level_icon/point_level_icon.addon.php b/addons/point_level_icon/point_level_icon.addon.php
index bbf847334..28cedf744 100644
--- a/addons/point_level_icon/point_level_icon.addon.php
+++ b/addons/point_level_icon/point_level_icon.addon.php
@@ -1,19 +1,18 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file point.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 포인트 레벨 아이콘 표시 애드온
-     *
-     * 포인트 시스템 사용중일때 사용자 이름 앞에 포인트 레벨 아이콘을 표시합니다.
-     **/
-
-    // before_display_content 가 아니면 return
-    if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
-
-    require_once('./addons/point_level_icon/point_level_icon.lib.php');
-
-    $oPointController = &getController('point');
-    $output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file point.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Icon-on-point level
+ *
+ * Display point level icon before user name when point system is enabled.
+ **/
+// return unless before_display_content
+if($called_position != "before_display_content" || Context::get('act')=='dispPageAdminContentModify') return;
+
+require_once('./addons/point_level_icon/point_level_icon.lib.php');
+
+$oPointController = &getController('point');
+$output = preg_replace_callback('!<(div|span|a)([^\>]*)member_([0-9\-]+)([^\>]*)>(.*?)\<\/(div|span|a)\>!is', 'pointLevelIconTrans', $output);
+?>
diff --git a/addons/point_level_icon/point_level_icon.lib.php b/addons/point_level_icon/point_level_icon.lib.php
index 749eda5a7..23daedd7c 100644
--- a/addons/point_level_icon/point_level_icon.lib.php
+++ b/addons/point_level_icon/point_level_icon.lib.php
@@ -1,56 +1,52 @@
 <?php
-    /**
-     * @brief 포인트 아이콘 변경을 위한 함수.
-     **/
-    function pointLevelIconTrans($matches) {
-        $member_srl = $matches[3];
-        if($member_srl<1) return $matches[0];
+/**
+ * @brief Function to change point icon.
+ **/
+function pointLevelIconTrans($matches) {
+	$member_srl = $matches[3];
+	if($member_srl<1) return $matches[0];
 
-        $orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
+	$orig_text = preg_replace('/'.preg_quote($matches[5],'/').'<\/'.$matches[6].'>$/', '', $matches[0]);
 
-		// Check Group Image Mark
-		$oMemberModel = &getModel('member');
-		if($oMemberModel->getGroupImageMark($member_srl)) return $orig_text.$matches[5].'</'.$matches[6].'>';
+	// Check Group Image Mark
+	$oMemberModel = &getModel('member');
+	if($oMemberModel->getGroupImageMark($member_srl)) return $orig_text.$matches[5].'</'.$matches[6].'>';
 
-        if(!isset($GLOBALS['_pointLevelIcon'][$member_srl])) {
-            // 포인트 설정을 구해옴
-            if(!$GLOBALS['_pointConfig']) {
-                $oModuleModel = &getModel('module');
-                $GLOBALS['_pointConfig'] = $oModuleModel->getModuleConfig('point');
-            }
-            $config = $GLOBALS['_pointConfig'];
+	if(!isset($GLOBALS['_pointLevelIcon'][$member_srl])) {
+		// Get point configuration
+		if(!$GLOBALS['_pointConfig']) {
+			$oModuleModel = &getModel('module');
+			$GLOBALS['_pointConfig'] = $oModuleModel->getModuleConfig('point');
+		}
+		$config = $GLOBALS['_pointConfig'];
+		// Get point model
+		if(!$GLOBALS['_pointModel']) $GLOBALS['_pointModel'] = getModel('point');
+		$oPointModel = &$GLOBALS['_pointModel'];
+		// Get points
+		if(!$oPointModel->isExistsPoint($member_srl)) return $matches[0];
+		$point = $oPointModel->getPoint($member_srl);
+		// Get level
+		$level = $oPointModel->getLevel($point, $config->level_step);
+		$text = $matches[5];
+		// Get a path where level icon is
+		$level_icon = sprintf('%smodules/point/icons/%s/%d.gif', Context::getRequestUri(), $config->level_icon, $level);
+		// Get per to go to the next level if not a top level
+		if($level < $config->max_level) {
+			$next_point = $config->level_step[$level+1];
+			$present_point = $config->level_step[$level];
+			if($next_point > 0) { 
+				$per = (int)(($point - $present_point) / ($next_point - $present_point)*100);
+				$per = $per.'%';
+			}
+		}
 
-            // 포인트 모델을 구해 놓음
-            if(!$GLOBALS['_pointModel']) $GLOBALS['_pointModel'] = getModel('point');
-            $oPointModel = &$GLOBALS['_pointModel'];
+		$title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per?' ('.$per.')':'', Context::getLang('level'), $level, $config->max_level);
+		$alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
 
-            // 포인트를 구함
-            $point = $oPointModel->getPoint($member_srl);
+		$GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" style="vertical-align:middle; margin-right:3px;" />', $level_icon, $alt, $title);
+	}
+	$text = $GLOBALS['_pointLevelIcon'][$member_srl];
 
-            // 레벨을 구함
-            $level = $oPointModel->getLevel($point, $config->level_step);
-            $text = $matches[5];
-
-            // 레벨 아이콘의 위치를 구함
-            $level_icon = sprintf('%smodules/point/icons/%s/%d.gif', Context::getRequestUri(), $config->level_icon, $level);
-
-            // 최고 레벨이 아니면 다음 레벨로 가기 위한 per을 구함 :: 주석과 실제 내용이 맞지 않아 실제 내용을 수정
-            if($level < $config->max_level) {
-                $next_point = $config->level_step[$level+1];
-                $present_point = $config->level_step[$level];
-                if($next_point > 0) { 
-                    $per = (int)(($point - $present_point) / ($next_point - $present_point)*100);
-                    $per = $per.'%';
-                }
-            }
-
-            $title = sprintf('%s:%s%s%s, %s:%s/%s', Context::getLang('point'), $point, $config->point_name, $per?' ('.$per.')':'', Context::getLang('level'), $level, $config->max_level);
-            $alt = sprintf('[%s:%s]', Context::getLang('level'), $level);
-
-            $GLOBALS['_pointLevelIcon'][$member_srl] = sprintf('<img src="%s" alt="%s" title="%s" style="vertical-align:middle; margin-right:3px;" />', $level_icon, $alt, $title);
-        }
-        $text = $GLOBALS['_pointLevelIcon'][$member_srl];
-
-        return $orig_text.$text.$matches[5].'</'.$matches[6].'>';
-    }
+	return $orig_text.$text.$matches[5].'</'.$matches[6].'>';
+}
 ?>
diff --git a/addons/resize_image/conf/info.xml b/addons/resize_image/conf/info.xml
index b16c38058..e50589268 100644
--- a/addons/resize_image/conf/info.xml
+++ b/addons/resize_image/conf/info.xml
@@ -1,53 +1,53 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<addon version="0.2">
-    <title xml:lang="ko">본문내 이미지 조절 애드온</title>
-    <title xml:lang="jp">本文内イメージリーサイズアドオン</title>
-    <title xml:lang="zh-CN">内容区图片缩放插件</title>
-    <title xml:lang="en">Image Resizer</title>
-    <title xml:lang="vi">Thay đổi cỡ hình ảnh</title>
-    <title xml:lang="es">Imagen de control add-on bonmunnae</title>
-    <title xml:lang="ru">Аддон редактирования размера картинки в тексте</title>
-    <title xml:lang="ge">Image-Add-on bonmunnae</title>
-    <title xml:lang="zh-TW">圖片縮放</title>
-    <description xml:lang="ko">
-        본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
-    </description>
-    <description xml:lang="jp">
-        本文内に挿入されたイメージのサイズを本文の幅サイズに合わせてリーサイズし、クリックした時、オリジナルサイズのイメージを表示します。
-    </description>
-    <description xml:lang="zh-CN">
-        自动调整主题内容区内的图片大小，点击将显示原始大小的插件。
-    </description>
-    <description xml:lang="vi">
-        Addon này sẽ lấy lại kích thước nguyên bản của hình ảnh trong bài viết hoặc bình luận khi bạn bấm vào hình.
-    </description>
-	<description xml:lang="en">
-        This addon resizes images inserted in the article, and shows original image when you click on them.
-    </description>
-    <description xml:lang="es">
-        La imagen corporal se inserta dentro del cuerpo para que se adapte al tamaño de la muestra original cuando hago clic en los add-ons.
-    </description>
-    <description xml:lang="ru">
-        Аддон, изменяющий размер картинки к размеру текста, при клике на картинку, появляется полное изображение.
-    </description>
-    <description xml:lang="ge">
-        Body Bild eingefügt im Inneren des Körpers zu passen die Größe des Originals zeigen, wenn ich darauf klicke auf das Add-ons.
-    </description>
-    <description xml:lang="zh-TW">
-        自動調整文章内的圖片大小，點擊圖片後會顯示原始大小。
-    </description>
-    <version>0.1</version>
-    <date>2008-04-22</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</addon>
+<?xml version="1.0" encoding="UTF-8"?>
+<addon version="0.2">
+    <title xml:lang="ko">본문내 이미지 조절 애드온</title>
+    <title xml:lang="jp">本文内イメージリーサイズアドオン</title>
+    <title xml:lang="zh-CN">内容区图片缩放插件</title>
+    <title xml:lang="en">Image Resizer</title>
+    <title xml:lang="vi">Thay đổi cỡ hình ảnh</title>
+    <title xml:lang="es">Imagen de control add-on bonmunnae</title>
+    <title xml:lang="ru">Аддон редактирования размера картинки в тексте</title>
+    <title xml:lang="ge">Image-Add-on bonmunnae</title>
+    <title xml:lang="zh-TW">圖片縮放</title>
+    <description xml:lang="ko">
+        본문내에 삽입된 이미지의 크기를 본문크기에 맞게 하고 클릭시 원본을 보여주는 애드온입니다.
+    </description>
+    <description xml:lang="jp">
+        本文内に挿入されたイメージのサイズを本文の幅サイズに合わせてリーサイズし、クリックした時、オリジナルサイズのイメージを表示します。
+    </description>
+    <description xml:lang="zh-CN">
+        自动调整主题内容区内的图片大小，点击将显示原始大小的插件。
+    </description>
+    <description xml:lang="vi">
+        Addon này sẽ lấy lại kích thước nguyên bản của hình ảnh trong bài viết hoặc bình luận khi bạn bấm vào hình.
+    </description>
+	<description xml:lang="en">
+        This addon resizes images inserted in the article. When clicked, the original images are shown.
+    </description>
+    <description xml:lang="es">
+        La imagen corporal se inserta dentro del cuerpo para que se adapte al tamaño de la muestra original cuando hago clic en los add-ons.
+    </description>
+    <description xml:lang="ru">
+        Аддон, изменяющий размер картинки к размеру текста, при клике на картинку, появляется полное изображение.
+    </description>
+    <description xml:lang="ge">
+        Body Bild eingefügt im Inneren des Körpers zu passen die Größe des Originals zeigen, wenn ich darauf klicke auf das Add-ons.
+    </description>
+    <description xml:lang="zh-TW">
+        自動調整文章内的圖片大小，點擊圖片後會顯示原始大小。
+    </description>
+    <version>0.1</version>
+    <date>2008-04-22</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</addon>
diff --git a/addons/resize_image/js/resize_image.js b/addons/resize_image/js/resize_image.js
index 70c3d02ed..be1e197eb 100644
--- a/addons/resize_image/js/resize_image.js
+++ b/addons/resize_image/js/resize_image.js
@@ -121,21 +121,18 @@ function getScreen() {
 			prevbtn.css("visibility", (this.index>0)?"visible":"hidden");
 			nextbtn.css("visibility", (this.index<this.list.size()-1)?"visible":"hidden");
 
-            //textyle 이미지 리사이즈 처리
-            var src = this.list.eq(this.index).attr("rawsrc");
-            if(!src) src = this.list.eq(this.index).attr("src");
-
-			imgframe.attr("src", src).css({
-    					left : Math.round( Math.max( (clientWidth-imgframe.width()-14)/2, 0 ) ) + "px",
-    					top  : Math.round( Math.max( (clientHeight-imgframe.height()-14)/2, 0 ) ) + "px"
-    				});
+            //textyle 이미지 리사이즈 처리
+            var src = this.list.eq(this.index).attr("rawsrc");
+            if(!src) src = this.list.eq(this.index).attr("src");
+
+			imgframe.attr("src", src).css({
+				left : Math.round( Math.max( (clientWidth-imgframe.width()-14)/2, 0 ) ) + "px",
+				top  : Math.round( Math.max( (clientHeight-imgframe.height()-14)/2, 0 ) ) + "px"
+			});
 		};
 
 		// 스크린을 닫는 상황
-		$(document).scroll(xScreen.xeHide);
 		$(document).keydown(xScreen.xeHide);
-		$(window).resize(xScreen.xeHide);
-		$(window).scroll(xScreen.xeHide);
 	} else {
 		controls = $("#xe_gallery_controls");
 		imgframe = $("#xe_gallery_holder");
@@ -149,7 +146,7 @@ function getScreen() {
 
 // 이미지 슬라이드를 보는 함수
 function slideshow(event) {
-	var container  = $(this).parents(".xe_content");
+	var container  = $(this).closest('.xe_content');
 	var imglist    = container.find("img[rel=xe_gallery]");
 	var currentIdx = $.inArray($(this).get(0), imglist.get());
 	var xScreen    = getScreen();
@@ -203,8 +200,7 @@ $(function() {
 	}
 
 	$('div.xe_content').each(function() {
-		dummy.appendTo(this);
-		var contentWidth = dummy.width();
+		var contentWidth = dummy.appendTo(this).width();
 		dummy.remove();
 		if(!contentWidth) return;
 
diff --git a/addons/resize_image/js/resize_image.min.js b/addons/resize_image/js/resize_image.min.js
index ac5ad7276..659fd9f56 100644
--- a/addons/resize_image/js/resize_image.min.js
+++ b/addons/resize_image/js/resize_image.min.js
@@ -1,9 +1,9 @@
 /**
  * @brief 화면내에서 상위 영역보다 이미지가 크면 리사이즈를 하고 클릭시 원본을 보여줄수 있도록 변경
  **/
-(function($){var xScreen=null;function getScreen(){var body=$(document.body);var controls,imgframe,closebtn,prevbtn,nextbtn;if(!xScreen){xScreen=$("<div>").attr("id","xe_gallery_screen").css({position:"absolute",display:"none",backgroundColor:"black",zIndex:500,opacity:0.5});controls=$("<div>").attr("id","xe_gallery_controls").css({position:"absolute",display:"none",overflow:"hidden",zIndex:510});closebtn=$("<img>").attr("id","xe_gallery_closebtn").attr("src",request_uri+"addons/resize_image/iconClose.png").css({top:"10px"}).click(function(){xScreen.xeHide()}).appendTo(controls);prevbtn=$("<img>").attr("id","xe_gallery_prevbtn").attr("src",request_uri+"addons/resize_image/iconLeft.png").css("left","10px").click(function(){xScreen.xePrev()}).appendTo(controls);nextbtn=$("<img>").attr("id","xe_gallery_nextbtn").attr("src",request_uri+"addons/resize_image/iconRight.png").css("right","10px").click(function(){xScreen.xeNext()}).appendTo(controls);controls.find("img").attr({width:60,height:60,className:"iePngFix"}).css({position:"absolute",width:"60px",height:"60px",zIndex:530,cursor:"pointer"});imgframe=$("<img>").attr("id","xe_gallery_holder").css("border","7px solid white").css("zIndex",520).appendTo(controls).draggable();body.append(xScreen).append(controls);xScreen.xeShow=function(){var clientWidth=$(window).width();var clientHeight=$(window).height();$("#xe_gallery_controls,#xe_gallery_screen").css({display:"block",width:clientWidth+"px",height:clientHeight+"px",left:$(document).scrollLeft(),top:$(document).scrollTop()});closebtn.css("left",Math.round((clientWidth-60)/2)+"px");$("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top",Math.round((clientHeight-60)/2)+"px");this.xeMove(0);};xScreen.xeHide=function(event){xScreen.css("display","none");controls.css("display","none");};xScreen.xePrev=function(){this.xeMove(-1);};xScreen.xeNext=function(){this.xeMove(1);};xScreen.xeMove=function(val){var clientWidth=$(window).width();var clientHeight=$(window).height();this.index+=val;prevbtn.css("visibility",(this.index>0)?"visible":"hidden");nextbtn.css("visibility",(this.index<this.list.size()-1)?"visible":"hidden");var src=this.list.eq(this.index).attr("rawsrc");if(!src)src=this.list.eq(this.index).attr("src");imgframe.attr("src",src).css({left:Math.round(Math.max((clientWidth-imgframe.width()-14)/2,0))+"px",top:Math.round(Math.max((clientHeight-imgframe.height()-14)/2,0))+"px"});};$(document).scroll(xScreen.xeHide);$(document).keydown(xScreen.xeHide);$(window).resize(xScreen.xeHide);$(window).scroll(xScreen.xeHide);}else{controls=$("#xe_gallery_controls");imgframe=$("#xe_gallery_holder");closebtn=$("#xe_gallery_closebtn");prevbtn=$("#xe_gallery_prevbtn");nextbtn=$("#xe_gallery_nextbtn");}
+(function($){var xScreen=null;function getScreen(){var body=$(document.body);var controls,imgframe,closebtn,prevbtn,nextbtn;if(!xScreen){xScreen=$("<div>").attr("id","xe_gallery_screen").css({position:"absolute",display:"none",backgroundColor:"black",zIndex:500,opacity:0.5});controls=$("<div>").attr("id","xe_gallery_controls").css({position:"absolute",display:"none",overflow:"hidden",zIndex:510});closebtn=$("<img>").attr("id","xe_gallery_closebtn").attr("src",request_uri+"addons/resize_image/iconClose.png").css({top:"10px"}).click(function(){xScreen.xeHide()}).appendTo(controls);prevbtn=$("<img>").attr("id","xe_gallery_prevbtn").attr("src",request_uri+"addons/resize_image/iconLeft.png").css("left","10px").click(function(){xScreen.xePrev()}).appendTo(controls);nextbtn=$("<img>").attr("id","xe_gallery_nextbtn").attr("src",request_uri+"addons/resize_image/iconRight.png").css("right","10px").click(function(){xScreen.xeNext()}).appendTo(controls);controls.find("img").attr({width:60,height:60,className:"iePngFix"}).css({position:"absolute",width:"60px",height:"60px",zIndex:530,cursor:"pointer"});imgframe=$("<img>").attr("id","xe_gallery_holder").css("border","7px solid white").css("zIndex",520).appendTo(controls).draggable();body.append(xScreen).append(controls);xScreen.xeShow=function(){var clientWidth=$(window).width();var clientHeight=$(window).height();$("#xe_gallery_controls,#xe_gallery_screen").css({display:"block",width:clientWidth+"px",height:clientHeight+"px",left:$(document).scrollLeft(),top:$(document).scrollTop()});closebtn.css("left",Math.round((clientWidth-60)/2)+"px");$("#xe_gallery_prevbtn,#xe_gallery_nextbtn").css("top",Math.round((clientHeight-60)/2)+"px");this.xeMove(0);};xScreen.xeHide=function(event){xScreen.css("display","none");controls.css("display","none");};xScreen.xePrev=function(){this.xeMove(-1);};xScreen.xeNext=function(){this.xeMove(1);};xScreen.xeMove=function(val){var clientWidth=$(window).width();var clientHeight=$(window).height();this.index+=val;prevbtn.css("visibility",(this.index>0)?"visible":"hidden");nextbtn.css("visibility",(this.index<this.list.size()-1)?"visible":"hidden");var src=this.list.eq(this.index).attr("rawsrc");if(!src)src=this.list.eq(this.index).attr("src");imgframe.attr("src",src).css({left:Math.round(Math.max((clientWidth-imgframe.width()-14)/2,0))+"px",top:Math.round(Math.max((clientHeight-imgframe.height()-14)/2,0))+"px"});};$(document).keydown(xScreen.xeHide);}else{controls=$("#xe_gallery_controls");imgframe=$("#xe_gallery_holder");closebtn=$("#xe_gallery_closebtn");prevbtn=$("#xe_gallery_prevbtn");nextbtn=$("#xe_gallery_nextbtn");}
 return xScreen;}
-function slideshow(event){var container=$(this).parents(".xe_content");var imglist=container.find("img[rel=xe_gallery]");var currentIdx=$.inArray($(this).get(0),imglist.get());var xScreen=getScreen();xScreen.list=imglist;xScreen.index=currentIdx;xScreen.xeShow();}
+function slideshow(event){var container=$(this).closest('.xe_content');var imglist=container.find("img[rel=xe_gallery]");var currentIdx=$.inArray($(this).get(0),imglist.get());var xScreen=getScreen();xScreen.list=imglist;xScreen.index=currentIdx;xScreen.xeShow();}
 $(function(){var regx_skip=/(?:(modules|addons|classes|common|layouts|libs|widgets|widgetstyles)\/)/i;var regx_allow_i6pngfix=/(?:common\/tpl\/images\/blank\.gif$)/i;var dummy=$('<div style="height:1; overflow:hidden; opacity:0; display:block; clear:both;"></div>');function doResize(contentWidth,count){if(!count)count=0;if(count>=10)return;var $img=this;var beforSize={'width':$img.width(),'height':$img.height()};if(!beforSize.width||!beforSize.height){setTimeout(function(){doResize.call($img,contentWidth,++count)},200);return;}
 if(beforSize.width<=contentWidth)return;var resize_ratio=contentWidth/beforSize.width;$img.removeAttr('width').removeAttr('height').css({'width':contentWidth,'height':parseInt(beforSize.height*resize_ratio,10)});}
 $('div.xe_content').each(function(){dummy.appendTo(this);var contentWidth=dummy.width();dummy.remove();if(!contentWidth)return;$('img',this).each(function(){var $img=$(this);var imgSrc=$img.attr('src');if(regx_skip.test(imgSrc)&&!regx_allow_i6pngfix.test(imgSrc))return;$img.attr('rel','xe_gallery');doResize.call($img,contentWidth);});$('img[rel=xe_gallery]',this).live('mouseover',function(){var $img=$(this);if(!$img.parent('a').length&&!$img.attr('onclick')){$img.css('cursor','pointer').click(slideshow);}});});});})(jQuery);
diff --git a/addons/resize_image/resize_image.addon.php b/addons/resize_image/resize_image.addon.php
index bcc74e01a..5b10d33ec 100644
--- a/addons/resize_image/resize_image.addon.php
+++ b/addons/resize_image/resize_image.addon.php
@@ -1,18 +1,18 @@
-<?php
-    if(!defined("__ZBXE__")) exit();
-
-    /**
-     * @file resize_image.addon.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 본문내 이미지 조절 애드온
-     **/
-
-    if($called_position == 'after_module_proc' && Context::getResponseMethod()=="HTML") {
-		if(Mobile::isFromMobilePhone()) {
-			Context::addCssFile('./addons/resize_image/css/resize_image.mobile.css');
-		} else { 
-			Context::loadJavascriptPlugin('ui');
-			Context::addJsFile('./addons/resize_image/js/resize_image.min.js',false, '',null, 'body');
-		}
-    }
-?>
+<?php
+if(!defined('__XE__')) exit();
+
+/**
+ * @file resize_image.addon.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief Add-on to resize images in the body
+ **/
+
+if($called_position == 'after_module_proc' && Context::getResponseMethod()=="HTML") {
+	if(Mobile::isFromMobilePhone()) {
+		Context::loadFile('./addons/resize_image/css/resize_image.mobile.css', true);
+	} else {
+		Context::loadJavascriptPlugin('ui');
+		Context::loadFile(array('./addons/resize_image/js/resize_image.min.js', 'body', '', null), true);
+	}
+}
+?>
diff --git a/classes/cache/CacheApc.class.php b/classes/cache/CacheApc.class.php
index 84b6c88fc..f3e8657a4 100644
--- a/classes/cache/CacheApc.class.php
+++ b/classes/cache/CacheApc.class.php
@@ -1,72 +1,72 @@
-<?php
-    /**
-     * @class CacheApc
-     * @author NHN (developer@xpressengine.com)
-     * @brief APC Handler
-     * @version 0.1
-	 *
-     **/
-
-
-	class CacheApc extends CacheBase {
-		var $valid_time = 36000;
-
-		function getInstance($opt=null){
-            if(!$GLOBALS['__CacheApc__']) {
-                $GLOBALS['__CacheApc__'] = new CacheApc();
-            }
-            return $GLOBALS['__CacheApc__'];
-		}
-
-		function CacheApc(){
-		}
-
-		function isSupport(){
-			return function_exists('apc_add');
-		}
-
-		function put($key, $buff, $valid_time = 0){
-			if($valid_time == 0) $valid_time = $this->valid_time;
-			return apc_store(md5(_XE_PATH_.$key), array(time(), $buff), $valid_time);
-		}
-
-		function isValid($key, $modified_time = 0) {
-			$_key = md5(_XE_PATH_.$key);
-			$obj = apc_fetch($_key, $success);
-			if(!$success || !is_array($obj)) return false;
-			unset($obj[1]);
-
-			if($modified_time > 0 && $modified_time > $obj[0]) {
-				$this->_delete($_key);
-				return false;
-			}
-			
-			return true;
-		}
-
-		function get($key, $modified_time = 0) {
-			$_key = md5(_XE_PATH_.$key);
-			$obj = apc_fetch($_key, $success);
-			if(!$success || !is_array($obj)) return false;
-
-			if($modified_time > 0 && $modified_time > $obj[0]) {
-				$this->_delete($_key);
-				return false;
-			}
-
-			return $obj[1];
-		}
-
-		function _delete($_key) {
-			$this->put($_key,null,1);
-		}
-
-		function delete($key) {
-			$this->_delete(md5(_XE_PATH_.$key));
-		}
-
-		function truncate() {
-			return apc_clear_cache('user');
-		}
-	}
-?>
+<?php
+/**
+ * @class CacheApc
+ * @author NHN (developer@xpressengine.com)
+ * @brief APC Handler
+ * @version 0.1
+ **/
+
+class CacheApc extends CacheBase {
+	var $valid_time = 36000;
+
+	function getInstance($opt=null){
+		if(!$GLOBALS['__CacheApc__']) {
+			$GLOBALS['__CacheApc__'] = new CacheApc();
+		}
+		return $GLOBALS['__CacheApc__'];
+	}
+
+	function CacheApc(){
+	}
+
+	function isSupport(){
+		return function_exists('apc_add');
+	}
+
+	function put($key, $buff, $valid_time = 0){
+		if($valid_time == 0) $valid_time = $this->valid_time;
+		return apc_store(md5(_XE_PATH_.$key), array(time(), $buff), $valid_time);
+	}
+
+	function isValid($key, $modified_time = 0) {
+		$_key = md5(_XE_PATH_.$key);
+		$obj = apc_fetch($_key, $success);
+		if(!$success || !is_array($obj)) return false;
+		unset($obj[1]);
+
+		if($modified_time > 0 && $modified_time > $obj[0]) {
+			$this->_delete($_key);
+			return false;
+		}
+		
+		return true;
+	}
+
+	function get($key, $modified_time = 0) {
+		$_key = md5(_XE_PATH_.$key);
+		$obj = apc_fetch($_key, $success);
+		if(!$success || !is_array($obj)) return false;
+
+		if($modified_time > 0 && $modified_time > $obj[0]) {
+			$this->_delete($_key);
+			return false;
+		}
+
+		return $obj[1];
+	}
+
+	function _delete($_key) {
+		$this->put($_key,null,1);
+	}
+
+	function delete($key) {
+		$this->_delete($key);
+	}
+
+	function truncate() {
+		return apc_clear_cache('user');
+	}
+}
+
+/* End of file CacheApc.class.php */
+/* Location: ./classes/cache/CacheApc.class.php */
diff --git a/classes/cache/CacheHandler.class.php b/classes/cache/CacheHandler.class.php
index 4ca454a4e..b7ded39be 100644
--- a/classes/cache/CacheHandler.class.php
+++ b/classes/cache/CacheHandler.class.php
@@ -1,95 +1,130 @@
-<?php
-    /**
-     * @class CacheHandler
-     * @author NHN (developer@xpressengine.com)
-     * @brief Cache Handler
-     * @version 0.1
-	 *
-     **/
-
-    class CacheHandler extends Handler {
-			
-		var $handler = null;
-
-        function &getInstance($target='object') {
-			return new CacheHandler($target);
-        }
-
-		function CacheHandler($target, $info=null) {
-			if(!$info) $info = Context::getDBInfo();
-			if($info){
-				if($target == 'object'){
-					if($info->use_object_cache =='apc') $type = 'apc';
-					else if(substr($info->use_object_cache,0,8)=='memcache'){
-						$type = 'memcache'; 
-						$url = $info->use_object_cache;
-					}
-				}else if($target == 'template'){
-					if($info->use_template_cache =='apc') $type = 'apc';
-					else if(substr($info->use_template_cache,0,8)=='memcache'){
-						$type = 'memcache'; 
-						$url = $info->use_template_cache;
-					}
-				}
-
-				if($type){
-					$class = 'Cache' . ucfirst($type);
-					include_once sprintf('%sclasses/cache/%s.class.php', _XE_PATH_, $class);
-					$this->handler = call_user_func(array($class,'getInstance'), $url);
-				}
-			}
-		}
-
-		function isSupport(){
-			if($this->handler && $this->handler->isSupport()) return true;
-			return false;
-		}
-
-		function get($key, $modified_time = 0){
-			if(!$this->handler) return false;
-			return $this->handler->get($key, $modified_time);
-		}
-
-		function put($key, $obj, $valid_time = 0){
-			if(!$this->handler) return false;
-			return $this->handler->put($key, $obj, $valid_time);
-		}
-
-		function delete($key){
-			if(!$this->handler) return false;
-			return $this->handler->delete($key);
-		}
-
-		function isValid($key, $modified_time){
-			if(!$this->handler) return false;
-			return $this->handler->isValid($key, $modified_time);
-		}
-
-		function truncate(){
-			if(!$this->handler) return false;
-			return $this->handler->truncate();
-		}
-    }
-
-	class CacheBase{
-		function get($key, $modified_time = 0){
-			return false;
-		}
-
-		function put($key, $obj, $valid_time = 0){
-			return false;
-		}
-
-		function isValid($key, $modified_time = 0){
-			return false;
-		}
-
-		function isSupport(){
-			return false;
-		}
-
-		function truncate(){
-			return false;
-		}
-	}
-?>
+<?php
+/**
+ * @class CacheHandler
+ * @author NHN (developer@xpressengine.com)
+ * @brief Cache Handler
+ * @version 0.1
+ **/
+
+class CacheHandler extends Handler {
+	var $handler = null;
+	var $keyGroupVersions = null;
+
+	function &getInstance($target = 'object') {
+		if(!$GLOBALS['__XE_CACHE_HANDLER__'][$target]) {
+			$GLOBALS['__XE_CACHE_HANDLER__'][$target] = new CacheHandler($target);
+		}
+		return $GLOBALS['__XE_CACHE_HANDLER__'][$target];
+	}
+
+	function CacheHandler($target, $info = null) {
+		if(!$info) $info = Context::getDBInfo();
+		if($info){
+			if($target == 'object'){
+				if($info->use_object_cache =='apc') $type = 'apc';
+				else if(substr($info->use_object_cache,0,8)=='memcache'){
+					$type = 'memcache';
+					$url = $info->use_object_cache;
+				}
+			}else if($target == 'template'){
+				if($info->use_template_cache =='apc') $type = 'apc';
+				else if(substr($info->use_template_cache,0,8)=='memcache'){
+					$type = 'memcache';
+					$url = $info->use_template_cache;
+				}
+			}
+
+			if($type){
+				$class = 'Cache' . ucfirst($type);
+				include_once sprintf('%sclasses/cache/%s.class.php', _XE_PATH_, $class);
+				$this->handler = call_user_func(array($class,'getInstance'), $url);
+									$this->keyGroupVersions = $this->handler->get('key_group_versions', 0);
+									if(!$this->keyGroupVersions) {
+										$this->keyGroupVersions = array();
+										$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
+									}
+			}
+		}
+	}
+
+	function isSupport(){
+		if($this->handler && $this->handler->isSupport()) return true;
+		return false;
+	}
+
+	function get($key, $modified_time = 0){
+		if(!$this->handler) return false;
+		return $this->handler->get($key, $modified_time);
+	}
+
+	function put($key, $obj, $valid_time = 0){
+		if(!$this->handler) return false;
+		return $this->handler->put($key, $obj, $valid_time);
+	}
+
+	function delete($key){
+		if(!$this->handler) return false;
+		return $this->handler->delete($key);
+	}
+
+	function isValid($key, $modified_time){
+		if(!$this->handler) return false;
+		return $this->handler->isValid($key, $modified_time);
+	}
+
+	function truncate(){
+		if(!$this->handler) return false;
+		return $this->handler->truncate();
+	}
+
+	/**
+	 * Function used for generating keys for similar objects.
+	 *
+	 * Ex: 1:document:123
+	 *     1:document:777
+	 *
+	 * This allows easily removing all object of type "document"
+	 * from cache by simply invalidating the group key.
+	 *
+	 * The new key will be 2:document:123, thus forcing the document
+	 * to be reloaded from the database.
+	 */
+	function getGroupKey($keyGroupName, $key){
+		if(!$this->keyGroupVersions[$keyGroupName]){
+			$this->keyGroupVersions[$keyGroupName] = 1;
+			$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
+		}
+
+		return $this->keyGroupVersions[$keyGroupName] . ':' . $keyGroupName . ':' . $key;
+	}
+
+	function invalidateGroupKey($keyGroupName){
+		$this->keyGroupVersions[$keyGroupName]++;
+		$this->handler->put('key_group_versions', $this->keyGroupVersions, 0);
+	}
+}
+
+class CacheBase{
+	function get($key, $modified_time = 0){
+		return false;
+	}
+
+	function put($key, $obj, $valid_time = 0){
+		return false;
+	}
+
+	function isValid($key, $modified_time = 0){
+		return false;
+	}
+
+	function isSupport(){
+		return false;
+	}
+
+	function truncate(){
+		return false;
+	}
+}
+
+/* End of file CacheHandler.class.php */
+/* Location: ./classes/cache/CacheHandler.class.php */
diff --git a/classes/cache/CacheMemcache.class.php b/classes/cache/CacheMemcache.class.php
index 6ce27624c..80d1adfe3 100644
--- a/classes/cache/CacheMemcache.class.php
+++ b/classes/cache/CacheMemcache.class.php
@@ -1,91 +1,97 @@
-<?php
-    /**
-     * @class CacheMemcache
-     * @author NHN (developer@xpressengine.com)
-     * @brief Memcache Handler
-     * @version 0.1
-	 *
-     **/
-
-	class CacheMemcache extends CacheBase {
-
-		var $valid_time = 36000;
-		var $Memcache;
-
-		function getInstance($url){
-            if(!$GLOBALS['__CacheMemcache__']) {
-                $GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
-            }
-            return $GLOBALS['__CacheMemcache__'];
-		}
-
-		function CacheMemcache($url){
-			//$config['url'] = array('memcache://localhost:11211');
-			$config['url'] = is_array($url)?$url:array($url);
-			$this->Memcache = new Memcache;
-
-			foreach($config['url'] as $url) {
-				$info = parse_url($url);
-				$this->Memcache->addServer($info['host'], $info['port']);
-			}
-		}
-		
-		function isSupport(){
-			return $this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1);
-		}
-
-		function getKey($key){
-			return md5(_XE_PATH_.$key);
-		}
-
-		function put($key, $buff, $valid_time = 0){
-			if($valid_time == 0) $valid_time = $this->valid_time;
-
-			return $this->Memcache->set($this->getKey($key), array(time(), $buff), MEMCACHE_COMPRESSED, $valid_time);
-		}
-
-		function isValid($key, $modified_time = 0) {
-			$_key = $this->getKey($key);
-
-			$obj = $this->Memcache->get($_key);
-			if(!$obj || !is_array($obj)) return false;
-			unset($obj[1]);
-
-			if($modified_time > 0 && $modified_time > $obj[0]) {
-				$this->_delete($_key);
-				return false;
-			}
-			
-			return true;
-		}
-
-		function get($key, $modified_time = 0) {
-			$_key = $this->getKey($key);
-			$obj = $this->Memcache->get($_key);
-			if(!$obj || !is_array($obj)) return false;
-
-			if($modified_time > 0 && $modified_time > $obj[0]) {
-				$this->_delete($_key);
-				return false;
-			}
-
-			unset($obj[0]);
-
-			return $obj[1];
-		}
-
-		function delete($key) {
-			$_key = $this->getKey($key);
-			$this->_delete($_key);
-		}
-
-		function _delete($_key) {
-			$this->Memcache->delete($_key);
-		}
-
-		function truncate() {
-			// not support memcached
-			return false;
-		}
-	}
-?>
+<?php
+/**
+ * @class CacheMemcache
+ * @author NHN (developer@xpressengine.com)
+ * @brief Memcache Handler
+ * @version 0.1
+ **/
+
+class CacheMemcache extends CacheBase {
+	var $valid_time = 36000;
+	var $Memcache;
+
+	function getInstance($url){
+		if(!$GLOBALS['__CacheMemcache__']) {
+			$GLOBALS['__CacheMemcache__'] = new CacheMemcache($url);
+		}
+		return $GLOBALS['__CacheMemcache__'];
+	}
+
+	function CacheMemcache($url){
+		//$config['url'] = array('memcache://localhost:11211');
+		$config['url'] = is_array($url)?$url:array($url);
+		$this->Memcache = new Memcache;
+
+		foreach($config['url'] as $url) {
+			$info = parse_url($url);
+			$this->Memcache->addServer($info['host'], $info['port']);
+		}
+	}
+
+	function isSupport(){
+		if($GLOBALS['XE_MEMCACHE_SUPPORT']) return true;
+		if($this->Memcache->set('xe', 'xe', MEMCACHE_COMPRESSED, 1)) {
+			$GLOBALS['XE_MEMCACHE_SUPPORT'] = true;
+		} else {
+			$GLOBALS['XE_MEMCACHE_SUPPORT'] = false;
+		}
+		return $GLOBALS['XE_MEMCACHE_SUPPORT'];
+	}
+
+	function getKey($key){
+		return md5(_XE_PATH_.$key);
+	}
+
+	function put($key, $buff, $valid_time = 0){
+		if($valid_time == 0) $valid_time = $this->valid_time;
+
+		return $this->Memcache->set($this->getKey($key), array(time(), $buff), MEMCACHE_COMPRESSED, $valid_time);
+	}
+
+	function isValid($key, $modified_time = 0) {
+		$_key = $this->getKey($key);
+
+		$obj = $this->Memcache->get($_key);
+		if(!$obj || !is_array($obj)) return false;
+		unset($obj[1]);
+
+		if($modified_time > 0 && $modified_time > $obj[0]) {
+			$this->_delete($_key);
+			return false;
+		}
+
+		return true;
+	}
+
+	function get($key, $modified_time = 0) {
+		$_key = $this->getKey($key);
+		$obj = $this->Memcache->get($_key);
+		if(!$obj || !is_array($obj)) return false;
+
+		if($modified_time > 0 && $modified_time > $obj[0]) {
+			$this->_delete($_key);
+			return false;
+		}
+
+		unset($obj[0]);
+
+		return $obj[1];
+	}
+
+	function delete($key) {
+		$_key = $this->getKey($key);
+		$this->_delete($_key);
+	}
+
+	function _delete($_key) {
+		$this->Memcache->delete($_key);
+	}
+
+	function truncate() {
+		// not supported on memcached
+		return false;
+	}
+}
+
+/* End of file CacheMemcache.class.php */
+/* Location: ./classes/cache/CacheMemcache.class.php */
diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index c5e315fc8..fbcdf4f0a 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -24,8 +24,7 @@ class Context {
 	var $ftp_info = NULL;       ///< FTP info.
 
 	var $ssl_actions = array(); ///< list of actions to be sent via ssl (it is used by javascript xml handler for ajax)
-	var $js_files_map  = array(); ///< hash map of javascript files. The file name is used as a key
-	var $css_files_map = array(); ///< hash map of css files. The file name is used as a key
+	var $oFrontEndFileHandler;
 
 	var $html_header = NULL;    ///< script codes in <head>..</head>
 	var $body_class  = array();  ///< classnames of <body>
@@ -57,6 +56,14 @@ class Context {
 		return $theInstance;
 	}
 
+	/**
+	 * @brief cunstructor
+	 **/
+	function Context()
+	{
+		$this->oFrontEndFileHandler = new FrontEndFileHandler();
+	}
+
 	/**
 	 * @brief initialization, it sets DB information, request arguments and so on.
 	 * @return none
@@ -120,19 +127,20 @@ class Context {
 		$this->loadLang(_XE_PATH_.'modules/module/lang');
 
 		// set session handler
-		if($this->db_info->use_db_session != 'N') {
+		if(Context::isInstalled() && $this->db_info->use_db_session != 'N') {
 			$oSessionModel = &getModel('session');
 			$oSessionController = &getController('session');
 			session_set_save_handler(
-				array(&$oSessionController,"open"),
-				array(&$oSessionController,"close"),
-				array(&$oSessionModel,"read"),
-				array(&$oSessionController,"write"),
-				array(&$oSessionController,"destroy"),
-				array(&$oSessionController,"gc")
+				array(&$oSessionController, 'open'),
+				array(&$oSessionController, 'close'),
+				array(&$oSessionModel, 'read'),
+				array(&$oSessionController, 'write'),
+				array(&$oSessionController, 'destroy'),
+				array(&$oSessionController, 'gc')
 			);
 		}
 		session_start();
+		if($sess=$_POST[session_name()]) session_id($sess);
 
 		// set authentication information in Context and session
 		if(Context::isInstalled()) {
@@ -166,7 +174,7 @@ class Context {
 		if($_SERVER['REQUEST_METHOD'] == 'GET') {
 			if($this->get_vars) {
 				foreach($this->get_vars as $key=>$val) {
-					if(!$val) continue;
+					if(!strlen($val)) continue;
 					if(is_array($val)&&count($val)) {
 						foreach($val as $k => $v) {
 							$url .= ($url?'&':'').$key.'['.$k.']='.urlencode($v);
@@ -210,7 +218,28 @@ class Context {
 		$config_file = $self->getConfigFile();
 		if(is_readable($config_file)) @include($config_file);
 
-		if(!$db_info->time_zone) $db_info->time_zone = date("O");
+                // If master_db information does not exist, the config file needs to be updated
+                if(!isset($db_info->master_db)) {
+                    $db_info->master_db = array();
+                    $db_info->master_db["db_type"] = $db_info->db_type; unset($db_info->db_type);
+                    $db_info->master_db["db_port"] = $db_info->db_port; unset($db_info->db_port);
+                    $db_info->master_db["db_hostname"] = $db_info->db_hostname; unset($db_info->db_hostname);
+                    $db_info->master_db["db_password"] = $db_info->db_password; unset($db_info->db_password);
+                    $db_info->master_db["db_database"] = $db_info->db_database; unset($db_info->db_database);
+                    $db_info->master_db["db_userid"] = $db_info->db_userid; unset($db_info->db_userid);
+                    $db_info->master_db["db_table_prefix"] = $db_info->db_table_prefix; unset($db_info->db_table_prefix);
+                    if(substr($db_info->master_db["db_table_prefix"],-1)!='_') $db_info->master_db["db_table_prefix"] .= '_';
+
+                    $slave_db = $db_info->master_db;
+                    $db_info->slave_db = array($slave_db);
+					
+                    $self->setDBInfo($db_info);
+
+                    $oInstallController = &getController('install');
+                    $oInstallController->makeConfigFile();
+                }
+
+		if(!$db_info->time_zone) $db_info->time_zone = date('O');
 		$GLOBALS['_time_zone'] = $db_info->time_zone;
 
 		if($db_info->qmail_compatibility != 'Y') $db_info->qmail_compatibility = 'N';
@@ -231,7 +260,7 @@ class Context {
 	 **/
 	function getDBType() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-		return $self->db_info->db_type;
+		return $self->db_info->master_db["db_type"];
 	}
 
 	/**
@@ -253,6 +282,16 @@ class Context {
 		return $self->db_info;
 	}
 
+	/**
+	 * @brief return ssl status
+	 * @return none|always|optional
+	 **/
+	function getSslStatus()
+	{
+		$dbInfo = Context::getDBInfo();
+		return $dbInfo->use_ssl;
+	}
+
 	/**
 	 * @brief return default URL
 	 * @return default URL string
@@ -330,7 +369,7 @@ class Context {
 				$url_info = parse_url($url);
 				$url_info['query'].= ($url_info['query']?'&':'').'SSOID='.session_id();
 				$redirect_url = sprintf('%s://%s%s%s?%s',$url_info['scheme'],$url_info['host'],$url_info['port']?':'.$url_info['port']:'',$url_info['path'], $url_info['query']);
-				header("location:".$redirect_url);
+				header('location:'.$redirect_url);
 				return false;
 			}
 		// for sites requesting SSO validation
@@ -341,13 +380,13 @@ class Context {
 				setcookie(session_name(), $session_name);
 
 				$url = preg_replace('/([\?\&])$/','',str_replace('SSOID='.$session_name,'',Context::getRequestUrl()));
-				header("location:".$url);
+				header('location:'.$url);
 				return false;
 			// send SSO request
 			} else if($_COOKIE['sso']!=md5(Context::getRequestUri()) && !Context::get('SSOID')) {
 				setcookie('sso',md5(Context::getRequestUri()),0,'/');
 				$url = sprintf("%s?default_url=%s", $default_url, base64_encode(Context::getRequestUrl()));
-				header("location:".$url);
+				header('location:'.$url);
 				return false;
 			}
 		}
@@ -413,7 +452,7 @@ class Context {
 		$oModuleController = &getController('module');
 		$oModuleController->replaceDefinedLangCode($self->site_title);
 
-		return $self->site_title;
+		return htmlspecialchars($self->site_title);
 	}
 	/**
 	 * @deprecated
@@ -432,20 +471,61 @@ class Context {
 		if(!is_object($lang)) $lang = new stdClass;
 		if(!$self->lang_type) return;
 
-		if(substr($path,-1)!='/') $path .= '/';
-		$path_tpl = $path.'%s.lang.php';
-		$filename = sprintf($path_tpl, $self->lang_type);
-		$langs    = array('ko','en'); // this will be configurable.
-		while(!is_readable($filename) && $langs[0]) {
-			$filename = sprintf($path_tpl, array_shift($langs));
-		}
-		if(!is_readable($filename)) return;
+		$filename = $self->_loadXmlLang($path);
+		if(!$filename) $filename = $self->_loadPhpLang($path);
 
 		if(!is_array($self->loaded_lang_files)) $self->loaded_lang_files = array();
 		if(in_array($filename, $self->loaded_lang_files)) return;
-		$self->loaded_lang_files[] = $filename;
 
-		@include($filename);
+		if ($filename && is_readable($filename)){
+			$self->loaded_lang_files[] = $filename;
+			@include($filename);
+		}else{
+			$self->_evalxmlLang($path);
+		}
+	}
+
+	function _evalxmlLang($path) {
+		global $lang;
+		
+		$_path = 'eval://'.$path;
+
+		if(in_array($_path, $this->loaded_lang_files)) return;
+
+		if(substr($path,-1)!='/') $path .= '/';
+		$file = $path.'lang.xml';
+
+		$oXmlLangParser = new XmlLangParser($file, $this->lang_type);
+		$content = $oXmlLangParser->getCompileContent();
+
+		if ($content){
+			$this->loaded_lang_files[] = $_path;
+			eval($content);
+		}
+	}
+
+	function _loadXmlLang($path) {
+		if(substr($path,-1)!='/') $path .= '/';
+		$file = $path.'lang.xml';
+
+		$oXmlLangParser = new XmlLangParser($file, $this->lang_type);
+		$file = $oXmlLangParser->compile();
+
+		return $file;
+	}
+
+	function _loadPhpLang($path) {
+		if(substr($path,-1)!='/') $path .= '/';
+		$path_tpl = $path.'%s.lang.php';
+		$file = sprintf($path_tpl, $this->lang_type);
+
+		$langs = array('ko','en'); // this will be configurable.
+		while(!is_readable($file) && $langs[0]) {
+			$file = sprintf($path_tpl, array_shift($langs));
+		}
+
+		if(!is_readable($file)) return false;
+		return $file;
 	}
 
 	/**
@@ -564,15 +644,15 @@ class Context {
 
 	/**
 	 * @brief determine request method (GET/POST/XMLRPC/JSON)
-	 * @param[in] $type request method
+	 * @param[in] $type request method (optional)
 	 * @return none
 	 **/
-	function setRequestMethod($type) {
+	function setRequestMethod($type='') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
 
 		($type && $self->request_method=$type) or
-		(strpos($_SERVER['CONTENT_TYPE'],'json') && $this->request_method='JSON') or
-		($GLOBALS['HTTP_RAW_POST_DATA'] && $this->request_method='XMLRPC') or
+		(strpos($_SERVER['CONTENT_TYPE'],'json') && $self->request_method='JSON') or
+		($GLOBALS['HTTP_RAW_POST_DATA'] && $self->request_method='XMLRPC') or
 		($self->request_method = $_SERVER['REQUEST_METHOD']);
 	}
 
@@ -584,7 +664,7 @@ class Context {
 		if(!count($_REQUEST)) return;
 
 		foreach($_REQUEST as $key => $val) {
-			if($val === "" || Context::get($key)) continue;
+			if($val === '' || Context::get($key)) continue;
 			$val = $this->_filterRequestVar($key, $val);
 
 			if($this->getRequestMethod()=='GET'&&isset($_GET[$key])) $set_to_vars = true;
@@ -640,15 +720,15 @@ class Context {
 	 * @return filtered value
 	 **/
 	function _filterRequestVar($key, $val, $do_stripslashes = 1) {
-		if( ($key == "page" || $key == "cpage" || substr($key,-3)=="srl")) return !preg_match('/^[0-9,]+$/',$val)?(int)$val:$val;
+		if( ($key == 'page' || $key == 'cpage' || substr($key,-3)=='srl')) return !preg_match('/^[0-9,]+$/',$val)?(int)$val:$val;
 		if(is_array($val) && count($val) ) {
 			foreach($val as $k => $v) {
-				if($do_stripslashes && version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $v = stripslashes($v);
+				if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc()) $v = stripslashes($v);
 				$v = trim($v);
 				$val[$k] = $v;
 			}
 		} else {
-			if($do_stripslashes && version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $val = stripslashes($val);
+			if($do_stripslashes && version_compare(PHP_VERSION, '5.9.0', '<') && get_magic_quotes_gpc()) $val = stripslashes($val);
 			$val = trim($val);
 		}
 		return $val;
@@ -669,7 +749,7 @@ class Context {
 	 **/
 	function _setUploadedArgument() {
 		if($this->getRequestMethod() != 'POST') return;
-		if(!preg_match("/multipart\/form-data/i",$_SERVER['CONTENT_TYPE'])) return;
+		if(!preg_match('/multipart\/form-data/i',$_SERVER['CONTENT_TYPE'])) return;
 		if(!$_FILES) return;
 
 		foreach($_FILES as $key => $val) {
@@ -709,7 +789,7 @@ class Context {
 	 * @brief make URL with args_list upon request URL
 	 * @return result URL
 	 **/
-	function getUrl($num_args=0, $args_list=array(), $domain = null, $encode = true) {
+	function getUrl($num_args=0, $args_list=array(), $domain = null, $encode = true, $autoEncode = false) {
 		static $site_module_info = null;
 		static $current_info = null;
 
@@ -788,7 +868,9 @@ class Context {
 			// if using rewrite mod
 			if($self->allow_rewrite) {
 				$var_keys = array_keys($get_vars);
-				$target   = implode('.', $var_keys);
+				sort($var_keys);
+
+				$target = implode('.', $var_keys);
 
 				$act = $get_vars['act'];
 				$vid = $get_vars['vid'];
@@ -817,7 +899,7 @@ class Context {
 					'act.document_srl.key.vid'=>($act=='trackback')?"$vid/$srl/$key/$act":''
 				);
 
-				$query = $target_map[$target];
+				$query  = $target_map[$target];
 			}
 
 			if(!$query) {
@@ -853,18 +935,37 @@ class Context {
 			else $query = getScriptPath().$query;
 		}
 
-		return $encode?htmlspecialchars($query):$query;
+		if ($encode){
+			if($autoEncode){
+				$parsedUrl = parse_url($query);
+				parse_str($parsedUrl['query'], $output);
+				$encode_queries = array();
+				foreach($output as $key=>$value){
+					if (preg_match('/&([a-z]{2,}|#\d+);/', urldecode($value))){
+						$value = urlencode(htmlspecialchars_decode(urldecode($value)));
+					}
+					$encode_queries[] = $key.'='.$value;
+				}
+				$encode_query = implode('&', $encode_queries);
+				return htmlspecialchars($parsedUrl['path'].'?'.$encode_query);
+			}
+			else{
+				return htmlspecialchars($query);
+			}
+		}else{
+			return $query;		
+		}
 	}
 
 	/**
-	 * @brief 요청이 들어온 URL에서 argument를 제거하여 return
+	 * @brief Return after removing an argument on the requested URL
 	 **/
 	function getRequestUri($ssl_mode = FOLLOW_REQUEST_SSL, $domain = null) {
 		static $url = array();
 
 		// HTTP Request가 아니면 패스
 		if(!isset($_SERVER['SERVER_PROTOCOL'])) return ;
-		if(Context::get('_use_ssl') == "always") $ssl_mode = ENFORCE_SSL;
+		if(Context::get('_use_ssl') == 'always') $ssl_mode = ENFORCE_SSL;
 
 		if($domain) $domain_key = md5($domain);
 		else $domain_key = 'default';
@@ -903,7 +1004,7 @@ class Context {
 			elseif($url_info['port']==80) unset($url_info['port']);
 		}
 
-		$url[$ssl_mode][$domain_key] = sprintf("%s://%s%s%s",$use_ssl?'https':$url_info['scheme'], $url_info['host'], $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$url_info['path']);
+		$url[$ssl_mode][$domain_key] = sprintf('%s://%s%s%s',$use_ssl?'https':$url_info['scheme'], $url_info['host'], $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$url_info['path']);
 
 		return $url[$ssl_mode][$domain_key];
 	}
@@ -919,17 +1020,19 @@ class Context {
 	}
 
 	/**
-	 * @brief key값에 해당하는 값을 return
+	 * @brief return key value
 	 **/
 	function get($key) {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+
+		if(!isset($self->context->{$key})) return null;
 		return $self->context->{$key};
 	}
 
 	/**
-	 * @brief 받고자 하는 변수만 object에 입력하여 받음
-	 *
-	 * key1, key2, key3 .. 등의 인자를 주어 여러개의 변수를 object vars로 세팅하여 받을 수 있음
+    * @brief get a specified var in object
+    *
+    * get one more vars in object vars with given arguments(key1, key2, key3,...)
 	 **/
 	function gets() {
 		$num_args = func_num_args();
@@ -944,7 +1047,7 @@ class Context {
 	}
 
 	/**
-	 * @brief 모든 데이터를 return
+	 * @brief Return all data
 	 **/
 	function getAll() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
@@ -952,16 +1055,17 @@ class Context {
 	}
 
 	/**
-	 * @brief GET/POST/XMLRPC에서 넘어온 변수값을 return
+	 * @brief Return values from the GET/POST/XMLRPC
 	 **/
 	function getRequestVars() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-		return clone($self->get_vars);
+		if($self->get_vars) return clone($self->get_vars);
+		return new stdClass;
 	}
 
 	/**
-	 * @brief SSL로 인증되어야 할 action이 있을 경우 등록
-	 * common/js/xml_handler.js에서 이 action들에 대해서 https로 전송되도록 함
+    * @brief Register if actions is to be encrypted by SSL
+    * Those actions are sent to https in common/js/xml_handler.js
 	 **/
 	function addSSLAction($action) {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
@@ -982,6 +1086,7 @@ class Context {
 	/**
 	 * @brief normalize file path
 	 * @return normalized file path
+	 * @deprecated
 	 */
 	function normalizeFilePath($file) {
 		if(strpos($file,'://')===false && $file{0}!='/' && $file{0}!='.') $file = './'.$file;
@@ -992,37 +1097,78 @@ class Context {
 	}
 
 	/**
-	 * @brief js file을 추가
+	 * @deprecated
 	 **/
-	function addJsFile($file, $optimized = false, $targetie = '',$index=0, $type='head') {
-		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+	function getAbsFileUrl($file) {
+		$file = Context::normalizeFilePath($file);
+		if(strpos($file,'./')===0) $file = dirname($_SERVER['SCRIPT_NAME']).'/'.substr($file,2);
+		elseif(strpos($file,'../')===0) $file = Context::normalizeFilePath(dirname($_SERVER['SCRIPT_NAME'])."/{$file}");
 
-		$avail_types = array('head', 'body');
-		if(!in_array($type, $avail_types)) $type = $avail_types[0];
-
-		$key = $self->normalizeFilePath($file)."\t".$targetie;
-		$map = &$self->js_files_map;
-
-		// Is this file already registered?
-		if (!is_array($map[$type])) $map[$type] = array();
-		if (!isset($map[$type][$key]) || (int)$map[$type][$key] > (int)$index) $map[$type][$key] = (int)$index+count($map[$type])/1000-1;
+		return $file;
 	}
 
 	/**
-	 * @brief js file을 제거
+	 * @brief load front end file
+	 * @params $args array
+	 * case js
+	 *		$args[0]: file name
+	 *		$args[1]: type (head | body)
+	 *		$args[2]: target IE
+	 *		$args[3]: index
+	 * case css
+	 *		$args[0]: file name
+	 *		$args[1]: media
+	 *		$args[2]: target IE
+	 *		$args[3]: index
+	 **/
+	function loadFile($args, $useCdn = false, $cdnPrefix = '', $cdnVersion = '')
+	{
+		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+
+		if ($useCdn && !$cdnPrefix)
+		{
+			$cdnPrefix = __XE_CDN_PREFIX__;
+			$cdnVersion = __XE_CDN_VERSION__;
+		}
+
+		$self->oFrontEndFileHandler->loadFile($args, $useCdn, $cdnPrefix, $cdnVersion);
+	}
+
+	function unloadFile($file, $targetIe = '', $media = 'all')
+	{
+		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+		$self->oFrontEndFileHandler->unloadFile($file, $targetIe, $media);
+	}
+
+	function unloadAllFiles($type = 'all')
+	{
+		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+		$self->oFrontEndFileHandler->unloadAllFiles($type);
+	}
+
+	/**
+	 * @brief Add the js file
+	 * @deprecated
+	 **/
+	function addJsFile($file, $optimized = false, $targetie = '',$index=0, $type='head', $isRuleset = false) {
+		if($isRuleset)
+		{
+			$validator   = new Validator($file);
+			$validator->setCacheDir('files/cache');
+			$file = $validator->getJsPath();
+		}
+
+		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+		$self->oFrontEndFileHandler->loadFile(array($file, $type, $targetie, $index));
+	}
+
+	/**
+	 * @brief Remove the js file
+	 * @deprecated
 	 **/
 	function unloadJsFile($file, $optimized = false, $targetie = '') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-
-		$realfile = realpath($file);
-
-		foreach($self->js_files_map as $key=>$val) {
-			list($_file, $_targetie) = explode("\t", $key);
-			if(realpath($_file)==$realfile && $_targetie == $targetie) {
-				unset($self->js_files_map[$key]);
-				return;
-			}
-		}
+		$self->oFrontEndFileHandler->unloadFile($file, $targetie);
 	}
 
 	/**
@@ -1030,18 +1176,18 @@ class Context {
 	 **/
 	function unloadAllJsFiles() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-		$self->js_files_map = array();
+		$self->oFrontEndFileHandler->unloadAllJsFiles();
 	}
 
 	/**
-	 * @brief javascript filter 추가
+	 * @brief Add javascript filter
 	 **/
 	function addJsFilter($path, $filename) {
 		$oXmlFilter = new XmlJSFilter($path, $filename);
 		$oXmlFilter->compile();
 	}
 	/**
-	 * @brief array_unique와 동작은 동일하나 file 첨자에 대해서만 동작함
+	 * @brief Same as array_unique but works only for file subscript
 	 * @deprecated
  	 **/
 	function _getUniqueFileList($files) {
@@ -1063,49 +1209,25 @@ class Context {
 	 **/
 	function getJsFile($type='head') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-
-		if(!is_array($self->js_files_map[$type])) $self->js_files_map[$type] = array();
-
-		$ret = array();
-		$map = &$self->js_files_map[$type];
-
-		asort($self->js_files_map[$type]);
-
-		foreach($map as $key=>$val) {
-			list($file, $targetie) = explode("\t", $key);
-			$ret[] = array('file'=>$file, 'targetie'=>$targetie);
-		}
-
-		return $ret;
+		return $self->oFrontEndFileHandler->getJsFileList($type);
 	}
 
 	/**
-	 * @brief CSS file 추가
+	 * @brief Add CSS file
+	 * @deprecated
 	 **/
 	function addCSSFile($file, $optimized=false, $media='all', $targetie='',$index=0) {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-
-		$key = $self->normalizeFilePath($file)."\t".$targetie."\t".$media;
-		$map = &$self->css_files_map;
-
-		if (!isset($map[$key]) || (int)$map[$key] > (int)$index) $map[$key] = (int)$index+count($map)/100-1;
+		$self->oFrontEndFileHandler->loadFile(array($file, $media, $targetie, $index));
 	}
 
 	/**
-	 * @brief css file을 제거
+	 * @brief Remove css file
+	 * @deprecated
 	 **/
 	function unloadCSSFile($file, $optimized = false, $media = 'all', $targetie = '') {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-
-		$realfile = realpath($file);
-
-		foreach($self->css_files_map as $key => $val) {
-			list($_file, $_targetie, $_media) = explode("\t", $key);
-			if(realpath($_file)==$realfile && $_media==$media && $_targetie==$targetie) {
-				unset($self->css_files_map[$key]);
-				return;
-			}
-		}
+		$self->oFrontEndFileHandler->unloadFile($file, $targetie, $media);
 	}
 
 	/**
@@ -1113,7 +1235,7 @@ class Context {
 	 **/
 	function unloadAllCSSFiles() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-		$self->css_files_map = array();
+		$self->oFrontEndFileHandler->unloadAllCssFiles();
 	}
 
 	/**
@@ -1121,16 +1243,7 @@ class Context {
 	 **/
 	function getCSSFile() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
-	
-		asort($self->css_files_map);
-		$ret = array();
-		
-		foreach($self->css_files_map as $key=>$val) {
-			list($_file, $_targetie, $_media) = explode("\t", $key);
-			$ret[] = array('file'=>$_file, 'media'=>$_media, 'targetie'=>$_targetie);
-		}
-		
-		return $ret;
+		return $self->oFrontEndFileHandler->getCssFileList();
 	}
 
 	/**
@@ -1145,7 +1258,7 @@ class Context {
 		if($loaded_plugins[$plugin_name]) return;
 		$loaded_plugins[$plugin_name] = true;
 
-		$plugin_path = "./common/js/plugins/$plugin_name/";
+		$plugin_path = './common/js/plugins/'.$plugin_name.'/';
 		$info_file   = $plugin_path.'plugin.load';
 		if(!is_readable($info_file)) return;
 
@@ -1155,15 +1268,15 @@ class Context {
 			if(!$filename) continue;
 
 			if(substr($filename,0,2)=='./') $filename = substr($filename,2);
-			if(preg_match('/\.js$/i',  $filename))     $self->addJsFile($plugin_path.$filename, false, '', 0, 'body');
-			elseif(preg_match('/\.css$/i', $filename)) $self->addCSSFile($plugin_path.$filename, false, 'all', '', 0);
+			if(preg_match('/\.js$/i',  $filename))     $self->loadFile(array($plugin_path.$filename, 'body', '', 0), true);
+			elseif(preg_match('/\.css$/i', $filename)) $self->loadFile(array($plugin_path.$filename, 'all', '', 0), true);
 		}
 
 		if(is_dir($plugin_path.'lang')) $self->loadLang($plugin_path.'lang');
 	}
 
 	/**
-	 * @brief HtmlHeader 추가
+	 * @brief Add HtmlHeader
 	 **/
 	function addHtmlHeader($header) {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
@@ -1179,7 +1292,7 @@ class Context {
 	}
 
 	/**
-	 * @brief Html Body에 css class 추가
+	 * @brief Add css class to Html Body
 	 **/
 	function addBodyClass($class_name) {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
@@ -1187,7 +1300,7 @@ class Context {
 	}
 
 	/**
-	 * @brief Html Body에 css class return
+	 * @brief Return css class to Html Body
 	 **/
 	function getBodyClass() {
 		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
@@ -1232,14 +1345,14 @@ class Context {
 	 * @brief returns the path of the config file that contains database settings
 	 **/
 	function getConfigFile() {
-		return _XE_PATH_."files/config/db.config.php";
+		return _XE_PATH_.'files/config/db.config.php';
 	}
 
 	/**
 	 * @brief returns the path of the config file that contains FTP settings
 	 **/
 	function getFTPConfigFile() {
-		return _XE_PATH_."files/config/ftp.config.php";
+		return _XE_PATH_.'files/config/ftp.config.php';
 	}
 
 	/**
@@ -1251,7 +1364,7 @@ class Context {
 	}
 
 	/**
-	 * @brief 내용의 위젯이나 기타 기능에 대한 code를 실제 code로 변경
+	 * @brief Transforms codes about widget or other features into the actual code, deprecatred
 	 **/
 	function transContent($content) {
 		return $content;
@@ -1300,5 +1413,36 @@ class Context {
 		if(substr($path,-1)!='/') $path .= '/';
 		return $path;
 	}
+
+	/**
+	 * @brief returns the list of meta tags
+	 **/
+	function getMetaTag() {
+		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+
+		if(!is_array($self->meta_tags)) $self->meta_tags = array();
+
+		$ret = array();
+		$map = &$self->meta_tags;
+
+		foreach($map as $key=>$val) {
+			list($name, $is_http_equiv) = explode("\t", $key);
+			$ret[] = array('name'=>$name, 'is_http_equiv'=>$is_http_equiv, 'content' => $val);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @brief Add the meta tag
+	 **/
+	function addMetaTag($name, $content, $is_http_equiv = false) {
+		is_a($this,'Context')?$self=&$this:$self=&Context::getInstance();
+
+		$key = $name."\t".($is_http_equiv ? '1' : '0');
+		$map = &$self->meta_tags;
+
+		$map[$key] = $content;
+	}
 }
-?>
\ No newline at end of file
+?>
diff --git a/classes/db/DB.class.php b/classes/db/DB.class.php
index 8b38d39e6..85339e092 100644
--- a/classes/db/DB.class.php
+++ b/classes/db/DB.class.php
@@ -1,708 +1,846 @@
-<?php
-    /**
-     * @class DB
-     * @author NHN (developers@xpressengine.com)
-     * @brief  base class of db* classes
-     * @version 0.1
-     *
-     * usage of db in XE is via xml
-     * there are 2 types of xml - query xml, schema xml
-     * in case of query xml, DB::executeQuery() method compiles xml file into php code and then execute it
-     * query xml has unique query id, and will be created in module
-     *
-     * queryid = module_name.query_name
-     **/
-
-    class DB {
-
-        var $count_cache_path = 'files/cache/db';
-
-        var $cond_operation = array( ///< operations for condition
-            'equal' => '=',
-            'more' => '>=',
-            'excess' => '>',
-            'less' => '<=',
-            'below' => '<',
-            'notequal' => '<>',
-            'notnull' => 'is not null',
-            'null' => 'is null',
-        );
-
-        var $fd = NULL; ///< connector resource or file description
-
-        var $result = NULL; ///< result
-
-        var $errno = 0; ///< error code (0 means no error)
-        var $errstr = ''; ///< error message
-        var $query = ''; ///< query string of latest executed query
-        var $elapsed_time = 0; ///< elapsed time of latest executed query
-
-        var $transaction_started = false; ///< transaction flag
-
-        var $is_connected = false; ///< is db connected
-
-        var $supported_list = array(); ///< list of supported db, (will be written by classes/DB/DB***.class.php)
-
-        var $cache_file = 'files/cache/queries/'; ///< location of query cache
-
-        /**
-         * @brief returns instance of certain db type
-         * @param[in] $db_type type of db
-         * @return instance
-         **/
-        function &getInstance($db_type = NULL) {
-            if(!$db_type) $db_type = Context::getDBType();
-            if(!$db_type && Context::isInstalled()) return new Object(-1, 'msg_db_not_setted');
-
-            if(!$GLOBALS['__DB__']) {
-                $class_name = 'DB'.ucfirst($db_type);
-                $class_file = _XE_PATH_."classes/db/$class_name.class.php";
-                if(!file_exists($class_file)) return new Object(-1, 'msg_db_not_setted');
-
-				// get a singletone instance of the database driver class
-				require_once($class_file);
-                $GLOBALS['__DB__'][$db_type] = call_user_func(array($class_name, 'create'));
-            }
-
-            return $GLOBALS['__DB__'][$db_type];
-        }
-
-		function create() {
-			return new DB;
-		}
-
-        /**
-         * @brief constructor
-         * @return none
-         **/
-        function DB() {
-            $this->count_cache_path = _XE_PATH_.$this->count_cache_path;
-            $this->cache_file = _XE_PATH_.$this->cache_file;
-        }
-
-        /**
-         * @brief returns list of supported db
-         * @return list of supported db
-         **/
-        function getSupportedList() {
-            $oDB = new DB();
-            return $oDB->_getSupportedList();
-        }
-
-        /**
-         * @brief returns list of supported db
-         * @return list of supported db
-         **/
-        function _getSupportedList() {
-            $db_classes_path = _XE_PATH_."classes/db/";
-            $filter = "/^DB([^\.]+)\.class\.php/i";
-            $supported_list = FileHandler::readDir($db_classes_path, $filter, true);
-            sort($supported_list);
-
-            // after creating instance of class, check is supported
-            for($i = 0; $i < count($supported_list); $i++) {
-                $db_type = $supported_list[$i];
-
-                if(version_compare(phpversion(), '5.0') < 0 && preg_match('/pdo/i',$db_type)) continue;
-
-                $class_name = sprintf("DB%s%s", strtoupper(substr($db_type,0,1)), strtolower(substr($db_type,1)));
-                $class_file = sprintf(_XE_PATH_."classes/db/%s.class.php", $class_name);
-                if(!file_exists($class_file)) continue;
-
-                unset($oDB);
-                require_once($class_file);
-				$tmp_fn = create_function('', "return new {$class_name}();");
-				$oDB    = $tmp_fn();
-
-                if(!$oDB) continue;
-
-                $obj = null;
-                $obj->db_type = $db_type;
-                $obj->enable = $oDB->isSupported() ? true : false;
-
-                $this->supported_list[] = $obj;
-            }
-
-            return $this->supported_list;
-        }
-
-        /**
-         * @brief check if the db_type is supported
-         * @param[in] $db_type type of db to check
-         * @return true: is supported, false: is not supported
-         **/
-        function isSupported($db_type) {
-            $supported_list = DB::getSupportedList();
-            return in_array($db_type, $supported_list);
-        }
-
-        /**
-         * @brief check if is connected
-         * @return true: connected, false: not connected
-         **/
-        function isConnected() {
-            return $this->is_connected ? true : false;
-        }
-
-        /**
-         * @brief start recording log
-         * @return none
-         **/
-        function actStart($query) {
-            $this->setError(0, 'success');
-            $this->query = $query;
-            $this->act_start = getMicroTime();
-            $this->elapsed_time = 0;
-        }
-
-        /**
-         * @brief finish recording log
-         * @return none
-         **/
-        function actFinish() {
-            if(!$this->query) return;
-            $this->act_finish = getMicroTime();
-            $elapsed_time = $this->act_finish - $this->act_start;
-            $this->elapsed_time = $elapsed_time;
-            $GLOBALS['__db_elapsed_time__'] += $elapsed_time;
-
-            $log['query'] = $this->query;
-            $log['elapsed_time'] = $elapsed_time;
-
-            // leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
-            if($this->isError()) {
-                $site_module_info = Context::get('site_module_info');
-                $log['module'] = $site_module_info->module;
-                $log['act'] = Context::get('act');
-                $log['query_id'] = $this->query_id;
-                $log['time'] = date('Y-m-d H:i:s');
-                $log['result'] = 'Failed';
-                $log['errno'] = $this->errno;
-                $log['errstr'] = $this->errstr;
-
-                if(__DEBUG_DB_OUTPUT__ == 1)  {
-                    $debug_file = _XE_PATH_."files/_debug_db_query.php";
-                    $buff = array();
-                    if(!file_exists($debug_file)) $buff[] = '<?php exit(); ?>';
-                    $buff[] = print_r($log, true);
-
-                    if(@!$fp = fopen($debug_file, "a")) return;
-                    fwrite($fp, implode("\n", $buff)."\n\n");
-                    fclose($fp);
-                }
-            } else {
-                $log['result'] = 'Success';
-            }
-            $GLOBALS['__db_queries__'][] = $log;
-
-            // if __LOG_SLOW_QUERY__ if defined, check elapsed time and leave query log
-            if(__LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__) {
-                $buff = '';
-                $log_file = _XE_PATH_.'files/_db_slow_query.php';
-                if(!file_exists($log_file)) {
-                    $buff = '<?php exit();?>'."\n";
-                }
-
-                $buff .= sprintf("%s\t%s\n\t%0.6f sec\tquery_id:%s\n\n", date("Y-m-d H:i"), $this->query, $elapsed_time, $this->query_id);
-
-                if($fp = fopen($log_file, 'a')) {
-                    fwrite($fp, $buff);
-                    fclose($fp);
-                }
-            }
-        }
-
-        /**
-         * @brief set error
-         * @param[in] $errno error code
-         * @param[in] $errstr error message
-         * @return none
-         **/
-        function setError($errno = 0, $errstr = 'success') {
-            $this->errno = $errno;
-            $this->errstr = $errstr;
-        }
-
-        /**
-         * @brief check if an error occured
-         * @return true: error, false: no error
-         **/
-        function isError() {
-            return $this->errno === 0 ? false : true;
-        }
-
-        /**
-         * @brief returns object of error info
-         * @return object of error
-         **/
-        function getError() {
-            $this->errstr = Context::convertEncodingStr($this->errstr);
-            return new Object($this->errno, $this->errstr);
-        }
-
-        /**
-         * @brief query xml 파일을 실행하여 결과를 return
-         * @param[in] $query_id query id (module.queryname
-         * @param[in] $args arguments for query
-         * @return result of query
-         * @remarks this function finds xml file or cache file of $query_id, compiles it and then execute it
-         **/
-        function executeQuery($query_id, $args = NULL, $arg_columns = NULL) {
-            if(!$query_id) return new Object(-1, 'msg_invalid_queryid');
-            $this->query_id = $query_id;
-
-            $id_args = explode('.', $query_id);
-            if(count($id_args) == 2) {
-                $target = 'modules';
-                $module = $id_args[0];
-                $id = $id_args[1];
-            } elseif(count($id_args) == 3) {
-                $target = $id_args[0];
-                if(!in_array($target, array('addons','widgets'))) return;
-                $module = $id_args[1];
-                $id = $id_args[2];
-            }
-            if(!$target || !$module || !$id) return new Object(-1, 'msg_invalid_queryid');
-
-            $xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
-            if(!file_exists($xml_file)) return new Object(-1, 'msg_invalid_queryid');
-
-            // look for cache file
-            $cache_file = $this->checkQueryCacheFile($query_id, $xml_file);
-
-            // execute query
-            return $this->_executeQuery($cache_file, $args, $query_id, $arg_columns);
-        }
-
-
-        /**
-         * @brief look for cache file
-         * @param[in] $query_id query id for finding
-         * @param[in] $xml_file original xml query file
-         * @return cache file
-         **/
-        function checkQueryCacheFile($query_id,$xml_file){
-
-            // first try finding cache file
-            $cache_file = sprintf('%s%s%s.cache.php', _XE_PATH_, $this->cache_file, $query_id);
-
-            if(file_exists($cache_file)) $cache_time = filemtime($cache_file);
-            else $cache_time = -1;
-
-            // if there is no cache file or is not new, find original xml query file and parse it
-            if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_.'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_.'classes/xml/XmlQueryParser.class.php')) {
-                require_once(_XE_PATH_.'classes/xml/XmlQueryParser.class.php');
-                $oParser = new XmlQueryParser();
-                $oParser->parse($query_id, $xml_file, $cache_file);
-            }
-
-            return $cache_file;
-        }
-
-
-        /**
-         * @brief execute query and return the result
-         * @param[in] $cache_file cache file of query
-         * @param[in] $source_args arguments for query
-         * @param[in] $query_id query id
-         * @return result of query
-         **/
-        function _executeQuery($cache_file, $source_args, $query_id, $arg_columns) {
-            global $lang;
-
-            if(!file_exists($cache_file)) return new Object(-1, 'msg_invalid_queryid');
-
-            if($source_args) $args = @clone($source_args);
-
-            $output = @include($cache_file);
-
-            if( (is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
-            $output->_tables = ($output->_tables && is_array($output->_tables)) ? $output->_tables : array();
-			
-            // execute appropriate query
-            switch($output->action) {
-                case 'insert' :
-                        $this->resetCountCache($output->tables);
-                        $output = $this->_executeInsertAct($output);
-                    break;
-                case 'update' :
-                        $this->resetCountCache($output->tables);
-                        $output = $this->_executeUpdateAct($output);
-                    break;
-                case 'delete' :
-                        $this->resetCountCache($output->tables);
-                        $output = $this->_executeDeleteAct($output);
-                    break;
-                case 'select' :
-						$output->arg_columns = is_array($arg_columns)?$arg_columns:array();
-                        $output = $this->_executeSelectAct($output);
-                    break;
-            }
-			
-            if($this->isError()) $output = $this->getError();
-            else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object')) $output = new Object();
-            $output->add('_query', $this->query);
-            $output->add('_elapsed_time', sprintf("%0.5f", $this->elapsed_time));
-
-            return $output;
-        }
-
-        /**
-         * @brief check $val with $filter_type
-         * @param[in] $key key value
-         * @param[in] $val value of $key
-         * @param[in] $filter_type type of filter to check $val
-         * @return object
-         * @remarks this function is to be used from XmlQueryParser
-         **/
-        function checkFilter($key, $val, $filter_type) {
-            global $lang;
-
-            switch($filter_type) {
-                case 'email' :
-                case 'email_address' :
-                        if(!preg_match('/^[_0-9a-z-]+(\.[_0-9a-z-]+)*@[0-9a-z-]+(\.[0-9a-z-]+)*$/is', $val)) return new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
-                    break;
-                case 'homepage' :
-                        if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val)) return new Object(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
-                    break;
-                case 'userid' :
-                case 'user_id' :
-                        if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val)) return new Object(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
-                    break;
-                case 'number' :
-                case 'numbers' :
-						if(is_array($val)) $val = join(',', $val);
-                        if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val)) return new Object(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
-                    break;
-                case 'alpha' :
-                        if(!preg_match('/^[a-z]+$/is', $val)) return new Object(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
-                    break;
-                case 'alpha_number' :
-                        if(!preg_match('/^[0-9a-z]+$/is', $val)) return new Object(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
-                    break;
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief returns type of column
-         * @param[in] $column_type_list list of column type
-         * @param[in] $name name of column type
-         * @return column type of $name
-         * @remarks columns are usually like a.b, so it needs another function
-         **/
-        function getColumnType($column_type_list, $name) {
-            if(strpos($name, '.') === false) return $column_type_list[$name];
-            list($prefix, $name) = explode('.', $name);
-            return $column_type_list[$name];
-        }
-
-        /**
-         * @brief returns the value of condition
-         * @param[in] $name name of condition
-         * @param[in] $value value of condition
-         * @param[in] $operation operation this is used in condition
-         * @param[in] $type type of condition
-         * @param[in] $column_type type of column
-         * @return well modified $value
-         * @remarks if $operation is like or like_prefix, $value itself will be modified
-         * @remarks if $type is not 'number', call addQuotes() and wrap with ' '
-         **/
-        function getConditionValue($name, $value, $operation, $type, $column_type) {
-
-            if(!in_array($operation,array('in','notin','between')) && $type == 'number') {
-				if(is_array($value)){
-					$value = join(',',$value);
-				}
-                if(strpos($value, ',') === false && strpos($value, '(') === false) return (int)$value;
-                return $value;
-            }
-			
-            if(!is_array($value) && strpos($name, '.') !== false && strpos($value, '.') !== false) {
-                list($table_name, $column_name) = explode('.', $value);
-                if($column_type[$column_name]) return $value;
-            }
-
-            switch($operation) {
-                case 'like_prefix' :
-						if(!is_array($value)) $value = preg_replace('/(^\'|\'$){1}/', '', $value);
-                        $value = $value.'%';
-                    break;
-                case 'like_tail' :
-						if(!is_array($value)) $value = preg_replace('/(^\'|\'$){1}/', '', $value);
-                        $value = '%'.$value;
-                    break;
-                case 'like' :
-						if(!is_array($value)) $value = preg_replace('/(^\'|\'$){1}/', '', $value);
-                        $value = '%'.$value.'%';
-                    break;
-                case 'notin' :
-						if(is_array($value))
-						{
-							$value = $this->addQuotesArray($value);
-							if($type=='number') return join(',',$value);
-							else return "'". join("','",$value)."'";
-						}
-						else
-						{
-							return $value;
-						}
-                    break;
-                case 'in' :
-						if(is_array($value))
-						{
-							$value = $this->addQuotesArray($value);
-							if($type=='number') return join(',',$value);
-							else return "'". join("','",$value)."'";
-						}
-						else
-						{
-							return $value;
-						}
-                    break;
-                case 'between' :
-						if(!is_array($value)) $value = array($value);
-			            $value = $this->addQuotesArray($value);
-						if($type!='number')
-						{
-							foreach($value as $k=>$v)
-							{
-								$value[$k] = "'".$v."'";
-							}
-						}
-
-						return $value;
-                    break;
-				default:
-					if(!is_array($value)) $value = preg_replace('/(^\'|\'$){1}/', '', $value);
-            }
-
-            return "'".$this->addQuotes($value)."'";
-        }
-
-        /**
-         * @brief returns part of condition
-         * @param[in] $name name of condition
-         * @param[in] $value value of condition
-         * @param[in] $operation operation that is used in condition
-         * @return detail condition
-         **/
-        function getConditionPart($name, $value, $operation) {
-            switch($operation) {
-                case 'equal' :
-                case 'more' :
-                case 'excess' :
-                case 'less' :
-                case 'below' :
-                case 'like_tail' :
-                case 'like_prefix' :
-                case 'like' :
-                case 'in' :
-                case 'notin' :
-                case 'notequal' :
-                        // if variable is not set or is not string or number, return
-                        if(!isset($value)) return;
-                        if($value === '') return;
-                        if(!in_array(gettype($value), array('string', 'integer'))) return;
-				break;
-                case 'between' :
-					if(!is_array($value)) return;
-					if(count($value)!=2) return;
-
-            }
-
-            switch($operation) {
-                case 'equal' :
-                        return $name.' = '.$value;
-                    break;
-                case 'more' :
-                        return $name.' >= '.$value;
-                    break;
-                case 'excess' :
-                        return $name.' > '.$value;
-                    break;
-                case 'less' :
-                        return $name.' <= '.$value;
-                    break;
-                case 'below' :
-                        return $name.' < '.$value;
-                    break;
-                case 'like_tail' :
-                case 'like_prefix' :
-                case 'like' :
-                        return $name.' like '.$value;
-                    break;
-                case 'in' :
-                        return $name.' in ('.$value.')';
-                    break;
-                case 'notin' :
-                        return $name.' not in ('.$value.')';
-                    break;
-                case 'notequal' :
-                        return $name.' <> '.$value;
-                    break;
-                case 'notnull' :
-                        return $name.' is not null';
-                    break;
-                case 'null' :
-                        return $name.' is null';
-                    break;
-				case 'between' :
-                        return $name.' between ' . $value[0] . ' and ' . $value[1];
-					break;
-            }
-        }
-
-        /**
-         * @brief returns condition key
-         * @param[in] $output result of query
-         * @return array of conditions of $output
-         **/
-        function getConditionList($output) {
-            $conditions = array();
-            if(count($output->conditions)) {
-                foreach($output->conditions as $key => $val) {
-                    if($val['condition']) {
-                        foreach($val['condition'] as $k => $v) {
-                            $conditions[] = $v['column'];
-                        }
-                    }
-                }
-            }
-
-            return $conditions;
-        }
-
-        /**
-         * @brief returns counter cache data
-         * @param[in] $tables tables to get data
-         * @param[in] $condition condition to get data
-         * @return count of cache data
-         **/
-        function getCountCache($tables, $condition) {
-            return false;
-            if(!$tables) return false;
-            if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path);
-
-            $condition = md5($condition);
-
-            if(!is_array($tables)) $tables_str = $tables;
-            else $tables_str = implode('.',$tables);
-
-            $cache_path = sprintf('%s/%s%s', $this->count_cache_path, $this->prefix, $tables_str);
-            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
-
-            $cache_filename = sprintf('%s/%s.%s', $cache_path, $tables_str, $condition);
-            if(!file_exists($cache_filename)) return false;
-
-            $cache_mtime = filemtime($cache_filename);
-
-            if(!is_array($tables)) $tables = array($tables);
-            foreach($tables as $alias => $table) {
-                $table_filename = sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table) ;
-                if(!file_exists($table_filename) || filemtime($table_filename) > $cache_mtime) return false;
-            }
-
-            $count = (int)FileHandler::readFile($cache_filename);
-            return $count;
-        }
-
-        /**
-         * @brief save counter cache data
-         * @param[in] $tables tables to save data
-         * @param[in] $condition condition to save data
-         * @param[in] $count count of cache data to save
-         * @return none
-         **/
-        function putCountCache($tables, $condition, $count = 0) {
-            return false;
-            if(!$tables) return false;
-            if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path);
-
-            $condition = md5($condition);
-
-            if(!is_array($tables)) $tables_str = $tables;
-            else $tables_str = implode('.',$tables);
-
-            $cache_path = sprintf('%s/%s%s', $this->count_cache_path, $this->prefix, $tables_str);
-            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
-
-            $cache_filename = sprintf('%s/%s.%s', $cache_path, $tables_str, $condition);
-
-            FileHandler::writeFile($cache_filename, $count);
-        }
-
-        /**
-         * @brief reset counter cache data
-         * @param[in] $tables tables to reset cache data
-         * @return true: success, false: failed
-         **/
-        function resetCountCache($tables) {
-            return false;
-            if(!$tables) return false;
-            if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path);
-
-            if(!is_array($tables)) $tables = array($tables);
-            foreach($tables as $alias => $table) {
-                $filename = sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table);
-                FileHandler::removeFile($filename);
-                FileHandler::writeFile($filename, '');
-            }
-
-            return true;
-        }
-
-        /**
-         * @brief returns supported database list
-         * @return list of supported database
-         **/
-        function getSupportedDatabase(){
-            $result = array();
-
-            if(function_exists('mysql_connect')) $result[] = 'MySQL';
-            if(function_exists('cubrid_connect')) $result[] = 'Cubrid';
-            if(function_exists('ibase_connect')) $result[] = 'FireBird';
-            if(function_exists('pg_connect')) $result[] = 'Postgre';
-            if(function_exists('sqlite_open')) $result[] = 'sqlite2';
-            if(function_exists('mssql_connect')) $result[] = 'MSSQL';
-            if(function_exists('PDO')) $result[] = 'sqlite3(PDO)';
-
-            return $result;
-        }
-
-        function dropTable($table_name){
-            if(!$table_name) return;
-            $query = sprintf("drop table %s%s", $this->prefix, $table_name);
-            $this->_query($query);
-        }
-
-		function addQuotesArray($arr)
-		{
-			if(is_array($arr))
-			{
-				foreach($arr as $k => $v)
-				{
-					$arr[$k] = $this->addQuotes($v);
-				}
-			}
-			else
-			{
-				$arr = $this->addQuotes($arr);
-			}
-
-			return $arr;
-		}
-
-        /**
-         * @brief Just like numbers, and operations needed to remove the rest
-         **/
-		function _filterNumber(&$value)
-		{
-			$value = preg_replace('/[^\d\w\+\-\*\/\.\(\)]/', '', $value);
-			$value = preg_replace('@\b(?:select|update|delete)\b|[/+\*]{2,}|(-){2,}@i', '$1', $value);
-			if(!$value) $value = 0;
-		}
-    }
-?>
+<?php
+    /**
+     * @class DB
+     * @author NHN (developers@xpressengine.com)
+     * @brief  base class of db* classes
+     * @version 0.1
+     *
+     * usage of db in XE is via xml
+     * there are 2 types of xml - query xml, schema xml
+     * in case of query xml, DB::executeQuery() method compiles xml file into php code and then execute it
+     * query xml has unique query id, and will be created in module
+     *
+     * queryid = module_name.query_name
+     **/
+
+    if(!defined('__XE_LOADED_DB_CLASS__')){
+        define('__XE_LOADED_DB_CLASS__', 1);
+
+        require(_XE_PATH_.'classes/xml/xmlquery/DBParser.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/QueryParser.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/argument/SortArgument.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/argument/ConditionArgument.class.php');
+
+        require(_XE_PATH_.'classes/db/queryparts/expression/Expression.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/expression/SelectExpression.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/expression/InsertExpression.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/expression/UpdateExpression.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/table/Table.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/table/JoinTable.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/table/CubridTableWithHint.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/table/MysqlTableWithHint.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/table/MssqlTableWithHint.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/table/IndexHint.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/condition/ConditionGroup.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/condition/Condition.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/condition/ConditionWithArgument.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/condition/ConditionWithoutArgument.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/condition/ConditionSubquery.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/expression/StarExpression.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/order/OrderByColumn.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/limit/Limit.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/Query.class.php');
+        require(_XE_PATH_.'classes/db/queryparts/Subquery.class.php');
+    }
+
+    class DB {
+
+        var $count_cache_path = 'files/cache/db';
+
+        var $cond_operation = array( ///< operations for condition
+            'equal' => '=',
+            'more' => '>=',
+            'excess' => '>',
+            'less' => '<=',
+            'below' => '<',
+            'notequal' => '<>',
+            'notnull' => 'is not null',
+            'null' => 'is null',
+        );
+
+        var $master_db = NULL; // master database connection string
+        var $slave_db = NULL; // array of slave databases connection strings
+
+        var $result = NULL; ///< result
+
+        var $errno = 0; ///< error code (0 means no error)
+        var $errstr = ''; ///< error message
+        var $query = ''; ///< query string of latest executed query
+        var $connection = '';
+        var $elapsed_time = 0; ///< elapsed time of latest executed query
+        var $elapsed_dbclass_time = 0; ///< elapsed time of latest executed query
+
+        var $transaction_started = false; ///< transaction flag
+
+        var $is_connected = false; ///< is db connected
+
+        var $supported_list = array(); ///< list of supported db, (will be written by classes/DB/DB***.class.php)
+
+        var $cache_file = 'files/cache/queries/'; ///< location of query cache
+
+		var $db_type; ///< stores database type: 'mysql','cubrid','mssql' etc. or 'db' when database is not yet set
+
+        /**
+         * @brief returns instance of certain db type
+         * @param[in] $db_type type of db
+         * @return instance
+         **/
+        function &getInstance($db_type = NULL) {
+            if(!$db_type) $db_type = Context::getDBType();
+            if(!$db_type && Context::isInstalled()) return new Object(-1, 'msg_db_not_setted');
+
+			if(!isset($GLOBALS['__DB__'])) $GLOBALS['__DB__'] = array();
+            if(!isset($GLOBALS['__DB__'][$db_type])) {
+                $class_name = 'DB'.ucfirst($db_type);
+                $class_file = _XE_PATH_."classes/db/$class_name.class.php";
+                if(!file_exists($class_file)) return new Object(-1, 'msg_db_not_setted');
+
+				// get a singletone instance of the database driver class
+				require_once($class_file);
+                $GLOBALS['__DB__'][$db_type] = call_user_func(array($class_name, 'create'));
+				$GLOBALS['__DB__'][$db_type]->db_type = $db_type;
+            }
+
+            return $GLOBALS['__DB__'][$db_type];
+        }
+
+		function create() {
+			return new DB;
+		}
+
+        /**
+         * @brief constructor
+         * @return none
+         **/
+        function DB() {
+            $this->count_cache_path = _XE_PATH_.$this->count_cache_path;
+            $this->cache_file = _XE_PATH_.$this->cache_file;
+        }
+
+        /**
+         * @brief returns list of supported db
+         * @return list of supported db
+         **/
+        function getSupportedList() {
+            $oDB = new DB();
+            return $oDB->_getSupportedList();
+        }
+
+        /**
+         * @brief returns list of enable in supported db
+         * @return list of enable in supported db
+         **/
+        function getEnableList()
+        {
+                if(!$this->supported_list)
+                {
+                        $oDB = new DB();
+                        $this->supported_list = $oDB->_getSupportedList();
+                }
+
+                $enableList = array();
+                if(is_array($this->supported_list))
+                {
+                        foreach($this->supported_list AS $key=>$value)
+                                if($value->enable) array_push($enableList, $value);
+                }
+                return $enableList;
+        }
+
+        /**
+         * @brief returns list of disable in supported db
+         * @return list of disable in supported db
+         **/
+        function getDisableList()
+        {
+                if(!$this->supported_list)
+                {
+                        $oDB = new DB();
+                        $this->supported_list = $oDB->_getSupportedList();
+                }
+
+                $disableList = array();
+                if(is_array($this->supported_list))
+                {
+                        foreach($this->supported_list AS $key=>$value)
+                                if(!$value->enable) array_push($disableList, $value);
+                }
+                return $disableList;
+        }
+
+        /**
+         * @brief returns list of supported db
+         * @return list of supported db
+         **/
+        function _getSupportedList() {
+            $db_classes_path = _XE_PATH_."classes/db/";
+            $filter = "/^DB([^\.]+)\.class\.php/i";
+            $supported_list = FileHandler::readDir($db_classes_path, $filter, true);
+            sort($supported_list);
+
+            // after creating instance of class, check is supported
+            for($i = 0; $i < count($supported_list); $i++) {
+                $db_type = $supported_list[$i];
+
+                if(version_compare(phpversion(), '5.0') < 0 && preg_match('/pdo/i',$db_type)) continue;
+
+                $class_name = sprintf("DB%s%s", strtoupper(substr($db_type,0,1)), strtolower(substr($db_type,1)));
+                $class_file = sprintf(_XE_PATH_."classes/db/%s.class.php", $class_name);
+                if(!file_exists($class_file)) continue;
+
+                unset($oDB);
+                require_once($class_file);
+				$tmp_fn = create_function('', "return new {$class_name}();");
+				$oDB    = $tmp_fn();
+
+                if(!$oDB) continue;
+
+                $obj = null;
+                $obj->db_type = $db_type;
+                $obj->enable = $oDB->isSupported() ? true : false;
+
+                $this->supported_list[] = $obj;
+            }
+
+            return $this->supported_list;
+        }
+
+        /**
+         * @brief check if the db_type is supported
+         * @param[in] $db_type type of db to check
+         * @return true: is supported, false: is not supported
+         **/
+        function isSupported($db_type) {
+            $supported_list = DB::getSupportedList();
+            return in_array($db_type, $supported_list);
+        }
+
+        /**
+         * @brief check if is connected
+         * @return true: connected, false: not connected
+         **/
+        function isConnected($type = 'master', $indx = 0) {
+            if($type == 'master') return $this->master_db["is_connected"] ? true : false;
+            else return $this->slave_db[$indx]["is_connected"] ? true : false;
+        }
+
+        /**
+         * @brief start recording log
+         * @return none
+         **/
+        function actStart($query) {
+            $this->setError(0, 'success');
+            $this->query = $query;
+            $this->act_start = getMicroTime();
+            $this->elapsed_time = 0;
+        }
+
+        /**
+         * @brief finish recording log
+         * @return none
+         **/
+        function actFinish() {
+            if(!$this->query) return;
+            $this->act_finish = getMicroTime();
+            $elapsed_time = $this->act_finish - $this->act_start;
+            $this->elapsed_time = $elapsed_time;
+            $GLOBALS['__db_elapsed_time__'] += $elapsed_time;
+
+            $log['query'] = $this->query;
+            $log['elapsed_time'] = $elapsed_time;
+            $log['connection'] = $this->connection;
+
+            // leave error log if an error occured (if __DEBUG_DB_OUTPUT__ is defined)
+            if($this->isError()) {
+                $site_module_info = Context::get('site_module_info');
+                $log['module'] = $site_module_info->module;
+                $log['act'] = Context::get('act');
+                $log['query_id'] = $this->query_id;
+                $log['time'] = date('Y-m-d H:i:s');
+                $log['result'] = 'Failed';
+                $log['errno'] = $this->errno;
+                $log['errstr'] = $this->errstr;
+
+                if(__DEBUG_DB_OUTPUT__ == 1)  {
+                    $debug_file = _XE_PATH_."files/_debug_db_query.php";
+                    $buff = array();
+                    if(!file_exists($debug_file)) $buff[] = '<?php exit(); ?>';
+                    $buff[] = print_r($log, true);
+
+                    if(@!$fp = fopen($debug_file, "a")) return;
+                    fwrite($fp, implode("\n", $buff)."\n\n");
+                    fclose($fp);
+                }
+            } else {
+                $log['result'] = 'Success';
+            }
+            $GLOBALS['__db_queries__'][] = $log;
+
+            // if __LOG_SLOW_QUERY__ if defined, check elapsed time and leave query log
+            if(__LOG_SLOW_QUERY__ > 0 && $elapsed_time > __LOG_SLOW_QUERY__) {
+                $buff = '';
+                $log_file = _XE_PATH_.'files/_db_slow_query.php';
+                if(!file_exists($log_file)) {
+                    $buff = '<?php exit();?>'."\n";
+                }
+
+                $buff .= sprintf("%s\t%s\n\t%0.6f sec\tquery_id:%s\n\n", date("Y-m-d H:i"), $this->query, $elapsed_time, $this->query_id);
+
+                if($fp = fopen($log_file, 'a')) {
+                    fwrite($fp, $buff);
+                    fclose($fp);
+                }
+            }
+        }
+
+        /**
+         * @brief set error
+         * @param[in] $errno error code
+         * @param[in] $errstr error message
+         * @return none
+         **/
+        function setError($errno = 0, $errstr = 'success') {
+            $this->errno = $errno;
+            $this->errstr = $errstr;
+        }
+
+        /**
+         * @brief check if an error occured
+         * @return true: error, false: no error
+         **/
+        function isError() {
+            return $this->errno === 0 ? false : true;
+        }
+
+        /**
+         * @brief returns object of error info
+         * @return object of error
+         **/
+        function getError() {
+            $this->errstr = Context::convertEncodingStr($this->errstr);
+            return new Object($this->errno, $this->errstr);
+        }
+
+        /**
+         * @brief Run the result of the query xml file
+         * @param[in] $query_id query id (module.queryname
+         * @param[in] $args arguments for query
+         * @return result of query
+         * @remarks this function finds xml file or cache file of $query_id, compiles it and then execute it
+         **/
+        function executeQuery($query_id, $args = NULL, $arg_columns = NULL) {
+            if(!$query_id) return new Object(-1, 'msg_invalid_queryid');
+			if(!$this->db_type) return;
+
+			$this->actDBClassStart();
+
+			$this->query_id = $query_id;
+
+            $id_args = explode('.', $query_id);
+            if(count($id_args) == 2) {
+                $target = 'modules';
+                $module = $id_args[0];
+                $id = $id_args[1];
+            } elseif(count($id_args) == 3) {
+                $target = $id_args[0];
+                if(!in_array($target, array('addons','widgets'))){
+		    $this->actDBClassFinish();
+		    return;
+		}
+                $module = $id_args[1];
+                $id = $id_args[2];
+            }
+            if(!$target || !$module || !$id){
+		$this->actDBClassFinish();
+		return new Object(-1, 'msg_invalid_queryid');
+	    }
+
+            $xml_file = sprintf('%s%s/%s/queries/%s.xml', _XE_PATH_, $target, $module, $id);
+            if(!file_exists($xml_file)){
+		$this->actDBClassFinish();
+		return new Object(-1, 'msg_invalid_queryid');
+	    }
+
+            // look for cache file
+            $cache_file = $this->checkQueryCacheFile($query_id, $xml_file);
+	    $result = $this->_executeQuery($cache_file, $args, $query_id, $arg_columns);
+
+	    $this->actDBClassFinish();
+            // execute query
+            return $result;
+        }
+
+
+        /**
+         * @brief look for cache file
+         * @param[in] $query_id query id for finding
+         * @param[in] $xml_file original xml query file
+         * @return cache file
+         **/
+        function checkQueryCacheFile($query_id,$xml_file){
+
+            // first try finding cache file
+            $cache_file = sprintf('%s%s%s.%s.%s.cache.php', _XE_PATH_, $this->cache_file, $query_id, __ZBXE_VERSION__, $this->db_type);
+
+            if(file_exists($cache_file)) $cache_time = filemtime($cache_file);
+            else $cache_time = -1;
+
+            // if there is no cache file or is not new, find original xml query file and parse it
+            if($cache_time < filemtime($xml_file) || $cache_time < filemtime(_XE_PATH_.'classes/db/DB.class.php') || $cache_time < filemtime(_XE_PATH_.'classes/xml/XmlQueryParser.150.class.php')) {
+                require_once(_XE_PATH_.'classes/xml/XmlQueryParser.150.class.php');
+                $oParser = new XmlQueryParser();
+                $oParser->parse($query_id, $xml_file, $cache_file);
+            }
+
+            return $cache_file;
+        }
+
+
+        /**
+         * @brief execute query and return the result
+         * @param[in] $cache_file cache file of query
+         * @param[in] $source_args arguments for query
+         * @param[in] $query_id query id
+         * @return result of query
+         **/
+        function _executeQuery($cache_file, $source_args, $query_id, $arg_columns) {
+            global $lang;
+
+            if(!file_exists($cache_file)) return new Object(-1, 'msg_invalid_queryid');
+
+            if($source_args) $args = @clone($source_args);
+
+            $output = include($cache_file);
+
+            if( (is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
+
+            // execute appropriate query
+            switch($output->getAction()) {
+                case 'insert' :
+                        $this->resetCountCache($output->tables);
+                        $output = $this->_executeInsertAct($output);
+                    break;
+                case 'update' :
+                        $this->resetCountCache($output->tables);
+                        $output = $this->_executeUpdateAct($output);
+                    break;
+                case 'delete' :
+                        $this->resetCountCache($output->tables);
+                        $output = $this->_executeDeleteAct($output);
+                    break;
+                case 'select' :
+                        $arg_columns = is_array($arg_columns)?$arg_columns:array();
+                        $output->setColumnList($arg_columns);
+                        $connection = $this->_getConnection('slave');
+                        $output = $this->_executeSelectAct($output, $connection);
+                    break;
+            }
+
+            if($this->isError()) $output = $this->getError();
+            else if(!is_a($output, 'Object') && !is_subclass_of($output, 'Object')) $output = new Object();
+            $output->add('_query', $this->query);
+            $output->add('_elapsed_time', sprintf("%0.5f", $this->elapsed_time));
+
+            return $output;
+        }
+
+
+        /**
+         * @brief returns counter cache data
+         * @param[in] $tables tables to get data
+         * @param[in] $condition condition to get data
+         * @return count of cache data
+         **/
+        function getCountCache($tables, $condition) {
+            return false;
+            if(!$tables) return false;
+            if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path);
+
+            $condition = md5($condition);
+
+            if(!is_array($tables)) $tables_str = $tables;
+            else $tables_str = implode('.',$tables);
+
+            $cache_path = sprintf('%s/%s%s', $this->count_cache_path, $this->prefix, $tables_str);
+            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
+
+            $cache_filename = sprintf('%s/%s.%s', $cache_path, $tables_str, $condition);
+            if(!file_exists($cache_filename)) return false;
+
+            $cache_mtime = filemtime($cache_filename);
+
+            if(!is_array($tables)) $tables = array($tables);
+            foreach($tables as $alias => $table) {
+                $table_filename = sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table) ;
+                if(!file_exists($table_filename) || filemtime($table_filename) > $cache_mtime) return false;
+            }
+
+            $count = (int)FileHandler::readFile($cache_filename);
+            return $count;
+        }
+
+        /**
+         * @brief save counter cache data
+         * @param[in] $tables tables to save data
+         * @param[in] $condition condition to save data
+         * @param[in] $count count of cache data to save
+         * @return none
+         **/
+        function putCountCache($tables, $condition, $count = 0) {
+            return false;
+            if(!$tables) return false;
+            if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path);
+
+            $condition = md5($condition);
+
+            if(!is_array($tables)) $tables_str = $tables;
+            else $tables_str = implode('.',$tables);
+
+            $cache_path = sprintf('%s/%s%s', $this->count_cache_path, $this->prefix, $tables_str);
+            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
+
+            $cache_filename = sprintf('%s/%s.%s', $cache_path, $tables_str, $condition);
+
+            FileHandler::writeFile($cache_filename, $count);
+        }
+
+        /**
+         * @brief reset counter cache data
+         * @param[in] $tables tables to reset cache data
+         * @return true: success, false: failed
+         **/
+        function resetCountCache($tables) {
+            return false;
+            if(!$tables) return false;
+            if(!is_dir($this->count_cache_path)) return FileHandler::makeDir($this->count_cache_path);
+
+            if(!is_array($tables)) $tables = array($tables);
+            foreach($tables as $alias => $table) {
+                $filename = sprintf('%s/cache.%s%s', $this->count_cache_path, $this->prefix, $table);
+                FileHandler::removeFile($filename);
+                FileHandler::writeFile($filename, '');
+            }
+
+            return true;
+        }
+
+        /**
+         * @brief returns supported database list
+         * @return list of supported database
+         **/
+        function getSupportedDatabase(){
+            $result = array();
+
+            if(function_exists('mysql_connect')) $result[] = 'MySQL';
+            if(function_exists('cubrid_connect')) $result[] = 'Cubrid';
+            if(function_exists('ibase_connect')) $result[] = 'FireBird';
+            if(function_exists('pg_connect')) $result[] = 'Postgre';
+            if(function_exists('sqlite_open')) $result[] = 'sqlite2';
+            if(function_exists('mssql_connect')) $result[] = 'MSSQL';
+            if(function_exists('PDO')) $result[] = 'sqlite3(PDO)';
+
+            return $result;
+        }
+
+        function dropTable($table_name){
+            if(!$table_name) return;
+            $query = sprintf("drop table %s%s", $this->prefix, $table_name);
+            $this->_query($query);
+        }
+
+    	function getSelectSql($query, $with_values = true){
+			$select = $query->getSelectString($with_values);
+			if($select == '') return new Object(-1, "Invalid query");
+			$select = 'SELECT ' .$select;
+
+			$from = $query->getFromString($with_values);
+			if($from == '') return new Object(-1, "Invalid query");
+			$from = ' FROM '.$from;
+
+			$where = $query->getWhereString($with_values);
+			if($where != '') $where = ' WHERE ' . $where;
+
+                        $tableObjects = $query->getTables();
+                        $index_hint_list = '';
+                        foreach($tableObjects as $tableObject){
+                            if(is_a($tableObject, 'CubridTableWithHint'))
+                                    $index_hint_list .= $tableObject->getIndexHintString() . ', ';
+                        }
+                        $index_hint_list = substr($index_hint_list, 0, -2);
+                        if($index_hint_list != '')
+                            $index_hint_list = 'USING INDEX ' . $index_hint_list;
+
+			$groupBy = $query->getGroupByString();
+			if($groupBy != '') $groupBy = ' GROUP BY ' . $groupBy;
+
+			$orderBy = $query->getOrderByString();
+			if($orderBy != '') $orderBy = ' ORDER BY ' . $orderBy;
+
+		 	$limit = $query->getLimitString();
+		 	if($limit != '') $limit = ' LIMIT ' . $limit;
+
+		 	return $select . ' ' . $from . ' ' . $where . ' ' . $index_hint_list . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+		}
+
+   		function getDeleteSql($query, $with_values = true, $with_priority = false){
+			$sql = 'DELETE ';
+
+			$sql .= $with_priority?$query->getPriority():'';
+			$tables = $query->getTables();
+
+			$sql .= $tables[0]->getAlias();
+
+			$from = $query->getFromString($with_values);
+			if($from == '') return new Object(-1, "Invalid query");
+			$sql .= ' FROM '.$from;
+
+			$where = $query->getWhereString($with_values);
+			if($where != '') $sql .= ' WHERE ' . $where;
+
+			return $sql;
+		}
+
+    	function getUpdateSql($query, $with_values = true, $with_priority = false){
+			$columnsList = $query->getUpdateString($with_values);
+			if($columnsList == '') return new Object(-1, "Invalid query");
+
+                        $tables = $query->getFromString($with_values);
+                        if($tables == '') return new Object(-1, "Invalid query");
+
+			$where = $query->getWhereString($with_values);
+			if($where != '') $where = ' WHERE ' . $where;
+
+			$priority = $with_priority?$query->getPriority():'';
+
+			return "UPDATE $priority $tables SET $columnsList ".$where;
+		}
+
+    	function getInsertSql($query, $with_values = true, $with_priority = false){
+			$tableName = $query->getFirstTableName();
+			$values = $query->getInsertString($with_values);
+			$priority = $with_priority?$query->getPriority():'';
+
+			return "INSERT $priority INTO $tableName \n $values";
+		}
+
+        function _getSlaveConnectionStringIndex() {
+            $max = count($this->slave_db);
+            $indx = rand(0, $max - 1);
+            return $indx;
+        }
+
+        function _getConnection($type = 'master', $indx = NULL){
+            if($type == master){
+                if(!$this->master_db['is_connected'])
+                        $this->_connect($type);
+                $this->connection = 'Master ' . $this->master_db['db_hostname'];
+                return $this->master_db["resource"];
+            }
+
+            if($indx === NULL)
+                $indx = $this->_getSlaveConnectionStringIndex($type);
+
+            if(!$this->slave_db[$indx]['is_connected'])
+                    $this->_connect($type, $indx);
+
+            $this->connection = 'Slave ' . $this->slave_db[$indx]['db_hostname'];
+            return $this->slave_db[$indx]["resource"];
+        }
+
+        function _dbInfoExists() {
+            if (!$this->master_db)
+                return false;
+            if (count($this->slave_db) === 0)
+                return false;
+            return true;
+        }
+
+        function _close($connection){
+
+        }
+
+        /**
+         * @brief DB disconnection
+         * */
+        function close($type = 'master', $indx = 0) {
+            if (!$this->isConnected($type, $indx))
+                return;
+
+            if ($type == 'master')
+                $connection = &$this->master_db;
+            else
+                $connection = &$this->slave_db[$indx];
+
+            $this->_close($connection["resource"]);
+
+            $connection["is_connected"] = false;
+        }
+
+        function _begin(){
+            return true;
+        }
+        /**
+         * @brief Begin transaction
+         * */
+        function begin() {
+            if (!$this->isConnected() || $this->transaction_started)
+                return;
+
+            if($this->_begin())
+                 $this->transaction_started = true;
+        }
+
+        function _rollback(){
+            return true;
+        }
+
+        /**
+         * @brief Rollback
+         * */
+        function rollback() {
+            if (!$this->isConnected() || !$this->transaction_started)
+                return;
+            if($this->_rollback())
+                $this->transaction_started = false;
+        }
+
+        function _commit(){
+            return true;
+        }
+        /**
+         * @brief Commits
+         * */
+        function commit($force = false) {
+            if (!$force && (!$this->isConnected() || !$this->transaction_started))
+                return;
+            if($this->_commit())
+                $this->transaction_started = false;
+        }
+
+        function __query($query, $connection){
+
+        }
+        /**
+         * @brief : Run a query and fetch the result
+         *
+         * query: run a query and return the result \n
+         * fetch: NULL if no value is returned \n
+         *        array object if rows are returned \n
+         *        object if a row is returned \n
+         *         return\n
+         * */
+        function _query($query, $connection = null) {
+            if($connection == null)
+                $connection = $this->_getConnection('master');
+            // Notify to start a query execution
+            $this->actStart($query);
+
+            // Run the query statement
+            $result = $this->__query($query, $connection);
+
+            // Notify to complete a query execution
+            $this->actFinish();
+            // Return result
+            return $result;
+        }
+
+        /**
+         * @brief DB settings and connect/close
+         * */
+        function _setDBInfo(){
+            $db_info = Context::getDBInfo();
+            $this->master_db = $db_info->master_db;
+            if($db_info->master_db["db_hostname"] == $db_info->slave_db[0]["db_hostname"]
+                    && $db_info->master_db["db_port"] == $db_info->slave_db[0]["db_port"]
+                    && $db_info->master_db["db_userid"] == $db_info->slave_db[0]["db_userid"]
+                    && $db_info->master_db["db_password"] == $db_info->slave_db[0]["db_password"]
+                    && $db_info->master_db["db_database"] == $db_info->slave_db[0]["db_database"]
+                    )
+                    $this->slave_db[0] = &$this->master_db;
+            else
+                    $this->slave_db = $db_info->slave_db;
+            $this->prefix = $db_info->master_db["db_table_prefix"];
+        }
+
+        function __connect(){
+
+        }
+
+        function _afterConnect($connection){
+
+        }
+        /**
+         * @brief DB Connection
+         * */
+        function _connect($type = 'master', $indx = 0) {
+            if ($this->isConnected($type, $indx))
+                return;
+
+            // Ignore if no DB information exists
+            if (!$this->_dbInfoExists())
+                return;
+
+            if ($type == 'master')
+                $connection = &$this->master_db;
+            else
+                $connection = &$this->slave_db[$indx];
+
+            $result = $this->__connect($connection);
+            if($result === NULL || $result === false) {
+                $connection["is_connected"] = false;
+                return;
+            }
+
+            // Check connections
+            $connection["resource"] = $result;
+            $connection["is_connected"] = true;
+
+            // Save connection info for db logs
+            $this->connection = ucfirst($type) . ' ' . $connection["db_hostname"];
+
+            $this->_afterConnect($result);
+        }
+	/**
+         * @brief start recording DBClass log
+         * @return none
+         **/
+        function actDBClassStart() {
+            $this->setError(0, 'success');
+            $this->act_dbclass_start = getMicroTime();
+            $this->elapsed_dbclass_time = 0;
+        }
+
+        /**
+         * @brief finish recording DBClass log
+         * @return none
+         **/
+        function actDBClassFinish() {
+            if(!$this->query) return;
+            $this->act_dbclass_finish = getMicroTime();
+            $elapsed_dbclass_time = $this->act_dbclass_finish - $this->act_dbclass_start;
+            $this->elapsed_dbclass_time = $elapsed_dbclass_time;
+            $GLOBALS['__dbclass_elapsed_time__'] += $elapsed_dbclass_time;
+        }
+
+        /**
+         * Returns a database specific parser class
+         * used for escaping expressions and table/column identifiers
+         *
+         * Requires an implementation of the DB class (won't work if database is not set)
+         *
+         * @remarks singleton
+         */
+       function &getParser($force = false){
+            static $dbParser = null;
+            if(!$dbParser || $force) {
+                $oDB = &DB::getInstance();
+                $dbParser = $oDB->getParser();
+            }
+
+            return $dbParser;
+        }
+
+    }
+?>
diff --git a/classes/db/DBCubrid.class.php b/classes/db/DBCubrid.class.php
index e8d349aa9..58167b9a9 100644
--- a/classes/db/DBCubrid.class.php
+++ b/classes/db/DBCubrid.class.php
@@ -1,1253 +1,705 @@
-<?php
-    /**
-     * @class DBCubrid
-     * @author NHN (developers@xpressengine.com)
-     * @brief Cubrid DBMS를 이용하기 위한 class
-     * @version 0.1p1
-     *
-     * CUBRID2008 R1.3 에 대응하도록 수정 Prototype (prototype@cubrid.com) / 09.02.23
-     * 7.3 ~ 2008 R1.3 까지 테스트 완료함.
-     * 기본 쿼리만 사용하였기에 특화된 튜닝이 필요
-     **/
-
-    class DBCubrid extends DB
-    {
-
-        /**
-         * @brief Cubrid DB에 접속하기 위한 정보
-         **/
-        var $hostname = '127.0.0.1'; ///< hostname
-        var $userid = NULL; ///< user id
-        var $password = NULL; ///< password
-        var $database = NULL; ///< database
-        var $port = 33000; ///< db server port
-        var $prefix = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE 설치 가능)
-        var $cutlen = 12000; ///< 큐브리드의 최대 상수 크기(스트링이 이보다 크면 '...'+'...' 방식을 사용해야 한다
-        var $comment_syntax = '/* %s */';
-
-        /**
-         * @brief cubrid에서 사용될 column type
-         *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
-         **/
-        var $column_type = array(
-            'bignumber' => 'numeric(20)',
-            'number' => 'integer',
-            'varchar' => 'character varying',
-            'char' => 'character',
-            'tinytext' => 'character varying(256)',
-            'text' => 'character varying(1073741823)',
-            'bigtext' => 'character varying(1073741823)',
-            'date' => 'character varying(14)',
-            'float' => 'float',
-        );
-
-        /**
-         * @brief constructor
-         **/
-        function DBCubrid()
-        {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-		
-		/**
-		 * @brief create an instance of this class
-		 */
-		function create()
-		{
-			return new DBCubrid;
-		}
-
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported()
-        {
-            if (!function_exists('cubrid_connect')) return false;
-            return true;
-        }
-
-        /**
-         * @brief DB정보 설정 및 connect/ close
-         **/
-        function _setDBInfo()
-        {
-            $db_info = Context::getDBInfo();
-            $this->hostname = $db_info->db_hostname;
-            $this->userid   = $db_info->db_userid;
-            $this->password   = $db_info->db_password;
-            $this->database = $db_info->db_database;
-            $this->port = $db_info->db_port;
-            $this->prefix = $db_info->db_table_prefix;
-
-            if (!substr($this->prefix, -1) != '_') $this->prefix .= '_';
-        }
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect()
-        {
-            // db 정보가 없으면 무시
-            if (!$this->hostname || !$this->userid || !$this->password || !$this->database || !$this->port) return;
-
-            // 접속시도
-            $this->fd = @cubrid_connect ($this->hostname, $this->port, $this->database, $this->userid, $this->password);
-
-            // 접속체크
-            if (!$this->fd) {
-                $this->setError (-1, 'database connect fail');
-                return $this->is_connected = false;
-            }
-
-            $this->is_connected = true;
-            $this->password = md5 ($this->password);
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close()
-        {
-            if (!$this->isConnected ()) return;
-
-            @cubrid_commit ($this->fd);
-            @cubrid_disconnect ($this->fd);
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string)
-        {
-            if (!$this->fd) return $string;
-
-            if (version_compare (PHP_VERSION, "5.9.0", "<") &&
-              get_magic_quotes_gpc ()) {
-                $string = stripslashes (str_replace ("\\","\\\\", $string));
-            }
-
-            if (!is_numeric ($string)) {
-            /*
-                if ($this->isConnected()) {
-                    $string = cubrid_real_escape_string($string);
-                }
-                else {
-                    $string = str_replace("'","\'",$string);
-                }
-                */
-
-                $string = str_replace("'","''",$string);
-            }
-
-            return $string;
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin()
-        {
-            if (!$this->isConnected () || $this->transaction_started) return;
-            $this->transaction_started = true;
-        }
-
-        /**
-         * @brief 롤백
-         **/
-        function rollback()
-        {
-            if (!$this->isConnected () || !$this->transaction_started) return;
-            @cubrid_rollback ($this->fd);
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 커밋
-         **/
-        function commit()
-        {
-            if (!$force && (!$this->isConnected () ||
-              !$this->transaction_started)) return;
-
-            @cubrid_commit($this->fd);
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query)
-        {
-            if (!$query || !$this->isConnected ()) return;
-
-            // 쿼리 시작을 알림
-            $this->actStart ($query);
-
-            // 쿼리 문 실행
-            $result = @cubrid_execute ($this->fd, $query);
-            // 오류 체크
-            if (cubrid_error_code ()) {
-                $code = cubrid_error_code ();
-                $msg = cubrid_error_msg ();
-
-                $this->setError ($code, $msg);
-            }
-
-            // 쿼리 실행 종료를 알림
-            $this->actFinish ();
-
-            // 결과 리턴
-            return $result;
-        }
-
-        /**
-         * @brief 결과를 fetch
-         **/
-        function _fetch($result)
-        {
-            if (!$this->isConnected() || $this->isError() || !$result) return;
-
-            $col_types = cubrid_column_types ($result);
-            $col_names = cubrid_column_names ($result);
-            $max = count ($col_types);
-
-            for ($count = 0; $count < $max; $count++) {
-                if (preg_match ("/^char/", $col_types[$count]) > 0) {
-                    $char_type_fields[] = $col_names[$count];
-                }
-            }
-
-            while ($tmp = cubrid_fetch ($result, CUBRID_OBJECT)) {
-                if (is_array ($char_type_fields)) {
-                    foreach ($char_type_fields as $val) {
-                        $tmp->{$val} = rtrim ($tmp->{$val});
-                    }
-                }
-
-                $output[] = $tmp;
-            }
-
-            unset ($char_type_fields);
-
-            if ($result) cubrid_close_request($result);
-
-            if (count ($output) == 1) return $output[0];
-            return $output;
-        }
-
-        /**
-         * @brief 1씩 증가되는 sequence 값을 return (cubrid의 auto_increment는 sequence테이블에서만 사용)
-         **/
-        function getNextSequence()
-        {
-            $this->_makeSequence();
-
-            $query = sprintf ("select \"%ssequence\".\"nextval\" as \"seq\" from db_root", $this->prefix);
-            $result = $this->_query($query);
-            $output = $this->_fetch($result);
-
-            return $output->seq;
-        }
-
-        /**
-         * @brief 마이그레이션시 sequence  가 없을 경우 생성
-         **/
-        function _makeSequence()
-        {
-            if($_GLOBALS['XE_EXISTS_SEQUENCE']) return;
-
-            // check cubrid serial
-            $query = sprintf('select count(*) as "count" from "db_serial" where name=\'%ssequence\'', $this->prefix);
-            $result = $this->_query($query);
-            $output = $this->_fetch($result);
-
-            // if do not create serial
-            if ($output->count == 0) {
-                $query = sprintf('select max("a"."srl") as "srl" from '.
-                                 '( select max("document_srl") as "srl" from '.
-                                 '"%sdocuments" UNION '.
-                                 'select max("comment_srl") as "srl" from '.
-                                 '"%scomments" UNION '.
-                                 'select max("member_srl") as "srl" from '.
-                                 '"%smember"'.
-                                  ') as "a"', $this->prefix, $this->prefix, $this->prefix);
-
-                $result = $this->_query($query);
-                $output = $this->_fetch($result);
-                $srl = $output->srl;
-                if ($srl < 1) {
-                    $start = 1;
-                }
-                else {
-                    $start = $srl + 1000000;
-                }
-
-                // create sequence
-                $query = sprintf('create serial "%ssequence" start with %s increment by 1 minvalue 1 maxvalue 10000000000000000000000000000000000000 nocycle;', $this->prefix, $start);
-                $this->_query($query);
-            }
-
-            $_GLOBALS['XE_EXISTS_SEQUENCE'] = true;
-        }
-
-
-        /**
-         * @brief 테이블 기생성 여부 return
-         **/
-        function isTableExists ($target_name)
-        {
-            if($target_name == 'sequence') {
-                $query = sprintf ("select \"name\" from \"db_serial\" where \"name\" = '%s%s'", $this->prefix, $target_name);
-            }
-            else {
-                $query = sprintf ("select \"class_name\" from \"db_class\" where \"class_name\" = '%s%s'", $this->prefix, $target_name);
-            }
-
-            $result = $this->_query ($query);
-            if (cubrid_num_rows($result) > 0) {
-                $output = true;
-            }
-            else {
-                $output = false;
-            }
-
-            if ($result) cubrid_close_request ($result);
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 추가
-         **/
-        function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = '', $notnull = false)
-        {
-            $type = strtoupper($this->column_type[$type]);
-            if ($type == 'INTEGER') $size = '';
-
-            $query = sprintf ("alter class \"%s%s\" add \"%s\" ", $this->prefix, $table_name, $column_name);
-
-            if ($type == 'char' || $type == 'varchar') {
-                if ($size) $size = $size * 3;
-            }
-
-            if ($size) {
-                $query .= sprintf ("%s(%s) ", $type, $size);
-            }
-            else {
-                $query .= sprintf ("%s ", $type);
-            }
-
-            if ($default) {
-                if ($type == 'INTEGER' || $type == 'BIGINT' || $type=='INT') {
-                    $query .= sprintf ("default %d ", $default);
-                }
-                else {
-                    $query .= sprintf ("default '%s' ", $default);
-                }
-            }
-
-            if ($notnull) $query .= "not null ";
-
-            $this->_query ($query);
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 제거
-         **/
-        function dropColumn ($table_name, $column_name)
-        {
-            $query = sprintf ("alter class \"%s%s\" drop \"%s\" ", $this->prefix, $table_name, $column_name);
-
-            $this->_query ($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 column의 정보를 return
-         **/
-        function isColumnExists ($table_name, $column_name)
-        {
-            $query = sprintf ("select \"attr_name\" from \"db_attribute\" where ".  "\"attr_name\" ='%s' and \"class_name\" = '%s%s'", $column_name, $this->prefix, $table_name);
-            $result = $this->_query ($query);
-
-            if (cubrid_num_rows ($result) > 0) $output = true;
-            else $output = false;
-
-            if ($result) cubrid_close_request ($result);
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 인덱스 추가
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
-        function addIndex ($table_name, $index_name, $target_columns, $is_unique = false)
-        {
-            if (!is_array ($target_columns)) {
-                $target_columns = array ($target_columns);
-            }
-
-            $query = sprintf ("create %s index \"%s\" on \"%s%s\" (%s);", $is_unique?'unique':'', $this->prefix .$index_name, $this->prefix, $table_name, '"'.implode('","',$target_columns).'"');
-
-            $this->_query ($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
-         **/
-        function dropIndex ($table_name, $index_name, $is_unique = false)
-        {
-            $query = sprintf ("drop %s index \"%s\" on \"%s%s\"", $is_unique?'unique':'', $this->prefix .$index_name, $this->prefix, $table_name);
-
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 index 정보를 return
-         **/
-        function isIndexExists ($table_name, $index_name)
-        {
-            $query = sprintf ("select \"index_name\" from \"db_index\" where ".  "\"class_name\" = '%s%s' and \"index_name\" = '%s' ", $this->prefix, $table_name, $this->prefix .$index_name);
-            $result = $this->_query ($query);
-
-            if ($this->isError ()) return false;
-
-            $output = $this->_fetch ($result);
-
-            if (!$output) return false;
-            return true;
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXml ($xml_doc)
-        {
-            return $this->_createTable ($xml_doc);
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXmlFile ($file_name)
-        {
-            if (!file_exists ($file_name)) return;
-            // xml 파일을 읽음
-            $buff = FileHandler::readFile ($file_name);
-
-            return $this->_createTable ($buff);
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create class query생성
-         *
-         * type : number, varchar, tinytext, text, bigtext, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable ($xml_doc)
-        {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-
-			// if the table already exists exit function
-            if ($this->isTableExists($table_name)) return;
-
-            // 만약 테이블 이름이 sequence라면 serial 생성
-            if ($table_name == 'sequence') {
-                $query = sprintf ('create serial "%s" start with 1 increment by 1'.
-                                  ' minvalue 1 '.
-                                  'maxvalue 10000000000000000000000000000000000000'.  ' nocycle;', $this->prefix.$table_name);
-
-                return $this->_query($query);
-            }
-
-
-            $table_name = $this->prefix.$table_name;
-
-            $query = sprintf ('create class "%s";', $table_name);
-            $this->_query ($query);
-
-            if (!is_array ($xml_obj->table->column)) {
-                $columns[] = $xml_obj->table->column;
-            }
-            else {
-                $columns = $xml_obj->table->column;
-            }
-
-            $query = sprintf ("alter class \"%s\" add attribute ", $table_name);
-
-            foreach ($columns as $column) {
-                $name = $column->attrs->name;
-                $type = $column->attrs->type;
-                $size = $column->attrs->size;
-                $notnull = $column->attrs->notnull;
-                $primary_key = $column->attrs->primary_key;
-                $index = $column->attrs->index;
-                $unique = $column->attrs->unique;
-                $default = $column->attrs->default;
-
-                switch ($this->column_type[$type]) {
-                    case 'integer' :
-                        $size = null;
-                        break;
-                    case 'text' :
-                        $size = null;
-                        break;
-                }
-
-                if (isset ($default) && ($type == 'varchar' || $type == 'char' ||
-                  $type == 'text' || $type == 'tinytext' || $type == 'bigtext')) {
-                    $default = sprintf ("'%s'", $default);
-                }
-
-                if ($type == 'varchar' || $type == 'char') {
-                    if($size) $size = $size * 3;
-                }
-
-
-                $column_schema[] = sprintf ('"%s" %s%s %s %s',
-                                    $name,
-                                    $this->column_type[$type],
-                                    $size?'('.$size.')':'',
-                                    isset($default)?"default ".$default:'',
-                                    $notnull?'not null':'');
-
-                if ($primary_key) {
-                    $primary_list[] = $name;
-                }
-                else if ($unique) {
-                    $unique_list[$unique][] = $name;
-                }
-                else if ($index) {
-                    $index_list[$index][] = $name;
-                }
-            }
-
-            $query .= implode (',', $column_schema).';';
-            $this->_query ($query);
-
-            if (count ($primary_list)) {
-                $query = sprintf ("alter class \"%s\" add attribute constraint ".  "\"pkey_%s\" PRIMARY KEY(%s);", $table_name, $table_name, '"'.implode('","',$primary_list).'"');
-                $this->_query ($query);
-            }
-
-            if (count ($unique_list)) {
-                foreach ($unique_list as $key => $val) {
-                    $query = sprintf ("create unique index \"%s\" on \"%s\" ".  "(%s);", $this->prefix .$key, $table_name, '"'.implode('","', $val).'"');
-                    $this->_query ($query);
-                }
-            }
-
-            if (count ($index_list)) {
-                foreach ($index_list as $key => $val) {
-                    $query = sprintf ("create index \"%s\" on \"%s\" (%s);", $this->prefix .$key, $table_name, '"'.implode('","',$val).'"');
-                    $this->_query ($query);
-                }
-            }
-        }
-
-        /**
-         * @brief 조건문 작성하여 return
-         **/
-        function getCondition ($output)
-        {
-            if (!$output->conditions) return;
-            $condition = $this->_getCondition ($output->conditions, $output->column_type, $output);
-            if ($condition) $condition = ' where '.$condition;
-
-            return $condition;
-        }
-
-        function _getCondition ($conditions, $column_type, &$output)
-        {
-            $condition = '';
-
-            foreach ($conditions as $val) {
-                $sub_condition = '';
-
-                foreach ($val['condition'] as $v) {
-                    if (!isset ($v['value'])) continue;
-                    if ($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double', 'array'))) continue;
-
-                    $name = $v['column'];
-                    $operation = $v['operation'];
-                    $value = $v['value'];
-                    $type = $this->getColumnType ($column_type, $name);
-                    $pipe = $v['pipe'];
-                    $value = $this->getConditionValue ($name, $value, $operation, $type, $column_type);
-
-                    if (!$value) {
-                        $value = $v['value'];
-                        if (strpos ($value, '(')) {
-                            $valuetmp = $value;
-                        }
-                        elseif (strpos ($value, ".") === false) {
-                            $valuetmp = $value;
-                        }
-                        else {
-                            $valuetmp = '"'.str_replace('.', '"."', $value).'"';
-                        }
-                    }
-                    else {
-                        $tmp = explode('.',$value);
-
-                        if (count($tmp)==2) {
-                            $table = $tmp[0];
-                            $column = $tmp[1];
-
-                            if ($column_type[$column] && (in_array ($table, $output->tables) ||
-                              array_key_exists($table, $output->tables))) {
-                                $valuetmp = sprintf('"%s"."%s"', $table, $column);
-                            }
-                            else {
-                                $valuetmp = $value;
-                            }
-                        }
-                        else {
-                            $valuetmp = $value;
-                        }
-                    }
-
-                    if (strpos ($name, '(') > 0) {
-                        $nametmp = $name;
-                    }
-                    elseif (strpos ($name, ".") === false) {
-                        $nametmp = '"'.$name.'"';
-                    }
-                    else {
-                        $nametmp = '"'.str_replace('.', '"."', $name).'"';
-                    }
-                    $str = $this->getConditionPart ($nametmp, $valuetmp, $operation);
-                    if ($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .= $str;
-                }
-
-                if ($sub_condition) {
-                    if ($condition && $val['pipe']) {
-                        $condition .= ' '.$val['pipe'].' ';
-                    }
-                    $condition .= '('.$sub_condition.')';
-                }
-            }
-
-            return $condition;
-        }
-
-        /**
-         * @brief insertAct 처리
-         **/
-        function _executeInsertAct ($output)
-        {
-            // 테이블 정리
-            foreach ($output->tables as $val) {
-                $table_list[] = '"'.$this->prefix.$val.'"';
-            }
-
-            // 컬럼 정리
-            foreach ($output->columns as $key => $val) {
-                $name = $val['name'];
-                $value = $val['value'];
-                //if ($this->getColumnType ($output->column_type, $name) != 'number')
-                if ($output->column_type[$name] != 'number') {
-                    if (!is_null($value)) {
-                        $value = "'" . $this->addQuotes($value) ."'";
-                    }
-                    else {
-                        if ($val['notnull']=='notnull') {
-                            $value = "''";
-                        }
-                        else {
-                            //$value = 'null';
-                            $value = "''";
-                        }
-                    }
-                }
-                else $this->_filterNumber(&$value);
-
-                $column_list[] = '"'.$name.'"';
-                $value_list[] = $value;
-            }
-
-            $query = sprintf ("insert into %s (%s) values (%s);", implode(',', $table_list), implode(',', $column_list), implode(',', $value_list));
-
-            $query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
-            $result = $this->_query ($query);
-            if ($result && !$this->transaction_started) {
-                @cubrid_commit ($this->fd);
-            }
-
-            return $result;
-        }
-
-        /**
-         * @brief updateAct 처리
-         **/
-        function _executeUpdateAct ($output)
-        {
-            // 테이블 정리
-            foreach ($output->tables as $key => $val) {
-                $table_list[] = '"'.$this->prefix.$val.'" as "'.$key.'"';
-            }
-
-            $check_click_count = true;
-
-            // 컬럼 정리
-            foreach ($output->columns as $key => $val) {
-                if (!isset ($val['value'])) continue;
-                $name = $val['name'];
-                $value = $val['value'];
-
-                if (substr ($value, -2) != '+1' || $output->column_type[$name] != 'number') {
-                    $check_click_count = false;
-                }
-
-                for ($i = 0; $i < $key; $i++) {
-                    /* 한문장에 같은 속성에 대한 중복 설정은 큐브리드에서는 허용치 않음 */
-                    if ($output->columns[$i]['name'] == $name) break;
-                }
-                if ($i < $key) continue; // 중복이 발견되면 이후의 설정은 무시
-
-                if (strpos ($name, '.') !== false && strpos ($value, '.') !== false) {
-                    $column_list[] = $name.' = '.$value;
-                }
-                else {
-                    if ($output->column_type[$name] != 'number') {
-                        $check_column = false;
-                        $value = "'".$this->addQuotes ($value)."'";
-                    }
-					else $this->_filterNumber(&$value);
-
-                    $column_list[] = sprintf ("\"%s\" = %s", $name, $value);
-                }
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition ($output);
-
-            $check_click_count_condition = false;
-            if ($check_click_count) {
-                foreach ($output->conditions as $val) {
-                    if ($val['pipe'] == 'or') {
-                        $check_click_count_condition = false;
-                        break;
-                    }
-
-                    foreach ($val['condition'] as $v) {
-                        if ($v['operation'] == 'equal') {
-                            $check_click_count_condition = true;
-                        }
-                        else {
-                            if ($v['operation'] == 'in' && !strpos ($v['value'], ',')) {
-                                $check_click_count_condition = true;
-                            }
-                            else {
-                                $check_click_count_condition = false;
-                            }
-                        }
-
-                        if ($v['pipe'] == 'or') {
-                            $check_click_count_condition = false;
-                            break;
-                        }
-                    }
-                }
-            }
-
-            if ($check_click_count&& $check_click_count_condition && count ($output->tables) == 1 && count ($output->conditions) > 0 && count ($output->groups) == 0 && count ($output->order) == 0) {
-                foreach ($output->columns as $v) {
-                    $incr_columns[] = 'incr("'.$v['name'].'")';
-                }
-
-                $query = sprintf ('select %s from %s %s', join (',', $incr_columns), implode(',', $table_list), $condition);
-            }
-            else {
-                $query = sprintf ("update %s set %s %s", implode (',', $table_list), implode (',', $column_list), $condition);
-            }
-
-            $result = $this->_query ($query);
-            if ($result && !$this->transaction_started) @cubrid_commit ($this->fd);
-
-            return $result;
-        }
-
-        /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct ($output)
-        {
-            // 테이블 정리
-            foreach ($output->tables as $val) {
-                $table_list[] = '"'.$this->prefix.$val.'"';
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition ($output);
-
-            $query = sprintf ("delete from %s %s", implode (',',$table_list), $condition);
-            $result = $this->_query ($query);
-            if ($result && !$this->transaction_started) @cubrid_commit ($this->fd);
-
-            return $result;
-        }
-
-        /**
-         * @brief selectAct 처리
-         *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
-         **/
-        function _executeSelectAct ($output)
-        {
-            // 테이블 정리
-            $table_list = array ();
-            foreach ($output->tables as $key => $val) {
-                $table_list[] = '"'.$this->prefix.$val.'" as "'.$key.'"';
-            }
-            $left_join = array ();
-            // why???
-            $left_tables = (array) $output->left_tables;
-
-            foreach ($left_tables as $key => $val) {
-                $condition = $this->_getCondition ($output->left_conditions[$key], $output->column_type, $output);
-                if ($condition) {
-                    $left_join[] = $val.' "'.$this->prefix.$output->_tables[$key].  '" "'.$key.'" on ('.$condition.')';
-                }
-            }
-
-            $click_count = array();
-            if(!$output->columns){
-                $output->columns = array(array('name'=>'*'));
-            }
-
-            $column_list = array ();
-            foreach ($output->columns as $key => $val) {
-                $name = $val['name'];
-
-                $click_count = '%s';
-                if ($val['click_count'] && count ($output->conditions) > 0) {
-                    $click_count = 'incr(%s)';
-                }
-
-                $alias = $val['alias'] ? sprintf ('"%s"', $val['alias']) : null;
-                $_alias = $val['alias'];
-
-                if ($name == '*') {
-                    $column_list[] = $name;
-                }
-                elseif (strpos ($name, '.') === false && strpos ($name, '(') === false) {
-                    $name = sprintf ($click_count,$name);
-                    if ($alias) {
-                        $column_list[$alias] = sprintf('"%s" as %s', $name, $alias);
-                    }
-                    else {
-                        $column_list[] = sprintf ('"%s"', $name);
-                    }
-                }
-                else {
-                    if (strpos ($name, '.') != false) {
-                        list ($prefix, $name) = explode('.', $name);
-                        if (($now_matchs = preg_match_all ("/\(/", $prefix, $xtmp)) > 0) {
-                            if ($now_matchs == 1) {
-                                $tmpval = explode ("(", $prefix);
-                                $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
-                                $prefix = implode ("(", $tmpval);
-                                $tmpval = explode (")", $name);
-                                $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
-                                $name = implode (")", $tmpval);
-                            }
-                        }
-                        else {
-                            $prefix = sprintf ('"%s"', $prefix);
-                            $name = ($name == '*') ? $name : sprintf('"%s"',$name);
-                        }
-                        $xtmp = null;
-                        $now_matchs = null;
-                        if($alias) $column_list[$_alias] = sprintf ($click_count, sprintf ('%s.%s', $prefix, $name)) .  ($alias ? sprintf (' as %s',$alias) : '');
-                        else $column_list[] = sprintf ($click_count, sprintf ('%s.%s', $prefix, $name));
-                    }
-                    elseif (($now_matchs = preg_match_all ("/\(/", $name, $xtmp)) > 0) {
-                        if ($now_matchs == 1 && preg_match ("/[a-zA-Z0-9]*\(\*\)/", $name) < 1) {
-                            $open_pos = strpos ($name, "(");
-                            $close_pos = strpos ($name, ")");
-
-                            if (preg_match ("/,/", $name)) {
-                                $tmp_func_name = sprintf ('%s', substr ($name, 0, $open_pos));
-                                $tmp_params = sprintf ('%s', substr ($name, $open_pos + 1, $close_pos - $open_pos - 1));
-                                $tmpval = null;
-                                $tmpval = explode (',', $tmp_params);
-
-                                foreach ($tmpval as $tmp_param) {
-                                    $tmp_param_list[] = (!is_numeric ($tmp_param)) ? sprintf ('"%s"', $tmp_param) : $tmp_param;
-                                }
-
-                                $tmpval = implode (',', $tmp_param_list);
-                                $name = sprintf ('%s(%s)', $tmp_func_name, $tmpval);
-                            }
-                            else {
-                                $name = sprintf ('%s("%s")', substr ($name, 0, $open_pos), substr ($name, $open_pos + 1, $close_pos - $open_pos - 1));
-                            }
-                        }
-
-                        if($alias) $column_list[$_alias] = sprintf ($click_count, $name).  ($alias ? sprintf (' as %s', $alias) : '');
-                        else $column_list[] = sprintf ($click_count, $name);
-                    }
-                    else {
-                        if($alias) $column_list[$_alias] = sprintf($click_count, $name).  ($alias ? sprintf(' as %s',$alias) : '');
-                        else $column_list[] = sprintf($click_count, $name);
-                    }
-                }
-                $columns = implode (',', $column_list);
-            }
-
-            $condition = $this->getCondition ($output);
-
-            $output->column_list = $column_list;
-            if ($output->list_count && $output->page) {
-                return ($this->_getNavigationData($table_list, $columns, $left_join, $condition, $output));
-            }
-
-            if ($output->order) {
-                $conditions = $this->getConditionList($output);
-                //if(in_array('list_order', $conditions) || in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if ($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                //}
-            }
-
-
-            if (count ($output->groups)) {
-                foreach ($output->groups as $key => $value) {
-                    if (strpos ($value, '.')) {
-                        $tmp = explode ('.', $value);
-                        $tmp[0] = sprintf ('"%s"', $tmp[0]);
-                        $tmp[1] = sprintf ('"%s"', $tmp[1]);
-                        $value = implode ('.', $tmp);
-                    }
-                    elseif (strpos ($value, '(')) {
-                        $value = $value;
-                    }
-                    else {
-                        $value = sprintf ('"%s"', $value);
-                    }
-                    $output->groups[$key] = $value;
-
-
-                    if(count($output->arg_columns))
-                    {
-                        if($column_list[$value]) $output->arg_columns[] = $column_list[$value];
-                    }
-                }
-                $groupby_query = sprintf ('group by %s', implode(',', $output->groups));
-            }
-
-
-            // list_count를 사용할 경우 적용
-            if ($output->list_count['value']) {
-                $start_count = 0;
-                $list_count = $output->list_count['value'];
-
-                if ($output->order) {
-                  foreach ($output->order as $val) {
-                      if (strpos ($val[0], '.')) {
-                          $tmpval = explode ('.', $val[0]);
-                          $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
-                          $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
-                          $val[0] = implode ('.', $tmpval);
-                      }
-                      elseif (strpos ($val[0], '(')) $val[0] = $val[0];
-                      elseif ($val[0] == 'count') $val[0] = 'count (*)';
-                      else $val[0] = sprintf ('"%s"', $val[0]);
-                      $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-                  }
-                  if (count($index_list))
-                      $orderby_query = ' order by '.implode(',', $index_list);
-                      $orderby_query = sprintf ('%s for orderby_num() between %d and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                }
-                else {
-                    if (count ($output->groups)) {
-                        $orderby_query = sprintf ('%s having groupby_num() between %d'.  ' and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                    }
-                    else {
-                        if ($condition) {
-                            $orderby_query = sprintf ('%s and inst_num() between %d'.  ' and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                        }
-                        else {
-                            $orderby_query = sprintf ('%s where inst_num() between %d'.  ' and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                        }
-                    }
-                }
-            }
-            else {
-                if ($output->order) {
-                    foreach ($output->order as $val) {
-                        if (strpos ($val[0], '.')) {
-                            $tmpval = explode ('.', $val[0]);
-                            $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
-                            $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
-                            $val[0] = implode ('.', $tmpval);
-                        }
-                        elseif (strpos ($val[0], '(')) $val[0] = $val[0];
-                        elseif ($val[0] == 'count') $val[0] = 'count (*)';
-                        else $val[0] = sprintf ('"%s"', $val[0]);
-                        $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-
-                        if(count($output->arg_columns) && $column_list[$val]) $output->arg_columns[] = $column_list[$key];
-                    }
-
-                    if (count ($index_list)) {
-                        $orderby_query = ' order by '.implode(',', $index_list);
-                    }
-                }
-            }
-
-
-            if(count($output->arg_columns))
-            {
-                $columns = array();
-                foreach($output->arg_columns as $col){
-                    if(strpos($col,'"')===false && strpos($col,' ')===false) $columns[] = '"'.$col.'"';
-                    else $columns[] = $col;
-                }
-
-                $columns = join(',',$columns);
-            }
-
-            $query = sprintf ("select %s from %s %s %s %s", $columns, implode (',',$table_list), implode (' ',$left_join), $condition, $groupby_query.$orderby_query);
-            $query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
-            $result = $this->_query ($query);
-            if ($this->isError ()) return;
-            $data = $this->_fetch ($result);
-
-            $buff = new Object ();
-            $buff->data = $data;
-
-            return $buff;
-        }
-
-        /**
-         * @brief 현재 시점의 Stack trace를 보여줌.결과를 fetch
-         **/
-        function backtrace ()
-        {
-            $output = "<div style='text-align: left;'>\n";
-            $output .= "<b>Backtrace:</b><br />\n";
-            $backtrace = debug_backtrace ();
-
-            foreach ($backtrace as $bt) {
-                $args = '';
-                foreach ($bt['args'] as $a) {
-                    if (!empty ($args)) {
-                        $args .= ', ';
-                    }
-                    switch (gettype ($a)) {
-                    case 'integer':
-                    case 'double':
-                        $args .= $a;
-                        break;
-                    case 'string':
-                        $a = htmlspecialchars (substr ($a, 0, 64)).
-                            ((strlen ($a) > 64) ? '...' : '');
-                        $args .= "\"$a\"";
-                        break;
-                    case 'array':
-                        $args .= 'Array ('. count ($a).')';
-                        break;
-                    case 'object':
-                        $args .= 'Object ('.get_class ($a).')';
-                        break;
-                    case 'resource':
-                        $args .= 'Resource ('.strstr ($a, '#').')';
-                        break;
-                    case 'boolean':
-                        $args .= $a ? 'True' : 'False';
-                        break;
-                    case 'NULL':
-                        $args .= 'Null';
-                        break;
-                    default:
-                        $args .= 'Unknown';
-                    }
-                }
-                $output .= "<br />\n";
-                $output .= "<b>file:</b> ".$bt['line']." - ".  $bt['file']."<br />\n";
-                $output .= "<b>call:</b> ".$bt['class'].  $bt['type'].$bt['function'].$args."<br />\n";
-            }
-            $output .= "</div>\n";
-            return $output;
-        }
-
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-        function _getNavigationData ($table_list, $columns, $left_join, $condition, $output) {
-            require_once (_XE_PATH_.'classes/page/PageHandler.class.php');
-
-            $column_list = $output->column_list;
-
-            $count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
-            $count_query = sprintf('select count(*) as "count" from %s %s %s', implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-            if (count($output->groups)) {
-                $count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
-            }
-
-            $count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
-            $result = $this->_query($count_query);
-            $count_output = $this->_fetch($result);
-            $total_count = (int)$count_output->count;
-
-            $list_count = $output->list_count['value'];
-            if (!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if (!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if (!$page) $page = 1;
-
-            // 전체 페이지를 구함
-            if ($total_count) {
-                $total_page = (int) (($total_count - 1) / $list_count) + 1;
-            }
-            else {
-                $total_page = 1;
-            }
-
-            // 페이지 변수를 체크
-            if ($page > $total_page) $page = $total_page;
-            $start_count = ($page - 1) * $list_count;
-
-            if ($output->order) {
-                $conditions = $this->getConditionList($output);
-                //if(in_array('list_order', $conditions) || in_array('update_order', $conditions)) {
-                    foreach ($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                //}
-            }
-
-
-            if (count ($output->groups)) {
-                foreach ($output->groups as $key => $value) {
-                    if (strpos ($value, '.')) {
-                        $tmp = explode ('.', $value);
-                        $tmp[0] = sprintf ('"%s"', $tmp[0]);
-                        $tmp[1] = sprintf ('"%s"', $tmp[1]);
-                        $value = implode ('.', $tmp);
-                    }
-                    elseif (strpos ($value, '(')) $value = $value;
-                    else $value = sprintf ('"%s"', $value);
-                    $output->groups[$key] = $value;
-                }
-
-                $groupby_query = sprintf (' group by %s', implode (',', $output->groups));
-            }
-
-            if ($output->order) {
-                foreach ($output->order as $val) {
-                    if (strpos ($val[0], '.')) {
-                        $tmpval = explode ('.', $val[0]);
-                        $tmpval[0] = sprintf ('"%s"', $tmpval[0]);
-                        $tmpval[1] = sprintf ('"%s"', $tmpval[1]);
-                        $val[0] = implode ('.', $tmpval);
-                    }
-                    elseif (strpos ($val[0], '(')) $val[0] = $val[0];
-                    elseif ($val[0] == 'count') $val[0] = 'count (*)';
-                    else $val[0] = sprintf ('"%s"', $val[0]);
-                    $index_list[] = sprintf ('%s %s', $val[0], $val[1]);
-                }
-
-                if (count ($index_list)) {
-                    $orderby_query = ' order by '.implode(',', $index_list);
-                }
-
-                $orderby_query = sprintf ('%s for orderby_num() between %d and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-            }
-            else {
-                if (count($output->groups)) {
-                    $orderby_query = sprintf ('%s having groupby_num() between %d and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                }
-                else {
-                    if ($condition) {
-                        $orderby_query = sprintf ('%s and inst_num() between %d and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                    }
-                    else {
-                        $orderby_query = sprintf('%s where inst_num() between %d and %d', $orderby_query, $start_count + 1, $list_count + $start_count);
-                    }
-                }
-            }
-
-            if(count($output->arg_columns))
-            {
-                $columns = array();
-                foreach($output->arg_columns as $col){
-                    if(strpos($col,'"')===false) $columns[] = '"'.$col.'"';
-                    else $columns[] = $col;
-                }
-
-                $columns = join(',',$columns);
-            }
-
-            $query = sprintf ("select %s from %s %s %s %s", $columns, implode (',',$table_list), implode (' ',$left_join), $condition, $groupby_query.$orderby_query);
-            $query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
-            $result = $this->_query ($query);
-
-            if ($this->isError ()) {
-                $buff = new Object ();
-                $buff->total_count = 0;
-                $buff->total_page = 0;
-                $buff->page = 1;
-                $buff->data = array ();
-
-                $buff->page_navigation = new PageHandler ($total_count, $total_page, $page, $page_count);
-
-                return $buff;
-            }
-
-            $virtual_no = $total_count - ($page - 1) * $list_count;
-            while ($tmp = cubrid_fetch ($result, CUBRID_OBJECT)) {
-                if ($tmp) {
-                    foreach ($tmp as $k => $v) {
-                        $tmp->{$k} = rtrim($v);
-                    }
-                }
-                $data[$virtual_no--] = $tmp;
-            }
-
-            $buff = new Object ();
-            $buff->total_count = $total_count;
-            $buff->total_page = $total_page;
-            $buff->page = $page;
-            $buff->data = $data;
-
-            $buff->page_navigation = new PageHandler ($total_count, $total_page, $page, $page_count);
-
-            return $buff;
-        }
-    }
-
-return new DBCubrid;
-?>
+<?php
+	/**
+	 * @class DBCubrid
+	 * @author NHN (developers@xpressengine.com)
+	 * @brief Cubrid DBMS to use the class
+	 * @version 0.1p1
+	 *
+	 * Modified to work with CUBRID2008 R1.3 verion by Prototype (prototype@cubrid.com)/09.02.23
+	 * Test completed for CUBRID 7.3 ~ 2008 R1.3 versions.
+	 * Only basic query used so query tunning and optimization needed
+	 **/
+
+	class DBCubrid extends DB
+	{
+
+		/**
+		 * @brief CUBRID DB connection information
+		 **/
+		var $prefix = 'xe_'; // / <prefix of XE tables(One more XE can be installed on a single DB)
+		var $cutlen = 12000; // /< max size of constant in CUBRID(if string is larger than this, '...'+'...' should be used)
+		var $comment_syntax = '/* %s */';
+
+		/**
+		 * @brief column type used in CUBRID
+		 *
+		 * column_type should be replaced for each DBMS's type
+		 * becasue it uses commonly defined type in the schema/query xml
+		 **/
+		var $column_type = array(
+			'bignumber' => 'numeric(20)',
+			'number' => 'integer',
+			'varchar' => 'character varying',
+			'char' => 'character',
+			'tinytext' => 'character varying(256)',
+			'text' => 'character varying(1073741823)',
+			'bigtext' => 'character varying(1073741823)',
+			'date' => 'character varying(14)',
+			'float' => 'float',
+		);
+
+		/**
+		 * @brief constructor
+		 **/
+		function DBCubrid()
+		{
+			$this->_setDBInfo();
+			$this->_connect();
+		}
+
+		/**
+		 * @brief create an instance of this class
+		 */
+		function create()
+		{
+			return new DBCubrid;
+		}
+
+		/**
+		 * @brief Return if installable
+		 **/
+		function isSupported()
+		{
+			if (!function_exists('cubrid_connect')) return false;
+			return true;
+		}
+
+		/**
+		 * @brief DB Connection
+		 **/
+		function __connect($connection)
+		{
+                        // attempts to connect
+			$result = @cubrid_connect($connection["db_hostname"], $connection["db_port"], $connection["db_database"], $connection["db_userid"], $connection["db_password"]);
+
+			// check connections
+			if (!$result) {
+				$this->setError (-1, 'database connect fail');
+				return;
+			}
+                        return $result;
+		}
+
+		/**
+		 * @brief DB disconnect
+		 **/
+		function _close($connection)
+		{
+			@cubrid_commit ($connection);
+			@cubrid_disconnect ($connection);
+			$this->transaction_started = false;
+		}
+
+		/**
+		 * @brief handles quatation of the string variables from the query
+		 **/
+		function addQuotes($string)
+		{
+			if (version_compare (PHP_VERSION, "5.9.0", "<") &&
+			  get_magic_quotes_gpc ()) {
+				$string = stripslashes (str_replace ("\\","\\\\", $string));
+			}
+
+			if (!is_numeric ($string)) {
+			/*
+				if ($this->isConnected()) {
+					$string = cubrid_real_escape_string($string);
+				}
+				else {
+					$string = str_replace("'","\'",$string);
+				}
+				*/
+
+				$string = str_replace("'","''",$string);
+			}
+
+			return $string;
+		}
+
+		/**
+		 * @brief Begin transaction
+		 **/
+		function _begin()
+		{
+                    return true;
+		}
+
+		/**
+		 * @brief Rollback
+		 **/
+		function _rollback()
+		{
+                        $connection = $this->_getConnection('master');
+			@cubrid_rollback ($connection);
+                        return true;
+		}
+
+		/**
+		 * @brief Commit
+		 **/
+		function _commit()
+		{
+                        $connection = $this->_getConnection('master');
+			@cubrid_commit($connection);
+                        return true;
+		}
+
+		/**
+		 * @brief : executing the query and fetching the result
+		 *
+		 * query: run a query and return the result\n
+		 * fetch: NULL if no value returned \n
+		 *		array object if rows returned \n
+		 *		object if a row returned \n
+		 *		return\n
+		 **/
+		function __query($query, $connection)
+		{
+			// Execute the query
+			$result = @cubrid_execute ($connection, $query);
+			// error check
+			if (cubrid_error_code ()) {
+				$code = cubrid_error_code ();
+				$msg = cubrid_error_msg ();
+
+				$this->setError ($code, $msg);
+			}
+			// Return the result
+ 			return $result;
+		}
+
+		/**
+		 * @brief Fetch the result
+		 **/
+		function _fetch($result, $arrayIndexEndValue = NULL)
+		{
+			if (!$this->isConnected() || $this->isError() || !$result) return;
+
+			// TODO Improve this piece of code
+			// This code trims values from char type columns
+			$col_types = cubrid_column_types ($result);
+			$col_names = cubrid_column_names ($result);
+			$max = count ($col_types);
+
+			for ($count = 0; $count < $max; $count++) {
+				if (preg_match ("/^char/", $col_types[$count]) > 0) {
+					$char_type_fields[] = $col_names[$count];
+				}
+			}
+
+			while ($tmp = cubrid_fetch ($result, CUBRID_OBJECT)) {
+				if (is_array ($char_type_fields)) {
+					foreach ($char_type_fields as $val) {
+						$tmp->{$val} = rtrim ($tmp->{$val});
+					}
+				}
+
+				if($arrayIndexEndValue) $output[$arrayIndexEndValue--] = $tmp;
+				else $output[] = $tmp;
+			}
+
+			unset ($char_type_fields);
+
+			if ($result) cubrid_close_request($result);
+
+                        if(count($output)==1){
+                            // If call is made for pagination, always return array
+                            if(isset($arrayIndexEndValue)) return $output;
+                            // Else return object instead of array
+                            else return $output[0];
+                        }
+                        return $output;
+		}
+
+		/**
+		 * @brief return the sequence value incremented by 1(auto_increment column only used in the CUBRID sequence table)
+		 **/
+		function getNextSequence()
+		{
+			$this->_makeSequence();
+
+			$query = sprintf ("select \"%ssequence\".\"nextval\" as \"seq\" from db_root", $this->prefix);
+			$result = $this->_query($query);
+			$output = $this->_fetch($result);
+
+			return $output->seq;
+		}
+
+		/**
+		 * @brief return if the table already exists
+		 **/
+		function _makeSequence()
+		{
+			if($_GLOBALS['XE_EXISTS_SEQUENCE']) return;
+
+			// check cubrid serial
+			$query = sprintf('select count(*) as "count" from "db_serial" where name=\'%ssequence\'', $this->prefix);
+			$result = $this->_query($query);
+			$output = $this->_fetch($result);
+
+			// if do not create serial
+			if ($output->count == 0) {
+				$query = sprintf('select max("a"."srl") as "srl" from '.
+								 '( select max("document_srl") as "srl" from '.
+								 '"%sdocuments" UNION '.
+								 'select max("comment_srl") as "srl" from '.
+								 '"%scomments" UNION '.
+								 'select max("member_srl") as "srl" from '.
+								 '"%smember"'.
+								  ') as "a"', $this->prefix, $this->prefix, $this->prefix);
+
+				$result = $this->_query($query);
+				$output = $this->_fetch($result);
+				$srl = $output->srl;
+				if ($srl < 1) {
+					$start = 1;
+				}
+				else {
+					$start = $srl + 1000000;
+				}
+
+				// create sequence
+				$query = sprintf('create serial "%ssequence" start with %s increment by 1 minvalue 1 maxvalue 10000000000000000000000000000000000000 nocycle;', $this->prefix, $start);
+				$this->_query($query);
+			}
+
+			$_GLOBALS['XE_EXISTS_SEQUENCE'] = true;
+		}
+
+
+		/**
+		 * brief return a table if exists
+		 **/
+		function isTableExists ($target_name)
+		{
+			if($target_name == 'sequence') {
+				$query = sprintf ("select \"name\" from \"db_serial\" where \"name\" = '%s%s'", $this->prefix, $target_name);
+			}
+			else {
+				$query = sprintf ("select \"class_name\" from \"db_class\" where \"class_name\" = '%s%s'", $this->prefix, $target_name);
+			}
+
+			$result = $this->_query ($query);
+			if (cubrid_num_rows($result) > 0) {
+				$output = true;
+			}
+			else {
+				$output = false;
+			}
+
+			if ($result) cubrid_close_request ($result);
+
+			return $output;
+		}
+
+		/**
+		 * @brief add a column to the table
+		 **/
+		function addColumn($table_name, $column_name, $type = 'number', $size = '', $default = '', $notnull = false)
+		{
+			$type = strtoupper($this->column_type[$type]);
+			if ($type == 'INTEGER') $size = '';
+
+			$query = sprintf ("alter class \"%s%s\" add \"%s\" ", $this->prefix, $table_name, $column_name);
+
+			if ($type == 'char' || $type == 'varchar') {
+				if ($size) $size = $size * 3;
+			}
+
+			if ($size) {
+				$query .= sprintf ("%s(%s) ", $type, $size);
+			}
+			else {
+				$query .= sprintf ("%s ", $type);
+			}
+
+			if ($default) {
+				if ($type == 'INTEGER' || $type == 'BIGINT' || $type=='INT') {
+					$query .= sprintf ("default %d ", $default);
+				}
+				else {
+					$query .= sprintf ("default '%s' ", $default);
+				}
+			}
+
+			if ($notnull) $query .= "not null ";
+
+			$this->_query ($query);
+		}
+
+		/**
+		 * @brief drop a column from the table
+		 **/
+		function dropColumn ($table_name, $column_name)
+		{
+			$query = sprintf ("alter class \"%s%s\" drop \"%s\" ", $this->prefix, $table_name, $column_name);
+
+			$this->_query ($query);
+		}
+
+		/**
+		 * @brief return column information of the table
+		 **/
+		function isColumnExists ($table_name, $column_name)
+		{
+			$query = sprintf ("select \"attr_name\" from \"db_attribute\" where ".  "\"attr_name\" ='%s' and \"class_name\" = '%s%s'", $column_name, $this->prefix, $table_name);
+			$result = $this->_query ($query);
+
+			if (cubrid_num_rows ($result) > 0) $output = true;
+			else $output = false;
+
+			if ($result) cubrid_close_request ($result);
+
+			return $output;
+		}
+
+		/**
+		 * @brief add an index to the table
+		 * $target_columns = array(col1, col2)
+		 * $is_unique? unique : none
+		 **/
+		function addIndex ($table_name, $index_name, $target_columns, $is_unique = false)
+		{
+			if (!is_array ($target_columns)) {
+				$target_columns = array ($target_columns);
+			}
+
+			$query = sprintf ("create %s index \"%s\" on \"%s%s\" (%s);", $is_unique?'unique':'', $this->prefix .$index_name, $this->prefix, $table_name, '"'.implode('","',$target_columns).'"');
+
+			$this->_query ($query);
+		}
+
+		/**
+		 * @brief drop an index from the table
+		 **/
+		function dropIndex ($table_name, $index_name, $is_unique = false)
+		{
+			$query = sprintf ("drop %s index \"%s\" on \"%s%s\"", $is_unique?'unique':'', $this->prefix .$index_name, $this->prefix, $table_name);
+
+			$this->_query($query);
+		}
+
+		/**
+		 * @brief return index information of the table
+		 **/
+		function isIndexExists ($table_name, $index_name)
+		{
+			$query = sprintf ("select \"index_name\" from \"db_index\" where ".  "\"class_name\" = '%s%s' and \"index_name\" = '%s' ", $this->prefix, $table_name, $this->prefix .$index_name);
+			$result = $this->_query ($query);
+
+			if ($this->isError ()) return false;
+
+			$output = $this->_fetch ($result);
+
+			if (!$output) return false;
+			return true;
+		}
+
+		/**
+		 * @brief creates a table by using xml file
+		 **/
+		function createTableByXml ($xml_doc)
+		{
+			return $this->_createTable ($xml_doc);
+		}
+
+		/**
+		 * @brief creates a table by using xml file
+		 **/
+		function createTableByXmlFile ($file_name)
+		{
+			if (!file_exists ($file_name)) return;
+			// read xml file
+			$buff = FileHandler::readFile ($file_name);
+			return $this->_createTable ($buff);
+		}
+
+		/**
+		 * @brief create table by using the schema xml
+		 *
+		 * type : number, varchar, tinytext, text, bigtext, char, date, \n
+		 * opt : notnull, default, size\n
+		 * index : primary key, index, unique\n
+		 **/
+		function _createTable ($xml_doc)
+		{
+			// xml parsing
+			$oXml = new XmlParser();
+			$xml_obj = $oXml->parse($xml_doc);
+			// Create a table schema
+			$table_name = $xml_obj->table->attrs->name;
+
+			// if the table already exists exit function
+			if ($this->isTableExists($table_name)) return;
+
+			// If the table name is sequence, it creates a serial
+			if ($table_name == 'sequence') {
+				$query = sprintf ('create serial "%s" start with 1 increment by 1'.
+								  ' minvalue 1 '.
+								  'maxvalue 10000000000000000000000000000000000000'.  ' nocycle;', $this->prefix.$table_name);
+
+				return $this->_query($query);
+			}
+
+
+			$table_name = $this->prefix.$table_name;
+
+			$query = sprintf ('create class "%s";', $table_name);
+			$this->_query ($query);
+
+			if (!is_array ($xml_obj->table->column)) {
+				$columns[] = $xml_obj->table->column;
+			}
+			else {
+				$columns = $xml_obj->table->column;
+			}
+
+			$query = sprintf ("alter class \"%s\" add attribute ", $table_name);
+
+			foreach ($columns as $column) {
+				$name = $column->attrs->name;
+				$type = $column->attrs->type;
+				$size = $column->attrs->size;
+				$notnull = $column->attrs->notnull;
+				$primary_key = $column->attrs->primary_key;
+				$index = $column->attrs->index;
+				$unique = $column->attrs->unique;
+				$default = $column->attrs->default;
+
+				switch ($this->column_type[$type]) {
+					case 'integer' :
+						$size = null;
+						break;
+					case 'text' :
+						$size = null;
+						break;
+				}
+
+				if (isset ($default) && ($type == 'varchar' || $type == 'char' ||
+				  $type == 'text' || $type == 'tinytext' || $type == 'bigtext')) {
+					$default = sprintf ("'%s'", $default);
+				}
+
+				if ($type == 'varchar' || $type == 'char') {
+					if($size) $size = $size * 3;
+				}
+
+
+				$column_schema[] = sprintf ('"%s" %s%s %s %s',
+									$name,
+									$this->column_type[$type],
+									$size?'('.$size.')':'',
+									isset($default)?"default ".$default:'',
+									$notnull?'not null':'');
+
+				if ($primary_key) {
+					$primary_list[] = $name;
+				}
+				else if ($unique) {
+					$unique_list[$unique][] = $name;
+				}
+				else if ($index) {
+					$index_list[$index][] = $name;
+				}
+			}
+
+			$query .= implode (',', $column_schema).';';
+			$this->_query ($query);
+
+			if (count ($primary_list)) {
+				$query = sprintf ("alter class \"%s\" add attribute constraint ".  "\"pkey_%s\" PRIMARY KEY(%s);", $table_name, $table_name, '"'.implode('","',$primary_list).'"');
+				$this->_query ($query);
+			}
+
+			if (count ($unique_list)) {
+				foreach ($unique_list as $key => $val) {
+					$query = sprintf ("create unique index \"%s\" on \"%s\" ".  "(%s);", $this->prefix .$key, $table_name, '"'.implode('","', $val).'"');
+					$this->_query ($query);
+				}
+			}
+
+			if (count ($index_list)) {
+				foreach ($index_list as $key => $val) {
+					$query = sprintf ("create index \"%s\" on \"%s\" (%s);", $this->prefix .$key, $table_name, '"'.implode('","',$val).'"');
+					$this->_query ($query);
+				}
+			}
+		}
+
+
+
+
+		/**
+		 * @brief handles insertAct
+		 **/
+		function _executeInsertAct($queryObject)
+		{
+			$query = $this->getInsertSql($queryObject);
+			if(is_a($query, 'Object')) return;
+
+			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+
+			$result = $this->_query ($query);
+			if ($result && !$this->transaction_started) {
+				$this->_commit();
+			}
+
+			return $result;
+		}
+
+		/**
+		 * @brief handles updateAct
+		 **/
+		function _executeUpdateAct($queryObject)
+		{
+			$query = $this->getUpdateSql($queryObject);
+			if(is_a($query, 'Object')) return;
+
+			$result = $this->_query($query);
+
+			if ($result && !$this->transaction_started) $this->_commit();
+
+			return $result;
+		}
+
+
+		/**
+		 * @brief handles deleteAct
+		 **/
+		function _executeDeleteAct($queryObject)
+		{
+			$query =  $this->getDeleteSql($queryObject);
+			if(is_a($query, 'Object')) return;
+
+			$result = $this->_query ($query);
+
+			if ($result && !$this->transaction_started) $this->_commit();
+
+			return $result;
+		}
+
+		/**
+		 * @brief Handle selectAct
+		 *
+		 * to get a specific page list easily in select statement,\n
+		 * a method, navigation, is used
+		 **/
+		 function _executeSelectAct($queryObject, $connection = null){
+                        $limit = $queryObject->getLimit();
+        		if ($limit && $limit->isPageHandler())
+                                return $this->queryPageLimit($queryObject, $result, $connection);
+                        else {
+                            $query = $this->getSelectSql($queryObject);
+                            if(is_a($query, 'Object')) return;
+
+                            $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+                            $result = $this->_query ($query, $connection);
+
+                            if ($this->isError ())
+                                    return $this->queryError($queryObject);
+
+                            $data = $this->_fetch($result);
+                            $buff = new Object ();
+                            $buff->data = $data;
+                            return $buff;
+                        }
+		}
+
+		function queryError($queryObject){
+                        $limit = $queryObject->getLimit();
+			if ($limit && $limit->isPageHandler()){
+					$buff = new Object ();
+					$buff->total_count = 0;
+					$buff->total_page = 0;
+					$buff->page = 1;
+					$buff->data = array ();
+					$buff->page_navigation = new PageHandler (/*$total_count*/0, /*$total_page*/1, /*$page*/1, /*$page_count*/10);//default page handler values
+					return $buff;
+				}else
+					return;
+		}
+
+		function queryPageLimit($queryObject, $result, $connection){
+                        $limit = $queryObject->getLimit();
+		 	// Total count
+			$temp_where = $queryObject->getWhereString(true, false);
+		 	$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '. $temp_where));
+			if ($queryObject->getGroupByString() != '') {
+				$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
+			}
+
+			$count_query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+			$result = $this->_query($count_query, $connection);
+			$count_output = $this->_fetch($result);
+			$total_count = (int)$count_output->count;
+
+			$list_count = $limit->list_count->getValue();
+			if (!$list_count) $list_count = 20;
+			$page_count = $limit->page_count->getValue();
+			if (!$page_count) $page_count = 10;
+			$page = $limit->page->getValue();
+			if (!$page) $page = 1;
+
+			// total pages
+			if ($total_count) {
+				$total_page = (int) (($total_count - 1) / $list_count) + 1;
+			}
+			else {
+				$total_page = 1;
+			}
+
+			// check the page variables
+			if ($page > $total_page) $page = $total_page;
+			$start_count = ($page - 1) * $list_count;
+
+                        $query = $this->getSelectPageSql($queryObject, true, $start_count, $list_count);
+                        $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+			$result = $this->_query ($query, $connection);
+                        if ($this->isError ())
+                            return $this->queryError($queryObject);
+
+	 		$virtual_no = $total_count - ($page - 1) * $list_count;
+	 		$data = $this->_fetch($result, $virtual_no);
+
+	 		$buff = new Object ();
+			$buff->total_count = $total_count;
+			$buff->total_page = $total_page;
+			$buff->page = $page;
+			$buff->data = $data;
+			$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+			return $buff;
+		}
+
+		function getParser(){
+                    return new DBParser('"', '"', $this->prefix);
+		}
+
+                function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {
+
+                    $select = $query->getSelectString($with_values);
+                    if($select == '') return new Object(-1, "Invalid query");
+                    $select = 'SELECT ' .$select;
+
+                    $from = $query->getFromString($with_values);
+                    if($from == '') return new Object(-1, "Invalid query");
+                    $from = ' FROM '.$from;
+
+                    $where = $query->getWhereString($with_values);
+                    if($where != '')
+                        $where = ' WHERE ' . $where;
+
+                    $groupBy = $query->getGroupByString();
+                    if($groupBy != '') $groupBy = ' GROUP BY ' . $groupBy;
+
+                    $orderBy = $query->getOrderByString();
+                    if($orderBy != '') $orderBy = ' ORDER BY ' . $orderBy;
+
+                    $limit = $query->getLimitString();
+		    if ($limit != '') $limit = sprintf (' LIMIT %d, %d', $start_count, $list_count);
+
+                    return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+                }
+}
+
+	return new DBCubrid;
+?>
diff --git a/classes/db/DBFirebird.class.php b/classes/db/DBFirebird.class.php
index e7ee592fe..8327cdcb6 100644
--- a/classes/db/DBFirebird.class.php
+++ b/classes/db/DBFirebird.class.php
@@ -1,8 +1,8 @@
 <?php
     /**
-     * @class DBFriebird
-     * @author 김현식 (dev.hyuns@gmail.com)
-     * @brief Firebird DBMS를 이용하기 위한 class
+     * @class DBFirebird
+     * @author Kim Hyun Sik (dev.hyuns @ gmail.com)
+     * @brief class to use Firebird DBMS
      * @version 0.3
      *
      * firebird handling class
@@ -11,21 +11,17 @@
     class DBFireBird extends DB {
 
         /**
-         * @brief Firebird DB에 접속하기 위한 정보
+         * @brief connection to Firebird DB
          **/
-        var $hostname = '127.0.0.1'; ///< hostname
-        var $userid   = NULL; ///< user id
-        var $password   = NULL; ///< password
-        var $database = NULL; ///< database
-        var $prefix   = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE 설치 가능)
-        var $idx_no = 0; // 인덱스 생성시 사용할 카운터
-		var $comment_syntax = '/* %s */';
+        var $prefix   = 'xe_'; // / <prefix of XE tables(One more XE can be installed on a single DB)
+        var $idx_no = 0; // counter for creating an index
+	var $comment_syntax = '/* %s */';
 
-        /**
-         * @brief firebird에서 사용될 column type
+                /**
+         * @brief column type used in firebird
          *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
+         * column_type should be replaced for each DBMS's type
+         * becasue it uses commonly defined type in the schema/query xml
          **/
         var $column_type = array(
             'bignumber' => 'BIGINT',
@@ -45,7 +41,7 @@
             $this->_setDBInfo();
             $this->_connect();
         }
-		
+
 		/**
 		 * @brief create an instance of this class
 		 */
@@ -55,7 +51,7 @@
 		}
 
         /**
-         * @brief 설치 가능 여부를 return
+         * @brief Return if installable
          **/
         function isSupported() {
             if(!function_exists('ibase_connect')) return false;
@@ -63,48 +59,28 @@
         }
 
         /**
-         * @brief DB정보 설정 및 connect/ close
+         * @brief DB Connection
          **/
-        function _setDBInfo() {
-            $db_info = Context::getDBInfo();
-            $this->hostname = $db_info->db_hostname;
-            $this->port = $db_info->db_port;
-            $this->userid   = $db_info->db_userid;
-            $this->password   = $db_info->db_password;
-            $this->database = $db_info->db_database;
-            $this->prefix = $db_info->db_table_prefix;
-            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
-        }
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // db 정보가 없으면 무시
-            if(!$this->hostname || !$this->port || !$this->userid || !$this->password || !$this->database) return;
-
+        function __connect($connection) {
             //if(strpos($this->hostname, ':')===false && $this->port) $this->hostname .= ':'.$this->port;
+            // attempts to connect
+            $host = $connection["db_hostname"]."/".$connection["db_port"].":".$connection["db_database"];
 
-            // 접속시도
-
-            $host = $this->hostname."/".$this->port.":".$this->database;
-
-            $this->fd = @ibase_connect($host, $this->userid, $this->password);
+            $result = ibase_connect($host, $connection["db_userid"], $connection["db_password"]);
             if(ibase_errmsg()) {
                 $this->setError(ibase_errcode(), ibase_errmsg());
-                return $this->is_connected = false;
+                return;
             }
-
-            // Firebird 버전 확인후 2.0 이하면 오류 표시
-            if (($service = ibase_service_attach($this->hostname, $this->userid, $this->password)) != FALSE) {
+            // Error when Firebird version is lower than 2.0
+            if (($service = ibase_service_attach($connection["db_hostname"], $connection["db_userid"], $connection["db_password"])) != FALSE) {
                 // get server version and implementation strings
                 $server_info  = ibase_server_info($service, IBASE_SVC_SERVER_VERSION);
                 ibase_service_detach($service);
             }
             else {
                 $this->setError(ibase_errcode(), ibase_errmsg());
-                @ibase_close($this->fd);
-                return $this->is_connected = false;
+                ibase_close($result);
+                return;
             }
 
             $pos = strpos($server_info, "Firebird");
@@ -115,36 +91,31 @@
 
             if($ver < "2.0") {
                 $this->setError(-1, "XE cannot be installed under the version of firebird 2.0. Current firebird version is ".$ver);
-                @ibase_close($this->fd);
-                return $this->is_connected = false;
+                ibase_close($result);
+                return;
             }
-
-            // 접속체크
-            $this->is_connected = true;
-			$this->password = md5($this->password);
+            return $result;
         }
 
         /**
-         * @brief DB접속 해제
+         * @brief DB disconnect
          **/
-        function close() {
-            if(!$this->isConnected()) return;
-            @ibase_commit($this->fd);
-            @ibase_close($this->fd);
-            $this->transaction_started = false;
+        function _close($connection) {
+            ibase_commit($connection);
+            ibase_close($connection);
         }
 
         /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
+         * @brief handles quatation of the string variables from the query
          **/
         function addQuotes($string) {
-//            if(get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-//            if(!is_numeric($string)) $string = str_replace("'","''", $string);
+            if(get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            if(!is_numeric($string)) $string = str_replace("'","''", $string);
             return $string;
         }
 
         /**
-        * @brief 쿼리에서 입력되는 table, column 명에 더블쿼터를 넣어줌
+        * @brief put double quotes for tabls, column names in the query statement
         **/
         function addDoubleQuotes($string) {
             if($string == "*") return $string;
@@ -162,12 +133,11 @@
         }
 
         /**
-         * @brief 쿼리에서 입력되는 table, column 명에 더블쿼터를 넣어줌
+         * @brief put double quotes for tabls, column names in the query statement
          **/
         function autoQuotes($string){
             $string = strtolower($string);
-
-            // substr 함수 일경우
+            // for substr function
             if(strpos($string, "substr(") !== false) {
                 $tokken = strtok($string, "(,)");
                 $tokken = strtok("(,)");
@@ -190,8 +160,7 @@
                 $as = trim($as);
                 $as = $this->addDoubleQuotes($as);
             }
-
-            // 함수 사용시
+            // for functions
             $tmpFunc1 = null;
             $tmpFunc2 = null;
             if(($no1 = strpos($string,'('))!==false && ($no2 = strpos($string, ')'))!==false) {
@@ -199,8 +168,7 @@
                 $tmpFunc2 = substr($string, $no2, strlen($string)-$no2+1);
                 $string = trim(substr($string, $no1+1, $no2-$no1-1));
             }
-
-            // (테이블.컬럼) 구조 일때 처리
+            // for (table.column) structure
             preg_match("/((?i)[a-z0-9_-]+)[.]((?i)[a-z0-9_\-\*]+)/", $string, $matches);
 
             if($matches) {
@@ -225,7 +193,7 @@
             }
 
             foreach($values as $val1) {
-                // (테이블.컬럼) 구조 일때 처리
+                // for (table.column) structure
                 preg_match("/((?i)[a-z0-9_-]+)[.]((?i)[a-z0-9_\-\*]+)/", $val1, $matches);
                 if($matches) {
                     $isTable = false;
@@ -257,87 +225,111 @@
         }
 
         /**
-         * @brief 트랜잭션 시작
+         * @brief Begin transaction
          **/
-        function begin() {
-            if(!$this->isConnected() || $this->transaction_started) return;
-            $this->transaction_started = true;
+        function _begin() {
+            return true;
         }
 
         /**
-         * @brief 롤백
+         * @brief Rollback
          **/
-        function rollback() {
-            if(!$this->isConnected() || !$this->transaction_started) return;
-            @ibase_rollback($this->fd);
-            $this->transaction_started = false;
+        function _rollback() {
+            $connection = $this->_getConnection('master');
+            ibase_rollback($connection);
+            return true;
         }
 
         /**
-         * @brief 커밋
+         * @brief Commits
          **/
-        function commit() {
-            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
-            @ibase_commit($this->fd);
-            $this->transaction_started = false;
+        function _commit() {
+            $connection = $this->_getConnection('master');
+            ibase_commit($connection);
+            return true;
         }
 
         /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
+         * @brief : Run a query and fetch the result
          *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
+         * query: run a query and return the result\n
+         * fetch: NULL if no value returned \n
+         *        array object if rows returned \n
+         *        object if a row returned \n
+         *        return\n
          **/
-        function _query($query, $params=null) {
-            if(!$this->isConnected()) return;
-
+        function __query($query, $connection, $params = null) {
             if(count($params) == 0) {
-                // 쿼리 시작을 알림
-                $this->actStart($query);
-
-                // 쿼리 문 실행
-                 $result = ibase_query($this->fd, $query);
+                // Execute the query statement
+                $result = ibase_query($connection, $query);
             }
             else {
-                // 쿼리 시작을 알림
-                $log = $query."\n\t\t\t";
-                $log .= implode(",", $params);
-                $this->actStart($log);
-
-                // 쿼리 문 실행 (blob type 입력하기 위한 방법)
-                $query = ibase_prepare($this->fd, $query);
-                $fnarr = array_merge(array($query), $params);
-                $result = call_user_func_array("ibase_execute", $fnarr);
+                // Execute the query(for blob type)
+                $query = ibase_prepare($connection, $query);
+                //$fnarr = array_merge(array($query), $params);
+                $result = ibase_execute($query);
             }
-
-            // 오류 체크
+            // Error Check
             if(ibase_errmsg()) $this->setError(ibase_errcode(), ibase_errmsg());
 
-            // 쿼리 실행 종료를 알림
-            $this->actFinish();
-
-            // 결과 리턴
             return $result;
         }
 
+        function _queryInsertUpdateDeleteSelect($query, $params=null, $connection) {
+            if(!$connection) return;
+
+            if(count($params) == 0) {
+                // Notify to start a query execution
+                $this->actStart($query);
+                // Execute the query statement
+                $trans = ibase_trans(IBASE_DEFAULT,$connection);
+                $result = ibase_query($trans, $query);
+                ibase_commit($trans);
+                unset($trans);
+            }
+            else {
+                // Notify to start a query execution
+                $log = $query."\n\t\t\t";
+                $log .= implode(",", $params);
+                $this->actStart($log);
+                // Execute the query(for blob type)
+                $query = ibase_prepare($connection, $query);
+                //$fnarr = array_merge(array($query), $params);
+                $result = ibase_execute($query);
+            }
+            // Error Check
+            if(ibase_errmsg()) $this->setError(ibase_errcode(), ibase_errmsg());
+            // Notify to complete a query execution
+            $this->actFinish();
+            // Return the result
+            return $result;
+        }
+
+        function getTableInfo($result){
+            $coln = ibase_num_fields($result);
+            $column_type = array();
+            for ($i = 0; $i < $coln; $i++) {
+                $col_info = ibase_field_info($result, $i);
+                if($col_info['name'] === "")    $column_type[$col_info['alias']] = $col_info['type'];
+                else    $column_type[$col_info['name']] = $col_info['type'];
+            }
+            return $column_type;
+        }
         /**
-         * @brief 결과를 fetch
+         * @brief Fetch the result
          **/
         function _fetch($result, $output = null) {
             if(!$this->isConnected() || $this->isError() || !$result) return;
+            $output->column_type = $this->getTableInfo($result);
 
             while($tmp = ibase_fetch_object($result)) {
                 foreach($tmp as $key => $val) {
                     $type = $output->column_type[$key];
-
-                    // type 값이 null 일때는 $key값이 alias인 경우라 실제 column 이름을 찾아 type을 구함
+                    // type value is null when $key is an alias. so get a type by finding actual coloumn name
                     if($type == null && $output->columns && count($output->columns)) {
                         foreach($output->columns as $cols) {
                             if($cols['alias'] == $key) {
-                                // table.column 형식인지 정규식으로 검사 함
+                                // checks if the format is table.column or a regular expression
                                 preg_match("/\w+[.](\w+)/", $cols['name'], $matches);
                                 if($matches) {
                                     $type = $output->column_type[$matches[1]];
@@ -349,14 +341,26 @@
                         }
                     }
 
-                    if(($type == "text" || $type == "bigtext") && $tmp->{$key}) {
+                    if(($type == "text" || $type == "bigtext" || $type == "BLOB") && $tmp->{$key}) {
                         $blob_data = ibase_blob_info($tmp->{$key});
                         $blob_hndl = ibase_blob_open($tmp->{$key});
-                        $tmp->{$key} = ibase_blob_get($blob_hndl, $blob_data[0]);
-                        ibase_blob_close($blob_hndl);
+
+			if($blob_data[1] === 1) {
+				$tmp->{$key} = ibase_blob_get($blob_hndl, $blob_data[0]);
+			} else {
+			    for ($i = 0; $i < $blob_data[1]; $i++) {
+				$readsize = $blob_data[2];
+				if ($i == ($blob_data[1] - 1)) {
+					$readsize = $blob_data[0] - (($blob_data[1] - 1) * $blob_data[2]);
+				    }
+				    $totalimage .= ibase_blob_get($blob_hndl, $readsize);
+				}
+			    }
+
+			ibase_blob_close($blob_hndl);
                     }
-                    else if($type == "char") {
-                        $tmp->{$key} = trim($tmp->{$key});	// DB의 character set이 UTF8일때 생기는 빈칸을 제거
+                    else if($type == "CHAR") {
+                        $tmp->{$key} = trim($tmp->{$key});	// remove blanks generated when DB character set is UTF8
                     }
                 }
 
@@ -368,31 +372,33 @@
         }
 
         /**
-         * @brief 1씩 증가되는 sequence값을 return (firebird의 generator 값을 증가)
+         * @brief return sequence value incremented by 1(increase the value of the generator in firebird)
          **/
         function getNextSequence() {
-            $gen = "GEN_".$this->prefix."sequence_ID";
+            //$gen = "GEN_".$this->prefix."sequence_ID";
+	    $gen = 'GEN_XE_SEQUENCE_ID';
             $sequence = ibase_gen_id($gen, 1);
             return $sequence;
         }
 
         /**
-         * @brief 테이블 기생성 여부 return
+         * @brief returns if the table already exists
          **/
         function isTableExists($target_name) {
             $query = sprintf("select rdb\$relation_name from rdb\$relations where rdb\$system_flag=0 and rdb\$relation_name = '%s%s';", $this->prefix, $target_name);
             $result = $this->_query($query);
             $tmp = $this->_fetch($result);
+            $connection = $this->_getConnection('master');
             if(!$tmp) {
-                if(!$this->transaction_started) @ibase_rollback($this->fd);
+                if(!$this->transaction_started) ibase_rollback($connection);
                 return false;
             }
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            if(!$this->transaction_started) ibase_commit($connection);
             return true;
         }
 
         /**
-         * @brief 특정 테이블에 특정 column 추가
+         * @brief add a column to the table
          **/
         function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
             $type = $this->column_type[$type];
@@ -408,32 +414,42 @@
             if($notnull) $query .= " NOT NULL ";
 
             $this->_query($query);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+
+            if(!$this->transaction_started) {
+                $connection = $this->_getConnection('master');
+                ibase_commit($connection);
+            }
         }
 
         /**
-         * @brief 특정 테이블에 특정 column 제거
+         * @brief drop a column from the table
          **/
         function dropColumn($table_name, $column_name) {
             $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
             $this->_query($query);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            if(!$this->transaction_started) {
+                $connection = $this->_getConnection('master');
+                ibase_commit($connection);
+            }
+
         }
 
 
         /**
-         * @brief 특정 테이블의 column의 정보를 return
+         * @brief return column information of the table
          **/
         function isColumnExists($table_name, $column_name) {
             $query = sprintf("SELECT RDB\$FIELD_NAME as \"FIELD\" FROM RDB\$RELATION_FIELDS WHERE RDB\$RELATION_NAME = '%s%s'", $this->prefix, $table_name);
             $result = $this->_query($query);
+            $connection = $this->_getConnection('master');
+
             if($this->isError()) {
-                if(!$this->transaction_started) @ibase_rollback($this->fd);
+                if(!$this->transaction_started) ibase_rollback($connection);
                 return false;
             }
 
             $output = $this->_fetch($result);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            if(!$this->transaction_started) ibase_commit($connection);
 
             if($output) {
                 $column_name = strtolower($column_name);
@@ -446,36 +462,37 @@
         }
 
         /**
-         * @brief 특정 테이블에 특정 인덱스 추가
+         * @brief add an index to the table
          * $target_columns = array(col1, col2)
          * $is_unique? unique : none
          **/
         function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
-            // index name 크기가 31byte로 제한으로 index name을 넣지 않음
-            // Firebird에서는 index name을 넣지 않으면 "RDB$10"처럼 자동으로 이름을 부여함
-            // table을 삭제 할 경우 인덱스도 자동으로 삭제 됨
-
+            // index name size should be limited to 31 byte. no index name assigned
+            // if index name omitted, Firebird automatically assign its name like "RDB $10"
+            // deletes indexes when deleting the table
             if(!is_array($target_columns)) $target_columns = array($target_columns);
 
             $query = sprintf('CREATE %s INDEX "" ON "%s%s" ("%s");', $is_unique?'UNIQUE':'', $this->prefix, $table_name, implode('", "',$target_columns));
             $this->_query($query);
 
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            $connection = $this->_getConnection('master');
+            if(!$this->transaction_started) ibase_commit($connection);
         }
 
         /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
+         * @brief drop an index from the table
          **/
         function dropIndex($table_name, $index_name, $is_unique = false) {
             $query = sprintf('DROP INDEX "%s" ON "%s%s"', $index_name, $this->prefix, $table_name);
             $this->_query($query);
 
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            $connection = $this->_getConnection('master');
+            if(!$this->transaction_started) ibase_commit($connection);
         }
 
 
         /**
-         * @brief 특정 테이블의 index 정보를 return
+         * @brief return index information of the table
          **/
         function isIndexExists($table_name, $index_name) {
             $query = "SELECT\n";
@@ -497,11 +514,15 @@
             $output = $this->_fetch($result);
 
             if(!$output) {
-                if(!$this->transaction_started) @ibase_rollback($this->fd);
+                $connection = $this->_getConnection('master');
+                if(!$this->transaction_started) ibase_rollback($connection);
                 return false;
             }
 
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            if(!$this->transaction_started) {
+                $connection = $this->_getConnection('master');
+                ibase_commit($connection);
+            }
 
             if(!is_array($output)) $output = array($output);
             for($i=0;$i<count($output);$i++) {
@@ -512,24 +533,24 @@
         }
 
         /**
-         * @brief xml 을 받아서 테이블을 생성
+         * @brief creates a table by using xml file
          **/
         function createTableByXml($xml_doc) {
             return $this->_createTable($xml_doc);
         }
 
         /**
-         * @brief xml 을 받아서 테이블을 생성
+         * @brief creates a table by using xml file
          **/
         function createTableByXmlFile($file_name) {
             if(!file_exists($file_name)) return;
-            // xml 파일을 읽음
+            // read xml file
             $buff = FileHandler::readFile($file_name);
             return $this->_createTable($buff);
         }
 
         /**
-         * @brief schema xml을 이용하여 create table query생성
+         * @brief create table by using the schema xml
          *
          * type : number, varchar, text, char, date, \n
          * opt : notnull, default, size\n
@@ -539,8 +560,7 @@
             // xml parsing
             $oXml = new XmlParser();
             $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
+            // Create a table schema
             $table_name = $xml_obj->table->attrs->name;
             if($this->isTableExists($table_name)) return;
             $table_name = $this->prefix.$table_name;
@@ -591,34 +611,48 @@
             $schema = sprintf("CREATE TABLE \"%s\" (%s%s); \n", $table_name, "\n", implode($column_schema, ",\n"));
 
             $output = $this->_query($schema);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            if(!$this->transaction_started) {
+                $connection = $this->_getConnection('master');
+                ibase_commit($connection);
+            }
             if(!$output) return false;
 
             if(count($index_list)) {
                 foreach($index_list as $key => $val) {
-                    // index name 크기가 31byte로 제한으로 index name을 넣지 않음
-                    // Firebird에서는 index name을 넣지 않으면 "RDB$10"처럼 자동으로 이름을 부여함
-                    // table을 삭제 할 경우 인덱스도 자동으로 삭제 됨
-
+                    // index name size should be limited to 31 byte. no index name assigned
+                    // if index name omitted, Firebird automatically assign its name like "RDB $10"
+                    // deletes indexes when deleting the table
                     $schema = sprintf("CREATE INDEX \"\" ON \"%s\" (\"%s\");",
                             $table_name, implode($val, "\",\""));
                     $output = $this->_query($schema);
-                    if(!$this->transaction_started) @ibase_commit($this->fd);
+                    if(!$this->transaction_started) {
+                        $connection = $this->_getConnection('master');
+                        ibase_commit($connection);
+                    }
                     if(!$output) return false;
                 }
             }
 
+	    if($_GLOBALS['XE_EXISTS_SEQUENCE']) return;
+                $schema = 'CREATE GENERATOR GEN_XE_SEQUENCE_ID;';
+                $output = $this->_query($schema);
+                if(!$this->transaction_started) {
+                    $connection = $this->_getConnection('master');
+                    ibase_commit($connection);
+                }
+                if(!$output) return false;
+		$_GLOBALS['XE_EXISTS_SEQUENCE'] = true;
+            /*if($auto_increment_list)
             foreach($auto_increment_list as $increment) {
                 $schema = sprintf('CREATE GENERATOR GEN_%s_ID;', $table_name);
                 $output = $this->_query($schema);
-                if(!$this->transaction_started) @ibase_commit($this->fd);
-                if(!$output) return false;
-
-                // Firebird에서 auto increment는 generator를 만들어 insert 발생시 트리거를 실행시켜
-                // generator의 값을 증가시키고 그값을 테이블에 넣어주는 방식을 사용함.
-                // 아래 트리거가 auto increment 역할을 하지만 쿼리로 트리거 등록이 되지 않아 주석처리 하였음.
-                // php 함수에서 generator 값을 증가시켜 주는 함수가 있어 XE에서는 굳이
-                // auto increment를 사용 할 필요가 없어보임.
+                if(!$this->transaction_started) ibase_commit($this->fd);
+                if(!$output) return false;*/
+                // auto_increment in Firebird creates a generator which activates a trigger when insert occurs
+                // the generator increases the value of the generator and then insert to the table
+                // The trigger below acts like auto_increment however I commented the below because the trigger cannot be defined by a query statement
+                // php api has a function to increase a generator, so
+                // no need to use auto increment in XE
                 /*
                 $schema = 'SET TERM ^ ; ';
                 $schema .= sprintf('CREATE TRIGGER "%s_BI" FOR "%s" ', $table_name, $table_name);
@@ -630,442 +664,196 @@
                 $output = $this->_query($schema);
                 if(!$output) return false;
                 */
-            }
+            //}
         }
 
+
         /**
-         * @brief 조건문 작성하여 return
+         * @brief Handle the insertAct
          **/
-        function getCondition($output) {
-            if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type,$output->_tables);
-            if($condition) $condition = ' where '.$condition;
-            return $condition;
-        }
-
-        function getLeftCondition($conditions,$column_type,$tables){
-            return $this->_getCondition($conditions,$column_type,$tables);
-        }
-
-
-        function _getCondition($conditions,$column_type,$tables) {
-            $condition = '';
-            foreach($conditions as $val) {
-                $sub_condition = '';
-                foreach($val['condition'] as $v) {
-                    if(!isset($v['value'])) continue;
-                    if($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double'))) continue;
-
-                    $name = $v['column'];
-                    $operation = $v['operation'];
-                    $value = $v['value'];
-                    $type = $this->getColumnType($column_type,$name);
-                    $pipe = $v['pipe'];
-
-                    $value = $this->getConditionValue('"'.$name.'"', $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-
-                    $name = $this->autoQuotes($name);
-                    $value = $this->autoValueQuotes($value, $tables);
-
-                    $str = $this->getConditionPart($name, $value, $operation);
-                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .=  $str;
-                }
-                if($sub_condition) {
-                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
-                    $condition .= '('.$sub_condition.')';
-                }
-            }
-
-            return $condition;
+        function _executeInsertAct($queryObject) {
+            $query = $this->getInsertSql($queryObject);
+            if(is_a($query, 'Object')) return;
+            return $this->_queryInsertUpdateDeleteSelect($query);
         }
 
         /**
-         * @brief insertAct 처리
+         * @brief handles updateAct
          **/
-        function _executeInsertAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '"'.$this->prefix.$val.'"';
-            }
-
-            // 컬럼 정리
-            foreach($output->columns as $key => $val) {
-                $name = $val['name'];
-                $value = $val['value'];
-
-                $value = str_replace("'", "`", $value);
-
-                if($output->column_type[$name]=="text" || $output->column_type[$name]=="bigtext"){
-                    if(!isset($val['value'])) continue;
-                    $blh = ibase_blob_create($this->fd);
-                    ibase_blob_add($blh, $value);
-                    $value = ibase_blob_close($blh);
-                }
-                else if($output->column_type[$name]!='number') {
-//                    if(!$value) $value = 'null';
-                }
-                else $this->_filterNumber(&$value);
-
-                $column_list[] = '"'.$name.'"';
-                $value_list[] = $value;
-                $questions[] = "?";
-            }
-
-            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $questions));
-
-            $result = $this->_query($query, $value_list);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
-            return $result;
+        function _executeUpdateAct($queryObject) {
+ 			$query = $this->getUpdateSql($queryObject);
+            if(is_a($query, 'Object')) return;
+            return $this->_queryInsertUpdateDeleteSelect($query);
         }
 
         /**
-         * @brief updateAct 처리
+         * @brief handles deleteAct
          **/
-        function _executeUpdateAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '"'.$this->prefix.$val.'"';
-            }
-
-            // 컬럼 정리
-            foreach($output->columns as $key => $val) {
-                if(!isset($val['value'])) continue;
-                $name = $val['name'];
-                $value = $val['value'];
-
-                $value = str_replace("'", "`", $value);
-
-                if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
-                else {
-                    if($output->column_type[$name]=="text" || $output->column_type[$name]=="bigtext"){
-                        $blh = ibase_blob_create($this->fd);
-                        ibase_blob_add($blh, $value);
-                        $value = ibase_blob_close($blh);
-                    }
-                    else if($output->column_type[$name]=='number' ||
-                            $output->column_type[$name]=='bignumber' ||
-                            $output->column_type[$name]=='float') {
-                        // 연산식이 들어갔을 경우 컬럼명이 있는 지 체크해 더블쿼터를 넣어줌
-                        preg_match("/(?i)[a-z][a-z0-9_]+/", $value, $matches);
-
-                        foreach($matches as $key => $val) {
-                            $value = str_replace($val, "\"".$val."\"", $value);
-                        }
-
-                        if($matches != null) {
-                            $column_list[] = sprintf("\"%s\" = %s", $name, $value);
-                            continue;
-                        }
-                    }
-
-                    $values[] = $value;
-                    $column_list[] = sprintf('"%s" = ?', $name);
-                }
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("update %s set %s %s;", implode(',',$table_list), implode(',',$column_list), $condition);
-            $result = $this->_query($query, $values);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
-            return $result;
+        function _executeDeleteAct($queryObject) {
+  			$query = $this->getDeleteSql($queryObject);
+        	if(is_a($query, 'Object')) return;
+            return $this->_queryInsertUpdateDeleteSelect($query);
         }
 
         /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '"'.$this->prefix.$val.'"';
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("delete from %s %s;", implode(',',$table_list), $condition);
-
-            $result = $this->_query($query);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
-            return $result;
-        }
-
-        /**
-         * @brief selectAct 처리
+         * @brief Handle selectAct
          *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
+         * In order to get a list of pages easily when selecting \n
+         * it supports a method as navigation
          **/
-        function _executeSelectAct($output) {
-            // 테이블 정리
-            $table_list = array();
-            foreach($output->tables as $key => $val) {
-                $table_list[] = sprintf("\"%s%s\" as \"%s\"", $this->prefix, $val, $key);
-            }
-
-            $left_join = array();
-            // why???
-            $left_tables= (array)$output->left_tables;
-
-            foreach($left_tables as $key => $val) {
-                $condition = $this->getLeftCondition($output->left_conditions[$key],$output->column_type,$output->_tables);
-                if($condition){
-                    $left_join[] = $val . ' "'.$this->prefix.$output->_tables[$key].'" as "'.$key.'" on (' . $condition . ')';
-                }
-            }
-
-            $click_count = array();
-            if(!$output->columns){
-				$output->columns = array(array('name'=>'*'));
+        function _executeSelectAct($queryObject, $connection) {
+   			$query = $this->getSelectSql($queryObject);
+                        if(strpos($query, "substr")) {
+			    $query = str_replace ("substr", "substring", $query);
+			    $query = $this->replaceSubstrFormat($query);
 			}
+			if(is_a($query, 'Object')) return;
+			$query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
+			$result = $this->_queryInsertUpdateDeleteSelect ($query, null, $connection);
 
-			$column_list = array();
-			foreach($output->columns as $key => $val) {
-				$name = $val['name'];
-				$alias = $val['alias'];
-				if($val['click_count']) $click_count[] = $val['name'];
-
-				if($alias == "")
-					$column_list[] = $this->autoQuotes($name);
-				else
-					$column_list[$alias] = sprintf("%s as \"%s\"", $this->autoQuotes($name), $alias);
-			}
-			$columns = implode(',',$column_list);
-
-            $condition = $this->getCondition($output);
-
-			$output->column_list = $column_list;
-            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and "%s" < 2100000000 ', $col);
-                        else $condition = sprintf(' where "%s" < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            // list_count를 사용할 경우 적용
-            if($output->list_count['value']) $limit = sprintf('FIRST %d', $output->list_count['value']);
-            else $limit = '';
-
-
-            if($output->groups) {
-                foreach($output->groups as $key => $val) {
-                    $group_list[] = $this->autoQuotes($val);
-					if($column_list[$val]) $output->arg_columns[] = $column_list[$val];
-                }
-                if(count($group_list)) $groupby_query = sprintf(" group by %s", implode(",",$group_list));
-            }
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf("%s %s", $this->autoQuotes($val[0]), $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query = sprintf(" order by %s", implode(",",$index_list));
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = array();
-				foreach($output->arg_columns as $col){
-					if(strpos($col,'"')===false && strpos($col,' ')==false) $columns[] = '"'.$col.'"'; 
-					else $columns[] = $col;
-				}
-				
-				$columns = join(',',$columns);
-			}
-
-            $query = sprintf("select %s from %s %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-            $query .= ";";
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-            $result = $this->_query($query);
-            if($this->isError()) {
-                if(!$this->transaction_started) @ibase_rollback($this->fd);
-                return;
-            }
-
-            $data = $this->_fetch($result, $output);
-            if(!$this->transaction_started) @ibase_commit($this->fd);
-
-            if(count($click_count)>0 && count($output->conditions)>0){
-                $_query = '';
-                foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
-                $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
-                $this->_query($_query);
-            }
-
-            $buff = new Object();
-            $buff->data = $data;
-            return $buff;
+			if ($this->isError ()) return $this->queryError($queryObject);
+			else return $this->queryPageLimit($queryObject, $result, $connection);
         }
 
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-        function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
-            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
-
-			$column_list = $output->column_list;
-
-            $query_groupby = '';
-            if ($output->groups) {
-                foreach ($output->groups as $key => $val){
-                    $group_list[] = $this->autoQuotes($val);
-					if($column_list[$val]) $output->arg_columns[] = $column_list[$val];
-				}
-                if (count($group_list)) $query_groupby = sprintf(" GROUP BY %s", implode(", ", $group_list));
-            }
-
-            /*
-            // group by 절이 포함된 SELECT 쿼리의 전체 갯수를 구하기 위한 수정
-            // 정상적인 동작이 확인되면 주석으로 막아둔 부분으로 대체합니다.
-            //
-            $count_condition = strlen($query_groupby) ? sprintf('%s group by %s', $condition, $query_groupby) : $condition;
-            $total_count = $this->getCountCache($output->tables, $count_condition);
-            if($total_count === false) {
-                $count_query = sprintf('select count(*) as "count" from %s %s %s', implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-                if (count($output->groups))
-                    $count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
-                $result = $this->_query($count_query);
-                $count_output = $this->_fetch($result);
-                $total_count = (int)$count_output->count;
-                $this->putCountCache($output->tables, $count_condition, $total_count);
-            }
-            */
-
-            // 전체 개수를 구함
-            $count_query = sprintf("select count(*) as \"count\" from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
-			$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
-			$result = $this->_query($count_query);
-			$count_output = $this->_fetch($result);
-			if(!$this->transaction_started) @ibase_commit($this->fd);
-
-			$total_count = (int)$count_output->count;
-
-            $list_count = $output->list_count['value'];
-            if(!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if(!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if(!$page) $page = 1;
-
-            // 전체 페이지를 구함
-            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
-            else $total_page = 1;
-
-            // 페이지 변수를 체크
-            if($page > $total_page) $page = $total_page;
-            $start_count = ($page-1)*$list_count;
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and "%s" < 2100000000 ', $col);
-                        else $condition = sprintf(' where "%s" < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            $limit = sprintf('FIRST %d SKIP %d ', $list_count, $start_count);
-
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf("%s %s", $this->autoQuotes($val[0]), $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query = sprintf(" ORDER BY %s", implode(",",$index_list));
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = array();
-				foreach($output->arg_columns as $col){
-					if(strpos($col,'"')===false && strpos($col,' ')==false) $columns[] = '"'.$col.'"'; 
-					else $columns[] = $col;
-				}
-				
-				$columns = join(',',$columns);
-			}
-
-            $query = sprintf('SELECT %s %s FROM %s %s %s, %s', $limit, $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-            $query .= ";";
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-            $result = $this->_query($query);
-            if($this->isError()) {
-                if(!$this->transaction_started) @ibase_rollback($this->fd);
-
-                $buff = new Object();
+    	function queryError($queryObject) {
+            $limit = $queryObject->getLimit();
+            if ($limit  && $limit->isPageHandler()) {
+                $buff = new Object ();
                 $buff->total_count = 0;
                 $buff->total_page = 0;
                 $buff->page = 1;
                 $buff->data = array();
+                $buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
+            }else
+                return;
+        }
 
-                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-                return $buff;
+    function queryPageLimit($queryObject, $result, $connection) {
+        $limit = $queryObject->getLimit();
+        if ($limit && $limit->isPageHandler()) {
+            // Total count
+	    $temp_where = $queryObject->getWhereString(true, false);
+            $count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+            if ($queryObject->getGroupByString() != '') {
+                $count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
             }
 
-            $virtual_no = $total_count - ($page-1)*$list_count;
-            while($tmp = ibase_fetch_object($result)) {
-                foreach($tmp as $key => $val){
-                    $type = $output->column_type[$key];
+            $count_query .= ( __DEBUG_QUERY__ & 1 && $output->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+            $result_count = $this->_query($count_query, null, $connection);
+            $count_output = $this->_fetch($result_count);
+            $total_count = (int) $count_output->count;
 
-                    // type 값이 null 일때는 $key값이 alias인 경우라 실제 column 이름을 찾아 type을 구함
-                    if($type == null && $output->columns && count($output->columns)) {
-                        foreach($output->columns as $cols) {
-                            if($cols['alias'] == $key) {
-                                // table.column 형식인지 정규식으로 검사 함
-                                preg_match("/\w+[.](\w+)/", $cols['name'], $matches);
-                                if($matches) {
-                                    $type = $output->column_type[$matches[1]];
-                                }
-                                else {
-                                    $type = $output->column_type[$cols['name']];
-                                }
-                            }
-                        }
-                    }
+            $list_count = $limit->list_count->getValue();
+            if (!$list_count) $list_count = 20;
+            $page_count = $limit->page_count->getValue();
+            if (!$page_count) $page_count = 10;
+            $page = $limit->page->getValue();
+            if (!$page) $page = 1;
+            // Total pages
+            if ($total_count)   $total_page = (int) (($total_count - 1) / $list_count) + 1;
+            else    $total_page = 1;
 
-                    if(($type == "text" || $type == "bigtext") && $tmp->{$key}) {
-                        $blob_data = ibase_blob_info($tmp->{$key});
-                        $blob_hndl = ibase_blob_open($tmp->{$key});
-                        $tmp->{$key} = ibase_blob_get($blob_hndl, $blob_data[0]);
-                        ibase_blob_close($blob_hndl);
-                    }
-                }
+            if($page > $total_page) $page = $total_page;
+            $start_count = ($page-1)*$list_count;
 
+            $query = $this->getSelectSql($queryObject, true, $start_count);
+	    if(strpos($query, "substr")) {
+			    $query = str_replace ("substr", "substring", $query);
+			    $query = $this->replaceSubstrFormat($query);
+	    }
+            $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+            $result = $this->_query ($query, null, $connection);
+            if ($this->isError ())
+                return $this->queryError($queryObject);
+
+            $virtual_no = $total_count - ($page - 1) * $list_count;
+            while ($tmp = ibase_fetch_object($result))
                 $data[$virtual_no--] = $tmp;
-            }
 
-            if(!$this->transaction_started) @ibase_commit($this->fd);
+            if (!$this->transaction_started)
+                ibase_commit($connection);
 
-            $buff = new Object();
+            $buff = new Object ();
             $buff->total_count = $total_count;
             $buff->total_page = $total_page;
             $buff->page = $page;
             $buff->data = $data;
-
             $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-            return $buff;
+        }else {
+            $data = $this->_fetch($result);
+            $buff = new Object ();
+            $buff->data = $data;
         }
+        return $buff;
     }
 
+    function getParser() {
+        return new DBParser('"', '"', $this->prefix);
+    }
+
+    function getSelectSql($query, $with_values = true, $start_count = 0) {
+        $limit = $query->getLimit();
+        if ($limit && $limit->isPageHandler()) {
+            $list_count = $limit->list_count->getValue();
+            if(!$limit->page) $page = 1;
+            else $page = $limit->page->getValue();
+            if(!$start_count)
+                $start_count = ($page - 1) * $list_count;
+            $limit = sprintf('SELECT FIRST %d SKIP %d ', $list_count, $start_count);
+        }
+
+        $select = $query->getSelectString($with_values);
+
+        if ($select == '')
+            return new Object(-1, "Invalid query");
+
+        if ($limit && $limit->isPageHandler())
+            $select = $limit . ' ' . $select;
+        else
+            $select = 'SELECT ' . $select;
+        $from = $query->getFromString($with_values);
+        if ($from == '')
+            return new Object(-1, "Invalid query");
+        $from = ' FROM ' . $from;
+
+        $where = $query->getWhereString($with_values);
+        if ($where != '')
+            $where = ' WHERE ' . $where;
+
+        $groupBy = $query->getGroupByString();
+        if ($groupBy != '')
+            $groupBy = ' GROUP BY ' . $groupBy;
+
+        $orderBy = $query->getOrderByString();
+        if ($orderBy != '')
+            $orderBy = ' ORDER BY ' . $orderBy;
+
+        return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy;
+    }
+
+    function getDeleteSql($query, $with_values = true){
+	$sql = 'DELETE ';
+
+	$from = $query->getFromString($with_values);
+	if($from == '') return new Object(-1, "Invalid query");
+
+	$sql .= ' FROM '.$from;
+
+	$where = $query->getWhereString($with_values);
+	if($where != '') $sql .= ' WHERE ' . $where;
+
+	return $sql;
+    }
+
+    function replaceSubstrFormat($queryString){
+	//replacing substr("string",number,number) with substr("string" from number for number)
+	$pattern = '/substring\("(\w+)",(\d+),(\d+)\)/i';
+	$replacement = 'substring("${1}" from $2 for $3)';
+
+	return  preg_replace($pattern, $replacement, $queryString);
+    }
+
+}
+
 return new DBFireBird;
 ?>
diff --git a/classes/db/DBMssql.class.php b/classes/db/DBMssql.class.php
index 0d5055759..a9579edd5 100644
--- a/classes/db/DBMssql.class.php
+++ b/classes/db/DBMssql.class.php
@@ -1,909 +1,546 @@
-<?php
-
-    /**
-     * @class DBMSSQL
-     * @author NHN (developers@xpressengine.com)
-     * @brief MSSQL driver로 수정 sol (sol@ngleader.com)
-     * @version 0.1
-     **/
-
-    class DBMssql extends DB {
-
-        /**
-         * DB를 이용하기 위한 정보
-         **/
-		var $conn		= NULL;
-        var $database	= NULL; ///< database
-        var $prefix		= 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE 설치 가능)
-		var $param		= array();
-		var $comment_syntax = '/* %s */';
-        
-        /**
-         * @brief mssql 에서 사용될 column type
-         *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
-         **/
-        var $column_type = array(
-            'bignumber' => 'bigint',
-            'number' => 'int',
-            'varchar' => 'varchar',
-            'char' => 'char',
-            'text' => 'text',
-            'bigtext' => 'text',
-            'date' => 'varchar(14)',
-            'float' => 'float',
-        );
-
-        /**
-         * @brief constructor
-         **/
-        function DBMssql() {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-		
-		/**
-		 * @brief create an instance of this class
-		 */
-		function create()
-		{
-			return new DBMssql;
-		}
-
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported() {
-            if (!extension_loaded("sqlsrv")) return false;
-            return true;
-        }
-
-        /**
-         * @brief DB정보 설정 및 connect/ close
-         **/
-        function _setDBInfo() {
-            $db_info = Context::getDBInfo();
-            $this->hostname = $db_info->db_hostname;
-            $this->port = $db_info->db_port;
-            $this->userid   = $db_info->db_userid;
-            $this->password   = $db_info->db_password;
-            $this->database = $db_info->db_database;
-            $this->prefix = $db_info->db_table_prefix;
-			
-			if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
-        }
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // db 정보가 없으면 무시
-            if(!$this->hostname || !$this->database) return;
-
-			//sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
-			//sqlsrv_configure( 'LogSeverity', SQLSRV_LOG_SEVERITY_ALL );
-			//sqlsrv_configure( 'LogSubsystems', SQLSRV_LOG_SYSTEM_ALL );
-
-			$this->conn = sqlsrv_connect( $this->hostname, 
-											array( 'Database' => $this->database,'UID'=>$this->userid,'PWD'=>$this->password ));
-
-											
-			// 접속체크
-		    if($this->conn){
-				$this->is_connected = true;
-				$this->password = md5($this->password);
-			}else{
-				$this->is_connected = false;
-			}
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if($this->is_connected == false) return;
-			
-            $this->commit();
-			sqlsrv_close($this->conn);
-			$this->conn = null;
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string) {
-            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-            //if(!is_numeric($string)) $string = str_replace("'","''",$string);
-			
-            return $string;
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin() {
-            if($this->is_connected == false || $this->transaction_started) return;
-			if(sqlsrv_begin_transaction( $this->conn ) === false) return;
-			
-            $this->transaction_started = true;
-        }
-
-        /**
-         * @brief 롤백
-         **/
-        function rollback() {
-            if($this->is_connected == false || !$this->transaction_started) return;
-            
-			$this->transaction_started = false;
-            sqlsrv_rollback( $this->conn );
-        }
-
-        /**
-         * @brief 커밋
-         **/
-        function commit($force = false) {
-            if(!$force && ($this->is_connected == false || !$this->transaction_started)) return;
-			
-            $this->transaction_started = false;	
-            sqlsrv_commit( $this->conn );
-        }
-
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query) {
-			if($this->is_connected == false || !$query) return;
-
-			$_param = array();
-			
-			if(count($this->param)){
-				foreach($this->param as $k => $o){
-					if($o['type'] == 'number'){
-						$_param[] = &$o['value'];
-					}else{
-						$_param[] = array(&$o['value'], SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
-					}
-				}	
-			}
-			
-            // 쿼리 시작을 알림
-            $this->actStart($query);
-			
-            // 쿼리 문 실행
-			$result = false;
-			if(count($_param)){
-				$result = @sqlsrv_query($this->conn, $query, $_param);
-			}else{
-				$result = @sqlsrv_query($this->conn, $query);
-			}
-
-			// 오류 체크
-			if(!$result) $this->setError(print_r(sqlsrv_errors(),true));
-						
-            // 쿼리 실행 종료를 알림
-            $this->actFinish();
-			$this->param = array();
-
-			return $result;
-        }
-
-        /**
-         * @brief 결과를 fetch
-         **/
-        function _fetch($result) {
-			if(!$this->isConnected() || $this->isError() || !$result) return;
-			
-			$c = sqlsrv_num_fields($result);
-			$m = null;
-			$output = array();
-			
-			while(sqlsrv_fetch($result)){
-				if(!$m) $m = sqlsrv_field_metadata($result);
-				unset($row);
-				for($i=0;$i<$c;$i++){
-					$row->{$m[$i]['Name']} = sqlsrv_get_field( $result, $i, SQLSRV_PHPTYPE_STRING( 'utf-8' )); 
-				}
-				$output[] = $row;
-			}
-
-            if(count($output)==1) return $output[0];
-            return $output;
-
-        }
-
-        /**
-         * @brief 1씩 증가되는 sequence값을 return (mssql의 auto_increment는 sequence테이블에서만 사용)
-         **/
-        function getNextSequence() {
-            $query = sprintf("insert into %ssequence (seq) values (ident_incr('%ssequence'))", $this->prefix, $this->prefix);
-			$this->_query($query);
-			
-            $query = sprintf("select ident_current('%ssequence')+1 as sequence", $this->prefix);
-            $result = $this->_query($query);
-            $tmp = $this->_fetch($result);
-
-			
-            return $tmp->sequence;
-        }
-
-        /**
-         * @brief 테이블 기생성 여부 return
-         **/
-        function isTableExists($target_name) {
-            $query = sprintf("select name from sysobjects where name = '%s%s' and xtype='U'", $this->prefix, $this->addQuotes($target_name));
-            $result = $this->_query($query);			
-            $tmp = $this->_fetch($result);
-			
-            if(!$tmp) return false;
-            return true;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 추가
-         **/
-        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
-			if($this->isColumnExists($table_name, $column_name)) return;
-            $type = $this->column_type[$type];
-            if(strtoupper($type)=='INTEGER') $size = '';
-
-            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
-            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
-            else $query .= sprintf(" %s ", $type);
-            if($default) $query .= sprintf(" default '%s' ", $default);
-            if($notnull) $query .= " not null ";
-
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 제거
-         **/
-        function dropColumn($table_name, $column_name) {
-			if(!$this->isColumnExists($table_name, $column_name)) return;
-            $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 column의 정보를 return
-         **/
-        function isColumnExists($table_name, $column_name) {
-            $query = sprintf("select syscolumns.name as name from syscolumns, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = syscolumns.id and syscolumns.name = '%s'", $this->prefix, $table_name, $column_name);
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $tmp = $this->_fetch($result);
-            if(!$tmp->name) return false;
-            return true;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 인덱스 추가
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
-        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
-			if($this->isIndexExists($table_name, $index_name)) return;
-            if(!is_array($target_columns)) $target_columns = array($target_columns);
-
-            $query = sprintf("create %s index %s on %s%s (%s)", $is_unique?'unique':'', $index_name, $this->prefix, $table_name, implode(',',$target_columns));
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
-         **/
-        function dropIndex($table_name, $index_name, $is_unique = false) {
-			if(!$this->isIndexExists($table_name, $index_name)) return;
-            $query = sprintf("drop index %s%s.%s", $this->prefix, $table_name, $index_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 index 정보를 return
-         **/
-        function isIndexExists($table_name, $index_name) {
-            $query = sprintf("select sysindexes.name as name from sysindexes, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = sysindexes.id and sysindexes.name = '%s'", $this->prefix, $table_name, $index_name);
-
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $tmp = $this->_fetch($result);
-
-            if(!$tmp->name) return false;
-            return true;
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXml($xml_doc) {
-            return $this->_createTable($xml_doc);
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXmlFile($file_name) {
-            if(!file_exists($file_name)) return;
-            // xml 파일을 읽음
-            $buff = FileHandler::readFile($file_name);
-            return $this->_createTable($buff);
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create table query생성
-         *
-         * type : number, varchar, text, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable($xml_doc) {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-            if($this->isTableExists($table_name)) return;
-
-            if($table_name == 'sequence') {
-                $table_name = $this->prefix.$table_name;
-                $query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
-                return $this->_query($query);
-            } else {
-                $table_name = $this->prefix.$table_name;
-
-                if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
-                else $columns = $xml_obj->table->column;
-
-                foreach($columns as $column) {
-                    $name = $column->attrs->name;
-                    $type = $column->attrs->type;
-                    $size = $column->attrs->size;
-                    $notnull = $column->attrs->notnull;
-                    $primary_key = $column->attrs->primary_key;
-                    $index = $column->attrs->index;
-                    $unique = $column->attrs->unique;
-                    $default = $column->attrs->default;
-                    $auto_increment = $column->attrs->auto_increment;
-
-                    $column_schema[] = sprintf('[%s] %s%s %s %s %s %s',
-                    $name,
-                    $this->column_type[$type],
-                    !in_array($type,array('number','text'))&&$size?'('.$size.')':'',
-                    $primary_key?'primary key':'',
-                    isset($default)?"default '".$default."'":'',
-                    $notnull?'not null':'null',
-                    $auto_increment?'identity(1,1)':''
-                    );
-
-                    if($unique) $unique_list[$unique][] = $name;
-                    else if($index) $index_list[$index][] = $name;
-                }
-				
-                $schema = sprintf('create table [%s] (xe_seq int identity(1,1),%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
-                $output = $this->_query($schema);
-                if(!$output) return false;
-				
-                if(count($unique_list)) {
-                    foreach($unique_list as $key => $val) {
-                        $query = sprintf("create unique index %s on %s (%s);", $key, $table_name, '['.implode('],[',$val).']');
-                        $this->_query($query);
-                    }
-                }
-
-                if(count($index_list)) {
-                    foreach($index_list as $key => $val) {
-                        $query = sprintf("create index %s on %s (%s);", $key, $table_name, '['.implode('],[',$val).']');
-                        $this->_query($query);
-                    }
-                }
-				return true;
-            }
-        }
-
-        /**
-         * @brief 조건문 작성하여 return
-         **/
-        function getCondition($output) {
-            if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type);
-            if($condition) $condition = ' where '.$condition;
-            return $condition;
-        }
-
-        function getLeftCondition($conditions,$column_type){
-            return $this->_getCondition($conditions,$column_type);
-        }
-
-
-        function _getCondition($conditions,$column_type) {
-            $condition = '';
-
-            foreach($conditions as $val) {
-                $sub_condition = '';
-                foreach($val['condition'] as $v) {
-                    if(!isset($v['value'])) continue;
-                    if($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double'))) continue;
-
-                    $name = $v['column'];
-					if(preg_match('/^substr\(/i',$name)) $name = preg_replace('/^substr\(/i','substring(',$name);
-                    $operation = $v['operation'];
-                    $value = $v['value'];
-
-                    $type = $this->getColumnType($column_type,$name);
-                    $pipe = $v['pipe'];
-
-                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-                    $str = $this->getConditionPart($name, $value, $operation);
-                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .=  $str;
-                }
-                if($sub_condition) {
-                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
-                    $condition .= '('.$sub_condition.')';
-                }
-            }
-            return $condition;
-        }
-
-		
-		function getConditionValue($name, $value, $operation, $type, $column_type) {
-			
-			if($type == 'number') {
-                if(strpos($value,',')===false && strpos($value,'(')===false){
-				
-					if(is_integer($value)){
-						$this->param[] = array('type'=>'number','value'=>(int)$value);
-						return '?';
-					}else{
-						return $value;
-					}
-				}
-            }
-
-            if(strpos($name,'.')!==false&&strpos($value,'.')!==false) {
-                list($table_name, $column_name) = explode('.',$value);
-                if($column_type[$column_name]){
-					return $value;
-				}
-            }
-	
-            switch($operation) {
-                case 'like_prefix' :
-						$value = preg_replace('/(^\'|\'$){1}/','',$value);
-						$this->param[] = array('type'=>$column_type[$name],'value'=>$value);
-							
-                        $value = "? + '%'";
-                    break;
-                case 'like_tail' :
-						$value = preg_replace('/(^\'|\'$){1}/','',$value);
-						$this->param[] = array('type'=>$column_type[$name],'value'=>$value);				
-						
-                        $value = "'%' + ?";
-                    break;
-                case 'like' :
-						$value = preg_replace('/(^\'|\'$){1}/','',$value);
-						$this->param[] = array('type'=>$column_type[$name],'value'=>$value);				
-				
-                        $value = "'%' + ? + '%'";
-                    break;
-                case 'notin' :
-						preg_match_all('/,?\'([^\']*)\'/',$value,$match);
-						$val = array();
-						foreach($match[1] as $k => $v){
-							$this->param[] = array('type'=>$column_type[$name],'value'=>trim($v));				
-							$val[] ='?';
-						}
-                        $value = join(',',$val);
-                    break;
-                case 'in' :
-                        preg_match_all('/,?\'([^\']*)\'/',$value,$match);
-						$val = array();
-						foreach($match[1] as $k => $v){
-							$this->param[] = array('type'=>$column_type[$name],'value'=>trim($v));				
-							$val[] ='?';
-						}
-                        $value = join(',',$val);
-                    break;
-				default:
-						$value = preg_replace('/(^\'|\'$){1}/','',$value);
-						$this->param[] = array('type'=>$column_type[$name],'value'=>$value);				
-						$value = '?';
-					break;
-            }
-
-            return $value;
-        }
-		
-        /**
-         * @brief insertAct 처리
-         **/
-        function _executeInsertAct($output) {
-		
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '['.$this->prefix.$val.']';
-            }
-
-            // 컬럼 정리 
-            foreach($output->columns as $key => $val) {
-                $name = $val['name'];
-                $value = $val['value'];
-				
-                if($output->column_type[$name]!='number') {
-                    $value = $this->addQuotes($value);
-					if(!$value) $value = '';
-				} elseif(is_numeric($value)){
-					if(!$value) $value = '';
-					$value = (int)$value;
-				} elseif(!$value){
-					$value = '';
-				}
-				// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
-				else $this->_filterNumber(&$value);
-				
-                $column_list[] = '['.$name.']';
-				$value_list[] = '?';
-				
-                $this->param[] = array('type'=>$output->column_type[$name], 'value'=>$value);
-            }
-
-            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $value_list));
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief updateAct 처리
-         **/
-        function _executeUpdateAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '['.$this->prefix.$val.']';
-            }
-		
-		    // 컬럼 정리 
-            foreach($output->columns as $key => $val) {
-                if(!isset($val['value'])) continue;
-				
-                $name = $val['name'];
-                $value = $val['value'];
-                if(strpos($name,'.')!==false&&strpos($value,'.')!==false){
-					$column_list[] = $name.' = '.$value;
-				} else {
-                    if($output->column_type[$name]!='number'){
-						$value = $this->addQuotes($value);
-						if(!$value) $value = '';
-						
-						$this->param[] = array('type'=>$output->column_type[$name], 'value'=>$value);
-						$column_list[] = sprintf("[%s] = ?",  $name);
-                    }elseif(!$value || is_numeric($value)){
-						$value = (int)$value;
-						
-						$this->param[] = array('type'=>$output->column_type[$name], 'value'=>$value);
-						$column_list[] = sprintf("[%s] = ?",  $name);
-					}else{
-						if(!$value) $value = '';
-						$this->_filterNumber(&$value);
-						$column_list[] = sprintf("[%s] = %s",  $name, $value);
-					}
-                }
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("update %s set %s %s", implode(',',$table_list), implode(',',$column_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '['.$this->prefix.$val.']';
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief selectAct 처리
-         *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
-         **/
-        function _executeSelectAct($output) {
-            // 테이블 정리
-            $table_list = array();
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '['.$this->prefix.$val.'] as '.$key;
-            }
-
-            $left_join = array();
-            // why???
-            $left_tables= (array)$output->left_tables;
-
-            foreach($left_tables as $key => $val) {
-                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
-                if($condition){
-                    $left_join[] = $val . ' ['.$this->prefix.$output->_tables[$key].'] as '.$key  . ' on (' . $condition . ')';
-                }
-            }
-
-            $click_count = array();
-            if(!$output->columns){
-				$output->columns = array(array('name'=>'*'));
-			}
-
-			$column_list = array();
-			foreach($output->columns as $key => $val) {
-				$name = $val['name'];
-				if(preg_match('/^substr\(/i',$name)) $name = preg_replace('/^substr\(/i','substring(',$name);
-				$alias = $val['alias'];
-				if($val['click_count']) $click_count[] = $val['name'];
-
-				if(substr($name,-1) == '*') {
-					$column_list[] = $name;
-				} elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
-					if($alias) $column_list[$alias] = sprintf('[%s] as [%s]', $name, $alias);
-					else $column_list[] = sprintf('[%s]',$name);
-				} else {
-					if($alias) $column_list[$alias] = sprintf('%s as [%s]', $name, $alias);
-					else $column_list[] = sprintf('%s',$name);
-				}
-			}
-			$columns = implode(',',$column_list);
-
-            $condition = $this->getCondition($output);
-		
-			$output->column_list = $column_list;
-            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-			if(count($output->groups)){
-				foreach($output->groups as $k => $v ){
-					if(preg_match('/^substr\(/i',$v)) $output->groups[$k] = preg_replace('/^substr\(/i','substring(',$v);
-					if($column_list[$v]) $output->arg_columns[] = $column_list[$v];
-				}
-				$groupby_query = sprintf(' group by %s', implode(',',$output->groups));
-			}
-
-            if($output->order && !preg_match('/count\(\*\)/i',$columns) ) {
-                foreach($output->order as $key => $val) {
-					if(preg_match('/^substr\(/i',$val[0])) $name = preg_replace('/^substr\(/i','substring(',$val[0]);
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query = ' order by '.implode(',',$index_list);
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = array();
-				foreach($output->arg_columns as $col){
-					if(strpos($col,'[')===false && strpos($col,' ')==false) $columns[] = '['.$col.']'; 
-					else $columns[] = $col;
-				}
-				
-				$columns = join(',',$columns);
-			}
-
-            $query = sprintf("%s from %s %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-            // list_count를 사용할 경우 적용
-            if($output->list_count['value']) $query = sprintf('select top %d %s', $output->list_count['value'], $query);
-			else $query = "select ".$query;
-
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-            $result = $this->_query($query);
-            if($this->isError()) return;
-
-            if(count($click_count)>0 && count($output->conditions)>0){
-                $_query = '';
-                foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
-                $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
-                $this->_query($_query);
-            }
-
-            $data = $this->_fetch($result);
-
-            $buff = new Object();
-            $buff->data = $data;
-            return $buff;
-        }
-
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-        function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
-            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
-
-			$column_list = $output->column_list;
-
-            // 전체 개수를 구함
-			if(count($output->groups)){
-				foreach($output->groups as $k => $v ){
-					if(preg_match('/^substr\(/i',$v)) $output->groups[$k] = preg_replace('/^substr\(/i','substring(',$v);
-					if($column_list[$v]) $output->arg_columns[] = $column_list[$v];
-				}
-				$count_condition = sprintf('%s group by %s', $condition, implode(', ', $output->groups));
-			}else{
-				$count_condition = $condition;
-			}
-			
-			$count_query = sprintf("select count(*) as count from %s %s %s", implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-			if (count($output->groups)) $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
-			
-			$param = $this->param;
-
-			$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
-			$result = $this->_query($count_query);
-			
-			$this->param = $param;
-			$count_output = $this->_fetch($result);
-
-			$total_count = (int)$count_output->count;
-
-            $list_count = $output->list_count['value'];
-            if(!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if(!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if(!$page) $page = 1;
-
-            // 전체 페이지를 구함
-            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
-            else $total_page = 1;
-
-            // 페이지 변수를 체크
-            if($page > $total_page) $page = $total_page;
-            $start_count = ($page-1)*$list_count;
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            $conditions = $this->getConditionList($output);
-            if($output->order) {
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' %s < 2100000000 ', $col);
-                    }
-                }
-            }
-			
-            // group by 절 추가
-			if(count($output->groups)){
-				foreach($output->groups as $k => $v ){
-					if(preg_match('/^substr\(/i',$v)) $output->groups[$k] = preg_replace('/^substr\(/i','substring(',$v);
-					if($column_list[$v]) $output->arg_columns[] = $column_list[$v];
-				}
-
-				$group = sprintf('group by %s', implode(',',$output->groups));
-			}
-			
-            // order 절 추가
-            $order_targets = array();
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-					if(preg_match('/^substr\(/i',$val[0])) $name = preg_replace('/^substr\(/i','substring(',$val[0]);
-                    $order_targets[$val[0]] = $val[1];
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $order .= 'order by '.implode(',',$index_list);
-            }
-            if(!count($order_targets)) {
-                if(in_array('list_order',$conditions)) $order_targets['list_order'] = 'asc';
-                else $order_targets['xe_seq'] = 'desc';
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = array();
-				foreach($output->arg_columns as $col){
-					if(strpos($col,'[')===false && strpos($col,' ')==false) $columns[] = '['.$col.']'; 
-					else $columns[] = $col;
-				}
-				
-				$columns = join(',',$columns);
-			}
-
-            if($start_count<1) {
-                $query = sprintf('select top %d %s from %s %s %s %s %s', $list_count, $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
-
-            } else {
-                foreach($order_targets as $k => $v) {
-					$first_columns[] = sprintf('%s(%s) as %s', $v=='asc'?'max':'min', $k, $k);
-					$first_sub_columns[] = $k;
-                }
-				
-				// 1차로 order 대상에 해당 하는 값을 가져옴
-				$param = $this->param;
-				$first_query = sprintf("select %s from (select top %d %s from %s %s %s %s %s) xet", implode(',',$first_columns),  $start_count, implode(',',$first_sub_columns), implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
-				$result = $this->_query($first_query);
-				$this->param = $param;
-				$tmp = $this->_fetch($result);
-				
-
-				
-				// 1차에서 나온 값을 이용 다시 쿼리 실행
-				$sub_cond = array();
-                foreach($order_targets as $k => $v) {
-                    $sub_cond[] = sprintf("%s %s '%s'", $k, $v=='asc'?'>':'<', $tmp->{$k});
-				}
-				$sub_condition = ' and( '.implode(' and ',$sub_cond).' )';
-				
-				if($condition) $condition .= $sub_condition;
-				else $condition  = ' where '.$sub_condition;
-				$query = sprintf('select top %d %s from %s %s %s %s %s', $list_count, $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $group, $order);
-            }
-
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-            $result = $this->_query($query);
-			
-            if($this->isError()) {
-                $buff = new Object();
-                $buff->total_count = 0;
-                $buff->total_page = 0;
-                $buff->page = 1;
-                $buff->data = array();
-
-                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-                return $buff;
-            }
-
-			$virtual_no = $total_count - ($page-1)*$list_count;
-			
-			$output = $this->_fetch($result);
-			if(!is_array($output)) $output = array($output);
-
-            foreach($output as $k => $v) {
-                $data[$virtual_no--] = $v;
-            }
-			
-            $buff = new Object();
-            $buff->total_count = $total_count;
-            $buff->total_page = $total_page;
-            $buff->page = $page;
-            $buff->data = $data;
-
-            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-            return $buff;
-        }
-
-    }
-
-return new DBMssql;
-?>
+<?php
+
+    /**
+     * @class DBMSSQL
+     * @author NHN (developers@xpressengine.com)
+     * @brief Modified to use MSSQL driver by sol (sol@ngleader.com)
+     * @version 0.1
+     **/
+
+    class DBMssql extends DB {
+
+        /**
+         * information to connect to DB
+         **/
+        var $prefix		= 'xe'; // / <prefix of XE tables(One more XE can be installed on a single DB)
+        var $param		= array();
+        var $comment_syntax = '/* %s */';
+
+        /**
+         * @brief column type used in mssql
+         *
+         * column_type should be replaced for each DBMS's type
+         * becasue it uses commonly defined type in the schema/query xml
+         **/
+        var $column_type = array(
+            'bignumber' => 'bigint',
+            'number' => 'int',
+            'varchar' => 'varchar',
+            'char' => 'char',
+            'text' => 'text',
+            'bigtext' => 'text',
+            'date' => 'varchar(14)',
+            'float' => 'float',
+        );
+
+        /**
+         * @brief constructor
+         **/
+        function DBMssql() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+
+		/**
+		 * @brief create an instance of this class
+		 */
+		function create()
+		{
+			return new DBMssql;
+		}
+
+        /**
+         * @brief Return if installable
+         **/
+        function isSupported() {
+            if (!extension_loaded("sqlsrv")) return false;
+            return true;
+        }
+
+        /**
+         * @brief DB Connection
+         **/
+        function __connect($connection) {
+            //sqlsrv_configure( 'WarningsReturnAsErrors', 0 );
+            //sqlsrv_configure( 'LogSeverity', SQLSRV_LOG_SEVERITY_ALL );
+            //sqlsrv_configure( 'LogSubsystems', SQLSRV_LOG_SYSTEM_ALL );
+            $result = @sqlsrv_connect($connection["db_hostname"], array('Database' => $connection["db_database"], 'UID' => $connection["db_userid"], 'PWD' => $connection["db_password"]));
+
+            if(!$result)
+            {
+                $errors = print_r(sqlsrv_errors(), true);
+                $this->setError (-1, 'database connect fail' . PHP_EOL . $errors);
+		return;
+            }
+            return $result;
+        }
+
+        /**
+         * @brief DB disconnect
+         **/
+        function _close($connection) {
+            $this->commit();
+            sqlsrv_close($connection);
+        }
+
+        /**
+         * @brief handles quatation of the string variables from the query
+         **/
+        // TODO See what to do about this
+        function addQuotes($string) {
+            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            //if(!is_numeric($string)) $string = str_replace("'","''",$string);
+
+            return $string;
+        }
+
+        /**
+         * @brief Begin transaction
+         **/
+        function _begin() {
+            $connection = $this->_getConnection('master');
+            if(sqlsrv_begin_transaction($connection) === false) return;
+            return true;
+        }
+
+        /**
+         * @brief Rollback
+         **/
+        function _rollback() {
+            $connection = $this->_getConnection('master');
+            sqlsrv_rollback($connection);
+            return true;
+        }
+
+        /**
+         * @brief Commit
+         **/
+        function _commit() {
+            $connection = $this->_getConnection('master');
+            sqlsrv_commit($connection);
+            return true;
+        }
+
+        /**
+         * @brief : executing the query and fetching the result
+         *
+         * query: run a query and return the result\n
+         * fetch: NULL if no value returned \n
+         *        array object if rows returned \n
+         *        object if a row returned \n
+         *        return\n
+         **/
+        function __query($query, $connection) {
+            $_param = array();
+
+            if(count($this->param)){
+                    foreach($this->param as $k => $o){
+                            if($o->getType() == 'number'){
+                                    $value = $o->getUnescapedValue();
+                                    if(is_array($value)) $_param = array_merge($_param, $value);
+                                    else $_param[] = $o->getUnescapedValue();
+                            }else{
+                                    $value = $o->getUnescapedValue();
+                                    if(is_array($value)) {
+                                        foreach($value as $v)
+                                            $_param[] = array($v, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
+                                    }
+                                    else $_param[] = array($value, SQLSRV_PARAM_IN, SQLSRV_PHPTYPE_STRING('utf-8'));
+                            }
+                    }
+            }
+
+            // Run the query statement
+			$result = false;
+			if(count($_param)){
+				$result = @sqlsrv_query($connection, $query, $_param);
+			}else{
+				$result = @sqlsrv_query($connection, $query);
+			}
+            // Error Check
+
+			if(!$result) $this->setError(print_r(sqlsrv_errors(),true));
+
+            $this->param = array();
+
+            return $result;
+        }
+
+        /**
+         * @brief Fetch results
+         **/
+        function _fetch($result, $arrayIndexEndValue = NULL) {
+			if(!$this->isConnected() || $this->isError() || !$result) return;
+
+			$c = sqlsrv_num_fields($result);
+			$m = null;
+			$output = array();
+
+			while(sqlsrv_fetch($result)){
+				if(!$m) $m = sqlsrv_field_metadata($result);
+				unset($row);
+				for($i=0;$i<$c;$i++){
+					$row->{$m[$i]['Name']} = sqlsrv_get_field( $result, $i, SQLSRV_PHPTYPE_STRING( 'utf-8' ));
+				}
+				if($arrayIndexEndValue) $output[$arrayIndexEndValue--] = $row;
+				else $output[] = $row;
+			}
+
+            if(count($output)==1) {
+            	if(isset($arrayIndexEndValue)) return $output;
+            	else return $output[0];
+            }
+            return $output;
+
+        }
+
+        /**
+         * @brief Return sequence value incremented by 1(auto_increment is usd in the sequence table only)
+         **/
+        function getNextSequence() {
+            $query = sprintf("insert into %ssequence (seq) values (ident_incr('%ssequence'))", $this->prefix, $this->prefix);
+			$this->_query($query);
+
+            $query = sprintf("select ident_current('%ssequence')+1 as sequence", $this->prefix);
+            $result = $this->_query($query);
+            $tmp = $this->_fetch($result);
+
+
+            return $tmp->sequence;
+        }
+
+        /**
+         * @brief Return if a table already exists
+         **/
+        function isTableExists($target_name) {
+            $query = sprintf("select name from sysobjects where name = '%s%s' and xtype='U'", $this->prefix, $this->addQuotes($target_name));
+            $result = $this->_query($query);
+            $tmp = $this->_fetch($result);
+
+            if(!$tmp) return false;
+            return true;
+        }
+
+        /**
+         * @brief Add a column to a table
+         **/
+        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
+			if($this->isColumnExists($table_name, $column_name)) return;
+            $type = $this->column_type[$type];
+            if(strtoupper($type)=='INTEGER') $size = '';
+
+            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
+            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
+            else $query .= sprintf(" %s ", $type);
+            if($default) $query .= sprintf(" default '%s' ", $default);
+            if($notnull) $query .= " not null ";
+
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Delete a column from a table
+         **/
+        function dropColumn($table_name, $column_name) {
+			if(!$this->isColumnExists($table_name, $column_name)) return;
+            $query = sprintf("alter table %s%s drop %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return column information of a table
+         **/
+        function isColumnExists($table_name, $column_name) {
+            $query = sprintf("select syscolumns.name as name from syscolumns, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = syscolumns.id and syscolumns.name = '%s'", $this->prefix, $table_name, $column_name);
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $tmp = $this->_fetch($result);
+            if(!$tmp->name) return false;
+            return true;
+        }
+
+        /**
+         * @brief Add an index to a table
+         * $target_columns = array(col1, col2)
+         * $is_unique? unique : none
+         **/
+        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
+			if($this->isIndexExists($table_name, $index_name)) return;
+            if(!is_array($target_columns)) $target_columns = array($target_columns);
+
+            $query = sprintf("create %s index %s on %s%s (%s)", $is_unique?'unique':'', $index_name, $this->prefix, $table_name, implode(',',$target_columns));
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Drop an index from a table
+         **/
+        function dropIndex($table_name, $index_name, $is_unique = false) {
+			if(!$this->isIndexExists($table_name, $index_name)) return;
+            $query = sprintf("drop index %s%s.%s", $this->prefix, $table_name, $index_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return index information of a table
+         **/
+        function isIndexExists($table_name, $index_name) {
+            $query = sprintf("select sysindexes.name as name from sysindexes, sysobjects where sysobjects.name = '%s%s' and sysobjects.id = sysindexes.id and sysindexes.name = '%s'", $this->prefix, $table_name, $index_name);
+
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $tmp = $this->_fetch($result);
+
+            if(!$tmp->name) return false;
+            return true;
+        }
+
+        /**
+         * @brief Create a table by using xml file
+         **/
+        function createTableByXml($xml_doc) {
+            return $this->_createTable($xml_doc);
+        }
+
+        /**
+         * @brief Create a table by using xml file
+         **/
+        function createTableByXmlFile($file_name) {
+            if(!file_exists($file_name)) return;
+            // read xml file
+            $buff = FileHandler::readFile($file_name);
+            return $this->_createTable($buff);
+        }
+
+        /**
+         * @brief generate a query statement to create a table by using schema xml
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+            // Create a table schema
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+
+            if($table_name == 'sequence') {
+                $table_name = $this->prefix.$table_name;
+                $query = sprintf('create table %s ( sequence int identity(1,1), seq int )', $table_name);
+                return $this->_query($query);
+            } else {
+                $table_name = $this->prefix.$table_name;
+
+                if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+                else $columns = $xml_obj->table->column;
+
+                foreach($columns as $column) {
+                    $name = $column->attrs->name;
+                    $type = $column->attrs->type;
+                    $size = $column->attrs->size;
+                    $notnull = $column->attrs->notnull;
+                    $primary_key = $column->attrs->primary_key;
+                    $index = $column->attrs->index;
+                    $unique = $column->attrs->unique;
+                    $default = $column->attrs->default;
+                    $auto_increment = $column->attrs->auto_increment;
+
+                    $column_schema[] = sprintf('[%s] %s%s %s %s %s %s',
+                    $name,
+                    $this->column_type[$type],
+                    !in_array($type,array('number','text'))&&$size?'('.$size.')':'',
+                    $primary_key?'primary key':'',
+                    isset($default)?"default '".$default."'":'',
+                    $notnull?'not null':'null',
+                    $auto_increment?'identity(1,1)':''
+                    );
+
+                    if($unique) $unique_list[$unique][] = $name;
+                    else if($index) $index_list[$index][] = $name;
+                }
+
+                $schema = sprintf('create table [%s] (xe_seq int identity(1,1),%s%s)', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"));
+                $output = $this->_query($schema);
+                if(!$output) return false;
+
+                if(count($unique_list)) {
+                    foreach($unique_list as $key => $val) {
+                        $query = sprintf("create unique index %s on %s (%s);", $key, $table_name, '['.implode('],[',$val).']');
+                        $this->_query($query);
+                    }
+                }
+
+                if(count($index_list)) {
+                    foreach($index_list as $key => $val) {
+                        $query = sprintf("create index %s on %s (%s);", $key, $table_name, '['.implode('],[',$val).']');
+                        $this->_query($query);
+                    }
+                }
+				return true;
+            }
+        }
+
+
+        /**
+         * @brief Handle the insertAct
+         **/
+        // TODO Lookup _filterNumber against sql injection - see if it is still needed and how to integrate
+        function _executeInsertAct($queryObject) {
+        	$query = $this->getInsertSql($queryObject, false);
+        	$this->param = $queryObject->getArguments();
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle updateAct
+         **/
+        function _executeUpdateAct($queryObject) {
+        	$query = $this->getUpdateSql($queryObject, false);
+        	$this->param = $queryObject->getArguments();
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle deleteAct
+         **/
+        function _executeDeleteAct($queryObject) {
+        	$query = $this->getDeleteSql($queryObject, false);
+        	$this->param = $queryObject->getArguments();
+            return $this->_query($query);
+        }
+
+        function getSelectSql($query){
+       		$with_value = false;
+
+       		//$limitOffset = $query->getLimit()->getOffset();
+       		//if($limitOffset)
+       			// TODO Implement Limit with offset with subquery
+		 	$limit = '';$limitCount = '';
+                        $limitQueryPart = $query->getLimit();
+		 	if($limitQueryPart)
+       			$limitCount = $limitQueryPart->getLimit();
+		 	if($limitCount != '') $limit = 'SELECT TOP ' . $limitCount;
+
+			$select = $query->getSelectString($with_values);
+			if($select == '') return new Object(-1, "Invalid query");
+			if($limit != '')
+				$select = $limit.' '.$select;
+			else
+				$select = 'SELECT ' .$select;
+
+			$from = $query->getFromString($with_values);
+			if($from == '') return new Object(-1, "Invalid query");
+			$from = ' FROM '.$from;
+
+			$where = $query->getWhereString($with_values);
+			if($where != '') $where = ' WHERE ' . $where;
+
+			$groupBy = $query->getGroupByString();
+			if($groupBy != '') $groupBy = ' GROUP BY ' . $groupBy;
+
+			$orderBy = $query->getOrderByString();
+			if($orderBy != '') $orderBy = ' ORDER BY ' . $orderBy;
+
+
+
+		 	return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy;
+        }
+
+        /**
+         * @brief Handle selectAct
+         *
+         * In order to get a list of pages easily when selecting \n
+         * it supports a method as navigation
+         **/
+        function _executeSelectAct($queryObject, $connection = null) {
+        	$query = $this->getSelectSql($queryObject);
+
+                if(strpos($query, "substr")) $query = str_replace ("substr", "substring", $query);
+
+        	// TODO Decide if we continue to pass parameters like this
+        	$this->param = $queryObject->getArguments();
+
+		$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
+                $result = $this->_query($query, $connection);
+
+                if ($this->isError ()) return $this->queryError($queryObject);
+                else return $this->queryPageLimit($queryObject, $result, $connection);
+        }
+
+        function getParser(){
+        	return new DBParser("[", "]", $this->prefix);
+        }
+
+    	function queryError($queryObject){
+                $limit = $queryObject->getLimit();
+			if ($limit && $limit->isPageHandler()){
+					$buff = new Object ();
+					$buff->total_count = 0;
+					$buff->total_page = 0;
+					$buff->page = 1;
+					$buff->data = array ();
+					$buff->page_navigation = new PageHandler (/*$total_count*/0, /*$total_page*/1, /*$page*/1, /*$page_count*/10);//default page handler values
+					return $buff;
+				}else
+					return;
+		}
+
+		function queryPageLimit($queryObject, $result, $connection){
+                    $limit = $queryObject->getLimit();
+			 	if ($limit && $limit->isPageHandler()) {
+		 		// Total count
+				$temp_where = $queryObject->getWhereString(true, false);
+		 		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '. $temp_where));
+				if ($queryObject->getGroupByString() != '') {
+					$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
+				}
+
+				$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+				$result_count = $this->_query($count_query, $connection);
+				$count_output = $this->_fetch($result_count);
+				$total_count = (int)$count_output->count;
+
+                                $list_count = $limit->list_count->getValue();
+                                if (!$list_count) $list_count = 20;
+                                $page_count = $limit->page_count->getValue();
+                                if (!$page_count) $page_count = 10;
+                                $page = $limit->page->getValue();
+                                if (!$page) $page = 1;
+				// Total pages
+				if ($total_count) {
+					$total_page = (int) (($total_count - 1) / $list_count) + 1;
+				}	else	$total_page = 1;
+
+                                // check the page variables
+                                if ($page > $total_page) $page = $total_page;
+                                $start_count = ($page - 1) * $list_count;
+
+                                $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+                                $result = $this->_query ($query, $connection);
+                                if ($this->isError ())
+                                    return $this->queryError($queryObject);
+
+		 		$virtual_no = $total_count - ($page - 1) * $list_count;
+		 		$data = $this->_fetch($result, $virtual_no);
+
+		 		$buff = new Object ();
+				$buff->total_count = $total_count;
+				$buff->total_page = $total_page;
+				$buff->page = $page;
+				$buff->data = $data;
+				$buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+			}else{
+				$data = $this->_fetch($result);
+				$buff = new Object ();
+				$buff->data = $data;
+			}
+			return $buff;
+		}
+
+    }
+
+return new DBMssql;
+?>
diff --git a/classes/db/DBMysql.class.php b/classes/db/DBMysql.class.php
index 7e5be0f3e..d5fe2b462 100644
--- a/classes/db/DBMysql.class.php
+++ b/classes/db/DBMysql.class.php
@@ -1,782 +1,537 @@
-<?php
-    /**
-     * @class DBMysql
-     * @author NHN (developers@xpressengine.com)
-     * @brief MySQL DBMS를 이용하기 위한 class
-     * @version 0.1
-     *
-     * mysql handling class
-     **/
-
-    class DBMysql extends DB {
-
-        /**
-         * @brief Mysql DB에 접속하기 위한 정보
-         **/
-        var $hostname = '127.0.0.1'; ///< hostname
-        var $userid   = NULL; ///< user id
-        var $password   = NULL; ///< password
-        var $database = NULL; ///< database
-        var $prefix   = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE 설치 가능)
-		var $comment_syntax = '/* %s */';
-
-        /**
-         * @brief mysql에서 사용될 column type
-         *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
-         **/
-        var $column_type = array(
-            'bignumber' => 'bigint',
-            'number' => 'bigint',
-            'varchar' => 'varchar',
-            'char' => 'char',
-            'text' => 'text',
-            'bigtext' => 'longtext',
-            'date' => 'varchar(14)',
-            'float' => 'float',
-        );
-
-        /**
-         * @brief constructor
-         **/
-        function DBMysql() {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-		
-		function create() {
-			return new DBMysql;
-		}
-
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported() {
-            if(!function_exists('mysql_connect')) return false;
-            return true;
-        }
-
-        /**
-         * @brief DB정보 설정 및 connect/ close
-         **/
-        function _setDBInfo() {
-            $db_info = Context::getDBInfo();
-            $this->hostname = $db_info->db_hostname;
-            $this->port = $db_info->db_port;
-            $this->userid   = $db_info->db_userid;
-            $this->password   = $db_info->db_password;
-            $this->database = $db_info->db_database;
-            $this->prefix = $db_info->db_table_prefix;
-            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
-        }
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // db 정보가 없으면 무시
-            if(!$this->hostname || !$this->userid || !$this->password || !$this->database) return;
-
-            if(strpos($this->hostname, ':')===false && $this->port) $this->hostname .= ':'.$this->port;
-
-            // 접속시도  
-            $this->fd = @mysql_connect($this->hostname, $this->userid, $this->password);
-            if(mysql_error()) {
-                $this->setError(mysql_errno(), mysql_error());
-                return;
-            }
-
-            // 버전 확인후 4.1 이하면 오류 표시
-            if(mysql_get_server_info($this->fd)<"4.1") {
-                $this->setError(-1, "XE cannot be installed under the version of mysql 4.1. Current mysql version is ".mysql_get_server_info());
-                return;
-            }
-
-            // db 선택
-            @mysql_select_db($this->database, $this->fd);
-            if(mysql_error()) {
-                $this->setError(mysql_errno(), mysql_error());
-                return;
-            }
-
-            // 접속체크
-            $this->is_connected = true;
-			$this->password = md5($this->password);
-
-            // mysql의 경우 utf8임을 지정
-            $this->_query("set names 'utf8'");
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if(!$this->isConnected()) return;
-            @mysql_close($this->fd);
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string) {
-            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-            if(!is_numeric($string)) $string = @mysql_escape_string($string);
-            return $string;
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin() {
-        }
-
-        /**
-         * @brief 롤백
-         **/
-        function rollback() {
-        }
-
-        /**
-         * @brief 커밋
-         **/
-        function commit() {
-        }
-
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query) {
-            if(!$this->isConnected()) return;
-
-            // 쿼리 시작을 알림
-            $this->actStart($query);
-
-            // 쿼리 문 실행
-            $result = @mysql_query($query, $this->fd);
-
-            // 오류 체크
-            if(mysql_error($this->fd)) $this->setError(mysql_errno($this->fd), mysql_error($this->fd));
-
-            // 쿼리 실행 종료를 알림
-            $this->actFinish();
-
-            // 결과 리턴
-            return $result;
-        }
-
-        /**
-         * @brief 결과를 fetch
-         **/
-        function _fetch($result) {
-            if(!$this->isConnected() || $this->isError() || !$result) return;
-            while($tmp = $this->db_fetch_object($result)) {
-                $output[] = $tmp;
-            }
-            if(count($output)==1) return $output[0];
-            return $output;
-        }
-
-        /**
-         * @brief 1씩 증가되는 sequence값을 return (mysql의 auto_increment는 sequence테이블에서만 사용)
-         **/
-        function getNextSequence() {
-            $query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
-            $this->_query($query);
-            $sequence = $this->db_insert_id();
-            if($sequence % 10000 == 0) {
-              $query = sprintf("delete from  `%ssequence` where seq < %d", $this->prefix, $sequence);
-              $this->_query($query);
-            }
-
-            return $sequence;
-        }
-
-        /**
-         * @brief mysql old password를 가져오는 함수 (mysql에서만 사용)
-         **/
-        function isValidOldPassword($password, $saved_password) {
-            $query = sprintf("select password('%s') as password, old_password('%s') as old_password", $this->addQuotes($password), $this->addQuotes($password));
-            $result = $this->_query($query);
-            $tmp = $this->_fetch($result);
-            if($tmp->password == $saved_password || $tmp->old_password == $saved_password) return true;
-            return false;
-        }
-
-        /**
-         * @brief 테이블 기생성 여부 return
-         **/
-        function isTableExists($target_name) {
-            $query = sprintf("show tables like '%s%s'", $this->prefix, $this->addQuotes($target_name));
-            $result = $this->_query($query);
-            $tmp = $this->_fetch($result);
-            if(!$tmp) return false;
-            return true;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 추가
-         **/
-        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
-            $type = $this->column_type[$type];
-            if(strtoupper($type)=='INTEGER') $size = '';
-
-            $query = sprintf("alter table `%s%s` add `%s` ", $this->prefix, $table_name, $column_name);
-            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
-            else $query .= sprintf(" %s ", $type);
-            if($default) $query .= sprintf(" default '%s' ", $default);
-            if($notnull) $query .= " not null ";
-
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 제거
-         **/
-        function dropColumn($table_name, $column_name) {
-            $query = sprintf("alter table `%s%s` drop `%s` ", $this->prefix, $table_name, $column_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 column의 정보를 return
-         **/
-        function isColumnExists($table_name, $column_name) {
-            $query = sprintf("show fields from `%s%s`", $this->prefix, $table_name);
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $output = $this->_fetch($result);
-            if($output) {
-                $column_name = strtolower($column_name);
-                foreach($output as $key => $val) {
-                    $name = strtolower($val->Field);
-                    if($column_name == $name) return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 인덱스 추가
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
-        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
-            if(!is_array($target_columns)) $target_columns = array($target_columns);
-
-            $query = sprintf("alter table `%s%s` add %s index `%s` (%s);", $this->prefix, $table_name, $is_unique?'unique':'', $index_name, implode(',',$target_columns));
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
-         **/
-        function dropIndex($table_name, $index_name, $is_unique = false) {
-            $query = sprintf("alter table `%s%s` drop index `%s`", $this->prefix, $table_name, $index_name);
-            $this->_query($query);
-        }
-
-
-        /**
-         * @brief 특정 테이블의 index 정보를 return
-         **/
-        function isIndexExists($table_name, $index_name) {
-            //$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
-            $query = sprintf("show indexes from `%s%s`", $this->prefix, $table_name);
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            $output = $this->_fetch($result);
-            if(!$output) return;
-            if(!is_array($output)) $output = array($output);
-
-            for($i=0;$i<count($output);$i++) {
-                if($output[$i]->Key_name == $index_name) return true;
-            }
-            return false;
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXml($xml_doc) {
-            return $this->_createTable($xml_doc);
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXmlFile($file_name) {
-            if(!file_exists($file_name)) return;
-            // xml 파일을 읽음
-            $buff = FileHandler::readFile($file_name);
-            return $this->_createTable($buff);
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create table query생성
-         *
-         * type : number, varchar, text, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable($xml_doc) {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-            if($this->isTableExists($table_name)) return;
-            $table_name = $this->prefix.$table_name;
-
-            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
-            else $columns = $xml_obj->table->column;
-
-            foreach($columns as $column) {
-                $name = $column->attrs->name;
-                $type = $column->attrs->type;
-                $size = $column->attrs->size;
-                $notnull = $column->attrs->notnull;
-                $primary_key = $column->attrs->primary_key;
-                $index = $column->attrs->index;
-                $unique = $column->attrs->unique;
-                $default = $column->attrs->default;
-                $auto_increment = $column->attrs->auto_increment;
-
-                $column_schema[] = sprintf('`%s` %s%s %s %s %s',
-                    $name,
-                    $this->column_type[$type],
-                    $size?'('.$size.')':'',
-                    isset($default)?"default '".$default."'":'',
-                    $notnull?'not null':'',
-                    $auto_increment?'auto_increment':''
-                );
-
-                if($primary_key) $primary_list[] = $name;
-                else if($unique) $unique_list[$unique][] = $name;
-                else if($index) $index_list[$index][] = $name;
-            }
-
-            if(count($primary_list)) {
-                $column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list,'`,`').'`');
-            }
-
-            if(count($unique_list)) {
-                foreach($unique_list as $key => $val) {
-                    $column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val,'`,`').'`');
-                }
-            }
-
-            if(count($index_list)) {
-                foreach($index_list as $key => $val) {
-                    $column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val,'`,`').'`');
-                }
-            }
-
-            $schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"), "ENGINE = MYISAM  CHARACTER SET utf8 COLLATE utf8_general_ci");
-
-            $output = $this->_query($schema);
-            if(!$output) return false;
-        }
-
-        /**
-         * @brief 조건문 작성하여 return
-         **/
-        function getCondition($output) {
-            if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type);
-            if($condition) $condition = ' where '.$condition;
-            return $condition;
-        }
-
-        function getLeftCondition($conditions,$column_type){
-            return $this->_getCondition($conditions,$column_type);
-        }
-
-
-        function _getCondition($conditions,$column_type) {
-            $condition = '';
-            foreach($conditions as $val) {
-                $sub_condition = '';
-                foreach($val['condition'] as $v) {
-                    if(!isset($v['value'])) continue;
-                    if($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double', 'array'))) continue;
-
-                    $name = $v['column'];
-                    $operation = $v['operation'];
-                    $value = $v['value'];
-                    $type = $this->getColumnType($column_type,$name);
-                    $pipe = $v['pipe'];
-                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-                    $str = $this->getConditionPart($name, $value, $operation);
-                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .=  $str;
-                }
-                if($sub_condition) {
-                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
-                    $condition .= '('.$sub_condition.')';
-                }
-            }
-            return $condition;
-        }
-
-        /**
-         * @brief insertAct 처리
-         **/
-        function _executeInsertAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '`'.$this->prefix.$val.'`';
-            }
-
-            // 컬럼 정리 
-            foreach($output->columns as $key => $val) {
-                $name = $val['name'];
-                $value = $val['value'];
-
-                if($output->column_type[$name]!='number') {
-
-					if(!is_null($value)){
-						$value = "'" . $this->addQuotes($value) ."'";
-					}else{
-						if($val['notnull']=='notnull') {
-							$value = "''";
-						} else {
-							//$value = 'null';
-							$value = "''";
-						}
-					}
-
-                }
-				//elseif(!$value || is_numeric($value)) $value = (int)$value;
-                else $this->_filterNumber(&$value);
-
-                $column_list[] = '`'.$name.'`';
-                $value_list[] = $value;
-            }
-
-            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $value_list));
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief updateAct 처리
-         **/
-        function _executeUpdateAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '`'.$this->prefix.$val.'` as '.$key;
-            }
-
-            // 컬럼 정리 
-            foreach($output->columns as $key => $val) {
-                if(!isset($val['value'])) continue;
-                $name = $val['name'];
-                $value = $val['value'];
-                if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
-                else {
-                    if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-                	else $this->_filterNumber(&$value);
-
-                    $column_list[] = sprintf("`%s` = %s", $name, $value);
-                }
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("update %s set %s %s", implode(',',$table_list), implode(',',$column_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '`'.$this->prefix.$val.'`';
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief selectAct 처리
-         *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
-         **/
-        function _executeSelectAct($output) {
-            // 테이블 정리
-            $table_list = array();
-            foreach($output->tables as $key => $val) {
-                $table_list[] = '`'.$this->prefix.$val.'` as '.$key;
-            }
-
-            $left_join = array();
-            // why???
-            $left_tables= (array)$output->left_tables;
-
-            foreach($left_tables as $key => $val) {
-                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
-                if($condition){
-                    $left_join[] = $val . ' `'.$this->prefix.$output->_tables[$key].'` as '.$key  . ' on (' . $condition . ')';
-                }
-            }
-			
-            $click_count = array();
-            if(!$output->columns){
-				$output->columns = array(array('name'=>'*'));
-			}
-
-			$column_list = array();
-			foreach($output->columns as $key => $val) 
-			{
-				$name = $val['name'];
-				$alias = $val['alias'];
-				if($val['click_count']) $click_count[] = $val['name'];
-
-				if(substr($name,-1) == '*') 
-				{
-					$column_list[] = $name;
-				} 
-				else if(strpos($name,'.')===false && strpos($name,'(')===false) 
-				{
-					if($alias)
-					{
-						$col = sprintf('`%s` as `%s`', $name, $alias);
-						$column_list[$alias] = $col;
-					}
-					else
-					{
-						$column_list[] = sprintf('`%s`',$name);
-					}
-				} 
-				else 
-				{
-					if($alias)
-					{
-						$col = sprintf('%s as `%s`', $name, $alias);
-						$column_list[$alias] = $col;
-					}
-					else
-					{
-						$column_list[] = sprintf('%s',$name);
-					}
-				}
-			}
-
-			$columns = implode(',',$column_list);
-			$output->column_list = $column_list;
-            $condition = $this->getCondition($output);
-
-            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-
-            if(count($output->groups))
-			{
-				$groupby_query = sprintf(' group by %s', implode(',',$output->groups));
-
-				if(count($output->arg_columns))
-				{
-					foreach($output->groups as $group)
-					{
-						if($column_list[$group]) $output->arg_columns[] = $column_list[$group];
-					}
-				}
-			}
-	
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query .= ' order by '.implode(',',$index_list);
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = array();
-				foreach($output->arg_columns as $col){
-					if(strpos($col,'`')===false && strpos($col,' ')==false) $columns[] = '`'.$col.'`'; 
-					else $columns[] = $col;
-				}
-				
-				$columns = join(',',$columns);
-			}
-
-            $query = sprintf("select %s from %s %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-
-            // list_count를 사용할 경우 적용
-            if($output->list_count['value']) $query = sprintf('%s limit %d', $query, $output->list_count['value']);
-
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-
-            $result = $this->_query($query);
-            if($this->isError()) return;
-            if(count($click_count) && count($output->conditions)){
-                $_query = '';
-                foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
-                $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
-                $this->_query($_query);
-            }
-
-            $data = $this->_fetch($result);
-
-            $buff = new Object();
-            $buff->data = $data;
-
-            return $buff;
-        }
-
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-        function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
-            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
-
-			$column_list = $output->column_list;
-
-            // 전체 개수를 구함
-			$count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
-			$count_query = sprintf("select count(*) as count from %s %s %s", implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-			if (count($output->groups)) $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
-
-			$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
-			$result = $this->_query($count_query);
-			$count_output = $this->_fetch($result);
-			$total_count = (int)$count_output->count;
-
-            $list_count = $output->list_count['value'];
-            if(!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if(!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if(!$page) $page = 1;
-
-            // 전체 페이지를 구함
-            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
-            else $total_page = 1;
-
-            // 페이지 변수를 체크
-            if($page > $total_page) $page = $total_page;
-            $start_count = ($page-1)*$list_count;
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            if(count($output->groups)){
-				$groupby_query = sprintf(' group by %s', implode(',',$output->groups));
-
-				if(count($output->arg_columns))
-				{
-					foreach($output->groups as $group)
-					{
-						if($column_list[$group]) $output->arg_columns[] = $column_list[$group];
-					}
-				}
-			}
-
-            if(count($output->order)) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query = ' order by '.implode(',',$index_list);
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = array();
-				foreach($output->arg_columns as $col){
-					if(strpos($col,'`')===false && strpos($col,' ')==false) $columns[] = '`'.$col.'`'; 
-					else $columns[] = $col;
-				}
-				
-				$columns = join(',',$columns);
-			}
-
-            $query = sprintf("select %s from %s %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-            $query = sprintf('%s limit %d, %d', $query, $start_count, $list_count);
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-
-            $result = $this->_query($query);
-            if($this->isError()) {
-                $buff = new Object();
-                $buff->total_count = 0;
-                $buff->total_page = 0;
-                $buff->page = 1;
-                $buff->data = array();
-
-                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-                return $buff;
-            }
-
-            $virtual_no = $total_count - ($page-1)*$list_count;
-			$data = array();
-            while($tmp = $this->db_fetch_object($result)) {
-                $data[$virtual_no--] = $tmp;
-            }
-            $buff = new Object();
-            $buff->total_count = $total_count;
-            $buff->total_page = $total_page;
-            $buff->page = $page;
-            $buff->data = $data;
-
-            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-            return $buff;
-        }
-
-		function db_insert_id()
-		{
-            return mysql_insert_id($this->fd);
-		}
-
-		function db_fetch_object(&$result)
-		{
-			return mysql_fetch_object($result);
-		}
-    }
-
-return new DBMysql;
-?>
+<?php
+    /**
+     * @class DBMysql
+     * @author NHN (developers@xpressengine.com)
+     * @brief Class to use MySQL DBMS
+     * @version 0.1
+     *
+     * mysql handling class
+     **/
+
+    class DBMysql extends DB {
+
+        /**
+         * @brief Connection information for Mysql DB
+         **/
+        var $prefix   = 'xe_'; // / <prefix of a tablename (One or more XEs can be installed in a single DB)
+        var $comment_syntax = '/* %s */';
+
+        /**
+         * @brief Column type used in MySQL
+         *
+         * Becasue a common column type in schema/query xml is used for colum_type,
+         * it should be replaced properly for each DBMS
+         **/
+        var $column_type = array(
+            'bignumber' => 'bigint',
+            'number' => 'bigint',
+            'varchar' => 'varchar',
+            'char' => 'char',
+            'text' => 'text',
+            'bigtext' => 'longtext',
+            'date' => 'varchar(14)',
+            'float' => 'float',
+        );
+
+        /**
+         * @brief constructor
+         **/
+        function DBMysql() {
+			$this->_setDBInfo();
+            $this->_connect();
+        }
+
+		function create() {
+			return new DBMysql;
+		}
+
+        /**
+         * @brief Return if it is installable
+         **/
+        function isSupported() {
+            if(!function_exists('mysql_connect')) return false;
+            return true;
+        }
+
+        /**
+         * @brief DB Connection
+         **/
+        function __connect($connection) {
+            // Ignore if no DB information exists
+           if (strpos($connection["db_hostname"], ':') === false && $connection["db_port"])
+                $connection["db_hostname"] .= ':' . $connection["db_port"];
+
+            // Attempt to connect
+            $result = @mysql_connect($connection["db_hostname"], $connection["db_userid"], $connection["db_password"]);
+
+            if(mysql_error()) {
+                $this->setError(mysql_errno(), mysql_error());
+                return;
+            }
+            // Error appears if the version is lower than 4.1
+            if(mysql_get_server_info($result)<"4.1") {
+                $this->setError(-1, "XE cannot be installed under the version of mysql 4.1. Current mysql version is ".mysql_get_server_info());
+                return;
+            }
+            // select db
+            @mysql_select_db($connection["db_database"], $result);
+            if(mysql_error()) {
+                $this->setError(mysql_errno(), mysql_error());
+                return;
+            }
+
+            return $result;
+        }
+
+        function _afterConnect($connection){
+            // Set utf8 if a database is MySQL
+            $this->_query("set names 'utf8'", $connection);
+        }
+
+        /**
+         * @brief DB disconnection
+         **/
+        function _close($connection) {
+            @mysql_close($connection);
+        }
+
+        /**
+         * @brief Add quotes on the string variables in a query
+         **/
+        function addQuotes($string) {
+            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            if(!is_numeric($string)) $string = @mysql_real_escape_string($string);
+            return $string;
+        }
+
+        /**
+         * @brief Begin transaction
+         **/
+        function _begin() {
+            return true;
+        }
+
+        /**
+         * @brief Rollback
+         **/
+        function _rollback() {
+            return true;
+        }
+
+        /**
+         * @brief Commits
+         **/
+        function _commit() {
+            return true;
+        }
+
+        /**
+         * @brief : Run a query and fetch the result
+         *
+         * query: run a query and return the result \n
+         * fetch: NULL if no value is returned \n
+         *        array object if rows are returned \n
+         *        object if a row is returned \n
+         *         return\n
+         **/
+        function __query($query, $connection) {
+            // Run the query statement
+            $result = mysql_query($query, $connection);
+            // Error Check
+            if(mysql_error($connection)) $this->setError(mysql_errno($connection), mysql_error($connection));
+            // Return result
+            return $result;
+        }
+
+        /**
+         * @brief Fetch results
+         **/
+        function _fetch($result, $arrayIndexEndValue = NULL) {
+            if(!$this->isConnected() || $this->isError() || !$result) return;
+            while($tmp = $this->db_fetch_object($result)) {
+            	if($arrayIndexEndValue) $output[$arrayIndexEndValue--] = $tmp;
+                else $output[] = $tmp;
+            }
+            if(count($output)==1){
+            	if(isset($arrayIndexEndValue)) return $output;
+            	else return $output[0];
+            }
+            mysql_free_result($result);
+            return $output;
+        }
+
+        /**
+         * @brief Return sequence value incremented by 1(auto_increment is used in sequence table only in MySQL)
+         **/
+        function getNextSequence() {
+            $query = sprintf("insert into `%ssequence` (seq) values ('0')", $this->prefix);
+            $this->_query($query);
+            $sequence = $this->db_insert_id();
+            if($sequence % 10000 == 0) {
+              $query = sprintf("delete from  `%ssequence` where seq < %d", $this->prefix, $sequence);
+              $this->_query($query);
+            }
+
+            return $sequence;
+        }
+
+        /**
+         * @brief Function to obtain mysql old password(mysql only)
+         **/
+        function isValidOldPassword($password, $saved_password) {
+            $query = sprintf("select password('%s') as password, old_password('%s') as old_password", $this->addQuotes($password), $this->addQuotes($password));
+            $result = $this->_query($query);
+            $tmp = $this->_fetch($result);
+            if($tmp->password == $saved_password || $tmp->old_password == $saved_password) return true;
+            return false;
+        }
+
+        /**
+         * @brief Return if a table already exists
+         **/
+        function isTableExists($target_name) {
+            $query = sprintf("show tables like '%s%s'", $this->prefix, $this->addQuotes($target_name));
+            $result = $this->_query($query);
+            $tmp = $this->_fetch($result);
+            if(!$tmp) return false;
+            return true;
+        }
+
+        /**
+         * @brief Add a column to a table
+         **/
+        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
+            $type = $this->column_type[$type];
+            if(strtoupper($type)=='INTEGER') $size = '';
+
+            $query = sprintf("alter table `%s%s` add `%s` ", $this->prefix, $table_name, $column_name);
+            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
+            else $query .= sprintf(" %s ", $type);
+            if($default) $query .= sprintf(" default '%s' ", $default);
+            if($notnull) $query .= " not null ";
+
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Delete a column from a table
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table `%s%s` drop `%s` ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return column information of a table
+         **/
+        function isColumnExists($table_name, $column_name) {
+            $query = sprintf("show fields from `%s%s`", $this->prefix, $table_name);
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $output = $this->_fetch($result);
+            if($output) {
+                $column_name = strtolower($column_name);
+                foreach($output as $key => $val) {
+                    $name = strtolower($val->Field);
+                    if($column_name == $name) return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * @brief Add an index to a table
+         * $target_columns = array(col1, col2)
+         * $is_unique? unique : none
+         **/
+        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
+            if(!is_array($target_columns)) $target_columns = array($target_columns);
+
+            $query = sprintf("alter table `%s%s` add %s index `%s` (%s);", $this->prefix, $table_name, $is_unique?'unique':'', $index_name, implode(',',$target_columns));
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Drop an index from a table
+         **/
+        function dropIndex($table_name, $index_name, $is_unique = false) {
+            $query = sprintf("alter table `%s%s` drop index `%s`", $this->prefix, $table_name, $index_name);
+            $this->_query($query);
+        }
+
+
+        /**
+         * @brief Return index information of a table
+         **/
+        function isIndexExists($table_name, $index_name) {
+            //$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
+            $query = sprintf("show indexes from `%s%s`", $this->prefix, $table_name);
+            $result = $this->_query($query);
+            if($this->isError()) return;
+            $output = $this->_fetch($result);
+            if(!$output) return;
+            if(!is_array($output)) $output = array($output);
+
+            for($i=0;$i<count($output);$i++) {
+                if($output[$i]->Key_name == $index_name) return true;
+            }
+            return false;
+        }
+
+        /**
+         * @brief Create a table by using xml file
+         **/
+        function createTableByXml($xml_doc) {
+            return $this->_createTable($xml_doc);
+        }
+
+        /**
+         * @brief Create a table by using xml file
+         **/
+        function createTableByXmlFile($file_name) {
+            if(!file_exists($file_name)) return;
+            // read xml file
+            $buff = FileHandler::readFile($file_name);
+            return $this->_createTable($buff);
+        }
+
+        /**
+         * @brief generate a query statement to create a table by using schema xml
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+            // Create a table schema
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+            $table_name = $this->prefix.$table_name;
+
+            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+            else $columns = $xml_obj->table->column;
+
+            foreach($columns as $column) {
+                $name = $column->attrs->name;
+                $type = $column->attrs->type;
+                $size = $column->attrs->size;
+                $notnull = $column->attrs->notnull;
+                $primary_key = $column->attrs->primary_key;
+                $index = $column->attrs->index;
+                $unique = $column->attrs->unique;
+                $default = $column->attrs->default;
+                $auto_increment = $column->attrs->auto_increment;
+
+                $column_schema[] = sprintf('`%s` %s%s %s %s %s',
+                    $name,
+                    $this->column_type[$type],
+                    $size?'('.$size.')':'',
+                    isset($default)?"default '".$default."'":'',
+                    $notnull?'not null':'',
+                    $auto_increment?'auto_increment':''
+                );
+
+                if($primary_key) $primary_list[] = $name;
+                else if($unique) $unique_list[$unique][] = $name;
+                else if($index) $index_list[$index][] = $name;
+            }
+
+            if(count($primary_list)) {
+                $column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list,'`,`').'`');
+            }
+
+            if(count($unique_list)) {
+                foreach($unique_list as $key => $val) {
+                    $column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val,'`,`').'`');
+                }
+            }
+
+            if(count($index_list)) {
+                foreach($index_list as $key => $val) {
+                    $column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val,'`,`').'`');
+                }
+            }
+
+            $schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"), "ENGINE = MYISAM  CHARACTER SET utf8 COLLATE utf8_general_ci");
+
+            $output = $this->_query($schema);
+            if(!$output) return false;
+        }
+
+        /**
+         * @brief Handle the insertAct
+         **/
+        function _executeInsertAct($queryObject) {
+            // TODO See what priority does
+			//priority setting
+			//$priority = '';
+			//if($output->priority) $priority = $output->priority['type'].'_priority';
+
+            $query = $this->getInsertSql($queryObject, true, true);
+            if(is_a($query, 'Object')) return;
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle updateAct
+         **/
+        function _executeUpdateAct($queryObject) {
+            // TODO See what proiority does
+			//priority setting
+			//$priority = '';
+			//if($output->priority) $priority = $output->priority['type'].'_priority';
+
+            $query = $this->getUpdateSql($queryObject, true, true);
+            if(is_a($query, 'Object')) return;
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle deleteAct
+         **/
+        function _executeDeleteAct($queryObject) {
+        	$query = $this->getDeleteSql($queryObject, true, true);
+
+        	if(is_a($query, 'Object')) return;
+
+        	//priority setting
+			// TODO Check what priority does
+			//$priority = '';
+			//if($output->priority) $priority = $output->priority['type'].'_priority';
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle selectAct
+         *
+         * In order to get a list of pages easily when selecting \n
+         * it supports a method as navigation
+         **/
+        function _executeSelectAct($queryObject, $connection = null) {
+            $limit = $queryObject->getLimit();
+            if ($limit && $limit->isPageHandler())
+                    return $this->queryPageLimit($queryObject, $result, $connection);
+            else {
+                $query = $this->getSelectSql($queryObject);
+		if(is_a($query, 'Object')) return;
+                    $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
+
+		$result = $this->_query ($query, $connection);
+		if ($this->isError ()) return $this->queryError($queryObject);
+
+                $data = $this->_fetch($result);
+                $buff = new Object ();
+                $buff->data = $data;
+                return $buff;
+            }
+        }
+
+        function db_insert_id()
+        {
+            $connection = $this->_getConnection('master');
+            return mysql_insert_id($connection);
+        }
+
+        function db_fetch_object(&$result)
+        {
+            return mysql_fetch_object($result);
+        }
+
+        function getParser(){
+            return new DBParser('`', '`', $this->prefix);
+        }
+
+        function queryError($queryObject){
+            $limit = $queryObject->getLimit();
+            if ($limit && $limit->isPageHandler()){
+                            $buff = new Object ();
+                            $buff->total_count = 0;
+                            $buff->total_page = 0;
+                            $buff->page = 1;
+                            $buff->data = array ();
+                            $buff->page_navigation = new PageHandler (/*$total_count*/0, /*$total_page*/1, /*$page*/1, /*$page_count*/10);//default page handler values
+                            return $buff;
+                    }else
+                            return;
+        }
+
+        function queryPageLimit($queryObject, $result, $connection){
+            $limit = $queryObject->getLimit();
+            // Total count
+            $temp_where = $queryObject->getWhereString(true, false);
+            $count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '. $temp_where));
+            if ($queryObject->getGroupByString() != '') {
+                    $count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
+            }
+
+            $count_query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+            $result_count = $this->_query($count_query, $connection);
+            $count_output = $this->_fetch($result_count);
+            $total_count = (int)$count_output->count;
+
+            $list_count = $limit->list_count->getValue();
+            if (!$list_count) $list_count = 20;
+            $page_count = $limit->page_count->getValue();
+            if (!$page_count) $page_count = 10;
+            $page = $limit->page->getValue();
+            if (!$page) $page = 1;
+
+            // total pages
+            if ($total_count)
+                    $total_page = (int) (($total_count - 1) / $list_count) + 1;
+            else
+                    $total_page = 1;
+
+            // check the page variables
+            if ($page > $total_page) $page = $total_page;
+            $start_count = ($page - 1) * $list_count;
+
+            $query = $this->getSelectPageSql($queryObject, true, $start_count, $list_count);
+
+            $query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+            $result = $this->_query ($query, $connection);
+            if ($this->isError ())
+                return $this->queryError($queryObject);
+
+            $virtual_no = $total_count - ($page - 1) * $list_count;
+            $data = $this->_fetch($result, $virtual_no);
+
+            $buff = new Object ();
+            $buff->total_count = $total_count;
+            $buff->total_page = $total_page;
+            $buff->page = $page;
+            $buff->data = $data;
+            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+            return $buff;
+        }
+
+        function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {
+            $select = $query->getSelectString($with_values);
+            if($select == '') return new Object(-1, "Invalid query");
+            $select = 'SELECT ' .$select;
+
+            $from = $query->getFromString($with_values);
+            if($from == '') return new Object(-1, "Invalid query");
+            $from = ' FROM '.$from;
+
+            $where = $query->getWhereString($with_values);
+            if($where != '') $where = ' WHERE ' . $where;
+
+            $groupBy = $query->getGroupByString();
+            if($groupBy != '') $groupBy = ' GROUP BY ' . $groupBy;
+
+            $orderBy = $query->getOrderByString();
+            if($orderBy != '') $orderBy = ' ORDER BY ' . $orderBy;
+
+            $limit = $query->getLimitString();
+            if ($limit != '') $limit = sprintf (' LIMIT %d, %d', $start_count, $list_count);
+
+            return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+        }
+    }
+
+return new DBMysql;
+?>
diff --git a/classes/db/DBMysql_innodb.class.php b/classes/db/DBMysql_innodb.class.php
index 7ba8f304a..fb93ae8c2 100644
--- a/classes/db/DBMysql_innodb.class.php
+++ b/classes/db/DBMysql_innodb.class.php
@@ -1,164 +1,152 @@
-<?php
-	require_once('DBMysql.class.php');
-
-    /**
-     * @class DBMysql_innodb
-     * @author NHN (developers@xpressengine.com)
-     * @brief MySQL DBMS를 이용하기 위한 class
-     * @version 0.1
-     *
-     * mysql innodb handling class
-     **/
-
-    class DBMysql_innodb extends DBMysql {
-
-        /**
-         * @brief constructor
-         **/
-        function DBMysql_innodb() {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-		
-		/**
-		 * @brief create an instance of this class
-		 */
-		function create()
-		{
-			return new DBMysql_innodb;
-		}
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if(!$this->isConnected()) return;
-            $this->_query("commit");
-            @mysql_close($this->fd);
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin() {
-            if(!$this->isConnected() || $this->transaction_started) return;
-            $this->transaction_started = true;
-            $this->_query("begin");
-        }
-
-        /**
-         * @brief 롤백
-         **/
-        function rollback() {
-            if(!$this->isConnected() || !$this->transaction_started) return;
-            $this->_query("rollback");
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 커밋
-         **/
-        function commit($force = false) {
-            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
-            $this->_query("commit");
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query) {
-            if(!$this->isConnected()) return;
-
-            // 쿼리 시작을 알림
-            $this->actStart($query);
-
-            // 쿼리 문 실행
-            $result = @mysql_query($query, $this->fd);
-
-            // 오류 체크
-            if(mysql_error($this->fd)) $this->setError(mysql_errno($this->fd), mysql_error($this->fd));
-
-            // 쿼리 실행 종료를 알림
-            $this->actFinish();
-
-            // 결과 리턴
-            return $result;
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create table query생성
-         *
-         * type : number, varchar, text, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable($xml_doc) {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-            if($this->isTableExists($table_name)) return;
-            $table_name = $this->prefix.$table_name;
-
-            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
-            else $columns = $xml_obj->table->column;
-
-            foreach($columns as $column) {
-                $name = $column->attrs->name;
-                $type = $column->attrs->type;
-                $size = $column->attrs->size;
-                $notnull = $column->attrs->notnull;
-                $primary_key = $column->attrs->primary_key;
-                $index = $column->attrs->index;
-                $unique = $column->attrs->unique;
-                $default = $column->attrs->default;
-                $auto_increment = $column->attrs->auto_increment;
-
-                $column_schema[] = sprintf('`%s` %s%s %s %s %s',
-                $name,
-                $this->column_type[$type],
-                $size?'('.$size.')':'',
-                isset($default)?"default '".$default."'":'',
-                $notnull?'not null':'',
-                $auto_increment?'auto_increment':''
-                );
-
-                if($primary_key) $primary_list[] = $name;
-                else if($unique) $unique_list[$unique][] = $name;
-                else if($index) $index_list[$index][] = $name;
-            }
-
-            if(count($primary_list)) {
-                $column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list,'`,`').'`');
-            }
-
-            if(count($unique_list)) {
-                foreach($unique_list as $key => $val) {
-                    $column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val,'`,`').'`');
-                }
-            }
-
-            if(count($index_list)) {
-                foreach($index_list as $key => $val) {
-                    $column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val,'`,`').'`');
-                }
-            }
-
-            $schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
-
-            $output = $this->_query($schema);
-            if(!$output) return false;
-        }
-    }
-
-return new DBMysql_innodb;
-?>
+<?php
+	require_once('DBMysql.class.php');
+
+    /**
+     * @class DBMysql_innodb
+     * @author NHN (developers@xpressengine.com)
+     * @brief class to use MySQL DBMS
+     * @version 0.1
+     *
+     * mysql innodb handling class
+     **/
+
+    class DBMysql_innodb extends DBMysql {
+
+        /**
+         * @brief constructor
+         **/
+        function DBMysql_innodb() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+
+		/**
+		 * @brief create an instance of this class
+		 */
+		function create()
+		{
+			return new DBMysql_innodb;
+		}
+
+        /**
+         * @brief DB disconnection
+         **/
+        function _close($connection) {
+            $this->_query("commit", $connection);
+            @mysql_close($connection);
+        }
+
+        /**
+         * @brief Begin transaction
+         **/
+        function _begin() {
+            $connection = $this->_getConnection('master');
+            $this->_query("begin", $connection);
+            return true;
+        }
+
+        /**
+         * @brief Rollback
+         **/
+        function _rollback() {
+            $connection = $this->_getConnection('master');
+            $this->_query("rollback", $connection);
+            return true;
+        }
+
+        /**
+         * @brief Commits
+         **/
+        function _commit() {
+            $connection = $this->_getConnection('master');
+            $this->_query("commit", $connection);
+            return true;
+        }
+
+        /**
+         * @brief : Run a query and fetch the result
+         *
+         * query: run a query and return the result \n
+         * fetch: NULL if no value is returned \n
+         *        array object if rows are returned \n
+         *        object if a row is returned \n
+         *         return\n
+         **/
+        function __query($query, $connection) {
+            // Run the query statement
+            $result = @mysql_query($query, $connection);
+            // Error Check
+            if(mysql_error($connection)) $this->setError(mysql_errno($connection), mysql_error($connection));
+            // Return result
+            return $result;
+        }
+
+        /**
+         * @brief generate a query statement to create a table by using schema xml
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+            // Create a table schema
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+            $table_name = $this->prefix.$table_name;
+
+            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+            else $columns = $xml_obj->table->column;
+
+            foreach($columns as $column) {
+                $name = $column->attrs->name;
+                $type = $column->attrs->type;
+                $size = $column->attrs->size;
+                $notnull = $column->attrs->notnull;
+                $primary_key = $column->attrs->primary_key;
+                $index = $column->attrs->index;
+                $unique = $column->attrs->unique;
+                $default = $column->attrs->default;
+                $auto_increment = $column->attrs->auto_increment;
+
+                $column_schema[] = sprintf('`%s` %s%s %s %s %s',
+                $name,
+                $this->column_type[$type],
+                $size?'('.$size.')':'',
+                isset($default)?"default '".$default."'":'',
+                $notnull?'not null':'',
+                $auto_increment?'auto_increment':''
+                );
+
+                if($primary_key) $primary_list[] = $name;
+                else if($unique) $unique_list[$unique][] = $name;
+                else if($index) $index_list[$index][] = $name;
+            }
+
+            if(count($primary_list)) {
+                $column_schema[] = sprintf("primary key (%s)", '`'.implode($primary_list,'`,`').'`');
+            }
+
+            if(count($unique_list)) {
+                foreach($unique_list as $key => $val) {
+                    $column_schema[] = sprintf("unique %s (%s)", $key, '`'.implode($val,'`,`').'`');
+                }
+            }
+
+            if(count($index_list)) {
+                foreach($index_list as $key => $val) {
+                    $column_schema[] = sprintf("index %s (%s)", $key, '`'.implode($val,'`,`').'`');
+                }
+            }
+
+            $schema = sprintf('create table `%s` (%s%s) %s;', $this->addQuotes($table_name), "\n", implode($column_schema,",\n"), "ENGINE = INNODB CHARACTER SET utf8 COLLATE utf8_general_ci");
+
+            $output = $this->_query($schema);
+            if(!$output) return false;
+        }
+    }
+
+return new DBMysql_innodb;
+?>
diff --git a/classes/db/DBMysqli.class.php b/classes/db/DBMysqli.class.php
index 4ccaf3c41..933fd8c60 100644
--- a/classes/db/DBMysqli.class.php
+++ b/classes/db/DBMysqli.class.php
@@ -1,123 +1,118 @@
-<?php
-	require_once('DBMysql.class.php');
-    /**
-     * @class DBMysqli
-     * @author NHN (developers@xpressengine.com)
-     * @brief MySQL DBMS를 mysqli_* 로 이용하기 위한 class
-     * @version 0.1
-     *
-     * mysql handling class
-     **/
-	
-
-    class DBMysqli extends DBMysql {
-
-        /**
-         * @brief constructor
-         **/
-        function DBMysqli() {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported() {
-            if(!function_exists('mysqli_connect')) return false;
-            return true;
-        }
-		
-		/**
-		 * @brief create an instance of this class
-		 */
-		function create()
-		{
-			return new DBMysqli;
-		}
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // db 정보가 없으면 무시
-            if(!$this->hostname || !$this->userid || !$this->password || !$this->database) return;
-
-            // 접속시도
-			if($this->port){
-	            $this->fd = @mysqli_connect($this->hostname, $this->userid, $this->password, $this->database, $this->port);
-			}else{
-	            $this->fd = @mysqli_connect($this->hostname, $this->userid, $this->password, $this->database);
-			}
-			$error = mysqli_connect_errno();
-            if($error) {
-                $this->setError($error,mysqli_connect_error());
-                return;
-            }
-			mysqli_set_charset($this->fd,'utf8');
-
-            // 접속체크
-            $this->is_connected = true;
-			$this->password = md5($this->password);
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if(!$this->isConnected()) return;
-            mysqli_close($this->fd);
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string) {
-            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-            if(!is_numeric($string)) $string = mysqli_escape_string($this->fd,$string);
-            return $string;
-        }
-
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query) {
-            if(!$this->isConnected()) return;
-
-            // 쿼리 시작을 알림
-            $this->actStart($query);
-
-            // 쿼리 문 실행
-            $result = mysqli_query($this->fd,$query);
-            // 오류 체크
-			$error = mysqli_error($this->fd);
-            if($error){
-				$this->setError(mysqli_errno($this->fd), $error);
-			}
-
-            // 쿼리 실행 종료를 알림
-            $this->actFinish();
-
-            // 결과 리턴
-            return $result;
-        }
-
-		function db_insert_id()
-		{
-            return  mysqli_insert_id($this->fd);
-		}
-
-		function db_fetch_object(&$result)
-		{
-			return mysqli_fetch_object($result);
-		}
-    }
-
-return new DBMysqli;
-?>
+<?php
+	require_once('DBMysql.class.php');
+    /**
+     * @class DBMysqli
+     * @author NHN (developers@xpressengine.com)
+     * @brief Class to use MySQL DBMS as mysqli_*
+     * @version 0.1
+     *
+     * mysql handling class
+     **/
+
+
+    class DBMysqli extends DBMysql {
+
+        /**
+         * @brief constructor
+         **/
+        function DBMysqli() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+
+        /**
+         * @brief Return if it is installable
+         **/
+        function isSupported() {
+            if(!function_exists('mysqli_connect')) return false;
+            return true;
+        }
+
+		/**
+		 * @brief create an instance of this class
+		 */
+		function create()
+		{
+			return new DBMysqli;
+		}
+
+        /**
+         * @brief DB Connection
+         **/
+        function __connect($connection) {
+            // Attempt to connect
+            if ($connection["db_port"]) {
+                $result = @mysqli_connect($connection["db_hostname"]
+                                                        , $connection["db_userid"]
+                                                        , $connection["db_password"]
+                                                        , $connection["db_database"]
+                                                        , $connection["db_port"]);
+            } else {
+                $result = @mysqli_connect($connection["db_hostname"]
+                                                        , $connection["db_userid"]
+                                                        , $connection["db_password"]
+                                                        , $connection["db_database"]);
+            }
+			$error = mysqli_connect_errno();
+            if($error) {
+                $this->setError($error,mysqli_connect_error());
+                return;
+            }
+            mysqli_set_charset($result,'utf8');
+            return $result;
+        }
+
+        /**
+         * @brief DB disconnection
+         **/
+        function _close($connection) {
+            mysqli_close($connection);
+        }
+
+        /**
+         * @brief Add quotes on the string variables in a query
+         **/
+        function addQuotes($string) {
+            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            if(!is_numeric($string)){
+                $connection = $this->_getConnection('master');
+                $string = mysqli_escape_string($connection,$string);
+            }
+            return $string;
+        }
+
+        /**
+         * @brief : Run a query and fetch the result
+         *
+         * query: run a query and return the result \n
+         * fetch: NULL if no value is returned \n
+         *        array object if rows are returned \n
+         *        object if a row is returned \n
+         *         return\n
+         **/
+        function __query($query, $connection) {
+            // Run the query statement
+            $result = mysqli_query($connection,$query);
+            // Error Check
+			$error = mysqli_error($connection);
+            if($error){
+				$this->setError(mysqli_errno($connection), $error);
+			}
+            // Return result
+            return $result;
+        }
+
+		function db_insert_id()
+		{
+                    $connection = $this->_getConnection('master');
+            return  mysqli_insert_id($connection);
+		}
+
+		function db_fetch_object(&$result)
+		{
+			return mysqli_fetch_object($result);
+		}
+    }
+
+return new DBMysqli;
+?>
diff --git a/classes/db/DBPostgresql.class.php b/classes/db/DBPostgresql.class.php
index 88264e9c6..b108c6571 100644
--- a/classes/db/DBPostgresql.class.php
+++ b/classes/db/DBPostgresql.class.php
@@ -2,43 +2,39 @@
 /**
  * @class DBPostgreSQL
  * @author ioseph (ioseph@postgresql.kr) updated by yoonjong.joh@gmail.com
- * @brief MySQL DBMS를 이용하기 위한 class
+ * @brief Class to use PostgreSQL DBMS
  * @version 0.2
  *
  * postgresql handling class
- * 2009.02.10  update 와 delete query를 실행할때 table 이름에 alias 사용하는 것을 없앰. 지원 안함
- *             order by clause를 실행할때 함수를 실행 하는 부분을 column alias로 대체.
- * 2009.02.11  dropColumn() function이 추가  
- * 2009.02.13  addColumn() 함수 변경
+ * 2009.02.10 update and delete query for the table name at runtime, eliminating the alias to use. Not Supported
+ * when running order by clause column alias to run a function to replace parts.
+ * 2009.02.11 dropColumn() function added
+ * 2009.02.13 addColumn() function changes
  **/
 
 class DBPostgresql extends DB
 {
 
     /**
-     * @brief PostgreSQL DB에 접속하기 위한 정보
+     * @brief Connection information for PostgreSQL DB
      **/
-    var $hostname = '127.0.0.1'; ///< hostname
-    var $userid = null; ///< user id
-    var $password = null; ///< password
-    var $database = null; ///< database
-    var $prefix = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE설치 가능)
-	var $comment_syntax = '/* %s */';
+    var $prefix = 'xe'; // / <prefix of a tablename (One or more XEs can be installed in a single DB)
+    var $comment_syntax = '/* %s */';
 
     /**
-     * @brief postgresql에서 사용될 column type
+     * @brief column type used in postgresql
      *
-     * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-     * 각 DBMS에 맞게 replace 해주어야 한다
+     * Becasue a common column type in schema/query xml is used for colum_type,
+     * it should be replaced properly for each DBMS
      **/
     var $column_type = array(
-        'bignumber' => 'bigint', 
+        'bignumber' => 'bigint',
         'number' => 'integer',
-        'varchar' => 'varchar', 
-        'char' => 'char', 
-        'text' => 'text', 
+        'varchar' => 'varchar',
+        'char' => 'char',
+        'text' => 'text',
         'bigtext' => 'text',
-        'date' => 'varchar(14)', 
+        'date' => 'varchar(14)',
         'float' => 'real',
     );
 
@@ -50,7 +46,7 @@ class DBPostgresql extends DB
         $this->_setDBInfo();
         $this->_connect();
     }
-	
+
 	/**
 	 * @brief create an instance of this class
 	 */
@@ -60,7 +56,7 @@ class DBPostgresql extends DB
 	}
 
     /**
-     * @brief 설치 가능 여부를 return
+     * @brief Return if it is installable
      **/
     function isSupported()
     {
@@ -70,66 +66,38 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief DB정보 설정 및 connect/ close
+     * @brief DB Connection
      **/
-    function _setDBInfo()
+    function __connect($connection)
     {
-        $db_info = Context::getDBInfo();
-        $this->hostname = $db_info->db_hostname;
-        $this->port = $db_info->db_port;
-        $this->userid = $db_info->db_userid;
-        $this->password = $db_info->db_password;
-        $this->database = $db_info->db_database;
-        $this->prefix = $db_info->db_table_prefix;
-        if (!substr($this->prefix, -1) != '_')
-            $this->prefix .= '_';
-    }
-
-    /**
-     * @brief DB 접속
-     **/
-    function _connect()
-    {
-        // pg용 connection string
+        // the connection string for PG
         $conn_string = "";
+        // Create connection string
+        $conn_string .= ($connection["db_hostname"]) ? ' host='.$connection["db_hostname"] : "";
+        $conn_string .= ($connection["db_userid"]) ? " user=" . $connection["db_userid"] : "";
+        $conn_string .= ($connection["db_password"]) ? " password=" . $connection["db_password"] : "";
+        $conn_string .= ($connection["db_database"]) ? " dbname=" . $connection["db_database"] : "";
+        $conn_string .= ($connection["db_port"]) ? " port=" . $connection["db_port"] : "";
 
-        // db 정보가 없으면 무시
-        if (!$this->hostname || !$this->userid || !$this->database)
-            return;
-
-        // connection string 만들기
-        $conn_string .= ($this->hostname) ? " host=$this->hostname" : "";
-        $conn_string .= ($this->userid) ? " user=$this->userid" : "";
-        $conn_string .= ($this->password) ? " password=$this->password" : "";
-        $conn_string .= ($this->database) ? " dbname=$this->database" : "";
-        $conn_string .= ($this->port) ? " port=$this->port" : "";
-
-        // 접속시도
-        $this->fd = @pg_connect($conn_string);
-        if (!$this->fd || pg_connection_status($this->fd) != PGSQL_CONNECTION_OK) {
+        // Attempt to connect
+        $result = @pg_connect($conn_string);
+        if (!$result || pg_connection_status($result) != PGSQL_CONNECTION_OK) {
             $this->setError(-1, "CONNECTION FAILURE");
             return;
         }
-
-        // 접속체크
-        $this->is_connected = true;
-		$this->password = md5($this->password);
-        // utf8임을 지정
-        //$this ->_query('set client_encoding to uhc');
+        return $result;
     }
 
     /**
-     * @brief DB접속 해제
+     * @brief DB disconnection
      **/
-    function close()
+    function _close($connection)
     {
-        if (!$this->isConnected())
-            return;
-        @pg_close($this->fd);
+        @pg_close($connection);
     }
 
     /**
-     * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
+     * @brief Add quotes on the string variables in a query
      **/
     function addQuotes($string)
     {
@@ -141,48 +109,43 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief 트랜잭션 시작
+     * @brief Begin transaction
      **/
-    function begin()
+    function _begin()
     {
-        if (!$this->isConnected() || $this->transaction_started == false)
-            return;
-        if ($this->_query($this->fd, 'BEGIN'))
-            $this->transaction_started = true;
+        $connection = $this->_getConnection('master');
+        if (!$this->_query('BEGIN')) return false;
+        return true;
     }
 
     /**
-     * @brief 롤백
+     * @brief Rollback
      **/
-    function rollback()
+    function _rollback()
     {
-        if (!$this->isConnected() || $this->transaction_started == false)
-            return;
-        if ($this->_query($this->fd, 'ROLLBACK'))
-            $this->transaction_started = false;
+        if (!$this->_query('ROLLBACK')) return false;
+        return true;
     }
 
     /**
-     * @brief 커밋
+     * @brief Commits
      **/
-    function commit()
+    function _commit()
     {
-        if (!$this->isConnected() || $this->transaction_started == false)
-            return;
-        if ($this->_query($this->fd, 'COMMIT'))
-            $this->transaction_started = false;
+        if (!$this->_query('COMMIT')) return false;
+        return true;
     }
 
     /**
-     * @brief : 쿼리문의 실행 및 결과의 fetch 처리
+     * @brief : Run a query and fetch the result
      *
-     * query : query문 실행하고 result return\n
-     * fetch : reutrn 된 값이 없으면 NULL\n
-     *         rows이면 array object\n
-     *         row이면 object\n
+     * query: run a query and return the result \n
+     * fetch: NULL if no value is returned \n
+     *        array object if rows are returned \n
+     *        object if a row is returned \n
      *         return\n
      **/
-    function _query($query)
+    function __query($query, $connection)
     {
         if (!$this->isConnected())
             return;
@@ -198,58 +161,53 @@ class DBPostgresql extends DB
         $query = implode(" ",$l_query_array);
         }
         }
-        else if ($l_query_array[0] = "delete") 
+        else if ($l_query_array[0] = "delete")
         {
         if (strtolower($l_query_array[3]) == "as")
         {
         $l_query_array[3] = "";
-        $l_query_array[4] = "";            
+        $l_query_array[4] = "";
         $query = implode(" ",$l_query_array);
         }
         }
         */
-
-        // 쿼리 시작을 알림
-        $this->actStart($query);
-        $arr = array('Hello', 'World!', 'Beautiful', 'Day!');
-
-
-        // 쿼리 문 실행
-        $result = @pg_query($this->fd, $query);
-
-        // 오류 체크
+        // Notify to start a query execution
+        // $arr = array('Hello', 'World!', 'Beautiful', 'Day!');
+        // Run the query statement
+        $result = @pg_query($connection, $query);
+        // Error Check
         if (!$result) {
             //              var_dump($l_query_array);
             //var_dump($query);
             //die("\nin query statement\n");
             //var_dump(debug_backtrace());
-            $this->setError(1, pg_last_error($this->fd));
+            $this->setError(1, pg_last_error($connection));
         }
-
-        // 쿼리 실행 종료를 알림
-        $this->actFinish();
-
-        // 결과 리턴
+        // Return result
         return $result;
     }
 
     /**
-     * @brief 결과를 fetch
+     * @brief Fetch results
      **/
-    function _fetch($result)
+    // TODO This is duplicate code - maybe we can find away to abastract the driver
+    function _fetch($result, $arrayIndexEndValue = NULL)
     {
         if (!$this->isConnected() || $this->isError() || !$result)
             return;
         while ($tmp = pg_fetch_object($result)) {
-            $output[] = $tmp;
+            if($arrayIndexEndValue) $output[$arrayIndexEndValue--] = $tmp;
+            else $output[] = $tmp;
+        }
+        if(count($output)==1){
+          	if(isset($arrayIndexEndValue)) return $output;
+            else return $output[0];
         }
-        if (count($output) == 1)
-            return $output[0];
         return $output;
     }
 
     /**
-     * @brief 1씩 증가되는 sequence값을 return (postgresql의 auto_increment는 sequence테이블에서만 사용)
+     * @brief Return sequence value incremented by 1(in postgresql, auto_increment is used in the sequence table only)
      **/
     function getNextSequence()
     {
@@ -260,7 +218,7 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief 테이블 기생성 여부 return
+     * @brief Return if a table already exists
      **/
     function isTableExists($target_name)
     {
@@ -277,7 +235,7 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief 특정 테이블에 특정 column 추가
+     * @brief Add a column to a table
      **/
     function addColumn($table_name, $column_name, $type = 'number', $size = '', $default =
         NULL, $notnull = false)
@@ -301,7 +259,7 @@ class DBPostgresql extends DB
         }
         if ($notnull) {
             $query = sprintf("update %s%s set %s  = %s ", $this->prefix, $table_name, $column_name, $default);
-            $this->_query($query);              
+            $this->_query($query);
             $query = sprintf("alter table %s%s alter %s  set not null ", $this->prefix, $table_name, $column_name);
             $this->_query($query);
         }
@@ -309,7 +267,7 @@ class DBPostgresql extends DB
 
 
     /**
-     * @brief 특정 테이블의 column의 정보를 return
+     * @brief Return column information of a table
      **/
     function isColumnExists($table_name, $column_name)
     {
@@ -329,7 +287,7 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief 특정 테이블에 특정 인덱스 추가
+     * @brief Add an index to a table
      * $target_columns = array(col1, col2)
      * $is_unique? unique : none
      **/
@@ -340,8 +298,7 @@ class DBPostgresql extends DB
 
         if (strpos($table_name, $this->prefix) === false)
             $table_name = $this->prefix . $table_name;
-
-        // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
+        // Use a tablename before an index name to avoid defining the same index
         $index_name = $table_name . $index_name;
 
         $query = sprintf("create %s index %s on %s (%s);", $is_unique ? 'unique' : '', $index_name,
@@ -350,7 +307,7 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief 특정 테이블에 특정 column 제거
+     * @brief Delete a column from a table
      **/
     function dropColumn($table_name, $column_name)
     {
@@ -359,14 +316,13 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief 특정 테이블의 특정 인덱스 삭제
+     * @brief Drop an index from a table
      **/
     function dropIndex($table_name, $index_name, $is_unique = false)
     {
         if (strpos($table_name, $this->prefix) === false)
             $table_name = $this->prefix . $table_name;
-
-        // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
+        // Use a tablename before an index name to avoid defining the same index
         $index_name = $table_name . $index_name;
 
         $query = sprintf("drop index %s", $index_name);
@@ -375,14 +331,13 @@ class DBPostgresql extends DB
 
 
     /**
-     * @brief 특정 테이블의 index 정보를 return
+     * @brief Return index information of a table
      **/
     function isIndexExists($table_name, $index_name)
     {
         if (strpos($table_name, $this->prefix) === false)
             $table_name = $this->prefix . $table_name;
-
-        // index_name의 경우 앞에 table이름을 붙여줘서 중복을 피함
+        // Use a tablename before an index name to avoid defining the same index
         $index_name = $table_name . $index_name;
 
         //$query = sprintf("show indexes from %s%s where key_name = '%s' ", $this->prefix, $table_name, $index_name);
@@ -402,7 +357,7 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief xml 을 받아서 테이블을 생성
+     * @brief Create a table by using xml file
      **/
     function createTableByXml($xml_doc)
     {
@@ -410,19 +365,19 @@ class DBPostgresql extends DB
     }
 
     /**
-     * @brief xml 을 받아서 테이블을 생성
+     * @brief Create a table by using xml file
      **/
     function createTableByXmlFile($file_name)
     {
         if (!file_exists($file_name))
             return;
-        // xml 파일을 읽음
+        // read xml file
         $buff = FileHandler::readFile($file_name);
         return $this->_createTable($buff);
     }
 
     /**
-     * @brief schema xml을 이용하여 create table query생성
+     * @brief generate a query statement to create a table by using schema xml
      *
      * type : number, varchar, text, char, date, \n
      * opt : notnull, default, size\n
@@ -433,8 +388,7 @@ class DBPostgresql extends DB
         // xml parsing
         $oXml = new XmlParser();
         $xml_obj = $oXml->parse($xml_doc);
-
-        // 테이블 생성 schema 작성
+        // Create a table schema
         $table_name = $xml_obj->table->attrs->name;
 
         if ($table_name == 'sequence') {
@@ -507,434 +461,140 @@ class DBPostgresql extends DB
 
     }
 
-    /**
-     * @brief 조건문 작성하여 return
-     **/
-    function getCondition($output)
-    {
-        if (!$output->conditions)
-            return;
-        $condition = $this->_getCondition($output->conditions, $output->column_type);
-        if ($condition)
-            $condition = ' where ' . $condition;
-        return $condition;
-    }
-
-    function getLeftCondition($conditions, $column_type)
-    {
-        return $this->_getCondition($conditions, $column_type);
-    }
-
-
-    function _getCondition($conditions, $column_type)
-    {
-        $condition = '';
-        foreach ($conditions as $val) {
-            $sub_condition = '';
-            foreach ($val['condition'] as $v) {
-                if (!isset($v['value']))
-                    continue;
-                if ($v['value'] === '')
-                    continue;
-                if(!in_array(gettype($v['value']), array('string', 'integer', 'double', 'array'))) continue;
-                    continue;
-
-                $name = $v['column'];
-                $operation = $v['operation'];
-                $value = $v['value'];
-                $type = $this->getColumnType($column_type, $name);
-                $pipe = $v['pipe'];
-
-                $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                if (!$value)
-                    $value = $v['value'];
-                $str = $this->getConditionPart($name, $value, $operation);
-                if ($sub_condition)
-                    $sub_condition .= ' ' . $pipe . ' ';
-                $sub_condition .= $str;
-            }
-            if ($sub_condition) {
-                if ($condition && $val['pipe'])
-                    $condition .= ' ' . $val['pipe'] . ' ';
-                $condition .= '(' . $sub_condition . ')';
-            }
-        }
-        return $condition;
-    }
-
 
     /**
-     * @brief insertAct 처리
+     * @brief Handle the insertAct
      **/
-    function _executeInsertAct($output)
+    function _executeInsertAct($queryObject)
     {
-        // 테이블 정리
-        foreach ($output->tables as $key => $val) {
-            $table_list[] = $this->prefix . $val;
-        }
-
-        // 컬럼 정리
-        foreach ($output->columns as $key => $val) {
-            $name = $val['name'];
-            $value = $val['value'];
-            if ($output->column_type[$name] != 'number') {
-                $value = "'" . $this->addQuotes($value) . "'";
-                if (!$value)
-                    $value = 'null';
-            }
-			// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
-			// elseif (!$value || is_numeric($value)) $value = (int)$value;
-			else $this->_filterNumber(&$value);
-
-            $column_list[] = $name;
-            $value_list[] = $value;
-        }
-
-        $query = sprintf("insert into %s (%s) values (%s);", implode(',', $table_list),
-            implode(',', $column_list), implode(',', $value_list));
-        return $this->_query($query);
-    }
-
-    /**
-     * @brief updateAct 처리
-     **/
-    function _executeUpdateAct($output)
-    {
-        // 테이블 정리
-        foreach ($output->tables as $key => $val) {
-            //$table_list[] = $this->prefix.$val.' as '.$key;
-            $table_list[] = $this->prefix . $val;
-        }
-
-        // 컬럼 정리
-        foreach ($output->columns as $key => $val) {
-            if (!isset($val['value']))
-                continue;
-            $name = $val['name'];
-            $value = $val['value'];
-            if (strpos($name, '.') !== false && strpos($value, '.') !== false)
-                $column_list[] = $name . ' = ' . $value;
-            else {
-                if ($output->column_type[$name] != 'number')
-                    $value = "'" . $this->addQuotes($value) . "'";
-				// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
-				else $this->_filterNumber(&$value);
-
-                $column_list[] = sprintf("%s = %s", $name, $value);
-            }
-        }
-
-        // 조건절 정리
-        $condition = $this->getCondition($output);
-
-        $query = sprintf("update %s set %s %s", implode(',', $table_list), implode(',',
-            $column_list), $condition);
+        $query = $this->getInsertSql($queryObject);
+        if(is_a($query, 'Object')) return;
 
         return $this->_query($query);
     }
 
     /**
-     * @brief deleteAct 처리
+     * @brief Handle updateAct
      **/
-    function _executeDeleteAct($output)
+    function _executeUpdateAct($queryObject)
     {
-        // 테이블 정리
-        foreach ($output->tables as $key => $val) {
-            $table_list[] = $this->prefix . $val;
-        }
-
-        // 조건절 정리
-        $condition = $this->getCondition($output);
-
-        $query = sprintf("delete from %s %s", implode(',', $table_list), $condition);
-
+        $query = $this->getUpdateSql($queryObject);
+        if(is_a($query, 'Object')) return;
+        return $this->_query($query);
+    }
+
+    /**
+     * @brief Handle deleteAct
+     **/
+    function _executeDeleteAct($queryObject)
+    {
+        $query = $this->getDeleteSql($queryObject);
+
+      	if(is_a($query, 'Object')) return;
         return $this->_query($query);
     }
 
     /**
-     * @brief selectAct 처리
      *
-     * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-     * navigation이라는 method를 제공
+     * override
+     * @param $queryObject
+     */
+    function getSelectSql($query){
+		$select = $query->getSelectString();
+		if($select == '') return new Object(-1, "Invalid query");
+		$select = 'SELECT ' .$select;
+
+		$from = $query->getFromString();
+		if($from == '') return new Object(-1, "Invalid query");
+		$from = ' FROM '.$from;
+
+		$where = $query->getWhereString();
+		if($where != '') $where = ' WHERE ' . $where;
+
+		$groupBy = $query->getGroupByString();
+		if($groupBy != '') $groupBy = ' GROUP BY ' . $groupBy;
+
+		$orderBy = $query->getOrderByString();
+		if($orderBy != '') $orderBy = ' ORDER BY ' . $orderBy;
+
+	 	$limit = $query->getLimitString();
+                $limitObject = $query->getLimit();
+	 	if($limit != '') $limit = ' LIMIT ' . $limitObject->getLimit() . ' OFFSET ' . $limitObject->getOffset();
+
+	 	return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+    }
+
+    /**
+     * @brief Handle selectAct
+     *
+     * In order to get a list of pages easily when selecting \n
+     * it supports a method as navigation
      **/
-    function _executeSelectAct($output)
+    function _executeSelectAct($queryObject, $connection)
     {
-        // 테이블 정리
-        $table_list = array();
-        foreach ($output->tables as $key => $val) {
-            $table_list[] = $this->prefix . $val . ' as ' . $key;
-        }
+		$query = $this->getSelectSql($queryObject);
 
-        $left_join = array();
-        // why???
-        $left_tables = (array )$output->left_tables;
+			if(is_a($query, 'Object')) return;
 
-        foreach ($left_tables as $key => $val) {
-            $condition = $this->_getCondition($output->left_conditions[$key], $output->
-                column_type);
-            if ($condition) {
-                $left_join[] = $val . ' ' . $this->prefix . $output->_tables[$key] . ' as ' . $key .
-                    ' on (' . $condition . ')';
-            }
-        }
+			$query .= (__DEBUG_QUERY__&1 && $queryObject->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
 
-		$click_count = array();
-		if(!$output->columns){
-			$output->columns = array(array('name'=>'*'));
-		}
+            // TODO Add support for click count
+            // TODO Add code for pagination
 
-		$column_list = array();
-		foreach ($output->columns as $key => $val) {
-			$name = $val['name'];
-			$alias = $val['alias'];
-			if($val['click_count']) $click_count[] = $val['name'];
-
-			if (substr($name, -1) == '*') {
-				$column_list[] = $name;
-			} elseif (strpos($name, '.') === false && strpos($name, '(') === false) {
-				if ($alias)
-					$column_list[$alias] = sprintf('%s as %s', $name, $alias);
-				else
-					$column_list[] = sprintf('%s', $name);
-			} else {
-				if ($alias)
-					$column_list[$alias] = sprintf('%s as %s', $name, $alias);
-				else
-					$column_list[] = sprintf('%s', $name);
+			$result = $this->_query ($query, $connection);
+			if ($this->isError ()) {
+				if ($limit && $output->limit->isPageHandler()){
+					$buff = new Object ();
+					$buff->total_count = 0;
+					$buff->total_page = 0;
+					$buff->page = 1;
+					$buff->data = array ();
+					$buff->page_navigation = new PageHandler (/*$total_count*/0, /*$total_page*/1, /*$page*/1, /*$page_count*/10);//default page handler values
+					return $buff;
+				}else
+					return;
 			}
-		}
-		$columns = implode(',', $column_list);
 
-        $condition = $this->getCondition($output);
+                        $limit = $queryObject->getLimit();
+		 	if ($limit && $limit->isPageHandler()) {
+		 		// Total count
+				$temp_where = $queryObject->getWhereString(true, false);
+		 		$count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE '. $temp_where));
+				if ($queryObject->getGroupByString() != '') {
+					$count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
+				}
 
-		$output->column_list = $column_list;
-        if ($output->list_count && $output->page)
-            return $this->_getNavigationData($table_list, $columns, $left_join, $condition,
-                $output);
+				$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf (' '.$this->comment_syntax, $this->query_id):'';
+				$result_count = $this->_query($count_query, $connection);
+				$count_output = $this->_fetch($result_count);
+				$total_count = (int)$count_output->count;
 
-        // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-        if ($output->order) {
-            $conditions = $this->getConditionList($output);
-            if (!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                foreach ($output->order as $key => $val) {
-                    $col = $val[0];
-                    if (!in_array($col, array('list_order', 'update_order')))
-                        continue;
-                    if ($condition)
-                        $condition .= sprintf(' and %s < 2100000000 ', $col);
-                    else
-                        $condition = sprintf(' where %s < 2100000000 ', $col);
-                }
-            }
-        }
+				// Total pages
+				if ($total_count) {
+					$total_page = (int) (($total_count - 1) / $limit->list_count) + 1;
+				}	else	$total_page = 1;
 
 
-        if (count($output->groups)) {
-            /*
-            var_dump("= column output start = ");
-            var_dump(sizeof ($output->columns) . " = end length == ");
-            var_dump($output->columns);
-            var_dump("= column output end = " . "\n");
-            var_dump($output->groups);
-            var_dump("=== " . "\n");
-            var_dump(debug_backtrace());
-            
-            foreach($output->columns as $key => $val) {
-            $name = $val['name'];
-            $alias = $val['alias'];
-            } */
-            $group_list = array();
-            foreach ($output->groups as $gkey => $gval) {
-                foreach ($output->columns as $key => $val) {
-                    $name = $val['name'];
-                    $alias = $val['alias'];
-                    if (trim($name) == trim($gval)) {
-                        $group_list[] = $alias;
-                        break;
-                    }
-                }
+		 		$virtual_no = $total_count - ($limit->page - 1) * $limit->list_count;
+		 		$data = $this->_fetch($result, $virtual_no);
 
-				if($column_list[$gval]) $output->arg_columns[] = $column_list[$gval];
+		 		$buff = new Object ();
+				$buff->total_count = $total_count;
+				$buff->total_page = $total_page;
+				$buff->page = $limit->page->getValue();
+				$buff->data = $data;
+				$buff->page_navigation = new PageHandler($total_count, $total_page, $limit->page->getValue(), $limit->page_count);
+			}else{
+				$data = $this->_fetch($result);
+				$buff = new Object ();
+				$buff->data = $data;
+			}
 
-            }
-            $groupby_query = sprintf(' group by %s', implode(',', $group_list));
-            //             var_dump($query);
-        }
-
-        if ($output->order) {
-            foreach ($output->order as $key => $val) {
-                $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-				if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-            }
-            if (count($index_list)) $orderby_query = ' order by ' . implode(',', $index_list);
-        }
-
-		if(count($output->arg_columns))
-		{
-			$columns = join(',',$output->arg_columns);
-		}
-
-        $query = sprintf("select %s from %s %s %s %s", $columns, implode(',', $table_list), implode(' ', $left_join), $condition, $groupby_query.$orderby_query);
-		$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-        $result = $this->_query($query);
-        if ($this->isError())
-            return;
-        
-        if(count($click_count)>0 && count($output->conditions)>0){
-            $_query = '';
-            foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
-            $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
-            $this->_query($_query);
-        }
-
-
-        $data = $this->_fetch($result);
-
-        $buff = new Object();
-        $buff->data = $data;
-        return $buff;
+			return $buff;
     }
 
-    /**
-     * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-     *
-     * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-     **/
-    function _getNavigationData($table_list, $columns, $left_join, $condition, $output)
-    {
-        require_once (_XE_PATH_ . 'classes/page/PageHandler.class.php');
-
-		$column_list = $output->column_list;
-        /*
-        // group by 절이 포함된 SELECT 쿼리의 전체 갯수를 구하기 위한 수정
-        // 정상적인 동작이 확인되면 주석으로 막아둔 부분으로 대체합니다.
-        //
-        $count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
-        $total_count = $this->getCountCache($output->tables, $count_condition);
-        if ($total_count === false) {
-            $count_query = sprintf('select count(*) as count from %s %s %s', implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-            if (count($output->groups))
-                $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
-            $result = $this->_query($count_query);
-            $count_output = $this->_fetch($result);
-            $total_count = (int)$count_output->count;
-            $this->putCountCache($output->tables, $count_condition, $total_count);
-        }
-        */
-
-        // 전체 개수를 구함
-        $count_query = sprintf("select count(*) as count from %s %s %s", implode(',', $table_list), implode(' ', $left_join), $condition);
-		$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
-		$result = $this->_query($count_query);
-		$count_output = $this->_fetch($result);
-		$total_count = (int)$count_output->count;
-
-        $list_count = $output->list_count['value'];
-        if (!$list_count) $list_count = 20;
-        $page_count = $output->page_count['value'];
-        if (!$page_count) $page_count = 10;
-        $page = $output->page['value'];
-        if (!$page)
-            $page = 1;
-
-        // 전체 페이지를 구함
-        if ($total_count) $total_page = (int)(($total_count - 1) / $list_count) + 1;
-        else $total_page = 1;
-
-        // 페이지 변수를 체크
-        if ($page > $total_page) $page = $total_page;
-        $start_count = ($page - 1) * $list_count;
-
-        // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-        if ($output->order) {
-            $conditions = $this->getConditionList($output);
-            if (!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                foreach ($output->order as $key => $val) {
-                    $col = $val[0];
-                    if (!in_array($col, array('list_order', 'update_order')))
-                        continue;
-                    if ($condition)
-                        $condition .= sprintf(' and %s < 2100000000 ', $col);
-                    else
-                        $condition = sprintf(' where %s < 2100000000 ', $col);
-                }
-            }
-        }
-
-        if (count($output->groups)) {
-            /*
-            var_dump("= column output start = ");
-            var_dump(sizeof ($output->columns) . " = end length == ");
-            var_dump($output->columns);
-            var_dump("= column output end = " . "\n");
-            var_dump($output->groups);
-            var_dump("=== " . "\n");
-            var_dump(debug_backtrace());
-            
-            foreach($output->columns as $key => $val) {
-            $name = $val['name'];
-            $alias = $val['alias'];
-            } */
-            $group_list = array();
-            foreach ($output->groups as $gkey => $gval) {
-                foreach ($output->columns as $key => $val) {
-                    $name = $val['name'];
-                    $alias = $val['alias'];
-                    if (trim($name) == trim($gval)) {
-                        $group_list[] = $alias;
-                        break;
-                    }
-                }
-
-				if($column_list[$gval]) $output->arg_columns[] = $column_list[$gval];
-
-            }
-            $groupby_query = sprintf(' group by %s', implode(',', $group_list));
-            //             var_dump($query);
-        }
-
-        if ($output->order) {
-            foreach ($output->order as $key => $val) {
-                $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-				if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-            }
-            if (count($index_list)) $orderby_query = ' order by ' . implode(',', $index_list);
-        }
-
-		if(count($output->arg_columns))
-		{
-			$columns = join(',',$output->arg_columns);
-		}
-
-        $query = sprintf("select %s from %s %s %s", $columns, implode(',', $table_list), implode(' ', $left_join), $condition);
-        $query = sprintf('%s offset %d limit %d', $query, $start_count, $list_count);
-		$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-
-        $result = $this->_query($query);
-        if ($this->isError()) {
-            $buff = new Object();
-            $buff->total_count = 0;
-            $buff->total_page = 0;
-            $buff->page = 1;
-            $buff->data = array();
-
-            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-            return $buff;
-        }
-
-        $virtual_no = $total_count - ($page - 1) * $list_count;
-        while ($tmp = pg_fetch_object($result)) {
-            $data[$virtual_no--] = $tmp;
-        }
-
-        $buff = new Object();
-        $buff->total_count = $total_count;
-        $buff->total_page = $total_page;
-        $buff->page = $page;
-        $buff->data = $data;
-
-        $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-        return $buff;
+    function getParser(){
+    	return new DBParser('"', '"', $this->prefix);
     }
 }
 
diff --git a/classes/db/DBSqlite2.class.php b/classes/db/DBSqlite2.class.php
index 51a5664ab..01e607f25 100644
--- a/classes/db/DBSqlite2.class.php
+++ b/classes/db/DBSqlite2.class.php
@@ -1,739 +1,718 @@
-<?php
-    /**
-     * @class DBSqlite2
-     * @author NHN (developers@xpressengine.com)
-     * @brief SQLite ver 2.x 를 이용하기 위한 class
-     * @version 0.1
-     *
-     * sqlite handling class (sqlite ver 2.x)
-     **/
-
-    class DBSqlite2 extends DB {
-
-        /**
-         * DB를 이용하기 위한 정보
-         **/
-        var $database = NULL; ///< database
-        var $prefix   = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE설치 가능)
-		var $comment_syntax = '/* %s */';
-
-        /**
-         * @brief sqlite 에서 사용될 column type
-         *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
-         **/
-        var $column_type = array(
-            'bignumber' => 'INTEGER',
-            'number' => 'INTEGER',
-            'varchar' => 'VARCHAR',
-            'char' => 'CHAR',
-            'text' => 'TEXT',
-            'bigtext' => 'TEXT',
-            'date' => 'VARCHAR(14)',
-            'float' => 'FLOAT',
-        );
-
-        /**
-         * @brief constructor
-         **/
-        function DBSqlite2() {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-		
-		/**
-		 * @brief create an instance of this class
-		 */
-		function create()
-		{
-			return new DBSqlite2;
-		}
-
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported() {
-            if(!function_exists('sqlite_open')) return false;
-            return true;
-        }
-
-        /**
-         * @brief DB정보 설정 및 connect/ close
-         **/
-        function _setDBInfo() {
-            $db_info = Context::getDBInfo();
-            $this->database = $db_info->db_database;
-            $this->prefix = $db_info->db_table_prefix;
-            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
-        }
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // db 정보가 없으면 무시
-            if(!$this->database) return;
-
-            // 데이터 베이스 파일 접속 시도
-            $this->fd = sqlite_open($this->database, 0666, $error);
-            if(!file_exists($this->database) || $error) {
-                $this->setError(-1,$error);
-                $this->is_connected = false;
-                return;
-            }
-
-            // 접속체크
-            $this->is_connected = true;
-			$this->password = md5($this->password);
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if(!$this->isConnected()) return;
-            sqlite_close($this->fd);
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin() {
-            if(!$this->is_connected || $this->transaction_started) return;
-            if($this->_query("BEGIN;")) $this->transaction_started = true;
-        }
-
-        /**
-         * @brief 롤백
-         **/
-        function rollback() {
-            if(!$this->is_connected || !$this->transaction_started) return;
-            $this->_query("ROLLBACK;");
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 커밋
-         **/
-        function commit($force = false) {
-            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
-            if(!$this->is_connected || !$this->transaction_started) return;
-            $this->_query("COMMIT;");
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string) {
-            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-            if(!is_numeric($string)) $string = str_replace("'","''", $string);
-            return $string;
-        }
-
-        /**
-         * @brief : 쿼리문의 실행 및 결과의 fetch 처리
-         *
-         * query : query문 실행하고 result return\n
-         * fetch : reutrn 된 값이 없으면 NULL\n
-         *         rows이면 array object\n
-         *         row이면 object\n
-         *         return\n
-         **/
-        function _query($query) {
-            if(!$this->isConnected()) return;
-
-            // 쿼리 시작을 알림
-            $this->actStart($query);
-
-            // 쿼리 문 실행
-            $result = @sqlite_query($query, $this->fd);
-
-            // 오류 체크
-            if(sqlite_last_error($this->fd)) $this->setError(sqlite_last_error($this->fd), sqlite_error_string(sqlite_last_error($this->fd)));
-
-            // 쿼리 실행 알림
-            $this->actFinish();
-
-            return $result;
-        }
-
-        /**
-         * @brief 결과를 fetch
-         **/
-        function _fetch($result) {
-            if($this->isError() || !$result) return;
-
-            while($tmp = sqlite_fetch_array($result, SQLITE_ASSOC)) {
-                unset($obj);
-                foreach($tmp as $key => $val) {
-                    $pos = strpos($key, '.');
-                    if($pos) $key = substr($key, $pos+1);
-                    $obj->{$key} = $val;
-                }
-                $output[] = $obj;
-            }
-
-            if(count($output)==1) return $output[0];
-            return $output;
-        }
-
-        /**
-         * @brief 1씩 증가되는 sequence값을 return
-         **/
-        function getNextSequence() {
-            $query = sprintf("insert into %ssequence (seq) values ('')", $this->prefix);
-            $this->_query($query);
-            $sequence = sqlite_last_insert_rowid($this->fd);
-            if($sequence % 10000 == 0) {
-              $query = sprintf("delete from  %ssequence where seq < %d", $this->prefix, $sequence);
-              $this->_query($query);
-            }
-
-            return $sequence;
-        }
-
-        /**
-         * @brief 테이블 기생성 여부 return
-         **/
-        function isTableExists($target_name) {
-            $query = sprintf('pragma table_info(%s%s)', $this->prefix, $this->addQuotes($target_name));
-            $result = $this->_query($query);
-            if(sqlite_num_rows($result)==0) return false;
-            return true;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 추가
-         **/
-        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
-            $type = $this->column_type[$type];
-            if(strtoupper($type)=='INTEGER') $size = '';
-
-            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
-            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
-            else $query .= sprintf(" %s ", $type);
-            if($default) $query .= sprintf(" default '%s' ", $default);
-            if($notnull) $query .= " not null ";
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 제거
-         **/
-        function dropColumn($table_name, $column_name) {
-            $query = sprintf("alter table %s%s drop column %s ", $this->prefix, $table_name, $column_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 column의 정보를 return
-         **/
-        function isColumnExists($table_name, $column_name) {
-            $query = sprintf("pragma table_info(%s%s)", $this->prefix, $table_name);
-            $result = $this->_query($query);
-            $output = $this->_fetch($result);
-            if($output) {
-                $column_name = strtolower($column_name);
-                foreach($output as $key => $val) {
-                    $name = strtolower($val->name);
-                    if($column_name == $name) return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 인덱스 추가
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
-        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
-            if(!is_array($target_columns)) $target_columns = array($target_columns);
-
-            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
-            $query = sprintf("pragma table_info(%s%s)", $this->prefix, $table_name);
-
-            $query = sprintf('CREATE %s INDEX %s ON %s%s (%s)', $is_unique?'UNIQUE':'', $key_name, $this->prefix, $table_name, implode(',',$target_columns));
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
-         **/
-        function dropIndex($table_name, $index_name, $is_unique = false) {
-            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
-            $query = sprintf("DROP INDEX %s", $this->prefix, $table_name, $key_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 index 정보를 return
-         **/
-        function isIndexExists($table_name, $index_name) {
-            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
-            $query = sprintf("pragma index_info(%s)", $key_name);
-            $result = $this->_query($query);
-            $output = $this->_fetch($result);
-            if(!$output) return false;
-            return true;
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXml($xml_doc) {
-            return $this->_createTable($xml_doc);
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXmlFile($file_name) {
-            if(!file_exists($file_name)) return;
-            // xml 파일을 읽음
-            $buff = FileHandler::readFile($file_name);
-            return $this->_createTable($buff);
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create table query생성
-         *
-         * type : number, varchar, text, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable($xml_doc) {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-            if($this->isTableExists($table_name)) return;
-            $table_name = $this->prefix.$table_name;
-
-            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
-            else $columns = $xml_obj->table->column;
-
-            foreach($columns as $column) {
-                $name = $column->attrs->name;
-                $type = $column->attrs->type;
-                if(strtoupper($this->column_type[$type])=='INTEGER') $size = '';
-                else $size = $column->attrs->size;
-                $notnull = $column->attrs->notnull;
-                $primary_key = $column->attrs->primary_key;
-                $index = $column->attrs->index;
-                $unique = $column->attrs->unique;
-                $default = $column->attrs->default;
-                $auto_increment = $column->attrs->auto_increment;
-
-                if($auto_increment) {
-                    $column_schema[] = sprintf('%s %s %s',
-                        $name,
-                        $this->column_type[$type],
-                        $auto_increment?'AUTOINCREMENT':''
-                    );
-                } else {
-                    $column_schema[] = sprintf('%s %s%s %s %s %s %s',
-                        $name,
-                        $this->column_type[$type],
-                        $size?'('.$size.')':'',
-                        $notnull?'NOT NULL':'',
-                        $primary_key?'PRIMARY KEY':'',
-                        isset($default)?"DEFAULT '".$default."'":'',
-                        $auto_increment?'AUTOINCREMENT':''
-                    );
-                }
-
-                if($unique) $unique_list[$unique][] = $name;
-                else if($index) $index_list[$index][] = $name;
-            }
-
-            $schema = sprintf('CREATE TABLE %s (%s%s) ;', $this->addQuotes($table_name)," ", implode($column_schema,", "));
-            $this->_query($schema);
-
-            if(count($unique_list)) {
-                foreach($unique_list as $key => $val) {
-                    $query = sprintf('CREATE UNIQUE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
-                    $this->_query($query);
-                }
-            }
-
-            if(count($index_list)) {
-                foreach($index_list as $key => $val) {
-                    $query = sprintf('CREATE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
-                    $this->_query($query);
-                }
-            }
-        }
-
-        /**
-         * @brief 조건문 작성하여 return
-         **/
-        function getCondition($output) {
-            if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type);
-            if($condition) $condition = ' where '.$condition;
-            return $condition;
-        }
-
-        function getLeftCondition($conditions,$column_type){
-            return $this->_getCondition($conditions,$column_type);
-        }
-
-
-        function _getCondition($conditions,$column_type) {
-            $condition = '';
-            foreach($conditions as $val) {
-                $sub_condition = '';
-                foreach($val['condition'] as $v) {
-                    if(!isset($v['value'])) continue;
-                    if($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double'))) continue;
-
-                    $name = $v['column'];
-                    $operation = $v['operation'];
-                    $value = $v['value'];
-                    $type = $this->getColumnType($column_type,$name);
-                    $pipe = $v['pipe'];
-
-                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-                    $str = $this->getConditionPart($name, $value, $operation);
-                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .=  $str;
-                }
-                if($sub_condition) {
-                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
-                    $condition .= '('.$sub_condition.')';
-                }
-            }
-            return $condition;
-        }
-
-        /**
-         * @brief insertAct 처리
-         **/
-        function _executeInsertAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val;
-            }
-
-            // 컬럼 정리 
-            foreach($output->columns as $key => $val) {
-                $name = $val['name'];
-                $value = $val['value'];
-                if($output->column_type[$name]!='number') {
-                    $value = "'".$this->addQuotes($value)."'";
-                    if(!$value) $value = 'null';
-                }
-				// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
-				// elseif(!$value || is_numeric($value)) $value = (int)$value;
-                else $this->_filterNumber(&$value);
-
-                $column_list[] = $name;
-                $value_list[] = $value;
-            }
-
-            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $value_list));
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief updateAct 처리
-         **/
-        function _executeUpdateAct($output) {
-            $table_count = count(array_values($output->tables));
-
-            // 대상 테이블이 1개일 경우
-            if($table_count == 1) {
-                // 테이블 정리
-                list($target_table) = array_values($output->tables);
-                $target_table = $this->prefix.$target_table;
-
-                // 컬럼 정리 
-                foreach($output->columns as $key => $val) {
-                    if(!isset($val['value'])) continue;
-                    $name = $val['name'];
-                    $value = $val['value'];
-                    if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
-                    else {
-                        if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-						// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
-						else $this->_filterNumber(&$value);
-
-                        $column_list[] = sprintf("%s = %s", $name, $value);
-                    }
-                }
-
-                // 조건절 정리
-                $condition = $this->getCondition($output);
-
-                $query = sprintf("update %s set %s %s", $target_table, implode(',',$column_list), $condition);
-
-            // 대상 테이블이 2개일 경우 (sqlite에서 update 테이블을 1개 이상 지정 못해서 이렇게 꽁수로... 다른 방법이 있으려나..)
-            } elseif($table_count == 2) {
-                // 테이블 정리
-                foreach($output->tables as $key => $val) {
-                    $table_list[$val] = $this->prefix.$key;
-                }
-                list($source_table, $target_table) = array_values($table_list);
-
-                // 조건절 정리
-                $condition = $this->getCondition($output);
-                foreach($table_list as $key => $val) {
-                    $condition = eregi_replace($key.'\\.', $val.'.', $condition);
-                }
-
-                // 컬럼 정리 
-                foreach($output->columns as $key => $val) {
-                    if(!isset($val['value'])) continue;
-                    $name = $val['name'];
-                    $value = $val['value'];
-                    list($s_prefix, $s_column) = explode('.',$name);
-                    list($t_prefix, $t_column) = explode('.',$value);
-
-                    $s_table = $table_list[$s_prefix];
-                    $t_table = $table_list[$t_prefix];
-                    $column_list[] = sprintf(' %s = (select %s from %s %s) ', $s_column, $t_column, $t_table, $condition);
-                }
-
-                $query = sprintf('update %s set %s where exists(select * from %s %s)', $source_table, implode(',', $column_list), $target_table, $condition);
-            } else {
-                return;
-            }
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val;
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
-
-            return $this->_query($query);
-        }
-
-        /**
-         * @brief selectAct 처리
-         *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
-         **/
-        function _executeSelectAct($output) {
-            // 테이블 정리
-            $table_list = array();
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val.' as '.$key;
-            }
-
-            $left_join = array();
-            // why???
-            $left_tables= (array)$output->left_tables;
-
-            foreach($left_tables as $key => $val) {
-                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
-                if($condition){
-                    $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key  . ' on ' . $condition . '';
-                }
-            }
-
-            if(!$output->columns) {
-                $columns = '*';
-            } else {
-                $column_list = array();
-                foreach($output->columns as $key => $val) {
-                    $name = $val['name'];
-                    $alias = $val['alias'];
-                    if($val['click_count']) $click_count[] = $val['name'];
-
-                    if(substr($name,-1) == '*') {
-                        $column_list[] = $name;
-                    } elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
-                        if($alias) $column_list[] = sprintf('%s as %s', $name, $alias);
-                        else $column_list[] = sprintf('%s',$name);
-                    } else {
-                        if($alias) $column_list[] = sprintf('%s as %s', $name, $alias);
-                        else $column_list[] = sprintf('%s',$name);
-                    }
-                }
-                $columns = implode(',',$column_list);
-            }
-
-            $condition = $this->getCondition($output);
-
-			$output->column_list = $column_list;
-            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns,  $left_join, $condition, $output);
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
-
-            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-                }
-                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
-            }
-
-            // list_count를 사용할 경우 적용
-            if($output->list_count['value']) $query = sprintf('%s limit %d', $query, $output->list_count['value']);
-
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-            $result = $this->_query($query);
-            if($this->isError()) return;
-
-            if(count($click_count)>0 && count($output->conditions)>0){
-                $_query = '';
-                foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
-                $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
-                $this->_query($_query);
-            }
-
-            $data = $this->_fetch($result);
-
-            $buff = new Object();
-            $buff->data = $data;
-            return $buff;
-        }
-
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-      function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
-            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
-
-			$column_list = $output->column_list;
-            /*
-            // group by 절이 포함된 SELECT 쿼리의 전체 갯수를 구하기 위한 수정
-            // 정상적인 동작이 확인되면 주석으로 막아둔 부분으로 대체합니다.
-            //
-            $count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
-            $total_count = $this->getCountCache($output->tables, $count_condition);
-            if($total_count === false) {
-                $count_query = sprintf("select count(*) as count from %s %s %s", implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-                if (count($output->groups))
-                    $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
-                $result = $this->_query($count_query);
-                $count_output = $this->_fetch($result);
-                $total_count = (int)$count_output->count;
-                $this->putCountCache($output->tables, $count_condition, $total_count);
-            }
-            */
-
-            // 전체 개수를 구함
-            $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
-			$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
-			$result = $this->_query($count_query);
-			$count_output = $this->_fetch($result);
-			$total_count = (int)$count_output->count;
-
-            $list_count = $output->list_count['value'];
-            if(!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if(!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if(!$page) $page = 1;
-
-            // 전체 페이지를 구함
-            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
-            else $total_page = 1;
-
-            // 페이지 변수를 체크
-            if($page > $total_page) $page = $total_page;
-            $start_count = ($page-1)*$list_count;
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
-
-
-            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-                }
-                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
-            }
-
-            $query = sprintf('%s limit %d, %d', $query, $start_count, $list_count);
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-
-            $result = $this->_query($query);
-            if($this->isError()) {
-                $buff = new Object();
-                $buff->total_count = 0;
-                $buff->total_page = 0;
-                $buff->page = 1;
-                $buff->data = array();
-
-                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-                return $buff;
-            }
-
-            if($result) {
-                $virtual_no = $total_count - ($page-1)*$list_count;
-                while($tmp = sqlite_fetch_array($result, SQLITE_ASSOC)) {
-                    unset($obj);
-                    foreach($tmp as $key => $val) {
-                        $pos = strpos($key, '.');
-                        if($pos) $key = substr($key, $pos+1);
-                        $obj->{$key} = $val;
-                    }
-                    $data[$virtual_no--] = $obj;
-                }
-            }
-
-            $buff = new Object();
-            $buff->total_count = $total_count;
-            $buff->total_page = $total_page;
-            $buff->page = $page;
-            $buff->data = $data;
-
-            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-            return $buff;
-        }
-    }
-
-return new DBSqlite2;
-?>
+<?php
+    /**
+     * @class DBSqlite2
+     * @author NHN (developers@xpressengine.com)
+     * @brief Class for using SQLite ver 2.x
+     * @version 0.1
+     *
+     * sqlite handling class (sqlite ver 2.x)
+     **/
+
+    class DBSqlite2 extends DB {
+
+        /**
+         * DB information
+         **/
+        var $database = NULL; ///< database
+        var $prefix   = 'xe'; // / <prefix of a tablename (One or more XEs can be installed in a single DB)
+		var $comment_syntax = '/* %s */';
+
+        /**
+         * @brief sqlite column type used in
+         *
+         * Becasue a common column type in schema/query xml is used for colum_type,
+         * it should be replaced properly for each DBMS
+         **/
+        var $column_type = array(
+            'bignumber' => 'INTEGER',
+            'number' => 'INTEGER',
+            'varchar' => 'VARCHAR',
+            'char' => 'CHAR',
+            'text' => 'TEXT',
+            'bigtext' => 'TEXT',
+            'date' => 'VARCHAR(14)',
+            'float' => 'FLOAT',
+        );
+
+        /**
+         * @brief constructor
+         **/
+        function DBSqlite2() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+		
+		/**
+		 * @brief create an instance of this class
+		 */
+		function create()
+		{
+			return new DBSqlite2;
+		}
+
+        /**
+         * @brief Return if it is installable
+         **/
+        function isSupported() {
+            if(!function_exists('sqlite_open')) return false;
+            return true;
+        }
+
+        /**
+         * @brief DB settings and connect/close
+         **/
+        function _setDBInfo() {
+            $db_info = Context::getDBInfo();
+            $this->database = $db_info->db_database;
+            $this->prefix = $db_info->db_table_prefix;
+            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
+        }
+
+        /**
+         * @brief DB Connection
+         **/
+        function _connect() {
+            // Ignore if no DB information exists
+            if(!$this->database) return;
+            // Attempt to access the database file
+            $this->fd = sqlite_open($this->database, 0666, $error);
+            if(!file_exists($this->database) || $error) {
+                $this->setError(-1,$error);
+                $this->is_connected = false;
+                return;
+            }
+            // Check connections
+            $this->is_connected = true;
+			$this->password = md5($this->password);
+        }
+
+        /**
+         * @brief DB disconnection
+         **/
+        function close() {
+            if(!$this->isConnected()) return;
+            sqlite_close($this->fd);
+        }
+
+        /**
+         * @brief Begin transaction
+         **/
+        function begin() {
+            if(!$this->is_connected || $this->transaction_started) return;
+            if($this->_query("BEGIN;")) $this->transaction_started = true;
+        }
+
+        /**
+         * @brief Rollback
+         **/
+        function rollback() {
+            if(!$this->is_connected || !$this->transaction_started) return;
+            $this->_query("ROLLBACK;");
+            $this->transaction_started = false;
+        }
+
+        /**
+         * @brief Commits
+         **/
+        function commit($force = false) {
+            if(!$force && (!$this->isConnected() || !$this->transaction_started)) return;
+            if(!$this->is_connected || !$this->transaction_started) return;
+            $this->_query("COMMIT;");
+            $this->transaction_started = false;
+        }
+
+        /**
+         * @brief Add quotes on the string variables in a query
+         **/
+        function addQuotes($string) {
+            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            if(!is_numeric($string)) $string = str_replace("'","''", $string);
+            return $string;
+        }
+
+        /**
+         * @brief : Run a query and fetch the result
+         *
+         * query: run a query and return the result \n
+         * fetch: NULL if no value is returned \n
+         *        array object if rows are returned \n
+         *        object if a row is returned \n
+         *         return\n
+         **/
+        function _query($query) {
+            if(!$this->isConnected()) return;
+            // Notify to start a query execution
+            $this->actStart($query);
+            // Run the query statement
+            $result = @sqlite_query($query, $this->fd);
+            // Error Check
+            if(sqlite_last_error($this->fd)) $this->setError(sqlite_last_error($this->fd), sqlite_error_string(sqlite_last_error($this->fd)));
+            // Notify to complete a query execution
+            $this->actFinish();
+
+            return $result;
+        }
+
+        /**
+         * @brief Fetch results
+         **/
+        function _fetch($result) {
+            if($this->isError() || !$result) return;
+
+            while($tmp = sqlite_fetch_array($result, SQLITE_ASSOC)) {
+                unset($obj);
+                foreach($tmp as $key => $val) {
+                    $pos = strpos($key, '.');
+                    if($pos) $key = substr($key, $pos+1);
+                    $obj->{$key} = $val;
+                }
+                $output[] = $obj;
+            }
+
+            if(count($output)==1) return $output[0];
+            return $output;
+        }
+
+        /**
+         * @brief Return the sequence value is incremented by 1
+         **/
+        function getNextSequence() {
+            $query = sprintf("insert into %ssequence (seq) values ('')", $this->prefix);
+            $this->_query($query);
+            $sequence = sqlite_last_insert_rowid($this->fd);
+            if($sequence % 10000 == 0) {
+              $query = sprintf("delete from  %ssequence where seq < %d", $this->prefix, $sequence);
+              $this->_query($query);
+            }
+
+            return $sequence;
+        }
+
+        /**
+         * @brief Return if a table already exists
+         **/
+        function isTableExists($target_name) {
+            $query = sprintf('pragma table_info(%s%s)', $this->prefix, $this->addQuotes($target_name));
+            $result = $this->_query($query);
+            if(sqlite_num_rows($result)==0) return false;
+            return true;
+        }
+
+        /**
+         * @brief Add a column to a table
+         **/
+        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
+            $type = $this->column_type[$type];
+            if(strtoupper($type)=='INTEGER') $size = '';
+
+            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
+            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
+            else $query .= sprintf(" %s ", $type);
+            if($default) $query .= sprintf(" default '%s' ", $default);
+            if($notnull) $query .= " not null ";
+
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Delete a column from a table
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop column %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return column information of a table
+         **/
+        function isColumnExists($table_name, $column_name) {
+            $query = sprintf("pragma table_info(%s%s)", $this->prefix, $table_name);
+            $result = $this->_query($query);
+            $output = $this->_fetch($result);
+            if($output) {
+                $column_name = strtolower($column_name);
+                foreach($output as $key => $val) {
+                    $name = strtolower($val->name);
+                    if($column_name == $name) return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * @brief Add an index to a table
+         * $target_columns = array(col1, col2)
+         * $is_unique? unique : none
+         **/
+        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
+            if(!is_array($target_columns)) $target_columns = array($target_columns);
+
+            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
+            $query = sprintf("pragma table_info(%s%s)", $this->prefix, $table_name);
+
+            $query = sprintf('CREATE %s INDEX %s ON %s%s (%s)', $is_unique?'UNIQUE':'', $key_name, $this->prefix, $table_name, implode(',',$target_columns));
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Drop an index from a table
+         **/
+        function dropIndex($table_name, $index_name, $is_unique = false) {
+            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
+            $query = sprintf("DROP INDEX %s", $this->prefix, $table_name, $key_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return index information of a table
+         **/
+        function isIndexExists($table_name, $index_name) {
+            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
+            $query = sprintf("pragma index_info(%s)", $key_name);
+            $result = $this->_query($query);
+            $output = $this->_fetch($result);
+            if(!$output) return false;
+            return true;
+        }
+
+        /**
+         * @brief Create a table by using xml file
+         **/
+        function createTableByXml($xml_doc) {
+            return $this->_createTable($xml_doc);
+        }
+
+        /**
+         * @brief Create a table by using xml file
+         **/
+        function createTableByXmlFile($file_name) {
+            if(!file_exists($file_name)) return;
+            // read xml file
+            $buff = FileHandler::readFile($file_name);
+            return $this->_createTable($buff);
+        }
+
+        /**
+         * @brief generate a query statement to create a table by using schema xml
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+            // Create a table schema
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+            $table_name = $this->prefix.$table_name;
+
+            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+            else $columns = $xml_obj->table->column;
+
+            foreach($columns as $column) {
+                $name = $column->attrs->name;
+                $type = $column->attrs->type;
+                if(strtoupper($this->column_type[$type])=='INTEGER') $size = '';
+                else $size = $column->attrs->size;
+                $notnull = $column->attrs->notnull;
+                $primary_key = $column->attrs->primary_key;
+                $index = $column->attrs->index;
+                $unique = $column->attrs->unique;
+                $default = $column->attrs->default;
+                $auto_increment = $column->attrs->auto_increment;
+
+                if($auto_increment) {
+                    $column_schema[] = sprintf('%s %s %s',
+                        $name,
+                        $this->column_type[$type],
+                        $auto_increment?'AUTOINCREMENT':''
+                    );
+                } else {
+                    $column_schema[] = sprintf('%s %s%s %s %s %s %s',
+                        $name,
+                        $this->column_type[$type],
+                        $size?'('.$size.')':'',
+                        $notnull?'NOT NULL':'',
+                        $primary_key?'PRIMARY KEY':'',
+                        isset($default)?"DEFAULT '".$default."'":'',
+                        $auto_increment?'AUTOINCREMENT':''
+                    );
+                }
+
+                if($unique) $unique_list[$unique][] = $name;
+                else if($index) $index_list[$index][] = $name;
+            }
+
+            $schema = sprintf('CREATE TABLE %s (%s%s) ;', $this->addQuotes($table_name)," ", implode($column_schema,", "));
+            $this->_query($schema);
+
+            if(count($unique_list)) {
+                foreach($unique_list as $key => $val) {
+                    $query = sprintf('CREATE UNIQUE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
+                    $this->_query($query);
+                }
+            }
+
+            if(count($index_list)) {
+                foreach($index_list as $key => $val) {
+                    $query = sprintf('CREATE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
+                    $this->_query($query);
+                }
+            }
+        }
+
+        /**
+         * @brief Return conditional clause
+         **/
+        function getCondition($output) {
+            if(!$output->conditions) return;
+            $condition = $this->_getCondition($output->conditions,$output->column_type);
+            if($condition) $condition = ' where '.$condition;
+            return $condition;
+        }
+
+        function getLeftCondition($conditions,$column_type){
+            return $this->_getCondition($conditions,$column_type);
+        }
+
+
+        function _getCondition($conditions,$column_type) {
+            $condition = '';
+            foreach($conditions as $val) {
+                $sub_condition = '';
+                foreach($val['condition'] as $v) {
+                    if(!isset($v['value'])) continue;
+                    if($v['value'] === '') continue;
+                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double'))) continue;
+
+                    $name = $v['column'];
+                    $operation = $v['operation'];
+                    $value = $v['value'];
+                    $type = $this->getColumnType($column_type,$name);
+                    $pipe = $v['pipe'];
+
+                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
+                    if(!$value) $value = $v['value'];
+                    $str = $this->getConditionPart($name, $value, $operation);
+                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
+                    $sub_condition .=  $str;
+                }
+                if($sub_condition) {
+                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
+                    $condition .= '('.$sub_condition.')';
+                }
+            }
+            return $condition;
+        }
+
+        /**
+         * @brief Handle the insertAct
+         **/
+        function _executeInsertAct($output) {
+            // List tables
+            foreach($output->tables as $key => $val) {
+                $table_list[] = $this->prefix.$val;
+            }
+            // List columns
+            foreach($output->columns as $key => $val) {
+                $name = $val['name'];
+                $value = $val['value'];
+                if($output->column_type[$name]!='number') {
+                    $value = "'".$this->addQuotes($value)."'";
+                    if(!$value) $value = 'null';
+                }
+				// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
+				// elseif(!$value || is_numeric($value)) $value = (int)$value;
+                else $this->_filterNumber(&$value);
+
+                $column_list[] = $name;
+                $value_list[] = $value;
+            }
+
+            $query = sprintf("insert into %s (%s) values (%s);", implode(',',$table_list), implode(',',$column_list), implode(',', $value_list));
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle updateAct
+         **/
+        function _executeUpdateAct($output) {
+            $table_count = count(array_values($output->tables));
+            // If one day the destination table
+            if($table_count == 1) {
+                // List tables
+                list($target_table) = array_values($output->tables);
+                $target_table = $this->prefix.$target_table;
+                // List columns
+                foreach($output->columns as $key => $val) {
+                    if(!isset($val['value'])) continue;
+                    $name = $val['name'];
+                    $value = $val['value'];
+                    if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
+                    else {
+                        if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
+						// sql injection 문제로 xml 선언이 number인 경우이면서 넘어온 값이 숫자형이 아니면 숫자형으로 강제 형변환
+						else $this->_filterNumber(&$value);
+
+                        $column_list[] = sprintf("%s = %s", $name, $value);
+                    }
+                }
+                // List the conditional clause
+                $condition = $this->getCondition($output);
+
+                $query = sprintf("update %s set %s %s", $target_table, implode(',',$column_list), $condition);
+            // trick to handle if targt table to update is more than one (sqlite doesn't support update to multi-tables)
+            } elseif($table_count == 2) {
+                // List tables
+                foreach($output->tables as $key => $val) {
+                    $table_list[$val] = $this->prefix.$key;
+                }
+                list($source_table, $target_table) = array_values($table_list);
+                // List the conditional clause
+                $condition = $this->getCondition($output);
+                foreach($table_list as $key => $val) {
+                    $condition = eregi_replace($key.'\\.', $val.'.', $condition);
+                }
+                // List columns
+                foreach($output->columns as $key => $val) {
+                    if(!isset($val['value'])) continue;
+                    $name = $val['name'];
+                    $value = $val['value'];
+                    list($s_prefix, $s_column) = explode('.',$name);
+                    list($t_prefix, $t_column) = explode('.',$value);
+
+                    $s_table = $table_list[$s_prefix];
+                    $t_table = $table_list[$t_prefix];
+                    $column_list[] = sprintf(' %s = (select %s from %s %s) ', $s_column, $t_column, $t_table, $condition);
+                }
+
+                $query = sprintf('update %s set %s where exists(select * from %s %s)', $source_table, implode(',', $column_list), $target_table, $condition);
+            } else {
+                return;
+            }
+
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle deleteAct
+         **/
+        function _executeDeleteAct($output) {
+            // List tables
+            foreach($output->tables as $key => $val) {
+                $table_list[] = $this->prefix.$val;
+            }
+            // List the conditional clause
+            $condition = $this->getCondition($output);
+
+            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
+
+            return $this->_query($query);
+        }
+
+        /**
+         * @brief Handle selectAct
+         *
+         * In order to get a list of pages easily when selecting \n
+         * it supports a method as navigation
+         **/
+        function _executeSelectAct($output) {
+            // List tables
+            $table_list = array();
+            foreach($output->tables as $key => $val) {
+                $table_list[] = $this->prefix.$val.' as '.$key;
+            }
+
+            $left_join = array();
+            // why???
+            $left_tables= (array)$output->left_tables;
+
+            foreach($left_tables as $key => $val) {
+                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
+                if($condition){
+                    $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key  . ' on ' . $condition . '';
+                }
+            }
+
+            if(!$output->columns) {
+                $columns = '*';
+            } else {
+                $column_list = array();
+                foreach($output->columns as $key => $val) {
+                    $name = $val['name'];
+                    $alias = $val['alias'];
+                    if($val['click_count']) $click_count[] = $val['name'];
+
+                    if(substr($name,-1) == '*') {
+                        $column_list[] = $name;
+                    } elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
+                        if($alias) $column_list[] = sprintf('%s as %s', $name, $alias);
+                        else $column_list[] = sprintf('%s',$name);
+                    } else {
+                        if($alias) $column_list[] = sprintf('%s as %s', $name, $alias);
+                        else $column_list[] = sprintf('%s',$name);
+                    }
+                }
+                $columns = implode(',',$column_list);
+            }
+
+            $condition = $this->getCondition($output);
+
+			$output->column_list = $column_list;
+            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns,  $left_join, $condition, $output);
+            // Add a condition to use an index when sorting in order by list_order, update_order
+            if($output->order) {
+                $conditions = $this->getConditionList($output);
+                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                    foreach($output->order as $key => $val) {
+                        $col = $val[0];
+                        if(!in_array($col, array('list_order','update_order'))) continue;
+                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
+                        else $condition = sprintf(' where %s < 2100000000 ', $col);
+                    }
+                }
+            }
+
+            $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition);
+
+            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
+
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
+                }
+                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
+            }
+            // Apply when using list_count
+            if($output->list_count['value']) $query = sprintf('%s limit %d', $query, $output->list_count['value']);
+
+			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
+            $result = $this->_query($query);
+            if($this->isError()) return;
+
+            if(count($click_count)>0 && count($output->conditions)>0){
+                $_query = '';
+                foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
+                $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
+                $this->_query($_query);
+            }
+
+            $data = $this->_fetch($result);
+
+            $buff = new Object();
+            $buff->data = $data;
+            return $buff;
+        }
+
+        /**
+         * @brief Paging is handled if navigation information exists in the query xml
+         *
+         * It is quite convenient although its structure is not good at all .. -_-;
+         **/
+      function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
+            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
+
+			$column_list = $output->column_list;
+            /*
+            // Modified to find total number of SELECT queries having group by clause
+            // If it works correctly, uncomment the following codes
+            //
+            $count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
+            $total_count = $this->getCountCache($output->tables, $count_condition);
+            if($total_count === false) {
+                $count_query = sprintf("select count(*) as count from %s %s %s", implode(', ', $table_list), implode(' ', $left_join), $count_condition);
+                if (count($output->groups))
+                    $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
+                $result = $this->_query($count_query);
+                $count_output = $this->_fetch($result);
+                $total_count = (int)$count_output->count;
+                $this->putCountCache($output->tables, $count_condition, $total_count);
+            }
+            */
+            // Get a total count
+            $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
+			$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
+			$result = $this->_query($count_query);
+			$count_output = $this->_fetch($result);
+			$total_count = (int)$count_output->count;
+
+            $list_count = $output->list_count['value'];
+            if(!$list_count) $list_count = 20;
+            $page_count = $output->page_count['value'];
+            if(!$page_count) $page_count = 10;
+            $page = $output->page['value'];
+            if(!$page) $page = 1;
+            // Get a total page
+            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
+            else $total_page = 1;
+            // Check Page variables
+            if($page > $total_page) $page = $total_page;
+            $start_count = ($page-1)*$list_count;
+            // Add a condition to use an index when sorting in order by list_order, update_order
+            if($output->order) {
+                $conditions = $this->getConditionList($output);
+                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
+                    foreach($output->order as $key => $val) {
+                        $col = $val[0];
+                        if(!in_array($col, array('list_order','update_order'))) continue;
+                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
+                        else $condition = sprintf(' where %s < 2100000000 ', $col);
+                    }
+                }
+            }
+
+            $query = sprintf("select %s from %s %s %s", $columns, implode(',',$table_list), implode(' ',$left_join), $condition);
+
+
+            if(count($output->groups)) $query .= sprintf(' group by %s', implode(',',$output->groups));
+
+            if($output->order) {
+                foreach($output->order as $key => $val) {
+                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
+                }
+                if(count($index_list)) $query .= ' order by '.implode(',',$index_list);
+            }
+
+            $query = sprintf('%s limit %d, %d', $query, $start_count, $list_count);
+			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
+
+            $result = $this->_query($query);
+            if($this->isError()) {
+                $buff = new Object();
+                $buff->total_count = 0;
+                $buff->total_page = 0;
+                $buff->page = 1;
+                $buff->data = array();
+
+                $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+                return $buff;
+            }
+
+            if($result) {
+                $virtual_no = $total_count - ($page-1)*$list_count;
+                while($tmp = sqlite_fetch_array($result, SQLITE_ASSOC)) {
+                    unset($obj);
+                    foreach($tmp as $key => $val) {
+                        $pos = strpos($key, '.');
+                        if($pos) $key = substr($key, $pos+1);
+                        $obj->{$key} = $val;
+                    }
+                    $data[$virtual_no--] = $obj;
+                }
+            }
+
+            $buff = new Object();
+            $buff->total_count = $total_count;
+            $buff->total_page = $total_page;
+            $buff->page = $page;
+            $buff->data = $data;
+
+            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+            return $buff;
+        }
+    }
+
+return new DBSqlite2;
+?>
diff --git a/classes/db/DBSqlite3_pdo.class.php b/classes/db/DBSqlite3_pdo.class.php
index 96301a1a2..e8e7e1d0f 100644
--- a/classes/db/DBSqlite3_pdo.class.php
+++ b/classes/db/DBSqlite3_pdo.class.php
@@ -1,819 +1,628 @@
-<?php
-    /**
-     * @class DBSqlite3_pdo
-     * @author NHN (developers@xpressengine.com)
-     * @brief SQLite3를 PDO로 이용하여 class
-     * @version 0.1
-     **/
-
-    class DBSqlite3_pdo extends DB {
-
-        /**
-         * DB를 이용하기 위한 정보
-         **/
-        var $database = NULL; ///< database
-        var $prefix   = 'xe'; ///< XE에서 사용할 테이블들의 prefix  (한 DB에서 여러개의 XE 설치 가능)
-		var $comment_syntax = '/* %s */';
-
-        /**
-         * PDO 사용시 필요한 변수들
-         **/
-        var $handler      = NULL;
-        var $stmt         = NULL;
-        var $bind_idx     = 0;
-        var $bind_vars    = array();
-
-        /**
-         * @brief sqlite3 에서 사용될 column type
-         *
-         * column_type은 schema/query xml에서 공통 선언된 type을 이용하기 때문에
-         * 각 DBMS에 맞게 replace 해주어야 한다
-         **/
-        var $column_type = array(
-            'bignumber' => 'INTEGER',
-            'number'    => 'INTEGER',
-            'varchar'   => 'VARCHAR',
-            'char'      => 'CHAR',
-            'text'      => 'TEXT',
-            'bigtext'   => 'TEXT',
-            'date'      => 'VARCHAR(14)',
-            'float'     => 'REAL',
-        );
-
-        /**
-         * @brief constructor
-         **/
-        function DBSqlite3_pdo() {
-            $this->_setDBInfo();
-            $this->_connect();
-        }
-		
-		/**
-		 * @brief create an instance of this class
-		 */
-		function create()
-		{
-			return new DBSqlite3_pdo;
-		}
-
-        /**
-         * @brief 설치 가능 여부를 return
-         **/
-        function isSupported() {
-            return class_exists('PDO');
-        }
-
-        /**
-         * @brief DB정보 설정 및 connect/ close
-         **/
-        function _setDBInfo() {
-            $db_info = Context::getDBInfo();
-            $this->database = $db_info->db_database;
-            $this->prefix = $db_info->db_table_prefix;
-            if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
-        }
-
-        /**
-         * @brief DB 접속
-         **/
-        function _connect() {
-            // db 정보가 없으면 무시
-            if(!$this->database) return;
-
-            // 데이터 베이스 파일 접속 시도
-			try {
-				// PDO is only supported with PHP5,
-				// so it is allowed to use try~catch statment in this class.
-				$this->handler = new PDO('sqlite:'.$this->database);
-			} catch (PDOException $e) {
-				$this->setError(-1, 'Connection failed: '.$e->getMessage());
-				$this->is_connected = false;
-				return;
-			}
-
-            // 접속체크
-            $this->is_connected = true;
-			$this->password = md5($this->password);
-        }
-
-        /**
-         * @brief DB접속 해제
-         **/
-        function close() {
-            if(!$this->is_connected) return;
-            $this->commit();
-        }
-
-        /**
-         * @brief 트랜잭션 시작
-         **/
-        function begin() {
-            if(!$this->is_connected || $this->transaction_started) return;
-            if($this->handler->beginTransaction()) $this->transaction_started = true;
-        }
-
-        /**
-         * @brief 롤백
-         **/
-        function rollback() {
-            if(!$this->is_connected || !$this->transaction_started) return;
-            $this->handler->rollBack();
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 커밋
-         **/
-        function commit($force = false) {
-            if(!$force && (!$this->is_connected || !$this->transaction_started)) return;
-            $this->handler->commit();
-            $this->transaction_started = false;
-        }
-
-        /**
-         * @brief 쿼리에서 입력되는 문자열 변수들의 quotation 조절
-         **/
-        function addQuotes($string) {
-            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
-            if(!is_numeric($string)) $string = str_replace("'","''",$string);
-            return $string;
-        }
-
-        /**
-         * @brief : 쿼리문의 prepare
-         **/
-        function _prepare($query) {
-            if(!$this->is_connected) return;
-
-            // 쿼리 시작을 알림
-            $this->actStart($query);
-
-            $this->stmt = $this->handler->prepare($query);
-
-            if($this->handler->errorCode() != '00000') {
-                $this->setError($this->handler->errorCode(), print_r($this->handler->errorInfo(),true));
-                $this->actFinish();
-            }
-            $this->bind_idx = 0;
-            $this->bind_vars = array();
-        }
-
-        /**
-         * @brief : stmt에 binding params
-         **/
-        function _bind($val) {
-            if(!$this->is_connected || !$this->stmt) return;
-
-            $this->bind_idx ++;
-            $this->bind_vars[] = $val;
-            $this->stmt->bindParam($this->bind_idx, $val);
-        }
-
-        /**
-         * @brief : prepare된 쿼리의 execute
-         **/
-        function _execute() {
-            if(!$this->is_connected || !$this->stmt) return;
-
-            $this->stmt->execute();
-
-            if($this->stmt->errorCode() === '00000') {
-                $output = null;
-                while($tmp = $this->stmt->fetch(PDO::FETCH_ASSOC)) {
-                    unset($obj);
-                    foreach($tmp as $key => $val) {
-                        $pos = strpos($key, '.');
-                        if($pos) $key = substr($key, $pos+1);
-                        $obj->{$key} = str_replace("''","'",$val);
-                    }
-                    $output[] = $obj;
-                }
-            } else {
-                $this->setError($this->stmt->errorCode(),print_r($this->stmt->errorInfo(),true));
-            }
-
-            $this->stmt = null;
-            $this->actFinish();
-
-            if(is_array($output) && count($output)==1) return $output[0];
-            return $output;
-        }
-
-        /**
-         * @brief 1씩 증가되는 sequence값을 return
-         **/
-        function getNextSequence() {
-            $query = sprintf("insert into %ssequence (seq) values (NULL)", $this->prefix);
-            $this->_prepare($query);
-            $result = $this->_execute();
-            $sequence = $this->handler->lastInsertId();
-            if($sequence % 10000 == 0) {
-              $query = sprintf("delete from  %ssequence where seq < %d", $this->prefix, $sequence);
-              $this->_prepare($query);
-              $result = $this->_execute();
-            }
-
-            return $sequence;
-        }
-
-        /**
-         * @brief 테이블 기생성 여부 return
-         **/
-        function isTableExists($target_name) {
-            $query = sprintf('pragma table_info(%s%s)', $this->prefix, $target_name);
-            $this->_prepare($query);
-            if(!$this->_execute()) return false;
-            return true;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 추가
-         **/
-        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
-            $type = $this->column_type[$type];
-            if(strtoupper($type)=='INTEGER') $size = '';
-
-            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
-            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
-            else $query .= sprintf(" %s ", $type);
-            if($default) $query .= sprintf(" default '%s' ", $default);
-            if($notnull) $query .= " not null ";
-
-            $this->_prepare($query);
-            return $this->_execute();
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 column 제거
-         **/
-        function dropColumn($table_name, $column_name) {
-            $query = sprintf("alter table %s%s drop column %s ", $this->prefix, $table_name, $column_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 column의 정보를 return
-         **/
-        function isColumnExists($table_name, $column_name) {
-            $query = sprintf("pragma table_info(%s%s)", $this->prefix, $table_name);
-            $this->_prepare($query);
-            $output = $this->_execute();
-
-            if($output) {
-                $column_name = strtolower($column_name);
-                foreach($output as $key => $val) {
-                    $name = strtolower($val->name);
-                    if($column_name == $name) return true;
-                }
-            }
-            return false;
-        }
-
-        /**
-         * @brief 특정 테이블에 특정 인덱스 추가
-         * $target_columns = array(col1, col2)
-         * $is_unique? unique : none
-         **/
-        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
-            if(!is_array($target_columns)) $target_columns = array($target_columns);
-
-            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
-
-            $query = sprintf('CREATE %s INDEX %s ON %s%s (%s)', $is_unique?'UNIQUE':'', $key_name, $this->prefix, $table_name, implode(',',$target_columns));
-            $this->_prepare($query);
-            $this->_execute();
-        }
-
-        /**
-         * @brief 특정 테이블의 특정 인덱스 삭제
-         **/
-        function dropIndex($table_name, $index_name, $is_unique = false) {
-            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
-            $query = sprintf("DROP INDEX %s", $this->prefix, $table_name, $key_name);
-            $this->_query($query);
-        }
-
-        /**
-         * @brief 특정 테이블의 index 정보를 return
-         **/
-        function isIndexExists($table_name, $index_name) {
-            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
-
-            $query = sprintf("pragma index_info(%s)", $key_name);
-            $this->_prepare($query);
-            $output = $this->_execute();
-            if(!$output) return false;
-            return true;
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXml($xml_doc) {
-            return $this->_createTable($xml_doc);
-        }
-
-        /**
-         * @brief xml 을 받아서 테이블을 생성
-         **/
-        function createTableByXmlFile($file_name) {
-            if(!file_exists($file_name)) return;
-            // xml 파일을 읽음
-            $buff = FileHandler::readFile($file_name);
-            return $this->_createTable($buff);
-        }
-
-        /**
-         * @brief schema xml을 이용하여 create table query생성
-         *
-         * type : number, varchar, text, char, date, \n
-         * opt : notnull, default, size\n
-         * index : primary key, index, unique\n
-         **/
-        function _createTable($xml_doc) {
-            // xml parsing
-            $oXml = new XmlParser();
-            $xml_obj = $oXml->parse($xml_doc);
-
-            // 테이블 생성 schema 작성
-            $table_name = $xml_obj->table->attrs->name;
-            if($this->isTableExists($table_name)) return;
-            $table_name = $this->prefix.$table_name;
-
-            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
-            else $columns = $xml_obj->table->column;
-
-            foreach($columns as $column) {
-                $name = $column->attrs->name;
-                $type = $column->attrs->type;
-                if(strtoupper($this->column_type[$type])=='INTEGER') $size = '';
-                else $size = $column->attrs->size;
-                $notnull = $column->attrs->notnull;
-                $primary_key = $column->attrs->primary_key;
-                $index = $column->attrs->index;
-                $unique = $column->attrs->unique;
-                $default = $column->attrs->default;
-                $auto_increment = $column->attrs->auto_increment;
-
-                if($auto_increment) {
-                    $column_schema[] = sprintf('%s %s PRIMARY KEY %s',
-                        $name,
-                        $this->column_type[$type],
-                        $auto_increment?'AUTOINCREMENT':''
-                    );
-                } else {
-                    $column_schema[] = sprintf('%s %s%s %s %s %s',
-                        $name,
-                        $this->column_type[$type],
-                        $size?'('.$size.')':'',
-                        $notnull?'NOT NULL':'',
-                        $primary_key?'PRIMARY KEY':'',
-                        isset($default)?"DEFAULT '".$default."'":''
-                    );
-                }
-
-                if($unique) $unique_list[$unique][] = $name;
-                else if($index) $index_list[$index][] = $name;
-            }
-
-            $schema = sprintf('CREATE TABLE %s (%s%s) ;', $table_name," ", implode($column_schema,", "));
-            $this->_prepare($schema);
-            $this->_execute();
-            if($this->isError()) return;
-
-            if(count($unique_list)) {
-                foreach($unique_list as $key => $val) {
-                    $query = sprintf('CREATE UNIQUE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
-                    $this->_prepare($query);
-                    $this->_execute();
-                    if($this->isError()) $this->rollback();
-                }
-            }
-
-            if(count($index_list)) {
-                foreach($index_list as $key => $val) {
-                    $query = sprintf('CREATE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
-                    $this->_prepare($query);
-                    $this->_execute();
-                    if($this->isError()) $this->rollback();
-                }
-            }
-        }
-
-        /**
-         * @brief 조건문 작성하여 return
-         **/
-        function getCondition($output) {
-            if(!$output->conditions) return;
-            $condition = $this->_getCondition($output->conditions,$output->column_type);
-            if($condition) $condition = ' where '.$condition;
-            return $condition;
-        }
-
-        function getLeftCondition($conditions,$column_type){
-            return $this->_getCondition($conditions,$column_type);
-        }
-
-
-        function _getCondition($conditions,$column_type) {
-            $condition = '';
-            foreach($conditions as $val) {
-                $sub_condition = '';
-                foreach($val['condition'] as $v) {
-                    if(!isset($v['value'])) continue;
-                    if($v['value'] === '') continue;
-                    if(!in_array(gettype($v['value']), array('string', 'integer', 'double', 'array'))) continue;
-
-                    $name = $v['column'];
-                    $operation = $v['operation'];
-                    $value = $v['value'];
-                    $type = $this->getColumnType($column_type,$name);
-                    $pipe = $v['pipe'];
-
-                    $value = $this->getConditionValue($name, $value, $operation, $type, $column_type);
-                    if(!$value) $value = $v['value'];
-                    $str = $this->getConditionPart($name, $value, $operation);
-                    if($sub_condition) $sub_condition .= ' '.$pipe.' ';
-                    $sub_condition .=  $str;
-                }
-                if($sub_condition) {
-                    if($condition && $val['pipe']) $condition .= ' '.$val['pipe'].' ';
-                    $condition .= '('.$sub_condition.')';
-                }
-            }
-            return $condition;
-        }
-
-        /**
-         * @brief insertAct 처리
-         **/
-        function _executeInsertAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val;
-            }
-
-            // 컬럼 정리 
-            foreach($output->columns as $key => $val) {
-                $name = $val['name'];
-                $value = $val['value'];
-
-                $key_list[] = $name;
-
-                if($output->column_type[$name]!='number') $val_list[] = $this->addQuotes($value);
-                else {
-					$this->_filterNumber(&$value);
-                    $val_list[] = $value;
-                }
-
-                $prepare_list[] = '?';
-            }
-
-            $query = sprintf("INSERT INTO %s (%s) VALUES (%s);", implode(',',$table_list), implode(',',$key_list), implode(',',$prepare_list));
-
-            $this->_prepare($query);
-
-            $val_count = count($val_list);
-            for($i=0;$i<$val_count;$i++) $this->_bind($val_list[$i]);
-
-            return $this->_execute();
-        }
-
-        /**
-         * @brief updateAct 처리
-         **/
-        function _executeUpdateAct($output) {
-            $table_count = count(array_values($output->tables));
-
-            // 대상 테이블이 1개일 경우
-            if($table_count == 1) {
-                // 테이블 정리
-                list($target_table) = array_values($output->tables);
-                $target_table = $this->prefix.$target_table;
-
-                // 컬럼 정리 
-                foreach($output->columns as $key => $val) {
-                    if(!isset($val['value'])) continue;
-                    $name = $val['name'];
-                    $value = $val['value'];
-                    if(strpos($name,'.')!==false&&strpos($value,'.')!==false) $column_list[] = $name.' = '.$value;
-                    else {
-                        if($output->column_type[$name]!='number') $value = "'".$this->addQuotes($value)."'";
-						else $this->_filterNumber(&$value);
-
-                        $column_list[] = sprintf("%s = %s", $name, $value);
-                    }
-                }
-
-                // 조건절 정리
-                $condition = $this->getCondition($output);
-
-                $query = sprintf("update %s set %s %s", $target_table, implode(',',$column_list), $condition);
-
-            // 대상 테이블이 2개일 경우 (sqlite에서 update 테이블을 1개 이상 지정 못해서 이렇게 꽁수로... 다른 방법이 있으려나..)
-            } elseif($table_count == 2) {
-                // 테이블 정리
-                foreach($output->tables as $key => $val) {
-                    $table_list[$val] = $this->prefix.$key;
-                }
-                list($source_table, $target_table) = array_values($table_list);
-
-                // 조건절 정리
-                $condition = $this->getCondition($output);
-                foreach($table_list as $key => $val) {
-                    $condition = eregi_replace($key.'\\.', $val.'.', $condition);
-                }
-
-                // 컬럼 정리 
-                foreach($output->columns as $key => $val) {
-                    if(!isset($val['value'])) continue;
-                    $name = $val['name'];
-                    $value = $val['value'];
-                    list($s_prefix, $s_column) = explode('.',$name);
-                    list($t_prefix, $t_column) = explode('.',$value);
-
-                    $s_table = $table_list[$s_prefix];
-                    $t_table = $table_list[$t_prefix];
-                    $column_list[] = sprintf(' %s = (select %s from %s %s) ', $s_column, $t_column, $t_table, $condition);
-                }
-
-                $query = sprintf('update %s set %s where exists(select * from %s %s)', $source_table, implode(',', $column_list), $target_table, $condition);
-            } else {
-                return;
-            }
-
-            $this->_prepare($query);
-            return $this->_execute();
-        }
-
-        /**
-         * @brief deleteAct 처리
-         **/
-        function _executeDeleteAct($output) {
-            // 테이블 정리
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val;
-            }
-
-            // 조건절 정리
-            $condition = $this->getCondition($output);
-
-            $query = sprintf("delete from %s %s", implode(',',$table_list), $condition);
-
-            $this->_prepare($query);
-            return $this->_execute();
-        }
-
-        /**
-         * @brief selectAct 처리
-         *
-         * select의 경우 특정 페이지의 목록을 가져오는 것을 편하게 하기 위해\n
-         * navigation이라는 method를 제공
-         **/
-        function _executeSelectAct($output) {
-            // 테이블 정리
-            $table_list = array();
-            foreach($output->tables as $key => $val) {
-                $table_list[] = $this->prefix.$val.' as '.$key;
-            }
-
-            $left_join = array();
-            // why???
-            $left_tables= (array)$output->left_tables;
-
-            foreach($left_tables as $key => $val) {
-                $condition = $this->_getCondition($output->left_conditions[$key],$output->column_type);
-                if($condition){
-                    $left_join[] = $val . ' '.$this->prefix.$output->_tables[$key].' as '.$key  . ' on (' . $condition . ')';
-                }
-            }
-
-
-            $click_count = array();
-            if(!$output->columns){
-				$output->columns = array(array('name'=>'*'));
-			}
-
-			$column_list = array();
-			foreach($output->columns as $key => $val) {
-				$name = $val['name'];
-				$alias = $val['alias'];
-				if($val['click_count']) $click_count[] = $val['name'];
-
-				if(substr($name,-1) == '*') {
-					$column_list[] = $name;
-				} elseif(strpos($name,'.')===false && strpos($name,'(')===false) {
-					if($alias) $column_list[$alias] = sprintf('%s as %s', $name, $alias);
-					else $column_list[] = sprintf('%s',$name);
-				} else {
-					if($alias) $column_list[$alias] = sprintf('%s as %s', $name, $alias);
-					else $column_list[] = sprintf('%s',$name);
-				}
-			}
-			$columns = implode(',',$column_list);
-
-            $condition = $this->getCondition($output);
-
-			$output->column_list = $column_list;
-            if($output->list_count && $output->page) return $this->_getNavigationData($table_list, $columns, $left_join, $condition, $output);
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            if(count($output->groups)){
-				$groupby_query = sprintf(' group by %s', implode(',',$output->groups));
-				if(count($output->arg_columns))
-				{
-					foreach($output->groups as $group)
-					{
-						if($column_list[$group]) $output->arg_columns[] = $column_list[$group];
-					}
-				}
-			}
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query = ' order by '.implode(',',$index_list);
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = join(',',$output->arg_columns);
-			}
-
-            $query = sprintf("select %s from %s %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-            // list_count를 사용할 경우 적용
-            if($output->list_count['value']) $query = sprintf('%s limit %d', $query, $output->list_count['value']);
-
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-            $this->_prepare($query);
-            $data = $this->_execute();
-            if($this->isError()) return;
-
-            if(count($click_count)>0 && count($output->conditions)>0){
-                $_query = '';
-                foreach($click_count as $k => $c) $_query .= sprintf(',%s=%s+1 ',$c,$c);
-                $_query = sprintf('update %s set %s %s',implode(',',$table_list), substr($_query,1),  $condition);
-                $this->_query($_query);
-            }
-
-            $buff = new Object();
-            $buff->data = $data;
-            return $buff;
-        }
-
-        /**
-         * @brief query xml에 navigation 정보가 있을 경우 페이징 관련 작업을 처리한다
-         *
-         * 그닥 좋지는 않은 구조이지만 편리하다.. -_-;
-         **/
-        function _getNavigationData($table_list, $columns, $left_join, $condition, $output) {
-            require_once(_XE_PATH_.'classes/page/PageHandler.class.php');
-
-			$column_list = $output->column_list;
-            /*
-            // group by 절이 포함된 SELECT 쿼리의 전체 갯수를 구하기 위한 수정
-            // 정상적인 동작이 확인되면 주석으로 막아둔 부분으로 대체합니다.
-            //
-            $count_condition = count($output->groups) ? sprintf('%s group by %s', $condition, implode(', ', $output->groups)) : $condition;
-            $total_count = $this->getCountCache($output->tables, $count_condition);
-            if($total_count === false) {
-                $count_query = sprintf("select count(*) as count from %s %s %s", implode(', ', $table_list), implode(' ', $left_join), $count_condition);
-                if (count($output->groups))
-                    $count_query = sprintf('select count(*) as count from (%s) xet', $count_query);
-                $result = $this->_query($count_query);
-                $count_output = $this->_fetch($result);
-                $total_count = (int)$count_output->count;
-                $this->putCountCache($output->tables, $count_condition, $total_count);
-            }
-            */
-
-            // 전체 개수를 구함
-            $count_query = sprintf("select count(*) as count from %s %s %s", implode(',',$table_list),implode(' ',$left_join), $condition);
-			$count_query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id . ' count(*)'):'';
-			$this->_prepare($count_query);
-			$count_output = $this->_execute();
-			$total_count = (int)$count_output->count;
-
-            $list_count = $output->list_count['value'];
-            if(!$list_count) $list_count = 20;
-            $page_count = $output->page_count['value'];
-            if(!$page_count) $page_count = 10;
-            $page = $output->page['value'];
-            if(!$page) $page = 1;
-
-            // 전체 페이지를 구함
-            if($total_count) $total_page = (int)( ($total_count-1) / $list_count) + 1;
-            else $total_page = 1;
-
-            // 페이지 변수를 체크
-            if($page > $total_page) $page = $total_page;
-            $start_count = ($page-1)*$list_count;
-
-            // list_order, update_order 로 정렬시에 인덱스 사용을 위해 condition에 쿼리 추가
-            if($output->order) {
-                $conditions = $this->getConditionList($output);
-                if(!in_array('list_order', $conditions) && !in_array('update_order', $conditions)) {
-                    foreach($output->order as $key => $val) {
-                        $col = $val[0];
-                        if(!in_array($col, array('list_order','update_order'))) continue;
-                        if($condition) $condition .= sprintf(' and %s < 2100000000 ', $col);
-                        else $condition = sprintf(' where %s < 2100000000 ', $col);
-                    }
-                }
-            }
-
-            if(count($output->groups)){
-				$groupby_query = sprintf(' group by %s', implode(',',$output->groups));
-				if(count($output->arg_columns))
-				{
-					foreach($output->groups as $group)
-					{
-						if($column_list[$group]) $output->arg_columns[] = $column_list[$group];
-					}
-				}
-			}
-
-            if($output->order) {
-                foreach($output->order as $key => $val) {
-                    $index_list[] = sprintf('%s %s', $val[0], $val[1]);
-					if(count($output->arg_columns) && $column_list[$val[0]]) $output->arg_columns[] = $column_list[$val[0]];
-                }
-                if(count($index_list)) $orderby_query = ' order by '.implode(',',$index_list);
-            }
-
-			if(count($output->arg_columns))
-			{
-				$columns = join(',',$output->arg_columns);
-			}
-
-            // return 결과물 생성
-            $buff = new Object();
-            $buff->total_count = 0;
-            $buff->total_page = 0;
-            $buff->page = 1;
-            $buff->data = array();
-            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-
-            // 쿼리 실행
-            $query = sprintf("select %s from %s %s %s %s", $columns, implode(',',$table_list),implode(' ',$left_join), $condition, $groupby_query.$orderby_query);
-            $query = sprintf('%s limit %d, %d', $query, $start_count, $list_count);
-			$query .= (__DEBUG_QUERY__&1 && $output->query_id)?sprintf(' '.$this->comment_syntax,$this->query_id):'';
-
-            $this->_prepare($query);
-
-            if($this->isError()) {
-                $this->setError($this->handler->errorCode(), print_r($this->handler->errorInfo(),true));
-                $this->actFinish();
-                return $buff;
-            }
-
-            $this->stmt->execute();
-
-            if($this->stmt->errorCode() != '00000') {
-                $this->setError($this->stmt->errorCode(), print_r($this->stmt->errorInfo(),true));
-                $this->actFinish();
-                return $buff;
-            }
-
-            $output = null;
-            $virtual_no = $total_count - ($page-1)*$list_count;
-            while($tmp = $this->stmt->fetch(PDO::FETCH_ASSOC)) {
-                unset($obj);
-                foreach($tmp as $key => $val) {
-                    $pos = strpos($key, '.');
-                    if($pos) $key = substr($key, $pos+1);
-                    $obj->{$key} = $val;
-                }
-                $data[$virtual_no--] = $obj;
-            }
-
-            $this->stmt = null;
-            $this->actFinish();
-
-            $buff = new Object();
-            $buff->total_count = $total_count;
-            $buff->total_page = $total_page;
-            $buff->page = $page;
-            $buff->data = $data;
-
-            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
-            return $buff;
-        }
-    }
-
-return new DBSqlite3_pdo;
-?>
+<?php
+    /**
+     * @class DBSqlite3_pdo
+     * @author NHN (developers@xpressengine.com)
+     * @brief class to use SQLite3 with PDO
+     * @version 0.1
+     **/
+
+    class DBSqlite3_pdo extends DB {
+
+        /**
+         * DB information
+         **/
+        var $database = NULL; ///< database
+        var $prefix   = 'xe'; // /< prefix of a tablename (many XEs can be installed in a single DB)
+		var $comment_syntax = '/* %s */';
+
+        /**
+         * Variables for using PDO
+         **/
+        var $handler      = NULL;
+        var $stmt         = NULL;
+        var $bind_idx     = 0;
+        var $bind_vars    = array();
+
+        /**
+         * @brief column type used in sqlite3
+         *
+         * column_type should be replaced for each DBMS properly
+         * because column_type uses a commonly defined type in schema/query xml files
+         **/
+        var $column_type = array(
+            'bignumber' => 'INTEGER',
+            'number'    => 'INTEGER',
+            'varchar'   => 'VARCHAR',
+            'char'      => 'CHAR',
+            'text'      => 'TEXT',
+            'bigtext'   => 'TEXT',
+            'date'      => 'VARCHAR(14)',
+            'float'     => 'REAL',
+        );
+
+        /**
+         * @brief constructor
+         **/
+        function DBSqlite3_pdo() {
+            $this->_setDBInfo();
+            $this->_connect();
+        }
+
+		/**
+		 * @brief create an instance of this class
+		 */
+		function create()
+		{
+			return new DBSqlite3_pdo;
+		}
+
+        /**
+         * @brief Return if installable
+         **/
+        function isSupported() {
+            return class_exists('PDO');
+        }
+
+        function isConnected() {
+            return $this->is_connected;
+        }
+
+        /**
+         * @brief DB settings and connect/close
+         **/
+        function _setDBInfo() {
+            $db_info = Context::getDBInfo();
+            $this->database = $db_info->master_db["db_database"];
+            $this->prefix = $db_info->master_db["db_table_prefix"];
+            //if(!substr($this->prefix,-1)!='_') $this->prefix .= '_';
+        }
+
+        /**
+         * @brief DB Connection
+         **/
+        function _connect() {
+            // override if db information not exists
+            if(!$this->database) return;
+
+            // Attempt to access the database file
+            try {
+                    // PDO is only supported with PHP5,
+                    // so it is allowed to use try~catch statment in this class.
+                    $this->handler = new PDO('sqlite:'.$this->database);
+            } catch (PDOException $e) {
+                    $this->setError(-1, 'Connection failed: '.$e->getMessage());
+                    $this->is_connected = false;
+                    return;
+            }
+
+            // Check connections
+            $this->is_connected = true;
+            $this->password = md5($this->password);
+        }
+
+        /**
+         * @brief disconnect to DB
+         **/
+        function close() {
+            if(!$this->is_connected) return;
+            $this->commit();
+        }
+
+        /**
+         * @brief Begin a transaction
+         **/
+        function begin() {
+            if(!$this->is_connected || $this->transaction_started) return;
+            if($this->handler->beginTransaction()) $this->transaction_started = true;
+        }
+
+        /**
+         * @brief Rollback
+         **/
+        function rollback() {
+            if(!$this->is_connected || !$this->transaction_started) return;
+            $this->handler->rollBack();
+            $this->transaction_started = false;
+        }
+
+        /**
+         * @brief Commit
+         **/
+        function commit($force = false) {
+            if(!$force && (!$this->is_connected || !$this->transaction_started)) return;
+            try {
+                $this->handler->commit();
+            }
+            catch(PDOException $e){
+                // There was no transaction started, so just continue.
+                error_log($e->getMessage());
+            }
+            $this->transaction_started = false;
+        }
+
+        /**
+         * @brief Add or change quotes to the query string variables
+         **/
+        function addQuotes($string) {
+            if(version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc()) $string = stripslashes(str_replace("\\","\\\\",$string));
+            if(!is_numeric($string)) $string = str_replace("'","''",$string);
+            return $string;
+        }
+
+        /**
+         * @brief : Prepare a query statement
+         **/
+        function _prepare($query) {
+            if(!$this->is_connected) return;
+
+            // notify to start a query execution
+            $this->actStart($query);
+
+            $this->stmt = $this->handler->prepare($query);
+
+            if($this->handler->errorCode() != '00000') {
+                $this->setError($this->handler->errorCode(), print_r($this->handler->errorInfo(),true));
+                $this->actFinish();
+            }
+            $this->bind_idx = 0;
+            $this->bind_vars = array();
+        }
+
+        /**
+         * @brief : Binding params in stmt
+         **/
+        function _bind($val) {
+            if(!$this->is_connected || !$this->stmt) return;
+
+            $this->bind_idx ++;
+            $this->bind_vars[] = $val;
+            $this->stmt->bindParam($this->bind_idx, $val);
+        }
+
+        /**
+         * @brief : execute the prepared statement
+         **/
+        function _execute() {
+            if(!$this->is_connected || !$this->stmt) return;
+
+            $this->stmt->execute();
+
+            if($this->stmt->errorCode() === '00000') {
+                $output = null;
+                while($tmp = $this->stmt->fetch(PDO::FETCH_ASSOC)) {
+                    unset($obj);
+                    foreach($tmp as $key => $val) {
+                        $pos = strpos($key, '.');
+                        if($pos) $key = substr($key, $pos+1);
+                        $obj->{$key} = str_replace("''","'",$val);
+                    }
+                    $output[] = $obj;
+                }
+            } else {
+                $this->setError($this->stmt->errorCode(),print_r($this->stmt->errorInfo(),true));
+            }
+
+            $this->stmt = null;
+            $this->actFinish();
+
+            if(is_array($output) && count($output)==1) return $output[0];
+            return $output;
+        }
+
+        /**
+         * @brief Return the sequence value incremented by 1
+         **/
+        function getNextSequence() {
+            $query = sprintf("insert into %ssequence (seq) values (NULL)", $this->prefix);
+            $this->_prepare($query);
+            $result = $this->_execute();
+            $sequence = $this->handler->lastInsertId();
+            if($sequence % 10000 == 0) {
+              $query = sprintf("delete from  %ssequence where seq < %d", $this->prefix, $sequence);
+              $this->_prepare($query);
+              $result = $this->_execute();
+            }
+
+            return $sequence;
+        }
+
+        /**
+         * @brief return if the table already exists
+         **/
+        function isTableExists($target_name) {
+            $query = sprintf('pragma table_info(%s%s)', $this->prefix, $target_name);
+            $this->_prepare($query);
+            if(!$this->_execute()) return false;
+            return true;
+        }
+
+        /**
+         * @brief Add a column to a table
+         **/
+        function addColumn($table_name, $column_name, $type='number', $size='', $default = '', $notnull=false) {
+            $type = $this->column_type[$type];
+            if(strtoupper($type)=='INTEGER') $size = '';
+
+            $query = sprintf("alter table %s%s add %s ", $this->prefix, $table_name, $column_name);
+            if($size) $query .= sprintf(" %s(%s) ", $type, $size);
+            else $query .= sprintf(" %s ", $type);
+            if($default) $query .= sprintf(" default '%s' ", $default);
+            if($notnull) $query .= " not null ";
+
+            $this->_prepare($query);
+            return $this->_execute();
+        }
+
+        /**
+         * @brief Remove a column from a table
+         **/
+        function dropColumn($table_name, $column_name) {
+            $query = sprintf("alter table %s%s drop column %s ", $this->prefix, $table_name, $column_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return column information of a table
+         **/
+        function isColumnExists($table_name, $column_name) {
+            $query = sprintf("pragma table_info(%s%s)", $this->prefix, $table_name);
+            $this->_prepare($query);
+            $output = $this->_execute();
+
+            if($output) {
+                $column_name = strtolower($column_name);
+                foreach($output as $key => $val) {
+                    $name = strtolower($val->name);
+                    if($column_name == $name) return true;
+                }
+            }
+            return false;
+        }
+
+        /**
+         * @brief Add an index to a table
+         * $target_columns = array(col1, col2)
+         * $is_unique? unique : none
+         **/
+        function addIndex($table_name, $index_name, $target_columns, $is_unique = false) {
+            if(!is_array($target_columns)) $target_columns = array($target_columns);
+
+            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
+
+            $query = sprintf('CREATE %s INDEX %s ON %s%s (%s)', $is_unique?'UNIQUE':'', $key_name, $this->prefix, $table_name, implode(',',$target_columns));
+            $this->_prepare($query);
+            $this->_execute();
+        }
+
+        /**
+         * @brief Drop an index from a table
+         **/
+        function dropIndex($table_name, $index_name, $is_unique = false) {
+            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
+            $query = sprintf("DROP INDEX %s", $this->prefix, $table_name, $key_name);
+            $this->_query($query);
+        }
+
+        /**
+         * @brief Return index information of a table
+         **/
+        function isIndexExists($table_name, $index_name) {
+            $key_name = sprintf('%s%s_%s', $this->prefix, $table_name, $index_name);
+
+            $query = sprintf("pragma index_info(%s)", $key_name);
+            $this->_prepare($query);
+            $output = $this->_execute();
+            if(!$output) return false;
+            return true;
+        }
+
+        /**
+         * @brief create a table from xml file
+         **/
+        function createTableByXml($xml_doc) {
+            return $this->_createTable($xml_doc);
+        }
+
+        /**
+         * @brief create a table from xml file
+         **/
+        function createTableByXmlFile($file_name) {
+            if(!file_exists($file_name)) return;
+            // read xml file
+            $buff = FileHandler::readFile($file_name);
+            return $this->_createTable($buff);
+        }
+
+        /**
+         * @brief generate a query to create a table using the schema xml
+         *
+         * type : number, varchar, text, char, date, \n
+         * opt : notnull, default, size\n
+         * index : primary key, index, unique\n
+         **/
+        function _createTable($xml_doc) {
+            // xml parsing
+            $oXml = new XmlParser();
+            $xml_obj = $oXml->parse($xml_doc);
+            // Create a table schema
+            $table_name = $xml_obj->table->attrs->name;
+            if($this->isTableExists($table_name)) return;
+            $table_name = $this->prefix.$table_name;
+
+            if(!is_array($xml_obj->table->column)) $columns[] = $xml_obj->table->column;
+            else $columns = $xml_obj->table->column;
+
+            foreach($columns as $column) {
+                $name = $column->attrs->name;
+                $type = $column->attrs->type;
+                if(strtoupper($this->column_type[$type])=='INTEGER') $size = '';
+                else $size = $column->attrs->size;
+                $notnull = $column->attrs->notnull;
+                $primary_key = $column->attrs->primary_key;
+                $index = $column->attrs->index;
+                $unique = $column->attrs->unique;
+                $default = $column->attrs->default;
+                $auto_increment = $column->attrs->auto_increment;
+
+                if($auto_increment) {
+                    $column_schema[] = sprintf('%s %s PRIMARY KEY %s',
+                        $name,
+                        $this->column_type[$type],
+                        $auto_increment?'AUTOINCREMENT':''
+                    );
+                } else {
+                    $column_schema[] = sprintf('%s %s%s %s %s %s',
+                        $name,
+                        $this->column_type[$type],
+                        $size?'('.$size.')':'',
+                        $notnull?'NOT NULL':'',
+                        $primary_key?'PRIMARY KEY':'',
+                        isset($default)?"DEFAULT '".$default."'":''
+                    );
+                }
+
+                if($unique) $unique_list[$unique][] = $name;
+                else if($index) $index_list[$index][] = $name;
+            }
+
+            $schema = sprintf('CREATE TABLE %s (%s%s) ;', $table_name," ", implode($column_schema,", "));
+            $this->_prepare($schema);
+            $this->_execute();
+            if($this->isError()) return;
+
+            if(count($unique_list)) {
+                foreach($unique_list as $key => $val) {
+                    $query = sprintf('CREATE UNIQUE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
+                    $this->_prepare($query);
+                    $this->_execute();
+                    if($this->isError()) $this->rollback();
+                }
+            }
+
+            if(count($index_list)) {
+                foreach($index_list as $key => $val) {
+                    $query = sprintf('CREATE INDEX %s_%s ON %s (%s)', $this->addQuotes($table_name), $key, $this->addQuotes($table_name), implode(',',$val));
+                    $this->_prepare($query);
+                    $this->_execute();
+                    if($this->isError()) $this->rollback();
+                }
+            }
+        }
+
+    function _getConnection($type = null){
+        return null;
+    }
+
+    /**
+     * @brief insertAct
+     * */
+    function _executeInsertAct($queryObject) {
+        $query = $this->getInsertSql($queryObject);
+        if (is_a($query, 'Object'))
+            return;
+
+        $this->_prepare($query);
+
+        $val_count = count($val_list);
+        for ($i = 0; $i < $val_count; $i++)
+            $this->_bind($val_list[$i]);
+
+        return $this->_execute();
+    }
+
+    /**
+     * @brief updateAct
+     * */
+    function _executeUpdateAct($queryObject) {
+        $query = $this->getUpdateSql($queryObject);
+        if (is_a($query, 'Object'))
+            return;
+
+        $this->_prepare($query);
+        return $this->_execute();
+    }
+
+    /**
+     * @brief deleteAct
+     * */
+    function _executeDeleteAct($queryObject) {
+        $query = $this->getDeleteSql($queryObject);
+        if (is_a($query, 'Object'))
+            return;
+
+        $this->_prepare($query);
+        return $this->_execute();
+    }
+
+    /**
+     * @brief selectAct
+     *
+     * To fetch a list of the page conveniently when selecting, \n
+     * navigation method supported
+     * */
+    function _executeSelectAct($queryObject) {
+        $query = $this->getSelectSql($queryObject);
+        if (is_a($query, 'Object'))
+            return;
+
+        $this->_prepare($query);
+        $data = $this->_execute();
+        // TODO isError is called twice
+        if ($this->isError())
+            return;
+
+        if ($this->isError())
+            return $this->queryError($queryObject);
+        else
+            return $this->queryPageLimit($queryObject, $data);
+    }
+
+    function queryError($queryObject) {
+        if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
+            $buff = new Object ();
+            $buff->total_count = 0;
+            $buff->total_page = 0;
+            $buff->page = 1;
+            $buff->data = array();
+            $buff->page_navigation = new PageHandler(/* $total_count */0, /* $total_page */1, /* $page */1, /* $page_count */10); //default page handler values
+            return $buff;
+        }else
+            return;
+    }
+
+    function queryPageLimit($queryObject, $data) {
+        if ($queryObject->getLimit() && $queryObject->getLimit()->isPageHandler()) {
+            // Total count
+	    $temp_where = $queryObject->getWhereString(true, false);
+            $count_query = sprintf('select count(*) as "count" %s %s', 'FROM ' . $queryObject->getFromString(), ($temp_where === '' ? '' : ' WHERE ' . $temp_where));
+            if ($queryObject->getGroupByString() != '') {
+                $count_query = sprintf('select count(*) as "count" from (%s) xet', $count_query);
+            }
+
+            $count_query .= ( __DEBUG_QUERY__ & 1 && $output->query_id) ? sprintf(' ' . $this->comment_syntax, $this->query_id) : '';
+            $this->_prepare($count_query);
+            $count_output = $this->_execute();
+            $total_count = (int) $count_output->count;
+
+            $list_count = $queryObject->getLimit()->list_count->getValue();
+            if (!$list_count) $list_count = 20;
+            $page_count = $queryObject->getLimit()->page_count->getValue();
+            if (!$page_count) $page_count = 10;
+            $page = $queryObject->getLimit()->page->getValue();
+            if (!$page) $page = 1;
+            // Total pages
+            if ($total_count) {
+                $total_page = (int) (($total_count - 1) / $list_count) + 1;
+            } else
+                $total_page = 1;
+
+            // check the page variables
+            if ($page > $total_page) $page = $total_page;
+            $start_count = ($page - 1) * $list_count;
+
+            $this->_prepare($this->getSelectPageSql($queryObject, true, $start_count, $list_count));
+            $this->stmt->execute();
+            if ($this->stmt->errorCode() != '00000') {
+                $this->setError($this->stmt->errorCode(), print_r($this->stmt->errorInfo(), true));
+                $this->actFinish();
+                return $buff;
+            }
+
+            $output = null;
+            $virtual_no = $total_count - ($page - 1) * $list_count;
+            //$data = $this->_fetch($result, $virtual_no);
+            while ($tmp = $this->stmt->fetch(PDO::FETCH_ASSOC)) {
+                unset($obj);
+                foreach ($tmp as $key => $val) {
+                    $pos = strpos($key, '.');
+                    if ($pos)
+                        $key = substr($key, $pos + 1);
+                    $obj->{$key} = $val;
+                }
+		$datatemp[$virtual_no--] = $obj;
+            }
+
+            $this->stmt = null;
+            $this->actFinish();
+
+            $buff = new Object ();
+            $buff->total_count = $total_count;
+            $buff->total_page = $total_page;
+            $buff->page = $page;
+            $buff->data = $datatemp;
+            $buff->page_navigation = new PageHandler($total_count, $total_page, $page, $page_count);
+        }else {
+            //$data = $this->_fetch($result);
+            $buff = new Object ();
+            $buff->data = $data;
+        }
+        return $buff;
+    }
+
+    function getSelectPageSql($query, $with_values = true, $start_count = 0, $list_count = 0) {
+
+        $select = $query->getSelectString($with_values);
+        if ($select == '')
+            return new Object(-1, "Invalid query");
+        $select = 'SELECT ' . $select;
+
+        $from = $query->getFromString($with_values);
+        if ($from == '')
+            return new Object(-1, "Invalid query");
+        $from = ' FROM ' . $from;
+
+        $where = $query->getWhereString($with_values);
+        if ($where != '')
+            $where = ' WHERE ' . $where;
+
+        $groupBy = $query->getGroupByString();
+        if ($groupBy != '')
+            $groupBy = ' GROUP BY ' . $groupBy;
+
+        $orderBy = $query->getOrderByString();
+        if ($orderBy != '')
+            $orderBy = ' ORDER BY ' . $orderBy;
+
+        $limit = $query->getLimitString();
+        if ($limit != '' && $query->getLimit()) {
+            $limit = sprintf(' LIMIT %d, %d',$start_count, $list_count);
+        }
+
+        return $select . ' ' . $from . ' ' . $where . ' ' . $groupBy . ' ' . $orderBy . ' ' . $limit;
+    }
+
+    function getParser() {
+        return new DBParser('"', '"', $this->prefix);
+    }
+
+    function getUpdateSql($query, $with_values = true, $with_priority = false){
+                    $columnsList = $query->getUpdateString($with_values);
+                    if($columnsList == '') return new Object(-1, "Invalid query");
+
+                    $tableName = $query->getFirstTableName();
+    		    if($tableName == '') return new Object(-1, "Invalid query");
+
+                    $where = $query->getWhereString($with_values);
+                    if($where != '') $where = ' WHERE ' . $where;
+
+                    $priority = $with_priority?$query->getPriority():'';
+
+                    return "UPDATE $priority $tableName SET $columnsList ".$where;
+            }
+
+   		function getDeleteSql($query, $with_values = true, $with_priority = false){
+			$sql = 'DELETE ';
+
+        		$tables = $query->getTables();
+                        $from = $tables[0]->getName();
+			$sql .= ' FROM '.$from;
+
+			$where = $query->getWhereString($with_values);
+			if($where != '') $sql .= ' WHERE ' . $where;
+
+			return $sql;
+		}
+}
+
+return new DBSqlite3_pdo;
+?>
diff --git a/classes/db/queryparts/Query.class.php b/classes/db/queryparts/Query.class.php
new file mode 100644
index 000000000..729ca46e4
--- /dev/null
+++ b/classes/db/queryparts/Query.class.php
@@ -0,0 +1,327 @@
+<?php
+
+	class Query extends Object {
+		var $queryID;
+		var $action;
+		var $priority;
+
+		var $columns;
+		var $tables;
+		var $conditions;
+		var $groups;
+		var $orderby;
+		var $limit;
+
+		var $arguments = null;
+
+                var $columnList = null;
+
+		var $_orderByString;
+
+		function Query($queryID = null
+			, $action = null
+			, $columns = null
+			, $tables = null
+			, $conditions = null
+			, $groups = null
+			, $orderby = null
+			, $limit = null){
+			$this->queryID = $queryID;
+			$this->action = $action;
+			$this->priority = $priority;
+
+                        if(!isset($tables)) return;
+			$this->columns = $this->setColumns($columns);
+			$this->tables = $this->setTables($tables);
+			$this->conditions = $this->setConditions($conditions);
+			$this->groups = $this->setGroups($groups);
+			$this->orderby = $this->setOrder($orderby);
+			$this->limit = $this->setLimit($limit);
+		}
+
+		function show(){
+			return true;
+		}
+
+		function setQueryId($queryID){
+			$this->queryID = $queryID;
+		}
+
+		function setAction($action){
+			$this->action = $action;
+		}
+		
+		function setPriority($priority){
+			$this->priority = $priority;
+		}
+
+                function setColumnList($columnList){
+                        $this->columnList = $columnList;
+                        if(count($this->columnList) > 0) {
+                            $selectColumns = array();
+                            $dbParser = DB::getParser();
+
+                            foreach($this->columnList as $columnName){
+                                    $columnName = $dbParser->escapeColumn($columnName);
+                                    $selectColumns[] = new SelectExpression($columnName);
+                            }
+                            unset($this->columns);
+                            $this->columns = $selectColumns;
+                        }
+                }
+
+		function setColumns($columns){
+			if(!isset($columns) || count($columns) === 0){
+				$this->columns = array(new StarExpression());
+				return;
+			}
+
+			if(!is_array($columns)) $columns = array($columns);
+
+			$this->columns = $columns;
+		}
+
+		function setTables($tables){
+			if(!isset($tables) || count($tables) === 0){
+				$this->setError(true);
+				$this->setMessage("You must provide at least one table for the query.");
+				return;
+			}
+
+			if(!is_array($tables)) $tables = array($tables);
+
+			$this->tables = $tables;
+		}
+
+		function setConditions($conditions){
+                    $this->conditions = array();
+                    if(!isset($conditions) || count($conditions) === 0) return;
+		    if(!is_array($conditions)) $conditions = array($conditions);
+
+                    foreach($conditions as $conditionGroup){
+                        if($conditionGroup->show()) $this->conditions[] = $conditionGroup;
+                    }
+		}
+
+		function setGroups($groups){
+			if(!isset($groups) || count($groups) === 0) return;
+			if(!is_array($groups)) $groups = array($groups);
+
+			$this->groups = $groups;
+		}
+
+		function setOrder($order){
+			if(!isset($order) || count($order) === 0) return;
+			if(!is_array($order)) $order = array($order);
+
+			$this->orderby = $order;
+		}
+
+		function setLimit($limit = NULL){
+			if(!isset($limit)) return;
+			$this->limit = $limit;
+		}
+
+		// START Fluent interface
+		function select($columns= null){
+			$this->action = 'select';
+			$this->setColumns($columns);
+			return $this;
+		}
+
+		function from($tables){
+			$this->setTables($tables);
+			return $this;
+		}
+
+		function where($conditions){
+			$this->setConditions($conditions);
+			return $this;
+		}
+
+		function groupBy($groups){
+			$this->setGroups($groups);
+			return $this;
+		}
+
+		function orderBy($order){
+			$this->setOrder($order);
+			return $this;
+		}
+
+		function limit($limit){
+			$this->setLimit($limit);
+			return $this;
+		}
+		// END Fluent interface
+
+		function getAction(){
+			return $this->action;
+		}
+		
+		function getPriority(){
+			return $this->priority?'LOW_PRIORITY':'';
+		}
+
+		function getSelectString($with_values = true){
+                    foreach($this->columns as $column){
+                            if($column->show())
+                                    if($column->isSubquery()){
+                                            $select[] = $column->toString($with_values) . ' as '. $column->getAlias();
+                                    }
+                                    else
+                                            $select[] = $column->getExpression($with_values);
+                    }
+                    return trim(implode($select, ', '));
+		}
+
+		function getUpdateString($with_values = true){
+                    foreach($this->columns as $column){
+                        if($column->show())
+                           $update[] = $column->getExpression($with_values);
+                    }
+                    return trim(implode($update, ', '));
+		}
+
+		function getInsertString($with_values = true){
+			$columnsList = '';
+			$valuesList = '';
+			foreach($this->columns as $column){
+				if($column->show()){
+					$columnsList .= $column->getColumnName() . ', ';
+					$valuesList .= $column->getValue($with_values) . ', ';
+				}
+			}
+			$columnsList = substr($columnsList, 0, -2);
+			$valuesList = substr($valuesList, 0, -2);
+
+			return "($columnsList) \n VALUES ($valuesList)";
+		}
+
+		function getTables(){
+			return $this->tables;
+		}
+
+                // from table_a
+                // from table_a inner join table_b on x=y
+                // from (select * from table a) as x
+                // from (select * from table t) as x inner join table y on y.x
+		function getFromString($with_values = true){
+			$from = '';
+			$simple_table_count = 0;
+			foreach($this->tables as $table){
+				if($table->isJoinTable() || !$simple_table_count) $from .= $table->toString($with_values) . ' ';
+				else $from .= ', '.$table->toString($with_values) . ' ';
+
+                                if(is_a($table, 'Subquery')) $from .= $table->getAlias() ? ' as ' . $table->getAlias() . ' ' : ' ';
+
+				$simple_table_count++;
+			}
+			if(trim($from) == '') return '';
+			return $from;
+		}
+
+		function getWhereString($with_values = true, $with_optimization = true){
+			$where = '';
+                        $condition_count = 0;
+			
+                        foreach($this->conditions as $conditionGroup){
+                                if($condition_count === 0){
+                                    $conditionGroup->setPipe("");
+                                }
+                                $condition_string = $conditionGroup->toString($with_values);
+                                $where .= $condition_string;
+                                $condition_count++;
+                        }
+			
+			if($with_optimization && 
+				(strstr($this->getOrderByString(), 'list_order') || strstr($this->getOrderByString(), 'update_order'))){
+			    
+			    if($condition_count !== 0) $where = '(' . $where .') ';
+			    
+			    foreach($this->orderby as $order){
+				$colName = $order->getColumnName();
+				if(strstr($colName, 'list_order') || strstr($colName, 'update_order')){
+				    $opt_condition = new ConditionWithoutArgument($colName, 2100000000, 'less', 'and');
+				    if ($condition_count === 0) $opt_condition->setPipe("");
+				    $where .= $opt_condition->toString($with_values).' ';
+				    $condition_count++;
+				}
+			    }
+			}
+			
+                    return trim($where);
+		}
+
+		function getGroupByString(){
+			$groupBy = '';
+			if($this->groups) if($this->groups[0] !== "")
+				$groupBy = implode(', ', $this->groups);
+			return $groupBy;
+		}
+
+		function getOrderByString(){
+			if(!$this->_orderByString){
+			    if(count($this->orderby) === 0) return '';
+			    $orderBy = '';
+			    foreach($this->orderby as $order){
+    				$orderBy .= $order->toString() .', ';
+			    }
+			    $orderBy = substr($orderBy, 0, -2);
+			    $this->_orderByString = $orderBy;
+			}
+			return $this->_orderByString;
+		}
+
+		function getLimit(){
+			return $this->limit;
+		}
+
+		function getLimitString(){
+			$limit = '';
+			if(count($this->limit) > 0){
+				$limit = '';
+				$limit .= $this->limit->toString();
+			}
+			return $limit;
+		}
+
+		function getFirstTableName(){
+			return $this->tables[0]->getName();
+		}
+
+		function getArguments(){
+			if(!isset($this->arguments)){
+				$this->arguments = array();
+
+				// Column arguments
+				if(count($this->columns) > 0){ // The if is for delete statements, all others must have columns
+					foreach($this->columns as $column){
+						if($column->show()){
+							$arg = $column->getArgument();
+							if($arg) $this->arguments[] = $arg;
+						}
+					}
+				}
+
+				// Condition arguments
+				if(count($this->conditions) > 0)
+					foreach($this->conditions as $conditionGroup){
+						$args = $conditionGroup->getArguments();
+						if(count($args) > 0) $this->arguments = array_merge($this->arguments, $args);
+					}
+
+				// Navigation arguments
+				if(count($this->orderby) > 0)
+					foreach($this->orderby as $order){
+						$args = $order->getArguments();
+						if(count($args) > 0) $this->arguments = array_merge($this->arguments, $args);
+					}
+			}
+			return $this->arguments;
+		}
+	}
+
+
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/Subquery.class.php b/classes/db/queryparts/Subquery.class.php
new file mode 100644
index 000000000..2f49c34ef
--- /dev/null
+++ b/classes/db/queryparts/Subquery.class.php
@@ -0,0 +1,42 @@
+<?php
+
+	class Subquery extends Query {
+		var $alias;
+		var $join_type;
+
+		function Subquery($alias, $columns, $tables, $conditions, $groups, $orderby, $limit, $join_type = null){
+			$this->alias = $alias;
+
+			$this->queryID = null;
+			$this->action = "select";
+
+			$this->columns = $columns;
+			$this->tables = $tables;
+			$this->conditions = $conditions;
+			$this->groups = $groups;
+			$this->orderby = $orderby;
+			$this->limit = $limit;
+                        $this->join_type = $join_type;
+		}
+
+		function getAlias(){
+			return $this->alias;
+		}
+
+                function isJoinTable(){
+                    if($this->join_type) return true;
+                    return false;
+                }
+
+                function toString($with_values = true){
+                    $oDB = &DB::getInstance();
+                    return '(' .$oDB->getSelectSql($this, $with_values) . ')';
+
+                }
+
+                function isSubquery(){
+                    return true;
+                }
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/condition/Condition.class.php b/classes/db/queryparts/condition/Condition.class.php
new file mode 100644
index 000000000..c482626f5
--- /dev/null
+++ b/classes/db/queryparts/condition/Condition.class.php
@@ -0,0 +1,152 @@
+<?php
+
+	class Condition {
+		var $column_name;
+		var $argument;
+		var $operation;
+		var $pipe;
+
+		var $_value;
+
+                var $_show;
+                var $_value_to_string;
+
+		function Condition($column_name, $argument, $operation, $pipe){
+			$this->column_name = $column_name;
+			$this->argument = $argument;
+			$this->operation = $operation;
+			$this->pipe = $pipe;
+
+		}
+
+		function getArgument(){
+			return null;
+		}
+
+		function toString($withValue = true){
+                    if(!isset($this->_value_to_string)){
+                        if(!$this->show()) { $this->_value_to_string = ''; }
+			else if($withValue)
+				$this->_value_to_string = $this->toStringWithValue();
+			else $this->_value_to_string = $this->toStringWithoutValue();
+                    }
+                    return $this->_value_to_string;
+		}
+
+		function toStringWithoutValue(){
+                    return $this->pipe . ' ' . $this->getConditionPart($this->_value);
+		}
+
+		function toStringWithValue(){
+                    return $this->pipe . ' ' . $this->getConditionPart($this->_value);
+		}
+
+		function setPipe($pipe){
+			$this->pipe = $pipe;
+		}
+
+		function show(){
+                    if(!isset($this->_show)){
+                        if(is_array($this->_value) && count($this->_value) === 1 && $this->_value[0] === '') {
+                            $this->_show = false;
+                        }
+                        else {
+                            $this->_show = true;
+                            switch($this->operation) {
+                                case 'equal' :
+                                case 'more' :
+                                case 'excess' :
+                                case 'less' :
+                                case 'below' :
+                                case 'like_tail' :
+                                case 'like_prefix' :
+                                case 'like' :
+                                case 'notlike_tail' :
+                                case 'notlike_prefix' :
+                                case 'notlike' :
+                                case 'in' :
+                                case 'notin' :
+                                case 'and':
+                                case 'or':
+                                case 'xor':
+                                case 'not':
+                                case 'notequal' :
+                                        // if variable is not set or is not string or number, return
+                                        if(!isset($this->_value)) { $this->_show = false; break;}
+                                        if($this->_value === '') { $this->_show = false; break; }
+                                        if(!in_array(gettype($this->_value), array('string', 'integer'))) {$this->_show = false; break; }
+                                        break;
+                                case 'between' :
+                                        if(!is_array($this->_value)) { $this->_show = false; break;}
+                                        if(count($this->_value)!=2) {$this->_show = false; break;}
+                            }
+                        }
+                    }
+                    return $this->_show;
+		}
+
+		function getConditionPart($value) {
+                    $name = $this->column_name;
+                    $operation = $this->operation;
+
+                        switch($operation) {
+                            case 'equal' :
+                                    return $name.' = '.$value;
+                                break;
+                            case 'more' :
+                                    return $name.' >= '.$value;
+                                break;
+                            case 'excess' :
+                                    return $name.' > '.$value;
+                                break;
+                            case 'less' :
+                                    return $name.' <= '.$value;
+                                break;
+                            case 'below' :
+                                    return $name.' < '.$value;
+                                break;
+                            case 'like_tail' :
+                            case 'like_prefix' :
+                            case 'like' :
+                                    return $name.' like '.$value;
+                                break;
+                            case 'notlike_tail' :
+                            case 'notlike_prefix' :
+                            case 'notlike' :
+                                    return $name.' not like '.$value;
+                                break;
+                            case 'in' :
+                                    return $name.' in '.$value;
+                                break;
+                            case 'notin' :
+                                    return $name.' not in '.$value;
+                                break;
+                            case 'notequal' :
+                                    return $name.' <> '.$value;
+                                break;
+                            case 'notnull' :
+                                    return $name.' is not null';
+                                break;
+                            case 'null' :
+                                    return $name.' is null';
+                                break;
+                            case 'and' :
+                                    return $name.' & '.$value;
+                                break;
+                            case 'or' :
+                                    return $name.' | '.$value;
+                                break;
+                            case 'xor' :
+                                    return $name.' ^ '.$value;
+                                break;
+                            case 'not' :
+                                    return $name.' ~ '.$value;
+                                break;
+                            case 'between' :
+                            return $name.' between ' . $value[0] . ' and ' . $value[1];
+                                            break;
+                }
+            }
+	}
+
+?>
diff --git a/classes/db/queryparts/condition/ConditionGroup.class.php b/classes/db/queryparts/condition/ConditionGroup.class.php
new file mode 100644
index 000000000..201c8c8bf
--- /dev/null
+++ b/classes/db/queryparts/condition/ConditionGroup.class.php
@@ -0,0 +1,60 @@
+<?php
+
+	class ConditionGroup {
+		var $conditions;
+		var $pipe;
+
+                var $_group;
+                var $_show;
+
+		function ConditionGroup($conditions, $pipe = "") {
+                        $this->conditions = array();
+                        foreach($conditions as $condition){
+                            if($condition->show())
+                                    $this->conditions[] = $condition;
+                        }
+                        if(count($this->conditions) === 0) $this->_show = false;
+                        else $this->_show = true;
+
+			$this->pipe = $pipe;
+		}
+
+                function show(){
+                    return $this->_show;
+                }
+
+                function setPipe($pipe){
+                    if($this->pipe !== $pipe) $this->_group = null;
+                    $this->pipe = $pipe;
+                }
+
+		function toString($with_value = true){
+                    if(!isset($this->_group)){
+			$cond_indx = 0;
+                        $group = '';
+
+			foreach($this->conditions as $condition){
+                            if($cond_indx === 0) $condition->setPipe("");
+                            $group .= $condition->toString($with_value) . ' ';
+                            $cond_indx++;
+			}
+
+			if($this->pipe !== "" && trim($group) !== ''){
+                            $group = $this->pipe . ' (' . $group . ')';
+                        }
+
+                        $this->_group = $group;
+                    }
+                    return $this->_group;
+		}
+
+		function getArguments(){
+                    $args = array();
+                    foreach($this->conditions as $condition){
+                        $arg = $condition->getArgument();
+                        if($arg) $args[] = $arg;
+                    }
+                    return $args;
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/condition/ConditionSubquery.class.php b/classes/db/queryparts/condition/ConditionSubquery.class.php
new file mode 100644
index 000000000..c515e814b
--- /dev/null
+++ b/classes/db/queryparts/condition/ConditionSubquery.class.php
@@ -0,0 +1,11 @@
+<?php
+
+	class ConditionSubquery extends Condition {
+
+            function ConditionSubquery($column_name, $argument, $operation, $pipe = ""){
+                parent::Condition($column_name, $argument, $operation, $pipe);
+                $this->_value = $this->argument->toString();
+            }
+	}
+
+?>
diff --git a/classes/db/queryparts/condition/ConditionWithArgument.class.php b/classes/db/queryparts/condition/ConditionWithArgument.class.php
new file mode 100644
index 000000000..5a00153f3
--- /dev/null
+++ b/classes/db/queryparts/condition/ConditionWithArgument.class.php
@@ -0,0 +1,41 @@
+<?php
+
+	class ConditionWithArgument extends Condition {
+
+            function ConditionWithArgument($column_name, $argument, $operation, $pipe = ""){
+                    if($argument === null) { $this->_show = false; return; }
+                        parent::Condition($column_name, $argument, $operation, $pipe);
+			$this->_value = $argument->getValue();
+		}
+
+		function getArgument(){
+                    if(!$this->show()) return;
+                    return $this->argument;
+		}
+
+		function toStringWithoutValue(){
+                    $value = $this->argument->getUnescapedValue();
+
+                    if(is_array($value)){
+                        $q = '';
+                        foreach ($value as $v) $q .= '?,';
+                        if($q !== '') $q = substr($q, 0, -1);
+                        $q = '(' . $q . ')';
+                    }
+                    else $q = '?';
+                    return $this->pipe . ' ' . $this->getConditionPart($q);
+		}
+
+		function show(){
+                    if(!isset($this->_show)){
+                        if(!$this->argument->isValid()) $this->_show = false;
+                        if($this->_value === '\'\'') $this->_show = false;
+                        if(!isset($this->_show)){
+                            return parent::show();
+                        }
+                    }
+                    return $this->_show;
+		}
+	}
+
+?>
diff --git a/classes/db/queryparts/condition/ConditionWithoutArgument.class.php b/classes/db/queryparts/condition/ConditionWithoutArgument.class.php
new file mode 100644
index 000000000..68ee35103
--- /dev/null
+++ b/classes/db/queryparts/condition/ConditionWithoutArgument.class.php
@@ -0,0 +1,14 @@
+<?php
+
+	class ConditionWithoutArgument extends Condition {
+		function ConditionWithoutArgument($column_name, $argument, $operation, $pipe = ""){
+                    parent::Condition($column_name, $argument, $operation, $pipe);
+                    if(in_array($operation, array('in', 'notin')))
+                            $this->_value = '('. $argument .')';
+                    else
+                        $this->_value = $argument;
+
+		}
+	}
+
+?>
diff --git a/classes/db/queryparts/expression/ClickCountExpression.class.php b/classes/db/queryparts/expression/ClickCountExpression.class.php
new file mode 100644
index 000000000..a112368e8
--- /dev/null
+++ b/classes/db/queryparts/expression/ClickCountExpression.class.php
@@ -0,0 +1,33 @@
+<?php 
+
+	/**
+	 * @class ClickCountExpression
+	 * @author Arnia Software
+	 * @brief 
+	 *
+	 */
+
+	class ClickCountExpression extends SelectExpression {
+		var $click_count;
+	
+		function ClickCountExpression($column_name, $alias = NULL, $click_count = false){
+			parent::SelectExpression($column_name, $alias);
+			
+			if(!is_bool($click_count)){
+				error_log("Click_count value for $column_name was not boolean", 0);
+				$this->click_count = false;
+				return;
+			}
+			$this->click_count = $click_count;
+		}
+		
+		function show() {
+			return $this->click_count;
+		}
+		
+		function getExpression(){
+			return "$this->column_name = $this->column_name + 1";
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/DeleteExpression.class.php b/classes/db/queryparts/expression/DeleteExpression.class.php
new file mode 100644
index 000000000..611510109
--- /dev/null
+++ b/classes/db/queryparts/expression/DeleteExpression.class.php
@@ -0,0 +1,35 @@
+<?php 
+	/**
+	 * @class DeleteExpression
+	 * @author Arnia Software
+	 * @brief 
+	 *
+	 */
+
+	// TODO Fix this class 
+	class DeleteExpression extends Expression {
+		var $value;
+		
+		function DeleteExpression($column_name, $value){
+			parent::Expression($column_name);
+			$this->value = $value;
+		}
+		
+		function getExpression(){
+			return "$this->column_name = $this->value";
+		}
+		
+		function getValue(){
+			// TODO Escape value according to column type instead of variable type
+			if(!is_numeric($this->value)) return "'".$this->value."'";
+			return $this->value;
+		}
+		
+		function show(){
+			if(!$this->value) return false;
+			return true;
+		}
+	}
+
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/Expression.class.php b/classes/db/queryparts/expression/Expression.class.php
new file mode 100644
index 000000000..bd11929f6
--- /dev/null
+++ b/classes/db/queryparts/expression/Expression.class.php
@@ -0,0 +1,30 @@
+<?php
+	/**
+	 * @class Expression
+	 * @author Corina
+	 * @brief Represents an expression used in select/update/insert/delete statements
+	 * 
+	 *  Examples (expressions are inside double square brackets):
+	 *  	select [[columnA]], [[columnB as aliasB]] from tableA
+	 *  	update tableA set [[columnA = valueA]] where columnB = something
+	 *
+	 */
+
+	class Expression {
+		var $column_name;
+		
+		function Expression($column_name){
+			$this->column_name = $column_name;
+		}
+		
+		function getColumnName(){
+			return $this->column_name;
+		}
+		
+		function show() {
+			return false;
+		}
+		
+		function getExpression() {
+		}
+	}
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/InsertExpression.class.php b/classes/db/queryparts/expression/InsertExpression.class.php
new file mode 100644
index 000000000..89b0754b7
--- /dev/null
+++ b/classes/db/queryparts/expression/InsertExpression.class.php
@@ -0,0 +1,36 @@
+<?php
+
+	/**
+	 * @class InsertExpression
+	 * @author Arnia Software
+	 * @brief
+	 *
+	 */
+
+	class InsertExpression extends Expression {
+		var $argument;
+
+		function InsertExpression($column_name, $argument){
+			parent::Expression($column_name);
+			$this->argument = $argument;
+		}
+
+		function getValue($with_values = true){
+			if($with_values)
+				return $this->argument->getValue();
+			return '?';
+		}
+
+		function show(){
+                    if(!$this->argument) return false;
+                    $value = $this->argument->getValue();
+                    if(!isset($value)) return false;
+                    return true;
+		}
+
+		function getArgument(){
+			return $this->argument;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/SelectExpression.class.php b/classes/db/queryparts/expression/SelectExpression.class.php
new file mode 100644
index 000000000..1f7e54625
--- /dev/null
+++ b/classes/db/queryparts/expression/SelectExpression.class.php
@@ -0,0 +1,40 @@
+<?php
+
+	/**
+	 * @class SelectExpression
+	 * @author Arnia Software
+	 * @brief Represents an expresion that appears in the select clause
+	 *
+	 * @remarks
+	 * 		$column_name can be:
+	 *  		- a table column name
+	 *  		- an sql function - like count(*)
+	 *	  		- an sql expression - substr(column_name, 1, 8) or score1 + score2
+	 *		$column_name is already escaped
+	 */
+
+	class SelectExpression extends Expression {
+		var $column_alias;
+
+		function SelectExpression($column_name, $alias = NULL){
+			parent::Expression($column_name);
+			$this->column_alias = $alias;
+		}
+
+		function getExpression() {
+			return sprintf("%s%s", $this->column_name, $this->column_alias ? " as ".$this->column_alias : "");
+		}
+
+		function show() {
+			return true;
+		}
+
+		function getArgument(){
+			return null;
+		}
+
+                function isSubquery(){
+                    return false;
+                }
+	}
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/StarExpression.class.php b/classes/db/queryparts/expression/StarExpression.class.php
new file mode 100644
index 000000000..eb8d35030
--- /dev/null
+++ b/classes/db/queryparts/expression/StarExpression.class.php
@@ -0,0 +1,20 @@
+<?php 
+
+	/**
+	 * @class StarExpression
+	 * @author Corina
+	 * @brief Represents the * in 'select * from ...' statements 
+	 *
+	 */
+
+	class StarExpression extends SelectExpression {
+		
+		function StarExpression(){
+			parent::SelectExpression("*");
+		}
+		
+		function getArgument(){
+			return null;
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/UpdateExpression.class.php b/classes/db/queryparts/expression/UpdateExpression.class.php
new file mode 100644
index 000000000..067239e34
--- /dev/null
+++ b/classes/db/queryparts/expression/UpdateExpression.class.php
@@ -0,0 +1,58 @@
+<?php
+	/**
+	 * @class UpdateExpression
+	 * @author Arnia Software
+	 * @brief
+	 *
+	 */
+
+	class UpdateExpression extends Expression {
+		var $argument;
+
+		function UpdateExpression($column_name, $argument){
+			parent::Expression($column_name);
+			$this->argument = $argument;
+		}
+
+		function getExpression($with_value = true){
+			if($with_value)
+				return $this->getExpressionWithValue();
+			return $this->getExpressionWithoutValue();
+		}
+
+		function getExpressionWithValue(){
+			$value = $this->argument->getValue();
+                        $operation = $this->argument->getColumnOperation();
+                        if(isset($operation))
+                                return "$this->column_name = $this->column_name $operation $value";
+			return "$this->column_name = $value";
+		}
+
+		function getExpressionWithoutValue(){
+                        $operation = $this->argument->getColumnOperation();
+                        if(isset($operation))
+                                return "$this->column_name = $this->column_name $operation ?";
+			return "$this->column_name = ?";
+		}
+
+		function getValue(){
+			// TODO Escape value according to column type instead of variable type
+			$value = $this->argument->getValue();
+			if(!is_numeric($value)) return "'".$value."'";
+			return $value;
+		}
+
+		function show(){
+                        if(!$this->argument) return false;
+                        $value = $this->argument->getValue();
+			if(!isset($value)) return false;
+			return true;
+		}
+
+		function getArgument(){
+			return $this->argument;
+		}
+	}
+
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
new file mode 100644
index 000000000..2ee8c019b
--- /dev/null
+++ b/classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php
@@ -0,0 +1,41 @@
+<?php
+	/**
+	 * @class UpdateExpression
+	 * @author Arnia Software
+	 * @brief
+	 *
+	 */
+
+	class UpdateExpressionWithoutArgument extends UpdateExpression {
+		var $argument;
+
+		function UpdateExpressionWithoutArgument($column_name, $argument){
+			parent::Expression($column_name);
+			$this->argument = $argument;
+		}
+
+		function getExpression($with_value = true){
+                        return "$this->column_name = $this->argument";
+		}
+
+		function getValue(){
+			// TODO Escape value according to column type instead of variable type
+			$value = $this->argument;
+			if(!is_numeric($value)) return "'".$value."'";
+			return $value;
+		}
+
+		function show(){
+                        if(!$this->argument) return false;
+                        $value = $this->argument;
+			if(!isset($value)) return false;
+			return true;
+		}
+
+		function getArgument(){
+			return null;
+		}
+	}
+
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/limit/Limit.class.php b/classes/db/queryparts/limit/Limit.class.php
new file mode 100644
index 000000000..4cc372434
--- /dev/null
+++ b/classes/db/queryparts/limit/Limit.class.php
@@ -0,0 +1,37 @@
+<?php 
+	class Limit {
+		var $start;
+		var $list_count;
+		var $page_count;
+		var $page;
+
+		function Limit($list_count, $page= NULL, $page_count= NULL){
+			$this->list_count = $list_count;
+			if ($page){
+				$list_count_value = $list_count->getValue();
+				$page_value = $page->getValue();
+				$this->start = ($page_value - 1) * $list_count_value;
+				$this->page_count = $page_count;
+				$this->page = $page;
+			}			
+		}
+		
+		function isPageHandler(){//in case you choose to use query limit in other cases than page select
+			if ($this->page)return true;
+			else return false;
+		}
+		
+		function getOffset(){
+			return $this->start;
+		}
+		
+		function getLimit(){
+			return $this->list_count->getValue();
+		}
+		
+		function toString(){
+			if ($this->page) return $this->start . ' , ' . $this->list_count->getValue();
+			else return $this->list_count->getValue();
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/order/OrderByColumn.class.php b/classes/db/queryparts/order/OrderByColumn.class.php
new file mode 100644
index 000000000..445eaae64
--- /dev/null
+++ b/classes/db/queryparts/order/OrderByColumn.class.php
@@ -0,0 +1,31 @@
+<?php 
+	class OrderByColumn {
+		var $column_name;
+		var $sort_order;
+		
+		function OrderByColumn($column_name, $sort_order){
+			$this->column_name = $column_name;
+			$this->sort_order = $sort_order;
+		}
+		
+		function toString(){
+			$result = $this->getColumnName();
+			$result .= ' ';
+			$result .= is_a($this->sort_order, 'Argument') ? $this->sort_order->getValue() : $this->sort_order;
+			return $result;
+		}
+		
+		function getColumnName(){
+		    return is_a($this->column_name, 'Argument') ? $this->column_name->getValue() : $this->column_name;
+		}
+		
+		function getArguments(){
+			$args = array();
+			if(is_a($this->column_name, 'Argument'))
+				$args[]= $this->column_name;
+			if(is_a($this->sort_order, 'Argument'))
+				$args[] = $this->sort_order; 
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/table/CubridTableWithHint.class.php b/classes/db/queryparts/table/CubridTableWithHint.class.php
new file mode 100644
index 000000000..ae1e7a1fe
--- /dev/null
+++ b/classes/db/queryparts/table/CubridTableWithHint.class.php
@@ -0,0 +1,35 @@
+<?php
+
+	class CubridTableWithHint extends Table {
+		var $name;
+		var $alias;
+                var $index_hints_list;
+
+		function CubridTableWithHint($name, $alias = NULL, $index_hints_list){
+                    parent::Table($name, $alias);
+                    $this->index_hints_list = $index_hints_list;
+		}
+
+		function getIndexHintString(){
+                    $result = '';
+
+                    // Retrieve table prefix, to add it to index name
+                    $db_info = Context::getDBInfo();
+                    $prefix = $db_info->master_db["db_table_prefix"];
+
+                    foreach($this->index_hints_list as $index_hint){
+                        $index_hint_type = $index_hint->getIndexHintType();
+                        if($index_hint_type !== 'IGNORE'){
+                            $result .= $this->alias . '.'
+                                        . '"' . $prefix . substr($index_hint->getIndexName(), 1)
+                                        . ($index_hint_type == 'FORCE' ? '(+)' : '')
+                                        . ', ';
+                        }
+
+                    }
+                    $result = substr($result, 0, -2);
+                    return $result;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/table/IndexHint.class.php b/classes/db/queryparts/table/IndexHint.class.php
new file mode 100644
index 000000000..6f24a954b
--- /dev/null
+++ b/classes/db/queryparts/table/IndexHint.class.php
@@ -0,0 +1,21 @@
+<?php
+
+	class IndexHint {
+		var $index_name;
+		var $index_hint_type;
+
+		function IndexHint($index_name, $index_hint_type){
+                    $this->index_name = $index_name;
+                    $this->index_hint_type = $index_hint_type;
+		}
+
+                function getIndexName(){
+                    return $this->index_name;
+                }
+
+                function getIndexHintType() {
+                    return $this->index_hint_type;
+                }
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/table/JoinTable.class.php b/classes/db/queryparts/table/JoinTable.class.php
new file mode 100644
index 000000000..7738667d1
--- /dev/null
+++ b/classes/db/queryparts/table/JoinTable.class.php
@@ -0,0 +1,37 @@
+<?php 
+
+	/**
+	 * @class JoinTable
+	 * @author Arnia Software
+	 * @brief 
+	 * 
+	 * @remarks
+	 * 		$conditions in an array of Condition objects 
+	 *
+	 */
+
+	class JoinTable extends Table {
+		var $join_type;
+		var $conditions;
+		
+		function JoinTable($name, $alias, $join_type, $conditions){
+			parent::Table($name, $alias);
+			$this->join_type = $join_type;
+			$this->conditions = $conditions;
+		}
+		
+		function toString($with_value = true){
+			$part = $this->join_type . ' ' . $this->name ;
+			$part .= $this->alias ? ' as ' . $this->alias : '';
+			$part .= ' on ';
+			foreach($this->conditions as $conditionGroup)
+				$part .= $conditionGroup->toString($with_value);
+			return $part;
+		}
+		
+		function isJoinTable(){
+			return true;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/table/MssqlTableWithHint.class.php b/classes/db/queryparts/table/MssqlTableWithHint.class.php
new file mode 100644
index 000000000..a3c2e46e6
--- /dev/null
+++ b/classes/db/queryparts/table/MssqlTableWithHint.class.php
@@ -0,0 +1,29 @@
+<?php
+
+	class MssqlTableWithHint extends Table {
+		var $name;
+		var $alias;
+                var $index_hints_list;
+
+		function MssqlTableWithHint($name, $alias = NULL, $index_hints_list){
+                    parent::Table($name, $alias);
+                    $this->index_hints_list = $index_hints_list;
+		}
+
+                function toString(){
+                    $result = parent::toString();
+
+                    $index_hint_string = '';
+                    foreach($this->index_hints_list as $index_hint){
+                        $index_hint_type = $index_hint->getIndexHintType();
+                        if(in_array($index_hint_type, array('USE', 'FORCE')))
+                                $index_hint_string .= 'INDEX(' . $index_hint->getIndexName() . '), ';
+                    }
+                    if($index_hint_string != ''){
+                        $result .= ' WITH(' . substr($index_hint_string, 0, -2) . ') ';
+                    }
+                    return $result;
+                }
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/table/MysqlTableWithHint.class.php b/classes/db/queryparts/table/MysqlTableWithHint.class.php
new file mode 100644
index 000000000..58bdcac73
--- /dev/null
+++ b/classes/db/queryparts/table/MysqlTableWithHint.class.php
@@ -0,0 +1,36 @@
+<?php
+
+	class MysqlTableWithHint extends Table {
+		var $name;
+		var $alias;
+                var $index_hints_list;
+
+		function MysqlTableWithHint($name, $alias = NULL, $index_hints_list){
+                    parent::Table($name, $alias);
+                    $this->index_hints_list = $index_hints_list;
+		}
+
+                function toString(){
+                    $result = parent::toString();
+
+                    $use_index_hint = ''; $force_index_hint = ''; $ignore_index_hint = '';
+                    foreach($this->index_hints_list as $index_hint){
+                        $index_hint_type = $index_hint->getIndexHintType();
+                        if($index_hint_type == 'USE') $use_index_hint .= $index_hint->getIndexName() . ', ';
+                        else if($index_hint_type == 'FORCE') $force_index_hint .= $index_hint->getIndexName() . ', ';
+                        else if($index_hint_type == 'IGNORE') $ignore_index_hint .= $index_hint->getIndexName() . ', ';
+                    }
+                    if($use_index_hint != ''){
+                        $result .= ' USE INDEX (' . substr($use_index_hint, 0, -2) . ') ';
+                    }
+                    if($force_index_hint != ''){
+                        $result .= ' FORCE INDEX (' . substr($force_index_hint, 0, -2) . ') ';
+                    }
+                    if($ignore_index_hint != ''){
+                        $result .= ' IGNORE INDEX (' . substr($ignore_index_hint, 0, -2) . ') ';
+                    }
+                    return $result;
+                }
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/db/queryparts/table/Table.class.php b/classes/db/queryparts/table/Table.class.php
new file mode 100644
index 000000000..3a19d3a97
--- /dev/null
+++ b/classes/db/queryparts/table/Table.class.php
@@ -0,0 +1,30 @@
+<?php 
+
+	class Table {
+		var $name;
+		var $alias;
+		
+		function Table($name, $alias = NULL){
+			$this->name = $name;
+			$this->alias = $alias;
+		}
+		
+		function toString(){
+                    //return $this->name;
+                    return sprintf("%s%s", $this->name, $this->alias ? ' as ' . $this->alias : '');
+		}
+		
+		function getName(){
+			return $this->name;
+		}
+		
+		function getAlias(){
+			return $this->alias;
+		}
+		
+		function isJoinTable(){
+                    return false;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/display/DisplayHandler.class.php b/classes/display/DisplayHandler.class.php
index 8ad991f7a..0327211b9 100644
--- a/classes/display/DisplayHandler.class.php
+++ b/classes/display/DisplayHandler.class.php
@@ -1,278 +1,270 @@
-<?php
-    /**
-    * @class DisplayHandler
-    * @author NHN (developers@xpressengine.com)
-    * @brief DisplayHandler is responsible for displaying the execution result. \n 
-    *  Depending on the request type, it can display either HTML or XML content.\n
-    *  Xml content is simple xml presentation of variables in oModule while html content
-    *   is the combination of the variables of oModue and template files/.
-    **/
-
-    class DisplayHandler extends Handler {
-
-        var $content_size = 0; ///< 출력하는 컨텐츠의 사이즈
-
-        var $gz_enabled = false; ///< gzip 압축하여 컨텐츠 호출할 것인지에 대한 flag변수
-		var $handler = null;
-
-        /**
-         * @brief print either html or xml content given oModule object 
-         * @remark addon execution and the trigger execution are included within this method, which
-         * might create inflexibility for the fine grained caching
-        * @param[in] $oModule the module object
-        **/
-        function printContent(&$oModule) {
-
-            // gzip encoding 지원 여부 체크
-            if(
-                (defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
-                strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false &&
-                function_exists('ob_gzhandler') &&
-                extension_loaded('zlib')
-            ) $this->gz_enabled = true;
-
-            // request method에 따른 컨텐츠 결과물 추출 
-            if(Context::get('xeVirtualRequestMethod')=='xml') {
-				require_once("./classes/display/VirtualXMLDisplayHandler.php");
-				$handler = new VirtualXMLDisplayHandler();
-			}
-            else if(Context::getRequestMethod() == 'XMLRPC') {
-				require_once("./classes/display/XMLDisplayHandler.php");
-				$handler = new XMLDisplayHandler();
-				if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) $this->gz_enabled = false;
-			}
-            else if(Context::getRequestMethod() == 'JSON') {
-				require_once("./classes/display/JSONDisplayHandler.php");
-				$handler = new JSONDisplayHandler();
-			}
-            else {
-				require_once("./classes/display/HTMLDisplayHandler.php");
-				$handler = new HTMLDisplayHandler();
-			}
-
-			$output = $handler->toDoc($oModule);
-
-            // 출력하기 전에 trigger 호출 (before)
-            ModuleHandler::triggerCall('display', 'before', $output);
-
-            // 애드온 실행
-            $called_position = 'before_display_content';
-            $oAddonController = &getController('addon');
-            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?"mobile":"pc");
-            @include($addon_file);
-
-			if(method_exists($handler, "prepareToPrint")) $handler->prepareToPrint($output);
-
-            // header 출력
-            if($this->gz_enabled) header("Content-Encoding: gzip");
-			if(Context::getResponseMethod() == 'JSON') $this->_printJSONHeader();
-			else if(Context::getResponseMethod() != 'HTML') $this->_printXMLHeader();
-			else $this->_printHTMLHeader();
-
-            // debugOutput 출력
-            $this->content_size = strlen($output);
-            $output .= $this->_debugOutput();
-
-            // 결과물 직접 출력
-            if($this->gz_enabled) print ob_gzhandler($output, 5);
-            else print $output;
-
-            // 출력 후 trigger 호출 (after)
-            ModuleHandler::triggerCall('display', 'after', $content);
-        }
-
-
-        /**
-         * @brief Print debugging message to designated output source depending on the value set to __DEBUG_OUTPUT_. \n
-         *  This method only functions when __DEBUG__ variable is set to 1.
-         *  __DEBUG_OUTPUT__ == 0, messages are written in ./files/_debug_message.php
-         **/
-        function _debugOutput() {
-            if(!__DEBUG__) return;
-
-            $end = getMicroTime();
-
-            // Firebug 콘솔 출력
-            if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1) {
-                static $firephp;
-                if(!isset($firephp)) $firephp = FirePHP::getInstance(true);
-
-                if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
-                    $firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
-                    return;
-                }
-
-                // 전체 실행 시간 출력, Request/Response info 출력
-                if(__DEBUG__ & 2) {
-                    $firephp->fb(
-                        array('Request / Response info >>> '.$_SERVER['REQUEST_METHOD'].' / '.Context::getResponseMethod(),
-                            array(
-                                array('Request URI', 'Request method', 'Response method', 'Response contents size'),
-                                array(
-                                    sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']),
-                                    $_SERVER['REQUEST_METHOD'],
-                                    Context::getResponseMethod(),
-                                    $this->content_size.' byte'
-                                )
-                            )
-                        ),
-                        'TABLE'
-                    );
-                    $firephp->fb(
-                        array('Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
-                            array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans Content'),
-                                array(
-                                    sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
-                                    sprintf('%0.5f sec', $GLOBALS['__elapsed_class_load__']),
-                                    sprintf('%0.5f sec (%d called)', $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']),
-                                    sprintf('%0.5f sec', $GLOBALS['__xmlparse_elapsed__']),
-                                    sprintf('%0.5f sec', $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']),
-                                    sprintf('%0.5f sec', $GLOBALS['__widget_excute_elapsed__']),
-                                    sprintf('%0.5f sec', $GLOBALS['__trans_content_elapsed__'])
-                                )
-                            )
-                        ),
-                        'TABLE'
-                    );
-                }
-
-                // DB 쿼리 내역 출력
-                if((__DEBUG__ & 4) && $GLOBALS['__db_queries__']) {
-                    $queries_output = array(array('Query', 'Elapsed time', 'Result'));
-                    foreach($GLOBALS['__db_queries__'] as $query) {
-                        array_push($queries_output, array($query['query'], sprintf('%0.5f', $query['elapsed_time']), $query['result']));
-                    }
-                    $firephp->fb(
-                        array(
-                            'DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
-                            $queries_output
-                        ),
-                        'TABLE'
-                    );
-                }
-
-
-            // 파일 및 HTML 주석으로 출력
-            } else {
-
-                // 전체 실행 시간 출력, Request/Response info 출력
-                if(__DEBUG__ & 2) {
-                    if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
-                        return;
-                    }
-
-                    // Request/Response 정보 작성
-                    $buff .= "\n- Request/ Response info\n";
-                    $buff .= sprintf("\tRequest URI \t\t\t: %s:%s%s%s%s\n", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']);
-                    $buff .= sprintf("\tRequest method \t\t\t: %s\n", $_SERVER['REQUEST_METHOD']);
-                    $buff .= sprintf("\tResponse method \t\t: %s\n", Context::getResponseMethod());
-                    $buff .= sprintf("\tResponse contents size\t\t: %d byte\n", $this->content_size);
-
-                    // 전체 실행 시간
-                    $buff .= sprintf("\n- Total elapsed time : %0.5f sec\n", $end-__StartTime__);
-
-                    $buff .= sprintf("\tclass file load elapsed time \t: %0.5f sec\n", $GLOBALS['__elapsed_class_load__']);
-                    $buff .= sprintf("\tTemplate compile elapsed time\t: %0.5f sec (%d called)\n", $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']);
-                    $buff .= sprintf("\tXmlParse compile elapsed time\t: %0.5f sec\n", $GLOBALS['__xmlparse_elapsed__']);
-                    $buff .= sprintf("\tPHP elapsed time \t\t: %0.5f sec\n", $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']);
-
-                    // 위젯 실행 시간 작성
-                    $buff .= sprintf("\n\tWidgets elapsed time \t\t: %0.5f sec", $GLOBALS['__widget_excute_elapsed__']);
-
-                    // 레이아웃 실행 시간
-                    $buff .= sprintf("\n\tLayout compile elapsed time \t: %0.5f sec", $GLOBALS['__layout_compile_elapsed__']);
-
-                    // 위젯, 에디터 컴포넌트 치환 시간
-                    $buff .= sprintf("\n\tTrans Content \t\t\t: %0.5f sec\n", $GLOBALS['__trans_content_elapsed__']);
-                }
-
-                // DB 로그 작성
-                if(__DEBUG__ & 4) {
-                    if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
-                        return;
-                    }
-
-                    if($GLOBALS['__db_queries__']) {
-                        $buff .= sprintf("\n- DB Queries : %d Queries. %0.5f sec\n", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
-                        $num = 0;
-
-                        foreach($GLOBALS['__db_queries__'] as $query) {
-                            $buff .= sprintf("\t%02d. %s\n\t\t%0.6f sec. ", ++$num, $query['query'], $query['elapsed_time']);
-                            if($query['result'] == 'Success') {
-                                $buff .= "Query Success\n";
-                            } else {
-                                $buff .= sprintf("Query $s : %d\n\t\t\t   %s\n", $query['result'], $query['errno'], $query['errstr']);
-                            }
-                        }
-                    }
-                }
-
-                // HTML 주석으로 출력
-                if($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML') {
-                    $buff = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
-
-                    if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
-                        $buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
-                    }
-
-                    return "<!--\r\n".$buff."\r\n-->";
-                }
-
-                // 파일에 출력
-                if($buff && __DEBUG_OUTPUT__ == 0) {
-                    $debug_file = _XE_PATH_.'files/_debug_message.php';
-                    $buff = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
-
-                    $buff = str_repeat('=', 40)."\n".$buff.str_repeat('-', 40);
-                    $buff = "\n<?php\n/*".$buff."*/\n?>\n";
-
-                    if(@!$fp = fopen($debug_file, 'a')) return;
-                    fwrite($fp, $buff);
-                    fclose($fp);
-                }
-            }
-        }
-
-		/**
-		 * @brief print a HTTP HEADER for XML, which is encoded in UTF-8
-		 **/
-		function _printXMLHeader() {
-			header("Content-Type: text/xml; charset=UTF-8");
-			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-			header("Cache-Control: no-store, no-cache, must-revalidate");
-			header("Cache-Control: post-check=0, pre-check=0", false);
-			header("Pragma: no-cache");
-		}
-
-
-		/**
-		 * @brief print a HTTP HEADER for HTML, which is encoded in UTF-8
-		 **/
-		function _printHTMLHeader() {
-			header("Content-Type: text/html; charset=UTF-8");
-			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-			header("Cache-Control: no-store, no-cache, must-revalidate");
-			header("Cache-Control: post-check=0, pre-check=0", false);
-			header("Pragma: no-cache");
-		}
-
-
-		/**
-		 * @brief print a HTTP HEADER for JSON, which is encoded in UTF-8
-		 **/
-		function _printJSONHeader() {
-			header("Content-Type: text/html; charset=UTF-8");
-			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-			header("Cache-Control: no-store, no-cache, must-revalidate");
-			header("Cache-Control: post-check=0, pre-check=0", false);
-			header("Pragma: no-cache");
-		}
-
-
-
-
-    }
-?>
+<?php
+    /**
+    * @class DisplayHandler
+    * @author NHN (developers@xpressengine.com)
+    * @brief DisplayHandler is responsible for displaying the execution result. \n
+    *  Depending on the request type, it can display either HTML or XML content.\n
+    *  Xml content is simple xml presentation of variables in oModule while html content
+    *   is the combination of the variables of oModue and template files/.
+    **/
+
+    class DisplayHandler extends Handler {
+
+        var $content_size = 0; // /< The size of displaying contents
+
+        var $gz_enabled = false; // / <a flog variable whether to call contents after compressing by gzip
+		var $handler = null;
+
+        /**
+         * @brief print either html or xml content given oModule object
+         * @remark addon execution and the trigger execution are included within this method, which
+         * might create inflexibility for the fine grained caching
+        * @param[in] $oModule the module object
+        **/
+        function printContent(&$oModule) {
+            // Check if the gzip encoding supported
+            if(
+                (defined('__OB_GZHANDLER_ENABLE__') && __OB_GZHANDLER_ENABLE__ == 1) &&
+                strpos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip')!==false &&
+                function_exists('ob_gzhandler') &&
+                extension_loaded('zlib')
+            ) $this->gz_enabled = true;
+            // Extract contents to display by the request method
+            if(Context::get('xeVirtualRequestMethod')=='xml') {
+				require_once("./classes/display/VirtualXMLDisplayHandler.php");
+				$handler = new VirtualXMLDisplayHandler();
+			}
+            else if(Context::getRequestMethod() == 'XMLRPC') {
+				require_once("./classes/display/XMLDisplayHandler.php");
+				$handler = new XMLDisplayHandler();
+				if(strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE') !== false) $this->gz_enabled = false;
+			}
+            else if(Context::getRequestMethod() == 'JSON') {
+				require_once("./classes/display/JSONDisplayHandler.php");
+				$handler = new JSONDisplayHandler();
+			}
+            else {
+				require_once("./classes/display/HTMLDisplayHandler.php");
+				$handler = new HTMLDisplayHandler();
+			}
+
+			$output = $handler->toDoc($oModule);
+			// call a trigger before display
+			ModuleHandler::triggerCall('display', 'before', $output);
+			// execute add-on
+			$called_position = 'before_display_content';
+			$oAddonController = &getController('addon');
+			$addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?"mobile":"pc");
+			@include($addon_file);
+
+			if(method_exists($handler, "prepareToPrint")) $handler->prepareToPrint($output);
+			// header output
+			if($this->gz_enabled) header("Content-Encoding: gzip");
+
+			$httpStatusCode = $oModule->getHttpStatusCode();
+			if($httpStatusCode && $httpStatusCode != 200) $this->_printHttpStatusCode($httpStatusCode);
+			else
+			{
+				if(Context::getResponseMethod() == 'JSON') $this->_printJSONHeader();
+				else if(Context::getResponseMethod() != 'HTML') $this->_printXMLHeader();
+				else $this->_printHTMLHeader();
+			}
+
+			// debugOutput output
+			$this->content_size = strlen($output);
+			$output .= $this->_debugOutput();
+			// results directly output
+			if($this->gz_enabled) print ob_gzhandler($output, 5);
+			else print $output;
+			// call a trigger after display
+			ModuleHandler::triggerCall('display', 'after', $content);
+        }
+
+
+        /**
+         * @brief Print debugging message to designated output source depending on the value set to __DEBUG_OUTPUT_. \n
+         *  This method only functions when __DEBUG__ variable is set to 1.
+         *  __DEBUG_OUTPUT__ == 0, messages are written in ./files/_debug_message.php
+         **/
+        function _debugOutput() {
+            if(!__DEBUG__) return;
+
+            $end = getMicroTime();
+            // Firebug console output
+            if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1) {
+                static $firephp;
+                if(!isset($firephp)) $firephp = FirePHP::getInstance(true);
+
+                if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+                    $firephp->fb('Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php', 'The IP address is not allowed.');
+                    return;
+                }
+                // display total execution time and Request/Response info
+                if(__DEBUG__ & 2) {
+                    $firephp->fb(
+                        array('Request / Response info >>> '.$_SERVER['REQUEST_METHOD'].' / '.Context::getResponseMethod(),
+                            array(
+                                array('Request URI', 'Request method', 'Response method', 'Response contents size'),
+                                array(
+                                    sprintf("%s:%s%s%s%s", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']),
+                                    $_SERVER['REQUEST_METHOD'],
+                                    Context::getResponseMethod(),
+                                    $this->content_size.' byte'
+                                )
+                            )
+                        ),
+                        'TABLE'
+                    );
+                    $firephp->fb(
+                        array('Elapsed time >>> Total : '.sprintf('%0.5f sec', $end - __StartTime__),
+                            array(array('DB queries', 'class file load', 'Template compile', 'XmlParse compile', 'PHP', 'Widgets', 'Trans Content'),
+                                array(
+                                    sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+                                    sprintf('%0.5f sec', $GLOBALS['__elapsed_class_load__']),
+                                    sprintf('%0.5f sec (%d called)', $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']),
+                                    sprintf('%0.5f sec', $GLOBALS['__xmlparse_elapsed__']),
+                                    sprintf('%0.5f sec', $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']),
+                                    sprintf('%0.5f sec', $GLOBALS['__widget_excute_elapsed__']),
+                                    sprintf('%0.5f sec', $GLOBALS['__trans_content_elapsed__'])
+                                )
+                            )
+                        ),
+                        'TABLE'
+                    );
+                }
+                // display DB query history
+                if((__DEBUG__ & 4) && $GLOBALS['__db_queries__']) {
+                    $queries_output = array(array('Query', 'Elapsed time', 'Result'));
+                    foreach($GLOBALS['__db_queries__'] as $query) {
+                        array_push($queries_output, array($query['query'], sprintf('%0.5f', $query['elapsed_time']), $query['result']));
+                    }
+                    $firephp->fb(
+                        array(
+                            'DB Queries >>> '.count($GLOBALS['__db_queries__']).' Queries, '.sprintf('%0.5f sec', $GLOBALS['__db_elapsed_time__']),
+                            $queries_output
+                        ),
+                        'TABLE'
+                    );
+                }
+            // dislpay the file and HTML comments
+            } else {
+                // display total execution time and Request/Response info
+                if(__DEBUG__ & 2) {
+                    if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+                        return;
+                    }
+                    // Request/Response information
+                    $buff .= "\n- Request/ Response info\n";
+                    $buff .= sprintf("\tRequest URI \t\t\t: %s:%s%s%s%s\n", $_SERVER['SERVER_NAME'], $_SERVER['SERVER_PORT'], $_SERVER['PHP_SELF'], $_SERVER['QUERY_STRING']?'?':'', $_SERVER['QUERY_STRING']);
+                    $buff .= sprintf("\tRequest method \t\t\t: %s\n", $_SERVER['REQUEST_METHOD']);
+                    $buff .= sprintf("\tResponse method \t\t: %s\n", Context::getResponseMethod());
+                    $buff .= sprintf("\tResponse contents size\t\t: %d byte\n", $this->content_size);
+                    // total execution time
+                    $buff .= sprintf("\n- Total elapsed time : %0.5f sec\n", $end-__StartTime__);
+
+                    $buff .= sprintf("\tclass file load elapsed time \t: %0.5f sec\n", $GLOBALS['__elapsed_class_load__']);
+                    $buff .= sprintf("\tTemplate compile elapsed time\t: %0.5f sec (%d called)\n", $GLOBALS['__template_elapsed__'], $GLOBALS['__TemplateHandlerCalled__']);
+                    $buff .= sprintf("\tXmlParse compile elapsed time\t: %0.5f sec\n", $GLOBALS['__xmlparse_elapsed__']);
+                    $buff .= sprintf("\tPHP elapsed time \t\t: %0.5f sec\n", $end-__StartTime__-$GLOBALS['__template_elapsed__']-$GLOBALS['__xmlparse_elapsed__']-$GLOBALS['__db_elapsed_time__']-$GLOBALS['__elapsed_class_load__']);
+		    $buff .= sprintf("\tDB class elapsed time \t\t: %0.5f sec\n", $GLOBALS['__dbclass_elapsed_time__'] -$GLOBALS['__db_elapsed_time__']);
+                    // widget execution time
+                    $buff .= sprintf("\n\tWidgets elapsed time \t\t: %0.5f sec", $GLOBALS['__widget_excute_elapsed__']);
+                    // layout execution time
+                    $buff .= sprintf("\n\tLayout compile elapsed time \t: %0.5f sec", $GLOBALS['__layout_compile_elapsed__']);
+                    // Widgets, the editor component replacement time
+                    $buff .= sprintf("\n\tTrans Content \t\t\t: %0.5f sec\n", $GLOBALS['__trans_content_elapsed__']);
+                }
+                // DB Logging
+                if(__DEBUG__ & 4) {
+                    if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+                        return;
+                    }
+
+                    if($GLOBALS['__db_queries__']) {
+                        $buff .= sprintf("\n- DB Queries : %d Queries. %0.5f sec\n", count($GLOBALS['__db_queries__']), $GLOBALS['__db_elapsed_time__']);
+                        $num = 0;
+
+                        foreach($GLOBALS['__db_queries__'] as $query) {
+                            $buff .= sprintf("\t%02d. %s\n\t\t%0.6f sec. ", ++$num, $query['query'], $query['elapsed_time']);
+                            if($query['result'] == 'Success') {
+                                $buff .= "Query Success\n";
+                            } else {
+                                $buff .= sprintf("Query $s : %d\n\t\t\t   %s\n", $query['result'], $query['errno'], $query['errstr']);
+                            }
+                            $buff .= sprintf("\t\tConnection: %s\n", $query['connection']);
+                        }
+                    }
+                }
+                // Output in HTML comments
+                if($buff && __DEBUG_OUTPUT__ == 1 && Context::getResponseMethod() == 'HTML') {
+                    $buff = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
+
+                    if(__DEBUG_PROTECT__ == 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+                        $buff = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
+                    }
+
+                    return "<!--\r\n".$buff."\r\n-->";
+                }
+                // Output to a file
+                if($buff && __DEBUG_OUTPUT__ == 0) {
+                    $debug_file = _XE_PATH_.'files/_debug_message.php';
+                    $buff = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($buff, true));
+
+                    $buff = str_repeat('=', 40)."\n".$buff.str_repeat('-', 40);
+                    $buff = "\n<?php\n/*".$buff."*/\n?>\n";
+
+                    if(@!$fp = fopen($debug_file, 'a')) return;
+                    fwrite($fp, $buff);
+                    fclose($fp);
+                }
+            }
+        }
+
+		/**
+		 * @brief print a HTTP HEADER for XML, which is encoded in UTF-8
+		 **/
+		function _printXMLHeader() {
+			header("Content-Type: text/xml; charset=UTF-8");
+			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Cache-Control: no-store, no-cache, must-revalidate");
+			header("Cache-Control: post-check=0, pre-check=0", false);
+			header("Pragma: no-cache");
+		}
+
+
+		/**
+		 * @brief print a HTTP HEADER for HTML, which is encoded in UTF-8
+		 **/
+		function _printHTMLHeader() {
+			header("Content-Type: text/html; charset=UTF-8");
+			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Cache-Control: no-store, no-cache, must-revalidate");
+			header("Cache-Control: post-check=0, pre-check=0", false);
+			header("Pragma: no-cache");
+		}
+
+
+		/**
+		 * @brief print a HTTP HEADER for JSON, which is encoded in UTF-8
+		 **/
+		function _printJSONHeader() {
+			header("Content-Type: text/html; charset=UTF-8");
+			header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+			header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+			header("Cache-Control: no-store, no-cache, must-revalidate");
+			header("Cache-Control: post-check=0, pre-check=0", false);
+			header("Pragma: no-cache");
+		}
+
+
+		/**
+		 * @brief print a HTTP HEADER for HTML, which is encoded in UTF-8
+		 **/
+		function _printHttpStatusCode($code) {
+			$statusMessage = Context::get('http_status_message');
+			header("HTTP/1.0 $code $statusMessage");
+		}
+    }
+?>
diff --git a/classes/display/HTMLDisplayHandler.php b/classes/display/HTMLDisplayHandler.php
index 577f98163..5b35a2dde 100644
--- a/classes/display/HTMLDisplayHandler.php
+++ b/classes/display/HTMLDisplayHandler.php
@@ -5,19 +5,35 @@ class HTMLDisplayHandler {
 	 * @brief Produce HTML compliant content given a module object.\n
 	 * @param[in] $oModule the module object
 	 **/
-	function toDoc(&$oModule) 
+	function toDoc(&$oModule)
 	{
 		$oTemplate = &TemplateHandler::getInstance();
 
 		// compile module tpl
-		$template_path = $oModule->getTemplatePath();
+		if ($oModule->module_info->module == $oModule->module)
+			$skin = $oModule->origin_module_info->skin;
+		else
+			$skin = $oModule->module_config->skin;
+
+		if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin') === false){
+			if ($skin && is_string($skin)){
+				$theme_skin = explode('.', $skin);
+				if (count($theme_skin) == 2)
+					$template_path = sprintf('./themes/%s/modules/%s/', $theme_skin[0], $theme_skin[1]);
+				else
+					$template_path = $oModule->getTemplatePath();
+			}else{
+				$template_path = $oModule->getTemplatePath();
+			}
+		}else $template_path = $oModule->getTemplatePath();
 		$tpl_file = $oModule->getTemplateFile();
+
 		$output = $oTemplate->compile($template_path, $tpl_file);
 
-		// add #xeAdmin div for adminitration pages
+		// add .x div for adminitration pages
 		if(Context::getResponseMethod() == 'HTML') {
-			if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $output = '<div id="xeAdmin">'.$output.'</div>';
-
+			if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')>0) $output = '<div class="x">'.$output.'</div>';
+			
 			if(Context::get('layout') != 'none') {
 				if(__DEBUG__==3) $start = getMicroTime();
 
@@ -28,32 +44,32 @@ class HTMLDisplayHandler {
 
 				$edited_layout_file = $oModule->getEditedLayoutFile();
 
-				// 현재 요청된 레이아웃 정보를 구함
+				// get the layout information currently requested
 				$oLayoutModel = &getModel('layout');
 				$layout_info = Context::get('layout_info');
 				$layout_srl = $layout_info->layout_srl;
 
-				// 레이아웃과 연결되어 있으면 레이아웃 컴파일
+				// compile if connected to the layout
 				if($layout_srl > 0){
 
-					// faceoff 레이아웃일 경우 별도 처리
+					// handle separately if the layout is faceoff
 					if($layout_info && $layout_info->type == 'faceoff') {
 						$oLayoutModel->doActivateFaceOff($layout_info);
 						Context::set('layout_info', $layout_info);
 					}
 
-					// 관리자 레이아웃 수정화면에서 변경된 CSS가 있는지 조사
+					// search if the changes CSS exists in the admin layout edit window
 					$edited_layout_css = $oLayoutModel->getUserLayoutCss($layout_srl);
 
-					if(file_exists($edited_layout_css)) Context::addCSSFile($edited_layout_css,true,'all','',100);
+					if(file_exists($edited_layout_css)) Context::loadFile(array($edited_layout_css,'all','',100));
 				}
-				if(!$layout_path) $layout_path = "./common/tpl";
-				if(!$layout_file) $layout_file = "default_layout";
+				if(!$layout_path) $layout_path = './common/tpl';
+				if(!$layout_file) $layout_file = 'default_layout';
 				$output = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
 
 				if(__DEBUG__==3) $GLOBALS['__layout_compile_elapsed__'] = getMicroTime()-$start;
 
-				if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get("_use_ssl")=='optional'||Context::get("_use_ssl")=="always")) {
+				if(preg_match('/MSIE/i',$_SERVER['HTTP_USER_AGENT']) && (Context::get('_use_ssl') == 'optional' || Context::get('_use_ssl') == 'always')) {
 					Context::addHtmlFooter('<iframe id="xeTmpIframe" name="xeTmpIframe" style="width:1px;height:1px;position:absolute;top:-2px;left:-2px;"></iframe>');
 				}
 			}
@@ -63,16 +79,16 @@ class HTMLDisplayHandler {
 
 	function prepareToPrint(&$output) {
 		if(Context::getResponseMethod() != 'HTML') return;
-		
+
 		if(__DEBUG__==3) $start = getMicroTime();
 
-		// body 내의 <style ..></style>를 header로 이동
+		// move <style ..></style> in body to the header
 		$output = preg_replace_callback('!<style(.*?)<\/style>!is', array($this,'_moveStyleToHeader'), $output);
 
-		// 메타 파일 변경 (캐싱기능등으로 인해 위젯등에서 <!--Meta:경로--> 태그를 content에 넣는 경우가 있음
+		// change a meta fine(widget often put the tag like <!--Meta:path--> to the content because of caching)
 		$output = preg_replace_callback('/<!--(#)?Meta:([a-z0-9\_\/\.\@]+)-->/is', array($this,'_transMeta'), $output);
 
-		// rewrite module 사용시 생기는 상대경로에 대한 처리를 함
+		// handles a relative path generated by using the rewrite module
 		if(Context::isAllowRewrite()) {
 			$url = parse_url(Context::getRequestUri());
 			$real_path = $url['path'];
@@ -89,15 +105,31 @@ class HTMLDisplayHandler {
 			}
 		}
 
-		// 간혹 background-image에 url(none) 때문에 request가 한번 더 일어나는 경우가 생기는 것을 방지
+		// prevent the 2nd request due to url(none) of the background-image
 		$output = preg_replace('/url\((["\']?)none(["\']?)\)/is', 'none', $output);
 
+		if(is_array(Context::get('INPUT_ERROR')))
+		{
+			$INPUT_ERROR = Context::get('INPUT_ERROR');
+			$keys = array_keys($INPUT_ERROR);
+			$keys = '('.implode('|', $keys).')';
+
+			$output = preg_replace_callback('@(<input)([^>]*?)\sname="'.$keys.'"([^>]*?)/?>@is', array(&$this, '_preserveValue'), $output);
+		}
+
 		if(__DEBUG__==3) $GLOBALS['__trans_content_elapsed__'] = getMicroTime()-$start;
 
-		// 불필요한 정보 제거
+		// Remove unnecessary information
 		$output = preg_replace('/member\_\-([0-9]+)/s','member_0',$output);
 
-		// 최종 레이아웃 변환
+		// set icon
+		$oAdminModel = &getAdminModel('admin');
+		$favicon_url = $oAdminModel->getFaviconUrl();
+		$mobicon_url = $oAdminModel->getMobileIconUrl();
+		Context::set('favicon_url', $favicon_url);
+		Context::set('mobicon_url', $mobicon_url);
+
+		// convert the final layout
 		Context::set('content', $output);
 		$oTemplate = &TemplateHandler::getInstance();
 		if(Mobile::isFromMobilePhone()) {
@@ -106,14 +138,45 @@ class HTMLDisplayHandler {
 		else
 		{
 			$this->_loadJSCSS();
+			$this->_addMetaTag();
 			$output = $oTemplate->compile('./common/tpl', 'common_layout');
 		}
 
-		// 사용자 정의 언어 변환
+		// replace the user-defined-language
 		$oModuleController = &getController('module');
 		$oModuleController->replaceDefinedLangCode($output);
 	}
 
+	function _preserveValue($match)
+	{
+		$INPUT_ERROR = Context::get('INPUT_ERROR');
+
+		$str = $match[1].$match[2].' name="'.$match[3].'"'.$match[4];
+
+		// get type
+		$type = 'text';
+		if(preg_match('/\stype="([a-z]+)"/i', $str, $m)) $type = strtolower($m[1]);
+
+		switch($type){
+			case 'text':
+			case 'hidden':
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.$INPUT_ERROR[$match[3]].'"';
+				break;
+			case 'password':
+				$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
+				break;
+			case 'radio':
+			case 'checkbox':
+				$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);
+				if(preg_match('@\s(?i:value)="'.$INPUT_ERROR[$match[3]].'"@', $str)) {
+					$str .= ' checked="checked"';
+				}
+				break;
+		}
+
+		return $str.' />';
+	}
+
 	/**
 	 * @brief add html style code extracted from html body to Context, which will be
 	 * printed inside <header></header> later.
@@ -124,33 +187,53 @@ class HTMLDisplayHandler {
 	}
 
 	/**
-	 * @brief add given .css or .js file names in widget code to Context       
+	 * @brief add given .css or .js file names in widget code to Context
 	 * @param[in] $oModule the module object
 	 **/
 	function _transMeta($matches) {
 		if($matches[1]) return '';
-		if(substr($matches[2],'-4')=='.css') Context::addCSSFile($matches[2]);
-		elseif(substr($matches[2],'-3')=='.js') Context::addJSFile($matches[2]);
+		Context::loadFile($matches[2]);
 	}
 
 	function _loadJSCSS()
 	{
-		$oContext =& Context::getInstance();
+		$oContext  =& Context::getInstance();
+		$lang_type =  Context::getLangType();
+
 		// add common JS/CSS files
-		$oContext->addJsFile('./common/js/jquery.js', false, '', -100000);
-		$oContext->addJsFile('./common/js/x.js', false, '', -100000);
-		$oContext->addJsFile('./common/js/common.js', false, '', -100000);
-		$oContext->addJsFile('./common/js/js_app.js', false, '', -100000);
-		$oContext->addJsFile('./common/js/xml_handler.js', false, '', -100000);
-		$oContext->addJsFile('./common/js/xml_js_filter.js', false, '', -100000);
-		$oContext->addCSSFile('./common/css/default.css', false, 'all', '', -100000);
-		$oContext->addCSSFile('./common/css/button.css', false, 'all', '', -100000);
+		if(__DEBUG__) {
+			$oContext->loadFile(array('./common/js/jquery.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/x.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/common.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/js_app.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/css/xe.css', 'all', '', -100000), true);
+		} else {
+			$oContext->loadFile(array('./common/js/jquery.min.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/x.min.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/js/xe.min.js', 'head', '', -100000), true);
+			$oContext->loadFile(array('./common/css/xe.min.css', 'all', '', -100000), true);
+		}
 
 		// for admin page, add admin css
 		if(Context::get('module')=='admin' || strpos(Context::get('act'),'Admin')>0){
-			$oContext->addCSSFile('./modules/admin/tpl/css/font.css', false, 'all', '',10000);
-			$oContext->addCSSFile('./modules/admin/tpl/css/pagination.css', false, 'all', '', 100001);
-			$oContext->addCSSFile('./modules/admin/tpl/css/admin.css', false, 'all', '', 100002);
+			if(__DEBUG__) {
+				$oContext->loadFile(array('./modules/admin/tpl/css/admin.css', 'all', '', 100000), true);
+				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", 'all', '', 100000), true);
+				$oContext->loadFile('./modules/admin/tpl/js/admin.js', true);
+			} else {
+				$oContext->loadFile(array('./modules/admin/tpl/css/admin.min.css', 'all', '', 100000), true);
+				$oContext->loadFile(array("./modules/admin/tpl/css/admin_{$lang_type}.css", 'all', '',10000), true);
+				$oContext->loadFile('./modules/admin/tpl/js/admin.min.js', true);
+			}
 		}
 	}
+
+	function _addMetaTag()
+	{
+		$oContext =& Context::getInstance();
+		$oContext->addMetaTag('Content-Type', 'text/html; charset=UTF-8', true);
+		$oContext->addMetaTag('imagetoolbar', 'no');
+	}
 }
diff --git a/classes/editor/EditorHandler.class.php b/classes/editor/EditorHandler.class.php
index 930139792..0db5f451e 100644
--- a/classes/editor/EditorHandler.class.php
+++ b/classes/editor/EditorHandler.class.php
@@ -1,27 +1,27 @@
-<?php
-    /**
-    * @class EditorHandler
-    * @author NHN (developers@xpressengine.com)
-    * @brief edit component의 상위 클래스임
-    *
-    * 주로 하는 일은 컴포넌트 요청시 컴포넌트에서 필요로 하는 변수를 세팅해준다
-    **/
-
-    class EditorHandler extends Object {
-
-        /**
-         * @brief 컴포넌트의 xml및 관련 정보들을 설정
-         **/
-        function setInfo($info) {
-            Context::set('component_info', $info);
-
-            if(!$info->extra_vars) return;
-
-            foreach($info->extra_vars as $key => $val) {
-                $this->{$key} = trim($val->value);
-            }
-        }
-
-    }
-
-?>
+<?php
+    /**
+    * @class EditorHandler
+    * @author NHN (developers@xpressengine.com)
+    * @brief superclass of the edit component
+    *
+    * set up the component variables
+    **/
+
+    class EditorHandler extends Object {
+
+        /**
+         * @brief set the xml and other information of the component
+         **/
+        function setInfo($info) {
+            Context::set('component_info', $info);
+
+            if(!$info->extra_vars) return;
+
+            foreach($info->extra_vars as $key => $val) {
+                $this->{$key} = trim($val->value);
+            }
+        }
+
+    }
+
+?>
diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index bf3d83389..db16ac8ba 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -1,311 +1,304 @@
-<?php
-    /**
-     * @class ExtraVar
-     * @author NHN (developers@xpressengine.com)
-     * @brief 게시글, 회원등에서 사용하는 확장변수를 핸들링하는 클래스
-     *
-     **/
-    class ExtraVar {
-
-        var $module_srl = null;
-        var $keys = null;
-
-        /**
-         * @brief constructor
-         **/
-        function &getInstance($module_srl) {
-            return new ExtraVar($module_srl);
-        }
-
-        /**
-         * @brief constructor
-         **/
-        function ExtraVar($module_srl) {
-            $this->module_srl = $module_srl;
-        }
-
-        /**
-         * @brief 확장변수 키를 등록
-         * @param module_srl, idx, name, type, default, desc, is_required, search, value
-         **/
-        function setExtraVarKeys($extra_keys) {
-            if(!is_array($extra_keys) || !count($extra_keys)) return;
-            foreach($extra_keys as $key => $val) {
-                $obj = null;
-                $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value,  $val->eid);
-                $this->keys[$val->idx] = $obj;
-            }
-        }
-
-        /**
-         * @brief 확장변수 객체 배열 return
-         **/
-        function getExtraVars() {
-            return $this->keys;
-        }
-    }
-
-    /**
-     * @class ExtraItem
-     * @author NHN (developers@xpressengine.com)
-     * @brief 확장변수의 개별 값
-     **/
-    class ExtraItem {
-        var $module_srl = 0;
-        var $idx = 0;
-        var $name = 0;
-        var $type = 'text';
-        var $default = null;
-        var $desc = '';
-        var $is_required = 'N';
-        var $search = 'N';
-        var $value = null;
-        var $eid = '';
-
-        /**
-         * @brief constructor
-         **/
-        function ExtraItem($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '') {
-            if(!$idx) return;
-            $this->module_srl = $module_srl;
-            $this->idx = $idx;
-            $this->name = $name;
-            $this->type = $type;
-            $this->default = $default;
-            $this->desc = $desc;
-            $this->is_required = $is_required;
-            $this->search = $search;
-            $this->value = $value;
-            $this->eid = $eid;
-        }
-
-        /**
-         * @brief 값 지정
-         **/
-        function setValue($value) {
-            $this->value = $value;
-        }
-
-        /**
-         * @brief type에 따라서 주어진 값을 변형하여 원형 값을 return
-         **/
-        function _getTypeValue($type, $value) {
-            $value = trim($value);
-            if(!isset($value)) return;
-            switch($type) {
-                case 'homepage' :
-                        if($value && !preg_match('/^([a-z]+):\/\//i',$value)) $value = 'http://'.$value;
-                        return htmlspecialchars($value);
-                    break;
-                case 'tel' :
-                        if(is_array($value)) $values = $value;
-                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
-                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
-                        $values[0] = $values[0];
-                        $values[1] = $values[1];
-                        $values[2] = $values[2];
-                        return $values;
-                    break;
-                    break;
-                case 'checkbox' :
-                case 'radio' :
-                case 'select' :
-                        if(is_array($value)) $values = $value;
-                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
-                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
-                        else $values = array($value);
-                        for($i=0;$i<count($values);$i++) $values[$i] = htmlspecialchars($values[$i]);
-                        return $values;
-                    break;
-                case 'kr_zip' :
-                        if(is_array($value)) $values = $value;
-                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
-                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
-                        return $values;
-                    break;
-                //case 'date' :
-                //case 'email_address' :
-                //case 'text' :
-                //case 'textarea' :
-                default :
-                        return htmlspecialchars($value);
-                    break;
-            }
-        }
-
-        /**
-         * @brief 값을 return
-         * 원형 값을 HTML 결과물로 return
-         **/
-        function getValueHTML() {
-            $value = $this->_getTypeValue($this->type, $this->value);
-            switch($this->type) {
-                case 'homepage' :
-                        return ($value)?(sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value)>60?substr($value,0,40).'...'.substr($value,-10):$value)):"";
-                case 'email_address' :
-                        return ($value)?sprintf('<a href="mailto:%s">%s</a>', $value, $value):"";
-                    break;
-                case 'tel' :
-                        return sprintf('%s - %s - %s', $value[0],$value[1],$value[2]);
-                    break;
-                case 'textarea' :
-                        return nl2br($value);
-                    break;
-                case 'checkbox' :
-                        if(is_array($value)) return implode(', ',$value);
-                        else return $value;
-                    break;
-                case 'date' :
-                        return zdate($value,"Y-m-d");
-                    break;
-                case 'select' :
-                case 'radio' :
-                        if(is_array($value)) return implode(', ',$value);
-                        else return $value;
-                    break;
-                case 'kr_zip' :
-                        if(is_array($value)) return implode(' ',$value);
-                        else return $value;
-                    break;
-                // case 'text' :
-                default :
-                    return $value;
-            }
-        }
-
-        /**
-         * @brief type에 따른 form을 리턴
-         **/
-        function getFormHTML() {
-			static $id_num = 1000;
-
-            $type = $this->type;
-            $name = $this->name;
-            $value = $this->_getTypeValue($this->type, $this->value);
-            $default = $this->_getTypeValue($this->type, $this->default);
-            $column_name = 'extra_vars'.$this->idx;
-			$tmp_id = $column_name.'-'.$id_num++;
-
-            $buff = '';
-            switch($type) {
-                // 홈페이지 주소
-                case 'homepage' :
-                        $buff .= '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
-                    break;
-
-                // Email 주소
-                case 'email_address' :
-                        $buff .= '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
-                    break;
-
-                // 전화번호
-                case 'tel' :
-                        $buff .=
-                            '<input type="text" name="'.$column_name.'" value="'.$value[0].'" size="4" class="tel" />'.
-                            '<input type="text" name="'.$column_name.'" value="'.$value[1].'" size="4" class="tel" />'.
-                            '<input type="text" name="'.$column_name.'" value="'.$value[2].'" size="4" class="tel" />';
-                    break;
-
-                // textarea
-                case 'textarea' :
-                        $buff .= '<textarea name="'.$column_name.'" class="textarea">'.$value.'</textarea>';
-                    break;
-
-                // 다중 선택
-                case 'checkbox' :
-                        $buff .= '<ul>';
-                        foreach($default as $v) {
-                            if($value && in_array($v, $value)) $checked = ' checked="checked"';
-                            else $checked = '';
-
-							// Temporary ID for labeling
-							$tmp_id = $column_name.'-'.$id_num++;
-
-                            $buff .='<li><input type="checkbox" name="'.$column_name.'" id="'.$tmp_id.'" value="'.htmlspecialchars($v).'" '.$checked.' /><label for="'.$tmp_id.'">'.$v.'</label></li>';
-                        }
-                        $buff .= '</ul>';
-                    break;
-
-                // 단일 선택
-                case 'select' :
-                        $buff .= '<select name="'.$column_name.'" class="select">';
-                        foreach($default as $v) {
-                            if($value && in_array($v,$value)) $selected = ' selected="selected"';
-                            else $selected = '';
-                            $buff .= '<option value="'.$v.'" '.$selected.'>'.$v.'</option>';
-                        }
-                        $buff .= '</select>';
-                    break;
-
-                // radio
-                case 'radio' :
-                        $buff .= '<ul>';
-                        foreach($default as $v) {
-                            if($value && in_array($v,$value)) $checked = ' checked="checked"';
-                            else $checked = '';
-
-							// Temporary ID for labeling
-							$tmp_id = $column_name.'-'.$id_num++;
-
-                            $buff .= '<li><input type="radio" name="'.$column_name.'" id="'.$tmp_id.'" '.$checked.' value="'.$v.'"  class="radio" /><label for="'.$tmp_id.'">'.$v.'</label></li>';
-                        }
-                        $buff .= '</ul>';
-                    break;
-
-                // 날짜 입력
-                case 'date' :
-                        // datepicker javascript plugin load
-                        Context::loadJavascriptPlugin('ui.datepicker');
-
-                        $buff .=
-                            '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'.
-                            '<input type="text" id="date_'.$column_name.'" value="'.zdate($value,'Y-m-d').'" readonly="readonly" class="date" />'."\n".
-                            '<script type="text/javascript">'."\n".
-                            '(function($){'."\n".
-                            '    $(function(){'."\n".
-                            '        var option = { changeMonth:true, changeYear:true, gotoCurrent: false,yearRange:\'-100:+10\', onSelect:function(){'."\n".
-                            '            $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}'."\n".
-                            '        };'."\n".
-                            '        $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);'."\n".
-                            '        $("#date_'.$column_name.'").datepicker(option);'."\n".
-                            '    });'."\n".
-                            '})(jQuery);'."\n".
-                            '</script>';
-                    break;
-
-                // 주소 입력
-                case "kr_zip" :
-                        // krzip address javascript plugin load
-                        Context::loadJavascriptPlugin('ui.krzip');
-
-                        $buff .=
-                            '<div id="addr_searched_'.$column_name.'" style="display:'.($value[0]?'block':'none').';">'.
-                                '<input type="text" readonly="readonly" name="'.$column_name.'" value="'.$value[0].'" class="address" />'.
-                                '<a href="#" onclick="doShowKrZipSearch(this, \''.$column_name.'\'); return false;" class="button red"><span>'.Context::getLang('cmd_cancel').'</span></a>'.
-                            '</div>'.
-
-                            '<div id="addr_list_'.$column_name.'" style="display:none;">'.
-                                '<select name="addr_list_'.$column_name.'"></select>'.
-                                '<a href="#" onclick="doSelectKrZip(this, \''.$column_name.'\'); return false;" class="button blue"><span>'.Context::getLang('cmd_select').'</span></a>'.
-                                '<a href="#" onclick="doHideKrZipList(this, \''.$column_name.'\'); return false;" class="button red"><span>'.Context::getLang('cmd_cancel').'</span></a>'.
-                            '</div>'.
-
-                            '<div id="addr_search_'.$column_name.'" style="display:'.($value[0]?'none':'block').'">'.
-                                '<input type="text" name="addr_search_'.$column_name.'" class="address" value="" />'.
-                                '<a href="#" onclick="doSearchKrZip(this, \''.$column_name.'\'); return false;" class="button green"><span>'.Context::getLang('cmd_search').'</span></a>'.
-                            '</div>'.
-
-                            '<input type="text" name="'.$column_name.'" value="'.htmlspecialchars($value[1]).'" class="address" />'.
-                            '';
-                    break;
-
-                // 일반 text
-                default :
-                        $buff .=' <input type="text" name="'.$column_name.'" value="'.$value.'" class="text" />';
-                    break;
-            }
-            if($this->desc) $buff .= '<p>'.$this->desc.'</p>';
-            return $buff;
-        }
-    }
-?>
+<?php
+    /**
+     * @class ExtraVar
+     * @author NHN (developers@xpressengine.com)
+     * @brief a class to handle extra variables used in posts, member and others
+     *
+     **/
+    class ExtraVar {
+
+        var $module_srl = null;
+        var $keys = null;
+
+        /**
+         * @brief constructor
+         **/
+        function &getInstance($module_srl) {
+            return new ExtraVar($module_srl);
+        }
+
+        /**
+         * @brief constructor
+         **/
+        function ExtraVar($module_srl) {
+            $this->module_srl = $module_srl;
+        }
+
+        /**
+         * @brief register a key of extra variable
+         * @param module_srl, idx, name, type, default, desc, is_required, search, value
+         **/
+        function setExtraVarKeys($extra_keys) {
+            if(!is_array($extra_keys) || !count($extra_keys)) return;
+            foreach($extra_keys as $key => $val) {
+                $obj = null;
+                $obj = new ExtraItem($val->module_srl, $val->idx, $val->name, $val->type, $val->default, $val->desc, $val->is_required, $val->search, $val->value,  $val->eid);
+                $this->keys[$val->idx] = $obj;
+            }
+        }
+
+        /**
+         * @brief Return an array of extra vars
+         **/
+        function getExtraVars() {
+            return $this->keys;
+        }
+    }
+
+    /**
+     * @class ExtraItem
+     * @author NHN (developers@xpressengine.com)
+     * @brief each value of the extra vars
+     **/
+    class ExtraItem {
+        var $module_srl = 0;
+        var $idx = 0;
+        var $name = 0;
+        var $type = 'text';
+        var $default = null;
+        var $desc = '';
+        var $is_required = 'N';
+        var $search = 'N';
+        var $value = null;
+        var $eid = '';
+
+        /**
+         * @brief constructor
+         **/
+        function ExtraItem($module_srl, $idx, $name, $type = 'text', $default = null, $desc = '', $is_required = 'N', $search = 'N', $value = null, $eid = '') {
+            if(!$idx) return;
+            $this->module_srl = $module_srl;
+            $this->idx = $idx;
+            $this->name = $name;
+            $this->type = $type;
+            $this->default = $default;
+            $this->desc = $desc;
+            $this->is_required = $is_required;
+            $this->search = $search;
+            $this->value = $value;
+            $this->eid = $eid;
+        }
+
+        /**
+         * @brief Values
+         **/
+        function setValue($value) {
+            $this->value = $value;
+        }
+
+        /**
+         * @brief return a given value converted based on its type
+         **/
+        function _getTypeValue($type, $value) {
+            $value = trim($value);
+            if(!isset($value)) return;
+            switch($type) {
+                case 'homepage' :
+                        if($value && !preg_match('/^([a-z]+):\/\//i',$value)) $value = 'http://'.$value;
+                        return htmlspecialchars($value);
+                    break;
+                case 'tel' :
+                        if(is_array($value)) $values = $value;
+                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
+                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
+                        $values[0] = $values[0];
+                        $values[1] = $values[1];
+                        $values[2] = $values[2];
+                        return $values;
+                    break;
+                    break;
+                case 'checkbox' :
+                case 'radio' :
+                case 'select' :
+                        if(is_array($value)) $values = $value;
+                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
+                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
+                        else $values = array($value);
+                        for($i=0;$i<count($values);$i++) $values[$i] = htmlspecialchars($values[$i]);
+                        return $values;
+                    break;
+                case 'kr_zip' :
+                        if(is_array($value)) $values = $value;
+                        elseif(strpos($value,'|@|')!==false) $values = explode('|@|', $value);
+                        elseif(strpos($value,',')!==false) $values = explode(',', $value);
+                        return $values;
+                    break;
+                //case 'date' :
+                //case 'email_address' :
+                //case 'text' :
+                //case 'textarea' :
+                default :
+                        return htmlspecialchars($value);
+                    break;
+            }
+        }
+
+        /**
+         * @brief Return value
+         * return the original values for HTML result
+         **/
+        function getValueHTML() {
+            $value = $this->_getTypeValue($this->type, $this->value);
+            switch($this->type) {
+                case 'homepage' :
+                        return ($value)?(sprintf('<a href="%s" target="_blank">%s</a>', $value, strlen($value)>60?substr($value,0,40).'...'.substr($value,-10):$value)):"";
+                case 'email_address' :
+                        return ($value)?sprintf('<a href="mailto:%s">%s</a>', $value, $value):"";
+                    break;
+                case 'tel' :
+                        return sprintf('%s - %s - %s', $value[0],$value[1],$value[2]);
+                    break;
+                case 'textarea' :
+                        return nl2br($value);
+                    break;
+                case 'checkbox' :
+                        if(is_array($value)) return implode(', ',$value);
+                        else return $value;
+                    break;
+                case 'date' :
+                        return zdate($value,"Y-m-d");
+                    break;
+                case 'select' :
+                case 'radio' :
+                        if(is_array($value)) return implode(', ',$value);
+                        else return $value;
+                    break;
+                case 'kr_zip' :
+                        if(is_array($value)) return implode(' ',$value);
+                        else return $value;
+                    break;
+                // case 'text' :
+                default :
+                    return $value;
+            }
+        }
+
+        /**
+         * @brief return a form based on its type
+         **/
+        function getFormHTML() {
+			static $id_num = 1000;
+
+            $type = $this->type;
+            $name = $this->name;
+            $value = $this->_getTypeValue($this->type, $this->value);
+            $default = $this->_getTypeValue($this->type, $this->default);
+            $column_name = 'extra_vars'.$this->idx;
+			$tmp_id = $column_name.'-'.$id_num++;
+
+            $buff = '';
+            switch($type) {
+                // Homepage
+                case 'homepage' :
+                        $buff .= '<input type="text" name="'.$column_name.'" value="'.$value.'" class="homepage" />';
+                    break;
+                // Email Address
+                case 'email_address' :
+                        $buff .= '<input type="text" name="'.$column_name.'" value="'.$value.'" class="email_address" />';
+                    break;
+                // Phone Number
+                case 'tel' :
+                        $buff .=
+                            '<input type="text" name="'.$column_name.'" value="'.$value[0].'" size="4" class="tel" />'.
+                            '<input type="text" name="'.$column_name.'" value="'.$value[1].'" size="4" class="tel" />'.
+                            '<input type="text" name="'.$column_name.'" value="'.$value[2].'" size="4" class="tel" />';
+                    break;
+
+                // textarea
+                case 'textarea' :
+                        $buff .= '<textarea name="'.$column_name.'" class="textarea">'.$value.'</textarea>';
+                    break;
+                // multiple choice
+                case 'checkbox' :
+                        $buff .= '<ul>';
+                        foreach($default as $v) {
+                            if($value && in_array($v, $value)) $checked = ' checked="checked"';
+                            else $checked = '';
+
+							// Temporary ID for labeling
+							$tmp_id = $column_name.'-'.$id_num++;
+
+                            $buff .='<li><input type="checkbox" name="'.$column_name.'" id="'.$tmp_id.'" value="'.htmlspecialchars($v).'" '.$checked.' /><label for="'.$tmp_id.'">'.$v.'</label></li>';
+                        }
+                        $buff .= '</ul>';
+                    break;
+                // single choice
+                case 'select' :
+                        $buff .= '<select name="'.$column_name.'" class="select">';
+                        foreach($default as $v) {
+                            if($value && in_array($v,$value)) $selected = ' selected="selected"';
+                            else $selected = '';
+                            $buff .= '<option value="'.$v.'" '.$selected.'>'.$v.'</option>';
+                        }
+                        $buff .= '</select>';
+                    break;
+
+                // radio
+                case 'radio' :
+                        $buff .= '<ul>';
+                        foreach($default as $v) {
+                            if($value && in_array($v,$value)) $checked = ' checked="checked"';
+                            else $checked = '';
+
+							// Temporary ID for labeling
+							$tmp_id = $column_name.'-'.$id_num++;
+
+                            $buff .= '<li><input type="radio" name="'.$column_name.'" id="'.$tmp_id.'" '.$checked.' value="'.$v.'"  class="radio" /><label for="'.$tmp_id.'">'.$v.'</label></li>';
+                        }
+                        $buff .= '</ul>';
+                    break;
+                // date
+                case 'date' :
+                        // datepicker javascript plugin load
+                        Context::loadJavascriptPlugin('ui.datepicker');
+
+                        $buff .=
+                            '<input type="hidden" name="'.$column_name.'" value="'.$value.'" />'.
+                            '<input type="text" id="date_'.$column_name.'" value="'.zdate($value,'Y-m-d').'" class="date" />'."\n".
+                            '<script type="text/javascript">'."\n".
+                            '(function($){'."\n".
+                            '    $(function(){'."\n".
+                            '        var option = { dateFormat: "yy-mm-dd", changeMonth:true, changeYear:true, gotoCurrent: false,yearRange:\'-100:+10\', onSelect:function(){'."\n".
+                            '            $(this).prev(\'input[type="hidden"]\').val(this.value.replace(/-/g,""))}'."\n".
+                            '        };'."\n".
+                            '        $.extend(option,$.datepicker.regional[\''.Context::getLangType().'\']);'."\n".
+                            '        $("#date_'.$column_name.'").datepicker(option);'."\n".
+                            '    });'."\n".
+                            '})(jQuery);'."\n".
+                            '</script>';
+                    break;
+                // address
+                case "kr_zip" :
+                        // krzip address javascript plugin load
+                        Context::loadJavascriptPlugin('ui.krzip');
+
+                        $buff .=
+                            '<div id="addr_searched_'.$column_name.'" style="display:'.($value[0]?'block':'none').';">'.
+                                '<input type="text" readonly="readonly" name="'.$column_name.'" value="'.$value[0].'" class="address" />'.
+                                '<a href="#" onclick="doShowKrZipSearch(this, \''.$column_name.'\'); return false;" class="button red"><span>'.Context::getLang('cmd_cancel').'</span></a>'.
+                            '</div>'.
+
+                            '<div id="addr_list_'.$column_name.'" style="display:none;">'.
+                                '<select name="addr_list_'.$column_name.'"></select>'.
+                                '<a href="#" onclick="doSelectKrZip(this, \''.$column_name.'\'); return false;" class="button blue"><span>'.Context::getLang('cmd_select').'</span></a>'.
+                                '<a href="#" onclick="doHideKrZipList(this, \''.$column_name.'\'); return false;" class="button red"><span>'.Context::getLang('cmd_cancel').'</span></a>'.
+                            '</div>'.
+
+                            '<div id="addr_search_'.$column_name.'" style="display:'.($value[0]?'none':'block').'">'.
+                                '<input type="text" name="addr_search_'.$column_name.'" class="address" value="" />'.
+                                '<a href="#" onclick="doSearchKrZip(this, \''.$column_name.'\'); return false;" class="button green"><span>'.Context::getLang('cmd_search').'</span></a>'.
+                            '</div>'.
+
+                            '<input type="text" name="'.$column_name.'" value="'.htmlspecialchars($value[1]).'" class="address" />'.
+                            '';
+                    break;
+                // General text
+                default :
+                        $buff .=' <input type="text" name="'.$column_name.'" value="'.$value.'" class="text" />';
+                    break;
+            }
+            if($this->desc) $buff .= '<p>'.$this->desc.'</p>';
+            return $buff;
+        }
+    }
+?>
diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index ee87578a9..72772089b 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -1,677 +1,680 @@
 <?php
-    /**
-    * @class FileHandler
-    * @author NHN (developers@xpressengine.com)
-    * @brief contains methods for accessing file system
-    **/
+/**
+ * @class FileHandler
+ * @author NHN (developers@xpressengine.com)
+ * @brief contains methods for accessing file system
+ **/
 
-    class FileHandler extends Handler {
-        /**
-         * @brief changes path of target file, directory into absolute path
-         * @param[in] $source path
-         * @return absolute path 
-         **/
-        function getRealPath($source) {
-            $temp = explode('/', $source);
-            if($temp[0] == '.') $source = _XE_PATH_.substr($source, 2);
-            return $source;
-        }
+class FileHandler {
+	/**
+	 * @brief changes path of target file, directory into absolute path
+	 * @param[in] $source path
+	 * @return absolute path 
+	 **/
+	function getRealPath($source) {
+		$temp = explode('/', $source);
+		if($temp[0] == '.') $source = _XE_PATH_.substr($source, 2);
+		return $source;
+	}
 
-        /**
-         * @brief copy a directory to target 
-         * @param[in] $source_dir path of source directory
-         * @param[in] $target_dir path of target dir
-         * @param[in] $filter
-         * @param[in] $type
-         * @remarks if target directory does not exist, this function creates it 
-         * @return none
-         **/
-        function copyDir($source_dir, $target_dir, $filter=null,$type=null){
-            $source_dir = FileHandler::getRealPath($source_dir);
-            $target_dir = FileHandler::getRealPath($target_dir);
-            if(!is_dir($source_dir)) return false;
+	/**
+	 * @brief copy a directory to target 
+	 * @param[in] $source_dir path of source directory
+	 * @param[in] $target_dir path of target dir
+	 * @param[in] $filter
+	 * @param[in] $type
+	 * @remarks if target directory does not exist, this function creates it 
+	 * @return none
+	 **/
+	function copyDir($source_dir, $target_dir, $filter=null,$type=null){
+		$source_dir = FileHandler::getRealPath($source_dir);
+		$target_dir = FileHandler::getRealPath($target_dir);
+		if(!is_dir($source_dir)) return false;
+		// generate when no target exists
+		if(!file_exists($target_dir)) FileHandler::makeDir($target_dir);
 
-            // target이 없을땐 생성
-            if(!file_exists($target_dir)) FileHandler::makeDir($target_dir);
+		if(substr($source_dir, -1) != '/') $source_dir .= '/';
+		if(substr($target_dir, -1) != '/') $target_dir .= '/';
 
-            if(substr($source_dir, -1) != '/') $source_dir .= '/';
-            if(substr($target_dir, -1) != '/') $target_dir .= '/';
-
-            $oDir = dir($source_dir);
-            while($file = $oDir->read()) {
-                if(substr($file,0,1)=='.') continue;
-                if($filter && preg_match($filter, $file)) continue;
-                if(is_dir($source_dir.$file)){
-                    FileHandler::copyDir($source_dir.$file,$target_dir.$file,$type);
-                }else{
-                    if($type == 'force'){
-                        @unlink($target_dir.$file);
-                    }else{
-                        if(!file_exists($target_dir.$file)) @copy($source_dir.$file,$target_dir.$file);
-                    }
-                }
-            }
-        }
-
-        /**
-         * @brief copy a file to target 
-         * @param[in] $source path of source file
-         * @param[in] $target path of target file
-         * @param[in] $force Y: overwrite
-         * @return none
-         **/
-        function copyFile($source, $target, $force='Y'){
-            setlocale(LC_CTYPE, 'en_US.UTF8', 'ko_KR.UTF8'); 
-            $source = FileHandler::getRealPath($source);
-            $target_dir = FileHandler::getRealPath(dirname($target));
-            $target = basename($target);
-            if(!file_exists($target_dir)) FileHandler::makeDir($target_dir);
-            if($force=='Y') @unlink($target_dir.'/'.$target);
-            @copy($source, $target_dir.'/'.$target);
-        }
-
-        /**
-         * @brief returns the content of the file 
-         * @param[in] $file_name path of target file
-         * @return the content of the file. if target file does not exist, this function returns nothing.
-         **/
-        function readFile($file_name) {
-            $file_name = FileHandler::getRealPath($file_name);
-
-            if(!file_exists($file_name)) return;
-            $filesize = filesize($file_name);
-            if($filesize<1) return;
-
-            if(function_exists('file_get_contents')) return file_get_contents($file_name);
-
-            $fp = fopen($file_name, "r");
-            $buff = '';
-            if($fp) {
-                while(!feof($fp) && strlen($buff)<=$filesize) {
-                    $str = fgets($fp, 1024);
-                    $buff .= $str;
-                }
-                fclose($fp);
-            }
-            return $buff;
-        }
-
-        /**
-         * @brief write $buff into the specified file
-         * @param[in] $file_name path of target file
-         * @param[in] $buff content to be writeen
-         * @param[in] $mode a(append) / w(write)
-         * @return none
-         **/
-        function writeFile($file_name, $buff, $mode = "w") {
-            $file_name = FileHandler::getRealPath($file_name);
-
-            $pathinfo = pathinfo($file_name);
-            $path = $pathinfo['dirname'];
-            if(!is_dir($path)) FileHandler::makeDir($path);
-
-            $mode = strtolower($mode);
-            if($mode != "a") $mode = "w";
-            if(@!$fp = fopen($file_name,$mode)) return false;
-            fwrite($fp, $buff);
-            fclose($fp);
-            @chmod($file_name, 0644);
-        }
-
-        /**
-         * @brief remove a file
-         * @param[in] $file_name path of target file
-         * @return returns true on success or false on failure.
-         **/
-        function removeFile($file_name) {
-            $file_name = FileHandler::getRealPath($file_name);
-			return (file_exists($file_name) && @unlink($file_name));
-        }
-
-        /**
-         * @brief rename a file
-         * @param[in] $source path of source file
-         * @param[in] $target path of target file
-         * @remarks In order to move a file, use this function.
-         * @return returns true on success or false on failure.
-         **/
-        function rename($source, $target) {
-            $source = FileHandler::getRealPath($source);
-            $target = FileHandler::getRealPath($target);
-            return @rename($source, $target);
-        }
-
-		/**
-		 * @brief Move a file
-         * @param[in] $source path of source file
-         * @param[in] $target path of target file
-         * @return returns true on success or false on failure.
-		 */
-		function moveFile($source, $target) {
-			$source = FileHandler::getRealPath($source);
-			return (file_exists($source) && FileHandler::removeFile($target) && FileHandler::rename($source, $target));
-		}
-
-        /**
-         * @brief move a directory 
-         * @param[in] $source_dir path of source directory
-         * @param[in] $target_dir path of target directory
-         * @remarks this function just wraps rename function.
-         * @return none
-         **/
-        function moveDir($source_dir, $target_dir) {
-            FileHandler::rename($source_dir, $target_dir);
-        }
-
-        /**
-         * @brief return list of the files in the path
-         * @param[in] $path path of target directory
-         * @param[in] $filter if specified, return only files matching with the filter
-         * @param[in] $to_lower if true, file names will be changed into lower case.
-         * @param[in] $concat_prefix if true, return file name as absolute path
-         * @remarks the array does not contain files, such as '.', '..', and files starting with '.'
-         * @return array of the filenames in the path 
-         **/
-        function readDir($path, $filter = '', $to_lower = false, $concat_prefix = false) {
-            $path = FileHandler::getRealPath($path);
-
-            if(substr($path,-1)!='/') $path .= '/';
-            if(!is_dir($path)) return array();
-
-            $oDir = dir($path);
-            while($file = $oDir->read()) {
-                if(substr($file,0,1)=='.') continue;
-
-                if($filter && !preg_match($filter, $file)) continue;
-
-                if($to_lower) $file = strtolower($file);
-
-                if($filter) $file = preg_replace($filter, '$1', $file);
-                else $file = $file;
-
-                if($concat_prefix) {
-                    $file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
-                }
-
-                $output[] = $file;
-            }
-            if(!$output) return array();
-
-            return $output;
-        }
-
-        /**
-         * @brief creates a directory
-         * @param[in] $path_string path of target directory
-         * @return true if success. it might return nothing when ftp is used and connection to the ftp address failed.
-         * @remarks This function creates directories recursively, which means that if ancestors of the target directory does not exist, they will be created too.
-         **/
-        function makeDir($path_string) {
-            static $oFtp = null;
-
-            // if safe_mode is on, use FTP 
-            if(ini_get('safe_mode')) {
-				$ftp_info = Context::getFTPInfo();
-				if($oFtp == null) {
-					if(!Context::isFTPRegisted()) return;
-
-					require_once(_XE_PATH_.'libs/ftp.class.php');
-					$oFtp = new ftp();
-					if(!$ftp_info->ftp_host) $ftp_info->ftp_host = "127.0.0.1";
-					if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-					if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return;
-					if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
-						$oFtp->ftp_quit();
-						return;
-					}
+		$oDir = dir($source_dir);
+		while($file = $oDir->read()) {
+			if(substr($file,0,1)=='.') continue;
+			if($filter && preg_match($filter, $file)) continue;
+			if(is_dir($source_dir.$file)){
+				FileHandler::copyDir($source_dir.$file,$target_dir.$file,$type);
+			}else{
+				if($type == 'force'){
+					@unlink($target_dir.$file);
+				}else{
+					if(!file_exists($target_dir.$file)) @copy($source_dir.$file,$target_dir.$file);
 				}
-				$ftp_path = $ftp_info->ftp_root_path;
-				if(!$ftp_path) $ftp_path = "/";
-            }
-
-            $path_string = str_replace(_XE_PATH_,'',$path_string);
-            $path_list = explode('/', $path_string);
-
-            $path = _XE_PATH_;
-            for($i=0;$i<count($path_list);$i++) {
-                if(!$path_list[$i]) continue;
-                $path .= $path_list[$i].'/';
-				$ftp_path .= $path_list[$i].'/';
-                if(!is_dir($path)) {
-                    if(ini_get('safe_mode')) {
-                        $oFtp->ftp_mkdir($ftp_path);
-                        $oFtp->ftp_site("CHMOD 777 ".$ftp_path);
-                    } else {
-                        @mkdir($path, 0755);
-                        @chmod($path, 0755);
-                    }
-                }
-            }
-
-            return is_dir($path_string);
-        }
-
-        /**
-         * @brief remove all files under the path
-         * @param[in] $path path of the target directory
-         * @return none
-         **/
-        function removeDir($path) {
-            $path = FileHandler::getRealPath($path);
-            if(!is_dir($path)) return;
-            $directory = dir($path);
-            while($entry = $directory->read()) {
-                if ($entry != "." && $entry != "..") {
-                    if (is_dir($path."/".$entry)) {
-                        FileHandler::removeDir($path."/".$entry);
-                    } else {
-                        @unlink($path."/".$entry);
-                    }
-                }
-            }
-            $directory->close();
-            @rmdir($path);
-        }
-
-        /**
-         * @brief remove a directory only if it is empty 
-         * @param[in] $path path of the target directory
-         * @return none
-         **/
-        function removeBlankDir($path) {
-            $item_cnt = 0;
-
-            $path = FileHandler::getRealPath($path);
-            if(!is_dir($path)) return;
-            $directory = dir($path);
-            while($entry = $directory->read()) {
-                if ($entry == "." || $entry == "..") continue;
-                if (is_dir($path."/".$entry)) $item_cnt = FileHandler::removeBlankDir($path.'/'.$entry);
-            }
-            $directory->close();
-
-            if($item_cnt < 1) @rmdir($path);
-        }
-
-
-        /**
-         * @biref remove files in the target directory.  
-         * @param[in] $path path of the target directory
-         * @remarks This function keeps the directory structure. 
-         * @return none
-         **/
-        function removeFilesInDir($path) {
-            $path = FileHandler::getRealPath($path);
-            if(!is_dir($path)) return;
-            $directory = dir($path);
-            while($entry = $directory->read()) {
-                if ($entry != "." && $entry != "..") {
-                    if (is_dir($path."/".$entry)) {
-                        FileHandler::removeFilesInDir($path."/".$entry);
-                    } else {
-                        @unlink($path."/".$entry);
-                    }
-                }
-            }
-            $directory->close();
-        }
-
-        /**
-         * @brief makes file size byte into KB, MB according to the size
-         * @param[in] $size number of the size
-         * @return file size string
-         **/
-        function filesize($size) {
-            if(!$size) return "0Byte";
-            if($size < 1024) return ($size."Byte");
-            if($size >= 1024 && $size < 1024*1024) return sprintf("%0.1fKB",$size / 1024);
-            return sprintf("%0.2fMB",$size / (1024*1024));
-        }
-
-        /**
-         * @brief return remote file's content via HTTP
-         * @param[in] $url the address of the target file 
-         * @param[in] $body HTTP request body
-         * @param[in] $timeout connection timeout
-         * @param[in] $method GET/POST
-         * @param[in] $content_type content type header of HTTP request
-         * @param[in] $headers headers key vaule array.
-         * @param[in] $cookies cookies key value array.
-         * @param[in] $post_data request arguments array for POST method
-         * @return if success, the content of the target file. otherwise: none
-         * @remarks if the target is moved (when return code is 300~399), this function follows the location specified response header.
-         **/
-        function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array()) {
-			requirePear();
-            require_once('HTTP/Request.php');
-
-			$parsed_url = parse_url(__PROXY_SERVER__);
-			if($parsed_url["host"]) {
-                $oRequest = new HTTP_Request(__PROXY_SERVER__);
-                $oRequest->setMethod('POST');
-                $oRequest->_timeout = $timeout;
-                $oRequest->addPostData('arg', serialize(array('Destination'=>$url, 'method'=>$method, 'body'=>$body, 'content_type'=>$content_type, "headers"=>$headers, "post_data"=>$post_data)));
-            } else {
-                $oRequest = new HTTP_Request($url);
-                if(count($headers)) {
-                    foreach($headers as $key => $val) {
-                        $oRequest->addHeader($key, $val);
-                    }
-                }
-                if($cookies[$host]) {
-                    foreach($cookies[$host] as $key => $val) {
-                        $oRequest->addCookie($key, $val);
-                    }
-                }
-                if(count($post_data)) {
-                    foreach($post_data as $key => $val) {
-                        $oRequest->addPostData($key, $val);
-                    }
-                }
-                if(!$content_type) $oRequest->addHeader('Content-Type', 'text/html');
-                else $oRequest->addHeader('Content-Type', $content_type);
-                $oRequest->setMethod($method);
-                if($body) $oRequest->setBody($body);
-
-                $oRequest->_timeout = $timeout;
-            }
-
-            $oResponse = $oRequest->sendRequest();
-
-            $code = $oRequest->getResponseCode();
-            $header = $oRequest->getResponseHeader();
-            $response = $oRequest->getResponseBody();
-            if($c = $oRequest->getResponseCookies()) {
-                foreach($c as $k => $v) {
-                    $cookies[$host][$v['name']] = $v['value'];
-                }
-            }
-
-            if($code > 300 && $code < 399 && $header['location']) {
-                return FileHandler::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
-            } 
-
-            if($code != 200) return;
-
-            return $response;
-        }
-
-        /**
-         * @brief retrieves remote file, then stores it into target path.
-         * @param[in] $url the address of the target file
-         * @param[in] $target_file the location to store
-         * @param[in] $body HTTP request body
-         * @param[in] $timeout connection timeout
-         * @param[in] $method GET/POST
-         * @param[in] $content_type content type header of HTTP request
-         * @param[in] $headers headers key vaule array.
-         * @return true: success, false: failed 
-         **/
-        function getRemoteFile($url, $target_filename, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array()) {
-            $body = FileHandler::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers);
-            if(!$body) return false;
-            $target_filename = FileHandler::getRealPath($target_filename);
-            FileHandler::writeFile($target_filename, $body);
-            return true;
-        }
-
-        /**
-         * @brief convert size in string into numeric value 
-         * @param[in] $val size in string (ex., 10, 10K, 10M, 10G )
-         * @return converted size
-         */
-        function returnBytes($val)
-        {
-            $val = trim($val);
-            $last = strtolower(substr($val, -1));
-            if($last == 'g') $val *= 1024*1024*1024;
-            else if($last == 'm') $val *= 1024*1024;
-            else if($last == 'k') $val *= 1024;
-
-            return $val;
-        }
-
-        /**
-         * @brief check available memory to load image file 
-         * @param[in] $imageInfo image info retrieved by getimagesize function 
-         * @return true: it's ok, false: otherwise 
-         */
-        function checkMemoryLoadImage(&$imageInfo)
-        {
-            if(!function_exists('memory_get_usage')) return true;
-            $K64 = 65536;
-            $TWEAKFACTOR = 2.0;
-            $channels = $imageInfo['channels'];
-            if(!$channels) $channels = 6; //for png
-            $memoryNeeded = round( ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR );
-            $availableMemory = FileHandler::returnBytes(ini_get('memory_limit')) - memory_get_usage();
-            if($availableMemory < $memoryNeeded) return false;
-            return true;
-        }
-
-        /**
-         * @brief moves an image file (resizing is possible)
-         * @param[in] $source_file path of the source file
-         * @param[in] $target_file path of the target file
-         * @param[in] $resize_width width to resize 
-         * @param[in] $resize_height height to resize
-         * @param[in] $target_type if $target_type is set (gif, jpg, png, bmp), result image will be saved as target type
-         * @param[in] $thumbnail_type thumbnail type(crop, ratio)
-         * @return true: success, false: failed 
-         **/
-        function createImageFile($source_file, $target_file, $resize_width = 0, $resize_height = 0, $target_type = '', $thumbnail_type = 'crop') {
-            $source_file = FileHandler::getRealPath($source_file);
-            $target_file = FileHandler::getRealPath($target_file);
-
-            if(!file_exists($source_file)) return;
-            if(!$resize_width) $resize_width = 100;
-            if(!$resize_height) $resize_height = $resize_width;
-
-            // retrieve source image's information
-            $imageInfo = getimagesize($source_file);
-            if(!FileHandler::checkMemoryLoadImage($imageInfo)) return false;
-            list($width, $height, $type, $attrs) = $imageInfo;
-
-            if($width<1 || $height<1) return;
-
-            switch($type) {
-                case '1' :
-                        $type = 'gif';
-                    break;
-                case '2' :
-                        $type = 'jpg';
-                    break;
-                case '3' :
-                        $type = 'png';
-                    break;
-                case '6' :
-                        $type = 'bmp';
-                    break;
-                default :
-                        return;
-                    break;
-            }
-
-            // if original image is larger than specified size to resize, calculate the ratio 
-            if($resize_width > 0 && $width >= $resize_width) $width_per = $resize_width / $width;
-            else $width_per = 1;
-
-            if($resize_height>0 && $height >= $resize_height) $height_per = $resize_height / $height;
-            else $height_per = 1;
-
-            if($thumbnail_type == 'ratio') {
-                if($width_per>$height_per) $per = $height_per;
-                else $per = $width_per;
-                $resize_width = $width * $per;
-                $resize_height = $height * $per;
-            } else {
-                if($width_per < $height_per) $per = $height_per;
-                else $per = $width_per;
-            }
-
-            if(!$per) $per = 1;
-
-            // get type of target file
-            if(!$target_type) $target_type = $type;
-            $target_type = strtolower($target_type);
-
-            // create temporary image with target size
-            if(function_exists('imagecreatetruecolor')) $thumb = imagecreatetruecolor($resize_width, $resize_height);
-            else if(function_exists('imagecreate')) $thumb = imagecreate($resize_width, $resize_height);
-			else return false;
-			if(!$thumb) return false;
-
-            $white = imagecolorallocate($thumb, 255,255,255);
-            imagefilledrectangle($thumb,0,0,$resize_width-1,$resize_height-1,$white);
-
-            // create temporary image having original type
-            switch($type) {
-                case 'gif' :
-                        if(!function_exists('imagecreatefromgif')) return false;
-                        $source = imagecreatefromgif($source_file);
-                    break;
-                // jpg
-                case 'jpeg' :
-                case 'jpg' :
-                        if(!function_exists('imagecreatefromjpeg')) return false;
-                        $source = imagecreatefromjpeg($source_file);
-                    break;
-                // png
-                case 'png' :
-                        if(!function_exists('imagecreatefrompng')) return false;
-                        $source = imagecreatefrompng($source_file);
-                    break;
-                // bmp
-                case 'wbmp' :
-                case 'bmp' :
-                        if(!function_exists('imagecreatefromwbmp')) return false;
-                        $source = imagecreatefromwbmp($source_file);
-                    break;
-                default :
-                    return;
-            }
-
-            // resize original image and put it into temporary image
-            $new_width = (int)($width * $per);
-            $new_height = (int)($height * $per);
-
-            if($thumbnail_type == 'crop') {
-                $x = (int)($resize_width/2 - $new_width/2);
-                $y = (int)($resize_height/2 - $new_height/2);
-            } else {
-                $x = 0;
-                $y = 0;
-            }
-
-            if($source) {
-                if(function_exists('imagecopyresampled')) imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
-                else imagecopyresized($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
-            } else return false;
-
-            // create directory 
-            $path = dirname($target_file);
-            if(!is_dir($path)) FileHandler::makeDir($path);
-
-            // write into the file
-            switch($target_type) {
-                case 'gif' :
-                        if(!function_exists('imagegif')) return false;
-                        $output = imagegif($thumb, $target_file);
-                    break;
-                case 'jpeg' :
-                case 'jpg' :
-                        if(!function_exists('imagejpeg')) return false;
-                        $output = imagejpeg($thumb, $target_file, 100);
-                    break;
-                case 'png' :
-                        if(!function_exists('imagepng')) return false;
-                        $output = imagepng($thumb, $target_file, 9);
-                    break;
-                case 'wbmp' :
-                case 'bmp' :
-                        if(!function_exists('imagewbmp')) return false;
-                        $output = imagewbmp($thumb, $target_file, 100);
-                    break;
-            }
-
-            imagedestroy($thumb);
-            imagedestroy($source);
-
-            if(!$output) return false;
-            @chmod($target_file, 0644);
-
-            return true;
-        }
-
-        /**
-         * @brief reads ini file, and puts result into array
-         * @param[in] $filename path of the ini file
-         * @return ini array (if the target file does not exist, it returns false)
-         **/
-        function readIniFile($filename){
-            $filename = FileHandler::getRealPath($filename);
-            if(!file_exists($filename)) return false;
-            $arr = parse_ini_file($filename, true);
-            if(is_array($arr) && count($arr)>0) return $arr;
-            else return array();
-        }
-
-
-        /**
-         * @brief write array into ini file
-         * @param[in] $filename target ini file name
-         * @param[in] $arr array
-         * @return if array contains nothing it returns false, otherwise true
-         **/
-        function writeIniFile($filename, $arr){
-            if(count($arr)==0) return false;
-            FileHandler::writeFile($filename, FileHandler::_makeIniBuff($arr));
-            return true;
-        }
-
-        function _makeIniBuff($arr){
-            $return = '';
-            foreach($arr as $key => $val){
-                // section
-                if(is_array($val)){
-                    $return .= sprintf("[%s]\n",$key);
-                    foreach($val as $k => $v){
-                        $return .= sprintf("%s=\"%s\"\n",$k,$v);
-                    }
-                // value
-                }else if(is_string($val) || is_int($val)){
-                    $return .= sprintf("%s=\"%s\"\n",$key,$val);
-                }
-            }
-            return $return;
-        }
-
-        /**
-         * @brief return file object 
-         * @param[in] $filename target file name
-         * @param[in] $mode file mode for fopen
-         * @remarks if the directory of the file does not exist, create it.
-         * @return file object 
-         **/
-        function openFile($filename, $mode)
-        {
-            $pathinfo = pathinfo($filename);
-            $path = $pathinfo['dirname'];
-            if(!is_dir($path)) FileHandler::makeDir($path);
-
-            require_once("FileObject.class.php");
-            $file_object = new FileObject($file_name, $mode);
-            return $file_object;
-        }
-
-		/**
-		 * @brief  check whether the given file has the content.
-		 * @param[in] $file_name target file name
-		 * @return return true if the file exists and contains something.
-		 */
-		function hasContent($filename)
-		{
-			return (is_readable($filename) && !!filesize($filename));
+			}
 		}
-    }
-?>
\ No newline at end of file
+	}
+
+	/**
+	 * @brief copy a file to target 
+	 * @param[in] $source path of source file
+	 * @param[in] $target path of target file
+	 * @param[in] $force Y: overwrite
+	 * @return none
+	 **/
+	function copyFile($source, $target, $force='Y'){
+		setlocale(LC_CTYPE, 'en_US.UTF8', 'ko_KR.UTF8'); 
+		$source = FileHandler::getRealPath($source);
+		$target_dir = FileHandler::getRealPath(dirname($target));
+		$target = basename($target);
+		if(!file_exists($target_dir)) FileHandler::makeDir($target_dir);
+		if($force=='Y') @unlink($target_dir.'/'.$target);
+		@copy($source, $target_dir.'/'.$target);
+	}
+
+	/**
+	 * @brief returns the content of the file 
+	 * @param[in] $file_name path of target file
+	 * @return the content of the file. if target file does not exist, this function returns nothing.
+	 **/
+	function readFile($file_name) {
+		$file_name = FileHandler::getRealPath($file_name);
+
+		if(!file_exists($file_name)) return;
+		$filesize = filesize($file_name);
+		if($filesize<1) return;
+
+		if(function_exists('file_get_contents')) return file_get_contents($file_name);
+
+		$fp = fopen($file_name, "r");
+		$buff = '';
+		if($fp) {
+			while(!feof($fp) && strlen($buff)<=$filesize) {
+				$str = fgets($fp, 1024);
+				$buff .= $str;
+			}
+			fclose($fp);
+		}
+		return $buff;
+	}
+
+	/**
+	 * @brief write $buff into the specified file
+	 * @param[in] $file_name path of target file
+	 * @param[in] $buff content to be writeen
+	 * @param[in] $mode a(append) / w(write)
+	 * @return none
+	 **/
+	function writeFile($file_name, $buff, $mode = "w") {
+		$file_name = FileHandler::getRealPath($file_name);
+
+		$pathinfo = pathinfo($file_name);
+		$path = $pathinfo['dirname'];
+		if(!is_dir($path)) FileHandler::makeDir($path);
+
+		$mode = strtolower($mode);
+		if($mode != "a") $mode = "w";
+		if(@!$fp = fopen($file_name,$mode)) return false;
+		fwrite($fp, $buff);
+		fclose($fp);
+		@chmod($file_name, 0644);
+	}
+
+	/**
+	 * @brief remove a file
+	 * @param[in] $file_name path of target file
+	 * @return returns true on success or false on failure.
+	 **/
+	function removeFile($file_name) {
+		$file_name = FileHandler::getRealPath($file_name);
+		return (file_exists($file_name) && @unlink($file_name));
+	}
+
+	/**
+	 * @brief rename a file
+	 * @param[in] $source path of source file
+	 * @param[in] $target path of target file
+	 * @remarks In order to move a file, use this function.
+	 * @return returns true on success or false on failure.
+	 **/
+	function rename($source, $target) {
+		$source = FileHandler::getRealPath($source);
+		$target = FileHandler::getRealPath($target);
+		return @rename($source, $target);
+	}
+
+	/**
+	 * @brief Move a file
+	 * @param[in] $source path of source file
+	 * @param[in] $target path of target file
+	 * @return returns true on success or false on failure.
+	 */
+	function moveFile($source, $target) {
+		$source = FileHandler::getRealPath($source);
+		return (file_exists($source) && FileHandler::removeFile($target) && FileHandler::rename($source, $target));
+	}
+
+	/**
+	 * @brief move a directory 
+	 * @param[in] $source_dir path of source directory
+	 * @param[in] $target_dir path of target directory
+	 * @remarks this function just wraps rename function.
+	 * @return none
+	 **/
+	function moveDir($source_dir, $target_dir) {
+		FileHandler::rename($source_dir, $target_dir);
+	}
+
+	/**
+	 * @brief return list of the files in the path
+	 * @param[in] $path path of target directory
+	 * @param[in] $filter if specified, return only files matching with the filter
+	 * @param[in] $to_lower if true, file names will be changed into lower case.
+	 * @param[in] $concat_prefix if true, return file name as absolute path
+	 * @remarks the array does not contain files, such as '.', '..', and files starting with '.'
+	 * @return array of the filenames in the path 
+	 **/
+	function readDir($path, $filter = '', $to_lower = false, $concat_prefix = false) {
+		$path = FileHandler::getRealPath($path);
+
+		if(substr($path,-1)!='/') $path .= '/';
+		if(!is_dir($path)) return array();
+
+		$oDir = dir($path);
+		while($file = $oDir->read()) {
+			if(substr($file,0,1)=='.') continue;
+
+			if($filter && !preg_match($filter, $file)) continue;
+
+			if($to_lower) $file = strtolower($file);
+
+			if($filter) $file = preg_replace($filter, '$1', $file);
+			else $file = $file;
+
+			if($concat_prefix) {
+				$file = sprintf('%s%s', str_replace(_XE_PATH_, '', $path), $file);
+			}
+
+			$output[] = $file;
+		}
+		if(!$output) return array();
+
+		return $output;
+	}
+
+	/**
+	 * @brief creates a directory
+	 * @param[in] $path_string path of target directory
+	 * @return true if success. it might return nothing when ftp is used and connection to the ftp address failed.
+	 * @remarks This function creates directories recursively, which means that if ancestors of the target directory does not exist, they will be created too.
+	 **/
+	function makeDir($path_string) {
+		static $oFtp = null;
+
+		// if safe_mode is on, use FTP 
+		if(ini_get('safe_mode')) {
+			$ftp_info = Context::getFTPInfo();
+			if($oFtp == null) {
+				if(!Context::isFTPRegisted()) return;
+
+				require_once(_XE_PATH_.'libs/ftp.class.php');
+				$oFtp = new ftp();
+				if(!$ftp_info->ftp_host) $ftp_info->ftp_host = "127.0.0.1";
+				if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+				if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return;
+				if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
+					$oFtp->ftp_quit();
+					return;
+				}
+			}
+			$ftp_path = $ftp_info->ftp_root_path;
+			if(!$ftp_path) $ftp_path = "/";
+		}
+
+		$path_string = str_replace(_XE_PATH_,'',$path_string);
+		$path_list = explode('/', $path_string);
+
+		$path = _XE_PATH_;
+		for($i=0;$i<count($path_list);$i++) {
+			if(!$path_list[$i]) continue;
+			$path .= $path_list[$i].'/';
+			$ftp_path .= $path_list[$i].'/';
+			if(!is_dir($path)) {
+				if(ini_get('safe_mode')) {
+					$oFtp->ftp_mkdir($ftp_path);
+					$oFtp->ftp_site("CHMOD 777 ".$ftp_path);
+				} else {
+					@mkdir($path, 0755);
+					@chmod($path, 0755);
+				}
+			}
+		}
+
+		return is_dir($path_string);
+	}
+
+	/**
+	 * @brief remove all files under the path
+	 * @param[in] $path path of the target directory
+	 * @return none
+	 **/
+	function removeDir($path) {
+		$path = FileHandler::getRealPath($path);
+		if(!is_dir($path)) return;
+		$directory = dir($path);
+		while($entry = $directory->read()) {
+			if ($entry != "." && $entry != "..") {
+				if (is_dir($path."/".$entry)) {
+					FileHandler::removeDir($path."/".$entry);
+				} else {
+					@unlink($path."/".$entry);
+				}
+			}
+		}
+		$directory->close();
+		@rmdir($path);
+	}
+
+	/**
+	 * @brief remove a directory only if it is empty 
+	 * @param[in] $path path of the target directory
+	 * @return none
+	 **/
+	function removeBlankDir($path) {
+		$item_cnt = 0;
+
+		$path = FileHandler::getRealPath($path);
+		if(!is_dir($path)) return;
+		$directory = dir($path);
+		while($entry = $directory->read()) {
+			if ($entry == "." || $entry == "..") continue;
+			if (is_dir($path."/".$entry)) $item_cnt = FileHandler::removeBlankDir($path.'/'.$entry);
+		}
+		$directory->close();
+
+		if($item_cnt < 1) @rmdir($path);
+	}
+
+
+	/**
+	 * @biref remove files in the target directory.  
+	 * @param[in] $path path of the target directory
+	 * @remarks This function keeps the directory structure. 
+	 * @return none
+	 **/
+	function removeFilesInDir($path) {
+		$path = FileHandler::getRealPath($path);
+		if(!is_dir($path)) return;
+		$directory = dir($path);
+		while($entry = $directory->read()) {
+			if ($entry != "." && $entry != "..") {
+				if (is_dir($path."/".$entry)) {
+					FileHandler::removeFilesInDir($path."/".$entry);
+				} else {
+					@unlink($path."/".$entry);
+				}
+			}
+		}
+		$directory->close();
+	}
+
+	/**
+	 * @brief makes file size byte into KB, MB according to the size
+	 * @param[in] $size number of the size
+	 * @return file size string
+	 **/
+	function filesize($size) {
+		if(!$size) return '0Byte';
+		if($size === 1) return '1Byte';
+		if($size < 1024) return $size.'Bytes';
+		if($size >= 1024 && $size < 1024*1024) return sprintf("%0.1fKB",$size / 1024);
+		return sprintf("%0.2fMB",$size / (1024*1024));
+	}
+
+	/**
+	 * @brief return remote file's content via HTTP
+	 * @param[in] $url the address of the target file 
+	 * @param[in] $body HTTP request body
+	 * @param[in] $timeout connection timeout
+	 * @param[in] $method GET/POST
+	 * @param[in] $content_type content type header of HTTP request
+	 * @param[in] $headers headers key vaule array.
+	 * @param[in] $cookies cookies key value array.
+	 * @param[in] $post_data request arguments array for POST method
+	 * @return if success, the content of the target file. otherwise: none
+	 * @remarks if the target is moved (when return code is 300~399), this function follows the location specified response header.
+	 **/
+	function getRemoteResource($url, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array(), $cookies = array(), $post_data = array()) {
+		requirePear();
+		require_once('HTTP/Request.php');
+
+		$parsed_url = parse_url(__PROXY_SERVER__);
+		if($parsed_url["host"]) {
+			$oRequest = new HTTP_Request(__PROXY_SERVER__);
+			$oRequest->setMethod('POST');
+			$oRequest->_timeout = $timeout;
+			$oRequest->addPostData('arg', serialize(array('Destination'=>$url, 'method'=>$method, 'body'=>$body, 'content_type'=>$content_type, "headers"=>$headers, "post_data"=>$post_data)));
+		} else {
+			$oRequest = new HTTP_Request($url);
+			if(count($headers)) {
+				foreach($headers as $key => $val) {
+					$oRequest->addHeader($key, $val);
+				}
+			}
+			if($cookies[$host]) {
+				foreach($cookies[$host] as $key => $val) {
+					$oRequest->addCookie($key, $val);
+				}
+			}
+			if(count($post_data)) {
+				foreach($post_data as $key => $val) {
+					$oRequest->addPostData($key, $val);
+				}
+			}
+			if(!$content_type) $oRequest->addHeader('Content-Type', 'text/html');
+			else $oRequest->addHeader('Content-Type', $content_type);
+			$oRequest->setMethod($method);
+			if($body) $oRequest->setBody($body);
+
+			$oRequest->_timeout = $timeout;
+		}
+
+		$oResponse = $oRequest->sendRequest();
+
+		$code = $oRequest->getResponseCode();
+		$header = $oRequest->getResponseHeader();
+		$response = $oRequest->getResponseBody();
+		if($c = $oRequest->getResponseCookies()) {
+			foreach($c as $k => $v) {
+				$cookies[$host][$v['name']] = $v['value'];
+			}
+		}
+
+		if($code > 300 && $code < 399 && $header['location']) {
+			return FileHandler::getRemoteResource($header['location'], $body, $timeout, $method, $content_type, $headers, $cookies, $post_data);
+		} 
+
+		if($code != 200) return;
+
+		return $response;
+	}
+
+	/**
+	 * @brief retrieves remote file, then stores it into target path.
+	 * @param[in] $url the address of the target file
+	 * @param[in] $target_file the location to store
+	 * @param[in] $body HTTP request body
+	 * @param[in] $timeout connection timeout
+	 * @param[in] $method GET/POST
+	 * @param[in] $content_type content type header of HTTP request
+	 * @param[in] $headers headers key vaule array.
+	 * @return true: success, false: failed 
+	 **/
+	function getRemoteFile($url, $target_filename, $body = null, $timeout = 3, $method = 'GET', $content_type = null, $headers = array()) {
+		$body = FileHandler::getRemoteResource($url, $body, $timeout, $method, $content_type, $headers);
+		if(!$body) return false;
+		$target_filename = FileHandler::getRealPath($target_filename);
+		FileHandler::writeFile($target_filename, $body);
+		return true;
+	}
+
+	/**
+	 * @brief convert size in string into numeric value 
+	 * @param[in] $val size in string (ex., 10, 10K, 10M, 10G )
+	 * @return converted size
+	 */
+	function returnBytes($val)
+	{
+		$val = trim($val);
+		$last = strtolower(substr($val, -1));
+		if($last == 'g') $val *= 1024*1024*1024;
+		else if($last == 'm') $val *= 1024*1024;
+		else if($last == 'k') $val *= 1024;
+		else $val *= 1;
+
+		return $val;
+	}
+
+	/**
+	 * @brief check available memory to load image file 
+	 * @param[in] $imageInfo image info retrieved by getimagesize function 
+	 * @return true: it's ok, false: otherwise 
+	 */
+	function checkMemoryLoadImage(&$imageInfo)
+	{
+		if(!function_exists('memory_get_usage')) return true;
+		$K64 = 65536;
+		$TWEAKFACTOR = 2.0;
+		$channels = $imageInfo['channels'];
+		if(!$channels) $channels = 6; //for png
+		$memoryNeeded = round( ($imageInfo[0] * $imageInfo[1] * $imageInfo['bits'] * $channels / 8 + $K64 ) * $TWEAKFACTOR );
+		$availableMemory = FileHandler::returnBytes(ini_get('memory_limit')) - memory_get_usage();
+		if($availableMemory < $memoryNeeded) return false;
+		return true;
+	}
+
+	/**
+	 * @brief moves an image file (resizing is possible)
+	 * @param[in] $source_file path of the source file
+	 * @param[in] $target_file path of the target file
+	 * @param[in] $resize_width width to resize 
+	 * @param[in] $resize_height height to resize
+	 * @param[in] $target_type if $target_type is set (gif, jpg, png, bmp), result image will be saved as target type
+	 * @param[in] $thumbnail_type thumbnail type(crop, ratio)
+	 * @return true: success, false: failed 
+	 **/
+	function createImageFile($source_file, $target_file, $resize_width = 0, $resize_height = 0, $target_type = '', $thumbnail_type = 'crop') {
+		$source_file = FileHandler::getRealPath($source_file);
+		$target_file = FileHandler::getRealPath($target_file);
+
+		if(!file_exists($source_file)) return;
+		if(!$resize_width) $resize_width = 100;
+		if(!$resize_height) $resize_height = $resize_width;
+
+		// retrieve source image's information
+		$imageInfo = getimagesize($source_file);
+		if(!FileHandler::checkMemoryLoadImage($imageInfo)) return false;
+		list($width, $height, $type, $attrs) = $imageInfo;
+
+		if($width<1 || $height<1) return;
+
+		switch($type) {
+			case '1' :
+					$type = 'gif';
+				break;
+			case '2' :
+					$type = 'jpg';
+				break;
+			case '3' :
+					$type = 'png';
+				break;
+			case '6' :
+					$type = 'bmp';
+				break;
+			default :
+					return;
+				break;
+		}
+
+		// if original image is larger than specified size to resize, calculate the ratio 
+		if($resize_width > 0 && $width >= $resize_width) $width_per = $resize_width / $width;
+		else $width_per = 1;
+
+		if($resize_height>0 && $height >= $resize_height) $height_per = $resize_height / $height;
+		else $height_per = 1;
+
+		if($thumbnail_type == 'ratio') {
+			if($width_per>$height_per) $per = $height_per;
+			else $per = $width_per;
+			$resize_width = $width * $per;
+			$resize_height = $height * $per;
+		} else {
+			if($width_per < $height_per) $per = $height_per;
+			else $per = $width_per;
+		}
+
+		if(!$per) $per = 1;
+
+		// get type of target file
+		if(!$target_type) $target_type = $type;
+		$target_type = strtolower($target_type);
+
+		// create temporary image with target size
+		if(function_exists('imagecreatetruecolor')) $thumb = imagecreatetruecolor($resize_width, $resize_height);
+		else if(function_exists('imagecreate')) $thumb = imagecreate($resize_width, $resize_height);
+		else return false;
+		if(!$thumb) return false;
+
+		$white = imagecolorallocate($thumb, 255,255,255);
+		imagefilledrectangle($thumb,0,0,$resize_width-1,$resize_height-1,$white);
+
+		// create temporary image having original type
+		switch($type) {
+			case 'gif' :
+					if(!function_exists('imagecreatefromgif')) return false;
+					$source = imagecreatefromgif($source_file);
+				break;
+			// jpg
+			case 'jpeg' :
+			case 'jpg' :
+					if(!function_exists('imagecreatefromjpeg')) return false;
+					$source = imagecreatefromjpeg($source_file);
+				break;
+			// png
+			case 'png' :
+					if(!function_exists('imagecreatefrompng')) return false;
+					$source = imagecreatefrompng($source_file);
+				break;
+			// bmp
+			case 'wbmp' :
+			case 'bmp' :
+					if(!function_exists('imagecreatefromwbmp')) return false;
+					$source = imagecreatefromwbmp($source_file);
+				break;
+			default :
+				return;
+		}
+
+		// resize original image and put it into temporary image
+		$new_width = (int)($width * $per);
+		$new_height = (int)($height * $per);
+
+		if($thumbnail_type == 'crop') {
+			$x = (int)($resize_width/2 - $new_width/2);
+			$y = (int)($resize_height/2 - $new_height/2);
+		} else {
+			$x = 0;
+			$y = 0;
+		}
+
+		if($source) {
+			if(function_exists('imagecopyresampled')) imagecopyresampled($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
+			else imagecopyresized($thumb, $source, $x, $y, 0, 0, $new_width, $new_height, $width, $height);
+		} else return false;
+
+		// create directory 
+		$path = dirname($target_file);
+		if(!is_dir($path)) FileHandler::makeDir($path);
+
+		// write into the file
+		switch($target_type) {
+			case 'gif' :
+					if(!function_exists('imagegif')) return false;
+					$output = imagegif($thumb, $target_file);
+				break;
+			case 'jpeg' :
+			case 'jpg' :
+					if(!function_exists('imagejpeg')) return false;
+					$output = imagejpeg($thumb, $target_file, 100);
+				break;
+			case 'png' :
+					if(!function_exists('imagepng')) return false;
+					$output = imagepng($thumb, $target_file, 9);
+				break;
+			case 'wbmp' :
+			case 'bmp' :
+					if(!function_exists('imagewbmp')) return false;
+					$output = imagewbmp($thumb, $target_file, 100);
+				break;
+		}
+
+		imagedestroy($thumb);
+		imagedestroy($source);
+
+		if(!$output) return false;
+		@chmod($target_file, 0644);
+
+		return true;
+	}
+
+	/**
+	 * @brief reads ini file, and puts result into array
+	 * @param[in] $filename path of the ini file
+	 * @return ini array (if the target file does not exist, it returns false)
+	 **/
+	function readIniFile($filename){
+		$filename = FileHandler::getRealPath($filename);
+		if(!file_exists($filename)) return false;
+		$arr = parse_ini_file($filename, true);
+		if(is_array($arr) && count($arr)>0) return $arr;
+		else return array();
+	}
+
+
+	/**
+	 * @brief write array into ini file
+	 * @param[in] $filename target ini file name
+	 * @param[in] $arr array
+	 * @return if array contains nothing it returns false, otherwise true
+	 **/
+	function writeIniFile($filename, $arr){
+		if(count($arr)==0) return false;
+		FileHandler::writeFile($filename, FileHandler::_makeIniBuff($arr));
+		return true;
+	}
+
+	function _makeIniBuff($arr){
+		$return = '';
+		foreach($arr as $key => $val){
+			// section
+			if(is_array($val)){
+				$return .= sprintf("[%s]\n",$key);
+				foreach($val as $k => $v){
+					$return .= sprintf("%s=\"%s\"\n",$k,$v);
+				}
+			// value
+			}else if(is_string($val) || is_int($val)){
+				$return .= sprintf("%s=\"%s\"\n",$key,$val);
+			}
+		}
+		return $return;
+	}
+
+	/**
+	 * @brief return file object 
+	 * @param[in] $filename target file name
+	 * @param[in] $mode file mode for fopen
+	 * @remarks if the directory of the file does not exist, create it.
+	 * @return file object 
+	 **/
+	function openFile($filename, $mode)
+	{
+		$pathinfo = pathinfo($filename);
+		$path = $pathinfo['dirname'];
+		if(!is_dir($path)) FileHandler::makeDir($path);
+
+		require_once("FileObject.class.php");
+		$file_object = new FileObject($file_name, $mode);
+		return $file_object;
+	}
+
+	/**
+	 * @brief  check whether the given file has the content.
+	 * @param[in] $file_name target file name
+	 * @return return true if the file exists and contains something.
+	 */
+	function hasContent($filename)
+	{
+		return (is_readable($filename) && !!filesize($filename));
+	}
+}
+
+/* End of file FileObject.class.php */
+/* Location: ./classes/file/FileObject.class.php */
diff --git a/classes/file/FileObject.class.php b/classes/file/FileObject.class.php
index cbe1ae2b0..fd83b127c 100644
--- a/classes/file/FileObject.class.php
+++ b/classes/file/FileObject.class.php
@@ -1,128 +1,129 @@
-<?php
-    /**
-    * @class FileObject
-    * @author NHN (developers@xpressengine.com)
-    * @brief file abstraction class 
-    **/
-
-    class FileObject extends Object
-    {
-        var $fp = null; ///< file descriptor
-        var $path = null; ///< file path
-        var $mode = "r"; ///< file open mode
-
-        /**
-         * @brief constructor 
-         * @param[in] $path path of target file
-         * @param[in] $mode file open mode 
-         * @return file object 
-         **/
-        function FileObject($path, $mode)
-        {
-            if($path != null) $this->Open($path, $mode);
-        }
-
-        /**
-         * @brief append target file's content to current file 
-         * @param[in] $file_name path of target file
-         * @return none 
-         **/
-        function append($file_name)
-        {
-            $target = new FileObject($file_name, "r");
-            while(!$target->feof())
-            {
-                $readstr = $target->read();
-                $this->write($readstr);
-            }
-            $target->close();
-        }
-
-        /**
-         * @brief check current file meets eof
-         * @return true: if eof. false: otherwise 
-         **/
-        function feof()
-        {
-            return feof($this->fp);
-        }
-
-        /**
-         * @brief read from current file 
-         * @param[in] $size size to read
-         * @return read bytes 
-         **/
-        function read($size = 1024)
-        {
-            return fread($this->fp, $size);
-        }
-
-
-        /**
-         * @brief write string to current file 
-         * @param[in] $str string to write
-         * @return written bytes. if failed, it returns false 
-         **/
-        function write($str)
-        {
-            $len = strlen($str);
-            if(!$str || $len <= 0) return false;
-            if(!$this->fp) return false;
-            $written = fwrite($this->fp, $str);
-            return $written;
-        }
-
-        /**
-         * @brief open a file
-         * @param[in] $path path of target file
-         * @param[in] $mode file open mode 
-         * @remarks if file is opened, close it and open the new path
-         * @return true if succeed, false otherwise.
-         */
-        function open($path, $mode)
-        {
-            if($this->fp != null)
-            {   
-                $this->close();
-            }
-            $this->fp = fopen($path, $mode);
-            if(! is_resource($this->fp) )
-            {
-                $this->fp = null; 
-                return false;
-            }
-            $this->path = $path;
-            return true;
-        }
-
-        /**
-         * @brief return current file's path 
-         * @return file path 
-         **/
-        function getPath()
-        {
-            if($this->fp != null)
-            {
-                return $this->path;
-            }
-            else
-            {
-                return null; 
-            }
-        }
-
-        /**
-         * @brief close file 
-         * @return none 
-         **/
-        function close()
-        {
-            if($this->fp != null)
-            {
-                fclose($this->fp);
-                $this->fp = null;
-            }
-        }
-
-    }
-?>
+<?php
+/**
+ * @class FileObject
+ * @author NHN (developers@xpressengine.com)
+ * @brief file abstraction class 
+ **/
+
+class FileObject extends Object
+{
+	var $fp = null; ///< file descriptor
+	var $path = null; ///< file path
+	var $mode = "r"; ///< file open mode
+
+	/**
+	 * @brief constructor 
+	 * @param[in] $path path of target file
+	 * @param[in] $mode file open mode 
+	 * @return file object 
+	 **/
+	function FileObject($path, $mode)
+	{
+		if($path != null) $this->Open($path, $mode);
+	}
+
+	/**
+	 * @brief append target file's content to current file 
+	 * @param[in] $file_name path of target file
+	 * @return none 
+	 **/
+	function append($file_name)
+	{
+		$target = new FileObject($file_name, "r");
+		while(!$target->feof())
+		{
+			$readstr = $target->read();
+			$this->write($readstr);
+		}
+		$target->close();
+	}
+
+	/**
+	 * @brief check current file meets eof
+	 * @return true: if eof. false: otherwise 
+	 **/
+	function feof()
+	{
+		return feof($this->fp);
+	}
+
+	/**
+	 * @brief read from current file 
+	 * @param[in] $size size to read
+	 * @return read bytes 
+	 **/
+	function read($size = 1024)
+	{
+		return fread($this->fp, $size);
+	}
+
+
+	/**
+	 * @brief write string to current file 
+	 * @param[in] $str string to write
+	 * @return written bytes. if failed, it returns false 
+	 **/
+	function write($str)
+	{
+		$len = strlen($str);
+		if(!$str || $len <= 0) return false;
+		if(!$this->fp) return false;
+		$written = fwrite($this->fp, $str);
+		return $written;
+	}
+
+	/**
+	 * @brief open a file
+	 * @param[in] $path path of target file
+	 * @param[in] $mode file open mode 
+	 * @remarks if file is opened, close it and open the new path
+	 * @return true if succeed, false otherwise.
+	 */
+	function open($path, $mode)
+	{
+		if($this->fp != null)
+		{   
+			$this->close();
+		}
+		$this->fp = fopen($path, $mode);
+		if(! is_resource($this->fp) )
+		{
+			$this->fp = null; 
+			return false;
+		}
+		$this->path = $path;
+		return true;
+	}
+
+	/**
+	 * @brief return current file's path 
+	 * @return file path 
+	 **/
+	function getPath()
+	{
+		if($this->fp != null)
+		{
+			return $this->path;
+		}
+		else
+		{
+			return null; 
+		}
+	}
+
+	/**
+	 * @brief close file 
+	 * @return none 
+	 **/
+	function close()
+	{
+		if($this->fp != null)
+		{
+			fclose($this->fp);
+			$this->fp = null;
+		}
+	}
+}
+
+/* End of file FileObject.class.php */
+/* Location: ./classes/file/FileObject.class.php */
diff --git a/classes/frontendfile/FrontEndFileHandler.class.php b/classes/frontendfile/FrontEndFileHandler.class.php
new file mode 100644
index 000000000..b54c8d4b4
--- /dev/null
+++ b/classes/frontendfile/FrontEndFileHandler.class.php
@@ -0,0 +1,262 @@
+<?php
+	/**
+	 * @class FrontEndFileHandler
+	 * @author NHN (developers@xpressengine.com)
+	 **/
+
+	class FrontEndFileHandler extends Handler
+	{
+		var $cssMap = array();
+		var $jsHeadMap = array();
+		var $jsBodyMap = array();
+		var $cssMapIndex = array();
+		var $jsHeadMapIndex = array();
+		var $jsBodyMapIndex = array();
+
+		function isSsl()
+		{
+			if ($GLOBAL['__XE_IS_SSL__']) return $GLOBAL['__XE_IS_SSL__'];
+
+			$url_info = parse_url(Context::getRequestUrl());
+			if ($url_info['scheme'] == 'https')
+				$GLOBAL['__XE_IS_SSL__'] = true;
+			else
+				$GLOBAL['__XE_IS_SSL__'] = false;
+
+			return $GLOBAL['__XE_IS_SSL__'];
+		}
+
+		/**
+		 * @brief load front end file
+		 * @params $args array
+		 * case js
+		 *		$args[0]: file name
+		 *		$args[1]: type (head | body)
+		 *		$args[2]: target IE
+		 *		$args[3]: index
+		 * case css
+		 *		$args[0]: file name
+		 *		$args[1]: media
+		 *		$args[2]: target IE
+		 *		$args[3]: index
+		 **/
+		function loadFile($args, $useCdn = false, $cdnPrefix = '', $cdnVersion = '')
+		{
+			if (!is_array($args)) $args = array($args);
+
+			$pathInfo = pathinfo($args[0]);
+			$file->fileName = $pathInfo['basename'];
+			$file->filePath = $this->_getAbsFileUrl($pathInfo['dirname']);
+			$file->fileExtension = strtolower($pathInfo['extension']);
+
+			if (strpos($file->filePath, '://') == false)
+			{
+				$file->useCdn = $useCdn;
+				$file->cdnPath = $this->_normalizeFilePath($pathInfo['dirname']);
+				$file->cdnPrefix = $cdnPrefix;
+				$file->cdnVersion = $cdnVersion;
+			}
+
+			$availableExtension = array('css', 'js');
+			if (!in_array($file->fileExtension, $availableExtension)) return;
+
+			$file->targetIe = $args[2];
+			$file->index = (int)$args[3];
+
+			if ($file->fileExtension == 'css')
+			{
+				$file->media = $args[1];
+				if (!$file->media) $file->media = 'all';
+				$map = &$this->cssMap;
+				$mapIndex = &$this->cssMapIndex;
+				$key = $file->filePath . $file->fileName . "\t" . $file->targetIe . "\t" . $file->media;
+			}
+			else if ($file->fileExtension == 'js')
+			{
+				$type = $args[1];
+				if ($type == 'body')
+				{
+					$map = &$this->jsBodyMap;
+					$mapIndex = &$this->jsBodyMapIndex;
+				}
+				else
+				{
+					$map = &$this->jsHeadMap;
+					$mapIndex = &$this->jsHeadMapIndex;
+				}
+				$key = $file->filePath . $file->fileName . "\t" . $file->targetIe;
+			}
+
+			if (!isset($map[$key]) || $mapIndex[$key] != $file->index)
+			{
+				$this->unloadFile($args[0], $args[2], $args[1]);
+				$map[$file->index][$key] = $file;
+				$mapIndex[$key] = $file->index;
+			}
+		}
+
+		function unloadFile($fileName, $targetIe = '', $media = 'all')
+		{
+			$pathInfo = pathinfo($fileName);
+			$fileName = $pathInfo['basename'];
+			$filePath = $this->_getAbsFileUrl($pathInfo['dirname']);
+			$fileExtension = strtolower($pathInfo['extension']);
+			$key = $filePath . $fileName . "\t" . $targetIe;
+
+			if ($fileExtension == 'css')
+			{
+				$key .= "\t" . $media;
+				if (isset($this->cssMapIndex[$key]))
+				{
+					$index = $this->cssMapIndex[$key];
+					unset($this->cssMap[$index][$key]);
+					unset($this->cssMapIndex[$key]);
+				}
+			}
+			else
+			{
+				if (isset($this->jsHeadMapIndex[$key]))
+				{
+					$index = $this->jsHeadMapIndex[$key];
+					unset($this->jsHeadMap[$index][$key]);
+					unset($this->jsHeadMapIndex[$key]);
+				}
+				if (isset($this->jsBodyMapIndex[$key]))
+				{
+					$index = $this->jsBodyMapIndex[$key];
+					unset($this->jsBodyMap[$index][$key]);
+					unset($this->jsBodyMapIndex[$key]);
+				}
+			}
+		}
+
+		function unloadAllFiles($type = 'all')
+		{
+			if ($type == 'css' || $type == 'all')
+			{
+				$cssMap = array();
+				$cssMapIndex = array();
+			}
+
+			if ($type == 'js' || $type == 'all')
+			{
+				$jsHeadMap = array();
+				$jsBodyMap = array();
+				$jsHeadMapIndex = array();
+				$jsBodyMapIndex = array();
+			}
+		}
+
+		function getCssFileList()
+		{
+			$map = &$this->cssMap;
+			$mapIndex = &$this->cssMapIndex;
+
+			$this->_sortMap($map, $mapIndex);
+
+			$dbInfo = Context::getDBInfo();
+			$useCdn = $dbInfo->use_cdn;
+
+			$result = array();
+			foreach($map as $indexedMap)
+			{
+				foreach($indexedMap as $file)
+				{
+					if ($this->isSsl() == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
+					{
+						$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
+					}
+					else
+					{
+						$fullFilePath = $file->filePath . '/' . $file->fileName;
+					}
+					$result[] = array('file' => $fullFilePath, 'media' => $file->media, 'targetie' => $file->targetIe);
+				}
+			}
+
+			return $result;
+		}
+
+		function getJsFileList($type = 'head')
+		{
+			if ($type == 'head')
+			{
+				$map = &$this->jsHeadMap;
+				$mapIndex = &$this->jsHeadMapIndex;
+			}
+			else
+			{
+				$map = &$this->jsBodyMap;
+				$mapIndex = &$this->jsBodyMapIndex;
+			}
+
+			$this->_sortMap($map, $mapIndex);
+
+			$dbInfo = Context::getDBInfo();
+			$useCdn = $dbInfo->use_cdn;
+
+			$result = array();
+			foreach($map as $indexedMap)
+			{
+				foreach($indexedMap as $file)
+				{
+					if ($this->isSsl() == false && $useCdn == 'Y' && $file->useCdn && $file->cdnVersion != '%__XE_CDN_VERSION__%')
+					{
+						$fullFilePath = $file->cdnPrefix . $file->cdnVersion . '/' . substr($file->cdnPath, 2) . '/' . $file->fileName;
+					}
+					else
+					{
+						$fullFilePath = $file->filePath . '/' . $file->fileName;
+					}
+					$result[] = array('file' => $fullFilePath, 'targetie' => $file->targetIe);
+				}
+			}
+
+			return $result;
+		}
+
+		function _sortMap(&$map, &$index)
+		{
+			ksort($map);
+		}
+
+		function _normalizeFilePath($path)
+		{
+			if (strpos($path, '://') === false && $path{0} != '/' && $path{0} != '.')
+			{
+				$path = './' . $path;
+			}
+
+			$path = preg_replace('@/\./|(?<!:)\/\/@', '/', $path);
+
+			while(strpos($path, '/../'))
+			{
+				$path = preg_replace('/\/([^\/]+)\/\.\.\//s', '/', $path, 1);
+			}
+
+			return $path;
+		}
+
+		function _getAbsFileUrl($path)
+		{
+			$path = $this->_normalizeFilePath($path);
+
+			if(strpos($path, './') === 0)
+			{
+				if (dirname($_SERVER['SCRIPT_NAME']) == '/' || dirname($_SERVER['SCRIPT_NAME']) == '\\')
+				{
+					$path = '/' . substr($path, 2);
+				}
+				else
+				{
+					$path = dirname($_SERVER['SCRIPT_NAME']) . '/' . substr($path, 2);
+				}
+			}
+			else if(strpos($file, '../') === 0)
+			{
+				$path= $this->_normalizeFilePath(dirname($_SERVER['SCRIPT_NAME']) . "/{$path}");
+			}
+
+			return $path;
+		}
+	}
diff --git a/classes/handler/Handler.class.php b/classes/handler/Handler.class.php
index 375dfe281..1454f733e 100644
--- a/classes/handler/Handler.class.php
+++ b/classes/handler/Handler.class.php
@@ -1,11 +1,11 @@
-<?php
-    /**
-     * @class  Handler
-     * @author NHN (developers@xpressengine.com)
-     * @brief  an abstract class of (*)Handler 
-     **/
-
-    class Handler {
-
-    }
-?>
+<?php
+    /**
+     * @class  Handler
+     * @author NHN (developers@xpressengine.com)
+     * @brief  an abstract class of (*)Handler 
+     **/
+
+    class Handler {
+
+    }
+?>
diff --git a/classes/httprequest/XEHttpRequest.class.php b/classes/httprequest/XEHttpRequest.class.php
index cf09444ff..621676cf5 100644
--- a/classes/httprequest/XEHttpRequest.class.php
+++ b/classes/httprequest/XEHttpRequest.class.php
@@ -1,85 +1,184 @@
-<?php
-    /**
-     * @class HttpRequest
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief a class that is designed to be used for sending out HTTP request to an external server and retrieving response
-     * @remarks  Connection: keep-alive is not supported
-     */
-    class XEHttpRequest {
-
-	/// target host
-	var $m_host;
-	/// target Port
-	var $m_port;
-	/// header array 
-	var $m_headers;
-
-	/**
-	 * @brief Constructor 
-	 */
-	function XEHttpRequest($host, $port)
-	{
-	    $this->m_host = $host;
-	    $this->m_port = $port;
-	    $this->m_headers = array();
-	}
-
-	/**
-	 * @brief mether to add key/value pair to the HTTP request header
-     * @param[in] key HTTP header element
-     * @param[in] value value string for HTTP header element
-	 */
-	function AddToHeader($key, $value)
-	{
-	    $this->m_headers[$key] = $value;
-	}
-
-	/**
-	 * @brief send HTTP message to the host
-     * @param[in] target ip or url of the external server
-     * @param[in] method HTTP method such as GET and POST
-     * @param[in] timeout time out value for HTTP request expiration
-	 * @return Returns an object containing HTTP Response body and HTTP response code 
-	 */
-	function Send($target, $method="GET", $timeout = 3)
-	{
-	    $socket = @fsockopen($this->m_host, $this->m_port, $errno, $errstr, $timeout);
-	    if(!$socket)
-	    {
-		return new Object(-1, "socket_connect_failed");
-	    }
-
-	    $this->AddToHeader('Host', $this->m_host);
-	    $this->AddToHeader('Connection', "close");
-
-	    $crlf = "\r\n";
-	    $request = "$method $target HTTP/1.1$crlf"; 
-
-	    foreach($this->m_headers as $equiv => $content)
-	    {
-		$request .= "$equiv: $content$crlf";
-	    }
-	    $request .= $crlf;
-	    fwrite($socket, $request);
-
-	    list($httpver, $code, $status) = split(' +', rtrim(fgets($socket)));
-	    // read response header
-	    while(strlen(trim($line = fgets($socket))))
-	    {
-		list($equiv, $content) = split(' *: *', rtrim($line));
-	    }
-	    $body =  '';
-	    while(!feof($socket))
-	    {
-		$body .= fgets($socket, 128);
-	    }
-	    fclose($socket);
-
-	    $ret->result_code = $code;
-	    $ret->body = $body;
-
-	    return $ret;
-	}
-    }
-?>
+<?php
+/**
+ * @class HttpRequest
+ * @author NHN (developers@xpressengine.com)
+ * @version 0.1
+ * @brief a class that is designed to be used for sending out HTTP request to an external server and retrieving response
+ * @remarks  Connection: keep-alive is not supported
+ */
+class XEHttpRequest {
+	/// target host
+	var $m_host;
+	/// target Port
+	var $m_port;
+	/// header array 
+	var $m_headers;
+
+	/**
+	 * @brief Constructor 
+	 */
+	function XEHttpRequest($host, $port)
+	{
+	    $this->m_host = $host;
+	    $this->m_port = $port;
+	    $this->m_headers = array();
+	}
+
+	/**
+	 * @brief mether to add key/value pair to the HTTP request header
+     * @param[in] key HTTP header element
+     * @param[in] value value string for HTTP header element
+	 */
+	function addToHeader($key, $value)
+	{
+	    $this->m_headers[$key] = $value;
+	}
+
+	/**
+	 * @brief send HTTP message to the host
+     * @param[in] target ip or url of the external server
+     * @param[in] method HTTP method such as GET and POST
+     * @param[in] timeout time out value for HTTP request expiration
+	 * @param[in] post variables to send
+	 * @return Returns an object containing HTTP Response body and HTTP response code 
+	 */
+	function send($target='/', $method='GET', $timeout=3, $post_vars=null)
+	{
+		static $allow_methods=null;
+
+		$this->addToHeader('Host', $this->m_host);
+		$this->addToHeader('Connection', 'close');
+
+		$method = strtoupper($method);
+		if(!$allow_methods) $allow_methods = explode(' ', 'GET POST PUT');
+		if(!in_array($method, $allow_methods)) $method = $allow_methods[0];
+
+		// $timeout should be an integer that is bigger than zero
+		$timout = max((int)$timeout, 0);
+
+		// list of post variables
+		if(!is_array($post_vars)) $post_vars = array();
+
+		if(false && is_callable('curl_init')) {
+			return $this->sendWithCurl($target, $method, $timeout, $post_vars);
+		} else {
+			return $this->sendWithSock($target, $method, $timeout, $post_vars);
+		}
+	}
+
+	/**
+	 * @brief Send a request with the file socket
+	 * @private
+	 */
+	function sendWithSock($target, $method, $timeout, $post_vars)
+	{
+		static $crlf = "\r\n";
+
+		$sock = @fsockopen($this->m_host, $this->m_port, $errno, $errstr, $timeout);
+		if(!$sock) {
+			return new Object(-1, 'socket_connect_failed');
+		}
+
+		$headers = $this->m_headers + array();
+		if(!isset($headers['Accept-Encoding'])) $headers['Accept-Encoding'] = 'identity';
+
+		// post body
+		$post_body = '';
+		if($method == 'POST' && count($post_vars)) {
+			foreach($post_vars as $key=>$value) {
+				$post_body .= urlencode($key).'='.urlencode($value).'&';
+			}
+			$post_body = substr($post_body, 0, -1);
+
+			$headers['Content-Length'] = strlen($post_body);
+			$headers['Content-Type']   = 'application/x-www-form-urlencoded';
+		}
+
+		$request = "$method $target HTTP/1.1$crlf";
+		foreach($headers as $equiv=>$content) {
+			$request .= "$equiv: $content$crlf";
+		}
+		$request .= $crlf.$post_body;
+		fwrite($sock, $request);
+
+		list($httpver, $code, $status) = preg_split('/ +/', rtrim(fgets($sock)), 3);
+
+		// read response headers
+		$is_chunked = false;
+		while(strlen(trim($line = fgets($sock)))) {
+			list($equiv, $content) = preg_split('/ *: */', rtrim($line), 1);
+			if(!strcasecmp($equiv, 'Transfer-Encoding') && $content == 'chunked') {
+				$is_chunked = true;
+			}
+		}
+
+		$body = '';
+		while(!feof($sock)) {
+			if ($is_chunked) {
+				$chunk_size = hexdec(fgets($sock));
+				if($chunk_size) $body .= fread($sock, $chunk_size);
+			} else {
+				$body .= fgets($sock, 512);
+			}
+		}
+		fclose($sock);
+
+		$ret = new stdClass;
+		$ret->result_code = $code;
+		$ret->body = $body;
+
+		return $ret;
+	}
+
+	/**
+	 * @brief Send a request with the curl library
+	 * @private
+	 */
+	function sendWithCurl($target, $method, $timeout, $post_vars)
+	{
+		$headers = $this->m_headers + array();
+
+		// creat a new cURL resource
+		$ch = curl_init();
+
+		$headers['Expect'] = '';
+
+		// set URL and other appropriate options
+		curl_setopt($ch, CURLOPT_URL, "http://{$this->m_host}{$target}");
+		curl_setopt($ch, CURLOPT_HEADER, false);
+		curl_setopt($ch, CURLOPT_PORT, $this->m_port);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+		curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
+
+		switch($method) {
+			case 'GET':  curl_setopt($ch, CURLOPT_HTTPGET, true); break;
+			case 'PUT':  curl_setopt($ch, CURLOPT_PUT, true); break;
+			case 'POST':
+				curl_setopt($ch, CURLOPT_POST, true);
+				curl_setopt($ch, CURLOPT_POSTFIELDS, $post_vars);
+				break;
+		}
+
+		$arr_headers = array();
+		foreach($headers as $key=>$value){
+			$arr_headers[] = "$key: $value";
+		}
+
+		curl_setopt($ch, CURLOPT_HTTPHEADER, $arr_headers);
+
+		$body = curl_exec($ch);
+		if(curl_errno($ch)) {
+			return new Object(-1, 'socket_connect_failed');
+		}
+
+		$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+
+		$ret = new stdClass;
+		$ret->result_code = $code;
+		$ret->body = $body;
+
+		return $ret;
+	}
+}
+?>
diff --git a/classes/mail/Mail.class.php b/classes/mail/Mail.class.php
index ad5b3d19a..9605670ba 100644
--- a/classes/mail/Mail.class.php
+++ b/classes/mail/Mail.class.php
@@ -1,353 +1,353 @@
-<?php
-    /**
-     * @brief 메일 발송
-     * @author NHN (developers@xpressengine.com)
-     **/
-
-    class Mail {
-
-        var $sender_name = '';
-        var $sender_email = '';
-        var $receiptor_name = '';
-        var $receiptor_email = '';
-        var $title = '';
-        var $content = '';
-        var $content_type = 'html';
-        var $messageId = null;
-        var $replyTo = null;
-        var $bcc = null;
-        var $attachments = array(); 
-        var $cidAttachments  = array(); 
-        var $mainMailPart = null;
-        var $body = '';
-        var $header = '';
-        var $eol = '';
-        var $references = '';
-		var $additional_params = null;
-
-
-        function Mail() { }
-
-		function setAdditionalParams($additional_params)
-		{
-			$this->additional_params = $additional_params;
-		}
-
-        function addAttachment($filename, $orgfilename)
-        {
-            $this->attachments[$orgfilename] = $filename;
-        }
-
-        function addCidAttachment($filename, $cid)
-        {
-            $this->cidAttachments[$cid] = $filename;
-        }
-
-        function setSender($name, $email) {
-            $this->sender_name = $name;
-            $this->sender_email = $email;
-        }
-
-        function getSender() {
-            if(!stristr(PHP_OS, 'win') && $this->sender_name) return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->sender_name).'?=', $this->sender_email);
-            return $this->sender_email;
-        }
-
-        function setReceiptor($name, $email) {
-            $this->receiptor_name = $name;
-            $this->receiptor_email = $email;
-        }
-
-        function getReceiptor() {
-            if(!stristr(PHP_OS, 'win') && $this->receiptor_name && $this->receiptor_name != $this->receiptor_email) return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->receiptor_name).'?=', $this->receiptor_email);
-            return $this->receiptor_email;
-        }
-
-        function setTitle($title) {
-            $this->title = $title;
-        }
-
-        function getTitle() {
-            return '=?utf-8?b?'.base64_encode($this->title).'?=';
-        }
-
-        function setBCC($bcc)
-        {
-            $this->bcc = $bcc;
-        }
-
-        function setMessageID($messageId) {
-            $this->messageId = $messageId;
-        }
-
-        function setReferences($references) {
-            $this->references = $references;
-        }
-
-        function setReplyTo($replyTo)
-        {
-            $this->replyTo = $replyTo;
-        }
-
-        function setContent($content) {
-            $content = preg_replace_callback('/<img([^>]+)>/i',array($this,'replaceResourceRealPath'), $content);
-            $this->content = $content;
-        }
-
-        function replaceResourceRealPath($matches) {
-            return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
-        }
-
-        function getPlainContent() {
-            return chunk_split(base64_encode(str_replace(array("<",">","&"), array("&lt;","&gt;","&amp;"), $this->content)));
-        }
-
-        function getHTMLContent() {
-            return chunk_split(base64_encode($this->content_type!='html'?nl2br($this->content):$this->content));
-        }
-
-        function setContentType($mode = 'html') {
-            $this->content_type = $mode=='html'?'html':'';
-        }
-
-        function procAttachments()
-        {
-            if(count($this->attachments) > 0)
-            {
-                $this->body = $this->header.$this->body;
-                $boundary = '----=='.uniqid(rand(),true);
-                $this->header = "Content-Type: multipart/mixed;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
-                $this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
-                $res = array();
-                $res[] = $this->body;
-                foreach($this->attachments as $filename => $attachment)
-                {
-                    $type = $this->returnMIMEType($filename);
-                    $file_str = FileHandler::readFile($attachment);
-                    $chunks = chunk_split(base64_encode($file_str)); 
-                    $tempBody = sprintf(    
-                        "--".$boundary.$this->eol.
-                        "Content-Type: %s;".$this->eol.
-                        "\tname=\"%s\"".$this->eol.
-                        "Content-Transfer-Encoding: base64".$this->eol.
-                        "Content-Description: %s".$this->eol.
-                        "Content-Disposition: attachment;".$this->eol.
-                        "\tfilename=\"%s\"".$this->eol.$this->eol.
-                        "%s".$this->eol.$this->eol,
-                        $type,
-                        $filename,
-                        $filename,
-                        $filename,
-                        $chunks);
-                    $res[] = $tempBody;
-                }
-                $this->body = implode("", $res);
-                $this->body .= "--".$boundary."--";
-            }
-        }
-
-        function procCidAttachments()
-        {
-            if(count($this->cidAttachments) > 0)
-            {
-                $this->body = $this->header.$this->body;
-                $boundary = '----=='.uniqid(rand(),true);
-                $this->header = "Content-Type: multipart/relative;".$this->eol."\ttype=\"multipart/alternative\";".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
-                $this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
-                $res = array();
-                $res[] = $this->body;
-                foreach($this->cidAttachments as $cid => $attachment)
-                {
-                    $filename = basename($attachment);
-                    $type = $this->returnMIMEType(FileHandler::getRealPath($attachment));
-                    $file_str = FileHandler::readFile($attachment);
-                    $chunks = chunk_split(base64_encode($file_str)); 
-                    $tempBody = sprintf(    
-                        "--".$boundary.$this->eol.
-                        "Content-Type: %s;".$this->eol.
-                        "\tname=\"%s\"".$this->eol.
-                        "Content-Transfer-Encoding: base64".$this->eol.
-                        "Content-ID: <%s>".$this->eol.
-                        "Content-Description: %s".$this->eol.
-                        "Content-Location: %s".$this->eol.$this->eol.
-                        "%s".$this->eol.$this->eol,
-                        $type,
-                        $filename,
-                        $cid,
-                        $filename,
-                        $filename,
-                        $chunks);
-                    $res[] = $tempBody;
-                }
-                $this->body = implode("", $res);
-                $this->body .= "--".$boundary."--";
-            }
-        }
-
-
-        function send() {
-            $boundary = '----=='.uniqid(rand(),true);
-            $this->eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
-
-            $this->header = "Content-Type: multipart/alternative;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
-            $this->body = sprintf(
-                "--%s".$this->eol.
-                "Content-Type: text/plain; charset=utf-8; format=flowed".$this->eol.
-                "Content-Transfer-Encoding: base64".$this->eol.
-                "Content-Disposition: inline".$this->eol.$this->eol.
-                "%s".
-                "--%s".$this->eol.
-                "Content-Type: text/html; charset=utf-8".$this->eol.
-                "Content-Transfer-Encoding: base64".$this->eol.
-                "Content-Disposition: inline".$this->eol.$this->eol.
-                "%s".
-                "--%s--".
-                "",
-                $boundary,
-                $this->getPlainContent(),
-                $boundary,
-                $this->getHTMLContent(),
-                $boundary
-            );
-
-            $this->procCidAttachments();
-            $this->procAttachments();
-
-            $headers = sprintf(
-                "From: %s".$this->eol.
-                "%s".
-                "%s".
-                "%s".
-                "%s".
-                "MIME-Version: 1.0".$this->eol."",
-                $this->getSender(),
-                $this->messageId?("Message-ID: <".$this->messageId.">".$this->eol):"",
-                $this->replyTo?("Reply-To: <".$this->replyTo.">".$this->eol):"",
-                $this->bcc?("Bcc: ".$this->bcc.$this->eol):"",
-                $this->references?("References: <".$this->references.">".$this->eol."In-Reply-To: <".$this->references.">".$this->eol):""
-            );
-            $headers .= $this->header;
-			if($this->additional_params) return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
-            return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers);
-        }
-
-        function checkMailMX($email_address) {
-            if(!Mail::isVaildMailAddress($email_address)) return false;
-            list($user, $host) = explode("@", $email_address);
-            if(function_exists('checkdnsrr')) {
-                if (checkdnsrr($host, "MX") or checkdnsrr($host, "A")) return true;     
-                else return false;
-            }
-            return true;
-        }
-
-        function isVaildMailAddress($email_address) {
-            if( preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address) ) return $email_address;
-            else return ''; 
-        }
-
-        function returnMIMEType($filename)
-        {
-            preg_match("|\.([a-z0-9]{2,4})$|i", $filename, $fileSuffix);
-
-            switch(strtolower($fileSuffix[1]))
-            {
-                case "js" :
-                    return "application/x-javascript";
-
-                case "json" :
-                    return "application/json";
-
-                case "jpg" :
-                    case "jpeg" :
-                    case "jpe" :
-                    return "image/jpg";
-
-                case "png" :
-                    case "gif" :
-                    case "bmp" :
-                    case "tiff" :
-                    return "image/".strtolower($fileSuffix[1]);
-
-                case "css" :
-                    return "text/css";
-
-                case "xml" :
-                    return "application/xml";
-
-                case "doc" :
-                    case "docx" :
-                    return "application/msword";
-
-                case "xls" :
-                    case "xlt" :
-                    case "xlm" :
-                    case "xld" :
-                    case "xla" :
-                    case "xlc" :
-                    case "xlw" :
-                    case "xll" :
-                    return "application/vnd.ms-excel";
-
-                case "ppt" :
-                    case "pps" :
-                    return "application/vnd.ms-powerpoint";
-
-                case "rtf" :
-                    return "application/rtf";
-
-                case "pdf" :
-                    return "application/pdf";
-
-                case "html" :
-                    case "htm" :
-                    case "php" :
-                    return "text/html";
-
-                case "txt" :
-                    return "text/plain";
-
-                case "mpeg" :
-                    case "mpg" :
-                    case "mpe" :
-                    return "video/mpeg";
-
-                case "mp3" :
-                    return "audio/mpeg3";
-
-                case "wav" :
-                    return "audio/wav";
-
-                case "aiff" :
-                    case "aif" :
-                    return "audio/aiff";
-
-                case "avi" :
-                    return "video/msvideo";
-
-                case "wmv" :
-                    return "video/x-ms-wmv";
-
-                case "mov" :
-                    return "video/quicktime";
-
-                case "zip" :
-                    return "application/zip";
-
-                case "tar" :
-                    return "application/x-tar";
-
-                case "swf" :
-                    return "application/x-shockwave-flash";
-
-                default :
-                if(function_exists("mime_content_type"))
-                {
-                    $fileSuffix = mime_content_type($filename);
-                }
-
-                return "unknown/" . trim($fileSuffix[0], ".");
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @brief Mailing
+     * @author NHN (developers@xpressengine.com)
+     **/
+
+    class Mail {
+
+        var $sender_name = '';
+        var $sender_email = '';
+        var $receiptor_name = '';
+        var $receiptor_email = '';
+        var $title = '';
+        var $content = '';
+        var $content_type = 'html';
+        var $messageId = null;
+        var $replyTo = null;
+        var $bcc = null;
+        var $attachments = array(); 
+        var $cidAttachments  = array(); 
+        var $mainMailPart = null;
+        var $body = '';
+        var $header = '';
+        var $eol = '';
+        var $references = '';
+		var $additional_params = null;
+
+
+        function Mail() { }
+
+		function setAdditionalParams($additional_params)
+		{
+			$this->additional_params = $additional_params;
+		}
+
+        function addAttachment($filename, $orgfilename)
+        {
+            $this->attachments[$orgfilename] = $filename;
+        }
+
+        function addCidAttachment($filename, $cid)
+        {
+            $this->cidAttachments[$cid] = $filename;
+        }
+
+        function setSender($name, $email) {
+            $this->sender_name = $name;
+            $this->sender_email = $email;
+        }
+
+        function getSender() {
+            if(!stristr(PHP_OS, 'win') && $this->sender_name) return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->sender_name).'?=', $this->sender_email);
+            return $this->sender_email;
+        }
+
+        function setReceiptor($name, $email) {
+            $this->receiptor_name = $name;
+            $this->receiptor_email = $email;
+        }
+
+        function getReceiptor() {
+            if(!stristr(PHP_OS, 'win') && $this->receiptor_name && $this->receiptor_name != $this->receiptor_email) return sprintf("%s <%s>", '=?utf-8?b?'.base64_encode($this->receiptor_name).'?=', $this->receiptor_email);
+            return $this->receiptor_email;
+        }
+
+        function setTitle($title) {
+            $this->title = $title;
+        }
+
+        function getTitle() {
+            return '=?utf-8?b?'.base64_encode($this->title).'?=';
+        }
+
+        function setBCC($bcc)
+        {
+            $this->bcc = $bcc;
+        }
+
+        function setMessageID($messageId) {
+            $this->messageId = $messageId;
+        }
+
+        function setReferences($references) {
+            $this->references = $references;
+        }
+
+        function setReplyTo($replyTo)
+        {
+            $this->replyTo = $replyTo;
+        }
+
+        function setContent($content) {
+            $content = preg_replace_callback('/<img([^>]+)>/i',array($this,'replaceResourceRealPath'), $content);
+            $this->content = $content;
+        }
+
+        function replaceResourceRealPath($matches) {
+            return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
+        }
+
+        function getPlainContent() {
+            return chunk_split(base64_encode(str_replace(array("<",">","&"), array("&lt;","&gt;","&amp;"), $this->content)));
+        }
+
+        function getHTMLContent() {
+            return chunk_split(base64_encode($this->content_type!='html'?nl2br($this->content):$this->content));
+        }
+
+        function setContentType($mode = 'html') {
+            $this->content_type = $mode=='html'?'html':'';
+        }
+
+        function procAttachments()
+        {
+            if(count($this->attachments) > 0)
+            {
+                $this->body = $this->header.$this->body;
+                $boundary = '----=='.uniqid(rand(),true);
+                $this->header = "Content-Type: multipart/mixed;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+                $this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
+                $res = array();
+                $res[] = $this->body;
+                foreach($this->attachments as $filename => $attachment)
+                {
+                    $type = $this->returnMIMEType($filename);
+                    $file_str = FileHandler::readFile($attachment);
+                    $chunks = chunk_split(base64_encode($file_str)); 
+                    $tempBody = sprintf(    
+                        "--".$boundary.$this->eol.
+                        "Content-Type: %s;".$this->eol.
+                        "\tname=\"%s\"".$this->eol.
+                        "Content-Transfer-Encoding: base64".$this->eol.
+                        "Content-Description: %s".$this->eol.
+                        "Content-Disposition: attachment;".$this->eol.
+                        "\tfilename=\"%s\"".$this->eol.$this->eol.
+                        "%s".$this->eol.$this->eol,
+                        $type,
+                        $filename,
+                        $filename,
+                        $filename,
+                        $chunks);
+                    $res[] = $tempBody;
+                }
+                $this->body = implode("", $res);
+                $this->body .= "--".$boundary."--";
+            }
+        }
+
+        function procCidAttachments()
+        {
+            if(count($this->cidAttachments) > 0)
+            {
+                $this->body = $this->header.$this->body;
+                $boundary = '----=='.uniqid(rand(),true);
+                $this->header = "Content-Type: multipart/relative;".$this->eol."\ttype=\"multipart/alternative\";".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+                $this->body = "--".$boundary.$this->eol.$this->body.$this->eol.$this->eol;
+                $res = array();
+                $res[] = $this->body;
+                foreach($this->cidAttachments as $cid => $attachment)
+                {
+                    $filename = basename($attachment);
+                    $type = $this->returnMIMEType(FileHandler::getRealPath($attachment));
+                    $file_str = FileHandler::readFile($attachment);
+                    $chunks = chunk_split(base64_encode($file_str)); 
+                    $tempBody = sprintf(    
+                        "--".$boundary.$this->eol.
+                        "Content-Type: %s;".$this->eol.
+                        "\tname=\"%s\"".$this->eol.
+                        "Content-Transfer-Encoding: base64".$this->eol.
+                        "Content-ID: <%s>".$this->eol.
+                        "Content-Description: %s".$this->eol.
+                        "Content-Location: %s".$this->eol.$this->eol.
+                        "%s".$this->eol.$this->eol,
+                        $type,
+                        $filename,
+                        $cid,
+                        $filename,
+                        $filename,
+                        $chunks);
+                    $res[] = $tempBody;
+                }
+                $this->body = implode("", $res);
+                $this->body .= "--".$boundary."--";
+            }
+        }
+
+
+        function send() {
+            $boundary = '----=='.uniqid(rand(),true);
+            $this->eol = $GLOBALS['_qmail_compatibility'] == "Y" ? "\n" : "\r\n";
+
+            $this->header = "Content-Type: multipart/alternative;".$this->eol."\tboundary=\"".$boundary."\"".$this->eol.$this->eol;
+            $this->body = sprintf(
+                "--%s".$this->eol.
+                "Content-Type: text/plain; charset=utf-8; format=flowed".$this->eol.
+                "Content-Transfer-Encoding: base64".$this->eol.
+                "Content-Disposition: inline".$this->eol.$this->eol.
+                "%s".
+                "--%s".$this->eol.
+                "Content-Type: text/html; charset=utf-8".$this->eol.
+                "Content-Transfer-Encoding: base64".$this->eol.
+                "Content-Disposition: inline".$this->eol.$this->eol.
+                "%s".
+                "--%s--".
+                "",
+                $boundary,
+                $this->getPlainContent(),
+                $boundary,
+                $this->getHTMLContent(),
+                $boundary
+            );
+
+            $this->procCidAttachments();
+            $this->procAttachments();
+
+            $headers = sprintf(
+                "From: %s".$this->eol.
+                "%s".
+                "%s".
+                "%s".
+                "%s".
+                "MIME-Version: 1.0".$this->eol."",
+                $this->getSender(),
+                $this->messageId?("Message-ID: <".$this->messageId.">".$this->eol):"",
+                $this->replyTo?("Reply-To: <".$this->replyTo.">".$this->eol):"",
+                $this->bcc?("Bcc: ".$this->bcc.$this->eol):"",
+                $this->references?("References: <".$this->references.">".$this->eol."In-Reply-To: <".$this->references.">".$this->eol):""
+            );
+            $headers .= $this->header;
+			if($this->additional_params) return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers, $this->additional_params);
+            return mail($this->getReceiptor(), $this->getTitle(), $this->body, $headers);
+        }
+
+        function checkMailMX($email_address) {
+            if(!Mail::isVaildMailAddress($email_address)) return false;
+            list($user, $host) = explode("@", $email_address);
+            if(function_exists('checkdnsrr')) {
+                if (checkdnsrr($host, "MX") or checkdnsrr($host, "A")) return true;     
+                else return false;
+            }
+            return true;
+        }
+
+        function isVaildMailAddress($email_address) {
+            if( preg_match("/([a-z0-9\_\-\.]+)@([a-z0-9\_\-\.]+)/i", $email_address) ) return $email_address;
+            else return ''; 
+        }
+
+        function returnMIMEType($filename)
+        {
+            preg_match("|\.([a-z0-9]{2,4})$|i", $filename, $fileSuffix);
+
+            switch(strtolower($fileSuffix[1]))
+            {
+                case "js" :
+                    return "application/x-javascript";
+
+                case "json" :
+                    return "application/json";
+
+                case "jpg" :
+                    case "jpeg" :
+                    case "jpe" :
+                    return "image/jpg";
+
+                case "png" :
+                    case "gif" :
+                    case "bmp" :
+                    case "tiff" :
+                    return "image/".strtolower($fileSuffix[1]);
+
+                case "css" :
+                    return "text/css";
+
+                case "xml" :
+                    return "application/xml";
+
+                case "doc" :
+                    case "docx" :
+                    return "application/msword";
+
+                case "xls" :
+                    case "xlt" :
+                    case "xlm" :
+                    case "xld" :
+                    case "xla" :
+                    case "xlc" :
+                    case "xlw" :
+                    case "xll" :
+                    return "application/vnd.ms-excel";
+
+                case "ppt" :
+                    case "pps" :
+                    return "application/vnd.ms-powerpoint";
+
+                case "rtf" :
+                    return "application/rtf";
+
+                case "pdf" :
+                    return "application/pdf";
+
+                case "html" :
+                    case "htm" :
+                    case "php" :
+                    return "text/html";
+
+                case "txt" :
+                    return "text/plain";
+
+                case "mpeg" :
+                    case "mpg" :
+                    case "mpe" :
+                    return "video/mpeg";
+
+                case "mp3" :
+                    return "audio/mpeg3";
+
+                case "wav" :
+                    return "audio/wav";
+
+                case "aiff" :
+                    case "aif" :
+                    return "audio/aiff";
+
+                case "avi" :
+                    return "video/msvideo";
+
+                case "wmv" :
+                    return "video/x-ms-wmv";
+
+                case "mov" :
+                    return "video/quicktime";
+
+                case "zip" :
+                    return "application/zip";
+
+                case "tar" :
+                    return "application/x-tar";
+
+                case "swf" :
+                    return "application/x-shockwave-flash";
+
+                default :
+                if(function_exists("mime_content_type"))
+                {
+                    $fileSuffix = mime_content_type($filename);
+                }
+
+                return "unknown/" . trim($fileSuffix[0], ".");
+            }
+        }
+    }
+?>
diff --git a/classes/mobile/Mobile.class.php b/classes/mobile/Mobile.class.php
index 574fa9c10..694038406 100644
--- a/classes/mobile/Mobile.class.php
+++ b/classes/mobile/Mobile.class.php
@@ -16,44 +16,37 @@ class Mobile {
 
 	function _isFromMobilePhone() {
 		if($this->ismobile !== null) return $this->ismobile;
-		$db_info = Context::getDBInfo();
-		if($db_info->use_mobile_view != "Y" || Context::get('full_browse') || $_COOKIE["FullBrowse"])
-		{
-			$this->ismobile = false;
-		}
-		else
-		{
-			$xe_web_path = Context::pathToUrl(_XE_PATH_);
 
-			$m = Context::get('m');
-			if(strlen($m)==1) {
-				if($m == "1") {
-					$_COOKIE["mobile"] = 'true';
-					setcookie("mobile", 'true', 0, $xe_web_path);
-					$this->ismobile = true;
-				}
-				else if($m == "0") {
-					$_COOKIE["mobile"] = 'false';
-					setcookie("mobile", 'false', 0, $xe_web_path);
-					$this->ismobile = false;
-				}
+		$db_info = Context::getDBInfo();
+		if($db_info->use_mobile_view != "Y" || Context::get('full_browse') || $_COOKIE["FullBrowse"]) {
+			return ($this->ismobile = false);
+		}
+
+		$xe_web_path = Context::pathToUrl(_XE_PATH_);
+
+		$m = Context::get('m');
+		if(strlen($m)==1) {
+			if($m == "1") {
+				$_COOKIE['mobile'] = 'true';
+				setcookie('mobile', 'true', 0, $xe_web_path);
+				$this->ismobile = true;
+			} elseif($m == "0") {
+				$_COOKIE['mobile'] = 'false';
+				setcookie('mobile', 'false', 0, $xe_web_path);
+				$this->ismobile = false;
 			}
-			else if(isset($_COOKIE["mobile"])) {
-				if($_COOKIE['mobile']  == 'true') {
-					$this->ismobile = true;
-				}
-				else {
-					$_COOKIE["mobile"] = 'false';
-					setcookie("mobile", 'false', 0, $xe_web_path);
-					$this->ismobile = false;
-				} 
-			}
-			else {
-				if(preg_match('/(iPod|iPhone|Android|BlackBerry|SymbianOS|SCH\-M[0-9]+)/',$_SERVER['HTTP_USER_AGENT']))
-				{
-					setcookie("mobile", 'true', 0, $xe_web_path);
-					$this->ismobile = true;
-				}
+		} elseif(isset($_COOKIE['mobile'])) {
+			if($_COOKIE['mobile']  == 'true') {
+				$this->ismobile = true;
+			} else {
+				$_COOKIE['mobile'] = 'false';
+				setcookie('mobile', 'false', 0, $xe_web_path);
+				$this->ismobile = false;
+			} 
+		} else {
+			if($this->isMobileCheckByAgent()) {
+				setcookie("mobile", 'true', 0, $xe_web_path);
+				$this->ismobile = true;
 			}
 		}
 
@@ -62,10 +55,7 @@ class Mobile {
 
 	function isMobileCheckByAgent()
 	{
-		if(preg_match('/(iPod|iPhone|Android|BlackBerry|SymbianOS|SCH\-M[0-9]+)/',$_SERVER['HTTP_USER_AGENT']))
-			return true;
-		else
-			return false;
+		return !!preg_match('/(iPod|iPhone|Android|BlackBerry|SymbianOS|SCH-M\d+|SPH-M\d+|Windows Phone|Dorothy Browser|Googlebot-Mobile)/',$_SERVER['HTTP_USER_AGENT']);
 	}
 
 	function setMobile($ismobile)
diff --git a/classes/module/ModuleHandler.class.php b/classes/module/ModuleHandler.class.php
index 7d70d6b9f..788a3ba30 100644
--- a/classes/module/ModuleHandler.class.php
+++ b/classes/module/ModuleHandler.class.php
@@ -1,559 +1,779 @@
-<?php
-    /**
-    * @class ModuleHandler
-    * @author NHN (developers@xpressengine.com)
-    * @brief Handling modules
-    *
-    * @remarks This class is to excute actions of modules.
-    *          Constructing an instance without any parameterconstructor, it finds the target module based on Context.
-    *          If there is no act on the found module, excute an action referencing action_forward.
-    **/
-
-    class ModuleHandler extends Handler {
-
-        var $module = NULL; ///< Module
-        var $act = NULL; ///< action
-        var $mid = NULL; ///< Module ID
-        var $document_srl = NULL; ///< Document Number
-        var $module_srl = NULL; ///< Module Number
-
-        var $module_info = NULL; ///< Module Info. Object
-
-        var $error = NULL; ///< an error code.
-
-        /**
-         * @brief constructor
-         * @remarks it prepares variables to use in moduleHandler
-         **/
-        function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $module_srl = '') {
-            // If XE has not installed yet, set module as install
-            if(!Context::isInstalled()) {
-                $this->module = 'install';
-                $this->act = Context::get('act');
-                return;
-            }
-
-            // Set variables from request arguments
-            $this->module = $module?$module:Context::get('module');
-            $this->act    = $act?$act:Context::get('act');
-            $this->mid    = $mid?$mid:Context::get('mid');
-            $this->document_srl = $document_srl?(int)$document_srl:(int)Context::get('document_srl');
-            $this->module_srl   = $module_srl?(int)$module_srl:(int)Context::get('module_srl');
-            $this->entry  = Context::convertEncodingStr(Context::get('entry'));
-
-            // Validate variables to prevent XSS
-            if($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->module)) die(Context::getLang("msg_invalid_request"));
-            if($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->mid)) die(Context::getLang("msg_invalid_request"));
-            if($this->act && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->act)) die(Context::getLang("msg_invalid_request"));
-
-            // execute addon (before module initialization)
-            $called_position = 'before_module_init';
-            $oAddonController = &getController('addon');
-            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?'mobile':'pc');
-            @include($addon_file);
-        }
-
-        /**
-         * @brief Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
-         * @return true: OK, false: redirected 
-         **/
-        function init() {
-			$oModuleModel = &getModel('module');
-            $site_module_info = Context::get('site_module_info');
-
-            if(!$this->document_srl && $this->mid && $this->entry) {
-                $oDocumentModel = &getModel('document');
-                $this->document_srl = $oDocumentModel->getDocumentSrlByAlias($this->mid, $this->entry);
-                if($this->document_srl) Context::set('document_srl', $this->document_srl);
-            }
-
-            // Get module's information based on document_srl, if it's specified
-            if($this->document_srl && !$this->module) {
-                $module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl);
-
-                // If the document does not exist, remove document_srl
-                if(!$module_info) {
-                    unset($this->document_srl);
-                } else {
-                    // If it exists, compare mid based on the module information
-                    // if mids are not matching, set it as the document's mid
-                    if($this->mid != $module_info->mid) {
-                        $this->mid = $module_info->mid;
-                        Context::set('mid', $module_info->mid, true);
-                    }
-                }
-                // if requested module is different from one of the document, remove the module information retrieved based on the document number
-                if($this->module && $module_info->module != $this->module) unset($module_info);
-            }
-
-            // If module_info is not set yet, and there exists mid information, get module information based on the mid
-            if(!$module_info && $this->mid) {
-                $module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_module_info->site_srl);
-                //if($this->module && $module_info->module != $this->module) unset($module_info);
-            }
-
-            // redirect, if module_site_srl and site_srl are different
-            if(!$this->module && !$module_info && $site_module_info->site_srl == 0 && $site_module_info->module_site_srl > 0) {
-                $site_info = $oModuleModel->getSiteInfo($site_module_info->module_site_srl);
-                header("location:".getNotEncodedSiteUrl($site_info->domain,'mid',$site_module_info->mid));
-                return false;
-            }
-
-            // If module_info is not set still, and $module does not exist, find the default module
-            if(!$module_info && !$this->module) $module_info = $site_module_info;
-
-            if(!$module_info && !$this->module && $site_module_info->module_site_srl) $module_info = $site_module_info;
-
-            // redirect, if site_srl of module_info is different from one of site's module_info
-            if($module_info && $module_info->site_srl != $site_module_info->site_srl && !isCrawler()) {
-                // If the module is of virtual site
-                if($module_info->site_srl) {
-                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
-                    $redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'),'entry',Context::get('entry'));
-                // If it's called from a virtual site, though it's not a module of the virtual site
-                } else {
-                    $db_info = Context::getDBInfo();
-                    if(!$db_info->default_url) return Context::getLang('msg_default_url_is_not_defined');
-                    else $redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'),'entry',Context::get('entry'));
-                }
-                header("location:".$redirect_url);
-                return false;
-            }
-
-            // If module info was set, retrieve variables from the module information
-            if($module_info) {
-                $this->module = $module_info->module;
-                $this->mid = $module_info->mid;
-                $this->module_info = $module_info;
-                Context::setBrowserTitle($module_info->browser_title);
-                $part_config= $oModuleModel->getModulePartConfig('layout',$module_info->layout_srl);
-                Context::addHtmlHeader($part_config->header_script);
-            }
-
-            // Set module and mid into module_info
-            $this->module_info->module = $this->module;
-            $this->module_info->mid = $this->mid;
-
-            // Still no module? it's an error
-            if(!$this->module) $this->error = 'msg_module_does_not_exist';
-
-            // If mid exists, set mid into context
-            if($this->mid) Context::set('mid', $this->mid, true);
-                
-            // Call a trigger after moduleHandler init
-            $output = ModuleHandler::triggerCall('moduleHandler.init', 'after', $this->module_info);
-            if(!$output->toBool()) {
-                $this->error = $output->getMessage();
-                return false;
-            }
-
-            // Set current module info into context 
-            Context::set('current_module_info', $this->module_info);
-
-            return true;
-        }
-
-        /**
-         * @brief get a module instance and execute an action
-         * @return executed module instance
-         **/
-        function procModule() {
-            // If error occurred while preparation, return a message instance
-            if($this->error) {
-				$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
-                $oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
-                $oMessageObject->setError(-1);
-                $oMessageObject->setMessage($this->error);
-                $oMessageObject->dispMessage();
-                return $oMessageObject;
-            }
-
-            $oModuleModel = &getModel('module');
-
-            // Get action information with conf/action.xml 
-            $xml_info = $oModuleModel->getModuleActionXml($this->module);
-
-            // If not installed yet, modify act 
-            if($this->module=="install") {
-                if(!$this->act || !$xml_info->action->{$this->act}) $this->act = $xml_info->default_index_act;
-            }
-
-            // if act exists, find type of the action, if not use default index act
-            if(!$this->act) $this->act = $xml_info->default_index_act;
-
-            // still no act means error
-            if(!$this->act) {
-                $this->error = 'msg_module_does_not_exist';
-                return;
-            }
-
-            // get type, kind
-            $type = $xml_info->action->{$this->act}->type;
-            $kind = strpos(strtolower($this->act),'admin')!==false?'admin':'';
-            if(!$kind && $this->module == 'admin') $kind = 'admin';
-			if($this->module_info->use_mobile != "Y") Mobile::setMobile(false);
-
-			// if(type == view, and case for using mobilephone)
-			if($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
-			{
-				$orig_type = "view";
-				$type = "mobile";
-				// create a module instance
-				$oModule = &$this->getModuleInstance($this->module, $type, $kind);
-				if(!is_object($oModule) || !method_exists($oModule, $this->act)) {
-					$type = $orig_type;
-					Mobile::setMobile(false);
-					$oModule = &$this->getModuleInstance($this->module, $type, $kind);
-				}
-			}
-			else
-			{
-				// create a module instance
-				$oModule = &$this->getModuleInstance($this->module, $type, $kind);
-			}
-
-			if(!is_object($oModule)) {
-				$this->error = 'msg_module_does_not_exist';
-				return;
-			}
-
-			// If there is no such action in the module object
-			if(!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act)) 
-			{
-				if(!Context::isInstalled()) 
-				{
-					$this->error = 'msg_invalid_request';
-					return;
-				}
-
-                $forward = null;
-				// 1. Look for the module with action name
-                if(preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches)) {
-                    $module = strtolower($matches[2].$matches[3]);
-                    $xml_info = $oModuleModel->getModuleActionXml($module);
-                    if($xml_info->action->{$this->act}) {
-                        $forward->module = $module;
-                        $forward->type = $xml_info->action->{$this->act}->type;
-                        $forward->act = $this->act;
-                    }
-                }
-
-				if(!$forward) 
-				{
-					$forward = $oModuleModel->getActionForward($this->act);
-				}
-
-                if($forward->module && $forward->type && $forward->act && $forward->act == $this->act) {
-                    $kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
-					$type = $forward->type;
-					$tpl_path = $oModule->getTemplatePath();
-					$orig_module = $oModule;
-
-					if($type == "view" && Mobile::isFromMobilePhone())
-					{
-						$orig_type = "view";
-						$type = "mobile";
-						// create a module instance
-						$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
-						if(!is_object($oModule) || !method_exists($oModule, $this->act)) {
-							$type = $orig_type;
-							Mobile::setMobile(false);
-							$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
-						}
-					}
-					else
-					{
-						$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
-					}
-                    $xml_info = $oModuleModel->getModuleActionXml($forward->module);
-					$oMemberModel = &getModel('member');
-					$logged_info = $oMemberModel->getLoggedInfo();
-
-					if($this->module == "admin" && $type == "view")
-					{
-						if($logged_info->is_admin=='Y') {
-							$orig_module->loadSideBar();
-							$oModule->setLayoutPath("./modules/admin/tpl");
-							$oModule->setLayoutFile("layout.html");
-						}
-						else{
-                            $this->error = 'msg_is_not_administrator';
-                            $oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
-                            $oMessageObject->setError(-1);
-                            $oMessageObject->setMessage($this->error);
-                            $oMessageObject->dispMessage();
-                            return $oMessageObject;
-                        }   
-					}
-					if ($kind == 'admin'){
-						$grant = $oModuleModel->getGrant($this->module_info, $logged_info);		
-						if(!$grant->is_admin && !$grant->manager) {
-                            $this->error = 'msg_is_not_manager';
-                            $oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
-                            $oMessageObject->setError(-1);
-                            $oMessageObject->setMessage($this->error);
-                            $oMessageObject->dispMessage();
-                            return $oMessageObject;
-                        }   
-						
-					}
-				}
-				else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
-				{
-					$this->act = $xml_info->default_index_act;
-				}
-				else
-				{
-					$this->error = 'msg_invalid_request';
-					return;
-				}
-			}
-
-            $oModule->setAct($this->act);
-
-            $this->module_info->module_type = $type;
-            $oModule->setModuleInfo($this->module_info, $xml_info);
-
-			if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent())
-			{
-				global $lang;
-				$footer = '<div style="margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0"><p style="color:#fff;text-align:center;margin:1em 0">'.$lang->msg_pc_to_mobile.' <a href="'.getUrl('m', '1').'" style="color:#FF0; font-weight:bold">'.$lang->cmd_move.'</a></p></div>';
-				Context::addHtmlFooter($footer);
-			}
-
-            // execute the action, and if failed, set error
-            if(!$oModule->proc()) $this->error = $oModule->getMessage();
-
-            return $oModule;
-        }
-
-        /**
-         * @brief display contents from executed module
-         * @param[in] $oModule module instance
-         * @return none
-         **/
-        function displayContent($oModule = NULL) {
-            // If the module is not set or not an object, set error
-            if(!$oModule || !is_object($oModule)) {
-                $this->error = 'msg_module_does_not_exists';
-            }
-
-            // If connection to DB has a problem even though it's not install module, set error
-            if($this->module != 'install' && $GLOBALS['__DB__'][Context::getDBType()]->is_connected == false) {
-                $this->error = 'msg_dbconnect_failed';
-            }
-
-            // Call trigger after moduleHandler proc
-            $output = ModuleHandler::triggerCall('moduleHandler.proc', 'after', $oModule);
-            if(!$output->toBool()) $this->error = $output->getMessage();
-
-            // Use message view object, if HTML call
-            if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
-                // If error occurred, handle it
-                if($this->error) {
-                    // display content with message module instance 
-					$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
-					$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
-					$oMessageObject->setError(-1);
-					$oMessageObject->setMessage($this->error);
-					$oMessageObject->dispMessage();
-
-                    // If module was called normally, change the templates of the module into ones of the message view module
-                    if($oModule) {
-                        $oModule->setTemplatePath($oMessageObject->getTemplatePath());
-                        $oModule->setTemplateFile($oMessageObject->getTemplateFile());
-
-                    // Otherwise, set message instance as the target module
-                    } else {
-                        $oModule = $oMessageObject;
-                    }
-                }
-
-                // Check if layout_srl exists for the module
-				if(Mobile::isFromMobilePhone())
-				{
-					$layout_srl = $oModule->module_info->mlayout_srl;
-				}
-				else
-				{
-					$layout_srl = $oModule->module_info->layout_srl;
-				}
-
-                if($layout_srl && !$oModule->getLayoutFile()) {
-
-                    // If layout_srl exists, get information of the layout, and set the location of layout_path/ layout_file 
-                    $oLayoutModel = &getModel('layout');
-                    $layout_info = $oLayoutModel->getLayout($layout_srl);
-                    if($layout_info) {
-
-                        // Input extra_vars into $layout_info
-                        if($layout_info->extra_var_count) {
-
-                            foreach($layout_info->extra_var as $var_id => $val) {
-                                if($val->type == 'image') {
-                                    if(preg_match('/^\.\/files\/attach\/images\/(.+)/i',$val->value)) $val->value = Context::getRequestUri().substr($val->value,2);
-                                }
-                                $layout_info->{$var_id} = $val->value;
-                            }
-                        }
-                        // Set menus into context
-                        if($layout_info->menu_count) {
-                            foreach($layout_info->menu as $menu_id => $menu) {
-                                if(file_exists($menu->php_file)) @include($menu->php_file);
-                                Context::set($menu_id, $menu);
-                            }
-                        }
-
-                        // Set layout information into context 
-                        Context::set('layout_info', $layout_info);
-
-                        $oModule->setLayoutPath($layout_info->path);
-                        $oModule->setLayoutFile('layout');
-
-                        // If layout was modified, use the modified version
-                        $edited_layout = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-                        if(file_exists($edited_layout)) $oModule->setEditedLayoutFile($edited_layout);
-                    }
-                }
-            }
-
-            // Display contents 
-            $oDisplayHandler = new DisplayHandler();
-            $oDisplayHandler->printContent($oModule);
-        }
-
-        /**
-         * @brief returns module's path
-         * @param[in] $module module name
-         * @return path of the module
-         **/
-        function getModulePath($module) {
-            return sprintf('./modules/%s/', $module);
-        }
-
-        /**
-         * @brief It creates a module instance
-         * @param[in] $module module name
-         * @param[in] $type instance type, (e.g., view, controller, model)
-         * @param[in] $kind admin or svc
-         * @return module instance (if failed it returns null)
-         * @remarks if there exists a module instance created before, returns it.
-         **/
-        function &getModuleInstance($module, $type = 'view', $kind = '') {
-
-            if(__DEBUG__==3) $start_time = getMicroTime();
-
-			$kind = strtolower($kind);
-			$type = strtolower($type);
-
-			$kinds = explode(' ', 'svc admin');
-			if(!in_array($kind, $kinds)) $kind = $kinds[0];
-
-			$key = $module.'.'.($kind!='admin'?'':'admin').'.'.$type;
-
-			if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__'])) {
-				$module = $extend_module = $GLOBALS['__MODULE_EXTEND__'][$key];
-			}else{
-				unset($parent_module);
-			}
-
-            // if there is no instance of the module in global variable, create a new one 
-            if(!$GLOBALS['_loaded_module'][$module][$type][$kind]) {
-				$parent_module = $module;
-
-				$class_path = ModuleHandler::getModulePath($module);
-				if(!is_dir(FileHandler::getRealPath($class_path))) return NULL;
-
-                // Get base class name and load the file contains it 
-                if(!class_exists($module)) {
-                    $high_class_file = sprintf('%s%s%s.class.php', _XE_PATH_,$class_path, $module);
-                    if(!file_exists($high_class_file)) return NULL;
-                    require_once($high_class_file);
-                }
-
-                // Get the object's name
-				$types = explode(' ', 'view controller model api wap mobile class');
-				if(!in_array($type, $types)) $type = $types[0];
-				if($type == 'class') {
-					$instance_name = '%s';
-					$class_file    = '%s%s.%s.php';
-				} elseif($kind == 'admin' && array_search($type, $types) < 3) {
-					$instance_name = '%sAdmin%s';
-					$class_file    = '%s%s.admin.%s.php';
-				} else{
-					$instance_name = '%s%s';
-					$class_file    = '%s%s.%s.php';
-				}
-				$instance_name = sprintf($instance_name, $module, ucfirst($type));
-				$class_file    = sprintf($class_file, $class_path, $module, $type);
-				$class_file    = FileHandler::getRealPath($class_file);
-
-                // Get the name of the class file
-                if(!is_readable($class_file)) return NULL;
-
-                // Create an instance with eval function
-                require_once($class_file);
-                if(!class_exists($instance_name)) return NULL;
-				$tmp_fn  = create_function('', "return new {$instance_name}();");
-				$oModule = $tmp_fn();
-                if(!is_object($oModule)) return NULL;
-
-                // Load language files for the class
-                Context::loadLang($class_path.'lang');
-				if($extend_module) {
-					Context::loadLang(ModuleHandler::getModulePath($parent_module).'lang');
-				}
-
-                // Set variables to the instance
-                $oModule->setModule($module);
-                $oModule->setModulePath($class_path);
-
-                // If the module has a constructor, run it.
-                if(!isset($GLOBALS['_called_constructor'][$instance_name])) {
-                    $GLOBALS['_called_constructor'][$instance_name] = true;
-                    if(@method_exists($oModule, $instance_name)) $oModule->{$instance_name}();
-                }
-
-                // Store the created instance into GLOBALS variable 
-                $GLOBALS['_loaded_module'][$module][$type][$kind] = $oModule;
-            }
-
-            if(__DEBUG__==3) $GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
-
-            // return the instance 
-            return $GLOBALS['_loaded_module'][$module][$type][$kind];
-        }
-
-        /**
-         * @brief call a trigger
-         * @param[in] $trigger_name trigger's name to call
-         * @param[in] $called_position called position
-         * @param[in] $obj an object as a parameter to trigger
-         * @return Object
-         **/
-        function triggerCall($trigger_name, $called_position, &$obj) {
-            // skip if not installed 
-            if(!Context::isInstalled()) return new Object();
-
-            $oModuleModel = &getModel('module');
-            $triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
-            if(!$triggers || !count($triggers)) return new Object();
-
-            foreach($triggers as $item) {
-                $module = $item->module;
-                $type = $item->type;
-                $called_method = $item->called_method;
-
-                $oModule = null;
-                $oModule = &getModule($module, $type);
-                if(!$oModule || !method_exists($oModule, $called_method)) continue;
-
-                $output = $oModule->{$called_method}($obj);
-                if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool()) return $output;
-                unset($oModule);
-            }
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+    * @class ModuleHandler
+    * @author NHN (developers@xpressengine.com)
+    * @brief Handling modules
+    *
+    * @remarks This class is to excute actions of modules.
+    *          Constructing an instance without any parameterconstructor, it finds the target module based on Context.
+    *          If there is no act on the found module, excute an action referencing action_forward.
+    **/
+
+    class ModuleHandler extends Handler {
+
+        var $module = NULL; ///< Module
+        var $act = NULL; ///< action
+        var $mid = NULL; ///< Module ID
+        var $document_srl = NULL; ///< Document Number
+        var $module_srl = NULL; ///< Module Number
+
+        var $module_info = NULL; ///< Module Info. Object
+
+        var $error = NULL; ///< an error code.
+        var $httpStatusCode = NULL; ///< http status code.
+
+        /**
+         * @brief constructor
+         * @remarks it prepares variables to use in moduleHandler
+         **/
+        function ModuleHandler($module = '', $act = '', $mid = '', $document_srl = '', $module_srl = '') {
+            // If XE has not installed yet, set module as install
+            if(!Context::isInstalled()) {
+                $this->module = 'install';
+                $this->act = Context::get('act');
+                return;
+            }
+            // Set variables from request arguments
+            $this->module = $module?$module:Context::get('module');
+            $this->act    = $act?$act:Context::get('act');
+            $this->mid    = $mid?$mid:Context::get('mid');
+            $this->document_srl = $document_srl?(int)$document_srl:(int)Context::get('document_srl');
+            $this->module_srl   = $module_srl?(int)$module_srl:(int)Context::get('module_srl');
+            $this->entry  = Context::convertEncodingStr(Context::get('entry'));
+
+            // Validate variables to prevent XSS
+			$isInvalid = null;
+            if($this->module && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->module)) $isInvalid = true;
+            if($this->mid && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->mid)) $isInvalid = true;
+            if($this->act && !preg_match("/^([a-z0-9\_\-]+)$/i",$this->act)) $isInvalid = true;
+			if ($isInvalid)
+			{
+				htmlHeader();
+				echo Context::getLang("msg_invalid_request");
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+
+            // execute addon (before module initialization)
+            $called_position = 'before_module_init';
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?'mobile':'pc');
+            @include($addon_file);
+        }
+
+        /**
+         * @brief Initialization. It finds the target module based on module, mid, document_srl, and prepares to execute an action
+         * @return true: OK, false: redirected
+         **/
+        function init() {
+			$oModuleModel = &getModel('module');
+            $site_module_info = Context::get('site_module_info');
+
+            if(!$this->document_srl && $this->mid && $this->entry) {
+                $oDocumentModel = &getModel('document');
+                $this->document_srl = $oDocumentModel->getDocumentSrlByAlias($this->mid, $this->entry);
+                if($this->document_srl) Context::set('document_srl', $this->document_srl);
+            }
+
+            // Get module's information based on document_srl, if it's specified
+            if($this->document_srl && !$this->module) {
+                $module_info = $oModuleModel->getModuleInfoByDocumentSrl($this->document_srl);
+
+                // If the document does not exist, remove document_srl
+                if(!$module_info) {
+                    unset($this->document_srl);
+                } else {
+                    // If it exists, compare mid based on the module information
+                    // if mids are not matching, set it as the document's mid
+                    if($this->mid != $module_info->mid) {
+                        $this->mid = $module_info->mid;
+                        Context::set('mid', $module_info->mid, true);
+                    }
+                }
+                // if requested module is different from one of the document, remove the module information retrieved based on the document number
+                if($this->module && $module_info->module != $this->module) unset($module_info);
+            }
+
+            // If module_info is not set yet, and there exists mid information, get module information based on the mid
+            if(!$module_info && $this->mid) {
+                $module_info = $oModuleModel->getModuleInfoByMid($this->mid, $site_module_info->site_srl);
+                //if($this->module && $module_info->module != $this->module) unset($module_info);
+            }
+
+            // redirect, if module_site_srl and site_srl are different
+            if(!$this->module && !$module_info && $site_module_info->site_srl == 0 && $site_module_info->module_site_srl > 0) {
+                $site_info = $oModuleModel->getSiteInfo($site_module_info->module_site_srl);
+                header("location:".getNotEncodedSiteUrl($site_info->domain,'mid',$site_module_info->mid));
+                return false;
+            }
+
+            // If module_info is not set still, and $module does not exist, find the default module
+            if(!$module_info && !$this->module && !$this->mid) $module_info = $site_module_info;
+
+            if(!$module_info && !$this->module && $site_module_info->module_site_srl) $module_info = $site_module_info;
+
+            // redirect, if site_srl of module_info is different from one of site's module_info
+            if($module_info && $module_info->site_srl != $site_module_info->site_srl && !isCrawler()) {
+                // If the module is of virtual site
+                if($module_info->site_srl) {
+                    $site_info = $oModuleModel->getSiteInfo($module_info->site_srl);
+                    $redirect_url = getNotEncodedSiteUrl($site_info->domain, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'),'entry',Context::get('entry'));
+                // If it's called from a virtual site, though it's not a module of the virtual site
+                } else {
+                    $db_info = Context::getDBInfo();
+                    if(!$db_info->default_url) return Context::getLang('msg_default_url_is_not_defined');
+                    else $redirect_url = getNotEncodedSiteUrl($db_info->default_url, 'mid',Context::get('mid'),'document_srl',Context::get('document_srl'),'module_srl',Context::get('module_srl'),'entry',Context::get('entry'));
+                }
+                header("location:".$redirect_url);
+                return false;
+            }
+
+            // If module info was set, retrieve variables from the module information
+            if($module_info) {
+                $this->module = $module_info->module;
+                $this->mid = $module_info->mid;
+                $this->module_info = $module_info;
+                Context::setBrowserTitle($module_info->browser_title);
+                $part_config= $oModuleModel->getModulePartConfig('layout',$module_info->layout_srl);
+                Context::addHtmlHeader($part_config->header_script);
+            }
+
+            // Set module and mid into module_info
+            $this->module_info->module = $this->module;
+            $this->module_info->mid = $this->mid;
+
+			// Set site_srl add 2011 08 09
+			$this->module_info->site_srl = $site_module_info->site_srl;
+
+            // Still no module? it's an error
+            if(!$this->module)
+			{
+				$this->error = 'msg_module_is_not_exists';
+				$this->httpStatusCode = '404';
+			}
+
+            // If mid exists, set mid into context
+            if($this->mid) Context::set('mid', $this->mid, true);
+
+            // Call a trigger after moduleHandler init
+            $output = ModuleHandler::triggerCall('moduleHandler.init', 'after', $this->module_info);
+            if(!$output->toBool()) {
+                $this->error = $output->getMessage();
+                return false;
+            }
+
+            // Set current module info into context
+            Context::set('current_module_info', $this->module_info);
+
+            return true;
+        }
+
+        /**
+         * @brief get a module instance and execute an action
+         * @return executed module instance
+         **/
+        function procModule() {
+            $oModuleModel = &getModel('module');
+
+            // If error occurred while preparation, return a message instance
+            if($this->error) {
+				$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
+                $oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
+                $oMessageObject->setError(-1);
+                $oMessageObject->setMessage($this->error);
+                $oMessageObject->dispMessage();
+				if($this->httpStatusCode)
+				{
+					$oMessageObject->setHttpStatusCode($this->httpStatusCode);
+				}
+                return $oMessageObject;
+            }
+
+            // Get action information with conf/module.xml
+            $xml_info = $oModuleModel->getModuleActionXml($this->module);
+
+            // If not installed yet, modify act
+            if($this->module=="install") {
+                if(!$this->act || !$xml_info->action->{$this->act}) $this->act = $xml_info->default_index_act;
+            }
+
+            // if act exists, find type of the action, if not use default index act
+            if(!$this->act) $this->act = $xml_info->default_index_act;
+
+            // still no act means error
+            if(!$this->act) {
+                $this->error = 'msg_module_is_not_exists';
+				$this->httpStatusCode = '404';
+                return;
+            }
+
+            // get type, kind
+            $type = $xml_info->action->{$this->act}->type;
+            $ruleset = $xml_info->action->{$this->act}->ruleset;
+            $kind = strpos(strtolower($this->act),'admin')!==false?'admin':'';
+            if(!$kind && $this->module == 'admin') $kind = 'admin';
+			if($this->module_info->use_mobile != "Y") Mobile::setMobile(false);
+
+			// admin menu check
+            if(Context::isInstalled())
+			{
+				$oMenuAdminModel = &getAdminModel('menu');
+				$output = $oMenuAdminModel->getMenuByTitle('__XE_ADMIN__');
+
+				if(!$output->menu_srl)
+				{
+					$oAdminClass = &getClass('admin');
+					$oAdminClass->createXeAdminMenu();
+				}
+				else if(!is_readable($output->php_file))
+				{
+					$oMenuAdminController = &getAdminController('menu');
+					$oMenuAdminController->makeXmlFile($output->menu_srl);
+				}
+			}
+
+			// Admin ip
+			$logged_info = Context::get('logged_info');
+			if($kind == 'admin' && $_SESSION['denied_admin'] == 'Y'){
+				$this->error = "msg_not_permitted_act";
+				$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
+				$oMessageObject->setError(-1);
+				$oMessageObject->setMessage($this->error);
+				$oMessageObject->dispMessage();
+				return $oMessageObject;
+			}
+			
+			// if(type == view, and case for using mobilephone)
+			if($type == "view" && Mobile::isFromMobilePhone() && Context::isInstalled())
+			{
+				$orig_type = "view";
+				$type = "mobile";
+				// create a module instance
+				$oModule = &$this->getModuleInstance($this->module, $type, $kind);
+				if(!is_object($oModule) || !method_exists($oModule, $this->act)) {
+					$type = $orig_type;
+					Mobile::setMobile(false);
+					$oModule = &$this->getModuleInstance($this->module, $type, $kind);
+				}
+			}
+			else
+			{
+				// create a module instance
+				$oModule = &$this->getModuleInstance($this->module, $type, $kind);
+			}
+
+			if(!is_object($oModule)) {
+				$this->error = 'msg_module_is_not_exists';
+				$this->httpStatusCode = '404';
+				return;
+			}
+
+			// If there is no such action in the module object
+			if(!isset($xml_info->action->{$this->act}) || !method_exists($oModule, $this->act))
+			{
+
+				if(!Context::isInstalled())
+				{
+					$this->error = 'msg_invalid_request';
+					return;
+				}
+
+                $forward = null;
+				// 1. Look for the module with action name
+                if(preg_match('/^([a-z]+)([A-Z])([a-z0-9\_]+)(.*)$/', $this->act, $matches)) {
+                    $module = strtolower($matches[2].$matches[3]);
+                    $xml_info = $oModuleModel->getModuleActionXml($module);
+                    if($xml_info->action->{$this->act}) {
+                        $forward->module = $module;
+                        $forward->type = $xml_info->action->{$this->act}->type;
+            			$forward->ruleset = $xml_info->action->{$this->act}->ruleset;
+                        $forward->act = $this->act;
+                    }
+                }
+
+				if(!$forward)
+				{
+					$forward = $oModuleModel->getActionForward($this->act);
+				}
+
+                if($forward->module && $forward->type && $forward->act && $forward->act == $this->act) {
+                    $kind = strpos(strtolower($forward->act),'admin')!==false?'admin':'';
+					$type = $forward->type;
+					$ruleset = $forward->ruleset;
+					$tpl_path = $oModule->getTemplatePath();
+					$orig_module = $oModule;
+
+					if($type == "view" && Mobile::isFromMobilePhone())
+					{
+						$orig_type = "view";
+						$type = "mobile";
+						// create a module instance
+						$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
+						if(!is_object($oModule) || !method_exists($oModule, $this->act)) {
+							$type = $orig_type;
+							Mobile::setMobile(false);
+							$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
+						}
+					}
+					else
+					{
+						$oModule = &$this->getModuleInstance($forward->module, $type, $kind);
+					}
+                    $xml_info = $oModuleModel->getModuleActionXml($forward->module);
+					$oMemberModel = &getModel('member');
+
+					if($this->module == "admin" && $type == "view")
+					{
+						if($logged_info->is_admin=='Y'){
+							if ($this->act != 'dispLayoutAdminLayoutModify')
+							{
+								$oAdminView = &getAdminView('admin');
+								$oAdminView->makeGnbUrl($forward->module);
+								$oModule->setLayoutPath("./modules/admin/tpl");
+								$oModule->setLayoutFile("layout.html");
+							}
+						}else{
+							$this->error = 'msg_is_not_administrator';
+							$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
+							$oMessageObject->setError(-1);
+							$oMessageObject->setMessage($this->error);
+							$oMessageObject->dispMessage();
+							return $oMessageObject;
+						}
+					}
+					if ($kind == 'admin'){
+						$grant = $oModuleModel->getGrant($this->module_info, $logged_info);		
+						if(!$grant->is_admin && !$grant->manager) {
+                            $this->error = 'msg_is_not_manager';
+                            $oMessageObject = &ModuleHandler::getModuleInstance('message','view');
+                            $oMessageObject->setError(-1);
+                            $oMessageObject->setMessage($this->error);
+                            $oMessageObject->dispMessage();
+                            return $oMessageObject;
+                        }   
+						
+					}
+				}
+				else if($xml_info->default_index_act && method_exists($oModule, $xml_info->default_index_act))
+				{
+					$this->act = $xml_info->default_index_act;
+				}
+				else
+				{
+					$this->error = 'msg_invalid_request';
+					return;
+				}
+			}
+
+			// ruleset check...
+			if(!empty($ruleset))
+			{
+				$rulesetModule = $forward->module ? $forward->module : $this->module;
+				$rulesetFile = $oModuleModel->getValidatorFilePath($rulesetModule, $ruleset);
+				if(!empty($rulesetFile))
+				{
+					$Validator = new Validator($rulesetFile);
+					$result = $Validator->validate();
+					if(!$result)
+					{
+						$lastError = $Validator->getLastError();
+						$returnUrl = Context::get('error_return_url');
+						$errorMsg = $lastError['msg'] ? $lastError['msg'] : 'validation error';
+
+						//for xml response
+						$oModule->setError(-1);
+						$oModule->setMessage($errorMsg);
+						//for html redirect
+						$this->error = $errorMsg;
+						$_SESSION['XE_VALIDATOR_ERROR'] = -1;
+						$_SESSION['XE_VALIDATOR_MESSAGE'] = $this->error;
+						$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = 'error';
+						$_SESSION['XE_VALIDATOR_RETURN_URL'] = $returnUrl;
+						$this->_setInputValueToSession();
+						return $oModule;
+					}
+				}
+			}
+
+            $oModule->setAct($this->act);
+
+            $this->module_info->module_type = $type;
+            $oModule->setModuleInfo($this->module_info, $xml_info);
+
+			if($type == "view" && $this->module_info->use_mobile == "Y" && Mobile::isMobileCheckByAgent())
+			{
+				global $lang;
+				$footer = '<div style="margin:1em 0;padding:.5em;background:#333;border:1px solid #666;border-left:0;border-right:0"><p style="text-align:center;margin:1em 0"><a href="'.getUrl('m', '1').'" style="color:#ff0; font-weight:bold">'.$lang->msg_pc_to_mobile.'</a></p></div>';
+				Context::addHtmlFooter($footer);
+			}
+
+			if($type == "view" && $kind != 'admin'){
+				$module_config= $oModuleModel->getModuleConfig('module');
+				if($module_config->htmlFooter){
+						Context::addHtmlFooter($module_config->htmlFooter);
+				}
+			}
+
+
+            // if failed message exists in session, set context
+			$this->_setInputErrorToContext();
+
+            $procResult = $oModule->proc();
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON')))
+			{
+				$error = $oModule->getError();
+				$message = $oModule->getMessage();
+				$messageType = $oModule->getMessageType();
+				$redirectUrl = $oModule->getRedirectUrl();
+
+				if (!$procResult)
+				{
+					$this->error = $message;
+					if (!$redirectUrl && Context::get('error_return_url')) $redirectUrl = Context::get('error_return_url');
+					$this->_setInputValueToSession();
+
+				}
+				else
+				{
+					if(count($_SESSION['INPUT_ERROR']))
+					{
+						Context::set('INPUT_ERROR', $_SESSION['INPUT_ERROR']);
+						$_SESSION['INPUT_ERROR'] = '';
+					}
+				}
+
+				$_SESSION['XE_VALIDATOR_ERROR'] = $error;
+				if ($message != 'success') $_SESSION['XE_VALIDATOR_MESSAGE'] = $message;
+				$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = $messageType;
+				$_SESSION['XE_VALIDATOR_RETURN_URL'] = $redirectUrl;
+			}	
+			
+			unset($logged_info);
+            return $oModule;
+        }
+
+		function _setInputErrorToContext()
+		{
+			if($_SESSION['XE_VALIDATOR_ERROR'] && !Context::get('XE_VALIDATOR_ERROR')) Context::set('XE_VALIDATOR_ERROR', $_SESSION['XE_VALIDATOR_ERROR']);
+			if($_SESSION['XE_VALIDATOR_MESSAGE'] && !Context::get('XE_VALIDATOR_MESSAGE')) Context::set('XE_VALIDATOR_MESSAGE', $_SESSION['XE_VALIDATOR_MESSAGE']);
+			if($_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] && !Context::get('XE_VALIDATOR_MESSAGE_TYPE')) Context::set('XE_VALIDATOR_MESSAGE_TYPE', $_SESSION['XE_VALIDATOR_MESSAGE_TYPE']);
+			if($_SESSION['XE_VALIDATOR_RETURN_URL'] && !Context::get('XE_VALIDATOR_RETURN_URL')) Context::set('XE_VALIDATOR_RETURN_URL', $_SESSION['XE_VALIDATOR_RETURN_URL']);
+
+			$this->_clearErrorSession();
+		}
+
+		function _clearErrorSession()
+		{
+			$_SESSION['XE_VALIDATOR_ERROR'] = '';
+			$_SESSION['XE_VALIDATOR_MESSAGE'] = '';
+			$_SESSION['XE_VALIDATOR_MESSAGE_TYPE'] = '';
+			$_SESSION['XE_VALIDATOR_RETURN_URL'] = '';
+		}
+
+		function _setInputValueToSession()
+		{
+			$requestVars = Context::getRequestVars();
+			unset($requestVars->act, $requestVars->mid, $requestVars->vid, $requestVars->success_return_url, $requestVars->error_return_url);
+			foreach($requestVars AS $key=>$value) $_SESSION['INPUT_ERROR'][$key] = $value;
+		}
+
+        /**
+         * @brief display contents from executed module
+         * @param[in] $oModule module instance
+         * @return none
+         **/
+        function displayContent($oModule = NULL) {
+            // If the module is not set or not an object, set error
+            if(!$oModule || !is_object($oModule)) {
+                $this->error = 'msg_module_is_not_exists';
+				$this->httpStatusCode = '404';
+            }
+
+            // If connection to DB has a problem even though it's not install module, set error
+            if($this->module != 'install' && $GLOBALS['__DB__'][Context::getDBType()]->isConnected() == false) {
+                $this->error = 'msg_dbconnect_failed';
+            }
+
+            // Call trigger after moduleHandler proc
+            $output = ModuleHandler::triggerCall('moduleHandler.proc', 'after', $oModule);
+            if(!$output->toBool()) $this->error = $output->getMessage();
+
+            // Use message view object, if HTML call
+            if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+
+				if($_SESSION['XE_VALIDATOR_RETURN_URL'])
+				{
+					header('location:'.$_SESSION['XE_VALIDATOR_RETURN_URL']);
+					return;
+				}
+
+                // If error occurred, handle it
+                if($this->error) {
+                    // display content with message module instance
+					$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
+					$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
+					$oMessageObject->setError(-1);
+					$oMessageObject->setMessage($this->error);
+					$oMessageObject->dispMessage();
+
+					if($oMessageObject->getHttpStatusCode() && $oMessageObject->getHttpStatusCode() != '200')
+					{
+						$this->_setHttpStatusMessage($oMessageObject->getHttpStatusCode());
+						$oMessageObject->setTemplateFile('http_status_code');
+					}
+
+                    // If module was called normally, change the templates of the module into ones of the message view module
+                    if($oModule) {
+						$oModule->setTemplatePath($oMessageObject->getTemplatePath());
+						$oModule->setTemplateFile($oMessageObject->getTemplateFile());
+                    // Otherwise, set message instance as the target module
+                    } else {
+                        $oModule = $oMessageObject;
+                    }
+
+					$this->_clearErrorSession();
+                }
+
+                // Check if layout_srl exists for the module
+				if(Mobile::isFromMobilePhone())
+				{
+					$layout_srl = $oModule->module_info->mlayout_srl;
+				}
+				else
+				{
+					$layout_srl = $oModule->module_info->layout_srl;
+				}
+
+                if($layout_srl && !$oModule->getLayoutFile()) {
+
+                    // If layout_srl exists, get information of the layout, and set the location of layout_path/ layout_file
+                    $oLayoutModel = &getModel('layout');
+                    $layout_info = $oLayoutModel->getLayout($layout_srl);
+                    if($layout_info) {
+
+                        // Input extra_vars into $layout_info
+                        if($layout_info->extra_var_count) {
+
+                            foreach($layout_info->extra_var as $var_id => $val) {
+                                if($val->type == 'image') {
+                                    if(preg_match('/^\.\/files\/attach\/images\/(.+)/i',$val->value)) $val->value = Context::getRequestUri().substr($val->value,2);
+                                }
+                                $layout_info->{$var_id} = $val->value;
+                            }
+                        }
+                        // Set menus into context
+                        if($layout_info->menu_count) {
+                            foreach($layout_info->menu as $menu_id => $menu) {
+                                if(file_exists($menu->php_file)) @include($menu->php_file);
+                                Context::set($menu_id, $menu);
+                            }
+                        }
+
+                        // Set layout information into context
+                        Context::set('layout_info', $layout_info);
+
+                        $oModule->setLayoutPath($layout_info->path);
+                        $oModule->setLayoutFile('layout');
+
+                        // If layout was modified, use the modified version
+                        $edited_layout = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
+                        if(file_exists($edited_layout)) $oModule->setEditedLayoutFile($edited_layout);
+                    }
+                }
+            }
+
+            // Display contents
+            $oDisplayHandler = new DisplayHandler();
+            $oDisplayHandler->printContent($oModule);
+        }
+
+        /**
+         * @brief returns module's path
+         * @param[in] $module module name
+         * @return path of the module
+         **/
+        function getModulePath($module) {
+            return sprintf('./modules/%s/', $module);
+        }
+
+        /**
+         * @brief It creates a module instance
+         * @param[in] $module module name
+         * @param[in] $type instance type, (e.g., view, controller, model)
+         * @param[in] $kind admin or svc
+         * @return module instance (if failed it returns null)
+         * @remarks if there exists a module instance created before, returns it.
+         **/
+        function &getModuleInstance($module, $type = 'view', $kind = '') {
+
+            if(__DEBUG__==3) $start_time = getMicroTime();
+
+			$kind = strtolower($kind);
+			$type = strtolower($type);
+
+			$kinds = explode(' ', 'svc admin');
+			if(!in_array($kind, $kinds)) $kind = $kinds[0];
+
+			$key = $module.'.'.($kind!='admin'?'':'admin').'.'.$type;
+
+			if(is_array($GLOBALS['__MODULE_EXTEND__']) && array_key_exists($key, $GLOBALS['__MODULE_EXTEND__'])) {
+				$module = $extend_module = $GLOBALS['__MODULE_EXTEND__'][$key];
+			}else{
+				unset($parent_module);
+			}
+
+            // if there is no instance of the module in global variable, create a new one
+            if(!$GLOBALS['_loaded_module'][$module][$type][$kind]) {
+				$parent_module = $module;
+
+				$class_path = ModuleHandler::getModulePath($module);
+				if(!is_dir(FileHandler::getRealPath($class_path))) return NULL;
+
+                // Get base class name and load the file contains it
+                if(!class_exists($module)) {
+                    $high_class_file = sprintf('%s%s%s.class.php', _XE_PATH_,$class_path, $module);
+                    if(!file_exists($high_class_file)) return NULL;
+                    require_once($high_class_file);
+                }
+
+                // Get the object's name
+				$types = explode(' ', 'view controller model api wap mobile class');
+				if(!in_array($type, $types)) $type = $types[0];
+				if($type == 'class') {
+					$instance_name = '%s';
+					$class_file    = '%s%s.%s.php';
+				} elseif($kind == 'admin' && array_search($type, $types) < 3) {
+					$instance_name = '%sAdmin%s';
+					$class_file    = '%s%s.admin.%s.php';
+				} else{
+					$instance_name = '%s%s';
+					$class_file    = '%s%s.%s.php';
+				}
+				$instance_name = sprintf($instance_name, $module, ucfirst($type));
+				$class_file    = sprintf($class_file, $class_path, $module, $type);
+				$class_file    = FileHandler::getRealPath($class_file);
+
+                // Get the name of the class file
+                if(!is_readable($class_file)) return NULL;
+
+                // Create an instance with eval function
+                require_once($class_file);
+                if(!class_exists($instance_name)) return NULL;
+				$tmp_fn  = create_function('', "return new {$instance_name}();");
+				$oModule = $tmp_fn();
+                if(!is_object($oModule)) return NULL;
+
+                // Load language files for the class
+                Context::loadLang($class_path.'lang');
+				if($extend_module) {
+					Context::loadLang(ModuleHandler::getModulePath($parent_module).'lang');
+				}
+
+                // Set variables to the instance
+                $oModule->setModule($module);
+                $oModule->setModulePath($class_path);
+
+                // If the module has a constructor, run it.
+                if(!isset($GLOBALS['_called_constructor'][$instance_name])) {
+                    $GLOBALS['_called_constructor'][$instance_name] = true;
+                    if(@method_exists($oModule, $instance_name)) $oModule->{$instance_name}();
+                }
+
+                // Store the created instance into GLOBALS variable
+                $GLOBALS['_loaded_module'][$module][$type][$kind] = $oModule;
+            }
+
+            if(__DEBUG__==3) $GLOBALS['__elapsed_class_load__'] += getMicroTime() - $start_time;
+
+            // return the instance
+            return $GLOBALS['_loaded_module'][$module][$type][$kind];
+        }
+
+        /**
+         * @brief call a trigger
+         * @param[in] $trigger_name trigger's name to call
+         * @param[in] $called_position called position
+         * @param[in] $obj an object as a parameter to trigger
+         * @return Object
+         **/
+        function triggerCall($trigger_name, $called_position, &$obj) {
+            // skip if not installed
+            if(!Context::isInstalled()) return new Object();
+
+            $oModuleModel = &getModel('module');
+            $triggers = $oModuleModel->getTriggers($trigger_name, $called_position);
+            if(!$triggers || !count($triggers)) return new Object();
+
+            foreach($triggers as $item) {
+                $module = $item->module;
+                $type = $item->type;
+                $called_method = $item->called_method;
+
+                $oModule = null;
+                $oModule = &getModule($module, $type);
+                if(!$oModule || !method_exists($oModule, $called_method)) continue;
+
+                $output = $oModule->{$called_method}($obj);
+                if(is_object($output) && method_exists($output, 'toBool') && !$output->toBool()) return $output;
+                unset($oModule);
+            }
+
+            return new Object();
+        }
+
+		/**
+		 * @brief get http status message by http status code
+		 **/
+		function _setHttpStatusMessage($code) {
+			$statusMessageList = array(
+				'100'=>'Continue',
+				'101'=>'Switching Protocols',
+				'201'=>'OK',
+				'201'=>'Created',
+				'202'=>'Accepted',
+				'203'=>'Non-Authoritative Information',
+				'204'=>'No Content',
+				'205'=>'Reset Content',
+				'206'=>'Partial Content',
+				'300'=>'Multiple Choices',
+				'301'=>'Moved Permanently',
+				'302'=>'Found',
+				'303'=>'See Other',
+				'304'=>'Not Modified',
+				'305'=>'Use Proxy',
+				'307'=>'Temporary Redirect',
+				'400'=>'Bad Request',
+				'401'=>'Unauthorized',
+				'402'=>'Payment Required',
+				'403'=>'Forbidden',
+				'404'=>'Not Found',
+				'405'=>'Method Not Allowed',
+				'406'=>'Not Acceptable',
+				'407'=>'Proxy Authentication Required',
+				'408'=>'Request Timeout',
+				'409'=>'Conflict',
+				'410'=>'Gone',
+				'411'=>'Length Required',
+				'412'=>'Precondition Failed',
+				'413'=>'Request Entity Too Large',
+				'414'=>'Request-URI Too Long',
+				'415'=>'Unsupported Media Type',
+				'416'=>'Requested Range Not Satisfiable',
+				'417'=>'Expectation Failed',
+				'500'=>'Internal Server Error',
+				'501'=>'Not Implemented',
+				'502'=>'Bad Gateway',
+				'503'=>'Service Unavailable',
+				'504'=>'Gateway Timeout',
+				'505'=>'HTTP Version Not Supported',
+            );
+			$statusMessage = $statusMessageList[$code];
+			if(!$statusMessage) $statusMessage = 'OK';
+
+			Context::set('http_status_code', $code);
+			Context::set('http_status_message', $statusMessage);
+		}
+    }
+?>
diff --git a/classes/module/ModuleObject.class.php b/classes/module/ModuleObject.class.php
index 35f0fba01..68409c7d0 100644
--- a/classes/module/ModuleObject.class.php
+++ b/classes/module/ModuleObject.class.php
@@ -1,311 +1,345 @@
-<?php
-    /**
-    * @class ModuleObject
-    * @author NHN (developers@xpressengine.com)
-    * @brief base class of ModuleHandler
-    **/
-
-    class ModuleObject extends Object {
-
-        var $mid = NULL; ///< string to represent run-time instance of Module (XE Module)
-        var $module = NULL; ///< Class name of Xe Module that is identified by mid
-        var $module_srl = NULL; ///< integer value to represent a run-time instance of Module (XE Module)
-        var $module_info = NULL; ///< an object containing the module information 
-        var $xml_info = NULL; ///< an object containing the module description extracted from XML file
-
-        var $module_path = NULL; ///< a path to directory where module source code resides
-
-        var $act = NULL; ///< a string value to contain the action name
-
-        var $template_path = NULL; ///< a path of directory where template files reside
-        var $template_file = NULL; ///< name of template file
-
-        var $layout_path = ''; ///< a path of directory where layout files reside
-        var $layout_file = ''; ///< name of layout file
-        var $edited_layout_file = ''; ///< name of temporary layout files that is modified in an admin mode
-
-        var $stop_proc = false; ///< a flag to indicating whether to stop the execution of code.
-
-        /**
-         * @brief setter to set the name of module
-         * @param name of module
-         **/
-        function setModule($module) {
-            $this->module = $module;
-        }
-
-        /**
-         * @brief setter to set the name of module path
-         * @param the directory path to a module directory
-         **/
-        function setModulePath($path) {
-            if(substr($path,-1)!='/') $path.='/';
-            $this->module_path = $path;
-        }
-
-        /**
-         * @brief setter to set an url for redirection
-         * @param $url url for redirection
-         * @remark redirect_url is used only for ajax requests
-         **/
-        function setRedirectUrl($url='./') {
-            $this->add('redirect_url', $url);
-        }
-
-        /**
-         * @brief sett to set the template path for refresh.html
-         * @remark refresh.html is executed as a result of method execution
-         * 공통 tpl중 refresh.html을 실행할 뿐..
-         **/
-        function setRefreshPage() {
-            $this->setTemplatePath('./common/tpl');
-            $this->setTemplateFile('refresh');
-        }
-
-
-        /**
-         * @brief sett to set the action name
-         **/
-        function setAct($act) {
-            $this->act = $act;
-        }
-
-        /**
-         * @brief sett to set module information
-         * @param[in] $module_info object containing module information
-         * @param[in] $xml_info object containing module description
-        **/
-        function setModuleInfo($module_info, $xml_info) {
-            // 기본 변수 설정
-            $this->mid = $module_info->mid;
-            $this->module_srl = $module_info->module_srl;
-            $this->module_info = $module_info;
-            $this->xml_info = $xml_info;
-            $this->skin_vars = $module_info->skin_vars;
-
-            // 웹서비스에서 꼭 필요한 인증 정보와 권한 설정 체크
-            $is_logged = Context::get('is_logged');
-            $logged_info = Context::get('logged_info');
-
-            // module model 객체 생성
-            $oModuleModel = &getModel('module');
-
-            // XE에서 access, manager (== is_admin) 는 고정된 권한명이며 이와 관련된 권한 설정
-            $module_srl = Context::get('module_srl');
-            if(!$module_info->mid && preg_match('/^([0-9]+)$/',$module_srl)) {
-                $request_module = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                if($request_module->module_srl == $module_srl) {
-                    $grant = $oModuleModel->getGrant($request_module, $logged_info);
-                }
-            } else {
-                $grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
-            }
-
-            // 현재 모듈의 access 권한이 없으면 권한 없음 표시
-            //if(!$grant->access) return $this->stop("msg_not_permitted");
-
-            // 관리 권한이 없으면 permision, action 확인
-            if(!$grant->manager) {
-                // 현재 요청된 action의 퍼미션 type(guest, member, manager, root)를 구함
-                $permission_target = $xml_info->permission->{$this->act};
-
-                // module.xml에 명시된 퍼미션이 없을때 action명에 Admin이 있으면 manager로 체크
-                if(!$permission_target && substr_count($this->act, 'Admin')) $permission_target = 'manager';
-
-                // 권한 체크
-                switch($permission_target) {
-                    case 'root' :
-                            $this->stop('msg_not_permitted_act');
-                        break;
-                    case 'manager' :
-                            if(!$grant->manager) $this->stop('msg_not_permitted_act');
-                        break;
-                    case 'member' :
-                            if(!$is_logged) $this->stop('msg_not_permitted_act');
-                        break;
-                }
-            }
-
-            // 권한변수 설정
-            $this->grant = $grant;
-            Context::set('grant', $grant);
-
-            if(method_exists($this, 'init')) $this->init();
-        }
-
-        /**
-         * @brief set the stop_proc and approprate message for msg_code
-         * @param $msg_code an error code 
-         **/
-        function stop($msg_code) {
-            // proc 수행을 중지 시키기 위한 플래그 세팅
-            $this->stop_proc = true;
-
-            // 에러 처리
-            $this->setError(-1);
-            $this->setMessage($msg_code);
-
-            // message 모듈의 에러 표시
-			$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
-			$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
-			$oMessageObject->setError(-1);
-			$oMessageObject->setMessage($msg_code);
-			$oMessageObject->dispMessage();
-
-            $this->setTemplatePath($oMessageObject->getTemplatePath());
-            $this->setTemplateFile($oMessageObject->getTemplateFile());
-
-            return $this;
-        }
-
-        /**
-         * @brief set the file name of the template file
-         **/
-        function setTemplateFile($filename) {
-            if(substr($filename,-5)!='.html') $filename .= '.html';
-            $this->template_file = $filename;
-        }
-
-        /**
-         * @brief retrieve the directory path of the template directory
-         **/
-        function getTemplateFile() {
-            return $this->template_file;
-        }
-
-        /**
-         * @brief set the directory path of the template directory
-         **/
-        function setTemplatePath($path) {
-            if(substr($path,0,1)!='/' && substr($path,0,2)!='./') $path = './'.$path;
-            if(substr($path,-1)!='/') $path .= '/';
-            $this->template_path = $path;
-        }
-
-        /**
-
-         * @brief retrieve the directory path of the template directory
-         **/
-        function getTemplatePath() {
-            return $this->template_path;
-        }
-
-        /**
-         * @brief set the file name of the temporarily modified by admin
-         **/
-        function setEditedLayoutFile($filename) {
-            if(substr($filename,-5)!='.html') $filename .= '.html';
-            $this->edited_layout_file = $filename;
-        }
-
-        /**
-         * @brief retreived the file name of edited_layout_file
-         **/
-        function getEditedLayoutFile() {
-            return $this->edited_layout_file;
-        }
-
-        /**
-         * @brief set the file name of the layout file
-         **/
-        function setLayoutFile($filename) {
-            if(substr($filename,-5)!='.html') $filename .= '.html';
-            $this->layout_file = $filename;
-        }
-
-        /**
-         * @brief get the file name of the layout file
-         **/
-        function getLayoutFile() {
-            return $this->layout_file;
-        }
-
-        /**
-         * @brief set the directory path of the layout directory
-         **/
-        function setLayoutPath($path) {
-            if(substr($path,0,1)!='/' && substr($path,0,2)!='./') $path = './'.$path;
-            if(substr($path,-1)!='/') $path .= '/';
-            $this->layout_path = $path;
-        }
-
-        /**
-         * @brief set the directory path of the layout directory
-         **/
-        function getLayoutPath() {
-            return $this->layout_path;
-        }
-
-        /**
-         * @brief excute the member method specified by $act variable 
-         *
-         **/
-        function proc() {
-            // stop_proc==true이면 그냥 패스
-            if($this->stop_proc) return false;
-
-            // trigger call
-            $triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'before', $this);
-            if(!$triggerOutput->toBool()) {
-                $this->setError($triggerOutput->getError());
-                $this->setMessage($triggerOutput->getMessage());
-                return false;
-            }
-
-            // addon 실행(called_position 를 before_module_proc로 하여 호출)
-            $called_position = 'before_module_proc';
-            $oAddonController = &getController('addon');
-            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?"mobile":"pc");
-            @include($addon_file);
-
-            if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act)) {
-
-                // 권한 체크
-                if(!$this->grant->access) return $this->stop("msg_not_permitted_act");
-
-                // 모듈의 스킨 정보를 연동 (스킨 정보의 테이블 분리로 동작대상 모듈에만 스킨 정보를 싱크시키도록 변경)
-                $oModuleModel = &getModel('module');
-                $oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
-                Context::set('module_info', $this->module_info);
-
-                // 실행
-                $output = $this->{$this->act}();
-            } 
-			else {
-				return false;
-			}
-
-            // trigger call
-            $triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'after', $this);
-            if(!$triggerOutput->toBool()) {
-                $this->setError($triggerOutput->getError());
-                $this->setMessage($triggerOutput->getMessage());
-                return false;
-            }
-			
-            // addon 실행(called_position 를 after_module_proc로 하여 호출)
-            $called_position = 'after_module_proc';
-            $oAddonController = &getController('addon');
-            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?"mobile":"pc");
-            @include($addon_file);
-
-            if(is_a($output, 'Object') || is_subclass_of($output, 'Object')) {
-                $this->setError($output->getError());
-                $this->setMessage($output->getMessage());
-                return false;
-            }
-
-            // view action이고 결과 출력이 XMLRPC 또는 JSON일 경우 해당 모듈의 api method를 실행
-            if($this->module_info->module_type == 'view'){
-                if(Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON') {
-                    $oAPI = getAPI($this->module_info->module, 'api');
-                    if(method_exists($oAPI, $this->act)) {
-                        $oAPI->{$this->act}($this);
-                    }
-                }
-            }
-
-            return true;
-        }
-    }
-?>
+<?php
+    /**
+    * @class ModuleObject
+    * @author NHN (developers@xpressengine.com)
+    * @brief base class of ModuleHandler
+    **/
+
+    class ModuleObject extends Object {
+
+        var $mid = NULL; ///< string to represent run-time instance of Module (XE Module)
+        var $module = NULL; ///< Class name of Xe Module that is identified by mid
+        var $module_srl = NULL; ///< integer value to represent a run-time instance of Module (XE Module)
+        var $module_info = NULL; ///< an object containing the module information
+		var $origin_module_info = NULL;
+        var $xml_info = NULL; ///< an object containing the module description extracted from XML file
+
+        var $module_path = NULL; ///< a path to directory where module source code resides
+
+        var $act = NULL; ///< a string value to contain the action name
+
+        var $template_path = NULL; ///< a path of directory where template files reside
+        var $template_file = NULL; ///< name of template file
+
+        var $layout_path = ''; ///< a path of directory where layout files reside
+        var $layout_file = ''; ///< name of layout file
+        var $edited_layout_file = ''; ///< name of temporary layout files that is modified in an admin mode
+
+        var $stop_proc = false; ///< a flag to indicating whether to stop the execution of code.
+
+		var $module_config = NULL;
+
+        /**
+         * @brief setter to set the name of module
+         * @param name of module
+         **/
+        function setModule($module) {
+            $this->module = $module;
+        }
+
+        /**
+         * @brief setter to set the name of module path
+         * @param the directory path to a module directory
+         **/
+        function setModulePath($path) {
+            if(substr($path,-1)!='/') $path.='/';
+            $this->module_path = $path;
+        }
+
+        /**
+         * @brief setter to set an url for redirection
+         * @param $url url for redirection
+         * @remark redirect_url is used only for ajax requests
+         **/
+        function setRedirectUrl($url='./') {
+            $this->add('redirect_url', $url);
+        }
+
+		/**
+		 * @brief get url for redirection
+		 **/
+		function getRedirectUrl(){
+			return $this->get('redirect_url');
+		}
+
+		/**
+		 * @brief set message
+		 * @param $message a message string
+		 * @param $type type of message (error, info, update)
+		 **/
+		function setMessage($message, $type = null){
+			parent::setMessage($message);
+			$this->setMessageType($type);
+		}
+
+		/**
+		 * @brief set type of message
+		 * @param $type type of message (error, info, update)
+		 **/
+		function setMessageType($type){
+			$this->add('message_type', $type);
+		}
+
+		/**
+		 * @brief get type of message
+		 **/
+		function getMessageType(){
+			$type = $this->get('message_type');
+			if (!in_array($type, array('error', 'info', 'update'))){
+				$type = $this->getError()?'error':'info';
+			}
+			return $type;
+		}
+
+        /**
+         * @brief sett to set the template path for refresh.html
+         * @remark refresh.html is executed as a result of method execution
+         * Tpl as the common run of the refresh.html ..
+         **/
+        function setRefreshPage() {
+            $this->setTemplatePath('./common/tpl');
+            $this->setTemplateFile('refresh');
+        }
+
+
+        /**
+         * @brief sett to set the action name
+         **/
+        function setAct($act) {
+            $this->act = $act;
+        }
+
+        /**
+         * @brief sett to set module information
+         * @param[in] $module_info object containing module information
+         * @param[in] $xml_info object containing module description
+        **/
+        function setModuleInfo($module_info, $xml_info) {
+            // The default variable settings
+            $this->mid = $module_info->mid;
+            $this->module_srl = $module_info->module_srl;
+            $this->module_info = $module_info;
+            $this->origin_module_info = $module_info;
+            $this->xml_info = $xml_info;
+            $this->skin_vars = $module_info->skin_vars;
+            // validate certificate info and permission settings necessary in Web-services
+            $is_logged = Context::get('is_logged');
+            $logged_info = Context::get('logged_info');
+            // module model create an object
+            $oModuleModel = &getModel('module');
+            // permission settings. access, manager(== is_admin) are fixed and privilege name in XE
+            $module_srl = Context::get('module_srl');
+            if(!$module_info->mid && preg_match('/^([0-9]+)$/',$module_srl)) {
+                $request_module = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if($request_module->module_srl == $module_srl) {
+                    $grant = $oModuleModel->getGrant($request_module, $logged_info);
+                }
+            } else {
+				$grant = $oModuleModel->getGrant($module_info, $logged_info, $xml_info);
+				// have at least access grant
+				if( substr_count($this->act, 'Member') || substr_count($this->act, 'Communication'))
+					$grant->access = 1;
+            }
+            // display no permission if the current module doesn't have an access privilege
+            //if(!$grant->access) return $this->stop("msg_not_permitted");
+            // checks permission and action if you don't have an admin privilege
+            if(!$grant->manager) {
+                // get permission types(guest, member, manager, root) of the currently requested action
+                $permission_target = $xml_info->permission->{$this->act};
+                // check manager if a permission in module.xml otherwise action if no permission
+                if(!$permission_target && substr_count($this->act, 'Admin')) $permission_target = 'manager';
+                // Check permissions
+                switch($permission_target) {
+                    case 'root' :
+                            $this->stop('msg_not_permitted_act');
+                        break;
+                    case 'manager' :
+                            if(!$grant->manager) $this->stop('msg_not_permitted_act');
+                        break;
+                    case 'member' :
+                            if(!$is_logged) $this->stop('msg_not_permitted_act');
+                        break;
+                }
+            }
+            // permission variable settings
+            $this->grant = $grant;
+
+            Context::set('grant', $grant);
+
+			$this->module_config = $oModuleModel->getModuleConfig($this->module, $module_info->site_srl);
+
+            if(method_exists($this, 'init')) $this->init();
+        }
+
+        /**
+         * @brief set the stop_proc and approprate message for msg_code
+         * @param $msg_code an error code
+         **/
+        function stop($msg_code) {
+            // flag setting to stop the proc processing
+            $this->stop_proc = true;
+            // Error handling
+            $this->setError(-1);
+            $this->setMessage($msg_code);
+            // Error message display by message module
+			$type = Mobile::isFromMobilePhone() ? 'mobile' : 'view';
+			$oMessageObject = &ModuleHandler::getModuleInstance('message',$type);
+			$oMessageObject->setError(-1);
+			$oMessageObject->setMessage($msg_code);
+			$oMessageObject->dispMessage();
+
+            $this->setTemplatePath($oMessageObject->getTemplatePath());
+            $this->setTemplateFile($oMessageObject->getTemplateFile());
+
+            return $this;
+        }
+
+        /**
+         * @brief set the file name of the template file
+         **/
+        function setTemplateFile($filename) {
+            if(substr($filename,-5)!='.html') $filename .= '.html';
+            $this->template_file = $filename;
+        }
+
+        /**
+         * @brief retrieve the directory path of the template directory
+         **/
+        function getTemplateFile() {
+            return $this->template_file;
+        }
+
+        /**
+         * @brief set the directory path of the template directory
+         **/
+        function setTemplatePath($path) {
+            if(substr($path,0,1)!='/' && substr($path,0,2)!='./') $path = './'.$path;
+            if(substr($path,-1)!='/') $path .= '/';
+            $this->template_path = $path;
+        }
+
+        /**
+
+         * @brief retrieve the directory path of the template directory
+         **/
+        function getTemplatePath() {
+            return $this->template_path;
+        }
+
+        /**
+         * @brief set the file name of the temporarily modified by admin
+         **/
+        function setEditedLayoutFile($filename) {
+            if(substr($filename,-5)!='.html') $filename .= '.html';
+            $this->edited_layout_file = $filename;
+        }
+
+        /**
+         * @brief retreived the file name of edited_layout_file
+         **/
+        function getEditedLayoutFile() {
+            return $this->edited_layout_file;
+        }
+
+        /**
+         * @brief set the file name of the layout file
+         **/
+        function setLayoutFile($filename) {
+            if(substr($filename,-5)!='.html') $filename .= '.html';
+            $this->layout_file = $filename;
+        }
+
+        /**
+         * @brief get the file name of the layout file
+         **/
+        function getLayoutFile() {
+            return $this->layout_file;
+        }
+
+        /**
+         * @brief set the directory path of the layout directory
+         **/
+        function setLayoutPath($path) {
+            if(substr($path,0,1)!='/' && substr($path,0,2)!='./') $path = './'.$path;
+            if(substr($path,-1)!='/') $path .= '/';
+            $this->layout_path = $path;
+        }
+
+        /**
+         * @brief set the directory path of the layout directory
+         **/
+        function getLayoutPath() {
+            return $this->layout_path;
+        }
+
+        /**
+         * @brief excute the member method specified by $act variable
+         *
+         **/
+        function proc() {
+            // pass if stop_proc is true
+            if($this->stop_proc) return false;
+
+            // trigger call
+            $triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'before', $this);
+            if(!$triggerOutput->toBool()) {
+                $this->setError($triggerOutput->getError());
+                $this->setMessage($triggerOutput->getMessage());
+                return false;
+            }
+
+            // execute an addon(call called_position as before_module_proc)
+            $called_position = 'before_module_proc';
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?"mobile":"pc");
+            @include($addon_file);
+
+            if(isset($this->xml_info->action->{$this->act}) && method_exists($this, $this->act)) {
+                // Check permissions
+                if(!$this->grant->access){
+					return $this->stop("msg_not_permitted_act");
+				}
+                // integrate skin information of the module(change to sync skin info with the target module only by seperating its table)
+                $oModuleModel = &getModel('module');
+                $oModuleModel->syncSkinInfoToModuleInfo($this->module_info);
+                Context::set('module_info', $this->module_info);
+                // Run
+                $output = $this->{$this->act}();
+            }
+			else {
+				return false;
+			}
+
+            // trigger call
+            $triggerOutput = ModuleHandler::triggerCall('moduleObject.proc', 'after', $this);
+            if(!$triggerOutput->toBool()) {
+                $this->setError($triggerOutput->getError());
+                $this->setMessage($triggerOutput->getMessage());
+                return false;
+            }
+
+            // execute an addon(call called_position as after_module_proc)
+            $called_position = 'after_module_proc';
+            $oAddonController = &getController('addon');
+            $addon_file = $oAddonController->getCacheFilePath(Mobile::isFromMobilePhone()?"mobile":"pc");
+            @include($addon_file);
+
+            if(is_a($output, 'Object') || is_subclass_of($output, 'Object')) {
+                $this->setError($output->getError());
+                $this->setMessage($output->getMessage());
+
+				if (!$output->toBool()) return false;
+            }
+            // execute api methos of the module if view action is and result is XMLRPC or JSON
+            if($this->module_info->module_type == 'view'){
+                if(Context::getResponseMethod() == 'XMLRPC' || Context::getResponseMethod() == 'JSON') {
+                    $oAPI = getAPI($this->module_info->module, 'api');
+                    if(method_exists($oAPI, $this->act)) {
+                        $oAPI->{$this->act}($this);
+                    }
+                }
+            }
+            return true;
+        }
+    }
+?>
diff --git a/classes/object/Object.class.php b/classes/object/Object.class.php
index 4cf8bab11..36cefe90d 100644
--- a/classes/object/Object.class.php
+++ b/classes/object/Object.class.php
@@ -1,137 +1,149 @@
-<?php
-    /**
-     * @class Object
-     * @author NHN (developers@xpressengine.com)
-     * @brief Base class design to pass the Object instance between XE Modules 
-     *
-     * @remark Every modules inherits from Object class. It includes error, message, and other variables for communicatin purpose
-     **/
-
-    class Object {
-
-        var $error = 0; ///< 에러 코드 (0이면 에러 아님)
-        var $message = 'success'; ///< 에러 메세지 (success이면 에러 아님)
-
-        var $variables = array(); ///< 추가 변수
-
-        /**
-         * @brief constructor
-         **/
-        function Object($error = 0, $message = 'success') {
-            $this->setError($error);
-            $this->setMessage($message);
-        }
-
-        /**
-         * @brief Setter to set error code
-         * @param[in] $error error code
-         **/
-        function setError($error = 0) {
-            $this->error = $error;
-        }
-
-        /**
-         * @brief Getter to retrieve error code
-         **/
-        function getError() {
-            return $this->error;
-        }
-
-        /**
-         * @brief Setter to set set the error message
-         * @param[in] $message a messge string
-         * @return return True
-         * @remark this method always returns True. We'd better remove it
-         **/
-        function setMessage($message = 'success') {
-            if(Context::getLang($message)) $message = Context::getLang($message);
-            $this->message = $message;
-            return true;
-        }
-
-        /**
-         * @brief getter to retrieve an error message
-         **/
-        function getMessage() {
-            return $this->message;
-        }
-
-        /**
-         * @brief setter to set a key/value pair as an additional variable
-         * @param[in] $key a variable name
-         * @param[in] $val a value for the variable
-         **/
-        function add($key, $val) {
-            $this->variables[$key] = $val;
-        }
-
-        /**
-         * @brief method to set multiple key/value pairs as an additional variables
-         * @param[in] $object either object or array containg key/value pairs to be added
-         **/
-        function adds($object) {
-            if(is_object($object)) {
-                $vars = get_object_vars($object);
-                foreach($vars as $key => $val) $this->add($key, $val);
-            } elseif(is_array($object)) {
-                foreach($object as $key => $val) $this->add($key, $val);
-            }
-        }
-
-        /**
-         * @brief method to retrieve a corresponding value to a given key
-         **/
-        function get($key) {
-            return $this->variables[$key];
-        }
-
-
-        /**
-         * @brief method to retrieve an object containing a key/value paris 
-         * @return Returns an object containing key/value pairs    
-        **/
-        function gets() {
-            $num_args = func_num_args();
-            $args_list = func_get_args();
-            for($i=0;$i<$num_args;$i++) {
-                $key = $args_list[$i];
-                $output->{$key} = $this->get($key);
-            }
-            return $output;
-        }
-
-        /**
-         * @brief method to retrieve an array of key/value pairs
-         * @return Return a list of key/value pairs
-         **/
-        function getVariables() {
-            return $this->variables;
-        }
-
-        /**
-         * @brief method to retrieve an object of key/value pairs
-         * @return Return an object of key/value pairs
-         **/
-        function getObjectVars() {
-            foreach($this->variables as $key => $val) $output->{$key} = $val;
-            return $output;
-        }
-
-        /**
-         * @brief method to return either true or false depnding on the value in a 'error' variable
-         * @remark this method is misleading in that it returns true if error is 0, which should be true in
-         * boolean representation.
-         **/
-        function toBool() {
-            return $this->error==0?true:false;
-        }
-
-
-        /**
-         * @brief method to return either true or false depnding on the value in a 'error' variable
-         **/
-        function toBoolean() {
-        return $this->toBool();
-        }
-    }
-?>
+<?php
+/**
+ * @class Object
+ * @author NHN (developers@xpressengine.com)
+ * @brief Base class design to pass the Object instance between XE Modules 
+ *
+ * @remark Every modules inherits from Object class. It includes error, message, and other variables for communicatin purpose
+ **/
+
+class Object {
+	var $error = 0; // / "Error code (if 0, it is not an error)
+	var $message = 'success'; // / "Error message (if success, it is not an error)
+
+	var $variables = array(); // /< an additional variable
+	var $httpStatusCode = NULL; ///< http status code.
+
+	/**
+	 * @brief constructor
+	 **/
+	function Object($error = 0, $message = 'success') {
+		$this->setError($error);
+		$this->setMessage($message);
+	}
+
+	/**
+	 * @brief Setter to set error code
+	 * @param[in] $error error code
+	 **/
+	function setError($error = 0) {
+		$this->error = $error;
+	}
+
+	/**
+	 * @brief Getter to retrieve error code
+	 **/
+	function getError() {
+		return $this->error;
+	}
+
+	function setHttpStatusCode($code = '200')
+	{
+		$this->httpStatusCode = $code;
+	}
+
+	function getHttpStatusCode()
+	{
+		return $this->httpStatusCode;
+	}
+
+	/**
+	 * @brief Setter to set set the error message
+	 * @param[in] $message a messge string
+	 * @return return True
+	 * @remark this method always returns True. We'd better remove it
+	 **/
+	function setMessage($message = 'success') {
+		if(Context::getLang($message)) $message = Context::getLang($message);
+		$this->message = $message;
+		return true;
+	}
+
+	/**
+	 * @brief getter to retrieve an error message
+	 **/
+	function getMessage() {
+		return $this->message;
+	}
+
+	/**
+	 * @brief setter to set a key/value pair as an additional variable
+	 * @param[in] $key a variable name
+	 * @param[in] $val a value for the variable
+	 **/
+	function add($key, $val) {
+		$this->variables[$key] = $val;
+	}
+
+	/**
+	 * @brief method to set multiple key/value pairs as an additional variables
+	 * @param[in] $object either object or array containg key/value pairs to be added
+	 **/
+	function adds($object) {
+		if(is_object($object)) {
+			$vars = get_object_vars($object);
+			foreach($vars as $key => $val) $this->add($key, $val);
+		} elseif(is_array($object)) {
+			foreach($object as $key => $val) $this->add($key, $val);
+		}
+	}
+
+	/**
+	 * @brief method to retrieve a corresponding value to a given key
+	 **/
+	function get($key) {
+		return $this->variables[$key];
+	}
+
+
+	/**
+	 * @brief method to retrieve an object containing a key/value paris 
+	 * @return Returns an object containing key/value pairs    
+	**/
+	function gets() {
+		$num_args = func_num_args();
+		$args_list = func_get_args();
+		for($i=0;$i<$num_args;$i++) {
+			$key = $args_list[$i];
+			$output->{$key} = $this->get($key);
+		}
+		return $output;
+	}
+
+	/**
+	 * @brief method to retrieve an array of key/value pairs
+	 * @return Return a list of key/value pairs
+	 **/
+	function getVariables() {
+		return $this->variables;
+	}
+
+	/**
+	 * @brief method to retrieve an object of key/value pairs
+	 * @return Return an object of key/value pairs
+	 **/
+	function getObjectVars() {
+		foreach($this->variables as $key => $val) $output->{$key} = $val;
+		return $output;
+	}
+
+	/**
+	 * @brief method to return either true or false depnding on the value in a 'error' variable
+	 * @remark this method is misleading in that it returns true if error is 0, which should be true in
+	 * boolean representation.
+	 **/
+	function toBool() {
+		return $this->error==0?true:false;
+	}
+
+
+	/**
+	 * @brief method to return either true or false depnding on the value in a 'error' variable
+	 **/
+	function toBoolean() {
+	return $this->toBool();
+	}
+}
+
+/* End of file Object.class.php */
+/* Location: ./classes/object/Object.class.php */
diff --git a/classes/page/PageHandler.class.php b/classes/page/PageHandler.class.php
index 4f65e4bed..5ba96bfc5 100644
--- a/classes/page/PageHandler.class.php
+++ b/classes/page/PageHandler.class.php
@@ -1,62 +1,62 @@
-<?php
-    /**
-     * @class PageHandler
-     * @author NHN (developers@xpressengine.com)
-     * @brief handles page navigation
-     * @version 0.1
-     *
-     * @remarks Getting total counts, number of pages, current page number, number of items per page, 
-     *          this class implements methods and contains variables for page navigation
-     **/
-
-    class PageHandler extends Handler {
-
-        var $total_count = 0; ///< number of total items
-        var $total_page = 0; ///< number of total pages
-        var $cur_page = 0; ///< current page number
-        var $page_count = 10; ///< number of page links displayed at one time
-        var $first_page = 1; ///< first page number
-        var $last_page = 1; ///< last page number
-        var $point = 0; ///< increments per getNextPage() 
-
-        /**
-         * @brief constructor
-         * @param[in] $total_count number of total items
-         * @param[in] $total_page number of total pages
-         * @param[in] $cur_page current page number
-         * @param[in] $page_count number of page links displayed at one time 
-         **/
-        function PageHandler($total_count, $total_page, $cur_page, $page_count = 10) {
-            $this->total_count = $total_count;
-            $this->total_page = $total_page;
-            $this->cur_page = $cur_page;
-            $this->page_count = $page_count;
-            $this->point = 0;
-
-            $first_page = $cur_page - (int)($page_count/2);
-            if($first_page<1) $first_page = 1;
-            $last_page = $total_page;
-            if($last_page>$total_page) $last_page = $total_page;
-
-            $this->first_page = $first_page;
-            $this->last_page = $last_page;
-
-            if($total_page < $this->page_count) $this->page_count = $total_page;
-        }
-
-        /**
-         * @brief request next page
-         * @return next page number
-         **/
-        function getNextPage() {
-            $page = $this->first_page+$this->point++;
-            if($this->point > $this->page_count || $page > $this->last_page) $page = 0;
-            return $page;
-        }
-		
-		function getPage($offset) 
-		{
-			return max(min($this->cur_page + $offset, $this->total_page), '');
-		}
-    }
-?>
+<?php
+    /**
+     * @class PageHandler
+     * @author NHN (developers@xpressengine.com)
+     * @brief handles page navigation
+     * @version 0.1
+     *
+     * @remarks Getting total counts, number of pages, current page number, number of items per page, 
+     *          this class implements methods and contains variables for page navigation
+     **/
+
+    class PageHandler extends Handler {
+
+        var $total_count = 0; ///< number of total items
+        var $total_page = 0; ///< number of total pages
+        var $cur_page = 0; ///< current page number
+        var $page_count = 10; ///< number of page links displayed at one time
+        var $first_page = 1; ///< first page number
+        var $last_page = 1; ///< last page number
+        var $point = 0; ///< increments per getNextPage() 
+
+        /**
+         * @brief constructor
+         * @param[in] $total_count number of total items
+         * @param[in] $total_page number of total pages
+         * @param[in] $cur_page current page number
+         * @param[in] $page_count number of page links displayed at one time 
+         **/
+        function PageHandler($total_count, $total_page, $cur_page, $page_count = 10) {
+            $this->total_count = $total_count;
+            $this->total_page = $total_page;
+            $this->cur_page = $cur_page;
+            $this->page_count = $page_count;
+            $this->point = 0;
+
+            $first_page = $cur_page - (int)($page_count/2);
+            if($first_page<1) $first_page = 1;
+            $last_page = $total_page;
+            if($last_page>$total_page) $last_page = $total_page;
+
+            $this->first_page = $first_page;
+            $this->last_page = $last_page;
+
+            if($total_page < $this->page_count) $this->page_count = $total_page;
+        }
+
+        /**
+         * @brief request next page
+         * @return next page number
+         **/
+        function getNextPage() {
+            $page = $this->first_page+$this->point++;
+            if($this->point > $this->page_count || $page > $this->last_page) $page = 0;
+            return $page;
+        }
+		
+		function getPage($offset) 
+		{
+			return max(min($this->cur_page + $offset, $this->total_page), '');
+		}
+    }
+?>
diff --git a/classes/security/Security.class.php b/classes/security/Security.class.php
index ab0387b38..dcbe91546 100644
--- a/classes/security/Security.class.php
+++ b/classes/security/Security.class.php
@@ -47,19 +47,22 @@ class Security
 			$varName0 = array_shift($varName);
 			if($use_context) {
 				$var = Context::get($varName0);
-			} else {
+			} elseif($varName0) {
 				$var = $is_object ? $this->_targetVar->{$varName0} : $this->_targetVar[$varName0];
+			} else {
+				$var = $this->_targetVar;
 			}
 			$var = $this->_encodeHTML($var, $varName);
 
-			if($var !== false) {
-				if($use_context) {
-					Context::set($varName0, $var);
-				} elseif($is_object) {
-					$this->_targetVar->{$varName0} = $var;
-				} else {
-					$this->_targetVar[$varName0] = $var;
-				}
+			if($var === false) continue;
+
+			if($use_context) {
+				Context::set($varName0, $var);
+			} elseif($varName0) {
+				if($is_object) $this->_targetVar->{$varName0} = $var;
+				else $this->_targetVar[$varName0] = $var;
+			} else {
+				$this->_targetVar = $var;
 			}
 		}
 
diff --git a/classes/template/TemplateHandler.class.php b/classes/template/TemplateHandler.class.php
index a56d0f2db..6ee48ba09 100644
--- a/classes/template/TemplateHandler.class.php
+++ b/classes/template/TemplateHandler.class.php
@@ -1,914 +1,567 @@
-<?php
-    /**
-     * @class TemplateHandler
-     * @author NHN (developers@xpressengine.com)
-     * @brief template compiler 
-     * @version 0.1
-     * @remarks It compiles template file by using regular expression into php 
-     *          code, and XE caches compiled code for further uses 
-     **/
-
-    class TemplateHandler extends Handler {
-
-        var $compiled_path = './files/cache/template_compiled/'; ///< path of compiled caches files
-
-        var $path = null; ///< target directory 
-        var $filename = null; ///< target filename
-        var $file = null; ///< target file (fullpath) 
-		var $xe_path = null;  ///< XpressEngine base path
-		var $web_path = null; ///< tpl file web path
-		var $compiled_file = null; ///< tpl file web path
-		var $buff = null; ///< tpl file web path
-
-		var $handler_mtime = 0;
-
-        /**
-         * @brief returns TemplateHandler's singleton object
-         * @return TemplateHandler instance
-         **/
-        function &getInstance() {
-            if(__DEBUG__==3 ) {
-                if(!isset($GLOBALS['__TemplateHandlerCalled__'])) $GLOBALS['__TemplateHandlerCalled__']=1;
-                else $GLOBALS['__TemplateHandlerCalled__']++;
-            }
-
-            if(!$GLOBALS['__TemplateHandler__']) {
-                $GLOBALS['__TemplateHandler__'] = new TemplateHandler();
-            }
-            return $GLOBALS['__TemplateHandler__'];
-        }
-
-		/**
-		 * @brief set variables for template compile
-		 **/
-		function init($tpl_path, $tpl_filename, $tpl_file) {
-            // verify arguments 
-            if(substr($tpl_path,-1)!='/') $tpl_path .= '/';
-			if(!file_exists($tpl_path.$tpl_filename)&&file_exists($tpl_path.$tpl_filename.'.html')) $tpl_filename .= '.html';
-
-            // create tpl_file variable 
-            if(!$tpl_file) $tpl_file = $tpl_path.$tpl_filename;
-
-			// set template file infos.
-			$info = pathinfo($tpl_file);
-			//$this->path = preg_replace('/^\.\//','',$info['dirname']).'/';
-			$this->path = $tpl_path;
-			$this->filename = $tpl_filename;
-			$this->file = $tpl_file;
-
-			$this->xe_path = preg_replace('/([^\.^\/]+)\.php$/i','',$_SERVER['SCRIPT_NAME']);
-			$this->web_path = $this->xe_path.str_replace(_XE_PATH_,'',$this->path);
-
-			// get compiled file name
-			$this->compiled_file = sprintf('%s%s.compiled.php',$this->compiled_path, md5($this->file));
-
-			// compare various file's modified time for check changed
-			$this->handler_mtime = filemtime(_XE_PATH_.'classes/template/TemplateHandler.class.php');
-
-			$this->buff = null;
-		}
-
-        /**
-         * @brief compiles specified tpl file and execution result in Context into resultant content 
-         * @param[in] $tpl_path path of the directory containing target template file
-         * @param[in] $tpl_filename target template file's name
-         * @param[in] $tpl_file if specified use it as template file's full path 
-         * @return Returns compiled result in case of success, NULL otherwise 
-         */
-        function compile($tpl_path, $tpl_filename, $tpl_file = '') {
-            // store the starting time for debug information
-            if(__DEBUG__==3 ) $start = getMicroTime();
-
-			// initiation
-			$this->init($tpl_path, $tpl_filename, $tpl_file);
-
-            // if target file does not exist exit
-            if(!$this->file || !file_exists($this->file)) return sprintf('Err : "%s" template file does not exists.', $this->file);
-
-            $source_template_mtime = filemtime($this->file);
-			$latest_mtime = $source_template_mtime>$this->handler_mtime?$source_template_mtime:$this->handler_mtime;
-
-			// cache controll
-			$oCacheHandler = &CacheHandler::getInstance('template');
-
-			// get cached buff
-			if($oCacheHandler->isSupport()){
-				$cache_key = 'template:'.$this->file;
-				$this->buff = $oCacheHandler->get($cache_key, $latest_mtime);
-			} else {
-				if(file_exists($this->compiled_file) && filemtime($this->compiled_file)>$latest_mtime) {
-					$this->buff = FileHandler::readFile($this->compiled_file);
-				}
-			}
-
-			if(!$this->buff) {
-				$this->parse();
-				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $this->buff);
-				else FileHandler::writeFile($this->compiled_file, $this->buff);
-			}
-
-			$output = $this->_fetch();
-
-			// store the ending time for debug information
-            if(__DEBUG__==3 ) $GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
-
-            return $output;
-        }
-
-        /**
-         * @brief compile specified file and immediately return
-         * @param[in] $tpl_path path of the directory containing target template file
-         * @param[in] $tpl_filename target template file's name
-         * @return Returns compiled content in case of success or NULL in case of failure
-         **/
-        function compileDirect($tpl_path, $tpl_filename) {
-			$this->init($tpl_path, $tpl_filename, null);
-
-            // if target file does not exist exit
-            if(!$this->file || !file_exists($this->file)) {
-				Context::close();
-				printf('"%s" template file is not exists.', $this->file);
-				exit();
-			}
-
-            $this->parse();
-			return $this->buff;
-        }
-
-        /**
-         * @brief compile a template file specified in $tpl_file and 
-         * @pre files specified by $tpl_file exists.
-         * @param[in] $tpl_file path of tpl file
-         * @param[in] $compiled_tpl_file if specified, write compiled result into the file
-         * @return compiled result in case of success or NULL in case of error 
-         **/
-        function parse() {
-			if(!file_exists($this->file)) return;
-
-            // read tpl file 
-            $buff = FileHandler::readFile($this->file);
-
-			// replace value of src in img/input/script tag
-			$buff = preg_replace_callback('/<(img|input|script)([^>]*)src="([^"]*?)"/is', array($this, '_replacePath'), $buff);
-
-			// loop 템플릿 문법을 변환
-			$buff = $this->_replaceLoop($buff);
-
-			// cond 템플릿 문법을 변환
-			$buff = $this->_replaceCond($buff);
-
-			// |cond 템플릿 문법을 변환
-			$buff = preg_replace_callback("/<\/?(\w+)((\s+\w+(\s*=\s*(?:\".*?\"|'.*?'|[^'\">\s]+))?)+\s*|\s*)\/?>/i", array($this, '_replacePipeCond'), $buff);
-
-			// include 태그의 변환
-			$buff = preg_replace_callback('!<include ([^>]+)>!is', array($this, '_replaceInclude'), $buff);
-
-			// unload/ load 태그의 변환
-			$buff = preg_replace_callback('!<(unload|load) ([^>]+)>!is', array($this, '_replaceLoad'), $buff);
-
-			// 가상 태그인 block의 변환
-			$buff = preg_replace('/<block([ ]*)>|<\/block>/is','',$buff);
-
-            // replace include <!--#include($filename)-->
-            $buff = preg_replace_callback('!<\!--#include\(([^\)]*?)\)-->!is', array($this, '_compileIncludeToCode'), $buff);
-
-            // replace <!--@, --> 
-            $buff = preg_replace_callback('!<\!--@(.*?)-->!is', array($this, '_compileFuncToCode'), $buff);
-
-            // remove comments <!--// ~ --> 
-            $buff = preg_replace('!(\n?)( *?)<\!--//(.*?)-->!is', '', $buff);
-
-            // import xml filter/ css/ js/ files <!--%import("filename"[,optimized=true|false][,media="media"][,targetie="lt IE 6|IE 7|gte IE 8|..."])--> (media is applied to only css)
-            $buff = preg_replace_callback('!<\!--%import\(\"([^\"]*?)\"(,optimized\=(true|false))?(,media\=\"([^\"]*)\")?(,targetie=\"([^\"]*)\")?(,index=\"([^\"]*)\")?(,type=\"([^\"]*)\")?\)-->!is', array($this, '_compileImportCode'), $buff);
-
-            // unload css/ js <!--%unload("filename"[,optimized=true|false][,media="media"][,targetie="lt IE 6|IE 7|gte IE 8|..."])--> (media is applied to only css)
-            $buff = preg_replace_callback('!<\!--%unload\(\"([^\"]*?)\"(,optimized\=(true|false))?(,media\=\"([^\"]*)\")?(,targetie=\"([^\"]*)\")?\)-->!is', array($this, '_compileUnloadCode'), $buff);
-
-            // javascript plugin import
-            $buff = preg_replace_callback('!<\!--%load_js_plugin\(\"([^\"]*?)\"\)-->!is', array($this, '_compileLoadJavascriptPlugin'), $buff);
-
-            // replace variables
-            $buff = preg_replace_callback('/\{[^@^ ]([^\{\}\n]+)\}/i', array($this, '_compileVarToContext'), $buff);
-
-			// PHP 변수형의 변환 ($문자등을 공유 context로 변환)
-			$buff = $this->_replaceVarInPHP($buff);
-
-            // replace parts not displaying results
-            $buff = preg_replace_callback('/\{\@([^\{\}]+)\}/i', array($this, '_compileVarToSilenceExecute'), $buff);
-
-            // prevent from calling directly before writing into file
-            $this->buff = '<?php if(!defined("__ZBXE__")) exit();?>'.$buff;
-        }
-
-        /**
-         * @brief fetch using ob_* function 
-         * @param[in] $compiled_tpl_file path of compiled template file
-         * @param[in] $buff if buff is not null, eval it instead of including compiled template file
-         * @param[in] $tpl_path set context's tpl path
-         * @return result string
-         **/
-        function _fetch() {
-			if(!$this->buff) return;
-
-            $__Context = &$GLOBALS['__Context__'];
-            $__Context->tpl_path = $this->path;
-
-            if($_SESSION['is_logged']) $__Context->logged_info = $_SESSION['logged_info'];
-
-            ob_start();
-			$eval_str = "?>".$this->buff;
-			eval($eval_str);
-            return ob_get_clean();
-        }
-
-        /**
-         * @brief change image path
-         * @pre $matches is an array containg three elements
-         * @param[in] $matches match
-         * @return changed result
-         **/
-		function _replacePath($matches) 
-		{
-			preg_match_all('/src="([^"]*?)"/is', $matches[0], $m);
-			for($i=0,$c=count($m[0]);$i<$c;$i++) {
-				$path = trim($m[1][$i]);
-				if(substr($path,0,1)=='/' || substr($path,0,1)=='{' || strpos($path,'://')!==false) continue;
-				if(substr($path,0,2)=='./') $path = substr($path,2);
-				$target = $this->web_path.$path;
-				while(strpos($target,'/../')!==false) 
-				{
-					$target = preg_replace('/\/([^\/]+)\/\.\.\//','/',$target);
-				}
-				$target = str_replace('/./','/',$target);
-				$matches[0] = str_replace($m[0][$i], 'src="'.$target.'"', $matches[0]);
-			}
-			return $matches[0];
-		}
-
-		/**
-		 * @brief loop 문법의 변환
-		 **/
-		function _replaceLoop($buff)
-		{
-			while(false !== $pos = strpos($buff, ' loop="'))
-			{
-				$pre = substr($buff,0,$pos);
-				$next = substr($buff,$pos);
-
-				$pre_pos = strrpos($pre, '<');
-
-				preg_match('/^ loop="([^"]+)"/i',$next,$m);
-				$orgTag = $tag = substr($next,0,strlen($m[0]));
-				$next = substr($next,strlen($m[0]));
-				$next_pos = strpos($next, '<');
-
-				$tag = substr($pre, $pre_pos). $tag. substr($next, 0, $next_pos);
-				// search end tag
-				/* tag as '<br cond="condition"/>blahblah' to be '<br cond="condition"/>' */
-				preg_match('/\/>(\w+)/',$tag, $mm);
-				if ($mm[1]){
-					$next_pos = strpos($next, $mm[1]);
-					$tag = substr($pre, $pre_pos). $orgTag. substr($next, 0, $next_pos);
-				}
-				$pre = substr($pre, 0, $pre_pos);
-				$next  = substr($next, $next_pos);
-
-				$tag_name = trim(substr($tag,1,strpos($tag,' ')));
-				$tag_head = $tag_tail = '';
-
-				if(!preg_match('/ loop="([^"]+)"/is',$tag)) {
-					print "<strong>Invalid XpressEngine Template Syntax</strong><br/>";
-					print "File : ".$this->file."<br/>";
-					print "Code : ".htmlspecialchars($tag);
-					exit();
-				}
-
-				preg_match_all('/ loop="([^"]+)"/is',$tag,$m);
-				$tag = preg_replace('/ loop="([^"]+)"/is','', $tag);
-
-				for($i=0,$c=count($m[0]);$i<$c;$i++)
-				{
-					$loop = $m[1][$i];
-					if(false!== $fpos = strpos($loop,'=>'))
-					{
-						$target = trim(substr($loop,0,$fpos));
-						if(substr($target, 0, 1) == '$') $target = sprintf('$__Context->%s ', substr($target, 1));
-
-						$vars = trim(substr($loop,$fpos+2));
-						if(false===strpos($vars,','))
-						{
-							if(substr($vars, 0, 1) == '$') $vars = sprintf('$__Context->%s ', substr($vars, 1));
-
-							$tag_head .= '<?php if(count('.$target.')) { foreach('.$target.' as '.$vars.') { ?>';
-							$tag_tail .= '<?php } } ?>';
-						}
-						else
-						{
-							$t = explode(',',$vars);
-							foreach($t as $key => $val){
-								if(substr(trim($val), 0, 1) == '$') $val = sprintf('$__Context->%s ', substr(trim($val), 1));
-								$t[$key] = trim($val);
-							}
-							$tag_head .= '<?php if(count('.$target.')) { foreach('.$target.' as '.trim($t[0]).' => '.trim($t[1]).') { ?>';
-							$tag_tail .= '<?php } } ?>';
-						}
-					}
-					elseif(false!==strpos($loop,';'))
-					{
-						$loop = preg_replace('/\$(\w+)/', '$__Context->$1', $loop);
-						$tag_head .= '<?php for('.$loop.'){ ?>';
-						$tag_tail .= '<?php } ?>';
-					}
-					else
-					{
-						$t = explode('=',$loop);
-						if(count($t)==2)
-						{
-							$tag_head .= '<?php while('.trim($t[0]).' = '.trim($t[1]).') { ?>';
-							$tag_tail .= '<?php } ?>';
-						}
-					}
-				}
-
-				if(substr(trim($tag),-2)!='/>') 
-				{
-					while(false !== $close_pos = strpos($next, '</'.$tag_name))
-					{
-						$tmp_buff = substr($next, 0, $close_pos+strlen('</'.$tag_name.'>'));
-						$tag .= $tmp_buff;
-						$next = substr($next, strlen($tmp_buff));
-						if(substr_count($tag, '<'.$tag_name) == substr_count($tag,'</'.$tag_name)) break;
-					}
-				}
-
-				$buff = $pre.$tag_head.$tag.$tag_tail.$next;
-			}
-			return $buff;
-		}
-
-		/**
-		 * @brief pipe cond, |cond= 의 변환
-		 **/
-		function _replacePipeCond($matches)
-		{
-			if(strpos($matches[0],'|cond')!==false) {
-				while(strpos($matches[0],'|cond="')!==false) {
-					if(preg_match('/ (\w+)=\"([^\"]+)\"\|cond=\"([^\"]+)\"/is', $matches[0], $m)){
-						$m[3] = preg_replace('/^\$(\w+)/', '$__Context->$1', $m[3]);
-						$matches[0] = str_replace($m[0], sprintf('<?php if(%s) {?> %s="%s"<?php }?>', $m[3], $m[1], $m[2]), $matches[0]);
-					}
-				}
-			}
-
-			return $matches[0];
-		}
-
-		/**
-		 * @brief cond 문법의 변환
-		 **/
-		function _replaceCond($buff)
-		{
-			while(false !== ($pos = strpos($buff, ' cond="')))
-			{
-				$pre = substr($buff,0,$pos);
-				$next = substr($buff,$pos);
-
-				$pre_pos = strrpos($pre, '<');
-
-				preg_match('/<(\/|[a-z])/i',$next,$m);
-				if(!$m[0]) return $buff;
-				$next_pos = strpos($next, $m[0]);
-
-				$tag = substr($pre, $pre_pos). substr($next, 0, $next_pos);
-
-				// search end tag
-				/* tag as '<br cond="condition"/>blahblah' to be '<br cond="condition"/>' */
-				preg_match('/\/>(\w+)/',$tag, $mm);
-				if ($mm[1]){
-					$next_pos = strpos($next, $mm[1]);
-					$tag = substr($pre, $pre_pos). substr($next, 0, $next_pos);
-				}
-				$pre = substr($pre, 0, $pre_pos);
-				$next  = substr($next, $next_pos);
-				$tag_name = trim(substr($tag,1,strpos($tag,' ')));
-				$tag_head = $tag_tail = '';
-
-				if(preg_match_all('/ cond=\"([^\"]+)"/is',$tag,$m))
-				{
-					for($i=0,$c=count($m[0]);$i<$c;$i++)
-					{
-						$m[1][$i] = preg_replace('/^\$(\w+)/', '$__Context->$1', $m[1][$i]);
-						$tag_head .= '<?php if('.$m[1][$i].') { ?>';
-						$tag_tail .= '<?php } ?>';
-					}
-				} 
-
-				if(!preg_match('/ cond="([^"]+)"/is',$tag)) {
-					print "<strong>Invalid XpressEngine Template Syntax</strong><br/>";
-					print "File : ".$this->file."<br/>";
-					print "Code : ".htmlspecialchars($tag);
-					exit();
-				}
-
-				$tag = preg_replace('/ cond="([^"]+)"/is','', $tag);
-				if(substr(trim($tag),-2)=='/>') 
-				{
-					$buff = $pre.$tag_head.$tag.$tag_tail.$next;
-				} 
-				else 
-				{
-					while(false !== $close_pos = strpos($next, '</'.$tag_name))
-					{
-						$tmp_buff = substr($next, 0, $close_pos+strlen('</'.$tag_name.'>'));
-						$tag .= $tmp_buff;
-						$next = substr($next, strlen($tmp_buff));
-
-						if(substr_count($tag, '<'.$tag_name) == substr_count($tag,'</'.$tag_name)) break;
-					}
-					$buff = $pre.$tag_head.$tag.$tag_tail.$next;
-				}
-			}
-			
-			return $buff;
-		}
-
-		/**
-		 * @brief 다른 template파일을 include하는 include tag의 변환
-		 **/
-		function _replaceInclude($matches) 
-		{
-			if(!preg_match('/target=\"([^\"]+)\"/is',$matches[0], $m)) {
-				print '"target" attribute missing in "'.htmlspecialchars($matches[0]);
-				exit();
-			}
-
-			$target = $m[1];
-            if(substr($target,0,1)=='/')
-			{
-				$target = substr($target,1);
-				$pos = strrpos('/',$target);
-				$filename = substr($target,$pos+1);
-				$path = substr($target,0,$pos);
-			} else {
-				if(substr($target,0,2)=='./') $target = substr($target,2);
-				$pos = strrpos('/',$target);
-				$filename = substr($target,$pos);
-				$path = $this->path.substr($target,0,$pos);
-			}
-
-			return sprintf(
-                '<?php%s'.
-                '$oTemplate = &TemplateHandler::getInstance();%s'.
-                'print $oTemplate->compile(\'%s\',\'%s\');%s'.
-                '?>%s',
-                "\n",
-                "\n",
-                $path, $filename, "\n",
-                "\n"
-            );
-		}
-
-		/**
-		 * @brief load 태그의 변환
-		 **/
-		function _replaceLoad($matches) {
-			$output = $matches[0];
-			if(!preg_match_all('/ ([^=]+)=\"([^\"]+)\"/is',$matches[0], $m)) return $matches[0];
-
-			$type = $matches[1];
-			for($i=0,$c=count($m[1]);$i<$c;$i++)
-			{
-				if(!trim($m[1][$i])) continue;
-				$attrs[trim($m[1][$i])] = trim($m[2][$i]);
-			}
-
-			if(!$attrs['target']) return $matches[0];
-
-			$web_path = $this->web_path;
-			$base_path = $this->path;
-
-			$target = $attrs['target'];
-            if(!preg_match('/^(http|https)/i',$target)) 
-            {
-                if(substr($target,0,2)=='./') $target = substr($target,2);
-                if(substr($target,0,1)!='/') $target = $web_path.$target;
-            }
-
-			if(!$attrs['index']) $attrs['index'] = 'null';
-			if($attrs['type']!='body') $attrs['type'] = 'head';
-
-            // if target ends with lang, load language pack
-            if(substr($target, -4)=='lang') {
-                if(substr($target,0,2)=='./') $target = substr($target, 2);
-                $lang_dir = $base_path.$target;
-                if(is_dir($lang_dir)) $output = sprintf('<?php Context::loadLang("%s"); ?>', $lang_dir);
-
-			// otherwise try to load xml, css, js file
-			} else {
-				if(substr($target,0,1)!='/' && !preg_match('/^(http|https)/i',$target)) $source_filename = $base_path.$target;
-				else $source_filename = $target;
-
-				if(!preg_match('/^(http|https)/i',$source_filename)) 
-					$source_filename = str_replace(array('/./','//'),'/',$source_filename);
-
-				// get filename and path
-				$tmp_arr = explode("/",$source_filename);
-				$filename = array_pop($tmp_arr);
-
-				//$base_path = implode("/",$tmp_arr)."/";
-
-				// get the ext
-				$tmp_arr = explode(".",$filename);
-				$ext = strtolower(array_pop($tmp_arr));
-
-				// according to ext., import the file
-				switch($ext) {
-					// xml js filter
-					case 'xml' :
-							if(preg_match('/^(http|https)/i',$source_filename)) return;
-							// create an instance of XmlJSFilter class, then create js and handle Context::addJsFile
-							$output = sprintf(
-								'<?php%s'.
-								'require_once("./classes/xml/XmlJsFilter.class.php");%s'.
-								'$oXmlFilter = new XmlJSFilter("%s","%s");%s'.
-								'$oXmlFilter->compile();%s'.
-								'?>%s',
-								"\n",
-								"\n",
-								dirname($base_path . $attrs['target']).'/',
-								$filename,
-								"\n",
-								"\n",
-								"\n"
-								);
-						break;
-					// css file
-					case 'css' :
-							if($type == 'unload') {
-								$output = '<?php Context::unloadCSSFile("'.$source_filename.'"); ?>';
-							} else {
-								$meta_file = $source_filename;
-								$output = '<?php Context::addCSSFile("'.$source_filename.'",false,"'.$attrs['media'].'","'.$attrs['targetie'].'",'.$attrs['index'].'); ?>';
-							}
-						break;
-					// js file
-					case 'js' :
-							if($type == 'unload') {
-								$output = '<?php Context::unloadJsFile("'.$source_filename.'"); ?>';
-							} else {
-								$meta_file = $source_filename;
-								$output = '<?php Context::addJsFile("'.$source_filename.'",false,"'.$attrs['targetie'].'",'.$attrs['index'].',"'.$attrs['type'].'"); ?>';
-							}
-						break;
-				}
-			}
-
-			if($meta_file) $output = '<!--#Meta:'.$meta_file.'-->'.$output;
-			return $output;
-		}
-
-		/**
-		 * @brief $문자 의 PHP 변수 변환
-		 **/
-		function _replaceVarInPHP($buff) {
-			$head = $tail = '';
-			while(false !== $pos = strpos($buff, '<?php'))
-			{
-				$head .= substr($buff,0,$pos);
-				$buff = substr($buff,$pos);
-				$pos = strpos($buff,'?>');
-				$body = substr($buff,0,$pos+2);
-				$head .= preg_replace_callback('/(.?)\$(\w+[a-z0-9\_\-\[\]\'\"]+)/is',array($this, '_replaceVarString'), $body);
-
-				$buff = substr($buff,$pos+2);
-			}
-			return $head.$buff;
-		}
-
-
-		/**
-		 * @brief php5의 class::$변수명의 경우 context를 사용하지 않아야 하기에 함수로 대체
-		 **/
-		function _replaceVarString($matches)
-		{
-			if($matches[1]==':') return $matches[0];
-			if(substr($matches[2],0,1)=='_') return $matches[0];
-			return $matches[1].'$__Context->'.$matches[2];
-		}
-
-        /**
-         * @brief replace <!--#include $path--> with php code
-         * @param[in] $matches match
-         * @return replaced result
-         **/
-        function _compileIncludeToCode($matches) {
-            // if target string to include contains variables handle them
-            $arg = str_replace(array('"','\''), '', $matches[1]);
-            if(!$arg) return;
-
-            $tmp_arr = explode("/", $arg);
-            for($i=0;$i<count($tmp_arr);$i++) {
-                $item1 = trim($tmp_arr[$i]);
-                if($item1=='.'||substr($item1,-5)=='.html') continue;
-
-                $tmp2_arr = explode(".",$item1);
-                for($j=0;$j<count($tmp2_arr);$j++) {
-                    $item = trim($tmp2_arr[$j]);
-                    if(substr($item,0,1)=='$') $item = Context::get(substr($item,1));
-                    $tmp2_arr[$j] = $item;
-                }
-                $tmp_arr[$i] = implode(".",$tmp2_arr);
-            }
-            $arg = implode("/",$tmp_arr);
-            if(substr($arg,0,2)=='./') $arg = substr($arg,2);
-
-            // step1: check files in the template directory
-            //$source_filename = sprintf("%s/%s", dirname($this->file), $arg);
-			$path = substr($this->path,-1)=='/'?substr($this->path,0,-1):$this->path;
-            $source_filename = sprintf("%s/%s", $path, $arg);
-
-            // step2: check path from root
-            if(!file_exists($source_filename)) $source_filename = './'.$arg;
-            if(!file_exists($source_filename)) return;
-
-            // split into path and filename
-            $tmp_arr = explode('/', $source_filename);
-            $filename = array_pop($tmp_arr);
-            $path = implode('/', $tmp_arr).'/';
-
-            // try to include 
-            $output = sprintf(
-                '<?php%s'.
-                '$oTemplate = &TemplateHandler::getInstance();%s'.
-                'print $oTemplate->compile(\'%s\',\'%s\');%s'.
-                '?>%s',
-                "\n",
-                "\n",
-                $path, $filename, "\n",
-                "\n"
-            );
-
-            return $output;
-        }
-
-        /**
-         * @brief replace $... variables in { } with Context::get(...) 
-         * @param[in] $matches match 
-         * @return replaced result in case of success or NULL in case of error
-         **/
-        function _compileVarToContext($matches) {
-            $str = trim(substr($matches[0],1,strlen($matches[0])-2));
-            if(!$str) return $matches[0];
-            if(!in_array(substr($str,0,1),array('(','$','\'','"'))) {
-                if(preg_match('/^([^\( \.]+)(\(| \.)/i',$str,$m)) {
-                    $func = trim($m[1]);
-                    if(strpos($func,'::')===false) {
-                        if(!function_exists($func)) {
-                            return $matches[0];
-                        }
-                    } else {
-                        list($class, $method) = explode('::',$func);
-                        // FIXME regardless of whether class/func name is case-sensitive, it is safe
-                        // to assume names are case sensitive. We don't have compare twice.
-                        if(!class_exists($class)  || !in_array($method, get_class_methods($class))) {
-                            // In some environment, the name of classes and methods may be case-sensitive
-                            list($class, $method) = explode('::',strtolower($func));
-                            if(!class_exists($class)  || !in_array($method, get_class_methods($class))) {
-                                return $matches[0];
-                            }
-                        }
-                    }
-                } else {
-                    if(!defined($str)) return $matches[0];
-                }
-            }
-            return '<?php @print('.preg_replace('/\$([a-zA-Z0-9\_\-\>]+)/i','$__Context->\\1', $str).');?>';
-        }
-
-        /**
-         * @brief replace @... function in { } into print func(..)
-         * @param[in] $matches match
-         * @return replaced result
-         **/
-        function _compileVarToSilenceExecute($matches) {
-            if(strtolower(trim(str_replace(array(';',' '),'', $matches[1])))=='return') return '<?php return; ?>';
-            return '<?php @'.preg_replace('/\$([a-zA-Z0-9\_\-\>]+)/i','$__Context->\\1', trim($matches[1])).';?>';
-        }
-
-        /**
-         * @brief replace code in <!--@, --> with php code
-         * @param[in] $matches match
-         * @return changed result
-         **/
-        function _compileFuncToCode($matches) {
-            static $idx = 0;
-            $code = trim($matches[1]);
-            if(!$code) return;
-
-            switch(strtolower($code)) {
-                case 'else' :
-                        $output = '}else{';
-                    break;
-                case 'end' :
-                case 'endif' :
-                case 'endfor' :
-                case 'endforeach' :
-                case 'endswitch' :
-                        $output = '}';
-                    break;
-                case 'break' :
-                        $output = 'break;';
-                    break;
-                case 'default' :
-                        $output = 'default :';
-                    break;
-                case 'break@default' :
-                        $output = 'break; default :';
-                    break;
-                default :
-                        $suffix = '{';
-
-                        if(substr($code, 0, 4) == 'else') {
-                            $code = '}'.$code;
-                        } elseif(substr($code, 0, 7) == 'foreach') {
-                            $tmp_str = substr($code, 8);
-                            $tmp_arr = explode(' ', $tmp_str);
-                            $var_name = $tmp_arr[0];
-                            $prefix = '$Context->__idx['.$idx.']=0;';
-                            if(substr($var_name, 0, 1) == '$') {
-                                $prefix .= sprintf('if(count($__Context->%s)) ', substr($var_name, 1));
-                            } else {
-                                $prefix .= sprintf('if(count(%s)) ', $var_name);
-                            }
-                            $idx++;
-                            $suffix .= '$__idx['.$idx.']=($__idx['.$idx.']+1)%2; $cycle_idx = $__idx['.$idx.']+1;';
-                        } elseif(substr($code, 0, 4) == 'case') {
-                            $suffix = ':';
-                        } elseif(substr($code, 0, 10) == 'break@case') {
-                            $code = 'break; case'.substr($code, 10);
-                            $suffix = ':';
-                        }
-                        $output = preg_replace('/\$([a-zA-Z0-9\_\-]+)/i', '$__Context->\\1', $code.$suffix);
-                    break;
-            }
-
-            return sprintf('<?php %s %s ?>', $prefix, $output);
-        }
-
-
-        /**
-         * @brief replace xe specific code, "<!--%filename-->" with appropriate php code 
-         * @param[in] $matches match
-         * @return Returns modified result or NULL in case of error
-         **/
-        function _compileImportCode($matches) {
-            // find xml file
-            $base_path = $this->path;
-            $given_file = trim($matches[1]);
-            if(!$given_file) return;
-            if(isset($matches[3])) $optimized = strtolower(trim($matches[3]));
-            if(!$optimized) $optimized = 'true';
-            if(isset($matches[5])) $media = trim($matches[5]);
-            if(!$media) $media = 'all';
-            if(isset($matches[7])) $targetie = trim($matches[7]);
-            if(!$targetie) $targetie = '';
-            else $optimized = 'false';
-
-            if(isset($matches[9])) $index = intval($matches[9]);
-			if(!$index) $index = 'null';
-            if(isset($matches[11])) $type = strtolower(trim($matches[11]));
-			if($type!='body') $type = 'head';
-
-            // if given_file ends with lang, load language pack
-            if(substr($given_file, -4)=='lang') {
-                if(substr($given_file,0,2)=='./') $given_file = substr($given_file, 2);
-                $lang_dir = $base_path.$given_file;
-                if(is_dir($lang_dir)) $output = sprintf('<?php Context::loadLang("%s"); ?>', $lang_dir);
-
-            // otherwise try to load xml, css, js file
-            } else {
-				if(preg_match('/^(http|https):/i',$given_file)) $source_filename = $given_file;
-                elseif(substr($given_file,0,1)!='/') $source_filename = sprintf("%s%s",$base_path, $given_file);
-                else $source_filename = $given_file;
-
-                // get filename and path
-                $tmp_arr = explode("/",$source_filename);
-                $filename = array_pop($tmp_arr);
-
-                $base_path = implode("/",$tmp_arr)."/";
-
-                // get the ext
-                $tmp_arr = explode(".",$filename);
-                $ext = strtolower(array_pop($tmp_arr));
-
-                // according to ext., import the file
-                switch($ext) {
-                    // xml js filter
-                    case 'xml' :
-                            // create an instance of XmlJSFilter class, then create js and handle Context::addJsFile
-                            $output = sprintf(
-                                '<?php%s'.
-                                'require_once("./classes/xml/XmlJsFilter.class.php");%s'.
-                                '$oXmlFilter = new XmlJSFilter("%s","%s");%s'.
-                                '$oXmlFilter->compile();%s'.
-                                '?>%s',
-                                "\n",
-                                "\n",
-                                $base_path,
-                                $filename,
-                                "\n",
-                                "\n",
-                                "\n"
-                                );
-                        break;
-                    // css file
-                    case 'css' :
-                            if(preg_match('/^(http|\/)/i',$source_filename)) {
-                                $output = sprintf('<?php Context::addCSSFile("%s", %s, "%s", "%s", %s); ?>', $source_filename, 'false', $media, $targetie, $index);
-                            } else {
-								$meta_file = $base_path.$filename;
-                                $output = sprintf('<?php Context::addCSSFile("%s%s", %s, "%s", "%s", %s); ?>', $base_path, $filename, $optimized, $media, $targetie, $index);
-                            }
-                        break;
-                    // js file
-                    case 'js' :
-                            if(preg_match('/^(http|\/)/i',$source_filename)) {
-                                $output = sprintf('<?php Context::addJsFile("%s", %s, "%s", %s,"%s"); ?>', $source_filename, 'false', $targetie, $index, $type);
-                            } else {
-								$meta_file = $base_path.$filename;
-                                $output = sprintf('<?php Context::addJsFile("%s%s", %s, "%s", %s, "%s"); ?>', $base_path, $filename, $optimized, $targetie, $index, $type);
-                            }
-                        break;
-                }
-            }
-
-			if($meta_file) $output = '<!--#Meta:'.$meta_file.'-->'.$output;
-            return $output;
-        }
-
-        /**
-         * @brief import javascript plugin 
-         * @param[in] $matches match
-         * @return result loading the plugin
-         * @remarks javascript plugin works as optimized = false
-         **/
-        function _compileLoadJavascriptPlugin($matches) {
-            $base_path = $this->path;
-            $plugin = trim($matches[1]);
-            return sprintf('<?php Context::loadJavascriptPlugin("%s"); ?>', $plugin);
-        }
-
-        /**
-         * @brief remove loading part of css/ js file 
-         * @param[in] $matches match
-         * @return removed result
-         **/
-        function _compileUnloadCode($matches) {
-            // find xml file 
-            $base_path = $this->path;
-            $given_file = trim($matches[1]);
-            if(!$given_file) return;
-            if(isset($matches[3])) $optimized = strtolower(trim($matches[3]));
-            if(!$optimized) $optimized = 'true';
-            if(isset($matches[5])) $media = trim($matches[5]);
-            if(!$media) $media = 'all';
-            if(isset($matches[7])) $targetie = trim($matches[7]);
-            if(!$targetie) $targetie = '';
-            else $optimized = 'false';
-
-            if(substr($given_file,0,1)!='/') $source_filename = sprintf("%s%s",$base_path, $given_file);
-            else $source_filename = $given_file;
-
-            // get path and file nam
-            $tmp_arr = explode("/",$source_filename);
-            $filename = array_pop($tmp_arr);
-
-            $base_path = implode("/",$tmp_arr)."/";
-
-            // get an ext.
-            $tmp_arr = explode(".",$filename);
-            $ext = strtolower(array_pop($tmp_arr));
-
-            switch($ext) {
-                // css file
-                case 'css' :
-                        if(preg_match('/^(http|https|\/)/i',$source_filename)) {
-                            $output = sprintf('<?php Context::unloadCSSFile("%s", %s, "%s", "%s"); ?>', $source_filename, 'false', $media, $targetie);
-                        } else {
-                            $output = sprintf('<?php Context::unloadCSSFile("%s%s", %s, "%s", "%s"); ?>', $base_path, $filename, $optimized, $media, $targetie);
-                        }
-                    break;
-                // js file
-                case 'js' :
-                        if(preg_match('/^(http|https|\/)/i',$source_filename)) {
-                            $output = sprintf('<?php Context::unloadJsFile("%s", %s, "%s"); ?>', $source_filename, 'false', $targetie);
-                        } else {
-                            $output = sprintf('<?php Context::unloadJsFile("%s%s", %s, "%s"); ?>', $base_path, $filename, $optimized, $targetie);
-                        }
-                    break;
-            }
-
-            return $output;
-        }
-    }
-?>
+<?php
+/**
+ * @class TemplateHandler
+ * @author NHN (developers@xpressengine.com)
+ * @brief template compiler
+ * @version 0.1
+ * @remarks It compiles template file by using regular expression into php
+ *          code, and XE caches compiled code for further uses
+ **/
+
+class TemplateHandler {
+
+	var $compiled_path = './files/cache/template_compiled/'; ///< path of compiled caches files
+
+	var $path = null; ///< target directory
+	var $filename = null; ///< target filename
+	var $file = null; ///< target file (fullpath)
+	var $xe_path = null;  ///< XpressEngine base path
+	var $web_path = null; ///< tpl file web path
+	var $compiled_file = null; ///< tpl file web path
+	var $skipTags = null;
+
+	var $handler_mtime = 0;
+
+	function TemplateHandler()
+	{
+		// TODO: replace this with static variable in PHP5
+		global $__templatehandler_root_tpl;
+
+		$__templatehandler_root_tpl = null;
+
+		$this->xe_path  = rtrim(preg_replace('/([^\.^\/]+)\.php$/i','',$_SERVER['SCRIPT_NAME']),'/');
+	}
+
+	/**
+	 * @brief returns TemplateHandler's singleton object
+	 * @return TemplateHandler instance
+	 **/
+	function &getInstance()
+	{
+		static $oTemplate = null;
+
+		if(__DEBUG__==3 ) {
+			if(!isset($GLOBALS['__TemplateHandlerCalled__'])) $GLOBALS['__TemplateHandlerCalled__']=1;
+			else $GLOBALS['__TemplateHandlerCalled__']++;
+		}
+
+		if(!$oTemplate) $oTemplate = new TemplateHandler();
+
+		return $oTemplate;
+	}
+
+	/**
+	 * @brief set variables for template compile
+	 **/
+	function init($tpl_path, $tpl_filename, $tpl_file='')
+	{
+		// verify arguments
+		if(substr($tpl_path,-1)!='/') $tpl_path .= '/';
+		if(!file_exists($tpl_path.$tpl_filename)&&file_exists($tpl_path.$tpl_filename.'.html')) $tpl_filename .= '.html';
+
+		// create tpl_file variable
+		if(!$tpl_file) $tpl_file = $tpl_path.$tpl_filename;
+
+		// set template file infos.
+		$this->path = $tpl_path;
+		$this->filename = $tpl_filename;
+		$this->file = $tpl_file;
+
+		$this->web_path = $this->xe_path.'/'.ltrim(preg_replace('@^'.preg_quote(_XE_PATH_,'@').'|\./@','',$this->path),'/');
+
+		// get compiled file name
+		$hash = md5($this->file . __ZBXE_VERSION__);
+		$this->compiled_file = "{$this->compiled_path}{$hash}.compiled.php";
+
+		// compare various file's modified time for check changed
+		$this->handler_mtime = filemtime(__FILE__);
+
+		$skip = array('');
+	}
+
+	/**
+	 * @brief compiles specified tpl file and execution result in Context into resultant content
+	 * @param[in] $tpl_path path of the directory containing target template file
+	 * @param[in] $tpl_filename target template file's name
+	 * @param[in] $tpl_file if specified use it as template file's full path
+	 * @return Returns compiled result in case of success, NULL otherwise
+	 */
+	function compile($tpl_path, $tpl_filename, $tpl_file='') {
+		global $__templatehandler_root_tpl;
+
+		$buff = '';
+
+		// store the starting time for debug information
+		if(__DEBUG__==3 ) $start = getMicroTime();
+
+		// initiation
+		$this->init($tpl_path, $tpl_filename, $tpl_file);
+
+		// if target file does not exist exit
+		if(!$this->file || !file_exists($this->file)) return "Err : '{$this->file}' template file does not exists.";
+
+		// for backward compatibility
+		if(is_null($__templatehandler_root_tpl)) {
+			$__templatehandler_root_tpl = $this->file;
+		}
+
+		$source_template_mtime = filemtime($this->file);
+		$latest_mtime = $source_template_mtime>$this->handler_mtime?$source_template_mtime:$this->handler_mtime;
+
+		// cache control
+		$oCacheHandler = &CacheHandler::getInstance('template');
+
+		// get cached buff
+		if($oCacheHandler->isSupport()){
+			$cache_key = 'template:'.$this->file;
+			$buff = $oCacheHandler->get($cache_key, $latest_mtime);
+		} else {
+			if(is_readable($this->compiled_file) && filemtime($this->compiled_file)>$latest_mtime && filesize($this->compiled_file)) {
+				$buff = 'file://'.$this->compiled_file;
+			}
+		}
+
+		if(!$buff) {
+			$buff = $this->parse();
+			if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key, $buff);
+			else FileHandler::writeFile($this->compiled_file, $buff);
+		}
+
+		$output = $this->_fetch($buff);
+
+		if($__templatehandler_root_tpl == $this->file) {
+			$__templatehandler_root_tpl = null;
+		}
+
+		// store the ending time for debug information
+		if(__DEBUG__==3 ) $GLOBALS['__template_elapsed__'] += getMicroTime() - $start;
+
+		return $output;
+	}
+
+	/**
+	 * @brief compile specified file and immediately return
+	 * @param[in] $tpl_path path of the directory containing target template file
+	 * @param[in] $tpl_filename target template file's name
+	 * @return Returns compiled content in case of success or NULL in case of failure
+	 **/
+	function compileDirect($tpl_path, $tpl_filename) {
+		$this->init($tpl_path, $tpl_filename, null);
+
+		// if target file does not exist exit
+		if(!$this->file || !file_exists($this->file)) {
+			Context::close();
+			exit("Cannot find the template file: '{$this->file}'");
+		}
+
+		return $this->parse();
+	}
+
+	/**
+	 * @brief compile a template file specified in $tpl_file and
+	 * @pre files specified by $tpl_file exists.
+	 * @param[in] $tpl_file path of tpl file
+	 * @param[in] $compiled_tpl_file if specified, write compiled result into the file
+	 * @return compiled result in case of success or NULL in case of error
+	 **/
+	function parse($buff=null) {
+		if(is_null($buff)) {
+			if(!is_readable($this->file)) return;
+
+			// read tpl file
+			$buff = FileHandler::readFile($this->file);
+		}
+
+		// HTML tags to skip
+		if(is_null($this->skipTags)) {
+			$this->skipTags = array('marquee');
+		}
+
+		// replace comments
+		$buff = preg_replace('@<!--//.*?-->@s', '', $buff);
+
+		// replace value of src in img/input/script tag
+		$buff = preg_replace_callback('/<(?:img|input|script)(?:(?!["\'\/]\s*>).)* src="(?!https?:\/\/|[\/\{])([^"]+)"/is', array($this, '_replacePath'), $buff);
+
+		// replace loop and cond template syntax
+		$buff = $this->_parseInline($buff);
+
+		// include, unload/load, import
+		$buff = preg_replace_callback('/{(@[\s\S]+?|(?=\$\w+|_{1,2}[A-Z]+|[!\(+-]|\w+(?:\(|::)|\d+|[\'"].*?[\'"]).+?)}|<(!--[#%])?(include|import|(un)?load(?(4)|(?:_js_plugin)?))(?(2)\("([^"]+)")(.*?)(?(2)\)--|\/)>|<!--(@[a-z@]+)([\s\S]*?)-->(\s*)/', array($this, '_parseResource'), $buff);
+
+		// remove block which is a virtual tag and remove comments
+		$buff = preg_replace('@</?block\s*>|\s?<!--//(.*?)-->@is','',$buff);
+
+		// form auto generation
+		$buff = preg_replace_callback('/(<form(?:<\?php.+?\?>|[^<>]+)*?>)(.*?)(<\/form>)/is', array($this, '_compileFormAuthGeneration'), $buff);
+
+		// prevent from calling directly before writing into file
+		$buff = '<?php if(!defined("__XE__"))exit;?>'.$buff;
+
+		return $buff;
+	}
+
+	/**
+	 * @brief 1. remove ruleset from form tag
+	 * 2. add hidden tag with ruleset value
+	 * 3. if empty default hidden tag, generate hidden tag (ex:mid, vid, act...)
+	 * 4. generate return url, return url use in server side validator
+	 **/
+	function _compileFormAuthGeneration($matches)
+	{
+		// form ruleset attribute move to hidden tag
+		if($matches[1])
+		{
+			preg_match('/ruleset="([^"]*?)"/is', $matches[1], $m);
+			if($m[0])
+			{
+				$matches[1] = preg_replace('/'.$m[0].'/i', '', $matches[1]);
+				$matches[2] = '<input type="hidden" name="ruleset" value="'.$m[1].'" />'.$matches[2];
+
+				if (strpos($m[1],'@') !== false){
+					$path = str_replace('@', '', $m[1]);
+					$path = './files/ruleset/'.$path.'.xml';
+				}else if(preg_match('@(?:^|\.?/)(modules/[\w-]+)@', $this->path, $mm)) {
+					$module_path = $mm[1];
+					$path = $module_path.'/ruleset/'.$m[1].'.xml';
+				}
+				//assign to addJsFile method for js dynamic recache
+				$matches[1]  = '<?php Context::addJsFile("'.$path.'", false, "", 0, "head", true) ?'.'>'.$matches[1];
+			}
+		}
+
+		// if not exists default hidden tag, generate hidden tag
+		preg_match_all('/<input[^>]* name="(act|mid|vid)"/is', $matches[2], $m2);
+		$checkVar = array('act', 'mid', 'vid');
+		$resultArray = array_diff($checkVar, $m2[1]);
+		if(is_array($resultArray))
+		{
+			$generatedHidden = '';
+			foreach($resultArray AS $key=>$value)
+			{
+				$generatedHidden .= '<input type="hidden" name="'.$value.'" value="<?php echo $__Context->'.$value.' ?>">';
+			}
+			$matches[2] = $generatedHidden.$matches[2];
+		}
+
+		// return url generate
+		if (!preg_match('/no-error-return-url="true"/i', $matches[1]))
+		{
+			preg_match('/<input[^>]*name="error_return_url"[^>]*>/is', $matches[2], $m3);
+			if(!$m3[0]) $matches[2] = '<input type="hidden" name="error_return_url" value="<?php echo getRequestUriByServerEnviroment() ?>" />'.$matches[2];
+		}
+
+		$matches[0] = '';
+		return implode($matches);
+	}
+
+	/**
+	 * @brief fetch using ob_* function
+	 * @param[in] $compiled_tpl_file path of compiled template file
+	 * @param[in] $buff if buff is not null, eval it instead of including compiled template file
+	 * @param[in] $tpl_path set context's tpl path
+	 * @return result string
+	 **/
+	function _fetch($buff) {
+		if(!$buff) return;
+
+		$__Context = &$GLOBALS['__Context__'];
+		$__Context->tpl_path = $this->path;
+
+		if($_SESSION['is_logged']) {
+			$__Context->logged_info = Context::get('logged_info');
+		}
+
+		ob_start();
+		if(substr($buff, 0, 7) == 'file://') {
+			include(substr($buff, 7));
+		} else {
+			$eval_str = "?>".$buff;
+			eval($eval_str);
+		}
+
+		return ob_get_clean();
+	}
+
+	/**
+	 * @brief change image path
+	 * @pre $matches is an array containg three elements
+	 * @param[in] $matches match
+	 * @return changed result
+	 **/
+	function _replacePath($match)
+	{
+		$src = preg_replace('@^(\./)+@', '', trim($match[1]));
+
+		$src = $this->web_path.$src;
+		$src = str_replace('/./', '/', $src);
+
+		// for backward compatibility
+		$src = preg_replace('@((?:[\w-]+/)+)\1@', '\1', $src);
+
+		while(($tmp=preg_replace('@[^/]+/\.\./@', '', $src))!==$src) $src = $tmp;
+
+		return substr($match[0],0,-strlen($match[1])-6)."src=\"{$src}\"";
+	}
+
+	function _parseInline($buff)
+	{
+		if(preg_match_all('/<([a-zA-Z]+\d?)(?>(?!<[a-z]+\d?[\s>]).)*?(?:[ \|]cond| loop)="/s', $buff, $match) === false) return $buff;
+
+		$tags = array_diff(array_unique($match[1]), $this->skipTags);
+
+		if(!count($tags)) return $buff;
+
+		$tags = '(?:'.implode('|',$tags).')';
+		$split_regex = "@(<(?>/?{$tags})(?>[^<>\{\}\"']+|<!--.*?-->|{[^}]+}|\".*?\"|'.*?'|.)*?>)@s";
+
+		$nodes = preg_split($split_regex, $buff, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+		// list of self closing tags
+		$self_closing = explode(',', 'area,base,basefont,br,hr,input,img,link,meta,param,frame,col');
+
+		for($idx=1,$node_len=count($nodes); $idx < $node_len; $idx+=2) {
+			if(!($node=$nodes[$idx])) continue;
+
+			if(preg_match_all('@\s(loop|cond)="([^"]+)"@', $node, $matches)) {
+				// this tag
+				$tag = substr($node, 1, strpos($node, ' ')-1);
+
+				// if the vale of $closing is 0, it means 'skipping'
+				$closing = 0;
+
+				// process opening tag
+				foreach($matches[1] as $n=>$stmt) {
+					$expr = $matches[2][$n];
+					$expr = $this->_replaceVar($expr);
+					$closing++;
+
+					switch($stmt) {
+					case 'cond':
+						$nodes[$idx-1] .= "<?php if({$expr}){ ?>";
+						break;
+					case 'loop':
+						if(!preg_match('@^(?:(.+?)=>(.+?)(?:,(.+?))?|(.*?;.*?;.*?)|(.+?)\s*=\s*(.+?))$@', $expr, $expr_m)) break;
+						if($expr_m[1]) {
+							$expr_m[1] = trim($expr_m[1]);
+							$expr_m[2] = trim($expr_m[2]);
+							if($expr_m[3]) $expr_m[2] .= '=>'.trim($expr_m[3]);
+							$nodes[$idx-1] .= "<?php if({$expr_m[1]}&&count({$expr_m[1]}))foreach({$expr_m[1]} as {$expr_m[2]}){ ?>";
+						}elseif($expr_m[4]) {
+							$nodes[$idx-1] .= "<?php for({$expr_m[4]}){ ?>";
+						}elseif($expr_m[5]) {
+							$nodes[$idx-1] .= "<?php while({$expr_m[5]}={$expr_m[6]}){ ?>";
+						}
+						break;
+					}
+				}
+				$node = preg_replace('@\s(loop|cond)="([^"]+)"@', '', $node);
+
+				// find closing tag
+				$close_php = '<?php '.str_repeat('}', $closing).' ?>';
+				if($node{1} == '!' || substr($node,-2,1) == '/' || in_array($tag, $self_closing)) { //  self closing tag
+					$nodes[$idx+1] = $close_php.$nodes[$idx+1];
+				} else {
+					$depth = 1;
+					for($i=$idx+2; $i < $node_len; $i+=2) {
+						$nd = $nodes[$i];
+						if(strpos($nd, $tag) === 1) {
+							$depth++;
+						} elseif(strpos($nd, '/'.$tag) === 1) {
+							$depth--;
+							if(!$depth) {
+								$nodes[$i-1] .= $nodes[$i].$close_php;
+								$nodes[$i] = '';
+								break;
+							}
+						}
+					}
+				}
+			}
+
+			if(strpos($node, '|cond="') !== false) {
+				$node = preg_replace('@(\s[\w:]+="[^"]+?")\|cond="(.+?)"@s', '<?php if($2){ ?>$1<?php } ?>', $node);
+				$node = $this->_replaceVar($node);
+			}
+
+			if($nodes[$idx] != $node) $nodes[$idx] = $node;
+		}
+
+		$buff = implode('', $nodes);
+
+		return $buff;
+	}
+
+	function _parseResource($m)
+	{
+		// {@ ... } or {$var} or {func(...)}
+		if($m[1])
+		{
+			if(preg_match('@^(\w+)\(@', $m[1], $mm) && !function_exists($mm[1])) return $m[0];
+
+			$echo = 'echo ';
+			if($m[1]{0} == '@') {
+				$echo = '';
+				$m[1] = substr($m[1], 1);
+			}
+			return '<?php '.$echo.$this->_replaceVar($m[1]).' ?>';
+		}
+
+		if($m[3])
+		{
+			$attr = array();
+			if($m[5]) {
+				if(preg_match_all('@,(\w+)="([^"]+)"@', $m[6], $mm)) {
+					foreach($mm[1] as $idx=>$name) {
+						$attr[$name] = $mm[2][$idx];
+					}
+				}
+				$attr['target'] = $m[5];
+			} else {
+				if(!preg_match_all('@ (\w+)="([^"]+)"@', $m[6], $mm)) return $m[0];
+				foreach($mm[1] as $idx=>$name) {
+					$attr[$name] = $mm[2][$idx];
+				}
+			}
+
+			switch($m[3])
+			{
+				// <!--#include--> or <include ..>
+				case 'include':
+					if(!$this->file || !$attr['target']) return '';
+
+					$pathinfo = pathinfo($attr['target']);
+					$fileDir  = $this->_getRelativeDir($pathinfo['dirname']);
+
+					if(!$fileDir) return '';
+
+					return "<?php \$__tpl=TemplateHandler::getInstance();echo \$__tpl->compile('{$fileDir}','{$pathinfo['basename']}') ?>";
+
+				// <!--%load_js_plugin-->
+				case 'load_js_plugin': 
+					$plugin = $this->_replaceVar($m[5]);
+					if(strpos($plugin, '$__Context') === false) $plugin = "'{$plugin}'";
+
+					return "<?php Context::loadJavascriptPlugin({$plugin}); ?>";
+
+				// <load ...> or <unload ...> or <!--%import ...--> or <!--%unload ...-->
+				case 'import':
+				case 'load':
+				case 'unload':
+					$metafile = '';
+					$pathinfo = pathinfo($attr['target']);
+					$doUnload = ($m[3] === 'unload');
+					$isRemote = !!preg_match('@^https?://@i', $attr['target']);
+
+					if(!$isRemote) {
+						if(!preg_match('@^\.?/@',$attr['target'])) $attr['target'] = './'.$attr['target'];
+						if(substr($attr['target'], -5) == '/lang') {
+							$pathinfo['dirname']  .= '/lang';
+							$pathinfo['basename']  = '';
+							$pathinfo['extension'] = 'xml';
+						}
+
+						$relativeDir = $this->_getRelativeDir($pathinfo['dirname']);
+
+						$attr['target'] = $relativeDir.'/'.$pathinfo['basename'];
+					}
+
+					switch($pathinfo['extension'])
+					{
+						case 'xml':
+							if($isRemote || $doUnload) return '';
+							// language file?
+							if($pathinfo['basename'] == 'lang.xml' || substr($pathinfo['dirname'],-5) == '/lang') {
+								$result = "Context::loadLang('{$relativeDir}');";
+							} else {
+								$result = "require_once('./classes/xml/XmlJsFilter.class.php');\$__xmlFilter=new XmlJsFilter('{$relativeDir}','{$pathinfo['basename']}');\$__xmlFilter->compile();";
+							}
+							break;
+						case 'js':
+							if($doUnload) {
+								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}');";
+							} else {
+								$metafile = $attr['target'];
+								$result = "\$__tmp=array('{$attr['target']}','{$attr['type']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp,'{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');unset(\$__tmp);";
+							}
+							break;
+						case 'css':
+							if($doUnload) {
+								$result = "Context::unloadFile('{$attr['target']}','{$attr['targetie']}','{$attr['media']}');";
+							} else {
+								$metafile = $attr['target'];
+								$result = "\$__tmp=array('{$attr['target']}','{$attr['media']}','{$attr['targetie']}','{$attr['index']}');Context::loadFile(\$__tmp,'{$attr['usecdn']}','{$attr['cdnprefix']}','{$attr['cdnversion']}');unset(\$__tmp);";
+							}
+							break;
+					}
+
+					$result = "<?php {$result} ?>";
+					if($metafile) $result = "<!--#Meta:{$metafile}-->".$result;
+
+					return $result;
+			}
+		}
+
+		// <!--@..--> such as <!--@if($cond)-->, <!--@else-->, <!--@end-->
+		if($m[7])
+		{
+			$m[7] = substr($m[7],1);
+			if(!preg_match('/^(?:((?:end)?(?:if|switch|for(?:each)?|while)|end)|(else(?:if)?)|(break@)?(case|default)|(break))$/', $m[7], $mm)) return '';
+			if($mm[1]) {
+				if($mm[1]{0} == 'e') return '<?php } ?>'.$m[9];
+
+				$precheck = '';
+				if($mm[1] == 'switch') {
+					$m[9] = '';
+				} elseif($mm[1] == 'foreach') {
+					$var = preg_replace('/^\s*\(\s*(.+?) .*$/', '$1', $m[8]);
+					$precheck = "if({$var}&&count({$var}))";
+				}
+				return '<?php '.$this->_replaceVar($precheck.$m[7].$m[8]).'{ ?>'.$m[9];
+			}
+			if($mm[2]) return "<?php }{$m[7]}".$this->_replaceVar($m[8])."{ ?>".$m[9];
+			if($mm[4]) return "<?php ".($mm[3]?'break;':'')."{$m[7]} ".trim($m[8],'()').": ?>".$m[9];
+			if($mm[5]) return "<?php break; ?>";
+			return '';
+		}
+
+		return $m[0];
+	}
+
+	function _getRelativeDir($path)
+	{
+		$_path = $path;
+
+		$fileDir = strtr(realpath($this->path),'\\','/');
+		if($path{0} != '/') $path = strtr(realpath($fileDir.'/'.$path),'\\','/');
+
+		// for backward compatibility
+		if(!$path) {
+			$dirs  = explode('/', $fileDir);
+			$paths = explode('/', $_path);
+			$idx   = array_search($paths[0], $dirs);
+
+			if($idx !== false) {
+				while($dirs[$idx] && $dirs[$idx] === $paths[0]) {
+					array_splice($dirs, $idx, 1);
+					array_shift($paths);
+				}
+				$path = strtr(realpath($fileDir.'/'.implode('/', $paths)),'\\','/');
+			}
+		}
+
+		$path = preg_replace('/^'.preg_quote(_XE_PATH_,'/').'/', '', $path);
+
+		return $path;
+	}
+
+	/**
+	 * @brief replace PHP variables of $ character
+	 **/
+	function _replaceVar($php) {
+		if(!strlen($php)) return '';
+		return preg_replace('@(?<!::|\\\\|\')\$([a-z]|_[a-z0-9])@i', '\$__Context->$1', $php);
+	}
+}
+
+/* End of File: TemplateHandler.class.php */
diff --git a/classes/validator/Validator.class.php b/classes/validator/Validator.class.php
new file mode 100644
index 000000000..aa07afa2e
--- /dev/null
+++ b/classes/validator/Validator.class.php
@@ -0,0 +1,499 @@
+<?php
+/**
+ * Validator class
+ * @author NHN (developers@xpressengine.com)
+ */
+class Validator
+{
+	var $_cache_dir = '';
+	var $_last_error;
+	var $_xml_ruleset = null;
+	var $_rules;
+	var $_filters;
+	var $_has_mb_func;
+	var $_version = '1.0';
+	var $_xml_path = '';
+
+	/**
+	 * @constructor
+	 */
+	function Validator($xml_path='') {
+		$this->__construct($xml_path);
+	}
+
+	function __construct($xml_path='') {
+		$this->_rules   = array();
+		$this->_filters = array();
+		$this->_xml_ruleset = null;
+
+		if($xml_path) $this->load($xml_path);
+
+		// predefined rules
+		$this->addRule(array(
+			'email'        => '/^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/',
+			'userid'       => '/^[a-z]+[\w-]*[a-z0-9_]+$/i',
+			'url'          => '/^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:\d+)?/',
+			'alpha'        => '/^[a-z]*$/i',
+			'alpha_number' => '/^[a-z][a-z0-9_]*$/i',
+			'number'       => '/^(?:[1-9]\\d*|0)$/'
+		));
+
+		$this->_has_mb_func = is_callable('mb_strlen');
+		$this->setCacheDir('./files/cache');
+	}
+
+	function __destruct() {
+		$this->_rules   = null;
+		$this->_filters = null;
+	}
+
+	/**
+	 * Load a xml file
+	 * @param[in] string $xml_path A file name to be loaded
+	 */
+	function load($xml_path) {
+		$this->_xml_ruleset = null;
+
+		$xml_path = realpath($xml_path);
+		if(!is_readable($xml_path)) return false;
+
+		$parser = new XmlParser();
+		$xml = $parser->loadXmlFile($xml_path);
+		if(!isset($xml->ruleset) || !isset($xml->ruleset->fields) || !isset($xml->ruleset->fields->field)) return false;
+
+		// custom rules
+		if(isset($xml->ruleset->customrules) && isset($xml->ruleset->customrules->rule)) {
+			$customrules = $xml->ruleset->customrules->rule;
+			if(!is_array($customrules)) $customrules = array($customrules);
+
+			$rules = array();
+			foreach($customrules as $rule) {
+				if(!isset($rule->attrs) || !isset($rule->attrs->name)) continue;
+
+				$rule = (array)$rule->attrs;
+				$name = $rule['name'];
+				unset($rule['name']);
+
+				$rules[$name] = $rule;
+			}
+			if(count($rules)) $this->addRule($rules);
+		}
+
+		// filters
+		$fields = $xml->ruleset->fields->field;
+		if(!is_array($fields)) $fields = array($fields);
+
+		$filters = array();
+		foreach($fields as $field) {
+			$name   = '';
+			$filter = array();
+
+			if(!isset($field->attrs) || !isset($field->attrs->name)) continue;
+			$filter = (array)$field->attrs;
+
+			$name = $filter['name'];
+			unset($filter['name']);
+
+			// conditional statement
+			if(isset($field->if)) {
+				$if = $field->if;
+				if(!is_array($if)) $if = array($if);
+				foreach($if as $idx=>$cond) {
+					$if[$idx] = (array)$cond->attrs;
+				}
+				$filter['if'] = $if;
+			}
+
+			$filters[$name] = $filter;
+		}
+
+		$this->_xml_ruleset = $xml->ruleset;
+		$this->_filters  = $filters;
+		$this->_xml_path = $xml_path;
+
+		return true;
+	}
+
+	/**
+	 * Set root cache directory
+	 * @param[in] string $cache_dir Root cache directory
+	 */
+	function setCacheDir($cache_dir){
+		if(is_dir($cache_dir)) {
+			$this->_cache_dir = preg_replace('@/$@', '', $cache_dir);
+		}
+	}
+
+	/**
+	 * Validate the fields. If the fields aren't passed, validation will be execute on the Context variables.
+	 * @param[in] (optional) array $fields Target fields. The keys of the array represents field's name, its values represents field's value.
+	 * @return bool True if it is valid, FALSE otherwise.
+	 */
+	function validate($fields_=null) {
+		if(is_array($fields_)) {
+			$fields = $fields_;
+		} else {
+			$args   = array_keys($this->_filters);
+			$fields = (array)Context::getRequestVars();
+		}
+
+		if(!is_array($fields)) return true;
+
+		$filter_default = array(
+			'required'  => 'false',
+			'default'   => '',
+			'modifiers' => array(),
+			'length'    => 0,
+			'equalto'   => 0,
+			'rule'      => 0,
+			'if'        => array()
+		);
+
+		$fields = array_map(array($this, 'arrayTrim'), $fields);
+		$field_names = array_keys($fields);
+
+		$filters = $this->_filters;
+
+		// get field names matching patterns
+		foreach($this->_filters as $key=>$filter) {
+			$names = array();
+			if($key{0} == '^') {
+				$names = preg_grep('/^'.preg_quote(substr($key,1)).'/', $field_names);
+			}elseif(substr($key,-2) == '[]'){
+				$filters[substr($key,0,-2)] = $filter;
+				unset($filters[$key]);
+			}
+
+			if(!count($names)) continue;
+
+			foreach($names as $name) {
+				$filters[$name] = $filter;
+			}
+			
+			unset($filters[$key]);
+		}
+
+		foreach($filters as $key=>$filter) {
+			$fname  = preg_replace('/\[\]$/', '', $key);
+			$exists = array_key_exists($key, $fields);
+			$filter = array_merge($filter_default, $filter);
+			$value  = $exists ? $fields[$fname] : null;
+
+			if(is_array($value)) $value = implode('', $value);
+
+			// conditional statement
+			foreach($filter['if'] as $cond) {
+				if(!isset($cond['test']) || !isset($cond['attr'])) continue;
+
+				$func_body = preg_replace('/\\$(\w+)/', '$c[\'$1\']', $cond['test']);
+				$func = create_function('$c', "return !!({$func_body});");
+
+				if($func($fields)) $filter[$cond['attr']] = $cond['value'];
+			}
+
+			// attr : default
+			if(!$value && strlen($default=trim($filter['default']))) {
+				$value = $default;
+				if(is_null($fields_)) Context::set($fname, $value);
+				else $fields_[$fname] = $value;
+			}
+			$value_len = strlen($value);
+
+			// attr : modifier
+			if(is_string($modifiers=$filter['modifiers'])) $modifiers = explode(',', trim($modifiers));
+
+			// attr : required
+			if($filter['required'] === 'true' && !$value_len) return $this->error($key, 'isnull');
+
+			// if the field wasn't passed, ignore this value
+			if(!$exists && !$value_len) continue;
+
+			// attr : length
+			if($length=$filter['length']){
+				list($min, $max) = explode(':', trim($length));
+				$is_min_b = (substr($min, -1) === 'b');
+				$is_max_b = (substr($max, -1) === 'b');
+				list($min, $max) = array((int)$min, (int)$max);
+
+				$strbytes = strlen($value);
+				if(!$is_min_b || !$is_max_b) {
+					$strlength = $this->_has_mb_func?mb_strlen($value,'utf-8'):$this->mbStrLen($value);
+				}
+
+				if(($min && $min > ($is_min_b?$strbytes:$strlength)) || ($max && $max < ($is_max_b?$strbytes:$strlength))) return $this->error($key, 'outofrange');
+			}
+
+			// equalto
+			if($equalto=$filter['equalto']){
+				if(!array_key_exists($equalto, $fields) || trim($fields[$equalto]) !== $value) return $this->error($key, 'equalto');
+			}
+
+			// rules
+			if($rules=$filter['rule']){
+				$rules = explode(',', $rules);
+				foreach($rules as $rule) {
+					$result = $this->applyRule($rule, $value);
+					// apply the 'not' modifier
+					if(in_array('not', $modifiers)) $result = !$result;
+					if(!$result) return $this->error($key, 'invalid_'.$rule);
+				}
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * apply trim recursive
+	 */
+	function arrayTrim($array)
+	{
+		if (!is_array($array)) return trim($array);
+
+		foreach($array as $key => $value)
+		{
+			$array[$key] = $this->arrayTrim($value);
+		}
+
+		return $array;
+	}
+
+	/**
+	 * Log an error
+	 * @param[in] $msg error message
+	 * @return always false
+	 */
+	function error($field, $msg){
+		$lang_filter = Context::getLang('filter');
+		$msg = isset($lang_filter->{$msg})?$lang_filter->{$msg}:$lang_filter->invalid;
+		$msg = sprintf($msg, Context::getLang($field));
+
+		$this->_last_error = array('field'=>$field, 'msg'=>$msg);
+
+		return false;
+	}
+
+	/**
+	 * Returns the last error infomation including a field name and an error message.
+	 * @return array The last error infomation
+	 */
+	function getLastError(){
+		return $this->_last_error;
+	}
+
+	/**
+	 * Add a new rule
+	 * @param[in] string $name rule name
+	 * @param[in] mixed $rule
+	 */
+	function addRule($name, $rule=''){
+		if(is_array($name)) $args = $name;
+		else $args = array($name=>$rule);
+
+		foreach($args as $name=>$rule){
+			if(!$rule) continue;
+			if(is_string($rule)) $rule = array('type'=>'regex', 'test'=>$rule);
+
+			if($rule['type'] == 'enum') {
+				$delim = isset($rule['delim'])?$rule['delim']:',';
+				$rule['test'] = explode($delim, $rule['test']);
+			}
+
+			$this->_rules[$name] = $rule;
+		}
+	}
+
+	/**
+	 * Remove a rule
+	 * @param[in] string $name rule name
+	 */
+	function removeRule($name){
+		unset($this->_rules[$name]);
+	}
+
+	function addFilter($name, $filter='') {
+		if(is_array($name)) $args = $name;
+		else $args = array($name=>$filter);
+
+		foreach($args as $name=>$filter) {
+			if(!$filter) continue;
+
+			if(isset($filter['if'])) {
+				if(is_array($filter['if']) && count($filter['if'])) {
+					$key = key($filter['if']);
+					if(!is_int($key)) $filter['if'] = array($filter['if']);
+				} else {
+					unset($filter['if']);
+				}
+			}
+
+			$this->_filters[$name] = $filter;
+		}
+	}
+
+	function removeFilter($name) {
+		unset($this->_filters[$name]);
+	}
+
+	/**
+	 * Find whether the field is valid with the rule
+	 * @param[in] string $name rule name
+	 * @param[in] string $value a value to be validated
+	 * @return bool TRUE if the field is valid, FALSE otherwise.
+	 */
+	function applyRule($name, $value){
+		$rule = $this->_rules[$name];
+
+		if (is_array($value) && isset($value['tmp_name']))
+		{
+			$value = $value['name'];
+		}
+
+		switch($rule['type']) {
+			case 'regex':
+				return (preg_match($rule['test'], $value) > 0);
+			case 'enum':
+				return in_array($value, $rule['test']);
+			case 'expr':
+				if(!$rule['func_test']) {
+					$rule['func_test'] = create_function('$a', 'return ('.preg_replace('/\$\$/', '$a', $rule['test']).');');
+				}
+				return $rule['func_test']($value);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Return
+	 */
+	function mbStrLen($str){
+		$arr = count_chars($str);
+		for($i=0x80; $i < 0xc0; $i++) {
+			unset($arr[$i]);
+		}
+		return array_sum($arr);
+	}
+
+	/**
+	 * Returns compiled javascript file path. The path begins from XE root directory.
+	 * @return string Compiled JavaScript file path
+	 */
+	function getJsPath(){
+		if(!$this->_cache_dir) return false;
+
+		$dir = $this->_cache_dir.'/ruleset';
+		if(!is_dir($dir) && !mkdir($dir)) return false;
+		if(!$this->_xml_path) return false;
+
+		// current language
+		$lang_type = class_exists('Context')?Context::getLangType():'en';
+
+		// check the file
+		$filepath = $dir.'/'.md5($this->_version.' '.$this->_xml_path).".{$lang_type}.js";
+		if(is_readable($filepath) && filemtime($filepath) > filemtime($this->_xml_path)) return $filepath;
+
+		$content = $this->_compile2js();
+		if($content === false) return false;
+
+		if(is_callable('file_put_contents')) {
+			@file_put_contents($filepath, $content);
+		} else {
+			$fp = @fopen($filepath, 'w');
+			if(is_resource($fp)) {
+				fwrite($fp, $content);
+				fclose($fp);
+			}
+		}
+
+		return $filepath;
+	}
+
+	/**
+	 * Compile a ruleset to a javascript file
+	 * @private
+	 */
+	function _compile2js() {
+		global $lang;
+
+		$ruleset = basename($this->_xml_path,'.xml');
+		$content = array();
+
+		if(preg_match('@(^|/)files/ruleset/\w+\.xml$@i', $this->_xml_path)) $ruleset = '@'.$ruleset;
+
+		// current language
+		$lang_type = class_exists('Context')?Context::getLangType():'en';
+
+		// custom rulesets
+		$addrules = array();
+		foreach($this->_rules as $name=>$rule) {
+			if(strpos('email,userid,url,alpha,alpha_number,number,', $name.',') !== false) continue;
+			switch($rule['type']) {
+				case 'regex':
+					$content[] = "v.cast('ADD_RULE', ['{$name}', {$rule['test']}]);";
+					break;
+				case 'enum':
+					$enums = '"'.implode('","', $rule['test']).'"';
+					$content[] = "v.cast('ADD_RULE', ['{$name}', function($$){ return ($.inArray($$,[{$enums}]) > -1); }]);";
+					break;
+				case 'expr':
+					$content[] = "v.cast('ADD_RULE', ['{$name}', function($$){ return ({$rule['test']}); }]);";
+					break;
+			}
+		}
+		$addrules = implode('', $addrules);
+
+		// filters
+		$content  = array();
+		$messages = array();
+		foreach($this->_filters as $name=>$filter) {
+			$field = array();
+
+			// form filed name
+			if(isset($lang->{$name})) {
+				$field_lang = addslashes($lang->{$name});
+				$messages[] = "v.cast('ADD_MESSAGE',['{$name}','{$field_lang}']);";
+			}
+
+			if($filter['required'] == 'true') $field[] = 'required:true';
+			if($filter['rule'])     $field[] = "rule:'{$filter['rule']}'";
+			if($filter['default'])  $field[] = "default:'{$filter['default']}'";
+			if($filter['modifier']) $field[] = "modifier:'{$filter['modifier']}'";
+			if($filter['length']) {
+				list($min, $max) = explode(':', $filter['length']);
+				if($min) $field[] = "minlength:'{$min}'";
+				if($max) $field[] = "maxlength:'{$max}'";
+			}
+			if($filter['if']) {
+				$ifs = array();
+				if(!isset($filter['if'][0])) $filter['if'] = array($filter['if']);
+				foreach($filter['if'] as $if) {
+					$ifs[] = "{test:'".addslashes($if['test'])."', attr:'{$if['attr']}', value:'".addslashes($if['value'])."'}";
+				}
+				$field[] = "'if':[".implode(',', $ifs)."]";
+			}
+			if(count($field)) {
+				$field = '{'.implode(',', $field).'}';
+				$content[] = "'{$name}':{$field}";
+			}
+		}
+
+		if(!$content) return '/* Error : empty ruleset  */';
+
+		// error messages
+		foreach($lang->filter as $key=>$text) {
+			if($text) {
+				$text = preg_replace('@\r?\n@', '\\n', addslashes($text));
+				$messages[] = "v.cast('ADD_MESSAGE',['{$key}','{$text}']);";
+			}
+		}
+
+		$content  = implode(',', $content);
+		$messages = implode("\n", $messages);
+
+		return "(function($,v){\nv=xe.getApp('validator')[0];if(!v)return;\n{$addrules}\nv.cast('ADD_FILTER',['{$ruleset}', {{$content}}]);\n{$messages}\n})(jQuery);";
+	}
+}
+
+/* End of file Validator.class.php */
+/* Location: ./classes/validator/Validator.class.php */
diff --git a/classes/widget/WidgetHandler.class.php b/classes/widget/WidgetHandler.class.php
index c35e4a188..8acf4abb4 100644
--- a/classes/widget/WidgetHandler.class.php
+++ b/classes/widget/WidgetHandler.class.php
@@ -1,14 +1,14 @@
-<?php
-    /**
-     * @class WidgetHandler
-     * @author NHN (developers@xpressengine.com)
-     * @brief Handler class for widget execution
-     * @remark it is empty for now, it would be removed in the future
-     **/
-
-    class WidgetHandler {
-
-        var $widget_path = '';
-
-    }
-?>
+<?php
+    /**
+     * @class WidgetHandler
+     * @author NHN (developers@xpressengine.com)
+     * @brief Handler class for widget execution
+     * @remark it is empty for now, it would be removed in the future
+     **/
+
+    class WidgetHandler {
+
+        var $widget_path = '';
+
+    }
+?>
diff --git a/classes/xml/GeneralXmlParser.class.php b/classes/xml/GeneralXmlParser.class.php
index 18b938ab0..becf581d4 100644
--- a/classes/xml/GeneralXmlParser.class.php
+++ b/classes/xml/GeneralXmlParser.class.php
@@ -1,83 +1,83 @@
-<?php
-    /**
-     * @class GeneralXmlParser
-     * @author NHN (developers@xpressengine.com)
-     * @brief Generic XML parser for XE
-     * @version 0.1
-     */
-    class GeneralXmlParser {
-	var $output = array();
-
-    /**
-    * @brief parse a given input to product a object containing parse values.
-    * @param[in] $input data to be parsed
-    * @return Returns an object containing parsed values or NULL in case of failure
-    */
-	function parse($input = '') {
-	    $oParser = xml_parser_create('UTF-8');
-	    xml_set_object($oParser, $this);
-	    xml_set_element_handler($oParser, "_tagOpen", "_tagClosed");
-	    xml_set_character_data_handler($oParser, "_tagBody");
-
-	    xml_parse($oParser, $input);
-	    xml_parser_free($oParser);
-
-	    if(!count($this->output)) return;
-	    $this->output = array_shift($this->output);
-
-	    return $this->output;
-	}
-
-    /**
-    * @brief start element handler
-    * @param[in] $parse an instance of parser
-    * @param[in] $node_name a name of node
-    * @param[in] $attrs attributes to be set
-    */
-	function _tagOpen($parser, $node_name, $attrs) {
-	    $obj->node_name = strtolower($node_name);
-	    $obj->attrs = $attrs;
-	    $obj->childNodes = array();
-
-	    array_push($this->output, $obj);
-	}
-
-    /**
-    * @brief character data handler
-    *  variable in the last element of this->output
-    * @param[in] $parse an instance of parser
-    * @param[in] $body a data to be added
-    */
-	function _tagBody($parser, $body) {
-	    //if(!trim($body)) return;
-	    $this->output[count($this->output)-1]->body .= $body;
-	}
-
-
-    /**
-    * @brief end element handler
-    * @param[in] $parse an instance of parser
-    * @param[in] $node_name name of xml node
-    */
-	function _tagClosed($parser, $node_name) {
-	    $node_name = strtolower($node_name);
-	    $cur_obj = array_pop($this->output);
-	    $parent_obj = &$this->output[count($this->output)-1];
-
-	    if($parent_obj->childNodes[$node_name]) 
-        {
-    		$tmp_obj = $parent_obj->childNodes[$node_name];
-    		if(is_array($tmp_obj)) {
-    		    array_push($parent_obj->childNodes[$node_name], $cur_obj);
-    		} else {
-    		    $parent_obj->childNodes[$node_name] = array();
-    		    array_push($parent_obj->childNodes[$node_name], $tmp_obj);
-    		    array_push($parent_obj->childNodes[$node_name], $cur_obj);
-    		}
-   	    } else {
-    		$parent_obj->childNodes[$node_name] = $cur_obj;
-	    }
-	}
-
-    }
-?>
+<?php
+    /**
+     * @class GeneralXmlParser
+     * @author NHN (developers@xpressengine.com)
+     * @brief Generic XML parser for XE
+     * @version 0.1
+     */
+    class GeneralXmlParser {
+	var $output = array();
+
+    /**
+    * @brief parse a given input to product a object containing parse values.
+    * @param[in] $input data to be parsed
+    * @return Returns an object containing parsed values or NULL in case of failure
+    */
+	function parse($input = '') {
+	    $oParser = xml_parser_create('UTF-8');
+	    xml_set_object($oParser, $this);
+	    xml_set_element_handler($oParser, "_tagOpen", "_tagClosed");
+	    xml_set_character_data_handler($oParser, "_tagBody");
+
+	    xml_parse($oParser, $input);
+	    xml_parser_free($oParser);
+
+	    if(!count($this->output)) return;
+	    $this->output = array_shift($this->output);
+
+	    return $this->output;
+	}
+
+    /**
+    * @brief start element handler
+    * @param[in] $parse an instance of parser
+    * @param[in] $node_name a name of node
+    * @param[in] $attrs attributes to be set
+    */
+	function _tagOpen($parser, $node_name, $attrs) {
+	    $obj->node_name = strtolower($node_name);
+	    $obj->attrs = $attrs;
+	    $obj->childNodes = array();
+
+	    array_push($this->output, $obj);
+	}
+
+    /**
+    * @brief character data handler
+    *  variable in the last element of this->output
+    * @param[in] $parse an instance of parser
+    * @param[in] $body a data to be added
+    */
+	function _tagBody($parser, $body) {
+	    //if(!trim($body)) return;
+	    $this->output[count($this->output)-1]->body .= $body;
+	}
+
+
+    /**
+    * @brief end element handler
+    * @param[in] $parse an instance of parser
+    * @param[in] $node_name name of xml node
+    */
+	function _tagClosed($parser, $node_name) {
+	    $node_name = strtolower($node_name);
+	    $cur_obj = array_pop($this->output);
+	    $parent_obj = &$this->output[count($this->output)-1];
+
+	    if($parent_obj->childNodes[$node_name]) 
+        {
+    		$tmp_obj = $parent_obj->childNodes[$node_name];
+    		if(is_array($tmp_obj)) {
+    		    array_push($parent_obj->childNodes[$node_name], $cur_obj);
+    		} else {
+    		    $parent_obj->childNodes[$node_name] = array();
+    		    array_push($parent_obj->childNodes[$node_name], $tmp_obj);
+    		    array_push($parent_obj->childNodes[$node_name], $cur_obj);
+    		}
+   	    } else {
+    		$parent_obj->childNodes[$node_name] = $cur_obj;
+	    }
+	}
+
+    }
+?>
diff --git a/classes/xml/XmlJsFilter.class.php b/classes/xml/XmlJsFilter.class.php
index a97a8eceb..db1bae032 100644
--- a/classes/xml/XmlJsFilter.class.php
+++ b/classes/xml/XmlJsFilter.class.php
@@ -1,290 +1,292 @@
-<?php
-	/**
-	 * @class XmlJsFilter
-	 * @author NHN (developers@xpressengine.com)
-	 * @brief filter class traslate xml content into javascript code
-     * @version 0.2
-	 *
-	 * it convert xml code into js file and save the result as a cache file
-     * @code 
-     * {   
-	 * <filter name="name of javascript funcion" act="action name" confirm_msg_code="message string to be prompted when submitting the form" >
-	 *  <form> <-- code to validate data in the form
-	 *    <node target="name" required="true" minlength="1" maxlength="5" filter="email,userid,alpha,number" equalto="target" />
-	 *  </form>
-	 *  <parameter> <-- 폼 항목을 조합하여 key=val 의 js array로 return, act는 필수
-	 *    <param name="key" target="target" />
-	 *  </parameter>
-	 *  <response callback_func="callback 받게 될 js function 이름 지정" > <-- 서버에 ajax로 전송하여 받을 결과값
-	 *    <tag name="error" /> <-- error이름의 결과값을 받겠다는 것
-	 *  </response>
-	 * </filter>
-     * }
-     *
-	 * @detail {
-     * - syntax description of <form> node
-	 *  target = name of for element
-	 *  required = flag indicating whether a field is mandatory or not
-	 *  minlength, maxlength = mininum, maxinum length of string allowed for the field
-	 *  filter = name of filter to be used for javascript validation. Following is the description of filter available
-	 *      1) email : validate the confirmance of the value against an email format
-	 *      2) userid : validate the confirmance of the value against the format of user id. (combination of number[0-9],alphabet(lower case) and '_', underscore starting with an alphatic character)
-	 *      3) alpha : check if the value is consists of alphabatic characters.
-	 *      4) number : check if the value is consists of numerical digits
-	 *      5) equalto = target : indicate that values in the form should be equal to those in target
-	 *      6) pattern_id/regex pattern/[i] : check the value using custom regular expression.
-	 *
-	 * - parameter - param
-	 *  name = key : indicate that a new array, 'key' will be created and a value will be assigned to it
-	 *  target = target_name : target form element의 값을 가져옴
-	 *
-	 * - response
-	 *  tag = key : name of variable that will contain the result of the execution
-     *  }
-	 **/
-                
-	class XmlJsFilter extends XmlParser {
-        var $version = '0.2.5';
-		var $compiled_path = './files/cache/js_filter_compiled/'; ///< 컴파일된 캐시 파일이 놓일 위치
-		var $xml_file = NULL; ///< 대상 xml 파일
-		var $js_file = NULL; ///< 컴파일된 js 파일
-
-		/**
-		 * @brief constructor
-		 **/
-		function XmlJsFilter($path, $xml_file) {
-			if(substr($path,-1)!=='/') $path .= '/';
-			$this->xml_file = sprintf("%s%s",$path, $xml_file);
-			$this->js_file = $this->_getCompiledFileName($this->xml_file);
-		}
-
-		/**
-		 * @brief compile a xml_file only when a corresponding js file does not exists or is outdated
-         * @return Returns NULL regardless of the success of failure of the operation
-         **/
-		function compile() {
-			if(!file_exists($this->xml_file)) return;
-			if(!file_exists($this->js_file)) $this->_compile();
-			else if(filemtime($this->xml_file)>filemtime($this->js_file)) $this->_compile();
-			Context::addJsFile($this->js_file, false, '',null,'body');
-		}
-
-		/**
-		 * @brief compile a xml_file into js_file
-		 **/
-		function _compile() {
-			global $lang;
-
-			// xml 파일을 읽음
-			$buff = FileHandler::readFile($this->xml_file);
-
-			// xml parsing
-			$xml_obj = parent::parse($buff);
-
-			$attrs = $xml_obj->filter->attrs;
-			$rules = $xml_obj->filter->rules;
-
-			// XmlJsFilter는 filter_name, field, parameter 3개의 데이터를 핸들링
-			$filter_name       = $attrs->name;
-			$confirm_msg_code  = $attrs->confirm_msg_code;
-			$module            = $attrs->module;
-			$act               = $attrs->act;
-			$extend_filter     = $attrs->extend_filter;
-			
-
-			$field_node = $xml_obj->filter->form->node;
-			if($field_node && !is_array($field_node)) $field_node = array($field_node);
-
-			$parameter_param = $xml_obj->filter->parameter->param;
-			if($parameter_param && !is_array($parameter_param)) $parameter_param = array($parameter_param);
-
-			$response_tag = $xml_obj->filter->response->tag;
-			if($response_tag && !is_array($response_tag)) $response_tag = array($response_tag);
-
-			// extend_filter가 있을 경우 해당 method를 호출하여 결과를 받음
-			if($extend_filter) {
-
-				// extend_filter가 있을 경우 캐시 사용을 못하도록 js 캐시 파일명을 변경
-				$this->js_file .= '.nocache.js';
-
-				// extend_filter는 module.method 로 지칭되어 이를 분리
-				list($module_name, $method) = explode('.',$extend_filter);
-
-				// 모듈 이름과 method가 있을 경우 진행
-				if($module_name&&$method) {
-					// 해당 module의 model 객체를 받음
-					$oExtendFilter = &getModel($module_name);
-
-					// method가 존재하면 실행
-					if(method_exists($oExtendFilter, $method)) {
-						// 결과를 받음
-						$extend_filter_list  = $oExtendFilter->{$method}(true);
-						$extend_filter_count = count($extend_filter_list);
-
-						// 결과에서 lang값을 이용 문서 변수에 적용
-						for($i=0; $i < $extend_filter_count; $i++) {
-							$name = $extend_filter_list[$i]->name;
-							$lang_value = $extend_filter_list[$i]->lang;
-							if($lang_value) $lang->{$name} = $lang_value;
-						}
-					}
-
-				}
-			}
-
-			// 언어 입력을 위한 사용되는 필드 조사
-			$target_list      = array();
-			$target_type_list = array();
-
-			// javascript contents
-			$js_rules       = array();
-			$js_messages    = array();
-
-			$fields = array();
-
-			// create custom rule
-			if ($rules && $rules->rule) {
-				if (!is_array($rules->rule)) $rules->rule = array($rules->rule);
-				foreach($rules->rule as $r) {
-					if ($r->attrs->type == 'regex') {
-						$js_rules[] = "v.cast('ADD_RULE', ['{$r->attrs->name}', {$r->body}]);";
-					}
-				}
-			}
-
-			// field, 즉 체크항목의 script 생성
-			$node_count = count($field_node);
-			if($node_count) {
-				foreach($field_node as $key =>$node) {
-					$attrs  = $node->attrs;
-					$target = trim($attrs->target);
-
-					if(!$target) continue;
-
-					$rule    = trim($attrs->rule?$attrs->rule:$attrs->filter);
-					$equalto = trim($attrs->equalto);
-
-					$field = array();
-
-					if($attrs->required == 'true') $field[] = 'required:true';
-					if($attrs->minlength > 0)      $field[] = 'minlength:'.$attrs->minlength;
-					if($attrs->maxlength > 0)      $field[] = 'maxlength:'.$attrs->maxlength;
-					if($equalto) $field[] = "equalto:'{$attrs->equalto}'";
-					if($rule)    $field[] = "rule:'{$rule}'";
-
-					$fields[] = "'{$target}': {".implode(',', $field)."}";
-
-					if(!in_array($target, $target_list)) $target_list[] = $target;
-					if(!$target_type_list[$target]) $target_type_list[$target] = $filter;
-				}
-			}
-
-			// extend_filter_item 체크
-			$rule_types = array('homepage'=>'homepage', 'email_address'=>'email');
-			
-			for($i=0;$i<$extend_filter_count;$i++) {
-				$filter_item = $extend_filter_list[$i];
-				$target      = trim($filter_item->name);
-
-				if(!$target) continue;
-
-				// extend filter item의 type으로 rule을 구함
-				$type  = $filter_item->type;
-				$rule  = $rule_types[$type]?$rule_types[$type]:'';
-				$required = ($filter_item->required == 'true');
-
-				$field = array();
-				if($required) $field[] = 'required:true';
-				if($rule)     $field[] = "rule:'{$rule}'";
-				$fields[] = "\t\t'{$target}' : {".implode(',', $field)."}";
-
-				if(!in_array($target, $target_list)) $target_list[] = $target;
-				if(!$target_type_list[$target]) $target_type_list[$target] = $type;
-			}
-
-			// 데이터를 만들기 위한 parameter script 생성
-			$rename_params   = array();
-			$parameter_count = count($parameter_param);
-			if($parameter_count) {
-				// 기본 필터 내용의 parameter로 구성
-				foreach($parameter_param as $key =>$param) {
-					$attrs  = $param->attrs;
-					$name   = trim($attrs->name);
-					$target = trim($attrs->target);
-
-					//if($name && $target && ($name != $target)) $js_doc[] = "\t\tparams['{$name}'] = params['{$target}']; delete params['{$target}'];";
-					if($name && $target && ($name != $target))  $rename_params[] = "'{$target}':'{$name}'";
-					if($name && !in_array($name, $target_list)) $target_list[] = $name;
-				}
-
-				// extend_filter_item 체크
-				for($i=0;$i<$extend_filter_count;$i++) {
-					$filter_item = $extend_filter_list[$i];
-					$target = $name = trim($filter_item->name);
-					if(!$name || !$target) continue;
-
-					if(!in_array($name, $target_list)) $target_list[] = $name;
-				}
-			}
-
-			// response script 생성
-			$response_count = count($response_tag);
-			$responses = array();
-			for($i=0;$i<$response_count;$i++) {
-				$attrs = $response_tag[$i]->attrs;
-				$name = $attrs->name;
-				$responses[] = "'{$name}'";
-			}
-
-			// lang : form field description
-			$target_count = count($target_list);
-			for($i=0;$i<$target_count;$i++) {
-				$target = $target_list[$i];
-				if(!$lang->{$target}) $lang->{$target} = $target;
-				$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $target, addslashes($lang->{$target}));
-			}
-
-			// target type을 기록
-			/*
-			$target_type_count = count($target_type_list);
-			if($target_type_count) {
-				foreach($target_type_list as $target => $type) {
-					//$js_doc .= sprintf("target_type_list[\"%s\"] = \"%s\";\n", $target, $type);
-				}
-			}
-			*/
-
-			// lang : error message
-			foreach($lang->filter as $key => $val) {
-				if(!$val) $val = $key;
-				$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $key, $val);
-			}
-
-			$callback_func = $xml_obj->filter->response->attrs->callback_func;
-			if(!$callback_func) $callback_func = "filterAlertMessage";
-
-			$confirm_msg = '';
-			if ($confirm_msg_code) $confirm_msg = $lang->{$confirm_msg_code};
-			
-			$jsdoc   = array();
-			$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [".implode(',', $responses)."], '".addslashes($confirm_msg)."', {".implode(',', $rename_params)."}) };";
-			$jsdoc[] = '(function($){';
-			$jsdoc[] = "\tvar v=xe.getApp('validator')[0];if(!v)return false;";
-			$jsdoc[] = "\t".'v.cast("ADD_FILTER", ["'.$filter_name.'", {'.implode(',', $fields).'}]);';
-			$jsdoc[] = "\t".implode("\n\t", $js_rules);
-			$jsdoc[] = "\t".implode("\n\t", $js_messages);
-			$jsdoc[] = '})(jQuery);';
-			$jsdoc   = implode("\n", $jsdoc);
-
-			// js파일 생성
-			FileHandler::writeFile($this->js_file, $jsdoc);
-		}
-
-		/**
-		 * @brief return a file name of js file corresponding to the xml file
-		 **/
-		function _getCompiledFileName($xml_file) {
-			return sprintf('%s%s.%s.compiled.js',$this->compiled_path, md5($this->version.$xml_file),Context::getLangType());
-		}
-	}
-?>
+<?php
+	/**
+	 * @class XmlJsFilter
+	 * @author NHN (developers@xpressengine.com)
+	 * @brief filter class traslate xml content into javascript code
+     * @version 0.2
+	 *
+	 * it convert xml code into js file and save the result as a cache file
+     * @code
+     * {
+	 * <filter name="name of javascript funcion" act="action name" confirm_msg_code="message string to be prompted when submitting the form" >
+	 *  <form> <-- code to validate data in the form
+	 *    <node target="name" required="true" minlength="1" maxlength="5" filter="email,userid,alpha,number" equalto="target" />
+	 *  </form>
+	 * <parameter> "- A form of key = val combination of items to js array return, act required
+	 *    <param name="key" target="target" />
+	 *  </parameter>
+	 * <response callback_func="specifying the name of js function to callback" > "- Result to get by sending ajax to the server
+	 * <tag name="error" /> <- get the result of error name
+	 *  </response>
+	 * </filter>
+     * }
+     *
+	 * @detail {
+     * - syntax description of <form> node
+	 *  target = name of for element
+	 *  required = flag indicating whether a field is mandatory or not
+	 *  minlength, maxlength = mininum, maxinum length of string allowed for the field
+	 *  filter = name of filter to be used for javascript validation. Following is the description of filter available
+	 *      1) email : validate the confirmance of the value against an email format
+	 *      2) userid : validate the confirmance of the value against the format of user id. (combination of number[0-9],alphabet(lower case) and '_', underscore starting with an alphatic character)
+	 *      3) alpha : check if the value is consists of alphabatic characters.
+	 *      4) number : check if the value is consists of numerical digits
+	 *      5) equalto = target : indicate that values in the form should be equal to those in target
+	 *      6) pattern_id/regex pattern/[i] : check the value using custom regular expression.
+	 *
+	 * - parameter - param
+	 *  name = key : indicate that a new array, 'key' will be created and a value will be assigned to it
+	 * target = target_name: get the value of the target form element
+	 *
+	 * - response
+	 *  tag = key : name of variable that will contain the result of the execution
+     *  }
+	 **/
+
+	class XmlJsFilter extends XmlParser {
+        var $version = '0.2.5';
+		var $compiled_path = './files/cache/js_filter_compiled/'; // / directory path for compiled cache file
+		var $xml_file = NULL; // / Target xml file
+		var $js_file = NULL; // / Compiled js file
+
+		/**
+		 * @brief constructor
+		 **/
+		function XmlJsFilter($path, $xml_file) {
+			if(substr($path,-1)!=='/') $path .= '/';
+			$this->xml_file = sprintf("%s%s",$path, $xml_file);
+			$this->js_file = $this->_getCompiledFileName($this->xml_file);
+		}
+
+		/**
+		 * @brief compile a xml_file only when a corresponding js file does not exists or is outdated
+         * @return Returns NULL regardless of the success of failure of the operation
+         **/
+		function compile() {
+			if(!file_exists($this->xml_file)) return;
+			if(!file_exists($this->js_file)) $this->_compile();
+			else if(filemtime($this->xml_file)>filemtime($this->js_file)) $this->_compile();
+			Context::loadFile(array($this->js_file, 'body', '',null));
+		}
+
+		/**
+		 * @brief compile a xml_file into js_file
+		 **/
+		function _compile() {
+			global $lang;
+
+			// read xml file
+			$buff = FileHandler::readFile($this->xml_file);
+
+			// xml parsing
+			$xml_obj = parent::parse($buff);
+
+			$attrs = $xml_obj->filter->attrs;
+			$rules = $xml_obj->filter->rules;
+
+			// XmlJsFilter handles three data; filter_name, field, and parameter
+			$filter_name       = $attrs->name;
+			$confirm_msg_code  = $attrs->confirm_msg_code;
+			$module            = $attrs->module;
+			$act               = $attrs->act;
+			$extend_filter     = $attrs->extend_filter;
+
+
+			$field_node = $xml_obj->filter->form->node;
+			if($field_node && !is_array($field_node)) $field_node = array($field_node);
+
+			$parameter_param = $xml_obj->filter->parameter->param;
+			if($parameter_param && !is_array($parameter_param)) $parameter_param = array($parameter_param);
+
+			$response_tag = $xml_obj->filter->response->tag;
+			if($response_tag && !is_array($response_tag)) $response_tag = array($response_tag);
+
+			// If extend_filter exists, result returned by calling the method
+			if($extend_filter) {
+
+				// If extend_filter exists, it changes the name of cache not to use cache
+				$this->js_file .= '.nocache.js';
+
+				// Separate the extend_filter
+				list($module_name, $method) = explode('.',$extend_filter);
+
+				// contibue if both module_name and methos exist.
+				if($module_name&&$method) {
+					// get model object of the module
+					$oExtendFilter = &getModel($module_name);
+
+					// execute if method exists
+					if(method_exists($oExtendFilter, $method)) {
+						// get the result
+						$extend_filter_list  = $oExtendFilter->{$method}(true);
+						$extend_filter_count = count($extend_filter_list);
+
+						// apply lang_value from the result to the variable
+						for($i=0; $i < $extend_filter_count; $i++) {
+							$name = $extend_filter_list[$i]->name;
+							$lang_value = $extend_filter_list[$i]->lang;
+							if($lang_value) $lang->{$name} = $lang_value;
+						}
+					}
+
+				}
+			}
+
+			// search the field to be used for entering language
+			$target_list      = array();
+			$target_type_list = array();
+
+			// javascript contents
+			$js_rules       = array();
+			$js_messages    = array();
+
+			$fields = array();
+
+			// create custom rule
+			if ($rules && $rules->rule) {
+				if (!is_array($rules->rule)) $rules->rule = array($rules->rule);
+				foreach($rules->rule as $r) {
+					if ($r->attrs->type == 'regex') {
+						$js_rules[] = "v.cast('ADD_RULE', ['{$r->attrs->name}', {$r->body}]);";
+					}
+				}
+			}
+
+			// generates a field, which is a script of the checked item
+			$node_count = count($field_node);
+			if($node_count) {
+				foreach($field_node as $key =>$node) {
+					$attrs  = $node->attrs;
+					$target = trim($attrs->target);
+
+					if(!$target) continue;
+
+					$rule    = trim($attrs->rule?$attrs->rule:$attrs->filter);
+					$equalto = trim($attrs->equalto);
+
+					$field = array();
+
+					if($attrs->required == 'true') $field[] = 'required:true';
+					if($attrs->minlength > 0)      $field[] = 'minlength:'.$attrs->minlength;
+					if($attrs->maxlength > 0)      $field[] = 'maxlength:'.$attrs->maxlength;
+					if($equalto) $field[] = "equalto:'{$attrs->equalto}'";
+					if($rule)    $field[] = "rule:'{$rule}'";
+
+					$fields[] = "'{$target}': {".implode(',', $field)."}";
+
+					if(!in_array($target, $target_list)) $target_list[] = $target;
+					if(!$target_type_list[$target]) $target_type_list[$target] = $filter;
+				}
+			}
+
+			// Check extend_filter_item
+			$rule_types = array('homepage'=>'homepage', 'email_address'=>'email');
+
+			for($i=0;$i<$extend_filter_count;$i++) {
+				$filter_item = $extend_filter_list[$i];
+				$target      = trim($filter_item->name);
+
+				if(!$target) continue;
+
+				// get the filter from the type of extend filter item
+				$type  = $filter_item->type;
+				$rule  = $rule_types[$type]?$rule_types[$type]:'';
+				$required = ($filter_item->required == 'true');
+
+				$field = array();
+				if($required) $field[] = 'required:true';
+				if($rule)     $field[] = "rule:'{$rule}'";
+				$fields[] = "\t\t'{$target}' : {".implode(',', $field)."}";
+
+				if(!in_array($target, $target_list)) $target_list[] = $target;
+				if(!$target_type_list[$target]) $target_type_list[$target] = $type;
+			}
+
+			// generates parameter script to create dbata
+			$rename_params   = array();
+			$parameter_count = count($parameter_param);
+			if($parameter_count) {
+				// contains parameter of the default filter contents
+				foreach($parameter_param as $key =>$param) {
+					$attrs  = $param->attrs;
+					$name   = trim($attrs->name);
+					$target = trim($attrs->target);
+
+					//if($name && $target && ($name != $target)) $js_doc[] = "\t\tparams['{$name}'] = params['{$target}']; delete params['{$target}'];";
+					if($name && $target && ($name != $target))  $rename_params[] = "'{$target}':'{$name}'";
+					if($name && !in_array($name, $target_list)) $target_list[] = $name;
+				}
+
+				// Check extend_filter_item
+				for($i=0;$i<$extend_filter_count;$i++) {
+					$filter_item = $extend_filter_list[$i];
+					$target = $name = trim($filter_item->name);
+					if(!$name || !$target) continue;
+
+					if(!in_array($name, $target_list)) $target_list[] = $name;
+				}
+			}
+
+			// generates the response script
+			$response_count = count($response_tag);
+			$responses = array();
+			for($i=0;$i<$response_count;$i++) {
+				$attrs = $response_tag[$i]->attrs;
+				$name = $attrs->name;
+				$responses[] = "'{$name}'";
+			}
+
+			// writes lang values of the form field
+			$target_count = count($target_list);
+			for($i=0;$i<$target_count;$i++) {
+				$target = $target_list[$i];
+				if(!$lang->{$target}) $lang->{$target} = $target;
+				$text = preg_replace('@\r?\n@', '\\n', addslashes($lang->{$target}));
+				$js_messages[] = "v.cast('ADD_MESSAGE',['{$target}','{$text}']);";
+			}
+
+			// writes the target type
+			/*
+			$target_type_count = count($target_type_list);
+			if($target_type_count) {
+				foreach($target_type_list as $target => $type) {
+					//$js_doc .= sprintf("target_type_list[\"%s\"] = \"%s\";\n", $target, $type);
+				}
+			}
+			*/
+
+			// writes error messages
+			foreach($lang->filter as $key => $val) {
+				if(!$val) $val = $key;
+				$val = preg_replace('@\r?\n@', '\\n', addslashes($val));
+				$js_messages[] = sprintf("v.cast('ADD_MESSAGE',['%s','%s']);", $key, $val);
+			}
+
+			$callback_func = $xml_obj->filter->response->attrs->callback_func;
+			if(!$callback_func) $callback_func = "filterAlertMessage";
+
+			$confirm_msg = '';
+			if ($confirm_msg_code) $confirm_msg = $lang->{$confirm_msg_code};
+
+			$jsdoc   = array();
+			$jsdoc[] = "function {$filter_name}(form){ return legacy_filter('{$filter_name}', form, '{$module}', '{$act}', {$callback_func}, [".implode(',', $responses)."], '".addslashes($confirm_msg)."', {".implode(',', $rename_params)."}) };";
+			$jsdoc[] = '(function($){';
+			$jsdoc[] = "\tvar v=xe.getApp('validator')[0];if(!v)return false;";
+			$jsdoc[] = "\t".'v.cast("ADD_FILTER", ["'.$filter_name.'", {'.implode(',', $fields).'}]);';
+			$jsdoc[] = "\t".implode("\n\t", $js_rules);
+			$jsdoc[] = "\t".implode("\n\t", $js_messages);
+			$jsdoc[] = '})(jQuery);';
+			$jsdoc   = implode("\n", $jsdoc);
+
+			// generates the js file
+			FileHandler::writeFile($this->js_file, $jsdoc);
+		}
+
+		/**
+		 * @brief return a file name of js file corresponding to the xml file
+		 **/
+		function _getCompiledFileName($xml_file) {
+			return sprintf('%s%s.%s.compiled.js',$this->compiled_path, md5($this->version.$xml_file),Context::getLangType());
+		}
+	}
+?>
diff --git a/classes/xml/XmlLangParser.class.php b/classes/xml/XmlLangParser.class.php
new file mode 100644
index 000000000..9a780a4d6
--- /dev/null
+++ b/classes/xml/XmlLangParser.class.php
@@ -0,0 +1,152 @@
+<?php
+	/**
+	 * @class XmlLangParser
+	 * @author NHN (developers@xpressengine.com)
+	 * @brief change to lang php file from xml.
+     * @version 0.1
+	 **/
+
+	class XmlLangParser extends XmlParser {
+		var $compiled_path = './files/cache/lang/'; // / directory path for compiled cache file
+		var $xml_file = NULL; // / Target xml file
+		var $php_file = NULL; // / Target php file
+		var $code;
+		var $lang_types;
+		var $lang_type;
+
+		/**
+		 * @brief constructor
+		 **/
+		function XmlLangParser($xml_file, $lang_type) {
+			$this->lang_type = $lang_type;
+			$this->xml_file = $xml_file;
+			$this->php_file = $this->_getCompiledFileName($lang_type);
+		}
+
+		/**
+		 * @brief compile a xml_file only when a corresponding php lang file does not exists or is outdated
+         * @return Returns compiled php file.
+         **/
+		function compile() {
+			if(!file_exists($this->xml_file)) return false;
+			if(!file_exists($this->php_file)){
+				$this->_compile();
+			} else {
+				if(filemtime($this->xml_file)>filemtime($this->php_file)) $this->_compile();
+				else return $this->php_file;
+			}
+
+			return $this->_writefile() ? $this->php_file : false;
+		}
+
+		function getCompileContent() {
+			if(!file_exists($this->xml_file)) return false;
+			$this->_compile();
+
+			return $this->code;
+		}
+
+		/**
+		 * @brief compile a xml_file
+		 **/
+		function _compile() {
+			$lang_selected = Context::loadLangSelected();
+			$this->lang_types = array_keys($lang_selected);
+
+			// read xml file
+			$buff = FileHandler::readFile($this->xml_file);
+			$buff = str_replace('xml:lang','xml_lang',$buff);
+
+			// xml parsing
+			$xml_obj = parent::parse($buff);
+
+			$item = $xml_obj->lang->item;
+			if(!is_array($item)) $item = array($item);
+			foreach($item as $i){
+				$this->_parseItem($i, $var='$lang->%s');
+			}
+		}
+
+		/**
+		 * @brief writing cache file
+		 **/
+		function _writeFile(){
+			if(!$this->code) return;
+			FileHandler::writeFile($this->php_file, "<?php\n".$this->code);
+			return false;
+		}
+
+		/**
+		 * @brief Parsing item node
+		 **/
+		function _parseItem($item, $var){
+			$name = $item->attrs->name;
+			$value = $item->value;
+			$var = sprintf($var, $name);
+
+			if($item->item) {
+				$type = $item->attrs->type;
+
+				if($type == 'array'){
+					$this->code .= $var."=array();\n";
+					$var .= '[\'%s\']';
+				}else{
+					$this->code .= $var."=new stdClass;\n";
+					$var .= '->%s';
+				}
+
+				$items = $item->item;
+				if(!is_array($items)) $items = array($items);
+				foreach($items as $item){
+					$this->_parseItem($item, $var);
+				}
+
+			} else {
+				$code = $this->_parseValues($value, $var);
+				$this->code .= $code;
+			}
+		}
+
+		/**
+		 * @brief Parsing value nodes
+		 **/
+		function _parseValues($nodes, $var) {
+			if(!is_array($nodes)) $nodes = array($nodes);
+
+			$value = array();
+			foreach($nodes as $node){
+				$return = $this->_parseValue($node, $var);
+				if($return && is_array($return)) $value = array_merge($value, $return);
+			}
+
+			if($value[$this->lang_type]) return $value[$this->lang_type];
+			else if($value['en']) return $value['en'];
+			else if($value['ko']) return $value['ko'];
+
+			foreach($this->lang_types as $lang_type) {
+				if($lang_type == 'en' || $lang_type == 'ko' || $lang_type == $this->lang_type) continue;
+				if($value[$lang_type]) return $value[$lang_type];
+			}
+
+			return '';
+		}
+
+		/**
+		 * @brief Parsing value node
+		 **/
+		function _parseValue($node, $var) {
+			$lang_type = $node->attrs->xml_lang;
+			$value = $node->body;
+			if(!$value) return false;
+
+			$var .= '=\'' . str_replace("'","\'",$value) . "';\n";
+			return array($lang_type=>$var);
+		}
+
+		/**
+		 * @brief get cache file name
+		 **/
+		function _getCompiledFileName($lang_type, $type='php') {
+			return sprintf('%s%s.%s.php',$this->compiled_path, md5($this->xml_file), $lang_type);
+		}
+	}
diff --git a/classes/xml/XmlParser.class.php b/classes/xml/XmlParser.class.php
index 4e68a2abf..b9326fec8 100644
--- a/classes/xml/XmlParser.class.php
+++ b/classes/xml/XmlParser.class.php
@@ -1,154 +1,153 @@
-<?php
-    /**
-     * @class XmlParser 
-     * @author NHN (developers@xpressengine.com)
-     * @brief class parsing a given xmlrpc request and creating a data object
-     * @version 0.1
-     *
-     * @remarks { 
-     * This class may drops unsupported xml lanuage attributes when multiple language attributes are given.
-     * For example, if 'xml:lang='ko, en, ch, jp..' is given in a xml file, only ko will be left ignoring all other language
-     * attributes when kor is only supported language. It seems to work fine now but we did not scrutinze any potential side effects,
-     * }
-     **/
-
-    class XmlParser {
-
-        var $oParser = NULL; ///< xml parser
-
-        var $input = NULL; ///< input xml
-        var $output = array(); ///< output object
-
-        var $lang = "en"; ///< 기본 언어타입
-
-        /**
-         * @brief load a xml file specified by a filename and parse it to return the resultant data object
-         * @param[in] $filename a file path of file
-         * @return Returns a data object containing data extracted from a xml file or NULL if a specified file does not exist
-         **/
-        function loadXmlFile($filename) {
-            if(!file_exists($filename)) return;
-            $buff = FileHandler::readFile($filename);
-
-            $oXmlParser = new XmlParser();
-            return $oXmlParser->parse($buff);
-        }
-
-        /**
-         * @brief parse xml data to extract values from it and construct data object
-         * @param[in] a data buffer containing xml data
-         * @return Returns a resultant data object or NULL in case of error
-         **/
-        function parse($input = '') {
-            // 디버그를 위한 컴파일 시작 시간 저장
-            if(__DEBUG__==3) $start = getMicroTime();
-
-            $this->lang = Context::getLangType();
-
-            $this->input = $input?$input:$GLOBALS['HTTP_RAW_POST_DATA'];
-			$this->input = str_replace(array('','
'),array('',''),$this->input);
-
-            // 지원언어 종류를 뽑음
-            preg_match_all("/xml:lang=\"([^\"].+)\"/i", $this->input, $matches);
-
-            // xml:lang이 쓰였을 경우 지원하는 언어종류를 뽑음
-            if(count($matches[1]) && $supported_lang = array_unique($matches[1])) {
-                // supported_lang에 현재 접속자의 lang이 없으면 en이 있는지 확인하여 en이 있으면 en을 기본, 아니면 첫번째것을..
-                if(!in_array($this->lang, $supported_lang)) {
-                    if(in_array('en', $supported_lang)) {
-                        $this->lang = 'en';
-                    } else {
-                        $this->lang = array_shift($supported_lang);
-                    }
-                }
-            // 특별한 언어가 지정되지 않았다면 언어체크를 하지 않음
-            } else {
-                unset($this->lang);
-            }
-
-            $this->oParser = xml_parser_create('UTF-8');
-
-            xml_set_object($this->oParser, $this);
-            xml_set_element_handler($this->oParser, "_tagOpen", "_tagClosed");
-            xml_set_character_data_handler($this->oParser, "_tagBody");
-
-            xml_parse($this->oParser, $this->input);
-            xml_parser_free($this->oParser);
-
-            if(!count($this->output)) return;
-
-            $output = array_shift($this->output);
-
-            // 디버그를 위한 컴파일 시작 시간 저장
-            if(__DEBUG__==3) $GLOBALS['__xmlparse_elapsed__'] += getMicroTime() - $start;
-
-            return $output;
-        }
-
-
-       /**
-        * @brief start element handler.
-        * @param[in] $parse an instance of parser
-        * @param[in] $node_name a name of node
-        * @param[in] $attrs attributes to be set
-        */
-        function _tagOpen($parser, $node_name, $attrs) {
-            $obj->node_name = strtolower($node_name);
-            $obj->attrs = $this->_arrToObj($attrs);
-
-            array_push($this->output, $obj);
-        }
-
-
-       /**
-        * @brief character data handler
-        *  variable in the last element of this->output
-        * @param[in] $parse an instance of parser
-        * @param[in] $body a data to be added
-        * @remark the first parameter, $parser ought to be remove since it is not used.
-        */
-        function _tagBody($parser, $body) {
-            //if(!trim($body)) return;
-            $this->output[count($this->output)-1]->body .= $body;
-        }
-
-       /**
-        * @brief end element handler
-        * @param[in] $parse an instance of parser
-        * @param[in] $node_name name of xml node
-        */
-        function _tagClosed($parser, $node_name) {
-            $node_name = strtolower($node_name);
-            $cur_obj = array_pop($this->output);
-            $parent_obj = &$this->output[count($this->output)-1];
-            if($this->lang&&$cur_obj->attrs->{'xml:lang'}&&$cur_obj->attrs->{'xml:lang'}!=$this->lang) return;
-            if($this->lang&&$parent_obj->{$node_name}->attrs->{'xml:lang'}&&$parent_obj->{$node_name}->attrs->{'xml:lang'}!=$this->lang) return;
-
-            if($parent_obj->{$node_name}) {
-                $tmp_obj = $parent_obj->{$node_name};
-                if(is_array($tmp_obj)) {
-                    array_push($parent_obj->{$node_name}, $cur_obj);
-                } else {
-                    $parent_obj->{$node_name} = array();
-                    array_push($parent_obj->{$node_name}, $tmp_obj);
-                    array_push($parent_obj->{$node_name}, $cur_obj);
-                }
-            } else {
-                $parent_obj->{$node_name} = $cur_obj;
-            }
-        }
-
-        /**
-        * @brief method to transfer values in an array to a data object       
-        * @param[in] $arr data array 
-        **/
-        function _arrToObj($arr) {
-            if(!count($arr)) return;
-            foreach($arr as $key => $val) {
-                $key = strtolower($key);
-                $output->{$key} = $val;
-            }
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class XmlParser 
+     * @author NHN (developers@xpressengine.com)
+     * @brief class parsing a given xmlrpc request and creating a data object
+     * @version 0.1
+     *
+     * @remarks { 
+     * This class may drops unsupported xml lanuage attributes when multiple language attributes are given.
+     * For example, if 'xml:lang='ko, en, ch, jp..' is given in a xml file, only ko will be left ignoring all other language
+     * attributes when kor is only supported language. It seems to work fine now but we did not scrutinze any potential side effects,
+     * }
+     **/
+
+    class XmlParser {
+
+        var $oParser = NULL; ///< xml parser
+
+        var $input = NULL; ///< input xml
+        var $output = array(); ///< output object
+
+        var $lang = "en"; // /< The default language type
+
+        /**
+         * @brief load a xml file specified by a filename and parse it to Return the resultant data object
+         * @param[in] $filename a file path of file
+         * @return Returns a data object containing data extracted from a xml file or NULL if a specified file does not exist
+         **/
+        function loadXmlFile($filename) {
+            if(!file_exists($filename)) return;
+            $buff = FileHandler::readFile($filename);
+
+            $oXmlParser = new XmlParser();
+            return $oXmlParser->parse($buff);
+        }
+
+        /**
+         * @brief parse xml data to extract values from it and construct data object
+         * @param[in] a data buffer containing xml data
+         * @return Returns a resultant data object or NULL in case of error
+         **/
+        function parse($input = '') {
+            // Save the compile starting time for debugging
+            if(__DEBUG__==3) $start = getMicroTime();
+
+            $this->lang = Context::getLangType();
+
+            $this->input = $input?$input:$GLOBALS['HTTP_RAW_POST_DATA'];
+			$this->input = str_replace(array('','
'),array('',''),$this->input);
+
+            // extracts a supported language
+            preg_match_all("/xml:lang=\"([^\"].+)\"/i", $this->input, $matches);
+
+            // extracts the supported lanuage when xml:lang is used
+            if(count($matches[1]) && $supported_lang = array_unique($matches[1])) {
+                // if lang of the first log-in user doesn't exist, apply en by default if exists. Otherwise apply the first lang.
+                if(!in_array($this->lang, $supported_lang)) {
+                    if(in_array('en', $supported_lang)) {
+                        $this->lang = 'en';
+                    } else {
+                        $this->lang = array_shift($supported_lang);
+                    }
+                }
+            // uncheck the language if no specific language is set.
+            } else {
+				$this->lang = '';
+            }
+
+            $this->oParser = xml_parser_create('UTF-8');
+
+            xml_set_object($this->oParser, $this);
+            xml_set_element_handler($this->oParser, "_tagOpen", "_tagClosed");
+            xml_set_character_data_handler($this->oParser, "_tagBody");
+
+            xml_parse($this->oParser, $this->input);
+            xml_parser_free($this->oParser);
+
+            if(!count($this->output)) return;
+
+            $output = array_shift($this->output);
+            // Save compile starting time for debugging
+            if(__DEBUG__==3) $GLOBALS['__xmlparse_elapsed__'] += getMicroTime() - $start;
+
+            return $output;
+        }
+
+
+       /**
+        * @brief start element handler.
+        * @param[in] $parse an instance of parser
+        * @param[in] $node_name a name of node
+        * @param[in] $attrs attributes to be set
+        */
+        function _tagOpen($parser, $node_name, $attrs) {
+            $obj->node_name = strtolower($node_name);
+            $obj->attrs = $this->_arrToObj($attrs);
+
+            array_push($this->output, $obj);
+        }
+
+
+       /**
+        * @brief character data handler
+        *  variable in the last element of this->output
+        * @param[in] $parse an instance of parser
+        * @param[in] $body a data to be added
+        * @remark the first parameter, $parser ought to be remove since it is not used.
+        */
+        function _tagBody($parser, $body) {
+            //if(!trim($body)) return;
+            $this->output[count($this->output)-1]->body .= $body;
+        }
+
+       /**
+        * @brief end element handler
+        * @param[in] $parse an instance of parser
+        * @param[in] $node_name name of xml node
+        */
+        function _tagClosed($parser, $node_name) {
+            $node_name = strtolower($node_name);
+            $cur_obj = array_pop($this->output);
+            $parent_obj = &$this->output[count($this->output)-1];
+            if($this->lang&&$cur_obj->attrs->{'xml:lang'}&&$cur_obj->attrs->{'xml:lang'}!=$this->lang) return;
+            if($this->lang&&$parent_obj->{$node_name}->attrs->{'xml:lang'}&&$parent_obj->{$node_name}->attrs->{'xml:lang'}!=$this->lang) return;
+
+            if(isset($parent_obj->{$node_name})) {
+                $tmp_obj = $parent_obj->{$node_name};
+                if(is_array($tmp_obj)) {
+                    array_push($parent_obj->{$node_name}, $cur_obj);
+                } else {
+                    $parent_obj->{$node_name} = array();
+                    array_push($parent_obj->{$node_name}, $tmp_obj);
+                    array_push($parent_obj->{$node_name}, $cur_obj);
+                }
+            } else {
+                $parent_obj->{$node_name} = $cur_obj;
+            }
+        }
+
+        /**
+        * @brief method to transfer values in an array to a data object       
+        * @param[in] $arr data array 
+        **/
+        function _arrToObj($arr) {
+            if(!count($arr)) return;
+            foreach($arr as $key => $val) {
+                $key = strtolower($key);
+                $output->{$key} = $val;
+            }
+            return $output;
+        }
+    }
+?>
diff --git a/classes/xml/XmlQueryParser.150.class.php b/classes/xml/XmlQueryParser.150.class.php
new file mode 100644
index 000000000..f42920447
--- /dev/null
+++ b/classes/xml/XmlQueryParser.150.class.php
@@ -0,0 +1,82 @@
+<?php
+    /**
+     * @class NewXmlQueryParser
+     * @author NHN (developers@xpressengine.com)
+     * @brief case to parse XE xml query
+     * @version 0.1
+     *
+     * @todo need to support extend query such as subquery, union
+     * @todo include info about column types for parsing user input
+     **/
+
+    if(!defined('__XE_LOADED_XML_CLASS__')){
+        define('__XE_LOADED_XML_CLASS__', 1);
+
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/query/QueryTag.class.php');
+
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/table/TableTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/table/HintTableTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/table/TablesTag.class.php');
+
+	require(_XE_PATH_.'classes/xml/xmlquery/tags/column/ColumnTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/column/SelectColumnTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/column/InsertColumnTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php');
+
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionsTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php');
+
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/group/GroupsTag.class.php');
+
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/NavigationTag.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/IndexTag.class.php');
+	require(_XE_PATH_.'classes/xml/xmlquery/tags/navigation/LimitTag.class.php');
+
+        require(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php');
+	require(_XE_PATH_.'classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php');
+        require(_XE_PATH_.'classes/xml/xmlquery/queryargument/DefaultValue.class.php');
+    }
+
+
+    class XmlQueryParser extends XmlParser {
+
+        function XmlQueryParser(){
+    	}
+
+    	function &getInstance(){
+            static $theInstance = null;
+            if(!isset($theInstance)){
+                    $theInstance = new XmlQueryParser();
+            }
+            return $theInstance;
+    	}
+
+        function parse($query_id, $xml_file, $cache_file) {
+
+            // Read xml file
+            $xml_obj = $this->getXmlFileContent($xml_file);
+
+            // insert, update, delete, select action
+            $action = strtolower($xml_obj->query->attrs->action);
+            if(!$action) return;
+
+            $parser = new QueryParser($xml_obj->query);
+
+            FileHandler::writeFile($cache_file, $parser->toString());
+        }
+
+        function getXmlFileContent($xml_file){
+            $buff = FileHandler::readFile($xml_file);
+            $xml_obj = parent::parse($buff);
+            if(!$xml_obj) return;
+            unset($buff);
+            return $xml_obj;
+        }
+    }
+?>
diff --git a/classes/xml/XmlQueryParser.class.php b/classes/xml/XmlQueryParser.class.php
index 15cccc026..bf6d291fd 100644
--- a/classes/xml/XmlQueryParser.class.php
+++ b/classes/xml/XmlQueryParser.class.php
@@ -1,542 +1,542 @@
-<?php
-    /**
-     * @class XmlQueryParser
-     * @author NHN (developers@xpressengine.com)
-     * @brief case to parse XE xml query 
-     * @version 0.1
-     *
-     * @todo need to support extend query such as subquery, union
-     **/
-
-    class XmlQueryParser extends XmlParser {
-
-        var $default_list = array();
-        var $notnull_list = array();
-        var $filter_list = array();
-
-        /**
-         * @brief parse a xml query file and save the result as a new file specified by cache_file
-         * @param[in] $query_id name of query
-         * @param[in] $xml_file file path of a xml query file to be loaded
-         * @param[in] $cache_file file path of a cache file to store resultant php code after parsing xml query
-         * @return Nothing is requred.
-         * @remarks {there should be a way to report an error}
-         **/
-        function parse($query_id, $xml_file, $cache_file) {
-            // query xml 파일을 찾아서 파싱, 결과가 없으면 return
-            $buff = FileHandler::readFile($xml_file);
-            $xml_obj = parent::parse($buff);
-            if(!$xml_obj) return;
-            unset($buff);
-
-            $id_args = explode('.', $query_id);
-            if(count($id_args)==2) {
-                $target = 'modules';
-                $module = $id_args[0];
-                $id = $id_args[1];
-            } elseif(count($id_args)==3) {
-                $target = $id_args[0];
-                if(!in_array($target, array('modules','addons','widgets'))) return;
-                $module = $id_args[1];
-                $id = $id_args[2];
-            }
-
-            // insert, update, delete, select등의 action
-            $action = strtolower($xml_obj->query->attrs->action);
-            if(!$action) return;
-
-            // 테이블 정리 (배열코드로 변환)
-            $tables = $xml_obj->query->tables->table;
-            $output->left_tables = array();
-
-            $left_conditions = array();
-
-            if(!$tables) return;
-            if(!is_array($tables)) $tables = array($tables);
-            foreach($tables as $key => $val) {
-
-                // 테이블과 alias의 이름을 구함
-                $table_name = $val->attrs->name;
-                $alias = $val->attrs->alias;
-                if(!$alias) $alias = $table_name;
-
-                $output->tables[$alias] = $table_name;
-
-                if(in_array($val->attrs->type,array('left join','left outer join','right join','right outer join')) && count($val->conditions)){
-                    $output->left_tables[$alias] =  $val->attrs->type;
-                    $left_conditions[$alias] = $val->conditions;
-                }
-
-                // 테이블을 찾아서 컬럼의 속성을 구함
-                $table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);
-                if(!file_exists($table_file)) {
-                    $searched_list = FileHandler::readDir(_XE_PATH_.'modules');
-                    $searched_count = count($searched_list);
-                    for($i=0;$i<$searched_count;$i++) {
-                        $table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $searched_list[$i], $table_name);
-                        if(file_exists($table_file)) break;
-                    }
-                }
-
-                if(file_exists($table_file)) {
-                    $table_xml = FileHandler::readFile($table_file);
-                    $table_obj = parent::parse($table_xml);
-                    if($table_obj->table) {
-                        if(isset($table_obj->table->column) && !is_array($table_obj->table->column))
-                        {
-                            $table_obj->table->column = array($table_obj->table->column);
-                        }
-
-                        foreach($table_obj->table->column as $k => $v) {
-                            $buff .= sprintf('$output->column_type["%s"] = "%s";%s', $v->attrs->name, $v->attrs->type, "\n");
-                        }
-                    }
-                }
-            }
-
-
-            // 컬럼 정리
-            $columns = $xml_obj->query->columns->column;
-            $out = $this->_setColumn($columns);
-            $output->columns = $out->columns;
-
-            $conditions = $xml_obj->query->conditions;
-            $out = $this->_setConditions($conditions);
-            $output->conditions = $out->conditions;
-
-            foreach($output->left_tables as $key => $val){
-                if($left_conditions[$key]){
-                    $out = $this->_setConditions($left_conditions[$key]);
-                    $output->left_conditions[$key] = $out->conditions;
-                }
-            }
-
-            $group_list = $xml_obj->query->groups->group;
-            $out = $this->_setGroup($group_list);
-            $output->groups = $out->groups;
-
-            // 네비게이션 정리
-            $out = $this->_setNavigation($xml_obj);
-            $output->order = $out->order;
-            $output->list_count = $out->list_count;
-            $output->page_count = $out->page_count;
-            $output->page = $out->page;
-
-            $column_count = count($output->columns);
-            $condition_count = count($output->conditions);
-
-            $buff .= '$output->tables = array( ';
-            foreach($output->tables as $key => $val) {
-                if(!array_key_exists($key,$output->left_tables)){
-                    $buff .= sprintf('"%s"=>"%s",', $key, $val);
-                }
-            }
-            $buff .= ' );'."\n";
-
-            // php script 생성
-            $buff .= '$output->_tables = array( ';
-            foreach($output->tables as $key => $val) {
-                $buff .= sprintf('"%s"=>"%s",', $key, $val);
-            }
-            $buff .= ' );'."\n";
-
-            if(count($output->left_tables)){
-                $buff .= '$output->left_tables = array( ';
-                foreach($output->left_tables as $key => $val) {
-                    $buff .= sprintf('"%s"=>"%s",', $key, $val);
-                }
-                $buff .= ' );'."\n";
-            }
-
-            // column 정리
-            if($column_count) {
-                $buff .= '$output->columns = array ( ';
-                $buff .= $this->_getColumn($output->columns);
-                $buff .= ' );'."\n";
-            }
-
-            // conditions 정리
-            if($condition_count) {
-                $buff .= '$output->conditions = array ( ';
-                $buff .= $this->_getConditions($output->conditions);
-                $buff .= ' );'."\n";
-            }
-
-            // conditions 정리
-            if(count($output->left_conditions)) {
-                $buff .= '$output->left_conditions = array ( ';
-                foreach($output->left_conditions as $key => $val){
-                    $buff .= "'{$key}' => array ( ";
-                    $buff .= $this->_getConditions($val);
-                    $buff .= "),\n";
-                }
-                $buff .= ' );'."\n";
-            }
-
-			// args 변수 확인
-			$arg_list = $this->getArguments();
-			if($arg_list)
-			{
-				foreach($arg_list as $arg)
-				{
-					$pre_buff .= 'if(is_object($args->'.$arg.')){ $args->'.$arg.' = array_values(get_method_vars($args->'.$arg.')); }'. "\n";
-					$pre_buff .= 'if(is_array($args->'.$arg.') && count($args->'.$arg.')==0){ unset($args->'.$arg.'); };'."\n";
-				}
-			}
-
-            // order 정리
-            if($output->order) {
-                $buff .= '$output->order = array(';
-                foreach($output->order as $key => $val) {
-                    $buff .= sprintf('array($args->%s?$args->%s:"%s",in_array($args->%s,array("asc","desc"))?$args->%s:("%s"?"%s":"asc")),', $val->var, $val->var, $val->default, $val->order, $val->order, $val->order, $val->order);
-                }
-                $buff .= ');'."\n";
-            }
-
-            // list_count 정리
-            if($output->list_count) {
-                $buff .= sprintf('$output->list_count = array("var"=>"%s", "value"=>$args->%s?$args->%s:"%s");%s', $output->list_count->var, $output->list_count->var, $output->list_count->var, $output->list_count->default,"\n");
-            }
-
-            // page_count 정리
-            if($output->page_count) {
-                $buff .= sprintf('$output->page_count = array("var"=>"%s", "value"=>$args->%s?$args->%s:"%s");%s', $output->page_count->var, $output->page_count->var, $output->page_count->var, $output->list_count->default,"\n");
-            }
-
-            // page 정리
-            if($output->page) {
-                $buff .= sprintf('$output->page = array("var"=>"%s", "value"=>$args->%s?$args->%s:"%s");%s', $output->page->var, $output->page->var, $output->page->var, $output->list->default,"\n");
-            }
-
-            // group by 정리
-            if($output->groups) {
-                $buff .= sprintf('$output->groups = array("%s");%s', implode('","',$output->groups),"\n");
-            }
-
-            // minlength check
-            if(count($minlength_list)) {
-                foreach($minlength_list as $key => $val) {
-                    $pre_buff .= 'if($args->'.$key.'&&strlen($args->'.$key.')<'.$val.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'.$key.'?$lang->'.$key.':\''.$key.'\'));'."\n";
-                }
-            }
-
-            // maxlength check
-            if(count($maxlength_list)) {
-                foreach($maxlength_list as $key => $val) {
-                    $pre_buff .= 'if($args->'.$key.'&&strlen($args->'.$key.')>'.$val.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'.$key.'?$lang->'.$key.':\''.$key.'\'));'."\n";
-                }
-            }
-
-            // filter check
-            if(count($this->filter_list)) {
-                foreach($this->filter_list as $key => $val) {
-                    $pre_buff .= sprintf('if(isset($args->%s)) { unset($_output); $_output = $this->checkFilter("%s",$args->%s,"%s"); if(!$_output->toBool()) return $_output; } %s',$val->var, $val->var,$val->var,$val->filter,"\n");
-                }
-            }
-
-            // default check
-            if(count($this->default_list)) {
-                foreach($this->default_list as $key => $val) {
-                    $pre_buff .= 'if(!isset($args->'.$key.')) $args->'.$key.' = '.$val.';'."\n";
-                }
-            }
-
-            // not null check
-            if(count($this->notnull_list)) {
-                foreach($this->notnull_list as $key => $val) {
-                    $pre_buff .= 'if(!isset($args->'.$val.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'.$val.'?$lang->'.$val.':\''.$val.'\'));'."\n";
-                }
-            }
-
-            $buff = "<?php if(!defined('__ZBXE__')) exit();\n"
-                  . sprintf('$output->query_id = "%s";%s', $query_id, "\n")
-                  . sprintf('$output->action = "%s";%s', $action, "\n")
-                  . $pre_buff
-                  . $buff
-                  . 'return $output; ?>';
-
-            // 저장
-            FileHandler::writeFile($cache_file, $buff);
-        }
-
-        /**
-        * @brief transfer given column information to object->columns
-        * @param[in] column information
-        * @result Returns $object 
-        */
-
-        function _setColumn($columns){
-            if(!$columns) {
-                $output->column[] = array("*" => "*");
-            } else {
-                if(!is_array($columns)) $columns = array($columns);
-                foreach($columns as $key => $val) {
-                    $name = $val->attrs->name;
-                    /*
-                    if(strpos('.',$name)===false && count($output->tables)==1) {
-                        $tmp = array_values($output->tables);
-                        $name = sprintf('%s.%s', $tmp[0], $val->attrs->name);
-                    }
-                    */
-
-                    $output->columns[] = array(
-                        "name" => $name,
-                        "var" => $val->attrs->var,
-                        "default" => $val->attrs->default,
-                        "notnull" => $val->attrs->notnull,
-                        "filter" => $val->attrs->filter,
-                        "minlength" => $val->attrs->minlength,
-                        "maxlength" => $val->attrs->maxlength,
-                        "alias" => $val->attrs->alias,
-                        "click_count" => $val->attrs->click_count,
-                    );
-                }
-            }
-            return $output;
-        }
-
-        /**
-        * @brief transfer condition information to $object->conditions
-        * @param[in] SQL condition information
-        * @result Returns $output
-        */
-        function _setConditions($conditions){
-            // 조건절 정리
-
-            $condition = $conditions->condition;
-            if($condition) {
-                $obj->condition = $condition;
-                unset($condition);
-                $condition = array($obj);
-            }
-            $condition_group = $conditions->group;
-            if($condition_group && !is_array($condition_group)) $condition_group = array($condition_group);
-
-            if($condition && $condition_group) $cond = array_merge($condition, $condition_group);
-            elseif($condition_group) $cond = $condition_group;
-            else $cond = $condition;
-
-            if($cond) {
-                foreach($cond as $key => $val) {
-                    unset($cond_output);
-
-                    if($val->attrs->pipe) $cond_output->pipe = $val->attrs->pipe;
-                    else $cond_output->pipe = null;
-
-                    if(!$val->condition) continue;
-                    if(!is_array($val->condition)) $val->condition = array($val->condition);
-
-                    foreach($val->condition as $k => $v) {
-                        $obj = $v->attrs;
-                        if(!$obj->alias) $obj->alias = $obj->column;
-                        $cond_output->condition[] = $obj;
-                    }
-
-                    $output->conditions[] = $cond_output;
-                }
-            }
-            return $output;
-        }
-
-        /**
-        * @brief transfer condition information to $object->groups
-        * @param[in] SQL group information
-        * @result Returns $output
-        */
-        function _setGroup($group_list){
-            // group 정리
-
-            if($group_list) {
-                if(!is_array($group_list)) $group_list = array($group_list);
-                for($i=0;$i<count($group_list);$i++) {
-                    $group = $group_list[$i];
-                    $column = trim($group->attrs->column);
-                    if(!$column) continue;
-                    $group_column_list[] = $column;
-                }
-                if(count($group_column_list)) $output->groups = $group_column_list;
-            }
-            return $output;
-        }
-
-
-        /**
-        * @brief transfer pagnation information to $output
-        * @param[in] $xml_obj xml object containing Navigation information
-        * @result Returns $output
-        */
-        function _setNavigation($xml_obj){
-            $navigation = $xml_obj->query->navigation;
-            if($navigation) {
-                $order = $navigation->index;
-                if($order) {
-                    if(!is_array($order)) $order = array($order);
-                    foreach($order as $order_info) {
-                        $output->order[] = $order_info->attrs;
-                    }
-                }
-
-                $list_count = $navigation->list_count->attrs;
-                $output->list_count = $list_count;
-
-                $page_count = $navigation->page_count->attrs;
-                $output->page_count = $page_count;
-
-                $page = $navigation->page->attrs;
-                $output->page = $page ;
-            }
-            return $output;
-        }
-
-        /**
-        * @brief retrieve column information from $output->colums to generate corresponding php code 
-        * @param[in] $column 
-        * @remarks the name of this method is misleading.
-        * @result Returns string buffer containing php code
-        */
-        function _getColumn($columns){
-            $buff = '';
-			$str = '';
-			$print_vars = array();
-
-            foreach($columns as $key => $val) {
-				$str = 'array("name"=>"%s","alias"=>"%s"';
-				$print_vars = array();
-				$print_vars[] = $val['name'];
-				$print_vars[] = $val['alias'];
-
-                $val['default'] = $this->getDefault($val['name'], $val['default']);
-                if($val['var'] && strpos($val['var'],'.')===false) {
-
-                    if($val['default']){
-						$str .= ',"value"=>$args->%s?$args->%s:%s'; 
-						$print_vars[] = $val['var'];
-						$print_vars[] = $val['var'];
-						$print_vars[] = $val['default'];
-					}else{
-						$str .= ',"value"=>$args->%s'; 
-						$print_vars[] = $val['var'];
-					}
-
-                } else {
-                    if($val['default']){
-						$str .= ',"value"=>%s'; 
-						$print_vars[] = $val['default'];
-					}
-                }
-
-				if($val['click_count']){
-					$str .= ',"click_count"=>$args->%s';
-					$print_vars[] = $val['click_count'];
-				}
-
-				$str .= '),%s';
-				$print_vars[] = "\n";
-
-				$buff .= vsprintf($str, $print_vars);
-            }
-            return $buff;
-        }
-
-        /**
-        * @brief retrieve condition information from $output->condition to generate corresponding php code 
-        * @param[in] $conditions array containing Query conditions
-        * @remarks the name of this method is misleading.
-        * @return Returns string buffer containing php code
-        */
-        function _getConditions($conditions){
-            $buff = '';
-            foreach($conditions as $key => $val) {
-                $buff .= sprintf('array("pipe"=>"%s",%s"condition"=>array(', $val->pipe,"\n");
-                foreach($val->condition as $k => $v) {
-                    $v->default = $this->getDefault($v->column, $v->default);
-                    if($v->var) {
-                        if(strpos($v->var,".")===false) {
-                            if($v->default) $this->default_list[$v->var] = $v->default;
-                            if($v->filter) $this->filter_list[] = $v;
-                            if($v->notnull) $this->notnull_list[] = $v->var;
-                            if($v->default) $buff .= sprintf('array("column"=>"%s", "value"=>$args->%s?$args->%s:%s,"pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->var, $v->var, $v->default, $v->pipe, $v->operation, "\n");
-                            else $buff .= sprintf('array("column"=>"%s", "value"=>$args->%s,"pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->var, $v->pipe, $v->operation, "\n");
-
-							$this->addArguments($v->var);
-                        } else {
-                            $buff .= sprintf('array("column"=>"%s", "value"=>"%s","pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->var, $v->pipe, $v->operation, "\n");
-                        }
-                    } else {
-                        if($v->default) $buff .= sprintf('array("column"=>"%s", "value"=>%s,"pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->default ,$v->pipe, $v->operation,"\n");
-                        else $buff .= sprintf('array("column"=>"%s", "pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->pipe, $v->operation,"\n");
-                    }
-                }
-                $buff .= ')),'."\n";
-            }
-            return $buff;
-        }
-
-		function addArguments($args_name)
-		{
-			$this->args[] = $args_name;
-		}
-		
-		function getArguments()
-		{
-			return $this->args;
-		}
-
-        /**
-        * @brief returns predefined default values correspoding to given parameters 
-        * @param[in] $name 
-        * @param[in] $value
-        * @return Returns a default value for specified field
-        */
-        function getDefault($name, $value) {
-            $db_info = Context::getDBInfo ();
-            if(!isset($value)) return;
-            $str_pos = strpos($value, '(');
-            if($str_pos===false) return '"'.$value.'"';
-
-            $func_name = substr($value, 0, $str_pos);
-            $args = substr($value, $str_pos+1, strlen($value)-1);
-
-            switch($func_name) {
-                case 'ipaddress' :
-                        $val = '$_SERVER[\'REMOTE_ADDR\']';
-                    break;
-                case 'unixtime' :
-                        $val = 'time()';
-                    break;
-                case 'curdate' :
-                        $val = 'date("YmdHis")';
-                    break;
-                case 'sequence' :
-                        $val = '$this->getNextSequence()';
-                    break;
-                case 'plus' :
-                        $args = abs($args);
-                        if ($db_info->db_type == 'cubrid') {
-                            $val = sprintf ('"\\"%s\\"+%d"', $name, $args);
-                        } else {
-                            $val = sprintf('"%s+%d"', $name, $args);
-                        }
-                    break;
-                case 'minus' :
-                        $args = abs($args);
-                        if ($db_info->db_type == 'cubrid') {
-                            $val = sprintf ('"\\"%s\\"-%d"', $name, $args);
-                        } else {
-                            $val = sprintf('"%s-%d"', $name, $args);
-                        }
-                        break;
-                case 'multiply' :
-						$args = intval($args);
-                        if ($db_info->db_type == 'cubrid') {
-                            $val = sprintf ('"\\"%s\\"*%d"', $name, $args);
-                        } else {
-                            $val = sprintf('"%s*%d"', $name, $args);
-                        }
-                    break;
-            }
-
-            return $val;
-        }
-    }
-?>
+<?php
+    /**
+     * @class XmlQueryParser
+     * @author NHN (developers@xpressengine.com)
+     * @brief case to parse XE xml query 
+     * @version 0.1
+     *
+     * @todo need to support extend query such as subquery, union
+     **/
+
+    class XmlQueryParser extends XmlParser {
+
+        var $default_list = array();
+        var $notnull_list = array();
+        var $filter_list = array();
+
+        /**
+         * @brief parse a xml query file and save the result as a new file specified by cache_file
+         * @param[in] $query_id name of query
+         * @param[in] $xml_file file path of a xml query file to be loaded
+         * @param[in] $cache_file file path of a cache file to store resultant php code after parsing xml query
+         * @return Nothing is requred.
+         * @remarks {there should be a way to report an error}
+         **/
+        function parse($query_id, $xml_file, $cache_file) {
+            // query xml 파일을 찾아서 파싱, 결과가 없으면 return
+            $buff = FileHandler::readFile($xml_file);
+            $xml_obj = parent::parse($buff);
+            if(!$xml_obj) return;
+            unset($buff);
+
+            $id_args = explode('.', $query_id);
+            if(count($id_args)==2) {
+                $target = 'modules';
+                $module = $id_args[0];
+                $id = $id_args[1];
+            } elseif(count($id_args)==3) {
+                $target = $id_args[0];
+                if(!in_array($target, array('modules','addons','widgets'))) return;
+                $module = $id_args[1];
+                $id = $id_args[2];
+            }
+
+            // insert, update, delete, select등의 action
+            $action = strtolower($xml_obj->query->attrs->action);
+            if(!$action) return;
+
+            // 테이블 정리 (배열코드로 변환)
+            $tables = $xml_obj->query->tables->table;
+            $output->left_tables = array();
+
+            $left_conditions = array();
+
+            if(!$tables) return;
+            if(!is_array($tables)) $tables = array($tables);
+            foreach($tables as $key => $val) {
+
+                // 테이블과 alias의 이름을 구함
+                $table_name = $val->attrs->name;
+                $alias = $val->attrs->alias;
+                if(!$alias) $alias = $table_name;
+
+                $output->tables[$alias] = $table_name;
+
+                if(in_array($val->attrs->type,array('left join','left outer join','right join','right outer join')) && count($val->conditions)){
+                    $output->left_tables[$alias] =  $val->attrs->type;
+                    $left_conditions[$alias] = $val->conditions;
+                }
+
+                // 테이블을 찾아서 컬럼의 속성을 구함
+                $table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);
+                if(!file_exists($table_file)) {
+                    $searched_list = FileHandler::readDir(_XE_PATH_.'modules');
+                    $searched_count = count($searched_list);
+                    for($i=0;$i<$searched_count;$i++) {
+                        $table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $searched_list[$i], $table_name);
+                        if(file_exists($table_file)) break;
+                    }
+                }
+
+                if(file_exists($table_file)) {
+                    $table_xml = FileHandler::readFile($table_file);
+                    $table_obj = parent::parse($table_xml);
+                    if($table_obj->table) {
+                        if(isset($table_obj->table->column) && !is_array($table_obj->table->column))
+                        {
+                            $table_obj->table->column = array($table_obj->table->column);
+                        }
+
+                        foreach($table_obj->table->column as $k => $v) {
+                            $buff .= sprintf('$output->column_type["%s"] = "%s";%s', $v->attrs->name, $v->attrs->type, "\n");
+                        }
+                    }
+                }
+            }
+
+
+            // 컬럼 정리
+            $columns = $xml_obj->query->columns->column;
+            $out = $this->_setColumn($columns);
+            $output->columns = $out->columns;
+
+            $conditions = $xml_obj->query->conditions;
+            $out = $this->_setConditions($conditions);
+            $output->conditions = $out->conditions;
+
+            foreach($output->left_tables as $key => $val){
+                if($left_conditions[$key]){
+                    $out = $this->_setConditions($left_conditions[$key]);
+                    $output->left_conditions[$key] = $out->conditions;
+                }
+            }
+
+            $group_list = $xml_obj->query->groups->group;
+            $out = $this->_setGroup($group_list);
+            $output->groups = $out->groups;
+
+            // 네비게이션 정리
+            $out = $this->_setNavigation($xml_obj);
+            $output->order = $out->order;
+            $output->list_count = $out->list_count;
+            $output->page_count = $out->page_count;
+            $output->page = $out->page;
+
+            $column_count = count($output->columns);
+            $condition_count = count($output->conditions);
+
+            $buff .= '$output->tables = array( ';
+            foreach($output->tables as $key => $val) {
+                if(!array_key_exists($key,$output->left_tables)){
+                    $buff .= sprintf('"%s"=>"%s",', $key, $val);
+                }
+            }
+            $buff .= ' );'."\n";
+
+            // php script 생성
+            $buff .= '$output->_tables = array( ';
+            foreach($output->tables as $key => $val) {
+                $buff .= sprintf('"%s"=>"%s",', $key, $val);
+            }
+            $buff .= ' );'."\n";
+
+            if(count($output->left_tables)){
+                $buff .= '$output->left_tables = array( ';
+                foreach($output->left_tables as $key => $val) {
+                    $buff .= sprintf('"%s"=>"%s",', $key, $val);
+                }
+                $buff .= ' );'."\n";
+            }
+
+            // column 정리
+            if($column_count) {
+                $buff .= '$output->columns = array ( ';
+                $buff .= $this->_getColumn($output->columns);
+                $buff .= ' );'."\n";
+            }
+
+            // conditions 정리
+            if($condition_count) {
+                $buff .= '$output->conditions = array ( ';
+                $buff .= $this->_getConditions($output->conditions);
+                $buff .= ' );'."\n";
+            }
+
+            // conditions 정리
+            if(count($output->left_conditions)) {
+                $buff .= '$output->left_conditions = array ( ';
+                foreach($output->left_conditions as $key => $val){
+                    $buff .= "'{$key}' => array ( ";
+                    $buff .= $this->_getConditions($val);
+                    $buff .= "),\n";
+                }
+                $buff .= ' );'."\n";
+            }
+
+			// args 변수 확인
+			$arg_list = $this->getArguments();
+			if($arg_list)
+			{
+				foreach($arg_list as $arg)
+				{
+					$pre_buff .= 'if(is_object($args->'.$arg.')){ $args->'.$arg.' = array_values(get_method_vars($args->'.$arg.')); }'. "\n";
+					$pre_buff .= 'if(is_array($args->'.$arg.') && count($args->'.$arg.')==0){ unset($args->'.$arg.'); };'."\n";
+				}
+			}
+
+            // order 정리
+            if($output->order) {
+                $buff .= '$output->order = array(';
+                foreach($output->order as $key => $val) {
+                    $buff .= sprintf('array($args->%s?$args->%s:"%s",in_array($args->%s,array("asc","desc"))?$args->%s:("%s"?"%s":"asc")),', $val->var, $val->var, $val->default, $val->order, $val->order, $val->order, $val->order);
+                }
+                $buff .= ');'."\n";
+            }
+
+            // list_count 정리
+            if($output->list_count) {
+                $buff .= sprintf('$output->list_count = array("var"=>"%s", "value"=>$args->%s?$args->%s:"%s");%s', $output->list_count->var, $output->list_count->var, $output->list_count->var, $output->list_count->default,"\n");
+            }
+
+            // page_count 정리
+            if($output->page_count) {
+                $buff .= sprintf('$output->page_count = array("var"=>"%s", "value"=>$args->%s?$args->%s:"%s");%s', $output->page_count->var, $output->page_count->var, $output->page_count->var, $output->page_count->default,"\n");
+            }
+
+            // page 정리
+            if($output->page) {
+                $buff .= sprintf('$output->page = array("var"=>"%s", "value"=>$args->%s?$args->%s:"%s");%s', $output->page->var, $output->page->var, $output->page->var, $output->list->default,"\n");
+            }
+
+            // group by 정리
+            if($output->groups) {
+                $buff .= sprintf('$output->groups = array("%s");%s', implode('","',$output->groups),"\n");
+            }
+
+            // minlength check
+            if(count($minlength_list)) {
+                foreach($minlength_list as $key => $val) {
+                    $pre_buff .= 'if($args->'.$key.'&&strlen($args->'.$key.')<'.$val.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'.$key.'?$lang->'.$key.':\''.$key.'\'));'."\n";
+                }
+            }
+
+            // maxlength check
+            if(count($maxlength_list)) {
+                foreach($maxlength_list as $key => $val) {
+                    $pre_buff .= 'if($args->'.$key.'&&strlen($args->'.$key.')>'.$val.') return new Object(-1, sprintf($lang->filter->outofrange, $lang->'.$key.'?$lang->'.$key.':\''.$key.'\'));'."\n";
+                }
+            }
+
+            // filter check
+            if(count($this->filter_list)) {
+                foreach($this->filter_list as $key => $val) {
+                    $pre_buff .= sprintf('if(isset($args->%s)) { unset($_output); $_output = $this->checkFilter("%s",$args->%s,"%s"); if(!$_output->toBool()) return $_output; } %s',$val->var, $val->var,$val->var,$val->filter,"\n");
+                }
+            }
+
+            // default check
+            if(count($this->default_list)) {
+                foreach($this->default_list as $key => $val) {
+                    $pre_buff .= 'if(!isset($args->'.$key.')) $args->'.$key.' = '.$val.';'."\n";
+                }
+            }
+
+            // not null check
+            if(count($this->notnull_list)) {
+                foreach($this->notnull_list as $key => $val) {
+                    $pre_buff .= 'if(!isset($args->'.$val.')) return new Object(-1, sprintf($lang->filter->isnull, $lang->'.$val.'?$lang->'.$val.':\''.$val.'\'));'."\n";
+                }
+            }
+
+            $buff = "<?php if(!defined('__ZBXE__')) exit();\n"
+                  . sprintf('$output->query_id = "%s";%s', $query_id, "\n")
+                  . sprintf('$output->action = "%s";%s', $action, "\n")
+                  . $pre_buff
+                  . $buff
+                  . 'return $output; ?>';
+
+            // 저장
+            FileHandler::writeFile($cache_file, $buff);
+        }
+
+        /**
+        * @brief transfer given column information to object->columns
+        * @param[in] column information
+        * @result Returns $object 
+        */
+
+        function _setColumn($columns){
+            if(!$columns) {
+                $output->column[] = array("*" => "*");
+            } else {
+                if(!is_array($columns)) $columns = array($columns);
+                foreach($columns as $key => $val) {
+                    $name = $val->attrs->name;
+                    /*
+                    if(strpos('.',$name)===false && count($output->tables)==1) {
+                        $tmp = array_values($output->tables);
+                        $name = sprintf('%s.%s', $tmp[0], $val->attrs->name);
+                    }
+                    */
+
+                    $output->columns[] = array(
+                        "name" => $name,
+                        "var" => $val->attrs->var,
+                        "default" => $val->attrs->default,
+                        "notnull" => $val->attrs->notnull,
+                        "filter" => $val->attrs->filter,
+                        "minlength" => $val->attrs->minlength,
+                        "maxlength" => $val->attrs->maxlength,
+                        "alias" => $val->attrs->alias,
+                        "click_count" => $val->attrs->click_count,
+                    );
+                }
+            }
+            return $output;
+        }
+
+        /**
+        * @brief transfer condition information to $object->conditions
+        * @param[in] SQL condition information
+        * @result Returns $output
+        */
+        function _setConditions($conditions){
+            // 조건절 정리
+
+            $condition = $conditions->condition;
+            if($condition) {
+                $obj->condition = $condition;
+                unset($condition);
+                $condition = array($obj);
+            }
+            $condition_group = $conditions->group;
+            if($condition_group && !is_array($condition_group)) $condition_group = array($condition_group);
+
+            if($condition && $condition_group) $cond = array_merge($condition, $condition_group);
+            elseif($condition_group) $cond = $condition_group;
+            else $cond = $condition;
+
+            if($cond) {
+                foreach($cond as $key => $val) {
+                    unset($cond_output);
+
+                    if($val->attrs->pipe) $cond_output->pipe = $val->attrs->pipe;
+                    else $cond_output->pipe = null;
+
+                    if(!$val->condition) continue;
+                    if(!is_array($val->condition)) $val->condition = array($val->condition);
+
+                    foreach($val->condition as $k => $v) {
+                        $obj = $v->attrs;
+                        if(!$obj->alias) $obj->alias = $obj->column;
+                        $cond_output->condition[] = $obj;
+                    }
+
+                    $output->conditions[] = $cond_output;
+                }
+            }
+            return $output;
+        }
+
+        /**
+        * @brief transfer condition information to $object->groups
+        * @param[in] SQL group information
+        * @result Returns $output
+        */
+        function _setGroup($group_list){
+            // group 정리
+
+            if($group_list) {
+                if(!is_array($group_list)) $group_list = array($group_list);
+                for($i=0;$i<count($group_list);$i++) {
+                    $group = $group_list[$i];
+                    $column = trim($group->attrs->column);
+                    if(!$column) continue;
+                    $group_column_list[] = $column;
+                }
+                if(count($group_column_list)) $output->groups = $group_column_list;
+            }
+            return $output;
+        }
+
+
+        /**
+        * @brief transfer pagnation information to $output
+        * @param[in] $xml_obj xml object containing Navigation information
+        * @result Returns $output
+        */
+        function _setNavigation($xml_obj){
+            $navigation = $xml_obj->query->navigation;
+            if($navigation) {
+                $order = $navigation->index;
+                if($order) {
+                    if(!is_array($order)) $order = array($order);
+                    foreach($order as $order_info) {
+                        $output->order[] = $order_info->attrs;
+                    }
+                }
+
+                $list_count = $navigation->list_count->attrs;
+                $output->list_count = $list_count;
+
+                $page_count = $navigation->page_count->attrs;
+                $output->page_count = $page_count;
+
+                $page = $navigation->page->attrs;
+                $output->page = $page ;
+            }
+            return $output;
+        }
+
+        /**
+        * @brief retrieve column information from $output->colums to generate corresponding php code 
+        * @param[in] $column 
+        * @remarks the name of this method is misleading.
+        * @result Returns string buffer containing php code
+        */
+        function _getColumn($columns){
+            $buff = '';
+			$str = '';
+			$print_vars = array();
+
+            foreach($columns as $key => $val) {
+				$str = 'array("name"=>"%s","alias"=>"%s"';
+				$print_vars = array();
+				$print_vars[] = $val['name'];
+				$print_vars[] = $val['alias'];
+
+                $val['default'] = $this->getDefault($val['name'], $val['default']);
+                if($val['var'] && strpos($val['var'],'.')===false) {
+
+                    if($val['default']){
+						$str .= ',"value"=>$args->%s?$args->%s:%s'; 
+						$print_vars[] = $val['var'];
+						$print_vars[] = $val['var'];
+						$print_vars[] = $val['default'];
+					}else{
+						$str .= ',"value"=>$args->%s'; 
+						$print_vars[] = $val['var'];
+					}
+
+                } else {
+                    if($val['default']){
+						$str .= ',"value"=>%s'; 
+						$print_vars[] = $val['default'];
+					}
+                }
+
+				if($val['click_count']){
+					$str .= ',"click_count"=>$args->%s';
+					$print_vars[] = $val['click_count'];
+				}
+
+				$str .= '),%s';
+				$print_vars[] = "\n";
+
+				$buff .= vsprintf($str, $print_vars);
+            }
+            return $buff;
+        }
+
+        /**
+        * @brief retrieve condition information from $output->condition to generate corresponding php code 
+        * @param[in] $conditions array containing Query conditions
+        * @remarks the name of this method is misleading.
+        * @return Returns string buffer containing php code
+        */
+        function _getConditions($conditions){
+            $buff = '';
+            foreach($conditions as $key => $val) {
+                $buff .= sprintf('array("pipe"=>"%s",%s"condition"=>array(', $val->pipe,"\n");
+                foreach($val->condition as $k => $v) {
+                    $v->default = $this->getDefault($v->column, $v->default);
+                    if($v->var) {
+                        if(strpos($v->var,".")===false) {
+                            if($v->default) $this->default_list[$v->var] = $v->default;
+                            if($v->filter) $this->filter_list[] = $v;
+                            if($v->notnull) $this->notnull_list[] = $v->var;
+                            if($v->default) $buff .= sprintf('array("column"=>"%s", "value"=>$args->%s?$args->%s:%s,"pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->var, $v->var, $v->default, $v->pipe, $v->operation, "\n");
+                            else $buff .= sprintf('array("column"=>"%s", "value"=>$args->%s,"pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->var, $v->pipe, $v->operation, "\n");
+
+							$this->addArguments($v->var);
+                        } else {
+                            $buff .= sprintf('array("column"=>"%s", "value"=>"%s","pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->var, $v->pipe, $v->operation, "\n");
+                        }
+                    } else {
+                        if($v->default) $buff .= sprintf('array("column"=>"%s", "value"=>%s,"pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->default ,$v->pipe, $v->operation,"\n");
+                        else $buff .= sprintf('array("column"=>"%s", "pipe"=>"%s","operation"=>"%s",),%s', $v->column, $v->pipe, $v->operation,"\n");
+                    }
+                }
+                $buff .= ')),'."\n";
+            }
+            return $buff;
+        }
+
+		function addArguments($args_name)
+		{
+			$this->args[] = $args_name;
+		}
+		
+		function getArguments()
+		{
+			return $this->args;
+		}
+
+        /**
+        * @brief returns predefined default values correspoding to given parameters 
+        * @param[in] $name 
+        * @param[in] $value
+        * @return Returns a default value for specified field
+        */
+        function getDefault($name, $value) {
+            $db_info = Context::getDBInfo ();
+            if(!isset($value)) return;
+            $str_pos = strpos($value, '(');
+            if($str_pos===false) return '"'.$value.'"';
+
+            $func_name = substr($value, 0, $str_pos);
+            $args = substr($value, $str_pos+1, strlen($value)-1);
+
+            switch($func_name) {
+                case 'ipaddress' :
+                        $val = '$_SERVER[\'REMOTE_ADDR\']';
+                    break;
+                case 'unixtime' :
+                        $val = 'time()';
+                    break;
+                case 'curdate' :
+                        $val = 'date("YmdHis")';
+                    break;
+                case 'sequence' :
+                        $val = '$this->getNextSequence()';
+                    break;
+                case 'plus' :
+                        $args = abs($args);
+                        if ($db_info->db_type == 'cubrid') {
+                            $val = sprintf ('"\\"%s\\"+%d"', $name, $args);
+                        } else {
+                            $val = sprintf('"%s+%d"', $name, $args);
+                        }
+                    break;
+                case 'minus' :
+                        $args = abs($args);
+                        if ($db_info->db_type == 'cubrid') {
+                            $val = sprintf ('"\\"%s\\"-%d"', $name, $args);
+                        } else {
+                            $val = sprintf('"%s-%d"', $name, $args);
+                        }
+                        break;
+                case 'multiply' :
+						$args = intval($args);
+                        if ($db_info->db_type == 'cubrid') {
+                            $val = sprintf ('"\\"%s\\"*%d"', $name, $args);
+                        } else {
+                            $val = sprintf('"%s*%d"', $name, $args);
+                        }
+                    break;
+            }
+
+            return $val;
+        }
+    }
+?>
diff --git a/classes/xml/xmlquery/DBParser.class.php b/classes/xml/xmlquery/DBParser.class.php
new file mode 100644
index 000000000..54591f3a2
--- /dev/null
+++ b/classes/xml/xmlquery/DBParser.class.php
@@ -0,0 +1,110 @@
+<?php
+	class DBParser {
+		var $escape_char_left;
+		var $escape_char_right;
+		var $table_prefix;
+		
+		function DBParser($escape_char_left,  $escape_char_right = "", $table_prefix = "xe_"){
+			$this->escape_char_left = $escape_char_left;
+			if ($escape_char_right !== "")$this->escape_char_right = $escape_char_right;
+			else $this->escape_char_right = $escape_char_left;
+			$this->table_prefix = $table_prefix;
+		}
+		
+		function getEscapeChar($leftOrRight){
+			if ($leftOrRight === 'left')return $this->escape_char_left;
+			else return $this->escape_char_right;
+		}
+		
+		function escape($name){
+			return $this->escape_char_left . $name . $this->escape_char_right;
+		}		
+		
+		function escapeString($name){
+			return "'".$this->escapeStringValue($name)."'";
+		}
+		
+		function escapeStringValue($value){
+			if($value == "*")	return $value;
+			if (is_string($value))	return $value = str_replace("'","''",$value);
+			return $value;
+		}
+		
+		function parseTableName($name){
+			return $this->table_prefix . $name;
+		}
+		
+		function parseColumnName($name){
+			return $this->escapeColumn($name);
+		}
+		
+		function escapeColumn($column_name){
+			if($this->isUnqualifiedColumnName($column_name))
+				return $this->escape($column_name);
+			if($this->isQualifiedColumnName($column_name)){
+				list($table, $column) = explode('.', $column_name);
+				// $table can also be an alias, so the prefix should not be added
+				return $this->escape($table).'.'.$this->escape($column);
+				//return $this->escape($this->parseTableName($table)).'.'.$this->escape($column);
+			}
+		}
+
+		function isUnqualifiedColumnName($column_name){
+			if(strpos($column_name,'.')===false && strpos($column_name,'(')===false) return true;
+			return false;	
+		}
+		
+		function isQualifiedColumnName($column_name){
+			if(strpos($column_name,'.')!==false && strpos($column_name,'(')===false) return true;
+			return false;		
+		}
+
+		function parseExpression($column_name){
+			$functions = preg_split('/([\+\-\*\/\ ])/', $column_name, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+			foreach($functions as $k => $v){
+                $function = &$functions[$k];
+				if(strlen($function)==1) continue; // skip delimiters
+				$pos = strrpos("(", $function);
+				$matches = preg_split('/([a-zA-Z0-9_*]+)/', $function, -1, PREG_SPLIT_DELIM_CAPTURE|PREG_SPLIT_NO_EMPTY);
+				$total_brackets = substr_count($function, "(");
+				$brackets = 0;
+				foreach($matches as $i => $j){
+					$match = &$matches[$i];
+					if($match == '(') {$brackets++; continue;}
+					if(strpos($match,')') !== false) continue;
+					if(in_array($match, array(',', '.'))) continue;
+					if($brackets == $total_brackets){
+						if(!is_numeric($match)) {
+							$match = $this->escapeColumnExpression($match);	
+						}
+					}
+				}
+				$function = implode('', $matches);
+			}	
+			return implode('', $functions);				
+		}
+		
+		function isStar($column_name){
+			if(substr($column_name,-1) == '*') return true;
+			return false;
+		}
+		
+		/*
+		 * Checks to see if expression is an aggregate star function
+		 * like count(*)
+		 */
+		function isStarFunction($column_name){
+			if(strpos($column_name, "(*)")!==false) return true;
+			return false;
+		}
+		
+		function escapeColumnExpression($column_name){
+			if($this->isStar($column_name)) return $column_name;
+			if($this->isStarFunction($column_name)){
+				return $column_name;
+			}
+			return $this->escapeColumn($column_name);			
+		}				
+	}
+	
+	
\ No newline at end of file
diff --git a/classes/xml/xmlquery/QueryParser.class.php b/classes/xml/xmlquery/QueryParser.class.php
new file mode 100644
index 000000000..2f1a3f20c
--- /dev/null
+++ b/classes/xml/xmlquery/QueryParser.class.php
@@ -0,0 +1,65 @@
+<?php
+
+    class QueryParser {
+
+        var $queryTag;
+
+        function QueryParser($query, $isSubQuery = false) {
+            $this->queryTag = new QueryTag($query, $isSubQuery);
+        }
+
+        function getTableInfo($query_id, $table_name) {
+            $column_type = array();
+
+            $id_args = explode('.', $query_id);
+            if (count($id_args) == 2) {
+                $target = 'modules';
+                $module = $id_args[0];
+                $id = $id_args[1];
+            } elseif (count($id_args) == 3) {
+                $target = $id_args[0];
+                if (!in_array($target, array('modules', 'addons', 'widgets')))
+                    return;
+                $module = $id_args[1];
+                $id = $id_args[2];
+            }
+
+            // get column properties from the table
+            $table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $module, $table_name);
+            if (!file_exists($table_file)) {
+                $searched_list = FileHandler::readDir(_XE_PATH_ . 'modules');
+                $searched_count = count($searched_list);
+                for ($i = 0; $i < $searched_count; $i++) {
+                    $table_file = sprintf('%s%s/%s/schemas/%s.xml', _XE_PATH_, 'modules', $searched_list[$i], $table_name);
+                    if (file_exists($table_file))
+                        break;
+                }
+            }
+
+            if (file_exists($table_file)) {
+                $table_xml = FileHandler::readFile($table_file);
+                $xml_parser = new XmlParser();
+                $table_obj = $xml_parser->parse($table_xml);
+                if ($table_obj->table) {
+                    if (isset($table_obj->table->column) && !is_array($table_obj->table->column)) {
+                        $table_obj->table->column = array($table_obj->table->column);
+                    }
+
+                    foreach ($table_obj->table->column as $k => $v) {
+                        $column_type[$v->attrs->name] = $v->attrs->type;
+                    }
+                }
+            }
+
+            return $column_type;
+        }
+
+        function toString() {
+            return "<?php if(!defined('__ZBXE__')) exit();\n"
+            . $this->queryTag->toString()
+            . 'return $query; ?>';
+        }
+
+    }
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/argument/Argument.class.php b/classes/xml/xmlquery/argument/Argument.class.php
new file mode 100644
index 000000000..69d0f2800
--- /dev/null
+++ b/classes/xml/xmlquery/argument/Argument.class.php
@@ -0,0 +1,186 @@
+<?php
+
+	class Argument {
+		var $value;
+		var $name;
+                var $type;
+
+		var $isValid;
+		var $errorMessage;
+
+                var $column_operation;
+
+                var $_value; // Caches escaped and toString value so that the parsing won't happen multiple times;
+
+		function Argument($name, $value){
+                        $this->value = $value;
+			$this->name = $name;
+			$this->isValid = true;
+		}
+
+                function getType(){
+                    if(isset($this->type)) return $this->type;
+                    if(is_string($this->value)) return 'column_name';
+                    return 'number';
+                }
+
+                function setColumnType($value){
+                    $this->type = $value;
+                }
+
+                function setColumnOperation($operation){
+                    $this->column_operation = $operation;
+                }
+
+		function getName(){
+			return $this->name;
+		}
+
+		function getValue(){
+                    if(!isset($this->_value)){
+			$value = $this->getEscapedValue();
+			$this->_value = $this->toString($value);
+                    }
+                    return $this->_value;
+		}
+
+                function getColumnOperation(){
+                    return $this->column_operation;
+                }
+
+                function getEscapedValue(){
+                    return $this->escapeValue($this->value);
+                }
+
+		function getUnescapedValue(){
+                        return $this->value;
+		}
+
+		function toString($value){
+			if(is_array($value)){
+                            if(count($value) === 0) return '';
+                            if(count($value) === 1 && $value[0] === '') return '';
+                            return '('.implode(',', $value).')';
+                        }
+			return $value;
+		}
+
+		function escapeValue($value){
+                        if($this->getType() == 'column_name'){
+				$dbParser = DB::getParser();
+				return $dbParser->parseExpression($value);
+                        }
+                        if(!isset($value)) return null;
+			if(in_array($this->getType(), array('date', 'varchar', 'char','text', 'bigtext'))){
+				if(!is_array($value))
+					$value = $this->_escapeStringValue ($value);
+				else {
+					$total = count($value);
+					for($i = 0; $i < $total; $i++)
+                                            $value[$i] = $this->_escapeStringValue($value[$i]);
+						//$value[$i] = '\''.$value[$i].'\'';
+				}
+			}
+			return $value;
+		}
+
+                function _escapeStringValue($value){
+                    $db = &DB::getInstance();
+                    $value = $db->addQuotes($value);
+                    return '\''.$value.'\'';
+
+                }
+
+		function isValid(){
+			return $this->isValid;
+		}
+
+		function getErrorMessage(){
+			return $this->errorMessage;
+		}
+
+		function ensureDefaultValue($default_value){
+			if(!isset($this->value) || $this->value == '')
+				$this->value = $default_value;
+		}
+
+		function checkFilter($filter_type){
+			if(isset($this->value) && $this->value != ''){
+                                global $lang;
+				$val = $this->value;
+				$key = $this->name;
+                                switch($filter_type) {
+                                            case 'email' :
+                                            case 'email_address' :
+                                                    if(!preg_match('/^[_0-9a-z-]+(\.[_0-9a-z-]+)*@[0-9a-z-]+(\.[0-9a-z-]+)*$/is', $val)) {
+                                                            $this->isValid = false;
+                                                            $this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_email, $lang->{$key} ? $lang->{$key} : $key));
+                                                    }
+                                                    break;
+                                            case 'homepage' :
+                                                    if(!preg_match('/^(http|https)+(:\/\/)+[0-9a-z_-]+\.[^ ]+$/is', $val)) {
+                                                            $this->isValid = false;
+                                                            $this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_homepage, $lang->{$key} ? $lang->{$key} : $key));
+                                                    }
+                                                    break;
+                                            case 'userid' :
+                                            case 'user_id' :
+                                                    if(!preg_match('/^[a-zA-Z]+([_0-9a-zA-Z]+)*$/is', $val)) {
+                                                            $this->isValid = false;
+                                                            $this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_userid, $lang->{$key} ? $lang->{$key} : $key));
+                                                    }
+                                                break;
+                                            case 'number' :
+                                            case 'numbers' :
+                                                                            if(is_array($val)) $val = join(',', $val);
+                                                    if(!preg_match('/^(-?)[0-9]+(,\-?[0-9]+)*$/is', $val)){
+                                                            $this->isValid = false;
+                                                            $this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_number, $lang->{$key} ? $lang->{$key} : $key));
+                                                    }
+                                                break;
+                                            case 'alpha' :
+                                                    if(!preg_match('/^[a-z]+$/is', $val)) {
+                                                            $this->isValid = false;
+                                                            $this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha, $lang->{$key} ? $lang->{$key} : $key));
+                                                    }
+                                                break;
+                                            case 'alpha_number' :
+                                                    if(!preg_match('/^[0-9a-z]+$/is', $val)) {
+                                                            $this->isValid = false;
+                                                            $this->errorMessage = new Object(-1, sprintf($lang->filter->invalid_alpha_number, $lang->{$key} ? $lang->{$key} : $key));
+                                                    }
+                                                break;
+                                    }
+			}
+		}
+
+		function checkMaxLength($length){
+			if($this->value && (strlen($this->value) > $length)){
+                                global $lang;
+				$this->isValid = false;
+				$key = $this->name;
+				$this->errorMessage = new Object(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
+			}
+		}
+
+		function checkMinLength($length){
+			if($this->value && (strlen($this->value) < $length)){
+                                global $lang;
+				$this->isValid = false;
+				$key = $this->name;
+				$this->errorMessage = new Object(-1, sprintf($lang->filter->outofrange, $lang->{$key} ? $lang->{$key} : $key));
+			}
+		}
+
+		function checkNotNull(){
+			if(!isset($this->value)){
+                                global $lang;
+				$this->isValid = false;
+				$key = $this->name;
+				$this->errorMessage = new Object(-1, sprintf($lang->filter->isnull, $lang->{$key} ? $lang->{$key} : $key));
+			}
+		}
+	}
+
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/argument/ConditionArgument.class.php b/classes/xml/xmlquery/argument/ConditionArgument.class.php
new file mode 100644
index 000000000..cdbebfdf0
--- /dev/null
+++ b/classes/xml/xmlquery/argument/ConditionArgument.class.php
@@ -0,0 +1,76 @@
+<?php
+
+	class ConditionArgument extends Argument {
+		var $operation;
+
+
+		function ConditionArgument($name, $value, $operation){
+                        if(isset($value) && in_array($operation, array('in', 'notin', 'between')) && !is_array($value)){
+                            $value = str_replace(' ', '', $value);
+                            $value = str_replace('\'', '', $value);
+                            $value = explode(',', $value);
+                        }
+			parent::Argument($name, $value);
+			$this->operation = $operation;
+		}
+
+		function createConditionValue(){
+			if(!isset($this->value)) return;
+
+                        $name = $this->column_name;
+                        $operation = $this->operation;
+                        $value = $this->value;
+
+                        switch($operation) {
+                            case 'like_prefix' :
+                                    $this->value =  $value.'%';
+                                break;
+                            case 'like_tail' :
+                                    $this->value = '%'.$value;
+                                break;
+                            case 'like' :
+                                    $this->value = '%'.$value.'%';
+                                break;
+                            case 'notlike' :
+                                    $this->value = '%'.$value.'%';
+                                break;
+                            case 'notlike_prefix' :
+                                    $this->value = $value.'%';
+                                break;
+                            case 'notlike_tail' :
+                                    $this->value = '%'.$value;
+                                break;
+                            case 'in':
+                                    if(!is_array($value)) $this->value = array($value);
+                                break;
+                            case 'notin':
+                                    if(!is_array($value)) $this->value = array($value);
+                                break;
+                        }
+		}
+
+                /**
+                 * Since ConditionArgument is used in WHERE clause,
+                 * where the argument value is compared to a table column,
+                 * it is assumed that all arguments have type. There are cases though
+                 * where the column does not have any type - if it was removed from
+                 * the XML schema for example - see the is_secret column in xe_documents table.
+                 * In this case, the column type is retrieved according to argument
+                 * value type (using the PHP function is_numeric).
+                 *
+                 * @return type string
+                 */
+                function getType(){
+			return $this->type ? $this->type : (!is_numeric($this->value) ? "varchar" : "");
+		}
+
+                function setColumnType($column_type){
+			if(!isset($this->value)) return;
+			if($column_type === '') return;
+
+			$this->type = $column_type;
+		}
+
+        }
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/argument/SortArgument.class.php b/classes/xml/xmlquery/argument/SortArgument.class.php
new file mode 100644
index 000000000..639b10a06
--- /dev/null
+++ b/classes/xml/xmlquery/argument/SortArgument.class.php
@@ -0,0 +1,11 @@
+<?php
+
+	class SortArgument extends Argument {
+
+            function getValue(){
+                return $this->getUnescapedValue();
+            }
+
+        }
+
+?>
diff --git a/classes/xml/xmlquery/queryargument/DefaultValue.class.php b/classes/xml/xmlquery/queryargument/DefaultValue.class.php
new file mode 100644
index 000000000..05f2bd69b
--- /dev/null
+++ b/classes/xml/xmlquery/queryargument/DefaultValue.class.php
@@ -0,0 +1,110 @@
+<?php
+
+	class DefaultValue {
+		var $column_name;
+		var $value;
+		var $is_sequence = false;
+                var $is_operation = false;
+                var $operation = '';
+
+                var $_is_string = false; ///< Checks if value is plain string or name of XE function (ipaddress, plus, etc).
+                var $_is_string_from_function = false; //< Checks if value is string resulted from evaluating a piece of PHP code (see $_SERVER[REMOTE_ADDR])
+
+		function DefaultValue($column_name, $value){
+                        $dbParser = &DB::getParser();
+			$this->column_name = $dbParser->parseColumnName($column_name);
+			$this->value = $value;
+                        $this->value = $this->_setValue();
+		}
+
+		function isString(){
+                    return $this->_is_string;
+                    $str_pos = strpos($this->value, '(');
+                    if($str_pos===false) return true;
+                    return false;
+		}
+
+                function isStringFromFunction(){
+                    return $this->_is_string_from_function;
+                }
+
+                function isSequence(){
+                    return $this->is_sequence;
+                }
+
+                function isOperation(){
+                    return $this->is_operation;
+                }
+
+                function getOperation(){
+                    return $this->operation;
+                }
+
+                function _setValue(){
+			if(!isset($this->value)) return;
+
+			// If value contains comma separated values and does not contain paranthesis
+			//  -> default value is an array
+			if(strpos($this->value, ',') !== false && strpos($this->value, '(') === false) {
+				return sprintf('array(%s)', $this->value);
+			}
+
+                        $str_pos = strpos($this->value, '(');
+                        // // TODO Replace this with parseExpression
+                        if($str_pos===false) {
+                            $this->_is_string = true;
+                            return '\''.$this->value.'\'';
+                        }
+                        //if($str_pos===false) return $this->value;
+
+                        $func_name = substr($this->value, 0, $str_pos);
+                        $args = substr($this->value, $str_pos+1, strlen($value)-1);
+
+			switch($func_name) {
+				case 'ipaddress' :
+						$val = '$_SERVER[\'REMOTE_ADDR\']';
+                                                $this->_is_string_from_function = true;
+					break;
+				case 'unixtime' :
+						$val = 'time()';
+					break;
+				case 'curdate' :
+						$val = 'date("YmdHis")';
+                                                $this->_is_string_from_function = true;
+					break;
+				case 'sequence' :
+                                                $this->is_sequence = true;
+						$val = '$sequence';
+					break;
+				case 'plus' :
+						$args = abs($args);
+                                                $this->is_operation = true;
+                                                $this->operation = '+';
+						$val = sprintf('%d', $args);
+					break;
+				case 'minus' :
+						$args = abs($args);
+                                                $this->is_operation = true;
+                                                $this->operation = '-';
+						$val = sprintf('%d', $args);
+					break;
+				case 'multiply' :
+						$args = intval($args);
+                                                $this->is_operation = true;
+                                                $this->operation = '*';
+						$val = sprintf('%d', $args);
+					break;
+				default :
+						$val = '\'' . $this->value . '\'';
+						//$val = $this->value;
+			}
+
+			return $val;
+                }
+
+		function toString(){
+                        return $this->value;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/QueryArgument.class.php b/classes/xml/xmlquery/queryargument/QueryArgument.class.php
new file mode 100644
index 000000000..e4082403f
--- /dev/null
+++ b/classes/xml/xmlquery/queryargument/QueryArgument.class.php
@@ -0,0 +1,104 @@
+<?php
+
+	class QueryArgument {
+		var $argument_name;
+                var $variable_name;
+		var $argument_validator;
+		var $column_name;
+		var $operation;
+
+                var $ignore_value;
+
+		function QueryArgument($tag, $ignore_value = false){
+                        static $number_of_arguments = 0;
+
+			$this->argument_name = $tag->attrs->var;
+			if(!$this->argument_name) $this->argument_name = str_replace('.', '_',$tag->attrs->name);
+			if(!$this->argument_name) $this->argument_name = str_replace('.', '_',$tag->attrs->column);
+
+                        $this->variable_name = $this->argument_name;
+
+                        $number_of_arguments++;
+                        $this->argument_name .= $number_of_arguments;
+
+			$name = $tag->attrs->name;
+			if(!$name) $name = $tag->attrs->column;
+			if(strpos($name, '.') === false) $this->column_name = $name;
+			else {
+                            list($prefix, $name) = explode('.', $name);
+                            $this->column_name = $name;
+			}
+
+			if($tag->attrs->operation) $this->operation = $tag->attrs->operation;
+
+			$this->argument_validator = new QueryArgumentValidator($tag, $this);
+                        $this->ignore_value = $ignore_value;
+		}
+
+		function getArgumentName(){
+			return $this->argument_name;
+		}
+
+		function getColumnName(){
+			return $this->column_name;
+		}
+
+		function getValidatorString(){
+			return $this->argument_validator->toString();
+		}
+
+                function isConditionArgument(){
+                    if($this->operation) return true;
+                    return false;
+                }
+
+		function toString(){
+                    if($this->isConditionArgument()){
+                            // Instantiation
+                            $arg = sprintf("\n$%s_argument = new ConditionArgument('%s', %s, '%s');\n"
+                                                    , $this->argument_name
+                                                    , $this->variable_name
+                                                    , '$args->'.$this->variable_name
+                                                    , $this->operation
+                                                    );
+                            // Call methods to validate argument and ensure default value
+                            $arg .= $this->argument_validator->toString();
+
+                            // Prepare condition string
+                            $arg .= sprintf("$%s_argument->createConditionValue();\n"
+                                    , $this->argument_name
+                                    );
+
+                            // Check that argument passed validation, else return
+                            $arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
+                                            , $this->argument_name
+                                            , $this->argument_name
+                                            );
+                    }
+                    else {
+                            $arg = sprintf("\n$%s_argument = new Argument('%s', %s);\n"
+                                                    , $this->argument_name
+                                                    , $this->variable_name
+                                                    , $this->ignore_value ? 'null' : '$args->'.$this->variable_name);
+
+                            $arg .= $this->argument_validator->toString();
+
+                            $arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
+                                            , $this->argument_name
+                                            , $this->argument_name
+                                            );
+                    }
+
+                    // If the argument is null, skip it
+                    if($this->argument_validator->isIgnorable()){
+                        $arg = sprintf("if(isset(%s)) {", '$args->'.$this->variable_name)
+                                . $arg
+                                . sprintf("} else \n$%s_argument = null;", $this->argument_name);
+                    }
+
+                    return $arg;
+            }
+
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php
new file mode 100644
index 000000000..60b068f2d
--- /dev/null
+++ b/classes/xml/xmlquery/queryargument/SortQueryArgument.class.php
@@ -0,0 +1,20 @@
+<?php
+
+	class SortQueryArgument extends QueryArgument{
+            function toString(){
+                $arg = sprintf("\n$%s_argument = new SortArgument('%s', %s);\n"
+                                        , $this->argument_name
+                                        , $this->argument_name
+                                        , '$args->'.$this->variable_name);
+
+
+                $arg .= $this->argument_validator->toString();
+
+                $arg .= sprintf("if(!$%s_argument->isValid()) return $%s_argument->getErrorMessage();\n"
+                                    , $this->argument_name
+                                    , $this->argument_name
+                                    );
+                return $arg;
+            }
+        }
+?>
diff --git a/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
new file mode 100644
index 000000000..e54fce76d
--- /dev/null
+++ b/classes/xml/xmlquery/queryargument/validator/QueryArgumentValidator.class.php
@@ -0,0 +1,73 @@
+<?php
+	class QueryArgumentValidator {
+		var $argument_name;
+		var $default_value;
+		var $notnull;
+		var $filter;
+		var $min_length;
+		var $max_length;
+
+		var $validator_string;
+
+		var $argument;
+
+		function QueryArgumentValidator($tag, $argument){
+			$this->argument = $argument;
+			$this->argument_name = $this->argument->getArgumentName();
+
+			$this->default_value = $tag->attrs->default;
+			$this->notnull = $tag->attrs->notnull;
+			$this->filter = $tag->attrs->filter;
+			$this->min_length = $tag->attrs->min_length;
+			$this->max_length = $tag->attrs->max_length;
+		}
+
+                function isIgnorable(){
+                    if(isset($this->default_value) || isset($this->notnull)) return false;
+                    return true;
+                }
+
+		function toString(){
+			$validator = '';
+			if($this->filter){
+				$validator .= sprintf("$%s_argument->checkFilter('%s');\n"
+					, $this->argument_name
+					, $this->filter
+					);
+			}
+			if($this->min_length){
+				$validator .= sprintf("$%s_argument->checkMinLength(%s);\n"
+					, $this->argument_name
+					, $this->min_length
+					);
+			}
+			if($this->max_length){
+				$validator .= sprintf("$%s_argument->checkMaxLength(%s);\n"
+					, $this->argument_name
+					, $this->max_length
+					);
+			}
+			if(isset($this->default_value)){
+                                $this->default_value = new DefaultValue($this->argument_name, $this->default_value);
+                                if($this->default_value->isSequence())
+                                        $validator .= '$db = &DB::getInstance(); $sequence = $db->getNextSequence(); ';
+                                if($this->default_value->isOperation())
+                                        $validator .= sprintf("$%s_argument->setColumnOperation('%s');\n"
+                                                , $this->argument_name
+                                                , $this->default_value->getOperation()
+                                                );
+                                $validator .= sprintf("$%s_argument->ensureDefaultValue(%s);\n"
+                                        , $this->argument_name
+                                        , $this->default_value->toString()
+                                        );
+			}
+			if($this->notnull){
+				$validator .= sprintf("$%s_argument->checkNotNull();\n"
+					, $this->argument_name
+					);
+			}
+			return $validator;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/ColumnTag.class.php b/classes/xml/xmlquery/tags/column/ColumnTag.class.php
new file mode 100644
index 000000000..8ffe77373
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/ColumnTag.class.php
@@ -0,0 +1,19 @@
+<?php
+    /**
+     * @class ColumnTag
+     * @author Arnia Software
+     * @brief Models the <column> tag inside an XML Query file
+     * 
+     * Since the <column> tag supports different attributes depending on
+     * the type of query (select, update, insert, delete) this is only
+     * the base class for the classes that will model each type <column> tag. 
+	 *
+     **/
+
+	class ColumnTag {
+		var $name;
+		
+		function ColumnTag($name){	
+			$this->name = $name;
+		}
+	}
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
new file mode 100644
index 000000000..586125f42
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/InsertColumnTag.class.php
@@ -0,0 +1,31 @@
+<?php
+    /**
+     * @class InsertColumnTag
+     * @author Arnia Software
+     * @brief Models the <column> tag inside an XML Query file whose action is 'insert'
+     *
+     **/
+
+
+	class InsertColumnTag extends ColumnTag {
+		var $argument;
+
+		function InsertColumnTag($column) {
+			parent::ColumnTag($column->attrs->name);
+			$dbParser = DB::getParser();
+			$this->name = $dbParser->parseColumnName($this->name);
+			$this->argument = new QueryArgument($column);
+		}
+
+		function getExpressionString(){
+			return sprintf('new InsertExpression(\'%s\', $%s_argument)'
+						, $this->name
+						, $this->argument->argument_name);
+		}
+
+		function getArgument(){
+			return $this->argument;
+		}
+
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
new file mode 100644
index 000000000..88ed19ccb
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/InsertColumnsTag.class.php
@@ -0,0 +1,46 @@
+<?php
+    /**
+     * @class InsertColumnsTag
+     * @author Arnia Software
+     * @brief Models the <column> tag inside an XML Query file whose action is 'insert'
+     *
+     **/
+
+	class InsertColumnsTag{
+		var $columns;
+
+		function InsertColumnsTag($xml_columns) {
+			$this->columns = array();
+
+			if(!$xml_columns)
+				return;
+
+			if(!is_array($xml_columns)) $xml_columns = array($xml_columns);
+
+			foreach($xml_columns as $column){
+				if($column->name === 'query') $this->columns[] = new QueryTag($column, true);
+				else $this->columns[] = new InsertColumnTag($column);
+			}
+		}
+
+		function toString(){
+			$output_columns = 'array(' . PHP_EOL;
+			foreach($this->columns as $column){
+				$output_columns .= $column->getExpressionString() . PHP_EOL . ',';
+			}
+			$output_columns = substr($output_columns, 0, -1);
+			$output_columns .= ')';
+			return $output_columns;
+		}
+
+		function getArguments(){
+			$arguments = array();
+			foreach($this->columns as $column){
+				$arguments[] = $column->getArgument();
+			}
+			return $arguments;
+		}
+
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
new file mode 100644
index 000000000..53012641c
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/SelectColumnTag.class.php
@@ -0,0 +1,34 @@
+<?php
+
+    /**
+     * @class SelectColumnTag
+     * @author Arnia Software
+     * @brief Models the <column> tag inside an XML Query file whose action is 'select'
+     *
+     **/
+
+	class SelectColumnTag extends ColumnTag{
+		var $alias;
+		var $click_count;
+		
+		function SelectColumnTag($column){
+			parent::ColumnTag($column->attrs->name);
+			if(!$this->name) $this->name = "*";			
+			if($this->name != "*") {
+				$dbParser = DB::getParser();
+				$this->name = $dbParser->parseExpression($this->name);
+			}
+				
+			$this->alias = $column->attrs->alias;
+			$this->click_count = $column->attrs->click_count;
+		}
+		
+		function getExpressionString(){
+			if($this->name == '*') return "new StarExpression()";
+			if($this->click_count)
+				return sprintf('new ClickCountExpression(%s, %s, $args->%s)', $this->name, $this->alias,$this->click_count);
+			$dbParser = DB::getParser();
+			return sprintf('new SelectExpression(\'%s\'%s)', $this->name, $this->alias ? ', \''.$dbParser->escape($this->alias) .'\'': '');	
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
new file mode 100644
index 000000000..404107a2f
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/SelectColumnsTag.class.php
@@ -0,0 +1,57 @@
+<?php
+
+	class SelectColumnsTag {
+		var $columns;
+
+		function SelectColumnsTag($xml_columns_tag){
+			$xml_columns = $xml_columns_tag->column;
+			$xml_queries = $xml_columns_tag->query;
+
+			$this->columns = array();
+
+			if(!$xml_columns) {
+				$this->columns[] = new SelectColumnTag("*");
+				return;
+			}
+
+			if(!is_array($xml_columns)) $xml_columns = array($xml_columns);
+
+			foreach($xml_columns as $column){
+				$this->columns[] = new SelectColumnTag($column);
+			}
+
+
+			if(!$xml_queries) {
+				return;
+			}
+
+			if(!is_array($xml_queries)) $xml_queries = array($xml_queries);
+
+			foreach($xml_queries as $column){
+				$this->columns[] = new QueryTag($column, true);
+			}
+		}
+
+		function toString(){
+			$output_columns = 'array(' . PHP_EOL;
+			foreach($this->columns as $column){
+				if(is_a($column, 'QueryTag'))
+					$output_columns .= $column->toString() . PHP_EOL . ',';
+				else
+					$output_columns .= $column->getExpressionString() . PHP_EOL . ',';
+			}
+			$output_columns = substr($output_columns, 0, -1);
+			$output_columns .= ')';
+			return $output_columns;
+		}
+
+		function getArguments(){
+			$arguments = array();
+			foreach($this->columns as $column){
+				if(is_a($column, 'QueryTag'))
+					$arguments = array_merge($arguments, $column->getArguments());
+			}
+			return $arguments;
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
new file mode 100644
index 000000000..3ba648727
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnTag.class.php
@@ -0,0 +1,62 @@
+<?php
+
+    /**
+     * @class UpdateColumnTag
+     * @author Arnia Software
+     * @brief Models the <column> tag inside an XML Query file whose action is 'update'
+     *
+     **/
+
+
+
+	class UpdateColumnTag extends ColumnTag {
+		var $argument;
+                var $default_value;
+
+		function UpdateColumnTag($column) {
+			parent::ColumnTag($column->attrs->name);
+			$dbParser = DB::getParser();
+			$this->name = $dbParser->parseColumnName($this->name);
+                        if($column->attrs->var)
+                            $this->argument = new QueryArgument($column);
+                        else {
+                            if(strpos($column->attrs->default, '.') !== false)
+                                    $this->default_value = "'" . $dbParser->parseColumnName($column->attrs->default) . "'";
+                            else {
+                                $default_value = new DefaultValue($this->name, $column->attrs->default);
+                                if($default_value->isOperation())
+                                    $this->argument = new QueryArgument($column, true);
+                            //else $this->default_value = $dbParser->parseColumnName($column->attrs->default);
+                                else {
+                                    $this->default_value = $default_value->toString();
+                                    if($default_value->isStringFromFunction()){
+                                        $this->default_value = '"\'".' . $this->default_value . '."\'"';
+                                    }
+                                    if($default_value->isString()){
+                                        $this->default_value = '"' . $this->default_value . '"';
+                                    }
+                                }
+
+
+                            }
+                        }
+		}
+
+		function getExpressionString(){
+                    if($this->argument)
+			return sprintf('new UpdateExpression(\'%s\', $%s_argument)'
+						, $this->name
+						, $this->argument->argument_name);
+                    else {
+			return sprintf('new UpdateExpressionWithoutArgument(\'%s\', %s)'
+						, $this->name
+						, $this->default_value);
+                    }
+		}
+
+		function getArgument(){
+			return $this->argument;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
new file mode 100644
index 000000000..eb6ca94ea
--- /dev/null
+++ b/classes/xml/xmlquery/tags/column/UpdateColumnsTag.class.php
@@ -0,0 +1,44 @@
+<?php
+
+    /**
+     * @class UpdateColumnsTag
+     * @author Arnia Software
+     * @brief Models the <column> tag inside an XML Query file whose action is 'update'
+     *
+     **/
+
+	class UpdateColumnsTag{
+		var $columns;
+
+		function UpdateColumnsTag($xml_columns) {
+			$this->columns = array();
+
+			if(!is_array($xml_columns)) $xml_columns = array($xml_columns);
+
+			foreach($xml_columns as $column){
+				if($column->name === 'query') $this->columns[] = new QueryTag($column, true);
+				else $this->columns[] = new UpdateColumnTag($column);
+			}
+		}
+
+		function toString(){
+			$output_columns = 'array(' . PHP_EOL;
+			foreach($this->columns as $column){
+				$output_columns .= $column->getExpressionString() . PHP_EOL . ',';
+			}
+			$output_columns = substr($output_columns, 0, -1);
+			$output_columns .= ')';
+			return $output_columns;
+		}
+
+		function getArguments(){
+			$arguments = array();
+			foreach($this->columns as $column){
+				$arguments[] = $column->getArgument();
+			}
+			return $arguments;
+		}
+
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
new file mode 100644
index 000000000..2fa3609db
--- /dev/null
+++ b/classes/xml/xmlquery/tags/condition/ConditionGroupTag.class.php
@@ -0,0 +1,42 @@
+<?php
+
+	class ConditionGroupTag {
+		var $conditions;
+		var $pipe;
+
+		function ConditionGroupTag($conditions, $pipe = ""){
+			$this->pipe = $pipe;
+
+			if(!is_array($conditions)) $conditions = array($conditions);
+
+			foreach($conditions as $condition){
+				//if($condition->node_name === 'query') $this->conditions[] = new QueryTag($condition, true);
+				$this->conditions[] = new ConditionTag($condition);
+			}
+		}
+
+		function getConditions(){
+			return $this->conditions;
+		}
+
+		function getConditionGroupString(){
+			$conditions_string = 'array('.PHP_EOL;
+			foreach($this->conditions as $condition){
+				$conditions_string .= $condition->getConditionString() . PHP_EOL . ',';
+                        }
+			$conditions_string = substr($conditions_string, 0, -2);//remove ','
+			$conditions_string .= ')';
+
+			return sprintf("new ConditionGroup(%s%s)", $conditions_string, $this->pipe ? ',\''.$this->pipe . '\'': '');
+		}
+
+		function getArguments(){
+			$arguments = array();
+			foreach($this->conditions as $condition){
+                                $arguments = array_merge($arguments, $condition->getArguments());
+			}
+			return $arguments;
+		}
+
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/ConditionTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
new file mode 100644
index 000000000..c2eedd66d
--- /dev/null
+++ b/classes/xml/xmlquery/tags/condition/ConditionTag.class.php
@@ -0,0 +1,110 @@
+<?php
+
+	/**
+	 * @class ConditionTag
+	 * @author Corina
+	 * @brief Models the <condition> tag inside an XML Query file. Base class.
+	 *
+	 */
+
+	class ConditionTag {
+		var $operation;
+		var $column_name;
+
+		var $pipe;
+		var $argument_name;
+		var $argument;
+		var $default_column;
+
+                var $query;
+		function ConditionTag($condition){
+			$this->operation = $condition->attrs->operation;
+			$this->pipe = $condition->attrs->pipe;
+			$dbParser = DB::getParser();
+                        $this->column_name = $dbParser->parseExpression($condition->attrs->column);
+
+                        // If default value is column name, it should be escaped
+			if($isColumnName = strpos($condition->attrs->default, '.')){
+                            $condition->attrs->default = $dbParser->parseColumnName($condition->attrs->default);
+                        }
+
+                        if($condition->node_name == 'query'){
+                                $this->query = new QueryTag($condition, true);
+                                $this->default_column = $this->query->toString();
+                        }
+                        else if($condition->attrs->var && !strpos($condition->attrs->var, '.')){
+				$this->argument = new QueryArgument($condition);
+				$this->argument_name = $this->argument->getArgumentName();
+			}
+			else {
+                            if(isset($condition->attrs->default)){
+                              if(in_array($this->operation, array('in', 'between', 'not in'))){
+                                    $default_value = $condition->attrs->default;
+                                    if(strpos($default_value, "'") !== false)
+                                        $default_value = "\"" . $default_value . "\"";
+                                    else
+                                        $default_value = "'" . $default_value . "'";
+                              }
+                              else {
+                                $default_value_object = new DefaultValue($this->column_name, $condition->attrs->default);
+                                $default_value = $default_value_object->toString();
+
+                                if($default_value_object->isStringFromFunction()){
+                                    $default_value = '"\'".' . $default_value . '."\'"';
+                                }
+
+                                if($default_value_object->isString() && !$isColumnName && !is_numeric( $condition->attrs->default)){
+                                    if(strpos($default_value, "'") !== false)
+                                        $default_value = "\"" . $default_value . "\"";
+                                    else
+                                        $default_value = "'" . $default_value . "'";
+                                }
+                              }
+                                $this->default_column = $default_value;
+                            }
+                            else
+                                $this->default_column = "'" .  $dbParser->parseColumnName($condition->attrs->var)  . "'" ;
+			}
+		}
+
+		function setPipe($pipe){
+			$this->pipe = $pipe;
+		}
+
+		function getArguments(){
+                    $arguments = array();
+                    if($this->query)
+                        $arguments = array_merge($arguments, $this->query->getArguments());
+                    if($this->argument)
+                        $arguments[] = $this->argument;
+                    return $arguments;
+		}
+
+		function getConditionString(){
+                        if($this->query){
+                            return sprintf("new ConditionSubquery('%s',%s,%s%s)"
+                                            , $this->column_name
+                                            , $this->default_column
+                                            , '"'.$this->operation.'"'
+                                            , $this->pipe ? ", '" . $this->pipe . "'" : ''
+                                            );
+                        }
+                        else if(isset($this->default_column)){
+                            return sprintf("new ConditionWithoutArgument('%s',%s,%s%s)"
+                                            , $this->column_name
+                                            , $this->default_column
+                                            , '"'.$this->operation.'"'
+                                            , $this->pipe ? ", '" . $this->pipe . "'" : ''
+                                            );
+                        }
+                        else{
+                            return sprintf("new ConditionWithArgument('%s',%s,%s%s)"
+                                            , $this->column_name
+                                            , '$' . $this->argument_name . '_argument'
+                                            , '"'.$this->operation.'"'
+                                            , $this->pipe ? ", '" . $this->pipe . "'" : ''
+                                            );
+                        }
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
new file mode 100644
index 000000000..dcd676494
--- /dev/null
+++ b/classes/xml/xmlquery/tags/condition/ConditionsTag.class.php
@@ -0,0 +1,48 @@
+<?php
+	class ConditionsTag {
+		var $condition_groups;
+
+		function ConditionsTag($xml_conditions){
+			$this->condition_groups = array();
+
+                        $xml_condition_list = array();
+                        if($xml_conditions->condition)
+                            $xml_condition_list = $xml_conditions->condition;
+
+                        if($xml_conditions->query){
+                            if(!is_array($xml_condition_list)) $xml_condition_list = array($xml_condition_list);
+                            if(!is_array($xml_conditions->query)) $xml_conditions->query = array($xml_conditions->query);
+                            $xml_condition_list = array_merge($xml_condition_list, $xml_conditions->query);
+                        }
+			if($xml_condition_list){
+				$this->condition_groups[] = new ConditionGroupTag($xml_condition_list);
+			}
+
+			$xml_groups = $xml_conditions->group;
+			if($xml_groups){
+				if(!is_array($xml_groups)) $xml_groups = array($xml_groups);
+				foreach($xml_groups as $group){
+					$this->condition_groups[] = new ConditionGroupTag($group->condition, $group->attrs->pipe);
+				}
+			}
+		}
+
+		function toString(){
+			$output_conditions = 'array(' . PHP_EOL;
+			foreach($this->condition_groups as $condition){
+				$output_conditions .= $condition->getConditionGroupString() . PHP_EOL . ',';
+			}
+			$output_conditions = substr($output_conditions, 0, -1);
+			$output_conditions .= ')';
+			return $output_conditions;
+		}
+
+		function getArguments(){
+			$arguments = array();
+			foreach($this->condition_groups as $condition){
+				$arguments = array_merge($arguments, $condition->getArguments());
+			}
+			return $arguments;
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php b/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php
new file mode 100644
index 000000000..3b59989f6
--- /dev/null
+++ b/classes/xml/xmlquery/tags/condition/JoinConditionsTag.class.php
@@ -0,0 +1,11 @@
+<?php 
+
+	class JoinConditionsTag extends ConditionsTag {
+		
+		function JoinConditionsTag($xml_conditions){
+			parent::ConditionsTag($xml_conditions);
+			$this->condition_groups[0]->conditions[0]->setPipe("");
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/group/GroupsTag.class.php b/classes/xml/xmlquery/tags/group/GroupsTag.class.php
new file mode 100644
index 000000000..620f3c5f6
--- /dev/null
+++ b/classes/xml/xmlquery/tags/group/GroupsTag.class.php
@@ -0,0 +1,35 @@
+<?php 
+
+	class GroupsTag {
+		var $groups;
+		
+		function GroupsTag($xml_groups){			
+			$this->groups = array();
+			
+            if($xml_groups) {
+                if(!is_array($xml_groups)) $xml_groups = array($xml_groups);
+                
+                $dbParser = DB::getParser();
+                for($i=0;$i<count($xml_groups);$i++) {
+                    $group = $xml_groups[$i];
+                    $column = trim($group->attrs->column);
+                    if(!$column) continue;
+                    
+                    $column = $dbParser->parseExpression($column);
+                    $this->groups[] = $column;
+                }
+            }			
+		}
+		
+		function toString(){
+			$output = 'array(' . PHP_EOL;
+			foreach($this->groups as $group){
+				$output .= "'" . $group . "' ,";
+			}
+			$output = substr($output, 0, -1);
+			$output .= ')';	
+			return $output;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/navigation/IndexTag.class.php b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
new file mode 100644
index 000000000..86408de2a
--- /dev/null
+++ b/classes/xml/xmlquery/tags/navigation/IndexTag.class.php
@@ -0,0 +1,43 @@
+<?php
+
+	class IndexTag {
+		var $argument_name;
+		var $argument;
+		var $default;
+		var $sort_order;
+		var $sort_order_argument;
+
+		function IndexTag($index){
+			$this->argument_name = $index->attrs->var;
+
+                        // Sort index - column by which to sort
+			//$dbParser = DB::getParser();
+			//$index->attrs->default = $dbParser->parseExpression($index->attrs->default);
+			$this->default = $index->attrs->default;
+			$this->argument = new QueryArgument($index);
+
+                        // Sort order - asc / desc
+			$this->sort_order = $index->attrs->order;
+			if(!in_array($this->sort_order, array("asc", "desc"))){
+				$arg->attrs->var = $this->sort_order;
+				$arg->attrs->default = 'asc';
+				$this->sort_order_argument = new SortQueryArgument($arg);
+				$this->sort_order = '$'.$this->sort_order_argument->getArgumentName().'_argument';
+			}
+			else $this->sort_order = '"'.$this->sort_order.'"';
+		}
+
+		function toString(){
+			return sprintf("new OrderByColumn(\$%s_argument, %s)", $this->argument->getArgumentName(), $this->sort_order);
+		}
+
+		function getArguments(){
+			$arguments = array();
+			$arguments[] = $this->argument;
+			if($this->sort_order_argument)
+				$arguments[] = $this->sort_order_argument;
+			return $arguments;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/navigation/LimitTag.class.php b/classes/xml/xmlquery/tags/navigation/LimitTag.class.php
new file mode 100644
index 000000000..fc9350675
--- /dev/null
+++ b/classes/xml/xmlquery/tags/navigation/LimitTag.class.php
@@ -0,0 +1,30 @@
+<?php
+
+	class LimitTag {
+		var $arguments;
+		var $page;
+		var $page_count;
+		var $list_count;
+
+		function LimitTag($index){
+			if($index->page->attrs && $index->page_count->attrs){
+				$this->page = new QueryArgument($index->page);
+				$this->page_count = new QueryArgument($index->page_count);
+				$this->arguments[] = $this->page;
+				$this->arguments[] = $this->page_count;
+			}
+
+			$this->list_count = new QueryArgument($index->list_count);
+			$this->arguments[] = $this->list_count;
+		}
+
+		function toString(){
+			if ($this->page)return sprintf("new Limit(\$%s_argument, \$%s_argument, \$%s_argument)", $this->list_count->getArgumentName(), $this->page->getArgumentName(),  $this->page_count->getArgumentName());
+			else return sprintf("new Limit(\$%s_argument)", $this->list_count->getArgumentName());
+		}
+
+		function getArguments(){
+			return $this->arguments;
+		}
+	}
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
new file mode 100644
index 000000000..062ae6ad3
--- /dev/null
+++ b/classes/xml/xmlquery/tags/navigation/NavigationTag.class.php
@@ -0,0 +1,59 @@
+<?php
+	class NavigationTag {
+		var $order;
+		var $list_count;
+		var $page_count;
+		var $page;
+		var $limit;
+
+		function NavigationTag($xml_navigation){
+			$this->order = array();
+            if($xml_navigation) {
+                $order = $xml_navigation->index;
+                if($order) {
+                    if(!is_array($order)) $order = array($order);
+                    foreach($order as $order_info) {
+                        $this->order[] = new IndexTag($order_info);
+                    }
+                }
+
+                if($xml_navigation->page->attrs || $xml_navigation->list_count->attrs)
+                	$this->limit = new LimitTag($xml_navigation);
+
+                $list_count = $xml_navigation->list_count->attrs;
+                $this->list_count = $list_count;
+
+                $page_count = $xml_navigation->page_count->attrs;
+                $this->page_count = $page_count;
+
+                $page = $xml_navigation->page->attrs;
+                $this->page = $page ;
+            }
+		}
+
+		function getOrderByString(){
+			$output = 'array(' . PHP_EOL;
+			foreach($this->order as $order){
+				$output .= $order->toString() . PHP_EOL . ',';
+			}
+			$output = substr($output, 0, -1);
+			$output .= ')';
+			return $output;
+		}
+
+		function getLimitString(){
+			if ($this->limit)	return $this->limit->toString();
+			else return "";
+		}
+
+		function getArguments(){
+			$arguments = array();
+			foreach($this->order as $order){
+				$arguments = array_merge($order->getArguments(), $arguments);
+			}
+			if($this->limit)	$arguments = array_merge($this->limit->getArguments(), $arguments);
+			return $arguments;
+		}
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/query/QueryTag.class.php b/classes/xml/xmlquery/tags/query/QueryTag.class.php
new file mode 100644
index 000000000..ac9a2a6c4
--- /dev/null
+++ b/classes/xml/xmlquery/tags/query/QueryTag.class.php
@@ -0,0 +1,198 @@
+<?php
+
+class QueryTag {
+	var $action;
+	var $query_id;
+	var $priority;
+	var $column_type;
+	var $query;
+
+	//xml tags
+	var $columns;
+	var $tables;
+	var $conditions;
+	var $groups;
+	var $navigation;
+	var $arguments;
+	var $preBuff;
+	var $buff;
+	var $isSubQuery;
+
+        var $join_type;
+	var $alias;
+
+	function QueryTag($query, $isSubQuery = false){
+		$this->action = $query->attrs->action;
+		$this->query_id = $query->attrs->id;
+		$this->priority = $query->attrs->priority;
+		$this->query = $query;
+		$this->isSubQuery = $isSubQuery;
+		if($this->isSubQuery) $this->action = 'select';
+                if($query->attrs->alias){
+                    $dbParser = DB::getParser();
+                    $this->alias = $dbParser->escape($query->attrs->alias);
+                }
+                $this->join_type = $query->attrs->join_type;
+
+		$this->getColumns();
+		$tables = $this->getTables();
+		$this->setTableColumnTypes($tables);
+		$this->getConditions();
+		$this->getGroups();
+		$this->getNavigation();
+		$this->getPrebuff();
+		$this->getBuff();
+	}
+
+	function show(){
+		return true;
+	}
+
+	function getQueryId(){
+		return $this->query->attrs->query_id ? $this->query->attrs->query_id : $this->query->attrs->id;
+	}
+
+	function getPriority(){
+		return $this->query->attrs->priority;
+	}
+
+	function getAction(){
+		return $this->query->attrs->action;
+	}
+
+	function setTableColumnTypes($tables){
+		$query_id = $this->getQueryId();
+		if(!isset($this->column_type[$query_id])){
+			$table_tags = $tables->getTables();
+			$column_type = array();
+			foreach($table_tags as $table_tag){
+                            if(is_a($table_tag, 'TableTag')){
+				$tag_column_type = QueryParser::getTableInfo($query_id, $table_tag->getTableName());
+				$column_type = array_merge($column_type, $tag_column_type);
+                            }
+			}
+			$this->column_type[$query_id] = $column_type;
+		}
+	}
+
+	function getColumns(){
+		if($this->action == 'select'){
+			return $this->columns =  new SelectColumnsTag($this->query->columns);
+		}else if($this->action == 'insert'){
+			return $this->columns =  new InsertColumnsTag($this->query->columns->column);
+		}else if($this->action == 'update') {
+			return $this->columns =  new UpdateColumnsTag($this->query->columns->column);
+		}else if($this->action == 'delete') {
+			return $this->columns =  null;
+		}
+	}
+
+	function getPrebuff(){
+		// TODO Check if this work with arguments in join clause
+		$arguments = $this->getArguments();
+
+		$prebuff = '';
+		foreach($arguments as $argument){
+                    if(isset($argument)){
+                        $arg_name = $argument->getArgumentName();
+                        if($arg_name){
+                            $prebuff .= $argument->toString();
+                            $column_type = $this->column_type[$this->getQueryId()][$argument->getColumnName()];
+                            if(isset($column_type))
+                                $prebuff .= sprintf("if($%s_argument !== null) $%s_argument->setColumnType('%s');\n"
+                                        , $arg_name
+                                        , $arg_name
+                                        , $column_type );
+                        }
+                    }
+		}
+		$prebuff .= "\n";
+
+		return $this->preBuff = $prebuff;
+	}
+
+	function getBuff(){
+		$buff = '';
+		if($this->isSubQuery){
+			$buff = 'new Subquery(';
+			$buff .= "'" . $this->alias . '\', ';
+			$buff .=  ($this->columns ? $this->columns->toString() : 'null' ). ', '.PHP_EOL;
+                        $buff .=  $this->tables->toString() .','.PHP_EOL;
+                        $buff .=  $this->conditions->toString() .',' .PHP_EOL;
+                        $buff .=  $this->groups->toString() . ',' .PHP_EOL;
+                        $buff .=  $this->navigation->getOrderByString() .','.PHP_EOL;
+                        $limit =  $this->navigation->getLimitString() ;
+			$buff .=  $limit ? $limit : 'null' . PHP_EOL;
+                        $buff .=  $this->join_type ? "'" . $this->join_type . "'" : '';
+			$buff .= ')';
+
+			$this->buff = $buff;
+			return $this->buff;
+		}
+
+		$buff .= '$query = new Query();'.PHP_EOL;
+		$buff .= sprintf('$query->setQueryId("%s");%s', $this->query_id, "\n");
+		$buff .= sprintf('$query->setAction("%s");%s', $this->action, "\n");
+		$buff .= sprintf('$query->setPriority("%s");%s', $this->priority, "\n");
+		$buff .= $this->preBuff;
+		if($this->columns)
+			$buff .= '$query->setColumns(' . $this->columns->toString() . ');'.PHP_EOL;
+
+        $buff .= '$query->setTables(' . $this->tables->toString() .');'.PHP_EOL;
+        $buff .= '$query->setConditions('.$this->conditions->toString() .');'.PHP_EOL;
+       	$buff .= '$query->setGroups(' . $this->groups->toString() . ');'.PHP_EOL;
+       	$buff .= '$query->setOrder(' . $this->navigation->getOrderByString() .');'.PHP_EOL;
+		$buff .= '$query->setLimit(' . $this->navigation->getLimitString() .');'.PHP_EOL;
+
+		$this->buff = $buff;
+		return $this->buff;
+	}
+
+	function getTables(){
+                if($this->query->index_hint->attrs->for == 'ALL' || Context::getDBType() == strtolower($this->query->index_hint->attrs->for))
+                    return $this->tables = new TablesTag($this->query->tables, $this->query->index_hint);
+                else
+                    return $this->tables = new TablesTag($this->query->tables);
+	}
+
+	function getConditions(){
+		return $this->conditions = new ConditionsTag($this->query->conditions);
+	}
+
+	function getGroups(){
+		return $this->groups = new GroupsTag($this->query->groups->group);
+	}
+
+	function getNavigation(){
+		return $this->navigation = new NavigationTag($this->query->navigation);
+	}
+
+	function toString(){
+		return $this->buff;
+	}
+
+	function getTableString(){
+		return $this->buff;
+	}
+
+	function getConditionString(){
+		return $this->buff;
+	}
+
+	function getExpressionString(){
+		return $this->buff;
+	}
+
+
+	function getArguments(){
+		$arguments = array();
+		if($this->columns)
+			$arguments = array_merge($arguments, $this->columns->getArguments());
+                $arguments = array_merge($arguments, $this->tables->getArguments());
+		$arguments = array_merge($arguments, $this->conditions->getArguments());
+		$arguments = array_merge($arguments, $this->navigation->getArguments());
+		return $arguments;
+	}
+
+}
+?>
diff --git a/classes/xml/xmlquery/tags/table/HintTableTag.class.php b/classes/xml/xmlquery/tags/table/HintTableTag.class.php
new file mode 100644
index 000000000..ce76a63bb
--- /dev/null
+++ b/classes/xml/xmlquery/tags/table/HintTableTag.class.php
@@ -0,0 +1,48 @@
+<?php
+
+	/**
+	 * @class HintTableTag
+	 * @author Arnia Sowftare
+	 * @brief Models the <table> tag inside an XML Query file
+         *      and the corresponding <index_hint> tag
+	 *
+	 */
+
+	class HintTableTag extends TableTag {
+                var $index;
+
+                /**
+                 * @brief Initialises Table Tag properties
+                 * @param XML <table> tag $table
+                 */
+		function HintTableTag($table, $index){
+                        parent::TableTag($table);
+                        $this->index = $index;
+		}
+
+		function getTableString(){
+			$dbParser = DB::getParser();
+                        $dbType = ucfirst(Context::getDBType());
+
+                        $result = sprintf('new %sTableWithHint(\'%s\'%s, array('
+                                            , $dbType
+                                            , $dbParser->escape($this->name)
+                                            , $this->alias ? ', \'' . $dbParser->escape($this->alias) .'\'' : ', null'
+                                            //, ', \'' . $dbParser->escape($this->index->name) .'\', \'' . $this->index->type .'\''
+                                        );
+                        foreach($this->index as $indx){
+                            $result .= "new IndexHint(";
+                            $result .= '\'' . $dbParser->escape($indx->name) .'\', \'' . $indx->type .'\'' . ') , ';
+                        }
+                        $result = substr($result, 0, -2);
+                        $result .= '))';
+                        return $result;
+		}
+
+                function getArguments(){
+                    if(!isset($this->conditionsTag)) return array();
+                    return $this->conditionsTag->getArguments();
+                }
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/table/TableTag.class.php b/classes/xml/xmlquery/tags/table/TableTag.class.php
new file mode 100644
index 000000000..0fe59c23d
--- /dev/null
+++ b/classes/xml/xmlquery/tags/table/TableTag.class.php
@@ -0,0 +1,88 @@
+<?php 
+	
+	/**
+	 * @class TableTag
+	 * @author Arnia Sowftare
+	 * @brief Models the <table> tag inside an XML Query file
+	 *
+         * @abstract
+         *   Example
+         *      <table name="modules" />
+         *      <table name="documents" alias="doc" />
+         *   Attributes
+         *      name - name of the table - table prefix will be automatically added
+         *      alias - table alias. If no value is specified, the table name will be set as default alias
+         *      join_type - in case the table is part of a join clause, this specifies the type of join: left, right etc.
+         *                - permitted values: 'left join','left outer join','right join','right outer join'
+         *   Children
+         *      Can have children of type <conditions>
+	 */
+
+	class TableTag {
+		var $unescaped_name;
+		var $name;
+		var $alias;
+		var $join_type;
+		var $conditions;
+		var $conditionsTag;
+                /**
+                 * @brief Initialises Table Tag properties
+                 * @param XML <table> tag $table
+                 */
+		function TableTag($table){
+			$dbParser = DB::getParser();
+                        
+                        $this->unescaped_name = $table->attrs->name;
+			$this->name = $dbParser->parseTableName($table->attrs->name);
+			
+                        $this->alias = $table->attrs->alias;
+			if(!$this->alias) $this->alias = $table->attrs->name; 
+			
+			$this->join_type = $table->attrs->type;
+			
+                        $this->conditions = $table->conditions;			
+                        
+                        if($this->isJoinTable())
+                            $this->conditionsTag = new JoinConditionsTag($this->conditions);
+		}
+		
+		function isJoinTable(){
+			if(in_array($this->join_type,array('left join','left outer join','right join','right outer join')) 
+				&& count($this->conditions)) return true;
+			return false;
+		}
+		
+		function getTableAlias(){
+			return $this->alias;
+		}
+		
+		function getTableName(){
+			return $this->unescaped_name;
+		}
+		
+                /**
+                 * @brief Returns string for printing in PHP query cache file
+                 * The string contains code for instantiation of either 
+                 * a Table or a JoinTable object
+                 * @return string 
+                 */
+		function getTableString(){
+			$dbParser = DB::getParser();
+			if($this->isJoinTable()){
+				return sprintf('new JoinTable(\'%s\', \'%s\', "%s", %s)'
+								, $dbParser->escape($this->name)
+								, $dbParser->escape($this->alias)
+								, $this->join_type, $this->conditionsTag->toString());
+			}
+			return sprintf('new Table(\'%s\'%s)'
+								, $dbParser->escape($this->name)
+								, $this->alias ? ', \'' . $dbParser->escape($this->alias) .'\'' : '');			
+		}
+                
+                function getArguments(){
+                    if(!isset($this->conditionsTag)) return array();
+                    return $this->conditionsTag->getArguments();
+                }
+	}
+
+?>
\ No newline at end of file
diff --git a/classes/xml/xmlquery/tags/table/TablesTag.class.php b/classes/xml/xmlquery/tags/table/TablesTag.class.php
new file mode 100644
index 000000000..ca0842c3a
--- /dev/null
+++ b/classes/xml/xmlquery/tags/table/TablesTag.class.php
@@ -0,0 +1,76 @@
+<?php
+
+	/**
+	 * @class TablesTag
+	 * @author Arnia Sowftare
+	 * @brief Models the <tables> tag inside an XML Query file
+	 *
+         * @abstract
+         *   Example
+         *      <tables>
+         *          <table name="documents" alias="doc" />
+         *      </tables>
+         *   Attributes
+         *      None.
+         *   Children
+         *      Can have children of type <table> or <query>
+	 */
+
+	class TablesTag {
+		var $tables;
+
+		function TablesTag($xml_tables_tag, $xml_index_hints_tag = NULL){
+                    $this->tables = array();
+
+                    $xml_tables = $xml_tables_tag->table;
+                    if(!is_array($xml_tables)) $xml_tables = array($xml_tables);
+
+                    if($xml_index_hints_tag){
+                        $index_nodes = $xml_index_hints_tag->index;
+                        if(!is_array($index_nodes)) $index_nodes = array($index_nodes);
+                        foreach($index_nodes as $index_node) {
+                            if(!$indexes[$index_node->attrs->table]) $indexes[$index_node->attrs->table] = array();
+                            $count = count($indexes[$index_node->attrs->table]);
+                            $indexes[$index_node->attrs->table][$count]->name = $index_node->attrs->name;
+                            $indexes[$index_node->attrs->table][$count]->type = $index_node->attrs->type;
+                        }
+                    }
+
+                    foreach($xml_tables as $tag){
+                        if($tag->attrs->query == 'true'){
+                            $this->tables[] = new QueryTag($tag, true);
+                        }
+                        else {
+                            if($indexes && $indexes[$tag->attrs->name])
+                                $this->tables[] = new HintTableTag($tag, $indexes[$tag->attrs->name]);
+                            else
+                                $this->tables[] = new TableTag($tag);
+                        }
+                    }
+		}
+
+		function getTables(){
+			return $this->tables;
+		}
+
+		function toString(){
+			$output_tables = 'array(' . PHP_EOL;
+			foreach($this->tables as $table){
+				if(is_a($table, 'QueryTag'))
+					$output_tables .= $table->toString() . PHP_EOL . ',';
+				else
+					$output_tables .= $table->getTableString() . PHP_EOL . ',';
+			}
+			$output_tables = substr($output_tables, 0, -1);
+			$output_tables .= ')';
+			return $output_tables;
+		}
+
+                function getArguments(){
+                    $arguments = array();
+                    foreach($this->tables as $table)
+                           $arguments = array_merge($arguments, $table->getArguments());
+                    return $arguments;
+                }
+	}
+?>
\ No newline at end of file
diff --git a/common/css/button.css b/common/css/button.css
deleted file mode 100644
index fb9661cd9..000000000
--- a/common/css/button.css
+++ /dev/null
@@ -1,91 +0,0 @@
-/* NHN (developers@xpressengine.com) */
-
-/* Anchor Button */
-a.button,
-a.button span { position:relative; display:inline-block; text-decoration:none !important; background:url(../tpl/images/buttonWhite.gif) no-repeat; cursor:pointer; white-space:nowrap; vertical-align:middle;}
-a.button { padding:0; background-position:left top; overflow:visible;}
-a.button span { left:2px; padding:6px 10px 5px 8px; color:#000; font:12px/12px Sans-serif; background-position:right top; *vertical-align:top;}
-/* Large Size */
-a.button.large { background-position:left -30px; }
-a.button.large span { padding:7px 10px 6px 8px; font:16px/16px Sans-serif; background-position:right -30px;}
-/* xLarge Size */
-a.button.xLarge { background-position:left -65px; }
-a.button.xLarge span { padding:8px 10px 7px 8px; font:20px/20px Sans-serif; background-position:right -65px;}
-/* Small Size */
-a.button.small { background-position:left -107px; }
-a.button.small span { padding:4px 6px 3px 4px; font:11px/11px Sans-serif; background-position:right -107px;}
-
-/* Control Button + Submit Button */
-span.button,
-span.button button,
-span.button input { position:relative; margin:0; display:inline-block; border:0; font:12px Sans-serif; white-space:nowrap; background:url(../tpl/images/buttonWhite.gif) no-repeat; vertical-align:middle;}
-span.button { padding:0; background-position:left top;}
-span.button button,
-span.button input { height:23px; left:2px; *vertical-align:top; padding:0 10px 0 8px; line-height:24px; background-position:right top; cursor:pointer; *overflow:visible;}
-/* Large Size */
-span.button.large { background-position:left -30px;}
-span.button.large button,
-span.button.large input { height:30px; padding:0 10px 0 8px; font:16px/30px Sans-serif; background-position:right -30px;}
-/* xLarge Size */
-span.button.xLarge { background-position:left -65px;}
-span.button.xLarge button,
-span.button.xLarge input { height:35px; padding:0 10px 0 8px; font:20px/36px Sans-serif; background-position:right -65px;}
-/* Small Size */
-span.button.small { background-position:left -107px;}
-span.button.small button,
-span.button.small input { height:18px; padding:0 6px 0 4px; font:11px/18px Sans-serif; background-position:right -107px;}
-
-/* Strong Button */
-a.button.strong *,
-span.button.strong * { font-weight:bold !important;}
-
-/* Icon Add */
-a.button .icon { position:relative; border:0; vertical-align:middle;}
-span.button .icon { position:relative; left:10px; margin-right:8px; vertical-align:middle;}
-
-/* Color Preset */
-a.button.green,
-a.button.green span,
-span.button.green,
-span.button.green button,
-span.button.green input { background-image:url(../tpl/images/buttonGreen.gif); color:#fff;}
-a.button.black,
-a.button.black span,
-span.button.black,
-span.button.black button,
-span.button.black input { background-image:url(../tpl/images/buttonBlack.gif); color:#fff;}
-a.button.red,
-a.button.red span,
-span.button.red,
-span.button.red button,
-span.button.red input { background-image:url(../tpl/images/buttonRed.gif); color:#fff;}
-a.button.blue,
-a.button.blue span,
-span.button.blue,
-span.button.blue button,
-span.button.blue input { background-image:url(../tpl/images/buttonBlue.gif); color:#fff;}
-
-/* Offset Debug */
-a.button,
-span.button{ margin-right:2px;}
-
-/* Button Set */
-.buttonSet{ width:16px; height:16px; background-image:url(../tpl/images/buttonSet.gif); background-repeat:no-repeat; border:0; background-color:transparent; vertical-align:middle; display:inline-block; text-decoration:none;}
-.buttonSet span{ z-index:-1; font-size:0; line-height:0; visibility:hidden;}
-.buttonSet.buttonUp{ background-position:0 0;}
-.buttonSet.buttonDown{ background-position:0 -16px;}
-.buttonSet.buttonLeft{ background-position:0 -32px;}
-.buttonSet.buttonRight{ background-position:0 -48px;}
-.buttonSet.buttonInfo{ background-position:0 -64px;}
-.buttonSet.buttonCopy{ background-position:0 -80px;}
-.buttonSet.buttonSetting{ background-position:0 -96px;}
-.buttonSet.buttonActive{ background-position:0 -112px;}
-.buttonSet.buttonDisable{ background-position:0 -128px;}
-.buttonSet.buttonDelete{ background-position:0 -144px;}
-.buttonSet.buttonHomepage{ background-position:0 -160px;}
-.buttonSet.buttonBlog{ background-position:0 -176px;}
-.buttonSet.buttonCalendar{ background-position:0 -192px;}
-.buttonSet.buttonLayoutEditor{ background-position:0 -208px;}
-.buttonSet.buttonAddWidget{ background-position:0 -224px;}
-.buttonSet.buttonAddContent{ background-position:0 -240px;}
-
diff --git a/common/css/default.css b/common/css/default.css
deleted file mode 100644
index dba8b421f..000000000
--- a/common/css/default.css
+++ /dev/null
@@ -1,91 +0,0 @@
-/* default.css - Type Selector Definition */
-body { margin:0;padding:0; font-size:.75em;}
-
-img { border:none; }
-label { cursor:pointer; }
-form { margin:0; padding:0; }
-
-/* Special Class Selector */
-.fr { float:right; }
-.fl { float:left; }
-.clear { clear:both; }
-.fwB { font-weight:bold;}
-.tCenter { text-align:center; }
-.tRight { text-align:right; }
-.tLeft { text-align:left; }
-.gap1 { margin-top:.8em; }
-.nowrap { white-space:nowrap; }
-
-.iePngFix { behavior:url(./common/js/iePngFix.htc); } 
-.zbxe_info { vertical-align:middle; behavior:url(./common/js/iePngFix.htc); }
-
-/* Input Style Definition */
-.inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1.4em; padding:.2em 0 0 .3em; background:#ffffff; font-size:1em; _font-size:9pt; }
-*:first-child+html .inputTypeText { font-size:9pt; }
-.inputTypeText:hover,
-.inputTypeText:focus { background:#f4f4f4; }
-.inputTypeTextArea { border:1px solid !important; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6 !important; background:#ffffff; font-size:1em; _font-size:9pt; height:100px;}
-*:first-child+html .inputTypeTextArea { font-size:9pt; }
-
-.w40 { width:40px; }
-.w60 { width:60px; }
-.w70 { width:70px; }
-.w80 { width:80px; }
-.w90 { width:90px; }
-.w100 { width:100px; }
-.w110 { width:110px; }
-.w120 { width:120px; }
-.w130 { width:130px; }
-.w140 { width:140px; }
-.w150 { width:150px; }
-.w160 { width:160px; }
-.w170 { width:170px; }
-.w180 { width:180px; }
-.w190 { width:190px; }
-.w200 { width:200px; }
-.w210 { width:210px; }
-.w220 { width:220px; }
-.w230 { width:230px; }
-.w240 { width:240px; }
-.w250 { width:250px; }
-.w260 { width:260px; }
-.w270 { width:270px; }
-.w280 { width:280px; }
-.w290 { width:290px; }
-.w300 { width:300px; }
-.w400 { width:400px; }
-
-/* editor style */
-a.bold { font-weight:bold; }
-
-.editor_blue_text { color: #145ff9 !important; text-decoration:underline !important; }
-.editor_blue_text a { color: #145ff9 !important; text-decoration:underline !important; }
-.editor_red_text { color: #f42126 !important; text-decoration:underline !important; }
-.editor_red_text a { color: #f42126 !important; text-decoration:underline !important; }
-.editor_yellow_text { color: #c9bd00 !important; text-decoration:underline !important; }
-.editor_yellow_text a { color: #c9bd00 !important; text-decoration:underline !important; }
-.editor_green_text { color: #08830B !important; text-decoration:underline !important; }
-.editor_green_text a { color: #08830B !important; text-decoration:underline !important; }
-
-.folder_opener { display: block; }
-.folder_closer { display: none; }
-.folder_area { display: none; }
-
-.xe_content { line-height:1.6; overflow:hidden; }
-
-.zbxe_widget_output { background:url(../tpl/images/widget_text.gif) no-repeat center bottom; display:block;}
-
-/* xe layer */
-#waitingforserverresponse { border:2px solid #444444; font-weight:bold; color:#444444; padding: 7px 5px 5px 25px; background:#FFFFFF url("../tpl/images/loading.gif") no-repeat 5px 5px; top:40px; left:40px; position:absolute; z-index:100; visibility:hidden; }
-
-#popup_menu_area{ position:absolute; background:#fff; border:2px solid #eee; -moz-border-radius:5px; -webkit-border-radius:5px; margin:0; padding:0;}
-#popup_menu_area *{ margin:0; padding:0; list-style:none; font-size:12px; line-height:normal;}
-#popup_menu_area ul{ border:1px solid #ddd; -moz-border-radius:5px; -webkit-border-radius:5px; padding:10px 10px 5px 10px;}
-#popup_menu_area li{ padding:2px 0 2px 20px; background-repeat:no-repeat; background-position:left center; margin-bottom:3px; white-space:nowrap;}
-#popup_menu_area li a{ text-decoration:none; color:#000;}
-#popup_menu_area li a:hover,
-#popup_menu_area li a:active,
-#popup_menu_area li a:focus{ font-weight:bold; letter-spacing:-1px;}
-
-/* xe faceoff */
-.faceOffManager { position:fixed; _position:absolute; right:3px; top:3px;  height:23px; }
diff --git a/common/css/popup.css b/common/css/popup.css
deleted file mode 100644
index 6b558e507..000000000
--- a/common/css/popup.css
+++ /dev/null
@@ -1,2 +0,0 @@
-body { overflow:hidden; }
-table.colTable { margin:0; }
diff --git a/common/css/xe.css b/common/css/xe.css
new file mode 100644
index 000000000..f668cac6e
--- /dev/null
+++ b/common/css/xe.css
@@ -0,0 +1,64 @@
+@charset "utf-8";
+/* Element Reset */
+body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}
+img{border:0}
+/* Button */
+.btn{position:relative;display:inline-block;vertical-align:middle}
+.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}
+.btn *[type=submit][disabled=disabled],
+.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}
+.btn a, 
+.btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}
+.btn input, 
+.btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}
+.btn a{height:22px}
+.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}
+.btn.medium a{height:28px}
+.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}
+.btn.large a{height:34px}
+/* Button - Regucy */
+span.button,
+a.button{position:relative;display:inline-block;vertical-align:top}
+span.button *,
+a.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}
+span.button *[type=submit][disabled=disabled],
+span.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}
+a.button span, 
+span.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}
+span.button input, 
+span.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}
+a.button span{height:22px}
+/* Button Area */
+.btnArea{margin:1em 0;text-align:right;zoom:1}
+.btnArea:after{content:"";display:block;clear:both}
+.btnArea .etc{float:left}
+/* Text Button */
+input[type=submit].text,
+input[type=button].text, 
+button[type=submit].text,
+button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a !important;background:none;text-decoration:underline;cursor:pointer}
+/* Popup Menu Area */
+#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}
+#popup_menu_area ul{list-style:none;margin:0;padding:0}
+#popup_menu_area li{margin:0;padding:0}
+#popup_menu_area a{text-decoration:none;color:#333}
+#popup_menu_area a:hover,
+#popup_menu_area a:avtive,
+#popup_menu_area a:focus{text-decoration:underline}
+/* Message */
+.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}
+body>.message{margin:1em}
+.message p{margin:1em 0 !important}
+.message em{font-style:normal;color:#e00}
+.message.info,
+.message.error,
+.message.update{padding-left:55px}
+.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em}
+.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em}
+.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em}
+/* Waiting for server response */
+.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px;font-weight:bold}
+/* Waiting for server response - Modal Window */
+.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}
+.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1}
+.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}
diff --git a/common/css/xe.min.css b/common/css/xe.min.css
new file mode 100644
index 000000000..896e7492c
--- /dev/null
+++ b/common/css/xe.min.css
@@ -0,0 +1 @@
+@charset "utf-8";/* Element Reset */body,table,input,textarea,select,button{font-family:Tahoma,Geneva,sans-serif;font-size:12px}img{border:0}/* Button */.btn{position:relative;display:inline-block;vertical-align:middle}.btn *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}.btn *[type=submit][disabled=disabled],.btn *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}.btn a, .btn button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}.btn input, .btn button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000)) !important;background:#333 -moz-linear-gradient(top,#777,#000) !important;background-color:#333 !important;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}.btn a{height:22px}.btn.medium *{padding:0 12px;font-size:16px;height:30px;line-height:28px}.btn.medium a{height:28px}.btn.large *{padding:0 18px;font-size:22px;height:36px;line-height:34px}.btn.large a{height:34px}/* Button - Regucy */span.button,a.button{position:relative;display:inline-block;vertical-align:top}span.button *,a.button *{display:inline-block;padding:0 8px;font-size:12px;height:24px;line-height:22px;margin:0;font-weight:bold !important;color:#fff;text-decoration:none !important;border:1px solid;cursor:pointer;overflow:visible;border-radius:3px;box-shadow:inset 0 0 1px #fff;background-color:#666;text-shadow:0 -1px 0 #333;zoom:1}span.button *[type=submit][disabled=disabled],span.button *[type=button][disabled=disabled]{opacity:.5;*filter:alpha(opacity=50)}a.button span, span.button button[type=button]{border-color:#ccc;color:#333 !important;background:#eee -webkit-gradient(linear,0% 0%,0% 100%,from(#fff),to(#ddd));background:#eee -moz-linear-gradient(top,#fff,#ddd);background-color:#eee;text-shadow:1px 1px 0 #fff;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#ffffff, endColorStr=#dddddd)}span.button input, span.button button[type=submit]{border-color:#666;background:#333 -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#777),color-stop(0.5,#333),color-stop(0.5,#000));background:#333 -moz-linear-gradient(top,#777,#000);background-color:#333;color:#ffc !important;filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#777777, endColorStr=#333333)}a.button span{height:22px}/* Button Area */.btnArea{margin:1em 0;text-align:right;zoom:1}.btnArea:after{content:"";display:block;clear:both}.btnArea .etc{float:left}/* Text Button */input[type=submit].text,input[type=button].text, button[type=submit].text,button[type=button].text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a !important;background:none;text-decoration:underline;cursor:pointer}/* Popup Menu Area */#popup_menu_area{position:absolute;background:#fff;border:1px solid #e9e9e9;border-radius:5px;padding:10px;line-height:1.3;box-shadow:0 0 6px #666;font-size:12px;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}#popup_menu_area ul{list-style:none;margin:0;padding:0}#popup_menu_area li{margin:0;padding:0}#popup_menu_area a{text-decoration:none;color:#333}#popup_menu_area a:hover,#popup_menu_area a:avtive,#popup_menu_area a:focus{text-decoration:underline}/* Message */.message{border:1px solid #ddd;background:#f8f8f8;margin:1em 0;padding:0 1em;border-radius:5px;line-height:1.4;font-size:12px}body>.message{margin:1em}.message p{margin:1em 0 !important}.message em{font-style:normal;color:#e00}.message.info,.message.error,.message.update{padding-left:55px}.message.info{border-color:#E0E8EC;background:#EDF9FF url(../../common/img/msg.Info.png) no-repeat 1em .5em}.message.error{border-color:#EFDCDC;background:#FFECEC url(../../common/img/msg.error.png) no-repeat 1em .5em}.message.update{border-color:#EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em}/* Waiting for server response */.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.loading.gif) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px;font-weight:bold}/* Waiting for server response - Modal Window */.wfsr_fog{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.wfsr_fog .bg{position:absolute;position:fixed;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1}.wfsr_fog .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}
\ No newline at end of file
diff --git a/common/tpl/images/blank.gif b/common/img/blank.gif
similarity index 100%
rename from common/tpl/images/blank.gif
rename to common/img/blank.gif
diff --git a/common/tpl/images/flvplayer.swf b/common/img/flvplayer.swf
similarity index 100%
rename from common/tpl/images/flvplayer.swf
rename to common/img/flvplayer.swf
diff --git a/common/img/icon.bubble.png b/common/img/icon.bubble.png
new file mode 100644
index 000000000..82f6f3aad
Binary files /dev/null and b/common/img/icon.bubble.png differ
diff --git a/common/img/msg.Info.png b/common/img/msg.Info.png
new file mode 100644
index 000000000..a6f3565c5
Binary files /dev/null and b/common/img/msg.Info.png differ
diff --git a/common/img/msg.error.png b/common/img/msg.error.png
new file mode 100644
index 000000000..7d9c1a68b
Binary files /dev/null and b/common/img/msg.error.png differ
diff --git a/common/img/msg.loading.gif b/common/img/msg.loading.gif
new file mode 100644
index 000000000..c97ec6ea9
Binary files /dev/null and b/common/img/msg.loading.gif differ
diff --git a/common/img/msg.update.png b/common/img/msg.update.png
new file mode 100644
index 000000000..598afd0a3
Binary files /dev/null and b/common/img/msg.update.png differ
diff --git a/common/js/common.js b/common/js/common.js
index e1c795c4d..3d7ed4db1 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -1,47 +1,977 @@
-/**
- * @file common.js
- * @author NHN (developers@xpressengine.com)
- * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음
+/**
+ * @file common.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음
  **/
-if(jQuery)jQuery.noConflict();(function($){var UA=navigator.userAgent.toLowerCase();$.os={Linux:/linux/.test(UA),Unix:/x11/.test(UA),Mac:/mac/.test(UA),Windows:/win/.test(UA)};$.os.name=($.os.Windows)?'Windows':($.os.Linux)?'Linux':($.os.Unix)?'Unix':($.os.Mac)?'Mac':'';window.XE={loaded_popup_menus:new Array(),addedDocument:new Array(),checkboxToggleAll:function(){var itemName='cart',options={wrap:null,checked:'toggle',doClick:false};switch(arguments.length){case 1:if(typeof (arguments[0])=="string"){itemName=arguments[0]}else $.extend(options,arguments[0]||{});break;case 2:itemName=arguments[0];$.extend(options,arguments[1]||{})};if(options.doClick==true)options.checked=null;if(typeof (options.wrap)=="string")options.wrap='#'+options.wrap;if(options.wrap){var obj=$(options.wrap).find('input[name='+itemName+']:checkbox')}else var obj=$('input[name='+itemName+']:checkbox');if(options.checked=='toggle'){obj.each(function(){$(this).attr('checked',($(this).attr('checked'))?false:true)})}else (options.doClick==true)?obj.click():obj.attr('checked',options.checked)},displayPopupMenu:function(ret_obj,response_tags,params){var target_srl=params.target_srl,menu_id=params.menu_id,menus=ret_obj.menus,html="";if(this.loaded_popup_menus[menu_id]){html=this.loaded_popup_menus[menu_id]}else{if(menus){var item=menus.item;if(typeof (item.length)=='undefined'||item.length<1)item=new Array(item);if(item.length)for(var i=0;i<item.length;i++){var url=item[i].url,str=item[i].str,icon=item[i].icon,target=item[i].target,styleText="",click_str="";if(icon)styleText=" style=\"background-image:url('"+icon+"')\" ";switch(target){case"popup":click_str=" onclick=\"popopen(this.href,'"+target+"'); return false;\"";break;case"self":break;case"javascript":click_str=" onclick=\""+url+"; return false; \"";url="#";break;default:click_str=" onclick=\"window.open(this.href); return false;\"";break};html+='<li '+styleText+'><a href="'+url+'"'+click_str+'>'+str+'</a></li> '}};this.loaded_popup_menus[menu_id]=html};if(html){var area=$('#popup_menu_area').html('<ul>'+html+'</ul>'),areaOffset={top:params.page_y,left:params.page_x};if(area.outerHeight()+areaOffset.top>$(window).height()+$(window).scrollTop())areaOffset.top=$(window).height()-area.outerHeight()+$(window).scrollTop();if(area.outerWidth()+areaOffset.left>$(window).width()+$(window).scrollLeft())areaOffset.left=$(window).width()-area.outerWidth()+$(window).scrollLeft();area.css({top:areaOffset.top,left:areaOffset.left}).show()}}}})(jQuery);jQuery(function($){if(!$('#popup_menu_area').length){var menuObj=$('<div>').attr('id','popup_menu_area').css({display:'none',zIndex:9999});$(document.body).append(menuObj)};$(document).click(function(evt){var area=$('#popup_menu_area');if(!area.length)return;area.hide();var targetObj=$(evt.target);if(!targetObj.length)return;if(targetObj.length&&$.inArray(targetObj.attr('nodeName'),['DIV','SPAN','A'])==-1)targetObj=targetObj.parent();if(!targetObj.length||$.inArray(targetObj.attr('nodeName'),['DIV','SPAN','A'])==-1)return;var class_name=targetObj.attr('className');if(class_name.indexOf('_')<=0)return;var class_name_list=class_name.split(' '),menu_id='',menu_id_regx=/^([a-zA-Z]+)_([0-9]+)$/;for(var i=0,c=class_name_list.length;i<c;i++)if(menu_id_regx.test(class_name_list[i]))menu_id=class_name_list[i];if(!menu_id)return;var tmp_arr=menu_id.split('_'),module_name=tmp_arr[0],target_srl=tmp_arr[1];if(!module_name||!target_srl||target_srl<1)return;var action_name="get"+module_name.substr(0,1).toUpperCase()+module_name.substr(1,module_name.length-1)+"Menu",params=new Array();params.target_srl=target_srl;params.mid=params.cur_mid=current_mid;params.cur_act=current_url.getQuery('act');params.menu_id=menu_id;params.page_x=evt.pageX;params.page_y=evt.pageY;if(typeof (xeVid)!='undefined')params.vid=xeVid;var response_tags=new Array("error","message","menus");if(typeof (XE.loaded_popup_menus[menu_id])!='undefined'){XE.displayPopupMenu(params,response_tags,params);return};show_waiting_message=false;exec_xml(module_name,action_name,params,XE.displayPopupMenu,response_tags,params);show_waiting_message=true});if($.browser.msie)$('select').each(function(i,sels){var disabled_exists=false,first_enable=new Array();for(var j=0;j<sels.options.length;j++)if(sels.options[j].disabled){sels.options[j].style.color='#CCCCCC';disabled_exists=true}else first_enable[i]=(first_enable[i]>-1)?first_enable[i]:j;if(!disabled_exists)return;sels.oldonchange=sels.onchange;sels.onchange=function(){if(this.options[this.selectedIndex].disabled){this.selectedIndex=first_enable[i]}else if(this.oldonchange)this.oldonchange()};if(sels.selectedIndex>=0&&sels.options[sels.selectedIndex].disabled)sels.onchange()});var drEditorFold=$('.xe_content .fold_button');if(drEditorFold.size()){var fold_container=$('div.fold_container',drEditorFold);$('button.more',drEditorFold).click(function(){$(this).hide().next('button').show().parent().next(fold_container).show()});$('button.less',drEditorFold).click(function(){$(this).hide().prev('button').show().parent().next(fold_container).hide()})}});String.prototype.getQuery=function(key){var idx=this.indexOf('?');if(idx==-1)return null;var query_string=this.substr(idx+1,this.length),args={};query_string.replace(/([^=]+)=([^&]*)(&|$)/g,function(){args[arguments[1]]=arguments[2]});var q=args[key];if(typeof (q)=="undefined")q="";return q};String.prototype.setQuery=function(key,val){var idx=this.indexOf('?'),uri=this.replace(/#$/,'');if(idx!=-1){var query_string=uri.substr(idx+1,this.length),args={},q_list=[];uri=this.substr(0,idx);query_string.replace(/([^=]+)=([^&]*)(&|$)/g,function(all,key,val){args[key]=val});args[key]=val;jQuery.each(args,function(key,val){if(!jQuery.trim(val))return;q_list.push(decodeURIComponent(key)+'='+decodeURIComponent(val))});query_string=q_list.join('&');uri=uri+(query_string?'?'+query_string:'')}else if(val.toString().trim())uri=uri+"?"+decodeURIComponent(key)+"="+decodeURIComponent(val);var re=/https:\/\/([^:\/]+)(:\d+|)/i,check=re.exec(uri);if(check){var toReplace="http://"+check[1];if(typeof (http_port)!='undefined'&&http_port!=80)toReplace+=":"+http_port;uri=uri.replace(re,toReplace)};var bUseSSL=false;if(typeof (enforce_ssl)!='undefined'&&enforce_ssl){bUseSSL=true}else if(typeof (ssl_actions)!='undefined'&&typeof (ssl_actions.length)!='undefined'&&uri.getQuery('act')){var act=uri.getQuery('act');for(i=0;i<ssl_actions.length;i++)if(ssl_actions[i]==act){bUseSSL=true;break}};if(bUseSSL){var re=/http:\/\/([^:\/]+)(:\d+|)/i,check=re.exec(uri);if(check){var toReplace="https://"+check[1];if(typeof (https_port)!='undefined'&&https_port!=443)toReplace+=":"+https_port;uri=uri.replace(re,toReplace)}};return encodeURI(uri)};String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/g,"")}
-function xSleep(sec){sec=sec/1000;var now=new Date(),sleep=new Date();while(sleep.getTime()-now.getTime()<sec)sleep=new Date()}
-function isDef(){for(var i=0;i<arguments.length;++i)if(typeof (arguments[i])=="undefined")return false;return true};var winopen_list=new Array()
-function winopen(url,target,attribute){if(typeof (xeVid)!='undefined'&&url.indexOf(request_uri)>-1&&!url.getQuery('vid'))url=url.setQuery('vid',xeVid);try{if(target!="_blank"&&winopen_list[target]){winopen_list[target].close();winopen_list[target]=null}}catch(e){};if(typeof (target)=='undefined')target='_blank';if(typeof (attribute)=='undefined')attribute='';var win=window.open(url,target,attribute);win.focus();if(target!="_blank")winopen_list[target]=win}
-function popopen(url,target){if(typeof (target)=="undefined")target="_blank";if(typeof (xeVid)!='undefined'&&url.indexOf(request_uri)>-1&&!url.getQuery('vid'))url=url.setQuery('vid',xeVid);winopen(url,target,"left=10,top=10,width=10,height=10,scrollbars=no,resizable=yes,toolbars=no")}
-function sendMailTo(to){location.href="mailto:"+to}
-function move_url(url,open_wnidow){if(!url)return false;if(typeof (open_wnidow)=='undefined')open_wnidow='N';if(open_wnidow=='N'){open_wnidow=false}else open_wnidow=true;if(/^\./.test(url))url=request_uri+url;if(open_wnidow){winopen(url)}else location.href=url;return false}
-function displayMultimedia(src,width,height,options){var html=_displayMultimedia(src,width,height,options);if(html)document.writeln(html)}
-function _displayMultimedia(src,width,height,options){if(src.indexOf('files')==0)src=request_uri+src;var defaults={wmode:'transparent',allowScriptAccess:'sameDomain',quality:'high',flashvars:'',autostart:false},params=jQuery.extend(defaults,options||{}),autostart=(params.autostart&&params.autostart!='false')?'true':'false';delete (params.autostart);var clsid="",codebase="",html="";if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){html='<img src="'+src+'" width="'+width+'" height="'+height+'" />'}else if(/\.flv$/i.test(src)||/\.mov$/i.test(src)||/\.moov$/i.test(src)||/\.m4v$/i.test(src)){html='<embed src="'+request_uri+'common/tpl/images/flvplayer.swf" allowfullscreen="true" autostart="'+autostart+'" width="'+width+'" height="'+height+'" flashvars="&file='+src+'&width='+width+'&height='+height+'&autostart='+autostart+'" wmode="'+params.wmode+'" />'}else if(/\.swf/i.test(src)){clsid='clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';if(typeof (enforce_ssl)!='undefined'&&enforce_ssl){codebase="https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"}else codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0";html='<object classid="'+clsid+'" codebase="'+codebase+'" width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'">';html+='<param name="movie" value="'+src+'" />';for(var name in params)if(params[name]!='undefined'&&params[name]!='')html+='<param name="'+name+'" value="'+params[name]+'" />';html+='<embed src="'+src+'" autostart="'+autostart+'"  width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'" wmode="'+params.wmode+'"></embed></object>'}else{if(jQuery.browser.mozilla||jQuery.browser.opera)autostart=(params.autostart&&params.autostart!='false')?'1':'0';html='<embed src="'+src+'" autostart="'+autostart+'" width="'+width+'" height="'+height+'"';if(params.wmode=='transparent')html+=' windowlessvideo="1"';html+='></embed>'};return html}
-function zbxe_folder_open(id){jQuery("#folder_open_"+id).hide();jQuery("#folder_close_"+id).show();jQuery("#folder_"+id).show()}
-function zbxe_folder_close(id){jQuery("#folder_open_"+id).show();jQuery("#folder_close_"+id).hide();jQuery("#folder_"+id).hide()}
-function setFixedPopupSize(){var $=jQuery,$header=$('#popHeader'),$body=$('#popBody');if($body.length)if($body.height()>400)$body.css({overflow:'auto',overflowX:'hidden',height:400+'px'});var $win=$(window),$pc=$('#popup_content'),w=Math.max($pc[0].offsetWidth,600),h=$pc[0].offsetHeight,dw=$win.width(),dh=$win.height(),_w=0,_h=0;if(w!=dw)_w=w-dw;if(h!=dh)_h=h-dh;if(_w||_h)window.resizeBy(_w,_h);if(!arguments.callee.executed){setTimeout(setFixedPopupSize,300);arguments.callee.executed=true}}
-function doCallModuleAction(module,action,target_srl){var params=new Array();params.target_srl=target_srl;params.cur_mid=current_mid;exec_xml(module,action,params,completeCallModuleAction)}
-function completeCallModuleAction(ret_obj,response_tags){if(ret_obj.message!='success')alert(ret_obj.message);location.reload()}
-function completeMessage(ret_obj){alert(ret_obj.message);location.reload()}
-function doChangeLangType(obj){if(typeof (obj)=="string"){setLangType(obj)}else{var val=obj.options[obj.selectedIndex].value;setLangType(val)};location.href=location.href.setQuery('l','')}
-function setLangType(lang_type){var expire=new Date();expire.setTime(expire.getTime()+(7000*24*3600000));setCookie('lang_type',lang_type,expire,'/')}
-function doDocumentPreview(obj){var fo_obj=obj;while(fo_obj.nodeName!="FORM")fo_obj=fo_obj.parentNode;if(fo_obj.nodeName!="FORM")return;var editor_sequence=fo_obj.getAttribute('editor_sequence'),content=editorGetContent(editor_sequence),win=window.open("","previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes"),dummy_obj=jQuery("#previewDocument");if(!dummy_obj.length)dummy_obj=jQuery('<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'"><input type="hidden" name="module" value="document" /><input type="hidden" name="act" value="dispDocumentPreview" /><input type="hidden" name="content" /></form>').appendTo(document.body);dummy_obj.find('input[name="content"]').val(content).end().submit()}
-function doDocumentSave(obj){var editor_sequence=obj.form.getAttribute('editor_sequence'),prev_content=editorRelKeys[editor_sequence]['content'].value;if(typeof (editor_sequence)!='undefined'&&editor_sequence&&typeof (editorRelKeys)!='undefined'&&typeof (editorGetContent)=='function'){var content=editorGetContent(editor_sequence);editorRelKeys[editor_sequence]['content'].value=content};var params={},responses=['error','message','document_srl'],elms=obj.form.elements,data=jQuery(obj.form).serializeArray();jQuery.each(data,function(i,field){var val=jQuery.trim(field.value);if(!val)return true;if(/\[\]$/.test(field.name))field.name=field.name.replace(/\[\]$/,'');if(params[field.name]){params[field.name]+='|@|'+val}else params[field.name]=field.value});exec_xml('member','procMemberSaveDocument',params,completeDocumentSave,responses,params,obj.form);editorRelKeys[editor_sequence]['content'].value=prev_content;return false}
-function completeDocumentSave(ret_obj){jQuery('input[name=document_srl]').eq(0).val(ret_obj.document_srl);alert(ret_obj.message)};var objForSavedDoc=null
-function doDocumentLoad(obj){objForSavedDoc=obj.form;popopen(request_uri.setQuery('module','member').setQuery('act','dispSavedDocumentList'))}
-function doDocumentSelect(document_srl){if(!opener||!opener.objForSavedDoc){window.close();return};opener.location.href=opener.current_url.setQuery('document_srl',document_srl).setQuery('act','dispBoardWrite');window.close()}
-function viewSkinInfo(module,skin){popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin,'SkinInfo')};var addedDocument=new Array()
-function doAddDocumentCart(obj){var srl=obj.value;addedDocument[addedDocument.length]=srl;setTimeout(function(){callAddDocumentCart(addedDocument.length)},100)}
-function callAddDocumentCart(document_length){if(addedDocument.length<1||document_length!=addedDocument.length)return;var params=new Array();params.srls=addedDocument.join(",");exec_xml("document","procDocumentAddCart",params,null);addedDocument=new Array()}
-function transRGB2Hex(value){if(!value)return value;if(value.indexOf('#')>-1)return value.replace(/^#/,'');if(value.toLowerCase().indexOf('rgb')<0)return value;value=value.replace(/^rgb\(/i,'').replace(/\)$/,'');value_list=value.split(',');var hex='';for(var i=0;i<value_list.length;i++){var color=parseInt(value_list[i],10).toString(16);if(color.length==1)color='0'+color;hex+=color};return hex}
-function toggleSecuritySignIn(){var href=location.href;if(/https:\/\//i.test(href)){location.href=href.replace(/^https/i,'http')}else location.href=href.replace(/^http/i,'https')}
-function reloadDocument(){location.reload()};var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(input){var output="",chr1,chr2,chr3,enc1,enc2,enc3,enc4,i=0;input=Base64._utf8_encode(input);while(i<input.length){chr1=input.charCodeAt(i++);chr2=input.charCodeAt(i++);chr3=input.charCodeAt(i++);enc1=chr1>>2;enc2=((chr1&3)<<4)|(chr2>>4);enc3=((chr2&15)<<2)|(chr3>>6);enc4=chr3&63;if(isNaN(chr2)){enc3=enc4=64}else if(isNaN(chr3))enc4=64;output=output+this._keyStr.charAt(enc1)+this._keyStr.charAt(enc2)+this._keyStr.charAt(enc3)+this._keyStr.charAt(enc4)};return output},decode:function(input){var output="",chr1,chr2,chr3,enc1,enc2,enc3,enc4,i=0;input=input.replace(/[^A-Za-z0-9\+\/\=]/g,"");while(i<input.length){enc1=this._keyStr.indexOf(input.charAt(i++));enc2=this._keyStr.indexOf(input.charAt(i++));enc3=this._keyStr.indexOf(input.charAt(i++));enc4=this._keyStr.indexOf(input.charAt(i++));chr1=(enc1<<2)|(enc2>>4);chr2=((enc2&15)<<4)|(enc3>>2);chr3=((enc3&3)<<6)|enc4;output=output+String.fromCharCode(chr1);if(enc3!=64)output=output+String.fromCharCode(chr2);if(enc4!=64)output=output+String.fromCharCode(chr3)};output=Base64._utf8_decode(output);return output},_utf8_encode:function(string){string=string.replace(/\r\n/g,"\n");var utftext="";for(var n=0;n<string.length;n++){var c=string.charCodeAt(n);if(c<128){utftext+=String.fromCharCode(c)}else if((c>127)&&(c<2048)){utftext+=String.fromCharCode((c>>6)|192);utftext+=String.fromCharCode((c&63)|128)}else{utftext+=String.fromCharCode((c>>12)|224);utftext+=String.fromCharCode(((c>>6)&63)|128);utftext+=String.fromCharCode((c&63)|128)}};return utftext},_utf8_decode:function(utftext){var string="",i=0,c=c1=c2=0;while(i<utftext.length){c=utftext.charCodeAt(i);if(c<128){string+=String.fromCharCode(c);i++}else if((c>191)&&(c<224)){c2=utftext.charCodeAt(i+1);string+=String.fromCharCode(((c&31)<<6)|(c2&63));i+=2}else{c2=utftext.charCodeAt(i+1);c3=utftext.charCodeAt(i+2);string+=String.fromCharCode(((c&15)<<12)|((c2&63)<<6)|(c3&63));i+=3}};return string}};if(typeof (resizeImageContents)=='undefined')function resizeImageContents(){};if(typeof (activateOptionDisabled)=='undefined')function activateOptionDisabled(){};objectExtend=jQuery.extend
-function toggleDisplay(objId){jQuery('#'+objId).toggle()}
-function checkboxSelectAll(formObj,name,checked){var itemName=name,option={};if(typeof (formObj)!="undefined")option.wrap=formObj;if(typeof (checked)!="undefined")option.checked=checked;XE.checkboxToggleAll(itemName,option)}
-function clickCheckBoxAll(formObj,name){var itemName=name,option={doClick:true};if(typeof (formObj)!="undefined")option.wrap=formObj;XE.checkboxToggleAll(itemName,option)}
-function svc_folder_open(id){jQuery("#_folder_open_"+id).hide();jQuery("#_folder_close_"+id).show();jQuery("#_folder_"+id).show()}
-function svc_folder_close(id){jQuery("#_folder_open_"+id).show();jQuery("#_folder_close_"+id).hide();jQuery("#_folder_"+id).hide()}
-function open_calendar(fo_id,day_str,callback_func){if(typeof (day_str)=="undefined")day_str="";var url="./common/tpl/calendar.php?";if(fo_id)url+="fo_id="+fo_id;if(day_str)url+="&day_str="+day_str;if(callback_func)url+="&callback_func="+callback_func;popopen(url,'Calendar')};var loaded_popup_menus=XE.loaded_popup_menus
-function createPopupMenu(){}
-function chkPopupMenu(){}
-function displayPopupMenu(ret_obj,response_tags,params){XE.displayPopupMenu(ret_obj,response_tags,params)}
-function GetObjLeft(obj){return jQuery(obj).offset().left}
-function GetObjTop(obj){return jQuery(obj).offset().top}
-function replaceOuterHTML(obj,html){jQuery(obj).replaceWith(html)}
-function getOuterHTML(obj){return jQuery(obj).html().trim()}
-function setCookie(name,value,expire,path){var s_cookie=name+"="+escape(value)+((!expire)?"":("; expires="+expire.toGMTString()))+"; path="+((!path)?"/":path);document.cookie=s_cookie};jQuery(function(){jQuery(".lang_code").each(function(){var objText=jQuery(this),targetName=objText.attr("id");if(typeof (targetName)=="undefined")targetName=objText.attr("name");if(typeof (targetName)=="undefined")return;objText.after("<a href='"+request_uri.setQuery('module','module').setQuery('act','dispModuleAdminLangcode').setQuery('target',targetName)+"' class='buttonSet buttonSetting' onclick='popopen(this.href);return false;'><span>find_langcode</span></a>")})})
\ No newline at end of file
+
+/* jQuery 참조변수($) 제거 */
+if(jQuery) jQuery.noConflict();
+
+(function($) {
+    /* OS check */
+    var UA = navigator.userAgent.toLowerCase();
+    $.os = {
+        Linux: /linux/.test(UA),
+        Unix: /x11/.test(UA),
+        Mac: /mac/.test(UA),
+        Windows: /win/.test(UA)
+    };
+    $.os.name = ($.os.Windows) ? 'Windows' :
+        ($.os.Linux) ? 'Linux' :
+        ($.os.Unix) ? 'Unix' :
+        ($.os.Mac) ? 'Mac' : '';
+
+    /**
+     * @brief XE 공용 유틸리티 함수
+     * @namespace XE
+     */
+    window.XE = {
+        loaded_popup_menus : new Array(),
+        addedDocument : new Array(),
+        /**
+         * @brief 특정 name을 가진 체크박스들의 checked 속성 변경
+         * @param [itemName='cart',][options={}]
+         */
+        checkboxToggleAll : function(itemName) {
+            if(!is_def(itemName)) itemName='cart';
+            var options = {
+                wrap : null,
+                checked : 'toggle',
+                doClick : false
+            };
+
+            switch(arguments.length) {
+                case 1:
+                    if(typeof(arguments[0]) == "string") {
+                        itemName = arguments[0];
+                    } else {
+                        $.extend(options, arguments[0] || {});
+						itemName = 'cart';
+                    }
+                    break;
+                case 2:
+                    itemName = arguments[0];
+                    $.extend(options, arguments[1] || {});
+            }
+
+            if(options.doClick == true) options.checked = null;
+            if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap;
+
+            if(options.wrap) {
+                var obj = $(options.wrap).find('input[name='+itemName+']:checkbox');
+            } else {
+                var obj = $('input[name='+itemName+']:checkbox');
+            }
+			
+			if(options.checked == 'toggle') {
+                obj.each(function() {
+                    $(this).attr('checked', ($(this).attr('checked')) ? false : true);
+                });
+            } else {
+                (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked);
+            }
+        },
+
+        /**
+         * @brief 문서/회원 등 팝업 메뉴 출력
+         */
+        displayPopupMenu : function(ret_obj, response_tags, params) {
+            var target_srl = params["target_srl"];
+            var menu_id = params["menu_id"];
+            var menus = ret_obj['menus'];
+            var html = "";
+
+            if(this.loaded_popup_menus[menu_id]) {
+                html = this.loaded_popup_menus[menu_id];
+
+            } else {
+                if(menus) {
+                    var item = menus['item'];
+                    if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
+                    if(item.length) {
+                        for(var i=0;i<item.length;i++) {
+                            var url = item[i].url;
+                            var str = item[i].str;
+                            var icon = item[i].icon;
+                            var target = item[i].target;
+
+                            var styleText = "";
+                            var click_str = "";
+                            if(icon) styleText = " style=\"background-image:url('"+icon+"')\" ";
+                            switch(target) {
+                                case "popup" :
+                                        click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\"";
+                                    break;
+                                case "javascript" :
+                                        click_str = " onclick=\""+url+"; return false; \"";
+                                        url="#";
+                                    break;
+                                default :
+                                        click_str = " onclick=\"window.open(this.href); return false;\"";
+                                    break;
+                            }
+
+                            html += '<li '+styleText+'><a href="'+url+'"'+click_str+'>'+str+'</a></li> ';
+                        }
+                    }
+                }
+                this.loaded_popup_menus[menu_id] =  html;
+            }
+
+            /* 레이어 출력 */
+            if(html) {
+                var area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
+                var areaOffset = {top:params['page_y'], left:params['page_x']};
+
+                if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop())
+                    areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop();
+                if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft())
+                    areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft();
+
+                area.css({ top:areaOffset.top, left:areaOffset.left }).show();
+            }
+        }
+    }
+
+}) (jQuery);
+
+
+
+/* jQuery(document).ready() */
+jQuery(function($) {
+
+    /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */
+    if($.browser.msie) {
+        $('select').each(function(i, sels) {
+            var disabled_exists = false;
+            var first_enable = new Array();
+
+            for(var j=0; j < sels.options.length; j++) {
+                if(sels.options[j].disabled) {
+                    sels.options[j].style.color = '#CCCCCC';
+                    disabled_exists = true;
+                }else{
+                    first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j;
+                }
+            }
+
+            if(!disabled_exists) return;
+
+            sels.oldonchange = sels.onchange;
+            sels.onchange = function() {
+                if(this.options[this.selectedIndex].disabled) {
+
+                    this.selectedIndex = first_enable[i];
+                    /*
+                    if(this.options.length<=1) this.selectedIndex = -1;
+                    else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++;
+                    else this.selectedIndex--;
+                    */
+
+                } else {
+                    if(this.oldonchange) this.oldonchange();
+                }
+            };
+
+            if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange();
+
+        });
+    }
+
+    /* 단락에디터 fold 컴포넌트 펼치기/접기 */
+    var drEditorFold = $('.xe_content .fold_button');
+    if(drEditorFold.size()) {
+        var fold_container = $('div.fold_container', drEditorFold);
+        $('button.more', drEditorFold).click(function() {
+            $(this).hide().next('button').show().parent().next(fold_container).show();
+        });
+        $('button.less', drEditorFold).click(function() {
+            $(this).hide().prev('button').show().parent().next(fold_container).hide();
+        });
+    }
+
+});
+
+
+/**
+ * @brief location.href에서 특정 key의 값을 return
+ **/
+String.prototype.getQuery = function(key) {
+    var idx = this.indexOf('?');
+    if(idx == -1) return null;
+    var query_string = this.substr(idx+1, this.length);
+    var args = {};
+    query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; });
+
+    var q = args[key];
+    if(typeof(q)=="undefined") q = "";
+
+    return q;
+}
+
+/**
+ * @brief location.href에서 특정 key의 값을 return
+ **/
+String.prototype.setQuery = function(key, val) {
+    var idx = this.indexOf('?');
+    var uri = this.replace(/#$/, '');
+
+    if(idx != -1) {
+        var query_string = uri.substr(idx+1, this.length), args = {}, q_list = [];
+		uri = this.substr(0, idx);
+        query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; });
+
+        args[key] = val;
+
+		jQuery.each(args, function(key,val){
+			if (!jQuery.trim(val)) return;
+			q_list.push(key+'='+decodeURI(val));
+		});
+
+		query_string = q_list.join('&');
+		uri = uri+(query_string?'?'+query_string:'');
+    } else {
+        if(val.toString().trim()) uri = uri+"?"+key+"="+val;
+    }
+
+    var re = /https:\/\/([^:\/]+)(:\d+|)/i;
+    var check = re.exec(uri);
+    if(check)
+    {
+        var toReplace = "http://"+check[1];
+        if(typeof(http_port)!='undefined' && http_port != 80)
+        {
+            toReplace += ":" + http_port;
+        }
+        uri = uri.replace(re,toReplace);
+    }
+    var bUseSSL = false;
+    if(typeof(enforce_ssl)!='undefined' && enforce_ssl)
+    {
+        bUseSSL = true;
+    }
+    else if(typeof(ssl_actions)!='undefined' && typeof(ssl_actions.length)!='undefined' && uri.getQuery('act')) {
+        var act = uri.getQuery('act');
+        for(i=0;i<ssl_actions.length;i++) {
+            if(ssl_actions[i]==act) {
+                bUseSSL = true;
+                break;
+            }
+        }
+    }
+
+    if(bUseSSL)
+    {
+        var re = /http:\/\/([^:\/]+)(:\d+|)/i;
+        var check = re.exec(uri);
+        if(check)
+        {
+            var toReplace = "https://"+check[1];
+            if(typeof(https_port)!='undefined' && https_port != 443)
+            {
+                toReplace += ":" + https_port;
+            }
+            uri = uri.replace(re,toReplace);
+        }
+    }
+
+    return encodeURI(uri);
+}
+
+/**
+ * @brief string prototype으로 trim 함수 추가
+ **/
+String.prototype.trim = function() {
+    return this.replace(/(^\s*)|(\s*$)/g, "");
+}
+
+/**
+ * @brief xSleep(micro time)
+ **/
+function xSleep(sec) {
+    sec = sec / 1000;
+    var now = new Date();
+    var sleep = new Date();
+    while( sleep.getTime() - now.getTime() < sec) {
+        sleep = new Date();
+    }
+}
+
+/**
+ * @brief 주어진 인자가 하나라도 defined되어 있지 않으면 false return
+ **/
+function isDef() {
+    for(var i=0; i < arguments.length; ++i) {
+        if(typeof(arguments[i]) == "undefined") return false;
+    }
+    return true;
+}
+
+/**
+ * @brief 윈도우 오픈
+ * 열려진 윈도우의 관리를 통해 window.focus()등을 FF에서도 비슷하게 구현함
+ **/
+var winopen_list = new Array();
+function winopen(url, target, attribute) {
+    if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
+    try {
+        if(target != "_blank" && winopen_list[target]) {
+            winopen_list[target].close();
+            winopen_list[target] = null;
+        }
+    } catch(e) {
+    }
+
+    if(typeof(target) == 'undefined') target = '_blank';
+    if(typeof(attribute) == 'undefined') attribute = '';
+    var win = window.open(url, target, attribute);
+    win.focus();
+    if(target != "_blank") winopen_list[target] = win;
+}
+
+/**
+ * @brief 팝업으로만 띄우기
+ * common/tpl/popup_layout.html이 요청되는 XE내의 팝업일 경우에 사용
+ **/
+function popopen(url, target) {
+    if(typeof(target) == "undefined") target = "_blank";
+    if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
+    winopen(url, target, "width=650,height=500,scrollbars=yes,resizable=yes,toolbars=no");
+}
+
+/**
+ * @brief 메일 보내기용
+ **/
+function sendMailTo(to) {
+    location.href="mailto:"+to;
+}
+
+/**
+ * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움)
+ **/
+function move_url(url, open_wnidow) {
+    if(!url) return false;
+    if(typeof(open_wnidow) == 'undefined') open_wnidow = 'N';
+    if(open_wnidow=='N') {
+        open_wnidow = false;
+    } else {
+        open_wnidow = true;
+    }
+
+    if(/^\./.test(url)) url = request_uri+url;
+
+    if(open_wnidow) {
+        winopen(url);
+    } else {
+        location.href=url;
+    }
+
+    return false;
+}
+
+/**
+ * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용)
+ **/
+function displayMultimedia(src, width, height, options) {
+    var html = _displayMultimedia(src, width, height, options);
+    if(html) document.writeln(html);
+}
+function _displayMultimedia(src, width, height, options) {
+    if(src.indexOf('files') == 0) src = request_uri + src;
+
+    var defaults = {
+        wmode : 'transparent',
+        allowScriptAccess : 'sameDomain',
+        quality : 'high',
+        flashvars : '',
+        autostart : false
+    };
+
+    var params = jQuery.extend(defaults, options || {});
+	var autostart = (params.autostart && params.autostart != 'false') ? 'true' : 'false';
+	delete(params.autostart);
+
+    var clsid = "";
+    var codebase = "";
+    var html = "";
+
+    if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){
+        html = '<img src="'+src+'" width="'+width+'" height="'+height+'" />';
+    } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) {
+        html = '<embed src="'+request_uri+'common/img/flvplayer.swf" allowfullscreen="true" autostart="'+autostart+'" width="'+width+'" height="'+height+'" flashvars="&file='+src+'&width='+width+'&height='+height+'&autostart='+autostart+'" wmode="'+params.wmode+'" />';
+    } else if(/\.swf/i.test(src)) {
+        clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+
+        if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
+        else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
+        html = '<object classid="'+clsid+'" codebase="'+codebase+'" width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'">';
+        html += '<param name="movie" value="'+src+'" />';
+        for(var name in params) {
+            if(params[name] != 'undefined' && params[name] != '') {
+                html += '<param name="'+name+'" value="'+params[name]+'" />';
+            }
+        }
+        html += ''
+            + '<embed src="'+src+'" autostart="'+autostart+'"  width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'" wmode="'+params.wmode+'"></embed>'
+            + '</object>';
+    }  else {
+		if (jQuery.browser.mozilla || jQuery.browser.opera) {
+			// firefox and opera uses 0 or 1 for autostart parameter.
+			autostart = (params.autostart && params.autostart != 'false') ? '1' : '0';
+		}
+
+        html = '<embed src="'+src+'" autostart="'+autostart+'" width="'+width+'" height="'+height+'"';
+        if(params.wmode == 'transparent') {
+            html += ' windowlessvideo="1"';
+        }
+        html += '></embed>';
+    }
+    return html;
+}
+
+/**
+ * @brief 에디터에서 사용되는 내용 여닫는 코드 (고정, zbxe용)
+ **/
+function zbxe_folder_open(id) {
+    jQuery("#folder_open_"+id).hide();
+    jQuery("#folder_close_"+id).show();
+    jQuery("#folder_"+id).show();
+}
+function zbxe_folder_close(id) {
+    jQuery("#folder_open_"+id).show();
+    jQuery("#folder_close_"+id).hide();
+    jQuery("#folder_"+id).hide();
+}
+
+/**
+ * @brief 팝업의 경우 내용에 맞춰 현 윈도우의 크기를 조절해줌
+ * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ
+ * popup_layout 에서 window.onload 시 자동 요청됨.
+ **/
+function setFixedPopupSize() {
+	var $ = jQuery, $win = $(window), $pc = $('body>.popup'), w, h, dw, dh, offset;
+
+	offset = $pc.css({overflow:'scroll'}).offset();
+
+	w = $pc.width(10).height(10000).get(0).scrollWidth + offset.left*2;
+	h = $pc.height(10).width(10000).get(0).scrollHeight + offset.top*2;
+
+	if(w < 600) w = 600 + offset.left*2;
+
+	dw = $win.width();
+	dh = $win.height();
+
+	if(w != dw) window.resizeBy(w - dw, 0);
+	if(h != dh) window.resizeBy(0, h - dh);
+
+	$pc.width(w-offset.left*2).css({overflow:'',height:''});
+}
+
+/**
+ * @brief 추천/비추천,스크랩,신고기능등 특정 srl에 대한 특정 module/action을 호출하는 함수
+ **/
+function doCallModuleAction(module, action, target_srl) {
+    var params = {
+		target_srl : target_srl,
+		cur_mid    : current_mid,
+		mid        : current_mid
+	};
+    exec_xml(module, action, params, completeCallModuleAction);
+}
+
+function completeCallModuleAction(ret_obj, response_tags) {
+    if(ret_obj['message']!='success') alert(ret_obj['message']);
+    location.reload();
+}
+
+function completeMessage(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+
+
+/* 언어코드 (lang_type) 쿠키값 변경 */
+function doChangeLangType(obj) {
+    if(typeof(obj) == "string") {
+        setLangType(obj);
+    } else {
+        var val = obj.options[obj.selectedIndex].value;
+        setLangType(val);
+    }
+	location.href = location.href.setQuery('l', '');
+}
+function setLangType(lang_type) {
+    var expire = new Date();
+    expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
+    setCookie('lang_type', lang_type, expire, '/');
+}
+
+/* 미리보기 */
+function doDocumentPreview(obj) {
+    var fo_obj = obj;
+    while(fo_obj.nodeName != "FORM") {
+        fo_obj = fo_obj.parentNode;
+    }
+    if(fo_obj.nodeName != "FORM") return;
+    var editor_sequence = fo_obj.getAttribute('editor_sequence');
+
+    var content = editorGetContent(editor_sequence);
+
+    var win = window.open("", "previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");
+
+    var dummy_obj = jQuery("#previewDocument");
+
+    if(!dummy_obj.length) {
+        jQuery(
+            '<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'">'+
+            '<input type="hidden" name="module" value="document" />'+
+            '<input type="hidden" name="act" value="dispDocumentPreview" />'+
+            '<input type="hidden" name="content" />'+
+            '</form>'
+        ).appendTo(document.body);
+
+        dummy_obj = jQuery("#previewDocument")[0];
+    }
+
+    if(dummy_obj) {
+        dummy_obj.content.value = content;
+        dummy_obj.submit();
+    }
+}
+
+/* 게시글 저장 */
+function doDocumentSave(obj) {
+    var editor_sequence = obj.form.getAttribute('editor_sequence');
+    var prev_content = editorRelKeys[editor_sequence]['content'].value;
+    if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') {
+        var content = editorGetContent(editor_sequence);
+        editorRelKeys[editor_sequence]['content'].value = content;
+    }
+
+	var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray();;
+	jQuery.each(data, function(i, field){
+		var val = jQuery.trim(field.value);
+		if(!val) return true;
+		if(/\[\]$/.test(field.name)) field.name = field.name.replace(/\[\]$/, '');
+		if(params[field.name]) params[field.name] += '|@|'+val;
+		else params[field.name] = field.value;
+	});
+
+	exec_xml('document','procDocumentTempSave', params, completeDocumentSave, responses, params, obj.form);
+
+    editorRelKeys[editor_sequence]['content'].value = prev_content;
+    return false;
+}
+
+function completeDocumentSave(ret_obj) {
+    jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']);
+    alert(ret_obj['message']);
+}
+
+/* 저장된 게시글 불러오기 */
+var objForSavedDoc = null;
+function doDocumentLoad(obj) {
+    // 저장된 게시글 목록 불러오기
+    objForSavedDoc = obj.form;
+    popopen(request_uri.setQuery('module','document').setQuery('act','dispTempSavedList'));
+}
+
+/* 저장된 게시글의 선택 */
+function doDocumentSelect(document_srl) {
+    if(!opener || !opener.objForSavedDoc) {
+        window.close();
+        return;
+    }
+
+    // 게시글을 가져와서 등록하기
+    opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite');
+    window.close();
+}
+
+
+/* 스킨 정보 */
+function viewSkinInfo(module, skin) {
+    popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo');
+}
+
+
+/* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */
+var addedDocument = new Array();
+function doAddDocumentCart(obj) {
+    var srl = obj.value;
+    addedDocument[addedDocument.length] = srl;
+    setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100);
+}
+
+function callAddDocumentCart(document_length) {
+    if(addedDocument.length<1 || document_length != addedDocument.length) return;
+    var params = new Array();
+    params["srls"] = addedDocument.join(",");
+    exec_xml("document","procDocumentAddCart", params, null);
+    addedDocument = new Array();
+}
+
+/* ff의 rgb(a,b,c)를 #... 로 변경 */
+function transRGB2Hex(value) {
+    if(!value) return value;
+    if(value.indexOf('#') > -1) return value.replace(/^#/, '');
+
+    if(value.toLowerCase().indexOf('rgb') < 0) return value;
+    value = value.replace(/^rgb\(/i, '').replace(/\)$/, '');
+    value_list = value.split(',');
+
+    var hex = '';
+    for(var i = 0; i < value_list.length; i++) {
+        var color = parseInt(value_list[i], 10).toString(16);
+        if(color.length == 1) color = '0'+color;
+        hex += color;
+    }
+    return hex;
+}
+
+/* 보안 로그인 모드로 전환 */
+function toggleSecuritySignIn() {
+    var href = location.href;
+    if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http');
+    else location.href = href.replace(/^http/i,'https');
+}
+
+function reloadDocument() {
+    location.reload();
+}
+
+
+/**
+*
+* Base64 encode / decode
+* http://www.webtoolkit.info/
+*
+**/
+
+var Base64 = {
+
+    // private property
+    _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+    // public method for encoding
+    encode : function (input) {
+        var output = "";
+        var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        input = Base64._utf8_encode(input);
+
+        while (i < input.length) {
+
+            chr1 = input.charCodeAt(i++);
+            chr2 = input.charCodeAt(i++);
+            chr3 = input.charCodeAt(i++);
+
+            enc1 = chr1 >> 2;
+            enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+            enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+            enc4 = chr3 & 63;
+
+            if (isNaN(chr2)) {
+                enc3 = enc4 = 64;
+            } else if (isNaN(chr3)) {
+                enc4 = 64;
+            }
+
+            output = output +
+            this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+            this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+        }
+
+        return output;
+    },
+
+    // public method for decoding
+    decode : function (input) {
+        var output = "";
+        var chr1, chr2, chr3;
+        var enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+        while (i < input.length) {
+
+            enc1 = this._keyStr.indexOf(input.charAt(i++));
+            enc2 = this._keyStr.indexOf(input.charAt(i++));
+            enc3 = this._keyStr.indexOf(input.charAt(i++));
+            enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+            chr1 = (enc1 << 2) | (enc2 >> 4);
+            chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+            chr3 = ((enc3 & 3) << 6) | enc4;
+
+            output = output + String.fromCharCode(chr1);
+
+            if (enc3 != 64) {
+                output = output + String.fromCharCode(chr2);
+            }
+            if (enc4 != 64) {
+                output = output + String.fromCharCode(chr3);
+            }
+
+        }
+
+        output = Base64._utf8_decode(output);
+
+        return output;
+
+    },
+
+    // private method for UTF-8 encoding
+    _utf8_encode : function (string) {
+        string = string.replace(/\r\n/g,"\n");
+        var utftext = "";
+
+        for (var n = 0; n < string.length; n++) {
+
+            var c = string.charCodeAt(n);
+
+            if (c < 128) {
+                utftext += String.fromCharCode(c);
+            }
+            else if((c > 127) && (c < 2048)) {
+                utftext += String.fromCharCode((c >> 6) | 192);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+            else {
+                utftext += String.fromCharCode((c >> 12) | 224);
+                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+
+        }
+
+        return utftext;
+    },
+
+    // private method for UTF-8 decoding
+    _utf8_decode : function (utftext) {
+        var string = "";
+        var i = 0;
+        var c = c1 = c2 = 0;
+
+        while ( i < utftext.length ) {
+
+            c = utftext.charCodeAt(i);
+
+            if (c < 128) {
+                string += String.fromCharCode(c);
+                i++;
+            }
+            else if((c > 191) && (c < 224)) {
+                c2 = utftext.charCodeAt(i+1);
+                string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+                i += 2;
+            }
+            else {
+                c2 = utftext.charCodeAt(i+1);
+                c3 = utftext.charCodeAt(i+2);
+                string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+                i += 3;
+            }
+
+        }
+
+        return string;
+    }
+
+}
+
+
+
+
+
+
+/* ----------------------------------------------
+ * DEPRECATED
+ * 하위호환용으로 남겨 놓음
+ * ------------------------------------------- */
+
+if(typeof(resizeImageContents) == 'undefined') {
+    function resizeImageContents() {}
+}
+
+if(typeof(activateOptionDisabled) == 'undefined') {
+    function activateOptionDisabled() {}
+}
+
+objectExtend = jQuery.extend;
+
+/**
+ * @brief 특정 Element의 display 옵션 토글
+ **/
+function toggleDisplay(objId) {
+    jQuery('#'+objId).toggle();
+}
+
+/* 체크박스 선택 */
+function checkboxSelectAll(formObj, name, checked) {
+    var itemName = name;
+    var option = {};
+    if(typeof(formObj) != "undefined") option.wrap = formObj;
+    if(typeof(checked) != "undefined") option.checked = checked;
+
+    XE.checkboxToggleAll(itemName, option);
+}
+
+/* 체크박스를 실행 */
+function clickCheckBoxAll(formObj, name) {
+    var itemName = name;
+    var option = { doClick:true };
+    if(typeof(formObj) != "undefined") option.wrap = formObj;
+
+    XE.checkboxToggleAll(itemName, option);
+}
+
+/**
+ * @brief 에디터에서 사용하되 내용 여닫는 코드 (zb5beta beta 호환용으로 남겨 놓음)
+ **/
+function svc_folder_open(id) {
+    jQuery("#_folder_open_"+id).hide();
+    jQuery("#_folder_close_"+id).show();
+    jQuery("#_folder_"+id).show();
+}
+function svc_folder_close(id) {
+    jQuery("#_folder_open_"+id).show();
+    jQuery("#_folder_close_"+id).hide();
+    jQuery("#_folder_"+id).hide();
+}
+
+/**
+ * @brief 날짜 선택 (달력 열기)
+ **/
+function open_calendar(fo_id, day_str, callback_func) {
+    if(typeof(day_str)=="undefined") day_str = "";
+
+    var url = "./common/tpl/calendar.php?";
+    if(fo_id) url+="fo_id="+fo_id;
+    if(day_str) url+="&day_str="+day_str;
+    if(callback_func) url+="&callback_func="+callback_func;
+
+    popopen(url, 'Calendar');
+}
+
+var loaded_popup_menus = XE.loaded_popup_menus;
+function createPopupMenu() {}
+function chkPopupMenu() {}
+function displayPopupMenu(ret_obj, response_tags, params) {
+    XE.displayPopupMenu(ret_obj, response_tags, params);
+}
+
+function GetObjLeft(obj) {
+    return jQuery(obj).offset().left;
+}
+function GetObjTop(obj) {
+    return jQuery(obj).offset().top;
+}
+
+function replaceOuterHTML(obj, html) {
+    jQuery(obj).replaceWith(html);
+}
+
+function getOuterHTML(obj) {
+    return jQuery(obj).html().trim();
+}
+
+function setCookie(name, value, expire, path) {
+	var s_cookie = name + "=" + escape(value) +
+		((!expire) ? "" : ("; expires=" + expire.toGMTString())) +
+		"; path=" + ((!path) ? "/" : path);
+
+	document.cookie = s_cookie;
+}
+
+function getCookie(name) {
+	var match = document.cookie.match(new RegExp(name+'=(.*?)(?:;|$)'));
+	if(match) return unescape(match[1]);
+}
+
+function is_def(v) {
+	return (typeof(v)!='undefined');
+}
+
+function ucfirst(str) {
+	return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+function get_by_id(id) {
+	return document.getElementById(id);
+}
+
+jQuery(function($){
+    $('.lang_code').each(
+		function() 
+		{
+			var objText = $(this);
+			var targetName = objText.attr("id");
+			if(typeof(targetName) == "undefined") targetName = objText.attr("name");
+			if(typeof(targetName) == "undefined") return;
+			objText.after("<a href='"+request_uri.setQuery('module','module').setQuery('act','dispModuleAdminLangcode').setQuery('target',targetName)+"' class='buttonSet buttonSetting' onclick='popopen(this.href);return false;'><span>find_langcode</span></a>"); 
+		}
+    );
+
+	// display popup menu that contains member actions and document actions
+	$(document).click(function(evt) {
+		var $area = $('#popup_menu_area');
+		if(!$area.length) $area = $('<div id="popup_menu_area" style="display:none;z-index:9999" />').appendTo(document.body);
+
+		// 이전에 호출되었을지 모르는 팝업메뉴 숨김
+		$area.hide();
+
+		var $target = $(evt.target).filter('a,div,span');
+		if(!$target.length) $target = $(evt.target).closest('a,div,span');
+		if(!$target.length) return;
+
+        // 객체의 className값을 구함
+		var cls = $target.attr('class'), match;
+		if(cls) match = cls.match(new RegExp('(?:^| )((document|comment|member)_([1-9]\\d*))(?: |$)',''));
+		if(!match) return;
+
+		var action = 'get'+ucfirst(match[2])+'Menu';
+		var params = {
+			mid        : current_mid,
+			cur_mid    : current_mid,
+			menu_id    : match[1],
+			target_srl : match[3],
+			cur_act    : current_url.getQuery('act'),
+			page_x     : evt.pageX,
+			page_y     : evt.pageY
+		};
+		var response_tags = 'error message menus'.split(' ');
+
+		// prevent default action
+		evt.preventDefault();
+		evt.stopPropagation();
+
+		if(is_def(window.xeVid)) params.vid = xeVid;
+		if(is_def(XE.loaded_popup_menus[params.menu_id])) return XE.displayPopupMenu(params, response_tags, params);
+
+		show_waiting_message = false;
+		exec_xml('member', action, params, XE.displayPopupMenu, response_tags, params);
+        show_waiting_message = true;
+    });
+
+	/**
+	 * Create popup windows automatically.
+	 * Find anchors that have the '_xe_popup' class, then add popup script to them.
+	 */
+	$('a._xe_popup').click(function(){
+		var $this = $(this), name = $this.attr('name'), href = $this.attr('href'), win;
+
+		if(!name) name = '_xe_popup_'+Math.floor(Math.random()*1000);
+
+		win = window.open(href, name, 'left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');
+		if(win) win.focus();
+
+		// cancel default action
+		return false;
+	});
+});
diff --git a/common/js/html5.js b/common/js/html5.js
new file mode 100644
index 000000000..b87a4e57a
--- /dev/null
+++ b/common/js/html5.js
@@ -0,0 +1,4 @@
+// html5shiv @rem remysharp.com/html5-enabling-script
+// iepp v1.6.2 @jon_neal iecss.com/print-protector
+// Dual licensed under the MIT or GPL Version 2 licenses
+/*@cc_on(function(a,b){function r(a){var b=-1;while(++b<f)a.createElement(e[b])}if(!(!window.attachEvent||!b.createStyleSheet||!function(){var a=document.createElement("div");a.innerHTML="<elem></elem>";return a.childNodes.length!==1}())){a.iepp=a.iepp||{};var c=a.iepp,d=c.html5elements||"abbr|article|aside|audio|canvas|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",e=d.split("|"),f=e.length,g=new RegExp("(^|\\s)("+d+")","gi"),h=new RegExp("<(/*)("+d+")","gi"),i=/^\s*[\{\}]\s*$/,j=new RegExp("(^|[^\\n]*?\\s)("+d+")([^\\n]*)({[\\n\\w\\W]*?})","gi"),k=b.createDocumentFragment(),l=b.documentElement,m=l.firstChild,n=b.createElement("body"),o=b.createElement("style"),p=/print|all/,q;c.getCSS=function(a,b){if(a+""===undefined)return"";var d=-1,e=a.length,f,g=[];while(++d<e){f=a[d];if(f.disabled)continue;b=f.media||b,p.test(b)&&g.push(c.getCSS(f.imports,b),f.cssText),b="all"}return g.join("")},c.parseCSS=function(a){var b=[],c;while((c=j.exec(a))!=null)b.push(((i.exec(c[1])?"\n":c[1])+c[2]+c[3]).replace(g,"$1.iepp_$2")+c[4]);return b.join("\n")},c.writeHTML=function(){var a=-1;q=q||b.body;while(++a<f){var c=b.getElementsByTagName(e[a]),d=c.length,g=-1;while(++g<d)c[g].className.indexOf("iepp_")<0&&(c[g].className+=" iepp_"+e[a])}k.appendChild(q),l.appendChild(n),n.className=q.className,n.id=q.id,n.innerHTML=q.innerHTML.replace(h,"<$1font")},c._beforePrint=function(){o.styleSheet.cssText=c.parseCSS(c.getCSS(b.styleSheets,"all")),c.writeHTML()},c.restoreHTML=function(){n.innerHTML="",l.removeChild(n),l.appendChild(q)},c._afterPrint=function(){c.restoreHTML(),o.styleSheet.cssText=""},r(b),r(k);if(c.disablePP)return;m.insertBefore(o,m.firstChild),o.media="print",o.className="iepp-printshim",a.attachEvent("onbeforeprint",c._beforePrint),a.attachEvent("onafterprint",c._afterPrint)}})(this,document);@*/
diff --git a/common/js/iepngfix_tilebg.js b/common/js/iepngfix_tilebg.js
deleted file mode 100644
index 72ba3f3e2..000000000
--- a/common/js/iepngfix_tilebg.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// IE5.5+ PNG Alpha Fix v2.0 Alpha: Background Tiling Support
-// (c) 2008 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-var IEPNGFix=window.IEPNGFix||{};IEPNGFix.tileBG=function(elm,pngSrc,ready){var data=this.data[elm.uniqueID],elmW=Math.max(elm.clientWidth,elm.scrollWidth),elmH=Math.max(elm.clientHeight,elm.scrollHeight),bgX=elm.currentStyle.backgroundPositionX,bgY=elm.currentStyle.backgroundPositionY,bgR=elm.currentStyle.backgroundRepeat;if(!data.tiles){data.tiles={elm:elm,src:'',cache:[],img:new Image(),old:{}};}
-var tiles=data.tiles,pngW=tiles.img.width,pngH=tiles.img.height;if(pngSrc){if(!ready&&pngSrc!=tiles.src){tiles.img.onload=function(){this.onload=null;IEPNGFix.tileBG(elm,pngSrc,1);};return tiles.img.src=pngSrc;}}else{if(tiles.src)ready=1;pngW=pngH=0;}
-tiles.src=pngSrc;if(!ready&&elmW==tiles.old.w&&elmH==tiles.old.h&&bgX==tiles.old.x&&bgY==tiles.old.y&&bgR==tiles.old.r){return;}
-var pos={top:'0%',left:'0%',center:'50%',bottom:'100%',right:'100%'},x,y,pc;x=pos[bgX]||bgX;y=pos[bgY]||bgY;if(pc=x.match(/(\d+)%/)){x=Math.round((elmW-pngW)*(parseInt(pc[1])/100));}
-if(pc=y.match(/(\d+)%/)){y=Math.round((elmH-pngH)*(parseInt(pc[1])/100));}
-x=parseInt(x);y=parseInt(y);var repeatX={'repeat':1,'repeat-x':1}[bgR],repeatY={'repeat':1,'repeat-y':1}[bgR];if(repeatX){x%=pngW;if(x>0)x-=pngW;}
-if(repeatY){y%=pngH;if(y>0)y-=pngH;}
-this.hook.enabled=0;if(!({relative:1,absolute:1}[elm.currentStyle.position])){elm.style.position='relative';}
-var count=0,xPos,maxX=repeatX?elmW:x+0.1,yPos,maxY=repeatY?elmH:y+0.1,d,s,isNew;if(pngW&&pngH){for(xPos=x;xPos<maxX;xPos+=pngW){for(yPos=y;yPos<maxY;yPos+=pngH){isNew=0;if(!tiles.cache[count]){tiles.cache[count]=document.createElement('div');isNew=1;}
-var clipR=(xPos+pngW>elmW?elmW-xPos:pngW),clipB=(yPos+pngH>elmH?elmH-yPos:pngH);d=tiles.cache[count];s=d.style;s.behavior='none';s.left=xPos+'px';s.top=yPos+'px';s.width=clipR+'px';s.height=clipB+'px';s.clip='rect('+
-(yPos<0?0-yPos:0)+'px,'+
-clipR+'px,'+
-clipB+'px,'+
-(xPos<0?0-xPos:0)+'px)';s.display='block';if(isNew){s.position='absolute';s.zIndex=-999;if(elm.firstChild){elm.insertBefore(d,elm.firstChild);}else{elm.appendChild(d);}}
-this.fix(d,pngSrc,0);count++;}}}
-while(count<tiles.cache.length){this.fix(tiles.cache[count],'',0);tiles.cache[count++].style.display='none';}
-this.hook.enabled=1;tiles.old={w:elmW,h:elmH,x:bgX,y:bgY,r:bgR};};IEPNGFix.update=function(){for(var i in IEPNGFix.data){var t=IEPNGFix.data[i].tiles;if(t&&t.elm&&t.src){IEPNGFix.tileBG(t.elm,t.src);}}};IEPNGFix.update.timer=0;if(window.attachEvent&&!window.opera){window.attachEvent('onresize',function(){clearTimeout(IEPNGFix.update.timer);IEPNGFix.update.timer=setTimeout(IEPNGFix.update,100);});}
\ No newline at end of file
diff --git a/common/js/jquery.js b/common/js/jquery.js
index 2bd4cbb8a..f3201aacb 100644
--- a/common/js/jquery.js
+++ b/common/js/jquery.js
@@ -1,167 +1,8981 @@
 /*!
- * jQuery JavaScript Library v1.4.4
+ * jQuery JavaScript Library v1.6.2
  * http://jquery.com/
  *
- * Copyright 2010, John Resig
+ * Copyright 2011, John Resig
  * Dual licensed under the MIT or GPL Version 2 licenses.
  * http://jquery.org/license
  *
  * Includes Sizzle.js
  * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
+ * Copyright 2011, The Dojo Foundation
  * Released under the MIT, BSD, and GPL Licenses.
  *
- * Date: Thu Nov 11 19:04:53 2010 -0500
+ * Date: Thu Jun 30 14:16:56 2011 -0400
  */
-(function(E,B){function ka(a,b,d){if(d===B&&a.nodeType===1){d=a.getAttribute("data-"+b);if(typeof d==="string"){try{d=d==="true"?true:d==="false"?false:d==="null"?null:!c.isNaN(d)?parseFloat(d):Ja.test(d)?c.parseJSON(d):d}catch(e){}c.data(a,b,d)}else d=B}return d}function U(){return false}function ca(){return true}function la(a,b,d){d[0].type=a;return c.event.handle.apply(b,d)}function Ka(a){var b,d,e,f,h,l,k,o,x,r,A,C=[];f=[];h=c.data(this,this.nodeType?"events":"__events__");if(typeof h==="function")h=
-h.events;if(!(a.liveFired===this||!h||!h.live||a.button&&a.type==="click")){if(a.namespace)A=RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)");a.liveFired=this;var J=h.live.slice(0);for(k=0;k<J.length;k++){h=J[k];h.origType.replace(X,"")===a.type?f.push(h.selector):J.splice(k--,1)}f=c(a.target).closest(f,a.currentTarget);o=0;for(x=f.length;o<x;o++){r=f[o];for(k=0;k<J.length;k++){h=J[k];if(r.selector===h.selector&&(!A||A.test(h.namespace))){l=r.elem;e=null;if(h.preType==="mouseenter"||
-h.preType==="mouseleave"){a.type=h.preType;e=c(a.relatedTarget).closest(h.selector)[0]}if(!e||e!==l)C.push({elem:l,handleObj:h,level:r.level})}}}o=0;for(x=C.length;o<x;o++){f=C[o];if(d&&f.level>d)break;a.currentTarget=f.elem;a.data=f.handleObj.data;a.handleObj=f.handleObj;A=f.handleObj.origHandler.apply(f.elem,arguments);if(A===false||a.isPropagationStopped()){d=f.level;if(A===false)b=false;if(a.isImmediatePropagationStopped())break}}return b}}function Y(a,b){return(a&&a!=="*"?a+".":"")+b.replace(La,
-"`").replace(Ma,"&")}function ma(a,b,d){if(c.isFunction(b))return c.grep(a,function(f,h){return!!b.call(f,h,f)===d});else if(b.nodeType)return c.grep(a,function(f){return f===b===d});else if(typeof b==="string"){var e=c.grep(a,function(f){return f.nodeType===1});if(Na.test(b))return c.filter(b,e,!d);else b=c.filter(b,e)}return c.grep(a,function(f){return c.inArray(f,b)>=0===d})}function na(a,b){var d=0;b.each(function(){if(this.nodeName===(a[d]&&a[d].nodeName)){var e=c.data(a[d++]),f=c.data(this,
-e);if(e=e&&e.events){delete f.handle;f.events={};for(var h in e)for(var l in e[h])c.event.add(this,h,e[h][l],e[h][l].data)}}})}function Oa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function oa(a,b,d){var e=b==="width"?a.offsetWidth:a.offsetHeight;if(d==="border")return e;c.each(b==="width"?Pa:Qa,function(){d||(e-=parseFloat(c.css(a,"padding"+this))||0);if(d==="margin")e+=parseFloat(c.css(a,
-"margin"+this))||0;else e-=parseFloat(c.css(a,"border"+this+"Width"))||0});return e}function da(a,b,d,e){if(c.isArray(b)&&b.length)c.each(b,function(f,h){d||Ra.test(a)?e(a,h):da(a+"["+(typeof h==="object"||c.isArray(h)?f:"")+"]",h,d,e)});else if(!d&&b!=null&&typeof b==="object")c.isEmptyObject(b)?e(a,""):c.each(b,function(f,h){da(a+"["+f+"]",h,d,e)});else e(a,b)}function S(a,b){var d={};c.each(pa.concat.apply([],pa.slice(0,b)),function(){d[this]=a});return d}function qa(a){if(!ea[a]){var b=c("<"+
-a+">").appendTo("body"),d=b.css("display");b.remove();if(d==="none"||d==="")d="block";ea[a]=d}return ea[a]}function fa(a){return c.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:false}var t=E.document,c=function(){function a(){if(!b.isReady){try{t.documentElement.doScroll("left")}catch(j){setTimeout(a,1);return}b.ready()}}var b=function(j,s){return new b.fn.init(j,s)},d=E.jQuery,e=E.$,f,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,l=/\S/,k=/^\s+/,o=/\s+$/,x=/\W/,r=/\d/,A=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-C=/^[\],:{}\s]*$/,J=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,w=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,I=/(?:^|:|,)(?:\s*\[)+/g,L=/(webkit)[ \/]([\w.]+)/,g=/(opera)(?:.*version)?[ \/]([\w.]+)/,i=/(msie) ([\w.]+)/,n=/(mozilla)(?:.*? rv:([\w.]+))?/,m=navigator.userAgent,p=false,q=[],u,y=Object.prototype.toString,F=Object.prototype.hasOwnProperty,M=Array.prototype.push,N=Array.prototype.slice,O=String.prototype.trim,D=Array.prototype.indexOf,R={};b.fn=b.prototype={init:function(j,
-s){var v,z,H;if(!j)return this;if(j.nodeType){this.context=this[0]=j;this.length=1;return this}if(j==="body"&&!s&&t.body){this.context=t;this[0]=t.body;this.selector="body";this.length=1;return this}if(typeof j==="string")if((v=h.exec(j))&&(v[1]||!s))if(v[1]){H=s?s.ownerDocument||s:t;if(z=A.exec(j))if(b.isPlainObject(s)){j=[t.createElement(z[1])];b.fn.attr.call(j,s,true)}else j=[H.createElement(z[1])];else{z=b.buildFragment([v[1]],[H]);j=(z.cacheable?z.fragment.cloneNode(true):z.fragment).childNodes}return b.merge(this,
-j)}else{if((z=t.getElementById(v[2]))&&z.parentNode){if(z.id!==v[2])return f.find(j);this.length=1;this[0]=z}this.context=t;this.selector=j;return this}else if(!s&&!x.test(j)){this.selector=j;this.context=t;j=t.getElementsByTagName(j);return b.merge(this,j)}else return!s||s.jquery?(s||f).find(j):b(s).find(j);else if(b.isFunction(j))return f.ready(j);if(j.selector!==B){this.selector=j.selector;this.context=j.context}return b.makeArray(j,this)},selector:"",jquery:"1.4.4",length:0,size:function(){return this.length},
-toArray:function(){return N.call(this,0)},get:function(j){return j==null?this.toArray():j<0?this.slice(j)[0]:this[j]},pushStack:function(j,s,v){var z=b();b.isArray(j)?M.apply(z,j):b.merge(z,j);z.prevObject=this;z.context=this.context;if(s==="find")z.selector=this.selector+(this.selector?" ":"")+v;else if(s)z.selector=this.selector+"."+s+"("+v+")";return z},each:function(j,s){return b.each(this,j,s)},ready:function(j){b.bindReady();if(b.isReady)j.call(t,b);else q&&q.push(j);return this},eq:function(j){return j===
--1?this.slice(j):this.slice(j,+j+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(N.apply(this,arguments),"slice",N.call(arguments).join(","))},map:function(j){return this.pushStack(b.map(this,function(s,v){return j.call(s,v,s)}))},end:function(){return this.prevObject||b(null)},push:M,sort:[].sort,splice:[].splice};b.fn.init.prototype=b.fn;b.extend=b.fn.extend=function(){var j,s,v,z,H,G=arguments[0]||{},K=1,Q=arguments.length,ga=false;
-if(typeof G==="boolean"){ga=G;G=arguments[1]||{};K=2}if(typeof G!=="object"&&!b.isFunction(G))G={};if(Q===K){G=this;--K}for(;K<Q;K++)if((j=arguments[K])!=null)for(s in j){v=G[s];z=j[s];if(G!==z)if(ga&&z&&(b.isPlainObject(z)||(H=b.isArray(z)))){if(H){H=false;v=v&&b.isArray(v)?v:[]}else v=v&&b.isPlainObject(v)?v:{};G[s]=b.extend(ga,v,z)}else if(z!==B)G[s]=z}return G};b.extend({noConflict:function(j){E.$=e;if(j)E.jQuery=d;return b},isReady:false,readyWait:1,ready:function(j){j===true&&b.readyWait--;
-if(!b.readyWait||j!==true&&!b.isReady){if(!t.body)return setTimeout(b.ready,1);b.isReady=true;if(!(j!==true&&--b.readyWait>0))if(q){var s=0,v=q;for(q=null;j=v[s++];)j.call(t,b);b.fn.trigger&&b(t).trigger("ready").unbind("ready")}}},bindReady:function(){if(!p){p=true;if(t.readyState==="complete")return setTimeout(b.ready,1);if(t.addEventListener){t.addEventListener("DOMContentLoaded",u,false);E.addEventListener("load",b.ready,false)}else if(t.attachEvent){t.attachEvent("onreadystatechange",u);E.attachEvent("onload",
-b.ready);var j=false;try{j=E.frameElement==null}catch(s){}t.documentElement.doScroll&&j&&a()}}},isFunction:function(j){return b.type(j)==="function"},isArray:Array.isArray||function(j){return b.type(j)==="array"},isWindow:function(j){return j&&typeof j==="object"&&"setInterval"in j},isNaN:function(j){return j==null||!r.test(j)||isNaN(j)},type:function(j){return j==null?String(j):R[y.call(j)]||"object"},isPlainObject:function(j){if(!j||b.type(j)!=="object"||j.nodeType||b.isWindow(j))return false;if(j.constructor&&
-!F.call(j,"constructor")&&!F.call(j.constructor.prototype,"isPrototypeOf"))return false;for(var s in j);return s===B||F.call(j,s)},isEmptyObject:function(j){for(var s in j)return false;return true},error:function(j){throw j;},parseJSON:function(j){if(typeof j!=="string"||!j)return null;j=b.trim(j);if(C.test(j.replace(J,"@").replace(w,"]").replace(I,"")))return E.JSON&&E.JSON.parse?E.JSON.parse(j):(new Function("return "+j))();else b.error("Invalid JSON: "+j)},noop:function(){},globalEval:function(j){if(j&&
-l.test(j)){var s=t.getElementsByTagName("head")[0]||t.documentElement,v=t.createElement("script");v.type="text/javascript";if(b.support.scriptEval)v.appendChild(t.createTextNode(j));else v.text=j;s.insertBefore(v,s.firstChild);s.removeChild(v)}},nodeName:function(j,s){return j.nodeName&&j.nodeName.toUpperCase()===s.toUpperCase()},each:function(j,s,v){var z,H=0,G=j.length,K=G===B||b.isFunction(j);if(v)if(K)for(z in j){if(s.apply(j[z],v)===false)break}else for(;H<G;){if(s.apply(j[H++],v)===false)break}else if(K)for(z in j){if(s.call(j[z],
-z,j[z])===false)break}else for(v=j[0];H<G&&s.call(v,H,v)!==false;v=j[++H]);return j},trim:O?function(j){return j==null?"":O.call(j)}:function(j){return j==null?"":j.toString().replace(k,"").replace(o,"")},makeArray:function(j,s){var v=s||[];if(j!=null){var z=b.type(j);j.length==null||z==="string"||z==="function"||z==="regexp"||b.isWindow(j)?M.call(v,j):b.merge(v,j)}return v},inArray:function(j,s){if(s.indexOf)return s.indexOf(j);for(var v=0,z=s.length;v<z;v++)if(s[v]===j)return v;return-1},merge:function(j,
-s){var v=j.length,z=0;if(typeof s.length==="number")for(var H=s.length;z<H;z++)j[v++]=s[z];else for(;s[z]!==B;)j[v++]=s[z++];j.length=v;return j},grep:function(j,s,v){var z=[],H;v=!!v;for(var G=0,K=j.length;G<K;G++){H=!!s(j[G],G);v!==H&&z.push(j[G])}return z},map:function(j,s,v){for(var z=[],H,G=0,K=j.length;G<K;G++){H=s(j[G],G,v);if(H!=null)z[z.length]=H}return z.concat.apply([],z)},guid:1,proxy:function(j,s,v){if(arguments.length===2)if(typeof s==="string"){v=j;j=v[s];s=B}else if(s&&!b.isFunction(s)){v=
-s;s=B}if(!s&&j)s=function(){return j.apply(v||this,arguments)};if(j)s.guid=j.guid=j.guid||s.guid||b.guid++;return s},access:function(j,s,v,z,H,G){var K=j.length;if(typeof s==="object"){for(var Q in s)b.access(j,Q,s[Q],z,H,v);return j}if(v!==B){z=!G&&z&&b.isFunction(v);for(Q=0;Q<K;Q++)H(j[Q],s,z?v.call(j[Q],Q,H(j[Q],s)):v,G);return j}return K?H(j[0],s):B},now:function(){return(new Date).getTime()},uaMatch:function(j){j=j.toLowerCase();j=L.exec(j)||g.exec(j)||i.exec(j)||j.indexOf("compatible")<0&&n.exec(j)||
-[];return{browser:j[1]||"",version:j[2]||"0"}},browser:{}});b.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(j,s){R["[object "+s+"]"]=s.toLowerCase()});m=b.uaMatch(m);if(m.browser){b.browser[m.browser]=true;b.browser.version=m.version}if(b.browser.webkit)b.browser.safari=true;if(D)b.inArray=function(j,s){return D.call(s,j)};if(!/\s/.test("\u00a0")){k=/^[\s\xA0]+/;o=/[\s\xA0]+$/}f=b(t);if(t.addEventListener)u=function(){t.removeEventListener("DOMContentLoaded",u,
-false);b.ready()};else if(t.attachEvent)u=function(){if(t.readyState==="complete"){t.detachEvent("onreadystatechange",u);b.ready()}};return E.jQuery=E.$=b}();(function(){c.support={};var a=t.documentElement,b=t.createElement("script"),d=t.createElement("div"),e="script"+c.now();d.style.display="none";d.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var f=d.getElementsByTagName("*"),h=d.getElementsByTagName("a")[0],l=t.createElement("select"),
-k=l.appendChild(t.createElement("option"));if(!(!f||!f.length||!h)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(h.getAttribute("style")),hrefNormalized:h.getAttribute("href")==="/a",opacity:/^0.55$/.test(h.style.opacity),cssFloat:!!h.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:k.selected,deleteExpando:true,optDisabled:false,checkClone:false,
-scriptEval:false,noCloneEvent:true,boxModel:null,inlineBlockNeedsLayout:false,shrinkWrapBlocks:false,reliableHiddenOffsets:true};l.disabled=true;c.support.optDisabled=!k.disabled;b.type="text/javascript";try{b.appendChild(t.createTextNode("window."+e+"=1;"))}catch(o){}a.insertBefore(b,a.firstChild);if(E[e]){c.support.scriptEval=true;delete E[e]}try{delete b.test}catch(x){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function r(){c.support.noCloneEvent=
-false;d.detachEvent("onclick",r)});d.cloneNode(true).fireEvent("onclick")}d=t.createElement("div");d.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";a=t.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var r=t.createElement("div");r.style.width=r.style.paddingLeft="1px";t.body.appendChild(r);c.boxModel=c.support.boxModel=r.offsetWidth===2;if("zoom"in r.style){r.style.display="inline";r.style.zoom=
-1;c.support.inlineBlockNeedsLayout=r.offsetWidth===2;r.style.display="";r.innerHTML="<div style='width:4px;'></div>";c.support.shrinkWrapBlocks=r.offsetWidth!==2}r.innerHTML="<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";var A=r.getElementsByTagName("td");c.support.reliableHiddenOffsets=A[0].offsetHeight===0;A[0].style.display="";A[1].style.display="none";c.support.reliableHiddenOffsets=c.support.reliableHiddenOffsets&&A[0].offsetHeight===0;r.innerHTML="";t.body.removeChild(r).style.display=
-"none"});a=function(r){var A=t.createElement("div");r="on"+r;var C=r in A;if(!C){A.setAttribute(r,"return;");C=typeof A[r]==="function"}return C};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=f=h=null}})();var ra={},Ja=/^(?:\{.*\}|\[.*\])$/;c.extend({cache:{},uuid:0,expando:"jQuery"+c.now(),noData:{embed:true,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:true},data:function(a,b,d){if(c.acceptData(a)){a=a==E?ra:a;var e=a.nodeType,f=e?a[c.expando]:null,h=
-c.cache;if(!(e&&!f&&typeof b==="string"&&d===B)){if(e)f||(a[c.expando]=f=++c.uuid);else h=a;if(typeof b==="object")if(e)h[f]=c.extend(h[f],b);else c.extend(h,b);else if(e&&!h[f])h[f]={};a=e?h[f]:h;if(d!==B)a[b]=d;return typeof b==="string"?a[b]:a}}},removeData:function(a,b){if(c.acceptData(a)){a=a==E?ra:a;var d=a.nodeType,e=d?a[c.expando]:a,f=c.cache,h=d?f[e]:e;if(b){if(h){delete h[b];d&&c.isEmptyObject(h)&&c.removeData(a)}}else if(d&&c.support.deleteExpando)delete a[c.expando];else if(a.removeAttribute)a.removeAttribute(c.expando);
-else if(d)delete f[e];else for(var l in a)delete a[l]}},acceptData:function(a){if(a.nodeName){var b=c.noData[a.nodeName.toLowerCase()];if(b)return!(b===true||a.getAttribute("classid")!==b)}return true}});c.fn.extend({data:function(a,b){var d=null;if(typeof a==="undefined"){if(this.length){var e=this[0].attributes,f;d=c.data(this[0]);for(var h=0,l=e.length;h<l;h++){f=e[h].name;if(f.indexOf("data-")===0){f=f.substr(5);ka(this[0],f,d[f])}}}return d}else if(typeof a==="object")return this.each(function(){c.data(this,
-a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(b===B){d=this.triggerHandler("getData"+k[1]+"!",[k[0]]);if(d===B&&this.length){d=c.data(this[0],a);d=ka(this[0],a,d)}return d===B&&k[1]?this.data(k[0]):d}else return this.each(function(){var o=c(this),x=[k[0],b];o.triggerHandler("setData"+k[1]+"!",x);c.data(this,a,b);o.triggerHandler("changeData"+k[1]+"!",x)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var e=
-c.data(a,b);if(!d)return e||[];if(!e||c.isArray(d))e=c.data(a,b,c.makeArray(d));else e.push(d);return e}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),e=d.shift();if(e==="inprogress")e=d.shift();if(e){b==="fx"&&d.unshift("inprogress");e.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b===B)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,
-a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var sa=/[\n\t]/g,ha=/\s+/,Sa=/\r/g,Ta=/^(?:href|src|style)$/,Ua=/^(?:button|input)$/i,Va=/^(?:button|input|object|select|textarea)$/i,Wa=/^a(?:rea)?$/i,ta=/^(?:radio|checkbox)$/i;c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",
-colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};c.fn.extend({attr:function(a,b){return c.access(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(x){var r=c(this);r.addClass(a.call(this,x,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===
-1)if(f.className){for(var h=" "+f.className+" ",l=f.className,k=0,o=b.length;k<o;k++)if(h.indexOf(" "+b[k]+" ")<0)l+=" "+b[k];f.className=c.trim(l)}else f.className=a}return this},removeClass:function(a){if(c.isFunction(a))return this.each(function(o){var x=c(this);x.removeClass(a.call(this,o,x.attr("class")))});if(a&&typeof a==="string"||a===B)for(var b=(a||"").split(ha),d=0,e=this.length;d<e;d++){var f=this[d];if(f.nodeType===1&&f.className)if(a){for(var h=(" "+f.className+" ").replace(sa," "),
-l=0,k=b.length;l<k;l++)h=h.replace(" "+b[l]+" "," ");f.className=c.trim(h)}else f.className=""}return this},toggleClass:function(a,b){var d=typeof a,e=typeof b==="boolean";if(c.isFunction(a))return this.each(function(f){var h=c(this);h.toggleClass(a.call(this,f,h.attr("class"),b),b)});return this.each(function(){if(d==="string")for(var f,h=0,l=c(this),k=b,o=a.split(ha);f=o[h++];){k=e?k:!l.hasClass(f);l[k?"addClass":"removeClass"](f)}else if(d==="undefined"||d==="boolean"){this.className&&c.data(this,
-"__className__",this.className);this.className=this.className||a===false?"":c.data(this,"__className__")||""}})},hasClass:function(a){a=" "+a+" ";for(var b=0,d=this.length;b<d;b++)if((" "+this[b].className+" ").replace(sa," ").indexOf(a)>-1)return true;return false},val:function(a){if(!arguments.length){var b=this[0];if(b){if(c.nodeName(b,"option")){var d=b.attributes.value;return!d||d.specified?b.value:b.text}if(c.nodeName(b,"select")){var e=b.selectedIndex;d=[];var f=b.options;b=b.type==="select-one";
-if(e<0)return null;var h=b?e:0;for(e=b?e+1:f.length;h<e;h++){var l=f[h];if(l.selected&&(c.support.optDisabled?!l.disabled:l.getAttribute("disabled")===null)&&(!l.parentNode.disabled||!c.nodeName(l.parentNode,"optgroup"))){a=c(l).val();if(b)return a;d.push(a)}}return d}if(ta.test(b.type)&&!c.support.checkOn)return b.getAttribute("value")===null?"on":b.value;return(b.value||"").replace(Sa,"")}return B}var k=c.isFunction(a);return this.each(function(o){var x=c(this),r=a;if(this.nodeType===1){if(k)r=
-a.call(this,o,x.val());if(r==null)r="";else if(typeof r==="number")r+="";else if(c.isArray(r))r=c.map(r,function(C){return C==null?"":C+""});if(c.isArray(r)&&ta.test(this.type))this.checked=c.inArray(x.val(),r)>=0;else if(c.nodeName(this,"select")){var A=c.makeArray(r);c("option",this).each(function(){this.selected=c.inArray(c(this).val(),A)>=0});if(!A.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},
-attr:function(a,b,d,e){if(!a||a.nodeType===3||a.nodeType===8)return B;if(e&&b in c.attrFn)return c(a)[b](d);e=a.nodeType!==1||!c.isXMLDoc(a);var f=d!==B;b=e&&c.props[b]||b;var h=Ta.test(b);if((b in a||a[b]!==B)&&e&&!h){if(f){b==="type"&&Ua.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed");if(d===null)a.nodeType===1&&a.removeAttribute(b);else a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&
-b.specified?b.value:Va.test(a.nodeName)||Wa.test(a.nodeName)&&a.href?0:B;return a[b]}if(!c.support.style&&e&&b==="style"){if(f)a.style.cssText=""+d;return a.style.cssText}f&&a.setAttribute(b,""+d);if(!a.attributes[b]&&a.hasAttribute&&!a.hasAttribute(b))return B;a=!c.support.hrefNormalized&&e&&h?a.getAttribute(b,2):a.getAttribute(b);return a===null?B:a}});var X=/\.(.*)$/,ia=/^(?:textarea|input|select)$/i,La=/\./g,Ma=/ /g,Xa=/[^\w\s.|`]/g,Ya=function(a){return a.replace(Xa,"\\$&")},ua={focusin:0,focusout:0};
-c.event={add:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(c.isWindow(a)&&a!==E&&!a.frameElement)a=E;if(d===false)d=U;else if(!d)return;var f,h;if(d.handler){f=d;d=f.handler}if(!d.guid)d.guid=c.guid++;if(h=c.data(a)){var l=a.nodeType?"events":"__events__",k=h[l],o=h.handle;if(typeof k==="function"){o=k.handle;k=k.events}else if(!k){a.nodeType||(h[l]=h=function(){});h.events=k={}}if(!o)h.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,
-arguments):B};o.elem=a;b=b.split(" ");for(var x=0,r;l=b[x++];){h=f?c.extend({},f):{handler:d,data:e};if(l.indexOf(".")>-1){r=l.split(".");l=r.shift();h.namespace=r.slice(0).sort().join(".")}else{r=[];h.namespace=""}h.type=l;if(!h.guid)h.guid=d.guid;var A=k[l],C=c.event.special[l]||{};if(!A){A=k[l]=[];if(!C.setup||C.setup.call(a,e,r,o)===false)if(a.addEventListener)a.addEventListener(l,o,false);else a.attachEvent&&a.attachEvent("on"+l,o)}if(C.add){C.add.call(a,h);if(!h.handler.guid)h.handler.guid=
-d.guid}A.push(h);c.event.global[l]=true}a=null}}},global:{},remove:function(a,b,d,e){if(!(a.nodeType===3||a.nodeType===8)){if(d===false)d=U;var f,h,l=0,k,o,x,r,A,C,J=a.nodeType?"events":"__events__",w=c.data(a),I=w&&w[J];if(w&&I){if(typeof I==="function"){w=I;I=I.events}if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(f in I)c.event.remove(a,f+b)}else{for(b=b.split(" ");f=b[l++];){r=f;k=f.indexOf(".")<0;o=[];if(!k){o=f.split(".");f=o.shift();x=RegExp("(^|\\.)"+
-c.map(o.slice(0).sort(),Ya).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(A=I[f])if(d){r=c.event.special[f]||{};for(h=e||0;h<A.length;h++){C=A[h];if(d.guid===C.guid){if(k||x.test(C.namespace)){e==null&&A.splice(h--,1);r.remove&&r.remove.call(a,C)}if(e!=null)break}}if(A.length===0||e!=null&&A.length===1){if(!r.teardown||r.teardown.call(a,o)===false)c.removeEvent(a,f,w.handle);delete I[f]}}else for(h=0;h<A.length;h++){C=A[h];if(k||x.test(C.namespace)){c.event.remove(a,r,C.handler,h);A.splice(h--,1)}}}if(c.isEmptyObject(I)){if(b=
-w.handle)b.elem=null;delete w.events;delete w.handle;if(typeof w==="function")c.removeData(a,J);else c.isEmptyObject(w)&&c.removeData(a)}}}}},trigger:function(a,b,d,e){var f=a.type||a;if(!e){a=typeof a==="object"?a[c.expando]?a:c.extend(c.Event(f),a):c.Event(f);if(f.indexOf("!")>=0){a.type=f=f.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[f]&&c.each(c.cache,function(){this.events&&this.events[f]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===
-8)return B;a.result=B;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(e=d.nodeType?c.data(d,"handle"):(c.data(d,"__events__")||{}).handle)&&e.apply(d,b);e=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+f]&&d["on"+f].apply(d,b)===false){a.result=false;a.preventDefault()}}catch(h){}if(!a.isPropagationStopped()&&e)c.event.trigger(a,b,e,true);else if(!a.isDefaultPrevented()){var l;e=a.target;var k=f.replace(X,""),o=c.nodeName(e,"a")&&k===
-"click",x=c.event.special[k]||{};if((!x._default||x._default.call(d,a)===false)&&!o&&!(e&&e.nodeName&&c.noData[e.nodeName.toLowerCase()])){try{if(e[k]){if(l=e["on"+k])e["on"+k]=null;c.event.triggered=true;e[k]()}}catch(r){}if(l)e["on"+k]=l;c.event.triggered=false}}},handle:function(a){var b,d,e,f;d=[];var h=c.makeArray(arguments);a=h[0]=c.event.fix(a||E.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive;if(!b){e=a.type.split(".");a.type=e.shift();d=e.slice(0).sort();e=RegExp("(^|\\.)"+
-d.join("\\.(?:.*\\.)?")+"(\\.|$)")}a.namespace=a.namespace||d.join(".");f=c.data(this,this.nodeType?"events":"__events__");if(typeof f==="function")f=f.events;d=(f||{})[a.type];if(f&&d){d=d.slice(0);f=0;for(var l=d.length;f<l;f++){var k=d[f];if(b||e.test(k.namespace)){a.handler=k.handler;a.data=k.data;a.handleObj=k;k=k.handler.apply(this,h);if(k!==B){a.result=k;if(k===false){a.preventDefault();a.stopPropagation()}}if(a.isImmediatePropagationStopped())break}}}return a.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-fix:function(a){if(a[c.expando])return a;var b=a;a=c.Event(b);for(var d=this.props.length,e;d;){e=this.props[--d];a[e]=b[e]}if(!a.target)a.target=a.srcElement||t;if(a.target.nodeType===3)a.target=a.target.parentNode;if(!a.relatedTarget&&a.fromElement)a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement;if(a.pageX==null&&a.clientX!=null){b=t.documentElement;d=t.body;a.pageX=a.clientX+(b&&b.scrollLeft||d&&d.scrollLeft||0)-(b&&b.clientLeft||d&&d.clientLeft||0);a.pageY=a.clientY+(b&&b.scrollTop||
-d&&d.scrollTop||0)-(b&&b.clientTop||d&&d.clientTop||0)}if(a.which==null&&(a.charCode!=null||a.keyCode!=null))a.which=a.charCode!=null?a.charCode:a.keyCode;if(!a.metaKey&&a.ctrlKey)a.metaKey=a.ctrlKey;if(!a.which&&a.button!==B)a.which=a.button&1?1:a.button&2?3:a.button&4?2:0;return a},guid:1E8,proxy:c.proxy,special:{ready:{setup:c.bindReady,teardown:c.noop},live:{add:function(a){c.event.add(this,Y(a.origType,a.selector),c.extend({},a,{handler:Ka,guid:a.handler.guid}))},remove:function(a){c.event.remove(this,
-Y(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,d){if(c.isWindow(this))this.onbeforeunload=d},teardown:function(a,b){if(this.onbeforeunload===b)this.onbeforeunload=null}}}};c.removeEvent=t.removeEventListener?function(a,b,d){a.removeEventListener&&a.removeEventListener(b,d,false)}:function(a,b,d){a.detachEvent&&a.detachEvent("on"+b,d)};c.Event=function(a){if(!this.preventDefault)return new c.Event(a);if(a&&a.type){this.originalEvent=a;this.type=a.type}else this.type=a;this.timeStamp=
-c.now();this[c.expando]=true};c.Event.prototype={preventDefault:function(){this.isDefaultPrevented=ca;var a=this.originalEvent;if(a)if(a.preventDefault)a.preventDefault();else a.returnValue=false},stopPropagation:function(){this.isPropagationStopped=ca;var a=this.originalEvent;if(a){a.stopPropagation&&a.stopPropagation();a.cancelBubble=true}},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=ca;this.stopPropagation()},isDefaultPrevented:U,isPropagationStopped:U,isImmediatePropagationStopped:U};
-var va=function(a){var b=a.relatedTarget;try{for(;b&&b!==this;)b=b.parentNode;if(b!==this){a.type=a.data;c.event.handle.apply(this,arguments)}}catch(d){}},wa=function(a){a.type=a.data;c.event.handle.apply(this,arguments)};c.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){c.event.special[a]={setup:function(d){c.event.add(this,b,d&&d.selector?wa:va,a)},teardown:function(d){c.event.remove(this,b,d&&d.selector?wa:va)}}});if(!c.support.submitBubbles)c.event.special.submit={setup:function(){if(this.nodeName.toLowerCase()!==
-"form"){c.event.add(this,"click.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="submit"||d==="image")&&c(b).closest("form").length){a.liveFired=B;return la("submit",this,arguments)}});c.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,d=b.type;if((d==="text"||d==="password")&&c(b).closest("form").length&&a.keyCode===13){a.liveFired=B;return la("submit",this,arguments)}})}else return false},teardown:function(){c.event.remove(this,".specialSubmit")}};if(!c.support.changeBubbles){var V,
-xa=function(a){var b=a.type,d=a.value;if(b==="radio"||b==="checkbox")d=a.checked;else if(b==="select-multiple")d=a.selectedIndex>-1?c.map(a.options,function(e){return e.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},Z=function(a,b){var d=a.target,e,f;if(!(!ia.test(d.nodeName)||d.readOnly)){e=c.data(d,"_change_data");f=xa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data",f);if(!(e===B||f===e))if(e!=null||f){a.type="change";a.liveFired=
-B;return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:Z,beforedeactivate:Z,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return Z.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return Z.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a,"_change_data",xa(a))}},setup:function(){if(this.type===
-"file")return false;for(var a in V)c.event.add(this,a+".specialChange",V[a]);return ia.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return ia.test(this.nodeName)}};V=c.event.special.change.filters;V.focus=V.beforeactivate}t.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(e){e=c.event.fix(e);e.type=b;return c.event.trigger(e,null,e.target)}c.event.special[b]={setup:function(){ua[b]++===0&&t.addEventListener(a,d,true)},teardown:function(){--ua[b]===
-0&&t.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,e,f){if(typeof d==="object"){for(var h in d)this[b](h,e,d[h],f);return this}if(c.isFunction(e)||e===false){f=e;e=B}var l=b==="one"?c.proxy(f,function(o){c(this).unbind(o,l);return f.apply(this,arguments)}):f;if(d==="unload"&&b!=="one")this.one(d,e,f);else{h=0;for(var k=this.length;h<k;h++)c.event.add(this[h],d,l,e)}return this}});c.fn.extend({unbind:function(a,b){if(typeof a==="object"&&!a.preventDefault)for(var d in a)this.unbind(d,
-a[d]);else{d=0;for(var e=this.length;d<e;d++)c.event.remove(this[d],a,b)}return this},delegate:function(a,b,d,e){return this.live(b,d,e,a)},undelegate:function(a,b,d){return arguments.length===0?this.unbind("live"):this.die(b,null,d,a)},trigger:function(a,b){return this.each(function(){c.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var d=c.Event(a);d.preventDefault();d.stopPropagation();c.event.trigger(d,b,this[0]);return d.result}},toggle:function(a){for(var b=arguments,d=
-1;d<b.length;)c.proxy(a,b[d++]);return this.click(c.proxy(a,function(e){var f=(c.data(this,"lastToggle"+a.guid)||0)%d;c.data(this,"lastToggle"+a.guid,f+1);e.preventDefault();return b[f].apply(this,arguments)||false}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var ya={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};c.each(["live","die"],function(a,b){c.fn[b]=function(d,e,f,h){var l,k=0,o,x,r=h||this.selector;h=h?this:c(this.context);if(typeof d===
-"object"&&!d.preventDefault){for(l in d)h[b](l,e,d[l],r);return this}if(c.isFunction(e)){f=e;e=B}for(d=(d||"").split(" ");(l=d[k++])!=null;){o=X.exec(l);x="";if(o){x=o[0];l=l.replace(X,"")}if(l==="hover")d.push("mouseenter"+x,"mouseleave"+x);else{o=l;if(l==="focus"||l==="blur"){d.push(ya[l]+x);l+=x}else l=(ya[l]||l)+x;if(b==="live"){x=0;for(var A=h.length;x<A;x++)c.event.add(h[x],"live."+Y(l,r),{data:e,selector:r,handler:f,origType:l,origHandler:f,preType:o})}else h.unbind("live."+Y(l,r),f)}}return this}});
-c.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){c.fn[b]=function(d,e){if(e==null){e=d;d=null}return arguments.length>0?this.bind(b,d,e):this.trigger(b)};if(c.attrFn)c.attrFn[b]=true});E.attachEvent&&!E.addEventListener&&c(E).bind("unload",function(){for(var a in c.cache)if(c.cache[a].handle)try{c.event.remove(c.cache[a].handle.elem)}catch(b){}});
-(function(){function a(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1&&!q){y.sizcache=n;y.sizset=p}if(y.nodeName.toLowerCase()===i){F=y;break}y=y[g]}m[p]=F}}}function b(g,i,n,m,p,q){p=0;for(var u=m.length;p<u;p++){var y=m[p];if(y){var F=false;for(y=y[g];y;){if(y.sizcache===n){F=m[y.sizset];break}if(y.nodeType===1){if(!q){y.sizcache=n;y.sizset=p}if(typeof i!=="string"){if(y===i){F=true;break}}else if(k.filter(i,
-[y]).length>0){F=y;break}}y=y[g]}m[p]=F}}}var d=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,h=false,l=true;[0,0].sort(function(){l=false;return 0});var k=function(g,i,n,m){n=n||[];var p=i=i||t;if(i.nodeType!==1&&i.nodeType!==9)return[];if(!g||typeof g!=="string")return n;var q,u,y,F,M,N=true,O=k.isXML(i),D=[],R=g;do{d.exec("");if(q=d.exec(R)){R=q[3];D.push(q[1]);if(q[2]){F=q[3];
-break}}}while(q);if(D.length>1&&x.exec(g))if(D.length===2&&o.relative[D[0]])u=L(D[0]+D[1],i);else for(u=o.relative[D[0]]?[i]:k(D.shift(),i);D.length;){g=D.shift();if(o.relative[g])g+=D.shift();u=L(g,u)}else{if(!m&&D.length>1&&i.nodeType===9&&!O&&o.match.ID.test(D[0])&&!o.match.ID.test(D[D.length-1])){q=k.find(D.shift(),i,O);i=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]}if(i){q=m?{expr:D.pop(),set:C(m)}:k.find(D.pop(),D.length===1&&(D[0]==="~"||D[0]==="+")&&i.parentNode?i.parentNode:i,O);u=q.expr?k.filter(q.expr,
-q.set):q.set;if(D.length>0)y=C(u);else N=false;for(;D.length;){q=M=D.pop();if(o.relative[M])q=D.pop();else M="";if(q==null)q=i;o.relative[M](y,q,O)}}else y=[]}y||(y=u);y||k.error(M||g);if(f.call(y)==="[object Array]")if(N)if(i&&i.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&k.contains(i,y[g])))n.push(u[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&n.push(u[g]);else n.push.apply(n,y);else C(y,n);if(F){k(F,p,n,m);k.uniqueSort(n)}return n};k.uniqueSort=function(g){if(w){h=
-l;g.sort(w);if(h)for(var i=1;i<g.length;i++)g[i]===g[i-1]&&g.splice(i--,1)}return g};k.matches=function(g,i){return k(g,null,null,i)};k.matchesSelector=function(g,i){return k(i,null,null,[g]).length>0};k.find=function(g,i,n){var m;if(!g)return[];for(var p=0,q=o.order.length;p<q;p++){var u,y=o.order[p];if(u=o.leftMatch[y].exec(g)){var F=u[1];u.splice(1,1);if(F.substr(F.length-1)!=="\\"){u[1]=(u[1]||"").replace(/\\/g,"");m=o.find[y](u,i,n);if(m!=null){g=g.replace(o.match[y],"");break}}}}m||(m=i.getElementsByTagName("*"));
-return{set:m,expr:g}};k.filter=function(g,i,n,m){for(var p,q,u=g,y=[],F=i,M=i&&i[0]&&k.isXML(i[0]);g&&i.length;){for(var N in o.filter)if((p=o.leftMatch[N].exec(g))!=null&&p[2]){var O,D,R=o.filter[N];D=p[1];q=false;p.splice(1,1);if(D.substr(D.length-1)!=="\\"){if(F===y)y=[];if(o.preFilter[N])if(p=o.preFilter[N](p,F,n,y,m,M)){if(p===true)continue}else q=O=true;if(p)for(var j=0;(D=F[j])!=null;j++)if(D){O=R(D,p,j,F);var s=m^!!O;if(n&&O!=null)if(s)q=true;else F[j]=false;else if(s){y.push(D);q=true}}if(O!==
-B){n||(F=y);g=g.replace(o.match[N],"");if(!q)return[];break}}}if(g===u)if(q==null)k.error(g);else break;u=g}return F};k.error=function(g){throw"Syntax error, unrecognized expression: "+g;};var o=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
-POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(g){return g.getAttribute("href")}},relative:{"+":function(g,i){var n=typeof i==="string",m=n&&!/\W/.test(i);n=n&&!m;if(m)i=i.toLowerCase();m=0;for(var p=g.length,q;m<p;m++)if(q=g[m]){for(;(q=q.previousSibling)&&q.nodeType!==1;);g[m]=n||q&&q.nodeName.toLowerCase()===
-i?q||false:q===i}n&&k.filter(i,g,true)},">":function(g,i){var n,m=typeof i==="string",p=0,q=g.length;if(m&&!/\W/.test(i))for(i=i.toLowerCase();p<q;p++){if(n=g[p]){n=n.parentNode;g[p]=n.nodeName.toLowerCase()===i?n:false}}else{for(;p<q;p++)if(n=g[p])g[p]=m?n.parentNode:n.parentNode===i;m&&k.filter(i,g,true)}},"":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=i=i.toLowerCase();q=a}q("parentNode",i,p,g,m,n)},"~":function(g,i,n){var m,p=e++,q=b;if(typeof i==="string"&&!/\W/.test(i)){m=
-i=i.toLowerCase();q=a}q("previousSibling",i,p,g,m,n)}},find:{ID:function(g,i,n){if(typeof i.getElementById!=="undefined"&&!n)return(g=i.getElementById(g[1]))&&g.parentNode?[g]:[]},NAME:function(g,i){if(typeof i.getElementsByName!=="undefined"){for(var n=[],m=i.getElementsByName(g[1]),p=0,q=m.length;p<q;p++)m[p].getAttribute("name")===g[1]&&n.push(m[p]);return n.length===0?null:n}},TAG:function(g,i){return i.getElementsByTagName(g[1])}},preFilter:{CLASS:function(g,i,n,m,p,q){g=" "+g[1].replace(/\\/g,
-"")+" ";if(q)return g;q=0;for(var u;(u=i[q])!=null;q++)if(u)if(p^(u.className&&(" "+u.className+" ").replace(/[\t\n]/g," ").indexOf(g)>=0))n||m.push(u);else if(n)i[q]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()},CHILD:function(g){if(g[1]==="nth"){var i=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=i[1]+(i[2]||1)-0;g[3]=i[3]-0}g[0]=e++;return g},ATTR:function(g,i,n,
-m,p,q){i=g[1].replace(/\\/g,"");if(!q&&o.attrMap[i])g[1]=o.attrMap[i];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,i,n,m,p){if(g[1]==="not")if((d.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,i);else{g=k.filter(g[3],i,n,true^p);n||m.push.apply(m,g);return false}else if(o.match.POS.test(g[0])||o.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===
-true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,i,n){return!!k(n[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)},text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===
-g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}},setFilters:{first:function(g,i){return i===0},last:function(g,i,n,m){return i===m.length-1},even:function(g,i){return i%2===0},odd:function(g,i){return i%2===1},lt:function(g,i,n){return i<n[3]-0},gt:function(g,i,n){return i>n[3]-0},nth:function(g,i,n){return n[3]-
-0===i},eq:function(g,i,n){return n[3]-0===i}},filter:{PSEUDO:function(g,i,n,m){var p=i[1],q=o.filters[p];if(q)return q(g,n,i,m);else if(p==="contains")return(g.textContent||g.innerText||k.getText([g])||"").indexOf(i[3])>=0;else if(p==="not"){i=i[3];n=0;for(m=i.length;n<m;n++)if(i[n]===g)return false;return true}else k.error("Syntax error, unrecognized expression: "+p)},CHILD:function(g,i){var n=i[1],m=g;switch(n){case "only":case "first":for(;m=m.previousSibling;)if(m.nodeType===1)return false;if(n===
-"first")return true;m=g;case "last":for(;m=m.nextSibling;)if(m.nodeType===1)return false;return true;case "nth":n=i[2];var p=i[3];if(n===1&&p===0)return true;var q=i[0],u=g.parentNode;if(u&&(u.sizcache!==q||!g.nodeIndex)){var y=0;for(m=u.firstChild;m;m=m.nextSibling)if(m.nodeType===1)m.nodeIndex=++y;u.sizcache=q}m=g.nodeIndex-p;return n===0?m===0:m%n===0&&m/n>=0}},ID:function(g,i){return g.nodeType===1&&g.getAttribute("id")===i},TAG:function(g,i){return i==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===
-i},CLASS:function(g,i){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(i)>-1},ATTR:function(g,i){var n=i[1];n=o.attrHandle[n]?o.attrHandle[n](g):g[n]!=null?g[n]:g.getAttribute(n);var m=n+"",p=i[2],q=i[4];return n==null?p==="!=":p==="="?m===q:p==="*="?m.indexOf(q)>=0:p==="~="?(" "+m+" ").indexOf(q)>=0:!q?m&&n!==false:p==="!="?m!==q:p==="^="?m.indexOf(q)===0:p==="$="?m.substr(m.length-q.length)===q:p==="|="?m===q||m.substr(0,q.length+1)===q+"-":false},POS:function(g,i,n,m){var p=o.setFilters[i[2]];
-if(p)return p(g,n,i,m)}}},x=o.match.POS,r=function(g,i){return"\\"+(i-0+1)},A;for(A in o.match){o.match[A]=RegExp(o.match[A].source+/(?![^\[]*\])(?![^\(]*\))/.source);o.leftMatch[A]=RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[A].source.replace(/\\(\d+)/g,r))}var C=function(g,i){g=Array.prototype.slice.call(g,0);if(i){i.push.apply(i,g);return i}return g};try{Array.prototype.slice.call(t.documentElement.childNodes,0)}catch(J){C=function(g,i){var n=0,m=i||[];if(f.call(g)==="[object Array]")Array.prototype.push.apply(m,
-g);else if(typeof g.length==="number")for(var p=g.length;n<p;n++)m.push(g[n]);else for(;g[n];n++)m.push(g[n]);return m}}var w,I;if(t.documentElement.compareDocumentPosition)w=function(g,i){if(g===i){h=true;return 0}if(!g.compareDocumentPosition||!i.compareDocumentPosition)return g.compareDocumentPosition?-1:1;return g.compareDocumentPosition(i)&4?-1:1};else{w=function(g,i){var n,m,p=[],q=[];n=g.parentNode;m=i.parentNode;var u=n;if(g===i){h=true;return 0}else if(n===m)return I(g,i);else if(n){if(!m)return 1}else return-1;
-for(;u;){p.unshift(u);u=u.parentNode}for(u=m;u;){q.unshift(u);u=u.parentNode}n=p.length;m=q.length;for(u=0;u<n&&u<m;u++)if(p[u]!==q[u])return I(p[u],q[u]);return u===n?I(g,q[u],-1):I(p[u],i,1)};I=function(g,i,n){if(g===i)return n;for(g=g.nextSibling;g;){if(g===i)return-1;g=g.nextSibling}return 1}}k.getText=function(g){for(var i="",n,m=0;g[m];m++){n=g[m];if(n.nodeType===3||n.nodeType===4)i+=n.nodeValue;else if(n.nodeType!==8)i+=k.getText(n.childNodes)}return i};(function(){var g=t.createElement("div"),
-i="script"+(new Date).getTime(),n=t.documentElement;g.innerHTML="<a name='"+i+"'/>";n.insertBefore(g,n.firstChild);if(t.getElementById(i)){o.find.ID=function(m,p,q){if(typeof p.getElementById!=="undefined"&&!q)return(p=p.getElementById(m[1]))?p.id===m[1]||typeof p.getAttributeNode!=="undefined"&&p.getAttributeNode("id").nodeValue===m[1]?[p]:B:[]};o.filter.ID=function(m,p){var q=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&q&&q.nodeValue===p}}n.removeChild(g);
-n=g=null})();(function(){var g=t.createElement("div");g.appendChild(t.createComment(""));if(g.getElementsByTagName("*").length>0)o.find.TAG=function(i,n){var m=n.getElementsByTagName(i[1]);if(i[1]==="*"){for(var p=[],q=0;m[q];q++)m[q].nodeType===1&&p.push(m[q]);m=p}return m};g.innerHTML="<a href='#'></a>";if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")o.attrHandle.href=function(i){return i.getAttribute("href",2)};g=null})();t.querySelectorAll&&
-function(){var g=k,i=t.createElement("div");i.innerHTML="<p class='TEST'></p>";if(!(i.querySelectorAll&&i.querySelectorAll(".TEST").length===0)){k=function(m,p,q,u){p=p||t;m=m.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!u&&!k.isXML(p))if(p.nodeType===9)try{return C(p.querySelectorAll(m),q)}catch(y){}else if(p.nodeType===1&&p.nodeName.toLowerCase()!=="object"){var F=p.getAttribute("id"),M=F||"__sizzle__";F||p.setAttribute("id",M);try{return C(p.querySelectorAll("#"+M+" "+m),q)}catch(N){}finally{F||
-p.removeAttribute("id")}}return g(m,p,q,u)};for(var n in g)k[n]=g[n];i=null}}();(function(){var g=t.documentElement,i=g.matchesSelector||g.mozMatchesSelector||g.webkitMatchesSelector||g.msMatchesSelector,n=false;try{i.call(t.documentElement,"[test!='']:sizzle")}catch(m){n=true}if(i)k.matchesSelector=function(p,q){q=q.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(p))try{if(n||!o.match.PSEUDO.test(q)&&!/!=/.test(q))return i.call(p,q)}catch(u){}return k(q,null,null,[p]).length>0}})();(function(){var g=
-t.createElement("div");g.innerHTML="<div class='test e'></div><div class='test'></div>";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){o.order.splice(1,0,"CLASS");o.find.CLASS=function(i,n,m){if(typeof n.getElementsByClassName!=="undefined"&&!m)return n.getElementsByClassName(i[1])};g=null}}})();k.contains=t.documentElement.contains?function(g,i){return g!==i&&(g.contains?g.contains(i):true)}:t.documentElement.compareDocumentPosition?
-function(g,i){return!!(g.compareDocumentPosition(i)&16)}:function(){return false};k.isXML=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false};var L=function(g,i){for(var n,m=[],p="",q=i.nodeType?[i]:i;n=o.match.PSEUDO.exec(g);){p+=n[0];g=g.replace(o.match.PSEUDO,"")}g=o.relative[g]?g+"*":g;n=0;for(var u=q.length;n<u;n++)k(g,q[n],m);return k.filter(p,m)};c.find=k;c.expr=k.selectors;c.expr[":"]=c.expr.filters;c.unique=k.uniqueSort;c.text=k.getText;c.isXMLDoc=k.isXML;
-c.contains=k.contains})();var Za=/Until$/,$a=/^(?:parents|prevUntil|prevAll)/,ab=/,/,Na=/^.[^:#\[\.,]*$/,bb=Array.prototype.slice,cb=c.expr.match.POS;c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,e=0,f=this.length;e<f;e++){d=b.length;c.find(a,this[e],b);if(e>0)for(var h=d;h<b.length;h++)for(var l=0;l<d;l++)if(b[l]===b[h]){b.splice(h--,1);break}}return b},has:function(a){var b=c(a);return this.filter(function(){for(var d=0,e=b.length;d<e;d++)if(c.contains(this,b[d]))return true})},
-not:function(a){return this.pushStack(ma(this,a,false),"not",a)},filter:function(a){return this.pushStack(ma(this,a,true),"filter",a)},is:function(a){return!!a&&c.filter(a,this).length>0},closest:function(a,b){var d=[],e,f,h=this[0];if(c.isArray(a)){var l,k={},o=1;if(h&&a.length){e=0;for(f=a.length;e<f;e++){l=a[e];k[l]||(k[l]=c.expr.match.POS.test(l)?c(l,b||this.context):l)}for(;h&&h.ownerDocument&&h!==b;){for(l in k){e=k[l];if(e.jquery?e.index(h)>-1:c(h).is(e))d.push({selector:l,elem:h,level:o})}h=
-h.parentNode;o++}}return d}l=cb.test(a)?c(a,b||this.context):null;e=0;for(f=this.length;e<f;e++)for(h=this[e];h;)if(l?l.index(h)>-1:c.find.matchesSelector(h,a)){d.push(h);break}else{h=h.parentNode;if(!h||!h.ownerDocument||h===b)break}d=d.length>1?c.unique(d):d;return this.pushStack(d,"closest",a)},index:function(a){if(!a||typeof a==="string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var d=typeof a==="string"?c(a,b||this.context):
-c.makeArray(a),e=c.merge(this.get(),d);return this.pushStack(!d[0]||!d[0].parentNode||d[0].parentNode.nodeType===11||!e[0]||!e[0].parentNode||e[0].parentNode.nodeType===11?e:c.unique(e))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode",d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,
-2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,
-b){c.fn[a]=function(d,e){var f=c.map(this,b,d);Za.test(a)||(e=d);if(e&&typeof e==="string")f=c.filter(e,f);f=this.length>1?c.unique(f):f;if((this.length>1||ab.test(e))&&$a.test(a))f=f.reverse();return this.pushStack(f,a,bb.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return b.length===1?c.find.matchesSelector(b[0],a)?[b[0]]:[]:c.find.matches(a,b)},dir:function(a,b,d){var e=[];for(a=a[b];a&&a.nodeType!==9&&(d===B||a.nodeType!==1||!c(a).is(d));){a.nodeType===1&&
-e.push(a);a=a[b]}return e},nth:function(a,b,d){b=b||1;for(var e=0;a;a=a[d])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var za=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,Aa=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,Ba=/<([\w:]+)/,db=/<tbody/i,eb=/<|&#?\w+;/,Ca=/<(?:script|object|embed|option|style)/i,Da=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/\=([^="'>\s]+\/)>/g,P={option:[1,
-"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};P.optgroup=P.option;P.tbody=P.tfoot=P.colgroup=P.caption=P.thead;P.th=P.td;if(!c.support.htmlSerialize)P._default=[1,"div<div>","</div>"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d=
-c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==B)return this.empty().append((this[0]&&this[0].ownerDocument||t).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this},
-wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})},
-prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,
-this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,e;(e=this[d])!=null;d++)if(!a||c.filter(a,[e]).length){if(!b&&e.nodeType===1){c.cleanData(e.getElementsByTagName("*"));c.cleanData([e])}e.parentNode&&e.parentNode.removeChild(e)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild);
-return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,e=this.ownerDocument;if(!d){d=e.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(za,"").replace(fb,'="$1">').replace($,"")],e)[0]}else return this.cloneNode(true)});if(a===true){na(this,b);na(this.find("*"),b.find("*"))}return b},html:function(a){if(a===B)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(za,""):null;
-else if(typeof a==="string"&&!Ca.test(a)&&(c.support.leadingWhitespace||!$.test(a))&&!P[(Ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Aa,"<$1></$2>");try{for(var b=0,d=this.length;b<d;b++)if(this[b].nodeType===1){c.cleanData(this[b].getElementsByTagName("*"));this[b].innerHTML=a}}catch(e){this.empty().append(a)}}else c.isFunction(a)?this.each(function(f){var h=c(this);h.html(a.call(this,f,h.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(c.isFunction(a))return this.each(function(b){var d=
-c(this),e=d.html();d.replaceWith(a.call(this,b,e))});if(typeof a!=="string")a=c(a).detach();return this.each(function(){var b=this.nextSibling,d=this.parentNode;c(this).remove();b?c(b).before(a):c(d).append(a)})}else return this.pushStack(c(c.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,true)},domManip:function(a,b,d){var e,f,h,l=a[0],k=[];if(!c.support.checkClone&&arguments.length===3&&typeof l==="string"&&Da.test(l))return this.each(function(){c(this).domManip(a,
-b,d,true)});if(c.isFunction(l))return this.each(function(x){var r=c(this);a[0]=l.call(this,x,b?r.html():B);r.domManip(a,b,d)});if(this[0]){e=l&&l.parentNode;e=c.support.parentNode&&e&&e.nodeType===11&&e.childNodes.length===this.length?{fragment:e}:c.buildFragment(a,this,k);h=e.fragment;if(f=h.childNodes.length===1?h=h.firstChild:h.firstChild){b=b&&c.nodeName(f,"tr");f=0;for(var o=this.length;f<o;f++)d.call(b?c.nodeName(this[f],"table")?this[f].getElementsByTagName("tbody")[0]||this[f].appendChild(this[f].ownerDocument.createElement("tbody")):
-this[f]:this[f],f>0||e.cacheable||this.length>1?h.cloneNode(true):h)}k.length&&c.each(k,Oa)}return this}});c.buildFragment=function(a,b,d){var e,f,h;b=b&&b[0]?b[0].ownerDocument||b[0]:t;if(a.length===1&&typeof a[0]==="string"&&a[0].length<512&&b===t&&!Ca.test(a[0])&&(c.support.checkClone||!Da.test(a[0]))){f=true;if(h=c.fragments[a[0]])if(h!==1)e=h}if(!e){e=b.createDocumentFragment();c.clean(a,b,e,d)}if(f)c.fragments[a[0]]=h?e:1;return{fragment:e,cacheable:f}};c.fragments={};c.each({appendTo:"append",
-prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var e=[];d=c(d);var f=this.length===1&&this[0].parentNode;if(f&&f.nodeType===11&&f.childNodes.length===1&&d.length===1){d[b](this[0]);return this}else{f=0;for(var h=d.length;f<h;f++){var l=(f>0?this.clone(true):this).get();c(d[f])[b](l);e=e.concat(l)}return this.pushStack(e,a,d.selector)}}});c.extend({clean:function(a,b,d,e){b=b||t;if(typeof b.createElement==="undefined")b=b.ownerDocument||
-b[0]&&b[0].ownerDocument||t;for(var f=[],h=0,l;(l=a[h])!=null;h++){if(typeof l==="number")l+="";if(l){if(typeof l==="string"&&!eb.test(l))l=b.createTextNode(l);else if(typeof l==="string"){l=l.replace(Aa,"<$1></$2>");var k=(Ba.exec(l)||["",""])[1].toLowerCase(),o=P[k]||P._default,x=o[0],r=b.createElement("div");for(r.innerHTML=o[1]+l+o[2];x--;)r=r.lastChild;if(!c.support.tbody){x=db.test(l);k=k==="table"&&!x?r.firstChild&&r.firstChild.childNodes:o[1]==="<table>"&&!x?r.childNodes:[];for(o=k.length-
-1;o>=0;--o)c.nodeName(k[o],"tbody")&&!k[o].childNodes.length&&k[o].parentNode.removeChild(k[o])}!c.support.leadingWhitespace&&$.test(l)&&r.insertBefore(b.createTextNode($.exec(l)[0]),r.firstChild);l=r.childNodes}if(l.nodeType)f.push(l);else f=c.merge(f,l)}}if(d)for(h=0;f[h];h++)if(e&&c.nodeName(f[h],"script")&&(!f[h].type||f[h].type.toLowerCase()==="text/javascript"))e.push(f[h].parentNode?f[h].parentNode.removeChild(f[h]):f[h]);else{f[h].nodeType===1&&f.splice.apply(f,[h+1,0].concat(c.makeArray(f[h].getElementsByTagName("script"))));
-d.appendChild(f[h])}return f},cleanData:function(a){for(var b,d,e=c.cache,f=c.event.special,h=c.support.deleteExpando,l=0,k;(k=a[l])!=null;l++)if(!(k.nodeName&&c.noData[k.nodeName.toLowerCase()]))if(d=k[c.expando]){if((b=e[d])&&b.events)for(var o in b.events)f[o]?c.event.remove(k,o):c.removeEvent(k,o,b.handle);if(h)delete k[c.expando];else k.removeAttribute&&k.removeAttribute(c.expando);delete e[d]}}});var Ea=/alpha\([^)]*\)/i,gb=/opacity=([^)]*)/,hb=/-([a-z])/ig,ib=/([A-Z])/g,Fa=/^-?\d+(?:px)?$/i,
-jb=/^-?\d/,kb={position:"absolute",visibility:"hidden",display:"block"},Pa=["Left","Right"],Qa=["Top","Bottom"],W,Ga,aa,lb=function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){if(arguments.length===2&&b===B)return this;return c.access(this,a,b,true,function(d,e,f){return f!==B?c.style(d,e,f):c.css(d,e)})};c.extend({cssHooks:{opacity:{get:function(a,b){if(b){var d=W(a,"opacity","opacity");return d===""?"1":d}else return a.style.opacity}}},cssNumber:{zIndex:true,fontWeight:true,opacity:true,
-zoom:true,lineHeight:true},cssProps:{"float":c.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,b,d,e){if(!(!a||a.nodeType===3||a.nodeType===8||!a.style)){var f,h=c.camelCase(b),l=a.style,k=c.cssHooks[h];b=c.cssProps[h]||h;if(d!==B){if(!(typeof d==="number"&&isNaN(d)||d==null)){if(typeof d==="number"&&!c.cssNumber[h])d+="px";if(!k||!("set"in k)||(d=k.set(a,d))!==B)try{l[b]=d}catch(o){}}}else{if(k&&"get"in k&&(f=k.get(a,false,e))!==B)return f;return l[b]}}},css:function(a,b,d){var e,f=c.camelCase(b),
-h=c.cssHooks[f];b=c.cssProps[f]||f;if(h&&"get"in h&&(e=h.get(a,true,d))!==B)return e;else if(W)return W(a,b,f)},swap:function(a,b,d){var e={},f;for(f in b){e[f]=a.style[f];a.style[f]=b[f]}d.call(a);for(f in b)a.style[f]=e[f]},camelCase:function(a){return a.replace(hb,lb)}});c.curCSS=c.css;c.each(["height","width"],function(a,b){c.cssHooks[b]={get:function(d,e,f){var h;if(e){if(d.offsetWidth!==0)h=oa(d,b,f);else c.swap(d,kb,function(){h=oa(d,b,f)});if(h<=0){h=W(d,b,b);if(h==="0px"&&aa)h=aa(d,b,b);
-if(h!=null)return h===""||h==="auto"?"0px":h}if(h<0||h==null){h=d.style[b];return h===""||h==="auto"?"0px":h}return typeof h==="string"?h:h+"px"}},set:function(d,e){if(Fa.test(e)){e=parseFloat(e);if(e>=0)return e+"px"}else return e}}});if(!c.support.opacity)c.cssHooks.opacity={get:function(a,b){return gb.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var d=a.style;d.zoom=1;var e=c.isNaN(b)?"":"alpha(opacity="+b*100+")",f=
-d.filter||"";d.filter=Ea.test(f)?f.replace(Ea,e):d.filter+" "+e}};if(t.defaultView&&t.defaultView.getComputedStyle)Ga=function(a,b,d){var e;d=d.replace(ib,"-$1").toLowerCase();if(!(b=a.ownerDocument.defaultView))return B;if(b=b.getComputedStyle(a,null)){e=b.getPropertyValue(d);if(e===""&&!c.contains(a.ownerDocument.documentElement,a))e=c.style(a,d)}return e};if(t.documentElement.currentStyle)aa=function(a,b){var d,e,f=a.currentStyle&&a.currentStyle[b],h=a.style;if(!Fa.test(f)&&jb.test(f)){d=h.left;
-e=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;h.left=b==="fontSize"?"1em":f||0;f=h.pixelLeft+"px";h.left=d;a.runtimeStyle.left=e}return f===""?"auto":f};W=Ga||aa;if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b=a.offsetHeight;return a.offsetWidth===0&&b===0||!c.support.reliableHiddenOffsets&&(a.style.display||c.css(a,"display"))==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var mb=c.now(),nb=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-ob=/^(?:select|textarea)/i,pb=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,qb=/^(?:GET|HEAD)$/,Ra=/\[\]$/,T=/\=\?(&|$)/,ja=/\?/,rb=/([?&])_=[^&]*/,sb=/^(\w+:)?\/\/([^\/?#]+)/,tb=/%20/g,ub=/#.*$/,Ha=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!=="string"&&Ha)return Ha.apply(this,arguments);else if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var f=a.slice(e,a.length);a=a.slice(0,e)}e="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b===
-"object"){b=c.param(b,c.ajaxSettings.traditional);e="POST"}var h=this;c.ajax({url:a,type:e,dataType:"html",data:b,complete:function(l,k){if(k==="success"||k==="notmodified")h.html(f?c("<div>").append(l.responseText.replace(nb,"")).find(f):l.responseText);d&&h.each(d,[l.responseText,k,l])}});return this},serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&
-!this.disabled&&(this.checked||ob.test(this.nodeName)||pb.test(this.type))}).map(function(a,b){var d=c(this).val();return d==null?null:c.isArray(d)?c.map(d,function(e){return{name:b.name,value:e}}):{name:b.name,value:d}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:e})},
-getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,e){if(c.isFunction(b)){e=e||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:e})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href,global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:function(){return new E.XMLHttpRequest},accepts:{xml:"application/xml, text/xml",html:"text/html",
-script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},ajax:function(a){var b=c.extend(true,{},c.ajaxSettings,a),d,e,f,h=b.type.toUpperCase(),l=qb.test(h);b.url=b.url.replace(ub,"");b.context=a&&a.context!=null?a.context:b;if(b.data&&b.processData&&typeof b.data!=="string")b.data=c.param(b.data,b.traditional);if(b.dataType==="jsonp"){if(h==="GET")T.test(b.url)||(b.url+=(ja.test(b.url)?"&":"?")+(b.jsonp||"callback")+"=?");else if(!b.data||
-!T.test(b.data))b.data=(b.data?b.data+"&":"")+(b.jsonp||"callback")+"=?";b.dataType="json"}if(b.dataType==="json"&&(b.data&&T.test(b.data)||T.test(b.url))){d=b.jsonpCallback||"jsonp"+mb++;if(b.data)b.data=(b.data+"").replace(T,"="+d+"$1");b.url=b.url.replace(T,"="+d+"$1");b.dataType="script";var k=E[d];E[d]=function(m){if(c.isFunction(k))k(m);else{E[d]=B;try{delete E[d]}catch(p){}}f=m;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);r&&r.removeChild(A)}}if(b.dataType==="script"&&b.cache===null)b.cache=
-false;if(b.cache===false&&l){var o=c.now(),x=b.url.replace(rb,"$1_="+o);b.url=x+(x===b.url?(ja.test(b.url)?"&":"?")+"_="+o:"")}if(b.data&&l)b.url+=(ja.test(b.url)?"&":"?")+b.data;b.global&&c.active++===0&&c.event.trigger("ajaxStart");o=(o=sb.exec(b.url))&&(o[1]&&o[1].toLowerCase()!==location.protocol||o[2].toLowerCase()!==location.host);if(b.dataType==="script"&&h==="GET"&&o){var r=t.getElementsByTagName("head")[0]||t.documentElement,A=t.createElement("script");if(b.scriptCharset)A.charset=b.scriptCharset;
-A.src=b.url;if(!d){var C=false;A.onload=A.onreadystatechange=function(){if(!C&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){C=true;c.handleSuccess(b,w,e,f);c.handleComplete(b,w,e,f);A.onload=A.onreadystatechange=null;r&&A.parentNode&&r.removeChild(A)}}}r.insertBefore(A,r.firstChild);return B}var J=false,w=b.xhr();if(w){b.username?w.open(h,b.url,b.async,b.username,b.password):w.open(h,b.url,b.async);try{if(b.data!=null&&!l||a&&a.contentType)w.setRequestHeader("Content-Type",
-b.contentType);if(b.ifModified){c.lastModified[b.url]&&w.setRequestHeader("If-Modified-Since",c.lastModified[b.url]);c.etag[b.url]&&w.setRequestHeader("If-None-Match",c.etag[b.url])}o||w.setRequestHeader("X-Requested-With","XMLHttpRequest");w.setRequestHeader("Accept",b.dataType&&b.accepts[b.dataType]?b.accepts[b.dataType]+", */*; q=0.01":b.accepts._default)}catch(I){}if(b.beforeSend&&b.beforeSend.call(b.context,w,b)===false){b.global&&c.active--===1&&c.event.trigger("ajaxStop");w.abort();return false}b.global&&
-c.triggerGlobal(b,"ajaxSend",[w,b]);var L=w.onreadystatechange=function(m){if(!w||w.readyState===0||m==="abort"){J||c.handleComplete(b,w,e,f);J=true;if(w)w.onreadystatechange=c.noop}else if(!J&&w&&(w.readyState===4||m==="timeout")){J=true;w.onreadystatechange=c.noop;e=m==="timeout"?"timeout":!c.httpSuccess(w)?"error":b.ifModified&&c.httpNotModified(w,b.url)?"notmodified":"success";var p;if(e==="success")try{f=c.httpData(w,b.dataType,b)}catch(q){e="parsererror";p=q}if(e==="success"||e==="notmodified")d||
-c.handleSuccess(b,w,e,f);else c.handleError(b,w,e,p);d||c.handleComplete(b,w,e,f);m==="timeout"&&w.abort();if(b.async)w=null}};try{var g=w.abort;w.abort=function(){w&&Function.prototype.call.call(g,w);L("abort")}}catch(i){}b.async&&b.timeout>0&&setTimeout(function(){w&&!J&&L("timeout")},b.timeout);try{w.send(l||b.data==null?null:b.data)}catch(n){c.handleError(b,w,null,n);c.handleComplete(b,w,e,f)}b.async||L();return w}},param:function(a,b){var d=[],e=function(h,l){l=c.isFunction(l)?l():l;d[d.length]=
-encodeURIComponent(h)+"="+encodeURIComponent(l)};if(b===B)b=c.ajaxSettings.traditional;if(c.isArray(a)||a.jquery)c.each(a,function(){e(this.name,this.value)});else for(var f in a)da(f,a[f],b,e);return d.join("&").replace(tb,"+")}});c.extend({active:0,lastModified:{},etag:{},handleError:function(a,b,d,e){a.error&&a.error.call(a.context,b,d,e);a.global&&c.triggerGlobal(a,"ajaxError",[b,a,e])},handleSuccess:function(a,b,d,e){a.success&&a.success.call(a.context,e,d,b);a.global&&c.triggerGlobal(a,"ajaxSuccess",
-[b,a])},handleComplete:function(a,b,d){a.complete&&a.complete.call(a.context,b,d);a.global&&c.triggerGlobal(a,"ajaxComplete",[b,a]);a.global&&c.active--===1&&c.event.trigger("ajaxStop")},triggerGlobal:function(a,b,d){(a.context&&a.context.url==null?c(a.context):c.event).trigger(b,d)},httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status===1223}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),
-e=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(e)c.etag[b]=e;return a.status===304},httpData:function(a,b,d){var e=a.getResponseHeader("content-type")||"",f=b==="xml"||!b&&e.indexOf("xml")>=0;a=f?a.responseXML:a.responseText;f&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b==="json"||!b&&e.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&e.indexOf("javascript")>=0)c.globalEval(a);return a}});
-if(E.ActiveXObject)c.ajaxSettings.xhr=function(){if(E.location.protocol!=="file:")try{return new E.XMLHttpRequest}catch(a){}try{return new E.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}};c.support.ajax=!!c.ajaxSettings.xhr();var ea={},vb=/^(?:toggle|show|hide)$/,wb=/^([+\-]=)?([\d+.\-]+)(.*)$/,ba,pa=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b,d){if(a||a===0)return this.animate(S("show",
-3),a,b,d);else{d=0;for(var e=this.length;d<e;d++){a=this[d];b=a.style.display;if(!c.data(a,"olddisplay")&&b==="none")b=a.style.display="";b===""&&c.css(a,"display")==="none"&&c.data(a,"olddisplay",qa(a.nodeName))}for(d=0;d<e;d++){a=this[d];b=a.style.display;if(b===""||b==="none")a.style.display=c.data(a,"olddisplay")||""}return this}},hide:function(a,b,d){if(a||a===0)return this.animate(S("hide",3),a,b,d);else{a=0;for(b=this.length;a<b;a++){d=c.css(this[a],"display");d!=="none"&&c.data(this[a],"olddisplay",
-d)}for(a=0;a<b;a++)this[a].style.display="none";return this}},_toggle:c.fn.toggle,toggle:function(a,b,d){var e=typeof a==="boolean";if(c.isFunction(a)&&c.isFunction(b))this._toggle.apply(this,arguments);else a==null||e?this.each(function(){var f=e?a:c(this).is(":hidden");c(this)[f?"show":"hide"]()}):this.animate(S("toggle",3),a,b,d);return this},fadeTo:function(a,b,d,e){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,d,e)},animate:function(a,b,d,e){var f=c.speed(b,
-d,e);if(c.isEmptyObject(a))return this.each(f.complete);return this[f.queue===false?"each":"queue"](function(){var h=c.extend({},f),l,k=this.nodeType===1,o=k&&c(this).is(":hidden"),x=this;for(l in a){var r=c.camelCase(l);if(l!==r){a[r]=a[l];delete a[l];l=r}if(a[l]==="hide"&&o||a[l]==="show"&&!o)return h.complete.call(this);if(k&&(l==="height"||l==="width")){h.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(c.css(this,"display")==="inline"&&c.css(this,"float")==="none")if(c.support.inlineBlockNeedsLayout)if(qa(this.nodeName)===
-"inline")this.style.display="inline-block";else{this.style.display="inline";this.style.zoom=1}else this.style.display="inline-block"}if(c.isArray(a[l])){(h.specialEasing=h.specialEasing||{})[l]=a[l][1];a[l]=a[l][0]}}if(h.overflow!=null)this.style.overflow="hidden";h.curAnim=c.extend({},a);c.each(a,function(A,C){var J=new c.fx(x,h,A);if(vb.test(C))J[C==="toggle"?o?"show":"hide":C](a);else{var w=wb.exec(C),I=J.cur()||0;if(w){var L=parseFloat(w[2]),g=w[3]||"px";if(g!=="px"){c.style(x,A,(L||1)+g);I=(L||
-1)/J.cur()*I;c.style(x,A,I+g)}if(w[1])L=(w[1]==="-="?-1:1)*L+I;J.custom(I,L,g)}else J.custom(I,C,"")}});return true})},stop:function(a,b){var d=c.timers;a&&this.queue([]);this.each(function(){for(var e=d.length-1;e>=0;e--)if(d[e].elem===this){b&&d[e](true);d.splice(e,1)}});b||this.dequeue();return this}});c.each({slideDown:S("show",1),slideUp:S("hide",1),slideToggle:S("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){c.fn[a]=function(d,e,f){return this.animate(b,
-d,e,f)}});c.extend({speed:function(a,b,d){var e=a&&typeof a==="object"?c.extend({},a):{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};e.duration=c.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in c.fx.speeds?c.fx.speeds[e.duration]:c.fx.speeds._default;e.old=e.complete;e.complete=function(){e.queue!==false&&c(this).dequeue();c.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,d,e){return d+e*a},swing:function(a,b,d,e){return(-Math.cos(a*
-Math.PI)/2+0.5)*e+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]||c.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a=parseFloat(c.css(this.elem,this.prop));return a&&a>-1E4?a:0},custom:function(a,b,d){function e(l){return f.step(l)}
-var f=this,h=c.fx;this.startTime=c.now();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start;this.pos=this.state=0;e.elem=this.elem;if(e()&&c.timers.push(e)&&!ba)ba=setInterval(h.tick,h.interval)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;
-this.custom(this.cur(),0)},step:function(a){var b=c.now(),d=true;if(a||b>=this.options.duration+this.startTime){this.now=this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var e in this.options.curAnim)if(this.options.curAnim[e]!==true)d=false;if(d){if(this.options.overflow!=null&&!c.support.shrinkWrapBlocks){var f=this.elem,h=this.options;c.each(["","X","Y"],function(k,o){f.style["overflow"+o]=h.overflow[k]})}this.options.hide&&c(this.elem).hide();if(this.options.hide||
-this.options.show)for(var l in this.options.curAnim)c.style(this.elem,l,this.options.orig[l]);this.options.complete.call(this.elem)}return false}else{a=b-this.startTime;this.state=a/this.options.duration;b=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||b](this.state,a,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=
-c.timers,b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||c.fx.stop()},interval:13,stop:function(){clearInterval(ba);ba=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){c.style(a.elem,"opacity",a.now)},_default:function(a){if(a.elem.style&&a.elem.style[a.prop]!=null)a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit;else a.elem[a.prop]=a.now}}});if(c.expr&&c.expr.filters)c.expr.filters.animated=function(a){return c.grep(c.timers,function(b){return a===
-b.elem}).length};var xb=/^t(?:able|d|h)$/i,Ia=/^(?:body|html)$/i;c.fn.offset="getBoundingClientRect"in t.documentElement?function(a){var b=this[0],d;if(a)return this.each(function(l){c.offset.setOffset(this,a,l)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);try{d=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,h=f.documentElement;if(!d||!c.contains(h,b))return d||{top:0,left:0};b=f.body;f=fa(f);return{top:d.top+(f.pageYOffset||c.support.boxModel&&
-h.scrollTop||b.scrollTop)-(h.clientTop||b.clientTop||0),left:d.left+(f.pageXOffset||c.support.boxModel&&h.scrollLeft||b.scrollLeft)-(h.clientLeft||b.clientLeft||0)}}:function(a){var b=this[0];if(a)return this.each(function(x){c.offset.setOffset(this,a,x)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return c.offset.bodyOffset(b);c.offset.initialize();var d,e=b.offsetParent,f=b.ownerDocument,h=f.documentElement,l=f.body;d=(f=f.defaultView)?f.getComputedStyle(b,null):b.currentStyle;
-for(var k=b.offsetTop,o=b.offsetLeft;(b=b.parentNode)&&b!==l&&b!==h;){if(c.offset.supportsFixedPosition&&d.position==="fixed")break;d=f?f.getComputedStyle(b,null):b.currentStyle;k-=b.scrollTop;o-=b.scrollLeft;if(b===e){k+=b.offsetTop;o+=b.offsetLeft;if(c.offset.doesNotAddBorder&&!(c.offset.doesAddBorderForTableAndCells&&xb.test(b.nodeName))){k+=parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}e=b.offsetParent}if(c.offset.subtractsBorderForOverflowNotVisible&&d.overflow!=="visible"){k+=
-parseFloat(d.borderTopWidth)||0;o+=parseFloat(d.borderLeftWidth)||0}d=d}if(d.position==="relative"||d.position==="static"){k+=l.offsetTop;o+=l.offsetLeft}if(c.offset.supportsFixedPosition&&d.position==="fixed"){k+=Math.max(h.scrollTop,l.scrollTop);o+=Math.max(h.scrollLeft,l.scrollLeft)}return{top:k,left:o}};c.offset={initialize:function(){var a=t.body,b=t.createElement("div"),d,e,f,h=parseFloat(c.css(a,"marginTop"))||0;c.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",
-height:"1px",visibility:"hidden"});b.innerHTML="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";a.insertBefore(b,a.firstChild);d=b.firstChild;e=d.firstChild;f=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=e.offsetTop!==5;this.doesAddBorderForTableAndCells=
-f.offsetTop===5;e.style.position="fixed";e.style.top="20px";this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15;e.style.position=e.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==h;a.removeChild(b);c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.css(a,
-"marginTop"))||0;d+=parseFloat(c.css(a,"marginLeft"))||0}return{top:b,left:d}},setOffset:function(a,b,d){var e=c.css(a,"position");if(e==="static")a.style.position="relative";var f=c(a),h=f.offset(),l=c.css(a,"top"),k=c.css(a,"left"),o=e==="absolute"&&c.inArray("auto",[l,k])>-1;e={};var x={};if(o)x=f.position();l=o?x.top:parseInt(l,10)||0;k=o?x.left:parseInt(k,10)||0;if(c.isFunction(b))b=b.call(a,d,h);if(b.top!=null)e.top=b.top-h.top+l;if(b.left!=null)e.left=b.left-h.left+k;"using"in b?b.using.call(a,
-e):f.css(e)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),e=Ia.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.css(a,"marginTop"))||0;d.left-=parseFloat(c.css(a,"marginLeft"))||0;e.top+=parseFloat(c.css(b[0],"borderTopWidth"))||0;e.left+=parseFloat(c.css(b[0],"borderLeftWidth"))||0;return{top:d.top-e.top,left:d.left-e.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||t.body;a&&!Ia.test(a.nodeName)&&
-c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(e){var f=this[0],h;if(!f)return null;if(e!==B)return this.each(function(){if(h=fa(this))h.scrollTo(!a?e:c(h).scrollLeft(),a?e:c(h).scrollTop());else this[d]=e});else return(h=fa(f))?"pageXOffset"in h?h[a?"pageYOffset":"pageXOffset"]:c.support.boxModel&&h.document.documentElement[d]||h.document.body[d]:f[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();
-c.fn["inner"+b]=function(){return this[0]?parseFloat(c.css(this[0],d,"padding")):null};c.fn["outer"+b]=function(e){return this[0]?parseFloat(c.css(this[0],d,e?"margin":"border")):null};c.fn[d]=function(e){var f=this[0];if(!f)return e==null?null:this;if(c.isFunction(e))return this.each(function(l){var k=c(this);k[d](e.call(this,l,k[d]()))});if(c.isWindow(f))return f.document.compatMode==="CSS1Compat"&&f.document.documentElement["client"+b]||f.document.body["client"+b];else if(f.nodeType===9)return Math.max(f.documentElement["client"+
-b],f.body["scroll"+b],f.documentElement["scroll"+b],f.body["offset"+b],f.documentElement["offset"+b]);else if(e===B){f=c.css(f,d);var h=parseFloat(f);return c.isNaN(h)?f:h}else return this.css(d,typeof e==="string"?e:e+"px")}})})(window);
\ No newline at end of file
+(function( window, undefined ) {
+
+// Use the correct document accordingly with window argument (sandbox)
+var document = window.document,
+	navigator = window.navigator,
+	location = window.location;
+var jQuery = (function() {
+
+// Define a local copy of jQuery
+var jQuery = function( selector, context ) {
+		// The jQuery object is actually just the init constructor 'enhanced'
+		return new jQuery.fn.init( selector, context, rootjQuery );
+	},
+
+	// Map over jQuery in case of overwrite
+	_jQuery = window.jQuery,
+
+	// Map over the $ in case of overwrite
+	_$ = window.$,
+
+	// A central reference to the root jQuery(document)
+	rootjQuery,
+
+	// A simple way to check for HTML strings or ID strings
+	// (both of which we optimize for)
+	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,
+
+	// Check if a string has a non-whitespace character in it
+	rnotwhite = /\S/,
+
+	// Used for trimming whitespace
+	trimLeft = /^\s+/,
+	trimRight = /\s+$/,
+
+	// Check for digits
+	rdigit = /\d/,
+
+	// Match a standalone tag
+	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
+
+	// JSON RegExp
+	rvalidchars = /^[\],:{}\s]*$/,
+	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
+	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
+
+	// Useragent RegExp
+	rwebkit = /(webkit)[ \/]([\w.]+)/,
+	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
+	rmsie = /(msie) ([\w.]+)/,
+	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
+
+	// Matches dashed string for camelizing
+	rdashAlpha = /-([a-z])/ig,
+
+	// Used by jQuery.camelCase as callback to replace()
+	fcamelCase = function( all, letter ) {
+		return letter.toUpperCase();
+	},
+
+	// Keep a UserAgent string for use with jQuery.browser
+	userAgent = navigator.userAgent,
+
+	// For matching the engine and version of the browser
+	browserMatch,
+
+	// The deferred used on DOM ready
+	readyList,
+
+	// The ready event handler
+	DOMContentLoaded,
+
+	// Save a reference to some core methods
+	toString = Object.prototype.toString,
+	hasOwn = Object.prototype.hasOwnProperty,
+	push = Array.prototype.push,
+	slice = Array.prototype.slice,
+	trim = String.prototype.trim,
+	indexOf = Array.prototype.indexOf,
+
+	// [[Class]] -> type pairs
+	class2type = {};
+
+jQuery.fn = jQuery.prototype = {
+	constructor: jQuery,
+	init: function( selector, context, rootjQuery ) {
+		var match, elem, ret, doc;
+
+		// Handle $(""), $(null), or $(undefined)
+		if ( !selector ) {
+			return this;
+		}
+
+		// Handle $(DOMElement)
+		if ( selector.nodeType ) {
+			this.context = this[0] = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// The body element only exists once, optimize finding it
+		if ( selector === "body" && !context && document.body ) {
+			this.context = document;
+			this[0] = document.body;
+			this.selector = selector;
+			this.length = 1;
+			return this;
+		}
+
+		// Handle HTML strings
+		if ( typeof selector === "string" ) {
+			// Are we dealing with HTML string or an ID?
+			if ( selector.charAt(0) === "<" && selector.charAt( selector.length - 1 ) === ">" && selector.length >= 3 ) {
+				// Assume that strings that start and end with <> are HTML and skip the regex check
+				match = [ null, selector, null ];
+
+			} else {
+				match = quickExpr.exec( selector );
+			}
+
+			// Verify a match, and that no context was specified for #id
+			if ( match && (match[1] || !context) ) {
+
+				// HANDLE: $(html) -> $(array)
+				if ( match[1] ) {
+					context = context instanceof jQuery ? context[0] : context;
+					doc = (context ? context.ownerDocument || context : document);
+
+					// If a single string is passed in and it's a single tag
+					// just do a createElement and skip the rest
+					ret = rsingleTag.exec( selector );
+
+					if ( ret ) {
+						if ( jQuery.isPlainObject( context ) ) {
+							selector = [ document.createElement( ret[1] ) ];
+							jQuery.fn.attr.call( selector, context, true );
+
+						} else {
+							selector = [ doc.createElement( ret[1] ) ];
+						}
+
+					} else {
+						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
+						selector = (ret.cacheable ? jQuery.clone(ret.fragment) : ret.fragment).childNodes;
+					}
+
+					return jQuery.merge( this, selector );
+
+				// HANDLE: $("#id")
+				} else {
+					elem = document.getElementById( match[2] );
+
+					// Check parentNode to catch when Blackberry 4.6 returns
+					// nodes that are no longer in the document #6963
+					if ( elem && elem.parentNode ) {
+						// Handle the case where IE and Opera return items
+						// by name instead of ID
+						if ( elem.id !== match[2] ) {
+							return rootjQuery.find( selector );
+						}
+
+						// Otherwise, we inject the element directly into the jQuery object
+						this.length = 1;
+						this[0] = elem;
+					}
+
+					this.context = document;
+					this.selector = selector;
+					return this;
+				}
+
+			// HANDLE: $(expr, $(...))
+			} else if ( !context || context.jquery ) {
+				return (context || rootjQuery).find( selector );
+
+			// HANDLE: $(expr, context)
+			// (which is just equivalent to: $(context).find(expr)
+			} else {
+				return this.constructor( context ).find( selector );
+			}
+
+		// HANDLE: $(function)
+		// Shortcut for document ready
+		} else if ( jQuery.isFunction( selector ) ) {
+			return rootjQuery.ready( selector );
+		}
+
+		if (selector.selector !== undefined) {
+			this.selector = selector.selector;
+			this.context = selector.context;
+		}
+
+		return jQuery.makeArray( selector, this );
+	},
+
+	// Start with an empty selector
+	selector: "",
+
+	// The current version of jQuery being used
+	jquery: "1.6.2",
+
+	// The default length of a jQuery object is 0
+	length: 0,
+
+	// The number of elements contained in the matched element set
+	size: function() {
+		return this.length;
+	},
+
+	toArray: function() {
+		return slice.call( this, 0 );
+	},
+
+	// Get the Nth element in the matched element set OR
+	// Get the whole matched element set as a clean array
+	get: function( num ) {
+		return num == null ?
+
+			// Return a 'clean' array
+			this.toArray() :
+
+			// Return just the object
+			( num < 0 ? this[ this.length + num ] : this[ num ] );
+	},
+
+	// Take an array of elements and push it onto the stack
+	// (returning the new matched element set)
+	pushStack: function( elems, name, selector ) {
+		// Build a new jQuery matched element set
+		var ret = this.constructor();
+
+		if ( jQuery.isArray( elems ) ) {
+			push.apply( ret, elems );
+
+		} else {
+			jQuery.merge( ret, elems );
+		}
+
+		// Add the old object onto the stack (as a reference)
+		ret.prevObject = this;
+
+		ret.context = this.context;
+
+		if ( name === "find" ) {
+			ret.selector = this.selector + (this.selector ? " " : "") + selector;
+		} else if ( name ) {
+			ret.selector = this.selector + "." + name + "(" + selector + ")";
+		}
+
+		// Return the newly-formed element set
+		return ret;
+	},
+
+	// Execute a callback for every element in the matched set.
+	// (You can seed the arguments with an array of args, but this is
+	// only used internally.)
+	each: function( callback, args ) {
+		return jQuery.each( this, callback, args );
+	},
+
+	ready: function( fn ) {
+		// Attach the listeners
+		jQuery.bindReady();
+
+		// Add the callback
+		readyList.done( fn );
+
+		return this;
+	},
+
+	eq: function( i ) {
+		return i === -1 ?
+			this.slice( i ) :
+			this.slice( i, +i + 1 );
+	},
+
+	first: function() {
+		return this.eq( 0 );
+	},
+
+	last: function() {
+		return this.eq( -1 );
+	},
+
+	slice: function() {
+		return this.pushStack( slice.apply( this, arguments ),
+			"slice", slice.call(arguments).join(",") );
+	},
+
+	map: function( callback ) {
+		return this.pushStack( jQuery.map(this, function( elem, i ) {
+			return callback.call( elem, i, elem );
+		}));
+	},
+
+	end: function() {
+		return this.prevObject || this.constructor(null);
+	},
+
+	// For internal use only.
+	// Behaves like an Array's method, not like a jQuery method.
+	push: push,
+	sort: [].sort,
+	splice: [].splice
+};
+
+// Give the init function the jQuery prototype for later instantiation
+jQuery.fn.init.prototype = jQuery.fn;
+
+jQuery.extend = jQuery.fn.extend = function() {
+	var options, name, src, copy, copyIsArray, clone,
+		target = arguments[0] || {},
+		i = 1,
+		length = arguments.length,
+		deep = false;
+
+	// Handle a deep copy situation
+	if ( typeof target === "boolean" ) {
+		deep = target;
+		target = arguments[1] || {};
+		// skip the boolean and the target
+		i = 2;
+	}
+
+	// Handle case when target is a string or something (possible in deep copy)
+	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
+		target = {};
+	}
+
+	// extend jQuery itself if only one argument is passed
+	if ( length === i ) {
+		target = this;
+		--i;
+	}
+
+	for ( ; i < length; i++ ) {
+		// Only deal with non-null/undefined values
+		if ( (options = arguments[ i ]) != null ) {
+			// Extend the base object
+			for ( name in options ) {
+				src = target[ name ];
+				copy = options[ name ];
+
+				// Prevent never-ending loop
+				if ( target === copy ) {
+					continue;
+				}
+
+				// Recurse if we're merging plain objects or arrays
+				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
+					if ( copyIsArray ) {
+						copyIsArray = false;
+						clone = src && jQuery.isArray(src) ? src : [];
+
+					} else {
+						clone = src && jQuery.isPlainObject(src) ? src : {};
+					}
+
+					// Never move original objects, clone them
+					target[ name ] = jQuery.extend( deep, clone, copy );
+
+				// Don't bring in undefined values
+				} else if ( copy !== undefined ) {
+					target[ name ] = copy;
+				}
+			}
+		}
+	}
+
+	// Return the modified object
+	return target;
+};
+
+jQuery.extend({
+	noConflict: function( deep ) {
+		if ( window.$ === jQuery ) {
+			window.$ = _$;
+		}
+
+		if ( deep && window.jQuery === jQuery ) {
+			window.jQuery = _jQuery;
+		}
+
+		return jQuery;
+	},
+
+	// Is the DOM ready to be used? Set to true once it occurs.
+	isReady: false,
+
+	// A counter to track how many items to wait for before
+	// the ready event fires. See #6781
+	readyWait: 1,
+
+	// Hold (or release) the ready event
+	holdReady: function( hold ) {
+		if ( hold ) {
+			jQuery.readyWait++;
+		} else {
+			jQuery.ready( true );
+		}
+	},
+
+	// Handle when the DOM is ready
+	ready: function( wait ) {
+		// Either a released hold or an DOMready/load event and not yet ready
+		if ( (wait === true && !--jQuery.readyWait) || (wait !== true && !jQuery.isReady) ) {
+			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+			if ( !document.body ) {
+				return setTimeout( jQuery.ready, 1 );
+			}
+
+			// Remember that the DOM is ready
+			jQuery.isReady = true;
+
+			// If a normal DOM Ready event fired, decrement, and wait if need be
+			if ( wait !== true && --jQuery.readyWait > 0 ) {
+				return;
+			}
+
+			// If there are functions bound, to execute
+			readyList.resolveWith( document, [ jQuery ] );
+
+			// Trigger any bound ready events
+			if ( jQuery.fn.trigger ) {
+				jQuery( document ).trigger( "ready" ).unbind( "ready" );
+			}
+		}
+	},
+
+	bindReady: function() {
+		if ( readyList ) {
+			return;
+		}
+
+		readyList = jQuery._Deferred();
+
+		// Catch cases where $(document).ready() is called after the
+		// browser event has already occurred.
+		if ( document.readyState === "complete" ) {
+			// Handle it asynchronously to allow scripts the opportunity to delay ready
+			return setTimeout( jQuery.ready, 1 );
+		}
+
+		// Mozilla, Opera and webkit nightlies currently support this event
+		if ( document.addEventListener ) {
+			// Use the handy event callback
+			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+
+			// A fallback to window.onload, that will always work
+			window.addEventListener( "load", jQuery.ready, false );
+
+		// If IE event model is used
+		} else if ( document.attachEvent ) {
+			// ensure firing before onload,
+			// maybe late but safe also for iframes
+			document.attachEvent( "onreadystatechange", DOMContentLoaded );
+
+			// A fallback to window.onload, that will always work
+			window.attachEvent( "onload", jQuery.ready );
+
+			// If IE and not a frame
+			// continually check to see if the document is ready
+			var toplevel = false;
+
+			try {
+				toplevel = window.frameElement == null;
+			} catch(e) {}
+
+			if ( document.documentElement.doScroll && toplevel ) {
+				doScrollCheck();
+			}
+		}
+	},
+
+	// See test/unit/core.js for details concerning isFunction.
+	// Since version 1.3, DOM methods and functions like alert
+	// aren't supported. They return false on IE (#2968).
+	isFunction: function( obj ) {
+		return jQuery.type(obj) === "function";
+	},
+
+	isArray: Array.isArray || function( obj ) {
+		return jQuery.type(obj) === "array";
+	},
+
+	// A crude way of determining if an object is a window
+	isWindow: function( obj ) {
+		return obj && typeof obj === "object" && "setInterval" in obj;
+	},
+
+	isNaN: function( obj ) {
+		return obj == null || !rdigit.test( obj ) || isNaN( obj );
+	},
+
+	type: function( obj ) {
+		return obj == null ?
+			String( obj ) :
+			class2type[ toString.call(obj) ] || "object";
+	},
+
+	isPlainObject: function( obj ) {
+		// Must be an Object.
+		// Because of IE, we also have to check the presence of the constructor property.
+		// Make sure that DOM nodes and window objects don't pass through, as well
+		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
+			return false;
+		}
+
+		// Not own constructor property must be Object
+		if ( obj.constructor &&
+			!hasOwn.call(obj, "constructor") &&
+			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
+			return false;
+		}
+
+		// Own properties are enumerated firstly, so to speed up,
+		// if last one is own, then all properties are own.
+
+		var key;
+		for ( key in obj ) {}
+
+		return key === undefined || hasOwn.call( obj, key );
+	},
+
+	isEmptyObject: function( obj ) {
+		for ( var name in obj ) {
+			return false;
+		}
+		return true;
+	},
+
+	error: function( msg ) {
+		throw msg;
+	},
+
+	parseJSON: function( data ) {
+		if ( typeof data !== "string" || !data ) {
+			return null;
+		}
+
+		// Make sure leading/trailing whitespace is removed (IE can't handle it)
+		data = jQuery.trim( data );
+
+		// Attempt to parse using the native JSON parser first
+		if ( window.JSON && window.JSON.parse ) {
+			return window.JSON.parse( data );
+		}
+
+		// Make sure the incoming data is actual JSON
+		// Logic borrowed from http://json.org/json2.js
+		if ( rvalidchars.test( data.replace( rvalidescape, "@" )
+			.replace( rvalidtokens, "]" )
+			.replace( rvalidbraces, "")) ) {
+
+			return (new Function( "return " + data ))();
+
+		}
+		jQuery.error( "Invalid JSON: " + data );
+	},
+
+	// Cross-browser xml parsing
+	// (xml & tmp used internally)
+	parseXML: function( data , xml , tmp ) {
+
+		if ( window.DOMParser ) { // Standard
+			tmp = new DOMParser();
+			xml = tmp.parseFromString( data , "text/xml" );
+		} else { // IE
+			xml = new ActiveXObject( "Microsoft.XMLDOM" );
+			xml.async = "false";
+			xml.loadXML( data );
+		}
+
+		tmp = xml.documentElement;
+
+		if ( ! tmp || ! tmp.nodeName || tmp.nodeName === "parsererror" ) {
+			jQuery.error( "Invalid XML: " + data );
+		}
+
+		return xml;
+	},
+
+	noop: function() {},
+
+	// Evaluates a script in a global context
+	// Workarounds based on findings by Jim Driscoll
+	// http://weblogs.java.net/blog/driscoll/archive/2009/09/08/eval-javascript-global-context
+	globalEval: function( data ) {
+		if ( data && rnotwhite.test( data ) ) {
+			// We use execScript on Internet Explorer
+			// We use an anonymous function so that context is window
+			// rather than jQuery in Firefox
+			( window.execScript || function( data ) {
+				window[ "eval" ].call( window, data );
+			} )( data );
+		}
+	},
+
+	// Converts a dashed string to camelCased string;
+	// Used by both the css and data modules
+	camelCase: function( string ) {
+		return string.replace( rdashAlpha, fcamelCase );
+	},
+
+	nodeName: function( elem, name ) {
+		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
+	},
+
+	// args is for internal usage only
+	each: function( object, callback, args ) {
+		var name, i = 0,
+			length = object.length,
+			isObj = length === undefined || jQuery.isFunction( object );
+
+		if ( args ) {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.apply( object[ name ], args ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.apply( object[ i++ ], args ) === false ) {
+						break;
+					}
+				}
+			}
+
+		// A special, fast, case for the most common use of each
+		} else {
+			if ( isObj ) {
+				for ( name in object ) {
+					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
+						break;
+					}
+				}
+			} else {
+				for ( ; i < length; ) {
+					if ( callback.call( object[ i ], i, object[ i++ ] ) === false ) {
+						break;
+					}
+				}
+			}
+		}
+
+		return object;
+	},
+
+	// Use native String.trim function wherever possible
+	trim: trim ?
+		function( text ) {
+			return text == null ?
+				"" :
+				trim.call( text );
+		} :
+
+		// Otherwise use our own trimming functionality
+		function( text ) {
+			return text == null ?
+				"" :
+				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
+		},
+
+	// results is for internal usage only
+	makeArray: function( array, results ) {
+		var ret = results || [];
+
+		if ( array != null ) {
+			// The window, strings (and functions) also have 'length'
+			// The extra typeof function check is to prevent crashes
+			// in Safari 2 (See: #3039)
+			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
+			var type = jQuery.type( array );
+
+			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
+				push.call( ret, array );
+			} else {
+				jQuery.merge( ret, array );
+			}
+		}
+
+		return ret;
+	},
+
+	inArray: function( elem, array ) {
+
+		if ( indexOf ) {
+			return indexOf.call( array, elem );
+		}
+
+		for ( var i = 0, length = array.length; i < length; i++ ) {
+			if ( array[ i ] === elem ) {
+				return i;
+			}
+		}
+
+		return -1;
+	},
+
+	merge: function( first, second ) {
+		var i = first.length,
+			j = 0;
+
+		if ( typeof second.length === "number" ) {
+			for ( var l = second.length; j < l; j++ ) {
+				first[ i++ ] = second[ j ];
+			}
+
+		} else {
+			while ( second[j] !== undefined ) {
+				first[ i++ ] = second[ j++ ];
+			}
+		}
+
+		first.length = i;
+
+		return first;
+	},
+
+	grep: function( elems, callback, inv ) {
+		var ret = [], retVal;
+		inv = !!inv;
+
+		// Go through the array, only saving the items
+		// that pass the validator function
+		for ( var i = 0, length = elems.length; i < length; i++ ) {
+			retVal = !!callback( elems[ i ], i );
+			if ( inv !== retVal ) {
+				ret.push( elems[ i ] );
+			}
+		}
+
+		return ret;
+	},
+
+	// arg is for internal usage only
+	map: function( elems, callback, arg ) {
+		var value, key, ret = [],
+			i = 0,
+			length = elems.length,
+			// jquery objects are treated as arrays
+			isArray = elems instanceof jQuery || length !== undefined && typeof length === "number" && ( ( length > 0 && elems[ 0 ] && elems[ length -1 ] ) || length === 0 || jQuery.isArray( elems ) ) ;
+
+		// Go through the array, translating each of the items to their
+		if ( isArray ) {
+			for ( ; i < length; i++ ) {
+				value = callback( elems[ i ], i, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+
+		// Go through every key on the object,
+		} else {
+			for ( key in elems ) {
+				value = callback( elems[ key ], key, arg );
+
+				if ( value != null ) {
+					ret[ ret.length ] = value;
+				}
+			}
+		}
+
+		// Flatten any nested arrays
+		return ret.concat.apply( [], ret );
+	},
+
+	// A global GUID counter for objects
+	guid: 1,
+
+	// Bind a function to a context, optionally partially applying any
+	// arguments.
+	proxy: function( fn, context ) {
+		if ( typeof context === "string" ) {
+			var tmp = fn[ context ];
+			context = fn;
+			fn = tmp;
+		}
+
+		// Quick check to determine if target is callable, in the spec
+		// this throws a TypeError, but we will just return undefined.
+		if ( !jQuery.isFunction( fn ) ) {
+			return undefined;
+		}
+
+		// Simulated bind
+		var args = slice.call( arguments, 2 ),
+			proxy = function() {
+				return fn.apply( context, args.concat( slice.call( arguments ) ) );
+			};
+
+		// Set the guid of unique handler to the same of original handler, so it can be removed
+		proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
+
+		return proxy;
+	},
+
+	// Mutifunctional method to get and set values to a collection
+	// The value/s can optionally be executed if it's a function
+	access: function( elems, key, value, exec, fn, pass ) {
+		var length = elems.length;
+
+		// Setting many attributes
+		if ( typeof key === "object" ) {
+			for ( var k in key ) {
+				jQuery.access( elems, k, key[k], exec, fn, value );
+			}
+			return elems;
+		}
+
+		// Setting one attribute
+		if ( value !== undefined ) {
+			// Optionally, function values get executed if exec is true
+			exec = !pass && exec && jQuery.isFunction(value);
+
+			for ( var i = 0; i < length; i++ ) {
+				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
+			}
+
+			return elems;
+		}
+
+		// Getting an attribute
+		return length ? fn( elems[0], key ) : undefined;
+	},
+
+	now: function() {
+		return (new Date()).getTime();
+	},
+
+	// Use of jQuery.browser is frowned upon.
+	// More details: http://docs.jquery.com/Utilities/jQuery.browser
+	uaMatch: function( ua ) {
+		ua = ua.toLowerCase();
+
+		var match = rwebkit.exec( ua ) ||
+			ropera.exec( ua ) ||
+			rmsie.exec( ua ) ||
+			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
+			[];
+
+		return { browser: match[1] || "", version: match[2] || "0" };
+	},
+
+	sub: function() {
+		function jQuerySub( selector, context ) {
+			return new jQuerySub.fn.init( selector, context );
+		}
+		jQuery.extend( true, jQuerySub, this );
+		jQuerySub.superclass = this;
+		jQuerySub.fn = jQuerySub.prototype = this();
+		jQuerySub.fn.constructor = jQuerySub;
+		jQuerySub.sub = this.sub;
+		jQuerySub.fn.init = function init( selector, context ) {
+			if ( context && context instanceof jQuery && !(context instanceof jQuerySub) ) {
+				context = jQuerySub( context );
+			}
+
+			return jQuery.fn.init.call( this, selector, context, rootjQuerySub );
+		};
+		jQuerySub.fn.init.prototype = jQuerySub.fn;
+		var rootjQuerySub = jQuerySub(document);
+		return jQuerySub;
+	},
+
+	browser: {}
+});
+
+// Populate the class2type map
+jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
+	class2type[ "[object " + name + "]" ] = name.toLowerCase();
+});
+
+browserMatch = jQuery.uaMatch( userAgent );
+if ( browserMatch.browser ) {
+	jQuery.browser[ browserMatch.browser ] = true;
+	jQuery.browser.version = browserMatch.version;
+}
+
+// Deprecated, use jQuery.browser.webkit instead
+if ( jQuery.browser.webkit ) {
+	jQuery.browser.safari = true;
+}
+
+// IE doesn't match non-breaking spaces with \s
+if ( rnotwhite.test( "\xA0" ) ) {
+	trimLeft = /^[\s\xA0]+/;
+	trimRight = /[\s\xA0]+$/;
+}
+
+// All jQuery objects should point back to these
+rootjQuery = jQuery(document);
+
+// Cleanup functions for the document ready method
+if ( document.addEventListener ) {
+	DOMContentLoaded = function() {
+		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
+		jQuery.ready();
+	};
+
+} else if ( document.attachEvent ) {
+	DOMContentLoaded = function() {
+		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
+		if ( document.readyState === "complete" ) {
+			document.detachEvent( "onreadystatechange", DOMContentLoaded );
+			jQuery.ready();
+		}
+	};
+}
+
+// The DOM ready check for Internet Explorer
+function doScrollCheck() {
+	if ( jQuery.isReady ) {
+		return;
+	}
+
+	try {
+		// If IE is used, use the trick by Diego Perini
+		// http://javascript.nwbox.com/IEContentLoaded/
+		document.documentElement.doScroll("left");
+	} catch(e) {
+		setTimeout( doScrollCheck, 1 );
+		return;
+	}
+
+	// and execute any waiting functions
+	jQuery.ready();
+}
+
+return jQuery;
+
+})();
+
+
+var // Promise methods
+	promiseMethods = "done fail isResolved isRejected promise then always pipe".split( " " ),
+	// Static reference to slice
+	sliceDeferred = [].slice;
+
+jQuery.extend({
+	// Create a simple deferred (one callbacks list)
+	_Deferred: function() {
+		var // callbacks list
+			callbacks = [],
+			// stored [ context , args ]
+			fired,
+			// to avoid firing when already doing so
+			firing,
+			// flag to know if the deferred has been cancelled
+			cancelled,
+			// the deferred itself
+			deferred  = {
+
+				// done( f1, f2, ...)
+				done: function() {
+					if ( !cancelled ) {
+						var args = arguments,
+							i,
+							length,
+							elem,
+							type,
+							_fired;
+						if ( fired ) {
+							_fired = fired;
+							fired = 0;
+						}
+						for ( i = 0, length = args.length; i < length; i++ ) {
+							elem = args[ i ];
+							type = jQuery.type( elem );
+							if ( type === "array" ) {
+								deferred.done.apply( deferred, elem );
+							} else if ( type === "function" ) {
+								callbacks.push( elem );
+							}
+						}
+						if ( _fired ) {
+							deferred.resolveWith( _fired[ 0 ], _fired[ 1 ] );
+						}
+					}
+					return this;
+				},
+
+				// resolve with given context and args
+				resolveWith: function( context, args ) {
+					if ( !cancelled && !fired && !firing ) {
+						// make sure args are available (#8421)
+						args = args || [];
+						firing = 1;
+						try {
+							while( callbacks[ 0 ] ) {
+								callbacks.shift().apply( context, args );
+							}
+						}
+						finally {
+							fired = [ context, args ];
+							firing = 0;
+						}
+					}
+					return this;
+				},
+
+				// resolve with this as context and given arguments
+				resolve: function() {
+					deferred.resolveWith( this, arguments );
+					return this;
+				},
+
+				// Has this deferred been resolved?
+				isResolved: function() {
+					return !!( firing || fired );
+				},
+
+				// Cancel
+				cancel: function() {
+					cancelled = 1;
+					callbacks = [];
+					return this;
+				}
+			};
+
+		return deferred;
+	},
+
+	// Full fledged deferred (two callbacks list)
+	Deferred: function( func ) {
+		var deferred = jQuery._Deferred(),
+			failDeferred = jQuery._Deferred(),
+			promise;
+		// Add errorDeferred methods, then and promise
+		jQuery.extend( deferred, {
+			then: function( doneCallbacks, failCallbacks ) {
+				deferred.done( doneCallbacks ).fail( failCallbacks );
+				return this;
+			},
+			always: function() {
+				return deferred.done.apply( deferred, arguments ).fail.apply( this, arguments );
+			},
+			fail: failDeferred.done,
+			rejectWith: failDeferred.resolveWith,
+			reject: failDeferred.resolve,
+			isRejected: failDeferred.isResolved,
+			pipe: function( fnDone, fnFail ) {
+				return jQuery.Deferred(function( newDefer ) {
+					jQuery.each( {
+						done: [ fnDone, "resolve" ],
+						fail: [ fnFail, "reject" ]
+					}, function( handler, data ) {
+						var fn = data[ 0 ],
+							action = data[ 1 ],
+							returned;
+						if ( jQuery.isFunction( fn ) ) {
+							deferred[ handler ](function() {
+								returned = fn.apply( this, arguments );
+								if ( returned && jQuery.isFunction( returned.promise ) ) {
+									returned.promise().then( newDefer.resolve, newDefer.reject );
+								} else {
+									newDefer[ action ]( returned );
+								}
+							});
+						} else {
+							deferred[ handler ]( newDefer[ action ] );
+						}
+					});
+				}).promise();
+			},
+			// Get a promise for this deferred
+			// If obj is provided, the promise aspect is added to the object
+			promise: function( obj ) {
+				if ( obj == null ) {
+					if ( promise ) {
+						return promise;
+					}
+					promise = obj = {};
+				}
+				var i = promiseMethods.length;
+				while( i-- ) {
+					obj[ promiseMethods[i] ] = deferred[ promiseMethods[i] ];
+				}
+				return obj;
+			}
+		});
+		// Make sure only one callback list will be used
+		deferred.done( failDeferred.cancel ).fail( deferred.cancel );
+		// Unexpose cancel
+		delete deferred.cancel;
+		// Call given func if any
+		if ( func ) {
+			func.call( deferred, deferred );
+		}
+		return deferred;
+	},
+
+	// Deferred helper
+	when: function( firstParam ) {
+		var args = arguments,
+			i = 0,
+			length = args.length,
+			count = length,
+			deferred = length <= 1 && firstParam && jQuery.isFunction( firstParam.promise ) ?
+				firstParam :
+				jQuery.Deferred();
+		function resolveFunc( i ) {
+			return function( value ) {
+				args[ i ] = arguments.length > 1 ? sliceDeferred.call( arguments, 0 ) : value;
+				if ( !( --count ) ) {
+					// Strange bug in FF4:
+					// Values changed onto the arguments object sometimes end up as undefined values
+					// outside the $.when method. Cloning the object into a fresh array solves the issue
+					deferred.resolveWith( deferred, sliceDeferred.call( args, 0 ) );
+				}
+			};
+		}
+		if ( length > 1 ) {
+			for( ; i < length; i++ ) {
+				if ( args[ i ] && jQuery.isFunction( args[ i ].promise ) ) {
+					args[ i ].promise().then( resolveFunc(i), deferred.reject );
+				} else {
+					--count;
+				}
+			}
+			if ( !count ) {
+				deferred.resolveWith( deferred, args );
+			}
+		} else if ( deferred !== firstParam ) {
+			deferred.resolveWith( deferred, length ? [ firstParam ] : [] );
+		}
+		return deferred.promise();
+	}
+});
+
+
+
+jQuery.support = (function() {
+
+	var div = document.createElement( "div" ),
+		documentElement = document.documentElement,
+		all,
+		a,
+		select,
+		opt,
+		input,
+		marginDiv,
+		support,
+		fragment,
+		body,
+		testElementParent,
+		testElement,
+		testElementStyle,
+		tds,
+		events,
+		eventName,
+		i,
+		isSupported;
+
+	// Preliminary tests
+	div.setAttribute("className", "t");
+	div.innerHTML = "   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
+
+	all = div.getElementsByTagName( "*" );
+	a = div.getElementsByTagName( "a" )[ 0 ];
+
+	// Can't get basic test support
+	if ( !all || !all.length || !a ) {
+		return {};
+	}
+
+	// First batch of supports tests
+	select = document.createElement( "select" );
+	opt = select.appendChild( document.createElement("option") );
+	input = div.getElementsByTagName( "input" )[ 0 ];
+
+	support = {
+		// IE strips leading whitespace when .innerHTML is used
+		leadingWhitespace: ( div.firstChild.nodeType === 3 ),
+
+		// Make sure that tbody elements aren't automatically inserted
+		// IE will insert them into empty tables
+		tbody: !div.getElementsByTagName( "tbody" ).length,
+
+		// Make sure that link elements get serialized correctly by innerHTML
+		// This requires a wrapper element in IE
+		htmlSerialize: !!div.getElementsByTagName( "link" ).length,
+
+		// Get the style information from getAttribute
+		// (IE uses .cssText instead)
+		style: /top/.test( a.getAttribute("style") ),
+
+		// Make sure that URLs aren't manipulated
+		// (IE normalizes it by default)
+		hrefNormalized: ( a.getAttribute( "href" ) === "/a" ),
+
+		// Make sure that element opacity exists
+		// (IE uses filter instead)
+		// Use a regex to work around a WebKit issue. See #5145
+		opacity: /^0.55$/.test( a.style.opacity ),
+
+		// Verify style float existence
+		// (IE uses styleFloat instead of cssFloat)
+		cssFloat: !!a.style.cssFloat,
+
+		// Make sure that if no value is specified for a checkbox
+		// that it defaults to "on".
+		// (WebKit defaults to "" instead)
+		checkOn: ( input.value === "on" ),
+
+		// Make sure that a selected-by-default option has a working selected property.
+		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
+		optSelected: opt.selected,
+
+		// Test setAttribute on camelCase class. If it works, we need attrFixes when doing get/setAttribute (ie6/7)
+		getSetAttribute: div.className !== "t",
+
+		// Will be defined later
+		submitBubbles: true,
+		changeBubbles: true,
+		focusinBubbles: false,
+		deleteExpando: true,
+		noCloneEvent: true,
+		inlineBlockNeedsLayout: false,
+		shrinkWrapBlocks: false,
+		reliableMarginRight: true
+	};
+
+	// Make sure checked status is properly cloned
+	input.checked = true;
+	support.noCloneChecked = input.cloneNode( true ).checked;
+
+	// Make sure that the options inside disabled selects aren't marked as disabled
+	// (WebKit marks them as disabled)
+	select.disabled = true;
+	support.optDisabled = !opt.disabled;
+
+	// Test to see if it's possible to delete an expando from an element
+	// Fails in Internet Explorer
+	try {
+		delete div.test;
+	} catch( e ) {
+		support.deleteExpando = false;
+	}
+
+	if ( !div.addEventListener && div.attachEvent && div.fireEvent ) {
+		div.attachEvent( "onclick", function() {
+			// Cloning a node shouldn't copy over any
+			// bound event handlers (IE does this)
+			support.noCloneEvent = false;
+		});
+		div.cloneNode( true ).fireEvent( "onclick" );
+	}
+
+	// Check if a radio maintains it's value
+	// after being appended to the DOM
+	input = document.createElement("input");
+	input.value = "t";
+	input.setAttribute("type", "radio");
+	support.radioValue = input.value === "t";
+
+	input.setAttribute("checked", "checked");
+	div.appendChild( input );
+	fragment = document.createDocumentFragment();
+	fragment.appendChild( div.firstChild );
+
+	// WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = fragment.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	div.innerHTML = "";
+
+	// Figure out if the W3C box model works as expected
+	div.style.width = div.style.paddingLeft = "1px";
+
+	body = document.getElementsByTagName( "body" )[ 0 ];
+	// We use our own, invisible, body unless the body is already present
+	// in which case we use a div (#9239)
+	testElement = document.createElement( body ? "div" : "body" );
+	testElementStyle = {
+		visibility: "hidden",
+		width: 0,
+		height: 0,
+		border: 0,
+		margin: 0
+	};
+	if ( body ) {
+		jQuery.extend( testElementStyle, {
+			position: "absolute",
+			left: -1000,
+			top: -1000
+		});
+	}
+	for ( i in testElementStyle ) {
+		testElement.style[ i ] = testElementStyle[ i ];
+	}
+	testElement.appendChild( div );
+	testElementParent = body || documentElement;
+	testElementParent.insertBefore( testElement, testElementParent.firstChild );
+
+	// Check if a disconnected checkbox will retain its checked
+	// value of true after appended to the DOM (IE6/7)
+	support.appendChecked = input.checked;
+
+	support.boxModel = div.offsetWidth === 2;
+
+	if ( "zoom" in div.style ) {
+		// Check if natively block-level elements act like inline-block
+		// elements when setting their display to 'inline' and giving
+		// them layout
+		// (IE < 8 does this)
+		div.style.display = "inline";
+		div.style.zoom = 1;
+		support.inlineBlockNeedsLayout = ( div.offsetWidth === 2 );
+
+		// Check if elements with layout shrink-wrap their children
+		// (IE 6 does this)
+		div.style.display = "";
+		div.innerHTML = "<div style='width:4px;'></div>";
+		support.shrinkWrapBlocks = ( div.offsetWidth !== 2 );
+	}
+
+	div.innerHTML = "<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";
+	tds = div.getElementsByTagName( "td" );
+
+	// Check if table cells still have offsetWidth/Height when they are set
+	// to display:none and there are still other visible table cells in a
+	// table row; if so, offsetWidth/Height are not reliable for use when
+	// determining if an element has been hidden directly using
+	// display:none (it is still safe to use offsets if a parent element is
+	// hidden; don safety goggles and see bug #4512 for more information).
+	// (only IE 8 fails this test)
+	isSupported = ( tds[ 0 ].offsetHeight === 0 );
+
+	tds[ 0 ].style.display = "";
+	tds[ 1 ].style.display = "none";
+
+	// Check if empty table cells still have offsetWidth/Height
+	// (IE < 8 fail this test)
+	support.reliableHiddenOffsets = isSupported && ( tds[ 0 ].offsetHeight === 0 );
+	div.innerHTML = "";
+
+	// Check if div with explicit width and no margin-right incorrectly
+	// gets computed margin-right based on width of container. For more
+	// info see bug #3333
+	// Fails in WebKit before Feb 2011 nightlies
+	// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+	if ( document.defaultView && document.defaultView.getComputedStyle ) {
+		marginDiv = document.createElement( "div" );
+		marginDiv.style.width = "0";
+		marginDiv.style.marginRight = "0";
+		div.appendChild( marginDiv );
+		support.reliableMarginRight =
+			( parseInt( ( document.defaultView.getComputedStyle( marginDiv, null ) || { marginRight: 0 } ).marginRight, 10 ) || 0 ) === 0;
+	}
+
+	// Remove the body element we added
+	testElement.innerHTML = "";
+	testElementParent.removeChild( testElement );
+
+	// Technique from Juriy Zaytsev
+	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
+	// We only care about the case where non-standard event systems
+	// are used, namely in IE. Short-circuiting here helps us to
+	// avoid an eval call (in setAttribute) which can cause CSP
+	// to go haywire. See: https://developer.mozilla.org/en/Security/CSP
+	if ( div.attachEvent ) {
+		for( i in {
+			submit: 1,
+			change: 1,
+			focusin: 1
+		} ) {
+			eventName = "on" + i;
+			isSupported = ( eventName in div );
+			if ( !isSupported ) {
+				div.setAttribute( eventName, "return;" );
+				isSupported = ( typeof div[ eventName ] === "function" );
+			}
+			support[ i + "Bubbles" ] = isSupported;
+		}
+	}
+
+	// Null connected elements to avoid leaks in IE
+	testElement = fragment = select = opt = body = marginDiv = div = input = null;
+
+	return support;
+})();
+
+// Keep track of boxModel
+jQuery.boxModel = jQuery.support.boxModel;
+
+
+
+
+var rbrace = /^(?:\{.*\}|\[.*\])$/,
+	rmultiDash = /([a-z])([A-Z])/g;
+
+jQuery.extend({
+	cache: {},
+
+	// Please use with caution
+	uuid: 0,
+
+	// Unique for each copy of jQuery on the page
+	// Non-digits removed to match rinlinejQuery
+	expando: "jQuery" + ( jQuery.fn.jquery + Math.random() ).replace( /\D/g, "" ),
+
+	// The following elements throw uncatchable exceptions if you
+	// attempt to add expando properties to them.
+	noData: {
+		"embed": true,
+		// Ban all objects except for Flash (which handle expandos)
+		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
+		"applet": true
+	},
+
+	hasData: function( elem ) {
+		elem = elem.nodeType ? jQuery.cache[ elem[jQuery.expando] ] : elem[ jQuery.expando ];
+
+		return !!elem && !isEmptyDataObject( elem );
+	},
+
+	data: function( elem, name, data, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var internalKey = jQuery.expando, getByName = typeof name === "string", thisCache,
+
+			// We have to handle DOM nodes and JS objects differently because IE6-7
+			// can't GC object references properly across the DOM-JS boundary
+			isNode = elem.nodeType,
+
+			// Only DOM nodes need the global jQuery cache; JS object data is
+			// attached directly to the object so GC can occur automatically
+			cache = isNode ? jQuery.cache : elem,
+
+			// Only defining an ID for JS objects if its cache already exists allows
+			// the code to shortcut on the same path as a DOM node with no cache
+			id = isNode ? elem[ jQuery.expando ] : elem[ jQuery.expando ] && jQuery.expando;
+
+		// Avoid doing any more work than we need to when trying to get data on an
+		// object that has no data at all
+		if ( (!id || (pvt && id && !cache[ id ][ internalKey ])) && getByName && data === undefined ) {
+			return;
+		}
+
+		if ( !id ) {
+			// Only DOM nodes need a new unique ID for each element since their data
+			// ends up in the global cache
+			if ( isNode ) {
+				elem[ jQuery.expando ] = id = ++jQuery.uuid;
+			} else {
+				id = jQuery.expando;
+			}
+		}
+
+		if ( !cache[ id ] ) {
+			cache[ id ] = {};
+
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+		}
+
+		// An object can be passed to jQuery.data instead of a key/value pair; this gets
+		// shallow copied over onto the existing cache
+		if ( typeof name === "object" || typeof name === "function" ) {
+			if ( pvt ) {
+				cache[ id ][ internalKey ] = jQuery.extend(cache[ id ][ internalKey ], name);
+			} else {
+				cache[ id ] = jQuery.extend(cache[ id ], name);
+			}
+		}
+
+		thisCache = cache[ id ];
+
+		// Internal jQuery data is stored in a separate object inside the object's data
+		// cache in order to avoid key collisions between internal data and user-defined
+		// data
+		if ( pvt ) {
+			if ( !thisCache[ internalKey ] ) {
+				thisCache[ internalKey ] = {};
+			}
+
+			thisCache = thisCache[ internalKey ];
+		}
+
+		if ( data !== undefined ) {
+			thisCache[ jQuery.camelCase( name ) ] = data;
+		}
+
+		// TODO: This is a hack for 1.5 ONLY. It will be removed in 1.6. Users should
+		// not attempt to inspect the internal events object using jQuery.data, as this
+		// internal data object is undocumented and subject to change.
+		if ( name === "events" && !thisCache[name] ) {
+			return thisCache[ internalKey ] && thisCache[ internalKey ].events;
+		}
+
+		return getByName ? 
+			// Check for both converted-to-camel and non-converted data property names
+			thisCache[ jQuery.camelCase( name ) ] || thisCache[ name ] :
+			thisCache;
+	},
+
+	removeData: function( elem, name, pvt /* Internal Use Only */ ) {
+		if ( !jQuery.acceptData( elem ) ) {
+			return;
+		}
+
+		var internalKey = jQuery.expando, isNode = elem.nodeType,
+
+			// See jQuery.data for more information
+			cache = isNode ? jQuery.cache : elem,
+
+			// See jQuery.data for more information
+			id = isNode ? elem[ jQuery.expando ] : jQuery.expando;
+
+		// If there is already no cache entry for this object, there is no
+		// purpose in continuing
+		if ( !cache[ id ] ) {
+			return;
+		}
+
+		if ( name ) {
+			var thisCache = pvt ? cache[ id ][ internalKey ] : cache[ id ];
+
+			if ( thisCache ) {
+				delete thisCache[ name ];
+
+				// If there is no data left in the cache, we want to continue
+				// and let the cache object itself get destroyed
+				if ( !isEmptyDataObject(thisCache) ) {
+					return;
+				}
+			}
+		}
+
+		// See jQuery.data for more information
+		if ( pvt ) {
+			delete cache[ id ][ internalKey ];
+
+			// Don't destroy the parent cache unless the internal data object
+			// had been the only thing left in it
+			if ( !isEmptyDataObject(cache[ id ]) ) {
+				return;
+			}
+		}
+
+		var internalCache = cache[ id ][ internalKey ];
+
+		// Browsers that fail expando deletion also refuse to delete expandos on
+		// the window, but it will allow it on all other JS objects; other browsers
+		// don't care
+		if ( jQuery.support.deleteExpando || cache != window ) {
+			delete cache[ id ];
+		} else {
+			cache[ id ] = null;
+		}
+
+		// We destroyed the entire user cache at once because it's faster than
+		// iterating through each key, but we need to continue to persist internal
+		// data if it existed
+		if ( internalCache ) {
+			cache[ id ] = {};
+			// TODO: This is a hack for 1.5 ONLY. Avoids exposing jQuery
+			// metadata on plain JS objects when the object is serialized using
+			// JSON.stringify
+			if ( !isNode ) {
+				cache[ id ].toJSON = jQuery.noop;
+			}
+
+			cache[ id ][ internalKey ] = internalCache;
+
+		// Otherwise, we need to eliminate the expando on the node to avoid
+		// false lookups in the cache for entries that no longer exist
+		} else if ( isNode ) {
+			// IE does not allow us to delete expando properties from nodes,
+			// nor does it have a removeAttribute function on Document nodes;
+			// we must handle all of these cases
+			if ( jQuery.support.deleteExpando ) {
+				delete elem[ jQuery.expando ];
+			} else if ( elem.removeAttribute ) {
+				elem.removeAttribute( jQuery.expando );
+			} else {
+				elem[ jQuery.expando ] = null;
+			}
+		}
+	},
+
+	// For internal use only.
+	_data: function( elem, name, data ) {
+		return jQuery.data( elem, name, data, true );
+	},
+
+	// A method for determining if a DOM node can handle the data expando
+	acceptData: function( elem ) {
+		if ( elem.nodeName ) {
+			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
+
+			if ( match ) {
+				return !(match === true || elem.getAttribute("classid") !== match);
+			}
+		}
+
+		return true;
+	}
+});
+
+jQuery.fn.extend({
+	data: function( key, value ) {
+		var data = null;
+
+		if ( typeof key === "undefined" ) {
+			if ( this.length ) {
+				data = jQuery.data( this[0] );
+
+				if ( this[0].nodeType === 1 ) {
+			    var attr = this[0].attributes, name;
+					for ( var i = 0, l = attr.length; i < l; i++ ) {
+						name = attr[i].name;
+
+						if ( name.indexOf( "data-" ) === 0 ) {
+							name = jQuery.camelCase( name.substring(5) );
+
+							dataAttr( this[0], name, data[ name ] );
+						}
+					}
+				}
+			}
+
+			return data;
+
+		} else if ( typeof key === "object" ) {
+			return this.each(function() {
+				jQuery.data( this, key );
+			});
+		}
+
+		var parts = key.split(".");
+		parts[1] = parts[1] ? "." + parts[1] : "";
+
+		if ( value === undefined ) {
+			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
+
+			// Try to fetch any internally stored data first
+			if ( data === undefined && this.length ) {
+				data = jQuery.data( this[0], key );
+				data = dataAttr( this[0], key, data );
+			}
+
+			return data === undefined && parts[1] ?
+				this.data( parts[0] ) :
+				data;
+
+		} else {
+			return this.each(function() {
+				var $this = jQuery( this ),
+					args = [ parts[0], value ];
+
+				$this.triggerHandler( "setData" + parts[1] + "!", args );
+				jQuery.data( this, key, value );
+				$this.triggerHandler( "changeData" + parts[1] + "!", args );
+			});
+		}
+	},
+
+	removeData: function( key ) {
+		return this.each(function() {
+			jQuery.removeData( this, key );
+		});
+	}
+});
+
+function dataAttr( elem, key, data ) {
+	// If nothing was found internally, try to fetch any
+	// data from the HTML5 data-* attribute
+	if ( data === undefined && elem.nodeType === 1 ) {
+		var name = "data-" + key.replace( rmultiDash, "$1-$2" ).toLowerCase();
+
+		data = elem.getAttribute( name );
+
+		if ( typeof data === "string" ) {
+			try {
+				data = data === "true" ? true :
+				data === "false" ? false :
+				data === "null" ? null :
+				!jQuery.isNaN( data ) ? parseFloat( data ) :
+					rbrace.test( data ) ? jQuery.parseJSON( data ) :
+					data;
+			} catch( e ) {}
+
+			// Make sure we set the data so it isn't changed later
+			jQuery.data( elem, key, data );
+
+		} else {
+			data = undefined;
+		}
+	}
+
+	return data;
+}
+
+// TODO: This is a hack for 1.5 ONLY to allow objects with a single toJSON
+// property to be considered empty objects; this property always exists in
+// order to make sure JSON.stringify does not expose internal metadata
+function isEmptyDataObject( obj ) {
+	for ( var name in obj ) {
+		if ( name !== "toJSON" ) {
+			return false;
+		}
+	}
+
+	return true;
+}
+
+
+
+
+function handleQueueMarkDefer( elem, type, src ) {
+	var deferDataKey = type + "defer",
+		queueDataKey = type + "queue",
+		markDataKey = type + "mark",
+		defer = jQuery.data( elem, deferDataKey, undefined, true );
+	if ( defer &&
+		( src === "queue" || !jQuery.data( elem, queueDataKey, undefined, true ) ) &&
+		( src === "mark" || !jQuery.data( elem, markDataKey, undefined, true ) ) ) {
+		// Give room for hard-coded callbacks to fire first
+		// and eventually mark/queue something else on the element
+		setTimeout( function() {
+			if ( !jQuery.data( elem, queueDataKey, undefined, true ) &&
+				!jQuery.data( elem, markDataKey, undefined, true ) ) {
+				jQuery.removeData( elem, deferDataKey, true );
+				defer.resolve();
+			}
+		}, 0 );
+	}
+}
+
+jQuery.extend({
+
+	_mark: function( elem, type ) {
+		if ( elem ) {
+			type = (type || "fx") + "mark";
+			jQuery.data( elem, type, (jQuery.data(elem,type,undefined,true) || 0) + 1, true );
+		}
+	},
+
+	_unmark: function( force, elem, type ) {
+		if ( force !== true ) {
+			type = elem;
+			elem = force;
+			force = false;
+		}
+		if ( elem ) {
+			type = type || "fx";
+			var key = type + "mark",
+				count = force ? 0 : ( (jQuery.data( elem, key, undefined, true) || 1 ) - 1 );
+			if ( count ) {
+				jQuery.data( elem, key, count, true );
+			} else {
+				jQuery.removeData( elem, key, true );
+				handleQueueMarkDefer( elem, type, "mark" );
+			}
+		}
+	},
+
+	queue: function( elem, type, data ) {
+		if ( elem ) {
+			type = (type || "fx") + "queue";
+			var q = jQuery.data( elem, type, undefined, true );
+			// Speed up dequeue by getting out quickly if this is just a lookup
+			if ( data ) {
+				if ( !q || jQuery.isArray(data) ) {
+					q = jQuery.data( elem, type, jQuery.makeArray(data), true );
+				} else {
+					q.push( data );
+				}
+			}
+			return q || [];
+		}
+	},
+
+	dequeue: function( elem, type ) {
+		type = type || "fx";
+
+		var queue = jQuery.queue( elem, type ),
+			fn = queue.shift(),
+			defer;
+
+		// If the fx queue is dequeued, always remove the progress sentinel
+		if ( fn === "inprogress" ) {
+			fn = queue.shift();
+		}
+
+		if ( fn ) {
+			// Add a progress sentinel to prevent the fx queue from being
+			// automatically dequeued
+			if ( type === "fx" ) {
+				queue.unshift("inprogress");
+			}
+
+			fn.call(elem, function() {
+				jQuery.dequeue(elem, type);
+			});
+		}
+
+		if ( !queue.length ) {
+			jQuery.removeData( elem, type + "queue", true );
+			handleQueueMarkDefer( elem, type, "queue" );
+		}
+	}
+});
+
+jQuery.fn.extend({
+	queue: function( type, data ) {
+		if ( typeof type !== "string" ) {
+			data = type;
+			type = "fx";
+		}
+
+		if ( data === undefined ) {
+			return jQuery.queue( this[0], type );
+		}
+		return this.each(function() {
+			var queue = jQuery.queue( this, type, data );
+
+			if ( type === "fx" && queue[0] !== "inprogress" ) {
+				jQuery.dequeue( this, type );
+			}
+		});
+	},
+	dequeue: function( type ) {
+		return this.each(function() {
+			jQuery.dequeue( this, type );
+		});
+	},
+	// Based off of the plugin by Clint Helfers, with permission.
+	// http://blindsignals.com/index.php/2009/07/jquery-delay/
+	delay: function( time, type ) {
+		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
+		type = type || "fx";
+
+		return this.queue( type, function() {
+			var elem = this;
+			setTimeout(function() {
+				jQuery.dequeue( elem, type );
+			}, time );
+		});
+	},
+	clearQueue: function( type ) {
+		return this.queue( type || "fx", [] );
+	},
+	// Get a promise resolved when queues of a certain type
+	// are emptied (fx is the type by default)
+	promise: function( type, object ) {
+		if ( typeof type !== "string" ) {
+			object = type;
+			type = undefined;
+		}
+		type = type || "fx";
+		var defer = jQuery.Deferred(),
+			elements = this,
+			i = elements.length,
+			count = 1,
+			deferDataKey = type + "defer",
+			queueDataKey = type + "queue",
+			markDataKey = type + "mark",
+			tmp;
+		function resolve() {
+			if ( !( --count ) ) {
+				defer.resolveWith( elements, [ elements ] );
+			}
+		}
+		while( i-- ) {
+			if (( tmp = jQuery.data( elements[ i ], deferDataKey, undefined, true ) ||
+					( jQuery.data( elements[ i ], queueDataKey, undefined, true ) ||
+						jQuery.data( elements[ i ], markDataKey, undefined, true ) ) &&
+					jQuery.data( elements[ i ], deferDataKey, jQuery._Deferred(), true ) )) {
+				count++;
+				tmp.done( resolve );
+			}
+		}
+		resolve();
+		return defer.promise();
+	}
+});
+
+
+
+
+var rclass = /[\n\t\r]/g,
+	rspace = /\s+/,
+	rreturn = /\r/g,
+	rtype = /^(?:button|input)$/i,
+	rfocusable = /^(?:button|input|object|select|textarea)$/i,
+	rclickable = /^a(?:rea)?$/i,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	rinvalidChar = /\:|^on/,
+	formHook, boolHook;
+
+jQuery.fn.extend({
+	attr: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.attr );
+	},
+
+	removeAttr: function( name ) {
+		return this.each(function() {
+			jQuery.removeAttr( this, name );
+		});
+	},
+	
+	prop: function( name, value ) {
+		return jQuery.access( this, name, value, true, jQuery.prop );
+	},
+	
+	removeProp: function( name ) {
+		name = jQuery.propFix[ name ] || name;
+		return this.each(function() {
+			// try/catch handles cases where IE balks (such as removing a property on window)
+			try {
+				this[ name ] = undefined;
+				delete this[ name ];
+			} catch( e ) {}
+		});
+	},
+
+	addClass: function( value ) {
+		var classNames, i, l, elem,
+			setClass, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).addClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( value && typeof value === "string" ) {
+			classNames = value.split( rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 ) {
+					if ( !elem.className && classNames.length === 1 ) {
+						elem.className = value;
+
+					} else {
+						setClass = " " + elem.className + " ";
+
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							if ( !~setClass.indexOf( " " + classNames[ c ] + " " ) ) {
+								setClass += classNames[ c ] + " ";
+							}
+						}
+						elem.className = jQuery.trim( setClass );
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	removeClass: function( value ) {
+		var classNames, i, l, elem, className, c, cl;
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( j ) {
+				jQuery( this ).removeClass( value.call(this, j, this.className) );
+			});
+		}
+
+		if ( (value && typeof value === "string") || value === undefined ) {
+			classNames = (value || "").split( rspace );
+
+			for ( i = 0, l = this.length; i < l; i++ ) {
+				elem = this[ i ];
+
+				if ( elem.nodeType === 1 && elem.className ) {
+					if ( value ) {
+						className = (" " + elem.className + " ").replace( rclass, " " );
+						for ( c = 0, cl = classNames.length; c < cl; c++ ) {
+							className = className.replace(" " + classNames[ c ] + " ", " ");
+						}
+						elem.className = jQuery.trim( className );
+
+					} else {
+						elem.className = "";
+					}
+				}
+			}
+		}
+
+		return this;
+	},
+
+	toggleClass: function( value, stateVal ) {
+		var type = typeof value,
+			isBool = typeof stateVal === "boolean";
+
+		if ( jQuery.isFunction( value ) ) {
+			return this.each(function( i ) {
+				jQuery( this ).toggleClass( value.call(this, i, this.className, stateVal), stateVal );
+			});
+		}
+
+		return this.each(function() {
+			if ( type === "string" ) {
+				// toggle individual class names
+				var className,
+					i = 0,
+					self = jQuery( this ),
+					state = stateVal,
+					classNames = value.split( rspace );
+
+				while ( (className = classNames[ i++ ]) ) {
+					// check each className given, space seperated list
+					state = isBool ? state : !self.hasClass( className );
+					self[ state ? "addClass" : "removeClass" ]( className );
+				}
+
+			} else if ( type === "undefined" || type === "boolean" ) {
+				if ( this.className ) {
+					// store className if set
+					jQuery._data( this, "__className__", this.className );
+				}
+
+				// toggle whole className
+				this.className = this.className || value === false ? "" : jQuery._data( this, "__className__" ) || "";
+			}
+		});
+	},
+
+	hasClass: function( selector ) {
+		var className = " " + selector + " ";
+		for ( var i = 0, l = this.length; i < l; i++ ) {
+			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
+				return true;
+			}
+		}
+
+		return false;
+	},
+
+	val: function( value ) {
+		var hooks, ret,
+			elem = this[0];
+		
+		if ( !arguments.length ) {
+			if ( elem ) {
+				hooks = jQuery.valHooks[ elem.nodeName.toLowerCase() ] || jQuery.valHooks[ elem.type ];
+
+				if ( hooks && "get" in hooks && (ret = hooks.get( elem, "value" )) !== undefined ) {
+					return ret;
+				}
+
+				ret = elem.value;
+
+				return typeof ret === "string" ? 
+					// handle most common string cases
+					ret.replace(rreturn, "") : 
+					// handle cases where value is null/undef or number
+					ret == null ? "" : ret;
+			}
+
+			return undefined;
+		}
+
+		var isFunction = jQuery.isFunction( value );
+
+		return this.each(function( i ) {
+			var self = jQuery(this), val;
+
+			if ( this.nodeType !== 1 ) {
+				return;
+			}
+
+			if ( isFunction ) {
+				val = value.call( this, i, self.val() );
+			} else {
+				val = value;
+			}
+
+			// Treat null/undefined as ""; convert numbers to string
+			if ( val == null ) {
+				val = "";
+			} else if ( typeof val === "number" ) {
+				val += "";
+			} else if ( jQuery.isArray( val ) ) {
+				val = jQuery.map(val, function ( value ) {
+					return value == null ? "" : value + "";
+				});
+			}
+
+			hooks = jQuery.valHooks[ this.nodeName.toLowerCase() ] || jQuery.valHooks[ this.type ];
+
+			// If set returns undefined, fall back to normal setting
+			if ( !hooks || !("set" in hooks) || hooks.set( this, val, "value" ) === undefined ) {
+				this.value = val;
+			}
+		});
+	}
+});
+
+jQuery.extend({
+	valHooks: {
+		option: {
+			get: function( elem ) {
+				// attributes.value is undefined in Blackberry 4.7 but
+				// uses .value. See #6932
+				var val = elem.attributes.value;
+				return !val || val.specified ? elem.value : elem.text;
+			}
+		},
+		select: {
+			get: function( elem ) {
+				var value,
+					index = elem.selectedIndex,
+					values = [],
+					options = elem.options,
+					one = elem.type === "select-one";
+
+				// Nothing was selected
+				if ( index < 0 ) {
+					return null;
+				}
+
+				// Loop through all the selected options
+				for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
+					var option = options[ i ];
+
+					// Don't return options that are disabled or in a disabled optgroup
+					if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) &&
+							(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
+
+						// Get the specific value for the option
+						value = jQuery( option ).val();
+
+						// We don't need an array for one selects
+						if ( one ) {
+							return value;
+						}
+
+						// Multi-Selects return an array
+						values.push( value );
+					}
+				}
+
+				// Fixes Bug #2551 -- select.val() broken in IE after form.reset()
+				if ( one && !values.length && options.length ) {
+					return jQuery( options[ index ] ).val();
+				}
+
+				return values;
+			},
+
+			set: function( elem, value ) {
+				var values = jQuery.makeArray( value );
+
+				jQuery(elem).find("option").each(function() {
+					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
+				});
+
+				if ( !values.length ) {
+					elem.selectedIndex = -1;
+				}
+				return values;
+			}
+		}
+	},
+
+	attrFn: {
+		val: true,
+		css: true,
+		html: true,
+		text: true,
+		data: true,
+		width: true,
+		height: true,
+		offset: true
+	},
+	
+	attrFix: {
+		// Always normalize to ensure hook usage
+		tabindex: "tabIndex"
+	},
+	
+	attr: function( elem, name, value, pass ) {
+		var nType = elem.nodeType;
+		
+		// don't get/set attributes on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return undefined;
+		}
+
+		if ( pass && name in jQuery.attrFn ) {
+			return jQuery( elem )[ name ]( value );
+		}
+
+		// Fallback to prop when attributes are not supported
+		if ( !("getAttribute" in elem) ) {
+			return jQuery.prop( elem, name, value );
+		}
+
+		var ret, hooks,
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		// Normalize the name if needed
+		if ( notxml ) {
+			name = jQuery.attrFix[ name ] || name;
+
+			hooks = jQuery.attrHooks[ name ];
+
+			if ( !hooks ) {
+				// Use boolHook for boolean attributes
+				if ( rboolean.test( name ) ) {
+
+					hooks = boolHook;
+
+				// Use formHook for forms and if the name contains certain characters
+				} else if ( formHook && name !== "className" &&
+					(jQuery.nodeName( elem, "form" ) || rinvalidChar.test( name )) ) {
+
+					hooks = formHook;
+				}
+			}
+		}
+
+		if ( value !== undefined ) {
+
+			if ( value === null ) {
+				jQuery.removeAttr( elem, name );
+				return undefined;
+
+			} else if ( hooks && "set" in hooks && notxml && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				elem.setAttribute( name, "" + value );
+				return value;
+			}
+
+		} else if ( hooks && "get" in hooks && notxml && (ret = hooks.get( elem, name )) !== null ) {
+			return ret;
+
+		} else {
+
+			ret = elem.getAttribute( name );
+
+			// Non-existent attributes return null, we normalize to undefined
+			return ret === null ?
+				undefined :
+				ret;
+		}
+	},
+
+	removeAttr: function( elem, name ) {
+		var propName;
+		if ( elem.nodeType === 1 ) {
+			name = jQuery.attrFix[ name ] || name;
+		
+			if ( jQuery.support.getSetAttribute ) {
+				// Use removeAttribute in browsers that support it
+				elem.removeAttribute( name );
+			} else {
+				jQuery.attr( elem, name, "" );
+				elem.removeAttributeNode( elem.getAttributeNode( name ) );
+			}
+
+			// Set corresponding property to false for boolean attributes
+			if ( rboolean.test( name ) && (propName = jQuery.propFix[ name ] || name) in elem ) {
+				elem[ propName ] = false;
+			}
+		}
+	},
+
+	attrHooks: {
+		type: {
+			set: function( elem, value ) {
+				// We can't allow the type property to be changed (since it causes problems in IE)
+				if ( rtype.test( elem.nodeName ) && elem.parentNode ) {
+					jQuery.error( "type property can't be changed" );
+				} else if ( !jQuery.support.radioValue && value === "radio" && jQuery.nodeName(elem, "input") ) {
+					// Setting the type on a radio button after the value resets the value in IE6-9
+					// Reset value to it's default in case type is set after value
+					// This is for element creation
+					var val = elem.value;
+					elem.setAttribute( "type", value );
+					if ( val ) {
+						elem.value = val;
+					}
+					return value;
+				}
+			}
+		},
+		tabIndex: {
+			get: function( elem ) {
+				// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
+				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
+				var attributeNode = elem.getAttributeNode("tabIndex");
+
+				return attributeNode && attributeNode.specified ?
+					parseInt( attributeNode.value, 10 ) :
+					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
+						0 :
+						undefined;
+			}
+		},
+		// Use the value property for back compat
+		// Use the formHook for button elements in IE6/7 (#1954)
+		value: {
+			get: function( elem, name ) {
+				if ( formHook && jQuery.nodeName( elem, "button" ) ) {
+					return formHook.get( elem, name );
+				}
+				return name in elem ?
+					elem.value :
+					null;
+			},
+			set: function( elem, value, name ) {
+				if ( formHook && jQuery.nodeName( elem, "button" ) ) {
+					return formHook.set( elem, value, name );
+				}
+				// Does not return so that setAttribute is also used
+				elem.value = value;
+			}
+		}
+	},
+
+	propFix: {
+		tabindex: "tabIndex",
+		readonly: "readOnly",
+		"for": "htmlFor",
+		"class": "className",
+		maxlength: "maxLength",
+		cellspacing: "cellSpacing",
+		cellpadding: "cellPadding",
+		rowspan: "rowSpan",
+		colspan: "colSpan",
+		usemap: "useMap",
+		frameborder: "frameBorder",
+		contenteditable: "contentEditable"
+	},
+	
+	prop: function( elem, name, value ) {
+		var nType = elem.nodeType;
+
+		// don't get/set properties on text, comment and attribute nodes
+		if ( !elem || nType === 3 || nType === 8 || nType === 2 ) {
+			return undefined;
+		}
+
+		var ret, hooks,
+			notxml = nType !== 1 || !jQuery.isXMLDoc( elem );
+
+		if ( notxml ) {
+			// Fix name and attach hooks
+			name = jQuery.propFix[ name ] || name;
+			hooks = jQuery.propHooks[ name ];
+		}
+
+		if ( value !== undefined ) {
+			if ( hooks && "set" in hooks && (ret = hooks.set( elem, value, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return (elem[ name ] = value);
+			}
+
+		} else {
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, name )) !== undefined ) {
+				return ret;
+
+			} else {
+				return elem[ name ];
+			}
+		}
+	},
+	
+	propHooks: {}
+});
+
+// Hook for boolean attributes
+boolHook = {
+	get: function( elem, name ) {
+		// Align boolean attributes with corresponding properties
+		return jQuery.prop( elem, name ) ?
+			name.toLowerCase() :
+			undefined;
+	},
+	set: function( elem, value, name ) {
+		var propName;
+		if ( value === false ) {
+			// Remove boolean attributes when set to false
+			jQuery.removeAttr( elem, name );
+		} else {
+			// value is true since we know at this point it's type boolean and not false
+			// Set boolean attributes to the same name and set the DOM property
+			propName = jQuery.propFix[ name ] || name;
+			if ( propName in elem ) {
+				// Only set the IDL specifically if it already exists on the element
+				elem[ propName ] = true;
+			}
+
+			elem.setAttribute( name, name.toLowerCase() );
+		}
+		return name;
+	}
+};
+
+// IE6/7 do not support getting/setting some attributes with get/setAttribute
+if ( !jQuery.support.getSetAttribute ) {
+
+	// propFix is more comprehensive and contains all fixes
+	jQuery.attrFix = jQuery.propFix;
+	
+	// Use this for any attribute on a form in IE6/7
+	formHook = jQuery.attrHooks.name = jQuery.attrHooks.title = jQuery.valHooks.button = {
+		get: function( elem, name ) {
+			var ret;
+			ret = elem.getAttributeNode( name );
+			// Return undefined if nodeValue is empty string
+			return ret && ret.nodeValue !== "" ?
+				ret.nodeValue :
+				undefined;
+		},
+		set: function( elem, value, name ) {
+			// Check form objects in IE (multiple bugs related)
+			// Only use nodeValue if the attribute node exists on the form
+			var ret = elem.getAttributeNode( name );
+			if ( ret ) {
+				ret.nodeValue = value;
+				return value;
+			}
+		}
+	};
+
+	// Set width and height to auto instead of 0 on empty string( Bug #8150 )
+	// This is for removals
+	jQuery.each([ "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			set: function( elem, value ) {
+				if ( value === "" ) {
+					elem.setAttribute( name, "auto" );
+					return value;
+				}
+			}
+		});
+	});
+}
+
+
+// Some attributes require a special call on IE
+if ( !jQuery.support.hrefNormalized ) {
+	jQuery.each([ "href", "src", "width", "height" ], function( i, name ) {
+		jQuery.attrHooks[ name ] = jQuery.extend( jQuery.attrHooks[ name ], {
+			get: function( elem ) {
+				var ret = elem.getAttribute( name, 2 );
+				return ret === null ? undefined : ret;
+			}
+		});
+	});
+}
+
+if ( !jQuery.support.style ) {
+	jQuery.attrHooks.style = {
+		get: function( elem ) {
+			// Return undefined in the case of empty string
+			// Normalize to lowercase since IE uppercases css property names
+			return elem.style.cssText.toLowerCase() || undefined;
+		},
+		set: function( elem, value ) {
+			return (elem.style.cssText = "" + value);
+		}
+	};
+}
+
+// Safari mis-reports the default selected property of an option
+// Accessing the parent's selectedIndex property fixes it
+if ( !jQuery.support.optSelected ) {
+	jQuery.propHooks.selected = jQuery.extend( jQuery.propHooks.selected, {
+		get: function( elem ) {
+			var parent = elem.parentNode;
+
+			if ( parent ) {
+				parent.selectedIndex;
+
+				// Make sure that it also works with optgroups, see #5701
+				if ( parent.parentNode ) {
+					parent.parentNode.selectedIndex;
+				}
+			}
+		}
+	});
+}
+
+// Radios and checkboxes getter/setter
+if ( !jQuery.support.checkOn ) {
+	jQuery.each([ "radio", "checkbox" ], function() {
+		jQuery.valHooks[ this ] = {
+			get: function( elem ) {
+				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
+				return elem.getAttribute("value") === null ? "on" : elem.value;
+			}
+		};
+	});
+}
+jQuery.each([ "radio", "checkbox" ], function() {
+	jQuery.valHooks[ this ] = jQuery.extend( jQuery.valHooks[ this ], {
+		set: function( elem, value ) {
+			if ( jQuery.isArray( value ) ) {
+				return (elem.checked = jQuery.inArray( jQuery(elem).val(), value ) >= 0);
+			}
+		}
+	});
+});
+
+
+
+
+var rnamespaces = /\.(.*)$/,
+	rformElems = /^(?:textarea|input|select)$/i,
+	rperiod = /\./g,
+	rspaces = / /g,
+	rescape = /[^\w\s.|`]/g,
+	fcleanup = function( nm ) {
+		return nm.replace(rescape, "\\$&");
+	};
+
+/*
+ * A number of helper functions used for managing events.
+ * Many of the ideas behind this code originated from
+ * Dean Edwards' addEvent library.
+ */
+jQuery.event = {
+
+	// Bind an event to an element
+	// Original by Dean Edwards
+	add: function( elem, types, handler, data ) {
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		} else if ( !handler ) {
+			// Fixes bug #7229. Fix recommended by jdalton
+			return;
+		}
+
+		var handleObjIn, handleObj;
+
+		if ( handler.handler ) {
+			handleObjIn = handler;
+			handler = handleObjIn.handler;
+		}
+
+		// Make sure that the function being executed has a unique ID
+		if ( !handler.guid ) {
+			handler.guid = jQuery.guid++;
+		}
+
+		// Init the element's event structure
+		var elemData = jQuery._data( elem );
+
+		// If no elemData is found then we must be trying to bind to one of the
+		// banned noData elements
+		if ( !elemData ) {
+			return;
+		}
+
+		var events = elemData.events,
+			eventHandle = elemData.handle;
+
+		if ( !events ) {
+			elemData.events = events = {};
+		}
+
+		if ( !eventHandle ) {
+			elemData.handle = eventHandle = function( e ) {
+				// Discard the second event of a jQuery.event.trigger() and
+				// when an event is called after a page has unloaded
+				return typeof jQuery !== "undefined" && (!e || jQuery.event.triggered !== e.type) ?
+					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
+					undefined;
+			};
+		}
+
+		// Add elem as a property of the handle function
+		// This is to prevent a memory leak with non-native events in IE.
+		eventHandle.elem = elem;
+
+		// Handle multiple events separated by a space
+		// jQuery(...).bind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		var type, i = 0, namespaces;
+
+		while ( (type = types[ i++ ]) ) {
+			handleObj = handleObjIn ?
+				jQuery.extend({}, handleObjIn) :
+				{ handler: handler, data: data };
+
+			// Namespaced event handlers
+			if ( type.indexOf(".") > -1 ) {
+				namespaces = type.split(".");
+				type = namespaces.shift();
+				handleObj.namespace = namespaces.slice(0).sort().join(".");
+
+			} else {
+				namespaces = [];
+				handleObj.namespace = "";
+			}
+
+			handleObj.type = type;
+			if ( !handleObj.guid ) {
+				handleObj.guid = handler.guid;
+			}
+
+			// Get the current list of functions bound to this event
+			var handlers = events[ type ],
+				special = jQuery.event.special[ type ] || {};
+
+			// Init the event handler queue
+			if ( !handlers ) {
+				handlers = events[ type ] = [];
+
+				// Check for a special event handler
+				// Only use addEventListener/attachEvent if the special
+				// events handler returns false
+				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+					// Bind the global event handler to the element
+					if ( elem.addEventListener ) {
+						elem.addEventListener( type, eventHandle, false );
+
+					} else if ( elem.attachEvent ) {
+						elem.attachEvent( "on" + type, eventHandle );
+					}
+				}
+			}
+
+			if ( special.add ) {
+				special.add.call( elem, handleObj );
+
+				if ( !handleObj.handler.guid ) {
+					handleObj.handler.guid = handler.guid;
+				}
+			}
+
+			// Add the function to the element's handler list
+			handlers.push( handleObj );
+
+			// Keep track of which events have been used, for event optimization
+			jQuery.event.global[ type ] = true;
+		}
+
+		// Nullify elem to prevent memory leaks in IE
+		elem = null;
+	},
+
+	global: {},
+
+	// Detach an event or set of events from an element
+	remove: function( elem, types, handler, pos ) {
+		// don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		if ( handler === false ) {
+			handler = returnFalse;
+		}
+
+		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
+			elemData = jQuery.hasData( elem ) && jQuery._data( elem ),
+			events = elemData && elemData.events;
+
+		if ( !elemData || !events ) {
+			return;
+		}
+
+		// types is actually an event object here
+		if ( types && types.type ) {
+			handler = types.handler;
+			types = types.type;
+		}
+
+		// Unbind all events for the element
+		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
+			types = types || "";
+
+			for ( type in events ) {
+				jQuery.event.remove( elem, type + types );
+			}
+
+			return;
+		}
+
+		// Handle multiple events separated by a space
+		// jQuery(...).unbind("mouseover mouseout", fn);
+		types = types.split(" ");
+
+		while ( (type = types[ i++ ]) ) {
+			origType = type;
+			handleObj = null;
+			all = type.indexOf(".") < 0;
+			namespaces = [];
+
+			if ( !all ) {
+				// Namespaced event handlers
+				namespaces = type.split(".");
+				type = namespaces.shift();
+
+				namespace = new RegExp("(^|\\.)" +
+					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
+			}
+
+			eventType = events[ type ];
+
+			if ( !eventType ) {
+				continue;
+			}
+
+			if ( !handler ) {
+				for ( j = 0; j < eventType.length; j++ ) {
+					handleObj = eventType[ j ];
+
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						jQuery.event.remove( elem, origType, handleObj.handler, j );
+						eventType.splice( j--, 1 );
+					}
+				}
+
+				continue;
+			}
+
+			special = jQuery.event.special[ type ] || {};
+
+			for ( j = pos || 0; j < eventType.length; j++ ) {
+				handleObj = eventType[ j ];
+
+				if ( handler.guid === handleObj.guid ) {
+					// remove the given handler for the given type
+					if ( all || namespace.test( handleObj.namespace ) ) {
+						if ( pos == null ) {
+							eventType.splice( j--, 1 );
+						}
+
+						if ( special.remove ) {
+							special.remove.call( elem, handleObj );
+						}
+					}
+
+					if ( pos != null ) {
+						break;
+					}
+				}
+			}
+
+			// remove generic event handler if no more handlers exist
+			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
+				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
+					jQuery.removeEvent( elem, type, elemData.handle );
+				}
+
+				ret = null;
+				delete events[ type ];
+			}
+		}
+
+		// Remove the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
+			var handle = elemData.handle;
+			if ( handle ) {
+				handle.elem = null;
+			}
+
+			delete elemData.events;
+			delete elemData.handle;
+
+			if ( jQuery.isEmptyObject( elemData ) ) {
+				jQuery.removeData( elem, undefined, true );
+			}
+		}
+	},
+	
+	// Events that are safe to short-circuit if no handlers are attached.
+	// Native DOM events should not be added, they may have inline handlers.
+	customEvent: {
+		"getData": true,
+		"setData": true,
+		"changeData": true
+	},
+
+	trigger: function( event, data, elem, onlyHandlers ) {
+		// Event object or event type
+		var type = event.type || event,
+			namespaces = [],
+			exclusive;
+
+		if ( type.indexOf("!") >= 0 ) {
+			// Exclusive events trigger only for the exact event (no namespaces)
+			type = type.slice(0, -1);
+			exclusive = true;
+		}
+
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+
+		if ( (!elem || jQuery.event.customEvent[ type ]) && !jQuery.event.global[ type ] ) {
+			// No jQuery handlers for this event type, and it can't have inline handlers
+			return;
+		}
+
+		// Caller can pass in an Event, Object, or just an event type string
+		event = typeof event === "object" ?
+			// jQuery.Event object
+			event[ jQuery.expando ] ? event :
+			// Object literal
+			new jQuery.Event( type, event ) :
+			// Just the event type (string)
+			new jQuery.Event( type );
+
+		event.type = type;
+		event.exclusive = exclusive;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = new RegExp("(^|\\.)" + namespaces.join("\\.(?:.*\\.)?") + "(\\.|$)");
+		
+		// triggerHandler() and global events don't bubble or run the default action
+		if ( onlyHandlers || !elem ) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+
+		// Handle a global trigger
+		if ( !elem ) {
+			// TODO: Stop taunting the data cache; remove global events and always attach to document
+			jQuery.each( jQuery.cache, function() {
+				// internalKey variable is just used to make it easier to find
+				// and potentially change this stuff later; currently it just
+				// points to jQuery.expando
+				var internalKey = jQuery.expando,
+					internalCache = this[ internalKey ];
+				if ( internalCache && internalCache.events && internalCache.events[ type ] ) {
+					jQuery.event.trigger( event, data, internalCache.handle.elem );
+				}
+			});
+			return;
+		}
+
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		event.target = elem;
+
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data != null ? jQuery.makeArray( data ) : [];
+		data.unshift( event );
+
+		var cur = elem,
+			// IE doesn't like method names with a colon (#3533, #8272)
+			ontype = type.indexOf(":") < 0 ? "on" + type : "";
+
+		// Fire event on the current element, then bubble up the DOM tree
+		do {
+			var handle = jQuery._data( cur, "handle" );
+
+			event.currentTarget = cur;
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+
+			// Trigger an inline bound script
+			if ( ontype && jQuery.acceptData( cur ) && cur[ ontype ] && cur[ ontype ].apply( cur, data ) === false ) {
+				event.result = false;
+				event.preventDefault();
+			}
+
+			// Bubble up to document, then to window
+			cur = cur.parentNode || cur.ownerDocument || cur === event.target.ownerDocument && window;
+		} while ( cur && !event.isPropagationStopped() );
+
+		// If nobody prevented the default action, do it now
+		if ( !event.isDefaultPrevented() ) {
+			var old,
+				special = jQuery.event.special[ type ] || {};
+
+			if ( (!special._default || special._default.call( elem.ownerDocument, event ) === false) &&
+				!(type === "click" && jQuery.nodeName( elem, "a" )) && jQuery.acceptData( elem ) ) {
+
+				// Call a native DOM method on the target with the same name name as the event.
+				// Can't use an .isFunction)() check here because IE6/7 fails that test.
+				// IE<9 dies on focus to hidden element (#1486), may want to revisit a try/catch.
+				try {
+					if ( ontype && elem[ type ] ) {
+						// Don't re-trigger an onFOO event when we call its FOO() method
+						old = elem[ ontype ];
+
+						if ( old ) {
+							elem[ ontype ] = null;
+						}
+
+						jQuery.event.triggered = type;
+						elem[ type ]();
+					}
+				} catch ( ieError ) {}
+
+				if ( old ) {
+					elem[ ontype ] = old;
+				}
+
+				jQuery.event.triggered = undefined;
+			}
+		}
+		
+		return event.result;
+	},
+
+	handle: function( event ) {
+		event = jQuery.event.fix( event || window.event );
+		// Snapshot the handlers list since a called handler may add/remove events.
+		var handlers = ((jQuery._data( this, "events" ) || {})[ event.type ] || []).slice(0),
+			run_all = !event.exclusive && !event.namespace,
+			args = Array.prototype.slice.call( arguments, 0 );
+
+		// Use the fix-ed Event rather than the (read-only) native event
+		args[0] = event;
+		event.currentTarget = this;
+
+		for ( var j = 0, l = handlers.length; j < l; j++ ) {
+			var handleObj = handlers[ j ];
+
+			// Triggered event must 1) be non-exclusive and have no namespace, or
+			// 2) have namespace(s) a subset or equal to those in the bound event.
+			if ( run_all || event.namespace_re.test( handleObj.namespace ) ) {
+				// Pass in a reference to the handler function itself
+				// So that we can later remove it
+				event.handler = handleObj.handler;
+				event.data = handleObj.data;
+				event.handleObj = handleObj;
+
+				var ret = handleObj.handler.apply( this, args );
+
+				if ( ret !== undefined ) {
+					event.result = ret;
+					if ( ret === false ) {
+						event.preventDefault();
+						event.stopPropagation();
+					}
+				}
+
+				if ( event.isImmediatePropagationStopped() ) {
+					break;
+				}
+			}
+		}
+		return event.result;
+	},
+
+	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
+
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+
+		// store a copy of the original event object
+		// and "clone" to set read-only properties
+		var originalEvent = event;
+		event = jQuery.Event( originalEvent );
+
+		for ( var i = this.props.length, prop; i; ) {
+			prop = this.props[ --i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+
+		// Fix target property, if necessary
+		if ( !event.target ) {
+			// Fixes #1925 where srcElement might not be defined either
+			event.target = event.srcElement || document;
+		}
+
+		// check if target is a textnode (safari)
+		if ( event.target.nodeType === 3 ) {
+			event.target = event.target.parentNode;
+		}
+
+		// Add relatedTarget, if necessary
+		if ( !event.relatedTarget && event.fromElement ) {
+			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
+		}
+
+		// Calculate pageX/Y if missing and clientX/Y available
+		if ( event.pageX == null && event.clientX != null ) {
+			var eventDocument = event.target.ownerDocument || document,
+				doc = eventDocument.documentElement,
+				body = eventDocument.body;
+
+			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
+			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
+		}
+
+		// Add which for key events
+		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
+			event.which = event.charCode != null ? event.charCode : event.keyCode;
+		}
+
+		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
+		if ( !event.metaKey && event.ctrlKey ) {
+			event.metaKey = event.ctrlKey;
+		}
+
+		// Add which for click: 1 === left; 2 === middle; 3 === right
+		// Note: button is not normalized, so don't use it
+		if ( !event.which && event.button !== undefined ) {
+			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
+		}
+
+		return event;
+	},
+
+	// Deprecated, use jQuery.guid instead
+	guid: 1E8,
+
+	// Deprecated, use jQuery.proxy instead
+	proxy: jQuery.proxy,
+
+	special: {
+		ready: {
+			// Make sure the ready event is setup
+			setup: jQuery.bindReady,
+			teardown: jQuery.noop
+		},
+
+		live: {
+			add: function( handleObj ) {
+				jQuery.event.add( this,
+					liveConvert( handleObj.origType, handleObj.selector ),
+					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) );
+			},
+
+			remove: function( handleObj ) {
+				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
+			}
+		},
+
+		beforeunload: {
+			setup: function( data, namespaces, eventHandle ) {
+				// We only want to do this special case on windows
+				if ( jQuery.isWindow( this ) ) {
+					this.onbeforeunload = eventHandle;
+				}
+			},
+
+			teardown: function( namespaces, eventHandle ) {
+				if ( this.onbeforeunload === eventHandle ) {
+					this.onbeforeunload = null;
+				}
+			}
+		}
+	}
+};
+
+jQuery.removeEvent = document.removeEventListener ?
+	function( elem, type, handle ) {
+		if ( elem.removeEventListener ) {
+			elem.removeEventListener( type, handle, false );
+		}
+	} :
+	function( elem, type, handle ) {
+		if ( elem.detachEvent ) {
+			elem.detachEvent( "on" + type, handle );
+		}
+	};
+
+jQuery.Event = function( src, props ) {
+	// Allow instantiation without the 'new' keyword
+	if ( !this.preventDefault ) {
+		return new jQuery.Event( src, props );
+	}
+
+	// Event object
+	if ( src && src.type ) {
+		this.originalEvent = src;
+		this.type = src.type;
+
+		// Events bubbling up the document may have been marked as prevented
+		// by a handler lower down the tree; reflect the correct value.
+		this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+			src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
+
+	// Event type
+	} else {
+		this.type = src;
+	}
+
+	// Put explicitly provided properties onto the event object
+	if ( props ) {
+		jQuery.extend( this, props );
+	}
+
+	// timeStamp is buggy for some events on Firefox(#3843)
+	// So we won't rely on the native value
+	this.timeStamp = jQuery.now();
+
+	// Mark it as fixed
+	this[ jQuery.expando ] = true;
+};
+
+function returnFalse() {
+	return false;
+}
+function returnTrue() {
+	return true;
+}
+
+// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+jQuery.Event.prototype = {
+	preventDefault: function() {
+		this.isDefaultPrevented = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+
+		// if preventDefault exists run it on the original event
+		if ( e.preventDefault ) {
+			e.preventDefault();
+
+		// otherwise set the returnValue property of the original event to false (IE)
+		} else {
+			e.returnValue = false;
+		}
+	},
+	stopPropagation: function() {
+		this.isPropagationStopped = returnTrue;
+
+		var e = this.originalEvent;
+		if ( !e ) {
+			return;
+		}
+		// if stopPropagation exists run it on the original event
+		if ( e.stopPropagation ) {
+			e.stopPropagation();
+		}
+		// otherwise set the cancelBubble property of the original event to true (IE)
+		e.cancelBubble = true;
+	},
+	stopImmediatePropagation: function() {
+		this.isImmediatePropagationStopped = returnTrue;
+		this.stopPropagation();
+	},
+	isDefaultPrevented: returnFalse,
+	isPropagationStopped: returnFalse,
+	isImmediatePropagationStopped: returnFalse
+};
+
+// Checks if an event happened on an element within another element
+// Used in jQuery.event.special.mouseenter and mouseleave handlers
+var withinElement = function( event ) {
+
+	// Check if mouse(over|out) are still within the same parent element
+	var related = event.relatedTarget,
+		inside = false,
+		eventType = event.type;
+
+	event.type = event.data;
+
+	if ( related !== this ) {
+
+		if ( related ) {
+			inside = jQuery.contains( this, related );
+		}
+
+		if ( !inside ) {
+
+			jQuery.event.handle.apply( this, arguments );
+
+			event.type = eventType;
+		}
+	}
+},
+
+// In case of event delegation, we only need to rename the event.type,
+// liveHandler will take care of the rest.
+delegate = function( event ) {
+	event.type = event.data;
+	jQuery.event.handle.apply( this, arguments );
+};
+
+// Create mouseenter and mouseleave events
+jQuery.each({
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+}, function( orig, fix ) {
+	jQuery.event.special[ orig ] = {
+		setup: function( data ) {
+			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
+		},
+		teardown: function( data ) {
+			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
+		}
+	};
+});
+
+// submit delegation
+if ( !jQuery.support.submitBubbles ) {
+
+	jQuery.event.special.submit = {
+		setup: function( data, namespaces ) {
+			if ( !jQuery.nodeName( this, "form" ) ) {
+				jQuery.event.add(this, "click.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
+						trigger( "submit", this, arguments );
+					}
+				});
+
+				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
+					var elem = e.target,
+						type = elem.type;
+
+					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
+						trigger( "submit", this, arguments );
+					}
+				});
+
+			} else {
+				return false;
+			}
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialSubmit" );
+		}
+	};
+
+}
+
+// change delegation, happens here so we have bind.
+if ( !jQuery.support.changeBubbles ) {
+
+	var changeFilters,
+
+	getVal = function( elem ) {
+		var type = elem.type, val = elem.value;
+
+		if ( type === "radio" || type === "checkbox" ) {
+			val = elem.checked;
+
+		} else if ( type === "select-multiple" ) {
+			val = elem.selectedIndex > -1 ?
+				jQuery.map( elem.options, function( elem ) {
+					return elem.selected;
+				}).join("-") :
+				"";
+
+		} else if ( jQuery.nodeName( elem, "select" ) ) {
+			val = elem.selectedIndex;
+		}
+
+		return val;
+	},
+
+	testChange = function testChange( e ) {
+		var elem = e.target, data, val;
+
+		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
+			return;
+		}
+
+		data = jQuery._data( elem, "_change_data" );
+		val = getVal(elem);
+
+		// the current data will be also retrieved by beforeactivate
+		if ( e.type !== "focusout" || elem.type !== "radio" ) {
+			jQuery._data( elem, "_change_data", val );
+		}
+
+		if ( data === undefined || val === data ) {
+			return;
+		}
+
+		if ( data != null || val ) {
+			e.type = "change";
+			e.liveFired = undefined;
+			jQuery.event.trigger( e, arguments[1], elem );
+		}
+	};
+
+	jQuery.event.special.change = {
+		filters: {
+			focusout: testChange,
+
+			beforedeactivate: testChange,
+
+			click: function( e ) {
+				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
+
+				if ( type === "radio" || type === "checkbox" || jQuery.nodeName( elem, "select" ) ) {
+					testChange.call( this, e );
+				}
+			},
+
+			// Change has to be called before submit
+			// Keydown will be called before keypress, which is used in submit-event delegation
+			keydown: function( e ) {
+				var elem = e.target, type = jQuery.nodeName( elem, "input" ) ? elem.type : "";
+
+				if ( (e.keyCode === 13 && !jQuery.nodeName( elem, "textarea" ) ) ||
+					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
+					type === "select-multiple" ) {
+					testChange.call( this, e );
+				}
+			},
+
+			// Beforeactivate happens also before the previous element is blurred
+			// with this event you can't trigger a change event, but you can store
+			// information
+			beforeactivate: function( e ) {
+				var elem = e.target;
+				jQuery._data( elem, "_change_data", getVal(elem) );
+			}
+		},
+
+		setup: function( data, namespaces ) {
+			if ( this.type === "file" ) {
+				return false;
+			}
+
+			for ( var type in changeFilters ) {
+				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
+			}
+
+			return rformElems.test( this.nodeName );
+		},
+
+		teardown: function( namespaces ) {
+			jQuery.event.remove( this, ".specialChange" );
+
+			return rformElems.test( this.nodeName );
+		}
+	};
+
+	changeFilters = jQuery.event.special.change.filters;
+
+	// Handle when the input is .focus()'d
+	changeFilters.focus = changeFilters.beforeactivate;
+}
+
+function trigger( type, elem, args ) {
+	// Piggyback on a donor event to simulate a different one.
+	// Fake originalEvent to avoid donor's stopPropagation, but if the
+	// simulated event prevents default then we do the same on the donor.
+	// Don't pass args or remember liveFired; they apply to the donor event.
+	var event = jQuery.extend( {}, args[ 0 ] );
+	event.type = type;
+	event.originalEvent = {};
+	event.liveFired = undefined;
+	jQuery.event.handle.call( elem, event );
+	if ( event.isDefaultPrevented() ) {
+		args[ 0 ].preventDefault();
+	}
+}
+
+// Create "bubbling" focus and blur events
+if ( !jQuery.support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+
+		// Attach a single capturing handler while someone wants focusin/focusout
+		var attaches = 0;
+
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				if ( attaches++ === 0 ) {
+					document.addEventListener( orig, handler, true );
+				}
+			},
+			teardown: function() {
+				if ( --attaches === 0 ) {
+					document.removeEventListener( orig, handler, true );
+				}
+			}
+		};
+
+		function handler( donor ) {
+			// Donor event is always a native one; fix it and switch its type.
+			// Let focusin/out handler cancel the donor focus/blur event.
+			var e = jQuery.event.fix( donor );
+			e.type = fix;
+			e.originalEvent = {};
+			jQuery.event.trigger( e, null, e.target );
+			if ( e.isDefaultPrevented() ) {
+				donor.preventDefault();
+			}
+		}
+	});
+}
+
+jQuery.each(["bind", "one"], function( i, name ) {
+	jQuery.fn[ name ] = function( type, data, fn ) {
+		var handler;
+
+		// Handle object literals
+		if ( typeof type === "object" ) {
+			for ( var key in type ) {
+				this[ name ](key, data, type[key], fn);
+			}
+			return this;
+		}
+
+		if ( arguments.length === 2 || data === false ) {
+			fn = data;
+			data = undefined;
+		}
+
+		if ( name === "one" ) {
+			handler = function( event ) {
+				jQuery( this ).unbind( event, handler );
+				return fn.apply( this, arguments );
+			};
+			handler.guid = fn.guid || jQuery.guid++;
+		} else {
+			handler = fn;
+		}
+
+		if ( type === "unload" && name !== "one" ) {
+			this.one( type, data, fn );
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.add( this[i], type, handler, data );
+			}
+		}
+
+		return this;
+	};
+});
+
+jQuery.fn.extend({
+	unbind: function( type, fn ) {
+		// Handle object literals
+		if ( typeof type === "object" && !type.preventDefault ) {
+			for ( var key in type ) {
+				this.unbind(key, type[key]);
+			}
+
+		} else {
+			for ( var i = 0, l = this.length; i < l; i++ ) {
+				jQuery.event.remove( this[i], type, fn );
+			}
+		}
+
+		return this;
+	},
+
+	delegate: function( selector, types, data, fn ) {
+		return this.live( types, data, fn, selector );
+	},
+
+	undelegate: function( selector, types, fn ) {
+		if ( arguments.length === 0 ) {
+			return this.unbind( "live" );
+
+		} else {
+			return this.die( types, null, fn, selector );
+		}
+	},
+
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+
+	triggerHandler: function( type, data ) {
+		if ( this[0] ) {
+			return jQuery.event.trigger( type, data, this[0], true );
+		}
+	},
+
+	toggle: function( fn ) {
+		// Save reference to arguments for access in closure
+		var args = arguments,
+			guid = fn.guid || jQuery.guid++,
+			i = 0,
+			toggler = function( event ) {
+				// Figure out which function to execute
+				var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
+				jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
+
+				// Make sure that clicks stop
+				event.preventDefault();
+
+				// and execute the function
+				return args[ lastToggle ].apply( this, arguments ) || false;
+			};
+
+		// link all the functions, so any of them can unbind this click handler
+		toggler.guid = guid;
+		while ( i < args.length ) {
+			args[ i++ ].guid = guid;
+		}
+
+		return this.click( toggler );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
+	}
+});
+
+var liveMap = {
+	focus: "focusin",
+	blur: "focusout",
+	mouseenter: "mouseover",
+	mouseleave: "mouseout"
+};
+
+jQuery.each(["live", "die"], function( i, name ) {
+	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
+		var type, i = 0, match, namespaces, preType,
+			selector = origSelector || this.selector,
+			context = origSelector ? this : jQuery( this.context );
+
+		if ( typeof types === "object" && !types.preventDefault ) {
+			for ( var key in types ) {
+				context[ name ]( key, data, types[key], selector );
+			}
+
+			return this;
+		}
+
+		if ( name === "die" && !types &&
+					origSelector && origSelector.charAt(0) === "." ) {
+
+			context.unbind( origSelector );
+
+			return this;
+		}
+
+		if ( data === false || jQuery.isFunction( data ) ) {
+			fn = data || returnFalse;
+			data = undefined;
+		}
+
+		types = (types || "").split(" ");
+
+		while ( (type = types[ i++ ]) != null ) {
+			match = rnamespaces.exec( type );
+			namespaces = "";
+
+			if ( match )  {
+				namespaces = match[0];
+				type = type.replace( rnamespaces, "" );
+			}
+
+			if ( type === "hover" ) {
+				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
+				continue;
+			}
+
+			preType = type;
+
+			if ( liveMap[ type ] ) {
+				types.push( liveMap[ type ] + namespaces );
+				type = type + namespaces;
+
+			} else {
+				type = (liveMap[ type ] || type) + namespaces;
+			}
+
+			if ( name === "live" ) {
+				// bind live handler
+				for ( var j = 0, l = context.length; j < l; j++ ) {
+					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
+						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
+				}
+
+			} else {
+				// unbind live handler
+				context.unbind( "live." + liveConvert( type, selector ), fn );
+			}
+		}
+
+		return this;
+	};
+});
+
+function liveHandler( event ) {
+	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
+		elems = [],
+		selectors = [],
+		events = jQuery._data( this, "events" );
+
+	// Make sure we avoid non-left-click bubbling in Firefox (#3861) and disabled elements in IE (#6911)
+	if ( event.liveFired === this || !events || !events.live || event.target.disabled || event.button && event.type === "click" ) {
+		return;
+	}
+
+	if ( event.namespace ) {
+		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
+	}
+
+	event.liveFired = this;
+
+	var live = events.live.slice(0);
+
+	for ( j = 0; j < live.length; j++ ) {
+		handleObj = live[j];
+
+		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
+			selectors.push( handleObj.selector );
+
+		} else {
+			live.splice( j--, 1 );
+		}
+	}
+
+	match = jQuery( event.target ).closest( selectors, event.currentTarget );
+
+	for ( i = 0, l = match.length; i < l; i++ ) {
+		close = match[i];
+
+		for ( j = 0; j < live.length; j++ ) {
+			handleObj = live[j];
+
+			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) && !close.elem.disabled ) {
+				elem = close.elem;
+				related = null;
+
+				// Those two events require additional checking
+				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
+					event.type = handleObj.preType;
+					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
+
+					// Make sure not to accidentally match a child element with the same selector
+					if ( related && jQuery.contains( elem, related ) ) {
+						related = elem;
+					}
+				}
+
+				if ( !related || related !== elem ) {
+					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
+				}
+			}
+		}
+	}
+
+	for ( i = 0, l = elems.length; i < l; i++ ) {
+		match = elems[i];
+
+		if ( maxLevel && match.level > maxLevel ) {
+			break;
+		}
+
+		event.currentTarget = match.elem;
+		event.data = match.handleObj.data;
+		event.handleObj = match.handleObj;
+
+		ret = match.handleObj.origHandler.apply( match.elem, arguments );
+
+		if ( ret === false || event.isPropagationStopped() ) {
+			maxLevel = match.level;
+
+			if ( ret === false ) {
+				stop = false;
+			}
+			if ( event.isImmediatePropagationStopped() ) {
+				break;
+			}
+		}
+	}
+
+	return stop;
+}
+
+function liveConvert( type, selector ) {
+	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspaces, "&");
+}
+
+jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
+
+	// Handle event binding
+	jQuery.fn[ name ] = function( data, fn ) {
+		if ( fn == null ) {
+			fn = data;
+			data = null;
+		}
+
+		return arguments.length > 0 ?
+			this.bind( name, data, fn ) :
+			this.trigger( name );
+	};
+
+	if ( jQuery.attrFn ) {
+		jQuery.attrFn[ name ] = true;
+	}
+});
+
+
+
+/*!
+ * Sizzle CSS Selector Engine
+ *  Copyright 2011, The Dojo Foundation
+ *  Released under the MIT, BSD, and GPL Licenses.
+ *  More information: http://sizzlejs.com/
+ */
+(function(){
+
+var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
+	done = 0,
+	toString = Object.prototype.toString,
+	hasDuplicate = false,
+	baseHasDuplicate = true,
+	rBackslash = /\\/g,
+	rNonWord = /\W/;
+
+// Here we check if the JavaScript engine is using some sort of
+// optimization where it does not always call our comparision
+// function. If that is the case, discard the hasDuplicate value.
+//   Thus far that includes Google Chrome.
+[0, 0].sort(function() {
+	baseHasDuplicate = false;
+	return 0;
+});
+
+var Sizzle = function( selector, context, results, seed ) {
+	results = results || [];
+	context = context || document;
+
+	var origContext = context;
+
+	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
+		return [];
+	}
+	
+	if ( !selector || typeof selector !== "string" ) {
+		return results;
+	}
+
+	var m, set, checkSet, extra, ret, cur, pop, i,
+		prune = true,
+		contextXML = Sizzle.isXML( context ),
+		parts = [],
+		soFar = selector;
+	
+	// Reset the position of the chunker regexp (start from head)
+	do {
+		chunker.exec( "" );
+		m = chunker.exec( soFar );
+
+		if ( m ) {
+			soFar = m[3];
+		
+			parts.push( m[1] );
+		
+			if ( m[2] ) {
+				extra = m[3];
+				break;
+			}
+		}
+	} while ( m );
+
+	if ( parts.length > 1 && origPOS.exec( selector ) ) {
+
+		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
+			set = posProcess( parts[0] + parts[1], context );
+
+		} else {
+			set = Expr.relative[ parts[0] ] ?
+				[ context ] :
+				Sizzle( parts.shift(), context );
+
+			while ( parts.length ) {
+				selector = parts.shift();
+
+				if ( Expr.relative[ selector ] ) {
+					selector += parts.shift();
+				}
+				
+				set = posProcess( selector, set );
+			}
+		}
+
+	} else {
+		// Take a shortcut and set the context if the root selector is an ID
+		// (but not if it'll be faster if the inner selector is an ID)
+		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
+				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
+
+			ret = Sizzle.find( parts.shift(), context, contextXML );
+			context = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set )[0] :
+				ret.set[0];
+		}
+
+		if ( context ) {
+			ret = seed ?
+				{ expr: parts.pop(), set: makeArray(seed) } :
+				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
+
+			set = ret.expr ?
+				Sizzle.filter( ret.expr, ret.set ) :
+				ret.set;
+
+			if ( parts.length > 0 ) {
+				checkSet = makeArray( set );
+
+			} else {
+				prune = false;
+			}
+
+			while ( parts.length ) {
+				cur = parts.pop();
+				pop = cur;
+
+				if ( !Expr.relative[ cur ] ) {
+					cur = "";
+				} else {
+					pop = parts.pop();
+				}
+
+				if ( pop == null ) {
+					pop = context;
+				}
+
+				Expr.relative[ cur ]( checkSet, pop, contextXML );
+			}
+
+		} else {
+			checkSet = parts = [];
+		}
+	}
+
+	if ( !checkSet ) {
+		checkSet = set;
+	}
+
+	if ( !checkSet ) {
+		Sizzle.error( cur || selector );
+	}
+
+	if ( toString.call(checkSet) === "[object Array]" ) {
+		if ( !prune ) {
+			results.push.apply( results, checkSet );
+
+		} else if ( context && context.nodeType === 1 ) {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
+					results.push( set[i] );
+				}
+			}
+
+		} else {
+			for ( i = 0; checkSet[i] != null; i++ ) {
+				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
+					results.push( set[i] );
+				}
+			}
+		}
+
+	} else {
+		makeArray( checkSet, results );
+	}
+
+	if ( extra ) {
+		Sizzle( extra, origContext, results, seed );
+		Sizzle.uniqueSort( results );
+	}
+
+	return results;
+};
+
+Sizzle.uniqueSort = function( results ) {
+	if ( sortOrder ) {
+		hasDuplicate = baseHasDuplicate;
+		results.sort( sortOrder );
+
+		if ( hasDuplicate ) {
+			for ( var i = 1; i < results.length; i++ ) {
+				if ( results[i] === results[ i - 1 ] ) {
+					results.splice( i--, 1 );
+				}
+			}
+		}
+	}
+
+	return results;
+};
+
+Sizzle.matches = function( expr, set ) {
+	return Sizzle( expr, null, null, set );
+};
+
+Sizzle.matchesSelector = function( node, expr ) {
+	return Sizzle( expr, null, null, [node] ).length > 0;
+};
+
+Sizzle.find = function( expr, context, isXML ) {
+	var set;
+
+	if ( !expr ) {
+		return [];
+	}
+
+	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
+		var match,
+			type = Expr.order[i];
+		
+		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
+			var left = match[1];
+			match.splice( 1, 1 );
+
+			if ( left.substr( left.length - 1 ) !== "\\" ) {
+				match[1] = (match[1] || "").replace( rBackslash, "" );
+				set = Expr.find[ type ]( match, context, isXML );
+
+				if ( set != null ) {
+					expr = expr.replace( Expr.match[ type ], "" );
+					break;
+				}
+			}
+		}
+	}
+
+	if ( !set ) {
+		set = typeof context.getElementsByTagName !== "undefined" ?
+			context.getElementsByTagName( "*" ) :
+			[];
+	}
+
+	return { set: set, expr: expr };
+};
+
+Sizzle.filter = function( expr, set, inplace, not ) {
+	var match, anyFound,
+		old = expr,
+		result = [],
+		curLoop = set,
+		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
+
+	while ( expr && set.length ) {
+		for ( var type in Expr.filter ) {
+			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
+				var found, item,
+					filter = Expr.filter[ type ],
+					left = match[1];
+
+				anyFound = false;
+
+				match.splice(1,1);
+
+				if ( left.substr( left.length - 1 ) === "\\" ) {
+					continue;
+				}
+
+				if ( curLoop === result ) {
+					result = [];
+				}
+
+				if ( Expr.preFilter[ type ] ) {
+					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
+
+					if ( !match ) {
+						anyFound = found = true;
+
+					} else if ( match === true ) {
+						continue;
+					}
+				}
+
+				if ( match ) {
+					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
+						if ( item ) {
+							found = filter( item, match, i, curLoop );
+							var pass = not ^ !!found;
+
+							if ( inplace && found != null ) {
+								if ( pass ) {
+									anyFound = true;
+
+								} else {
+									curLoop[i] = false;
+								}
+
+							} else if ( pass ) {
+								result.push( item );
+								anyFound = true;
+							}
+						}
+					}
+				}
+
+				if ( found !== undefined ) {
+					if ( !inplace ) {
+						curLoop = result;
+					}
+
+					expr = expr.replace( Expr.match[ type ], "" );
+
+					if ( !anyFound ) {
+						return [];
+					}
+
+					break;
+				}
+			}
+		}
+
+		// Improper expression
+		if ( expr === old ) {
+			if ( anyFound == null ) {
+				Sizzle.error( expr );
+
+			} else {
+				break;
+			}
+		}
+
+		old = expr;
+	}
+
+	return curLoop;
+};
+
+Sizzle.error = function( msg ) {
+	throw "Syntax error, unrecognized expression: " + msg;
+};
+
+var Expr = Sizzle.selectors = {
+	order: [ "ID", "NAME", "TAG" ],
+
+	match: {
+		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
+		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
+		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,
+		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
+		CHILD: /:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,
+		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
+		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
+	},
+
+	leftMatch: {},
+
+	attrMap: {
+		"class": "className",
+		"for": "htmlFor"
+	},
+
+	attrHandle: {
+		href: function( elem ) {
+			return elem.getAttribute( "href" );
+		},
+		type: function( elem ) {
+			return elem.getAttribute( "type" );
+		}
+	},
+
+	relative: {
+		"+": function(checkSet, part){
+			var isPartStr = typeof part === "string",
+				isTag = isPartStr && !rNonWord.test( part ),
+				isPartStrNotTag = isPartStr && !isTag;
+
+			if ( isTag ) {
+				part = part.toLowerCase();
+			}
+
+			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
+				if ( (elem = checkSet[i]) ) {
+					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
+
+					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
+						elem || false :
+						elem === part;
+				}
+			}
+
+			if ( isPartStrNotTag ) {
+				Sizzle.filter( part, checkSet, true );
+			}
+		},
+
+		">": function( checkSet, part ) {
+			var elem,
+				isPartStr = typeof part === "string",
+				i = 0,
+				l = checkSet.length;
+
+			if ( isPartStr && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						var parent = elem.parentNode;
+						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
+					}
+				}
+
+			} else {
+				for ( ; i < l; i++ ) {
+					elem = checkSet[i];
+
+					if ( elem ) {
+						checkSet[i] = isPartStr ?
+							elem.parentNode :
+							elem.parentNode === part;
+					}
+				}
+
+				if ( isPartStr ) {
+					Sizzle.filter( part, checkSet, true );
+				}
+			}
+		},
+
+		"": function(checkSet, part, isXML){
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
+		},
+
+		"~": function( checkSet, part, isXML ) {
+			var nodeCheck,
+				doneName = done++,
+				checkFn = dirCheck;
+
+			if ( typeof part === "string" && !rNonWord.test( part ) ) {
+				part = part.toLowerCase();
+				nodeCheck = part;
+				checkFn = dirNodeCheck;
+			}
+
+			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
+		}
+	},
+
+	find: {
+		ID: function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+				// Check parentNode to catch when Blackberry 4.6 returns
+				// nodes that are no longer in the document #6963
+				return m && m.parentNode ? [m] : [];
+			}
+		},
+
+		NAME: function( match, context ) {
+			if ( typeof context.getElementsByName !== "undefined" ) {
+				var ret = [],
+					results = context.getElementsByName( match[1] );
+
+				for ( var i = 0, l = results.length; i < l; i++ ) {
+					if ( results[i].getAttribute("name") === match[1] ) {
+						ret.push( results[i] );
+					}
+				}
+
+				return ret.length === 0 ? null : ret;
+			}
+		},
+
+		TAG: function( match, context ) {
+			if ( typeof context.getElementsByTagName !== "undefined" ) {
+				return context.getElementsByTagName( match[1] );
+			}
+		}
+	},
+	preFilter: {
+		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
+			match = " " + match[1].replace( rBackslash, "" ) + " ";
+
+			if ( isXML ) {
+				return match;
+			}
+
+			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
+				if ( elem ) {
+					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n\r]/g, " ").indexOf(match) >= 0) ) {
+						if ( !inplace ) {
+							result.push( elem );
+						}
+
+					} else if ( inplace ) {
+						curLoop[i] = false;
+					}
+				}
+			}
+
+			return false;
+		},
+
+		ID: function( match ) {
+			return match[1].replace( rBackslash, "" );
+		},
+
+		TAG: function( match, curLoop ) {
+			return match[1].replace( rBackslash, "" ).toLowerCase();
+		},
+
+		CHILD: function( match ) {
+			if ( match[1] === "nth" ) {
+				if ( !match[2] ) {
+					Sizzle.error( match[0] );
+				}
+
+				match[2] = match[2].replace(/^\+|\s*/g, '');
+
+				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
+				var test = /(-?)(\d*)(?:n([+\-]?\d*))?/.exec(
+					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
+					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
+
+				// calculate the numbers (first)n+(last) including if they are negative
+				match[2] = (test[1] + (test[2] || 1)) - 0;
+				match[3] = test[3] - 0;
+			}
+			else if ( match[2] ) {
+				Sizzle.error( match[0] );
+			}
+
+			// TODO: Move to normal caching system
+			match[0] = done++;
+
+			return match;
+		},
+
+		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
+			var name = match[1] = match[1].replace( rBackslash, "" );
+			
+			if ( !isXML && Expr.attrMap[name] ) {
+				match[1] = Expr.attrMap[name];
+			}
+
+			// Handle if an un-quoted value was used
+			match[4] = ( match[4] || match[5] || "" ).replace( rBackslash, "" );
+
+			if ( match[2] === "~=" ) {
+				match[4] = " " + match[4] + " ";
+			}
+
+			return match;
+		},
+
+		PSEUDO: function( match, curLoop, inplace, result, not ) {
+			if ( match[1] === "not" ) {
+				// If we're dealing with a complex expression, or a simple one
+				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
+					match[3] = Sizzle(match[3], null, null, curLoop);
+
+				} else {
+					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
+
+					if ( !inplace ) {
+						result.push.apply( result, ret );
+					}
+
+					return false;
+				}
+
+			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
+				return true;
+			}
+			
+			return match;
+		},
+
+		POS: function( match ) {
+			match.unshift( true );
+
+			return match;
+		}
+	},
+	
+	filters: {
+		enabled: function( elem ) {
+			return elem.disabled === false && elem.type !== "hidden";
+		},
+
+		disabled: function( elem ) {
+			return elem.disabled === true;
+		},
+
+		checked: function( elem ) {
+			return elem.checked === true;
+		},
+		
+		selected: function( elem ) {
+			// Accessing this property makes selected-by-default
+			// options in Safari work properly
+			if ( elem.parentNode ) {
+				elem.parentNode.selectedIndex;
+			}
+			
+			return elem.selected === true;
+		},
+
+		parent: function( elem ) {
+			return !!elem.firstChild;
+		},
+
+		empty: function( elem ) {
+			return !elem.firstChild;
+		},
+
+		has: function( elem, i, match ) {
+			return !!Sizzle( match[3], elem ).length;
+		},
+
+		header: function( elem ) {
+			return (/h\d/i).test( elem.nodeName );
+		},
+
+		text: function( elem ) {
+			var attr = elem.getAttribute( "type" ), type = elem.type;
+			// IE6 and 7 will map elem.type to 'text' for new HTML5 types (search, etc) 
+			// use getAttribute instead to test this case
+			return elem.nodeName.toLowerCase() === "input" && "text" === type && ( attr === type || attr === null );
+		},
+
+		radio: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "radio" === elem.type;
+		},
+
+		checkbox: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "checkbox" === elem.type;
+		},
+
+		file: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "file" === elem.type;
+		},
+
+		password: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "password" === elem.type;
+		},
+
+		submit: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "submit" === elem.type;
+		},
+
+		image: function( elem ) {
+			return elem.nodeName.toLowerCase() === "input" && "image" === elem.type;
+		},
+
+		reset: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return (name === "input" || name === "button") && "reset" === elem.type;
+		},
+
+		button: function( elem ) {
+			var name = elem.nodeName.toLowerCase();
+			return name === "input" && "button" === elem.type || name === "button";
+		},
+
+		input: function( elem ) {
+			return (/input|select|textarea|button/i).test( elem.nodeName );
+		},
+
+		focus: function( elem ) {
+			return elem === elem.ownerDocument.activeElement;
+		}
+	},
+	setFilters: {
+		first: function( elem, i ) {
+			return i === 0;
+		},
+
+		last: function( elem, i, match, array ) {
+			return i === array.length - 1;
+		},
+
+		even: function( elem, i ) {
+			return i % 2 === 0;
+		},
+
+		odd: function( elem, i ) {
+			return i % 2 === 1;
+		},
+
+		lt: function( elem, i, match ) {
+			return i < match[3] - 0;
+		},
+
+		gt: function( elem, i, match ) {
+			return i > match[3] - 0;
+		},
+
+		nth: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		},
+
+		eq: function( elem, i, match ) {
+			return match[3] - 0 === i;
+		}
+	},
+	filter: {
+		PSEUDO: function( elem, match, i, array ) {
+			var name = match[1],
+				filter = Expr.filters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+
+			} else if ( name === "contains" ) {
+				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
+
+			} else if ( name === "not" ) {
+				var not = match[3];
+
+				for ( var j = 0, l = not.length; j < l; j++ ) {
+					if ( not[j] === elem ) {
+						return false;
+					}
+				}
+
+				return true;
+
+			} else {
+				Sizzle.error( name );
+			}
+		},
+
+		CHILD: function( elem, match ) {
+			var type = match[1],
+				node = elem;
+
+			switch ( type ) {
+				case "only":
+				case "first":
+					while ( (node = node.previousSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					if ( type === "first" ) { 
+						return true; 
+					}
+
+					node = elem;
+
+				case "last":
+					while ( (node = node.nextSibling) )	 {
+						if ( node.nodeType === 1 ) { 
+							return false; 
+						}
+					}
+
+					return true;
+
+				case "nth":
+					var first = match[2],
+						last = match[3];
+
+					if ( first === 1 && last === 0 ) {
+						return true;
+					}
+					
+					var doneName = match[0],
+						parent = elem.parentNode;
+	
+					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
+						var count = 0;
+						
+						for ( node = parent.firstChild; node; node = node.nextSibling ) {
+							if ( node.nodeType === 1 ) {
+								node.nodeIndex = ++count;
+							}
+						} 
+
+						parent.sizcache = doneName;
+					}
+					
+					var diff = elem.nodeIndex - last;
+
+					if ( first === 0 ) {
+						return diff === 0;
+
+					} else {
+						return ( diff % first === 0 && diff / first >= 0 );
+					}
+			}
+		},
+
+		ID: function( elem, match ) {
+			return elem.nodeType === 1 && elem.getAttribute("id") === match;
+		},
+
+		TAG: function( elem, match ) {
+			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
+		},
+		
+		CLASS: function( elem, match ) {
+			return (" " + (elem.className || elem.getAttribute("class")) + " ")
+				.indexOf( match ) > -1;
+		},
+
+		ATTR: function( elem, match ) {
+			var name = match[1],
+				result = Expr.attrHandle[ name ] ?
+					Expr.attrHandle[ name ]( elem ) :
+					elem[ name ] != null ?
+						elem[ name ] :
+						elem.getAttribute( name ),
+				value = result + "",
+				type = match[2],
+				check = match[4];
+
+			return result == null ?
+				type === "!=" :
+				type === "=" ?
+				value === check :
+				type === "*=" ?
+				value.indexOf(check) >= 0 :
+				type === "~=" ?
+				(" " + value + " ").indexOf(check) >= 0 :
+				!check ?
+				value && result !== false :
+				type === "!=" ?
+				value !== check :
+				type === "^=" ?
+				value.indexOf(check) === 0 :
+				type === "$=" ?
+				value.substr(value.length - check.length) === check :
+				type === "|=" ?
+				value === check || value.substr(0, check.length + 1) === check + "-" :
+				false;
+		},
+
+		POS: function( elem, match, i, array ) {
+			var name = match[2],
+				filter = Expr.setFilters[ name ];
+
+			if ( filter ) {
+				return filter( elem, i, match, array );
+			}
+		}
+	}
+};
+
+var origPOS = Expr.match.POS,
+	fescape = function(all, num){
+		return "\\" + (num - 0 + 1);
+	};
+
+for ( var type in Expr.match ) {
+	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
+	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
+}
+
+var makeArray = function( array, results ) {
+	array = Array.prototype.slice.call( array, 0 );
+
+	if ( results ) {
+		results.push.apply( results, array );
+		return results;
+	}
+	
+	return array;
+};
+
+// Perform a simple check to determine if the browser is capable of
+// converting a NodeList to an array using builtin methods.
+// Also verifies that the returned array holds DOM nodes
+// (which is not the case in the Blackberry browser)
+try {
+	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
+
+// Provide a fallback method if it does not work
+} catch( e ) {
+	makeArray = function( array, results ) {
+		var i = 0,
+			ret = results || [];
+
+		if ( toString.call(array) === "[object Array]" ) {
+			Array.prototype.push.apply( ret, array );
+
+		} else {
+			if ( typeof array.length === "number" ) {
+				for ( var l = array.length; i < l; i++ ) {
+					ret.push( array[i] );
+				}
+
+			} else {
+				for ( ; array[i]; i++ ) {
+					ret.push( array[i] );
+				}
+			}
+		}
+
+		return ret;
+	};
+}
+
+var sortOrder, siblingCheck;
+
+if ( document.documentElement.compareDocumentPosition ) {
+	sortOrder = function( a, b ) {
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+		}
+
+		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
+			return a.compareDocumentPosition ? -1 : 1;
+		}
+
+		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
+	};
+
+} else {
+	sortOrder = function( a, b ) {
+		// The nodes are identical, we can exit early
+		if ( a === b ) {
+			hasDuplicate = true;
+			return 0;
+
+		// Fallback to using sourceIndex (in IE) if it's available on both nodes
+		} else if ( a.sourceIndex && b.sourceIndex ) {
+			return a.sourceIndex - b.sourceIndex;
+		}
+
+		var al, bl,
+			ap = [],
+			bp = [],
+			aup = a.parentNode,
+			bup = b.parentNode,
+			cur = aup;
+
+		// If the nodes are siblings (or identical) we can do a quick check
+		if ( aup === bup ) {
+			return siblingCheck( a, b );
+
+		// If no parents were found then the nodes are disconnected
+		} else if ( !aup ) {
+			return -1;
+
+		} else if ( !bup ) {
+			return 1;
+		}
+
+		// Otherwise they're somewhere else in the tree so we need
+		// to build up a full list of the parentNodes for comparison
+		while ( cur ) {
+			ap.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		cur = bup;
+
+		while ( cur ) {
+			bp.unshift( cur );
+			cur = cur.parentNode;
+		}
+
+		al = ap.length;
+		bl = bp.length;
+
+		// Start walking down the tree looking for a discrepancy
+		for ( var i = 0; i < al && i < bl; i++ ) {
+			if ( ap[i] !== bp[i] ) {
+				return siblingCheck( ap[i], bp[i] );
+			}
+		}
+
+		// We ended someplace up the tree so do a sibling check
+		return i === al ?
+			siblingCheck( a, bp[i], -1 ) :
+			siblingCheck( ap[i], b, 1 );
+	};
+
+	siblingCheck = function( a, b, ret ) {
+		if ( a === b ) {
+			return ret;
+		}
+
+		var cur = a.nextSibling;
+
+		while ( cur ) {
+			if ( cur === b ) {
+				return -1;
+			}
+
+			cur = cur.nextSibling;
+		}
+
+		return 1;
+	};
+}
+
+// Utility function for retreiving the text value of an array of DOM nodes
+Sizzle.getText = function( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += Sizzle.getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+// Check to see if the browser returns elements by name when
+// querying by getElementById (and provide a workaround)
+(function(){
+	// We're going to inject a fake input element with a specified name
+	var form = document.createElement("div"),
+		id = "script" + (new Date()).getTime(),
+		root = document.documentElement;
+
+	form.innerHTML = "<a name='" + id + "'/>";
+
+	// Inject it into the root element, check its status, and remove it quickly
+	root.insertBefore( form, root.firstChild );
+
+	// The workaround has to do additional checks after a getElementById
+	// Which slows things down for other browsers (hence the branching)
+	if ( document.getElementById( id ) ) {
+		Expr.find.ID = function( match, context, isXML ) {
+			if ( typeof context.getElementById !== "undefined" && !isXML ) {
+				var m = context.getElementById(match[1]);
+
+				return m ?
+					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
+						[m] :
+						undefined :
+					[];
+			}
+		};
+
+		Expr.filter.ID = function( elem, match ) {
+			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
+
+			return elem.nodeType === 1 && node && node.nodeValue === match;
+		};
+	}
+
+	root.removeChild( form );
+
+	// release memory in IE
+	root = form = null;
+})();
+
+(function(){
+	// Check to see if the browser returns only elements
+	// when doing getElementsByTagName("*")
+
+	// Create a fake element
+	var div = document.createElement("div");
+	div.appendChild( document.createComment("") );
+
+	// Make sure no comments are found
+	if ( div.getElementsByTagName("*").length > 0 ) {
+		Expr.find.TAG = function( match, context ) {
+			var results = context.getElementsByTagName( match[1] );
+
+			// Filter out possible comments
+			if ( match[1] === "*" ) {
+				var tmp = [];
+
+				for ( var i = 0; results[i]; i++ ) {
+					if ( results[i].nodeType === 1 ) {
+						tmp.push( results[i] );
+					}
+				}
+
+				results = tmp;
+			}
+
+			return results;
+		};
+	}
+
+	// Check to see if an attribute returns normalized href attributes
+	div.innerHTML = "<a href='#'></a>";
+
+	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
+			div.firstChild.getAttribute("href") !== "#" ) {
+
+		Expr.attrHandle.href = function( elem ) {
+			return elem.getAttribute( "href", 2 );
+		};
+	}
+
+	// release memory in IE
+	div = null;
+})();
+
+if ( document.querySelectorAll ) {
+	(function(){
+		var oldSizzle = Sizzle,
+			div = document.createElement("div"),
+			id = "__sizzle__";
+
+		div.innerHTML = "<p class='TEST'></p>";
+
+		// Safari can't handle uppercase or unicode characters when
+		// in quirks mode.
+		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
+			return;
+		}
+	
+		Sizzle = function( query, context, extra, seed ) {
+			context = context || document;
+
+			// Only use querySelectorAll on non-XML documents
+			// (ID selectors don't work in non-HTML documents)
+			if ( !seed && !Sizzle.isXML(context) ) {
+				// See if we find a selector to speed up
+				var match = /^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec( query );
+				
+				if ( match && (context.nodeType === 1 || context.nodeType === 9) ) {
+					// Speed-up: Sizzle("TAG")
+					if ( match[1] ) {
+						return makeArray( context.getElementsByTagName( query ), extra );
+					
+					// Speed-up: Sizzle(".CLASS")
+					} else if ( match[2] && Expr.find.CLASS && context.getElementsByClassName ) {
+						return makeArray( context.getElementsByClassName( match[2] ), extra );
+					}
+				}
+				
+				if ( context.nodeType === 9 ) {
+					// Speed-up: Sizzle("body")
+					// The body element only exists once, optimize finding it
+					if ( query === "body" && context.body ) {
+						return makeArray( [ context.body ], extra );
+						
+					// Speed-up: Sizzle("#ID")
+					} else if ( match && match[3] ) {
+						var elem = context.getElementById( match[3] );
+
+						// Check parentNode to catch when Blackberry 4.6 returns
+						// nodes that are no longer in the document #6963
+						if ( elem && elem.parentNode ) {
+							// Handle the case where IE and Opera return items
+							// by name instead of ID
+							if ( elem.id === match[3] ) {
+								return makeArray( [ elem ], extra );
+							}
+							
+						} else {
+							return makeArray( [], extra );
+						}
+					}
+					
+					try {
+						return makeArray( context.querySelectorAll(query), extra );
+					} catch(qsaError) {}
+
+				// qSA works strangely on Element-rooted queries
+				// We can work around this by specifying an extra ID on the root
+				// and working up from there (Thanks to Andrew Dupont for the technique)
+				// IE 8 doesn't work on object elements
+				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
+					var oldContext = context,
+						old = context.getAttribute( "id" ),
+						nid = old || id,
+						hasParent = context.parentNode,
+						relativeHierarchySelector = /^\s*[+~]/.test( query );
+
+					if ( !old ) {
+						context.setAttribute( "id", nid );
+					} else {
+						nid = nid.replace( /'/g, "\\$&" );
+					}
+					if ( relativeHierarchySelector && hasParent ) {
+						context = context.parentNode;
+					}
+
+					try {
+						if ( !relativeHierarchySelector || hasParent ) {
+							return makeArray( context.querySelectorAll( "[id='" + nid + "'] " + query ), extra );
+						}
+
+					} catch(pseudoError) {
+					} finally {
+						if ( !old ) {
+							oldContext.removeAttribute( "id" );
+						}
+					}
+				}
+			}
+		
+			return oldSizzle(query, context, extra, seed);
+		};
+
+		for ( var prop in oldSizzle ) {
+			Sizzle[ prop ] = oldSizzle[ prop ];
+		}
+
+		// release memory in IE
+		div = null;
+	})();
+}
+
+(function(){
+	var html = document.documentElement,
+		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector;
+
+	if ( matches ) {
+		// Check to see if it's possible to do matchesSelector
+		// on a disconnected node (IE 9 fails this)
+		var disconnectedMatch = !matches.call( document.createElement( "div" ), "div" ),
+			pseudoWorks = false;
+
+		try {
+			// This should fail with an exception
+			// Gecko does not error, returns false instead
+			matches.call( document.documentElement, "[test!='']:sizzle" );
+	
+		} catch( pseudoError ) {
+			pseudoWorks = true;
+		}
+
+		Sizzle.matchesSelector = function( node, expr ) {
+			// Make sure that attribute selectors are quoted
+			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
+
+			if ( !Sizzle.isXML( node ) ) {
+				try { 
+					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
+						var ret = matches.call( node, expr );
+
+						// IE 9's matchesSelector returns false on disconnected nodes
+						if ( ret || !disconnectedMatch ||
+								// As well, disconnected nodes are said to be in a document
+								// fragment in IE 9, so check for that
+								node.document && node.document.nodeType !== 11 ) {
+							return ret;
+						}
+					}
+				} catch(e) {}
+			}
+
+			return Sizzle(expr, null, null, [node]).length > 0;
+		};
+	}
+})();
+
+(function(){
+	var div = document.createElement("div");
+
+	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
+
+	// Opera can't find a second classname (in 9.6)
+	// Also, make sure that getElementsByClassName actually exists
+	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
+		return;
+	}
+
+	// Safari caches class attributes, doesn't catch changes (in 3.2)
+	div.lastChild.className = "e";
+
+	if ( div.getElementsByClassName("e").length === 1 ) {
+		return;
+	}
+	
+	Expr.order.splice(1, 0, "CLASS");
+	Expr.find.CLASS = function( match, context, isXML ) {
+		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
+			return context.getElementsByClassName(match[1]);
+		}
+	};
+
+	// release memory in IE
+	div = null;
+})();
+
+function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 && !isXML ){
+					elem.sizcache = doneName;
+					elem.sizset = i;
+				}
+
+				if ( elem.nodeName.toLowerCase() === cur ) {
+					match = elem;
+					break;
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
+	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
+		var elem = checkSet[i];
+
+		if ( elem ) {
+			var match = false;
+			
+			elem = elem[dir];
+
+			while ( elem ) {
+				if ( elem.sizcache === doneName ) {
+					match = checkSet[elem.sizset];
+					break;
+				}
+
+				if ( elem.nodeType === 1 ) {
+					if ( !isXML ) {
+						elem.sizcache = doneName;
+						elem.sizset = i;
+					}
+
+					if ( typeof cur !== "string" ) {
+						if ( elem === cur ) {
+							match = true;
+							break;
+						}
+
+					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
+						match = elem;
+						break;
+					}
+				}
+
+				elem = elem[dir];
+			}
+
+			checkSet[i] = match;
+		}
+	}
+}
+
+if ( document.documentElement.contains ) {
+	Sizzle.contains = function( a, b ) {
+		return a !== b && (a.contains ? a.contains(b) : true);
+	};
+
+} else if ( document.documentElement.compareDocumentPosition ) {
+	Sizzle.contains = function( a, b ) {
+		return !!(a.compareDocumentPosition(b) & 16);
+	};
+
+} else {
+	Sizzle.contains = function() {
+		return false;
+	};
+}
+
+Sizzle.isXML = function( elem ) {
+	// documentElement is verified for cases where it doesn't yet exist
+	// (such as loading iframes in IE - #4833) 
+	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
+
+	return documentElement ? documentElement.nodeName !== "HTML" : false;
+};
+
+var posProcess = function( selector, context ) {
+	var match,
+		tmpSet = [],
+		later = "",
+		root = context.nodeType ? [context] : context;
+
+	// Position selectors must be done after the filter
+	// And so must :not(positional) so we move all PSEUDOs to the end
+	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
+		later += match[0];
+		selector = selector.replace( Expr.match.PSEUDO, "" );
+	}
+
+	selector = Expr.relative[selector] ? selector + "*" : selector;
+
+	for ( var i = 0, l = root.length; i < l; i++ ) {
+		Sizzle( selector, root[i], tmpSet );
+	}
+
+	return Sizzle.filter( later, tmpSet );
+};
+
+// EXPOSE
+jQuery.find = Sizzle;
+jQuery.expr = Sizzle.selectors;
+jQuery.expr[":"] = jQuery.expr.filters;
+jQuery.unique = Sizzle.uniqueSort;
+jQuery.text = Sizzle.getText;
+jQuery.isXMLDoc = Sizzle.isXML;
+jQuery.contains = Sizzle.contains;
+
+
+})();
+
+
+var runtil = /Until$/,
+	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
+	// Note: This RegExp should be improved, or likely pulled from Sizzle
+	rmultiselector = /,/,
+	isSimple = /^.[^:#\[\.,]*$/,
+	slice = Array.prototype.slice,
+	POS = jQuery.expr.match.POS,
+	// methods guaranteed to produce a unique set when starting from a unique set
+	guaranteedUnique = {
+		children: true,
+		contents: true,
+		next: true,
+		prev: true
+	};
+
+jQuery.fn.extend({
+	find: function( selector ) {
+		var self = this,
+			i, l;
+
+		if ( typeof selector !== "string" ) {
+			return jQuery( selector ).filter(function() {
+				for ( i = 0, l = self.length; i < l; i++ ) {
+					if ( jQuery.contains( self[ i ], this ) ) {
+						return true;
+					}
+				}
+			});
+		}
+
+		var ret = this.pushStack( "", "find", selector ),
+			length, n, r;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			length = ret.length;
+			jQuery.find( selector, this[i], ret );
+
+			if ( i > 0 ) {
+				// Make sure that the results are unique
+				for ( n = length; n < ret.length; n++ ) {
+					for ( r = 0; r < length; r++ ) {
+						if ( ret[r] === ret[n] ) {
+							ret.splice(n--, 1);
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	has: function( target ) {
+		var targets = jQuery( target );
+		return this.filter(function() {
+			for ( var i = 0, l = targets.length; i < l; i++ ) {
+				if ( jQuery.contains( this, targets[i] ) ) {
+					return true;
+				}
+			}
+		});
+	},
+
+	not: function( selector ) {
+		return this.pushStack( winnow(this, selector, false), "not", selector);
+	},
+
+	filter: function( selector ) {
+		return this.pushStack( winnow(this, selector, true), "filter", selector );
+	},
+
+	is: function( selector ) {
+		return !!selector && ( typeof selector === "string" ?
+			jQuery.filter( selector, this ).length > 0 :
+			this.filter( selector ).length > 0 );
+	},
+
+	closest: function( selectors, context ) {
+		var ret = [], i, l, cur = this[0];
+		
+		// Array
+		if ( jQuery.isArray( selectors ) ) {
+			var match, selector,
+				matches = {},
+				level = 1;
+
+			if ( cur && selectors.length ) {
+				for ( i = 0, l = selectors.length; i < l; i++ ) {
+					selector = selectors[i];
+
+					if ( !matches[ selector ] ) {
+						matches[ selector ] = POS.test( selector ) ?
+							jQuery( selector, context || this.context ) :
+							selector;
+					}
+				}
+
+				while ( cur && cur.ownerDocument && cur !== context ) {
+					for ( selector in matches ) {
+						match = matches[ selector ];
+
+						if ( match.jquery ? match.index( cur ) > -1 : jQuery( cur ).is( match ) ) {
+							ret.push({ selector: selector, elem: cur, level: level });
+						}
+					}
+
+					cur = cur.parentNode;
+					level++;
+				}
+			}
+
+			return ret;
+		}
+
+		// String
+		var pos = POS.test( selectors ) || typeof selectors !== "string" ?
+				jQuery( selectors, context || this.context ) :
+				0;
+
+		for ( i = 0, l = this.length; i < l; i++ ) {
+			cur = this[i];
+
+			while ( cur ) {
+				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
+					ret.push( cur );
+					break;
+
+				} else {
+					cur = cur.parentNode;
+					if ( !cur || !cur.ownerDocument || cur === context || cur.nodeType === 11 ) {
+						break;
+					}
+				}
+			}
+		}
+
+		ret = ret.length > 1 ? jQuery.unique( ret ) : ret;
+
+		return this.pushStack( ret, "closest", selectors );
+	},
+
+	// Determine the position of an element within
+	// the matched set of elements
+	index: function( elem ) {
+		if ( !elem || typeof elem === "string" ) {
+			return jQuery.inArray( this[0],
+				// If it receives a string, the selector is used
+				// If it receives nothing, the siblings are used
+				elem ? jQuery( elem ) : this.parent().children() );
+		}
+		// Locate the position of the desired element
+		return jQuery.inArray(
+			// If it receives a jQuery object, the first element is used
+			elem.jquery ? elem[0] : elem, this );
+	},
+
+	add: function( selector, context ) {
+		var set = typeof selector === "string" ?
+				jQuery( selector, context ) :
+				jQuery.makeArray( selector && selector.nodeType ? [ selector ] : selector ),
+			all = jQuery.merge( this.get(), set );
+
+		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
+			all :
+			jQuery.unique( all ) );
+	},
+
+	andSelf: function() {
+		return this.add( this.prevObject );
+	}
+});
+
+// A painfully simple check to see if an element is disconnected
+// from a document (should be improved, where feasible).
+function isDisconnected( node ) {
+	return !node || !node.parentNode || node.parentNode.nodeType === 11;
+}
+
+jQuery.each({
+	parent: function( elem ) {
+		var parent = elem.parentNode;
+		return parent && parent.nodeType !== 11 ? parent : null;
+	},
+	parents: function( elem ) {
+		return jQuery.dir( elem, "parentNode" );
+	},
+	parentsUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "parentNode", until );
+	},
+	next: function( elem ) {
+		return jQuery.nth( elem, 2, "nextSibling" );
+	},
+	prev: function( elem ) {
+		return jQuery.nth( elem, 2, "previousSibling" );
+	},
+	nextAll: function( elem ) {
+		return jQuery.dir( elem, "nextSibling" );
+	},
+	prevAll: function( elem ) {
+		return jQuery.dir( elem, "previousSibling" );
+	},
+	nextUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "nextSibling", until );
+	},
+	prevUntil: function( elem, i, until ) {
+		return jQuery.dir( elem, "previousSibling", until );
+	},
+	siblings: function( elem ) {
+		return jQuery.sibling( elem.parentNode.firstChild, elem );
+	},
+	children: function( elem ) {
+		return jQuery.sibling( elem.firstChild );
+	},
+	contents: function( elem ) {
+		return jQuery.nodeName( elem, "iframe" ) ?
+			elem.contentDocument || elem.contentWindow.document :
+			jQuery.makeArray( elem.childNodes );
+	}
+}, function( name, fn ) {
+	jQuery.fn[ name ] = function( until, selector ) {
+		var ret = jQuery.map( this, fn, until ),
+			// The variable 'args' was introduced in
+			// https://github.com/jquery/jquery/commit/52a0238
+			// to work around a bug in Chrome 10 (Dev) and should be removed when the bug is fixed.
+			// http://code.google.com/p/v8/issues/detail?id=1050
+			args = slice.call(arguments);
+
+		if ( !runtil.test( name ) ) {
+			selector = until;
+		}
+
+		if ( selector && typeof selector === "string" ) {
+			ret = jQuery.filter( selector, ret );
+		}
+
+		ret = this.length > 1 && !guaranteedUnique[ name ] ? jQuery.unique( ret ) : ret;
+
+		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
+			ret = ret.reverse();
+		}
+
+		return this.pushStack( ret, name, args.join(",") );
+	};
+});
+
+jQuery.extend({
+	filter: function( expr, elems, not ) {
+		if ( not ) {
+			expr = ":not(" + expr + ")";
+		}
+
+		return elems.length === 1 ?
+			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
+			jQuery.find.matches(expr, elems);
+	},
+
+	dir: function( elem, dir, until ) {
+		var matched = [],
+			cur = elem[ dir ];
+
+		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
+			if ( cur.nodeType === 1 ) {
+				matched.push( cur );
+			}
+			cur = cur[dir];
+		}
+		return matched;
+	},
+
+	nth: function( cur, result, dir, elem ) {
+		result = result || 1;
+		var num = 0;
+
+		for ( ; cur; cur = cur[dir] ) {
+			if ( cur.nodeType === 1 && ++num === result ) {
+				break;
+			}
+		}
+
+		return cur;
+	},
+
+	sibling: function( n, elem ) {
+		var r = [];
+
+		for ( ; n; n = n.nextSibling ) {
+			if ( n.nodeType === 1 && n !== elem ) {
+				r.push( n );
+			}
+		}
+
+		return r;
+	}
+});
+
+// Implement the identical functionality for filter and not
+function winnow( elements, qualifier, keep ) {
+
+	// Can't pass null or undefined to indexOf in Firefox 4
+	// Set to 0 to skip string check
+	qualifier = qualifier || 0;
+
+	if ( jQuery.isFunction( qualifier ) ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			var retVal = !!qualifier.call( elem, i, elem );
+			return retVal === keep;
+		});
+
+	} else if ( qualifier.nodeType ) {
+		return jQuery.grep(elements, function( elem, i ) {
+			return (elem === qualifier) === keep;
+		});
+
+	} else if ( typeof qualifier === "string" ) {
+		var filtered = jQuery.grep(elements, function( elem ) {
+			return elem.nodeType === 1;
+		});
+
+		if ( isSimple.test( qualifier ) ) {
+			return jQuery.filter(qualifier, filtered, !keep);
+		} else {
+			qualifier = jQuery.filter( qualifier, filtered );
+		}
+	}
+
+	return jQuery.grep(elements, function( elem, i ) {
+		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
+	});
+}
+
+
+
+
+var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
+	rleadingWhitespace = /^\s+/,
+	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
+	rtagName = /<([\w:]+)/,
+	rtbody = /<tbody/i,
+	rhtml = /<|&#?\w+;/,
+	rnocache = /<(?:script|object|embed|option|style)/i,
+	// checked="checked" or checked
+	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
+	rscriptType = /\/(java|ecma)script/i,
+	rcleanScript = /^\s*<!(?:\[CDATA\[|\-\-)/,
+	wrapMap = {
+		option: [ 1, "<select multiple='multiple'>", "</select>" ],
+		legend: [ 1, "<fieldset>", "</fieldset>" ],
+		thead: [ 1, "<table>", "</table>" ],
+		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
+		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
+		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
+		area: [ 1, "<map>", "</map>" ],
+		_default: [ 0, "", "" ]
+	};
+
+wrapMap.optgroup = wrapMap.option;
+wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
+wrapMap.th = wrapMap.td;
+
+// IE can't serialize <link> and <script> tags normally
+if ( !jQuery.support.htmlSerialize ) {
+	wrapMap._default = [ 1, "div<div>", "</div>" ];
+}
+
+jQuery.fn.extend({
+	text: function( text ) {
+		if ( jQuery.isFunction(text) ) {
+			return this.each(function(i) {
+				var self = jQuery( this );
+
+				self.text( text.call(this, i, self.text()) );
+			});
+		}
+
+		if ( typeof text !== "object" && text !== undefined ) {
+			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
+		}
+
+		return jQuery.text( this );
+	},
+
+	wrapAll: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapAll( html.call(this, i) );
+			});
+		}
+
+		if ( this[0] ) {
+			// The elements to wrap the target around
+			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
+
+			if ( this[0].parentNode ) {
+				wrap.insertBefore( this[0] );
+			}
+
+			wrap.map(function() {
+				var elem = this;
+
+				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
+					elem = elem.firstChild;
+				}
+
+				return elem;
+			}).append( this );
+		}
+
+		return this;
+	},
+
+	wrapInner: function( html ) {
+		if ( jQuery.isFunction( html ) ) {
+			return this.each(function(i) {
+				jQuery(this).wrapInner( html.call(this, i) );
+			});
+		}
+
+		return this.each(function() {
+			var self = jQuery( this ),
+				contents = self.contents();
+
+			if ( contents.length ) {
+				contents.wrapAll( html );
+
+			} else {
+				self.append( html );
+			}
+		});
+	},
+
+	wrap: function( html ) {
+		return this.each(function() {
+			jQuery( this ).wrapAll( html );
+		});
+	},
+
+	unwrap: function() {
+		return this.parent().each(function() {
+			if ( !jQuery.nodeName( this, "body" ) ) {
+				jQuery( this ).replaceWith( this.childNodes );
+			}
+		}).end();
+	},
+
+	append: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.appendChild( elem );
+			}
+		});
+	},
+
+	prepend: function() {
+		return this.domManip(arguments, true, function( elem ) {
+			if ( this.nodeType === 1 ) {
+				this.insertBefore( elem, this.firstChild );
+			}
+		});
+	},
+
+	before: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this );
+			});
+		} else if ( arguments.length ) {
+			var set = jQuery(arguments[0]);
+			set.push.apply( set, this.toArray() );
+			return this.pushStack( set, "before", arguments );
+		}
+	},
+
+	after: function() {
+		if ( this[0] && this[0].parentNode ) {
+			return this.domManip(arguments, false, function( elem ) {
+				this.parentNode.insertBefore( elem, this.nextSibling );
+			});
+		} else if ( arguments.length ) {
+			var set = this.pushStack( this, "after", arguments );
+			set.push.apply( set, jQuery(arguments[0]).toArray() );
+			return set;
+		}
+	},
+
+	// keepData is for internal use only--do not document
+	remove: function( selector, keepData ) {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
+				if ( !keepData && elem.nodeType === 1 ) {
+					jQuery.cleanData( elem.getElementsByTagName("*") );
+					jQuery.cleanData( [ elem ] );
+				}
+
+				if ( elem.parentNode ) {
+					elem.parentNode.removeChild( elem );
+				}
+			}
+		}
+
+		return this;
+	},
+
+	empty: function() {
+		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
+			// Remove element nodes and prevent memory leaks
+			if ( elem.nodeType === 1 ) {
+				jQuery.cleanData( elem.getElementsByTagName("*") );
+			}
+
+			// Remove any remaining nodes
+			while ( elem.firstChild ) {
+				elem.removeChild( elem.firstChild );
+			}
+		}
+
+		return this;
+	},
+
+	clone: function( dataAndEvents, deepDataAndEvents ) {
+		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
+		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
+
+		return this.map( function () {
+			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
+		});
+	},
+
+	html: function( value ) {
+		if ( value === undefined ) {
+			return this[0] && this[0].nodeType === 1 ?
+				this[0].innerHTML.replace(rinlinejQuery, "") :
+				null;
+
+		// See if we can take a shortcut and just use innerHTML
+		} else if ( typeof value === "string" && !rnocache.test( value ) &&
+			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
+			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
+
+			value = value.replace(rxhtmlTag, "<$1></$2>");
+
+			try {
+				for ( var i = 0, l = this.length; i < l; i++ ) {
+					// Remove element nodes and prevent memory leaks
+					if ( this[i].nodeType === 1 ) {
+						jQuery.cleanData( this[i].getElementsByTagName("*") );
+						this[i].innerHTML = value;
+					}
+				}
+
+			// If using innerHTML throws an exception, use the fallback method
+			} catch(e) {
+				this.empty().append( value );
+			}
+
+		} else if ( jQuery.isFunction( value ) ) {
+			this.each(function(i){
+				var self = jQuery( this );
+
+				self.html( value.call(this, i, self.html()) );
+			});
+
+		} else {
+			this.empty().append( value );
+		}
+
+		return this;
+	},
+
+	replaceWith: function( value ) {
+		if ( this[0] && this[0].parentNode ) {
+			// Make sure that the elements are removed from the DOM before they are inserted
+			// this can help fix replacing a parent with child elements
+			if ( jQuery.isFunction( value ) ) {
+				return this.each(function(i) {
+					var self = jQuery(this), old = self.html();
+					self.replaceWith( value.call( this, i, old ) );
+				});
+			}
+
+			if ( typeof value !== "string" ) {
+				value = jQuery( value ).detach();
+			}
+
+			return this.each(function() {
+				var next = this.nextSibling,
+					parent = this.parentNode;
+
+				jQuery( this ).remove();
+
+				if ( next ) {
+					jQuery(next).before( value );
+				} else {
+					jQuery(parent).append( value );
+				}
+			});
+		} else {
+			return this.length ?
+				this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value ) :
+				this;
+		}
+	},
+
+	detach: function( selector ) {
+		return this.remove( selector, true );
+	},
+
+	domManip: function( args, table, callback ) {
+		var results, first, fragment, parent,
+			value = args[0],
+			scripts = [];
+
+		// We can't cloneNode fragments that contain checked, in WebKit
+		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
+			return this.each(function() {
+				jQuery(this).domManip( args, table, callback, true );
+			});
+		}
+
+		if ( jQuery.isFunction(value) ) {
+			return this.each(function(i) {
+				var self = jQuery(this);
+				args[0] = value.call(this, i, table ? self.html() : undefined);
+				self.domManip( args, table, callback );
+			});
+		}
+
+		if ( this[0] ) {
+			parent = value && value.parentNode;
+
+			// If we're in a fragment, just use that instead of building a new one
+			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
+				results = { fragment: parent };
+
+			} else {
+				results = jQuery.buildFragment( args, this, scripts );
+			}
+
+			fragment = results.fragment;
+
+			if ( fragment.childNodes.length === 1 ) {
+				first = fragment = fragment.firstChild;
+			} else {
+				first = fragment.firstChild;
+			}
+
+			if ( first ) {
+				table = table && jQuery.nodeName( first, "tr" );
+
+				for ( var i = 0, l = this.length, lastIndex = l - 1; i < l; i++ ) {
+					callback.call(
+						table ?
+							root(this[i], first) :
+							this[i],
+						// Make sure that we do not leak memory by inadvertently discarding
+						// the original fragment (which might have attached data) instead of
+						// using it; in addition, use the original fragment object for the last
+						// item instead of first because it can end up being emptied incorrectly
+						// in certain situations (Bug #8070).
+						// Fragments from the fragment cache must always be cloned and never used
+						// in place.
+						results.cacheable || (l > 1 && i < lastIndex) ?
+							jQuery.clone( fragment, true, true ) :
+							fragment
+					);
+				}
+			}
+
+			if ( scripts.length ) {
+				jQuery.each( scripts, evalScript );
+			}
+		}
+
+		return this;
+	}
+});
+
+function root( elem, cur ) {
+	return jQuery.nodeName(elem, "table") ?
+		(elem.getElementsByTagName("tbody")[0] ||
+		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
+		elem;
+}
+
+function cloneCopyEvent( src, dest ) {
+
+	if ( dest.nodeType !== 1 || !jQuery.hasData( src ) ) {
+		return;
+	}
+
+	var internalKey = jQuery.expando,
+		oldData = jQuery.data( src ),
+		curData = jQuery.data( dest, oldData );
+
+	// Switch to use the internal data object, if it exists, for the next
+	// stage of data copying
+	if ( (oldData = oldData[ internalKey ]) ) {
+		var events = oldData.events;
+				curData = curData[ internalKey ] = jQuery.extend({}, oldData);
+
+		if ( events ) {
+			delete curData.handle;
+			curData.events = {};
+
+			for ( var type in events ) {
+				for ( var i = 0, l = events[ type ].length; i < l; i++ ) {
+					jQuery.event.add( dest, type + ( events[ type ][ i ].namespace ? "." : "" ) + events[ type ][ i ].namespace, events[ type ][ i ], events[ type ][ i ].data );
+				}
+			}
+		}
+	}
+}
+
+function cloneFixAttributes( src, dest ) {
+	var nodeName;
+
+	// We do not need to do anything for non-Elements
+	if ( dest.nodeType !== 1 ) {
+		return;
+	}
+
+	// clearAttributes removes the attributes, which we don't want,
+	// but also removes the attachEvent events, which we *do* want
+	if ( dest.clearAttributes ) {
+		dest.clearAttributes();
+	}
+
+	// mergeAttributes, in contrast, only merges back on the
+	// original attributes, not the events
+	if ( dest.mergeAttributes ) {
+		dest.mergeAttributes( src );
+	}
+
+	nodeName = dest.nodeName.toLowerCase();
+
+	// IE6-8 fail to clone children inside object elements that use
+	// the proprietary classid attribute value (rather than the type
+	// attribute) to identify the type of content to display
+	if ( nodeName === "object" ) {
+		dest.outerHTML = src.outerHTML;
+
+	} else if ( nodeName === "input" && (src.type === "checkbox" || src.type === "radio") ) {
+		// IE6-8 fails to persist the checked state of a cloned checkbox
+		// or radio button. Worse, IE6-7 fail to give the cloned element
+		// a checked appearance if the defaultChecked value isn't also set
+		if ( src.checked ) {
+			dest.defaultChecked = dest.checked = src.checked;
+		}
+
+		// IE6-7 get confused and end up setting the value of a cloned
+		// checkbox/radio button to an empty string instead of "on"
+		if ( dest.value !== src.value ) {
+			dest.value = src.value;
+		}
+
+	// IE6-8 fails to return the selected option to the default selected
+	// state when cloning options
+	} else if ( nodeName === "option" ) {
+		dest.selected = src.defaultSelected;
+
+	// IE6-8 fails to set the defaultValue to the correct value when
+	// cloning other types of input fields
+	} else if ( nodeName === "input" || nodeName === "textarea" ) {
+		dest.defaultValue = src.defaultValue;
+	}
+
+	// Event data gets referenced instead of copied if the expando
+	// gets copied too
+	dest.removeAttribute( jQuery.expando );
+}
+
+jQuery.buildFragment = function( args, nodes, scripts ) {
+	var fragment, cacheable, cacheresults, doc;
+
+  // nodes may contain either an explicit document object,
+  // a jQuery collection or context object.
+  // If nodes[0] contains a valid object to assign to doc
+  if ( nodes && nodes[0] ) {
+    doc = nodes[0].ownerDocument || nodes[0];
+  }
+
+  // Ensure that an attr object doesn't incorrectly stand in as a document object
+	// Chrome and Firefox seem to allow this to occur and will throw exception
+	// Fixes #8950
+	if ( !doc.createDocumentFragment ) {
+		doc = document;
+	}
+
+	// Only cache "small" (1/2 KB) HTML strings that are associated with the main document
+	// Cloning options loses the selected state, so don't cache them
+	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
+	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
+	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
+		args[0].charAt(0) === "<" && !rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
+
+		cacheable = true;
+
+		cacheresults = jQuery.fragments[ args[0] ];
+		if ( cacheresults && cacheresults !== 1 ) {
+			fragment = cacheresults;
+		}
+	}
+
+	if ( !fragment ) {
+		fragment = doc.createDocumentFragment();
+		jQuery.clean( args, doc, fragment, scripts );
+	}
+
+	if ( cacheable ) {
+		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
+	}
+
+	return { fragment: fragment, cacheable: cacheable };
+};
+
+jQuery.fragments = {};
+
+jQuery.each({
+	appendTo: "append",
+	prependTo: "prepend",
+	insertBefore: "before",
+	insertAfter: "after",
+	replaceAll: "replaceWith"
+}, function( name, original ) {
+	jQuery.fn[ name ] = function( selector ) {
+		var ret = [],
+			insert = jQuery( selector ),
+			parent = this.length === 1 && this[0].parentNode;
+
+		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
+			insert[ original ]( this[0] );
+			return this;
+
+		} else {
+			for ( var i = 0, l = insert.length; i < l; i++ ) {
+				var elems = (i > 0 ? this.clone(true) : this).get();
+				jQuery( insert[i] )[ original ]( elems );
+				ret = ret.concat( elems );
+			}
+
+			return this.pushStack( ret, name, insert.selector );
+		}
+	};
+});
+
+function getAll( elem ) {
+	if ( "getElementsByTagName" in elem ) {
+		return elem.getElementsByTagName( "*" );
+
+	} else if ( "querySelectorAll" in elem ) {
+		return elem.querySelectorAll( "*" );
+
+	} else {
+		return [];
+	}
+}
+
+// Used in clean, fixes the defaultChecked property
+function fixDefaultChecked( elem ) {
+	if ( elem.type === "checkbox" || elem.type === "radio" ) {
+		elem.defaultChecked = elem.checked;
+	}
+}
+// Finds all inputs and passes them to fixDefaultChecked
+function findInputs( elem ) {
+	if ( jQuery.nodeName( elem, "input" ) ) {
+		fixDefaultChecked( elem );
+	} else if ( "getElementsByTagName" in elem ) {
+		jQuery.grep( elem.getElementsByTagName("input"), fixDefaultChecked );
+	}
+}
+
+jQuery.extend({
+	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
+		var clone = elem.cloneNode(true),
+				srcElements,
+				destElements,
+				i;
+
+		if ( (!jQuery.support.noCloneEvent || !jQuery.support.noCloneChecked) &&
+				(elem.nodeType === 1 || elem.nodeType === 11) && !jQuery.isXMLDoc(elem) ) {
+			// IE copies events bound via attachEvent when using cloneNode.
+			// Calling detachEvent on the clone will also remove the events
+			// from the original. In order to get around this, we use some
+			// proprietary methods to clear the events. Thanks to MooTools
+			// guys for this hotness.
+
+			cloneFixAttributes( elem, clone );
+
+			// Using Sizzle here is crazy slow, so we use getElementsByTagName
+			// instead
+			srcElements = getAll( elem );
+			destElements = getAll( clone );
+
+			// Weird iteration because IE will replace the length property
+			// with an element if you are cloning the body and one of the
+			// elements on the page has a name or id of "length"
+			for ( i = 0; srcElements[i]; ++i ) {
+				cloneFixAttributes( srcElements[i], destElements[i] );
+			}
+		}
+
+		// Copy the events from the original to the clone
+		if ( dataAndEvents ) {
+			cloneCopyEvent( elem, clone );
+
+			if ( deepDataAndEvents ) {
+				srcElements = getAll( elem );
+				destElements = getAll( clone );
+
+				for ( i = 0; srcElements[i]; ++i ) {
+					cloneCopyEvent( srcElements[i], destElements[i] );
+				}
+			}
+		}
+
+		srcElements = destElements = null;
+
+		// Return the cloned set
+		return clone;
+	},
+
+	clean: function( elems, context, fragment, scripts ) {
+		var checkScriptType;
+
+		context = context || document;
+
+		// !context.createElement fails in IE with an error but returns typeof 'object'
+		if ( typeof context.createElement === "undefined" ) {
+			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
+		}
+
+		var ret = [], j;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( typeof elem === "number" ) {
+				elem += "";
+			}
+
+			if ( !elem ) {
+				continue;
+			}
+
+			// Convert html string into DOM nodes
+			if ( typeof elem === "string" ) {
+				if ( !rhtml.test( elem ) ) {
+					elem = context.createTextNode( elem );
+				} else {
+					// Fix "XHTML"-style tags in all browsers
+					elem = elem.replace(rxhtmlTag, "<$1></$2>");
+
+					// Trim whitespace, otherwise indexOf won't work as expected
+					var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
+						wrap = wrapMap[ tag ] || wrapMap._default,
+						depth = wrap[0],
+						div = context.createElement("div");
+
+					// Go to html and back, then peel off extra wrappers
+					div.innerHTML = wrap[1] + elem + wrap[2];
+
+					// Move to the right depth
+					while ( depth-- ) {
+						div = div.lastChild;
+					}
+
+					// Remove IE's autoinserted <tbody> from table fragments
+					if ( !jQuery.support.tbody ) {
+
+						// String was a <table>, *may* have spurious <tbody>
+						var hasBody = rtbody.test(elem),
+							tbody = tag === "table" && !hasBody ?
+								div.firstChild && div.firstChild.childNodes :
+
+								// String was a bare <thead> or <tfoot>
+								wrap[1] === "<table>" && !hasBody ?
+									div.childNodes :
+									[];
+
+						for ( j = tbody.length - 1; j >= 0 ; --j ) {
+							if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
+								tbody[ j ].parentNode.removeChild( tbody[ j ] );
+							}
+						}
+					}
+
+					// IE completely kills leading whitespace when innerHTML is used
+					if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
+						div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
+					}
+
+					elem = div.childNodes;
+				}
+			}
+
+			// Resets defaultChecked for any radios and checkboxes
+			// about to be appended to the DOM in IE 6/7 (#8060)
+			var len;
+			if ( !jQuery.support.appendChecked ) {
+				if ( elem[0] && typeof (len = elem.length) === "number" ) {
+					for ( j = 0; j < len; j++ ) {
+						findInputs( elem[j] );
+					}
+				} else {
+					findInputs( elem );
+				}
+			}
+
+			if ( elem.nodeType ) {
+				ret.push( elem );
+			} else {
+				ret = jQuery.merge( ret, elem );
+			}
+		}
+
+		if ( fragment ) {
+			checkScriptType = function( elem ) {
+				return !elem.type || rscriptType.test( elem.type );
+			};
+			for ( i = 0; ret[i]; i++ ) {
+				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
+					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
+
+				} else {
+					if ( ret[i].nodeType === 1 ) {
+						var jsTags = jQuery.grep( ret[i].getElementsByTagName( "script" ), checkScriptType );
+
+						ret.splice.apply( ret, [i + 1, 0].concat( jsTags ) );
+					}
+					fragment.appendChild( ret[i] );
+				}
+			}
+		}
+
+		return ret;
+	},
+
+	cleanData: function( elems ) {
+		var data, id, cache = jQuery.cache, internalKey = jQuery.expando, special = jQuery.event.special,
+			deleteExpando = jQuery.support.deleteExpando;
+
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
+				continue;
+			}
+
+			id = elem[ jQuery.expando ];
+
+			if ( id ) {
+				data = cache[ id ] && cache[ id ][ internalKey ];
+
+				if ( data && data.events ) {
+					for ( var type in data.events ) {
+						if ( special[ type ] ) {
+							jQuery.event.remove( elem, type );
+
+						// This is a shortcut to avoid jQuery.event.remove's overhead
+						} else {
+							jQuery.removeEvent( elem, type, data.handle );
+						}
+					}
+
+					// Null the DOM reference to avoid IE6/7/8 leak (#7054)
+					if ( data.handle ) {
+						data.handle.elem = null;
+					}
+				}
+
+				if ( deleteExpando ) {
+					delete elem[ jQuery.expando ];
+
+				} else if ( elem.removeAttribute ) {
+					elem.removeAttribute( jQuery.expando );
+				}
+
+				delete cache[ id ];
+			}
+		}
+	}
+});
+
+function evalScript( i, elem ) {
+	if ( elem.src ) {
+		jQuery.ajax({
+			url: elem.src,
+			async: false,
+			dataType: "script"
+		});
+	} else {
+		jQuery.globalEval( ( elem.text || elem.textContent || elem.innerHTML || "" ).replace( rcleanScript, "/*$0*/" ) );
+	}
+
+	if ( elem.parentNode ) {
+		elem.parentNode.removeChild( elem );
+	}
+}
+
+
+
+var ralpha = /alpha\([^)]*\)/i,
+	ropacity = /opacity=([^)]*)/,
+	// fixed for IE9, see #8346
+	rupper = /([A-Z]|^ms)/g,
+	rnumpx = /^-?\d+(?:px)?$/i,
+	rnum = /^-?\d/,
+	rrelNum = /^[+\-]=/,
+	rrelNumFilter = /[^+\-\.\de]+/g,
+
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssWidth = [ "Left", "Right" ],
+	cssHeight = [ "Top", "Bottom" ],
+	curCSS,
+
+	getComputedStyle,
+	currentStyle;
+
+jQuery.fn.css = function( name, value ) {
+	// Setting 'undefined' is a no-op
+	if ( arguments.length === 2 && value === undefined ) {
+		return this;
+	}
+
+	return jQuery.access( this, name, value, true, function( elem, name, value ) {
+		return value !== undefined ?
+			jQuery.style( elem, name, value ) :
+			jQuery.css( elem, name );
+	});
+};
+
+jQuery.extend({
+	// Add in style property hooks for overriding the default
+	// behavior of getting and setting a style property
+	cssHooks: {
+		opacity: {
+			get: function( elem, computed ) {
+				if ( computed ) {
+					// We should always get a number back from opacity
+					var ret = curCSS( elem, "opacity", "opacity" );
+					return ret === "" ? "1" : ret;
+
+				} else {
+					return elem.style.opacity;
+				}
+			}
+		}
+	},
+
+	// Exclude the following css properties to add px
+	cssNumber: {
+		"fillOpacity": true,
+		"fontWeight": true,
+		"lineHeight": true,
+		"opacity": true,
+		"orphans": true,
+		"widows": true,
+		"zIndex": true,
+		"zoom": true
+	},
+
+	// Add in properties whose names you wish to fix before
+	// setting or getting the value
+	cssProps: {
+		// normalize float css property
+		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
+	},
+
+	// Get and set the style property on a DOM Node
+	style: function( elem, name, value, extra ) {
+		// Don't set styles on text and comment nodes
+		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
+			return;
+		}
+
+		// Make sure that we're working with the right name
+		var ret, type, origName = jQuery.camelCase( name ),
+			style = elem.style, hooks = jQuery.cssHooks[ origName ];
+
+		name = jQuery.cssProps[ origName ] || origName;
+
+		// Check if we're setting a value
+		if ( value !== undefined ) {
+			type = typeof value;
+
+			// Make sure that NaN and null values aren't set. See: #7116
+			if ( type === "number" && isNaN( value ) || value == null ) {
+				return;
+			}
+
+			// convert relative number strings (+= or -=) to relative numbers. #7345
+			if ( type === "string" && rrelNum.test( value ) ) {
+				value = +value.replace( rrelNumFilter, "" ) + parseFloat( jQuery.css( elem, name ) );
+				// Fixes bug #9237
+				type = "number";
+			}
+
+			// If a number was passed in, add 'px' to the (except for certain CSS properties)
+			if ( type === "number" && !jQuery.cssNumber[ origName ] ) {
+				value += "px";
+			}
+
+			// If a hook was provided, use that value, otherwise just set the specified value
+			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
+				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
+				// Fixes bug #5509
+				try {
+					style[ name ] = value;
+				} catch(e) {}
+			}
+
+		} else {
+			// If a hook was provided get the non-computed value from there
+			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
+				return ret;
+			}
+
+			// Otherwise just get the value from the style object
+			return style[ name ];
+		}
+	},
+
+	css: function( elem, name, extra ) {
+		var ret, hooks;
+
+		// Make sure that we're working with the right name
+		name = jQuery.camelCase( name );
+		hooks = jQuery.cssHooks[ name ];
+		name = jQuery.cssProps[ name ] || name;
+
+		// cssFloat needs a special treatment
+		if ( name === "cssFloat" ) {
+			name = "float";
+		}
+
+		// If a hook was provided get the computed value from there
+		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
+			return ret;
+
+		// Otherwise, if a way to get the computed value exists, use that
+		} else if ( curCSS ) {
+			return curCSS( elem, name );
+		}
+	},
+
+	// A method for quickly swapping in/out CSS properties to get correct calculations
+	swap: function( elem, options, callback ) {
+		var old = {};
+
+		// Remember the old values, and insert the new ones
+		for ( var name in options ) {
+			old[ name ] = elem.style[ name ];
+			elem.style[ name ] = options[ name ];
+		}
+
+		callback.call( elem );
+
+		// Revert the old values
+		for ( name in options ) {
+			elem.style[ name ] = old[ name ];
+		}
+	}
+});
+
+// DEPRECATED, Use jQuery.css() instead
+jQuery.curCSS = jQuery.css;
+
+jQuery.each(["height", "width"], function( i, name ) {
+	jQuery.cssHooks[ name ] = {
+		get: function( elem, computed, extra ) {
+			var val;
+
+			if ( computed ) {
+				if ( elem.offsetWidth !== 0 ) {
+					return getWH( elem, name, extra );
+				} else {
+					jQuery.swap( elem, cssShow, function() {
+						val = getWH( elem, name, extra );
+					});
+				}
+
+				return val;
+			}
+		},
+
+		set: function( elem, value ) {
+			if ( rnumpx.test( value ) ) {
+				// ignore negative width and height values #1599
+				value = parseFloat( value );
+
+				if ( value >= 0 ) {
+					return value + "px";
+				}
+
+			} else {
+				return value;
+			}
+		}
+	};
+});
+
+if ( !jQuery.support.opacity ) {
+	jQuery.cssHooks.opacity = {
+		get: function( elem, computed ) {
+			// IE uses filters for opacity
+			return ropacity.test( (computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "" ) ?
+				( parseFloat( RegExp.$1 ) / 100 ) + "" :
+				computed ? "1" : "";
+		},
+
+		set: function( elem, value ) {
+			var style = elem.style,
+				currentStyle = elem.currentStyle;
+
+			// IE has trouble with opacity if it does not have layout
+			// Force it by setting the zoom level
+			style.zoom = 1;
+
+			// Set the alpha filter to set the opacity
+			var opacity = jQuery.isNaN( value ) ?
+				"" :
+				"alpha(opacity=" + value * 100 + ")",
+				filter = currentStyle && currentStyle.filter || style.filter || "";
+
+			style.filter = ralpha.test( filter ) ?
+				filter.replace( ralpha, opacity ) :
+				filter + " " + opacity;
+		}
+	};
+}
+
+jQuery(function() {
+	// This hook cannot be added until DOM ready because the support test
+	// for it is not run until after DOM ready
+	if ( !jQuery.support.reliableMarginRight ) {
+		jQuery.cssHooks.marginRight = {
+			get: function( elem, computed ) {
+				// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
+				// Work around by temporarily setting element display to inline-block
+				var ret;
+				jQuery.swap( elem, { "display": "inline-block" }, function() {
+					if ( computed ) {
+						ret = curCSS( elem, "margin-right", "marginRight" );
+					} else {
+						ret = elem.style.marginRight;
+					}
+				});
+				return ret;
+			}
+		};
+	}
+});
+
+if ( document.defaultView && document.defaultView.getComputedStyle ) {
+	getComputedStyle = function( elem, name ) {
+		var ret, defaultView, computedStyle;
+
+		name = name.replace( rupper, "-$1" ).toLowerCase();
+
+		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
+			return undefined;
+		}
+
+		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
+			ret = computedStyle.getPropertyValue( name );
+			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
+				ret = jQuery.style( elem, name );
+			}
+		}
+
+		return ret;
+	};
+}
+
+if ( document.documentElement.currentStyle ) {
+	currentStyle = function( elem, name ) {
+		var left,
+			ret = elem.currentStyle && elem.currentStyle[ name ],
+			rsLeft = elem.runtimeStyle && elem.runtimeStyle[ name ],
+			style = elem.style;
+
+		// From the awesome hack by Dean Edwards
+		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
+
+		// If we're not dealing with a regular pixel number
+		// but a number that has a weird ending, we need to convert it to pixels
+		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
+			// Remember the original values
+			left = style.left;
+
+			// Put in the new values to get a computed value out
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = elem.currentStyle.left;
+			}
+			style.left = name === "fontSize" ? "1em" : (ret || 0);
+			ret = style.pixelLeft + "px";
+
+			// Revert the changed values
+			style.left = left;
+			if ( rsLeft ) {
+				elem.runtimeStyle.left = rsLeft;
+			}
+		}
+
+		return ret === "" ? "auto" : ret;
+	};
+}
+
+curCSS = getComputedStyle || currentStyle;
+
+function getWH( elem, name, extra ) {
+
+	// Start with offset property
+	var val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
+		which = name === "width" ? cssWidth : cssHeight;
+
+	if ( val > 0 ) {
+		if ( extra !== "border" ) {
+			jQuery.each( which, function() {
+				if ( !extra ) {
+					val -= parseFloat( jQuery.css( elem, "padding" + this ) ) || 0;
+				}
+				if ( extra === "margin" ) {
+					val += parseFloat( jQuery.css( elem, extra + this ) ) || 0;
+				} else {
+					val -= parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0;
+				}
+			});
+		}
+
+		return val + "px";
+	}
+
+	// Fall back to computed then uncomputed css if necessary
+	val = curCSS( elem, name, name );
+	if ( val < 0 || val == null ) {
+		val = elem.style[ name ] || 0;
+	}
+	// Normalize "", auto, and prepare for extra
+	val = parseFloat( val ) || 0;
+
+	// Add padding, border, margin
+	if ( extra ) {
+		jQuery.each( which, function() {
+			val += parseFloat( jQuery.css( elem, "padding" + this ) ) || 0;
+			if ( extra !== "padding" ) {
+				val += parseFloat( jQuery.css( elem, "border" + this + "Width" ) ) || 0;
+			}
+			if ( extra === "margin" ) {
+				val += parseFloat( jQuery.css( elem, extra + this ) ) || 0;
+			}
+		});
+	}
+
+	return val + "px";
+}
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.hidden = function( elem ) {
+		var width = elem.offsetWidth,
+			height = elem.offsetHeight;
+
+		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
+	};
+
+	jQuery.expr.filters.visible = function( elem ) {
+		return !jQuery.expr.filters.hidden( elem );
+	};
+}
+
+
+
+
+var r20 = /%20/g,
+	rbracket = /\[\]$/,
+	rCRLF = /\r?\n/g,
+	rhash = /#.*$/,
+	rheaders = /^(.*?):[ \t]*([^\r\n]*)\r?$/mg, // IE leaves an \r character at EOL
+	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
+	// #7653, #8125, #8152: local protocol detection
+	rlocalProtocol = /^(?:about|app|app\-storage|.+\-extension|file|widget):$/,
+	rnoContent = /^(?:GET|HEAD)$/,
+	rprotocol = /^\/\//,
+	rquery = /\?/,
+	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
+	rselectTextarea = /^(?:select|textarea)/i,
+	rspacesAjax = /\s+/,
+	rts = /([?&])_=[^&]*/,
+	rurl = /^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,
+
+	// Keep a copy of the old load method
+	_load = jQuery.fn.load,
+
+	/* Prefilters
+	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
+	 * 2) These are called:
+	 *    - BEFORE asking for a transport
+	 *    - AFTER param serialization (s.data is a string if s.processData is true)
+	 * 3) key is the dataType
+	 * 4) the catchall symbol "*" can be used
+	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
+	 */
+	prefilters = {},
+
+	/* Transports bindings
+	 * 1) key is the dataType
+	 * 2) the catchall symbol "*" can be used
+	 * 3) selection will start with transport dataType and THEN go to "*" if needed
+	 */
+	transports = {},
+
+	// Document location
+	ajaxLocation,
+
+	// Document location segments
+	ajaxLocParts;
+
+// #8138, IE may throw an exception when accessing
+// a field from window.location if document.domain has been set
+try {
+	ajaxLocation = location.href;
+} catch( e ) {
+	// Use the href attribute of an A element
+	// since IE will modify it given document.location
+	ajaxLocation = document.createElement( "a" );
+	ajaxLocation.href = "";
+	ajaxLocation = ajaxLocation.href;
+}
+
+// Segment location into parts
+ajaxLocParts = rurl.exec( ajaxLocation.toLowerCase() ) || [];
+
+// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
+function addToPrefiltersOrTransports( structure ) {
+
+	// dataTypeExpression is optional and defaults to "*"
+	return function( dataTypeExpression, func ) {
+
+		if ( typeof dataTypeExpression !== "string" ) {
+			func = dataTypeExpression;
+			dataTypeExpression = "*";
+		}
+
+		if ( jQuery.isFunction( func ) ) {
+			var dataTypes = dataTypeExpression.toLowerCase().split( rspacesAjax ),
+				i = 0,
+				length = dataTypes.length,
+				dataType,
+				list,
+				placeBefore;
+
+			// For each dataType in the dataTypeExpression
+			for(; i < length; i++ ) {
+				dataType = dataTypes[ i ];
+				// We control if we're asked to add before
+				// any existing element
+				placeBefore = /^\+/.test( dataType );
+				if ( placeBefore ) {
+					dataType = dataType.substr( 1 ) || "*";
+				}
+				list = structure[ dataType ] = structure[ dataType ] || [];
+				// then we add to the structure accordingly
+				list[ placeBefore ? "unshift" : "push" ]( func );
+			}
+		}
+	};
+}
+
+// Base inspection function for prefilters and transports
+function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR,
+		dataType /* internal */, inspected /* internal */ ) {
+
+	dataType = dataType || options.dataTypes[ 0 ];
+	inspected = inspected || {};
+
+	inspected[ dataType ] = true;
+
+	var list = structure[ dataType ],
+		i = 0,
+		length = list ? list.length : 0,
+		executeOnly = ( structure === prefilters ),
+		selection;
+
+	for(; i < length && ( executeOnly || !selection ); i++ ) {
+		selection = list[ i ]( options, originalOptions, jqXHR );
+		// If we got redirected to another dataType
+		// we try there if executing only and not done already
+		if ( typeof selection === "string" ) {
+			if ( !executeOnly || inspected[ selection ] ) {
+				selection = undefined;
+			} else {
+				options.dataTypes.unshift( selection );
+				selection = inspectPrefiltersOrTransports(
+						structure, options, originalOptions, jqXHR, selection, inspected );
+			}
+		}
+	}
+	// If we're only executing or nothing was selected
+	// we try the catchall dataType if not done already
+	if ( ( executeOnly || !selection ) && !inspected[ "*" ] ) {
+		selection = inspectPrefiltersOrTransports(
+				structure, options, originalOptions, jqXHR, "*", inspected );
+	}
+	// unnecessary when only executing (prefilters)
+	// but it'll be ignored by the caller in that case
+	return selection;
+}
+
+jQuery.fn.extend({
+	load: function( url, params, callback ) {
+		if ( typeof url !== "string" && _load ) {
+			return _load.apply( this, arguments );
+
+		// Don't do a request if no elements are being requested
+		} else if ( !this.length ) {
+			return this;
+		}
+
+		var off = url.indexOf( " " );
+		if ( off >= 0 ) {
+			var selector = url.slice( off, url.length );
+			url = url.slice( 0, off );
+		}
+
+		// Default to a GET request
+		var type = "GET";
+
+		// If the second parameter was provided
+		if ( params ) {
+			// If it's a function
+			if ( jQuery.isFunction( params ) ) {
+				// We assume that it's the callback
+				callback = params;
+				params = undefined;
+
+			// Otherwise, build a param string
+			} else if ( typeof params === "object" ) {
+				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
+				type = "POST";
+			}
+		}
+
+		var self = this;
+
+		// Request the remote document
+		jQuery.ajax({
+			url: url,
+			type: type,
+			dataType: "html",
+			data: params,
+			// Complete callback (responseText is used internally)
+			complete: function( jqXHR, status, responseText ) {
+				// Store the response as specified by the jqXHR object
+				responseText = jqXHR.responseText;
+				// If successful, inject the HTML into all the matched elements
+				if ( jqXHR.isResolved() ) {
+					// #4825: Get the actual response in case
+					// a dataFilter is present in ajaxSettings
+					jqXHR.done(function( r ) {
+						responseText = r;
+					});
+					// See if a selector was specified
+					self.html( selector ?
+						// Create a dummy div to hold the results
+						jQuery("<div>")
+							// inject the contents of the document in, removing the scripts
+							// to avoid any 'Permission Denied' errors in IE
+							.append(responseText.replace(rscript, ""))
+
+							// Locate the specified elements
+							.find(selector) :
+
+						// If not, just inject the full result
+						responseText );
+				}
+
+				if ( callback ) {
+					self.each( callback, [ responseText, status, jqXHR ] );
+				}
+			}
+		});
+
+		return this;
+	},
+
+	serialize: function() {
+		return jQuery.param( this.serializeArray() );
+	},
+
+	serializeArray: function() {
+		return this.map(function(){
+			return this.elements ? jQuery.makeArray( this.elements ) : this;
+		})
+		.filter(function(){
+			return this.name && !this.disabled &&
+				( this.checked || rselectTextarea.test( this.nodeName ) ||
+					rinput.test( this.type ) );
+		})
+		.map(function( i, elem ){
+			var val = jQuery( this ).val();
+
+			return val == null ?
+				null :
+				jQuery.isArray( val ) ?
+					jQuery.map( val, function( val, i ){
+						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+					}) :
+					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
+		}).get();
+	}
+});
+
+// Attach a bunch of functions for handling common AJAX events
+jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split( " " ), function( i, o ){
+	jQuery.fn[ o ] = function( f ){
+		return this.bind( o, f );
+	};
+});
+
+jQuery.each( [ "get", "post" ], function( i, method ) {
+	jQuery[ method ] = function( url, data, callback, type ) {
+		// shift arguments if data argument was omitted
+		if ( jQuery.isFunction( data ) ) {
+			type = type || callback;
+			callback = data;
+			data = undefined;
+		}
+
+		return jQuery.ajax({
+			type: method,
+			url: url,
+			data: data,
+			success: callback,
+			dataType: type
+		});
+	};
+});
+
+jQuery.extend({
+
+	getScript: function( url, callback ) {
+		return jQuery.get( url, undefined, callback, "script" );
+	},
+
+	getJSON: function( url, data, callback ) {
+		return jQuery.get( url, data, callback, "json" );
+	},
+
+	// Creates a full fledged settings object into target
+	// with both ajaxSettings and settings fields.
+	// If target is omitted, writes into ajaxSettings.
+	ajaxSetup: function ( target, settings ) {
+		if ( !settings ) {
+			// Only one parameter, we extend ajaxSettings
+			settings = target;
+			target = jQuery.extend( true, jQuery.ajaxSettings, settings );
+		} else {
+			// target was provided, we extend into it
+			jQuery.extend( true, target, jQuery.ajaxSettings, settings );
+		}
+		// Flatten fields we don't want deep extended
+		for( var field in { context: 1, url: 1 } ) {
+			if ( field in settings ) {
+				target[ field ] = settings[ field ];
+			} else if( field in jQuery.ajaxSettings ) {
+				target[ field ] = jQuery.ajaxSettings[ field ];
+			}
+		}
+		return target;
+	},
+
+	ajaxSettings: {
+		url: ajaxLocation,
+		isLocal: rlocalProtocol.test( ajaxLocParts[ 1 ] ),
+		global: true,
+		type: "GET",
+		contentType: "application/x-www-form-urlencoded",
+		processData: true,
+		async: true,
+		/*
+		timeout: 0,
+		data: null,
+		dataType: null,
+		username: null,
+		password: null,
+		cache: null,
+		traditional: false,
+		headers: {},
+		*/
+
+		accepts: {
+			xml: "application/xml, text/xml",
+			html: "text/html",
+			text: "text/plain",
+			json: "application/json, text/javascript",
+			"*": "*/*"
+		},
+
+		contents: {
+			xml: /xml/,
+			html: /html/,
+			json: /json/
+		},
+
+		responseFields: {
+			xml: "responseXML",
+			text: "responseText"
+		},
+
+		// List of data converters
+		// 1) key format is "source_type destination_type" (a single space in-between)
+		// 2) the catchall symbol "*" can be used for source_type
+		converters: {
+
+			// Convert anything to text
+			"* text": window.String,
+
+			// Text to html (true = no transformation)
+			"text html": true,
+
+			// Evaluate text as a json expression
+			"text json": jQuery.parseJSON,
+
+			// Parse text as xml
+			"text xml": jQuery.parseXML
+		}
+	},
+
+	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
+	ajaxTransport: addToPrefiltersOrTransports( transports ),
+
+	// Main method
+	ajax: function( url, options ) {
+
+		// If url is an object, simulate pre-1.5 signature
+		if ( typeof url === "object" ) {
+			options = url;
+			url = undefined;
+		}
+
+		// Force options to be an object
+		options = options || {};
+
+		var // Create the final options object
+			s = jQuery.ajaxSetup( {}, options ),
+			// Callbacks context
+			callbackContext = s.context || s,
+			// Context for global events
+			// It's the callbackContext if one was provided in the options
+			// and if it's a DOM node or a jQuery collection
+			globalEventContext = callbackContext !== s &&
+				( callbackContext.nodeType || callbackContext instanceof jQuery ) ?
+						jQuery( callbackContext ) : jQuery.event,
+			// Deferreds
+			deferred = jQuery.Deferred(),
+			completeDeferred = jQuery._Deferred(),
+			// Status-dependent callbacks
+			statusCode = s.statusCode || {},
+			// ifModified key
+			ifModifiedKey,
+			// Headers (they are sent all at once)
+			requestHeaders = {},
+			requestHeadersNames = {},
+			// Response headers
+			responseHeadersString,
+			responseHeaders,
+			// transport
+			transport,
+			// timeout handle
+			timeoutTimer,
+			// Cross-domain detection vars
+			parts,
+			// The jqXHR state
+			state = 0,
+			// To know if global events are to be dispatched
+			fireGlobals,
+			// Loop variable
+			i,
+			// Fake xhr
+			jqXHR = {
+
+				readyState: 0,
+
+				// Caches the header
+				setRequestHeader: function( name, value ) {
+					if ( !state ) {
+						var lname = name.toLowerCase();
+						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
+						requestHeaders[ name ] = value;
+					}
+					return this;
+				},
+
+				// Raw string
+				getAllResponseHeaders: function() {
+					return state === 2 ? responseHeadersString : null;
+				},
+
+				// Builds headers hashtable if needed
+				getResponseHeader: function( key ) {
+					var match;
+					if ( state === 2 ) {
+						if ( !responseHeaders ) {
+							responseHeaders = {};
+							while( ( match = rheaders.exec( responseHeadersString ) ) ) {
+								responseHeaders[ match[1].toLowerCase() ] = match[ 2 ];
+							}
+						}
+						match = responseHeaders[ key.toLowerCase() ];
+					}
+					return match === undefined ? null : match;
+				},
+
+				// Overrides response content-type header
+				overrideMimeType: function( type ) {
+					if ( !state ) {
+						s.mimeType = type;
+					}
+					return this;
+				},
+
+				// Cancel the request
+				abort: function( statusText ) {
+					statusText = statusText || "abort";
+					if ( transport ) {
+						transport.abort( statusText );
+					}
+					done( 0, statusText );
+					return this;
+				}
+			};
+
+		// Callback for when everything is done
+		// It is defined here because jslint complains if it is declared
+		// at the end of the function (which would be more logical and readable)
+		function done( status, statusText, responses, headers ) {
+
+			// Called once
+			if ( state === 2 ) {
+				return;
+			}
+
+			// State is "done" now
+			state = 2;
+
+			// Clear timeout if it exists
+			if ( timeoutTimer ) {
+				clearTimeout( timeoutTimer );
+			}
+
+			// Dereference transport for early garbage collection
+			// (no matter how long the jqXHR object will be used)
+			transport = undefined;
+
+			// Cache response headers
+			responseHeadersString = headers || "";
+
+			// Set readyState
+			jqXHR.readyState = status ? 4 : 0;
+
+			var isSuccess,
+				success,
+				error,
+				response = responses ? ajaxHandleResponses( s, jqXHR, responses ) : undefined,
+				lastModified,
+				etag;
+
+			// If successful, handle type chaining
+			if ( status >= 200 && status < 300 || status === 304 ) {
+
+				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+				if ( s.ifModified ) {
+
+					if ( ( lastModified = jqXHR.getResponseHeader( "Last-Modified" ) ) ) {
+						jQuery.lastModified[ ifModifiedKey ] = lastModified;
+					}
+					if ( ( etag = jqXHR.getResponseHeader( "Etag" ) ) ) {
+						jQuery.etag[ ifModifiedKey ] = etag;
+					}
+				}
+
+				// If not modified
+				if ( status === 304 ) {
+
+					statusText = "notmodified";
+					isSuccess = true;
+
+				// If we have data
+				} else {
+
+					try {
+						success = ajaxConvert( s, response );
+						statusText = "success";
+						isSuccess = true;
+					} catch(e) {
+						// We have a parsererror
+						statusText = "parsererror";
+						error = e;
+					}
+				}
+			} else {
+				// We extract error from statusText
+				// then normalize statusText and status for non-aborts
+				error = statusText;
+				if( !statusText || status ) {
+					statusText = "error";
+					if ( status < 0 ) {
+						status = 0;
+					}
+				}
+			}
+
+			// Set data for the fake xhr object
+			jqXHR.status = status;
+			jqXHR.statusText = statusText;
+
+			// Success/Error
+			if ( isSuccess ) {
+				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
+			} else {
+				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
+			}
+
+			// Status-dependent callbacks
+			jqXHR.statusCode( statusCode );
+			statusCode = undefined;
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajax" + ( isSuccess ? "Success" : "Error" ),
+						[ jqXHR, s, isSuccess ? success : error ] );
+			}
+
+			// Complete
+			completeDeferred.resolveWith( callbackContext, [ jqXHR, statusText ] );
+
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s] );
+				// Handle the global AJAX counter
+				if ( !( --jQuery.active ) ) {
+					jQuery.event.trigger( "ajaxStop" );
+				}
+			}
+		}
+
+		// Attach deferreds
+		deferred.promise( jqXHR );
+		jqXHR.success = jqXHR.done;
+		jqXHR.error = jqXHR.fail;
+		jqXHR.complete = completeDeferred.done;
+
+		// Status-dependent callbacks
+		jqXHR.statusCode = function( map ) {
+			if ( map ) {
+				var tmp;
+				if ( state < 2 ) {
+					for( tmp in map ) {
+						statusCode[ tmp ] = [ statusCode[tmp], map[tmp] ];
+					}
+				} else {
+					tmp = map[ jqXHR.status ];
+					jqXHR.then( tmp, tmp );
+				}
+			}
+			return this;
+		};
+
+		// Remove hash character (#7531: and string promotion)
+		// Add protocol if not provided (#5866: IE7 issue with protocol-less urls)
+		// We also use the url parameter if available
+		s.url = ( ( url || s.url ) + "" ).replace( rhash, "" ).replace( rprotocol, ajaxLocParts[ 1 ] + "//" );
+
+		// Extract dataTypes list
+		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().split( rspacesAjax );
+
+		// Determine if a cross-domain request is in order
+		if ( s.crossDomain == null ) {
+			parts = rurl.exec( s.url.toLowerCase() );
+			s.crossDomain = !!( parts &&
+				( parts[ 1 ] != ajaxLocParts[ 1 ] || parts[ 2 ] != ajaxLocParts[ 2 ] ||
+					( parts[ 3 ] || ( parts[ 1 ] === "http:" ? 80 : 443 ) ) !=
+						( ajaxLocParts[ 3 ] || ( ajaxLocParts[ 1 ] === "http:" ? 80 : 443 ) ) )
+			);
+		}
+
+		// Convert data if not already a string
+		if ( s.data && s.processData && typeof s.data !== "string" ) {
+			s.data = jQuery.param( s.data, s.traditional );
+		}
+
+		// Apply prefilters
+		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
+
+		// If request was aborted inside a prefiler, stop there
+		if ( state === 2 ) {
+			return false;
+		}
+
+		// We can fire global events as of now if asked to
+		fireGlobals = s.global;
+
+		// Uppercase the type
+		s.type = s.type.toUpperCase();
+
+		// Determine if request has content
+		s.hasContent = !rnoContent.test( s.type );
+
+		// Watch for a new set of requests
+		if ( fireGlobals && jQuery.active++ === 0 ) {
+			jQuery.event.trigger( "ajaxStart" );
+		}
+
+		// More options handling for requests with no content
+		if ( !s.hasContent ) {
+
+			// If data is available, append data to url
+			if ( s.data ) {
+				s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.data;
+			}
+
+			// Get ifModifiedKey before adding the anti-cache parameter
+			ifModifiedKey = s.url;
+
+			// Add anti-cache in url if needed
+			if ( s.cache === false ) {
+
+				var ts = jQuery.now(),
+					// try replacing _= if it is there
+					ret = s.url.replace( rts, "$1_=" + ts );
+
+				// if nothing was replaced, add timestamp to the end
+				s.url = ret + ( (ret === s.url ) ? ( rquery.test( s.url ) ? "&" : "?" ) + "_=" + ts : "" );
+			}
+		}
+
+		// Set the correct header, if data is being sent
+		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
+			jqXHR.setRequestHeader( "Content-Type", s.contentType );
+		}
+
+		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
+		if ( s.ifModified ) {
+			ifModifiedKey = ifModifiedKey || s.url;
+			if ( jQuery.lastModified[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ ifModifiedKey ] );
+			}
+			if ( jQuery.etag[ ifModifiedKey ] ) {
+				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ ifModifiedKey ] );
+			}
+		}
+
+		// Set the Accepts header for the server, depending on the dataType
+		jqXHR.setRequestHeader(
+			"Accept",
+			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[0] ] ?
+				s.accepts[ s.dataTypes[0] ] + ( s.dataTypes[ 0 ] !== "*" ? ", */*; q=0.01" : "" ) :
+				s.accepts[ "*" ]
+		);
+
+		// Check for headers option
+		for ( i in s.headers ) {
+			jqXHR.setRequestHeader( i, s.headers[ i ] );
+		}
+
+		// Allow custom headers/mimetypes and early abort
+		if ( s.beforeSend && ( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
+				// Abort if not done already
+				jqXHR.abort();
+				return false;
+
+		}
+
+		// Install callbacks on deferreds
+		for ( i in { success: 1, error: 1, complete: 1 } ) {
+			jqXHR[ i ]( s[ i ] );
+		}
+
+		// Get transport
+		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
+
+		// If no transport, we auto-abort
+		if ( !transport ) {
+			done( -1, "No Transport" );
+		} else {
+			jqXHR.readyState = 1;
+			// Send global event
+			if ( fireGlobals ) {
+				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
+			}
+			// Timeout
+			if ( s.async && s.timeout > 0 ) {
+				timeoutTimer = setTimeout( function(){
+					jqXHR.abort( "timeout" );
+				}, s.timeout );
+			}
+
+			try {
+				state = 1;
+				transport.send( requestHeaders, done );
+			} catch (e) {
+				// Propagate exception as error if not done
+				if ( status < 2 ) {
+					done( -1, e );
+				// Simply rethrow otherwise
+				} else {
+					jQuery.error( e );
+				}
+			}
+		}
+
+		return jqXHR;
+	},
+
+	// Serialize an array of form elements or a set of
+	// key/values into a query string
+	param: function( a, traditional ) {
+		var s = [],
+			add = function( key, value ) {
+				// If value is a function, invoke it and return its value
+				value = jQuery.isFunction( value ) ? value() : value;
+				s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
+			};
+
+		// Set traditional to true for jQuery <= 1.3.2 behavior.
+		if ( traditional === undefined ) {
+			traditional = jQuery.ajaxSettings.traditional;
+		}
+
+		// If an array was passed in, assume that it is an array of form elements.
+		if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
+			// Serialize the form elements
+			jQuery.each( a, function() {
+				add( this.name, this.value );
+			});
+
+		} else {
+			// If traditional, encode the "old" way (the way 1.3.2 or older
+			// did it), otherwise encode params recursively.
+			for ( var prefix in a ) {
+				buildParams( prefix, a[ prefix ], traditional, add );
+			}
+		}
+
+		// Return the resulting serialization
+		return s.join( "&" ).replace( r20, "+" );
+	}
+});
+
+function buildParams( prefix, obj, traditional, add ) {
+	if ( jQuery.isArray( obj ) ) {
+		// Serialize array item.
+		jQuery.each( obj, function( i, v ) {
+			if ( traditional || rbracket.test( prefix ) ) {
+				// Treat each array item as a scalar.
+				add( prefix, v );
+
+			} else {
+				// If array item is non-scalar (array or object), encode its
+				// numeric index to resolve deserialization ambiguity issues.
+				// Note that rack (as of 1.0.0) can't currently deserialize
+				// nested arrays properly, and attempting to do so may cause
+				// a server error. Possible fixes are to modify rack's
+				// deserialization algorithm or to provide an option or flag
+				// to force array serialization to be shallow.
+				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
+			}
+		});
+
+	} else if ( !traditional && obj != null && typeof obj === "object" ) {
+		// Serialize object item.
+		for ( var name in obj ) {
+			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
+		}
+
+	} else {
+		// Serialize scalar item.
+		add( prefix, obj );
+	}
+}
+
+// This is still on the jQuery object... for now
+// Want to move this to jQuery.ajax some day
+jQuery.extend({
+
+	// Counter for holding the number of active queries
+	active: 0,
+
+	// Last-Modified header cache for next request
+	lastModified: {},
+	etag: {}
+
+});
+
+/* Handles responses to an ajax request:
+ * - sets all responseXXX fields accordingly
+ * - finds the right dataType (mediates between content-type and expected dataType)
+ * - returns the corresponding response
+ */
+function ajaxHandleResponses( s, jqXHR, responses ) {
+
+	var contents = s.contents,
+		dataTypes = s.dataTypes,
+		responseFields = s.responseFields,
+		ct,
+		type,
+		finalDataType,
+		firstDataType;
+
+	// Fill responseXXX fields
+	for( type in responseFields ) {
+		if ( type in responses ) {
+			jqXHR[ responseFields[type] ] = responses[ type ];
+		}
+	}
+
+	// Remove auto dataType and get content-type in the process
+	while( dataTypes[ 0 ] === "*" ) {
+		dataTypes.shift();
+		if ( ct === undefined ) {
+			ct = s.mimeType || jqXHR.getResponseHeader( "content-type" );
+		}
+	}
+
+	// Check if we're dealing with a known content-type
+	if ( ct ) {
+		for ( type in contents ) {
+			if ( contents[ type ] && contents[ type ].test( ct ) ) {
+				dataTypes.unshift( type );
+				break;
+			}
+		}
+	}
+
+	// Check to see if we have a response for the expected dataType
+	if ( dataTypes[ 0 ] in responses ) {
+		finalDataType = dataTypes[ 0 ];
+	} else {
+		// Try convertible dataTypes
+		for ( type in responses ) {
+			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[0] ] ) {
+				finalDataType = type;
+				break;
+			}
+			if ( !firstDataType ) {
+				firstDataType = type;
+			}
+		}
+		// Or just use first one
+		finalDataType = finalDataType || firstDataType;
+	}
+
+	// If we found a dataType
+	// We add the dataType to the list if needed
+	// and return the corresponding response
+	if ( finalDataType ) {
+		if ( finalDataType !== dataTypes[ 0 ] ) {
+			dataTypes.unshift( finalDataType );
+		}
+		return responses[ finalDataType ];
+	}
+}
+
+// Chain conversions given the request and the original response
+function ajaxConvert( s, response ) {
+
+	// Apply the dataFilter if provided
+	if ( s.dataFilter ) {
+		response = s.dataFilter( response, s.dataType );
+	}
+
+	var dataTypes = s.dataTypes,
+		converters = {},
+		i,
+		key,
+		length = dataTypes.length,
+		tmp,
+		// Current and previous dataTypes
+		current = dataTypes[ 0 ],
+		prev,
+		// Conversion expression
+		conversion,
+		// Conversion function
+		conv,
+		// Conversion functions (transitive conversion)
+		conv1,
+		conv2;
+
+	// For each dataType in the chain
+	for( i = 1; i < length; i++ ) {
+
+		// Create converters map
+		// with lowercased keys
+		if ( i === 1 ) {
+			for( key in s.converters ) {
+				if( typeof key === "string" ) {
+					converters[ key.toLowerCase() ] = s.converters[ key ];
+				}
+			}
+		}
+
+		// Get the dataTypes
+		prev = current;
+		current = dataTypes[ i ];
+
+		// If current is auto dataType, update it to prev
+		if( current === "*" ) {
+			current = prev;
+		// If no auto and dataTypes are actually different
+		} else if ( prev !== "*" && prev !== current ) {
+
+			// Get the converter
+			conversion = prev + " " + current;
+			conv = converters[ conversion ] || converters[ "* " + current ];
+
+			// If there is no direct converter, search transitively
+			if ( !conv ) {
+				conv2 = undefined;
+				for( conv1 in converters ) {
+					tmp = conv1.split( " " );
+					if ( tmp[ 0 ] === prev || tmp[ 0 ] === "*" ) {
+						conv2 = converters[ tmp[1] + " " + current ];
+						if ( conv2 ) {
+							conv1 = converters[ conv1 ];
+							if ( conv1 === true ) {
+								conv = conv2;
+							} else if ( conv2 === true ) {
+								conv = conv1;
+							}
+							break;
+						}
+					}
+				}
+			}
+			// If we found no converter, dispatch an error
+			if ( !( conv || conv2 ) ) {
+				jQuery.error( "No conversion from " + conversion.replace(" "," to ") );
+			}
+			// If found converter is not an equivalence
+			if ( conv !== true ) {
+				// Convert with 1 or 2 converters accordingly
+				response = conv ? conv( response ) : conv2( conv1(response) );
+			}
+		}
+	}
+	return response;
+}
+
+
+
+
+var jsc = jQuery.now(),
+	jsre = /(\=)\?(&|$)|\?\?/i;
+
+// Default jsonp settings
+jQuery.ajaxSetup({
+	jsonp: "callback",
+	jsonpCallback: function() {
+		return jQuery.expando + "_" + ( jsc++ );
+	}
+});
+
+// Detect, normalize options and install callbacks for jsonp requests
+jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
+
+	var inspectData = s.contentType === "application/x-www-form-urlencoded" &&
+		( typeof s.data === "string" );
+
+	if ( s.dataTypes[ 0 ] === "jsonp" ||
+		s.jsonp !== false && ( jsre.test( s.url ) ||
+				inspectData && jsre.test( s.data ) ) ) {
+
+		var responseContainer,
+			jsonpCallback = s.jsonpCallback =
+				jQuery.isFunction( s.jsonpCallback ) ? s.jsonpCallback() : s.jsonpCallback,
+			previous = window[ jsonpCallback ],
+			url = s.url,
+			data = s.data,
+			replace = "$1" + jsonpCallback + "$2";
+
+		if ( s.jsonp !== false ) {
+			url = url.replace( jsre, replace );
+			if ( s.url === url ) {
+				if ( inspectData ) {
+					data = data.replace( jsre, replace );
+				}
+				if ( s.data === data ) {
+					// Add callback manually
+					url += (/\?/.test( url ) ? "&" : "?") + s.jsonp + "=" + jsonpCallback;
+				}
+			}
+		}
+
+		s.url = url;
+		s.data = data;
+
+		// Install callback
+		window[ jsonpCallback ] = function( response ) {
+			responseContainer = [ response ];
+		};
+
+		// Clean-up function
+		jqXHR.always(function() {
+			// Set callback back to previous value
+			window[ jsonpCallback ] = previous;
+			// Call if it was a function and we have a response
+			if ( responseContainer && jQuery.isFunction( previous ) ) {
+				window[ jsonpCallback ]( responseContainer[ 0 ] );
+			}
+		});
+
+		// Use data converter to retrieve json after script execution
+		s.converters["script json"] = function() {
+			if ( !responseContainer ) {
+				jQuery.error( jsonpCallback + " was not called" );
+			}
+			return responseContainer[ 0 ];
+		};
+
+		// force json dataType
+		s.dataTypes[ 0 ] = "json";
+
+		// Delegate to script
+		return "script";
+	}
+});
+
+
+
+
+// Install script dataType
+jQuery.ajaxSetup({
+	accepts: {
+		script: "text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"
+	},
+	contents: {
+		script: /javascript|ecmascript/
+	},
+	converters: {
+		"text script": function( text ) {
+			jQuery.globalEval( text );
+			return text;
+		}
+	}
+});
+
+// Handle cache's special case and global
+jQuery.ajaxPrefilter( "script", function( s ) {
+	if ( s.cache === undefined ) {
+		s.cache = false;
+	}
+	if ( s.crossDomain ) {
+		s.type = "GET";
+		s.global = false;
+	}
+});
+
+// Bind script tag hack transport
+jQuery.ajaxTransport( "script", function(s) {
+
+	// This transport only deals with cross domain requests
+	if ( s.crossDomain ) {
+
+		var script,
+			head = document.head || document.getElementsByTagName( "head" )[0] || document.documentElement;
+
+		return {
+
+			send: function( _, callback ) {
+
+				script = document.createElement( "script" );
+
+				script.async = "async";
+
+				if ( s.scriptCharset ) {
+					script.charset = s.scriptCharset;
+				}
+
+				script.src = s.url;
+
+				// Attach handlers for all browsers
+				script.onload = script.onreadystatechange = function( _, isAbort ) {
+
+					if ( isAbort || !script.readyState || /loaded|complete/.test( script.readyState ) ) {
+
+						// Handle memory leak in IE
+						script.onload = script.onreadystatechange = null;
+
+						// Remove the script
+						if ( head && script.parentNode ) {
+							head.removeChild( script );
+						}
+
+						// Dereference the script
+						script = undefined;
+
+						// Callback if not abort
+						if ( !isAbort ) {
+							callback( 200, "success" );
+						}
+					}
+				};
+				// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
+				// This arises when a base node is used (#2709 and #4378).
+				head.insertBefore( script, head.firstChild );
+			},
+
+			abort: function() {
+				if ( script ) {
+					script.onload( 0, 1 );
+				}
+			}
+		};
+	}
+});
+
+
+
+
+var // #5280: Internet Explorer will keep connections alive if we don't abort on unload
+	xhrOnUnloadAbort = window.ActiveXObject ? function() {
+		// Abort all pending requests
+		for ( var key in xhrCallbacks ) {
+			xhrCallbacks[ key ]( 0, 1 );
+		}
+	} : false,
+	xhrId = 0,
+	xhrCallbacks;
+
+// Functions to create xhrs
+function createStandardXHR() {
+	try {
+		return new window.XMLHttpRequest();
+	} catch( e ) {}
+}
+
+function createActiveXHR() {
+	try {
+		return new window.ActiveXObject( "Microsoft.XMLHTTP" );
+	} catch( e ) {}
+}
+
+// Create the request object
+// (This is still attached to ajaxSettings for backward compatibility)
+jQuery.ajaxSettings.xhr = window.ActiveXObject ?
+	/* Microsoft failed to properly
+	 * implement the XMLHttpRequest in IE7 (can't request local files),
+	 * so we use the ActiveXObject when it is available
+	 * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
+	 * we need a fallback.
+	 */
+	function() {
+		return !this.isLocal && createStandardXHR() || createActiveXHR();
+	} :
+	// For all other browsers, use the standard XMLHttpRequest object
+	createStandardXHR;
+
+// Determine support properties
+(function( xhr ) {
+	jQuery.extend( jQuery.support, {
+		ajax: !!xhr,
+		cors: !!xhr && ( "withCredentials" in xhr )
+	});
+})( jQuery.ajaxSettings.xhr() );
+
+// Create transport if the browser can provide an xhr
+if ( jQuery.support.ajax ) {
+
+	jQuery.ajaxTransport(function( s ) {
+		// Cross domain only allowed if supported through XMLHttpRequest
+		if ( !s.crossDomain || jQuery.support.cors ) {
+
+			var callback;
+
+			return {
+				send: function( headers, complete ) {
+
+					// Get a new xhr
+					var xhr = s.xhr(),
+						handle,
+						i;
+
+					// Open the socket
+					// Passing null username, generates a login popup on Opera (#2865)
+					if ( s.username ) {
+						xhr.open( s.type, s.url, s.async, s.username, s.password );
+					} else {
+						xhr.open( s.type, s.url, s.async );
+					}
+
+					// Apply custom fields if provided
+					if ( s.xhrFields ) {
+						for ( i in s.xhrFields ) {
+							xhr[ i ] = s.xhrFields[ i ];
+						}
+					}
+
+					// Override mime type if needed
+					if ( s.mimeType && xhr.overrideMimeType ) {
+						xhr.overrideMimeType( s.mimeType );
+					}
+
+					// X-Requested-With header
+					// For cross-domain requests, seeing as conditions for a preflight are
+					// akin to a jigsaw puzzle, we simply never set it to be sure.
+					// (it can always be set on a per-request basis or even using ajaxSetup)
+					// For same-domain requests, won't change header if already provided.
+					if ( !s.crossDomain && !headers["X-Requested-With"] ) {
+						headers[ "X-Requested-With" ] = "XMLHttpRequest";
+					}
+
+					// Need an extra try/catch for cross domain requests in Firefox 3
+					try {
+						for ( i in headers ) {
+							xhr.setRequestHeader( i, headers[ i ] );
+						}
+					} catch( _ ) {}
+
+					// Do send the request
+					// This may raise an exception which is actually
+					// handled in jQuery.ajax (so no try/catch here)
+					xhr.send( ( s.hasContent && s.data ) || null );
+
+					// Listener
+					callback = function( _, isAbort ) {
+
+						var status,
+							statusText,
+							responseHeaders,
+							responses,
+							xml;
+
+						// Firefox throws exceptions when accessing properties
+						// of an xhr when a network error occured
+						// http://helpful.knobs-dials.com/index.php/Component_returned_failure_code:_0x80040111_(NS_ERROR_NOT_AVAILABLE)
+						try {
+
+							// Was never called and is aborted or complete
+							if ( callback && ( isAbort || xhr.readyState === 4 ) ) {
+
+								// Only called once
+								callback = undefined;
+
+								// Do not keep as active anymore
+								if ( handle ) {
+									xhr.onreadystatechange = jQuery.noop;
+									if ( xhrOnUnloadAbort ) {
+										delete xhrCallbacks[ handle ];
+									}
+								}
+
+								// If it's an abort
+								if ( isAbort ) {
+									// Abort it manually if needed
+									if ( xhr.readyState !== 4 ) {
+										xhr.abort();
+									}
+								} else {
+									status = xhr.status;
+									responseHeaders = xhr.getAllResponseHeaders();
+									responses = {};
+									xml = xhr.responseXML;
+
+									// Construct response list
+									if ( xml && xml.documentElement /* #4958 */ ) {
+										responses.xml = xml;
+									}
+									responses.text = xhr.responseText;
+
+									// Firefox throws an exception when accessing
+									// statusText for faulty cross-domain requests
+									try {
+										statusText = xhr.statusText;
+									} catch( e ) {
+										// We normalize with Webkit giving an empty statusText
+										statusText = "";
+									}
+
+									// Filter status for non standard behaviors
+
+									// If the request is local and we have data: assume a success
+									// (success with no data won't get notified, that's the best we
+									// can do given current implementations)
+									if ( !status && s.isLocal && !s.crossDomain ) {
+										status = responses.text ? 200 : 404;
+									// IE - #1450: sometimes returns 1223 when it should be 204
+									} else if ( status === 1223 ) {
+										status = 204;
+									}
+								}
+							}
+						} catch( firefoxAccessException ) {
+							if ( !isAbort ) {
+								complete( -1, firefoxAccessException );
+							}
+						}
+
+						// Call complete if needed
+						if ( responses ) {
+							complete( status, statusText, responses, responseHeaders );
+						}
+					};
+
+					// if we're in sync mode or it's in cache
+					// and has been retrieved directly (IE6 & IE7)
+					// we need to manually fire the callback
+					if ( !s.async || xhr.readyState === 4 ) {
+						callback();
+					} else {
+						handle = ++xhrId;
+						if ( xhrOnUnloadAbort ) {
+							// Create the active xhrs callbacks list if needed
+							// and attach the unload handler
+							if ( !xhrCallbacks ) {
+								xhrCallbacks = {};
+								jQuery( window ).unload( xhrOnUnloadAbort );
+							}
+							// Add to list of active xhrs callbacks
+							xhrCallbacks[ handle ] = callback;
+						}
+						xhr.onreadystatechange = callback;
+					}
+				},
+
+				abort: function() {
+					if ( callback ) {
+						callback(0,1);
+					}
+				}
+			};
+		}
+	});
+}
+
+
+
+
+var elemdisplay = {},
+	iframe, iframeDoc,
+	rfxtypes = /^(?:toggle|show|hide)$/,
+	rfxnum = /^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,
+	timerId,
+	fxAttrs = [
+		// height animations
+		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
+		// width animations
+		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
+		// opacity animations
+		[ "opacity" ]
+	],
+	fxNow,
+	requestAnimationFrame = window.webkitRequestAnimationFrame ||
+		window.mozRequestAnimationFrame ||
+		window.oRequestAnimationFrame;
+
+jQuery.fn.extend({
+	show: function( speed, easing, callback ) {
+		var elem, display;
+
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("show", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				elem = this[i];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					// Reset the inline display of this element to learn if it is
+					// being hidden by cascaded rules or not
+					if ( !jQuery._data(elem, "olddisplay") && display === "none" ) {
+						display = elem.style.display = "";
+					}
+
+					// Set elements which have been overridden with display: none
+					// in a stylesheet to whatever the default browser style is
+					// for such an element
+					if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
+						jQuery._data(elem, "olddisplay", defaultDisplay(elem.nodeName));
+					}
+				}
+			}
+
+			// Set the display of most of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				elem = this[i];
+
+				if ( elem.style ) {
+					display = elem.style.display;
+
+					if ( display === "" || display === "none" ) {
+						elem.style.display = jQuery._data(elem, "olddisplay") || "";
+					}
+				}
+			}
+
+			return this;
+		}
+	},
+
+	hide: function( speed, easing, callback ) {
+		if ( speed || speed === 0 ) {
+			return this.animate( genFx("hide", 3), speed, easing, callback);
+
+		} else {
+			for ( var i = 0, j = this.length; i < j; i++ ) {
+				if ( this[i].style ) {
+					var display = jQuery.css( this[i], "display" );
+
+					if ( display !== "none" && !jQuery._data( this[i], "olddisplay" ) ) {
+						jQuery._data( this[i], "olddisplay", display );
+					}
+				}
+			}
+
+			// Set the display of the elements in a second loop
+			// to avoid the constant reflow
+			for ( i = 0; i < j; i++ ) {
+				if ( this[i].style ) {
+					this[i].style.display = "none";
+				}
+			}
+
+			return this;
+		}
+	},
+
+	// Save the old toggle function
+	_toggle: jQuery.fn.toggle,
+
+	toggle: function( fn, fn2, callback ) {
+		var bool = typeof fn === "boolean";
+
+		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
+			this._toggle.apply( this, arguments );
+
+		} else if ( fn == null || bool ) {
+			this.each(function() {
+				var state = bool ? fn : jQuery(this).is(":hidden");
+				jQuery(this)[ state ? "show" : "hide" ]();
+			});
+
+		} else {
+			this.animate(genFx("toggle", 3), fn, fn2, callback);
+		}
+
+		return this;
+	},
+
+	fadeTo: function( speed, to, easing, callback ) {
+		return this.filter(":hidden").css("opacity", 0).show().end()
+					.animate({opacity: to}, speed, easing, callback);
+	},
+
+	animate: function( prop, speed, easing, callback ) {
+		var optall = jQuery.speed(speed, easing, callback);
+
+		if ( jQuery.isEmptyObject( prop ) ) {
+			return this.each( optall.complete, [ false ] );
+		}
+
+		// Do not change referenced properties as per-property easing will be lost
+		prop = jQuery.extend( {}, prop );
+
+		return this[ optall.queue === false ? "each" : "queue" ](function() {
+			// XXX 'this' does not always have a nodeName when running the
+			// test suite
+
+			if ( optall.queue === false ) {
+				jQuery._mark( this );
+			}
+
+			var opt = jQuery.extend( {}, optall ),
+				isElement = this.nodeType === 1,
+				hidden = isElement && jQuery(this).is(":hidden"),
+				name, val, p,
+				display, e,
+				parts, start, end, unit;
+
+			// will store per property easing and be used to determine when an animation is complete
+			opt.animatedProperties = {};
+
+			for ( p in prop ) {
+
+				// property name normalization
+				name = jQuery.camelCase( p );
+				if ( p !== name ) {
+					prop[ name ] = prop[ p ];
+					delete prop[ p ];
+				}
+
+				val = prop[ name ];
+
+				// easing resolution: per property > opt.specialEasing > opt.easing > 'swing' (default)
+				if ( jQuery.isArray( val ) ) {
+					opt.animatedProperties[ name ] = val[ 1 ];
+					val = prop[ name ] = val[ 0 ];
+				} else {
+					opt.animatedProperties[ name ] = opt.specialEasing && opt.specialEasing[ name ] || opt.easing || 'swing';
+				}
+
+				if ( val === "hide" && hidden || val === "show" && !hidden ) {
+					return opt.complete.call( this );
+				}
+
+				if ( isElement && ( name === "height" || name === "width" ) ) {
+					// Make sure that nothing sneaks out
+					// Record all 3 overflow attributes because IE does not
+					// change the overflow attribute when overflowX and
+					// overflowY are set to the same value
+					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
+
+					// Set display property to inline-block for height/width
+					// animations on inline elements that are having width/height
+					// animated
+					if ( jQuery.css( this, "display" ) === "inline" &&
+							jQuery.css( this, "float" ) === "none" ) {
+						if ( !jQuery.support.inlineBlockNeedsLayout ) {
+							this.style.display = "inline-block";
+
+						} else {
+							display = defaultDisplay( this.nodeName );
+
+							// inline-level elements accept inline-block;
+							// block-level elements need to be inline with layout
+							if ( display === "inline" ) {
+								this.style.display = "inline-block";
+
+							} else {
+								this.style.display = "inline";
+								this.style.zoom = 1;
+							}
+						}
+					}
+				}
+			}
+
+			if ( opt.overflow != null ) {
+				this.style.overflow = "hidden";
+			}
+
+			for ( p in prop ) {
+				e = new jQuery.fx( this, opt, p );
+				val = prop[ p ];
+
+				if ( rfxtypes.test(val) ) {
+					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]();
+
+				} else {
+					parts = rfxnum.exec( val );
+					start = e.cur();
+
+					if ( parts ) {
+						end = parseFloat( parts[2] );
+						unit = parts[3] || ( jQuery.cssNumber[ p ] ? "" : "px" );
+
+						// We need to compute starting value
+						if ( unit !== "px" ) {
+							jQuery.style( this, p, (end || 1) + unit);
+							start = ((end || 1) / e.cur()) * start;
+							jQuery.style( this, p, start + unit);
+						}
+
+						// If a +=/-= token was provided, we're doing a relative animation
+						if ( parts[1] ) {
+							end = ( (parts[ 1 ] === "-=" ? -1 : 1) * end ) + start;
+						}
+
+						e.custom( start, end, unit );
+
+					} else {
+						e.custom( start, val, "" );
+					}
+				}
+			}
+
+			// For JS strict compliance
+			return true;
+		});
+	},
+
+	stop: function( clearQueue, gotoEnd ) {
+		if ( clearQueue ) {
+			this.queue([]);
+		}
+
+		this.each(function() {
+			var timers = jQuery.timers,
+				i = timers.length;
+			// clear marker counters if we know they won't be
+			if ( !gotoEnd ) {
+				jQuery._unmark( true, this );
+			}
+			while ( i-- ) {
+				if ( timers[i].elem === this ) {
+					if (gotoEnd) {
+						// force the next step to be the last
+						timers[i](true);
+					}
+
+					timers.splice(i, 1);
+				}
+			}
+		});
+
+		// start the next in the queue if the last step wasn't forced
+		if ( !gotoEnd ) {
+			this.dequeue();
+		}
+
+		return this;
+	}
+
+});
+
+// Animations created synchronously will run synchronously
+function createFxNow() {
+	setTimeout( clearFxNow, 0 );
+	return ( fxNow = jQuery.now() );
+}
+
+function clearFxNow() {
+	fxNow = undefined;
+}
+
+// Generate parameters to create a standard animation
+function genFx( type, num ) {
+	var obj = {};
+
+	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
+		obj[ this ] = type;
+	});
+
+	return obj;
+}
+
+// Generate shortcuts for custom animations
+jQuery.each({
+	slideDown: genFx("show", 1),
+	slideUp: genFx("hide", 1),
+	slideToggle: genFx("toggle", 1),
+	fadeIn: { opacity: "show" },
+	fadeOut: { opacity: "hide" },
+	fadeToggle: { opacity: "toggle" }
+}, function( name, props ) {
+	jQuery.fn[ name ] = function( speed, easing, callback ) {
+		return this.animate( props, speed, easing, callback );
+	};
+});
+
+jQuery.extend({
+	speed: function( speed, easing, fn ) {
+		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
+			complete: fn || !fn && easing ||
+				jQuery.isFunction( speed ) && speed,
+			duration: speed,
+			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
+		};
+
+		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
+			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
+
+		// Queueing
+		opt.old = opt.complete;
+		opt.complete = function( noUnmark ) {
+			if ( jQuery.isFunction( opt.old ) ) {
+				opt.old.call( this );
+			}
+
+			if ( opt.queue !== false ) {
+				jQuery.dequeue( this );
+			} else if ( noUnmark !== false ) {
+				jQuery._unmark( this );
+			}
+		};
+
+		return opt;
+	},
+
+	easing: {
+		linear: function( p, n, firstNum, diff ) {
+			return firstNum + diff * p;
+		},
+		swing: function( p, n, firstNum, diff ) {
+			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
+		}
+	},
+
+	timers: [],
+
+	fx: function( elem, options, prop ) {
+		this.options = options;
+		this.elem = elem;
+		this.prop = prop;
+
+		options.orig = options.orig || {};
+	}
+
+});
+
+jQuery.fx.prototype = {
+	// Simple function for setting a style value
+	update: function() {
+		if ( this.options.step ) {
+			this.options.step.call( this.elem, this.now, this );
+		}
+
+		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
+	},
+
+	// Get the current size
+	cur: function() {
+		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
+			return this.elem[ this.prop ];
+		}
+
+		var parsed,
+			r = jQuery.css( this.elem, this.prop );
+		// Empty strings, null, undefined and "auto" are converted to 0,
+		// complex values such as "rotate(1rad)" are returned as is,
+		// simple values such as "10px" are parsed to Float.
+		return isNaN( parsed = parseFloat( r ) ) ? !r || r === "auto" ? 0 : r : parsed;
+	},
+
+	// Start an animation from one number to another
+	custom: function( from, to, unit ) {
+		var self = this,
+			fx = jQuery.fx,
+			raf;
+
+		this.startTime = fxNow || createFxNow();
+		this.start = from;
+		this.end = to;
+		this.unit = unit || this.unit || ( jQuery.cssNumber[ this.prop ] ? "" : "px" );
+		this.now = this.start;
+		this.pos = this.state = 0;
+
+		function t( gotoEnd ) {
+			return self.step(gotoEnd);
+		}
+
+		t.elem = this.elem;
+
+		if ( t() && jQuery.timers.push(t) && !timerId ) {
+			// Use requestAnimationFrame instead of setInterval if available
+			if ( requestAnimationFrame ) {
+				timerId = true;
+				raf = function() {
+					// When timerId gets set to null at any point, this stops
+					if ( timerId ) {
+						requestAnimationFrame( raf );
+						fx.tick();
+					}
+				};
+				requestAnimationFrame( raf );
+			} else {
+				timerId = setInterval( fx.tick, fx.interval );
+			}
+		}
+	},
+
+	// Simple 'show' function
+	show: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.show = true;
+
+		// Begin the animation
+		// Make sure that we start at a small width/height to avoid any
+		// flash of content
+		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
+
+		// Start by showing the element
+		jQuery( this.elem ).show();
+	},
+
+	// Simple 'hide' function
+	hide: function() {
+		// Remember where we started, so that we can go back to it later
+		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
+		this.options.hide = true;
+
+		// Begin the animation
+		this.custom(this.cur(), 0);
+	},
+
+	// Each step of an animation
+	step: function( gotoEnd ) {
+		var t = fxNow || createFxNow(),
+			done = true,
+			elem = this.elem,
+			options = this.options,
+			i, n;
+
+		if ( gotoEnd || t >= options.duration + this.startTime ) {
+			this.now = this.end;
+			this.pos = this.state = 1;
+			this.update();
+
+			options.animatedProperties[ this.prop ] = true;
+
+			for ( i in options.animatedProperties ) {
+				if ( options.animatedProperties[i] !== true ) {
+					done = false;
+				}
+			}
+
+			if ( done ) {
+				// Reset the overflow
+				if ( options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
+
+					jQuery.each( [ "", "X", "Y" ], function (index, value) {
+						elem.style[ "overflow" + value ] = options.overflow[index];
+					});
+				}
+
+				// Hide the element if the "hide" operation was done
+				if ( options.hide ) {
+					jQuery(elem).hide();
+				}
+
+				// Reset the properties, if the item has been hidden or shown
+				if ( options.hide || options.show ) {
+					for ( var p in options.animatedProperties ) {
+						jQuery.style( elem, p, options.orig[p] );
+					}
+				}
+
+				// Execute the complete function
+				options.complete.call( elem );
+			}
+
+			return false;
+
+		} else {
+			// classical easing cannot be used with an Infinity duration
+			if ( options.duration == Infinity ) {
+				this.now = t;
+			} else {
+				n = t - this.startTime;
+				this.state = n / options.duration;
+
+				// Perform the easing function, defaults to swing
+				this.pos = jQuery.easing[ options.animatedProperties[ this.prop ] ]( this.state, n, 0, 1, options.duration );
+				this.now = this.start + ((this.end - this.start) * this.pos);
+			}
+			// Perform the next step of the animation
+			this.update();
+		}
+
+		return true;
+	}
+};
+
+jQuery.extend( jQuery.fx, {
+	tick: function() {
+		for ( var timers = jQuery.timers, i = 0 ; i < timers.length ; ++i ) {
+			if ( !timers[i]() ) {
+				timers.splice(i--, 1);
+			}
+		}
+
+		if ( !timers.length ) {
+			jQuery.fx.stop();
+		}
+	},
+
+	interval: 13,
+
+	stop: function() {
+		clearInterval( timerId );
+		timerId = null;
+	},
+
+	speeds: {
+		slow: 600,
+		fast: 200,
+		// Default speed
+		_default: 400
+	},
+
+	step: {
+		opacity: function( fx ) {
+			jQuery.style( fx.elem, "opacity", fx.now );
+		},
+
+		_default: function( fx ) {
+			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
+				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
+			} else {
+				fx.elem[ fx.prop ] = fx.now;
+			}
+		}
+	}
+});
+
+if ( jQuery.expr && jQuery.expr.filters ) {
+	jQuery.expr.filters.animated = function( elem ) {
+		return jQuery.grep(jQuery.timers, function( fn ) {
+			return elem === fn.elem;
+		}).length;
+	};
+}
+
+// Try to restore the default display value of an element
+function defaultDisplay( nodeName ) {
+
+	if ( !elemdisplay[ nodeName ] ) {
+
+		var body = document.body,
+			elem = jQuery( "<" + nodeName + ">" ).appendTo( body ),
+			display = elem.css( "display" );
+
+		elem.remove();
+
+		// If the simple way fails,
+		// get element's real default display by attaching it to a temp iframe
+		if ( display === "none" || display === "" ) {
+			// No iframe to use yet, so create it
+			if ( !iframe ) {
+				iframe = document.createElement( "iframe" );
+				iframe.frameBorder = iframe.width = iframe.height = 0;
+			}
+
+			body.appendChild( iframe );
+
+			// Create a cacheable copy of the iframe document on first call.
+			// IE and Opera will allow us to reuse the iframeDoc without re-writing the fake HTML
+			// document to it; WebKit & Firefox won't allow reusing the iframe document.
+			if ( !iframeDoc || !iframe.createElement ) {
+				iframeDoc = ( iframe.contentWindow || iframe.contentDocument ).document;
+				iframeDoc.write( ( document.compatMode === "CSS1Compat" ? "<!doctype html>" : "" ) + "<html><body>" );
+				iframeDoc.close();
+			}
+
+			elem = iframeDoc.createElement( nodeName );
+
+			iframeDoc.body.appendChild( elem );
+
+			display = jQuery.css( elem, "display" );
+
+			body.removeChild( iframe );
+		}
+
+		// Store the correct default display
+		elemdisplay[ nodeName ] = display;
+	}
+
+	return elemdisplay[ nodeName ];
+}
+
+
+
+
+var rtable = /^t(?:able|d|h)$/i,
+	rroot = /^(?:body|html)$/i;
+
+if ( "getBoundingClientRect" in document.documentElement ) {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0], box;
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		try {
+			box = elem.getBoundingClientRect();
+		} catch(e) {}
+
+		var doc = elem.ownerDocument,
+			docElem = doc.documentElement;
+
+		// Make sure we're not dealing with a disconnected DOM node
+		if ( !box || !jQuery.contains( docElem, elem ) ) {
+			return box ? { top: box.top, left: box.left } : { top: 0, left: 0 };
+		}
+
+		var body = doc.body,
+			win = getWindow(doc),
+			clientTop  = docElem.clientTop  || body.clientTop  || 0,
+			clientLeft = docElem.clientLeft || body.clientLeft || 0,
+			scrollTop  = win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop,
+			scrollLeft = win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft,
+			top  = box.top  + scrollTop  - clientTop,
+			left = box.left + scrollLeft - clientLeft;
+
+		return { top: top, left: left };
+	};
+
+} else {
+	jQuery.fn.offset = function( options ) {
+		var elem = this[0];
+
+		if ( options ) {
+			return this.each(function( i ) {
+				jQuery.offset.setOffset( this, options, i );
+			});
+		}
+
+		if ( !elem || !elem.ownerDocument ) {
+			return null;
+		}
+
+		if ( elem === elem.ownerDocument.body ) {
+			return jQuery.offset.bodyOffset( elem );
+		}
+
+		jQuery.offset.initialize();
+
+		var computedStyle,
+			offsetParent = elem.offsetParent,
+			prevOffsetParent = elem,
+			doc = elem.ownerDocument,
+			docElem = doc.documentElement,
+			body = doc.body,
+			defaultView = doc.defaultView,
+			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
+			top = elem.offsetTop,
+			left = elem.offsetLeft;
+
+		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
+			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+				break;
+			}
+
+			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
+			top  -= elem.scrollTop;
+			left -= elem.scrollLeft;
+
+			if ( elem === offsetParent ) {
+				top  += elem.offsetTop;
+				left += elem.offsetLeft;
+
+				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
+					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+				}
+
+				prevOffsetParent = offsetParent;
+				offsetParent = elem.offsetParent;
+			}
+
+			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
+				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
+				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
+			}
+
+			prevComputedStyle = computedStyle;
+		}
+
+		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
+			top  += body.offsetTop;
+			left += body.offsetLeft;
+		}
+
+		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
+			top  += Math.max( docElem.scrollTop, body.scrollTop );
+			left += Math.max( docElem.scrollLeft, body.scrollLeft );
+		}
+
+		return { top: top, left: left };
+	};
+}
+
+jQuery.offset = {
+	initialize: function() {
+		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
+			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
+
+		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
+
+		container.innerHTML = html;
+		body.insertBefore( container, body.firstChild );
+		innerDiv = container.firstChild;
+		checkDiv = innerDiv.firstChild;
+		td = innerDiv.nextSibling.firstChild.firstChild;
+
+		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
+		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
+
+		checkDiv.style.position = "fixed";
+		checkDiv.style.top = "20px";
+
+		// safari subtracts parent border width here which is 5px
+		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
+		checkDiv.style.position = checkDiv.style.top = "";
+
+		innerDiv.style.overflow = "hidden";
+		innerDiv.style.position = "relative";
+
+		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
+
+		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
+
+		body.removeChild( container );
+		jQuery.offset.initialize = jQuery.noop;
+	},
+
+	bodyOffset: function( body ) {
+		var top = body.offsetTop,
+			left = body.offsetLeft;
+
+		jQuery.offset.initialize();
+
+		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
+			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
+			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
+		}
+
+		return { top: top, left: left };
+	},
+
+	setOffset: function( elem, options, i ) {
+		var position = jQuery.css( elem, "position" );
+
+		// set position first, in-case top/left are set even on static elem
+		if ( position === "static" ) {
+			elem.style.position = "relative";
+		}
+
+		var curElem = jQuery( elem ),
+			curOffset = curElem.offset(),
+			curCSSTop = jQuery.css( elem, "top" ),
+			curCSSLeft = jQuery.css( elem, "left" ),
+			calculatePosition = (position === "absolute" || position === "fixed") && jQuery.inArray("auto", [curCSSTop, curCSSLeft]) > -1,
+			props = {}, curPosition = {}, curTop, curLeft;
+
+		// need to be able to calculate position if either top or left is auto and position is either absolute or fixed
+		if ( calculatePosition ) {
+			curPosition = curElem.position();
+			curTop = curPosition.top;
+			curLeft = curPosition.left;
+		} else {
+			curTop = parseFloat( curCSSTop ) || 0;
+			curLeft = parseFloat( curCSSLeft ) || 0;
+		}
+
+		if ( jQuery.isFunction( options ) ) {
+			options = options.call( elem, i, curOffset );
+		}
+
+		if (options.top != null) {
+			props.top = (options.top - curOffset.top) + curTop;
+		}
+		if (options.left != null) {
+			props.left = (options.left - curOffset.left) + curLeft;
+		}
+
+		if ( "using" in options ) {
+			options.using.call( elem, props );
+		} else {
+			curElem.css( props );
+		}
+	}
+};
+
+
+jQuery.fn.extend({
+	position: function() {
+		if ( !this[0] ) {
+			return null;
+		}
+
+		var elem = this[0],
+
+		// Get *real* offsetParent
+		offsetParent = this.offsetParent(),
+
+		// Get correct offsets
+		offset       = this.offset(),
+		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
+
+		// Subtract element margins
+		// note: when an element has margin: auto the offsetLeft and marginLeft
+		// are the same in Safari causing offset.left to incorrectly be 0
+		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
+		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
+
+		// Add offsetParent borders
+		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
+		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
+
+		// Subtract the two offsets
+		return {
+			top:  offset.top  - parentOffset.top,
+			left: offset.left - parentOffset.left
+		};
+	},
+
+	offsetParent: function() {
+		return this.map(function() {
+			var offsetParent = this.offsetParent || document.body;
+			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
+				offsetParent = offsetParent.offsetParent;
+			}
+			return offsetParent;
+		});
+	}
+});
+
+
+// Create scrollLeft and scrollTop methods
+jQuery.each( ["Left", "Top"], function( i, name ) {
+	var method = "scroll" + name;
+
+	jQuery.fn[ method ] = function( val ) {
+		var elem, win;
+
+		if ( val === undefined ) {
+			elem = this[ 0 ];
+
+			if ( !elem ) {
+				return null;
+			}
+
+			win = getWindow( elem );
+
+			// Return the scroll offset
+			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
+				jQuery.support.boxModel && win.document.documentElement[ method ] ||
+					win.document.body[ method ] :
+				elem[ method ];
+		}
+
+		// Set the scroll offset
+		return this.each(function() {
+			win = getWindow( this );
+
+			if ( win ) {
+				win.scrollTo(
+					!i ? val : jQuery( win ).scrollLeft(),
+					 i ? val : jQuery( win ).scrollTop()
+				);
+
+			} else {
+				this[ method ] = val;
+			}
+		});
+	};
+});
+
+function getWindow( elem ) {
+	return jQuery.isWindow( elem ) ?
+		elem :
+		elem.nodeType === 9 ?
+			elem.defaultView || elem.parentWindow :
+			false;
+}
+
+
+
+
+// Create width, height, innerHeight, innerWidth, outerHeight and outerWidth methods
+jQuery.each([ "Height", "Width" ], function( i, name ) {
+
+	var type = name.toLowerCase();
+
+	// innerHeight and innerWidth
+	jQuery.fn[ "inner" + name ] = function() {
+		var elem = this[0];
+		return elem && elem.style ?
+			parseFloat( jQuery.css( elem, type, "padding" ) ) :
+			null;
+	};
+
+	// outerHeight and outerWidth
+	jQuery.fn[ "outer" + name ] = function( margin ) {
+		var elem = this[0];
+		return elem && elem.style ?
+			parseFloat( jQuery.css( elem, type, margin ? "margin" : "border" ) ) :
+			null;
+	};
+
+	jQuery.fn[ type ] = function( size ) {
+		// Get window width or height
+		var elem = this[0];
+		if ( !elem ) {
+			return size == null ? null : this;
+		}
+
+		if ( jQuery.isFunction( size ) ) {
+			return this.each(function( i ) {
+				var self = jQuery( this );
+				self[ type ]( size.call( this, i, self[ type ]() ) );
+			});
+		}
+
+		if ( jQuery.isWindow( elem ) ) {
+			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
+			// 3rd condition allows Nokia support, as it supports the docElem prop but not CSS1Compat
+			var docElemProp = elem.document.documentElement[ "client" + name ];
+			return elem.document.compatMode === "CSS1Compat" && docElemProp ||
+				elem.document.body[ "client" + name ] || docElemProp;
+
+		// Get document width or height
+		} else if ( elem.nodeType === 9 ) {
+			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
+			return Math.max(
+				elem.documentElement["client" + name],
+				elem.body["scroll" + name], elem.documentElement["scroll" + name],
+				elem.body["offset" + name], elem.documentElement["offset" + name]
+			);
+
+		// Get or set width or height on the element
+		} else if ( size === undefined ) {
+			var orig = jQuery.css( elem, type ),
+				ret = parseFloat( orig );
+
+			return jQuery.isNaN( ret ) ? orig : ret;
+
+		// Set the width or height on the element (default to pixels if value is unitless)
+		} else {
+			return this.css( type, typeof size === "string" ? size : size + "px" );
+		}
+	};
+
+});
+
+
+// Expose jQuery to the global object
+window.jQuery = window.$ = jQuery;
+})(window);
diff --git a/common/js/jquery.min.js b/common/js/jquery.min.js
new file mode 100644
index 000000000..48590ecb9
--- /dev/null
+++ b/common/js/jquery.min.js
@@ -0,0 +1,18 @@
+/*!
+ * jQuery JavaScript Library v1.6.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Jun 30 14:16:56 2011 -0400
+ */
+(function(a,b){function cv(a){return f.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cs(a){if(!cg[a]){var b=c.body,d=f("<"+a+">").appendTo(b),e=d.css("display");d.remove();if(e==="none"||e===""){ch||(ch=c.createElement("iframe"),ch.frameBorder=ch.width=ch.height=0),b.appendChild(ch);if(!ci||!ch.createElement)ci=(ch.contentWindow||ch.contentDocument).document,ci.write((c.compatMode==="CSS1Compat"?"<!doctype html>":"")+"<html><body>"),ci.close();d=ci.createElement(a),ci.body.appendChild(d),e=f.css(d,"display"),b.removeChild(ch)}cg[a]=e}return cg[a]}function cr(a,b){var c={};f.each(cm.concat.apply([],cm.slice(0,b)),function(){c[this]=a});return c}function cq(){cn=b}function cp(){setTimeout(cq,0);return cn=f.now()}function cf(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function ce(){try{return new a.XMLHttpRequest}catch(b){}}function b$(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var d=a.dataTypes,e={},g,h,i=d.length,j,k=d[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h=="string"&&(e[h.toLowerCase()]=a.converters[h]);l=k,k=d[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=e[m]||e["* "+k];if(!n){p=b;for(o in e){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=e[j[1]+" "+k];if(p){o=e[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&f.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bZ(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bY(a,b,c,d){if(f.isArray(b))f.each(b,function(b,e){c||bC.test(a)?d(a,e):bY(a+"["+(typeof e=="object"||f.isArray(e)?b:"")+"]",e,c,d)});else if(!c&&b!=null&&typeof b=="object")for(var e in b)bY(a+"["+e+"]",b[e],c,d);else d(a,b)}function bX(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bR,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l=="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bX(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bX(a,c,d,e,"*",g));return l}function bW(a){return function(b,c){typeof b!="string"&&(c=b,b="*");if(f.isFunction(c)){var d=b.toLowerCase().split(bN),e=0,g=d.length,h,i,j;for(;e<g;e++)h=d[e],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bA(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=b==="width"?bv:bw;if(d>0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bx(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function bm(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(be,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bl(a){f.nodeName(a,"input")?bk(a):"getElementsByTagName"in a&&f.grep(a.getElementsByTagName("input"),bk)}function bk(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bj(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function bi(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bh(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c=f.expando,d=f.data(a),e=f.data(b,d);if(d=d[c]){var g=d.events;e=e[c]=f.extend({},d);if(g){delete e.handle,e.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)f.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function bg(a,b){return f.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function W(a,b,c){b=b||0;if(f.isFunction(b))return f.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return f.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=f.grep(a,function(a){return a.nodeType===1});if(R.test(b))return f.filter(b,d,!c);b=f.filter(b,d)}return f.grep(a,function(a,d){return f.inArray(a,b)>=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(a,b){return(a&&a!=="*"?a+".":"")+b.replace(z,"`").replace(A,"&")}function M(a){var b,c,d,e,g,h,i,j,k,l,m,n,o,p=[],q=[],r=f._data(this,"events");if(!(a.liveFired===this||!r||!r.live||a.target.disabled||a.button&&a.type==="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var s=r.live.slice(0);for(i=0;i<s.length;i++)g=s[i],g.origType.replace(x,"")===a.type?q.push(g.selector):s.splice(i--,1);e=f(a.target).closest(q,a.currentTarget);for(j=0,k=e.length;j<k;j++){m=e[j];for(i=0;i<s.length;i++){g=s[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,d=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,d=f(a.relatedTarget).closest(g.selector)[0],d&&f.contains(h,d)&&(d=h);(!d||d!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){e=p[j];if(c&&e.level>c)break;a.currentTarget=e.elem,a.data=e.handleObj.data,a.handleObj=e.handleObj,o=e.handleObj.origHandler.apply(e.elem,arguments);if(o===!1||a.isPropagationStopped()){c=e.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function K(a,c,d){var e=f.extend({},d[0]);e.type=a,e.originalEvent={},e.liveFired=b,f.event.handle.call(c,e),e.isDefaultPrevented()&&d[0].preventDefault()}function E(){return!0}function D(){return!1}function m(a,c,d){var e=c+"defer",g=c+"queue",h=c+"mark",i=f.data(a,e,b,!0);i&&(d==="queue"||!f.data(a,g,b,!0))&&(d==="mark"||!f.data(a,h,b,!0))&&setTimeout(function(){!f.data(a,g,b,!0)&&!f.data(a,h,b,!0)&&(f.removeData(a,e,!0),i.resolve())},0)}function l(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function k(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(j,"$1-$2").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNaN(d)?i.test(d)?f.parseJSON(d):d:parseFloat(d)}catch(g){}f.data(a,c,d)}else d=b}return d}var c=a.document,d=a.navigator,e=a.location,f=function(){function J(){if(!e.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(J,1);return}e.ready()}}var e=function(a,b){return new e.fn.init(a,b,h)},f=a.jQuery,g=a.$,h,i=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z])/ig,x=function(a,b){return b.toUpperCase()},y=d.userAgent,z,A,B,C=Object.prototype.toString,D=Object.prototype.hasOwnProperty,E=Array.prototype.push,F=Array.prototype.slice,G=String.prototype.trim,H=Array.prototype.indexOf,I={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.6.2",length:0,size:function(){return this.length},toArray:function(){return F.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?E.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),A.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(F.apply(this,arguments),"slice",F.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:E,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){d=i[c],f=a[c];if(i===f)continue;l&&f&&(e.isPlainObject(f)||(g=e.isArray(f)))?(g?(g=!1,h=d&&e.isArray(d)?d:[]):h=d&&e.isPlainObject(d)?d:{},i[c]=e.extend(l,h,f)):f!==b&&(i[c]=f)}return i},e.extend({noConflict:function(b){a.$===e&&(a.$=g),b&&a.jQuery===e&&(a.jQuery=f);return e},isReady:!1,readyWait:1,holdReady:function(a){a?e.readyWait++:e.ready(!0)},ready:function(a){if(a===!0&&!--e.readyWait||a!==!0&&!e.isReady){if(!c.body)return setTimeout(e.ready,1);e.isReady=!0;if(a!==!0&&--e.readyWait>0)return;A.resolveWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!A){A=e._Deferred();if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",B,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",B),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&J()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNaN:function(a){return a==null||!m.test(a)||isNaN(a)},type:function(a){return a==null?String(a):I[C.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;if(a.constructor&&!D.call(a,"constructor")&&!D.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a);return c===b||D.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(b,c,d){a.DOMParser?(d=new DOMParser,c=d.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),d=c.documentElement,(!d||!d.nodeName||d.nodeName==="parsererror")&&e.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(w,x)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g<h;)if(c.apply(a[g++],d)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(;g<h;)if(c.call(a[g],g,a[g++])===!1)break;return a},trim:G?function(a){return a==null?"":G.call(a)}:function(a){return a==null?"":(a+"").replace(k,"").replace(l,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var d=e.type(a);a.length==null||d==="string"||d==="function"||d==="regexp"||e.isWindow(a)?E.call(c,a):e.merge(c,a)}return c},inArray:function(a,b){if(H)return H.call(b,a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length=="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,c,d){var f,g,h=[],i=0,j=a.length,k=a instanceof e||j!==b&&typeof j=="number"&&(j>0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i<j;i++)f=c(a[i],i,d),f!=null&&(h[h.length]=f);else for(g in a)f=c(a[g],g,d),f!=null&&(h[h.length]=f);return h.concat.apply([],h)},guid:1,proxy:function(a,c){if(typeof c=="string"){var d=a[c];c=a,a=d}if(!e.isFunction(a))return b;var f=F.call(arguments,2),g=function(){return a.apply(c,f.concat(F.call(arguments)))};g.guid=a.guid=a.guid||g.guid||e.guid++;return g},access:function(a,c,d,f,g,h){var i=a.length;if(typeof c=="object"){for(var j in c)e.access(a,j,c[j],f,g,d);return a}if(d!==b){f=!h&&f&&e.isFunction(d);for(var k=0;k<i;k++)g(a[k],c,f?d.call(a[k],k,g(a[k],c)):d,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=s.exec(a)||t.exec(a)||u.exec(a)||a.indexOf("compatible")<0&&v.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}e.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function(d,f){f&&f instanceof e&&!(f instanceof a)&&(f=a(f));return e.fn.init.call(this,d,f,b)},a.fn.init.prototype=a.fn;var b=a(c);return a},browser:{}}),e.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){I["[object "+b+"]"]=b.toLowerCase()}),z=e.uaMatch(y),z.browser&&(e.browser[z.browser]=!0,e.browser.version=z.version),e.browser.webkit&&(e.browser.safari=!0),j.test(" ")&&(k=/^[\s\xA0]+/,l=/[\s\xA0]+$/),h=e(c),c.addEventListener?B=function(){c.removeEventListener("DOMContentLoaded",B,!1),e.ready()}:c.attachEvent&&(B=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",B),e.ready())});return e}(),g="done fail isResolved isRejected promise then always pipe".split(" "),h=[].slice;f.extend({_Deferred:function(){var a=[],b,c,d,e={done:function(){if(!d){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=f.type(i),j==="array"?e.done.apply(e,i):j==="function"&&a.push(i);k&&e.resolveWith(k[0],k[1])}return this},resolveWith:function(e,f){if(!d&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(e,f)}finally{b=[e,f],c=0}}return this},resolve:function(){e.resolveWith(this,arguments);return this},isResolved:function(){return!!c||!!b},cancel:function(){d=1,a=[];return this}};return e},Deferred:function(a){var b=f._Deferred(),c=f._Deferred(),d;f.extend(b,{then:function(a,c){b.done(a).fail(c);return this},always:function(){return b.done.apply(b,arguments).fail.apply(this,arguments)},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,pipe:function(a,c){return f.Deferred(function(d){f.each({done:[a,"resolve"],fail:[c,"reject"]},function(a,c){var e=c[0],g=c[1],h;f.isFunction(e)?b[a](function(){h=e.apply(this,arguments),h&&f.isFunction(h.promise)?h.promise().then(d.resolve,d.reject):d[g](h)}):b[a](d[g])})}).promise()},promise:function(a){if(a==null){if(d)return d;d=a={}}var c=g.length;while(c--)a[g[c]]=b[g[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?h.call(arguments,0):c,--e||g.resolveWith(g,h.call(b,0))}}var b=arguments,c=0,d=b.length,e=d,g=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred();if(d>1){for(;c<d;c++)b[c]&&f.isFunction(b[c].promise)?b[c].promise().then(i(c),g.reject):--e;e||g.resolveWith(g,b)}else g!==a&&g.resolveWith(g,d?[a]:[]);return g.promise()}}),f.support=function(){var a=c.createElement("div"),b=c.documentElement,d,e,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u;a.setAttribute("className","t"),a.innerHTML="   <link/><table></table><a href='/a' style='top:1px;float:left;opacity:.55;'>a</a><input type='checkbox'/>",d=a.getElementsByTagName("*"),e=a.getElementsByTagName("a")[0];if(!d||!d.length||!e)return{};g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=a.getElementsByTagName("input")[0],k={leadingWhitespace:a.firstChild.nodeType===3,tbody:!a.getElementsByTagName("tbody").length,htmlSerialize:!!a.getElementsByTagName("link").length,style:/top/.test(e.getAttribute("style")),hrefNormalized:e.getAttribute("href")==="/a",opacity:/^0.55$/.test(e.style.opacity),cssFloat:!!e.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,getSetAttribute:a.className!=="t",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0},i.checked=!0,k.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,k.optDisabled=!h.disabled;try{delete a.test}catch(v){k.deleteExpando=!1}!a.addEventListener&&a.attachEvent&&a.fireEvent&&(a.attachEvent("onclick",function(){k.noCloneEvent=!1}),a.cloneNode(!0).fireEvent("onclick")),i=c.createElement("input"),i.value="t",i.setAttribute("type","radio"),k.radioValue=i.value==="t",i.setAttribute("checked","checked"),a.appendChild(i),l=c.createDocumentFragment(),l.appendChild(a.firstChild),k.checkClone=l.cloneNode(!0).cloneNode(!0).lastChild.checked,a.innerHTML="",a.style.width=a.style.paddingLeft="1px",m=c.getElementsByTagName("body")[0],o=c.createElement(m?"div":"body"),p={visibility:"hidden",width:0,height:0,border:0,margin:0},m&&f.extend(p,{position:"absolute",left:-1e3,top:-1e3});for(t in p)o.style[t]=p[t];o.appendChild(a),n=m||b,n.insertBefore(o,n.firstChild),k.appendChecked=i.checked,k.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,k.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0),o.innerHTML="",n.removeChild(o);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var i=/^(?:\{.*\}|\[.*\])$/,j=/([a-z])([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!l(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g=f.expando,h=typeof c=="string",i,j=a.nodeType,k=j?f.cache:a,l=j?a[f.expando]:a[f.expando]&&f.expando;if((!l||e&&l&&!k[l][g])&&h&&d===b)return;l||(j?a[f.expando]=l=++f.uuid:l=f.expando),k[l]||(k[l]={},j||(k[l].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?k[l][g]=f.extend(k[l][g],c):k[l]=f.extend(k[l],c);i=k[l],e&&(i[g]||(i[g]={}),i=i[g]),d!==b&&(i[f.camelCase(c)]=d);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[f.camelCase(c)]||i[c]:i}},removeData:function(b,c,d){if(!!f.acceptData(b)){var e=f.expando,g=b.nodeType,h=g?f.cache:b,i=g?b[f.expando]:f.expando;if(!h[i])return;if(c){var j=d?h[i][e]:h[i];if(j){delete j[c];if(!l(j))return}}if(d){delete h[i][e];if(!l(h[i]))return}var k=h[i][e];f.support.deleteExpando||h!=a?delete h[i]:h[i]=null,k?(h[i]={},g||(h[i].toJSON=f.noop),h[i][e]=k):g&&(f.support.deleteExpando?delete b[f.expando]:b.removeAttribute?b.removeAttribute(f.expando):b[f.expando]=null)}},_data:function(a,b,c){return f.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=f.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),f.fn.extend({data:function(a,c){var d=null;if(typeof a=="undefined"){if(this.length){d=f.data(this[0]);if(this[0].nodeType===1){var e=this[0].attributes,g;for(var h=0,i=e.length;h<i;h++)g=e[h].name,g.indexOf("data-")===0&&(g=f.camelCase(g.substring(5)),k(this[0],g,d[g]))}}return d}if(typeof a=="object")return this.each(function(){f.data(this,a)});var j=a.split(".");j[1]=j[1]?"."+j[1]:"";if(c===b){d=this.triggerHandler("getData"+j[1]+"!",[j[0]]),d===b&&this.length&&(d=f.data(this[0],a),d=k(this[0],a,d));return d===b&&j[1]?this.data(j[0]):d}return this.each(function(){var b=f(this),d=[j[0],c];b.triggerHandler("setData"+j[1]+"!",d),f.data(this,a,c),b.triggerHandler("changeData"+j[1]+"!",d)})},removeData:function(a){return this.each(function(){f.removeData(this,a)})}}),f.extend({_mark:function(a,c){a&&(c=(c||"fx")+"mark",f.data(a,c,(f.data(a,c,b,!0)||0)+1,!0))},_unmark:function(a,c,d){a!==!0&&(d=c,c=a,a=!1);if(c){d=d||"fx";var e=d+"mark",g=a?0:(f.data(c,e,b,!0)||1)-1;g?f.data(c,e,g,!0):(f.removeData(c,e,!0),m(c,d,"mark"))}},queue:function(a,c,d){if(a){c=(c||"fx")+"queue";var e=f.data(a,c,b,!0);d&&(!e||f.isArray(d)?e=f.data(a,c,f.makeArray(d),!0):e.push(d));return e||[]}},dequeue:function(a,b){b=b||"fx";var c=f.queue(a,b),d=c.shift(),e;d==="inprogress"&&(d=c.shift()),d&&(b==="fx"&&c.unshift("inprogress"),d.call(a,function(){f.dequeue(a,b)})),c.length||(f.removeData(a,b+"queue",!0),m(a,b,"queue"))}}),f.fn.extend({queue:function(a,c){typeof a!="string"&&(c=a,a="fx");if(c===b)return f.queue(this[0],a);return this.each(function(){var b=f.queue(this,a,c);a==="fx"&&b[0]!=="inprogress"&&f.dequeue(this,a)})},dequeue:function(a){return this.each(function(){f.dequeue(this,a)})},delay:function(a,b){a=f.fx?f.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){f.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){function m(){--h||d.resolveWith(e,[e])}typeof a!="string"&&(c=a,a=b),a=a||"fx";var d=f.Deferred(),e=this,g=e.length,h=1,i=a+"defer",j=a+"queue",k=a+"mark",l;while(g--)if(l=f.data(e[g],i,b,!0)||(f.data(e[g],j,b,!0)||f.data(e[g],k,b,!0))&&f.data(e[g],i,f._Deferred(),!0))h++,l.done(m);m();return d.promise()}});var n=/[\n\t\r]/g,o=/\s+/,p=/\r/g,q=/^(?:button|input)$/i,r=/^(?:button|input|object|select|textarea)$/i,s=/^a(?:rea)?$/i,t=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,u=/\:|^on/,v,w;f.fn.extend({attr:function(a,b){return f.access(this,a,b,!0,f.attr)},removeAttr:function(a){return this.each(function(){f.removeAttr(this,a)})},prop:function(a,b){return f.access(this,a,b,!0,f.prop)},removeProp:function(a){a=f.propFix[a]||a;return this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,g,h,i;if(f.isFunction(a))return this.each(function(b){f(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(o);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{g=" "+e.className+" ";for(h=0,i=b.length;h<i;h++)~g.indexOf(" "+b[h]+" ")||(g+=b[h]+" ");e.className=f.trim(g)}}}return this},removeClass:function(a){var c,d,e,g,h,i,j;if(f.isFunction(a))return this.each(function(b){f(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(o);for(d=0,e=this.length;d<e;d++){g=this[d];if(g.nodeType===1&&g.className)if(a){h=(" "+g.className+" ").replace(n," ");for(i=0,j=c.length;i<j;i++)h=h.replace(" "+c[i]+" "," ");g.className=f.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";if(f.isFunction(a))return this.each(function(c){f(this).toggleClass(a.call(this,c,this.className,b),b)});return this.each(function(){if(c==="string"){var e,g=0,h=f(this),i=b,j=a.split(o);while(e=j[g++])i=d?i:!h.hasClass(e),h[i?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&f._data(this,"__className__",this.className),this.className=this.className||a===!1?"":f._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(n," ").indexOf(b)>-1)return!0;return!1},val:function(a){var c,d,e=this[0];if(!arguments.length){if(e){c=f.valHooks[e.nodeName.toLowerCase()]||f.valHooks[e.type];if(c&&"get"in c&&(d=c.get(e,"value"))!==b)return d;d=e.value;return typeof d=="string"?d.replace(p,""):d==null?"":d}return b}var g=f.isFunction(a);return this.each(function(d){var e=f(this),h;if(this.nodeType===1){g?h=a.call(this,d,e.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c=a.selectedIndex,d=[],e=a.options,g=a.type==="select-one";if(c<0)return null;for(var h=g?c:0,i=g?c+1:e.length;h<i;h++){var j=e[h];if(j.selected&&(f.support.optDisabled?!j.disabled:j.getAttribute("disabled")===null)&&(!j.parentNode.disabled||!f.nodeName(j.parentNode,"optgroup"))){b=f(j).val();if(g)return b;d.push(b)}}if(g&&!d.length&&e.length)return f(e[c]).val();return d},set:function(a,b){var c=f.makeArray(b);f(a).find("option").each(function(){this.selected=f.inArray(f(this).val(),c)>=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attrFix:{tabindex:"tabIndex"},attr:function(a,c,d,e){var g=a.nodeType;if(!a||g===3||g===8||g===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);var h,i,j=g!==1||!f.isXMLDoc(a);j&&(c=f.attrFix[c]||c,i=f.attrHooks[c],i||(t.test(c)?i=w:v&&c!=="className"&&(f.nodeName(a,"form")||u.test(c))&&(i=v)));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(i&&"set"in i&&j&&(h=i.set(a,d,c))!==b)return h;a.setAttribute(c,""+d);return d}if(i&&"get"in i&&j&&(h=i.get(a,c))!==null)return h;h=a.getAttribute(c);return h===null?b:h},removeAttr:function(a,b){var c;a.nodeType===1&&(b=f.attrFix[b]||b,f.support.getSetAttribute?a.removeAttribute(b):(f.attr(a,b,""),a.removeAttributeNode(a.getAttributeNode(b))),t.test(b)&&(c=f.propFix[b]||b)in a&&(a[c]=!1))},attrHooks:{type:{set:function(a,b){if(q.test(a.nodeName)&&a.parentNode)f.error("type property can't be changed");else if(!f.support.radioValue&&b==="radio"&&f.nodeName(a,"input")){var c=a.value;a.setAttribute("type",b),c&&(a.value=c);return b}}},tabIndex:{get:function(a){var c=a.getAttributeNode("tabIndex");return c&&c.specified?parseInt(c.value,10):r.test(a.nodeName)||s.test(a.nodeName)&&a.href?0:b}},value:{get:function(a,b){if(v&&f.nodeName(a,"button"))return v.get(a,b);return b in a?a.value:null},set:function(a,b,c){if(v&&f.nodeName(a,"button"))return v.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e=a.nodeType;if(!a||e===3||e===8||e===2)return b;var g,h,i=e!==1||!f.isXMLDoc(a);i&&(c=f.propFix[c]||c,h=f.propHooks[c]);return d!==b?h&&"set"in h&&(g=h.set(a,d,c))!==b?g:a[c]=d:h&&"get"in h&&(g=h.get(a,c))!==b?g:a[c]},propHooks:{}}),w={get:function(a,c){return f.prop(a,c)?c.toLowerCase():b},set:function(a,b,c){var d;b===!1?f.removeAttr(a,c):(d=f.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase()));return c}},f.support.getSetAttribute||(f.attrFix=f.propFix,v=f.attrHooks.name=f.attrHooks.title=f.valHooks.button={get:function(a,c){var d;d=a.getAttributeNode(c);return d&&d.nodeValue!==""?d.nodeValue:b},set:function(a,b,c){var d=a.getAttributeNode(c);if(d){d.nodeValue=b;return b}}},f.each(["width","height"],function(a,b){f.attrHooks[b]=f.extend(f.attrHooks[b],{set:function(a,c){if(c===""){a.setAttribute(b,"auto");return c}}})})),f.support.hrefNormalized||f.each(["href","src","width","height"],function(a,c){f.attrHooks[c]=f.extend(f.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),f.support.style||(f.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=""+b}}),f.support.optSelected||(f.propHooks.selected=f.extend(f.propHooks.selected,{get:function(a){var b=a.parentNode;b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex)}})),f.support.checkOn||f.each(["radio","checkbox"],function(){f.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),f.each(["radio","checkbox"],function(){f.valHooks[this]=f.extend(f.valHooks[this],{set:function(a,b){if(f.isArray(b))return a.checked=f.inArray(f(a).val(),b)>=0}})});var x=/\.(.*)$/,y=/^(?:textarea|input|select)$/i,z=/\./g,A=/ /g,B=/[^\w\s.|`]/g,C=function(a){return a.replace(B,"\\$&")};f.event={add:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){if(d===!1)d=D;else if(!d)return;var g,h;d.handler&&(g=d,d=g.handler),d.guid||(d.guid=f.guid++);var i=f._data(a);if(!i)return;var j=i.events,k=i.handle;j||(i.events=j={}),k||(i.handle=k=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.handle.apply(k.elem,arguments):b}),k.elem=a,c=c.split(" ");var l,m=0,n;while(l=c[m++]){h=g?f.extend({},g):{handler:d,data:e},l.indexOf(".")>-1?(n=l.split("."),l=n.shift(),h.namespace=n.slice(0).sort().join(".")):(n=[],h.namespace=""),h.type=l,h.guid||(h.guid=d.guid);var o=j[l],p=f.event.special[l]||{};if(!o){o=j[l]=[];if(!p.setup||p.setup.call(a,e,n,k)===!1)a.addEventListener?a.addEventListener(l,k,!1):a.attachEvent&&a.attachEvent("on"+l,k)}p.add&&(p.add.call(a,h),h.handler.guid||(h.handler.guid=d.guid)),o.push(h),f.event.global[l]=!0}a=null}},global:{},remove:function(a,c,d,e){if(a.nodeType!==3&&a.nodeType!==8){d===!1&&(d=D);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=f.hasData(a)&&f._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(d=c.handler,c=c.type);if(!c||typeof c=="string"&&c.charAt(0)==="."){c=c||"";for(h in t)f.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+f.map(m.slice(0).sort(),C).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!d){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))f.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=f.event.special[h]||{};for(j=e||0;j<p.length;j++){q=p[j];if(d.guid===q.guid){if(l||n.test(q.namespace))e==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(e!=null)break}}if(p.length===0||e!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&f.removeEvent(a,h,s.handle),g=null,delete t[h]}if(f.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,f.isEmptyObject(s)&&f.removeData(a,b,!0)}}},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,e,g){var h=c.type||c,i=[],j;h.indexOf("!")>=0&&(h=h.slice(0,-1),j=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.
+shift(),i.sort());if(!!e&&!f.event.customEvent[h]||!!f.event.global[h]){c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.exclusive=j,c.namespace=i.join("."),c.namespace_re=new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)");if(g||!e)c.preventDefault(),c.stopPropagation();if(!e){f.each(f.cache,function(){var a=f.expando,b=this[a];b&&b.events&&b.events[h]&&f.event.trigger(c,d,b.handle.elem)});return}if(e.nodeType===3||e.nodeType===8)return;c.result=b,c.target=e,d=d!=null?f.makeArray(d):[],d.unshift(c);var k=e,l=h.indexOf(":")<0?"on"+h:"";do{var m=f._data(k,"handle");c.currentTarget=k,m&&m.apply(k,d),l&&f.acceptData(k)&&k[l]&&k[l].apply(k,d)===!1&&(c.result=!1,c.preventDefault()),k=k.parentNode||k.ownerDocument||k===c.target.ownerDocument&&a}while(k&&!c.isPropagationStopped());if(!c.isDefaultPrevented()){var n,o=f.event.special[h]||{};if((!o._default||o._default.call(e.ownerDocument,c)===!1)&&(h!=="click"||!f.nodeName(e,"a"))&&f.acceptData(e)){try{l&&e[h]&&(n=e[l],n&&(e[l]=null),f.event.triggered=h,e[h]())}catch(p){}n&&(e[l]=n),f.event.triggered=b}}return c.result}},handle:function(c){c=f.event.fix(c||a.event);var d=((f._data(this,"events")||{})[c.type]||[]).slice(0),e=!c.exclusive&&!c.namespace,g=Array.prototype.slice.call(arguments,0);g[0]=c,c.currentTarget=this;for(var h=0,i=d.length;h<i;h++){var j=d[h];if(e||c.namespace_re.test(j.namespace)){c.handler=j.handler,c.data=j.data,c.handleObj=j;var k=j.handler.apply(this,g);k!==b&&(c.result=k,k===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[f.expando])return a;var d=a;a=f.Event(d);for(var e=this.props.length,g;e;)g=this.props[--e],a[g]=d[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=a.target.ownerDocument||c,i=h.documentElement,j=h.body;a.pageX=a.clientX+(i&&i.scrollLeft||j&&j.scrollLeft||0)-(i&&i.clientLeft||j&&j.clientLeft||0),a.pageY=a.clientY+(i&&i.scrollTop||j&&j.scrollTop||0)-(i&&i.clientTop||j&&j.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:f.proxy,special:{ready:{setup:f.bindReady,teardown:f.noop},live:{add:function(a){f.event.add(this,N(a.origType,a.selector),f.extend({},a,{handler:M,guid:a.handler.guid}))},remove:function(a){f.event.remove(this,N(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){f.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},f.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},f.Event=function(a,b){if(!this.preventDefault)return new f.Event(a,b);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?E:D):this.type=a,b&&f.extend(this,b),this.timeStamp=f.now(),this[f.expando]=!0},f.Event.prototype={preventDefault:function(){this.isDefaultPrevented=E;var a=this.originalEvent;!a||(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=E;var a=this.originalEvent;!a||(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=E,this.stopPropagation()},isDefaultPrevented:D,isPropagationStopped:D,isImmediatePropagationStopped:D};var F=function(a){var b=a.relatedTarget,c=!1,d=a.type;a.type=a.data,b!==this&&(b&&(c=f.contains(this,b)),c||(f.event.handle.apply(this,arguments),a.type=d))},G=function(a){a.type=a.data,f.event.handle.apply(this,arguments)};f.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){f.event.special[a]={setup:function(c){f.event.add(this,b,c&&c.selector?G:F,a)},teardown:function(a){f.event.remove(this,b,a&&a.selector?G:F)}}}),f.support.submitBubbles||(f.event.special.submit={setup:function(a,b){if(!f.nodeName(this,"form"))f.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&f(b).closest("form").length&&K("submit",this,arguments)}),f.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&f(b).closest("form").length&&a.keyCode===13&&K("submit",this,arguments)});else return!1},teardown:function(a){f.event.remove(this,".specialSubmit")}});if(!f.support.changeBubbles){var H,I=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?f.map(a.options,function(a){return a.selected}).join("-"):"":f.nodeName(a,"select")&&(c=a.selectedIndex);return c},J=function(c){var d=c.target,e,g;if(!!y.test(d.nodeName)&&!d.readOnly){e=f._data(d,"_change_data"),g=I(d),(c.type!=="focusout"||d.type!=="radio")&&f._data(d,"_change_data",g);if(e===b||g===e)return;if(e!=null||g)c.type="change",c.liveFired=b,f.event.trigger(c,arguments[1],d)}};f.event.special.change={filters:{focusout:J,beforedeactivate:J,click:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(c==="radio"||c==="checkbox"||f.nodeName(b,"select"))&&J.call(this,a)},keydown:function(a){var b=a.target,c=f.nodeName(b,"input")?b.type:"";(a.keyCode===13&&!f.nodeName(b,"textarea")||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&J.call(this,a)},beforeactivate:function(a){var b=a.target;f._data(b,"_change_data",I(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in H)f.event.add(this,c+".specialChange",H[c]);return y.test(this.nodeName)},teardown:function(a){f.event.remove(this,".specialChange");return y.test(this.nodeName)}},H=f.event.special.change.filters,H.focus=H.beforeactivate}f.support.focusinBubbles||f.each({focus:"focusin",blur:"focusout"},function(a,b){function e(a){var c=f.event.fix(a);c.type=b,c.originalEvent={},f.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var d=0;f.event.special[b]={setup:function(){d++===0&&c.addEventListener(a,e,!0)},teardown:function(){--d===0&&c.removeEventListener(a,e,!0)}}}),f.each(["bind","one"],function(a,c){f.fn[c]=function(a,d,e){var g;if(typeof a=="object"){for(var h in a)this[c](h,d,a[h],e);return this}if(arguments.length===2||d===!1)e=d,d=b;c==="one"?(g=function(a){f(this).unbind(a,g);return e.apply(this,arguments)},g.guid=e.guid||f.guid++):g=e;if(a==="unload"&&c!=="one")this.one(a,d,e);else for(var i=0,j=this.length;i<j;i++)f.event.add(this[i],a,g,d);return this}}),f.fn.extend({unbind:function(a,b){if(typeof a=="object"&&!a.preventDefault)for(var c in a)this.unbind(c,a[c]);else for(var d=0,e=this.length;d<e;d++)f.event.remove(this[d],a,b);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){f.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return f.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||f.guid++,d=0,e=function(c){var e=(f.data(this,"lastToggle"+a.guid)||0)%d;f.data(this,"lastToggle"+a.guid,e+1),c.preventDefault();return b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var L={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};f.each(["live","die"],function(a,c){f.fn[c]=function(a,d,e,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:f(this.context);if(typeof a=="object"&&!a.preventDefault){for(var o in a)n[c](o,d,a[o],m);return this}if(c==="die"&&!a&&g&&g.charAt(0)==="."){n.unbind(g);return this}if(d===!1||f.isFunction(d))e=d||D,d=b;a=(a||"").split(" ");while((h=a[i++])!=null){j=x.exec(h),k="",j&&(k=j[0],h=h.replace(x,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,L[h]?(a.push(L[h]+k),h=h+k):h=(L[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)f.event.add(n[p],"live."+N(h,m),{data:d,selector:m,handler:e,origType:h,origHandler:e,preType:l});else n.unbind("live."+N(h,m),e)}return this}}),f.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){f.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d=0,e=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,f,g){f=f||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return f;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(e.call(n)==="[object Array]")if(!u)f.push.apply(f,n);else if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&f.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&f.push(j[t]);else p(n,f);o&&(k(o,h,f,g),k.uniqueSort(f));return f};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(!f)g=o=!0;else if(f===!0)continue}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b=="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1);a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("parentNode",b,f,a,e,c)},"~":function(a,b,c){var e,f=d++,g=u;typeof b=="string"&&!j.test(b)&&(b=b.toLowerCase(),e=b,g=t),g("previousSibling",b,f,a,e,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=d++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(e.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var f=a.length;c<f;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){if(a===b){g=!0;return 0}if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};f.find=k,f.expr=k.selectors,f.expr[":"]=f.expr.filters,f.unique=k.uniqueSort,f.text=k.getText,f.isXMLDoc=k.isXML,f.contains=k.contains}();var O=/Until$/,P=/^(?:parents|prevUntil|prevAll)/,Q=/,/,R=/^.[^:#\[\.,]*$/,S=Array.prototype.slice,T=f.expr.match.POS,U={children:!0,contents:!0,next:!0,prev:!0};f.fn.extend({find:function(a){var b=this,c,d;if(typeof a!="string")return f(a).filter(function(){for(c=0,d=b.length;c<d;c++)if(f.contains(b[c],this))return!0});var e=this.pushStack("","find",a),g,h,i;for(c=0,d=this.length;c<d;c++){g=e.length,f.find(a,this[c],e);if(c>0)for(h=g;h<e.length;h++)for(i=0;i<g;i++)if(e[i]===e[h]){e.splice(h--,1);break}}return e},has:function(a){var b=f(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(f.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(W(this,a,!1),"not",a)},filter:function(a){return this.pushStack(W(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(d=0,e=a.length;d<e;d++)i=a[d],j[i]||(j[i]=T.test(i)?f(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:f(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=T.test(a)||typeof a!="string"?f(a,b||this.context):0;for(d=0,e=this.length;d<e;d++){g=this[d];while(g){if(l?l.index(g)>-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a=="string")return f.inArray(this[0],a?f(a):this.parent().children());return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var X=/ jQuery\d+="(?:\d+|null)"/g,Y=/^\s+/,Z=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,$=/<([\w:]+)/,_=/<tbody/i,ba=/<|&#?\w+;/,bb=/<(?:script|object|embed|option|style)/i,bc=/checked\s*(?:[^=]|=\s*.checked.)/i,bd=/\/(java|ecma)script/i,be=/^\s*<!(?:\[CDATA\[|\-\-)/,bf={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};bf.optgroup=bf.option,bf.tbody=bf.tfoot=bf.colgroup=bf.caption=bf.thead,bf.th=bf.td,f.support.htmlSerialize||(bf._default=[1,"div<div>","</div>"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(X,""):null;if(typeof a=="string"&&!bb.test(a)&&(f.support.leadingWhitespace||!Y.test(a))&&!bf[($.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Z,"<$1></$2>");try{for(var c=0,d=this.length;c<d;c++)this[c].nodeType===1&&(f.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(e){this.empty().append(a)}}else f.isFunction(a)?this.each(function(b){var c=f(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(f.isFunction(a))return this.each(function(b){var c=f(this),d=c.html();c.replaceWith(a.call(this,b,d))});typeof a!="string"&&(a=f(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;f(this).remove(),b?f(b).before(a):f(c).append(a)})}return this.length?this.pushStack(f(f.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){var e,g,h,i,j=a[0],k=[];if(!f.support.checkClone&&arguments.length===3&&typeof j=="string"&&bc.test(j))return this.each(function(){f(this).domManip(a,c,d,!0)});if(f.isFunction(j))return this.each(function(e){var g=f(this);a[0]=j.call(this,e,c?g.html():b),g.domManip(a,c,d)});if(this[0]){i=j&&j.parentNode,f.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?e={fragment:i}:e=f.buildFragment(a,this,k),h=e.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&f.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)d.call(c?bg(this[l],g):this[l],e.cacheable||m>1&&l<n?f.clone(h,!0,!0):h)}k.length&&f.each(k,bm)}return this}}),f.buildFragment=function(a,b,d){var e,g,h,i;b&&b[0]&&(i=b[0].ownerDocument||b[0]),i.createDocumentFragment||(i=c),a.length===1&&typeof a[0]=="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!bb.test(a[0])&&(f.support.checkClone||!bc.test(a[0]))&&(g=!0,h=f.fragments[a[0]],h&&h!==1&&(e=h)),e||(e=i.createDocumentFragment(),f.clean(a,i,e,d)),g&&(f.fragments[a[0]]=h?e:1);return{fragment:e,cacheable:g}},f.fragments={},f.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){f.fn[a]=function(c){var d=[],e=f(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&e.length===1){e[b](this[0]);return this}for(var h=0,i=e.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j
+)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bi(a,d),e=bj(a),g=bj(d);for(h=0;e[h];++h)bi(e[h],g[h])}if(b){bh(a,d);if(c){e=bj(a),g=bj(d);for(h=0;e[h];++h)bh(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!ba.test(k))k=b.createTextNode(k);else{k=k.replace(Z,"<$1></$2>");var l=($.exec(k)||["",""])[1].toLowerCase(),m=bf[l]||bf._default,n=m[0],o=b.createElement("div");o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=_.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]==="<table>"&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&Y.test(k)&&o.insertBefore(b.createTextNode(Y.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i<r;i++)bl(k[i]);else bl(k);k.nodeType?h.push(k):h=f.merge(h,k)}if(d){g=function(a){return!a.type||bd.test(a.type)};for(j=0;h[j];j++)if(e&&f.nodeName(h[j],"script")&&(!h[j].type||h[j].type.toLowerCase()==="text/javascript"))e.push(h[j].parentNode?h[j].parentNode.removeChild(h[j]):h[j]);else{if(h[j].nodeType===1){var s=f.grep(h[j].getElementsByTagName("script"),g);h.splice.apply(h,[j+1,0].concat(s))}d.appendChild(h[j])}}return h},cleanData:function(a){var b,c,d=f.cache,e=f.expando,g=f.event.special,h=f.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&f.noData[j.nodeName.toLowerCase()])continue;c=j[f.expando];if(c){b=d[c]&&d[c][e];if(b&&b.events){for(var k in b.events)g[k]?f.event.remove(j,k):f.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[f.expando]:j.removeAttribute&&j.removeAttribute(f.expando),delete d[c]}}}});var bn=/alpha\([^)]*\)/i,bo=/opacity=([^)]*)/,bp=/([A-Z]|^ms)/g,bq=/^-?\d+(?:px)?$/i,br=/^-?\d/,bs=/^[+\-]=/,bt=/[^+\-\.\de]+/g,bu={position:"absolute",visibility:"hidden",display:"block"},bv=["Left","Right"],bw=["Top","Bottom"],bx,by,bz;f.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return f.access(this,a,c,!0,function(a,c,d){return d!==b?f.style(a,c,d):f.css(a,c)})},f.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bx(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":f.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!!a&&a.nodeType!==3&&a.nodeType!==8&&!!a.style){var g,h,i=f.camelCase(c),j=a.style,k=f.cssHooks[i];c=f.cssProps[i]||i;if(d===b){if(k&&"get"in k&&(g=k.get(a,!1,e))!==b)return g;return j[c]}h=typeof d;if(h==="number"&&isNaN(d)||d==null)return;h==="string"&&bs.test(d)&&(d=+d.replace(bt,"")+parseFloat(f.css(a,c)),h="number"),h==="number"&&!f.cssNumber[i]&&(d+="px");if(!k||!("set"in k)||(d=k.set(a,d))!==b)try{j[c]=d}catch(l){}}},css:function(a,c,d){var e,g;c=f.camelCase(c),g=f.cssHooks[c],c=f.cssProps[c]||c,c==="cssFloat"&&(c="float");if(g&&"get"in g&&(e=g.get(a,!0,d))!==b)return e;if(bx)return bx(a,c)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]}}),f.curCSS=f.css,f.each(["height","width"],function(a,b){f.cssHooks[b]={get:function(a,c,d){var e;if(c){if(a.offsetWidth!==0)return bA(a,b,d);f.swap(a,bu,function(){e=bA(a,b,d)});return e}},set:function(a,b){if(!bq.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bo.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle;c.zoom=1;var e=f.isNaN(b)?"":"alpha(opacity="+b*100+")",g=d&&d.filter||c.filter||"";c.filter=bn.test(g)?g.replace(bn,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bx(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(by=function(a,c){var d,e,g;c=c.replace(bp,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bz=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bq.test(d)&&br.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bx=by||bz,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bB=/%20/g,bC=/\[\]$/,bD=/\r?\n/g,bE=/#.*$/,bF=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bG=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bH=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,bI=/^(?:GET|HEAD)$/,bJ=/^\/\//,bK=/\?/,bL=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bM=/^(?:select|textarea)/i,bN=/\s+/,bO=/([?&])_=[^&]*/,bP=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bQ=f.fn.load,bR={},bS={},bT,bU;try{bT=e.href}catch(bV){bT=c.createElement("a"),bT.href="",bT=bT.href}bU=bP.exec(bT.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bQ)return bQ.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("<div>").append(c.replace(bL,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bM.test(this.nodeName)||bG.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bD,"\r\n")}}):{name:b.name,value:c.replace(bD,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?f.extend(!0,a,f.ajaxSettings,b):(b=a,a=f.extend(!0,f.ajaxSettings,b));for(var c in{context:1,url:1})c in b?a[c]=b[c]:c in f.ajaxSettings&&(a[c]=f.ajaxSettings[c]);return a},ajaxSettings:{url:bT,isLocal:bH.test(bU[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML}},ajaxPrefilter:bW(bR),ajaxTransport:bW(bS),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a?4:0;var o,r,u,w=l?bZ(d,v,l):b,x,y;if(a>=200&&a<300||a===304){if(d.ifModified){if(x=v.getResponseHeader("Last-Modified"))f.lastModified[k]=x;if(y=v.getResponseHeader("Etag"))f.etag[k]=y}if(a===304)c="notmodified",o=!0;else try{r=b$(d,w),c="success",o=!0}catch(z){c="parsererror",u=z}}else{u=c;if(!c||a)c="error",a<0&&(a=0)}v.status=a,v.statusText=c,o?h.resolveWith(e,[r,c,v]):h.rejectWith(e,[v,c,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.resolveWith(e,[v,c]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f._Deferred(),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bF.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.done,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bE,"").replace(bJ,bU[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bN),d.crossDomain==null&&(r=bP.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bU[1]&&r[2]==bU[2]&&(r[3]||(r[1]==="http:"?80:443))==(bU[3]||(bU[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),bX(bR,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bI.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bK.test(d.url)?"&":"?")+d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bO,"$1_="+x);d.url=y+(y===d.url?(bK.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", */*; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=bX(bS,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){status<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)bY(g,a[g],c,e);return d.join("&").replace(bB,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var b_=f.now(),ca=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+b_++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(ca.test(b.url)||e&&ca.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(ca,l),b.url===j&&(e&&(k=k.replace(ca,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var cb=a.ActiveXObject?function(){for(var a in cd)cd[a](0,1)}:!1,cc=0,cd;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ce()||cf()}:ce,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,cb&&delete cd[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++cc,cb&&(cd||(cd={},f(a).unload(cb)),cd[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cg={},ch,ci,cj=/^(?:toggle|show|hide)$/,ck=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cl,cm=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],cn,co=a.webkitRequestAnimationFrame||a.mozRequestAnimationFrame||a.oRequestAnimationFrame;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cr("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)d=this[g],d.style&&(e=d.style.display,!f._data(d,"olddisplay")&&e==="none"&&(e=d.style.display=""),e===""&&f.css(d,"display")==="none"&&f._data(d,"olddisplay",cs(d.nodeName)));for(g=0;g<h;g++){d=this[g];if(d.style){e=d.style.display;if(e===""||e==="none")d.style.display=f._data(d,"olddisplay")||""}}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cr("hide",3),a,b,c);for(var d=0,e=this.length;d<e;d++)if(this[d].style){var g=f.css(this[d],"display");g!=="none"&&!f._data(this[d],"olddisplay")&&f._data(this[d],"olddisplay",g)}for(d=0;d<e;d++)this[d].style&&(this[d].style.display="none");return this},_toggle:f.fn.toggle,toggle:function(a,b,c){var d=typeof a=="boolean";f.isFunction(a)&&f.isFunction(b)?this._toggle.apply(this,arguments):a==null||d?this.each(function(){var b=d?a:f(this).is(":hidden");f(this)[b?"show":"hide"]()}):this.animate(cr("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=f.speed(b,c,d);if(f.isEmptyObject(a))return this.each(e.complete,[!1]);a=f.extend({},a);return this[e.queue===!1?"each":"queue"](function(){e.queue===!1&&f._mark(this);var b=f.extend({},e),c=this.nodeType===1,d=c&&f(this).is(":hidden"),g,h,i,j,k,l,m,n,o;b.animatedProperties={};for(i in a){g=f.camelCase(i),i!==g&&(a[g]=a[i],delete a[i]),h=a[g],f.isArray(h)?(b.animatedProperties[g]=h[1],h=a[g]=h[0]):b.animatedProperties[g]=b.specialEasing&&b.specialEasing[g]||b.easing||"swing";if(h==="hide"&&d||h==="show"&&!d)return b.complete.call(this);c&&(g==="height"||g==="width")&&(b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY],f.css(this,"display")==="inline"&&f.css(this,"float")==="none"&&(f.support.inlineBlockNeedsLayout?(j=cs(this.nodeName),j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)):this.style.display="inline-block"))}b.overflow!=null&&(this.style.overflow="hidden");for(i in a)k=new f.fx(this,b,i),h=a[i],cj.test(h)?k[h==="toggle"?d?"show":"hide":h]():(l=ck.exec(h),m=k.cur(),l?(n=parseFloat(l[2]),o=l[3]||(f.cssNumber[i]?"":"px"),o!=="px"&&(f.style(this,i,(n||1)+o),m=(n||1)/k.cur()*m,f.style(this,i,m+o)),l[1]&&(n=(l[1]==="-="?-1:1)*n+m),k.custom(m,n,o)):k.custom(m,h,""));return!0})},stop:function(a,b){a&&this.queue([]),this.each(function(){var a=f.timers,c=a.length;b||f._unmark(!0,this);while(c--)a[c].elem===this&&(b&&a[c](!0),a.splice(c,1))}),b||this.dequeue();return this}}),f.each({slideDown:cr("show",1),slideUp:cr("hide",1),slideToggle:cr("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){f.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),f.extend({speed:function(a,b,c){var d=a&&typeof a=="object"?f.extend({},a):{complete:c||!c&&b||f.isFunction(a)&&a,duration:a,easing:c&&b||b&&!f.isFunction(b)&&b};d.duration=f.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in f.fx.speeds?f.fx.speeds[d.duration]:f.fx.speeds._default,d.old=d.complete,d.complete=function(a){f.isFunction(d.old)&&d.old.call(this),d.queue!==!1?f.dequeue(this):a!==!1&&f._unmark(this)};return d},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig=b.orig||{}}}),f.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(f.fx.step[this.prop]||f.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=f.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function h(a){return d.step(a)}var d=this,e=f.fx,g;this.startTime=cn||cp(),this.start=a,this.end=b,this.unit=c||this.unit||(f.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,h.elem=this.elem,h()&&f.timers.push(h)&&!cl&&(co?(cl=!0,g=function(){cl&&(co(g),e.tick())},co(g)):cl=setInterval(e.tick,e.interval))},show:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),f(this.elem).show()},hide:function(){this.options.orig[this.prop]=f.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=cn||cp(),c=!0,d=this.elem,e=this.options,g,h;if(a||b>=e.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),e.animatedProperties[this.prop]=!0;for(g in e.animatedProperties)e.animatedProperties[g]!==!0&&(c=!1);if(c){e.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){d.style["overflow"+b]=e.overflow[a]}),e.hide&&f(d).hide();if(e.hide||e.show)for(var i in e.animatedProperties)f.style(d,i,e.orig[i]);e.complete.call(d)}return!1}e.duration==Infinity?this.now=b:(h=b-this.startTime,this.state=h/e.duration,this.pos=f.easing[e.animatedProperties[this.prop]](this.state,h,0,1,e.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){for(var a=f.timers,b=0;b<a.length;++b)a[b]()||a.splice(b--,1);a.length||f.fx.stop()},interval:13,stop:function(){clearInterval(cl),cl=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){f.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),f.expr&&f.expr.filters&&(f.expr.filters.animated=function(a){return f.grep(f.timers,function(b){return a===b.elem}).length});var ct=/^t(?:able|d|h)$/i,cu=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?f.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(d){}var e=b.ownerDocument,g=e.documentElement;if(!c||!f.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=e.body,i=cv(e),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||f.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||f.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:f.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){f.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return f.offset.bodyOffset(b);f.offset.initialize();var c,d=b.offsetParent,e=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(f.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===d&&(l+=b.offsetTop,m+=b.offsetLeft,f.offset.doesNotAddBorder&&(!f.offset.doesAddBorderForTableAndCells||!ct.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),e=d,d=b.offsetParent),f.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;f.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},f.offset={initialize:function(){var a=c.body,b=c.createElement("div"),d,e,g,h,i=parseFloat(f.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";f.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),d=b.firstChild,e=d.firstChild,h=d.nextSibling.firstChild.firstChild,this.doesNotAddBorder=e.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,e.style.position="fixed",e.style.top="20px",this.supportsFixedPosition=e.offsetTop===20||e.offsetTop===15,e.style.position=e.style.top="",d.style.overflow="hidden",d.style.position="relative",this.subtractsBorderForOverflowNotVisible=e.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),f.offset.initialize=f.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;f.offset.initialize(),f.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(f.css(a,"marginTop"))||0,c+=parseFloat(f.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var d=f.css(a,"position");d==="static"&&(a.style.position="relative");var e=f(a),g=e.offset(),h=f.css(a,"top"),i=f.css(a,"left"),j=(d==="absolute"||d==="fixed")&&f.inArray("auto",[h,i])>-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cu.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cu.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cv(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cv(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a&&a.style?parseFloat(f.css(a,d,"padding")):null},f.fn["outer"+c]=function(a){var b=this[0];return b&&b.style?parseFloat(f.css(b,d,a?"margin":"border")):null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c];return e.document.compatMode==="CSS1Compat"&&g||e.document.body["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var h=f.css(e,d),i=parseFloat(h);return f.isNaN(i)?h:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/common/js/js_app.js b/common/js/js_app.js
index c18aab213..9c115fa8d 100644
--- a/common/js/js_app.js
+++ b/common/js/js_app.js
@@ -1,17 +1,279 @@
-/**
- * @file js_app.js
- * @author NHN (developers@xpressengine.com)
- * @brief XE JavaScript Application Framework (JAF)
- * @namespace xe
- * @update 20100701
- */
-
-(function($){var _xe_base,_app_base,_plugin_base;var _apps=[];_xe_base={getName:function(){return'Core';},createApp:function(sName,oDef){var _base=getTypeBase();$.extend(_base.prototype,_app_base,oDef);_base.prototype.getName=function(){return sName;};return _base;},createPlugin:function(sName,oDef){var _base=getTypeBase();$.extend(_base.prototype,_plugin_base,oDef);_base.prototype.getName=function(){return sName;};return _base;},getApps:function(){return $.makeArray(_apps);},getApp:function(indexOrName){indexOrName=(indexOrName||'').toLowerCase();if(typeof _apps[indexOrName]!='undefined'){return _apps[indexOrName];}else{return null;}},registerApp:function(oApp){var sName=oApp.getName().toLowerCase();_apps.push(oApp);if(!$.isArray(_apps[sName])){_apps[sName]=[];}
-_apps[sName].push(oApp);oApp.parent=this;if($.isFunction(oApp.activate))oApp.activate();},unregisterApp:function(oApp){var sName=oPlugin.getName().toLowerCase();var nIndex=$.inArray(oApp,_apps);if(nIndex>=0)_apps.splice(nIndex,1);if($.isArray(_apps[sName])){nIndex=$.inArray(oApp,_apps[sName]);if(nIndex>=0)_apps[sName].splice(nIndex,1);}
-if($.isFunction(oApp.deactivate))oApp.deactivate();},broadcast:function(msg,params){this._broadcast(this,msg,params);},_broadcast:function(sender,msg,params){for(var i=0;i<_apps.length;i++){_apps[i]._cast(sender,msg,params);}
-this._cast(sender,msg,params);}}
-_app_base={_plugins:[],_messages:{},getPlugin:function(sPluginName){sPluginName=sPluginName.toLowerCase();if($.isArray(this._plugins[sPluginName])){return this._plugins[sPluginName];}else{return[];}},registerPlugin:function(oPlugin){var self=this;var sName=oPlugin.getName().toLowerCase();if($.inArray(oPlugin,this._plugins)>=0)return false;this._plugins.push(oPlugin);if(!$.isArray(this._plugins[sName]))this._plugins[sName]=[];this._plugins[sName].push(oPlugin);$.each(oPlugin._binded_fn,function(api,fn){self.registerHandler(api,fn);});oPlugin.oApp=this;if($.isFunction(oPlugin.activate))oPlugin.activate();return true;},registerHandler:function(api,func){var msgs=this._messages;api=api.toUpperCase();if(!$.isArray(msgs[api]))msgs[api]=[];msgs[api].push(func);},cast:function(msg,params){return this._cast(this,msg,params||[]);},broadcast:function(sender,msg,params){if(this.parent&&this.parent._broadcast){this.parent._broadcast(sender,msg,params);}},_cast:function(sender,msg,params){var i,len;var aMsg=this._messages;msg=msg.toUpperCase();if(aMsg['BEFORE_'+msg]||this['API_BEFORE_'+msg]){var bContinue=this._cast(sender,'BEFORE_'+msg,params);if(!bContinue)return;}
-var vRet=[],sFn='API_'+msg;if($.isArray(aMsg[msg])){for(i=0;i<aMsg[msg].length;i++){vRet.push(aMsg[msg][i](sender,params));}}
-if(vRet.length<2)vRet=vRet[0];if(aMsg['AFTER_'+msg]||this['API_AFTER_'+msg]){this._cast(sender,'AFTER_'+msg,params);}
-if(!/^(?:AFTER|BEFORE)_/.test(msg)){return vRet;}else{return $.isArray(vRet)?($.inArray(false,vRet)<0):((typeof vRet=='undefined')?true:!!vRet);}}};_plugin_base={oApp:null,cast:function(msg,params){if(this.oApp&&this.oApp._cast){return this.oApp._cast(this,msg,params||[]);}},broadcast:function(msg,params){if(this.oApp&&this.oApp.broadcast){this.oApp.broadcast(this,mag,params||[]);}}};function getTypeBase(){var _base=function(){var self=this;var pool=null;if($.isArray(this._plugins))this._plugins=[];if(this._messages)this._messages={};else this._binded_fn={};$.each(this,function(key,val){if(!$.isFunction(val))return true;if(!/^API_([A-Z0-9_]+)$/.test(key))return true;var api=RegExp.$1;var fn=function(sender,params){return self[key](sender,params)};if(self._messages)self._messages[api]=[fn];else self._binded_fn[api]=fn;});if($.isFunction(this.init))this.init.apply(this,arguments);};return _base;}
-window.xe=$.extend(_app_base,_xe_base);window.xe.lang={};$(function(){xe.broadcast('ONREADY');});$(window).load(function(){xe.broadcast('ONLOAD');});})(jQuery);
\ No newline at end of file
+/**
+ * @file js_app.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief XE JavaScript Application Framework (JAF)
+ * @namespace xe
+ * @update 20100701
+ */
+(function($){
+
+var _xe_base, _app_base, _plugin_base;
+var _apps = [];
+
+_xe_base = {
+	/**
+	 * @brief return the name of Core module
+	 */
+	getName : function() {
+		return 'Core';
+	},
+
+	/**
+	 * @brief Create an application class
+	 */
+	createApp : function(sName, oDef) {
+		var _base = getTypeBase();
+
+		$.extend(_base.prototype, _app_base, oDef);
+
+		_base.prototype.getName = function() {
+			return sName;
+		};
+
+		return _base;
+	},
+
+	/**
+	 * @brief Create a plugin class
+	 */
+	createPlugin : function(sName, oDef) {
+		var _base = getTypeBase();
+
+		$.extend(_base.prototype, _plugin_base, oDef);
+
+		_base.prototype.getName = function() {
+			return sName;
+		};
+
+		return _base;
+	},
+
+	/**
+	 * @brief Get the array of applications
+	 */
+	getApps : function() {
+		return $.makeArray(_apps);
+	},
+
+	/**
+	 * @brief Get one application
+	 */
+	getApp : function(indexOrName) {
+		indexOrName = (indexOrName||'').toLowerCase();
+		if(typeof _apps[indexOrName] != 'undefined') {
+			return _apps[indexOrName];
+		} else {
+			return null;
+		}
+	},
+
+	/**
+	 * @brief Register an application instance
+	 */
+	registerApp : function(oApp) {
+		var sName = oApp.getName().toLowerCase();
+
+		_apps.push(oApp);
+		if (!$.isArray(_apps[sName])) {
+			_apps[sName] = [];
+		}
+		_apps[sName].push(oApp);
+
+		oApp.parent = this;
+
+		// register event
+		if ($.isFunction(oApp.activate)) oApp.activate();
+	},
+
+	/**
+	 * @brief Unregister an application instance
+	 */
+	unregisterApp : function(oApp) {
+		var sName  = oApp.getName().toLowerCase();
+		var nIndex = $.inArray(oApp, _apps);
+
+		if (nIndex >= 0) _apps = _apps.splice(nIndex, 1);
+
+		if ($.isArray(_apps[sName])) {
+			nIndex = $.inArray(oApp, _apps[sName]);
+			if (nIndex >= 0) _apps[sName] = _apps[sName].splice(nIndex, 1);
+		}
+
+		// unregister event
+		if ($.isFunction(oApp.deactivate)) oApp.deactivate();
+	},
+
+	/**
+	 * @brief overrides broadcast method
+	 */
+	broadcast : function(msg, params) {
+		this._broadcast(this, msg, params);
+	},
+
+	_broadcast : function(sender, msg, params) {
+		for(var i=0; i < _apps.length; i++) {
+			_apps[i]._cast(sender, msg, params);
+		}
+
+
+		// cast to child plugins
+		this._cast(sender, msg, params);
+	}
+}
+
+_app_base = {
+	_plugins  : [],
+	_messages : {},
+
+	/**
+	 * @brief get plugin
+	 */
+	getPlugin : function(sPluginName) {
+		sPluginName = sPluginName.toLowerCase();
+		if ($.isArray(this._plugins[sPluginName])) {
+			return this._plugins[sPluginName];
+		} else {
+			return [];
+		}
+	},
+
+	/**
+	 * @brief register a plugin instance
+	 */
+	registerPlugin : function(oPlugin) {
+		var self  = this;
+		var sName = oPlugin.getName().toLowerCase();
+
+		// check if the plugin is already registered
+		if ($.inArray(oPlugin, this._plugins) >= 0) return false;
+
+		// push the plugin into the _plugins array
+		this._plugins.push(oPlugin);
+
+		if (!$.isArray(this._plugins[sName])) this._plugins[sName] = [];
+		this._plugins[sName].push(oPlugin);
+
+		// register method pool
+		$.each(oPlugin._binded_fn, function(api, fn){ self.registerHandler(api, fn); });
+
+		// binding
+		oPlugin.oApp = this;
+
+		// registered event
+		if ($.isFunction(oPlugin.activate)) oPlugin.activate();
+
+		return true;
+	},
+
+	/**
+	 * @brief register api message handler
+	 */
+	registerHandler : function(api, func) {
+		var msgs = this._messages; api = api.toUpperCase();
+		if (!$.isArray(msgs[api])) msgs[api] = [];
+		msgs[api].push(func);
+	},
+
+	cast : function(msg, params) {
+		return this._cast(this, msg, params || []);
+	},
+
+	broadcast : function(sender, msg, params) {
+		if (this.parent && this.parent._broadcast) {
+			this.parent._broadcast(sender, msg, params);
+		}
+	},
+
+	_cast : function(sender, msg, params) {
+		var i, len;
+		var aMsg = this._messages;
+
+		msg = msg.toUpperCase();
+
+		// BEFORE hooker
+		if (aMsg['BEFORE_'+msg] || this['API_BEFORE_'+msg]) {
+			var bContinue = this._cast(sender, 'BEFORE_'+msg, params);
+			if (!bContinue) return;
+		}
+
+		// main api function
+		var vRet = [], sFn = 'API_'+msg;
+		if ($.isArray(aMsg[msg])) {
+			for(i=0; i < aMsg[msg].length; i++) {
+				vRet.push( aMsg[msg][i](sender, params) );
+			}
+		}
+		if (vRet.length < 2) vRet = vRet[0];
+
+		// AFTER hooker
+		if (aMsg['AFTER_'+msg] || this['API_AFTER_'+msg]) {
+			this._cast(sender, 'AFTER_'+msg, params);
+		}
+
+		if (!/^(?:AFTER|BEFORE)_/.test(msg)) { // top level function
+			return vRet;
+		} else {
+			return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet);
+		}
+	}
+};
+
+_plugin_base = {
+	oApp : null,
+
+	cast : function(msg, params) {
+		if (this.oApp && this.oApp._cast) {
+			return this.oApp._cast(this, msg, params || []);
+		}
+	},
+
+	broadcast : function(msg, params) {
+		if (this.oApp && this.oApp.broadcast) {
+			this.oApp.broadcast(this, mag, params || []);
+		}
+	}
+
+	/**
+	 * Event handler prototype
+	 *
+	 * function (oSender, params)
+	 */
+};
+
+function getTypeBase() {
+	var _base = function() {
+		var self = this;
+		var pool = null;
+		
+		if ($.isArray(this._plugins))   this._plugins   = [];
+		if (this._messages) this._messages = {};
+		else this._binded_fn = {};
+		
+		// bind functions
+		$.each(this, function(key, val){
+			if (!$.isFunction(val)) return true;
+			if (!/^API_([A-Z0-9_]+)$/.test(key)) return true;
+
+			var api = RegExp.$1;
+			var fn  = function(sender, params){ return self[key](sender, params) };
+
+			if (self._messages) self._messages[api] = [fn];
+			else self._binded_fn[api] = fn;
+		});
+
+		if ($.isFunction(this.init)) this.init.apply(this, arguments);
+	};
+
+	return _base;
+}
+
+window.xe = $.extend(_app_base, _xe_base);
+window.xe.lang = {}; // language repository
+
+// domready event
+$(function(){ xe.broadcast('ONREADY'); });
+
+// load event
+$(window).load(function(){ xe.broadcast('ONLOAD'); });
+
+})(jQuery);
diff --git a/common/js/minify.ini b/common/js/minify.ini
new file mode 100644
index 000000000..d8aef13fd
--- /dev/null
+++ b/common/js/minify.ini
@@ -0,0 +1,19 @@
+[option]
+use_closure_compiler=true
+
+[skip]
+jquery.js
+js_app.js
+common.js
+xml_handler.js
+xml_js_filter.js
+iepngfix_tilebg.js
+xe.header.js
+html5.js
+
+[merge >> xe.js]
+xe.header.js
+js_app.js
+common.js
+xml_handler.js
+xml_js_filter.js
diff --git a/common/js/plugins/filebox/filebox.js b/common/js/plugins/filebox/filebox.js
index 9a0a33d53..92137822a 100644
--- a/common/js/plugins/filebox/filebox.js
+++ b/common/js/plugins/filebox/filebox.js
@@ -1,82 +1,82 @@
-
-;(function($) {
-
-    var defaults = {
-    };
-
-    var filebox = {
-        selected : null,
-        /**
-         * 파일 박스 창 팝업
-         */
-        open : function(input_obj, filter) {
-            this.selected = input_obj;
-
-            var url = request_uri
-                .setQuery('module', 'module')
-                .setQuery('act', 'dispModuleFileBox')
-                .setQuery('input', this.selected.name)
-                .setQuery('filter', filter);
-
-            popopen(url, 'filebox');
-        },
-
-        /**
-         * 파일 선택
-         */
-        selectFile : function(file_url, module_filebox_srl){
-            var target = $(opener.XE.filebox.selected);
-            var target_name = target.attr('name');
-
-            target.val(file_url);
-            var html = _displayMultimedia(file_url, '100%', '100%');
-            $('#filebox_preview_' + target_name, opener.document).html(html).show();
-            $('#filebox_cancel_' + target_name, opener.document).show();
-
-            window.close();
-        },
-
-        /**
-         * 파일 선택 취소
-         */
-        cancel : function(name) {
-            $('[name=' + name + ']').val('');
-            $('#filebox_preview_' + name).hide().html('');
-            $('#filebox_cancel_' + name).hide();
-        },
-
-        /**
-         * 파일 삭제
-         */
-        deleteFile : function(module_filebox_srl){
-            var params = {
-                'module_filebox_srl' : module_filebox_srl
-            };
-
-            $.exec_json('module.procModuleFileBoxDelete', params, function() { document.location.reload(); });
-        },
-
-        /**
-         * 초기화
-         */
-        init : function(name) {
-            var file;
-
-            if(opener && opener.selectedWidget && opener.selectedWidget.getAttribute("widget")) {
-                file = opener.selectedWidget.getAttribute(name);
-            } else if($('[name=' + name + ']').val()) {
-                file = $('[name=' + name + ']').val();
-            }
-
-            if(file) {
-                var html = _displayMultimedia(file, '100%', '100%');
-                $('#filebox_preview_' + name).html(html).show();
-                $('#filebox_cancel_' + name).show();
-            }
-        }
-    };
-
-    // XE에 담기
-    $.extend(window.XE, {'filebox' : filebox});
-
-}) (jQuery);
+
+;(function($) {
+
+    var defaults = {
+    };
+
+    var filebox = {
+        selected : null,
+        /**
+         * pop up the file box
+         */
+        open : function(input_obj, filter) {
+            this.selected = input_obj;
+
+            var url = request_uri
+                .setQuery('module', 'module')
+                .setQuery('act', 'dispModuleFileBox')
+                .setQuery('input', this.selected.name)
+                .setQuery('filter', filter);
+
+            popopen(url, 'filebox');
+        },
+
+        /**
+         * select a file
+         */
+        selectFile : function(file_url, module_filebox_srl){
+            var target = $(opener.XE.filebox.selected);
+            var target_name = target.attr('name');
+
+            target.val(file_url);
+            var html = _displayMultimedia(file_url, '100%', '100%');
+            $('#filebox_preview_' + target_name, opener.document).html(html).show();
+            $('#filebox_cancel_' + target_name, opener.document).show();
+
+            window.close();
+        },
+
+        /**
+         * cancel
+         */
+        cancel : function(name) {
+            $('[name=' + name + ']').val('');
+            $('#filebox_preview_' + name).hide().html('');
+            $('#filebox_cancel_' + name).hide();
+        },
+
+        /**
+         * delete a file
+         */
+        deleteFile : function(module_filebox_srl){
+            var params = {
+                'module_filebox_srl' : module_filebox_srl
+            };
+
+            $.exec_json('module.procModuleFileBoxDelete', params, function() { document.location.reload(); });
+        },
+
+        /**
+         * initialize
+         */
+        init : function(name) {
+            var file;
+
+            if(opener && opener.selectedWidget && opener.selectedWidget.getAttribute("widget")) {
+                file = opener.selectedWidget.getAttribute(name);
+            } else if($('[name=' + name + ']').val()) {
+                file = $('[name=' + name + ']').val();
+            }
+
+            if(file) {
+                var html = _displayMultimedia(file, '100%', '100%');
+                $('#filebox_preview_' + name).html(html).show();
+                $('#filebox_cancel_' + name).show();
+            }
+        }
+    };
+
+    // put the file into XE
+    $.extend(window.XE, {'filebox' : filebox});
+
+}) (jQuery);
diff --git a/common/js/plugins/ui.calendar/ui.calendar.css b/common/js/plugins/ui.calendar/ui.calendar.css
index c50d545c2..098af0dcd 100644
--- a/common/js/plugins/ui.calendar/ui.calendar.css
+++ b/common/js/plugins/ui.calendar/ui.calendar.css
@@ -1,35 +1,35 @@
-@charset "utf-8";
-/* Calendar */
-.ui-calendar {display:none; padding:25px 15px 15px 15px; position:absolute; border:2px solid #737373; background:#fff; color:#333; *zoom:1;}
-.ui-calendar .close{ position:absolute; _display:block !important; top:10px; right:15px; width:17px; height:17px; border:0; padding:0; background:url(./img/buttonCloseLayerX.gif) no-repeat center center; cursor:pointer; *zoom:1;}
-.ui-calendar .close span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
-.ui-calendar table{ border:0; border-spacing:0; _width:200px;}
-.ui-calendar caption{ font-weight:bold; text-align:center; position:relative;}
-.ui-calendar caption span{ display:block; position:relative; padding:10px 0 15px 0; *zoom:1;}
-.ui-calendar caption .today{ font-size:11px; border:0; padding:0; border-bottom:1px solid; background:none; cursor:pointer;}
-.ui-calendar caption .today span{text-decoration:underline;}
-.ui-calendar caption .navi{ position:absolute; top:10px; border:0; padding:0; width:17px; height:18px; background-color:transparent; background-image:url(./img/buttonPaginate.gif); background-repeat:no-repeat; cursor:pointer;}
-.ui-calendar caption .navi span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
-.ui-calendar caption .navi.prev{ left:20px; background-position:left top;}
-.ui-calendar caption .navi.next{ right:20px; background-position:right top;}
-.ui-calendar caption .navi.prev_year,
-.ui-calendar caption .navi.next_year{ width:22px; background-image:url(./img/buttonPaginateDuble.gif); }
-.ui-calendar caption .navi.prev_year{ left:0; background-position:left top;}
-.ui-calendar caption .navi.next_year{ right:0; background-position:right top;}
-.ui-calendar th,
-.ui-calendar td{ border:0; text-align:center;}
-.ui-calendar th{ color:#666; background:#f2f2f2; padding:3px 8px;}
-.ui-calendar td{ font-size:11px; padding:3px 8px;}
-.ui-calendar td button{ padding:0; border:0; background:none; cursor:pointer; width:20px; font-size:11px; font-family:Tahoma, Sans-serif;}
-.ui-calendar td button.today{ font-weight:bold;}
-.ui-calendar td button.book,
-.ui-calendar td button.active,
-.ui-calendar tr.active button{ background:#ff4747; color:#fff;}
-.ui-calendar .sun,
-.ui-calendar .sun button{ color:#ff1a1a;}
-
-.ui-calendar table.month{ border-top:1px solid #f2f2f2; border-left:1px solid #f2f2f2;}
-.ui-calendar table.month td{ border-right:1px solid #f2f2f2; border-bottom:1px solid #f2f2f2;}
-.ui-calendar table.month td button{ width:50px; color:#bababa;}
-.ui-calendar table.month td button.past{ color:#333;}
-.ui-calendar table.month td button.active{ color:#fff;}
+@charset "utf-8";
+/* Calendar */
+.ui-calendar {display:none; padding:25px 15px 15px 15px; position:absolute; border:2px solid #737373; background:#fff; color:#333; *zoom:1;}
+.ui-calendar .close{ position:absolute; _display:block !important; top:10px; right:15px; width:17px; height:17px; border:0; padding:0; background:url(./img/buttonCloseLayerX.gif) no-repeat center center; cursor:pointer; *zoom:1;}
+.ui-calendar .close span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
+.ui-calendar table{ border:0; border-spacing:0; _width:200px;}
+.ui-calendar caption{ font-weight:bold; text-align:center; position:relative;}
+.ui-calendar caption span{ display:block; position:relative; padding:10px 0 15px 0; *zoom:1;}
+.ui-calendar caption .today{ font-size:11px; border:0; padding:0; border-bottom:1px solid; background:none; cursor:pointer;}
+.ui-calendar caption .today span{text-decoration:underline;}
+.ui-calendar caption .navi{ position:absolute; top:10px; border:0; padding:0; width:17px; height:18px; background-color:transparent; background-image:url(./img/buttonPaginate.gif); background-repeat:no-repeat; cursor:pointer;}
+.ui-calendar caption .navi span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+.ui-calendar caption .navi.prev{ left:20px; background-position:left top;}
+.ui-calendar caption .navi.next{ right:20px; background-position:right top;}
+.ui-calendar caption .navi.prev_year,
+.ui-calendar caption .navi.next_year{ width:22px; background-image:url(./img/buttonPaginateDuble.gif); }
+.ui-calendar caption .navi.prev_year{ left:0; background-position:left top;}
+.ui-calendar caption .navi.next_year{ right:0; background-position:right top;}
+.ui-calendar th,
+.ui-calendar td{ border:0; text-align:center;}
+.ui-calendar th{ color:#666; background:#f2f2f2; padding:3px 8px;}
+.ui-calendar td{ font-size:11px; padding:3px 8px;}
+.ui-calendar td button{ padding:0; border:0; background:none; cursor:pointer; width:20px; font-size:11px; font-family:Tahoma, Sans-serif;}
+.ui-calendar td button.today{ font-weight:bold;}
+.ui-calendar td button.book,
+.ui-calendar td button.active,
+.ui-calendar tr.active button{ background:#ff4747; color:#fff;}
+.ui-calendar .sun,
+.ui-calendar .sun button{ color:#ff1a1a;}
+
+.ui-calendar table.month{ border-top:1px solid #f2f2f2; border-left:1px solid #f2f2f2;}
+.ui-calendar table.month td{ border-right:1px solid #f2f2f2; border-bottom:1px solid #f2f2f2;}
+.ui-calendar table.month td button{ width:50px; color:#bababa;}
+.ui-calendar table.month td button.past{ color:#333;}
+.ui-calendar table.month td button.active{ color:#fff;}
diff --git a/common/js/plugins/ui.calendar/ui.calendar.js b/common/js/plugins/ui.calendar/ui.calendar.js
index a0c41451a..f59d4d814 100644
--- a/common/js/plugins/ui.calendar/ui.calendar.js
+++ b/common/js/plugins/ui.calendar/ui.calendar.js
@@ -1,368 +1,368 @@
-/**
- * @brief XE Calendar
- * @author NHN (developers@xpressengine.com)
- *
- * 사용법
- * 
- **/
-(function($){
-
-if (!$.ui) $.ui = {};
-$.extend($.ui, { calendar: { version:'0.3' } });
-
-var PROP_NAME = 'calendar';
-var index = 0;
-var calendars = {};
-var template  = {calendar:'',month:''};
-
-function Calendar() {
-}
-
-$.extend(Calendar.prototype, {
-	_activeCalendar : null,
-	_getuid : function(obj) {
-		var uid = obj.attr('class').match(/ui-calendar-(\d+-\d+)/);
-
-		if (!uid) return -1;
-		return uid[1];
-	},
-	_show : function(obj) {
-		if (this._activeCalendar) this._hide(this._activeCalendar);
-
-		// disabled?
-		if (obj.hasClass('ui-calendar-disabled')) return;
-
-		// Active Calendar
-		this._activeCalendar = obj.show(300);
-	},
-	_hide : function(obj) {
-		if (this._activeCalendar && this._activeCalendar.get(0) == obj.get(0)) this._activeCalendar = null;
-		obj.hide(300);
-	},
-	_toggle : function(obj) {
-		(obj.css('display' ) == 'none')?this._show(obj):this._hide(obj);
-	},
-	_attachCalendar : function(obj, options) {
-		if ((obj=$(obj)).hasClass('ui-calendar')) return;
-
-		var uid = $.calendar.uuid+'-'+(index++);
-		var c = calendars[uid] = {};
-		
-		// uid 추가
-		obj.addClass('ui-calendar-'+uid).mousedown(function(){return false});
-
-		// default options
-		c.options = $.extend({
-			type : 'day',
-			activeDate : ''
-		}, options||{});
-		c.lang = $.extend({
-			weekdays : 'Sun,Mon,Tue,Wed,Thu,Fri,Sat',
-			today : 'Today',
-			prevmonth : 'Prev Month',
-			nextmonth : 'Next Month',
-			prevyear  : 'Prev Year',
-			nextyear  : 'Next Year',
-			close : 'Close'
-		}, options.lang||{});
-		
-		c.lang.weekdays = c.lang.weekdays.split(',');
-
-		// 날짜 설정
-		var d;
-		if (typeof c.options.activeDate == 'string' && c.options.activeDate) {
-			var s = c.options.activeDate.split('/');
-			d = new Date(s[0], s[1]-1, s[2]-0);
-		} else {
-			d = new Date();
-		}
-		this._setDate(obj, d);
-
-		// 토글 버튼
-		if (c.options.button) {
-			(c.button=$(c.options.button)).click(function(){ obj.calendar('toggle') });
-		}
-
-		// 클래스 추가
-		obj.addClass('ui-calendar');
-
-		// position 설정한 후, 좌표를 (0,0)으로 변경
-		var pos = obj.css({position:'absolute',top:0,left:0}).show().offset();
-
-		// 버튼의 위치 구해서 좌표 조정
-		var bpos = c.button.offset();
-		var dx  = bpos.left - pos.left;
-		var dy  = bpos.top - pos.top;
-
-		// 좌표 조정 후 레이어 숨김
-		obj.css({top:(dy+c.button.height())+'px',left:dx+'px'}).hide();
-	},
-	_checkExternalClick : function(e) {
-		if ($.calendar._activeCalendar) $.calendar._hide($.calendar._activeCalendar);
-	},
-	_processTemplate : function(tpl, vars) {
-		tpl = (' '+tpl+' ').split(/[\{\}]/g);
-
-		for(var i=0; i < tpl.length; i++) {
-			if (i%2) {
-				if (/^[\w\.\[\]]+$/.test(tpl[i])) tpl[i] = 'try{v=vv.'+tpl[i]+'}catch(e){v=""};ret.push(v);';
-				else if (/^@(\w+)\s+in\s+(\w+)$/.test(tpl[i])) tpl[i] = 'for(i=0,l=vv.'+RegExp.$2+'.length;i<l;i++) { vv.'+RegExp.$1+'=vv.'+RegExp.$2+'[i];';
-				else if (tpl[i] == '/') tpl[i] = '};';
-				else tpl[i] = 'ret.push("{'+tpl[i]+'}");';
-			} else {
-				tpl[i] = 'ret.push("'+tpl[i].replace(/"/g, '\\"')+'");'; //"
-			}
-		}
-
-		tpl.push('return ret.join("");');
-		tpl = (['var i,l,v,t,ret=[];'].concat(tpl)).join('');
-
-		return (new Function('vv',tpl))(vars);
-	},
-	_draw : function(obj) {
-		var uid = this._getuid(obj);
-		if (uid < 0) return;
-
-		var cal = calendars[uid];
-		var tpl = (cal.options.type == 'month')?template.month:template.calendar;
-		var v   = {lang:cal.lang};
-
-		// 날짜 관련 변수
-		v['yyyy'] = cal.date.getFullYear();
-		v['yy'] = (v['yyyy']+'').substring(2);
-		v['m']  = cal.date.getMonth() + 1;
-		v['mm'] = v['m'] > 9?v['m']:'0'+v['m'];
-
-		// 연간 달력이 아니라면 이 달의 날짜를 구한다.
-		if (cal.options.type != 'month') {
-			// 날짜에 사용할 달력
-			v['weeks'] = [];
-
-			var d = new Date(cal.date.getTime()), w = [];
-			var last = (v.m!=2)? ((v.m+(v.m>7?1:0))%2?31:30) : ((new Date(v.yyyy,v.m-1,29)).getMonth()==v.m?29:28); // 마지막 날
-
-			d.setDate(1); // 1일로 설정 후 1일의 요일을 가져온다.
-			var start = d.getDay(), end = last+start;
-
-			for(var i=0,len=end+(7-(end%7||7));i<len;i++) {
-				if (i%7 == 0) v['weeks'].push(w=[]);
-				if (i < start || i >= end) w.push('&nbsp;');
-				else w.push('<button type="button" class="day'+v.yyyy+'-'+v.m+'-'+(i+1-start)+'">'+(i+1-start)+'</button>');
-			}
-		}
-		
-		// 템플릿 처리
-		tpl = this._processTemplate(tpl, v);
-		obj.html(tpl);
-
-		// 선택한 날짜
-		if (cal.options.type == 'month') {
-			
-		} else {
-			var t = new Date();
-			obj.find('td>button.day'+t.getFullYear()+'-'+(t.getMonth()+1)+'-'+t.getDate()).addClass('today');
-			
-			t = cal.activeDate;
-			obj.find('td>button.day'+t.getFullYear()+'-'+(t.getMonth()+1)+'-'+t.getDate()).addClass('active');
-		}
-
-		// 이벤트 핸들러
-		obj.find('button.close').click(function(){ $.calendar._hide(obj); });
-		obj.find('button.today').click(function(){ $.calendar._moveToday(obj); });
-		if (cal.options.type == 'month') {
-			obj.find('button.prev').click(function(){ $.calendar._prevYear(obj) });
-			obj.find('button.next').click(function(){ $.calendar._nextYear(obj) });
-		} else {
-			obj.find('button.prev').click(function(){ $.calendar._prevMonth(obj) });
-			obj.find('button.next').click(function(){ $.calendar._nextMonth(obj) });
-			obj.find('button.prev_year').click(function(){ $.calendar._prevYear(obj) });
-			obj.find('button.next_year').click(function(){ $.calendar._nextYear(obj) });
-		}
-		obj.find('td>button').click(function(){ $.calendar._selectDate(obj, $(this)) });
-	},
-	_selectDate : function(obj, btn) {
-		var cal  = calendars[ this._getuid(obj) ];
-		var date = btn.attr('class').match(/day([\d\-]+)/);
-		if (!date) return;
-		
-		date = date[1].split('-');
-		
-		var ad = cal.activeDate;
-		ad.setFullYear(date[0]-0);
-		ad.setMonth(date[1]-1);
-		ad.setDate(date[2]-0);
-
-		this._setDate(obj, ad);
-	},
-	_setDate : function(obj, newDate) {
-		var uid = this._getuid(obj);
-		if (uid < 0) return null;
-		if (!newDate || !(newDate instanceof Date)) newDate = new Date();
-
-		var cal = calendars[uid];
-		cal.activeDate = new Date(newDate.getTime());
-		cal.date = new Date(newDate.getTime());
-		this._draw(obj);
-		
-		if ($.isFunction(cal.options.select) && obj.hasClass('ui-calendar')) {
-			cal.options.select(newDate.getFullYear(), newDate.getMonth()+1, newDate.getDate());
-		}
-	},
-	_getDate : function(obj, format) {
-		var uid = this._getuid(obj);
-		if (uid < 0) return null;
-		if (typeof format != 'string') return calendars[uid].activeDate;
-
-		// format string
-	},
-	_moveToday : function(obj) {
-		calendars[this._getuid(obj)].date = new Date();
-		this._draw(obj);
-	},
-	_prevMonth : function(obj) {
-		var cal = calendars[this._getuid(obj)];
-		var m = cal.date.getMonth();
-
-		cal.date.setDate(1);
-		if (m == 0) {
-			cal.date.setFullYear(cal.date.getFullYear()-1);
-			cal.date.setMonth(11);
-		} else {
-			cal.date.setMonth(m-1);
-		}
-
-		this._draw(obj);
-	},
-	_nextMonth : function(obj) {
-		var cal = calendars[this._getuid(obj)];
-		var m = cal.date.getMonth();
-		
-		cal.date.setDate(1);
-		if (m == 11) {
-			cal.date.setFullYear(cal.date.getFullYear()+1);
-			cal.date.setMonth(0);
-		} else {
-			cal.date.setMonth(m+1);
-		}
-
-		this._draw(obj);
-	},
-	_prevYear : function(obj) {
-		var cal = calendars[this._getuid(obj)];
-
-		cal.date.setFullYear(cal.date.getFullYear()-1);
-		this._draw(obj);
-	},
-	_nextYear : function(obj) {
-		var cal = calendars[this._getuid(obj)];
-
-		cal.date.setFullYear(cal.date.getFullYear()+1);
-		this._draw(obj);
-	}
-});
-
-/**
- * Invoke the calednar functionallity
- * @return jQuery object
- */
-$.fn.calendar = function(options) {
-	var args = $.makeArray(arguments);
-
-	if (!$.calendar.initialized) {
-		$(document).mousedown($.calendar._checkExternalClick);
-		$.calendar.initialized = true;
-	}
-
-	if (typeof options == 'string' && $.inArray(options, ['getDate'])) {
-		args.shift();
-		return $.calendar['_'+options].apply($.calendar, [$(this[0])].concat(args) );
-	}
-
-	return this.each(function(){
-		if (typeof options == 'string') {
-			args.shift();
-			$.calendar['_'+ options].apply($.calendar, [$(this)].concat(args));
-		} else {
-			$.calendar._attachCalendar($(this), options);
-		}
-	});
-}
-
-$.calendar = new Calendar(); // singleton instance
-$.calendar.initialized = false;
-$.calendar.uuid = new Date().getTime();
-$.calendar.version = $.ui.calendar.version;
-
-// template
-template.calendar = '<button type="button" class="close"><span>{lang.close_layer}</span></button>\
-<table border="1" cellspacing="0" summary="달력에서 날짜를 선택하기">\
-<caption>\
-	<span>\
-		{yyyy}.{mm}.\
-		<button type="button" class="today">{lang.today}</button>\
-		<button type="button" class="navi prev"><span>{lang.prevmonth}</span></button>\
-		<button type="button" class="navi next"><span>{lang.nextmonth}</span></button>\
-		<button type="button" class="navi prev_year"><span>{lang.prevyear}</span></button>\
-		<button type="button" class="navi next_year"><span>{lang.nextyear}</span></button>\
-	</span>\
-</caption>\
-<thead>\
-	<tr>\
-		<th scope="col" class="sun">{lang.weekdays[0]}</th>\
-		<th scope="col">{lang.weekdays[1]}</th>\
-		<th scope="col">{lang.weekdays[2]}</th>\
-		<th scope="col">{lang.weekdays[3]}</th>\
-		<th scope="col">{lang.weekdays[4]}</th>\
-		<th scope="col">{lang.weekdays[5]}</th>\
-		<th scope="col">{lang.weekdays[6]}</th>\
-	</tr>\
-</thead>\
-<tbody>\
-	{@week in weeks}\
-	<tr class="ui-calenar-repeat">\
-		<td class="sun">{week[0]}</td>\
-		<td>{week[1]}</td>\
-		<td>{week[2]}</td>\
-		<td>{week[3]}</td>\
-		<td>{week[4]}</td>\
-		<td>{week[5]}</td>\
-		<td>{week[6]}</td>\
-	</tr>\
-	{/}\
-</tbody>\
-</table>\
-<button type="button" class="close"><span>{lang.close_layer}</span></button>';
-
-template.month = '<button type="button" class="close"><span>{lang.close_layer}</span></button>\
-<table border="1" cellspacing="0" summary="달력에서 날짜를 선택하기" class="month">\
-<caption>\
-	<span>\
-		{yyyy}.{mm} <button type="button" class="today">{lang.today}</button>\
-		<button type="button" class="navi prev"><span>{lang.prevyear}</span></button>\
-		<button type="button" class="navi next"><span>{lang.nextyear}</span></button>\
-	</span>\
-</caption>\
-<tbody>\
-	<tr>\
-		<td><button type="button" class="past"><strong>1</strong><br />January</button></td>\
-		<td><button type="button" class="past"><strong>2</strong><br />Februry</button></td>\
-		<td><button type="button" class="past"><strong>3</strong><br />March</button></td>\
-		<td><button type="button" class="past"><strong>4</strong><br />April</button></td>\
-	</tr>\
-	<tr>\
-		<td><button type="button" class="past"><strong>5</strong><br />May</button></td>\
-		<td><button type="button" class="active"><strong>6</strong><br />June</button></td>\
-		<td><button type="button"><strong>7</strong><br />July</button></td>\
-		<td><button type="button"><strong>8</strong><br />August</button></td>\
-	</tr>\
-	<tr>\
-		<td><button type="button"><strong>9</strong><br />September</button></td>\
-		<td><button type="button"><strong>10</strong><br />October</button></td>\
-		<td><button type="button"><strong>11</strong><br />Nobember</button></td>\
-		<td><button type="button"><strong>12</strong><br />December</button></td>\
-	</tr>\
-</tbody>\
-</table>\
-<button type="button" class="close"><span>{lang.close_layer}</span></button>';
-
+/**
+ * @brief XE Calendar
+ * @author NHN (developers@xpressengine.com)
+ *
+ * 사용법
+ * 
+ **/
+(function($){
+
+if (!$.ui) $.ui = {};
+$.extend($.ui, { calendar: { version:'0.3' } });
+
+var PROP_NAME = 'calendar';
+var index = 0;
+var calendars = {};
+var template  = {calendar:'',month:''};
+
+function Calendar() {
+}
+
+$.extend(Calendar.prototype, {
+	_activeCalendar : null,
+	_getuid : function(obj) {
+		var uid = obj.attr('class').match(/ui-calendar-(\d+-\d+)/);
+
+		if (!uid) return -1;
+		return uid[1];
+	},
+	_show : function(obj) {
+		if (this._activeCalendar) this._hide(this._activeCalendar);
+
+		// disabled?
+		if (obj.hasClass('ui-calendar-disabled')) return;
+
+		// Active Calendar
+		this._activeCalendar = obj.show(300);
+	},
+	_hide : function(obj) {
+		if (this._activeCalendar && this._activeCalendar.get(0) == obj.get(0)) this._activeCalendar = null;
+		obj.hide(300);
+	},
+	_toggle : function(obj) {
+		(obj.css('display' ) == 'none')?this._show(obj):this._hide(obj);
+	},
+	_attachCalendar : function(obj, options) {
+		if ((obj=$(obj)).hasClass('ui-calendar')) return;
+
+		var uid = $.calendar.uuid+'-'+(index++);
+		var c = calendars[uid] = {};
+		
+		// uid 추가
+		obj.addClass('ui-calendar-'+uid).mousedown(function(){return false});
+
+		// default options
+		c.options = $.extend({
+			type : 'day',
+			activeDate : ''
+		}, options||{});
+		c.lang = $.extend({
+			weekdays : 'Sun,Mon,Tue,Wed,Thu,Fri,Sat',
+			today : 'Today',
+			prevmonth : 'Prev Month',
+			nextmonth : 'Next Month',
+			prevyear  : 'Prev Year',
+			nextyear  : 'Next Year',
+			close : 'Close'
+		}, options.lang||{});
+		
+		c.lang.weekdays = c.lang.weekdays.split(',');
+
+		// 날짜 설정
+		var d;
+		if (typeof c.options.activeDate == 'string' && c.options.activeDate) {
+			var s = c.options.activeDate.split('/');
+			d = new Date(s[0], s[1]-1, s[2]-0);
+		} else {
+			d = new Date();
+		}
+		this._setDate(obj, d);
+
+		// 토글 버튼
+		if (c.options.button) {
+			(c.button=$(c.options.button)).click(function(){ obj.calendar('toggle') });
+		}
+
+		// 클래스 추가
+		obj.addClass('ui-calendar');
+
+		// position 설정한 후, 좌표를 (0,0)으로 변경
+		var pos = obj.css({position:'absolute',top:0,left:0}).show().offset();
+
+		// 버튼의 위치 구해서 좌표 조정
+		var bpos = c.button.offset();
+		var dx  = bpos.left - pos.left;
+		var dy  = bpos.top - pos.top;
+
+		// 좌표 조정 후 레이어 숨김
+		obj.css({top:(dy+c.button.height())+'px',left:dx+'px'}).hide();
+	},
+	_checkExternalClick : function(e) {
+		if ($.calendar._activeCalendar) $.calendar._hide($.calendar._activeCalendar);
+	},
+	_processTemplate : function(tpl, vars) {
+		tpl = (' '+tpl+' ').split(/[\{\}]/g);
+
+		for(var i=0; i < tpl.length; i++) {
+			if (i%2) {
+				if (/^[\w\.\[\]]+$/.test(tpl[i])) tpl[i] = 'try{v=vv.'+tpl[i]+'}catch(e){v=""};ret.push(v);';
+				else if (/^@(\w+)\s+in\s+(\w+)$/.test(tpl[i])) tpl[i] = 'for(i=0,l=vv.'+RegExp.$2+'.length;i<l;i++) { vv.'+RegExp.$1+'=vv.'+RegExp.$2+'[i];';
+				else if (tpl[i] == '/') tpl[i] = '};';
+				else tpl[i] = 'ret.push("{'+tpl[i]+'}");';
+			} else {
+				tpl[i] = 'ret.push("'+tpl[i].replace(/"/g, '\\"')+'");'; //"
+			}
+		}
+
+		tpl.push('return ret.join("");');
+		tpl = (['var i,l,v,t,ret=[];'].concat(tpl)).join('');
+
+		return (new Function('vv',tpl))(vars);
+	},
+	_draw : function(obj) {
+		var uid = this._getuid(obj);
+		if (uid < 0) return;
+
+		var cal = calendars[uid];
+		var tpl = (cal.options.type == 'month')?template.month:template.calendar;
+		var v   = {lang:cal.lang};
+
+		// 날짜 관련 변수
+		v['yyyy'] = cal.date.getFullYear();
+		v['yy'] = (v['yyyy']+'').substring(2);
+		v['m']  = cal.date.getMonth() + 1;
+		v['mm'] = v['m'] > 9?v['m']:'0'+v['m'];
+
+		// 연간 달력이 아니라면 이 달의 날짜를 구한다.
+		if (cal.options.type != 'month') {
+			// 날짜에 사용할 달력
+			v['weeks'] = [];
+
+			var d = new Date(cal.date.getTime()), w = [];
+			var last = (v.m!=2)? ((v.m+(v.m>7?1:0))%2?31:30) : ((new Date(v.yyyy,v.m-1,29)).getMonth()==v.m?29:28); // 마지막 날
+
+			d.setDate(1); // 1일로 설정 후 1일의 요일을 가져온다.
+			var start = d.getDay(), end = last+start;
+
+			for(var i=0,len=end+(7-(end%7||7));i<len;i++) {
+				if (i%7 == 0) v['weeks'].push(w=[]);
+				if (i < start || i >= end) w.push('&nbsp;');
+				else w.push('<button type="button" class="day'+v.yyyy+'-'+v.m+'-'+(i+1-start)+'">'+(i+1-start)+'</button>');
+			}
+		}
+		
+		// 템플릿 처리
+		tpl = this._processTemplate(tpl, v);
+		obj.html(tpl);
+
+		// 선택한 날짜
+		if (cal.options.type == 'month') {
+			
+		} else {
+			var t = new Date();
+			obj.find('td>button.day'+t.getFullYear()+'-'+(t.getMonth()+1)+'-'+t.getDate()).addClass('today');
+			
+			t = cal.activeDate;
+			obj.find('td>button.day'+t.getFullYear()+'-'+(t.getMonth()+1)+'-'+t.getDate()).addClass('active');
+		}
+
+		// 이벤트 핸들러
+		obj.find('button.close').click(function(){ $.calendar._hide(obj); });
+		obj.find('button.today').click(function(){ $.calendar._moveToday(obj); });
+		if (cal.options.type == 'month') {
+			obj.find('button.prev').click(function(){ $.calendar._prevYear(obj) });
+			obj.find('button.next').click(function(){ $.calendar._nextYear(obj) });
+		} else {
+			obj.find('button.prev').click(function(){ $.calendar._prevMonth(obj) });
+			obj.find('button.next').click(function(){ $.calendar._nextMonth(obj) });
+			obj.find('button.prev_year').click(function(){ $.calendar._prevYear(obj) });
+			obj.find('button.next_year').click(function(){ $.calendar._nextYear(obj) });
+		}
+		obj.find('td>button').click(function(){ $.calendar._selectDate(obj, $(this)) });
+	},
+	_selectDate : function(obj, btn) {
+		var cal  = calendars[ this._getuid(obj) ];
+		var date = btn.attr('class').match(/day([\d\-]+)/);
+		if (!date) return;
+		
+		date = date[1].split('-');
+		
+		var ad = cal.activeDate;
+		ad.setFullYear(date[0]-0);
+		ad.setMonth(date[1]-1);
+		ad.setDate(date[2]-0);
+
+		this._setDate(obj, ad);
+	},
+	_setDate : function(obj, newDate) {
+		var uid = this._getuid(obj);
+		if (uid < 0) return null;
+		if (!newDate || !(newDate instanceof Date)) newDate = new Date();
+
+		var cal = calendars[uid];
+		cal.activeDate = new Date(newDate.getTime());
+		cal.date = new Date(newDate.getTime());
+		this._draw(obj);
+		
+		if ($.isFunction(cal.options.select) && obj.hasClass('ui-calendar')) {
+			cal.options.select(newDate.getFullYear(), newDate.getMonth()+1, newDate.getDate());
+		}
+	},
+	_getDate : function(obj, format) {
+		var uid = this._getuid(obj);
+		if (uid < 0) return null;
+		if (typeof format != 'string') return calendars[uid].activeDate;
+
+		// format string
+	},
+	_moveToday : function(obj) {
+		calendars[this._getuid(obj)].date = new Date();
+		this._draw(obj);
+	},
+	_prevMonth : function(obj) {
+		var cal = calendars[this._getuid(obj)];
+		var m = cal.date.getMonth();
+
+		cal.date.setDate(1);
+		if (m == 0) {
+			cal.date.setFullYear(cal.date.getFullYear()-1);
+			cal.date.setMonth(11);
+		} else {
+			cal.date.setMonth(m-1);
+		}
+
+		this._draw(obj);
+	},
+	_nextMonth : function(obj) {
+		var cal = calendars[this._getuid(obj)];
+		var m = cal.date.getMonth();
+		
+		cal.date.setDate(1);
+		if (m == 11) {
+			cal.date.setFullYear(cal.date.getFullYear()+1);
+			cal.date.setMonth(0);
+		} else {
+			cal.date.setMonth(m+1);
+		}
+
+		this._draw(obj);
+	},
+	_prevYear : function(obj) {
+		var cal = calendars[this._getuid(obj)];
+
+		cal.date.setFullYear(cal.date.getFullYear()-1);
+		this._draw(obj);
+	},
+	_nextYear : function(obj) {
+		var cal = calendars[this._getuid(obj)];
+
+		cal.date.setFullYear(cal.date.getFullYear()+1);
+		this._draw(obj);
+	}
+});
+
+/**
+ * Invoke the calednar functionallity
+ * @return jQuery object
+ */
+$.fn.calendar = function(options) {
+	var args = $.makeArray(arguments);
+
+	if (!$.calendar.initialized) {
+		$(document).mousedown($.calendar._checkExternalClick);
+		$.calendar.initialized = true;
+	}
+
+	if (typeof options == 'string' && $.inArray(options, ['getDate'])) {
+		args.shift();
+		return $.calendar['_'+options].apply($.calendar, [$(this[0])].concat(args) );
+	}
+
+	return this.each(function(){
+		if (typeof options == 'string') {
+			args.shift();
+			$.calendar['_'+ options].apply($.calendar, [$(this)].concat(args));
+		} else {
+			$.calendar._attachCalendar($(this), options);
+		}
+	});
+}
+
+$.calendar = new Calendar(); // singleton instance
+$.calendar.initialized = false;
+$.calendar.uuid = new Date().getTime();
+$.calendar.version = $.ui.calendar.version;
+
+// template
+template.calendar = '<button type="button" class="close"><span>{lang.close_layer}</span></button>\
+<table border="1" cellspacing="0" summary="달력에서 날짜를 선택하기">\
+<caption>\
+	<span>\
+		{yyyy}.{mm}.\
+		<button type="button" class="today">{lang.today}</button>\
+		<button type="button" class="navi prev"><span>{lang.prevmonth}</span></button>\
+		<button type="button" class="navi next"><span>{lang.nextmonth}</span></button>\
+		<button type="button" class="navi prev_year"><span>{lang.prevyear}</span></button>\
+		<button type="button" class="navi next_year"><span>{lang.nextyear}</span></button>\
+	</span>\
+</caption>\
+<thead>\
+	<tr>\
+		<th scope="col" class="sun">{lang.weekdays[0]}</th>\
+		<th scope="col">{lang.weekdays[1]}</th>\
+		<th scope="col">{lang.weekdays[2]}</th>\
+		<th scope="col">{lang.weekdays[3]}</th>\
+		<th scope="col">{lang.weekdays[4]}</th>\
+		<th scope="col">{lang.weekdays[5]}</th>\
+		<th scope="col">{lang.weekdays[6]}</th>\
+	</tr>\
+</thead>\
+<tbody>\
+	{@week in weeks}\
+	<tr class="ui-calenar-repeat">\
+		<td class="sun">{week[0]}</td>\
+		<td>{week[1]}</td>\
+		<td>{week[2]}</td>\
+		<td>{week[3]}</td>\
+		<td>{week[4]}</td>\
+		<td>{week[5]}</td>\
+		<td>{week[6]}</td>\
+	</tr>\
+	{/}\
+</tbody>\
+</table>\
+<button type="button" class="close"><span>{lang.close_layer}</span></button>';
+
+template.month = '<button type="button" class="close"><span>{lang.close_layer}</span></button>\
+<table border="1" cellspacing="0" summary="달력에서 날짜를 선택하기" class="month">\
+<caption>\
+	<span>\
+		{yyyy}.{mm} <button type="button" class="today">{lang.today}</button>\
+		<button type="button" class="navi prev"><span>{lang.prevyear}</span></button>\
+		<button type="button" class="navi next"><span>{lang.nextyear}</span></button>\
+	</span>\
+</caption>\
+<tbody>\
+	<tr>\
+		<td><button type="button" class="past"><strong>1</strong><br />January</button></td>\
+		<td><button type="button" class="past"><strong>2</strong><br />Februry</button></td>\
+		<td><button type="button" class="past"><strong>3</strong><br />March</button></td>\
+		<td><button type="button" class="past"><strong>4</strong><br />April</button></td>\
+	</tr>\
+	<tr>\
+		<td><button type="button" class="past"><strong>5</strong><br />May</button></td>\
+		<td><button type="button" class="active"><strong>6</strong><br />June</button></td>\
+		<td><button type="button"><strong>7</strong><br />July</button></td>\
+		<td><button type="button"><strong>8</strong><br />August</button></td>\
+	</tr>\
+	<tr>\
+		<td><button type="button"><strong>9</strong><br />September</button></td>\
+		<td><button type="button"><strong>10</strong><br />October</button></td>\
+		<td><button type="button"><strong>11</strong><br />Nobember</button></td>\
+		<td><button type="button"><strong>12</strong><br />December</button></td>\
+	</tr>\
+</tbody>\
+</table>\
+<button type="button" class="close"><span>{lang.close_layer}</span></button>';
+
 })(jQuery);
\ No newline at end of file
diff --git a/common/js/plugins/ui.colorpicker/xe_colorpicker.js b/common/js/plugins/ui.colorpicker/xe_colorpicker.js
index 8e592ce4d..1825ed917 100644
--- a/common/js/plugins/ui.colorpicker/xe_colorpicker.js
+++ b/common/js/plugins/ui.colorpicker/xe_colorpicker.js
@@ -1,366 +1,366 @@
-/**
- * @brief XE Colorpicker
- * @author NHN (developers@xpressengine.com)
- **/
-jQuery(function($){
-    var ready  = false;
-    var tmp    = $('<span>').hide();
-    // var panel  = null;
-
-    $.fn.xe_colorpicker = function(settings){
-        var selection = this;
-
-        if (!ready) {
-            ColorPicker.init(settings);
-            ready = true;
-        }
-
-        this.each(function(){
-            var col = color($(this).val());
-
-            $(this).val( col ).css('background-color', col );
-            setTextColor( $(this) );
-        }).focus(function(event){
-            var t = this;
-            $(this).select();
-
-            // show color picker
-            ColorPicker.show(this);
-        }).keypress(function(event){
-            if (!ColorPicker.is(':visible')) return;
-
-            if (/^#?[0-9a-f]{6}$/i.test( event.target.value )) {
-                ColorPicker.color( event.target.value );
-            }
-        });
-
-        $(document).mousedown(function(event){
-            var target = event.target;
-
-            if (selection.index(target) > -1) return;
-            if ($(target).parents().add(target).index(ColorPicker.element) > -1) return;
-            if ($(target).parents().add(target).index(ColorPicker.buttons) > -1) return;
-
-            ColorPicker.hide();
-        });
-
-        return this;
-    };
-
-    var ColorPicker = {
-        element  : null,
-        picker   : null,
-        colpane: null,
-        buttons  : null,
-        _target  : null,
-        _backup  : null,
-        _hsv     : null,
-        _mode    : 'none',
-
-        init : function() {
-            var cp = this;
-
-            this.element = $('<div class="xe_colorpicker"><div class="colorpicker"><div class="colortable"><div class="background"><div class="indicator"></div></div></div><div class="huebar"><div class="background"><div class="indicator"></div></div></div></div><div class="buttons"><button type="button" class="ok">OK</button><button type="button" class="cancel">Cancel</button><button type="button" class="none">None</button></div></div>');
-
-            this.picker    = this.element.find('> div.colorpicker');
-            this.colpane   = this.picker.find('div.colortable > div.background');
-            this.colpoint  = this.colpane.find('> .indicator');
-            this.buttons   = this.element.find('> div.buttons');
-            this.huepane   = this.element.find('div.huebar > .background');
-            this.huepoint  = this.huepane.find('> .indicator');
-
-            this._mousedown = method(this.onmousedown, this);
-            this._mousemove = method(this.onmousemove, this);
-            this._mouseup   = method(this.onmouseup, this);
-
-            this.picker.find('.background').mousedown(this._mousedown);
-
-            this.buttons.find('button.ok').click(method(this.ok,this));
-            this.buttons.find('button.cancel').click(method(this.cancel,this));
-            this.buttons.find('button.none').click(method(this.none,this));
-
-            // only for IE6
-            if ($.browser.msie && parseInt($.browser.version) < 7) {
-                this.element.append( $('<iframe>').css({position:'absolute','z-index':-1,left:0,top:0,width:9999,height:9999}) );
-            }
-        },
-        show : function(input) {
-            var pos = (input=$(input)).offset(), pos_panel;
-            //var par = input.get(0).offsetParent;
-            var par = $("body").get(0);
-            var btn = this.buttons.hide();
-            var col = color(input.val());
-
-            this._target = input;
-            this._backup = col;
-
-            this.color(col);
-            this._target.val(col);
-
-            pos_panel = this.element.hide().css({'z-index':99999,left:0,top:0}).appendTo( par ).show(300,function(){btn.slideDown(150)}).offset();
-            this.element.css({left:pos.left-pos_panel.left,top:pos.top-pos_panel.top+input.get(0).offsetHeight});
-        },
-        hide : function() {
-            var e = this.element;
-
-            this._target = null;
-            this.buttons.slideUp(100, function(){e.hide(200)});
-        },
-        visible : function() {
-            return this.element.is(':visible');
-        },
-        color : function(sColor) {
-            if (typeof sColor == 'string') {
-                var col = color(sColor);
-                var hsv = _hsv(rgb2hsv(hex2rgb(col)));
-
-                this.hsv(hsv.h, hsv.s, hsv.v);
-            } else if (this._target) {
-                return color(this._target.val());
-            }
-        },
-        hsv : function(h, s, v) {
-            var col = rgb2hex(hsv2rgb(h, s, v));
-
-            this._hsv = _hsv(h, s, v);
-
-            // background color and text color
-            this._target.val(col).css('background-color', col);
-            setTextColor(this._target);
-
-            // hue bar indicator
-            if (this._hue_h) this.huepoint.css('top', limit(0, Math.round((360-this._hsv.h)/360*this._hue_h), this._hue_h-1) - 3 );
-
-            // color - background
-            this.colpane.css('background-color', rgb2hex(hsv2rgb(h, 100, 100)) );
-
-            // color - indicator
-            if (this._col_h && this._col_w) {
-                this.colpoint.css({
-                    top  : limit(0, Math.round((100-this._hsv.v)/100*this._col_h), this._col_h-1) - 5,
-                    left : limit(0, Math.round(this._hsv.s/100*this._col_w), this._col_w-1 ) - 5
-                });
-            }
-        },
-        onmousedown : function(event) {
-            var cur = $(event.target);
-            var par = cur.parent();
-            var pos = cur.offset();
-            var hue, sat, val; // hue, saturation, value
-
-            this._height = cur.height();
-            this._width  = cur.width();
-            this._top    = pos.top;
-            this._left   = pos.left;
-
-            this._col_w  = this.colpane.width();
-            this._col_h  = this.colpane.width();
-            this._hue_h  = this.huepane.height();
-
-            if (par.is('.colortable')) {
-                this._mode = 'color';
-                hue = this._hsv.h;
-                sat = ( limit(0, (event.pageX - this._left), this._width ) / this._width * 100);
-                val = ( limit(0, (this._height - event.pageY + this._top), this._height ) / this._height * 100);
-            } else if (par.is('.huebar')) {
-                this._mode = 'hue';
-                hue = limit(0, (this._height - event.pageY + this._top), this._height) / this._height * 360;
-                sat = this._hsv.s;
-                val = this._hsv.v;
-            }
-
-            this.hsv( hue, sat, val );
-
-            $(document).bind('mousemove', this._mousemove).bind('mouseup', this._mouseup);
-        },
-        onmousemove : function(event) {
-            var hue, sat, val; // hue, saturation, value
-
-            switch(this._mode) {
-                case 'color':
-                    hue = this._hsv.h;
-                    sat = ( limit(0, (event.pageX - this._left), this._width ) / this._width * 100);
-                    val = ( limit(0, (this._height - event.pageY + this._top), this._height ) / this._height * 100);
-                    break;
-                case 'hue':
-                    hue = limit(0, (this._height - event.pageY + this._top), this._height) / this._height * 360;
-                    sat = this._hsv.s;
-                    val = this._hsv.v;
-                    break;
-            }
-
-            this.hsv( hue, sat, val );
-        },
-        onmouseup : function(event) {
-            this._mode = 'none';
-            $(document).unbind('mousemove', this._mousemove).unbind('mouseup', this._mouseup);
-        },
-        ok : function() {
-            this.hide();
-        },
-        cancel : function() {
-            this.color(this._backup);
-            this.hide();
-        },
-        none : function() {
-            this._target.attr('value','transparent').css('background','').css('color','#000000');
-            this.hide();
-        }
-    };
-
-    function setTextColor(input) {
-        var hex = input.css('color', '').val(), hsv, rgb;
-
-        if (hex == 'transparent' || hex == '') return;
-
-        rgb = hex2rgb(hex);
-        hsv = rgb2hsv(255-rgb.r, 255-rgb.g, 255-rgb.b); // 보색을 구한 뒤
-        hex = rgb2hex(hsv2rgb(0, 0, hsv.v>50?100:0)); // 보색에 해당하는 흑백으로 결정
-
-        input.css('color', hex);
-    }
-
-    function method(func, thisObj) {
-        return function() { return func.apply(thisObj, arguments) }
-    }
-
-    function color(str) {
-        var col = $.trim(str);
-        var regHex1 = /^#[0-9a-f]{6}$/i;
-        var regHex2 = /^#?([0-9a-f])([0-9a-f])([0-9a-f])$/i; // short hex
-
-        if (regHex1.test(col)) return col.toUpperCase();
-        if (regHex2.test(col)) return col.replace(regHex2, '#$1$1$2$2$3$3').toUpperCase();
-
-        try {
-            col = tmp.appendTo($('<body>')).css('background-color', col).css('background-color');
-        } catch(e) {
-            col = 'transparent';
-        } finally {
-            tmp.css('background-color','').remove();
-        }
-
-        if (/^rgb\(([0-9, ]+)\)$/i.test(col)) col = rgb2hex(RegExp.$1.split(/,\s*/));
-        if (!/#[0-9a-f]{6}/i.test(col)) col = 'transparent';
-
-        return col;
-    }
-
-    function _rgb(rgb, _g, _b) {
-        var r, g, b;
-
-        if (typeof arguments[2] == "number") {
-            r = rgb;
-            g = _g;
-            b = _b;
-        } else if (typeof rgb == "object") {
-            if (rgb.constructor == Array) {
-                r = rgb[0] || 0; g = rgb[1] || 0; b = rgb[2] || 0;
-            } else {
-                r = rgb.r || 0; g = rgb.g || 0; b = rgb.b || 0;
-            }
-        }
-
-        rgb = [];
-
-        rgb.r = rgb[0] = r = parseInt(r, 10);
-        rgb.g = rgb[1] = g = parseInt(g, 10);
-        rgb.b = rgb[2] = b = parseInt(b, 10);
-
-        return rgb;
-    }
-
-    function _hsv(hsv, _s, _v) {
-        var h, s, v;
-
-        if (typeof arguments[2] == "number") {
-            h = hsv; s = _s; v = _v;
-        } else if (typeof hsv == "object") {
-            if (hsv.constructor == Array) {
-                h = hsv[0] || 0; s = hsv[1] || 0; v = hsv[2] || 0;
-            } else {
-                h = hsv.h || 0; s = hsv.s || 0; v = hsv.v || 0;
-            }
-        }
-
-        hsv = [];
-
-        hsv.h = hsv[0] = h = parseInt(h, 10);
-        hsv.s = hsv[1] = s = parseInt(s, 10);
-        hsv.v = hsv[2] = v = parseInt(v, 10);
-
-        return hsv;
-    }
-
-    function rgb2hex(rgb, _g, _b) {
-        var rgb = _rgb(rgb, _g, _b);
-
-        for(var i=0; i < rgb.length; i++) {
-            (rgb[i] = Number(rgb[i]).toString(16)).length<2?rgb[i]='0'+rgb[i]:0;
-        }
-
-        return '#'+rgb.join('').toUpperCase();
-    }
-
-    function hex2rgb(hex) {
-        var r=0, g=0, b=0;
-
-        if (/^#?([0-9a-f]{1,2})([0-9a-f]{1,2})([0-9a-f]{1,2})$/i.test(hex)) {
-            r = parseInt(RegExp.$1, 16);
-            g = parseInt(RegExp.$2, 16);
-            b = parseInt(RegExp.$3, 16);
-        }
-
-        return _rgb(r, g, b);
-    }
-
-    function hsv2rgb(hsv, _s, _v) {
-        var r=0, g=0, b=0;
-        var h=0, s=0, v=0;
-        var i, f, p, q, t;
-
-        hsv = _hsv(hsv, _s, _v);
-
-        h = (hsv[0] % 360) / 60; s = hsv[1] / 100; v = hsv[2] / 100;
-
-        i = Math.floor(h);
-        f = h-i;
-        p = v*(1-s);
-        q = v*(1-s*f);
-        t = v*(1-s*(1-f));
-
-        switch (i) {
-            case 0: r=v; g=t; b=p; break;
-            case 1: r=q; g=v; b=p; break;
-            case 2: r=p; g=v; b=t; break;
-            case 3: r=p; g=q; b=v; break;
-            case 4: r=t; g=p; b=v; break;
-            case 5: r=v; g=p; b=q; break;
-            case 6: break;
-        }
-
-        return _rgb(Math.floor(r*255), Math.floor(g*255), Math.floor(b*255));
-    }
-
-    function rgb2hsv(rgb, _g, _b) {
-        var rgb = _rgb(rgb, _g, _b);
-        var r = rgb[0], g = rgb[1], b = rgb[2];
-        var h = 0, s = 0, v = Math.max(r,g,b), min = Math.min(r,g,b), delta = v - min;
-
-        if (s = v?delta/v:0) {
-            if (r == v) h = 60 * (g - b) / delta;
-            else if (g == v) h = 120 + 60 * (b - r) / delta;
-            else if (b == v) h = 240 + 60 * (r - g) / delta;
-
-            if (h < 0) h += 360;
-        }
-
-        return _hsv(Math.floor(h), Math.floor(s*100), Math.floor(v/255*100));
-    }
-
-    function limit(min, val, max){
-        return Math.min(Math.max(min, val), max);
-    }
-
-    $('input.color-indicator').xe_colorpicker();
-});
+/**
+ * @brief XE Colorpicker
+ * @author NHN (developers@xpressengine.com)
+ **/
+jQuery(function($){
+    var ready  = false;
+    var tmp    = $('<span>').hide();
+    // var panel  = null;
+
+    $.fn.xe_colorpicker = function(settings){
+        var selection = this;
+
+        if (!ready) {
+            ColorPicker.init(settings);
+            ready = true;
+        }
+
+        this.each(function(){
+            var col = color($(this).val());
+
+            $(this).val( col ).css('background-color', col );
+            setTextColor( $(this) );
+        }).focus(function(event){
+            var t = this;
+            $(this).select();
+
+            // show color picker
+            ColorPicker.show(this);
+        }).keypress(function(event){
+            if (!ColorPicker.is(':visible')) return;
+
+            if (/^#?[0-9a-f]{6}$/i.test( event.target.value )) {
+                ColorPicker.color( event.target.value );
+            }
+        });
+
+        $(document).mousedown(function(event){
+            var target = event.target;
+
+            if (selection.index(target) > -1) return;
+            if ($(target).parents().add(target).index(ColorPicker.element) > -1) return;
+            if ($(target).parents().add(target).index(ColorPicker.buttons) > -1) return;
+
+            ColorPicker.hide();
+        });
+
+        return this;
+    };
+
+    var ColorPicker = {
+        element  : null,
+        picker   : null,
+        colpane: null,
+        buttons  : null,
+        _target  : null,
+        _backup  : null,
+        _hsv     : null,
+        _mode    : 'none',
+
+        init : function() {
+            var cp = this;
+
+            this.element = $('<div class="xe_colorpicker"><div class="colorpicker"><div class="colortable"><div class="background"><div class="indicator"></div></div></div><div class="huebar"><div class="background"><div class="indicator"></div></div></div></div><div class="buttons"><button type="button" class="ok">OK</button><button type="button" class="cancel">Cancel</button><button type="button" class="none">None</button></div></div>');
+
+            this.picker    = this.element.find('> div.colorpicker');
+            this.colpane   = this.picker.find('div.colortable > div.background');
+            this.colpoint  = this.colpane.find('> .indicator');
+            this.buttons   = this.element.find('> div.buttons');
+            this.huepane   = this.element.find('div.huebar > .background');
+            this.huepoint  = this.huepane.find('> .indicator');
+
+            this._mousedown = method(this.onmousedown, this);
+            this._mousemove = method(this.onmousemove, this);
+            this._mouseup   = method(this.onmouseup, this);
+
+            this.picker.find('.background').mousedown(this._mousedown);
+
+            this.buttons.find('button.ok').click(method(this.ok,this));
+            this.buttons.find('button.cancel').click(method(this.cancel,this));
+            this.buttons.find('button.none').click(method(this.none,this));
+
+            // only for IE6
+            if ($.browser.msie && parseInt($.browser.version) < 7) {
+                this.element.append( $('<iframe>').css({position:'absolute','z-index':-1,left:0,top:0,width:9999,height:9999}) );
+            }
+        },
+        show : function(input) {
+            var pos = (input=$(input)).offset(), pos_panel;
+            //var par = input.get(0).offsetParent;
+            var par = $("body").get(0);
+            var btn = this.buttons.hide();
+            var col = color(input.val());
+
+            this._target = input;
+            this._backup = col;
+
+            this.color(col);
+            this._target.val(col);
+
+            pos_panel = this.element.hide().css({'z-index':99999,left:0,top:0}).appendTo( par ).show(300,function(){btn.slideDown(150)}).offset();
+            this.element.css({left:pos.left-pos_panel.left,top:pos.top-pos_panel.top+input.get(0).offsetHeight});
+        },
+        hide : function() {
+            var e = this.element;
+
+            this._target = null;
+            this.buttons.slideUp(100, function(){e.hide(200)});
+        },
+        visible : function() {
+            return this.element.is(':visible');
+        },
+        color : function(sColor) {
+            if (typeof sColor == 'string') {
+                var col = color(sColor);
+                var hsv = _hsv(rgb2hsv(hex2rgb(col)));
+
+                this.hsv(hsv.h, hsv.s, hsv.v);
+            } else if (this._target) {
+                return color(this._target.val());
+            }
+        },
+        hsv : function(h, s, v) {
+            var col = rgb2hex(hsv2rgb(h, s, v));
+
+            this._hsv = _hsv(h, s, v);
+
+            // background color and text color
+            this._target.val(col).css('background-color', col);
+            setTextColor(this._target);
+
+            // hue bar indicator
+            if (this._hue_h) this.huepoint.css('top', limit(0, Math.round((360-this._hsv.h)/360*this._hue_h), this._hue_h-1) - 3 );
+
+            // color - background
+            this.colpane.css('background-color', rgb2hex(hsv2rgb(h, 100, 100)) );
+
+            // color - indicator
+            if (this._col_h && this._col_w) {
+                this.colpoint.css({
+                    top  : limit(0, Math.round((100-this._hsv.v)/100*this._col_h), this._col_h-1) - 5,
+                    left : limit(0, Math.round(this._hsv.s/100*this._col_w), this._col_w-1 ) - 5
+                });
+            }
+        },
+        onmousedown : function(event) {
+            var cur = $(event.target);
+            var par = cur.parent();
+            var pos = cur.offset();
+            var hue, sat, val; // hue, saturation, value
+
+            this._height = cur.height();
+            this._width  = cur.width();
+            this._top    = pos.top;
+            this._left   = pos.left;
+
+            this._col_w  = this.colpane.width();
+            this._col_h  = this.colpane.width();
+            this._hue_h  = this.huepane.height();
+
+            if (par.is('.colortable')) {
+                this._mode = 'color';
+                hue = this._hsv.h;
+                sat = ( limit(0, (event.pageX - this._left), this._width ) / this._width * 100);
+                val = ( limit(0, (this._height - event.pageY + this._top), this._height ) / this._height * 100);
+            } else if (par.is('.huebar')) {
+                this._mode = 'hue';
+                hue = limit(0, (this._height - event.pageY + this._top), this._height) / this._height * 360;
+                sat = this._hsv.s;
+                val = this._hsv.v;
+            }
+
+            this.hsv( hue, sat, val );
+
+            $(document).bind('mousemove', this._mousemove).bind('mouseup', this._mouseup);
+        },
+        onmousemove : function(event) {
+            var hue, sat, val; // hue, saturation, value
+
+            switch(this._mode) {
+                case 'color':
+                    hue = this._hsv.h;
+                    sat = ( limit(0, (event.pageX - this._left), this._width ) / this._width * 100);
+                    val = ( limit(0, (this._height - event.pageY + this._top), this._height ) / this._height * 100);
+                    break;
+                case 'hue':
+                    hue = limit(0, (this._height - event.pageY + this._top), this._height) / this._height * 360;
+                    sat = this._hsv.s;
+                    val = this._hsv.v;
+                    break;
+            }
+
+            this.hsv( hue, sat, val );
+        },
+        onmouseup : function(event) {
+            this._mode = 'none';
+            $(document).unbind('mousemove', this._mousemove).unbind('mouseup', this._mouseup);
+        },
+        ok : function() {
+            this.hide();
+        },
+        cancel : function() {
+            this.color(this._backup);
+            this.hide();
+        },
+        none : function() {
+            this._target.attr('value','transparent').css('background','').css('color','#000000');
+            this.hide();
+        }
+    };
+
+    function setTextColor(input) {
+        var hex = input.css('color', '').val(), hsv, rgb;
+
+        if (hex == 'transparent' || hex == '') return;
+
+        rgb = hex2rgb(hex);
+        hsv = rgb2hsv(255-rgb.r, 255-rgb.g, 255-rgb.b); // 보색을 구한 뒤
+        hex = rgb2hex(hsv2rgb(0, 0, hsv.v>50?100:0)); // 보색에 해당하는 흑백으로 결정
+
+        input.css('color', hex);
+    }
+
+    function method(func, thisObj) {
+        return function() { return func.apply(thisObj, arguments) }
+    }
+
+    function color(str) {
+        var col = $.trim(str);
+        var regHex1 = /^#[0-9a-f]{6}$/i;
+        var regHex2 = /^#?([0-9a-f])([0-9a-f])([0-9a-f])$/i; // short hex
+
+        if (regHex1.test(col)) return col.toUpperCase();
+        if (regHex2.test(col)) return col.replace(regHex2, '#$1$1$2$2$3$3').toUpperCase();
+
+        try {
+            col = tmp.appendTo($('<body>')).css('background-color', col).css('background-color');
+        } catch(e) {
+            col = 'transparent';
+        } finally {
+            tmp.css('background-color','').remove();
+        }
+
+        if (/^rgb\(([0-9, ]+)\)$/i.test(col)) col = rgb2hex(RegExp.$1.split(/,\s*/));
+        if (!/#[0-9a-f]{6}/i.test(col)) col = 'transparent';
+
+        return col;
+    }
+
+    function _rgb(rgb, _g, _b) {
+        var r, g, b;
+
+        if (typeof arguments[2] == "number") {
+            r = rgb;
+            g = _g;
+            b = _b;
+        } else if (typeof rgb == "object") {
+            if (rgb.constructor == Array) {
+                r = rgb[0] || 0; g = rgb[1] || 0; b = rgb[2] || 0;
+            } else {
+                r = rgb.r || 0; g = rgb.g || 0; b = rgb.b || 0;
+            }
+        }
+
+        rgb = [];
+
+        rgb.r = rgb[0] = r = parseInt(r, 10);
+        rgb.g = rgb[1] = g = parseInt(g, 10);
+        rgb.b = rgb[2] = b = parseInt(b, 10);
+
+        return rgb;
+    }
+
+    function _hsv(hsv, _s, _v) {
+        var h, s, v;
+
+        if (typeof arguments[2] == "number") {
+            h = hsv; s = _s; v = _v;
+        } else if (typeof hsv == "object") {
+            if (hsv.constructor == Array) {
+                h = hsv[0] || 0; s = hsv[1] || 0; v = hsv[2] || 0;
+            } else {
+                h = hsv.h || 0; s = hsv.s || 0; v = hsv.v || 0;
+            }
+        }
+
+        hsv = [];
+
+        hsv.h = hsv[0] = h = parseInt(h, 10);
+        hsv.s = hsv[1] = s = parseInt(s, 10);
+        hsv.v = hsv[2] = v = parseInt(v, 10);
+
+        return hsv;
+    }
+
+    function rgb2hex(rgb, _g, _b) {
+        var rgb = _rgb(rgb, _g, _b);
+
+        for(var i=0; i < rgb.length; i++) {
+            (rgb[i] = Number(rgb[i]).toString(16)).length<2?rgb[i]='0'+rgb[i]:0;
+        }
+
+        return '#'+rgb.join('').toUpperCase();
+    }
+
+    function hex2rgb(hex) {
+        var r=0, g=0, b=0;
+
+        if (/^#?([0-9a-f]{1,2})([0-9a-f]{1,2})([0-9a-f]{1,2})$/i.test(hex)) {
+            r = parseInt(RegExp.$1, 16);
+            g = parseInt(RegExp.$2, 16);
+            b = parseInt(RegExp.$3, 16);
+        }
+
+        return _rgb(r, g, b);
+    }
+
+    function hsv2rgb(hsv, _s, _v) {
+        var r=0, g=0, b=0;
+        var h=0, s=0, v=0;
+        var i, f, p, q, t;
+
+        hsv = _hsv(hsv, _s, _v);
+
+        h = (hsv[0] % 360) / 60; s = hsv[1] / 100; v = hsv[2] / 100;
+
+        i = Math.floor(h);
+        f = h-i;
+        p = v*(1-s);
+        q = v*(1-s*f);
+        t = v*(1-s*(1-f));
+
+        switch (i) {
+            case 0: r=v; g=t; b=p; break;
+            case 1: r=q; g=v; b=p; break;
+            case 2: r=p; g=v; b=t; break;
+            case 3: r=p; g=q; b=v; break;
+            case 4: r=t; g=p; b=v; break;
+            case 5: r=v; g=p; b=q; break;
+            case 6: break;
+        }
+
+        return _rgb(Math.floor(r*255), Math.floor(g*255), Math.floor(b*255));
+    }
+
+    function rgb2hsv(rgb, _g, _b) {
+        var rgb = _rgb(rgb, _g, _b);
+        var r = rgb[0], g = rgb[1], b = rgb[2];
+        var h = 0, s = 0, v = Math.max(r,g,b), min = Math.min(r,g,b), delta = v - min;
+
+        if (s = v?delta/v:0) {
+            if (r == v) h = 60 * (g - b) / delta;
+            else if (g == v) h = 120 + 60 * (b - r) / delta;
+            else if (b == v) h = 240 + 60 * (r - g) / delta;
+
+            if (h < 0) h += 360;
+        }
+
+        return _hsv(Math.floor(h), Math.floor(s*100), Math.floor(v/255*100));
+    }
+
+    function limit(min, val, max){
+        return Math.min(Math.max(min, val), max);
+    }
+
+    $('input.color-indicator').xe_colorpicker();
+});
diff --git a/common/js/plugins/ui.krzip/krzip_search.js b/common/js/plugins/ui.krzip/krzip_search.js
index c6371bbeb..2cabdd1ad 100644
--- a/common/js/plugins/ui.krzip/krzip_search.js
+++ b/common/js/plugins/ui.krzip/krzip_search.js
@@ -1,119 +1,85 @@
-function doSearchKrZip(obj, column_name) {
-    var fo_obj = obj;
-    while(fo_obj) {
-        if(fo_obj.nodeName == 'FORM') break;
-        fo_obj = fo_obj.parentNode;
-    }
-    if(fo_obj.nodeName != 'FORM') return;
+function doSearchKrZip(form, column_name) {
+	var $=jQuery, $form, field_obj, params, response_tags;
 
-    var field_obj = fo_obj['addr_search_'+column_name];
-    if(!field_obj) return;
+	$form = $(form);
+	if (!$form.filter('form').length) $form = $form.parents('form:first');
+	if (!$form.length) return;
 
-    var addr = field_obj.value;
-    if(!addr) return;
+	field_obj = $form.get(0).elements['addr_search_'+column_name];
+	if(!field_obj || !field_obj.value) return;
 
-    var params = new Array();
-    params['addr'] = addr;
-    params['column_name'] = column_name;
-    var response_tags = new Array('error','message','address_list');
-    exec_xml('krzip', 'getKrzipCodeList', params, completeSearchKrZip, response_tags, params, fo_obj);
+	params = {
+		addr : field_obj.value,
+		column_name : column_name
+	};
+	response_tags = 'error message address_list'.split(' ');
+
+	exec_xml('krzip', 'getKrzipCodeList', params, completeSearchKrZip, response_tags, params, $form[0]);
 }
 
 function completeSearchKrZip(ret_obj, response_tags, callback_args, fo_obj) {
-    if(!ret_obj['address_list']) {
-            alert(alert_msg['address']);
-            return;
-    }
-    var address_list = ret_obj['address_list'].split("\n");
-    var column_name = callback_args['column_name'];
+	var $=jQuery, addr_list, column_name, $zone_list, $zone_search, $select;
 
-    var zone_list_obj = xGetElementById('addr_list_'+column_name);
-    if(!zone_list_obj) return;
+	if(!ret_obj['address_list']) return alert(alert_msg['address']);
 
-    var zone_search_obj = xGetElementById('addr_search_'+column_name);
-    if(!zone_search_obj) return;
+	addr_list   = ret_obj['address_list'].split('\n');
+	column_name = callback_args['column_name'];
 
-    var sel_obj = fo_obj['addr_list_'+column_name];
-    if(!sel_obj) return;
+	if (!($zone_list=$('#addr_list_'+column_name)).length) return;
+	if (!($zone_search=$('#addr_search_'+column_name)).length) return;
+	if (!($select=$(fo_obj.elements['addr_list_'+column_name])).length) return;
 
-    for(var i=0;i<sel_obj.length;i++) {
-        sel_obj.remove(0);
-    }
-    for(var i=0;i<address_list.length;i++) {
-        if(!address_list[i]) continue;
-        var opt = new Option(address_list[i],address_list[i],false,false);
-        sel_obj.options[sel_obj.options.length] = opt;
-    }
+	for(var i=0,c=addr_list.length; i<c; i++) {
+		addr_list[i] = '<option value="'+addr_list[i]+'">'+addr_list[i]+'</option>';
+	}
 
-    sel_obj.selectedIndex = 0;
+	$select.html(addr_list.join('')).get(0).selectedIndex = 0;
 
-    zone_search_obj.style.display = 'none';
-    zone_list_obj.style.display = 'block';
+	$zone_search.hide();
+	$zone_list.show();
 }
 
-function doHideKrZipList(obj, column_name) {
-    var fo_obj = obj;
-    while(fo_obj) {
-        if(fo_obj.nodeName == 'FORM') break;
-        fo_obj = fo_obj.parentNode;
-    }
+function doHideKrZipList(form, column_name) {
+	var $=jQuery, $form, $zone_search, $zone_list;
 
-    if(fo_obj.nodeName != 'FORM') return;
+	$form = $(form);
+	if (!$form.filter('form').length) $form = $form.parents('form:first');
+	if (!$form.length) return;
 
-    var zone_list_obj = xGetElementById('addr_list_'+column_name);
-    if(!zone_list_obj) return;
+	if (!($zone_list=$('#addr_list_'+column_name)).length) return;
+	if (!($zone_search=$('#addr_search_'+column_name)).length) return;
 
-    var zone_search_obj = xGetElementById('addr_search_'+column_name);
-    if(!zone_search_obj) return;
+	$zone_search.show();
+	$zone_list.hide();
 
-    zone_list_obj.style.display = 'none';
-    zone_search_obj.style.display = 'block';
-
-    fo_obj['addr_search_'+column_name].focus();
+	try {
+		$form.get(0).elements['addr_search_'+column_name].focus();
+	} catch(e){};
 }
 
-function doSelectKrZip(obj, column_name) {
-    var fo_obj = obj;
-    while(fo_obj) {
-        if(fo_obj.nodeName == 'FORM') break;
-        fo_obj = fo_obj.parentNode;
-    }
+function doSelectKrZip(form, column_name) {
+	var $=jQuery, $form, $zone_list, $zone_search, $zone_searched, $select;
 
-    if(fo_obj.nodeName != 'FORM') return;
+	$form = $(form);
+	if (!$form.filter('form').length) $form = $form.parents('form:first');
+	if (!$form.length) return;
 
-    var zone_list_obj = xGetElementById('addr_list_'+column_name);
-    if(!zone_list_obj) return;
+	if (!($zone_list=$('#addr_list_'+column_name)).length) return;
+	if (!($zone_search=$('#addr_search_'+column_name)).length) return;
+	if (!($zone_searched=$('#addr_searched_'+column_name)).length) return;
+	if (!($select=$form.find('select[name="addr_list_'+column_name+'"]')).length) return;
 
-    var zone_search_obj = xGetElementById('addr_search_'+column_name);
-    if(!zone_search_obj) return;
+	$zone_searched.show();
+	$zone_list.hide();
+	$zone_search.hide();
 
-    var zone_searched_obj = xGetElementById('addr_searched_'+column_name);
-    if(!zone_searched_obj) return;
-
-    var sel_obj = fo_obj['addr_list_'+column_name];
-    if(!sel_obj) return;
-
-    var address = sel_obj.options[sel_obj.selectedIndex].value;
-    fo_obj[column_name][0].value = address;
-
-    zone_searched_obj.style.display = 'block';
-    zone_list_obj.style.display = 'none';
-    zone_search_obj.style.display = 'none';
-
-    fo_obj[column_name][1].focus();
+	$form.get(0).elements[column_name][0].value = $select.val();
+	$form.get(0).elements[column_name][1].focus();
 }
 
 function doShowKrZipSearch(obj, column_name) {
-    var zone_list_obj = xGetElementById('addr_list_'+column_name);
-    if(!zone_list_obj) return;
-
-    var zone_search_obj = xGetElementById('addr_search_'+column_name);
-    if(!zone_search_obj) return;
-
-    var zone_searched_obj = xGetElementById('addr_searched_'+column_name);
-    if(!zone_searched_obj) return;
-
-    zone_searched_obj.style.display = 'none';
-    zone_list_obj.style.display = 'none';
-    zone_search_obj.style.display = 'block';
+	var $=jQuery;
+	$('#addr_list_'+column_name).hide();
+	$('#addr_search_'+column_name).show();
+	$('#addr_searched_'+column_name).hide();
 }
diff --git a/common/js/plugins/ui.tree/jquery.simple.tree.css b/common/js/plugins/ui.tree/jquery.simple.tree.css
index 077dcd400..cdd78dc0c 100644
--- a/common/js/plugins/ui.tree/jquery.simple.tree.css
+++ b/common/js/plugins/ui.tree/jquery.simple.tree.css
@@ -1,186 +1,186 @@
-
-.simpleTree
-{
-	
-	margin:0;
-	padding:0;
-	/*
-	overflow:auto;
-	width: 250px;
-	height:350px;
-	overflow:auto;
-	border: 1px solid #444444;
-	*/
-}
-.simpleTree li
-{
-	white-space: nowrap;
-	list-style: none;
-	margin:0;
-	padding:0 0 0 34px;
-	line-height: 14px;
-}
-.simpleTree li span
-{
-	display:inline;
-	clear: left;
-	white-space: nowrap;
-}
-
-.simpleTree li a img
-{
-	padding:0 1px 0px 3px;
-}
-
-.simpleTree ul
-{
-	margin:0; 
-	padding:0;
-}
-.simpleTree .root
-{
-	margin-left:-16px;
-	background: url(./images/root.gif) no-repeat 16px 0 #ffffff;
-}
-.simpleTree .line
-{
-	margin:0 0 0 -16px;
-	padding:0;
-	line-height: 3px;
-	height:3px;
-	font-size:3px;
-	background: url(./images/line_bg.gif) 0 0 no-repeat transparent;
-}
-.simpleTree .line-last
-{
-	margin:0 0 0 -16px;
-	padding:0;
-	line-height: 3px;
-	height:3px;
-	font-size:3px;
-	background: url(./images/spacer.gif) 0 0 no-repeat transparent;
-}
-.simpleTree .line-over
-{
-	margin:0 0 0 -16px;
-	padding:0;
-	line-height: 3px;
-	height:3px;
-	font-size:3px;
-	background: url(./images/line_bg_over.gif) 0 0 no-repeat transparent;
-}
-.simpleTree .line-over-last
-{
-	margin:0 0 0 -16px;
-	padding:0;
-	line-height: 3px;
-	height:3px;
-	font-size:3px;
-	background: url(./images/line_bg_over_last.gif) 0 0 no-repeat transparent;
-}
-.simpleTree .folder-open
-{
-	margin-left:-16px;
-	background: url(./images/collapsable.gif) 0 -2px no-repeat #fff;
-}
-.simpleTree .folder-open-last
-{
-	margin-left:-16px;
-	background: url(./images/collapsable-last.gif) 0 -2px no-repeat #fff;
-}
-.simpleTree .folder-close
-{
-	margin-left:-16px;
-	background: url(./images/expandable.gif) 0 -2px no-repeat #fff;
-}
-.simpleTree .folder-close-last
-{
-	margin-left:-16px;
-	background: url(./images/expandable-last.gif) 0 -2px no-repeat #fff;
-}
-.simpleTree .doc
-{
-	margin-left:-16px;
-	background: url(./images/leaf.gif) 0 -1px no-repeat #fff;
-}
-.simpleTree .doc-last
-{
-	margin-left:-16px;
-	background: url(./images/leaf-last.gif) 0 -1px no-repeat #fff;
-}
-.simpleTree .ajax
-{
-	background: url(./images/spinner.gif) no-repeat 0 0 #ffffff;
-	height: 16px;
-	display:none;
-}
-.simpleTree .ajax li
-{
-	display:none;
-	margin:0; 
-	padding:0;
-}
-.simpleTree .trigger
-{
-	display:inline;
-	margin-left:-32px;
-	width: 28px;
-	height: 11px;
-	cursor:pointer;
-}
-.simpleTree .text
-{
-	cursor: default;
-}
-.simpleTree .active
-{
-	cursor: default;
-	background-color:#F7BE77;
-	padding:0px 2px;
-	border: 1px dashed #444;
-}
-#drag_container
-{
-	background:#ffffff;
-	color:#000;
-	font: normal 11px arial, tahoma, helvetica, sans-serif;
-	border: 1px dashed #767676;
-}
-#drag_container ul
-{
-	list-style: none;
-	padding:0;
-	margin:0;
-}
-
-#drag_container li
-{
-	list-style: none;
-	background-color:#ffffff;
-	line-height:18px;
-	white-space: nowrap;
-	padding:1px 1px 0px 16px;
-	margin:0;
-}
-#drag_container li span
-{
-	padding:0;
-}
-
-#drag_container li.doc, #drag_container li.doc-last
-{
-	background: url(./images/leaf.gif) no-repeat -17px 0 #ffffff;
-}
-#drag_container .folder-close, #drag_container .folder-close-last
-{
-	background: url(./images/expandable.gif) no-repeat -17px 0 #ffffff;
-}
-
-#drag_container .folder-open, #drag_container .folder-open-last
-{
-	background: url(./images/collapsable.gif) no-repeat -17px 0 #ffffff;
-}
-.contextMenu
-{
-	display:none;
-}
+
+.simpleTree
+{
+	
+	margin:0;
+	padding:0;
+	/*
+	overflow:auto;
+	width: 250px;
+	height:350px;
+	overflow:auto;
+	border: 1px solid #444444;
+	*/
+}
+.simpleTree li
+{
+	white-space: nowrap;
+	list-style: none;
+	margin:0;
+	padding:0 0 0 34px;
+	line-height: 14px;
+}
+.simpleTree li span
+{
+	display:inline;
+	clear: left;
+	white-space: nowrap;
+}
+
+.simpleTree li a img
+{
+	padding:0 1px 0px 3px;
+}
+
+.simpleTree ul
+{
+	margin:0; 
+	padding:0;
+}
+.simpleTree .root
+{
+	margin-left:-16px;
+	background: url(./images/root.gif) no-repeat 16px 0 #ffffff;
+}
+.simpleTree .line
+{
+	margin:0 0 0 -16px;
+	padding:0;
+	line-height: 3px;
+	height:3px;
+	font-size:3px;
+	background: url(./images/line_bg.gif) 0 0 no-repeat transparent;
+}
+.simpleTree .line-last
+{
+	margin:0 0 0 -16px;
+	padding:0;
+	line-height: 3px;
+	height:3px;
+	font-size:3px;
+	background: url(./images/spacer.gif) 0 0 no-repeat transparent;
+}
+.simpleTree .line-over
+{
+	margin:0 0 0 -16px;
+	padding:0;
+	line-height: 3px;
+	height:3px;
+	font-size:3px;
+	background: url(./images/line_bg_over.gif) 0 0 no-repeat transparent;
+}
+.simpleTree .line-over-last
+{
+	margin:0 0 0 -16px;
+	padding:0;
+	line-height: 3px;
+	height:3px;
+	font-size:3px;
+	background: url(./images/line_bg_over_last.gif) 0 0 no-repeat transparent;
+}
+.simpleTree .folder-open
+{
+	margin-left:-16px;
+	background: url(./images/collapsable.gif) 0 -2px no-repeat #fff;
+}
+.simpleTree .folder-open-last
+{
+	margin-left:-16px;
+	background: url(./images/collapsable-last.gif) 0 -2px no-repeat #fff;
+}
+.simpleTree .folder-close
+{
+	margin-left:-16px;
+	background: url(./images/expandable.gif) 0 -2px no-repeat #fff;
+}
+.simpleTree .folder-close-last
+{
+	margin-left:-16px;
+	background: url(./images/expandable-last.gif) 0 -2px no-repeat #fff;
+}
+.simpleTree .doc
+{
+	margin-left:-16px;
+	background: url(./images/leaf.gif) 0 -1px no-repeat #fff;
+}
+.simpleTree .doc-last
+{
+	margin-left:-16px;
+	background: url(./images/leaf-last.gif) 0 -1px no-repeat #fff;
+}
+.simpleTree .ajax
+{
+	background: url(./images/spinner.gif) no-repeat 0 0 #ffffff;
+	height: 16px;
+	display:none;
+}
+.simpleTree .ajax li
+{
+	display:none;
+	margin:0; 
+	padding:0;
+}
+.simpleTree .trigger
+{
+	display:inline;
+	margin-left:-32px;
+	width: 28px;
+	height: 11px;
+	cursor:pointer;
+}
+.simpleTree .text
+{
+	cursor: default;
+}
+.simpleTree .active
+{
+	cursor: default;
+	background-color:#F7BE77;
+	padding:0px 2px;
+	border: 1px dashed #444;
+}
+#drag_container
+{
+	background:#ffffff;
+	color:#000;
+	font: normal 11px arial, tahoma, helvetica, sans-serif;
+	border: 1px dashed #767676;
+}
+#drag_container ul
+{
+	list-style: none;
+	padding:0;
+	margin:0;
+}
+
+#drag_container li
+{
+	list-style: none;
+	background-color:#ffffff;
+	line-height:18px;
+	white-space: nowrap;
+	padding:1px 1px 0px 16px;
+	margin:0;
+}
+#drag_container li span
+{
+	padding:0;
+}
+
+#drag_container li.doc, #drag_container li.doc-last
+{
+	background: url(./images/leaf.gif) no-repeat -17px 0 #ffffff;
+}
+#drag_container .folder-close, #drag_container .folder-close-last
+{
+	background: url(./images/expandable.gif) no-repeat -17px 0 #ffffff;
+}
+
+#drag_container .folder-open, #drag_container .folder-open-last
+{
+	background: url(./images/collapsable.gif) no-repeat -17px 0 #ffffff;
+}
+.contextMenu
+{
+	display:none;
+}
diff --git a/common/js/plugins/ui/jquery-ui.css b/common/js/plugins/ui/jquery-ui.css
index a5e31ab44..8a8c10722 100644
--- a/common/js/plugins/ui/jquery-ui.css
+++ b/common/js/plugins/ui/jquery-ui.css
@@ -1,13 +1,17 @@
 /*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-*/
+ * jQuery UI CSS Framework 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ */
 
 /* Layout helpers
 ----------------------------------*/
 .ui-helper-hidden { display: none; }
-.ui-helper-hidden-accessible { position: absolute; left: -99999999px; }
+.ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
 .ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; }
 .ui-helper-clearfix { display: inline-block; }
@@ -38,11 +42,16 @@
 
 
 /*
-* jQuery UI CSS Framework
-* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
-* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
-* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
-*/
+ * jQuery UI CSS Framework 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Theming/API
+ *
+ * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=cccccc&bgTextureHeader=03_highlight_soft.png&bgImgOpacityHeader=75&borderColorHeader=aaaaaa&fcHeader=222222&iconColorHeader=222222&bgColorContent=ffffff&bgTextureContent=01_flat.png&bgImgOpacityContent=75&borderColorContent=aaaaaa&fcContent=222222&iconColorContent=222222&bgColorDefault=e6e6e6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=75&borderColorDefault=d3d3d3&fcDefault=555555&iconColorDefault=888888&bgColorHover=dadada&bgTextureHover=02_glass.png&bgImgOpacityHover=75&borderColorHover=999999&fcHover=212121&iconColorHover=454545&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=aaaaaa&fcActive=212121&iconColorActive=454545&bgColorHighlight=fbf9ee&bgTextureHighlight=02_glass.png&bgImgOpacityHighlight=55&borderColorHighlight=fcefa1&fcHighlight=363636&iconColorHighlight=2e83ff&bgColorError=fef1ec&bgTextureError=02_glass.png&bgImgOpacityError=95&borderColorError=cd0a0a&fcError=cd0a0a&iconColorError=cd0a0a&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=0&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=0&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px
+ */
 
 
 /* Component containers
@@ -57,24 +66,24 @@
 
 /* Interaction states
 ----------------------------------*/
-.ui-state-default, .ui-widget-content .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
+.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #d3d3d3; background: #e6e6e6 url(images/ui-bg_glass_75_e6e6e6_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #555555; }
 .ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #555555; text-decoration: none; }
-.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { border: 1px solid #999999; background: #dadada url(images/ui-bg_glass_75_dadada_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
 .ui-state-hover a, .ui-state-hover a:hover { color: #212121; text-decoration: none; }
-.ui-state-active, .ui-widget-content .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
+.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #aaaaaa; background: #ffffff url(images/ui-bg_glass_65_ffffff_1x400.png) 50% 50% repeat-x; font-weight: normal; color: #212121; }
 .ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #212121; text-decoration: none; }
 .ui-widget :active { outline: none; }
 
 /* Interaction Cues
 ----------------------------------*/
-.ui-state-highlight, .ui-widget-content .ui-state-highlight {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
-.ui-state-highlight a, .ui-widget-content .ui-state-highlight a { color: #363636; }
-.ui-state-error, .ui-widget-content .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
-.ui-state-error a, .ui-widget-content .ui-state-error a { color: #cd0a0a; }
-.ui-state-error-text, .ui-widget-content .ui-state-error-text { color: #cd0a0a; }
-.ui-priority-primary, .ui-widget-content .ui-priority-primary { font-weight: bold; }
-.ui-priority-secondary, .ui-widget-content .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
-.ui-state-disabled, .ui-widget-content .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
+.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight  {border: 1px solid #fcefa1; background: #fbf9ee url(images/ui-bg_glass_55_fbf9ee_1x400.png) 50% 50% repeat-x; color: #363636; }
+.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; }
+.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #fef1ec url(images/ui-bg_glass_95_fef1ec_1x400.png) 50% 50% repeat-x; color: #cd0a0a; }
+.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #cd0a0a; }
+.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #cd0a0a; }
+.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; }
+.ui-priority-secondary, .ui-widget-content .ui-priority-secondary,  .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; }
+.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; }
 
 /* Icons
 ----------------------------------*/
@@ -283,10 +292,22 @@
 
 /* Overlays */
 .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); }
-.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* Resizable
-----------------------------------*/
+.ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_0_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/*
+ * jQuery UI Resizable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizable#theming
+ */
 .ui-resizable { position: relative;}
-.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;}
+.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;
+	/* http://bugs.jqueryui.com/ticket/7233
+	 - Resizable: resizable handles fail to work in IE if transparent and content overlaps
+	*/
+	background-image:url(data:);
+}
 .ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; }
 .ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; }
 .ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; }
@@ -295,8 +316,27 @@
 .ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; }
 .ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; }
 .ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; }
-.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Accordion
-----------------------------------*/
+.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/*
+ * jQuery UI Selectable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectable#theming
+ */
+.ui-selectable-helper { position: absolute; z-index: 100; border:1px dotted black; }
+/*
+ * jQuery UI Accordion 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion#theming
+ */
+/* IE/Win - Fix animation bug - #4615 */
+.ui-accordion { width: 100%; }
 .ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; }
 .ui-accordion .ui-accordion-li-fix { display: inline; }
 .ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; }
@@ -304,21 +344,36 @@
 .ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; }
 .ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; }
 .ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; }
-.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete
-----------------------------------*/
+.ui-accordion .ui-accordion-content-active { display: block; }
+/*
+ * jQuery UI Autocomplete 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete#theming
+ */
 .ui-autocomplete { position: absolute; cursor: default; }	
-.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; }
 
 /* workarounds */
 * html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */
 
-/* Menu
-----------------------------------*/
+/*
+ * jQuery UI Menu 1.8.12
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Menu#theming
+ */
 .ui-menu {
 	list-style:none;
 	padding: 2px;
 	margin: 0;
 	display:block;
+	float: left;
 }
 .ui-menu .ui-menu {
 	margin-top: -3px;
@@ -326,6 +381,9 @@
 .ui-menu .ui-menu-item {
 	margin:0;
 	padding: 0;
+	zoom: 1;
+	float: left;
+	clear: left;
 	width: 100%;
 }
 .ui-menu .ui-menu-item a {
@@ -337,11 +395,18 @@
 }
 .ui-menu .ui-menu-item a.ui-state-hover,
 .ui-menu .ui-menu-item a.ui-state-active {
+	font-weight: normal;
 	margin: -1px;
 }
-/* Button
-----------------------------------*/
-
+/*
+ * jQuery UI Button 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button#theming
+ */
 .ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */
 .ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */
 button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */
@@ -352,15 +417,17 @@ button.ui-button-icons-only { width: 3.7em; }
 .ui-button .ui-button-text { display: block; line-height: 1.4;  }
 .ui-button-text-only .ui-button-text { padding: .4em 1em; }
 .ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; }
-.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-primary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; }
+.ui-button-text-icon-secondary .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 2.1em .4em 1em; }
 .ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; }
 /* no icon support for input elements, provide padding by default */
 input.ui-button { padding: .4em 1em; }
 
 /*button icon element(s) */
-.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
+.ui-button-icon-only .ui-icon, .ui-button-text-icon-primary .ui-icon, .ui-button-text-icon-secondary .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; }
 .ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; }
-.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-primary .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; }
+.ui-button-text-icon-secondary .ui-button-icon-secondary, .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
 .ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; }
 
 /*button sets*/
@@ -369,26 +436,36 @@ input.ui-button { padding: .4em 1em; }
 
 /* workarounds */
 button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */
-
-
-
-
-
-/* Dialog
-----------------------------------*/
+/*
+ * jQuery UI Dialog 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog#theming
+ */
 .ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } 
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; } 
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
 .ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
-.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
+.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
-.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; }
+.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; }
+.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; }
 .ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; }
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
-/* Slider
-----------------------------------*/
+/*
+ * jQuery UI Slider 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider#theming
+ */
 .ui-slider { position: relative; text-align: left; }
 .ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; }
 .ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; }
@@ -403,8 +480,15 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; }
 .ui-slider-vertical .ui-slider-range { left: 0; width: 100%; }
 .ui-slider-vertical .ui-slider-range-min { bottom: 0; }
-.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs
-----------------------------------*/
+.ui-slider-vertical .ui-slider-range-max { top: 0; }/*
+ * jQuery UI Tabs 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs#theming
+ */
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
 .ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; }
@@ -412,11 +496,18 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; }
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: text; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
-.ui-tabs .ui-tabs-panel { display: block; border: 0; padding: 1em 1.4em; background: none; }
+.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tabs .ui-tabs-hide { display: none !important; }
-/* Datepicker
-----------------------------------*/
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+/*
+ * jQuery UI Datepicker 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker#theming
+ */
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none; z-index:100 !important}
 .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
 .ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }
@@ -474,7 +565,14 @@ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra pad
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}/* Progressbar
-----------------------------------*/
+}/*
+ * jQuery UI Progressbar 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar#theming
+ */
 .ui-progressbar { height:2em; text-align: left; }
 .ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; }
\ No newline at end of file
diff --git a/common/js/plugins/ui/jquery-ui.min.js b/common/js/plugins/ui/jquery-ui.min.js
new file mode 100644
index 000000000..4370afdae
--- /dev/null
+++ b/common/js/plugins/ui/jquery-ui.min.js
@@ -0,0 +1,413 @@
+/*!
+ * jQuery UI 1.8.15
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI
+ */
+(function(a,c){function d(h,g){var i=h.nodeName.toLowerCase();if("area"===i){g=h.parentNode;i=g.name;if(!h.href||!i||g.nodeName.toLowerCase()!=="map")return false;h=a("img[usemap=#"+i+"]")[0];return!!h&&e(h)}return(/input|select|textarea|button|object/.test(i)?!h.disabled:"a"==i?h.href||g:g)&&e(h)}function e(h){return!a(h).parents().andSelf().filter(function(){return a.curCSS(this,"visibility")==="hidden"||a.expr.filters.hidden(this)}).length}a.ui=a.ui||{};if(!a.ui.version){a.extend(a.ui,{version:"1.8.15",
+keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});a.fn.extend({propAttr:a.fn.prop||a.fn.attr,_focus:a.fn.focus,focus:function(h,g){return typeof h==="number"?this.each(function(){var i=
+this;setTimeout(function(){a(i).focus();g&&g.call(i)},h)}):this._focus.apply(this,arguments)},scrollParent:function(){var h;h=a.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(a.curCSS(this,"position",1))&&/(auto|scroll)/.test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(a.curCSS(this,
+"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!h.length?a(document):h},zIndex:function(h){if(h!==c)return this.css("zIndex",h);if(this.length){h=a(this[0]);for(var g;h.length&&h[0]!==document;){g=h.css("position");if(g==="absolute"||g==="relative"||g==="fixed"){g=parseInt(h.css("zIndex"),10);if(!isNaN(g)&&g!==0)return g}h=h.parent()}}return 0},disableSelection:function(){return this.bind((a.support.selectstart?"selectstart":
+"mousedown")+".ui-disableSelection",function(h){h.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});a.each(["Width","Height"],function(h,g){function i(l,o,n,k){a.each(b,function(){o-=parseFloat(a.curCSS(l,"padding"+this,true))||0;if(n)o-=parseFloat(a.curCSS(l,"border"+this+"Width",true))||0;if(k)o-=parseFloat(a.curCSS(l,"margin"+this,true))||0});return o}var b=g==="Width"?["Left","Right"]:["Top","Bottom"],f=g.toLowerCase(),j={innerWidth:a.fn.innerWidth,innerHeight:a.fn.innerHeight,
+outerWidth:a.fn.outerWidth,outerHeight:a.fn.outerHeight};a.fn["inner"+g]=function(l){if(l===c)return j["inner"+g].call(this);return this.each(function(){a(this).css(f,i(this,l)+"px")})};a.fn["outer"+g]=function(l,o){if(typeof l!=="number")return j["outer"+g].call(this,l);return this.each(function(){a(this).css(f,i(this,l,true,o)+"px")})}});a.extend(a.expr[":"],{data:function(h,g,i){return!!a.data(h,i[3])},focusable:function(h){return d(h,!isNaN(a.attr(h,"tabindex")))},tabbable:function(h){var g=a.attr(h,
+"tabindex"),i=isNaN(g);return(i||g>=0)&&d(h,!i)}});a(function(){var h=document.body,g=h.appendChild(g=document.createElement("div"));a.extend(g.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});a.support.minHeight=g.offsetHeight===100;a.support.selectstart="onselectstart"in g;h.removeChild(g).style.display="none"});a.extend(a.ui,{plugin:{add:function(h,g,i){h=a.ui[h].prototype;for(var b in i){h.plugins[b]=h.plugins[b]||[];h.plugins[b].push([g,i[b]])}},call:function(h,g,i){if((g=h.plugins[g])&&
+h.element[0].parentNode)for(var b=0;b<g.length;b++)h.options[g[b][0]]&&g[b][1].apply(h.element,i)}},contains:function(h,g){return document.compareDocumentPosition?h.compareDocumentPosition(g)&16:h!==g&&h.contains(g)},hasScroll:function(h,g){if(a(h).css("overflow")==="hidden")return false;g=g&&g==="left"?"scrollLeft":"scrollTop";var i=false;if(h[g]>0)return true;h[g]=1;i=h[g]>0;h[g]=0;return i},isOverAxis:function(h,g,i){return h>g&&h<g+i},isOver:function(h,g,i,b,f,j){return a.ui.isOverAxis(h,i,f)&&
+a.ui.isOverAxis(g,b,j)}})}})(jQuery);
+(function(a,c){if(a.cleanData){var d=a.cleanData;a.cleanData=function(h){for(var g=0,i;(i=h[g])!=null;g++)a(i).triggerHandler("remove");d(h)}}else{var e=a.fn.remove;a.fn.remove=function(h,g){return this.each(function(){if(!g)if(!h||a.filter(h,[this]).length)a("*",this).add([this]).each(function(){a(this).triggerHandler("remove")});return e.call(a(this),h,g)})}}a.widget=function(h,g,i){var b=h.split(".")[0],f;h=h.split(".")[1];f=b+"-"+h;if(!i){i=g;g=a.Widget}a.expr[":"][f]=function(j){return!!a.data(j,
+h)};a[b]=a[b]||{};a[b][h]=function(j,l){arguments.length&&this._createWidget(j,l)};g=new g;g.options=a.extend(true,{},g.options);a[b][h].prototype=a.extend(true,g,{namespace:b,widgetName:h,widgetEventPrefix:a[b][h].prototype.widgetEventPrefix||h,widgetBaseClass:f},i);a.widget.bridge(h,a[b][h])};a.widget.bridge=function(h,g){a.fn[h]=function(i){var b=typeof i==="string",f=Array.prototype.slice.call(arguments,1),j=this;i=!b&&f.length?a.extend.apply(null,[true,i].concat(f)):i;if(b&&i.charAt(0)==="_")return j;
+b?this.each(function(){var l=a.data(this,h),o=l&&a.isFunction(l[i])?l[i].apply(l,f):l;if(o!==l&&o!==c){j=o;return false}}):this.each(function(){var l=a.data(this,h);l?l.option(i||{})._init():a.data(this,h,new g(i,this))});return j}};a.Widget=function(h,g){arguments.length&&this._createWidget(h,g)};a.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(h,g){a.data(g,this.widgetName,this);this.element=a(g);this.options=a.extend(true,{},this.options,
+this._getCreateOptions(),h);var i=this;this.element.bind("remove."+this.widgetName,function(){i.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return a.metadata&&a.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(h,g){var i=h;if(arguments.length===0)return a.extend({},this.options);if(typeof h==="string"){if(g===c)return this.options[h];i={};i[h]=g}this._setOptions(i);return this},_setOptions:function(h){var g=this;a.each(h,function(i,b){g._setOption(i,b)});return this},_setOption:function(h,g){this.options[h]=g;if(h==="disabled")this.widget()[g?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",g);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(h,g,i){var b=this.options[h];g=a.Event(g);g.type=(h===this.widgetEventPrefix?h:this.widgetEventPrefix+h).toLowerCase();i=i||{};if(g.originalEvent){h=a.event.props.length;for(var f;h;){f=a.event.props[--h];g[f]=g.originalEvent[f]}}this.element.trigger(g,i);return!(a.isFunction(b)&&b.call(this.element[0],g,i)===false||g.isDefaultPrevented())}}})(jQuery);
+(function(a){a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var c=this;this.element.bind("mousedown."+this.widgetName,function(d){return c._mouseDown(d)}).bind("click."+this.widgetName,function(d){if(true===a.data(d.target,c.widgetName+".preventClickEvent")){a.removeData(d.target,c.widgetName+".preventClickEvent");d.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(c){c.originalEvent=
+c.originalEvent||{};if(!c.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(c);this._mouseDownEvent=c;var d=this,e=c.which==1,h=typeof this.options.cancel=="string"?a(c.target).closest(this.options.cancel).length:false;if(!e||h||!this._mouseCapture(c))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){d.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c)){this._mouseStarted=this._mouseStart(c)!==
+false;if(!this._mouseStarted){c.preventDefault();return true}}true===a.data(c.target,this.widgetName+".preventClickEvent")&&a.removeData(c.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(g){return d._mouseMove(g)};this._mouseUpDelegate=function(g){return d._mouseUp(g)};a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);c.preventDefault();return c.originalEvent.mouseHandled=true}},_mouseMove:function(c){if(a.browser.msie&&
+!(document.documentMode>=9)&&!c.button)return this._mouseUp(c);if(this._mouseStarted){this._mouseDrag(c);return c.preventDefault()}if(this._mouseDistanceMet(c)&&this._mouseDelayMet(c))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,c)!==false)?this._mouseDrag(c):this._mouseUp(c);return!this._mouseStarted},_mouseUp:function(c){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=
+false;c.target==this._mouseDownEvent.target&&a.data(c.target,this.widgetName+".preventClickEvent",true);this._mouseStop(c)}return false},_mouseDistanceMet:function(c){return Math.max(Math.abs(this._mouseDownEvent.pageX-c.pageX),Math.abs(this._mouseDownEvent.pageY-c.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+(function(a){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(c){var d=
+this.options;if(this.helper||d.disabled||a(c.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(c);if(!this.handle)return false;a(d.iframeFix===true?"iframe":d.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(a(this).offset()).appendTo("body")});return true},_mouseStart:function(c){var d=this.options;this.helper=
+this._createHelper(c);this._cacheHelperProportions();if(a.ui.ddmanager)a.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:c.pageX-this.offset.left,top:c.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});
+this.originalPosition=this.position=this._generatePosition(c);this.originalPageX=c.pageX;this.originalPageY=c.pageY;d.cursorAt&&this._adjustOffsetFromHelper(d.cursorAt);d.containment&&this._setContainment();if(this._trigger("start",c)===false){this._clear();return false}this._cacheHelperProportions();a.ui.ddmanager&&!d.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,c);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(c,true);a.ui.ddmanager&&a.ui.ddmanager.dragStart(this,c);return true},
+_mouseDrag:function(c,d){this.position=this._generatePosition(c);this.positionAbs=this._convertPositionTo("absolute");if(!d){d=this._uiHash();if(this._trigger("drag",c,d)===false){this._mouseUp({});return false}this.position=d.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";a.ui.ddmanager&&a.ui.ddmanager.drag(this,c);return false},_mouseStop:function(c){var d=
+false;if(a.ui.ddmanager&&!this.options.dropBehaviour)d=a.ui.ddmanager.drop(this,c);if(this.dropped){d=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!d||this.options.revert=="valid"&&d||this.options.revert===true||a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d)){var e=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,
+10),function(){e._trigger("stop",c)!==false&&e._clear()})}else this._trigger("stop",c)!==false&&this._clear();return false},_mouseUp:function(c){this.options.iframeFix===true&&a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)});a.ui.ddmanager&&a.ui.ddmanager.dragStop(this,c);return a.ui.mouse.prototype._mouseUp.call(this,c)},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(c){var d=!this.options.handle||
+!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==c.target)d=true});return d},_createHelper:function(c){var d=this.options;c=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c])):d.helper=="clone"?this.element.clone().removeAttr("id"):this.element;c.parents("body").length||c.appendTo(d.appendTo=="parent"?this.element[0].parentNode:d.appendTo);c[0]!=this.element[0]&&!/(fixed|absolute)/.test(c.css("position"))&&
+c.css("position","absolute");return c},_adjustOffsetFromHelper:function(c){if(typeof c=="string")c=c.split(" ");if(a.isArray(c))c={left:+c[0],top:+c[1]||0};if("left"in c)this.offset.click.left=c.left+this.margins.left;if("right"in c)this.offset.click.left=this.helperProportions.width-c.right+this.margins.left;if("top"in c)this.offset.click.top=c.top+this.margins.top;if("bottom"in c)this.offset.click.top=this.helperProportions.height-c.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=
+this.helper.offsetParent();var c=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){c.left+=this.scrollParent.scrollLeft();c.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)c={top:0,left:0};return{top:c.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:c.left+(parseInt(this.offsetParent.css("borderLeftWidth"),
+10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var c=this.element.position();return{top:c.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:c.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),
+10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var c=this.options;if(c.containment=="parent")c.containment=this.helper[0].parentNode;if(c.containment=="document"||c.containment=="window")this.containment=[c.containment=="document"?0:a(window).scrollLeft()-this.offset.relative.left-this.offset.parent.left,c.containment=="document"?0:a(window).scrollTop()-this.offset.relative.top-this.offset.parent.top,
+(c.containment=="document"?0:a(window).scrollLeft())+a(c.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(c.containment=="document"?0:a(window).scrollTop())+(a(c.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(c.containment)&&c.containment.constructor!=Array){c=a(c.containment);var d=c[0];if(d){c.offset();var e=a(d).css("overflow")!=
+"hidden";this.containment=[(parseInt(a(d).css("borderLeftWidth"),10)||0)+(parseInt(a(d).css("paddingLeft"),10)||0),(parseInt(a(d).css("borderTopWidth"),10)||0)+(parseInt(a(d).css("paddingTop"),10)||0),(e?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(a(d).css("borderLeftWidth"),10)||0)-(parseInt(a(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,(e?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(a(d).css("borderTopWidth"),
+10)||0)-(parseInt(a(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom];this.relative_container=c}}else if(c.containment.constructor==Array)this.containment=c.containment},_convertPositionTo:function(c,d){if(!d)d=this.position;c=c=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:d.top+
+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*c),left:d.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*c)}},_generatePosition:function(c){var d=this.options,e=this.cssPosition=="absolute"&&
+!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName),g=c.pageX,i=c.pageY;if(this.originalPosition){var b;if(this.containment){if(this.relative_container){b=this.relative_container.offset();b=[this.containment[0]+b.left,this.containment[1]+b.top,this.containment[2]+b.left,this.containment[3]+b.top]}else b=this.containment;if(c.pageX-this.offset.click.left<b[0])g=b[0]+this.offset.click.left;
+if(c.pageY-this.offset.click.top<b[1])i=b[1]+this.offset.click.top;if(c.pageX-this.offset.click.left>b[2])g=b[2]+this.offset.click.left;if(c.pageY-this.offset.click.top>b[3])i=b[3]+this.offset.click.top}if(d.grid){i=d.grid[1]?this.originalPageY+Math.round((i-this.originalPageY)/d.grid[1])*d.grid[1]:this.originalPageY;i=b?!(i-this.offset.click.top<b[1]||i-this.offset.click.top>b[3])?i:!(i-this.offset.click.top<b[1])?i-d.grid[1]:i+d.grid[1]:i;g=d.grid[0]?this.originalPageX+Math.round((g-this.originalPageX)/
+d.grid[0])*d.grid[0]:this.originalPageX;g=b?!(g-this.offset.click.left<b[0]||g-this.offset.click.left>b[2])?g:!(g-this.offset.click.left<b[0])?g-d.grid[0]:g+d.grid[0]:g}}return{top:i-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<
+526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(c,d,e){e=e||this._uiHash();a.ui.plugin.call(this,c,[d,e]);if(c=="drag")this.positionAbs=this._convertPositionTo("absolute");return a.Widget.prototype._trigger.call(this,c,d,
+e)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});a.extend(a.ui.draggable,{version:"1.8.15"});a.ui.plugin.add("draggable","connectToSortable",{start:function(c,d){var e=a(this).data("draggable"),h=e.options,g=a.extend({},d,{item:e.element});e.sortables=[];a(h.connectToSortable).each(function(){var i=a.data(this,"sortable");if(i&&!i.options.disabled){e.sortables.push({instance:i,shouldRevert:i.options.revert});
+i.refreshPositions();i._trigger("activate",c,g)}})},stop:function(c,d){var e=a(this).data("draggable"),h=a.extend({},d,{item:e.element});a.each(e.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;e.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(c);this.instance.options.helper=this.instance.options._helper;e.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=
+false;this.instance._trigger("deactivate",c,h)}})},drag:function(c,d){var e=a(this).data("draggable"),h=this;a.each(e.sortables,function(){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(h).clone().removeAttr("id").appendTo(this.instance.element).data("sortable-item",true);
+this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return d.helper[0]};c.target=this.instance.currentItem[0];this.instance._mouseCapture(c,true);this.instance._mouseStart(c,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;
+e._trigger("toSortable",c);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}this.instance.currentItem&&this.instance._mouseDrag(c)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",c,this.instance._uiHash(this.instance));this.instance._mouseStop(c,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&
+this.instance.placeholder.remove();e._trigger("fromSortable",c);e.dropped=false}})}});a.ui.plugin.add("draggable","cursor",{start:function(){var c=a("body"),d=a(this).data("draggable").options;if(c.css("cursor"))d._cursor=c.css("cursor");c.css("cursor",d.cursor)},stop:function(){var c=a(this).data("draggable").options;c._cursor&&a("body").css("cursor",c._cursor)}});a.ui.plugin.add("draggable","opacity",{start:function(c,d){c=a(d.helper);d=a(this).data("draggable").options;if(c.css("opacity"))d._opacity=
+c.css("opacity");c.css("opacity",d.opacity)},stop:function(c,d){c=a(this).data("draggable").options;c._opacity&&a(d.helper).css("opacity",c._opacity)}});a.ui.plugin.add("draggable","scroll",{start:function(){var c=a(this).data("draggable");if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML")c.overflowOffset=c.scrollParent.offset()},drag:function(c){var d=a(this).data("draggable"),e=d.options,h=false;if(d.scrollParent[0]!=document&&d.scrollParent[0].tagName!="HTML"){if(!e.axis||e.axis!=
+"x")if(d.overflowOffset.top+d.scrollParent[0].offsetHeight-c.pageY<e.scrollSensitivity)d.scrollParent[0].scrollTop=h=d.scrollParent[0].scrollTop+e.scrollSpeed;else if(c.pageY-d.overflowOffset.top<e.scrollSensitivity)d.scrollParent[0].scrollTop=h=d.scrollParent[0].scrollTop-e.scrollSpeed;if(!e.axis||e.axis!="y")if(d.overflowOffset.left+d.scrollParent[0].offsetWidth-c.pageX<e.scrollSensitivity)d.scrollParent[0].scrollLeft=h=d.scrollParent[0].scrollLeft+e.scrollSpeed;else if(c.pageX-d.overflowOffset.left<
+e.scrollSensitivity)d.scrollParent[0].scrollLeft=h=d.scrollParent[0].scrollLeft-e.scrollSpeed}else{if(!e.axis||e.axis!="x")if(c.pageY-a(document).scrollTop()<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()-e.scrollSpeed);else if(a(window).height()-(c.pageY-a(document).scrollTop())<e.scrollSensitivity)h=a(document).scrollTop(a(document).scrollTop()+e.scrollSpeed);if(!e.axis||e.axis!="y")if(c.pageX-a(document).scrollLeft()<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()-
+e.scrollSpeed);else if(a(window).width()-(c.pageX-a(document).scrollLeft())<e.scrollSensitivity)h=a(document).scrollLeft(a(document).scrollLeft()+e.scrollSpeed)}h!==false&&a.ui.ddmanager&&!e.dropBehaviour&&a.ui.ddmanager.prepareOffsets(d,c)}});a.ui.plugin.add("draggable","snap",{start:function(){var c=a(this).data("draggable"),d=c.options;c.snapElements=[];a(d.snap.constructor!=String?d.snap.items||":data(draggable)":d.snap).each(function(){var e=a(this),h=e.offset();this!=c.element[0]&&c.snapElements.push({item:this,
+width:e.outerWidth(),height:e.outerHeight(),top:h.top,left:h.left})})},drag:function(c,d){for(var e=a(this).data("draggable"),h=e.options,g=h.snapTolerance,i=d.offset.left,b=i+e.helperProportions.width,f=d.offset.top,j=f+e.helperProportions.height,l=e.snapElements.length-1;l>=0;l--){var o=e.snapElements[l].left,n=o+e.snapElements[l].width,k=e.snapElements[l].top,m=k+e.snapElements[l].height;if(o-g<i&&i<n+g&&k-g<f&&f<m+g||o-g<i&&i<n+g&&k-g<j&&j<m+g||o-g<b&&b<n+g&&k-g<f&&f<m+g||o-g<b&&b<n+g&&k-g<j&&
+j<m+g){if(h.snapMode!="inner"){var p=Math.abs(k-j)<=g,q=Math.abs(m-f)<=g,s=Math.abs(o-b)<=g,r=Math.abs(n-i)<=g;if(p)d.position.top=e._convertPositionTo("relative",{top:k-e.helperProportions.height,left:0}).top-e.margins.top;if(q)d.position.top=e._convertPositionTo("relative",{top:m,left:0}).top-e.margins.top;if(s)d.position.left=e._convertPositionTo("relative",{top:0,left:o-e.helperProportions.width}).left-e.margins.left;if(r)d.position.left=e._convertPositionTo("relative",{top:0,left:n}).left-e.margins.left}var u=
+p||q||s||r;if(h.snapMode!="outer"){p=Math.abs(k-f)<=g;q=Math.abs(m-j)<=g;s=Math.abs(o-i)<=g;r=Math.abs(n-b)<=g;if(p)d.position.top=e._convertPositionTo("relative",{top:k,left:0}).top-e.margins.top;if(q)d.position.top=e._convertPositionTo("relative",{top:m-e.helperProportions.height,left:0}).top-e.margins.top;if(s)d.position.left=e._convertPositionTo("relative",{top:0,left:o}).left-e.margins.left;if(r)d.position.left=e._convertPositionTo("relative",{top:0,left:n-e.helperProportions.width}).left-e.margins.left}if(!e.snapElements[l].snapping&&
+(p||q||s||r||u))e.options.snap.snap&&e.options.snap.snap.call(e.element,c,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=p||q||s||r||u}else{e.snapElements[l].snapping&&e.options.snap.release&&e.options.snap.release.call(e.element,c,a.extend(e._uiHash(),{snapItem:e.snapElements[l].item}));e.snapElements[l].snapping=false}}}});a.ui.plugin.add("draggable","stack",{start:function(){var c=a(this).data("draggable").options;c=a.makeArray(a(c.stack)).sort(function(e,h){return(parseInt(a(e).css("zIndex"),
+10)||0)-(parseInt(a(h).css("zIndex"),10)||0)});if(c.length){var d=parseInt(c[0].style.zIndex)||0;a(c).each(function(e){this.style.zIndex=d+e});this[0].style.zIndex=d+c.length}}});a.ui.plugin.add("draggable","zIndex",{start:function(c,d){c=a(d.helper);d=a(this).data("draggable").options;if(c.css("zIndex"))d._zIndex=c.css("zIndex");c.css("zIndex",d.zIndex)},stop:function(c,d){c=a(this).data("draggable").options;c._zIndex&&a(d.helper).css("zIndex",c._zIndex)}})})(jQuery);
+(function(a){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var c=this.options,d=c.accept;this.isover=0;this.isout=1;this.accept=a.isFunction(d)?d:function(e){return e.is(d)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[c.scope]=a.ui.ddmanager.droppables[c.scope]||[];a.ui.ddmanager.droppables[c.scope].push(this);
+c.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var c=a.ui.ddmanager.droppables[this.options.scope],d=0;d<c.length;d++)c[d]==this&&c.splice(d,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(c,d){if(c=="accept")this.accept=a.isFunction(d)?d:function(e){return e.is(d)};a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(c){var d=a.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);d&&this._trigger("activate",c,this.ui(d))},_deactivate:function(c){var d=a.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);d&&this._trigger("deactivate",c,this.ui(d))},_over:function(c){var d=a.ui.ddmanager.current;if(!(!d||(d.currentItem||d.element)[0]==this.element[0]))if(this.accept.call(this.element[0],d.currentItem||d.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",c,this.ui(d))}},_out:function(c){var d=a.ui.ddmanager.current;if(!(!d||(d.currentItem||d.element)[0]==this.element[0]))if(this.accept.call(this.element[0],d.currentItem||d.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",c,this.ui(d))}},_drop:function(c,d){var e=d||a.ui.ddmanager.current;if(!e||(e.currentItem||e.element)[0]==this.element[0])return false;var h=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+a.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==e.options.scope&&g.accept.call(g.element[0],e.currentItem||e.element)&&a.ui.intersect(e,a.extend(g,{offset:g.element.offset()}),g.options.tolerance)){h=true;return false}});if(h)return false;if(this.accept.call(this.element[0],e.currentItem||e.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+c,this.ui(e));return this.element}return false},ui:function(c){return{draggable:c.currentItem||c.element,helper:c.helper,position:c.position,offset:c.positionAbs}}});a.extend(a.ui.droppable,{version:"1.8.15"});a.ui.intersect=function(c,d,e){if(!d.offset)return false;var h=(c.positionAbs||c.position.absolute).left,g=h+c.helperProportions.width,i=(c.positionAbs||c.position.absolute).top,b=i+c.helperProportions.height,f=d.offset.left,j=f+d.proportions.width,l=d.offset.top,o=l+d.proportions.height;
+switch(e){case "fit":return f<=h&&g<=j&&l<=i&&b<=o;case "intersect":return f<h+c.helperProportions.width/2&&g-c.helperProportions.width/2<j&&l<i+c.helperProportions.height/2&&b-c.helperProportions.height/2<o;case "pointer":return a.ui.isOver((c.positionAbs||c.position.absolute).top+(c.clickOffset||c.offset.click).top,(c.positionAbs||c.position.absolute).left+(c.clickOffset||c.offset.click).left,l,f,d.proportions.height,d.proportions.width);case "touch":return(i>=l&&i<=o||b>=l&&b<=o||i<l&&b>o)&&(h>=
+f&&h<=j||g>=f&&g<=j||h<f&&g>j);default:return false}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(c,d){var e=a.ui.ddmanager.droppables[c.options.scope]||[],h=d?d.type:null,g=(c.currentItem||c.element).find(":data(droppable)").andSelf(),i=0;a:for(;i<e.length;i++)if(!(e[i].options.disabled||c&&!e[i].accept.call(e[i].element[0],c.currentItem||c.element))){for(var b=0;b<g.length;b++)if(g[b]==e[i].element[0]){e[i].proportions.height=0;continue a}e[i].visible=e[i].element.css("display")!=
+"none";if(e[i].visible){h=="mousedown"&&e[i]._activate.call(e[i],d);e[i].offset=e[i].element.offset();e[i].proportions={width:e[i].element[0].offsetWidth,height:e[i].element[0].offsetHeight}}}},drop:function(c,d){var e=false;a.each(a.ui.ddmanager.droppables[c.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&a.ui.intersect(c,this,this.options.tolerance))e=e||this._drop.call(this,d);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],c.currentItem||
+c.element)){this.isout=1;this.isover=0;this._deactivate.call(this,d)}}});return e},dragStart:function(c,d){c.element.parentsUntil("body").bind("scroll.droppable",function(){c.options.refreshPositions||a.ui.ddmanager.prepareOffsets(c,d)})},drag:function(c,d){c.options.refreshPositions&&a.ui.ddmanager.prepareOffsets(c,d);a.each(a.ui.ddmanager.droppables[c.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var e=a.ui.intersect(c,this,this.options.tolerance);if(e=
+!e&&this.isover==1?"isout":e&&this.isover==0?"isover":null){var h;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){h=a.data(g[0],"droppable");h.greedyChild=e=="isover"?1:0}}if(h&&e=="isover"){h.isover=0;h.isout=1;h._out.call(h,d)}this[e]=1;this[e=="isout"?"isover":"isout"]=0;this[e=="isover"?"_over":"_out"].call(this,d);if(h&&e=="isout"){h.isout=0;h.isover=1;h._over.call(h,d)}}}})},dragStop:function(c,d){c.element.parentsUntil("body").unbind("scroll.droppable");
+c.options.refreshPositions||a.ui.ddmanager.prepareOffsets(c,d)}}})(jQuery);
+(function(a){a.widget("ui.resizable",a.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var e=this,h=this.options;this.element.addClass("ui-resizable");a.extend(this,{_aspectRatio:!!h.aspectRatio,aspectRatio:h.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:h.helper||h.ghost||h.animate?h.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&a.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(a('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=h.handles||(!a(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var g=this.handles.split(",");this.handles={};for(var i=0;i<g.length;i++){var b=a.trim(g[i]),f=a('<div class="ui-resizable-handle '+("ui-resizable-"+b)+'"></div>');/sw|se|ne|nw/.test(b)&&f.css({zIndex:++h.zIndex});"se"==b&&f.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[b]=".ui-resizable-"+b;this.element.append(f)}}this._renderAxis=function(j){j=j||this.element;for(var l in this.handles){if(this.handles[l].constructor==
+String)this.handles[l]=a(this.handles[l],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var o=a(this.handles[l],this.element),n=0;n=/sw|ne|nw|se|n|s/.test(l)?o.outerHeight():o.outerWidth();o=["padding",/ne|nw|n/.test(l)?"Top":/se|sw|s/.test(l)?"Bottom":/^e$/.test(l)?"Right":"Left"].join("");j.css(o,n);this._proportionallyResize()}a(this.handles[l])}};this._renderAxis(this.element);this._handles=a(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!e.resizing){if(this.className)var j=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);e.axis=j&&j[1]?j[1]:"se"}});if(h.autoHide){this._handles.hide();a(this.element).addClass("ui-resizable-autohide").hover(function(){if(!h.disabled){a(this).removeClass("ui-resizable-autohide");e._handles.show()}},function(){if(!h.disabled)if(!e.resizing){a(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();
+var e=function(g){a(g).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){e(this.element);var h=this.element;h.after(this.originalElement.css({position:h.css("position"),width:h.outerWidth(),height:h.outerHeight(),top:h.css("top"),left:h.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);e(this.originalElement);return this},_mouseCapture:function(e){var h=
+false;for(var g in this.handles)if(a(this.handles[g])[0]==e.target)h=true;return!this.options.disabled&&h},_mouseStart:function(e){var h=this.options,g=this.element.position(),i=this.element;this.resizing=true;this.documentScroll={top:a(document).scrollTop(),left:a(document).scrollLeft()};if(i.is(".ui-draggable")||/absolute/.test(i.css("position")))i.css({position:"absolute",top:g.top,left:g.left});a.browser.opera&&/relative/.test(i.css("position"))&&i.css({position:"relative",top:"auto",left:"auto"});
+this._renderProxy();g=c(this.helper.css("left"));var b=c(this.helper.css("top"));if(h.containment){g+=a(h.containment).scrollLeft()||0;b+=a(h.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:g,top:b};this.size=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalSize=this._helper?{width:i.outerWidth(),height:i.outerHeight()}:{width:i.width(),height:i.height()};this.originalPosition={left:g,top:b};this.sizeDiff=
+{width:i.outerWidth()-i.width(),height:i.outerHeight()-i.height()};this.originalMousePosition={left:e.pageX,top:e.pageY};this.aspectRatio=typeof h.aspectRatio=="number"?h.aspectRatio:this.originalSize.width/this.originalSize.height||1;h=a(".ui-resizable-"+this.axis).css("cursor");a("body").css("cursor",h=="auto"?this.axis+"-resize":h);i.addClass("ui-resizable-resizing");this._propagate("start",e);return true},_mouseDrag:function(e){var h=this.helper,g=this.originalMousePosition,i=this._change[this.axis];
+if(!i)return false;g=i.apply(this,[e,e.pageX-g.left||0,e.pageY-g.top||0]);this._updateVirtualBoundaries(e.shiftKey);if(this._aspectRatio||e.shiftKey)g=this._updateRatio(g,e);g=this._respectSize(g,e);this._propagate("resize",e);h.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(g);this._trigger("resize",e,this.ui());return false},
+_mouseStop:function(e){this.resizing=false;var h=this.options,g=this;if(this._helper){var i=this._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName);i=b&&a.ui.hasScroll(i[0],"left")?0:g.sizeDiff.height;b=b?0:g.sizeDiff.width;b={width:g.helper.width()-b,height:g.helper.height()-i};i=parseInt(g.element.css("left"),10)+(g.position.left-g.originalPosition.left)||null;var f=parseInt(g.element.css("top"),10)+(g.position.top-g.originalPosition.top)||null;h.animate||this.element.css(a.extend(b,
+{top:f,left:i}));g.helper.height(g.size.height);g.helper.width(g.size.width);this._helper&&!h.animate&&this._proportionallyResize()}a("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",e);this._helper&&this.helper.remove();return false},_updateVirtualBoundaries:function(e){var h=this.options,g,i,b;h={minWidth:d(h.minWidth)?h.minWidth:0,maxWidth:d(h.maxWidth)?h.maxWidth:Infinity,minHeight:d(h.minHeight)?h.minHeight:0,maxHeight:d(h.maxHeight)?h.maxHeight:
+Infinity};if(this._aspectRatio||e){e=h.minHeight*this.aspectRatio;i=h.minWidth/this.aspectRatio;g=h.maxHeight*this.aspectRatio;b=h.maxWidth/this.aspectRatio;if(e>h.minWidth)h.minWidth=e;if(i>h.minHeight)h.minHeight=i;if(g<h.maxWidth)h.maxWidth=g;if(b<h.maxHeight)h.maxHeight=b}this._vBoundaries=h},_updateCache:function(e){this.offset=this.helper.offset();if(d(e.left))this.position.left=e.left;if(d(e.top))this.position.top=e.top;if(d(e.height))this.size.height=e.height;if(d(e.width))this.size.width=
+e.width},_updateRatio:function(e){var h=this.position,g=this.size,i=this.axis;if(d(e.height))e.width=e.height*this.aspectRatio;else if(d(e.width))e.height=e.width/this.aspectRatio;if(i=="sw"){e.left=h.left+(g.width-e.width);e.top=null}if(i=="nw"){e.top=h.top+(g.height-e.height);e.left=h.left+(g.width-e.width)}return e},_respectSize:function(e){var h=this._vBoundaries,g=this.axis,i=d(e.width)&&h.maxWidth&&h.maxWidth<e.width,b=d(e.height)&&h.maxHeight&&h.maxHeight<e.height,f=d(e.width)&&h.minWidth&&
+h.minWidth>e.width,j=d(e.height)&&h.minHeight&&h.minHeight>e.height;if(f)e.width=h.minWidth;if(j)e.height=h.minHeight;if(i)e.width=h.maxWidth;if(b)e.height=h.maxHeight;var l=this.originalPosition.left+this.originalSize.width,o=this.position.top+this.size.height,n=/sw|nw|w/.test(g);g=/nw|ne|n/.test(g);if(f&&n)e.left=l-h.minWidth;if(i&&n)e.left=l-h.maxWidth;if(j&&g)e.top=o-h.minHeight;if(b&&g)e.top=o-h.maxHeight;if((h=!e.width&&!e.height)&&!e.left&&e.top)e.top=null;else if(h&&!e.top&&e.left)e.left=
+null;return e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var e=this.helper||this.element,h=0;h<this._proportionallyResizeElements.length;h++){var g=this._proportionallyResizeElements[h];if(!this.borderDif){var i=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],b=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=a.map(i,function(f,j){f=parseInt(f,10)||
+0;j=parseInt(b[j],10)||0;return f+j})}a.browser.msie&&(a(e).is(":hidden")||a(e).parents(":hidden").length)||g.css({height:e.height()-this.borderDif[0]-this.borderDif[2]||0,width:e.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var e=this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||a('<div style="overflow:hidden;"></div>');var h=a.browser.msie&&a.browser.version<7,g=h?1:0;h=h?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+
+h,height:this.element.outerHeight()+h,position:"absolute",left:this.elementOffset.left-g+"px",top:this.elementOffset.top-g+"px",zIndex:++e.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(e,h){return{width:this.originalSize.width+h}},w:function(e,h){return{left:this.originalPosition.left+h,width:this.originalSize.width-h}},n:function(e,h,g){return{top:this.originalPosition.top+g,height:this.originalSize.height-g}},s:function(e,h,g){return{height:this.originalSize.height+
+g}},se:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},sw:function(e,h,g){return a.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[e,h,g]))},ne:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[e,h,g]))},nw:function(e,h,g){return a.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[e,h,g]))}},_propagate:function(e,h){a.ui.plugin.call(this,e,[h,this.ui()]);
+e!="resize"&&this._trigger(e,h,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});a.extend(a.ui.resizable,{version:"1.8.15"});a.ui.plugin.add("resizable","alsoResize",{start:function(){var e=a(this).data("resizable").options,h=function(g){a(g).each(function(){var i=a(this);i.data("resizable-alsoresize",{width:parseInt(i.width(),
+10),height:parseInt(i.height(),10),left:parseInt(i.css("left"),10),top:parseInt(i.css("top"),10),position:i.css("position")})})};if(typeof e.alsoResize=="object"&&!e.alsoResize.parentNode)if(e.alsoResize.length){e.alsoResize=e.alsoResize[0];h(e.alsoResize)}else a.each(e.alsoResize,function(g){h(g)});else h(e.alsoResize)},resize:function(e,h){var g=a(this).data("resizable");e=g.options;var i=g.originalSize,b=g.originalPosition,f={height:g.size.height-i.height||0,width:g.size.width-i.width||0,top:g.position.top-
+b.top||0,left:g.position.left-b.left||0},j=function(l,o){a(l).each(function(){var n=a(this),k=a(this).data("resizable-alsoresize"),m={},p=o&&o.length?o:n.parents(h.originalElement[0]).length?["width","height"]:["width","height","top","left"];a.each(p,function(q,s){if((q=(k[s]||0)+(f[s]||0))&&q>=0)m[s]=q||null});if(a.browser.opera&&/relative/.test(n.css("position"))){g._revertToRelativePosition=true;n.css({position:"absolute",top:"auto",left:"auto"})}n.css(m)})};typeof e.alsoResize=="object"&&!e.alsoResize.nodeType?
+a.each(e.alsoResize,function(l,o){j(l,o)}):j(e.alsoResize)},stop:function(){var e=a(this).data("resizable"),h=e.options,g=function(i){a(i).each(function(){var b=a(this);b.css({position:b.data("resizable-alsoresize").position})})};if(e._revertToRelativePosition){e._revertToRelativePosition=false;typeof h.alsoResize=="object"&&!h.alsoResize.nodeType?a.each(h.alsoResize,function(i){g(i)}):g(h.alsoResize)}a(this).removeData("resizable-alsoresize")}});a.ui.plugin.add("resizable","animate",{stop:function(e){var h=
+a(this).data("resizable"),g=h.options,i=h._proportionallyResizeElements,b=i.length&&/textarea/i.test(i[0].nodeName),f=b&&a.ui.hasScroll(i[0],"left")?0:h.sizeDiff.height;b={width:h.size.width-(b?0:h.sizeDiff.width),height:h.size.height-f};f=parseInt(h.element.css("left"),10)+(h.position.left-h.originalPosition.left)||null;var j=parseInt(h.element.css("top"),10)+(h.position.top-h.originalPosition.top)||null;h.element.animate(a.extend(b,j&&f?{top:j,left:f}:{}),{duration:g.animateDuration,easing:g.animateEasing,
+step:function(){var l={width:parseInt(h.element.css("width"),10),height:parseInt(h.element.css("height"),10),top:parseInt(h.element.css("top"),10),left:parseInt(h.element.css("left"),10)};i&&i.length&&a(i[0]).css({width:l.width,height:l.height});h._updateCache(l);h._propagate("resize",e)}})}});a.ui.plugin.add("resizable","containment",{start:function(){var e=a(this).data("resizable"),h=e.element,g=e.options.containment;if(h=g instanceof a?g.get(0):/parent/.test(g)?h.parent().get(0):g){e.containerElement=
+a(h);if(/document/.test(g)||g==document){e.containerOffset={left:0,top:0};e.containerPosition={left:0,top:0};e.parentData={element:a(document),left:0,top:0,width:a(document).width(),height:a(document).height()||document.body.parentNode.scrollHeight}}else{var i=a(h),b=[];a(["Top","Right","Left","Bottom"]).each(function(l,o){b[l]=c(i.css("padding"+o))});e.containerOffset=i.offset();e.containerPosition=i.position();e.containerSize={height:i.innerHeight()-b[3],width:i.innerWidth()-b[1]};g=e.containerOffset;
+var f=e.containerSize.height,j=e.containerSize.width;j=a.ui.hasScroll(h,"left")?h.scrollWidth:j;f=a.ui.hasScroll(h)?h.scrollHeight:f;e.parentData={element:h,left:g.left,top:g.top,width:j,height:f}}}},resize:function(e){var h=a(this).data("resizable"),g=h.options,i=h.containerOffset,b=h.position;e=h._aspectRatio||e.shiftKey;var f={top:0,left:0},j=h.containerElement;if(j[0]!=document&&/static/.test(j.css("position")))f=i;if(b.left<(h._helper?i.left:0)){h.size.width+=h._helper?h.position.left-i.left:
+h.position.left-f.left;if(e)h.size.height=h.size.width/g.aspectRatio;h.position.left=g.helper?i.left:0}if(b.top<(h._helper?i.top:0)){h.size.height+=h._helper?h.position.top-i.top:h.position.top;if(e)h.size.width=h.size.height*g.aspectRatio;h.position.top=h._helper?i.top:0}h.offset.left=h.parentData.left+h.position.left;h.offset.top=h.parentData.top+h.position.top;g=Math.abs((h._helper?h.offset.left-f.left:h.offset.left-f.left)+h.sizeDiff.width);i=Math.abs((h._helper?h.offset.top-f.top:h.offset.top-
+i.top)+h.sizeDiff.height);b=h.containerElement.get(0)==h.element.parent().get(0);f=/relative|absolute/.test(h.containerElement.css("position"));if(b&&f)g-=h.parentData.left;if(g+h.size.width>=h.parentData.width){h.size.width=h.parentData.width-g;if(e)h.size.height=h.size.width/h.aspectRatio}if(i+h.size.height>=h.parentData.height){h.size.height=h.parentData.height-i;if(e)h.size.width=h.size.height*h.aspectRatio}},stop:function(){var e=a(this).data("resizable"),h=e.options,g=e.containerOffset,i=e.containerPosition,
+b=e.containerElement,f=a(e.helper),j=f.offset(),l=f.outerWidth()-e.sizeDiff.width;f=f.outerHeight()-e.sizeDiff.height;e._helper&&!h.animate&&/relative/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f});e._helper&&!h.animate&&/static/.test(b.css("position"))&&a(this).css({left:j.left-i.left-g.left,width:l,height:f})}});a.ui.plugin.add("resizable","ghost",{start:function(){var e=a(this).data("resizable"),h=e.options,g=e.size;e.ghost=e.originalElement.clone();e.ghost.css({opacity:0.25,
+display:"block",position:"relative",height:g.height,width:g.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");e.ghost.appendTo(e.helper)},resize:function(){var e=a(this).data("resizable");e.ghost&&e.ghost.css({position:"relative",height:e.size.height,width:e.size.width})},stop:function(){var e=a(this).data("resizable");e.ghost&&e.helper&&e.helper.get(0).removeChild(e.ghost.get(0))}});a.ui.plugin.add("resizable","grid",{resize:function(){var e=
+a(this).data("resizable"),h=e.options,g=e.size,i=e.originalSize,b=e.originalPosition,f=e.axis;h.grid=typeof h.grid=="number"?[h.grid,h.grid]:h.grid;var j=Math.round((g.width-i.width)/(h.grid[0]||1))*(h.grid[0]||1);h=Math.round((g.height-i.height)/(h.grid[1]||1))*(h.grid[1]||1);if(/^(se|s|e)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h}else if(/^(ne)$/.test(f)){e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}else{if(/^(sw)$/.test(f)){e.size.width=i.width+j;e.size.height=
+i.height+h}else{e.size.width=i.width+j;e.size.height=i.height+h;e.position.top=b.top-h}e.position.left=b.left-j}}});var c=function(e){return parseInt(e,10)||0},d=function(e){return!isNaN(parseInt(e,10))}})(jQuery);
+(function(a){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var d;this.refresh=function(){d=a(c.options.filter,c.element[0]);d.each(function(){var e=a(this),h=e.offset();a.data(this,"selectable-item",{element:this,$element:e,left:h.left,top:h.top,right:h.left+e.outerWidth(),bottom:h.top+e.outerHeight(),startselected:false,selected:e.hasClass("ui-selected"),
+selecting:e.hasClass("ui-selecting"),unselecting:e.hasClass("ui-unselecting")})})};this.refresh();this.selectees=d.addClass("ui-selectee");this._mouseInit();this.helper=a("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var d=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var e=this.options;this.selectees=a(e.filter,this.element[0]);this._trigger("start",c);a(e.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});e.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var h=a.data(this,"selectable-item");h.startselected=true;if(!c.metaKey){h.$element.removeClass("ui-selected");h.selected=false;h.$element.addClass("ui-unselecting");h.unselecting=true;d._trigger("unselecting",
+c,{unselecting:h.element})}});a(c.target).parents().andSelf().each(function(){var h=a.data(this,"selectable-item");if(h){var g=!c.metaKey||!h.$element.hasClass("ui-selected");h.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");h.unselecting=!g;h.selecting=g;(h.selected=g)?d._trigger("selecting",c,{selecting:h.element}):d._trigger("unselecting",c,{unselecting:h.element});return false}})}},_mouseDrag:function(c){var d=this;this.dragged=true;if(!this.options.disabled){var e=
+this.options,h=this.opos[0],g=this.opos[1],i=c.pageX,b=c.pageY;if(h>i){var f=i;i=h;h=f}if(g>b){f=b;b=g;g=f}this.helper.css({left:h,top:g,width:i-h,height:b-g});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!(!j||j.element==d.element[0])){var l=false;if(e.tolerance=="touch")l=!(j.left>i||j.right<h||j.top>b||j.bottom<g);else if(e.tolerance=="fit")l=j.left>h&&j.right<i&&j.top>g&&j.bottom<b;if(l){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");
+j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;d._trigger("selecting",c,{selecting:j.element})}}else{if(j.selecting)if(c.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}d._trigger("unselecting",c,{unselecting:j.element})}if(j.selected)if(!c.metaKey&&
+!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;d._trigger("unselecting",c,{unselecting:j.element})}}}});return false}},_mouseStop:function(c){var d=this;this.dragged=false;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;d._trigger("unselected",c,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=
+a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;d._trigger("selected",c,{selected:e.element})});this._trigger("stop",c);this.helper.remove();return false}});a.extend(a.ui.selectable,{version:"1.8.15"})})(jQuery);
+(function(a){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){var c=this.options;this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?c.axis==="x"||/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var c=this.items.length-1;c>=0;c--)this.items[c].item.removeData("sortable-item");return this},_setOption:function(c,d){if(c===
+"disabled"){this.options[c]=d;this.widget()[d?"addClass":"removeClass"]("ui-sortable-disabled")}else a.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(c,d){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(c);var e=null,h=this;a(c.target).parents().each(function(){if(a.data(this,"sortable-item")==h){e=a(this);return false}});if(a.data(c.target,"sortable-item")==h)e=a(c.target);if(!e)return false;if(this.options.handle&&
+!d){var g=false;a(this.options.handle,e).find("*").andSelf().each(function(){if(this==c.target)g=true});if(!g)return false}this.currentItem=e;this._removeCurrentsFromItems();return true},_mouseStart:function(c,d,e){d=this.options;var h=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(c);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,
+left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:c.pageX-this.offset.left,top:c.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(c);this.originalPageX=c.pageX;this.originalPageY=c.pageY;d.cursorAt&&this._adjustOffsetFromHelper(d.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();d.containment&&this._setContainment();if(d.cursor){if(a("body").css("cursor"))this._storedCursor=a("body").css("cursor");a("body").css("cursor",d.cursor)}if(d.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",d.opacity)}if(d.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",d.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",c,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!e)for(e=this.containers.length-1;e>=0;e--)this.containers[e]._trigger("activate",c,h._uiHash(this));if(a.ui.ddmanager)a.ui.ddmanager.current=this;a.ui.ddmanager&&!d.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,c);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(c);
+return true},_mouseDrag:function(c){this.position=this._generatePosition(c);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var d=this.options,e=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-c.pageY<d.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop+d.scrollSpeed;else if(c.pageY-this.overflowOffset.top<
+d.scrollSensitivity)this.scrollParent[0].scrollTop=e=this.scrollParent[0].scrollTop-d.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-c.pageX<d.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft+d.scrollSpeed;else if(c.pageX-this.overflowOffset.left<d.scrollSensitivity)this.scrollParent[0].scrollLeft=e=this.scrollParent[0].scrollLeft-d.scrollSpeed}else{if(c.pageY-a(document).scrollTop()<d.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()-
+d.scrollSpeed);else if(a(window).height()-(c.pageY-a(document).scrollTop())<d.scrollSensitivity)e=a(document).scrollTop(a(document).scrollTop()+d.scrollSpeed);if(c.pageX-a(document).scrollLeft()<d.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()-d.scrollSpeed);else if(a(window).width()-(c.pageX-a(document).scrollLeft())<d.scrollSensitivity)e=a(document).scrollLeft(a(document).scrollLeft()+d.scrollSpeed)}e!==false&&a.ui.ddmanager&&!d.dropBehaviour&&a.ui.ddmanager.prepareOffsets(this,
+c)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(d=this.items.length-1;d>=0;d--){e=this.items[d];var h=e.item[0],g=this._intersectsWithPointer(e);if(g)if(h!=this.currentItem[0]&&this.placeholder[g==1?"next":"prev"]()[0]!=h&&!a.ui.contains(this.placeholder[0],h)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],
+h):true)){this.direction=g==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e))this._rearrange(c,e);else break;this._trigger("change",c,this._uiHash());break}}this._contactContainers(c);a.ui.ddmanager&&a.ui.ddmanager.drag(this,c);this._trigger("sort",c,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(c,d){if(c){a.ui.ddmanager&&!this.options.dropBehaviour&&a.ui.ddmanager.drop(this,c);if(this.options.revert){var e=this;d=e.placeholder.offset();
+e.reverting=true;a(this.helper).animate({left:d.left-this.offset.parent.left-e.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:d.top-this.offset.parent.top-e.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){e._clear(c)})}else this._clear(c,d);return false}},cancel:function(){var c=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("deactivate",null,c._uiHash(this));if(this.containers[d].containerCache.over){this.containers[d]._trigger("out",null,c._uiHash(this));this.containers[d].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();a.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?a(this.domPosition.prev).after(this.currentItem):a(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(c){var d=this._getItemsAsjQuery(c&&c.connected),e=[];c=c||{};a(d).each(function(){var h=(a(c.item||this).attr(c.attribute||"id")||"").match(c.expression||/(.+)[-=_](.+)/);if(h)e.push((c.key||h[1]+"[]")+"="+(c.key&&c.expression?h[1]:h[2]))});!e.length&&c.key&&e.push(c.key+"=");return e.join("&")},
+toArray:function(c){var d=this._getItemsAsjQuery(c&&c.connected),e=[];c=c||{};d.each(function(){e.push(a(c.item||this).attr(c.attribute||"id")||"")});return e},_intersectsWith:function(c){var d=this.positionAbs.left,e=d+this.helperProportions.width,h=this.positionAbs.top,g=h+this.helperProportions.height,i=c.left,b=i+c.width,f=c.top,j=f+c.height,l=this.offset.click.top,o=this.offset.click.left;l=h+l>f&&h+l<j&&d+o>i&&d+o<b;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>c[this.floating?"width":"height"]?l:i<d+this.helperProportions.width/2&&e-this.helperProportions.width/2<b&&f<h+this.helperProportions.height/2&&g-this.helperProportions.height/2<j},_intersectsWithPointer:function(c){var d=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,c.top,c.height);c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,c.left,c.width);d=d&&c;c=this._getDragVerticalDirection();
+var e=this._getDragHorizontalDirection();if(!d)return false;return this.floating?e&&e=="right"||c=="down"?2:1:c&&(c=="down"?2:1)},_intersectsWithSides:function(c){var d=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,c.top+c.height/2,c.height);c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,c.left+c.width/2,c.width);var e=this._getDragVerticalDirection(),h=this._getDragHorizontalDirection();return this.floating&&h?h=="right"&&c||h=="left"&&!c:e&&(e=="down"&&d||e=="up"&&!d)},
+_getDragVerticalDirection:function(){var c=this.positionAbs.top-this.lastPositionAbs.top;return c!=0&&(c>0?"down":"up")},_getDragHorizontalDirection:function(){var c=this.positionAbs.left-this.lastPositionAbs.left;return c!=0&&(c>0?"right":"left")},refresh:function(c){this._refreshItems(c);this.refreshPositions();return this},_connectWith:function(){var c=this.options;return c.connectWith.constructor==String?[c.connectWith]:c.connectWith},_getItemsAsjQuery:function(c){var d=[],e=[],h=this._connectWith();
+if(h&&c)for(c=h.length-1;c>=0;c--)for(var g=a(h[c]),i=g.length-1;i>=0;i--){var b=a.data(g[i],"sortable");if(b&&b!=this&&!b.options.disabled)e.push([a.isFunction(b.options.items)?b.options.items.call(b.element):a(b.options.items,b.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),b])}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(c=e.length-1;c>=0;c--)e[c][0].each(function(){d.push(this)});return a(d)},_removeCurrentsFromItems:function(){for(var c=this.currentItem.find(":data(sortable-item)"),d=0;d<this.items.length;d++)for(var e=0;e<c.length;e++)c[e]==this.items[d].item[0]&&this.items.splice(d,1)},_refreshItems:function(c){this.items=[];this.containers=[this];var d=this.items,e=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],c,{item:this.currentItem}):a(this.options.items,this.element),
+this]],h=this._connectWith();if(h)for(var g=h.length-1;g>=0;g--)for(var i=a(h[g]),b=i.length-1;b>=0;b--){var f=a.data(i[b],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element[0],c,{item:this.currentItem}):a(f.options.items,f.element),f]);this.containers.push(f)}}for(g=e.length-1;g>=0;g--){c=e[g][1];h=e[g][0];b=0;for(i=h.length;b<i;b++){f=a(h[b]);f.data("sortable-item",c);d.push({item:f,instance:c,width:0,height:0,left:0,top:0})}}},refreshPositions:function(c){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var d=this.items.length-1;d>=0;d--){var e=this.items[d];if(!(e.instance!=this.currentContainer&&this.currentContainer&&e.item[0]!=this.currentItem[0])){var h=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!c){e.width=h.outerWidth();e.height=h.outerHeight()}h=h.offset();e.left=h.left;e.top=h.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(d=
+this.containers.length-1;d>=0;d--){h=this.containers[d].element.offset();this.containers[d].containerCache.left=h.left;this.containers[d].containerCache.top=h.top;this.containers[d].containerCache.width=this.containers[d].element.outerWidth();this.containers[d].containerCache.height=this.containers[d].element.outerHeight()}return this},_createPlaceholder:function(c){var d=c||this,e=d.options;if(!e.placeholder||e.placeholder.constructor==String){var h=e.placeholder;e.placeholder={element:function(){var g=
+a(document.createElement(d.currentItem[0].nodeName)).addClass(h||d.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!h)g.style.visibility="hidden";return g},update:function(g,i){if(!(h&&!e.forcePlaceholderSize)){i.height()||i.height(d.currentItem.innerHeight()-parseInt(d.currentItem.css("paddingTop")||0,10)-parseInt(d.currentItem.css("paddingBottom")||0,10));i.width()||i.width(d.currentItem.innerWidth()-parseInt(d.currentItem.css("paddingLeft")||0,10)-parseInt(d.currentItem.css("paddingRight")||
+0,10))}}}}d.placeholder=a(e.placeholder.element.call(d.element,d.currentItem));d.currentItem.after(d.placeholder);e.placeholder.update(d,d.placeholder)},_contactContainers:function(c){for(var d=null,e=null,h=this.containers.length-1;h>=0;h--)if(!a.ui.contains(this.currentItem[0],this.containers[h].element[0]))if(this._intersectsWith(this.containers[h].containerCache)){if(!(d&&a.ui.contains(this.containers[h].element[0],d.element[0]))){d=this.containers[h];e=h}}else if(this.containers[h].containerCache.over){this.containers[h]._trigger("out",
+c,this._uiHash(this));this.containers[h].containerCache.over=0}if(d)if(this.containers.length===1){this.containers[e]._trigger("over",c,this._uiHash(this));this.containers[e].containerCache.over=1}else if(this.currentContainer!=this.containers[e]){d=1E4;h=null;for(var g=this.positionAbs[this.containers[e].floating?"left":"top"],i=this.items.length-1;i>=0;i--)if(a.ui.contains(this.containers[e].element[0],this.items[i].item[0])){var b=this.items[i][this.containers[e].floating?"left":"top"];if(Math.abs(b-
+g)<d){d=Math.abs(b-g);h=this.items[i]}}if(h||this.options.dropOnEmpty){this.currentContainer=this.containers[e];h?this._rearrange(c,h,null,true):this._rearrange(c,null,this.containers[e].element,true);this._trigger("change",c,this._uiHash());this.containers[e]._trigger("change",c,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[e]._trigger("over",c,this._uiHash(this));this.containers[e].containerCache.over=1}}},_createHelper:function(c){var d=
+this.options;c=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c,this.currentItem])):d.helper=="clone"?this.currentItem.clone():this.currentItem;c.parents("body").length||a(d.appendTo!="parent"?d.appendTo:this.currentItem[0].parentNode)[0].appendChild(c[0]);if(c[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(c[0].style.width==
+""||d.forceHelperSize)c.width(this.currentItem.width());if(c[0].style.height==""||d.forceHelperSize)c.height(this.currentItem.height());return c},_adjustOffsetFromHelper:function(c){if(typeof c=="string")c=c.split(" ");if(a.isArray(c))c={left:+c[0],top:+c[1]||0};if("left"in c)this.offset.click.left=c.left+this.margins.left;if("right"in c)this.offset.click.left=this.helperProportions.width-c.right+this.margins.left;if("top"in c)this.offset.click.top=c.top+this.margins.top;if("bottom"in c)this.offset.click.top=
+this.helperProportions.height-c.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var c=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){c.left+=this.scrollParent.scrollLeft();c.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)c=
+{top:0,left:0};return{top:c.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:c.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var c=this.currentItem.position();return{top:c.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:c.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var c=this.options;if(c.containment=="parent")c.containment=this.helper[0].parentNode;if(c.containment=="document"||c.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(c.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(a(c.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(c.containment)){var d=a(c.containment)[0];c=a(c.containment).offset();var e=a(d).css("overflow")!="hidden";this.containment=[c.left+(parseInt(a(d).css("borderLeftWidth"),10)||0)+(parseInt(a(d).css("paddingLeft"),10)||0)-this.margins.left,c.top+(parseInt(a(d).css("borderTopWidth"),
+10)||0)+(parseInt(a(d).css("paddingTop"),10)||0)-this.margins.top,c.left+(e?Math.max(d.scrollWidth,d.offsetWidth):d.offsetWidth)-(parseInt(a(d).css("borderLeftWidth"),10)||0)-(parseInt(a(d).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,c.top+(e?Math.max(d.scrollHeight,d.offsetHeight):d.offsetHeight)-(parseInt(a(d).css("borderTopWidth"),10)||0)-(parseInt(a(d).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(c,d){if(!d)d=
+this.position;c=c=="absolute"?1:-1;var e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);return{top:d.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop())*c),left:d.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())*c)}},_generatePosition:function(c){var d=this.options,e=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,h=/(html|body)/i.test(e[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var g=c.pageX,i=c.pageY;if(this.originalPosition){if(this.containment){if(c.pageX-this.offset.click.left<this.containment[0])g=this.containment[0]+this.offset.click.left;if(c.pageY-this.offset.click.top<this.containment[1])i=this.containment[1]+this.offset.click.top;if(c.pageX-this.offset.click.left>this.containment[2])g=this.containment[2]+this.offset.click.left;if(c.pageY-this.offset.click.top>this.containment[3])i=this.containment[3]+this.offset.click.top}if(d.grid){i=this.originalPageY+Math.round((i-
+this.originalPageY)/d.grid[1])*d.grid[1];i=this.containment?!(i-this.offset.click.top<this.containment[1]||i-this.offset.click.top>this.containment[3])?i:!(i-this.offset.click.top<this.containment[1])?i-d.grid[1]:i+d.grid[1]:i;g=this.originalPageX+Math.round((g-this.originalPageX)/d.grid[0])*d.grid[0];g=this.containment?!(g-this.offset.click.left<this.containment[0]||g-this.offset.click.left>this.containment[2])?g:!(g-this.offset.click.left<this.containment[0])?g-d.grid[0]:g+d.grid[0]:g}}return{top:i-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():h?0:e.scrollTop()),left:g-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():h?0:e.scrollLeft())}},_rearrange:function(c,d,e,h){e?e[0].appendChild(this.placeholder[0]):d.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?d.item[0]:d.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var g=this,i=this.counter;window.setTimeout(function(){i==g.counter&&g.refreshPositions(!h)},0)},_clear:function(c,d){this.reverting=false;var e=[];!this._noFinalSort&&this.currentItem.parent().length&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var h in this._storedCSS)if(this._storedCSS[h]=="auto"||this._storedCSS[h]=="static")this._storedCSS[h]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!d&&e.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!d)e.push(function(g){this._trigger("update",g,this._uiHash())});if(!a.ui.contains(this.element[0],this.currentItem[0])){d||e.push(function(g){this._trigger("remove",
+g,this._uiHash())});for(h=this.containers.length-1;h>=0;h--)if(a.ui.contains(this.containers[h].element[0],this.currentItem[0])&&!d){e.push(function(g){return function(i){g._trigger("receive",i,this._uiHash(this))}}.call(this,this.containers[h]));e.push(function(g){return function(i){g._trigger("update",i,this._uiHash(this))}}.call(this,this.containers[h]))}}for(h=this.containers.length-1;h>=0;h--){d||e.push(function(g){return function(i){g._trigger("deactivate",i,this._uiHash(this))}}.call(this,
+this.containers[h]));if(this.containers[h].containerCache.over){e.push(function(g){return function(i){g._trigger("out",i,this._uiHash(this))}}.call(this,this.containers[h]));this.containers[h].containerCache.over=0}}this._storedCursor&&a("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!d){this._trigger("beforeStop",
+c,this._uiHash());for(h=0;h<e.length;h++)e[h].call(this,c);this._trigger("stop",c,this._uiHash())}return false}d||this._trigger("beforeStop",c,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!d){for(h=0;h<e.length;h++)e[h].call(this,c);this._trigger("stop",c,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){a.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(c){var d=c||this;return{helper:d.helper,placeholder:d.placeholder||a([]),position:d.position,originalPosition:d.originalPosition,offset:d.positionAbs,item:d.currentItem,sender:c?c.element:null}}});a.extend(a.ui.sortable,{version:"1.8.15"})})(jQuery);
+jQuery.effects||function(a,c){function d(n){var k;if(n&&n.constructor==Array&&n.length==3)return n;if(k=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(n))return[parseInt(k[1],10),parseInt(k[2],10),parseInt(k[3],10)];if(k=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(n))return[parseFloat(k[1])*2.55,parseFloat(k[2])*2.55,parseFloat(k[3])*2.55];if(k=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(n))return[parseInt(k[1],
+16),parseInt(k[2],16),parseInt(k[3],16)];if(k=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(n))return[parseInt(k[1]+k[1],16),parseInt(k[2]+k[2],16),parseInt(k[3]+k[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(n))return j.transparent;return j[a.trim(n).toLowerCase()]}function e(n,k){var m;do{m=a.curCSS(n,k);if(m!=""&&m!="transparent"||a.nodeName(n,"body"))break;k="backgroundColor"}while(n=n.parentNode);return d(m)}function h(){var n=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+k={},m,p;if(n&&n.length&&n[0]&&n[n[0]])for(var q=n.length;q--;){m=n[q];if(typeof n[m]=="string"){p=m.replace(/\-(\w)/g,function(s,r){return r.toUpperCase()});k[p]=n[m]}}else for(m in n)if(typeof n[m]==="string")k[m]=n[m];return k}function g(n){var k,m;for(k in n){m=n[k];if(m==null||a.isFunction(m)||k in o||/scrollbar/.test(k)||!/color/i.test(k)&&isNaN(parseFloat(m)))delete n[k]}return n}function i(n,k){var m={_:0},p;for(p in k)if(n[p]!=k[p])m[p]=k[p];return m}function b(n,k,m,p){if(typeof n=="object"){p=
+k;m=null;k=n;n=k.effect}if(a.isFunction(k)){p=k;m=null;k={}}if(typeof k=="number"||a.fx.speeds[k]){p=m;m=k;k={}}if(a.isFunction(m)){p=m;m=null}k=k||{};m=m||k.duration;m=a.fx.off?0:typeof m=="number"?m:m in a.fx.speeds?a.fx.speeds[m]:a.fx.speeds._default;p=p||k.complete;return[n,k,m,p]}function f(n){if(!n||typeof n==="number"||a.fx.speeds[n])return true;if(typeof n==="string"&&!a.effects[n])return true;return false}a.effects={};a.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(n,k){a.fx.step[k]=function(m){if(!m.colorInit){m.start=e(m.elem,k);m.end=d(m.end);m.colorInit=true}m.elem.style[k]="rgb("+Math.max(Math.min(parseInt(m.pos*(m.end[0]-m.start[0])+m.start[0],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[1]-m.start[1])+m.start[1],10),255),0)+","+Math.max(Math.min(parseInt(m.pos*(m.end[2]-m.start[2])+m.start[2],10),255),0)+")"}});var j={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},l=["add","remove","toggle"],o={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};a.effects.animateClass=function(n,k,m,
+p){if(a.isFunction(m)){p=m;m=null}return this.queue(function(){var q=a(this),s=q.attr("style")||" ",r=g(h.call(this)),u,v=q.attr("class");a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});u=g(h.call(this));q.attr("class",v);q.animate(i(r,u),{queue:false,duration:k,easing:m,complete:function(){a.each(l,function(w,x){n[x]&&q[x+"Class"](n[x])});if(typeof q.attr("style")=="object"){q.attr("style").cssText="";q.attr("style").cssText=s}else q.attr("style",s);p&&p.apply(this,arguments);a.dequeue(this)}})})};
+a.fn.extend({_addClass:a.fn.addClass,addClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{add:n},k,m,p]):this._addClass(n)},_removeClass:a.fn.removeClass,removeClass:function(n,k,m,p){return k?a.effects.animateClass.apply(this,[{remove:n},k,m,p]):this._removeClass(n)},_toggleClass:a.fn.toggleClass,toggleClass:function(n,k,m,p,q){return typeof k=="boolean"||k===c?m?a.effects.animateClass.apply(this,[k?{add:n}:{remove:n},m,p,q]):this._toggleClass(n,k):a.effects.animateClass.apply(this,
+[{toggle:n},k,m,p])},switchClass:function(n,k,m,p,q){return a.effects.animateClass.apply(this,[{add:k,remove:n},m,p,q])}});a.extend(a.effects,{version:"1.8.15",save:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.data("ec.storage."+k[m],n[0].style[k[m]])},restore:function(n,k){for(var m=0;m<k.length;m++)k[m]!==null&&n.css(k[m],n.data("ec.storage."+k[m]))},setMode:function(n,k){if(k=="toggle")k=n.is(":hidden")?"show":"hide";return k},getBaseline:function(n,k){var m;switch(n[0]){case "top":m=
+0;break;case "middle":m=0.5;break;case "bottom":m=1;break;default:m=n[0]/k.height}switch(n[1]){case "left":n=0;break;case "center":n=0.5;break;case "right":n=1;break;default:n=n[1]/k.width}return{x:n,y:m}},createWrapper:function(n){if(n.parent().is(".ui-effects-wrapper"))return n.parent();var k={width:n.outerWidth(true),height:n.outerHeight(true),"float":n.css("float")},m=a("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});
+n.wrap(m);m=n.parent();if(n.css("position")=="static"){m.css({position:"relative"});n.css({position:"relative"})}else{a.extend(k,{position:n.css("position"),zIndex:n.css("z-index")});a.each(["top","left","bottom","right"],function(p,q){k[q]=n.css(q);if(isNaN(parseInt(k[q],10)))k[q]="auto"});n.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return m.css(k).show()},removeWrapper:function(n){if(n.parent().is(".ui-effects-wrapper"))return n.parent().replaceWith(n);return n},setTransition:function(n,
+k,m,p){p=p||{};a.each(k,function(q,s){unit=n.cssUnit(s);if(unit[0]>0)p[s]=unit[0]*m+unit[1]});return p}});a.fn.extend({effect:function(n){var k=b.apply(this,arguments),m={options:k[1],duration:k[2],callback:k[3]};k=m.options.mode;var p=a.effects[n];if(a.fx.off||!p)return k?this[k](m.duration,m.callback):this.each(function(){m.callback&&m.callback.call(this)});return p.call(this,m)},_show:a.fn.show,show:function(n){if(f(n))return this._show.apply(this,arguments);else{var k=b.apply(this,arguments);
+k[1].mode="show";return this.effect.apply(this,k)}},_hide:a.fn.hide,hide:function(n){if(f(n))return this._hide.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="hide";return this.effect.apply(this,k)}},__toggle:a.fn.toggle,toggle:function(n){if(f(n)||typeof n==="boolean"||a.isFunction(n))return this.__toggle.apply(this,arguments);else{var k=b.apply(this,arguments);k[1].mode="toggle";return this.effect.apply(this,k)}},cssUnit:function(n){var k=this.css(n),m=[];a.each(["em","px","%",
+"pt"],function(p,q){if(k.indexOf(q)>0)m=[parseFloat(k),q]});return m}});a.easing.jswing=a.easing.swing;a.extend(a.easing,{def:"easeOutQuad",swing:function(n,k,m,p,q){return a.easing[a.easing.def](n,k,m,p,q)},easeInQuad:function(n,k,m,p,q){return p*(k/=q)*k+m},easeOutQuad:function(n,k,m,p,q){return-p*(k/=q)*(k-2)+m},easeInOutQuad:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k+m;return-p/2*(--k*(k-2)-1)+m},easeInCubic:function(n,k,m,p,q){return p*(k/=q)*k*k+m},easeOutCubic:function(n,k,m,p,q){return p*
+((k=k/q-1)*k*k+1)+m},easeInOutCubic:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k+m;return p/2*((k-=2)*k*k+2)+m},easeInQuart:function(n,k,m,p,q){return p*(k/=q)*k*k*k+m},easeOutQuart:function(n,k,m,p,q){return-p*((k=k/q-1)*k*k*k-1)+m},easeInOutQuart:function(n,k,m,p,q){if((k/=q/2)<1)return p/2*k*k*k*k+m;return-p/2*((k-=2)*k*k*k-2)+m},easeInQuint:function(n,k,m,p,q){return p*(k/=q)*k*k*k*k+m},easeOutQuint:function(n,k,m,p,q){return p*((k=k/q-1)*k*k*k*k+1)+m},easeInOutQuint:function(n,k,m,p,q){if((k/=
+q/2)<1)return p/2*k*k*k*k*k+m;return p/2*((k-=2)*k*k*k*k+2)+m},easeInSine:function(n,k,m,p,q){return-p*Math.cos(k/q*(Math.PI/2))+p+m},easeOutSine:function(n,k,m,p,q){return p*Math.sin(k/q*(Math.PI/2))+m},easeInOutSine:function(n,k,m,p,q){return-p/2*(Math.cos(Math.PI*k/q)-1)+m},easeInExpo:function(n,k,m,p,q){return k==0?m:p*Math.pow(2,10*(k/q-1))+m},easeOutExpo:function(n,k,m,p,q){return k==q?m+p:p*(-Math.pow(2,-10*k/q)+1)+m},easeInOutExpo:function(n,k,m,p,q){if(k==0)return m;if(k==q)return m+p;if((k/=
+q/2)<1)return p/2*Math.pow(2,10*(k-1))+m;return p/2*(-Math.pow(2,-10*--k)+2)+m},easeInCirc:function(n,k,m,p,q){return-p*(Math.sqrt(1-(k/=q)*k)-1)+m},easeOutCirc:function(n,k,m,p,q){return p*Math.sqrt(1-(k=k/q-1)*k)+m},easeInOutCirc:function(n,k,m,p,q){if((k/=q/2)<1)return-p/2*(Math.sqrt(1-k*k)-1)+m;return p/2*(Math.sqrt(1-(k-=2)*k)+1)+m},easeInElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/
+r);return-(r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s))+m},easeOutElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q)==1)return m+p;s||(s=q*0.3);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);return r*Math.pow(2,-10*k)*Math.sin((k*q-n)*2*Math.PI/s)+p+m},easeInOutElastic:function(n,k,m,p,q){n=1.70158;var s=0,r=p;if(k==0)return m;if((k/=q/2)==2)return m+p;s||(s=q*0.3*1.5);if(r<Math.abs(p)){r=p;n=s/4}else n=s/(2*Math.PI)*Math.asin(p/r);if(k<1)return-0.5*
+r*Math.pow(2,10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)+m;return r*Math.pow(2,-10*(k-=1))*Math.sin((k*q-n)*2*Math.PI/s)*0.5+p+m},easeInBack:function(n,k,m,p,q,s){if(s==c)s=1.70158;return p*(k/=q)*k*((s+1)*k-s)+m},easeOutBack:function(n,k,m,p,q,s){if(s==c)s=1.70158;return p*((k=k/q-1)*k*((s+1)*k+s)+1)+m},easeInOutBack:function(n,k,m,p,q,s){if(s==c)s=1.70158;if((k/=q/2)<1)return p/2*k*k*(((s*=1.525)+1)*k-s)+m;return p/2*((k-=2)*k*(((s*=1.525)+1)*k+s)+2)+m},easeInBounce:function(n,k,m,p,q){return p-a.easing.easeOutBounce(n,
+q-k,0,p,q)+m},easeOutBounce:function(n,k,m,p,q){return(k/=q)<1/2.75?p*7.5625*k*k+m:k<2/2.75?p*(7.5625*(k-=1.5/2.75)*k+0.75)+m:k<2.5/2.75?p*(7.5625*(k-=2.25/2.75)*k+0.9375)+m:p*(7.5625*(k-=2.625/2.75)*k+0.984375)+m},easeInOutBounce:function(n,k,m,p,q){if(k<q/2)return a.easing.easeInBounce(n,k*2,0,p,q)*0.5+m;return a.easing.easeOutBounce(n,k*2-q,0,p,q)*0.5+p*0.5+m}})}(jQuery);
+(function(a){a.effects.blind=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(d,c.options.mode||"hide"),g=c.options.direction||"vertical";a.effects.save(d,e);d.show();var i=a.effects.createWrapper(d).css({overflow:"hidden"}),b=g=="vertical"?"height":"width";g=g=="vertical"?i.height():i.width();h=="show"&&i.css(b,0);var f={};f[b]=h=="show"?g:0;i.animate(f,c.duration,c.options.easing,function(){h=="hide"&&d.hide();a.effects.restore(d,
+e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(d[0],arguments);d.dequeue()})})}})(jQuery);
+(function(a){a.effects.bounce=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(d,c.options.mode||"effect"),g=c.options.direction||"up",i=c.options.distance||20,b=c.options.times||5,f=c.duration||250;/show|hide/.test(h)&&e.push("opacity");a.effects.save(d,e);d.show();a.effects.createWrapper(d);var j=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";i=c.options.distance||(j=="top"?d.outerHeight({margin:true})/3:d.outerWidth({margin:true})/
+3);if(h=="show")d.css("opacity",0).css(j,g=="pos"?-i:i);if(h=="hide")i/=b*2;h!="hide"&&b--;if(h=="show"){var l={opacity:1};l[j]=(g=="pos"?"+=":"-=")+i;d.animate(l,f/2,c.options.easing);i/=2;b--}for(l=0;l<b;l++){var o={},n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;d.animate(o,f/2,c.options.easing).animate(n,f/2,c.options.easing);i=h=="hide"?i*2:i/2}if(h=="hide"){l={opacity:0};l[j]=(g=="pos"?"-=":"+=")+i;d.animate(l,f/2,c.options.easing,function(){d.hide();a.effects.restore(d,e);a.effects.removeWrapper(d);
+c.callback&&c.callback.apply(this,arguments)})}else{o={};n={};o[j]=(g=="pos"?"-=":"+=")+i;n[j]=(g=="pos"?"+=":"-=")+i;d.animate(o,f/2,c.options.easing).animate(n,f/2,c.options.easing,function(){a.effects.restore(d,e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(this,arguments)})}d.queue("fx",function(){d.dequeue()});d.dequeue()})}})(jQuery);
+(function(a){a.effects.clip=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right","height","width"],h=a.effects.setMode(d,c.options.mode||"hide"),g=c.options.direction||"vertical";a.effects.save(d,e);d.show();var i=a.effects.createWrapper(d).css({overflow:"hidden"});i=d[0].tagName=="IMG"?i:d;var b={size:g=="vertical"?"height":"width",position:g=="vertical"?"top":"left"};g=g=="vertical"?i.height():i.width();if(h=="show"){i.css(b.size,0);i.css(b.position,
+g/2)}var f={};f[b.size]=h=="show"?g:0;f[b.position]=h=="show"?0:g/2;i.animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){h=="hide"&&d.hide();a.effects.restore(d,e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(d[0],arguments);d.dequeue()}})})}})(jQuery);
+(function(a){a.effects.drop=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right","opacity"],h=a.effects.setMode(d,c.options.mode||"hide"),g=c.options.direction||"left";a.effects.save(d,e);d.show();a.effects.createWrapper(d);var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=c.options.distance||(i=="top"?d.outerHeight({margin:true})/2:d.outerWidth({margin:true})/2);if(h=="show")d.css("opacity",0).css(i,g=="pos"?-b:b);var f={opacity:h==
+"show"?1:0};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;d.animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){h=="hide"&&d.hide();a.effects.restore(d,e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(this,arguments);d.dequeue()}})})}})(jQuery);
+(function(a){a.effects.explode=function(c){return this.queue(function(){var d=c.options.pieces?Math.round(Math.sqrt(c.options.pieces)):3,e=c.options.pieces?Math.round(Math.sqrt(c.options.pieces)):3;c.options.mode=c.options.mode=="toggle"?a(this).is(":visible")?"hide":"show":c.options.mode;var h=a(this).show().css("visibility","hidden"),g=h.offset();g.top-=parseInt(h.css("marginTop"),10)||0;g.left-=parseInt(h.css("marginLeft"),10)||0;for(var i=h.outerWidth(true),b=h.outerHeight(true),f=0;f<d;f++)for(var j=
+0;j<e;j++)h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-j*(i/e),top:-f*(b/d)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:i/e,height:b/d,left:g.left+j*(i/e)+(c.options.mode=="show"?(j-Math.floor(e/2))*(i/e):0),top:g.top+f*(b/d)+(c.options.mode=="show"?(f-Math.floor(d/2))*(b/d):0),opacity:c.options.mode=="show"?0:1}).animate({left:g.left+j*(i/e)+(c.options.mode=="show"?0:(j-Math.floor(e/2))*(i/e)),top:g.top+
+f*(b/d)+(c.options.mode=="show"?0:(f-Math.floor(d/2))*(b/d)),opacity:c.options.mode=="show"?1:0},c.duration||500);setTimeout(function(){c.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();c.callback&&c.callback.apply(h[0]);h.dequeue();a("div.ui-effects-explode").remove()},c.duration||500)})}})(jQuery);
+(function(a){a.effects.fade=function(c){return this.queue(function(){var d=a(this),e=a.effects.setMode(d,c.options.mode||"hide");d.animate({opacity:e},{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){c.callback&&c.callback.apply(this,arguments);d.dequeue()}})})}})(jQuery);
+(function(a){a.effects.fold=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(d,c.options.mode||"hide"),g=c.options.size||15,i=!!c.options.horizFirst,b=c.duration?c.duration/2:a.fx.speeds._default/2;a.effects.save(d,e);d.show();var f=a.effects.createWrapper(d).css({overflow:"hidden"}),j=h=="show"!=i,l=j?["width","height"]:["height","width"];j=j?[f.width(),f.height()]:[f.height(),f.width()];var o=/([0-9]+)%/.exec(g);if(o)g=parseInt(o[1],
+10)/100*j[h=="hide"?0:1];if(h=="show")f.css(i?{height:0,width:g}:{height:g,width:0});i={};o={};i[l[0]]=h=="show"?j[0]:g;o[l[1]]=h=="show"?j[1]:0;f.animate(i,b,c.options.easing).animate(o,b,c.options.easing,function(){h=="hide"&&d.hide();a.effects.restore(d,e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(d[0],arguments);d.dequeue()})})}})(jQuery);
+(function(a){a.effects.highlight=function(c){return this.queue(function(){var d=a(this),e=["backgroundImage","backgroundColor","opacity"],h=a.effects.setMode(d,c.options.mode||"show"),g={backgroundColor:d.css("backgroundColor")};if(h=="hide")g.opacity=0;a.effects.save(d,e);d.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(g,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){h=="hide"&&d.hide();a.effects.restore(d,e);h=="show"&&!a.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);d.dequeue()}})})}})(jQuery);
+(function(a){a.effects.pulsate=function(c){return this.queue(function(){var d=a(this),e=a.effects.setMode(d,c.options.mode||"show");times=(c.options.times||5)*2-1;duration=c.duration?c.duration/2:a.fx.speeds._default/2;isVisible=d.is(":visible");animateTo=0;if(!isVisible){d.css("opacity",0).show();animateTo=1}if(e=="hide"&&isVisible||e=="show"&&!isVisible)times--;for(e=0;e<times;e++){d.animate({opacity:animateTo},duration,c.options.easing);animateTo=(animateTo+1)%2}d.animate({opacity:animateTo},duration,
+c.options.easing,function(){animateTo==0&&d.hide();c.callback&&c.callback.apply(this,arguments)});d.queue("fx",function(){d.dequeue()}).dequeue()})}})(jQuery);
+(function(a){a.effects.puff=function(c){return this.queue(function(){var d=a(this),e=a.effects.setMode(d,c.options.mode||"hide"),h=parseInt(c.options.percent,10)||150,g=h/100,i={height:d.height(),width:d.width()};a.extend(c.options,{fade:true,mode:e,percent:e=="hide"?h:100,from:e=="hide"?i:{height:i.height*g,width:i.width*g}});d.effect("scale",c.options,c.duration,c.callback);d.dequeue()})};a.effects.scale=function(c){return this.queue(function(){var d=a(this),e=a.extend(true,{},c.options),h=a.effects.setMode(d,
+c.options.mode||"effect"),g=parseInt(c.options.percent,10)||(parseInt(c.options.percent,10)==0?0:h=="hide"?0:100),i=c.options.direction||"both",b=c.options.origin;if(h!="effect"){e.origin=b||["middle","center"];e.restore=true}b={height:d.height(),width:d.width()};d.from=c.options.from||(h=="show"?{height:0,width:0}:b);g={y:i!="horizontal"?g/100:1,x:i!="vertical"?g/100:1};d.to={height:b.height*g.y,width:b.width*g.x};if(c.options.fade){if(h=="show"){d.from.opacity=0;d.to.opacity=1}if(h=="hide"){d.from.opacity=
+1;d.to.opacity=0}}e.from=d.from;e.to=d.to;e.mode=h;d.effect("size",e,c.duration,c.callback);d.dequeue()})};a.effects.size=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],h=["position","top","bottom","left","right","overflow","opacity"],g=["width","height","overflow"],i=["fontSize"],b=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+j=a.effects.setMode(d,c.options.mode||"effect"),l=c.options.restore||false,o=c.options.scale||"both",n=c.options.origin,k={height:d.height(),width:d.width()};d.from=c.options.from||k;d.to=c.options.to||k;if(n){n=a.effects.getBaseline(n,k);d.from.top=(k.height-d.from.height)*n.y;d.from.left=(k.width-d.from.width)*n.x;d.to.top=(k.height-d.to.height)*n.y;d.to.left=(k.width-d.to.width)*n.x}var m={from:{y:d.from.height/k.height,x:d.from.width/k.width},to:{y:d.to.height/k.height,x:d.to.width/k.width}};
+if(o=="box"||o=="both"){if(m.from.y!=m.to.y){e=e.concat(b);d.from=a.effects.setTransition(d,b,m.from.y,d.from);d.to=a.effects.setTransition(d,b,m.to.y,d.to)}if(m.from.x!=m.to.x){e=e.concat(f);d.from=a.effects.setTransition(d,f,m.from.x,d.from);d.to=a.effects.setTransition(d,f,m.to.x,d.to)}}if(o=="content"||o=="both")if(m.from.y!=m.to.y){e=e.concat(i);d.from=a.effects.setTransition(d,i,m.from.y,d.from);d.to=a.effects.setTransition(d,i,m.to.y,d.to)}a.effects.save(d,l?e:h);d.show();a.effects.createWrapper(d);
+d.css("overflow","hidden").css(d.from);if(o=="content"||o=="both"){b=b.concat(["marginTop","marginBottom"]).concat(i);f=f.concat(["marginLeft","marginRight"]);g=e.concat(b).concat(f);d.find("*[width]").each(function(){child=a(this);l&&a.effects.save(child,g);var p={height:child.height(),width:child.width()};child.from={height:p.height*m.from.y,width:p.width*m.from.x};child.to={height:p.height*m.to.y,width:p.width*m.to.x};if(m.from.y!=m.to.y){child.from=a.effects.setTransition(child,b,m.from.y,child.from);
+child.to=a.effects.setTransition(child,b,m.to.y,child.to)}if(m.from.x!=m.to.x){child.from=a.effects.setTransition(child,f,m.from.x,child.from);child.to=a.effects.setTransition(child,f,m.to.x,child.to)}child.css(child.from);child.animate(child.to,c.duration,c.options.easing,function(){l&&a.effects.restore(child,g)})})}d.animate(d.to,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d.to.opacity===0&&d.css("opacity",d.from.opacity);j=="hide"&&d.hide();a.effects.restore(d,
+l?e:h);a.effects.removeWrapper(d);c.callback&&c.callback.apply(this,arguments);d.dequeue()}})})}})(jQuery);
+(function(a){a.effects.shake=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right"];a.effects.setMode(d,c.options.mode||"effect");var h=c.options.direction||"left",g=c.options.distance||20,i=c.options.times||3,b=c.duration||c.options.duration||140;a.effects.save(d,e);d.show();a.effects.createWrapper(d);var f=h=="up"||h=="down"?"top":"left",j=h=="up"||h=="left"?"pos":"neg";h={};var l={},o={};h[f]=(j=="pos"?"-=":"+=")+g;l[f]=(j=="pos"?"+=":"-=")+g*2;o[f]=
+(j=="pos"?"-=":"+=")+g*2;d.animate(h,b,c.options.easing);for(g=1;g<i;g++)d.animate(l,b,c.options.easing).animate(o,b,c.options.easing);d.animate(l,b,c.options.easing).animate(h,b/2,c.options.easing,function(){a.effects.restore(d,e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(this,arguments)});d.queue("fx",function(){d.dequeue()});d.dequeue()})}})(jQuery);
+(function(a){a.effects.slide=function(c){return this.queue(function(){var d=a(this),e=["position","top","bottom","left","right"],h=a.effects.setMode(d,c.options.mode||"show"),g=c.options.direction||"left";a.effects.save(d,e);d.show();a.effects.createWrapper(d).css({overflow:"hidden"});var i=g=="up"||g=="down"?"top":"left";g=g=="up"||g=="left"?"pos":"neg";var b=c.options.distance||(i=="top"?d.outerHeight({margin:true}):d.outerWidth({margin:true}));if(h=="show")d.css(i,g=="pos"?isNaN(b)?"-"+b:-b:b);
+var f={};f[i]=(h=="show"?g=="pos"?"+=":"-=":g=="pos"?"-=":"+=")+b;d.animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){h=="hide"&&d.hide();a.effects.restore(d,e);a.effects.removeWrapper(d);c.callback&&c.callback.apply(this,arguments);d.dequeue()}})})}})(jQuery);
+(function(a){a.effects.transfer=function(c){return this.queue(function(){var d=a(this),e=a(c.options.to),h=e.offset();e={top:h.top,left:h.left,height:e.innerHeight(),width:e.innerWidth()};h=d.offset();var g=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(c.options.className).css({top:h.top,left:h.left,height:d.innerHeight(),width:d.innerWidth(),position:"absolute"}).animate(e,c.duration,c.options.easing,function(){g.remove();c.callback&&c.callback.apply(d[0],arguments);
+d.dequeue()})})}})(jQuery);
+(function(a){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var c=this,d=c.options;c.running=0;c.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");c.headers=
+c.element.find(d.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){d.disabled||a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){d.disabled||a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){d.disabled||a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){d.disabled||a(this).removeClass("ui-state-focus")});c.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(d.navigation){var e=c.element.find("a").filter(d.navigationFilter).eq(0);if(e.length){var h=e.closest(".ui-accordion-header");c.active=h.length?h:e.closest(".ui-accordion-content").prev()}}c.active=c._findActive(c.active||d.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");c.active.next().addClass("ui-accordion-content-active");c._createIcons();c.resize();c.element.attr("role","tablist");c.headers.attr("role","tab").bind("keydown.accordion",
+function(g){return c._keydown(g)}).next().attr("role","tabpanel");c.headers.not(c.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();c.active.length?c.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):c.headers.eq(0).attr("tabIndex",0);a.browser.safari||c.headers.find("a").attr("tabIndex",-1);d.event&&c.headers.bind(d.event.split(" ").join(".accordion ")+".accordion",function(g){c._clickHandler.call(c,g,this);g.preventDefault()})},_createIcons:function(){var c=
+this.options;if(c.icons){a("<span></span>").addClass("ui-icon "+c.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(c.icons.header).toggleClass(c.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var c=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var d=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(c.autoHeight||c.fillHeight)d.css("height","");return a.Widget.prototype.destroy.call(this)},_setOption:function(c,d){a.Widget.prototype._setOption.apply(this,arguments);c=="active"&&this.activate(d);if(c=="icons"){this._destroyIcons();
+d&&this._createIcons()}if(c=="disabled")this.headers.add(this.headers.next())[d?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(c){if(!(this.options.disabled||c.altKey||c.ctrlKey)){var d=a.ui.keyCode,e=this.headers.length,h=this.headers.index(c.target),g=false;switch(c.keyCode){case d.RIGHT:case d.DOWN:g=this.headers[(h+1)%e];break;case d.LEFT:case d.UP:g=this.headers[(h-1+e)%e];break;case d.SPACE:case d.ENTER:this._clickHandler({target:c.target},c.target);
+c.preventDefault()}if(g){a(c.target).attr("tabIndex",-1);a(g).attr("tabIndex",0);g.focus();return false}return true}},resize:function(){var c=this.options,d;if(c.fillSpace){if(a.browser.msie){var e=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}d=this.element.parent().height();a.browser.msie&&this.element.parent().css("overflow",e);this.headers.each(function(){d-=a(this).outerHeight(true)});this.headers.next().each(function(){a(this).height(Math.max(0,d-a(this).innerHeight()+
+a(this).height()))}).css("overflow","auto")}else if(c.autoHeight){d=0;this.headers.next().each(function(){d=Math.max(d,a(this).height("").height())}).height(d)}return this},activate:function(c){this.options.active=c;c=this._findActive(c)[0];this._clickHandler({target:c},c);return this},_findActive:function(c){return c?typeof c==="number"?this.headers.filter(":eq("+c+")"):this.headers.not(this.headers.not(c)):c===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(c,d){var e=this.options;
+if(!e.disabled)if(c.target){c=a(c.currentTarget||d);d=c[0]===this.active[0];e.active=e.collapsible&&d?false:this.headers.index(c);if(!(this.running||!e.collapsible&&d)){var h=this.active;f=c.next();i=this.active.next();b={options:e,newHeader:d&&e.collapsible?a([]):c,oldHeader:this.active,newContent:d&&e.collapsible?a([]):f,oldContent:i};var g=this.headers.index(this.active[0])>this.headers.index(c[0]);this.active=d?a([]):c;this._toggle(f,i,b,d,g);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);
+if(!d){c.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(e.icons.header).addClass(e.icons.headerSelected);c.next().addClass("ui-accordion-content-active")}}}else if(e.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(e.icons.headerSelected).addClass(e.icons.header);this.active.next().addClass("ui-accordion-content-active");var i=this.active.next(),
+b={options:e,newHeader:a([]),oldHeader:e.active,newContent:a([]),oldContent:i},f=this.active=a([]);this._toggle(f,i,b)}},_toggle:function(c,d,e,h,g){var i=this,b=i.options;i.toShow=c;i.toHide=d;i.data=e;var f=function(){if(i)return i._completed.apply(i,arguments)};i._trigger("changestart",null,i.data);i.running=d.size()===0?c.size():d.size();if(b.animated){e={};e=b.collapsible&&h?{toShow:a([]),toHide:d,complete:f,down:g,autoHeight:b.autoHeight||b.fillSpace}:{toShow:c,toHide:d,complete:f,down:g,autoHeight:b.autoHeight||
+b.fillSpace};if(!b.proxied)b.proxied=b.animated;if(!b.proxiedDuration)b.proxiedDuration=b.duration;b.animated=a.isFunction(b.proxied)?b.proxied(e):b.proxied;b.duration=a.isFunction(b.proxiedDuration)?b.proxiedDuration(e):b.proxiedDuration;h=a.ui.accordion.animations;var j=b.duration,l=b.animated;if(l&&!h[l]&&!a.easing[l])l="slide";h[l]||(h[l]=function(o){this.slide(o,{easing:l,duration:j||700})});h[l](e)}else{if(b.collapsible&&h)c.toggle();else{d.hide();c.show()}f(true)}d.prev().attr({"aria-expanded":"false",
+"aria-selected":"false",tabIndex:-1}).blur();c.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(c){this.running=c?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});a.extend(a.ui.accordion,{version:"1.8.15",
+animations:{slide:function(c,d){c=a.extend({easing:"swing",duration:300},c,d);if(c.toHide.size())if(c.toShow.size()){var e=c.toShow.css("overflow"),h=0,g={},i={},b;d=c.toShow;b=d[0].style.width;d.width(parseInt(d.parent().width(),10)-parseInt(d.css("paddingLeft"),10)-parseInt(d.css("paddingRight"),10)-(parseInt(d.css("borderLeftWidth"),10)||0)-(parseInt(d.css("borderRightWidth"),10)||0));a.each(["height","paddingTop","paddingBottom"],function(f,j){i[j]="hide";f=(""+a.css(c.toShow[0],j)).match(/^([\d+-.]+)(.*)$/);
+g[j]={value:f[1],unit:f[2]||"px"}});c.toShow.css({height:0,overflow:"hidden"}).show();c.toHide.filter(":hidden").each(c.complete).end().filter(":visible").animate(i,{step:function(f,j){if(j.prop=="height")h=j.end-j.start===0?0:(j.now-j.start)/(j.end-j.start);c.toShow[0].style[j.prop]=h*g[j.prop].value+g[j.prop].unit},duration:c.duration,easing:c.easing,complete:function(){c.autoHeight||c.toShow.css("height","");c.toShow.css({width:b,overflow:e});c.complete()}})}else c.toHide.animate({height:"hide",
+paddingTop:"hide",paddingBottom:"hide"},c);else c.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},c)},bounceslide:function(c){this.slide(c,{easing:c.down?"easeOutBounce":"swing",duration:c.down?1E3:200})}}})})(jQuery);
+(function(a){var c=0;a.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var d=this,e=this.element[0].ownerDocument,h;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(g){if(!(d.options.disabled||d.element.propAttr("readOnly"))){h=
+false;var i=a.ui.keyCode;switch(g.keyCode){case i.PAGE_UP:d._move("previousPage",g);break;case i.PAGE_DOWN:d._move("nextPage",g);break;case i.UP:d._move("previous",g);g.preventDefault();break;case i.DOWN:d._move("next",g);g.preventDefault();break;case i.ENTER:case i.NUMPAD_ENTER:if(d.menu.active){h=true;g.preventDefault()}case i.TAB:if(!d.menu.active)return;d.menu.select(g);break;case i.ESCAPE:d.element.val(d.term);d.close(g);break;default:clearTimeout(d.searching);d.searching=setTimeout(function(){if(d.term!=
+d.element.val()){d.selectedItem=null;d.search(null,g)}},d.options.delay);break}}}).bind("keypress.autocomplete",function(g){if(h){h=false;g.preventDefault()}}).bind("focus.autocomplete",function(){if(!d.options.disabled){d.selectedItem=null;d.previous=d.element.val()}}).bind("blur.autocomplete",function(g){if(!d.options.disabled){clearTimeout(d.searching);d.closing=setTimeout(function(){d.close(g);d._change(g)},150)}});this._initSource();this.response=function(){return d._response.apply(d,arguments)};
+this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo(a(this.options.appendTo||"body",e)[0]).mousedown(function(g){var i=d.menu.element[0];a(g.target).closest(".ui-menu-item").length||setTimeout(function(){a(document).one("mousedown",function(b){b.target!==d.element[0]&&b.target!==i&&!a.ui.contains(i,b.target)&&d.close()})},1);setTimeout(function(){clearTimeout(d.closing)},13)}).menu({focus:function(g,i){i=i.item.data("item.autocomplete");false!==d._trigger("focus",g,{item:i})&&/^key/.test(g.originalEvent.type)&&
+d.element.val(i.value)},selected:function(g,i){var b=i.item.data("item.autocomplete"),f=d.previous;if(d.element[0]!==e.activeElement){d.element.focus();d.previous=f;setTimeout(function(){d.previous=f;d.selectedItem=b},1)}false!==d._trigger("select",g,{item:b})&&d.element.val(b.value);d.term=d.element.val();d.close(g);d.selectedItem=b},blur:function(){d.menu.element.is(":visible")&&d.element.val()!==d.term&&d.element.val(d.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
+a.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();a.Widget.prototype.destroy.call(this)},_setOption:function(d,e){a.Widget.prototype._setOption.apply(this,arguments);d==="source"&&this._initSource();if(d==="appendTo")this.menu.element.appendTo(a(e||"body",this.element[0].ownerDocument)[0]);d==="disabled"&&
+e&&this.xhr&&this.xhr.abort()},_initSource:function(){var d=this,e,h;if(a.isArray(this.options.source)){e=this.options.source;this.source=function(g,i){i(a.ui.autocomplete.filter(e,g.term))}}else if(typeof this.options.source==="string"){h=this.options.source;this.source=function(g,i){d.xhr&&d.xhr.abort();d.xhr=a.ajax({url:h,data:g,dataType:"json",autocompleteRequest:++c,success:function(b){this.autocompleteRequest===c&&i(b)},error:function(){this.autocompleteRequest===c&&i([])}})}}else this.source=
+this.options.source},search:function(d,e){d=d!=null?d:this.element.val();this.term=this.element.val();if(d.length<this.options.minLength)return this.close(e);clearTimeout(this.closing);if(this._trigger("search",e)!==false)return this._search(d)},_search:function(d){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:d},this.response)},_response:function(d){if(!this.options.disabled&&d&&d.length){d=this._normalize(d);this._suggest(d);this._trigger("open")}else this.close();
+this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(d){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",d)}},_change:function(d){this.previous!==this.element.val()&&this._trigger("change",d,{item:this.selectedItem})},_normalize:function(d){if(d.length&&d[0].label&&d[0].value)return d;return a.map(d,function(e){if(typeof e==="string")return{label:e,value:e};return a.extend({label:e.label||
+e.value,value:e.value||e.label},e)})},_suggest:function(d){var e=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(e,d);this.menu.deactivate();this.menu.refresh();e.show();this._resizeMenu();e.position(a.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new a.Event("mouseover"))},_resizeMenu:function(){var d=this.menu.element;d.outerWidth(Math.max(d.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(d,e){var h=this;
+a.each(e,function(g,i){h._renderItem(d,i)})},_renderItem:function(d,e){return a("<li></li>").data("item.autocomplete",e).append(a("<a></a>").text(e.label)).appendTo(d)},_move:function(d,e){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(d)||this.menu.last()&&/^next/.test(d)){this.element.val(this.term);this.menu.deactivate()}else this.menu[d](e);else this.search(null,e)},widget:function(){return this.menu.element}});a.extend(a.ui.autocomplete,{escapeRegex:function(d){return d.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
+"\\$&")},filter:function(d,e){var h=new RegExp(a.ui.autocomplete.escapeRegex(e),"i");return a.grep(d,function(g){return h.test(g.label||g.value||g)})}})})(jQuery);
+(function(a){a.widget("ui.menu",{_create:function(){var c=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(d){if(a(d.target).closest(".ui-menu-item a").length){d.preventDefault();c.select(d)}});this.refresh()},refresh:function(){var c=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(d){c.activate(d,a(this).parent())}).mouseleave(function(){c.deactivate()})},activate:function(c,d){this.deactivate();if(this.hasScroll()){var e=d.offset().top-this.element.offset().top,h=this.element.scrollTop(),g=this.element.height();if(e<0)this.element.scrollTop(h+e);else e>=g&&this.element.scrollTop(h+e-g+d.height())}this.active=d.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",c,{item:d})},deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");
+this._trigger("blur");this.active=null}},next:function(c){this.move("next",".ui-menu-item:first",c)},previous:function(c){this.move("prev",".ui-menu-item:last",c)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(c,d,e){if(this.active){c=this.active[c+"All"](".ui-menu-item").eq(0);c.length?this.activate(e,c):this.activate(e,this.element.children(d))}else this.activate(e,
+this.element.children(d))},nextPage:function(c){if(this.hasScroll())if(!this.active||this.last())this.activate(c,this.element.children(".ui-menu-item:first"));else{var d=this.active.offset().top,e=this.element.height(),h=this.element.children(".ui-menu-item").filter(function(){var g=a(this).offset().top-d-e+a(this).height();return g<10&&g>-10});h.length||(h=this.element.children(".ui-menu-item:last"));this.activate(c,h)}else this.activate(c,this.element.children(".ui-menu-item").filter(!this.active||
+this.last()?":first":":last"))},previousPage:function(c){if(this.hasScroll())if(!this.active||this.first())this.activate(c,this.element.children(".ui-menu-item:last"));else{var d=this.active.offset().top,e=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var h=a(this).offset().top-d+e-a(this).height();return h<10&&h>-10});result.length||(result=this.element.children(".ui-menu-item:first"));this.activate(c,result)}else this.activate(c,this.element.children(".ui-menu-item").filter(!this.active||
+this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element[a.fn.prop?"prop":"attr"]("scrollHeight")},select:function(c){this._trigger("selected",c,{item:this.active})}})})(jQuery);
+(function(a){var c,d,e,h,g=function(){var b=a(this).find(":ui-button");setTimeout(function(){b.button("refresh")},1)},i=function(b){var f=b.name,j=b.form,l=a([]);if(f)l=j?a(j).find("[name='"+f+"']"):a("[name='"+f+"']",b.ownerDocument).filter(function(){return!this.form});return l};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",g);if(typeof this.options.disabled!==
+"boolean")this.options.disabled=this.element.propAttr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,f=this.options,j=this.type==="checkbox"||this.type==="radio",l="ui-state-hover"+(!j?" ui-state-active":"");if(f.label===null)f.label=this.buttonElement.html();if(this.element.is(":disabled"))f.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",function(){if(!f.disabled){a(this).addClass("ui-state-hover");
+this===c&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){f.disabled||a(this).removeClass(l)}).bind("click.button",function(o){if(f.disabled){o.preventDefault();o.stopImmediatePropagation()}});this.element.bind("focus.button",function(){b.buttonElement.addClass("ui-state-focus")}).bind("blur.button",function(){b.buttonElement.removeClass("ui-state-focus")});if(j){this.element.bind("change.button",function(){h||b.refresh()});this.buttonElement.bind("mousedown.button",function(o){if(!f.disabled){h=
+false;d=o.pageX;e=o.pageY}}).bind("mouseup.button",function(o){if(!f.disabled)if(d!==o.pageX||e!==o.pageY)h=true})}if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).toggleClass("ui-state-active");b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(f.disabled||h)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed","true");
+var o=b.element[0];i(o).not(o).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed","false")});else{this.buttonElement.bind("mousedown.button",function(){if(f.disabled)return false;a(this).addClass("ui-state-active");c=this;a(document).one("mouseup",function(){c=null})}).bind("mouseup.button",function(){if(f.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(o){if(f.disabled)return false;if(o.keyCode==a.ui.keyCode.SPACE||
+o.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(o){o.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",f.disabled);this._resetButton()},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type===
+"radio"){var b=this.element.parents().filter(":last"),f="label[for="+this.element.attr("id")+"]";this.buttonElement=b.find(f);if(!this.buttonElement.length){b=b.length?b.siblings():this.element.siblings();this.buttonElement=b.filter(f);if(!this.buttonElement.length)this.buttonElement=b.find(f)}this.element.addClass("ui-helper-hidden-accessible");(b=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=this.element},
+widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());this.hasTitle||this.buttonElement.removeAttr("title");
+a.Widget.prototype.destroy.call(this)},_setOption:function(b,f){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")f?this.element.propAttr("disabled",true):this.element.propAttr("disabled",false);else this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")i(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+"true"):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed","false")});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed","true"):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed","false")},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+f=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),j=this.options.icons,l=j.primary&&j.secondary,o=[];if(j.primary||j.secondary){if(this.options.text)o.push("ui-button-text-icon"+(l?"s":j.primary?"-primary":"-secondary"));j.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+j.primary+"'></span>");j.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+j.secondary+"'></span>");if(!this.options.text){o.push(l?"ui-button-icons-only":
+"ui-button-icon-only");this.hasTitle||b.attr("title",f)}}else o.push("ui-button-text-only");b.addClass(o.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,f){b==="disabled"&&this.buttons.button("option",b,f);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){var b=this.element.css("direction")===
+"ltr";this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass(b?"ui-corner-left":"ui-corner-right").end().filter(":last").addClass(b?"ui-corner-right":"ui-corner-left").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");
+a.Widget.prototype.destroy.call(this)}})})(jQuery);
+(function(a,c){function d(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false,disabled:false};a.extend(this._defaults,this.regional[""]);this.dpDiv=e(a('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}function e(b){return b.bind("mouseout",
+function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");f.length&&f.removeClass("ui-state-hover ui-datepicker-prev-hover ui-datepicker-next-hover")}).bind("mouseover",function(f){f=a(f.target).closest("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a");if(!(a.datepicker._isDisabledDatepicker(i.inline?b.parent()[0]:i.input[0])||!f.length)){f.parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+f.addClass("ui-state-hover");f.hasClass("ui-datepicker-prev")&&f.addClass("ui-datepicker-prev-hover");f.hasClass("ui-datepicker-next")&&f.addClass("ui-datepicker-next-hover")}})}function h(b,f){a.extend(b,f);for(var j in f)if(f[j]==null||f[j]==c)b[j]=f[j];return b}a.extend(a.ui,{datepicker:{version:"1.8.15"}});var g=(new Date).getTime(),i;a.extend(d.prototype,{markerClassName:"hasDatepicker",maxRows:4,log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},
+setDefaults:function(b){h(this._defaults,b||{});return this},_attachDatepicker:function(b,f){var j=null;for(var l in this._defaults){var o=b.getAttribute("date:"+l);if(o){j=j||{};try{j[l]=eval(o)}catch(n){j[l]=o}}}l=b.nodeName.toLowerCase();o=l=="div"||l=="span";if(!b.id){this.uuid+=1;b.id="dp"+this.uuid}var k=this._newInst(a(b),o);k.settings=a.extend({},f||{},j||{});if(l=="input")this._connectDatepicker(b,k);else o&&this._inlineDatepicker(b,k)},_newInst:function(b,f){return{id:b[0].id.replace(/([^A-Za-z0-9_-])/g,
+"\\\\$1"),input:b,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:f,dpDiv:!f?this.dpDiv:e(a('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(b,f){var j=a(b);f.append=a([]);f.trigger=a([]);if(!j.hasClass(this.markerClassName)){this._attachments(j,f);j.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",
+function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});this._autoSize(f);a.data(b,"datepicker",f);f.settings.disabled&&this._disableDatepicker(b)}},_attachments:function(b,f){var j=this._get(f,"appendText"),l=this._get(f,"isRTL");f.append&&f.append.remove();if(j){f.append=a('<span class="'+this._appendClass+'">'+j+"</span>");b[l?"before":"after"](f.append)}b.unbind("focus",this._showDatepicker);f.trigger&&f.trigger.remove();j=this._get(f,"showOn");if(j==
+"focus"||j=="both")b.focus(this._showDatepicker);if(j=="button"||j=="both"){j=this._get(f,"buttonText");var o=this._get(f,"buttonImage");f.trigger=a(this._get(f,"buttonImageOnly")?a("<img/>").addClass(this._triggerClass).attr({src:o,alt:j,title:j}):a('<button type="button"></button>').addClass(this._triggerClass).html(o==""?j:a("<img/>").attr({src:o,alt:j,title:j})));b[l?"before":"after"](f.trigger);f.trigger.click(function(){a.datepicker._datepickerShowing&&a.datepicker._lastInput==b[0]?a.datepicker._hideDatepicker():
+a.datepicker._showDatepicker(b[0]);return false})}},_autoSize:function(b){if(this._get(b,"autoSize")&&!b.inline){var f=new Date(2009,11,20),j=this._get(b,"dateFormat");if(j.match(/[DM]/)){var l=function(o){for(var n=0,k=0,m=0;m<o.length;m++)if(o[m].length>n){n=o[m].length;k=m}return k};f.setMonth(l(this._get(b,j.match(/MM/)?"monthNames":"monthNamesShort")));f.setDate(l(this._get(b,j.match(/DD/)?"dayNames":"dayNamesShort"))+20-f.getDay())}b.input.attr("size",this._formatDate(b,f).length)}},_inlineDatepicker:function(b,
+f){var j=a(b);if(!j.hasClass(this.markerClassName)){j.addClass(this.markerClassName).append(f.dpDiv).bind("setData.datepicker",function(l,o,n){f.settings[o]=n}).bind("getData.datepicker",function(l,o){return this._get(f,o)});a.data(b,"datepicker",f);this._setDate(f,this._getDefaultDate(f),true);this._updateDatepicker(f);this._updateAlternate(f);f.settings.disabled&&this._disableDatepicker(b);f.dpDiv.css("display","block")}},_dialogDatepicker:function(b,f,j,l,o){b=this._dialogInst;if(!b){this.uuid+=
+1;this._dialogInput=a('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);a("body").append(this._dialogInput);b=this._dialogInst=this._newInst(this._dialogInput,false);b.settings={};a.data(this._dialogInput[0],"datepicker",b)}h(b.settings,l||{});f=f&&f.constructor==Date?this._formatDate(b,f):f;this._dialogInput.val(f);this._pos=o?o.length?o:[o.pageX,o.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/
+2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");b.settings.onSelect=j;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);a.blockUI&&a.blockUI(this.dpDiv);a.data(this._dialogInput[0],"datepicker",b);return this},_destroyDatepicker:function(b){var f=
+a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();a.removeData(b,"datepicker");if(l=="input"){j.append.remove();j.trigger.remove();f.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else if(l=="div"||l=="span")f.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(b){var f=a(b),j=a.data(b,"datepicker");if(f.hasClass(this.markerClassName)){var l=
+b.nodeName.toLowerCase();if(l=="input"){b.disabled=false;j.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().removeClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").removeAttr("disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==b?null:o})}},_disableDatepicker:function(b){var f=a(b),j=a.data(b,
+"datepicker");if(f.hasClass(this.markerClassName)){var l=b.nodeName.toLowerCase();if(l=="input"){b.disabled=true;j.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(l=="div"||l=="span"){f=f.children("."+this._inlineClass);f.children().addClass("ui-state-disabled");f.find("select.ui-datepicker-month, select.ui-datepicker-year").attr("disabled","disabled")}this._disabledInputs=a.map(this._disabledInputs,function(o){return o==
+b?null:o});this._disabledInputs[this._disabledInputs.length]=b}},_isDisabledDatepicker:function(b){if(!b)return false;for(var f=0;f<this._disabledInputs.length;f++)if(this._disabledInputs[f]==b)return true;return false},_getInst:function(b){try{return a.data(b,"datepicker")}catch(f){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(b,f,j){var l=this._getInst(b);if(arguments.length==2&&typeof f=="string")return f=="defaults"?a.extend({},a.datepicker._defaults):l?f=="all"?
+a.extend({},l.settings):this._get(l,f):null;var o=f||{};if(typeof f=="string"){o={};o[f]=j}if(l){this._curInst==l&&this._hideDatepicker();var n=this._getDateDatepicker(b,true),k=this._getMinMaxDate(l,"min"),m=this._getMinMaxDate(l,"max");h(l.settings,o);if(k!==null&&o.dateFormat!==c&&o.minDate===c)l.settings.minDate=this._formatDate(l,k);if(m!==null&&o.dateFormat!==c&&o.maxDate===c)l.settings.maxDate=this._formatDate(l,m);this._attachments(a(b),l);this._autoSize(l);this._setDate(l,n);this._updateAlternate(l);
+this._updateDatepicker(l)}},_changeDatepicker:function(b,f,j){this._optionDatepicker(b,f,j)},_refreshDatepicker:function(b){(b=this._getInst(b))&&this._updateDatepicker(b)},_setDateDatepicker:function(b,f){if(b=this._getInst(b)){this._setDate(b,f);this._updateDatepicker(b);this._updateAlternate(b)}},_getDateDatepicker:function(b,f){(b=this._getInst(b))&&!b.inline&&this._setDateFromField(b,f);return b?this._getDate(b):null},_doKeyDown:function(b){var f=a.datepicker._getInst(b.target),j=true,l=f.dpDiv.is(".ui-datepicker-rtl");
+f._keyEvent=true;if(a.datepicker._datepickerShowing)switch(b.keyCode){case 9:a.datepicker._hideDatepicker();j=false;break;case 13:j=a("td."+a.datepicker._dayOverClass+":not(."+a.datepicker._currentClass+")",f.dpDiv);j[0]&&a.datepicker._selectDay(b.target,f.selectedMonth,f.selectedYear,j[0]);if(b=a.datepicker._get(f,"onSelect")){j=a.datepicker._formatDate(f);b.apply(f.input?f.input[0]:null,[j,f])}else a.datepicker._hideDatepicker();return false;case 27:a.datepicker._hideDatepicker();break;case 33:a.datepicker._adjustDate(b.target,
+b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 34:a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,"stepMonths"),"M");break;case 35:if(b.ctrlKey||b.metaKey)a.datepicker._clearDate(b.target);j=b.ctrlKey||b.metaKey;break;case 36:if(b.ctrlKey||b.metaKey)a.datepicker._gotoToday(b.target);j=b.ctrlKey||b.metaKey;break;case 37:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?+1:-1,"D");j=
+b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?-a.datepicker._get(f,"stepBigMonths"):-a.datepicker._get(f,"stepMonths"),"M");break;case 38:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,-7,"D");j=b.ctrlKey||b.metaKey;break;case 39:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,l?-1:+1,"D");j=b.ctrlKey||b.metaKey;if(b.originalEvent.altKey)a.datepicker._adjustDate(b.target,b.ctrlKey?+a.datepicker._get(f,"stepBigMonths"):+a.datepicker._get(f,
+"stepMonths"),"M");break;case 40:if(b.ctrlKey||b.metaKey)a.datepicker._adjustDate(b.target,+7,"D");j=b.ctrlKey||b.metaKey;break;default:j=false}else if(b.keyCode==36&&b.ctrlKey)a.datepicker._showDatepicker(this);else j=false;if(j){b.preventDefault();b.stopPropagation()}},_doKeyPress:function(b){var f=a.datepicker._getInst(b.target);if(a.datepicker._get(f,"constrainInput")){f=a.datepicker._possibleChars(a.datepicker._get(f,"dateFormat"));var j=String.fromCharCode(b.charCode==c?b.keyCode:b.charCode);
+return b.ctrlKey||b.metaKey||j<" "||!f||f.indexOf(j)>-1}},_doKeyUp:function(b){b=a.datepicker._getInst(b.target);if(b.input.val()!=b.lastVal)try{if(a.datepicker.parseDate(a.datepicker._get(b,"dateFormat"),b.input?b.input.val():null,a.datepicker._getFormatConfig(b))){a.datepicker._setDateFromField(b);a.datepicker._updateAlternate(b);a.datepicker._updateDatepicker(b)}}catch(f){a.datepicker.log(f)}return true},_showDatepicker:function(b){b=b.target||b;if(b.nodeName.toLowerCase()!="input")b=a("input",
+b.parentNode)[0];if(!(a.datepicker._isDisabledDatepicker(b)||a.datepicker._lastInput==b)){var f=a.datepicker._getInst(b);if(a.datepicker._curInst&&a.datepicker._curInst!=f){a.datepicker._datepickerShowing&&a.datepicker._triggerOnClose(a.datepicker._curInst);a.datepicker._curInst.dpDiv.stop(true,true)}var j=a.datepicker._get(f,"beforeShow");h(f.settings,j?j.apply(b,[b,f]):{});f.lastVal=null;a.datepicker._lastInput=b;a.datepicker._setDateFromField(f);if(a.datepicker._inDialog)b.value="";if(!a.datepicker._pos){a.datepicker._pos=
+a.datepicker._findPos(b);a.datepicker._pos[1]+=b.offsetHeight}var l=false;a(b).parents().each(function(){l|=a(this).css("position")=="fixed";return!l});if(l&&a.browser.opera){a.datepicker._pos[0]-=document.documentElement.scrollLeft;a.datepicker._pos[1]-=document.documentElement.scrollTop}j={left:a.datepicker._pos[0],top:a.datepicker._pos[1]};a.datepicker._pos=null;f.dpDiv.empty();f.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});a.datepicker._updateDatepicker(f);j=a.datepicker._checkOffset(f,
+j,l);f.dpDiv.css({position:a.datepicker._inDialog&&a.blockUI?"static":l?"fixed":"absolute",display:"none",left:j.left+"px",top:j.top+"px"});if(!f.inline){j=a.datepicker._get(f,"showAnim");var o=a.datepicker._get(f,"duration"),n=function(){var k=f.dpDiv.find("iframe.ui-datepicker-cover");if(k.length){var m=a.datepicker._getBorders(f.dpDiv);k.css({left:-m[0],top:-m[1],width:f.dpDiv.outerWidth(),height:f.dpDiv.outerHeight()})}};f.dpDiv.zIndex(a(b).zIndex()+1);a.datepicker._datepickerShowing=true;a.effects&&
+a.effects[j]?f.dpDiv.show(j,a.datepicker._get(f,"showOptions"),o,n):f.dpDiv[j||"show"](j?o:null,n);if(!j||!o)n();f.input.is(":visible")&&!f.input.is(":disabled")&&f.input.focus();a.datepicker._curInst=f}}},_updateDatepicker:function(b){this.maxRows=4;var f=a.datepicker._getBorders(b.dpDiv);i=b;b.dpDiv.empty().append(this._generateHTML(b));var j=b.dpDiv.find("iframe.ui-datepicker-cover");j.length&&j.css({left:-f[0],top:-f[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()});b.dpDiv.find("."+
+this._dayOverClass+" a").mouseover();f=this._getNumberOfMonths(b);j=f[1];b.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");j>1&&b.dpDiv.addClass("ui-datepicker-multi-"+j).css("width",17*j+"em");b.dpDiv[(f[0]!=1||f[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");b.dpDiv[(this._get(b,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");b==a.datepicker._curInst&&a.datepicker._datepickerShowing&&b.input&&b.input.is(":visible")&&!b.input.is(":disabled")&&
+b.input[0]!=document.activeElement&&b.input.focus();if(b.yearshtml){var l=b.yearshtml;setTimeout(function(){l===b.yearshtml&&b.yearshtml&&b.dpDiv.find("select.ui-datepicker-year:first").replaceWith(b.yearshtml);l=b.yearshtml=null},0)}},_getBorders:function(b){var f=function(j){return{thin:1,medium:2,thick:3}[j]||j};return[parseFloat(f(b.css("border-left-width"))),parseFloat(f(b.css("border-top-width")))]},_checkOffset:function(b,f,j){var l=b.dpDiv.outerWidth(),o=b.dpDiv.outerHeight(),n=b.input?b.input.outerWidth():
+0,k=b.input?b.input.outerHeight():0,m=document.documentElement.clientWidth+a(document).scrollLeft(),p=document.documentElement.clientHeight+a(document).scrollTop();f.left-=this._get(b,"isRTL")?l-n:0;f.left-=j&&f.left==b.input.offset().left?a(document).scrollLeft():0;f.top-=j&&f.top==b.input.offset().top+k?a(document).scrollTop():0;f.left-=Math.min(f.left,f.left+l>m&&m>l?Math.abs(f.left+l-m):0);f.top-=Math.min(f.top,f.top+o>p&&p>o?Math.abs(o+k):0);return f},_findPos:function(b){for(var f=this._get(this._getInst(b),
+"isRTL");b&&(b.type=="hidden"||b.nodeType!=1||a.expr.filters.hidden(b));)b=b[f?"previousSibling":"nextSibling"];b=a(b).offset();return[b.left,b.top]},_triggerOnClose:function(b){var f=this._get(b,"onClose");if(f)f.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b])},_hideDatepicker:function(b){var f=this._curInst;if(!(!f||b&&f!=a.data(b,"datepicker")))if(this._datepickerShowing){b=this._get(f,"showAnim");var j=this._get(f,"duration"),l=function(){a.datepicker._tidyDialog(f);this._curInst=
+null};a.effects&&a.effects[b]?f.dpDiv.hide(b,a.datepicker._get(f,"showOptions"),j,l):f.dpDiv[b=="slideDown"?"slideUp":b=="fadeIn"?"fadeOut":"hide"](b?j:null,l);b||l();a.datepicker._triggerOnClose(f);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(a.blockUI){a.unblockUI();a("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(b){b.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},
+_checkExternalClick:function(b){if(a.datepicker._curInst){b=a(b.target);b[0].id!=a.datepicker._mainDivId&&b.parents("#"+a.datepicker._mainDivId).length==0&&!b.hasClass(a.datepicker.markerClassName)&&!b.hasClass(a.datepicker._triggerClass)&&a.datepicker._datepickerShowing&&!(a.datepicker._inDialog&&a.blockUI)&&a.datepicker._hideDatepicker()}},_adjustDate:function(b,f,j){b=a(b);var l=this._getInst(b[0]);if(!this._isDisabledDatepicker(b[0])){this._adjustInstDate(l,f+(j=="M"?this._get(l,"showCurrentAtPos"):
+0),j);this._updateDatepicker(l)}},_gotoToday:function(b){b=a(b);var f=this._getInst(b[0]);if(this._get(f,"gotoCurrent")&&f.currentDay){f.selectedDay=f.currentDay;f.drawMonth=f.selectedMonth=f.currentMonth;f.drawYear=f.selectedYear=f.currentYear}else{var j=new Date;f.selectedDay=j.getDate();f.drawMonth=f.selectedMonth=j.getMonth();f.drawYear=f.selectedYear=j.getFullYear()}this._notifyChange(f);this._adjustDate(b)},_selectMonthYear:function(b,f,j){b=a(b);var l=this._getInst(b[0]);l["selected"+(j=="M"?
+"Month":"Year")]=l["draw"+(j=="M"?"Month":"Year")]=parseInt(f.options[f.selectedIndex].value,10);this._notifyChange(l);this._adjustDate(b)},_selectDay:function(b,f,j,l){var o=a(b);if(!(a(l).hasClass(this._unselectableClass)||this._isDisabledDatepicker(o[0]))){o=this._getInst(o[0]);o.selectedDay=o.currentDay=a("a",l).html();o.selectedMonth=o.currentMonth=f;o.selectedYear=o.currentYear=j;this._selectDate(b,this._formatDate(o,o.currentDay,o.currentMonth,o.currentYear))}},_clearDate:function(b){b=a(b);
+this._getInst(b[0]);this._selectDate(b,"")},_selectDate:function(b,f){b=this._getInst(a(b)[0]);f=f!=null?f:this._formatDate(b);b.input&&b.input.val(f);this._updateAlternate(b);var j=this._get(b,"onSelect");if(j)j.apply(b.input?b.input[0]:null,[f,b]);else b.input&&b.input.trigger("change");if(b.inline)this._updateDatepicker(b);else{this._hideDatepicker();this._lastInput=b.input[0];b.input.focus();this._lastInput=null}},_updateAlternate:function(b){var f=this._get(b,"altField");if(f){var j=this._get(b,
+"altFormat")||this._get(b,"dateFormat"),l=this._getDate(b),o=this.formatDate(j,l,this._getFormatConfig(b));a(f).each(function(){a(this).val(o)})}},noWeekends:function(b){b=b.getDay();return[b>0&&b<6,""]},iso8601Week:function(b){b=new Date(b.getTime());b.setDate(b.getDate()+4-(b.getDay()||7));var f=b.getTime();b.setMonth(0);b.setDate(1);return Math.floor(Math.round((f-b)/864E5)/7)+1},parseDate:function(b,f,j){if(b==null||f==null)throw"Invalid arguments";f=typeof f=="object"?f.toString():f+"";if(f==
+"")return null;var l=(j?j.shortYearCutoff:null)||this._defaults.shortYearCutoff;l=typeof l!="string"?l:(new Date).getFullYear()%100+parseInt(l,10);for(var o=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,n=(j?j.dayNames:null)||this._defaults.dayNames,k=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort,m=(j?j.monthNames:null)||this._defaults.monthNames,p=j=-1,q=-1,s=-1,r=false,u=function(z){(z=H+1<b.length&&b.charAt(H+1)==z)&&H++;return z},v=function(z){var I=u(z);z=new RegExp("^\\d{1,"+
+(z=="@"?14:z=="!"?20:z=="y"&&I?4:z=="o"?3:2)+"}");z=f.substring(y).match(z);if(!z)throw"Missing number at position "+y;y+=z[0].length;return parseInt(z[0],10)},w=function(z,I,N){z=a.map(u(z)?N:I,function(D,E){return[[E,D]]}).sort(function(D,E){return-(D[1].length-E[1].length)});var J=-1;a.each(z,function(D,E){D=E[1];if(f.substr(y,D.length).toLowerCase()==D.toLowerCase()){J=E[0];y+=D.length;return false}});if(J!=-1)return J+1;else throw"Unknown name at position "+y;},x=function(){if(f.charAt(y)!=b.charAt(H))throw"Unexpected literal at position "+
+y;y++},y=0,H=0;H<b.length;H++)if(r)if(b.charAt(H)=="'"&&!u("'"))r=false;else x();else switch(b.charAt(H)){case "d":q=v("d");break;case "D":w("D",o,n);break;case "o":s=v("o");break;case "m":p=v("m");break;case "M":p=w("M",k,m);break;case "y":j=v("y");break;case "@":var C=new Date(v("@"));j=C.getFullYear();p=C.getMonth()+1;q=C.getDate();break;case "!":C=new Date((v("!")-this._ticksTo1970)/1E4);j=C.getFullYear();p=C.getMonth()+1;q=C.getDate();break;case "'":if(u("'"))x();else r=true;break;default:x()}if(y<
+f.length)throw"Extra/unparsed characters found in date: "+f.substring(y);if(j==-1)j=(new Date).getFullYear();else if(j<100)j+=(new Date).getFullYear()-(new Date).getFullYear()%100+(j<=l?0:-100);if(s>-1){p=1;q=s;do{l=this._getDaysInMonth(j,p-1);if(q<=l)break;p++;q-=l}while(1)}C=this._daylightSavingAdjust(new Date(j,p-1,q));if(C.getFullYear()!=j||C.getMonth()+1!=p||C.getDate()!=q)throw"Invalid date";return C},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",
+RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(b,f,j){if(!f)return"";var l=(j?j.dayNamesShort:null)||this._defaults.dayNamesShort,o=(j?j.dayNames:null)||this._defaults.dayNames,n=(j?j.monthNamesShort:null)||this._defaults.monthNamesShort;j=(j?j.monthNames:null)||this._defaults.monthNames;var k=function(u){(u=r+1<b.length&&
+b.charAt(r+1)==u)&&r++;return u},m=function(u,v,w){v=""+v;if(k(u))for(;v.length<w;)v="0"+v;return v},p=function(u,v,w,x){return k(u)?x[v]:w[v]},q="",s=false;if(f)for(var r=0;r<b.length;r++)if(s)if(b.charAt(r)=="'"&&!k("'"))s=false;else q+=b.charAt(r);else switch(b.charAt(r)){case "d":q+=m("d",f.getDate(),2);break;case "D":q+=p("D",f.getDay(),l,o);break;case "o":q+=m("o",Math.round(((new Date(f.getFullYear(),f.getMonth(),f.getDate())).getTime()-(new Date(f.getFullYear(),0,0)).getTime())/864E5),3);
+break;case "m":q+=m("m",f.getMonth()+1,2);break;case "M":q+=p("M",f.getMonth(),n,j);break;case "y":q+=k("y")?f.getFullYear():(f.getYear()%100<10?"0":"")+f.getYear()%100;break;case "@":q+=f.getTime();break;case "!":q+=f.getTime()*1E4+this._ticksTo1970;break;case "'":if(k("'"))q+="'";else s=true;break;default:q+=b.charAt(r)}return q},_possibleChars:function(b){for(var f="",j=false,l=function(n){(n=o+1<b.length&&b.charAt(o+1)==n)&&o++;return n},o=0;o<b.length;o++)if(j)if(b.charAt(o)=="'"&&!l("'"))j=
+false;else f+=b.charAt(o);else switch(b.charAt(o)){case "d":case "m":case "y":case "@":f+="0123456789";break;case "D":case "M":return null;case "'":if(l("'"))f+="'";else j=true;break;default:f+=b.charAt(o)}return f},_get:function(b,f){return b.settings[f]!==c?b.settings[f]:this._defaults[f]},_setDateFromField:function(b,f){if(b.input.val()!=b.lastVal){var j=this._get(b,"dateFormat"),l=b.lastVal=b.input?b.input.val():null,o,n;o=n=this._getDefaultDate(b);var k=this._getFormatConfig(b);try{o=this.parseDate(j,
+l,k)||n}catch(m){this.log(m);l=f?"":l}b.selectedDay=o.getDate();b.drawMonth=b.selectedMonth=o.getMonth();b.drawYear=b.selectedYear=o.getFullYear();b.currentDay=l?o.getDate():0;b.currentMonth=l?o.getMonth():0;b.currentYear=l?o.getFullYear():0;this._adjustInstDate(b)}},_getDefaultDate:function(b){return this._restrictMinMax(b,this._determineDate(b,this._get(b,"defaultDate"),new Date))},_determineDate:function(b,f,j){var l=function(n){var k=new Date;k.setDate(k.getDate()+n);return k},o=function(n){try{return a.datepicker.parseDate(a.datepicker._get(b,
+"dateFormat"),n,a.datepicker._getFormatConfig(b))}catch(k){}var m=(n.toLowerCase().match(/^c/)?a.datepicker._getDate(b):null)||new Date,p=m.getFullYear(),q=m.getMonth();m=m.getDate();for(var s=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,r=s.exec(n);r;){switch(r[2]||"d"){case "d":case "D":m+=parseInt(r[1],10);break;case "w":case "W":m+=parseInt(r[1],10)*7;break;case "m":case "M":q+=parseInt(r[1],10);m=Math.min(m,a.datepicker._getDaysInMonth(p,q));break;case "y":case "Y":p+=parseInt(r[1],10);m=Math.min(m,
+a.datepicker._getDaysInMonth(p,q));break}r=s.exec(n)}return new Date(p,q,m)};if(f=(f=f==null||f===""?j:typeof f=="string"?o(f):typeof f=="number"?isNaN(f)?j:l(f):new Date(f.getTime()))&&f.toString()=="Invalid Date"?j:f){f.setHours(0);f.setMinutes(0);f.setSeconds(0);f.setMilliseconds(0)}return this._daylightSavingAdjust(f)},_daylightSavingAdjust:function(b){if(!b)return null;b.setHours(b.getHours()>12?b.getHours()+2:0);return b},_setDate:function(b,f,j){var l=!f,o=b.selectedMonth,n=b.selectedYear;
+f=this._restrictMinMax(b,this._determineDate(b,f,new Date));b.selectedDay=b.currentDay=f.getDate();b.drawMonth=b.selectedMonth=b.currentMonth=f.getMonth();b.drawYear=b.selectedYear=b.currentYear=f.getFullYear();if((o!=b.selectedMonth||n!=b.selectedYear)&&!j)this._notifyChange(b);this._adjustInstDate(b);if(b.input)b.input.val(l?"":this._formatDate(b));if(j=this._get(b,"onSelect")){l=this._formatDate(b);j.apply(b.input?b.input[0]:null,[l,b])}},_getDate:function(b){return!b.currentYear||b.input&&b.input.val()==
+""?null:this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay))},_generateHTML:function(b){var f=new Date;f=this._daylightSavingAdjust(new Date(f.getFullYear(),f.getMonth(),f.getDate()));var j=this._get(b,"isRTL"),l=this._get(b,"showButtonPanel"),o=this._get(b,"hideIfNoPrevNext"),n=this._get(b,"navigationAsDateFormat"),k=this._getNumberOfMonths(b),m=this._get(b,"showCurrentAtPos"),p=this._get(b,"stepMonths"),q=k[0]!=1||k[1]!=1,s=this._daylightSavingAdjust(!b.currentDay?new Date(9999,
+9,9):new Date(b.currentYear,b.currentMonth,b.currentDay)),r=this._getMinMaxDate(b,"min"),u=this._getMinMaxDate(b,"max");m=b.drawMonth-m;var v=b.drawYear;if(m<0){m+=12;v--}if(u){var w=this._daylightSavingAdjust(new Date(u.getFullYear(),u.getMonth()-k[0]*k[1]+1,u.getDate()));for(w=r&&w<r?r:w;this._daylightSavingAdjust(new Date(v,m,1))>w;){m--;if(m<0){m=11;v--}}}b.drawMonth=m;b.drawYear=v;w=this._get(b,"prevText");w=!n?w:this.formatDate(w,this._daylightSavingAdjust(new Date(v,m-p,1)),this._getFormatConfig(b));
+w=this._canAdjustMonth(b,-1,v,m)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', -"+p+", 'M');\" title=\""+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>":o?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+w+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"e":"w")+'">'+w+"</span></a>";var x=this._get(b,"nextText");x=!n?x:this.formatDate(x,this._daylightSavingAdjust(new Date(v,
+m+p,1)),this._getFormatConfig(b));o=this._canAdjustMonth(b,+1,v,m)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+g+".datepicker._adjustDate('#"+b.id+"', +"+p+", 'M');\" title=\""+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>":o?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+x+'"><span class="ui-icon ui-icon-circle-triangle-'+(j?"w":"e")+'">'+x+"</span></a>";p=this._get(b,"currentText");x=this._get(b,"gotoCurrent")&&
+b.currentDay?s:f;p=!n?p:this.formatDate(p,x,this._getFormatConfig(b));n=!b.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+g+'.datepicker._hideDatepicker();">'+this._get(b,"closeText")+"</button>":"";l=l?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(j?n:"")+(this._isInRange(b,x)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+
+g+".datepicker._gotoToday('#"+b.id+"');\">"+p+"</button>":"")+(j?"":n)+"</div>":"";n=parseInt(this._get(b,"firstDay"),10);n=isNaN(n)?0:n;p=this._get(b,"showWeek");x=this._get(b,"dayNames");this._get(b,"dayNamesShort");var y=this._get(b,"dayNamesMin"),H=this._get(b,"monthNames"),C=this._get(b,"monthNamesShort"),z=this._get(b,"beforeShowDay"),I=this._get(b,"showOtherMonths"),N=this._get(b,"selectOtherMonths");this._get(b,"calculateWeek");for(var J=this._getDefaultDate(b),D="",E=0;E<k[0];E++){var P=
+"";this.maxRows=4;for(var L=0;L<k[1];L++){var Q=this._daylightSavingAdjust(new Date(v,m,b.selectedDay)),B=" ui-corner-all",F="";if(q){F+='<div class="ui-datepicker-group';if(k[1]>1)switch(L){case 0:F+=" ui-datepicker-group-first";B=" ui-corner-"+(j?"right":"left");break;case k[1]-1:F+=" ui-datepicker-group-last";B=" ui-corner-"+(j?"left":"right");break;default:F+=" ui-datepicker-group-middle";B="";break}F+='">'}F+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+B+'">'+(/all|left/.test(B)&&
+E==0?j?o:w:"")+(/all|right/.test(B)&&E==0?j?w:o:"")+this._generateMonthYearHeader(b,m,v,r,u,E>0||L>0,H,C)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var G=p?'<th class="ui-datepicker-week-col">'+this._get(b,"weekHeader")+"</th>":"";for(B=0;B<7;B++){var A=(B+n)%7;G+="<th"+((B+n+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+x[A]+'">'+y[A]+"</span></th>"}F+=G+"</tr></thead><tbody>";G=this._getDaysInMonth(v,m);if(v==b.selectedYear&&m==b.selectedMonth)b.selectedDay=Math.min(b.selectedDay,
+G);B=(this._getFirstDayOfMonth(v,m)-n+7)%7;G=Math.ceil((B+G)/7);this.maxRows=G=q?this.maxRows>G?this.maxRows:G:G;A=this._daylightSavingAdjust(new Date(v,m,1-B));for(var R=0;R<G;R++){F+="<tr>";var S=!p?"":'<td class="ui-datepicker-week-col">'+this._get(b,"calculateWeek")(A)+"</td>";for(B=0;B<7;B++){var M=z?z.apply(b.input?b.input[0]:null,[A]):[true,""],K=A.getMonth()!=m,O=K&&!N||!M[0]||r&&A<r||u&&A>u;S+='<td class="'+((B+n+6)%7>=5?" ui-datepicker-week-end":"")+(K?" ui-datepicker-other-month":"")+(A.getTime()==
+Q.getTime()&&m==b.selectedMonth&&b._keyEvent||J.getTime()==A.getTime()&&J.getTime()==Q.getTime()?" "+this._dayOverClass:"")+(O?" "+this._unselectableClass+" ui-state-disabled":"")+(K&&!I?"":" "+M[1]+(A.getTime()==s.getTime()?" "+this._currentClass:"")+(A.getTime()==f.getTime()?" ui-datepicker-today":""))+'"'+((!K||I)&&M[2]?' title="'+M[2]+'"':"")+(O?"":' onclick="DP_jQuery_'+g+".datepicker._selectDay('#"+b.id+"',"+A.getMonth()+","+A.getFullYear()+', this);return false;"')+">"+(K&&!I?"&#xa0;":O?'<span class="ui-state-default">'+
+A.getDate()+"</span>":'<a class="ui-state-default'+(A.getTime()==f.getTime()?" ui-state-highlight":"")+(A.getTime()==s.getTime()?" ui-state-active":"")+(K?" ui-priority-secondary":"")+'" href="#">'+A.getDate()+"</a>")+"</td>";A.setDate(A.getDate()+1);A=this._daylightSavingAdjust(A)}F+=S+"</tr>"}m++;if(m>11){m=0;v++}F+="</tbody></table>"+(q?"</div>"+(k[0]>0&&L==k[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");P+=F}D+=P}D+=l+(a.browser.msie&&parseInt(a.browser.version,10)<7&&!b.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':
+"");b._keyEvent=false;return D},_generateMonthYearHeader:function(b,f,j,l,o,n,k,m){var p=this._get(b,"changeMonth"),q=this._get(b,"changeYear"),s=this._get(b,"showMonthAfterYear"),r='<div class="ui-datepicker-title">',u="";if(n||!p)u+='<span class="ui-datepicker-month">'+k[f]+"</span>";else{k=l&&l.getFullYear()==j;var v=o&&o.getFullYear()==j;u+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'M');\" >";for(var w=0;w<12;w++)if((!k||w>=l.getMonth())&&
+(!v||w<=o.getMonth()))u+='<option value="'+w+'"'+(w==f?' selected="selected"':"")+">"+m[w]+"</option>";u+="</select>"}s||(r+=u+(n||!(p&&q)?"&#xa0;":""));if(!b.yearshtml){b.yearshtml="";if(n||!q)r+='<span class="ui-datepicker-year">'+j+"</span>";else{m=this._get(b,"yearRange").split(":");var x=(new Date).getFullYear();k=function(y){y=y.match(/c[+-].*/)?j+parseInt(y.substring(1),10):y.match(/[+-].*/)?x+parseInt(y,10):parseInt(y,10);return isNaN(y)?x:y};f=k(m[0]);m=Math.max(f,k(m[1]||""));f=l?Math.max(f,
+l.getFullYear()):f;m=o?Math.min(m,o.getFullYear()):m;for(b.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+g+".datepicker._selectMonthYear('#"+b.id+"', this, 'Y');\" >";f<=m;f++)b.yearshtml+='<option value="'+f+'"'+(f==j?' selected="selected"':"")+">"+f+"</option>";b.yearshtml+="</select>";r+=b.yearshtml;b.yearshtml=null}}r+=this._get(b,"yearSuffix");if(s)r+=(n||!(p&&q)?"&#xa0;":"")+u;r+="</div>";return r},_adjustInstDate:function(b,f,j){var l=b.drawYear+(j=="Y"?f:0),o=b.drawMonth+
+(j=="M"?f:0);f=Math.min(b.selectedDay,this._getDaysInMonth(l,o))+(j=="D"?f:0);l=this._restrictMinMax(b,this._daylightSavingAdjust(new Date(l,o,f)));b.selectedDay=l.getDate();b.drawMonth=b.selectedMonth=l.getMonth();b.drawYear=b.selectedYear=l.getFullYear();if(j=="M"||j=="Y")this._notifyChange(b)},_restrictMinMax:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");f=j&&f<j?j:f;return f=b&&f>b?b:f},_notifyChange:function(b){var f=this._get(b,"onChangeMonthYear");if(f)f.apply(b.input?
+b.input[0]:null,[b.selectedYear,b.selectedMonth+1,b])},_getNumberOfMonths:function(b){b=this._get(b,"numberOfMonths");return b==null?[1,1]:typeof b=="number"?[1,b]:b},_getMinMaxDate:function(b,f){return this._determineDate(b,this._get(b,f+"Date"),null)},_getDaysInMonth:function(b,f){return 32-this._daylightSavingAdjust(new Date(b,f,32)).getDate()},_getFirstDayOfMonth:function(b,f){return(new Date(b,f,1)).getDay()},_canAdjustMonth:function(b,f,j,l){var o=this._getNumberOfMonths(b);j=this._daylightSavingAdjust(new Date(j,
+l+(f<0?f:o[0]*o[1]),1));f<0&&j.setDate(this._getDaysInMonth(j.getFullYear(),j.getMonth()));return this._isInRange(b,j)},_isInRange:function(b,f){var j=this._getMinMaxDate(b,"min");b=this._getMinMaxDate(b,"max");return(!j||f.getTime()>=j.getTime())&&(!b||f.getTime()<=b.getTime())},_getFormatConfig:function(b){var f=this._get(b,"shortYearCutoff");f=typeof f!="string"?f:(new Date).getFullYear()%100+parseInt(f,10);return{shortYearCutoff:f,dayNamesShort:this._get(b,"dayNamesShort"),dayNames:this._get(b,
+"dayNames"),monthNamesShort:this._get(b,"monthNamesShort"),monthNames:this._get(b,"monthNames")}},_formatDate:function(b,f,j,l){if(!f){b.currentDay=b.selectedDay;b.currentMonth=b.selectedMonth;b.currentYear=b.selectedYear}f=f?typeof f=="object"?f:this._daylightSavingAdjust(new Date(l,j,f)):this._daylightSavingAdjust(new Date(b.currentYear,b.currentMonth,b.currentDay));return this.formatDate(this._get(b,"dateFormat"),f,this._getFormatConfig(b))}});a.fn.datepicker=function(b){if(!this.length)return this;
+if(!a.datepicker.initialized){a(document).mousedown(a.datepicker._checkExternalClick).find("body").append(a.datepicker.dpDiv);a.datepicker.initialized=true}var f=Array.prototype.slice.call(arguments,1);if(typeof b=="string"&&(b=="isDisabled"||b=="getDate"||b=="widget"))return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));if(b=="option"&&arguments.length==2&&typeof arguments[1]=="string")return a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this[0]].concat(f));return this.each(function(){typeof b==
+"string"?a.datepicker["_"+b+"Datepicker"].apply(a.datepicker,[this].concat(f)):a.datepicker._attachDatepicker(this,b)})};a.datepicker=new d;a.datepicker.initialized=false;a.datepicker.uuid=(new Date).getTime();a.datepicker.version="1.8.15";window["DP_jQuery_"+g]=a})(jQuery);
+(function(a,c){var d={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},e={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},h=a.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};a.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
+position:{my:"center",at:"center",collision:"fit",using:function(g){var i=a(this).css(g).offset().top;i<0&&a(this).css("top",g.top-i)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var g=this,i=g.options,b=i.title||"&#160;",f=a.ui.dialog.getTitleId(g.element),j=(g.uiDialog=a("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
+i.dialogClass).css({zIndex:i.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(n){if(i.closeOnEscape&&n.keyCode&&n.keyCode===a.ui.keyCode.ESCAPE){g.close(n);n.preventDefault()}}).attr({role:"dialog","aria-labelledby":f}).mousedown(function(n){g.moveToTop(false,n)});g.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j);var l=(g.uiDialogTitlebar=a("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j),
+o=a('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){o.addClass("ui-state-hover")},function(){o.removeClass("ui-state-hover")}).focus(function(){o.addClass("ui-state-focus")}).blur(function(){o.removeClass("ui-state-focus")}).click(function(n){g.close(n);return false}).appendTo(l);(g.uiDialogTitlebarCloseText=a("<span></span>")).addClass("ui-icon ui-icon-closethick").text(i.closeText).appendTo(o);a("<span></span>").addClass("ui-dialog-title").attr("id",
+f).html(b).prependTo(l);if(a.isFunction(i.beforeclose)&&!a.isFunction(i.beforeClose))i.beforeClose=i.beforeclose;l.find("*").add(l).disableSelection();i.draggable&&a.fn.draggable&&g._makeDraggable();i.resizable&&a.fn.resizable&&g._makeResizable();g._createButtons(i.buttons);g._isOpen=false;a.fn.bgiframe&&j.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var g=this;g.overlay&&g.overlay.destroy();g.uiDialog.hide();g.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
+g.uiDialog.remove();g.originalTitle&&g.element.attr("title",g.originalTitle);return g},widget:function(){return this.uiDialog},close:function(g){var i=this,b,f;if(false!==i._trigger("beforeClose",g)){i.overlay&&i.overlay.destroy();i.uiDialog.unbind("keypress.ui-dialog");i._isOpen=false;if(i.options.hide)i.uiDialog.hide(i.options.hide,function(){i._trigger("close",g)});else{i.uiDialog.hide();i._trigger("close",g)}a.ui.dialog.overlay.resize();if(i.options.modal){b=0;a(".ui-dialog").each(function(){if(this!==
+i.uiDialog[0]){f=a(this).css("z-index");isNaN(f)||(b=Math.max(b,f))}});a.ui.dialog.maxZ=b}return i}},isOpen:function(){return this._isOpen},moveToTop:function(g,i){var b=this,f=b.options;if(f.modal&&!g||!f.stack&&!f.modal)return b._trigger("focus",i);if(f.zIndex>a.ui.dialog.maxZ)a.ui.dialog.maxZ=f.zIndex;if(b.overlay){a.ui.dialog.maxZ+=1;b.overlay.$el.css("z-index",a.ui.dialog.overlay.maxZ=a.ui.dialog.maxZ)}g={scrollTop:b.element.scrollTop(),scrollLeft:b.element.scrollLeft()};a.ui.dialog.maxZ+=1;
+b.uiDialog.css("z-index",a.ui.dialog.maxZ);b.element.attr(g);b._trigger("focus",i);return b},open:function(){if(!this._isOpen){var g=this,i=g.options,b=g.uiDialog;g.overlay=i.modal?new a.ui.dialog.overlay(g):null;g._size();g._position(i.position);b.show(i.show);g.moveToTop(true);i.modal&&b.bind("keypress.ui-dialog",function(f){if(f.keyCode===a.ui.keyCode.TAB){var j=a(":tabbable",this),l=j.filter(":first");j=j.filter(":last");if(f.target===j[0]&&!f.shiftKey){l.focus(1);return false}else if(f.target===
+l[0]&&f.shiftKey){j.focus(1);return false}}});a(g.element.find(":tabbable").get().concat(b.find(".ui-dialog-buttonpane :tabbable").get().concat(b.get()))).eq(0).focus();g._isOpen=true;g._trigger("open");return g}},_createButtons:function(g){var i=this,b=false,f=a("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),j=a("<div></div>").addClass("ui-dialog-buttonset").appendTo(f);i.uiDialog.find(".ui-dialog-buttonpane").remove();typeof g==="object"&&g!==null&&a.each(g,
+function(){return!(b=true)});if(b){a.each(g,function(l,o){o=a.isFunction(o)?{click:o,text:l}:o;var n=a('<button type="button"></button>').click(function(){o.click.apply(i.element[0],arguments)}).appendTo(j);a.each(o,function(k,m){if(k!=="click")k in h?n[k](m):n.attr(k,m)});a.fn.button&&n.button()});f.appendTo(i.uiDialog)}},_makeDraggable:function(){function g(l){return{position:l.position,offset:l.offset}}var i=this,b=i.options,f=a(document),j;i.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
+handle:".ui-dialog-titlebar",containment:"document",start:function(l,o){j=b.height==="auto"?"auto":a(this).height();a(this).height(a(this).height()).addClass("ui-dialog-dragging");i._trigger("dragStart",l,g(o))},drag:function(l,o){i._trigger("drag",l,g(o))},stop:function(l,o){b.position=[o.position.left-f.scrollLeft(),o.position.top-f.scrollTop()];a(this).removeClass("ui-dialog-dragging").height(j);i._trigger("dragStop",l,g(o));a.ui.dialog.overlay.resize()}})},_makeResizable:function(g){function i(l){return{originalPosition:l.originalPosition,
+originalSize:l.originalSize,position:l.position,size:l.size}}g=g===c?this.options.resizable:g;var b=this,f=b.options,j=b.uiDialog.css("position");g=typeof g==="string"?g:"n,e,s,w,se,sw,ne,nw";b.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:b.element,maxWidth:f.maxWidth,maxHeight:f.maxHeight,minWidth:f.minWidth,minHeight:b._minHeight(),handles:g,start:function(l,o){a(this).addClass("ui-dialog-resizing");b._trigger("resizeStart",l,i(o))},resize:function(l,o){b._trigger("resize",
+l,i(o))},stop:function(l,o){a(this).removeClass("ui-dialog-resizing");f.height=a(this).height();f.width=a(this).width();b._trigger("resizeStop",l,i(o));a.ui.dialog.overlay.resize()}}).css("position",j).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var g=this.options;return g.height==="auto"?g.minHeight:Math.min(g.minHeight,g.height)},_position:function(g){var i=[],b=[0,0],f;if(g){if(typeof g==="string"||typeof g==="object"&&"0"in g){i=g.split?g.split(" "):
+[g[0],g[1]];if(i.length===1)i[1]=i[0];a.each(["left","top"],function(j,l){if(+i[j]===i[j]){b[j]=i[j];i[j]=l}});g={my:i.join(" "),at:i.join(" "),offset:b.join(" ")}}g=a.extend({},a.ui.dialog.prototype.options.position,g)}else g=a.ui.dialog.prototype.options.position;(f=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(a.extend({of:window},g));f||this.uiDialog.hide()},_setOptions:function(g){var i=this,b={},f=false;a.each(g,function(j,l){i._setOption(j,l);
+if(j in d)f=true;if(j in e)b[j]=l});f&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",b)},_setOption:function(g,i){var b=this,f=b.uiDialog;switch(g){case "beforeclose":g="beforeClose";break;case "buttons":b._createButtons(i);break;case "closeText":b.uiDialogTitlebarCloseText.text(""+i);break;case "dialogClass":f.removeClass(b.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+i);break;case "disabled":i?f.addClass("ui-dialog-disabled"):
+f.removeClass("ui-dialog-disabled");break;case "draggable":var j=f.is(":data(draggable)");j&&!i&&f.draggable("destroy");!j&&i&&b._makeDraggable();break;case "position":b._position(i);break;case "resizable":(j=f.is(":data(resizable)"))&&!i&&f.resizable("destroy");j&&typeof i==="string"&&f.resizable("option","handles",i);!j&&i!==false&&b._makeResizable(i);break;case "title":a(".ui-dialog-title",b.uiDialogTitlebar).html(""+(i||"&#160;"));break}a.Widget.prototype._setOption.apply(b,arguments)},_size:function(){var g=
+this.options,i,b,f=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(g.minWidth>g.width)g.width=g.minWidth;i=this.uiDialog.css({height:"auto",width:g.width}).height();b=Math.max(0,g.minHeight-i);if(g.height==="auto")if(a.support.minHeight)this.element.css({minHeight:b,height:"auto"});else{this.uiDialog.show();g=this.element.css("height","auto").height();f||this.uiDialog.hide();this.element.height(Math.max(g,b))}else this.element.height(Math.max(g.height-
+i,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});a.extend(a.ui.dialog,{version:"1.8.15",uuid:0,maxZ:0,getTitleId:function(g){g=g.attr("id");if(!g){this.uuid+=1;g=this.uuid}return"ui-dialog-title-"+g},overlay:function(g){this.$el=a.ui.dialog.overlay.create(g)}});a.extend(a.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:a.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(g){return g+".dialog-overlay"}).join(" "),
+create:function(g){if(this.instances.length===0){setTimeout(function(){a.ui.dialog.overlay.instances.length&&a(document).bind(a.ui.dialog.overlay.events,function(b){if(a(b.target).zIndex()<a.ui.dialog.overlay.maxZ)return false})},1);a(document).bind("keydown.dialog-overlay",function(b){if(g.options.closeOnEscape&&b.keyCode&&b.keyCode===a.ui.keyCode.ESCAPE){g.close(b);b.preventDefault()}});a(window).bind("resize.dialog-overlay",a.ui.dialog.overlay.resize)}var i=(this.oldInstances.pop()||a("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
+height:this.height()});a.fn.bgiframe&&i.bgiframe();this.instances.push(i);return i},destroy:function(g){var i=a.inArray(g,this.instances);i!=-1&&this.oldInstances.push(this.instances.splice(i,1)[0]);this.instances.length===0&&a([document,window]).unbind(".dialog-overlay");g.remove();var b=0;a.each(this.instances,function(){b=Math.max(b,this.css("z-index"))});this.maxZ=b},height:function(){var g,i;if(a.browser.msie&&a.browser.version<7){g=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
+i=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return g<i?a(window).height()+"px":g+"px"}else return a(document).height()+"px"},width:function(){var g,i;if(a.browser.msie){g=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);i=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return g<i?a(window).width()+"px":g+"px"}else return a(document).width()+"px"},resize:function(){var g=a([]);a.each(a.ui.dialog.overlay.instances,function(){g=
+g.add(this)});g.css({width:0,height:0}).css({width:a.ui.dialog.overlay.width(),height:a.ui.dialog.overlay.height()})}});a.extend(a.ui.dialog.overlay.prototype,{destroy:function(){a.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+(function(a){a.ui=a.ui||{};var c=/left|center|right/,d=/top|center|bottom/,e=a.fn.position,h=a.fn.offset;a.fn.position=function(g){if(!g||!g.of)return e.apply(this,arguments);g=a.extend({},g);var i=a(g.of),b=i[0],f=(g.collision||"flip").split(" "),j=g.offset?g.offset.split(" "):[0,0],l,o,n;if(b.nodeType===9){l=i.width();o=i.height();n={top:0,left:0}}else if(b.setTimeout){l=i.width();o=i.height();n={top:i.scrollTop(),left:i.scrollLeft()}}else if(b.preventDefault){g.at="left top";l=o=0;n={top:g.of.pageY,
+left:g.of.pageX}}else{l=i.outerWidth();o=i.outerHeight();n=i.offset()}a.each(["my","at"],function(){var k=(g[this]||"").split(" ");if(k.length===1)k=c.test(k[0])?k.concat(["center"]):d.test(k[0])?["center"].concat(k):["center","center"];k[0]=c.test(k[0])?k[0]:"center";k[1]=d.test(k[1])?k[1]:"center";g[this]=k});if(f.length===1)f[1]=f[0];j[0]=parseInt(j[0],10)||0;if(j.length===1)j[1]=j[0];j[1]=parseInt(j[1],10)||0;if(g.at[0]==="right")n.left+=l;else if(g.at[0]==="center")n.left+=l/2;if(g.at[1]==="bottom")n.top+=
+o;else if(g.at[1]==="center")n.top+=o/2;n.left+=j[0];n.top+=j[1];return this.each(function(){var k=a(this),m=k.outerWidth(),p=k.outerHeight(),q=parseInt(a.curCSS(this,"marginLeft",true))||0,s=parseInt(a.curCSS(this,"marginTop",true))||0,r=m+q+(parseInt(a.curCSS(this,"marginRight",true))||0),u=p+s+(parseInt(a.curCSS(this,"marginBottom",true))||0),v=a.extend({},n),w;if(g.my[0]==="right")v.left-=m;else if(g.my[0]==="center")v.left-=m/2;if(g.my[1]==="bottom")v.top-=p;else if(g.my[1]==="center")v.top-=
+p/2;v.left=Math.round(v.left);v.top=Math.round(v.top);w={left:v.left-q,top:v.top-s};a.each(["left","top"],function(x,y){a.ui.position[f[x]]&&a.ui.position[f[x]][y](v,{targetWidth:l,targetHeight:o,elemWidth:m,elemHeight:p,collisionPosition:w,collisionWidth:r,collisionHeight:u,offset:j,my:g.my,at:g.at})});a.fn.bgiframe&&k.bgiframe();k.offset(a.extend(v,{using:g.using}))})};a.ui.position={fit:{left:function(g,i){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();g.left=
+b>0?g.left-b:Math.max(g.left-i.collisionPosition.left,g.left)},top:function(g,i){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();g.top=b>0?g.top-b:Math.max(g.top-i.collisionPosition.top,g.top)}},flip:{left:function(g,i){if(i.at[0]!=="center"){var b=a(window);b=i.collisionPosition.left+i.collisionWidth-b.width()-b.scrollLeft();var f=i.my[0]==="left"?-i.elemWidth:i.my[0]==="right"?i.elemWidth:0,j=i.at[0]==="left"?i.targetWidth:-i.targetWidth,l=-2*i.offset[0];g.left+=
+i.collisionPosition.left<0?f+j+l:b>0?f+j+l:0}},top:function(g,i){if(i.at[1]!=="center"){var b=a(window);b=i.collisionPosition.top+i.collisionHeight-b.height()-b.scrollTop();var f=i.my[1]==="top"?-i.elemHeight:i.my[1]==="bottom"?i.elemHeight:0,j=i.at[1]==="top"?i.targetHeight:-i.targetHeight,l=-2*i.offset[1];g.top+=i.collisionPosition.top<0?f+j+l:b>0?f+j+l:0}}}};if(!a.offset.setOffset){a.offset.setOffset=function(g,i){if(/static/.test(a.curCSS(g,"position")))g.style.position="relative";var b=a(g),
+f=b.offset(),j=parseInt(a.curCSS(g,"top",true),10)||0,l=parseInt(a.curCSS(g,"left",true),10)||0;f={top:i.top-f.top+j,left:i.left-f.left+l};"using"in i?i.using.call(g,f):b.css(f)};a.fn.offset=function(g){var i=this[0];if(!i||!i.ownerDocument)return null;if(g)return this.each(function(){a.offset.setOffset(this,g)});return h.call(this)}}})(jQuery);
+(function(a,c){a.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();a.Widget.prototype.destroy.apply(this,arguments)},value:function(d){if(d===c)return this._value();this._setOption("value",d);return this},_setOption:function(d,e){if(d==="value"){this.options.value=e;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var d=this.options.value;if(typeof d!=="number")d=0;return Math.min(this.options.max,Math.max(this.min,d))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var d=this.value(),e=this._percentage();if(this.oldValue!==d){this.oldValue=d;this._trigger("change")}this.valueDiv.toggle(d>this.min).toggleClass("ui-corner-right",d===this.options.max).width(e.toFixed(0)+"%");this.element.attr("aria-valuenow",d)}});a.extend(a.ui.progressbar,{version:"1.8.15"})})(jQuery);
+(function(a){a.widget("ui.slider",a.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var c=this,d=this.options,e=this.element.find(".ui-slider-handle").addClass("ui-state-default ui-corner-all"),h=d.values&&d.values.length||1,g=[];this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+
+this.orientation+" ui-widget ui-widget-content ui-corner-all"+(d.disabled?" ui-slider-disabled ui-disabled":""));this.range=a([]);if(d.range){if(d.range===true){if(!d.values)d.values=[this._valueMin(),this._valueMin()];if(d.values.length&&d.values.length!==2)d.values=[d.values[0],d.values[0]]}this.range=a("<div></div>").appendTo(this.element).addClass("ui-slider-range ui-widget-header"+(d.range==="min"||d.range==="max"?" ui-slider-range-"+d.range:""))}for(var i=e.length;i<h;i+=1)g.push("<a class='ui-slider-handle ui-state-default ui-corner-all' href='#'></a>");
+this.handles=e.add(a(g.join("")).appendTo(c.element));this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(b){b.preventDefault()}).hover(function(){d.disabled||a(this).addClass("ui-state-hover")},function(){a(this).removeClass("ui-state-hover")}).focus(function(){if(d.disabled)a(this).blur();else{a(".ui-slider .ui-state-focus").removeClass("ui-state-focus");a(this).addClass("ui-state-focus")}}).blur(function(){a(this).removeClass("ui-state-focus")});this.handles.each(function(b){a(this).data("index.ui-slider-handle",
+b)});this.handles.keydown(function(b){var f=true,j=a(this).data("index.ui-slider-handle"),l,o,n;if(!c.options.disabled){switch(b.keyCode){case a.ui.keyCode.HOME:case a.ui.keyCode.END:case a.ui.keyCode.PAGE_UP:case a.ui.keyCode.PAGE_DOWN:case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:f=false;if(!c._keySliding){c._keySliding=true;a(this).addClass("ui-state-active");l=c._start(b,j);if(l===false)return}break}n=c.options.step;l=c.options.values&&c.options.values.length?
+(o=c.values(j)):(o=c.value());switch(b.keyCode){case a.ui.keyCode.HOME:o=c._valueMin();break;case a.ui.keyCode.END:o=c._valueMax();break;case a.ui.keyCode.PAGE_UP:o=c._trimAlignValue(l+(c._valueMax()-c._valueMin())/5);break;case a.ui.keyCode.PAGE_DOWN:o=c._trimAlignValue(l-(c._valueMax()-c._valueMin())/5);break;case a.ui.keyCode.UP:case a.ui.keyCode.RIGHT:if(l===c._valueMax())return;o=c._trimAlignValue(l+n);break;case a.ui.keyCode.DOWN:case a.ui.keyCode.LEFT:if(l===c._valueMin())return;o=c._trimAlignValue(l-
+n);break}c._slide(b,j,o);return f}}).keyup(function(b){var f=a(this).data("index.ui-slider-handle");if(c._keySliding){c._keySliding=false;c._stop(b,f);c._change(b,f);a(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();
+return this},_mouseCapture:function(c){var d=this.options,e,h,g,i,b;if(d.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();e=this._normValueFromMouse({x:c.pageX,y:c.pageY});h=this._valueMax()-this._valueMin()+1;i=this;this.handles.each(function(f){var j=Math.abs(e-i.values(f));if(h>j){h=j;g=a(this);b=f}});if(d.range===true&&this.values(1)===d.min){b+=1;g=a(this.handles[b])}if(this._start(c,b)===false)return false;
+this._mouseSliding=true;i._handleIndex=b;g.addClass("ui-state-active").focus();d=g.offset();this._clickOffset=!a(c.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:c.pageX-d.left-g.width()/2,top:c.pageY-d.top-g.height()/2-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(c,b,e);return this._animateOff=true},_mouseStart:function(){return true},_mouseDrag:function(c){var d=
+this._normValueFromMouse({x:c.pageX,y:c.pageY});this._slide(c,this._handleIndex,d);return false},_mouseStop:function(c){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(c,this._handleIndex);this._change(c,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(c){var d;if(this.orientation==="horizontal"){d=
+this.elementSize.width;c=c.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{d=this.elementSize.height;c=c.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}d=c/d;if(d>1)d=1;if(d<0)d=0;if(this.orientation==="vertical")d=1-d;c=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+d*c)},_start:function(c,d){var e={handle:this.handles[d],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(d);
+e.values=this.values()}return this._trigger("start",c,e)},_slide:function(c,d,e){var h;if(this.options.values&&this.options.values.length){h=this.values(d?0:1);if(this.options.values.length===2&&this.options.range===true&&(d===0&&e>h||d===1&&e<h))e=h;if(e!==this.values(d)){h=this.values();h[d]=e;c=this._trigger("slide",c,{handle:this.handles[d],value:e,values:h});this.values(d?0:1);c!==false&&this.values(d,e,true)}}else if(e!==this.value()){c=this._trigger("slide",c,{handle:this.handles[d],value:e});
+c!==false&&this.value(e)}},_stop:function(c,d){var e={handle:this.handles[d],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(d);e.values=this.values()}this._trigger("stop",c,e)},_change:function(c,d){if(!this._keySliding&&!this._mouseSliding){var e={handle:this.handles[d],value:this.value()};if(this.options.values&&this.options.values.length){e.value=this.values(d);e.values=this.values()}this._trigger("change",c,e)}},value:function(c){if(arguments.length){this.options.value=
+this._trimAlignValue(c);this._refreshValue();this._change(null,0)}else return this._value()},values:function(c,d){var e,h,g;if(arguments.length>1){this.options.values[c]=this._trimAlignValue(d);this._refreshValue();this._change(null,c)}else if(arguments.length)if(a.isArray(arguments[0])){e=this.options.values;h=arguments[0];for(g=0;g<e.length;g+=1){e[g]=this._trimAlignValue(h[g]);this._change(null,g)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(c):
+this.value();else return this._values()},_setOption:function(c,d){var e,h=0;if(a.isArray(this.options.values))h=this.options.values.length;a.Widget.prototype._setOption.apply(this,arguments);switch(c){case "disabled":if(d){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.propAttr("disabled",true);this.element.addClass("ui-disabled")}else{this.handles.propAttr("disabled",false);this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(e=0;e<h;e+=1)this._change(null,e);this._animateOff=false;break}},_value:function(){var c=this.options.value;return c=this._trimAlignValue(c)},_values:function(c){var d,e;if(arguments.length){d=this.options.values[c];
+return d=this._trimAlignValue(d)}else{d=this.options.values.slice();for(e=0;e<d.length;e+=1)d[e]=this._trimAlignValue(d[e]);return d}},_trimAlignValue:function(c){if(c<=this._valueMin())return this._valueMin();if(c>=this._valueMax())return this._valueMax();var d=this.options.step>0?this.options.step:1,e=(c-this._valueMin())%d;c=c-e;if(Math.abs(e)*2>=d)c+=e>0?d:-d;return parseFloat(c.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},_refreshValue:function(){var c=
+this.options.range,d=this.options,e=this,h=!this._animateOff?d.animate:false,g,i={},b,f,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(o){g=(e.values(o)-e._valueMin())/(e._valueMax()-e._valueMin())*100;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";a(this).stop(1,1)[h?"animate":"css"](i,d.animate);if(e.options.range===true)if(e.orientation==="horizontal"){if(o===0)e.range.stop(1,1)[h?"animate":"css"]({left:g+"%"},d.animate);if(o===1)e.range[h?"animate":"css"]({width:g-
+b+"%"},{queue:false,duration:d.animate})}else{if(o===0)e.range.stop(1,1)[h?"animate":"css"]({bottom:g+"%"},d.animate);if(o===1)e.range[h?"animate":"css"]({height:g-b+"%"},{queue:false,duration:d.animate})}b=g});else{f=this.value();j=this._valueMin();l=this._valueMax();g=l!==j?(f-j)/(l-j)*100:0;i[e.orientation==="horizontal"?"left":"bottom"]=g+"%";this.handle.stop(1,1)[h?"animate":"css"](i,d.animate);if(c==="min"&&this.orientation==="horizontal")this.range.stop(1,1)[h?"animate":"css"]({width:g+"%"},
+d.animate);if(c==="max"&&this.orientation==="horizontal")this.range[h?"animate":"css"]({width:100-g+"%"},{queue:false,duration:d.animate});if(c==="min"&&this.orientation==="vertical")this.range.stop(1,1)[h?"animate":"css"]({height:g+"%"},d.animate);if(c==="max"&&this.orientation==="vertical")this.range[h?"animate":"css"]({height:100-g+"%"},{queue:false,duration:d.animate})}}});a.extend(a.ui.slider,{version:"1.8.15"})})(jQuery);
+(function(a,c){function d(){return++h}function e(){return++g}var h=0,g=0;a.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(i,b){if(i=="selected")this.options.collapsible&&
+b==this.options.selected||this.select(b);else{this.options[i]=b;this._tabify()}},_tabId:function(i){return i.title&&i.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+d()},_sanitizeSelector:function(i){return i.replace(/:/g,"\\:")},_cookie:function(){var i=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+e());return a.cookie.apply(null,[i].concat(a.makeArray(arguments)))},_ui:function(i,b){return{tab:i,panel:b,index:this.anchors.index(i)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var i=
+a(this);i.html(i.data("label.tabs")).removeData("label.tabs")})},_tabify:function(i){function b(r,u){r.css("display","");!a.support.opacity&&u.opacity&&r[0].style.removeAttribute("filter")}var f=this,j=this.options,l=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=a(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return a("a",this)[0]});this.panels=a([]);this.anchors.each(function(r,u){var v=a(u).attr("href"),w=v.split("#")[0],x;if(w&&(w===location.toString().split("#")[0]||
+(x=a("base")[0])&&w===x.href)){v=u.hash;u.href=v}if(l.test(v))f.panels=f.panels.add(f.element.find(f._sanitizeSelector(v)));else if(v&&v!=="#"){a.data(u,"href.tabs",v);a.data(u,"load.tabs",v.replace(/#.*$/,""));v=f._tabId(u);u.href="#"+v;u=f.element.find("#"+v);if(!u.length){u=a(j.panelTemplate).attr("id",v).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(f.panels[r-1]||f.list);u.data("destroy.tabs",true)}f.panels=f.panels.add(u)}else j.disabled.push(r)});if(i){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(j.selected===c){location.hash&&this.anchors.each(function(r,u){if(u.hash==location.hash){j.selected=r;return false}});if(typeof j.selected!=="number"&&j.cookie)j.selected=parseInt(f._cookie(),10);if(typeof j.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)j.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));j.selected=j.selected||(this.lis.length?0:-1)}else if(j.selected===null)j.selected=-1;j.selected=j.selected>=0&&this.anchors[j.selected]||j.selected<0?j.selected:0;j.disabled=a.unique(j.disabled.concat(a.map(this.lis.filter(".ui-state-disabled"),function(r){return f.lis.index(r)}))).sort();a.inArray(j.selected,j.disabled)!=-1&&j.disabled.splice(a.inArray(j.selected,j.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(j.selected>=0&&this.anchors.length){f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(j.selected).addClass("ui-tabs-selected ui-state-active");f.element.queue("tabs",function(){f._trigger("show",null,f._ui(f.anchors[j.selected],f.element.find(f._sanitizeSelector(f.anchors[j.selected].hash))[0]))});this.load(j.selected)}a(window).bind("unload",function(){f.lis.add(f.anchors).unbind(".tabs");f.lis=f.anchors=f.panels=null})}else j.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[j.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");j.cookie&&this._cookie(j.selected,j.cookie);i=0;for(var o;o=this.lis[i];i++)a(o)[a.inArray(i,j.disabled)!=-1&&!a(o).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");j.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(j.event!=="mouseover"){var n=function(r,u){u.is(":not(.ui-state-disabled)")&&u.addClass("ui-state-"+r)},k=function(r,u){u.removeClass("ui-state-"+
+r)};this.lis.bind("mouseover.tabs",function(){n("hover",a(this))});this.lis.bind("mouseout.tabs",function(){k("hover",a(this))});this.anchors.bind("focus.tabs",function(){n("focus",a(this).closest("li"))});this.anchors.bind("blur.tabs",function(){k("focus",a(this).closest("li"))})}var m,p;if(j.fx)if(a.isArray(j.fx)){m=j.fx[0];p=j.fx[1]}else m=p=j.fx;var q=p?function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.hide().removeClass("ui-tabs-hide").animate(p,p.duration||"normal",
+function(){b(u,p);f._trigger("show",null,f._ui(r,u[0]))})}:function(r,u){a(r).closest("li").addClass("ui-tabs-selected ui-state-active");u.removeClass("ui-tabs-hide");f._trigger("show",null,f._ui(r,u[0]))},s=m?function(r,u){u.animate(m,m.duration||"normal",function(){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");b(u,m);f.element.dequeue("tabs")})}:function(r,u){f.lis.removeClass("ui-tabs-selected ui-state-active");u.addClass("ui-tabs-hide");f.element.dequeue("tabs")};
+this.anchors.bind(j.event+".tabs",function(){var r=this,u=a(r).closest("li"),v=f.panels.filter(":not(.ui-tabs-hide)"),w=f.element.find(f._sanitizeSelector(r.hash));if(u.hasClass("ui-tabs-selected")&&!j.collapsible||u.hasClass("ui-state-disabled")||u.hasClass("ui-state-processing")||f.panels.filter(":animated").length||f._trigger("select",null,f._ui(this,w[0]))===false){this.blur();return false}j.selected=f.anchors.index(this);f.abort();if(j.collapsible)if(u.hasClass("ui-tabs-selected")){j.selected=
+-1;j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){s(r,v)}).dequeue("tabs");this.blur();return false}else if(!v.length){j.cookie&&f._cookie(j.selected,j.cookie);f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this));this.blur();return false}j.cookie&&f._cookie(j.selected,j.cookie);if(w.length){v.length&&f.element.queue("tabs",function(){s(r,v)});f.element.queue("tabs",function(){q(r,w)});f.load(f.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+a.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(i){if(typeof i=="string")i=this.anchors.index(this.anchors.filter("[href$="+i+"]"));return i},destroy:function(){var i=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var b=
+a.data(this,"href.tabs");if(b)this.href=b;var f=a(this).unbind(".tabs");a.each(["href","load","cache"],function(j,l){f.removeData(l+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){a.data(this,"destroy.tabs")?a(this).remove():a(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});i.cookie&&this._cookie(null,i.cookie);return this},add:function(i,
+b,f){if(f===c)f=this.anchors.length;var j=this,l=this.options;b=a(l.tabTemplate.replace(/#\{href\}/g,i).replace(/#\{label\}/g,b));i=!i.indexOf("#")?i.replace("#",""):this._tabId(a("a",b)[0]);b.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var o=j.element.find("#"+i);o.length||(o=a(l.panelTemplate).attr("id",i).data("destroy.tabs",true));o.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(f>=this.lis.length){b.appendTo(this.list);o.appendTo(this.list[0].parentNode)}else{b.insertBefore(this.lis[f]);
+o.insertBefore(this.panels[f])}l.disabled=a.map(l.disabled,function(n){return n>=f?++n:n});this._tabify();if(this.anchors.length==1){l.selected=0;b.addClass("ui-tabs-selected ui-state-active");o.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){j._trigger("show",null,j._ui(j.anchors[0],j.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[f],this.panels[f]));return this},remove:function(i){i=this._getIndex(i);var b=this.options,f=this.lis.eq(i).remove(),j=this.panels.eq(i).remove();
+if(f.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(i+(i+1<this.anchors.length?1:-1));b.disabled=a.map(a.grep(b.disabled,function(l){return l!=i}),function(l){return l>=i?--l:l});this._tabify();this._trigger("remove",null,this._ui(f.find("a")[0],j[0]));return this},enable:function(i){i=this._getIndex(i);var b=this.options;if(a.inArray(i,b.disabled)!=-1){this.lis.eq(i).removeClass("ui-state-disabled");b.disabled=a.grep(b.disabled,function(f){return f!=i});this._trigger("enable",null,
+this._ui(this.anchors[i],this.panels[i]));return this}},disable:function(i){i=this._getIndex(i);var b=this.options;if(i!=b.selected){this.lis.eq(i).addClass("ui-state-disabled");b.disabled.push(i);b.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[i],this.panels[i]))}return this},select:function(i){i=this._getIndex(i);if(i==-1)if(this.options.collapsible&&this.options.selected!=-1)i=this.options.selected;else return this;this.anchors.eq(i).trigger(this.options.event+".tabs");return this},
+load:function(i){i=this._getIndex(i);var b=this,f=this.options,j=this.anchors.eq(i)[0],l=a.data(j,"load.tabs");this.abort();if(!l||this.element.queue("tabs").length!==0&&a.data(j,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(i).addClass("ui-state-processing");if(f.spinner){var o=a("span",j);o.data("label.tabs",o.html()).html(f.spinner)}this.xhr=a.ajax(a.extend({},f.ajaxOptions,{url:l,success:function(n,k){b.element.find(b._sanitizeSelector(j.hash)).html(n);b._cleanup();f.cache&&a.data(j,
+"cache.tabs",true);b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.success(n,k)}catch(m){}},error:function(n,k){b._cleanup();b._trigger("load",null,b._ui(b.anchors[i],b.panels[i]));try{f.ajaxOptions.error(n,k,i,j)}catch(m){}}}));b.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(i,b){this.anchors.eq(i).removeData("cache.tabs").data("load.tabs",b);return this},length:function(){return this.anchors.length}});a.extend(a.ui.tabs,{version:"1.8.15"});a.extend(a.ui.tabs.prototype,{rotation:null,rotate:function(i,b){var f=this,j=this.options,l=f._rotate||(f._rotate=function(o){clearTimeout(f.rotation);f.rotation=setTimeout(function(){var n=j.selected;f.select(++n<f.anchors.length?n:0)},i);o&&o.stopPropagation()});b=f._unrotate||(f._unrotate=!b?function(o){o.clientX&&
+f.rotate(null)}:function(){t=j.selected;l()});if(i){this.element.bind("tabsshow",l);this.anchors.bind(j.event+".tabs",b);l()}else{clearTimeout(f.rotation);this.element.unbind("tabsshow",l);this.anchors.unbind(j.event+".tabs",b);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
diff --git a/common/js/plugins/ui/jquery-ui.packed.js b/common/js/plugins/ui/jquery-ui.packed.js
index c1df6b8bd..1b1c88f30 100644
--- a/common/js/plugins/ui/jquery-ui.packed.js
+++ b/common/js/plugins/ui/jquery-ui.packed.js
@@ -1,374 +1,783 @@
-/*!
- * jQuery UI 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI
- */
/*
- * jQuery UI 1.8
+/*!
+ * jQuery UI 1.8.12
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI
  */
-jQuery.ui||(function(a){a.ui={version:"1.8",plugin:{add:function(c,d,f){var e=a.ui[c].prototype;for(var b in f){e.plugins[b]=e.plugins[b]||[];e.plugins[b].push([d,f[b]])}},call:function(b,d,c){var f=b.plugins[d];if(!f||!b.element[0].parentNode){return}for(var e=0;e<f.length;e++){if(b.options[f[e][0]]){f[e][1].apply(b.element,c)}}}},contains:function(d,c){return document.compareDocumentPosition?d.compareDocumentPosition(c)&16:d!==c&&d.contains(c)},hasScroll:function(e,c){if(a(e).css("overflow")=="hidden"){return false}var b=(c&&c=="left")?"scrollLeft":"scrollTop",d=false;if(e[b]>0){return true}e[b]=1;d=(e[b]>0);e[b]=0;return d},isOverAxis:function(c,b,d){return(c>b)&&(c<(b+d))},isOver:function(g,c,f,e,b,d){return a.ui.isOverAxis(g,f,b)&&a.ui.isOverAxis(c,e,d)},keyCode:{BACKSPACE:8,CAPS_LOCK:20,COMMA:188,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38}};a.fn.extend({_focus:a.fn.focus,focus:function(b,c){return typeof b==="number"?this.each(function(){var d=this;setTimeout(function(){a(d).focus();(c&&c.call(d))},b)}):this._focus.apply(this,arguments)},enableSelection:function(){return this.attr("unselectable","off").css("MozUserSelect","").unbind("selectstart.ui")},disableSelection:function(){return this.attr("unselectable","on").css("MozUserSelect","none").bind("selectstart.ui",function(){return false})},scrollParent:function(){var b;if((a.browser.msie&&(/(static|relative)/).test(this.css("position")))||(/absolute/).test(this.css("position"))){b=this.parents().filter(function(){return(/(relative|absolute|fixed)/).test(a.curCSS(this,"position",1))&&(/(auto|scroll)/).test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0)}else{b=this.parents().filter(function(){return(/(auto|scroll)/).test(a.curCSS(this,"overflow",1)+a.curCSS(this,"overflow-y",1)+a.curCSS(this,"overflow-x",1))}).eq(0)}return(/fixed/).test(this.css("position"))||!b.length?a(document):b},zIndex:function(e){if(e!==undefined){return this.css("zIndex",e)}if(this.length){var c=a(this[0]),b,d;while(c.length&&c[0]!==document){b=c.css("position");if(b=="absolute"||b=="relative"||b=="fixed"){d=parseInt(c.css("zIndex"));if(!isNaN(d)&&d!=0){return d}}c=c.parent()}}return 0}});a.extend(a.expr[":"],{data:function(d,c,b){return !!a.data(d,b[3])},focusable:function(c){var d=c.nodeName.toLowerCase(),b=a.attr(c,"tabindex");return(/input|select|textarea|button|object/.test(d)?!c.disabled:"a"==d||"area"==d?c.href||!isNaN(b):!isNaN(b))&&!a(c)["area"==d?"parents":"closest"](":hidden").length},tabbable:function(c){var b=a.attr(c,"tabindex");return(isNaN(b)||b>=0)&&a(c).is(":focusable")}})})(jQuery);;/*!
- * jQuery UI Widget 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Widget
- */
/*
- * jQuery UI Widget 1.8
+(function(c,j){function k(a){return!c(a).parents().andSelf().filter(function(){return c.curCSS(this,"visibility")==="hidden"||c.expr.filters.hidden(this)}).length}c.ui=c.ui||{};if(!c.ui.version){c.extend(c.ui,{version:"1.8.12",keyCode:{ALT:18,BACKSPACE:8,CAPS_LOCK:20,COMMA:188,COMMAND:91,COMMAND_LEFT:91,COMMAND_RIGHT:93,CONTROL:17,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,INSERT:45,LEFT:37,MENU:93,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,
+NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SHIFT:16,SPACE:32,TAB:9,UP:38,WINDOWS:91}});c.fn.extend({_focus:c.fn.focus,focus:function(a,b){return typeof a==="number"?this.each(function(){var d=this;setTimeout(function(){c(d).focus();b&&b.call(d)},a)}):this._focus.apply(this,arguments)},scrollParent:function(){var a;a=c.browser.msie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(c.curCSS(this,
+"position",1))&&/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(c.curCSS(this,"overflow",1)+c.curCSS(this,"overflow-y",1)+c.curCSS(this,"overflow-x",1))}).eq(0);return/fixed/.test(this.css("position"))||!a.length?c(document):a},zIndex:function(a){if(a!==j)return this.css("zIndex",a);if(this.length){a=c(this[0]);for(var b;a.length&&a[0]!==document;){b=a.css("position");
+if(b==="absolute"||b==="relative"||b==="fixed"){b=parseInt(a.css("zIndex"),10);if(!isNaN(b)&&b!==0)return b}a=a.parent()}}return 0},disableSelection:function(){return this.bind((c.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(a){a.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}});c.each(["Width","Height"],function(a,b){function d(f,g,l,m){c.each(e,function(){g-=parseFloat(c.curCSS(f,"padding"+this,true))||0;if(l)g-=parseFloat(c.curCSS(f,
+"border"+this+"Width",true))||0;if(m)g-=parseFloat(c.curCSS(f,"margin"+this,true))||0});return g}var e=b==="Width"?["Left","Right"]:["Top","Bottom"],h=b.toLowerCase(),i={innerWidth:c.fn.innerWidth,innerHeight:c.fn.innerHeight,outerWidth:c.fn.outerWidth,outerHeight:c.fn.outerHeight};c.fn["inner"+b]=function(f){if(f===j)return i["inner"+b].call(this);return this.each(function(){c(this).css(h,d(this,f)+"px")})};c.fn["outer"+b]=function(f,g){if(typeof f!=="number")return i["outer"+b].call(this,f);return this.each(function(){c(this).css(h,
+d(this,f,true,g)+"px")})}});c.extend(c.expr[":"],{data:function(a,b,d){return!!c.data(a,d[3])},focusable:function(a){var b=a.nodeName.toLowerCase(),d=c.attr(a,"tabindex");if("area"===b){b=a.parentNode;d=b.name;if(!a.href||!d||b.nodeName.toLowerCase()!=="map")return false;a=c("img[usemap=#"+d+"]")[0];return!!a&&k(a)}return(/input|select|textarea|button|object/.test(b)?!a.disabled:"a"==b?a.href||!isNaN(d):!isNaN(d))&&k(a)},tabbable:function(a){var b=c.attr(a,"tabindex");return(isNaN(b)||b>=0)&&c(a).is(":focusable")}});
+c(function(){var a=document.body,b=a.appendChild(b=document.createElement("div"));c.extend(b.style,{minHeight:"100px",height:"auto",padding:0,borderWidth:0});c.support.minHeight=b.offsetHeight===100;c.support.selectstart="onselectstart"in b;a.removeChild(b).style.display="none"});c.extend(c.ui,{plugin:{add:function(a,b,d){a=c.ui[a].prototype;for(var e in d){a.plugins[e]=a.plugins[e]||[];a.plugins[e].push([b,d[e]])}},call:function(a,b,d){if((b=a.plugins[b])&&a.element[0].parentNode)for(var e=0;e<b.length;e++)a.options[b[e][0]]&&
+b[e][1].apply(a.element,d)}},contains:function(a,b){return document.compareDocumentPosition?a.compareDocumentPosition(b)&16:a!==b&&a.contains(b)},hasScroll:function(a,b){if(c(a).css("overflow")==="hidden")return false;b=b&&b==="left"?"scrollLeft":"scrollTop";var d=false;if(a[b]>0)return true;a[b]=1;d=a[b]>0;a[b]=0;return d},isOverAxis:function(a,b,d){return a>b&&a<b+d},isOver:function(a,b,d,e,h,i){return c.ui.isOverAxis(a,d,h)&&c.ui.isOverAxis(b,e,i)}})}})(jQuery);
+;/*!
+ * jQuery UI Widget 1.8.12
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Widget
  */
-(function(b){var a=b.fn.remove;b.fn.remove=function(c,d){return this.each(function(){if(!d){if(!c||b.filter(c,[this]).length){b("*",this).add(this).each(function(){b(this).triggerHandler("remove")})}}return a.call(b(this),c,d)})};b.widget=function(d,f,c){var e=d.split(".")[0],h;d=d.split(".")[1];h=e+"-"+d;if(!c){c=f;f=b.Widget}b.expr[":"][h]=function(i){return !!b.data(i,d)};b[e]=b[e]||{};b[e][d]=function(i,j){if(arguments.length){this._createWidget(i,j)}};var g=new f();g.options=b.extend({},g.options);b[e][d].prototype=b.extend(true,g,{namespace:e,widgetName:d,widgetEventPrefix:b[e][d].prototype.widgetEventPrefix||d,widgetBaseClass:h},c);b.widget.bridge(d,b[e][d])};b.widget.bridge=function(d,c){b.fn[d]=function(g){var e=typeof g==="string",f=Array.prototype.slice.call(arguments,1),h=this;g=!e&&f.length?b.extend.apply(null,[true,g].concat(f)):g;if(e&&g.substring(0,1)==="_"){return h}if(e){this.each(function(){var i=b.data(this,d),j=i&&b.isFunction(i[g])?i[g].apply(i,f):i;if(j!==i&&j!==undefined){h=j;return false}})}else{this.each(function(){var i=b.data(this,d);if(i){if(g){i.option(g)}i._init()}else{b.data(this,d,new c(g,this))}})}return h}};b.Widget=function(c,d){if(arguments.length){this._createWidget(c,d)}};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(d,e){this.element=b(e).data(this.widgetName,this);this.options=b.extend(true,{},this.options,b.metadata&&b.metadata.get(e)[this.widgetName],d);var c=this;this.element.bind("remove."+this.widgetName,function(){c.destroy()});this._create();this._init()},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled")},widget:function(){return this.element},option:function(e,f){var d=e,c=this;if(arguments.length===0){return b.extend({},c.options)}if(typeof e==="string"){if(f===undefined){return this.options[e]}d={};d[e]=f}b.each(d,function(g,h){c._setOption(g,h)});return c},_setOption:function(c,d){this.options[c]=d;if(c==="disabled"){this.widget()[d?"addClass":"removeClass"](this.widgetBaseClass+"-disabled "+this.namespace+"-state-disabled").attr("aria-disabled",d)}return this},enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(d,e,f){var h=this.options[d];e=b.Event(e);e.type=(d===this.widgetEventPrefix?d:this.widgetEventPrefix+d).toLowerCase();f=f||{};if(e.originalEvent){for(var c=b.event.props.length,g;c;){g=b.event.props[--c];e[g]=e.originalEvent[g]}}this.element.trigger(e,f);return !(b.isFunction(h)&&h.call(this.element[0],e,f)===false||e.isDefaultPrevented())}}})(jQuery);;/*!
- * jQuery UI Mouse 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Mouse
- *
- * Depends:
- *	jquery.ui.widget.js
- */
/*
- * jQuery UI Mouse 1.8
+(function(b,j){if(b.cleanData){var k=b.cleanData;b.cleanData=function(a){for(var c=0,d;(d=a[c])!=null;c++)b(d).triggerHandler("remove");k(a)}}else{var l=b.fn.remove;b.fn.remove=function(a,c){return this.each(function(){if(!c)if(!a||b.filter(a,[this]).length)b("*",this).add([this]).each(function(){b(this).triggerHandler("remove")});return l.call(b(this),a,c)})}}b.widget=function(a,c,d){var e=a.split(".")[0],f;a=a.split(".")[1];f=e+"-"+a;if(!d){d=c;c=b.Widget}b.expr[":"][f]=function(h){return!!b.data(h,
+a)};b[e]=b[e]||{};b[e][a]=function(h,g){arguments.length&&this._createWidget(h,g)};c=new c;c.options=b.extend(true,{},c.options);b[e][a].prototype=b.extend(true,c,{namespace:e,widgetName:a,widgetEventPrefix:b[e][a].prototype.widgetEventPrefix||a,widgetBaseClass:f},d);b.widget.bridge(a,b[e][a])};b.widget.bridge=function(a,c){b.fn[a]=function(d){var e=typeof d==="string",f=Array.prototype.slice.call(arguments,1),h=this;d=!e&&f.length?b.extend.apply(null,[true,d].concat(f)):d;if(e&&d.charAt(0)==="_")return h;
+e?this.each(function(){var g=b.data(this,a),i=g&&b.isFunction(g[d])?g[d].apply(g,f):g;if(i!==g&&i!==j){h=i;return false}}):this.each(function(){var g=b.data(this,a);g?g.option(d||{})._init():b.data(this,a,new c(d,this))});return h}};b.Widget=function(a,c){arguments.length&&this._createWidget(a,c)};b.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",options:{disabled:false},_createWidget:function(a,c){b.data(c,this.widgetName,this);this.element=b(c);this.options=b.extend(true,{},this.options,
+this._getCreateOptions(),a);var d=this;this.element.bind("remove."+this.widgetName,function(){d.destroy()});this._create();this._trigger("create");this._init()},_getCreateOptions:function(){return b.metadata&&b.metadata.get(this.element[0])[this.widgetName]},_create:function(){},_init:function(){},destroy:function(){this.element.unbind("."+this.widgetName).removeData(this.widgetName);this.widget().unbind("."+this.widgetName).removeAttr("aria-disabled").removeClass(this.widgetBaseClass+"-disabled ui-state-disabled")},
+widget:function(){return this.element},option:function(a,c){var d=a;if(arguments.length===0)return b.extend({},this.options);if(typeof a==="string"){if(c===j)return this.options[a];d={};d[a]=c}this._setOptions(d);return this},_setOptions:function(a){var c=this;b.each(a,function(d,e){c._setOption(d,e)});return this},_setOption:function(a,c){this.options[a]=c;if(a==="disabled")this.widget()[c?"addClass":"removeClass"](this.widgetBaseClass+"-disabled ui-state-disabled").attr("aria-disabled",c);return this},
+enable:function(){return this._setOption("disabled",false)},disable:function(){return this._setOption("disabled",true)},_trigger:function(a,c,d){var e=this.options[a];c=b.Event(c);c.type=(a===this.widgetEventPrefix?a:this.widgetEventPrefix+a).toLowerCase();d=d||{};if(c.originalEvent){a=b.event.props.length;for(var f;a;){f=b.event.props[--a];c[f]=c.originalEvent[f]}}this.element.trigger(c,d);return!(b.isFunction(e)&&e.call(this.element[0],c,d)===false||c.isDefaultPrevented())}}})(jQuery);
+;/*!
+ * jQuery UI Mouse 1.8.12
  *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Mouse
  *
  * Depends:
  *	jquery.ui.widget.js
  */
-(function(a){a.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var b=this;this.element.bind("mousedown."+this.widgetName,function(c){return b._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(b._preventClickEvent){b._preventClickEvent=false;c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(d){d.originalEvent=d.originalEvent||{};if(d.originalEvent.mouseHandled){return}(this._mouseStarted&&this._mouseUp(d));this._mouseDownEvent=d;var c=this,e=(d.which==1),b=(typeof this.options.cancel=="string"?a(d.target).parents().add(d.target).filter(this.options.cancel).length:false);if(!e||b||!this._mouseCapture(d)){return true}this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet){this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay)}if(this._mouseDistanceMet(d)&&this._mouseDelayMet(d)){this._mouseStarted=(this._mouseStart(d)!==false);if(!this._mouseStarted){d.preventDefault();return true}}this._mouseMoveDelegate=function(f){return c._mouseMove(f)};this._mouseUpDelegate=function(f){return c._mouseUp(f)};a(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);(a.browser.safari||d.preventDefault());d.originalEvent.mouseHandled=true;return true},_mouseMove:function(b){if(a.browser.msie&&!b.button){return this._mouseUp(b)}if(this._mouseStarted){this._mouseDrag(b);return b.preventDefault()}if(this._mouseDistanceMet(b)&&this._mouseDelayMet(b)){this._mouseStarted=(this._mouseStart(this._mouseDownEvent,b)!==false);(this._mouseStarted?this._mouseDrag(b):this._mouseUp(b))}return !this._mouseStarted},_mouseUp:function(b){a(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);if(this._mouseStarted){this._mouseStarted=false;this._preventClickEvent=(b.target==this._mouseDownEvent.target);this._mouseStop(b)}return false},_mouseDistanceMet:function(b){return(Math.max(Math.abs(this._mouseDownEvent.pageX-b.pageX),Math.abs(this._mouseDownEvent.pageY-b.pageY))>=this.options.distance)},_mouseDelayMet:function(b){return this.mouseDelayMet},_mouseStart:function(b){},_mouseDrag:function(b){},_mouseStop:function(b){},_mouseCapture:function(b){return true}})})(jQuery);;/*
- * jQuery UI Position 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Position
- */
(function(f){f.ui=f.ui||{};var c=/left|center|right/,e="center",d=/top|center|bottom/,g="center",a=f.fn.position,b=f.fn.offset;f.fn.position=function(i){if(!i||!i.of){return a.apply(this,arguments)}i=f.extend({},i);var l=f(i.of),n=(i.collision||"flip").split(" "),m=i.offset?i.offset.split(" "):[0,0],k,h,j;if(i.of.nodeType===9){k=l.width();h=l.height();j={top:0,left:0}}else{if(i.of.scrollTo&&i.of.document){k=l.width();h=l.height();j={top:l.scrollTop(),left:l.scrollLeft()}}else{if(i.of.preventDefault){i.at="left top";k=h=0;j={top:i.of.pageY,left:i.of.pageX}}else{k=l.outerWidth();h=l.outerHeight();j=l.offset()}}}f.each(["my","at"],function(){var o=(i[this]||"").split(" ");if(o.length===1){o=c.test(o[0])?o.concat([g]):d.test(o[0])?[e].concat(o):[e,g]}o[0]=c.test(o[0])?o[0]:e;o[1]=d.test(o[1])?o[1]:g;i[this]=o});if(n.length===1){n[1]=n[0]}m[0]=parseInt(m[0],10)||0;if(m.length===1){m[1]=m[0]}m[1]=parseInt(m[1],10)||0;if(i.at[0]==="right"){j.left+=k}else{if(i.at[0]===e){j.left+=k/2}}if(i.at[1]==="bottom"){j.top+=h}else{if(i.at[1]===g){j.top+=h/2}}j.left+=m[0];j.top+=m[1];return this.each(function(){var r=f(this),q=r.outerWidth(),p=r.outerHeight(),o=f.extend({},j);if(i.my[0]==="right"){o.left-=q}else{if(i.my[0]===e){o.left-=q/2}}if(i.my[1]==="bottom"){o.top-=p}else{if(i.my[1]===g){o.top-=p/2}}f.each(["left","top"],function(t,s){if(f.ui.position[n[t]]){f.ui.position[n[t]][s](o,{targetWidth:k,targetHeight:h,elemWidth:q,elemHeight:p,offset:m,my:i.my,at:i.at})}});if(f.fn.bgiframe){r.bgiframe()}r.offset(f.extend(o,{using:i.using}))})};f.ui.position={fit:{left:function(h,i){var k=f(window),j=h.left+i.elemWidth-k.width()-k.scrollLeft();h.left=j>0?h.left-j:Math.max(0,h.left)},top:function(h,i){var k=f(window),j=h.top+i.elemHeight-k.height()-k.scrollTop();h.top=j>0?h.top-j:Math.max(0,h.top)}},flip:{left:function(i,j){if(j.at[0]==="center"){return}var l=f(window),k=i.left+j.elemWidth-l.width()-l.scrollLeft(),h=j.my[0]==="left"?-j.elemWidth:j.my[0]==="right"?j.elemWidth:0,m=-2*j.offset[0];i.left+=i.left<0?h+j.targetWidth+m:k>0?h-j.targetWidth+m:0},top:function(i,k){if(k.at[1]==="center"){return}var m=f(window),l=i.top+k.elemHeight-m.height()-m.scrollTop(),h=k.my[1]==="top"?-k.elemHeight:k.my[1]==="bottom"?k.elemHeight:0,j=k.at[1]==="top"?k.targetHeight:-k.targetHeight,n=-2*k.offset[1];i.top+=i.top<0?h+k.targetHeight+n:l>0?h+j+n:0}}};if(!f.offset.setOffset){f.offset.setOffset=function(l,i){if(/static/.test(f.curCSS(l,"position"))){l.style.position="relative"}var k=f(l),n=k.offset(),h=parseInt(f.curCSS(l,"top",true),10)||0,m=parseInt(f.curCSS(l,"left",true),10)||0,j={top:(i.top-n.top)+h,left:(i.left-n.left)+m};if("using" in i){i.using.call(l,j)}else{k.css(j)}};f.fn.offset=function(h){var i=this[0];if(!i||!i.ownerDocument){return null}if(h){return this.each(function(){f.offset.setOffset(this,h)})}return b.call(this)}}}(jQuery));;/*
- * jQuery UI Draggable 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Draggables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
(function(a){a.widget("ui.draggable",a.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper=="original"&&!(/^(?:r|a|f)/).test(this.element.css("position"))){this.element[0].style.position="relative"}(this.options.addClasses&&this.element.addClass("ui-draggable"));(this.options.disabled&&this.element.addClass("ui-draggable-disabled"));this._mouseInit()},destroy:function(){if(!this.element.data("draggable")){return}this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this},_mouseCapture:function(b){var c=this.options;if(this.helper||c.disabled||a(b.target).is(".ui-resizable-handle")){return false}this.handle=this._getHandle(b);if(!this.handle){return false}return true},_mouseStart:function(b){var c=this.options;this.helper=this._createHelper(b);this._cacheHelperProportions();if(a.ui.ddmanager){a.ui.ddmanager.current=this}this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};a.extend(this.offset,{click:{left:b.pageX-this.offset.left,top:b.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(b);this.originalPageX=b.pageX;this.originalPageY=b.pageY;(c.cursorAt&&this._adjustOffsetFromHelper(c.cursorAt));if(c.containment){this._setContainment()}if(this._trigger("start",b)===false){this._clear();return false}this._cacheHelperProportions();if(a.ui.ddmanager&&!c.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,b)}this.helper.addClass("ui-draggable-dragging");this._mouseDrag(b,true);return true},_mouseDrag:function(b,d){this.position=this._generatePosition(b);this.positionAbs=this._convertPositionTo("absolute");if(!d){var c=this._uiHash();if(this._trigger("drag",b,c)===false){this._mouseUp({});return false}this.position=c.position}if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}if(a.ui.ddmanager){a.ui.ddmanager.drag(this,b)}return false},_mouseStop:function(c){var d=false;if(a.ui.ddmanager&&!this.options.dropBehaviour){d=a.ui.ddmanager.drop(this,c)}if(this.dropped){d=this.dropped;this.dropped=false}if(!this.element[0]||!this.element[0].parentNode){return false}if((this.options.revert=="invalid"&&!d)||(this.options.revert=="valid"&&d)||this.options.revert===true||(a.isFunction(this.options.revert)&&this.options.revert.call(this.element,d))){var b=this;a(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){if(b._trigger("stop",c)!==false){b._clear()}})}else{if(this._trigger("stop",c)!==false){this._clear()}}return false},cancel:function(){if(this.helper.is(".ui-draggable-dragging")){this._mouseUp({})}else{this._clear()}return this},_getHandle:function(b){var c=!this.options.handle||!a(this.options.handle,this.element).length?true:false;a(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==b.target){c=true}});return c},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c])):(d.helper=="clone"?this.element.clone():this.element);if(!b.parents("body").length){b.appendTo((d.appendTo=="parent"?this.element[0].parentNode:d.appendTo))}if(b[0]!=this.element[0]&&!(/(fixed|absolute)/).test(b.css("position"))){b.css("position","absolute")}return b},_adjustOffsetFromHelper:function(b){if(typeof b=="string"){b=b.split(" ")}if(a.isArray(b)){b={left:+b[0],top:+b[1]||0}}if("left" in b){this.offset.click.left=b.left+this.margins.left}if("right" in b){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if("top" in b){this.offset.click.top=b.top+this.margins.top}if("bottom" in b){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.element.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.element.css("marginLeft"),10)||0),top:(parseInt(this.element.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)&&e.containment.constructor!=Array){var c=a(e.containment)[0];if(!c){return}var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}else{if(e.containment.constructor==Array){this.containment=e.containment}}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c)),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c))}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&a.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");if(this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval){this.helper.remove()}this.helper=null;this.cancelHelperRemoval=false},_trigger:function(b,c,d){d=d||this._uiHash();a.ui.plugin.call(this,b,[c,d]);if(b=="drag"){this.positionAbs=this._convertPositionTo("absolute")}return a.Widget.prototype._trigger.call(this,b,c,d)},plugins:{},_uiHash:function(b){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,offset:this.positionAbs}}});a.extend(a.ui.draggable,{version:"1.8"});a.ui.plugin.add("draggable","connectToSortable",{start:function(c,e){var d=a(this).data("draggable"),f=d.options,b=a.extend({},e,{item:d.element});d.sortables=[];a(f.connectToSortable).each(function(){var g=a.data(this,"sortable");if(g&&!g.options.disabled){d.sortables.push({instance:g,shouldRevert:g.options.revert});g._refreshItems();g._trigger("activate",c,b)}})},stop:function(c,e){var d=a(this).data("draggable"),b=a.extend({},e,{item:d.element});a.each(d.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;d.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert){this.instance.options.revert=true}this.instance._mouseStop(c);this.instance.options.helper=this.instance.options._helper;if(d.options.helper=="original"){this.instance.currentItem.css({top:"auto",left:"auto"})}}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",c,b)}})},drag:function(c,f){var e=a(this).data("draggable"),b=this;var d=function(i){var n=this.offset.click.top,m=this.offset.click.left;var g=this.positionAbs.top,k=this.positionAbs.left;var j=i.height,l=i.width;var p=i.top,h=i.left;return a.ui.isOver(g+n,k+m,p,h,j,l)};a.each(e.sortables,function(g){this.instance.positionAbs=e.positionAbs;this.instance.helperProportions=e.helperProportions;this.instance.offset.click=e.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=a(b).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return f.helper[0]};c.target=this.instance.currentItem[0];this.instance._mouseCapture(c,true);this.instance._mouseStart(c,true,true);this.instance.offset.click.top=e.offset.click.top;this.instance.offset.click.left=e.offset.click.left;this.instance.offset.parent.left-=e.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=e.offset.parent.top-this.instance.offset.parent.top;e._trigger("toSortable",c);e.dropped=this.instance.element;e.currentItem=e.element;this.instance.fromOutside=e}if(this.instance.currentItem){this.instance._mouseDrag(c)}}else{if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",c,this.instance._uiHash(this.instance));this.instance._mouseStop(c,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();if(this.instance.placeholder){this.instance.placeholder.remove()}e._trigger("fromSortable",c);e.dropped=false}}})}});a.ui.plugin.add("draggable","cursor",{start:function(c,d){var b=a("body"),e=a(this).data("draggable").options;if(b.css("cursor")){e._cursor=b.css("cursor")}b.css("cursor",e.cursor)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._cursor){a("body").css("cursor",d._cursor)}}});a.ui.plugin.add("draggable","iframeFix",{start:function(b,c){var d=a(this).data("draggable").options;a(d.iframeFix===true?"iframe":d.iframeFix).each(function(){a('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1000}).css(a(this).offset()).appendTo("body")})},stop:function(b,c){a("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});a.ui.plugin.add("draggable","opacity",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("opacity")){e._opacity=b.css("opacity")}b.css("opacity",e.opacity)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._opacity){a(c.helper).css("opacity",d._opacity)}}});a.ui.plugin.add("draggable","scroll",{start:function(c,d){var b=a(this).data("draggable");if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){b.overflowOffset=b.scrollParent.offset()}},drag:function(d,e){var c=a(this).data("draggable"),f=c.options,b=false;if(c.scrollParent[0]!=document&&c.scrollParent[0].tagName!="HTML"){if(!f.axis||f.axis!="x"){if((c.overflowOffset.top+c.scrollParent[0].offsetHeight)-d.pageY<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop+f.scrollSpeed}else{if(d.pageY-c.overflowOffset.top<f.scrollSensitivity){c.scrollParent[0].scrollTop=b=c.scrollParent[0].scrollTop-f.scrollSpeed}}}if(!f.axis||f.axis!="y"){if((c.overflowOffset.left+c.scrollParent[0].offsetWidth)-d.pageX<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft+f.scrollSpeed}else{if(d.pageX-c.overflowOffset.left<f.scrollSensitivity){c.scrollParent[0].scrollLeft=b=c.scrollParent[0].scrollLeft-f.scrollSpeed}}}}else{if(!f.axis||f.axis!="x"){if(d.pageY-a(document).scrollTop()<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-f.scrollSpeed)}else{if(a(window).height()-(d.pageY-a(document).scrollTop())<f.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+f.scrollSpeed)}}}if(!f.axis||f.axis!="y"){if(d.pageX-a(document).scrollLeft()<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-f.scrollSpeed)}else{if(a(window).width()-(d.pageX-a(document).scrollLeft())<f.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+f.scrollSpeed)}}}}if(b!==false&&a.ui.ddmanager&&!f.dropBehaviour){a.ui.ddmanager.prepareOffsets(c,d)}}});a.ui.plugin.add("draggable","snap",{start:function(c,d){var b=a(this).data("draggable"),e=b.options;b.snapElements=[];a(e.snap.constructor!=String?(e.snap.items||":data(draggable)"):e.snap).each(function(){var g=a(this);var f=g.offset();if(this!=b.element[0]){b.snapElements.push({item:this,width:g.outerWidth(),height:g.outerHeight(),top:f.top,left:f.left})}})},drag:function(u,p){var g=a(this).data("draggable"),q=g.options;var y=q.snapTolerance;var x=p.offset.left,w=x+g.helperProportions.width,f=p.offset.top,e=f+g.helperProportions.height;for(var v=g.snapElements.length-1;v>=0;v--){var s=g.snapElements[v].left,n=s+g.snapElements[v].width,m=g.snapElements[v].top,A=m+g.snapElements[v].height;if(!((s-y<x&&x<n+y&&m-y<f&&f<A+y)||(s-y<x&&x<n+y&&m-y<e&&e<A+y)||(s-y<w&&w<n+y&&m-y<f&&f<A+y)||(s-y<w&&w<n+y&&m-y<e&&e<A+y))){if(g.snapElements[v].snapping){(g.options.snap.release&&g.options.snap.release.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=false;continue}if(q.snapMode!="inner"){var c=Math.abs(m-e)<=y;var z=Math.abs(A-f)<=y;var j=Math.abs(s-w)<=y;var k=Math.abs(n-x)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m-g.helperProportions.height,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s-g.helperProportions.width}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n}).left-g.margins.left}}var h=(c||z||j||k);if(q.snapMode!="outer"){var c=Math.abs(m-f)<=y;var z=Math.abs(A-e)<=y;var j=Math.abs(s-x)<=y;var k=Math.abs(n-w)<=y;if(c){p.position.top=g._convertPositionTo("relative",{top:m,left:0}).top-g.margins.top}if(z){p.position.top=g._convertPositionTo("relative",{top:A-g.helperProportions.height,left:0}).top-g.margins.top}if(j){p.position.left=g._convertPositionTo("relative",{top:0,left:s}).left-g.margins.left}if(k){p.position.left=g._convertPositionTo("relative",{top:0,left:n-g.helperProportions.width}).left-g.margins.left}}if(!g.snapElements[v].snapping&&(c||z||j||k||h)){(g.options.snap.snap&&g.options.snap.snap.call(g.element,u,a.extend(g._uiHash(),{snapItem:g.snapElements[v].item})))}g.snapElements[v].snapping=(c||z||j||k||h)}}});a.ui.plugin.add("draggable","stack",{start:function(c,d){var f=a(this).data("draggable").options;var e=a.makeArray(a(f.stack)).sort(function(h,g){return(parseInt(a(h).css("zIndex"),10)||0)-(parseInt(a(g).css("zIndex"),10)||0)});if(!e.length){return}var b=parseInt(e[0].style.zIndex)||0;a(e).each(function(g){this.style.zIndex=b+g});this[0].style.zIndex=b+e.length}});a.ui.plugin.add("draggable","zIndex",{start:function(c,d){var b=a(d.helper),e=a(this).data("draggable").options;if(b.css("zIndex")){e._zIndex=b.css("zIndex")}b.css("zIndex",e.zIndex)},stop:function(b,c){var d=a(this).data("draggable").options;if(d._zIndex){a(c.helper).css("zIndex",d._zIndex)}}})})(jQuery);;/*
- * jQuery UI Droppable 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Droppables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.mouse.js
- *	jquery.ui.draggable.js
- */
(function(a){a.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var c=this.options,b=c.accept;this.isover=0;this.isout=1;this.accept=a.isFunction(b)?b:function(e){return e.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};a.ui.ddmanager.droppables[c.scope]=a.ui.ddmanager.droppables[c.scope]||[];a.ui.ddmanager.droppables[c.scope].push(this);(c.addClasses&&this.element.addClass("ui-droppable"))},destroy:function(){var b=a.ui.ddmanager.droppables[this.options.scope];for(var c=0;c<b.length;c++){if(b[c]==this){b.splice(c,1)}}this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(b,c){if(b=="accept"){this.accept=a.isFunction(c)?c:function(e){return e.is(c)}}a.Widget.prototype._setOption.apply(this,arguments)},_activate:function(c){var b=a.ui.ddmanager.current;if(this.options.activeClass){this.element.addClass(this.options.activeClass)}(b&&this._trigger("activate",c,this.ui(b)))},_deactivate:function(c){var b=a.ui.ddmanager.current;if(this.options.activeClass){this.element.removeClass(this.options.activeClass)}(b&&this._trigger("deactivate",c,this.ui(b)))},_over:function(c){var b=a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return}if(this.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.hoverClass){this.element.addClass(this.options.hoverClass)}this._trigger("over",c,this.ui(b))}},_out:function(c){var b=a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return}if(this.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.hoverClass){this.element.removeClass(this.options.hoverClass)}this._trigger("out",c,this.ui(b))}},_drop:function(c,d){var b=d||a.ui.ddmanager.current;if(!b||(b.currentItem||b.element)[0]==this.element[0]){return false}var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var f=a.data(this,"droppable");if(f.options.greedy&&!f.options.disabled&&f.options.scope==b.options.scope&&f.accept.call(f.element[0],(b.currentItem||b.element))&&a.ui.intersect(b,a.extend(f,{offset:f.element.offset()}),f.options.tolerance)){e=true;return false}});if(e){return false}if(this.accept.call(this.element[0],(b.currentItem||b.element))){if(this.options.activeClass){this.element.removeClass(this.options.activeClass)}if(this.options.hoverClass){this.element.removeClass(this.options.hoverClass)}this._trigger("drop",c,this.ui(b));return this.element}return false},ui:function(b){return{draggable:(b.currentItem||b.element),helper:b.helper,position:b.position,offset:b.positionAbs}}});a.extend(a.ui.droppable,{version:"1.8"});a.ui.intersect=function(q,j,o){if(!j.offset){return false}var e=(q.positionAbs||q.position.absolute).left,d=e+q.helperProportions.width,n=(q.positionAbs||q.position.absolute).top,m=n+q.helperProportions.height;var g=j.offset.left,c=g+j.proportions.width,p=j.offset.top,k=p+j.proportions.height;switch(o){case"fit":return(g<e&&d<c&&p<n&&m<k);break;case"intersect":return(g<e+(q.helperProportions.width/2)&&d-(q.helperProportions.width/2)<c&&p<n+(q.helperProportions.height/2)&&m-(q.helperProportions.height/2)<k);break;case"pointer":var h=((q.positionAbs||q.position.absolute).left+(q.clickOffset||q.offset.click).left),i=((q.positionAbs||q.position.absolute).top+(q.clickOffset||q.offset.click).top),f=a.ui.isOver(i,h,p,g,j.proportions.height,j.proportions.width);return f;break;case"touch":return((n>=p&&n<=k)||(m>=p&&m<=k)||(n<p&&m>k))&&((e>=g&&e<=c)||(d>=g&&d<=c)||(e<g&&d>c));break;default:return false;break}};a.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(e,g){var b=a.ui.ddmanager.droppables[e.options.scope]||[];var f=g?g.type:null;var h=(e.currentItem||e.element).find(":data(droppable)").andSelf();droppablesLoop:for(var d=0;d<b.length;d++){if(b[d].options.disabled||(e&&!b[d].accept.call(b[d].element[0],(e.currentItem||e.element)))){continue}for(var c=0;c<h.length;c++){if(h[c]==b[d].element[0]){b[d].proportions.height=0;continue droppablesLoop}}b[d].visible=b[d].element.css("display")!="none";if(!b[d].visible){continue}b[d].offset=b[d].element.offset();b[d].proportions={width:b[d].element[0].offsetWidth,height:b[d].element[0].offsetHeight};if(f=="mousedown"){b[d]._activate.call(b[d],g)}}},drop:function(b,c){var d=false;a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(!this.options){return}if(!this.options.disabled&&this.visible&&a.ui.intersect(b,this,this.options.tolerance)){d=d||this._drop.call(this,c)}if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],(b.currentItem||b.element))){this.isout=1;this.isover=0;this._deactivate.call(this,c)}});return d},drag:function(b,c){if(b.options.refreshPositions){a.ui.ddmanager.prepareOffsets(b,c)}a.each(a.ui.ddmanager.droppables[b.options.scope]||[],function(){if(this.options.disabled||this.greedyChild||!this.visible){return}var e=a.ui.intersect(b,this,this.options.tolerance);var g=!e&&this.isover==1?"isout":(e&&this.isover==0?"isover":null);if(!g){return}var f;if(this.options.greedy){var d=this.element.parents(":data(droppable):eq(0)");if(d.length){f=a.data(d[0],"droppable");f.greedyChild=(g=="isover"?1:0)}}if(f&&g=="isover"){f.isover=0;f.isout=1;f._out.call(f,c)}this[g]=1;this[g=="isout"?"isover":"isout"]=0;this[g=="isover"?"_over":"_out"].call(this,c);if(f&&g=="isout"){f.isout=0;f.isover=1;f._over.call(f,c)}})}}})(jQuery);;/*
- * jQuery UI Resizable 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Resizables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
(function(c){c.widget("ui.resizable",c.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1000},_create:function(){var e=this,j=this.options;this.element.addClass("ui-resizable");c.extend(this,{_aspectRatio:!!(j.aspectRatio),aspectRatio:j.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:j.helper||j.ghost||j.animate?j.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){if(/relative/.test(this.element.css("position"))&&c.browser.opera){this.element.css({position:"relative",top:"auto",left:"auto"})}this.element.wrap(c('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=j.handles||(!c(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all"){this.handles="n,e,s,w,se,sw,ne,nw"}var k=this.handles.split(",");this.handles={};for(var f=0;f<k.length;f++){var h=c.trim(k[f]),d="ui-resizable-"+h;var g=c('<div class="ui-resizable-handle '+d+'"></div>');if(/sw|se|ne|nw/.test(h)){g.css({zIndex:++j.zIndex})}if("se"==h){g.addClass("ui-icon ui-icon-gripsmall-diagonal-se")}this.handles[h]=".ui-resizable-"+h;this.element.append(g)}}this._renderAxis=function(p){p=p||this.element;for(var m in this.handles){if(this.handles[m].constructor==String){this.handles[m]=c(this.handles[m],this.element).show()}if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var n=c(this.handles[m],this.element),o=0;o=/sw|ne|nw|se|n|s/.test(m)?n.outerHeight():n.outerWidth();var l=["padding",/ne|nw|n/.test(m)?"Top":/se|sw|s/.test(m)?"Bottom":/^e$/.test(m)?"Right":"Left"].join("");p.css(l,o);this._proportionallyResize()}if(!c(this.handles[m]).length){continue}}};this._renderAxis(this.element);this._handles=c(".ui-resizable-handle",this.element).disableSelection();this._handles.mouseover(function(){if(!e.resizing){if(this.className){var i=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)}e.axis=i&&i[1]?i[1]:"se"}});if(j.autoHide){this._handles.hide();c(this.element).addClass("ui-resizable-autohide").hover(function(){c(this).removeClass("ui-resizable-autohide");e._handles.show()},function(){if(!e.resizing){c(this).addClass("ui-resizable-autohide");e._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var d=function(f){c(f).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};if(this.elementIsWrapper){d(this.element);var e=this.element;e.after(this.originalElement.css({position:e.css("position"),width:e.outerWidth(),height:e.outerHeight(),top:e.css("top"),left:e.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);d(this.originalElement);return this},_mouseCapture:function(e){var f=false;for(var d in this.handles){if(c(this.handles[d])[0]==e.target){f=true}}return !this.options.disabled&&f},_mouseStart:function(f){var i=this.options,e=this.element.position(),d=this.element;this.resizing=true;this.documentScroll={top:c(document).scrollTop(),left:c(document).scrollLeft()};if(d.is(".ui-draggable")||(/absolute/).test(d.css("position"))){d.css({position:"absolute",top:e.top,left:e.left})}if(c.browser.opera&&(/relative/).test(d.css("position"))){d.css({position:"relative",top:"auto",left:"auto"})}this._renderProxy();var j=b(this.helper.css("left")),g=b(this.helper.css("top"));if(i.containment){j+=c(i.containment).scrollLeft()||0;g+=c(i.containment).scrollTop()||0}this.offset=this.helper.offset();this.position={left:j,top:g};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:j,top:g};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:f.pageX,top:f.pageY};this.aspectRatio=(typeof i.aspectRatio=="number")?i.aspectRatio:((this.originalSize.width/this.originalSize.height)||1);var h=c(".ui-resizable-"+this.axis).css("cursor");c("body").css("cursor",h=="auto"?this.axis+"-resize":h);d.addClass("ui-resizable-resizing");this._propagate("start",f);return true},_mouseDrag:function(d){var g=this.helper,f=this.options,l={},p=this,i=this.originalMousePosition,m=this.axis;var q=(d.pageX-i.left)||0,n=(d.pageY-i.top)||0;var h=this._change[m];if(!h){return false}var k=h.apply(this,[d,q,n]),j=c.browser.msie&&c.browser.version<7,e=this.sizeDiff;if(this._aspectRatio||d.shiftKey){k=this._updateRatio(k,d)}k=this._respectSize(k,d);this._propagate("resize",d);g.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});if(!this._helper&&this._proportionallyResizeElements.length){this._proportionallyResize()}this._updateCache(k);this._trigger("resize",d,this.ui());return false},_mouseStop:function(g){this.resizing=false;var h=this.options,l=this;if(this._helper){var f=this._proportionallyResizeElements,d=f.length&&(/textarea/i).test(f[0].nodeName),e=d&&c.ui.hasScroll(f[0],"left")?0:l.sizeDiff.height,j=d?0:l.sizeDiff.width;var m={width:(l.size.width-j),height:(l.size.height-e)},i=(parseInt(l.element.css("left"),10)+(l.position.left-l.originalPosition.left))||null,k=(parseInt(l.element.css("top"),10)+(l.position.top-l.originalPosition.top))||null;if(!h.animate){this.element.css(c.extend(m,{top:k,left:i}))}l.helper.height(l.size.height);l.helper.width(l.size.width);if(this._helper&&!h.animate){this._proportionallyResize()}}c("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");this._propagate("stop",g);if(this._helper){this.helper.remove()}return false},_updateCache:function(d){var e=this.options;this.offset=this.helper.offset();if(a(d.left)){this.position.left=d.left}if(a(d.top)){this.position.top=d.top}if(a(d.height)){this.size.height=d.height}if(a(d.width)){this.size.width=d.width}},_updateRatio:function(g,f){var h=this.options,i=this.position,e=this.size,d=this.axis;if(g.height){g.width=(e.height*this.aspectRatio)}else{if(g.width){g.height=(e.width/this.aspectRatio)}}if(d=="sw"){g.left=i.left+(e.width-g.width);g.top=null}if(d=="nw"){g.top=i.top+(e.height-g.height);g.left=i.left+(e.width-g.width)}return g},_respectSize:function(k,f){var i=this.helper,h=this.options,q=this._aspectRatio||f.shiftKey,p=this.axis,s=a(k.width)&&h.maxWidth&&(h.maxWidth<k.width),l=a(k.height)&&h.maxHeight&&(h.maxHeight<k.height),g=a(k.width)&&h.minWidth&&(h.minWidth>k.width),r=a(k.height)&&h.minHeight&&(h.minHeight>k.height);if(g){k.width=h.minWidth}if(r){k.height=h.minHeight}if(s){k.width=h.maxWidth}if(l){k.height=h.maxHeight}var e=this.originalPosition.left+this.originalSize.width,n=this.position.top+this.size.height;var j=/sw|nw|w/.test(p),d=/nw|ne|n/.test(p);if(g&&j){k.left=e-h.minWidth}if(s&&j){k.left=e-h.maxWidth}if(r&&d){k.top=n-h.minHeight}if(l&&d){k.top=n-h.maxHeight}var m=!k.width&&!k.height;if(m&&!k.left&&k.top){k.top=null}else{if(m&&!k.top&&k.left){k.left=null}}return k},_proportionallyResize:function(){var j=this.options;if(!this._proportionallyResizeElements.length){return}var f=this.helper||this.element;for(var e=0;e<this._proportionallyResizeElements.length;e++){var g=this._proportionallyResizeElements[e];if(!this.borderDif){var d=[g.css("borderTopWidth"),g.css("borderRightWidth"),g.css("borderBottomWidth"),g.css("borderLeftWidth")],h=[g.css("paddingTop"),g.css("paddingRight"),g.css("paddingBottom"),g.css("paddingLeft")];this.borderDif=c.map(d,function(k,m){var l=parseInt(k,10)||0,n=parseInt(h[m],10)||0;return l+n})}if(c.browser.msie&&!(!(c(f).is(":hidden")||c(f).parents(":hidden").length))){continue}g.css({height:(f.height()-this.borderDif[0]-this.borderDif[2])||0,width:(f.width()-this.borderDif[1]-this.borderDif[3])||0})}},_renderProxy:function(){var e=this.element,h=this.options;this.elementOffset=e.offset();if(this._helper){this.helper=this.helper||c('<div style="overflow:hidden;"></div>');var d=c.browser.msie&&c.browser.version<7,f=(d?1:0),g=(d?2:-1);this.helper.addClass(this._helper).css({width:this.element.outerWidth()+g,height:this.element.outerHeight()+g,position:"absolute",left:this.elementOffset.left-f+"px",top:this.elementOffset.top-f+"px",zIndex:++h.zIndex});this.helper.appendTo("body").disableSelection()}else{this.helper=this.element}},_change:{e:function(f,e,d){return{width:this.originalSize.width+e}},w:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{left:h.left+e,width:f.width-e}},n:function(g,e,d){var i=this.options,f=this.originalSize,h=this.originalPosition;return{top:h.top+d,height:f.height-d}},s:function(f,e,d){return{height:this.originalSize.height+d}},se:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},sw:function(f,e,d){return c.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[f,e,d]))},ne:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[f,e,d]))},nw:function(f,e,d){return c.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[f,e,d]))}},_propagate:function(e,d){c.ui.plugin.call(this,e,[d,this.ui()]);(e!="resize"&&this._trigger(e,d,this.ui()))},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}});c.extend(c.ui.resizable,{version:"1.8"});c.ui.plugin.add("resizable","alsoResize",{start:function(e,f){var d=c(this).data("resizable"),h=d.options;var g=function(i){c(i).each(function(){c(this).data("resizable-alsoresize",{width:parseInt(c(this).width(),10),height:parseInt(c(this).height(),10),left:parseInt(c(this).css("left"),10),top:parseInt(c(this).css("top"),10)})})};if(typeof(h.alsoResize)=="object"&&!h.alsoResize.parentNode){if(h.alsoResize.length){h.alsoResize=h.alsoResize[0];g(h.alsoResize)}else{c.each(h.alsoResize,function(i,j){g(i)})}}else{g(h.alsoResize)}},resize:function(f,h){var e=c(this).data("resizable"),i=e.options,g=e.originalSize,k=e.originalPosition;var j={height:(e.size.height-g.height)||0,width:(e.size.width-g.width)||0,top:(e.position.top-k.top)||0,left:(e.position.left-k.left)||0},d=function(l,m){c(l).each(function(){var p=c(this),q=c(this).data("resizable-alsoresize"),o={},n=m&&m.length?m:["width","height","top","left"];c.each(n||["width","height","top","left"],function(r,t){var s=(q[t]||0)+(j[t]||0);if(s&&s>=0){o[t]=s||null}});if(/relative/.test(p.css("position"))&&c.browser.opera){e._revertToRelativePosition=true;p.css({position:"absolute",top:"auto",left:"auto"})}p.css(o)})};if(typeof(i.alsoResize)=="object"&&!i.alsoResize.nodeType){c.each(i.alsoResize,function(l,m){d(l,m)})}else{d(i.alsoResize)}},stop:function(e,f){var d=c(this).data("resizable");if(d._revertToRelativePosition&&c.browser.opera){d._revertToRelativePosition=false;el.css({position:"relative"})}c(this).removeData("resizable-alsoresize-start")}});c.ui.plugin.add("resizable","animate",{stop:function(h,m){var n=c(this).data("resizable"),i=n.options;var g=n._proportionallyResizeElements,d=g.length&&(/textarea/i).test(g[0].nodeName),e=d&&c.ui.hasScroll(g[0],"left")?0:n.sizeDiff.height,k=d?0:n.sizeDiff.width;var f={width:(n.size.width-k),height:(n.size.height-e)},j=(parseInt(n.element.css("left"),10)+(n.position.left-n.originalPosition.left))||null,l=(parseInt(n.element.css("top"),10)+(n.position.top-n.originalPosition.top))||null;n.element.animate(c.extend(f,l&&j?{top:l,left:j}:{}),{duration:i.animateDuration,easing:i.animateEasing,step:function(){var o={width:parseInt(n.element.css("width"),10),height:parseInt(n.element.css("height"),10),top:parseInt(n.element.css("top"),10),left:parseInt(n.element.css("left"),10)};if(g&&g.length){c(g[0]).css({width:o.width,height:o.height})}n._updateCache(o);n._propagate("resize",h)}})}});c.ui.plugin.add("resizable","containment",{start:function(e,q){var s=c(this).data("resizable"),i=s.options,k=s.element;var f=i.containment,j=(f instanceof c)?f.get(0):(/parent/.test(f))?k.parent().get(0):f;if(!j){return}s.containerElement=c(j);if(/document/.test(f)||f==document){s.containerOffset={left:0,top:0};s.containerPosition={left:0,top:0};s.parentData={element:c(document),left:0,top:0,width:c(document).width(),height:c(document).height()||document.body.parentNode.scrollHeight}}else{var m=c(j),h=[];c(["Top","Right","Left","Bottom"]).each(function(p,o){h[p]=b(m.css("padding"+o))});s.containerOffset=m.offset();s.containerPosition=m.position();s.containerSize={height:(m.innerHeight()-h[3]),width:(m.innerWidth()-h[1])};var n=s.containerOffset,d=s.containerSize.height,l=s.containerSize.width,g=(c.ui.hasScroll(j,"left")?j.scrollWidth:l),r=(c.ui.hasScroll(j)?j.scrollHeight:d);s.parentData={element:j,left:n.left,top:n.top,width:g,height:r}}},resize:function(f,p){var s=c(this).data("resizable"),h=s.options,e=s.containerSize,n=s.containerOffset,l=s.size,m=s.position,q=s._aspectRatio||f.shiftKey,d={top:0,left:0},g=s.containerElement;if(g[0]!=document&&(/static/).test(g.css("position"))){d=n}if(m.left<(s._helper?n.left:0)){s.size.width=s.size.width+(s._helper?(s.position.left-n.left):(s.position.left-d.left));if(q){s.size.height=s.size.width/h.aspectRatio}s.position.left=h.helper?n.left:0}if(m.top<(s._helper?n.top:0)){s.size.height=s.size.height+(s._helper?(s.position.top-n.top):s.position.top);if(q){s.size.width=s.size.height*h.aspectRatio}s.position.top=s._helper?n.top:0}s.offset.left=s.parentData.left+s.position.left;s.offset.top=s.parentData.top+s.position.top;var k=Math.abs((s._helper?s.offset.left-d.left:(s.offset.left-d.left))+s.sizeDiff.width),r=Math.abs((s._helper?s.offset.top-d.top:(s.offset.top-n.top))+s.sizeDiff.height);var j=s.containerElement.get(0)==s.element.parent().get(0),i=/relative|absolute/.test(s.containerElement.css("position"));if(j&&i){k-=s.parentData.left}if(k+s.size.width>=s.parentData.width){s.size.width=s.parentData.width-k;if(q){s.size.height=s.size.width/s.aspectRatio}}if(r+s.size.height>=s.parentData.height){s.size.height=s.parentData.height-r;if(q){s.size.width=s.size.height*s.aspectRatio}}},stop:function(e,m){var p=c(this).data("resizable"),f=p.options,k=p.position,l=p.containerOffset,d=p.containerPosition,g=p.containerElement;var i=c(p.helper),q=i.offset(),n=i.outerWidth()-p.sizeDiff.width,j=i.outerHeight()-p.sizeDiff.height;if(p._helper&&!f.animate&&(/relative/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}if(p._helper&&!f.animate&&(/static/).test(g.css("position"))){c(this).css({left:q.left-d.left-l.left,width:n,height:j})}}});c.ui.plugin.add("resizable","ghost",{start:function(f,g){var d=c(this).data("resizable"),h=d.options,e=d.size;d.ghost=d.originalElement.clone();d.ghost.css({opacity:0.25,display:"block",position:"relative",height:e.height,width:e.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof h.ghost=="string"?h.ghost:"");d.ghost.appendTo(d.helper)},resize:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost){d.ghost.css({position:"relative",height:d.size.height,width:d.size.width})}},stop:function(e,f){var d=c(this).data("resizable"),g=d.options;if(d.ghost&&d.helper){d.helper.get(0).removeChild(d.ghost.get(0))}}});c.ui.plugin.add("resizable","grid",{resize:function(d,l){var n=c(this).data("resizable"),g=n.options,j=n.size,h=n.originalSize,i=n.originalPosition,m=n.axis,k=g._aspectRatio||d.shiftKey;g.grid=typeof g.grid=="number"?[g.grid,g.grid]:g.grid;var f=Math.round((j.width-h.width)/(g.grid[0]||1))*(g.grid[0]||1),e=Math.round((j.height-h.height)/(g.grid[1]||1))*(g.grid[1]||1);if(/^(se|s|e)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e}else{if(/^(ne)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e}else{if(/^(sw)$/.test(m)){n.size.width=h.width+f;n.size.height=h.height+e;n.position.left=i.left-f}else{n.size.width=h.width+f;n.size.height=h.height+e;n.position.top=i.top-e;n.position.left=i.left-f}}}}});var b=function(d){return parseInt(d,10)||0};var a=function(d){return !isNaN(parseInt(d,10))}})(jQuery);;/*
- * jQuery UI Selectable 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Selectables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
(function(a){a.widget("ui.selectable",a.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var b=this;this.element.addClass("ui-selectable");this.dragged=false;var c;this.refresh=function(){c=a(b.options.filter,b.element[0]);c.each(function(){var d=a(this);var e=d.offset();a.data(this,"selectable-item",{element:this,$element:d,left:e.left,top:e.top,right:e.left+d.outerWidth(),bottom:e.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=c.addClass("ui-selectee");this._mouseInit();this.helper=a(document.createElement("div")).css({border:"1px dotted black"}).addClass("ui-selectable-helper")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(d){var b=this;this.opos=[d.pageX,d.pageY];if(this.options.disabled){return}var c=this.options;this.selectees=a(c.filter,this.element[0]);this._trigger("start",d);a(c.appendTo).append(this.helper);this.helper.css({"z-index":100,position:"absolute",left:d.clientX,top:d.clientY,width:0,height:0});if(c.autoRefresh){this.refresh()}this.selectees.filter(".ui-selected").each(function(){var e=a.data(this,"selectable-item");e.startselected=true;if(!d.metaKey){e.$element.removeClass("ui-selected");e.selected=false;e.$element.addClass("ui-unselecting");e.unselecting=true;b._trigger("unselecting",d,{unselecting:e.element})}});a(d.target).parents().andSelf().each(function(){var e=a.data(this,"selectable-item");if(e){e.$element.removeClass("ui-unselecting").addClass("ui-selecting");e.unselecting=false;e.selecting=true;e.selected=true;b._trigger("selecting",d,{selecting:e.element});return false}})},_mouseDrag:function(i){var c=this;this.dragged=true;if(this.options.disabled){return}var e=this.options;var d=this.opos[0],h=this.opos[1],b=i.pageX,g=i.pageY;if(d>b){var f=b;b=d;d=f}if(h>g){var f=g;g=h;h=f}this.helper.css({left:d,top:h,width:b-d,height:g-h});this.selectees.each(function(){var j=a.data(this,"selectable-item");if(!j||j.element==c.element[0]){return}var k=false;if(e.tolerance=="touch"){k=(!(j.left>b||j.right<d||j.top>g||j.bottom<h))}else{if(e.tolerance=="fit"){k=(j.left>d&&j.right<b&&j.top>h&&j.bottom<g)}}if(k){if(j.selected){j.$element.removeClass("ui-selected");j.selected=false}if(j.unselecting){j.$element.removeClass("ui-unselecting");j.unselecting=false}if(!j.selecting){j.$element.addClass("ui-selecting");j.selecting=true;c._trigger("selecting",i,{selecting:j.element})}}else{if(j.selecting){if(i.metaKey&&j.startselected){j.$element.removeClass("ui-selecting");j.selecting=false;j.$element.addClass("ui-selected");j.selected=true}else{j.$element.removeClass("ui-selecting");j.selecting=false;if(j.startselected){j.$element.addClass("ui-unselecting");j.unselecting=true}c._trigger("unselecting",i,{unselecting:j.element})}}if(j.selected){if(!i.metaKey&&!j.startselected){j.$element.removeClass("ui-selected");j.selected=false;j.$element.addClass("ui-unselecting");j.unselecting=true;c._trigger("unselecting",i,{unselecting:j.element})}}}});return false},_mouseStop:function(d){var b=this;this.dragged=false;var c=this.options;a(".ui-unselecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-unselecting");e.unselecting=false;e.startselected=false;b._trigger("unselected",d,{unselected:e.element})});a(".ui-selecting",this.element[0]).each(function(){var e=a.data(this,"selectable-item");e.$element.removeClass("ui-selecting").addClass("ui-selected");e.selecting=false;e.selected=true;e.startselected=true;b._trigger("selected",d,{selected:e.element})});this._trigger("stop",d);this.helper.remove();return false}});a.extend(a.ui.selectable,{version:"1.8"})})(jQuery);;/*
- * jQuery UI Sortable 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Sortables
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
(function(a){a.widget("ui.sortable",a.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1000},_create:function(){var b=this.options;this.containerCache={};this.element.addClass("ui-sortable");this.refresh();this.floating=this.items.length?(/left|right/).test(this.items[0].item.css("float")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var b=this.items.length-1;b>=0;b--){this.items[b].item.removeData("sortable-item")}return this},_mouseCapture:function(e,f){if(this.reverting){return false}if(this.options.disabled||this.options.type=="static"){return false}this._refreshItems(e);var d=null,c=this,b=a(e.target).parents().each(function(){if(a.data(this,"sortable-item")==c){d=a(this);return false}});if(a.data(e.target,"sortable-item")==c){d=a(e.target)}if(!d){return false}if(this.options.handle&&!f){var g=false;a(this.options.handle,d).find("*").andSelf().each(function(){if(this==e.target){g=true}});if(!g){return false}}this.currentItem=d;this._removeCurrentsFromItems();return true},_mouseStart:function(e,f,b){var g=this.options,c=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(e);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");a.extend(this.offset,{click:{left:e.pageX-this.offset.left,top:e.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(e);this.originalPageX=e.pageX;this.originalPageY=e.pageY;(g.cursorAt&&this._adjustOffsetFromHelper(g.cursorAt));this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};if(this.helper[0]!=this.currentItem[0]){this.currentItem.hide()}this._createPlaceholder();if(g.containment){this._setContainment()}if(g.cursor){if(a("body").css("cursor")){this._storedCursor=a("body").css("cursor")}a("body").css("cursor",g.cursor)}if(g.opacity){if(this.helper.css("opacity")){this._storedOpacity=this.helper.css("opacity")}this.helper.css("opacity",g.opacity)}if(g.zIndex){if(this.helper.css("zIndex")){this._storedZIndex=this.helper.css("zIndex")}this.helper.css("zIndex",g.zIndex)}if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){this.overflowOffset=this.scrollParent.offset()}this._trigger("start",e,this._uiHash());if(!this._preserveHelperProportions){this._cacheHelperProportions()}if(!b){for(var d=this.containers.length-1;d>=0;d--){this.containers[d]._trigger("activate",e,c._uiHash(this))}}if(a.ui.ddmanager){a.ui.ddmanager.current=this}if(a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,e)}this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(e);return true},_mouseDrag:function(f){this.position=this._generatePosition(f);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs){this.lastPositionAbs=this.positionAbs}if(this.options.scroll){var g=this.options,b=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if((this.overflowOffset.top+this.scrollParent[0].offsetHeight)-f.pageY<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop+g.scrollSpeed}else{if(f.pageY-this.overflowOffset.top<g.scrollSensitivity){this.scrollParent[0].scrollTop=b=this.scrollParent[0].scrollTop-g.scrollSpeed}}if((this.overflowOffset.left+this.scrollParent[0].offsetWidth)-f.pageX<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft+g.scrollSpeed}else{if(f.pageX-this.overflowOffset.left<g.scrollSensitivity){this.scrollParent[0].scrollLeft=b=this.scrollParent[0].scrollLeft-g.scrollSpeed}}}else{if(f.pageY-a(document).scrollTop()<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()-g.scrollSpeed)}else{if(a(window).height()-(f.pageY-a(document).scrollTop())<g.scrollSensitivity){b=a(document).scrollTop(a(document).scrollTop()+g.scrollSpeed)}}if(f.pageX-a(document).scrollLeft()<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()-g.scrollSpeed)}else{if(a(window).width()-(f.pageX-a(document).scrollLeft())<g.scrollSensitivity){b=a(document).scrollLeft(a(document).scrollLeft()+g.scrollSpeed)}}}if(b!==false&&a.ui.ddmanager&&!g.dropBehaviour){a.ui.ddmanager.prepareOffsets(this,f)}}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y"){this.helper[0].style.left=this.position.left+"px"}if(!this.options.axis||this.options.axis!="x"){this.helper[0].style.top=this.position.top+"px"}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d],c=e.item[0],h=this._intersectsWithPointer(e);if(!h){continue}if(c!=this.currentItem[0]&&this.placeholder[h==1?"next":"prev"]()[0]!=c&&!a.ui.contains(this.placeholder[0],c)&&(this.options.type=="semi-dynamic"?!a.ui.contains(this.element[0],c):true)){this.direction=h==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(e)){this._rearrange(f,e)}else{break}this._trigger("change",f,this._uiHash());break}}this._contactContainers(f);if(a.ui.ddmanager){a.ui.ddmanager.drag(this,f)}this._trigger("sort",f,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(c,d){if(!c){return}if(a.ui.ddmanager&&!this.options.dropBehaviour){a.ui.ddmanager.drop(this,c)}if(this.options.revert){var b=this;var e=b.placeholder.offset();b.reverting=true;a(this.helper).animate({left:e.left-this.offset.parent.left-b.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:e.top-this.offset.parent.top-b.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){b._clear(c)})}else{this._clear(c,d)}return false},cancel:function(){var b=this;if(this.dragging){this._mouseUp();if(this.options.helper=="original"){this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}for(var c=this.containers.length-1;c>=0;c--){this.containers[c]._trigger("deactivate",null,b._uiHash(this));if(this.containers[c].containerCache.over){this.containers[c]._trigger("out",null,b._uiHash(this));this.containers[c].containerCache.over=0}}}if(this.placeholder[0].parentNode){this.placeholder[0].parentNode.removeChild(this.placeholder[0])}if(this.options.helper!="original"&&this.helper&&this.helper[0].parentNode){this.helper.remove()}a.extend(this,{helper:null,dragging:false,reverting:false,_noFinalSort:null});if(this.domPosition.prev){a(this.domPosition.prev).after(this.currentItem)}else{a(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};a(b).each(function(){var e=(a(d.item||this).attr(d.attribute||"id")||"").match(d.expression||(/(.+)[-=_](.+)/));if(e){c.push((d.key||e[1]+"[]")+"="+(d.key&&d.expression?e[1]:e[2]))}});return c.join("&")},toArray:function(d){var b=this._getItemsAsjQuery(d&&d.connected);var c=[];d=d||{};b.each(function(){c.push(a(d.item||this).attr(d.attribute||"id")||"")});return c},_intersectsWith:function(m){var e=this.positionAbs.left,d=e+this.helperProportions.width,k=this.positionAbs.top,j=k+this.helperProportions.height;var f=m.left,c=f+m.width,n=m.top,i=n+m.height;var o=this.offset.click.top,h=this.offset.click.left;var g=(k+o)>n&&(k+o)<i&&(e+h)>f&&(e+h)<c;if(this.options.tolerance=="pointer"||this.options.forcePointerForContainers||(this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>m[this.floating?"width":"height"])){return g}else{return(f<e+(this.helperProportions.width/2)&&d-(this.helperProportions.width/2)<c&&n<k+(this.helperProportions.height/2)&&j-(this.helperProportions.height/2)<i)}},_intersectsWithPointer:function(d){var e=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,d.top,d.height),c=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,d.left,d.width),g=e&&c,b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(!g){return false}return this.floating?(((f&&f=="right")||b=="down")?2:1):(b&&(b=="down"?2:1))},_intersectsWithSides:function(e){var c=a.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,e.top+(e.height/2),e.height),d=a.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,e.left+(e.width/2),e.width),b=this._getDragVerticalDirection(),f=this._getDragHorizontalDirection();if(this.floating&&f){return((f=="right"&&d)||(f=="left"&&!d))}else{return b&&((b=="down"&&c)||(b=="up"&&!c))}},_getDragVerticalDirection:function(){var b=this.positionAbs.top-this.lastPositionAbs.top;return b!=0&&(b>0?"down":"up")},_getDragHorizontalDirection:function(){var b=this.positionAbs.left-this.lastPositionAbs.left;return b!=0&&(b>0?"right":"left")},refresh:function(b){this._refreshItems(b);this.refreshPositions();return this},_connectWith:function(){var b=this.options;return b.connectWith.constructor==String?[b.connectWith]:b.connectWith},_getItemsAsjQuery:function(b){var l=this;var g=[];var e=[];var h=this._connectWith();if(h&&b){for(var d=h.length-1;d>=0;d--){var k=a(h[d]);for(var c=k.length-1;c>=0;c--){var f=a.data(k[c],"sortable");if(f&&f!=this&&!f.options.disabled){e.push([a.isFunction(f.options.items)?f.options.items.call(f.element):a(f.options.items,f.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),f])}}}}e.push([a.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):a(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),this]);for(var d=e.length-1;d>=0;d--){e[d][0].each(function(){g.push(this)})}return a(g)},_removeCurrentsFromItems:function(){var d=this.currentItem.find(":data(sortable-item)");for(var c=0;c<this.items.length;c++){for(var b=0;b<d.length;b++){if(d[b]==this.items[c].item[0]){this.items.splice(c,1)}}}},_refreshItems:function(b){this.items=[];this.containers=[this];var h=this.items;var p=this;var f=[[a.isFunction(this.options.items)?this.options.items.call(this.element[0],b,{item:this.currentItem}):a(this.options.items,this.element),this]];var l=this._connectWith();if(l){for(var e=l.length-1;e>=0;e--){var m=a(l[e]);for(var d=m.length-1;d>=0;d--){var g=a.data(m[d],"sortable");if(g&&g!=this&&!g.options.disabled){f.push([a.isFunction(g.options.items)?g.options.items.call(g.element[0],b,{item:this.currentItem}):a(g.options.items,g.element),g]);this.containers.push(g)}}}}for(var e=f.length-1;e>=0;e--){var k=f[e][1];var c=f[e][0];for(var d=0,n=c.length;d<n;d++){var o=a(c[d]);o.data("sortable-item",k);h.push({item:o,instance:k,width:0,height:0,left:0,top:0})}}},refreshPositions:function(b){if(this.offsetParent&&this.helper){this.offset.parent=this._getParentOffset()}for(var d=this.items.length-1;d>=0;d--){var e=this.items[d];var c=this.options.toleranceElement?a(this.options.toleranceElement,e.item):e.item;if(!b){e.width=c.outerWidth();e.height=c.outerHeight()}var f=c.offset();e.left=f.left;e.top=f.top}if(this.options.custom&&this.options.custom.refreshContainers){this.options.custom.refreshContainers.call(this)}else{for(var d=this.containers.length-1;d>=0;d--){var f=this.containers[d].element.offset();this.containers[d].containerCache.left=f.left;this.containers[d].containerCache.top=f.top;this.containers[d].containerCache.width=this.containers[d].element.outerWidth();this.containers[d].containerCache.height=this.containers[d].element.outerHeight()}}return this},_createPlaceholder:function(d){var b=d||this,e=b.options;if(!e.placeholder||e.placeholder.constructor==String){var c=e.placeholder;e.placeholder={element:function(){var f=a(document.createElement(b.currentItem[0].nodeName)).addClass(c||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!c){f.style.visibility="hidden"}return f},update:function(f,g){if(c&&!e.forcePlaceholderSize){return}if(!g.height()){g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10))}if(!g.width()){g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||0,10))}}}}b.placeholder=a(e.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);e.placeholder.update(b,b.placeholder)},_contactContainers:function(b){var d=null,k=null;for(var f=this.containers.length-1;f>=0;f--){if(a.ui.contains(this.currentItem[0],this.containers[f].element[0])){continue}if(this._intersectsWith(this.containers[f].containerCache)){if(d&&a.ui.contains(this.containers[f].element[0],d.element[0])){continue}d=this.containers[f];k=f}else{if(this.containers[f].containerCache.over){this.containers[f]._trigger("out",b,this._uiHash(this));this.containers[f].containerCache.over=0}}}if(!d){return}if(this.containers.length===1){this.containers[k]._trigger("over",b,this._uiHash(this));this.containers[k].containerCache.over=1}else{if(this.currentContainer!=this.containers[k]){var h=10000;var g=null;var c=this.positionAbs[this.containers[k].floating?"left":"top"];for(var e=this.items.length-1;e>=0;e--){if(!a.ui.contains(this.containers[k].element[0],this.items[e].item[0])){continue}var l=this.items[e][this.containers[k].floating?"left":"top"];if(Math.abs(l-c)<h){h=Math.abs(l-c);g=this.items[e]}}if(!g&&!this.options.dropOnEmpty){return}this.currentContainer=this.containers[k];g?this._rearrange(b,g,null,true):this._rearrange(b,null,this.containers[k].element,true);this._trigger("change",b,this._uiHash());this.containers[k]._trigger("change",b,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[k]._trigger("over",b,this._uiHash(this));this.containers[k].containerCache.over=1}}},_createHelper:function(c){var d=this.options;var b=a.isFunction(d.helper)?a(d.helper.apply(this.element[0],[c,this.currentItem])):(d.helper=="clone"?this.currentItem.clone():this.currentItem);if(!b.parents("body").length){a(d.appendTo!="parent"?d.appendTo:this.currentItem[0].parentNode)[0].appendChild(b[0])}if(b[0]==this.currentItem[0]){this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")}}if(b[0].style.width==""||d.forceHelperSize){b.width(this.currentItem.width())}if(b[0].style.height==""||d.forceHelperSize){b.height(this.currentItem.height())}return b},_adjustOffsetFromHelper:function(b){if(typeof b=="string"){b=b.split(" ")}if(a.isArray(b)){b={left:+b[0],top:+b[1]||0}}if("left" in b){this.offset.click.left=b.left+this.margins.left}if("right" in b){this.offset.click.left=this.helperProportions.width-b.right+this.margins.left}if("top" in b){this.offset.click.top=b.top+this.margins.top}if("bottom" in b){this.offset.click.top=this.helperProportions.height-b.bottom+this.margins.top}},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var b=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0])){b.left+=this.scrollParent.scrollLeft();b.top+=this.scrollParent.scrollTop()}if((this.offsetParent[0]==document.body)||(this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&a.browser.msie)){b={top:0,left:0}}return{top:b.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:b.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var b=this.currentItem.position();return{top:b.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:b.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else{return{top:0,left:0}}},_cacheMargins:function(){this.margins={left:(parseInt(this.currentItem.css("marginLeft"),10)||0),top:(parseInt(this.currentItem.css("marginTop"),10)||0)}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var e=this.options;if(e.containment=="parent"){e.containment=this.helper[0].parentNode}if(e.containment=="document"||e.containment=="window"){this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,a(e.containment=="document"?document:window).width()-this.helperProportions.width-this.margins.left,(a(e.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top]}if(!(/^(document|window|parent)$/).test(e.containment)){var c=a(e.containment)[0];var d=a(e.containment).offset();var b=(a(c).css("overflow")!="hidden");this.containment=[d.left+(parseInt(a(c).css("borderLeftWidth"),10)||0)+(parseInt(a(c).css("paddingLeft"),10)||0)-this.margins.left,d.top+(parseInt(a(c).css("borderTopWidth"),10)||0)+(parseInt(a(c).css("paddingTop"),10)||0)-this.margins.top,d.left+(b?Math.max(c.scrollWidth,c.offsetWidth):c.offsetWidth)-(parseInt(a(c).css("borderLeftWidth"),10)||0)-(parseInt(a(c).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,d.top+(b?Math.max(c.scrollHeight,c.offsetHeight):c.offsetHeight)-(parseInt(a(c).css("borderTopWidth"),10)||0)-(parseInt(a(c).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(f,h){if(!h){h=this.position}var c=f=="absolute"?1:-1;var e=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,g=(/(html|body)/i).test(b[0].tagName);return{top:(h.top+this.offset.relative.top*c+this.offset.parent.top*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(g?0:b.scrollTop()))*c)),left:(h.left+this.offset.relative.left*c+this.offset.parent.left*c-(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():g?0:b.scrollLeft())*c))}},_generatePosition:function(e){var h=this.options,b=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&a.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,i=(/(html|body)/i).test(b[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0])){this.offset.relative=this._getRelativeOffset()}var d=e.pageX;var c=e.pageY;if(this.originalPosition){if(this.containment){if(e.pageX-this.offset.click.left<this.containment[0]){d=this.containment[0]+this.offset.click.left}if(e.pageY-this.offset.click.top<this.containment[1]){c=this.containment[1]+this.offset.click.top}if(e.pageX-this.offset.click.left>this.containment[2]){d=this.containment[2]+this.offset.click.left}if(e.pageY-this.offset.click.top>this.containment[3]){c=this.containment[3]+this.offset.click.top}}if(h.grid){var g=this.originalPageY+Math.round((c-this.originalPageY)/h.grid[1])*h.grid[1];c=this.containment?(!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:(!(g-this.offset.click.top<this.containment[1])?g-h.grid[1]:g+h.grid[1])):g;var f=this.originalPageX+Math.round((d-this.originalPageX)/h.grid[0])*h.grid[0];d=this.containment?(!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:(!(f-this.offset.click.left<this.containment[0])?f-h.grid[0]:f+h.grid[0])):f}}return{top:(c-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():(i?0:b.scrollTop())))),left:(d-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(a.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():i?0:b.scrollLeft())))}},_rearrange:function(g,f,c,e){c?c[0].appendChild(this.placeholder[0]):f.item[0].parentNode.insertBefore(this.placeholder[0],(this.direction=="down"?f.item[0]:f.item[0].nextSibling));this.counter=this.counter?++this.counter:1;var d=this,b=this.counter;window.setTimeout(function(){if(b==d.counter){d.refreshPositions(!e)}},0)},_clear:function(d,e){this.reverting=false;var f=[],b=this;if(!this._noFinalSort&&this.currentItem[0].parentNode){this.placeholder.before(this.currentItem)}this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var c in this._storedCSS){if(this._storedCSS[c]=="auto"||this._storedCSS[c]=="static"){this._storedCSS[c]=""}}this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else{this.currentItem.show()}if(this.fromOutside&&!e){f.push(function(g){this._trigger("receive",g,this._uiHash(this.fromOutside))})}if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!e){f.push(function(g){this._trigger("update",g,this._uiHash())})}if(!a.ui.contains(this.element[0],this.currentItem[0])){if(!e){f.push(function(g){this._trigger("remove",g,this._uiHash())})}for(var c=this.containers.length-1;c>=0;c--){if(a.ui.contains(this.containers[c].element[0],this.currentItem[0])&&!e){f.push((function(g){return function(h){g._trigger("receive",h,this._uiHash(this))}}).call(this,this.containers[c]));f.push((function(g){return function(h){g._trigger("update",h,this._uiHash(this))}}).call(this,this.containers[c]))}}}for(var c=this.containers.length-1;c>=0;c--){if(!e){f.push((function(g){return function(h){g._trigger("deactivate",h,this._uiHash(this))}}).call(this,this.containers[c]))}if(this.containers[c].containerCache.over){f.push((function(g){return function(h){g._trigger("out",h,this._uiHash(this))}}).call(this,this.containers[c]));this.containers[c].containerCache.over=0}}if(this._storedCursor){a("body").css("cursor",this._storedCursor)}if(this._storedOpacity){this.helper.css("opacity",this._storedOpacity)}if(this._storedZIndex){this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex)}this.dragging=false;if(this.cancelHelperRemoval){if(!e){this._trigger("beforeStop",d,this._uiHash());for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}return false}if(!e){this._trigger("beforeStop",d,this._uiHash())}this.placeholder[0].parentNode.removeChild(this.placeholder[0]);if(this.helper[0]!=this.currentItem[0]){this.helper.remove()}this.helper=null;if(!e){for(var c=0;c<f.length;c++){f[c].call(this,d)}this._trigger("stop",d,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){if(a.Widget.prototype._trigger.apply(this,arguments)===false){this.cancel()}},_uiHash:function(c){var b=c||this;return{helper:b.helper,placeholder:b.placeholder||a([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:c?c.element:null}}});a.extend(a.ui.sortable,{version:"1.8"})})(jQuery);;/*
- * jQuery UI Accordion 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Accordion
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
(function(a){a.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()==location.href.toLowerCase()}},_create:function(){var d=this.options,b=this;this.running=0;this.element.addClass("ui-accordion ui-widget ui-helper-reset");if(this.element[0].nodeName=="UL"){this.element.children("li").addClass("ui-accordion-li-fix")}this.headers=this.element.find(d.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){a(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){a(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){a(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){a(this).removeClass("ui-state-focus")});this.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");if(d.navigation){var c=this.element.find("a").filter(d.navigationFilter);if(c.length){var e=c.closest(".ui-accordion-header");if(e.length){this.active=e}else{this.active=c.closest(".ui-accordion-content").prev()}}}this.active=this._findActive(this.active||d.active).toggleClass("ui-state-default").toggleClass("ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");this.active.next().addClass("ui-accordion-content-active");this._createIcons();if(a.browser.msie){this.element.find("a").css("zoom","1")}this.resize();this.element.attr("role","tablist");this.headers.attr("role","tab").bind("keydown",function(f){return b._keydown(f)}).next().attr("role","tabpanel");this.headers.not(this.active||"").attr("aria-expanded","false").attr("tabIndex","-1").next().hide();if(!this.active.length){this.headers.eq(0).attr("tabIndex","0")}else{this.active.attr("aria-expanded","true").attr("tabIndex","0")}if(!a.browser.safari){this.headers.find("a").attr("tabIndex","-1")}if(d.event){this.headers.bind((d.event)+".accordion",function(f){b._clickHandler.call(b,f,this);f.preventDefault()})}},_createIcons:function(){var b=this.options;if(b.icons){a("<span/>").addClass("ui-icon "+b.icons.header).prependTo(this.headers);this.active.find(".ui-icon").toggleClass(b.icons.header).toggleClass(b.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var c=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role").unbind(".accordion").removeData("accordion");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("tabindex");this.headers.find("a").removeAttr("tabindex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active");if(c.autoHeight||c.fillHeight){b.css("height","")}return this},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b=="active"){this.activate(c)}if(b=="icons"){this._destroyIcons();if(c){this._createIcons()}}},_keydown:function(e){var g=this.options,f=a.ui.keyCode;if(g.disabled||e.altKey||e.ctrlKey){return}var d=this.headers.length;var b=this.headers.index(e.target);var c=false;switch(e.keyCode){case f.RIGHT:case f.DOWN:c=this.headers[(b+1)%d];break;case f.LEFT:case f.UP:c=this.headers[(b-1+d)%d];break;case f.SPACE:case f.ENTER:this._clickHandler({target:e.target},e.target);e.preventDefault()}if(c){a(e.target).attr("tabIndex","-1");a(c).attr("tabIndex","0");c.focus();return false}return true},resize:function(){var d=this.options,c;if(d.fillSpace){if(a.browser.msie){var b=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}c=this.element.parent().height();if(a.browser.msie){this.element.parent().css("overflow",b)}this.headers.each(function(){c-=a(this).outerHeight(true)});this.headers.next().each(function(){a(this).height(Math.max(0,c-a(this).innerHeight()+a(this).height()))}).css("overflow","auto")}else{if(d.autoHeight){c=0;this.headers.next().each(function(){c=Math.max(c,a(this).height())}).height(c)}}return this},activate:function(b){this.options.active=b;var c=this._findActive(b)[0];this._clickHandler({target:c},c);return this},_findActive:function(b){return b?typeof b=="number"?this.headers.filter(":eq("+b+")"):this.headers.not(this.headers.not(b)):b===false?a([]):this.headers.filter(":eq(0)")},_clickHandler:function(b,f){var d=this.options;if(d.disabled){return}if(!b.target){if(!d.collapsible){return}this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").find(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var h=this.active.next(),e={options:d,newHeader:a([]),oldHeader:d.active,newContent:a([]),oldContent:h},c=(this.active=a([]));this._toggle(c,h,e);return}var g=a(b.currentTarget||f);var i=g[0]==this.active[0];d.active=d.collapsible&&i?false:a(".ui-accordion-header",this.element).index(g);if(this.running||(!d.collapsible&&i)){return}this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").find(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);if(!i){g.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").find(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);g.next().addClass("ui-accordion-content-active")}var c=g.next(),h=this.active.next(),e={options:d,newHeader:i&&d.collapsible?a([]):g,oldHeader:this.active,newContent:i&&d.collapsible?a([]):c,oldContent:h},j=this.headers.index(this.active[0])>this.headers.index(g[0]);this.active=i?a([]):g;this._toggle(c,h,e,i,j);return},_toggle:function(b,i,g,j,k){var d=this.options,m=this;this.toShow=b;this.toHide=i;this.data=g;var c=function(){if(!m){return}return m._completed.apply(m,arguments)};this._trigger("changestart",null,this.data);this.running=i.size()===0?b.size():i.size();if(d.animated){var f={};if(d.collapsible&&j){f={toShow:a([]),toHide:i,complete:c,down:k,autoHeight:d.autoHeight||d.fillSpace}}else{f={toShow:b,toHide:i,complete:c,down:k,autoHeight:d.autoHeight||d.fillSpace}}if(!d.proxied){d.proxied=d.animated}if(!d.proxiedDuration){d.proxiedDuration=d.duration}d.animated=a.isFunction(d.proxied)?d.proxied(f):d.proxied;d.duration=a.isFunction(d.proxiedDuration)?d.proxiedDuration(f):d.proxiedDuration;var l=a.ui.accordion.animations,e=d.duration,h=d.animated;if(h&&!l[h]&&!a.easing[h]){h="slide"}if(!l[h]){l[h]=function(n){this.slide(n,{easing:h,duration:e||700})}}l[h](f)}else{if(d.collapsible&&j){b.toggle()}else{i.hide();b.show()}c(true)}i.prev().attr("aria-expanded","false").attr("tabIndex","-1").blur();b.prev().attr("aria-expanded","true").attr("tabIndex","0").focus()},_completed:function(b){var c=this.options;this.running=b?0:--this.running;if(this.running){return}if(c.clearStyle){this.toShow.add(this.toHide).css({height:"",overflow:""})}this.toHide.removeClass("ui-accordion-content-active");this._trigger("change",null,this.data)}});a.extend(a.ui.accordion,{version:"1.8",animations:{slide:function(j,h){j=a.extend({easing:"swing",duration:300},j,h);if(!j.toHide.size()){j.toShow.animate({height:"show"},j);return}if(!j.toShow.size()){j.toHide.animate({height:"hide"},j);return}var c=j.toShow.css("overflow"),g=0,d={},f={},e=["height","paddingTop","paddingBottom"],b;var i=j.toShow;b=i[0].style.width;i.width(parseInt(i.parent().width(),10)-parseInt(i.css("paddingLeft"),10)-parseInt(i.css("paddingRight"),10)-(parseInt(i.css("borderLeftWidth"),10)||0)-(parseInt(i.css("borderRightWidth"),10)||0));a.each(e,function(k,m){f[m]="hide";var l=(""+a.css(j.toShow[0],m)).match(/^([\d+-.]+)(.*)$/);d[m]={value:l[1],unit:l[2]||"px"}});j.toShow.css({height:0,overflow:"hidden"}).show();j.toHide.filter(":hidden").each(j.complete).end().filter(":visible").animate(f,{step:function(k,l){if(l.prop=="height"){g=(l.end-l.start===0)?0:(l.now-l.start)/(l.end-l.start)}j.toShow[0].style[l.prop]=(g*d[l.prop].value)+d[l.prop].unit},duration:j.duration,easing:j.easing,complete:function(){if(!j.autoHeight){j.toShow.css("height","")}j.toShow.css("width",b);j.toShow.css({overflow:c});j.complete()}})},bounceslide:function(b){this.slide(b,{easing:b.down?"easeOutBounce":"swing",duration:b.down?1000:200})}}})})(jQuery);;/*
- * jQuery UI Autocomplete 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Autocomplete
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *	jquery.ui.position.js
- */
(function(a){a.widget("ui.autocomplete",{options:{minLength:1,delay:300},_create:function(){var b=this,c=this.element[0].ownerDocument;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(d){var e=a.ui.keyCode;switch(d.keyCode){case e.PAGE_UP:b._move("previousPage",d);break;case e.PAGE_DOWN:b._move("nextPage",d);break;case e.UP:b._move("previous",d);d.preventDefault();break;case e.DOWN:b._move("next",d);d.preventDefault();break;case e.ENTER:if(b.menu.active){d.preventDefault()}case e.TAB:if(!b.menu.active){return}b.menu.select();break;case e.ESCAPE:b.element.val(b.term);b.close(d);break;case e.SHIFT:case e.CONTROL:case 18:break;default:clearTimeout(b.searching);b.searching=setTimeout(function(){b.search(null,d)},b.options.delay);break}}).bind("focus.autocomplete",function(){b.previous=b.element.val()}).bind("blur.autocomplete",function(d){clearTimeout(b.searching);b.closing=setTimeout(function(){b.close(d)},150)});this._initSource();this.response=function(){return b._response.apply(b,arguments)};this.menu=a("<ul></ul>").addClass("ui-autocomplete").appendTo("body",c).menu({focus:function(e,f){var d=f.item.data("item.autocomplete");if(false!==b._trigger("focus",null,{item:d})){b.element.val(d.value)}},selected:function(e,f){var d=f.item.data("item.autocomplete");if(false!==b._trigger("select",e,{item:d})){b.element.val(d.value)}b.close(e);b.previous=b.element.val();if(b.element[0]!==c.activeElement){b.element.focus()}},blur:function(d,e){if(b.menu.element.is(":visible")){b.element.val(b.term)}}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");if(a.fn.bgiframe){this.menu.element.bgiframe()}},destroy:function(){this.element.removeClass("ui-autocomplete-input ui-widget ui-widget-content").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();a.Widget.prototype.destroy.call(this)},_setOption:function(b){a.Widget.prototype._setOption.apply(this,arguments);if(b==="source"){this._initSource()}},_initSource:function(){var c,b;if(a.isArray(this.options.source)){c=this.options.source;this.source=function(e,d){var f=new RegExp(a.ui.autocomplete.escapeRegex(e.term),"i");d(a.grep(c,function(g){return f.test(g.label||g.value||g)}))}}else{if(typeof this.options.source==="string"){b=this.options.source;this.source=function(e,d){a.getJSON(b,e,d)}}else{this.source=this.options.source}}},search:function(c,b){c=c!=null?c:this.element.val();if(c.length<this.options.minLength){return this.close(b)}clearTimeout(this.closing);if(this._trigger("search")===false){return}return this._search(c)},_search:function(b){this.term=this.element.addClass("ui-autocomplete-loading").val();this.source({term:b},this.response)},_response:function(b){if(b.length){b=this._normalize(b);this._suggest(b);this._trigger("open")}else{this.close()}this.element.removeClass("ui-autocomplete-loading")},close:function(b){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this._trigger("close",b);this.menu.element.hide();this.menu.deactivate()}if(this.previous!==this.element.val()){this._trigger("change",b)}},_normalize:function(b){if(b.length&&b[0].label&&b[0].value){return b}return a.map(b,function(c){if(typeof c==="string"){return{label:c,value:c}}return a.extend({label:c.label||c.value,value:c.value||c.label},c)})},_suggest:function(b){var c=this.menu.element.empty().zIndex(this.element.zIndex()+1),d,e;this._renderMenu(c,b);this.menu.deactivate();this.menu.refresh();this.menu.element.show().position({my:"left top",at:"left bottom",of:this.element,collision:"none"});d=c.width("").width();e=this.element.width();c.width(Math.max(d,e))},_renderMenu:function(d,c){var b=this;a.each(c,function(e,f){b._renderItem(d,f)})},_renderItem:function(b,c){return a("<li></li>").data("item.autocomplete",c).append("<a>"+c.label+"</a>").appendTo(b)},_move:function(c,b){if(!this.menu.element.is(":visible")){this.search(null,b);return}if(this.menu.first()&&/^previous/.test(c)||this.menu.last()&&/^next/.test(c)){this.element.val(this.term);this.menu.deactivate();return}this.menu[c]()},widget:function(){return this.menu.element}});a.extend(a.ui.autocomplete,{escapeRegex:function(b){return b.replace(/([\^\$\(\)\[\]\{\}\*\.\+\?\|\\])/gi,"\\$1")}})}(jQuery));(function(a){a.widget("ui.menu",{_create:function(){var b=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(c){c.preventDefault();b.select()});this.refresh()},refresh:function(){var c=this;var b=this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem");b.children("a").addClass("ui-corner-all").attr("tabindex",-1).mouseenter(function(){c.activate(a(this).parent())}).mouseleave(function(){c.deactivate()})},activate:function(d){this.deactivate();if(this.hasScroll()){var e=d.offset().top-this.element.offset().top,b=this.element.attr("scrollTop"),c=this.element.height();if(e<0){this.element.attr("scrollTop",b+e)}else{if(e>c){this.element.attr("scrollTop",b+e-c+d.height())}}}this.active=d.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",null,{item:d})},deactivate:function(){if(!this.active){return}this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null},next:function(){this.move("next","li:first")},previous:function(){this.move("prev","li:last")},first:function(){return this.active&&!this.active.prev().length},last:function(){return this.active&&!this.active.next().length},move:function(d,c){if(!this.active){this.activate(this.element.children(c));return}var b=this.active[d]();if(b.length){this.activate(b)}else{this.activate(this.element.children(c))}},nextPage:function(){if(this.hasScroll()){if(!this.active||this.last()){this.activate(this.element.children(":first"));return}var d=this.active.offset().top,c=this.element.height(),b=this.element.children("li").filter(function(){var e=a(this).offset().top-d-c+a(this).height();return e<10&&e>-10});if(!b.length){b=this.element.children(":last")}this.activate(b)}else{this.activate(this.element.children(!this.active||this.last()?":first":":last"))}},previousPage:function(){if(this.hasScroll()){if(!this.active||this.first()){this.activate(this.element.children(":last"));return}var c=this.active.offset().top,b=this.element.height();result=this.element.children("li").filter(function(){var d=a(this).offset().top-c+b-a(this).height();return d<10&&d>-10});if(!result.length){result=this.element.children(":first")}this.activate(result)}else{this.activate(this.element.children(!this.active||this.first()?":last":":first"))}},hasScroll:function(){return this.element.height()<this.element.attr("scrollHeight")},select:function(){this._trigger("selected",null,{item:this.active})}})}(jQuery));;/*
- * jQuery UI Button 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Button
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
(function(f){var d,c="ui-button ui-widget ui-state-default ui-corner-all",b="ui-state-hover ui-state-active ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon ui-button-text-only",e=function(g){f(":ui-button",g.target.form).each(function(){var h=f(this).data("button");setTimeout(function(){h.refresh()},1)})},a=function(h){var g=h.name,i=h.form,j=f([]);if(g){if(i){j=f(i).find("[name='"+g+"']")}else{j=f("[name='"+g+"']",h.ownerDocument).filter(function(){return !this.form})}}return j};f.widget("ui.button",{options:{text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",e);this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var g=this,i=this.options,j=this.type==="checkbox"||this.type==="radio",k="ui-state-hover"+(!j?" ui-state-active":""),h="ui-state-focus";if(i.label===null){i.label=this.buttonElement.html()}if(this.element.is(":disabled")){i.disabled=true}this.buttonElement.addClass(c).attr("role","button").bind("mouseenter.button",function(){if(i.disabled){return}f(this).addClass("ui-state-hover");if(this===d){f(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){if(i.disabled){return}f(this).removeClass(k)}).bind("focus.button",function(){f(this).addClass(h)}).bind("blur.button",function(){f(this).removeClass(h)});if(j){this.element.bind("change.button",function(){g.refresh()})}if(this.type==="checkbox"){this.buttonElement.bind("click.button",function(){if(i.disabled){return false}f(this).toggleClass("ui-state-active");g.buttonElement.attr("aria-pressed",g.element[0].checked)})}else{if(this.type==="radio"){this.buttonElement.bind("click.button",function(){if(i.disabled){return false}f(this).addClass("ui-state-active");g.buttonElement.attr("aria-pressed",true);var l=g.element[0];a(l).not(l).map(function(){return f(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)})}else{this.buttonElement.bind("mousedown.button",function(){if(i.disabled){return false}f(this).addClass("ui-state-active");d=this;f(document).one("mouseup",function(){d=null})}).bind("mouseup.button",function(){if(i.disabled){return false}f(this).removeClass("ui-state-active")}).bind("keydown.button",function(l){if(i.disabled){return false}if(l.keyCode==f.ui.keyCode.SPACE||l.keyCode==f.ui.keyCode.ENTER){f(this).addClass("ui-state-active")}}).bind("keyup.button",function(){f(this).removeClass("ui-state-active")});if(this.buttonElement.is("a")){this.buttonElement.keyup(function(l){if(l.keyCode===f.ui.keyCode.SPACE){f(this).click()}})}}}this._setOption("disabled",i.disabled)},_determineButtonType:function(){if(this.element.is(":checkbox")){this.type="checkbox"}else{if(this.element.is(":radio")){this.type="radio"}else{if(this.element.is("input")){this.type="input"}else{this.type="button"}}}if(this.type==="checkbox"||this.type==="radio"){this.buttonElement=this.element.parents().last().find("[for="+this.element.attr("id")+"]");this.element.addClass("ui-helper-hidden-accessible");var g=this.element.is(":checked");if(g){this.buttonElement.addClass("ui-state-active")}this.buttonElement.attr("aria-pressed",g)}else{this.buttonElement=this.element}},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass(c+" "+b).removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());if(!this.hasTitle){this.buttonElement.removeAttr("title")}f.Widget.prototype.destroy.call(this)},_setOption:function(g,h){f.Widget.prototype._setOption.apply(this,arguments);if(g==="disabled"){if(h){this.element.attr("disabled",true)}else{this.element.removeAttr("disabled")}}this._resetButton()},refresh:function(){var g=this.element.is(":disabled");if(g!==this.options.disabled){this._setOption("disabled",g)}if(this.type==="radio"){a(this.element[0]).each(function(){if(f(this).is(":checked")){f(this).button("widget").addClass("ui-state-active").attr("aria-pressed",true)}else{f(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)}})}else{if(this.type==="checkbox"){if(this.element.is(":checked")){this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true)}else{this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)}}}},_resetButton:function(){if(this.type==="input"){if(this.options.label){this.element.val(this.options.label)}return}var j=this.buttonElement,i=f("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(j.empty()).text(),h=this.options.icons,g=h.primary&&h.secondary;if(h.primary||h.secondary){j.addClass("ui-button-text-icon"+(g?"s":""));if(h.primary){j.prepend("<span class='ui-button-icon-primary ui-icon "+h.primary+"'></span>")}if(h.secondary){j.append("<span class='ui-button-icon-secondary ui-icon "+h.secondary+"'></span>")}if(!this.options.text){j.addClass(g?"ui-button-icons-only":"ui-button-icon-only").removeClass("ui-button-text-icons ui-button-text-icon");if(!this.hasTitle){j.attr("title",i)}}}else{j.addClass("ui-button-text-only")}}});f.widget("ui.buttonset",{_create:function(){this.element.addClass("ui-buttonset");this._init()},_init:function(){this.refresh()},_setOption:function(g,h){if(g==="disabled"){this.buttons.button("option",g,h)}f.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(":button, :submit, :reset, :checkbox, :radio, a, :data(button)").filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return f(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end()},destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return f(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");f.Widget.prototype.destroy.call(this)}})}(jQuery));;/*
- * jQuery UI Dialog 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Dialog
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- *  jquery.ui.button.js
- *	jquery.ui.draggable.js
- *	jquery.ui.mouse.js
- *	jquery.ui.position.js
- *	jquery.ui.resizable.js
- */
(function(b){var a="ui-dialog ui-widget ui-widget-content ui-corner-all ";b.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,position:"center",resizable:true,show:null,stack:true,title:"",width:300,zIndex:1000},_create:function(){this.originalTitle=this.element.attr("title");var k=this,l=k.options,i=l.title||k.originalTitle||"&#160;",d=b.ui.dialog.getTitleId(k.element),j=(k.uiDialog=b("<div></div>")).appendTo(document.body).hide().addClass(a+l.dialogClass).css({zIndex:l.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(m){if(l.closeOnEscape&&m.keyCode&&m.keyCode===b.ui.keyCode.ESCAPE){k.close(m);m.preventDefault()}}).attr({role:"dialog","aria-labelledby":d}).mousedown(function(m){k.moveToTop(false,m)}),f=k.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(j),e=(k.uiDialogTitlebar=b("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(j),h=b('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(m){k.close(m);return false}).appendTo(e),g=(k.uiDialogTitlebarCloseText=b("<span></span>")).addClass("ui-icon ui-icon-closethick").text(l.closeText).appendTo(h),c=b("<span></span>").addClass("ui-dialog-title").attr("id",d).html(i).prependTo(e);if(b.isFunction(l.beforeclose)&&!b.isFunction(l.beforeClose)){l.beforeClose=l.beforeclose}e.find("*").add(e).disableSelection();if(l.draggable&&b.fn.draggable){k._makeDraggable()}if(l.resizable&&b.fn.resizable){k._makeResizable()}k._createButtons(l.buttons);k._isOpen=false;if(b.fn.bgiframe){j.bgiframe()}},_init:function(){if(this.options.autoOpen){this.open()}},destroy:function(){var c=this;if(c.overlay){c.overlay.destroy()}c.uiDialog.hide();c.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");c.uiDialog.remove();if(c.originalTitle){c.element.attr("title",c.originalTitle)}return c},widget:function(){return this.uiDialog},close:function(e){var c=this,d;if(false===c._trigger("beforeClose",e)){return}if(c.overlay){c.overlay.destroy()}c.uiDialog.unbind("keypress.ui-dialog");c._isOpen=false;if(c.options.hide){c.uiDialog.hide(c.options.hide,function(){c._trigger("close",e)})}else{c.uiDialog.hide();c._trigger("close",e)}b.ui.dialog.overlay.resize();if(c.options.modal){d=0;b(".ui-dialog").each(function(){if(this!==c.uiDialog[0]){d=Math.max(d,b(this).css("z-index"))}});b.ui.dialog.maxZ=d}return c},isOpen:function(){return this._isOpen},moveToTop:function(g,f){var c=this,e=c.options,d;if((e.modal&&!g)||(!e.stack&&!e.modal)){return c._trigger("focus",f)}if(e.zIndex>b.ui.dialog.maxZ){b.ui.dialog.maxZ=e.zIndex}if(c.overlay){b.ui.dialog.maxZ+=1;c.overlay.$el.css("z-index",b.ui.dialog.overlay.maxZ=b.ui.dialog.maxZ)}d={scrollTop:c.element.attr("scrollTop"),scrollLeft:c.element.attr("scrollLeft")};b.ui.dialog.maxZ+=1;c.uiDialog.css("z-index",b.ui.dialog.maxZ);c.element.attr(d);c._trigger("focus",f);return c},open:function(){if(this._isOpen){return}var d=this,e=d.options,c=d.uiDialog;d.overlay=e.modal?new b.ui.dialog.overlay(d):null;if(c.next().length){c.appendTo("body")}d._size();d._position(e.position);c.show(e.show);d.moveToTop(true);if(e.modal){c.bind("keypress.ui-dialog",function(h){if(h.keyCode!==b.ui.keyCode.TAB){return}var g=b(":tabbable",this),i=g.filter(":first"),f=g.filter(":last");if(h.target===f[0]&&!h.shiftKey){i.focus(1);return false}else{if(h.target===i[0]&&h.shiftKey){f.focus(1);return false}}})}b([]).add(c.find(".ui-dialog-content :tabbable:first")).add(c.find(".ui-dialog-buttonpane :tabbable:first")).add(c).filter(":first").focus();d._trigger("open");d._isOpen=true;return d},_createButtons:function(f){var e=this,c=false,d=b("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix");e.uiDialog.find(".ui-dialog-buttonpane").remove();if(typeof f==="object"&&f!==null){b.each(f,function(){return !(c=true)})}if(c){b.each(f,function(g,i){var h=b('<button type="button"></button>').text(g).click(function(){i.apply(e.element[0],arguments)}).appendTo(d);if(b.fn.button){h.button()}});d.appendTo(e.uiDialog)}},_makeDraggable:function(){var c=this,f=c.options,g=b(document),e;function d(h){return{position:h.position,offset:h.offset}}c.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",handle:".ui-dialog-titlebar",containment:"document",start:function(h,i){e=f.height==="auto"?"auto":b(this).height();b(this).height(b(this).height()).addClass("ui-dialog-dragging");c._trigger("dragStart",h,d(i))},drag:function(h,i){c._trigger("drag",h,d(i))},stop:function(h,i){f.position=[i.position.left-g.scrollLeft(),i.position.top-g.scrollTop()];b(this).removeClass("ui-dialog-dragging").height(e);c._trigger("dragStop",h,d(i));b.ui.dialog.overlay.resize()}})},_makeResizable:function(h){h=(h===undefined?this.options.resizable:h);var d=this,g=d.options,c=d.uiDialog.css("position"),f=(typeof h==="string"?h:"n,e,s,w,se,sw,ne,nw");function e(i){return{originalPosition:i.originalPosition,originalSize:i.originalSize,position:i.position,size:i.size}}d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:g.maxWidth,maxHeight:g.maxHeight,minWidth:g.minWidth,minHeight:d._minHeight(),handles:f,start:function(i,j){b(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",i,e(j))},resize:function(i,j){d._trigger("resize",i,e(j))},stop:function(i,j){b(this).removeClass("ui-dialog-resizing");g.height=b(this).height();g.width=b(this).width();d._trigger("resizeStop",i,e(j));b.ui.dialog.overlay.resize()}}).css("position",c).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var c=this.options;if(c.height==="auto"){return c.minHeight}else{return Math.min(c.minHeight,c.height)}},_position:function(d){var e=[],f=[0,0],c;d=d||b.ui.dialog.prototype.options.position;if(typeof d==="string"||(typeof d==="object"&&"0" in d)){e=d.split?d.split(" "):[d[0],d[1]];if(e.length===1){e[1]=e[0]}b.each(["left","top"],function(h,g){if(+e[h]===e[h]){f[h]=e[h];e[h]=g}})}else{if(typeof d==="object"){if("left" in d){e[0]="left";f[0]=d.left}else{if("right" in d){e[0]="right";f[0]=-d.right}}if("top" in d){e[1]="top";f[1]=d.top}else{if("bottom" in d){e[1]="bottom";f[1]=-d.bottom}}}}c=this.uiDialog.is(":visible");if(!c){this.uiDialog.show()}this.uiDialog.css({top:0,left:0}).position({my:e.join(" "),at:e.join(" "),offset:f.join(" "),of:window,collision:"fit",using:function(h){var g=b(this).css(h).offset().top;if(g<0){b(this).css("top",h.top-g)}}});if(!c){this.uiDialog.hide()}},_setOption:function(f,g){var d=this,c=d.uiDialog,h=c.is(":data(resizable)"),e=false;switch(f){case"beforeclose":f="beforeClose";break;case"buttons":d._createButtons(g);break;case"closeText":d.uiDialogTitlebarCloseText.text(""+g);break;case"dialogClass":c.removeClass(d.options.dialogClass).addClass(a+g);break;case"disabled":if(g){c.addClass("ui-dialog-disabled")}else{c.removeClass("ui-dialog-disabled")}break;case"draggable":if(g){d._makeDraggable()}else{c.draggable("destroy")}break;case"height":e=true;break;case"maxHeight":if(h){c.resizable("option","maxHeight",g)}e=true;break;case"maxWidth":if(h){c.resizable("option","maxWidth",g)}e=true;break;case"minHeight":if(h){c.resizable("option","minHeight",g)}e=true;break;case"minWidth":if(h){c.resizable("option","minWidth",g)}e=true;break;case"position":d._position(g);break;case"resizable":if(h&&!g){c.resizable("destroy")}if(h&&typeof g==="string"){c.resizable("option","handles",g)}if(!h&&g!==false){d._makeResizable(g)}break;case"title":b(".ui-dialog-title",d.uiDialogTitlebar).html(""+(g||"&#160;"));break;case"width":e=true;break}b.Widget.prototype._setOption.apply(d,arguments);if(e){d._size()}},_size:function(){var d=this.options,c;this.element.css("width","auto").hide();c=this.uiDialog.css({height:"auto",width:d.width}).height();this.element.css(d.height==="auto"?{minHeight:Math.max(d.minHeight-c,0),height:"auto"}:{minHeight:0,height:Math.max(d.height-c,0)}).show();if(this.uiDialog.is(":data(resizable)")){this.uiDialog.resizable("option","minHeight",this._minHeight())}}});b.extend(b.ui.dialog,{version:"1.8",uuid:0,maxZ:0,getTitleId:function(c){var d=c.attr("id");if(!d){this.uuid+=1;d=this.uuid}return"ui-dialog-title-"+d},overlay:function(c){this.$el=b.ui.dialog.overlay.create(c)}});b.extend(b.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:b.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(c){return c+".dialog-overlay"}).join(" "),create:function(d){if(this.instances.length===0){setTimeout(function(){if(b.ui.dialog.overlay.instances.length){b(document).bind(b.ui.dialog.overlay.events,function(e){return(b(e.target).zIndex()>=b.ui.dialog.overlay.maxZ)})}},1);b(document).bind("keydown.dialog-overlay",function(e){if(d.options.closeOnEscape&&e.keyCode&&e.keyCode===b.ui.keyCode.ESCAPE){d.close(e);e.preventDefault()}});b(window).bind("resize.dialog-overlay",b.ui.dialog.overlay.resize)}var c=(this.oldInstances.pop()||b("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),height:this.height()});if(b.fn.bgiframe){c.bgiframe()}this.instances.push(c);return c},destroy:function(c){this.oldInstances.push(this.instances.splice(b.inArray(c,this.instances),1)[0]);if(this.instances.length===0){b([document,window]).unbind(".dialog-overlay")}c.remove();var d=0;b.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var d,c;if(b.browser.msie&&b.browser.version<7){d=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);c=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);if(d<c){return b(window).height()+"px"}else{return d+"px"}}else{return b(document).height()+"px"}},width:function(){var c,d;if(b.browser.msie&&b.browser.version<7){c=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);d=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);if(c<d){return b(window).width()+"px"}else{return c+"px"}}else{return b(document).width()+"px"}},resize:function(){var c=b([]);b.each(b.ui.dialog.overlay.instances,function(){c=c.add(this)});c.css({width:0,height:0}).css({width:b.ui.dialog.overlay.width(),height:b.ui.dialog.overlay.height()})}});b.extend(b.ui.dialog.overlay.prototype,{destroy:function(){b.ui.dialog.overlay.destroy(this.$el)}})}(jQuery));;/*
- * jQuery UI Slider 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Slider
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.mouse.js
- *	jquery.ui.widget.js
- */
(function(b){var a=5;b.widget("ui.slider",b.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var c=this,d=this.options;this._keySliding=false;this._mouseSliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");if(d.disabled){this.element.addClass("ui-slider-disabled ui-disabled")}this.range=b([]);if(d.range){if(d.range===true){this.range=b("<div></div>");if(!d.values){d.values=[this._valueMin(),this._valueMin()]}if(d.values.length&&d.values.length!=2){d.values=[d.values[0],d.values[0]]}}else{this.range=b("<div></div>")}this.range.appendTo(this.element).addClass("ui-slider-range");if(d.range=="min"||d.range=="max"){this.range.addClass("ui-slider-range-"+d.range)}this.range.addClass("ui-widget-header")}if(b(".ui-slider-handle",this.element).length==0){b('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle")}if(d.values&&d.values.length){while(b(".ui-slider-handle",this.element).length<d.values.length){b('<a href="#"></a>').appendTo(this.element).addClass("ui-slider-handle")}}this.handles=b(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(e){e.preventDefault()}).hover(function(){if(!d.disabled){b(this).addClass("ui-state-hover")}},function(){b(this).removeClass("ui-state-hover")}).focus(function(){if(!d.disabled){b(".ui-slider .ui-state-focus").removeClass("ui-state-focus");b(this).addClass("ui-state-focus")}else{b(this).blur()}}).blur(function(){b(this).removeClass("ui-state-focus")});this.handles.each(function(e){b(this).data("index.ui-slider-handle",e)});this.handles.keydown(function(j){var g=true;var f=b(this).data("index.ui-slider-handle");if(c.options.disabled){return}switch(j.keyCode){case b.ui.keyCode.HOME:case b.ui.keyCode.END:case b.ui.keyCode.PAGE_UP:case b.ui.keyCode.PAGE_DOWN:case b.ui.keyCode.UP:case b.ui.keyCode.RIGHT:case b.ui.keyCode.DOWN:case b.ui.keyCode.LEFT:g=false;if(!c._keySliding){c._keySliding=true;b(this).addClass("ui-state-active");c._start(j,f)}break}var h,e,i=c._step();if(c.options.values&&c.options.values.length){h=e=c.values(f)}else{h=e=c.value()}switch(j.keyCode){case b.ui.keyCode.HOME:e=c._valueMin();break;case b.ui.keyCode.END:e=c._valueMax();break;case b.ui.keyCode.PAGE_UP:e=h+((c._valueMax()-c._valueMin())/a);break;case b.ui.keyCode.PAGE_DOWN:e=h-((c._valueMax()-c._valueMin())/a);break;case b.ui.keyCode.UP:case b.ui.keyCode.RIGHT:if(h==c._valueMax()){return}e=h+i;break;case b.ui.keyCode.DOWN:case b.ui.keyCode.LEFT:if(h==c._valueMin()){return}e=h-i;break}c._slide(j,f,e);return g}).keyup(function(f){var e=b(this).data("index.ui-slider-handle");if(c._keySliding){c._keySliding=false;c._stop(f,e);c._change(f,e);b(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");this._mouseDestroy();return this},_mouseCapture:function(e){var f=this.options;if(f.disabled){return false}this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();var i={x:e.pageX,y:e.pageY};var k=this._normValueFromMouse(i);var d=this._valueMax()-this._valueMin()+1,g;var l=this,j;this.handles.each(function(m){var n=Math.abs(k-l.values(m));if(d>n){d=n;g=b(this);j=m}});if(f.range==true&&this.values(1)==f.min){g=b(this.handles[++j])}this._start(e,j);this._mouseSliding=true;l._handleIndex=j;g.addClass("ui-state-active").focus();var h=g.offset();var c=!b(e.target).parents().andSelf().is(".ui-slider-handle");this._clickOffset=c?{left:0,top:0}:{left:e.pageX-h.left-(g.width()/2),top:e.pageY-h.top-(g.height()/2)-(parseInt(g.css("borderTopWidth"),10)||0)-(parseInt(g.css("borderBottomWidth"),10)||0)+(parseInt(g.css("marginTop"),10)||0)};k=this._normValueFromMouse(i);this._slide(e,j,k);this._animateOff=true;return true},_mouseStart:function(c){return true},_mouseDrag:function(e){var c={x:e.pageX,y:e.pageY};var d=this._normValueFromMouse(c);this._slide(e,this._handleIndex,d);return false},_mouseStop:function(c){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(c,this._handleIndex);this._change(c,this._handleIndex);this._handleIndex=null;this._clickOffset=null;this._animateOff=false;return false},_detectOrientation:function(){this.orientation=this.options.orientation=="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(e){var d,i;if("horizontal"==this.orientation){d=this.elementSize.width;i=e.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{d=this.elementSize.height;i=e.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}var g=(i/d);if(g>1){g=1}if(g<0){g=0}if("vertical"==this.orientation){g=1-g}var f=this._valueMax()-this._valueMin(),j=g*f,c=j%this.options.step,h=this._valueMin()+j-c;if(c>(this.options.step/2)){h+=this.options.step}return parseFloat(h.toFixed(5))},_start:function(e,d){var c={handle:this.handles[d],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(d);c.values=this.values()}this._trigger("start",e,c)},_slide:function(g,f,e){var h=this.handles[f];if(this.options.values&&this.options.values.length){var c=this.values(f?0:1);if((this.options.values.length==2&&this.options.range===true)&&((f==0&&e>c)||(f==1&&e<c))){e=c}if(e!=this.values(f)){var d=this.values();d[f]=e;var i=this._trigger("slide",g,{handle:this.handles[f],value:e,values:d});var c=this.values(f?0:1);if(i!==false){this.values(f,e,true)}}}else{if(e!=this.value()){var i=this._trigger("slide",g,{handle:this.handles[f],value:e});if(i!==false){this.value(e)}}}},_stop:function(e,d){var c={handle:this.handles[d],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(d);c.values=this.values()}this._trigger("stop",e,c)},_change:function(e,d){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[d],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(d);c.values=this.values()}this._trigger("change",e,c)}},value:function(c){if(arguments.length){this.options.value=this._trimValue(c);this._refreshValue();this._change(null,0)}return this._value()},values:function(e,h){if(arguments.length>1){this.options.values[e]=this._trimValue(h);this._refreshValue();this._change(null,e)}if(arguments.length){if(b.isArray(arguments[0])){var g=this.options.values,d=arguments[0];for(var f=0,c=g.length;f<c;f++){g[f]=this._trimValue(d[f]);this._change(null,f)}this._refreshValue()}else{if(this.options.values&&this.options.values.length){return this._values(e)}else{return this.value()}}}else{return this._values()}},_setOption:function(d,e){var c,f=0;if(jQuery.isArray(this.options.values)){f=this.options.values.length}b.Widget.prototype._setOption.apply(this,arguments);switch(d){case"disabled":if(e){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}case"orientation":this._detectOrientation();this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case"value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case"values":this._animateOff=true;this._refreshValue();for(c=0;c<f;c++){this._change(null,c)}this._animateOff=false;break}},_step:function(){var c=this.options.step;return c},_value:function(){var c=this.options.value;c=this._trimValue(c);return c},_values:function(d){if(arguments.length){var g=this.options.values[d];g=this._trimValue(g);return g}else{var f=this.options.values.slice();for(var e=0,c=f.length;e<c;e++){f[e]=this._trimValue(f[e])}return f}},_trimValue:function(c){if(c<this._valueMin()){c=this._valueMin()}if(c>this._valueMax()){c=this._valueMax()}return c},_valueMin:function(){var c=this.options.min;return c},_valueMax:function(){var c=this.options.max;return c},_refreshValue:function(){var g=this.options.range,e=this.options,m=this;var d=(!this._animateOff)?e.animate:false;if(this.options.values&&this.options.values.length){var j,i;this.handles.each(function(q,o){var p=(m.values(q)-m._valueMin())/(m._valueMax()-m._valueMin())*100;var n={};n[m.orientation=="horizontal"?"left":"bottom"]=p+"%";b(this).stop(1,1)[d?"animate":"css"](n,e.animate);if(m.options.range===true){if(m.orientation=="horizontal"){(q==0)&&m.range.stop(1,1)[d?"animate":"css"]({left:p+"%"},e.animate);(q==1)&&m.range[d?"animate":"css"]({width:(p-lastValPercent)+"%"},{queue:false,duration:e.animate})}else{(q==0)&&m.range.stop(1,1)[d?"animate":"css"]({bottom:(p)+"%"},e.animate);(q==1)&&m.range[d?"animate":"css"]({height:(p-lastValPercent)+"%"},{queue:false,duration:e.animate})}}lastValPercent=p})}else{var k=this.value(),h=this._valueMin(),l=this._valueMax(),f=l!=h?(k-h)/(l-h)*100:0;var c={};c[m.orientation=="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[d?"animate":"css"](c,e.animate);(g=="min")&&(this.orientation=="horizontal")&&this.range.stop(1,1)[d?"animate":"css"]({width:f+"%"},e.animate);(g=="max")&&(this.orientation=="horizontal")&&this.range[d?"animate":"css"]({width:(100-f)+"%"},{queue:false,duration:e.animate});(g=="min")&&(this.orientation=="vertical")&&this.range.stop(1,1)[d?"animate":"css"]({height:f+"%"},e.animate);(g=="max")&&(this.orientation=="vertical")&&this.range[d?"animate":"css"]({height:(100-f)+"%"},{queue:false,duration:e.animate})}}});b.extend(b.ui.slider,{version:"1.8"})})(jQuery);;/*
- * jQuery UI Tabs 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Tabs
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
- */
(function(c){var b=0,a=0;c.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:'<li><a href="#{href}"><span>#{label}</span></a></li>'},_create:function(){this._tabify(true)},_setOption:function(d,e){if(d=="selected"){if(this.options.collapsible&&e==this.options.selected){return}this.select(e)}else{this.options[d]=e;this._tabify()}},_tabId:function(d){return d.title&&d.title.replace(/\s/g,"_").replace(/[^A-Za-z0-9\-_:\.]/g,"")||this.options.idPrefix+(++b)},_sanitizeSelector:function(d){return d.replace(/:/g,"\\:")},_cookie:function(){var d=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+(++a));return c.cookie.apply(null,[d].concat(c.makeArray(arguments)))},_ui:function(e,d){return{tab:e,panel:d,index:this.anchors.index(e)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var d=c(this);d.html(d.data("label.tabs")).removeData("label.tabs")})},_tabify:function(q){this.list=this.element.find("ol,ul").eq(0);this.lis=c("li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return c("a",this)[0]});this.panels=c([]);var r=this,f=this.options;var e=/^#.+/;this.anchors.each(function(u,o){var s=c(o).attr("href");var v=s.split("#")[0],w;if(v&&(v===location.toString().split("#")[0]||(w=c("base")[0])&&v===w.href)){s=o.hash;o.href=s}if(e.test(s)){r.panels=r.panels.add(r._sanitizeSelector(s))}else{if(s!="#"){c.data(o,"href.tabs",s);c.data(o,"load.tabs",s.replace(/#.*$/,""));var y=r._tabId(o);o.href="#"+y;var x=c("#"+y);if(!x.length){x=c(f.panelTemplate).attr("id",y).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(r.panels[u-1]||r.list);x.data("destroy.tabs",true)}r.panels=r.panels.add(x)}else{f.disabled.push(u)}}});if(q){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(f.selected===undefined){if(location.hash){this.anchors.each(function(s,o){if(o.hash==location.hash){f.selected=s;return false}})}if(typeof f.selected!="number"&&f.cookie){f.selected=parseInt(r._cookie(),10)}if(typeof f.selected!="number"&&this.lis.filter(".ui-tabs-selected").length){f.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))}f.selected=f.selected||(this.lis.length?0:-1)}else{if(f.selected===null){f.selected=-1}}f.selected=((f.selected>=0&&this.anchors[f.selected])||f.selected<0)?f.selected:0;f.disabled=c.unique(f.disabled.concat(c.map(this.lis.filter(".ui-state-disabled"),function(s,o){return r.lis.index(s)}))).sort();if(c.inArray(f.selected,f.disabled)!=-1){f.disabled.splice(c.inArray(f.selected,f.disabled),1)}this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");if(f.selected>=0&&this.anchors.length){this.panels.eq(f.selected).removeClass("ui-tabs-hide");this.lis.eq(f.selected).addClass("ui-tabs-selected ui-state-active");r.element.queue("tabs",function(){r._trigger("show",null,r._ui(r.anchors[f.selected],r.panels[f.selected]))});this.load(f.selected)}c(window).bind("unload",function(){r.lis.add(r.anchors).unbind(".tabs");r.lis=r.anchors=r.panels=null})}else{f.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"))}this.element[f.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");if(f.cookie){this._cookie(f.selected,f.cookie)}for(var j=0,p;(p=this.lis[j]);j++){c(p)[c.inArray(j,f.disabled)!=-1&&!c(p).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled")}if(f.cache===false){this.anchors.removeData("cache.tabs")}this.lis.add(this.anchors).unbind(".tabs");if(f.event!="mouseover"){var h=function(o,i){if(i.is(":not(.ui-state-disabled)")){i.addClass("ui-state-"+o)}};var l=function(o,i){i.removeClass("ui-state-"+o)};this.lis.bind("mouseover.tabs",function(){h("hover",c(this))});this.lis.bind("mouseout.tabs",function(){l("hover",c(this))});this.anchors.bind("focus.tabs",function(){h("focus",c(this).closest("li"))});this.anchors.bind("blur.tabs",function(){l("focus",c(this).closest("li"))})}var d,k;if(f.fx){if(c.isArray(f.fx)){d=f.fx[0];k=f.fx[1]}else{d=k=f.fx}}function g(i,o){i.css({display:""});if(!c.support.opacity&&o.opacity){i[0].style.removeAttribute("filter")}}var m=k?function(i,o){c(i).closest("li").addClass("ui-tabs-selected ui-state-active");o.hide().removeClass("ui-tabs-hide").animate(k,k.duration||"normal",function(){g(o,k);r._trigger("show",null,r._ui(i,o[0]))})}:function(i,o){c(i).closest("li").addClass("ui-tabs-selected ui-state-active");o.removeClass("ui-tabs-hide");r._trigger("show",null,r._ui(i,o[0]))};var n=d?function(o,i){i.animate(d,d.duration||"normal",function(){r.lis.removeClass("ui-tabs-selected ui-state-active");i.addClass("ui-tabs-hide");g(i,d);r.element.dequeue("tabs")})}:function(o,i,s){r.lis.removeClass("ui-tabs-selected ui-state-active");i.addClass("ui-tabs-hide");r.element.dequeue("tabs")};this.anchors.bind(f.event+".tabs",function(){var o=this,u=c(this).closest("li"),i=r.panels.filter(":not(.ui-tabs-hide)"),s=c(r._sanitizeSelector(this.hash));if((u.hasClass("ui-tabs-selected")&&!f.collapsible)||u.hasClass("ui-state-disabled")||u.hasClass("ui-state-processing")||r._trigger("select",null,r._ui(this,s[0]))===false){this.blur();return false}f.selected=r.anchors.index(this);r.abort();if(f.collapsible){if(u.hasClass("ui-tabs-selected")){f.selected=-1;if(f.cookie){r._cookie(f.selected,f.cookie)}r.element.queue("tabs",function(){n(o,i)}).dequeue("tabs");this.blur();return false}else{if(!i.length){if(f.cookie){r._cookie(f.selected,f.cookie)}r.element.queue("tabs",function(){m(o,s)});r.load(r.anchors.index(this));this.blur();return false}}}if(f.cookie){r._cookie(f.selected,f.cookie)}if(s.length){if(i.length){r.element.queue("tabs",function(){n(o,i)})}r.element.queue("tabs",function(){m(o,s)});r.load(r.anchors.index(this))}else{throw"jQuery UI Tabs: Mismatching fragment identifier."}if(c.browser.msie){this.blur()}});this.anchors.bind("click.tabs",function(){return false})},destroy:function(){var d=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=c.data(this,"href.tabs");if(e){this.href=e}var f=c(this).unbind(".tabs");c.each(["href","load","cache"],function(g,h){f.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){if(c.data(this,"destroy.tabs")){c(this).remove()}else{c(this).removeClass(["ui-state-default","ui-corner-top","ui-tabs-selected","ui-state-active","ui-state-hover","ui-state-focus","ui-state-disabled","ui-tabs-panel","ui-widget-content","ui-corner-bottom","ui-tabs-hide"].join(" "))}});if(d.cookie){this._cookie(null,d.cookie)}return this},add:function(g,f,e){if(e===undefined){e=this.anchors.length}var d=this,i=this.options,k=c(i.tabTemplate.replace(/#\{href\}/g,g).replace(/#\{label\}/g,f)),j=!g.indexOf("#")?g.replace("#",""):this._tabId(c("a",k)[0]);k.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var h=c("#"+j);if(!h.length){h=c(i.panelTemplate).attr("id",j).data("destroy.tabs",true)}h.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(e>=this.lis.length){k.appendTo(this.list);h.appendTo(this.list[0].parentNode)}else{k.insertBefore(this.lis[e]);h.insertBefore(this.panels[e])}i.disabled=c.map(i.disabled,function(m,l){return m>=e?++m:m});this._tabify();if(this.anchors.length==1){i.selected=0;k.addClass("ui-tabs-selected ui-state-active");h.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){d._trigger("show",null,d._ui(d.anchors[0],d.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[e],this.panels[e]));return this},remove:function(d){var f=this.options,g=this.lis.eq(d).remove(),e=this.panels.eq(d).remove();if(g.hasClass("ui-tabs-selected")&&this.anchors.length>1){this.select(d+(d+1<this.anchors.length?1:-1))}f.disabled=c.map(c.grep(f.disabled,function(j,h){return j!=d}),function(j,h){return j>=d?--j:j});this._tabify();this._trigger("remove",null,this._ui(g.find("a")[0],e[0]));return this},enable:function(d){var e=this.options;if(c.inArray(d,e.disabled)==-1){return}this.lis.eq(d).removeClass("ui-state-disabled");e.disabled=c.grep(e.disabled,function(g,f){return g!=d});this._trigger("enable",null,this._ui(this.anchors[d],this.panels[d]));return this},disable:function(e){var d=this,f=this.options;if(e!=f.selected){this.lis.eq(e).addClass("ui-state-disabled");f.disabled.push(e);f.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[e],this.panels[e]))}return this},select:function(d){if(typeof d=="string"){d=this.anchors.index(this.anchors.filter("[href$="+d+"]"))}else{if(d===null){d=-1}}if(d==-1&&this.options.collapsible){d=this.options.selected}this.anchors.eq(d).trigger(this.options.event+".tabs");return this},load:function(g){var e=this,i=this.options,d=this.anchors.eq(g)[0],f=c.data(d,"load.tabs");this.abort();if(!f||this.element.queue("tabs").length!==0&&c.data(d,"cache.tabs")){this.element.dequeue("tabs");return}this.lis.eq(g).addClass("ui-state-processing");if(i.spinner){var h=c("span",d);h.data("label.tabs",h.html()).html(i.spinner)}this.xhr=c.ajax(c.extend({},i.ajaxOptions,{url:f,success:function(k,j){c(e._sanitizeSelector(d.hash)).html(k);e._cleanup();if(i.cache){c.data(d,"cache.tabs",true)}e._trigger("load",null,e._ui(e.anchors[g],e.panels[g]));try{i.ajaxOptions.success(k,j)}catch(l){}},error:function(l,j,k){e._cleanup();e._trigger("load",null,e._ui(e.anchors[g],e.panels[g]));try{i.ajaxOptions.error(l,j,g,d)}catch(k){}}}));e.element.dequeue("tabs");return this},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},url:function(e,d){this.anchors.eq(e).removeData("cache.tabs").data("load.tabs",d);return this},length:function(){return this.anchors.length}});c.extend(c.ui.tabs,{version:"1.8"});c.extend(c.ui.tabs.prototype,{rotation:null,rotate:function(f,h){var d=this,i=this.options;var e=d._rotate||(d._rotate=function(j){clearTimeout(d.rotation);d.rotation=setTimeout(function(){var k=i.selected;d.select(++k<d.anchors.length?k:0)},f);if(j){j.stopPropagation()}});var g=d._unrotate||(d._unrotate=!h?function(j){if(j.clientX){d.rotate(null)}}:function(j){t=i.selected;e()});if(f){this.element.bind("tabsshow",e);this.anchors.bind(i.event+".tabs",g);e()}else{clearTimeout(d.rotation);this.element.unbind("tabsshow",e);this.anchors.unbind(i.event+".tabs",g);delete this._rotate;delete this._unrotate}return this}})})(jQuery);;/*
- * jQuery UI Datepicker 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Datepicker
- *
- * Depends:
- *	jquery.ui.core.js
- */
(function($){$.extend($.ui,{datepicker:{version:"1.8"}});var PROP_NAME="datepicker";var dpuuid=new Date().getTime();function Datepicker(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._datepickerShowing=false;this._inDialog=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass="ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su","Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"yy-mm-dd",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"show",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",minDate:null,maxDate:null,duration:"_default",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};$.extend(this._defaults,this.regional[""]);this.dpDiv=$('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all ui-helper-hidden-accessible"></div>')}$.extend(Datepicker.prototype,{markerClassName:"hasDatepicker",log:function(){if(this.debug){console.log.apply("",arguments)}},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(settings){extendRemove(this._defaults,settings||{});return this},_attachDatepicker:function(target,settings){var inlineSettings=null;for(var attrName in this._defaults){var attrValue=target.getAttribute("date:"+attrName);if(attrValue){inlineSettings=inlineSettings||{};try{inlineSettings[attrName]=eval(attrValue)}catch(err){inlineSettings[attrName]=attrValue}}}var nodeName=target.nodeName.toLowerCase();var inline=(nodeName=="div"||nodeName=="span");if(!target.id){target.id="dp"+(++this.uuid)}var inst=this._newInst($(target),inline);inst.settings=$.extend({},settings||{},inlineSettings||{});if(nodeName=="input"){this._connectDatepicker(target,inst)}else{if(inline){this._inlineDatepicker(target,inst)}}},_newInst:function(target,inline){var id=target[0].id.replace(/([^A-Za-z0-9_])/g,"\\\\$1");return{id:id,input:target,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:inline,dpDiv:(!inline?this.dpDiv:$('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>'))}},_connectDatepicker:function(target,inst){var input=$(target);inst.append=$([]);inst.trigger=$([]);if(input.hasClass(this.markerClassName)){return}this._attachments(input,inst);input.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});this._autoSize(inst);$.data(target,PROP_NAME,inst)},_attachments:function(input,inst){var appendText=this._get(inst,"appendText");var isRTL=this._get(inst,"isRTL");if(inst.append){inst.append.remove()}if(appendText){inst.append=$('<span class="'+this._appendClass+'">'+appendText+"</span>");input[isRTL?"before":"after"](inst.append)}input.unbind("focus",this._showDatepicker);if(inst.trigger){inst.trigger.remove()}var showOn=this._get(inst,"showOn");if(showOn=="focus"||showOn=="both"){input.focus(this._showDatepicker)}if(showOn=="button"||showOn=="both"){var buttonText=this._get(inst,"buttonText");var buttonImage=this._get(inst,"buttonImage");inst.trigger=$(this._get(inst,"buttonImageOnly")?$("<img/>").addClass(this._triggerClass).attr({src:buttonImage,alt:buttonText,title:buttonText}):$('<button type="button"></button>').addClass(this._triggerClass).html(buttonImage==""?buttonText:$("<img/>").attr({src:buttonImage,alt:buttonText,title:buttonText})));input[isRTL?"before":"after"](inst.trigger);inst.trigger.click(function(){if($.datepicker._datepickerShowing&&$.datepicker._lastInput==input[0]){$.datepicker._hideDatepicker()}else{$.datepicker._showDatepicker(input[0])}return false})}},_autoSize:function(inst){if(this._get(inst,"autoSize")&&!inst.inline){var date=new Date(2009,12-1,20);var dateFormat=this._get(inst,"dateFormat");if(dateFormat.match(/[DM]/)){var findMax=function(names){var max=0;var maxI=0;for(var i=0;i<names.length;i++){if(names[i].length>max){max=names[i].length;maxI=i}}return maxI};date.setMonth(findMax(this._get(inst,(dateFormat.match(/MM/)?"monthNames":"monthNamesShort"))));date.setDate(findMax(this._get(inst,(dateFormat.match(/DD/)?"dayNames":"dayNamesShort")))+20-date.getDay())}inst.input.attr("size",this._formatDate(inst,date).length)}},_inlineDatepicker:function(target,inst){var divSpan=$(target);if(divSpan.hasClass(this.markerClassName)){return}divSpan.addClass(this.markerClassName).append(inst.dpDiv).bind("setData.datepicker",function(event,key,value){inst.settings[key]=value}).bind("getData.datepicker",function(event,key){return this._get(inst,key)});$.data(target,PROP_NAME,inst);this._setDate(inst,this._getDefaultDate(inst),true);this._updateDatepicker(inst);this._updateAlternate(inst)},_dialogDatepicker:function(input,date,onSelect,settings,pos){var inst=this._dialogInst;if(!inst){var id="dp"+(++this.uuid);this._dialogInput=$('<input type="text" id="'+id+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);$("body").append(this._dialogInput);inst=this._dialogInst=this._newInst(this._dialogInput,false);inst.settings={};$.data(this._dialogInput[0],PROP_NAME,inst)}extendRemove(inst.settings,settings||{});date=(date&&date.constructor==Date?this._formatDate(inst,date):date);this._dialogInput.val(date);this._pos=(pos?(pos.length?pos:[pos.pageX,pos.pageY]):null);if(!this._pos){var browserWidth=document.documentElement.clientWidth;var browserHeight=document.documentElement.clientHeight;var scrollX=document.documentElement.scrollLeft||document.body.scrollLeft;var scrollY=document.documentElement.scrollTop||document.body.scrollTop;this._pos=[(browserWidth/2)-100+scrollX,(browserHeight/2)-150+scrollY]}this._dialogInput.css("left",(this._pos[0]+20)+"px").css("top",this._pos[1]+"px");inst.settings.onSelect=onSelect;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);this._showDatepicker(this._dialogInput[0]);if($.blockUI){$.blockUI(this.dpDiv)}$.data(this._dialogInput[0],PROP_NAME,inst);return this},_destroyDatepicker:function(target){var $target=$(target);var inst=$.data(target,PROP_NAME);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();$.removeData(target,PROP_NAME);if(nodeName=="input"){inst.append.remove();inst.trigger.remove();$target.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",this._doKeyUp)}else{if(nodeName=="div"||nodeName=="span"){$target.removeClass(this.markerClassName).empty()}}},_enableDatepicker:function(target){var $target=$(target);var inst=$.data(target,PROP_NAME);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();if(nodeName=="input"){target.disabled=false;inst.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else{if(nodeName=="div"||nodeName=="span"){var inline=$target.children("."+this._inlineClass);inline.children().removeClass("ui-state-disabled")}}this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)})},_disableDatepicker:function(target){var $target=$(target);var inst=$.data(target,PROP_NAME);if(!$target.hasClass(this.markerClassName)){return}var nodeName=target.nodeName.toLowerCase();if(nodeName=="input"){target.disabled=true;inst.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else{if(nodeName=="div"||nodeName=="span"){var inline=$target.children("."+this._inlineClass);inline.children().addClass("ui-state-disabled")}}this._disabledInputs=$.map(this._disabledInputs,function(value){return(value==target?null:value)});this._disabledInputs[this._disabledInputs.length]=target},_isDisabledDatepicker:function(target){if(!target){return false}for(var i=0;i<this._disabledInputs.length;i++){if(this._disabledInputs[i]==target){return true}}return false},_getInst:function(target){try{return $.data(target,PROP_NAME)}catch(err){throw"Missing instance data for this datepicker"}},_optionDatepicker:function(target,name,value){var inst=this._getInst(target);if(arguments.length==2&&typeof name=="string"){return(name=="defaults"?$.extend({},$.datepicker._defaults):(inst?(name=="all"?$.extend({},inst.settings):this._get(inst,name)):null))}var settings=name||{};if(typeof name=="string"){settings={};settings[name]=value}if(inst){if(this._curInst==inst){this._hideDatepicker()}var date=this._getDateDatepicker(target,true);extendRemove(inst.settings,settings);this._attachments($(target),inst);this._autoSize(inst);this._setDateDatepicker(target,date);this._updateDatepicker(inst)}},_changeDatepicker:function(target,name,value){this._optionDatepicker(target,name,value)},_refreshDatepicker:function(target){var inst=this._getInst(target);if(inst){this._updateDatepicker(inst)}},_setDateDatepicker:function(target,date){var inst=this._getInst(target);if(inst){this._setDate(inst,date);this._updateDatepicker(inst);this._updateAlternate(inst)}},_getDateDatepicker:function(target,noDefault){var inst=this._getInst(target);if(inst&&!inst.inline){this._setDateFromField(inst,noDefault)}return(inst?this._getDate(inst):null)},_doKeyDown:function(event){var inst=$.datepicker._getInst(event.target);var handled=true;var isRTL=inst.dpDiv.is(".ui-datepicker-rtl");inst._keyEvent=true;if($.datepicker._datepickerShowing){switch(event.keyCode){case 9:$.datepicker._hideDatepicker();handled=false;break;case 13:var sel=$("td."+$.datepicker._dayOverClass,inst.dpDiv).add($("td."+$.datepicker._currentClass,inst.dpDiv));if(sel[0]){$.datepicker._selectDay(event.target,inst.selectedMonth,inst.selectedYear,sel[0])}else{$.datepicker._hideDatepicker()}return false;break;case 27:$.datepicker._hideDatepicker();break;case 33:$.datepicker._adjustDate(event.target,(event.ctrlKey?-$.datepicker._get(inst,"stepBigMonths"):-$.datepicker._get(inst,"stepMonths")),"M");break;case 34:$.datepicker._adjustDate(event.target,(event.ctrlKey?+$.datepicker._get(inst,"stepBigMonths"):+$.datepicker._get(inst,"stepMonths")),"M");break;case 35:if(event.ctrlKey||event.metaKey){$.datepicker._clearDate(event.target)}handled=event.ctrlKey||event.metaKey;break;case 36:if(event.ctrlKey||event.metaKey){$.datepicker._gotoToday(event.target)}handled=event.ctrlKey||event.metaKey;break;case 37:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,(isRTL?+1:-1),"D")}handled=event.ctrlKey||event.metaKey;if(event.originalEvent.altKey){$.datepicker._adjustDate(event.target,(event.ctrlKey?-$.datepicker._get(inst,"stepBigMonths"):-$.datepicker._get(inst,"stepMonths")),"M")}break;case 38:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,-7,"D")}handled=event.ctrlKey||event.metaKey;break;case 39:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,(isRTL?-1:+1),"D")}handled=event.ctrlKey||event.metaKey;if(event.originalEvent.altKey){$.datepicker._adjustDate(event.target,(event.ctrlKey?+$.datepicker._get(inst,"stepBigMonths"):+$.datepicker._get(inst,"stepMonths")),"M")}break;case 40:if(event.ctrlKey||event.metaKey){$.datepicker._adjustDate(event.target,+7,"D")}handled=event.ctrlKey||event.metaKey;break;default:handled=false}}else{if(event.keyCode==36&&event.ctrlKey){$.datepicker._showDatepicker(this)}else{handled=false}}if(handled){event.preventDefault();event.stopPropagation()}},_doKeyPress:function(event){var inst=$.datepicker._getInst(event.target);if($.datepicker._get(inst,"constrainInput")){var chars=$.datepicker._possibleChars($.datepicker._get(inst,"dateFormat"));var chr=String.fromCharCode(event.charCode==undefined?event.keyCode:event.charCode);return event.ctrlKey||(chr<" "||!chars||chars.indexOf(chr)>-1)}},_doKeyUp:function(event){var inst=$.datepicker._getInst(event.target);if(inst.input.val()!=inst.lastVal){try{var date=$.datepicker.parseDate($.datepicker._get(inst,"dateFormat"),(inst.input?inst.input.val():null),$.datepicker._getFormatConfig(inst));if(date){$.datepicker._setDateFromField(inst);$.datepicker._updateAlternate(inst);$.datepicker._updateDatepicker(inst)}}catch(event){$.datepicker.log(event)}}return true},_showDatepicker:function(input){input=input.target||input;if(input.nodeName.toLowerCase()!="input"){input=$("input",input.parentNode)[0]}if($.datepicker._isDisabledDatepicker(input)||$.datepicker._lastInput==input){return}var inst=$.datepicker._getInst(input);if($.datepicker._curInst&&$.datepicker._curInst!=inst){$.datepicker._curInst.dpDiv.stop(true,true)}var beforeShow=$.datepicker._get(inst,"beforeShow");extendRemove(inst.settings,(beforeShow?beforeShow.apply(input,[input,inst]):{}));inst.lastVal=null;$.datepicker._lastInput=input;$.datepicker._setDateFromField(inst);if($.datepicker._inDialog){input.value=""}if(!$.datepicker._pos){$.datepicker._pos=$.datepicker._findPos(input);$.datepicker._pos[1]+=input.offsetHeight}var isFixed=false;$(input).parents().each(function(){isFixed|=$(this).css("position")=="fixed";return !isFixed});if(isFixed&&$.browser.opera){$.datepicker._pos[0]-=document.documentElement.scrollLeft;$.datepicker._pos[1]-=document.documentElement.scrollTop}var offset={left:$.datepicker._pos[0],top:$.datepicker._pos[1]};$.datepicker._pos=null;inst.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});$.datepicker._updateDatepicker(inst);offset=$.datepicker._checkOffset(inst,offset,isFixed);inst.dpDiv.css({position:($.datepicker._inDialog&&$.blockUI?"static":(isFixed?"fixed":"absolute")),display:"none",left:offset.left+"px",top:offset.top+"px"});if(!inst.inline){var showAnim=$.datepicker._get(inst,"showAnim");var duration=$.datepicker._get(inst,"duration");var postProcess=function(){$.datepicker._datepickerShowing=true;var borders=$.datepicker._getBorders(inst.dpDiv);inst.dpDiv.find("iframe.ui-datepicker-cover").css({left:-borders[0],top:-borders[1],width:inst.dpDiv.outerWidth(),height:inst.dpDiv.outerHeight()})};inst.dpDiv.zIndex(999);if($.effects&&$.effects[showAnim]){inst.dpDiv.show(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[showAnim||"show"]((showAnim?duration:null),postProcess)}if(!showAnim||!duration){postProcess()}if(inst.input.is(":visible")&&!inst.input.is(":disabled")){inst.input.focus()}$.datepicker._curInst=inst}},_updateDatepicker:function(inst){var self=this;var borders=$.datepicker._getBorders(inst.dpDiv);inst.dpDiv.empty().append(this._generateHTML(inst)).find("iframe.ui-datepicker-cover").css({left:-borders[0],top:-borders[1],width:inst.dpDiv.outerWidth(),height:inst.dpDiv.outerHeight()}).end().find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){$(this).removeClass("ui-state-hover");if(this.className.indexOf("ui-datepicker-prev")!=-1){$(this).removeClass("ui-datepicker-prev-hover")}if(this.className.indexOf("ui-datepicker-next")!=-1){$(this).removeClass("ui-datepicker-next-hover")}}).bind("mouseover",function(){if(!self._isDisabledDatepicker(inst.inline?inst.dpDiv.parent()[0]:inst.input[0])){$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");$(this).addClass("ui-state-hover");if(this.className.indexOf("ui-datepicker-prev")!=-1){$(this).addClass("ui-datepicker-prev-hover")}if(this.className.indexOf("ui-datepicker-next")!=-1){$(this).addClass("ui-datepicker-next-hover")}}}).end().find("."+this._dayOverClass+" a").trigger("mouseover").end();var numMonths=this._getNumberOfMonths(inst);var cols=numMonths[1];var width=17;if(cols>1){inst.dpDiv.addClass("ui-datepicker-multi-"+cols).css("width",(width*cols)+"em")}else{inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("")}inst.dpDiv[(numMonths[0]!=1||numMonths[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");inst.dpDiv[(this._get(inst,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");if(inst==$.datepicker._curInst&&$.datepicker._datepickerShowing&&inst.input&&inst.input.is(":visible")&&!inst.input.is(":disabled")){inst.input.focus()}},_getBorders:function(elem){var convert=function(value){return{thin:1,medium:2,thick:3}[value]||value};return[parseFloat(convert(elem.css("border-left-width"))),parseFloat(convert(elem.css("border-top-width")))]},_checkOffset:function(inst,offset,isFixed){var dpWidth=inst.dpDiv.outerWidth();var dpHeight=inst.dpDiv.outerHeight();var inputWidth=inst.input?inst.input.outerWidth():0;var inputHeight=inst.input?inst.input.outerHeight():0;var viewWidth=document.documentElement.clientWidth+$(document).scrollLeft();var viewHeight=document.documentElement.clientHeight+$(document).scrollTop();offset.left-=(this._get(inst,"isRTL")?(dpWidth-inputWidth):0);offset.left-=(isFixed&&offset.left==inst.input.offset().left)?$(document).scrollLeft():0;offset.top-=(isFixed&&offset.top==(inst.input.offset().top+inputHeight))?$(document).scrollTop():0;offset.left-=Math.min(offset.left,(offset.left+dpWidth>viewWidth&&viewWidth>dpWidth)?Math.abs(offset.left+dpWidth-viewWidth):0);offset.top-=Math.min(offset.top,(offset.top+dpHeight>viewHeight&&viewHeight>dpHeight)?Math.abs(dpHeight+inputHeight):0);return offset},_findPos:function(obj){var inst=this._getInst(obj);var isRTL=this._get(inst,"isRTL");while(obj&&(obj.type=="hidden"||obj.nodeType!=1)){obj=obj[isRTL?"previousSibling":"nextSibling"]}var position=$(obj).offset();return[position.left,position.top]},_hideDatepicker:function(input){var inst=this._curInst;if(!inst||(input&&inst!=$.data(input,PROP_NAME))){return}if(this._datepickerShowing){var showAnim=this._get(inst,"showAnim");var duration=this._get(inst,"duration");var postProcess=function(){$.datepicker._tidyDialog(inst);this._curInst=null};if($.effects&&$.effects[showAnim]){inst.dpDiv.hide(showAnim,$.datepicker._get(inst,"showOptions"),duration,postProcess)}else{inst.dpDiv[(showAnim=="slideDown"?"slideUp":(showAnim=="fadeIn"?"fadeOut":"hide"))]((showAnim?duration:null),postProcess)}if(!showAnim){postProcess()}var onClose=this._get(inst,"onClose");if(onClose){onClose.apply((inst.input?inst.input[0]:null),[(inst.input?inst.input.val():""),inst])}this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if($.blockUI){$.unblockUI();$("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(inst){inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(event){if(!$.datepicker._curInst){return}var $target=$(event.target);if($target[0].id!=$.datepicker._mainDivId&&$target.parents("#"+$.datepicker._mainDivId).length==0&&!$target.hasClass($.datepicker.markerClassName)&&!$target.hasClass($.datepicker._triggerClass)&&$.datepicker._datepickerShowing&&!($.datepicker._inDialog&&$.blockUI)){$.datepicker._hideDatepicker()}},_adjustDate:function(id,offset,period){var target=$(id);var inst=this._getInst(target[0]);if(this._isDisabledDatepicker(target[0])){return}this._adjustInstDate(inst,offset+(period=="M"?this._get(inst,"showCurrentAtPos"):0),period);this._updateDatepicker(inst)},_gotoToday:function(id){var target=$(id);var inst=this._getInst(target[0]);if(this._get(inst,"gotoCurrent")&&inst.currentDay){inst.selectedDay=inst.currentDay;inst.drawMonth=inst.selectedMonth=inst.currentMonth;inst.drawYear=inst.selectedYear=inst.currentYear}else{var date=new Date();inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear()}this._notifyChange(inst);this._adjustDate(target)},_selectMonthYear:function(id,select,period){var target=$(id);var inst=this._getInst(target[0]);inst._selectingMonthYear=false;inst["selected"+(period=="M"?"Month":"Year")]=inst["draw"+(period=="M"?"Month":"Year")]=parseInt(select.options[select.selectedIndex].value,10);this._notifyChange(inst);this._adjustDate(target)},_clickMonthYear:function(id){var target=$(id);var inst=this._getInst(target[0]);if(inst.input&&inst._selectingMonthYear&&!$.browser.msie){inst.input.focus()}inst._selectingMonthYear=!inst._selectingMonthYear},_selectDay:function(id,month,year,td){var target=$(id);if($(td).hasClass(this._unselectableClass)||this._isDisabledDatepicker(target[0])){return}var inst=this._getInst(target[0]);inst.selectedDay=inst.currentDay=$("a",td).html();inst.selectedMonth=inst.currentMonth=month;inst.selectedYear=inst.currentYear=year;this._selectDate(id,this._formatDate(inst,inst.currentDay,inst.currentMonth,inst.currentYear))},_clearDate:function(id){var target=$(id);var inst=this._getInst(target[0]);this._selectDate(target,"")},_selectDate:function(id,dateStr){var target=$(id);var inst=this._getInst(target[0]);dateStr=(dateStr!=null?dateStr:this._formatDate(inst));if(inst.input){inst.input.val(dateStr)}this._updateAlternate(inst);var onSelect=this._get(inst,"onSelect");if(onSelect){onSelect.apply((inst.input?inst.input[0]:null),[dateStr,inst])}else{if(inst.input){inst.input.trigger("change")}}if(inst.inline){this._updateDatepicker(inst)}else{this._hideDatepicker();this._lastInput=inst.input[0];if(typeof(inst.input[0])!="object"){inst.input.focus()}this._lastInput=null}},_updateAlternate:function(inst){var altField=this._get(inst,"altField");if(altField){var altFormat=this._get(inst,"altFormat")||this._get(inst,"dateFormat");var date=this._getDate(inst);var dateStr=this.formatDate(altFormat,date,this._getFormatConfig(inst));$(altField).each(function(){$(this).val(dateStr)})}},noWeekends:function(date){var day=date.getDay();return[(day>0&&day<6),""]},iso8601Week:function(date){var checkDate=new Date(date.getTime());checkDate.setDate(checkDate.getDate()+4-(checkDate.getDay()||7));var time=checkDate.getTime();checkDate.setMonth(0);checkDate.setDate(1);return Math.floor(Math.round((time-checkDate)/86400000)/7)+1},parseDate:function(format,value,settings){if(format==null||value==null){throw"Invalid arguments"}value=(typeof value=="object"?value.toString():value+"");if(value==""){return null}var shortYearCutoff=(settings?settings.shortYearCutoff:null)||this._defaults.shortYearCutoff;var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var year=-1;var month=-1;var day=-1;var doy=-1;var literal=false;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var getNumber=function(match){lookAhead(match);var size=(match=="@"?14:(match=="!"?20:(match=="y"?4:(match=="o"?3:2))));var digits=new RegExp("^\\d{1,"+size+"}");var num=value.substring(iValue).match(digits);if(!num){throw"Missing number at position "+iValue}iValue+=num[0].length;return parseInt(num[0],10)};var getName=function(match,shortNames,longNames){var names=(lookAhead(match)?longNames:shortNames);for(var i=0;i<names.length;i++){if(value.substr(iValue,names[i].length)==names[i]){iValue+=names[i].length;return i+1}}throw"Unknown name at position "+iValue};var checkLiteral=function(){if(value.charAt(iValue)!=format.charAt(iFormat)){throw"Unexpected literal at position "+iValue}iValue++};var iValue=0;for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{checkLiteral()}}else{switch(format.charAt(iFormat)){case"d":day=getNumber("d");break;case"D":getName("D",dayNamesShort,dayNames);break;case"o":doy=getNumber("o");break;case"m":month=getNumber("m");break;case"M":month=getName("M",monthNamesShort,monthNames);break;case"y":year=getNumber("y");break;case"@":var date=new Date(getNumber("@"));year=date.getFullYear();month=date.getMonth()+1;day=date.getDate();break;case"!":var date=new Date((getNumber("!")-this._ticksTo1970)/10000);year=date.getFullYear();month=date.getMonth()+1;day=date.getDate();break;case"'":if(lookAhead("'")){checkLiteral()}else{literal=true}break;default:checkLiteral()}}}if(year==-1){year=new Date().getFullYear()}else{if(year<100){year+=new Date().getFullYear()-new Date().getFullYear()%100+(year<=shortYearCutoff?0:-100)}}if(doy>-1){month=1;day=doy;do{var dim=this._getDaysInMonth(year,month-1);if(day<=dim){break}month++;day-=dim}while(true)}var date=this._daylightSavingAdjust(new Date(year,month-1,day));if(date.getFullYear()!=year||date.getMonth()+1!=month||date.getDate()!=day){throw"Invalid date"}return date},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(((1970-1)*365+Math.floor(1970/4)-Math.floor(1970/100)+Math.floor(1970/400))*24*60*60*10000000),formatDate:function(format,date,settings){if(!date){return""}var dayNamesShort=(settings?settings.dayNamesShort:null)||this._defaults.dayNamesShort;var dayNames=(settings?settings.dayNames:null)||this._defaults.dayNames;var monthNamesShort=(settings?settings.monthNamesShort:null)||this._defaults.monthNamesShort;var monthNames=(settings?settings.monthNames:null)||this._defaults.monthNames;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};var formatNumber=function(match,value,len){var num=""+value;if(lookAhead(match)){while(num.length<len){num="0"+num}}return num};var formatName=function(match,value,shortNames,longNames){return(lookAhead(match)?longNames[value]:shortNames[value])};var output="";var literal=false;if(date){for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{output+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":output+=formatNumber("d",date.getDate(),2);break;case"D":output+=formatName("D",date.getDay(),dayNamesShort,dayNames);break;case"o":output+=formatNumber("o",(date.getTime()-new Date(date.getFullYear(),0,0).getTime())/86400000,3);break;case"m":output+=formatNumber("m",date.getMonth()+1,2);break;case"M":output+=formatName("M",date.getMonth(),monthNamesShort,monthNames);break;case"y":output+=(lookAhead("y")?date.getFullYear():(date.getYear()%100<10?"0":"")+date.getYear()%100);break;case"@":output+=date.getTime();break;case"!":output+=date.getTime()*10000+this._ticksTo1970;break;case"'":if(lookAhead("'")){output+="'"}else{literal=true}break;default:output+=format.charAt(iFormat)}}}}return output},_possibleChars:function(format){var chars="";var literal=false;var lookAhead=function(match){var matches=(iFormat+1<format.length&&format.charAt(iFormat+1)==match);if(matches){iFormat++}return matches};for(var iFormat=0;iFormat<format.length;iFormat++){if(literal){if(format.charAt(iFormat)=="'"&&!lookAhead("'")){literal=false}else{chars+=format.charAt(iFormat)}}else{switch(format.charAt(iFormat)){case"d":case"m":case"y":case"@":chars+="0123456789";break;case"D":case"M":return null;case"'":if(lookAhead("'")){chars+="'"}else{literal=true}break;default:chars+=format.charAt(iFormat)}}}return chars},_get:function(inst,name){return inst.settings[name]!==undefined?inst.settings[name]:this._defaults[name]},_setDateFromField:function(inst,noDefault){if(inst.input.val()==inst.lastVal){return}var dateFormat=this._get(inst,"dateFormat");var dates=inst.lastVal=inst.input?inst.input.val():null;var date,defaultDate;date=defaultDate=this._getDefaultDate(inst);var settings=this._getFormatConfig(inst);try{date=this.parseDate(dateFormat,dates,settings)||defaultDate}catch(event){this.log(event);dates=(noDefault?"":dates)}inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();inst.currentDay=(dates?date.getDate():0);inst.currentMonth=(dates?date.getMonth():0);inst.currentYear=(dates?date.getFullYear():0);this._adjustInstDate(inst)},_getDefaultDate:function(inst){return this._restrictMinMax(inst,this._determineDate(inst,this._get(inst,"defaultDate"),new Date()))},_determineDate:function(inst,date,defaultDate){var offsetNumeric=function(offset){var date=new Date();date.setDate(date.getDate()+offset);return date};var offsetString=function(offset){try{return $.datepicker.parseDate($.datepicker._get(inst,"dateFormat"),offset,$.datepicker._getFormatConfig(inst))}catch(e){}var date=(offset.toLowerCase().match(/^c/)?$.datepicker._getDate(inst):null)||new Date();var year=date.getFullYear();var month=date.getMonth();var day=date.getDate();var pattern=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g;var matches=pattern.exec(offset);while(matches){switch(matches[2]||"d"){case"d":case"D":day+=parseInt(matches[1],10);break;case"w":case"W":day+=parseInt(matches[1],10)*7;break;case"m":case"M":month+=parseInt(matches[1],10);day=Math.min(day,$.datepicker._getDaysInMonth(year,month));break;case"y":case"Y":year+=parseInt(matches[1],10);day=Math.min(day,$.datepicker._getDaysInMonth(year,month));break}matches=pattern.exec(offset)}return new Date(year,month,day)};date=(date==null?defaultDate:(typeof date=="string"?offsetString(date):(typeof date=="number"?(isNaN(date)?defaultDate:offsetNumeric(date)):date)));date=(date&&date.toString()=="Invalid Date"?defaultDate:date);if(date){date.setHours(0);date.setMinutes(0);date.setSeconds(0);date.setMilliseconds(0)}return this._daylightSavingAdjust(date)},_daylightSavingAdjust:function(date){if(!date){return null}date.setHours(date.getHours()>12?date.getHours()+2:0);return date},_setDate:function(inst,date,noChange){var clear=!(date);var origMonth=inst.selectedMonth;var origYear=inst.selectedYear;date=this._restrictMinMax(inst,this._determineDate(inst,date,new Date()));inst.selectedDay=inst.currentDay=date.getDate();inst.drawMonth=inst.selectedMonth=inst.currentMonth=date.getMonth();inst.drawYear=inst.selectedYear=inst.currentYear=date.getFullYear();if((origMonth!=inst.selectedMonth||origYear!=inst.selectedYear)&&!noChange){this._notifyChange(inst)}this._adjustInstDate(inst);if(inst.input){inst.input.val(clear?"":this._formatDate(inst))}},_getDate:function(inst){var startDate=(!inst.currentYear||(inst.input&&inst.input.val()=="")?null:this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));return startDate},_generateHTML:function(inst){var today=new Date();today=this._daylightSavingAdjust(new Date(today.getFullYear(),today.getMonth(),today.getDate()));var isRTL=this._get(inst,"isRTL");var showButtonPanel=this._get(inst,"showButtonPanel");var hideIfNoPrevNext=this._get(inst,"hideIfNoPrevNext");var navigationAsDateFormat=this._get(inst,"navigationAsDateFormat");var numMonths=this._getNumberOfMonths(inst);var showCurrentAtPos=this._get(inst,"showCurrentAtPos");var stepMonths=this._get(inst,"stepMonths");var isMultiMonth=(numMonths[0]!=1||numMonths[1]!=1);var currentDate=this._daylightSavingAdjust((!inst.currentDay?new Date(9999,9,9):new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));var minDate=this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");var drawMonth=inst.drawMonth-showCurrentAtPos;var drawYear=inst.drawYear;if(drawMonth<0){drawMonth+=12;drawYear--}if(maxDate){var maxDraw=this._daylightSavingAdjust(new Date(maxDate.getFullYear(),maxDate.getMonth()-(numMonths[0]*numMonths[1])+1,maxDate.getDate()));maxDraw=(minDate&&maxDraw<minDate?minDate:maxDraw);while(this._daylightSavingAdjust(new Date(drawYear,drawMonth,1))>maxDraw){drawMonth--;if(drawMonth<0){drawMonth=11;drawYear--}}}inst.drawMonth=drawMonth;inst.drawYear=drawYear;var prevText=this._get(inst,"prevText");prevText=(!navigationAsDateFormat?prevText:this.formatDate(prevText,this._daylightSavingAdjust(new Date(drawYear,drawMonth-stepMonths,1)),this._getFormatConfig(inst)));var prev=(this._canAdjustMonth(inst,-1,drawYear,drawMonth)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+inst.id+"', -"+stepMonths+", 'M');\" title=\""+prevText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"e":"w")+'">'+prevText+"</span></a>":(hideIfNoPrevNext?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+prevText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"e":"w")+'">'+prevText+"</span></a>"));var nextText=this._get(inst,"nextText");nextText=(!navigationAsDateFormat?nextText:this.formatDate(nextText,this._daylightSavingAdjust(new Date(drawYear,drawMonth+stepMonths,1)),this._getFormatConfig(inst)));var next=(this._canAdjustMonth(inst,+1,drawYear,drawMonth)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._adjustDate('#"+inst.id+"', +"+stepMonths+", 'M');\" title=\""+nextText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"w":"e")+'">'+nextText+"</span></a>":(hideIfNoPrevNext?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+nextText+'"><span class="ui-icon ui-icon-circle-triangle-'+(isRTL?"w":"e")+'">'+nextText+"</span></a>"));var currentText=this._get(inst,"currentText");var gotoDate=(this._get(inst,"gotoCurrent")&&inst.currentDay?currentDate:today);currentText=(!navigationAsDateFormat?currentText:this.formatDate(currentText,gotoDate,this._getFormatConfig(inst)));var controls=(!inst.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+dpuuid+'.datepicker._hideDatepicker();">'+this._get(inst,"closeText")+"</button>":"");var buttonPanel=(showButtonPanel)?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(isRTL?controls:"")+(this._isInRange(inst,gotoDate)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+dpuuid+".datepicker._gotoToday('#"+inst.id+"');\">"+currentText+"</button>":"")+(isRTL?"":controls)+"</div>":"";var firstDay=parseInt(this._get(inst,"firstDay"),10);firstDay=(isNaN(firstDay)?0:firstDay);var showWeek=this._get(inst,"showWeek");var dayNames=this._get(inst,"dayNames");var dayNamesShort=this._get(inst,"dayNamesShort");var dayNamesMin=this._get(inst,"dayNamesMin");var monthNames=this._get(inst,"monthNames");var monthNamesShort=this._get(inst,"monthNamesShort");var beforeShowDay=this._get(inst,"beforeShowDay");var showOtherMonths=this._get(inst,"showOtherMonths");var selectOtherMonths=this._get(inst,"selectOtherMonths");var calculateWeek=this._get(inst,"calculateWeek")||this.iso8601Week;var defaultDate=this._getDefaultDate(inst);var html="";for(var row=0;row<numMonths[0];row++){var group="";for(var col=0;col<numMonths[1];col++){var selectedDate=this._daylightSavingAdjust(new Date(drawYear,drawMonth,inst.selectedDay));var cornerClass=" ui-corner-all";var calender="";if(isMultiMonth){calender+='<div class="ui-datepicker-group';if(numMonths[1]>1){switch(col){case 0:calender+=" ui-datepicker-group-first";cornerClass=" ui-corner-"+(isRTL?"right":"left");break;case numMonths[1]-1:calender+=" ui-datepicker-group-last";cornerClass=" ui-corner-"+(isRTL?"left":"right");break;default:calender+=" ui-datepicker-group-middle";cornerClass="";break}}calender+='">'}calender+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+cornerClass+'">'+(/all|left/.test(cornerClass)&&row==0?(isRTL?next:prev):"")+(/all|right/.test(cornerClass)&&row==0?(isRTL?prev:next):"")+this._generateMonthYearHeader(inst,drawMonth,drawYear,minDate,maxDate,row>0||col>0,monthNames,monthNamesShort)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var thead=(showWeek?'<th class="ui-datepicker-week-col">'+this._get(inst,"weekHeader")+"</th>":"");for(var dow=0;dow<7;dow++){var day=(dow+firstDay)%7;thead+="<th"+((dow+firstDay+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+dayNames[day]+'">'+dayNamesMin[day]+"</span></th>"}calender+=thead+"</tr></thead><tbody>";var daysInMonth=this._getDaysInMonth(drawYear,drawMonth);if(drawYear==inst.selectedYear&&drawMonth==inst.selectedMonth){inst.selectedDay=Math.min(inst.selectedDay,daysInMonth)}var leadDays=(this._getFirstDayOfMonth(drawYear,drawMonth)-firstDay+7)%7;var numRows=(isMultiMonth?6:Math.ceil((leadDays+daysInMonth)/7));var printDate=this._daylightSavingAdjust(new Date(drawYear,drawMonth,1-leadDays));for(var dRow=0;dRow<numRows;dRow++){calender+="<tr>";var tbody=(!showWeek?"":'<td class="ui-datepicker-week-col">'+this._get(inst,"calculateWeek")(printDate)+"</td>");for(var dow=0;dow<7;dow++){var daySettings=(beforeShowDay?beforeShowDay.apply((inst.input?inst.input[0]:null),[printDate]):[true,""]);var otherMonth=(printDate.getMonth()!=drawMonth);var unselectable=(otherMonth&&!selectOtherMonths)||!daySettings[0]||(minDate&&printDate<minDate)||(maxDate&&printDate>maxDate);tbody+='<td class="'+((dow+firstDay+6)%7>=5?" ui-datepicker-week-end":"")+(otherMonth?" ui-datepicker-other-month":"")+((printDate.getTime()==selectedDate.getTime()&&drawMonth==inst.selectedMonth&&inst._keyEvent)||(defaultDate.getTime()==printDate.getTime()&&defaultDate.getTime()==selectedDate.getTime())?" "+this._dayOverClass:"")+(unselectable?" "+this._unselectableClass+" ui-state-disabled":"")+(otherMonth&&!showOtherMonths?"":" "+daySettings[1]+(printDate.getTime()==currentDate.getTime()?" "+this._currentClass:"")+(printDate.getTime()==today.getTime()?" ui-datepicker-today":""))+'"'+((!otherMonth||showOtherMonths)&&daySettings[2]?' title="'+daySettings[2]+'"':"")+(unselectable?"":' onclick="DP_jQuery_'+dpuuid+".datepicker._selectDay('#"+inst.id+"',"+printDate.getMonth()+","+printDate.getFullYear()+', this);return false;"')+">"+(otherMonth&&!showOtherMonths?"&#xa0;":(unselectable?'<span class="ui-state-default">'+printDate.getDate()+"</span>":'<a class="ui-state-default'+(printDate.getTime()==today.getTime()?" ui-state-highlight":"")+(printDate.getTime()==currentDate.getTime()?" ui-state-active":"")+(otherMonth?" ui-priority-secondary":"")+'" href="#">'+printDate.getDate()+"</a>"))+"</td>";printDate.setDate(printDate.getDate()+1);printDate=this._daylightSavingAdjust(printDate)}calender+=tbody+"</tr>"}drawMonth++;if(drawMonth>11){drawMonth=0;drawYear++}calender+="</tbody></table>"+(isMultiMonth?"</div>"+((numMonths[0]>0&&col==numMonths[1]-1)?'<div class="ui-datepicker-row-break"></div>':""):"");group+=calender}html+=group}html+=buttonPanel+($.browser.msie&&parseInt($.browser.version,10)<7&&!inst.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");inst._keyEvent=false;return html},_generateMonthYearHeader:function(inst,drawMonth,drawYear,minDate,maxDate,secondary,monthNames,monthNamesShort){var changeMonth=this._get(inst,"changeMonth");var changeYear=this._get(inst,"changeYear");var showMonthAfterYear=this._get(inst,"showMonthAfterYear");var html='<div class="ui-datepicker-title">';var monthHtml="";if(secondary||!changeMonth){monthHtml+='<span class="ui-datepicker-month">'+monthNames[drawMonth]+"</span>"}else{var inMinYear=(minDate&&minDate.getFullYear()==drawYear);var inMaxYear=(maxDate&&maxDate.getFullYear()==drawYear);monthHtml+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+inst.id+"', this, 'M');\" onclick=\"DP_jQuery_"+dpuuid+".datepicker._clickMonthYear('#"+inst.id+"');\">";for(var month=0;month<12;month++){if((!inMinYear||month>=minDate.getMonth())&&(!inMaxYear||month<=maxDate.getMonth())){monthHtml+='<option value="'+month+'"'+(month==drawMonth?' selected="selected"':"")+">"+monthNamesShort[month]+"</option>"}}monthHtml+="</select>"}if(!showMonthAfterYear){html+=monthHtml+(secondary||!(changeMonth&&changeYear)?"&#xa0;":"")}if(secondary||!changeYear){html+='<span class="ui-datepicker-year">'+drawYear+"</span>"}else{var years=this._get(inst,"yearRange").split(":");var thisYear=new Date().getFullYear();var determineYear=function(value){var year=(value.match(/c[+-].*/)?drawYear+parseInt(value.substring(1),10):(value.match(/[+-].*/)?thisYear+parseInt(value,10):parseInt(value,10)));return(isNaN(year)?thisYear:year)};var year=determineYear(years[0]);var endYear=Math.max(year,determineYear(years[1]||""));year=(minDate?Math.max(year,minDate.getFullYear()):year);endYear=(maxDate?Math.min(endYear,maxDate.getFullYear()):endYear);html+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+dpuuid+".datepicker._selectMonthYear('#"+inst.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+dpuuid+".datepicker._clickMonthYear('#"+inst.id+"');\">";for(;year<=endYear;year++){html+='<option value="'+year+'"'+(year==drawYear?' selected="selected"':"")+">"+year+"</option>"}html+="</select>"}html+=this._get(inst,"yearSuffix");if(showMonthAfterYear){html+=(secondary||!(changeMonth&&changeYear)?"&#xa0;":"")+monthHtml}html+="</div>";return html},_adjustInstDate:function(inst,offset,period){var year=inst.drawYear+(period=="Y"?offset:0);var month=inst.drawMonth+(period=="M"?offset:0);var day=Math.min(inst.selectedDay,this._getDaysInMonth(year,month))+(period=="D"?offset:0);var date=this._restrictMinMax(inst,this._daylightSavingAdjust(new Date(year,month,day)));inst.selectedDay=date.getDate();inst.drawMonth=inst.selectedMonth=date.getMonth();inst.drawYear=inst.selectedYear=date.getFullYear();if(period=="M"||period=="Y"){this._notifyChange(inst)}},_restrictMinMax:function(inst,date){var minDate=this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");date=(minDate&&date<minDate?minDate:date);date=(maxDate&&date>maxDate?maxDate:date);return date},_notifyChange:function(inst){var onChange=this._get(inst,"onChangeMonthYear");if(onChange){onChange.apply((inst.input?inst.input[0]:null),[inst.selectedYear,inst.selectedMonth+1,inst])}},_getNumberOfMonths:function(inst){var numMonths=this._get(inst,"numberOfMonths");return(numMonths==null?[1,1]:(typeof numMonths=="number"?[1,numMonths]:numMonths))},_getMinMaxDate:function(inst,minMax){return this._determineDate(inst,this._get(inst,minMax+"Date"),null)},_getDaysInMonth:function(year,month){return 32-new Date(year,month,32).getDate()},_getFirstDayOfMonth:function(year,month){return new Date(year,month,1).getDay()},_canAdjustMonth:function(inst,offset,curYear,curMonth){var numMonths=this._getNumberOfMonths(inst);var date=this._daylightSavingAdjust(new Date(curYear,curMonth+(offset<0?offset:numMonths[0]*numMonths[1]),1));if(offset<0){date.setDate(this._getDaysInMonth(date.getFullYear(),date.getMonth()))}return this._isInRange(inst,date)},_isInRange:function(inst,date){var minDate=this._getMinMaxDate(inst,"min");var maxDate=this._getMinMaxDate(inst,"max");return((!minDate||date.getTime()>=minDate.getTime())&&(!maxDate||date.getTime()<=maxDate.getTime()))},_getFormatConfig:function(inst){var shortYearCutoff=this._get(inst,"shortYearCutoff");shortYearCutoff=(typeof shortYearCutoff!="string"?shortYearCutoff:new Date().getFullYear()%100+parseInt(shortYearCutoff,10));return{shortYearCutoff:shortYearCutoff,dayNamesShort:this._get(inst,"dayNamesShort"),dayNames:this._get(inst,"dayNames"),monthNamesShort:this._get(inst,"monthNamesShort"),monthNames:this._get(inst,"monthNames")}},_formatDate:function(inst,day,month,year){if(!day){inst.currentDay=inst.selectedDay;inst.currentMonth=inst.selectedMonth;inst.currentYear=inst.selectedYear}var date=(day?(typeof day=="object"?day:this._daylightSavingAdjust(new Date(year,month,day))):this._daylightSavingAdjust(new Date(inst.currentYear,inst.currentMonth,inst.currentDay)));return this.formatDate(this._get(inst,"dateFormat"),date,this._getFormatConfig(inst))}});function extendRemove(target,props){$.extend(target,props);for(var name in props){if(props[name]==null||props[name]==undefined){target[name]=props[name]}}return target}function isArray(a){return(a&&(($.browser.safari&&typeof a=="object"&&a.length)||(a.constructor&&a.constructor.toString().match(/\Array\(\)/))))}$.fn.datepicker=function(options){if(!$.datepicker.initialized){$(document).mousedown($.datepicker._checkExternalClick).find("body").append($.datepicker.dpDiv);$.datepicker.initialized=true}var otherArgs=Array.prototype.slice.call(arguments,1);if(typeof options=="string"&&(options=="isDisabled"||options=="getDate"||options=="widget")){return $.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this[0]].concat(otherArgs))}if(options=="option"&&arguments.length==2&&typeof arguments[1]=="string"){return $.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this[0]].concat(otherArgs))}return this.each(function(){typeof options=="string"?$.datepicker["_"+options+"Datepicker"].apply($.datepicker,[this].concat(otherArgs)):$.datepicker._attachDatepicker(this,options)})};$.datepicker=new Datepicker();$.datepicker.initialized=false;$.datepicker.uuid=new Date().getTime();$.datepicker.version="1.8";window["DP_jQuery_"+dpuuid]=$})(jQuery);;/*
- * jQuery UI Progressbar 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Progressbar
- *
- * Depends:
- *   jquery.ui.core.js
- *   jquery.ui.widget.js
- */
(function(a){a.widget("ui.progressbar",{options:{value:0},_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this._valueMin(),"aria-valuemax":this._valueMax(),"aria-valuenow":this._value()});this.valueDiv=a("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");this.valueDiv.remove();a.Widget.prototype.destroy.apply(this,arguments)},value:function(b){if(b===undefined){return this._value()}this._setOption("value",b);return this},_setOption:function(b,c){switch(b){case"value":this.options.value=c;this._refreshValue();this._trigger("change");break}a.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var b=this.options.value;if(typeof b!=="number"){b=0}if(b<this._valueMin()){b=this._valueMin()}if(b>this._valueMax()){b=this._valueMax()}return b},_valueMin:function(){return 0},_valueMax:function(){return 100},_refreshValue:function(){var b=this.value();this.valueDiv[b===this._valueMax()?"addClass":"removeClass"]("ui-corner-right").width(b+"%");this.element.attr("aria-valuenow",b)}});a.extend(a.ui.progressbar,{version:"1.8"})})(jQuery);;/*
- * jQuery UI Effects 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/
- */
jQuery.effects||(function(g){g.effects={};g.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(l,k){g.fx.step[k]=function(m){if(!m.colorInit){m.start=j(m.elem,k);m.end=i(m.end);m.colorInit=true}m.elem.style[k]="rgb("+Math.max(Math.min(parseInt((m.pos*(m.end[0]-m.start[0]))+m.start[0],10),255),0)+","+Math.max(Math.min(parseInt((m.pos*(m.end[1]-m.start[1]))+m.start[1],10),255),0)+","+Math.max(Math.min(parseInt((m.pos*(m.end[2]-m.start[2]))+m.start[2],10),255),0)+")"}});function i(l){var k;if(l&&l.constructor==Array&&l.length==3){return l}if(k=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(l)){return[parseInt(k[1],10),parseInt(k[2],10),parseInt(k[3],10)]}if(k=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(l)){return[parseFloat(k[1])*2.55,parseFloat(k[2])*2.55,parseFloat(k[3])*2.55]}if(k=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(l)){return[parseInt(k[1],16),parseInt(k[2],16),parseInt(k[3],16)]}if(k=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(l)){return[parseInt(k[1]+k[1],16),parseInt(k[2]+k[2],16),parseInt(k[3]+k[3],16)]}if(k=/rgba\(0, 0, 0, 0\)/.exec(l)){return a.transparent}return a[g.trim(l).toLowerCase()]}function j(m,k){var l;do{l=g.curCSS(m,k);if(l!=""&&l!="transparent"||g.nodeName(m,"body")){break}k="backgroundColor"}while(m=m.parentNode);return i(l)}var a={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]};var e=["add","remove","toggle"],c={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};function f(){var n=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,o={},l,m;if(n&&n.length&&n[0]&&n[n[0]]){var k=n.length;while(k--){l=n[k];if(typeof n[l]=="string"){m=l.replace(/\-(\w)/g,function(p,q){return q.toUpperCase()});o[m]=n[l]}}}else{for(l in n){if(typeof n[l]==="string"){o[l]=n[l]}}}return o}function b(l){var k,m;for(k in l){m=l[k];if(m==null||g.isFunction(m)||k in c||(/scrollbar/).test(k)||(!(/color/i).test(k)&&isNaN(parseFloat(m)))){delete l[k]}}return l}function h(k,m){var n={_:0},l;for(l in m){if(k[l]!=m[l]){n[l]=m[l]}}return n}g.effects.animateClass=function(k,l,n,m){if(g.isFunction(n)){m=n;n=null}return this.each(function(){var r=g(this),o=r.attr("style")||" ",s=b(f.call(this)),q,p=r.attr("className");g.each(e,function(t,u){if(k[u]){r[u+"Class"](k[u])}});q=b(f.call(this));r.attr("className",p);r.animate(h(s,q),l,n,function(){g.each(e,function(t,u){if(k[u]){r[u+"Class"](k[u])}});if(typeof r.attr("style")=="object"){r.attr("style").cssText="";r.attr("style").cssText=o}else{r.attr("style",o)}if(m){m.apply(this,arguments)}})})};g.fn.extend({_addClass:g.fn.addClass,addClass:function(l,k,n,m){return k?g.effects.animateClass.apply(this,[{add:l},k,n,m]):this._addClass(l)},_removeClass:g.fn.removeClass,removeClass:function(l,k,n,m){return k?g.effects.animateClass.apply(this,[{remove:l},k,n,m]):this._removeClass(l)},_toggleClass:g.fn.toggleClass,toggleClass:function(m,l,k,o,n){if(typeof l=="boolean"||l===undefined){if(!k){return this._toggleClass(m,l)}else{return g.effects.animateClass.apply(this,[(l?{add:m}:{remove:m}),k,o,n])}}else{return g.effects.animateClass.apply(this,[{toggle:m},l,k,o])}},switchClass:function(k,m,l,o,n){return g.effects.animateClass.apply(this,[{add:m,remove:k},l,o,n])}});g.extend(g.effects,{version:"1.8",save:function(l,m){for(var k=0;k<m.length;k++){if(m[k]!==null){l.data("ec.storage."+m[k],l[0].style[m[k]])}}},restore:function(l,m){for(var k=0;k<m.length;k++){if(m[k]!==null){l.css(m[k],l.data("ec.storage."+m[k]))}}},setMode:function(k,l){if(l=="toggle"){l=k.is(":hidden")?"show":"hide"}return l},getBaseline:function(l,m){var n,k;switch(l[0]){case"top":n=0;break;case"middle":n=0.5;break;case"bottom":n=1;break;default:n=l[0]/m.height}switch(l[1]){case"left":k=0;break;case"center":k=0.5;break;case"right":k=1;break;default:k=l[1]/m.width}return{x:k,y:n}},createWrapper:function(k){if(k.parent().is(".ui-effects-wrapper")){return k.parent()}var l={width:k.outerWidth(true),height:k.outerHeight(true),"float":k.css("float")},m=g("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",border:"none",margin:0,padding:0});k.wrap(m);m=k.parent();if(k.css("position")=="static"){m.css({position:"relative"});k.css({position:"relative"})}else{g.extend(l,{position:k.css("position"),zIndex:k.css("z-index")});g.each(["top","left","bottom","right"],function(n,o){l[o]=k.css(o);if(isNaN(parseInt(l[o],10))){l[o]="auto"}});k.css({position:"relative",top:0,left:0})}return m.css(l).show()},removeWrapper:function(k){if(k.parent().is(".ui-effects-wrapper")){return k.parent().replaceWith(k)}return k},setTransition:function(l,n,k,m){m=m||{};g.each(n,function(p,o){unit=l.cssUnit(o);if(unit[0]>0){m[o]=unit[0]*k+unit[1]}});return m}});function d(l,k,m,n){if(typeof l=="object"){n=k;m=null;k=l;l=k.effect}if(g.isFunction(k)){n=k;m=null;k={}}if(g.isFunction(m)){n=m;m=null}if(typeof k=="number"||g.fx.speeds[k]){n=m;m=k;k={}}k=k||{};m=m||k.duration;m=g.fx.off?0:typeof m=="number"?m:g.fx.speeds[m]||g.fx.speeds._default;n=n||k.complete;return[l,k,m,n]}g.fn.extend({effect:function(n,m,p,q){var l=d.apply(this,arguments),o={options:l[1],duration:l[2],callback:l[3]},k=g.effects[n];return k&&!g.fx.off?k.call(this,o):this},_show:g.fn.show,show:function(l){if(!l||typeof l=="number"||g.fx.speeds[l]){return this._show.apply(this,arguments)}else{var k=d.apply(this,arguments);k[1].mode="show";return this.effect.apply(this,k)}},_hide:g.fn.hide,hide:function(l){if(!l||typeof l=="number"||g.fx.speeds[l]){return this._hide.apply(this,arguments)}else{var k=d.apply(this,arguments);k[1].mode="hide";return this.effect.apply(this,k)}},__toggle:g.fn.toggle,toggle:function(l){if(!l||typeof l=="number"||g.fx.speeds[l]||typeof l=="boolean"||g.isFunction(l)){return this.__toggle.apply(this,arguments)}else{var k=d.apply(this,arguments);k[1].mode="toggle";return this.effect.apply(this,k)}},cssUnit:function(k){var l=this.css(k),m=[];g.each(["em","px","%","pt"],function(n,o){if(l.indexOf(o)>0){m=[parseFloat(l),o]}});return m}});g.easing.jswing=g.easing.swing;g.extend(g.easing,{def:"easeOutQuad",swing:function(l,m,k,o,n){return g.easing[g.easing.def](l,m,k,o,n)},easeInQuad:function(l,m,k,o,n){return o*(m/=n)*m+k},easeOutQuad:function(l,m,k,o,n){return -o*(m/=n)*(m-2)+k},easeInOutQuad:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m+k}return -o/2*((--m)*(m-2)-1)+k},easeInCubic:function(l,m,k,o,n){return o*(m/=n)*m*m+k},easeOutCubic:function(l,m,k,o,n){return o*((m=m/n-1)*m*m+1)+k},easeInOutCubic:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m*m+k}return o/2*((m-=2)*m*m+2)+k},easeInQuart:function(l,m,k,o,n){return o*(m/=n)*m*m*m+k},easeOutQuart:function(l,m,k,o,n){return -o*((m=m/n-1)*m*m*m-1)+k},easeInOutQuart:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m*m*m+k}return -o/2*((m-=2)*m*m*m-2)+k},easeInQuint:function(l,m,k,o,n){return o*(m/=n)*m*m*m*m+k},easeOutQuint:function(l,m,k,o,n){return o*((m=m/n-1)*m*m*m*m+1)+k},easeInOutQuint:function(l,m,k,o,n){if((m/=n/2)<1){return o/2*m*m*m*m*m+k}return o/2*((m-=2)*m*m*m*m+2)+k},easeInSine:function(l,m,k,o,n){return -o*Math.cos(m/n*(Math.PI/2))+o+k},easeOutSine:function(l,m,k,o,n){return o*Math.sin(m/n*(Math.PI/2))+k},easeInOutSine:function(l,m,k,o,n){return -o/2*(Math.cos(Math.PI*m/n)-1)+k},easeInExpo:function(l,m,k,o,n){return(m==0)?k:o*Math.pow(2,10*(m/n-1))+k},easeOutExpo:function(l,m,k,o,n){return(m==n)?k+o:o*(-Math.pow(2,-10*m/n)+1)+k},easeInOutExpo:function(l,m,k,o,n){if(m==0){return k}if(m==n){return k+o}if((m/=n/2)<1){return o/2*Math.pow(2,10*(m-1))+k}return o/2*(-Math.pow(2,-10*--m)+2)+k},easeInCirc:function(l,m,k,o,n){return -o*(Math.sqrt(1-(m/=n)*m)-1)+k},easeOutCirc:function(l,m,k,o,n){return o*Math.sqrt(1-(m=m/n-1)*m)+k},easeInOutCirc:function(l,m,k,o,n){if((m/=n/2)<1){return -o/2*(Math.sqrt(1-m*m)-1)+k}return o/2*(Math.sqrt(1-(m-=2)*m)+1)+k},easeInElastic:function(l,n,k,u,r){var o=1.70158;var q=0;var m=u;if(n==0){return k}if((n/=r)==1){return k+u}if(!q){q=r*0.3}if(m<Math.abs(u)){m=u;var o=q/4}else{var o=q/(2*Math.PI)*Math.asin(u/m)}return -(m*Math.pow(2,10*(n-=1))*Math.sin((n*r-o)*(2*Math.PI)/q))+k},easeOutElastic:function(l,n,k,u,r){var o=1.70158;var q=0;var m=u;if(n==0){return k}if((n/=r)==1){return k+u}if(!q){q=r*0.3}if(m<Math.abs(u)){m=u;var o=q/4}else{var o=q/(2*Math.PI)*Math.asin(u/m)}return m*Math.pow(2,-10*n)*Math.sin((n*r-o)*(2*Math.PI)/q)+u+k},easeInOutElastic:function(l,n,k,u,r){var o=1.70158;var q=0;var m=u;if(n==0){return k}if((n/=r/2)==2){return k+u}if(!q){q=r*(0.3*1.5)}if(m<Math.abs(u)){m=u;var o=q/4}else{var o=q/(2*Math.PI)*Math.asin(u/m)}if(n<1){return -0.5*(m*Math.pow(2,10*(n-=1))*Math.sin((n*r-o)*(2*Math.PI)/q))+k}return m*Math.pow(2,-10*(n-=1))*Math.sin((n*r-o)*(2*Math.PI)/q)*0.5+u+k},easeInBack:function(l,m,k,p,o,n){if(n==undefined){n=1.70158}return p*(m/=o)*m*((n+1)*m-n)+k},easeOutBack:function(l,m,k,p,o,n){if(n==undefined){n=1.70158}return p*((m=m/o-1)*m*((n+1)*m+n)+1)+k},easeInOutBack:function(l,m,k,p,o,n){if(n==undefined){n=1.70158}if((m/=o/2)<1){return p/2*(m*m*(((n*=(1.525))+1)*m-n))+k}return p/2*((m-=2)*m*(((n*=(1.525))+1)*m+n)+2)+k},easeInBounce:function(l,m,k,o,n){return o-g.easing.easeOutBounce(l,n-m,0,o,n)+k},easeOutBounce:function(l,m,k,o,n){if((m/=n)<(1/2.75)){return o*(7.5625*m*m)+k}else{if(m<(2/2.75)){return o*(7.5625*(m-=(1.5/2.75))*m+0.75)+k}else{if(m<(2.5/2.75)){return o*(7.5625*(m-=(2.25/2.75))*m+0.9375)+k}else{return o*(7.5625*(m-=(2.625/2.75))*m+0.984375)+k}}}},easeInOutBounce:function(l,m,k,o,n){if(m<n/2){return g.easing.easeInBounce(l,m*2,0,o,n)*0.5+k}return g.easing.easeOutBounce(l,m*2-n,0,o,n)*0.5+o*0.5+k}})})(jQuery);;/*
- * jQuery UI Effects Blind 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Blind
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.blind=function(b){return this.queue(function(){var d=a(this),c=["position","top","left"];var h=a.effects.setMode(d,b.options.mode||"hide");var g=b.options.direction||"vertical";a.effects.save(d,c);d.show();var j=a.effects.createWrapper(d).css({overflow:"hidden"});var e=(g=="vertical")?"height":"width";var i=(g=="vertical")?j.height():j.width();if(h=="show"){j.css(e,0)}var f={};f[e]=h=="show"?i:0;j.animate(f,b.duration,b.options.easing,function(){if(h=="hide"){d.hide()}a.effects.restore(d,c);a.effects.removeWrapper(d);if(b.callback){b.callback.apply(d[0],arguments)}d.dequeue()})})}})(jQuery);;/*
- * jQuery UI Effects Bounce 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Bounce
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.bounce=function(b){return this.queue(function(){var e=a(this),l=["position","top","left"];var k=a.effects.setMode(e,b.options.mode||"effect");var n=b.options.direction||"up";var c=b.options.distance||20;var d=b.options.times||5;var g=b.duration||250;if(/show|hide/.test(k)){l.push("opacity")}a.effects.save(e,l);e.show();a.effects.createWrapper(e);var f=(n=="up"||n=="down")?"top":"left";var p=(n=="up"||n=="left")?"pos":"neg";var c=b.options.distance||(f=="top"?e.outerHeight({margin:true})/3:e.outerWidth({margin:true})/3);if(k=="show"){e.css("opacity",0).css(f,p=="pos"?-c:c)}if(k=="hide"){c=c/(d*2)}if(k!="hide"){d--}if(k=="show"){var h={opacity:1};h[f]=(p=="pos"?"+=":"-=")+c;e.animate(h,g/2,b.options.easing);c=c/2;d--}for(var j=0;j<d;j++){var o={},m={};o[f]=(p=="pos"?"-=":"+=")+c;m[f]=(p=="pos"?"+=":"-=")+c;e.animate(o,g/2,b.options.easing).animate(m,g/2,b.options.easing);c=(k=="hide")?c*2:c/2}if(k=="hide"){var h={opacity:0};h[f]=(p=="pos"?"-=":"+=")+c;e.animate(h,g/2,b.options.easing,function(){e.hide();a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}})}else{var o={},m={};o[f]=(p=="pos"?"-=":"+=")+c;m[f]=(p=="pos"?"+=":"-=")+c;e.animate(o,g/2,b.options.easing).animate(m,g/2,b.options.easing,function(){a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}})}e.queue("fx",function(){e.dequeue()});e.dequeue()})}})(jQuery);;/*
- * jQuery UI Effects Clip 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Clip
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.clip=function(b){return this.queue(function(){var f=a(this),j=["position","top","left","height","width"];var i=a.effects.setMode(f,b.options.mode||"hide");var k=b.options.direction||"vertical";a.effects.save(f,j);f.show();var c=a.effects.createWrapper(f).css({overflow:"hidden"});var e=f[0].tagName=="IMG"?c:f;var g={size:(k=="vertical")?"height":"width",position:(k=="vertical")?"top":"left"};var d=(k=="vertical")?e.height():e.width();if(i=="show"){e.css(g.size,0);e.css(g.position,d/2)}var h={};h[g.size]=i=="show"?d:0;h[g.position]=i=="show"?0:d/2;e.animate(h,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){f.hide()}a.effects.restore(f,j);a.effects.removeWrapper(f);if(b.callback){b.callback.apply(f[0],arguments)}f.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Drop 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Drop
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.drop=function(b){return this.queue(function(){var e=a(this),d=["position","top","left","opacity"];var i=a.effects.setMode(e,b.options.mode||"hide");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e);var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true})/2:e.outerWidth({margin:true})/2);if(i=="show"){e.css("opacity",0).css(f,c=="pos"?-j:j)}var g={opacity:i=="show"?1:0};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Explode 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Explode
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.explode=function(b){return this.queue(function(){var k=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;var e=b.options.pieces?Math.round(Math.sqrt(b.options.pieces)):3;b.options.mode=b.options.mode=="toggle"?(a(this).is(":visible")?"hide":"show"):b.options.mode;var h=a(this).show().css("visibility","hidden");var l=h.offset();l.top-=parseInt(h.css("marginTop"),10)||0;l.left-=parseInt(h.css("marginLeft"),10)||0;var g=h.outerWidth(true);var c=h.outerHeight(true);for(var f=0;f<k;f++){for(var d=0;d<e;d++){h.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-d*(g/e),top:-f*(c/k)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:g/e,height:c/k,left:l.left+d*(g/e)+(b.options.mode=="show"?(d-Math.floor(e/2))*(g/e):0),top:l.top+f*(c/k)+(b.options.mode=="show"?(f-Math.floor(k/2))*(c/k):0),opacity:b.options.mode=="show"?0:1}).animate({left:l.left+d*(g/e)+(b.options.mode=="show"?0:(d-Math.floor(e/2))*(g/e)),top:l.top+f*(c/k)+(b.options.mode=="show"?0:(f-Math.floor(k/2))*(c/k)),opacity:b.options.mode=="show"?1:0},b.duration||500)}}setTimeout(function(){b.options.mode=="show"?h.css({visibility:"visible"}):h.css({visibility:"visible"}).hide();if(b.callback){b.callback.apply(h[0])}h.dequeue();a("div.ui-effects-explode").remove()},b.duration||500)})}})(jQuery);;/*
- * jQuery UI Effects Fold 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Fold
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.fold=function(b){return this.queue(function(){var e=a(this),k=["position","top","left"];var h=a.effects.setMode(e,b.options.mode||"hide");var o=b.options.size||15;var n=!(!b.options.horizFirst);var g=b.duration?b.duration/2:a.fx.speeds._default/2;a.effects.save(e,k);e.show();var d=a.effects.createWrapper(e).css({overflow:"hidden"});var i=((h=="show")!=n);var f=i?["width","height"]:["height","width"];var c=i?[d.width(),d.height()]:[d.height(),d.width()];var j=/([0-9]+)%/.exec(o);if(j){o=parseInt(j[1],10)/100*c[h=="hide"?0:1]}if(h=="show"){d.css(n?{height:0,width:o}:{height:o,width:0})}var m={},l={};m[f[0]]=h=="show"?c[0]:o;l[f[1]]=h=="show"?c[1]:0;d.animate(m,g,b.options.easing).animate(l,g,b.options.easing,function(){if(h=="hide"){e.hide()}a.effects.restore(e,k);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(e[0],arguments)}e.dequeue()})})}})(jQuery);;/*
- * jQuery UI Effects Highlight 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Highlight
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.highlight=function(b){return this.queue(function(){var d=a(this),c=["backgroundImage","backgroundColor","opacity"],f=a.effects.setMode(d,b.options.mode||"show"),e={backgroundColor:d.css("backgroundColor")};if(f=="hide"){e.opacity=0}a.effects.save(d,c);d.show().css({backgroundImage:"none",backgroundColor:b.options.color||"#ffff99"}).animate(e,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){(f=="hide"&&d.hide());a.effects.restore(d,c);(f=="show"&&!a.support.opacity&&this.style.removeAttribute("filter"));(b.callback&&b.callback.apply(this,arguments));d.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Pulsate 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Pulsate
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.pulsate=function(b){return this.queue(function(){var d=a(this),e=a.effects.setMode(d,b.options.mode||"show");times=((b.options.times||5)*2)-1;duration=b.duration?b.duration/2:a.fx.speeds._default/2,isVisible=d.is(":visible"),animateTo=0;if(!isVisible){d.css("opacity",0).show();animateTo=1}if((e=="hide"&&isVisible)||(e=="show"&&!isVisible)){times--}for(var c=0;c<times;c++){d.animate({opacity:animateTo},duration,b.options.easing);animateTo=(animateTo+1)%2}d.animate({opacity:animateTo},duration,b.options.easing,function(){if(animateTo==0){d.hide()}(b.callback&&b.callback.apply(this,arguments))});d.queue("fx",function(){d.dequeue()}).dequeue()})}})(jQuery);;/*
- * jQuery UI Effects Scale 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Scale
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.puff=function(b){return this.queue(function(){var f=a(this),g=a.effects.setMode(f,b.options.mode||"hide"),e=parseInt(b.options.percent,10)||150,d=e/100,c={height:f.height(),width:f.width()};a.extend(b.options,{fade:true,mode:g,percent:g=="hide"?e:100,from:g=="hide"?c:{height:c.height*d,width:c.width*d}});f.effect("scale",b.options,b.duration,b.callback);f.dequeue()})};a.effects.scale=function(b){return this.queue(function(){var g=a(this);var d=a.extend(true,{},b.options);var j=a.effects.setMode(g,b.options.mode||"effect");var h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:(j=="hide"?0:100));var i=b.options.direction||"both";var c=b.options.origin;if(j!="effect"){d.origin=c||["middle","center"];d.restore=true}var f={height:g.height(),width:g.width()};g.from=b.options.from||(j=="show"?{height:0,width:0}:f);var e={y:i!="horizontal"?(h/100):1,x:i!="vertical"?(h/100):1};g.to={height:f.height*e.y,width:f.width*e.x};if(b.options.fade){if(j=="show"){g.from.opacity=0;g.to.opacity=1}if(j=="hide"){g.from.opacity=1;g.to.opacity=0}}d.from=g.from;d.to=g.to;d.mode=j;g.effect("size",d,b.duration,b.callback);g.dequeue()})};a.effects.size=function(b){return this.queue(function(){var c=a(this),n=["position","top","left","width","height","overflow","opacity"];var m=["position","top","left","overflow","opacity"];var j=["width","height","overflow"];var p=["fontSize"];var k=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"];var f=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"];var g=a.effects.setMode(c,b.options.mode||"effect");var i=b.options.restore||false;var e=b.options.scale||"both";var o=b.options.origin;var d={height:c.height(),width:c.width()};c.from=b.options.from||d;c.to=b.options.to||d;if(o){var h=a.effects.getBaseline(o,d);c.from.top=(d.height-c.from.height)*h.y;c.from.left=(d.width-c.from.width)*h.x;c.to.top=(d.height-c.to.height)*h.y;c.to.left=(d.width-c.to.width)*h.x}var l={from:{y:c.from.height/d.height,x:c.from.width/d.width},to:{y:c.to.height/d.height,x:c.to.width/d.width}};if(e=="box"||e=="both"){if(l.from.y!=l.to.y){n=n.concat(k);c.from=a.effects.setTransition(c,k,l.from.y,c.from);c.to=a.effects.setTransition(c,k,l.to.y,c.to)}if(l.from.x!=l.to.x){n=n.concat(f);c.from=a.effects.setTransition(c,f,l.from.x,c.from);c.to=a.effects.setTransition(c,f,l.to.x,c.to)}}if(e=="content"||e=="both"){if(l.from.y!=l.to.y){n=n.concat(p);c.from=a.effects.setTransition(c,p,l.from.y,c.from);c.to=a.effects.setTransition(c,p,l.to.y,c.to)}}a.effects.save(c,i?n:m);c.show();a.effects.createWrapper(c);c.css("overflow","hidden").css(c.from);if(e=="content"||e=="both"){k=k.concat(["marginTop","marginBottom"]).concat(p);f=f.concat(["marginLeft","marginRight"]);j=n.concat(k).concat(f);c.find("*[width]").each(function(){child=a(this);if(i){a.effects.save(child,j)}var q={height:child.height(),width:child.width()};child.from={height:q.height*l.from.y,width:q.width*l.from.x};child.to={height:q.height*l.to.y,width:q.width*l.to.x};if(l.from.y!=l.to.y){child.from=a.effects.setTransition(child,k,l.from.y,child.from);child.to=a.effects.setTransition(child,k,l.to.y,child.to)}if(l.from.x!=l.to.x){child.from=a.effects.setTransition(child,f,l.from.x,child.from);child.to=a.effects.setTransition(child,f,l.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){if(i){a.effects.restore(child,j)}})})}c.animate(c.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(c.to.opacity===0){c.css("opacity",c.from.opacity)}if(g=="hide"){c.hide()}a.effects.restore(c,i?n:m);a.effects.removeWrapper(c);if(b.callback){b.callback.apply(this,arguments)}c.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Shake 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Shake
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.shake=function(b){return this.queue(function(){var e=a(this),l=["position","top","left"];var k=a.effects.setMode(e,b.options.mode||"effect");var n=b.options.direction||"left";var c=b.options.distance||20;var d=b.options.times||3;var g=b.duration||b.options.duration||140;a.effects.save(e,l);e.show();a.effects.createWrapper(e);var f=(n=="up"||n=="down")?"top":"left";var p=(n=="up"||n=="left")?"pos":"neg";var h={},o={},m={};h[f]=(p=="pos"?"-=":"+=")+c;o[f]=(p=="pos"?"+=":"-=")+c*2;m[f]=(p=="pos"?"-=":"+=")+c*2;e.animate(h,g,b.options.easing);for(var j=1;j<d;j++){e.animate(o,g,b.options.easing).animate(m,g,b.options.easing)}e.animate(o,g,b.options.easing).animate(h,g/2,b.options.easing,function(){a.effects.restore(e,l);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}});e.queue("fx",function(){e.dequeue()});e.dequeue()})}})(jQuery);;/*
- * jQuery UI Effects Slide 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Slide
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.slide=function(b){return this.queue(function(){var e=a(this),d=["position","top","left"];var i=a.effects.setMode(e,b.options.mode||"show");var h=b.options.direction||"left";a.effects.save(e,d);e.show();a.effects.createWrapper(e).css({overflow:"hidden"});var f=(h=="up"||h=="down")?"top":"left";var c=(h=="up"||h=="left")?"pos":"neg";var j=b.options.distance||(f=="top"?e.outerHeight({margin:true}):e.outerWidth({margin:true}));if(i=="show"){e.css(f,c=="pos"?-j:j)}var g={};g[f]=(i=="show"?(c=="pos"?"+=":"-="):(c=="pos"?"-=":"+="))+j;e.animate(g,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){if(i=="hide"){e.hide()}a.effects.restore(e,d);a.effects.removeWrapper(e);if(b.callback){b.callback.apply(this,arguments)}e.dequeue()}})})}})(jQuery);;/*
- * jQuery UI Effects Transfer 1.8
- *
- * Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about)
- * Dual licensed under the MIT (MIT-LICENSE.txt)
- * and GPL (GPL-LICENSE.txt) licenses.
- *
- * http://docs.jquery.com/UI/Effects/Transfer
- *
- * Depends:
- *	jquery.effects.core.js
- */
(function(a){a.effects.transfer=function(b){return this.queue(function(){var f=a(this),h=a(b.options.to),e=h.offset(),g={top:e.top,left:e.left,height:h.innerHeight(),width:h.innerWidth()},d=f.offset(),c=a('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(b.options.className).css({top:d.top,left:d.left,height:f.innerHeight(),width:f.innerWidth(),position:"absolute"}).animate(g,b.duration,b.options.easing,function(){c.remove();(b.callback&&b.callback.apply(f[0],arguments));f.dequeue()})})}})(jQuery);;
+(function(b){b.widget("ui.mouse",{options:{cancel:":input,option",distance:1,delay:0},_mouseInit:function(){var a=this;this.element.bind("mousedown."+this.widgetName,function(c){return a._mouseDown(c)}).bind("click."+this.widgetName,function(c){if(true===b.data(c.target,a.widgetName+".preventClickEvent")){b.removeData(c.target,a.widgetName+".preventClickEvent");c.stopImmediatePropagation();return false}});this.started=false},_mouseDestroy:function(){this.element.unbind("."+this.widgetName)},_mouseDown:function(a){a.originalEvent=
+a.originalEvent||{};if(!a.originalEvent.mouseHandled){this._mouseStarted&&this._mouseUp(a);this._mouseDownEvent=a;var c=this,e=a.which==1,f=typeof this.options.cancel=="string"?b(a.target).parents().add(a.target).filter(this.options.cancel).length:false;if(!e||f||!this._mouseCapture(a))return true;this.mouseDelayMet=!this.options.delay;if(!this.mouseDelayMet)this._mouseDelayTimer=setTimeout(function(){c.mouseDelayMet=true},this.options.delay);if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a)){this._mouseStarted=
+this._mouseStart(a)!==false;if(!this._mouseStarted){a.preventDefault();return true}}true===b.data(a.target,this.widgetName+".preventClickEvent")&&b.removeData(a.target,this.widgetName+".preventClickEvent");this._mouseMoveDelegate=function(d){return c._mouseMove(d)};this._mouseUpDelegate=function(d){return c._mouseUp(d)};b(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate);a.preventDefault();return a.originalEvent.mouseHandled=
+true}},_mouseMove:function(a){if(b.browser.msie&&!(document.documentMode>=9)&&!a.button)return this._mouseUp(a);if(this._mouseStarted){this._mouseDrag(a);return a.preventDefault()}if(this._mouseDistanceMet(a)&&this._mouseDelayMet(a))(this._mouseStarted=this._mouseStart(this._mouseDownEvent,a)!==false)?this._mouseDrag(a):this._mouseUp(a);return!this._mouseStarted},_mouseUp:function(a){b(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate);
+if(this._mouseStarted){this._mouseStarted=false;a.target==this._mouseDownEvent.target&&b.data(a.target,this.widgetName+".preventClickEvent",true);this._mouseStop(a)}return false},_mouseDistanceMet:function(a){return Math.max(Math.abs(this._mouseDownEvent.pageX-a.pageX),Math.abs(this._mouseDownEvent.pageY-a.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return true}})})(jQuery);
+;/*
+ * jQuery UI Position 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Position
+ */
+(function(c){c.ui=c.ui||{};var n=/left|center|right/,o=/top|center|bottom/,t=c.fn.position,u=c.fn.offset;c.fn.position=function(b){if(!b||!b.of)return t.apply(this,arguments);b=c.extend({},b);var a=c(b.of),d=a[0],g=(b.collision||"flip").split(" "),e=b.offset?b.offset.split(" "):[0,0],h,k,j;if(d.nodeType===9){h=a.width();k=a.height();j={top:0,left:0}}else if(d.setTimeout){h=a.width();k=a.height();j={top:a.scrollTop(),left:a.scrollLeft()}}else if(d.preventDefault){b.at="left top";h=k=0;j={top:b.of.pageY,
+left:b.of.pageX}}else{h=a.outerWidth();k=a.outerHeight();j=a.offset()}c.each(["my","at"],function(){var f=(b[this]||"").split(" ");if(f.length===1)f=n.test(f[0])?f.concat(["center"]):o.test(f[0])?["center"].concat(f):["center","center"];f[0]=n.test(f[0])?f[0]:"center";f[1]=o.test(f[1])?f[1]:"center";b[this]=f});if(g.length===1)g[1]=g[0];e[0]=parseInt(e[0],10)||0;if(e.length===1)e[1]=e[0];e[1]=parseInt(e[1],10)||0;if(b.at[0]==="right")j.left+=h;else if(b.at[0]==="center")j.left+=h/2;if(b.at[1]==="bottom")j.top+=
+k;else if(b.at[1]==="center")j.top+=k/2;j.left+=e[0];j.top+=e[1];return this.each(function(){var f=c(this),l=f.outerWidth(),m=f.outerHeight(),p=parseInt(c.curCSS(this,"marginLeft",true))||0,q=parseInt(c.curCSS(this,"marginTop",true))||0,v=l+p+(parseInt(c.curCSS(this,"marginRight",true))||0),w=m+q+(parseInt(c.curCSS(this,"marginBottom",true))||0),i=c.extend({},j),r;if(b.my[0]==="right")i.left-=l;else if(b.my[0]==="center")i.left-=l/2;if(b.my[1]==="bottom")i.top-=m;else if(b.my[1]==="center")i.top-=
+m/2;i.left=Math.round(i.left);i.top=Math.round(i.top);r={left:i.left-p,top:i.top-q};c.each(["left","top"],function(s,x){c.ui.position[g[s]]&&c.ui.position[g[s]][x](i,{targetWidth:h,targetHeight:k,elemWidth:l,elemHeight:m,collisionPosition:r,collisionWidth:v,collisionHeight:w,offset:e,my:b.my,at:b.at})});c.fn.bgiframe&&f.bgiframe();f.offset(c.extend(i,{using:b.using}))})};c.ui.position={fit:{left:function(b,a){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();b.left=
+d>0?b.left-d:Math.max(b.left-a.collisionPosition.left,b.left)},top:function(b,a){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();b.top=d>0?b.top-d:Math.max(b.top-a.collisionPosition.top,b.top)}},flip:{left:function(b,a){if(a.at[0]!=="center"){var d=c(window);d=a.collisionPosition.left+a.collisionWidth-d.width()-d.scrollLeft();var g=a.my[0]==="left"?-a.elemWidth:a.my[0]==="right"?a.elemWidth:0,e=a.at[0]==="left"?a.targetWidth:-a.targetWidth,h=-2*a.offset[0];b.left+=
+a.collisionPosition.left<0?g+e+h:d>0?g+e+h:0}},top:function(b,a){if(a.at[1]!=="center"){var d=c(window);d=a.collisionPosition.top+a.collisionHeight-d.height()-d.scrollTop();var g=a.my[1]==="top"?-a.elemHeight:a.my[1]==="bottom"?a.elemHeight:0,e=a.at[1]==="top"?a.targetHeight:-a.targetHeight,h=-2*a.offset[1];b.top+=a.collisionPosition.top<0?g+e+h:d>0?g+e+h:0}}}};if(!c.offset.setOffset){c.offset.setOffset=function(b,a){if(/static/.test(c.curCSS(b,"position")))b.style.position="relative";var d=c(b),
+g=d.offset(),e=parseInt(c.curCSS(b,"top",true),10)||0,h=parseInt(c.curCSS(b,"left",true),10)||0;g={top:a.top-g.top+e,left:a.left-g.left+h};"using"in a?a.using.call(b,g):d.css(g)};c.fn.offset=function(b){var a=this[0];if(!a||!a.ownerDocument)return null;if(b)return this.each(function(){c.offset.setOffset(this,b)});return u.call(this)}}})(jQuery);
+;/*
+ * jQuery UI Draggable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Draggables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.draggable",d.ui.mouse,{widgetEventPrefix:"drag",options:{addClasses:true,appendTo:"parent",axis:false,connectToSortable:false,containment:false,cursor:"auto",cursorAt:false,grid:false,handle:false,helper:"original",iframeFix:false,opacity:false,refreshPositions:false,revert:false,revertDuration:500,scope:"default",scroll:true,scrollSensitivity:20,scrollSpeed:20,snap:false,snapMode:"both",snapTolerance:20,stack:false,zIndex:false},_create:function(){if(this.options.helper==
+"original"&&!/^(?:r|a|f)/.test(this.element.css("position")))this.element[0].style.position="relative";this.options.addClasses&&this.element.addClass("ui-draggable");this.options.disabled&&this.element.addClass("ui-draggable-disabled");this._mouseInit()},destroy:function(){if(this.element.data("draggable")){this.element.removeData("draggable").unbind(".draggable").removeClass("ui-draggable ui-draggable-dragging ui-draggable-disabled");this._mouseDestroy();return this}},_mouseCapture:function(a){var b=
+this.options;if(this.helper||b.disabled||d(a.target).is(".ui-resizable-handle"))return false;this.handle=this._getHandle(a);if(!this.handle)return false;return true},_mouseStart:function(a){var b=this.options;this.helper=this._createHelper(a);this._cacheHelperProportions();if(d.ui.ddmanager)d.ui.ddmanager.current=this;this._cacheMargins();this.cssPosition=this.helper.css("position");this.scrollParent=this.helper.scrollParent();this.offset=this.positionAbs=this.element.offset();this.offset={top:this.offset.top-
+this.margins.top,left:this.offset.left-this.margins.left};d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this.position=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);b.containment&&this._setContainment();if(this._trigger("start",a)===false){this._clear();return false}this._cacheHelperProportions();
+d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.helper.addClass("ui-draggable-dragging");this._mouseDrag(a,true);return true},_mouseDrag:function(a,b){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!b){b=this._uiHash();if(this._trigger("drag",a,b)===false){this._mouseUp({});return false}this.position=b.position}if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||
+this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);return false},_mouseStop:function(a){var b=false;if(d.ui.ddmanager&&!this.options.dropBehaviour)b=d.ui.ddmanager.drop(this,a);if(this.dropped){b=this.dropped;this.dropped=false}if((!this.element[0]||!this.element[0].parentNode)&&this.options.helper=="original")return false;if(this.options.revert=="invalid"&&!b||this.options.revert=="valid"&&b||this.options.revert===true||d.isFunction(this.options.revert)&&
+this.options.revert.call(this.element,b)){var c=this;d(this.helper).animate(this.originalPosition,parseInt(this.options.revertDuration,10),function(){c._trigger("stop",a)!==false&&c._clear()})}else this._trigger("stop",a)!==false&&this._clear();return false},cancel:function(){this.helper.is(".ui-draggable-dragging")?this._mouseUp({}):this._clear();return this},_getHandle:function(a){var b=!this.options.handle||!d(this.options.handle,this.element).length?true:false;d(this.options.handle,this.element).find("*").andSelf().each(function(){if(this==
+a.target)b=true});return b},_createHelper:function(a){var b=this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a])):b.helper=="clone"?this.element.clone():this.element;a.parents("body").length||a.appendTo(b.appendTo=="parent"?this.element[0].parentNode:b.appendTo);a[0]!=this.element[0]&&!/(fixed|absolute)/.test(a.css("position"))&&a.css("position","absolute");return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||
+0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a={top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.element.position();return{top:a.top-
+(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.element.css("marginLeft"),10)||0,top:parseInt(this.element.css("marginTop"),10)||0,right:parseInt(this.element.css("marginRight"),10)||0,bottom:parseInt(this.element.css("marginBottom"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),
+height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[(a.containment=="document"?0:d(window).scrollLeft())-this.offset.relative.left-this.offset.parent.left,(a.containment=="document"?0:d(window).scrollTop())-this.offset.relative.top-this.offset.parent.top,(a.containment=="document"?0:d(window).scrollLeft())+d(a.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(a.containment=="document"?0:d(window).scrollTop())+(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)&&a.containment.constructor!=Array){var b=d(a.containment)[0];if(b){a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),
+10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0),a.top+(parseInt(d(b).css("borderTopWidth"),10)||0)+(parseInt(d(b).css("paddingTop"),10)||0),a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left-this.margins.right,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),
+10)||0)-this.helperProportions.height-this.margins.top-this.margins.bottom]}}else if(a.containment.constructor==Array)this.containment=a.containment},_convertPositionTo:function(a,b){if(!b)b=this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&
+d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():f?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],
+this.offsetParent[0]))?this.offsetParent:this.scrollParent,f=/(html|body)/i.test(c[0].tagName),e=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])e=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])e=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=
+this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;e=this.originalPageX+Math.round((e-this.originalPageX)/b.grid[0])*b.grid[0];e=this.containment?!(e-this.offset.click.left<this.containment[0]||e-this.offset.click.left>this.containment[2])?
+e:!(e-this.offset.click.left<this.containment[0])?e-b.grid[0]:e+b.grid[0]:e}}return{top:g-this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():f?0:c.scrollTop()),left:e-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&d.browser.version<526&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():
+f?0:c.scrollLeft())}},_clear:function(){this.helper.removeClass("ui-draggable-dragging");this.helper[0]!=this.element[0]&&!this.cancelHelperRemoval&&this.helper.remove();this.helper=null;this.cancelHelperRemoval=false},_trigger:function(a,b,c){c=c||this._uiHash();d.ui.plugin.call(this,a,[b,c]);if(a=="drag")this.positionAbs=this._convertPositionTo("absolute");return d.Widget.prototype._trigger.call(this,a,b,c)},plugins:{},_uiHash:function(){return{helper:this.helper,position:this.position,originalPosition:this.originalPosition,
+offset:this.positionAbs}}});d.extend(d.ui.draggable,{version:"1.8.12"});d.ui.plugin.add("draggable","connectToSortable",{start:function(a,b){var c=d(this).data("draggable"),f=c.options,e=d.extend({},b,{item:c.element});c.sortables=[];d(f.connectToSortable).each(function(){var g=d.data(this,"sortable");if(g&&!g.options.disabled){c.sortables.push({instance:g,shouldRevert:g.options.revert});g.refreshPositions();g._trigger("activate",a,e)}})},stop:function(a,b){var c=d(this).data("draggable"),f=d.extend({},
+b,{item:c.element});d.each(c.sortables,function(){if(this.instance.isOver){this.instance.isOver=0;c.cancelHelperRemoval=true;this.instance.cancelHelperRemoval=false;if(this.shouldRevert)this.instance.options.revert=true;this.instance._mouseStop(a);this.instance.options.helper=this.instance.options._helper;c.options.helper=="original"&&this.instance.currentItem.css({top:"auto",left:"auto"})}else{this.instance.cancelHelperRemoval=false;this.instance._trigger("deactivate",a,f)}})},drag:function(a,b){var c=
+d(this).data("draggable"),f=this;d.each(c.sortables,function(){this.instance.positionAbs=c.positionAbs;this.instance.helperProportions=c.helperProportions;this.instance.offset.click=c.offset.click;if(this.instance._intersectsWith(this.instance.containerCache)){if(!this.instance.isOver){this.instance.isOver=1;this.instance.currentItem=d(f).clone().appendTo(this.instance.element).data("sortable-item",true);this.instance.options._helper=this.instance.options.helper;this.instance.options.helper=function(){return b.helper[0]};
+a.target=this.instance.currentItem[0];this.instance._mouseCapture(a,true);this.instance._mouseStart(a,true,true);this.instance.offset.click.top=c.offset.click.top;this.instance.offset.click.left=c.offset.click.left;this.instance.offset.parent.left-=c.offset.parent.left-this.instance.offset.parent.left;this.instance.offset.parent.top-=c.offset.parent.top-this.instance.offset.parent.top;c._trigger("toSortable",a);c.dropped=this.instance.element;c.currentItem=c.element;this.instance.fromOutside=c}this.instance.currentItem&&
+this.instance._mouseDrag(a)}else if(this.instance.isOver){this.instance.isOver=0;this.instance.cancelHelperRemoval=true;this.instance.options.revert=false;this.instance._trigger("out",a,this.instance._uiHash(this.instance));this.instance._mouseStop(a,true);this.instance.options.helper=this.instance.options._helper;this.instance.currentItem.remove();this.instance.placeholder&&this.instance.placeholder.remove();c._trigger("fromSortable",a);c.dropped=false}})}});d.ui.plugin.add("draggable","cursor",
+{start:function(){var a=d("body"),b=d(this).data("draggable").options;if(a.css("cursor"))b._cursor=a.css("cursor");a.css("cursor",b.cursor)},stop:function(){var a=d(this).data("draggable").options;a._cursor&&d("body").css("cursor",a._cursor)}});d.ui.plugin.add("draggable","iframeFix",{start:function(){var a=d(this).data("draggable").options;d(a.iframeFix===true?"iframe":a.iframeFix).each(function(){d('<div class="ui-draggable-iframeFix" style="background: #fff;"></div>').css({width:this.offsetWidth+
+"px",height:this.offsetHeight+"px",position:"absolute",opacity:"0.001",zIndex:1E3}).css(d(this).offset()).appendTo("body")})},stop:function(){d("div.ui-draggable-iframeFix").each(function(){this.parentNode.removeChild(this)})}});d.ui.plugin.add("draggable","opacity",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("opacity"))b._opacity=a.css("opacity");a.css("opacity",b.opacity)},stop:function(a,b){a=d(this).data("draggable").options;a._opacity&&d(b.helper).css("opacity",
+a._opacity)}});d.ui.plugin.add("draggable","scroll",{start:function(){var a=d(this).data("draggable");if(a.scrollParent[0]!=document&&a.scrollParent[0].tagName!="HTML")a.overflowOffset=a.scrollParent.offset()},drag:function(a){var b=d(this).data("draggable"),c=b.options,f=false;if(b.scrollParent[0]!=document&&b.scrollParent[0].tagName!="HTML"){if(!c.axis||c.axis!="x")if(b.overflowOffset.top+b.scrollParent[0].offsetHeight-a.pageY<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop+
+c.scrollSpeed;else if(a.pageY-b.overflowOffset.top<c.scrollSensitivity)b.scrollParent[0].scrollTop=f=b.scrollParent[0].scrollTop-c.scrollSpeed;if(!c.axis||c.axis!="y")if(b.overflowOffset.left+b.scrollParent[0].offsetWidth-a.pageX<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft+c.scrollSpeed;else if(a.pageX-b.overflowOffset.left<c.scrollSensitivity)b.scrollParent[0].scrollLeft=f=b.scrollParent[0].scrollLeft-c.scrollSpeed}else{if(!c.axis||c.axis!="x")if(a.pageY-d(document).scrollTop()<
+c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()-c.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<c.scrollSensitivity)f=d(document).scrollTop(d(document).scrollTop()+c.scrollSpeed);if(!c.axis||c.axis!="y")if(a.pageX-d(document).scrollLeft()<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()-c.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<c.scrollSensitivity)f=d(document).scrollLeft(d(document).scrollLeft()+
+c.scrollSpeed)}f!==false&&d.ui.ddmanager&&!c.dropBehaviour&&d.ui.ddmanager.prepareOffsets(b,a)}});d.ui.plugin.add("draggable","snap",{start:function(){var a=d(this).data("draggable"),b=a.options;a.snapElements=[];d(b.snap.constructor!=String?b.snap.items||":data(draggable)":b.snap).each(function(){var c=d(this),f=c.offset();this!=a.element[0]&&a.snapElements.push({item:this,width:c.outerWidth(),height:c.outerHeight(),top:f.top,left:f.left})})},drag:function(a,b){for(var c=d(this).data("draggable"),
+f=c.options,e=f.snapTolerance,g=b.offset.left,n=g+c.helperProportions.width,m=b.offset.top,o=m+c.helperProportions.height,h=c.snapElements.length-1;h>=0;h--){var i=c.snapElements[h].left,k=i+c.snapElements[h].width,j=c.snapElements[h].top,l=j+c.snapElements[h].height;if(i-e<g&&g<k+e&&j-e<m&&m<l+e||i-e<g&&g<k+e&&j-e<o&&o<l+e||i-e<n&&n<k+e&&j-e<m&&m<l+e||i-e<n&&n<k+e&&j-e<o&&o<l+e){if(f.snapMode!="inner"){var p=Math.abs(j-o)<=e,q=Math.abs(l-m)<=e,r=Math.abs(i-n)<=e,s=Math.abs(k-g)<=e;if(p)b.position.top=
+c._convertPositionTo("relative",{top:j-c.helperProportions.height,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i-c.helperProportions.width}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k}).left-c.margins.left}var t=p||q||r||s;if(f.snapMode!="outer"){p=Math.abs(j-m)<=e;q=Math.abs(l-o)<=e;r=Math.abs(i-g)<=e;s=Math.abs(k-n)<=e;if(p)b.position.top=
+c._convertPositionTo("relative",{top:j,left:0}).top-c.margins.top;if(q)b.position.top=c._convertPositionTo("relative",{top:l-c.helperProportions.height,left:0}).top-c.margins.top;if(r)b.position.left=c._convertPositionTo("relative",{top:0,left:i}).left-c.margins.left;if(s)b.position.left=c._convertPositionTo("relative",{top:0,left:k-c.helperProportions.width}).left-c.margins.left}if(!c.snapElements[h].snapping&&(p||q||r||s||t))c.options.snap.snap&&c.options.snap.snap.call(c.element,a,d.extend(c._uiHash(),
+{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=p||q||r||s||t}else{c.snapElements[h].snapping&&c.options.snap.release&&c.options.snap.release.call(c.element,a,d.extend(c._uiHash(),{snapItem:c.snapElements[h].item}));c.snapElements[h].snapping=false}}}});d.ui.plugin.add("draggable","stack",{start:function(){var a=d(this).data("draggable").options;a=d.makeArray(d(a.stack)).sort(function(c,f){return(parseInt(d(c).css("zIndex"),10)||0)-(parseInt(d(f).css("zIndex"),10)||0)});if(a.length){var b=
+parseInt(a[0].style.zIndex)||0;d(a).each(function(c){this.style.zIndex=b+c});this[0].style.zIndex=b+a.length}}});d.ui.plugin.add("draggable","zIndex",{start:function(a,b){a=d(b.helper);b=d(this).data("draggable").options;if(a.css("zIndex"))b._zIndex=a.css("zIndex");a.css("zIndex",b.zIndex)},stop:function(a,b){a=d(this).data("draggable").options;a._zIndex&&d(b.helper).css("zIndex",a._zIndex)}})})(jQuery);
+;/*
+ * jQuery UI Droppable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Droppables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.draggable.js
+ */
+(function(d){d.widget("ui.droppable",{widgetEventPrefix:"drop",options:{accept:"*",activeClass:false,addClasses:true,greedy:false,hoverClass:false,scope:"default",tolerance:"intersect"},_create:function(){var a=this.options,b=a.accept;this.isover=0;this.isout=1;this.accept=d.isFunction(b)?b:function(c){return c.is(b)};this.proportions={width:this.element[0].offsetWidth,height:this.element[0].offsetHeight};d.ui.ddmanager.droppables[a.scope]=d.ui.ddmanager.droppables[a.scope]||[];d.ui.ddmanager.droppables[a.scope].push(this);
+a.addClasses&&this.element.addClass("ui-droppable")},destroy:function(){for(var a=d.ui.ddmanager.droppables[this.options.scope],b=0;b<a.length;b++)a[b]==this&&a.splice(b,1);this.element.removeClass("ui-droppable ui-droppable-disabled").removeData("droppable").unbind(".droppable");return this},_setOption:function(a,b){if(a=="accept")this.accept=d.isFunction(b)?b:function(c){return c.is(b)};d.Widget.prototype._setOption.apply(this,arguments)},_activate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&
+this.element.addClass(this.options.activeClass);b&&this._trigger("activate",a,this.ui(b))},_deactivate:function(a){var b=d.ui.ddmanager.current;this.options.activeClass&&this.element.removeClass(this.options.activeClass);b&&this._trigger("deactivate",a,this.ui(b))},_over:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.addClass(this.options.hoverClass);
+this._trigger("over",a,this.ui(b))}},_out:function(a){var b=d.ui.ddmanager.current;if(!(!b||(b.currentItem||b.element)[0]==this.element[0]))if(this.accept.call(this.element[0],b.currentItem||b.element)){this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("out",a,this.ui(b))}},_drop:function(a,b){var c=b||d.ui.ddmanager.current;if(!c||(c.currentItem||c.element)[0]==this.element[0])return false;var e=false;this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function(){var g=
+d.data(this,"droppable");if(g.options.greedy&&!g.options.disabled&&g.options.scope==c.options.scope&&g.accept.call(g.element[0],c.currentItem||c.element)&&d.ui.intersect(c,d.extend(g,{offset:g.element.offset()}),g.options.tolerance)){e=true;return false}});if(e)return false;if(this.accept.call(this.element[0],c.currentItem||c.element)){this.options.activeClass&&this.element.removeClass(this.options.activeClass);this.options.hoverClass&&this.element.removeClass(this.options.hoverClass);this._trigger("drop",
+a,this.ui(c));return this.element}return false},ui:function(a){return{draggable:a.currentItem||a.element,helper:a.helper,position:a.position,offset:a.positionAbs}}});d.extend(d.ui.droppable,{version:"1.8.12"});d.ui.intersect=function(a,b,c){if(!b.offset)return false;var e=(a.positionAbs||a.position.absolute).left,g=e+a.helperProportions.width,f=(a.positionAbs||a.position.absolute).top,h=f+a.helperProportions.height,i=b.offset.left,k=i+b.proportions.width,j=b.offset.top,l=j+b.proportions.height;
+switch(c){case "fit":return i<=e&&g<=k&&j<=f&&h<=l;case "intersect":return i<e+a.helperProportions.width/2&&g-a.helperProportions.width/2<k&&j<f+a.helperProportions.height/2&&h-a.helperProportions.height/2<l;case "pointer":return d.ui.isOver((a.positionAbs||a.position.absolute).top+(a.clickOffset||a.offset.click).top,(a.positionAbs||a.position.absolute).left+(a.clickOffset||a.offset.click).left,j,i,b.proportions.height,b.proportions.width);case "touch":return(f>=j&&f<=l||h>=j&&h<=l||f<j&&h>l)&&(e>=
+i&&e<=k||g>=i&&g<=k||e<i&&g>k);default:return false}};d.ui.ddmanager={current:null,droppables:{"default":[]},prepareOffsets:function(a,b){var c=d.ui.ddmanager.droppables[a.options.scope]||[],e=b?b.type:null,g=(a.currentItem||a.element).find(":data(droppable)").andSelf(),f=0;a:for(;f<c.length;f++)if(!(c[f].options.disabled||a&&!c[f].accept.call(c[f].element[0],a.currentItem||a.element))){for(var h=0;h<g.length;h++)if(g[h]==c[f].element[0]){c[f].proportions.height=0;continue a}c[f].visible=c[f].element.css("display")!=
+"none";if(c[f].visible){e=="mousedown"&&c[f]._activate.call(c[f],b);c[f].offset=c[f].element.offset();c[f].proportions={width:c[f].element[0].offsetWidth,height:c[f].element[0].offsetHeight}}}},drop:function(a,b){var c=false;d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(this.options){if(!this.options.disabled&&this.visible&&d.ui.intersect(a,this,this.options.tolerance))c=c||this._drop.call(this,b);if(!this.options.disabled&&this.visible&&this.accept.call(this.element[0],a.currentItem||
+a.element)){this.isout=1;this.isover=0;this._deactivate.call(this,b)}}});return c},drag:function(a,b){a.options.refreshPositions&&d.ui.ddmanager.prepareOffsets(a,b);d.each(d.ui.ddmanager.droppables[a.options.scope]||[],function(){if(!(this.options.disabled||this.greedyChild||!this.visible)){var c=d.ui.intersect(a,this,this.options.tolerance);if(c=!c&&this.isover==1?"isout":c&&this.isover==0?"isover":null){var e;if(this.options.greedy){var g=this.element.parents(":data(droppable):eq(0)");if(g.length){e=
+d.data(g[0],"droppable");e.greedyChild=c=="isover"?1:0}}if(e&&c=="isover"){e.isover=0;e.isout=1;e._out.call(e,b)}this[c]=1;this[c=="isout"?"isover":"isout"]=0;this[c=="isover"?"_over":"_out"].call(this,b);if(e&&c=="isout"){e.isout=0;e.isover=1;e._over.call(e,b)}}}})}}})(jQuery);
+;/*
+ * jQuery UI Resizable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Resizables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.resizable",e.ui.mouse,{widgetEventPrefix:"resize",options:{alsoResize:false,animate:false,animateDuration:"slow",animateEasing:"swing",aspectRatio:false,autoHide:false,containment:false,ghost:false,grid:false,handles:"e,s,se",helper:false,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:1E3},_create:function(){var b=this,a=this.options;this.element.addClass("ui-resizable");e.extend(this,{_aspectRatio:!!a.aspectRatio,aspectRatio:a.aspectRatio,originalElement:this.element,
+_proportionallyResizeElements:[],_helper:a.helper||a.ghost||a.animate?a.helper||"ui-resizable-helper":null});if(this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)){/relative/.test(this.element.css("position"))&&e.browser.opera&&this.element.css({position:"relative",top:"auto",left:"auto"});this.element.wrap(e('<div class="ui-wrapper" style="overflow: hidden;"></div>').css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),
+top:this.element.css("top"),left:this.element.css("left")}));this.element=this.element.parent().data("resizable",this.element.data("resizable"));this.elementIsWrapper=true;this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")});this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0});this.originalResizeStyle=
+this.originalElement.css("resize");this.originalElement.css("resize","none");this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"}));this.originalElement.css({margin:this.originalElement.css("margin")});this._proportionallyResize()}this.handles=a.handles||(!e(".ui-resizable-handle",this.element).length?"e,s,se":{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",
+nw:".ui-resizable-nw"});if(this.handles.constructor==String){if(this.handles=="all")this.handles="n,e,s,w,se,sw,ne,nw";var c=this.handles.split(",");this.handles={};for(var d=0;d<c.length;d++){var f=e.trim(c[d]),g=e('<div class="ui-resizable-handle '+("ui-resizable-"+f)+'"></div>');/sw|se|ne|nw/.test(f)&&g.css({zIndex:++a.zIndex});"se"==f&&g.addClass("ui-icon ui-icon-gripsmall-diagonal-se");this.handles[f]=".ui-resizable-"+f;this.element.append(g)}}this._renderAxis=function(h){h=h||this.element;for(var i in this.handles){if(this.handles[i].constructor==
+String)this.handles[i]=e(this.handles[i],this.element).show();if(this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)){var j=e(this.handles[i],this.element),k=0;k=/sw|ne|nw|se|n|s/.test(i)?j.outerHeight():j.outerWidth();j=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join("");h.css(j,k);this._proportionallyResize()}e(this.handles[i])}};this._renderAxis(this.element);this._handles=e(".ui-resizable-handle",this.element).disableSelection();
+this._handles.mouseover(function(){if(!b.resizing){if(this.className)var h=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i);b.axis=h&&h[1]?h[1]:"se"}});if(a.autoHide){this._handles.hide();e(this.element).addClass("ui-resizable-autohide").hover(function(){e(this).removeClass("ui-resizable-autohide");b._handles.show()},function(){if(!b.resizing){e(this).addClass("ui-resizable-autohide");b._handles.hide()}})}this._mouseInit()},destroy:function(){this._mouseDestroy();var b=function(c){e(c).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};
+if(this.elementIsWrapper){b(this.element);var a=this.element;a.after(this.originalElement.css({position:a.css("position"),width:a.outerWidth(),height:a.outerHeight(),top:a.css("top"),left:a.css("left")})).remove()}this.originalElement.css("resize",this.originalResizeStyle);b(this.originalElement);return this},_mouseCapture:function(b){var a=false;for(var c in this.handles)if(e(this.handles[c])[0]==b.target)a=true;return!this.options.disabled&&a},_mouseStart:function(b){var a=this.options,c=this.element.position(),
+d=this.element;this.resizing=true;this.documentScroll={top:e(document).scrollTop(),left:e(document).scrollLeft()};if(d.is(".ui-draggable")||/absolute/.test(d.css("position")))d.css({position:"absolute",top:c.top,left:c.left});e.browser.opera&&/relative/.test(d.css("position"))&&d.css({position:"relative",top:"auto",left:"auto"});this._renderProxy();c=m(this.helper.css("left"));var f=m(this.helper.css("top"));if(a.containment){c+=e(a.containment).scrollLeft()||0;f+=e(a.containment).scrollTop()||0}this.offset=
+this.helper.offset();this.position={left:c,top:f};this.size=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalSize=this._helper?{width:d.outerWidth(),height:d.outerHeight()}:{width:d.width(),height:d.height()};this.originalPosition={left:c,top:f};this.sizeDiff={width:d.outerWidth()-d.width(),height:d.outerHeight()-d.height()};this.originalMousePosition={left:b.pageX,top:b.pageY};this.aspectRatio=typeof a.aspectRatio=="number"?a.aspectRatio:
+this.originalSize.width/this.originalSize.height||1;a=e(".ui-resizable-"+this.axis).css("cursor");e("body").css("cursor",a=="auto"?this.axis+"-resize":a);d.addClass("ui-resizable-resizing");this._propagate("start",b);return true},_mouseDrag:function(b){var a=this.helper,c=this.originalMousePosition,d=this._change[this.axis];if(!d)return false;c=d.apply(this,[b,b.pageX-c.left||0,b.pageY-c.top||0]);if(this._aspectRatio||b.shiftKey)c=this._updateRatio(c,b);c=this._respectSize(c,b);this._propagate("resize",
+b);a.css({top:this.position.top+"px",left:this.position.left+"px",width:this.size.width+"px",height:this.size.height+"px"});!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize();this._updateCache(c);this._trigger("resize",b,this.ui());return false},_mouseStop:function(b){this.resizing=false;var a=this.options,c=this;if(this._helper){var d=this._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName);d=f&&e.ui.hasScroll(d[0],"left")?0:c.sizeDiff.height;
+f=f?0:c.sizeDiff.width;f={width:c.helper.width()-f,height:c.helper.height()-d};d=parseInt(c.element.css("left"),10)+(c.position.left-c.originalPosition.left)||null;var g=parseInt(c.element.css("top"),10)+(c.position.top-c.originalPosition.top)||null;a.animate||this.element.css(e.extend(f,{top:g,left:d}));c.helper.height(c.size.height);c.helper.width(c.size.width);this._helper&&!a.animate&&this._proportionallyResize()}e("body").css("cursor","auto");this.element.removeClass("ui-resizable-resizing");
+this._propagate("stop",b);this._helper&&this.helper.remove();return false},_updateCache:function(b){this.offset=this.helper.offset();if(l(b.left))this.position.left=b.left;if(l(b.top))this.position.top=b.top;if(l(b.height))this.size.height=b.height;if(l(b.width))this.size.width=b.width},_updateRatio:function(b){var a=this.position,c=this.size,d=this.axis;if(b.height)b.width=c.height*this.aspectRatio;else if(b.width)b.height=c.width/this.aspectRatio;if(d=="sw"){b.left=a.left+(c.width-b.width);b.top=
+null}if(d=="nw"){b.top=a.top+(c.height-b.height);b.left=a.left+(c.width-b.width)}return b},_respectSize:function(b){var a=this.options,c=this.axis,d=l(b.width)&&a.maxWidth&&a.maxWidth<b.width,f=l(b.height)&&a.maxHeight&&a.maxHeight<b.height,g=l(b.width)&&a.minWidth&&a.minWidth>b.width,h=l(b.height)&&a.minHeight&&a.minHeight>b.height;if(g)b.width=a.minWidth;if(h)b.height=a.minHeight;if(d)b.width=a.maxWidth;if(f)b.height=a.maxHeight;var i=this.originalPosition.left+this.originalSize.width,j=this.position.top+
+this.size.height,k=/sw|nw|w/.test(c);c=/nw|ne|n/.test(c);if(g&&k)b.left=i-a.minWidth;if(d&&k)b.left=i-a.maxWidth;if(h&&c)b.top=j-a.minHeight;if(f&&c)b.top=j-a.maxHeight;if((a=!b.width&&!b.height)&&!b.left&&b.top)b.top=null;else if(a&&!b.top&&b.left)b.left=null;return b},_proportionallyResize:function(){if(this._proportionallyResizeElements.length)for(var b=this.helper||this.element,a=0;a<this._proportionallyResizeElements.length;a++){var c=this._proportionallyResizeElements[a];if(!this.borderDif){var d=
+[c.css("borderTopWidth"),c.css("borderRightWidth"),c.css("borderBottomWidth"),c.css("borderLeftWidth")],f=[c.css("paddingTop"),c.css("paddingRight"),c.css("paddingBottom"),c.css("paddingLeft")];this.borderDif=e.map(d,function(g,h){g=parseInt(g,10)||0;h=parseInt(f[h],10)||0;return g+h})}e.browser.msie&&(e(b).is(":hidden")||e(b).parents(":hidden").length)||c.css({height:b.height()-this.borderDif[0]-this.borderDif[2]||0,width:b.width()-this.borderDif[1]-this.borderDif[3]||0})}},_renderProxy:function(){var b=
+this.options;this.elementOffset=this.element.offset();if(this._helper){this.helper=this.helper||e('<div style="overflow:hidden;"></div>');var a=e.browser.msie&&e.browser.version<7,c=a?1:0;a=a?2:-1;this.helper.addClass(this._helper).css({width:this.element.outerWidth()+a,height:this.element.outerHeight()+a,position:"absolute",left:this.elementOffset.left-c+"px",top:this.elementOffset.top-c+"px",zIndex:++b.zIndex});this.helper.appendTo("body").disableSelection()}else this.helper=this.element},_change:{e:function(b,
+a){return{width:this.originalSize.width+a}},w:function(b,a){return{left:this.originalPosition.left+a,width:this.originalSize.width-a}},n:function(b,a,c){return{top:this.originalPosition.top+c,height:this.originalSize.height-c}},s:function(b,a,c){return{height:this.originalSize.height+c}},se:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},sw:function(b,a,c){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[b,a,
+c]))},ne:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[b,a,c]))},nw:function(b,a,c){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[b,a,c]))}},_propagate:function(b,a){e.ui.plugin.call(this,b,[a,this.ui()]);b!="resize"&&this._trigger(b,a,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,
+originalPosition:this.originalPosition}}});e.extend(e.ui.resizable,{version:"1.8.12"});e.ui.plugin.add("resizable","alsoResize",{start:function(){var b=e(this).data("resizable").options,a=function(c){e(c).each(function(){var d=e(this);d.data("resizable-alsoresize",{width:parseInt(d.width(),10),height:parseInt(d.height(),10),left:parseInt(d.css("left"),10),top:parseInt(d.css("top"),10),position:d.css("position")})})};if(typeof b.alsoResize=="object"&&!b.alsoResize.parentNode)if(b.alsoResize.length){b.alsoResize=
+b.alsoResize[0];a(b.alsoResize)}else e.each(b.alsoResize,function(c){a(c)});else a(b.alsoResize)},resize:function(b,a){var c=e(this).data("resizable");b=c.options;var d=c.originalSize,f=c.originalPosition,g={height:c.size.height-d.height||0,width:c.size.width-d.width||0,top:c.position.top-f.top||0,left:c.position.left-f.left||0},h=function(i,j){e(i).each(function(){var k=e(this),q=e(this).data("resizable-alsoresize"),p={},r=j&&j.length?j:k.parents(a.originalElement[0]).length?["width","height"]:["width",
+"height","top","left"];e.each(r,function(n,o){if((n=(q[o]||0)+(g[o]||0))&&n>=0)p[o]=n||null});if(e.browser.opera&&/relative/.test(k.css("position"))){c._revertToRelativePosition=true;k.css({position:"absolute",top:"auto",left:"auto"})}k.css(p)})};typeof b.alsoResize=="object"&&!b.alsoResize.nodeType?e.each(b.alsoResize,function(i,j){h(i,j)}):h(b.alsoResize)},stop:function(){var b=e(this).data("resizable"),a=b.options,c=function(d){e(d).each(function(){var f=e(this);f.css({position:f.data("resizable-alsoresize").position})})};
+if(b._revertToRelativePosition){b._revertToRelativePosition=false;typeof a.alsoResize=="object"&&!a.alsoResize.nodeType?e.each(a.alsoResize,function(d){c(d)}):c(a.alsoResize)}e(this).removeData("resizable-alsoresize")}});e.ui.plugin.add("resizable","animate",{stop:function(b){var a=e(this).data("resizable"),c=a.options,d=a._proportionallyResizeElements,f=d.length&&/textarea/i.test(d[0].nodeName),g=f&&e.ui.hasScroll(d[0],"left")?0:a.sizeDiff.height;f={width:a.size.width-(f?0:a.sizeDiff.width),height:a.size.height-
+g};g=parseInt(a.element.css("left"),10)+(a.position.left-a.originalPosition.left)||null;var h=parseInt(a.element.css("top"),10)+(a.position.top-a.originalPosition.top)||null;a.element.animate(e.extend(f,h&&g?{top:h,left:g}:{}),{duration:c.animateDuration,easing:c.animateEasing,step:function(){var i={width:parseInt(a.element.css("width"),10),height:parseInt(a.element.css("height"),10),top:parseInt(a.element.css("top"),10),left:parseInt(a.element.css("left"),10)};d&&d.length&&e(d[0]).css({width:i.width,
+height:i.height});a._updateCache(i);a._propagate("resize",b)}})}});e.ui.plugin.add("resizable","containment",{start:function(){var b=e(this).data("resizable"),a=b.element,c=b.options.containment;if(a=c instanceof e?c.get(0):/parent/.test(c)?a.parent().get(0):c){b.containerElement=e(a);if(/document/.test(c)||c==document){b.containerOffset={left:0,top:0};b.containerPosition={left:0,top:0};b.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}}else{var d=
+e(a),f=[];e(["Top","Right","Left","Bottom"]).each(function(i,j){f[i]=m(d.css("padding"+j))});b.containerOffset=d.offset();b.containerPosition=d.position();b.containerSize={height:d.innerHeight()-f[3],width:d.innerWidth()-f[1]};c=b.containerOffset;var g=b.containerSize.height,h=b.containerSize.width;h=e.ui.hasScroll(a,"left")?a.scrollWidth:h;g=e.ui.hasScroll(a)?a.scrollHeight:g;b.parentData={element:a,left:c.left,top:c.top,width:h,height:g}}}},resize:function(b){var a=e(this).data("resizable"),c=a.options,
+d=a.containerOffset,f=a.position;b=a._aspectRatio||b.shiftKey;var g={top:0,left:0},h=a.containerElement;if(h[0]!=document&&/static/.test(h.css("position")))g=d;if(f.left<(a._helper?d.left:0)){a.size.width+=a._helper?a.position.left-d.left:a.position.left-g.left;if(b)a.size.height=a.size.width/c.aspectRatio;a.position.left=c.helper?d.left:0}if(f.top<(a._helper?d.top:0)){a.size.height+=a._helper?a.position.top-d.top:a.position.top;if(b)a.size.width=a.size.height*c.aspectRatio;a.position.top=a._helper?
+d.top:0}a.offset.left=a.parentData.left+a.position.left;a.offset.top=a.parentData.top+a.position.top;c=Math.abs((a._helper?a.offset.left-g.left:a.offset.left-g.left)+a.sizeDiff.width);d=Math.abs((a._helper?a.offset.top-g.top:a.offset.top-d.top)+a.sizeDiff.height);f=a.containerElement.get(0)==a.element.parent().get(0);g=/relative|absolute/.test(a.containerElement.css("position"));if(f&&g)c-=a.parentData.left;if(c+a.size.width>=a.parentData.width){a.size.width=a.parentData.width-c;if(b)a.size.height=
+a.size.width/a.aspectRatio}if(d+a.size.height>=a.parentData.height){a.size.height=a.parentData.height-d;if(b)a.size.width=a.size.height*a.aspectRatio}},stop:function(){var b=e(this).data("resizable"),a=b.options,c=b.containerOffset,d=b.containerPosition,f=b.containerElement,g=e(b.helper),h=g.offset(),i=g.outerWidth()-b.sizeDiff.width;g=g.outerHeight()-b.sizeDiff.height;b._helper&&!a.animate&&/relative/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g});b._helper&&!a.animate&&
+/static/.test(f.css("position"))&&e(this).css({left:h.left-d.left-c.left,width:i,height:g})}});e.ui.plugin.add("resizable","ghost",{start:function(){var b=e(this).data("resizable"),a=b.options,c=b.size;b.ghost=b.originalElement.clone();b.ghost.css({opacity:0.25,display:"block",position:"relative",height:c.height,width:c.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass(typeof a.ghost=="string"?a.ghost:"");b.ghost.appendTo(b.helper)},resize:function(){var b=e(this).data("resizable");
+b.ghost&&b.ghost.css({position:"relative",height:b.size.height,width:b.size.width})},stop:function(){var b=e(this).data("resizable");b.ghost&&b.helper&&b.helper.get(0).removeChild(b.ghost.get(0))}});e.ui.plugin.add("resizable","grid",{resize:function(){var b=e(this).data("resizable"),a=b.options,c=b.size,d=b.originalSize,f=b.originalPosition,g=b.axis;a.grid=typeof a.grid=="number"?[a.grid,a.grid]:a.grid;var h=Math.round((c.width-d.width)/(a.grid[0]||1))*(a.grid[0]||1);a=Math.round((c.height-d.height)/
+(a.grid[1]||1))*(a.grid[1]||1);if(/^(se|s|e)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else if(/^(ne)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}else{if(/^(sw)$/.test(g)){b.size.width=d.width+h;b.size.height=d.height+a}else{b.size.width=d.width+h;b.size.height=d.height+a;b.position.top=f.top-a}b.position.left=f.left-h}}});var m=function(b){return parseInt(b,10)||0},l=function(b){return!isNaN(parseInt(b,10))}})(jQuery);
+;/*
+ * jQuery UI Selectable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Selectables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(e){e.widget("ui.selectable",e.ui.mouse,{options:{appendTo:"body",autoRefresh:true,distance:0,filter:"*",tolerance:"touch"},_create:function(){var c=this;this.element.addClass("ui-selectable");this.dragged=false;var f;this.refresh=function(){f=e(c.options.filter,c.element[0]);f.each(function(){var d=e(this),b=d.offset();e.data(this,"selectable-item",{element:this,$element:d,left:b.left,top:b.top,right:b.left+d.outerWidth(),bottom:b.top+d.outerHeight(),startselected:false,selected:d.hasClass("ui-selected"),
+selecting:d.hasClass("ui-selecting"),unselecting:d.hasClass("ui-unselecting")})})};this.refresh();this.selectees=f.addClass("ui-selectee");this._mouseInit();this.helper=e("<div class='ui-selectable-helper'></div>")},destroy:function(){this.selectees.removeClass("ui-selectee").removeData("selectable-item");this.element.removeClass("ui-selectable ui-selectable-disabled").removeData("selectable").unbind(".selectable");this._mouseDestroy();return this},_mouseStart:function(c){var f=this;this.opos=[c.pageX,
+c.pageY];if(!this.options.disabled){var d=this.options;this.selectees=e(d.filter,this.element[0]);this._trigger("start",c);e(d.appendTo).append(this.helper);this.helper.css({left:c.clientX,top:c.clientY,width:0,height:0});d.autoRefresh&&this.refresh();this.selectees.filter(".ui-selected").each(function(){var b=e.data(this,"selectable-item");b.startselected=true;if(!c.metaKey){b.$element.removeClass("ui-selected");b.selected=false;b.$element.addClass("ui-unselecting");b.unselecting=true;f._trigger("unselecting",
+c,{unselecting:b.element})}});e(c.target).parents().andSelf().each(function(){var b=e.data(this,"selectable-item");if(b){var g=!c.metaKey||!b.$element.hasClass("ui-selected");b.$element.removeClass(g?"ui-unselecting":"ui-selected").addClass(g?"ui-selecting":"ui-unselecting");b.unselecting=!g;b.selecting=g;(b.selected=g)?f._trigger("selecting",c,{selecting:b.element}):f._trigger("unselecting",c,{unselecting:b.element});return false}})}},_mouseDrag:function(c){var f=this;this.dragged=true;if(!this.options.disabled){var d=
+this.options,b=this.opos[0],g=this.opos[1],h=c.pageX,i=c.pageY;if(b>h){var j=h;h=b;b=j}if(g>i){j=i;i=g;g=j}this.helper.css({left:b,top:g,width:h-b,height:i-g});this.selectees.each(function(){var a=e.data(this,"selectable-item");if(!(!a||a.element==f.element[0])){var k=false;if(d.tolerance=="touch")k=!(a.left>h||a.right<b||a.top>i||a.bottom<g);else if(d.tolerance=="fit")k=a.left>b&&a.right<h&&a.top>g&&a.bottom<i;if(k){if(a.selected){a.$element.removeClass("ui-selected");a.selected=false}if(a.unselecting){a.$element.removeClass("ui-unselecting");
+a.unselecting=false}if(!a.selecting){a.$element.addClass("ui-selecting");a.selecting=true;f._trigger("selecting",c,{selecting:a.element})}}else{if(a.selecting)if(c.metaKey&&a.startselected){a.$element.removeClass("ui-selecting");a.selecting=false;a.$element.addClass("ui-selected");a.selected=true}else{a.$element.removeClass("ui-selecting");a.selecting=false;if(a.startselected){a.$element.addClass("ui-unselecting");a.unselecting=true}f._trigger("unselecting",c,{unselecting:a.element})}if(a.selected)if(!c.metaKey&&
+!a.startselected){a.$element.removeClass("ui-selected");a.selected=false;a.$element.addClass("ui-unselecting");a.unselecting=true;f._trigger("unselecting",c,{unselecting:a.element})}}}});return false}},_mouseStop:function(c){var f=this;this.dragged=false;e(".ui-unselecting",this.element[0]).each(function(){var d=e.data(this,"selectable-item");d.$element.removeClass("ui-unselecting");d.unselecting=false;d.startselected=false;f._trigger("unselected",c,{unselected:d.element})});e(".ui-selecting",this.element[0]).each(function(){var d=
+e.data(this,"selectable-item");d.$element.removeClass("ui-selecting").addClass("ui-selected");d.selecting=false;d.selected=true;d.startselected=true;f._trigger("selected",c,{selected:d.element})});this._trigger("stop",c);this.helper.remove();return false}});e.extend(e.ui.selectable,{version:"1.8.12"})})(jQuery);
+;/*
+ * jQuery UI Sortable 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Sortables
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.sortable",d.ui.mouse,{widgetEventPrefix:"sort",options:{appendTo:"parent",axis:false,connectWith:false,containment:false,cursor:"auto",cursorAt:false,dropOnEmpty:true,forcePlaceholderSize:false,forceHelperSize:false,grid:false,handle:false,helper:"original",items:"> *",opacity:false,placeholder:false,revert:false,scroll:true,scrollSensitivity:20,scrollSpeed:20,scope:"default",tolerance:"intersect",zIndex:1E3},_create:function(){this.containerCache={};this.element.addClass("ui-sortable");
+this.refresh();this.floating=this.items.length?/left|right/.test(this.items[0].item.css("float"))||/inline|table-cell/.test(this.items[0].item.css("display")):false;this.offset=this.element.offset();this._mouseInit()},destroy:function(){this.element.removeClass("ui-sortable ui-sortable-disabled").removeData("sortable").unbind(".sortable");this._mouseDestroy();for(var a=this.items.length-1;a>=0;a--)this.items[a].item.removeData("sortable-item");return this},_setOption:function(a,b){if(a==="disabled"){this.options[a]=
+b;this.widget()[b?"addClass":"removeClass"]("ui-sortable-disabled")}else d.Widget.prototype._setOption.apply(this,arguments)},_mouseCapture:function(a,b){if(this.reverting)return false;if(this.options.disabled||this.options.type=="static")return false;this._refreshItems(a);var c=null,e=this;d(a.target).parents().each(function(){if(d.data(this,"sortable-item")==e){c=d(this);return false}});if(d.data(a.target,"sortable-item")==e)c=d(a.target);if(!c)return false;if(this.options.handle&&!b){var f=false;
+d(this.options.handle,c).find("*").andSelf().each(function(){if(this==a.target)f=true});if(!f)return false}this.currentItem=c;this._removeCurrentsFromItems();return true},_mouseStart:function(a,b,c){b=this.options;var e=this;this.currentContainer=this;this.refreshPositions();this.helper=this._createHelper(a);this._cacheHelperProportions();this._cacheMargins();this.scrollParent=this.helper.scrollParent();this.offset=this.currentItem.offset();this.offset={top:this.offset.top-this.margins.top,left:this.offset.left-
+this.margins.left};this.helper.css("position","absolute");this.cssPosition=this.helper.css("position");d.extend(this.offset,{click:{left:a.pageX-this.offset.left,top:a.pageY-this.offset.top},parent:this._getParentOffset(),relative:this._getRelativeOffset()});this.originalPosition=this._generatePosition(a);this.originalPageX=a.pageX;this.originalPageY=a.pageY;b.cursorAt&&this._adjustOffsetFromHelper(b.cursorAt);this.domPosition={prev:this.currentItem.prev()[0],parent:this.currentItem.parent()[0]};
+this.helper[0]!=this.currentItem[0]&&this.currentItem.hide();this._createPlaceholder();b.containment&&this._setContainment();if(b.cursor){if(d("body").css("cursor"))this._storedCursor=d("body").css("cursor");d("body").css("cursor",b.cursor)}if(b.opacity){if(this.helper.css("opacity"))this._storedOpacity=this.helper.css("opacity");this.helper.css("opacity",b.opacity)}if(b.zIndex){if(this.helper.css("zIndex"))this._storedZIndex=this.helper.css("zIndex");this.helper.css("zIndex",b.zIndex)}if(this.scrollParent[0]!=
+document&&this.scrollParent[0].tagName!="HTML")this.overflowOffset=this.scrollParent.offset();this._trigger("start",a,this._uiHash());this._preserveHelperProportions||this._cacheHelperProportions();if(!c)for(c=this.containers.length-1;c>=0;c--)this.containers[c]._trigger("activate",a,e._uiHash(this));if(d.ui.ddmanager)d.ui.ddmanager.current=this;d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,a);this.dragging=true;this.helper.addClass("ui-sortable-helper");this._mouseDrag(a);
+return true},_mouseDrag:function(a){this.position=this._generatePosition(a);this.positionAbs=this._convertPositionTo("absolute");if(!this.lastPositionAbs)this.lastPositionAbs=this.positionAbs;if(this.options.scroll){var b=this.options,c=false;if(this.scrollParent[0]!=document&&this.scrollParent[0].tagName!="HTML"){if(this.overflowOffset.top+this.scrollParent[0].offsetHeight-a.pageY<b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop+b.scrollSpeed;else if(a.pageY-this.overflowOffset.top<
+b.scrollSensitivity)this.scrollParent[0].scrollTop=c=this.scrollParent[0].scrollTop-b.scrollSpeed;if(this.overflowOffset.left+this.scrollParent[0].offsetWidth-a.pageX<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft+b.scrollSpeed;else if(a.pageX-this.overflowOffset.left<b.scrollSensitivity)this.scrollParent[0].scrollLeft=c=this.scrollParent[0].scrollLeft-b.scrollSpeed}else{if(a.pageY-d(document).scrollTop()<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()-
+b.scrollSpeed);else if(d(window).height()-(a.pageY-d(document).scrollTop())<b.scrollSensitivity)c=d(document).scrollTop(d(document).scrollTop()+b.scrollSpeed);if(a.pageX-d(document).scrollLeft()<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()-b.scrollSpeed);else if(d(window).width()-(a.pageX-d(document).scrollLeft())<b.scrollSensitivity)c=d(document).scrollLeft(d(document).scrollLeft()+b.scrollSpeed)}c!==false&&d.ui.ddmanager&&!b.dropBehaviour&&d.ui.ddmanager.prepareOffsets(this,
+a)}this.positionAbs=this._convertPositionTo("absolute");if(!this.options.axis||this.options.axis!="y")this.helper[0].style.left=this.position.left+"px";if(!this.options.axis||this.options.axis!="x")this.helper[0].style.top=this.position.top+"px";for(b=this.items.length-1;b>=0;b--){c=this.items[b];var e=c.item[0],f=this._intersectsWithPointer(c);if(f)if(e!=this.currentItem[0]&&this.placeholder[f==1?"next":"prev"]()[0]!=e&&!d.ui.contains(this.placeholder[0],e)&&(this.options.type=="semi-dynamic"?!d.ui.contains(this.element[0],
+e):true)){this.direction=f==1?"down":"up";if(this.options.tolerance=="pointer"||this._intersectsWithSides(c))this._rearrange(a,c);else break;this._trigger("change",a,this._uiHash());break}}this._contactContainers(a);d.ui.ddmanager&&d.ui.ddmanager.drag(this,a);this._trigger("sort",a,this._uiHash());this.lastPositionAbs=this.positionAbs;return false},_mouseStop:function(a,b){if(a){d.ui.ddmanager&&!this.options.dropBehaviour&&d.ui.ddmanager.drop(this,a);if(this.options.revert){var c=this;b=c.placeholder.offset();
+c.reverting=true;d(this.helper).animate({left:b.left-this.offset.parent.left-c.margins.left+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollLeft),top:b.top-this.offset.parent.top-c.margins.top+(this.offsetParent[0]==document.body?0:this.offsetParent[0].scrollTop)},parseInt(this.options.revert,10)||500,function(){c._clear(a)})}else this._clear(a,b);return false}},cancel:function(){var a=this;if(this.dragging){this._mouseUp({target:null});this.options.helper=="original"?this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper"):
+this.currentItem.show();for(var b=this.containers.length-1;b>=0;b--){this.containers[b]._trigger("deactivate",null,a._uiHash(this));if(this.containers[b].containerCache.over){this.containers[b]._trigger("out",null,a._uiHash(this));this.containers[b].containerCache.over=0}}}if(this.placeholder){this.placeholder[0].parentNode&&this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.options.helper!="original"&&this.helper&&this.helper[0].parentNode&&this.helper.remove();d.extend(this,{helper:null,
+dragging:false,reverting:false,_noFinalSort:null});this.domPosition.prev?d(this.domPosition.prev).after(this.currentItem):d(this.domPosition.parent).prepend(this.currentItem)}return this},serialize:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};d(b).each(function(){var e=(d(a.item||this).attr(a.attribute||"id")||"").match(a.expression||/(.+)[-=_](.+)/);if(e)c.push((a.key||e[1]+"[]")+"="+(a.key&&a.expression?e[1]:e[2]))});!c.length&&a.key&&c.push(a.key+"=");return c.join("&")},
+toArray:function(a){var b=this._getItemsAsjQuery(a&&a.connected),c=[];a=a||{};b.each(function(){c.push(d(a.item||this).attr(a.attribute||"id")||"")});return c},_intersectsWith:function(a){var b=this.positionAbs.left,c=b+this.helperProportions.width,e=this.positionAbs.top,f=e+this.helperProportions.height,g=a.left,h=g+a.width,i=a.top,k=i+a.height,j=this.offset.click.top,l=this.offset.click.left;j=e+j>i&&e+j<k&&b+l>g&&b+l<h;return this.options.tolerance=="pointer"||this.options.forcePointerForContainers||
+this.options.tolerance!="pointer"&&this.helperProportions[this.floating?"width":"height"]>a[this.floating?"width":"height"]?j:g<b+this.helperProportions.width/2&&c-this.helperProportions.width/2<h&&i<e+this.helperProportions.height/2&&f-this.helperProportions.height/2<k},_intersectsWithPointer:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left,a.width);b=b&&a;a=this._getDragVerticalDirection();
+var c=this._getDragHorizontalDirection();if(!b)return false;return this.floating?c&&c=="right"||a=="down"?2:1:a&&(a=="down"?2:1)},_intersectsWithSides:function(a){var b=d.ui.isOverAxis(this.positionAbs.top+this.offset.click.top,a.top+a.height/2,a.height);a=d.ui.isOverAxis(this.positionAbs.left+this.offset.click.left,a.left+a.width/2,a.width);var c=this._getDragVerticalDirection(),e=this._getDragHorizontalDirection();return this.floating&&e?e=="right"&&a||e=="left"&&!a:c&&(c=="down"&&b||c=="up"&&!b)},
+_getDragVerticalDirection:function(){var a=this.positionAbs.top-this.lastPositionAbs.top;return a!=0&&(a>0?"down":"up")},_getDragHorizontalDirection:function(){var a=this.positionAbs.left-this.lastPositionAbs.left;return a!=0&&(a>0?"right":"left")},refresh:function(a){this._refreshItems(a);this.refreshPositions();return this},_connectWith:function(){var a=this.options;return a.connectWith.constructor==String?[a.connectWith]:a.connectWith},_getItemsAsjQuery:function(a){var b=[],c=[],e=this._connectWith();
+if(e&&a)for(a=e.length-1;a>=0;a--)for(var f=d(e[a]),g=f.length-1;g>=0;g--){var h=d.data(f[g],"sortable");if(h&&h!=this&&!h.options.disabled)c.push([d.isFunction(h.options.items)?h.options.items.call(h.element):d(h.options.items,h.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),h])}c.push([d.isFunction(this.options.items)?this.options.items.call(this.element,null,{options:this.options,item:this.currentItem}):d(this.options.items,this.element).not(".ui-sortable-helper").not(".ui-sortable-placeholder"),
+this]);for(a=c.length-1;a>=0;a--)c[a][0].each(function(){b.push(this)});return d(b)},_removeCurrentsFromItems:function(){for(var a=this.currentItem.find(":data(sortable-item)"),b=0;b<this.items.length;b++)for(var c=0;c<a.length;c++)a[c]==this.items[b].item[0]&&this.items.splice(b,1)},_refreshItems:function(a){this.items=[];this.containers=[this];var b=this.items,c=[[d.isFunction(this.options.items)?this.options.items.call(this.element[0],a,{item:this.currentItem}):d(this.options.items,this.element),
+this]],e=this._connectWith();if(e)for(var f=e.length-1;f>=0;f--)for(var g=d(e[f]),h=g.length-1;h>=0;h--){var i=d.data(g[h],"sortable");if(i&&i!=this&&!i.options.disabled){c.push([d.isFunction(i.options.items)?i.options.items.call(i.element[0],a,{item:this.currentItem}):d(i.options.items,i.element),i]);this.containers.push(i)}}for(f=c.length-1;f>=0;f--){a=c[f][1];e=c[f][0];h=0;for(g=e.length;h<g;h++){i=d(e[h]);i.data("sortable-item",a);b.push({item:i,instance:a,width:0,height:0,left:0,top:0})}}},refreshPositions:function(a){if(this.offsetParent&&
+this.helper)this.offset.parent=this._getParentOffset();for(var b=this.items.length-1;b>=0;b--){var c=this.items[b];if(!(c.instance!=this.currentContainer&&this.currentContainer&&c.item[0]!=this.currentItem[0])){var e=this.options.toleranceElement?d(this.options.toleranceElement,c.item):c.item;if(!a){c.width=e.outerWidth();c.height=e.outerHeight()}e=e.offset();c.left=e.left;c.top=e.top}}if(this.options.custom&&this.options.custom.refreshContainers)this.options.custom.refreshContainers.call(this);else for(b=
+this.containers.length-1;b>=0;b--){e=this.containers[b].element.offset();this.containers[b].containerCache.left=e.left;this.containers[b].containerCache.top=e.top;this.containers[b].containerCache.width=this.containers[b].element.outerWidth();this.containers[b].containerCache.height=this.containers[b].element.outerHeight()}return this},_createPlaceholder:function(a){var b=a||this,c=b.options;if(!c.placeholder||c.placeholder.constructor==String){var e=c.placeholder;c.placeholder={element:function(){var f=
+d(document.createElement(b.currentItem[0].nodeName)).addClass(e||b.currentItem[0].className+" ui-sortable-placeholder").removeClass("ui-sortable-helper")[0];if(!e)f.style.visibility="hidden";return f},update:function(f,g){if(!(e&&!c.forcePlaceholderSize)){g.height()||g.height(b.currentItem.innerHeight()-parseInt(b.currentItem.css("paddingTop")||0,10)-parseInt(b.currentItem.css("paddingBottom")||0,10));g.width()||g.width(b.currentItem.innerWidth()-parseInt(b.currentItem.css("paddingLeft")||0,10)-parseInt(b.currentItem.css("paddingRight")||
+0,10))}}}}b.placeholder=d(c.placeholder.element.call(b.element,b.currentItem));b.currentItem.after(b.placeholder);c.placeholder.update(b,b.placeholder)},_contactContainers:function(a){for(var b=null,c=null,e=this.containers.length-1;e>=0;e--)if(!d.ui.contains(this.currentItem[0],this.containers[e].element[0]))if(this._intersectsWith(this.containers[e].containerCache)){if(!(b&&d.ui.contains(this.containers[e].element[0],b.element[0]))){b=this.containers[e];c=e}}else if(this.containers[e].containerCache.over){this.containers[e]._trigger("out",
+a,this._uiHash(this));this.containers[e].containerCache.over=0}if(b)if(this.containers.length===1){this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}else if(this.currentContainer!=this.containers[c]){b=1E4;e=null;for(var f=this.positionAbs[this.containers[c].floating?"left":"top"],g=this.items.length-1;g>=0;g--)if(d.ui.contains(this.containers[c].element[0],this.items[g].item[0])){var h=this.items[g][this.containers[c].floating?"left":"top"];if(Math.abs(h-
+f)<b){b=Math.abs(h-f);e=this.items[g]}}if(e||this.options.dropOnEmpty){this.currentContainer=this.containers[c];e?this._rearrange(a,e,null,true):this._rearrange(a,null,this.containers[c].element,true);this._trigger("change",a,this._uiHash());this.containers[c]._trigger("change",a,this._uiHash(this));this.options.placeholder.update(this.currentContainer,this.placeholder);this.containers[c]._trigger("over",a,this._uiHash(this));this.containers[c].containerCache.over=1}}},_createHelper:function(a){var b=
+this.options;a=d.isFunction(b.helper)?d(b.helper.apply(this.element[0],[a,this.currentItem])):b.helper=="clone"?this.currentItem.clone():this.currentItem;a.parents("body").length||d(b.appendTo!="parent"?b.appendTo:this.currentItem[0].parentNode)[0].appendChild(a[0]);if(a[0]==this.currentItem[0])this._storedCSS={width:this.currentItem[0].style.width,height:this.currentItem[0].style.height,position:this.currentItem.css("position"),top:this.currentItem.css("top"),left:this.currentItem.css("left")};if(a[0].style.width==
+""||b.forceHelperSize)a.width(this.currentItem.width());if(a[0].style.height==""||b.forceHelperSize)a.height(this.currentItem.height());return a},_adjustOffsetFromHelper:function(a){if(typeof a=="string")a=a.split(" ");if(d.isArray(a))a={left:+a[0],top:+a[1]||0};if("left"in a)this.offset.click.left=a.left+this.margins.left;if("right"in a)this.offset.click.left=this.helperProportions.width-a.right+this.margins.left;if("top"in a)this.offset.click.top=a.top+this.margins.top;if("bottom"in a)this.offset.click.top=
+this.helperProportions.height-a.bottom+this.margins.top},_getParentOffset:function(){this.offsetParent=this.helper.offsetParent();var a=this.offsetParent.offset();if(this.cssPosition=="absolute"&&this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0])){a.left+=this.scrollParent.scrollLeft();a.top+=this.scrollParent.scrollTop()}if(this.offsetParent[0]==document.body||this.offsetParent[0].tagName&&this.offsetParent[0].tagName.toLowerCase()=="html"&&d.browser.msie)a=
+{top:0,left:0};return{top:a.top+(parseInt(this.offsetParent.css("borderTopWidth"),10)||0),left:a.left+(parseInt(this.offsetParent.css("borderLeftWidth"),10)||0)}},_getRelativeOffset:function(){if(this.cssPosition=="relative"){var a=this.currentItem.position();return{top:a.top-(parseInt(this.helper.css("top"),10)||0)+this.scrollParent.scrollTop(),left:a.left-(parseInt(this.helper.css("left"),10)||0)+this.scrollParent.scrollLeft()}}else return{top:0,left:0}},_cacheMargins:function(){this.margins={left:parseInt(this.currentItem.css("marginLeft"),
+10)||0,top:parseInt(this.currentItem.css("marginTop"),10)||0}},_cacheHelperProportions:function(){this.helperProportions={width:this.helper.outerWidth(),height:this.helper.outerHeight()}},_setContainment:function(){var a=this.options;if(a.containment=="parent")a.containment=this.helper[0].parentNode;if(a.containment=="document"||a.containment=="window")this.containment=[0-this.offset.relative.left-this.offset.parent.left,0-this.offset.relative.top-this.offset.parent.top,d(a.containment=="document"?
+document:window).width()-this.helperProportions.width-this.margins.left,(d(a.containment=="document"?document:window).height()||document.body.parentNode.scrollHeight)-this.helperProportions.height-this.margins.top];if(!/^(document|window|parent)$/.test(a.containment)){var b=d(a.containment)[0];a=d(a.containment).offset();var c=d(b).css("overflow")!="hidden";this.containment=[a.left+(parseInt(d(b).css("borderLeftWidth"),10)||0)+(parseInt(d(b).css("paddingLeft"),10)||0)-this.margins.left,a.top+(parseInt(d(b).css("borderTopWidth"),
+10)||0)+(parseInt(d(b).css("paddingTop"),10)||0)-this.margins.top,a.left+(c?Math.max(b.scrollWidth,b.offsetWidth):b.offsetWidth)-(parseInt(d(b).css("borderLeftWidth"),10)||0)-(parseInt(d(b).css("paddingRight"),10)||0)-this.helperProportions.width-this.margins.left,a.top+(c?Math.max(b.scrollHeight,b.offsetHeight):b.offsetHeight)-(parseInt(d(b).css("borderTopWidth"),10)||0)-(parseInt(d(b).css("paddingBottom"),10)||0)-this.helperProportions.height-this.margins.top]}},_convertPositionTo:function(a,b){if(!b)b=
+this.position;a=a=="absolute"?1:-1;var c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);return{top:b.top+this.offset.relative.top*a+this.offset.parent.top*a-(d.browser.safari&&this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop())*a),left:b.left+this.offset.relative.left*a+this.offset.parent.left*a-(d.browser.safari&&
+this.cssPosition=="fixed"?0:(this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())*a)}},_generatePosition:function(a){var b=this.options,c=this.cssPosition=="absolute"&&!(this.scrollParent[0]!=document&&d.ui.contains(this.scrollParent[0],this.offsetParent[0]))?this.offsetParent:this.scrollParent,e=/(html|body)/i.test(c[0].tagName);if(this.cssPosition=="relative"&&!(this.scrollParent[0]!=document&&this.scrollParent[0]!=this.offsetParent[0]))this.offset.relative=this._getRelativeOffset();
+var f=a.pageX,g=a.pageY;if(this.originalPosition){if(this.containment){if(a.pageX-this.offset.click.left<this.containment[0])f=this.containment[0]+this.offset.click.left;if(a.pageY-this.offset.click.top<this.containment[1])g=this.containment[1]+this.offset.click.top;if(a.pageX-this.offset.click.left>this.containment[2])f=this.containment[2]+this.offset.click.left;if(a.pageY-this.offset.click.top>this.containment[3])g=this.containment[3]+this.offset.click.top}if(b.grid){g=this.originalPageY+Math.round((g-
+this.originalPageY)/b.grid[1])*b.grid[1];g=this.containment?!(g-this.offset.click.top<this.containment[1]||g-this.offset.click.top>this.containment[3])?g:!(g-this.offset.click.top<this.containment[1])?g-b.grid[1]:g+b.grid[1]:g;f=this.originalPageX+Math.round((f-this.originalPageX)/b.grid[0])*b.grid[0];f=this.containment?!(f-this.offset.click.left<this.containment[0]||f-this.offset.click.left>this.containment[2])?f:!(f-this.offset.click.left<this.containment[0])?f-b.grid[0]:f+b.grid[0]:f}}return{top:g-
+this.offset.click.top-this.offset.relative.top-this.offset.parent.top+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollTop():e?0:c.scrollTop()),left:f-this.offset.click.left-this.offset.relative.left-this.offset.parent.left+(d.browser.safari&&this.cssPosition=="fixed"?0:this.cssPosition=="fixed"?-this.scrollParent.scrollLeft():e?0:c.scrollLeft())}},_rearrange:function(a,b,c,e){c?c[0].appendChild(this.placeholder[0]):b.item[0].parentNode.insertBefore(this.placeholder[0],
+this.direction=="down"?b.item[0]:b.item[0].nextSibling);this.counter=this.counter?++this.counter:1;var f=this,g=this.counter;window.setTimeout(function(){g==f.counter&&f.refreshPositions(!e)},0)},_clear:function(a,b){this.reverting=false;var c=[];!this._noFinalSort&&this.currentItem[0].parentNode&&this.placeholder.before(this.currentItem);this._noFinalSort=null;if(this.helper[0]==this.currentItem[0]){for(var e in this._storedCSS)if(this._storedCSS[e]=="auto"||this._storedCSS[e]=="static")this._storedCSS[e]=
+"";this.currentItem.css(this._storedCSS).removeClass("ui-sortable-helper")}else this.currentItem.show();this.fromOutside&&!b&&c.push(function(f){this._trigger("receive",f,this._uiHash(this.fromOutside))});if((this.fromOutside||this.domPosition.prev!=this.currentItem.prev().not(".ui-sortable-helper")[0]||this.domPosition.parent!=this.currentItem.parent()[0])&&!b)c.push(function(f){this._trigger("update",f,this._uiHash())});if(!d.ui.contains(this.element[0],this.currentItem[0])){b||c.push(function(f){this._trigger("remove",
+f,this._uiHash())});for(e=this.containers.length-1;e>=0;e--)if(d.ui.contains(this.containers[e].element[0],this.currentItem[0])&&!b){c.push(function(f){return function(g){f._trigger("receive",g,this._uiHash(this))}}.call(this,this.containers[e]));c.push(function(f){return function(g){f._trigger("update",g,this._uiHash(this))}}.call(this,this.containers[e]))}}for(e=this.containers.length-1;e>=0;e--){b||c.push(function(f){return function(g){f._trigger("deactivate",g,this._uiHash(this))}}.call(this,
+this.containers[e]));if(this.containers[e].containerCache.over){c.push(function(f){return function(g){f._trigger("out",g,this._uiHash(this))}}.call(this,this.containers[e]));this.containers[e].containerCache.over=0}}this._storedCursor&&d("body").css("cursor",this._storedCursor);this._storedOpacity&&this.helper.css("opacity",this._storedOpacity);if(this._storedZIndex)this.helper.css("zIndex",this._storedZIndex=="auto"?"":this._storedZIndex);this.dragging=false;if(this.cancelHelperRemoval){if(!b){this._trigger("beforeStop",
+a,this._uiHash());for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}return false}b||this._trigger("beforeStop",a,this._uiHash());this.placeholder[0].parentNode.removeChild(this.placeholder[0]);this.helper[0]!=this.currentItem[0]&&this.helper.remove();this.helper=null;if(!b){for(e=0;e<c.length;e++)c[e].call(this,a);this._trigger("stop",a,this._uiHash())}this.fromOutside=false;return true},_trigger:function(){d.Widget.prototype._trigger.apply(this,arguments)===false&&this.cancel()},
+_uiHash:function(a){var b=a||this;return{helper:b.helper,placeholder:b.placeholder||d([]),position:b.position,originalPosition:b.originalPosition,offset:b.positionAbs,item:b.currentItem,sender:a?a.element:null}}});d.extend(d.ui.sortable,{version:"1.8.12"})})(jQuery);
+;/*
+ * jQuery UI Accordion 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Accordion
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(c){c.widget("ui.accordion",{options:{active:0,animated:"slide",autoHeight:true,clearStyle:false,collapsible:false,event:"click",fillSpace:false,header:"> li > :first-child,> :not(li):even",icons:{header:"ui-icon-triangle-1-e",headerSelected:"ui-icon-triangle-1-s"},navigation:false,navigationFilter:function(){return this.href.toLowerCase()===location.href.toLowerCase()}},_create:function(){var a=this,b=a.options;a.running=0;a.element.addClass("ui-accordion ui-widget ui-helper-reset").children("li").addClass("ui-accordion-li-fix");
+a.headers=a.element.find(b.header).addClass("ui-accordion-header ui-helper-reset ui-state-default ui-corner-all").bind("mouseenter.accordion",function(){b.disabled||c(this).addClass("ui-state-hover")}).bind("mouseleave.accordion",function(){b.disabled||c(this).removeClass("ui-state-hover")}).bind("focus.accordion",function(){b.disabled||c(this).addClass("ui-state-focus")}).bind("blur.accordion",function(){b.disabled||c(this).removeClass("ui-state-focus")});a.headers.next().addClass("ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom");
+if(b.navigation){var d=a.element.find("a").filter(b.navigationFilter).eq(0);if(d.length){var h=d.closest(".ui-accordion-header");a.active=h.length?h:d.closest(".ui-accordion-content").prev()}}a.active=a._findActive(a.active||b.active).addClass("ui-state-default ui-state-active").toggleClass("ui-corner-all").toggleClass("ui-corner-top");a.active.next().addClass("ui-accordion-content-active");a._createIcons();a.resize();a.element.attr("role","tablist");a.headers.attr("role","tab").bind("keydown.accordion",
+function(f){return a._keydown(f)}).next().attr("role","tabpanel");a.headers.not(a.active||"").attr({"aria-expanded":"false","aria-selected":"false",tabIndex:-1}).next().hide();a.active.length?a.active.attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}):a.headers.eq(0).attr("tabIndex",0);c.browser.safari||a.headers.find("a").attr("tabIndex",-1);b.event&&a.headers.bind(b.event.split(" ").join(".accordion ")+".accordion",function(f){a._clickHandler.call(a,f,this);f.preventDefault()})},_createIcons:function(){var a=
+this.options;if(a.icons){c("<span></span>").addClass("ui-icon "+a.icons.header).prependTo(this.headers);this.active.children(".ui-icon").toggleClass(a.icons.header).toggleClass(a.icons.headerSelected);this.element.addClass("ui-accordion-icons")}},_destroyIcons:function(){this.headers.children(".ui-icon").remove();this.element.removeClass("ui-accordion-icons")},destroy:function(){var a=this.options;this.element.removeClass("ui-accordion ui-widget ui-helper-reset").removeAttr("role");this.headers.unbind(".accordion").removeClass("ui-accordion-header ui-accordion-disabled ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top").removeAttr("role").removeAttr("aria-expanded").removeAttr("aria-selected").removeAttr("tabIndex");
+this.headers.find("a").removeAttr("tabIndex");this._destroyIcons();var b=this.headers.next().css("display","").removeAttr("role").removeClass("ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-accordion-disabled ui-state-disabled");if(a.autoHeight||a.fillHeight)b.css("height","");return c.Widget.prototype.destroy.call(this)},_setOption:function(a,b){c.Widget.prototype._setOption.apply(this,arguments);a=="active"&&this.activate(b);if(a=="icons"){this._destroyIcons();
+b&&this._createIcons()}if(a=="disabled")this.headers.add(this.headers.next())[b?"addClass":"removeClass"]("ui-accordion-disabled ui-state-disabled")},_keydown:function(a){if(!(this.options.disabled||a.altKey||a.ctrlKey)){var b=c.ui.keyCode,d=this.headers.length,h=this.headers.index(a.target),f=false;switch(a.keyCode){case b.RIGHT:case b.DOWN:f=this.headers[(h+1)%d];break;case b.LEFT:case b.UP:f=this.headers[(h-1+d)%d];break;case b.SPACE:case b.ENTER:this._clickHandler({target:a.target},a.target);
+a.preventDefault()}if(f){c(a.target).attr("tabIndex",-1);c(f).attr("tabIndex",0);f.focus();return false}return true}},resize:function(){var a=this.options,b;if(a.fillSpace){if(c.browser.msie){var d=this.element.parent().css("overflow");this.element.parent().css("overflow","hidden")}b=this.element.parent().height();c.browser.msie&&this.element.parent().css("overflow",d);this.headers.each(function(){b-=c(this).outerHeight(true)});this.headers.next().each(function(){c(this).height(Math.max(0,b-c(this).innerHeight()+
+c(this).height()))}).css("overflow","auto")}else if(a.autoHeight){b=0;this.headers.next().each(function(){b=Math.max(b,c(this).height("").height())}).height(b)}return this},activate:function(a){this.options.active=a;a=this._findActive(a)[0];this._clickHandler({target:a},a);return this},_findActive:function(a){return a?typeof a==="number"?this.headers.filter(":eq("+a+")"):this.headers.not(this.headers.not(a)):a===false?c([]):this.headers.filter(":eq(0)")},_clickHandler:function(a,b){var d=this.options;
+if(!d.disabled)if(a.target){a=c(a.currentTarget||b);b=a[0]===this.active[0];d.active=d.collapsible&&b?false:this.headers.index(a);if(!(this.running||!d.collapsible&&b)){var h=this.active;j=a.next();g=this.active.next();e={options:d,newHeader:b&&d.collapsible?c([]):a,oldHeader:this.active,newContent:b&&d.collapsible?c([]):j,oldContent:g};var f=this.headers.index(this.active[0])>this.headers.index(a[0]);this.active=b?c([]):a;this._toggle(j,g,e,b,f);h.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);
+if(!b){a.removeClass("ui-state-default ui-corner-all").addClass("ui-state-active ui-corner-top").children(".ui-icon").removeClass(d.icons.header).addClass(d.icons.headerSelected);a.next().addClass("ui-accordion-content-active")}}}else if(d.collapsible){this.active.removeClass("ui-state-active ui-corner-top").addClass("ui-state-default ui-corner-all").children(".ui-icon").removeClass(d.icons.headerSelected).addClass(d.icons.header);this.active.next().addClass("ui-accordion-content-active");var g=this.active.next(),
+e={options:d,newHeader:c([]),oldHeader:d.active,newContent:c([]),oldContent:g},j=this.active=c([]);this._toggle(j,g,e)}},_toggle:function(a,b,d,h,f){var g=this,e=g.options;g.toShow=a;g.toHide=b;g.data=d;var j=function(){if(g)return g._completed.apply(g,arguments)};g._trigger("changestart",null,g.data);g.running=b.size()===0?a.size():b.size();if(e.animated){d={};d=e.collapsible&&h?{toShow:c([]),toHide:b,complete:j,down:f,autoHeight:e.autoHeight||e.fillSpace}:{toShow:a,toHide:b,complete:j,down:f,autoHeight:e.autoHeight||
+e.fillSpace};if(!e.proxied)e.proxied=e.animated;if(!e.proxiedDuration)e.proxiedDuration=e.duration;e.animated=c.isFunction(e.proxied)?e.proxied(d):e.proxied;e.duration=c.isFunction(e.proxiedDuration)?e.proxiedDuration(d):e.proxiedDuration;h=c.ui.accordion.animations;var i=e.duration,k=e.animated;if(k&&!h[k]&&!c.easing[k])k="slide";h[k]||(h[k]=function(l){this.slide(l,{easing:k,duration:i||700})});h[k](d)}else{if(e.collapsible&&h)a.toggle();else{b.hide();a.show()}j(true)}b.prev().attr({"aria-expanded":"false",
+"aria-selected":"false",tabIndex:-1}).blur();a.prev().attr({"aria-expanded":"true","aria-selected":"true",tabIndex:0}).focus()},_completed:function(a){this.running=a?0:--this.running;if(!this.running){this.options.clearStyle&&this.toShow.add(this.toHide).css({height:"",overflow:""});this.toHide.removeClass("ui-accordion-content-active");if(this.toHide.length)this.toHide.parent()[0].className=this.toHide.parent()[0].className;this._trigger("change",null,this.data)}}});c.extend(c.ui.accordion,{version:"1.8.12",
+animations:{slide:function(a,b){a=c.extend({easing:"swing",duration:300},a,b);if(a.toHide.size())if(a.toShow.size()){var d=a.toShow.css("overflow"),h=0,f={},g={},e;b=a.toShow;e=b[0].style.width;b.width(parseInt(b.parent().width(),10)-parseInt(b.css("paddingLeft"),10)-parseInt(b.css("paddingRight"),10)-(parseInt(b.css("borderLeftWidth"),10)||0)-(parseInt(b.css("borderRightWidth"),10)||0));c.each(["height","paddingTop","paddingBottom"],function(j,i){g[i]="hide";j=(""+c.css(a.toShow[0],i)).match(/^([\d+-.]+)(.*)$/);
+f[i]={value:j[1],unit:j[2]||"px"}});a.toShow.css({height:0,overflow:"hidden"}).show();a.toHide.filter(":hidden").each(a.complete).end().filter(":visible").animate(g,{step:function(j,i){if(i.prop=="height")h=i.end-i.start===0?0:(i.now-i.start)/(i.end-i.start);a.toShow[0].style[i.prop]=h*f[i.prop].value+f[i.prop].unit},duration:a.duration,easing:a.easing,complete:function(){a.autoHeight||a.toShow.css("height","");a.toShow.css({width:e,overflow:d});a.complete()}})}else a.toHide.animate({height:"hide",
+paddingTop:"hide",paddingBottom:"hide"},a);else a.toShow.animate({height:"show",paddingTop:"show",paddingBottom:"show"},a)},bounceslide:function(a){this.slide(a,{easing:a.down?"easeOutBounce":"swing",duration:a.down?1E3:200})}}})})(jQuery);
+;/*
+ * jQuery UI Autocomplete 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Autocomplete
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *	jquery.ui.position.js
+ */
+(function(d){var e=0;d.widget("ui.autocomplete",{options:{appendTo:"body",autoFocus:false,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null},pending:0,_create:function(){var a=this,b=this.element[0].ownerDocument,g;this.element.addClass("ui-autocomplete-input").attr("autocomplete","off").attr({role:"textbox","aria-autocomplete":"list","aria-haspopup":"true"}).bind("keydown.autocomplete",function(c){if(!(a.options.disabled||a.element.attr("readonly"))){g=
+false;var f=d.ui.keyCode;switch(c.keyCode){case f.PAGE_UP:a._move("previousPage",c);break;case f.PAGE_DOWN:a._move("nextPage",c);break;case f.UP:a._move("previous",c);c.preventDefault();break;case f.DOWN:a._move("next",c);c.preventDefault();break;case f.ENTER:case f.NUMPAD_ENTER:if(a.menu.active){g=true;c.preventDefault()}case f.TAB:if(!a.menu.active)return;a.menu.select(c);break;case f.ESCAPE:a.element.val(a.term);a.close(c);break;default:clearTimeout(a.searching);a.searching=setTimeout(function(){if(a.term!=
+a.element.val()){a.selectedItem=null;a.search(null,c)}},a.options.delay);break}}}).bind("keypress.autocomplete",function(c){if(g){g=false;c.preventDefault()}}).bind("focus.autocomplete",function(){if(!a.options.disabled){a.selectedItem=null;a.previous=a.element.val()}}).bind("blur.autocomplete",function(c){if(!a.options.disabled){clearTimeout(a.searching);a.closing=setTimeout(function(){a.close(c);a._change(c)},150)}});this._initSource();this.response=function(){return a._response.apply(a,arguments)};
+this.menu=d("<ul></ul>").addClass("ui-autocomplete").appendTo(d(this.options.appendTo||"body",b)[0]).mousedown(function(c){var f=a.menu.element[0];d(c.target).closest(".ui-menu-item").length||setTimeout(function(){d(document).one("mousedown",function(h){h.target!==a.element[0]&&h.target!==f&&!d.ui.contains(f,h.target)&&a.close()})},1);setTimeout(function(){clearTimeout(a.closing)},13)}).menu({focus:function(c,f){f=f.item.data("item.autocomplete");false!==a._trigger("focus",c,{item:f})&&/^key/.test(c.originalEvent.type)&&
+a.element.val(f.value)},selected:function(c,f){var h=f.item.data("item.autocomplete"),i=a.previous;if(a.element[0]!==b.activeElement){a.element.focus();a.previous=i;setTimeout(function(){a.previous=i;a.selectedItem=h},1)}false!==a._trigger("select",c,{item:h})&&a.element.val(h.value);a.term=a.element.val();a.close(c);a.selectedItem=h},blur:function(){a.menu.element.is(":visible")&&a.element.val()!==a.term&&a.element.val(a.term)}}).zIndex(this.element.zIndex()+1).css({top:0,left:0}).hide().data("menu");
+d.fn.bgiframe&&this.menu.element.bgiframe()},destroy:function(){this.element.removeClass("ui-autocomplete-input").removeAttr("autocomplete").removeAttr("role").removeAttr("aria-autocomplete").removeAttr("aria-haspopup");this.menu.element.remove();d.Widget.prototype.destroy.call(this)},_setOption:function(a,b){d.Widget.prototype._setOption.apply(this,arguments);a==="source"&&this._initSource();if(a==="appendTo")this.menu.element.appendTo(d(b||"body",this.element[0].ownerDocument)[0]);a==="disabled"&&
+b&&this.xhr&&this.xhr.abort()},_initSource:function(){var a=this,b,g;if(d.isArray(this.options.source)){b=this.options.source;this.source=function(c,f){f(d.ui.autocomplete.filter(b,c.term))}}else if(typeof this.options.source==="string"){g=this.options.source;this.source=function(c,f){a.xhr&&a.xhr.abort();a.xhr=d.ajax({url:g,data:c,dataType:"json",autocompleteRequest:++e,success:function(h){this.autocompleteRequest===e&&f(h)},error:function(){this.autocompleteRequest===e&&f([])}})}}else this.source=
+this.options.source},search:function(a,b){a=a!=null?a:this.element.val();this.term=this.element.val();if(a.length<this.options.minLength)return this.close(b);clearTimeout(this.closing);if(this._trigger("search",b)!==false)return this._search(a)},_search:function(a){this.pending++;this.element.addClass("ui-autocomplete-loading");this.source({term:a},this.response)},_response:function(a){if(!this.options.disabled&&a&&a.length){a=this._normalize(a);this._suggest(a);this._trigger("open")}else this.close();
+this.pending--;this.pending||this.element.removeClass("ui-autocomplete-loading")},close:function(a){clearTimeout(this.closing);if(this.menu.element.is(":visible")){this.menu.element.hide();this.menu.deactivate();this._trigger("close",a)}},_change:function(a){this.previous!==this.element.val()&&this._trigger("change",a,{item:this.selectedItem})},_normalize:function(a){if(a.length&&a[0].label&&a[0].value)return a;return d.map(a,function(b){if(typeof b==="string")return{label:b,value:b};return d.extend({label:b.label||
+b.value,value:b.value||b.label},b)})},_suggest:function(a){var b=this.menu.element.empty().zIndex(this.element.zIndex()+1);this._renderMenu(b,a);this.menu.deactivate();this.menu.refresh();b.show();this._resizeMenu();b.position(d.extend({of:this.element},this.options.position));this.options.autoFocus&&this.menu.next(new d.Event("mouseover"))},_resizeMenu:function(){var a=this.menu.element;a.outerWidth(Math.max(a.width("").outerWidth(),this.element.outerWidth()))},_renderMenu:function(a,b){var g=this;
+d.each(b,function(c,f){g._renderItem(a,f)})},_renderItem:function(a,b){return d("<li></li>").data("item.autocomplete",b).append(d("<a></a>").text(b.label)).appendTo(a)},_move:function(a,b){if(this.menu.element.is(":visible"))if(this.menu.first()&&/^previous/.test(a)||this.menu.last()&&/^next/.test(a)){this.element.val(this.term);this.menu.deactivate()}else this.menu[a](b);else this.search(null,b)},widget:function(){return this.menu.element}});d.extend(d.ui.autocomplete,{escapeRegex:function(a){return a.replace(/[-[\]{}()*+?.,\\^$|#\s]/g,
+"\\$&")},filter:function(a,b){var g=new RegExp(d.ui.autocomplete.escapeRegex(b),"i");return d.grep(a,function(c){return g.test(c.label||c.value||c)})}})})(jQuery);
+(function(d){d.widget("ui.menu",{_create:function(){var e=this;this.element.addClass("ui-menu ui-widget ui-widget-content ui-corner-all").attr({role:"listbox","aria-activedescendant":"ui-active-menuitem"}).click(function(a){if(d(a.target).closest(".ui-menu-item a").length){a.preventDefault();e.select(a)}});this.refresh()},refresh:function(){var e=this;this.element.children("li:not(.ui-menu-item):has(a)").addClass("ui-menu-item").attr("role","menuitem").children("a").addClass("ui-corner-all").attr("tabindex",
+-1).mouseenter(function(a){e.activate(a,d(this).parent())}).mouseleave(function(){e.deactivate()})},activate:function(e,a){this.deactivate();if(this.hasScroll()){var b=a.offset().top-this.element.offset().top,g=this.element.attr("scrollTop"),c=this.element.height();if(b<0)this.element.attr("scrollTop",g+b);else b>=c&&this.element.attr("scrollTop",g+b-c+a.height())}this.active=a.eq(0).children("a").addClass("ui-state-hover").attr("id","ui-active-menuitem").end();this._trigger("focus",e,{item:a})},
+deactivate:function(){if(this.active){this.active.children("a").removeClass("ui-state-hover").removeAttr("id");this._trigger("blur");this.active=null}},next:function(e){this.move("next",".ui-menu-item:first",e)},previous:function(e){this.move("prev",".ui-menu-item:last",e)},first:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},last:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},move:function(e,a,b){if(this.active){e=this.active[e+"All"](".ui-menu-item").eq(0);
+e.length?this.activate(b,e):this.activate(b,this.element.children(a))}else this.activate(b,this.element.children(a))},nextPage:function(e){if(this.hasScroll())if(!this.active||this.last())this.activate(e,this.element.children(".ui-menu-item:first"));else{var a=this.active.offset().top,b=this.element.height(),g=this.element.children(".ui-menu-item").filter(function(){var c=d(this).offset().top-a-b+d(this).height();return c<10&&c>-10});g.length||(g=this.element.children(".ui-menu-item:last"));this.activate(e,
+g)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||this.last()?":first":":last"))},previousPage:function(e){if(this.hasScroll())if(!this.active||this.first())this.activate(e,this.element.children(".ui-menu-item:last"));else{var a=this.active.offset().top,b=this.element.height();result=this.element.children(".ui-menu-item").filter(function(){var g=d(this).offset().top-a+b-d(this).height();return g<10&&g>-10});result.length||(result=this.element.children(".ui-menu-item:first"));
+this.activate(e,result)}else this.activate(e,this.element.children(".ui-menu-item").filter(!this.active||this.first()?":last":":first"))},hasScroll:function(){return this.element.height()<this.element.attr("scrollHeight")},select:function(e){this._trigger("selected",e,{item:this.active})}})})(jQuery);
+;/*
+ * jQuery UI Button 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Button
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(a){var g,i=function(b){a(":ui-button",b.target.form).each(function(){var c=a(this).data("button");setTimeout(function(){c.refresh()},1)})},h=function(b){var c=b.name,d=b.form,f=a([]);if(c)f=d?a(d).find("[name='"+c+"']"):a("[name='"+c+"']",b.ownerDocument).filter(function(){return!this.form});return f};a.widget("ui.button",{options:{disabled:null,text:true,label:null,icons:{primary:null,secondary:null}},_create:function(){this.element.closest("form").unbind("reset.button").bind("reset.button",
+i);if(typeof this.options.disabled!=="boolean")this.options.disabled=this.element.attr("disabled");this._determineButtonType();this.hasTitle=!!this.buttonElement.attr("title");var b=this,c=this.options,d=this.type==="checkbox"||this.type==="radio",f="ui-state-hover"+(!d?" ui-state-active":"");if(c.label===null)c.label=this.buttonElement.html();if(this.element.is(":disabled"))c.disabled=true;this.buttonElement.addClass("ui-button ui-widget ui-state-default ui-corner-all").attr("role","button").bind("mouseenter.button",
+function(){if(!c.disabled){a(this).addClass("ui-state-hover");this===g&&a(this).addClass("ui-state-active")}}).bind("mouseleave.button",function(){c.disabled||a(this).removeClass(f)}).bind("focus.button",function(){a(this).addClass("ui-state-focus")}).bind("blur.button",function(){a(this).removeClass("ui-state-focus")});d&&this.element.bind("change.button",function(){b.refresh()});if(this.type==="checkbox")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).toggleClass("ui-state-active");
+b.buttonElement.attr("aria-pressed",b.element[0].checked)});else if(this.type==="radio")this.buttonElement.bind("click.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");b.buttonElement.attr("aria-pressed",true);var e=b.element[0];h(e).not(e).map(function(){return a(this).button("widget")[0]}).removeClass("ui-state-active").attr("aria-pressed",false)});else{this.buttonElement.bind("mousedown.button",function(){if(c.disabled)return false;a(this).addClass("ui-state-active");
+g=this;a(document).one("mouseup",function(){g=null})}).bind("mouseup.button",function(){if(c.disabled)return false;a(this).removeClass("ui-state-active")}).bind("keydown.button",function(e){if(c.disabled)return false;if(e.keyCode==a.ui.keyCode.SPACE||e.keyCode==a.ui.keyCode.ENTER)a(this).addClass("ui-state-active")}).bind("keyup.button",function(){a(this).removeClass("ui-state-active")});this.buttonElement.is("a")&&this.buttonElement.keyup(function(e){e.keyCode===a.ui.keyCode.SPACE&&a(this).click()})}this._setOption("disabled",
+c.disabled)},_determineButtonType:function(){this.type=this.element.is(":checkbox")?"checkbox":this.element.is(":radio")?"radio":this.element.is("input")?"input":"button";if(this.type==="checkbox"||this.type==="radio"){var b=this.element.parents().filter(":last"),c="label[for="+this.element.attr("id")+"]";this.buttonElement=b.find(c);if(!this.buttonElement.length){b=b.length?b.siblings():this.element.siblings();this.buttonElement=b.filter(c);if(!this.buttonElement.length)this.buttonElement=b.find(c)}this.element.addClass("ui-helper-hidden-accessible");
+(b=this.element.is(":checked"))&&this.buttonElement.addClass("ui-state-active");this.buttonElement.attr("aria-pressed",b)}else this.buttonElement=this.element},widget:function(){return this.buttonElement},destroy:function(){this.element.removeClass("ui-helper-hidden-accessible");this.buttonElement.removeClass("ui-button ui-widget ui-state-default ui-corner-all ui-state-hover ui-state-active  ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only").removeAttr("role").removeAttr("aria-pressed").html(this.buttonElement.find(".ui-button-text").html());
+this.hasTitle||this.buttonElement.removeAttr("title");a.Widget.prototype.destroy.call(this)},_setOption:function(b,c){a.Widget.prototype._setOption.apply(this,arguments);if(b==="disabled")c?this.element.attr("disabled",true):this.element.removeAttr("disabled");this._resetButton()},refresh:function(){var b=this.element.is(":disabled");b!==this.options.disabled&&this._setOption("disabled",b);if(this.type==="radio")h(this.element[0]).each(function(){a(this).is(":checked")?a(this).button("widget").addClass("ui-state-active").attr("aria-pressed",
+true):a(this).button("widget").removeClass("ui-state-active").attr("aria-pressed",false)});else if(this.type==="checkbox")this.element.is(":checked")?this.buttonElement.addClass("ui-state-active").attr("aria-pressed",true):this.buttonElement.removeClass("ui-state-active").attr("aria-pressed",false)},_resetButton:function(){if(this.type==="input")this.options.label&&this.element.val(this.options.label);else{var b=this.buttonElement.removeClass("ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only"),
+c=a("<span></span>").addClass("ui-button-text").html(this.options.label).appendTo(b.empty()).text(),d=this.options.icons,f=d.primary&&d.secondary,e=[];if(d.primary||d.secondary){if(this.options.text)e.push("ui-button-text-icon"+(f?"s":d.primary?"-primary":"-secondary"));d.primary&&b.prepend("<span class='ui-button-icon-primary ui-icon "+d.primary+"'></span>");d.secondary&&b.append("<span class='ui-button-icon-secondary ui-icon "+d.secondary+"'></span>");if(!this.options.text){e.push(f?"ui-button-icons-only":
+"ui-button-icon-only");this.hasTitle||b.attr("title",c)}}else e.push("ui-button-text-only");b.addClass(e.join(" "))}}});a.widget("ui.buttonset",{options:{items:":button, :submit, :reset, :checkbox, :radio, a, :data(button)"},_create:function(){this.element.addClass("ui-buttonset")},_init:function(){this.refresh()},_setOption:function(b,c){b==="disabled"&&this.buttons.button("option",b,c);a.Widget.prototype._setOption.apply(this,arguments)},refresh:function(){this.buttons=this.element.find(this.options.items).filter(":ui-button").button("refresh").end().not(":ui-button").button().end().map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-all ui-corner-left ui-corner-right").filter(":first").addClass("ui-corner-left").end().filter(":last").addClass("ui-corner-right").end().end()},
+destroy:function(){this.element.removeClass("ui-buttonset");this.buttons.map(function(){return a(this).button("widget")[0]}).removeClass("ui-corner-left ui-corner-right").end().button("destroy");a.Widget.prototype.destroy.call(this)}})})(jQuery);
+;/*
+ * jQuery UI Dialog 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Dialog
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ *  jquery.ui.button.js
+ *	jquery.ui.draggable.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.position.js
+ *	jquery.ui.resizable.js
+ */
+(function(c,l){var m={buttons:true,height:true,maxHeight:true,maxWidth:true,minHeight:true,minWidth:true,width:true},n={maxHeight:true,maxWidth:true,minHeight:true,minWidth:true},o=c.attrFn||{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true,click:true};c.widget("ui.dialog",{options:{autoOpen:true,buttons:{},closeOnEscape:true,closeText:"close",dialogClass:"",draggable:true,hide:null,height:"auto",maxHeight:false,maxWidth:false,minHeight:150,minWidth:150,modal:false,
+position:{my:"center",at:"center",collision:"fit",using:function(a){var b=c(this).css(a).offset().top;b<0&&c(this).css("top",a.top-b)}},resizable:true,show:null,stack:true,title:"",width:300,zIndex:1E3},_create:function(){this.originalTitle=this.element.attr("title");if(typeof this.originalTitle!=="string")this.originalTitle="";this.options.title=this.options.title||this.originalTitle;var a=this,b=a.options,d=b.title||"&#160;",e=c.ui.dialog.getTitleId(a.element),g=(a.uiDialog=c("<div></div>")).appendTo(document.body).hide().addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+
+b.dialogClass).css({zIndex:b.zIndex}).attr("tabIndex",-1).css("outline",0).keydown(function(i){if(b.closeOnEscape&&i.keyCode&&i.keyCode===c.ui.keyCode.ESCAPE){a.close(i);i.preventDefault()}}).attr({role:"dialog","aria-labelledby":e}).mousedown(function(i){a.moveToTop(false,i)});a.element.show().removeAttr("title").addClass("ui-dialog-content ui-widget-content").appendTo(g);var f=(a.uiDialogTitlebar=c("<div></div>")).addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix").prependTo(g),
+h=c('<a href="#"></a>').addClass("ui-dialog-titlebar-close ui-corner-all").attr("role","button").hover(function(){h.addClass("ui-state-hover")},function(){h.removeClass("ui-state-hover")}).focus(function(){h.addClass("ui-state-focus")}).blur(function(){h.removeClass("ui-state-focus")}).click(function(i){a.close(i);return false}).appendTo(f);(a.uiDialogTitlebarCloseText=c("<span></span>")).addClass("ui-icon ui-icon-closethick").text(b.closeText).appendTo(h);c("<span></span>").addClass("ui-dialog-title").attr("id",
+e).html(d).prependTo(f);if(c.isFunction(b.beforeclose)&&!c.isFunction(b.beforeClose))b.beforeClose=b.beforeclose;f.find("*").add(f).disableSelection();b.draggable&&c.fn.draggable&&a._makeDraggable();b.resizable&&c.fn.resizable&&a._makeResizable();a._createButtons(b.buttons);a._isOpen=false;c.fn.bgiframe&&g.bgiframe()},_init:function(){this.options.autoOpen&&this.open()},destroy:function(){var a=this;a.overlay&&a.overlay.destroy();a.uiDialog.hide();a.element.unbind(".dialog").removeData("dialog").removeClass("ui-dialog-content ui-widget-content").hide().appendTo("body");
+a.uiDialog.remove();a.originalTitle&&a.element.attr("title",a.originalTitle);return a},widget:function(){return this.uiDialog},close:function(a){var b=this,d,e;if(false!==b._trigger("beforeClose",a)){b.overlay&&b.overlay.destroy();b.uiDialog.unbind("keypress.ui-dialog");b._isOpen=false;if(b.options.hide)b.uiDialog.hide(b.options.hide,function(){b._trigger("close",a)});else{b.uiDialog.hide();b._trigger("close",a)}c.ui.dialog.overlay.resize();if(b.options.modal){d=0;c(".ui-dialog").each(function(){if(this!==
+b.uiDialog[0]){e=c(this).css("z-index");isNaN(e)||(d=Math.max(d,e))}});c.ui.dialog.maxZ=d}return b}},isOpen:function(){return this._isOpen},moveToTop:function(a,b){var d=this,e=d.options;if(e.modal&&!a||!e.stack&&!e.modal)return d._trigger("focus",b);if(e.zIndex>c.ui.dialog.maxZ)c.ui.dialog.maxZ=e.zIndex;if(d.overlay){c.ui.dialog.maxZ+=1;d.overlay.$el.css("z-index",c.ui.dialog.overlay.maxZ=c.ui.dialog.maxZ)}a={scrollTop:d.element.attr("scrollTop"),scrollLeft:d.element.attr("scrollLeft")};c.ui.dialog.maxZ+=
+1;d.uiDialog.css("z-index",c.ui.dialog.maxZ);d.element.attr(a);d._trigger("focus",b);return d},open:function(){if(!this._isOpen){var a=this,b=a.options,d=a.uiDialog;a.overlay=b.modal?new c.ui.dialog.overlay(a):null;a._size();a._position(b.position);d.show(b.show);a.moveToTop(true);b.modal&&d.bind("keypress.ui-dialog",function(e){if(e.keyCode===c.ui.keyCode.TAB){var g=c(":tabbable",this),f=g.filter(":first");g=g.filter(":last");if(e.target===g[0]&&!e.shiftKey){f.focus(1);return false}else if(e.target===
+f[0]&&e.shiftKey){g.focus(1);return false}}});c(a.element.find(":tabbable").get().concat(d.find(".ui-dialog-buttonpane :tabbable").get().concat(d.get()))).eq(0).focus();a._isOpen=true;a._trigger("open");return a}},_createButtons:function(a){var b=this,d=false,e=c("<div></div>").addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix"),g=c("<div></div>").addClass("ui-dialog-buttonset").appendTo(e);b.uiDialog.find(".ui-dialog-buttonpane").remove();typeof a==="object"&&a!==null&&c.each(a,
+function(){return!(d=true)});if(d){c.each(a,function(f,h){h=c.isFunction(h)?{click:h,text:f}:h;var i=c('<button type="button"></button>').click(function(){h.click.apply(b.element[0],arguments)}).appendTo(g);c.each(h,function(j,k){if(j!=="click")j in o?i[j](k):i.attr(j,k)});c.fn.button&&i.button()});e.appendTo(b.uiDialog)}},_makeDraggable:function(){function a(f){return{position:f.position,offset:f.offset}}var b=this,d=b.options,e=c(document),g;b.uiDialog.draggable({cancel:".ui-dialog-content, .ui-dialog-titlebar-close",
+handle:".ui-dialog-titlebar",containment:"document",start:function(f,h){g=d.height==="auto"?"auto":c(this).height();c(this).height(c(this).height()).addClass("ui-dialog-dragging");b._trigger("dragStart",f,a(h))},drag:function(f,h){b._trigger("drag",f,a(h))},stop:function(f,h){d.position=[h.position.left-e.scrollLeft(),h.position.top-e.scrollTop()];c(this).removeClass("ui-dialog-dragging").height(g);b._trigger("dragStop",f,a(h));c.ui.dialog.overlay.resize()}})},_makeResizable:function(a){function b(f){return{originalPosition:f.originalPosition,
+originalSize:f.originalSize,position:f.position,size:f.size}}a=a===l?this.options.resizable:a;var d=this,e=d.options,g=d.uiDialog.css("position");a=typeof a==="string"?a:"n,e,s,w,se,sw,ne,nw";d.uiDialog.resizable({cancel:".ui-dialog-content",containment:"document",alsoResize:d.element,maxWidth:e.maxWidth,maxHeight:e.maxHeight,minWidth:e.minWidth,minHeight:d._minHeight(),handles:a,start:function(f,h){c(this).addClass("ui-dialog-resizing");d._trigger("resizeStart",f,b(h))},resize:function(f,h){d._trigger("resize",
+f,b(h))},stop:function(f,h){c(this).removeClass("ui-dialog-resizing");e.height=c(this).height();e.width=c(this).width();d._trigger("resizeStop",f,b(h));c.ui.dialog.overlay.resize()}}).css("position",g).find(".ui-resizable-se").addClass("ui-icon ui-icon-grip-diagonal-se")},_minHeight:function(){var a=this.options;return a.height==="auto"?a.minHeight:Math.min(a.minHeight,a.height)},_position:function(a){var b=[],d=[0,0],e;if(a){if(typeof a==="string"||typeof a==="object"&&"0"in a){b=a.split?a.split(" "):
+[a[0],a[1]];if(b.length===1)b[1]=b[0];c.each(["left","top"],function(g,f){if(+b[g]===b[g]){d[g]=b[g];b[g]=f}});a={my:b.join(" "),at:b.join(" "),offset:d.join(" ")}}a=c.extend({},c.ui.dialog.prototype.options.position,a)}else a=c.ui.dialog.prototype.options.position;(e=this.uiDialog.is(":visible"))||this.uiDialog.show();this.uiDialog.css({top:0,left:0}).position(c.extend({of:window},a));e||this.uiDialog.hide()},_setOptions:function(a){var b=this,d={},e=false;c.each(a,function(g,f){b._setOption(g,f);
+if(g in m)e=true;if(g in n)d[g]=f});e&&this._size();this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option",d)},_setOption:function(a,b){var d=this,e=d.uiDialog;switch(a){case "beforeclose":a="beforeClose";break;case "buttons":d._createButtons(b);break;case "closeText":d.uiDialogTitlebarCloseText.text(""+b);break;case "dialogClass":e.removeClass(d.options.dialogClass).addClass("ui-dialog ui-widget ui-widget-content ui-corner-all "+b);break;case "disabled":b?e.addClass("ui-dialog-disabled"):
+e.removeClass("ui-dialog-disabled");break;case "draggable":var g=e.is(":data(draggable)");g&&!b&&e.draggable("destroy");!g&&b&&d._makeDraggable();break;case "position":d._position(b);break;case "resizable":(g=e.is(":data(resizable)"))&&!b&&e.resizable("destroy");g&&typeof b==="string"&&e.resizable("option","handles",b);!g&&b!==false&&d._makeResizable(b);break;case "title":c(".ui-dialog-title",d.uiDialogTitlebar).html(""+(b||"&#160;"));break}c.Widget.prototype._setOption.apply(d,arguments)},_size:function(){var a=
+this.options,b,d,e=this.uiDialog.is(":visible");this.element.show().css({width:"auto",minHeight:0,height:0});if(a.minWidth>a.width)a.width=a.minWidth;b=this.uiDialog.css({height:"auto",width:a.width}).height();d=Math.max(0,a.minHeight-b);if(a.height==="auto")if(c.support.minHeight)this.element.css({minHeight:d,height:"auto"});else{this.uiDialog.show();a=this.element.css("height","auto").height();e||this.uiDialog.hide();this.element.height(Math.max(a,d))}else this.element.height(Math.max(a.height-
+b,0));this.uiDialog.is(":data(resizable)")&&this.uiDialog.resizable("option","minHeight",this._minHeight())}});c.extend(c.ui.dialog,{version:"1.8.12",uuid:0,maxZ:0,getTitleId:function(a){a=a.attr("id");if(!a){this.uuid+=1;a=this.uuid}return"ui-dialog-title-"+a},overlay:function(a){this.$el=c.ui.dialog.overlay.create(a)}});c.extend(c.ui.dialog.overlay,{instances:[],oldInstances:[],maxZ:0,events:c.map("focus,mousedown,mouseup,keydown,keypress,click".split(","),function(a){return a+".dialog-overlay"}).join(" "),
+create:function(a){if(this.instances.length===0){setTimeout(function(){c.ui.dialog.overlay.instances.length&&c(document).bind(c.ui.dialog.overlay.events,function(d){if(c(d.target).zIndex()<c.ui.dialog.overlay.maxZ)return false})},1);c(document).bind("keydown.dialog-overlay",function(d){if(a.options.closeOnEscape&&d.keyCode&&d.keyCode===c.ui.keyCode.ESCAPE){a.close(d);d.preventDefault()}});c(window).bind("resize.dialog-overlay",c.ui.dialog.overlay.resize)}var b=(this.oldInstances.pop()||c("<div></div>").addClass("ui-widget-overlay")).appendTo(document.body).css({width:this.width(),
+height:this.height()});c.fn.bgiframe&&b.bgiframe();this.instances.push(b);return b},destroy:function(a){var b=c.inArray(a,this.instances);b!=-1&&this.oldInstances.push(this.instances.splice(b,1)[0]);this.instances.length===0&&c([document,window]).unbind(".dialog-overlay");a.remove();var d=0;c.each(this.instances,function(){d=Math.max(d,this.css("z-index"))});this.maxZ=d},height:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollHeight,document.body.scrollHeight);
+b=Math.max(document.documentElement.offsetHeight,document.body.offsetHeight);return a<b?c(window).height()+"px":a+"px"}else return c(document).height()+"px"},width:function(){var a,b;if(c.browser.msie&&c.browser.version<7){a=Math.max(document.documentElement.scrollWidth,document.body.scrollWidth);b=Math.max(document.documentElement.offsetWidth,document.body.offsetWidth);return a<b?c(window).width()+"px":a+"px"}else return c(document).width()+"px"},resize:function(){var a=c([]);c.each(c.ui.dialog.overlay.instances,
+function(){a=a.add(this)});a.css({width:0,height:0}).css({width:c.ui.dialog.overlay.width(),height:c.ui.dialog.overlay.height()})}});c.extend(c.ui.dialog.overlay.prototype,{destroy:function(){c.ui.dialog.overlay.destroy(this.$el)}})})(jQuery);
+;/*
+ * jQuery UI Slider 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Slider
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.mouse.js
+ *	jquery.ui.widget.js
+ */
+(function(d){d.widget("ui.slider",d.ui.mouse,{widgetEventPrefix:"slide",options:{animate:false,distance:0,max:100,min:0,orientation:"horizontal",range:false,step:1,value:0,values:null},_create:function(){var b=this,a=this.options;this._mouseSliding=this._keySliding=false;this._animateOff=true;this._handleIndex=null;this._detectOrientation();this._mouseInit();this.element.addClass("ui-slider ui-slider-"+this.orientation+" ui-widget ui-widget-content ui-corner-all");a.disabled&&this.element.addClass("ui-slider-disabled ui-disabled");
+this.range=d([]);if(a.range){if(a.range===true){this.range=d("<div></div>");if(!a.values)a.values=[this._valueMin(),this._valueMin()];if(a.values.length&&a.values.length!==2)a.values=[a.values[0],a.values[0]]}else this.range=d("<div></div>");this.range.appendTo(this.element).addClass("ui-slider-range");if(a.range==="min"||a.range==="max")this.range.addClass("ui-slider-range-"+a.range);this.range.addClass("ui-widget-header")}d(".ui-slider-handle",this.element).length===0&&d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");
+if(a.values&&a.values.length)for(;d(".ui-slider-handle",this.element).length<a.values.length;)d("<a href='#'></a>").appendTo(this.element).addClass("ui-slider-handle");this.handles=d(".ui-slider-handle",this.element).addClass("ui-state-default ui-corner-all");this.handle=this.handles.eq(0);this.handles.add(this.range).filter("a").click(function(c){c.preventDefault()}).hover(function(){a.disabled||d(this).addClass("ui-state-hover")},function(){d(this).removeClass("ui-state-hover")}).focus(function(){if(a.disabled)d(this).blur();
+else{d(".ui-slider .ui-state-focus").removeClass("ui-state-focus");d(this).addClass("ui-state-focus")}}).blur(function(){d(this).removeClass("ui-state-focus")});this.handles.each(function(c){d(this).data("index.ui-slider-handle",c)});this.handles.keydown(function(c){var e=true,f=d(this).data("index.ui-slider-handle"),h,g,i;if(!b.options.disabled){switch(c.keyCode){case d.ui.keyCode.HOME:case d.ui.keyCode.END:case d.ui.keyCode.PAGE_UP:case d.ui.keyCode.PAGE_DOWN:case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:e=
+false;if(!b._keySliding){b._keySliding=true;d(this).addClass("ui-state-active");h=b._start(c,f);if(h===false)return}break}i=b.options.step;h=b.options.values&&b.options.values.length?(g=b.values(f)):(g=b.value());switch(c.keyCode){case d.ui.keyCode.HOME:g=b._valueMin();break;case d.ui.keyCode.END:g=b._valueMax();break;case d.ui.keyCode.PAGE_UP:g=b._trimAlignValue(h+(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.PAGE_DOWN:g=b._trimAlignValue(h-(b._valueMax()-b._valueMin())/5);break;case d.ui.keyCode.UP:case d.ui.keyCode.RIGHT:if(h===
+b._valueMax())return;g=b._trimAlignValue(h+i);break;case d.ui.keyCode.DOWN:case d.ui.keyCode.LEFT:if(h===b._valueMin())return;g=b._trimAlignValue(h-i);break}b._slide(c,f,g);return e}}).keyup(function(c){var e=d(this).data("index.ui-slider-handle");if(b._keySliding){b._keySliding=false;b._stop(c,e);b._change(c,e);d(this).removeClass("ui-state-active")}});this._refreshValue();this._animateOff=false},destroy:function(){this.handles.remove();this.range.remove();this.element.removeClass("ui-slider ui-slider-horizontal ui-slider-vertical ui-slider-disabled ui-widget ui-widget-content ui-corner-all").removeData("slider").unbind(".slider");
+this._mouseDestroy();return this},_mouseCapture:function(b){var a=this.options,c,e,f,h,g;if(a.disabled)return false;this.elementSize={width:this.element.outerWidth(),height:this.element.outerHeight()};this.elementOffset=this.element.offset();c=this._normValueFromMouse({x:b.pageX,y:b.pageY});e=this._valueMax()-this._valueMin()+1;h=this;this.handles.each(function(i){var j=Math.abs(c-h.values(i));if(e>j){e=j;f=d(this);g=i}});if(a.range===true&&this.values(1)===a.min){g+=1;f=d(this.handles[g])}if(this._start(b,
+g)===false)return false;this._mouseSliding=true;h._handleIndex=g;f.addClass("ui-state-active").focus();a=f.offset();this._clickOffset=!d(b.target).parents().andSelf().is(".ui-slider-handle")?{left:0,top:0}:{left:b.pageX-a.left-f.width()/2,top:b.pageY-a.top-f.height()/2-(parseInt(f.css("borderTopWidth"),10)||0)-(parseInt(f.css("borderBottomWidth"),10)||0)+(parseInt(f.css("marginTop"),10)||0)};this.handles.hasClass("ui-state-hover")||this._slide(b,g,c);return this._animateOff=true},_mouseStart:function(){return true},
+_mouseDrag:function(b){var a=this._normValueFromMouse({x:b.pageX,y:b.pageY});this._slide(b,this._handleIndex,a);return false},_mouseStop:function(b){this.handles.removeClass("ui-state-active");this._mouseSliding=false;this._stop(b,this._handleIndex);this._change(b,this._handleIndex);this._clickOffset=this._handleIndex=null;return this._animateOff=false},_detectOrientation:function(){this.orientation=this.options.orientation==="vertical"?"vertical":"horizontal"},_normValueFromMouse:function(b){var a;
+if(this.orientation==="horizontal"){a=this.elementSize.width;b=b.x-this.elementOffset.left-(this._clickOffset?this._clickOffset.left:0)}else{a=this.elementSize.height;b=b.y-this.elementOffset.top-(this._clickOffset?this._clickOffset.top:0)}a=b/a;if(a>1)a=1;if(a<0)a=0;if(this.orientation==="vertical")a=1-a;b=this._valueMax()-this._valueMin();return this._trimAlignValue(this._valueMin()+a*b)},_start:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=
+this.values(a);c.values=this.values()}return this._trigger("start",b,c)},_slide:function(b,a,c){var e;if(this.options.values&&this.options.values.length){e=this.values(a?0:1);if(this.options.values.length===2&&this.options.range===true&&(a===0&&c>e||a===1&&c<e))c=e;if(c!==this.values(a)){e=this.values();e[a]=c;b=this._trigger("slide",b,{handle:this.handles[a],value:c,values:e});this.values(a?0:1);b!==false&&this.values(a,c,true)}}else if(c!==this.value()){b=this._trigger("slide",b,{handle:this.handles[a],
+value:c});b!==false&&this.value(c)}},_stop:function(b,a){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("stop",b,c)},_change:function(b,a){if(!this._keySliding&&!this._mouseSliding){var c={handle:this.handles[a],value:this.value()};if(this.options.values&&this.options.values.length){c.value=this.values(a);c.values=this.values()}this._trigger("change",b,c)}},value:function(b){if(arguments.length){this.options.value=
+this._trimAlignValue(b);this._refreshValue();this._change(null,0)}else return this._value()},values:function(b,a){var c,e,f;if(arguments.length>1){this.options.values[b]=this._trimAlignValue(a);this._refreshValue();this._change(null,b)}else if(arguments.length)if(d.isArray(arguments[0])){c=this.options.values;e=arguments[0];for(f=0;f<c.length;f+=1){c[f]=this._trimAlignValue(e[f]);this._change(null,f)}this._refreshValue()}else return this.options.values&&this.options.values.length?this._values(b):
+this.value();else return this._values()},_setOption:function(b,a){var c,e=0;if(d.isArray(this.options.values))e=this.options.values.length;d.Widget.prototype._setOption.apply(this,arguments);switch(b){case "disabled":if(a){this.handles.filter(".ui-state-focus").blur();this.handles.removeClass("ui-state-hover");this.handles.attr("disabled","disabled");this.element.addClass("ui-disabled")}else{this.handles.removeAttr("disabled");this.element.removeClass("ui-disabled")}break;case "orientation":this._detectOrientation();
+this.element.removeClass("ui-slider-horizontal ui-slider-vertical").addClass("ui-slider-"+this.orientation);this._refreshValue();break;case "value":this._animateOff=true;this._refreshValue();this._change(null,0);this._animateOff=false;break;case "values":this._animateOff=true;this._refreshValue();for(c=0;c<e;c+=1)this._change(null,c);this._animateOff=false;break}},_value:function(){var b=this.options.value;return b=this._trimAlignValue(b)},_values:function(b){var a,c;if(arguments.length){a=this.options.values[b];
+return a=this._trimAlignValue(a)}else{a=this.options.values.slice();for(c=0;c<a.length;c+=1)a[c]=this._trimAlignValue(a[c]);return a}},_trimAlignValue:function(b){if(b<=this._valueMin())return this._valueMin();if(b>=this._valueMax())return this._valueMax();var a=this.options.step>0?this.options.step:1,c=(b-this._valueMin())%a;alignValue=b-c;if(Math.abs(c)*2>=a)alignValue+=c>0?a:-a;return parseFloat(alignValue.toFixed(5))},_valueMin:function(){return this.options.min},_valueMax:function(){return this.options.max},
+_refreshValue:function(){var b=this.options.range,a=this.options,c=this,e=!this._animateOff?a.animate:false,f,h={},g,i,j,l;if(this.options.values&&this.options.values.length)this.handles.each(function(k){f=(c.values(k)-c._valueMin())/(c._valueMax()-c._valueMin())*100;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";d(this).stop(1,1)[e?"animate":"css"](h,a.animate);if(c.options.range===true)if(c.orientation==="horizontal"){if(k===0)c.range.stop(1,1)[e?"animate":"css"]({left:f+"%"},a.animate);
+if(k===1)c.range[e?"animate":"css"]({width:f-g+"%"},{queue:false,duration:a.animate})}else{if(k===0)c.range.stop(1,1)[e?"animate":"css"]({bottom:f+"%"},a.animate);if(k===1)c.range[e?"animate":"css"]({height:f-g+"%"},{queue:false,duration:a.animate})}g=f});else{i=this.value();j=this._valueMin();l=this._valueMax();f=l!==j?(i-j)/(l-j)*100:0;h[c.orientation==="horizontal"?"left":"bottom"]=f+"%";this.handle.stop(1,1)[e?"animate":"css"](h,a.animate);if(b==="min"&&this.orientation==="horizontal")this.range.stop(1,
+1)[e?"animate":"css"]({width:f+"%"},a.animate);if(b==="max"&&this.orientation==="horizontal")this.range[e?"animate":"css"]({width:100-f+"%"},{queue:false,duration:a.animate});if(b==="min"&&this.orientation==="vertical")this.range.stop(1,1)[e?"animate":"css"]({height:f+"%"},a.animate);if(b==="max"&&this.orientation==="vertical")this.range[e?"animate":"css"]({height:100-f+"%"},{queue:false,duration:a.animate})}}});d.extend(d.ui.slider,{version:"1.8.12"})})(jQuery);
+;/*
+ * jQuery UI Tabs 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Tabs
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ *	jquery.ui.widget.js
+ */
+(function(d,p){function u(){return++v}function w(){return++x}var v=0,x=0;d.widget("ui.tabs",{options:{add:null,ajaxOptions:null,cache:false,cookie:null,collapsible:false,disable:null,disabled:[],enable:null,event:"click",fx:null,idPrefix:"ui-tabs-",load:null,panelTemplate:"<div></div>",remove:null,select:null,show:null,spinner:"<em>Loading&#8230;</em>",tabTemplate:"<li><a href='#{href}'><span>#{label}</span></a></li>"},_create:function(){this._tabify(true)},_setOption:function(b,e){if(b=="selected")this.options.collapsible&&
+e==this.options.selected||this.select(e);else{this.options[b]=e;this._tabify()}},_tabId:function(b){return b.title&&b.title.replace(/\s/g,"_").replace(/[^\w\u00c0-\uFFFF-]/g,"")||this.options.idPrefix+u()},_sanitizeSelector:function(b){return b.replace(/:/g,"\\:")},_cookie:function(){var b=this.cookie||(this.cookie=this.options.cookie.name||"ui-tabs-"+w());return d.cookie.apply(null,[b].concat(d.makeArray(arguments)))},_ui:function(b,e){return{tab:b,panel:e,index:this.anchors.index(b)}},_cleanup:function(){this.lis.filter(".ui-state-processing").removeClass("ui-state-processing").find("span:data(label.tabs)").each(function(){var b=
+d(this);b.html(b.data("label.tabs")).removeData("label.tabs")})},_tabify:function(b){function e(g,f){g.css("display","");!d.support.opacity&&f.opacity&&g[0].style.removeAttribute("filter")}var a=this,c=this.options,h=/^#.+/;this.list=this.element.find("ol,ul").eq(0);this.lis=d(" > li:has(a[href])",this.list);this.anchors=this.lis.map(function(){return d("a",this)[0]});this.panels=d([]);this.anchors.each(function(g,f){var i=d(f).attr("href"),l=i.split("#")[0],q;if(l&&(l===location.toString().split("#")[0]||
+(q=d("base")[0])&&l===q.href)){i=f.hash;f.href=i}if(h.test(i))a.panels=a.panels.add(a.element.find(a._sanitizeSelector(i)));else if(i&&i!=="#"){d.data(f,"href.tabs",i);d.data(f,"load.tabs",i.replace(/#.*$/,""));i=a._tabId(f);f.href="#"+i;f=a.element.find("#"+i);if(!f.length){f=d(c.panelTemplate).attr("id",i).addClass("ui-tabs-panel ui-widget-content ui-corner-bottom").insertAfter(a.panels[g-1]||a.list);f.data("destroy.tabs",true)}a.panels=a.panels.add(f)}else c.disabled.push(g)});if(b){this.element.addClass("ui-tabs ui-widget ui-widget-content ui-corner-all");
+this.list.addClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.lis.addClass("ui-state-default ui-corner-top");this.panels.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom");if(c.selected===p){location.hash&&this.anchors.each(function(g,f){if(f.hash==location.hash){c.selected=g;return false}});if(typeof c.selected!=="number"&&c.cookie)c.selected=parseInt(a._cookie(),10);if(typeof c.selected!=="number"&&this.lis.filter(".ui-tabs-selected").length)c.selected=
+this.lis.index(this.lis.filter(".ui-tabs-selected"));c.selected=c.selected||(this.lis.length?0:-1)}else if(c.selected===null)c.selected=-1;c.selected=c.selected>=0&&this.anchors[c.selected]||c.selected<0?c.selected:0;c.disabled=d.unique(c.disabled.concat(d.map(this.lis.filter(".ui-state-disabled"),function(g){return a.lis.index(g)}))).sort();d.inArray(c.selected,c.disabled)!=-1&&c.disabled.splice(d.inArray(c.selected,c.disabled),1);this.panels.addClass("ui-tabs-hide");this.lis.removeClass("ui-tabs-selected ui-state-active");
+if(c.selected>=0&&this.anchors.length){a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash)).removeClass("ui-tabs-hide");this.lis.eq(c.selected).addClass("ui-tabs-selected ui-state-active");a.element.queue("tabs",function(){a._trigger("show",null,a._ui(a.anchors[c.selected],a.element.find(a._sanitizeSelector(a.anchors[c.selected].hash))[0]))});this.load(c.selected)}d(window).bind("unload",function(){a.lis.add(a.anchors).unbind(".tabs");a.lis=a.anchors=a.panels=null})}else c.selected=this.lis.index(this.lis.filter(".ui-tabs-selected"));
+this.element[c.collapsible?"addClass":"removeClass"]("ui-tabs-collapsible");c.cookie&&this._cookie(c.selected,c.cookie);b=0;for(var j;j=this.lis[b];b++)d(j)[d.inArray(b,c.disabled)!=-1&&!d(j).hasClass("ui-tabs-selected")?"addClass":"removeClass"]("ui-state-disabled");c.cache===false&&this.anchors.removeData("cache.tabs");this.lis.add(this.anchors).unbind(".tabs");if(c.event!=="mouseover"){var k=function(g,f){f.is(":not(.ui-state-disabled)")&&f.addClass("ui-state-"+g)},n=function(g,f){f.removeClass("ui-state-"+
+g)};this.lis.bind("mouseover.tabs",function(){k("hover",d(this))});this.lis.bind("mouseout.tabs",function(){n("hover",d(this))});this.anchors.bind("focus.tabs",function(){k("focus",d(this).closest("li"))});this.anchors.bind("blur.tabs",function(){n("focus",d(this).closest("li"))})}var m,o;if(c.fx)if(d.isArray(c.fx)){m=c.fx[0];o=c.fx[1]}else m=o=c.fx;var r=o?function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.hide().removeClass("ui-tabs-hide").animate(o,o.duration||"normal",
+function(){e(f,o);a._trigger("show",null,a._ui(g,f[0]))})}:function(g,f){d(g).closest("li").addClass("ui-tabs-selected ui-state-active");f.removeClass("ui-tabs-hide");a._trigger("show",null,a._ui(g,f[0]))},s=m?function(g,f){f.animate(m,m.duration||"normal",function(){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");e(f,m);a.element.dequeue("tabs")})}:function(g,f){a.lis.removeClass("ui-tabs-selected ui-state-active");f.addClass("ui-tabs-hide");a.element.dequeue("tabs")};
+this.anchors.bind(c.event+".tabs",function(){var g=this,f=d(g).closest("li"),i=a.panels.filter(":not(.ui-tabs-hide)"),l=a.element.find(a._sanitizeSelector(g.hash));if(f.hasClass("ui-tabs-selected")&&!c.collapsible||f.hasClass("ui-state-disabled")||f.hasClass("ui-state-processing")||a.panels.filter(":animated").length||a._trigger("select",null,a._ui(this,l[0]))===false){this.blur();return false}c.selected=a.anchors.index(this);a.abort();if(c.collapsible)if(f.hasClass("ui-tabs-selected")){c.selected=
+-1;c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){s(g,i)}).dequeue("tabs");this.blur();return false}else if(!i.length){c.cookie&&a._cookie(c.selected,c.cookie);a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this));this.blur();return false}c.cookie&&a._cookie(c.selected,c.cookie);if(l.length){i.length&&a.element.queue("tabs",function(){s(g,i)});a.element.queue("tabs",function(){r(g,l)});a.load(a.anchors.index(this))}else throw"jQuery UI Tabs: Mismatching fragment identifier.";
+d.browser.msie&&this.blur()});this.anchors.bind("click.tabs",function(){return false})},_getIndex:function(b){if(typeof b=="string")b=this.anchors.index(this.anchors.filter("[href$="+b+"]"));return b},destroy:function(){var b=this.options;this.abort();this.element.unbind(".tabs").removeClass("ui-tabs ui-widget ui-widget-content ui-corner-all ui-tabs-collapsible").removeData("tabs");this.list.removeClass("ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all");this.anchors.each(function(){var e=
+d.data(this,"href.tabs");if(e)this.href=e;var a=d(this).unbind(".tabs");d.each(["href","load","cache"],function(c,h){a.removeData(h+".tabs")})});this.lis.unbind(".tabs").add(this.panels).each(function(){d.data(this,"destroy.tabs")?d(this).remove():d(this).removeClass("ui-state-default ui-corner-top ui-tabs-selected ui-state-active ui-state-hover ui-state-focus ui-state-disabled ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide")});b.cookie&&this._cookie(null,b.cookie);return this},add:function(b,
+e,a){if(a===p)a=this.anchors.length;var c=this,h=this.options;e=d(h.tabTemplate.replace(/#\{href\}/g,b).replace(/#\{label\}/g,e));b=!b.indexOf("#")?b.replace("#",""):this._tabId(d("a",e)[0]);e.addClass("ui-state-default ui-corner-top").data("destroy.tabs",true);var j=c.element.find("#"+b);j.length||(j=d(h.panelTemplate).attr("id",b).data("destroy.tabs",true));j.addClass("ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide");if(a>=this.lis.length){e.appendTo(this.list);j.appendTo(this.list[0].parentNode)}else{e.insertBefore(this.lis[a]);
+j.insertBefore(this.panels[a])}h.disabled=d.map(h.disabled,function(k){return k>=a?++k:k});this._tabify();if(this.anchors.length==1){h.selected=0;e.addClass("ui-tabs-selected ui-state-active");j.removeClass("ui-tabs-hide");this.element.queue("tabs",function(){c._trigger("show",null,c._ui(c.anchors[0],c.panels[0]))});this.load(0)}this._trigger("add",null,this._ui(this.anchors[a],this.panels[a]));return this},remove:function(b){b=this._getIndex(b);var e=this.options,a=this.lis.eq(b).remove(),c=this.panels.eq(b).remove();
+if(a.hasClass("ui-tabs-selected")&&this.anchors.length>1)this.select(b+(b+1<this.anchors.length?1:-1));e.disabled=d.map(d.grep(e.disabled,function(h){return h!=b}),function(h){return h>=b?--h:h});this._tabify();this._trigger("remove",null,this._ui(a.find("a")[0],c[0]));return this},enable:function(b){b=this._getIndex(b);var e=this.options;if(d.inArray(b,e.disabled)!=-1){this.lis.eq(b).removeClass("ui-state-disabled");e.disabled=d.grep(e.disabled,function(a){return a!=b});this._trigger("enable",null,
+this._ui(this.anchors[b],this.panels[b]));return this}},disable:function(b){b=this._getIndex(b);var e=this.options;if(b!=e.selected){this.lis.eq(b).addClass("ui-state-disabled");e.disabled.push(b);e.disabled.sort();this._trigger("disable",null,this._ui(this.anchors[b],this.panels[b]))}return this},select:function(b){b=this._getIndex(b);if(b==-1)if(this.options.collapsible&&this.options.selected!=-1)b=this.options.selected;else return this;this.anchors.eq(b).trigger(this.options.event+".tabs");return this},
+load:function(b){b=this._getIndex(b);var e=this,a=this.options,c=this.anchors.eq(b)[0],h=d.data(c,"load.tabs");this.abort();if(!h||this.element.queue("tabs").length!==0&&d.data(c,"cache.tabs"))this.element.dequeue("tabs");else{this.lis.eq(b).addClass("ui-state-processing");if(a.spinner){var j=d("span",c);j.data("label.tabs",j.html()).html(a.spinner)}this.xhr=d.ajax(d.extend({},a.ajaxOptions,{url:h,success:function(k,n){e.element.find(e._sanitizeSelector(c.hash)).html(k);e._cleanup();a.cache&&d.data(c,
+"cache.tabs",true);e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.success(k,n)}catch(m){}},error:function(k,n){e._cleanup();e._trigger("load",null,e._ui(e.anchors[b],e.panels[b]));try{a.ajaxOptions.error(k,n,b,c)}catch(m){}}}));e.element.dequeue("tabs");return this}},abort:function(){this.element.queue([]);this.panels.stop(false,true);this.element.queue("tabs",this.element.queue("tabs").splice(-2,2));if(this.xhr){this.xhr.abort();delete this.xhr}this._cleanup();return this},
+url:function(b,e){this.anchors.eq(b).removeData("cache.tabs").data("load.tabs",e);return this},length:function(){return this.anchors.length}});d.extend(d.ui.tabs,{version:"1.8.12"});d.extend(d.ui.tabs.prototype,{rotation:null,rotate:function(b,e){var a=this,c=this.options,h=a._rotate||(a._rotate=function(j){clearTimeout(a.rotation);a.rotation=setTimeout(function(){var k=c.selected;a.select(++k<a.anchors.length?k:0)},b);j&&j.stopPropagation()});e=a._unrotate||(a._unrotate=!e?function(j){j.clientX&&
+a.rotate(null)}:function(){t=c.selected;h()});if(b){this.element.bind("tabsshow",h);this.anchors.bind(c.event+".tabs",e);h()}else{clearTimeout(a.rotation);this.element.unbind("tabsshow",h);this.anchors.unbind(c.event+".tabs",e);delete this._rotate;delete this._unrotate}return this}})})(jQuery);
+;/*
+ * jQuery UI Datepicker 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Datepicker
+ *
+ * Depends:
+ *	jquery.ui.core.js
+ */
+(function(d,A){function K(){this.debug=false;this._curInst=null;this._keyEvent=false;this._disabledInputs=[];this._inDialog=this._datepickerShowing=false;this._mainDivId="ui-datepicker-div";this._inlineClass="ui-datepicker-inline";this._appendClass="ui-datepicker-append";this._triggerClass="ui-datepicker-trigger";this._dialogClass="ui-datepicker-dialog";this._disableClass="ui-datepicker-disabled";this._unselectableClass="ui-datepicker-unselectable";this._currentClass="ui-datepicker-current-day";this._dayOverClass=
+"ui-datepicker-days-cell-over";this.regional=[];this.regional[""]={closeText:"Done",prevText:"Prev",nextText:"Next",currentText:"Today",monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNamesShort:["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"],dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],dayNamesShort:["Sun","Mon","Tue","Wed","Thu","Fri","Sat"],dayNamesMin:["Su",
+"Mo","Tu","We","Th","Fr","Sa"],weekHeader:"Wk",dateFormat:"mm/dd/yy",firstDay:0,isRTL:false,showMonthAfterYear:false,yearSuffix:""};this._defaults={showOn:"focus",showAnim:"fadeIn",showOptions:{},defaultDate:null,appendText:"",buttonText:"...",buttonImage:"",buttonImageOnly:false,hideIfNoPrevNext:false,navigationAsDateFormat:false,gotoCurrent:false,changeMonth:false,changeYear:false,yearRange:"c-10:c+10",showOtherMonths:false,selectOtherMonths:false,showWeek:false,calculateWeek:this.iso8601Week,shortYearCutoff:"+10",
+minDate:null,maxDate:null,duration:"fast",beforeShowDay:null,beforeShow:null,onSelect:null,onChangeMonthYear:null,onClose:null,numberOfMonths:1,showCurrentAtPos:0,stepMonths:1,stepBigMonths:12,altField:"",altFormat:"",constrainInput:true,showButtonPanel:false,autoSize:false};d.extend(this._defaults,this.regional[""]);this.dpDiv=d('<div id="'+this._mainDivId+'" class="ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}function F(a,b){d.extend(a,b);for(var c in b)if(b[c]==
+null||b[c]==A)a[c]=b[c];return a}d.extend(d.ui,{datepicker:{version:"1.8.12"}});var y=(new Date).getTime();d.extend(K.prototype,{markerClassName:"hasDatepicker",log:function(){this.debug&&console.log.apply("",arguments)},_widgetDatepicker:function(){return this.dpDiv},setDefaults:function(a){F(this._defaults,a||{});return this},_attachDatepicker:function(a,b){var c=null;for(var e in this._defaults){var f=a.getAttribute("date:"+e);if(f){c=c||{};try{c[e]=eval(f)}catch(h){c[e]=f}}}e=a.nodeName.toLowerCase();
+f=e=="div"||e=="span";if(!a.id){this.uuid+=1;a.id="dp"+this.uuid}var i=this._newInst(d(a),f);i.settings=d.extend({},b||{},c||{});if(e=="input")this._connectDatepicker(a,i);else f&&this._inlineDatepicker(a,i)},_newInst:function(a,b){return{id:a[0].id.replace(/([^A-Za-z0-9_-])/g,"\\\\$1"),input:a,selectedDay:0,selectedMonth:0,selectedYear:0,drawMonth:0,drawYear:0,inline:b,dpDiv:!b?this.dpDiv:d('<div class="'+this._inlineClass+' ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all"></div>')}},
+_connectDatepicker:function(a,b){var c=d(a);b.append=d([]);b.trigger=d([]);if(!c.hasClass(this.markerClassName)){this._attachments(c,b);c.addClass(this.markerClassName).keydown(this._doKeyDown).keypress(this._doKeyPress).keyup(this._doKeyUp).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});this._autoSize(b);d.data(a,"datepicker",b)}},_attachments:function(a,b){var c=this._get(b,"appendText"),e=this._get(b,"isRTL");b.append&&
+b.append.remove();if(c){b.append=d('<span class="'+this._appendClass+'">'+c+"</span>");a[e?"before":"after"](b.append)}a.unbind("focus",this._showDatepicker);b.trigger&&b.trigger.remove();c=this._get(b,"showOn");if(c=="focus"||c=="both")a.focus(this._showDatepicker);if(c=="button"||c=="both"){c=this._get(b,"buttonText");var f=this._get(b,"buttonImage");b.trigger=d(this._get(b,"buttonImageOnly")?d("<img/>").addClass(this._triggerClass).attr({src:f,alt:c,title:c}):d('<button type="button"></button>').addClass(this._triggerClass).html(f==
+""?c:d("<img/>").attr({src:f,alt:c,title:c})));a[e?"before":"after"](b.trigger);b.trigger.click(function(){d.datepicker._datepickerShowing&&d.datepicker._lastInput==a[0]?d.datepicker._hideDatepicker():d.datepicker._showDatepicker(a[0]);return false})}},_autoSize:function(a){if(this._get(a,"autoSize")&&!a.inline){var b=new Date(2009,11,20),c=this._get(a,"dateFormat");if(c.match(/[DM]/)){var e=function(f){for(var h=0,i=0,g=0;g<f.length;g++)if(f[g].length>h){h=f[g].length;i=g}return i};b.setMonth(e(this._get(a,
+c.match(/MM/)?"monthNames":"monthNamesShort")));b.setDate(e(this._get(a,c.match(/DD/)?"dayNames":"dayNamesShort"))+20-b.getDay())}a.input.attr("size",this._formatDate(a,b).length)}},_inlineDatepicker:function(a,b){var c=d(a);if(!c.hasClass(this.markerClassName)){c.addClass(this.markerClassName).append(b.dpDiv).bind("setData.datepicker",function(e,f,h){b.settings[f]=h}).bind("getData.datepicker",function(e,f){return this._get(b,f)});d.data(a,"datepicker",b);this._setDate(b,this._getDefaultDate(b),
+true);this._updateDatepicker(b);this._updateAlternate(b);b.dpDiv.show()}},_dialogDatepicker:function(a,b,c,e,f){a=this._dialogInst;if(!a){this.uuid+=1;this._dialogInput=d('<input type="text" id="'+("dp"+this.uuid)+'" style="position: absolute; top: -100px; width: 0px; z-index: -10;"/>');this._dialogInput.keydown(this._doKeyDown);d("body").append(this._dialogInput);a=this._dialogInst=this._newInst(this._dialogInput,false);a.settings={};d.data(this._dialogInput[0],"datepicker",a)}F(a.settings,e||{});
+b=b&&b.constructor==Date?this._formatDate(a,b):b;this._dialogInput.val(b);this._pos=f?f.length?f:[f.pageX,f.pageY]:null;if(!this._pos)this._pos=[document.documentElement.clientWidth/2-100+(document.documentElement.scrollLeft||document.body.scrollLeft),document.documentElement.clientHeight/2-150+(document.documentElement.scrollTop||document.body.scrollTop)];this._dialogInput.css("left",this._pos[0]+20+"px").css("top",this._pos[1]+"px");a.settings.onSelect=c;this._inDialog=true;this.dpDiv.addClass(this._dialogClass);
+this._showDatepicker(this._dialogInput[0]);d.blockUI&&d.blockUI(this.dpDiv);d.data(this._dialogInput[0],"datepicker",a);return this},_destroyDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();d.removeData(a,"datepicker");if(e=="input"){c.append.remove();c.trigger.remove();b.removeClass(this.markerClassName).unbind("focus",this._showDatepicker).unbind("keydown",this._doKeyDown).unbind("keypress",this._doKeyPress).unbind("keyup",
+this._doKeyUp)}else if(e=="div"||e=="span")b.removeClass(this.markerClassName).empty()}},_enableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=false;c.trigger.filter("button").each(function(){this.disabled=false}).end().filter("img").css({opacity:"1.0",cursor:""})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().removeClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,
+function(f){return f==a?null:f})}},_disableDatepicker:function(a){var b=d(a),c=d.data(a,"datepicker");if(b.hasClass(this.markerClassName)){var e=a.nodeName.toLowerCase();if(e=="input"){a.disabled=true;c.trigger.filter("button").each(function(){this.disabled=true}).end().filter("img").css({opacity:"0.5",cursor:"default"})}else if(e=="div"||e=="span")b.children("."+this._inlineClass).children().addClass("ui-state-disabled");this._disabledInputs=d.map(this._disabledInputs,function(f){return f==a?null:
+f});this._disabledInputs[this._disabledInputs.length]=a}},_isDisabledDatepicker:function(a){if(!a)return false;for(var b=0;b<this._disabledInputs.length;b++)if(this._disabledInputs[b]==a)return true;return false},_getInst:function(a){try{return d.data(a,"datepicker")}catch(b){throw"Missing instance data for this datepicker";}},_optionDatepicker:function(a,b,c){var e=this._getInst(a);if(arguments.length==2&&typeof b=="string")return b=="defaults"?d.extend({},d.datepicker._defaults):e?b=="all"?d.extend({},
+e.settings):this._get(e,b):null;var f=b||{};if(typeof b=="string"){f={};f[b]=c}if(e){this._curInst==e&&this._hideDatepicker();var h=this._getDateDatepicker(a,true),i=this._getMinMaxDate(e,"min"),g=this._getMinMaxDate(e,"max");F(e.settings,f);if(i!==null&&f.dateFormat!==A&&f.minDate===A)e.settings.minDate=this._formatDate(e,i);if(g!==null&&f.dateFormat!==A&&f.maxDate===A)e.settings.maxDate=this._formatDate(e,g);this._attachments(d(a),e);this._autoSize(e);this._setDateDatepicker(a,h);this._updateDatepicker(e)}},
+_changeDatepicker:function(a,b,c){this._optionDatepicker(a,b,c)},_refreshDatepicker:function(a){(a=this._getInst(a))&&this._updateDatepicker(a)},_setDateDatepicker:function(a,b){if(a=this._getInst(a)){this._setDate(a,b);this._updateDatepicker(a);this._updateAlternate(a)}},_getDateDatepicker:function(a,b){(a=this._getInst(a))&&!a.inline&&this._setDateFromField(a,b);return a?this._getDate(a):null},_doKeyDown:function(a){var b=d.datepicker._getInst(a.target),c=true,e=b.dpDiv.is(".ui-datepicker-rtl");
+b._keyEvent=true;if(d.datepicker._datepickerShowing)switch(a.keyCode){case 9:d.datepicker._hideDatepicker();c=false;break;case 13:c=d("td."+d.datepicker._dayOverClass+":not(."+d.datepicker._currentClass+")",b.dpDiv);c[0]?d.datepicker._selectDay(a.target,b.selectedMonth,b.selectedYear,c[0]):d.datepicker._hideDatepicker();return false;case 27:d.datepicker._hideDatepicker();break;case 33:d.datepicker._adjustDate(a.target,a.ctrlKey?-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),
+"M");break;case 34:d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 35:if(a.ctrlKey||a.metaKey)d.datepicker._clearDate(a.target);c=a.ctrlKey||a.metaKey;break;case 36:if(a.ctrlKey||a.metaKey)d.datepicker._gotoToday(a.target);c=a.ctrlKey||a.metaKey;break;case 37:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?+1:-1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?
+-d.datepicker._get(b,"stepBigMonths"):-d.datepicker._get(b,"stepMonths"),"M");break;case 38:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,-7,"D");c=a.ctrlKey||a.metaKey;break;case 39:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,e?-1:+1,"D");c=a.ctrlKey||a.metaKey;if(a.originalEvent.altKey)d.datepicker._adjustDate(a.target,a.ctrlKey?+d.datepicker._get(b,"stepBigMonths"):+d.datepicker._get(b,"stepMonths"),"M");break;case 40:if(a.ctrlKey||a.metaKey)d.datepicker._adjustDate(a.target,
++7,"D");c=a.ctrlKey||a.metaKey;break;default:c=false}else if(a.keyCode==36&&a.ctrlKey)d.datepicker._showDatepicker(this);else c=false;if(c){a.preventDefault();a.stopPropagation()}},_doKeyPress:function(a){var b=d.datepicker._getInst(a.target);if(d.datepicker._get(b,"constrainInput")){b=d.datepicker._possibleChars(d.datepicker._get(b,"dateFormat"));var c=String.fromCharCode(a.charCode==A?a.keyCode:a.charCode);return a.ctrlKey||a.metaKey||c<" "||!b||b.indexOf(c)>-1}},_doKeyUp:function(a){a=d.datepicker._getInst(a.target);
+if(a.input.val()!=a.lastVal)try{if(d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),a.input?a.input.val():null,d.datepicker._getFormatConfig(a))){d.datepicker._setDateFromField(a);d.datepicker._updateAlternate(a);d.datepicker._updateDatepicker(a)}}catch(b){d.datepicker.log(b)}return true},_showDatepicker:function(a){a=a.target||a;if(a.nodeName.toLowerCase()!="input")a=d("input",a.parentNode)[0];if(!(d.datepicker._isDisabledDatepicker(a)||d.datepicker._lastInput==a)){var b=d.datepicker._getInst(a);
+d.datepicker._curInst&&d.datepicker._curInst!=b&&d.datepicker._curInst.dpDiv.stop(true,true);var c=d.datepicker._get(b,"beforeShow");F(b.settings,c?c.apply(a,[a,b]):{});b.lastVal=null;d.datepicker._lastInput=a;d.datepicker._setDateFromField(b);if(d.datepicker._inDialog)a.value="";if(!d.datepicker._pos){d.datepicker._pos=d.datepicker._findPos(a);d.datepicker._pos[1]+=a.offsetHeight}var e=false;d(a).parents().each(function(){e|=d(this).css("position")=="fixed";return!e});if(e&&d.browser.opera){d.datepicker._pos[0]-=
+document.documentElement.scrollLeft;d.datepicker._pos[1]-=document.documentElement.scrollTop}c={left:d.datepicker._pos[0],top:d.datepicker._pos[1]};d.datepicker._pos=null;b.dpDiv.empty();b.dpDiv.css({position:"absolute",display:"block",top:"-1000px"});d.datepicker._updateDatepicker(b);c=d.datepicker._checkOffset(b,c,e);b.dpDiv.css({position:d.datepicker._inDialog&&d.blockUI?"static":e?"fixed":"absolute",display:"none",left:c.left+"px",top:c.top+"px"});if(!b.inline){c=d.datepicker._get(b,"showAnim");
+var f=d.datepicker._get(b,"duration"),h=function(){d.datepicker._datepickerShowing=true;var i=b.dpDiv.find("iframe.ui-datepicker-cover");if(i.length){var g=d.datepicker._getBorders(b.dpDiv);i.css({left:-g[0],top:-g[1],width:b.dpDiv.outerWidth(),height:b.dpDiv.outerHeight()})}};b.dpDiv.zIndex(d(a).zIndex()+1);d.effects&&d.effects[c]?b.dpDiv.show(c,d.datepicker._get(b,"showOptions"),f,h):b.dpDiv[c||"show"](c?f:null,h);if(!c||!f)h();b.input.is(":visible")&&!b.input.is(":disabled")&&b.input.focus();d.datepicker._curInst=
+b}}},_updateDatepicker:function(a){var b=this,c=d.datepicker._getBorders(a.dpDiv);a.dpDiv.empty().append(this._generateHTML(a));var e=a.dpDiv.find("iframe.ui-datepicker-cover");e.length&&e.css({left:-c[0],top:-c[1],width:a.dpDiv.outerWidth(),height:a.dpDiv.outerHeight()});a.dpDiv.find("button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a").bind("mouseout",function(){d(this).removeClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).removeClass("ui-datepicker-prev-hover");
+this.className.indexOf("ui-datepicker-next")!=-1&&d(this).removeClass("ui-datepicker-next-hover")}).bind("mouseover",function(){if(!b._isDisabledDatepicker(a.inline?a.dpDiv.parent()[0]:a.input[0])){d(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");d(this).addClass("ui-state-hover");this.className.indexOf("ui-datepicker-prev")!=-1&&d(this).addClass("ui-datepicker-prev-hover");this.className.indexOf("ui-datepicker-next")!=-1&&d(this).addClass("ui-datepicker-next-hover")}}).end().find("."+
+this._dayOverClass+" a").trigger("mouseover").end();c=this._getNumberOfMonths(a);e=c[1];e>1?a.dpDiv.addClass("ui-datepicker-multi-"+e).css("width",17*e+"em"):a.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");a.dpDiv[(c[0]!=1||c[1]!=1?"add":"remove")+"Class"]("ui-datepicker-multi");a.dpDiv[(this._get(a,"isRTL")?"add":"remove")+"Class"]("ui-datepicker-rtl");a==d.datepicker._curInst&&d.datepicker._datepickerShowing&&a.input&&a.input.is(":visible")&&!a.input.is(":disabled")&&
+a.input[0]!=document.activeElement&&a.input.focus();if(a.yearshtml){var f=a.yearshtml;setTimeout(function(){f===a.yearshtml&&a.dpDiv.find("select.ui-datepicker-year:first").replaceWith(a.yearshtml);f=a.yearshtml=null},0)}},_getBorders:function(a){var b=function(c){return{thin:1,medium:2,thick:3}[c]||c};return[parseFloat(b(a.css("border-left-width"))),parseFloat(b(a.css("border-top-width")))]},_checkOffset:function(a,b,c){var e=a.dpDiv.outerWidth(),f=a.dpDiv.outerHeight(),h=a.input?a.input.outerWidth():
+0,i=a.input?a.input.outerHeight():0,g=document.documentElement.clientWidth+d(document).scrollLeft(),j=document.documentElement.clientHeight+d(document).scrollTop();b.left-=this._get(a,"isRTL")?e-h:0;b.left-=c&&b.left==a.input.offset().left?d(document).scrollLeft():0;b.top-=c&&b.top==a.input.offset().top+i?d(document).scrollTop():0;b.left-=Math.min(b.left,b.left+e>g&&g>e?Math.abs(b.left+e-g):0);b.top-=Math.min(b.top,b.top+f>j&&j>f?Math.abs(f+i):0);return b},_findPos:function(a){for(var b=this._get(this._getInst(a),
+"isRTL");a&&(a.type=="hidden"||a.nodeType!=1||d.expr.filters.hidden(a));)a=a[b?"previousSibling":"nextSibling"];a=d(a).offset();return[a.left,a.top]},_hideDatepicker:function(a){var b=this._curInst;if(!(!b||a&&b!=d.data(a,"datepicker")))if(this._datepickerShowing){a=this._get(b,"showAnim");var c=this._get(b,"duration"),e=function(){d.datepicker._tidyDialog(b);this._curInst=null};d.effects&&d.effects[a]?b.dpDiv.hide(a,d.datepicker._get(b,"showOptions"),c,e):b.dpDiv[a=="slideDown"?"slideUp":a=="fadeIn"?
+"fadeOut":"hide"](a?c:null,e);a||e();if(a=this._get(b,"onClose"))a.apply(b.input?b.input[0]:null,[b.input?b.input.val():"",b]);this._datepickerShowing=false;this._lastInput=null;if(this._inDialog){this._dialogInput.css({position:"absolute",left:"0",top:"-100px"});if(d.blockUI){d.unblockUI();d("body").append(this.dpDiv)}}this._inDialog=false}},_tidyDialog:function(a){a.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar")},_checkExternalClick:function(a){if(d.datepicker._curInst){a=
+d(a.target);a[0].id!=d.datepicker._mainDivId&&a.parents("#"+d.datepicker._mainDivId).length==0&&!a.hasClass(d.datepicker.markerClassName)&&!a.hasClass(d.datepicker._triggerClass)&&d.datepicker._datepickerShowing&&!(d.datepicker._inDialog&&d.blockUI)&&d.datepicker._hideDatepicker()}},_adjustDate:function(a,b,c){a=d(a);var e=this._getInst(a[0]);if(!this._isDisabledDatepicker(a[0])){this._adjustInstDate(e,b+(c=="M"?this._get(e,"showCurrentAtPos"):0),c);this._updateDatepicker(e)}},_gotoToday:function(a){a=
+d(a);var b=this._getInst(a[0]);if(this._get(b,"gotoCurrent")&&b.currentDay){b.selectedDay=b.currentDay;b.drawMonth=b.selectedMonth=b.currentMonth;b.drawYear=b.selectedYear=b.currentYear}else{var c=new Date;b.selectedDay=c.getDate();b.drawMonth=b.selectedMonth=c.getMonth();b.drawYear=b.selectedYear=c.getFullYear()}this._notifyChange(b);this._adjustDate(a)},_selectMonthYear:function(a,b,c){a=d(a);var e=this._getInst(a[0]);e._selectingMonthYear=false;e["selected"+(c=="M"?"Month":"Year")]=e["draw"+(c==
+"M"?"Month":"Year")]=parseInt(b.options[b.selectedIndex].value,10);this._notifyChange(e);this._adjustDate(a)},_clickMonthYear:function(a){var b=this._getInst(d(a)[0]);b.input&&b._selectingMonthYear&&setTimeout(function(){b.input.focus()},0);b._selectingMonthYear=!b._selectingMonthYear},_selectDay:function(a,b,c,e){var f=d(a);if(!(d(e).hasClass(this._unselectableClass)||this._isDisabledDatepicker(f[0]))){f=this._getInst(f[0]);f.selectedDay=f.currentDay=d("a",e).html();f.selectedMonth=f.currentMonth=
+b;f.selectedYear=f.currentYear=c;this._selectDate(a,this._formatDate(f,f.currentDay,f.currentMonth,f.currentYear))}},_clearDate:function(a){a=d(a);this._getInst(a[0]);this._selectDate(a,"")},_selectDate:function(a,b){a=this._getInst(d(a)[0]);b=b!=null?b:this._formatDate(a);a.input&&a.input.val(b);this._updateAlternate(a);var c=this._get(a,"onSelect");if(c)c.apply(a.input?a.input[0]:null,[b,a]);else a.input&&a.input.trigger("change");if(a.inline)this._updateDatepicker(a);else{this._hideDatepicker();
+this._lastInput=a.input[0];typeof a.input[0]!="object"&&a.input.focus();this._lastInput=null}},_updateAlternate:function(a){var b=this._get(a,"altField");if(b){var c=this._get(a,"altFormat")||this._get(a,"dateFormat"),e=this._getDate(a),f=this.formatDate(c,e,this._getFormatConfig(a));d(b).each(function(){d(this).val(f)})}},noWeekends:function(a){a=a.getDay();return[a>0&&a<6,""]},iso8601Week:function(a){a=new Date(a.getTime());a.setDate(a.getDate()+4-(a.getDay()||7));var b=a.getTime();a.setMonth(0);
+a.setDate(1);return Math.floor(Math.round((b-a)/864E5)/7)+1},parseDate:function(a,b,c){if(a==null||b==null)throw"Invalid arguments";b=typeof b=="object"?b.toString():b+"";if(b=="")return null;var e=(c?c.shortYearCutoff:null)||this._defaults.shortYearCutoff;e=typeof e!="string"?e:(new Date).getFullYear()%100+parseInt(e,10);for(var f=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,h=(c?c.dayNames:null)||this._defaults.dayNames,i=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort,g=(c?
+c.monthNames:null)||this._defaults.monthNames,j=c=-1,l=-1,u=-1,k=false,o=function(p){(p=z+1<a.length&&a.charAt(z+1)==p)&&z++;return p},m=function(p){var v=o(p);p=new RegExp("^\\d{1,"+(p=="@"?14:p=="!"?20:p=="y"&&v?4:p=="o"?3:2)+"}");p=b.substring(s).match(p);if(!p)throw"Missing number at position "+s;s+=p[0].length;return parseInt(p[0],10)},n=function(p,v,H){p=o(p)?H:v;for(v=0;v<p.length;v++)if(b.substr(s,p[v].length).toLowerCase()==p[v].toLowerCase()){s+=p[v].length;return v+1}throw"Unknown name at position "+
+s;},r=function(){if(b.charAt(s)!=a.charAt(z))throw"Unexpected literal at position "+s;s++},s=0,z=0;z<a.length;z++)if(k)if(a.charAt(z)=="'"&&!o("'"))k=false;else r();else switch(a.charAt(z)){case "d":l=m("d");break;case "D":n("D",f,h);break;case "o":u=m("o");break;case "m":j=m("m");break;case "M":j=n("M",i,g);break;case "y":c=m("y");break;case "@":var w=new Date(m("@"));c=w.getFullYear();j=w.getMonth()+1;l=w.getDate();break;case "!":w=new Date((m("!")-this._ticksTo1970)/1E4);c=w.getFullYear();j=w.getMonth()+
+1;l=w.getDate();break;case "'":if(o("'"))r();else k=true;break;default:r()}if(c==-1)c=(new Date).getFullYear();else if(c<100)c+=(new Date).getFullYear()-(new Date).getFullYear()%100+(c<=e?0:-100);if(u>-1){j=1;l=u;do{e=this._getDaysInMonth(c,j-1);if(l<=e)break;j++;l-=e}while(1)}w=this._daylightSavingAdjust(new Date(c,j-1,l));if(w.getFullYear()!=c||w.getMonth()+1!=j||w.getDate()!=l)throw"Invalid date";return w},ATOM:"yy-mm-dd",COOKIE:"D, dd M yy",ISO_8601:"yy-mm-dd",RFC_822:"D, d M y",RFC_850:"DD, dd-M-y",
+RFC_1036:"D, d M y",RFC_1123:"D, d M yy",RFC_2822:"D, d M yy",RSS:"D, d M y",TICKS:"!",TIMESTAMP:"@",W3C:"yy-mm-dd",_ticksTo1970:(718685+Math.floor(492.5)-Math.floor(19.7)+Math.floor(4.925))*24*60*60*1E7,formatDate:function(a,b,c){if(!b)return"";var e=(c?c.dayNamesShort:null)||this._defaults.dayNamesShort,f=(c?c.dayNames:null)||this._defaults.dayNames,h=(c?c.monthNamesShort:null)||this._defaults.monthNamesShort;c=(c?c.monthNames:null)||this._defaults.monthNames;var i=function(o){(o=k+1<a.length&&
+a.charAt(k+1)==o)&&k++;return o},g=function(o,m,n){m=""+m;if(i(o))for(;m.length<n;)m="0"+m;return m},j=function(o,m,n,r){return i(o)?r[m]:n[m]},l="",u=false;if(b)for(var k=0;k<a.length;k++)if(u)if(a.charAt(k)=="'"&&!i("'"))u=false;else l+=a.charAt(k);else switch(a.charAt(k)){case "d":l+=g("d",b.getDate(),2);break;case "D":l+=j("D",b.getDay(),e,f);break;case "o":l+=g("o",(b.getTime()-(new Date(b.getFullYear(),0,0)).getTime())/864E5,3);break;case "m":l+=g("m",b.getMonth()+1,2);break;case "M":l+=j("M",
+b.getMonth(),h,c);break;case "y":l+=i("y")?b.getFullYear():(b.getYear()%100<10?"0":"")+b.getYear()%100;break;case "@":l+=b.getTime();break;case "!":l+=b.getTime()*1E4+this._ticksTo1970;break;case "'":if(i("'"))l+="'";else u=true;break;default:l+=a.charAt(k)}return l},_possibleChars:function(a){for(var b="",c=false,e=function(h){(h=f+1<a.length&&a.charAt(f+1)==h)&&f++;return h},f=0;f<a.length;f++)if(c)if(a.charAt(f)=="'"&&!e("'"))c=false;else b+=a.charAt(f);else switch(a.charAt(f)){case "d":case "m":case "y":case "@":b+=
+"0123456789";break;case "D":case "M":return null;case "'":if(e("'"))b+="'";else c=true;break;default:b+=a.charAt(f)}return b},_get:function(a,b){return a.settings[b]!==A?a.settings[b]:this._defaults[b]},_setDateFromField:function(a,b){if(a.input.val()!=a.lastVal){var c=this._get(a,"dateFormat"),e=a.lastVal=a.input?a.input.val():null,f,h;f=h=this._getDefaultDate(a);var i=this._getFormatConfig(a);try{f=this.parseDate(c,e,i)||h}catch(g){this.log(g);e=b?"":e}a.selectedDay=f.getDate();a.drawMonth=a.selectedMonth=
+f.getMonth();a.drawYear=a.selectedYear=f.getFullYear();a.currentDay=e?f.getDate():0;a.currentMonth=e?f.getMonth():0;a.currentYear=e?f.getFullYear():0;this._adjustInstDate(a)}},_getDefaultDate:function(a){return this._restrictMinMax(a,this._determineDate(a,this._get(a,"defaultDate"),new Date))},_determineDate:function(a,b,c){var e=function(h){var i=new Date;i.setDate(i.getDate()+h);return i},f=function(h){try{return d.datepicker.parseDate(d.datepicker._get(a,"dateFormat"),h,d.datepicker._getFormatConfig(a))}catch(i){}var g=
+(h.toLowerCase().match(/^c/)?d.datepicker._getDate(a):null)||new Date,j=g.getFullYear(),l=g.getMonth();g=g.getDate();for(var u=/([+-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,k=u.exec(h);k;){switch(k[2]||"d"){case "d":case "D":g+=parseInt(k[1],10);break;case "w":case "W":g+=parseInt(k[1],10)*7;break;case "m":case "M":l+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break;case "y":case "Y":j+=parseInt(k[1],10);g=Math.min(g,d.datepicker._getDaysInMonth(j,l));break}k=u.exec(h)}return new Date(j,
+l,g)};if(b=(b=b==null||b===""?c:typeof b=="string"?f(b):typeof b=="number"?isNaN(b)?c:e(b):new Date(b.getTime()))&&b.toString()=="Invalid Date"?c:b){b.setHours(0);b.setMinutes(0);b.setSeconds(0);b.setMilliseconds(0)}return this._daylightSavingAdjust(b)},_daylightSavingAdjust:function(a){if(!a)return null;a.setHours(a.getHours()>12?a.getHours()+2:0);return a},_setDate:function(a,b,c){var e=!b,f=a.selectedMonth,h=a.selectedYear;b=this._restrictMinMax(a,this._determineDate(a,b,new Date));a.selectedDay=
+a.currentDay=b.getDate();a.drawMonth=a.selectedMonth=a.currentMonth=b.getMonth();a.drawYear=a.selectedYear=a.currentYear=b.getFullYear();if((f!=a.selectedMonth||h!=a.selectedYear)&&!c)this._notifyChange(a);this._adjustInstDate(a);if(a.input)a.input.val(e?"":this._formatDate(a))},_getDate:function(a){return!a.currentYear||a.input&&a.input.val()==""?null:this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay))},_generateHTML:function(a){var b=new Date;b=this._daylightSavingAdjust(new Date(b.getFullYear(),
+b.getMonth(),b.getDate()));var c=this._get(a,"isRTL"),e=this._get(a,"showButtonPanel"),f=this._get(a,"hideIfNoPrevNext"),h=this._get(a,"navigationAsDateFormat"),i=this._getNumberOfMonths(a),g=this._get(a,"showCurrentAtPos"),j=this._get(a,"stepMonths"),l=i[0]!=1||i[1]!=1,u=this._daylightSavingAdjust(!a.currentDay?new Date(9999,9,9):new Date(a.currentYear,a.currentMonth,a.currentDay)),k=this._getMinMaxDate(a,"min"),o=this._getMinMaxDate(a,"max");g=a.drawMonth-g;var m=a.drawYear;if(g<0){g+=12;m--}if(o){var n=
+this._daylightSavingAdjust(new Date(o.getFullYear(),o.getMonth()-i[0]*i[1]+1,o.getDate()));for(n=k&&n<k?k:n;this._daylightSavingAdjust(new Date(m,g,1))>n;){g--;if(g<0){g=11;m--}}}a.drawMonth=g;a.drawYear=m;n=this._get(a,"prevText");n=!h?n:this.formatDate(n,this._daylightSavingAdjust(new Date(m,g-j,1)),this._getFormatConfig(a));n=this._canAdjustMonth(a,-1,m,g)?'<a class="ui-datepicker-prev ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', -"+j+", 'M');\" title=\""+n+'"><span class="ui-icon ui-icon-circle-triangle-'+
+(c?"e":"w")+'">'+n+"</span></a>":f?"":'<a class="ui-datepicker-prev ui-corner-all ui-state-disabled" title="'+n+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"e":"w")+'">'+n+"</span></a>";var r=this._get(a,"nextText");r=!h?r:this.formatDate(r,this._daylightSavingAdjust(new Date(m,g+j,1)),this._getFormatConfig(a));f=this._canAdjustMonth(a,+1,m,g)?'<a class="ui-datepicker-next ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._adjustDate('#"+a.id+"', +"+j+", 'M');\" title=\""+r+'"><span class="ui-icon ui-icon-circle-triangle-'+
+(c?"w":"e")+'">'+r+"</span></a>":f?"":'<a class="ui-datepicker-next ui-corner-all ui-state-disabled" title="'+r+'"><span class="ui-icon ui-icon-circle-triangle-'+(c?"w":"e")+'">'+r+"</span></a>";j=this._get(a,"currentText");r=this._get(a,"gotoCurrent")&&a.currentDay?u:b;j=!h?j:this.formatDate(j,r,this._getFormatConfig(a));h=!a.inline?'<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="DP_jQuery_'+y+'.datepicker._hideDatepicker();">'+this._get(a,
+"closeText")+"</button>":"";e=e?'<div class="ui-datepicker-buttonpane ui-widget-content">'+(c?h:"")+(this._isInRange(a,r)?'<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="DP_jQuery_'+y+".datepicker._gotoToday('#"+a.id+"');\">"+j+"</button>":"")+(c?"":h)+"</div>":"";h=parseInt(this._get(a,"firstDay"),10);h=isNaN(h)?0:h;j=this._get(a,"showWeek");r=this._get(a,"dayNames");this._get(a,"dayNamesShort");var s=this._get(a,"dayNamesMin"),z=
+this._get(a,"monthNames"),w=this._get(a,"monthNamesShort"),p=this._get(a,"beforeShowDay"),v=this._get(a,"showOtherMonths"),H=this._get(a,"selectOtherMonths");this._get(a,"calculateWeek");for(var L=this._getDefaultDate(a),I="",D=0;D<i[0];D++){for(var M="",E=0;E<i[1];E++){var N=this._daylightSavingAdjust(new Date(m,g,a.selectedDay)),t=" ui-corner-all",x="";if(l){x+='<div class="ui-datepicker-group';if(i[1]>1)switch(E){case 0:x+=" ui-datepicker-group-first";t=" ui-corner-"+(c?"right":"left");break;case i[1]-
+1:x+=" ui-datepicker-group-last";t=" ui-corner-"+(c?"left":"right");break;default:x+=" ui-datepicker-group-middle";t="";break}x+='">'}x+='<div class="ui-datepicker-header ui-widget-header ui-helper-clearfix'+t+'">'+(/all|left/.test(t)&&D==0?c?f:n:"")+(/all|right/.test(t)&&D==0?c?n:f:"")+this._generateMonthYearHeader(a,g,m,k,o,D>0||E>0,z,w)+'</div><table class="ui-datepicker-calendar"><thead><tr>';var B=j?'<th class="ui-datepicker-week-col">'+this._get(a,"weekHeader")+"</th>":"";for(t=0;t<7;t++){var q=
+(t+h)%7;B+="<th"+((t+h+6)%7>=5?' class="ui-datepicker-week-end"':"")+'><span title="'+r[q]+'">'+s[q]+"</span></th>"}x+=B+"</tr></thead><tbody>";B=this._getDaysInMonth(m,g);if(m==a.selectedYear&&g==a.selectedMonth)a.selectedDay=Math.min(a.selectedDay,B);t=(this._getFirstDayOfMonth(m,g)-h+7)%7;B=l?6:Math.ceil((t+B)/7);q=this._daylightSavingAdjust(new Date(m,g,1-t));for(var O=0;O<B;O++){x+="<tr>";var P=!j?"":'<td class="ui-datepicker-week-col">'+this._get(a,"calculateWeek")(q)+"</td>";for(t=0;t<7;t++){var G=
+p?p.apply(a.input?a.input[0]:null,[q]):[true,""],C=q.getMonth()!=g,J=C&&!H||!G[0]||k&&q<k||o&&q>o;P+='<td class="'+((t+h+6)%7>=5?" ui-datepicker-week-end":"")+(C?" ui-datepicker-other-month":"")+(q.getTime()==N.getTime()&&g==a.selectedMonth&&a._keyEvent||L.getTime()==q.getTime()&&L.getTime()==N.getTime()?" "+this._dayOverClass:"")+(J?" "+this._unselectableClass+" ui-state-disabled":"")+(C&&!v?"":" "+G[1]+(q.getTime()==u.getTime()?" "+this._currentClass:"")+(q.getTime()==b.getTime()?" ui-datepicker-today":
+""))+'"'+((!C||v)&&G[2]?' title="'+G[2]+'"':"")+(J?"":' onclick="DP_jQuery_'+y+".datepicker._selectDay('#"+a.id+"',"+q.getMonth()+","+q.getFullYear()+', this);return false;"')+">"+(C&&!v?"&#xa0;":J?'<span class="ui-state-default">'+q.getDate()+"</span>":'<a class="ui-state-default'+(q.getTime()==b.getTime()?" ui-state-highlight":"")+(q.getTime()==u.getTime()?" ui-state-active":"")+(C?" ui-priority-secondary":"")+'" href="#">'+q.getDate()+"</a>")+"</td>";q.setDate(q.getDate()+1);q=this._daylightSavingAdjust(q)}x+=
+P+"</tr>"}g++;if(g>11){g=0;m++}x+="</tbody></table>"+(l?"</div>"+(i[0]>0&&E==i[1]-1?'<div class="ui-datepicker-row-break"></div>':""):"");M+=x}I+=M}I+=e+(d.browser.msie&&parseInt(d.browser.version,10)<7&&!a.inline?'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>':"");a._keyEvent=false;return I},_generateMonthYearHeader:function(a,b,c,e,f,h,i,g){var j=this._get(a,"changeMonth"),l=this._get(a,"changeYear"),u=this._get(a,"showMonthAfterYear"),k='<div class="ui-datepicker-title">',
+o="";if(h||!j)o+='<span class="ui-datepicker-month">'+i[b]+"</span>";else{i=e&&e.getFullYear()==c;var m=f&&f.getFullYear()==c;o+='<select class="ui-datepicker-month" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+a.id+"', this, 'M');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";for(var n=0;n<12;n++)if((!i||n>=e.getMonth())&&(!m||n<=f.getMonth()))o+='<option value="'+n+'"'+(n==b?' selected="selected"':"")+">"+g[n]+"</option>";o+="</select>"}u||(k+=o+(h||!(j&&
+l)?"&#xa0;":""));if(!a.yearshtml){a.yearshtml="";if(h||!l)k+='<span class="ui-datepicker-year">'+c+"</span>";else{g=this._get(a,"yearRange").split(":");var r=(new Date).getFullYear();i=function(s){s=s.match(/c[+-].*/)?c+parseInt(s.substring(1),10):s.match(/[+-].*/)?r+parseInt(s,10):parseInt(s,10);return isNaN(s)?r:s};b=i(g[0]);g=Math.max(b,i(g[1]||""));b=e?Math.max(b,e.getFullYear()):b;g=f?Math.min(g,f.getFullYear()):g;for(a.yearshtml+='<select class="ui-datepicker-year" onchange="DP_jQuery_'+y+".datepicker._selectMonthYear('#"+
+a.id+"', this, 'Y');\" onclick=\"DP_jQuery_"+y+".datepicker._clickMonthYear('#"+a.id+"');\">";b<=g;b++)a.yearshtml+='<option value="'+b+'"'+(b==c?' selected="selected"':"")+">"+b+"</option>";a.yearshtml+="</select>";if(d.browser.mozilla)k+='<select class="ui-datepicker-year"><option value="'+c+'" selected="selected">'+c+"</option></select>";else{k+=a.yearshtml;a.yearshtml=null}}}k+=this._get(a,"yearSuffix");if(u)k+=(h||!(j&&l)?"&#xa0;":"")+o;k+="</div>";return k},_adjustInstDate:function(a,b,c){var e=
+a.drawYear+(c=="Y"?b:0),f=a.drawMonth+(c=="M"?b:0);b=Math.min(a.selectedDay,this._getDaysInMonth(e,f))+(c=="D"?b:0);e=this._restrictMinMax(a,this._daylightSavingAdjust(new Date(e,f,b)));a.selectedDay=e.getDate();a.drawMonth=a.selectedMonth=e.getMonth();a.drawYear=a.selectedYear=e.getFullYear();if(c=="M"||c=="Y")this._notifyChange(a)},_restrictMinMax:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");b=c&&b<c?c:b;return b=a&&b>a?a:b},_notifyChange:function(a){var b=this._get(a,
+"onChangeMonthYear");if(b)b.apply(a.input?a.input[0]:null,[a.selectedYear,a.selectedMonth+1,a])},_getNumberOfMonths:function(a){a=this._get(a,"numberOfMonths");return a==null?[1,1]:typeof a=="number"?[1,a]:a},_getMinMaxDate:function(a,b){return this._determineDate(a,this._get(a,b+"Date"),null)},_getDaysInMonth:function(a,b){return 32-this._daylightSavingAdjust(new Date(a,b,32)).getDate()},_getFirstDayOfMonth:function(a,b){return(new Date(a,b,1)).getDay()},_canAdjustMonth:function(a,b,c,e){var f=this._getNumberOfMonths(a);
+c=this._daylightSavingAdjust(new Date(c,e+(b<0?b:f[0]*f[1]),1));b<0&&c.setDate(this._getDaysInMonth(c.getFullYear(),c.getMonth()));return this._isInRange(a,c)},_isInRange:function(a,b){var c=this._getMinMaxDate(a,"min");a=this._getMinMaxDate(a,"max");return(!c||b.getTime()>=c.getTime())&&(!a||b.getTime()<=a.getTime())},_getFormatConfig:function(a){var b=this._get(a,"shortYearCutoff");b=typeof b!="string"?b:(new Date).getFullYear()%100+parseInt(b,10);return{shortYearCutoff:b,dayNamesShort:this._get(a,
+"dayNamesShort"),dayNames:this._get(a,"dayNames"),monthNamesShort:this._get(a,"monthNamesShort"),monthNames:this._get(a,"monthNames")}},_formatDate:function(a,b,c,e){if(!b){a.currentDay=a.selectedDay;a.currentMonth=a.selectedMonth;a.currentYear=a.selectedYear}b=b?typeof b=="object"?b:this._daylightSavingAdjust(new Date(e,c,b)):this._daylightSavingAdjust(new Date(a.currentYear,a.currentMonth,a.currentDay));return this.formatDate(this._get(a,"dateFormat"),b,this._getFormatConfig(a))}});d.fn.datepicker=
+function(a){if(!this.length)return this;if(!d.datepicker.initialized){d(document).mousedown(d.datepicker._checkExternalClick).find("body").append(d.datepicker.dpDiv);d.datepicker.initialized=true}var b=Array.prototype.slice.call(arguments,1);if(typeof a=="string"&&(a=="isDisabled"||a=="getDate"||a=="widget"))return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this[0]].concat(b));if(a=="option"&&arguments.length==2&&typeof arguments[1]=="string")return d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,
+[this[0]].concat(b));return this.each(function(){typeof a=="string"?d.datepicker["_"+a+"Datepicker"].apply(d.datepicker,[this].concat(b)):d.datepicker._attachDatepicker(this,a)})};d.datepicker=new K;d.datepicker.initialized=false;d.datepicker.uuid=(new Date).getTime();d.datepicker.version="1.8.12";window["DP_jQuery_"+y]=d})(jQuery);
+;/*
+ * jQuery UI Progressbar 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Progressbar
+ *
+ * Depends:
+ *   jquery.ui.core.js
+ *   jquery.ui.widget.js
+ */
+(function(b,d){b.widget("ui.progressbar",{options:{value:0,max:100},min:0,_create:function(){this.element.addClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").attr({role:"progressbar","aria-valuemin":this.min,"aria-valuemax":this.options.max,"aria-valuenow":this._value()});this.valueDiv=b("<div class='ui-progressbar-value ui-widget-header ui-corner-left'></div>").appendTo(this.element);this.oldValue=this._value();this._refreshValue()},destroy:function(){this.element.removeClass("ui-progressbar ui-widget ui-widget-content ui-corner-all").removeAttr("role").removeAttr("aria-valuemin").removeAttr("aria-valuemax").removeAttr("aria-valuenow");
+this.valueDiv.remove();b.Widget.prototype.destroy.apply(this,arguments)},value:function(a){if(a===d)return this._value();this._setOption("value",a);return this},_setOption:function(a,c){if(a==="value"){this.options.value=c;this._refreshValue();this._value()===this.options.max&&this._trigger("complete")}b.Widget.prototype._setOption.apply(this,arguments)},_value:function(){var a=this.options.value;if(typeof a!=="number")a=0;return Math.min(this.options.max,Math.max(this.min,a))},_percentage:function(){return 100*
+this._value()/this.options.max},_refreshValue:function(){var a=this.value(),c=this._percentage();if(this.oldValue!==a){this.oldValue=a;this._trigger("change")}this.valueDiv.toggle(a>this.min).toggleClass("ui-corner-right",a===this.options.max).width(c.toFixed(0)+"%");this.element.attr("aria-valuenow",a)}});b.extend(b.ui.progressbar,{version:"1.8.12"})})(jQuery);
+;/*
+ * jQuery UI Effects 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/
+ */
+jQuery.effects||function(f,j){function n(c){var a;if(c&&c.constructor==Array&&c.length==3)return c;if(a=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(c))return[parseInt(a[1],10),parseInt(a[2],10),parseInt(a[3],10)];if(a=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(c))return[parseFloat(a[1])*2.55,parseFloat(a[2])*2.55,parseFloat(a[3])*2.55];if(a=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(c))return[parseInt(a[1],
+16),parseInt(a[2],16),parseInt(a[3],16)];if(a=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(c))return[parseInt(a[1]+a[1],16),parseInt(a[2]+a[2],16),parseInt(a[3]+a[3],16)];if(/rgba\(0, 0, 0, 0\)/.exec(c))return o.transparent;return o[f.trim(c).toLowerCase()]}function s(c,a){var b;do{b=f.curCSS(c,a);if(b!=""&&b!="transparent"||f.nodeName(c,"body"))break;a="backgroundColor"}while(c=c.parentNode);return n(b)}function p(){var c=document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle,
+a={},b,d;if(c&&c.length&&c[0]&&c[c[0]])for(var e=c.length;e--;){b=c[e];if(typeof c[b]=="string"){d=b.replace(/\-(\w)/g,function(g,h){return h.toUpperCase()});a[d]=c[b]}}else for(b in c)if(typeof c[b]==="string")a[b]=c[b];return a}function q(c){var a,b;for(a in c){b=c[a];if(b==null||f.isFunction(b)||a in t||/scrollbar/.test(a)||!/color/i.test(a)&&isNaN(parseFloat(b)))delete c[a]}return c}function u(c,a){var b={_:0},d;for(d in a)if(c[d]!=a[d])b[d]=a[d];return b}function k(c,a,b,d){if(typeof c=="object"){d=
+a;b=null;a=c;c=a.effect}if(f.isFunction(a)){d=a;b=null;a={}}if(typeof a=="number"||f.fx.speeds[a]){d=b;b=a;a={}}if(f.isFunction(b)){d=b;b=null}a=a||{};b=b||a.duration;b=f.fx.off?0:typeof b=="number"?b:b in f.fx.speeds?f.fx.speeds[b]:f.fx.speeds._default;d=d||a.complete;return[c,a,b,d]}function m(c){if(!c||typeof c==="number"||f.fx.speeds[c])return true;if(typeof c==="string"&&!f.effects[c])return true;return false}f.effects={};f.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor",
+"borderTopColor","borderColor","color","outlineColor"],function(c,a){f.fx.step[a]=function(b){if(!b.colorInit){b.start=s(b.elem,a);b.end=n(b.end);b.colorInit=true}b.elem.style[a]="rgb("+Math.max(Math.min(parseInt(b.pos*(b.end[0]-b.start[0])+b.start[0],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[1]-b.start[1])+b.start[1],10),255),0)+","+Math.max(Math.min(parseInt(b.pos*(b.end[2]-b.start[2])+b.start[2],10),255),0)+")"}});var o={aqua:[0,255,255],azure:[240,255,255],beige:[245,245,220],black:[0,
+0,0],blue:[0,0,255],brown:[165,42,42],cyan:[0,255,255],darkblue:[0,0,139],darkcyan:[0,139,139],darkgrey:[169,169,169],darkgreen:[0,100,0],darkkhaki:[189,183,107],darkmagenta:[139,0,139],darkolivegreen:[85,107,47],darkorange:[255,140,0],darkorchid:[153,50,204],darkred:[139,0,0],darksalmon:[233,150,122],darkviolet:[148,0,211],fuchsia:[255,0,255],gold:[255,215,0],green:[0,128,0],indigo:[75,0,130],khaki:[240,230,140],lightblue:[173,216,230],lightcyan:[224,255,255],lightgreen:[144,238,144],lightgrey:[211,
+211,211],lightpink:[255,182,193],lightyellow:[255,255,224],lime:[0,255,0],magenta:[255,0,255],maroon:[128,0,0],navy:[0,0,128],olive:[128,128,0],orange:[255,165,0],pink:[255,192,203],purple:[128,0,128],violet:[128,0,128],red:[255,0,0],silver:[192,192,192],white:[255,255,255],yellow:[255,255,0],transparent:[255,255,255]},r=["add","remove","toggle"],t={border:1,borderBottom:1,borderColor:1,borderLeft:1,borderRight:1,borderTop:1,borderWidth:1,margin:1,padding:1};f.effects.animateClass=function(c,a,b,
+d){if(f.isFunction(b)){d=b;b=null}return this.queue("fx",function(){var e=f(this),g=e.attr("style")||" ",h=q(p.call(this)),l,v=e.attr("className");f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});l=q(p.call(this));e.attr("className",v);e.animate(u(h,l),a,b,function(){f.each(r,function(w,i){c[i]&&e[i+"Class"](c[i])});if(typeof e.attr("style")=="object"){e.attr("style").cssText="";e.attr("style").cssText=g}else e.attr("style",g);d&&d.apply(this,arguments)});h=f.queue(this);l=h.splice(h.length-1,1)[0];
+h.splice(1,0,l);f.dequeue(this)})};f.fn.extend({_addClass:f.fn.addClass,addClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{add:c},a,b,d]):this._addClass(c)},_removeClass:f.fn.removeClass,removeClass:function(c,a,b,d){return a?f.effects.animateClass.apply(this,[{remove:c},a,b,d]):this._removeClass(c)},_toggleClass:f.fn.toggleClass,toggleClass:function(c,a,b,d,e){return typeof a=="boolean"||a===j?b?f.effects.animateClass.apply(this,[a?{add:c}:{remove:c},b,d,e]):this._toggleClass(c,
+a):f.effects.animateClass.apply(this,[{toggle:c},a,b,d])},switchClass:function(c,a,b,d,e){return f.effects.animateClass.apply(this,[{add:a,remove:c},b,d,e])}});f.extend(f.effects,{version:"1.8.12",save:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.data("ec.storage."+a[b],c[0].style[a[b]])},restore:function(c,a){for(var b=0;b<a.length;b++)a[b]!==null&&c.css(a[b],c.data("ec.storage."+a[b]))},setMode:function(c,a){if(a=="toggle")a=c.is(":hidden")?"show":"hide";return a},getBaseline:function(c,
+a){var b;switch(c[0]){case "top":b=0;break;case "middle":b=0.5;break;case "bottom":b=1;break;default:b=c[0]/a.height}switch(c[1]){case "left":c=0;break;case "center":c=0.5;break;case "right":c=1;break;default:c=c[1]/a.width}return{x:c,y:b}},createWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent();var a={width:c.outerWidth(true),height:c.outerHeight(true),"float":c.css("float")},b=f("<div></div>").addClass("ui-effects-wrapper").css({fontSize:"100%",background:"transparent",
+border:"none",margin:0,padding:0});c.wrap(b);b=c.parent();if(c.css("position")=="static"){b.css({position:"relative"});c.css({position:"relative"})}else{f.extend(a,{position:c.css("position"),zIndex:c.css("z-index")});f.each(["top","left","bottom","right"],function(d,e){a[e]=c.css(e);if(isNaN(parseInt(a[e],10)))a[e]="auto"});c.css({position:"relative",top:0,left:0,right:"auto",bottom:"auto"})}return b.css(a).show()},removeWrapper:function(c){if(c.parent().is(".ui-effects-wrapper"))return c.parent().replaceWith(c);
+return c},setTransition:function(c,a,b,d){d=d||{};f.each(a,function(e,g){unit=c.cssUnit(g);if(unit[0]>0)d[g]=unit[0]*b+unit[1]});return d}});f.fn.extend({effect:function(c){var a=k.apply(this,arguments),b={options:a[1],duration:a[2],callback:a[3]};a=b.options.mode;var d=f.effects[c];if(f.fx.off||!d)return a?this[a](b.duration,b.callback):this.each(function(){b.callback&&b.callback.call(this)});return d.call(this,b)},_show:f.fn.show,show:function(c){if(m(c))return this._show.apply(this,arguments);
+else{var a=k.apply(this,arguments);a[1].mode="show";return this.effect.apply(this,a)}},_hide:f.fn.hide,hide:function(c){if(m(c))return this._hide.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="hide";return this.effect.apply(this,a)}},__toggle:f.fn.toggle,toggle:function(c){if(m(c)||typeof c==="boolean"||f.isFunction(c))return this.__toggle.apply(this,arguments);else{var a=k.apply(this,arguments);a[1].mode="toggle";return this.effect.apply(this,a)}},cssUnit:function(c){var a=this.css(c),
+b=[];f.each(["em","px","%","pt"],function(d,e){if(a.indexOf(e)>0)b=[parseFloat(a),e]});return b}});f.easing.jswing=f.easing.swing;f.extend(f.easing,{def:"easeOutQuad",swing:function(c,a,b,d,e){return f.easing[f.easing.def](c,a,b,d,e)},easeInQuad:function(c,a,b,d,e){return d*(a/=e)*a+b},easeOutQuad:function(c,a,b,d,e){return-d*(a/=e)*(a-2)+b},easeInOutQuad:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a+b;return-d/2*(--a*(a-2)-1)+b},easeInCubic:function(c,a,b,d,e){return d*(a/=e)*a*a+b},easeOutCubic:function(c,
+a,b,d,e){return d*((a=a/e-1)*a*a+1)+b},easeInOutCubic:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a+b;return d/2*((a-=2)*a*a+2)+b},easeInQuart:function(c,a,b,d,e){return d*(a/=e)*a*a*a+b},easeOutQuart:function(c,a,b,d,e){return-d*((a=a/e-1)*a*a*a-1)+b},easeInOutQuart:function(c,a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a+b;return-d/2*((a-=2)*a*a*a-2)+b},easeInQuint:function(c,a,b,d,e){return d*(a/=e)*a*a*a*a+b},easeOutQuint:function(c,a,b,d,e){return d*((a=a/e-1)*a*a*a*a+1)+b},easeInOutQuint:function(c,
+a,b,d,e){if((a/=e/2)<1)return d/2*a*a*a*a*a+b;return d/2*((a-=2)*a*a*a*a+2)+b},easeInSine:function(c,a,b,d,e){return-d*Math.cos(a/e*(Math.PI/2))+d+b},easeOutSine:function(c,a,b,d,e){return d*Math.sin(a/e*(Math.PI/2))+b},easeInOutSine:function(c,a,b,d,e){return-d/2*(Math.cos(Math.PI*a/e)-1)+b},easeInExpo:function(c,a,b,d,e){return a==0?b:d*Math.pow(2,10*(a/e-1))+b},easeOutExpo:function(c,a,b,d,e){return a==e?b+d:d*(-Math.pow(2,-10*a/e)+1)+b},easeInOutExpo:function(c,a,b,d,e){if(a==0)return b;if(a==
+e)return b+d;if((a/=e/2)<1)return d/2*Math.pow(2,10*(a-1))+b;return d/2*(-Math.pow(2,-10*--a)+2)+b},easeInCirc:function(c,a,b,d,e){return-d*(Math.sqrt(1-(a/=e)*a)-1)+b},easeOutCirc:function(c,a,b,d,e){return d*Math.sqrt(1-(a=a/e-1)*a)+b},easeInOutCirc:function(c,a,b,d,e){if((a/=e/2)<1)return-d/2*(Math.sqrt(1-a*a)-1)+b;return d/2*(Math.sqrt(1-(a-=2)*a)+1)+b},easeInElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=
+g/(2*Math.PI)*Math.asin(d/h);return-(h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g))+b},easeOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e)==1)return b+d;g||(g=e*0.3);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/h);return h*Math.pow(2,-10*a)*Math.sin((a*e-c)*2*Math.PI/g)+d+b},easeInOutElastic:function(c,a,b,d,e){c=1.70158;var g=0,h=d;if(a==0)return b;if((a/=e/2)==2)return b+d;g||(g=e*0.3*1.5);if(h<Math.abs(d)){h=d;c=g/4}else c=g/(2*Math.PI)*Math.asin(d/
+h);if(a<1)return-0.5*h*Math.pow(2,10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)+b;return h*Math.pow(2,-10*(a-=1))*Math.sin((a*e-c)*2*Math.PI/g)*0.5+d+b},easeInBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*(a/=e)*a*((g+1)*a-g)+b},easeOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;return d*((a=a/e-1)*a*((g+1)*a+g)+1)+b},easeInOutBack:function(c,a,b,d,e,g){if(g==j)g=1.70158;if((a/=e/2)<1)return d/2*a*a*(((g*=1.525)+1)*a-g)+b;return d/2*((a-=2)*a*(((g*=1.525)+1)*a+g)+2)+b},easeInBounce:function(c,
+a,b,d,e){return d-f.easing.easeOutBounce(c,e-a,0,d,e)+b},easeOutBounce:function(c,a,b,d,e){return(a/=e)<1/2.75?d*7.5625*a*a+b:a<2/2.75?d*(7.5625*(a-=1.5/2.75)*a+0.75)+b:a<2.5/2.75?d*(7.5625*(a-=2.25/2.75)*a+0.9375)+b:d*(7.5625*(a-=2.625/2.75)*a+0.984375)+b},easeInOutBounce:function(c,a,b,d,e){if(a<e/2)return f.easing.easeInBounce(c,a*2,0,d,e)*0.5+b;return f.easing.easeOutBounce(c,a*2-e,0,d,e)*0.5+d*0.5+b}})}(jQuery);
+;/*
+ * jQuery UI Effects Blind 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Blind
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.blind=function(c){return this.queue(function(){var a=b(this),g=["position","top","bottom","left","right"],f=b.effects.setMode(a,c.options.mode||"hide"),d=c.options.direction||"vertical";b.effects.save(a,g);a.show();var e=b.effects.createWrapper(a).css({overflow:"hidden"}),h=d=="vertical"?"height":"width";d=d=="vertical"?e.height():e.width();f=="show"&&e.css(h,0);var i={};i[h]=f=="show"?d:0;e.animate(i,c.duration,c.options.easing,function(){f=="hide"&&a.hide();b.effects.restore(a,
+g);b.effects.removeWrapper(a);c.callback&&c.callback.apply(a[0],arguments);a.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Bounce 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Bounce
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.bounce=function(b){return this.queue(function(){var a=e(this),l=["position","top","bottom","left","right"],h=e.effects.setMode(a,b.options.mode||"effect"),d=b.options.direction||"up",c=b.options.distance||20,m=b.options.times||5,i=b.duration||250;/show|hide/.test(h)&&l.push("opacity");e.effects.save(a,l);a.show();e.effects.createWrapper(a);var f=d=="up"||d=="down"?"top":"left";d=d=="up"||d=="left"?"pos":"neg";c=b.options.distance||(f=="top"?a.outerHeight({margin:true})/3:a.outerWidth({margin:true})/
+3);if(h=="show")a.css("opacity",0).css(f,d=="pos"?-c:c);if(h=="hide")c/=m*2;h!="hide"&&m--;if(h=="show"){var g={opacity:1};g[f]=(d=="pos"?"+=":"-=")+c;a.animate(g,i/2,b.options.easing);c/=2;m--}for(g=0;g<m;g++){var j={},k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing);c=h=="hide"?c*2:c/2}if(h=="hide"){g={opacity:0};g[f]=(d=="pos"?"-=":"+=")+c;a.animate(g,i/2,b.options.easing,function(){a.hide();e.effects.restore(a,l);e.effects.removeWrapper(a);
+b.callback&&b.callback.apply(this,arguments)})}else{j={};k={};j[f]=(d=="pos"?"-=":"+=")+c;k[f]=(d=="pos"?"+=":"-=")+c;a.animate(j,i/2,b.options.easing).animate(k,i/2,b.options.easing,function(){e.effects.restore(a,l);e.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments)})}a.queue("fx",function(){a.dequeue()});a.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Clip 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Clip
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.clip=function(e){return this.queue(function(){var a=b(this),i=["position","top","bottom","left","right","height","width"],f=b.effects.setMode(a,e.options.mode||"hide"),c=e.options.direction||"vertical";b.effects.save(a,i);a.show();var d=b.effects.createWrapper(a).css({overflow:"hidden"});d=a[0].tagName=="IMG"?d:a;var g={size:c=="vertical"?"height":"width",position:c=="vertical"?"top":"left"};c=c=="vertical"?d.height():d.width();if(f=="show"){d.css(g.size,0);d.css(g.position,
+c/2)}var h={};h[g.size]=f=="show"?c:0;h[g.position]=f=="show"?0:c/2;d.animate(h,{queue:false,duration:e.duration,easing:e.options.easing,complete:function(){f=="hide"&&a.hide();b.effects.restore(a,i);b.effects.removeWrapper(a);e.callback&&e.callback.apply(a[0],arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Drop 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Drop
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.drop=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right","opacity"],e=c.effects.setMode(a,d.options.mode||"hide"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a);var f=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var g=d.options.distance||(f=="top"?a.outerHeight({margin:true})/2:a.outerWidth({margin:true})/2);if(e=="show")a.css("opacity",0).css(f,b=="pos"?-g:g);var i={opacity:e==
+"show"?1:0};i[f]=(e=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+g;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){e=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Explode 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Explode
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(j){j.effects.explode=function(a){return this.queue(function(){var c=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3,d=a.options.pieces?Math.round(Math.sqrt(a.options.pieces)):3;a.options.mode=a.options.mode=="toggle"?j(this).is(":visible")?"hide":"show":a.options.mode;var b=j(this).show().css("visibility","hidden"),g=b.offset();g.top-=parseInt(b.css("marginTop"),10)||0;g.left-=parseInt(b.css("marginLeft"),10)||0;for(var h=b.outerWidth(true),i=b.outerHeight(true),e=0;e<c;e++)for(var f=
+0;f<d;f++)b.clone().appendTo("body").wrap("<div></div>").css({position:"absolute",visibility:"visible",left:-f*(h/d),top:-e*(i/c)}).parent().addClass("ui-effects-explode").css({position:"absolute",overflow:"hidden",width:h/d,height:i/c,left:g.left+f*(h/d)+(a.options.mode=="show"?(f-Math.floor(d/2))*(h/d):0),top:g.top+e*(i/c)+(a.options.mode=="show"?(e-Math.floor(c/2))*(i/c):0),opacity:a.options.mode=="show"?0:1}).animate({left:g.left+f*(h/d)+(a.options.mode=="show"?0:(f-Math.floor(d/2))*(h/d)),top:g.top+
+e*(i/c)+(a.options.mode=="show"?0:(e-Math.floor(c/2))*(i/c)),opacity:a.options.mode=="show"?1:0},a.duration||500);setTimeout(function(){a.options.mode=="show"?b.css({visibility:"visible"}):b.css({visibility:"visible"}).hide();a.callback&&a.callback.apply(b[0]);b.dequeue();j("div.ui-effects-explode").remove()},a.duration||500)})}})(jQuery);
+;/*
+ * jQuery UI Effects Fade 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.fade=function(a){return this.queue(function(){var c=b(this),d=b.effects.setMode(c,a.options.mode||"hide");c.animate({opacity:d},{queue:false,duration:a.duration,easing:a.options.easing,complete:function(){a.callback&&a.callback.apply(this,arguments);c.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Fold 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Fold
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.fold=function(a){return this.queue(function(){var b=c(this),j=["position","top","bottom","left","right"],d=c.effects.setMode(b,a.options.mode||"hide"),g=a.options.size||15,h=!!a.options.horizFirst,k=a.duration?a.duration/2:c.fx.speeds._default/2;c.effects.save(b,j);b.show();var e=c.effects.createWrapper(b).css({overflow:"hidden"}),f=d=="show"!=h,l=f?["width","height"]:["height","width"];f=f?[e.width(),e.height()]:[e.height(),e.width()];var i=/([0-9]+)%/.exec(g);if(i)g=parseInt(i[1],
+10)/100*f[d=="hide"?0:1];if(d=="show")e.css(h?{height:0,width:g}:{height:g,width:0});h={};i={};h[l[0]]=d=="show"?f[0]:g;i[l[1]]=d=="show"?f[1]:0;e.animate(h,k,a.options.easing).animate(i,k,a.options.easing,function(){d=="hide"&&b.hide();c.effects.restore(b,j);c.effects.removeWrapper(b);a.callback&&a.callback.apply(b[0],arguments);b.dequeue()})})}})(jQuery);
+;/*
+ * jQuery UI Effects Highlight 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Highlight
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(b){b.effects.highlight=function(c){return this.queue(function(){var a=b(this),e=["backgroundImage","backgroundColor","opacity"],d=b.effects.setMode(a,c.options.mode||"show"),f={backgroundColor:a.css("backgroundColor")};if(d=="hide")f.opacity=0;b.effects.save(a,e);a.show().css({backgroundImage:"none",backgroundColor:c.options.color||"#ffff99"}).animate(f,{queue:false,duration:c.duration,easing:c.options.easing,complete:function(){d=="hide"&&a.hide();b.effects.restore(a,e);d=="show"&&!b.support.opacity&&
+this.style.removeAttribute("filter");c.callback&&c.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Pulsate 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Pulsate
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.pulsate=function(a){return this.queue(function(){var b=d(this),c=d.effects.setMode(b,a.options.mode||"show");times=(a.options.times||5)*2-1;duration=a.duration?a.duration/2:d.fx.speeds._default/2;isVisible=b.is(":visible");animateTo=0;if(!isVisible){b.css("opacity",0).show();animateTo=1}if(c=="hide"&&isVisible||c=="show"&&!isVisible)times--;for(c=0;c<times;c++){b.animate({opacity:animateTo},duration,a.options.easing);animateTo=(animateTo+1)%2}b.animate({opacity:animateTo},duration,
+a.options.easing,function(){animateTo==0&&b.hide();a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()}).dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Scale 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Scale
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.puff=function(b){return this.queue(function(){var a=c(this),e=c.effects.setMode(a,b.options.mode||"hide"),g=parseInt(b.options.percent,10)||150,h=g/100,i={height:a.height(),width:a.width()};c.extend(b.options,{fade:true,mode:e,percent:e=="hide"?g:100,from:e=="hide"?i:{height:i.height*h,width:i.width*h}});a.effect("scale",b.options,b.duration,b.callback);a.dequeue()})};c.effects.scale=function(b){return this.queue(function(){var a=c(this),e=c.extend(true,{},b.options),g=c.effects.setMode(a,
+b.options.mode||"effect"),h=parseInt(b.options.percent,10)||(parseInt(b.options.percent,10)==0?0:g=="hide"?0:100),i=b.options.direction||"both",f=b.options.origin;if(g!="effect"){e.origin=f||["middle","center"];e.restore=true}f={height:a.height(),width:a.width()};a.from=b.options.from||(g=="show"?{height:0,width:0}:f);h={y:i!="horizontal"?h/100:1,x:i!="vertical"?h/100:1};a.to={height:f.height*h.y,width:f.width*h.x};if(b.options.fade){if(g=="show"){a.from.opacity=0;a.to.opacity=1}if(g=="hide"){a.from.opacity=
+1;a.to.opacity=0}}e.from=a.from;e.to=a.to;e.mode=g;a.effect("size",e,b.duration,b.callback);a.dequeue()})};c.effects.size=function(b){return this.queue(function(){var a=c(this),e=["position","top","bottom","left","right","width","height","overflow","opacity"],g=["position","top","bottom","left","right","overflow","opacity"],h=["width","height","overflow"],i=["fontSize"],f=["borderTopWidth","borderBottomWidth","paddingTop","paddingBottom"],k=["borderLeftWidth","borderRightWidth","paddingLeft","paddingRight"],
+p=c.effects.setMode(a,b.options.mode||"effect"),n=b.options.restore||false,m=b.options.scale||"both",l=b.options.origin,j={height:a.height(),width:a.width()};a.from=b.options.from||j;a.to=b.options.to||j;if(l){l=c.effects.getBaseline(l,j);a.from.top=(j.height-a.from.height)*l.y;a.from.left=(j.width-a.from.width)*l.x;a.to.top=(j.height-a.to.height)*l.y;a.to.left=(j.width-a.to.width)*l.x}var d={from:{y:a.from.height/j.height,x:a.from.width/j.width},to:{y:a.to.height/j.height,x:a.to.width/j.width}};
+if(m=="box"||m=="both"){if(d.from.y!=d.to.y){e=e.concat(f);a.from=c.effects.setTransition(a,f,d.from.y,a.from);a.to=c.effects.setTransition(a,f,d.to.y,a.to)}if(d.from.x!=d.to.x){e=e.concat(k);a.from=c.effects.setTransition(a,k,d.from.x,a.from);a.to=c.effects.setTransition(a,k,d.to.x,a.to)}}if(m=="content"||m=="both")if(d.from.y!=d.to.y){e=e.concat(i);a.from=c.effects.setTransition(a,i,d.from.y,a.from);a.to=c.effects.setTransition(a,i,d.to.y,a.to)}c.effects.save(a,n?e:g);a.show();c.effects.createWrapper(a);
+a.css("overflow","hidden").css(a.from);if(m=="content"||m=="both"){f=f.concat(["marginTop","marginBottom"]).concat(i);k=k.concat(["marginLeft","marginRight"]);h=e.concat(f).concat(k);a.find("*[width]").each(function(){child=c(this);n&&c.effects.save(child,h);var o={height:child.height(),width:child.width()};child.from={height:o.height*d.from.y,width:o.width*d.from.x};child.to={height:o.height*d.to.y,width:o.width*d.to.x};if(d.from.y!=d.to.y){child.from=c.effects.setTransition(child,f,d.from.y,child.from);
+child.to=c.effects.setTransition(child,f,d.to.y,child.to)}if(d.from.x!=d.to.x){child.from=c.effects.setTransition(child,k,d.from.x,child.from);child.to=c.effects.setTransition(child,k,d.to.x,child.to)}child.css(child.from);child.animate(child.to,b.duration,b.options.easing,function(){n&&c.effects.restore(child,h)})})}a.animate(a.to,{queue:false,duration:b.duration,easing:b.options.easing,complete:function(){a.to.opacity===0&&a.css("opacity",a.from.opacity);p=="hide"&&a.hide();c.effects.restore(a,
+n?e:g);c.effects.removeWrapper(a);b.callback&&b.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Shake 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Shake
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(d){d.effects.shake=function(a){return this.queue(function(){var b=d(this),j=["position","top","bottom","left","right"];d.effects.setMode(b,a.options.mode||"effect");var c=a.options.direction||"left",e=a.options.distance||20,l=a.options.times||3,f=a.duration||a.options.duration||140;d.effects.save(b,j);b.show();d.effects.createWrapper(b);var g=c=="up"||c=="down"?"top":"left",h=c=="up"||c=="left"?"pos":"neg";c={};var i={},k={};c[g]=(h=="pos"?"-=":"+=")+e;i[g]=(h=="pos"?"+=":"-=")+e*2;k[g]=
+(h=="pos"?"-=":"+=")+e*2;b.animate(c,f,a.options.easing);for(e=1;e<l;e++)b.animate(i,f,a.options.easing).animate(k,f,a.options.easing);b.animate(i,f,a.options.easing).animate(c,f/2,a.options.easing,function(){d.effects.restore(b,j);d.effects.removeWrapper(b);a.callback&&a.callback.apply(this,arguments)});b.queue("fx",function(){b.dequeue()});b.dequeue()})}})(jQuery);
+;/*
+ * jQuery UI Effects Slide 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Slide
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(c){c.effects.slide=function(d){return this.queue(function(){var a=c(this),h=["position","top","bottom","left","right"],f=c.effects.setMode(a,d.options.mode||"show"),b=d.options.direction||"left";c.effects.save(a,h);a.show();c.effects.createWrapper(a).css({overflow:"hidden"});var g=b=="up"||b=="down"?"top":"left";b=b=="up"||b=="left"?"pos":"neg";var e=d.options.distance||(g=="top"?a.outerHeight({margin:true}):a.outerWidth({margin:true}));if(f=="show")a.css(g,b=="pos"?isNaN(e)?"-"+e:-e:e);
+var i={};i[g]=(f=="show"?b=="pos"?"+=":"-=":b=="pos"?"-=":"+=")+e;a.animate(i,{queue:false,duration:d.duration,easing:d.options.easing,complete:function(){f=="hide"&&a.hide();c.effects.restore(a,h);c.effects.removeWrapper(a);d.callback&&d.callback.apply(this,arguments);a.dequeue()}})})}})(jQuery);
+;/*
+ * jQuery UI Effects Transfer 1.8.12
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Effects/Transfer
+ *
+ * Depends:
+ *	jquery.effects.core.js
+ */
+(function(e){e.effects.transfer=function(a){return this.queue(function(){var b=e(this),c=e(a.options.to),d=c.offset();c={top:d.top,left:d.left,height:c.innerHeight(),width:c.innerWidth()};d=b.offset();var f=e('<div class="ui-effects-transfer"></div>').appendTo(document.body).addClass(a.options.className).css({top:d.top,left:d.left,height:b.innerHeight(),width:b.innerWidth(),position:"absolute"}).animate(c,a.duration,a.options.easing,function(){f.remove();a.callback&&a.callback.apply(b[0],arguments);
+b.dequeue()})})}})(jQuery);
+;
\ No newline at end of file
diff --git a/common/js/plugins/ui/plugin.load b/common/js/plugins/ui/plugin.load
index 146caa20e..b497ba25b 100644
--- a/common/js/plugins/ui/plugin.load
+++ b/common/js/plugins/ui/plugin.load
@@ -1,3 +1,3 @@
-jquery-ui.packed.js
+jquery-ui.min.js
 jquery-ui.css
 jquery.ui.datepicker-ko.js
diff --git a/common/js/plugins/watchinput/jquery.watchinput.js b/common/js/plugins/watchinput/jquery.watchinput.js
index 80782bb17..1654ac33c 100644
--- a/common/js/plugins/watchinput/jquery.watchinput.js
+++ b/common/js/plugins/watchinput/jquery.watchinput.js
@@ -1,61 +1,61 @@
-/**
- * @brief  Watch Input box
- * @author NHN (developers@xpresseingine.com)
- **/
-(function($){
-
-var class_name = '_watch_input';
-
-$.fn.watch_input = function(settings)
-{
-	if (this.length == 0) return false;
-	if (this.length > 1) {
-		this.each(function(){ $(this).watch_input(settings) });
-		return true;
-	}
-	if (!$.isFunction(settings.oninput)) return false;
-	if (this.hasClass(class_name)) return false;
-
-	this[0].__wi_oninput = settings.oninput;
-	this.addClass(class_name).keydown(_onkeydown).focus(_onfocus).blur(_onblur);
-
-	return this;
-};
-
-var timer = null, val = '', ie=$.browser.msie;
-
-function _onkeydown(event)
-{
-	if ($(this).val() != val) {
-		val = $(this).val();
-		this.__wi_oninput();
-	}
-}
-
-function _onfocus(event)
-{
-	var self = $(this);
-
-	val = self.val();
-	if (ie) return true;
-
-	(function fn() {
-		if ( (self.val() != val) && $.isFunction(self[0].__wi_oninput) ) {
-			val = self.val();
-			self[0].__wi_oninput();
-		}
-
-		timer = setTimeout(arguments.callee, 100);
-	})();
-}
-
-function _onblur(event)
-{
-	val = '';
-	if (!ie && timer) {
-		clearTimeout(timer);
-		timer = null;
-	}
-}
-
-})(jQuery);
+/**
+ * @brief  Watch Input box
+ * @author NHN (developers@xpresseingine.com)
+ **/
+(function($){
+
+var class_name = '_watch_input';
+
+$.fn.watch_input = function(settings)
+{
+	if (this.length == 0) return false;
+	if (this.length > 1) {
+		this.each(function(){ $(this).watch_input(settings) });
+		return true;
+	}
+	if (!$.isFunction(settings.oninput)) return false;
+	if (this.hasClass(class_name)) return false;
+
+	this[0].__wi_oninput = settings.oninput;
+	this.addClass(class_name).keydown(_onkeydown).focus(_onfocus).blur(_onblur);
+
+	return this;
+};
+
+var timer = null, val = '', ie=$.browser.msie;
+
+function _onkeydown(event)
+{
+	if ($(this).val() != val) {
+		val = $(this).val();
+		this.__wi_oninput();
+	}
+}
+
+function _onfocus(event)
+{
+	var self = $(this);
+
+	val = self.val();
+	if (ie) return true;
+
+	(function fn() {
+		if ( (self.val() != val) && $.isFunction(self[0].__wi_oninput) ) {
+			val = self.val();
+			self[0].__wi_oninput();
+		}
+
+		timer = setTimeout(arguments.callee, 100);
+	})();
+}
+
+function _onblur(event)
+{
+	val = '';
+	if (!ie && timer) {
+		clearTimeout(timer);
+		timer = null;
+	}
+}
+
+})(jQuery);
diff --git a/common/js/src/common.js b/common/js/src/common.js
deleted file mode 100644
index 8d0cc0f93..000000000
--- a/common/js/src/common.js
+++ /dev/null
@@ -1,980 +0,0 @@
-/**
- * @file common.js
- * @author NHN (developers@xpressengine.com)
- * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음
- **/
-
-/* jQuery 참조변수($) 제거 */
-if(jQuery) jQuery.noConflict();
-
-(function($) {
-    /* OS check */
-    var UA = navigator.userAgent.toLowerCase();
-    $.os = {
-        Linux: /linux/.test(UA),
-        Unix: /x11/.test(UA),
-        Mac: /mac/.test(UA),
-        Windows: /win/.test(UA)
-    };
-    $.os.name = ($.os.Windows) ? 'Windows' :
-        ($.os.Linux) ? 'Linux' :
-        ($.os.Unix) ? 'Unix' :
-        ($.os.Mac) ? 'Mac' : '';
-
-    /**
-     * @brief XE 공용 유틸리티 함수
-     * @namespace XE
-     */
-    window.XE = {
-        loaded_popup_menus : new Array(),
-        addedDocument : new Array(),
-        /**
-         * @brief 특정 name을 가진 체크박스들의 checked 속성 변경
-         * @param [itemName='cart',][options={}]
-         */
-        checkboxToggleAll : function() {
-            var itemName='cart';
-            var options = {
-                wrap : null,
-                checked : 'toggle',
-                doClick : false
-            };
-
-            switch(arguments.length) {
-                case 1:
-                    if(typeof(arguments[0]) == "string") {
-                        itemName = arguments[0];
-                    } else {
-                        $.extend(options, arguments[0] || {});
-                    }
-                    break;
-                case 2:
-                    itemName = arguments[0];
-                    $.extend(options, arguments[1] || {});
-            }
-
-            if(options.doClick == true) options.checked = null;
-            if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap;
-
-            if(options.wrap) {
-                var obj = $(options.wrap).find('input[name='+itemName+']:checkbox');
-            } else {
-                var obj = $('input[name='+itemName+']:checkbox');
-            }
-
-            if(options.checked == 'toggle') {
-                obj.each(function() {
-                    $(this).attr('checked', ($(this).attr('checked')) ? false : true);
-                });
-            } else {
-                (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked);
-            }
-        },
-
-        /**
-         * @brief 문서/회원 등 팝업 메뉴 출력
-         */
-        displayPopupMenu : function(ret_obj, response_tags, params) {
-            var target_srl = params["target_srl"];
-            var menu_id = params["menu_id"];
-            var menus = ret_obj['menus'];
-            var html = "";
-
-            if(this.loaded_popup_menus[menu_id]) {
-                html = this.loaded_popup_menus[menu_id];
-
-            } else {
-                if(menus) {
-                    var item = menus['item'];
-                    if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
-                    if(item.length) {
-                        for(var i=0;i<item.length;i++) {
-                            var url = item[i].url;
-                            var str = item[i].str;
-                            var icon = item[i].icon;
-                            var target = item[i].target;
-
-                            var styleText = "";
-                            var click_str = "";
-                            if(icon) styleText = " style=\"background-image:url('"+icon+"')\" ";
-                            switch(target) {
-                                case "popup" :
-                                        click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\"";
-                                    break;
-                                case "self" :
-                                        //click_str = " onclick=\"location.href='"+url+"' return false;\"";
-                                    break;
-                                case "javascript" :
-                                        click_str = " onclick=\""+url+"; return false; \"";
-                                        url="#";
-                                    break;
-                                default :
-                                        click_str = " onclick=\"window.open(this.href); return false;\"";
-                                    break;
-                            }
-
-                            html += '<li '+styleText+'><a href="'+url+'"'+click_str+'>'+str+'</a></li> ';
-                        }
-                    }
-                }
-                this.loaded_popup_menus[menu_id] =  html;
-            }
-
-            /* 레이어 출력 */
-            if(html) {
-                var area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
-                var areaOffset = {top:params['page_y'], left:params['page_x']};
-
-                if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop())
-                    areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop();
-                if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft())
-                    areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft();
-
-                area.css({ top:areaOffset.top, left:areaOffset.left }).show();
-            }
-        }
-    }
-
-}) (jQuery);
-
-
-
-/* jQuery(document).ready() */
-jQuery(function($) {
-    /* 팝업메뉴 레이어 생성 */
-    if(!$('#popup_menu_area').length) {
-        var menuObj = $('<div>')
-            .attr('id', 'popup_menu_area')
-            .css({display:'none', zIndex:9999});
-        $(document.body).append(menuObj);
-    }
-
-    $(document).click(function(evt) {
-        var area = $('#popup_menu_area');
-        if(!area.length) return;
-
-        // 이전에 호출되었을지 모르는 팝업메뉴 숨김
-        area.hide();
-
-        var targetObj = $(evt.target);
-        if(!targetObj.length) return;
-
-        // obj의 nodeName이 div나 span이 아니면 나올대까지 상위를 찾음
-        if(targetObj.length && $.inArray(targetObj.attr('nodeName'), ['DIV', 'SPAN', 'A']) == -1) targetObj = targetObj.parent();
-        if(!targetObj.length || $.inArray(targetObj.attr('nodeName'), ['DIV', 'SPAN', 'A']) == -1) return;
-
-        // 객체의 className값을 구함
-        var class_name = targetObj.attr('className');
-        if(class_name.indexOf('_') <= 0) return;
-        // className을 분리
-        var class_name_list = class_name.split(' ');
-
-        var menu_id = '';
-        var menu_id_regx = /^([a-zA-Z]+)_([0-9]+)$/;
-
-
-        for(var i = 0, c = class_name_list.length; i < c; i++) {
-            if(menu_id_regx.test(class_name_list[i])) {
-                menu_id = class_name_list[i];
-            }
-        }
-
-        if(!menu_id) return;
-
-        // module명과 대상 번호가 없으면 return
-        var tmp_arr = menu_id.split('_');
-        var module_name = tmp_arr[0];
-        var target_srl = tmp_arr[1];
-        if(!module_name || !target_srl || target_srl < 1) return;
-
-        // action이름을 규칙에 맞게 작성
-        var action_name = "get" + module_name.substr(0,1).toUpperCase() + module_name.substr(1,module_name.length-1) + "Menu";
-
-        // 서버에 메뉴를 요청
-        var params = new Array();
-        params["target_srl"] = target_srl;
-        params["mid"] = params["cur_mid"] = current_mid;
-        params["cur_act"] = current_url.getQuery('act');
-        params["menu_id"] = menu_id;
-        params["page_x"] = evt.pageX;
-        params["page_y"] = evt.pageY;
-        if(typeof(xeVid)!='undefined') params["vid"] = xeVid;
-
-        var response_tags = new Array("error","message","menus");
-
-        if(typeof(XE.loaded_popup_menus[menu_id]) != 'undefined') {
-            XE.displayPopupMenu(params, response_tags, params);
-            return;
-        }
-        show_waiting_message = false;
-        exec_xml(module_name, action_name, params, XE.displayPopupMenu, response_tags, params);
-        show_waiting_message = true;
-    });
-
-    /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */
-    if($.browser.msie) {
-        $('select').each(function(i, sels) {
-            var disabled_exists = false;
-            var first_enable = new Array();
-
-            for(var j=0; j < sels.options.length; j++) {
-                if(sels.options[j].disabled) {
-                    sels.options[j].style.color = '#CCCCCC';
-                    disabled_exists = true;
-                }else{
-                    first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j;
-                }
-            }
-
-            if(!disabled_exists) return;
-
-            sels.oldonchange = sels.onchange;
-            sels.onchange = function() {
-                if(this.options[this.selectedIndex].disabled) {
-
-                    this.selectedIndex = first_enable[i];
-                    /*
-                    if(this.options.length<=1) this.selectedIndex = -1;
-                    else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++;
-                    else this.selectedIndex--;
-                    */
-
-                } else {
-                    if(this.oldonchange) this.oldonchange();
-                }
-            };
-
-            if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange();
-
-        });
-    }
-
-    /* 단락에디터 fold 컴포넌트 펼치기/접기 */
-    var drEditorFold = $('.xe_content .fold_button');
-    if(drEditorFold.size()) {
-        var fold_container = $('div.fold_container', drEditorFold);
-        $('button.more', drEditorFold).click(function() {
-            $(this).hide().next('button').show().parent().next(fold_container).show();
-        });
-        $('button.less', drEditorFold).click(function() {
-            $(this).hide().prev('button').show().parent().next(fold_container).hide();
-        });
-    }
-
-});
-
-
-/**
- * @brief location.href에서 특정 key의 값을 return
- **/
-String.prototype.getQuery = function(key) {
-    var idx = this.indexOf('?');
-    if(idx == -1) return null;
-    var query_string = this.substr(idx+1, this.length);
-    var args = {};
-    query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; });
-
-    var q = args[key];
-    if(typeof(q)=="undefined") q = "";
-
-    return q;
-}
-
-/**
- * @brief location.href에서 특정 key의 값을 return
- **/
-String.prototype.setQuery = function(key, val) {
-    var idx = this.indexOf('?');
-    var uri = this.replace(/#$/, '');
-
-    if(idx != -1) {
-        var query_string = uri.substr(idx+1, this.length), args = {}, q_list = [];
-		uri = this.substr(0, idx);
-        query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; });
-
-        args[key] = val;
-
-		jQuery.each(args, function(key,val){
-			if (!jQuery.trim(val)) return;
-			q_list.push(decodeURIComponent(key)+'='+decodeURIComponent(val));
-		});
-
-		query_string = q_list.join('&');
-		uri = uri+(query_string?'?'+query_string:'');
-    } else {
-        if(val.toString().trim()) uri = uri+"?"+decodeURIComponent(key)+"="+decodeURIComponent(val);
-    }
-
-    var re = /https:\/\/([^:\/]+)(:\d+|)/i;
-    var check = re.exec(uri);
-    if(check)
-    {
-        var toReplace = "http://"+check[1];
-        if(typeof(http_port)!='undefined' && http_port != 80)
-        {
-            toReplace += ":" + http_port;
-        }
-        uri = uri.replace(re,toReplace);
-    }
-    var bUseSSL = false;
-    if(typeof(enforce_ssl)!='undefined' && enforce_ssl)
-    {
-        bUseSSL = true;
-    }
-    else if(typeof(ssl_actions)!='undefined' && typeof(ssl_actions.length)!='undefined' && uri.getQuery('act')) {
-        var act = uri.getQuery('act');
-        for(i=0;i<ssl_actions.length;i++) {
-            if(ssl_actions[i]==act) {
-                bUseSSL = true;
-                break;
-            }
-        }
-    }
-
-    if(bUseSSL)
-    {
-        var re = /http:\/\/([^:\/]+)(:\d+|)/i;
-        var check = re.exec(uri);
-        if(check)
-        {
-            var toReplace = "https://"+check[1];
-            if(typeof(https_port)!='undefined' && https_port != 443)
-            {
-                toReplace += ":" + https_port;
-            }
-            uri = uri.replace(re,toReplace);
-        }
-    }
-	
-    return encodeURI(uri);
-}
-
-/**
- * @brief string prototype으로 trim 함수 추가
- **/
-String.prototype.trim = function() {
-    return this.replace(/(^\s*)|(\s*$)/g, "");
-}
-
-/**
- * @brief xSleep(micro time)
- **/
-function xSleep(sec) {
-    sec = sec / 1000;
-    var now = new Date();
-    var sleep = new Date();
-    while( sleep.getTime() - now.getTime() < sec) {
-        sleep = new Date();
-    }
-}
-
-/**
- * @brief 주어진 인자가 하나라도 defined되어 있지 않으면 false return
- **/
-function isDef() {
-    for(var i=0; i < arguments.length; ++i) {
-        if(typeof(arguments[i]) == "undefined") return false;
-    }
-    return true;
-}
-
-/**
- * @brief 윈도우 오픈
- * 열려진 윈도우의 관리를 통해 window.focus()등을 FF에서도 비슷하게 구현함
- **/
-var winopen_list = new Array();
-function winopen(url, target, attribute) {
-    if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
-    try {
-        if(target != "_blank" && winopen_list[target]) {
-            winopen_list[target].close();
-            winopen_list[target] = null;
-        }
-    } catch(e) {
-    }
-
-    if(typeof(target) == 'undefined') target = '_blank';
-    if(typeof(attribute) == 'undefined') attribute = '';
-    var win = window.open(url, target, attribute);
-    win.focus();
-    if(target != "_blank") winopen_list[target] = win;
-}
-
-/**
- * @brief 팝업으로만 띄우기
- * common/tpl/popup_layout.html이 요청되는 XE내의 팝업일 경우에 사용
- **/
-function popopen(url, target) {
-    if(typeof(target) == "undefined") target = "_blank";
-    if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
-    winopen(url, target, "left=10,top=10,width=10,height=10,scrollbars=no,resizable=yes,toolbars=no");
-}
-
-/**
- * @brief 메일 보내기용
- **/
-function sendMailTo(to) {
-    location.href="mailto:"+to;
-}
-
-/**
- * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움)
- **/
-function move_url(url, open_wnidow) {
-    if(!url) return false;
-    if(typeof(open_wnidow) == 'undefined') open_wnidow = 'N';
-    if(open_wnidow=='N') {
-        open_wnidow = false;
-    } else {
-        open_wnidow = true;
-    }
-
-    if(/^\./.test(url)) url = request_uri+url;
-
-    if(open_wnidow) {
-        winopen(url);
-    } else {
-        location.href=url;
-    }
-
-    return false;
-}
-
-/**
- * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용)
- **/
-function displayMultimedia(src, width, height, options) {
-    var html = _displayMultimedia(src, width, height, options);
-    if(html) document.writeln(html);
-}
-function _displayMultimedia(src, width, height, options) {
-    if(src.indexOf('files') == 0) src = request_uri + src;
-
-    var defaults = {
-        wmode : 'transparent',
-        allowScriptAccess : 'sameDomain',
-        quality : 'high',
-        flashvars : '',
-        autostart : false
-    };
-
-    var params = jQuery.extend(defaults, options || {});
-	var autostart = (params.autostart && params.autostart != 'false') ? 'true' : 'false';
-	delete(params.autostart);
-
-    var clsid = "";
-    var codebase = "";
-    var html = "";
-
-    if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){
-        html = '<img src="'+src+'" width="'+width+'" height="'+height+'" />';
-    } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) {
-        html = '<embed src="'+request_uri+'common/tpl/images/flvplayer.swf" allowfullscreen="true" autostart="'+autostart+'" width="'+width+'" height="'+height+'" flashvars="&file='+src+'&width='+width+'&height='+height+'&autostart='+autostart+'" wmode="'+params.wmode+'" />';
-    } else if(/\.swf/i.test(src)) {
-        clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
-
-        if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
-        else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
-        html = '<object classid="'+clsid+'" codebase="'+codebase+'" width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'">';
-        html += '<param name="movie" value="'+src+'" />';
-        for(var name in params) {
-            if(params[name] != 'undefined' && params[name] != '') {
-                html += '<param name="'+name+'" value="'+params[name]+'" />';
-            }
-        }
-        html += ''
-            + '<embed src="'+src+'" autostart="'+autostart+'"  width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'" wmode="'+params.wmode+'"></embed>'
-            + '</object>';
-    }  else {
-		if (jQuery.browser.mozilla || jQuery.browser.opera) {
-			// firefox and opera uses 0 or 1 for autostart parameter.
-			autostart = (params.autostart && params.autostart != 'false') ? '1' : '0';
-		}
-
-        html = '<embed src="'+src+'" autostart="'+autostart+'" width="'+width+'" height="'+height+'"';
-        if(params.wmode == 'transparent') {
-            html += ' windowlessvideo="1"';
-        }
-        html += '></embed>';
-    }
-    return html;
-}
-
-/**
- * @brief 에디터에서 사용되는 내용 여닫는 코드 (고정, zbxe용)
- **/
-function zbxe_folder_open(id) {
-    jQuery("#folder_open_"+id).hide();
-    jQuery("#folder_close_"+id).show();
-    jQuery("#folder_"+id).show();
-}
-function zbxe_folder_close(id) {
-    jQuery("#folder_open_"+id).show();
-    jQuery("#folder_close_"+id).hide();
-    jQuery("#folder_"+id).hide();
-}
-
-/**
- * @brief 팝업의 경우 내용에 맞춰 현 윈도우의 크기를 조절해줌
- * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ
- * popup_layout 에서 window.onload 시 자동 요청됨.
- **/
-function setFixedPopupSize() {
-	var $ = jQuery;
-    var $header = $('#popHeader');
-    var $body   = $('#popBody');
-
-	if ($body.length) {
-		if ($body.height() > 400) {
-			$body.css({ overflow:'auto', overflowX:'hidden', height:400+'px' });
-		}
-	}
-
-	var $win = $(window);
-	var $pc  = $('#popup_content');
-	var w    = Math.max($pc[0].offsetWidth, 600);
-	var h    = $pc[0].offsetHeight;
-	var dw   = $win.width();
-	var dh   = $win.height();
-	var _w = 0, _h = 0;
-
-	if (w != dw) _w = w - dw;
-	if (h != dh) _h = h - dh;
-
-	if (_w || _h) {
-		window.resizeBy(_w, _h);
-	}
-
-	if (!arguments.callee.executed) {
-		setTimeout(setFixedPopupSize, 300);
-		arguments.callee.executed = true;
-	}
-}
-
-/**
- * @brief 추천/비추천,스크랩,신고기능등 특정 srl에 대한 특정 module/action을 호출하는 함수
- **/
-function doCallModuleAction(module, action, target_srl) {
-    var params = new Array();
-    params['target_srl'] = target_srl;
-    params['cur_mid'] = current_mid;
-    exec_xml(module, action, params, completeCallModuleAction);
-}
-
-function completeCallModuleAction(ret_obj, response_tags) {
-    if(ret_obj['message']!='success') alert(ret_obj['message']);
-    location.reload();
-}
-
-function completeMessage(ret_obj) {
-    alert(ret_obj['message']);
-    location.reload();
-}
-
-
-
-/* 언어코드 (lang_type) 쿠키값 변경 */
-function doChangeLangType(obj) {
-    if(typeof(obj) == "string") {
-        setLangType(obj);
-    } else {
-        var val = obj.options[obj.selectedIndex].value;
-        setLangType(val);
-    }
-	location.href = location.href.setQuery('l', '');
-}
-function setLangType(lang_type) {
-    var expire = new Date();
-    expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-    setCookie('lang_type', lang_type, expire, '/');
-}
-
-/* 미리보기 */
-function doDocumentPreview(obj) {
-    var fo_obj = obj;
-    while(fo_obj.nodeName != "FORM") {
-        fo_obj = fo_obj.parentNode;
-    }
-    if(fo_obj.nodeName != "FORM") return;
-    var editor_sequence = fo_obj.getAttribute('editor_sequence');
-
-    var content = editorGetContent(editor_sequence);
-
-    var win = window.open("", "previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");
-
-    var dummy_obj = jQuery("#previewDocument");
-
-    if(!dummy_obj.length) {
-        dummy_obj = jQuery(
-            '<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'">'+
-            '<input type="hidden" name="module" value="document" />'+
-            '<input type="hidden" name="act" value="dispDocumentPreview" />'+
-            '<input type="hidden" name="content" />'+
-            '</form>'
-        ).appendTo(document.body);
-    }
-
-	dummy_obj.find('input[name="content"]').val(content).end().submit();
-}
-
-/* 게시글 저장 */
-function doDocumentSave(obj) {
-    var editor_sequence = obj.form.getAttribute('editor_sequence');
-    var prev_content = editorRelKeys[editor_sequence]['content'].value;
-    if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') {
-        var content = editorGetContent(editor_sequence);
-        editorRelKeys[editor_sequence]['content'].value = content;
-    }
-
-	var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray();;
-	jQuery.each(data, function(i, field){
-		var val = jQuery.trim(field.value);
-		if(!val) return true;
-		if(/\[\]$/.test(field.name)) field.name = field.name.replace(/\[\]$/, '');
-		if(params[field.name]) params[field.name] += '|@|'+val;
-		else params[field.name] = field.value;
-	});
-
-	exec_xml('member','procMemberSaveDocument', params, completeDocumentSave, responses, params, obj.form);
-
-    editorRelKeys[editor_sequence]['content'].value = prev_content;
-    return false;
-}
-
-function completeDocumentSave(ret_obj) {
-    jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']);
-    alert(ret_obj['message']);
-}
-
-/* 저장된 게시글 불러오기 */
-var objForSavedDoc = null;
-function doDocumentLoad(obj) {
-    // 저장된 게시글 목록 불러오기
-    objForSavedDoc = obj.form;
-    popopen(request_uri.setQuery('module','member').setQuery('act','dispSavedDocumentList'));
-}
-
-/* 저장된 게시글의 선택 */
-function doDocumentSelect(document_srl) {
-    if(!opener || !opener.objForSavedDoc) {
-        window.close();
-        return;
-    }
-
-    // 게시글을 가져와서 등록하기
-    opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite');
-    window.close();
-}
-
-
-/* 스킨 정보 */
-function viewSkinInfo(module, skin) {
-    popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo');
-}
-
-
-/* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */
-var addedDocument = new Array();
-function doAddDocumentCart(obj) {
-    var srl = obj.value;
-    addedDocument[addedDocument.length] = srl;
-    setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100);
-}
-
-function callAddDocumentCart(document_length) {
-    if(addedDocument.length<1 || document_length != addedDocument.length) return;
-    var params = new Array();
-    params["srls"] = addedDocument.join(",");
-    exec_xml("document","procDocumentAddCart", params, null);
-    addedDocument = new Array();
-}
-
-/* ff의 rgb(a,b,c)를 #... 로 변경 */
-function transRGB2Hex(value) {
-    if(!value) return value;
-    if(value.indexOf('#') > -1) return value.replace(/^#/, '');
-
-    if(value.toLowerCase().indexOf('rgb') < 0) return value;
-    value = value.replace(/^rgb\(/i, '').replace(/\)$/, '');
-    value_list = value.split(',');
-
-    var hex = '';
-    for(var i = 0; i < value_list.length; i++) {
-        var color = parseInt(value_list[i], 10).toString(16);
-        if(color.length == 1) color = '0'+color;
-        hex += color;
-    }
-    return hex;
-}
-
-/* 보안 로그인 모드로 전환 */
-function toggleSecuritySignIn() {
-    var href = location.href;
-    if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http');
-    else location.href = href.replace(/^http/i,'https');
-}
-
-function reloadDocument() {
-    location.reload();
-}
-
-
-/**
-*
-* Base64 encode / decode
-* http://www.webtoolkit.info/
-*
-**/
-
-var Base64 = {
-
-    // private property
-    _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
-
-    // public method for encoding
-    encode : function (input) {
-        var output = "";
-        var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-        var i = 0;
-
-        input = Base64._utf8_encode(input);
-
-        while (i < input.length) {
-
-            chr1 = input.charCodeAt(i++);
-            chr2 = input.charCodeAt(i++);
-            chr3 = input.charCodeAt(i++);
-
-            enc1 = chr1 >> 2;
-            enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-            enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-            enc4 = chr3 & 63;
-
-            if (isNaN(chr2)) {
-                enc3 = enc4 = 64;
-            } else if (isNaN(chr3)) {
-                enc4 = 64;
-            }
-
-            output = output +
-            this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
-            this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
-
-        }
-
-        return output;
-    },
-
-    // public method for decoding
-    decode : function (input) {
-        var output = "";
-        var chr1, chr2, chr3;
-        var enc1, enc2, enc3, enc4;
-        var i = 0;
-
-        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-
-        while (i < input.length) {
-
-            enc1 = this._keyStr.indexOf(input.charAt(i++));
-            enc2 = this._keyStr.indexOf(input.charAt(i++));
-            enc3 = this._keyStr.indexOf(input.charAt(i++));
-            enc4 = this._keyStr.indexOf(input.charAt(i++));
-
-            chr1 = (enc1 << 2) | (enc2 >> 4);
-            chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-            chr3 = ((enc3 & 3) << 6) | enc4;
-
-            output = output + String.fromCharCode(chr1);
-
-            if (enc3 != 64) {
-                output = output + String.fromCharCode(chr2);
-            }
-            if (enc4 != 64) {
-                output = output + String.fromCharCode(chr3);
-            }
-
-        }
-
-        output = Base64._utf8_decode(output);
-
-        return output;
-
-    },
-
-    // private method for UTF-8 encoding
-    _utf8_encode : function (string) {
-        string = string.replace(/\r\n/g,"\n");
-        var utftext = "";
-
-        for (var n = 0; n < string.length; n++) {
-
-            var c = string.charCodeAt(n);
-
-            if (c < 128) {
-                utftext += String.fromCharCode(c);
-            }
-            else if((c > 127) && (c < 2048)) {
-                utftext += String.fromCharCode((c >> 6) | 192);
-                utftext += String.fromCharCode((c & 63) | 128);
-            }
-            else {
-                utftext += String.fromCharCode((c >> 12) | 224);
-                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-                utftext += String.fromCharCode((c & 63) | 128);
-            }
-
-        }
-
-        return utftext;
-    },
-
-    // private method for UTF-8 decoding
-    _utf8_decode : function (utftext) {
-        var string = "";
-        var i = 0;
-        var c = c1 = c2 = 0;
-
-        while ( i < utftext.length ) {
-
-            c = utftext.charCodeAt(i);
-
-            if (c < 128) {
-                string += String.fromCharCode(c);
-                i++;
-            }
-            else if((c > 191) && (c < 224)) {
-                c2 = utftext.charCodeAt(i+1);
-                string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
-                i += 2;
-            }
-            else {
-                c2 = utftext.charCodeAt(i+1);
-                c3 = utftext.charCodeAt(i+2);
-                string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
-                i += 3;
-            }
-
-        }
-
-        return string;
-    }
-
-}
-
-
-
-
-
-
-/* ----------------------------------------------
- * DEPRECATED
- * 하위호환용으로 남겨 놓음
- * ------------------------------------------- */
-
-if(typeof(resizeImageContents) == 'undefined') {
-    function resizeImageContents() {}
-}
-
-if(typeof(activateOptionDisabled) == 'undefined') {
-    function activateOptionDisabled() {}
-}
-
-objectExtend = jQuery.extend;
-
-/**
- * @brief 특정 Element의 display 옵션 토글
- **/
-function toggleDisplay(objId) {
-    jQuery('#'+objId).toggle();
-}
-
-/* 체크박스 선택 */
-function checkboxSelectAll(formObj, name, checked) {
-    var itemName = name;
-    var option = {};
-    if(typeof(formObj) != "undefined") option.wrap = formObj;
-    if(typeof(checked) != "undefined") option.checked = checked;
-
-    XE.checkboxToggleAll(itemName, option);
-}
-
-/* 체크박스를 실행 */
-function clickCheckBoxAll(formObj, name) {
-    var itemName = name;
-    var option = { doClick:true };
-    if(typeof(formObj) != "undefined") option.wrap = formObj;
-
-    XE.checkboxToggleAll(itemName, option);
-}
-
-/**
- * @brief 에디터에서 사용하되 내용 여닫는 코드 (zb5beta beta 호환용으로 남겨 놓음)
- **/
-function svc_folder_open(id) {
-    jQuery("#_folder_open_"+id).hide();
-    jQuery("#_folder_close_"+id).show();
-    jQuery("#_folder_"+id).show();
-}
-function svc_folder_close(id) {
-    jQuery("#_folder_open_"+id).show();
-    jQuery("#_folder_close_"+id).hide();
-    jQuery("#_folder_"+id).hide();
-}
-
-/**
- * @brief 날짜 선택 (달력 열기)
- **/
-function open_calendar(fo_id, day_str, callback_func) {
-    if(typeof(day_str)=="undefined") day_str = "";
-
-    var url = "./common/tpl/calendar.php?";
-    if(fo_id) url+="fo_id="+fo_id;
-    if(day_str) url+="&day_str="+day_str;
-    if(callback_func) url+="&callback_func="+callback_func;
-
-    popopen(url, 'Calendar');
-}
-
-var loaded_popup_menus = XE.loaded_popup_menus;
-function createPopupMenu() {}
-function chkPopupMenu() {}
-function displayPopupMenu(ret_obj, response_tags, params) {
-    XE.displayPopupMenu(ret_obj, response_tags, params);
-}
-
-function GetObjLeft(obj) {
-    return jQuery(obj).offset().left;
-}
-function GetObjTop(obj) {
-    return jQuery(obj).offset().top;
-}
-
-function replaceOuterHTML(obj, html) {
-    jQuery(obj).replaceWith(html);
-}
-
-function getOuterHTML(obj) {
-    return jQuery(obj).html().trim();
-}
-
-function setCookie(name, value, expire, path) {
-	var s_cookie = name + "=" + escape(value) +
-		((!expire) ? "" : ("; expires=" + expire.toGMTString())) +
-		"; path=" + ((!path) ? "/" : path);
-
-	document.cookie = s_cookie;
-}
-
-jQuery(function(){
-    jQuery(".lang_code").each(
-    function() 
-    {
-        var objText = jQuery(this);
-        var targetName = objText.attr("id");
-		if(typeof(targetName) == "undefined") targetName = objText.attr("name");
-		if(typeof(targetName) == "undefined") return;
-        objText.after("<a href='"+request_uri.setQuery('module','module').setQuery('act','dispModuleAdminLangcode').setQuery('target',targetName)+"' class='buttonSet buttonSetting' onclick='popopen(this.href);return false;'><span>find_langcode</span></a>"); 
-    }
-    );
-});
diff --git a/common/js/src/iepngfix_tilebg.js b/common/js/src/iepngfix_tilebg.js
deleted file mode 100644
index 1a5863011..000000000
--- a/common/js/src/iepngfix_tilebg.js
+++ /dev/null
@@ -1,173 +0,0 @@
-// IE5.5+ PNG Alpha Fix v2.0 Alpha: Background Tiling Support
-// (c) 2008 Angus Turnbull http://www.twinhelix.com
-
-// This is licensed under the GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-
-var IEPNGFix = window.IEPNGFix || {};
-
-IEPNGFix.tileBG = function(elm, pngSrc, ready) {
-	// Params: A reference to a DOM element, the PNG src file pathname, and a
-	// hidden "ready-to-run" passed when called back after image preloading.
-
-	var data = this.data[elm.uniqueID],
-		elmW = Math.max(elm.clientWidth, elm.scrollWidth),
-		elmH = Math.max(elm.clientHeight, elm.scrollHeight),
-		bgX = elm.currentStyle.backgroundPositionX,
-		bgY = elm.currentStyle.backgroundPositionY,
-		bgR = elm.currentStyle.backgroundRepeat;
-
-	// Cache of DIVs created per element, and image preloader/data.
-	if (!data.tiles) {
-		data.tiles = {
-			elm: elm,
-			src: '',
-			cache: [],
-			img: new Image(),
-			old: {}
-		};
-	}
-	var tiles = data.tiles,
-		pngW = tiles.img.width,
-		pngH = tiles.img.height;
-
-	if (pngSrc) {
-		if (!ready && pngSrc != tiles.src) {
-			// New image? Preload it with a callback to detect dimensions.
-			tiles.img.onload = function() {
-				this.onload = null;
-				IEPNGFix.tileBG(elm, pngSrc, 1);
-			};
-			return tiles.img.src = pngSrc;
-		}
-	} else {
-		// No image?
-		if (tiles.src) ready = 1;
-		pngW = pngH = 0;
-	}
-	tiles.src = pngSrc;
-
-	if (!ready && elmW == tiles.old.w && elmH == tiles.old.h &&
-		bgX == tiles.old.x && bgY == tiles.old.y && bgR == tiles.old.r) {
-		return;
-	}
-
-	// Convert English and percentage positions to pixels.
-	var pos = {
-			top: '0%',
-			left: '0%',
-			center: '50%',
-			bottom: '100%',
-			right: '100%'
-		},
-		x,
-		y,
-		pc;
-	x = pos[bgX] || bgX;
-	y = pos[bgY] || bgY;
-	if (pc = x.match(/(\d+)%/)) {
-		x = Math.round((elmW - pngW) * (parseInt(pc[1]) / 100));
-	}
-	if (pc = y.match(/(\d+)%/)) {
-		y = Math.round((elmH - pngH) * (parseInt(pc[1]) / 100));
-	}
-	x = parseInt(x);
-	y = parseInt(y);
-
-	// Handle backgroundRepeat.
-	var repeatX = { 'repeat': 1, 'repeat-x': 1 }[bgR],
-		repeatY = { 'repeat': 1, 'repeat-y': 1 }[bgR];
-	if (repeatX) {
-		x %= pngW;
-		if (x > 0) x -= pngW;
-	}
-	if (repeatY) {
-		y %= pngH;
-		if (y > 0) y -= pngH;
-	}
-
-	// Go!
-	this.hook.enabled = 0;
-	if (!({ relative: 1, absolute: 1 }[elm.currentStyle.position])) {
-		elm.style.position = 'relative';
-	}
-	var count = 0,
-		xPos,
-		maxX = repeatX ? elmW : x + 0.1,
-		yPos,
-		maxY = repeatY ? elmH : y + 0.1,
-		d,
-		s,
-		isNew;
-	if (pngW && pngH) {
-		for (xPos = x; xPos < maxX; xPos += pngW) {
-			for (yPos = y; yPos < maxY; yPos += pngH) {
-				isNew = 0;
-				if (!tiles.cache[count]) {
-					tiles.cache[count] = document.createElement('div');
-					isNew = 1;
-				}
-				var clipR = (xPos + pngW > elmW ? elmW - xPos : pngW),
-					clipB = (yPos + pngH > elmH ? elmH - yPos : pngH);
-				d = tiles.cache[count];
-				s = d.style;
-				s.behavior = 'none';
-				s.left = xPos + 'px';
-				s.top = yPos + 'px';
-				s.width = clipR + 'px';
-				s.height = clipB + 'px';
-				s.clip = 'rect(' +
-					(yPos < 0 ? 0 - yPos : 0) + 'px,' +
-					clipR + 'px,' +
-					clipB + 'px,' +
-					(xPos < 0 ? 0 - xPos : 0) + 'px)';
-				s.display = 'block';
-				if (isNew) {
-					s.position = 'absolute';
-					s.zIndex = -999;
-					if (elm.firstChild) {
-						elm.insertBefore(d, elm.firstChild);
-					} else {
-						elm.appendChild(d);
-					}
-				}
-				this.fix(d, pngSrc, 0);
-				count++;
-			}
-		}
-	}
-	while (count < tiles.cache.length) {
-		this.fix(tiles.cache[count], '', 0);
-		tiles.cache[count++].style.display = 'none';
-	}
-
-	this.hook.enabled = 1;
-
-	// Cache so updates are infrequent.
-	tiles.old = {
-		w: elmW,
-		h: elmH,
-		x: bgX,
-		y: bgY,
-		r: bgR
-	};
-};
-
-
-IEPNGFix.update = function() {
-	// Update all PNG backgrounds.
-	for (var i in IEPNGFix.data) {
-		var t = IEPNGFix.data[i].tiles;
-		if (t && t.elm && t.src) {
-			IEPNGFix.tileBG(t.elm, t.src);
-		}
-	}
-};
-IEPNGFix.update.timer = 0;
-
-if (window.attachEvent && !window.opera) {
-	window.attachEvent('onresize', function() {
-		clearTimeout(IEPNGFix.update.timer);
-		IEPNGFix.update.timer = setTimeout(IEPNGFix.update, 100);
-	});
-}
diff --git a/common/js/src/jquery.js b/common/js/src/jquery.js
deleted file mode 100644
index 2ddcf9936..000000000
--- a/common/js/src/jquery.js
+++ /dev/null
@@ -1,7179 +0,0 @@
-/*!
- * jQuery JavaScript Library v1.4.4
- * http://jquery.com/
- *
- * Copyright 2010, John Resig
- * Dual licensed under the MIT or GPL Version 2 licenses.
- * http://jquery.org/license
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- * Copyright 2010, The Dojo Foundation
- * Released under the MIT, BSD, and GPL Licenses.
- *
- * Date: Thu Nov 11 19:04:53 2010 -0500
- */
-(function( window, undefined ) {
-
-// Use the correct document accordingly with window argument (sandbox)
-var document = window.document;
-var jQuery = (function() {
-
-// Define a local copy of jQuery
-var jQuery = function( selector, context ) {
-		// The jQuery object is actually just the init constructor 'enhanced'
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$,
-
-	// A central reference to the root jQuery(document)
-	rootjQuery,
-
-	// A simple way to check for HTML strings or ID strings
-	// (both of which we optimize for)
-	quickExpr = /^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,
-
-	// Is it a simple selector
-	isSimple = /^.[^:#\[\.,]*$/,
-
-	// Check if a string has a non-whitespace character in it
-	rnotwhite = /\S/,
-	rwhite = /\s/,
-
-	// Used for trimming whitespace
-	trimLeft = /^\s+/,
-	trimRight = /\s+$/,
-
-	// Check for non-word characters
-	rnonword = /\W/,
-
-	// Check for digits
-	rdigit = /\d/,
-
-	// Match a standalone tag
-	rsingleTag = /^<(\w+)\s*\/?>(?:<\/\1>)?$/,
-
-	// JSON RegExp
-	rvalidchars = /^[\],:{}\s]*$/,
-	rvalidescape = /\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,
-	rvalidtokens = /"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
-	rvalidbraces = /(?:^|:|,)(?:\s*\[)+/g,
-
-	// Useragent RegExp
-	rwebkit = /(webkit)[ \/]([\w.]+)/,
-	ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/,
-	rmsie = /(msie) ([\w.]+)/,
-	rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/,
-
-	// Keep a UserAgent string for use with jQuery.browser
-	userAgent = navigator.userAgent,
-
-	// For matching the engine and version of the browser
-	browserMatch,
-	
-	// Has the ready events already been bound?
-	readyBound = false,
-	
-	// The functions to execute on DOM ready
-	readyList = [],
-
-	// The ready event handler
-	DOMContentLoaded,
-
-	// Save a reference to some core methods
-	toString = Object.prototype.toString,
-	hasOwn = Object.prototype.hasOwnProperty,
-	push = Array.prototype.push,
-	slice = Array.prototype.slice,
-	trim = String.prototype.trim,
-	indexOf = Array.prototype.indexOf,
-	
-	// [[Class]] -> type pairs
-	class2type = {};
-
-jQuery.fn = jQuery.prototype = {
-	init: function( selector, context ) {
-		var match, elem, ret, doc;
-
-		// Handle $(""), $(null), or $(undefined)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Handle $(DOMElement)
-		if ( selector.nodeType ) {
-			this.context = this[0] = selector;
-			this.length = 1;
-			return this;
-		}
-		
-		// The body element only exists once, optimize finding it
-		if ( selector === "body" && !context && document.body ) {
-			this.context = document;
-			this[0] = document.body;
-			this.selector = "body";
-			this.length = 1;
-			return this;
-		}
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			// Are we dealing with HTML string or an ID?
-			match = quickExpr.exec( selector );
-
-			// Verify a match, and that no context was specified for #id
-			if ( match && (match[1] || !context) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[1] ) {
-					doc = (context ? context.ownerDocument || context : document);
-
-					// If a single string is passed in and it's a single tag
-					// just do a createElement and skip the rest
-					ret = rsingleTag.exec( selector );
-
-					if ( ret ) {
-						if ( jQuery.isPlainObject( context ) ) {
-							selector = [ document.createElement( ret[1] ) ];
-							jQuery.fn.attr.call( selector, context, true );
-
-						} else {
-							selector = [ doc.createElement( ret[1] ) ];
-						}
-
-					} else {
-						ret = jQuery.buildFragment( [ match[1] ], [ doc ] );
-						selector = (ret.cacheable ? ret.fragment.cloneNode(true) : ret.fragment).childNodes;
-					}
-					
-					return jQuery.merge( this, selector );
-					
-				// HANDLE: $("#id")
-				} else {
-					elem = document.getElementById( match[2] );
-
-					// Check parentNode to catch when Blackberry 4.6 returns
-					// nodes that are no longer in the document #6963
-					if ( elem && elem.parentNode ) {
-						// Handle the case where IE and Opera return items
-						// by name instead of ID
-						if ( elem.id !== match[2] ) {
-							return rootjQuery.find( selector );
-						}
-
-						// Otherwise, we inject the element directly into the jQuery object
-						this.length = 1;
-						this[0] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $("TAG")
-			} else if ( !context && !rnonword.test( selector ) ) {
-				this.selector = selector;
-				this.context = document;
-				selector = document.getElementsByTagName( selector );
-				return jQuery.merge( this, selector );
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return (context || rootjQuery).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return jQuery( context ).find( selector );
-			}
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return rootjQuery.ready( selector );
-		}
-
-		if (selector.selector !== undefined) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	},
-
-	// Start with an empty selector
-	selector: "",
-
-	// The current version of jQuery being used
-	jquery: "1.4.4",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	// The number of elements contained in the matched element set
-	size: function() {
-		return this.length;
-	},
-
-	toArray: function() {
-		return slice.call( this, 0 );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num == null ?
-
-			// Return a 'clean' array
-			this.toArray() :
-
-			// Return just the object
-			( num < 0 ? this.slice(num)[ 0 ] : this[ num ] );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems, name, selector ) {
-		// Build a new jQuery matched element set
-		var ret = jQuery();
-
-		if ( jQuery.isArray( elems ) ) {
-			push.apply( ret, elems );
-		
-		} else {
-			jQuery.merge( ret, elems );
-		}
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-
-		ret.context = this.context;
-
-		if ( name === "find" ) {
-			ret.selector = this.selector + (this.selector ? " " : "") + selector;
-		} else if ( name ) {
-			ret.selector = this.selector + "." + name + "(" + selector + ")";
-		}
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	// (You can seed the arguments with an array of args, but this is
-	// only used internally.)
-	each: function( callback, args ) {
-		return jQuery.each( this, callback, args );
-	},
-	
-	ready: function( fn ) {
-		// Attach the listeners
-		jQuery.bindReady();
-
-		// If the DOM is already ready
-		if ( jQuery.isReady ) {
-			// Execute the function immediately
-			fn.call( document, jQuery );
-
-		// Otherwise, remember the function for later
-		} else if ( readyList ) {
-			// Add the function to the wait list
-			readyList.push( fn );
-		}
-
-		return this;
-	},
-	
-	eq: function( i ) {
-		return i === -1 ?
-			this.slice( i ) :
-			this.slice( i, +i + 1 );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ),
-			"slice", slice.call(arguments).join(",") );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map(this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		}));
-	},
-	
-	end: function() {
-		return this.prevObject || jQuery(null);
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: [].sort,
-	splice: [].splice
-};
-
-// Give the init function the jQuery prototype for later instantiation
-jQuery.fn.init.prototype = jQuery.fn;
-
-jQuery.extend = jQuery.fn.extend = function() {
-	 var options, name, src, copy, copyIsArray, clone,
-		target = arguments[0] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-		target = arguments[1] || {};
-		// skip the boolean and the target
-		i = 2;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction(target) ) {
-		target = {};
-	}
-
-	// extend jQuery itself if only one argument is passed
-	if ( length === i ) {
-		target = this;
-		--i;
-	}
-
-	for ( ; i < length; i++ ) {
-		// Only deal with non-null/undefined values
-		if ( (options = arguments[ i ]) != null ) {
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject(copy) || (copyIsArray = jQuery.isArray(copy)) ) ) {
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray(src) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject(src) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend({
-	noConflict: function( deep ) {
-		window.$ = _$;
-
-		if ( deep ) {
-			window.jQuery = _jQuery;
-		}
-
-		return jQuery;
-	},
-	
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-	
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-		// A third-party is pushing the ready event forwards
-		if ( wait === true ) {
-			jQuery.readyWait--;
-		}
-
-		// Make sure that the DOM is not already loaded
-		if ( !jQuery.readyWait || (wait !== true && !jQuery.isReady) ) {
-			// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-			if ( !document.body ) {
-				return setTimeout( jQuery.ready, 1 );
-			}
-
-			// Remember that the DOM is ready
-			jQuery.isReady = true;
-
-			// If a normal DOM Ready event fired, decrement, and wait if need be
-			if ( wait !== true && --jQuery.readyWait > 0 ) {
-				return;
-			}
-
-			// If there are functions bound, to execute
-			if ( readyList ) {
-				// Execute all of them
-				var fn,
-					i = 0,
-					ready = readyList;
-
-				// Reset the list of functions
-				readyList = null;
-
-				while ( (fn = ready[ i++ ]) ) {
-					fn.call( document, jQuery );
-				}
-
-				// Trigger any bound ready events
-				if ( jQuery.fn.trigger ) {
-					jQuery( document ).trigger( "ready" ).unbind( "ready" );
-				}
-			}
-		}
-	},
-	
-	bindReady: function() {
-		if ( readyBound ) {
-			return;
-		}
-
-		readyBound = true;
-
-		// Catch cases where $(document).ready() is called after the
-		// browser event has already occurred.
-		if ( document.readyState === "complete" ) {
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			return setTimeout( jQuery.ready, 1 );
-		}
-
-		// Mozilla, Opera and webkit nightlies currently support this event
-		if ( document.addEventListener ) {
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-			
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", jQuery.ready, false );
-
-		// If IE event model is used
-		} else if ( document.attachEvent ) {
-			// ensure firing before onload,
-			// maybe late but safe also for iframes
-			document.attachEvent("onreadystatechange", DOMContentLoaded);
-			
-			// A fallback to window.onload, that will always work
-			window.attachEvent( "onload", jQuery.ready );
-
-			// If IE and not a frame
-			// continually check to see if the document is ready
-			var toplevel = false;
-
-			try {
-				toplevel = window.frameElement == null;
-			} catch(e) {}
-
-			if ( document.documentElement.doScroll && toplevel ) {
-				doScrollCheck();
-			}
-		}
-	},
-
-	// See test/unit/core.js for details concerning isFunction.
-	// Since version 1.3, DOM methods and functions like alert
-	// aren't supported. They return false on IE (#2968).
-	isFunction: function( obj ) {
-		return jQuery.type(obj) === "function";
-	},
-
-	isArray: Array.isArray || function( obj ) {
-		return jQuery.type(obj) === "array";
-	},
-
-	// A crude way of determining if an object is a window
-	isWindow: function( obj ) {
-		return obj && typeof obj === "object" && "setInterval" in obj;
-	},
-
-	isNaN: function( obj ) {
-		return obj == null || !rdigit.test( obj ) || isNaN( obj );
-	},
-
-	type: function( obj ) {
-		return obj == null ?
-			String( obj ) :
-			class2type[ toString.call(obj) ] || "object";
-	},
-
-	isPlainObject: function( obj ) {
-		// Must be an Object.
-		// Because of IE, we also have to check the presence of the constructor property.
-		// Make sure that DOM nodes and window objects don't pass through, as well
-		if ( !obj || jQuery.type(obj) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-		
-		// Not own constructor property must be Object
-		if ( obj.constructor &&
-			!hasOwn.call(obj, "constructor") &&
-			!hasOwn.call(obj.constructor.prototype, "isPrototypeOf") ) {
-			return false;
-		}
-		
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own.
-	
-		var key;
-		for ( key in obj ) {}
-		
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		for ( var name in obj ) {
-			return false;
-		}
-		return true;
-	},
-	
-	error: function( msg ) {
-		throw msg;
-	},
-	
-	parseJSON: function( data ) {
-		if ( typeof data !== "string" || !data ) {
-			return null;
-		}
-
-		// Make sure leading/trailing whitespace is removed (IE can't handle it)
-		data = jQuery.trim( data );
-		
-		// Make sure the incoming data is actual JSON
-		// Logic borrowed from http://json.org/json2.js
-		if ( rvalidchars.test(data.replace(rvalidescape, "@")
-			.replace(rvalidtokens, "]")
-			.replace(rvalidbraces, "")) ) {
-
-			// Try to use the native JSON parser first
-			return window.JSON && window.JSON.parse ?
-				window.JSON.parse( data ) :
-				(new Function("return " + data))();
-
-		} else {
-			jQuery.error( "Invalid JSON: " + data );
-		}
-	},
-
-	noop: function() {},
-
-	// Evalulates a script in a global context
-	globalEval: function( data ) {
-		if ( data && rnotwhite.test(data) ) {
-			// Inspired by code by Andrea Giammarchi
-			// http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html
-			var head = document.getElementsByTagName("head")[0] || document.documentElement,
-				script = document.createElement("script");
-
-			script.type = "text/javascript";
-
-			if ( jQuery.support.scriptEval ) {
-				script.appendChild( document.createTextNode( data ) );
-			} else {
-				script.text = data;
-			}
-
-			// Use insertBefore instead of appendChild to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709).
-			head.insertBefore( script, head.firstChild );
-			head.removeChild( script );
-		}
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toUpperCase() === name.toUpperCase();
-	},
-
-	// args is for internal usage only
-	each: function( object, callback, args ) {
-		var name, i = 0,
-			length = object.length,
-			isObj = length === undefined || jQuery.isFunction(object);
-
-		if ( args ) {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.apply( object[ name ], args ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( ; i < length; ) {
-					if ( callback.apply( object[ i++ ], args ) === false ) {
-						break;
-					}
-				}
-			}
-
-		// A special, fast, case for the most common use of each
-		} else {
-			if ( isObj ) {
-				for ( name in object ) {
-					if ( callback.call( object[ name ], name, object[ name ] ) === false ) {
-						break;
-					}
-				}
-			} else {
-				for ( var value = object[0];
-					i < length && callback.call( value, i, value ) !== false; value = object[++i] ) {}
-			}
-		}
-
-		return object;
-	},
-
-	// Use native String.trim function wherever possible
-	trim: trim ?
-		function( text ) {
-			return text == null ?
-				"" :
-				trim.call( text );
-		} :
-
-		// Otherwise use our own trimming functionality
-		function( text ) {
-			return text == null ?
-				"" :
-				text.toString().replace( trimLeft, "" ).replace( trimRight, "" );
-		},
-
-	// results is for internal usage only
-	makeArray: function( array, results ) {
-		var ret = results || [];
-
-		if ( array != null ) {
-			// The window, strings (and functions) also have 'length'
-			// The extra typeof function check is to prevent crashes
-			// in Safari 2 (See: #3039)
-			// Tweaked logic slightly to handle Blackberry 4.7 RegExp issues #6930
-			var type = jQuery.type(array);
-
-			if ( array.length == null || type === "string" || type === "function" || type === "regexp" || jQuery.isWindow( array ) ) {
-				push.call( ret, array );
-			} else {
-				jQuery.merge( ret, array );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, array ) {
-		if ( array.indexOf ) {
-			return array.indexOf( elem );
-		}
-
-		for ( var i = 0, length = array.length; i < length; i++ ) {
-			if ( array[ i ] === elem ) {
-				return i;
-			}
-		}
-
-		return -1;
-	},
-
-	merge: function( first, second ) {
-		var i = first.length,
-			j = 0;
-
-		if ( typeof second.length === "number" ) {
-			for ( var l = second.length; j < l; j++ ) {
-				first[ i++ ] = second[ j ];
-			}
-		
-		} else {
-			while ( second[j] !== undefined ) {
-				first[ i++ ] = second[ j++ ];
-			}
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, inv ) {
-		var ret = [], retVal;
-		inv = !!inv;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			retVal = !!callback( elems[ i ], i );
-			if ( inv !== retVal ) {
-				ret.push( elems[ i ] );
-			}
-		}
-
-		return ret;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var ret = [], value;
-
-		// Go through the array, translating each of the items to their
-		// new value (or values).
-		for ( var i = 0, length = elems.length; i < length; i++ ) {
-			value = callback( elems[ i ], i, arg );
-
-			if ( value != null ) {
-				ret[ ret.length ] = value;
-			}
-		}
-
-		return ret.concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	proxy: function( fn, proxy, thisObject ) {
-		if ( arguments.length === 2 ) {
-			if ( typeof proxy === "string" ) {
-				thisObject = fn;
-				fn = thisObject[ proxy ];
-				proxy = undefined;
-
-			} else if ( proxy && !jQuery.isFunction( proxy ) ) {
-				thisObject = proxy;
-				proxy = undefined;
-			}
-		}
-
-		if ( !proxy && fn ) {
-			proxy = function() {
-				return fn.apply( thisObject || this, arguments );
-			};
-		}
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		if ( fn ) {
-			proxy.guid = fn.guid = fn.guid || proxy.guid || jQuery.guid++;
-		}
-
-		// So proxy can be declared as an argument
-		return proxy;
-	},
-
-	// Mutifunctional method to get and set values to a collection
-	// The value/s can be optionally by executed if its a function
-	access: function( elems, key, value, exec, fn, pass ) {
-		var length = elems.length;
-	
-		// Setting many attributes
-		if ( typeof key === "object" ) {
-			for ( var k in key ) {
-				jQuery.access( elems, k, key[k], exec, fn, value );
-			}
-			return elems;
-		}
-	
-		// Setting one attribute
-		if ( value !== undefined ) {
-			// Optionally, function values get executed if exec is true
-			exec = !pass && exec && jQuery.isFunction(value);
-		
-			for ( var i = 0; i < length; i++ ) {
-				fn( elems[i], key, exec ? value.call( elems[i], i, fn( elems[i], key ) ) : value, pass );
-			}
-		
-			return elems;
-		}
-	
-		// Getting an attribute
-		return length ? fn( elems[0], key ) : undefined;
-	},
-
-	now: function() {
-		return (new Date()).getTime();
-	},
-
-	// Use of jQuery.browser is frowned upon.
-	// More details: http://docs.jquery.com/Utilities/jQuery.browser
-	uaMatch: function( ua ) {
-		ua = ua.toLowerCase();
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	},
-
-	browser: {}
-});
-
-// Populate the class2type map
-jQuery.each("Boolean Number String Function Array Date RegExp Object".split(" "), function(i, name) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-});
-
-browserMatch = jQuery.uaMatch( userAgent );
-if ( browserMatch.browser ) {
-	jQuery.browser[ browserMatch.browser ] = true;
-	jQuery.browser.version = browserMatch.version;
-}
-
-// Deprecated, use jQuery.browser.webkit instead
-if ( jQuery.browser.webkit ) {
-	jQuery.browser.safari = true;
-}
-
-if ( indexOf ) {
-	jQuery.inArray = function( elem, array ) {
-		return indexOf.call( array, elem );
-	};
-}
-
-// Verify that \s matches non-breaking spaces
-// (IE fails on this test)
-if ( !rwhite.test( "\xA0" ) ) {
-	trimLeft = /^[\s\xA0]+/;
-	trimRight = /[\s\xA0]+$/;
-}
-
-// All jQuery objects should point back to these
-rootjQuery = jQuery(document);
-
-// Cleanup functions for the document ready method
-if ( document.addEventListener ) {
-	DOMContentLoaded = function() {
-		document.removeEventListener( "DOMContentLoaded", DOMContentLoaded, false );
-		jQuery.ready();
-	};
-
-} else if ( document.attachEvent ) {
-	DOMContentLoaded = function() {
-		// Make sure body exists, at least, in case IE gets a little overzealous (ticket #5443).
-		if ( document.readyState === "complete" ) {
-			document.detachEvent( "onreadystatechange", DOMContentLoaded );
-			jQuery.ready();
-		}
-	};
-}
-
-// The DOM ready check for Internet Explorer
-function doScrollCheck() {
-	if ( jQuery.isReady ) {
-		return;
-	}
-
-	try {
-		// If IE is used, use the trick by Diego Perini
-		// http://javascript.nwbox.com/IEContentLoaded/
-		document.documentElement.doScroll("left");
-	} catch(e) {
-		setTimeout( doScrollCheck, 1 );
-		return;
-	}
-
-	// and execute any waiting functions
-	jQuery.ready();
-}
-
-// Expose jQuery to the global object
-return (window.jQuery = window.$ = jQuery);
-
-})();
-
-
-(function() {
-
-	jQuery.support = {};
-
-	var root = document.documentElement,
-		script = document.createElement("script"),
-		div = document.createElement("div"),
-		id = "script" + jQuery.now();
-
-	div.style.display = "none";
-	div.innerHTML = "   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";
-
-	var all = div.getElementsByTagName("*"),
-		a = div.getElementsByTagName("a")[0],
-		select = document.createElement("select"),
-		opt = select.appendChild( document.createElement("option") );
-
-	// Can't get basic test support
-	if ( !all || !all.length || !a ) {
-		return;
-	}
-
-	jQuery.support = {
-		// IE strips leading whitespace when .innerHTML is used
-		leadingWhitespace: div.firstChild.nodeType === 3,
-
-		// Make sure that tbody elements aren't automatically inserted
-		// IE will insert them into empty tables
-		tbody: !div.getElementsByTagName("tbody").length,
-
-		// Make sure that link elements get serialized correctly by innerHTML
-		// This requires a wrapper element in IE
-		htmlSerialize: !!div.getElementsByTagName("link").length,
-
-		// Get the style information from getAttribute
-		// (IE uses .cssText insted)
-		style: /red/.test( a.getAttribute("style") ),
-
-		// Make sure that URLs aren't manipulated
-		// (IE normalizes it by default)
-		hrefNormalized: a.getAttribute("href") === "/a",
-
-		// Make sure that element opacity exists
-		// (IE uses filter instead)
-		// Use a regex to work around a WebKit issue. See #5145
-		opacity: /^0.55$/.test( a.style.opacity ),
-
-		// Verify style float existence
-		// (IE uses styleFloat instead of cssFloat)
-		cssFloat: !!a.style.cssFloat,
-
-		// Make sure that if no value is specified for a checkbox
-		// that it defaults to "on".
-		// (WebKit defaults to "" instead)
-		checkOn: div.getElementsByTagName("input")[0].value === "on",
-
-		// Make sure that a selected-by-default option has a working selected property.
-		// (WebKit defaults to false instead of true, IE too, if it's in an optgroup)
-		optSelected: opt.selected,
-
-		// Will be defined later
-		deleteExpando: true,
-		optDisabled: false,
-		checkClone: false,
-		scriptEval: false,
-		noCloneEvent: true,
-		boxModel: null,
-		inlineBlockNeedsLayout: false,
-		shrinkWrapBlocks: false,
-		reliableHiddenOffsets: true
-	};
-
-	// Make sure that the options inside disabled selects aren't marked as disabled
-	// (WebKit marks them as diabled)
-	select.disabled = true;
-	jQuery.support.optDisabled = !opt.disabled;
-
-	script.type = "text/javascript";
-	try {
-		script.appendChild( document.createTextNode( "window." + id + "=1;" ) );
-	} catch(e) {}
-
-	root.insertBefore( script, root.firstChild );
-
-	// Make sure that the execution of code works by injecting a script
-	// tag with appendChild/createTextNode
-	// (IE doesn't support this, fails, and uses .text instead)
-	if ( window[ id ] ) {
-		jQuery.support.scriptEval = true;
-		delete window[ id ];
-	}
-
-	// Test to see if it's possible to delete an expando from an element
-	// Fails in Internet Explorer
-	try {
-		delete script.test;
-
-	} catch(e) {
-		jQuery.support.deleteExpando = false;
-	}
-
-	root.removeChild( script );
-
-	if ( div.attachEvent && div.fireEvent ) {
-		div.attachEvent("onclick", function click() {
-			// Cloning a node shouldn't copy over any
-			// bound event handlers (IE does this)
-			jQuery.support.noCloneEvent = false;
-			div.detachEvent("onclick", click);
-		});
-		div.cloneNode(true).fireEvent("onclick");
-	}
-
-	div = document.createElement("div");
-	div.innerHTML = "<input type='radio' name='radiotest' checked='checked'/>";
-
-	var fragment = document.createDocumentFragment();
-	fragment.appendChild( div.firstChild );
-
-	// WebKit doesn't clone checked state correctly in fragments
-	jQuery.support.checkClone = fragment.cloneNode(true).cloneNode(true).lastChild.checked;
-
-	// Figure out if the W3C box model works as expected
-	// document.body must exist before we can do this
-	jQuery(function() {
-		var div = document.createElement("div");
-		div.style.width = div.style.paddingLeft = "1px";
-
-		document.body.appendChild( div );
-		jQuery.boxModel = jQuery.support.boxModel = div.offsetWidth === 2;
-
-		if ( "zoom" in div.style ) {
-			// Check if natively block-level elements act like inline-block
-			// elements when setting their display to 'inline' and giving
-			// them layout
-			// (IE < 8 does this)
-			div.style.display = "inline";
-			div.style.zoom = 1;
-			jQuery.support.inlineBlockNeedsLayout = div.offsetWidth === 2;
-
-			// Check if elements with layout shrink-wrap their children
-			// (IE 6 does this)
-			div.style.display = "";
-			div.innerHTML = "<div style='width:4px;'></div>";
-			jQuery.support.shrinkWrapBlocks = div.offsetWidth !== 2;
-		}
-
-		div.innerHTML = "<table><tr><td style='padding:0;display:none'></td><td>t</td></tr></table>";
-		var tds = div.getElementsByTagName("td");
-
-		// Check if table cells still have offsetWidth/Height when they are set
-		// to display:none and there are still other visible table cells in a
-		// table row; if so, offsetWidth/Height are not reliable for use when
-		// determining if an element has been hidden directly using
-		// display:none (it is still safe to use offsets if a parent element is
-		// hidden; don safety goggles and see bug #4512 for more information).
-		// (only IE 8 fails this test)
-		jQuery.support.reliableHiddenOffsets = tds[0].offsetHeight === 0;
-
-		tds[0].style.display = "";
-		tds[1].style.display = "none";
-
-		// Check if empty table cells still have offsetWidth/Height
-		// (IE < 8 fail this test)
-		jQuery.support.reliableHiddenOffsets = jQuery.support.reliableHiddenOffsets && tds[0].offsetHeight === 0;
-		div.innerHTML = "";
-
-		document.body.removeChild( div ).style.display = "none";
-		div = tds = null;
-	});
-
-	// Technique from Juriy Zaytsev
-	// http://thinkweb2.com/projects/prototype/detecting-event-support-without-browser-sniffing/
-	var eventSupported = function( eventName ) {
-		var el = document.createElement("div");
-		eventName = "on" + eventName;
-
-		var isSupported = (eventName in el);
-		if ( !isSupported ) {
-			el.setAttribute(eventName, "return;");
-			isSupported = typeof el[eventName] === "function";
-		}
-		el = null;
-
-		return isSupported;
-	};
-
-	jQuery.support.submitBubbles = eventSupported("submit");
-	jQuery.support.changeBubbles = eventSupported("change");
-
-	// release memory in IE
-	root = script = div = all = a = null;
-})();
-
-
-
-var windowData = {},
-	rbrace = /^(?:\{.*\}|\[.*\])$/;
-
-jQuery.extend({
-	cache: {},
-
-	// Please use with caution
-	uuid: 0,
-
-	// Unique for each copy of jQuery on the page	
-	expando: "jQuery" + jQuery.now(),
-
-	// The following elements throw uncatchable exceptions if you
-	// attempt to add expando properties to them.
-	noData: {
-		"embed": true,
-		// Ban all objects except for Flash (which handle expandos)
-		"object": "clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",
-		"applet": true
-	},
-
-	data: function( elem, name, data ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var isNode = elem.nodeType,
-			id = isNode ? elem[ jQuery.expando ] : null,
-			cache = jQuery.cache, thisCache;
-
-		if ( isNode && !id && typeof name === "string" && data === undefined ) {
-			return;
-		}
-
-		// Get the data from the object directly
-		if ( !isNode ) {
-			cache = elem;
-
-		// Compute a unique ID for the element
-		} else if ( !id ) {
-			elem[ jQuery.expando ] = id = ++jQuery.uuid;
-		}
-
-		// Avoid generating a new cache unless none exists and we
-		// want to manipulate it.
-		if ( typeof name === "object" ) {
-			if ( isNode ) {
-				cache[ id ] = jQuery.extend(cache[ id ], name);
-
-			} else {
-				jQuery.extend( cache, name );
-			}
-
-		} else if ( isNode && !cache[ id ] ) {
-			cache[ id ] = {};
-		}
-
-		thisCache = isNode ? cache[ id ] : cache;
-
-		// Prevent overriding the named cache with undefined values
-		if ( data !== undefined ) {
-			thisCache[ name ] = data;
-		}
-
-		return typeof name === "string" ? thisCache[ name ] : thisCache;
-	},
-
-	removeData: function( elem, name ) {
-		if ( !jQuery.acceptData( elem ) ) {
-			return;
-		}
-
-		elem = elem == window ?
-			windowData :
-			elem;
-
-		var isNode = elem.nodeType,
-			id = isNode ? elem[ jQuery.expando ] : elem,
-			cache = jQuery.cache,
-			thisCache = isNode ? cache[ id ] : id;
-
-		// If we want to remove a specific section of the element's data
-		if ( name ) {
-			if ( thisCache ) {
-				// Remove the section of cache data
-				delete thisCache[ name ];
-
-				// If we've removed all the data, remove the element's cache
-				if ( isNode && jQuery.isEmptyObject(thisCache) ) {
-					jQuery.removeData( elem );
-				}
-			}
-
-		// Otherwise, we want to remove all of the element's data
-		} else {
-			if ( isNode && jQuery.support.deleteExpando ) {
-				delete elem[ jQuery.expando ];
-
-			} else if ( elem.removeAttribute ) {
-				elem.removeAttribute( jQuery.expando );
-
-			// Completely remove the data cache
-			} else if ( isNode ) {
-				delete cache[ id ];
-
-			// Remove all fields from the object
-			} else {
-				for ( var n in elem ) {
-					delete elem[ n ];
-				}
-			}
-		}
-	},
-
-	// A method for determining if a DOM node can handle the data expando
-	acceptData: function( elem ) {
-		if ( elem.nodeName ) {
-			var match = jQuery.noData[ elem.nodeName.toLowerCase() ];
-
-			if ( match ) {
-				return !(match === true || elem.getAttribute("classid") !== match);
-			}
-		}
-
-		return true;
-	}
-});
-
-jQuery.fn.extend({
-	data: function( key, value ) {
-		var data = null;
-
-		if ( typeof key === "undefined" ) {
-			if ( this.length ) {
-				var attr = this[0].attributes, name;
-				data = jQuery.data( this[0] );
-
-				for ( var i = 0, l = attr.length; i < l; i++ ) {
-					name = attr[i].name;
-
-					if ( name.indexOf( "data-" ) === 0 ) {
-						name = name.substr( 5 );
-						dataAttr( this[0], name, data[ name ] );
-					}
-				}
-			}
-
-			return data;
-
-		} else if ( typeof key === "object" ) {
-			return this.each(function() {
-				jQuery.data( this, key );
-			});
-		}
-
-		var parts = key.split(".");
-		parts[1] = parts[1] ? "." + parts[1] : "";
-
-		if ( value === undefined ) {
-			data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]);
-
-			// Try to fetch any internally stored data first
-			if ( data === undefined && this.length ) {
-				data = jQuery.data( this[0], key );
-				data = dataAttr( this[0], key, data );
-			}
-
-			return data === undefined && parts[1] ?
-				this.data( parts[0] ) :
-				data;
-
-		} else {
-			return this.each(function() {
-				var $this = jQuery( this ),
-					args = [ parts[0], value ];
-
-				$this.triggerHandler( "setData" + parts[1] + "!", args );
-				jQuery.data( this, key, value );
-				$this.triggerHandler( "changeData" + parts[1] + "!", args );
-			});
-		}
-	},
-
-	removeData: function( key ) {
-		return this.each(function() {
-			jQuery.removeData( this, key );
-		});
-	}
-});
-
-function dataAttr( elem, key, data ) {
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		data = elem.getAttribute( "data-" + key );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-				data === "false" ? false :
-				data === "null" ? null :
-				!jQuery.isNaN( data ) ? parseFloat( data ) :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			jQuery.data( elem, key, data );
-
-		} else {
-			data = undefined;
-		}
-	}
-
-	return data;
-}
-
-
-
-
-jQuery.extend({
-	queue: function( elem, type, data ) {
-		if ( !elem ) {
-			return;
-		}
-
-		type = (type || "fx") + "queue";
-		var q = jQuery.data( elem, type );
-
-		// Speed up dequeue by getting out quickly if this is just a lookup
-		if ( !data ) {
-			return q || [];
-		}
-
-		if ( !q || jQuery.isArray(data) ) {
-			q = jQuery.data( elem, type, jQuery.makeArray(data) );
-
-		} else {
-			q.push( data );
-		}
-
-		return q;
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			fn = queue.shift();
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-		}
-
-		if ( fn ) {
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift("inprogress");
-			}
-
-			fn.call(elem, function() {
-				jQuery.dequeue(elem, type);
-			});
-		}
-	}
-});
-
-jQuery.fn.extend({
-	queue: function( type, data ) {
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-		}
-
-		if ( data === undefined ) {
-			return jQuery.queue( this[0], type );
-		}
-		return this.each(function( i ) {
-			var queue = jQuery.queue( this, type, data );
-
-			if ( type === "fx" && queue[0] !== "inprogress" ) {
-				jQuery.dequeue( this, type );
-			}
-		});
-	},
-	dequeue: function( type ) {
-		return this.each(function() {
-			jQuery.dequeue( this, type );
-		});
-	},
-
-	// Based off of the plugin by Clint Helfers, with permission.
-	// http://blindsignals.com/index.php/2009/07/jquery-delay/
-	delay: function( time, type ) {
-		time = jQuery.fx ? jQuery.fx.speeds[time] || time : time;
-		type = type || "fx";
-
-		return this.queue( type, function() {
-			var elem = this;
-			setTimeout(function() {
-				jQuery.dequeue( elem, type );
-			}, time );
-		});
-	},
-
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	}
-});
-
-
-
-
-var rclass = /[\n\t]/g,
-	rspaces = /\s+/,
-	rreturn = /\r/g,
-	rspecialurl = /^(?:href|src|style)$/,
-	rtype = /^(?:button|input)$/i,
-	rfocusable = /^(?:button|input|object|select|textarea)$/i,
-	rclickable = /^a(?:rea)?$/i,
-	rradiocheck = /^(?:radio|checkbox)$/i;
-
-jQuery.props = {
-	"for": "htmlFor",
-	"class": "className",
-	readonly: "readOnly",
-	maxlength: "maxLength",
-	cellspacing: "cellSpacing",
-	rowspan: "rowSpan",
-	colspan: "colSpan",
-	tabindex: "tabIndex",
-	usemap: "useMap",
-	frameborder: "frameBorder"
-};
-
-jQuery.fn.extend({
-	attr: function( name, value ) {
-		return jQuery.access( this, name, value, true, jQuery.attr );
-	},
-
-	removeAttr: function( name, fn ) {
-		return this.each(function(){
-			jQuery.attr( this, name, "" );
-			if ( this.nodeType === 1 ) {
-				this.removeAttribute( name );
-			}
-		});
-	},
-
-	addClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.addClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( value && typeof value === "string" ) {
-			var classNames = (value || "").split( rspaces );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 ) {
-					if ( !elem.className ) {
-						elem.className = value;
-
-					} else {
-						var className = " " + elem.className + " ",
-							setClass = elem.className;
-
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							if ( className.indexOf( " " + classNames[c] + " " ) < 0 ) {
-								setClass += " " + classNames[c];
-							}
-						}
-						elem.className = jQuery.trim( setClass );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.removeClass( value.call(this, i, self.attr("class")) );
-			});
-		}
-
-		if ( (value && typeof value === "string") || value === undefined ) {
-			var classNames = (value || "").split( rspaces );
-
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				var elem = this[i];
-
-				if ( elem.nodeType === 1 && elem.className ) {
-					if ( value ) {
-						var className = (" " + elem.className + " ").replace(rclass, " ");
-						for ( var c = 0, cl = classNames.length; c < cl; c++ ) {
-							className = className.replace(" " + classNames[c] + " ", " ");
-						}
-						elem.className = jQuery.trim( className );
-
-					} else {
-						elem.className = "";
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value,
-			isBool = typeof stateVal === "boolean";
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				self.toggleClass( value.call(this, i, self.attr("class"), stateVal), stateVal );
-			});
-		}
-
-		return this.each(function() {
-			if ( type === "string" ) {
-				// toggle individual class names
-				var className,
-					i = 0,
-					self = jQuery( this ),
-					state = stateVal,
-					classNames = value.split( rspaces );
-
-				while ( (className = classNames[ i++ ]) ) {
-					// check each className given, space seperated list
-					state = isBool ? state : !self.hasClass( className );
-					self[ state ? "addClass" : "removeClass" ]( className );
-				}
-
-			} else if ( type === "undefined" || type === "boolean" ) {
-				if ( this.className ) {
-					// store className if set
-					jQuery.data( this, "__className__", this.className );
-				}
-
-				// toggle whole className
-				this.className = this.className || value === false ? "" : jQuery.data( this, "__className__" ) || "";
-			}
-		});
-	},
-
-	hasClass: function( selector ) {
-		var className = " " + selector + " ";
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			if ( (" " + this[i].className + " ").replace(rclass, " ").indexOf( className ) > -1 ) {
-				return true;
-			}
-		}
-
-		return false;
-	},
-
-	val: function( value ) {
-		if ( !arguments.length ) {
-			var elem = this[0];
-
-			if ( elem ) {
-				if ( jQuery.nodeName( elem, "option" ) ) {
-					// attributes.value is undefined in Blackberry 4.7 but
-					// uses .value. See #6932
-					var val = elem.attributes.value;
-					return !val || val.specified ? elem.value : elem.text;
-				}
-
-				// We need to handle select boxes special
-				if ( jQuery.nodeName( elem, "select" ) ) {
-					var index = elem.selectedIndex,
-						values = [],
-						options = elem.options,
-						one = elem.type === "select-one";
-
-					// Nothing was selected
-					if ( index < 0 ) {
-						return null;
-					}
-
-					// Loop through all the selected options
-					for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) {
-						var option = options[ i ];
-
-						// Don't return options that are disabled or in a disabled optgroup
-						if ( option.selected && (jQuery.support.optDisabled ? !option.disabled : option.getAttribute("disabled") === null) && 
-								(!option.parentNode.disabled || !jQuery.nodeName( option.parentNode, "optgroup" )) ) {
-
-							// Get the specific value for the option
-							value = jQuery(option).val();
-
-							// We don't need an array for one selects
-							if ( one ) {
-								return value;
-							}
-
-							// Multi-Selects return an array
-							values.push( value );
-						}
-					}
-
-					return values;
-				}
-
-				// Handle the case where in Webkit "" is returned instead of "on" if a value isn't specified
-				if ( rradiocheck.test( elem.type ) && !jQuery.support.checkOn ) {
-					return elem.getAttribute("value") === null ? "on" : elem.value;
-				}
-				
-
-				// Everything else, we just grab the value
-				return (elem.value || "").replace(rreturn, "");
-
-			}
-
-			return undefined;
-		}
-
-		var isFunction = jQuery.isFunction(value);
-
-		return this.each(function(i) {
-			var self = jQuery(this), val = value;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call(this, i, self.val());
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-			} else if ( typeof val === "number" ) {
-				val += "";
-			} else if ( jQuery.isArray(val) ) {
-				val = jQuery.map(val, function (value) {
-					return value == null ? "" : value + "";
-				});
-			}
-
-			if ( jQuery.isArray(val) && rradiocheck.test( this.type ) ) {
-				this.checked = jQuery.inArray( self.val(), val ) >= 0;
-
-			} else if ( jQuery.nodeName( this, "select" ) ) {
-				var values = jQuery.makeArray(val);
-
-				jQuery( "option", this ).each(function() {
-					this.selected = jQuery.inArray( jQuery(this).val(), values ) >= 0;
-				});
-
-				if ( !values.length ) {
-					this.selectedIndex = -1;
-				}
-
-			} else {
-				this.value = val;
-			}
-		});
-	}
-});
-
-jQuery.extend({
-	attrFn: {
-		val: true,
-		css: true,
-		html: true,
-		text: true,
-		data: true,
-		width: true,
-		height: true,
-		offset: true
-	},
-		
-	attr: function( elem, name, value, pass ) {
-		// don't set attributes on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return undefined;
-		}
-
-		if ( pass && name in jQuery.attrFn ) {
-			return jQuery(elem)[name](value);
-		}
-
-		var notxml = elem.nodeType !== 1 || !jQuery.isXMLDoc( elem ),
-			// Whether we are setting (or getting)
-			set = value !== undefined;
-
-		// Try to normalize/fix the name
-		name = notxml && jQuery.props[ name ] || name;
-
-		// These attributes require special treatment
-		var special = rspecialurl.test( name );
-
-		// Safari mis-reports the default selected property of an option
-		// Accessing the parent's selectedIndex property fixes it
-		if ( name === "selected" && !jQuery.support.optSelected ) {
-			var parent = elem.parentNode;
-			if ( parent ) {
-				parent.selectedIndex;
-
-				// Make sure that it also works with optgroups, see #5701
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-		}
-
-		// If applicable, access the attribute via the DOM 0 way
-		// 'in' checks fail in Blackberry 4.7 #6931
-		if ( (name in elem || elem[ name ] !== undefined) && notxml && !special ) {
-			if ( set ) {
-				// We can't allow the type property to be changed (since it causes problems in IE)
-				if ( name === "type" && rtype.test( elem.nodeName ) && elem.parentNode ) {
-					jQuery.error( "type property can't be changed" );
-				}
-
-				if ( value === null ) {
-					if ( elem.nodeType === 1 ) {
-						elem.removeAttribute( name );
-					}
-
-				} else {
-					elem[ name ] = value;
-				}
-			}
-
-			// browsers index elements by id/name on forms, give priority to attributes.
-			if ( jQuery.nodeName( elem, "form" ) && elem.getAttributeNode(name) ) {
-				return elem.getAttributeNode( name ).nodeValue;
-			}
-
-			// elem.tabIndex doesn't always return the correct value when it hasn't been explicitly set
-			// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-			if ( name === "tabIndex" ) {
-				var attributeNode = elem.getAttributeNode( "tabIndex" );
-
-				return attributeNode && attributeNode.specified ?
-					attributeNode.value :
-					rfocusable.test( elem.nodeName ) || rclickable.test( elem.nodeName ) && elem.href ?
-						0 :
-						undefined;
-			}
-
-			return elem[ name ];
-		}
-
-		if ( !jQuery.support.style && notxml && name === "style" ) {
-			if ( set ) {
-				elem.style.cssText = "" + value;
-			}
-
-			return elem.style.cssText;
-		}
-
-		if ( set ) {
-			// convert the value to a string (all browsers do this but IE) see #1070
-			elem.setAttribute( name, "" + value );
-		}
-
-		// Ensure that missing attributes return undefined
-		// Blackberry 4.7 returns "" from getAttribute #6938
-		if ( !elem.attributes[ name ] && (elem.hasAttribute && !elem.hasAttribute( name )) ) {
-			return undefined;
-		}
-
-		var attr = !jQuery.support.hrefNormalized && notxml && special ?
-				// Some attributes require a special call on IE
-				elem.getAttribute( name, 2 ) :
-				elem.getAttribute( name );
-
-		// Non-existent attributes return null, we normalize to undefined
-		return attr === null ? undefined : attr;
-	}
-});
-
-
-
-
-var rnamespaces = /\.(.*)$/,
-	rformElems = /^(?:textarea|input|select)$/i,
-	rperiod = /\./g,
-	rspace = / /g,
-	rescape = /[^\w\s.|`]/g,
-	fcleanup = function( nm ) {
-		return nm.replace(rescape, "\\$&");
-	},
-	focusCounts = { focusin: 0, focusout: 0 };
-
-/*
- * A number of helper functions used for managing events.
- * Many of the ideas behind this code originated from
- * Dean Edwards' addEvent library.
- */
-jQuery.event = {
-
-	// Bind an event to an element
-	// Original by Dean Edwards
-	add: function( elem, types, handler, data ) {
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// For whatever reason, IE has trouble passing the window object
-		// around, causing it to be cloned in the process
-		if ( jQuery.isWindow( elem ) && ( elem !== window && !elem.frameElement ) ) {
-			elem = window;
-		}
-
-		if ( handler === false ) {
-			handler = returnFalse;
-		} else if ( !handler ) {
-			// Fixes bug #7229. Fix recommended by jdalton
-		  return;
-		}
-
-		var handleObjIn, handleObj;
-
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-		}
-
-		// Make sure that the function being executed has a unique ID
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure
-		var elemData = jQuery.data( elem );
-
-		// If no elemData is found then we must be trying to bind to one of the
-		// banned noData elements
-		if ( !elemData ) {
-			return;
-		}
-
-		// Use a key less likely to result in collisions for plain JS objects.
-		// Fixes bug #7150.
-		var eventKey = elem.nodeType ? "events" : "__events__",
-			events = elemData[ eventKey ],
-			eventHandle = elemData.handle;
-			
-		if ( typeof events === "function" ) {
-			// On plain objects events is a fn that holds the the data
-			// which prevents this data from being JSON serialized
-			// the function does not need to be called, it just contains the data
-			eventHandle = events.handle;
-			events = events.events;
-
-		} else if ( !events ) {
-			if ( !elem.nodeType ) {
-				// On plain objects, create a fn that acts as the holder
-				// of the values to avoid JSON serialization of event data
-				elemData[ eventKey ] = elemData = function(){};
-			}
-
-			elemData.events = events = {};
-		}
-
-		if ( !eventHandle ) {
-			elemData.handle = eventHandle = function() {
-				// Handle the second event of a trigger and when
-				// an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && !jQuery.event.triggered ?
-					jQuery.event.handle.apply( eventHandle.elem, arguments ) :
-					undefined;
-			};
-		}
-
-		// Add elem as a property of the handle function
-		// This is to prevent a memory leak with non-native events in IE.
-		eventHandle.elem = elem;
-
-		// Handle multiple events separated by a space
-		// jQuery(...).bind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		var type, i = 0, namespaces;
-
-		while ( (type = types[ i++ ]) ) {
-			handleObj = handleObjIn ?
-				jQuery.extend({}, handleObjIn) :
-				{ handler: handler, data: data };
-
-			// Namespaced event handlers
-			if ( type.indexOf(".") > -1 ) {
-				namespaces = type.split(".");
-				type = namespaces.shift();
-				handleObj.namespace = namespaces.slice(0).sort().join(".");
-
-			} else {
-				namespaces = [];
-				handleObj.namespace = "";
-			}
-
-			handleObj.type = type;
-			if ( !handleObj.guid ) {
-				handleObj.guid = handler.guid;
-			}
-
-			// Get the current list of functions bound to this event
-			var handlers = events[ type ],
-				special = jQuery.event.special[ type ] || {};
-
-			// Init the event handler queue
-			if ( !handlers ) {
-				handlers = events[ type ] = [];
-
-				// Check for a special event handler
-				// Only use addEventListener/attachEvent if the special
-				// events handler returns false
-				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-					// Bind the global event handler to the element
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle, false );
-
-					} else if ( elem.attachEvent ) {
-						elem.attachEvent( "on" + type, eventHandle );
-					}
-				}
-			}
-			
-			if ( special.add ) { 
-				special.add.call( elem, handleObj ); 
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add the function to the element's handler list
-			handlers.push( handleObj );
-
-			// Keep track of which events have been used, for global triggering
-			jQuery.event.global[ type ] = true;
-		}
-
-		// Nullify elem to prevent memory leaks in IE
-		elem = null;
-	},
-
-	global: {},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, pos ) {
-		// don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		if ( handler === false ) {
-			handler = returnFalse;
-		}
-
-		var ret, type, fn, j, i = 0, all, namespaces, namespace, special, eventType, handleObj, origType,
-			eventKey = elem.nodeType ? "events" : "__events__",
-			elemData = jQuery.data( elem ),
-			events = elemData && elemData[ eventKey ];
-
-		if ( !elemData || !events ) {
-			return;
-		}
-		
-		if ( typeof events === "function" ) {
-			elemData = events;
-			events = events.events;
-		}
-
-		// types is actually an event object here
-		if ( types && types.type ) {
-			handler = types.handler;
-			types = types.type;
-		}
-
-		// Unbind all events for the element
-		if ( !types || typeof types === "string" && types.charAt(0) === "." ) {
-			types = types || "";
-
-			for ( type in events ) {
-				jQuery.event.remove( elem, type + types );
-			}
-
-			return;
-		}
-
-		// Handle multiple events separated by a space
-		// jQuery(...).unbind("mouseover mouseout", fn);
-		types = types.split(" ");
-
-		while ( (type = types[ i++ ]) ) {
-			origType = type;
-			handleObj = null;
-			all = type.indexOf(".") < 0;
-			namespaces = [];
-
-			if ( !all ) {
-				// Namespaced event handlers
-				namespaces = type.split(".");
-				type = namespaces.shift();
-
-				namespace = new RegExp("(^|\\.)" + 
-					jQuery.map( namespaces.slice(0).sort(), fcleanup ).join("\\.(?:.*\\.)?") + "(\\.|$)");
-			}
-
-			eventType = events[ type ];
-
-			if ( !eventType ) {
-				continue;
-			}
-
-			if ( !handler ) {
-				for ( j = 0; j < eventType.length; j++ ) {
-					handleObj = eventType[ j ];
-
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						jQuery.event.remove( elem, origType, handleObj.handler, j );
-						eventType.splice( j--, 1 );
-					}
-				}
-
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-
-			for ( j = pos || 0; j < eventType.length; j++ ) {
-				handleObj = eventType[ j ];
-
-				if ( handler.guid === handleObj.guid ) {
-					// remove the given handler for the given type
-					if ( all || namespace.test( handleObj.namespace ) ) {
-						if ( pos == null ) {
-							eventType.splice( j--, 1 );
-						}
-
-						if ( special.remove ) {
-							special.remove.call( elem, handleObj );
-						}
-					}
-
-					if ( pos != null ) {
-						break;
-					}
-				}
-			}
-
-			// remove generic event handler if no more handlers exist
-			if ( eventType.length === 0 || pos != null && eventType.length === 1 ) {
-				if ( !special.teardown || special.teardown.call( elem, namespaces ) === false ) {
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				ret = null;
-				delete events[ type ];
-			}
-		}
-
-		// Remove the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			var handle = elemData.handle;
-			if ( handle ) {
-				handle.elem = null;
-			}
-
-			delete elemData.events;
-			delete elemData.handle;
-
-			if ( typeof elemData === "function" ) {
-				jQuery.removeData( elem, eventKey );
-
-			} else if ( jQuery.isEmptyObject( elemData ) ) {
-				jQuery.removeData( elem );
-			}
-		}
-	},
-
-	// bubbling is internal
-	trigger: function( event, data, elem /*, bubbling */ ) {
-		// Event object or event type
-		var type = event.type || event,
-			bubbling = arguments[3];
-
-		if ( !bubbling ) {
-			event = typeof event === "object" ?
-				// jQuery.Event object
-				event[ jQuery.expando ] ? event :
-				// Object literal
-				jQuery.extend( jQuery.Event(type), event ) :
-				// Just the event type (string)
-				jQuery.Event(type);
-
-			if ( type.indexOf("!") >= 0 ) {
-				event.type = type = type.slice(0, -1);
-				event.exclusive = true;
-			}
-
-			// Handle a global trigger
-			if ( !elem ) {
-				// Don't bubble custom events when global (to avoid too much overhead)
-				event.stopPropagation();
-
-				// Only trigger if we've ever bound an event for it
-				if ( jQuery.event.global[ type ] ) {
-					jQuery.each( jQuery.cache, function() {
-						if ( this.events && this.events[type] ) {
-							jQuery.event.trigger( event, data, this.handle.elem );
-						}
-					});
-				}
-			}
-
-			// Handle triggering a single element
-
-			// don't do events on text and comment nodes
-			if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 ) {
-				return undefined;
-			}
-
-			// Clean up in case it is reused
-			event.result = undefined;
-			event.target = elem;
-
-			// Clone the incoming data, if any
-			data = jQuery.makeArray( data );
-			data.unshift( event );
-		}
-
-		event.currentTarget = elem;
-
-		// Trigger the event, it is assumed that "handle" is a function
-		var handle = elem.nodeType ?
-			jQuery.data( elem, "handle" ) :
-			(jQuery.data( elem, "__events__" ) || {}).handle;
-
-		if ( handle ) {
-			handle.apply( elem, data );
-		}
-
-		var parent = elem.parentNode || elem.ownerDocument;
-
-		// Trigger an inline bound script
-		try {
-			if ( !(elem && elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()]) ) {
-				if ( elem[ "on" + type ] && elem[ "on" + type ].apply( elem, data ) === false ) {
-					event.result = false;
-					event.preventDefault();
-				}
-			}
-
-		// prevent IE from throwing an error for some elements with some event types, see #3533
-		} catch (inlineError) {}
-
-		if ( !event.isPropagationStopped() && parent ) {
-			jQuery.event.trigger( event, data, parent, true );
-
-		} else if ( !event.isDefaultPrevented() ) {
-			var old,
-				target = event.target,
-				targetType = type.replace( rnamespaces, "" ),
-				isClick = jQuery.nodeName( target, "a" ) && targetType === "click",
-				special = jQuery.event.special[ targetType ] || {};
-
-			if ( (!special._default || special._default.call( elem, event ) === false) && 
-				!isClick && !(target && target.nodeName && jQuery.noData[target.nodeName.toLowerCase()]) ) {
-
-				try {
-					if ( target[ targetType ] ) {
-						// Make sure that we don't accidentally re-trigger the onFOO events
-						old = target[ "on" + targetType ];
-
-						if ( old ) {
-							target[ "on" + targetType ] = null;
-						}
-
-						jQuery.event.triggered = true;
-						target[ targetType ]();
-					}
-
-				// prevent IE from throwing an error for some elements with some event types, see #3533
-				} catch (triggerError) {}
-
-				if ( old ) {
-					target[ "on" + targetType ] = old;
-				}
-
-				jQuery.event.triggered = false;
-			}
-		}
-	},
-
-	handle: function( event ) {
-		var all, handlers, namespaces, namespace_re, events,
-			namespace_sort = [],
-			args = jQuery.makeArray( arguments );
-
-		event = args[0] = jQuery.event.fix( event || window.event );
-		event.currentTarget = this;
-
-		// Namespaced event handlers
-		all = event.type.indexOf(".") < 0 && !event.exclusive;
-
-		if ( !all ) {
-			namespaces = event.type.split(".");
-			event.type = namespaces.shift();
-			namespace_sort = namespaces.slice(0).sort();
-			namespace_re = new RegExp("(^|\\.)" + namespace_sort.join("\\.(?:.*\\.)?") + "(\\.|$)");
-		}
-
-		event.namespace = event.namespace || namespace_sort.join(".");
-
-		events = jQuery.data(this, this.nodeType ? "events" : "__events__");
-
-		if ( typeof events === "function" ) {
-			events = events.events;
-		}
-
-		handlers = (events || {})[ event.type ];
-
-		if ( events && handlers ) {
-			// Clone the handlers to prevent manipulation
-			handlers = handlers.slice(0);
-
-			for ( var j = 0, l = handlers.length; j < l; j++ ) {
-				var handleObj = handlers[ j ];
-
-				// Filter the functions by class
-				if ( all || namespace_re.test( handleObj.namespace ) ) {
-					// Pass in a reference to the handler function itself
-					// So that we can later remove it
-					event.handler = handleObj.handler;
-					event.data = handleObj.data;
-					event.handleObj = handleObj;
-	
-					var ret = handleObj.handler.apply( this, args );
-
-					if ( ret !== undefined ) {
-						event.result = ret;
-						if ( ret === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-
-					if ( event.isImmediatePropagationStopped() ) {
-						break;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	props: "altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// store a copy of the original event object
-		// and "clone" to set read-only properties
-		var originalEvent = event;
-		event = jQuery.Event( originalEvent );
-
-		for ( var i = this.props.length, prop; i; ) {
-			prop = this.props[ --i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Fix target property, if necessary
-		if ( !event.target ) {
-			// Fixes #1925 where srcElement might not be defined either
-			event.target = event.srcElement || document;
-		}
-
-		// check if target is a textnode (safari)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		// Add relatedTarget, if necessary
-		if ( !event.relatedTarget && event.fromElement ) {
-			event.relatedTarget = event.fromElement === event.target ? event.toElement : event.fromElement;
-		}
-
-		// Calculate pageX/Y if missing and clientX/Y available
-		if ( event.pageX == null && event.clientX != null ) {
-			var doc = document.documentElement,
-				body = document.body;
-
-			event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc && doc.clientLeft || body && body.clientLeft || 0);
-			event.pageY = event.clientY + (doc && doc.scrollTop  || body && body.scrollTop  || 0) - (doc && doc.clientTop  || body && body.clientTop  || 0);
-		}
-
-		// Add which for key events
-		if ( event.which == null && (event.charCode != null || event.keyCode != null) ) {
-			event.which = event.charCode != null ? event.charCode : event.keyCode;
-		}
-
-		// Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs)
-		if ( !event.metaKey && event.ctrlKey ) {
-			event.metaKey = event.ctrlKey;
-		}
-
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		// Note: button is not normalized, so don't use it
-		if ( !event.which && event.button !== undefined ) {
-			event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) ));
-		}
-
-		return event;
-	},
-
-	// Deprecated, use jQuery.guid instead
-	guid: 1E8,
-
-	// Deprecated, use jQuery.proxy instead
-	proxy: jQuery.proxy,
-
-	special: {
-		ready: {
-			// Make sure the ready event is setup
-			setup: jQuery.bindReady,
-			teardown: jQuery.noop
-		},
-
-		live: {
-			add: function( handleObj ) {
-				jQuery.event.add( this,
-					liveConvert( handleObj.origType, handleObj.selector ),
-					jQuery.extend({}, handleObj, {handler: liveHandler, guid: handleObj.handler.guid}) ); 
-			},
-
-			remove: function( handleObj ) {
-				jQuery.event.remove( this, liveConvert( handleObj.origType, handleObj.selector ), handleObj );
-			}
-		},
-
-		beforeunload: {
-			setup: function( data, namespaces, eventHandle ) {
-				// We only want to do this special case on windows
-				if ( jQuery.isWindow( this ) ) {
-					this.onbeforeunload = eventHandle;
-				}
-			},
-
-			teardown: function( namespaces, eventHandle ) {
-				if ( this.onbeforeunload === eventHandle ) {
-					this.onbeforeunload = null;
-				}
-			}
-		}
-	}
-};
-
-jQuery.removeEvent = document.removeEventListener ?
-	function( elem, type, handle ) {
-		if ( elem.removeEventListener ) {
-			elem.removeEventListener( type, handle, false );
-		}
-	} : 
-	function( elem, type, handle ) {
-		if ( elem.detachEvent ) {
-			elem.detachEvent( "on" + type, handle );
-		}
-	};
-
-jQuery.Event = function( src ) {
-	// Allow instantiation without the 'new' keyword
-	if ( !this.preventDefault ) {
-		return new jQuery.Event( src );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// timeStamp is buggy for some events on Firefox(#3843)
-	// So we won't rely on the native value
-	this.timeStamp = jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-function returnFalse() {
-	return false;
-}
-function returnTrue() {
-	return true;
-}
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	preventDefault: function() {
-		this.isDefaultPrevented = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		
-		// if preventDefault exists run it on the original event
-		if ( e.preventDefault ) {
-			e.preventDefault();
-
-		// otherwise set the returnValue property of the original event to false (IE)
-		} else {
-			e.returnValue = false;
-		}
-	},
-	stopPropagation: function() {
-		this.isPropagationStopped = returnTrue;
-
-		var e = this.originalEvent;
-		if ( !e ) {
-			return;
-		}
-		// if stopPropagation exists run it on the original event
-		if ( e.stopPropagation ) {
-			e.stopPropagation();
-		}
-		// otherwise set the cancelBubble property of the original event to true (IE)
-		e.cancelBubble = true;
-	},
-	stopImmediatePropagation: function() {
-		this.isImmediatePropagationStopped = returnTrue;
-		this.stopPropagation();
-	},
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse
-};
-
-// Checks if an event happened on an element within another element
-// Used in jQuery.event.special.mouseenter and mouseleave handlers
-var withinElement = function( event ) {
-	// Check if mouse(over|out) are still within the same parent element
-	var parent = event.relatedTarget;
-
-	// Firefox sometimes assigns relatedTarget a XUL element
-	// which we cannot access the parentNode property of
-	try {
-		// Traverse up the tree
-		while ( parent && parent !== this ) {
-			parent = parent.parentNode;
-		}
-
-		if ( parent !== this ) {
-			// set the correct event type
-			event.type = event.data;
-
-			// handle event if we actually just moused on to a non sub-element
-			jQuery.event.handle.apply( this, arguments );
-		}
-
-	// assuming we've left the element since we most likely mousedover a xul element
-	} catch(e) { }
-},
-
-// In case of event delegation, we only need to rename the event.type,
-// liveHandler will take care of the rest.
-delegate = function( event ) {
-	event.type = event.data;
-	jQuery.event.handle.apply( this, arguments );
-};
-
-// Create mouseenter and mouseleave events
-jQuery.each({
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		setup: function( data ) {
-			jQuery.event.add( this, fix, data && data.selector ? delegate : withinElement, orig );
-		},
-		teardown: function( data ) {
-			jQuery.event.remove( this, fix, data && data.selector ? delegate : withinElement );
-		}
-	};
-});
-
-// submit delegation
-if ( !jQuery.support.submitBubbles ) {
-
-	jQuery.event.special.submit = {
-		setup: function( data, namespaces ) {
-			if ( this.nodeName.toLowerCase() !== "form" ) {
-				jQuery.event.add(this, "click.specialSubmit", function( e ) {
-					var elem = e.target,
-						type = elem.type;
-
-					if ( (type === "submit" || type === "image") && jQuery( elem ).closest("form").length ) {
-						e.liveFired = undefined;
-						return trigger( "submit", this, arguments );
-					}
-				});
-	 
-				jQuery.event.add(this, "keypress.specialSubmit", function( e ) {
-					var elem = e.target,
-						type = elem.type;
-
-					if ( (type === "text" || type === "password") && jQuery( elem ).closest("form").length && e.keyCode === 13 ) {
-						e.liveFired = undefined;
-						return trigger( "submit", this, arguments );
-					}
-				});
-
-			} else {
-				return false;
-			}
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialSubmit" );
-		}
-	};
-
-}
-
-// change delegation, happens here so we have bind.
-if ( !jQuery.support.changeBubbles ) {
-
-	var changeFilters,
-
-	getVal = function( elem ) {
-		var type = elem.type, val = elem.value;
-
-		if ( type === "radio" || type === "checkbox" ) {
-			val = elem.checked;
-
-		} else if ( type === "select-multiple" ) {
-			val = elem.selectedIndex > -1 ?
-				jQuery.map( elem.options, function( elem ) {
-					return elem.selected;
-				}).join("-") :
-				"";
-
-		} else if ( elem.nodeName.toLowerCase() === "select" ) {
-			val = elem.selectedIndex;
-		}
-
-		return val;
-	},
-
-	testChange = function testChange( e ) {
-		var elem = e.target, data, val;
-
-		if ( !rformElems.test( elem.nodeName ) || elem.readOnly ) {
-			return;
-		}
-
-		data = jQuery.data( elem, "_change_data" );
-		val = getVal(elem);
-
-		// the current data will be also retrieved by beforeactivate
-		if ( e.type !== "focusout" || elem.type !== "radio" ) {
-			jQuery.data( elem, "_change_data", val );
-		}
-		
-		if ( data === undefined || val === data ) {
-			return;
-		}
-
-		if ( data != null || val ) {
-			e.type = "change";
-			e.liveFired = undefined;
-			return jQuery.event.trigger( e, arguments[1], elem );
-		}
-	};
-
-	jQuery.event.special.change = {
-		filters: {
-			focusout: testChange, 
-
-			beforedeactivate: testChange,
-
-			click: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( type === "radio" || type === "checkbox" || elem.nodeName.toLowerCase() === "select" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Change has to be called before submit
-			// Keydown will be called before keypress, which is used in submit-event delegation
-			keydown: function( e ) {
-				var elem = e.target, type = elem.type;
-
-				if ( (e.keyCode === 13 && elem.nodeName.toLowerCase() !== "textarea") ||
-					(e.keyCode === 32 && (type === "checkbox" || type === "radio")) ||
-					type === "select-multiple" ) {
-					return testChange.call( this, e );
-				}
-			},
-
-			// Beforeactivate happens also before the previous element is blurred
-			// with this event you can't trigger a change event, but you can store
-			// information
-			beforeactivate: function( e ) {
-				var elem = e.target;
-				jQuery.data( elem, "_change_data", getVal(elem) );
-			}
-		},
-
-		setup: function( data, namespaces ) {
-			if ( this.type === "file" ) {
-				return false;
-			}
-
-			for ( var type in changeFilters ) {
-				jQuery.event.add( this, type + ".specialChange", changeFilters[type] );
-			}
-
-			return rformElems.test( this.nodeName );
-		},
-
-		teardown: function( namespaces ) {
-			jQuery.event.remove( this, ".specialChange" );
-
-			return rformElems.test( this.nodeName );
-		}
-	};
-
-	changeFilters = jQuery.event.special.change.filters;
-
-	// Handle when the input is .focus()'d
-	changeFilters.focus = changeFilters.beforeactivate;
-}
-
-function trigger( type, elem, args ) {
-	args[0].type = type;
-	return jQuery.event.handle.apply( elem, args );
-}
-
-// Create "bubbling" focus and blur events
-if ( document.addEventListener ) {
-	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				if ( focusCounts[fix]++ === 0 ) {
-					document.addEventListener( orig, handler, true );
-				}
-			}, 
-			teardown: function() { 
-				if ( --focusCounts[fix] === 0 ) {
-					document.removeEventListener( orig, handler, true );
-				}
-			}
-		};
-
-		function handler( e ) { 
-			e = jQuery.event.fix( e );
-			e.type = fix;
-			return jQuery.event.trigger( e, null, e.target );
-		}
-	});
-}
-
-jQuery.each(["bind", "one"], function( i, name ) {
-	jQuery.fn[ name ] = function( type, data, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" ) {
-			for ( var key in type ) {
-				this[ name ](key, data, type[key], fn);
-			}
-			return this;
-		}
-		
-		if ( jQuery.isFunction( data ) || data === false ) {
-			fn = data;
-			data = undefined;
-		}
-
-		var handler = name === "one" ? jQuery.proxy( fn, function( event ) {
-			jQuery( this ).unbind( event, handler );
-			return fn.apply( this, arguments );
-		}) : fn;
-
-		if ( type === "unload" && name !== "one" ) {
-			this.one( type, data, fn );
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.add( this[i], type, handler, data );
-			}
-		}
-
-		return this;
-	};
-});
-
-jQuery.fn.extend({
-	unbind: function( type, fn ) {
-		// Handle object literals
-		if ( typeof type === "object" && !type.preventDefault ) {
-			for ( var key in type ) {
-				this.unbind(key, type[key]);
-			}
-
-		} else {
-			for ( var i = 0, l = this.length; i < l; i++ ) {
-				jQuery.event.remove( this[i], type, fn );
-			}
-		}
-
-		return this;
-	},
-	
-	delegate: function( selector, types, data, fn ) {
-		return this.live( types, data, fn, selector );
-	},
-	
-	undelegate: function( selector, types, fn ) {
-		if ( arguments.length === 0 ) {
-				return this.unbind( "live" );
-		
-		} else {
-			return this.die( types, null, fn, selector );
-		}
-	},
-	
-	trigger: function( type, data ) {
-		return this.each(function() {
-			jQuery.event.trigger( type, data, this );
-		});
-	},
-
-	triggerHandler: function( type, data ) {
-		if ( this[0] ) {
-			var event = jQuery.Event( type );
-			event.preventDefault();
-			event.stopPropagation();
-			jQuery.event.trigger( event, data, this[0] );
-			return event.result;
-		}
-	},
-
-	toggle: function( fn ) {
-		// Save reference to arguments for access in closure
-		var args = arguments,
-			i = 1;
-
-		// link all the functions, so any of them can unbind this click handler
-		while ( i < args.length ) {
-			jQuery.proxy( fn, args[ i++ ] );
-		}
-
-		return this.click( jQuery.proxy( fn, function( event ) {
-			// Figure out which function to execute
-			var lastToggle = ( jQuery.data( this, "lastToggle" + fn.guid ) || 0 ) % i;
-			jQuery.data( this, "lastToggle" + fn.guid, lastToggle + 1 );
-
-			// Make sure that clicks stop
-			event.preventDefault();
-
-			// and execute the function
-			return args[ lastToggle ].apply( this, arguments ) || false;
-		}));
-	},
-
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-});
-
-var liveMap = {
-	focus: "focusin",
-	blur: "focusout",
-	mouseenter: "mouseover",
-	mouseleave: "mouseout"
-};
-
-jQuery.each(["live", "die"], function( i, name ) {
-	jQuery.fn[ name ] = function( types, data, fn, origSelector /* Internal Use Only */ ) {
-		var type, i = 0, match, namespaces, preType,
-			selector = origSelector || this.selector,
-			context = origSelector ? this : jQuery( this.context );
-		
-		if ( typeof types === "object" && !types.preventDefault ) {
-			for ( var key in types ) {
-				context[ name ]( key, data, types[key], selector );
-			}
-			
-			return this;
-		}
-
-		if ( jQuery.isFunction( data ) ) {
-			fn = data;
-			data = undefined;
-		}
-
-		types = (types || "").split(" ");
-
-		while ( (type = types[ i++ ]) != null ) {
-			match = rnamespaces.exec( type );
-			namespaces = "";
-
-			if ( match )  {
-				namespaces = match[0];
-				type = type.replace( rnamespaces, "" );
-			}
-
-			if ( type === "hover" ) {
-				types.push( "mouseenter" + namespaces, "mouseleave" + namespaces );
-				continue;
-			}
-
-			preType = type;
-
-			if ( type === "focus" || type === "blur" ) {
-				types.push( liveMap[ type ] + namespaces );
-				type = type + namespaces;
-
-			} else {
-				type = (liveMap[ type ] || type) + namespaces;
-			}
-
-			if ( name === "live" ) {
-				// bind live handler
-				for ( var j = 0, l = context.length; j < l; j++ ) {
-					jQuery.event.add( context[j], "live." + liveConvert( type, selector ),
-						{ data: data, selector: selector, handler: fn, origType: type, origHandler: fn, preType: preType } );
-				}
-
-			} else {
-				// unbind live handler
-				context.unbind( "live." + liveConvert( type, selector ), fn );
-			}
-		}
-		
-		return this;
-	};
-});
-
-function liveHandler( event ) {
-	var stop, maxLevel, related, match, handleObj, elem, j, i, l, data, close, namespace, ret,
-		elems = [],
-		selectors = [],
-		events = jQuery.data( this, this.nodeType ? "events" : "__events__" );
-
-	if ( typeof events === "function" ) {
-		events = events.events;
-	}
-
-	// Make sure we avoid non-left-click bubbling in Firefox (#3861)
-	if ( event.liveFired === this || !events || !events.live || event.button && event.type === "click" ) {
-		return;
-	}
-	
-	if ( event.namespace ) {
-		namespace = new RegExp("(^|\\.)" + event.namespace.split(".").join("\\.(?:.*\\.)?") + "(\\.|$)");
-	}
-
-	event.liveFired = this;
-
-	var live = events.live.slice(0);
-
-	for ( j = 0; j < live.length; j++ ) {
-		handleObj = live[j];
-
-		if ( handleObj.origType.replace( rnamespaces, "" ) === event.type ) {
-			selectors.push( handleObj.selector );
-
-		} else {
-			live.splice( j--, 1 );
-		}
-	}
-
-	match = jQuery( event.target ).closest( selectors, event.currentTarget );
-
-	for ( i = 0, l = match.length; i < l; i++ ) {
-		close = match[i];
-
-		for ( j = 0; j < live.length; j++ ) {
-			handleObj = live[j];
-
-			if ( close.selector === handleObj.selector && (!namespace || namespace.test( handleObj.namespace )) ) {
-				elem = close.elem;
-				related = null;
-
-				// Those two events require additional checking
-				if ( handleObj.preType === "mouseenter" || handleObj.preType === "mouseleave" ) {
-					event.type = handleObj.preType;
-					related = jQuery( event.relatedTarget ).closest( handleObj.selector )[0];
-				}
-
-				if ( !related || related !== elem ) {
-					elems.push({ elem: elem, handleObj: handleObj, level: close.level });
-				}
-			}
-		}
-	}
-
-	for ( i = 0, l = elems.length; i < l; i++ ) {
-		match = elems[i];
-
-		if ( maxLevel && match.level > maxLevel ) {
-			break;
-		}
-
-		event.currentTarget = match.elem;
-		event.data = match.handleObj.data;
-		event.handleObj = match.handleObj;
-
-		ret = match.handleObj.origHandler.apply( match.elem, arguments );
-
-		if ( ret === false || event.isPropagationStopped() ) {
-			maxLevel = match.level;
-
-			if ( ret === false ) {
-				stop = false;
-			}
-			if ( event.isImmediatePropagationStopped() ) {
-				break;
-			}
-		}
-	}
-
-	return stop;
-}
-
-function liveConvert( type, selector ) {
-	return (type && type !== "*" ? type + "." : "") + selector.replace(rperiod, "`").replace(rspace, "&");
-}
-
-jQuery.each( ("blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error").split(" "), function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		if ( fn == null ) {
-			fn = data;
-			data = null;
-		}
-
-		return arguments.length > 0 ?
-			this.bind( name, data, fn ) :
-			this.trigger( name );
-	};
-
-	if ( jQuery.attrFn ) {
-		jQuery.attrFn[ name ] = true;
-	}
-});
-
-// Prevent memory leaks in IE
-// Window isn't included so as not to unbind existing unload events
-// More info:
-//  - http://isaacschlueter.com/2006/10/msie-memory-leaks/
-if ( window.attachEvent && !window.addEventListener ) {
-	jQuery(window).bind("unload", function() {
-		for ( var id in jQuery.cache ) {
-			if ( jQuery.cache[ id ].handle ) {
-				// Try/Catch is to handle iframes being unloaded, see #4280
-				try {
-					jQuery.event.remove( jQuery.cache[ id ].handle.elem );
-				} catch(e) {}
-			}
-		}
-	});
-}
-
-
-/*!
- * Sizzle CSS Selector Engine - v1.0
- *  Copyright 2009, The Dojo Foundation
- *  Released under the MIT, BSD, and GPL Licenses.
- *  More information: http://sizzlejs.com/
- */
-(function(){
-
-var chunker = /((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,
-	done = 0,
-	toString = Object.prototype.toString,
-	hasDuplicate = false,
-	baseHasDuplicate = true;
-
-// Here we check if the JavaScript engine is using some sort of
-// optimization where it does not always call our comparision
-// function. If that is the case, discard the hasDuplicate value.
-//   Thus far that includes Google Chrome.
-[0, 0].sort(function() {
-	baseHasDuplicate = false;
-	return 0;
-});
-
-var Sizzle = function( selector, context, results, seed ) {
-	results = results || [];
-	context = context || document;
-
-	var origContext = context;
-
-	if ( context.nodeType !== 1 && context.nodeType !== 9 ) {
-		return [];
-	}
-	
-	if ( !selector || typeof selector !== "string" ) {
-		return results;
-	}
-
-	var m, set, checkSet, extra, ret, cur, pop, i,
-		prune = true,
-		contextXML = Sizzle.isXML( context ),
-		parts = [],
-		soFar = selector;
-	
-	// Reset the position of the chunker regexp (start from head)
-	do {
-		chunker.exec( "" );
-		m = chunker.exec( soFar );
-
-		if ( m ) {
-			soFar = m[3];
-		
-			parts.push( m[1] );
-		
-			if ( m[2] ) {
-				extra = m[3];
-				break;
-			}
-		}
-	} while ( m );
-
-	if ( parts.length > 1 && origPOS.exec( selector ) ) {
-
-		if ( parts.length === 2 && Expr.relative[ parts[0] ] ) {
-			set = posProcess( parts[0] + parts[1], context );
-
-		} else {
-			set = Expr.relative[ parts[0] ] ?
-				[ context ] :
-				Sizzle( parts.shift(), context );
-
-			while ( parts.length ) {
-				selector = parts.shift();
-
-				if ( Expr.relative[ selector ] ) {
-					selector += parts.shift();
-				}
-				
-				set = posProcess( selector, set );
-			}
-		}
-
-	} else {
-		// Take a shortcut and set the context if the root selector is an ID
-		// (but not if it'll be faster if the inner selector is an ID)
-		if ( !seed && parts.length > 1 && context.nodeType === 9 && !contextXML &&
-				Expr.match.ID.test(parts[0]) && !Expr.match.ID.test(parts[parts.length - 1]) ) {
-
-			ret = Sizzle.find( parts.shift(), context, contextXML );
-			context = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set )[0] :
-				ret.set[0];
-		}
-
-		if ( context ) {
-			ret = seed ?
-				{ expr: parts.pop(), set: makeArray(seed) } :
-				Sizzle.find( parts.pop(), parts.length === 1 && (parts[0] === "~" || parts[0] === "+") && context.parentNode ? context.parentNode : context, contextXML );
-
-			set = ret.expr ?
-				Sizzle.filter( ret.expr, ret.set ) :
-				ret.set;
-
-			if ( parts.length > 0 ) {
-				checkSet = makeArray( set );
-
-			} else {
-				prune = false;
-			}
-
-			while ( parts.length ) {
-				cur = parts.pop();
-				pop = cur;
-
-				if ( !Expr.relative[ cur ] ) {
-					cur = "";
-				} else {
-					pop = parts.pop();
-				}
-
-				if ( pop == null ) {
-					pop = context;
-				}
-
-				Expr.relative[ cur ]( checkSet, pop, contextXML );
-			}
-
-		} else {
-			checkSet = parts = [];
-		}
-	}
-
-	if ( !checkSet ) {
-		checkSet = set;
-	}
-
-	if ( !checkSet ) {
-		Sizzle.error( cur || selector );
-	}
-
-	if ( toString.call(checkSet) === "[object Array]" ) {
-		if ( !prune ) {
-			results.push.apply( results, checkSet );
-
-		} else if ( context && context.nodeType === 1 ) {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && (checkSet[i] === true || checkSet[i].nodeType === 1 && Sizzle.contains(context, checkSet[i])) ) {
-					results.push( set[i] );
-				}
-			}
-
-		} else {
-			for ( i = 0; checkSet[i] != null; i++ ) {
-				if ( checkSet[i] && checkSet[i].nodeType === 1 ) {
-					results.push( set[i] );
-				}
-			}
-		}
-
-	} else {
-		makeArray( checkSet, results );
-	}
-
-	if ( extra ) {
-		Sizzle( extra, origContext, results, seed );
-		Sizzle.uniqueSort( results );
-	}
-
-	return results;
-};
-
-Sizzle.uniqueSort = function( results ) {
-	if ( sortOrder ) {
-		hasDuplicate = baseHasDuplicate;
-		results.sort( sortOrder );
-
-		if ( hasDuplicate ) {
-			for ( var i = 1; i < results.length; i++ ) {
-				if ( results[i] === results[ i - 1 ] ) {
-					results.splice( i--, 1 );
-				}
-			}
-		}
-	}
-
-	return results;
-};
-
-Sizzle.matches = function( expr, set ) {
-	return Sizzle( expr, null, null, set );
-};
-
-Sizzle.matchesSelector = function( node, expr ) {
-	return Sizzle( expr, null, null, [node] ).length > 0;
-};
-
-Sizzle.find = function( expr, context, isXML ) {
-	var set;
-
-	if ( !expr ) {
-		return [];
-	}
-
-	for ( var i = 0, l = Expr.order.length; i < l; i++ ) {
-		var match,
-			type = Expr.order[i];
-		
-		if ( (match = Expr.leftMatch[ type ].exec( expr )) ) {
-			var left = match[1];
-			match.splice( 1, 1 );
-
-			if ( left.substr( left.length - 1 ) !== "\\" ) {
-				match[1] = (match[1] || "").replace(/\\/g, "");
-				set = Expr.find[ type ]( match, context, isXML );
-
-				if ( set != null ) {
-					expr = expr.replace( Expr.match[ type ], "" );
-					break;
-				}
-			}
-		}
-	}
-
-	if ( !set ) {
-		set = context.getElementsByTagName( "*" );
-	}
-
-	return { set: set, expr: expr };
-};
-
-Sizzle.filter = function( expr, set, inplace, not ) {
-	var match, anyFound,
-		old = expr,
-		result = [],
-		curLoop = set,
-		isXMLFilter = set && set[0] && Sizzle.isXML( set[0] );
-
-	while ( expr && set.length ) {
-		for ( var type in Expr.filter ) {
-			if ( (match = Expr.leftMatch[ type ].exec( expr )) != null && match[2] ) {
-				var found, item,
-					filter = Expr.filter[ type ],
-					left = match[1];
-
-				anyFound = false;
-
-				match.splice(1,1);
-
-				if ( left.substr( left.length - 1 ) === "\\" ) {
-					continue;
-				}
-
-				if ( curLoop === result ) {
-					result = [];
-				}
-
-				if ( Expr.preFilter[ type ] ) {
-					match = Expr.preFilter[ type ]( match, curLoop, inplace, result, not, isXMLFilter );
-
-					if ( !match ) {
-						anyFound = found = true;
-
-					} else if ( match === true ) {
-						continue;
-					}
-				}
-
-				if ( match ) {
-					for ( var i = 0; (item = curLoop[i]) != null; i++ ) {
-						if ( item ) {
-							found = filter( item, match, i, curLoop );
-							var pass = not ^ !!found;
-
-							if ( inplace && found != null ) {
-								if ( pass ) {
-									anyFound = true;
-
-								} else {
-									curLoop[i] = false;
-								}
-
-							} else if ( pass ) {
-								result.push( item );
-								anyFound = true;
-							}
-						}
-					}
-				}
-
-				if ( found !== undefined ) {
-					if ( !inplace ) {
-						curLoop = result;
-					}
-
-					expr = expr.replace( Expr.match[ type ], "" );
-
-					if ( !anyFound ) {
-						return [];
-					}
-
-					break;
-				}
-			}
-		}
-
-		// Improper expression
-		if ( expr === old ) {
-			if ( anyFound == null ) {
-				Sizzle.error( expr );
-
-			} else {
-				break;
-			}
-		}
-
-		old = expr;
-	}
-
-	return curLoop;
-};
-
-Sizzle.error = function( msg ) {
-	throw "Syntax error, unrecognized expression: " + msg;
-};
-
-var Expr = Sizzle.selectors = {
-	order: [ "ID", "NAME", "TAG" ],
-
-	match: {
-		ID: /#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		CLASS: /\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,
-		NAME: /\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,
-		ATTR: /\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(['"]*)(.*?)\3|)\s*\]/,
-		TAG: /^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,
-		CHILD: /:(only|nth|last|first)-child(?:\((even|odd|[\dn+\-]*)\))?/,
-		POS: /:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,
-		PSEUDO: /:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/
-	},
-
-	leftMatch: {},
-
-	attrMap: {
-		"class": "className",
-		"for": "htmlFor"
-	},
-
-	attrHandle: {
-		href: function( elem ) {
-			return elem.getAttribute( "href" );
-		}
-	},
-
-	relative: {
-		"+": function(checkSet, part){
-			var isPartStr = typeof part === "string",
-				isTag = isPartStr && !/\W/.test( part ),
-				isPartStrNotTag = isPartStr && !isTag;
-
-			if ( isTag ) {
-				part = part.toLowerCase();
-			}
-
-			for ( var i = 0, l = checkSet.length, elem; i < l; i++ ) {
-				if ( (elem = checkSet[i]) ) {
-					while ( (elem = elem.previousSibling) && elem.nodeType !== 1 ) {}
-
-					checkSet[i] = isPartStrNotTag || elem && elem.nodeName.toLowerCase() === part ?
-						elem || false :
-						elem === part;
-				}
-			}
-
-			if ( isPartStrNotTag ) {
-				Sizzle.filter( part, checkSet, true );
-			}
-		},
-
-		">": function( checkSet, part ) {
-			var elem,
-				isPartStr = typeof part === "string",
-				i = 0,
-				l = checkSet.length;
-
-			if ( isPartStr && !/\W/.test( part ) ) {
-				part = part.toLowerCase();
-
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						var parent = elem.parentNode;
-						checkSet[i] = parent.nodeName.toLowerCase() === part ? parent : false;
-					}
-				}
-
-			} else {
-				for ( ; i < l; i++ ) {
-					elem = checkSet[i];
-
-					if ( elem ) {
-						checkSet[i] = isPartStr ?
-							elem.parentNode :
-							elem.parentNode === part;
-					}
-				}
-
-				if ( isPartStr ) {
-					Sizzle.filter( part, checkSet, true );
-				}
-			}
-		},
-
-		"": function(checkSet, part, isXML){
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test(part) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "parentNode", part, doneName, checkSet, nodeCheck, isXML );
-		},
-
-		"~": function( checkSet, part, isXML ) {
-			var nodeCheck,
-				doneName = done++,
-				checkFn = dirCheck;
-
-			if ( typeof part === "string" && !/\W/.test( part ) ) {
-				part = part.toLowerCase();
-				nodeCheck = part;
-				checkFn = dirNodeCheck;
-			}
-
-			checkFn( "previousSibling", part, doneName, checkSet, nodeCheck, isXML );
-		}
-	},
-
-	find: {
-		ID: function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-				// Check parentNode to catch when Blackberry 4.6 returns
-				// nodes that are no longer in the document #6963
-				return m && m.parentNode ? [m] : [];
-			}
-		},
-
-		NAME: function( match, context ) {
-			if ( typeof context.getElementsByName !== "undefined" ) {
-				var ret = [],
-					results = context.getElementsByName( match[1] );
-
-				for ( var i = 0, l = results.length; i < l; i++ ) {
-					if ( results[i].getAttribute("name") === match[1] ) {
-						ret.push( results[i] );
-					}
-				}
-
-				return ret.length === 0 ? null : ret;
-			}
-		},
-
-		TAG: function( match, context ) {
-			return context.getElementsByTagName( match[1] );
-		}
-	},
-	preFilter: {
-		CLASS: function( match, curLoop, inplace, result, not, isXML ) {
-			match = " " + match[1].replace(/\\/g, "") + " ";
-
-			if ( isXML ) {
-				return match;
-			}
-
-			for ( var i = 0, elem; (elem = curLoop[i]) != null; i++ ) {
-				if ( elem ) {
-					if ( not ^ (elem.className && (" " + elem.className + " ").replace(/[\t\n]/g, " ").indexOf(match) >= 0) ) {
-						if ( !inplace ) {
-							result.push( elem );
-						}
-
-					} else if ( inplace ) {
-						curLoop[i] = false;
-					}
-				}
-			}
-
-			return false;
-		},
-
-		ID: function( match ) {
-			return match[1].replace(/\\/g, "");
-		},
-
-		TAG: function( match, curLoop ) {
-			return match[1].toLowerCase();
-		},
-
-		CHILD: function( match ) {
-			if ( match[1] === "nth" ) {
-				// parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6'
-				var test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec(
-					match[2] === "even" && "2n" || match[2] === "odd" && "2n+1" ||
-					!/\D/.test( match[2] ) && "0n+" + match[2] || match[2]);
-
-				// calculate the numbers (first)n+(last) including if they are negative
-				match[2] = (test[1] + (test[2] || 1)) - 0;
-				match[3] = test[3] - 0;
-			}
-
-			// TODO: Move to normal caching system
-			match[0] = done++;
-
-			return match;
-		},
-
-		ATTR: function( match, curLoop, inplace, result, not, isXML ) {
-			var name = match[1].replace(/\\/g, "");
-			
-			if ( !isXML && Expr.attrMap[name] ) {
-				match[1] = Expr.attrMap[name];
-			}
-
-			if ( match[2] === "~=" ) {
-				match[4] = " " + match[4] + " ";
-			}
-
-			return match;
-		},
-
-		PSEUDO: function( match, curLoop, inplace, result, not ) {
-			if ( match[1] === "not" ) {
-				// If we're dealing with a complex expression, or a simple one
-				if ( ( chunker.exec(match[3]) || "" ).length > 1 || /^\w/.test(match[3]) ) {
-					match[3] = Sizzle(match[3], null, null, curLoop);
-
-				} else {
-					var ret = Sizzle.filter(match[3], curLoop, inplace, true ^ not);
-
-					if ( !inplace ) {
-						result.push.apply( result, ret );
-					}
-
-					return false;
-				}
-
-			} else if ( Expr.match.POS.test( match[0] ) || Expr.match.CHILD.test( match[0] ) ) {
-				return true;
-			}
-			
-			return match;
-		},
-
-		POS: function( match ) {
-			match.unshift( true );
-
-			return match;
-		}
-	},
-	
-	filters: {
-		enabled: function( elem ) {
-			return elem.disabled === false && elem.type !== "hidden";
-		},
-
-		disabled: function( elem ) {
-			return elem.disabled === true;
-		},
-
-		checked: function( elem ) {
-			return elem.checked === true;
-		},
-		
-		selected: function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			elem.parentNode.selectedIndex;
-			
-			return elem.selected === true;
-		},
-
-		parent: function( elem ) {
-			return !!elem.firstChild;
-		},
-
-		empty: function( elem ) {
-			return !elem.firstChild;
-		},
-
-		has: function( elem, i, match ) {
-			return !!Sizzle( match[3], elem ).length;
-		},
-
-		header: function( elem ) {
-			return (/h\d/i).test( elem.nodeName );
-		},
-
-		text: function( elem ) {
-			return "text" === elem.type;
-		},
-		radio: function( elem ) {
-			return "radio" === elem.type;
-		},
-
-		checkbox: function( elem ) {
-			return "checkbox" === elem.type;
-		},
-
-		file: function( elem ) {
-			return "file" === elem.type;
-		},
-		password: function( elem ) {
-			return "password" === elem.type;
-		},
-
-		submit: function( elem ) {
-			return "submit" === elem.type;
-		},
-
-		image: function( elem ) {
-			return "image" === elem.type;
-		},
-
-		reset: function( elem ) {
-			return "reset" === elem.type;
-		},
-
-		button: function( elem ) {
-			return "button" === elem.type || elem.nodeName.toLowerCase() === "button";
-		},
-
-		input: function( elem ) {
-			return (/input|select|textarea|button/i).test( elem.nodeName );
-		}
-	},
-	setFilters: {
-		first: function( elem, i ) {
-			return i === 0;
-		},
-
-		last: function( elem, i, match, array ) {
-			return i === array.length - 1;
-		},
-
-		even: function( elem, i ) {
-			return i % 2 === 0;
-		},
-
-		odd: function( elem, i ) {
-			return i % 2 === 1;
-		},
-
-		lt: function( elem, i, match ) {
-			return i < match[3] - 0;
-		},
-
-		gt: function( elem, i, match ) {
-			return i > match[3] - 0;
-		},
-
-		nth: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		},
-
-		eq: function( elem, i, match ) {
-			return match[3] - 0 === i;
-		}
-	},
-	filter: {
-		PSEUDO: function( elem, match, i, array ) {
-			var name = match[1],
-				filter = Expr.filters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-
-			} else if ( name === "contains" ) {
-				return (elem.textContent || elem.innerText || Sizzle.getText([ elem ]) || "").indexOf(match[3]) >= 0;
-
-			} else if ( name === "not" ) {
-				var not = match[3];
-
-				for ( var j = 0, l = not.length; j < l; j++ ) {
-					if ( not[j] === elem ) {
-						return false;
-					}
-				}
-
-				return true;
-
-			} else {
-				Sizzle.error( "Syntax error, unrecognized expression: " + name );
-			}
-		},
-
-		CHILD: function( elem, match ) {
-			var type = match[1],
-				node = elem;
-
-			switch ( type ) {
-				case "only":
-				case "first":
-					while ( (node = node.previousSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-
-					if ( type === "first" ) { 
-						return true; 
-					}
-
-					node = elem;
-
-				case "last":
-					while ( (node = node.nextSibling) )	 {
-						if ( node.nodeType === 1 ) { 
-							return false; 
-						}
-					}
-
-					return true;
-
-				case "nth":
-					var first = match[2],
-						last = match[3];
-
-					if ( first === 1 && last === 0 ) {
-						return true;
-					}
-					
-					var doneName = match[0],
-						parent = elem.parentNode;
-	
-					if ( parent && (parent.sizcache !== doneName || !elem.nodeIndex) ) {
-						var count = 0;
-						
-						for ( node = parent.firstChild; node; node = node.nextSibling ) {
-							if ( node.nodeType === 1 ) {
-								node.nodeIndex = ++count;
-							}
-						} 
-
-						parent.sizcache = doneName;
-					}
-					
-					var diff = elem.nodeIndex - last;
-
-					if ( first === 0 ) {
-						return diff === 0;
-
-					} else {
-						return ( diff % first === 0 && diff / first >= 0 );
-					}
-			}
-		},
-
-		ID: function( elem, match ) {
-			return elem.nodeType === 1 && elem.getAttribute("id") === match;
-		},
-
-		TAG: function( elem, match ) {
-			return (match === "*" && elem.nodeType === 1) || elem.nodeName.toLowerCase() === match;
-		},
-		
-		CLASS: function( elem, match ) {
-			return (" " + (elem.className || elem.getAttribute("class")) + " ")
-				.indexOf( match ) > -1;
-		},
-
-		ATTR: function( elem, match ) {
-			var name = match[1],
-				result = Expr.attrHandle[ name ] ?
-					Expr.attrHandle[ name ]( elem ) :
-					elem[ name ] != null ?
-						elem[ name ] :
-						elem.getAttribute( name ),
-				value = result + "",
-				type = match[2],
-				check = match[4];
-
-			return result == null ?
-				type === "!=" :
-				type === "=" ?
-				value === check :
-				type === "*=" ?
-				value.indexOf(check) >= 0 :
-				type === "~=" ?
-				(" " + value + " ").indexOf(check) >= 0 :
-				!check ?
-				value && result !== false :
-				type === "!=" ?
-				value !== check :
-				type === "^=" ?
-				value.indexOf(check) === 0 :
-				type === "$=" ?
-				value.substr(value.length - check.length) === check :
-				type === "|=" ?
-				value === check || value.substr(0, check.length + 1) === check + "-" :
-				false;
-		},
-
-		POS: function( elem, match, i, array ) {
-			var name = match[2],
-				filter = Expr.setFilters[ name ];
-
-			if ( filter ) {
-				return filter( elem, i, match, array );
-			}
-		}
-	}
-};
-
-var origPOS = Expr.match.POS,
-	fescape = function(all, num){
-		return "\\" + (num - 0 + 1);
-	};
-
-for ( var type in Expr.match ) {
-	Expr.match[ type ] = new RegExp( Expr.match[ type ].source + (/(?![^\[]*\])(?![^\(]*\))/.source) );
-	Expr.leftMatch[ type ] = new RegExp( /(^(?:.|\r|\n)*?)/.source + Expr.match[ type ].source.replace(/\\(\d+)/g, fescape) );
-}
-
-var makeArray = function( array, results ) {
-	array = Array.prototype.slice.call( array, 0 );
-
-	if ( results ) {
-		results.push.apply( results, array );
-		return results;
-	}
-	
-	return array;
-};
-
-// Perform a simple check to determine if the browser is capable of
-// converting a NodeList to an array using builtin methods.
-// Also verifies that the returned array holds DOM nodes
-// (which is not the case in the Blackberry browser)
-try {
-	Array.prototype.slice.call( document.documentElement.childNodes, 0 )[0].nodeType;
-
-// Provide a fallback method if it does not work
-} catch( e ) {
-	makeArray = function( array, results ) {
-		var i = 0,
-			ret = results || [];
-
-		if ( toString.call(array) === "[object Array]" ) {
-			Array.prototype.push.apply( ret, array );
-
-		} else {
-			if ( typeof array.length === "number" ) {
-				for ( var l = array.length; i < l; i++ ) {
-					ret.push( array[i] );
-				}
-
-			} else {
-				for ( ; array[i]; i++ ) {
-					ret.push( array[i] );
-				}
-			}
-		}
-
-		return ret;
-	};
-}
-
-var sortOrder, siblingCheck;
-
-if ( document.documentElement.compareDocumentPosition ) {
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		if ( !a.compareDocumentPosition || !b.compareDocumentPosition ) {
-			return a.compareDocumentPosition ? -1 : 1;
-		}
-
-		return a.compareDocumentPosition(b) & 4 ? -1 : 1;
-	};
-
-} else {
-	sortOrder = function( a, b ) {
-		var al, bl,
-			ap = [],
-			bp = [],
-			aup = a.parentNode,
-			bup = b.parentNode,
-			cur = aup;
-
-		// The nodes are identical, we can exit early
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-
-		// If the nodes are siblings (or identical) we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-
-		// If no parents were found then the nodes are disconnected
-		} else if ( !aup ) {
-			return -1;
-
-		} else if ( !bup ) {
-			return 1;
-		}
-
-		// Otherwise they're somewhere else in the tree so we need
-		// to build up a full list of the parentNodes for comparison
-		while ( cur ) {
-			ap.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		cur = bup;
-
-		while ( cur ) {
-			bp.unshift( cur );
-			cur = cur.parentNode;
-		}
-
-		al = ap.length;
-		bl = bp.length;
-
-		// Start walking down the tree looking for a discrepancy
-		for ( var i = 0; i < al && i < bl; i++ ) {
-			if ( ap[i] !== bp[i] ) {
-				return siblingCheck( ap[i], bp[i] );
-			}
-		}
-
-		// We ended someplace up the tree so do a sibling check
-		return i === al ?
-			siblingCheck( a, bp[i], -1 ) :
-			siblingCheck( ap[i], b, 1 );
-	};
-
-	siblingCheck = function( a, b, ret ) {
-		if ( a === b ) {
-			return ret;
-		}
-
-		var cur = a.nextSibling;
-
-		while ( cur ) {
-			if ( cur === b ) {
-				return -1;
-			}
-
-			cur = cur.nextSibling;
-		}
-
-		return 1;
-	};
-}
-
-// Utility function for retreiving the text value of an array of DOM nodes
-Sizzle.getText = function( elems ) {
-	var ret = "", elem;
-
-	for ( var i = 0; elems[i]; i++ ) {
-		elem = elems[i];
-
-		// Get the text from text nodes and CDATA nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
-			ret += elem.nodeValue;
-
-		// Traverse everything else, except comment nodes
-		} else if ( elem.nodeType !== 8 ) {
-			ret += Sizzle.getText( elem.childNodes );
-		}
-	}
-
-	return ret;
-};
-
-// Check to see if the browser returns elements by name when
-// querying by getElementById (and provide a workaround)
-(function(){
-	// We're going to inject a fake input element with a specified name
-	var form = document.createElement("div"),
-		id = "script" + (new Date()).getTime(),
-		root = document.documentElement;
-
-	form.innerHTML = "<a name='" + id + "'/>";
-
-	// Inject it into the root element, check its status, and remove it quickly
-	root.insertBefore( form, root.firstChild );
-
-	// The workaround has to do additional checks after a getElementById
-	// Which slows things down for other browsers (hence the branching)
-	if ( document.getElementById( id ) ) {
-		Expr.find.ID = function( match, context, isXML ) {
-			if ( typeof context.getElementById !== "undefined" && !isXML ) {
-				var m = context.getElementById(match[1]);
-
-				return m ?
-					m.id === match[1] || typeof m.getAttributeNode !== "undefined" && m.getAttributeNode("id").nodeValue === match[1] ?
-						[m] :
-						undefined :
-					[];
-			}
-		};
-
-		Expr.filter.ID = function( elem, match ) {
-			var node = typeof elem.getAttributeNode !== "undefined" && elem.getAttributeNode("id");
-
-			return elem.nodeType === 1 && node && node.nodeValue === match;
-		};
-	}
-
-	root.removeChild( form );
-
-	// release memory in IE
-	root = form = null;
-})();
-
-(function(){
-	// Check to see if the browser returns only elements
-	// when doing getElementsByTagName("*")
-
-	// Create a fake element
-	var div = document.createElement("div");
-	div.appendChild( document.createComment("") );
-
-	// Make sure no comments are found
-	if ( div.getElementsByTagName("*").length > 0 ) {
-		Expr.find.TAG = function( match, context ) {
-			var results = context.getElementsByTagName( match[1] );
-
-			// Filter out possible comments
-			if ( match[1] === "*" ) {
-				var tmp = [];
-
-				for ( var i = 0; results[i]; i++ ) {
-					if ( results[i].nodeType === 1 ) {
-						tmp.push( results[i] );
-					}
-				}
-
-				results = tmp;
-			}
-
-			return results;
-		};
-	}
-
-	// Check to see if an attribute returns normalized href attributes
-	div.innerHTML = "<a href='#'></a>";
-
-	if ( div.firstChild && typeof div.firstChild.getAttribute !== "undefined" &&
-			div.firstChild.getAttribute("href") !== "#" ) {
-
-		Expr.attrHandle.href = function( elem ) {
-			return elem.getAttribute( "href", 2 );
-		};
-	}
-
-	// release memory in IE
-	div = null;
-})();
-
-if ( document.querySelectorAll ) {
-	(function(){
-		var oldSizzle = Sizzle,
-			div = document.createElement("div"),
-			id = "__sizzle__";
-
-		div.innerHTML = "<p class='TEST'></p>";
-
-		// Safari can't handle uppercase or unicode characters when
-		// in quirks mode.
-		if ( div.querySelectorAll && div.querySelectorAll(".TEST").length === 0 ) {
-			return;
-		}
-	
-		Sizzle = function( query, context, extra, seed ) {
-			context = context || document;
-
-			// Make sure that attribute selectors are quoted
-			query = query.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
-			// Only use querySelectorAll on non-XML documents
-			// (ID selectors don't work in non-HTML documents)
-			if ( !seed && !Sizzle.isXML(context) ) {
-				if ( context.nodeType === 9 ) {
-					try {
-						return makeArray( context.querySelectorAll(query), extra );
-					} catch(qsaError) {}
-
-				// qSA works strangely on Element-rooted queries
-				// We can work around this by specifying an extra ID on the root
-				// and working up from there (Thanks to Andrew Dupont for the technique)
-				// IE 8 doesn't work on object elements
-				} else if ( context.nodeType === 1 && context.nodeName.toLowerCase() !== "object" ) {
-					var old = context.getAttribute( "id" ),
-						nid = old || id;
-
-					if ( !old ) {
-						context.setAttribute( "id", nid );
-					}
-
-					try {
-						return makeArray( context.querySelectorAll( "#" + nid + " " + query ), extra );
-
-					} catch(pseudoError) {
-					} finally {
-						if ( !old ) {
-							context.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-		
-			return oldSizzle(query, context, extra, seed);
-		};
-
-		for ( var prop in oldSizzle ) {
-			Sizzle[ prop ] = oldSizzle[ prop ];
-		}
-
-		// release memory in IE
-		div = null;
-	})();
-}
-
-(function(){
-	var html = document.documentElement,
-		matches = html.matchesSelector || html.mozMatchesSelector || html.webkitMatchesSelector || html.msMatchesSelector,
-		pseudoWorks = false;
-
-	try {
-		// This should fail with an exception
-		// Gecko does not error, returns false instead
-		matches.call( document.documentElement, "[test!='']:sizzle" );
-	
-	} catch( pseudoError ) {
-		pseudoWorks = true;
-	}
-
-	if ( matches ) {
-		Sizzle.matchesSelector = function( node, expr ) {
-			// Make sure that attribute selectors are quoted
-			expr = expr.replace(/\=\s*([^'"\]]*)\s*\]/g, "='$1']");
-
-			if ( !Sizzle.isXML( node ) ) {
-				try { 
-					if ( pseudoWorks || !Expr.match.PSEUDO.test( expr ) && !/!=/.test( expr ) ) {
-						return matches.call( node, expr );
-					}
-				} catch(e) {}
-			}
-
-			return Sizzle(expr, null, null, [node]).length > 0;
-		};
-	}
-})();
-
-(function(){
-	var div = document.createElement("div");
-
-	div.innerHTML = "<div class='test e'></div><div class='test'></div>";
-
-	// Opera can't find a second classname (in 9.6)
-	// Also, make sure that getElementsByClassName actually exists
-	if ( !div.getElementsByClassName || div.getElementsByClassName("e").length === 0 ) {
-		return;
-	}
-
-	// Safari caches class attributes, doesn't catch changes (in 3.2)
-	div.lastChild.className = "e";
-
-	if ( div.getElementsByClassName("e").length === 1 ) {
-		return;
-	}
-	
-	Expr.order.splice(1, 0, "CLASS");
-	Expr.find.CLASS = function( match, context, isXML ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && !isXML ) {
-			return context.getElementsByClassName(match[1]);
-		}
-	};
-
-	// release memory in IE
-	div = null;
-})();
-
-function dirNodeCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 && !isXML ){
-					elem.sizcache = doneName;
-					elem.sizset = i;
-				}
-
-				if ( elem.nodeName.toLowerCase() === cur ) {
-					match = elem;
-					break;
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-function dirCheck( dir, cur, doneName, checkSet, nodeCheck, isXML ) {
-	for ( var i = 0, l = checkSet.length; i < l; i++ ) {
-		var elem = checkSet[i];
-
-		if ( elem ) {
-			var match = false;
-			
-			elem = elem[dir];
-
-			while ( elem ) {
-				if ( elem.sizcache === doneName ) {
-					match = checkSet[elem.sizset];
-					break;
-				}
-
-				if ( elem.nodeType === 1 ) {
-					if ( !isXML ) {
-						elem.sizcache = doneName;
-						elem.sizset = i;
-					}
-
-					if ( typeof cur !== "string" ) {
-						if ( elem === cur ) {
-							match = true;
-							break;
-						}
-
-					} else if ( Sizzle.filter( cur, [elem] ).length > 0 ) {
-						match = elem;
-						break;
-					}
-				}
-
-				elem = elem[dir];
-			}
-
-			checkSet[i] = match;
-		}
-	}
-}
-
-if ( document.documentElement.contains ) {
-	Sizzle.contains = function( a, b ) {
-		return a !== b && (a.contains ? a.contains(b) : true);
-	};
-
-} else if ( document.documentElement.compareDocumentPosition ) {
-	Sizzle.contains = function( a, b ) {
-		return !!(a.compareDocumentPosition(b) & 16);
-	};
-
-} else {
-	Sizzle.contains = function() {
-		return false;
-	};
-}
-
-Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833) 
-	var documentElement = (elem ? elem.ownerDocument || elem : 0).documentElement;
-
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-var posProcess = function( selector, context ) {
-	var match,
-		tmpSet = [],
-		later = "",
-		root = context.nodeType ? [context] : context;
-
-	// Position selectors must be done after the filter
-	// And so must :not(positional) so we move all PSEUDOs to the end
-	while ( (match = Expr.match.PSEUDO.exec( selector )) ) {
-		later += match[0];
-		selector = selector.replace( Expr.match.PSEUDO, "" );
-	}
-
-	selector = Expr.relative[selector] ? selector + "*" : selector;
-
-	for ( var i = 0, l = root.length; i < l; i++ ) {
-		Sizzle( selector, root[i], tmpSet );
-	}
-
-	return Sizzle.filter( later, tmpSet );
-};
-
-// EXPOSE
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[":"] = jQuery.expr.filters;
-jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-})();
-
-
-var runtil = /Until$/,
-	rparentsprev = /^(?:parents|prevUntil|prevAll)/,
-	// Note: This RegExp should be improved, or likely pulled from Sizzle
-	rmultiselector = /,/,
-	isSimple = /^.[^:#\[\.,]*$/,
-	slice = Array.prototype.slice,
-	POS = jQuery.expr.match.POS;
-
-jQuery.fn.extend({
-	find: function( selector ) {
-		var ret = this.pushStack( "", "find", selector ),
-			length = 0;
-
-		for ( var i = 0, l = this.length; i < l; i++ ) {
-			length = ret.length;
-			jQuery.find( selector, this[i], ret );
-
-			if ( i > 0 ) {
-				// Make sure that the results are unique
-				for ( var n = length; n < ret.length; n++ ) {
-					for ( var r = 0; r < length; r++ ) {
-						if ( ret[r] === ret[n] ) {
-							ret.splice(n--, 1);
-							break;
-						}
-					}
-				}
-			}
-		}
-
-		return ret;
-	},
-
-	has: function( target ) {
-		var targets = jQuery( target );
-		return this.filter(function() {
-			for ( var i = 0, l = targets.length; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[i] ) ) {
-					return true;
-				}
-			}
-		});
-	},
-
-	not: function( selector ) {
-		return this.pushStack( winnow(this, selector, false), "not", selector);
-	},
-
-	filter: function( selector ) {
-		return this.pushStack( winnow(this, selector, true), "filter", selector );
-	},
-	
-	is: function( selector ) {
-		return !!selector && jQuery.filter( selector, this ).length > 0;
-	},
-
-	closest: function( selectors, context ) {
-		var ret = [], i, l, cur = this[0];
-
-		if ( jQuery.isArray( selectors ) ) {
-			var match, selector,
-				matches = {},
-				level = 1;
-
-			if ( cur && selectors.length ) {
-				for ( i = 0, l = selectors.length; i < l; i++ ) {
-					selector = selectors[i];
-
-					if ( !matches[selector] ) {
-						matches[selector] = jQuery.expr.match.POS.test( selector ) ? 
-							jQuery( selector, context || this.context ) :
-							selector;
-					}
-				}
-
-				while ( cur && cur.ownerDocument && cur !== context ) {
-					for ( selector in matches ) {
-						match = matches[selector];
-
-						if ( match.jquery ? match.index(cur) > -1 : jQuery(cur).is(match) ) {
-							ret.push({ selector: selector, elem: cur, level: level });
-						}
-					}
-
-					cur = cur.parentNode;
-					level++;
-				}
-			}
-
-			return ret;
-		}
-
-		var pos = POS.test( selectors ) ? 
-			jQuery( selectors, context || this.context ) : null;
-
-		for ( i = 0, l = this.length; i < l; i++ ) {
-			cur = this[i];
-
-			while ( cur ) {
-				if ( pos ? pos.index(cur) > -1 : jQuery.find.matchesSelector(cur, selectors) ) {
-					ret.push( cur );
-					break;
-
-				} else {
-					cur = cur.parentNode;
-					if ( !cur || !cur.ownerDocument || cur === context ) {
-						break;
-					}
-				}
-			}
-		}
-
-		ret = ret.length > 1 ? jQuery.unique(ret) : ret;
-		
-		return this.pushStack( ret, "closest", selectors );
-	},
-	
-	// Determine the position of an element within
-	// the matched set of elements
-	index: function( elem ) {
-		if ( !elem || typeof elem === "string" ) {
-			return jQuery.inArray( this[0],
-				// If it receives a string, the selector is used
-				// If it receives nothing, the siblings are used
-				elem ? jQuery( elem ) : this.parent().children() );
-		}
-		// Locate the position of the desired element
-		return jQuery.inArray(
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[0] : elem, this );
-	},
-
-	add: function( selector, context ) {
-		var set = typeof selector === "string" ?
-				jQuery( selector, context || this.context ) :
-				jQuery.makeArray( selector ),
-			all = jQuery.merge( this.get(), set );
-
-		return this.pushStack( isDisconnected( set[0] ) || isDisconnected( all[0] ) ?
-			all :
-			jQuery.unique( all ) );
-	},
-
-	andSelf: function() {
-		return this.add( this.prevObject );
-	}
-});
-
-// A painfully simple check to see if an element is disconnected
-// from a document (should be improved, where feasible).
-function isDisconnected( node ) {
-	return !node || !node.parentNode || node.parentNode.nodeType === 11;
-}
-
-jQuery.each({
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return jQuery.dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return jQuery.nth( elem, 2, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return jQuery.nth( elem, 2, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return jQuery.dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return jQuery.dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return jQuery.dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return jQuery.sibling( elem.parentNode.firstChild, elem );
-	},
-	children: function( elem ) {
-		return jQuery.sibling( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return jQuery.nodeName( elem, "iframe" ) ?
-			elem.contentDocument || elem.contentWindow.document :
-			jQuery.makeArray( elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var ret = jQuery.map( this, fn, until );
-		
-		if ( !runtil.test( name ) ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			ret = jQuery.filter( selector, ret );
-		}
-
-		ret = this.length > 1 ? jQuery.unique( ret ) : ret;
-
-		if ( (this.length > 1 || rmultiselector.test( selector )) && rparentsprev.test( name ) ) {
-			ret = ret.reverse();
-		}
-
-		return this.pushStack( ret, name, slice.call(arguments).join(",") );
-	};
-});
-
-jQuery.extend({
-	filter: function( expr, elems, not ) {
-		if ( not ) {
-			expr = ":not(" + expr + ")";
-		}
-
-		return elems.length === 1 ?
-			jQuery.find.matchesSelector(elems[0], expr) ? [ elems[0] ] : [] :
-			jQuery.find.matches(expr, elems);
-	},
-	
-	dir: function( elem, dir, until ) {
-		var matched = [],
-			cur = elem[ dir ];
-
-		while ( cur && cur.nodeType !== 9 && (until === undefined || cur.nodeType !== 1 || !jQuery( cur ).is( until )) ) {
-			if ( cur.nodeType === 1 ) {
-				matched.push( cur );
-			}
-			cur = cur[dir];
-		}
-		return matched;
-	},
-
-	nth: function( cur, result, dir, elem ) {
-		result = result || 1;
-		var num = 0;
-
-		for ( ; cur; cur = cur[dir] ) {
-			if ( cur.nodeType === 1 && ++num === result ) {
-				break;
-			}
-		}
-
-		return cur;
-	},
-
-	sibling: function( n, elem ) {
-		var r = [];
-
-		for ( ; n; n = n.nextSibling ) {
-			if ( n.nodeType === 1 && n !== elem ) {
-				r.push( n );
-			}
-		}
-
-		return r;
-	}
-});
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, keep ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			var retVal = !!qualifier.call( elem, i, elem );
-			return retVal === keep;
-		});
-
-	} else if ( qualifier.nodeType ) {
-		return jQuery.grep(elements, function( elem, i ) {
-			return (elem === qualifier) === keep;
-		});
-
-	} else if ( typeof qualifier === "string" ) {
-		var filtered = jQuery.grep(elements, function( elem ) {
-			return elem.nodeType === 1;
-		});
-
-		if ( isSimple.test( qualifier ) ) {
-			return jQuery.filter(qualifier, filtered, !keep);
-		} else {
-			qualifier = jQuery.filter( qualifier, filtered );
-		}
-	}
-
-	return jQuery.grep(elements, function( elem, i ) {
-		return (jQuery.inArray( elem, qualifier ) >= 0) === keep;
-	});
-}
-
-
-
-
-var rinlinejQuery = / jQuery\d+="(?:\d+|null)"/g,
-	rleadingWhitespace = /^\s+/,
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,
-	rtagName = /<([\w:]+)/,
-	rtbody = /<tbody/i,
-	rhtml = /<|&#?\w+;/,
-	rnocache = /<(?:script|object|embed|option|style)/i,
-	// checked="checked" or checked (html5)
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	raction = /\=([^="'>\s]+\/)>/g,
-	wrapMap = {
-		option: [ 1, "<select multiple='multiple'>", "</select>" ],
-		legend: [ 1, "<fieldset>", "</fieldset>" ],
-		thead: [ 1, "<table>", "</table>" ],
-		tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-		td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-		col: [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ],
-		area: [ 1, "<map>", "</map>" ],
-		_default: [ 0, "", "" ]
-	};
-
-wrapMap.optgroup = wrapMap.option;
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-// IE can't serialize <link> and <script> tags normally
-if ( !jQuery.support.htmlSerialize ) {
-	wrapMap._default = [ 1, "div<div>", "</div>" ];
-}
-
-jQuery.fn.extend({
-	text: function( text ) {
-		if ( jQuery.isFunction(text) ) {
-			return this.each(function(i) {
-				var self = jQuery( this );
-
-				self.text( text.call(this, i, self.text()) );
-			});
-		}
-
-		if ( typeof text !== "object" && text !== undefined ) {
-			return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) );
-		}
-
-		return jQuery.text( this );
-	},
-
-	wrapAll: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapAll( html.call(this, i) );
-			});
-		}
-
-		if ( this[0] ) {
-			// The elements to wrap the target around
-			var wrap = jQuery( html, this[0].ownerDocument ).eq(0).clone(true);
-
-			if ( this[0].parentNode ) {
-				wrap.insertBefore( this[0] );
-			}
-
-			wrap.map(function() {
-				var elem = this;
-
-				while ( elem.firstChild && elem.firstChild.nodeType === 1 ) {
-					elem = elem.firstChild;
-				}
-
-				return elem;
-			}).append(this);
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each(function(i) {
-				jQuery(this).wrapInner( html.call(this, i) );
-			});
-		}
-
-		return this.each(function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		});
-	},
-
-	wrap: function( html ) {
-		return this.each(function() {
-			jQuery( this ).wrapAll( html );
-		});
-	},
-
-	unwrap: function() {
-		return this.parent().each(function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		}).end();
-	},
-
-	append: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.appendChild( elem );
-			}
-		});
-	},
-
-	prepend: function() {
-		return this.domManip(arguments, true, function( elem ) {
-			if ( this.nodeType === 1 ) {
-				this.insertBefore( elem, this.firstChild );
-			}
-		});
-	},
-
-	before: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this );
-			});
-		} else if ( arguments.length ) {
-			var set = jQuery(arguments[0]);
-			set.push.apply( set, this.toArray() );
-			return this.pushStack( set, "before", arguments );
-		}
-	},
-
-	after: function() {
-		if ( this[0] && this[0].parentNode ) {
-			return this.domManip(arguments, false, function( elem ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			});
-		} else if ( arguments.length ) {
-			var set = this.pushStack( this, "after", arguments );
-			set.push.apply( set, jQuery(arguments[0]).toArray() );
-			return set;
-		}
-	},
-	
-	// keepData is for internal use only--do not document
-	remove: function( selector, keepData ) {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			if ( !selector || jQuery.filter( selector, [ elem ] ).length ) {
-				if ( !keepData && elem.nodeType === 1 ) {
-					jQuery.cleanData( elem.getElementsByTagName("*") );
-					jQuery.cleanData( [ elem ] );
-				}
-
-				if ( elem.parentNode ) {
-					 elem.parentNode.removeChild( elem );
-				}
-			}
-		}
-		
-		return this;
-	},
-
-	empty: function() {
-		for ( var i = 0, elem; (elem = this[i]) != null; i++ ) {
-			// Remove element nodes and prevent memory leaks
-			if ( elem.nodeType === 1 ) {
-				jQuery.cleanData( elem.getElementsByTagName("*") );
-			}
-
-			// Remove any remaining nodes
-			while ( elem.firstChild ) {
-				elem.removeChild( elem.firstChild );
-			}
-		}
-		
-		return this;
-	},
-
-	clone: function( events ) {
-		// Do the clone
-		var ret = this.map(function() {
-			if ( !jQuery.support.noCloneEvent && !jQuery.isXMLDoc(this) ) {
-				// IE copies events bound via attachEvent when
-				// using cloneNode. Calling detachEvent on the
-				// clone will also remove the events from the orignal
-				// In order to get around this, we use innerHTML.
-				// Unfortunately, this means some modifications to
-				// attributes in IE that are actually only stored
-				// as properties will not be copied (such as the
-				// the name attribute on an input).
-				var html = this.outerHTML,
-					ownerDocument = this.ownerDocument;
-
-				if ( !html ) {
-					var div = ownerDocument.createElement("div");
-					div.appendChild( this.cloneNode(true) );
-					html = div.innerHTML;
-				}
-
-				return jQuery.clean([html.replace(rinlinejQuery, "")
-					// Handle the case in IE 8 where action=/test/> self-closes a tag
-					.replace(raction, '="$1">')
-					.replace(rleadingWhitespace, "")], ownerDocument)[0];
-			} else {
-				return this.cloneNode(true);
-			}
-		});
-
-		// Copy the events from the original to the clone
-		if ( events === true ) {
-			cloneCopyEvent( this, ret );
-			cloneCopyEvent( this.find("*"), ret.find("*") );
-		}
-
-		// Return the cloned set
-		return ret;
-	},
-
-	html: function( value ) {
-		if ( value === undefined ) {
-			return this[0] && this[0].nodeType === 1 ?
-				this[0].innerHTML.replace(rinlinejQuery, "") :
-				null;
-
-		// See if we can take a shortcut and just use innerHTML
-		} else if ( typeof value === "string" && !rnocache.test( value ) &&
-			(jQuery.support.leadingWhitespace || !rleadingWhitespace.test( value )) &&
-			!wrapMap[ (rtagName.exec( value ) || ["", ""])[1].toLowerCase() ] ) {
-
-			value = value.replace(rxhtmlTag, "<$1></$2>");
-
-			try {
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					// Remove element nodes and prevent memory leaks
-					if ( this[i].nodeType === 1 ) {
-						jQuery.cleanData( this[i].getElementsByTagName("*") );
-						this[i].innerHTML = value;
-					}
-				}
-
-			// If using innerHTML throws an exception, use the fallback method
-			} catch(e) {
-				this.empty().append( value );
-			}
-
-		} else if ( jQuery.isFunction( value ) ) {
-			this.each(function(i){
-				var self = jQuery( this );
-
-				self.html( value.call(this, i, self.html()) );
-			});
-
-		} else {
-			this.empty().append( value );
-		}
-
-		return this;
-	},
-
-	replaceWith: function( value ) {
-		if ( this[0] && this[0].parentNode ) {
-			// Make sure that the elements are removed from the DOM before they are inserted
-			// this can help fix replacing a parent with child elements
-			if ( jQuery.isFunction( value ) ) {
-				return this.each(function(i) {
-					var self = jQuery(this), old = self.html();
-					self.replaceWith( value.call( this, i, old ) );
-				});
-			}
-
-			if ( typeof value !== "string" ) {
-				value = jQuery( value ).detach();
-			}
-
-			return this.each(function() {
-				var next = this.nextSibling,
-					parent = this.parentNode;
-
-				jQuery( this ).remove();
-
-				if ( next ) {
-					jQuery(next).before( value );
-				} else {
-					jQuery(parent).append( value );
-				}
-			});
-		} else {
-			return this.pushStack( jQuery(jQuery.isFunction(value) ? value() : value), "replaceWith", value );
-		}
-	},
-
-	detach: function( selector ) {
-		return this.remove( selector, true );
-	},
-
-	domManip: function( args, table, callback ) {
-		var results, first, fragment, parent,
-			value = args[0],
-			scripts = [];
-
-		// We can't cloneNode fragments that contain checked, in WebKit
-		if ( !jQuery.support.checkClone && arguments.length === 3 && typeof value === "string" && rchecked.test( value ) ) {
-			return this.each(function() {
-				jQuery(this).domManip( args, table, callback, true );
-			});
-		}
-
-		if ( jQuery.isFunction(value) ) {
-			return this.each(function(i) {
-				var self = jQuery(this);
-				args[0] = value.call(this, i, table ? self.html() : undefined);
-				self.domManip( args, table, callback );
-			});
-		}
-
-		if ( this[0] ) {
-			parent = value && value.parentNode;
-
-			// If we're in a fragment, just use that instead of building a new one
-			if ( jQuery.support.parentNode && parent && parent.nodeType === 11 && parent.childNodes.length === this.length ) {
-				results = { fragment: parent };
-
-			} else {
-				results = jQuery.buildFragment( args, this, scripts );
-			}
-			
-			fragment = results.fragment;
-			
-			if ( fragment.childNodes.length === 1 ) {
-				first = fragment = fragment.firstChild;
-			} else {
-				first = fragment.firstChild;
-			}
-
-			if ( first ) {
-				table = table && jQuery.nodeName( first, "tr" );
-
-				for ( var i = 0, l = this.length; i < l; i++ ) {
-					callback.call(
-						table ?
-							root(this[i], first) :
-							this[i],
-						i > 0 || results.cacheable || this.length > 1  ?
-							fragment.cloneNode(true) :
-							fragment
-					);
-				}
-			}
-
-			if ( scripts.length ) {
-				jQuery.each( scripts, evalScript );
-			}
-		}
-
-		return this;
-	}
-});
-
-function root( elem, cur ) {
-	return jQuery.nodeName(elem, "table") ?
-		(elem.getElementsByTagName("tbody")[0] ||
-		elem.appendChild(elem.ownerDocument.createElement("tbody"))) :
-		elem;
-}
-
-function cloneCopyEvent(orig, ret) {
-	var i = 0;
-
-	ret.each(function() {
-		if ( this.nodeName !== (orig[i] && orig[i].nodeName) ) {
-			return;
-		}
-
-		var oldData = jQuery.data( orig[i++] ),
-			curData = jQuery.data( this, oldData ),
-			events = oldData && oldData.events;
-
-		if ( events ) {
-			delete curData.handle;
-			curData.events = {};
-
-			for ( var type in events ) {
-				for ( var handler in events[ type ] ) {
-					jQuery.event.add( this, type, events[ type ][ handler ], events[ type ][ handler ].data );
-				}
-			}
-		}
-	});
-}
-
-jQuery.buildFragment = function( args, nodes, scripts ) {
-	var fragment, cacheable, cacheresults,
-		doc = (nodes && nodes[0] ? nodes[0].ownerDocument || nodes[0] : document);
-
-	// Only cache "small" (1/2 KB) strings that are associated with the main document
-	// Cloning options loses the selected state, so don't cache them
-	// IE 6 doesn't like it when you put <object> or <embed> elements in a fragment
-	// Also, WebKit does not clone 'checked' attributes on cloneNode, so don't cache
-	if ( args.length === 1 && typeof args[0] === "string" && args[0].length < 512 && doc === document &&
-		!rnocache.test( args[0] ) && (jQuery.support.checkClone || !rchecked.test( args[0] )) ) {
-
-		cacheable = true;
-		cacheresults = jQuery.fragments[ args[0] ];
-		if ( cacheresults ) {
-			if ( cacheresults !== 1 ) {
-				fragment = cacheresults;
-			}
-		}
-	}
-
-	if ( !fragment ) {
-		fragment = doc.createDocumentFragment();
-		jQuery.clean( args, doc, fragment, scripts );
-	}
-
-	if ( cacheable ) {
-		jQuery.fragments[ args[0] ] = cacheresults ? fragment : 1;
-	}
-
-	return { fragment: fragment, cacheable: cacheable };
-};
-
-jQuery.fragments = {};
-
-jQuery.each({
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var ret = [],
-			insert = jQuery( selector ),
-			parent = this.length === 1 && this[0].parentNode;
-		
-		if ( parent && parent.nodeType === 11 && parent.childNodes.length === 1 && insert.length === 1 ) {
-			insert[ original ]( this[0] );
-			return this;
-			
-		} else {
-			for ( var i = 0, l = insert.length; i < l; i++ ) {
-				var elems = (i > 0 ? this.clone(true) : this).get();
-				jQuery( insert[i] )[ original ]( elems );
-				ret = ret.concat( elems );
-			}
-		
-			return this.pushStack( ret, name, insert.selector );
-		}
-	};
-});
-
-jQuery.extend({
-	clean: function( elems, context, fragment, scripts ) {
-		context = context || document;
-
-		// !context.createElement fails in IE with an error but returns typeof 'object'
-		if ( typeof context.createElement === "undefined" ) {
-			context = context.ownerDocument || context[0] && context[0].ownerDocument || document;
-		}
-
-		var ret = [];
-
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( typeof elem === "number" ) {
-				elem += "";
-			}
-
-			if ( !elem ) {
-				continue;
-			}
-
-			// Convert html string into DOM nodes
-			if ( typeof elem === "string" && !rhtml.test( elem ) ) {
-				elem = context.createTextNode( elem );
-
-			} else if ( typeof elem === "string" ) {
-				// Fix "XHTML"-style tags in all browsers
-				elem = elem.replace(rxhtmlTag, "<$1></$2>");
-
-				// Trim whitespace, otherwise indexOf won't work as expected
-				var tag = (rtagName.exec( elem ) || ["", ""])[1].toLowerCase(),
-					wrap = wrapMap[ tag ] || wrapMap._default,
-					depth = wrap[0],
-					div = context.createElement("div");
-
-				// Go to html and back, then peel off extra wrappers
-				div.innerHTML = wrap[1] + elem + wrap[2];
-
-				// Move to the right depth
-				while ( depth-- ) {
-					div = div.lastChild;
-				}
-
-				// Remove IE's autoinserted <tbody> from table fragments
-				if ( !jQuery.support.tbody ) {
-
-					// String was a <table>, *may* have spurious <tbody>
-					var hasBody = rtbody.test(elem),
-						tbody = tag === "table" && !hasBody ?
-							div.firstChild && div.firstChild.childNodes :
-
-							// String was a bare <thead> or <tfoot>
-							wrap[1] === "<table>" && !hasBody ?
-								div.childNodes :
-								[];
-
-					for ( var j = tbody.length - 1; j >= 0 ; --j ) {
-						if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) {
-							tbody[ j ].parentNode.removeChild( tbody[ j ] );
-						}
-					}
-
-				}
-
-				// IE completely kills leading whitespace when innerHTML is used
-				if ( !jQuery.support.leadingWhitespace && rleadingWhitespace.test( elem ) ) {
-					div.insertBefore( context.createTextNode( rleadingWhitespace.exec(elem)[0] ), div.firstChild );
-				}
-
-				elem = div.childNodes;
-			}
-
-			if ( elem.nodeType ) {
-				ret.push( elem );
-			} else {
-				ret = jQuery.merge( ret, elem );
-			}
-		}
-
-		if ( fragment ) {
-			for ( i = 0; ret[i]; i++ ) {
-				if ( scripts && jQuery.nodeName( ret[i], "script" ) && (!ret[i].type || ret[i].type.toLowerCase() === "text/javascript") ) {
-					scripts.push( ret[i].parentNode ? ret[i].parentNode.removeChild( ret[i] ) : ret[i] );
-				
-				} else {
-					if ( ret[i].nodeType === 1 ) {
-						ret.splice.apply( ret, [i + 1, 0].concat(jQuery.makeArray(ret[i].getElementsByTagName("script"))) );
-					}
-					fragment.appendChild( ret[i] );
-				}
-			}
-		}
-
-		return ret;
-	},
-	
-	cleanData: function( elems ) {
-		var data, id, cache = jQuery.cache,
-			special = jQuery.event.special,
-			deleteExpando = jQuery.support.deleteExpando;
-		
-		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
-			if ( elem.nodeName && jQuery.noData[elem.nodeName.toLowerCase()] ) {
-				continue;
-			}
-
-			id = elem[ jQuery.expando ];
-			
-			if ( id ) {
-				data = cache[ id ];
-				
-				if ( data && data.events ) {
-					for ( var type in data.events ) {
-						if ( special[ type ] ) {
-							jQuery.event.remove( elem, type );
-
-						} else {
-							jQuery.removeEvent( elem, type, data.handle );
-						}
-					}
-				}
-				
-				if ( deleteExpando ) {
-					delete elem[ jQuery.expando ];
-
-				} else if ( elem.removeAttribute ) {
-					elem.removeAttribute( jQuery.expando );
-				}
-				
-				delete cache[ id ];
-			}
-		}
-	}
-});
-
-function evalScript( i, elem ) {
-	if ( elem.src ) {
-		jQuery.ajax({
-			url: elem.src,
-			async: false,
-			dataType: "script"
-		});
-	} else {
-		jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" );
-	}
-
-	if ( elem.parentNode ) {
-		elem.parentNode.removeChild( elem );
-	}
-}
-
-
-
-
-var ralpha = /alpha\([^)]*\)/i,
-	ropacity = /opacity=([^)]*)/,
-	rdashAlpha = /-([a-z])/ig,
-	rupper = /([A-Z])/g,
-	rnumpx = /^-?\d+(?:px)?$/i,
-	rnum = /^-?\d/,
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssWidth = [ "Left", "Right" ],
-	cssHeight = [ "Top", "Bottom" ],
-	curCSS,
-
-	getComputedStyle,
-	currentStyle,
-
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn.css = function( name, value ) {
-	// Setting 'undefined' is a no-op
-	if ( arguments.length === 2 && value === undefined ) {
-		return this;
-	}
-
-	return jQuery.access( this, name, value, true, function( elem, name, value ) {
-		return value !== undefined ?
-			jQuery.style( elem, name, value ) :
-			jQuery.css( elem, name );
-	});
-};
-
-jQuery.extend({
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity", "opacity" );
-					return ret === "" ? "1" : ret;
-
-				} else {
-					return elem.style.opacity;
-				}
-			}
-		}
-	},
-
-	// Exclude the following css properties to add px
-	cssNumber: {
-		"zIndex": true,
-		"fontWeight": true,
-		"opacity": true,
-		"zoom": true,
-		"lineHeight": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		// normalize float css property
-		"float": jQuery.support.cssFloat ? "cssFloat" : "styleFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, origName = jQuery.camelCase( name ),
-			style = elem.style, hooks = jQuery.cssHooks[ origName ];
-
-		name = jQuery.cssProps[ origName ] || origName;
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			// Make sure that NaN and null values aren't set. See: #7116
-			if ( typeof value === "number" && isNaN( value ) || value == null ) {
-				return;
-			}
-
-			// If a number was passed in, add 'px' to the (except for certain CSS properties)
-			if ( typeof value === "number" && !jQuery.cssNumber[ origName ] ) {
-				value += "px";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !("set" in hooks) || (value = hooks.set( elem, value )) !== undefined ) {
-				// Wrapped to prevent IE from throwing errors when 'invalid' values are provided
-				// Fixes bug #5509
-				try {
-					style[ name ] = value;
-				} catch(e) {}
-			}
-
-		} else {
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks && (ret = hooks.get( elem, false, extra )) !== undefined ) {
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra ) {
-		// Make sure that we're working with the right name
-		var ret, origName = jQuery.camelCase( name ),
-			hooks = jQuery.cssHooks[ origName ];
-
-		name = jQuery.cssProps[ origName ] || origName;
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks && (ret = hooks.get( elem, true, extra )) !== undefined ) {
-			return ret;
-
-		// Otherwise, if a way to get the computed value exists, use that
-		} else if ( curCSS ) {
-			return curCSS( elem, name, origName );
-		}
-	},
-
-	// A method for quickly swapping in/out CSS properties to get correct calculations
-	swap: function( elem, options, callback ) {
-		var old = {};
-
-		// Remember the old values, and insert the new ones
-		for ( var name in options ) {
-			old[ name ] = elem.style[ name ];
-			elem.style[ name ] = options[ name ];
-		}
-
-		callback.call( elem );
-
-		// Revert the old values
-		for ( name in options ) {
-			elem.style[ name ] = old[ name ];
-		}
-	},
-
-	camelCase: function( string ) {
-		return string.replace( rdashAlpha, fcamelCase );
-	}
-});
-
-// DEPRECATED, Use jQuery.css() instead
-jQuery.curCSS = jQuery.css;
-
-jQuery.each(["height", "width"], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			var val;
-
-			if ( computed ) {
-				if ( elem.offsetWidth !== 0 ) {
-					val = getWH( elem, name, extra );
-
-				} else {
-					jQuery.swap( elem, cssShow, function() {
-						val = getWH( elem, name, extra );
-					});
-				}
-
-				if ( val <= 0 ) {
-					val = curCSS( elem, name, name );
-
-					if ( val === "0px" && currentStyle ) {
-						val = currentStyle( elem, name, name );
-					}
-
-					if ( val != null ) {
-						// Should return "auto" instead of 0, use 0 for
-						// temporary backwards-compat
-						return val === "" || val === "auto" ? "0px" : val;
-					}
-				}
-
-				if ( val < 0 || val == null ) {
-					val = elem.style[ name ];
-
-					// Should return "auto" instead of 0, use 0 for
-					// temporary backwards-compat
-					return val === "" || val === "auto" ? "0px" : val;
-				}
-
-				return typeof val === "string" ? val : val + "px";
-			}
-		},
-
-		set: function( elem, value ) {
-			if ( rnumpx.test( value ) ) {
-				// ignore negative width and height values #1599
-				value = parseFloat(value);
-
-				if ( value >= 0 ) {
-					return value + "px";
-				}
-
-			} else {
-				return value;
-			}
-		}
-	};
-});
-
-if ( !jQuery.support.opacity ) {
-	jQuery.cssHooks.opacity = {
-		get: function( elem, computed ) {
-			// IE uses filters for opacity
-			return ropacity.test((computed && elem.currentStyle ? elem.currentStyle.filter : elem.style.filter) || "") ?
-				(parseFloat(RegExp.$1) / 100) + "" :
-				computed ? "1" : "";
-		},
-
-		set: function( elem, value ) {
-			var style = elem.style;
-
-			// IE has trouble with opacity if it does not have layout
-			// Force it by setting the zoom level
-			style.zoom = 1;
-
-			// Set the alpha filter to set the opacity
-			var opacity = jQuery.isNaN(value) ?
-				"" :
-				"alpha(opacity=" + value * 100 + ")",
-				filter = style.filter || "";
-
-			style.filter = ralpha.test(filter) ?
-				filter.replace(ralpha, opacity) :
-				style.filter + ' ' + opacity;
-		}
-	};
-}
-
-if ( document.defaultView && document.defaultView.getComputedStyle ) {
-	getComputedStyle = function( elem, newName, name ) {
-		var ret, defaultView, computedStyle;
-
-		name = name.replace( rupper, "-$1" ).toLowerCase();
-
-		if ( !(defaultView = elem.ownerDocument.defaultView) ) {
-			return undefined;
-		}
-
-		if ( (computedStyle = defaultView.getComputedStyle( elem, null )) ) {
-			ret = computedStyle.getPropertyValue( name );
-			if ( ret === "" && !jQuery.contains( elem.ownerDocument.documentElement, elem ) ) {
-				ret = jQuery.style( elem, name );
-			}
-		}
-
-		return ret;
-	};
-}
-
-if ( document.documentElement.currentStyle ) {
-	currentStyle = function( elem, name ) {
-		var left, rsLeft,
-			ret = elem.currentStyle && elem.currentStyle[ name ],
-			style = elem.style;
-
-		// From the awesome hack by Dean Edwards
-		// http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-
-		// If we're not dealing with a regular pixel number
-		// but a number that has a weird ending, we need to convert it to pixels
-		if ( !rnumpx.test( ret ) && rnum.test( ret ) ) {
-			// Remember the original values
-			left = style.left;
-			rsLeft = elem.runtimeStyle.left;
-
-			// Put in the new values to get a computed value out
-			elem.runtimeStyle.left = elem.currentStyle.left;
-			style.left = name === "fontSize" ? "1em" : (ret || 0);
-			ret = style.pixelLeft + "px";
-
-			// Revert the changed values
-			style.left = left;
-			elem.runtimeStyle.left = rsLeft;
-		}
-
-		return ret === "" ? "auto" : ret;
-	};
-}
-
-curCSS = getComputedStyle || currentStyle;
-
-function getWH( elem, name, extra ) {
-	var which = name === "width" ? cssWidth : cssHeight,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight;
-
-	if ( extra === "border" ) {
-		return val;
-	}
-
-	jQuery.each( which, function() {
-		if ( !extra ) {
-			val -= parseFloat(jQuery.css( elem, "padding" + this )) || 0;
-		}
-
-		if ( extra === "margin" ) {
-			val += parseFloat(jQuery.css( elem, "margin" + this )) || 0;
-
-		} else {
-			val -= parseFloat(jQuery.css( elem, "border" + this + "Width" )) || 0;
-		}
-	});
-
-	return val;
-}
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.hidden = function( elem ) {
-		var width = elem.offsetWidth,
-			height = elem.offsetHeight;
-
-		return (width === 0 && height === 0) || (!jQuery.support.reliableHiddenOffsets && (elem.style.display || jQuery.css( elem, "display" )) === "none");
-	};
-
-	jQuery.expr.filters.visible = function( elem ) {
-		return !jQuery.expr.filters.hidden( elem );
-	};
-}
-
-
-
-
-var jsc = jQuery.now(),
-	rscript = /<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,
-	rselectTextarea = /^(?:select|textarea)/i,
-	rinput = /^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rbracket = /\[\]$/,
-	jsre = /\=\?(&|$)/,
-	rquery = /\?/,
-	rts = /([?&])_=[^&]*/,
-	rurl = /^(\w+:)?\/\/([^\/?#]+)/,
-	r20 = /%20/g,
-	rhash = /#.*$/,
-
-	// Keep a copy of the old load method
-	_load = jQuery.fn.load;
-
-jQuery.fn.extend({
-	load: function( url, params, callback ) {
-		if ( typeof url !== "string" && _load ) {
-			return _load.apply( this, arguments );
-
-		// Don't do a request if no elements are being requested
-		} else if ( !this.length ) {
-			return this;
-		}
-
-		var off = url.indexOf(" ");
-		if ( off >= 0 ) {
-			var selector = url.slice(off, url.length);
-			url = url.slice(0, off);
-		}
-
-		// Default to a GET request
-		var type = "GET";
-
-		// If the second parameter was provided
-		if ( params ) {
-			// If it's a function
-			if ( jQuery.isFunction( params ) ) {
-				// We assume that it's the callback
-				callback = params;
-				params = null;
-
-			// Otherwise, build a param string
-			} else if ( typeof params === "object" ) {
-				params = jQuery.param( params, jQuery.ajaxSettings.traditional );
-				type = "POST";
-			}
-		}
-
-		var self = this;
-
-		// Request the remote document
-		jQuery.ajax({
-			url: url,
-			type: type,
-			dataType: "html",
-			data: params,
-			complete: function( res, status ) {
-				// If successful, inject the HTML into all the matched elements
-				if ( status === "success" || status === "notmodified" ) {
-					// See if a selector was specified
-					self.html( selector ?
-						// Create a dummy div to hold the results
-						jQuery("<div>")
-							// inject the contents of the document in, removing the scripts
-							// to avoid any 'Permission Denied' errors in IE
-							.append(res.responseText.replace(rscript, ""))
-
-							// Locate the specified elements
-							.find(selector) :
-
-						// If not, just inject the full result
-						res.responseText );
-				}
-
-				if ( callback ) {
-					self.each( callback, [res.responseText, status, res] );
-				}
-			}
-		});
-
-		return this;
-	},
-
-	serialize: function() {
-		return jQuery.param(this.serializeArray());
-	},
-
-	serializeArray: function() {
-		return this.map(function() {
-			return this.elements ? jQuery.makeArray(this.elements) : this;
-		})
-		.filter(function() {
-			return this.name && !this.disabled &&
-				(this.checked || rselectTextarea.test(this.nodeName) ||
-					rinput.test(this.type));
-		})
-		.map(function( i, elem ) {
-			var val = jQuery(this).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray(val) ?
-					jQuery.map( val, function( val, i ) {
-						return { name: elem.name, value: val };
-					}) :
-					{ name: elem.name, value: val };
-		}).get();
-	}
-});
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( "ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), function( i, o ) {
-	jQuery.fn[o] = function( f ) {
-		return this.bind(o, f);
-	};
-});
-
-jQuery.extend({
-	get: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = null;
-		}
-
-		return jQuery.ajax({
-			type: "GET",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get(url, null, callback, "script");
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get(url, data, callback, "json");
-	},
-
-	post: function( url, data, callback, type ) {
-		// shift arguments if data argument was omited
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = {};
-		}
-
-		return jQuery.ajax({
-			type: "POST",
-			url: url,
-			data: data,
-			success: callback,
-			dataType: type
-		});
-	},
-
-	ajaxSetup: function( settings ) {
-		jQuery.extend( jQuery.ajaxSettings, settings );
-	},
-
-	ajaxSettings: {
-		url: location.href,
-		global: true,
-		type: "GET",
-		contentType: "application/x-www-form-urlencoded",
-		processData: true,
-		async: true,
-		/*
-		timeout: 0,
-		data: null,
-		username: null,
-		password: null,
-		traditional: false,
-		*/
-		// This function can be overriden by calling jQuery.ajaxSetup
-		xhr: function() {
-			return new window.XMLHttpRequest();
-		},
-		accepts: {
-			xml: "application/xml, text/xml",
-			html: "text/html",
-			script: "text/javascript, application/javascript",
-			json: "application/json, text/javascript",
-			text: "text/plain",
-			_default: "*/*"
-		}
-	},
-
-	ajax: function( origSettings ) {
-		var s = jQuery.extend(true, {}, jQuery.ajaxSettings, origSettings),
-			jsonp, status, data, type = s.type.toUpperCase(), noContent = rnoContent.test(type);
-
-		s.url = s.url.replace( rhash, "" );
-
-		// Use original (not extended) context object if it was provided
-		s.context = origSettings && origSettings.context != null ? origSettings.context : s;
-
-		// convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Handle JSONP Parameter Callbacks
-		if ( s.dataType === "jsonp" ) {
-			if ( type === "GET" ) {
-				if ( !jsre.test( s.url ) ) {
-					s.url += (rquery.test( s.url ) ? "&" : "?") + (s.jsonp || "callback") + "=?";
-				}
-			} else if ( !s.data || !jsre.test(s.data) ) {
-				s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?";
-			}
-			s.dataType = "json";
-		}
-
-		// Build temporary JSONP function
-		if ( s.dataType === "json" && (s.data && jsre.test(s.data) || jsre.test(s.url)) ) {
-			jsonp = s.jsonpCallback || ("jsonp" + jsc++);
-
-			// Replace the =? sequence both in the query string and the data
-			if ( s.data ) {
-				s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1");
-			}
-
-			s.url = s.url.replace(jsre, "=" + jsonp + "$1");
-
-			// We need to make sure
-			// that a JSONP style response is executed properly
-			s.dataType = "script";
-
-			// Handle JSONP-style loading
-			var customJsonp = window[ jsonp ];
-
-			window[ jsonp ] = function( tmp ) {
-				if ( jQuery.isFunction( customJsonp ) ) {
-					customJsonp( tmp );
-
-				} else {
-					// Garbage collect
-					window[ jsonp ] = undefined;
-
-					try {
-						delete window[ jsonp ];
-					} catch( jsonpError ) {}
-				}
-
-				data = tmp;
-				jQuery.handleSuccess( s, xhr, status, data );
-				jQuery.handleComplete( s, xhr, status, data );
-				
-				if ( head ) {
-					head.removeChild( script );
-				}
-			};
-		}
-
-		if ( s.dataType === "script" && s.cache === null ) {
-			s.cache = false;
-		}
-
-		if ( s.cache === false && noContent ) {
-			var ts = jQuery.now();
-
-			// try replacing _= if it is there
-			var ret = s.url.replace(rts, "$1_=" + ts);
-
-			// if nothing was replaced, add timestamp to the end
-			s.url = ret + ((ret === s.url) ? (rquery.test(s.url) ? "&" : "?") + "_=" + ts : "");
-		}
-
-		// If data is available, append data to url for GET/HEAD requests
-		if ( s.data && noContent ) {
-			s.url += (rquery.test(s.url) ? "&" : "?") + s.data;
-		}
-
-		// Watch for a new set of requests
-		if ( s.global && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// Matches an absolute URL, and saves the domain
-		var parts = rurl.exec( s.url ),
-			remote = parts && (parts[1] && parts[1].toLowerCase() !== location.protocol || parts[2].toLowerCase() !== location.host);
-
-		// If we're requesting a remote document
-		// and trying to load JSON or Script with a GET
-		if ( s.dataType === "script" && type === "GET" && remote ) {
-			var head = document.getElementsByTagName("head")[0] || document.documentElement;
-			var script = document.createElement("script");
-			if ( s.scriptCharset ) {
-				script.charset = s.scriptCharset;
-			}
-			script.src = s.url;
-
-			// Handle Script loading
-			if ( !jsonp ) {
-				var done = false;
-
-				// Attach handlers for all browsers
-				script.onload = script.onreadystatechange = function() {
-					if ( !done && (!this.readyState ||
-							this.readyState === "loaded" || this.readyState === "complete") ) {
-						done = true;
-						jQuery.handleSuccess( s, xhr, status, data );
-						jQuery.handleComplete( s, xhr, status, data );
-
-						// Handle memory leak in IE
-						script.onload = script.onreadystatechange = null;
-						if ( head && script.parentNode ) {
-							head.removeChild( script );
-						}
-					}
-				};
-			}
-
-			// Use insertBefore instead of appendChild  to circumvent an IE6 bug.
-			// This arises when a base node is used (#2709 and #4378).
-			head.insertBefore( script, head.firstChild );
-
-			// We handle everything using the script element injection
-			return undefined;
-		}
-
-		var requestDone = false;
-
-		// Create the request object
-		var xhr = s.xhr();
-
-		if ( !xhr ) {
-			return;
-		}
-
-		// Open the socket
-		// Passing null username, generates a login popup on Opera (#2865)
-		if ( s.username ) {
-			xhr.open(type, s.url, s.async, s.username, s.password);
-		} else {
-			xhr.open(type, s.url, s.async);
-		}
-
-		// Need an extra try/catch for cross domain requests in Firefox 3
-		try {
-			// Set content-type if data specified and content-body is valid for this type
-			if ( (s.data != null && !noContent) || (origSettings && origSettings.contentType) ) {
-				xhr.setRequestHeader("Content-Type", s.contentType);
-			}
-
-			// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-			if ( s.ifModified ) {
-				if ( jQuery.lastModified[s.url] ) {
-					xhr.setRequestHeader("If-Modified-Since", jQuery.lastModified[s.url]);
-				}
-
-				if ( jQuery.etag[s.url] ) {
-					xhr.setRequestHeader("If-None-Match", jQuery.etag[s.url]);
-				}
-			}
-
-			// Set header so the called script knows that it's an XMLHttpRequest
-			// Only send the header if it's not a remote XHR
-			if ( !remote ) {
-				xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
-			}
-
-			// Set the Accepts header for the server, depending on the dataType
-			xhr.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ?
-				s.accepts[ s.dataType ] + ", */*; q=0.01" :
-				s.accepts._default );
-		} catch( headerError ) {}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend && s.beforeSend.call(s.context, xhr, s) === false ) {
-			// Handle the global AJAX counter
-			if ( s.global && jQuery.active-- === 1 ) {
-				jQuery.event.trigger( "ajaxStop" );
-			}
-
-			// close opended socket
-			xhr.abort();
-			return false;
-		}
-
-		if ( s.global ) {
-			jQuery.triggerGlobal( s, "ajaxSend", [xhr, s] );
-		}
-
-		// Wait for a response to come back
-		var onreadystatechange = xhr.onreadystatechange = function( isTimeout ) {
-			// The request was aborted
-			if ( !xhr || xhr.readyState === 0 || isTimeout === "abort" ) {
-				// Opera doesn't call onreadystatechange before this point
-				// so we simulate the call
-				if ( !requestDone ) {
-					jQuery.handleComplete( s, xhr, status, data );
-				}
-
-				requestDone = true;
-				if ( xhr ) {
-					xhr.onreadystatechange = jQuery.noop;
-				}
-
-			// The transfer is complete and the data is available, or the request timed out
-			} else if ( !requestDone && xhr && (xhr.readyState === 4 || isTimeout === "timeout") ) {
-				requestDone = true;
-				xhr.onreadystatechange = jQuery.noop;
-
-				status = isTimeout === "timeout" ?
-					"timeout" :
-					!jQuery.httpSuccess( xhr ) ?
-						"error" :
-						s.ifModified && jQuery.httpNotModified( xhr, s.url ) ?
-							"notmodified" :
-							"success";
-
-				var errMsg;
-
-				if ( status === "success" ) {
-					// Watch for, and catch, XML document parse errors
-					try {
-						// process the data (runs the xml through httpData regardless of callback)
-						data = jQuery.httpData( xhr, s.dataType, s );
-					} catch( parserError ) {
-						status = "parsererror";
-						errMsg = parserError;
-					}
-				}
-
-				// Make sure that the request was successful or notmodified
-				if ( status === "success" || status === "notmodified" ) {
-					// JSONP handles its own success callback
-					if ( !jsonp ) {
-						jQuery.handleSuccess( s, xhr, status, data );
-					}
-				} else {
-					jQuery.handleError( s, xhr, status, errMsg );
-				}
-
-				// Fire the complete handlers
-				if ( !jsonp ) {
-					jQuery.handleComplete( s, xhr, status, data );
-				}
-
-				if ( isTimeout === "timeout" ) {
-					xhr.abort();
-				}
-
-				// Stop memory leaks
-				if ( s.async ) {
-					xhr = null;
-				}
-			}
-		};
-
-		// Override the abort handler, if we can (IE 6 doesn't allow it, but that's OK)
-		// Opera doesn't fire onreadystatechange at all on abort
-		try {
-			var oldAbort = xhr.abort;
-			xhr.abort = function() {
-				if ( xhr ) {
-					// oldAbort has no call property in IE7 so
-					// just do it this way, which works in all
-					// browsers
-					Function.prototype.call.call( oldAbort, xhr );
-				}
-
-				onreadystatechange( "abort" );
-			};
-		} catch( abortError ) {}
-
-		// Timeout checker
-		if ( s.async && s.timeout > 0 ) {
-			setTimeout(function() {
-				// Check to see if the request is still happening
-				if ( xhr && !requestDone ) {
-					onreadystatechange( "timeout" );
-				}
-			}, s.timeout);
-		}
-
-		// Send the data
-		try {
-			xhr.send( noContent || s.data == null ? null : s.data );
-
-		} catch( sendError ) {
-			jQuery.handleError( s, xhr, null, sendError );
-
-			// Fire the complete handlers
-			jQuery.handleComplete( s, xhr, status, data );
-		}
-
-		// firefox 1.5 doesn't fire statechange for sync requests
-		if ( !s.async ) {
-			onreadystatechange();
-		}
-
-		// return XMLHttpRequest to allow aborting the request etc.
-		return xhr;
-	},
-
-	// Serialize an array of form elements or a set of
-	// key/values into a query string
-	param: function( a, traditional ) {
-		var s = [],
-			add = function( key, value ) {
-				// If value is a function, invoke it and return its value
-				value = jQuery.isFunction(value) ? value() : value;
-				s[ s.length ] = encodeURIComponent(key) + "=" + encodeURIComponent(value);
-			};
-		
-		// Set traditional to true for jQuery <= 1.3.2 behavior.
-		if ( traditional === undefined ) {
-			traditional = jQuery.ajaxSettings.traditional;
-		}
-		
-		// If an array was passed in, assume that it is an array of form elements.
-		if ( jQuery.isArray(a) || a.jquery ) {
-			// Serialize the form elements
-			jQuery.each( a, function() {
-				add( this.name, this.value );
-			});
-			
-		} else {
-			// If traditional, encode the "old" way (the way 1.3.2 or older
-			// did it), otherwise encode params recursively.
-			for ( var prefix in a ) {
-				buildParams( prefix, a[prefix], traditional, add );
-			}
-		}
-
-		// Return the resulting serialization
-		return s.join("&").replace(r20, "+");
-	}
-});
-
-function buildParams( prefix, obj, traditional, add ) {
-	if ( jQuery.isArray(obj) && obj.length ) {
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-				// If array item is non-scalar (array or object), encode its
-				// numeric index to resolve deserialization ambiguity issues.
-				// Note that rack (as of 1.0.0) can't currently deserialize
-				// nested arrays properly, and attempting to do so may cause
-				// a server error. Possible fixes are to modify rack's
-				// deserialization algorithm or to provide an option or flag
-				// to force array serialization to be shallow.
-				buildParams( prefix + "[" + ( typeof v === "object" || jQuery.isArray(v) ? i : "" ) + "]", v, traditional, add );
-			}
-		});
-			
-	} else if ( !traditional && obj != null && typeof obj === "object" ) {
-		if ( jQuery.isEmptyObject( obj ) ) {
-			add( prefix, "" );
-
-		// Serialize object item.
-		} else {
-			jQuery.each( obj, function( k, v ) {
-				buildParams( prefix + "[" + k + "]", v, traditional, add );
-			});
-		}
-					
-	} else {
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// This is still on the jQuery object... for now
-// Want to move this to jQuery.ajax some day
-jQuery.extend({
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	handleError: function( s, xhr, status, e ) {
-		// If a local callback was specified, fire it
-		if ( s.error ) {
-			s.error.call( s.context, xhr, status, e );
-		}
-
-		// Fire the global callback
-		if ( s.global ) {
-			jQuery.triggerGlobal( s, "ajaxError", [xhr, s, e] );
-		}
-	},
-
-	handleSuccess: function( s, xhr, status, data ) {
-		// If a local callback was specified, fire it and pass it the data
-		if ( s.success ) {
-			s.success.call( s.context, data, status, xhr );
-		}
-
-		// Fire the global callback
-		if ( s.global ) {
-			jQuery.triggerGlobal( s, "ajaxSuccess", [xhr, s] );
-		}
-	},
-
-	handleComplete: function( s, xhr, status ) {
-		// Process result
-		if ( s.complete ) {
-			s.complete.call( s.context, xhr, status );
-		}
-
-		// The request was completed
-		if ( s.global ) {
-			jQuery.triggerGlobal( s, "ajaxComplete", [xhr, s] );
-		}
-
-		// Handle the global AJAX counter
-		if ( s.global && jQuery.active-- === 1 ) {
-			jQuery.event.trigger( "ajaxStop" );
-		}
-	},
-		
-	triggerGlobal: function( s, type, args ) {
-		(s.context && s.context.url == null ? jQuery(s.context) : jQuery.event).trigger(type, args);
-	},
-
-	// Determines if an XMLHttpRequest was successful or not
-	httpSuccess: function( xhr ) {
-		try {
-			// IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450
-			return !xhr.status && location.protocol === "file:" ||
-				xhr.status >= 200 && xhr.status < 300 ||
-				xhr.status === 304 || xhr.status === 1223;
-		} catch(e) {}
-
-		return false;
-	},
-
-	// Determines if an XMLHttpRequest returns NotModified
-	httpNotModified: function( xhr, url ) {
-		var lastModified = xhr.getResponseHeader("Last-Modified"),
-			etag = xhr.getResponseHeader("Etag");
-
-		if ( lastModified ) {
-			jQuery.lastModified[url] = lastModified;
-		}
-
-		if ( etag ) {
-			jQuery.etag[url] = etag;
-		}
-
-		return xhr.status === 304;
-	},
-
-	httpData: function( xhr, type, s ) {
-		var ct = xhr.getResponseHeader("content-type") || "",
-			xml = type === "xml" || !type && ct.indexOf("xml") >= 0,
-			data = xml ? xhr.responseXML : xhr.responseText;
-
-		if ( xml && data.documentElement.nodeName === "parsererror" ) {
-			jQuery.error( "parsererror" );
-		}
-
-		// Allow a pre-filtering function to sanitize the response
-		// s is checked to keep backwards compatibility
-		if ( s && s.dataFilter ) {
-			data = s.dataFilter( data, type );
-		}
-
-		// The filter can actually parse the response
-		if ( typeof data === "string" ) {
-			// Get the JavaScript object, if JSON is used.
-			if ( type === "json" || !type && ct.indexOf("json") >= 0 ) {
-				data = jQuery.parseJSON( data );
-
-			// If the type is "script", eval it in global context
-			} else if ( type === "script" || !type && ct.indexOf("javascript") >= 0 ) {
-				jQuery.globalEval( data );
-			}
-		}
-
-		return data;
-	}
-
-});
-
-/*
- * Create the request object; Microsoft failed to properly
- * implement the XMLHttpRequest in IE7 (can't request local files),
- * so we use the ActiveXObject when it is available
- * Additionally XMLHttpRequest can be disabled in IE7/IE8 so
- * we need a fallback.
- */
-if ( window.ActiveXObject ) {
-	jQuery.ajaxSettings.xhr = function() {
-		if ( window.location.protocol !== "file:" ) {
-			try {
-				return new window.XMLHttpRequest();
-			} catch(xhrError) {}
-		}
-
-		try {
-			return new window.ActiveXObject("Microsoft.XMLHTTP");
-		} catch(activeError) {}
-	};
-}
-
-// Does this browser support XHR requests?
-jQuery.support.ajax = !!jQuery.ajaxSettings.xhr();
-
-
-
-
-var elemdisplay = {},
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rfxnum = /^([+\-]=)?([\d+.\-]+)(.*)$/,
-	timerId,
-	fxAttrs = [
-		// height animations
-		[ "height", "marginTop", "marginBottom", "paddingTop", "paddingBottom" ],
-		// width animations
-		[ "width", "marginLeft", "marginRight", "paddingLeft", "paddingRight" ],
-		// opacity animations
-		[ "opacity" ]
-	];
-
-jQuery.fn.extend({
-	show: function( speed, easing, callback ) {
-		var elem, display;
-
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("show", 3), speed, easing, callback);
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				elem = this[i];
-				display = elem.style.display;
-
-				// Reset the inline display of this element to learn if it is
-				// being hidden by cascaded rules or not
-				if ( !jQuery.data(elem, "olddisplay") && display === "none" ) {
-					display = elem.style.display = "";
-				}
-
-				// Set elements which have been overridden with display: none
-				// in a stylesheet to whatever the default browser style is
-				// for such an element
-				if ( display === "" && jQuery.css( elem, "display" ) === "none" ) {
-					jQuery.data(elem, "olddisplay", defaultDisplay(elem.nodeName));
-				}
-			}
-
-			// Set the display of most of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				elem = this[i];
-				display = elem.style.display;
-
-				if ( display === "" || display === "none" ) {
-					elem.style.display = jQuery.data(elem, "olddisplay") || "";
-				}
-			}
-
-			return this;
-		}
-	},
-
-	hide: function( speed, easing, callback ) {
-		if ( speed || speed === 0 ) {
-			return this.animate( genFx("hide", 3), speed, easing, callback);
-
-		} else {
-			for ( var i = 0, j = this.length; i < j; i++ ) {
-				var display = jQuery.css( this[i], "display" );
-
-				if ( display !== "none" ) {
-					jQuery.data( this[i], "olddisplay", display );
-				}
-			}
-
-			// Set the display of the elements in a second loop
-			// to avoid the constant reflow
-			for ( i = 0; i < j; i++ ) {
-				this[i].style.display = "none";
-			}
-
-			return this;
-		}
-	},
-
-	// Save the old toggle function
-	_toggle: jQuery.fn.toggle,
-
-	toggle: function( fn, fn2, callback ) {
-		var bool = typeof fn === "boolean";
-
-		if ( jQuery.isFunction(fn) && jQuery.isFunction(fn2) ) {
-			this._toggle.apply( this, arguments );
-
-		} else if ( fn == null || bool ) {
-			this.each(function() {
-				var state = bool ? fn : jQuery(this).is(":hidden");
-				jQuery(this)[ state ? "show" : "hide" ]();
-			});
-
-		} else {
-			this.animate(genFx("toggle", 3), fn, fn2, callback);
-		}
-
-		return this;
-	},
-
-	fadeTo: function( speed, to, easing, callback ) {
-		return this.filter(":hidden").css("opacity", 0).show().end()
-					.animate({opacity: to}, speed, easing, callback);
-	},
-
-	animate: function( prop, speed, easing, callback ) {
-		var optall = jQuery.speed(speed, easing, callback);
-
-		if ( jQuery.isEmptyObject( prop ) ) {
-			return this.each( optall.complete );
-		}
-
-		return this[ optall.queue === false ? "each" : "queue" ](function() {
-			// XXX 'this' does not always have a nodeName when running the
-			// test suite
-
-			var opt = jQuery.extend({}, optall), p,
-				isElement = this.nodeType === 1,
-				hidden = isElement && jQuery(this).is(":hidden"),
-				self = this;
-
-			for ( p in prop ) {
-				var name = jQuery.camelCase( p );
-
-				if ( p !== name ) {
-					prop[ name ] = prop[ p ];
-					delete prop[ p ];
-					p = name;
-				}
-
-				if ( prop[p] === "hide" && hidden || prop[p] === "show" && !hidden ) {
-					return opt.complete.call(this);
-				}
-
-				if ( isElement && ( p === "height" || p === "width" ) ) {
-					// Make sure that nothing sneaks out
-					// Record all 3 overflow attributes because IE does not
-					// change the overflow attribute when overflowX and
-					// overflowY are set to the same value
-					opt.overflow = [ this.style.overflow, this.style.overflowX, this.style.overflowY ];
-
-					// Set display property to inline-block for height/width
-					// animations on inline elements that are having width/height
-					// animated
-					if ( jQuery.css( this, "display" ) === "inline" &&
-							jQuery.css( this, "float" ) === "none" ) {
-						if ( !jQuery.support.inlineBlockNeedsLayout ) {
-							this.style.display = "inline-block";
-
-						} else {
-							var display = defaultDisplay(this.nodeName);
-
-							// inline-level elements accept inline-block;
-							// block-level elements need to be inline with layout
-							if ( display === "inline" ) {
-								this.style.display = "inline-block";
-
-							} else {
-								this.style.display = "inline";
-								this.style.zoom = 1;
-							}
-						}
-					}
-				}
-
-				if ( jQuery.isArray( prop[p] ) ) {
-					// Create (if needed) and add to specialEasing
-					(opt.specialEasing = opt.specialEasing || {})[p] = prop[p][1];
-					prop[p] = prop[p][0];
-				}
-			}
-
-			if ( opt.overflow != null ) {
-				this.style.overflow = "hidden";
-			}
-
-			opt.curAnim = jQuery.extend({}, prop);
-
-			jQuery.each( prop, function( name, val ) {
-				var e = new jQuery.fx( self, opt, name );
-
-				if ( rfxtypes.test(val) ) {
-					e[ val === "toggle" ? hidden ? "show" : "hide" : val ]( prop );
-
-				} else {
-					var parts = rfxnum.exec(val),
-						start = e.cur() || 0;
-
-					if ( parts ) {
-						var end = parseFloat( parts[2] ),
-							unit = parts[3] || "px";
-
-						// We need to compute starting value
-						if ( unit !== "px" ) {
-							jQuery.style( self, name, (end || 1) + unit);
-							start = ((end || 1) / e.cur()) * start;
-							jQuery.style( self, name, start + unit);
-						}
-
-						// If a +=/-= token was provided, we're doing a relative animation
-						if ( parts[1] ) {
-							end = ((parts[1] === "-=" ? -1 : 1) * end) + start;
-						}
-
-						e.custom( start, end, unit );
-
-					} else {
-						e.custom( start, val, "" );
-					}
-				}
-			});
-
-			// For JS strict compliance
-			return true;
-		});
-	},
-
-	stop: function( clearQueue, gotoEnd ) {
-		var timers = jQuery.timers;
-
-		if ( clearQueue ) {
-			this.queue([]);
-		}
-
-		this.each(function() {
-			// go in reverse order so anything added to the queue during the loop is ignored
-			for ( var i = timers.length - 1; i >= 0; i-- ) {
-				if ( timers[i].elem === this ) {
-					if (gotoEnd) {
-						// force the next step to be the last
-						timers[i](true);
-					}
-
-					timers.splice(i, 1);
-				}
-			}
-		});
-
-		// start the next in the queue if the last step wasn't forced
-		if ( !gotoEnd ) {
-			this.dequeue();
-		}
-
-		return this;
-	}
-
-});
-
-function genFx( type, num ) {
-	var obj = {};
-
-	jQuery.each( fxAttrs.concat.apply([], fxAttrs.slice(0,num)), function() {
-		obj[ this ] = type;
-	});
-
-	return obj;
-}
-
-// Generate shortcuts for custom animations
-jQuery.each({
-	slideDown: genFx("show", 1),
-	slideUp: genFx("hide", 1),
-	slideToggle: genFx("toggle", 1),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-});
-
-jQuery.extend({
-	speed: function( speed, easing, fn ) {
-		var opt = speed && typeof speed === "object" ? jQuery.extend({}, speed) : {
-			complete: fn || !fn && easing ||
-				jQuery.isFunction( speed ) && speed,
-			duration: speed,
-			easing: fn && easing || easing && !jQuery.isFunction(easing) && easing
-		};
-
-		opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ? opt.duration :
-			opt.duration in jQuery.fx.speeds ? jQuery.fx.speeds[opt.duration] : jQuery.fx.speeds._default;
-
-		// Queueing
-		opt.old = opt.complete;
-		opt.complete = function() {
-			if ( opt.queue !== false ) {
-				jQuery(this).dequeue();
-			}
-			if ( jQuery.isFunction( opt.old ) ) {
-				opt.old.call( this );
-			}
-		};
-
-		return opt;
-	},
-
-	easing: {
-		linear: function( p, n, firstNum, diff ) {
-			return firstNum + diff * p;
-		},
-		swing: function( p, n, firstNum, diff ) {
-			return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum;
-		}
-	},
-
-	timers: [],
-
-	fx: function( elem, options, prop ) {
-		this.options = options;
-		this.elem = elem;
-		this.prop = prop;
-
-		if ( !options.orig ) {
-			options.orig = {};
-		}
-	}
-
-});
-
-jQuery.fx.prototype = {
-	// Simple function for setting a style value
-	update: function() {
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		(jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this );
-	},
-
-	// Get the current size
-	cur: function() {
-		if ( this.elem[this.prop] != null && (!this.elem.style || this.elem.style[this.prop] == null) ) {
-			return this.elem[ this.prop ];
-		}
-
-		var r = parseFloat( jQuery.css( this.elem, this.prop ) );
-		return r && r > -10000 ? r : 0;
-	},
-
-	// Start an animation from one number to another
-	custom: function( from, to, unit ) {
-		var self = this,
-			fx = jQuery.fx;
-
-		this.startTime = jQuery.now();
-		this.start = from;
-		this.end = to;
-		this.unit = unit || this.unit || "px";
-		this.now = this.start;
-		this.pos = this.state = 0;
-
-		function t( gotoEnd ) {
-			return self.step(gotoEnd);
-		}
-
-		t.elem = this.elem;
-
-		if ( t() && jQuery.timers.push(t) && !timerId ) {
-			timerId = setInterval(fx.tick, fx.interval);
-		}
-	},
-
-	// Simple 'show' function
-	show: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.show = true;
-
-		// Begin the animation
-		// Make sure that we start at a small width/height to avoid any
-		// flash of content
-		this.custom(this.prop === "width" || this.prop === "height" ? 1 : 0, this.cur());
-
-		// Start by showing the element
-		jQuery( this.elem ).show();
-	},
-
-	// Simple 'hide' function
-	hide: function() {
-		// Remember where we started, so that we can go back to it later
-		this.options.orig[this.prop] = jQuery.style( this.elem, this.prop );
-		this.options.hide = true;
-
-		// Begin the animation
-		this.custom(this.cur(), 0);
-	},
-
-	// Each step of an animation
-	step: function( gotoEnd ) {
-		var t = jQuery.now(), done = true;
-
-		if ( gotoEnd || t >= this.options.duration + this.startTime ) {
-			this.now = this.end;
-			this.pos = this.state = 1;
-			this.update();
-
-			this.options.curAnim[ this.prop ] = true;
-
-			for ( var i in this.options.curAnim ) {
-				if ( this.options.curAnim[i] !== true ) {
-					done = false;
-				}
-			}
-
-			if ( done ) {
-				// Reset the overflow
-				if ( this.options.overflow != null && !jQuery.support.shrinkWrapBlocks ) {
-					var elem = this.elem,
-						options = this.options;
-
-					jQuery.each( [ "", "X", "Y" ], function (index, value) {
-						elem.style[ "overflow" + value ] = options.overflow[index];
-					} );
-				}
-
-				// Hide the element if the "hide" operation was done
-				if ( this.options.hide ) {
-					jQuery(this.elem).hide();
-				}
-
-				// Reset the properties, if the item has been hidden or shown
-				if ( this.options.hide || this.options.show ) {
-					for ( var p in this.options.curAnim ) {
-						jQuery.style( this.elem, p, this.options.orig[p] );
-					}
-				}
-
-				// Execute the complete function
-				this.options.complete.call( this.elem );
-			}
-
-			return false;
-
-		} else {
-			var n = t - this.startTime;
-			this.state = n / this.options.duration;
-
-			// Perform the easing function, defaults to swing
-			var specialEasing = this.options.specialEasing && this.options.specialEasing[this.prop];
-			var defaultEasing = this.options.easing || (jQuery.easing.swing ? "swing" : "linear");
-			this.pos = jQuery.easing[specialEasing || defaultEasing](this.state, n, 0, 1, this.options.duration);
-			this.now = this.start + ((this.end - this.start) * this.pos);
-
-			// Perform the next step of the animation
-			this.update();
-		}
-
-		return true;
-	}
-};
-
-jQuery.extend( jQuery.fx, {
-	tick: function() {
-		var timers = jQuery.timers;
-
-		for ( var i = 0; i < timers.length; i++ ) {
-			if ( !timers[i]() ) {
-				timers.splice(i--, 1);
-			}
-		}
-
-		if ( !timers.length ) {
-			jQuery.fx.stop();
-		}
-	},
-
-	interval: 13,
-
-	stop: function() {
-		clearInterval( timerId );
-		timerId = null;
-	},
-
-	speeds: {
-		slow: 600,
-		fast: 200,
-		// Default speed
-		_default: 400
-	},
-
-	step: {
-		opacity: function( fx ) {
-			jQuery.style( fx.elem, "opacity", fx.now );
-		},
-
-		_default: function( fx ) {
-			if ( fx.elem.style && fx.elem.style[ fx.prop ] != null ) {
-				fx.elem.style[ fx.prop ] = (fx.prop === "width" || fx.prop === "height" ? Math.max(0, fx.now) : fx.now) + fx.unit;
-			} else {
-				fx.elem[ fx.prop ] = fx.now;
-			}
-		}
-	}
-});
-
-if ( jQuery.expr && jQuery.expr.filters ) {
-	jQuery.expr.filters.animated = function( elem ) {
-		return jQuery.grep(jQuery.timers, function( fn ) {
-			return elem === fn.elem;
-		}).length;
-	};
-}
-
-function defaultDisplay( nodeName ) {
-	if ( !elemdisplay[ nodeName ] ) {
-		var elem = jQuery("<" + nodeName + ">").appendTo("body"),
-			display = elem.css("display");
-
-		elem.remove();
-
-		if ( display === "none" || display === "" ) {
-			display = "block";
-		}
-
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return elemdisplay[ nodeName ];
-}
-
-
-
-
-var rtable = /^t(?:able|d|h)$/i,
-	rroot = /^(?:body|html)$/i;
-
-if ( "getBoundingClientRect" in document.documentElement ) {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0], box;
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		try {
-			box = elem.getBoundingClientRect();
-		} catch(e) {}
-
-		var doc = elem.ownerDocument,
-			docElem = doc.documentElement;
-
-		// Make sure we're not dealing with a disconnected DOM node
-		if ( !box || !jQuery.contains( docElem, elem ) ) {
-			return box || { top: 0, left: 0 };
-		}
-
-		var body = doc.body,
-			win = getWindow(doc),
-			clientTop  = docElem.clientTop  || body.clientTop  || 0,
-			clientLeft = docElem.clientLeft || body.clientLeft || 0,
-			scrollTop  = (win.pageYOffset || jQuery.support.boxModel && docElem.scrollTop  || body.scrollTop ),
-			scrollLeft = (win.pageXOffset || jQuery.support.boxModel && docElem.scrollLeft || body.scrollLeft),
-			top  = box.top  + scrollTop  - clientTop,
-			left = box.left + scrollLeft - clientLeft;
-
-		return { top: top, left: left };
-	};
-
-} else {
-	jQuery.fn.offset = function( options ) {
-		var elem = this[0];
-
-		if ( options ) { 
-			return this.each(function( i ) {
-				jQuery.offset.setOffset( this, options, i );
-			});
-		}
-
-		if ( !elem || !elem.ownerDocument ) {
-			return null;
-		}
-
-		if ( elem === elem.ownerDocument.body ) {
-			return jQuery.offset.bodyOffset( elem );
-		}
-
-		jQuery.offset.initialize();
-
-		var computedStyle,
-			offsetParent = elem.offsetParent,
-			prevOffsetParent = elem,
-			doc = elem.ownerDocument,
-			docElem = doc.documentElement,
-			body = doc.body,
-			defaultView = doc.defaultView,
-			prevComputedStyle = defaultView ? defaultView.getComputedStyle( elem, null ) : elem.currentStyle,
-			top = elem.offsetTop,
-			left = elem.offsetLeft;
-
-		while ( (elem = elem.parentNode) && elem !== body && elem !== docElem ) {
-			if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-				break;
-			}
-
-			computedStyle = defaultView ? defaultView.getComputedStyle(elem, null) : elem.currentStyle;
-			top  -= elem.scrollTop;
-			left -= elem.scrollLeft;
-
-			if ( elem === offsetParent ) {
-				top  += elem.offsetTop;
-				left += elem.offsetLeft;
-
-				if ( jQuery.offset.doesNotAddBorder && !(jQuery.offset.doesAddBorderForTableAndCells && rtable.test(elem.nodeName)) ) {
-					top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-					left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-				}
-
-				prevOffsetParent = offsetParent;
-				offsetParent = elem.offsetParent;
-			}
-
-			if ( jQuery.offset.subtractsBorderForOverflowNotVisible && computedStyle.overflow !== "visible" ) {
-				top  += parseFloat( computedStyle.borderTopWidth  ) || 0;
-				left += parseFloat( computedStyle.borderLeftWidth ) || 0;
-			}
-
-			prevComputedStyle = computedStyle;
-		}
-
-		if ( prevComputedStyle.position === "relative" || prevComputedStyle.position === "static" ) {
-			top  += body.offsetTop;
-			left += body.offsetLeft;
-		}
-
-		if ( jQuery.offset.supportsFixedPosition && prevComputedStyle.position === "fixed" ) {
-			top  += Math.max( docElem.scrollTop, body.scrollTop );
-			left += Math.max( docElem.scrollLeft, body.scrollLeft );
-		}
-
-		return { top: top, left: left };
-	};
-}
-
-jQuery.offset = {
-	initialize: function() {
-		var body = document.body, container = document.createElement("div"), innerDiv, checkDiv, table, td, bodyMarginTop = parseFloat( jQuery.css(body, "marginTop") ) || 0,
-			html = "<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";
-
-		jQuery.extend( container.style, { position: "absolute", top: 0, left: 0, margin: 0, border: 0, width: "1px", height: "1px", visibility: "hidden" } );
-
-		container.innerHTML = html;
-		body.insertBefore( container, body.firstChild );
-		innerDiv = container.firstChild;
-		checkDiv = innerDiv.firstChild;
-		td = innerDiv.nextSibling.firstChild.firstChild;
-
-		this.doesNotAddBorder = (checkDiv.offsetTop !== 5);
-		this.doesAddBorderForTableAndCells = (td.offsetTop === 5);
-
-		checkDiv.style.position = "fixed";
-		checkDiv.style.top = "20px";
-
-		// safari subtracts parent border width here which is 5px
-		this.supportsFixedPosition = (checkDiv.offsetTop === 20 || checkDiv.offsetTop === 15);
-		checkDiv.style.position = checkDiv.style.top = "";
-
-		innerDiv.style.overflow = "hidden";
-		innerDiv.style.position = "relative";
-
-		this.subtractsBorderForOverflowNotVisible = (checkDiv.offsetTop === -5);
-
-		this.doesNotIncludeMarginInBodyOffset = (body.offsetTop !== bodyMarginTop);
-
-		body.removeChild( container );
-		body = container = innerDiv = checkDiv = table = td = null;
-		jQuery.offset.initialize = jQuery.noop;
-	},
-
-	bodyOffset: function( body ) {
-		var top = body.offsetTop,
-			left = body.offsetLeft;
-
-		jQuery.offset.initialize();
-
-		if ( jQuery.offset.doesNotIncludeMarginInBodyOffset ) {
-			top  += parseFloat( jQuery.css(body, "marginTop") ) || 0;
-			left += parseFloat( jQuery.css(body, "marginLeft") ) || 0;
-		}
-
-		return { top: top, left: left };
-	},
-	
-	setOffset: function( elem, options, i ) {
-		var position = jQuery.css( elem, "position" );
-
-		// set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		var curElem = jQuery( elem ),
-			curOffset = curElem.offset(),
-			curCSSTop = jQuery.css( elem, "top" ),
-			curCSSLeft = jQuery.css( elem, "left" ),
-			calculatePosition = (position === "absolute" && jQuery.inArray('auto', [curCSSTop, curCSSLeft]) > -1),
-			props = {}, curPosition = {}, curTop, curLeft;
-
-		// need to be able to calculate position if either top or left is auto and position is absolute
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-		}
-
-		curTop  = calculatePosition ? curPosition.top  : parseInt( curCSSTop,  10 ) || 0;
-		curLeft = calculatePosition ? curPosition.left : parseInt( curCSSLeft, 10 ) || 0;
-
-		if ( jQuery.isFunction( options ) ) {
-			options = options.call( elem, i, curOffset );
-		}
-
-		if (options.top != null) {
-			props.top = (options.top - curOffset.top) + curTop;
-		}
-		if (options.left != null) {
-			props.left = (options.left - curOffset.left) + curLeft;
-		}
-		
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-
-jQuery.fn.extend({
-	position: function() {
-		if ( !this[0] ) {
-			return null;
-		}
-
-		var elem = this[0],
-
-		// Get *real* offsetParent
-		offsetParent = this.offsetParent(),
-
-		// Get correct offsets
-		offset       = this.offset(),
-		parentOffset = rroot.test(offsetParent[0].nodeName) ? { top: 0, left: 0 } : offsetParent.offset();
-
-		// Subtract element margins
-		// note: when an element has margin: auto the offsetLeft and marginLeft
-		// are the same in Safari causing offset.left to incorrectly be 0
-		offset.top  -= parseFloat( jQuery.css(elem, "marginTop") ) || 0;
-		offset.left -= parseFloat( jQuery.css(elem, "marginLeft") ) || 0;
-
-		// Add offsetParent borders
-		parentOffset.top  += parseFloat( jQuery.css(offsetParent[0], "borderTopWidth") ) || 0;
-		parentOffset.left += parseFloat( jQuery.css(offsetParent[0], "borderLeftWidth") ) || 0;
-
-		// Subtract the two offsets
-		return {
-			top:  offset.top  - parentOffset.top,
-			left: offset.left - parentOffset.left
-		};
-	},
-
-	offsetParent: function() {
-		return this.map(function() {
-			var offsetParent = this.offsetParent || document.body;
-			while ( offsetParent && (!rroot.test(offsetParent.nodeName) && jQuery.css(offsetParent, "position") === "static") ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-			return offsetParent;
-		});
-	}
-});
-
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( ["Left", "Top"], function( i, name ) {
-	var method = "scroll" + name;
-
-	jQuery.fn[ method ] = function(val) {
-		var elem = this[0], win;
-		
-		if ( !elem ) {
-			return null;
-		}
-
-		if ( val !== undefined ) {
-			// Set the scroll offset
-			return this.each(function() {
-				win = getWindow( this );
-
-				if ( win ) {
-					win.scrollTo(
-						!i ? val : jQuery(win).scrollLeft(),
-						 i ? val : jQuery(win).scrollTop()
-					);
-
-				} else {
-					this[ method ] = val;
-				}
-			});
-		} else {
-			win = getWindow( elem );
-
-			// Return the scroll offset
-			return win ? ("pageXOffset" in win) ? win[ i ? "pageYOffset" : "pageXOffset" ] :
-				jQuery.support.boxModel && win.document.documentElement[ method ] ||
-					win.document.body[ method ] :
-				elem[ method ];
-		}
-	};
-});
-
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ?
-		elem :
-		elem.nodeType === 9 ?
-			elem.defaultView || elem.parentWindow :
-			false;
-}
-
-
-
-
-// Create innerHeight, innerWidth, outerHeight and outerWidth methods
-jQuery.each([ "Height", "Width" ], function( i, name ) {
-
-	var type = name.toLowerCase();
-
-	// innerHeight and innerWidth
-	jQuery.fn["inner" + name] = function() {
-		return this[0] ?
-			parseFloat( jQuery.css( this[0], type, "padding" ) ) :
-			null;
-	};
-
-	// outerHeight and outerWidth
-	jQuery.fn["outer" + name] = function( margin ) {
-		return this[0] ?
-			parseFloat( jQuery.css( this[0], type, margin ? "margin" : "border" ) ) :
-			null;
-	};
-
-	jQuery.fn[ type ] = function( size ) {
-		// Get window width or height
-		var elem = this[0];
-		if ( !elem ) {
-			return size == null ? null : this;
-		}
-		
-		if ( jQuery.isFunction( size ) ) {
-			return this.each(function( i ) {
-				var self = jQuery( this );
-				self[ type ]( size.call( this, i, self[ type ]() ) );
-			});
-		}
-
-		if ( jQuery.isWindow( elem ) ) {
-			// Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode
-			return elem.document.compatMode === "CSS1Compat" && elem.document.documentElement[ "client" + name ] ||
-				elem.document.body[ "client" + name ];
-
-		// Get document width or height
-		} else if ( elem.nodeType === 9 ) {
-			// Either scroll[Width/Height] or offset[Width/Height], whichever is greater
-			return Math.max(
-				elem.documentElement["client" + name],
-				elem.body["scroll" + name], elem.documentElement["scroll" + name],
-				elem.body["offset" + name], elem.documentElement["offset" + name]
-			);
-
-		// Get or set width or height on the element
-		} else if ( size === undefined ) {
-			var orig = jQuery.css( elem, type ),
-				ret = parseFloat( orig );
-
-			return jQuery.isNaN( ret ) ? orig : ret;
-
-		// Set the width or height on the element (default to pixels if value is unitless)
-		} else {
-			return this.css( type, typeof size === "string" ? size : size + "px" );
-		}
-	};
-
-});
-
-
-})(window);
\ No newline at end of file
diff --git a/common/js/src/js_app.js b/common/js/src/js_app.js
deleted file mode 100644
index fd3ecf8a0..000000000
--- a/common/js/src/js_app.js
+++ /dev/null
@@ -1,279 +0,0 @@
-/**
- * @file js_app.js
- * @author NHN (developers@xpressengine.com)
- * @brief XE JavaScript Application Framework (JAF)
- * @namespace xe
- * @update 20100701
- */
-(function($){
-
-var _xe_base, _app_base, _plugin_base;
-var _apps = [];
-
-_xe_base = {
-	/**
-	 * @brief return the name of Core module
-	 */
-	getName : function() {
-		return 'Core';
-	},
-
-	/**
-	 * @brief Create an application class
-	 */
-	createApp : function(sName, oDef) {
-		var _base = getTypeBase();
-
-		$.extend(_base.prototype, _app_base, oDef);
-
-		_base.prototype.getName = function() {
-			return sName;
-		};
-
-		return _base;
-	},
-
-	/**
-	 * @brief Create a plugin class
-	 */
-	createPlugin : function(sName, oDef) {
-		var _base = getTypeBase();
-
-		$.extend(_base.prototype, _plugin_base, oDef);
-
-		_base.prototype.getName = function() {
-			return sName;
-		};
-
-		return _base;
-	},
-
-	/**
-	 * @brief Get the array of applications
-	 */
-	getApps : function() {
-		return $.makeArray(_apps);
-	},
-
-	/**
-	 * @brief Get one application
-	 */
-	getApp : function(indexOrName) {
-		indexOrName = (indexOrName||'').toLowerCase();
-		if(typeof _apps[indexOrName] != 'undefined') {
-			return _apps[indexOrName];
-		} else {
-			return null;
-		}
-	},
-
-	/**
-	 * @brief Register an application instance
-	 */
-	registerApp : function(oApp) {
-		var sName = oApp.getName().toLowerCase();
-
-		_apps.push(oApp);
-		if (!$.isArray(_apps[sName])) {
-			_apps[sName] = [];
-		}
-		_apps[sName].push(oApp);
-
-		oApp.parent = this;
-
-		// register event
-		if ($.isFunction(oApp.activate)) oApp.activate();
-	},
-
-	/**
-	 * @brief Unregister an application instance
-	 */
-	unregisterApp : function(oApp) {
-		var sName  = oPlugin.getName().toLowerCase();
-		var nIndex = $.inArray(oApp, _apps);
-
-		if (nIndex >= 0) _apps.splice(nIndex, 1);
-
-		if ($.isArray(_apps[sName])) {
-			nIndex = $.inArray(oApp, _apps[sName]);
-			if (nIndex >= 0) _apps[sName].splice(nIndex, 1);
-		}
-
-		// unregister event
-		if ($.isFunction(oApp.deactivate)) oApp.deactivate();
-	},
-
-	/**
-	 * @brief overrides broadcast method
-	 */
-	broadcast : function(msg, params) {
-		this._broadcast(this, msg, params);
-	},
-
-	_broadcast : function(sender, msg, params) {
-		for(var i=0; i < _apps.length; i++) {
-			_apps[i]._cast(sender, msg, params);
-		}
-
-
-		// cast to child plugins
-		this._cast(sender, msg, params);
-	}
-}
-
-_app_base = {
-	_plugins  : [],
-	_messages : {},
-
-	/**
-	 * @brief get plugin
-	 */
-	getPlugin : function(sPluginName) {
-		sPluginName = sPluginName.toLowerCase();
-		if ($.isArray(this._plugins[sPluginName])) {
-			return this._plugins[sPluginName];
-		} else {
-			return [];
-		}
-	},
-
-	/**
-	 * @brief register a plugin instance
-	 */
-	registerPlugin : function(oPlugin) {
-		var self  = this;
-		var sName = oPlugin.getName().toLowerCase();
-
-		// check if the plugin is already registered
-		if ($.inArray(oPlugin, this._plugins) >= 0) return false;
-
-		// push the plugin into the _plugins array
-		this._plugins.push(oPlugin);
-
-		if (!$.isArray(this._plugins[sName])) this._plugins[sName] = [];
-		this._plugins[sName].push(oPlugin);
-
-		// register method pool
-		$.each(oPlugin._binded_fn, function(api, fn){ self.registerHandler(api, fn); });
-
-		// binding
-		oPlugin.oApp = this;
-
-		// registered event
-		if ($.isFunction(oPlugin.activate)) oPlugin.activate();
-
-		return true;
-	},
-
-	/**
-	 * @brief register api message handler
-	 */
-	registerHandler : function(api, func) {
-		var msgs = this._messages; api = api.toUpperCase();
-		if (!$.isArray(msgs[api])) msgs[api] = [];
-		msgs[api].push(func);
-	},
-
-	cast : function(msg, params) {
-		return this._cast(this, msg, params || []);
-	},
-
-	broadcast : function(sender, msg, params) {
-		if (this.parent && this.parent._broadcast) {
-			this.parent._broadcast(sender, msg, params);
-		}
-	},
-
-	_cast : function(sender, msg, params) {
-		var i, len;
-		var aMsg = this._messages;
-
-		msg = msg.toUpperCase();
-
-		// BEFORE hooker
-		if (aMsg['BEFORE_'+msg] || this['API_BEFORE_'+msg]) {
-			var bContinue = this._cast(sender, 'BEFORE_'+msg, params);
-			if (!bContinue) return;
-		}
-
-		// main api function
-		var vRet = [], sFn = 'API_'+msg;
-		if ($.isArray(aMsg[msg])) {
-			for(i=0; i < aMsg[msg].length; i++) {
-				vRet.push( aMsg[msg][i](sender, params) );
-			}
-		}
-		if (vRet.length < 2) vRet = vRet[0];
-
-		// AFTER hooker
-		if (aMsg['AFTER_'+msg] || this['API_AFTER_'+msg]) {
-			this._cast(sender, 'AFTER_'+msg, params);
-		}
-
-		if (!/^(?:AFTER|BEFORE)_/.test(msg)) { // top level function
-			return vRet;
-		} else {
-			return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet);
-		}
-	}
-};
-
-_plugin_base = {
-	oApp : null,
-
-	cast : function(msg, params) {
-		if (this.oApp && this.oApp._cast) {
-			return this.oApp._cast(this, msg, params || []);
-		}
-	},
-
-	broadcast : function(msg, params) {
-		if (this.oApp && this.oApp.broadcast) {
-			this.oApp.broadcast(this, mag, params || []);
-		}
-	}
-
-	/**
-	 * Event handler prototype
-	 *
-	 * function (oSender, params)
-	 */
-};
-
-function getTypeBase() {
-	var _base = function() {
-		var self = this;
-		var pool = null;
-		
-		if ($.isArray(this._plugins))   this._plugins   = [];
-		if (this._messages) this._messages = {};
-		else this._binded_fn = {};
-		
-		// bind functions
-		$.each(this, function(key, val){
-			if (!$.isFunction(val)) return true;
-			if (!/^API_([A-Z0-9_]+)$/.test(key)) return true;
-
-			var api = RegExp.$1;
-			var fn  = function(sender, params){ return self[key](sender, params) };
-
-			if (self._messages) self._messages[api] = [fn];
-			else self._binded_fn[api] = fn;
-		});
-
-		if ($.isFunction(this.init)) this.init.apply(this, arguments);
-	};
-
-	return _base;
-}
-
-window.xe = $.extend(_app_base, _xe_base);
-window.xe.lang = {}; // language repository
-
-// domready event
-$(function(){ xe.broadcast('ONREADY'); });
-
-// load event
-$(window).load(function(){ xe.broadcast('ONLOAD'); });
-
-})(jQuery);
diff --git a/common/js/src/x.js b/common/js/src/x.js
deleted file mode 100644
index 72bfd87e4..000000000
--- a/common/js/src/x.js
+++ /dev/null
@@ -1,676 +0,0 @@
-/** 
- * x.js compiled from X 4.0 with XC 0.27b. 
- * Distributed by GNU LGPL. For copyrights, license, documentation and more visit Cross-Browser.com 
- * Copyright 2001-2005 Michael Foster (Cross-Browser.com)
- **/
-function xDeprecate(funcName) {
-	var msg = 'DEPRECATED : '+funcName+'() is deprecated function.';
-	if (typeof console == 'object' && typeof console.log == 'function') {
-		console.log(msg);
-	}
-}
-
-var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xIE6,xNN4,xUA=navigator.userAgent.toLowerCase();
-if(window.opera){
-  var i=xUA.indexOf('opera');
-  if(i!=-1){
-    var v=parseInt(xUA.charAt(i+6));
-    xOp7Up=v>=7;
-    xOp6Dn=v<7;
-  }
-}
-else if(navigator.vendor!='KDE' && document.all && xUA.indexOf('msie')!=-1){
-  xIE4Up=parseFloat(navigator.appVersion)>=4;
-  xIE4=xUA.indexOf('msie 4')!=-1;
-  xIE5=xUA.indexOf('msie 5')!=-1;
-  xIE6=xUA.indexOf('msie 6')!=-1;
-}
-else if(document.layers){xNN4=true;}
-var xMac=xUA.indexOf('mac')!=-1;
-var xFF=xUA.indexOf('firefox')!=-1;
-
-// (element, event(without 'on'), event listener(function name)[, caption])
-function xAddEventListener(e,eT,eL,cap)
-{
-  xDeprecate('xAddEventListener');
-  if(!(e=xGetElementById(e))) return;
-  eT=eT.toLowerCase();
-  if((!xIE4Up && !xOp7Up) && e==window) {
-    if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }
-    if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }
-  }
-  var eh='e.on'+eT+'=eL';
-  if(e.addEventListener) e.addEventListener(eT,eL,cap);
-  else if(e.attachEvent) e.attachEvent('on'+eT,eL);
-  else eval(eh);
-}
-// called only from the above
-function xResizeEvent()
-{
-  xDeprecate('xResizeEvent');
-  if (window.xREL) setTimeout('xResizeEvent()', 250);
-  var cw = xClientWidth(), ch = xClientHeight();
-  if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }
-}
-
-function xScrollEvent()
-{
-  xDeprecate('xScrollEvent');
-  if (window.xSEL) setTimeout('xScrollEvent()', 250);
-  var sl = xScrollLeft(), st = xScrollTop();
-  if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }
-}
-
-function xAppendChild(oParent, oChild)
-{
-  xDeprecate('xAppendChild');
-  if (oParent.appendChild) return oParent.appendChild(oChild);
-  else return null;
-}
-
-function xClientHeight()
-{
-  xDeprecate('xClientHeight');
-  var h=0;
-  if(xOp6Dn) h=window.innerHeight;
-  else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)
-    h=document.documentElement.clientHeight;
-  else if(document.body && document.body.clientHeight)
-    h=document.body.clientHeight;
-  else if(xDef(window.innerWidth,window.innerHeight,document.width)) {
-    h=window.innerHeight;
-    if(document.width>window.innerWidth) h-=16;
-  }
-  return h;
-}
-
-function xClientWidth()
-{
-  xDeprecate('xClientWidth');
-  var w=0;
-  if(xOp6Dn) w=window.innerWidth;
-  else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)
-    w=document.documentElement.clientWidth;
-  else if(document.body && document.body.clientWidth)
-    w=document.body.clientWidth;
-  else if(xDef(window.innerWidth,window.innerHeight,document.height)) {
-    w=window.innerWidth;
-    if(document.height>window.innerHeight) w-=16;
-  }
-  return w;
-}
-
-function xCreateElement(sTag)
-{
-  xDeprecate('xCreateElement');
-  if (document.createElement) return document.createElement(sTag);
-  else return null;
-}
-
-function xDef()
-{
-  xDeprecate('xDef');
-  for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}
-  return true;
-}
-
-function xDeleteCookie(name, path)
-{
-  xDeprecate('xDeleteCookie');
-  if (xGetCookie(name)) {
-    document.cookie = name + "=" +
-                    "; path=" + ((!path) ? "/" : path) +
-                    "; expires=" + new Date(0).toGMTString();
-  }
-}
-
-function xDisplay(e,s)
-{
-  xDeprecate('xDisplay');
-  if(!(e=xGetElementById(e))) return null;
-  if(e.style && xDef(e.style.display)) {
-    if (xStr(s)) e.style.display = s;
-    return e.style.display;
-  }
-  return null;
-}
-
-function xEvent(evt) // object prototype
-{
-  xDeprecate('xEvent');
-  var e = evt || window.event;
-  if(!e) return;
-  if(e.type) this.type = e.type;
-  if(e.target) this.target = e.target;
-  else if(e.srcElement) this.target = e.srcElement;
-
-  // Section B
-  if (e.relatedTarget) this.relatedTarget = e.relatedTarget;
-  else if (e.type == 'mouseover' && e.fromElement) this.relatedTarget = e.fromElement;
-  else if (e.type == 'mouseout') this.relatedTarget = e.toElement;
-  // End Section B
-
-  if(xOp6Dn) { this.pageX = e.clientX; this.pageY = e.clientY; }
-  else if(xDef(e.pageX,e.pageY)) { this.pageX = e.pageX; this.pageY = e.pageY; }
-  else if(xDef(e.clientX,e.clientY)) { this.pageX = e.clientX + xScrollLeft(); this.pageY = e.clientY + xScrollTop(); }
-
-  // Section A
-  if (xDef(e.offsetX,e.offsetY)) {
-    this.offsetX = e.offsetX;
-    this.offsetY = e.offsetY;
-  }
-  else if (xDef(e.layerX,e.layerY)) {
-    this.offsetX = e.layerX;
-    this.offsetY = e.layerY;
-  }
-  else {
-    this.offsetX = this.pageX - xPageX(this.target);
-    this.offsetY = this.pageY - xPageY(this.target);
-  }
-  // End Section A
-  
-  if (e.keyCode) { this.keyCode = e.keyCode; } // for moz/fb, if keyCode==0 use which
-  else if (xDef(e.which) && e.type.indexOf('key')!=-1) { this.keyCode = e.which; }
-
-  this.shiftKey = e.shiftKey;
-  this.ctrlKey = e.ctrlKey;
-  this.altKey = e.altKey;
-}
-
-function xFirstChild(e, t)
-{
-  xDeprecate('xFirstChild');
-  var c = e ? e.firstChild : null;
-  if (t) while (c && c.nodeName != t) { c = c.nextSibling; }
-  else while (c && c.nodeType != 1) { c = c.nextSibling; }
-  return c;
-}
-
-function xGetBodyWidth() {
-  xDeprecate('xGetBodyWidth');
-  var cw = xClientWidth();
-  var sw = window.document.body.scrollWidth;
-  return cw>sw?cw:sw;
-}
-
-function xGetBodyHeight() {
-  xDeprecate('xGetBodyHeight');
-  var cw = xClientHeight();
-  var sw = window.document.body.scrollHeight;
-  return cw>sw?cw:sw;
-}
-
-function xGetComputedStyle(oEle, sProp, bInt)
-{
-  xDeprecate('xGetComputedStyle');
-  var s, p = 'undefined';
-  var dv = document.defaultView;
-  if(dv && dv.getComputedStyle){
-    s = dv.getComputedStyle(oEle,'');
-    if (s) p = s.getPropertyValue(sProp);
-  }
-  else if(oEle.currentStyle) {
-    // convert css property name to object property name for IE
-    var a = sProp.split('-');
-    sProp = a[0];
-    for (var i=1; i<a.length; ++i) {
-      c = a[i].charAt(0);
-      sProp += a[i].replace(c, c.toUpperCase());
-    }   
-    p = oEle.currentStyle[sProp];
-  }
-  else return null;
-  return bInt ? (parseInt(p) || 0) : p;
-}
-
-function xGetCookie(name)
-{
-  xDeprecate('xGetCookie');
-  var value=null, search=name+"=";
-  if (document.cookie.length > 0) {
-    var offset = document.cookie.indexOf(search);
-    if (offset != -1) {
-      offset += search.length;
-      var end = document.cookie.indexOf(";", offset);
-      if (end == -1) end = document.cookie.length;
-      value = unescape(document.cookie.substring(offset, end));
-    }
-  }
-  return value;
-}
-
-function xGetElementById(e)
-{
-  xDeprecate('xGetElementById');
-  if(typeof(e)!='string') return e;
-  if(document.getElementById) e=document.getElementById(e);
-  else if(document.all) e=document.all[e];
-  else e=null;
-  return e;
-}
-
-function xGetElementsByAttribute(sTag, sAtt, sRE, fn)
-{
-  xDeprecate('xGetElementsByAttribute');
-  var a, list, found = new Array(), re = new RegExp(sRE, 'i');
-  list = xGetElementsByTagName(sTag);
-  for (var i = 0; i < list.length; ++i) {
-    a = list[i].getAttribute(sAtt);
-    if (!a) {a = list[i][sAtt];}
-    if (typeof(a)=='string' && a.search(re) != -1) {
-      found[found.length] = list[i];
-      if (fn) fn(list[i]);
-    }
-  }
-  return found;
-}
-
-function xGetElementsByClassName(c,p,t,f)
-{
-  xDeprecate('xGetElementsByClassName');
-  var found = new Array();
-  var re = new RegExp('\\b'+c+'\\b', 'i');
-  var list = xGetElementsByTagName(t, p);
-  for (var i = 0; i < list.length; ++i) {
-    if (list[i].className && list[i].className.search(re) != -1) {
-      found[found.length] = list[i];
-      if (f) f(list[i]);
-    }
-  }
-  return found;
-}
-
-function xGetElementsByTagName(t,p)
-{
-  xDeprecate('xGetElementsByTagName');
-  var list = null;
-  t = t || '*';
-  p = p || document;
-  if (xIE4 || xIE5) {
-    if (t == '*') list = p.all;
-    else list = p.all.tags(t);
-  }
-  else if (p.getElementsByTagName) list = p.getElementsByTagName(t);
-  return list || new Array();
-}
-
-function xGetURLArguments()
-{
-  xDeprecate('xGetURLArguments');
-  var idx = location.href.indexOf('?');
-  var params = new Array();
-  if (idx != -1) {
-    var pairs = location.href.substring(idx+1, location.href.length).split('&');
-    for (var i=0; i<pairs.length; i++) {
-      nameVal = pairs[i].split('=');
-      params[i] = nameVal[1];
-      params[nameVal[0]] = nameVal[1];
-    }
-  }
-  return params;
-}
-
-function xHeight(e,h)
-{
-  xDeprecate('xHeight');
-  if(!(e=xGetElementById(e))) return 0;
-  if (xNum(h)) {
-    if (h<0) h = 0;
-    else h=Math.round(h);
-  }
-  else h=-1;
-  var css=xDef(e.style);
-  if (e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
-    h = xClientHeight();
-  }
-  else if(css && xDef(e.offsetHeight) && xStr(e.style.height)) {
-    if(h>=0) {
-      var pt=0,pb=0,bt=0,bb=0;
-      if (document.compatMode=='CSS1Compat') {
-        var gcs = xGetComputedStyle;
-        pt=gcs(e,'padding-top',1);
-        if (pt !== null) {
-          pb=gcs(e,'padding-bottom',1);
-          bt=gcs(e,'border-top-width',1);
-          bb=gcs(e,'border-bottom-width',1);
-        }
-        // Should we try this as a last resort?
-        // At this point getComputedStyle and currentStyle do not exist.
-        else if(xDef(e.offsetHeight,e.style.height)){
-          e.style.height=h+'px';
-          pt=e.offsetHeight-h;
-        }
-      }
-      h-=(pt+pb+bt+bb);
-      if(isNaN(h)||h<0) return null;
-      else e.style.height=h+'px';
-    }
-    h=e.offsetHeight;
-  }
-  else if(css && xDef(e.style.pixelHeight)) {
-    if(h>=0) e.style.pixelHeight=h;
-    h=e.style.pixelHeight;
-  }
-  return h;
-}
-
-function xHex(sn, digits, prefix)
-{
-  xDeprecate('xHex');
-  var p = '';
-  var n = Math.ceil(sn);
-  if (prefix) p = prefix;
-  n = n.toString(16);
-  for (var i=0; i < digits - n.length; ++i) {
-    p += '0';
-  }
-  return p + n;
-}
-
-function xHide(e){  xDeprecate('xHide'); return xVisibility(e,0);}
-
-function xInnerHtml(e,h)
-{
-  xDeprecate('xInnerHtml');
-  if(!(e=xGetElementById(e)) || !xStr(e.innerHTML)) return null;
-  var s = e.innerHTML;
-  if (xStr(h)) {e.innerHTML = h;}
-  return s;
-}
-
-function xLeft(e, iX)
-{
-  xDeprecate('xLeft');
-  if(!(e=xGetElementById(e))) return 0;
-  var css=xDef(e.style);
-  if (css && xStr(e.style.left)) {
-    if(xNum(iX)) e.style.left=iX+'px';
-    else {
-      iX=parseInt(e.style.left);
-      if(isNaN(iX)) iX=0;
-    }
-  }
-  else if(css && xDef(e.style.pixelLeft)) {
-    if(xNum(iX)) e.style.pixelLeft=iX;
-    else iX=e.style.pixelLeft;
-  }
-  return iX;
-}
-
-function xMoveTo(e,x,y)
-{
-  xDeprecate('xMoveTo');
-  xLeft(e,x);
-  xTop(e,y);
-}
-
-function xName(e)
-{
-  xDeprecate('xName');
-  if (!e) return e;
-  else if (e.id && e.id != "") return e.id;
-  else if (e.name && e.name != "") return e.name;
-  else if (e.nodeName && e.nodeName != "") return e.nodeName;
-  else if (e.tagName && e.tagName != "") return e.tagName;
-  else return e;
-}
-
-function xNextSib(e,t)
-{
-  xDeprecate('xNextSib');
-  var s = e ? e.nextSibling : null;
-  if (t) while (s && s.nodeName != t) { s = s.nextSibling; }
-  else while (s && s.nodeType != 1) { s = s.nextSibling; }
-  return s;
-}
-
-function xNum()
-{
-  xDeprecate('xNum');
-  for(var i=0; i<arguments.length; ++i){if(isNaN(arguments[i]) || typeof(arguments[i])!='number') return false;}
-  return true;
-}
-
-function xOffsetLeft(e)
-{
-  xDeprecate('xOffsetLeft');
-  if (!(e=xGetElementById(e))) return 0;
-  if (xDef(e.offsetLeft)) return e.offsetLeft;
-  else return 0;
-}
-
-function xOffsetTop(e)
-{
-  xDeprecate('xOffsetTop');
-  if (!(e=xGetElementById(e))) return 0;
-  if (xDef(e.offsetTop)) return e.offsetTop;
-  else return 0;
-}
-
-function xPad(s,len,c,left)
-{
-  xDeprecate('xPad');
-  if(typeof s != 'string') s=s+'';
-  if(left) {for(var i=s.length; i<len; ++i) s=c+s;}
-  else {for (i=s.length; i<len; ++i) s+=c;}
-  return s;
-}
-
-function xPageX(e)
-{
-  xDeprecate('xPageX');
-  if (!(e=xGetElementById(e))) return 0;
-  var x = 0;
-  while (e) {
-    if (xDef(e.offsetLeft)) x += e.offsetLeft;
-    e = xDef(e.offsetParent) ? e.offsetParent : null;
-  }
-  return x;
-}
-
-function xPageY(e)
-{
-  xDeprecate('xPageY');
-  if (!(e=xGetElementById(e))) return 0;
-  var y = 0;
-  while (e) {
-    if (xDef(e.offsetTop)) y += e.offsetTop;
-    e = xDef(e.offsetParent) ? e.offsetParent : null;
-  }
-//  if (xOp7Up) return y - document.body.offsetTop; // v3.14, temporary hack for opera bug 130324 (reported 1nov03)
-  return y;
-}
-
-function xParent(e, bNode)
-{
-  xDeprecate('xParent');
-  if (!(e=xGetElementById(e))) return null;
-  var p=null;
-  if (!bNode && xDef(e.offsetParent)) p=e.offsetParent;
-  else if (xDef(e.parentNode)) p=e.parentNode;
-  else if (xDef(e.parentElement)) p=e.parentElement;
-  return p;
-}
-
-function xPreventDefault(e)
-{
-  xDeprecate('xPreventDefault');
-  if (e && e.preventDefault) e.preventDefault()
-  else if (window.event) window.event.returnValue = false;
-}
-
-function xPrevSib(e,t)
-{
-  xDeprecate('xPrevSib');
-  var s = e ? e.previousSibling : null;
-  if (t) while(s && s.nodeName != t) {s=s.previousSibling;}
-  else while(s && s.nodeType != 1) {s=s.previousSibling;}
-  return s;
-}
-
-function xRemoveEventListener(e,eT,eL,cap)
-{
-  xDeprecate('xRemoveEventListener');
-  if(!(e=xGetElementById(e))) return;
-  eT=eT.toLowerCase();
-  if((!xIE4Up && !xOp7Up) && e==window) {
-    if(eT=='resize') { window.xREL=null; return; }
-    if(eT=='scroll') { window.xSEL=null; return; }
-  }
-  var eh='e.on'+eT+'=null';
-  if(e.removeEventListener) e.removeEventListener(eT,eL,cap);
-  else if(e.detachEvent) e.detachEvent('on'+eT,eL);
-  else eval(eh);
-}
-
-function xResizeTo(e,w,h)
-{
-  xDeprecate('xResizeTo');
-  xWidth(e,w);
-  xHeight(e,h);
-}
-
-function xScrollLeft(e, bWin)
-{
-  xDeprecate('xScrollLeft');
-  var offset=0;
-  if (!xDef(e) || bWin || e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
-    var w = window;
-    if (bWin && e) w = e;
-    if(w.document.documentElement && w.document.documentElement.scrollLeft) offset=w.document.documentElement.scrollLeft;
-    else if(w.document.body && xDef(w.document.body.scrollLeft)) offset=w.document.body.scrollLeft;
-  }
-  else {
-    e = xGetElementById(e);
-    if (e && xNum(e.scrollLeft)) offset = e.scrollLeft;
-  }
-  return offset;
-}
-
-function xScrollTop(e, bWin)
-{
-  xDeprecate('xScrollTop');
-  var offset=0;
-  if (!xDef(e) || bWin || e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
-    var w = window;
-    if (bWin && e) w = e;
-    if(w.document.documentElement && w.document.documentElement.scrollTop) offset=w.document.documentElement.scrollTop;
-    else if(w.document.body && xDef(w.document.body.scrollTop)) offset=w.document.body.scrollTop;
-  }
-  else {
-    e = xGetElementById(e);
-    if (e && xNum(e.scrollTop)) offset = e.scrollTop;
-  }
-  return offset;
-}
-
-function xSetCookie(name, value, expire, path)
-{
-  xDeprecate('xSetCookie');
-  document.cookie = name + "=" + escape(value) +
-                    ((!expire) ? "" : ("; expires=" + expire.toGMTString())) +
-                    "; path=" + ((!path) ? "/" : path);
-}
-
-function xShow(e) { xDeprecate('xShow'); return xVisibility(e,1);}
-
-
-function xStr(s)
-{
-  xDeprecate('xStr');
-  for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])!='string') return false;}
-  return true;
-}
-
-function xTop(e, iY)
-{
-  xDeprecate('xTop');
-  if(!(e=xGetElementById(e))) return 0;
-  var css=xDef(e.style);
-  if(css && xStr(e.style.top)) {
-    if(xNum(iY)) e.style.top=iY+'px';
-    else {
-      iY=parseInt(e.style.top);
-      if(isNaN(iY)) iY=0;
-    }
-  }
-  else if(css && xDef(e.style.pixelTop)) {
-    if(xNum(iY)) e.style.pixelTop=iY;
-    else iY=e.style.pixelTop;
-  }
-  return iY;
-}
-
-function xVisibility(e, bShow)
-{
-  xDeprecate('xVisibility');
-  if(!(e=xGetElementById(e))) return null;
-  if(e.style && xDef(e.style.visibility)) {
-    if (xDef(bShow)) e.style.visibility = bShow ? 'visible' : 'hidden';
-    return e.style.visibility;
-  }
-  return null;
-}
-
-function xWidth(e,w)
-{
-  xDeprecate('xWidth');
-  if(!(e=xGetElementById(e))) return 0;
-  if (xNum(w)) {
-    if (w<0) w = 0;
-    else w=Math.round(w);
-  }
-  else w=-1;
-  var css=xDef(e.style);
-  if (e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
-    w = xClientWidth();
-  }
-  else if(css && xDef(e.offsetWidth) && xStr(e.style.width)) {
-    if(w>=0) {
-      var pl=0,pr=0,bl=0,br=0;
-      if (document.compatMode=='CSS1Compat') {
-        var gcs = xGetComputedStyle;
-        pl=gcs(e,'padding-left',1);
-        if (pl !== null) {
-          pr=gcs(e,'padding-right',1);
-          bl=gcs(e,'border-left-width',1);
-          br=gcs(e,'border-right-width',1);
-        }
-        // Should we try this as a last resort?
-        // At this point getComputedStyle and currentStyle do not exist.
-        else if(xDef(e.offsetWidth,e.style.width)){
-          e.style.width=w+'px';
-          pl=e.offsetWidth-w;
-        }
-      }
-      w-=(pl+pr+bl+br);
-      if(isNaN(w)||w<0) return null;
-      else e.style.width=w+'px';
-    }
-    w=e.offsetWidth;
-  }
-  else if(css && xDef(e.style.pixelWidth)) {
-    if(w>=0) e.style.pixelWidth=w;
-    w=e.style.pixelWidth;
-  }
-  return w;
-}
-
-function xZIndex(e,uZ)
-{
-  xDeprecate('xZIndex');
-  if(!(e=xGetElementById(e))) return 0;
-  if(e.style && xDef(e.style.zIndex)) {
-    if(xNum(uZ)) e.style.zIndex=uZ;
-    uZ=parseInt(e.style.zIndex);
-  }
-  return uZ;
-}
-
-function xStopPropagation(evt)
-{
-  xDeprecate('xStopPropagation');
-  if (evt && evt.stopPropagation) evt.stopPropagation();
-  else if (window.event) window.event.cancelBubble = true;
-}
-
diff --git a/common/js/src/xml_handler.js b/common/js/src/xml_handler.js
deleted file mode 100644
index f089dc174..000000000
--- a/common/js/src/xml_handler.js
+++ /dev/null
@@ -1,409 +0,0 @@
-/**
- * @file   common/js/xml_handler.js
- * @brief  XE에서 ajax기능을 이용함에 있어 module, act를 잘 사용하기 위한 자바스크립트
- **/
-
-// xml handler을 이용하는 user function
-var show_waiting_message = true;
-
-/*  This work is licensed under Creative Commons GNU LGPL License.
-
-    License: http://creativecommons.org/licenses/LGPL/2.1/
-   Version: 0.9
-    Author:  Stefan Goessner/2006
-    Web:     http://goessner.net/
-*/
-function xml2json(xml, tab, ignoreAttrib) {
-   var X = {
-      toObj: function(xml) {
-         var o = {};
-         if (xml.nodeType==1) {   // element node ..
-            if (ignoreAttrib && xml.attributes.length)   // element with attributes  ..
-               for (var i=0; i<xml.attributes.length; i++)
-                  o["@"+xml.attributes[i].nodeName] = (xml.attributes[i].nodeValue||"").toString();
-            if (xml.firstChild) { // element has child nodes ..
-               var textChild=0, cdataChild=0, hasElementChild=false;
-               for (var n=xml.firstChild; n; n=n.nextSibling) {
-                  if (n.nodeType==1) hasElementChild = true;
-                  else if (n.nodeType==3 && n.nodeValue.match(/[^ \f\n\r\t\v]/)) textChild++; // non-whitespace text
-                  else if (n.nodeType==4) cdataChild++; // cdata section node
-               }
-               if (hasElementChild) {
-                  if (textChild < 2 && cdataChild < 2) { // structured element with evtl. a single text or/and cdata node ..
-                     X.removeWhite(xml);
-                     for (var n=xml.firstChild; n; n=n.nextSibling) {
-                        if (n.nodeType == 3)  // text node
-                           o = X.escape(n.nodeValue);
-                        else if (n.nodeType == 4)  // cdata node
-//                           o["#cdata"] = X.escape(n.nodeValue);
-                            o = X.escape(n.nodeValue);
-                        else if (o[n.nodeName]) {  // multiple occurence of element ..
-                           if (o[n.nodeName] instanceof Array)
-                              o[n.nodeName][o[n.nodeName].length] = X.toObj(n);
-                           else
-                              o[n.nodeName] = [o[n.nodeName], X.toObj(n)];
-                        }
-                        else  // first occurence of element..
-                           o[n.nodeName] = X.toObj(n);
-                     }
-                  }
-                  else { // mixed content
-                     if (!xml.attributes.length)
-                        o = X.escape(X.innerXml(xml));
-                     else
-                        o["#text"] = X.escape(X.innerXml(xml));
-                  }
-               }
-               else if (textChild) { // pure text
-                  if (!xml.attributes.length)
-                     o = X.escape(X.innerXml(xml));
-                  else
-                     o["#text"] = X.escape(X.innerXml(xml));
-               }
-               else if (cdataChild) { // cdata
-                  if (cdataChild > 1)
-                     o = X.escape(X.innerXml(xml));
-                  else
-                     for (var n=xml.firstChild; n; n=n.nextSibling){
-                        //o["#cdata"] = X.escape(n.nodeValue);
-                        o = X.escape(n.nodeValue);
-                  }
-               }
-            }
-            if (!xml.attributes.length && !xml.firstChild) o = null;
-         }
-         else if (xml.nodeType==9) { // document.node
-            o = X.toObj(xml.documentElement);
-         }
-         else
-            alert("unhandled node type: " + xml.nodeType);
-         return o;
-      },
-      toJson: function(o, name, ind) {
-         var json = name ? ("\""+name+"\"") : "";
-         if (o instanceof Array) {
-            for (var i=0,n=o.length; i<n; i++)
-               o[i] = X.toJson(o[i], "", ind+"\t");
-            json += (name?":[":"[") + (o.length > 1 ? ("\n"+ind+"\t"+o.join(",\n"+ind+"\t")+"\n"+ind) : o.join("")) + "]";
-         }
-         else if (o == null)
-            json += (name&&":") + "null";
-         else if (typeof(o) == "object") {
-            var arr = [];
-            for (var m in o)
-               arr[arr.length] = X.toJson(o[m], m, ind+"\t");
-            json += (name?":{":"{") + (arr.length > 1 ? ("\n"+ind+"\t"+arr.join(",\n"+ind+"\t")+"\n"+ind) : arr.join("")) + "}";
-         }
-         else if (typeof(o) == "string")
-            json += (name&&":") + "\"" + o.toString() + "\"";
-         else
-            json += (name&&":") + o.toString();
-         return json;
-      },
-      innerXml: function(node) {
-         var s = ""
-         if ("innerHTML" in node)
-            s = node.innerHTML;
-         else {
-            var asXml = function(n) {
-               var s = "";
-               if (n.nodeType == 1) {
-                  s += "<" + n.nodeName;
-                  for (var i=0; i<n.attributes.length;i++)
-                     s += " " + n.attributes[i].nodeName + "=\"" + (n.attributes[i].nodeValue||"").toString() + "\"";
-                  if (n.firstChild) {
-                     s += ">";
-                     for (var c=n.firstChild; c; c=c.nextSibling)
-                        s += asXml(c);
-                     s += "</"+n.nodeName+">";
-                  }
-                  else
-                     s += "/>";
-               }
-               else if (n.nodeType == 3)
-                  s += n.nodeValue;
-               else if (n.nodeType == 4)
-                  s += "<![CDATA[" + n.nodeValue + "]]>";
-               return s;
-            };
-            for (var c=node.firstChild; c; c=c.nextSibling)
-               s += asXml(c);
-         }
-         return s;
-      },
-      escape: function(txt) {
-         return txt.replace(/[\\]/g, "\\\\")
-                   .replace(/[\"]/g, '\\"')
-                   .replace(/[\n]/g, '\\n')
-                   .replace(/[\r]/g, '\\r');
-      },
-      removeWhite: function(e) {
-         e.normalize();
-         for (var n = e.firstChild; n; ) {
-            if (n.nodeType == 3) {  // text node
-               if (!n.nodeValue.match(/[^ \f\n\r\t\v]/)) { // pure whitespace text node
-                  var nxt = n.nextSibling;
-                  e.removeChild(n);
-                  n = nxt;
-               }
-               else
-                  n = n.nextSibling;
-            }
-            else if (n.nodeType == 1) {  // element node
-               X.removeWhite(n);
-               n = n.nextSibling;
-            }
-            else                      // any other node
-               n = n.nextSibling;
-         }
-         return e;
-      }
-   };
-   if (xml.nodeType == 9) // document node
-      xml = xml.documentElement;
-
-   var json_obj = X.toObj(X.removeWhite(xml)), json_str;
-   
-   if (typeof(JSON)=='object' && jQuery.isFunction(JSON.stringify) && false) {
-	   var obj = {}; obj[xml.nodeName] = json_obj;
-	   json_str = JSON.stringify(obj);
-	   return json_str;
-   } else {
-	   json_str = X.toJson(json_obj, xml.nodeName, "");
-	   return "{" + (tab ? json_str.replace(/\t/g, tab) : json_str.replace(/\t|\n/g, "")) + "}";
-   }
-}
-
-(function($){
-/**
- * @brief exec_xml
- * @author NHN (developers@xpressengine.com)
- **/
-$.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) {
-	var xml_path = request_uri+"index.php"
-    if(!params) params = {};
-
-	// {{{ set parameters
-	if($.isArray(params)) params = arr2obj(params);
-	params['module'] = module;
-	params['act']    = act;
-
-    if(typeof(xeVid)!='undefined') params['vid'] = xeVid;
-    if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = ['error','message'];
-	else {
-		response_tags.push('error', 'message');
-	}
-	// }}} set parameters
-
-	// use ssl?
-	if ($.isArray(ssl_actions) && params['act'] && $.inArray(params['act'], ssl_actions) >= 0)
-	{
-		var url    = default_url || request_uri;
-		var port   = window.https_port || 443;
-		var _ul    = $('<a>').attr('href', url)[0];
-		var target = 'https://' + _ul.hostname.replace(/:\d+$/, '');
-
-		if(port != 443) target += ':'+port;
-		if(_ul.pathname[0] != '/') target += '/';
-		
-		target += _ul.pathname;
-		xml_path = target.replace(/\/$/, '')+'/index.php';
-	}
-
-	var _u1 = $('<a>').attr('href', location.href)[0];
-	var _u2 = $('<a>').attr('href', xml_path)[0];
-
-	// 현 url과 ajax call 대상 url의 schema 또는 port가 다르면 직접 form 전송
-	if(_u1.protocol != _u2.protocol || _u1.port != _u2.port) return send_by_form(xml_path, params);
-
-	var xml = [], i = 0;
-	xml[i++] = '<?xml version="1.0" encoding="utf-8" ?>';
-	xml[i++] = '<methodCall>';
-	xml[i++] = '<params>';
-
-	$.each(params, function(key, val) {
-		xml[i++] = '<'+key+'><![CDATA['+val+']]></'+key+'>';
-	});
-
-	xml[i++] = '</params>';
-	xml[i++] = '</methodCall>';
-
-	var _xhr = null;
-	if (_xhr && _xhr.readyState != 0) _xhr.abort();
-
-	// 전송 성공시
-	function onsuccess(data, textStatus, xhr) {
-		var resp_xml = $(data).find('response')[0], resp_obj, txt='', ret=[], tags={}, json_str='';
-
-		waiting_obj.css('visibility', 'hidden');
-
-		if(!resp_xml) {
-			alert(_xhr.responseText);
-			return null;
-		}
-
-		json_str = xml2json(resp_xml, false, false);
-		resp_obj = (typeof(JSON)=='object' && $.isFunction(JSON.parse))?JSON.parse(json_str):eval('('+json_str+')');
-		resp_obj = resp_obj.response;
-
-		if (typeof(resp_obj)=='undefined') {
-			ret['error'] = -1;
-			ret['message'] = 'Unexpected error occured.';
-			try {
-				if(typeof(txt=resp_xml.childNodes[0].firstChild.data)!='undefined') ret['message'] += '\r\n'+txt;
-			} catch(e){};
-			return ret;
-		}
-
-		$.each(response_tags, function(key, val){ tags[val] = true; });
-        tags["redirect_url"] = true;
-        tags["act"] = true;
-		$.each(resp_obj, function(key, val){ if(tags[key]) ret[key] = val; });
-
-		if(ret['error'] != 0) {
-			if ($.isFunction($.exec_xml.onerror)) {
-				return $.exec_xml.onerror(module, act, ret, callback_func, response_tags, callback_func_arg, fo_obj);
-			}
-
-			alert(ret['message'] || 'error!');
-			return null;
-		}
-
-		if(ret['redirect_url']) {
-			location.href = ret['redirect_url'].replace(/&amp;/g, '&');
-			return null;
-		}
-
-		if($.isFunction(callback_func)) callback_func(ret, response_tags, callback_func_arg, fo_obj);
-	}
-
-	// 모든 xml데이터는 POST방식으로 전송. try-catch문으로 오류 발생시 대처
-	try {
-		$.ajax({
-			url         : xml_path,
-			type        : 'POST',
-			dataType    : 'xml',
-			data        : xml.join('\n'),
-			contentType : 'text/plain',
-			beforeSend  : function(xhr){ _xhr = xhr; },
-			success     : onsuccess,
-			error       : function(xhr, textStatus) {
-				waiting_obj.css('visibility', 'hidden');
-
-				var msg = '';
-				if (textStatus == 'parsererror') {
-					msg  = 'The result is not valid XML :\n-------------------------------------\n';
-					if(xhr.responseText == "") return;
-					msg += xhr.responseText.replace(/<[^>]+>/g, '');
-				} else {
-					msg = textStatus;
-				}
-
-				alert(msg);
-			}
-		});
-	} catch(e) {
-		alert(e);
-		return;
-	}
-
-	// ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음)
-	var waiting_obj = $('#waitingforserverresponse');
-	if(show_waiting_message && waiting_obj.length) {
-		var d = $(document);
-		waiting_obj.html(waiting_message).css({
-			'top'  : (d.scrollTop()+20)+'px',
-			'left' : (d.scrollLeft()+20)+'px',
-			'visibility' : 'visible'
-		});
-	}
-}
-function send_by_form(url, params) {
-	var frame_id = 'xeTmpIframe';
-	var form_id  = 'xeVirtualForm';
-
-	if (!$('#'+frame_id).length) {
-		$('<iframe name="%id%" id="%id%" style="position:absolute;left:-1px;top:1px;width:1px;height:1px"></iframe>'.replace(/%id%/g, frame_id)).appendTo(document.body);
-	}
-
-	$('#'+form_id).remove();
-	var form = $('<form id="%id%"></form>'.replace(/%id%/g, form_id)).attr({
-		'id'     : form_id,
-		'method' : 'post',
-		'action' : url,
-		'target' : frame_id
-	});
-
-	params['xeVirtualRequestMethod'] = 'xml';
-	params['xeRequestURI']           = location.href.replace(/#(.*)$/i,'');
-	params['xeVirtualRequestUrl']    = request_uri;
-
-	$.each(params, function(key, value){
-		$('<input type="hidden">').attr('name', key).attr('value', value).appendTo(form);
-	});
-
-	form.appendTo(document.body).submit();
-}
-function arr2obj(arr) {
-	var ret = {};
-	for(var key in arr) {
-		if(arr.hasOwnProperty(key)) ret[key] = arr[key];		
-	}
-	return ret;
-}
-
-/**
- * @brief exec_json (exec_xml와 같은 용도)
- **/
-$.exec_json = function(action,data,func){
-    if(typeof(data) == 'undefined') data = {};
-    action = action.split(".");
-    if(action.length == 2){
-
-        if(show_waiting_message) {
-            $("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible');
-        }
-
-        $.extend(data,{module:action[0],act:action[1]});
-        if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid});
-        $.ajax({
-            type:"POST"
-            ,dataType:"json"
-            ,url:request_uri
-            ,contentType:"application/json"
-            ,data:$.param(data)
-            ,success : function(data){
-                $("#waitingforserverresponse").css('visibility','hidden');
-                if(data.error > 0) alert(data.message);
-                if($.isFunction(func)) func(data);
-            }
-        });
-    }
-};
-
-$.fn.exec_html = function(action,data,type,func,args){
-    if(typeof(data) == 'undefined') data = {};
-    if(!$.inArray(type, ['html','append','prepend'])) type = 'html';
-
-    var self = $(this);
-    action = action.split(".");
-    if(action.length == 2){
-        if(show_waiting_message) {
-            $("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible');
-        }
-
-        $.extend(data,{module:action[0],act:action[1]});
-        $.ajax({
-            type:"POST"
-            ,dataType:"html"
-            ,url:request_uri
-            ,data:$.param(data)
-            ,success : function(html){
-                $("#waitingforserverresponse").css('visibility','hidden');
-                self[type](html);
-                if($.isFunction(func)) func(args);
-            }
-        });
-    }
-};
-})(jQuery);
diff --git a/common/js/src/xml_js_filter.js b/common/js/src/xml_js_filter.js
deleted file mode 100644
index 993d748fb..000000000
--- a/common/js/src/xml_js_filter.js
+++ /dev/null
@@ -1,338 +0,0 @@
-/**
- * @file   common/js/xml_js_filter.js
- * @author NHN (developers@xpressengine.com)
- * @brief  xml filter (validator) plugin
- * 
- * A rule is a method validate one field.
- * A filter is made up of one or more rules.
- **/
-(function($){
-
-var messages  = [];
-var rules     = [];
-var filters   = [];
-var callbacks = [];
-var extras    = {};
-
-var Validator = xe.createApp('Validator', {
-	init : function() {
-		// {{{ add filters
-		// email
-		var regEmail = /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;
-		this.cast('ADD_RULE', ['email', regEmail]);
-		this.cast('ADD_RULE', ['email_address', regEmail]);
-
-		// userid
-		var regUserid = /^[a-z]+[\w-]*[a-z0-9_]+$/i;
-		this.cast('ADD_RULE', ['userid', regUserid]);
-		this.cast('ADD_RULE', ['user_id', regUserid]);
-
-		// url
-		var regUrl = /^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-\/\~]+)+(:[0-9]{2,4})*$/;
-		this.cast('ADD_RULE', ['url', regUrl]);
-		this.cast('ADD_RULE', ['homepage', regUrl]);
-
-		// korean
-		var regKor = /^[가-힣]*$/;
-		this.cast('ADD_RULE', ['korean', regKor]);
-
-		// korean_number
-		var regKorNum = /^[가-힣0-9]*$/;
-		this.cast('ADD_RULE', ['korean_number', regKorNum]);
-
-		// alpha
-		var regAlpha = /^[a-z]*$/i;
-		this.cast('ADD_RULE', ['alpha', regAlpha]);
-
-		// alpha_number
-		var regAlphaNum = /^[a-z][a-z0-9_]*$/i;
-		this.cast('ADD_RULE', ['alpha_number', regAlphaNum]);
-
-		// number
-		var regNum = /^[0-9]*$/;
-		this.cast('ADD_RULE', ['number', regNum]);
-		// }}} add filters
-	},
-	// run validator
-	run : function(oForm) {
-		var filter = '';
-
-		if (oForm._filter) filter = oForm._filter.value;
-
-		var params = [oForm, filter];
-		var result = this.cast('VALIDATE', params);
-		if (typeof result == 'undefined') result = false;
-
-		return result;
-	},
-	API_ONREADY : function() {
-		var self = this;
-
-		// hook form submit event
-		$('form')
-			.each(function(){
-				if (this.onsubmit) {
-					this['xe:onsubmit'] = this.onsubmit;
-					this.onsubmit = null;
-				}
-			})
-			.submit(function(){
-				var legacyFn = this['xe:onsubmit'];		
-				var hasLegacyFn = $.isFunction(legacyFn);
-				var bResult = hasLegacyFn?legacyFn.apply(this):self.run(this);
-
-				return bResult;
-			});
-	},
-	API_VALIDATE : function(sender, params) {
-		var self = this, result = true, form = params[0], filter=null, callback=null;
-
-		if (form.elements['_filter']) filter = form.elements['_filter'].value;
-		if (!filter) return true;
-		if ($.isFunction(callbacks[filter])) callback = callbacks[filter];
-		filter = $.extend({}, filters[filter.toLowerCase()] || {}, extras);
-
-		$.each(filter, function(name) {
-			var _el = form.elements[name];
-
-			if (!_el) return true;
-
-			var el = $(_el), val = $.trim(get_value(el));
-			var minlen = parseInt(this.minlength) || 0;
-			var maxlen = parseInt(this.maxlength) || 0;
-			var rule   = (this.rule || '').split(',');
-
-			if (this.required && !val) return (result = (!!self.cast('ALERT', [form, name, 'isnull']) && false));
-			if (!this.required && !val) return (result = true);
-			if ((minlen && val.length < minlen) || (maxlen && val.length > maxlen)) return (result = (!!self.cast('ALERT', [form, name, 'outofrange', minlen, maxlen]) && false));
-			
-			if (this.equalto) {
-				var eq_val = get_value($(form.elements[this.equalto]));
-				if (eq_val != val) return (result = (!!self.cast('ALERT', [form, name, 'equalto']) && false));
-			}
-
-			if (rule) {
-				$.each(rule, function(i,r) {
-					if (!r) return true;
-
-					var ret = self.cast('APPLY_RULE', [r, val]);
-					if (!ret) {
-						self.cast('ALERT', [form, name, 'invalid_'+this]);
-						return (result = false);
-					}
-				});
-			}
-
-			if (!result) return false;
-		});
-
-		if (!result) return false;
-		if ($.isFunction(callback)) return callback(form);
-
-		return true;
-	},
-	API_ADD_RULE : function(sender, params) {
-		var name = params[0].toLowerCase();
-		rules[name] = params[1];
-	},
-	API_DEL_RULE : function(sender, params) {
-		var name = params[0].toLowerCase();
-		delete rules[name];
-	},
-	API_GET_RULE : function(sender, params) {
-		var name = params[0].toLowerCase();
-
-		if (rules[name]) {
-			return rules[name];
-		} else {
-			return null;
-		}
-	},
-	API_ADD_FILTER : function(sender, params) {
-		var name   = params[0].toLowerCase();
-		var filter = params[1];
-
-		filters[name] = filter;
-	},
-	API_DEL_FILTER : function(sender, params) {
-		var name = params[0].toLowerCase();
-		delete filters[name];
-	},
-	API_GET_FILTER : function(sender, params) {
-		var name = params[0].toLowerCase();
-
-		if (filters[name]) {
-			return filters[name];
-		} else {
-			return null;
-		}
-	},
-	API_ADD_EXTRA_FIELD : function(sender, params) {
-		var name = params[0].toLowerCase();
-		var prop = params[1];
-
-		extras[name] = prop;
-	},
-	API_GET_EXTRA_FIELD : function(sender, params) {
-		var name = params[0].toLowerCase();
-		return extras[name];
-	},
-	API_DEL_EXTRA_FIELD : function(sender, params) {
-		var name = params[0].toLowerCase();
-		delete extras[name];
-	},
-	API_APPLY_RULE : function(sender, params) {
-		var name  = params[0];
-		var value = params[1];
-
-		if (typeof(rules[name]) == 'undefined') return true; // no filter
-		if ($.isFunction(rules[name])) return rules[name](value);
-		if (rules[name] instanceof RegExp) return rules[name].test(value);
-
-		return true;
-	},
-	API_ALERT : function(sender, params) {
-		var form = params[0];
-		var field_name = params[1];
-		var msg_code = params[2];
-		var minlen   = params[3];
-		var maxlen   = params[4];
-
-		var field_msg = this.cast('GET_MESSAGE', [field_name]);
-		var msg = this.cast('GET_MESSAGE', [msg_code]);
-
-		if (msg != msg_code) msg = (msg.indexOf('%s')<0)?(field_msg+msg):(msg.replace('%s',field_msg));
-		if (minlen||maxlen) msg +=  '('+(minlen||'')+'~'+(maxlen||'')+')';
-
-		this.cast('SHOW_ALERT', [msg]);
-
-		// set focus
-		$(form.elements[field_name]).focus();
-	},
-	API_SHOW_ALERT : function(sender, params) {
-		alert(params[0]);
-	},
-	API_ADD_MESSAGE : function(sender, params) {
-		var msg_code = params[0];
-		var msg_str  = params[1];
-
-		messages[msg_code] = msg_str;
-	},
-	API_GET_MESSAGE : function(sender, params) {
-		var msg_code = params[0];
-
-		return messages[msg_code] || msg_code;
-	},
-	API_ADD_CALLBACK : function(sender, params) {
-		var name = params[0];
-		var func = params[1];
-
-		callbacks[name] = func;
-	},
-	API_REMOVE_CALLBACK : function(sender, params) {
-		var name = params[0];
-
-		delete callbacks[name];
-	}
-});
-
-var oValidator = new Validator;
-
-// register validator
-xe.registerApp(oValidator);
-
-// 호환성을 위해 추가한 플러그인 - 에디터에서 컨텐트를 가져와서 설정한다.
-var EditorStub = xe.createPlugin('editor_stub', {
-	API_BEFORE_VALIDATE : function(sender, params) {
-		var form = params[0];
-		var seq  = form.getAttribute('editor_sequence');
-
-		// bug fix for IE6,7
-		if (seq && typeof seq == 'object') seq = seq.value;
-
-		if (seq) {
-			try {
-				editorRelKeys[seq].content.value = editorRelKeys[seq].func(seq) || '';
-			} catch(e) { }
-		}
-	}
-});
-oValidator.registerPlugin(new EditorStub);
-
-// functions
-function get_value(elem) {
-	var vals = [];
-	if (elem.is(':radio')){
-		return elem.filter(':checked').val();
-	} else if (elem.is(':checkbox')) {
-		elem.filter(':checked').each(function(){
-			vals.push(this.value);
-		});
-		return vals.join('|@|');
-	} else {
-		return elem.val();
-	}
-}
-
-})(jQuery);
-
-/**
- * @function filterAlertMessage
- * @brief ajax로 서버에 요청후 결과를 처리할 callback_function을 지정하지 않았을 시 호출되는 기본 함수
- **/
-function filterAlertMessage(ret_obj) {
-	var error = ret_obj["error"];
-	var message = ret_obj["message"];
-	var act = ret_obj["act"];
-	var redirect_url = ret_obj["redirect_url"];
-	var url = location.href;
-
-	if(typeof(message)!="undefined"&&message&&message!="success") alert(message);
-
-	if(typeof(act)!="undefined" && act) url = current_url.setQuery("act", act);
-	else if(typeof(redirect_url)!="undefined" && redirect_url) url = redirect_url;
-
-	if(url == location.href) url = url.replace(/#(.*)$/,'');
-
-	location.href = url;
-}
-
-/**
- * @brief Function to process filters
- * @deprecated
- */
-function procFilter(form, filter_func) {
-	filter_func(form);
-	return false;
-}
-
-function legacy_filter(filter_name, form, module, act, callback, responses, confirm_msg, rename_params) {
-	var v = xe.getApp('Validator')[0], $ = jQuery, args = [];
-
-	if (!v) return false;
-
-	if (!form.elements['_filter']) $(form).prepend('<input type="hidden" name="_filter" />');
-	form.elements['_filter'].value = filter_name;
-
-	args[0] = filter_name;
-	args[1] = function(f) {
-		var params = {}, res = [], elms = f.elements, data = $(f).serializeArray();
-		$.each(data, function(i, field) {
-			var v = $.trim(field.value), n = field.name;
-			if(!v || !n) return true;
-			if(rename_params[n]) n = rename_params[n];
-			
-			if(/\[\]$/.test(n)) n = n.replace(/\[\]$/, '');
-			if(params[n]) params[n] += '|@|'+v;
-			else params[n] = field.value;			
-		});
-
-		if (confirm_msg && !confirm(confirm_msg)) return false;
-		exec_xml(module, act, params, callback, responses, params, form);
-	};
-
-	v.cast('ADD_CALLBACK', args);
-	v.cast('VALIDATE', [form, filter_name]);
-
-	return false;
-}
\ No newline at end of file
diff --git a/common/js/unittest/JSSpec/JSSpec.js b/common/js/unittest/JSSpec/JSSpec.js
index 91cd142b3..1a337df41 100644
--- a/common/js/unittest/JSSpec/JSSpec.js
+++ b/common/js/unittest/JSSpec/JSSpec.js
@@ -1,1548 +1,1548 @@
-/**
- * JSSpec
- *
- * Copyright 2007 Alan Kang
- *  - mailto:jania902@gmail.com
- *  - http://jania.pe.kr
- *
- * http://jania.pe.kr/aw/moin.cgi/JSSpec
- *
- * Dependencies:
- *  - diff_match_patch.js ( http://code.google.com/p/google-diff-match-patch )
- *
- * 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 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
- * Lesser 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
- */
-
-/**
- * Namespace
- */
-
-var JSSpec = {
-	specs: [],
-	
-	EMPTY_FUNCTION: function() {},
-	
-	Browser: {
-		// By Rendering Engines
-		Trident: navigator.appName === "Microsoft Internet Explorer",
-		Webkit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
-		Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') === -1,
-		KHTML: navigator.userAgent.indexOf('KHTML') !== -1,
-		Presto: navigator.appName === "Opera",
-		
-		// By Platforms
-		Mac: navigator.userAgent.indexOf("Macintosh") !== -1,
-		Ubuntu: navigator.userAgent.indexOf('Ubuntu') !== -1,
-		Win: navigator.userAgent.indexOf('Windows') !== -1,
-		
-		// By Browsers
-		IE: navigator.appName === "Microsoft Internet Explorer",
-		IE6: navigator.userAgent.indexOf('MSIE 6') !== -1,
-		IE7: navigator.userAgent.indexOf('MSIE 7') !== -1,
-		IE8: navigator.userAgent.indexOf('MSIE 8') !== -1,
-		
-		FF: navigator.userAgent.indexOf('Firefox') !== -1,
-		FF2: navigator.userAgent.indexOf('Firefox/2') !== -1,
-		FF3: navigator.userAgent.indexOf('Firefox/3') !== -1,
-		Safari: navigator.userAgent.indexOf('Safari') !== -1
-	}
-};
-
-
-
-/**
- * Executor
- */
-JSSpec.Executor = function(target, onSuccess, onException) {
-	this.target = target;
-	this.onSuccess = typeof onSuccess == 'function' ? onSuccess : JSSpec.EMPTY_FUNCTION;
-	this.onException = typeof onException == 'function' ? onException : JSSpec.EMPTY_FUNCTION;
-	
-	if(JSSpec.Browser.Trident) {
-		// Exception handler for Trident. It helps to collect exact line number where exception occured.
-		window.onerror = function(message, fileName, lineNumber) {
-			var self = window._curExecutor;
-			var ex = {message:message, fileName:fileName, lineNumber:lineNumber};
-
-			if(JSSpec._secondPass)  {
-				ex = self.mergeExceptions(JSSpec._assertionFailure, ex);
-				delete JSSpec._secondPass;
-				delete JSSpec._assertionFailure;
-				
-				ex.type = "failure";
-				self.onException(self, ex);
-			} else if(JSSpec._assertionFailure) {
-				JSSpec._secondPass = true;
-				self.run();
-			} else {
-				self.onException(self, ex);
-			}
-			
-			return true;
-		};
-	}
-};
-JSSpec.Executor.prototype.mergeExceptions = function(assertionFailure, normalException) {
-	var merged = {
-		message:assertionFailure.message,
-		fileName:normalException.fileName,
-		lineNumber:normalException.lineNumber
-	};
-	
-	return merged;
-};
-
-JSSpec.Executor.prototype.run = function() {
-	var self = this;
-	var target = this.target;
-	var onSuccess = this.onSuccess;
-	var onException = this.onException;
-	
-	window.setTimeout(
-		function() {
-			var result;
-			if(JSSpec.Browser.Trident) {
-				window._curExecutor = self;
-				
-				result = self.target();
-				self.onSuccess(self, result);
-			} else {
-				try {
-					result = self.target();
-					self.onSuccess(self, result);
-				} catch(ex) {
-					if(JSSpec.Browser.Webkit) ex = {message:ex.message, fileName:ex.sourceURL, lineNumber:ex.line};
-					
-					if(JSSpec._secondPass)  {
-						ex = self.mergeExceptions(JSSpec._assertionFailure, ex);
-						delete JSSpec._secondPass;
-						delete JSSpec._assertionFailure;
-						
-						ex.type = "failure";
-						self.onException(self, ex);
-					} else if(JSSpec._assertionFailure) {
-						JSSpec._secondPass = true;
-						self.run();
-					} else {
-						self.onException(self, ex);
-					}
-				}
-			}
-		},
-		0
-	);
-};
-
-
-
-/**
- * CompositeExecutor composites one or more executors and execute them sequencially.
- */
-JSSpec.CompositeExecutor = function(onSuccess, onException, continueOnException) {
-	this.queue = [];
-	this.onSuccess = typeof onSuccess == 'function' ? onSuccess : JSSpec.EMPTY_FUNCTION;
-	this.onException = typeof onException == 'function' ? onException : JSSpec.EMPTY_FUNCTION;
-	this.continueOnException = !!continueOnException;
-};
-
-JSSpec.CompositeExecutor.prototype.addFunction = function(func) {
-	this.addExecutor(new JSSpec.Executor(func));
-};
-
-JSSpec.CompositeExecutor.prototype.addExecutor = function(executor) {
-	var last = this.queue.length == 0 ? null : this.queue[this.queue.length - 1];
-	if(last) {
-		last.next = executor;
-	}
-	
-	executor.parent = this;
-	executor.onSuccessBackup = executor.onSuccess;
-	executor.onSuccess = function(result) {
-		this.onSuccessBackup(result);
-		if(this.next) {
-			this.next.run();
-		} else {
-			this.parent.onSuccess();
-		}
-	};
-	executor.onExceptionBackup = executor.onException;
-	executor.onException = function(executor, ex) {
-		this.onExceptionBackup(executor, ex);
-
-		if(this.parent.continueOnException) {
-			if(this.next) {
-				this.next.run();
-			} else {
-				this.parent.onSuccess();
-			}
-		} else {
-			this.parent.onException(executor, ex);
-		}
-	};
-
-	this.queue.push(executor);
-};
-
-JSSpec.CompositeExecutor.prototype.run = function() {
-	if(this.queue.length > 0) {
-		this.queue[0].run();
-	}
-};
-
-/**
- * Spec is a set of Examples in a specific context
- */
-JSSpec.Spec = function(context, entries) {
-	this.id = JSSpec.Spec.id++;
-	this.context = context;
-	this.url = location.href;
-	
-	this.filterEntriesByEmbeddedExpressions(entries);
-	this.extractOutSpecialEntries(entries);
-	this.examples = this.makeExamplesFromEntries(entries);
-	this.examplesMap = this.makeMapFromExamples(this.examples);
-};
-
-JSSpec.Spec.id = 0;
-JSSpec.Spec.prototype.getExamples = function() {
-	return this.examples;
-};
-
-JSSpec.Spec.prototype.hasException = function() {
-	return this.getTotalFailures() > 0 || this.getTotalErrors() > 0;
-};
-
-JSSpec.Spec.prototype.getTotalFailures = function() {
-	var examples = this.examples;
-	var failures = 0;
-	for(var i = 0; i < examples.length; i++) {
-		if(examples[i].isFailure()) failures++;
-	}
-	return failures;
-};
-
-JSSpec.Spec.prototype.getTotalErrors = function() {
-	var examples = this.examples;
-	var errors = 0;
-	for(var i = 0; i < examples.length; i++) {
-		if(examples[i].isError()) errors++;
-	}
-	return errors;
-};
-
-JSSpec.Spec.prototype.filterEntriesByEmbeddedExpressions = function(entries) {
-	var isTrue;
-	for(name in entries) if(entries.hasOwnProperty(name)) {
-		var m = name.match(/\[\[(.+)\]\]/);
-		if(m && m[1]) {
-			eval("isTrue = (" + m[1] + ")");
-			if(!isTrue) delete entries[name];
-		}
-	}
-};
-
-JSSpec.Spec.prototype.extractOutSpecialEntries = function(entries) {
-	this.beforeEach = JSSpec.EMPTY_FUNCTION;
-	this.beforeAll = JSSpec.EMPTY_FUNCTION;
-	this.afterEach = JSSpec.EMPTY_FUNCTION;
-	this.afterAll = JSSpec.EMPTY_FUNCTION;
-	
-	for(name in entries) if(entries.hasOwnProperty(name)) {
-		if(name == 'before' || name == 'before each' || name == 'before_each') {
-			this.beforeEach = entries[name];
-		} else if(name == 'before all' || name == 'before_all') {
-			this.beforeAll = entries[name];
-		} else if(name == 'after' || name == 'after each' || name == 'after_each') {
-			this.afterEach = entries[name];
-		} else if(name == 'after all' || name == 'after_all') {
-			this.afterAll = entries[name];
-		}
-	}
-	
-	delete entries['before'];
-	delete entries['before each'];
-	delete entries['before_each'];
-	delete entries['before all'];
-	delete entries['before_all'];
-	delete entries['after'];
-	delete entries['after each'];
-	delete entries['after_each'];
-	delete entries['after all'];
-	delete entries['after_all'];
-};
-
-JSSpec.Spec.prototype.makeExamplesFromEntries = function(entries) {
-	var examples = [];
-	for(name in entries) if(entries.hasOwnProperty(name)) {
-		examples.push(new JSSpec.Example(name, entries[name], this.beforeEach, this.afterEach));
-	}
-	return examples;
-};
-
-JSSpec.Spec.prototype.makeMapFromExamples = function(examples) {
-	var map = {};
-	for(var i = 0; i < examples.length; i++) {
-		var example = examples[i];
-		map[example.id] = examples[i];
-	}
-	return map;
-};
-
-JSSpec.Spec.prototype.getExampleById = function(id) {
-	return this.examplesMap[id];
-};
-
-JSSpec.Spec.prototype.getExecutor = function() {
-	var self = this;
-	var onException = function(executor, ex) {
-		self.exception = ex;
-	};
-	
-	var composite = new JSSpec.CompositeExecutor();
-	composite.addFunction(function() {JSSpec.log.onSpecStart(self);});
-	composite.addExecutor(new JSSpec.Executor(this.beforeAll, null, function(exec, ex) {
-		self.exception = ex;
-		JSSpec.log.onSpecEnd(self);
-	}));
-	
-	var exampleAndAfter = new JSSpec.CompositeExecutor(null,null,true);
-	for(var i = 0; i < this.examples.length; i++) {
-		exampleAndAfter.addExecutor(this.examples[i].getExecutor());
-	}
-	exampleAndAfter.addExecutor(new JSSpec.Executor(this.afterAll, null, onException));
-	exampleAndAfter.addFunction(function() {JSSpec.log.onSpecEnd(self);});
-	composite.addExecutor(exampleAndAfter);
-	
-	return composite;
-};
-
-/**
- * Example
- */
-JSSpec.Example = function(name, target, before, after) {
-	this.id = JSSpec.Example.id++;
-	this.name = name;
-	this.target = target;
-	this.before = before;
-	this.after = after;
-};
-
-JSSpec.Example.id = 0;
-JSSpec.Example.prototype.isFailure = function() {
-	return this.exception && this.exception.type == "failure";
-};
-
-JSSpec.Example.prototype.isError = function() {
-	return this.exception && !this.exception.type;
-};
-
-JSSpec.Example.prototype.getExecutor = function() {
-	var self = this;
-	var onException = function(executor, ex) {
-		self.exception = ex;
-	};
-	
-	var composite = new JSSpec.CompositeExecutor();
-	composite.addFunction(function() {JSSpec.log.onExampleStart(self);});
-	composite.addExecutor(new JSSpec.Executor(this.before, null, function(exec, ex) {
-		self.exception = ex;
-		JSSpec.log.onExampleEnd(self);
-	}));
-	
-	var targetAndAfter = new JSSpec.CompositeExecutor(null,null,true);
-	
-	targetAndAfter.addExecutor(new JSSpec.Executor(this.target, null, onException));
-	targetAndAfter.addExecutor(new JSSpec.Executor(this.after, null, onException));
-	targetAndAfter.addFunction(function() {JSSpec.log.onExampleEnd(self);});
-	
-	composite.addExecutor(targetAndAfter);
-	
-	return composite;
-};
-
-/**
- * Runner
- */
-JSSpec.Runner = function(specs, logger) {
-	JSSpec.log = logger;
-	
-	this.totalExamples = 0;
-	this.specs = [];
-	this.specsMap = {};
-	this.addAllSpecs(specs);
-};
-
-JSSpec.Runner.prototype.addAllSpecs = function(specs) {
-	for(var i = 0; i < specs.length; i++) {
-		this.addSpec(specs[i]);
-	}
-};
-
-JSSpec.Runner.prototype.addSpec = function(spec) {
-	this.specs.push(spec);
-	this.specsMap[spec.id] = spec;
-	this.totalExamples += spec.getExamples().length;
-};
-
-JSSpec.Runner.prototype.getSpecById = function(id) {
-	return this.specsMap[id];
-};
-
-JSSpec.Runner.prototype.getSpecByContext = function(context) {
-	for(var i = 0; i < this.specs.length; i++) {
-		if(this.specs[i].context == context) return this.specs[i];
-	}
-	return null;
-};
-
-JSSpec.Runner.prototype.getSpecs = function() {
-	return this.specs;
-};
-
-JSSpec.Runner.prototype.hasException = function() {
-	return this.getTotalFailures() > 0 || this.getTotalErrors() > 0;
-};
-
-JSSpec.Runner.prototype.getTotalFailures = function() {
-	var specs = this.specs;
-	var failures = 0;
-	for(var i = 0; i < specs.length; i++) {
-		failures += specs[i].getTotalFailures();
-	}
-	return failures;
-};
-
-JSSpec.Runner.prototype.getTotalErrors = function() {
-	var specs = this.specs;
-	var errors = 0;
-	for(var i = 0; i < specs.length; i++) {
-		errors += specs[i].getTotalErrors();
-	}
-	return errors;
-};
-
-
-JSSpec.Runner.prototype.run = function() {
-	JSSpec.log.onRunnerStart();
-	var executor = new JSSpec.CompositeExecutor(function() {JSSpec.log.onRunnerEnd()},null,true);
-	for(var i = 0; i < this.specs.length; i++) {
-		executor.addExecutor(this.specs[i].getExecutor());
-	}
-	executor.run();
-};
-
-
-JSSpec.Runner.prototype.rerun = function(context) {
-	JSSpec.runner = new JSSpec.Runner([this.getSpecByContext(context)], JSSpec.log);
-	JSSpec.runner.run();
-};
-
-/**
- * Logger
- */
-JSSpec.Logger = function() {
-	this.finishedExamples = 0;
-	this.startedAt = null;
-};
-
-JSSpec.Logger.prototype.onRunnerStart = function() {
-	this._title = document.title;
-
-	this.startedAt = new Date();
-	var container = document.getElementById('jsspec_container');
-	if(container) {
-		container.innerHTML = "";
-	} else {
-		container = document.createElement("DIV");
-		container.id = "jsspec_container";
-		document.body.appendChild(container);
-	}
-	
-	var title = document.createElement("DIV");
-	title.id = "title";
-	title.innerHTML = [
-		'<h1>JSSpec</h1>',
-		'<ul>',
-		JSSpec.options.rerun ? '<li>[<a href="?" title="rerun all specs">X</a>] ' + JSSpec.util.escapeTags(decodeURIComponent(JSSpec.options.rerun)) + '</li>' : '',
-		'	<li><span id="total_examples">' + JSSpec.runner.totalExamples + '</span> examples</li>',
-		'	<li><span id="total_failures">0</span> failures</li>',
-		'	<li><span id="total_errors">0</span> errors</li>',
-		'	<li><span id="progress">0</span>% done</li>',
-		'	<li><span id="total_elapsed">0</span> secs</li>',
-		'</ul>',
-		'<p><a href="http://jania.pe.kr/aw/moin.cgi/JSSpec">JSSpec homepage</a></p>',
-	].join("");
-	container.appendChild(title);
-
-	var list = document.createElement("DIV");
-	list.id = "list";
-	list.innerHTML = [
-		'<h2>List</h2>',
-		'<ul class="specs">',
-		function() {
-			var specs = JSSpec.runner.getSpecs();
-			var sb = [];
-			for(var i = 0; i < specs.length; i++) {
-				var spec = specs[i];
-				sb.push('<li id="spec_' + specs[i].id + '_list"><h3><a href="#spec_' + specs[i].id + '">' + JSSpec.util.escapeTags(specs[i].context) + '</a> [<a href="?rerun=' + encodeURIComponent(specs[i].context) + '">rerun</a>]</h3> </li>');
-			}
-			return sb.join("");
-		}(),
-		'</ul>'
-	].join("");
-	container.appendChild(list);
-	
-	var log = document.createElement("DIV");
-	log.id = "log";
-	log.innerHTML = [
-		'<h2>Log</h2>',
-		'<ul class="specs">',
-		function() {
-			var specs = JSSpec.runner.getSpecs();
-			var sb = [];
-			for(var i = 0; i < specs.length; i++) {
-				var spec = specs[i];
-				sb.push('	<li id="spec_' + specs[i].id + '">');
-				sb.push('		<h3>' + JSSpec.util.escapeTags(specs[i].context) + ' [<a href="?rerun=' + encodeURIComponent(specs[i].context) + '">rerun</a>]</h3>');
-				sb.push('		<ul id="spec_' + specs[i].id + '_examples" class="examples">');
-				for(var j = 0; j < spec.examples.length; j++) {
-					var example = spec.examples[j];
-					sb.push('			<li id="example_' + example.id + '">');
-					sb.push('				<h4>' + JSSpec.util.escapeTags(example.name) + '</h4>');
-					sb.push('				<pre class="examples-code"><code>'+JSSpec.util.escapeTags(example.target.toString())+'</code></pre>');
-					sb.push('			</li>');
-				}
-				sb.push('		</ul>');
-				sb.push('	</li>');
-			}
-			return sb.join("");
-		}(),
-		'</ul>'
-	].join("");
-	
-	container.appendChild(log);
-	
-	// add event handler for toggling
-	var specs = JSSpec.runner.getSpecs();
-	var sb = [];
-	for(var i = 0; i < specs.length; i++) {
-		var spec = document.getElementById("spec_" + specs[i].id);
-		var title = spec.getElementsByTagName("H3")[0];
-		title.onclick = function(e) {
-			var target = document.getElementById(this.parentNode.id + "_examples");
-			target.style.display = target.style.display == "none" ? "block" : "none";
-			return true;
-		}
-	}
-};
-
-JSSpec.Logger.prototype.onRunnerEnd = function() {
-	if(JSSpec.runner.hasException()) {
-		var times = 4;
-		var title1 = "*" + this._title;
-		var title2 = "*F" + JSSpec.runner.getTotalFailures() + " E" + JSSpec.runner.getTotalErrors() + "* " + this._title;
-	} else {
-		var times = 2;
-		var title1 = this._title;
-		var title2 = "Success";
-	}
-	this.blinkTitle(times,title1,title2);
-};
-
-JSSpec.Logger.prototype.blinkTitle = function(times, title1, title2) {
-	var times = times * 2;
-	var mode = true;
-	
-	var f = function() {
-		if(times > 0) {
-			document.title = mode ? title1 : title2;
-			mode = !mode;
-			times--;
-			window.setTimeout(f, 500);
-		} else {
-			document.title = title1;
-		}
-	};
-	
-	f();
-};
-
-JSSpec.Logger.prototype.onSpecStart = function(spec) {
-	var spec_list = document.getElementById("spec_" + spec.id + "_list");
-	var spec_log = document.getElementById("spec_" + spec.id);
-	
-	spec_list.className = "ongoing";
-	spec_log.className = "ongoing";
-};
-
-JSSpec.Logger.prototype.onSpecEnd = function(spec) {
-	var spec_list = document.getElementById("spec_" + spec.id + "_list");
-	var spec_log = document.getElementById("spec_" + spec.id);
-	var examples = document.getElementById("spec_" + spec.id + "_examples");
-	var className = spec.hasException() ? "exception" : "success";
-
-	spec_list.className = className;
-	spec_log.className = className;
-
-	if(JSSpec.options.autocollapse && !spec.hasException()) examples.style.display = "none";
-	
-	if(spec.exception) {
-		spec_log.appendChild(document.createTextNode(" - " + spec.exception.message));
-	}
-};
-
-JSSpec.Logger.prototype.onExampleStart = function(example) {
-	var li = document.getElementById("example_" + example.id);
-	li.className = "ongoing";
-};
-
-JSSpec.Logger.prototype.onExampleEnd = function(example) {
-	var li = document.getElementById("example_" + example.id);
-	li.className = example.exception ? "exception" : "success";
-	
-	if(example.exception) {
-		var div = document.createElement("DIV");
-		div.innerHTML = example.exception.message + "<p><br />" + " at " + example.exception.fileName + ", line " + example.exception.lineNumber + "</p>";
-		li.appendChild(div);
-	}
-	
-	var title = document.getElementById("title");
-	var runner = JSSpec.runner;
-	
-	title.className = runner.hasException() ? "exception" : "success";
-	
-	this.finishedExamples++;
-	document.getElementById("total_failures").innerHTML = runner.getTotalFailures();
-	document.getElementById("total_errors").innerHTML = runner.getTotalErrors();
-	var progress = parseInt(this.finishedExamples / runner.totalExamples * 100);
-	document.getElementById("progress").innerHTML = progress;
-	document.getElementById("total_elapsed").innerHTML = (new Date().getTime() - this.startedAt.getTime()) / 1000;
-	
-	document.title = progress + "%: " + this._title;
-};
-
-/**
- * IncludeMatcher
- */
-JSSpec.IncludeMatcher = function(actual, expected, condition) {
-	this.actual = actual;
-	this.expected = expected;
-	this.condition = condition;
-	this.match = false;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.IncludeMatcher.createInstance = function(actual, expected, condition) {
-	return new JSSpec.IncludeMatcher(actual, expected, condition);
-};
-
-JSSpec.IncludeMatcher.prototype.matches = function() {
-	return this.match;
-};
-
-JSSpec.IncludeMatcher.prototype.explain = function() {
-	return this.explaination;
-};
-
-JSSpec.IncludeMatcher.prototype.makeExplain = function() {
-	if(typeof this.actual.length == 'undefined') {
-		return this.makeExplainForNotArray();
-	} else {
-		return this.makeExplainForArray();
-	}
-};
-
-JSSpec.IncludeMatcher.prototype.makeExplainForNotArray = function() {
-	if(this.condition) {
-		this.match = !!this.actual[this.expected];
-	} else {
-		this.match = !this.actual[this.expected];
-	}
-	
-	var sb = [];
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, this.expected) + '</p>');
-	sb.push('<p>should ' + (this.condition ? '' : 'not') + ' include:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
-	return sb.join("");
-};
-
-JSSpec.IncludeMatcher.prototype.makeExplainForArray = function() {
-	var matches;
-	if(this.condition) {
-		for(var i = 0; i < this.actual.length; i++) {
-			matches = JSSpec.EqualityMatcher.createInstance(this.expected, this.actual[i]).matches();
-			if(matches) {
-				this.match = true;
-				break;
-			}
-		}
-	} else {
-		for(var i = 0; i < this.actual.length; i++) {
-			matches = JSSpec.EqualityMatcher.createInstance(this.expected, this.actual[i]).matches();
-			if(matches) {
-				this.match = false;
-				break;
-			}
-		}
-	}
-	
-	if(this.match) return "";
-	
-	var sb = [];
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, this.condition ? null : i) + '</p>');
-	sb.push('<p>should ' + (this.condition ? '' : 'not') + ' include:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
-	return sb.join("");
-};
-
-/**
- * PropertyLengthMatcher
- */
-JSSpec.PropertyLengthMatcher = function(num, property, o, condition) {
-	this.num = num;
-	this.o = o;
-	this.property = property;
-	if((property == 'characters' || property == 'items') && typeof o.length != 'undefined') {
-		this.property = 'length';
-	}
-	
-	this.condition = condition;
-	this.conditionMet = function(x) {
-		if(condition == 'exactly') return x.length == num;
-		if(condition == 'at least') return x.length >= num;
-		if(condition == 'at most') return x.length <= num;
-
-		throw "Unknown condition '" + condition + "'";
-	};
-	this.match = false;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplain = function() {
-	if(this.o._type == 'String' && this.property == 'length') {
-		this.match = this.conditionMet(this.o);
-		return this.match ? '' : this.makeExplainForString();
-	} else if(typeof this.o.length != 'undefined' && this.property == "length") {
-		this.match = this.conditionMet(this.o);
-		return this.match ? '' : this.makeExplainForArray();
-	} else if(typeof this.o[this.property] != 'undefined' && this.o[this.property] != null) {
-		this.match = this.conditionMet(this.o[this.property]);
-		return this.match ? '' : this.makeExplainForObject();
-	} else if(typeof this.o[this.property] == 'undefined' || this.o[this.property] == null) {
-		this.match = false;
-		return this.makeExplainForNoProperty();
-	}
-
-	this.match = true;
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForString = function() {
-	var sb = [];
-	
-	var exp = this.num == 0 ?
-		'be an <strong>empty string</strong>' :
-		'have <strong>' + this.condition + ' ' + this.num + ' characters</strong>';
-	
-	sb.push('<p>actual value has <strong>' + this.o.length + ' characters</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
-	sb.push('<p>but it should ' + exp + '.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForArray = function() {
-	var sb = [];
-	
-	var exp = this.num == 0 ?
-		'be an <strong>empty array</strong>' :
-		'have <strong>' + this.condition + ' ' + this.num + ' items</strong>';
-
-	sb.push('<p>actual value has <strong>' + this.o.length + ' items</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
-	sb.push('<p>but it should ' + exp + '.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForObject = function() {
-	var sb = [];
-
-	var exp = this.num == 0 ?
-		'be <strong>empty</strong>' :
-		'have <strong>' + this.condition + ' ' + this.num + ' ' + this.property + '.</strong>';
-
-	sb.push('<p>actual value has <strong>' + this.o[this.property].length + ' ' + this.property + '</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o, false, this.property) + '</p>');
-	sb.push('<p>but it should ' + exp + '.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.makeExplainForNoProperty = function() {
-	var sb = [];
-	
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
-	sb.push('<p>should have <strong>' + this.condition + ' ' + this.num + ' ' + this.property + '</strong> but there\'s no such property.</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.PropertyLengthMatcher.prototype.matches = function() {
-	return this.match;
-};
-
-JSSpec.PropertyLengthMatcher.prototype.explain = function() {
-	return this.explaination;
-};
-
-JSSpec.PropertyLengthMatcher.createInstance = function(num, property, o, condition) {
-	return new JSSpec.PropertyLengthMatcher(num, property, o, condition);
-};
-
-/**
- * EqualityMatcher
- */
-JSSpec.EqualityMatcher = {};
-
-JSSpec.EqualityMatcher.createInstance = function(expected, actual) {
-	if(expected == null || actual == null) {
-		return new JSSpec.NullEqualityMatcher(expected, actual);
-	} else if(expected._type && expected._type == actual._type) {
-		if(expected._type == "String") {
-			return new JSSpec.StringEqualityMatcher(expected, actual);
-		} else if(expected._type == "Date") {
-			return new JSSpec.DateEqualityMatcher(expected, actual);
-		} else if(expected._type == "Number") {
-			return new JSSpec.NumberEqualityMatcher(expected, actual);
-		} else if(expected._type == "Array") {
-			return new JSSpec.ArrayEqualityMatcher(expected, actual);
-		} else if(expected._type == "Boolean") {
-			return new JSSpec.BooleanEqualityMatcher(expected, actual);
-		}
-	}
-	
-	return new JSSpec.ObjectEqualityMatcher(expected, actual);
-};
-
-JSSpec.EqualityMatcher.basicExplain = function(expected, actual, expectedDesc, actualDesc) {
-	var sb = [];
-	
-	sb.push(actualDesc || '<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(actual) + '</p>');
-	sb.push(expectedDesc || '<p>should be:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(expected) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.EqualityMatcher.diffExplain = function(expected, actual) {
-	var sb = [];
-
-	sb.push('<p>diff:</p>');
-	sb.push('<p style="margin-left:2em;">');
-	
-	var dmp = new diff_match_patch();
-	var diff = dmp.diff_main(expected, actual);
-	dmp.diff_cleanupEfficiency(diff);
-	
-	sb.push(JSSpec.util.inspect(dmp.diff_prettyHtml(diff), true));
-	
-	sb.push('</p>');
-	
-	return sb.join("");
-};
-
-/**
- * BooleanEqualityMatcher
- */
-JSSpec.BooleanEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.BooleanEqualityMatcher.prototype.explain = function() {
-	var sb = [];
-	
-	sb.push('<p>actual value:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
-	sb.push('<p>should be:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.BooleanEqualityMatcher.prototype.matches = function() {
-	return this.expected == this.actual;
-};
-
-/**
- * NullEqualityMatcher
- */
-JSSpec.NullEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.NullEqualityMatcher.prototype.matches = function() {
-	return this.expected == this.actual && typeof this.expected == typeof this.actual;
-};
-
-JSSpec.NullEqualityMatcher.prototype.explain = function() {
-	return JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual);
-};
-
-JSSpec.DateEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.DateEqualityMatcher.prototype.matches = function() {
-	return this.expected.getTime() == this.actual.getTime();
-};
-
-JSSpec.DateEqualityMatcher.prototype.explain = function() {
-	var sb = [];
-	
-	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
-	sb.push(JSSpec.EqualityMatcher.diffExplain(this.expected.toString(), this.actual.toString()));
-
-	return sb.join("");
-};
-
-/**
- * ObjectEqualityMatcher
- */
-JSSpec.ObjectEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-	this.match = this.expected == this.actual;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.matches = function() {return this.match};
-
-JSSpec.ObjectEqualityMatcher.prototype.explain = function() {return this.explaination};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplain = function() {
-	if(this.expected == this.actual) {
-		this.match = true;
-		return "";
-	}
-	
-	if(JSSpec.util.isDomNode(this.expected)) {
-		return this.makeExplainForDomNode();
-	}
-	
-	var key, expectedHasItem, actualHasItem;
-
-	for(key in this.expected) {
-		expectedHasItem = this.expected[key] != null && typeof this.expected[key] != 'undefined';
-		actualHasItem = this.actual[key] != null && typeof this.actual[key] != 'undefined';
-		if(expectedHasItem && !actualHasItem) return this.makeExplainForMissingItem(key);
-	}
-	for(key in this.actual) {
-		expectedHasItem = this.expected[key] != null && typeof this.expected[key] != 'undefined';
-		actualHasItem = this.actual[key] != null && typeof this.actual[key] != 'undefined';
-		if(actualHasItem && !expectedHasItem) return this.makeExplainForUnknownItem(key);
-	}
-	
-	for(key in this.expected) {
-		var matcher = JSSpec.EqualityMatcher.createInstance(this.expected[key], this.actual[key]);
-		if(!matcher.matches()) return this.makeExplainForItemMismatch(key);
-	}
-		
-	this.match = true;
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForDomNode = function(key) {
-	var sb = [];
-	
-	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
-	
-	return sb.join("");
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForMissingItem = function(key) {
-	var sb = [];
-
-	sb.push('<p>actual value has no item named <strong>' + JSSpec.util.inspect(key) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
-	sb.push('<p>but it should have the item whose value is <strong>' + JSSpec.util.inspect(this.expected[key]) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForUnknownItem = function(key) {
-	var sb = [];
-
-	sb.push('<p>actual value has item named <strong>' + JSSpec.util.inspect(key) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
-	sb.push('<p>but there should be no such item</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
-	
-	return sb.join("");
-};
-
-JSSpec.ObjectEqualityMatcher.prototype.makeExplainForItemMismatch = function(key) {
-	var sb = [];
-
-	sb.push('<p>actual value has an item named <strong>' + JSSpec.util.inspect(key) + '</strong> whose value is <strong>' + JSSpec.util.inspect(this.actual[key]) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
-	sb.push('<p>but it\'s value should be <strong>' + JSSpec.util.inspect(this.expected[key]) + '</strong></p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
-	
-	return sb.join("");
-};
-
-
-
-
-/**
- * ArrayEqualityMatcher
- */
-JSSpec.ArrayEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-	this.match = this.expected == this.actual;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.ArrayEqualityMatcher.prototype.matches = function() {return this.match};
-
-JSSpec.ArrayEqualityMatcher.prototype.explain = function() {return this.explaination};
-
-JSSpec.ArrayEqualityMatcher.prototype.makeExplain = function() {
-	if(this.expected.length != this.actual.length) return this.makeExplainForLengthMismatch();
-	
-	for(var i = 0; i < this.expected.length; i++) {
-		var matcher = JSSpec.EqualityMatcher.createInstance(this.expected[i], this.actual[i]);
-		if(!matcher.matches()) return this.makeExplainForItemMismatch(i);
-	}
-		
-	this.match = true;
-};
-
-JSSpec.ArrayEqualityMatcher.prototype.makeExplainForLengthMismatch = function() {
-	return JSSpec.EqualityMatcher.basicExplain(
-		this.expected,
-		this.actual,
-		'<p>but it should be <strong>' + this.expected.length + '</strong></p>',
-		'<p>actual value has <strong>' + this.actual.length + '</strong> items</p>'
-	);
-};
-
-JSSpec.ArrayEqualityMatcher.prototype.makeExplainForItemMismatch = function(index) {
-	var postfix = ["th", "st", "nd", "rd", "th"][Math.min((index + 1) % 10,4)];
-	
-	var sb = [];
-
-	sb.push('<p>' + (index + 1) + postfix + ' item (index ' + index + ') of actual value is <strong>' + JSSpec.util.inspect(this.actual[index]) + '</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, index) + '</p>');
-	sb.push('<p>but it should be <strong>' + JSSpec.util.inspect(this.expected[index]) + '</strong>:</p>');
-	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, index) + '</p>');
-	
-	return sb.join("");
-};
-
-/**
- * NumberEqualityMatcher
- */
-JSSpec.NumberEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.NumberEqualityMatcher.prototype.matches = function() {
-	if(this.expected == this.actual) return true;
-};
-
-JSSpec.NumberEqualityMatcher.prototype.explain = function() {
-	return JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual);
-};
-
-/**
- * StringEqualityMatcher
- */
-JSSpec.StringEqualityMatcher = function(expected, actual) {
-	this.expected = expected;
-	this.actual = actual;
-};
-
-JSSpec.StringEqualityMatcher.prototype.matches = function() {
-	return this.expected == this.actual;
-};
-
-JSSpec.StringEqualityMatcher.prototype.explain = function() {
-	var sb = [];
-
-	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
-	sb.push(JSSpec.EqualityMatcher.diffExplain(this.expected, this.actual));	
-	return sb.join("");
-};
-
-/**
- * PatternMatcher
- */
-JSSpec.PatternMatcher = function(actual, pattern, condition) {
-	this.actual = actual;
-	this.pattern = pattern;
-	this.condition = condition;
-	this.match = false;
-	this.explaination = this.makeExplain();
-};
-
-JSSpec.PatternMatcher.createInstance = function(actual, pattern, condition) {
-	return new JSSpec.PatternMatcher(actual, pattern, condition);
-};
-
-JSSpec.PatternMatcher.prototype.makeExplain = function() {
-	var sb;
-	if(this.actual == null || this.actual._type != 'String') {
-		sb = [];
-		sb.push('<p>actual value:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
-		sb.push('<p>should ' + (this.condition ? '' : 'not') + ' match with pattern:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.pattern) + '</p>');
-		sb.push('<p>but pattern matching cannot be performed.</p>');
-		return sb.join("");
-	} else {
-		this.match = this.condition == !!this.actual.match(this.pattern);
-		if(this.match) return "";
-		
-		sb = [];
-		sb.push('<p>actual value:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
-		sb.push('<p>should ' + (this.condition ? '' : 'not') + ' match with pattern:</p>');
-		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.pattern) + '</p>');
-		return sb.join("");
-	}
-};
-
-JSSpec.PatternMatcher.prototype.matches = function() {
-	return this.match;
-};
-
-JSSpec.PatternMatcher.prototype.explain = function() {
-	return this.explaination;
-};
-
-/**
- * Domain Specific Languages
- */
-JSSpec.DSL = {};
-
-JSSpec.DSL.forString = {
-	normalizeHtml: function() {
-		var html = this;
-		
-		// Uniformize quotation, turn tag names and attribute names into lower case
-		html = html.replace(/<(\/?)(\w+)([^>]*?)>/img, function(str, closingMark, tagName, attrs) {
-			var sortedAttrs = JSSpec.util.sortHtmlAttrs(JSSpec.util.correctHtmlAttrQuotation(attrs).toLowerCase())
-			return "<" + closingMark + tagName.toLowerCase() + sortedAttrs + ">"
-		});
-		
-		// validation self-closing tags
-		html = html.replace(/<(br|hr|img)([^>]*?)>/mg, function(str, tag, attrs) {
-			return "<" + tag + attrs + " />";
-		});
-		
-		// append semi-colon at the end of style value
-		html = html.replace(/style="(.*?)"/mg, function(str, styleStr) {
-			styleStr = JSSpec.util.sortStyleEntries(styleStr.strip()); // for Safari
-			if(styleStr.charAt(styleStr.length - 1) != ';') styleStr += ";"
-			
-			return 'style="' + styleStr + '"'
-		});
-		
-		// sort style entries
-		
-		// remove empty style attributes
-		html = html.replace(/ style=";"/mg, "");
-		
-		// remove new-lines
-		html = html.replace(/\r/mg, '');
-		html = html.replace(/\n/mg, '');
-			
-		return html;
-	}
-};
-
-
-JSSpec.DSL.describe = function(context, entries, base) {
-	if(base) {
-		for(var i = 0; i < JSSpec.specs.length; i++) {
-			if(JSSpec.specs[i].context === base) {
-				base = JSSpec.specs[i];
-				break;
-			}
-		}
-		
-		for(var i = 0; i < base.examples.length; i++) {
-			var example = base.examples[i];
-			
-			if(!entries[example.name]) entries[example.name] = example.target;
-		}
-	}
-	
-	JSSpec.specs.push(new JSSpec.Spec(context, entries));
-};
-
-JSSpec.DSL.value_of = function(target) {
-	if(JSSpec._secondPass) return {};
-	
-	var subject = new JSSpec.DSL.Subject(target);
-	return subject;
-};
-
-JSSpec.DSL.Subject = function(target) {
-	this.target = target;
-};
-
-JSSpec.DSL.Subject.prototype._type = 'Subject';
-
-JSSpec.DSL.Subject.prototype.should_fail = function(message) {
-	JSSpec._assertionFailure = {message:message};
-	throw JSSpec._assertionFailure;
-};
-
-JSSpec.DSL.Subject.prototype.should_be = function(expected) {
-	var matcher = JSSpec.EqualityMatcher.createInstance(expected, this.target);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be = function(expected) {
-	// TODO JSSpec.EqualityMatcher should support 'condition'
-	var matcher = JSSpec.EqualityMatcher.createInstance(expected, this.target);
-	if(matcher.matches()) {
-		JSSpec._assertionFailure = {message:"'" + this.target + "' should not be '" + expected + "'"};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_be_empty = function() {
-	this.should_have(0, this.getType() == 'String' ? 'characters' : 'items');
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be_empty = function() {
-	this.should_have_at_least(1, this.getType() == 'String' ? 'characters' : 'items');
-};
-
-JSSpec.DSL.Subject.prototype.should_be_true = function() {
-	this.should_be(true);
-};
-
-JSSpec.DSL.Subject.prototype.should_be_false = function() {
-	this.should_be(false);
-};
-
-JSSpec.DSL.Subject.prototype.should_be_null = function() {
-	this.should_be(null);
-};
-
-JSSpec.DSL.Subject.prototype.should_be_undefined = function() {
-	this.should_be(undefined);
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be_null = function() {
-	this.should_not_be(null);
-};
-
-JSSpec.DSL.Subject.prototype.should_not_be_undefined = function() {
-	this.should_not_be(undefined);
-};
-
-JSSpec.DSL.Subject.prototype._should_have = function(num, property, condition) {
-	var matcher = JSSpec.PropertyLengthMatcher.createInstance(num, property, this.target, condition);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_have = function(num, property) {
-	this._should_have(num, property, "exactly");
-};
-
-JSSpec.DSL.Subject.prototype.should_have_exactly = function(num, property) {
-	this._should_have(num, property, "exactly");
-};
-
-JSSpec.DSL.Subject.prototype.should_have_at_least = function(num, property) {
-	this._should_have(num, property, "at least");
-};
-
-JSSpec.DSL.Subject.prototype.should_have_at_most = function(num, property) {
-	this._should_have(num, property, "at most");
-};
-
-JSSpec.DSL.Subject.prototype.should_include = function(expected) {
-	var matcher = JSSpec.IncludeMatcher.createInstance(this.target, expected, true);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_not_include = function(expected) {
-	var matcher = JSSpec.IncludeMatcher.createInstance(this.target, expected, false);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.should_match = function(pattern) {
-	var matcher = JSSpec.PatternMatcher.createInstance(this.target, pattern, true);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-}
-JSSpec.DSL.Subject.prototype.should_not_match = function(pattern) {
-	var matcher = JSSpec.PatternMatcher.createInstance(this.target, pattern, false);
-	if(!matcher.matches()) {
-		JSSpec._assertionFailure = {message:matcher.explain()};
-		throw JSSpec._assertionFailure;
-	}
-};
-
-JSSpec.DSL.Subject.prototype.getType = function() {
-	if(typeof this.target == 'undefined') {
-		return 'undefined';
-	} else if(this.target == null) {
-		return 'null';
-	} else if(this.target._type) {
-		return this.target._type;
-	} else if(JSSpec.util.isDomNode(this.target)) {
-		return 'DomNode';
-	} else {
-		return 'object';
-	}
-};
-
-/**
- * Utilities
- */
-JSSpec.util = {
-	escapeTags: function(string) {
-		return string.replace(/</img, '&lt;').replace(/>/img, '&gt;');
-	},
-	escapeMetastring: function(string) {
-		return string.replace(/\r/img, '\\r').replace(/\n/img, '\\n').replace(/\&para\;\<BR\>/img, '\\n').replace(/\t/img, '\\t');
-	},
-	parseOptions: function(defaults) {
-		var options = defaults;
-		
-		var url = location.href;
-		var queryIndex = url.indexOf('?');
-		if(queryIndex == -1) return options;
-		
-		var query = url.substring(queryIndex + 1).split('#')[0];
-		var pairs = query.split('&');
-		for(var i = 0; i < pairs.length; i++) {
-			var tokens = pairs[i].split('=');
-			options[tokens[0]] = tokens[1];
-		}
-		
-		return options;
-	},
-	correctHtmlAttrQuotation: function(html) {
-		html = html.replace(/(\w+)=['"]([^'"]+)['"]/mg,function (str, name, value) {return name + '=' + '"' + value + '"';});
-		html = html.replace(/(\w+)=([^ '"]+)/mg,function (str, name, value) {return name + '=' + '"' + value + '"';});
-		html = html.replace(/'/mg, '"');
-		
-		return html;
-	},
-	sortHtmlAttrs: function(html) {
-		var attrs = [];
-		html.replace(/((\w+)="[^"]+")/mg, function(str, matched) {
-			attrs.push(matched);
-		});
-		return attrs.length == 0 ? "" : " " + attrs.sort().join(" ");
-	},
-	sortStyleEntries: function(styleText) {
-		var entries = styleText.split(/; /);
-		return entries.sort().join("; ");
-	},
-	escapeHtml: function(str) {
-		if(!this._div) {
-			this._div = document.createElement("DIV");
-			this._text = document.createTextNode('');
-			this._div.appendChild(this._text);
-		}
-		this._text.data = str;
-		return this._div.innerHTML;
-	},
-	isDomNode: function(o) {
-		// TODO: make it more stricter
-		return (typeof o.nodeName == 'string') && (typeof o.nodeType == 'number');
-	},
-	inspectDomPath: function(o) {
-		var sb = [];
-		while(o && o.nodeName != '#document' && o.parent) {
-			var siblings = o.parentNode.childNodes;
-			for(var i = 0; i < siblings.length; i++) {
-				if(siblings[i] == o) {
-					sb.push(o.nodeName + (i == 0 ? '' : '[' + i + ']'));
-					break;
-				}
-			}
-			o = o.parentNode;
-		}
-		return sb.join(" &gt; ");
-	},
-	inspectDomNode: function(o) {
-		if(o.nodeType == 1) {
-			var nodeName = o.nodeName.toLowerCase();
-			var sb = [];
-			sb.push('<span class="dom_value">');
-			sb.push("&lt;");
-			sb.push(nodeName);
-			
-			var attrs = o.attributes;
-			for(var i = 0; i < attrs.length; i++) {
-				if(
-					attrs[i].nodeValue &&
-					attrs[i].nodeName != 'contentEditable' &&
-					attrs[i].nodeName != 'style' &&
-					typeof attrs[i].nodeValue != 'function'
-				) sb.push(' <span class="dom_attr_name">' + attrs[i].nodeName.toLowerCase() + '</span>=<span class="dom_attr_value">"' + attrs[i].nodeValue + '"</span>');
-			}
-			if(o.style && o.style.cssText) {
-				sb.push(' <span class="dom_attr_name">style</span>=<span class="dom_attr_value">"' + o.style.cssText + '"</span>');
-			}
-			sb.push('&gt;');
-			sb.push(JSSpec.util.escapeHtml(o.innerHTML));
-			sb.push('&lt;/' + nodeName + '&gt;');
-			sb.push(' <span class="dom_path">(' + JSSpec.util.inspectDomPath(o) + ')</span>' );
-			sb.push('</span>');
-			return sb.join("");
-		} else if(o.nodeType == 3) {
-			return '<span class="dom_value">#text ' + o.nodeValue + '</span>';
-		} else {
-			return '<span class="dom_value">UnknownDomNode</span>';
-		}
-	},
-	inspect: function(o, dontEscape, emphasisKey) {
-		var sb, inspected;
-
-		if(typeof o == 'undefined') return '<span class="undefined_value">undefined</span>';
-		if(o == null) return '<span class="null_value">null</span>';
-		if(o._type == 'String') return '<span class="string_value">"' + (dontEscape ? JSSpec.util.escapeMetastring(o) : JSSpec.util.escapeHtml(JSSpec.util.escapeMetastring(o))) + '"</span>';
-
-		if(o._type == 'Date') {
-			return '<span class="date_value">"' + o.toString() + '"</span>';
-		}
-		
-		if(o._type == 'Number') return '<span class="number_value">' + (dontEscape ? o : JSSpec.util.escapeHtml(o)) + '</span>';
-		
-		if(o._type == 'Boolean') return '<span class="boolean_value">' + o + '</span>';
-
-		if(o._type == 'RegExp') return '<span class="regexp_value">' + JSSpec.util.escapeHtml(o.toString()) + '</span>';
-
-		if(JSSpec.util.isDomNode(o)) return JSSpec.util.inspectDomNode(o);
-
-		if(o._type == 'Array' || typeof o.length != 'undefined') {
-			sb = [];
-			for(var i = 0; i < o.length; i++) {
-				inspected = JSSpec.util.inspect(o[i]);
-				sb.push(i == emphasisKey ? ('<strong>' + inspected + '</strong>') : inspected);
-			}
-			return '<span class="array_value">[' + sb.join(', ') + ']</span>';
-		}
-		
-		// object
-		sb = [];
-		for(var key in o) {
-			if(key == 'should') continue;
-			
-			inspected = JSSpec.util.inspect(key) + ":" + JSSpec.util.inspect(o[key]);
-			sb.push(key == emphasisKey ? ('<strong>' + inspected + '</strong>') : inspected);
-		}
-		return '<span class="object_value">{' + sb.join(', ') + '}</span>';
-	}
-};
-
-describe = JSSpec.DSL.describe;
-behavior_of = JSSpec.DSL.describe;
-value_of = JSSpec.DSL.value_of;
-expect = JSSpec.DSL.value_of; // @deprecated
-
-String.prototype._type = "String";
-Number.prototype._type = "Number";
-Date.prototype._type = "Date";
-Array.prototype._type = "Array";
-Boolean.prototype._type = "Boolean";
-RegExp.prototype._type = "RegExp";
-
-var targets = [Array.prototype, Date.prototype, Number.prototype, String.prototype, Boolean.prototype, RegExp.prototype];
-
-String.prototype.normalizeHtml = JSSpec.DSL.forString.normalizeHtml;
-String.prototype.asHtml = String.prototype.normalizeHtml; //@deprecated
-String.prototype.strip = function() {return this.replace(/^\s+/, '').replace(/\s+$/, '');}
-
-
-/**
- * Main
- */
-JSSpec.defaultOptions = {
-	autorun: 1,
-	specIdBeginsWith: 0,
-	exampleIdBeginsWith: 0,
-	autocollapse: 1
-};
-JSSpec.options = JSSpec.util.parseOptions(JSSpec.defaultOptions);
-
-JSSpec.Spec.id = JSSpec.options.specIdBeginsWith;
-JSSpec.Example.id = JSSpec.options.exampleIdBeginsWith;
-
-
-
-window.onload = function() {
-	if(JSSpec.specs.length > 0) {
-		if(!JSSpec.options.inSuite) {
-			JSSpec.runner = new JSSpec.Runner(JSSpec.specs, new JSSpec.Logger());
-			if(JSSpec.options.rerun) {
-				JSSpec.runner.rerun(decodeURIComponent(JSSpec.options.rerun));
-			} else {
-				JSSpec.runner.run();
-			}
-		} else {
-			// in suite, send all specs to parent
-			var parentWindow = window.frames.parent.window;
-			for(var i = 0; i < JSSpec.specs.length; i++) {
-				parentWindow.JSSpec.specs.push(JSSpec.specs[i]);
-			}
-		}
-	} else {
-		var links = document.getElementById('list').getElementsByTagName('A');
-		var frameContainer = document.createElement('DIV');
-		frameContainer.style.display = 'none';
-		document.body.appendChild(frameContainer);
-		
-		for(var i = 0; i < links.length; i++) {
-			var frame = document.createElement('IFRAME');
-			frame.src = links[i].href + '?inSuite=0&specIdBeginsWith=' + (i * 10000) + '&exampleIdBeginsWith=' + (i * 10000);
-			frameContainer.appendChild(frame);
-		}
-	}
+/**
+ * JSSpec
+ *
+ * Copyright 2007 Alan Kang
+ *  - mailto:jania902@gmail.com
+ *  - http://jania.pe.kr
+ *
+ * http://jania.pe.kr/aw/moin.cgi/JSSpec
+ *
+ * Dependencies:
+ *  - diff_match_patch.js ( http://code.google.com/p/google-diff-match-patch )
+ *
+ * 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 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
+ * Lesser 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
+ */
+
+/**
+ * Namespace
+ */
+
+var JSSpec = {
+	specs: [],
+	
+	EMPTY_FUNCTION: function() {},
+	
+	Browser: {
+		// By Rendering Engines
+		Trident: navigator.appName === "Microsoft Internet Explorer",
+		Webkit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+		Gecko: navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') === -1,
+		KHTML: navigator.userAgent.indexOf('KHTML') !== -1,
+		Presto: navigator.appName === "Opera",
+		
+		// By Platforms
+		Mac: navigator.userAgent.indexOf("Macintosh") !== -1,
+		Ubuntu: navigator.userAgent.indexOf('Ubuntu') !== -1,
+		Win: navigator.userAgent.indexOf('Windows') !== -1,
+		
+		// By Browsers
+		IE: navigator.appName === "Microsoft Internet Explorer",
+		IE6: navigator.userAgent.indexOf('MSIE 6') !== -1,
+		IE7: navigator.userAgent.indexOf('MSIE 7') !== -1,
+		IE8: navigator.userAgent.indexOf('MSIE 8') !== -1,
+		
+		FF: navigator.userAgent.indexOf('Firefox') !== -1,
+		FF2: navigator.userAgent.indexOf('Firefox/2') !== -1,
+		FF3: navigator.userAgent.indexOf('Firefox/3') !== -1,
+		Safari: navigator.userAgent.indexOf('Safari') !== -1
+	}
+};
+
+
+
+/**
+ * Executor
+ */
+JSSpec.Executor = function(target, onSuccess, onException) {
+	this.target = target;
+	this.onSuccess = typeof onSuccess == 'function' ? onSuccess : JSSpec.EMPTY_FUNCTION;
+	this.onException = typeof onException == 'function' ? onException : JSSpec.EMPTY_FUNCTION;
+	
+	if(JSSpec.Browser.Trident) {
+		// Exception handler for Trident. It helps to collect exact line number where exception occured.
+		window.onerror = function(message, fileName, lineNumber) {
+			var self = window._curExecutor;
+			var ex = {message:message, fileName:fileName, lineNumber:lineNumber};
+
+			if(JSSpec._secondPass)  {
+				ex = self.mergeExceptions(JSSpec._assertionFailure, ex);
+				delete JSSpec._secondPass;
+				delete JSSpec._assertionFailure;
+				
+				ex.type = "failure";
+				self.onException(self, ex);
+			} else if(JSSpec._assertionFailure) {
+				JSSpec._secondPass = true;
+				self.run();
+			} else {
+				self.onException(self, ex);
+			}
+			
+			return true;
+		};
+	}
+};
+JSSpec.Executor.prototype.mergeExceptions = function(assertionFailure, normalException) {
+	var merged = {
+		message:assertionFailure.message,
+		fileName:normalException.fileName,
+		lineNumber:normalException.lineNumber
+	};
+	
+	return merged;
+};
+
+JSSpec.Executor.prototype.run = function() {
+	var self = this;
+	var target = this.target;
+	var onSuccess = this.onSuccess;
+	var onException = this.onException;
+	
+	window.setTimeout(
+		function() {
+			var result;
+			if(JSSpec.Browser.Trident) {
+				window._curExecutor = self;
+				
+				result = self.target();
+				self.onSuccess(self, result);
+			} else {
+				try {
+					result = self.target();
+					self.onSuccess(self, result);
+				} catch(ex) {
+					if(JSSpec.Browser.Webkit) ex = {message:ex.message, fileName:ex.sourceURL, lineNumber:ex.line};
+					
+					if(JSSpec._secondPass)  {
+						ex = self.mergeExceptions(JSSpec._assertionFailure, ex);
+						delete JSSpec._secondPass;
+						delete JSSpec._assertionFailure;
+						
+						ex.type = "failure";
+						self.onException(self, ex);
+					} else if(JSSpec._assertionFailure) {
+						JSSpec._secondPass = true;
+						self.run();
+					} else {
+						self.onException(self, ex);
+					}
+				}
+			}
+		},
+		0
+	);
+};
+
+
+
+/**
+ * CompositeExecutor composites one or more executors and execute them sequencially.
+ */
+JSSpec.CompositeExecutor = function(onSuccess, onException, continueOnException) {
+	this.queue = [];
+	this.onSuccess = typeof onSuccess == 'function' ? onSuccess : JSSpec.EMPTY_FUNCTION;
+	this.onException = typeof onException == 'function' ? onException : JSSpec.EMPTY_FUNCTION;
+	this.continueOnException = !!continueOnException;
+};
+
+JSSpec.CompositeExecutor.prototype.addFunction = function(func) {
+	this.addExecutor(new JSSpec.Executor(func));
+};
+
+JSSpec.CompositeExecutor.prototype.addExecutor = function(executor) {
+	var last = this.queue.length == 0 ? null : this.queue[this.queue.length - 1];
+	if(last) {
+		last.next = executor;
+	}
+	
+	executor.parent = this;
+	executor.onSuccessBackup = executor.onSuccess;
+	executor.onSuccess = function(result) {
+		this.onSuccessBackup(result);
+		if(this.next) {
+			this.next.run();
+		} else {
+			this.parent.onSuccess();
+		}
+	};
+	executor.onExceptionBackup = executor.onException;
+	executor.onException = function(executor, ex) {
+		this.onExceptionBackup(executor, ex);
+
+		if(this.parent.continueOnException) {
+			if(this.next) {
+				this.next.run();
+			} else {
+				this.parent.onSuccess();
+			}
+		} else {
+			this.parent.onException(executor, ex);
+		}
+	};
+
+	this.queue.push(executor);
+};
+
+JSSpec.CompositeExecutor.prototype.run = function() {
+	if(this.queue.length > 0) {
+		this.queue[0].run();
+	}
+};
+
+/**
+ * Spec is a set of Examples in a specific context
+ */
+JSSpec.Spec = function(context, entries) {
+	this.id = JSSpec.Spec.id++;
+	this.context = context;
+	this.url = location.href;
+	
+	this.filterEntriesByEmbeddedExpressions(entries);
+	this.extractOutSpecialEntries(entries);
+	this.examples = this.makeExamplesFromEntries(entries);
+	this.examplesMap = this.makeMapFromExamples(this.examples);
+};
+
+JSSpec.Spec.id = 0;
+JSSpec.Spec.prototype.getExamples = function() {
+	return this.examples;
+};
+
+JSSpec.Spec.prototype.hasException = function() {
+	return this.getTotalFailures() > 0 || this.getTotalErrors() > 0;
+};
+
+JSSpec.Spec.prototype.getTotalFailures = function() {
+	var examples = this.examples;
+	var failures = 0;
+	for(var i = 0; i < examples.length; i++) {
+		if(examples[i].isFailure()) failures++;
+	}
+	return failures;
+};
+
+JSSpec.Spec.prototype.getTotalErrors = function() {
+	var examples = this.examples;
+	var errors = 0;
+	for(var i = 0; i < examples.length; i++) {
+		if(examples[i].isError()) errors++;
+	}
+	return errors;
+};
+
+JSSpec.Spec.prototype.filterEntriesByEmbeddedExpressions = function(entries) {
+	var isTrue;
+	for(name in entries) if(entries.hasOwnProperty(name)) {
+		var m = name.match(/\[\[(.+)\]\]/);
+		if(m && m[1]) {
+			eval("isTrue = (" + m[1] + ")");
+			if(!isTrue) delete entries[name];
+		}
+	}
+};
+
+JSSpec.Spec.prototype.extractOutSpecialEntries = function(entries) {
+	this.beforeEach = JSSpec.EMPTY_FUNCTION;
+	this.beforeAll = JSSpec.EMPTY_FUNCTION;
+	this.afterEach = JSSpec.EMPTY_FUNCTION;
+	this.afterAll = JSSpec.EMPTY_FUNCTION;
+	
+	for(name in entries) if(entries.hasOwnProperty(name)) {
+		if(name == 'before' || name == 'before each' || name == 'before_each') {
+			this.beforeEach = entries[name];
+		} else if(name == 'before all' || name == 'before_all') {
+			this.beforeAll = entries[name];
+		} else if(name == 'after' || name == 'after each' || name == 'after_each') {
+			this.afterEach = entries[name];
+		} else if(name == 'after all' || name == 'after_all') {
+			this.afterAll = entries[name];
+		}
+	}
+	
+	delete entries['before'];
+	delete entries['before each'];
+	delete entries['before_each'];
+	delete entries['before all'];
+	delete entries['before_all'];
+	delete entries['after'];
+	delete entries['after each'];
+	delete entries['after_each'];
+	delete entries['after all'];
+	delete entries['after_all'];
+};
+
+JSSpec.Spec.prototype.makeExamplesFromEntries = function(entries) {
+	var examples = [];
+	for(name in entries) if(entries.hasOwnProperty(name)) {
+		examples.push(new JSSpec.Example(name, entries[name], this.beforeEach, this.afterEach));
+	}
+	return examples;
+};
+
+JSSpec.Spec.prototype.makeMapFromExamples = function(examples) {
+	var map = {};
+	for(var i = 0; i < examples.length; i++) {
+		var example = examples[i];
+		map[example.id] = examples[i];
+	}
+	return map;
+};
+
+JSSpec.Spec.prototype.getExampleById = function(id) {
+	return this.examplesMap[id];
+};
+
+JSSpec.Spec.prototype.getExecutor = function() {
+	var self = this;
+	var onException = function(executor, ex) {
+		self.exception = ex;
+	};
+	
+	var composite = new JSSpec.CompositeExecutor();
+	composite.addFunction(function() {JSSpec.log.onSpecStart(self);});
+	composite.addExecutor(new JSSpec.Executor(this.beforeAll, null, function(exec, ex) {
+		self.exception = ex;
+		JSSpec.log.onSpecEnd(self);
+	}));
+	
+	var exampleAndAfter = new JSSpec.CompositeExecutor(null,null,true);
+	for(var i = 0; i < this.examples.length; i++) {
+		exampleAndAfter.addExecutor(this.examples[i].getExecutor());
+	}
+	exampleAndAfter.addExecutor(new JSSpec.Executor(this.afterAll, null, onException));
+	exampleAndAfter.addFunction(function() {JSSpec.log.onSpecEnd(self);});
+	composite.addExecutor(exampleAndAfter);
+	
+	return composite;
+};
+
+/**
+ * Example
+ */
+JSSpec.Example = function(name, target, before, after) {
+	this.id = JSSpec.Example.id++;
+	this.name = name;
+	this.target = target;
+	this.before = before;
+	this.after = after;
+};
+
+JSSpec.Example.id = 0;
+JSSpec.Example.prototype.isFailure = function() {
+	return this.exception && this.exception.type == "failure";
+};
+
+JSSpec.Example.prototype.isError = function() {
+	return this.exception && !this.exception.type;
+};
+
+JSSpec.Example.prototype.getExecutor = function() {
+	var self = this;
+	var onException = function(executor, ex) {
+		self.exception = ex;
+	};
+	
+	var composite = new JSSpec.CompositeExecutor();
+	composite.addFunction(function() {JSSpec.log.onExampleStart(self);});
+	composite.addExecutor(new JSSpec.Executor(this.before, null, function(exec, ex) {
+		self.exception = ex;
+		JSSpec.log.onExampleEnd(self);
+	}));
+	
+	var targetAndAfter = new JSSpec.CompositeExecutor(null,null,true);
+	
+	targetAndAfter.addExecutor(new JSSpec.Executor(this.target, null, onException));
+	targetAndAfter.addExecutor(new JSSpec.Executor(this.after, null, onException));
+	targetAndAfter.addFunction(function() {JSSpec.log.onExampleEnd(self);});
+	
+	composite.addExecutor(targetAndAfter);
+	
+	return composite;
+};
+
+/**
+ * Runner
+ */
+JSSpec.Runner = function(specs, logger) {
+	JSSpec.log = logger;
+	
+	this.totalExamples = 0;
+	this.specs = [];
+	this.specsMap = {};
+	this.addAllSpecs(specs);
+};
+
+JSSpec.Runner.prototype.addAllSpecs = function(specs) {
+	for(var i = 0; i < specs.length; i++) {
+		this.addSpec(specs[i]);
+	}
+};
+
+JSSpec.Runner.prototype.addSpec = function(spec) {
+	this.specs.push(spec);
+	this.specsMap[spec.id] = spec;
+	this.totalExamples += spec.getExamples().length;
+};
+
+JSSpec.Runner.prototype.getSpecById = function(id) {
+	return this.specsMap[id];
+};
+
+JSSpec.Runner.prototype.getSpecByContext = function(context) {
+	for(var i = 0; i < this.specs.length; i++) {
+		if(this.specs[i].context == context) return this.specs[i];
+	}
+	return null;
+};
+
+JSSpec.Runner.prototype.getSpecs = function() {
+	return this.specs;
+};
+
+JSSpec.Runner.prototype.hasException = function() {
+	return this.getTotalFailures() > 0 || this.getTotalErrors() > 0;
+};
+
+JSSpec.Runner.prototype.getTotalFailures = function() {
+	var specs = this.specs;
+	var failures = 0;
+	for(var i = 0; i < specs.length; i++) {
+		failures += specs[i].getTotalFailures();
+	}
+	return failures;
+};
+
+JSSpec.Runner.prototype.getTotalErrors = function() {
+	var specs = this.specs;
+	var errors = 0;
+	for(var i = 0; i < specs.length; i++) {
+		errors += specs[i].getTotalErrors();
+	}
+	return errors;
+};
+
+
+JSSpec.Runner.prototype.run = function() {
+	JSSpec.log.onRunnerStart();
+	var executor = new JSSpec.CompositeExecutor(function() {JSSpec.log.onRunnerEnd()},null,true);
+	for(var i = 0; i < this.specs.length; i++) {
+		executor.addExecutor(this.specs[i].getExecutor());
+	}
+	executor.run();
+};
+
+
+JSSpec.Runner.prototype.rerun = function(context) {
+	JSSpec.runner = new JSSpec.Runner([this.getSpecByContext(context)], JSSpec.log);
+	JSSpec.runner.run();
+};
+
+/**
+ * Logger
+ */
+JSSpec.Logger = function() {
+	this.finishedExamples = 0;
+	this.startedAt = null;
+};
+
+JSSpec.Logger.prototype.onRunnerStart = function() {
+	this._title = document.title;
+
+	this.startedAt = new Date();
+	var container = document.getElementById('jsspec_container');
+	if(container) {
+		container.innerHTML = "";
+	} else {
+		container = document.createElement("DIV");
+		container.id = "jsspec_container";
+		document.body.appendChild(container);
+	}
+	
+	var title = document.createElement("DIV");
+	title.id = "title";
+	title.innerHTML = [
+		'<h1>JSSpec</h1>',
+		'<ul>',
+		JSSpec.options.rerun ? '<li>[<a href="?" title="rerun all specs">X</a>] ' + JSSpec.util.escapeTags(decodeURIComponent(JSSpec.options.rerun)) + '</li>' : '',
+		'	<li><span id="total_examples">' + JSSpec.runner.totalExamples + '</span> examples</li>',
+		'	<li><span id="total_failures">0</span> failures</li>',
+		'	<li><span id="total_errors">0</span> errors</li>',
+		'	<li><span id="progress">0</span>% done</li>',
+		'	<li><span id="total_elapsed">0</span> secs</li>',
+		'</ul>',
+		'<p><a href="http://jania.pe.kr/aw/moin.cgi/JSSpec">JSSpec homepage</a></p>',
+	].join("");
+	container.appendChild(title);
+
+	var list = document.createElement("DIV");
+	list.id = "list";
+	list.innerHTML = [
+		'<h2>List</h2>',
+		'<ul class="specs">',
+		function() {
+			var specs = JSSpec.runner.getSpecs();
+			var sb = [];
+			for(var i = 0; i < specs.length; i++) {
+				var spec = specs[i];
+				sb.push('<li id="spec_' + specs[i].id + '_list"><h3><a href="#spec_' + specs[i].id + '">' + JSSpec.util.escapeTags(specs[i].context) + '</a> [<a href="?rerun=' + encodeURIComponent(specs[i].context) + '">rerun</a>]</h3> </li>');
+			}
+			return sb.join("");
+		}(),
+		'</ul>'
+	].join("");
+	container.appendChild(list);
+	
+	var log = document.createElement("DIV");
+	log.id = "log";
+	log.innerHTML = [
+		'<h2>Log</h2>',
+		'<ul class="specs">',
+		function() {
+			var specs = JSSpec.runner.getSpecs();
+			var sb = [];
+			for(var i = 0; i < specs.length; i++) {
+				var spec = specs[i];
+				sb.push('	<li id="spec_' + specs[i].id + '">');
+				sb.push('		<h3>' + JSSpec.util.escapeTags(specs[i].context) + ' [<a href="?rerun=' + encodeURIComponent(specs[i].context) + '">rerun</a>]</h3>');
+				sb.push('		<ul id="spec_' + specs[i].id + '_examples" class="examples">');
+				for(var j = 0; j < spec.examples.length; j++) {
+					var example = spec.examples[j];
+					sb.push('			<li id="example_' + example.id + '">');
+					sb.push('				<h4>' + JSSpec.util.escapeTags(example.name) + '</h4>');
+					sb.push('				<pre class="examples-code"><code>'+JSSpec.util.escapeTags(example.target.toString())+'</code></pre>');
+					sb.push('			</li>');
+				}
+				sb.push('		</ul>');
+				sb.push('	</li>');
+			}
+			return sb.join("");
+		}(),
+		'</ul>'
+	].join("");
+	
+	container.appendChild(log);
+	
+	// add event handler for toggling
+	var specs = JSSpec.runner.getSpecs();
+	var sb = [];
+	for(var i = 0; i < specs.length; i++) {
+		var spec = document.getElementById("spec_" + specs[i].id);
+		var title = spec.getElementsByTagName("H3")[0];
+		title.onclick = function(e) {
+			var target = document.getElementById(this.parentNode.id + "_examples");
+			target.style.display = target.style.display == "none" ? "block" : "none";
+			return true;
+		}
+	}
+};
+
+JSSpec.Logger.prototype.onRunnerEnd = function() {
+	if(JSSpec.runner.hasException()) {
+		var times = 4;
+		var title1 = "*" + this._title;
+		var title2 = "*F" + JSSpec.runner.getTotalFailures() + " E" + JSSpec.runner.getTotalErrors() + "* " + this._title;
+	} else {
+		var times = 2;
+		var title1 = this._title;
+		var title2 = "Success";
+	}
+	this.blinkTitle(times,title1,title2);
+};
+
+JSSpec.Logger.prototype.blinkTitle = function(times, title1, title2) {
+	var times = times * 2;
+	var mode = true;
+	
+	var f = function() {
+		if(times > 0) {
+			document.title = mode ? title1 : title2;
+			mode = !mode;
+			times--;
+			window.setTimeout(f, 500);
+		} else {
+			document.title = title1;
+		}
+	};
+	
+	f();
+};
+
+JSSpec.Logger.prototype.onSpecStart = function(spec) {
+	var spec_list = document.getElementById("spec_" + spec.id + "_list");
+	var spec_log = document.getElementById("spec_" + spec.id);
+	
+	spec_list.className = "ongoing";
+	spec_log.className = "ongoing";
+};
+
+JSSpec.Logger.prototype.onSpecEnd = function(spec) {
+	var spec_list = document.getElementById("spec_" + spec.id + "_list");
+	var spec_log = document.getElementById("spec_" + spec.id);
+	var examples = document.getElementById("spec_" + spec.id + "_examples");
+	var className = spec.hasException() ? "exception" : "success";
+
+	spec_list.className = className;
+	spec_log.className = className;
+
+	if(JSSpec.options.autocollapse && !spec.hasException()) examples.style.display = "none";
+	
+	if(spec.exception) {
+		spec_log.appendChild(document.createTextNode(" - " + spec.exception.message));
+	}
+};
+
+JSSpec.Logger.prototype.onExampleStart = function(example) {
+	var li = document.getElementById("example_" + example.id);
+	li.className = "ongoing";
+};
+
+JSSpec.Logger.prototype.onExampleEnd = function(example) {
+	var li = document.getElementById("example_" + example.id);
+	li.className = example.exception ? "exception" : "success";
+	
+	if(example.exception) {
+		var div = document.createElement("DIV");
+		div.innerHTML = example.exception.message + "<p><br />" + " at " + example.exception.fileName + ", line " + example.exception.lineNumber + "</p>";
+		li.appendChild(div);
+	}
+	
+	var title = document.getElementById("title");
+	var runner = JSSpec.runner;
+	
+	title.className = runner.hasException() ? "exception" : "success";
+	
+	this.finishedExamples++;
+	document.getElementById("total_failures").innerHTML = runner.getTotalFailures();
+	document.getElementById("total_errors").innerHTML = runner.getTotalErrors();
+	var progress = parseInt(this.finishedExamples / runner.totalExamples * 100);
+	document.getElementById("progress").innerHTML = progress;
+	document.getElementById("total_elapsed").innerHTML = (new Date().getTime() - this.startedAt.getTime()) / 1000;
+	
+	document.title = progress + "%: " + this._title;
+};
+
+/**
+ * IncludeMatcher
+ */
+JSSpec.IncludeMatcher = function(actual, expected, condition) {
+	this.actual = actual;
+	this.expected = expected;
+	this.condition = condition;
+	this.match = false;
+	this.explaination = this.makeExplain();
+};
+
+JSSpec.IncludeMatcher.createInstance = function(actual, expected, condition) {
+	return new JSSpec.IncludeMatcher(actual, expected, condition);
+};
+
+JSSpec.IncludeMatcher.prototype.matches = function() {
+	return this.match;
+};
+
+JSSpec.IncludeMatcher.prototype.explain = function() {
+	return this.explaination;
+};
+
+JSSpec.IncludeMatcher.prototype.makeExplain = function() {
+	if(typeof this.actual.length == 'undefined') {
+		return this.makeExplainForNotArray();
+	} else {
+		return this.makeExplainForArray();
+	}
+};
+
+JSSpec.IncludeMatcher.prototype.makeExplainForNotArray = function() {
+	if(this.condition) {
+		this.match = !!this.actual[this.expected];
+	} else {
+		this.match = !this.actual[this.expected];
+	}
+	
+	var sb = [];
+	sb.push('<p>actual value:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, this.expected) + '</p>');
+	sb.push('<p>should ' + (this.condition ? '' : 'not') + ' include:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
+	return sb.join("");
+};
+
+JSSpec.IncludeMatcher.prototype.makeExplainForArray = function() {
+	var matches;
+	if(this.condition) {
+		for(var i = 0; i < this.actual.length; i++) {
+			matches = JSSpec.EqualityMatcher.createInstance(this.expected, this.actual[i]).matches();
+			if(matches) {
+				this.match = true;
+				break;
+			}
+		}
+	} else {
+		for(var i = 0; i < this.actual.length; i++) {
+			matches = JSSpec.EqualityMatcher.createInstance(this.expected, this.actual[i]).matches();
+			if(matches) {
+				this.match = false;
+				break;
+			}
+		}
+	}
+	
+	if(this.match) return "";
+	
+	var sb = [];
+	sb.push('<p>actual value:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, this.condition ? null : i) + '</p>');
+	sb.push('<p>should ' + (this.condition ? '' : 'not') + ' include:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
+	return sb.join("");
+};
+
+/**
+ * PropertyLengthMatcher
+ */
+JSSpec.PropertyLengthMatcher = function(num, property, o, condition) {
+	this.num = num;
+	this.o = o;
+	this.property = property;
+	if((property == 'characters' || property == 'items') && typeof o.length != 'undefined') {
+		this.property = 'length';
+	}
+	
+	this.condition = condition;
+	this.conditionMet = function(x) {
+		if(condition == 'exactly') return x.length == num;
+		if(condition == 'at least') return x.length >= num;
+		if(condition == 'at most') return x.length <= num;
+
+		throw "Unknown condition '" + condition + "'";
+	};
+	this.match = false;
+	this.explaination = this.makeExplain();
+};
+
+JSSpec.PropertyLengthMatcher.prototype.makeExplain = function() {
+	if(this.o._type == 'String' && this.property == 'length') {
+		this.match = this.conditionMet(this.o);
+		return this.match ? '' : this.makeExplainForString();
+	} else if(typeof this.o.length != 'undefined' && this.property == "length") {
+		this.match = this.conditionMet(this.o);
+		return this.match ? '' : this.makeExplainForArray();
+	} else if(typeof this.o[this.property] != 'undefined' && this.o[this.property] != null) {
+		this.match = this.conditionMet(this.o[this.property]);
+		return this.match ? '' : this.makeExplainForObject();
+	} else if(typeof this.o[this.property] == 'undefined' || this.o[this.property] == null) {
+		this.match = false;
+		return this.makeExplainForNoProperty();
+	}
+
+	this.match = true;
+};
+
+JSSpec.PropertyLengthMatcher.prototype.makeExplainForString = function() {
+	var sb = [];
+	
+	var exp = this.num == 0 ?
+		'be an <strong>empty string</strong>' :
+		'have <strong>' + this.condition + ' ' + this.num + ' characters</strong>';
+	
+	sb.push('<p>actual value has <strong>' + this.o.length + ' characters</strong>:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
+	sb.push('<p>but it should ' + exp + '.</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.PropertyLengthMatcher.prototype.makeExplainForArray = function() {
+	var sb = [];
+	
+	var exp = this.num == 0 ?
+		'be an <strong>empty array</strong>' :
+		'have <strong>' + this.condition + ' ' + this.num + ' items</strong>';
+
+	sb.push('<p>actual value has <strong>' + this.o.length + ' items</strong>:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
+	sb.push('<p>but it should ' + exp + '.</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.PropertyLengthMatcher.prototype.makeExplainForObject = function() {
+	var sb = [];
+
+	var exp = this.num == 0 ?
+		'be <strong>empty</strong>' :
+		'have <strong>' + this.condition + ' ' + this.num + ' ' + this.property + '.</strong>';
+
+	sb.push('<p>actual value has <strong>' + this.o[this.property].length + ' ' + this.property + '</strong>:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o, false, this.property) + '</p>');
+	sb.push('<p>but it should ' + exp + '.</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.PropertyLengthMatcher.prototype.makeExplainForNoProperty = function() {
+	var sb = [];
+	
+	sb.push('<p>actual value:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.o) + '</p>');
+	sb.push('<p>should have <strong>' + this.condition + ' ' + this.num + ' ' + this.property + '</strong> but there\'s no such property.</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.PropertyLengthMatcher.prototype.matches = function() {
+	return this.match;
+};
+
+JSSpec.PropertyLengthMatcher.prototype.explain = function() {
+	return this.explaination;
+};
+
+JSSpec.PropertyLengthMatcher.createInstance = function(num, property, o, condition) {
+	return new JSSpec.PropertyLengthMatcher(num, property, o, condition);
+};
+
+/**
+ * EqualityMatcher
+ */
+JSSpec.EqualityMatcher = {};
+
+JSSpec.EqualityMatcher.createInstance = function(expected, actual) {
+	if(expected == null || actual == null) {
+		return new JSSpec.NullEqualityMatcher(expected, actual);
+	} else if(expected._type && expected._type == actual._type) {
+		if(expected._type == "String") {
+			return new JSSpec.StringEqualityMatcher(expected, actual);
+		} else if(expected._type == "Date") {
+			return new JSSpec.DateEqualityMatcher(expected, actual);
+		} else if(expected._type == "Number") {
+			return new JSSpec.NumberEqualityMatcher(expected, actual);
+		} else if(expected._type == "Array") {
+			return new JSSpec.ArrayEqualityMatcher(expected, actual);
+		} else if(expected._type == "Boolean") {
+			return new JSSpec.BooleanEqualityMatcher(expected, actual);
+		}
+	}
+	
+	return new JSSpec.ObjectEqualityMatcher(expected, actual);
+};
+
+JSSpec.EqualityMatcher.basicExplain = function(expected, actual, expectedDesc, actualDesc) {
+	var sb = [];
+	
+	sb.push(actualDesc || '<p>actual value:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(actual) + '</p>');
+	sb.push(expectedDesc || '<p>should be:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(expected) + '</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.EqualityMatcher.diffExplain = function(expected, actual) {
+	var sb = [];
+
+	sb.push('<p>diff:</p>');
+	sb.push('<p style="margin-left:2em;">');
+	
+	var dmp = new diff_match_patch();
+	var diff = dmp.diff_main(expected, actual);
+	dmp.diff_cleanupEfficiency(diff);
+	
+	sb.push(JSSpec.util.inspect(dmp.diff_prettyHtml(diff), true));
+	
+	sb.push('</p>');
+	
+	return sb.join("");
+};
+
+/**
+ * BooleanEqualityMatcher
+ */
+JSSpec.BooleanEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+};
+
+JSSpec.BooleanEqualityMatcher.prototype.explain = function() {
+	var sb = [];
+	
+	sb.push('<p>actual value:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
+	sb.push('<p>should be:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected) + '</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.BooleanEqualityMatcher.prototype.matches = function() {
+	return this.expected == this.actual;
+};
+
+/**
+ * NullEqualityMatcher
+ */
+JSSpec.NullEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+};
+
+JSSpec.NullEqualityMatcher.prototype.matches = function() {
+	return this.expected == this.actual && typeof this.expected == typeof this.actual;
+};
+
+JSSpec.NullEqualityMatcher.prototype.explain = function() {
+	return JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual);
+};
+
+JSSpec.DateEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+};
+
+JSSpec.DateEqualityMatcher.prototype.matches = function() {
+	return this.expected.getTime() == this.actual.getTime();
+};
+
+JSSpec.DateEqualityMatcher.prototype.explain = function() {
+	var sb = [];
+	
+	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
+	sb.push(JSSpec.EqualityMatcher.diffExplain(this.expected.toString(), this.actual.toString()));
+
+	return sb.join("");
+};
+
+/**
+ * ObjectEqualityMatcher
+ */
+JSSpec.ObjectEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+	this.match = this.expected == this.actual;
+	this.explaination = this.makeExplain();
+};
+
+JSSpec.ObjectEqualityMatcher.prototype.matches = function() {return this.match};
+
+JSSpec.ObjectEqualityMatcher.prototype.explain = function() {return this.explaination};
+
+JSSpec.ObjectEqualityMatcher.prototype.makeExplain = function() {
+	if(this.expected == this.actual) {
+		this.match = true;
+		return "";
+	}
+	
+	if(JSSpec.util.isDomNode(this.expected)) {
+		return this.makeExplainForDomNode();
+	}
+	
+	var key, expectedHasItem, actualHasItem;
+
+	for(key in this.expected) {
+		expectedHasItem = this.expected[key] != null && typeof this.expected[key] != 'undefined';
+		actualHasItem = this.actual[key] != null && typeof this.actual[key] != 'undefined';
+		if(expectedHasItem && !actualHasItem) return this.makeExplainForMissingItem(key);
+	}
+	for(key in this.actual) {
+		expectedHasItem = this.expected[key] != null && typeof this.expected[key] != 'undefined';
+		actualHasItem = this.actual[key] != null && typeof this.actual[key] != 'undefined';
+		if(actualHasItem && !expectedHasItem) return this.makeExplainForUnknownItem(key);
+	}
+	
+	for(key in this.expected) {
+		var matcher = JSSpec.EqualityMatcher.createInstance(this.expected[key], this.actual[key]);
+		if(!matcher.matches()) return this.makeExplainForItemMismatch(key);
+	}
+		
+	this.match = true;
+};
+
+JSSpec.ObjectEqualityMatcher.prototype.makeExplainForDomNode = function(key) {
+	var sb = [];
+	
+	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
+	
+	return sb.join("");
+};
+
+JSSpec.ObjectEqualityMatcher.prototype.makeExplainForMissingItem = function(key) {
+	var sb = [];
+
+	sb.push('<p>actual value has no item named <strong>' + JSSpec.util.inspect(key) + '</strong></p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
+	sb.push('<p>but it should have the item whose value is <strong>' + JSSpec.util.inspect(this.expected[key]) + '</strong></p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.ObjectEqualityMatcher.prototype.makeExplainForUnknownItem = function(key) {
+	var sb = [];
+
+	sb.push('<p>actual value has item named <strong>' + JSSpec.util.inspect(key) + '</strong></p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
+	sb.push('<p>but there should be no such item</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
+	
+	return sb.join("");
+};
+
+JSSpec.ObjectEqualityMatcher.prototype.makeExplainForItemMismatch = function(key) {
+	var sb = [];
+
+	sb.push('<p>actual value has an item named <strong>' + JSSpec.util.inspect(key) + '</strong> whose value is <strong>' + JSSpec.util.inspect(this.actual[key]) + '</strong></p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, key) + '</p>');
+	sb.push('<p>but it\'s value should be <strong>' + JSSpec.util.inspect(this.expected[key]) + '</strong></p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, key) + '</p>');
+	
+	return sb.join("");
+};
+
+
+
+
+/**
+ * ArrayEqualityMatcher
+ */
+JSSpec.ArrayEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+	this.match = this.expected == this.actual;
+	this.explaination = this.makeExplain();
+};
+
+JSSpec.ArrayEqualityMatcher.prototype.matches = function() {return this.match};
+
+JSSpec.ArrayEqualityMatcher.prototype.explain = function() {return this.explaination};
+
+JSSpec.ArrayEqualityMatcher.prototype.makeExplain = function() {
+	if(this.expected.length != this.actual.length) return this.makeExplainForLengthMismatch();
+	
+	for(var i = 0; i < this.expected.length; i++) {
+		var matcher = JSSpec.EqualityMatcher.createInstance(this.expected[i], this.actual[i]);
+		if(!matcher.matches()) return this.makeExplainForItemMismatch(i);
+	}
+		
+	this.match = true;
+};
+
+JSSpec.ArrayEqualityMatcher.prototype.makeExplainForLengthMismatch = function() {
+	return JSSpec.EqualityMatcher.basicExplain(
+		this.expected,
+		this.actual,
+		'<p>but it should be <strong>' + this.expected.length + '</strong></p>',
+		'<p>actual value has <strong>' + this.actual.length + '</strong> items</p>'
+	);
+};
+
+JSSpec.ArrayEqualityMatcher.prototype.makeExplainForItemMismatch = function(index) {
+	var postfix = ["th", "st", "nd", "rd", "th"][Math.min((index + 1) % 10,4)];
+	
+	var sb = [];
+
+	sb.push('<p>' + (index + 1) + postfix + ' item (index ' + index + ') of actual value is <strong>' + JSSpec.util.inspect(this.actual[index]) + '</strong>:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual, false, index) + '</p>');
+	sb.push('<p>but it should be <strong>' + JSSpec.util.inspect(this.expected[index]) + '</strong>:</p>');
+	sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.expected, false, index) + '</p>');
+	
+	return sb.join("");
+};
+
+/**
+ * NumberEqualityMatcher
+ */
+JSSpec.NumberEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+};
+
+JSSpec.NumberEqualityMatcher.prototype.matches = function() {
+	if(this.expected == this.actual) return true;
+};
+
+JSSpec.NumberEqualityMatcher.prototype.explain = function() {
+	return JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual);
+};
+
+/**
+ * StringEqualityMatcher
+ */
+JSSpec.StringEqualityMatcher = function(expected, actual) {
+	this.expected = expected;
+	this.actual = actual;
+};
+
+JSSpec.StringEqualityMatcher.prototype.matches = function() {
+	return this.expected == this.actual;
+};
+
+JSSpec.StringEqualityMatcher.prototype.explain = function() {
+	var sb = [];
+
+	sb.push(JSSpec.EqualityMatcher.basicExplain(this.expected, this.actual));
+	sb.push(JSSpec.EqualityMatcher.diffExplain(this.expected, this.actual));	
+	return sb.join("");
+};
+
+/**
+ * PatternMatcher
+ */
+JSSpec.PatternMatcher = function(actual, pattern, condition) {
+	this.actual = actual;
+	this.pattern = pattern;
+	this.condition = condition;
+	this.match = false;
+	this.explaination = this.makeExplain();
+};
+
+JSSpec.PatternMatcher.createInstance = function(actual, pattern, condition) {
+	return new JSSpec.PatternMatcher(actual, pattern, condition);
+};
+
+JSSpec.PatternMatcher.prototype.makeExplain = function() {
+	var sb;
+	if(this.actual == null || this.actual._type != 'String') {
+		sb = [];
+		sb.push('<p>actual value:</p>');
+		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
+		sb.push('<p>should ' + (this.condition ? '' : 'not') + ' match with pattern:</p>');
+		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.pattern) + '</p>');
+		sb.push('<p>but pattern matching cannot be performed.</p>');
+		return sb.join("");
+	} else {
+		this.match = this.condition == !!this.actual.match(this.pattern);
+		if(this.match) return "";
+		
+		sb = [];
+		sb.push('<p>actual value:</p>');
+		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.actual) + '</p>');
+		sb.push('<p>should ' + (this.condition ? '' : 'not') + ' match with pattern:</p>');
+		sb.push('<p style="margin-left:2em;">' + JSSpec.util.inspect(this.pattern) + '</p>');
+		return sb.join("");
+	}
+};
+
+JSSpec.PatternMatcher.prototype.matches = function() {
+	return this.match;
+};
+
+JSSpec.PatternMatcher.prototype.explain = function() {
+	return this.explaination;
+};
+
+/**
+ * Domain Specific Languages
+ */
+JSSpec.DSL = {};
+
+JSSpec.DSL.forString = {
+	normalizeHtml: function() {
+		var html = this;
+		
+		// Uniformize quotation, turn tag names and attribute names into lower case
+		html = html.replace(/<(\/?)(\w+)([^>]*?)>/img, function(str, closingMark, tagName, attrs) {
+			var sortedAttrs = JSSpec.util.sortHtmlAttrs(JSSpec.util.correctHtmlAttrQuotation(attrs).toLowerCase())
+			return "<" + closingMark + tagName.toLowerCase() + sortedAttrs + ">"
+		});
+		
+		// validation self-closing tags
+		html = html.replace(/<(br|hr|img)([^>]*?)>/mg, function(str, tag, attrs) {
+			return "<" + tag + attrs + " />";
+		});
+		
+		// append semi-colon at the end of style value
+		html = html.replace(/style="(.*?)"/mg, function(str, styleStr) {
+			styleStr = JSSpec.util.sortStyleEntries(styleStr.strip()); // for Safari
+			if(styleStr.charAt(styleStr.length - 1) != ';') styleStr += ";"
+			
+			return 'style="' + styleStr + '"'
+		});
+		
+		// sort style entries
+		
+		// remove empty style attributes
+		html = html.replace(/ style=";"/mg, "");
+		
+		// remove new-lines
+		html = html.replace(/\r/mg, '');
+		html = html.replace(/\n/mg, '');
+			
+		return html;
+	}
+};
+
+
+JSSpec.DSL.describe = function(context, entries, base) {
+	if(base) {
+		for(var i = 0; i < JSSpec.specs.length; i++) {
+			if(JSSpec.specs[i].context === base) {
+				base = JSSpec.specs[i];
+				break;
+			}
+		}
+		
+		for(var i = 0; i < base.examples.length; i++) {
+			var example = base.examples[i];
+			
+			if(!entries[example.name]) entries[example.name] = example.target;
+		}
+	}
+	
+	JSSpec.specs.push(new JSSpec.Spec(context, entries));
+};
+
+JSSpec.DSL.value_of = function(target) {
+	if(JSSpec._secondPass) return {};
+	
+	var subject = new JSSpec.DSL.Subject(target);
+	return subject;
+};
+
+JSSpec.DSL.Subject = function(target) {
+	this.target = target;
+};
+
+JSSpec.DSL.Subject.prototype._type = 'Subject';
+
+JSSpec.DSL.Subject.prototype.should_fail = function(message) {
+	JSSpec._assertionFailure = {message:message};
+	throw JSSpec._assertionFailure;
+};
+
+JSSpec.DSL.Subject.prototype.should_be = function(expected) {
+	var matcher = JSSpec.EqualityMatcher.createInstance(expected, this.target);
+	if(!matcher.matches()) {
+		JSSpec._assertionFailure = {message:matcher.explain()};
+		throw JSSpec._assertionFailure;
+	}
+};
+
+JSSpec.DSL.Subject.prototype.should_not_be = function(expected) {
+	// TODO JSSpec.EqualityMatcher should support 'condition'
+	var matcher = JSSpec.EqualityMatcher.createInstance(expected, this.target);
+	if(matcher.matches()) {
+		JSSpec._assertionFailure = {message:"'" + this.target + "' should not be '" + expected + "'"};
+		throw JSSpec._assertionFailure;
+	}
+};
+
+JSSpec.DSL.Subject.prototype.should_be_empty = function() {
+	this.should_have(0, this.getType() == 'String' ? 'characters' : 'items');
+};
+
+JSSpec.DSL.Subject.prototype.should_not_be_empty = function() {
+	this.should_have_at_least(1, this.getType() == 'String' ? 'characters' : 'items');
+};
+
+JSSpec.DSL.Subject.prototype.should_be_true = function() {
+	this.should_be(true);
+};
+
+JSSpec.DSL.Subject.prototype.should_be_false = function() {
+	this.should_be(false);
+};
+
+JSSpec.DSL.Subject.prototype.should_be_null = function() {
+	this.should_be(null);
+};
+
+JSSpec.DSL.Subject.prototype.should_be_undefined = function() {
+	this.should_be(undefined);
+};
+
+JSSpec.DSL.Subject.prototype.should_not_be_null = function() {
+	this.should_not_be(null);
+};
+
+JSSpec.DSL.Subject.prototype.should_not_be_undefined = function() {
+	this.should_not_be(undefined);
+};
+
+JSSpec.DSL.Subject.prototype._should_have = function(num, property, condition) {
+	var matcher = JSSpec.PropertyLengthMatcher.createInstance(num, property, this.target, condition);
+	if(!matcher.matches()) {
+		JSSpec._assertionFailure = {message:matcher.explain()};
+		throw JSSpec._assertionFailure;
+	}
+};
+
+JSSpec.DSL.Subject.prototype.should_have = function(num, property) {
+	this._should_have(num, property, "exactly");
+};
+
+JSSpec.DSL.Subject.prototype.should_have_exactly = function(num, property) {
+	this._should_have(num, property, "exactly");
+};
+
+JSSpec.DSL.Subject.prototype.should_have_at_least = function(num, property) {
+	this._should_have(num, property, "at least");
+};
+
+JSSpec.DSL.Subject.prototype.should_have_at_most = function(num, property) {
+	this._should_have(num, property, "at most");
+};
+
+JSSpec.DSL.Subject.prototype.should_include = function(expected) {
+	var matcher = JSSpec.IncludeMatcher.createInstance(this.target, expected, true);
+	if(!matcher.matches()) {
+		JSSpec._assertionFailure = {message:matcher.explain()};
+		throw JSSpec._assertionFailure;
+	}
+};
+
+JSSpec.DSL.Subject.prototype.should_not_include = function(expected) {
+	var matcher = JSSpec.IncludeMatcher.createInstance(this.target, expected, false);
+	if(!matcher.matches()) {
+		JSSpec._assertionFailure = {message:matcher.explain()};
+		throw JSSpec._assertionFailure;
+	}
+};
+
+JSSpec.DSL.Subject.prototype.should_match = function(pattern) {
+	var matcher = JSSpec.PatternMatcher.createInstance(this.target, pattern, true);
+	if(!matcher.matches()) {
+		JSSpec._assertionFailure = {message:matcher.explain()};
+		throw JSSpec._assertionFailure;
+	}
+}
+JSSpec.DSL.Subject.prototype.should_not_match = function(pattern) {
+	var matcher = JSSpec.PatternMatcher.createInstance(this.target, pattern, false);
+	if(!matcher.matches()) {
+		JSSpec._assertionFailure = {message:matcher.explain()};
+		throw JSSpec._assertionFailure;
+	}
+};
+
+JSSpec.DSL.Subject.prototype.getType = function() {
+	if(typeof this.target == 'undefined') {
+		return 'undefined';
+	} else if(this.target == null) {
+		return 'null';
+	} else if(this.target._type) {
+		return this.target._type;
+	} else if(JSSpec.util.isDomNode(this.target)) {
+		return 'DomNode';
+	} else {
+		return 'object';
+	}
+};
+
+/**
+ * Utilities
+ */
+JSSpec.util = {
+	escapeTags: function(string) {
+		return string.replace(/</img, '&lt;').replace(/>/img, '&gt;');
+	},
+	escapeMetastring: function(string) {
+		return string.replace(/\r/img, '\\r').replace(/\n/img, '\\n').replace(/\&para\;\<BR\>/img, '\\n').replace(/\t/img, '\\t');
+	},
+	parseOptions: function(defaults) {
+		var options = defaults;
+		
+		var url = location.href;
+		var queryIndex = url.indexOf('?');
+		if(queryIndex == -1) return options;
+		
+		var query = url.substring(queryIndex + 1).split('#')[0];
+		var pairs = query.split('&');
+		for(var i = 0; i < pairs.length; i++) {
+			var tokens = pairs[i].split('=');
+			options[tokens[0]] = tokens[1];
+		}
+		
+		return options;
+	},
+	correctHtmlAttrQuotation: function(html) {
+		html = html.replace(/(\w+)=['"]([^'"]+)['"]/mg,function (str, name, value) {return name + '=' + '"' + value + '"';});
+		html = html.replace(/(\w+)=([^ '"]+)/mg,function (str, name, value) {return name + '=' + '"' + value + '"';});
+		html = html.replace(/'/mg, '"');
+		
+		return html;
+	},
+	sortHtmlAttrs: function(html) {
+		var attrs = [];
+		html.replace(/((\w+)="[^"]+")/mg, function(str, matched) {
+			attrs.push(matched);
+		});
+		return attrs.length == 0 ? "" : " " + attrs.sort().join(" ");
+	},
+	sortStyleEntries: function(styleText) {
+		var entries = styleText.split(/; /);
+		return entries.sort().join("; ");
+	},
+	escapeHtml: function(str) {
+		if(!this._div) {
+			this._div = document.createElement("DIV");
+			this._text = document.createTextNode('');
+			this._div.appendChild(this._text);
+		}
+		this._text.data = str;
+		return this._div.innerHTML;
+	},
+	isDomNode: function(o) {
+		// TODO: make it more stricter
+		return (typeof o.nodeName == 'string') && (typeof o.nodeType == 'number');
+	},
+	inspectDomPath: function(o) {
+		var sb = [];
+		while(o && o.nodeName != '#document' && o.parent) {
+			var siblings = o.parentNode.childNodes;
+			for(var i = 0; i < siblings.length; i++) {
+				if(siblings[i] == o) {
+					sb.push(o.nodeName + (i == 0 ? '' : '[' + i + ']'));
+					break;
+				}
+			}
+			o = o.parentNode;
+		}
+		return sb.join(" &gt; ");
+	},
+	inspectDomNode: function(o) {
+		if(o.nodeType == 1) {
+			var nodeName = o.nodeName.toLowerCase();
+			var sb = [];
+			sb.push('<span class="dom_value">');
+			sb.push("&lt;");
+			sb.push(nodeName);
+			
+			var attrs = o.attributes;
+			for(var i = 0; i < attrs.length; i++) {
+				if(
+					attrs[i].nodeValue &&
+					attrs[i].nodeName != 'contentEditable' &&
+					attrs[i].nodeName != 'style' &&
+					typeof attrs[i].nodeValue != 'function'
+				) sb.push(' <span class="dom_attr_name">' + attrs[i].nodeName.toLowerCase() + '</span>=<span class="dom_attr_value">"' + attrs[i].nodeValue + '"</span>');
+			}
+			if(o.style && o.style.cssText) {
+				sb.push(' <span class="dom_attr_name">style</span>=<span class="dom_attr_value">"' + o.style.cssText + '"</span>');
+			}
+			sb.push('&gt;');
+			sb.push(JSSpec.util.escapeHtml(o.innerHTML));
+			sb.push('&lt;/' + nodeName + '&gt;');
+			sb.push(' <span class="dom_path">(' + JSSpec.util.inspectDomPath(o) + ')</span>' );
+			sb.push('</span>');
+			return sb.join("");
+		} else if(o.nodeType == 3) {
+			return '<span class="dom_value">#text ' + o.nodeValue + '</span>';
+		} else {
+			return '<span class="dom_value">UnknownDomNode</span>';
+		}
+	},
+	inspect: function(o, dontEscape, emphasisKey) {
+		var sb, inspected;
+
+		if(typeof o == 'undefined') return '<span class="undefined_value">undefined</span>';
+		if(o == null) return '<span class="null_value">null</span>';
+		if(o._type == 'String') return '<span class="string_value">"' + (dontEscape ? JSSpec.util.escapeMetastring(o) : JSSpec.util.escapeHtml(JSSpec.util.escapeMetastring(o))) + '"</span>';
+
+		if(o._type == 'Date') {
+			return '<span class="date_value">"' + o.toString() + '"</span>';
+		}
+		
+		if(o._type == 'Number') return '<span class="number_value">' + (dontEscape ? o : JSSpec.util.escapeHtml(o)) + '</span>';
+		
+		if(o._type == 'Boolean') return '<span class="boolean_value">' + o + '</span>';
+
+		if(o._type == 'RegExp') return '<span class="regexp_value">' + JSSpec.util.escapeHtml(o.toString()) + '</span>';
+
+		if(JSSpec.util.isDomNode(o)) return JSSpec.util.inspectDomNode(o);
+
+		if(o._type == 'Array' || typeof o.length != 'undefined') {
+			sb = [];
+			for(var i = 0; i < o.length; i++) {
+				inspected = JSSpec.util.inspect(o[i]);
+				sb.push(i == emphasisKey ? ('<strong>' + inspected + '</strong>') : inspected);
+			}
+			return '<span class="array_value">[' + sb.join(', ') + ']</span>';
+		}
+		
+		// object
+		sb = [];
+		for(var key in o) {
+			if(key == 'should') continue;
+			
+			inspected = JSSpec.util.inspect(key) + ":" + JSSpec.util.inspect(o[key]);
+			sb.push(key == emphasisKey ? ('<strong>' + inspected + '</strong>') : inspected);
+		}
+		return '<span class="object_value">{' + sb.join(', ') + '}</span>';
+	}
+};
+
+describe = JSSpec.DSL.describe;
+behavior_of = JSSpec.DSL.describe;
+value_of = JSSpec.DSL.value_of;
+expect = JSSpec.DSL.value_of; // @deprecated
+
+String.prototype._type = "String";
+Number.prototype._type = "Number";
+Date.prototype._type = "Date";
+Array.prototype._type = "Array";
+Boolean.prototype._type = "Boolean";
+RegExp.prototype._type = "RegExp";
+
+var targets = [Array.prototype, Date.prototype, Number.prototype, String.prototype, Boolean.prototype, RegExp.prototype];
+
+String.prototype.normalizeHtml = JSSpec.DSL.forString.normalizeHtml;
+String.prototype.asHtml = String.prototype.normalizeHtml; //@deprecated
+String.prototype.strip = function() {return this.replace(/^\s+/, '').replace(/\s+$/, '');}
+
+
+/**
+ * Main
+ */
+JSSpec.defaultOptions = {
+	autorun: 1,
+	specIdBeginsWith: 0,
+	exampleIdBeginsWith: 0,
+	autocollapse: 1
+};
+JSSpec.options = JSSpec.util.parseOptions(JSSpec.defaultOptions);
+
+JSSpec.Spec.id = JSSpec.options.specIdBeginsWith;
+JSSpec.Example.id = JSSpec.options.exampleIdBeginsWith;
+
+
+
+window.onload = function() {
+	if(JSSpec.specs.length > 0) {
+		if(!JSSpec.options.inSuite) {
+			JSSpec.runner = new JSSpec.Runner(JSSpec.specs, new JSSpec.Logger());
+			if(JSSpec.options.rerun) {
+				JSSpec.runner.rerun(decodeURIComponent(JSSpec.options.rerun));
+			} else {
+				JSSpec.runner.run();
+			}
+		} else {
+			// in suite, send all specs to parent
+			var parentWindow = window.frames.parent.window;
+			for(var i = 0; i < JSSpec.specs.length; i++) {
+				parentWindow.JSSpec.specs.push(JSSpec.specs[i]);
+			}
+		}
+	} else {
+		var links = document.getElementById('list').getElementsByTagName('A');
+		var frameContainer = document.createElement('DIV');
+		frameContainer.style.display = 'none';
+		document.body.appendChild(frameContainer);
+		
+		for(var i = 0; i < links.length; i++) {
+			var frame = document.createElement('IFRAME');
+			frame.src = links[i].href + '?inSuite=0&specIdBeginsWith=' + (i * 10000) + '&exampleIdBeginsWith=' + (i * 10000);
+			frameContainer.appendChild(frame);
+		}
+	}
 }
\ No newline at end of file
diff --git a/common/js/unittest/JSSpec/demo.html b/common/js/unittest/JSSpec/demo.html
index 21a097111..e992e39bd 100644
--- a/common/js/unittest/JSSpec/demo.html
+++ b/common/js/unittest/JSSpec/demo.html
@@ -1,210 +1,210 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-<title>JSSpec results</title>
-<link rel="stylesheet" type="text/css" href="../css/JSSpec.css" />
-<script type="text/javascript" src="diff_match_patch.js"></script>
-<script type="text/javascript" src="JSSpec.js"></script>
-<script type="text/javascript">// <![CDATA[
-describe('Foo (base)', {
-	'before': function() {
-		target = {sayFoo: function() {return "foo";}};
-	},
-	'should say "foo"': function() {
-		value_of(target.sayFoo()).should_be("foo");
-	}
-})
-
-describe('Boo (derived)', {
-	'before': function() {
-		target = {
-			sayFoo: function() {return "foo";},
-			sayBar: function() {return "bar";}
-		};
-	},
-	'should also say "bar"': function() {
-		value_of(target.sayBar()).should_be("bar");
-	}
-}, 'Foo (base)')
-
-describe('Plus operator (just for example)', {
-	'should concatenate two strings': function() {
-		value_of("Hello " + "World").should_be("Hello World");
-	},
-	'should add two numbers': function() {
-		value_of(1 + 2).should_be(3);
-	}
-})
-
-describe('"Should match"s', {
-	'Should match': function() {
-		value_of("Hello").should_match(/ell/);
-	},
-	'Should match 1': function() {
-		value_of("Hello").should_match(/x/);
-	},
-	'Should match 2': function() {
-		value_of([1,2,3]).should_match(/x/);
-	},
-	'Should not match 1': function() {
-		value_of("Hello").should_not_match(/ell/);
-	},
-	'Should not match 2': function() {
-		value_of([1,2,3]).should_not_match(/x/);
-	}
-})
-describe('"Should include"s', {
-	'Should include': function() {
-		value_of([1,2,3]).should_include(4);
-	},
-	'Should not include': function() {
-		value_of([1,2,3]).should_not_include(2);
-	},
-	'Should include / Non-array object': function() {
-		value_of(new Date()).should_include(4);
-	},
-	'Should not include / Non-array object': function() {
-		value_of(new Date()).should_not_include('getMonth');
-	},
-	'Should include 2': function() {
-		value_of({a:1, b:2}).should_not_include('a');
-	}
-})
-
-describe('"Should have"s', {
-	'String length': function() {
-		value_of("Hello").should_have(4, "characters");
-	},
-	'Array length': function() {
-		value_of([1,2,3]).should_have(4, "items");
-	},
-	'Object\'s item length': function() {
-		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
-	},
-	'No match': function() {
-		value_of("This is a string").should_have(5, "players");
-	},
-	'Exactly': function() {
-		value_of([1,2,3]).should_have_exactly(2, "items");
-	},
-	'At least': function() {
-		value_of([1,2,3]).should_have_at_least(4, "items");
-	},
-	'At most': function() {
-		value_of([1,2,3]).should_have_at_most(2, "items");
-	},
-	'Member': function() {
-		value_of({x: 0}).should_have_member('x'); // true
-		value_of({x: 0}).should_have_member('y'); // false
-	}
-})
-describe('"Should be empty"s', {
-	'String': function() {
-		value_of("Hello").should_be_empty();
-	},
-	'Array': function() {
-		value_of([1,2,3]).should_be_empty();
-	},
-	'Object\'s item': function() {
-		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(0, "accounts");
-	}
-})
-
-describe('Failure messages', {
-	'Should be (String)': function() {
-		value_of("Hello World").should_be("Good-bye world");
-	},
-	'Should have (Object\s item)': function() {
-		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
-	},
-	'Should have at least': function() {
-		value_of([1,2,3]).should_have_at_least(4, "items");
-	},
-	'Should include': function() {
-		value_of([1,2,3]).should_include(4);
-	},
-	'Should match': function() {
-		value_of("Hello").should_match(/bye/);
-	}
-})
-
-describe('"Should be"s', {
-	'String mismatch': function() {
-		value_of("Hello world").should_be("Good-bye world");
-	},
-	'Array item mismatch': function() {
-		value_of(['ab','cd','ef']).should_be(['ab','bd','ef']);
-	},
-	'Array length mismatch': function() {
-		value_of(['a',2,'4',5]).should_be([1,2,[4,5,6],6,7]);
-	},
-	'Undefined value': function() {
-		value_of("Test").should_be(undefined);
-	},
-	'Null value': function() {
-		value_of(null).should_be("Test");
-	},
-	'Boolean value 1': function() {
-		value_of(true).should_be(false);
-	},
-	'Boolean value 2': function() {
-		value_of(false).should_be_true();
-	},
-	'Boolean value 3': function() {
-		value_of(true).should_be_false();
-	},
-	'Number mismatch': function() {
-		value_of(1+2).should_be(4);
-	},
-	'Date mismatch': function() {
-		value_of(new Date(1979, 3, 27)).should_be(new Date(1976, 7, 23));
-	},
-	'Object mismatch 1': function() {
-		var actual = {a:1, b:2};
-		var expected = {a:1, b:2, d:3};
-		
-		value_of(actual).should_be(expected);
-	},
-	'Object mismatch 2': function() {
-		var actual = {a:1, b:2, c:3, d:4};
-		var expected = {a:1, b:2, c:3};
-		
-		value_of(actual).should_be(expected);
-	},
-	'Object mismatch 3': function() {
-		var actual = {a:1, b:4, c:3};
-		var expected = {a:1, b:2, c:3};
-		
-		value_of(actual).should_be(expected);
-	},
-	'null should be null': function() {
-		value_of(null).should_be(null);
-	},
-	'null should not be undefined': function() {
-		value_of(null).should_be(undefined);
-	},
-	'null should not be null': function() {
-		value_of(null).should_not_be(null);
-	},
-	'empty array 1': function() {
-		value_of([]).should_be_empty();
-		value_of([1]).should_be_empty();
-	},
-	'empty array 2': function() {
-		value_of([1]).should_not_be_empty();
-		value_of([]).should_not_be_empty();
-	}
-})
-
-describe('Equality operator', {
-	'should work for different Date instances which have same value': function() {
-		var date1 = new Date(1979, 03, 27);
-		var date2 = new Date(1979, 03, 27);
-		value_of(date1).should_be(date2);
-	}
-})
-// ]]></script>
-</head>
-<body><div style="display:none;"><p>A</p><p>B</p></div></body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+<title>JSSpec results</title>
+<link rel="stylesheet" type="text/css" href="../css/JSSpec.css" />
+<script type="text/javascript" src="diff_match_patch.js"></script>
+<script type="text/javascript" src="JSSpec.js"></script>
+<script type="text/javascript">// <![CDATA[
+describe('Foo (base)', {
+	'before': function() {
+		target = {sayFoo: function() {return "foo";}};
+	},
+	'should say "foo"': function() {
+		value_of(target.sayFoo()).should_be("foo");
+	}
+})
+
+describe('Boo (derived)', {
+	'before': function() {
+		target = {
+			sayFoo: function() {return "foo";},
+			sayBar: function() {return "bar";}
+		};
+	},
+	'should also say "bar"': function() {
+		value_of(target.sayBar()).should_be("bar");
+	}
+}, 'Foo (base)')
+
+describe('Plus operator (just for example)', {
+	'should concatenate two strings': function() {
+		value_of("Hello " + "World").should_be("Hello World");
+	},
+	'should add two numbers': function() {
+		value_of(1 + 2).should_be(3);
+	}
+})
+
+describe('"Should match"s', {
+	'Should match': function() {
+		value_of("Hello").should_match(/ell/);
+	},
+	'Should match 1': function() {
+		value_of("Hello").should_match(/x/);
+	},
+	'Should match 2': function() {
+		value_of([1,2,3]).should_match(/x/);
+	},
+	'Should not match 1': function() {
+		value_of("Hello").should_not_match(/ell/);
+	},
+	'Should not match 2': function() {
+		value_of([1,2,3]).should_not_match(/x/);
+	}
+})
+describe('"Should include"s', {
+	'Should include': function() {
+		value_of([1,2,3]).should_include(4);
+	},
+	'Should not include': function() {
+		value_of([1,2,3]).should_not_include(2);
+	},
+	'Should include / Non-array object': function() {
+		value_of(new Date()).should_include(4);
+	},
+	'Should not include / Non-array object': function() {
+		value_of(new Date()).should_not_include('getMonth');
+	},
+	'Should include 2': function() {
+		value_of({a:1, b:2}).should_not_include('a');
+	}
+})
+
+describe('"Should have"s', {
+	'String length': function() {
+		value_of("Hello").should_have(4, "characters");
+	},
+	'Array length': function() {
+		value_of([1,2,3]).should_have(4, "items");
+	},
+	'Object\'s item length': function() {
+		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
+	},
+	'No match': function() {
+		value_of("This is a string").should_have(5, "players");
+	},
+	'Exactly': function() {
+		value_of([1,2,3]).should_have_exactly(2, "items");
+	},
+	'At least': function() {
+		value_of([1,2,3]).should_have_at_least(4, "items");
+	},
+	'At most': function() {
+		value_of([1,2,3]).should_have_at_most(2, "items");
+	},
+	'Member': function() {
+		value_of({x: 0}).should_have_member('x'); // true
+		value_of({x: 0}).should_have_member('y'); // false
+	}
+})
+describe('"Should be empty"s', {
+	'String': function() {
+		value_of("Hello").should_be_empty();
+	},
+	'Array': function() {
+		value_of([1,2,3]).should_be_empty();
+	},
+	'Object\'s item': function() {
+		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(0, "accounts");
+	}
+})
+
+describe('Failure messages', {
+	'Should be (String)': function() {
+		value_of("Hello World").should_be("Good-bye world");
+	},
+	'Should have (Object\s item)': function() {
+		value_of({name:'Alan Kang', email:'jania902@gmail.com', accounts:['A', 'B']}).should_have(3, "accounts");
+	},
+	'Should have at least': function() {
+		value_of([1,2,3]).should_have_at_least(4, "items");
+	},
+	'Should include': function() {
+		value_of([1,2,3]).should_include(4);
+	},
+	'Should match': function() {
+		value_of("Hello").should_match(/bye/);
+	}
+})
+
+describe('"Should be"s', {
+	'String mismatch': function() {
+		value_of("Hello world").should_be("Good-bye world");
+	},
+	'Array item mismatch': function() {
+		value_of(['ab','cd','ef']).should_be(['ab','bd','ef']);
+	},
+	'Array length mismatch': function() {
+		value_of(['a',2,'4',5]).should_be([1,2,[4,5,6],6,7]);
+	},
+	'Undefined value': function() {
+		value_of("Test").should_be(undefined);
+	},
+	'Null value': function() {
+		value_of(null).should_be("Test");
+	},
+	'Boolean value 1': function() {
+		value_of(true).should_be(false);
+	},
+	'Boolean value 2': function() {
+		value_of(false).should_be_true();
+	},
+	'Boolean value 3': function() {
+		value_of(true).should_be_false();
+	},
+	'Number mismatch': function() {
+		value_of(1+2).should_be(4);
+	},
+	'Date mismatch': function() {
+		value_of(new Date(1979, 3, 27)).should_be(new Date(1976, 7, 23));
+	},
+	'Object mismatch 1': function() {
+		var actual = {a:1, b:2};
+		var expected = {a:1, b:2, d:3};
+		
+		value_of(actual).should_be(expected);
+	},
+	'Object mismatch 2': function() {
+		var actual = {a:1, b:2, c:3, d:4};
+		var expected = {a:1, b:2, c:3};
+		
+		value_of(actual).should_be(expected);
+	},
+	'Object mismatch 3': function() {
+		var actual = {a:1, b:4, c:3};
+		var expected = {a:1, b:2, c:3};
+		
+		value_of(actual).should_be(expected);
+	},
+	'null should be null': function() {
+		value_of(null).should_be(null);
+	},
+	'null should not be undefined': function() {
+		value_of(null).should_be(undefined);
+	},
+	'null should not be null': function() {
+		value_of(null).should_not_be(null);
+	},
+	'empty array 1': function() {
+		value_of([]).should_be_empty();
+		value_of([1]).should_be_empty();
+	},
+	'empty array 2': function() {
+		value_of([1]).should_not_be_empty();
+		value_of([]).should_not_be_empty();
+	}
+})
+
+describe('Equality operator', {
+	'should work for different Date instances which have same value': function() {
+		var date1 = new Date(1979, 03, 27);
+		var date2 = new Date(1979, 03, 27);
+		value_of(date1).should_be(date2);
+	}
+})
+// ]]></script>
+</head>
+<body><div style="display:none;"><p>A</p><p>B</p></div></body>
+</html>
diff --git a/common/js/unittest/css/JSSpec.css b/common/js/unittest/css/JSSpec.css
index b03804ba9..0eac8183a 100644
--- a/common/js/unittest/css/JSSpec.css
+++ b/common/js/unittest/css/JSSpec.css
@@ -1,224 +1,224 @@
-@CHARSET "UTF-8";
-
-/* --------------------
- * @Layout
- */
-
-html {
-  overflow: hidden;
-}
-
-body, #jsspec_container {
-  overflow: hidden;
-  padding: 0;
-  margin: 0;
-  width: 100%;
-  height: 100%;
-  background-color: white;
-}
-
-#title {
-  padding: 0;
-  margin: 0;
-  position: absolute;
-  top: 0px;    
-  left: 0px;
-  width: 100%;
-  height: 40px;
-  overflow: hidden;
-}
-
-#list {
-  padding: 0;
-  margin: 0;
-  position: absolute;    
-  top: 40px;
-  left: 0px;
-  bottom: 0px;
-  overflow: auto;    
-  width: 250px;    
-  _height:expression(document.body.clientHeight-40);
-}
-
-#log {
-  padding: 0;
-  margin: 0;
-  position: absolute;    
-  top: 40px;
-  left: 250px;
-  right: 0px;
-  bottom: 0px;
-  overflow: auto;
-  _height:expression(document.body.clientHeight-40);
-  _width:expression(document.body.clientWidth-250);
-}
-
-
-
-/* --------------------
- * @Decorations and colors
- */
-* {
-	padding: 0;
-	margin: 0;
-	font-family: "Lucida Grande", Helvetica, sans-serif;
-}
-
-li {
-	list-style: none;
-}
-
-/* hiding subtitles */
-h2 {
-	display: none;
-}
-
-/* title section */
-div#title {
-	padding: 0em 0.5em;
-}
-
-div#title h1 {
-	font-size: 1.5em;
-	float: left;
-}
-
-div#title ul li {
-	float: left;
-	padding: 0.5em 0em 0.5em 0.75em;
-}
-
-div#title p {
-	float:right;
-	margin-right:1em;
-	font-size: 0.75em;
-}
-
-/* spec container */
-ul.specs {
-	margin: 0.5em;
-}
-ul.specs li {
-	margin-bottom: 0.1em;
-}
-
-/* spec title */
-ul.specs li h3 {
-	font-weight: bold;
-	font-size: 0.75em;
-	padding: 0.2em 1em;
-	cursor: pointer;
-	_cursor: hand;
-}
-
-/* example container */
-ul.examples li {
-	border-style: solid;
-	border-width: 0px 0px 1px 5px;
-	margin: 0.2em 0em 0.2em 1em;
-}
-
-/* example title */
-ul.examples li h4 {
-	font-weight: normal;
-	font-size: 0.75em;
-	margin-left: 1em;
-}
-
-pre.examples-code {
-	margin: 0.5em 2em;
-    padding: 0.5em;
-    background: white;
-    border: solid 1px #CCC;
-}
-
-/* example explaination */
-ul.examples li div {
-	padding: 1em 2em;
-	font-size: 0.75em;
-}
-
-/* styles for ongoing, success, failure, error */
-div.success, div.success a {
-	color: #FFFFFF;
-	background-color: #65C400;
-}
-
-ul.specs li.success h3, ul.specs li.success h3 a {
-	color: #FFFFFF;
-	background-color: #65C400;
-}
-
-ul.examples li.success, ul.examples li.success a {
-	color: #3D7700;
-	background-color: #DBFFB4;
-	border-color: #65C400;
-}
-
-div.exception, div.exception a {
-	color: #FFFFFF;
-	background-color: #C20000;
-}
-
-ul.specs li.exception h3, ul.specs li.exception h3 a {
-	color: #FFFFFF;
-	background-color: #C20000;
-}
-
-ul.examples li.exception, ul.examples li.exception a {
-	color: #C20000;
-	background-color: #FFFBD3;
-	border-color: #C20000;
-}
-
-div.ongoing, div.ongoing a {
-	color: #000000;
-	background-color: #FFFF80;
-}
-
-ul.specs li.ongoing h3, ul.specs li.ongoing h3 a {
-	color: #000000;
-	background-color: #FFFF80;
-}
-
-ul.examples li.ongoing, ul.examples li.ongoing a {
-	color: #000000;
-	background-color: #FFFF80;
-	border-color: #DDDD00;
-}
-
-
-
-/* --------------------
- * values
- */
-.number_value, .string_value, .regexp_value, .boolean_value, .dom_value {
-	font-family: monospace;
-	color: blue;
-}
-.object_value, .array_value {
-	line-height: 2em;
-	padding: 0.1em 0.2em;
-	margin: 0.1em 0;
-}
-.date_value {
-	font-family: monospace;
-	color: olive;
-}
-.undefined_value, .null_value {
-	font-style: italic;
-	color: blue;
-}
-.dom_attr_name {
-}
-.dom_attr_value {
-	color: red;
-}
-.dom_path {
-	font-size: 0.75em;
-	color: gray;
-}
-strong {
-	font-weight: normal;
-	background-color: #FFC6C6;
+@CHARSET "UTF-8";
+
+/* --------------------
+ * @Layout
+ */
+
+html {
+  overflow: hidden;
+}
+
+body, #jsspec_container {
+  overflow: hidden;
+  padding: 0;
+  margin: 0;
+  width: 100%;
+  height: 100%;
+  background-color: white;
+}
+
+#title {
+  padding: 0;
+  margin: 0;
+  position: absolute;
+  top: 0px;    
+  left: 0px;
+  width: 100%;
+  height: 40px;
+  overflow: hidden;
+}
+
+#list {
+  padding: 0;
+  margin: 0;
+  position: absolute;    
+  top: 40px;
+  left: 0px;
+  bottom: 0px;
+  overflow: auto;    
+  width: 250px;    
+  _height:expression(document.body.clientHeight-40);
+}
+
+#log {
+  padding: 0;
+  margin: 0;
+  position: absolute;    
+  top: 40px;
+  left: 250px;
+  right: 0px;
+  bottom: 0px;
+  overflow: auto;
+  _height:expression(document.body.clientHeight-40);
+  _width:expression(document.body.clientWidth-250);
+}
+
+
+
+/* --------------------
+ * @Decorations and colors
+ */
+* {
+	padding: 0;
+	margin: 0;
+	font-family: "Lucida Grande", Helvetica, sans-serif;
+}
+
+li {
+	list-style: none;
+}
+
+/* hiding subtitles */
+h2 {
+	display: none;
+}
+
+/* title section */
+div#title {
+	padding: 0em 0.5em;
+}
+
+div#title h1 {
+	font-size: 1.5em;
+	float: left;
+}
+
+div#title ul li {
+	float: left;
+	padding: 0.5em 0em 0.5em 0.75em;
+}
+
+div#title p {
+	float:right;
+	margin-right:1em;
+	font-size: 0.75em;
+}
+
+/* spec container */
+ul.specs {
+	margin: 0.5em;
+}
+ul.specs li {
+	margin-bottom: 0.1em;
+}
+
+/* spec title */
+ul.specs li h3 {
+	font-weight: bold;
+	font-size: 0.75em;
+	padding: 0.2em 1em;
+	cursor: pointer;
+	_cursor: hand;
+}
+
+/* example container */
+ul.examples li {
+	border-style: solid;
+	border-width: 0px 0px 1px 5px;
+	margin: 0.2em 0em 0.2em 1em;
+}
+
+/* example title */
+ul.examples li h4 {
+	font-weight: normal;
+	font-size: 0.75em;
+	margin-left: 1em;
+}
+
+pre.examples-code {
+	margin: 0.5em 2em;
+    padding: 0.5em;
+    background: white;
+    border: solid 1px #CCC;
+}
+
+/* example explaination */
+ul.examples li div {
+	padding: 1em 2em;
+	font-size: 0.75em;
+}
+
+/* styles for ongoing, success, failure, error */
+div.success, div.success a {
+	color: #FFFFFF;
+	background-color: #65C400;
+}
+
+ul.specs li.success h3, ul.specs li.success h3 a {
+	color: #FFFFFF;
+	background-color: #65C400;
+}
+
+ul.examples li.success, ul.examples li.success a {
+	color: #3D7700;
+	background-color: #DBFFB4;
+	border-color: #65C400;
+}
+
+div.exception, div.exception a {
+	color: #FFFFFF;
+	background-color: #C20000;
+}
+
+ul.specs li.exception h3, ul.specs li.exception h3 a {
+	color: #FFFFFF;
+	background-color: #C20000;
+}
+
+ul.examples li.exception, ul.examples li.exception a {
+	color: #C20000;
+	background-color: #FFFBD3;
+	border-color: #C20000;
+}
+
+div.ongoing, div.ongoing a {
+	color: #000000;
+	background-color: #FFFF80;
+}
+
+ul.specs li.ongoing h3, ul.specs li.ongoing h3 a {
+	color: #000000;
+	background-color: #FFFF80;
+}
+
+ul.examples li.ongoing, ul.examples li.ongoing a {
+	color: #000000;
+	background-color: #FFFF80;
+	border-color: #DDDD00;
+}
+
+
+
+/* --------------------
+ * values
+ */
+.number_value, .string_value, .regexp_value, .boolean_value, .dom_value {
+	font-family: monospace;
+	color: blue;
+}
+.object_value, .array_value {
+	line-height: 2em;
+	padding: 0.1em 0.2em;
+	margin: 0.1em 0;
+}
+.date_value {
+	font-family: monospace;
+	color: olive;
+}
+.undefined_value, .null_value {
+	font-style: italic;
+	color: blue;
+}
+.dom_attr_name {
+}
+.dom_attr_value {
+	color: red;
+}
+.dom_path {
+	font-size: 0.75em;
+	color: gray;
+}
+strong {
+	font-weight: normal;
+	background-color: #FFC6C6;
 }
\ No newline at end of file
diff --git a/common/js/unittest/unittest_common.html b/common/js/unittest/unittest_common.html
index c2b27eb69..f073a9c8f 100644
--- a/common/js/unittest/unittest_common.html
+++ b/common/js/unittest/unittest_common.html
@@ -1,74 +1,74 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
-<head>
-<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
-<title>JSSpec results</title>
-<link rel="stylesheet" type="text/css" href="css/JSSpec.css" />
-<script type="text/javascript" src="JSSpec/JSSpec.js"></script>
-<script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
-<script type="text/javascript" src="../jquery.js"></script>
-<script type="text/javascript" src="../common.js"></script>
-<script type="text/javascript">// <![CDATA[
-describe('SetQuery', {
-    'should satisfy basic uri condition' : function() {
-        target = "http://xpressengine.com/";
-        value_of(target.setQuery("q","r")).should_be("http://xpressengine.com/?q=r");
-    },
-    'should work when ssl is on' : function() {
-        target = "http://xpressengine.com/";
-        ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
-    },
-    'should work when ssl is on and https_port is set (not 443)' : function() {
-        target = "http://xpressengine.com/";
-        https_port = 445;
-        ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/?act=dispLogin");
-    },
-    'should work when ssl is on and https_port is set as 443' : function() {
-        target = "http://xpressengine.com/";
-        https_port = 443;
-        ssl_actions = new Array("dispLogin");
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
-    },
-    'should replace https to http if act is not a member of ssl_actions': function() {
-        targets = "https://xpressengine.com/";
-        ssl_actions = new Array("dispLogin");
-        value_of(targets.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?act=dispLogin2");
-    },
-    'should remove https port' : function() {
-        targetsp = "https://xpressengine.com:443/?q=r";
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?q=r&act=dispLogin2");
-    },
-    'should remove https port and add http port if http port is defined' : function() {
-        targetsp = "https://xpressengine.com:443/?q=r";
-        http_port = 8000;
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com:8000/?q=r&act=dispLogin2");
-    },
-    'should only remove https port and if http port is defined as 80' : function() {
-        targetsp = "https://xpressengine.com:443/?q=r";
-        http_port = 80;
-        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?q=r&act=dispLogin2");
-    },
-    'should work if enforce_ssl is set' : function() {
-        target = "http://xpressengine.com/";
-        enforce_ssl = true;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
-    },
-    'should work if enforce_ssl is set with 443 port' : function() {
-        target = "http://xpressengine.com/";
-        enforce_ssl = true;
-        https_port = 443;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
-    },
-    'should work if enforce_ssl is set with none-443 port' : function() {
-        target = "http://xpressengine.com/";
-        enforce_ssl = true;
-        https_port = 445;
-        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/?act=dispLogin");
-    }
-})
-// ]]></script>
-</head>
-<body><div style="display:none;"><p>A</p><p>B</p></div></body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ko">
+<head>
+<meta http-equiv="Content-Type" content="text/html;charset=UTF-8" />
+<title>JSSpec results</title>
+<link rel="stylesheet" type="text/css" href="css/JSSpec.css" />
+<script type="text/javascript" src="JSSpec/JSSpec.js"></script>
+<script type="text/javascript" src="JSSpec/diff_match_patch.js"></script>
+<script type="text/javascript" src="../jquery.js"></script>
+<script type="text/javascript" src="../common.js"></script>
+<script type="text/javascript">// <![CDATA[
+describe('SetQuery', {
+    'should satisfy basic uri condition' : function() {
+        target = "http://xpressengine.com/";
+        value_of(target.setQuery("q","r")).should_be("http://xpressengine.com/?q=r");
+    },
+    'should work when ssl is on' : function() {
+        target = "http://xpressengine.com/";
+        ssl_actions = new Array("dispLogin");
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+    },
+    'should work when ssl is on and https_port is set (not 443)' : function() {
+        target = "http://xpressengine.com/";
+        https_port = 445;
+        ssl_actions = new Array("dispLogin");
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/?act=dispLogin");
+    },
+    'should work when ssl is on and https_port is set as 443' : function() {
+        target = "http://xpressengine.com/";
+        https_port = 443;
+        ssl_actions = new Array("dispLogin");
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+    },
+    'should replace https to http if act is not a member of ssl_actions': function() {
+        targets = "https://xpressengine.com/";
+        ssl_actions = new Array("dispLogin");
+        value_of(targets.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?act=dispLogin2");
+    },
+    'should remove https port' : function() {
+        targetsp = "https://xpressengine.com:443/?q=r";
+        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?q=r&act=dispLogin2");
+    },
+    'should remove https port and add http port if http port is defined' : function() {
+        targetsp = "https://xpressengine.com:443/?q=r";
+        http_port = 8000;
+        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com:8000/?q=r&act=dispLogin2");
+    },
+    'should only remove https port and if http port is defined as 80' : function() {
+        targetsp = "https://xpressengine.com:443/?q=r";
+        http_port = 80;
+        value_of(targetsp.setQuery("act","dispLogin2")).should_be("http://xpressengine.com/?q=r&act=dispLogin2");
+    },
+    'should work if enforce_ssl is set' : function() {
+        target = "http://xpressengine.com/";
+        enforce_ssl = true;
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+    },
+    'should work if enforce_ssl is set with 443 port' : function() {
+        target = "http://xpressengine.com/";
+        enforce_ssl = true;
+        https_port = 443;
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com/?act=dispLogin");
+    },
+    'should work if enforce_ssl is set with none-443 port' : function() {
+        target = "http://xpressengine.com/";
+        enforce_ssl = true;
+        https_port = 445;
+        value_of(target.setQuery("act","dispLogin")).should_be("https://xpressengine.com:445/?act=dispLogin");
+    }
+})
+// ]]></script>
+</head>
+<body><div style="display:none;"><p>A</p><p>B</p></div></body>
+</html>
diff --git a/common/js/x.js b/common/js/x.js
index 95d2ee04c..71fed6d3e 100644
--- a/common/js/x.js
+++ b/common/js/x.js
@@ -3,172 +3,674 @@
  * Distributed by GNU LGPL. For copyrights, license, documentation and more visit Cross-Browser.com 
  * Copyright 2001-2005 Michael Foster (Cross-Browser.com)
  **/
-function xDeprecate(funcName){var msg='DEPRECATED : '+funcName+'() is deprecated function.';if(typeof console=='object'&&typeof console.log=='function'){console.log(msg);}}
-var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xIE6,xNN4,xUA=navigator.userAgent.toLowerCase();if(window.opera){var i=xUA.indexOf('opera');if(i!=-1){var v=parseInt(xUA.charAt(i+6));xOp7Up=v>=7;xOp6Dn=v<7;}}
-else if(navigator.vendor!='KDE'&&document.all&&xUA.indexOf('msie')!=-1){xIE4Up=parseFloat(navigator.appVersion)>=4;xIE4=xUA.indexOf('msie 4')!=-1;xIE5=xUA.indexOf('msie 5')!=-1;xIE6=xUA.indexOf('msie 6')!=-1;}
+function xDeprecate(funcName) {
+	var msg = 'DEPRECATED : '+funcName+'() is deprecated function.';
+	if (typeof console == 'object' && typeof console.log == 'function') {
+		console.log(msg);
+	}
+}
+
+var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xIE6,xNN4,xUA=navigator.userAgent.toLowerCase();
+if(window.opera){
+  var i=xUA.indexOf('opera');
+  if(i!=-1){
+    var v=parseInt(xUA.charAt(i+6));
+    xOp7Up=v>=7;
+    xOp6Dn=v<7;
+  }
+}
+else if(navigator.vendor!='KDE' && document.all && xUA.indexOf('msie')!=-1){
+  xIE4Up=parseFloat(navigator.appVersion)>=4;
+  xIE4=xUA.indexOf('msie 4')!=-1;
+  xIE5=xUA.indexOf('msie 5')!=-1;
+  xIE6=xUA.indexOf('msie 6')!=-1;
+}
 else if(document.layers){xNN4=true;}
-var xMac=xUA.indexOf('mac')!=-1;var xFF=xUA.indexOf('firefox')!=-1;function xAddEventListener(e,eT,eL,cap)
-{xDeprecate('xAddEventListener');if(!(e=xGetElementById(e)))return;eT=eT.toLowerCase();if((!xIE4Up&&!xOp7Up)&&e==window){if(eT=='resize'){window.xPCW=xClientWidth();window.xPCH=xClientHeight();window.xREL=eL;xResizeEvent();return;}
-if(eT=='scroll'){window.xPSL=xScrollLeft();window.xPST=xScrollTop();window.xSEL=eL;xScrollEvent();return;}}
-var eh='e.on'+eT+'=eL';if(e.addEventListener)e.addEventListener(eT,eL,cap);else if(e.attachEvent)e.attachEvent('on'+eT,eL);else eval(eh);}
+var xMac=xUA.indexOf('mac')!=-1;
+var xFF=xUA.indexOf('firefox')!=-1;
+
+// (element, event(without 'on'), event listener(function name)[, caption])
+function xAddEventListener(e,eT,eL,cap)
+{
+  xDeprecate('xAddEventListener');
+  if(!(e=xGetElementById(e))) return;
+  eT=eT.toLowerCase();
+  if((!xIE4Up && !xOp7Up) && e==window) {
+    if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }
+    if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }
+  }
+  var eh='e.on'+eT+'=eL';
+  if(e.addEventListener) e.addEventListener(eT,eL,cap);
+  else if(e.attachEvent) e.attachEvent('on'+eT,eL);
+  else eval(eh);
+}
+// called only from the above
 function xResizeEvent()
-{xDeprecate('xResizeEvent');if(window.xREL)setTimeout('xResizeEvent()',250);var cw=xClientWidth(),ch=xClientHeight();if(window.xPCW!=cw||window.xPCH!=ch){window.xPCW=cw;window.xPCH=ch;if(window.xREL)window.xREL();}}
+{
+  xDeprecate('xResizeEvent');
+  if (window.xREL) setTimeout('xResizeEvent()', 250);
+  var cw = xClientWidth(), ch = xClientHeight();
+  if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }
+}
+
 function xScrollEvent()
-{xDeprecate('xScrollEvent');if(window.xSEL)setTimeout('xScrollEvent()',250);var sl=xScrollLeft(),st=xScrollTop();if(window.xPSL!=sl||window.xPST!=st){window.xPSL=sl;window.xPST=st;if(window.xSEL)window.xSEL();}}
-function xAppendChild(oParent,oChild)
-{xDeprecate('xAppendChild');if(oParent.appendChild)return oParent.appendChild(oChild);else return null;}
+{
+  xDeprecate('xScrollEvent');
+  if (window.xSEL) setTimeout('xScrollEvent()', 250);
+  var sl = xScrollLeft(), st = xScrollTop();
+  if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }
+}
+
+function xAppendChild(oParent, oChild)
+{
+  xDeprecate('xAppendChild');
+  if (oParent.appendChild) return oParent.appendChild(oChild);
+  else return null;
+}
+
 function xClientHeight()
-{xDeprecate('xClientHeight');var h=0;if(xOp6Dn)h=window.innerHeight;else if(document.compatMode=='CSS1Compat'&&!window.opera&&document.documentElement&&document.documentElement.clientHeight)
-h=document.documentElement.clientHeight;else if(document.body&&document.body.clientHeight)
-h=document.body.clientHeight;else if(xDef(window.innerWidth,window.innerHeight,document.width)){h=window.innerHeight;if(document.width>window.innerWidth)h-=16;}
-return h;}
+{
+  xDeprecate('xClientHeight');
+  var h=0;
+  if(xOp6Dn) h=window.innerHeight;
+  else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)
+    h=document.documentElement.clientHeight;
+  else if(document.body && document.body.clientHeight)
+    h=document.body.clientHeight;
+  else if(xDef(window.innerWidth,window.innerHeight,document.width)) {
+    h=window.innerHeight;
+    if(document.width>window.innerWidth) h-=16;
+  }
+  return h;
+}
+
 function xClientWidth()
-{xDeprecate('xClientWidth');var w=0;if(xOp6Dn)w=window.innerWidth;else if(document.compatMode=='CSS1Compat'&&!window.opera&&document.documentElement&&document.documentElement.clientWidth)
-w=document.documentElement.clientWidth;else if(document.body&&document.body.clientWidth)
-w=document.body.clientWidth;else if(xDef(window.innerWidth,window.innerHeight,document.height)){w=window.innerWidth;if(document.height>window.innerHeight)w-=16;}
-return w;}
+{
+  xDeprecate('xClientWidth');
+  var w=0;
+  if(xOp6Dn) w=window.innerWidth;
+  else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)
+    w=document.documentElement.clientWidth;
+  else if(document.body && document.body.clientWidth)
+    w=document.body.clientWidth;
+  else if(xDef(window.innerWidth,window.innerHeight,document.height)) {
+    w=window.innerWidth;
+    if(document.height>window.innerHeight) w-=16;
+  }
+  return w;
+}
+
 function xCreateElement(sTag)
-{xDeprecate('xCreateElement');if(document.createElement)return document.createElement(sTag);else return null;}
+{
+  xDeprecate('xCreateElement');
+  if (document.createElement) return document.createElement(sTag);
+  else return null;
+}
+
 function xDef()
-{xDeprecate('xDef');for(var i=0;i<arguments.length;++i){if(typeof(arguments[i])=='undefined')return false;}
-return true;}
-function xDeleteCookie(name,path)
-{xDeprecate('xDeleteCookie');if(xGetCookie(name)){document.cookie=name+"="+"; path="+((!path)?"/":path)+"; expires="+new Date(0).toGMTString();}}
+{
+  xDeprecate('xDef');
+  for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}
+  return true;
+}
+
+function xDeleteCookie(name, path)
+{
+  xDeprecate('xDeleteCookie');
+  if (xGetCookie(name)) {
+    document.cookie = name + "=" +
+                    "; path=" + ((!path) ? "/" : path) +
+                    "; expires=" + new Date(0).toGMTString();
+  }
+}
+
 function xDisplay(e,s)
-{xDeprecate('xDisplay');if(!(e=xGetElementById(e)))return null;if(e.style&&xDef(e.style.display)){if(xStr(s))e.style.display=s;return e.style.display;}
-return null;}
-function xEvent(evt)
-{xDeprecate('xEvent');var e=evt||window.event;if(!e)return;if(e.type)this.type=e.type;if(e.target)this.target=e.target;else if(e.srcElement)this.target=e.srcElement;if(e.relatedTarget)this.relatedTarget=e.relatedTarget;else if(e.type=='mouseover'&&e.fromElement)this.relatedTarget=e.fromElement;else if(e.type=='mouseout')this.relatedTarget=e.toElement;if(xOp6Dn){this.pageX=e.clientX;this.pageY=e.clientY;}
-else if(xDef(e.pageX,e.pageY)){this.pageX=e.pageX;this.pageY=e.pageY;}
-else if(xDef(e.clientX,e.clientY)){this.pageX=e.clientX+xScrollLeft();this.pageY=e.clientY+xScrollTop();}
-if(xDef(e.offsetX,e.offsetY)){this.offsetX=e.offsetX;this.offsetY=e.offsetY;}
-else if(xDef(e.layerX,e.layerY)){this.offsetX=e.layerX;this.offsetY=e.layerY;}
-else{this.offsetX=this.pageX-xPageX(this.target);this.offsetY=this.pageY-xPageY(this.target);}
-if(e.keyCode){this.keyCode=e.keyCode;}
-else if(xDef(e.which)&&e.type.indexOf('key')!=-1){this.keyCode=e.which;}
-this.shiftKey=e.shiftKey;this.ctrlKey=e.ctrlKey;this.altKey=e.altKey;}
-function xFirstChild(e,t)
-{xDeprecate('xFirstChild');var c=e?e.firstChild:null;if(t)while(c&&c.nodeName!=t){c=c.nextSibling;}
-else while(c&&c.nodeType!=1){c=c.nextSibling;}
-return c;}
-function xGetBodyWidth(){xDeprecate('xGetBodyWidth');var cw=xClientWidth();var sw=window.document.body.scrollWidth;return cw>sw?cw:sw;}
-function xGetBodyHeight(){xDeprecate('xGetBodyHeight');var cw=xClientHeight();var sw=window.document.body.scrollHeight;return cw>sw?cw:sw;}
-function xGetComputedStyle(oEle,sProp,bInt)
-{xDeprecate('xGetComputedStyle');var s,p='undefined';var dv=document.defaultView;if(dv&&dv.getComputedStyle){s=dv.getComputedStyle(oEle,'');if(s)p=s.getPropertyValue(sProp);}
-else if(oEle.currentStyle){var a=sProp.split('-');sProp=a[0];for(var i=1;i<a.length;++i){c=a[i].charAt(0);sProp+=a[i].replace(c,c.toUpperCase());}
-p=oEle.currentStyle[sProp];}
-else return null;return bInt?(parseInt(p)||0):p;}
+{
+  xDeprecate('xDisplay');
+  if(!(e=xGetElementById(e))) return null;
+  if(e.style && xDef(e.style.display)) {
+    if (xStr(s)) e.style.display = s;
+    return e.style.display;
+  }
+  return null;
+}
+
+function xEvent(evt) // object prototype
+{
+  xDeprecate('xEvent');
+  var e = evt || window.event;
+  if(!e) return;
+  if(e.type) this.type = e.type;
+  if(e.target) this.target = e.target;
+  else if(e.srcElement) this.target = e.srcElement;
+
+  // Section B
+  if (e.relatedTarget) this.relatedTarget = e.relatedTarget;
+  else if (e.type == 'mouseover' && e.fromElement) this.relatedTarget = e.fromElement;
+  else if (e.type == 'mouseout') this.relatedTarget = e.toElement;
+  // End Section B
+
+  if(xOp6Dn) { this.pageX = e.clientX; this.pageY = e.clientY; }
+  else if(xDef(e.pageX,e.pageY)) { this.pageX = e.pageX; this.pageY = e.pageY; }
+  else if(xDef(e.clientX,e.clientY)) { this.pageX = e.clientX + xScrollLeft(); this.pageY = e.clientY + xScrollTop(); }
+
+  // Section A
+  if (xDef(e.offsetX,e.offsetY)) {
+    this.offsetX = e.offsetX;
+    this.offsetY = e.offsetY;
+  }
+  else if (xDef(e.layerX,e.layerY)) {
+    this.offsetX = e.layerX;
+    this.offsetY = e.layerY;
+  }
+  else {
+    this.offsetX = this.pageX - xPageX(this.target);
+    this.offsetY = this.pageY - xPageY(this.target);
+  }
+  // End Section A
+  
+  if (e.keyCode) { this.keyCode = e.keyCode; } // for moz/fb, if keyCode==0 use which
+  else if (xDef(e.which) && e.type.indexOf('key')!=-1) { this.keyCode = e.which; }
+
+  this.shiftKey = e.shiftKey;
+  this.ctrlKey = e.ctrlKey;
+  this.altKey = e.altKey;
+}
+
+function xFirstChild(e, t)
+{
+  xDeprecate('xFirstChild');
+  var c = e ? e.firstChild : null;
+  if (t) while (c && c.nodeName != t) { c = c.nextSibling; }
+  else while (c && c.nodeType != 1) { c = c.nextSibling; }
+  return c;
+}
+
+function xGetBodyWidth() {
+  xDeprecate('xGetBodyWidth');
+  var cw = xClientWidth();
+  var sw = window.document.body.scrollWidth;
+  return cw>sw?cw:sw;
+}
+
+function xGetBodyHeight() {
+  xDeprecate('xGetBodyHeight');
+  var cw = xClientHeight();
+  var sw = window.document.body.scrollHeight;
+  return cw>sw?cw:sw;
+}
+
+function xGetComputedStyle(oEle, sProp, bInt)
+{
+  xDeprecate('xGetComputedStyle');
+  var s, p = 'undefined';
+  var dv = document.defaultView;
+  if(dv && dv.getComputedStyle){
+    s = dv.getComputedStyle(oEle,'');
+    if (s) p = s.getPropertyValue(sProp);
+  }
+  else if(oEle.currentStyle) {
+    // convert css property name to object property name for IE
+    var a = sProp.split('-');
+    sProp = a[0];
+    for (var i=1; i<a.length; ++i) {
+      c = a[i].charAt(0);
+      sProp += a[i].replace(c, c.toUpperCase());
+    }   
+    p = oEle.currentStyle[sProp];
+  }
+  else return null;
+  return bInt ? (parseInt(p) || 0) : p;
+}
+
 function xGetCookie(name)
-{xDeprecate('xGetCookie');var value=null,search=name+"=";if(document.cookie.length>0){var offset=document.cookie.indexOf(search);if(offset!=-1){offset+=search.length;var end=document.cookie.indexOf(";",offset);if(end==-1)end=document.cookie.length;value=unescape(document.cookie.substring(offset,end));}}
-return value;}
+{
+  xDeprecate('xGetCookie');
+  var value=null, search=name+"=";
+  if (document.cookie.length > 0) {
+    var offset = document.cookie.indexOf(search);
+    if (offset != -1) {
+      offset += search.length;
+      var end = document.cookie.indexOf(";", offset);
+      if (end == -1) end = document.cookie.length;
+      value = unescape(document.cookie.substring(offset, end));
+    }
+  }
+  return value;
+}
+
 function xGetElementById(e)
-{xDeprecate('xGetElementById');if(typeof(e)!='string')return e;if(document.getElementById)e=document.getElementById(e);else if(document.all)e=document.all[e];else e=null;return e;}
-function xGetElementsByAttribute(sTag,sAtt,sRE,fn)
-{xDeprecate('xGetElementsByAttribute');var a,list,found=new Array(),re=new RegExp(sRE,'i');list=xGetElementsByTagName(sTag);for(var i=0;i<list.length;++i){a=list[i].getAttribute(sAtt);if(!a){a=list[i][sAtt];}
-if(typeof(a)=='string'&&a.search(re)!=-1){found[found.length]=list[i];if(fn)fn(list[i]);}}
-return found;}
+{
+  xDeprecate('xGetElementById');
+  if(typeof(e)!='string') return e;
+  if(document.getElementById) e=document.getElementById(e);
+  else if(document.all) e=document.all[e];
+  else e=null;
+  return e;
+}
+
+function xGetElementsByAttribute(sTag, sAtt, sRE, fn)
+{
+  xDeprecate('xGetElementsByAttribute');
+  var a, list, found = new Array(), re = new RegExp(sRE, 'i');
+  list = xGetElementsByTagName(sTag);
+  for (var i = 0; i < list.length; ++i) {
+    a = list[i].getAttribute(sAtt);
+    if (!a) {a = list[i][sAtt];}
+    if (typeof(a)=='string' && a.search(re) != -1) {
+      found[found.length] = list[i];
+      if (fn) fn(list[i]);
+    }
+  }
+  return found;
+}
+
 function xGetElementsByClassName(c,p,t,f)
-{xDeprecate('xGetElementsByClassName');var found=new Array();var re=new RegExp('\\b'+c+'\\b','i');var list=xGetElementsByTagName(t,p);for(var i=0;i<list.length;++i){if(list[i].className&&list[i].className.search(re)!=-1){found[found.length]=list[i];if(f)f(list[i]);}}
-return found;}
+{
+  xDeprecate('xGetElementsByClassName');
+  var found = new Array();
+  var re = new RegExp('\\b'+c+'\\b', 'i');
+  var list = xGetElementsByTagName(t, p);
+  for (var i = 0; i < list.length; ++i) {
+    if (list[i].className && list[i].className.search(re) != -1) {
+      found[found.length] = list[i];
+      if (f) f(list[i]);
+    }
+  }
+  return found;
+}
+
 function xGetElementsByTagName(t,p)
-{xDeprecate('xGetElementsByTagName');var list=null;t=t||'*';p=p||document;if(xIE4||xIE5){if(t=='*')list=p.all;else list=p.all.tags(t);}
-else if(p.getElementsByTagName)list=p.getElementsByTagName(t);return list||new Array();}
+{
+  xDeprecate('xGetElementsByTagName');
+  var list = null;
+  t = t || '*';
+  p = p || document;
+  if (xIE4 || xIE5) {
+    if (t == '*') list = p.all;
+    else list = p.all.tags(t);
+  }
+  else if (p.getElementsByTagName) list = p.getElementsByTagName(t);
+  return list || new Array();
+}
+
 function xGetURLArguments()
-{xDeprecate('xGetURLArguments');var idx=location.href.indexOf('?');var params=new Array();if(idx!=-1){var pairs=location.href.substring(idx+1,location.href.length).split('&');for(var i=0;i<pairs.length;i++){nameVal=pairs[i].split('=');params[i]=nameVal[1];params[nameVal[0]]=nameVal[1];}}
-return params;}
+{
+  xDeprecate('xGetURLArguments');
+  var idx = location.href.indexOf('?');
+  var params = new Array();
+  if (idx != -1) {
+    var pairs = location.href.substring(idx+1, location.href.length).split('&');
+    for (var i=0; i<pairs.length; i++) {
+      nameVal = pairs[i].split('=');
+      params[i] = nameVal[1];
+      params[nameVal[0]] = nameVal[1];
+    }
+  }
+  return params;
+}
+
 function xHeight(e,h)
-{xDeprecate('xHeight');if(!(e=xGetElementById(e)))return 0;if(xNum(h)){if(h<0)h=0;else h=Math.round(h);}
-else h=-1;var css=xDef(e.style);if(e==document||e.tagName.toLowerCase()=='html'||e.tagName.toLowerCase()=='body'){h=xClientHeight();}
-else if(css&&xDef(e.offsetHeight)&&xStr(e.style.height)){if(h>=0){var pt=0,pb=0,bt=0,bb=0;if(document.compatMode=='CSS1Compat'){var gcs=xGetComputedStyle;pt=gcs(e,'padding-top',1);if(pt!==null){pb=gcs(e,'padding-bottom',1);bt=gcs(e,'border-top-width',1);bb=gcs(e,'border-bottom-width',1);}
-else if(xDef(e.offsetHeight,e.style.height)){e.style.height=h+'px';pt=e.offsetHeight-h;}}
-h-=(pt+pb+bt+bb);if(isNaN(h)||h<0)return null;else e.style.height=h+'px';}
-h=e.offsetHeight;}
-else if(css&&xDef(e.style.pixelHeight)){if(h>=0)e.style.pixelHeight=h;h=e.style.pixelHeight;}
-return h;}
-function xHex(sn,digits,prefix)
-{xDeprecate('xHex');var p='';var n=Math.ceil(sn);if(prefix)p=prefix;n=n.toString(16);for(var i=0;i<digits-n.length;++i){p+='0';}
-return p+n;}
-function xHide(e){xDeprecate('xHide');return xVisibility(e,0);}
+{
+  xDeprecate('xHeight');
+  if(!(e=xGetElementById(e))) return 0;
+  if (xNum(h)) {
+    if (h<0) h = 0;
+    else h=Math.round(h);
+  }
+  else h=-1;
+  var css=xDef(e.style);
+  if (e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
+    h = xClientHeight();
+  }
+  else if(css && xDef(e.offsetHeight) && xStr(e.style.height)) {
+    if(h>=0) {
+      var pt=0,pb=0,bt=0,bb=0;
+      if (document.compatMode=='CSS1Compat') {
+        var gcs = xGetComputedStyle;
+        pt=gcs(e,'padding-top',1);
+        if (pt !== null) {
+          pb=gcs(e,'padding-bottom',1);
+          bt=gcs(e,'border-top-width',1);
+          bb=gcs(e,'border-bottom-width',1);
+        }
+        // Should we try this as a last resort?
+        // At this point getComputedStyle and currentStyle do not exist.
+        else if(xDef(e.offsetHeight,e.style.height)){
+          e.style.height=h+'px';
+          pt=e.offsetHeight-h;
+        }
+      }
+      h-=(pt+pb+bt+bb);
+      if(isNaN(h)||h<0) return null;
+      else e.style.height=h+'px';
+    }
+    h=e.offsetHeight;
+  }
+  else if(css && xDef(e.style.pixelHeight)) {
+    if(h>=0) e.style.pixelHeight=h;
+    h=e.style.pixelHeight;
+  }
+  return h;
+}
+
+function xHex(sn, digits, prefix)
+{
+  xDeprecate('xHex');
+  var p = '';
+  var n = Math.ceil(sn);
+  if (prefix) p = prefix;
+  n = n.toString(16);
+  for (var i=0; i < digits - n.length; ++i) {
+    p += '0';
+  }
+  return p + n;
+}
+
+function xHide(e){  xDeprecate('xHide'); return xVisibility(e,0);}
+
 function xInnerHtml(e,h)
-{xDeprecate('xInnerHtml');if(!(e=xGetElementById(e))||!xStr(e.innerHTML))return null;var s=e.innerHTML;if(xStr(h)){e.innerHTML=h;}
-return s;}
-function xLeft(e,iX)
-{xDeprecate('xLeft');if(!(e=xGetElementById(e)))return 0;var css=xDef(e.style);if(css&&xStr(e.style.left)){if(xNum(iX))e.style.left=iX+'px';else{iX=parseInt(e.style.left);if(isNaN(iX))iX=0;}}
-else if(css&&xDef(e.style.pixelLeft)){if(xNum(iX))e.style.pixelLeft=iX;else iX=e.style.pixelLeft;}
-return iX;}
+{
+  xDeprecate('xInnerHtml');
+  if(!(e=xGetElementById(e)) || !xStr(e.innerHTML)) return null;
+  var s = e.innerHTML;
+  if (xStr(h)) {e.innerHTML = h;}
+  return s;
+}
+
+function xLeft(e, iX)
+{
+  xDeprecate('xLeft');
+  if(!(e=xGetElementById(e))) return 0;
+  var css=xDef(e.style);
+  if (css && xStr(e.style.left)) {
+    if(xNum(iX)) e.style.left=iX+'px';
+    else {
+      iX=parseInt(e.style.left);
+      if(isNaN(iX)) iX=0;
+    }
+  }
+  else if(css && xDef(e.style.pixelLeft)) {
+    if(xNum(iX)) e.style.pixelLeft=iX;
+    else iX=e.style.pixelLeft;
+  }
+  return iX;
+}
+
 function xMoveTo(e,x,y)
-{xDeprecate('xMoveTo');xLeft(e,x);xTop(e,y);}
+{
+  xDeprecate('xMoveTo');
+  xLeft(e,x);
+  xTop(e,y);
+}
+
 function xName(e)
-{xDeprecate('xName');if(!e)return e;else if(e.id&&e.id!="")return e.id;else if(e.name&&e.name!="")return e.name;else if(e.nodeName&&e.nodeName!="")return e.nodeName;else if(e.tagName&&e.tagName!="")return e.tagName;else return e;}
+{
+  xDeprecate('xName');
+  if (!e) return e;
+  else if (e.id && e.id != "") return e.id;
+  else if (e.name && e.name != "") return e.name;
+  else if (e.nodeName && e.nodeName != "") return e.nodeName;
+  else if (e.tagName && e.tagName != "") return e.tagName;
+  else return e;
+}
+
 function xNextSib(e,t)
-{xDeprecate('xNextSib');var s=e?e.nextSibling:null;if(t)while(s&&s.nodeName!=t){s=s.nextSibling;}
-else while(s&&s.nodeType!=1){s=s.nextSibling;}
-return s;}
+{
+  xDeprecate('xNextSib');
+  var s = e ? e.nextSibling : null;
+  if (t) while (s && s.nodeName != t) { s = s.nextSibling; }
+  else while (s && s.nodeType != 1) { s = s.nextSibling; }
+  return s;
+}
+
 function xNum()
-{xDeprecate('xNum');for(var i=0;i<arguments.length;++i){if(isNaN(arguments[i])||typeof(arguments[i])!='number')return false;}
-return true;}
+{
+  xDeprecate('xNum');
+  for(var i=0; i<arguments.length; ++i){if(isNaN(arguments[i]) || typeof(arguments[i])!='number') return false;}
+  return true;
+}
+
 function xOffsetLeft(e)
-{xDeprecate('xOffsetLeft');if(!(e=xGetElementById(e)))return 0;if(xDef(e.offsetLeft))return e.offsetLeft;else return 0;}
+{
+  xDeprecate('xOffsetLeft');
+  if (!(e=xGetElementById(e))) return 0;
+  if (xDef(e.offsetLeft)) return e.offsetLeft;
+  else return 0;
+}
+
 function xOffsetTop(e)
-{xDeprecate('xOffsetTop');if(!(e=xGetElementById(e)))return 0;if(xDef(e.offsetTop))return e.offsetTop;else return 0;}
+{
+  xDeprecate('xOffsetTop');
+  if (!(e=xGetElementById(e))) return 0;
+  if (xDef(e.offsetTop)) return e.offsetTop;
+  else return 0;
+}
+
 function xPad(s,len,c,left)
-{xDeprecate('xPad');if(typeof s!='string')s=s+'';if(left){for(var i=s.length;i<len;++i)s=c+s;}
-else{for(i=s.length;i<len;++i)s+=c;}
-return s;}
+{
+  xDeprecate('xPad');
+  if(typeof s != 'string') s=s+'';
+  if(left) {for(var i=s.length; i<len; ++i) s=c+s;}
+  else {for (i=s.length; i<len; ++i) s+=c;}
+  return s;
+}
+
 function xPageX(e)
-{xDeprecate('xPageX');if(!(e=xGetElementById(e)))return 0;var x=0;while(e){if(xDef(e.offsetLeft))x+=e.offsetLeft;e=xDef(e.offsetParent)?e.offsetParent:null;}
-return x;}
+{
+  xDeprecate('xPageX');
+  if (!(e=xGetElementById(e))) return 0;
+  var x = 0;
+  while (e) {
+    if (xDef(e.offsetLeft)) x += e.offsetLeft;
+    e = xDef(e.offsetParent) ? e.offsetParent : null;
+  }
+  return x;
+}
+
 function xPageY(e)
-{xDeprecate('xPageY');if(!(e=xGetElementById(e)))return 0;var y=0;while(e){if(xDef(e.offsetTop))y+=e.offsetTop;e=xDef(e.offsetParent)?e.offsetParent:null;}
-return y;}
-function xParent(e,bNode)
-{xDeprecate('xParent');if(!(e=xGetElementById(e)))return null;var p=null;if(!bNode&&xDef(e.offsetParent))p=e.offsetParent;else if(xDef(e.parentNode))p=e.parentNode;else if(xDef(e.parentElement))p=e.parentElement;return p;}
+{
+  xDeprecate('xPageY');
+  if (!(e=xGetElementById(e))) return 0;
+  var y = 0;
+  while (e) {
+    if (xDef(e.offsetTop)) y += e.offsetTop;
+    e = xDef(e.offsetParent) ? e.offsetParent : null;
+  }
+//  if (xOp7Up) return y - document.body.offsetTop; // v3.14, temporary hack for opera bug 130324 (reported 1nov03)
+  return y;
+}
+
+function xParent(e, bNode)
+{
+  xDeprecate('xParent');
+  if (!(e=xGetElementById(e))) return null;
+  var p=null;
+  if (!bNode && xDef(e.offsetParent)) p=e.offsetParent;
+  else if (xDef(e.parentNode)) p=e.parentNode;
+  else if (xDef(e.parentElement)) p=e.parentElement;
+  return p;
+}
+
 function xPreventDefault(e)
-{xDeprecate('xPreventDefault');if(e&&e.preventDefault)e.preventDefault()
-else if(window.event)window.event.returnValue=false;}
+{
+  xDeprecate('xPreventDefault');
+  if (e && e.preventDefault) e.preventDefault()
+  else if (window.event) window.event.returnValue = false;
+}
+
 function xPrevSib(e,t)
-{xDeprecate('xPrevSib');var s=e?e.previousSibling:null;if(t)while(s&&s.nodeName!=t){s=s.previousSibling;}
-else while(s&&s.nodeType!=1){s=s.previousSibling;}
-return s;}
+{
+  xDeprecate('xPrevSib');
+  var s = e ? e.previousSibling : null;
+  if (t) while(s && s.nodeName != t) {s=s.previousSibling;}
+  else while(s && s.nodeType != 1) {s=s.previousSibling;}
+  return s;
+}
+
 function xRemoveEventListener(e,eT,eL,cap)
-{xDeprecate('xRemoveEventListener');if(!(e=xGetElementById(e)))return;eT=eT.toLowerCase();if((!xIE4Up&&!xOp7Up)&&e==window){if(eT=='resize'){window.xREL=null;return;}
-if(eT=='scroll'){window.xSEL=null;return;}}
-var eh='e.on'+eT+'=null';if(e.removeEventListener)e.removeEventListener(eT,eL,cap);else if(e.detachEvent)e.detachEvent('on'+eT,eL);else eval(eh);}
+{
+  xDeprecate('xRemoveEventListener');
+  if(!(e=xGetElementById(e))) return;
+  eT=eT.toLowerCase();
+  if((!xIE4Up && !xOp7Up) && e==window) {
+    if(eT=='resize') { window.xREL=null; return; }
+    if(eT=='scroll') { window.xSEL=null; return; }
+  }
+  var eh='e.on'+eT+'=null';
+  if(e.removeEventListener) e.removeEventListener(eT,eL,cap);
+  else if(e.detachEvent) e.detachEvent('on'+eT,eL);
+  else eval(eh);
+}
+
 function xResizeTo(e,w,h)
-{xDeprecate('xResizeTo');xWidth(e,w);xHeight(e,h);}
-function xScrollLeft(e,bWin)
-{xDeprecate('xScrollLeft');var offset=0;if(!xDef(e)||bWin||e==document||e.tagName.toLowerCase()=='html'||e.tagName.toLowerCase()=='body'){var w=window;if(bWin&&e)w=e;if(w.document.documentElement&&w.document.documentElement.scrollLeft)offset=w.document.documentElement.scrollLeft;else if(w.document.body&&xDef(w.document.body.scrollLeft))offset=w.document.body.scrollLeft;}
-else{e=xGetElementById(e);if(e&&xNum(e.scrollLeft))offset=e.scrollLeft;}
-return offset;}
-function xScrollTop(e,bWin)
-{xDeprecate('xScrollTop');var offset=0;if(!xDef(e)||bWin||e==document||e.tagName.toLowerCase()=='html'||e.tagName.toLowerCase()=='body'){var w=window;if(bWin&&e)w=e;if(w.document.documentElement&&w.document.documentElement.scrollTop)offset=w.document.documentElement.scrollTop;else if(w.document.body&&xDef(w.document.body.scrollTop))offset=w.document.body.scrollTop;}
-else{e=xGetElementById(e);if(e&&xNum(e.scrollTop))offset=e.scrollTop;}
-return offset;}
-function xSetCookie(name,value,expire,path)
-{xDeprecate('xSetCookie');document.cookie=name+"="+escape(value)+
-((!expire)?"":("; expires="+expire.toGMTString()))+"; path="+((!path)?"/":path);}
-function xShow(e){xDeprecate('xShow');return xVisibility(e,1);}
+{
+  xDeprecate('xResizeTo');
+  xWidth(e,w);
+  xHeight(e,h);
+}
+
+function xScrollLeft(e, bWin)
+{
+  xDeprecate('xScrollLeft');
+  var offset=0;
+  if (!xDef(e) || bWin || e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
+    var w = window;
+    if (bWin && e) w = e;
+    if(w.document.documentElement && w.document.documentElement.scrollLeft) offset=w.document.documentElement.scrollLeft;
+    else if(w.document.body && xDef(w.document.body.scrollLeft)) offset=w.document.body.scrollLeft;
+  }
+  else {
+    e = xGetElementById(e);
+    if (e && xNum(e.scrollLeft)) offset = e.scrollLeft;
+  }
+  return offset;
+}
+
+function xScrollTop(e, bWin)
+{
+  xDeprecate('xScrollTop');
+  var offset=0;
+  if (!xDef(e) || bWin || e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
+    var w = window;
+    if (bWin && e) w = e;
+    if(w.document.documentElement && w.document.documentElement.scrollTop) offset=w.document.documentElement.scrollTop;
+    else if(w.document.body && xDef(w.document.body.scrollTop)) offset=w.document.body.scrollTop;
+  }
+  else {
+    e = xGetElementById(e);
+    if (e && xNum(e.scrollTop)) offset = e.scrollTop;
+  }
+  return offset;
+}
+
+function xSetCookie(name, value, expire, path)
+{
+  xDeprecate('xSetCookie');
+  document.cookie = name + "=" + escape(value) +
+                    ((!expire) ? "" : ("; expires=" + expire.toGMTString())) +
+                    "; path=" + ((!path) ? "/" : path);
+}
+
+function xShow(e) { xDeprecate('xShow'); return xVisibility(e,1);}
+
+
 function xStr(s)
-{xDeprecate('xStr');for(var i=0;i<arguments.length;++i){if(typeof(arguments[i])!='string')return false;}
-return true;}
-function xTop(e,iY)
-{xDeprecate('xTop');if(!(e=xGetElementById(e)))return 0;var css=xDef(e.style);if(css&&xStr(e.style.top)){if(xNum(iY))e.style.top=iY+'px';else{iY=parseInt(e.style.top);if(isNaN(iY))iY=0;}}
-else if(css&&xDef(e.style.pixelTop)){if(xNum(iY))e.style.pixelTop=iY;else iY=e.style.pixelTop;}
-return iY;}
-function xVisibility(e,bShow)
-{xDeprecate('xVisibility');if(!(e=xGetElementById(e)))return null;if(e.style&&xDef(e.style.visibility)){if(xDef(bShow))e.style.visibility=bShow?'visible':'hidden';return e.style.visibility;}
-return null;}
+{
+  xDeprecate('xStr');
+  for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])!='string') return false;}
+  return true;
+}
+
+function xTop(e, iY)
+{
+  xDeprecate('xTop');
+  if(!(e=xGetElementById(e))) return 0;
+  var css=xDef(e.style);
+  if(css && xStr(e.style.top)) {
+    if(xNum(iY)) e.style.top=iY+'px';
+    else {
+      iY=parseInt(e.style.top);
+      if(isNaN(iY)) iY=0;
+    }
+  }
+  else if(css && xDef(e.style.pixelTop)) {
+    if(xNum(iY)) e.style.pixelTop=iY;
+    else iY=e.style.pixelTop;
+  }
+  return iY;
+}
+
+function xVisibility(e, bShow)
+{
+  xDeprecate('xVisibility');
+  if(!(e=xGetElementById(e))) return null;
+  if(e.style && xDef(e.style.visibility)) {
+    if (xDef(bShow)) e.style.visibility = bShow ? 'visible' : 'hidden';
+    return e.style.visibility;
+  }
+  return null;
+}
+
 function xWidth(e,w)
-{xDeprecate('xWidth');if(!(e=xGetElementById(e)))return 0;if(xNum(w)){if(w<0)w=0;else w=Math.round(w);}
-else w=-1;var css=xDef(e.style);if(e==document||e.tagName.toLowerCase()=='html'||e.tagName.toLowerCase()=='body'){w=xClientWidth();}
-else if(css&&xDef(e.offsetWidth)&&xStr(e.style.width)){if(w>=0){var pl=0,pr=0,bl=0,br=0;if(document.compatMode=='CSS1Compat'){var gcs=xGetComputedStyle;pl=gcs(e,'padding-left',1);if(pl!==null){pr=gcs(e,'padding-right',1);bl=gcs(e,'border-left-width',1);br=gcs(e,'border-right-width',1);}
-else if(xDef(e.offsetWidth,e.style.width)){e.style.width=w+'px';pl=e.offsetWidth-w;}}
-w-=(pl+pr+bl+br);if(isNaN(w)||w<0)return null;else e.style.width=w+'px';}
-w=e.offsetWidth;}
-else if(css&&xDef(e.style.pixelWidth)){if(w>=0)e.style.pixelWidth=w;w=e.style.pixelWidth;}
-return w;}
+{
+  xDeprecate('xWidth');
+  if(!(e=xGetElementById(e))) return 0;
+  if (xNum(w)) {
+    if (w<0) w = 0;
+    else w=Math.round(w);
+  }
+  else w=-1;
+  var css=xDef(e.style);
+  if (e == document || e.tagName.toLowerCase() == 'html' || e.tagName.toLowerCase() == 'body') {
+    w = xClientWidth();
+  }
+  else if(css && xDef(e.offsetWidth) && xStr(e.style.width)) {
+    if(w>=0) {
+      var pl=0,pr=0,bl=0,br=0;
+      if (document.compatMode=='CSS1Compat') {
+        var gcs = xGetComputedStyle;
+        pl=gcs(e,'padding-left',1);
+        if (pl !== null) {
+          pr=gcs(e,'padding-right',1);
+          bl=gcs(e,'border-left-width',1);
+          br=gcs(e,'border-right-width',1);
+        }
+        // Should we try this as a last resort?
+        // At this point getComputedStyle and currentStyle do not exist.
+        else if(xDef(e.offsetWidth,e.style.width)){
+          e.style.width=w+'px';
+          pl=e.offsetWidth-w;
+        }
+      }
+      w-=(pl+pr+bl+br);
+      if(isNaN(w)||w<0) return null;
+      else e.style.width=w+'px';
+    }
+    w=e.offsetWidth;
+  }
+  else if(css && xDef(e.style.pixelWidth)) {
+    if(w>=0) e.style.pixelWidth=w;
+    w=e.style.pixelWidth;
+  }
+  return w;
+}
+
 function xZIndex(e,uZ)
-{xDeprecate('xZIndex');if(!(e=xGetElementById(e)))return 0;if(e.style&&xDef(e.style.zIndex)){if(xNum(uZ))e.style.zIndex=uZ;uZ=parseInt(e.style.zIndex);}
-return uZ;}
+{
+  xDeprecate('xZIndex');
+  if(!(e=xGetElementById(e))) return 0;
+  if(e.style && xDef(e.style.zIndex)) {
+    if(xNum(uZ)) e.style.zIndex=uZ;
+    uZ=parseInt(e.style.zIndex);
+  }
+  return uZ;
+}
+
 function xStopPropagation(evt)
-{xDeprecate('xStopPropagation');if(evt&&evt.stopPropagation)evt.stopPropagation();else if(window.event)window.event.cancelBubble=true;}
\ No newline at end of file
+{
+  xDeprecate('xStopPropagation');
+  if (evt && evt.stopPropagation) evt.stopPropagation();
+  else if (window.event) window.event.cancelBubble = true;
+}
+
diff --git a/common/js/x.min.js b/common/js/x.min.js
new file mode 100644
index 000000000..09d7283e3
--- /dev/null
+++ b/common/js/x.min.js
@@ -0,0 +1,38 @@
+/** 
+ * x.js compiled from X 4.0 with XC 0.27b. 
+ * Distributed by GNU LGPL. For copyrights, license, documentation and more visit Cross-Browser.com 
+ * Copyright 2001-2005 Michael Foster (Cross-Browser.com)
+ **/
+function xDeprecate(a){typeof console=="object"&&typeof console.log=="function"&&console.log("DEPRECATED : "+a+"() is deprecated function.")}var xOp7Up,xOp6Dn,xIE4Up,xIE4,xIE5,xIE6,xNN4,xUA=navigator.userAgent.toLowerCase();
+if(window.opera){var i=xUA.indexOf("opera");if(i!=-1){var v=parseInt(xUA.charAt(i+6));xOp7Up=v>=7;xOp6Dn=v<7}}else navigator.vendor!="KDE"&&document.all&&xUA.indexOf("msie")!=-1?(xIE4Up=parseFloat(navigator.appVersion)>=4,xIE4=xUA.indexOf("msie 4")!=-1,xIE5=xUA.indexOf("msie 5")!=-1,xIE6=xUA.indexOf("msie 6")!=-1):document.layers&&(xNN4=true);var xMac=xUA.indexOf("mac")!=-1,xFF=xUA.indexOf("firefox")!=-1;
+function xAddEventListener(a,b,d,e){xDeprecate("xAddEventListener");if(a=xGetElementById(a)){b=b.toLowerCase();if(!xIE4Up&&!xOp7Up&&a==window){if(b=="resize"){window.xPCW=xClientWidth();window.xPCH=xClientHeight();window.xREL=d;xResizeEvent();return}if(b=="scroll"){window.xPSL=xScrollLeft();window.xPST=xScrollTop();window.xSEL=d;xScrollEvent();return}}var f="e.on"+b+"=eL";a.addEventListener?a.addEventListener(b,d,e):a.attachEvent?a.attachEvent("on"+b,d):eval(f)}}
+function xResizeEvent(){xDeprecate("xResizeEvent");window.xREL&&setTimeout("xResizeEvent()",250);var a=xClientWidth(),b=xClientHeight();if(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();if(window.xPSL!=a||window.xPST!=b)window.xPSL=a,window.xPST=b,window.xSEL&&window.xSEL()}
+function xAppendChild(a,b){xDeprecate("xAppendChild");return a.appendChild?a.appendChild(b):null}
+function xClientHeight(){xDeprecate("xClientHeight");var a=0;if(xOp6Dn)a=window.innerHeight;else if(document.compatMode=="CSS1Compat"&&!window.opera&&document.documentElement&&document.documentElement.clientHeight)a=document.documentElement.clientHeight;else if(document.body&&document.body.clientHeight)a=document.body.clientHeight;else if(xDef(window.innerWidth,window.innerHeight,document.width))a=window.innerHeight,document.width>window.innerWidth&&(a-=16);return a}
+function xClientWidth(){xDeprecate("xClientWidth");var a=0;if(xOp6Dn)a=window.innerWidth;else if(document.compatMode=="CSS1Compat"&&!window.opera&&document.documentElement&&document.documentElement.clientWidth)a=document.documentElement.clientWidth;else if(document.body&&document.body.clientWidth)a=document.body.clientWidth;else if(xDef(window.innerWidth,window.innerHeight,document.height))a=window.innerWidth,document.height>window.innerHeight&&(a-=16);return a}
+function xCreateElement(a){xDeprecate("xCreateElement");return document.createElement?document.createElement(a):null}function xDef(){xDeprecate("xDef");for(var a=0;a<arguments.length;++a)if(typeof arguments[a]=="undefined")return false;return true}function xDeleteCookie(a,b){xDeprecate("xDeleteCookie");if(xGetCookie(a))document.cookie=a+"=; path="+(!b?"/":b)+"; expires="+(new Date(0)).toGMTString()}
+function xDisplay(a,b){xDeprecate("xDisplay");if(!(a=xGetElementById(a)))return null;if(a.style&&xDef(a.style.display)){if(xStr(b))a.style.display=b;return a.style.display}return null}
+function xEvent(a){xDeprecate("xEvent");if(a=a||window.event){if(a.type)this.type=a.type;if(a.target)this.target=a.target;else if(a.srcElement)this.target=a.srcElement;if(a.relatedTarget)this.relatedTarget=a.relatedTarget;else if(a.type=="mouseover"&&a.fromElement)this.relatedTarget=a.fromElement;else if(a.type=="mouseout")this.relatedTarget=a.toElement;if(xOp6Dn)this.pageX=a.clientX,this.pageY=a.clientY;else if(xDef(a.pageX,a.pageY))this.pageX=a.pageX,this.pageY=a.pageY;else if(xDef(a.clientX,a.clientY))this.pageX=
+a.clientX+xScrollLeft(),this.pageY=a.clientY+xScrollTop();xDef(a.offsetX,a.offsetY)?(this.offsetX=a.offsetX,this.offsetY=a.offsetY):xDef(a.layerX,a.layerY)?(this.offsetX=a.layerX,this.offsetY=a.layerY):(this.offsetX=this.pageX-xPageX(this.target),this.offsetY=this.pageY-xPageY(this.target));if(a.keyCode)this.keyCode=a.keyCode;else if(xDef(a.which)&&a.type.indexOf("key")!=-1)this.keyCode=a.which;this.shiftKey=a.shiftKey;this.ctrlKey=a.ctrlKey;this.altKey=a.altKey}}
+function xFirstChild(a,b){xDeprecate("xFirstChild");var d=a?a.firstChild:null;if(b)for(;d&&d.nodeName!=b;)d=d.nextSibling;else for(;d&&d.nodeType!=1;)d=d.nextSibling;return d}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="undefined",f=document.defaultView;if(f&&f.getComputedStyle)(a=f.getComputedStyle(a,""))&&(e=a.getPropertyValue(b));else if(a.currentStyle){e=b.split("-");b=e[0];for(f=1;f<e.length;++f)c=e[f].charAt(0),b+=e[f].replace(c,c.toUpperCase());e=a.currentStyle[b]}else return null;return d?parseInt(e)||0:e}
+function xGetCookie(a){xDeprecate("xGetCookie");var b=null,d=a+"=";if(document.cookie.length>0&&(a=document.cookie.indexOf(d),a!=-1)){a+=d.length;b=document.cookie.indexOf(";",a);if(b==-1)b=document.cookie.length;b=unescape(document.cookie.substring(a,b))}return b}function xGetElementById(a){xDeprecate("xGetElementById");return typeof a!="string"?a:a=document.getElementById?document.getElementById(a):document.all?document.all[a]:null}
+function xGetElementsByAttribute(a,b,d,e){xDeprecate("xGetElementsByAttribute");var f,h=[],d=RegExp(d,"i");f=xGetElementsByTagName(a);for(var g=0;g<f.length;++g)(a=f[g].getAttribute(b))||(a=f[g][b]),typeof a=="string"&&a.search(d)!=-1&&(h[h.length]=f[g],e&&e(f[g]));return h}
+function xGetElementsByClassName(a,b,d,e){xDeprecate("xGetElementsByClassName");for(var f=[],a=RegExp("\\b"+a+"\\b","i"),b=xGetElementsByTagName(d,b),d=0;d<b.length;++d)b[d].className&&b[d].className.search(a)!=-1&&(f[f.length]=b[d],e&&e(b[d]));return f}function xGetElementsByTagName(a,b){xDeprecate("xGetElementsByTagName");var d=null,a=a||"*",b=b||document;xIE4||xIE5?d=a=="*"?b.all:b.all.tags(a):b.getElementsByTagName&&(d=b.getElementsByTagName(a));return d||[]}
+function xGetURLArguments(){xDeprecate("xGetURLArguments");var a=location.href.indexOf("?"),b=[];if(a!=-1)for(var a=location.href.substring(a+1,location.href.length).split("&"),d=0;d<a.length;d++)nameVal=a[d].split("="),b[d]=nameVal[1],b[nameVal[0]]=nameVal[1];return b}
+function xHeight(a,b){xDeprecate("xHeight");if(!(a=xGetElementById(a)))return 0;var b=xNum(b)?b<0?0:Math.round(b):-1,d=xDef(a.style);if(a==document||a.tagName.toLowerCase()=="html"||a.tagName.toLowerCase()=="body")b=xClientHeight();else if(d&&xDef(a.offsetHeight)&&xStr(a.style.height)){if(b>=0){var e=d=0,f=0,h=0;if(document.compatMode=="CSS1Compat"){var g=xGetComputedStyle,d=g(a,"padding-top",1);if(d!==null)e=g(a,"padding-bottom",1),f=g(a,"border-top-width",1),h=g(a,"border-bottom-width",1);else if(xDef(a.offsetHeight,
+a.style.height))a.style.height=b+"px",d=a.offsetHeight-b}b-=d+e+f+h;if(isNaN(b)||b<0)return null;else a.style.height=b+"px"}b=a.offsetHeight}else if(d&&xDef(a.style.pixelHeight)){if(b>=0)a.style.pixelHeight=b;b=a.style.pixelHeight}return b}function xHex(a,b,d){xDeprecate("xHex");var e="",a=Math.ceil(a);d&&(e=d);a=a.toString(16);for(d=0;d<b-a.length;++d)e+="0";return e+a}function xHide(a){xDeprecate("xHide");return xVisibility(a,0)}
+function xInnerHtml(a,b){xDeprecate("xInnerHtml");if(!(a=xGetElementById(a))||!xStr(a.innerHTML))return null;var d=a.innerHTML;if(xStr(b))a.innerHTML=b;return d}function xLeft(a,b){xDeprecate("xLeft");if(!(a=xGetElementById(a)))return 0;var d=xDef(a.style);if(d&&xStr(a.style.left))xNum(b)?a.style.left=b+"px":(b=parseInt(a.style.left),isNaN(b)&&(b=0));else if(d&&xDef(a.style.pixelLeft))xNum(b)?a.style.pixelLeft=b:b=a.style.pixelLeft;return b}
+function xMoveTo(a,b,d){xDeprecate("xMoveTo");xLeft(a,b);xTop(a,d)}function xName(a){xDeprecate("xName");return 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 d=a?a.nextSibling:null;if(b)for(;d&&d.nodeName!=b;)d=d.nextSibling;else for(;d&&d.nodeType!=1;)d=d.nextSibling;return d}
+function xNum(){xDeprecate("xNum");for(var a=0;a<arguments.length;++a)if(isNaN(arguments[a])||typeof arguments[a]!="number")return false;return true}function xOffsetLeft(a){xDeprecate("xOffsetLeft");return!(a=xGetElementById(a))?0:xDef(a.offsetLeft)?a.offsetLeft:0}function xOffsetTop(a){xDeprecate("xOffsetTop");return!(a=xGetElementById(a))?0:xDef(a.offsetTop)?a.offsetTop:0}
+function xPad(a,b,d,e){xDeprecate("xPad");typeof a!="string"&&(a+="");if(e)for(e=a.length;e<b;++e)a=d+a;else for(e=a.length;e<b;++e)a+=d;return a}function xPageX(a){xDeprecate("xPageX");if(!(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){xDeprecate("xPageY");if(!(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){xDeprecate("xParent");if(!(a=xGetElementById(a)))return null;var d=null;if(!b&&xDef(a.offsetParent))d=a.offsetParent;else if(xDef(a.parentNode))d=a.parentNode;else if(xDef(a.parentElement))d=a.parentElement;return d}
+function xPreventDefault(a){xDeprecate("xPreventDefault");if(a&&a.preventDefault)a.preventDefault();else if(window.event)window.event.returnValue=false}function xPrevSib(a,b){xDeprecate("xPrevSib");var d=a?a.previousSibling:null;if(b)for(;d&&d.nodeName!=b;)d=d.previousSibling;else for(;d&&d.nodeType!=1;)d=d.previousSibling;return d}
+function xRemoveEventListener(a,b,d,e){xDeprecate("xRemoveEventListener");if(a=xGetElementById(a)){b=b.toLowerCase();if(!xIE4Up&&!xOp7Up&&a==window){if(b=="resize"){window.xREL=null;return}if(b=="scroll"){window.xSEL=null;return}}var f="e.on"+b+"=null";a.removeEventListener?a.removeEventListener(b,d,e):a.detachEvent?a.detachEvent("on"+b,d):eval(f)}}function xResizeTo(a,b,d){xDeprecate("xResizeTo");xWidth(a,b);xHeight(a,d)}
+function xScrollLeft(a,b){xDeprecate("xScrollLeft");var d=0;if(!xDef(a)||b||a==document||a.tagName.toLowerCase()=="html"||a.tagName.toLowerCase()=="body"){var e=window;b&&a&&(e=a);if(e.document.documentElement&&e.document.documentElement.scrollLeft)d=e.document.documentElement.scrollLeft;else if(e.document.body&&xDef(e.document.body.scrollLeft))d=e.document.body.scrollLeft}else if((a=xGetElementById(a))&&xNum(a.scrollLeft))d=a.scrollLeft;return d}
+function xScrollTop(a,b){xDeprecate("xScrollTop");var d=0;if(!xDef(a)||b||a==document||a.tagName.toLowerCase()=="html"||a.tagName.toLowerCase()=="body"){var e=window;b&&a&&(e=a);if(e.document.documentElement&&e.document.documentElement.scrollTop)d=e.document.documentElement.scrollTop;else if(e.document.body&&xDef(e.document.body.scrollTop))d=e.document.body.scrollTop}else if((a=xGetElementById(a))&&xNum(a.scrollTop))d=a.scrollTop;return d}
+function xSetCookie(a,b,d,e){xDeprecate("xSetCookie");document.cookie=a+"="+escape(b)+(!d?"":"; expires="+d.toGMTString())+"; path="+(!e?"/":e)}function xShow(a){xDeprecate("xShow");return xVisibility(a,1)}function xStr(a){xDeprecate("xStr");for(var b=0;b<arguments.length;++b)if(typeof arguments[b]!="string")return false;return true}
+function xTop(a,b){xDeprecate("xTop");if(!(a=xGetElementById(a)))return 0;var d=xDef(a.style);if(d&&xStr(a.style.top))xNum(b)?a.style.top=b+"px":(b=parseInt(a.style.top),isNaN(b)&&(b=0));else if(d&&xDef(a.style.pixelTop))xNum(b)?a.style.pixelTop=b:b=a.style.pixelTop;return b}function xVisibility(a,b){xDeprecate("xVisibility");if(!(a=xGetElementById(a)))return null;if(a.style&&xDef(a.style.visibility)){if(xDef(b))a.style.visibility=b?"visible":"hidden";return a.style.visibility}return null}
+function xWidth(a,b){xDeprecate("xWidth");if(!(a=xGetElementById(a)))return 0;var b=xNum(b)?b<0?0:Math.round(b):-1,d=xDef(a.style);if(a==document||a.tagName.toLowerCase()=="html"||a.tagName.toLowerCase()=="body")b=xClientWidth();else if(d&&xDef(a.offsetWidth)&&xStr(a.style.width)){if(b>=0){var e=d=0,f=0,h=0;if(document.compatMode=="CSS1Compat"){var g=xGetComputedStyle,d=g(a,"padding-left",1);if(d!==null)e=g(a,"padding-right",1),f=g(a,"border-left-width",1),h=g(a,"border-right-width",1);else if(xDef(a.offsetWidth,
+a.style.width))a.style.width=b+"px",d=a.offsetWidth-b}b-=d+e+f+h;if(isNaN(b)||b<0)return null;else a.style.width=b+"px"}b=a.offsetWidth}else if(d&&xDef(a.style.pixelWidth)){if(b>=0)a.style.pixelWidth=b;b=a.style.pixelWidth}return b}function xZIndex(a,b){xDeprecate("xZIndex");if(!(a=xGetElementById(a)))return 0;if(a.style&&xDef(a.style.zIndex)){if(xNum(b))a.style.zIndex=b;b=parseInt(a.style.zIndex)}return b}
+function xStopPropagation(a){xDeprecate("xStopPropagation");if(a&&a.stopPropagation)a.stopPropagation();else if(window.event)window.event.cancelBubble=true};
diff --git a/common/js/xe.header.js b/common/js/xe.header.js
new file mode 100644
index 000000000..9a29487a0
--- /dev/null
+++ b/common/js/xe.header.js
@@ -0,0 +1,5 @@
+/**
+ * @file   common/js/xe.min.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  XE Common JavaScript
+ **/
diff --git a/common/js/xe.js b/common/js/xe.js
new file mode 100644
index 000000000..75fb3e6ec
--- /dev/null
+++ b/common/js/xe.js
@@ -0,0 +1,2088 @@
+/**
+ * @file   common/js/xe.min.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  XE Common JavaScript
+ **/
+/**
+ * @file js_app.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief XE JavaScript Application Framework (JAF)
+ * @namespace xe
+ * @update 20100701
+ */
+(function($){
+
+var _xe_base, _app_base, _plugin_base;
+var _apps = [];
+
+_xe_base = {
+	/**
+	 * @brief return the name of Core module
+	 */
+	getName : function() {
+		return 'Core';
+	},
+
+	/**
+	 * @brief Create an application class
+	 */
+	createApp : function(sName, oDef) {
+		var _base = getTypeBase();
+
+		$.extend(_base.prototype, _app_base, oDef);
+
+		_base.prototype.getName = function() {
+			return sName;
+		};
+
+		return _base;
+	},
+
+	/**
+	 * @brief Create a plugin class
+	 */
+	createPlugin : function(sName, oDef) {
+		var _base = getTypeBase();
+
+		$.extend(_base.prototype, _plugin_base, oDef);
+
+		_base.prototype.getName = function() {
+			return sName;
+		};
+
+		return _base;
+	},
+
+	/**
+	 * @brief Get the array of applications
+	 */
+	getApps : function() {
+		return $.makeArray(_apps);
+	},
+
+	/**
+	 * @brief Get one application
+	 */
+	getApp : function(indexOrName) {
+		indexOrName = (indexOrName||'').toLowerCase();
+		if(typeof _apps[indexOrName] != 'undefined') {
+			return _apps[indexOrName];
+		} else {
+			return null;
+		}
+	},
+
+	/**
+	 * @brief Register an application instance
+	 */
+	registerApp : function(oApp) {
+		var sName = oApp.getName().toLowerCase();
+
+		_apps.push(oApp);
+		if (!$.isArray(_apps[sName])) {
+			_apps[sName] = [];
+		}
+		_apps[sName].push(oApp);
+
+		oApp.parent = this;
+
+		// register event
+		if ($.isFunction(oApp.activate)) oApp.activate();
+	},
+
+	/**
+	 * @brief Unregister an application instance
+	 */
+	unregisterApp : function(oApp) {
+		var sName  = oApp.getName().toLowerCase();
+		var nIndex = $.inArray(oApp, _apps);
+
+		if (nIndex >= 0) _apps = _apps.splice(nIndex, 1);
+
+		if ($.isArray(_apps[sName])) {
+			nIndex = $.inArray(oApp, _apps[sName]);
+			if (nIndex >= 0) _apps[sName] = _apps[sName].splice(nIndex, 1);
+		}
+
+		// unregister event
+		if ($.isFunction(oApp.deactivate)) oApp.deactivate();
+	},
+
+	/**
+	 * @brief overrides broadcast method
+	 */
+	broadcast : function(msg, params) {
+		this._broadcast(this, msg, params);
+	},
+
+	_broadcast : function(sender, msg, params) {
+		for(var i=0; i < _apps.length; i++) {
+			_apps[i]._cast(sender, msg, params);
+		}
+
+
+		// cast to child plugins
+		this._cast(sender, msg, params);
+	}
+}
+
+_app_base = {
+	_plugins  : [],
+	_messages : {},
+
+	/**
+	 * @brief get plugin
+	 */
+	getPlugin : function(sPluginName) {
+		sPluginName = sPluginName.toLowerCase();
+		if ($.isArray(this._plugins[sPluginName])) {
+			return this._plugins[sPluginName];
+		} else {
+			return [];
+		}
+	},
+
+	/**
+	 * @brief register a plugin instance
+	 */
+	registerPlugin : function(oPlugin) {
+		var self  = this;
+		var sName = oPlugin.getName().toLowerCase();
+
+		// check if the plugin is already registered
+		if ($.inArray(oPlugin, this._plugins) >= 0) return false;
+
+		// push the plugin into the _plugins array
+		this._plugins.push(oPlugin);
+
+		if (!$.isArray(this._plugins[sName])) this._plugins[sName] = [];
+		this._plugins[sName].push(oPlugin);
+
+		// register method pool
+		$.each(oPlugin._binded_fn, function(api, fn){ self.registerHandler(api, fn); });
+
+		// binding
+		oPlugin.oApp = this;
+
+		// registered event
+		if ($.isFunction(oPlugin.activate)) oPlugin.activate();
+
+		return true;
+	},
+
+	/**
+	 * @brief register api message handler
+	 */
+	registerHandler : function(api, func) {
+		var msgs = this._messages; api = api.toUpperCase();
+		if (!$.isArray(msgs[api])) msgs[api] = [];
+		msgs[api].push(func);
+	},
+
+	cast : function(msg, params) {
+		return this._cast(this, msg, params || []);
+	},
+
+	broadcast : function(sender, msg, params) {
+		if (this.parent && this.parent._broadcast) {
+			this.parent._broadcast(sender, msg, params);
+		}
+	},
+
+	_cast : function(sender, msg, params) {
+		var i, len;
+		var aMsg = this._messages;
+
+		msg = msg.toUpperCase();
+
+		// BEFORE hooker
+		if (aMsg['BEFORE_'+msg] || this['API_BEFORE_'+msg]) {
+			var bContinue = this._cast(sender, 'BEFORE_'+msg, params);
+			if (!bContinue) return;
+		}
+
+		// main api function
+		var vRet = [], sFn = 'API_'+msg;
+		if ($.isArray(aMsg[msg])) {
+			for(i=0; i < aMsg[msg].length; i++) {
+				vRet.push( aMsg[msg][i](sender, params) );
+			}
+		}
+		if (vRet.length < 2) vRet = vRet[0];
+
+		// AFTER hooker
+		if (aMsg['AFTER_'+msg] || this['API_AFTER_'+msg]) {
+			this._cast(sender, 'AFTER_'+msg, params);
+		}
+
+		if (!/^(?:AFTER|BEFORE)_/.test(msg)) { // top level function
+			return vRet;
+		} else {
+			return $.isArray(vRet)?($.inArray(false, vRet)<0):((typeof vRet=='undefined')?true:!!vRet);
+		}
+	}
+};
+
+_plugin_base = {
+	oApp : null,
+
+	cast : function(msg, params) {
+		if (this.oApp && this.oApp._cast) {
+			return this.oApp._cast(this, msg, params || []);
+		}
+	},
+
+	broadcast : function(msg, params) {
+		if (this.oApp && this.oApp.broadcast) {
+			this.oApp.broadcast(this, mag, params || []);
+		}
+	}
+
+	/**
+	 * Event handler prototype
+	 *
+	 * function (oSender, params)
+	 */
+};
+
+function getTypeBase() {
+	var _base = function() {
+		var self = this;
+		var pool = null;
+		
+		if ($.isArray(this._plugins))   this._plugins   = [];
+		if (this._messages) this._messages = {};
+		else this._binded_fn = {};
+		
+		// bind functions
+		$.each(this, function(key, val){
+			if (!$.isFunction(val)) return true;
+			if (!/^API_([A-Z0-9_]+)$/.test(key)) return true;
+
+			var api = RegExp.$1;
+			var fn  = function(sender, params){ return self[key](sender, params) };
+
+			if (self._messages) self._messages[api] = [fn];
+			else self._binded_fn[api] = fn;
+		});
+
+		if ($.isFunction(this.init)) this.init.apply(this, arguments);
+	};
+
+	return _base;
+}
+
+window.xe = $.extend(_app_base, _xe_base);
+window.xe.lang = {}; // language repository
+
+// domready event
+$(function(){ xe.broadcast('ONREADY'); });
+
+// load event
+$(window).load(function(){ xe.broadcast('ONLOAD'); });
+
+})(jQuery);
+/**
+ * @file common.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief 몇가지 유용한 & 기본적으로 자주 사용되는 자바스크립트 함수들 모음
+ **/
+
+/* jQuery 참조변수($) 제거 */
+if(jQuery) jQuery.noConflict();
+
+(function($) {
+    /* OS check */
+    var UA = navigator.userAgent.toLowerCase();
+    $.os = {
+        Linux: /linux/.test(UA),
+        Unix: /x11/.test(UA),
+        Mac: /mac/.test(UA),
+        Windows: /win/.test(UA)
+    };
+    $.os.name = ($.os.Windows) ? 'Windows' :
+        ($.os.Linux) ? 'Linux' :
+        ($.os.Unix) ? 'Unix' :
+        ($.os.Mac) ? 'Mac' : '';
+
+    /**
+     * @brief XE 공용 유틸리티 함수
+     * @namespace XE
+     */
+    window.XE = {
+        loaded_popup_menus : new Array(),
+        addedDocument : new Array(),
+        /**
+         * @brief 특정 name을 가진 체크박스들의 checked 속성 변경
+         * @param [itemName='cart',][options={}]
+         */
+        checkboxToggleAll : function(itemName) {
+            if(!is_def(itemName)) itemName='cart';
+            var options = {
+                wrap : null,
+                checked : 'toggle',
+                doClick : false
+            };
+
+            switch(arguments.length) {
+                case 1:
+                    if(typeof(arguments[0]) == "string") {
+                        itemName = arguments[0];
+                    } else {
+                        $.extend(options, arguments[0] || {});
+						itemName = 'cart';
+                    }
+                    break;
+                case 2:
+                    itemName = arguments[0];
+                    $.extend(options, arguments[1] || {});
+            }
+
+            if(options.doClick == true) options.checked = null;
+            if(typeof(options.wrap) == "string") options.wrap ='#'+options.wrap;
+
+            if(options.wrap) {
+                var obj = $(options.wrap).find('input[name='+itemName+']:checkbox');
+            } else {
+                var obj = $('input[name='+itemName+']:checkbox');
+            }
+			
+			if(options.checked == 'toggle') {
+                obj.each(function() {
+                    $(this).attr('checked', ($(this).attr('checked')) ? false : true);
+                });
+            } else {
+                (options.doClick == true) ? obj.click() : obj.attr('checked', options.checked);
+            }
+        },
+
+        /**
+         * @brief 문서/회원 등 팝업 메뉴 출력
+         */
+        displayPopupMenu : function(ret_obj, response_tags, params) {
+            var target_srl = params["target_srl"];
+            var menu_id = params["menu_id"];
+            var menus = ret_obj['menus'];
+            var html = "";
+
+            if(this.loaded_popup_menus[menu_id]) {
+                html = this.loaded_popup_menus[menu_id];
+
+            } else {
+                if(menus) {
+                    var item = menus['item'];
+                    if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
+                    if(item.length) {
+                        for(var i=0;i<item.length;i++) {
+                            var url = item[i].url;
+                            var str = item[i].str;
+                            var icon = item[i].icon;
+                            var target = item[i].target;
+
+                            var styleText = "";
+                            var click_str = "";
+                            if(icon) styleText = " style=\"background-image:url('"+icon+"')\" ";
+                            switch(target) {
+                                case "popup" :
+                                        click_str = " onclick=\"popopen(this.href,'"+target+"'); return false;\"";
+                                    break;
+                                case "javascript" :
+                                        click_str = " onclick=\""+url+"; return false; \"";
+                                        url="#";
+                                    break;
+                                default :
+                                        click_str = " onclick=\"window.open(this.href); return false;\"";
+                                    break;
+                            }
+
+                            html += '<li '+styleText+'><a href="'+url+'"'+click_str+'>'+str+'</a></li> ';
+                        }
+                    }
+                }
+                this.loaded_popup_menus[menu_id] =  html;
+            }
+
+            /* 레이어 출력 */
+            if(html) {
+                var area = $('#popup_menu_area').html('<ul>'+html+'</ul>');
+                var areaOffset = {top:params['page_y'], left:params['page_x']};
+
+                if(area.outerHeight()+areaOffset.top > $(window).height()+$(window).scrollTop())
+                    areaOffset.top = $(window).height() - area.outerHeight() + $(window).scrollTop();
+                if(area.outerWidth()+areaOffset.left > $(window).width()+$(window).scrollLeft())
+                    areaOffset.left = $(window).width() - area.outerWidth() + $(window).scrollLeft();
+
+                area.css({ top:areaOffset.top, left:areaOffset.left }).show();
+            }
+        }
+    }
+
+}) (jQuery);
+
+
+
+/* jQuery(document).ready() */
+jQuery(function($) {
+
+    /* select - option의 disabled=disabled 속성을 IE에서도 체크하기 위한 함수 */
+    if($.browser.msie) {
+        $('select').each(function(i, sels) {
+            var disabled_exists = false;
+            var first_enable = new Array();
+
+            for(var j=0; j < sels.options.length; j++) {
+                if(sels.options[j].disabled) {
+                    sels.options[j].style.color = '#CCCCCC';
+                    disabled_exists = true;
+                }else{
+                    first_enable[i] = (first_enable[i] > -1) ? first_enable[i] : j;
+                }
+            }
+
+            if(!disabled_exists) return;
+
+            sels.oldonchange = sels.onchange;
+            sels.onchange = function() {
+                if(this.options[this.selectedIndex].disabled) {
+
+                    this.selectedIndex = first_enable[i];
+                    /*
+                    if(this.options.length<=1) this.selectedIndex = -1;
+                    else if(this.selectedIndex < this.options.length - 1) this.selectedIndex++;
+                    else this.selectedIndex--;
+                    */
+
+                } else {
+                    if(this.oldonchange) this.oldonchange();
+                }
+            };
+
+            if(sels.selectedIndex >= 0 && sels.options[ sels.selectedIndex ].disabled) sels.onchange();
+
+        });
+    }
+
+    /* 단락에디터 fold 컴포넌트 펼치기/접기 */
+    var drEditorFold = $('.xe_content .fold_button');
+    if(drEditorFold.size()) {
+        var fold_container = $('div.fold_container', drEditorFold);
+        $('button.more', drEditorFold).click(function() {
+            $(this).hide().next('button').show().parent().next(fold_container).show();
+        });
+        $('button.less', drEditorFold).click(function() {
+            $(this).hide().prev('button').show().parent().next(fold_container).hide();
+        });
+    }
+
+});
+
+
+/**
+ * @brief location.href에서 특정 key의 값을 return
+ **/
+String.prototype.getQuery = function(key) {
+    var idx = this.indexOf('?');
+    if(idx == -1) return null;
+    var query_string = this.substr(idx+1, this.length);
+    var args = {};
+    query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function() { args[arguments[1]] = arguments[2]; });
+
+    var q = args[key];
+    if(typeof(q)=="undefined") q = "";
+
+    return q;
+}
+
+/**
+ * @brief location.href에서 특정 key의 값을 return
+ **/
+String.prototype.setQuery = function(key, val) {
+    var idx = this.indexOf('?');
+    var uri = this.replace(/#$/, '');
+
+    if(idx != -1) {
+        var query_string = uri.substr(idx+1, this.length), args = {}, q_list = [];
+		uri = this.substr(0, idx);
+        query_string.replace(/([^=]+)=([^&]*)(&|$)/g, function(all,key,val) { args[key] = val; });
+
+        args[key] = val;
+
+		jQuery.each(args, function(key,val){
+			if (!jQuery.trim(val)) return;
+			q_list.push(key+'='+decodeURI(val));
+		});
+
+		query_string = q_list.join('&');
+		uri = uri+(query_string?'?'+query_string:'');
+    } else {
+        if(val.toString().trim()) uri = uri+"?"+key+"="+val;
+    }
+
+    var re = /https:\/\/([^:\/]+)(:\d+|)/i;
+    var check = re.exec(uri);
+    if(check)
+    {
+        var toReplace = "http://"+check[1];
+        if(typeof(http_port)!='undefined' && http_port != 80)
+        {
+            toReplace += ":" + http_port;
+        }
+        uri = uri.replace(re,toReplace);
+    }
+    var bUseSSL = false;
+    if(typeof(enforce_ssl)!='undefined' && enforce_ssl)
+    {
+        bUseSSL = true;
+    }
+    else if(typeof(ssl_actions)!='undefined' && typeof(ssl_actions.length)!='undefined' && uri.getQuery('act')) {
+        var act = uri.getQuery('act');
+        for(i=0;i<ssl_actions.length;i++) {
+            if(ssl_actions[i]==act) {
+                bUseSSL = true;
+                break;
+            }
+        }
+    }
+
+    if(bUseSSL)
+    {
+        var re = /http:\/\/([^:\/]+)(:\d+|)/i;
+        var check = re.exec(uri);
+        if(check)
+        {
+            var toReplace = "https://"+check[1];
+            if(typeof(https_port)!='undefined' && https_port != 443)
+            {
+                toReplace += ":" + https_port;
+            }
+            uri = uri.replace(re,toReplace);
+        }
+    }
+
+    return encodeURI(uri);
+}
+
+/**
+ * @brief string prototype으로 trim 함수 추가
+ **/
+String.prototype.trim = function() {
+    return this.replace(/(^\s*)|(\s*$)/g, "");
+}
+
+/**
+ * @brief xSleep(micro time)
+ **/
+function xSleep(sec) {
+    sec = sec / 1000;
+    var now = new Date();
+    var sleep = new Date();
+    while( sleep.getTime() - now.getTime() < sec) {
+        sleep = new Date();
+    }
+}
+
+/**
+ * @brief 주어진 인자가 하나라도 defined되어 있지 않으면 false return
+ **/
+function isDef() {
+    for(var i=0; i < arguments.length; ++i) {
+        if(typeof(arguments[i]) == "undefined") return false;
+    }
+    return true;
+}
+
+/**
+ * @brief 윈도우 오픈
+ * 열려진 윈도우의 관리를 통해 window.focus()등을 FF에서도 비슷하게 구현함
+ **/
+var winopen_list = new Array();
+function winopen(url, target, attribute) {
+    if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
+    try {
+        if(target != "_blank" && winopen_list[target]) {
+            winopen_list[target].close();
+            winopen_list[target] = null;
+        }
+    } catch(e) {
+    }
+
+    if(typeof(target) == 'undefined') target = '_blank';
+    if(typeof(attribute) == 'undefined') attribute = '';
+    var win = window.open(url, target, attribute);
+    win.focus();
+    if(target != "_blank") winopen_list[target] = win;
+}
+
+/**
+ * @brief 팝업으로만 띄우기
+ * common/tpl/popup_layout.html이 요청되는 XE내의 팝업일 경우에 사용
+ **/
+function popopen(url, target) {
+    if(typeof(target) == "undefined") target = "_blank";
+    if(typeof(xeVid)!='undefined' && url.indexOf(request_uri)>-1 && !url.getQuery('vid')) url = url.setQuery('vid',xeVid);
+    winopen(url, target, "width=650,height=500,scrollbars=yes,resizable=yes,toolbars=no");
+}
+
+/**
+ * @brief 메일 보내기용
+ **/
+function sendMailTo(to) {
+    location.href="mailto:"+to;
+}
+
+/**
+ * @brief url이동 (open_window 값이 N 가 아니면 새창으로 띄움)
+ **/
+function move_url(url, open_wnidow) {
+    if(!url) return false;
+    if(typeof(open_wnidow) == 'undefined') open_wnidow = 'N';
+    if(open_wnidow=='N') {
+        open_wnidow = false;
+    } else {
+        open_wnidow = true;
+    }
+
+    if(/^\./.test(url)) url = request_uri+url;
+
+    if(open_wnidow) {
+        winopen(url);
+    } else {
+        location.href=url;
+    }
+
+    return false;
+}
+
+/**
+ * @brief 멀티미디어 출력용 (IE에서 플래쉬/동영상 주변에 점선 생김 방지용)
+ **/
+function displayMultimedia(src, width, height, options) {
+    var html = _displayMultimedia(src, width, height, options);
+    if(html) document.writeln(html);
+}
+function _displayMultimedia(src, width, height, options) {
+    if(src.indexOf('files') == 0) src = request_uri + src;
+
+    var defaults = {
+        wmode : 'transparent',
+        allowScriptAccess : 'sameDomain',
+        quality : 'high',
+        flashvars : '',
+        autostart : false
+    };
+
+    var params = jQuery.extend(defaults, options || {});
+	var autostart = (params.autostart && params.autostart != 'false') ? 'true' : 'false';
+	delete(params.autostart);
+
+    var clsid = "";
+    var codebase = "";
+    var html = "";
+
+    if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(src)){
+        html = '<img src="'+src+'" width="'+width+'" height="'+height+'" />';
+    } else if(/\.flv$/i.test(src) || /\.mov$/i.test(src) || /\.moov$/i.test(src) || /\.m4v$/i.test(src)) {
+        html = '<embed src="'+request_uri+'common/img/flvplayer.swf" allowfullscreen="true" autostart="'+autostart+'" width="'+width+'" height="'+height+'" flashvars="&file='+src+'&width='+width+'&height='+height+'&autostart='+autostart+'" wmode="'+params.wmode+'" />';
+    } else if(/\.swf/i.test(src)) {
+        clsid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+
+        if(typeof(enforce_ssl)!='undefined' && enforce_ssl){ codebase = "https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
+        else { codebase = "http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0"; }
+        html = '<object classid="'+clsid+'" codebase="'+codebase+'" width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'">';
+        html += '<param name="movie" value="'+src+'" />';
+        for(var name in params) {
+            if(params[name] != 'undefined' && params[name] != '') {
+                html += '<param name="'+name+'" value="'+params[name]+'" />';
+            }
+        }
+        html += ''
+            + '<embed src="'+src+'" autostart="'+autostart+'"  width="'+width+'" height="'+height+'" flashvars="'+params.flashvars+'" wmode="'+params.wmode+'"></embed>'
+            + '</object>';
+    }  else {
+		if (jQuery.browser.mozilla || jQuery.browser.opera) {
+			// firefox and opera uses 0 or 1 for autostart parameter.
+			autostart = (params.autostart && params.autostart != 'false') ? '1' : '0';
+		}
+
+        html = '<embed src="'+src+'" autostart="'+autostart+'" width="'+width+'" height="'+height+'"';
+        if(params.wmode == 'transparent') {
+            html += ' windowlessvideo="1"';
+        }
+        html += '></embed>';
+    }
+    return html;
+}
+
+/**
+ * @brief 에디터에서 사용되는 내용 여닫는 코드 (고정, zbxe용)
+ **/
+function zbxe_folder_open(id) {
+    jQuery("#folder_open_"+id).hide();
+    jQuery("#folder_close_"+id).show();
+    jQuery("#folder_"+id).show();
+}
+function zbxe_folder_close(id) {
+    jQuery("#folder_open_"+id).show();
+    jQuery("#folder_close_"+id).hide();
+    jQuery("#folder_"+id).hide();
+}
+
+/**
+ * @brief 팝업의 경우 내용에 맞춰 현 윈도우의 크기를 조절해줌
+ * 팝업의 내용에 맞게 크기를 늘리는 것은... 쉽게 되지는 않음.. ㅡ.ㅜ
+ * popup_layout 에서 window.onload 시 자동 요청됨.
+ **/
+function setFixedPopupSize() {
+	var $ = jQuery, $win = $(window), $pc = $('body>.popup'), w, h, dw, dh, offset;
+
+	offset = $pc.css({overflow:'scroll'}).offset();
+
+	w = $pc.width(10).height(10000).get(0).scrollWidth + offset.left*2;
+	h = $pc.height(10).width(10000).get(0).scrollHeight + offset.top*2;
+
+	if(w < 600) w = 600 + offset.left*2;
+
+	dw = $win.width();
+	dh = $win.height();
+
+	if(w != dw) window.resizeBy(w - dw, 0);
+	if(h != dh) window.resizeBy(0, h - dh);
+
+	$pc.width(w-offset.left*2).css({overflow:'',height:''});
+}
+
+/**
+ * @brief 추천/비추천,스크랩,신고기능등 특정 srl에 대한 특정 module/action을 호출하는 함수
+ **/
+function doCallModuleAction(module, action, target_srl) {
+    var params = {
+		target_srl : target_srl,
+		cur_mid    : current_mid,
+		mid        : current_mid
+	};
+    exec_xml(module, action, params, completeCallModuleAction);
+}
+
+function completeCallModuleAction(ret_obj, response_tags) {
+    if(ret_obj['message']!='success') alert(ret_obj['message']);
+    location.reload();
+}
+
+function completeMessage(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+
+
+/* 언어코드 (lang_type) 쿠키값 변경 */
+function doChangeLangType(obj) {
+    if(typeof(obj) == "string") {
+        setLangType(obj);
+    } else {
+        var val = obj.options[obj.selectedIndex].value;
+        setLangType(val);
+    }
+	location.href = location.href.setQuery('l', '');
+}
+function setLangType(lang_type) {
+    var expire = new Date();
+    expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
+    setCookie('lang_type', lang_type, expire, '/');
+}
+
+/* 미리보기 */
+function doDocumentPreview(obj) {
+    var fo_obj = obj;
+    while(fo_obj.nodeName != "FORM") {
+        fo_obj = fo_obj.parentNode;
+    }
+    if(fo_obj.nodeName != "FORM") return;
+    var editor_sequence = fo_obj.getAttribute('editor_sequence');
+
+    var content = editorGetContent(editor_sequence);
+
+    var win = window.open("", "previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");
+
+    var dummy_obj = jQuery("#previewDocument");
+
+    if(!dummy_obj.length) {
+        jQuery(
+            '<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'">'+
+            '<input type="hidden" name="module" value="document" />'+
+            '<input type="hidden" name="act" value="dispDocumentPreview" />'+
+            '<input type="hidden" name="content" />'+
+            '</form>'
+        ).appendTo(document.body);
+
+        dummy_obj = jQuery("#previewDocument")[0];
+    }
+
+    if(dummy_obj) {
+        dummy_obj.content.value = content;
+        dummy_obj.submit();
+    }
+}
+
+/* 게시글 저장 */
+function doDocumentSave(obj) {
+    var editor_sequence = obj.form.getAttribute('editor_sequence');
+    var prev_content = editorRelKeys[editor_sequence]['content'].value;
+    if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') {
+        var content = editorGetContent(editor_sequence);
+        editorRelKeys[editor_sequence]['content'].value = content;
+    }
+
+	var params={}, responses=['error','message','document_srl'], elms=obj.form.elements, data=jQuery(obj.form).serializeArray();;
+	jQuery.each(data, function(i, field){
+		var val = jQuery.trim(field.value);
+		if(!val) return true;
+		if(/\[\]$/.test(field.name)) field.name = field.name.replace(/\[\]$/, '');
+		if(params[field.name]) params[field.name] += '|@|'+val;
+		else params[field.name] = field.value;
+	});
+
+	exec_xml('document','procDocumentTempSave', params, completeDocumentSave, responses, params, obj.form);
+
+    editorRelKeys[editor_sequence]['content'].value = prev_content;
+    return false;
+}
+
+function completeDocumentSave(ret_obj) {
+    jQuery('input[name=document_srl]').eq(0).val(ret_obj['document_srl']);
+    alert(ret_obj['message']);
+}
+
+/* 저장된 게시글 불러오기 */
+var objForSavedDoc = null;
+function doDocumentLoad(obj) {
+    // 저장된 게시글 목록 불러오기
+    objForSavedDoc = obj.form;
+    popopen(request_uri.setQuery('module','document').setQuery('act','dispTempSavedList'));
+}
+
+/* 저장된 게시글의 선택 */
+function doDocumentSelect(document_srl) {
+    if(!opener || !opener.objForSavedDoc) {
+        window.close();
+        return;
+    }
+
+    // 게시글을 가져와서 등록하기
+    opener.location.href = opener.current_url.setQuery('document_srl', document_srl).setQuery('act', 'dispBoardWrite');
+    window.close();
+}
+
+
+/* 스킨 정보 */
+function viewSkinInfo(module, skin) {
+    popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+module+"&skin="+skin, 'SkinInfo');
+}
+
+
+/* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */
+var addedDocument = new Array();
+function doAddDocumentCart(obj) {
+    var srl = obj.value;
+    addedDocument[addedDocument.length] = srl;
+    setTimeout(function() { callAddDocumentCart(addedDocument.length); }, 100);
+}
+
+function callAddDocumentCart(document_length) {
+    if(addedDocument.length<1 || document_length != addedDocument.length) return;
+    var params = new Array();
+    params["srls"] = addedDocument.join(",");
+    exec_xml("document","procDocumentAddCart", params, null);
+    addedDocument = new Array();
+}
+
+/* ff의 rgb(a,b,c)를 #... 로 변경 */
+function transRGB2Hex(value) {
+    if(!value) return value;
+    if(value.indexOf('#') > -1) return value.replace(/^#/, '');
+
+    if(value.toLowerCase().indexOf('rgb') < 0) return value;
+    value = value.replace(/^rgb\(/i, '').replace(/\)$/, '');
+    value_list = value.split(',');
+
+    var hex = '';
+    for(var i = 0; i < value_list.length; i++) {
+        var color = parseInt(value_list[i], 10).toString(16);
+        if(color.length == 1) color = '0'+color;
+        hex += color;
+    }
+    return hex;
+}
+
+/* 보안 로그인 모드로 전환 */
+function toggleSecuritySignIn() {
+    var href = location.href;
+    if(/https:\/\//i.test(href)) location.href = href.replace(/^https/i,'http');
+    else location.href = href.replace(/^http/i,'https');
+}
+
+function reloadDocument() {
+    location.reload();
+}
+
+
+/**
+*
+* Base64 encode / decode
+* http://www.webtoolkit.info/
+*
+**/
+
+var Base64 = {
+
+    // private property
+    _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+
+    // public method for encoding
+    encode : function (input) {
+        var output = "";
+        var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        input = Base64._utf8_encode(input);
+
+        while (i < input.length) {
+
+            chr1 = input.charCodeAt(i++);
+            chr2 = input.charCodeAt(i++);
+            chr3 = input.charCodeAt(i++);
+
+            enc1 = chr1 >> 2;
+            enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+            enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+            enc4 = chr3 & 63;
+
+            if (isNaN(chr2)) {
+                enc3 = enc4 = 64;
+            } else if (isNaN(chr3)) {
+                enc4 = 64;
+            }
+
+            output = output +
+            this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
+            this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
+
+        }
+
+        return output;
+    },
+
+    // public method for decoding
+    decode : function (input) {
+        var output = "";
+        var chr1, chr2, chr3;
+        var enc1, enc2, enc3, enc4;
+        var i = 0;
+
+        input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+        while (i < input.length) {
+
+            enc1 = this._keyStr.indexOf(input.charAt(i++));
+            enc2 = this._keyStr.indexOf(input.charAt(i++));
+            enc3 = this._keyStr.indexOf(input.charAt(i++));
+            enc4 = this._keyStr.indexOf(input.charAt(i++));
+
+            chr1 = (enc1 << 2) | (enc2 >> 4);
+            chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+            chr3 = ((enc3 & 3) << 6) | enc4;
+
+            output = output + String.fromCharCode(chr1);
+
+            if (enc3 != 64) {
+                output = output + String.fromCharCode(chr2);
+            }
+            if (enc4 != 64) {
+                output = output + String.fromCharCode(chr3);
+            }
+
+        }
+
+        output = Base64._utf8_decode(output);
+
+        return output;
+
+    },
+
+    // private method for UTF-8 encoding
+    _utf8_encode : function (string) {
+        string = string.replace(/\r\n/g,"\n");
+        var utftext = "";
+
+        for (var n = 0; n < string.length; n++) {
+
+            var c = string.charCodeAt(n);
+
+            if (c < 128) {
+                utftext += String.fromCharCode(c);
+            }
+            else if((c > 127) && (c < 2048)) {
+                utftext += String.fromCharCode((c >> 6) | 192);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+            else {
+                utftext += String.fromCharCode((c >> 12) | 224);
+                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+
+        }
+
+        return utftext;
+    },
+
+    // private method for UTF-8 decoding
+    _utf8_decode : function (utftext) {
+        var string = "";
+        var i = 0;
+        var c = c1 = c2 = 0;
+
+        while ( i < utftext.length ) {
+
+            c = utftext.charCodeAt(i);
+
+            if (c < 128) {
+                string += String.fromCharCode(c);
+                i++;
+            }
+            else if((c > 191) && (c < 224)) {
+                c2 = utftext.charCodeAt(i+1);
+                string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+                i += 2;
+            }
+            else {
+                c2 = utftext.charCodeAt(i+1);
+                c3 = utftext.charCodeAt(i+2);
+                string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+                i += 3;
+            }
+
+        }
+
+        return string;
+    }
+
+}
+
+
+
+
+
+
+/* ----------------------------------------------
+ * DEPRECATED
+ * 하위호환용으로 남겨 놓음
+ * ------------------------------------------- */
+
+if(typeof(resizeImageContents) == 'undefined') {
+    function resizeImageContents() {}
+}
+
+if(typeof(activateOptionDisabled) == 'undefined') {
+    function activateOptionDisabled() {}
+}
+
+objectExtend = jQuery.extend;
+
+/**
+ * @brief 특정 Element의 display 옵션 토글
+ **/
+function toggleDisplay(objId) {
+    jQuery('#'+objId).toggle();
+}
+
+/* 체크박스 선택 */
+function checkboxSelectAll(formObj, name, checked) {
+    var itemName = name;
+    var option = {};
+    if(typeof(formObj) != "undefined") option.wrap = formObj;
+    if(typeof(checked) != "undefined") option.checked = checked;
+
+    XE.checkboxToggleAll(itemName, option);
+}
+
+/* 체크박스를 실행 */
+function clickCheckBoxAll(formObj, name) {
+    var itemName = name;
+    var option = { doClick:true };
+    if(typeof(formObj) != "undefined") option.wrap = formObj;
+
+    XE.checkboxToggleAll(itemName, option);
+}
+
+/**
+ * @brief 에디터에서 사용하되 내용 여닫는 코드 (zb5beta beta 호환용으로 남겨 놓음)
+ **/
+function svc_folder_open(id) {
+    jQuery("#_folder_open_"+id).hide();
+    jQuery("#_folder_close_"+id).show();
+    jQuery("#_folder_"+id).show();
+}
+function svc_folder_close(id) {
+    jQuery("#_folder_open_"+id).show();
+    jQuery("#_folder_close_"+id).hide();
+    jQuery("#_folder_"+id).hide();
+}
+
+/**
+ * @brief 날짜 선택 (달력 열기)
+ **/
+function open_calendar(fo_id, day_str, callback_func) {
+    if(typeof(day_str)=="undefined") day_str = "";
+
+    var url = "./common/tpl/calendar.php?";
+    if(fo_id) url+="fo_id="+fo_id;
+    if(day_str) url+="&day_str="+day_str;
+    if(callback_func) url+="&callback_func="+callback_func;
+
+    popopen(url, 'Calendar');
+}
+
+var loaded_popup_menus = XE.loaded_popup_menus;
+function createPopupMenu() {}
+function chkPopupMenu() {}
+function displayPopupMenu(ret_obj, response_tags, params) {
+    XE.displayPopupMenu(ret_obj, response_tags, params);
+}
+
+function GetObjLeft(obj) {
+    return jQuery(obj).offset().left;
+}
+function GetObjTop(obj) {
+    return jQuery(obj).offset().top;
+}
+
+function replaceOuterHTML(obj, html) {
+    jQuery(obj).replaceWith(html);
+}
+
+function getOuterHTML(obj) {
+    return jQuery(obj).html().trim();
+}
+
+function setCookie(name, value, expire, path) {
+	var s_cookie = name + "=" + escape(value) +
+		((!expire) ? "" : ("; expires=" + expire.toGMTString())) +
+		"; path=" + ((!path) ? "/" : path);
+
+	document.cookie = s_cookie;
+}
+
+function getCookie(name) {
+	var match = document.cookie.match(new RegExp(name+'=(.*?)(?:;|$)'));
+	if(match) return unescape(match[1]);
+}
+
+function is_def(v) {
+	return (typeof(v)!='undefined');
+}
+
+function ucfirst(str) {
+	return str.charAt(0).toUpperCase() + str.slice(1);
+}
+
+function get_by_id(id) {
+	return document.getElementById(id);
+}
+
+jQuery(function($){
+    $('.lang_code').each(
+		function() 
+		{
+			var objText = $(this);
+			var targetName = objText.attr("id");
+			if(typeof(targetName) == "undefined") targetName = objText.attr("name");
+			if(typeof(targetName) == "undefined") return;
+			objText.after("<a href='"+request_uri.setQuery('module','module').setQuery('act','dispModuleAdminLangcode').setQuery('target',targetName)+"' class='buttonSet buttonSetting' onclick='popopen(this.href);return false;'><span>find_langcode</span></a>"); 
+		}
+    );
+
+	// display popup menu that contains member actions and document actions
+	$(document).click(function(evt) {
+		var $area = $('#popup_menu_area');
+		if(!$area.length) $area = $('<div id="popup_menu_area" style="display:none;z-index:9999" />').appendTo(document.body);
+
+		// 이전에 호출되었을지 모르는 팝업메뉴 숨김
+		$area.hide();
+
+		var $target = $(evt.target).filter('a,div,span');
+		if(!$target.length) $target = $(evt.target).closest('a,div,span');
+		if(!$target.length) return;
+
+        // 객체의 className값을 구함
+		var cls = $target.attr('class'), match;
+		if(cls) match = cls.match(new RegExp('(?:^| )((document|comment|member)_([1-9]\\d*))(?: |$)',''));
+		if(!match) return;
+
+		var action = 'get'+ucfirst(match[2])+'Menu';
+		var params = {
+			mid        : current_mid,
+			cur_mid    : current_mid,
+			menu_id    : match[1],
+			target_srl : match[3],
+			cur_act    : current_url.getQuery('act'),
+			page_x     : evt.pageX,
+			page_y     : evt.pageY
+		};
+		var response_tags = 'error message menus'.split(' ');
+
+		// prevent default action
+		evt.preventDefault();
+		evt.stopPropagation();
+
+		if(is_def(window.xeVid)) params.vid = xeVid;
+		if(is_def(XE.loaded_popup_menus[params.menu_id])) return XE.displayPopupMenu(params, response_tags, params);
+
+		show_waiting_message = false;
+		exec_xml('member', action, params, XE.displayPopupMenu, response_tags, params);
+        show_waiting_message = true;
+    });
+
+	/**
+	 * Create popup windows automatically.
+	 * Find anchors that have the '_xe_popup' class, then add popup script to them.
+	 */
+	$('a._xe_popup').click(function(){
+		var $this = $(this), name = $this.attr('name'), href = $this.attr('href'), win;
+
+		if(!name) name = '_xe_popup_'+Math.floor(Math.random()*1000);
+
+		win = window.open(href, name, 'left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');
+		if(win) win.focus();
+
+		// cancel default action
+		return false;
+	});
+});
+/**
+ * @file   common/js/xml_handler.js
+ * @brief  XE에서 ajax기능을 이용함에 있어 module, act를 잘 사용하기 위한 자바스크립트
+ **/
+
+// xml handler을 이용하는 user function
+var show_waiting_message = true;
+
+/*  This work is licensed under Creative Commons GNU LGPL License.
+
+    License: http://creativecommons.org/licenses/LGPL/2.1/
+   Version: 0.9
+    Author:  Stefan Goessner/2006
+    Web:     http://goessner.net/
+*/
+function xml2json(xml, tab, ignoreAttrib) {
+   var X = {
+      toObj: function(xml) {
+         var o = {};
+         if (xml.nodeType==1) {   // element node ..
+            if (ignoreAttrib && xml.attributes.length)   // element with attributes  ..
+               for (var i=0; i<xml.attributes.length; i++)
+                  o["@"+xml.attributes[i].nodeName] = (xml.attributes[i].nodeValue||"").toString();
+            if (xml.firstChild) { // element has child nodes ..
+               var textChild=0, cdataChild=0, hasElementChild=false;
+               for (var n=xml.firstChild; n; n=n.nextSibling) {
+                  if (n.nodeType==1) hasElementChild = true;
+                  else if (n.nodeType==3 && n.nodeValue.match(/[^ \f\n\r\t\v]/)) textChild++; // non-whitespace text
+                  else if (n.nodeType==4) cdataChild++; // cdata section node
+               }
+               if (hasElementChild) {
+                  if (textChild < 2 && cdataChild < 2) { // structured element with evtl. a single text or/and cdata node ..
+                     X.removeWhite(xml);
+                     for (var n=xml.firstChild; n; n=n.nextSibling) {
+                        if (n.nodeType == 3)  // text node
+                           o = X.escape(n.nodeValue);
+                        else if (n.nodeType == 4)  // cdata node
+//                           o["#cdata"] = X.escape(n.nodeValue);
+                            o = X.escape(n.nodeValue);
+                        else if (o[n.nodeName]) {  // multiple occurence of element ..
+                           if (o[n.nodeName] instanceof Array)
+                              o[n.nodeName][o[n.nodeName].length] = X.toObj(n);
+                           else
+                              o[n.nodeName] = [o[n.nodeName], X.toObj(n)];
+                        }
+                        else  // first occurence of element..
+                           o[n.nodeName] = X.toObj(n);
+                     }
+                  }
+                  else { // mixed content
+                     if (!xml.attributes.length)
+                        o = X.escape(X.innerXml(xml));
+                     else
+                        o["#text"] = X.escape(X.innerXml(xml));
+                  }
+               }
+               else if (textChild) { // pure text
+                  if (!xml.attributes.length)
+                     o = X.escape(X.innerXml(xml));
+                  else
+                     o["#text"] = X.escape(X.innerXml(xml));
+               }
+               else if (cdataChild) { // cdata
+                  if (cdataChild > 1)
+                     o = X.escape(X.innerXml(xml));
+                  else
+                     for (var n=xml.firstChild; n; n=n.nextSibling){
+                        //o["#cdata"] = X.escape(n.nodeValue);
+                        o = X.escape(n.nodeValue);
+                  }
+               }
+            }
+            if (!xml.attributes.length && !xml.firstChild) o = null;
+         }
+         else if (xml.nodeType==9) { // document.node
+            o = X.toObj(xml.documentElement);
+         }
+         else
+            alert("unhandled node type: " + xml.nodeType);
+         return o;
+      },
+      toJson: function(o, name, ind) {
+         var json = name ? ("\""+name+"\"") : "";
+         if (o instanceof Array) {
+            for (var i=0,n=o.length; i<n; i++)
+               o[i] = X.toJson(o[i], "", ind+"\t");
+            json += (name?":[":"[") + (o.length > 1 ? ("\n"+ind+"\t"+o.join(",\n"+ind+"\t")+"\n"+ind) : o.join("")) + "]";
+         }
+         else if (o == null)
+            json += (name&&":") + "null";
+         else if (typeof(o) == "object") {
+            var arr = [];
+            for (var m in o)
+               arr[arr.length] = X.toJson(o[m], m, ind+"\t");
+            json += (name?":{":"{") + (arr.length > 1 ? ("\n"+ind+"\t"+arr.join(",\n"+ind+"\t")+"\n"+ind) : arr.join("")) + "}";
+         }
+         else if (typeof(o) == "string")
+            json += (name&&":") + "\"" + o.toString() + "\"";
+         else
+            json += (name&&":") + o.toString();
+         return json;
+      },
+      innerXml: function(node) {
+         var s = ""
+         if ("innerHTML" in node)
+            s = node.innerHTML;
+         else {
+            var asXml = function(n) {
+               var s = "";
+               if (n.nodeType == 1) {
+                  s += "<" + n.nodeName;
+                  for (var i=0; i<n.attributes.length;i++)
+                     s += " " + n.attributes[i].nodeName + "=\"" + (n.attributes[i].nodeValue||"").toString() + "\"";
+                  if (n.firstChild) {
+                     s += ">";
+                     for (var c=n.firstChild; c; c=c.nextSibling)
+                        s += asXml(c);
+                     s += "</"+n.nodeName+">";
+                  }
+                  else
+                     s += "/>";
+               }
+               else if (n.nodeType == 3)
+                  s += n.nodeValue;
+               else if (n.nodeType == 4)
+                  s += "<![CDATA[" + n.nodeValue + "]]>";
+               return s;
+            };
+            for (var c=node.firstChild; c; c=c.nextSibling)
+               s += asXml(c);
+         }
+         return s;
+      },
+      escape: function(txt) {
+         return txt.replace(/[\\]/g, "\\\\")
+                   .replace(/[\"]/g, '\\"')
+                   .replace(/[\n]/g, '\\n')
+                   .replace(/[\r]/g, '\\r');
+      },
+      removeWhite: function(e) {
+         e.normalize();
+         for (var n = e.firstChild; n; ) {
+            if (n.nodeType == 3) {  // text node
+               if (!n.nodeValue.match(/[^ \f\n\r\t\v]/)) { // pure whitespace text node
+                  var nxt = n.nextSibling;
+                  e.removeChild(n);
+                  n = nxt;
+               }
+               else
+                  n = n.nextSibling;
+            }
+            else if (n.nodeType == 1) {  // element node
+               X.removeWhite(n);
+               n = n.nextSibling;
+            }
+            else                      // any other node
+               n = n.nextSibling;
+         }
+         return e;
+      }
+   };
+   if (xml.nodeType == 9) // document node
+      xml = xml.documentElement;
+
+   var json_obj = X.toObj(X.removeWhite(xml)), json_str;
+
+   if (typeof(JSON)=='object' && jQuery.isFunction(JSON.stringify) && false) {
+	   var obj = {}; obj[xml.nodeName] = json_obj;
+	   json_str = JSON.stringify(obj);
+	   return json_str;
+   } else {
+	   json_str = X.toJson(json_obj, xml.nodeName, "");
+	   return "{" + (tab ? json_str.replace(/\t/g, tab) : json_str.replace(/\t|\n/g, "")) + "}";
+   }
+}
+
+(function($){
+/**
+ * @brief exec_xml
+ * @author NHN (developers@xpressengine.com)
+ **/
+$.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) {
+	var xml_path = request_uri+"index.php"
+    if(!params) params = {};
+
+	// {{{ set parameters
+	if($.isArray(params)) params = arr2obj(params);
+	params['module'] = module;
+	params['act']    = act;
+
+    if(typeof(xeVid)!='undefined') params['vid'] = xeVid;
+    if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = ['error','message'];
+	else {
+		response_tags.push('error', 'message');
+	}
+	// }}} set parameters
+
+	// use ssl?
+	if ($.isArray(ssl_actions) && params['act'] && $.inArray(params['act'], ssl_actions) >= 0)
+	{
+		var url    = default_url || request_uri;
+		var port   = window.https_port || 443;
+		var _ul    = $('<a>').attr('href', url)[0];
+		var target = 'https://' + _ul.hostname.replace(/:\d+$/, '');
+
+		if(port != 443) target += ':'+port;
+		if(_ul.pathname[0] != '/') target += '/';
+
+		target += _ul.pathname;
+		xml_path = target.replace(/\/$/, '')+'/index.php';
+	}
+
+	var _u1 = $('<a>').attr('href', location.href)[0];
+	var _u2 = $('<a>').attr('href', xml_path)[0];
+
+	// 현 url과 ajax call 대상 url의 schema 또는 port가 다르면 직접 form 전송
+	if(_u1.protocol != _u2.protocol || _u1.port != _u2.port) return send_by_form(xml_path, params);
+
+	var xml = [], i = 0;
+	xml[i++] = '<?xml version="1.0" encoding="utf-8" ?>';
+	xml[i++] = '<methodCall>';
+	xml[i++] = '<params>';
+
+	$.each(params, function(key, val) {
+		xml[i++] = '<'+key+'><![CDATA['+val+']]></'+key+'>';
+	});
+
+	xml[i++] = '</params>';
+	xml[i++] = '</methodCall>';
+
+	var _xhr = null;
+	if (_xhr && _xhr.readyState != 0) _xhr.abort();
+
+	// 전송 성공시
+	function onsuccess(data, textStatus, xhr) {
+		var resp_xml = $(data).find('response')[0], resp_obj, txt='', ret=[], tags={}, json_str='';
+
+		waiting_obj.css('display', 'none').trigger('cancel_confirm');
+
+		if(!resp_xml) {
+			alert(_xhr.responseText);
+			return null;
+		}
+
+		json_str = xml2json(resp_xml, false, false);
+		resp_obj = (typeof(JSON)=='object' && $.isFunction(JSON.parse))?JSON.parse(json_str):eval('('+json_str+')');
+		resp_obj = resp_obj.response;
+
+		if (typeof(resp_obj)=='undefined') {
+			ret['error'] = -1;
+			ret['message'] = 'Unexpected error occured.';
+			try {
+				if(typeof(txt=resp_xml.childNodes[0].firstChild.data)!='undefined') ret['message'] += '\r\n'+txt;
+			} catch(e){};
+			return ret;
+		}
+
+		$.each(response_tags, function(key, val){ tags[val] = true; });
+        tags["redirect_url"] = true;
+        tags["act"] = true;
+		$.each(resp_obj, function(key, val){ if(tags[key]) ret[key] = val; });
+
+		if(ret['error'] != 0) {
+			if ($.isFunction($.exec_xml.onerror)) {
+				return $.exec_xml.onerror(module, act, ret, callback_func, response_tags, callback_func_arg, fo_obj);
+			}
+
+			alert(ret['message'] || 'error!');
+			return null;
+		}
+
+		if(ret['redirect_url']) {
+			location.href = ret['redirect_url'].replace(/&amp;/g, '&');
+			return null;
+		}
+
+		if($.isFunction(callback_func)) callback_func(ret, response_tags, callback_func_arg, fo_obj);
+	}
+
+	// 모든 xml데이터는 POST방식으로 전송. try-catch문으로 오류 발생시 대처
+	try {
+		$.ajax({
+			url         : xml_path,
+			type        : 'POST',
+			dataType    : 'xml',
+			data        : xml.join('\n'),
+			contentType : 'text/plain',
+			beforeSend  : function(xhr){ _xhr = xhr; },
+			success     : onsuccess,
+			error       : function(xhr, textStatus) {
+				waiting_obj.css('display', 'none');
+
+				var msg = '';
+				if (textStatus == 'parsererror') {
+					msg  = 'The result is not valid XML :\n-------------------------------------\n';
+					if(xhr.responseText == "") return;
+					msg += xhr.responseText.replace(/<[^>]+>/g, '');
+				} else {
+					msg = textStatus;
+				}
+
+				try{
+					console.log(msg);
+				}catch(ee){}
+			}
+		});
+	} catch(e) {
+		alert(e);
+		return;
+	}
+
+	// ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음)
+	var waiting_obj = $('.wfsr');
+	if(show_waiting_message && waiting_obj.length) {
+		waiting_obj.html(waiting_message).show();
+	}
+}
+function send_by_form(url, params) {
+	var frame_id = 'xeTmpIframe';
+	var form_id  = 'xeVirtualForm';
+
+	if (!$('#'+frame_id).length) {
+		$('<iframe name="%id%" id="%id%" style="position:absolute;left:-1px;top:1px;width:1px;height:1px"></iframe>'.replace(/%id%/g, frame_id)).appendTo(document.body);
+	}
+
+	$('#'+form_id).remove();
+	var form = $('<form id="%id%"></form>'.replace(/%id%/g, form_id)).attr({
+		'id'     : form_id,
+		'method' : 'post',
+		'action' : url,
+		'target' : frame_id
+	});
+
+	params['xeVirtualRequestMethod'] = 'xml';
+	params['xeRequestURI']           = location.href.replace(/#(.*)$/i,'');
+	params['xeVirtualRequestUrl']    = request_uri;
+
+	$.each(params, function(key, value){
+		$('<input type="hidden">').attr('name', key).attr('value', value).appendTo(form);
+	});
+
+	form.appendTo(document.body).submit();
+}
+function arr2obj(arr) {
+	var ret = {};
+	for(var key in arr) {
+		if(arr.hasOwnProperty(key)) ret[key] = arr[key];
+	}
+	return ret;
+}
+
+
+/**
+ * @brief exec_json (exec_xml와 같은 용도)
+ **/
+$.exec_json = function(action,data,func){
+    if(typeof(data) == 'undefined') data = {};
+    action = action.split(".");
+    if(action.length == 2){
+        if(show_waiting_message) $(".wfsr").html(waiting_message).show();
+
+        $.extend(data,{module:action[0],act:action[1]});
+        if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid});
+        $.ajax({
+            type:"POST"
+            ,dataType:"json"
+            ,url:request_uri
+            ,contentType:"application/json"
+            ,data:$.param(data)
+            ,success : function(data){
+                $(".wfsr").hide().trigger('cancel_confirm');
+                if(data.error > 0) alert(data.message);
+                if($.isFunction(func)) func(data);
+            }
+        });
+    }
+};
+
+$.fn.exec_html = function(action,data,type,func,args){
+    if(typeof(data) == 'undefined') data = {};
+    if(!$.inArray(type, ['html','append','prepend'])) type = 'html';
+
+    var self = $(this);
+    action = action.split(".");
+    if(action.length == 2){
+        if(show_waiting_message) $(".wfsr").html(waiting_message).show();
+
+        $.extend(data,{module:action[0],act:action[1]});
+        $.ajax({
+            type:"POST"
+            ,dataType:"html"
+            ,url:request_uri
+            ,data:$.param(data)
+            ,success : function(html){
+                $(".wfsr").hide().trigger('cancel_confirm');
+                self[type](html);
+                if($.isFunction(func)) func(args);
+            }
+        });
+    }
+};
+
+function beforeUnloadHandler(){
+	return '';
+}
+
+$(function($){
+	$('.wfsr')
+		.ajaxStart(function(){
+			$(window).bind('beforeunload', beforeUnloadHandler);
+		})
+		.bind('ajaxStop cancel_confirm', function(){
+			$(window).unbind('beforeunload', beforeUnloadHandler);
+		});
+});
+
+})(jQuery);
+/**
+ * @file   common/js/xml_js_filter.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  xml filter (validator) plugin
+ * 
+ * A rule is a method validate one field.
+ * A filter is made up of one or more rules.
+ **/
+(function($){
+
+var messages  = [];
+var rules     = [];
+var filters   = {};
+var callbacks = [];
+var extras    = {};
+
+var Validator = xe.createApp('Validator', {
+	init : function() {
+		// {{{ add filters
+		// email
+		var regEmail = /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;
+		this.cast('ADD_RULE', ['email', regEmail]);
+		this.cast('ADD_RULE', ['email_address', regEmail]);
+
+		// userid
+		var regUserid = /^[a-z]+[\w-]*[a-z0-9_]+$/i;
+		this.cast('ADD_RULE', ['userid', regUserid]);
+		this.cast('ADD_RULE', ['user_id', regUserid]);
+
+		// url
+		var regUrl = /^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:\d+)?/;
+		this.cast('ADD_RULE', ['url', regUrl]);
+		this.cast('ADD_RULE', ['homepage', regUrl]);
+
+		// korean
+		var regKor = new RegExp('^[\uAC00-\uD7A3]*$');
+		this.cast('ADD_RULE', ['korean', regKor]);
+
+		// korean_number
+		var regKorNum = new RegExp('^[\uAC00-\uD7A30-9]*$');
+		this.cast('ADD_RULE', ['korean_number', regKorNum]);
+
+		// alpha
+		var regAlpha = /^[a-z]*$/i;
+		this.cast('ADD_RULE', ['alpha', regAlpha]);
+
+		// alpha_number
+		var regAlphaNum = /^[a-z][a-z0-9_]*$/i;
+		this.cast('ADD_RULE', ['alpha_number', regAlphaNum]);
+
+		// number
+		var regNum = /^[0-9]*$/;
+		this.cast('ADD_RULE', ['number', regNum]);
+		// }}} add filters
+	},
+	// run validator
+	run : function(oForm) {
+		var filter = '';
+
+		if (oForm._filter) filter = oForm._filter.value;
+
+		var params = [oForm, filter];
+		var result = this.cast('VALIDATE', params);
+		if (typeof result == 'undefined') result = false;
+
+		return result;
+	},
+	API_ONREADY : function() {
+		var self = this;
+
+		// hook form submit event
+		$('form')
+			.each(function(){
+				if (this.onsubmit) {
+					this['xe:onsubmit'] = this.onsubmit;
+					this.onsubmit = null;
+				}
+			})
+			.submit(function(){
+				var legacyFn = this['xe:onsubmit'];		
+				var hasLegacyFn = $.isFunction(legacyFn);
+				var bResult = hasLegacyFn?legacyFn.apply(this):self.run(this);
+
+				return bResult;
+			});
+	},
+	API_VALIDATE : function(sender, params) {
+		var result = true, form = params[0], elems = form.elements, filter, filter_to_add, ruleset, callback;
+		var fields, names, name, el, val, mod, len, lenb, max, min, maxb, minb, rules, e_el, e_val, i, c, r, if_, fn;
+
+		if(elems['ruleset']) filter = form.elements['ruleset'].value;
+		else if(elems['_filter']) filter = form.elements['_filter'].value;
+		if(!filter) return true;
+
+		if($.isFunction(callbacks[filter])) callback = callbacks[filter];
+		filter = $.extend({}, filters[filter.toLowerCase()] || {}, extras);
+
+		function regex_quote(str){
+			return str.replace(/([\.\+\-\[\]\{\}\(\)\\])/g, '\\$1');
+		};
+
+		// get form names
+		fields = [];
+		for(i=0,c=form.elements.length; i < c; i++) {
+			el   = elems[i];
+			name = el.name;
+
+			if(!name || !elems[name]) continue;
+			if(!elems[name].length || elems[name][0] === el) fields.push(name);
+		};
+		fields = fields.join('\n');
+
+		// get field names matching patterns
+		filter_to_add = {};
+		for(name in filter) {
+			if(!filter.hasOwnProperty(name)) continue;
+
+			names = [];
+			if(name.substr(0,1) == '^') {
+				names = fields.match( (new RegExp('^'+regex_quote(name.substr(1))+'.*$','gm')) );
+			} else {
+				continue;
+			}
+			if(!names) names = [];
+
+			for(i=0,c=names.length; i < c; i++) {
+				filter_to_add[names[i]]= filter[name];
+			}
+
+			filter[name] = null;
+			delete filter[name];
+		};
+
+		filter = $.extend(filter, filter_to_add);
+
+		for(name in filter) {
+			if(!filter.hasOwnProperty(name)) continue;
+
+			f   = filter[name];
+			el  = elems[name];
+			val = el?$.trim(get_value($(el))):'';
+			mod = (f.modifier||'')+',';
+
+			if(!el || el.disabled) continue;
+
+			if(f['if']) {
+				if(!$.isArray(f['if'])) f['if'] = [f['if']];
+				for(i=0;i<f['if'].length;i++) {
+					if_ = f['if'][i];
+					fn  = new Function('el', 'return !!(' + (if_.test.replace(/\$(\w+)/g, 'el["$1"].value')) +')');
+					if(fn(elems)) f[if_.attr] = if_.value;
+				}
+			}
+
+			if(!val) {
+				if(f['default']) val = f['default'];
+				if(f.required) return this.cast('ALERT', [form, name, 'isnull']) && false;
+				else continue;
+			}
+
+			min  = parseInt(f.minlength) || 0;
+			max  = parseInt(f.maxlength) || 0;
+			minb = /b$/.test(f.minlength||'');
+			maxb = /b$/.test(f.maxlength||'');
+			len  = val.length;
+			if(minb || maxb) lenb = get_bytes(val);
+			if((min && min > (minb?lenb:len)) || (max && max < (maxb?lenb:len))) {
+				return this.cast('ALERT', [form, name, 'outofrange', min, max]) && false;
+			}
+			
+			if(f.equalto) {
+				e_el  = elems[f.equalto];
+				e_val = e_el?$.trim(get_value($(e_el))):'';
+				if(e_el && e_val !== val) {
+					return this.cast('ALERT', [form, name, 'equalto']) && false;
+				}
+			}
+			
+			rules = (f.rule || '').split(',');
+			for(i=0,c=rules.length; i < c; i++) {
+				if(!(r = rules[i])) continue;
+
+				result = this.cast('APPLY_RULE', [r, val]);
+				if(mod.indexOf('not,') > -1) result = !result;
+				if(!result) {
+					return this.cast('ALERT', [form, name, 'invalid_'+r]) && false;
+				}
+			}
+		};
+
+		if($.isFunction(callback)) return callback(form);
+
+		return true;
+	},
+	API_ADD_RULE : function(sender, params) {
+		var name = params[0].toLowerCase();
+		rules[name] = params[1];
+	},
+	API_DEL_RULE : function(sender, params) {
+		var name = params[0].toLowerCase();
+		delete rules[name];
+	},
+	API_GET_RULE : function(sender, params) {
+		var name = params[0].toLowerCase();
+
+		if (rules[name]) {
+			return rules[name];
+		} else {
+			return null;
+		}
+	},
+	API_ADD_FILTER : function(sender, params) {
+		var name   = params[0].toLowerCase();
+		var filter = params[1];
+
+		filters[name] = filter;
+	},
+	API_DEL_FILTER : function(sender, params) {
+		var name = params[0].toLowerCase();
+		delete filters[name];
+	},
+	API_GET_FILTER : function(sender, params) {
+		var name = params[0].toLowerCase();
+
+		if (filters[name]) {
+			return filters[name];
+		} else {
+			return null;
+		}
+	},
+	API_ADD_EXTRA_FIELD : function(sender, params) {
+		var name = params[0].toLowerCase();
+		var prop = params[1];
+
+		extras[name] = prop;
+	},
+	API_GET_EXTRA_FIELD : function(sender, params) {
+		var name = params[0].toLowerCase();
+		return extras[name];
+	},
+	API_DEL_EXTRA_FIELD : function(sender, params) {
+		var name = params[0].toLowerCase();
+		delete extras[name];
+	},
+	API_APPLY_RULE : function(sender, params) {
+		var name  = params[0];
+		var value = params[1];
+
+		if(typeof(rules[name]) == 'undefined') return true; // no filter
+		if($.isFunction(rules[name])) return rules[name](value);
+		if(rules[name] instanceof RegExp) return rules[name].test(value);
+		if($.isArray(rules[name])) return ($.inArray(value, rules[name]) > -1);
+
+		return true;
+	},
+	API_ALERT : function(sender, params) {
+		var form = params[0];
+		var field_name = params[1];
+		var msg_code = params[2];
+		var minlen   = params[3];
+		var maxlen   = params[4];
+
+		var field_msg = this.cast('GET_MESSAGE', [field_name]);
+		var msg = this.cast('GET_MESSAGE', [msg_code]);
+
+		if (msg != msg_code) msg = (msg.indexOf('%s')<0)?(field_msg+msg):(msg.replace('%s',field_msg));
+		if (minlen||maxlen) msg +=  '('+(minlen||'')+'~'+(maxlen||'')+')';
+
+		this.cast('SHOW_ALERT', [msg]);
+
+		// set focus
+		$(form.elements[field_name]).focus();
+	},
+	API_SHOW_ALERT : function(sender, params) {
+		alert(params[0]);
+	},
+	API_ADD_MESSAGE : function(sender, params) {
+		var msg_code = params[0];
+		var msg_str  = params[1];
+
+		messages[msg_code] = msg_str;
+	},
+	API_GET_MESSAGE : function(sender, params) {
+		var msg_code = params[0];
+
+		return messages[msg_code] || msg_code;
+	},
+	API_ADD_CALLBACK : function(sender, params) {
+		var name = params[0];
+		var func = params[1];
+
+		callbacks[name] = func;
+	},
+	API_REMOVE_CALLBACK : function(sender, params) {
+		var name = params[0];
+
+		delete callbacks[name];
+	}
+});
+
+var oValidator = new Validator;
+
+// register validator
+xe.registerApp(oValidator);
+
+// 호환성을 위해 추가한 플러그인 - 에디터에서 컨텐트를 가져와서 설정한다.
+var EditorStub = xe.createPlugin('editor_stub', {
+	API_BEFORE_VALIDATE : function(sender, params) {
+		var form = params[0];
+		var seq  = form.getAttribute('editor_sequence');
+
+		// bug fix for IE6,7
+		if (seq && typeof seq == 'object') seq = seq.value;
+
+		if (seq) {
+			try {
+				editorRelKeys[seq].content.value = editorRelKeys[seq].func(seq) || '';
+			} catch(e) { }
+		}
+	}
+});
+oValidator.registerPlugin(new EditorStub);
+
+// functions
+function get_value($elem) {
+	var vals = [];
+	if ($elem.is(':radio')){
+		return $elem.filter(':checked').val();
+	} else if ($elem.is(':checkbox')) {
+		$elem.filter(':checked').each(function(){
+			vals.push(this.value);
+		});
+		return vals.join('|@|');
+	} else {
+		return $elem.val();
+	}
+}
+
+function get_bytes(str) {
+	str += '';
+	if(!str.length) return 0;
+
+	str = encodeURI(str);
+	var c = str.split('%').length - 1;
+
+	return str.length - c*2;
+}
+
+})(jQuery);
+
+/**
+ * @function filterAlertMessage
+ * @brief ajax로 서버에 요청후 결과를 처리할 callback_function을 지정하지 않았을 시 호출되는 기본 함수
+ **/
+function filterAlertMessage(ret_obj) {
+	var error = ret_obj["error"];
+	var message = ret_obj["message"];
+	var act = ret_obj["act"];
+	var redirect_url = ret_obj["redirect_url"];
+	var url = location.href;
+
+	if(typeof(message)!="undefined"&&message&&message!="success") alert(message);
+
+	if(typeof(act)!="undefined" && act) url = current_url.setQuery("act", act);
+	else if(typeof(redirect_url)!="undefined" && redirect_url) url = redirect_url;
+
+	if(url == location.href) url = url.replace(/#(.*)$/,'');
+
+	location.href = url;
+}
+
+/**
+ * @brief Function to process filters
+ * @deprecated
+ */
+function procFilter(form, filter_func) {
+	filter_func(form);
+	return false;
+}
+
+function legacy_filter(filter_name, form, module, act, callback, responses, confirm_msg, rename_params) {
+	var v = xe.getApp('Validator')[0], $ = jQuery, args = [];
+
+	if (!v) return false;
+
+	if (!form.elements['_filter']) $(form).prepend('<input type="hidden" name="_filter" />');
+	form.elements['_filter'].value = filter_name;
+
+	args[0] = filter_name;
+	args[1] = function(f) {
+		var params = {}, res = [], elms = f.elements, data = $(f).serializeArray();
+		$.each(data, function(i, field) {
+			var v = $.trim(field.value), n = field.name;
+			if(!v || !n) return true;
+			if(rename_params[n]) n = rename_params[n];
+			
+			if(/\[\]$/.test(n)) n = n.replace(/\[\]$/, '');
+			if(params[n]) params[n] += '|@|'+v;
+			else params[n] = field.value;			
+		});
+
+		if (confirm_msg && !confirm(confirm_msg)) return false;
+		exec_xml(module, act, params, callback, responses, params, form);
+	};
+
+	v.cast('ADD_CALLBACK', args);
+	v.cast('VALIDATE', [form, filter_name]);
+
+	return false;
+}
diff --git a/common/js/xe.min.js b/common/js/xe.min.js
new file mode 100644
index 000000000..9ac416674
--- /dev/null
+++ b/common/js/xe.min.js
@@ -0,0 +1,74 @@
+/**
+ * @file   common/js/xe.min.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  XE Common JavaScript
+ **/
+(function(a){function b(){return function(){var g=this;if(a.isArray(this._plugins))this._plugins=[];this._messages?this._messages={}:this._binded_fn={};a.each(this,function(c,b){if(!a.isFunction(b))return true;if(!/^API_([A-Z0-9_]+)$/.test(c))return true;var d=RegExp.$1,e=function(a,b){return g[c](a,b)};g._messages?g._messages[d]=[e]:g._binded_fn[d]=e});a.isFunction(this.init)&&this.init.apply(this,arguments)}}var d,c,e=[];d={_plugins:[],_messages:{},getPlugin:function(g){g=g.toLowerCase();return a.isArray(this._plugins[g])?
+this._plugins[g]:[]},registerPlugin:function(g){var c=this,b=g.getName().toLowerCase();if(a.inArray(g,this._plugins)>=0)return false;this._plugins.push(g);a.isArray(this._plugins[b])||(this._plugins[b]=[]);this._plugins[b].push(g);a.each(g._binded_fn,function(a,g){c.registerHandler(a,g)});g.oApp=this;a.isFunction(g.activate)&&g.activate();return true},registerHandler:function(g,c){var b=this._messages,g=g.toUpperCase();a.isArray(b[g])||(b[g]=[]);b[g].push(c)},cast:function(a,c){return this._cast(this,
+a,c||[])},broadcast:function(a,c,b){this.parent&&this.parent._broadcast&&this.parent._broadcast(a,c,b)},_cast:function(g,c,b){var d,e=this._messages,c=c.toUpperCase();if(!e["BEFORE_"+c]&&!this["API_BEFORE_"+c]||this._cast(g,"BEFORE_"+c,b)){var h=[];if(a.isArray(e[c]))for(d=0;d<e[c].length;d++)h.push(e[c][d](g,b));h.length<2&&(h=h[0]);(e["AFTER_"+c]||this["API_AFTER_"+c])&&this._cast(g,"AFTER_"+c,b);return/^(?:AFTER|BEFORE)_/.test(c)?a.isArray(h)?a.inArray(false,h)<0:typeof h=="undefined"?true:!!h:
+h}}};c={oApp:null,cast:function(a,c){if(this.oApp&&this.oApp._cast)return this.oApp._cast(this,a,c||[])},broadcast:function(a,c){this.oApp&&this.oApp.broadcast&&this.oApp.broadcast(this,mag,c||[])}};window.xe=a.extend(d,{getName:function(){return"Core"},createApp:function(c,e){var l=b();a.extend(l.prototype,d,e);l.prototype.getName=function(){return c};return l},createPlugin:function(g,d){var e=b();a.extend(e.prototype,c,d);e.prototype.getName=function(){return g};return e},getApps:function(){return a.makeArray(e)},
+getApp:function(a){a=(a||"").toLowerCase();return typeof e[a]!="undefined"?e[a]:null},registerApp:function(c){var b=c.getName().toLowerCase();e.push(c);a.isArray(e[b])||(e[b]=[]);e[b].push(c);c.parent=this;a.isFunction(c.activate)&&c.activate()},unregisterApp:function(c){var b=c.getName().toLowerCase(),d=a.inArray(c,e);d>=0&&(e=e.splice(d,1));a.isArray(e[b])&&(d=a.inArray(c,e[b]),d>=0&&(e[b]=e[b].splice(d,1)));a.isFunction(c.deactivate)&&c.deactivate()},broadcast:function(a,c){this._broadcast(this,
+a,c)},_broadcast:function(a,c,b){for(var d=0;d<e.length;d++)e[d]._cast(a,c,b);this._cast(a,c,b)}});window.xe.lang={};a(function(){xe.broadcast("ONREADY")});a(window).load(function(){xe.broadcast("ONLOAD")})})(jQuery);jQuery&&jQuery.noConflict();
+(function(a){var b=navigator.userAgent.toLowerCase();a.os={Linux:/linux/.test(b),Unix:/x11/.test(b),Mac:/mac/.test(b),Windows:/win/.test(b)};a.os.name=a.os.Windows?"Windows":a.os.Linux?"Linux":a.os.Unix?"Unix":a.os.Mac?"Mac":"";window.XE={loaded_popup_menus:[],addedDocument:[],checkboxToggleAll:function(b){is_def(b)||(b="cart");var c={wrap:null,checked:"toggle",doClick:false};switch(arguments.length){case 1:typeof arguments[0]=="string"?b=arguments[0]:(a.extend(c,arguments[0]||{}),b="cart");break;
+case 2:b=arguments[0],a.extend(c,arguments[1]||{})}if(c.doClick==true)c.checked=null;if(typeof c.wrap=="string")c.wrap="#"+c.wrap;var e=c.wrap?a(c.wrap).find("input[name="+b+"]:checkbox"):a("input[name="+b+"]:checkbox");c.checked=="toggle"?e.each(function(){a(this).attr("checked",a(this).attr("checked")?false:true)}):c.doClick==true?e.click():e.attr("checked",c.checked)},displayPopupMenu:function(b,c,e){var c=e.menu_id,g=b.menus,b="";if(this.loaded_popup_menus[c])b=this.loaded_popup_menus[c];else{if(g){g=
+g.item;if(typeof g.length=="undefined"||g.length<1)g=Array(g);if(g.length)for(var j=0;j<g.length;j++){var l=g[j].url,m=g[j].str,k=g[j].icon,h=g[j].target,v="",o="";k&&(v=" style=\"background-image:url('"+k+"')\" ");switch(h){case "popup":o=" onclick=\"popopen(this.href,'"+h+"'); return false;\"";break;case "javascript":o=' onclick="'+l+'; return false; "';l="#";break;default:o=' onclick="window.open(this.href); return false;"'}b+="<li "+v+'><a href="'+l+'"'+o+">"+m+"</a></li> "}}this.loaded_popup_menus[c]=
+b}if(b)c=a("#popup_menu_area").html("<ul>"+b+"</ul>"),b=e.page_y,e=e.page_x,c.outerHeight()+b>a(window).height()+a(window).scrollTop()&&(b=a(window).height()-c.outerHeight()+a(window).scrollTop()),c.outerWidth()+e>a(window).width()+a(window).scrollLeft()&&(e=a(window).width()-c.outerWidth()+a(window).scrollLeft()),c.css({top:b,left:e}).show()}}})(jQuery);
+jQuery(function(a){a.browser.msie&&a("select").each(function(a,b){for(var g=false,d=[],l=0;l<b.options.length;l++)b.options[l].disabled?(b.options[l].style.color="#CCCCCC",g=true):d[a]=d[a]>-1?d[a]:l;if(g&&(b.oldonchange=b.onchange,b.onchange=function(){this.options[this.selectedIndex].disabled?this.selectedIndex=d[a]:this.oldonchange&&this.oldonchange()},b.selectedIndex>=0&&b.options[b.selectedIndex].disabled))b.onchange()});var b=a(".xe_content .fold_button");if(b.size()){var d=a("div.fold_container",
+b);a("button.more",b).click(function(){a(this).hide().next("button").show().parent().next(d).show()});a("button.less",b).click(function(){a(this).hide().prev("button").show().parent().next(d).hide()})}});String.prototype.getQuery=function(a){var b=this.indexOf("?");if(b==-1)return null;var d={};this.substr(b+1,this.length).replace(/([^=]+)=([^&]*)(&|$)/g,function(a,b,g){d[b]=g});a=d[a];typeof a=="undefined"&&(a="");return a};
+String.prototype.setQuery=function(a,b){var d=this.indexOf("?"),c=this.replace(/#$/,"");if(d!=-1){var e=c.substr(d+1,this.length),g={},j=[],c=this.substr(0,d);e.replace(/([^=]+)=([^&]*)(&|$)/g,function(a,b,c){g[b]=c});g[a]=b;jQuery.each(g,function(a,b){jQuery.trim(b)&&j.push(a+"="+decodeURI(b))});e=j.join("&");c+=e?"?"+e:""}else b.toString().trim()&&(c=c+"?"+a+"="+b);d=/https:\/\/([^:\/]+)(:\d+|)/i;if(e=d.exec(c))e="http://"+e[1],typeof http_port!="undefined"&&http_port!=80&&(e+=":"+http_port),c=
+c.replace(d,e);d=false;if(typeof enforce_ssl!="undefined"&&enforce_ssl)d=true;else if(typeof ssl_actions!="undefined"&&typeof ssl_actions.length!="undefined"&&c.getQuery("act")){e=c.getQuery("act");for(i=0;i<ssl_actions.length;i++)if(ssl_actions[i]==e){d=true;break}}if(d&&(d=/http:\/\/([^:\/]+)(:\d+|)/i,e=d.exec(c)))e="https://"+e[1],typeof https_port!="undefined"&&https_port!=443&&(e+=":"+https_port),c=c.replace(d,e);return encodeURI(c)};
+String.prototype.trim=function(){return this.replace(/(^\s*)|(\s*$)/g,"")};function xSleep(a){a/=1E3;for(var b=new Date,d=new Date;d.getTime()-b.getTime()<a;)d=new Date}function isDef(){for(var a=0;a<arguments.length;++a)if(typeof arguments[a]=="undefined")return false;return true}var winopen_list=[];
+function winopen(a,b,d){typeof xeVid!="undefined"&&a.indexOf(request_uri)>-1&&!a.getQuery("vid")&&(a=a.setQuery("vid",xeVid));try{b!="_blank"&&winopen_list[b]&&(winopen_list[b].close(),winopen_list[b]=null)}catch(c){}typeof b=="undefined"&&(b="_blank");typeof d=="undefined"&&(d="");a=window.open(a,b,d);a.focus();b!="_blank"&&(winopen_list[b]=a)}
+function popopen(a,b){typeof b=="undefined"&&(b="_blank");typeof xeVid!="undefined"&&a.indexOf(request_uri)>-1&&!a.getQuery("vid")&&(a=a.setQuery("vid",xeVid));winopen(a,b,"width=650,height=500,scrollbars=yes,resizable=yes,toolbars=no")}function sendMailTo(a){location.href="mailto:"+a}function move_url(a,b){if(!a)return false;typeof b=="undefined"&&(b="N");b=b=="N"?false:true;/^\./.test(a)&&(a=request_uri+a);b?winopen(a):location.href=a;return false}
+function displayMultimedia(a,b,d,c){(a=_displayMultimedia(a,b,d,c))&&document.writeln(a)}
+function _displayMultimedia(a,b,d,c){a.indexOf("files")==0&&(a=request_uri+a);var c=jQuery.extend({wmode:"transparent",allowScriptAccess:"sameDomain",quality:"high",flashvars:"",autostart:false},c||{}),e=c.autostart&&c.autostart!="false"?"true":"false";delete c.autostart;var g="",g=g="";if(/\.(gif|jpg|jpeg|bmp|png)$/i.test(a))g='<img src="'+a+'" width="'+b+'" height="'+d+'" />';else if(/\.flv$/i.test(a)||/\.mov$/i.test(a)||/\.moov$/i.test(a)||/\.m4v$/i.test(a))g='<embed src="'+request_uri+'common/img/flvplayer.swf" allowfullscreen="true" autostart="'+
+e+'" width="'+b+'" height="'+d+'" flashvars="&file='+a+"&width="+b+"&height="+d+"&autostart="+e+'" wmode="'+c.wmode+'" />';else if(/\.swf/i.test(a)){g='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="'+(typeof enforce_ssl!="undefined"&&enforce_ssl?"https://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0":"http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0")+'" width="'+b+'" height="'+d+'" flashvars="'+c.flashvars+
+'">';g+='<param name="movie" value="'+a+'" />';for(var j in c)c[j]!="undefined"&&c[j]!=""&&(g+='<param name="'+j+'" value="'+c[j]+'" />');g+='<embed src="'+a+'" autostart="'+e+'"  width="'+b+'" height="'+d+'" flashvars="'+c.flashvars+'" wmode="'+c.wmode+'"></embed></object>'}else{if(jQuery.browser.mozilla||jQuery.browser.opera)e=c.autostart&&c.autostart!="false"?"1":"0";g='<embed src="'+a+'" autostart="'+e+'" width="'+b+'" height="'+d+'"';c.wmode=="transparent"&&(g+=' windowlessvideo="1"');g+="></embed>"}return g}
+function zbxe_folder_open(a){jQuery("#folder_open_"+a).hide();jQuery("#folder_close_"+a).show();jQuery("#folder_"+a).show()}function zbxe_folder_close(a){jQuery("#folder_open_"+a).show();jQuery("#folder_close_"+a).hide();jQuery("#folder_"+a).hide()}
+function setFixedPopupSize(){var a=jQuery,b=a(window),a=a("body>.popup"),d,c,e,g;g=a.css({overflow:"scroll"}).offset();d=a.width(10).height(1E4).get(0).scrollWidth+g.left*2;c=a.height(10).width(1E4).get(0).scrollHeight+g.top*2;d<600&&(d=600+g.left*2);e=b.width();b=b.height();d!=e&&window.resizeBy(d-e,0);c!=b&&window.resizeBy(0,c-b);a.width(d-g.left*2).css({overflow:"",height:""})}
+function doCallModuleAction(a,b,d){exec_xml(a,b,{target_srl:d,cur_mid:current_mid,mid:current_mid},completeCallModuleAction)}function completeCallModuleAction(a){a.message!="success"&&alert(a.message);location.reload()}function completeMessage(a){alert(a.message);location.reload()}function doChangeLangType(a){typeof a=="string"?setLangType(a):setLangType(a.options[a.selectedIndex].value);location.href=location.href.setQuery("l","")}
+function setLangType(a){var b=new Date;b.setTime(b.getTime()+6048E8);setCookie("lang_type",a,b,"/")}
+function doDocumentPreview(a){for(;a.nodeName!="FORM";)a=a.parentNode;if(a.nodeName=="FORM"){a=a.getAttribute("editor_sequence");a=editorGetContent(a);window.open("","previewDocument","toolbars=no,width=700px;height=800px,scrollbars=yes,resizable=yes");var b=jQuery("#previewDocument");b.length||(jQuery('<form id="previewDocument" target="previewDocument" method="post" action="'+request_uri+'"><input type="hidden" name="module" value="document" /><input type="hidden" name="act" value="dispDocumentPreview" /><input type="hidden" name="content" /></form>').appendTo(document.body),b=
+jQuery("#previewDocument")[0]);if(b)b.content.value=a,b.submit()}}
+function doDocumentSave(a){var b=a.form.getAttribute("editor_sequence"),d=editorRelKeys[b].content.value;if(typeof b!="undefined"&&b&&typeof editorRelKeys!="undefined"&&typeof editorGetContent=="function"){var c=editorGetContent(b);editorRelKeys[b].content.value=c}var e={},c=jQuery(a.form).serializeArray();jQuery.each(c,function(a,b){var c=jQuery.trim(b.value);if(!c)return true;if(/\[\]$/.test(b.name))b.name=b.name.replace(/\[\]$/,"");e[b.name]?e[b.name]+="|@|"+c:e[b.name]=b.value});exec_xml("document",
+"procDocumentTempSave",e,completeDocumentSave,["error","message","document_srl"],e,a.form);editorRelKeys[b].content.value=d;return false}function completeDocumentSave(a){jQuery("input[name=document_srl]").eq(0).val(a.document_srl);alert(a.message)}var objForSavedDoc=null;function doDocumentLoad(a){objForSavedDoc=a.form;popopen(request_uri.setQuery("module","document").setQuery("act","dispTempSavedList"))}
+function doDocumentSelect(a){if(opener&&opener.objForSavedDoc)opener.location.href=opener.current_url.setQuery("document_srl",a).setQuery("act","dispBoardWrite");window.close()}function viewSkinInfo(a,b){popopen("./?module=module&act=dispModuleSkinInfo&selected_module="+a+"&skin="+b,"SkinInfo")}var addedDocument=[];function doAddDocumentCart(a){addedDocument[addedDocument.length]=a.value;setTimeout(function(){callAddDocumentCart(addedDocument.length)},100)}
+function callAddDocumentCart(a){if(!(addedDocument.length<1||a!=addedDocument.length))a=[],a.srls=addedDocument.join(","),exec_xml("document","procDocumentAddCart",a,null),addedDocument=[]}
+function transRGB2Hex(a){if(!a)return a;if(a.indexOf("#")>-1)return a.replace(/^#/,"");if(a.toLowerCase().indexOf("rgb")<0)return a;a=a.replace(/^rgb\(/i,"").replace(/\)$/,"");value_list=a.split(",");for(var a="",b=0;b<value_list.length;b++){var d=parseInt(value_list[b],10).toString(16);d.length==1&&(d="0"+d);a+=d}return a}function toggleSecuritySignIn(){var a=location.href;location.href=/https:\/\//i.test(a)?a.replace(/^https/i,"http"):a.replace(/^http/i,"https")}
+function reloadDocument(){location.reload()}
+var Base64={_keyStr:"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",encode:function(a){for(var b="",d,c,e,g,j,l,m=0,a=Base64._utf8_encode(a);m<a.length;)d=a.charCodeAt(m++),c=a.charCodeAt(m++),e=a.charCodeAt(m++),g=d>>2,d=(d&3)<<4|c>>4,j=(c&15)<<2|e>>6,l=e&63,isNaN(c)?j=l=64:isNaN(e)&&(l=64),b=b+this._keyStr.charAt(g)+this._keyStr.charAt(d)+this._keyStr.charAt(j)+this._keyStr.charAt(l);return b},decode:function(a){for(var b="",d,c,e,g,j,l=0,a=a.replace(/[^A-Za-z0-9\+\/\=]/g,"");l<
+a.length;)d=this._keyStr.indexOf(a.charAt(l++)),c=this._keyStr.indexOf(a.charAt(l++)),g=this._keyStr.indexOf(a.charAt(l++)),j=this._keyStr.indexOf(a.charAt(l++)),d=d<<2|c>>4,c=(c&15)<<4|g>>2,e=(g&3)<<6|j,b+=String.fromCharCode(d),g!=64&&(b+=String.fromCharCode(c)),j!=64&&(b+=String.fromCharCode(e));return b=Base64._utf8_decode(b)},_utf8_encode:function(a){for(var a=a.replace(/\r\n/g,"\n"),b="",d=0;d<a.length;d++){var c=a.charCodeAt(d);c<128?b+=String.fromCharCode(c):(c>127&&c<2048?b+=String.fromCharCode(c>>
+6|192):(b+=String.fromCharCode(c>>12|224),b+=String.fromCharCode(c>>6&63|128)),b+=String.fromCharCode(c&63|128))}return b},_utf8_decode:function(a){for(var b="",d=0,c=c1=c2=0;d<a.length;)c=a.charCodeAt(d),c<128?(b+=String.fromCharCode(c),d++):c>191&&c<224?(c2=a.charCodeAt(d+1),b+=String.fromCharCode((c&31)<<6|c2&63),d+=2):(c2=a.charCodeAt(d+1),c3=a.charCodeAt(d+2),b+=String.fromCharCode((c&15)<<12|(c2&63)<<6|c3&63),d+=3);return b}};
+if(typeof resizeImageContents=="undefined")var resizeImageContents=function(){};if(typeof activateOptionDisabled=="undefined")var activateOptionDisabled=function(){};objectExtend=jQuery.extend;function toggleDisplay(a){jQuery("#"+a).toggle()}function checkboxSelectAll(a,b,d){var c={};if(typeof a!="undefined")c.wrap=a;if(typeof d!="undefined")c.checked=d;XE.checkboxToggleAll(b,c)}function clickCheckBoxAll(a,b){var d={doClick:true};if(typeof a!="undefined")d.wrap=a;XE.checkboxToggleAll(b,d)}
+function svc_folder_open(a){jQuery("#_folder_open_"+a).hide();jQuery("#_folder_close_"+a).show();jQuery("#_folder_"+a).show()}function svc_folder_close(a){jQuery("#_folder_open_"+a).show();jQuery("#_folder_close_"+a).hide();jQuery("#_folder_"+a).hide()}function open_calendar(a,b,d){typeof b=="undefined"&&(b="");var c="./common/tpl/calendar.php?";a&&(c+="fo_id="+a);b&&(c+="&day_str="+b);d&&(c+="&callback_func="+d);popopen(c,"Calendar")}var loaded_popup_menus=XE.loaded_popup_menus;
+function createPopupMenu(){}function chkPopupMenu(){}function displayPopupMenu(a,b,d){XE.displayPopupMenu(a,b,d)}function GetObjLeft(a){return jQuery(a).offset().left}function GetObjTop(a){return jQuery(a).offset().top}function replaceOuterHTML(a,b){jQuery(a).replaceWith(b)}function getOuterHTML(a){return jQuery(a).html().trim()}function setCookie(a,b,d,c){a=a+"="+escape(b)+(!d?"":"; expires="+d.toGMTString())+"; path="+(!c?"/":c);document.cookie=a}
+function getCookie(a){if(a=document.cookie.match(RegExp(a+"=(.*?)(?:;|$)")))return unescape(a[1])}function is_def(a){return typeof a!="undefined"}function ucfirst(a){return a.charAt(0).toUpperCase()+a.slice(1)}function get_by_id(a){return document.getElementById(a)}
+jQuery(function(a){a(".lang_code").each(function(){var b=a(this),d=b.attr("id");typeof d=="undefined"&&(d=b.attr("name"));typeof d!="undefined"&&b.after("<a href='"+request_uri.setQuery("module","module").setQuery("act","dispModuleAdminLangcode").setQuery("target",d)+"' class='buttonSet buttonSetting' onclick='popopen(this.href);return false;'><span>find_langcode</span></a>")});a(document).click(function(b){var d=a("#popup_menu_area");d.length||(d=a('<div id="popup_menu_area" style="display:none;z-index:9999" />').appendTo(document.body));
+d.hide();d=a(b.target).filter("a,div,span");d.length||(d=a(b.target).closest("a,div,span"));if(d.length){var d=d.attr("class"),c;d&&(c=d.match(/(?:^| )((document|comment|member)_([1-9]\d*))(?: |$)/));if(c){d="get"+ucfirst(c[2])+"Menu";c={mid:current_mid,cur_mid:current_mid,menu_id:c[1],target_srl:c[3],cur_act:current_url.getQuery("act"),page_x:b.pageX,page_y:b.pageY};var e="error message menus".split(" ");b.preventDefault();b.stopPropagation();if(is_def(window.xeVid))c.vid=xeVid;if(is_def(XE.loaded_popup_menus[c.menu_id]))return XE.displayPopupMenu(c,
+e,c);show_waiting_message=false;exec_xml("member",d,c,XE.displayPopupMenu,e,c);show_waiting_message=true}}});a("a._xe_popup").click(function(){var b=a(this),d=b.attr("name"),b=b.attr("href");d||(d="_xe_popup_"+Math.floor(Math.random()*1E3));(d=window.open(b,d,"left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no"))&&d.focus();return false})});var show_waiting_message=true;
+function xml2json(a,b,d){var c={toObj:function(a){var b={};if(a.nodeType==1){if(d&&a.attributes.length)for(var e=0;e<a.attributes.length;e++)b["@"+a.attributes[e].nodeName]=(a.attributes[e].nodeValue||"").toString();if(a.firstChild){for(var m=e=0,k=false,h=a.firstChild;h;h=h.nextSibling)h.nodeType==1?k=true:h.nodeType==3&&h.nodeValue.match(/[^ \f\n\r\t\v]/)?e++:h.nodeType==4&&m++;if(k)if(e<2&&m<2){c.removeWhite(a);for(h=a.firstChild;h;h=h.nextSibling)h.nodeType==3?b=c.escape(h.nodeValue):h.nodeType==
+4?b=c.escape(h.nodeValue):b[h.nodeName]?b[h.nodeName]instanceof Array?b[h.nodeName][b[h.nodeName].length]=c.toObj(h):b[h.nodeName]=[b[h.nodeName],c.toObj(h)]:b[h.nodeName]=c.toObj(h)}else a.attributes.length?b["#text"]=c.escape(c.innerXml(a)):b=c.escape(c.innerXml(a));else if(e)a.attributes.length?b["#text"]=c.escape(c.innerXml(a)):b=c.escape(c.innerXml(a));else if(m)if(m>1)b=c.escape(c.innerXml(a));else for(h=a.firstChild;h;h=h.nextSibling)b=c.escape(h.nodeValue)}!a.attributes.length&&!a.firstChild&&
+(b=null)}else a.nodeType==9?b=c.toObj(a.documentElement):alert("unhandled node type: "+a.nodeType);return b},toJson:function(a,b,d){var e=b?'"'+b+'"':"";if(a instanceof Array){for(var k=0,h=a.length;k<h;k++)a[k]=c.toJson(a[k],"",d+"\t");e+=(b?":[":"[")+(a.length>1?"\n"+d+"\t"+a.join(",\n"+d+"\t")+"\n"+d:a.join(""))+"]"}else if(a==null)e+=(b&&":")+"null";else if(typeof a=="object"){k=[];for(h in a)k[k.length]=c.toJson(a[h],h,d+"\t");e+=(b?":{":"{")+(k.length>1?"\n"+d+"\t"+k.join(",\n"+d+"\t")+"\n"+
+d:k.join(""))+"}"}else e+=typeof a=="string"?(b&&":")+'"'+a.toString()+'"':(b&&":")+a.toString();return e},innerXml:function(a){var b="";if("innerHTML"in a)b=a.innerHTML;else for(var c=function(a){var b="";if(a.nodeType==1){b+="<"+a.nodeName;for(var d=0;d<a.attributes.length;d++)b+=" "+a.attributes[d].nodeName+'="'+(a.attributes[d].nodeValue||"").toString()+'"';if(a.firstChild){b+=">";for(d=a.firstChild;d;d=d.nextSibling)b+=c(d);b+="</"+a.nodeName+">"}else b+="/>"}else a.nodeType==3?b+=a.nodeValue:
+a.nodeType==4&&(b+="<![CDATA["+a.nodeValue+"]]\>");return b},a=a.firstChild;a;a=a.nextSibling)b+=c(a);return b},escape:function(a){return a.replace(/[\\]/g,"\\\\").replace(/[\"]/g,'\\"').replace(/[\n]/g,"\\n").replace(/[\r]/g,"\\r")},removeWhite:function(a){a.normalize();for(var b=a.firstChild;b;)if(b.nodeType==3)if(b.nodeValue.match(/[^ \f\n\r\t\v]/))b=b.nextSibling;else{var d=b.nextSibling;a.removeChild(b);b=d}else b.nodeType==1&&c.removeWhite(b),b=b.nextSibling;return a}};if(a.nodeType==9)a=a.documentElement;
+var e=c.toObj(c.removeWhite(a));typeof JSON=="object"&&jQuery.isFunction(JSON.stringify);a=c.toJson(e,a.nodeName,"");return"{"+(b?a.replace(/\t/g,b):a.replace(/\t|\n/g,""))+"}"}
+(function(a){function b(b,c){a("#xeTmpIframe").length||a('<iframe name="%id%" id="%id%" style="position:absolute;left:-1px;top:1px;width:1px;height:1px"></iframe>'.replace(/%id%/g,"xeTmpIframe")).appendTo(document.body);a("#xeVirtualForm").remove();var d=a('<form id="%id%"></form>'.replace(/%id%/g,"xeVirtualForm")).attr({id:"xeVirtualForm",method:"post",action:b,target:"xeTmpIframe"});c.xeVirtualRequestMethod="xml";c.xeRequestURI=location.href.replace(/#(.*)$/i,"");c.xeVirtualRequestUrl=request_uri;
+a.each(c,function(b,c){a('<input type="hidden">').attr("name",b).attr("value",c).appendTo(d)});d.appendTo(document.body).submit()}function d(a){var b={},c;for(c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}function c(){return""}a.exec_xml=window.exec_xml=function(c,g,j,l,m,k,h){function v(b){var b=a(b).find("response")[0],d,v="",o=[],j={};d="";s.css("display","none").trigger("cancel_confirm");if(!b)return alert(u.responseText),null;d=xml2json(b,false,false);d=typeof JSON=="object"&&a.isFunction(JSON.parse)?
+JSON.parse(d):eval("("+d+")");d=d.response;if(typeof d=="undefined"){o.error=-1;o.message="Unexpected error occured.";try{if(typeof(v=b.childNodes[0].firstChild.data)!="undefined")o.message+="\r\n"+v}catch(n){}return o}a.each(m,function(a,b){j[b]=true});j.redirect_url=true;j.act=true;a.each(d,function(a,b){j[a]&&(o[a]=b)});if(o.error!=0){if(a.isFunction(a.exec_xml.onerror))return a.exec_xml.onerror(c,g,o,l,m,k,h);alert(o.message||"error!");return null}if(o.redirect_url)return location.href=o.redirect_url.replace(/&amp;/g,
+"&"),null;a.isFunction(l)&&l(o,m,k,h)}var o=request_uri+"index.php";j||(j={});a.isArray(j)&&(j=d(j));j.module=c;j.act=g;typeof xeVid!="undefined"&&(j.vid=xeVid);typeof m=="undefined"||m.length<1?m=["error","message"]:m.push("error","message");if(a.isArray(ssl_actions)&&j.act&&a.inArray(j.act,ssl_actions)>=0){var o=window.https_port||443,n=a("<a>").attr("href",default_url||request_uri)[0],w="https://"+n.hostname.replace(/:\d+$/,"");o!=443&&(w+=":"+o);n.pathname[0]!="/"&&(w+="/");w+=n.pathname;o=w.replace(/\/$/,
+"")+"/index.php"}n=a("<a>").attr("href",location.href)[0];w=a("<a>").attr("href",o)[0];if(n.protocol!=w.protocol||n.port!=w.port)return b(o,j);var x=[],p=0;x[p++]='<?xml version="1.0" encoding="utf-8" ?>';x[p++]="<methodCall>";x[p++]="<params>";a.each(j,function(a,b){x[p++]="<"+a+"><![CDATA["+b+"]]\></"+a+">"});x[p++]="</params>";x[p++]="</methodCall>";var u=null;u&&u.readyState!=0&&u.abort();try{a.ajax({url:o,type:"POST",dataType:"xml",data:x.join("\n"),contentType:"text/plain",beforeSend:function(a){u=
+a},success:v,error:function(a,b){s.css("display","none");var c="";if(b=="parsererror"){c="The result is not valid XML :\n-------------------------------------\n";if(a.responseText=="")return;c+=a.responseText.replace(/<[^>]+>/g,"")}else c=b;try{console.log(c)}catch(d){}}})}catch(A){alert(A);return}var s=a(".wfsr");show_waiting_message&&s.length&&s.html(waiting_message).show()};a.exec_json=function(b,c,d){typeof c=="undefined"&&(c={});b=b.split(".");b.length==2&&(show_waiting_message&&a(".wfsr").html(waiting_message).show(),
+a.extend(c,{module:b[0],act:b[1]}),typeof xeVid!="undefined"&&a.extend(c,{vid:xeVid}),a.ajax({type:"POST",dataType:"json",url:request_uri,contentType:"application/json",data:a.param(c),success:function(b){a(".wfsr").hide().trigger("cancel_confirm");b.error>0&&alert(b.message);a.isFunction(d)&&d(b)}}))};a.fn.exec_html=function(b,c,d,l,m){typeof c=="undefined"&&(c={});a.inArray(d,["html","append","prepend"])||(d="html");var k=a(this),b=b.split(".");b.length==2&&(show_waiting_message&&a(".wfsr").html(waiting_message).show(),
+a.extend(c,{module:b[0],act:b[1]}),a.ajax({type:"POST",dataType:"html",url:request_uri,data:a.param(c),success:function(b){a(".wfsr").hide().trigger("cancel_confirm");k[d](b);a.isFunction(l)&&l(m)}}))};a(function(a){a(".wfsr").ajaxStart(function(){a(window).bind("beforeunload",c)}).bind("ajaxStop cancel_confirm",function(){a(window).unbind("beforeunload",c)})})})(jQuery);
+(function(a){function b(a){var b=[];return a.is(":radio")?a.filter(":checked").val():a.is(":checkbox")?(a.filter(":checked").each(function(){b.push(this.value)}),b.join("|@|")):a.val()}function d(a){a+="";if(!a.length)return 0;var a=encodeURI(a),b=a.split("%").length-1;return a.length-b*2}var c=[],e=[],g={},j=[],l={},m=new (xe.createApp("Validator",{init:function(){var a=/^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;this.cast("ADD_RULE",["email",a]);this.cast("ADD_RULE",["email_address",a]);a=/^[a-z]+[\w-]*[a-z0-9_]+$/i;
+this.cast("ADD_RULE",["userid",a]);this.cast("ADD_RULE",["user_id",a]);a=/^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:\d+)?/;this.cast("ADD_RULE",["url",a]);this.cast("ADD_RULE",["homepage",a]);this.cast("ADD_RULE",["korean",RegExp("^[\uac00-\ud7a3]*$")]);this.cast("ADD_RULE",["korean_number",RegExp("^[\uac00-\ud7a30-9]*$")]);this.cast("ADD_RULE",["alpha",/^[a-z]*$/i]);this.cast("ADD_RULE",["alpha_number",/^[a-z][a-z0-9_]*$/i]);this.cast("ADD_RULE",["number",/^[0-9]*$/])},run:function(a){var b=
+"";if(a._filter)b=a._filter.value;a=this.cast("VALIDATE",[a,b]);typeof a=="undefined"&&(a=false);return a},API_ONREADY:function(){var b=this;a("form").each(function(){if(this.onsubmit)this["xe:onsubmit"]=this.onsubmit,this.onsubmit=null}).submit(function(){var c=this["xe:onsubmit"];return a.isFunction(c)?c.apply(this):b.run(this)})},API_VALIDATE:function(c,e){function o(a){return a.replace(/([\.\+\-\[\]\{\}\(\)\\])/g,"\\$1")}var n=true,m=e[0],k=m.elements,p,u,A,s,r,q,B,t,y,z;if(k.ruleset)p=m.elements.ruleset.value;
+else if(k._filter)p=m.elements._filter.value;if(!p)return true;a.isFunction(j[p])&&(A=j[p]);p=a.extend({},g[p.toLowerCase()]||{},l);s=[];for(q=0,t=m.elements.length;q<t;q++)n=k[q],(r=n.name)&&k[r]&&(!k[r].length||k[r][0]===n)&&s.push(r);s=s.join("\n");u={};for(r in p)if(p.hasOwnProperty(r)&&(n=[],r.substr(0,1)=="^")){(n=s.match(RegExp("^"+o(r.substr(1))+".*$","gm")))||(n=[]);for(q=0,t=n.length;q<t;q++)u[n[q]]=p[r];p[r]=null;delete p[r]}p=a.extend(p,u);for(r in p)if(p.hasOwnProperty(r)&&(f=p[r],s=
+(n=k[r])?a.trim(b(a(n))):"",u=(f.modifier||"")+",",n&&!n.disabled)){if(f["if"]){a.isArray(f["if"])||(f["if"]=[f["if"]]);for(q=0;q<f["if"].length;q++)if(t=f["if"][q],n=new Function("el","return !!("+t.test.replace(/\$(\w+)/g,'el["$1"].value')+")"),n(k))f[t.attr]=t.value}if(!s)if(f["default"]&&(s=f["default"]),f.required)return this.cast("ALERT",[m,r,"isnull"])&&false;else continue;n=parseInt(f.minlength)||0;t=parseInt(f.maxlength)||0;z=/b$/.test(f.minlength||"");y=/b$/.test(f.maxlength||"");q=s.length;
+if(z||y)B=d(s);if(n&&n>(z?B:q)||t&&t<(y?B:q))return this.cast("ALERT",[m,r,"outofrange",n,t])&&false;if(f.equalto&&(t=(q=k[f.equalto])?a.trim(b(a(q))):"",q&&t!==s))return this.cast("ALERT",[m,r,"equalto"])&&false;y=(f.rule||"").split(",");for(q=0,t=y.length;q<t;q++)if(z=y[q])if(n=this.cast("APPLY_RULE",[z,s]),u.indexOf("not,")>-1&&(n=!n),!n)return this.cast("ALERT",[m,r,"invalid_"+z])&&false}return a.isFunction(A)?A(m):true},API_ADD_RULE:function(a,b){var c=b[0].toLowerCase();e[c]=b[1]},API_DEL_RULE:function(a,
+b){var c=b[0].toLowerCase();delete e[c]},API_GET_RULE:function(a,b){var c=b[0].toLowerCase();return e[c]?e[c]:null},API_ADD_FILTER:function(a,b){var c=b[0].toLowerCase();g[c]=b[1]},API_DEL_FILTER:function(a,b){var c=b[0].toLowerCase();delete g[c]},API_GET_FILTER:function(a,b){var c=b[0].toLowerCase();return g[c]?g[c]:null},API_ADD_EXTRA_FIELD:function(a,b){var c=b[0].toLowerCase();l[c]=b[1]},API_GET_EXTRA_FIELD:function(a,b){var c=b[0].toLowerCase();return l[c]},API_DEL_EXTRA_FIELD:function(a,b){var c=
+b[0].toLowerCase();delete l[c]},API_APPLY_RULE:function(b,c){var d=c[0],g=c[1];return typeof e[d]=="undefined"?true:a.isFunction(e[d])?e[d](g):e[d]instanceof RegExp?e[d].test(g):a.isArray(e[d])?a.inArray(g,e[d])>-1:true},API_ALERT:function(b,c){var d=c[0],e=c[1],g=c[2],j=c[3],l=c[4],m=this.cast("GET_MESSAGE",[e]),k=this.cast("GET_MESSAGE",[g]);k!=g&&(k=k.indexOf("%s")<0?m+k:k.replace("%s",m));if(j||l)k+="("+(j||"")+"~"+(l||"")+")";this.cast("SHOW_ALERT",[k]);a(d.elements[e]).focus()},API_SHOW_ALERT:function(a,
+b){alert(b[0])},API_ADD_MESSAGE:function(a,b){c[b[0]]=b[1]},API_GET_MESSAGE:function(a,b){var d=b[0];return c[d]||d},API_ADD_CALLBACK:function(a,b){j[b[0]]=b[1]},API_REMOVE_CALLBACK:function(a,b){delete j[b[0]]}}));xe.registerApp(m);var k=xe.createPlugin("editor_stub",{API_BEFORE_VALIDATE:function(a,b){var c=b[0].getAttribute("editor_sequence");if(c&&typeof c=="object")c=c.value;if(c)try{editorRelKeys[c].content.value=editorRelKeys[c].func(c)||""}catch(d){}}});m.registerPlugin(new k)})(jQuery);
+function filterAlertMessage(a){var b=a.message,d=a.act,a=a.redirect_url,c=location.href;typeof b!="undefined"&&b&&b!="success"&&alert(b);typeof d!="undefined"&&d?c=current_url.setQuery("act",d):typeof a!="undefined"&&a&&(c=a);c==location.href&&(c=c.replace(/#(.*)$/,""));location.href=c}function procFilter(a,b){b(a);return false}
+function legacy_filter(a,b,d,c,e,g,j,l){var m=xe.getApp("Validator")[0],k=jQuery,h=[];if(!m)return false;b.elements._filter||k(b).prepend('<input type="hidden" name="_filter" />');b.elements._filter.value=a;h[0]=a;h[1]=function(a){var h={},a=k(a).serializeArray();k.each(a,function(a,b){var c=k.trim(b.value),d=b.name;if(!c||!d)return true;l[d]&&(d=l[d]);/\[\]$/.test(d)&&(d=d.replace(/\[\]$/,""));h[d]?h[d]+="|@|"+c:h[d]=b.value});if(j&&!confirm(j))return false;exec_xml(d,c,h,e,g,h,b)};m.cast("ADD_CALLBACK",
+h);m.cast("VALIDATE",[b,a]);return false};
diff --git a/common/js/xml_handler.js b/common/js/xml_handler.js
index 74d2f0556..42323efae 100644
--- a/common/js/xml_handler.js
+++ b/common/js/xml_handler.js
@@ -2,71 +2,416 @@
  * @file   common/js/xml_handler.js
  * @brief  XE에서 ajax기능을 이용함에 있어 module, act를 잘 사용하기 위한 자바스크립트
  **/
-var show_waiting_message=true;function xml2json(xml,tab,ignoreAttrib){var X={toObj:function(xml){var o={};if(xml.nodeType==1){if(ignoreAttrib&&xml.attributes.length)
-for(var i=0;i<xml.attributes.length;i++)
-o["@"+xml.attributes[i].nodeName]=(xml.attributes[i].nodeValue||"").toString();if(xml.firstChild){var textChild=0,cdataChild=0,hasElementChild=false;for(var n=xml.firstChild;n;n=n.nextSibling){if(n.nodeType==1)hasElementChild=true;else if(n.nodeType==3&&n.nodeValue.match(/[^ \f\n\r\t\v]/))textChild++;else if(n.nodeType==4)cdataChild++;}
-if(hasElementChild){if(textChild<2&&cdataChild<2){X.removeWhite(xml);for(var n=xml.firstChild;n;n=n.nextSibling){if(n.nodeType==3)
-o=X.escape(n.nodeValue);else if(n.nodeType==4)
-o=X.escape(n.nodeValue);else if(o[n.nodeName]){if(o[n.nodeName]instanceof Array)
-o[n.nodeName][o[n.nodeName].length]=X.toObj(n);else
-o[n.nodeName]=[o[n.nodeName],X.toObj(n)];}
-else
-o[n.nodeName]=X.toObj(n);}}
-else{if(!xml.attributes.length)
-o=X.escape(X.innerXml(xml));else
-o["#text"]=X.escape(X.innerXml(xml));}}
-else if(textChild){if(!xml.attributes.length)
-o=X.escape(X.innerXml(xml));else
-o["#text"]=X.escape(X.innerXml(xml));}
-else if(cdataChild){if(cdataChild>1)
-o=X.escape(X.innerXml(xml));else
-for(var n=xml.firstChild;n;n=n.nextSibling){o=X.escape(n.nodeValue);}}}
-if(!xml.attributes.length&&!xml.firstChild)o=null;}
-else if(xml.nodeType==9){o=X.toObj(xml.documentElement);}
-else
-alert("unhandled node type: "+xml.nodeType);return o;},toJson:function(o,name,ind){var json=name?("\""+name+"\""):"";if(o instanceof Array){for(var i=0,n=o.length;i<n;i++)
-o[i]=X.toJson(o[i],"",ind+"\t");json+=(name?":[":"[")+(o.length>1?("\n"+ind+"\t"+o.join(",\n"+ind+"\t")+"\n"+ind):o.join(""))+"]";}
-else if(o==null)
-json+=(name&&":")+"null";else if(typeof(o)=="object"){var arr=[];for(var m in o)
-arr[arr.length]=X.toJson(o[m],m,ind+"\t");json+=(name?":{":"{")+(arr.length>1?("\n"+ind+"\t"+arr.join(",\n"+ind+"\t")+"\n"+ind):arr.join(""))+"}";}
-else if(typeof(o)=="string")
-json+=(name&&":")+"\""+o.toString()+"\"";else
-json+=(name&&":")+o.toString();return json;},innerXml:function(node){var s=""
-if("innerHTML"in node)
-s=node.innerHTML;else{var asXml=function(n){var s="";if(n.nodeType==1){s+="<"+n.nodeName;for(var i=0;i<n.attributes.length;i++)
-s+=" "+n.attributes[i].nodeName+"=\""+(n.attributes[i].nodeValue||"").toString()+"\"";if(n.firstChild){s+=">";for(var c=n.firstChild;c;c=c.nextSibling)
-s+=asXml(c);s+="</"+n.nodeName+">";}
-else
-s+="/>";}
-else if(n.nodeType==3)
-s+=n.nodeValue;else if(n.nodeType==4)
-s+="<![CDATA["+n.nodeValue+"]]>";return s;};for(var c=node.firstChild;c;c=c.nextSibling)
-s+=asXml(c);}
-return s;},escape:function(txt){return txt.replace(/[\\]/g,"\\\\").replace(/[\"]/g,'\\"').replace(/[\n]/g,'\\n').replace(/[\r]/g,'\\r');},removeWhite:function(e){e.normalize();for(var n=e.firstChild;n;){if(n.nodeType==3){if(!n.nodeValue.match(/[^ \f\n\r\t\v]/)){var nxt=n.nextSibling;e.removeChild(n);n=nxt;}
-else
-n=n.nextSibling;}
-else if(n.nodeType==1){X.removeWhite(n);n=n.nextSibling;}
-else
-n=n.nextSibling;}
-return e;}};if(xml.nodeType==9)
-xml=xml.documentElement;var json_obj=X.toObj(X.removeWhite(xml)),json_str;if(typeof(JSON)=='object'&&jQuery.isFunction(JSON.stringify)&&false){var obj={};obj[xml.nodeName]=json_obj;json_str=JSON.stringify(obj);return json_str;}else{json_str=X.toJson(json_obj,xml.nodeName,"");return"{"+(tab?json_str.replace(/\t/g,tab):json_str.replace(/\t|\n/g,""))+"}";}}
-(function($){$.exec_xml=window.exec_xml=function(module,act,params,callback_func,response_tags,callback_func_arg,fo_obj){var xml_path=request_uri+"index.php"
-if(!params)params={};if($.isArray(params))params=arr2obj(params);params['module']=module;params['act']=act;if(typeof(xeVid)!='undefined')params['vid']=xeVid;if(typeof(response_tags)=="undefined"||response_tags.length<1)response_tags=['error','message'];else{response_tags.push('error','message');}
-if($.isArray(ssl_actions)&&params['act']&&$.inArray(params['act'],ssl_actions)>=0)
-{var url=default_url||request_uri;var port=window.https_port||443;var _ul=$('<a>').attr('href',url)[0];var target='https://'+_ul.hostname.replace(/:\d+$/,'');if(port!=443)target+=':'+port;if(_ul.pathname[0]!='/')target+='/';target+=_ul.pathname;xml_path=target.replace(/\/$/,'')+'/index.php';}
-var _u1=$('<a>').attr('href',location.href)[0];var _u2=$('<a>').attr('href',xml_path)[0];if(_u1.protocol!=_u2.protocol||_u1.port!=_u2.port)return send_by_form(xml_path,params);var xml=[],i=0;xml[i++]='<?xml version="1.0" encoding="utf-8" ?>';xml[i++]='<methodCall>';xml[i++]='<params>';$.each(params,function(key,val){xml[i++]='<'+key+'><![CDATA['+val+']]></'+key+'>';});xml[i++]='</params>';xml[i++]='</methodCall>';var _xhr=null;if(_xhr&&_xhr.readyState!=0)_xhr.abort();function onsuccess(data,textStatus,xhr){var resp_xml=$(data).find('response')[0],resp_obj,txt='',ret=[],tags={},json_str='';waiting_obj.css('visibility','hidden');if(!resp_xml){alert(_xhr.responseText);return null;}
-json_str=xml2json(resp_xml,false,false);resp_obj=(typeof(JSON)=='object'&&$.isFunction(JSON.parse))?JSON.parse(json_str):eval('('+json_str+')');resp_obj=resp_obj.response;if(typeof(resp_obj)=='undefined'){ret['error']=-1;ret['message']='Unexpected error occured.';try{if(typeof(txt=resp_xml.childNodes[0].firstChild.data)!='undefined')ret['message']+='\r\n'+txt;}catch(e){};return ret;}
-$.each(response_tags,function(key,val){tags[val]=true;});tags["redirect_url"]=true;tags["act"]=true;$.each(resp_obj,function(key,val){if(tags[key])ret[key]=val;});if(ret['error']!=0){if($.isFunction($.exec_xml.onerror)){return $.exec_xml.onerror(module,act,ret,callback_func,response_tags,callback_func_arg,fo_obj);}
-alert(ret['message']||'error!');return null;}
-if(ret['redirect_url']){location.href=ret['redirect_url'].replace(/&amp;/g,'&');return null;}
-if($.isFunction(callback_func))callback_func(ret,response_tags,callback_func_arg,fo_obj);}
-try{$.ajax({url:xml_path,type:'POST',dataType:'xml',data:xml.join('\n'),contentType:'text/plain',beforeSend:function(xhr){_xhr=xhr;},success:onsuccess,error:function(xhr,textStatus){waiting_obj.css('visibility','hidden');var msg='';if(textStatus=='parsererror'){msg='The result is not valid XML :\n-------------------------------------\n';if(xhr.responseText=="")return;msg+=xhr.responseText.replace(/<[^>]+>/g,'');}else{msg=textStatus;}
-alert(msg);}});}catch(e){alert(e);return;}
-var waiting_obj=$('#waitingforserverresponse');if(show_waiting_message&&waiting_obj.length){var d=$(document);waiting_obj.html(waiting_message).css({'top':(d.scrollTop()+20)+'px','left':(d.scrollLeft()+20)+'px','visibility':'visible'});}}
-function send_by_form(url,params){var frame_id='xeTmpIframe';var form_id='xeVirtualForm';if(!$('#'+frame_id).length){$('<iframe name="%id%" id="%id%" style="position:absolute;left:-1px;top:1px;width:1px;height:1px"></iframe>'.replace(/%id%/g,frame_id)).appendTo(document.body);}
-$('#'+form_id).remove();var form=$('<form id="%id%"></form>'.replace(/%id%/g,form_id)).attr({'id':form_id,'method':'post','action':url,'target':frame_id});params['xeVirtualRequestMethod']='xml';params['xeRequestURI']=location.href.replace(/#(.*)$/i,'');params['xeVirtualRequestUrl']=request_uri;$.each(params,function(key,value){$('<input type="hidden">').attr('name',key).attr('value',value).appendTo(form);});form.appendTo(document.body).submit();}
-function arr2obj(arr){var ret={};for(var key in arr){if(arr.hasOwnProperty(key))ret[key]=arr[key];}
-return ret;}
-$.exec_json=function(action,data,func){if(typeof(data)=='undefined')data={};action=action.split(".");if(action.length==2){if(show_waiting_message){$("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible');}
-$.extend(data,{module:action[0],act:action[1]});if(typeof(xeVid)!='undefined')$.extend(data,{vid:xeVid});$.ajax({type:"POST",dataType:"json",url:request_uri,contentType:"application/json",data:$.param(data),success:function(data){$("#waitingforserverresponse").css('visibility','hidden');if(data.error>0)alert(data.message);if($.isFunction(func))func(data);}});}};$.fn.exec_html=function(action,data,type,func,args){if(typeof(data)=='undefined')data={};if(!$.inArray(type,['html','append','prepend']))type='html';var self=$(this);action=action.split(".");if(action.length==2){if(show_waiting_message){$("#waitingforserverresponse").html(waiting_message).css('top',$(document).scrollTop()+20).css('left',$(document).scrollLeft()+20).css('visibility','visible');}
-$.extend(data,{module:action[0],act:action[1]});$.ajax({type:"POST",dataType:"html",url:request_uri,data:$.param(data),success:function(html){$("#waitingforserverresponse").css('visibility','hidden');self[type](html);if($.isFunction(func))func(args);}});}};})(jQuery);
\ No newline at end of file
+
+// xml handler을 이용하는 user function
+var show_waiting_message = true;
+
+/*  This work is licensed under Creative Commons GNU LGPL License.
+
+    License: http://creativecommons.org/licenses/LGPL/2.1/
+   Version: 0.9
+    Author:  Stefan Goessner/2006
+    Web:     http://goessner.net/
+*/
+function xml2json(xml, tab, ignoreAttrib) {
+   var X = {
+      toObj: function(xml) {
+         var o = {};
+         if (xml.nodeType==1) {   // element node ..
+            if (ignoreAttrib && xml.attributes.length)   // element with attributes  ..
+               for (var i=0; i<xml.attributes.length; i++)
+                  o["@"+xml.attributes[i].nodeName] = (xml.attributes[i].nodeValue||"").toString();
+            if (xml.firstChild) { // element has child nodes ..
+               var textChild=0, cdataChild=0, hasElementChild=false;
+               for (var n=xml.firstChild; n; n=n.nextSibling) {
+                  if (n.nodeType==1) hasElementChild = true;
+                  else if (n.nodeType==3 && n.nodeValue.match(/[^ \f\n\r\t\v]/)) textChild++; // non-whitespace text
+                  else if (n.nodeType==4) cdataChild++; // cdata section node
+               }
+               if (hasElementChild) {
+                  if (textChild < 2 && cdataChild < 2) { // structured element with evtl. a single text or/and cdata node ..
+                     X.removeWhite(xml);
+                     for (var n=xml.firstChild; n; n=n.nextSibling) {
+                        if (n.nodeType == 3)  // text node
+                           o = X.escape(n.nodeValue);
+                        else if (n.nodeType == 4)  // cdata node
+//                           o["#cdata"] = X.escape(n.nodeValue);
+                            o = X.escape(n.nodeValue);
+                        else if (o[n.nodeName]) {  // multiple occurence of element ..
+                           if (o[n.nodeName] instanceof Array)
+                              o[n.nodeName][o[n.nodeName].length] = X.toObj(n);
+                           else
+                              o[n.nodeName] = [o[n.nodeName], X.toObj(n)];
+                        }
+                        else  // first occurence of element..
+                           o[n.nodeName] = X.toObj(n);
+                     }
+                  }
+                  else { // mixed content
+                     if (!xml.attributes.length)
+                        o = X.escape(X.innerXml(xml));
+                     else
+                        o["#text"] = X.escape(X.innerXml(xml));
+                  }
+               }
+               else if (textChild) { // pure text
+                  if (!xml.attributes.length)
+                     o = X.escape(X.innerXml(xml));
+                  else
+                     o["#text"] = X.escape(X.innerXml(xml));
+               }
+               else if (cdataChild) { // cdata
+                  if (cdataChild > 1)
+                     o = X.escape(X.innerXml(xml));
+                  else
+                     for (var n=xml.firstChild; n; n=n.nextSibling){
+                        //o["#cdata"] = X.escape(n.nodeValue);
+                        o = X.escape(n.nodeValue);
+                  }
+               }
+            }
+            if (!xml.attributes.length && !xml.firstChild) o = null;
+         }
+         else if (xml.nodeType==9) { // document.node
+            o = X.toObj(xml.documentElement);
+         }
+         else
+            alert("unhandled node type: " + xml.nodeType);
+         return o;
+      },
+      toJson: function(o, name, ind) {
+         var json = name ? ("\""+name+"\"") : "";
+         if (o instanceof Array) {
+            for (var i=0,n=o.length; i<n; i++)
+               o[i] = X.toJson(o[i], "", ind+"\t");
+            json += (name?":[":"[") + (o.length > 1 ? ("\n"+ind+"\t"+o.join(",\n"+ind+"\t")+"\n"+ind) : o.join("")) + "]";
+         }
+         else if (o == null)
+            json += (name&&":") + "null";
+         else if (typeof(o) == "object") {
+            var arr = [];
+            for (var m in o)
+               arr[arr.length] = X.toJson(o[m], m, ind+"\t");
+            json += (name?":{":"{") + (arr.length > 1 ? ("\n"+ind+"\t"+arr.join(",\n"+ind+"\t")+"\n"+ind) : arr.join("")) + "}";
+         }
+         else if (typeof(o) == "string")
+            json += (name&&":") + "\"" + o.toString() + "\"";
+         else
+            json += (name&&":") + o.toString();
+         return json;
+      },
+      innerXml: function(node) {
+         var s = ""
+         if ("innerHTML" in node)
+            s = node.innerHTML;
+         else {
+            var asXml = function(n) {
+               var s = "";
+               if (n.nodeType == 1) {
+                  s += "<" + n.nodeName;
+                  for (var i=0; i<n.attributes.length;i++)
+                     s += " " + n.attributes[i].nodeName + "=\"" + (n.attributes[i].nodeValue||"").toString() + "\"";
+                  if (n.firstChild) {
+                     s += ">";
+                     for (var c=n.firstChild; c; c=c.nextSibling)
+                        s += asXml(c);
+                     s += "</"+n.nodeName+">";
+                  }
+                  else
+                     s += "/>";
+               }
+               else if (n.nodeType == 3)
+                  s += n.nodeValue;
+               else if (n.nodeType == 4)
+                  s += "<![CDATA[" + n.nodeValue + "]]>";
+               return s;
+            };
+            for (var c=node.firstChild; c; c=c.nextSibling)
+               s += asXml(c);
+         }
+         return s;
+      },
+      escape: function(txt) {
+         return txt.replace(/[\\]/g, "\\\\")
+                   .replace(/[\"]/g, '\\"')
+                   .replace(/[\n]/g, '\\n')
+                   .replace(/[\r]/g, '\\r');
+      },
+      removeWhite: function(e) {
+         e.normalize();
+         for (var n = e.firstChild; n; ) {
+            if (n.nodeType == 3) {  // text node
+               if (!n.nodeValue.match(/[^ \f\n\r\t\v]/)) { // pure whitespace text node
+                  var nxt = n.nextSibling;
+                  e.removeChild(n);
+                  n = nxt;
+               }
+               else
+                  n = n.nextSibling;
+            }
+            else if (n.nodeType == 1) {  // element node
+               X.removeWhite(n);
+               n = n.nextSibling;
+            }
+            else                      // any other node
+               n = n.nextSibling;
+         }
+         return e;
+      }
+   };
+   if (xml.nodeType == 9) // document node
+      xml = xml.documentElement;
+
+   var json_obj = X.toObj(X.removeWhite(xml)), json_str;
+
+   if (typeof(JSON)=='object' && jQuery.isFunction(JSON.stringify) && false) {
+	   var obj = {}; obj[xml.nodeName] = json_obj;
+	   json_str = JSON.stringify(obj);
+	   return json_str;
+   } else {
+	   json_str = X.toJson(json_obj, xml.nodeName, "");
+	   return "{" + (tab ? json_str.replace(/\t/g, tab) : json_str.replace(/\t|\n/g, "")) + "}";
+   }
+}
+
+(function($){
+/**
+ * @brief exec_xml
+ * @author NHN (developers@xpressengine.com)
+ **/
+$.exec_xml = window.exec_xml = function(module, act, params, callback_func, response_tags, callback_func_arg, fo_obj) {
+	var xml_path = request_uri+"index.php"
+    if(!params) params = {};
+
+	// {{{ set parameters
+	if($.isArray(params)) params = arr2obj(params);
+	params['module'] = module;
+	params['act']    = act;
+
+    if(typeof(xeVid)!='undefined') params['vid'] = xeVid;
+    if(typeof(response_tags)=="undefined" || response_tags.length<1) response_tags = ['error','message'];
+	else {
+		response_tags.push('error', 'message');
+	}
+	// }}} set parameters
+
+	// use ssl?
+	if ($.isArray(ssl_actions) && params['act'] && $.inArray(params['act'], ssl_actions) >= 0)
+	{
+		var url    = default_url || request_uri;
+		var port   = window.https_port || 443;
+		var _ul    = $('<a>').attr('href', url)[0];
+		var target = 'https://' + _ul.hostname.replace(/:\d+$/, '');
+
+		if(port != 443) target += ':'+port;
+		if(_ul.pathname[0] != '/') target += '/';
+
+		target += _ul.pathname;
+		xml_path = target.replace(/\/$/, '')+'/index.php';
+	}
+
+	var _u1 = $('<a>').attr('href', location.href)[0];
+	var _u2 = $('<a>').attr('href', xml_path)[0];
+
+	// 현 url과 ajax call 대상 url의 schema 또는 port가 다르면 직접 form 전송
+	if(_u1.protocol != _u2.protocol || _u1.port != _u2.port) return send_by_form(xml_path, params);
+
+	var xml = [], i = 0;
+	xml[i++] = '<?xml version="1.0" encoding="utf-8" ?>';
+	xml[i++] = '<methodCall>';
+	xml[i++] = '<params>';
+
+	$.each(params, function(key, val) {
+		xml[i++] = '<'+key+'><![CDATA['+val+']]></'+key+'>';
+	});
+
+	xml[i++] = '</params>';
+	xml[i++] = '</methodCall>';
+
+	var _xhr = null;
+	if (_xhr && _xhr.readyState != 0) _xhr.abort();
+
+	// 전송 성공시
+	function onsuccess(data, textStatus, xhr) {
+		var resp_xml = $(data).find('response')[0], resp_obj, txt='', ret=[], tags={}, json_str='';
+
+		waiting_obj.css('display', 'none').trigger('cancel_confirm');
+
+		if(!resp_xml) {
+			alert(_xhr.responseText);
+			return null;
+		}
+
+		json_str = xml2json(resp_xml, false, false);
+		resp_obj = (typeof(JSON)=='object' && $.isFunction(JSON.parse))?JSON.parse(json_str):eval('('+json_str+')');
+		resp_obj = resp_obj.response;
+
+		if (typeof(resp_obj)=='undefined') {
+			ret['error'] = -1;
+			ret['message'] = 'Unexpected error occured.';
+			try {
+				if(typeof(txt=resp_xml.childNodes[0].firstChild.data)!='undefined') ret['message'] += '\r\n'+txt;
+			} catch(e){};
+			return ret;
+		}
+
+		$.each(response_tags, function(key, val){ tags[val] = true; });
+        tags["redirect_url"] = true;
+        tags["act"] = true;
+		$.each(resp_obj, function(key, val){ if(tags[key]) ret[key] = val; });
+
+		if(ret['error'] != 0) {
+			if ($.isFunction($.exec_xml.onerror)) {
+				return $.exec_xml.onerror(module, act, ret, callback_func, response_tags, callback_func_arg, fo_obj);
+			}
+
+			alert(ret['message'] || 'error!');
+			return null;
+		}
+
+		if(ret['redirect_url']) {
+			location.href = ret['redirect_url'].replace(/&amp;/g, '&');
+			return null;
+		}
+
+		if($.isFunction(callback_func)) callback_func(ret, response_tags, callback_func_arg, fo_obj);
+	}
+
+	// 모든 xml데이터는 POST방식으로 전송. try-catch문으로 오류 발생시 대처
+	try {
+		$.ajax({
+			url         : xml_path,
+			type        : 'POST',
+			dataType    : 'xml',
+			data        : xml.join('\n'),
+			contentType : 'text/plain',
+			beforeSend  : function(xhr){ _xhr = xhr; },
+			success     : onsuccess,
+			error       : function(xhr, textStatus) {
+				waiting_obj.css('display', 'none');
+
+				var msg = '';
+				if (textStatus == 'parsererror') {
+					msg  = 'The result is not valid XML :\n-------------------------------------\n';
+					if(xhr.responseText == "") return;
+					msg += xhr.responseText.replace(/<[^>]+>/g, '');
+				} else {
+					msg = textStatus;
+				}
+
+				try{
+					console.log(msg);
+				}catch(ee){}
+			}
+		});
+	} catch(e) {
+		alert(e);
+		return;
+	}
+
+	// ajax 통신중 대기 메세지 출력 (show_waiting_message값을 false로 세팅시 보이지 않음)
+	var waiting_obj = $('.wfsr');
+	if(show_waiting_message && waiting_obj.length) {
+		waiting_obj.html(waiting_message).show();
+	}
+}
+function send_by_form(url, params) {
+	var frame_id = 'xeTmpIframe';
+	var form_id  = 'xeVirtualForm';
+
+	if (!$('#'+frame_id).length) {
+		$('<iframe name="%id%" id="%id%" style="position:absolute;left:-1px;top:1px;width:1px;height:1px"></iframe>'.replace(/%id%/g, frame_id)).appendTo(document.body);
+	}
+
+	$('#'+form_id).remove();
+	var form = $('<form id="%id%"></form>'.replace(/%id%/g, form_id)).attr({
+		'id'     : form_id,
+		'method' : 'post',
+		'action' : url,
+		'target' : frame_id
+	});
+
+	params['xeVirtualRequestMethod'] = 'xml';
+	params['xeRequestURI']           = location.href.replace(/#(.*)$/i,'');
+	params['xeVirtualRequestUrl']    = request_uri;
+
+	$.each(params, function(key, value){
+		$('<input type="hidden">').attr('name', key).attr('value', value).appendTo(form);
+	});
+
+	form.appendTo(document.body).submit();
+}
+function arr2obj(arr) {
+	var ret = {};
+	for(var key in arr) {
+		if(arr.hasOwnProperty(key)) ret[key] = arr[key];
+	}
+	return ret;
+}
+
+
+/**
+ * @brief exec_json (exec_xml와 같은 용도)
+ **/
+$.exec_json = function(action,data,func){
+    if(typeof(data) == 'undefined') data = {};
+    action = action.split(".");
+    if(action.length == 2){
+        if(show_waiting_message) $(".wfsr").html(waiting_message).show();
+
+        $.extend(data,{module:action[0],act:action[1]});
+        if(typeof(xeVid)!='undefined') $.extend(data,{vid:xeVid});
+        $.ajax({
+            type:"POST"
+            ,dataType:"json"
+            ,url:request_uri
+            ,contentType:"application/json"
+            ,data:$.param(data)
+            ,success : function(data){
+                $(".wfsr").hide().trigger('cancel_confirm');
+                if(data.error > 0) alert(data.message);
+                if($.isFunction(func)) func(data);
+            }
+        });
+    }
+};
+
+$.fn.exec_html = function(action,data,type,func,args){
+    if(typeof(data) == 'undefined') data = {};
+    if(!$.inArray(type, ['html','append','prepend'])) type = 'html';
+
+    var self = $(this);
+    action = action.split(".");
+    if(action.length == 2){
+        if(show_waiting_message) $(".wfsr").html(waiting_message).show();
+
+        $.extend(data,{module:action[0],act:action[1]});
+        $.ajax({
+            type:"POST"
+            ,dataType:"html"
+            ,url:request_uri
+            ,data:$.param(data)
+            ,success : function(html){
+                $(".wfsr").hide().trigger('cancel_confirm');
+                self[type](html);
+                if($.isFunction(func)) func(args);
+            }
+        });
+    }
+};
+
+function beforeUnloadHandler(){
+	return '';
+}
+
+$(function($){
+	$('.wfsr')
+		.ajaxStart(function(){
+			$(window).bind('beforeunload', beforeUnloadHandler);
+		})
+		.bind('ajaxStop cancel_confirm', function(){
+			$(window).unbind('beforeunload', beforeUnloadHandler);
+		});
+});
+
+})(jQuery);
diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js
index 0f7dfd99e..997163f28 100644
--- a/common/js/xml_js_filter.js
+++ b/common/js/xml_js_filter.js
@@ -1,14 +1,410 @@
-/**
- * @file   common/js/xml_js_filter.js
- * @author NHN (developers@xpressengine.com)
- * @brief  xml filter (validator) plugin
- * 
- * A rule is a method validate one field.
- * A filter is made up of one or more rules.
- **/
-
-(function($){var messages=[];var rules=[];var filters=[];var callbacks=[];var extras={};var Validator=xe.createApp('Validator',{init:function(){var regEmail=/^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;this.cast('ADD_RULE',['email',regEmail]);this.cast('ADD_RULE',['email_address',regEmail]);var regUserid=/^[a-z]+[\w-]*[a-z0-9_]+$/i;this.cast('ADD_RULE',['userid',regUserid]);this.cast('ADD_RULE',['user_id',regUserid]);var regUrl=/^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-\/\~]+)+(:[0-9]{2,4})*$/;this.cast('ADD_RULE',['url',regUrl]);this.cast('ADD_RULE',['homepage',regUrl]);var regKor=/^[가-힣]*$/;this.cast('ADD_RULE',['korean',regKor]);var regKorNum=/^[가-힣0-9]*$/;this.cast('ADD_RULE',['korean_number',regKorNum]);var regAlpha=/^[a-z]*$/i;this.cast('ADD_RULE',['alpha',regAlpha]);var regAlphaNum=/^[a-z][a-z0-9_]*$/i;this.cast('ADD_RULE',['alpha_number',regAlphaNum]);var regNum=/^[0-9]*$/;this.cast('ADD_RULE',['number',regNum]);},run:function(oForm){var filter='';if(oForm._filter)filter=oForm._filter.value;var params=[oForm,filter];var result=this.cast('VALIDATE',params);if(typeof result=='undefined')result=false;return result;},API_ONREADY:function(){var self=this;$('form').each(function(){if(this.onsubmit){this['xe:onsubmit']=this.onsubmit;this.onsubmit=null;}}).submit(function(){var legacyFn=this['xe:onsubmit'];var hasLegacyFn=$.isFunction(legacyFn);var bResult=hasLegacyFn?legacyFn.apply(this):self.run(this);return bResult;});},API_VALIDATE:function(sender,params){var self=this,result=true,form=params[0],filter=null,callback=null;if(form.elements['_filter'])filter=form.elements['_filter'].value;if(!filter)return true;if($.isFunction(callbacks[filter]))callback=callbacks[filter];filter=$.extend({},filters[filter.toLowerCase()]||{},extras);$.each(filter,function(name){var _el=form.elements[name];if(!_el)return true;var el=$(_el),val=$.trim(get_value(el));var minlen=parseInt(this.minlength)||0;var maxlen=parseInt(this.maxlength)||0;var rule=(this.rule||'').split(',');if(this.required&&!val)return(result=(!!self.cast('ALERT',[form,name,'isnull'])&&false));if(!this.required&&!val)return(result=true);if((minlen&&val.length<minlen)||(maxlen&&val.length>maxlen))return(result=(!!self.cast('ALERT',[form,name,'outofrange',minlen,maxlen])&&false));if(this.equalto){var eq_val=get_value($(form.elements[this.equalto]));if(eq_val!=val)return(result=(!!self.cast('ALERT',[form,name,'equalto'])&&false));}
-if(rule){$.each(rule,function(i,r){if(!r)return true;var ret=self.cast('APPLY_RULE',[r,val]);if(!ret){self.cast('ALERT',[form,name,'invalid_'+this]);return(result=false);}});}
-if(!result)return false;});if(!result)return false;if($.isFunction(callback))return callback(form);return true;},API_ADD_RULE:function(sender,params){var name=params[0].toLowerCase();rules[name]=params[1];},API_DEL_RULE:function(sender,params){var name=params[0].toLowerCase();delete rules[name];},API_GET_RULE:function(sender,params){var name=params[0].toLowerCase();if(rules[name]){return rules[name];}else{return null;}},API_ADD_FILTER:function(sender,params){var name=params[0].toLowerCase();var filter=params[1];filters[name]=filter;},API_DEL_FILTER:function(sender,params){var name=params[0].toLowerCase();delete filters[name];},API_GET_FILTER:function(sender,params){var name=params[0].toLowerCase();if(filters[name]){return filters[name];}else{return null;}},API_ADD_EXTRA_FIELD:function(sender,params){var name=params[0].toLowerCase();var prop=params[1];extras[name]=prop;},API_GET_EXTRA_FIELD:function(sender,params){var name=params[0].toLowerCase();return extras[name];},API_DEL_EXTRA_FIELD:function(sender,params){var name=params[0].toLowerCase();delete extras[name];},API_APPLY_RULE:function(sender,params){var name=params[0];var value=params[1];if(typeof(rules[name])=='undefined')return true;if($.isFunction(rules[name]))return rules[name](value);if(rules[name]instanceof RegExp)return rules[name].test(value);return true;},API_ALERT:function(sender,params){var form=params[0];var field_name=params[1];var msg_code=params[2];var minlen=params[3];var maxlen=params[4];var field_msg=this.cast('GET_MESSAGE',[field_name]);var msg=this.cast('GET_MESSAGE',[msg_code]);if(msg!=msg_code)msg=(msg.indexOf('%s')<0)?(field_msg+msg):(msg.replace('%s',field_msg));if(minlen||maxlen)msg+='('+(minlen||'')+'~'+(maxlen||'')+')';this.cast('SHOW_ALERT',[msg]);$(form.elements[field_name]).focus();},API_SHOW_ALERT:function(sender,params){alert(params[0]);},API_ADD_MESSAGE:function(sender,params){var msg_code=params[0];var msg_str=params[1];messages[msg_code]=msg_str;},API_GET_MESSAGE:function(sender,params){var msg_code=params[0];return messages[msg_code]||msg_code;},API_ADD_CALLBACK:function(sender,params){var name=params[0];var func=params[1];callbacks[name]=func;},API_REMOVE_CALLBACK:function(sender,params){var name=params[0];delete callbacks[name];}});var oValidator=new Validator;xe.registerApp(oValidator);var EditorStub=xe.createPlugin('editor_stub',{API_BEFORE_VALIDATE:function(sender,params){var form=params[0];var seq=form.getAttribute('editor_sequence');if(seq && typeof seq=='object')seq=seq.value;if(seq){try{editorRelKeys[seq].content.value=editorRelKeys[seq].func(seq)||'';}catch(e){}}}});oValidator.registerPlugin(new EditorStub);function get_value(elem){var vals=[];if(elem.is(':radio')){return elem.filter(':checked').val();}else if(elem.is(':checkbox')){elem.filter(':checked').each(function(){vals.push(this.value);});return vals.join('|@|');}else{return elem.val();}}})(jQuery);function filterAlertMessage(ret_obj){var error=ret_obj["error"];var message=ret_obj["message"];var act=ret_obj["act"];var redirect_url=ret_obj["redirect_url"];var url=location.href;if(typeof(message)!="undefined"&&message&&message!="success")alert(message);if(typeof(act)!="undefined"&&act)url=current_url.setQuery("act",act);else if(typeof(redirect_url)!="undefined"&&redirect_url)url=redirect_url;if(url==location.href)url=url.replace(/#(.*)$/,'');location.href=url;}
-function procFilter(form,filter_func){filter_func(form);return false;}
-function legacy_filter(filter_name,form,module,act,callback,responses,confirm_msg,rename_params){var v=xe.getApp('Validator')[0],$=jQuery,args=[];if(!v)return false;if(!form.elements['_filter'])$(form).prepend('<input type="hidden" name="_filter" />');form.elements['_filter'].value=filter_name;args[0]=filter_name;args[1]=function(f){var params={},res=[],elms=f.elements,data=$(f).serializeArray();$.each(data,function(i,field){var v=$.trim(field.value),n=field.name;if(!v||!n)return true;if(rename_params[n])n=rename_params[n];if(/\[\]$/.test(n))n=n.replace(/\[\]$/,'');if(params[n])params[n]+='|@|'+v;else params[n]=field.value;});if(confirm_msg&&!confirm(confirm_msg))return false;exec_xml(module,act,params,callback,responses,params,form);};v.cast('ADD_CALLBACK',args);v.cast('VALIDATE',[form,filter_name]);return false;}
\ No newline at end of file
+/**
+ * @file   common/js/xml_js_filter.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  xml filter (validator) plugin
+ * 
+ * A rule is a method validate one field.
+ * A filter is made up of one or more rules.
+ **/
+(function($){
+
+var messages  = [];
+var rules     = [];
+var filters   = {};
+var callbacks = [];
+var extras    = {};
+
+var Validator = xe.createApp('Validator', {
+	init : function() {
+		// {{{ add filters
+		// email
+		var regEmail = /^[\w-]+(\.[\w-]+)*@[\w-]+(\.[\w-]+)+$/;
+		this.cast('ADD_RULE', ['email', regEmail]);
+		this.cast('ADD_RULE', ['email_address', regEmail]);
+
+		// userid
+		var regUserid = /^[a-z]+[\w-]*[a-z0-9_]+$/i;
+		this.cast('ADD_RULE', ['userid', regUserid]);
+		this.cast('ADD_RULE', ['user_id', regUserid]);
+
+		// url
+		var regUrl = /^(https?|ftp|mms):\/\/[0-9a-z-]+(\.[_0-9a-z-]+)+(:\d+)?/;
+		this.cast('ADD_RULE', ['url', regUrl]);
+		this.cast('ADD_RULE', ['homepage', regUrl]);
+
+		// korean
+		var regKor = new RegExp('^[\uAC00-\uD7A3]*$');
+		this.cast('ADD_RULE', ['korean', regKor]);
+
+		// korean_number
+		var regKorNum = new RegExp('^[\uAC00-\uD7A30-9]*$');
+		this.cast('ADD_RULE', ['korean_number', regKorNum]);
+
+		// alpha
+		var regAlpha = /^[a-z]*$/i;
+		this.cast('ADD_RULE', ['alpha', regAlpha]);
+
+		// alpha_number
+		var regAlphaNum = /^[a-z][a-z0-9_]*$/i;
+		this.cast('ADD_RULE', ['alpha_number', regAlphaNum]);
+
+		// number
+		var regNum = /^[0-9]*$/;
+		this.cast('ADD_RULE', ['number', regNum]);
+		// }}} add filters
+	},
+	// run validator
+	run : function(oForm) {
+		var filter = '';
+
+		if (oForm._filter) filter = oForm._filter.value;
+
+		var params = [oForm, filter];
+		var result = this.cast('VALIDATE', params);
+		if (typeof result == 'undefined') result = false;
+
+		return result;
+	},
+	API_ONREADY : function() {
+		var self = this;
+
+		// hook form submit event
+		$('form')
+			.each(function(){
+				if (this.onsubmit) {
+					this['xe:onsubmit'] = this.onsubmit;
+					this.onsubmit = null;
+				}
+			})
+			.submit(function(){
+				var legacyFn = this['xe:onsubmit'];		
+				var hasLegacyFn = $.isFunction(legacyFn);
+				var bResult = hasLegacyFn?legacyFn.apply(this):self.run(this);
+
+				return bResult;
+			});
+	},
+	API_VALIDATE : function(sender, params) {
+		var result = true, form = params[0], elems = form.elements, filter, filter_to_add, ruleset, callback;
+		var fields, names, name, el, val, mod, len, lenb, max, min, maxb, minb, rules, e_el, e_val, i, c, r, if_, fn;
+
+		if(elems['ruleset']) filter = form.elements['ruleset'].value;
+		else if(elems['_filter']) filter = form.elements['_filter'].value;
+		if(!filter) return true;
+
+		if($.isFunction(callbacks[filter])) callback = callbacks[filter];
+		filter = $.extend({}, filters[filter.toLowerCase()] || {}, extras);
+
+		function regex_quote(str){
+			return str.replace(/([\.\+\-\[\]\{\}\(\)\\])/g, '\\$1');
+		};
+
+		// get form names
+		fields = [];
+		for(i=0,c=form.elements.length; i < c; i++) {
+			el   = elems[i];
+			name = el.name;
+
+			if(!name || !elems[name]) continue;
+			if(!elems[name].length || elems[name][0] === el) fields.push(name);
+		};
+		fields = fields.join('\n');
+
+		// get field names matching patterns
+		filter_to_add = {};
+		for(name in filter) {
+			if(!filter.hasOwnProperty(name)) continue;
+
+			names = [];
+			if(name.substr(0,1) == '^') {
+				names = fields.match( (new RegExp('^'+regex_quote(name.substr(1))+'.*$','gm')) );
+			} else {
+				continue;
+			}
+			if(!names) names = [];
+
+			for(i=0,c=names.length; i < c; i++) {
+				filter_to_add[names[i]]= filter[name];
+			}
+
+			filter[name] = null;
+			delete filter[name];
+		};
+
+		filter = $.extend(filter, filter_to_add);
+
+		for(name in filter) {
+			if(!filter.hasOwnProperty(name)) continue;
+
+			f   = filter[name];
+			el  = elems[name];
+			val = el?$.trim(get_value($(el))):'';
+			mod = (f.modifier||'')+',';
+
+			if(!el || el.disabled) continue;
+
+			if(f['if']) {
+				if(!$.isArray(f['if'])) f['if'] = [f['if']];
+				for(i=0;i<f['if'].length;i++) {
+					if_ = f['if'][i];
+					fn  = new Function('el', 'return !!(' + (if_.test.replace(/\$(\w+)/g, 'el["$1"].value')) +')');
+					if(fn(elems)) f[if_.attr] = if_.value;
+				}
+			}
+
+			if(!val) {
+				if(f['default']) val = f['default'];
+				if(f.required) return this.cast('ALERT', [form, name, 'isnull']) && false;
+				else continue;
+			}
+
+			min  = parseInt(f.minlength) || 0;
+			max  = parseInt(f.maxlength) || 0;
+			minb = /b$/.test(f.minlength||'');
+			maxb = /b$/.test(f.maxlength||'');
+			len  = val.length;
+			if(minb || maxb) lenb = get_bytes(val);
+			if((min && min > (minb?lenb:len)) || (max && max < (maxb?lenb:len))) {
+				return this.cast('ALERT', [form, name, 'outofrange', min, max]) && false;
+			}
+			
+			if(f.equalto) {
+				e_el  = elems[f.equalto];
+				e_val = e_el?$.trim(get_value($(e_el))):'';
+				if(e_el && e_val !== val) {
+					return this.cast('ALERT', [form, name, 'equalto']) && false;
+				}
+			}
+			
+			rules = (f.rule || '').split(',');
+			for(i=0,c=rules.length; i < c; i++) {
+				if(!(r = rules[i])) continue;
+
+				result = this.cast('APPLY_RULE', [r, val]);
+				if(mod.indexOf('not,') > -1) result = !result;
+				if(!result) {
+					return this.cast('ALERT', [form, name, 'invalid_'+r]) && false;
+				}
+			}
+		};
+
+		if($.isFunction(callback)) return callback(form);
+
+		return true;
+	},
+	API_ADD_RULE : function(sender, params) {
+		var name = params[0].toLowerCase();
+		rules[name] = params[1];
+	},
+	API_DEL_RULE : function(sender, params) {
+		var name = params[0].toLowerCase();
+		delete rules[name];
+	},
+	API_GET_RULE : function(sender, params) {
+		var name = params[0].toLowerCase();
+
+		if (rules[name]) {
+			return rules[name];
+		} else {
+			return null;
+		}
+	},
+	API_ADD_FILTER : function(sender, params) {
+		var name   = params[0].toLowerCase();
+		var filter = params[1];
+
+		filters[name] = filter;
+	},
+	API_DEL_FILTER : function(sender, params) {
+		var name = params[0].toLowerCase();
+		delete filters[name];
+	},
+	API_GET_FILTER : function(sender, params) {
+		var name = params[0].toLowerCase();
+
+		if (filters[name]) {
+			return filters[name];
+		} else {
+			return null;
+		}
+	},
+	API_ADD_EXTRA_FIELD : function(sender, params) {
+		var name = params[0].toLowerCase();
+		var prop = params[1];
+
+		extras[name] = prop;
+	},
+	API_GET_EXTRA_FIELD : function(sender, params) {
+		var name = params[0].toLowerCase();
+		return extras[name];
+	},
+	API_DEL_EXTRA_FIELD : function(sender, params) {
+		var name = params[0].toLowerCase();
+		delete extras[name];
+	},
+	API_APPLY_RULE : function(sender, params) {
+		var name  = params[0];
+		var value = params[1];
+
+		if(typeof(rules[name]) == 'undefined') return true; // no filter
+		if($.isFunction(rules[name])) return rules[name](value);
+		if(rules[name] instanceof RegExp) return rules[name].test(value);
+		if($.isArray(rules[name])) return ($.inArray(value, rules[name]) > -1);
+
+		return true;
+	},
+	API_ALERT : function(sender, params) {
+		var form = params[0];
+		var field_name = params[1];
+		var msg_code = params[2];
+		var minlen   = params[3];
+		var maxlen   = params[4];
+
+		var field_msg = this.cast('GET_MESSAGE', [field_name]);
+		var msg = this.cast('GET_MESSAGE', [msg_code]);
+
+		if (msg != msg_code) msg = (msg.indexOf('%s')<0)?(field_msg+msg):(msg.replace('%s',field_msg));
+		if (minlen||maxlen) msg +=  '('+(minlen||'')+'~'+(maxlen||'')+')';
+
+		this.cast('SHOW_ALERT', [msg]);
+
+		// set focus
+		$(form.elements[field_name]).focus();
+	},
+	API_SHOW_ALERT : function(sender, params) {
+		alert(params[0]);
+	},
+	API_ADD_MESSAGE : function(sender, params) {
+		var msg_code = params[0];
+		var msg_str  = params[1];
+
+		messages[msg_code] = msg_str;
+	},
+	API_GET_MESSAGE : function(sender, params) {
+		var msg_code = params[0];
+
+		return messages[msg_code] || msg_code;
+	},
+	API_ADD_CALLBACK : function(sender, params) {
+		var name = params[0];
+		var func = params[1];
+
+		callbacks[name] = func;
+	},
+	API_REMOVE_CALLBACK : function(sender, params) {
+		var name = params[0];
+
+		delete callbacks[name];
+	}
+});
+
+var oValidator = new Validator;
+
+// register validator
+xe.registerApp(oValidator);
+
+// 호환성을 위해 추가한 플러그인 - 에디터에서 컨텐트를 가져와서 설정한다.
+var EditorStub = xe.createPlugin('editor_stub', {
+	API_BEFORE_VALIDATE : function(sender, params) {
+		var form = params[0];
+		var seq  = form.getAttribute('editor_sequence');
+
+		// bug fix for IE6,7
+		if (seq && typeof seq == 'object') seq = seq.value;
+
+		if (seq) {
+			try {
+				editorRelKeys[seq].content.value = editorRelKeys[seq].func(seq) || '';
+			} catch(e) { }
+		}
+	}
+});
+oValidator.registerPlugin(new EditorStub);
+
+// functions
+function get_value($elem) {
+	var vals = [];
+	if ($elem.is(':radio')){
+		return $elem.filter(':checked').val();
+	} else if ($elem.is(':checkbox')) {
+		$elem.filter(':checked').each(function(){
+			vals.push(this.value);
+		});
+		return vals.join('|@|');
+	} else {
+		return $elem.val();
+	}
+}
+
+function get_bytes(str) {
+	str += '';
+	if(!str.length) return 0;
+
+	str = encodeURI(str);
+	var c = str.split('%').length - 1;
+
+	return str.length - c*2;
+}
+
+})(jQuery);
+
+/**
+ * @function filterAlertMessage
+ * @brief ajax로 서버에 요청후 결과를 처리할 callback_function을 지정하지 않았을 시 호출되는 기본 함수
+ **/
+function filterAlertMessage(ret_obj) {
+	var error = ret_obj["error"];
+	var message = ret_obj["message"];
+	var act = ret_obj["act"];
+	var redirect_url = ret_obj["redirect_url"];
+	var url = location.href;
+
+	if(typeof(message)!="undefined"&&message&&message!="success") alert(message);
+
+	if(typeof(act)!="undefined" && act) url = current_url.setQuery("act", act);
+	else if(typeof(redirect_url)!="undefined" && redirect_url) url = redirect_url;
+
+	if(url == location.href) url = url.replace(/#(.*)$/,'');
+
+	location.href = url;
+}
+
+/**
+ * @brief Function to process filters
+ * @deprecated
+ */
+function procFilter(form, filter_func) {
+	filter_func(form);
+	return false;
+}
+
+function legacy_filter(filter_name, form, module, act, callback, responses, confirm_msg, rename_params) {
+	var v = xe.getApp('Validator')[0], $ = jQuery, args = [];
+
+	if (!v) return false;
+
+	if (!form.elements['_filter']) $(form).prepend('<input type="hidden" name="_filter" />');
+	form.elements['_filter'].value = filter_name;
+
+	args[0] = filter_name;
+	args[1] = function(f) {
+		var params = {}, res = [], elms = f.elements, data = $(f).serializeArray();
+		$.each(data, function(i, field) {
+			var v = $.trim(field.value), n = field.name;
+			if(!v || !n) return true;
+			if(rename_params[n]) n = rename_params[n];
+			
+			if(/\[\]$/.test(n)) n = n.replace(/\[\]$/, '');
+			if(params[n]) params[n] += '|@|'+v;
+			else params[n] = field.value;			
+		});
+
+		if (confirm_msg && !confirm(confirm_msg)) return false;
+		exec_xml(module, act, params, callback, responses, params, form);
+	};
+
+	v.cast('ADD_CALLBACK', args);
+	v.cast('VALIDATE', [form, filter_name]);
+
+	return false;
+}
diff --git a/common/lang/es.lang.php b/common/lang/es.lang.php
deleted file mode 100644
index d6d92be57..000000000
--- a/common/lang/es.lang.php
+++ /dev/null
@@ -1,330 +0,0 @@
-<?php
-/**
- * @archivo   common/lang/es.lang.php
- * @autor NHN (developers@xpressengine.com)
- * @sumario Paquete del Idioma Español (incluye sólo las palabras básicas )
- **/
-
-// palabras para la acción, las cuales son basicamente usados
-$lang->cmd_write = 'Escribir';
-$lang->cmd_reply = 'Responder';
-$lang->cmd_delete = 'Eliminar';
-$lang->cmd_modify = 'Modificar';
-$lang->cmd_edit = 'editar';
-$lang->cmd_view = 'Ver';
-$lang->cmd_view_all = 'Ver todo';
-$lang->cmd_list = 'Lista';
-$lang->cmd_prev = 'Anterior';
-$lang->cmd_next = 'Siguiente';
-$lang->cmd_send_trackback = 'Enviar Trackback';
-$lang->cmd_registration = $lang->cmd_submit = 'Admitir';
-$lang->cmd_comment_registration = 'Agregar comentario';
-$lang->cmd_insert = 'Insertar';
-$lang->cmd_save = 'Guardar';
-$lang->cmd_load = 'Carga';
-$lang->cmd_input = 'Ingresar';
-$lang->cmd_search = 'Buscar';
-$lang->cmd_find = '찾기';
-$lang->cmd_replace = '바꾸기';
-$lang->cmd_confirm = '확인';
-$lang->cmd_cancel = 'Cancelar';
-$lang->cmd_back = 'Atrás';
-$lang->cmd_vote = 'a Favor';
-$lang->cmd_vote_down = 'en Contra';
-$lang->cmd_declare = 'Denunciar';
-$lang->cmd_cancel_declare = 'Anular la Denuncia';
-$lang->cmd_declared_list = 'Lista de Denuncias';
-$lang->cmd_copy = 'Copiar';
-$lang->cmd_move = 'Mover';
-$lang->cmd_move_up = 'Arriba';
-$lang->cmd_move_down = 'Abajo';
-$lang->cmd_add_indent = 'Añadir Sangría';
-$lang->cmd_remove_indent = 'Reducir Sangría';
-$lang->cmd_management = 'Administración';
-$lang->cmd_make = 'Crear';
-$lang->cmd_select = 'Seleccionar';
-$lang->cmd_select_all = 'Seleccionar todo';
-$lang->cmd_unselect_all = 'Cancelar Toda la Selección';
-$lang->cmd_close_all = 'Cerrar todo';
-$lang->cmd_open_all = 'Abrir todo';
-$lang->cmd_reload = 'Actualizar';
-$lang->cmd_close = 'Cerrar';
-$lang->cmd_open = 'Abrir';
-$lang->cmd_setup = 'Configuración';
-$lang->cmd_addition_setup = 'Más opciones';
-$lang->cmd_option = 'Opción';
-$lang->cmd_apply = 'Aplicar';
-$lang->cmd_open_calendar = 'Abrir el calendario';
-$lang->cmd_send = 'Enviar';
-$lang->cmd_print = 'Imprimir';
-$lang->cmd_scrap = 'Recorte';
-$lang->cmd_preview = 'Vista Previa';
-$lang->cmd_reset = 'Rehacer';
-$lang->cmd_remake_cache = "Re-crear el archivo caché";
-$lang->cmd_publish = "Publicar";
-$lang->cmd_layout_setup = 'Composición de Página';
-$lang->cmd_layout_edit = 'Editar la Página';
-$lang->cmd_search_by_ipaddress = 'Búsqueda con IP';
-$lang->cmd_add_ip_to_spamfilter = 'Añadir IP en el Filtro de Spam';
-
-$lang->enable = 'Activar'; //Activado
-$lang->disable = 'Desactivar'; //Desactivado
-
-// Palabras Esenciales
-$lang->menu = 'Menu';
-$lang->no = 'Nº';
-$lang->notice = 'Aviso'; //boletín, noticia
-$lang->secret = 'Secreto';
-$lang->category = $lang->category_srl = 'Categoría';
-$lang->none_category = 'Sin categoría';
-$lang->none_image = '이미지 없음';
-$lang->document_srl = 'Número del documento';
-$lang->user_id = 'ID de Usuario';
-$lang->author = 'Autor';
-$lang->password = 'Contraseña';
-$lang->password1 = 'Contraseña';
-$lang->password2 = 'Otra vez la contraseña';
-$lang->admin_id = 'ID del Administrador';
-$lang->writer = 'Escritor';
-$lang->user_name = 'Nombre del Usuario';
-$lang->nick_name = 'Apodo';
-$lang->email_address = 'Correo electrónico';
-$lang->homepage = 'Página web';
-$lang->blog = 'Blog';
-$lang->birthday = 'Fecha de Nacimiento';
-$lang->browser_title = 'Título del navegador';
-$lang->title = 'Título';
-$lang->title_content = 'Título+Contenido';
-$lang->topic = 'Tema';
-$lang->replies = 'Responder';
-$lang->content = 'Contenido';
-$lang->document = 'Documento';
-$lang->comment = 'Comentario';
-$lang->description = 'Descripción';
-$lang->trackback = 'Trackback';
-$lang->tag = 'Etiqueta';
-$lang->allow_comment = 'Permitir Comentarios';
-$lang->lock_comment = 'Bloquear Comentarios';
-$lang->allow_trackback = 'Permitir Trackback';
-$lang->uploaded_file = 'Archivos Adjuntos';
-$lang->grant = 'Permisos';
-$lang->target = 'Para'; //significaria para cual o quien
-$lang->total = 'Total';
-$lang->total_count = 'Número total';
-$lang->ipaddress = 'Dirección IP';
-$lang->path = 'Ruta';
-$lang->cart = 'Artículo Seleccionado'; //Cesta
-$lang->friend = 'Amigos';
-$lang->notify = 'Notificación';
-$lang->order_target = 'Alinear Meta';
-$lang->order_type = 'Tipo de Ordenación';
-$lang->order_asc = 'ascendente';
-$lang->order_desc = 'descendente';
-$lang->file = 'file';
-
-$lang->mid = 'ID del Módulo';
-$lang->sid = 'Site Name';
-$lang->layout = 'Composición';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Widget';
-$lang->module = 'Módulo';
-$lang->skin = 'Tema'; //máscara,
-$lang->mobile_skin = 'Mobile Tema';
-$lang->colorset = 'Conjunto de Colores';
-$lang->extra_vars = 'Variables Extra';
-
-$lang->domain = "Domain Name";
-$lang->url = "URL";
-$lang->document_url = 'URL del Documento';
-$lang->trackback_url = 'URL del Trackback';
-$lang->blog_name = 'Titulo del Blog';
-$lang->excerpt = 'Extracto';
-
-$lang->document_count = 'Número de documentos';
-$lang->page_count = 'Número de páginas';
-$lang->list_count = 'Número de listas';
-$lang->search_list_count = 'Buscar lista Conde'; //??
-$lang->readed_count = 'Leídos';
-$lang->voted_count = 'Recomendados';
-$lang->comment_count = 'Comentarios';
-$lang->member_count = 'Número de usuarios';
-$lang->date = 'Fecha';
-$lang->regdate = 'Fecha de Publicación';
-$lang->last_update = 'Ultima actualización';
-$lang->last_post = 'Ultimo mensaje';
-$lang->signup_date = 'Fecha del Registro';
-$lang->last_login = 'Ultima conexión'; //Ultima Entrada
-$lang->first_page = 'Primera página';
-$lang->last_page = 'Ultima página';
-$lang->search_target = 'Campo a buscar'; //Objectivo a buscar
-$lang->search_keyword = 'Palabra a buscar';
-$lang->is_default = 'Por defecto';
-
-$lang->no_documents = 'Sin documento';
-
-$lang->board_manager = 'Adm. Tableros';
-$lang->member_manager = 'Adm. Usuarios';
-$lang->layout_manager = 'Adm. Diseños';
-
-$lang->use = 'Usar';
-$lang->notuse = 'No usar';
-$lang->not_exists = 'No existe';
-
-$lang->public = 'Público';
-$lang->private = 'Privado';
-
-$lang->unit_sec = 'segundo';
-$lang->unit_min = 'minuto';
-$lang->unit_hour = 'hora';
-$lang->unit_day = 'día';
-$lang->unit_month = 'mes';
-$lang->unit_year = 'año';
-
-$lang->unit_week = array(
-	'Monday' => 'Lunes',
-	'Tuesday' => 'Mártes',
-	'Wednesday' => 'Miércoles',
-	'Thursday' => 'Jueves',
-	'Friday' => 'Viernes',
-	'Saturday' => 'Sábado',
-	'Sunday' => 'Domingo',
-	'Monday' => 'Lunes',
-	'Tuesday' => 'Martes',
-	'Wednesday' => 'Miércoles ',
-	'Thursday' => 'Jueves',
-	'Friday' => 'Viernes',
-	'Saturday' => 'Sábado',
-	'Sunday' => 'Domingo',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => 'Hace %d minuto',
-	'mins' => '%d minutos',
-	'hour' => '%d día',
-	'hours' => '%d días',
-);
-
-// Relacionado a la Descripción
-$lang->about_tag = 'Puede agregar o añadir diversas etiquetas separándolas con la coma(,)'; // revisado hasta aquí (081007: Juan Lee)
-$lang->about_layout = 'Puede modificar la apariencia(Layout/Diseño) de los módulos. Puede administrarla con el menú Layout.';
-
-// Relacionado al Mensaje
-$lang->msg_call_server = 'Solicitando al servidor, espere un momento';
-$lang->msg_db_not_setted = 'La Base de Datos no está preparada';
-$lang->msg_dbconnect_failed = "Ha ocurrido un error en la conexión de BD.\n Por favor chequee la información de BD nuevamente";
-$lang->msg_invalid_queryid = 'El valor de Query ID especificado es inválido';
-$lang->msg_not_permitted = 'Acceso denegado';
-$lang->msg_input_password = 'Introduzca la contraseña';
-$lang->msg_invalid_document = 'Documento inválido';
-$lang->msg_invalid_request = 'Solicitud Inválida';
-$lang->msg_invalid_password = 'Contraseña Inválida';
-$lang->msg_error_occured = 'Error';
-$lang->msg_not_founded = 'No se ha encontrado';
-$lang->msg_no_result = 'Sin resultado';
-$lang->msg_fail_to_request_open = 'Fail to open your request';
-$lang->msg_invalid_format = 'Invalid Format';
-
-$lang->msg_not_permitted_act = 'No está permitodo para ejecutar esta acción';
-$lang->msg_module_does_not_exists = "요청하신 모듈을 찾을 수 없습니다.\n사이트 관리자에게 모듈 점검 요청 바랍니다";
-$lang->msg_module_is_not_standalone = 'El Módulo requerido no funciona solo.';
-$lang->msg_default_url_is_not_defined = '기본 URL이 정해지지 않아서 동작을 중지합니다';
-
-$lang->success_registed = 'Registrado con éxito';
-$lang->success_declared = 'Denuncia registrada con éxito';
-$lang->success_updated = 'Actualizado con éxito';
-$lang->success_deleted = 'Borrado con éxito';
-$lang->success_voted = 'Voto a favor registrado con éxito';
-$lang->success_blamed = 'Voto en Contra registrado con éxito';
-$lang->success_moved = 'Movido con éxito';
-$lang->success_sended = 'Enviado con éxito';
-$lang->success_reset = 'Reajustado con éxito';
-$lang->success_leaved = 'Abandonado con éxito';
-$lang->success_saved = 'Guardado correctamente';
-
-$lang->fail_to_delete = 'No puede ser borrado';
-$lang->fail_to_move = 'No puede ser movido';
-
-$lang->failed_voted = 'No puede dar Voto a favor';
-$lang->failed_blamed = 'No puede dar Voto en contra';
-$lang->failed_declared = 'No puede denunciar';
-$lang->fail_to_delete_have_children = 'No puede eliminar lo publicado, por los escritos: mensajes, ecos, respuestas, recibidos';
-
-$lang->confirm_submit = '¿Está seguro que desea enviar?';
-$lang->confirm_logout = '¿Está seguro que desea desconectar?';
-$lang->confirm_vote = '¿Está seguro que desea votar?';
-$lang->confirm_delete = '¿Está seguro que desea eliminar?';
-$lang->confirm_move = '¿Está seguro que desea mover?';
-$lang->confirm_reset = '¿Está seguro que desea rehacer?';
-$lang->confirm_leave = '¿Está seguro que desea abandonar?';
-$lang->confirm_update = 'Are you sure to update?';
-
-$lang->column_type = 'Tipos de Columnas';
-$lang->column_type_list['text'] = 'Texto sin cambio de línea';
-$lang->column_type_list['homepage'] = 'URL de la página web';
-$lang->column_type_list['email_address'] = 'Correo Electrónico';
-$lang->column_type_list['tel'] = 'Número de teléfono';
-$lang->column_type_list['textarea'] = 'Texto multi-linea';
-$lang->column_type_list['checkbox'] = 'Caja de chequeo (selección múltiple)';
-$lang->column_type_list['select'] = 'Selección (selección individual)';
-$lang->column_type_list['radio'] = 'radio button (radio)';
-//$lang->column_type_list['kr_zip'] = 'zip code (Korean)';
-$lang->column_type_list['date'] = 'fecha (dd/mm/aaaa)';
-//$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
-$lang->column_name = 'Nombre de la Columna';
-$lang->column_title = 'Título de la Columna';
-$lang->default_value = 'Valor por defecto';
-$lang->is_active = 'Activado';
-$lang->is_required = 'Requerido';
-$lang->eid = '확장변수 이름';
-
-// ftp 관련
-$lang->ftp_form_title = 'Datos de conexión para FTP';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP password will not be stored';
-$lang->cmd_check_ftp_connect = 'conexión de FTP confirmada';
-$lang->about_ftp_info = "
-	Los datos de conexión para FTP pueden ser utilizados en los siguientes casos.<br/>
-	1. Cuando la variable safe_mode está activa[safe_mode=On], el XE puede utilizarlos para su funcionamiento normal.<br/>
-	2. Para la actualización automática.<br/>
-	Estos datos de FTP se guardan en el fichero files/config/ftp.config.php <br/>
-	, y pueden ser borrados o modificados posteriormente en las páginas de administración.<br />
-";
-
-$lang->msg_safe_mode_ftp_needed = "Si la la variable safe_mode está activa[safe_mode=On], debe rellenar los datos de FTP para seguir instalando y usar con normalidad el XE.";
-$lang->msg_ftp_not_connected = "Ha ocurrico un error de conexión al FTP del localhost. Verifique el puerto del FTP y/o el funcionamiento del servicio FTP.";
-$lang->msg_ftp_invalid_auth_info = "Los datos de login para el FTP no son correctos. Veriféquelos.";
-$lang->msg_ftp_mkdir_fail = "Ha fallado el comando de FTP para la creación de directorio. Verifique la configuración del servicio FTP en el servidor";
-$lang->msg_ftp_chmod_fail = "Ha fallado el comando de FTP para la modificación de atributos de directorio. Verifique la configuración del servicio FTP en el servidor.";
-$lang->msg_ftp_connect_success = "conexión con éxito al FTP";
-
-$lang->ftp_path_title = 'FTP 경로 정보 입력';
-$lang->msg_ftp_installed_realpath = '설치된 XE의 절대경로';
-$lang->msg_ftp_installed_ftp_realpath = '설치된 XE의 FTP 절대경로 설정';
-
-
-
-// Mensajes de alerta para Javascript usando el filtro XML
-$lang->filter->isnull = 'Introduzca valor en el %s';
-$lang->filter->outofrange = 'Se ha excedido el máximo número de letras permitido en el %s';
-$lang->filter->equalto = 'Valor inválido en el %s';
-$lang->filter->invalid_email = 'Formato email inválido en el %s (ej. developers@xpressengine.com)';
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "Formato inválido en el %s.\\nSólo pueden introducir los alfabetos o los dígitos númericos o el guión bajo(_). Además, el primer valor sólo puede ser una letra de alfabeto";
-$lang->filter->invalid_homepage = 'Formato url inválido en el %s (ej: http://xpressengine.com/)';
-$lang->filter->invalid_korean = 'Sólo puede introducir los caracteres coreanos en el %s';
-$lang->filter->invalid_korean_number = 'Sólo puede introducir los caracteres coreanos o números en el %s';
-$lang->filter->invalid_alpha = 'Sólo puede introducir los alfabetos en el %s';
-$lang->filter->invalid_alpha_number = 'Sólo puede introducir los alfanuméricos en el %s es inválido';
-$lang->filter->invalid_number = 'Sólo puede introducir los dígitos numéricos en el %s';
-
-$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/fr.lang.php b/common/lang/fr.lang.php
deleted file mode 100644
index c4f9ca0a1..000000000
--- a/common/lang/fr.lang.php
+++ /dev/null
@@ -1,321 +0,0 @@
-<?php
-/**
- * @file   common/lang/fr.lang.php
- * @author NHN (developers@xpressengine.com)   Traduit par Pierre Duvent(PierreDuvent@gamil.com)
- * @brief  Paquet du langage en français
- **/
-
-// 	verbes et mots fondamentaux qui décrivent des actions
-$lang->cmd_write = 'Ecrire';
-$lang->cmd_reply = 'Répondre';
-$lang->cmd_delete = 'Supprimer';
-$lang->cmd_modify = 'Modifier';
-$lang->cmd_edit = 'Editer';
-$lang->cmd_view = 'Voir';
-$lang->cmd_view_all = 'Voir tout';
-$lang->cmd_list = 'Liste';
-$lang->cmd_prev = 'Précédent';
-$lang->cmd_next = 'Suivant';
-$lang->cmd_send_trackback = 'Envoyer Rétrolien';
-$lang->cmd_registration = $lang->cmd_submit = 'Enrégistrer';
-$lang->cmd_comment_registration = 'Ajouter un Commentaire';
-$lang->cmd_insert = 'Insérer';
-$lang->cmd_save = 'Conserver';
-$lang->cmd_load = 'Charger';
-$lang->cmd_input = 'Entrer';
-$lang->cmd_search = 'Rechercher';
-$lang->cmd_find = 'Trouver';
-$lang->cmd_replace = 'Remplacer';
-$lang->cmd_confirm = 'Confirmer';
-$lang->cmd_cancel = 'Annuler';
-$lang->cmd_back = 'Retourner';
-$lang->cmd_vote = 'Recommander';
-$lang->cmd_vote_down = 'Critiquer';
-$lang->cmd_declare = 'Déclarer';
-$lang->cmd_cancel_declare = 'Annuler déclaration';
-$lang->cmd_declared_list = 'Liste des déclarations';
-$lang->cmd_copy = 'Copier';
-$lang->cmd_move = 'Bouger';
-$lang->cmd_move_up = 'En haut';
-$lang->cmd_move_down = 'En bas';
-$lang->cmd_add_indent = 'Ajouter un Rentré';
-$lang->cmd_remove_indent = 'Enlever un Rentré';
-$lang->cmd_management = 'Administrer';
-$lang->cmd_make = 'Créer';
-$lang->cmd_select = 'Choisir';
-$lang->cmd_select_all = 'Choisir Tout';
-$lang->cmd_unselect_all = 'Annuler Tout';
-$lang->cmd_reverse_all = 'Renverser la Sélection';
-$lang->cmd_close_all = 'Fermer Tout';
-$lang->cmd_open_all = 'Ouvrir Tout';
-$lang->cmd_reload = 'Recharger';
-$lang->cmd_close = 'Fermer';
-$lang->cmd_open = 'Ouvrir';
-$lang->cmd_setup = 'Configuration';
-$lang->cmd_addition_setup = 'Configuration Additionnelle';
-$lang->cmd_option = 'Option';
-$lang->cmd_apply = 'Appliquer';
-$lang->cmd_open_calendar = 'Choisir un Jour';
-$lang->cmd_send = 'Envoyer';
-$lang->cmd_print = 'Imprimer';
-$lang->cmd_scrap = 'Coupure';
-$lang->cmd_preview = 'Avant-première';
-$lang->cmd_reset = 'Restaurer';
-$lang->cmd_remake_cache = "Recréer l'antémémoire du Fichier";
-$lang->cmd_publish = "Publier";
-$lang->cmd_layout_setup = 'Configurer la Mise en page';
-$lang->cmd_layout_edit = 'Editer la Mise en page';
-$lang->cmd_search_by_ipaddress = 'Recherce par l\'Address IP';
-$lang->cmd_add_ip_to_spamfilter = 'Add IP to spamfilter';
-
-$lang->enable = 'Valide';
-$lang->disable = 'Invalide';
-
-// Mots essentiels
-$lang->menu = 'Menu';
-$lang->no = 'No';
-$lang->notice = 'Notice';
-$lang->secret = 'Secret';
-$lang->category = $lang->category_srl = 'Catégorie';
-$lang->none_category = 'None category';
-$lang->none_image = '이미지 없음';
-$lang->document_srl = 'Numéro de série du Document';
-$lang->user_id = 'Compte';
-$lang->author = 'Auteur';
-$lang->password = 'Mot de Passe';
-$lang->password1 = 'Mot de Passe';
-$lang->password2 = 'Confirmer du Mot de Passe';
-$lang->admin_id = 'Compte d\'Administrateur';
-$lang->writer = 'Auteur';
-$lang->user_name = 'Nom';
-$lang->nick_name = 'Surnom';
-$lang->email_address = 'Mél';
-$lang->homepage = 'Page d\'accueil';
-$lang->blog = 'Blogue';
-$lang->birthday = 'Anniversaire';
-$lang->browser_title = 'Titre de Navigateur';
-$lang->title = 'Titre';
-$lang->title_content = 'Titre + Contenu';
-$lang->topic = 'Sujet';
-$lang->replies = 'Répondse';
-$lang->content = 'Contenu';
-$lang->document = 'Document';
-$lang->comment = 'Commentaire';
-$lang->description = 'Description';
-$lang->trackback = 'Rétrolien';
-$lang->tag = 'Tag';
-$lang->allow_comment = 'Permettre Commentaires';
-$lang->lock_comment = 'Bloquer Commentaires';
-$lang->allow_trackback = 'Permettre Rétrolien';
-$lang->uploaded_file = 'Fichier Attaché';
-$lang->grant = 'Permission';
-$lang->target = 'Objet';
-$lang->total = 'Total';
-$lang->total_count = 'Somme';
-$lang->ipaddress = 'Addresse IP';
-$lang->path = 'Chemin';
-$lang->cart = 'Article Choisi';
-$lang->friend = 'Les Amis';
-$lang->notify = 'Annoncer';
-$lang->order_target = 'Align Target';
-$lang->order_type = 'Sorting Type';
-$lang->order_asc = 'Ascend';
-$lang->order_desc = 'Descendre';
-$lang->file = 'file';
-
-$lang->mid = 'Nom';
-$lang->sid = 'Site Name';
-$lang->layout = 'Mise en Page';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Gadget';
-$lang->module = 'Module';
-$lang->skin = 'Habillage';
-$lang->mobile_skin = 'Mobile Habillage';
-$lang->colorset = 'Arrangement de couleur';
-$lang->extra_vars = 'Variables Supplémentaires';
-
-$lang->domain = "Domain Name";
-$lang->url = "URL";
-$lang->document_url = 'Document URL';
-$lang->trackback_url = 'Rétrolien URL';
-$lang->blog_name = 'Nom du Blogue';
-$lang->excerpt = 'Extrait';
-
-$lang->document_count = ' Documents';
-$lang->page_count = 'Pages';
-$lang->list_count = 'Item';
-$lang->search_list_count = 'Trouvés';
-$lang->readed_count = ' Vues';
-$lang->voted_count = 'Recommandés';
-$lang->comment_count = 'Commentaires';
-$lang->member_count = 'Membres';
-$lang->date = 'Jour';
-$lang->regdate = 'Enrégistré';
-$lang->last_update = 'Dernière Mise à Jour';
-$lang->last_post = 'Dernière Affichage';
-$lang->signup_date = 'Inscription';
-$lang->last_login = 'Dernière connexion';
-$lang->first_page = 'Première Page';
-$lang->last_page = 'Dernière Page';
-$lang->search_target = 'Champ à Rechercher';
-$lang->search_keyword = 'Mot-clé à Rechercher';
-$lang->is_default = 'Par Défaut';
-
-$lang->no_documents = 'Nul Document';
-
-$lang->board_manager = 'Administration des Panneaux';
-$lang->member_manager = 'Administration des Membres';
-$lang->layout_manager = 'Administration des Mises en Page';
-
-$lang->use = 'Utiliser';
-$lang->notuse = 'Pas Utilisé';
-$lang->not_exists = 'Rien';
-
-$lang->public = 'public';
-$lang->private = 'privé';
-
-$lang->unit_sec = 'seconde';
-$lang->unit_min = 'minute';
-$lang->unit_hour = 'heure';
-$lang->unit_day = 'jour';
-$lang->unit_month = 'mois';
-$lang->unit_year = 'année';;
-
-$lang->unit_week = array(
-	'Monday' => 'Lundi',
-	'Tuesday' => 'Mardi',
-	'Wednesday' => 'Mer.',
-	'Thursday' => 'Jeu.',
-	'Friday' => 'Vendredi',
-	'Saturday' => 'Samedi',
-	'Sunday' => 'Dimanche',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => '%d heure',
-	'mins' => 'Il ya %d minutes',
-	'hour' => 'Il ya %d jour',
-	'hours' => 'Il ya %d jours',
-);
-
-// Descriptions et information
-$lang->about_tag = 'Vous pouvez enrégistrer plusieurs balises en utilisant ,(virgule) entre chaque balise';
-$lang->about_layout = 'Le Mise en Page décore l\'apparence des modules. Vous pouvez les configurer avec le menu de Mise en Page en haut';
-
-// Messages et alertes
-$lang->msg_call_server = 'En demandant sur le serveur, attendez S.V.P.';
-$lang->msg_db_not_setted = 'La configuration de Base de Données n\'a pas été établie.';
-$lang->msg_dbconnect_failed = "Erreur a lieu en essayant connecter à la Base de Données.\nVérifiez encore une fois les informations sur la Base de Données, S.V.P.";
-$lang->msg_invalid_queryid = 'La valeur spécifiée d\'identite de query est invalide.';
-$lang->msg_not_permitted = 'Vous n\'avez pas le droit d\'accès.';
-$lang->msg_input_password = 'Veuillez entrer votre mot de passe.';
-$lang->msg_invalid_document = 'Numéro de Document invalide';
-$lang->msg_invalid_request = 'Requête invalide';
-$lang->msg_invalid_password = 'Mot de passe invalide';
-$lang->msg_error_occured = 'Une erreur a lieu';
-$lang->msg_not_founded = 'L\'objet n\'est pas trouvé.';
-$lang->msg_no_result = 'Nul Résultat';
-$lang->msg_fail_to_request_open = 'Fail to open your request';
-$lang->msg_invalid_format = 'Invalid Format';
-
-$lang->msg_not_permitted_act = 'Vous n\'êtes pas autorisés à exécuter l\'action que vous avez demandé.';
-$lang->msg_module_does_not_exist = "Vous ne trouvez pas le module demandé.\nS'il vous plaît contacter l'administrateur.";
-$lang->msg_module_is_not_standalone = 'Le module demandé ne peut pas être exécuté indépendamment.';
-$lang->msg_default_url_is_not_defined = 'URL par défaut n\'est pas défini.';
-
-$lang->success_registed = 'Enregistré avec succès';
-$lang->success_declared = 'Accusé avec succès';
-$lang->success_updated = 'Mise à jour avec succès';
-$lang->success_deleted = 'Supprimé avec succès';
-$lang->success_voted = 'Voté avec succès';
-$lang->success_blamed = 'Blâmé avec succès';
-$lang->success_moved = 'Bougé avec succès';
-$lang->success_sended = 'Envoyé avec succès';
-$lang->success_reset = 'Restauré avec succès';
-$lang->success_leaved = 'Toutes vos informations sont complètement supprimés';
-$lang->success_saved = 'Conservé avec succès';
-
-$lang->fail_to_delete = 'N\'a pas pu être supprimé.';
-$lang->fail_to_move = 'N\'a pas pu être bougé';
-
-$lang->failed_voted = 'N\'a pas pu recommander';
-$lang->failed_blamed = 'N\'a pas pu blâmer';
-$lang->failed_declared = 'N\'a pas pu accuser';
-$lang->fail_to_delete_have_children = 'Essayez encore une fois après avoir suprimé les reponses, S.V.P.';
-
-$lang->confirm_submit = 'Vous voulez sûrement soumettre?';
-$lang->confirm_logout = 'Vous voulez sûrement fermer la session?';
-$lang->confirm_vote = 'Vous voulez recommander?';
-$lang->confirm_delete = 'Vous voulez sûrement supprimer?';
-$lang->confirm_move = 'Vous voulez sûrement bouger?';
-$lang->confirm_reset = 'Vous voulez sûrement restaurer?';
-$lang->confirm_leave = 'Vous voulez sûrement supprimer votre compte?';
-$lang->confirm_update = 'Are you sure to update?';
-
-$lang->column_type = 'Types de la colonne';
-$lang->column_type_list['text'] = 'Texte en une seul ligne';
-$lang->column_type_list['homepage'] = 'URL';
-$lang->column_type_list['email_address'] = 'Mél';
-$lang->column_type_list['tel'] = 'Numéro de Telephone';
-$lang->column_type_list['textarea'] = 'Texte en plusieurs lignes';
-$lang->column_type_list['checkbox'] = 'Case à cocher (multichoix)';
-$lang->column_type_list['select'] = 'Case d\'option (seul choix)';
-$lang->column_type_list['radio'] = 'radio button (radio)';
-$lang->column_type_list['kr_zip'] = 'Code postal (coréen)';
-$lang->column_type_list['date'] = 'Jour (yyyy/mm/dd)';
-//$lang->column_type_list['jp_zip'] = 'code postal (japonais)';
-$lang->column_name = 'Nom de la colonne';
-$lang->column_title = 'Titre de la colonne';
-$lang->default_value = 'Valeur par défaut';
-$lang->is_active = 'Actif';
-$lang->is_required = 'Item essentielle';
-$lang->eid = '확장변수 이름';
-
-// ftp 관련
-$lang->ftp_form_title = 'FTP 정보 입력';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP password will not be stored';
-$lang->cmd_check_ftp_connect = 'FTP 접속 확인';
-$lang->about_ftp_info = "
-	FTP 정보는 다음의 경우에 이용될 수 있습니다.<br/>
-	1. PHP의 safe_mode=On일 경우에 FTP 정보를 이용해서 XE를 정상적으로 동작할 수 있게 합니다.<br/>
-	2. 자동 업데이트등에서 FTP 정보를 이용할 수 있습니다.<br/>
-	이 FTP정보는 files/config/ftp.config.php 파일내에 정보가 저장됩니다.<br/>
-	그리고 설치 후 관리자 페이지에서 FTP 정보를 변경하거나 제거할 수 있습니다.<br />
-";
-
-$lang->msg_safe_mode_ftp_needed = "PHP의 safe_mode가 On일 경우 FTP 정보를 꼭 입력해주셔야 XE의 설치 및 사용이 가능합니다";
-$lang->msg_ftp_not_connected = "localhost로의 FTP 접속 오류가 발생하였습니다. ftp 포트 번호를 확인해주시거나 ftp 서비스가 가능한지 확인해주세요";
-$lang->msg_ftp_invalid_auth_info = "입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요";
-$lang->msg_ftp_mkdir_fail = "FTP를 이용한 디렉토리 생성 명령을 실패하였습니다. FTP 서버의 설정을 확인해주세요";
-$lang->msg_ftp_chmod_fail = "FTP를 이용한 디렉토리의 속성 변경을 실패하였습니다. FTP 서버의 설정을 확인해주세요";
-$lang->msg_ftp_connect_success = "FTP 접속 및 인증 성공하였습니다";
-
-$lang->ftp_path_title = 'FTP 경로 정보 입력';
-$lang->msg_ftp_installed_realpath = '설치된 XE의 절대경로';
-$lang->msg_ftp_installed_ftp_realpath = '설치된 XE의 FTP 절대경로 설정';
-
-
-// Messages d\'alerte de le Javascript qui est utilisé dans les filtres en XML
-$lang->filter->isnull = 'Entrez une valeur pour %s';
-$lang->filter->outofrange = 'Aligner la longueur du texte de %s';
-$lang->filter->equalto = "La valeur de %s est invalide.";
-$lang->filter->invalid_email = "Le format de %s est invalide. ex) developers@xpressengine.com";
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "La format de %s n\'est pas convenable.\\nToutes les lettres devraient se composer des alphabets, des chiffres ou du soulignage(_) Et la première lettre doit être un de l\'alphabet.";
-$lang->filter->invalid_homepage = "La format de %s n\'est pas convenable. ex) http://xpressengine.com/";
-$lang->filter->invalid_korean = "La format de %s n\'est pas convenable. Entrez seulement en coréen, S.V.P.";
-$lang->filter->invalid_korean_number = "La format de %s n\'est pas convenable. Entrez seulement des lettres d\'alphabet coréen ou des chiffres, S.V.P.";
-$lang->filter->invalid_alpha = "La format de %s n\'est pas convenable. Entrez seulement en alphabet, S.V.P.";
-$lang->filter->invalid_alpha_number = "La format de %s n\'est pas convenable. Entrez seulement des lettres d\'alphabet ou des chiffres.";
-$lang->filter->invalid_number = "La format de %s n\'est pas convenable. Entrez seulement des chiffres.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/ge.lang.php b/common/lang/ge.lang.php
deleted file mode 100644
index 6cdd719af..000000000
--- a/common/lang/ge.lang.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * @Datei common/lang/ge.lang.php
- * @Author NHN (developers@xpressengine.com)
- * @Kurzen german Language Pack (nur einfache Worte sind hier eingeschlossen)
- **/
-
-// Worte für Aktion, die im Grunde verwendet
-$lang->cmd_write = 'Schreiben';
-$lang->cmd_reply = 'Antworten';
-$lang->cmd_delete = 'Löschen';
-$lang->cmd_modify = 'Ändern';
-$lang->cmd_edit = 'Bearbeiten';
-$lang->cmd_view = 'Anzeigen';
-$lang->cmd_view_all = 'Alle anzeigen';
-$lang->cmd_list = 'US -';
-$lang->cmd_prev = 'Zurück';
-$lang->cmd_next = 'Nächster';
-$lang->cmd_send_trackback = 'Trackback senden';
-$lang->cmd_registration = $lang->cmd_submit = 'Übermitteln';
-$lang->cmd_comment_registration = 'Kommentar hinzufügen';
-$lang->cmd_insert = 'Legen Sie';
-$lang->cmd_save = 'sichern';
-$lang->cmd_load = 'Laden';
-$lang->cmd_input = 'Input';
-$lang->cmd_search = 'Suche';
-$lang->cmd_find = '찾기';
-$lang->cmd_replace = '바꾸기';
-$lang->cmd_confirm = '확인';
-$lang->cmd_cancel = 'Abbrechen';
-$lang->cmd_back = 'Zurück';
-$lang->cmd_vote = 'Weiterempfehlen';
-$lang->cmd_vote_down = 'Criticize';
-$lang->cmd_declare = 'accuse';
-$lang->cmd_cancel_declare = 'accuse Abbrechen';
-$lang->cmd_declared_list = 'Vorwürfe Liste';
-$lang->cmd_copy = 'Kopieren';
-$lang->cmd_move = 'Verschieben';
-$lang->cmd_move_up = 'Nach oben';
-$lang->cmd_move_down = 'Down';
-$lang->cmd_add_indent = 'Einrücken';
-$lang->cmd_remove_indent = 'Ausrücken';
-$lang->cmd_management = 'Verwaltung';
-$lang->cmd_make = 'Erstellen';
-$lang->cmd_select = 'Select';
-$lang->cmd_select_all = 'Alle auswählen';
-$lang->cmd_unselect_all = 'Alle abwählen';
-$lang->cmd_reverse_all = 'Reverse';
-$lang->cmd_close_all = 'Schließen Sie alle';
-$lang->cmd_open_all = 'Open All';
-$lang->cmd_reload = 'Reload';
-$lang->cmd_close = 'Schließen';
-$lang->cmd_open = 'Open';
-$lang->cmd_setup = 'Konfiguration';
-$lang->cmd_addition_setup = 'Zusätzliche Setup ';
-$lang->cmd_option = 'Option';
-$lang->cmd_apply = 'Übernehmen';
-$lang->cmd_open_calendar = 'Wählen Sie ein Datum';
-$lang->cmd_send = 'Senden';
-$lang->cmd_print = 'Drucken';
-$lang->cmd_scrap = 'Schrott';
-$lang->cmd_preview = 'Vorschau';
-$lang->cmd_reset = 'Reset';
-$lang->cmd_remake_cache = 'Re-Cache-Datei erstellen';
-$lang->cmd_publish = 'Veröffentlichen';
-$lang->cmd_layout_setup = 'Konfiguration Layout';
-$lang->cmd_layout_edit = 'Layout bearbeiten';
-$lang->cmd_search_by_ipaddress = 'Search by IP Address';
-$lang->cmd_add_ip_to_spamfilter = 'Add IP to spamfilter';
-
-$lang->enable = 'Aktivieren';
-$lang->deaktivieren = 'Deaktivieren';
-
-// Essential Words
-$lang->menu = 'Menu';
-$lang->no = 'Nein';
-$lang->notice = 'Hinweis';
-$lang->secret = 'Geheim';
-$lang->category = $lang->category_srl = 'Kategorie';
-$lang->none_category = '분류없음';
-$lang->none_image = '이미지 없음';
-$lang->document_srl = 'Doc. No ';
-$lang->user_id = 'User-ID';
-$lang->author = 'Entwickler';
-$lang->password = 'Passwort';
-$lang->password1 = 'Passwort';
-$lang->password2 = 'Passwort bestätigen';
-$lang->admin_id = 'Admin ID';
-$lang->writer = 'Autor';
-$lang->user_name = 'Username';
-$lang->nick_name = 'Nick Name';
-$lang->email_address = 'E-Mail';
-$lang->homepage = 'Startseite';
-$lang->blog = 'Blog';
-$lang->birthday = 'Geburtstag';
-$lang->browser_title = 'Browser-Titel';
-$lang->title = 'Betreff';
-$lang->title_content = 'Betreff + Inhalt';
-$lang->topic = 'Thema';
-$lang->replies = 'Antwort';
-$lang->content = 'Inhalt';
-$lang->document = 'Artikel';
-$lang->comment = 'Kommentar';
-$lang->description = 'Beschreibung';
-$lang->trackback = 'Trackback';
-$lang->tag = 'Tag';
-$lang->allow_comment = 'Kommentare erlauben';
-$lang->lock_comment = 'Block Kommentare';
-$lang->allow_trackback = 'Allow Trackbacks';
-$lang->uploaded_file = 'Anlage';
-$lang->grant = 'Erlaubnis';
-$lang->target = 'target';
-$lang->total = 'Gesamt';
-$lang->total_count = 'count Gesamt';
-$lang->ipaddress = 'IP-Adresse';
-$lang->path = 'Pfad';
-$lang->cart = 'Ausgewählte Posten';
-$lang->friend = 'Freunde';
-$lang->notify = 'Meldung';
-$lang->order_target = 'Ausrichten Target';
-$lang->order_type = 'Sortieren Typ';
-$lang->order_asc = 'Aufstieg';
-$lang->order_desc = 'Abstieg';
-$lang->file = 'file';
-
-$lang->mid = 'Module Name';
-$lang->sid = 'Site Name';
-$lang->layout = 'Layout';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Widget';
-$lang->module = 'Modul';
-$lang->skin = 'Thema';
-$lang->mobile_skin = 'Mobile Theme';
-$lang->colorset = 'Colorset';
-$lang->extra_vars = 'Extra Vars';
-
-$lang->domain = "Domain Name";
-$lang->url = "URL";
-$lang->document_url = 'Artikel-URL';
-$lang->trackback_url = 'Trackback-URL';
-$lang->blog_name = 'Blog-Titel';
-$lang->excerpt = 'Zitat';
-
-$lang->document_count = 'Total Artikel';
-$lang->page_count = 'Page Count';
-$lang->list_count = 'US-Count ';
-$lang->search_list_count = 'Suchen US-Count';
-$lang->readed_count = 'Views';
-$lang->voted_count = 'Stimmen';
-$lang->comment_count = 'Kommentare';
-$lang->member_count = 'Mitglied Count';
-$lang->date = 'Datum';
-$lang->regdate = 'Anmeldungsdatum Datum';
-$lang->last_update = 'Letzte Aktualisierung';
-$lang->last_post = 'Letzter Beitrag';
-$lang->signup_date = 'Join Date';
-$lang->last_login = 'Letzter Login';
-$lang->first_page = 'Erste Seite';
-$lang->last_page = 'Letzte Seite';
-$lang->search_target = 'Target für die Google-Suche';
-$lang->search_keyword = 'Stichwort';
-$lang->is_default = 'Standard';
-
-$lang->no_documents = 'Keine Artikel';
-
-$lang->board_manager = 'Board';
-$lang->member_manager = 'Mitglied';
-$lang->layout_manager = 'Layout-Einstellungen';
-
-$lang->use = 'Use';
-$lang->notuse = 'nicht verwenden';
-$lang->not_exists = 'nicht vorhanden';
-
-$lang->public = 'öffentlich';
-$lang->private = 'private';
-
-$lang->unit_sec = 's';
-$lang->unit_min = 'mindestens';
-$lang->unit_hour = 'h';
-$lang->unit_day = 'th';
-$lang->unit_month = 'Monat';
-$lang->unit_year = 'Jahr';
-
-$lang->unit_week = array(
-	'Monday' => 'Montag',
-	'Tuesday' => 'Dienstag',
-	'Wednesday' => 'Mittwoch',
-	'Thursday' => 'Donnerstag',
-	'Friday' => 'Freitag',
-	'Saturday' => 'Samstag',
-	'Sunday' => 'Sonntag',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => 'Vor %d Minute',
-	'mins' => '%d Stunden',
-	'hour' => '%d Tag',
-	'hours' => '%d Tage',
-);
-
-// Beschreibungen
-$lang->about_tag = 'Sie können mehrere Tags, indem Sie ein Komma (,) zwischen den einzelnen Tag';
-$lang->about_layout = 'Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand ';
-
-// Messages
-$lang->msg_call_server = 'Anfordern an den Server, bitte warten';
-$lang->msg_db_not_setted = 'DB-Konfiguration wurde nicht festgelegt';
-$lang->msg_dbconnect_failed = "Error has occurred while connecting DB.\nPlease check DB information again"; // TODO:translation en -> ge
-$lang->msg_invalid_queryid = 'spezifiziert Abfrage ID-Wert ist ungültig';
-$lang->msg_not_permitted = 'Sie haben keine Berechtigung zum Zugriff auf';
-$lang->msg_input_password = 'Bitte geben Sie das Passwort';
-$lang->msg_invalid_document = 'Ungültige Article Number';
-$lang->msg_invalid_request = 'Invalid request ';
-$lang->msg_invalid_password = 'Ungültiges Passwort';
-$lang->msg_error_occured = 'Ein Fehler ist aufgetreten ';
-$lang->msg_not_founded = 'Target konnte nicht gefunden werden';
-$lang->msg_no_result = 'Nichts gefunden';
-$lang->msg_fail_to_request_open = 'Fail to open your request';
-$lang->msg_invalid_format = 'Invalid Format';
-
-$lang->msg_not_permitted_act = 'Sie haben keine Berechtigung zur Ausführung angeforderte Aktion';
-$lang->msg_module_does_not_exist = "요청하신 모듈을 찾을 수 없습니다.\n사이트 관리자에게 모듈 점검 요청 바랍니다";
-$lang->msg_module_is_not_standalone = 'Gewünschte Modul kann nicht ausgeführt werden unabhängig';
-$lang->msg_default_url_is_not_defined = '기본 URL이 정해지지 않아서 동작을 중지합니다';
-
-$lang->success_registed = 'Anmeldungsdatum';
-$lang->success_declared = 'Accused erfolgreich';
-$lang->success_updated = 'erfolgreich aktualisiert';
-$lang->success_deleted = 'erfolgreich gelöscht';
-$lang->success_voted = 'Empfohlen';
-$lang->success_blamed = 'Schuld success_blamed';
-$lang->success_moved = 'Umzug';
-$lang->success_sended = 'Gesendet';
-$lang->success_reset = 'Reset';
-$lang->success_leaved = 'Alle Mitglieder Daten wurden komplett gestrichen. ';
-$lang->success_saved = 'erfolgreich gespeichert ';
-
-$lang->fail_to_delete = 'konnte nicht gelöscht werden';
-$lang->fail_to_move = 'konnte nicht verschoben werden';
-
-$lang->failed_voted = 'konnte nicht empfehlen';
-$lang->failed_blamed = 'Es konnte keine Schuld';
-$lang->failed_declared = 'Konnte nicht vorwerfen';
-$lang->fail_to_delete_have_children = 'Bitte versuchen Sie es erneut nach dem Entfernen erste Antworten';
-
-$lang->confirm_submit = 'Sind Sie sicher, dass zur Vorlage? ';
-$lang->confirm_logout = 'Sind Sie sicher, dass nach Logout? ';
-$lang->confirm_vote = 'Sind Sie sicher, dass zu empfehlen? ';
-$lang->CONFIRM_DELETE = 'Sind Sie sicher, dass löschen? ';
-$lang->confirm_move = 'Sind Sie sicher, dass zu bewegen? ';
-$lang->confirm_reset = 'Sind Sie sicher, dass zurücksetzen? ';
-$lang->confirm_leave = 'Sind Sie sicher, dass zu verlassen? ';
-$lang->confirm_update = 'Are you sure to update?';
-
-$lang->column_type = 'Spaltenart';
-$lang->column_type_list['text'] = 'ein Online-Text';
-$lang->column_type_list['homepage'] = 'url';
-$lang->column_type_list['email_address'] =' E-Mail ';
-$lang->column_type_list['tel'] = 'Telefonnummer';
-$lang->column_type_list['textarea'] = 'Multi-line textarea';
-$lang->column_type_list['checkbox'] = 'Checkbox (multiple Auswahl)';
-$lang->column_type_list['select'] = 'select box (Einzel-Auswahl) ';
-$lang->column_type_list['radio'] = 'radio button (radio)';
-$lang->column_type_list['kr_zip'] = 'Postleitzahl (Koreanisch) ';
-$lang->column_type_list['date'] = 'Datum (jjjj / mm / dd)';
-// $lang->column_type_list [ 'jp_zip'] = 'Postleitzahl (Japanisch)';
-$lang->column_name = 'Spaltenname';
-$lang->column_title = 'Spaltentitel';
-$lang->default_value = 'Standardwert';
-$lang->is_active = 'Aktiv';
-$lang->is_required = 'Pflichtfeld';
-$lang->eid = '확장변수 이름';
-
-// ftp 관련
-$lang->ftp_form_title = 'FTP 정보 입력';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP password will not be stored';
-$lang->cmd_check_ftp_connect = 'FTP 접속 확인';
-$lang->about_ftp_info = "
-	FTP 정보는 다음의 경우에 이용될 수 있습니다.<br/>
-	1. PHP의 safe_mode=On일 경우에 FTP 정보를 이용해서 XE를 정상적으로 동작할 수 있게 합니다.<br/>
-	2. 자동 업데이트등에서 FTP 정보를 이용할 수 있습니다.<br/>
-	이 FTP정보는 files/config/ftp.config.php 파일내에 정보가 저장됩니다.<br/>
-	그리고 설치 후 관리자 페이지에서 FTP 정보를 변경하거나 제거할 수 있습니다.<br />
-";
-
-$lang->msg_safe_mode_ftp_needed = "PHP의 safe_mode가 On일 경우 FTP 정보를 꼭 입력해주셔야 XE의 설치 및 사용이 가능합니다";
-$lang->msg_ftp_not_connected = "localhost로의 FTP 접속 오류가 발생하였습니다. ftp 포트 번호를 확인해주시거나 ftp 서비스가 가능한지 확인해주세요";
-$lang->msg_ftp_invalid_auth_info = "입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요";
-$lang->msg_ftp_mkdir_fail = "FTP를 이용한 디렉토리 생성 명령을 실패하였습니다. FTP 서버의 설정을 확인해주세요";
-$lang->msg_ftp_chmod_fail = "FTP를 이용한 디렉토리의 속성 변경을 실패하였습니다. FTP 서버의 설정을 확인해주세요";
-$lang->msg_ftp_connect_success = "FTP 접속 및 인증 성공하였습니다";
-
-$lang->ftp_path_title = 'FTP 경로 정보 입력';
-$lang->msg_ftp_installed_realpath = '설치된 XE의 절대경로';
-$lang->msg_ftp_installed_ftp_realpath = '설치된 XE의 FTP 절대경로 설정';
-
-
-// Alert Nachrichten für JavaScript unter Verwendung von XML-Filter
-$lang->filter->isnull = 'Bitte geben Sie einen Wert für% s';
-$lang->filter->outofrange = 'Bitte richten Sie die Textlänge von% s';
-$lang->filter->equalto = "Der Wert von% s ist ungültig";
-$lang->filter->invalid_email = "Das Format von% s ist ungültig. ex) developers@xpressengine.com";
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "Das Format von% s ist ungültig. \ \ Nall Werte sollte aus Alphabet, Zahlen oder Unterstrich (_) und den ersten Buchstaben sollten Alphabet" ;
-$lang->filter->invalid_homepage = "Das Format von% s ist ungültig. ex) http://xpressengine.com/";
-$lang->filter->invalid_korean = "Das Format von% s ist ungültig. Koreanisch Bitte geben Sie nur";
-$lang->filter->invalid_korean_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Koreanisch oder Zahlen";
-$lang->filter->invalid_alpha = "Das Format von% s ist ungültig. Bitte geben Sie nur Alphabete";
-$lang->filter->invalid_alpha_number = "Das Format von% s ist ungültig. Bitte geben Sie Ihre Alphabete oder Zahlen";
-$lang->filter->invalid_number = "Das Format von% s ist ungültig. Bitte geben Sie nur Zahlen";
-
-$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/jp.lang.php b/common/lang/jp.lang.php
deleted file mode 100644
index 3c3c74b7d..000000000
--- a/common/lang/jp.lang.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php
-/**
- * @file   common/lang/jp.lang.php
- * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
- * @brief  日本語言語パッケージ（基本的な実行関連の用語がまとめられている）
- **/
-
-// 基本的な実行に用いる用語
-$lang->cmd_write = '書き込む';
-$lang->cmd_reply = '返信';
-$lang->cmd_delete = '削除';
-$lang->cmd_modify = '修正';
-$lang->cmd_edit = '編集';
-$lang->cmd_view = '表示';
-$lang->cmd_view_all = 'すべて表示';
-$lang->cmd_list = 'リスト';
-$lang->cmd_prev = '前へ';
-$lang->cmd_next = '次へ';
-$lang->cmd_send_trackback = 'トラックバック送信';
-$lang->cmd_registration = $lang->cmd_submit = '登録';
-$lang->cmd_comment_registration = 'コメント登録';
-$lang->cmd_insert = '挿入';
-$lang->cmd_save = '保存';
-$lang->cmd_load = '読み込む';
-$lang->cmd_input = '入力';
-$lang->cmd_search = '検索';
-$lang->cmd_find = '検索';
-$lang->cmd_replace = '置換';
-$lang->cmd_confirm = '確認';
-$lang->cmd_cancel = '取り消し';
-$lang->cmd_back = '戻る';
-$lang->cmd_vote = '推薦';
-$lang->cmd_vote_down = '非推薦';
-$lang->cmd_declare = '通報';
-$lang->cmd_cancel_declare = '通報取り消し';
-$lang->cmd_declared_list = '通報リスト';
-$lang->cmd_copy = 'コピー';
-$lang->cmd_move = '移動';
-$lang->cmd_move_up = '上へ';
-$lang->cmd_move_down = '下へ';
-$lang->cmd_add_indent = 'インデント';
-$lang->cmd_remove_indent = '逆インデント';
-$lang->cmd_management = '管理';
-$lang->cmd_make = '作成';
-$lang->cmd_select = '選択';
-$lang->cmd_select_all = 'すべて選択';
-$lang->cmd_unselect_all = 'すべて解除';
-$lang->cmd_reverse_all = '選択の反転';
-$lang->cmd_close_all = 'すべて閉じる';
-$lang->cmd_open_all = 'すべて開く';
-$lang->cmd_reload = 'リロード';
-$lang->cmd_close = '閉じる';
-$lang->cmd_open = '開く';
-$lang->cmd_setup = '設定';
-$lang->cmd_addition_setup = '追加設定';
-$lang->cmd_option = 'オプション';
-$lang->cmd_apply = '適用';
-$lang->cmd_open_calendar = 'カレンダーを開く';
-$lang->cmd_send = '送信';
-$lang->cmd_print = '印刷';
-$lang->cmd_scrap = 'スクラップ';
-$lang->cmd_preview = 'プレビュー';
-$lang->cmd_reset = '初期化';
-$lang->cmd_remake_cache = 'キャッシュファイル再生成';
-$lang->cmd_publish = '発行';
-$lang->cmd_layout_setup = 'レイアウト設定';
-$lang->cmd_layout_edit = 'レイアウト編集';
-$lang->cmd_search_by_ipaddress = 'IPアドレスで検索';
-$lang->cmd_add_ip_to_spamfilter = 'スパムフィルターにIPを追加';
-
-$lang->enable = '可能';
-$lang->disable = '不可';
-
-// 基本用語
-$lang->menu = 'メニュー';
-$lang->no = '番号';
-$lang->notice = 'お知らせ';
-$lang->secret = '非公開';
-$lang->category = $lang->category_srl = 'カテゴリ';
-$lang->none_category = 'カテゴリ無し';
-$lang->none_image = 'イメージなし';
-$lang->document_srl = '書き込み番号';
-$lang->user_id = 'ユーザーＩＤ';
-$lang->author = '作成者';
-$lang->password = 'パスワード';
-$lang->password1 = 'パスワード';
-$lang->password2 = 'パスワード確認';
-$lang->admin_id = '管理者ＩＤ';
-$lang->writer = '投稿者';
-$lang->user_name = '名前';
-$lang->nick_name = 'ニックネーム';
-$lang->email_address = 'メールアドレス';
-$lang->homepage = 'ホームページ';
-$lang->blog = 'ブログ';
-$lang->birthday = 'お誕生日';
-$lang->browser_title = 'ブラウザータイトル';
-$lang->title = 'タイトル';
-$lang->title_content = 'タイトル＋内容';
-$lang->topic = 'トピック';
-$lang->replies = '返事';
-$lang->content = '内容';
-$lang->document = '書き込み';
-$lang->comment = 'コメント';
-$lang->description = '説明';
-$lang->trackback = 'トラックバック';
-$lang->tag = 'タグ';
-$lang->allow_comment = 'コメント許可';
-$lang->lock_comment = 'コメントロック';
-$lang->allow_trackback = 'トラックバック許可';
-$lang->uploaded_file = '添付';
-$lang->grant = '権限';
-$lang->target = '対象';
-$lang->total = 'すべて';
-$lang->total_count = 'トータル数';
-$lang->ipaddress = 'IPアドレス';
-$lang->path = 'パス';
-$lang->cart = '選択項目';
-$lang->friend = '友達';
-$lang->notify = 'アラート';
-$lang->order_target = 'ソート対象';
-$lang->order_type = 'ソート方法';
-$lang->order_asc = '昇る';
-$lang->order_desc = '降下';
-$lang->file = 'ファイル';
-
-$lang->mid = 'モジュール名';
-$lang->sid = 'バーチャル（Virtual）サイト名';
-$lang->layout = 'レイアウト';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'ウィジェット';
-$lang->module = 'モジュール';
-$lang->skin = 'スキン';
-$lang->mobile_skin = 'Mobile Theme';
-$lang->colorset = 'カラーセット';
-$lang->extra_vars = '拡張変数';
-
-$lang->domain = 'ドメイン';
-$lang->url = 'URL';
-$lang->document_url = '書き込みＵＲＬ';
-$lang->trackback_url = 'トラックバックＵＲＬ';
-$lang->blog_name = 'ブログ名';
-$lang->excerpt = '抜粋';
-
-$lang->document_count = '書き込み数';
-$lang->page_count = 'ページ数';
-$lang->list_count = 'リスト数';
-$lang->search_list_count = '検索リスト数';
-$lang->readed_count = '閲覧数';
-$lang->voted_count = '推薦数';
-$lang->comment_count = 'コメント数';
-$lang->member_count = '会員数';
-$lang->date = '日付';
-$lang->regdate = '登録日';
-$lang->last_update = '最近修正日';
-$lang->last_post = '最近登録';
-$lang->signup_date = '登録日';
-$lang->last_login = '最近ログイン';
-$lang->first_page = '最初のページ';
-$lang->last_page = '最後のページ';
-$lang->search_target = '検索対象';
-$lang->search_keyword = 'キーワード';
-$lang->is_default = 'デフォルト';
-
-$lang->no_documents = '登録された書き込みがありません。';
-
-$lang->board_manager = '掲示板管理';
-$lang->member_manager = '会員管理';
-$lang->layout_manager = 'レイアウト管理';
-
-$lang->use = '使用';
-$lang->notuse = '未使用';
-$lang->not_exists = 'なし';
-
-$lang->public = '公開';
-$lang->private = '非公開';
-
-$lang->unit_sec = '秒';
-$lang->unit_min = '分';
-$lang->unit_hour = '時';
-$lang->unit_day = '日';
-$lang->unit_month = '月';
-$lang->unit_year = '年';
-
-$lang->unit_week = array(
-	'Monday' => '月',
-	'Tuesday' => '火',
-	'Wednesday' => '水',
-	'Thursday' => '木',
-	'Friday' => '金',
-	'Saturday' => '土',
-	'Sunday' => '日',
-);
-
-$lang->unit_meridiem = array(
-	'am' => '午前',
-	'pm' => '午後',
-	'AM' => '午前',
-	'PM' => '午後',
-);
-
-$lang->time_gap = array(
-	'min' => '%d 分前',
-	'mins' => '%d 分前',
-	'hour' => '%d 時間前',
-	'hours' => '%d 時間前',
-);
-
-// 説明関連
-$lang->about_tag = 'タグを入力する時、「,」（半角コンマ）を使うと複数登録出来ます。';
-$lang->about_layout = 'レイアウトでモジュールの枠をデザインします。上段のレイアウトメニューで管理出来ます。';
-
-// メッセージ関連
-$lang->msg_call_server = 'サーバへ問合わせ中です。しばらくお待ち下さい。';
-$lang->msg_db_not_setted = 'DBが設定されていません。';
-$lang->msg_dbconnect_failed = "データベースアクセスにエラーが発生しました。\nデータベースの情報をもう一度確認して下さい。";
-$lang->msg_invalid_queryid = 'クエリIDの値が無効です。';
-$lang->msg_not_permitted = '権限がありません。';
-$lang->msg_input_password = 'パスワードを入力して下さい。';
-$lang->msg_invalid_document = '無効な書き込み番号です。';
-$lang->msg_invalid_request = '無効なリクエストです。';
-$lang->msg_invalid_password = 'パスワードが正しくありません。';
-$lang->msg_error_occured = 'エラーが発生しました。';
-$lang->msg_not_founded = '見つかりません。';
-$lang->msg_no_result = '検索結果がありません。';
-$lang->msg_fail_to_request_open = 'リクエストのアクセスに失敗しました。';
-$lang->msg_invalid_format = '正しくないフォーマットです。';
-
-$lang->msg_not_permitted_act = '現在の操作は実行する権限がありません。';
-$lang->msg_module_does_not_exist = "動作に必要なモジュールが見つかりません。\nサイト管理者へモジュールの点検をお問い合わせ下さい。";
-$lang->msg_module_is_not_standalone = 'このモジュールはスタンドアローンでは作動しません。';
-$lang->msg_default_url_is_not_defined = 'デフォルトURLが定められてないため、動作を中止します。';
-
-$lang->success_registed = '登録しました。';
-$lang->success_declared = '通報しました。';
-$lang->success_updated = '修正しました。';
-$lang->success_deleted = '削除しました。';
-$lang->success_restore = '復元しました。';
-$lang->success_voted = '推薦しました。';
-$lang->success_blamed = '非推薦しました。';
-$lang->success_moved = '移動しました。';
-$lang->success_sended = '送信しました。';
-$lang->success_reset = '初期化しました。';
-$lang->success_leaved = '退会しました。';
-$lang->success_saved = '保存しました。';
-
-$lang->fail_to_delete = '削除に失敗しました。';
-$lang->fail_to_move = '移動に失敗しました。';
-
-$lang->failed_voted = '推薦出来ません。';
-$lang->failed_blamed = '非推薦出来ません。';
-$lang->failed_declared = '通報出来ません。';
-$lang->fail_to_delete_have_children = '返信の書き込みがあり、削除出来ません。';
-
-$lang->confirm_submit = '登録しますか？';
-$lang->confirm_logout = 'ログアウトしますか？';
-$lang->confirm_vote = '推薦しますか？';
-$lang->confirm_delete = '削除しますか？';
-$lang->confirm_restore = '復元しますか？';
-$lang->confirm_move = '移動しますか？';
-$lang->confirm_reset = '初期化しますか？';
-$lang->confirm_leave = '退会しますか？';
-$lang->confirm_update = '更新しますか？';
-
-$lang->column_type = 'タイプ';
-$lang->column_type_list['text'] = '入力フィールド(text)';
-$lang->column_type_list['homepage'] = 'URLタイプ(url)';
-$lang->column_type_list['email_address'] = 'メールアドレスタイプ(email)';
-$lang->column_type_list['tel'] = '電話番号タイプ(phone)';
-$lang->column_type_list['textarea'] = 'テキストエリア(textarea)';
-$lang->column_type_list['checkbox'] = 'チェックボックス(checkbox)';
-$lang->column_type_list['select'] = '選択(select)';
-$lang->column_type_list['radio'] = 'ラジオボタン (radio)';
-$lang->column_type_list['kr_zip'] = '韓国住所(zip)';
-$lang->column_type_list['date'] = '日付(年月日)';
-//$lang->column_type_list['jp_zip'] = '日本住所(zip)';
-$lang->column_name = 'コラム名';
-$lang->column_title = 'コラムタイトル';
-$lang->default_value = 'デフォルト値';
-$lang->is_active = '活性化';
-$lang->is_required = '必須項目';
-$lang->eid = '拡張変数名';
-
-// ftp関連
-$lang->ftp_form_title = 'サーバーのFTP情報の入力';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTPポート番号（port）';
-$lang->about_ftp_password = 'FTP情報は保存されません。';
-$lang->cmd_check_ftp_connect = 'FTP接続をテストする';
-$lang->about_ftp_info = "
-	FTP情報は次の場合、利用されます。<br />
-	1. サーバー側のPHPの設定中、「safe_mode=On」になった際、FTP情報を用いてXEが正常に働くようにします。<br />
-	2. FTP経由でXEの自動アップデート等に使われます。<br />
-	FTP情報は「files/config/ftp.config.php」の中に保存されます。<br />
-	また、XEのインストールの後、管理者画面からFTP情報の変更・削除が可能です。（省略可能） <br />
-";
-
-$lang->msg_safe_mode_ftp_needed = 'PHPのsafe_modeがOnの場合、FTP情報を登録することで、XEのインストール及び利用が可能になります。';
-$lang->msg_ftp_not_connected = 'localhostへのFTP接続エラーが発生しました。FTPポート(port)番号をはじめ、FTPサービスが可能であるかをご確認下さい。';
-$lang->msg_ftp_invalid_auth_info = 'ログインが失敗しました。 FTPアクセス情報を再度ご確認下さい。';
-$lang->msg_ftp_mkdir_fail = 'FTPを用いたディレクトリ生成に失敗しました。FTPサーバーの設定を再度ご確認下さい。';
-$lang->msg_ftp_chmod_fail = 'FTPを用いたディレクトリパーミッション(permission)変更に失敗しました。FTPサーバーの設定を再度ご確認下さい。';
-$lang->msg_ftp_connect_success = 'FTP接続に成功しました。';
-
-$lang->ftp_path_title = 'FTPパス情報入力';
-$lang->msg_ftp_installed_realpath = 'インストールされたXEの絶対パス';
-$lang->msg_ftp_installed_ftp_realpath = 'インストールされたXEのFTP絶対パス設定';
-
-
-// xml filterで用いられているjavascript用のアラートメッセージ
-$lang->filter->isnull = '%sを入力して下さい。';
-$lang->filter->outofrange = '%sの文字の長さを合わせて下さい。';
-$lang->filter->equalto = '%sが正しくありません。';
-$lang->filter->invalid_email = '%sのパターンが正しくありません。 (例: zbxe@xepressengine.com)';
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%sの形式が正しくありません。\\n半角の英数と記号「_」を組み合わせて入力して下さい。頭字は半角英文字でなければなりません。";
-$lang->filter->invalid_homepage = '%sの形式が正しくありません。 (例: http://www.xepressengine.com)';
-$lang->filter->invalid_korean = '%sの形式が正しくありません。ハングルのみ入力して下さい。';
-$lang->filter->invalid_korean_number = '%sの形式が正しくありません。ハングルと半角数字で入力して下さい。';
-$lang->filter->invalid_alpha = '%sの形式が正しくありません。半角英文字のみ入力して下さい。';
-$lang->filter->invalid_alpha_number = '%sの形式が正しくありません。半角英数で入力して下さい。';
-$lang->filter->invalid_number = '%sの形式が正しくありません。半角数字で入力して下さい。';
-
-$lang->security_warning_embed = "保安のため、管理者IDではEMBEDを見ることが出来ません。<br />他のIDでログインして下さい。";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
deleted file mode 100644
index 60ea2f154..000000000
--- a/common/lang/ko.lang.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * @file   common/lang/ko.lang.php
- * @author NHN (developers@xpressengine.com)
- * @brief  한국어 언어팩 (기본적인 내용만 수록)
- **/
-
-// 기본적으로 사용되는 action 언어
-$lang->cmd_write = '쓰기';
-$lang->cmd_reply = '댓글';
-$lang->cmd_delete = '삭제';
-$lang->cmd_modify = '수정';
-$lang->cmd_edit = '편집';
-$lang->cmd_view = '보기';
-$lang->cmd_view_all = '전체 보기';
-$lang->cmd_list = '목록';
-$lang->cmd_prev = '이전';
-$lang->cmd_next = '다음';
-$lang->cmd_send_trackback = '엮인글 발송';
-$lang->cmd_registration = $lang->cmd_submit = '등록';
-$lang->cmd_comment_registration = '댓글 등록';
-$lang->cmd_insert = '추가';
-$lang->cmd_save = '저장';
-$lang->cmd_load = '불러오기';
-$lang->cmd_input = '입력';
-$lang->cmd_search = '검색';
-$lang->cmd_find = '찾기';
-$lang->cmd_replace = '바꾸기';
-$lang->cmd_confirm = '확인';
-$lang->cmd_cancel = '취소';
-$lang->cmd_back = '돌아가기';
-$lang->cmd_vote = '추천';
-$lang->cmd_vote_down = '비추천';
-$lang->cmd_declare = '신고';
-$lang->cmd_cancel_declare = '신고 취소';
-$lang->cmd_declared_list = '신고 목록';
-$lang->cmd_copy = '복사';
-$lang->cmd_move = '이동';
-$lang->cmd_move_up = '위로';
-$lang->cmd_move_down = '아래로';
-$lang->cmd_add_indent = '들이기';
-$lang->cmd_remove_indent = '빼내기';
-$lang->cmd_management = '관리';
-$lang->cmd_make = '생성';
-$lang->cmd_select = '선택';
-$lang->cmd_select_all = '모두 선택';
-$lang->cmd_unselect_all = '모두 해제';
-$lang->cmd_reverse_all = '선택 반전';
-$lang->cmd_close_all = '모두 닫기';
-$lang->cmd_open_all = '모두 열기';
-$lang->cmd_reload = '다시 읽기';
-$lang->cmd_close = '닫기';
-$lang->cmd_open = '열기';
-$lang->cmd_setup = '설정';
-$lang->cmd_addition_setup = '추가 설정';
-$lang->cmd_option = '옵션';
-$lang->cmd_apply = '적용';
-$lang->cmd_open_calendar = '날짜 선택';
-$lang->cmd_send = '발송';
-$lang->cmd_print = '인쇄';
-$lang->cmd_scrap = '스크랩';
-$lang->cmd_preview = '미리 보기';
-$lang->cmd_reset = '초기화';
-$lang->cmd_remake_cache = '캐시파일 재생성';
-$lang->cmd_publish = '발행';
-$lang->cmd_layout_setup = '레이아웃 설정';
-$lang->cmd_layout_edit = '레이아웃 편집';
-$lang->cmd_search_by_ipaddress = 'IP주소로 검색';
-$lang->cmd_add_ip_to_spamfilter = '스팸필터에 IP추가';
-
-$lang->enable = '가능';
-$lang->disable = '불가능';
-
-// 기본 단어
-$lang->menu = '메뉴';
-$lang->no = '번호';
-$lang->notice = '공지';
-$lang->secret = '비밀';
-$lang->category = $lang->category_srl = '분류';
-$lang->none_category = '분류 없음';
-$lang->none_image = '이미지 없음';
-$lang->document_srl = '문서번호';
-$lang->user_id = '아이디';
-$lang->author = '작성자';
-$lang->password = '비밀번호';
-$lang->password1 = '비밀번호';
-$lang->password2 = '비밀번호 확인';
-$lang->admin_id = '관리자ID';
-$lang->writer = '글쓴이';
-$lang->user_name = '이름';
-$lang->nick_name = '닉네임';
-$lang->email_address = '이메일 주소';
-$lang->homepage = '홈페이지';
-$lang->blog = '블로그';
-$lang->birthday = '생일';
-$lang->browser_title = '브라우저 제목';
-$lang->title = '제목';
-$lang->title_content = '제목+내용';
-$lang->topic = '주제';
-$lang->replies = '댓글';
-$lang->content = '내용';
-$lang->document = '문서';
-$lang->comment = '댓글';
-$lang->description = '설명';
-$lang->trackback = '엮인글';
-$lang->tag = '태그';
-$lang->allow_comment = '댓글 허용';
-$lang->lock_comment = '댓글 잠금';
-$lang->allow_trackback = '엮인글 허용';
-$lang->uploaded_file = '첨부';
-$lang->grant = '권한';
-$lang->target = '대상';
-$lang->total = '전체';
-$lang->total_count = '전체개수';
-$lang->ipaddress = 'IP 주소';
-$lang->path = '경로';
-$lang->cart = '선택항목';
-$lang->friend = '친구';
-$lang->notify = '알림';
-$lang->order_target = '정렬대상';
-$lang->order_type = '정렬방법';
-$lang->order_asc = '오름차순';
-$lang->order_desc = '내림차순';
-$lang->file = '파일';
-
-$lang->mid = '모듈 이름';
-$lang->sid = '가상 사이트 이름';
-$lang->layout = '레이아웃';
-$lang->mobile_layout = '모바일 레이아웃';
-$lang->widget = '위젯 ';
-$lang->module = '모듈';
-$lang->skin = '스킨';
-$lang->mobile_skin = '모바일 스킨';
-$lang->colorset = '컬러셋';
-$lang->extra_vars = '확장변수';
-
-$lang->domain = '도메인';
-$lang->url = 'URL';
-$lang->document_url = '게시글 주소';
-$lang->trackback_url = '엮인글 주소';
-$lang->blog_name = '블로그 이름';
-$lang->excerpt = '발췌';
-
-$lang->document_count = '글 수';
-$lang->page_count = '페이지 수';
-$lang->list_count = '목록 수';
-$lang->search_list_count = '검색 목록 수';
-$lang->readed_count = '조회 수';
-$lang->voted_count = '추천 수';
-$lang->comment_count = '댓글 수';
-$lang->member_count = '회원 수';
-$lang->date = '날짜';
-$lang->regdate = '등록일';
-$lang->last_update = '최근 수정일';
-$lang->last_post = '마지막 댓글';
-$lang->signup_date = '가입일';
-$lang->last_login = '최근 로그인';
-$lang->first_page = '첫 페이지';
-$lang->last_page = '끝 페이지';
-$lang->search_target = '검색대상';
-$lang->search_keyword = '검색어';
-$lang->is_default = '기본';
-
-$lang->no_documents = '등록된 글이 없습니다.';
-
-$lang->board_manager = '게시판 관리';
-$lang->member_manager = '회원 관리';
-$lang->layout_manager = '레이아웃 관리';
-
-$lang->use = '사용';
-$lang->notuse = '미사용';
-$lang->not_exists = '없음';
-
-$lang->public = '공개';
-$lang->private = '비공개';
-
-$lang->unit_sec = '초';
-$lang->unit_min = '분';
-$lang->unit_hour = '시';
-$lang->unit_day = '일';
-$lang->unit_month = '월';
-$lang->unit_year = '년';
-
-$lang->unit_week = array(
-	'Monday' => '월',
-	'Tuesday' => '화',
-	'Wednesday' => '수',
-	'Thursday' => '목',
-	'Friday' => '금',
-	'Saturday' => '토',
-	'Sunday' => '일',
-);
-
-$lang->unit_meridiem = array(
-	'am' => '오전',
-	'pm' => '오후',
-	'AM' => '오전',
-	'PM' => '오후',
-);
-
-$lang->time_gap = array(
-	'min' => '%d 분 전',
-	'mins' => '%d 분 전',
-	'hour' => '%d 시간 전',
-	'hours' => '%d 시간 전',
-);
-
-// 설명 관련
-$lang->about_tag = '태그 입력 시 , (쉼표)를 이용하시면 복수 등록이 가능합니다.';
-$lang->about_layout = '레이아웃은 모듈의 껍데기를 꾸며줍니다. 상단 레이아웃 메뉴에서 관리하실 수 있습니다.';
-
-// 메시지 관련
-$lang->msg_call_server = '서버에 요청중입니다. 잠시만 기다려주세요.';
-$lang->msg_db_not_setted = 'DB설정이 되어 있지 않습니다.';
-$lang->msg_dbconnect_failed = "DB접속 오류가 발생하였습니다.\nDB정보를 다시 확인해주세요.";
-$lang->msg_invalid_queryid = 'Query ID값이 잘못 지정되었습니다.';
-$lang->msg_not_permitted = '권한이 없습니다.';
-$lang->msg_input_password = '비밀번호를 입력하세요.';
-$lang->msg_invalid_document = '잘못된 문서번호입니다.';
-$lang->msg_invalid_request = '잘못된 요청입니다.';
-$lang->msg_invalid_password = '비밀번호가 올바르지 않습니다.';
-$lang->msg_error_occured = '오류가 발생하였습니다.';
-$lang->msg_not_founded = '대상을 찾을 수 없습니다.';
-$lang->msg_no_result = '검색 결과가 없습니다.';
-$lang->msg_fail_to_request_open = '요청하신 연결에 실패하였습니다.';
-$lang->msg_invalid_format = '잘못된 형식입니다.';
-
-$lang->msg_not_permitted_act = '요청하신 기능을 실행할 수 있는 권한이 없습니다.';
-$lang->msg_module_does_not_exist = "요청하신 모듈을 찾을 수 없습니다.\n사이트 관리자에게 모듈 점검 요청 바랍니다";
-$lang->msg_module_is_not_standalone = '요청하신 모듈은 독립적으로 동작할 수 없습니다.';
-$lang->msg_default_url_is_not_defined = '기본 URL이 정해지지 않아서 동작을 중지합니다';
-
-$lang->success_registed = '등록 되었습니다.';
-$lang->success_declared = '신고 되었습니다.';
-$lang->success_updated = '수정 되었습니다.';
-$lang->success_deleted = '삭제되었습니다.';
-$lang->success_restore = '복원 되었습니다.';
-$lang->success_voted = '추천 되었습니다.';
-$lang->success_blamed = '비추천 되었습니다.';
-$lang->success_moved = '이동 되었습니다.';
-$lang->success_sended = '발송 되었습니다.';
-$lang->success_reset = '초기화 되었습니다.';
-$lang->success_leaved = '탈퇴 되었습니다.';
-$lang->success_saved = '저장 되었습니다.';
-
-$lang->fail_to_delete = '삭제 실패하였습니다.';
-$lang->fail_to_move = '이동 실패하였습니다.';
-
-$lang->failed_voted = '추천 하실 수 없습니다.';
-$lang->failed_blamed = '비추천 하실 수 없습니다.';
-$lang->failed_declared = '신고 하실 수 없습니다.';
-$lang->fail_to_delete_have_children = '댓글이 있어서 삭제할 수 없습니다.';
-
-$lang->confirm_submit = '등록하시겠습니까?';
-$lang->confirm_logout = '로그아웃하시겠습니까?';
-$lang->confirm_vote = '추천하시겠습니까?';
-$lang->confirm_delete = '삭제하시겠습니까?';
-$lang->confirm_restore = '복원하시겠습니까?';
-$lang->confirm_move = '이동하시겠습니까?';
-$lang->confirm_reset = '초기화 하시겠습니까??';
-$lang->confirm_leave = '탈퇴 하시겠습니까??';
-$lang->confirm_update = '수정하시겠습니까?';
-
-$lang->column_type = '형식';
-$lang->column_type_list['text'] = '한줄 입력칸 (text)';
-$lang->column_type_list['homepage'] = 'URL 형식';
-$lang->column_type_list['email_address'] = '이메일 형식 (email)';
-$lang->column_type_list['tel'] = '전화번호 형식 (phone)';
-$lang->column_type_list['textarea'] = '여러 줄 입력칸 (textarea)';
-$lang->column_type_list['checkbox'] = '다중 선택 (checkbox)';
-$lang->column_type_list['select'] = '단일 선택 (select)';
-$lang->column_type_list['radio'] = '라디오 버튼 (radio)';
-$lang->column_type_list['kr_zip'] = '한국주소 (zip)';
-$lang->column_type_list['date'] = '일자 (연월일)';
-//$lang->column_type_list['jp_zip'] = '일본주소 (zip)';
-$lang->column_name = '입력항목 이름';
-$lang->column_title = '입력항목 제목';
-$lang->default_value = '기본 값';
-$lang->is_active = '활성';
-$lang->is_required = '필수항목';
-$lang->eid = '확장변수 이름';
-
-// ftp 관련
-$lang->ftp_form_title = 'FTP 계정 정보 입력';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP 서버 주소';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP Password는 저장되지 않습니다.';
-$lang->cmd_check_ftp_connect = 'FTP 접속 확인';
-$lang->about_ftp_info = "
-	FTP 정보는 다음 경우에 이용될 수 있습니다.<br />
-	1. PHP의 safe_mode=On일 경우, FTP 정보를 이용해서 XE가 정상적으로 동작할 수 있게 합니다.<br />
-	2. 자동 업데이트 등에서 FTP 정보를 이용할 수 있습니다.<br />
-	이 FTP정보는 files/config/ftp.config.php 파일 내에 정보가 저장됩니다.<br />
-	설치 후 관리자 페이지에서 FTP 정보를 변경하거나 제거할 수 있습니다.<br />
-";
-
-$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 On일 경우, FTP 정보를 입력하셔야 XE 설치 및 사용이 가능합니다.';
-$lang->msg_ftp_not_connected = 'localhost로의 FTP 접속 오류가 발생하였습니다. FTP 포트 번호를 확인해주시거나 FTP 서비스가 가능한지 확인해주세요.';
-$lang->msg_ftp_invalid_auth_info = '입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요.';
-$lang->msg_ftp_mkdir_fail = 'FTP를 이용한 디렉토리 생성 명령에 실패하였습니다. FTP 서버의 설정을 확인해주세요.';
-$lang->msg_ftp_chmod_fail = 'FTP를 이용한 디렉토리의 속성 변경에 실패하였습니다. FTP 서버의 설정을 확인해주세요.';
-$lang->msg_ftp_connect_success = 'FTP 접속 및 인증에 성공하였습니다.';
-
-$lang->ftp_path_title = 'FTP 경로 정보 입력';
-$lang->msg_ftp_installed_realpath = '설치된 XE의 절대경로';
-$lang->msg_ftp_installed_ftp_realpath = '설치된 XE의 FTP 경로 설정';
-
-// xml filter에서 사용되는 javascript용 alert msg
-$lang->filter->isnull = '%s을 입력해주세요.';
-$lang->filter->outofrange = '%s의 글자 수를 맞추어 주세요.';
-$lang->filter->equalto = '%s이 잘못되었습니다.';
-$lang->filter->invalid_email = '%s의 형식이 잘못되었습니다. (예: xe@xpressengine.com)';
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s의 형식이 잘못되었습니다.\\n영문, 숫자와 _로 만드실 수 있으며, 첫 글자는 영문이어야 합니다.";
-$lang->filter->invalid_homepage = '%s의 형식이 잘못되었습니다. (예: http://www.xpressengine.com)';
-$lang->filter->invalid_korean = '%s의 형식이 잘못되었습니다. 한글로만 입력하셔야 합니다.';
-$lang->filter->invalid_korean_number = '%s의 형식이 잘못되었습니다. 한글과 숫자로만 입력하셔야 합니다.';
-$lang->filter->invalid_alpha = '%s의 형식이 잘못되었습니다. 영문으로만 입력하셔야 합니다.';
-$lang->filter->invalid_alpha_number = '%s의 형식이 잘못되었습니다. 영문과 숫자로만 입력하셔야 합니다.';
-$lang->filter->invalid_number = '%s의 형식이 잘못되었습니다. 숫자로만 입력하셔야 합니다.';
-
-$lang->security_warning_embed = "보안 문제로 관리자 아이디로는 embed를 볼 수 없습니다. 확인하시려면 다른 아이디로 접속하세요";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/lang.info b/common/lang/lang.info
index 5d9e1b385..b2fba7d77 100644
--- a/common/lang/lang.info
+++ b/common/lang/lang.info
@@ -1,11 +1,12 @@
 en,English
 ko,한국어
-zh-CN,中文(中国)
 jp,日本語
-es,Español
-ru,Русский
-fr,Français
+zh-CN,中文(中国)
 zh-TW,中文(臺灣)
+fr,Français
+de,Deutsch
+ru,Русский
+es,Español
+tr,Turkey
 vi,Tiếng Việt
 mn,Mongolian
-tr,Turkey
diff --git a/common/lang/lang.xml b/common/lang/lang.xml
new file mode 100644
index 000000000..0ee845cbf
--- /dev/null
+++ b/common/lang/lang.xml
@@ -0,0 +1,3697 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_write">
+		<value xml:lang="ko"><![CDATA[쓰기]]></value>
+		<value xml:lang="en"><![CDATA[Write]]></value>
+		<value xml:lang="jp"><![CDATA[書き込む]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发表新帖]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發表]]></value>
+		<value xml:lang="fr"><![CDATA[Ecrire]]></value>
+		<value xml:lang="de"><![CDATA[Schreiben]]></value>
+		<value xml:lang="ru"><![CDATA[Написать]]></value>
+		<value xml:lang="es"><![CDATA[Escribir]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi bài mới]]></value>
+		<value xml:lang="mn"><![CDATA[Бичих]]></value>
+	</item>
+	<item name="cmd_reply">
+		<value xml:lang="ko"><![CDATA[댓글]]></value>
+		<value xml:lang="en"><![CDATA[Comment]]></value>
+		<value xml:lang="jp"><![CDATA[返信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[回复]]></value>
+		<value xml:lang="zh-TW"><![CDATA[回覆]]></value>
+		<value xml:lang="fr"><![CDATA[Répondre]]></value>
+		<value xml:lang="de"><![CDATA[Kommentar]]></value>
+		<value xml:lang="ru"><![CDATA[Ответить]]></value>
+		<value xml:lang="es"><![CDATA[Responder]]></value>
+		<value xml:lang="tr"><![CDATA[Cevapla]]></value>
+		<value xml:lang="vi"><![CDATA[Trả lời]]></value>
+		<value xml:lang="mn"><![CDATA[Хариу]]></value>
+	</item>
+	<item name="cmd_delete">
+		<value xml:lang="ko"><![CDATA[삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete]]></value>
+		<value xml:lang="jp"><![CDATA[削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer]]></value>
+		<value xml:lang="de"><![CDATA[Löschen]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить]]></value>
+		<value xml:lang="es"><![CDATA[Eliminar]]></value>
+		<value xml:lang="tr"><![CDATA[Sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa]]></value>
+		<value xml:lang="mn"><![CDATA[Устгах]]></value>
+	</item>
+	<item name="cmd_modify">
+		<value xml:lang="ko"><![CDATA[수정]]></value>
+		<value xml:lang="en"><![CDATA[Update]]></value>
+		<value xml:lang="jp"><![CDATA[修正]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改]]></value>
+		<value xml:lang="fr"><![CDATA[Modifier]]></value>
+		<value xml:lang="de"><![CDATA[Ändern]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить]]></value>
+		<value xml:lang="es"><![CDATA[Modificar]]></value>
+		<value xml:lang="tr"><![CDATA[Değiştir]]></value>
+		<value xml:lang="vi"><![CDATA[Thay đổi]]></value>
+		<value xml:lang="mn"><![CDATA[Засах]]></value>
+	</item>
+	<item name="cmd_edit">
+		<value xml:lang="ko"><![CDATA[편집]]></value>
+		<value xml:lang="en"><![CDATA[Edit]]></value>
+		<value xml:lang="jp"><![CDATA[編集]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编辑]]></value>
+		<value xml:lang="zh-TW"><![CDATA[編輯]]></value>
+		<value xml:lang="fr"><![CDATA[Editer]]></value>
+		<value xml:lang="de"><![CDATA[Bearbeiten]]></value>
+		<value xml:lang="ru"><![CDATA[Редактировать]]></value>
+		<value xml:lang="es"><![CDATA[editar]]></value>
+		<value xml:lang="tr"><![CDATA[Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa]]></value>
+		<value xml:lang="mn"><![CDATA[Өөрчлөх]]></value>
+	</item>
+	<item name="cmd_view">
+		<value xml:lang="ko"><![CDATA[보기]]></value>
+		<value xml:lang="en"><![CDATA[View]]></value>
+		<value xml:lang="jp"><![CDATA[表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視]]></value>
+		<value xml:lang="fr"><![CDATA[Voir]]></value>
+		<value xml:lang="de"><![CDATA[Anzeigen]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть]]></value>
+		<value xml:lang="es"><![CDATA[Ver]]></value>
+		<value xml:lang="tr"><![CDATA[Görüntüle]]></value>
+		<value xml:lang="vi"><![CDATA[Xem]]></value>
+		<value xml:lang="mn"><![CDATA[Харах]]></value>
+	</item>
+	<item name="all">
+		<value xml:lang="ko"><![CDATA[전체]]></value>
+		<value xml:lang="en"><![CDATA[All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて]]></value>
+		<value xml:lang="zh-TW"><![CDATA[All全部]]></value>
+	</item>
+	<item name="cmd_view_all">
+		<value xml:lang="ko"><![CDATA[전체 보기]]></value>
+		<value xml:lang="en"><![CDATA[View All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部查看]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部檢視]]></value>
+		<value xml:lang="fr"><![CDATA[Voir tout]]></value>
+		<value xml:lang="de"><![CDATA[Alle anzeigen]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть все]]></value>
+		<value xml:lang="es"><![CDATA[Ver todo]]></value>
+		<value xml:lang="tr"><![CDATA[Tümünü Görüntüle]]></value>
+		<value xml:lang="vi"><![CDATA[Xem tất cả]]></value>
+		<value xml:lang="mn"><![CDATA[Бүгдийг харах]]></value>
+	</item>
+	<item name="cmd_list">
+		<value xml:lang="ko"><![CDATA[목록]]></value>
+		<value xml:lang="en"><![CDATA[List]]></value>
+		<value xml:lang="jp"><![CDATA[リスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste]]></value>
+		<value xml:lang="de"><![CDATA[US -]]></value>
+		<value xml:lang="ru"><![CDATA[Список]]></value>
+		<value xml:lang="es"><![CDATA[Lista]]></value>
+		<value xml:lang="tr"><![CDATA[Listele]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách]]></value>
+		<value xml:lang="mn"><![CDATA[Жагсаалт]]></value>
+	</item>
+	<item name="cmd_prev">
+		<value xml:lang="ko"><![CDATA[이전]]></value>
+		<value xml:lang="en"><![CDATA[Prev]]></value>
+		<value xml:lang="jp"><![CDATA[前へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上一页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[上一頁]]></value>
+		<value xml:lang="fr"><![CDATA[Précédent]]></value>
+		<value xml:lang="de"><![CDATA[Vorherig]]></value>
+		<value xml:lang="ru"><![CDATA[Предыдущее]]></value>
+		<value xml:lang="es"><![CDATA[Anterior]]></value>
+		<value xml:lang="tr"><![CDATA[Önceki]]></value>
+		<value xml:lang="vi"><![CDATA[Trước]]></value>
+		<value xml:lang="mn"><![CDATA[Өмнөх]]></value>
+	</item>
+	<item name="cmd_next">
+		<value xml:lang="ko"><![CDATA[다음]]></value>
+		<value xml:lang="en"><![CDATA[Next]]></value>
+		<value xml:lang="jp"><![CDATA[次へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下一页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下一頁]]></value>
+		<value xml:lang="fr"><![CDATA[Suivant]]></value>
+		<value xml:lang="de"><![CDATA[Nächst]]></value>
+		<value xml:lang="ru"><![CDATA[Следующее]]></value>
+		<value xml:lang="es"><![CDATA[Siguiente]]></value>
+		<value xml:lang="tr"><![CDATA[Sonraki]]></value>
+		<value xml:lang="vi"><![CDATA[Tiếp]]></value>
+		<value xml:lang="mn"><![CDATA[Дараах]]></value>
+	</item>
+	<item name="cmd_send_trackback">
+		<value xml:lang="ko"><![CDATA[엮인글 발송]]></value>
+		<value xml:lang="en"><![CDATA[Send Trackback]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバック送信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送引用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送引用]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyer Rétrolien]]></value>
+		<value xml:lang="de"><![CDATA[Trackback senden]]></value>
+		<value xml:lang="ru"><![CDATA[Отправить трекбек]]></value>
+		<value xml:lang="es"><![CDATA[Enviar Trackback]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izleme Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi liên kết Web]]></value>
+		<value xml:lang="mn"><![CDATA[Холбоотой бичлэг илгээх]]></value>
+	</item>
+	<item name="cmd_submit">
+		<value xml:lang="ko"><![CDATA[등록]]></value>
+		<value xml:lang="en"><![CDATA[Submit]]></value>
+		<value xml:lang="jp"><![CDATA[登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[提交]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定]]></value>
+		<value xml:lang="fr"><![CDATA[Enrégistrer]]></value>
+		<value xml:lang="de"><![CDATA[eintragen]]></value>
+		<value xml:lang="ru"><![CDATA[Принять]]></value>
+		<value xml:lang="es"><![CDATA[Admitir]]></value>
+		<value xml:lang="tr"><![CDATA[Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi]]></value>
+		<value xml:lang="mn"><![CDATA[Оруулах]]></value>
+	</item>
+	<item name="cmd_registration">
+		<value xml:lang="ko"><![CDATA[등록]]></value>
+		<value xml:lang="en"><![CDATA[Submit]]></value>
+		<value xml:lang="jp"><![CDATA[登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[提交]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定]]></value>
+		<value xml:lang="fr"><![CDATA[Enrégistrer]]></value>
+		<value xml:lang="de"><![CDATA[eintragen]]></value>
+		<value xml:lang="ru"><![CDATA[Принять]]></value>
+		<value xml:lang="es"><![CDATA[Admitir]]></value>
+		<value xml:lang="tr"><![CDATA[Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi]]></value>
+		<value xml:lang="mn"><![CDATA[Оруулах]]></value>
+	</item>
+	<item name="cmd_comment_registration">
+		<value xml:lang="ko"><![CDATA[댓글 등록]]></value>
+		<value xml:lang="en"><![CDATA[Add Comment]]></value>
+		<value xml:lang="jp"><![CDATA[コメント登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[提交评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[送出評論]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un Commentaire]]></value>
+		<value xml:lang="de"><![CDATA[Kommentar hinzufügen]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить запись]]></value>
+		<value xml:lang="es"><![CDATA[Agregar comentario]]></value>
+		<value xml:lang="tr"><![CDATA[Yorum Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi bình luận]]></value>
+		<value xml:lang="mn"><![CDATA[Коммент бичих]]></value>
+	</item>
+	<item name="cmd_insert">
+		<value xml:lang="ko"><![CDATA[추가]]></value>
+		<value xml:lang="en"><![CDATA[Insert]]></value>
+		<value xml:lang="jp"><![CDATA[挿入]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加]]></value>
+		<value xml:lang="zh-TW"><![CDATA[插入]]></value>
+		<value xml:lang="fr"><![CDATA[Insérer]]></value>
+		<value xml:lang="de"><![CDATA[einfügen]]></value>
+		<value xml:lang="ru"><![CDATA[Вставить]]></value>
+		<value xml:lang="es"><![CDATA[Insertar]]></value>
+		<value xml:lang="tr"><![CDATA[Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Chèn]]></value>
+		<value xml:lang="mn"><![CDATA[Нэмэх]]></value>
+	</item>
+	<item name="cmd_save">
+		<value xml:lang="ko"><![CDATA[저장]]></value>
+		<value xml:lang="en"><![CDATA[Save]]></value>
+		<value xml:lang="jp"><![CDATA[保存]]></value>
+		<value xml:lang="zh-CN"><![CDATA[保存]]></value>
+		<value xml:lang="zh-TW"><![CDATA[儲存]]></value>
+		<value xml:lang="fr"><![CDATA[Conserver]]></value>
+		<value xml:lang="de"><![CDATA[sichern]]></value>
+		<value xml:lang="ru"><![CDATA[Сохранить]]></value>
+		<value xml:lang="es"><![CDATA[Guardar]]></value>
+		<value xml:lang="tr"><![CDATA[Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Lưu]]></value>
+		<value xml:lang="mn"><![CDATA[Хадгалах]]></value>
+	</item>
+	<item name="cmd_load">
+		<value xml:lang="ko"><![CDATA[불러오기]]></value>
+		<value xml:lang="en"><![CDATA[Load]]></value>
+		<value xml:lang="jp"><![CDATA[読み込む]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导入]]></value>
+		<value xml:lang="zh-TW"><![CDATA[讀取]]></value>
+		<value xml:lang="fr"><![CDATA[Charger]]></value>
+		<value xml:lang="de"><![CDATA[laden]]></value>
+		<value xml:lang="ru"><![CDATA[Загрузить]]></value>
+		<value xml:lang="es"><![CDATA[Carga]]></value>
+		<value xml:lang="tr"><![CDATA[Yükle]]></value>
+		<value xml:lang="vi"><![CDATA[Tải]]></value>
+		<value xml:lang="mn"><![CDATA[Дуудах]]></value>
+	</item>
+	<item name="cmd_input">
+		<value xml:lang="ko"><![CDATA[입력]]></value>
+		<value xml:lang="en"><![CDATA[Input]]></value>
+		<value xml:lang="jp"><![CDATA[入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入]]></value>
+		<value xml:lang="fr"><![CDATA[Entrer]]></value>
+		<value xml:lang="de"><![CDATA[Eingabe]]></value>
+		<value xml:lang="ru"><![CDATA[Ввести]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar]]></value>
+		<value xml:lang="tr"><![CDATA[Veri gir]]></value>
+		<value xml:lang="vi"><![CDATA[Nhập vào]]></value>
+		<value xml:lang="mn"><![CDATA[Оруулах]]></value>
+	</item>
+	<item name="cmd_search">
+		<value xml:lang="ko"><![CDATA[검색]]></value>
+		<value xml:lang="en"><![CDATA[Search]]></value>
+		<value xml:lang="jp"><![CDATA[検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[搜索]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋]]></value>
+		<value xml:lang="fr"><![CDATA[Rechercher]]></value>
+		<value xml:lang="de"><![CDATA[Suche]]></value>
+		<value xml:lang="ru"><![CDATA[Искать]]></value>
+		<value xml:lang="es"><![CDATA[Buscar]]></value>
+		<value xml:lang="tr"><![CDATA[Ara]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm kiếm]]></value>
+		<value xml:lang="mn"><![CDATA[Хайх]]></value>
+	</item>
+	<item name="cmd_find">
+		<value xml:lang="ko"><![CDATA[찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find]]></value>
+		<value xml:lang="jp"><![CDATA[検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查找]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尋找]]></value>
+		<value xml:lang="fr"><![CDATA[Trouver]]></value>
+		<value xml:lang="de"><![CDATA[finden]]></value>
+		<value xml:lang="ru"><![CDATA[Поиск]]></value>
+		<value xml:lang="tr"><![CDATA[Bul]]></value>
+		<value xml:lang="mn"><![CDATA[Хайх]]></value>
+	</item>
+	<item name="cmd_replace">
+		<value xml:lang="ko"><![CDATA[바꾸기]]></value>
+		<value xml:lang="en"><![CDATA[Replace]]></value>
+		<value xml:lang="jp"><![CDATA[置換え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[替换]]></value>
+		<value xml:lang="zh-TW"><![CDATA[置換]]></value>
+		<value xml:lang="fr"><![CDATA[Remplacer]]></value>
+		<value xml:lang="de"><![CDATA[ersetzen]]></value>
+		<value xml:lang="ru"><![CDATA[Поменять]]></value>
+		<value xml:lang="tr"><![CDATA[Değiştir]]></value>
+		<value xml:lang="mn"><![CDATA[Солих]]></value>
+	</item>
+	<item name="cmd_confirm">
+		<value xml:lang="ko"><![CDATA[확인]]></value>
+		<value xml:lang="en"><![CDATA[Confirm]]></value>
+		<value xml:lang="jp"><![CDATA[OK]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确认]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確認]]></value>
+		<value xml:lang="fr"><![CDATA[Confirmer]]></value>
+		<value xml:lang="de"><![CDATA[bestätigen]]></value>
+		<value xml:lang="ru"><![CDATA[Подтвердить]]></value>
+		<value xml:lang="tr"><![CDATA[Doğrula]]></value>
+		<value xml:lang="mn"><![CDATA[ОК]]></value>
+	</item>
+	<item name="cmd_cancel">
+		<value xml:lang="ko"><![CDATA[취소]]></value>
+		<value xml:lang="en"><![CDATA[Cancel]]></value>
+		<value xml:lang="jp"><![CDATA[取り消し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[取消]]></value>
+		<value xml:lang="zh-TW"><![CDATA[取消]]></value>
+		<value xml:lang="fr"><![CDATA[Annuler]]></value>
+		<value xml:lang="de"><![CDATA[Abbrechen]]></value>
+		<value xml:lang="ru"><![CDATA[Отменить]]></value>
+		<value xml:lang="es"><![CDATA[Cancelar]]></value>
+		<value xml:lang="tr"><![CDATA[İptal et]]></value>
+		<value xml:lang="vi"><![CDATA[Loại bỏ]]></value>
+		<value xml:lang="mn"><![CDATA[Устгах]]></value>
+	</item>
+	<item name="cmd_back">
+		<value xml:lang="ko"><![CDATA[돌아가기]]></value>
+		<value xml:lang="en"><![CDATA[Go Back]]></value>
+		<value xml:lang="jp"><![CDATA[戻る]]></value>
+		<value xml:lang="zh-CN"><![CDATA[返回]]></value>
+		<value xml:lang="zh-TW"><![CDATA[返回]]></value>
+		<value xml:lang="fr"><![CDATA[Retourner]]></value>
+		<value xml:lang="de"><![CDATA[Zurück]]></value>
+		<value xml:lang="ru"><![CDATA[Вернуться]]></value>
+		<value xml:lang="es"><![CDATA[Atrás]]></value>
+		<value xml:lang="tr"><![CDATA[Önceki Sayfa]]></value>
+		<value xml:lang="vi"><![CDATA[Về trang trước]]></value>
+		<value xml:lang="mn"><![CDATA[Буцах]]></value>
+	</item>
+	<item name="cmd_vote">
+		<value xml:lang="ko"><![CDATA[추천]]></value>
+		<value xml:lang="en"><![CDATA[Recommend]]></value>
+		<value xml:lang="jp"><![CDATA[推薦]]></value>
+		<value xml:lang="zh-CN"><![CDATA[推荐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[推薦]]></value>
+		<value xml:lang="fr"><![CDATA[Recommander]]></value>
+		<value xml:lang="de"><![CDATA[zustimmen]]></value>
+		<value xml:lang="ru"><![CDATA[Рекомендовать]]></value>
+		<value xml:lang="es"><![CDATA[a Favor]]></value>
+		<value xml:lang="tr"><![CDATA[Tavsiye et]]></value>
+		<value xml:lang="vi"><![CDATA[Bình chọn]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгох]]></value>
+	</item>
+	<item name="cmd_vote_down">
+		<value xml:lang="ko"><![CDATA[비추천]]></value>
+		<value xml:lang="en"><![CDATA[Not recommend]]></value>
+		<value xml:lang="jp"><![CDATA[非推薦]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反对]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反對]]></value>
+		<value xml:lang="fr"><![CDATA[Critiquer]]></value>
+		<value xml:lang="de"><![CDATA[widersprechen]]></value>
+		<value xml:lang="ru"><![CDATA[Критиковать]]></value>
+		<value xml:lang="es"><![CDATA[en Contra]]></value>
+		<value xml:lang="tr"><![CDATA[Eleştir]]></value>
+		<value xml:lang="vi"><![CDATA[Phê bình]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгохгүй]]></value>
+	</item>
+	<item name="cmd_declare">
+		<value xml:lang="ko"><![CDATA[신고]]></value>
+		<value xml:lang="en"><![CDATA[Report]]></value>
+		<value xml:lang="jp"><![CDATA[通報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[举报]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢舉]]></value>
+		<value xml:lang="fr"><![CDATA[Déclarer]]></value>
+		<value xml:lang="de"><![CDATA[melden]]></value>
+		<value xml:lang="ru"><![CDATA[Пожаловаться]]></value>
+		<value xml:lang="es"><![CDATA[Denunciar]]></value>
+		<value xml:lang="tr"><![CDATA[Bildir]]></value>
+		<value xml:lang="vi"><![CDATA[Phạm quy]]></value>
+		<value xml:lang="mn"><![CDATA[Мэдээлэх]]></value>
+	</item>
+	<item name="cmd_cancel_declare">
+		<value xml:lang="ko"><![CDATA[신고 취소]]></value>
+		<value xml:lang="en"><![CDATA[Cancel Report]]></value>
+		<value xml:lang="jp"><![CDATA[通報取り消し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[取消举报]]></value>
+		<value xml:lang="zh-TW"><![CDATA[取消檢舉]]></value>
+		<value xml:lang="fr"><![CDATA[Annuler déclaration]]></value>
+		<value xml:lang="de"><![CDATA[melden abbrechen]]></value>
+		<value xml:lang="ru"><![CDATA[Отменить жалобу]]></value>
+		<value xml:lang="es"><![CDATA[Anular la Denuncia]]></value>
+		<value xml:lang="tr"><![CDATA[Bildirmeyi Geri al]]></value>
+		<value xml:lang="vi"><![CDATA[Loại bỏ báo cáo]]></value>
+		<value xml:lang="mn"><![CDATA[Мэдэгдлийг устгах]]></value>
+	</item>
+	<item name="cmd_declared_list">
+		<value xml:lang="ko"><![CDATA[신고 목록]]></value>
+		<value xml:lang="en"><![CDATA[Reported List]]></value>
+		<value xml:lang="jp"><![CDATA[通報リスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[举报列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢舉列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des déclarations]]></value>
+		<value xml:lang="de"><![CDATA[Meldeliste]]></value>
+		<value xml:lang="ru"><![CDATA[Список жалоб]]></value>
+		<value xml:lang="es"><![CDATA[Lista de Denuncias]]></value>
+		<value xml:lang="tr"><![CDATA[Bildirme listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách báo cáo]]></value>
+		<value xml:lang="mn"><![CDATA[Мэдээлсэн жагсаалт]]></value>
+	</item>
+	<item name="cmd_copy">
+		<value xml:lang="ko"><![CDATA[복사]]></value>
+		<value xml:lang="en"><![CDATA[Copy]]></value>
+		<value xml:lang="jp"><![CDATA[コピー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[复制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[複製]]></value>
+		<value xml:lang="fr"><![CDATA[Copier]]></value>
+		<value xml:lang="de"><![CDATA[Kopieren]]></value>
+		<value xml:lang="ru"><![CDATA[Копировать]]></value>
+		<value xml:lang="es"><![CDATA[Copiar]]></value>
+		<value xml:lang="tr"><![CDATA[Kopyala]]></value>
+		<value xml:lang="mn"><![CDATA[Хуулах]]></value>
+	</item>
+	<item name="cmd_move">
+		<value xml:lang="ko"><![CDATA[이동]]></value>
+		<value xml:lang="en"><![CDATA[Move]]></value>
+		<value xml:lang="jp"><![CDATA[移動]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移動]]></value>
+		<value xml:lang="fr"><![CDATA[Bouger]]></value>
+		<value xml:lang="de"><![CDATA[Verschieben]]></value>
+		<value xml:lang="ru"><![CDATA[Переместить]]></value>
+		<value xml:lang="es"><![CDATA[Mover]]></value>
+		<value xml:lang="tr"><![CDATA[Taşı]]></value>
+		<value xml:lang="vi"><![CDATA[Di chuyển]]></value>
+		<value xml:lang="mn"><![CDATA[Шилжих]]></value>
+	</item>
+	<item name="cmd_move_up">
+		<value xml:lang="ko"><![CDATA[위로]]></value>
+		<value xml:lang="en"><![CDATA[Up]]></value>
+		<value xml:lang="jp"><![CDATA[上へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[向上]]></value>
+		<value xml:lang="zh-TW"><![CDATA[向上]]></value>
+		<value xml:lang="fr"><![CDATA[En haut]]></value>
+		<value xml:lang="de"><![CDATA[Nach oben]]></value>
+		<value xml:lang="ru"><![CDATA[Вверх]]></value>
+		<value xml:lang="es"><![CDATA[Arriba]]></value>
+		<value xml:lang="tr"><![CDATA[Yukarı]]></value>
+		<value xml:lang="vi"><![CDATA[Lên]]></value>
+		<value xml:lang="mn"><![CDATA[Дээш]]></value>
+	</item>
+	<item name="cmd_move_down">
+		<value xml:lang="ko"><![CDATA[아래로]]></value>
+		<value xml:lang="en"><![CDATA[Down]]></value>
+		<value xml:lang="jp"><![CDATA[下へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[向下]]></value>
+		<value xml:lang="zh-TW"><![CDATA[向下]]></value>
+		<value xml:lang="fr"><![CDATA[En bas]]></value>
+		<value xml:lang="de"><![CDATA[Nach unten]]></value>
+		<value xml:lang="ru"><![CDATA[Вниз]]></value>
+		<value xml:lang="es"><![CDATA[Abajo]]></value>
+		<value xml:lang="tr"><![CDATA[Aşağı]]></value>
+		<value xml:lang="vi"><![CDATA[Xuống]]></value>
+		<value xml:lang="mn"><![CDATA[Доош]]></value>
+	</item>
+	<item name="cmd_add_indent">
+		<value xml:lang="ko"><![CDATA[들이기]]></value>
+		<value xml:lang="en"><![CDATA[Indent]]></value>
+		<value xml:lang="jp"><![CDATA[インデント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[拉长]]></value>
+		<value xml:lang="zh-TW"><![CDATA[拉長]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un Rentré]]></value>
+		<value xml:lang="de"><![CDATA[Einzug]]></value>
+		<value xml:lang="ru"><![CDATA[Отступ вправо]]></value>
+		<value xml:lang="es"><![CDATA[Añadir Sangría]]></value>
+		<value xml:lang="tr"><![CDATA[Satırbaşı]]></value>
+		<value xml:lang="vi"><![CDATA[Thu hẹp lề]]></value>
+		<value xml:lang="mn"><![CDATA[Нэмж оруулах]]></value>
+	</item>
+	<item name="cmd_remove_indent">
+		<value xml:lang="ko"><![CDATA[빼내기]]></value>
+		<value xml:lang="en"><![CDATA[Outdent]]></value>
+		<value xml:lang="jp"><![CDATA[逆インデント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[缩短]]></value>
+		<value xml:lang="zh-TW"><![CDATA[縮短]]></value>
+		<value xml:lang="fr"><![CDATA[Enlever un Rentré]]></value>
+		<value xml:lang="de"><![CDATA[Einzug entfernen]]></value>
+		<value xml:lang="ru"><![CDATA[Отступ влево]]></value>
+		<value xml:lang="es"><![CDATA[Reducir Sangría]]></value>
+		<value xml:lang="tr"><![CDATA[Çıkıntı]]></value>
+		<value xml:lang="vi"><![CDATA[Mở rộng lề]]></value>
+		<value xml:lang="mn"><![CDATA[Хасах]]></value>
+	</item>
+	<item name="cmd_management">
+		<value xml:lang="ko"><![CDATA[관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage]]></value>
+		<value xml:lang="jp"><![CDATA[管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer]]></value>
+		<value xml:lang="de"><![CDATA[Verwaltung]]></value>
+		<value xml:lang="ru"><![CDATA[Управление]]></value>
+		<value xml:lang="es"><![CDATA[Administración]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetimi]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý]]></value>
+		<value xml:lang="mn"><![CDATA[Удирдах]]></value>
+	</item>
+	<item name="cmd_make">
+		<value xml:lang="ko"><![CDATA[생성]]></value>
+		<value xml:lang="en"><![CDATA[Create]]></value>
+		<value xml:lang="jp"><![CDATA[作成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[生成]]></value>
+		<value xml:lang="zh-TW"><![CDATA[建立]]></value>
+		<value xml:lang="fr"><![CDATA[Créer]]></value>
+		<value xml:lang="de"><![CDATA[erstellen]]></value>
+		<value xml:lang="ru"><![CDATA[Создать]]></value>
+		<value xml:lang="es"><![CDATA[Crear]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni Oluştur]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo mới]]></value>
+		<value xml:lang="mn"><![CDATA[Харуулах]]></value>
+	</item>
+	<item name="cmd_select">
+		<value xml:lang="ko"><![CDATA[선택]]></value>
+		<value xml:lang="en"><![CDATA[Select]]></value>
+		<value xml:lang="jp"><![CDATA[選択]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇]]></value>
+		<value xml:lang="fr"><![CDATA[Choisir]]></value>
+		<value xml:lang="de"><![CDATA[Auswahl]]></value>
+		<value xml:lang="ru"><![CDATA[Выделить]]></value>
+		<value xml:lang="es"><![CDATA[Seleccionar]]></value>
+		<value xml:lang="tr"><![CDATA[Seç]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn]]></value>
+		<value xml:lang="mn"><![CDATA[Сонгох]]></value>
+	</item>
+	<item name="cmd_select_all">
+		<value xml:lang="ko"><![CDATA[모두 선택]]></value>
+		<value xml:lang="en"><![CDATA[Select All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて選択]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部选择]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部選擇]]></value>
+		<value xml:lang="fr"><![CDATA[Choisir Tout]]></value>
+		<value xml:lang="de"><![CDATA[Alle auswählen]]></value>
+		<value xml:lang="ru"><![CDATA[Выделить все]]></value>
+		<value xml:lang="es"><![CDATA[Seleccionar todo]]></value>
+		<value xml:lang="tr"><![CDATA[Tümünü Seç]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn tất cả]]></value>
+		<value xml:lang="mn"><![CDATA[Бүгдийг сонгох]]></value>
+	</item>
+	<item name="cmd_unselect_all">
+		<value xml:lang="ko"><![CDATA[모두 해제]]></value>
+		<value xml:lang="en"><![CDATA[Deselect All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて解除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部解除]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部解除]]></value>
+		<value xml:lang="fr"><![CDATA[Annuler Tout]]></value>
+		<value xml:lang="de"><![CDATA[Alle abwählen]]></value>
+		<value xml:lang="ru"><![CDATA[Убрать выделение ВСЕХ]]></value>
+		<value xml:lang="es"><![CDATA[Cancelar Toda la Selección]]></value>
+		<value xml:lang="tr"><![CDATA[Tümünü Seçimden çıkart]]></value>
+		<value xml:lang="vi"><![CDATA[Bỏ chọn tất cả]]></value>
+		<value xml:lang="mn"><![CDATA[Сонголтыг болих]]></value>
+	</item>
+	<item name="cmd_reverse_all">
+		<value xml:lang="ko"><![CDATA[선택 반전]]></value>
+		<value xml:lang="en"><![CDATA[Reverse]]></value>
+		<value xml:lang="jp"><![CDATA[反転選択]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反向選擇]]></value>
+		<value xml:lang="fr"><![CDATA[Renverser la Sélection]]></value>
+		<value xml:lang="de"><![CDATA[entgegengesetzt]]></value>
+		<value xml:lang="ru"><![CDATA[Перевернуть]]></value>
+		<value xml:lang="tr"><![CDATA[Ters çevir]]></value>
+		<value xml:lang="vi"><![CDATA[Đảo ngược]]></value>
+		<value xml:lang="mn"><![CDATA[Дахин сонгох]]></value>
+	</item>
+	<item name="cmd_close_all">
+		<value xml:lang="ko"><![CDATA[모두 닫기]]></value>
+		<value xml:lang="en"><![CDATA[Close All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて閉じる]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部折叠]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部收合]]></value>
+		<value xml:lang="fr"><![CDATA[Fermer Tout]]></value>
+		<value xml:lang="de"><![CDATA[Alle schließen]]></value>
+		<value xml:lang="ru"><![CDATA[Закрыть все]]></value>
+		<value xml:lang="es"><![CDATA[Cerrar todo]]></value>
+		<value xml:lang="tr"><![CDATA[Tümünü Kapat]]></value>
+		<value xml:lang="vi"><![CDATA[Đóng tất cả]]></value>
+		<value xml:lang="mn"><![CDATA[Бүгдийг хаах]]></value>
+	</item>
+	<item name="cmd_open_all">
+		<value xml:lang="ko"><![CDATA[모두 열기]]></value>
+		<value xml:lang="en"><![CDATA[Open All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて開く]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部展开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部展開]]></value>
+		<value xml:lang="fr"><![CDATA[Ouvrir Tout]]></value>
+		<value xml:lang="de"><![CDATA[Alle öffnen]]></value>
+		<value xml:lang="ru"><![CDATA[Открыть все]]></value>
+		<value xml:lang="es"><![CDATA[Abrir todo]]></value>
+		<value xml:lang="tr"><![CDATA[Tümünü Aç]]></value>
+		<value xml:lang="vi"><![CDATA[Mở tất cả]]></value>
+		<value xml:lang="mn"><![CDATA[Бүгдийг нээх]]></value>
+	</item>
+	<item name="cmd_reload">
+		<value xml:lang="ko"><![CDATA[다시 읽기]]></value>
+		<value xml:lang="en"><![CDATA[Reload]]></value>
+		<value xml:lang="jp"><![CDATA[リロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[从新载入]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重新讀取]]></value>
+		<value xml:lang="fr"><![CDATA[Recharger]]></value>
+		<value xml:lang="de"><![CDATA[neu laden]]></value>
+		<value xml:lang="ru"><![CDATA[Перегрузить]]></value>
+		<value xml:lang="es"><![CDATA[Actualizar]]></value>
+		<value xml:lang="tr"><![CDATA[Tekrar yükle]]></value>
+		<value xml:lang="vi"><![CDATA[Tải lại]]></value>
+		<value xml:lang="mn"><![CDATA[Дахин унших]]></value>
+	</item>
+	<item name="cmd_close">
+		<value xml:lang="ko"><![CDATA[닫기]]></value>
+		<value xml:lang="en"><![CDATA[Close]]></value>
+		<value xml:lang="jp"><![CDATA[閉じる]]></value>
+		<value xml:lang="zh-CN"><![CDATA[关闭]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關閉]]></value>
+		<value xml:lang="fr"><![CDATA[Fermer]]></value>
+		<value xml:lang="de"><![CDATA[Schließen]]></value>
+		<value xml:lang="ru"><![CDATA[Закрыть]]></value>
+		<value xml:lang="es"><![CDATA[Cerrar]]></value>
+		<value xml:lang="tr"><![CDATA[Kapat]]></value>
+		<value xml:lang="vi"><![CDATA[Đóng]]></value>
+		<value xml:lang="mn"><![CDATA[Хаах]]></value>
+	</item>
+	<item name="cmd_open">
+		<value xml:lang="ko"><![CDATA[열기]]></value>
+		<value xml:lang="en"><![CDATA[Open]]></value>
+		<value xml:lang="jp"><![CDATA[開く]]></value>
+		<value xml:lang="zh-CN"><![CDATA[打开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[開啟]]></value>
+		<value xml:lang="fr"><![CDATA[Ouvrir]]></value>
+		<value xml:lang="de"><![CDATA[öffnen]]></value>
+		<value xml:lang="ru"><![CDATA[Открыть]]></value>
+		<value xml:lang="es"><![CDATA[Abrir]]></value>
+		<value xml:lang="tr"><![CDATA[Aç]]></value>
+		<value xml:lang="vi"><![CDATA[Mở]]></value>
+		<value xml:lang="mn"><![CDATA[Нээх]]></value>
+	</item>
+	<item name="cmd_setup">
+		<value xml:lang="ko"><![CDATA[설정]]></value>
+		<value xml:lang="en"><![CDATA[Configure]]></value>
+		<value xml:lang="jp"><![CDATA[設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration]]></value>
+		<value xml:lang="de"><![CDATA[Einstellung]]></value>
+		<value xml:lang="ru"><![CDATA[Конфигурация]]></value>
+		<value xml:lang="es"><![CDATA[Configuración]]></value>
+		<value xml:lang="tr"><![CDATA[Yapılandır]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt]]></value>
+		<value xml:lang="mn"><![CDATA[Тохируулга]]></value>
+	</item>
+	<item name="cmd_addition_setup">
+		<value xml:lang="ko"><![CDATA[추가 설정]]></value>
+		<value xml:lang="en"><![CDATA[Additional Setup]]></value>
+		<value xml:lang="jp"><![CDATA[追加設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高级选项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[延伸設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration Additionnelle]]></value>
+		<value xml:lang="de"><![CDATA[Zusätzliche Einstellung]]></value>
+		<value xml:lang="ru"><![CDATA[Дополнительная настройка]]></value>
+		<value xml:lang="es"><![CDATA[Más opciones]]></value>
+		<value xml:lang="tr"><![CDATA[Ek kurulum]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt bổ xung]]></value>
+		<value xml:lang="mn"><![CDATA[Нэмэлт тохируулга]]></value>
+	</item>
+	<item name="cmd_option">
+		<value xml:lang="ko"><![CDATA[옵션]]></value>
+		<value xml:lang="en"><![CDATA[Option]]></value>
+		<value xml:lang="jp"><![CDATA[オプション]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選項]]></value>
+		<value xml:lang="de"><![CDATA[Auswahlmöglichkeit]]></value>
+		<value xml:lang="ru"><![CDATA[Опция]]></value>
+		<value xml:lang="es"><![CDATA[Opción]]></value>
+		<value xml:lang="tr"><![CDATA[Seçenek]]></value>
+		<value xml:lang="vi"><![CDATA[Tùy chọn]]></value>
+		<value xml:lang="mn"><![CDATA[Опшион]]></value>
+	</item>
+	<item name="cmd_apply">
+		<value xml:lang="ko"><![CDATA[적용]]></value>
+		<value xml:lang="en"><![CDATA[Apply]]></value>
+		<value xml:lang="jp"><![CDATA[適用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[应用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[套用]]></value>
+		<value xml:lang="fr"><![CDATA[Appliquer]]></value>
+		<value xml:lang="de"><![CDATA[Übernehmen]]></value>
+		<value xml:lang="ru"><![CDATA[Применить]]></value>
+		<value xml:lang="es"><![CDATA[Aplicar]]></value>
+		<value xml:lang="tr"><![CDATA[Uygula]]></value>
+		<value xml:lang="vi"><![CDATA[Áp dụng]]></value>
+		<value xml:lang="mn"><![CDATA[Хэрэгжүүлэх]]></value>
+	</item>
+	<item name="cmd_open_calendar">
+		<value xml:lang="ko"><![CDATA[날짜 선택]]></value>
+		<value xml:lang="en"><![CDATA[Select a Date]]></value>
+		<value xml:lang="jp"><![CDATA[カレンダーを開く]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇日期]]></value>
+		<value xml:lang="fr"><![CDATA[Choisir un Jour]]></value>
+		<value xml:lang="de"><![CDATA[Datum auswählen]]></value>
+		<value xml:lang="ru"><![CDATA[Выбрать дату]]></value>
+		<value xml:lang="es"><![CDATA[Abrir el calendario]]></value>
+		<value xml:lang="tr"><![CDATA[Bir tarih belirle]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn một ngày]]></value>
+		<value xml:lang="mn"><![CDATA[Календар сонгох]]></value>
+	</item>
+	<item name="cmd_send">
+		<value xml:lang="ko"><![CDATA[발송]]></value>
+		<value xml:lang="en"><![CDATA[Send]]></value>
+		<value xml:lang="jp"><![CDATA[送信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyer]]></value>
+		<value xml:lang="de"><![CDATA[Senden]]></value>
+		<value xml:lang="ru"><![CDATA[Отправить]]></value>
+		<value xml:lang="es"><![CDATA[Enviar]]></value>
+		<value xml:lang="tr"><![CDATA[Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi đi]]></value>
+		<value xml:lang="mn"><![CDATA[Илгээх]]></value>
+	</item>
+	<item name="cmd_print">
+		<value xml:lang="ko"><![CDATA[인쇄]]></value>
+		<value xml:lang="en"><![CDATA[Print]]></value>
+		<value xml:lang="jp"><![CDATA[印刷]]></value>
+		<value xml:lang="zh-CN"><![CDATA[打印]]></value>
+		<value xml:lang="zh-TW"><![CDATA[列印]]></value>
+		<value xml:lang="fr"><![CDATA[Imprimer]]></value>
+		<value xml:lang="de"><![CDATA[Drucken]]></value>
+		<value xml:lang="ru"><![CDATA[Напечатать]]></value>
+		<value xml:lang="es"><![CDATA[Imprimir]]></value>
+		<value xml:lang="tr"><![CDATA[Yazdır]]></value>
+		<value xml:lang="vi"><![CDATA[In trang]]></value>
+		<value xml:lang="mn"><![CDATA[Хэвлэх]]></value>
+	</item>
+	<item name="cmd_scrap">
+		<value xml:lang="ko"><![CDATA[스크랩]]></value>
+		<value xml:lang="en"><![CDATA[Scrap]]></value>
+		<value xml:lang="jp"><![CDATA[スクラップ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[收藏]]></value>
+		<value xml:lang="zh-TW"><![CDATA[收藏]]></value>
+		<value xml:lang="fr"><![CDATA[Coupure]]></value>
+		<value xml:lang="de"><![CDATA[sammeln]]></value>
+		<value xml:lang="ru"><![CDATA[В черновики]]></value>
+		<value xml:lang="es"><![CDATA[Recorte]]></value>
+		<value xml:lang="tr"><![CDATA[Bozuk olarak ayır]]></value>
+		<value xml:lang="vi"><![CDATA[Phân loại]]></value>
+		<value xml:lang="mn"><![CDATA[Скрап]]></value>
+	</item>
+	<item name="cmd_preview">
+		<value xml:lang="ko"><![CDATA[미리 보기]]></value>
+		<value xml:lang="en"><![CDATA[Preview]]></value>
+		<value xml:lang="jp"><![CDATA[プレビュー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[预览]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預覽]]></value>
+		<value xml:lang="fr"><![CDATA[Avant-première]]></value>
+		<value xml:lang="de"><![CDATA[Vorschau]]></value>
+		<value xml:lang="ru"><![CDATA[Предпросмотр]]></value>
+		<value xml:lang="es"><![CDATA[Vista Previa]]></value>
+		<value xml:lang="tr"><![CDATA[Önizleme]]></value>
+		<value xml:lang="vi"><![CDATA[Xem trước]]></value>
+		<value xml:lang="mn"><![CDATA[Урьдчилан харах]]></value>
+	</item>
+	<item name="cmd_reset">
+		<value xml:lang="ko"><![CDATA[초기화]]></value>
+		<value xml:lang="en"><![CDATA[Reset]]></value>
+		<value xml:lang="jp"><![CDATA[初期化]]></value>
+		<value xml:lang="zh-CN"><![CDATA[初始化]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重置]]></value>
+		<value xml:lang="fr"><![CDATA[Restaurer]]></value>
+		<value xml:lang="de"><![CDATA[zurücksetzen]]></value>
+		<value xml:lang="ru"><![CDATA[Сброс]]></value>
+		<value xml:lang="es"><![CDATA[Rehacer]]></value>
+		<value xml:lang="tr"><![CDATA[İlk duruma getir]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập lại]]></value>
+		<value xml:lang="mn"><![CDATA[Дахин тохируулах]]></value>
+	</item>
+	<item name="cmd_remake_cache">
+		<value xml:lang="ko"><![CDATA[캐시파일 재생성]]></value>
+		<value xml:lang="en"><![CDATA[Re-create cache file]]></value>
+		<value xml:lang="jp"><![CDATA[キャッシュファイル再生成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新缓冲]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重新建立暫存檔]]></value>
+		<value xml:lang="fr"><![CDATA[Recréer l'antémémoire du Fichier]]></value>
+		<value xml:lang="de"><![CDATA[cache neu generieren]]></value>
+		<value xml:lang="ru"><![CDATA[Пересоздать файл кэша]]></value>
+		<value xml:lang="es"><![CDATA[Re-crear el archivo caché]]></value>
+		<value xml:lang="tr"><![CDATA[Önbellek dosyasını tekrar oluştur]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo File Cache mới]]></value>
+		<value xml:lang="mn"><![CDATA[cache файл дахин хийх]]></value>
+	</item>
+	<item name="cmd_publish">
+		<value xml:lang="ko"><![CDATA[발행]]></value>
+		<value xml:lang="en"><![CDATA[Publish]]></value>
+		<value xml:lang="jp"><![CDATA[発行]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發表]]></value>
+		<value xml:lang="fr"><![CDATA[Publier]]></value>
+		<value xml:lang="de"><![CDATA[publizieren]]></value>
+		<value xml:lang="ru"><![CDATA[Опубликовать]]></value>
+		<value xml:lang="es"><![CDATA[Publicar]]></value>
+		<value xml:lang="tr"><![CDATA[Yayınla]]></value>
+		<value xml:lang="vi"><![CDATA[Xuất bản]]></value>
+		<value xml:lang="mn"><![CDATA[Олгох]]></value>
+	</item>
+	<item name="cmd_layout_setup">
+		<value xml:lang="ko"><![CDATA[레이아웃 설정]]></value>
+		<value xml:lang="en"><![CDATA[Configure layout]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configurer la Mise en page]]></value>
+		<value xml:lang="de"><![CDATA[Layout konfigurieren]]></value>
+		<value xml:lang="ru"><![CDATA[Конфигурировать лейаут]]></value>
+		<value xml:lang="es"><![CDATA[Composición de Página]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzenini yapılandır]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt giao diện]]></value>
+		<value xml:lang="mn"><![CDATA[Лэйаут тохируулах]]></value>
+	</item>
+	<item name="cmd_layout_edit">
+		<value xml:lang="ko"><![CDATA[레이아웃 편집]]></value>
+		<value xml:lang="en"><![CDATA[Edit layout]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト編集]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编辑布局]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面編輯]]></value>
+		<value xml:lang="fr"><![CDATA[Editer la Mise en page]]></value>
+		<value xml:lang="de"><![CDATA[Layout bearbeiten]]></value>
+		<value xml:lang="ru"><![CDATA[Редактировать лейаут]]></value>
+		<value xml:lang="es"><![CDATA[Editar la Página]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzeninin düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa giao diện]]></value>
+		<value xml:lang="mn"><![CDATA[Лэйаут өөрчлөх]]></value>
+	</item>
+	<item name="cmd_search_by_ipaddress">
+		<value xml:lang="ko"><![CDATA[IP주소로 검색]]></value>
+		<value xml:lang="en"><![CDATA[Search by IP Address]]></value>
+		<value xml:lang="jp"><![CDATA[IPアドレスで検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[以IP地址搜索]]></value>
+		<value xml:lang="zh-TW"><![CDATA[以 IP 搜尋]]></value>
+		<value xml:lang="fr"><![CDATA[Recherce par l'Address IP]]></value>
+		<value xml:lang="de"><![CDATA[nach IP Adresse suchen]]></value>
+		<value xml:lang="ru"><![CDATA[Искать по IP адресу]]></value>
+		<value xml:lang="es"><![CDATA[Búsqueda con IP]]></value>
+		<value xml:lang="tr"><![CDATA[IP Adresiyle ara]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm kiếm IP]]></value>
+		<value xml:lang="mn"><![CDATA[IP хаягаар хайх]]></value>
+	</item>
+	<item name="cmd_add_ip_to_spamfilter">
+		<value xml:lang="ko"><![CDATA[스팸필터에 IP추가]]></value>
+		<value xml:lang="en"><![CDATA[Add IP to spamfilter]]></value>
+		<value xml:lang="jp"><![CDATA[スパムフィルターにIPを追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止IP]]></value>
+		<value xml:lang="zh-TW"><![CDATA[封鎖此 IP]]></value>
+		<value xml:lang="de"><![CDATA[IP in den Spamfilter hinzufügen]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить IP в спамфильтры]]></value>
+		<value xml:lang="es"><![CDATA[Añadir IP en el Filtro de Spam]]></value>
+		<value xml:lang="tr"><![CDATA[Spamfilter'a IPyi ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm IP vào bộ lọc]]></value>
+		<value xml:lang="mn"><![CDATA[Спэм филтерт IPнэмэх]]></value>
+	</item>
+	<item name="cmd_pass_step">
+		<value xml:lang="ko"><![CDATA[이 단계를 생략]]></value>
+		<value xml:lang="en"><![CDATA[Skip this step.]]></value>
+		<value xml:lang="jp"><![CDATA[この段階を省略]]></value>
+		<value xml:lang="zh-TW"><![CDATA[略過此步]]></value>
+	</item>
+	<item name="cmd_complete">
+		<value xml:lang="ko"><![CDATA[완료]]></value>
+		<value xml:lang="en"><![CDATA[Done]]></value>
+		<value xml:lang="jp"><![CDATA[完了]]></value>
+		<value xml:lang="zh-TW"><![CDATA[完成]]></value>
+	</item>
+	<item name="cmd_go_to_page">
+		<value xml:lang="ko"><![CDATA[페이지 직접 이동]]></value>
+		<value xml:lang="en"><![CDATA[Go to page]]></value>
+		<value xml:lang="jp"><![CDATA[ページへ移動]]></value>
+		<value xml:lang="zh-TW"><![CDATA[前往頁面]]></value>
+	</item>
+	<item name="enable">
+		<value xml:lang="ko"><![CDATA[가능]]></value>
+		<value xml:lang="en"><![CDATA[Enable]]></value>
+		<value xml:lang="jp"><![CDATA[可能]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可用]]></value>
+		<value xml:lang="fr"><![CDATA[Valide]]></value>
+		<value xml:lang="de"><![CDATA[instand]]></value>
+		<value xml:lang="ru"><![CDATA[Включено]]></value>
+		<value xml:lang="es"><![CDATA[Activar]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilir kıl]]></value>
+		<value xml:lang="vi"><![CDATA[Bật]]></value>
+		<value xml:lang="mn"><![CDATA[Боломжтой]]></value>
+	</item>
+	<item name="disable">
+		<value xml:lang="ko"><![CDATA[불가능]]></value>
+		<value xml:lang="en"><![CDATA[Disable]]></value>
+		<value xml:lang="jp"><![CDATA[不可]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁用]]></value>
+		<value xml:lang="fr"><![CDATA[Invalide]]></value>
+		<value xml:lang="de"><![CDATA[außerstand]]></value>
+		<value xml:lang="ru"><![CDATA[Выключено]]></value>
+		<value xml:lang="es"><![CDATA[Desactivar]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilemez kıl]]></value>
+		<value xml:lang="vi"><![CDATA[Tắt]]></value>
+		<value xml:lang="mn"><![CDATA[Боломжгүй]]></value>
+	</item>
+	<item name="agree">
+		<value xml:lang="ko"><![CDATA[동의]]></value>
+		<value xml:lang="en"><![CDATA[Agree]]></value>
+		<value xml:lang="jp"><![CDATA[同意する]]></value>
+		<value xml:lang="zh-TW"><![CDATA[同意]]></value>
+		<value xml:lang="de"><![CDATA[akzeptieren]]></value>
+	</item>
+	<item name="disagree">
+		<value xml:lang="ko"><![CDATA[동의안함]]></value>
+		<value xml:lang="en"><![CDATA[Disagree]]></value>
+		<value xml:lang="jp"><![CDATA[同意しない]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不同意]]></value>
+		<value xml:lang="de"><![CDATA[nicht akzeptieren]]></value>
+	</item>
+	<item name="favorite">
+		<value xml:lang="ko"><![CDATA[즐겨찾기]]></value>
+		<value xml:lang="en"><![CDATA[Favorite]]></value>
+		<value xml:lang="jp"><![CDATA[お気に入り]]></value>
+		<value xml:lang="zh-TW"><![CDATA[我的最愛]]></value>
+		<value xml:lang="de"><![CDATA[Lesezeichen]]></value>
+	</item>
+	<item name="menu">
+		<value xml:lang="ko"><![CDATA[메뉴]]></value>
+		<value xml:lang="en"><![CDATA[Menu]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單]]></value>
+		<value xml:lang="de"><![CDATA[Menü]]></value>
+		<value xml:lang="ru"><![CDATA[Меню]]></value>
+		<value xml:lang="tr"><![CDATA[Menü]]></value>
+	</item>
+	<item name="no">
+		<value xml:lang="ko"><![CDATA[번호]]></value>
+		<value xml:lang="en"><![CDATA[No.]]></value>
+		<value xml:lang="jp"><![CDATA[番号]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编号]]></value>
+		<value xml:lang="zh-TW"><![CDATA[編號]]></value>
+		<value xml:lang="fr"><![CDATA[No]]></value>
+		<value xml:lang="de"><![CDATA[Nr.]]></value>
+		<value xml:lang="es"><![CDATA[Nº]]></value>
+		<value xml:lang="tr"><![CDATA[No]]></value>
+		<value xml:lang="vi"><![CDATA[STT]]></value>
+		<value xml:lang="mn"><![CDATA[Дугаар]]></value>
+	</item>
+	<item name="notice">
+		<value xml:lang="ko"><![CDATA[공지]]></value>
+		<value xml:lang="en"><![CDATA[Notice]]></value>
+		<value xml:lang="jp"><![CDATA[お知らせ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[公告]]></value>
+		<value xml:lang="zh-TW"><![CDATA[公告]]></value>
+		<value xml:lang="de"><![CDATA[Hinweis]]></value>
+		<value xml:lang="ru"><![CDATA[Уведомление]]></value>
+		<value xml:lang="es"><![CDATA[Aviso]]></value>
+		<value xml:lang="tr"><![CDATA[Duyuru]]></value>
+		<value xml:lang="vi"><![CDATA[Chú ý]]></value>
+		<value xml:lang="mn"><![CDATA[Зарлал]]></value>
+	</item>
+	<item name="secret">
+		<value xml:lang="ko"><![CDATA[비밀]]></value>
+		<value xml:lang="en"><![CDATA[Secret]]></value>
+		<value xml:lang="jp"><![CDATA[非公開]]></value>
+		<value xml:lang="zh-CN"><![CDATA[密帖]]></value>
+		<value xml:lang="zh-TW"><![CDATA[秘密]]></value>
+		<value xml:lang="de"><![CDATA[Geheim]]></value>
+		<value xml:lang="ru"><![CDATA[Секрет]]></value>
+		<value xml:lang="es"><![CDATA[Secreto]]></value>
+		<value xml:lang="tr"><![CDATA[Gizli]]></value>
+		<value xml:lang="vi"><![CDATA[Riêng tư]]></value>
+		<value xml:lang="mn"><![CDATA[Нууц]]></value>
+	</item>
+	<item name="category_srl">
+		<value xml:lang="ko"><![CDATA[분류]]></value>
+		<value xml:lang="en"><![CDATA[Category]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類]]></value>
+		<value xml:lang="fr"><![CDATA[Catégorie]]></value>
+		<value xml:lang="de"><![CDATA[Kategorie]]></value>
+		<value xml:lang="ru"><![CDATA[Категория]]></value>
+		<value xml:lang="es"><![CDATA[Categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori]]></value>
+		<value xml:lang="vi"><![CDATA[Thể loại]]></value>
+		<value xml:lang="mn"><![CDATA[Категори]]></value>
+	</item>
+	<item name="category">
+		<value xml:lang="ko"><![CDATA[분류]]></value>
+		<value xml:lang="en"><![CDATA[Category]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類]]></value>
+		<value xml:lang="fr"><![CDATA[Catégorie]]></value>
+		<value xml:lang="de"><![CDATA[Kategorie]]></value>
+		<value xml:lang="ru"><![CDATA[Категория]]></value>
+		<value xml:lang="es"><![CDATA[Categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori]]></value>
+		<value xml:lang="vi"><![CDATA[Thể loại]]></value>
+		<value xml:lang="mn"><![CDATA[Категори]]></value>
+	</item>
+	<item name="none_category">
+		<value xml:lang="ko"><![CDATA[분류 없음]]></value>
+		<value xml:lang="en"><![CDATA[None category]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ無し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無分類]]></value>
+		<value xml:lang="de"><![CDATA[keine Kategorie]]></value>
+		<value xml:lang="ru"><![CDATA[Без категории]]></value>
+		<value xml:lang="es"><![CDATA[Sin categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori Yok]]></value>
+		<value xml:lang="vi"><![CDATA[Không có thể loại]]></value>
+		<value xml:lang="mn"><![CDATA[Категори байхгүй]]></value>
+	</item>
+	<item name="none_image">
+		<value xml:lang="ko"><![CDATA[이미지 없음]]></value>
+		<value xml:lang="en"><![CDATA[Image does not exist.]]></value>
+		<value xml:lang="jp"><![CDATA[イメージなし]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无图]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無圖片]]></value>
+		<value xml:lang="de"><![CDATA[kein Bild]]></value>
+		<value xml:lang="ru"><![CDATA[Картинки нет]]></value>
+		<value xml:lang="tr"><![CDATA[Resim bulunmamaktadır]]></value>
+		<value xml:lang="mn"><![CDATA[No image]]></value>
+	</item>
+	<item name="document_srl">
+		<value xml:lang="ko"><![CDATA[문서번호]]></value>
+		<value xml:lang="en"><![CDATA[Article No.]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み番号]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文章编号]]></value>
+		<value xml:lang="zh-TW"><![CDATA[文章編號]]></value>
+		<value xml:lang="fr"><![CDATA[Numéro de série du Document]]></value>
+		<value xml:lang="de"><![CDATA[Artikelnr.]]></value>
+		<value xml:lang="ru"><![CDATA[No  документа]]></value>
+		<value xml:lang="es"><![CDATA[Número del documento]]></value>
+		<value xml:lang="tr"><![CDATA[Belge No]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết. STT.]]></value>
+		<value xml:lang="mn"><![CDATA[Баримтын дугаар]]></value>
+	</item>
+	<item name="user_id">
+		<value xml:lang="ko"><![CDATA[아이디]]></value>
+		<value xml:lang="en"><![CDATA[User ID]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザーＩＤ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
+		<value xml:lang="fr"><![CDATA[Compte]]></value>
+		<value xml:lang="de"><![CDATA[Benutzer-ID]]></value>
+		<value xml:lang="ru"><![CDATA[ID пользователя]]></value>
+		<value xml:lang="es"><![CDATA[ID de Usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcı Kimliği]]></value>
+		<value xml:lang="vi"><![CDATA[ID đăng nhập]]></value>
+		<value xml:lang="mn"><![CDATA[ID]]></value>
+	</item>
+	<item name="author">
+		<value xml:lang="ko"><![CDATA[작성자]]></value>
+		<value xml:lang="en"><![CDATA[Developer]]></value>
+		<value xml:lang="jp"><![CDATA[作成者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[制作]]></value>
+		<value xml:lang="zh-TW"><![CDATA[作者]]></value>
+		<value xml:lang="fr"><![CDATA[Auteur]]></value>
+		<value xml:lang="de"><![CDATA[Autor]]></value>
+		<value xml:lang="ru"><![CDATA[Автор]]></value>
+		<value xml:lang="es"><![CDATA[Autor]]></value>
+		<value xml:lang="tr"><![CDATA[Geliştirici]]></value>
+		<value xml:lang="vi"><![CDATA[Người gửi]]></value>
+		<value xml:lang="mn"><![CDATA[Бичсэн]]></value>
+	</item>
+	<item name="password">
+		<value xml:lang="ko"><![CDATA[비밀번호]]></value>
+		<value xml:lang="en"><![CDATA[Password]]></value>
+		<value xml:lang="jp"><![CDATA[パスワード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Mot de Passe]]></value>
+		<value xml:lang="de"><![CDATA[Passwort]]></value>
+		<value xml:lang="ru"><![CDATA[Пароль]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña]]></value>
+		<value xml:lang="tr"><![CDATA[Şifre]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu]]></value>
+		<value xml:lang="mn"><![CDATA[Нууц дугаар]]></value>
+	</item>
+	<item name="password1">
+		<value xml:lang="ko"><![CDATA[비밀번호]]></value>
+		<value xml:lang="en"><![CDATA[Password]]></value>
+		<value xml:lang="jp"><![CDATA[パスワード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Mot de Passe]]></value>
+		<value xml:lang="de"><![CDATA[Passwort]]></value>
+		<value xml:lang="ru"><![CDATA[Пароль]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña]]></value>
+		<value xml:lang="tr"><![CDATA[Şifre]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu]]></value>
+		<value xml:lang="mn"><![CDATA[Нууц дугаар]]></value>
+	</item>
+	<item name="password2">
+		<value xml:lang="ko"><![CDATA[비밀번호 확인]]></value>
+		<value xml:lang="en"><![CDATA[Retype Password]]></value>
+		<value xml:lang="jp"><![CDATA[パスワード確認]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确认密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確認密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Confirmer du Mot de Passe]]></value>
+		<value xml:lang="de"><![CDATA[Passwort bestätigen]]></value>
+		<value xml:lang="ru"><![CDATA[Подтверждение пароля]]></value>
+		<value xml:lang="es"><![CDATA[Otra vez la contraseña]]></value>
+		<value xml:lang="tr"><![CDATA[Şifreyi Doğrula]]></value>
+		<value xml:lang="vi"><![CDATA[Nhập lại mật khẩu]]></value>
+		<value xml:lang="mn"><![CDATA[Нууц дугаар шалгах]]></value>
+	</item>
+	<item name="admin_id">
+		<value xml:lang="ko"><![CDATA[관리자ID]]></value>
+		<value xml:lang="en"><![CDATA[Admin ID]]></value>
+		<value xml:lang="jp"><![CDATA[管理者ＩＤ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理员ID]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員帳號]]></value>
+		<value xml:lang="fr"><![CDATA[Compte d'Administrateur]]></value>
+		<value xml:lang="de"><![CDATA[Administrator ID]]></value>
+		<value xml:lang="ru"><![CDATA[ID админа]]></value>
+		<value xml:lang="es"><![CDATA[ID del Administrador]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Kimliği]]></value>
+		<value xml:lang="mn"><![CDATA[Хариуцагч ID]]></value>
+	</item>
+	<item name="admin_email_address">
+		<value xml:lang="ko"><![CDATA[관리자 Email 주소]]></value>
+		<value xml:lang="en"><![CDATA[Admin Email Address]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員電子郵件位址]]></value>
+	</item>
+	<item name="writer">
+		<value xml:lang="ko"><![CDATA[글쓴이]]></value>
+		<value xml:lang="en"><![CDATA[Author]]></value>
+		<value xml:lang="jp"><![CDATA[投稿者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[作者]]></value>
+		<value xml:lang="fr"><![CDATA[Auteur]]></value>
+		<value xml:lang="de"><![CDATA[Verfasser]]></value>
+		<value xml:lang="ru"><![CDATA[Автор записи]]></value>
+		<value xml:lang="es"><![CDATA[Escritor]]></value>
+		<value xml:lang="tr"><![CDATA[Yazar]]></value>
+		<value xml:lang="vi"><![CDATA[Người gửi]]></value>
+		<value xml:lang="mn"><![CDATA[Нэр]]></value>
+	</item>
+	<item name="user_name">
+		<value xml:lang="ko"><![CDATA[이름]]></value>
+		<value xml:lang="en"><![CDATA[User Name]]></value>
+		<value xml:lang="jp"><![CDATA[名前]]></value>
+		<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
+		<value xml:lang="fr"><![CDATA[Nom]]></value>
+		<value xml:lang="de"><![CDATA[Benutzername]]></value>
+		<value xml:lang="ru"><![CDATA[Имя пользователя]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del Usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcı Adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên thật]]></value>
+		<value xml:lang="mn"><![CDATA[Нэр]]></value>
+	</item>
+	<item name="nick_name">
+		<value xml:lang="ko"><![CDATA[닉네임]]></value>
+		<value xml:lang="en"><![CDATA[Nick Name]]></value>
+		<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
+		<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
+		<value xml:lang="fr"><![CDATA[Surnom]]></value>
+		<value xml:lang="de"><![CDATA[Spitzname]]></value>
+		<value xml:lang="ru"><![CDATA[Ник]]></value>
+		<value xml:lang="es"><![CDATA[Apodo]]></value>
+		<value xml:lang="tr"><![CDATA[Takma Ad]]></value>
+		<value xml:lang="vi"><![CDATA[NickName]]></value>
+		<value xml:lang="mn"><![CDATA[Ник]]></value>
+	</item>
+	<item name="email_address">
+		<value xml:lang="ko"><![CDATA[이메일 주소]]></value>
+		<value xml:lang="en"><![CDATA[Email]]></value>
+		<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[电子邮件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[電子郵件]]></value>
+		<value xml:lang="fr"><![CDATA[Mél]]></value>
+		<value xml:lang="de"><![CDATA[E-Mail]]></value>
+		<value xml:lang="es"><![CDATA[Correo electrónico]]></value>
+		<value xml:lang="tr"><![CDATA[E-posta]]></value>
+		<value xml:lang="mn"><![CDATA[Мэйл хаяг]]></value>
+	</item>
+	<item name="homepage">
+		<value xml:lang="ko"><![CDATA[홈페이지]]></value>
+		<value xml:lang="en"><![CDATA[Homepage]]></value>
+		<value xml:lang="jp"><![CDATA[ホームページ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[主页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主頁]]></value>
+		<value xml:lang="fr"><![CDATA[Page d'accueil]]></value>
+		<value xml:lang="de"><![CDATA[Startseite]]></value>
+		<value xml:lang="ru"><![CDATA[Домашняя страница]]></value>
+		<value xml:lang="es"><![CDATA[Página web]]></value>
+		<value xml:lang="tr"><![CDATA[Websayfası]]></value>
+		<value xml:lang="vi"><![CDATA[Trang chủ]]></value>
+		<value xml:lang="mn"><![CDATA[Вебхуудас]]></value>
+	</item>
+	<item name="blog">
+		<value xml:lang="ko"><![CDATA[블로그]]></value>
+		<value xml:lang="en"><![CDATA[Blog]]></value>
+		<value xml:lang="jp"><![CDATA[ブログ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[博客]]></value>
+		<value xml:lang="zh-TW"><![CDATA[部落格]]></value>
+		<value xml:lang="fr"><![CDATA[Blogue]]></value>
+		<value xml:lang="en"><![CDATA[Blog]]></value>
+		<value xml:lang="ru"><![CDATA[Блог]]></value>
+		<value xml:lang="mn"><![CDATA[Блог]]></value>
+	</item>
+	<item name="birthday">
+		<value xml:lang="ko"><![CDATA[생일]]></value>
+		<value xml:lang="en"><![CDATA[Birthday]]></value>
+		<value xml:lang="jp"><![CDATA[誕生日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[生日]]></value>
+		<value xml:lang="zh-TW"><![CDATA[生日]]></value>
+		<value xml:lang="fr"><![CDATA[Anniversaire]]></value>
+		<value xml:lang="de"><![CDATA[Geburtstag]]></value>
+		<value xml:lang="ru"><![CDATA[Дата рождения]]></value>
+		<value xml:lang="es"><![CDATA[Fecha de Nacimiento]]></value>
+		<value xml:lang="tr"><![CDATA[Doğum günü]]></value>
+		<value xml:lang="vi"><![CDATA[Sinh nhật]]></value>
+		<value xml:lang="mn"><![CDATA[Төрсөн өдөр]]></value>
+	</item>
+	<item name="browser_title">
+		<value xml:lang="ko"><![CDATA[브라우저 제목]]></value>
+		<value xml:lang="en"><![CDATA[Browser Title]]></value>
+		<value xml:lang="jp"><![CDATA[ブラウザタイトル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[浏览器标题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[瀏覽器標題]]></value>
+		<value xml:lang="fr"><![CDATA[Titre de Navigateur]]></value>
+		<value xml:lang="de"><![CDATA[Browser-Titel]]></value>
+		<value xml:lang="ru"><![CDATA[Заголовок браузера]]></value>
+		<value xml:lang="es"><![CDATA[Título del navegador]]></value>
+		<value xml:lang="tr"><![CDATA[Tarayıcı Başlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Tiêu đề trình duyệt]]></value>
+		<value xml:lang="mn"><![CDATA[Browser гарчиг]]></value>
+	</item>
+	<item name="title">
+		<value xml:lang="ko"><![CDATA[제목]]></value>
+		<value xml:lang="en"><![CDATA[Subject]]></value>
+		<value xml:lang="jp"><![CDATA[タイトル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+		<value xml:lang="fr"><![CDATA[Titre]]></value>
+		<value xml:lang="de"><![CDATA[Titel]]></value>
+		<value xml:lang="ru"><![CDATA[Заголовок]]></value>
+		<value xml:lang="es"><![CDATA[Título]]></value>
+		<value xml:lang="tr"><![CDATA[Konu]]></value>
+		<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		<value xml:lang="mn"><![CDATA[Гарчиг]]></value>
+	</item>
+	<item name="title_content">
+		<value xml:lang="ko"><![CDATA[제목+내용]]></value>
+		<value xml:lang="en"><![CDATA[Subject+Content]]></value>
+		<value xml:lang="jp"><![CDATA[タイトル＋内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[标题+内容]]></value>
+		<value xml:lang="zh-TW"><![CDATA[標題+內容]]></value>
+		<value xml:lang="fr"><![CDATA[Titre + Contenu]]></value>
+		<value xml:lang="de"><![CDATA[Titel + Inhalt]]></value>
+		<value xml:lang="ru"><![CDATA[Заголовок+Содержание]]></value>
+		<value xml:lang="es"><![CDATA[Título+Contenido]]></value>
+		<value xml:lang="tr"><![CDATA[Konu+İçerik]]></value>
+		<value xml:lang="vi"><![CDATA[TĐ+ND]]></value>
+		<value xml:lang="mn"><![CDATA[Гарчиг+ Агуулга]]></value>
+	</item>
+	<item name="untitle">
+		<value xml:lang="ko"><![CDATA[제목 없음]]></value>
+		<value xml:lang="en"><![CDATA[No Title]]></value>
+		<value xml:lang="jp"><![CDATA[タイトルなし]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無標題]]></value>
+		<value xml:lang="de"><![CDATA[Kein Titel]]></value>
+	</item>
+	<item name="topic">
+		<value xml:lang="ko"><![CDATA[주제]]></value>
+		<value xml:lang="en"><![CDATA[Topic]]></value>
+		<value xml:lang="jp"><![CDATA[トピック]]></value>
+		<value xml:lang="zh-CN"><![CDATA[主题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主題]]></value>
+		<value xml:lang="fr"><![CDATA[Sujet]]></value>
+		<value xml:lang="de"><![CDATA[Thema]]></value>
+		<value xml:lang="ru"><![CDATA[Тема]]></value>
+		<value xml:lang="es"><![CDATA[Tema]]></value>
+		<value xml:lang="tr"><![CDATA[Konu]]></value>
+		<value xml:lang="vi"><![CDATA[Chủ đề]]></value>
+		<value xml:lang="mn"><![CDATA[Сэдэв]]></value>
+	</item>
+	<item name="replies">
+		<value xml:lang="ko"><![CDATA[댓글]]></value>
+		<value xml:lang="en"><![CDATA[Comment]]></value>
+		<value xml:lang="jp"><![CDATA[コメント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[回复]]></value>
+		<value xml:lang="zh-TW"><![CDATA[回覆]]></value>
+		<value xml:lang="fr"><![CDATA[Répondse]]></value>
+		<value xml:lang="de"><![CDATA[Antwort]]></value>
+		<value xml:lang="ru"><![CDATA[Ответы]]></value>
+		<value xml:lang="es"><![CDATA[Responder]]></value>
+		<value xml:lang="tr"><![CDATA[Cevapla]]></value>
+		<value xml:lang="vi"><![CDATA[Trả lời]]></value>
+		<value xml:lang="mn"><![CDATA[Хариулах]]></value>
+	</item>
+	<item name="content">
+		<value xml:lang="ko"><![CDATA[내용]]></value>
+		<value xml:lang="en"><![CDATA[Content]]></value>
+		<value xml:lang="jp"><![CDATA[内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+		<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+		<value xml:lang="fr"><![CDATA[Contenu]]></value>
+		<value xml:lang="de"><![CDATA[Inhalt]]></value>
+		<value xml:lang="ru"><![CDATA[Содержание]]></value>
+		<value xml:lang="es"><![CDATA[Contenido]]></value>
+		<value xml:lang="tr"><![CDATA[İçerik]]></value>
+		<value xml:lang="vi"><![CDATA[Nội dung]]></value>
+		<value xml:lang="mn"><![CDATA[Агуулга]]></value>
+	</item>
+	<item name="document">
+		<value xml:lang="ko"><![CDATA[문서]]></value>
+		<value xml:lang="en"><![CDATA[Article]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文章]]></value>
+		<value xml:lang="zh-TW"><![CDATA[文章]]></value>
+		<value xml:lang="fr"><![CDATA[Document]]></value>
+		<value xml:lang="de"><![CDATA[Artikel]]></value>
+		<value xml:lang="ru"><![CDATA[Статьи]]></value>
+		<value xml:lang="es"><![CDATA[Documento]]></value>
+		<value xml:lang="tr"><![CDATA[Makale]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết]]></value>
+		<value xml:lang="mn"><![CDATA[Бичлэг]]></value>
+	</item>
+	<item name="comment">
+		<value xml:lang="ko"><![CDATA[댓글]]></value>
+		<value xml:lang="en"><![CDATA[Comment]]></value>
+		<value xml:lang="jp"><![CDATA[コメント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[評論]]></value>
+		<value xml:lang="fr"><![CDATA[Commentaire]]></value>
+		<value xml:lang="de"><![CDATA[Kommentar]]></value>
+		<value xml:lang="ru"><![CDATA[Комментарии]]></value>
+		<value xml:lang="es"><![CDATA[Comentario]]></value>
+		<value xml:lang="tr"><![CDATA[Yorum]]></value>
+		<value xml:lang="vi"><![CDATA[Bình luận]]></value>
+		<value xml:lang="mn"><![CDATA[Коммент]]></value>
+	</item>
+	<item name="description">
+		<value xml:lang="ko"><![CDATA[설명]]></value>
+		<value xml:lang="en"><![CDATA[Description]]></value>
+		<value xml:lang="jp"><![CDATA[説明]]></value>
+		<value xml:lang="zh-CN"><![CDATA[说明]]></value>
+		<value xml:lang="zh-TW"><![CDATA[說明]]></value>
+		<value xml:lang="de"><![CDATA[Beschreibung]]></value>
+		<value xml:lang="ru"><![CDATA[Описание]]></value>
+		<value xml:lang="es"><![CDATA[Descripción]]></value>
+		<value xml:lang="tr"><![CDATA[Tanım]]></value>
+		<value xml:lang="vi"><![CDATA[Mô tả]]></value>
+		<value xml:lang="mn"><![CDATA[Тайлбар]]></value>
+	</item>
+	<item name="trackback">
+		<value xml:lang="ko"><![CDATA[엮인글]]></value>
+		<value xml:lang="en"><![CDATA[Trackback]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバック]]></value>
+		<value xml:lang="zh-CN"><![CDATA[引用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[引用]]></value>
+		<value xml:lang="fr"><![CDATA[Rétrolien]]></value>
+		<value xml:lang="ru"><![CDATA[Трекбек]]></value>
+		<value xml:lang="de"><![CDATA[Трекбек]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izleme]]></value>
+		<value xml:lang="vi"><![CDATA[Liên kết Web]]></value>
+		<value xml:lang="mn"><![CDATA[Холбоотой бичлэг]]></value>
+	</item>
+	<item name="tag">
+		<value xml:lang="ko"><![CDATA[태그]]></value>
+		<value xml:lang="en"><![CDATA[Tag]]></value>
+		<value xml:lang="jp"><![CDATA[タグ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[标签]]></value>
+		<value xml:lang="zh-TW"><![CDATA[標籤]]></value>
+		<value xml:lang="de"><![CDATA[Etikett]]></value>
+		<value xml:lang="ru"><![CDATA[Тег]]></value>
+		<value xml:lang="es"><![CDATA[Etiqueta]]></value>
+		<value xml:lang="tr"><![CDATA[Etiket]]></value>
+		<value xml:lang="mn"><![CDATA[tag]]></value>
+	</item>
+	<item name="allow_comment">
+		<value xml:lang="ko"><![CDATA[댓글 허용]]></value>
+		<value xml:lang="en"><![CDATA[Allow Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメント許可]]></value>
+		<value xml:lang="zh-CN"><![CDATA[允许评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許回覆]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre Commentaires]]></value>
+		<value xml:lang="de"><![CDATA[Kommentar erlauben]]></value>
+		<value xml:lang="ru"><![CDATA[Позволить комментарии]]></value>
+		<value xml:lang="es"><![CDATA[Permitir Comentarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yorumlara izin ver]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép bình luận]]></value>
+		<value xml:lang="mn"><![CDATA[Коммент зөвшөөрнө]]></value>
+	</item>
+	<item name="lock_comment">
+		<value xml:lang="ko"><![CDATA[댓글 잠금]]></value>
+		<value xml:lang="en"><![CDATA[Block Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメントロック]]></value>
+		<value xml:lang="zh-CN"><![CDATA[关闭评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關閉回覆]]></value>
+		<value xml:lang="fr"><![CDATA[Bloquer Commentaires]]></value>
+		<value xml:lang="de"><![CDATA[Kommentar sperren]]></value>
+		<value xml:lang="ru"><![CDATA[Заблокировать комментарии]]></value>
+		<value xml:lang="es"><![CDATA[Bloquear Comentarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yorumları engelle]]></value>
+		<value xml:lang="vi"><![CDATA[Khóa bình luận]]></value>
+		<value xml:lang="mn"><![CDATA[Коммент түгжих]]></value>
+	</item>
+	<item name="allow_trackback">
+		<value xml:lang="ko"><![CDATA[엮인글 허용]]></value>
+		<value xml:lang="en"><![CDATA[Allow Trackbacks]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバック許可]]></value>
+		<value xml:lang="zh-CN"><![CDATA[允许引用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許引用]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre Rétrolien]]></value>
+		<value xml:lang="de"><![CDATA[Trackback erlauben]]></value>
+		<value xml:lang="ru"><![CDATA[Позволить трекбек]]></value>
+		<value xml:lang="es"><![CDATA[Permitir Trackback]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izlemelere izin ver]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép liên kết Web]]></value>
+		<value xml:lang="mn"><![CDATA[Холбоотой бичлэг зөвшөөрнө]]></value>
+	</item>
+	<item name="uploaded_file">
+		<value xml:lang="ko"><![CDATA[첨부]]></value>
+		<value xml:lang="en"><![CDATA[Attachment]]></value>
+		<value xml:lang="jp"><![CDATA[添付]]></value>
+		<value xml:lang="zh-CN"><![CDATA[附件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[附加檔案]]></value>
+		<value xml:lang="fr"><![CDATA[Fichier Attaché]]></value>
+		<value xml:lang="de"><![CDATA[Anlage]]></value>
+		<value xml:lang="ru"><![CDATA[Прикрепить файл]]></value>
+		<value xml:lang="es"><![CDATA[Archivos Adjuntos]]></value>
+		<value xml:lang="tr"><![CDATA[Ek]]></value>
+		<value xml:lang="vi"><![CDATA[File đã Upload]]></value>
+		<value xml:lang="mn"><![CDATA[Файл оруулах]]></value>
+	</item>
+	<item name="grant">
+		<value xml:lang="ko"><![CDATA[권한]]></value>
+		<value xml:lang="en"><![CDATA[Permission]]></value>
+		<value xml:lang="jp"><![CDATA[権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[權限]]></value>
+		<value xml:lang="de"><![CDATA[Zugriffsberechtigung]]></value>
+		<value xml:lang="ru"><![CDATA[Права доступа]]></value>
+		<value xml:lang="es"><![CDATA[Permisos]]></value>
+		<value xml:lang="tr"><![CDATA[İzin]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép]]></value>
+		<value xml:lang="mn"><![CDATA[Эрх]]></value>
+	</item>
+	<item name="target">
+		<value xml:lang="ko"><![CDATA[대상]]></value>
+		<value xml:lang="en"><![CDATA[Target]]></value>
+		<value xml:lang="jp"><![CDATA[対象]]></value>
+		<value xml:lang="zh-CN"><![CDATA[目标]]></value>
+		<value xml:lang="zh-TW"><![CDATA[目標]]></value>
+		<value xml:lang="fr"><![CDATA[Objet]]></value>
+		<value xml:lang="de"><![CDATA[Target]]></value>
+		<value xml:lang="ru"><![CDATA[Назначение]]></value>
+		<value xml:lang="es"><![CDATA[Para]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef]]></value>
+		<value xml:lang="vi"><![CDATA[Mục tiêu]]></value>
+		<value xml:lang="mn"><![CDATA[Зорилго]]></value>
+	</item>
+	<item name="total">
+		<value xml:lang="ko"><![CDATA[전체]]></value>
+		<value xml:lang="en"><![CDATA[Total]]></value>
+		<value xml:lang="jp"><![CDATA[すべて]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部]]></value>
+		<value xml:lang="de"><![CDATA[Gesamt]]></value>
+		<value xml:lang="ru"><![CDATA[Всего]]></value>
+		<value xml:lang="tr"><![CDATA[Toplam]]></value>
+		<value xml:lang="vi"><![CDATA[Tất cả]]></value>
+		<value xml:lang="mn"><![CDATA[Нийт]]></value>
+	</item>
+	<item name="total_count">
+		<value xml:lang="ko"><![CDATA[전체개수]]></value>
+		<value xml:lang="en"><![CDATA[Count Total]]></value>
+		<value xml:lang="jp"><![CDATA[トータル数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[总数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[總數]]></value>
+		<value xml:lang="fr"><![CDATA[Somme]]></value>
+		<value xml:lang="de"><![CDATA[Gesamtzahl]]></value>
+		<value xml:lang="ru"><![CDATA[Общее количество]]></value>
+		<value xml:lang="es"><![CDATA[Número total]]></value>
+		<value xml:lang="tr"><![CDATA[Toplamı hesapla]]></value>
+		<value xml:lang="vi"><![CDATA[Tổng số truy cập]]></value>
+		<value xml:lang="mn"><![CDATA[Нийт тоо]]></value>
+	</item>
+	<item name="ipaddress">
+		<value xml:lang="ko"><![CDATA[IP 주소]]></value>
+		<value xml:lang="en"><![CDATA[IP Address]]></value>
+		<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[IP地址]]></value>
+		<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
+		<value xml:lang="fr"><![CDATA[Addresse IP]]></value>
+		<value xml:lang="de"><![CDATA[IP-Adresse]]></value>
+		<value xml:lang="ru"><![CDATA[IP адрес]]></value>
+		<value xml:lang="es"><![CDATA[Dirección IP]]></value>
+		<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+		<value xml:lang="vi"><![CDATA[Địa chỉ IP]]></value>
+		<value xml:lang="mn"><![CDATA[IP хаяг]]></value>
+	</item>
+	<item name="path">
+		<value xml:lang="ko"><![CDATA[경로]]></value>
+		<value xml:lang="en"><![CDATA[Path]]></value>
+		<value xml:lang="jp"><![CDATA[パス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[路徑]]></value>
+		<value xml:lang="fr"><![CDATA[Chemin]]></value>
+		<value xml:lang="de"><![CDATA[Pfad]]></value>
+		<value xml:lang="ru"><![CDATA[Путь]]></value>
+		<value xml:lang="es"><![CDATA[Ruta]]></value>
+		<value xml:lang="tr"><![CDATA[Yol]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn]]></value>
+		<value xml:lang="mn"><![CDATA[Байрлал]]></value>
+	</item>
+	<item name="cart">
+		<value xml:lang="ko"><![CDATA[선택항목]]></value>
+		<value xml:lang="en"><![CDATA[Selected Item]]></value>
+		<value xml:lang="jp"><![CDATA[選択項目]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择项目]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇項目]]></value>
+		<value xml:lang="fr"><![CDATA[Article Choisi]]></value>
+		<value xml:lang="de"><![CDATA[Ausgewähltes Element]]></value>
+		<value xml:lang="ru"><![CDATA[Выбранный объект]]></value>
+		<value xml:lang="es"><![CDATA[Artículo Seleccionado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili Öğe]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn bài]]></value>
+		<value xml:lang="mn"><![CDATA[Сонгосон төрөл]]></value>
+	</item>
+	<item name="friend">
+		<value xml:lang="ko"><![CDATA[친구]]></value>
+		<value xml:lang="en"><![CDATA[Friends]]></value>
+		<value xml:lang="jp"><![CDATA[友達]]></value>
+		<value xml:lang="zh-CN"><![CDATA[好友]]></value>
+		<value xml:lang="zh-TW"><![CDATA[好友]]></value>
+		<value xml:lang="fr"><![CDATA[Les Amis]]></value>
+		<value xml:lang="de"><![CDATA[Freunde]]></value>
+		<value xml:lang="ru"><![CDATA[Друзья]]></value>
+		<value xml:lang="es"><![CDATA[Amigos]]></value>
+		<value xml:lang="tr"><![CDATA[Arkadaşlar]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn bè]]></value>
+		<value xml:lang="mn"><![CDATA[Найз]]></value>
+	</item>
+	<item name="notify">
+		<value xml:lang="ko"><![CDATA[알림]]></value>
+		<value xml:lang="en"><![CDATA[Notification]]></value>
+		<value xml:lang="jp"><![CDATA[アラート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[通告]]></value>
+		<value xml:lang="zh-TW"><![CDATA[通知]]></value>
+		<value xml:lang="fr"><![CDATA[Annoncer]]></value>
+		<value xml:lang="de"><![CDATA[Bekanntmachung]]></value>
+		<value xml:lang="ru"><![CDATA[Уведомление]]></value>
+		<value xml:lang="es"><![CDATA[Notificación]]></value>
+		<value xml:lang="tr"><![CDATA[Bildirim]]></value>
+		<value xml:lang="vi"><![CDATA[Thông báo]]></value>
+		<value xml:lang="mn"><![CDATA[Мэдээлэх]]></value>
+	</item>
+	<item name="order_target">
+		<value xml:lang="ko"><![CDATA[정렬대상]]></value>
+		<value xml:lang="en"><![CDATA[Target to be sorted]]></value>
+		<value xml:lang="jp"><![CDATA[ソート対象]]></value>
+		<value xml:lang="zh-CN"><![CDATA[排序对象]]></value>
+		<value xml:lang="zh-TW"><![CDATA[排列目標]]></value>
+		<value xml:lang="de"><![CDATA[Target ordnen]]></value>
+		<value xml:lang="es"><![CDATA[Alinear Meta]]></value>
+		<value xml:lang="tr"><![CDATA[Hedefi hizala]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn đích]]></value>
+		<value xml:lang="mn"><![CDATA[Цэгцлэх зорилго]]></value>
+	</item>
+	<item name="order_type">
+		<value xml:lang="ko"><![CDATA[정렬방법]]></value>
+		<value xml:lang="en"><![CDATA[Sorting Type]]></value>
+		<value xml:lang="jp"><![CDATA[ソート方法]]></value>
+		<value xml:lang="zh-CN"><![CDATA[排序方式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[排列方式]]></value>
+		<value xml:lang="de"><![CDATA[Typ ordnen]]></value>
+		<value xml:lang="ru"><![CDATA[Тип сортировки]]></value>
+		<value xml:lang="es"><![CDATA[Tipo de Ordenación]]></value>
+		<value xml:lang="tr"><![CDATA[Sıralama Şekli]]></value>
+		<value xml:lang="vi"><![CDATA[Phân loại theo định dạng]]></value>
+		<value xml:lang="mn"><![CDATA[Цэгцлэх арга]]></value>
+	</item>
+	<item name="order_asc">
+		<value xml:lang="ko"><![CDATA[오름차순]]></value>
+		<value xml:lang="en"><![CDATA[Ascend]]></value>
+		<value xml:lang="jp"><![CDATA[昇順]]></value>
+		<value xml:lang="zh-CN"><![CDATA[升序]]></value>
+		<value xml:lang="zh-TW"><![CDATA[升冪]]></value>
+		<value xml:lang="fr"><![CDATA[Ascend]]></value>
+		<value xml:lang="de"><![CDATA[Aufstieg]]></value>
+		<value xml:lang="ru"><![CDATA[снизу вверх]]></value>
+		<value xml:lang="es"><![CDATA[ascendente]]></value>
+		<value xml:lang="tr"><![CDATA[Artan]]></value>
+		<value xml:lang="vi"><![CDATA[Tăng dần]]></value>
+		<value xml:lang="mn"><![CDATA[Багаас ихрүү]]></value>
+	</item>
+	<item name="order_desc">
+		<value xml:lang="ko"><![CDATA[내림차순]]></value>
+		<value xml:lang="en"><![CDATA[Descend]]></value>
+		<value xml:lang="jp"><![CDATA[降順]]></value>
+		<value xml:lang="zh-CN"><![CDATA[倒序]]></value>
+		<value xml:lang="zh-TW"><![CDATA[降冪]]></value>
+		<value xml:lang="fr"><![CDATA[Descendre]]></value>
+		<value xml:lang="de"><![CDATA[Abstieg]]></value>
+		<value xml:lang="ru"><![CDATA[сверху вниз]]></value>
+		<value xml:lang="es"><![CDATA[descendente]]></value>
+		<value xml:lang="tr"><![CDATA[Azalan]]></value>
+		<value xml:lang="vi"><![CDATA[Giảm dần]]></value>
+		<value xml:lang="mn"><![CDATA[Ихээс бага руу]]></value>
+	</item>
+	<item name="file">
+		<value xml:lang="ko"><![CDATA[파일]]></value>
+		<value xml:lang="en"><![CDATA[File]]></value>
+		<value xml:lang="jp"><![CDATA[ファイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案]]></value>
+		<value xml:lang="de"><![CDATA[Datei]]></value>
+		<value xml:lang="ru"><![CDATA[файл]]></value>
+		<value xml:lang="tr"><![CDATA[Dosya]]></value>
+	</item>
+	<item name="mid">
+		<value xml:lang="ko"><![CDATA[모듈 이름]]></value>
+		<value xml:lang="en"><![CDATA[Module Name]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom]]></value>
+		<value xml:lang="de"><![CDATA[Modul]]></value>
+		<value xml:lang="ru"><![CDATA[Имя Модуля]]></value>
+		<value xml:lang="es"><![CDATA[ID del Módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Module]]></value>
+		<value xml:lang="mn"><![CDATA[Модиул нэр]]></value>
+	</item>
+	<item name="sid">
+		<value xml:lang="ko"><![CDATA[가상 사이트 이름]]></value>
+		<value xml:lang="en"><![CDATA[Virtual Site Name]]></value>
+		<value xml:lang="jp"><![CDATA[バーチャルサイト名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[站点名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[網站名稱]]></value>
+		<value xml:lang="de"><![CDATA[Name virtueller Seite]]></value>
+		<value xml:lang="tr"><![CDATA[Site Adı]]></value>
+		<value xml:lang="mn"><![CDATA[Тvр сайтын нэр]]></value>
+	</item>
+	<item name="layout">
+		<value xml:lang="ko"><![CDATA[레이아웃]]></value>
+		<value xml:lang="en"><![CDATA[Layout]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面]]></value>
+		<value xml:lang="fr"><![CDATA[Mise en Page]]></value>
+		<value xml:lang="de"><![CDATA[Layout]]></value>
+		<value xml:lang="ru"><![CDATA[Лейаут]]></value>
+		<value xml:lang="es"><![CDATA[Composición]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzeni]]></value>
+		<value xml:lang="vi"><![CDATA[Giao diện]]></value>
+		<value xml:lang="mn"><![CDATA[Лэйаут]]></value>
+	</item>
+	<item name="mobile_layout">
+		<value xml:lang="ko"><![CDATA[모바일 레이아웃]]></value>
+		<value xml:lang="jp"><![CDATA[モバイルレイアウト]]></value>
+		<value xml:lang="en"><![CDATA[Mobile Layout]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动版布局]]></value>
+		<value xml:lang="zh-TW"><![CDATA[手機版面]]></value>
+		<value xml:lang="de"><![CDATA[Layout für Mobile]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli Yerleşim düzeni]]></value>
+	</item>
+	<item name="widget">
+		<value xml:lang="ko"><![CDATA[위젯 ]]></value>
+		<value xml:lang="en"><![CDATA[Widget]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェット]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件 ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget]]></value>
+		<value xml:lang="fr"><![CDATA[Gadget]]></value>
+		<value xml:lang="de"><![CDATA[Widget]]></value>
+		<value xml:lang="ru"><![CDATA[Виджет]]></value>
+		<value xml:lang="mn"><![CDATA[Вижет ]]></value>
+	</item>
+	<item name="module">
+		<value xml:lang="ko"><![CDATA[모듈]]></value>
+		<value xml:lang="en"><![CDATA[Module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組]]></value>
+		<value xml:lang="de"><![CDATA[Modul]]></value>
+		<value xml:lang="ru"><![CDATA[Модуль]]></value>
+		<value xml:lang="es"><![CDATA[Módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Modül]]></value>
+		<value xml:lang="mn"><![CDATA[Модиул]]></value>
+	</item>
+	<item name="skin">
+		<value xml:lang="ko"><![CDATA[스킨]]></value>
+		<value xml:lang="en"><![CDATA[Theme]]></value>
+		<value xml:lang="jp"><![CDATA[スキン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[皮肤]]></value>
+		<value xml:lang="zh-TW"><![CDATA[佈景]]></value>
+		<value xml:lang="fr"><![CDATA[Habillage]]></value>
+		<value xml:lang="de"><![CDATA[Oberfläche]]></value>
+		<value xml:lang="ru"><![CDATA[Тема]]></value>
+		<value xml:lang="es"><![CDATA[Tema]]></value>
+		<value xml:lang="tr"><![CDATA[Dış Görünüm]]></value>
+		<value xml:lang="vi"><![CDATA[Skin]]></value>
+		<value xml:lang="mn"><![CDATA[Скин]]></value>
+	</item>
+	<item name="mobile_skin">
+		<value xml:lang="ko"><![CDATA[모바일 스킨]]></value>
+		<value xml:lang="en"><![CDATA[Mobile Theme]]></value>
+		<value xml:lang="jp"><![CDATA[モバイルスキン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动版皮肤]]></value>
+		<value xml:lang="zh-TW"><![CDATA[手機佈景]]></value>
+		<value xml:lang="fr"><![CDATA[Mobile Habillage]]></value>
+		<value xml:lang="de"><![CDATA[Oberfläche zum Mobile]]></value>
+		<value xml:lang="es"><![CDATA[Mobile Tema]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli Dış Görünümü]]></value>
+		<value xml:lang="vi"><![CDATA[Mobile Skin]]></value>
+	</item>
+	<item name="colorset">
+		<value xml:lang="ko"><![CDATA[컬러셋]]></value>
+		<value xml:lang="en"><![CDATA[Colorset]]></value>
+		<value xml:lang="jp"><![CDATA[カラーセット]]></value>
+		<value xml:lang="zh-CN"><![CDATA[颜色设定]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顏色設定]]></value>
+		<value xml:lang="fr"><![CDATA[Arrangement de couleur]]></value>
+		<value xml:lang="de"><![CDATA[Frabsatz]]></value>
+		<value xml:lang="ru"><![CDATA[Цветовой набор]]></value>
+		<value xml:lang="es"><![CDATA[Conjunto de Colores]]></value>
+		<value xml:lang="tr"><![CDATA[Renk kurulumu]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo màu]]></value>
+		<value xml:lang="mn"><![CDATA[Өнгө тохируулах]]></value>
+	</item>
+	<item name="extra_vars">
+		<value xml:lang="ko"><![CDATA[확장변수]]></value>
+		<value xml:lang="en"><![CDATA[Extra Vars]]></value>
+		<value xml:lang="jp"><![CDATA[拡張変数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[扩展变量]]></value>
+		<value xml:lang="zh-TW"><![CDATA[延伸變數]]></value>
+		<value xml:lang="fr"><![CDATA[Variables Supplémentaires]]></value>
+		<value xml:lang="de"><![CDATA[zusätzliche Variablen]]></value>
+		<value xml:lang="ru"><![CDATA[Дополнительные переменные.]]></value>
+		<value xml:lang="es"><![CDATA[Variables Extra]]></value>
+		<value xml:lang="tr"><![CDATA[Ek değişkenler]]></value>
+		<value xml:lang="vi"><![CDATA[Bổ xung]]></value>
+		<value xml:lang="mn"><![CDATA[Өргөжүүлэх тоо]]></value>
+	</item>
+	<item name="domain">
+		<value xml:lang="ko"><![CDATA[도메인]]></value>
+		<value xml:lang="en"><![CDATA[Domain Name]]></value>
+		<value xml:lang="jp"><![CDATA[ドメイン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[域名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[域名]]></value>
+		<value xml:lang="de"><![CDATA[Domainname]]></value>
+		<value xml:lang="ru"><![CDATA[Доменное имя]]></value>
+		<value xml:lang="tr"><![CDATA[Alan adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên miền]]></value>
+		<value xml:lang="mn"><![CDATA[Domain]]></value>
+	</item>
+	<item name="url">
+		<value xml:lang="ko"><![CDATA[URL]]></value>
+		<value xml:lang="en"><![CDATA[URL]]></value>
+		<value xml:lang="jp"><![CDATA[URL]]></value>
+		<value xml:lang="zh-TW"><![CDATA[網址]]></value>
+		<value xml:lang="de"><![CDATA[URL-Adresse]]></value>
+	</item>
+	<item name="document_url">
+		<value xml:lang="ko"><![CDATA[게시글 주소]]></value>
+		<value xml:lang="en"><![CDATA[Article URL]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みＵＲＬ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文章地址]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連結網址]]></value>
+		<value xml:lang="fr"><![CDATA[Document URL]]></value>
+		<value xml:lang="de"><![CDATA[URL-Adresse des Artikels]]></value>
+		<value xml:lang="ru"><![CDATA[URL записи]]></value>
+		<value xml:lang="es"><![CDATA[URL del Documento]]></value>
+		<value xml:lang="tr"><![CDATA[Yazı URL'si]]></value>
+		<value xml:lang="vi"><![CDATA[URL bài viết]]></value>
+		<value xml:lang="mn"><![CDATA[Бичлэгийн хаяг]]></value>
+	</item>
+	<item name="trackback_url">
+		<value xml:lang="ko"><![CDATA[엮인글 주소]]></value>
+		<value xml:lang="en"><![CDATA[Trackback URL]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバックＵＲＬ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[引用地址]]></value>
+		<value xml:lang="zh-TW"><![CDATA[引用位址]]></value>
+		<value xml:lang="fr"><![CDATA[Rétrolien URL]]></value>
+		<value xml:lang="de"><![CDATA[URL-Adresse des Trackbacks]]></value>
+		<value xml:lang="ru"><![CDATA[URL трекбека]]></value>
+		<value xml:lang="es"><![CDATA[URL del Trackback]]></value>
+		<value xml:lang="tr"><![CDATA[Geri İzleme URL'si]]></value>
+		<value xml:lang="vi"><![CDATA[URL liên kết Web]]></value>
+		<value xml:lang="mn"><![CDATA[Холбоотой бичлэгний хаяг]]></value>
+	</item>
+	<item name="blog_name">
+		<value xml:lang="ko"><![CDATA[블로그 이름]]></value>
+		<value xml:lang="en"><![CDATA[Blog Title]]></value>
+		<value xml:lang="jp"><![CDATA[ブログ名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[博客名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[部落格名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom du Blogue]]></value>
+		<value xml:lang="de"><![CDATA[Blogtitel]]></value>
+		<value xml:lang="ru"><![CDATA[Название блога]]></value>
+		<value xml:lang="es"><![CDATA[Titulo del Blog]]></value>
+		<value xml:lang="tr"><![CDATA[Blog Başlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Blog]]></value>
+		<value xml:lang="mn"><![CDATA[Блог нэр]]></value>
+	</item>
+	<item name="excerpt">
+		<value xml:lang="ko"><![CDATA[발췌]]></value>
+		<value xml:lang="en"><![CDATA[Quotation]]></value>
+		<value xml:lang="jp"><![CDATA[抜粋]]></value>
+		<value xml:lang="zh-CN"><![CDATA[载自]]></value>
+		<value xml:lang="zh-TW"><![CDATA[轉載自]]></value>
+		<value xml:lang="fr"><![CDATA[Extrait]]></value>
+		<value xml:lang="de"><![CDATA[Exzerpt]]></value>
+		<value xml:lang="ru"><![CDATA[Цитата]]></value>
+		<value xml:lang="es"><![CDATA[Extracto]]></value>
+		<value xml:lang="tr"><![CDATA[Alıntı]]></value>
+		<value xml:lang="vi"><![CDATA[Trích]]></value>
+		<value xml:lang="mn"><![CDATA[excerpt]]></value>
+	</item>
+	<item name="document_count">
+		<value xml:lang="ko"><![CDATA[글 수]]></value>
+		<value xml:lang="en"><![CDATA[Articles]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[帖子数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[文章數量]]></value>
+		<value xml:lang="fr"><![CDATA[ Documents]]></value>
+		<value xml:lang="de"><![CDATA[Anzahl des Artikels]]></value>
+		<value xml:lang="ru"><![CDATA[Всего записей]]></value>
+		<value xml:lang="es"><![CDATA[Número de documentos]]></value>
+		<value xml:lang="tr"><![CDATA[Toplam yazılar]]></value>
+		<value xml:lang="vi"><![CDATA[Số bài viết: ]]></value>
+		<value xml:lang="mn"><![CDATA[Бичлэгийн тоо]]></value>
+	</item>
+	<item name="page_count">
+		<value xml:lang="ko"><![CDATA[페이지 수]]></value>
+		<value xml:lang="en"><![CDATA[Pages]]></value>
+		<value xml:lang="jp"><![CDATA[ページ数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[页数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[頁數]]></value>
+		<value xml:lang="fr"><![CDATA[Pages]]></value>
+		<value xml:lang="de"><![CDATA[Seitenzahl]]></value>
+		<value xml:lang="ru"><![CDATA[Количество страниц]]></value>
+		<value xml:lang="es"><![CDATA[Número de páginas]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfa Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số trang]]></value>
+		<value xml:lang="mn"><![CDATA[Хуудасны тоо]]></value>
+	</item>
+	<item name="list_count">
+		<value xml:lang="ko"><![CDATA[목록 수]]></value>
+		<value xml:lang="en"><![CDATA[Lists]]></value>
+		<value xml:lang="jp"><![CDATA[リスト数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[目录数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[列表數]]></value>
+		<value xml:lang="fr"><![CDATA[Item]]></value>
+		<value xml:lang="de"><![CDATA[Anzahl der Liste]]></value>
+		<value xml:lang="ru"><![CDATA[Количество списков]]></value>
+		<value xml:lang="es"><![CDATA[Número de listas]]></value>
+		<value xml:lang="tr"><![CDATA[Liste Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số danh sách]]></value>
+		<value xml:lang="mn"><![CDATA[Жагсаалтын тоо]]></value>
+	</item>
+	<item name="search_list_count">
+		<value xml:lang="ko"><![CDATA[검색 목록 수]]></value>
+		<value xml:lang="en"><![CDATA[Search Lists]]></value>
+		<value xml:lang="jp"><![CDATA[検索リスト数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[搜索目录数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋列表數]]></value>
+		<value xml:lang="fr"><![CDATA[Trouvés]]></value>
+		<value xml:lang="de"><![CDATA[Anzahl der Liste finden]]></value>
+		<value xml:lang="ru"><![CDATA[Поиск Список кол]]></value>
+		<value xml:lang="es"><![CDATA[Buscar lista Conde]]></value>
+		<value xml:lang="tr"><![CDATA[Liste Sayısı ara]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm kiếm danh sách]]></value>
+		<value xml:lang="mn"><![CDATA[Хайлтын жагсаалт]]></value>
+	</item>
+	<item name="readed_count">
+		<value xml:lang="ko"><![CDATA[조회 수]]></value>
+		<value xml:lang="en"><![CDATA[Views]]></value>
+		<value xml:lang="jp"><![CDATA[閲覧数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點閱]]></value>
+		<value xml:lang="fr"><![CDATA[ Vues]]></value>
+		<value xml:lang="de"><![CDATA[gelesen]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотры]]></value>
+		<value xml:lang="es"><![CDATA[Leídos]]></value>
+		<value xml:lang="tr"><![CDATA[Görüntülenme]]></value>
+		<value xml:lang="vi"><![CDATA[Đã xem]]></value>
+		<value xml:lang="mn"><![CDATA[Уншсан]]></value>
+	</item>
+	<item name="voted_count">
+		<value xml:lang="ko"><![CDATA[추천 수]]></value>
+		<value xml:lang="en"><![CDATA[Votes]]></value>
+		<value xml:lang="jp"><![CDATA[推薦数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[推荐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[推薦]]></value>
+		<value xml:lang="fr"><![CDATA[Recommandés]]></value>
+		<value xml:lang="de"><![CDATA[Anzahl der Abstimmungen]]></value>
+		<value xml:lang="ru"><![CDATA[Голоса]]></value>
+		<value xml:lang="es"><![CDATA[Recomendados]]></value>
+		<value xml:lang="tr"><![CDATA[Oylar]]></value>
+		<value xml:lang="vi"><![CDATA[Lượt bình chọn]]></value>
+		<value xml:lang="mn"><![CDATA[vote]]></value>
+	</item>
+	<item name="comment_count">
+		<value xml:lang="ko"><![CDATA[댓글 수]]></value>
+		<value xml:lang="en"><![CDATA[Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメント数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[回覆數]]></value>
+		<value xml:lang="fr"><![CDATA[Commentaires]]></value>
+		<value xml:lang="de"><![CDATA[Anzahl der Kommentare]]></value>
+		<value xml:lang="ru"><![CDATA[Комментарии]]></value>
+		<value xml:lang="es"><![CDATA[Comentarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yorumlar]]></value>
+		<value xml:lang="vi"><![CDATA[Bình luận]]></value>
+		<value xml:lang="mn"><![CDATA[Комментын тоо]]></value>
+	</item>
+	<item name="member_count">
+		<value xml:lang="ko"><![CDATA[회원 수]]></value>
+		<value xml:lang="en"><![CDATA[Members]]></value>
+		<value xml:lang="jp"><![CDATA[会員数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員人數]]></value>
+		<value xml:lang="fr"><![CDATA[Membres]]></value>
+		<value xml:lang="de"><![CDATA[Anzahl der Mitglieder]]></value>
+		<value xml:lang="ru"><![CDATA[Количество пользователей]]></value>
+		<value xml:lang="es"><![CDATA[Número de usuarios]]></value>
+		<value xml:lang="tr"><![CDATA[Üye sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số thành viên]]></value>
+		<value xml:lang="mn"><![CDATA[Гишүүдийн тоо]]></value>
+	</item>
+	<item name="date">
+		<value xml:lang="ko"><![CDATA[날짜]]></value>
+		<value xml:lang="en"><![CDATA[Date]]></value>
+		<value xml:lang="jp"><![CDATA[日付]]></value>
+		<value xml:lang="zh-CN"><![CDATA[日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[日期]]></value>
+		<value xml:lang="fr"><![CDATA[Jour]]></value>
+		<value xml:lang="de"><![CDATA[Datum]]></value>
+		<value xml:lang="ru"><![CDATA[Дата]]></value>
+		<value xml:lang="es"><![CDATA[Fecha]]></value>
+		<value xml:lang="tr"><![CDATA[Tarih]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+	</item>
+	<item name="regdate">
+		<value xml:lang="ko"><![CDATA[등록일]]></value>
+		<value xml:lang="en"><![CDATA[Registered Date]]></value>
+		<value xml:lang="jp"><![CDATA[登録日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[登录日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[登錄日期]]></value>
+		<value xml:lang="fr"><![CDATA[Enrégistré]]></value>
+		<value xml:lang="de"><![CDATA[Eingetragenes Datum]]></value>
+		<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Fecha de Publicación]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt Tarihi]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+		<value xml:lang="mn"><![CDATA[Оруулсан өдөр]]></value>
+	</item>
+	<item name="last_update">
+		<value xml:lang="ko"><![CDATA[최근 수정일]]></value>
+		<value xml:lang="en"><![CDATA[Last Update]]></value>
+		<value xml:lang="jp"><![CDATA[最終修正日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最后更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最後更新]]></value>
+		<value xml:lang="fr"><![CDATA[Dernière Mise à Jour]]></value>
+		<value xml:lang="de"><![CDATA[Letzte Aktualisierung]]></value>
+		<value xml:lang="ru"><![CDATA[Последнее обновление]]></value>
+		<value xml:lang="es"><![CDATA[Ultima actualización]]></value>
+		<value xml:lang="tr"><![CDATA[Son Güncelleme]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật lần cuối]]></value>
+		<value xml:lang="mn"><![CDATA[Сүүлд засварласан өдөр]]></value>
+	</item>
+	<item name="last_post">
+		<value xml:lang="ko"><![CDATA[마지막 댓글]]></value>
+		<value xml:lang="en"><![CDATA[Last Comment]]></value>
+		<value xml:lang="jp"><![CDATA[最後のコメント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最后更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最後發表]]></value>
+		<value xml:lang="fr"><![CDATA[Dernière Affichage]]></value>
+		<value xml:lang="de"><![CDATA[Letztes Kommentar]]></value>
+		<value xml:lang="ru"><![CDATA[Последний комментарий]]></value>
+		<value xml:lang="es"><![CDATA[Ultimo mensaje]]></value>
+		<value xml:lang="tr"><![CDATA[Son mesaj]]></value>
+		<value xml:lang="vi"><![CDATA[Bài mới nhất]]></value>
+		<value xml:lang="mn"><![CDATA[Хамгийн сүүлд оруулсан]]></value>
+	</item>
+	<item name="signup_date">
+		<value xml:lang="ko"><![CDATA[가입일]]></value>
+		<value xml:lang="en"><![CDATA[Signup Date]]></value>
+		<value xml:lang="jp"><![CDATA[登録日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊日期]]></value>
+		<value xml:lang="fr"><![CDATA[Inscription]]></value>
+		<value xml:lang="de"><![CDATA[Beitrittsdatum]]></value>
+		<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Fecha del Registro]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt Tarihi]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày đăng kí]]></value>
+		<value xml:lang="mn"><![CDATA[Бүртгүүлсэн өдөр]]></value>
+	</item>
+	<item name="last_login">
+		<value xml:lang="ko"><![CDATA[최근 로그인]]></value>
+		<value xml:lang="en"><![CDATA[Last Signin]]></value>
+		<value xml:lang="jp"><![CDATA[最終ログイン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最近登录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最近登入]]></value>
+		<value xml:lang="fr"><![CDATA[Dernière connexion]]></value>
+		<value xml:lang="de"><![CDATA[Letztes Einloggen]]></value>
+		<value xml:lang="ru"><![CDATA[Последний вход]]></value>
+		<value xml:lang="es"><![CDATA[Ultima conexión]]></value>
+		<value xml:lang="tr"><![CDATA[Son Giriş]]></value>
+		<value xml:lang="vi"><![CDATA[Lần cuối đăng nhập]]></value>
+		<value xml:lang="mn"><![CDATA[Хамгийн сүүлд нэвтэрсэн]]></value>
+	</item>
+	<item name="first_page">
+		<value xml:lang="ko"><![CDATA[첫 페이지]]></value>
+		<value xml:lang="en"><![CDATA[First Page]]></value>
+		<value xml:lang="jp"><![CDATA[最初のページ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[第一页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[第一頁]]></value>
+		<value xml:lang="fr"><![CDATA[Première Page]]></value>
+		<value xml:lang="de"><![CDATA[Erste Seite]]></value>
+		<value xml:lang="ru"><![CDATA[Первая страница]]></value>
+		<value xml:lang="es"><![CDATA[Primera página]]></value>
+		<value xml:lang="tr"><![CDATA[İlk sayfa]]></value>
+		<value xml:lang="vi"><![CDATA[Trang trước]]></value>
+		<value xml:lang="mn"><![CDATA[Эхний хуудас]]></value>
+	</item>
+	<item name="last_page">
+		<value xml:lang="ko"><![CDATA[끝 페이지]]></value>
+		<value xml:lang="en"><![CDATA[Last Page]]></value>
+		<value xml:lang="jp"><![CDATA[最後のページ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最后一页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最後頁]]></value>
+		<value xml:lang="fr"><![CDATA[Dernière Page]]></value>
+		<value xml:lang="de"><![CDATA[Letzte Seite]]></value>
+		<value xml:lang="ru"><![CDATA[Последняя страница]]></value>
+		<value xml:lang="es"><![CDATA[Ultima página]]></value>
+		<value xml:lang="tr"><![CDATA[Son sayfa]]></value>
+		<value xml:lang="vi"><![CDATA[Trang sau]]></value>
+		<value xml:lang="mn"><![CDATA[Сүүлчийн хуудас]]></value>
+	</item>
+	<item name="search_target">
+		<value xml:lang="ko"><![CDATA[검색대상]]></value>
+		<value xml:lang="en"><![CDATA[Target for Search]]></value>
+		<value xml:lang="jp"><![CDATA[検索対象]]></value>
+		<value xml:lang="zh-CN"><![CDATA[搜索目标]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋目標]]></value>
+		<value xml:lang="fr"><![CDATA[Champ à Rechercher]]></value>
+		<value xml:lang="de"><![CDATA[Target finden]]></value>
+		<value xml:lang="ru"><![CDATA[Назначение поиска]]></value>
+		<value xml:lang="es"><![CDATA[Campo a buscar]]></value>
+		<value xml:lang="tr"><![CDATA[Arama hedefi]]></value>
+		<value xml:lang="vi"><![CDATA[Khu vực tìm kiếm]]></value>
+		<value xml:lang="mn"><![CDATA[Хайх зорилго]]></value>
+	</item>
+	<item name="search_keyword">
+		<value xml:lang="ko"><![CDATA[검색어]]></value>
+		<value xml:lang="en"><![CDATA[Keyword]]></value>
+		<value xml:lang="jp"><![CDATA[キーワード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[关键字]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關鍵字]]></value>
+		<value xml:lang="fr"><![CDATA[Mot-clé à Rechercher]]></value>
+		<value xml:lang="de"><![CDATA[Stichwort]]></value>
+		<value xml:lang="ru"><![CDATA[Ключевые слова]]></value>
+		<value xml:lang="es"><![CDATA[Palabra a buscar]]></value>
+		<value xml:lang="tr"><![CDATA[Anahtar sözcük]]></value>
+		<value xml:lang="vi"><![CDATA[Từ khóa]]></value>
+		<value xml:lang="mn"><![CDATA[Хайх үг]]></value>
+	</item>
+	<item name="is_default">
+		<value xml:lang="ko"><![CDATA[기본]]></value>
+		<value xml:lang="en"><![CDATA[Default]]></value>
+		<value xml:lang="jp"><![CDATA[デフォルト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[默认]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預設]]></value>
+		<value xml:lang="fr"><![CDATA[Par Défaut]]></value>
+		<value xml:lang="de"><![CDATA[Standard]]></value>
+		<value xml:lang="ru"><![CDATA[По умолчанию]]></value>
+		<value xml:lang="es"><![CDATA[Por defecto]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan]]></value>
+		<value xml:lang="vi"><![CDATA[Mặc định]]></value>
+		<value xml:lang="mn"><![CDATA[Үндсэн]]></value>
+	</item>
+	<item name="no_documents">
+		<value xml:lang="ko"><![CDATA[등록된 글이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No Articles]]></value>
+		<value xml:lang="jp"><![CDATA[登録された書き込みがありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[现没有主题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[目前沒有主題]]></value>
+		<value xml:lang="fr"><![CDATA[Nul Document]]></value>
+		<value xml:lang="de"><![CDATA[Kein Artikel]]></value>
+		<value xml:lang="ru"><![CDATA[Нет записей]]></value>
+		<value xml:lang="es"><![CDATA[Sin documento]]></value>
+		<value xml:lang="tr"><![CDATA[Yazı yok]]></value>
+		<value xml:lang="vi"><![CDATA[Chưa có bài viết nào.]]></value>
+		<value xml:lang="mn"><![CDATA[Оруулсан бичлэг байхгүй]]></value>
+	</item>
+	<item name="board_manager">
+		<value xml:lang="ko"><![CDATA[게시판 관리]]></value>
+		<value xml:lang="en"><![CDATA[Board Settings]]></value>
+		<value xml:lang="jp"><![CDATA[掲示板管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版面管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[討論板管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administration des Panneaux]]></value>
+		<value xml:lang="de"><![CDATA[Forum verwalten]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки форума]]></value>
+		<value xml:lang="es"><![CDATA[Adm. Tableros]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetim Ayarları]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý Board]]></value>
+		<value xml:lang="mn"><![CDATA[Board удирдах]]></value>
+	</item>
+	<item name="member_manager">
+		<value xml:lang="ko"><![CDATA[회원 관리]]></value>
+		<value xml:lang="en"><![CDATA[Member Settings]]></value>
+		<value xml:lang="jp"><![CDATA[会員管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administration des Membres]]></value>
+		<value xml:lang="de"><![CDATA[Mitglied verwalten]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки пользователей]]></value>
+		<value xml:lang="es"><![CDATA[Adm. Usuarios]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Ayarları]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý thành viên]]></value>
+		<value xml:lang="mn"><![CDATA[Гишүүн удирдах]]></value>
+	</item>
+	<item name="layout_manager">
+		<value xml:lang="ko"><![CDATA[레이아웃 관리]]></value>
+		<value xml:lang="en"><![CDATA[Layout Settings]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administration des Mises en Page]]></value>
+		<value xml:lang="de"><![CDATA[Layout Einstellung]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки лейаута]]></value>
+		<value xml:lang="es"><![CDATA[Adm. Diseños]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzeni ayarları]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý giao diện]]></value>
+		<value xml:lang="mn"><![CDATA[Лэйаут удирдах]]></value>
+	</item>
+	<item name="use">
+		<value xml:lang="ko"><![CDATA[사용]]></value>
+		<value xml:lang="en"><![CDATA[Use]]></value>
+		<value xml:lang="jp"><![CDATA[使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用]]></value>
+		<value xml:lang="fr"><![CDATA[Utiliser]]></value>
+		<value xml:lang="de"><![CDATA[verwenden]]></value>
+		<value xml:lang="ru"><![CDATA[Использовать]]></value>
+		<value xml:lang="es"><![CDATA[Usar]]></value>
+		<value xml:lang="tr"><![CDATA[Etkin]]></value>
+		<value xml:lang="vi"><![CDATA[Sử dụng]]></value>
+		<value xml:lang="mn"><![CDATA[Хэрэглэх]]></value>
+	</item>
+	<item name="notuse">
+		<value xml:lang="ko"><![CDATA[미사용]]></value>
+		<value xml:lang="en"><![CDATA[Not use]]></value>
+		<value xml:lang="jp"><![CDATA[未使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[未使用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[未使用]]></value>
+		<value xml:lang="fr"><![CDATA[Pas Utilisé]]></value>
+		<value xml:lang="de"><![CDATA[nicht verwenden]]></value>
+		<value xml:lang="ru"><![CDATA[Не использовать]]></value>
+		<value xml:lang="es"><![CDATA[No usar]]></value>
+		<value xml:lang="tr"><![CDATA[Devredışı]]></value>
+		<value xml:lang="vi"><![CDATA[Không sử dụng]]></value>
+		<value xml:lang="mn"><![CDATA[Хэрэглэхгүй]]></value>
+	</item>
+	<item name="on">
+		<value xml:lang="ko"><![CDATA[켜짐]]></value>
+		<value xml:lang="en"><![CDATA[On]]></value>
+		<value xml:lang="jp"><![CDATA[オン]]></value>
+		<value xml:lang="zh-TW"><![CDATA[開啟]]></value>
+		<value xml:lang="de"><![CDATA[An]]></value>
+	</item>
+	<item name="off">
+		<value xml:lang="ko"><![CDATA[꺼짐]]></value>
+		<value xml:lang="en"><![CDATA[Off]]></value>
+		<value xml:lang="jp"><![CDATA[オフ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關閉]]></value>
+		<value xml:lang="de"><![CDATA[Aus]]></value>
+	</item>
+	<item name="not_exists">
+		<value xml:lang="ko"><![CDATA[없음]]></value>
+		<value xml:lang="en"><![CDATA[Doesn't exist]]></value>
+		<value xml:lang="jp"><![CDATA[なし]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無]]></value>
+		<value xml:lang="fr"><![CDATA[Rien]]></value>
+		<value xml:lang="de"><![CDATA[nicht vorhanden]]></value>
+		<value xml:lang="ru"><![CDATA[Отсутствует]]></value>
+		<value xml:lang="es"><![CDATA[No existe]]></value>
+		<value xml:lang="tr"><![CDATA[mevcut değil]]></value>
+		<value xml:lang="vi"><![CDATA[Không tồn tại]]></value>
+		<value xml:lang="mn"><![CDATA[Байхгүй]]></value>
+	</item>
+	<item name="public">
+		<value xml:lang="ko"><![CDATA[공개]]></value>
+		<value xml:lang="en"><![CDATA[public]]></value>
+		<value xml:lang="jp"><![CDATA[公開]]></value>
+		<value xml:lang="zh-CN"><![CDATA[公开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[公開]]></value>
+		<value xml:lang="de"><![CDATA[öffentlich]]></value>
+		<value xml:lang="ru"><![CDATA[Показать всем]]></value>
+		<value xml:lang="es"><![CDATA[Público]]></value>
+		<value xml:lang="tr"><![CDATA[Genel]]></value>
+		<value xml:lang="vi"><![CDATA[Công khai]]></value>
+		<value xml:lang="mn"><![CDATA[Нийтийн]]></value>
+	</item>
+	<item name="private">
+		<value xml:lang="ko"><![CDATA[비공개]]></value>
+		<value xml:lang="en"><![CDATA[private]]></value>
+		<value xml:lang="jp"><![CDATA[非公開]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不公开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不公開]]></value>
+		<value xml:lang="fr"><![CDATA[privé]]></value>
+		<value xml:lang="de"><![CDATA[privat]]></value>
+		<value xml:lang="ru"><![CDATA[Не показывать]]></value>
+		<value xml:lang="es"><![CDATA[Privado]]></value>
+		<value xml:lang="tr"><![CDATA[Özel]]></value>
+		<value xml:lang="vi"><![CDATA[Riêng tư]]></value>
+		<value xml:lang="mn"><![CDATA[Нууцлах]]></value>
+	</item>
+	<item name="etc">
+		<value xml:lang="ko"><![CDATA[기타]]></value>
+		<value xml:lang="en"><![CDATA[Others]]></value>
+		<value xml:lang="jp"><![CDATA[その他]]></value>
+		<value xml:lang="zh-TW"><![CDATA[其他]]></value>
+		<value xml:lang="de"><![CDATA[Sonstiges]]></value>
+	</item>
+	<item name="unit_sec">
+		<value xml:lang="ko"><![CDATA[초]]></value>
+		<value xml:lang="en"><![CDATA[sec]]></value>
+		<value xml:lang="jp"><![CDATA[秒]]></value>
+		<value xml:lang="zh-CN"><![CDATA[秒]]></value>
+		<value xml:lang="zh-TW"><![CDATA[秒]]></value>
+		<value xml:lang="fr"><![CDATA[seconde]]></value>
+		<value xml:lang="de"><![CDATA[Sekunde]]></value>
+		<value xml:lang="ru"><![CDATA[сек.]]></value>
+		<value xml:lang="es"><![CDATA[segundo]]></value>
+		<value xml:lang="tr"><![CDATA[sn]]></value>
+		<value xml:lang="vi"><![CDATA[Giây]]></value>
+		<value xml:lang="mn"><![CDATA[Секунд]]></value>
+	</item>
+	<item name="unit_min">
+		<value xml:lang="ko"><![CDATA[분]]></value>
+		<value xml:lang="en"><![CDATA[min]]></value>
+		<value xml:lang="jp"><![CDATA[分]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分]]></value>
+		<value xml:lang="fr"><![CDATA[minute]]></value>
+		<value xml:lang="de"><![CDATA[Minute]]></value>
+		<value xml:lang="ru"><![CDATA[мин.]]></value>
+		<value xml:lang="es"><![CDATA[minuto]]></value>
+		<value xml:lang="tr"><![CDATA[dk]]></value>
+		<value xml:lang="vi"><![CDATA[Phút]]></value>
+		<value xml:lang="mn"><![CDATA[Минут]]></value>
+	</item>
+	<item name="unit_hour">
+		<value xml:lang="ko"><![CDATA[시]]></value>
+		<value xml:lang="en"><![CDATA[hr]]></value>
+		<value xml:lang="jp"><![CDATA[時]]></value>
+		<value xml:lang="zh-CN"><![CDATA[时]]></value>
+		<value xml:lang="zh-TW"><![CDATA[時]]></value>
+		<value xml:lang="fr"><![CDATA[heure]]></value>
+		<value xml:lang="de"><![CDATA[Stunde]]></value>
+		<value xml:lang="ru"><![CDATA[ч.]]></value>
+		<value xml:lang="es"><![CDATA[hora]]></value>
+		<value xml:lang="tr"><![CDATA[saat]]></value>
+		<value xml:lang="vi"><![CDATA[Giờ]]></value>
+		<value xml:lang="mn"><![CDATA[Цаг]]></value>
+	</item>
+	<item name="unit_day">
+		<value xml:lang="ko"><![CDATA[일]]></value>
+		<value xml:lang="en"><![CDATA[th]]></value>
+		<value xml:lang="jp"><![CDATA[日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[日]]></value>
+		<value xml:lang="zh-TW"><![CDATA[日]]></value>
+		<value xml:lang="fr"><![CDATA[jour]]></value>
+		<value xml:lang="de"><![CDATA[Tag]]></value>
+		<value xml:lang="ru"><![CDATA[д.]]></value>
+		<value xml:lang="es"><![CDATA[día]]></value>
+		<value xml:lang="tr"><![CDATA[gün]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày]]></value>
+		<value xml:lang="mn"><![CDATA[Өдөр]]></value>
+	</item>
+	<item name="unit_month">
+		<value xml:lang="ko"><![CDATA[월]]></value>
+		<value xml:lang="en"><![CDATA[month]]></value>
+		<value xml:lang="jp"><![CDATA[月]]></value>
+		<value xml:lang="zh-CN"><![CDATA[月]]></value>
+		<value xml:lang="zh-TW"><![CDATA[月]]></value>
+		<value xml:lang="fr"><![CDATA[mois]]></value>
+		<value xml:lang="de"><![CDATA[Monat]]></value>
+		<value xml:lang="ru"><![CDATA[мес.]]></value>
+		<value xml:lang="es"><![CDATA[mes]]></value>
+		<value xml:lang="tr"><![CDATA[ay]]></value>
+		<value xml:lang="vi"><![CDATA[Tháng]]></value>
+		<value xml:lang="mn"><![CDATA[Сар]]></value>
+	</item>
+	<item name="unit_year">
+		<value xml:lang="ko"><![CDATA[년]]></value>
+		<value xml:lang="en"><![CDATA[year]]></value>
+		<value xml:lang="jp"><![CDATA[年]]></value>
+		<value xml:lang="zh-CN"><![CDATA[年]]></value>
+		<value xml:lang="zh-TW"><![CDATA[年]]></value>
+		<value xml:lang="fr"><![CDATA[année]]></value>
+		<value xml:lang="de"><![CDATA[Jahr]]></value>
+		<value xml:lang="ru"><![CDATA[г.]]></value>
+		<value xml:lang="es"><![CDATA[año]]></value>
+		<value xml:lang="tr"><![CDATA[yıl]]></value>
+		<value xml:lang="vi"><![CDATA[Năm]]></value>
+		<value xml:lang="mn"><![CDATA[Жил]]></value>
+	</item>
+	<item name="unit_week" type="array">
+		<item name="Monday">
+			<value xml:lang="ko"><![CDATA[월]]></value>
+			<value xml:lang="en"><![CDATA[Monday]]></value>
+			<value xml:lang="jp"><![CDATA[月]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期一]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期一]]></value>
+			<value xml:lang="fr"><![CDATA[Lundi]]></value>
+			<value xml:lang="de"><![CDATA[Montag]]></value>
+			<value xml:lang="ru"><![CDATA[Понедельник]]></value>
+			<value xml:lang="es"><![CDATA[Lunes]]></value>
+			<value xml:lang="tr"><![CDATA[Pazartesi]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ hai]]></value>
+			<value xml:lang="mn"><![CDATA[Да]]></value>
+		</item>
+		<item name="Tuesday">
+			<value xml:lang="ko"><![CDATA[화]]></value>
+			<value xml:lang="en"><![CDATA[Tuesday]]></value>
+			<value xml:lang="jp"><![CDATA[火]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期二]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期二]]></value>
+			<value xml:lang="fr"><![CDATA[Mardi]]></value>
+			<value xml:lang="de"><![CDATA[Dienstag]]></value>
+			<value xml:lang="ru"><![CDATA[Вторник]]></value>
+			<value xml:lang="es"><![CDATA[Martes]]></value>
+			<value xml:lang="tr"><![CDATA[Salı]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ ba]]></value>
+			<value xml:lang="mn"><![CDATA[Мя]]></value>
+		</item>
+		<item name="Wednesday">
+			<value xml:lang="ko"><![CDATA[수]]></value>
+			<value xml:lang="en"><![CDATA[Wednesday]]></value>
+			<value xml:lang="jp"><![CDATA[水]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期三]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期三]]></value>
+			<value xml:lang="fr"><![CDATA[Mer.]]></value>
+			<value xml:lang="de"><![CDATA[Mittwoch]]></value>
+			<value xml:lang="ru"><![CDATA[Среда]]></value>
+			<value xml:lang="es"><![CDATA[Miércoles ]]></value>
+			<value xml:lang="tr"><![CDATA[Çarşamba]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ tư]]></value>
+			<value xml:lang="mn"><![CDATA[Лха]]></value>
+		</item>
+		<item name="Thursday">
+			<value xml:lang="ko"><![CDATA[목]]></value>
+			<value xml:lang="en"><![CDATA[Thursday]]></value>
+			<value xml:lang="jp"><![CDATA[木]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期四]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期四]]></value>
+			<value xml:lang="fr"><![CDATA[Jeu.]]></value>
+			<value xml:lang="de"><![CDATA[Donnerstag]]></value>
+			<value xml:lang="ru"><![CDATA[Четверг]]></value>
+			<value xml:lang="es"><![CDATA[Jueves]]></value>
+			<value xml:lang="tr"><![CDATA[Perşembe]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ năm]]></value>
+			<value xml:lang="mn"><![CDATA[Пv]]></value>
+		</item>
+		<item name="Friday">
+			<value xml:lang="ko"><![CDATA[금]]></value>
+			<value xml:lang="en"><![CDATA[Friday]]></value>
+			<value xml:lang="jp"><![CDATA[金]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期五]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期五]]></value>
+			<value xml:lang="fr"><![CDATA[Vendredi]]></value>
+			<value xml:lang="de"><![CDATA[Freitag]]></value>
+			<value xml:lang="ru"><![CDATA[Пятница]]></value>
+			<value xml:lang="es"><![CDATA[Viernes]]></value>
+			<value xml:lang="tr"><![CDATA[Cuma]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ sáu]]></value>
+			<value xml:lang="mn"><![CDATA[Ба]]></value>
+		</item>
+		<item name="Saturday">
+			<value xml:lang="ko"><![CDATA[토]]></value>
+			<value xml:lang="en"><![CDATA[Saturday]]></value>
+			<value xml:lang="jp"><![CDATA[土]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期六]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期六]]></value>
+			<value xml:lang="fr"><![CDATA[Samedi]]></value>
+			<value xml:lang="de"><![CDATA[Samstag]]></value>
+			<value xml:lang="ru"><![CDATA[Суббота]]></value>
+			<value xml:lang="es"><![CDATA[Sábado]]></value>
+			<value xml:lang="tr"><![CDATA[Cumartesi]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ bảy]]></value>
+			<value xml:lang="mn"><![CDATA[Бя]]></value>
+		</item>
+		<item name="Sunday">
+			<value xml:lang="ko"><![CDATA[일]]></value>
+			<value xml:lang="en"><![CDATA[Sunday]]></value>
+			<value xml:lang="jp"><![CDATA[日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[星期日]]></value>
+			<value xml:lang="zh-TW"><![CDATA[星期日]]></value>
+			<value xml:lang="fr"><![CDATA[Dimanche]]></value>
+			<value xml:lang="de"><![CDATA[Sonntag]]></value>
+			<value xml:lang="ru"><![CDATA[Воскресенье]]></value>
+			<value xml:lang="es"><![CDATA[Domingo]]></value>
+			<value xml:lang="tr"><![CDATA[Pazar]]></value>
+			<value xml:lang="vi"><![CDATA[Chủ nhật]]></value>
+			<value xml:lang="mn"><![CDATA[Ня]]></value>
+		</item>
+	</item>
+	<item name="unit_meridiem" type="array">
+		<item name="am">
+			<value xml:lang="ko"><![CDATA[오전]]></value>
+			<value xml:lang="en"><![CDATA[am]]></value>
+			<value xml:lang="jp"><![CDATA[午前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上午]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上午]]></value>
+			<value xml:lang="de"><![CDATA[vormittags]]></value>
+			<value xml:lang="mn"><![CDATA[eглee]]></value>
+		</item>
+		<item name="pm">
+			<value xml:lang="ko"><![CDATA[오후]]></value>
+			<value xml:lang="en"><![CDATA[pm]]></value>
+			<value xml:lang="jp"><![CDATA[午後]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下午]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下午]]></value>
+			<value xml:lang="de"><![CDATA[nachmittags]]></value>
+			<value xml:lang="mn"><![CDATA[орой]]></value>
+		</item>
+		<item name="AM">
+			<value xml:lang="ko"><![CDATA[오전]]></value>
+			<value xml:lang="en"><![CDATA[AM]]></value>
+			<value xml:lang="jp"><![CDATA[午前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上午]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上午]]></value>
+			<value xml:lang="de"><![CDATA[Vormittag]]></value>
+			<value xml:lang="mn"><![CDATA[eглee]]></value>
+		</item>
+		<item name="PM">
+			<value xml:lang="ko"><![CDATA[오후]]></value>
+			<value xml:lang="en"><![CDATA[PM]]></value>
+			<value xml:lang="jp"><![CDATA[午後]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下午]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下午]]></value>
+			<value xml:lang="de"><![CDATA[Nachmittag]]></value>
+			<value xml:lang="mn"><![CDATA[орой]]></value>
+		</item>
+	</item>
+	<item name="time_gap" type="array">
+		<item name="min">
+			<value xml:lang="ko"><![CDATA[%d 분 전]]></value>
+			<value xml:lang="en"><![CDATA[%d minute ago]]></value>
+			<value xml:lang="jp"><![CDATA[%d 分前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%d分钟前]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%d 分鐘前]]></value>
+			<value xml:lang="fr"><![CDATA[%d heure]]></value>
+			<value xml:lang="de"><![CDATA[Vor %d Minute]]></value>
+			<value xml:lang="ru"><![CDATA[%d минуту назад]]></value>
+			<value xml:lang="es"><![CDATA[Hace %d minuto]]></value>
+			<value xml:lang="tr"><![CDATA[%d bir dakika önce]]></value>
+			<value xml:lang="vi"><![CDATA[%d phút trước]]></value>
+			<value xml:lang="mn"><![CDATA[%d минутын eмнe]]></value>
+		</item>
+		<item name="mins">
+			<value xml:lang="ko"><![CDATA[%d 분 전]]></value>
+			<value xml:lang="en"><![CDATA[%d minutes ago]]></value>
+			<value xml:lang="jp"><![CDATA[%d 分前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%d分钟前]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%d 分鐘前]]></value>
+			<value xml:lang="fr"><![CDATA[Il ya %d minutes]]></value>
+			<value xml:lang="de"><![CDATA[Vor %d Minuten]]></value>
+			<value xml:lang="ru"><![CDATA[%d минут назад]]></value>
+			<value xml:lang="es"><![CDATA[%d minutos]]></value>
+			<value xml:lang="tr"><![CDATA[%d birkaç dakika önce]]></value>
+			<value xml:lang="vi"><![CDATA[%d phút trước]]></value>
+			<value xml:lang="mn"><![CDATA[%d минутын eмнe]]></value>
+		</item>
+		<item name="hour">
+			<value xml:lang="ko"><![CDATA[%d 시간 전]]></value>
+			<value xml:lang="en"><![CDATA[%d hour ago]]></value>
+			<value xml:lang="jp"><![CDATA[%d 時間前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%d小时前]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%d 小時前]]></value>
+			<value xml:lang="fr"><![CDATA[Il ya %d jour]]></value>
+			<value xml:lang="de"><![CDATA[Vor %d Stunde]]></value>
+			<value xml:lang="ru"><![CDATA[%d час назад]]></value>
+			<value xml:lang="es"><![CDATA[%d día]]></value>
+			<value xml:lang="tr"><![CDATA[%d saat önce]]></value>
+			<value xml:lang="vi"><![CDATA[%d giờ trước]]></value>
+			<value xml:lang="mn"><![CDATA[%d цагийн eмнe]]></value>
+		</item>
+		<item name="hours">
+			<value xml:lang="ko"><![CDATA[%d 시간 전]]></value>
+			<value xml:lang="en"><![CDATA[%d hours ago]]></value>
+			<value xml:lang="jp"><![CDATA[%d 時間前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%d小时前]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%d 小時前]]></value>
+			<value xml:lang="fr"><![CDATA[Il ya %d jours]]></value>
+			<value xml:lang="de"><![CDATA[Vor %d Stunden]]></value>
+			<value xml:lang="ru"><![CDATA[%d часов назад]]></value>
+			<value xml:lang="es"><![CDATA[%d días]]></value>
+			<value xml:lang="tr"><![CDATA[%d birkaç saat önce]]></value>
+			<value xml:lang="vi"><![CDATA[%d giờ trước]]></value>
+			<value xml:lang="mn"><![CDATA[%d цагийн eмнe]]></value>
+		</item>
+	</item>
+	<item name="about_tag">
+		<value xml:lang="ko"><![CDATA[쉼표(,)를 이용하여 복수 등록]]></value>
+		<value xml:lang="en"><![CDATA[You may submit multiple tags by inserting commas (,) between tags.]]></value>
+		<value xml:lang="jp"><![CDATA[タグは「,」(半角コンマ)を使って複数登録できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用逗号分隔多个标签]]></value>
+		<value xml:lang="zh-TW"><![CDATA[用逗號(,)區隔多個標籤]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez enrégistrer plusieurs balises en utilisant ,(virgule) entre chaque balise]]></value>
+		<value xml:lang="de"><![CDATA[Sie können mehrere Etiketten mit Komma eingeben.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете применить несколько тегов, разделенных запятыми (,)]]></value>
+		<value xml:lang="es"><![CDATA[Puede agregar o añadir diversas etiquetas separándolas con la coma(,)]]></value>
+		<value xml:lang="tr"><![CDATA[Her Etiketin arasına virgül(,)ekleyerek çoklu etiketleri de teslim edebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể thêm vào nhiều Tag bằng cách đặt dấu (,) giữa mỗi Tag.]]></value>
+		<value xml:lang="mn"><![CDATA[tag оруулахдаа таслал ашиглавал давтан оруулж болно]]></value>
+	</item>
+	<item name="about_layout">
+		<value xml:lang="ko"><![CDATA[레이아웃은 모듈의 겉모습을 꾸며줍니다. 상단 레이아웃 메뉴에서 관리하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Layouts decorate the appearance of your modules. You can configure them from the Layout menu on the top.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールのレイアウトをデザインします。上部のレイアウトメニューにて管理できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局是布置模块的外观，在上端布局菜里单可以进行管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面設計是佈置網站的外觀模組，在上端版面選單中，可以進行管理]]></value>
+		<value xml:lang="fr"><![CDATA[Le Mise en Page décore l'apparence des modules. Vous pouvez les configurer avec le menu de Mise en Page en haut]]></value>
+		<value xml:lang="de"><![CDATA[Durch das Layout kann man die Oberfläche des Moduls verschönern. Sie können es oben im Layout-Menü einstellen.]]></value>
+		<value xml:lang="ru"><![CDATA[Лейауты украшают внешний вид Ваших модулей. Вы можете сконфигурировать их с помощью меню Лейаут сверху]]></value>
+		<value xml:lang="es"><![CDATA[Puede modificar la apariencia(Layout/Diseño) de los módulos. Puede administrarla con el menú Layout.]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzenleri, modüllerin görünümünü şekillendirir. Üst taraftaki yerleşim düzeni bölümünden ayarlamaları yapabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Để trang trí giao diện bằng các Module. Bạn có thể điều chỉnh chúng bằng Menu trên đầu trang.]]></value>
+		<value xml:lang="mn"><![CDATA[Лэйаут нь модиулын гадаад байдлыг чимж өгнө. Дээрх лэйаут менюнээс удирдаж болно]]></value>
+	</item>
+	<item name="msg_call_server">
+		<value xml:lang="ko"><![CDATA[서버에 요청 중입니다. 잠시만 기다려주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Requesting to the server, please wait.]]></value>
+		<value xml:lang="jp"><![CDATA[サーバへ問合わせ中です。しばらくお待ちください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[系统正在连接服务器，请稍后…]]></value>
+		<value xml:lang="zh-TW"><![CDATA[系統正在連接伺服器，請稍後。]]></value>
+		<value xml:lang="fr"><![CDATA[En demandant sur le serveur, attendez S.V.P.]]></value>
+		<value xml:lang="de"><![CDATA[Request an den Server senden, bitte warten!]]></value>
+		<value xml:lang="ru"><![CDATA[Идет обработка. Пожалуйста, подождите...]]></value>
+		<value xml:lang="es"><![CDATA[Solicitando al servidor, espere un momento]]></value>
+		<value xml:lang="tr"><![CDATA[Sunucuya bağlanıyor, lütfen bekleyin]]></value>
+		<value xml:lang="vi"><![CDATA[Đang kết nối tới máy chủ, Xin vui lòng đợi! ...]]></value>
+		<value xml:lang="mn"><![CDATA[Сервер ачаалж байна. Түр хүлээнэ үү.]]></value>
+	</item>
+	<item name="msg_db_not_setted">
+		<value xml:lang="ko"><![CDATA[DB 설정이 되어 있지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[DB configuration has not been set.]]></value>
+		<value xml:lang="jp"><![CDATA[DBが設定されていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[还没有设定 DB]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未設定資料庫]]></value>
+		<value xml:lang="fr"><![CDATA[La configuration de Base de Données n'a pas été établie.]]></value>
+		<value xml:lang="de"><![CDATA[Die Datenbank ist noch nicht festgelegt.]]></value>
+		<value xml:lang="ru"><![CDATA[Даза данных не сконфигурирована]]></value>
+		<value xml:lang="es"><![CDATA[La Base de Datos no está preparada]]></value>
+		<value xml:lang="tr"><![CDATA[VT Ayarları yapılmadı.]]></value>
+		<value xml:lang="vi"><![CDATA[Cấu hình Database chưa được thiết lập.]]></value>
+		<value xml:lang="mn"><![CDATA[DB тохируулга хийгдээгүй байна.]]></value>
+	</item>
+	<item name="msg_dbconnect_failed">
+		<value xml:lang="ko"><![CDATA[DB 접속 오류가 발생했습니다.
+DB정보를 다시 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Error has occurred while connecting to the DB.
+Please check the DB information again.]]></value>
+		<value xml:lang="jp"><![CDATA[データベースアクセスにエラーが発生しました。
+データベースの情報をもう一度確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[连接DB时发生错误。
+请重新确认DB信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連接資料庫時發生錯誤。
+		請重新確認資料庫資訊。]]></value>
+		<value xml:lang="fr"><![CDATA[Erreur a lieu en essayant connecter à la Base de Données.
+Vérifiez encore une fois les informations sur la Base de Données, S.V.P.]]></value>
+		<value xml:lang="de"><![CDATA[Bei der Verbindung zur Datenbank ist ein Fehler aufgetreten.
+Bitte die Angabe der Datenbanek nochmal durchchecken]]></value>
+		<value xml:lang="ru"><![CDATA[Произошла ошибка подключения к базе данных.
+Пожалуйста, проверьте иформацию базы данных еще раз]]></value>
+		<value xml:lang="es"><![CDATA[Ha ocurrido un error en la conexión de BD.
+ Por favor chequee la información de BD nuevamente]]></value>
+		<value xml:lang="tr"><![CDATA[VT bağlantısında sorun meydana geldi.
+ DB bilgilerini lütfen kontrol edin.]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể kết nối.
+Xin vui lòng kiểm tra lại thông tin Database.]]></value>
+	</item>
+	<item name="msg_invalid_queryid">
+		<value xml:lang="ko"><![CDATA[Query ID값이 잘못 지정되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Specified query ID value is invalid.]]></value>
+		<value xml:lang="jp"><![CDATA[クエリIDの値が無効です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Query ID值指定错误]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Query ID值指定錯誤]]></value>
+		<value xml:lang="fr"><![CDATA[La valeur spécifiée d'identite de query est invalide.]]></value>
+		<value xml:lang="de"><![CDATA[Die Eingabe von Query_ID ist ungültig.]]></value>
+		<value xml:lang="ru"><![CDATA[Указанный ID запроса неверен]]></value>
+		<value xml:lang="es"><![CDATA[El valor de Query ID especificado es inválido]]></value>
+		<value xml:lang="tr"><![CDATA[Belirlenen sorgu için kimlik bilgisi geçersiz.]]></value>
+		<value xml:lang="vi"><![CDATA[Giá trị ID không hợp lệ]]></value>
+		<value xml:lang="mn"><![CDATA[Query ID буруу бичигдсэн байна.]]></value>
+	</item>
+	<item name="msg_not_permitted">
+		<value xml:lang="ko"><![CDATA[권한이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You do not have permission to access.]]></value>
+		<value xml:lang="jp"><![CDATA[権限がありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有權限]]></value>
+		<value xml:lang="fr"><![CDATA[Vous n'avez pas le droit d'accès.]]></value>
+		<value xml:lang="de"><![CDATA[Sie haben keine Berechtigung zum Zugriff.]]></value>
+		<value xml:lang="ru"><![CDATA[У Вас нет доступа]]></value>
+		<value xml:lang="es"><![CDATA[Acceso denegado]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş izniniz yok.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không được phép truy cập tại đây!]]></value>
+		<value xml:lang="mn"><![CDATA[Эрх байхгүй байна]]></value>
+	</item>
+	<item name="msg_input_password">
+		<value xml:lang="ko"><![CDATA[비밀번호를 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please type the password.]]></value>
+		<value xml:lang="jp"><![CDATA[パスワードを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Veuillez entrer votre mot de passe.]]></value>
+		<value xml:lang="de"><![CDATA[Bitte geben Sie das Passwort ein.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите пароль]]></value>
+		<value xml:lang="es"><![CDATA[Introduzca la contraseña]]></value>
+		<value xml:lang="tr"><![CDATA[Lüften Şifreyi girin]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng nhập mật khẩu!]]></value>
+		<value xml:lang="mn"><![CDATA[Нууц дугаараа оруулна уу]]></value>
+	</item>
+	<item name="msg_invalid_document">
+		<value xml:lang="ko"><![CDATA[잘못된 문서번호입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid Article Number]]></value>
+		<value xml:lang="jp"><![CDATA[無効な書き込み番号です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[出错的文章编号]]></value>
+		<value xml:lang="zh-TW"><![CDATA[錯誤的文章編號]]></value>
+		<value xml:lang="fr"><![CDATA[Numéro de Document invalide]]></value>
+		<value xml:lang="de"><![CDATA[Ungültige Artikelnummer]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный номер статьи]]></value>
+		<value xml:lang="es"><![CDATA[Documento inválido]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz yazı numarası]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết không tồn tại]]></value>
+		<value xml:lang="mn"><![CDATA[Бичлэгийн дугаар буруу байна]]></value>
+	</item>
+	<item name="msg_invalid_request">
+		<value xml:lang="ko"><![CDATA[잘못된 요청입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid Request]]></value>
+		<value xml:lang="jp"><![CDATA[無効なリクエストです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[出错的请求]]></value>
+		<value xml:lang="zh-TW"><![CDATA[錯誤的請求]]></value>
+		<value xml:lang="fr"><![CDATA[Requête invalide]]></value>
+		<value xml:lang="de"><![CDATA[ungültige Anforderung]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный запрос]]></value>
+		<value xml:lang="es"><![CDATA[Solicitud Inválida]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz İstek]]></value>
+		<value xml:lang="vi"><![CDATA[Yêu cầu không hợp lệ]]></value>
+		<value xml:lang="mn"><![CDATA[Буруу шаардлага байна]]></value>
+	</item>
+	<item name="msg_invalid_password">
+		<value xml:lang="ko"><![CDATA[비밀번호가 올바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The password you entered is incorrect.]]></value>
+		<value xml:lang="jp"><![CDATA[パスワードが正しくありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[密码错误]]></value>
+		<value xml:lang="zh-TW"><![CDATA[密碼錯誤]]></value>
+		<value xml:lang="fr"><![CDATA[Mot de passe invalide]]></value>
+		<value xml:lang="de"><![CDATA[Ungültiges Passwort]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный пароль]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña Inválida]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz Şifre]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu không đúng]]></value>
+		<value xml:lang="mn"><![CDATA[Нууц дугаар буруу байна]]></value>
+	</item>
+	<item name="msg_error_occured">
+		<value xml:lang="ko"><![CDATA[오류가 발생했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[An error has occured.]]></value>
+		<value xml:lang="jp"><![CDATA[エラーが発生しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发生错误]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發生錯誤]]></value>
+		<value xml:lang="fr"><![CDATA[Une erreur a lieu]]></value>
+		<value xml:lang="de"><![CDATA[Ein Fehler ist aufgetreten.]]></value>
+		<value xml:lang="ru"><![CDATA[Произошла ошибка]]></value>
+		<value xml:lang="es"><![CDATA[Error]]></value>
+		<value xml:lang="tr"><![CDATA[Bir hata oluştu.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã có lỗi xảy ra.]]></value>
+		<value xml:lang="mn"><![CDATA[Алдаа гарлаа]]></value>
+	</item>
+	<item name="msg_not_founded">
+		<value xml:lang="ko"><![CDATA[대상을 찾을 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot find the target.]]></value>
+		<value xml:lang="jp"><![CDATA[見つかりませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有找到相关内容]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到相關內容]]></value>
+		<value xml:lang="fr"><![CDATA[L'objet n'est pas trouvé.]]></value>
+		<value xml:lang="de"><![CDATA[Target ist nicht zu finden.]]></value>
+		<value xml:lang="ru"><![CDATA[Сообщение не найдено]]></value>
+		<value xml:lang="es"><![CDATA[No se ha encontrado]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef bulunamadı.]]></value>
+		<value xml:lang="vi"><![CDATA[Không tìm thấy.]]></value>
+		<value xml:lang="mn"><![CDATA[Зорилгыг олж чадсангүйү]]></value>
+	</item>
+	<item name="msg_no_result">
+		<value xml:lang="ko"><![CDATA[검색 결과가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No results found.]]></value>
+		<value xml:lang="jp"><![CDATA[検索結果がありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[找不到和您查询的相符结果]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋不到結果]]></value>
+		<value xml:lang="fr"><![CDATA[Nul Résultat]]></value>
+		<value xml:lang="de"><![CDATA[Kein Ergebnis]]></value>
+		<value xml:lang="ru"><![CDATA[Ничего не найдено]]></value>
+		<value xml:lang="es"><![CDATA[Sin resultado]]></value>
+		<value xml:lang="tr"><![CDATA[Hiçbir şey bulunamadı]]></value>
+		<value xml:lang="vi"><![CDATA[Không có kết quả nào được tìm thấy.]]></value>
+		<value xml:lang="mn"><![CDATA[Хайлтын үр дүн байхгүй байна]]></value>
+	</item>
+	<item name="msg_fail_to_request_open">
+		<value xml:lang="ko"><![CDATA[요청하신 연결에 실패했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to open your request.]]></value>
+		<value xml:lang="jp"><![CDATA[リクエストのアクセスに失敗しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[连接失败！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連結失敗]]></value>
+		<value xml:lang="de"><![CDATA[ungültiger Aufruf]]></value>
+		<value xml:lang="ru"><![CDATA[Ошибка в запрашиваемом соединении]]></value>
+		<value xml:lang="tr"><![CDATA[İsteğiniz gerçekleşmedi.]]></value>
+		<value xml:lang="mn"><![CDATA[Холболт амжилтгvй боллоо.]]></value>
+	</item>
+	<item name="msg_invalid_format">
+		<value xml:lang="ko"><![CDATA[잘못된 형식입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid Format]]></value>
+		<value xml:lang="jp"><![CDATA[正しくないフォーマットです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[错误的格式！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[格式錯誤]]></value>
+		<value xml:lang="de"><![CDATA[ein falsches Format]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный формат]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz Biçim]]></value>
+		<value xml:lang="mn"><![CDATA[Буруу хэлбэр байна.]]></value>
+	</item>
+	<item name="msg_not_permitted_act">
+		<value xml:lang="ko"><![CDATA[요청하신 기능을 실행할 수 있는 권한이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You do not have permission to execute requested action.]]></value>
+		<value xml:lang="jp"><![CDATA[現在の操作を実行する権限がありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有权限执行 action命令]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有權限執行]]></value>
+		<value xml:lang="fr"><![CDATA[Vous n'êtes pas autorisés à exécuter l'action que vous avez demandé.]]></value>
+		<value xml:lang="de"><![CDATA[Sie haben keine Berechtigung, um den aufgeforderten Vorgang auszuführen.]]></value>
+		<value xml:lang="ru"><![CDATA[У Вас нет прав для исполнения запрошенного действия]]></value>
+		<value xml:lang="es"><![CDATA[No está permitodo para ejecutar esta acción]]></value>
+		<value xml:lang="tr"><![CDATA[İstenilen eylemi gerçekleştirmeye yetkiniz yok.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không được phép làm việc này.]]></value>
+		<value xml:lang="mn"><![CDATA[Хүсэлт гаргасан үйлдлийг хэрэгжүүлэх эрх байхгүй.]]></value>
+	</item>
+	<item name="msg_module_is_not_exists">
+		<value xml:lang="ko"><![CDATA[요청하신 모듈을 찾을 수 없습니다.  사이트 관리자에게 모듈 점검 요청 바랍니다]]></value>
+		<value xml:lang="en"><![CDATA[Cannot find the module you requested. Ask your Site Admin to check the module.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールが見つかりません。 サイトマネージャへモジュールの点検をお問い合わせください。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到所登錄的模組。 請詢問網站管理員檢查模組。]]></value>
+		<value xml:lang="de"><![CDATA[Das aufgeforderte Modul ist nicht zu finden.  Bitte melden Sie sich dem Administrator des Moduls!]]></value>
+	</item>
+	<item name="msg_module_is_not_standalone">
+		<value xml:lang="ko"><![CDATA[요청하신 모듈은 독립적으로 동작할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Requested module cannot be executed independently.]]></value>
+		<value xml:lang="jp"><![CDATA[このモジュールはスタンドアローンでは作動しません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您请求的模块不能单独执行]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您請求的模組不能單獨執行]]></value>
+		<value xml:lang="fr"><![CDATA[Le module demandé ne peut pas être exécuté indépendamment.]]></value>
+		<value xml:lang="de"><![CDATA[Das aufgeforderte Modul kann nicht selbstständig ausgeführt werden.]]></value>
+		<value xml:lang="ru"><![CDATA[Запрошенный модуль не может быть исполнен независимо]]></value>
+		<value xml:lang="es"><![CDATA[El Módulo requerido no funciona solo.]]></value>
+		<value xml:lang="tr"><![CDATA[İstenilen modül bağımsız çalışamaz.]]></value>
+		<value xml:lang="vi"><![CDATA[Module yêu cầu không thể thực hiện độc lập.]]></value>
+		<value xml:lang="mn"><![CDATA[Хүсэлт гаргасан модиул нь бие даан хэрэгжих боломжгүй]]></value>
+	</item>
+	<item name="msg_default_url_is_not_defined">
+		<value xml:lang="ko"><![CDATA[기본 URL이 정해지지 않아서 동작을 중지합니다]]></value>
+		<value xml:lang="en"><![CDATA[Default URL is not defined.]]></value>
+		<value xml:lang="jp"><![CDATA[デフォルトURLが定められてないため、動作を中止します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请设置XE通行证！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未設定預設網址]]></value>
+		<value xml:lang="fr"><![CDATA[URL par défaut n'est pas défini.]]></value>
+		<value xml:lang="de"><![CDATA[Der Vorgang ist unterbrochen, denn Das Default_URL ist nicht eingegen.]]></value>
+		<value xml:lang="ru"><![CDATA[Default URL is not define]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan URL tanımlı değil.]]></value>
+	</item>
+	<item name="msg_empty_search_target">
+		<value xml:lang="ko"><![CDATA[검색대상이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot find the Search target.]]></value>
+	</item>
+	<item name="msg_empty_search_keyword">
+		<value xml:lang="ko"><![CDATA[검색어가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot find the Keyword.]]></value>
+	</item>
+	<item name="success_registed">
+		<value xml:lang="ko"><![CDATA[등록했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Registered successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[登録しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[提交成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[成功送出！]]></value>
+		<value xml:lang="fr"><![CDATA[Enregistré avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich registriert.]]></value>
+		<value xml:lang="ru"><![CDATA[Зарегистрировано успешно]]></value>
+		<value xml:lang="es"><![CDATA[Registrado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Kaydedildi.]]></value>
+		<value xml:lang="vi"><![CDATA[Chúc mừng bạn đã đăng kí thành công!]]></value>
+		<value xml:lang="mn"><![CDATA[Бүртгэгдсэн]]></value>
+	</item>
+	<item name="success_declared">
+		<value xml:lang="ko"><![CDATA[신고했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Reported successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[通報しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[举报成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢舉成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Accusé avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich gemeldet.]]></value>
+		<value xml:lang="ru"><![CDATA[Жалоба отправлена]]></value>
+		<value xml:lang="es"><![CDATA[Denuncia registrada con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Bildirildi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã báo cáo.]]></value>
+		<value xml:lang="mn"><![CDATA[Мэдээлэгдсэн]]></value>
+	</item>
+	<item name="success_updated">
+		<value xml:lang="ko"><![CDATA[수정했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Updated successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[修正しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Mise à jour avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich aktualisiert.]]></value>
+		<value xml:lang="ru"><![CDATA[Обновление успешно]]></value>
+		<value xml:lang="es"><![CDATA[Actualizado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Güncellendi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã cập nhật thành công.]]></value>
+		<value xml:lang="mn"><![CDATA[Засварлагдсан]]></value>
+	</item>
+	<item name="success_deleted">
+		<value xml:lang="ko"><![CDATA[삭제했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Deleted successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[削除しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimé avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich gelöscht.]]></value>
+		<value xml:lang="ru"><![CDATA[Удалено успешно]]></value>
+		<value xml:lang="es"><![CDATA[Borrado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Silindi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã xóa thành công.]]></value>
+		<value xml:lang="mn"><![CDATA[Устгагдсан]]></value>
+	</item>
+	<item name="success_restore">
+		<value xml:lang="ko"><![CDATA[복원했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Restored successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[復元しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[复原成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[成功還原！]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich wiederhergestellt.]]></value>
+	</item>
+	<item name="success_voted">
+		<value xml:lang="ko"><![CDATA[추천했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Recommended successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[推薦しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[推荐成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[推薦成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Voté avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich zugestimmt.]]></value>
+		<value xml:lang="ru"><![CDATA[Рекомендовано успешно]]></value>
+		<value xml:lang="es"><![CDATA[Voto a favor registrado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Tavsiye Edildi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã bình chọn.]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгогдсон]]></value>
+	</item>
+	<item name="success_blamed">
+		<value xml:lang="ko"><![CDATA[비추천했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Not recommended successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[非推薦しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反对成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反對成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Blâmé avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich widersprochen.]]></value>
+		<value xml:lang="ru"><![CDATA[Критика принята]]></value>
+		<value xml:lang="es"><![CDATA[Voto en Contra registrado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Bildirildi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã phê bình.]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгогдоогүй]]></value>
+	</item>
+	<item name="success_moved">
+		<value xml:lang="ko"><![CDATA[이동했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Moved successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[移動しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移動成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Bougé avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich verschoben.]]></value>
+		<value xml:lang="ru"><![CDATA[Перемещено успешно]]></value>
+		<value xml:lang="es"><![CDATA[Movido con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Taşındı.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã chuyển.]]></value>
+		<value xml:lang="mn"><![CDATA[Шилжсэн]]></value>
+	</item>
+	<item name="success_sended">
+		<value xml:lang="ko"><![CDATA[발송했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Sent successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[送信しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[成功送出！]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyé avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich Gesendet.]]></value>
+		<value xml:lang="ru"><![CDATA[Отправлено успешно]]></value>
+		<value xml:lang="es"><![CDATA[Enviado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Gönderildi]]></value>
+		<value xml:lang="vi"><![CDATA[Đã gửi thành công.]]></value>
+		<value xml:lang="mn"><![CDATA[Илгээгдсэн]]></value>
+	</item>
+	<item name="success_reset">
+		<value xml:lang="ko"><![CDATA[초기화했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Reset successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[初期化しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[初始化成功 !]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重設成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Restauré avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich zurückgesetzt.]]></value>
+		<value xml:lang="ru"><![CDATA[Сброшено успешно]]></value>
+		<value xml:lang="es"><![CDATA[Reajustado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Tekrar Kuruldu.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã thiết lập lại thành công.]]></value>
+		<value xml:lang="mn"><![CDATA[Reset]]></value>
+	</item>
+	<item name="success_leaved">
+		<value xml:lang="ko"><![CDATA[탈퇴했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Your account has been closed successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[退会しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注销成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[成功退出！]]></value>
+		<value xml:lang="fr"><![CDATA[Toutes vos informations sont complètement supprimés]]></value>
+		<value xml:lang="de"><![CDATA[Ihre Daten wurde komplett gestrichen.]]></value>
+		<value xml:lang="ru"><![CDATA[Пользователь удален]]></value>
+		<value xml:lang="es"><![CDATA[Abandonado con éxito]]></value>
+		<value xml:lang="tr"><![CDATA[Tüm üye verileri tamamen silindi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã xóa tất cả các thành viên.]]></value>
+		<value xml:lang="mn"><![CDATA[Гишүүнээс гарсан]]></value>
+	</item>
+	<item name="success_saved">
+		<value xml:lang="ko"><![CDATA[저장했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Saved successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[保存しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[保存成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[儲存成功！]]></value>
+		<value xml:lang="fr"><![CDATA[Conservé avec succès]]></value>
+		<value xml:lang="de"><![CDATA[Es ist erfolgreich gespeichert.]]></value>
+		<value xml:lang="ru"><![CDATA[Сохранено успешно]]></value>
+		<value xml:lang="es"><![CDATA[Guardado correctamente]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Kaydedildi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã lưu thành công.]]></value>
+		<value xml:lang="mn"><![CDATA[Хадгалагдсан]]></value>
+	</item>
+	<item name="fail_to_registed">
+		<value xml:lang="ko"><![CDATA[등록하지 못했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to register.]]></value>
+		<value xml:lang="jp"><![CDATA[登録できませんでした。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊失敗。]]></value>
+		<value xml:lang="de"><![CDATA[Misserfolg der Registrierung]]></value>
+	</item>
+	<item name="fail_to_delete">
+		<value xml:lang="ko"><![CDATA[삭제 실패했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to delete.]]></value>
+		<value xml:lang="jp"><![CDATA[削除できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除成功！]]></value>
+		<value xml:lang="fr"><![CDATA[N'a pas pu être supprimé.]]></value>
+		<value xml:lang="de"><![CDATA[Es ist gescheitert, es zu löschen.]]></value>
+		<value xml:lang="ru"><![CDATA[Не может быть удалено]]></value>
+		<value xml:lang="es"><![CDATA[No puede ser borrado]]></value>
+		<value xml:lang="tr"><![CDATA[Silinemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể xóa.]]></value>
+		<value xml:lang="mn"><![CDATA[Устгалт амжилтгүй боллоо]]></value>
+	</item>
+	<item name="fail_to_move">
+		<value xml:lang="ko"><![CDATA[이동 실패했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to move.]]></value>
+		<value xml:lang="jp"><![CDATA[移動できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移動成功！]]></value>
+		<value xml:lang="fr"><![CDATA[N'a pas pu être bougé]]></value>
+		<value xml:lang="de"><![CDATA[Es ist gescheitert, es zu verschieben.]]></value>
+		<value xml:lang="ru"><![CDATA[Перемещение невозможно]]></value>
+		<value xml:lang="es"><![CDATA[No puede ser movido]]></value>
+		<value xml:lang="tr"><![CDATA[Taşınamadı]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể chuyển.]]></value>
+		<value xml:lang="mn"><![CDATA[Шилжилт амжилтгүй боллоо]]></value>
+	</item>
+	<item name="failed_voted">
+		<value xml:lang="ko"><![CDATA[추천하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No permission to Recommend.]]></value>
+		<value xml:lang="jp"><![CDATA[推薦できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您不能推荐！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法推薦！]]></value>
+		<value xml:lang="fr"><![CDATA[N'a pas pu recommander]]></value>
+		<value xml:lang="de"><![CDATA[Es ist nicht in der Lage, zuzustimmen.]]></value>
+		<value xml:lang="ru"><![CDATA[Рекоммендовать невозможно]]></value>
+		<value xml:lang="es"><![CDATA[No puede dar Voto a favor]]></value>
+		<value xml:lang="tr"><![CDATA[Tavsiye edilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể bình chọn.]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгох боломжгүй]]></value>
+	</item>
+	<item name="failed_blamed">
+		<value xml:lang="ko"><![CDATA[비추천하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No permission to Not Recommend.]]></value>
+		<value xml:lang="jp"><![CDATA[非推薦できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您不能投反对！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法反對！]]></value>
+		<value xml:lang="fr"><![CDATA[N'a pas pu blâmer]]></value>
+		<value xml:lang="de"><![CDATA[Es ist nicht in der Lage, zu widersprechen.]]></value>
+		<value xml:lang="ru"><![CDATA[Критиковать невозможно]]></value>
+		<value xml:lang="es"><![CDATA[No puede dar Voto en contra]]></value>
+		<value xml:lang="tr"><![CDATA[Bildirilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể phê bình]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгохгүй байх боломжгүй]]></value>
+	</item>
+	<item name="failed_declared">
+		<value xml:lang="ko"><![CDATA[신고 하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No permission to Report.]]></value>
+		<value xml:lang="jp"><![CDATA[通報できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您不具备举报权限！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法檢舉！]]></value>
+		<value xml:lang="fr"><![CDATA[N'a pas pu accuser]]></value>
+		<value xml:lang="de"><![CDATA[Es ist nicht in der Lage, zu melden.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожаловаться невозможно]]></value>
+		<value xml:lang="es"><![CDATA[No puede denunciar]]></value>
+		<value xml:lang="tr"><![CDATA[Bildirilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể báo cáo.]]></value>
+		<value xml:lang="mn"><![CDATA[Мэдээлэх боломжгүй]]></value>
+	</item>
+	<item name="fail_to_delete_have_children">
+		<value xml:lang="ko"><![CDATA[댓글이 있어서 삭제할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot delete the article with comments.]]></value>
+		<value xml:lang="jp"><![CDATA[返信の書き込みがあり、削除できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能删除有回复的评论！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不能刪除有回覆的主題！]]></value>
+		<value xml:lang="fr"><![CDATA[Essayez encore une fois après avoir suprimé les reponses, S.V.P.]]></value>
+		<value xml:lang="de"><![CDATA[Es ist nicht in der Lage, zu löschen, da Kommentare daran hängen bleiben.]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно удаление из-за наличия ответов в записи]]></value>
+		<value xml:lang="es"><![CDATA[No puede eliminar lo publicado, por los escritos: mensajes, ecos, respuestas, recibidos]]></value>
+		<value xml:lang="tr"><![CDATA[Cevapları kaldırdıktan sonra lütfen tekrar deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng thử lại sau khi gỡ bỏ bài trả lời đầu tiên.]]></value>
+		<value xml:lang="mn"><![CDATA[Хариулт бичлэг байгаа тул устгах боломжгүй]]></value>
+	</item>
+	<item name="confirm_submit">
+		<value xml:lang="ko"><![CDATA[등록하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to submit?]]></value>
+		<value xml:lang="jp"><![CDATA[登録しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要提交吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要送出嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement soumettre?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie ihn eintragen wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Вы подтверждаете запись?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea enviar?]]></value>
+		<value xml:lang="tr"><![CDATA[Göndermek istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có chắc chắn muốn gửi?]]></value>
+		<value xml:lang="mn"><![CDATA[Оруулах уу?]]></value>
+	</item>
+	<item name="confirm_logout">
+		<value xml:lang="ko"><![CDATA[로그아웃하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to sign out?]]></value>
+		<value xml:lang="jp"><![CDATA[ログアウトしますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要退出吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要登出嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement fermer la session?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie sich ausloggen wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Вы подтверждаете выход?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea desconectar?]]></value>
+		<value xml:lang="tr"><![CDATA[Oturumu kapatmak istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có chắc chắn thoát?]]></value>
+		<value xml:lang="mn"><![CDATA[Гарах уу?]]></value>
+	</item>
+	<item name="confirm_vote">
+		<value xml:lang="ko"><![CDATA[추천하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to recommend?]]></value>
+		<value xml:lang="jp"><![CDATA[推薦しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要推荐吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要推薦嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez recommander?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie es zustimmen wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Рекомендовать?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea votar?]]></value>
+		<value xml:lang="tr"><![CDATA[Tavsiye etmek istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có muốn bình chọn không??]]></value>
+		<value xml:lang="mn"><![CDATA[Санал болгох уу?]]></value>
+	</item>
+	<item name="confirm_delete">
+		<value xml:lang="ko"><![CDATA[삭제하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to delete?]]></value>
+		<value xml:lang="jp"><![CDATA[削除しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要删除吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要刪除嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement supprimer?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie ihn löschen wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea eliminar?]]></value>
+		<value xml:lang="tr"><![CDATA[Silmek istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn chắc chắn muốn xóa?]]></value>
+		<value xml:lang="mn"><![CDATA[Устгах уу?]]></value>
+	</item>
+	<item name="confirm_restore">
+		<value xml:lang="ko"><![CDATA[복원하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to restore?]]></value>
+		<value xml:lang="jp"><![CDATA[復元しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要复原吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要復原嗎?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie es wiederherstellen wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Восстановить?]]></value>
+	</item>
+	<item name="confirm_move">
+		<value xml:lang="ko"><![CDATA[이동하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to move?]]></value>
+		<value xml:lang="jp"><![CDATA[移動しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要移动吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要移動嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement bouger?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie ihn verschieben wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Переместить?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea mover?]]></value>
+		<value xml:lang="tr"><![CDATA[Taşımak istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn chắc chắn muốn chuyển?]]></value>
+		<value xml:lang="mn"><![CDATA[Шилжих үү?]]></value>
+	</item>
+	<item name="confirm_reset">
+		<value xml:lang="ko"><![CDATA[초기화 하시겠습니까??]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to reset?]]></value>
+		<value xml:lang="jp"><![CDATA[初期化しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要初始化吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要重置嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement restaurer?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie es zurücksetzen wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Вы подтверждаете сброс?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea rehacer?]]></value>
+		<value xml:lang="tr"><![CDATA[Sıfırlamak istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn chắc chắn muốn thiết lập lại?]]></value>
+		<value xml:lang="mn"><![CDATA[Reset хийх үү?]]></value>
+	</item>
+	<item name="confirm_leave">
+		<value xml:lang="ko"><![CDATA[탈퇴하시겠습니까??]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to delete your account?]]></value>
+		<value xml:lang="jp"><![CDATA[退会しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要注销吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要退出嗎?]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement supprimer votre compte?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie austreten wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Вы подтверждаете удаление аккаунта?]]></value>
+		<value xml:lang="es"><![CDATA[¿Está seguro que desea abandonar?]]></value>
+		<value xml:lang="tr"><![CDATA[Çıkmak istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn chắc chắn muốn từ bỏ?]]></value>
+		<value xml:lang="mn"><![CDATA[Гишүүнээс гарах уу?]]></value>
+	</item>
+	<item name="confirm_update">
+		<value xml:lang="ko"><![CDATA[수정하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to update?]]></value>
+		<value xml:lang="jp"><![CDATA[修正しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要更新吗?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確定要更新嗎?]]></value>
+		<value xml:lang="de"><![CDATA[Sind Sie sicher, dass Sie es modifizieren wollen?]]></value>
+		<value xml:lang="ru"><![CDATA[Обновить?]]></value>
+		<value xml:lang="tr"><![CDATA[Güncellemek istediğinize emin misiniz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn chắc chắn muốn Update?]]></value>
+	</item>
+	<item name="column_type">
+		<value xml:lang="ko"><![CDATA[형식]]></value>
+		<value xml:lang="en"><![CDATA[Column Type]]></value>
+		<value xml:lang="jp"><![CDATA[タイプ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[格式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[格式]]></value>
+		<value xml:lang="fr"><![CDATA[Types de la colonne]]></value>
+		<value xml:lang="de"><![CDATA[Spaltenart]]></value>
+		<value xml:lang="ru"><![CDATA[Тип колонки]]></value>
+		<value xml:lang="es"><![CDATA[Tipos de Columnas]]></value>
+		<value xml:lang="tr"><![CDATA[Sütun Türü]]></value>
+		<value xml:lang="vi"><![CDATA[Định dạng cột]]></value>
+		<value xml:lang="mn"><![CDATA[Хэлбэр]]></value>
+	</item>
+	<item name="column_type_list" type="array">
+		<item name="text">
+			<value xml:lang="ko"><![CDATA[한줄 입력칸 (text)]]></value>
+			<value xml:lang="en"><![CDATA[one-line text]]></value>
+			<value xml:lang="jp"><![CDATA[入力フィールド(text)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[单行文本输入区(text)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[單行文字]]></value>
+			<value xml:lang="fr"><![CDATA[Texte en une seul ligne]]></value>
+			<value xml:lang="de"><![CDATA[eine Zeile Text]]></value>
+			<value xml:lang="ru"><![CDATA[Однострочное окно ввода]]></value>
+			<value xml:lang="es"><![CDATA[Texto sin cambio de línea]]></value>
+			<value xml:lang="tr"><![CDATA[tek satırlık metin]]></value>
+			<value xml:lang="vi"><![CDATA[Ô nhập liệu]]></value>
+			<value xml:lang="mn"><![CDATA[Нэг мөрөөр оруулах (text)]]></value>
+		</item>
+		<item name="homepage">
+			<value xml:lang="ko"><![CDATA[URL 형식]]></value>
+			<value xml:lang="en"><![CDATA[URL]]></value>
+			<value xml:lang="jp"><![CDATA[URLタイプ(url)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[网址格式(url)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[網址格式]]></value>
+			<value xml:lang="fr"><![CDATA[URL]]></value>
+			<value xml:lang="de"><![CDATA[Url-Adresse]]></value>
+			<value xml:lang="es"><![CDATA[URL de la página web]]></value>
+			<value xml:lang="vi"><![CDATA[URL]]></value>
+			<value xml:lang="mn"><![CDATA[Веб хуудас хэлбэр (url)]]></value>
+		</item>
+		<item name="email_address">
+			<value xml:lang="ko"><![CDATA[이메일 형식 (email)]]></value>
+			<value xml:lang="en"><![CDATA[Email]]></value>
+			<value xml:lang="jp"><![CDATA[メールアドレスタイプ(email)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[邮件格式(email)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[電子郵件]]></value>
+			<value xml:lang="fr"><![CDATA[Mél]]></value>
+			<value xml:lang="de"><![CDATA[E-Mail]]></value>
+			<value xml:lang="es"><![CDATA[Correo Electrónico]]></value>
+			<value xml:lang="tr"><![CDATA[e-posta]]></value>
+			<value xml:lang="vi"><![CDATA[Email]]></value>
+			<value xml:lang="mn"><![CDATA[Мэйл хэлбэр (email)]]></value>
+		</item>
+		<item name="tel">
+			<value xml:lang="ko"><![CDATA[전화번호 형식 (phone)]]></value>
+			<value xml:lang="en"><![CDATA[Phone number]]></value>
+			<value xml:lang="jp"><![CDATA[電話番号タイプ(phone)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[电话号码格式(phone)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[電話號碼格式(phone)]]></value>
+			<value xml:lang="fr"><![CDATA[Numéro de Telephone]]></value>
+			<value xml:lang="de"><![CDATA[Telefonnummer]]></value>
+			<value xml:lang="ru"><![CDATA[номер телефона]]></value>
+			<value xml:lang="es"><![CDATA[Número de teléfono]]></value>
+			<value xml:lang="tr"><![CDATA[telefon numarası]]></value>
+			<value xml:lang="vi"><![CDATA[Số điện thoại]]></value>
+			<value xml:lang="mn"><![CDATA[Утасны дугаар хэлбэр (phone)]]></value>
+		</item>
+		<item name="textarea">
+			<value xml:lang="ko"><![CDATA[여러 줄 입력칸 (textarea)]]></value>
+			<value xml:lang="en"><![CDATA[multi-line textarea]]></value>
+			<value xml:lang="jp"><![CDATA[テキストエリア(textarea)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[多行文本框(textarea)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文字區域(textarea)]]></value>
+			<value xml:lang="fr"><![CDATA[Texte en plusieurs lignes]]></value>
+			<value xml:lang="de"><![CDATA[Mehrere Zeilen Text]]></value>
+			<value xml:lang="ru"><![CDATA[Многострочное окно ввода]]></value>
+			<value xml:lang="es"><![CDATA[Texto multi-linea]]></value>
+			<value xml:lang="tr"><![CDATA[çok satırlı metin alanı]]></value>
+			<value xml:lang="vi"><![CDATA[Khu vực nội dung]]></value>
+			<value xml:lang="mn"><![CDATA[Олон мөрөөр оруулах (textarea)]]></value>
+		</item>
+		<item name="checkbox">
+			<value xml:lang="ko"><![CDATA[다중 선택 (checkbox)]]></value>
+			<value xml:lang="en"><![CDATA[checkbox (multiple selection)]]></value>
+			<value xml:lang="jp"><![CDATA[チェックボックス(checkbox)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[复选框(checkbox)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[核取方塊(checkbox)]]></value>
+			<value xml:lang="fr"><![CDATA[Case à cocher (multichoix)]]></value>
+			<value xml:lang="de"><![CDATA[Multiple Auswahl]]></value>
+			<value xml:lang="ru"><![CDATA[Чекбокс (мульти вариант)]]></value>
+			<value xml:lang="es"><![CDATA[Caja de chequeo (selección múltiple)]]></value>
+			<value xml:lang="tr"><![CDATA[onay kutusu (çoklu seçim)]]></value>
+			<value xml:lang="vi"><![CDATA[Ô chọn (Nhiều lựa chọn)]]></value>
+			<value xml:lang="mn"><![CDATA[Олон сонголт хийх (checkbox)]]></value>
+		</item>
+		<item name="select">
+			<value xml:lang="ko"><![CDATA[단일 선택 (select)]]></value>
+			<value xml:lang="en"><![CDATA[select box (single selection)]]></value>
+			<value xml:lang="jp"><![CDATA[ひとつ選択(select)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下拉列表框(select)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下拉式選單(select)]]></value>
+			<value xml:lang="fr"><![CDATA[Case d'option (seul choix)]]></value>
+			<value xml:lang="de"><![CDATA[Nur eine Auswahl]]></value>
+			<value xml:lang="ru"><![CDATA[Выбор (один вариант)]]></value>
+			<value xml:lang="es"><![CDATA[Selección (selección individual)]]></value>
+			<value xml:lang="tr"><![CDATA[kutuyu seç (tekli seçim)]]></value>
+			<value xml:lang="vi"><![CDATA[Ô chọn (Một lựa chọn)]]></value>
+			<value xml:lang="mn"><![CDATA[Ганц сонголт хийх (select)]]></value>
+		</item>
+		<item name="radio">
+			<value xml:lang="ko"><![CDATA[라디오 버튼 (radio)]]></value>
+			<value xml:lang="en"><![CDATA[radio button (radio)]]></value>
+			<value xml:lang="jp"><![CDATA[ラジオボタン(radio)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[单选框(radio)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[選項按紐(radio)]]></value>
+			<value xml:lang="de"><![CDATA[Radiobutton]]></value>
+			<value xml:lang="ru"><![CDATA[Кнопка радио (радио)]]></value>
+			<value xml:lang="tr"><![CDATA[radyo düğmesi (radyo)]]></value>
+			<value xml:lang="mn"><![CDATA[Нэг eдeр сонгох(radio)]]></value>
+		</item>
+		<item name="kr_zip">
+			<value xml:lang="ko"><![CDATA[한국주소 (zip)]]></value>
+			<value xml:lang="en"><![CDATA[zip code (Korean)]]></value>
+			<value xml:lang="jp"><![CDATA[韓国住所(zip)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[韩国邮编(zip)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[韓國郵編(zip)]]></value>
+			<value xml:lang="fr"><![CDATA[Code postal (coréen)]]></value>
+			<value xml:lang="de"><![CDATA[Postleitzahl(aber nur in Korean)]]></value>
+			<value xml:lang="ru"><![CDATA[Почтовый индекс (Корейский)]]></value>
+			<value xml:lang="tr"><![CDATA[zip kodu (Kore)]]></value>
+			<value xml:lang="vi"><![CDATA[Mã số bưu điện (Korean)]]></value>
+			<value xml:lang="mn"><![CDATA[Солонгос хаяг (zip)]]></value>
+		</item>
+		<item name="date">
+			<value xml:lang="ko"><![CDATA[일자 (연월일)]]></value>
+			<value xml:lang="en"><![CDATA[date (yyyy/mm/dd)]]></value>
+			<value xml:lang="jp"><![CDATA[日付(年月日)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[日期(年月日)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[日期(年月日)]]></value>
+			<value xml:lang="fr"><![CDATA[Jour (yyyy/mm/dd)]]></value>
+			<value xml:lang="de"><![CDATA[Datum (dd / mm /jjjj)]]></value>
+			<value xml:lang="ru"><![CDATA[Дата (гггг / мм / дд)]]></value>
+			<value xml:lang="es"><![CDATA[fecha (dd/mm/aaaa)]]></value>
+			<value xml:lang="tr"><![CDATA[tarih (gg/aa/yyyy)]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày (yyyy/mm/dd)]]></value>
+			<value xml:lang="mn"><![CDATA[Онсар  (Жил сар өдөр)]]></value>
+		</item>
+	</item>
+	<item name="column_name">
+		<value xml:lang="ko"><![CDATA[입력항목 이름]]></value>
+		<value xml:lang="en"><![CDATA[Column Name]]></value>
+		<value xml:lang="jp"><![CDATA[入力項目名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[项目名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[項目名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de la colonne]]></value>
+		<value xml:lang="de"><![CDATA[Spaltenname]]></value>
+		<value xml:lang="ru"><![CDATA[Имя колонки]]></value>
+		<value xml:lang="es"><![CDATA[Nombre de la Columna]]></value>
+		<value xml:lang="tr"><![CDATA[Sütun adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên cột]]></value>
+		<value xml:lang="mn"><![CDATA[Баганын нэр]]></value>
+	</item>
+	<item name="column_title">
+		<value xml:lang="ko"><![CDATA[입력항목 제목]]></value>
+		<value xml:lang="en"><![CDATA[Column Title]]></value>
+		<value xml:lang="jp"><![CDATA[入力項目のタイトル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[项目标题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[項目標題]]></value>
+		<value xml:lang="fr"><![CDATA[Titre de la colonne]]></value>
+		<value xml:lang="de"><![CDATA[Spaltentitel]]></value>
+		<value xml:lang="ru"><![CDATA[Заголовок колонки]]></value>
+		<value xml:lang="es"><![CDATA[Título de la Columna]]></value>
+		<value xml:lang="tr"><![CDATA[Sütun başlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Tiêu đề cột]]></value>
+		<value xml:lang="mn"><![CDATA[Баганын гарчиг]]></value>
+	</item>
+	<item name="default_value">
+		<value xml:lang="ko"><![CDATA[기본 값]]></value>
+		<value xml:lang="en"><![CDATA[Default Value]]></value>
+		<value xml:lang="jp"><![CDATA[デフォルト値]]></value>
+		<value xml:lang="zh-CN"><![CDATA[缺省值]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預設值]]></value>
+		<value xml:lang="fr"><![CDATA[Valeur par défaut]]></value>
+		<value xml:lang="de"><![CDATA[Standardwert]]></value>
+		<value xml:lang="ru"><![CDATA[Стандартное значение]]></value>
+		<value xml:lang="es"><![CDATA[Valor por defecto]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan Değer]]></value>
+		<value xml:lang="vi"><![CDATA[Giá trị mặc định]]></value>
+		<value xml:lang="mn"><![CDATA[Үндсэн байдал]]></value>
+	</item>
+	<item name="is_active">
+		<value xml:lang="ko"><![CDATA[활성]]></value>
+		<value xml:lang="en"><![CDATA[Active]]></value>
+		<value xml:lang="jp"><![CDATA[有効]]></value>
+		<value xml:lang="zh-CN"><![CDATA[激活]]></value>
+		<value xml:lang="zh-TW"><![CDATA[啟動]]></value>
+		<value xml:lang="fr"><![CDATA[Actif]]></value>
+		<value xml:lang="de"><![CDATA[Aktivierung]]></value>
+		<value xml:lang="ru"><![CDATA[Активация]]></value>
+		<value xml:lang="es"><![CDATA[Activado]]></value>
+		<value xml:lang="tr"><![CDATA[Etkin]]></value>
+		<value xml:lang="vi"><![CDATA[Hoạt động]]></value>
+		<value xml:lang="mn"><![CDATA[Идэвхжүүлэх]]></value>
+	</item>
+	<item name="is_required">
+		<value xml:lang="ko"><![CDATA[필수항목]]></value>
+		<value xml:lang="en"><![CDATA[Required Field]]></value>
+		<value xml:lang="jp"><![CDATA[必須項目]]></value>
+		<value xml:lang="zh-CN"><![CDATA[必填]]></value>
+		<value xml:lang="zh-TW"><![CDATA[必填]]></value>
+		<value xml:lang="fr"><![CDATA[Item essentielle]]></value>
+		<value xml:lang="de"><![CDATA[Pflichtfeld]]></value>
+		<value xml:lang="ru"><![CDATA[Обязательные данные]]></value>
+		<value xml:lang="es"><![CDATA[Requerido]]></value>
+		<value xml:lang="tr"><![CDATA[Gerekli Alan]]></value>
+		<value xml:lang="vi"><![CDATA[Bắt buộc]]></value>
+		<value xml:lang="mn"><![CDATA[Заавал бөглөх]]></value>
+	</item>
+	<item name="eid">
+		<value xml:lang="ko"><![CDATA[확장변수 이름]]></value>
+		<value xml:lang="en"><![CDATA[Name of extra variable]]></value>
+		<value xml:lang="jp"><![CDATA[拡張変数名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[扩展变量名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[延伸變數名稱]]></value>
+		<value xml:lang="de"><![CDATA[Name zusätzlicher Variablen]]></value>
+		<value xml:lang="ru"><![CDATA[Имя экстра переменных]]></value>
+		<value xml:lang="tr"><![CDATA[Ek değişkenin adı]]></value>
+		<value xml:lang="mn"><![CDATA[eгeдлийн нэр]]></value>
+	</item>
+	<item name="filter">
+		<item name="isnull">
+			<value xml:lang="ko"><![CDATA[%s에 값을 입력해주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please enter a value for %s]]></value>
+			<value xml:lang="jp"><![CDATA[%sに値を入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入%s]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入%s]]></value>
+			<value xml:lang="fr"><![CDATA[Entrez une valeur pour %s]]></value>
+			<value xml:lang="de"><![CDATA[Bitte geben Sie einen Wert für% s ein!]]></value>
+			<value xml:lang="es"><![CDATA[Introduzca valor en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[ Lütfen %s için  bir değer girin]]></value>
+			<value xml:lang="vi"><![CDATA[Xin vui lòng nhập giá trị cho %s]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ийг оруулна уу]]></value>
+		</item>
+		<item name="outofrange">
+			<value xml:lang="ko"><![CDATA[%s의 글자 수를 맞추어 주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please try to keep the text length of %s.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの文字の長さを合わせてください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请确认%s字数]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請確認 %s 字數]]></value>
+			<value xml:lang="fr"><![CDATA[Aligner la longueur du texte de %s]]></value>
+			<value xml:lang="de"><![CDATA[Bitte richten Sie die Textlänge von% s]]></value>
+			<value xml:lang="es"><![CDATA[Se ha excedido el máximo número de letras permitido en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen %s metninin uzunluğunu hizalayın.]]></value>
+			<value xml:lang="vi"><![CDATA[Xin vui lòng xếp thẳng hàng chiều dài văn bản của %s]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ийн үсгийн тоог тааруулна уу.]]></value>
+		</item>
+		<item name="equalto">
+			<value xml:lang="ko"><![CDATA[%s이(가) 잘못되었습니다.]]></value>
+			<value xml:lang="en"><![CDATA[The value of %s is invalid]]></value>
+			<value xml:lang="jp"><![CDATA[%sが正しくありません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s值有误。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s值有誤。]]></value>
+			<value xml:lang="fr"><![CDATA[La valeur de %s est invalide.]]></value>
+			<value xml:lang="de"><![CDATA[Der Wert von% s ist ungültig.]]></value>
+			<value xml:lang="es"><![CDATA[Valor inválido en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[%s değeri geçersiz.]]></value>
+			<value xml:lang="vi"><![CDATA[Giá trị của %s không hợp lệ]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ыг буруу оруулсан байна.]]></value>
+		</item>
+		<item name="invalid">
+			<value xml:lang="ko"><![CDATA[%s의 값이 올바르지 않습니다.]]></value>
+			<value xml:lang="en"><![CDATA[The value of %s is invalid.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの値が正しくありません。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s值有誤。]]></value>
+		</item>
+		<item name="invalid_email">
+			<value xml:lang="ko"><![CDATA[%s의 값은 올바른 메일 주소가 아닙니다.]]></value>
+			<value xml:lang="en"><![CDATA[%s is NOT a valid email address.]]></value>
+			<value xml:lang="jp"><![CDATA[%sのメール形式が正しくありません。(例: developers@xepressengine.com)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s格式有误。（例：developers@xpressengine.com)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s E-mail格式有誤。(例：developers@xpressengine.com)]]></value>
+			<value xml:lang="fr"><![CDATA[Le format de %s est invalide. ex) developers@xpressengine.com]]></value>
+			<value xml:lang="de"><![CDATA[% s ist eine ungültige Mail. ex) developers@xpressengine.com]]></value>
+			<value xml:lang="ru"><![CDATA[The format of %s is invalid. ex) developers@xpressengine.com]]></value>
+			<value xml:lang="es"><![CDATA[Formato email inválido en el %s (ej. developers@xpressengine.com)]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz. örn.) developers@xpressengine.com]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Ví dụ: emailname@yahoo.com]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэрийг буруу оруулсан байна. (Жнь: developers@xpressengine.com)]]></value>
+		</item>
+		<item name="invalid_userid">
+			<value xml:lang="ko"><![CDATA[%s의 값은 영문, 숫자, _만 가능하며 첫 글자는 영문이어야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The %s field allows only alphabets, numbers and underscore(_).
+			The first letter should be an alaphabet.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。
+			半角の英数字と記号「_」を組み合わせて入力してください。頭文字は半角英文字でなければなりません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能用英文，数字和 _，首个字符必须是英文字母。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只允許使用英文，數字和底線，開頭必須是英文。]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable.
+			Toutes les lettres devraient se composer des alphabets, des chiffres ou du soulignage(_) Et la première lettre doit être un de l'alphabet.]]></value>
+			<value xml:lang="de"><![CDATA[% s ist ungültig. Alle Werte sollten aus Alphatbet, Zahlen oder Unterstrich (_) und der erste Buchstabe sollte Alphabet.]]></value>
+			<value xml:lang="ru"><![CDATA[The format of %s is invalid.
+			All values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet]]></value>
+			<value xml:lang="es"><![CDATA[Formato inválido en el %s.
+			Sólo pueden introducir los alfabetos o los dígitos númericos o el guión bajo(_). Además, el primer valor sólo puede ser una letra de alfabeto]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz.
+			Tüm değerler alfabe harfleri, sayılar veya alttire(_)'den oluşmalı ve ilk karakter bir harf olmalıdır.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s Không hợp lệ.
+			Giá trị hợp lệ bao gồm các kí tự từ a-z, các chữ số và dấu gạch dưới (_).]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. .
+			Латин vсэг, тоо болон  '_'-р оруулж болох бeгeeд эхлэл нь vсэг байх шаардлагатай. ]]></value>
+		</item>
+		<item name="invalid_user_id">
+			<value xml:lang="ko"><![CDATA[%s의 값은 영문, 숫자, _만 가능하며 첫 글자는 영문이어야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The %s field allows only alphabets, numbers and underscore(_).
+			The first letter should be an alaphabet.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。
+			半角の英数字と記号「_」を組み合わせて入力してください。頭文字は半角英文字でなければなりません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能用英文，数字和 _，首个字符必须是英文字母。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只允許使用英文，數字和底線，開頭必須是英文。]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable.
+			Toutes les lettres devraient se composer des alphabets, des chiffres ou du soulignage(_) Et la première lettre doit être un de l'alphabet.]]></value>
+			<value xml:lang="de"><![CDATA[% s ist ungültig. Alle Werte sollten aus Alphatbet, Zahlen oder Unterstrich (_) und der erste Buchstabe sollte Alphabet.]]></value>
+			<value xml:lang="ru"><![CDATA[The format of %s is invalid.
+			All values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet]]></value>
+			<value xml:lang="es"><![CDATA[Formato inválido en el %s.
+			Sólo pueden introducir los alfabetos o los dígitos númericos o el guión bajo(_). Además, el primer valor sólo puede ser una letra de alfabeto]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz.
+			Tüm değerler alfabe harfleri, sayılar veya alttire(_)'den oluşmalı ve ilk karakter bir harf olmalıdır.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s Không hợp lệ.
+			Giá trị hợp lệ bao gồm các kí tự từ a-z, các chữ số và dấu gạch dưới (_).]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. .
+			Латин vсэг, тоо болон  '_'-р оруулж болох бeгeeд эхлэл нь vсэг байх шаардлагатай. ]]></value>
+		</item>
+		<item name="invalid_homepage">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. (예: http://www.xpressengine.com)]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. e.g.) http://xpressengine.com/]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。 (例: http://www.xepressengine.com)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s格式有误。（例： http://xpressengine.com/)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s格式有誤。(例： http://xpressengine.com/)]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable. ex) http://xpressengine.com/]]></value>
+			<value xml:lang="de"><![CDATA[Das Format von% s ist ungültig. Z.B. http://xpressengine.com/]]></value>
+			<value xml:lang="es"><![CDATA[Formato url inválido en el %s (ej: http://xpressengine.com/)]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz. örn.) http://xpressengine.com/]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Đúng sẽ là: http://xpressengine.vn hoặc http://www.xpressengine.vn]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна.. (Жнь: http://xpressengine.com/)]]></value>
+		</item>
+		<item name="invalid_url">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. (예: http://www.xpressengine.com)]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. e.g.) http://xpressengine.com/]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。例) http://xpressengine.com/]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s 格式錯誤。 例) http://xpressengine.com/]]></value>
+		</item>
+		<item name="invalid_korean">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. 한글로만 입력하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. Please enter Korean letters only.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。ハングルで入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能输入中文]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只能輸入中文]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable. Entrez seulement en coréen, S.V.P.]]></value>
+			<value xml:lang="de"><![CDATA[Das Format von% s ist ungültig. Bitte hier nur Koreanisch eingeben.]]></value>
+			<value xml:lang="es"><![CDATA[Sólo puede introducir los caracteres coreanos en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz. Lütfen sadece Korece karakterler giriniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Nội dung này bắt buộc phải sử dụng tiếng Hàn Quốc]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. Солонгосоор оруулах ёстой]]></value>
+		</item>
+		<item name="invalid_korean_number">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. 한글과 숫자로만 입력하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. Please enter Korean letters and numbers only.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。ハングルと半角数字で入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能输入中文或数字]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只能輸入中文或數字]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable. Entrez seulement des lettres d'alphabet coréen ou des chiffres, S.V.P.]]></value>
+			<value xml:lang="de"><![CDATA[Das Format von% s ist ungültig. Bitte hier nur Koreanisch oder Zahlen eingeben.]]></value>
+			<value xml:lang="es"><![CDATA[Sólo puede introducir los caracteres coreanos o números en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz. Lütfen Korece karakterler ve numaralar kullanınınız.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Nội dung này bắt buộc phải sử dụng tiếng Hàn Quốc hoặc các chữ số]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. Солонгос үсэг болон тоогоор оруулах хэрэгтэй.]]></value>
+		</item>
+		<item name="invalid_alpha">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. 영문으로만 입력하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. Please enter English alphabets only.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。半角英字で入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能输入英文字母]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只能輸入英文字母]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable. Entrez seulement en alphabet, S.V.P.]]></value>
+			<value xml:lang="de"><![CDATA[Das Format von% s ist ungültig. Bitte nur Alphabete eingeben.]]></value>
+			<value xml:lang="es"><![CDATA[Sólo puede introducir los alfabetos en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz. Lütfen sadece harfleri kullanınız.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. Зөвхөн латин үсгээр оруулах ёстой]]></value>
+		</item>
+		<item name="invalid_alpha_number">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. 영문과 숫자로만 입력하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. Please enter English alphabets and numbers only.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。半角英数字で入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能输入英文或数字]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只能輸入英文或數字]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable. Entrez seulement des lettres d'alphabet ou des chiffres.]]></value>
+			<value xml:lang="de"><![CDATA[Das Format von% s ist ungültig. Bitte nur Alphabete oder Zahlen eingeben.]]></value>
+			<value xml:lang="es"><![CDATA[Sólo puede introducir los alfanuméricos en el %s es inválido]]></value>
+			<value xml:lang="tr"><![CDATA[ %s biçimi geçersiz. Lütfen harfleri ve sayıları kullanınız.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z và các chữ số]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. Зөвхөн латин үсэг болон тоогоор л оруулах ёстой.]]></value>
+		</item>
+		<item name="invalid_mid">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. 첫 글자는 영문으로 시작해야 하며 '영문+숫자+_'로만 입력하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. Module ID should be begun with a letter. Subsequent characters may be letters, digits or underscore characters.]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s 格式錯誤。 模組名稱只能使用英文、數字及底線，開頭必須是英文。]]></value>
+		</item>
+		<item name="invalid_number">
+			<value xml:lang="ko"><![CDATA[%s의 형식이 잘못되었습니다. 숫자로만 입력하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[The format of %s is invalid. Please enter numbers only.]]></value>
+			<value xml:lang="jp"><![CDATA[%sの形式が正しくありません。半角数字で入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[%s只能输入数字]]></value>
+			<value xml:lang="zh-TW"><![CDATA[%s只能輸入數字]]></value>
+			<value xml:lang="fr"><![CDATA[La format de %s n'est pas convenable. Entrez seulement des chiffres.]]></value>
+			<value xml:lang="de"><![CDATA[Das Format von% s ist ungültig. Bitte nur Zahlen eingeben.]]></value>
+			<value xml:lang="es"><![CDATA[Sólo puede introducir los dígitos numéricos en el %s]]></value>
+			<value xml:lang="tr"><![CDATA[%s biçimi geçersiz . Lütfen sadece numaraları kullanın.]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng của %s không hợp lệ. Chỉ sử dụng các chữ số]]></value>
+			<value xml:lang="mn"><![CDATA[%s-ын хэлбэр буруу байна. Зөвхөн тоогоор оруулах ёстой.]]></value>
+		</item>
+	</item>
+	<item name="security_warning_embed">
+		<value xml:lang="ko"><![CDATA[보안 문제로 관리자 아이디로는 embed를 볼 수 없습니다. 확인하시려면 다른 아이디로 접속하세요]]></value>
+		<value xml:lang="en"><![CDATA[Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.]]></value>
+		<value xml:lang="jp"><![CDATA[セキュリティ問題のため、管理者IDではembedを見ることができません。<br />他のIDでログインしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[由于安全问题，不允许用系统管理员ID操作embed对象，请使用其他拥有管理权限的ID操作。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[基於安全因素，管理員無法檢視嵌入的物件。<BR /> 請使用其他非管理員帳號檢視。]]></value>
+		<value xml:lang="de"><![CDATA[Aus Sicherheitsgründen ist es nicht erlaubt, dass der Administrator den eingebetteten Teil sehen. Wenn Sie das sehen möchten, loggen Sie sich mit einem anderen ID ein.]]></value>
+		<value xml:lang="tr"><![CDATA[Güvenlik nedeniyle, yöneticiler yerleşik öğeleri görüntülemeye yetkili değildirler.<BR /> Yerleşik öğeleri görüntüleyebilmek için, lütfen yönetici olmayan bir hesap kullanın.]]></value>
+		<value xml:lang="vi"><![CDATA[Vì vấn đề bảo mật, nên Administrator không được phép xem các mục đã nhúng mã.<BR /> Để xem được chúng, hãy sử dụng một tên truy cập khác không có quyền quản trị.]]></value>
+	</item>
+	<item name="msg_pc_to_mobile">
+		<value xml:lang="ko"><![CDATA[모바일에 최적화된 화면으로 보기]]></value>
+		<value xml:lang="en"><![CDATA[View mobile optimized version of this page]]></value>
+		<value xml:lang="jp"><![CDATA[このページは、モバイル表示が可能です。モバイル表示へ移動しますか?]]></value>
+		<value xml:lang="zh-CN"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+		<value xml:lang="zh-TW"><![CDATA[此頁面有手機頁面，要移至手機頁面嗎？]]></value>
+		<value xml:lang="fr"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+		<value xml:lang="de"><![CDATA[Möchten Sie Mobile-Look?]]></value>
+		<value xml:lang="ru"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+		<value xml:lang="es"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+		<value xml:lang="tr"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+		<value xml:lang="vi"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+		<value xml:lang="mn"><![CDATA[이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?]]></value>
+	</item>
+	<item name="cmd_yes">
+		<value xml:lang="ko"><![CDATA[예]]></value>
+		<value xml:lang="en"><![CDATA[Yes]]></value>
+		<value xml:lang="jp"><![CDATA[はい]]></value>
+		<value xml:lang="zh-TW"><![CDATA[是]]></value>
+		<value xml:lang="de"><![CDATA[Ja]]></value>
+
+	</item>
+	<item name="cmd_no">
+		<value xml:lang="ko"><![CDATA[아니오]]></value>
+		<value xml:lang="en"><![CDATA[No]]></value>
+		<value xml:lang="jp"><![CDATA[いいえ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[否]]></value>
+		<value xml:lang="de"><![CDATA[Nein]]></value>
+	</item>
+	<item name="cmd_set_multilingual">
+		<value xml:lang="ko"><![CDATA[다국어 설정]]></value>
+		<value xml:lang="en"><![CDATA[Select Language]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇語言]]></value>
+		<value xml:lang="de"><![CDATA[Sprache wählen]]></value>
+	</item>
+	<item name="cmd_multilingual">
+		<value xml:lang="ko"><![CDATA[다국어]]></value>
+		<value xml:lang="en"><![CDATA[Language]]></value>
+		<value xml:lang="zh-TW"><![CDATA[語言]]></value>
+		<value xml:lang="de"><![CDATA[Sprache]]></value>
+	</item>
+	<item name="find_site">
+		<value xml:lang="ko"><![CDATA[사이트 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find Site]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尋找網站]]></value>
+		<value xml:lang="de"><![CDATA[Website Finden]]></value>
+	</item>
+	<item name="captcha">
+		<value xml:lang="ko"><![CDATA[Captcha]]></value>
+		<value xml:lang="en"><![CDATA[Captcha]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖形驗證]]></value>
+	</item>
+	<item name="reload">
+		<value xml:lang="ko"><![CDATA[새로고침]]></value>
+		<value xml:lang="en"><![CDATA[reload]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重新讀取]]></value>
+	</item>
+	<item name="play">
+		<value xml:lang="ko"><![CDATA[음성재생]]></value>
+		<value xml:lang="en"><![CDATA[play]]></value>
+		<value xml:lang="zh-TW"><![CDATA[播放]]></value>
+	</item>
+	<item name="use_and_display">
+		<value xml:lang="ko"><![CDATA[사용+노출]]></value>
+		<value xml:lang="en"><![CDATA[Use+Display]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Use+Display]]></value>
+	</item>
+	<item name="mobile_view">
+		<value xml:lang="ko"><![CDATA[모바일 뷰 사용]]></value>
+		<value xml:lang="en"><![CDATA[Mobile View]]></value>
+		<value xml:lang="jp"><![CDATA[モバイルスキン使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[开启移动版]]></value>
+		<value xml:lang="zh-TW"><![CDATA[手機瀏覽]]></value>
+		<value xml:lang="fr"><![CDATA[Use Mobile View]]></value>
+		<value xml:lang="ru"><![CDATA[Use Mobile View]]></value>
+		<value xml:lang="es"><![CDATA[Use Mobile View]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli Görünümü]]></value>
+		<value xml:lang="vi"><![CDATA[Xem bằng di động]]></value>
+	</item>
+	<item name="about_mobile_view">
+		<value xml:lang="ko"><![CDATA[스마트폰 등을 이용하여 접속할 때 모바일 화면에 최적화된 레이아웃을 이용하도록 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Mobile View will display the best layout when you access the website with your smart phone.]]></value>
+		<value xml:lang="jp"><![CDATA[スマートフォンなどを利用してサイトに接続した場合、モバイル画面に最適化されたレイアウトを使用するよう設定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[为智能手机访问网站，提供最佳视觉效果。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用手機瀏覽時將會顯示最適當的畫面。]]></value>
+		<value xml:lang="fr"><![CDATA[If accessing with a smartphone, display content with mobile layout.]]></value>
+		<value xml:lang="ru"><![CDATA[If accessing with a smartphone, display content with mobile layout.]]></value>
+		<value xml:lang="es"><![CDATA[If accessing with a smartphone, display content with mobile layout.]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli görünümü, mobil cihazlarla giriş yapılırken, mobil cihazlara uygun en iyi yerleşim düzenini göstermek içindir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu truy cập bằng thiết bị di động, nội dung sẽ được bố trí theo từng loại thiết bị.]]></value>
+	</item>
+</lang>
diff --git a/common/lang/mn.lang.php b/common/lang/mn.lang.php
deleted file mode 100644
index 1cfc7e041..000000000
--- a/common/lang/mn.lang.php
+++ /dev/null
@@ -1,320 +0,0 @@
-<?php
-/**
- * @file   common/lang/mn.lang.php
- * @author NHN (developers@xpressengine.com)
- * @brief  Mongolian Language pack
- **/
-
-// words for action, which is basically used
-$lang->cmd_write = 'Бичих';
-$lang->cmd_reply = 'Хариу';
-$lang->cmd_delete = 'Устгах';
-$lang->cmd_modify = 'Засах';
-$lang->cmd_edit = 'Өөрчлөх';
-$lang->cmd_view = 'Харах';
-$lang->cmd_view_all = 'Бүгдийг харах';
-$lang->cmd_list = 'Жагсаалт';
-$lang->cmd_prev = 'Өмнөх';
-$lang->cmd_next = 'Дараах';
-$lang->cmd_send_trackback = 'Холбоотой бичлэг илгээх';
-$lang->cmd_registration = $lang->cmd_submit = 'Оруулах';
-$lang->cmd_comment_registration = 'Коммент бичих';
-$lang->cmd_insert = 'Нэмэх';
-$lang->cmd_save = 'Хадгалах';
-$lang->cmd_load = 'Дуудах';
-$lang->cmd_input = 'Оруулах';
-$lang->cmd_search = 'Хайх';
-$lang->cmd_find = 'Хайх';
-$lang->cmd_replace = 'Солих';
-$lang->cmd_confirm = 'ОК';
-$lang->cmd_cancel = 'Устгах';
-$lang->cmd_back = 'Буцах';
-$lang->cmd_vote = 'Санал болгох';
-$lang->cmd_vote_down = 'Санал болгохгүй';
-$lang->cmd_declare = 'Мэдээлэх';
-$lang->cmd_cancel_declare = 'Мэдэгдлийг устгах';
-$lang->cmd_declared_list = 'Мэдээлсэн жагсаалт';
-$lang->cmd_copy = 'Хуулах';
-$lang->cmd_move = 'Шилжих';
-$lang->cmd_move_up = 'Дээш';
-$lang->cmd_move_down = 'Доош';
-$lang->cmd_add_indent = 'Нэмж оруулах';
-$lang->cmd_remove_indent = 'Хасах';
-$lang->cmd_management = 'Удирдах';
-$lang->cmd_make = 'Харуулах';
-$lang->cmd_select = 'Сонгох';
-$lang->cmd_select_all = 'Бүгдийг сонгох';
-$lang->cmd_unselect_all = 'Сонголтыг болих';
-$lang->cmd_reverse_all = "Дахин сонгох";
-$lang->cmd_close_all = 'Бүгдийг хаах';
-$lang->cmd_open_all = 'Бүгдийг нээх';
-$lang->cmd_reload = 'Дахин унших';
-$lang->cmd_close = 'Хаах';
-$lang->cmd_open = 'Нээх';
-$lang->cmd_setup = 'Тохируулга';
-$lang->cmd_addition_setup = 'Нэмэлт тохируулга';
-$lang->cmd_option = 'Опшион';
-$lang->cmd_apply = 'Хэрэгжүүлэх';
-$lang->cmd_open_calendar = 'Календар сонгох';
-$lang->cmd_send = 'Илгээх';
-$lang->cmd_print = 'Хэвлэх';
-$lang->cmd_scrap = 'Скрап';
-$lang->cmd_preview = 'Урьдчилан харах';
-$lang->cmd_reset = 'Дахин тохируулах';
-$lang->cmd_remake_cache = "cache файл дахин хийх";
-$lang->cmd_publish = "Олгох";
-$lang->cmd_layout_setup = 'Лэйаут тохируулах';
-$lang->cmd_layout_edit = 'Лэйаут өөрчлөх';
-$lang->cmd_search_by_ipaddress = 'IP хаягаар хайх';
-$lang->cmd_add_ip_to_spamfilter = 'Спэм филтерт IPнэмэх';
-
-$lang->enable = 'Боломжтой';
-$lang->disable = 'Боломжгүй';
-
-// 기본 단어
-$lang->menu = 'Menu';
-$lang->no = 'Дугаар';
-$lang->notice = 'Зарлал';
-$lang->secret = 'Нууц';
-$lang->category = $lang->category_srl = 'Категори';
-$lang->none_category = 'Категори байхгүй';
-$lang->none_image = 'No image';
-$lang->document_srl = 'Баримтын дугаар';
-$lang->user_id = 'ID';
-$lang->author = 'Бичсэн';
-$lang->password = 'Нууц дугаар';
-$lang->password1 = 'Нууц дугаар';
-$lang->password2 = 'Нууц дугаар шалгах';
-$lang->admin_id = 'Хариуцагч ID';
-//    $lang->writer = 'Бичлэг оруулагч';
-$lang->writer = 'Нэр';
-$lang->user_name = 'Нэр';
-$lang->nick_name = 'Ник';
-$lang->email_address = 'Мэйл хаяг';
-$lang->homepage = 'Вебхуудас';
-$lang->blog = 'Блог';
-$lang->birthday = 'Төрсөн өдөр';
-$lang->browser_title = 'Browser гарчиг';
-$lang->title = 'Гарчиг';
-$lang->title_content = 'Гарчиг+ Агуулга';
-$lang->topic = 'Сэдэв';
-$lang->replies = 'Хариулах';
-$lang->content = 'Агуулга';
-$lang->document = 'Бичлэг';
-$lang->comment = 'Коммент';
-$lang->description = 'Тайлбар';
-$lang->trackback = 'Холбоотой бичлэг';
-$lang->tag = 'tag';
-$lang->allow_comment = 'Коммент зөвшөөрнө';
-$lang->lock_comment = 'Коммент түгжих';
-$lang->allow_trackback = 'Холбоотой бичлэг зөвшөөрнө';
-$lang->uploaded_file = 'Файл оруулах';
-$lang->grant = 'Эрх';
-$lang->target = 'Зорилго';
-$lang->total = 'Нийт';
-$lang->total_count = 'Нийт тоо';
-$lang->ipaddress = 'IP хаяг';
-$lang->path = 'Байрлал';
-$lang->cart = 'Сонгосон төрөл';
-$lang->friend = 'Найз';
-$lang->notify = 'Мэдээлэх';
-$lang->order_target = 'Цэгцлэх зорилго';
-$lang->order_type = 'Цэгцлэх арга';
-$lang->order_asc = 'Багаас ихрүү';
-$lang->order_desc = 'Ихээс бага руу';
-$lang->file = 'file';
-
-
-$lang->mid = 'Модиул нэр';
-$lang->sid = 'Тvр сайтын нэр';
-$lang->layout = 'Лэйаут';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Вижет ';
-$lang->module = 'Модиул';
-$lang->skin = 'Скин';
-$lang->mobile_skin = 'Mobile Theme';
-$lang->colorset = 'Өнгө тохируулах';
-$lang->extra_vars = 'Өргөжүүлэх тоо';
-$lang->domain = 'Domain';
-$lang->url = 'URL';
-$lang->document_url = 'Бичлэгийн хаяг';
-$lang->trackback_url = 'Холбоотой бичлэгний хаяг';
-$lang->blog_name = 'Блог нэр';
-$lang->excerpt = 'excerpt';
-
-$lang->document_count = 'Бичлэгийн тоо';
-$lang->page_count = 'Хуудасны тоо';
-$lang->list_count = 'Жагсаалтын тоо';
-$lang->search_list_count = 'Хайлтын жагсаалт';
-$lang->readed_count = 'Уншсан';
-$lang->voted_count = 'vote';
-$lang->comment_count = 'Комментын тоо';
-$lang->member_count = 'Гишүүдийн тоо';
-$lang->date = 'Date';
-$lang->regdate = 'Оруулсан өдөр';
-$lang->last_update = 'Сүүлд засварласан өдөр';
-$lang->last_post = 'Хамгийн сүүлд оруулсан';
-$lang->signup_date = 'Бүртгүүлсэн өдөр';
-$lang->last_login = 'Хамгийн сүүлд нэвтэрсэн';
-$lang->first_page = 'Эхний хуудас';
-$lang->last_page = 'Сүүлчийн хуудас';
-$lang->search_target = 'Хайх зорилго';
-$lang->search_keyword = 'Хайх үг';
-$lang->is_default = 'Үндсэн';
-
-$lang->no_documents = 'Оруулсан бичлэг байхгүй';
-
-$lang->board_manager = 'Board удирдах';
-$lang->member_manager = 'Гишүүн удирдах';
-$lang->layout_manager = 'Лэйаут удирдах';
-
-$lang->use = 'Хэрэглэх';
-$lang->notuse = 'Хэрэглэхгүй';
-$lang->not_exists = 'Байхгүй';
-
-$lang->public = 'Нийтийн';
-$lang->private = 'Нууцлах';
-
-$lang->unit_sec = 'Секунд';
-$lang->unit_min = 'Минут';
-$lang->unit_hour = 'Цаг';
-$lang->unit_day = 'Өдөр';
-$lang->unit_month = 'Сар';
-$lang->unit_year = 'Жил';
-
-$lang->unit_week = array(
-	'Monday' => 'Да',
-	'Tuesday' => 'Мя',
-	'Wednesday' => 'Лха',
-	'Thursday' => 'Пv',
-	'Friday' => 'Ба',
-	'Saturday' => 'Бя',
-	'Sunday' => 'Ня',
-
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'eглee',
-	'pm' => 'орой',
-	'AM' => 'eглee',
-	'PM' => 'орой',
-);
-
-
-$lang->time_gap = array(
-	'min' => '%d минутын eмнe',
-	'mins' => '%d минутын eмнe',
-	'hour' => '%d цагийн eмнe',
-	'hours' => '%d цагийн eмнe',
-);
-
-// 설명 관련
-$lang->about_tag = 'tag оруулахдаа таслал ашиглавал давтан оруулж болно';
-$lang->about_layout = 'Лэйаут нь модиулын гадаад байдлыг чимж өгнө. Дээрх лэйаут менюнээс удирдаж болно';
-
-// 메세지 관련
-$lang->msg_call_server = 'Сервер ачаалж байна. Түр хүлээнэ үү.';
-$lang->msg_db_not_setted = 'DB тохируулга хийгдээгүй байна.';
-$lang->msg_invalid_queryid = 'Query ID буруу бичигдсэн байна.';
-$lang->msg_not_permitted = 'Эрх байхгүй байна';
-$lang->msg_input_password = 'Нууц дугаараа оруулна уу';
-$lang->msg_invalid_document = 'Бичлэгийн дугаар буруу байна';
-$lang->msg_invalid_request = 'Буруу шаардлага байна';
-$lang->msg_invalid_password = 'Нууц дугаар буруу байна';
-$lang->msg_error_occured = 'Алдаа гарлаа';
-$lang->msg_not_founded = 'Зорилгыг олж чадсангүйү';
-$lang->msg_no_result = 'Хайлтын үр дүн байхгүй байна';
-$lang->msg_fail_to_request_open = 'Холболт амжилтгvй боллоо.';
-$lang->msg_invalid_format = 'Буруу хэлбэр байна.';
-
-$lang->msg_not_permitted_act = 'Хүсэлт гаргасан үйлдлийг хэрэгжүүлэх эрх байхгүй.';
-$lang->msg_module_does_not_exist = 'Хүссэн модиулыг олж чадсангүй';
-$lang->msg_module_is_not_standalone = 'Хүсэлт гаргасан модиул нь бие даан хэрэгжих боломжгүй';
-
-$lang->success_registed = 'Бүртгэгдсэн';
-$lang->success_declared = 'Мэдээлэгдсэн';
-$lang->success_updated = 'Засварлагдсан';
-$lang->success_deleted = 'Устгагдсан';
-$lang->success_voted = 'Санал болгогдсон';
-$lang->success_blamed = 'Санал болгогдоогүй';
-$lang->success_moved = 'Шилжсэн';
-$lang->success_sended = 'Илгээгдсэн';
-$lang->success_reset = 'Reset';
-$lang->success_leaved = 'Гишүүнээс гарсан';
-$lang->success_saved = 'Хадгалагдсан';
-
-$lang->fail_to_delete = 'Устгалт амжилтгүй боллоо';
-$lang->fail_to_move = 'Шилжилт амжилтгүй боллоо';
-
-$lang->failed_voted = 'Санал болгох боломжгүй';
-$lang->failed_blamed = 'Санал болгохгүй байх боломжгүй';
-$lang->failed_declared = 'Мэдээлэх боломжгүй';
-$lang->fail_to_delete_have_children = 'Хариулт бичлэг байгаа тул устгах боломжгүй';
-
-$lang->confirm_submit = 'Оруулах уу?';
-$lang->confirm_logout = 'Гарах уу?';
-$lang->confirm_vote = 'Санал болгох уу?';
-$lang->confirm_delete = 'Устгах уу?';
-$lang->confirm_move = 'Шилжих үү?';
-$lang->confirm_reset = 'Reset хийх үү?';
-$lang->confirm_leave = 'Гишүүнээс гарах уу?';
-$lang->confirm_update = 'Are you sure to update?';
-
-$lang->column_type = 'Хэлбэр';
-$lang->column_type_list['text'] = 'Нэг мөрөөр оруулах (text)';
-$lang->column_type_list['homepage'] = 'Веб хуудас хэлбэр (url)';
-$lang->column_type_list['email_address'] = 'Мэйл хэлбэр (email)';
-$lang->column_type_list['tel'] = 'Утасны дугаар хэлбэр (phone)';
-$lang->column_type_list['textarea'] = 'Олон мөрөөр оруулах (textarea)';
-$lang->column_type_list['checkbox'] = 'Олон сонголт хийх (checkbox)';
-$lang->column_type_list['select'] = 'Ганц сонголт хийх (select)';
-$lang->column_type_list['radio'] = 'Нэг eдeр сонгох(radio)';
-$lang->column_type_list['kr_zip'] = 'Солонгос хаяг (zip)';
-$lang->column_type_list['date'] = 'Онсар  (Жил сар өдөр)';
-//$lang->column_type_list['jp_zip'] = '일본주소 (zip)';
-
-$lang->column_name = 'Баганын нэр';
-$lang->column_title = 'Баганын гарчиг';
-$lang->default_value = 'Үндсэн байдал';
-$lang->is_active = 'Идэвхжүүлэх';
-$lang->is_required = 'Заавал бөглөх';
-$lang->eid = 'eгeдлийн нэр';
-
-// ftp 관련
-$lang->ftp_form_title = 'FTP мэдээлэл оруулах';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP password will not be stored';
-$lang->cmd_check_ftp_connect = 'FTP холболт шалгах';
-$lang->about_ftp_info = "
-	FTP мэдээлэл нь дараах тохиолдолд хэрэглэгдэх боломжтой.<br />
-	1. PHP의 safe_mode=Onбайх тохиолдолд , FTP мэдээллийг ашиглан XE-г бvрэн ажиллуулахаар болгож болно.<br />
-	2. Автомат опдэйт хийх зэрэгт FTP мэдээллийг ашиглаж болно.<br />
-	Тус FTP мэпээлэл нь files/config/ftp.config.php файл дотор хадгалагдна.<br />
-	Идэвхжvvлсэний дараа хариуцагчийн хуудаснаас FTP мэдээллийг eeрчлeх болон устгаж болно.<br />
-";
-$lang->msg_safe_mode_ftp_needed = 'PHP의 safe_mode가 Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар XE идэвжvvлэх болон хэрэглэх боломжтой болно.';
-$lang->msg_ftp_not_connected = 'localhost-ын FTP холболт амжилтгvй боллоо. FTP дугаараа шалгах буюу эсвэл FTP vйлчилгээг ашиглах боломжтой эсэхээ шалгана уу.';
-$lang->msg_ftp_invalid_auth_info = 'Таны оруулсан FTP мэдээллээр нэвтэрч чадсангvй. FTPмэдээллээ шалгана уу.';
-$lang->msg_ftp_mkdir_fail = 'FTP-г ашиглан eгсeн eгeгдлийг биелvvлж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.';
-$lang->msg_ftp_chmod_fail = 'FTP-г ашиглан eeрчлeлтийг хийж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.';
-$lang->msg_ftp_connect_success = 'FTP холболт болон баталгаажуулалт хийгдлээ.';
-
-
-// xml filter에서 사용되는 javascript용 alert msg
-$lang->filter->isnull = '%s-ийг оруулна уу';
-$lang->filter->outofrange = '%s-ийн үсгийн тоог тааруулна уу.';
-$lang->filter->equalto = '%s-ыг буруу оруулсан байна.';
-$lang->filter->invalid_email = '%s-ын хэлбэрийг буруу оруулсан байна. (Жнь: developers@xpressengine.com)';
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s-ын хэлбэр буруу байна. .\\n Латин vсэг, тоо болон  \'_\'-р оруулж болох бeгeeд эхлэл нь vсэг байх шаардлагатай. ";
-$lang->filter->invalid_homepage = '%s-ын хэлбэр буруу байна.. (Жнь: http://xpressengine.com/)';
-$lang->filter->invalid_korean = '%s-ын хэлбэр буруу байна. Солонгосоор оруулах ёстой';
-$lang->filter->invalid_korean_number = '%s-ын хэлбэр буруу байна. Солонгос үсэг болон тоогоор оруулах хэрэгтэй.';
-$lang->filter->invalid_alpha = '%s-ын хэлбэр буруу байна. Зөвхөн латин үсгээр оруулах ёстой';
-$lang->filter->invalid_alpha_number = '%s-ын хэлбэр буруу байна. Зөвхөн латин үсэг болон тоогоор л оруулах ёстой.';
-$lang->filter->invalid_number = '%s-ын хэлбэр буруу байна. Зөвхөн тоогоор оруулах ёстой.';
-
-$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/ru.lang.php b/common/lang/ru.lang.php
deleted file mode 100644
index 94ba44421..000000000
--- a/common/lang/ru.lang.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * @file   ru.lang.php
- * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
- * @brief  Russian basic language pack
- **/
-
-// Основные слова для действий
-$lang->cmd_write = 'Написать';
-$lang->cmd_reply = 'Ответить';
-$lang->cmd_delete = 'Удалить';
-$lang->cmd_modify = 'Изменить';
-$lang->cmd_edit = 'Редактировать';
-$lang->cmd_view = 'Просмотреть';
-$lang->cmd_view_all = 'Просмотреть все';
-$lang->cmd_list = 'Список';
-$lang->cmd_prev = 'Предыдущее';
-$lang->cmd_next = 'Следующее';
-$lang->cmd_send_trackback = 'Отправить трекбек';
-$lang->cmd_registration = $lang->cmd_submit = 'Принять';
-$lang->cmd_comment_registration = 'Добавить запись';
-$lang->cmd_insert = 'Вставить';
-$lang->cmd_save = 'Сохранить';
-$lang->cmd_load = 'Загрузить';
-$lang->cmd_input = 'Ввести';
-$lang->cmd_search = 'Искать';
-$lang->cmd_find = 'Поиск';
-$lang->cmd_replace = 'Поменять';
-$lang->cmd_confirm = 'Подтвердить';
-$lang->cmd_cancel = 'Отменить';
-$lang->cmd_back = 'Вернуться';
-$lang->cmd_vote = 'Рекомендовать';
-$lang->cmd_vote_down = 'Критиковать';
-$lang->cmd_declare = 'Пожаловаться';
-$lang->cmd_cancel_declare = 'Отменить жалобу';
-$lang->cmd_declared_list = 'Список жалоб';
-$lang->cmd_copy = 'Копировать';
-$lang->cmd_move = 'Переместить';
-$lang->cmd_move_up = 'Вверх';
-$lang->cmd_move_down = 'Вниз';
-$lang->cmd_add_indent = 'Отступ вправо';
-$lang->cmd_remove_indent = 'Отступ влево';
-$lang->cmd_management = 'Управление';
-$lang->cmd_make = 'Создать';
-$lang->cmd_select = 'Выделить';
-$lang->cmd_select_all = 'Выделить все';
-$lang->cmd_unselect_all = 'Убрать выделение ВСЕХ';
-$lang->cmd_reverse_all = 'Перевернуть';
-$lang->cmd_close_all = 'Закрыть все';
-$lang->cmd_open_all = 'Открыть все';
-$lang->cmd_reload = 'Перегрузить';
-$lang->cmd_close = 'Закрыть';
-$lang->cmd_open = 'Открыть';
-$lang->cmd_setup = 'Конфигурация';
-$lang->cmd_addition_setup = 'Дополнительная настройка';
-$lang->cmd_option = 'Опция';
-$lang->cmd_apply = 'Применить';
-$lang->cmd_open_calendar = 'Выбрать дату';
-$lang->cmd_send = 'Отправить';
-$lang->cmd_print = 'Напечатать';
-$lang->cmd_scrap = 'В черновики';
-$lang->cmd_preview = 'Предпросмотр';
-$lang->cmd_reset = 'Сброс';
-$lang->cmd_remake_cache = "Пересоздать файл кэша";
-$lang->cmd_publish = "Опубликовать";
-$lang->cmd_layout_setup = 'Конфигурировать лейаут';
-$lang->cmd_layout_edit = 'Редактировать лейаут';
-$lang->cmd_search_by_ipaddress = 'Искать по IP адресу';
-$lang->cmd_add_ip_to_spamfilter = 'Добавить IP в спамфильтры';
-
-$lang->enable = 'Включено';
-$lang->disable = 'Выключено';
-
-// Основные слова
-$lang->menu = 'Меню';
-$lang->no = 'No.';
-$lang->notice = 'Уведомление';
-$lang->secret = 'Секрет';
-$lang->category = $lang->category_srl = 'Категория';
-$lang->none_category = 'Без категории';
-$lang->none_image = 'Картинки нет';
-$lang->document_srl = 'No  документа';
-$lang->user_id = 'ID пользователя';
-$lang->author = 'Автор';
-$lang->password = 'Пароль';
-$lang->password1 = 'Пароль';
-$lang->password2 = 'Подтверждение пароля';
-$lang->admin_id = 'ID админа';
-$lang->writer = 'Автор записи';
-$lang->user_name = 'Имя пользователя';
-$lang->nick_name = 'Ник';
-$lang->email_address = 'Email';
-$lang->homepage = 'Домашняя страница';
-$lang->blog = 'Блог';
-$lang->birthday = 'Дата рождения';
-$lang->browser_title = 'Заголовок браузера';
-$lang->title = 'Заголовок';
-$lang->title_content = 'Заголовок+Содержание';
-$lang->topic = 'Тема';
-$lang->replies = 'Ответы';
-$lang->content = 'Содержание';
-$lang->document = 'Статьи';
-$lang->comment = 'Комментарии';
-$lang->description = 'Описание';
-$lang->trackback = 'Трекбек';
-$lang->tag = 'Тег';
-$lang->allow_comment = 'Позволить комментарии';
-$lang->lock_comment = 'Заблокировать комментарии';
-$lang->allow_trackback = 'Позволить трекбек';
-$lang->uploaded_file = 'Прикрепить файл';
-$lang->grant = 'Права доступа';
-$lang->target = 'Назначение';
-$lang->total = 'Всего';
-$lang->total_count = 'Общее количество';
-$lang->ipaddress = 'IP адрес';
-$lang->path = 'Путь';
-$lang->cart = 'Выбранный объект';
-$lang->friend = 'Друзья';
-$lang->notify = 'Уведомление';
-$lang->order_target = 'Align Target';
-$lang->order_type = 'Тип сортировки';
-$lang->order_asc = 'снизу вверх';
-$lang->order_desc = 'сверху вниз';
-$lang->file = 'файл';
-
-$lang->mid = 'Имя Модуля';
-$lang->sid = 'Site Name';
-$lang->layout = 'Лейаут';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Виджет';
-$lang->module = 'Модуль';
-$lang->skin = 'Тема';
-$lang->mobile_skin = 'Mobile Theme';
-$lang->colorset = 'Цветовой набор';
-$lang->extra_vars = 'Дополнительные переменные.';
-
-$lang->domain = "Доменное имя";
-$lang->url = "URL";
-$lang->document_url = 'URL записи';
-$lang->trackback_url = 'URL трекбека';
-$lang->blog_name = 'Название блога';
-$lang->excerpt = 'Цитата';
-
-$lang->document_count = 'Всего записей';
-$lang->page_count = 'Количество страниц';
-$lang->list_count = 'Количество списков';
-$lang->search_list_count = 'Поиск Список кол';
-$lang->readed_count = 'Просмотры';
-$lang->voted_count = 'Голоса';
-$lang->comment_count = 'Комментарии';
-$lang->member_count = 'Количество пользователей';
-$lang->date = 'Дата';
-$lang->regdate = 'Дата регистрации';
-$lang->last_update = 'Последнее обновление';
-$lang->last_post = 'Последний комментарий';
-$lang->signup_date = 'Дата регистрации';
-$lang->last_login = 'Последний вход';
-$lang->first_page = 'Первая страница';
-$lang->last_page = 'Последняя страница';
-$lang->search_target = 'Назначение поиска';
-$lang->search_keyword = 'Ключевые слова';
-$lang->is_default = 'По умолчанию';
-
-$lang->no_documents = 'Нет записей';
-
-$lang->board_manager = 'Настройки форума';
-$lang->member_manager = 'Настройки пользователей';
-$lang->layout_manager = 'Настройки лейаута';
-
-$lang->use = 'Использовать';
-$lang->notuse = 'Не использовать';
-$lang->not_exists = "Отсутствует";
-
-$lang->public = 'Показать всем';
-$lang->private = 'Не показывать';
-
-$lang->unit_sec = 'сек.';
-$lang->unit_min = 'мин.';
-$lang->unit_hour = 'ч.';
-$lang->unit_day = 'д.';
-$lang->unit_week = 'нед.';
-$lang->unit_month = 'мес.';
-$lang->unit_year = 'г.';
-
-$lang->unit_week = array(
-	'Monday' => 'Понедельник',
-	'Tuesday' => 'Вторник',
-	'Wednesday' => 'Среда',
-	'Thursday' => 'Четверг',
-	'Friday' => 'Пятница',
-	'Saturday' => 'Суббота',
-	'Sunday' => 'Воскресенье',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => '%d минуту назад',
-	'mins' => '%d минут назад',
-	'hour' => '%d час назад',
-	'hours' => '%d часов назад',
-);
-
-// Описания
-$lang->about_tag = 'Вы можете применить несколько тегов, разделенных запятыми (,)';
-$lang->about_layout = 'Лейауты украшают внешний вид Ваших модулей. Вы можете сконфигурировать их с помощью меню Лейаут сверху';
-
-// Сообщение
-$lang->msg_call_server = 'Идет обработка. Пожалуйста, подождите...';
-$lang->msg_db_not_setted = 'Даза данных не сконфигурирована';
-$lang->msg_dbconnect_failed = "Произошла ошибка подключения к базе данных.\nПожалуйста, проверьте иформацию базы данных еще раз";
-$lang->msg_invalid_queryid = 'Указанный ID запроса неверен';
-$lang->msg_not_permitted = 'У Вас нет доступа';
-$lang->msg_input_password = 'Пожалуйста, введите пароль';
-$lang->msg_invalid_document = 'Неверный номер статьи';
-$lang->msg_invalid_request = 'Неверный запрос';
-$lang->msg_invalid_password = 'Неверный пароль';
-$lang->msg_error_occured = 'Произошла ошибка';
-$lang->msg_not_founded = 'Сообщение не найдено';
-$lang->msg_no_result = 'Ничего не найдено';
-$lang->msg_fail_to_request_open = 'Ошибка в запрашиваемом соединении';
-$lang->msg_invalid_format = 'Неверный формат';
-
-$lang->msg_not_permitted_act = 'У Вас нет прав для исполнения запрошенного действия';
-$lang->msg_module_does_not_exist = "Невозможно найти запрашиваемый модуль.\nПросьба обратиться к администратору";
-$lang->msg_module_is_not_standalone = 'Запрошенный модуль не может быть исполнен независимо';
-$lang->msg_default_url_is_not_defined = 'Default URL is not define';
-
-$lang->success_registed = 'Зарегистрировано успешно';
-$lang->success_declared = 'Жалоба отправлена';
-$lang->success_updated = 'Обновление успешно';
-$lang->success_deleted = 'Удалено успешно';
-$lang->success_voted = 'Рекомендовано успешно';
-$lang->success_blamed = 'Критика принята';
-$lang->success_moved = 'Перемещено успешно';
-$lang->success_sended = 'Отправлено успешно';
-$lang->success_reset = 'Сброшено успешно';
-$lang->success_leaved = 'Пользователь удален';
-$lang->success_saved = 'Сохранено успешно';
-
-$lang->fail_to_delete = 'Не может быть удалено';
-$lang->fail_to_move = 'Перемещение невозможно';
-
-$lang->failed_voted = 'Рекоммендовать невозможно';
-$lang->failed_blamed = 'Критиковать невозможно';
-$lang->failed_declared = 'Пожаловаться невозможно';
-$lang->fail_to_delete_have_children = 'Невозможно удаление из-за наличия ответов в записи';
-
-$lang->confirm_submit = 'Вы подтверждаете запись?';
-$lang->confirm_logout = 'Вы подтверждаете выход?';
-$lang->confirm_vote = 'Рекомендовать?';
-$lang->confirm_delete = 'Удалить?';
-$lang->confirm_restore = 'Восстановить?';
-$lang->confirm_move = 'Переместить?';
-$lang->confirm_reset = 'Вы подтверждаете сброс?';
-$lang->confirm_leave = 'Вы подтверждаете удаление аккаунта?';
-$lang->confirm_update = 'Обновить?';
-
-$lang->column_type = 'Тип колонки';
-$lang->column_type_list['text'] = 'Однострочное окно ввода';
-$lang->column_type_list['homepage'] = 'url';
-$lang->column_type_list['email_address'] = 'email';
-$lang->column_type_list['tel'] = 'номер телефона';
-$lang->column_type_list['textarea'] = 'Многострочное окно ввода';
-$lang->column_type_list['checkbox'] = 'Чекбокс (мульти вариант)';
-$lang->column_type_list['select'] = 'Выбор (один вариант)';
-$lang->column_type_list['radio'] = 'Кнопка радио (радио)';
-$lang->column_type_list['kr_zip'] = 'Почтовый индекс (Корейский)';
-$lang->column_type_list['date'] = 'Дата (гггг / мм / дд)';
-//$lang->column_type_list['jp_zip'] = 'почтовый индекс (японский)';
-$lang->column_name = 'Имя колонки';
-$lang->column_title = 'Заголовок колонки';
-$lang->default_value = 'Стандартное значение';
-$lang->is_active = 'Активация';
-$lang->is_required = 'Обязательные данные';
-$lang->eid = 'Имя экстра переменных';
-
-// ftp 관련
-$lang->ftp_form_title = 'Введите данные FTP';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP password will not be stored';
-$lang->cmd_check_ftp_connect = 'Check FTP Connection';
-$lang->about_ftp_info = "
-   FTP account information can be used in following cases. <br />
-	1. If safe_mode setting of PHP is on, XE will be installed using FTP.  <br />
-	2. Automatic updates might use FTP information. <br />
-	   This account info will be stored in files/config/ftp.config.php <br />
-	   After installation, you can modify or delete the account info at the administration page. <br />
-";
-
- $lang->msg_safe_mode_ftp_needed = "If safe_mode setting of PHP is on, you should input FTP account information to install XE.";
-$lang->msg_ftp_not_connected = "Connection to localhost via FTP failed. Please check the port number and if FTP service is available.";
-$lang->msg_ftp_invalid_auth_info = "Authentication failed. Please check the username and password.";
-$lang->msg_ftp_mkdir_fail = "Directory creation failed. Please check the permission of FTP account.";
-$lang->msg_ftp_chmod_fail = "Chmod failed. Please check the permission and configuration of FTP server.";
-$lang->msg_ftp_connect_success = "Connection and authentication to the FTP server succeeded.";
-
-$lang->ftp_path_title = 'FTP Path Information';
-$lang->msg_ftp_installed_realpath = 'Absolute Path of XE';
-$lang->msg_ftp_installed_ftp_realpath = 'Absolute FTP Path of XE';
-
-// Alert messages for Javascript using by XML filter
-$lang->filter->isnull = 'Please input a value for %s';
-$lang->filter->outofrange = 'Please align the text length of %s';
-$lang->filter->equalto = "The value of %s is invalid";
-$lang->filter->invalid_email = "The format of %s is invalid. ex) developers@xpressengine.com";
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "The format of %s is invalid.\\nAll values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet";
-$lang->filter->invalid_homepage = "The format of %s is invalid. ex) http://xpressengine.com/";
-$lang->filter->invalid_korean = "The format of %s is invalid. Please input Korean only";
-$lang->filter->invalid_korean_number = "The format of %s is invalid. Please input Korean or numbers";
-$lang->filter->invalid_alpha = "The format of %s is invalid. Please input alphabets only";
-$lang->filter->invalid_alpha_number = "The format of %s is invalid. Please input alphabets or numbers";
-$lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only";
-
-$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/tr.lang.php b/common/lang/tr.lang.php
deleted file mode 100644
index f07344b94..000000000
--- a/common/lang/tr.lang.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-/**
- * @file   common/lang/en.lang.php
- * @author NHN (developers@xpressengine.com)
- * @brief  Türkçe Dil Paketi (Sadece temel kelimeleri içerir.)
- **/
-
-// words for action, which is basically used
-$lang->cmd_write = 'Yeni';
-$lang->cmd_reply = 'Cevapla';
-$lang->cmd_delete = 'Sil';
-$lang->cmd_modify = 'Değiştir';
-$lang->cmd_edit = 'Düzenle';
-$lang->cmd_view = 'Görüntüle';
-$lang->cmd_view_all = 'Tümünü Görüntüle';
-$lang->cmd_list = 'Listele';
-$lang->cmd_prev = 'Önceki';
-$lang->cmd_next = 'Sonraki';
-$lang->cmd_send_trackback = 'Geri izleme Gönder';
-$lang->cmd_registration = $lang->cmd_submit = 'Gönder';
-$lang->cmd_comment_registration = 'Yorum Ekle';
-$lang->cmd_insert = 'Ekle';
-$lang->cmd_save = 'Gönder';
-$lang->cmd_load = 'Yükle';
-$lang->cmd_input = 'Veri gir';
-$lang->cmd_search = 'Ara';
-$lang->cmd_find = 'Bul';
-$lang->cmd_replace = 'Değiştir';
-$lang->cmd_confirm = 'Doğrula';
-$lang->cmd_cancel = 'İptal et';
-$lang->cmd_back = 'Önceki Sayfa';
-$lang->cmd_vote = 'Tavsiye et';
-$lang->cmd_vote_down = 'Eleştir';
-$lang->cmd_declare = 'Bildir';
-$lang->cmd_cancel_declare = 'Bildirmeyi Geri al';
-$lang->cmd_declared_list = 'Bildirme listesi';
-$lang->cmd_copy = 'Kopyala';
-$lang->cmd_move = 'Taşı';
-$lang->cmd_move_up = 'Yukarı';
-$lang->cmd_move_down = 'Aşağı';
-$lang->cmd_add_indent = 'Satırbaşı';
-$lang->cmd_remove_indent = 'Çıkıntı';
-$lang->cmd_management = 'Yönetimi';
-$lang->cmd_make = 'Yeni Oluştur';
-$lang->cmd_select = 'Seç';
-$lang->cmd_select_all = 'Tümünü Seç';
-$lang->cmd_unselect_all = 'Tümünü Seçimden çıkart';
-$lang->cmd_reverse_all = 'Ters çevir';
-$lang->cmd_close_all = 'Tümünü Kapat';
-$lang->cmd_open_all = 'Tümünü Aç';
-$lang->cmd_reload = 'Tekrar yükle';
-$lang->cmd_close = 'Kapat';
-$lang->cmd_open = 'Aç';
-$lang->cmd_setup = 'Yapılandır';
-$lang->cmd_addition_setup = 'Ek kurulum';
-$lang->cmd_option = 'Seçenek';
-$lang->cmd_apply = 'Uygula';
-$lang->cmd_open_calendar = 'Bir tarih belirle';
-$lang->cmd_send = 'Gönder';
-$lang->cmd_print = 'Yazdır';
-$lang->cmd_scrap = 'Bozuk olarak ayır';
-$lang->cmd_preview = 'Önizleme';
-$lang->cmd_reset = 'İlk duruma getir';
-$lang->cmd_remake_cache = "Önbellek dosyasını tekrar oluştur";
-$lang->cmd_publish = "Yayınla";
-$lang->cmd_layout_setup = 'Yerleşim düzenini yapılandır';
-$lang->cmd_layout_edit = 'Yerleşim düzeninin düzenle';
-$lang->cmd_search_by_ipaddress = 'IP Adresiyle ara';
-$lang->cmd_add_ip_to_spamfilter = 'Spamfilter\'a IPyi ekle';
-
-$lang->enable = 'Seçilir kıl';
-$lang->disable = 'Seçilemez kıl';
-
-// Essential Words
-$lang->menu = 'Menü';
-$lang->no = 'No';
-$lang->notice = 'Duyuru';
-$lang->secret = 'Gizli';
-$lang->category = $lang->category_srl = 'Kategori';
-$lang->none_category = 'Kategori Yok';
-$lang->none_image = 'Resim bulunmamaktadır';
-$lang->document_srl = 'Belge No';
-$lang->user_id = 'Kullanıcı Kimliği';
-$lang->author = 'Geliştirici';
-$lang->password = 'Şifre';
-$lang->password1 = 'Şifre';
-$lang->password2 = 'Şifreyi Doğrula';
-$lang->admin_id = 'Yönetici Kimliği';
-$lang->writer = 'Yazar';
-$lang->user_name = 'Kullanıcı Adı';
-$lang->nick_name = 'Takma Ad';
-$lang->email_address = 'E-posta';
-$lang->homepage = 'Websayfası';
-$lang->blog = 'Blog';
-$lang->birthday = 'Doğum günü';
-$lang->browser_title = 'Tarayıcı Başlığı';
-$lang->title = 'Konu';
-$lang->title_content = 'Konu+İçerik';
-$lang->topic = 'Konu';
-$lang->replies = 'Cevapla';
-$lang->content = 'İçerik';
-$lang->document = 'Makale';
-$lang->comment = 'Yorum';
-$lang->description = 'Tanım';
-$lang->trackback = 'Geri izleme';
-$lang->tag = 'Etiket';
-$lang->allow_comment = 'Yorumlara izin ver';
-$lang->lock_comment = 'Yorumları engelle';
-$lang->allow_trackback = 'Geri izlemelere izin ver';
-$lang->uploaded_file = 'Ek';
-$lang->grant = 'İzin';
-$lang->target = 'Hedef';
-$lang->total = 'Toplam';
-$lang->total_count = 'Toplamı hesapla';
-$lang->ipaddress = 'IP Adresi';
-$lang->path = 'Yol';
-$lang->cart = 'Seçili Öğe';
-$lang->friend = 'Arkadaşlar';
-$lang->notify = 'Bildirim';
-$lang->order_target = 'Hedefi hizala';
-$lang->order_type = 'Sıralama Şekli';
-$lang->order_asc = 'Artan';
-$lang->order_desc = 'Azalan';
-$lang->file = 'Dosya';
-
-$lang->mid = 'Modül Adı';
-$lang->sid = 'Site Adı';
-$lang->layout = 'Yerleşim düzeni';
-$lang->mobile_layout = 'Hareketli Yerleşim düzeni';
-$lang->widget = 'Widget';
-$lang->module = 'Modül';
-$lang->skin = 'Dış Görünüm';
-$lang->mobile_skin = 'Hareketli Dış Görünümü';
-$lang->colorset = 'Renk kurulumu';
-$lang->extra_vars = 'Ek değişkenler';
-
-$lang->domain = "Alan adı";
-$lang->url = "URL";
-$lang->document_url = 'Yazı URL\'si';
-$lang->trackback_url = 'Geri İzleme URL\'si';
-$lang->blog_name = 'Blog Başlığı';
-$lang->excerpt = 'Alıntı';
-
-$lang->document_count = 'Toplam yazılar';
-$lang->page_count = 'Sayfa Sayısı';
-$lang->list_count = 'Liste Sayısı';
-$lang->search_list_count = 'Liste Sayısı ara';
-$lang->readed_count = 'Görüntülenme';
-$lang->voted_count = 'Oylar';
-$lang->comment_count = 'Yorumlar';
-$lang->member_count = 'Üye sayısı';
-$lang->date = 'Tarih';
-$lang->regdate = 'Kayıt Tarihi';
-$lang->last_update = 'Son Güncelleme';
-$lang->last_post = 'Son mesaj';
-$lang->signup_date = 'Kayıt Tarihi';
-$lang->last_login = 'Son Giriş';
-$lang->first_page = 'İlk sayfa';
-$lang->last_page = 'Son sayfa';
-$lang->search_target = 'Arama hedefi';
-$lang->search_keyword = 'Anahtar sözcük';
-$lang->is_default = 'Varsayılan';
-
-$lang->no_documents = 'Yazı yok';
-
-$lang->board_manager = 'Yönetim Ayarları';
-$lang->member_manager = 'Üye Ayarları';
-$lang->layout_manager = 'Yerleşim düzeni ayarları';
-
-$lang->use = 'Etkin';
-$lang->notuse = 'Devredışı';
-$lang->not_exists = "mevcut değil";
-
-$lang->public = 'Genel';
-$lang->private = 'Özel';
-
-$lang->unit_sec = 'sn';
-$lang->unit_min = 'dk';
-$lang->unit_hour = 'saat';
-$lang->unit_day = 'gün';
-$lang->unit_month = 'ay';
-$lang->unit_year = 'yıl';
-
-$lang->unit_week = array(
-	'Monday' => 'Pazartesi',
-	'Tuesday' => 'Salı',
-	'Wednesday' => 'Çarşamba',
-	'Thursday' => 'Perşembe',
-	'Friday' => 'Cuma',
-	'Saturday' => 'Cumartesi',
-	'Sunday' => 'Pazar',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => '%d bir dakika önce',
-	'mins' => '%d birkaç dakika önce',
-	'hour' => '%d saat önce',
-	'hours' => '%d birkaç saat önce',
-);
-
-// Descriptions
-$lang->about_tag = 'Her Etiketin arasına virgül(,)ekleyerek çoklu etiketleri de teslim edebilirsiniz.';
-$lang->about_layout = 'Yerleşim Düzenleri, modüllerin görünümünü şekillendirir. Üst taraftaki yerleşim düzeni bölümünden ayarlamaları yapabilirsiniz.';
-
-// Messages
-$lang->msg_call_server = 'Sunucuya bağlanıyor, lütfen bekleyin';
-$lang->msg_db_not_setted = 'VT Ayarları yapılmadı.';
-$lang->msg_dbconnect_failed = "VT bağlantısında sorun meydana geldi.\n DB bilgilerini lütfen kontrol edin.";
-$lang->msg_invalid_queryid = 'Belirlenen sorgu için kimlik bilgisi geçersiz.';
-$lang->msg_not_permitted = 'Giriş izniniz yok.';
-$lang->msg_input_password = 'Lüften Şifreyi girin';
-$lang->msg_invalid_document = 'Geçersiz yazı numarası';
-$lang->msg_invalid_request = 'Geçersiz İstek';
-$lang->msg_invalid_password = 'Geçersiz Şifre';
-$lang->msg_error_occured = 'Bir hata oluştu.';
-$lang->msg_not_founded = 'Hedef bulunamadı.';
-$lang->msg_no_result = 'Hiçbir şey bulunamadı';
-$lang->msg_fail_to_request_open = 'İsteğiniz gerçekleşmedi.';
-$lang->msg_invalid_format = 'Geçersiz Biçim';
-
-$lang->msg_not_permitted_act = 'İstenilen eylemi gerçekleştirmeye yetkiniz yok.';
-$lang->msg_module_does_not_exist = "İstenilen modül bulunamadı.\nLütfen site yöneticisine bildirin.";
-$lang->msg_module_is_not_standalone = 'İstenilen modül bağımsız çalışamaz.';
-$lang->msg_default_url_is_not_defined = 'Varsayılan URL tanımlı değil.';
-
-$lang->success_registed = 'Başarıyla Kaydedildi.';
-$lang->success_declared = 'Başarıyla Bildirildi.';
-$lang->success_updated = 'Başarıyla Güncellendi.';
-$lang->success_deleted = 'Başarıyla Silindi.';
-$lang->success_voted = 'Başarıyla Tavsiye Edildi.';
-$lang->success_blamed = 'Başarıyla Bildirildi.';
-$lang->success_moved = 'Başarıyla Taşındı.';
-$lang->success_sended = 'Başarıyla Gönderildi';
-$lang->success_reset = 'Başarıyla Tekrar Kuruldu.';
-$lang->success_leaved = 'Tüm üye verileri tamamen silindi.';
-$lang->success_saved = 'Başarıyla Kaydedildi.';
-
-$lang->fail_to_delete = 'Silinemedi';
-$lang->fail_to_move = 'Taşınamadı';
-
-$lang->failed_voted = 'Tavsiye edilemedi';
-$lang->failed_blamed = 'Bildirilemedi';
-$lang->failed_declared = 'Bildirilemedi';
-$lang->fail_to_delete_have_children = 'Cevapları kaldırdıktan sonra lütfen tekrar deneyiniz.';
-
-$lang->confirm_submit = 'Göndermek istediğinize emin misiniz?';
-$lang->confirm_logout = 'Oturumu kapatmak istediğinize emin misiniz?';
-$lang->confirm_vote = 'Tavsiye etmek istediğinize emin misiniz?';
-$lang->confirm_delete = 'Silmek istediğinize emin misiniz?';
-$lang->confirm_move = 'Taşımak istediğinize emin misiniz?';
-$lang->confirm_reset = 'Sıfırlamak istediğinize emin misiniz?';
-$lang->confirm_leave = 'Çıkmak istediğinize emin misiniz?';
-$lang->confirm_update = 'Güncellemek istediğinize emin misiniz?';
-
-$lang->column_type = 'Sütun Türü';
-$lang->column_type_list['text'] = 'tek satırlık metin';
-$lang->column_type_list['homepage'] = 'url';
-$lang->column_type_list['email_address'] = 'e-posta';
-$lang->column_type_list['tel'] = 'telefon numarası';
-$lang->column_type_list['textarea'] = 'çok satırlı metin alanı';
-$lang->column_type_list['checkbox'] = 'onay kutusu (çoklu seçim)';
-$lang->column_type_list['select'] = 'kutuyu seç (tekli seçim)';
-$lang->column_type_list['radio'] = 'radyo düğmesi (radyo)';
-$lang->column_type_list['kr_zip'] = 'zip kodu (Kore)';
-$lang->column_type_list['date'] = 'tarih (gg/aa/yyyy)';
-//$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
-$lang->column_name = 'Sütun adı';
-$lang->column_title = 'Sütun başlığı';
-$lang->default_value = 'Varsayılan Değer';
-$lang->is_active = 'Etkin';
-$lang->is_required = 'Gerekli Alan';
-$lang->eid = 'Ek değişkenin adı';
-
-// ftp-related
-$lang->ftp_form_title = 'FTP Hesap Bilgileri';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP sistem adı';
-$lang->ftp_port = 'FTP portu';
-$lang->about_ftp_password = 'FTP şifresi saklanmayacaktır.';
-$lang->cmd_check_ftp_connect = 'FTP Bağlantısını kontrol ediniz';
-$lang->about_ftp_info = "
-	FTP hesap bilgileri aşağıdaki durumlarda kullanılabilir. <br />
-	1. PHP güvenli mod ayarları etkinse, XE, FTP\'yi kullanarak yüklenecektir.  <br />
-	2. Otomatik güncellemeler, FTP bilgilerini kullanabilir. <br />
-	   Hesap bilgileri files/config/ftp.config.php adresinde depolanacaktır.  <br />
-	   Kurulumun ardından, hesap bilgilerini yönetici sayfasından ayarlayabilir veya silebilirsiniz. <br />
-";
-
-$lang->msg_safe_mode_ftp_needed = "Eğer PHP güvenli mod ayarları etkinse, XE\'yi kurmak için FTP hesap bilgilerini girmelisiniz.";
-$lang->msg_ftp_not_connected = "Yerel web alanına FTP bağlantısı sağlanamadı. Lütfen port numarasını ve FTP servisinin mevcut olup-olmadığını kontrol ediniz .";
-$lang->msg_ftp_invalid_auth_info = "Kimlik doğrulama başarısız oldu. Lütfen kullanıcı adını ve şifreyi kontrol ediniz.";
-$lang->msg_ftp_mkdir_fail = "Dizin oluşturma başarısız oldu. Lütfen FTP hesap iznini kontrol ediniz.";
-$lang->msg_ftp_chmod_fail = "Chmod başarılamadı. Lütfen FTP sunucusunun izin ve yapılandırmasını kontrol ediniz.";
-$lang->msg_ftp_connect_success = "FTP sunucusu için bağlantı ve kimlik doğrulama sağlandı.";
-
-$lang->ftp_path_title = 'FTP Yolu Bilgileri';
-$lang->msg_ftp_installed_realpath = 'XE Salt Yolu';
-$lang->msg_ftp_installed_ftp_realpath = 'XE Salt FTP Yolu';
-
-
-// Alert messages for Javascript using by XML filter
-$lang->filter->isnull = ' Lütfen %s için  bir değer girin';
-$lang->filter->outofrange = 'Lütfen %s metninin uzunluğunu hizalayın.';
-$lang->filter->equalto = "%s değeri geçersiz.";
-$lang->filter->invalid_email = "%s biçimi geçersiz. örn.) developers@xpressengine.com";
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s biçimi geçersiz.\\nTüm değerler alfabe harfleri, sayılar veya alttire(_)\'den oluşmalı ve ilk karakter bir harf olmalıdır.";
-$lang->filter->invalid_homepage = "%s biçimi geçersiz. örn.) http://xpressengine.com/";
-$lang->filter->invalid_korean = "%s biçimi geçersiz. Lütfen sadece Korece karakterler giriniz.";
-$lang->filter->invalid_korean_number = "%s biçimi geçersiz. Lütfen Korece karakterler ve numaralar kullanınınız.";
-$lang->filter->invalid_alpha = "%s biçimi geçersiz. Lütfen sadece harfleri kullanınız.";
-$lang->filter->invalid_alpha_number = " %s biçimi geçersiz. Lütfen harfleri ve sayıları kullanınız.";
-$lang->filter->invalid_number = "%s biçimi geçersiz . Lütfen sadece numaraları kullanın.";
-
-$lang->security_warning_embed = "Güvenlik nedeniyle, yöneticiler yerleşik öğeleri görüntülemeye yetkili değildirler.<BR /> Yerleşik öğeleri görüntüleyebilmek için, lütfen yönetici olmayan bir hesap kullanın.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/vi.lang.php b/common/lang/vi.lang.php
deleted file mode 100644
index a4e79c3f1..000000000
--- a/common/lang/vi.lang.php
+++ /dev/null
@@ -1,313 +0,0 @@
-<?php
-/**			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
- * @file   :  common/lang/vi.lang.php                                              ░░
- * @author :  NHN (developers@xpressengine.com)                                                 ░░
- * @trans  :  DucDuy Dao (webmaster@xpressengine.vn)								  ░░
- * @website:  http://xpressengine.vn												  ░░
- * @brief  :  Vietnamese Language Pack (Only basic words are included here)
- */
-
-// words for action, which is basically used
-$lang->cmd_write = 'Gửi bài mới';
-$lang->cmd_reply = 'Trả lời';
-$lang->cmd_delete = 'Xóa';
-$lang->cmd_modify = 'Thay đổi';
-$lang->cmd_edit = 'Sửa';
-$lang->cmd_view = 'Xem';
-$lang->cmd_view_all = 'Xem tất cả';
-$lang->cmd_list = 'Danh sách';
-$lang->cmd_prev = 'Trước';
-$lang->cmd_next = 'Tiếp';
-$lang->cmd_send_trackback = 'Gửi liên kết Web';
-$lang->cmd_registration = $lang->cmd_submit = 'Gửi';
-$lang->cmd_comment_registration = 'Gửi bình luận';
-$lang->cmd_insert = 'Chèn';
-$lang->cmd_save = 'Lưu';
-$lang->cmd_load = 'Tải';
-$lang->cmd_input = 'Nhập vào';
-$lang->cmd_search = 'Tìm kiếm';
-$lang->cmd_cancel = 'Loại bỏ';
-$lang->cmd_back = 'Về trang trước';
-$lang->cmd_vote = 'Bình chọn';
-$lang->cmd_vote_down = 'Phê bình';
-$lang->cmd_declare = 'Phạm quy';
-$lang->cmd_cancel_declare = 'Loại bỏ báo cáo';
-$lang->cmd_declared_list = 'Danh sách báo cáo';
-$lang->cmd_copy = 'Copy';
-$lang->cmd_move = 'Di chuyển';
-$lang->cmd_move_up = 'Lên';
-$lang->cmd_move_down = 'Xuống';
-$lang->cmd_add_indent = 'Thu hẹp lề';
-$lang->cmd_remove_indent = 'Mở rộng lề';
-$lang->cmd_management = 'Quản lý';
-$lang->cmd_make = 'Tạo mới';
-$lang->cmd_select = 'Lựa chọn';
-$lang->cmd_select_all = 'Chọn tất cả';
-$lang->cmd_unselect_all = 'Bỏ chọn tất cả';
-$lang->cmd_reverse_all = 'Đảo ngược';
-$lang->cmd_close_all = 'Đóng tất cả';
-$lang->cmd_open_all = 'Mở tất cả';
-$lang->cmd_reload = 'Tải lại';
-$lang->cmd_close = 'Đóng';
-$lang->cmd_open = 'Mở';
-$lang->cmd_setup = 'Cài đặt';
-$lang->cmd_addition_setup = 'Cài đặt bổ xung';
-$lang->cmd_option = 'Tùy chọn';
-$lang->cmd_apply = 'Áp dụng';
-$lang->cmd_open_calendar = 'Chọn một ngày';
-$lang->cmd_send = 'Gửi đi';
-$lang->cmd_print = 'In trang';
-$lang->cmd_scrap = 'Phân loại';
-$lang->cmd_preview = 'Xem trước';
-$lang->cmd_reset = 'Thiết lập lại';
-$lang->cmd_remake_cache = "Tạo File Cache mới";
-$lang->cmd_publish = "Xuất bản";
-$lang->cmd_layout_setup = 'Cài đặt giao diện';
-$lang->cmd_layout_edit = 'Sửa giao diện';
-$lang->cmd_search_by_ipaddress = 'Tìm kiếm IP';
-$lang->cmd_add_ip_to_spamfilter = 'Thêm IP vào bộ lọc';
-
-$lang->enable = 'Bật';
-$lang->disable = 'Tắt';
-
-// Essential Words
-$lang->menu = 'Menu';
-$lang->no = 'STT';
-$lang->notice = 'Chú ý';
-$lang->secret = 'Riêng tư';
-$lang->category = $lang->category_srl = 'Thể loại';
-$lang->none_category = 'Không có thể loại';
-$lang->document_srl = 'Bài viết. STT.';
-$lang->user_id = 'ID đăng nhập';
-$lang->author = 'Người gửi';
-$lang->password = 'Mật khẩu';
-$lang->password1 = 'Mật khẩu';
-$lang->password2 = 'Nhập lại mật khẩu';
-$lang->admin_id = 'Admin ID';
-$lang->writer = 'Người gửi';
-$lang->user_name = 'Tên thật';
-$lang->nick_name = 'NickName';
-$lang->email_address = 'Email';
-$lang->homepage = 'Trang chủ';
-$lang->blog = 'Blog';
-$lang->birthday = 'Sinh nhật';
-$lang->browser_title = 'Tiêu đề trình duyệt';
-$lang->title = 'Tiêu đề';
-$lang->title_content = 'TĐ+ND';
-$lang->topic = 'Chủ đề';
-$lang->replies = 'Trả lời';
-$lang->content = 'Nội dung';
-$lang->document = 'Bài viết';
-$lang->comment = 'Bình luận';
-$lang->description = 'Mô tả';
-$lang->trackback = 'Liên kết Web';
-$lang->tag = 'Tag';
-$lang->allow_comment = 'Cho phép bình luận';
-$lang->lock_comment = 'Khóa bình luận';
-$lang->allow_trackback = 'Cho phép liên kết Web';
-$lang->uploaded_file = 'File đã Upload';
-$lang->grant = 'Cho phép';
-$lang->target = 'Mục tiêu';
-$lang->total = 'Tất cả';
-$lang->total_count = 'Tổng số truy cập';
-$lang->ipaddress = 'Địa chỉ IP';
-$lang->path = 'Đường dẫn';
-$lang->cart = 'Chọn bài';
-$lang->friend = 'Bạn bè';
-$lang->notify = 'Thông báo';
-$lang->order_target = 'Đường dẫn đích';
-$lang->order_type = 'Phân loại theo định dạng';
-$lang->order_asc = 'Tăng dần';
-$lang->order_desc = 'Giảm dần';
-
-$lang->mid = 'Tên Module';
-$lang->layout = 'Giao diện';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Widget';
-$lang->module = 'Module';
-$lang->skin = 'Skin';
-$lang->mobile_skin = 'Mobile Skin';
-$lang->colorset = 'Tạo màu';
-$lang->extra_vars = 'Bổ xung';
-
-$lang->domain = "Tên miền";
-$lang->url = "URL";
-$lang->document_url = 'URL bài viết';
-$lang->trackback_url = 'URL liên kết Web';
-$lang->blog_name = 'Tên Blog';
-$lang->excerpt = 'Trích';
-
-$lang->document_count = 'Số bài viết: ';
-$lang->page_count = 'Số trang';
-$lang->list_count = 'Số danh sách';
-$lang->search_list_count = 'Tìm kiếm danh sách';
-$lang->readed_count = 'Đã xem';
-$lang->voted_count = 'Lượt bình chọn';
-$lang->comment_count = 'Bình luận';
-$lang->member_count = 'Số thành viên';
-$lang->date = 'Ngày gửi';
-$lang->regdate = 'Ngày gửi';
-$lang->last_update = 'Cập nhật lần cuối';
-$lang->last_post = 'Bài mới nhất';
-$lang->signup_date = 'Ngày đăng kí';
-$lang->last_login = 'Lần cuối đăng nhập';
-$lang->first_page = 'Trang trước';
-$lang->last_page = 'Trang sau';
-$lang->search_target = 'Khu vực tìm kiếm';
-$lang->search_keyword = 'Từ khóa';
-$lang->is_default = 'Mặc định';
-
-$lang->no_documents = 'Chưa có bài viết nào.';
-
-$lang->board_manager = 'Quản lý Board';
-$lang->member_manager = 'Quản lý thành viên';
-$lang->layout_manager = 'Quản lý giao diện';
-
-$lang->use = 'Sử dụng';
-$lang->notuse = 'Không sử dụng';
-$lang->not_exists = "Không tồn tại";
-
-$lang->public = 'Công khai';
-$lang->private = 'Riêng tư';
-
-$lang->unit_sec = 'Giây';
-$lang->unit_min = 'Phút';
-$lang->unit_hour = 'Giờ';
-$lang->unit_day = 'Ngày';
-$lang->unit_month = 'Tháng';
-$lang->unit_year = 'Năm';
-
-$lang->unit_week = array(
-	'Monday' => 'Thứ hai',
-	'Tuesday' => 'Thứ ba',
-	'Wednesday' => 'Thứ tư',
-	'Thursday' => 'Thứ năm',
-	'Friday' => 'Thứ sáu',
-	'Saturday' => 'Thứ bảy',
-	'Sunday' => 'Chủ nhật',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => '%d phút trước',
-	'mins' => '%d phút trước',
-	'hour' => '%d giờ trước',
-	'hours' => '%d giờ trước',
-);
-
-// Descriptions
-$lang->about_tag = 'Bạn có thể thêm vào nhiều Tag bằng cách đặt dấu (,) giữa mỗi Tag.';
-$lang->about_layout = 'Để trang trí giao diện bằng các Module. Bạn có thể điều chỉnh chúng bằng Menu trên đầu trang.';
-
-// Messages
-$lang->msg_call_server = 'Đang kết nối tới máy chủ, Xin vui lòng đợi! ...';
-$lang->msg_db_not_setted = 'Cấu hình Database chưa được thiết lập.';
-$lang->msg_dbconnect_failed = "Không thể kết nối.\nXin vui lòng kiểm tra lại thông tin Database.";
-$lang->msg_invalid_queryid = 'Giá trị ID không hợp lệ';
-$lang->msg_not_permitted = 'Bạn không được phép truy cập tại đây!';
-$lang->msg_input_password = 'Xin vui lòng nhập mật khẩu!';
-$lang->msg_invalid_document = 'Bài viết không tồn tại';
-$lang->msg_invalid_request = 'Yêu cầu không hợp lệ';
-$lang->msg_invalid_password = 'Mật khẩu không đúng';
-$lang->msg_error_occured = 'Đã có lỗi xảy ra.';
-$lang->msg_not_founded = 'Không tìm thấy.';
-$lang->msg_no_result = 'Không có kết quả nào được tìm thấy.';
-
-$lang->msg_not_permitted_act = 'Bạn không được phép làm việc này.';
-$lang->msg_module_does_not_exist = 'Không tìm thấy Module yêu cầu';
-$lang->msg_module_is_not_standalone = 'Module yêu cầu không thể thực hiện độc lập.';
-
-$lang->success_registed = 'Chúc mừng bạn đã đăng kí thành công!';
-$lang->success_declared = 'Đã báo cáo.';
-$lang->success_updated = 'Đã cập nhật thành công.';
-$lang->success_deleted = 'Đã xóa thành công.';
-$lang->success_voted = 'Đã bình chọn.';
-$lang->success_blamed = 'Đã phê bình.';
-$lang->success_moved = 'Đã chuyển.';
-$lang->success_sended = 'Đã gửi thành công.';
-$lang->success_reset = 'Đã thiết lập lại thành công.';
-$lang->success_leaved = 'Đã xóa tất cả các thành viên.';
-$lang->success_saved = 'Đã lưu thành công.';
-
-$lang->fail_to_delete = 'Không thể xóa.';
-$lang->fail_to_move = 'Không thể chuyển.';
-
-$lang->failed_voted = 'Không thể bình chọn.';
-$lang->failed_blamed = 'Không thể phê bình';
-$lang->failed_declared = 'Không thể báo cáo.';
-$lang->fail_to_delete_have_children = 'Xin vui lòng thử lại sau khi gỡ bỏ bài trả lời đầu tiên.';
-
-$lang->confirm_submit = 'Bạn có chắc chắn muốn gửi?';
-$lang->confirm_logout = 'Bạn có chắc chắn thoát?';
-$lang->confirm_vote = 'Bạn có muốn bình chọn không??';
-$lang->confirm_delete = 'Bạn chắc chắn muốn xóa?';
-$lang->confirm_move = 'Bạn chắc chắn muốn chuyển?';
-$lang->confirm_reset = 'Bạn chắc chắn muốn thiết lập lại?';
-$lang->confirm_leave = 'Bạn chắc chắn muốn từ bỏ?';
-$lang->confirm_update = 'Bạn chắc chắn muốn Update?';
-
-$lang->column_type = 'Định dạng cột';
-$lang->column_type_list['text'] = 'Ô nhập liệu';
-$lang->column_type_list['homepage'] = 'URL';
-$lang->column_type_list['email_address'] = 'Email';
-$lang->column_type_list['tel'] = 'Số điện thoại';
-$lang->column_type_list['textarea'] = 'Khu vực nội dung';
-$lang->column_type_list['checkbox'] = 'Ô chọn (Nhiều lựa chọn)';
-$lang->column_type_list['select'] = 'Ô chọn (Một lựa chọn)';
-$lang->column_type_list['kr_zip'] = 'Mã số bưu điện (Korean)';
-$lang->column_type_list['date'] = 'Ngày (yyyy/mm/dd)';
-//$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
-$lang->column_name = 'Tên cột';
-$lang->column_title = 'Tiêu đề cột';
-$lang->default_value = 'Giá trị mặc định';
-$lang->is_active = 'Hoạt động';
-$lang->is_required = 'Bắt buộc';
-
-// ftp 관련
-$lang->ftp_form_title = 'Thông tin FTP';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'Tên Host FTP';
-$lang->ftp_port = 'Cổng kết nối';
-$lang->about_ftp_password = 'Mật khẩu của FTP sẽ không lưu lại';
-$lang->cmd_check_ftp_connect = 'Kiểm tra kết nối bằng FTP';
-$lang->about_ftp_info = "
-	Thông tin tài khoản FTP có thể được sử dụng trong các trường hợp sau: <br />
-	1. Nếu safe_mode của PHP mở, XE sẽ được cài đặt bằng cách sử dụng FTP. <br />
-	2. Tự động cập nhật thông tin sử dụng FTP. <br />
-	   Thông tin tài khoản FTP này sẽ được lưu giữ tại: 'files/config/ftp.config.php'<br />
-	   Sau khi cài đặt bạn có thể xóa hoặc thay đổi thông tin tại Bảng điều khiển của Administrator.<br />";
-
-$lang->msg_safe_mode_ftp_needed = "Nếu safe_mode của PHP mở, bạn có thể cài đặt các thành phần bổ xung cho XE một cách tự động qua FTP.";
-$lang->msg_ftp_not_connected = "Kết nối bằng FTP không thành công. Xin vui lòng kiểm tra lại thông tin tài khoản và cổng kết nối!";
-$lang->msg_ftp_invalid_auth_info = "Xác nhận thất bại. Xin vui lòng kiểm tra lại tên sử dụng và mật khẩu.";
-$lang->msg_ftp_mkdir_fail = "Lỗi khi tạo thư mục. Xin vui lòng kiểm tra lại quyền truy cập FTP.";
-$lang->msg_ftp_chmod_fail = "CHMOD thất bại. Xin vui lòng kiểm tra lại.";
-$lang->msg_ftp_connect_success = "Đã xác nhận và kết nối thành công tới máy chủ bằng FTP.";
-
-$lang->ftp_path_title = 'Hãy nhập thông tin đường dẫn của FTP.';
-$lang->msg_ftp_installed_realpath = 'Đường dẫn thư mục đã cài đặt XE';
-$lang->msg_ftp_installed_ftp_realpath = 'Đường dẫn tuyệt đối của thư mục cài đặt XE trên FTP';
-
-
-// Alert messages for Javascript using by XML filter
-$lang->filter->isnull = 'Xin vui lòng nhập giá trị cho %s';
-$lang->filter->outofrange = 'Xin vui lòng xếp thẳng hàng chiều dài văn bản của %s';
-$lang->filter->equalto = "Giá trị của %s không hợp lệ";
-$lang->filter->invalid_email = "Định dạng của %s không hợp lệ. Ví dụ: emailname@yahoo.com";
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "Định dạng của %s Không hợp lệ.\\nGiá trị hợp lệ bao gồm các kí tự từ a-z, các chữ số và dấu gạch dưới (_).";
-$lang->filter->invalid_homepage = "Định dạng của %s không hợp lệ. Đúng sẽ là: http://xpressengine.vn hoặc http://www.xpressengine.vn";
-$lang->filter->invalid_korean = "Định dạng của %s không hợp lệ. Nội dung này bắt buộc phải sử dụng tiếng Hàn Quốc";
-$lang->filter->invalid_korean_number = "Định dạng của %s không hợp lệ. Nội dung này bắt buộc phải sử dụng tiếng Hàn Quốc hoặc các chữ số";
-$lang->filter->invalid_alpha = "Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z";
-$lang->filter->invalid_alpha_number = "Định dạng của %s không hợp lệ. Chỉ sử dụng các kí tự từ a-z và các chữ số";
-$lang->filter->invalid_number = "Định dạng của %s không hợp lệ. Chỉ sử dụng các chữ số";
-
-$lang->security_warning_embed = "Vì vấn đề bảo mật, nên Administrator không được phép xem các mục đã nhúng mã.<BR /> Để xem được chúng, hãy sử dụng một tên truy cập khác không có quyền quản trị.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/zh-CN.lang.php b/common/lang/zh-CN.lang.php
deleted file mode 100644
index ad37c1973..000000000
--- a/common/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * @file   common/lang/zh-CN.lang.php
- * @author NHN (developers@xpressengine.com)
- * @brief  简体中文语言包
- **/
-
-// 基本使用的 action 语言
-$lang->cmd_write = '发表新帖';
-$lang->cmd_reply = '回复';
-$lang->cmd_delete = '删除';
-$lang->cmd_modify = '修改';
-$lang->cmd_edit = '编辑';
-$lang->cmd_view = '查看';
-$lang->cmd_view_all = '全部查看';
-$lang->cmd_list = '目录';
-$lang->cmd_prev = '上一页';
-$lang->cmd_next = '下一页';
-$lang->cmd_send_trackback = '发送引用';
-$lang->cmd_registration = $lang->cmd_submit = '提交';
-$lang->cmd_comment_registration = '提交评论';
-$lang->cmd_insert = '添加';
-$lang->cmd_save = '保存';
-$lang->cmd_load = '导入';
-$lang->cmd_input = '输入';
-$lang->cmd_search = '搜索';
-$lang->cmd_find = '查找';
-$lang->cmd_replace = '替换';
-$lang->cmd_confirm = '确认';
-$lang->cmd_cancel = '取消';
-$lang->cmd_back = '返回';
-$lang->cmd_vote = '推荐';
-$lang->cmd_vote_down = '反对';
-$lang->cmd_declare = '举报';
-$lang->cmd_cancel_declare = '取消举报';
-$lang->cmd_declared_list = '举报列表';
-$lang->cmd_copy = '复制';
-$lang->cmd_move = '移动';
-$lang->cmd_move_up = '向上';
-$lang->cmd_move_down = '向下';
-$lang->cmd_add_indent = '拉长';
-$lang->cmd_remove_indent = '缩短';
-$lang->cmd_management = '管理';
-$lang->cmd_make = '生成';
-$lang->cmd_select = '选择';
-$lang->cmd_select_all = '全部选择';
-$lang->cmd_unselect_all = '全部解除';
-$lang->cmd_reverse_all = "反选";
-$lang->cmd_close_all = '全部折叠';
-$lang->cmd_open_all = '全部展开';
-$lang->cmd_reload = '从新载入';
-$lang->cmd_close = '关闭';
-$lang->cmd_open = '打开';
-$lang->cmd_setup = '设置';
-$lang->cmd_addition_setup = '高级选项';
-$lang->cmd_option = '选项';
-$lang->cmd_apply = '应用';
-$lang->cmd_open_calendar = '选择日期';
-$lang->cmd_send = '发送';
-$lang->cmd_print = '打印';
-$lang->cmd_scrap = '收藏';
-$lang->cmd_preview = '预览';
-$lang->cmd_reset = '初始化';
-$lang->cmd_remake_cache = "更新缓冲";
-$lang->cmd_publish = "发表";
-$lang->cmd_layout_setup = '布局设置';
-$lang->cmd_layout_edit = '编辑布局';
-$lang->cmd_search_by_ipaddress = '以IP地址搜索';
-$lang->cmd_add_ip_to_spamfilter = '禁止IP';
-
-$lang->enable = '可用';
-$lang->disable = '禁用';
-
-// 基本词语
-$lang->menu = '菜单';
-$lang->no = '编号';
-$lang->notice = '公告';
-$lang->secret = '密帖';
-$lang->category = $lang->category_srl = '分类';
-$lang->none_category = '无分类';
-$lang->none_image = '无图';
-$lang->document_srl = '文章编号';
-$lang->user_id = '用户名';
-$lang->author = '制作';
-$lang->password = '密码';
-$lang->password1 = '密码';
-$lang->password2 = '确认密码';
-$lang->admin_id = '管理员ID';
-$lang->writer = '作者';
-$lang->user_name = '姓名';
-$lang->nick_name = '昵称';
-$lang->email_address = '电子邮件';
-$lang->homepage = '主页';
-$lang->blog = '博客';
-$lang->birthday = '生日';
-$lang->browser_title = '浏览器标题';
-$lang->title = '标题';
-$lang->title_content = '标题+内容';
-$lang->topic = '主题';
-$lang->replies = '回复';
-$lang->content = '内容';
-$lang->document = '文章';
-$lang->comment = '评论';
-$lang->description = '说明';
-$lang->trackback = '引用';
-$lang->tag = '标签';
-$lang->allow_comment = '允许评论';
-$lang->lock_comment = '关闭评论';
-$lang->allow_trackback = '允许引用';
-$lang->uploaded_file = '附件';
-$lang->grant = '权限';
-$lang->target = '目标';
-$lang->total = '全部';
-$lang->total_count = '总数';
-$lang->ipaddress = 'IP地址';
-$lang->path = '路径';
-$lang->cart = '选择项目';
-$lang->friend = '好友';
-$lang->notify = '通告';
-$lang->order_target = '排序对象';
-$lang->order_type = '排序方式';
-$lang->order_asc = '升序';
-$lang->order_desc = '倒序';
-$lang->file = '文件';
-
-$lang->mid = '模块名称';
-$lang->sid = '站点名称';
-$lang->layout = '布局';
-$lang->mobile_layout = '移动版布局';
-$lang->widget = '控件 ';
-$lang->module = '模块';
-$lang->skin = '皮肤';
-$lang->mobile_skin = '移动版皮肤';
-$lang->colorset = '颜色设定';
-$lang->extra_vars = '扩展变量';
-
-$lang->domain = "域名";
-$lang->url = "URL";
-$lang->document_url = '文章地址';
-$lang->trackback_url = '引用地址';
-$lang->blog_name = '博客名称';
-$lang->excerpt = '载自';
-
-$lang->document_count = '帖子数';
-$lang->page_count = '页数';
-$lang->list_count = '目录数';
-$lang->search_list_count = '搜索目录数';
-$lang->readed_count = '查看';
-$lang->voted_count = '推荐';
-$lang->comment_count = '评论';
-$lang->member_count = '会员数';
-$lang->date = '日期';
-$lang->regdate = '登录日期';
-$lang->last_update = '最后更新';
-$lang->last_post = '最后更新';
-$lang->signup_date = '注册日期';
-$lang->last_login = '最近登录';
-$lang->first_page = '第一页';
-$lang->last_page = '最后一页';
-$lang->search_target = '搜索目标';
-$lang->search_keyword = '关键字';
-$lang->is_default = '默认';
-
-$lang->no_documents = '现没有主题。';
-
-$lang->board_manager = '版面管理';
-$lang->member_manager = '会员管理';
-$lang->layout_manager = '布局管理';
-
-$lang->use = '使用';
-$lang->notuse = '未使用';
-$lang->not_exists = '无';
-
-$lang->public = '公开';
-$lang->private = '不公开';
-
-$lang->unit_sec = '秒';
-$lang->unit_min = '分';
-$lang->unit_hour = '时';
-$lang->unit_day = '日';
-$lang->unit_month = '月';
-$lang->unit_year = '年';
-
-$lang->unit_week = array(
-	'Monday' => '星期一',
-	'Tuesday' => '星期二',
-	'Wednesday' => '星期三',
-	'Thursday' => '星期四',
-	'Friday' => '星期五',
-	'Saturday' => '星期六',
-	'Sunday' => '星期日',
-);
-
-$lang->unit_meridiem = array(
-	'am' => '上午',
-	'pm' => '下午',
-	'AM' => '上午',
-	'PM' => '下午',
-);
-
-$lang->time_gap = array(
-	'min' => '%d分钟前',
-	'mins' => '%d分钟前',
-	'hour' => '%d小时前',
-	'hours' => '%d小时前',
-);
-
-// 说明
-$lang->about_tag = '用逗号分隔多个标签';
-$lang->about_layout = '布局是布置模块的外观，在上端布局菜里单可以进行管理';
-
-// 信息
-$lang->msg_call_server = '系统正在连接服务器，请稍后…';
-$lang->msg_db_not_setted = '还没有设定 DB';
-$lang->msg_dbconnect_failed = "连接DB时发生错误。\n请重新确认DB信息。";
-$lang->msg_invalid_queryid = 'Query ID值指定错误';
-$lang->msg_not_permitted = '没有权限';
-$lang->msg_input_password = '请输入密码';
-$lang->msg_invalid_document = '出错的文章编号';
-$lang->msg_invalid_request = '出错的请求';
-$lang->msg_invalid_password = '密码错误';
-$lang->msg_error_occured = '发生错误';
-$lang->msg_not_founded = '没有找到相关内容';
-$lang->msg_no_result = '找不到和您查询的相符结果';
-$lang->msg_fail_to_request_open = '连接失败！';
-$lang->msg_invalid_format = '错误的格式！';
-
-$lang->msg_not_permitted_act = '没有权限执行 action命令';
-$lang->msg_module_does_not_exists = "没有找到该模块！\n请联系网站管理员进行模块维护。";
-$lang->msg_module_is_not_standalone = '您请求的模块不能单独执行';
-$lang->msg_default_url_is_not_defined = '请设置XE通行证！';
-
-$lang->success_registed = '提交成功！';
-$lang->success_declared = '举报成功！';
-$lang->success_updated = '修改成功！';
-$lang->success_deleted = '删除成功！';
-$lang->success_restore = '复原成功！';
-$lang->success_voted = '推荐成功！';
-$lang->success_blamed = '反对成功！';
-$lang->success_moved = '移动成功！';
-$lang->success_sended = '发送成功！';
-$lang->success_reset = '初始化成功 !';
-$lang->success_leaved = '注销成功！';
-$lang->success_saved = '保存成功！';
-
-$lang->fail_to_delete = '删除成功！';
-$lang->fail_to_move = '移动成功！';
-
-$lang->failed_voted = '您不能推荐！';
-$lang->failed_blamed = '您不能投反对！';
-$lang->failed_declared = '您不具备举报权限！';
-$lang->fail_to_delete_have_children = '不能删除有回复的评论！';
-
-$lang->confirm_submit = '确定要提交吗?';
-$lang->confirm_logout = '确定要退出吗?';
-$lang->confirm_vote = '确定要推荐吗?';
-$lang->confirm_delete = '确定要删除吗?';
-$lang->confirm_restore = '确定要复原吗?';
-$lang->confirm_move = '确定要移动吗?';
-$lang->confirm_reset = '确定要初始化吗?';
-$lang->confirm_leave = '确定要注销吗?';
-$lang->confirm_update = '确定要更新吗?';
-
-$lang->column_type = '格式';
-$lang->column_type_list['text'] = '单行文本输入区(text)';
-$lang->column_type_list['homepage'] = '网址格式(url)';
-$lang->column_type_list['email_address'] = '邮件格式(email)';
-$lang->column_type_list['tel'] = '电话号码格式(phone)';
-$lang->column_type_list['textarea'] = '多行文本框(textarea)';
-$lang->column_type_list['checkbox'] = '复选框(checkbox)';
-$lang->column_type_list['select'] = '下拉列表框(select)';
-$lang->column_type_list['radio'] = '单选框(radio)';
-$lang->column_type_list['kr_zip'] = '韩国邮编(zip)';
-$lang->column_type_list['date'] = '日期(年月日)';
-//$lang->column_type_list['jp_zip'] = '日本地址(zip)';
-$lang->column_name = '项目名';
-$lang->column_title = '项目标题';
-$lang->default_value = '缺省值';
-$lang->is_active = '激活';
-$lang->is_required = '必填';
-$lang->eid = '扩展变量名';
-
-// ftp 相关
-$lang->ftp_form_title = '设置FTP信息';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP服务器名';
-$lang->ftp_port = 'FTP端口';
-$lang->about_ftp_password = 'FTP密码不会被保存。';
-$lang->cmd_check_ftp_connect = '测试FTP连接';
-$lang->about_ftp_info = "
-	相关FTP信息，应用于如下几种状况:<br/>
-	1. 当PHP的safe_mode=On时，也能使程序工作正常。<br/>
-	2. 可以应用于自动更新。<br/>
-	此FTP信息将保存在files/config/ftp.config.php文件当中。<br/>
-	安装程序后可在管理页面对FTP信息进行修改或删除操作。<br />
-";
-
-$lang->msg_safe_mode_ftp_needed = "当PHP的safe_mode=On时，请必须输入相关FTP信息，否则将无法正常安装或使用XE程序。";
-$lang->msg_ftp_not_connected = "发生本地(localhost)FTP连接错误。请确认ftp端口号及支持ftp服务与否。";
-$lang->msg_ftp_invalid_auth_info = "FTP登录失败。请确认输入的FTP信息。";
-$lang->msg_ftp_mkdir_fail = "新建文件夹失败。请确认 FTP服务器设置。";
-$lang->msg_ftp_chmod_fail = "修改文件夹属性失败。请确认 FTP服务器设置。";
-$lang->msg_ftp_connect_success = "FTP连接成功。";
-
-$lang->ftp_path_title = '输入FTP路径信息';
-$lang->msg_ftp_installed_realpath = 'XE绝对路径';
-$lang->msg_ftp_installed_ftp_realpath = 'FTP绝对路径设置';
-
-// 在xml filter使用的 javascript用 alert msg
-$lang->filter->isnull = '请输入%s';
-$lang->filter->outofrange = '请确认%s字数';
-$lang->filter->equalto = '%s值有误。';
-$lang->filter->invalid_email = '%s格式有误。（例：developers@xpressengine.com)';
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s只能用英文，数字和 _，首个字符必须是英文字母。";
-$lang->filter->invalid_homepage = '%s格式有误。（例： http://xpressengine.com/)';
-$lang->filter->invalid_korean = '%s只能输入中文';
-$lang->filter->invalid_korean_number = '%s只能输入中文或数字';
-$lang->filter->invalid_alpha = '%s只能输入英文字母';
-$lang->filter->invalid_alpha_number = '%s只能输入英文或数字';
-$lang->filter->invalid_number = '%s只能输入数字';
-
-$lang->security_warning_embed = "由于安全问题，不允许用系统管理员ID操作embed对象，请使用其他拥有管理权限的ID操作。";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
-?>
\ No newline at end of file
diff --git a/common/lang/zh-TW.lang.php b/common/lang/zh-TW.lang.php
deleted file mode 100644
index 0beedddb9..000000000
--- a/common/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,324 +0,0 @@
-<?php
-/**
- * @file   common/lang/zh-TW.lang.php
- * @author NHN (developers@xpressengine.com) 翻譯：royallin
- * @brief  正體中文語言
- **/
-
-// 基本用語
-$lang->cmd_write = '發表';
-$lang->cmd_reply = '回覆';
-$lang->cmd_delete = '刪除';
-$lang->cmd_modify = '修改';
-$lang->cmd_edit = '編輯';
-$lang->cmd_view = '檢視';
-$lang->cmd_view_all = '全部檢視';
-$lang->cmd_list = '列表';
-$lang->cmd_prev = '上一頁';
-$lang->cmd_next = '下一頁';
-$lang->cmd_send_trackback = '發送引用';
-$lang->cmd_registration = $lang->cmd_submit = '確定';
-$lang->cmd_comment_registration = '送出評論';
-$lang->cmd_insert = '插入';
-$lang->cmd_save = '儲存';
-$lang->cmd_load = '讀取';
-$lang->cmd_input = '輸入';
-$lang->cmd_search = '搜尋';
-$lang->cmd_find = '尋找';
-$lang->cmd_replace = '置換';
-$lang->cmd_confirm = '確認';
-$lang->cmd_cancel = '取消';
-$lang->cmd_back = '返回';
-$lang->cmd_vote = '推薦';
-$lang->cmd_vote_down = '反對';
-$lang->cmd_declare = '檢舉';
-$lang->cmd_cancel_declare = '取消檢舉';
-$lang->cmd_declared_list = '檢舉列表';
-$lang->cmd_copy = '複製';
-$lang->cmd_move = '移動';
-$lang->cmd_move_up = '向上';
-$lang->cmd_move_down = '向下';
-$lang->cmd_add_indent = '拉長';
-$lang->cmd_remove_indent = '縮短';
-$lang->cmd_management = '管理';
-$lang->cmd_make = '建立';
-$lang->cmd_select = '選擇';
-$lang->cmd_select_all = '全部選擇';
-$lang->cmd_unselect_all = '全部解除';
-$lang->cmd_reverse_all = "反選";
-$lang->cmd_close_all = '全部收合';
-$lang->cmd_open_all = '全部展開';
-$lang->cmd_reload = '重新讀取';
-$lang->cmd_close = '關閉';
-$lang->cmd_open = '開啟';
-$lang->cmd_setup = '設置';
-$lang->cmd_addition_setup = '延伸設置';
-$lang->cmd_option = '選項';
-$lang->cmd_apply = '套用';
-$lang->cmd_open_calendar = '選擇日期';
-$lang->cmd_send = '發送';
-$lang->cmd_print = '列印';
-$lang->cmd_scrap = '收藏';
-$lang->cmd_preview = '預覽';
-$lang->cmd_reset = '重置';
-$lang->cmd_remake_cache = "重新建立暫存檔";
-$lang->cmd_publish = "發表";
-$lang->cmd_layout_setup = '版面設置';
-$lang->cmd_layout_edit = '版面編輯';
-$lang->cmd_search_by_ipaddress = '以 IP 搜尋';
-$lang->cmd_add_ip_to_spamfilter = '封鎖此 IP';
-
-$lang->enable = '可用';
-$lang->disable = '禁用';
-
-// 基本詞語
-$lang->menu = '選單';
-$lang->no = '編號';
-$lang->notice = '公告';
-$lang->secret = '秘密';
-$lang->category = $lang->category_srl = '分類';
-$lang->none_category = '無分類';
-$lang->none_image = '無圖片';
-$lang->document_srl = '文章編號';
-$lang->user_id = '帳號';
-$lang->author = '作者';
-$lang->password = '密碼';
-$lang->password1 = '新密碼';
-$lang->password2 = '確認密碼';
-$lang->admin_id = '管理員帳號';
-$lang->writer = '作者';
-$lang->user_name = '姓名';
-$lang->nick_name = '暱稱';
-$lang->email_address = '電子郵件';
-$lang->homepage = '主頁';
-$lang->blog = '部落格';
-$lang->birthday = '生日';
-$lang->browser_title = '瀏覽器標題';
-$lang->title = '標題';
-$lang->title_content = '標題+內容';
-$lang->topic = '主題';
-$lang->replies = '回覆';
-$lang->content = '內容';
-$lang->document = '文章';
-$lang->comment = '評論';
-$lang->description = '說明';
-$lang->trackback = '引用';
-$lang->tag = '標籤';
-$lang->allow_comment = '允許評論';
-$lang->lock_comment = '關閉評論';
-$lang->allow_trackback = '允許引用';
-$lang->uploaded_file = '附加檔案';
-$lang->grant = '權限';
-$lang->target = '目標';
-$lang->total = '全部';
-$lang->total_count = '總數';
-$lang->ipaddress = 'IP位址';
-$lang->path = '路徑';
-$lang->cart = '選擇項目';
-$lang->friend = '好友';
-$lang->notify = '通知';
-$lang->order_target = '排列目標';
-$lang->order_type = '排列方式';
-$lang->order_asc = '升冪';
-$lang->order_desc = '降冪';
-$lang->file = '檔案';
-
-$lang->mid = '模組名稱';
-$lang->sid = '網站名稱';
-$lang->layout = '版面';
-$lang->mobile_layout = '手機版面';
-$lang->widget = 'Widget';
-$lang->module = '模組';
-$lang->skin = '面板';
-$lang->mobile_skin = '手機面板';
-$lang->colorset = '顏色設定';
-$lang->extra_vars = '延伸變數';
-
-$lang->domain = "域名";
-$lang->url = "網址";
-$lang->document_url = '連結網址';
-$lang->trackback_url = '引用';
-$lang->blog_name = '部落格名稱';
-$lang->excerpt = '轉載自';
-
-$lang->document_count = '文章數量';
-$lang->page_count = '頁數';
-$lang->list_count = '列表數';
-$lang->search_list_count = '搜尋列表數';
-$lang->readed_count = '點閱';
-$lang->voted_count = '推薦';
-$lang->comment_count = '評論';
-$lang->member_count = '會員人數';
-$lang->date = '日期';
-$lang->regdate = '登錄日期';
-$lang->last_update = '最後更新';
-$lang->last_post = '最後發表';
-$lang->signup_date = '註冊日期';
-$lang->last_login = '最近登入';
-$lang->first_page = '第一頁';
-$lang->last_page = '最後頁';
-$lang->search_target = '搜尋目標';
-$lang->search_keyword = '關鍵字';
-$lang->is_default = '預設';
-
-$lang->no_documents = '目前沒有主題';
-
-$lang->board_manager = '討論板管理';
-$lang->member_manager = '會員管理';
-$lang->layout_manager = '版面管理';
-
-$lang->use = '使用';
-$lang->notuse = '未使用';
-$lang->not_exists = '無';
-
-$lang->public = '公開';
-$lang->private = '不公開';
-
-$lang->unit_sec = '秒';
-$lang->unit_min = '分';
-$lang->unit_hour = '時';
-$lang->unit_day = '日';
-$lang->unit_month = '月';
-$lang->unit_year = '年';
-
-$lang->unit_week = array(
-	'Monday' => '星期一',
-	'Tuesday' => '星期二',
-	'Wednesday' => '星期三',
-	'Thursday' => '星期四',
-	'Friday' => '星期五',
-	'Saturday' => '星期六',
-	'Sunday' => '星期日',
-);
-
-$lang->unit_meridiem = array(
-	'am' => '上午',
-	'pm' => '下午',
-	'AM' => '上午',
-	'PM' => '下午',
-);
-
-$lang->time_gap = array(
-	'min' => '%d 分鐘前',
-	'mins' => '%d 分鐘前',
-	'hour' => '%d 小時前',
-	'hours' => '%d 小時前',
-);
-
-// 說明
-$lang->about_tag = '用逗號分隔多個標籤';
-$lang->about_layout = '版面設計是佈置網站的外觀模組，在上端版面選單中，可以進行管理';
-
-// 訊息
-$lang->msg_call_server = '系統正在連接伺服器，請稍後。';
-$lang->msg_db_not_setted = '還沒有設定資料庫';
-$lang->msg_dbconnect_failed = '連接資料庫時發生錯誤。\n請重新確認資料庫資訊。';
-$lang->msg_invalid_queryid = 'Query ID值指定錯誤';
-$lang->msg_not_permitted = '沒有權限';
-$lang->msg_input_password = '請輸入密碼';
-$lang->msg_invalid_document = '錯誤的文章編號';
-$lang->msg_invalid_request = '錯誤的請求';
-$lang->msg_invalid_password = '密碼錯誤';
-$lang->msg_error_occured = '發生錯誤';
-$lang->msg_not_founded = '找不到相關內容';
-$lang->msg_no_result = '搜尋不到結果';
-$lang->msg_fail_to_request_open = '連結失敗';
-$lang->msg_invalid_format = '格式錯誤';
-
-$lang->msg_not_permitted_act = '沒有權限執行';
-$lang->msg_module_does_not_exists = "找不到模組。\n請聯絡管理員";
-$lang->msg_module_is_not_standalone = '您請求的模組不能單獨執行';
-$lang->msg_default_url_is_not_defined = '尚未設定預設網址';
-
-$lang->success_registed = '成功送出！';
-$lang->success_declared = '檢舉成功！';
-$lang->success_updated = '修改成功！';
-$lang->success_deleted = '刪除成功！';
-$lang->success_restore = '成功還原！';
-$lang->success_voted = '推薦成功！';
-$lang->success_blamed = '反對成功！';
-$lang->success_moved = '移動成功！';
-$lang->success_sended = '發送成功！';
-$lang->success_reset = '重設成功！';
-$lang->success_leaved = '成功退出！';
-$lang->success_saved = '儲存成功！';
-
-$lang->fail_to_delete = '刪除成功！';
-$lang->fail_to_move = '移動成功！';
-
-$lang->failed_voted = '無法推薦！';
-$lang->failed_blamed = '無法反對！';
-$lang->failed_declared = '無法檢舉！';
-$lang->fail_to_delete_have_children = '不能刪除有回覆的評論！';
-
-$lang->confirm_submit = '確定要送出嗎?';
-$lang->confirm_logout = '確定要登出嗎?';
-$lang->confirm_vote = '確定要推薦嗎?';
-$lang->confirm_delete = '確定要刪除嗎?';
-$lang->confirm_restore = '確定要復原嗎?';
-$lang->confirm_move = '確定要移動嗎?';
-$lang->confirm_reset = '確定要重置嗎?';
-$lang->confirm_leave = '確定要退出嗎?';
-$lang->confirm_update = '確定要更新嗎?';
-
-$lang->column_type = '格式';
-$lang->column_type_list['text'] = '文字輸入(text)';
-$lang->column_type_list['homepage'] = '網址格式';
-$lang->column_type_list['email_address'] = '郵件格式(email)';
-$lang->column_type_list['tel'] = '電話號碼格式(phone)';
-$lang->column_type_list['textarea'] = '文字區域(textarea)';
-$lang->column_type_list['checkbox'] = '核取方塊(checkbox)';
-$lang->column_type_list['select'] = '下拉式選單(select)';
-$lang->column_type_list['radio'] = '選項按紐(radio)';
-$lang->column_type_list['kr_zip'] = '韓國郵編(zip)';
-$lang->column_type_list['date'] = '日期(年月日)';
-//$lang->column_type_list['jp_zip'] = '日本郵編(zip)';
-$lang->column_name = '項目名稱';
-$lang->column_title = '項目標題';
-$lang->default_value = '預設值';
-$lang->is_active = '啟動';
-$lang->is_required = '必填';
-$lang->eid = '延伸變數名稱';
-
-// 關於FTP
-$lang->ftp_form_title = '輸入 FTP 資訊';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP 主機名稱';
-$lang->ftp_port = 'FTP 埠口';
-$lang->about_ftp_password = 'FTP 密碼將不會被儲存';
-$lang->cmd_check_ftp_connect = '檢查 FTP 連線';
-$lang->about_ftp_info = "
-	FTP資訊可應用至以下情形<br/>
-	1. 當 PHP 的安全模式(safe_mode)開啟時，可使程式正常運作。<br/>
-	2. 可用於自動更新。<br/>
-	此 FTP 資訊會儲存在檔案『files/config/ftp.config.php』裡面。<br/>
-	安裝程式後，可以在管理頁面中針對 FTP 資訊進行修改或刪除。<br />
-";
-
-$lang->msg_safe_mode_ftp_needed = '當 PHP 的安全模式(safe_mode)開啟時，請輸入相關 FTP 資訊，否則無法正常安裝或使用程式。';
-$lang->msg_ftp_not_connected = '本地(localhost) FTP 連線錯誤。請檢查 FTP 埠口並確認是否支援 FTP 功能。';
-$lang->msg_ftp_invalid_auth_info = 'FTP登入失敗。請確認輸入的 FTP 資訊。';
-$lang->msg_ftp_mkdir_fail = '新增資料夾失敗。請確認 FTP 主機設置。';
-$lang->msg_ftp_chmod_fail = '修改資料夾權限失敗。請確認 FTP 主機設置。';
-$lang->msg_ftp_connect_success = 'FTP連線成功。';
-
-$lang->ftp_path_title = '請輸入 FTP 路經';
-$lang->msg_ftp_installed_realpath = 'XE絕對路經';
-$lang->msg_ftp_installed_ftp_realpath = 'XE的 FTP 絕對路經';
-
-// 在 xml filter 中所使用的 JavaScript 警告訊息
-$lang->filter->isnull = '請輸入%s';
-$lang->filter->outofrange = '請確認%s字數';
-$lang->filter->equalto = '%s值有誤。';
-$lang->filter->invalid_email = '%s格式有誤。(例：developers@xpressengine.com)';
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "%s只允許使用英文，數字和底線，開頭必須是英文。";
-$lang->filter->invalid_homepage = '%s格式有誤。(例： http://xpressengine.com/)';
-$lang->filter->invalid_korean = '%s只能輸入中文';
-$lang->filter->invalid_korean_number = '%s只能輸入中文或數字';
-$lang->filter->invalid_alpha = '%s只能輸入英文字母';
-$lang->filter->invalid_alpha_number = '%s只能輸入英文或數字';
-$lang->filter->invalid_number = '%s只能輸入數字';
-
-$lang->security_warning_embed = "由於安全的關係，管理員無法檢視嵌入的物件。<BR /> 請使用其他非管理員帳號檢視。";
-$lang->msg_pc_to_mobile = '此頁面有手機頁面，要移至手機頁面嗎？';
-?>
\ No newline at end of file
diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html
index 3dab820e0..2b006b4dc 100644
--- a/common/tpl/common_layout.html
+++ b/common/tpl/common_layout.html
@@ -1,8 +1,23 @@
+{@
+	$db_info   = Context::getDBInfo();
+	$lang_type = Context::getLangType();
+}
+<!--@if($db_info->use_html5=='Y')-->
+<!DOCTYPE html>
+<html lang="{$lang_type}">
+<!--@else-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html lang="{Context::getLangType()}" xml:lang="{Context::getLangType()}" xmlns="http://www.w3.org/1999/xhtml">
+<html lang="{$lang_type}" xml:lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml">
+<!--@end-->
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta name="Generator" content="XpressEngine {__ZBXE_VERSION__}" />
+    <meta name="Generator" content="XpressEngine" />
+	{@ $meta_tags = Context::getMetaTag() }
+	<block loop="$meta_tags=>$key,$meta_tag">
+	<meta http-equiv="{$meta_tag['name']}" content="{$meta_tag['content']}" cond="$meta_tag['is_http_equiv']" />
+	<meta name="{$meta_tag['name']}" content="{$meta_tag['content']}" cond="!$meta_tag['is_http_equiv']" />
+	</block>
+
 <!--@if($module_info->module)-->
     <meta name="module" content="{$module_info->module}" />
 <!--@end-->
@@ -21,24 +36,27 @@
     <title>{Context::getBrowserTitle()}</title>
 {@ $css_files = Context::getCssFile() }
 <!--@foreach($css_files as $key => $css_file)-->
-<!--@if($css_file['targetie'])-->
-    <!--[if {$css_file['targetie']}]>
-<!--@end-->
-    <link rel="stylesheet" href="{$css_file['file']}" type="text/css" charset="UTF-8" media="{$css_file['media']}" />
-<!--@if($css_file['targetie'])-->
-    <![endif]-->
-<!--@end-->
+	<!--@if($css_file['targetie'])-->
+		<!--[if {$css_file['targetie']}]>
+	<!--@end-->
+		<link rel="stylesheet" href="{$css_file['file']}" type="text/css" charset="UTF-8" media="{$css_file['media']}" />
+	<!--@if($css_file['targetie'])-->
+		<![endif]-->
+	<!--@end-->
 <!--@end-->
 {@ $js_files = Context::getJsFile() }
 <!--@foreach($js_files as $key => $js_file)-->
-<!--@if($js_file['targetie'])-->
-    <!--[if {$js_file['targetie']}]>
-<!--@end-->
-    <script type="text/javascript" src="{$js_file['file']}"></script>
-<!--@if($js_file['targetie'])-->
-    <![endif]-->
-<!--@end-->
+	<!--@if($js_file['targetie'])-->
+		<!--[if {$js_file['targetie']}]>
+	<!--@end-->
+		<script type="text/javascript" src="{$js_file['file']}"></script>
+	<!--@if($js_file['targetie'])-->
+		<![endif]-->
+	<!--@end-->
 <!--@end-->
+<!--[if lt IE 9]>
+<script type="text/javascript" src="../js/html5.js" cond="$db_info->use_html5=='Y'"></script>
+<![endif]-->
 <!--@if($rss_url)-->
     <link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" />
     <link rel="alternate" type="application/atom+xml" title="Atom" href="{$atom_url}" />
@@ -48,6 +66,9 @@
     <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" />
 <!--@end-->
 
+<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
+<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+
 {@ $ssl_actions = Context::getSSLActions() }
     <script type="text/javascript">//<![CDATA[
         var current_url = "{$current_url}";
@@ -72,10 +93,8 @@
     {$content}
 
     {Context::getHtmlFooter()}
-
-    <div id="waitingforserverresponse"></div>
-
-{@ $js_body_files = Context::getJsFile('body') }
+<div class="wfsr"></div>
+{@ $js_body_files = Context::getJsFile('body') } 
 <!--@foreach($js_body_files as $key => $js_file)-->
 <!--@if($js_file['targetie'])-->
     <!--[if {$js_file['targetie']}]>
diff --git a/common/tpl/images/buttonBlack.gif b/common/tpl/images/buttonBlack.gif
deleted file mode 100644
index 8873a99e5..000000000
Binary files a/common/tpl/images/buttonBlack.gif and /dev/null differ
diff --git a/common/tpl/images/buttonBlue.gif b/common/tpl/images/buttonBlue.gif
deleted file mode 100644
index 7e3a7f763..000000000
Binary files a/common/tpl/images/buttonBlue.gif and /dev/null differ
diff --git a/common/tpl/images/buttonGo.gif b/common/tpl/images/buttonGo.gif
deleted file mode 100644
index 8f4a53c6e..000000000
Binary files a/common/tpl/images/buttonGo.gif and /dev/null differ
diff --git a/common/tpl/images/buttonGreen.gif b/common/tpl/images/buttonGreen.gif
deleted file mode 100644
index 241fd57d6..000000000
Binary files a/common/tpl/images/buttonGreen.gif and /dev/null differ
diff --git a/common/tpl/images/buttonLeft2.gif b/common/tpl/images/buttonLeft2.gif
deleted file mode 100644
index 12764bd98..000000000
Binary files a/common/tpl/images/buttonLeft2.gif and /dev/null differ
diff --git a/common/tpl/images/buttonRed.gif b/common/tpl/images/buttonRed.gif
deleted file mode 100644
index d017d5949..000000000
Binary files a/common/tpl/images/buttonRed.gif and /dev/null differ
diff --git a/common/tpl/images/buttonRight2.gif b/common/tpl/images/buttonRight2.gif
deleted file mode 100644
index e4c85f1bf..000000000
Binary files a/common/tpl/images/buttonRight2.gif and /dev/null differ
diff --git a/common/tpl/images/buttonSet.gif b/common/tpl/images/buttonSet.gif
deleted file mode 100755
index 3e13945cb..000000000
Binary files a/common/tpl/images/buttonSet.gif and /dev/null differ
diff --git a/common/tpl/images/buttonWhite.gif b/common/tpl/images/buttonWhite.gif
deleted file mode 100644
index 4d5e40cef..000000000
Binary files a/common/tpl/images/buttonWhite.gif and /dev/null differ
diff --git a/common/tpl/images/calendar.gif b/common/tpl/images/calendar.gif
deleted file mode 100644
index 96a8bd14f..000000000
Binary files a/common/tpl/images/calendar.gif and /dev/null differ
diff --git a/common/tpl/images/folder.gif b/common/tpl/images/folder.gif
deleted file mode 100644
index eb129763d..000000000
Binary files a/common/tpl/images/folder.gif and /dev/null differ
diff --git a/common/tpl/images/form_buttons.gif b/common/tpl/images/form_buttons.gif
deleted file mode 100755
index b54b2694f..000000000
Binary files a/common/tpl/images/form_buttons.gif and /dev/null differ
diff --git a/common/tpl/images/form_buttons.png b/common/tpl/images/form_buttons.png
deleted file mode 100755
index 4ca99a35e..000000000
Binary files a/common/tpl/images/form_buttons.png and /dev/null differ
diff --git a/common/tpl/images/iconAdd.gif b/common/tpl/images/iconAdd.gif
deleted file mode 100644
index c4a7757f0..000000000
Binary files a/common/tpl/images/iconAdd.gif and /dev/null differ
diff --git a/common/tpl/images/iconCheckGreen.gif b/common/tpl/images/iconCheckGreen.gif
deleted file mode 100644
index e51b02626..000000000
Binary files a/common/tpl/images/iconCheckGreen.gif and /dev/null differ
diff --git a/common/tpl/images/iconCheckYellow.gif b/common/tpl/images/iconCheckYellow.gif
deleted file mode 100644
index e4eb0fbd1..000000000
Binary files a/common/tpl/images/iconCheckYellow.gif and /dev/null differ
diff --git a/common/tpl/images/iconWrite.gif b/common/tpl/images/iconWrite.gif
deleted file mode 100644
index 60a047473..000000000
Binary files a/common/tpl/images/iconWrite.gif and /dev/null differ
diff --git a/common/tpl/images/iconX.gif b/common/tpl/images/iconX.gif
deleted file mode 100644
index 0e9a830e1..000000000
Binary files a/common/tpl/images/iconX.gif and /dev/null differ
diff --git a/common/tpl/images/icon_next.gif b/common/tpl/images/icon_next.gif
deleted file mode 100644
index 511165bb4..000000000
Binary files a/common/tpl/images/icon_next.gif and /dev/null differ
diff --git a/common/tpl/images/icon_nnext.gif b/common/tpl/images/icon_nnext.gif
deleted file mode 100644
index 4d6ace35e..000000000
Binary files a/common/tpl/images/icon_nnext.gif and /dev/null differ
diff --git a/common/tpl/images/icon_pprev.gif b/common/tpl/images/icon_pprev.gif
deleted file mode 100644
index 6b04fad16..000000000
Binary files a/common/tpl/images/icon_pprev.gif and /dev/null differ
diff --git a/common/tpl/images/icon_prev.gif b/common/tpl/images/icon_prev.gif
deleted file mode 100644
index 97d4531ca..000000000
Binary files a/common/tpl/images/icon_prev.gif and /dev/null differ
diff --git a/common/tpl/images/imgfolder.gif b/common/tpl/images/imgfolder.gif
deleted file mode 100644
index e6d880347..000000000
Binary files a/common/tpl/images/imgfolder.gif and /dev/null differ
diff --git a/common/tpl/images/info.png b/common/tpl/images/info.png
deleted file mode 100644
index f253a8e34..000000000
Binary files a/common/tpl/images/info.png and /dev/null differ
diff --git a/common/tpl/images/loading.gif b/common/tpl/images/loading.gif
deleted file mode 100644
index cecabda03..000000000
Binary files a/common/tpl/images/loading.gif and /dev/null differ
diff --git a/common/tpl/images/widget.gif b/common/tpl/images/widget.gif
deleted file mode 100644
index ccd3ea82c..000000000
Binary files a/common/tpl/images/widget.gif and /dev/null differ
diff --git a/common/tpl/images/widget_bg.jpg b/common/tpl/images/widget_bg.jpg
deleted file mode 100755
index 62c0e5d5a..000000000
Binary files a/common/tpl/images/widget_bg.jpg and /dev/null differ
diff --git a/common/tpl/images/widget_text.gif b/common/tpl/images/widget_text.gif
deleted file mode 100755
index ad260736b..000000000
Binary files a/common/tpl/images/widget_text.gif and /dev/null differ
diff --git a/common/tpl/mobile_layout.html b/common/tpl/mobile_layout.html
index 10b0e6dab..6eb8c5181 100644
--- a/common/tpl/mobile_layout.html
+++ b/common/tpl/mobile_layout.html
@@ -1,8 +1,12 @@
+<!--@if($db_info->use_html5=='Y')-->
+<!DOCTYPE html>
+<!--@else-->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!--@end-->
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{Context::getLangType()}" xml:lang="{Context::getLangType()}">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1" />
+<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=yes, target-densitydpi=medium-dpi" />
 <title>{Context::getBrowserTitle()}</title>
 {@ $css_files = Context::getCssFile() }
 <!--@foreach($css_files as $key => $css_file)-->
@@ -32,6 +36,12 @@
     <link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" />
     <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" />
 <!--@end-->
+
+<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
+<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
+<!--[if lt IE 9]>
+<script type="text/javascript" src="../js/html5.js" cond="$db_info->use_html5=='Y'"></script>
+<![endif]-->
 {@ $ssl_actions = Context::getSSLActions() }
     <script type="text/javascript">//<![CDATA[
         var current_url = "{$current_url}";
diff --git a/common/tpl/popup_layout.html b/common/tpl/popup_layout.html
index 9131fc9fb..1a9cecd8c 100644
--- a/common/tpl/popup_layout.html
+++ b/common/tpl/popup_layout.html
@@ -1,10 +1,6 @@
-<!--%import("../../modules/admin/tpl/css/admin.css")-->
-<!--%import("../../modules/admin/tpl/css/pagination.css")-->
-<div id="xeAdmin">
-<div id="popup_content">
+<load target="../../modules/admin/tpl/css/admin.css" />
+<div class="x popup">
     {$content}
-    <button class="xButton" type="button" onclick="window.close();return false;"><span>{$lang->cmd_close}</span></button>
-</div>
 </div>
 <script type="text/javascript">
 	jQuery(window).load(setFixedPopupSize);
diff --git a/config/config.inc.php b/config/config.inc.php
index 5bc9b77d1..9044fcde1 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -1,164 +1,190 @@
-<?php
-    /**
-     * @file   config/config.inc.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  기본적으로 사용하는 class파일의 include 및 환경 설정을 함
-     **/
-
-    @error_reporting(E_ALL ^ E_NOTICE);
-
-    if(!defined('__ZBXE__')) exit();
-
-    /**
-     * @brief XE의 전체 버전 표기
-     * 이 파일의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
-     **/
-    define('__ZBXE_VERSION__', '1.4.5.10');
-
-    /**
-     * @brief zbXE가 설치된 장소의 base path를 구함
-     **/
-    define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
-
-	/**
-	 * @brief 쿠키 이외의 값에서도 세션을 인식할 수 있도록 함(파일업로드 등에서의 문제 수정)
-	 **/
-	ini_set('session.use_only_cookies', 0);
-
-    /**
-     * @brief 기본 설정에 우선하는 사용자 설정 파일
-     * config/config.user.inc.php 파일에 아래 내용을 저장하면 됨
-     * <?php 
-     * define('__DEBUG__', 0);
-     * define('__DEBUG_OUTPUT__', 0);
-     * define('__DEBUG_PROTECT__', 1);
-     * define('__DEBUG_PROTECT_IP__', '127.0.0.1');
-     * define('__DEBUG_DB_OUTPUT__', 0);
-     * define('__LOG_SLOW_QUERY__', 0);
-     * define('__OB_GZHANDLER_ENABLE__', 1);
-     * define('__ENABLE_PHPUNIT_TEST__', 0);
-     * define('__PROXY_SERVER__', 'http://domain:port/path');
-     * ?>
-     */
-    if(file_exists(_XE_PATH_.'config/config.user.inc.php')) {
-        require _XE_PATH_.'config/config.user.inc.php';
-    }
-
-    /**
-     * @brief 디버깅 메시지 출력 (비트 값)
-     * 0 : 디버그 메시지를 생성/ 출력하지 않음
-     * 1 : debugPrint() 함수를 통한 메시지 출력
-     * 2 : 소요시간, Request/Response info 출력
-     * 4 : DB 쿼리 내역 출력
-     **/
-    if(!defined('__DEBUG__')) define('__DEBUG__', 0);
-
-    /**
-     * @brief 디버그 메세지의 출력 장소
-     * 0 : files/_debug_message.php 에 연결하여 출력
-     * 1 : HTML 최하단에 주석으로 출력 (Response Method가 HTML 일 때)
-     * 2 : Firebug 콘솔에 출력 (PHP 4 & 5. Firebug/FirePHP 플러그인 필요)
-     **/
-    if(!defined('__DEBUG_OUTPUT__')) define('__DEBUG_OUTPUT__', 0);
-
-    /**
-     * @brief FirePHP 콘솔 및 브라우저 주석 출력 보안
-     * 0 : 제한 없음 (권장하지 않음)
-     * 1 : 지정한 IP 주소에만 허용
-     **/
-    if(!defined('__DEBUG_PROTECT__')) define('__DEBUG_PROTECT__', 1);
-    if(!defined('__DEBUG_PROTECT_IP__')) define('__DEBUG_PROTECT_IP__', '127.0.0.1');
-
-    /**
-     * @brief DB 오류 메세지 출력 정의
-     * 0 : 출력하지 않음
-     * 1 : files/_debug_db_query.php 에 연결하여 출력
-     **/
-    if(!defined('__DEBUG_DB_OUTPUT__')) define('__DEBUG_DB_OUTPUT__', 0);
-
-    /**
-     * @brief DB 쿼리중 정해진 시간을 넘기는 쿼리의 로그 남김
-     * 0 : 로그를 남기지 않음
-     * 0 이상 : 단위를 초로 하여 지정된 초 이상의 실행시간이 걸린 쿼리를 로그로 남김
-     * 로그파일은 ./files/_db_slow_query.php 파일로 저장됨
-     **/
-    if(!defined('__LOG_SLOW_QUERY__')) define('__LOG_SLOW_QUERY__', 0);
-
-    /**
-     * @brief DB 쿼리 정보를 남김
-     * 0 : 쿼리에 정보를 추가하지 않음
-     * 1 : XML Query ID를 쿼리 주석으로 남김
-     **/
-    if(!defined('__DEBUG_QUERY__')) define('__DEBUG_QUERY__', 0);
-
-    /**
-     * @brief ob_gzhandler를 이용한 압축 기능을 강제로 사용하거나 끄는 옵션
-     * 0 : 사용하지 않음
-     * 1 : 사용함
-     * 대부분의 서버에서는 문제가 없는데 특정 서버군에서 압축전송시 IE에서 오동작을 일으키는경우가 있음
-     **/
-    if(!defined('__OB_GZHANDLER_ENABLE__')) define('__OB_GZHANDLER_ENABLE__', 1);
-
-    /**
-     * @brief php unit test (경로/tests/index.php) 의 실행 유무 지정
-     * 0 : 사용하지 않음
-     * 1 : 사용함
-     **/
-    if(!defined('__ENABLE_PHPUNIT_TEST__')) define('__ENABLE_PHPUNIT_TEST__', 0);
-
-    /**
-     * @brief __PROXY_SERVER__ 는 대상 서버를 거쳐서 외부 요청을 하도록 하는 서버의 정보를 가지고 있음
-     * FileHandler::getRemoteResource 에서 이 상수를 사용함
-     **/
-    if(!defined('__PROXY_SERVER__')) define('__PROXY_SERVER__', null);
-
-    /**
-     * @brief Firebug 콘솔 출력 사용시 관련 파일 require
-     **/
-    if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1) {
-        require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
-    }
-
-	/**
-	 * @brief Set Timezone as server time 
-	 **/
-	if(version_compare(PHP_VERSION, '5.3.0') >= 0)
-	{
-		date_default_timezone_set(@date_default_timezone_get());		
-	}
-
-	if(!defined('__XE_LOADED_CLASS__')){
-		/**
-		 * @brief 간단하게 사용하기 위한 함수 정의한 파일 require
-		 **/
-		require(_XE_PATH_.'config/func.inc.php');
-
-		if(__DEBUG__) define('__StartTime__', getMicroTime());
-
-		/**
-		 * @brief 기본적인 class 파일 include
-		 * @TODO : PHP5 기반으로 바꾸게 되면 _autoload()를 이용할 수 있기에 제거 대상
-		 **/
-		if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
-		require(_XE_PATH_.'classes/object/Object.class.php');
-		require(_XE_PATH_.'classes/extravar/Extravar.class.php');
-		require(_XE_PATH_.'classes/handler/Handler.class.php');
-		require(_XE_PATH_.'classes/xml/XmlParser.class.php');
-		require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php');
-		require(_XE_PATH_.'classes/cache/CacheHandler.class.php');
-		require(_XE_PATH_.'classes/context/Context.class.php');
-		require(_XE_PATH_.'classes/db/DB.class.php');
-		require(_XE_PATH_.'classes/file/FileHandler.class.php');
-		require(_XE_PATH_.'classes/widget/WidgetHandler.class.php');
-		require(_XE_PATH_.'classes/editor/EditorHandler.class.php');
-		require(_XE_PATH_.'classes/module/ModuleObject.class.php');
-		require(_XE_PATH_.'classes/module/ModuleHandler.class.php');
-		require(_XE_PATH_.'classes/display/DisplayHandler.class.php');
-		require(_XE_PATH_.'classes/template/TemplateHandler.class.php');
-		require(_XE_PATH_.'classes/mail/Mail.class.php');
-		require(_XE_PATH_.'classes/page/PageHandler.class.php');
-		require(_XE_PATH_.'classes/mobile/Mobile.class.php');
-		require(_XE_PATH_.'classes/security/Security.class.php');				
-		if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
-	}
-?>
+<?php
+    /**
+     * @file   config/config.inc.php
+     * @author NHN (developers@xpressengine.com)
+     * @brief set the include of the class file and other environment configurations
+     **/
+
+    @error_reporting(E_ALL ^ E_NOTICE ^ E_DEPRECATED);
+
+    if(!defined('__ZBXE__')) exit();
+
+    /**
+     * @brief display XE's full version
+     * Even The file should be revised when releasing altough no change is made
+     **/
+	define('__XE_VERSION__', '1.5.0.9');
+    define('__ZBXE_VERSION__', __XE_VERSION__); // deprecated : __ZBXE_VERSION__ will be removed. Use __XE_VERSION__ instead.
+
+    /**
+     * @brief The base path to where you installed zbXE Wanted
+     **/
+    define('_XE_PATH_', str_replace('config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
+
+
+	/**
+	 * @brief 쿠키 이외의 값에서도 세션을 인식할 수 있도록 함(파일업로드 등에서의 문제 수정)
+	 **/
+	ini_set('session.use_only_cookies', 0);
+
+
+    if(file_exists(_XE_PATH_.'config/package.inc.php')) {
+        require _XE_PATH_.'config/package.inc.php';
+    } else {
+		define('_XE_PACKAGE_','XE');
+		define('_XE_LOCATION_','en');
+		define('_XE_LOCATION_SITE_','http://www.xpressengine.org/');
+		define('_XE_DOWNLOAD_SERVER_','http://en.download.xpressengine.org/');
+	}
+
+    /**
+     * @brief user configuration files which override the default settings
+     * save the following information into config/config.user.inc.php
+     * <?php
+     * define('__DEBUG__', 0);
+     * define('__DEBUG_OUTPUT__', 0);
+     * define('__DEBUG_PROTECT__', 1);
+     * define('__DEBUG_PROTECT_IP__', '127.0.0.1');
+     * define('__DEBUG_DB_OUTPUT__', 0);
+     * define('__LOG_SLOW_QUERY__', 0);
+     * define('__OB_GZHANDLER_ENABLE__', 1);
+     * define('__ENABLE_PHPUNIT_TEST__', 0);
+     * define('__PROXY_SERVER__', 'http://domain:port/path');
+	 * define('__XE_CDN_PREFIX__', 'http://yourCdnDomain.com/path/');
+	 * define('__XE_CDN_VERSION__', 'yourCndVersion');
+     */
+    if(file_exists(_XE_PATH_.'config/config.user.inc.php')) {
+        require _XE_PATH_.'config/config.user.inc.php';
+    }
+
+    /**
+     * @brief output debug message(bit value)
+     * 0: generate debug messages/not display
+     * 1: display messages through debugPrint() function
+     * 2: output execute time, Request/Response info
+     * 4: output DB query history
+     **/
+    if(!defined('__DEBUG__')) define('__DEBUG__', 0);
+
+    /**
+     * @brief output location of debug message
+     * 0: connect to the files/_debug_message.php and output
+     * 1: HTML output as a comment on the bottom (when response method is the HTML)
+     * 2: Firebug console output (PHP 4 & 5. Firebug/FirePHP plug-in required)
+     **/
+    if(!defined('__DEBUG_OUTPUT__')) define('__DEBUG_OUTPUT__', 0);
+
+    /**
+     * @brief output comments of the firePHP console and browser
+     * 0: No limit (not recommended)
+     * 1: Allow only specified IP addresses
+     **/
+    if(!defined('__DEBUG_PROTECT__')) define('__DEBUG_PROTECT__', 1);
+    if(!defined('__DEBUG_PROTECT_IP__')) define('__DEBUG_PROTECT_IP__', '127.0.0.1');
+
+    /**
+     * @brief DB error message definition
+     * 0: No output
+     * 1: files/_debug_db_query.php connected to the output
+     **/
+    if(!defined('__DEBUG_DB_OUTPUT__')) define('__DEBUG_DB_OUTPUT__', 0);
+
+    /**
+     * @brief Query log for only timeout query among DB queries
+     * 0: Do not leave a log
+     * = 0: leave a log when the slow query takes over specified seconds
+     * Log file is saved as ./files/_db_slow_query.php file
+     **/
+    if(!defined('__LOG_SLOW_QUERY__')) define('__LOG_SLOW_QUERY__', 0);
+
+    /**
+     * @brief Leave DB query information
+     * 0: Do not add information to the query
+     * 1: Comment the XML Query ID
+     **/
+    if(!defined('__DEBUG_QUERY__')) define('__DEBUG_QUERY__', 0);
+
+    /**
+     * @brief option to enable/disable a compression feature using ob_gzhandler
+     * 0: Not used
+     * 1: Enabled
+     * Only particular servers may have a problem in IE browser when sending a compression
+     **/
+    if(!defined('__OB_GZHANDLER_ENABLE__')) define('__OB_GZHANDLER_ENABLE__', 1);
+
+    /**
+     * @brief decide to use/not use the php unit test (Path/tests/index.php)
+     * 0: Not used
+     * 1: Enabled
+     **/
+    if(!defined('__ENABLE_PHPUNIT_TEST__')) define('__ENABLE_PHPUNIT_TEST__', 0);
+
+    /**
+     * @brief __PROXY_SERVER__ has server information to request to the external through the target server
+     * FileHandler:: getRemoteResource uses the constant
+     **/
+    if(!defined('__PROXY_SERVER__')) define('__PROXY_SERVER__', null);
+
+	/**
+	 * @brief CDN prefix
+	 **/
+	if(!defined('__XE_CDN_PREFIX__')) define('__XE_CDN_PREFIX__', 'http://static.xpressengine.com/core/');
+
+	/**
+	 * @brief CDN version
+	 **/
+	if(!defined('__XE_CDN_VERSION__')) define('__XE_CDN_VERSION__', '%__XE_CDN_VERSION__%');
+
+    /**
+     * @brief Require specific files when using Firebug console output
+     **/
+    if((__DEBUG_OUTPUT__ == 2) && version_compare(PHP_VERSION, '6.0.0') === -1) {
+        require _XE_PATH_.'libs/FirePHPCore/FirePHP.class.php';
+    }
+
+	/**
+	 * @brief Set Timezone as server time
+	 **/
+	if(version_compare(PHP_VERSION, '5.3.0') >= 0)
+	{
+		date_default_timezone_set(@date_default_timezone_get());
+	}
+
+	if(!defined('__XE_LOADED_CLASS__')){
+		/**
+		 * @brief Require a function-defined-file for simple use
+		 **/
+		require(_XE_PATH_.'config/func.inc.php');
+
+		if(__DEBUG__) define('__StartTime__', getMicroTime());
+
+		/**
+		 * @brief include the class files
+		 * @TODO : When _autoload() can be used for PHP5 based applications, it will be removed.
+		 **/
+		if(__DEBUG__) define('__ClassLoadStartTime__', getMicroTime());
+		require(_XE_PATH_.'classes/object/Object.class.php');
+		require(_XE_PATH_.'classes/extravar/Extravar.class.php');
+		require(_XE_PATH_.'classes/handler/Handler.class.php');
+		require(_XE_PATH_.'classes/xml/XmlParser.class.php');
+		require(_XE_PATH_.'classes/xml/XmlJsFilter.class.php');
+		require(_XE_PATH_.'classes/xml/XmlLangParser.class.php');
+		require(_XE_PATH_.'classes/cache/CacheHandler.class.php');
+		require(_XE_PATH_.'classes/context/Context.class.php');
+		require(_XE_PATH_.'classes/db/DB.class.php');
+		require(_XE_PATH_.'classes/file/FileHandler.class.php');
+		require(_XE_PATH_.'classes/widget/WidgetHandler.class.php');
+		require(_XE_PATH_.'classes/editor/EditorHandler.class.php');
+		require(_XE_PATH_.'classes/module/ModuleObject.class.php');
+		require(_XE_PATH_.'classes/module/ModuleHandler.class.php');
+		require(_XE_PATH_.'classes/display/DisplayHandler.class.php');
+		require(_XE_PATH_.'classes/template/TemplateHandler.class.php');
+		require(_XE_PATH_.'classes/mail/Mail.class.php');
+		require(_XE_PATH_.'classes/page/PageHandler.class.php');
+		require(_XE_PATH_.'classes/mobile/Mobile.class.php');
+		require(_XE_PATH_.'classes/validator/Validator.class.php');
+		require(_XE_PATH_.'classes/frontendfile/FrontEndFileHandler.class.php');
+		require(_XE_PATH_.'classes/security/Security.class.php');
+		if(__DEBUG__) $GLOBALS['__elapsed_class_load__'] = getMicroTime() - __ClassLoadStartTime__;
+	}
+?>
diff --git a/config/func.inc.php b/config/func.inc.php
index 6da46b091..ac2bd5642 100644
--- a/config/func.inc.php
+++ b/config/func.inc.php
@@ -1,979 +1,980 @@
-<?php
-    /**
-     * @file   config/func.inc.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  편의 목적으로 만든 함수라이브러리 파일
-    **/
-
-    if(!defined('__ZBXE__')) exit();
-
-    /**
-     * @brief php5에 대비하여 clone 정의
-     **/
-    if (version_compare(phpversion(), '5.0') < 0) {
-        eval('
-            function clone($object) {
-            return $object;
-            }
-        ');
-    }
-
-    /**
-     * @brief iconv 함수가 없을 경우 빈 함수를 만들어서 오류가 생기지 않도록 정의
-     **/
-    if(!function_exists('iconv')) {
-        eval('
-            function iconv($in_charset, $out_charset, $str) {
-                return $str;
-            }
-        ');
-    }
-
-
-    // time zone
-    $time_zone = array(
-        '-1200' => '[GMT -12:00] Baker Island Time',
-        '-1100' => '[GMT -11:00] Niue Time, Samoa Standard Time',
-        '-1000' => '[GMT -10:00] Hawaii-Aleutian Standard Time, Cook Island Time',
-        '-0930' => '[GMT -09:30] Marquesas Islands Time',
-        '-0900' => '[GMT -09:00] Alaska Standard Time, Gambier Island Time',
-        '-0800' => '[GMT -08:00] Pacific Standard Time',
-        '-0700' => '[GMT -07:00] Mountain Standard Time',
-        '-0600' => '[GMT -06:00] Central Standard Time',
-        '-0500' => '[GMT -05:00] Eastern Standard Time',
-        '-0400' => '[GMT -04:00] Atlantic Standard Time',
-        '-0330' => '[GMT -03:30] Newfoundland Standard Time',
-        '-0300' => '[GMT -03:00] Amazon Standard Time, Central Greenland Time',
-        '-0200' => '[GMT -02:00] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
-        '-0100' => '[GMT -01:00] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
-        '0000'  => '[GMT  00:00] Western European Time, Greenwich Mean Time',
-        '+0100' => '[GMT +01:00] Central European Time, West African Time',
-        '+0200' => '[GMT +02:00] Eastern European Time, Central African Time',
-        '+0300' => '[GMT +03:00] Moscow Standard Time, Eastern African Time',
-        '+0330' => '[GMT +03:30] Iran Standard Time',
-        '+0400' => '[GMT +04:00] Gulf Standard Time, Samara Standard Time',
-        '+0430' => '[GMT +04:30] Afghanistan Time',
-        '+0500' => '[GMT +05:00] Pakistan Standard Time, Yekaterinburg Standard Time',
-        '+0530' => '[GMT +05:30] Indian Standard Time, Sri Lanka Time',
-        '+0545' => '[GMT +05:45] Nepal Time',
-        '+0600' => '[GMT +06:00] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
-        '+0630' => '[GMT +06:30] Cocos Islands Time, Myanmar Time',
-        '+0700' => '[GMT +07:00] Indochina Time, Krasnoyarsk Standard Time',
-        '+0800' => '[GMT +08:00] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
-        '+0845' => '[GMT +08:45] Southeastern Western Australia Standard Time',
-        '+0900' => '[GMT +09:00] Korea Standard Time, Japan Standard Time, China Standard Time',
-        '+0930' => '[GMT +09:30] Australian Central Standard Time',
-        '+1000' => '[GMT +10:00] Australian Eastern Standard Time, Vladivostok Standard Time',
-        '+1030' => '[GMT +10:30] Lord Howe Standard Time',
-        '+1100' => '[GMT +11:00] Solomon Island Time, Magadan Standard Time',
-        '+1130' => '[GMT +11:30] Norfolk Island Time',
-        '+1200' => '[GMT +12:00] New Zealand Time, Fiji Time, Kamchatka Standard Time',
-        '+1245' => '[GMT +12:45] Chatham Islands Time',
-        '+1300' => '[GMT +13:00] Tonga Time, Phoenix Islands Time',
-        '+1400' => '[GMT +14:00] Line Island Time'
-    ) ;
-
-    /**
-     * @brief ModuleHandler::getModuleObject($module_name, $type)을 쓰기 쉽게 함수로 선언
-     * @param module_name 모듈이름
-     * @param type disp, proc, controller, class
-     * @param kind admin, null
-     * @return module instance
-     **/
-    function &getModule($module_name, $type = 'view', $kind = '') {
-        return ModuleHandler::getModuleInstance($module_name, $type, $kind);
-    }
-
-    /**
-     * @brief module의 controller 객체 생성용
-     * @param module_name 모듈이름
-     * @return module controller instance
-     **/
-    function &getController($module_name) {
-        return getModule($module_name, 'controller');
-    }
-
-    /**
-     * @brief module의 admin controller 객체 생성용
-     * @param module_name 모듈이름
-     * @return module admin controller instance
-     **/
-    function &getAdminController($module_name) {
-        return getModule($module_name, 'controller','admin');
-    }
-
-    /**
-     * @brief module의 view 객체 생성용
-     * @param module_name 모듈이름
-     * @return module view instance
-     **/
-    function &getView($module_name) {
-        return getModule($module_name, 'view');
-    }
-
-    /**
-     * @brief module의 mobile 객체 생성용
-     * @param module_name 모듈이름
-     * @return module mobile instance
-     **/
-    function &getMobile($module_name) {
-        return getModule($module_name, 'mobile');
-    }
-
-    /**
-     * @brief module의 admin view 객체 생성용
-     * @param module_name 모듈이름
-     * @return module admin view instance
-     **/
-    function &getAdminView($module_name) {
-        return getModule($module_name, 'view','admin');
-    }
-
-    /**
-     * @brief module의 model 객체 생성용
-     * @param module_name 모듈이름
-     * @return module model instance
-     **/
-    function &getModel($module_name) {
-        return getModule($module_name, 'model');
-    }
-
-    /**
-     * @brief module의 admin model 객체 생성용
-     * @param module_name 모듈이름
-     * @return module admin model instance
-     **/
-    function &getAdminModel($module_name) {
-        return getModule($module_name, 'model','admin');
-    }
-
-    /**
-     * @brief module의 api 객체 생성용
-     * @param module_name 모듈이름
-     * @return module api class instance
-     **/
-    function &getAPI($module_name) {
-        return getModule($module_name, 'api');
-    }
-
-    /**
-     * @brief module의 wap 객체 생성용
-     * @param module_name 모듈이름
-     * @return module wap class instance
-     **/
-    function &getWAP($module_name) {
-        return getModule($module_name, 'wap');
-    }
-
-    /**
-     * @brief module의 상위 class 객체 생성용
-     * @param module_name 모듈이름
-     * @return module class instance
-     **/
-    function &getClass($module_name) {
-        return getModule($module_name, 'class');
-    }
-
-    /**
-     * @brief DB::executeQuery() 의 alias
-     * @param query_id 쿼리 ID ( 모듈명.쿼리XML파일 )
-     * @param args object 변수로 선언된 인자값
-     * @return 처리결과
-     **/
-    function executeQuery($query_id, $args = null) {
-        $oDB = &DB::getInstance();
-        return $oDB->executeQuery($query_id, $args);
-    }
-
-    /**
-     * @brief DB::executeQuery() 의 결과값을 무조건 배열로 처리하도록 하는 함수
-     * @param query_id 쿼리 ID ( 모듈명.쿼리XML파일 )
-     * @param args object 변수로 선언된 인자값
-     * @return 처리결과
-     **/
-    function executeQueryArray($query_id, $args = null) {
-        $oDB = &DB::getInstance();
-        $output = $oDB->executeQuery($query_id, $args);
-        if(!is_array($output->data) && count($output->data) > 0){
-            $output->data = array($output->data);
-        }
-        return $output;
-    }
-
-    /**
-     * @brief DB::getNextSequence() 의 alias
-     * @return big int
-     **/
-    function getNextSequence() {
-        $oDB = &DB::getInstance();
-        return $oDB->getNextSequence();
-    }
-
-    /**
-     * @brief Context::getUrl()를 쓰기 쉽게 함수로 선언
-     * @return string
-     *
-     * getUrl()은 현재 요청된 RequestURI에 주어진 인자의 값으로 변형하여 url을 리턴한다\n
-     * 1. 인자는 (key, value)... 의 형식으로 주어져야 한다.\n
-     *    ex) getUrl('key1','val1', 'key2', '') : key1, key2를 val1과 '' 로 변형\n
-     * 2. 아무런 인자가 없으면 argument를 제외한 url을 리턴
-     * 3. 첫 인자값이 '' 이면 RequestUri에다가 추가된 args_list로 url을 만듬
-     **/
-    function getUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-
-        if(!$num_args) return Context::getRequestUri();
-
-        return Context::getUrl($num_args, $args_list);
-    }
-
-    function getNotEncodedUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-
-        if(!$num_args) return Context::getRequestUri();
-
-        return Context::getUrl($num_args, $args_list, null, false);
-    }
-
-    /**
-     * @brief getUrl()의 값에 request uri를 추가하여 reutrn
-     * full url을 얻기 위함
-     **/
-    function getFullUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-		$request_uri = Context::getRequestUri();
-        if(!$num_args) return $request_uri;
-
-        $url = Context::getUrl($num_args, $args_list);
-        if(!preg_match('/^http/i',$url)){
-			preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match);
-			return substr($match[0],0,-1).$url;
-		}
-        return $url;
-    }
-
-    function getNotEncodedFullUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-		$request_uri = Context::getRequestUri();
-        if(!$num_args) return $request_uri;
-
-        $url = Context::getUrl($num_args, $args_list);
-        if(!preg_match('/^http/i',$url)){
-			preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match);
-			$url = Context::getUrl($num_args, $args_list, null, false);
-			return substr($match[0],0,-1).$url;
-		}
-        return $url;
-    }
-
-    /**
-     * @brief Context::getUrl()를 쓰기 쉽게 함수로 선언
-     * @return string
-     *
-     * getSiteUrl()은 지정된 도메인에 대해 주어진 인자의 값으로 변형하여 url을 리턴한다\n
-     * 첫 인자는 도메인(http://등이 제외된)+path 여야 함.
-     **/
-    function getSiteUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-
-        if(!$num_args) return Context::getRequestUri();
-
-        $domain = array_shift($args_list);
-        $num_args = count($args_list);
-
-        return Context::getUrl($num_args, $args_list, $domain);
-    }
-
-    function getNotEncodedSiteUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-
-        if(!$num_args) return Context::getRequestUri();
-
-        $domain = array_shift($args_list);
-        $num_args = count($args_list);
-
-        return Context::getUrl($num_args, $args_list, $domain, false);
-    }
-
-    /**
-     * @brief getSiteUrl()의 값에 request uri를 추가하여 reutrn
-     * full url을 얻기 위함
-     **/
-    function getFullSiteUrl() {
-        $num_args = func_num_args();
-        $args_list = func_get_args();
-
-		$request_uri = Context::getRequestUri();
-        if(!$num_args) return $request_uri;
-
-        $domain = array_shift($args_list);
-        $num_args = count($args_list);
-
-        $url = Context::getUrl($num_args, $args_list, $domain);
-        if(!preg_match('/^http/i',$url)){
-			preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match);
-			return substr($match[0],0,-1).$url;
-		}
-        return $url;
-    }
-
-    /**
-     * @brief 가상사이트의 Domain이 url형식인지 site id인지 return
-     **/
-    function isSiteID($domain) {
-        return preg_match('/^([a-z0-9\_]+)$/i', $domain);
-    }
-
-    /**
-     * @brief 주어진 문자를 주어진 크기로 자르고 잘라졌을 경우 주어진 꼬리를 담
-     * @param string 자를 원 문자열
-     * @param cut_size 주어진 원 문자열을 자를 크기
-     * @param tail 잘라졌을 경우 문자열의 제일 뒤에 붙을 꼬리
-     * @return string
-     **/
-    function cut_str($string,$cut_size=0,$tail = '...') {
-        if($cut_size<1 || !$string) return $string;
-
-        $chars = Array(12, 4, 3, 5, 7, 7, 11, 8, 4, 5, 5, 6, 6, 4, 6, 4, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 4, 8, 6, 8, 6, 10, 8, 8, 9, 8, 8, 7, 9, 8, 3, 6, 7, 7, 11, 8, 9, 8, 9, 8, 8, 7, 8, 8, 10, 8, 8, 8, 6, 11, 6, 6, 6, 4, 7, 7, 7, 7, 7, 3, 7, 7, 3, 3, 6, 3, 9, 7, 7, 7, 7, 4, 7, 3, 7, 6, 10, 6, 6, 7, 6, 6, 6, 9);
-        $max_width = $cut_size*$chars[0]/2;
-        $char_width = 0;
-
-        $string_length = strlen($string);
-        $char_count = 0;
-
-        $idx = 0;
-        while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width) {
-            $c = ord(substr($string, $idx,1));
-            $char_count++;
-            if($c<128) {
-                $char_width += (int)$chars[$c-32];
-                $idx++;
-            }
-            else if (191<$c && $c < 224) {
-			          $char_width += $chars[4];
-			          $idx += 2;
-		        }
-            else {
-                $char_width += $chars[0];
-                $idx += 3;
-            }
-        }
-        $output = substr($string,0,$idx);
-        if(strlen($output)<$string_length) $output .= $tail;
-        return $output;
-    }
-
-    function zgap() {
-        $time_zone = $GLOBALS['_time_zone'];
-        if($time_zone < 0) $to = -1; else $to = 1;
-        $t_hour = substr($time_zone, 1, 2) * $to;
-        $t_min = substr($time_zone, 3, 2) * $to;
-
-        $server_time_zone = date("O");
-        if($server_time_zone < 0) $so = -1; else $so = 1;
-        $c_hour = substr($server_time_zone, 1, 2) * $so;
-        $c_min = substr($server_time_zone, 3, 2) * $so;
-
-        $g_min = $t_min - $c_min;
-        $g_hour = $t_hour - $c_hour;
-
-        $gap = $g_min*60 + $g_hour*60*60;
-        return $gap;
-    }
-
-    /**
-     * @brief YYYYMMDDHHIISS 형식의 시간값을 unix time으로 변경
-     * @param str YYYYMMDDHHIISS 형식의 시간값
-     * @return int
-     **/
-    function ztime($str) {
-        if(!$str) return;
-        $hour = (int)substr($str,8,2);
-        $min = (int)substr($str,10,2);
-        $sec = (int)substr($str,12,2);
-        $year = (int)substr($str,0,4);
-        $month = (int)substr($str,4,2);
-        $day = (int)substr($str,6,2);
-        if(strlen($str) <= 8) {
-            $gap = 0;
-        } else {
-            $gap = zgap();
-        }
-
-        return mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year)+$gap;
-    }
-
-    /**
-     * @brief YmdHis의 시간 형식을 지금으로 부터 몇분/몇시간전, 1일 이상 차이나면 format string return
-     **/
-    function getTimeGap($date, $format = 'Y.m.d') {
-        $gap = time() - zgap() - ztime($date);
-
-        $lang_time_gap = Context::getLang('time_gap');
-        if($gap<60) $buff = sprintf($lang_time_gap['min'], (int)($gap / 60)+1);
-        elseif($gap<60*60) $buff =  sprintf($lang_time_gap['mins'], (int)($gap / 60)+1);
-        elseif($gap<60*60*2) $buff =  sprintf($lang_time_gap['hour'], (int)($gap / 60 /60)+1);
-        elseif($gap<60*60*24) $buff =  sprintf($lang_time_gap['hours'], (int)($gap / 60 /60)+1);
-        else $buff =  zdate($date, $format);
-        return $buff;
-    }
-
-    /**
-     * @brief 월이름을 return
-     **/
-    function getMonthName($month, $short = true) {
-        $short_month = array('','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
-        $long_month = array('','January','February','March','April','May','June','July','August','September','October','November','December');
-        return !$short?$long_month[$month]:$short_month[$month];
-    }
-
-    /**
-     * @brief YYYYMMDDHHIISS 형식의 시간값을 원하는 시간 포맷으로 변형
-     * @param string|int str YYYYMMDDHHIISS 형식의 시간 값
-     * @param string format php date()함수의 시간 포맷
-     * @param bool conversion 언어에 따라 날짜 포맷의 자동변환 여부
-     * @return string
-     **/
-    function zdate($str, $format = 'Y-m-d H:i:s', $conversion=true) {
-        // 대상 시간이 없으면 null return
-        if(!$str) return;
-
-        // 언어권에 따라서 지정된 날짜 포맷을 변경
-        if($conversion == true) {
-            switch(Context::getLangType()) {
-                case 'en' :
-                case 'es' :
-                        if($format == 'Y-m-d') $format = 'M d, Y';
-                        elseif($format == 'Y-m-d H:i:s') $format = 'M d, Y H:i:s';
-                        elseif($format == 'Y-m-d H:i') $format = 'M d, Y H:i';
-                    break;
-                case 'vi' :
-                        if($format == 'Y-m-d') $format = 'd-m-Y';
-                        elseif($format == 'Y-m-d H:i:s') $format = 'H:i:s d-m-Y';
-                        elseif($format == 'Y-m-d H:i') $format = 'H:i d-m-Y';
-                    break;
-
-            }
-        }
-
-        // 년도가 1970년 이전이면 별도 처리
-        if((int)substr($str,0,4) < 1970) {
-            $hour  = (int)substr($str,8,2);
-            $min   = (int)substr($str,10,2);
-            $sec   = (int)substr($str,12,2);
-            $year  = (int)substr($str,0,4);
-            $month = (int)substr($str,4,2);
-            $day   = (int)substr($str,6,2);
-
-			// leading zero?
-			$lz = create_function('$n', 'return ($n>9?"":"0").$n;');
-
-			$trans = array(
-				'Y'=>$year,
-				'y'=>$lz($year%100),
-				'm'=>$lz($month),
-				'n'=>$month,
-				'd'=>$lz($day),
-				'j'=>$day,
-				'G'=>$hour,
-				'H'=>$lz($hour),
-				'g'=>$hour%12,
-				'h'=>$lz($hour%12),
-				'i'=>$lz($min),
-				's'=>$lz($sec),
-				'M'=>getMonthName($month),
-				'F'=>getMonthName($month,false)
-			);
-
-            $string = strtr($format, $trans);
-        } else {
-            // 1970년 이후라면 ztime()함수로 unixtime을 구하고 date함수로 처리
-            $string = date($format, ztime($str));
-        }
-
-        // 요일, am/pm을 각 언어에 맞게 변경
-        $unit_week = Context::getLang('unit_week');
-        $unit_meridiem = Context::getLang('unit_meridiem');
-        $string = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),$unit_week, $string);
-        $string = str_replace(array('am','pm','AM','PM'), $unit_meridiem, $string);
-        return $string;
-    }
-
-    /**
-     * @brief prints debug messages 
-     * @param debug_output target object to be printed
-     * @param display_line boolean flag whether to print seperator (default:true)
-     * @return none
-     *
-     * ./files/_debug_message.php 파일에 $buff 내용을 출력한다.
-     * tail -f ./files/_debug_message.php 하여 계속 살펴 볼 수 있다
-     **/
-    function debugPrint($debug_output = null, $display_option = true, $file = '_debug_message.php') {
-        if(!(__DEBUG__ & 1)) return;
-
-        static $firephp;
-        $bt = debug_backtrace();
-        if(is_array($bt)) $first = array_shift($bt);
-        $file_name = array_pop(explode(DIRECTORY_SEPARATOR, $first['file']));
-        $line_num = $first['line'];
-
-        if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1) {
-            if(!isset($firephp)) $firephp = FirePHP::getInstance(true);
-            if(function_exists("memory_get_usage"))
-            {
-                $label = sprintf('[%s:%d] (m:%s)', $file_name, $line_num, FileHandler::filesize(memory_get_usage()));
-            }
-            else
-            {
-                $label = sprintf('[%s:%d] ', $file_name, $line_num);
-            }
-
-            // FirePHP 옵션 체크
-            if($display_option === 'TABLE') $label = $display_option;
-
-            // __DEBUG_PROTECT__ 옵션으로 지정된 IP와 접근 IP가 동일한지 체크
-            if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
-                $debug_output = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
-                $label = null;
-            }
-
-            $firephp->fb($debug_output, $label);
-
-        } else {
-            if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
-                return;
-            }
-            $debug_file = _XE_PATH_.'files/'.$file;
-            if(function_exists("memory_get_usage"))
-            {
-                $debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, true));
-            }
-            else
-            {
-                $debug_output = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($debug_output, true));
-            }
-
-            if($display_option === true) $debug_output = str_repeat('=', 40)."\n".$debug_output.str_repeat('-', 40);
-            $debug_output = "\n<?php\n/*".$debug_output."*/\n?>\n";
-
-            if(@!$fp = fopen($debug_file, 'a')) return;
-            fwrite($fp, $debug_output);
-            fclose($fp);
-        }
-    }
-
-
-    /**
-     * @brief microtime() return
-     * @return float
-     **/
-    function getMicroTime() {
-        list($time1, $time2) = explode(' ', microtime());
-        return (float)$time1 + (float)$time2;
-    }
-
-    /**
-     * @brief 첫번째 인자로 오는 object var에서 2번째 object의 var들을 제거
-     * @param target_obj 원 object
-     * @param del_obj 원 object의 vars에서 del_obj의 vars를 제거한다
-     * @return object
-     **/
-    function delObjectVars($target_obj, $del_obj) {
-        if(!is_object($target_obj)) return;
-        if(!is_object($del_obj)) return;
-
-        $target_vars = get_object_vars($target_obj);
-        $del_vars = get_object_vars($del_obj);
-
-        $target = array_keys($target_vars);
-        $del = array_keys($del_vars);
-        if(!count($target)||!count($del)) return $target_obj;
-
-        $return_obj = NULL;
-
-        $target_count = count($target);
-        for($i = 0; $i < $target_count; $i++) {
-            $target_key = $target[$i];
-            if(!in_array($target_key, $del)) $return_obj->{$target_key} = $target_obj->{$target_key};
-        }
-
-        return $return_obj;
-    }
-
-    /**
-     * @brief php5 이상에서 error_handing을 debugPrint로 변경
-     * @param errno
-     * @param errstr
-     * @return file
-     * @return line
-     **/
-    function handleError($errno, $errstr, $file, $line) {
-        if(!__DEBUG__) return;
-        $errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
-        if(!in_array($errno, $errors)) return;
-
-        $output = sprintf("Fatal error : %s - %d", $file, $line);
-        $output .= sprintf("%d - %s", $errno, $errstr);
-
-        debugPrint($output);
-    }
-
-    /**
-     * @brief 주어진 숫자를 주어진 크기로 recursive하게 잘라줌
-     * @param no 주어진 숫자
-     * @param size 잘라낼 크기
-     **/
-    function getNumberingPath($no, $size=3) {
-        $mod = pow(10, $size);
-        $output = sprintf('%0'.$size.'d/', $no%$mod);
-        if($no >= $mod) $output .= getNumberingPath((int)$no/$mod, $size);
-        return $output;
-    }
-
-    /**
-     * @brief 한글이 들어간 url의 decode
-     **/
-    function url_decode($str) {
-        return preg_replace('/%u([[:alnum:]]{4})/', '&#x\\1;',$str);
-    }
-
-    /**
-     * @brief 해킹 시도로 의심되는 코드들을 미리 차단
-     **/
-    function removeHackTag($content) {
-        // 특정 태그들을 일반 문자로 변경
-        $content = preg_replace('/<(\/?)(iframe|script|meta|style|applet|link|base|html|body)/is', '&lt;$1$2', $content);
-
-        /**
-         * 이미지나 동영상등의 태그에서 src에 관리자 세션을 악용하는 코드를 제거
-         * - 취약점 제보 : 김상원님
-         **/
-        $content = preg_replace_callback("!<(/?)([a-z]+)(.*?)>!is", removeSrcHack, $content);
-
-		// xmp tag 확인 및 추가
-		$content = checkXmpTag($content);
-
-        return $content;
-    }
-
-    /**
-     * @brief xmp tag 확인 및 닫히지 않은 경우 추가
-     **/
-	function checkXmpTag($content) {
-		if(($start_xmp = strrpos($content, '<xmp>')) !==false) {
-			if(($close_xmp = strrpos($content, '</xmp>')) === false) $content .= '</xmp>';
-			else if($close_xmp < $start_xmp) $content .= '</xmp>';
-		}
-		
-		return $content;
-	}
-
-    function removeSrcHack($matches) {
-        $tag = strtolower(trim($matches[2]));
-		
-		// xmp tag 정리
-		if($tag=='xmp') return '<'.$matches[1].'xmp>';
- 		if($matches[1]=='/') return $matches[0];
-
-        //$buff = trim(preg_replace('/(\/>|>)/','/>',$matches[0]));
-        $buff = $matches[0];
-        $buff = str_replace(array('&amp;','&'),array('&','&amp;'),$buff);
-        $buff = preg_replace_callback('/([^=^"^ ]*)=([^ ^>]*)/i', 'fixQuotation', $buff);
-
-        $oXmlParser = new XmlParser();
-        $xml_doc = $oXmlParser->parse($buff);
-		if(!$xml_doc) return sprintf("<%s>", $tag);
-
-        // src값에 module=admin이라는 값이 입력되어 있으면 이 값을 무효화 시킴
-        $src = $xml_doc->attrs->src;
-        $dynsrc = $xml_doc->attrs->dynsrc;
-        $lowsrc = $xml_doc->attrs->lowsrc;
-        $href = $xml_doc->attrs->href;
-		$data = $xml_doc->attrs->data;
-		$background = $xml_doc->attrs->background;
-		$style = $xml_doc->attrs->style;
-		if($style) {
-			$url = preg_match_all('/url\s*\(([^\)]+)\)/is', $style, $matches2);
-			if(count($matches2[0]))
-			{
-				foreach($matches2[1] as $target)
-				{
-					if(_isHackedSrc($target)) return sprintf("<%s>",$tag);
-				}
-			}
-		}
-        if(_isHackedSrc($src) || _isHackedSrc($dynsrc) || _isHackedSrc($lowsrc) || _isHackedSrc($href) || _isHackedSrc($data) || _isHackedSrc($background) || _isHackedSrcExp($style)) return sprintf("<%s>",$tag);
-
-		if($tag=='param' && $xml_doc->attrs->value && preg_match('/^javascript:/i',$xml_doc->attrs->value)) return sprintf("<%s>",$tag);
-		if($tag=='object' && $xml_doc->attrs->data && preg_match('/^javascript:/i',$xml_doc->attrs->data)) return sprintf("<%s>",$tag);
-
-        return $buff;
-    }
-
-	function _isHackedSrcExp($style) {
-		if(!$style) return false;
-		if(preg_match('/((\/\*)|(\*\/)|(\\n)|(expression))/i', $style)) return true;
-		return false;
-	}
-
-    function _isHackedSrc($src) {
-        if(!$src) return false;
-        if($src) {
-			$target = trim($src);
-			if(preg_match('/(\s|(\&\#)|(script:))/i', $target)) return true;
-			if(preg_match('/data:/i', $target)) return true;
-
-            $url_info = parse_url($src);
-            $query = $url_info['query'];
-			if(!trim($query)) return false;
-			$query = str_replace("&amp;","&",$query);
-            $queries = explode('&', $query);
-            $cnt = count($queries);
-            for($i=0;$i<$cnt;$i++) {
-                $tmp_str = strtolower(trim($queries[$i]));
-                $pos = strpos($tmp_str,'=');
-                if($pos === false) continue;
-                $key = strtolower(trim(substr($tmp_str, 0, $pos)));
-                $val = strtolower(trim(substr($tmp_str,$pos+1)));
-                if( ($key=='module'&&$val=='admin') || ($key=='act'&&preg_match('/admin/i',$val)) ) return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * @brief attribute의 value를 " 로 둘러싸도록 처리하는 함수
-     **/
-    function fixQuotation($matches) {
-        $key = $matches[1];
-        $val = trim($matches[2]);
-
-		$close_tag = false;
-		if(substr($val,-1)=='/') {
-			$close_tag = true;
-			$val = rtrim(substr($val,0,-1));
-		}
-
-		if($val{0}=="'" && substr($val,-1)=="'")
-		{
-			$val = sprintf('"%s"', substr($val,1,-1));
-		}
-
-		if($close_tag) $val .= ' /';
-		
-		// attribute on* remove
-		if(preg_match('/^on([a-z]+)/i',preg_replace('/[^a-zA-Z_]/','',$key))) return '';
-       
-		$output = sprintf('%s=%s', $key, $val);
-
-		return $output;
-    }
-
-    // hexa값을 RGB로 변환
-    if(!function_exists('hexrgb')) {
-        function hexrgb($hexstr) {
-          $int = hexdec($hexstr);
-
-          return array('red' => 0xFF & ($int >> 0x10),
-                       'green' => 0xFF & ($int >> 0x8),
-                       'blue' => 0xFF & $int);
-        }
-
-    }
-
-    /**
-     * @brief mysql old_password 의 php 구현 함수
-     * 제로보드4나 기타 mysql4.1 이전의 old_password()함수를 쓴 데이터의 사용을 위해서
-     * mysql의 password.c 소스 참조해서 구현함
-     **/
-    function mysql_pre4_hash_password($password) {
-        $nr = 1345345333;
-        $add = 7;
-        $nr2 = 0x12345671;
-
-        settype($password, "string");
-
-        for ($i=0; $i<strlen($password); $i++) {
-            if ($password[$i] == ' ' || $password[$i] == '\t') continue;
-            $tmp = ord($password[$i]);
-            $nr ^= ((($nr & 63) + $add) * $tmp) + ($nr << 8);
-            $nr2 += ($nr2 << 8) ^ $nr;
-            $add += $tmp;
-        }
-        $result1 = sprintf("%08lx", $nr & ((1 << 31) -1));
-        $result2 = sprintf("%08lx", $nr2 & ((1 << 31) -1));
-
-        if($result1 == '80000000') $nr += 0x80000000;
-        if($result2 == '80000000') $nr2 += 0x80000000;
-
-        return sprintf("%08lx%08lx", $nr, $nr2);
-    }
-
-    /**
-     * 현재 요청받은 스크립트 경로를 return
-     **/
-    function getScriptPath() {
-        static $url = null;
-        if($url == null) $url = preg_replace('/\/tools\//i','/',preg_replace('/index.php$/i','',str_replace('\\','/',$_SERVER['SCRIPT_NAME'])));
-        return $url;
-    }
-
-    /**
-     * javascript의 escape의 php unescape 함수
-     * Function converts an Javascript escaped string back into a string with specified charset (default is UTF-8).
-     * Modified function from http://pure-essence.net/stuff/code/utf8RawUrlDecode.phps
-     **/
-    function utf8RawUrlDecode ($source) {
-        $decodedStr = '';
-        $pos = 0;
-        $len = strlen ($source);
-        while ($pos < $len) {
-            $charAt = substr ($source, $pos, 1);
-            if ($charAt == '%') {
-                $pos++;
-                $charAt = substr ($source, $pos, 1);
-                if ($charAt == 'u') {
-                    // we got a unicode character
-                    $pos++;
-                    $unicodeHexVal = substr ($source, $pos, 4);
-                    $unicode = hexdec ($unicodeHexVal);
-                    $decodedStr .= _code2utf($unicode);
-                    $pos += 4;
-                }
-                else {
-                    // we have an escaped ascii character
-                    $hexVal = substr ($source, $pos, 2);
-                    $decodedStr .= chr (hexdec ($hexVal));
-                    $pos += 2;
-                }
-            } else {
-                $decodedStr .= $charAt;
-                $pos++;
-            }
-        }
-        return $decodedStr;
-    }
-
-    function _code2utf($num){
-        if($num<128)return chr($num);
-        if($num<2048)return chr(($num>>6)+192).chr(($num&63)+128);
-        if($num<65536)return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128);
-        if($num<2097152)return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128) .chr(($num&63)+128);
-        return '';
-    }
-
-
-    function detectUTF8($string, $return_convert = false, $urldecode = true) {
-        if($urldecode) $string = urldecode($string);
-
-        $sample = iconv('utf-8', 'utf-8', $string);
-        $is_utf8 = (md5($sample) == md5($string));
-
-        if(!$urldecode) $string = urldecode($string);
-
-        if($return_convert) return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
-
-        return $is_utf8;
-    }
-
-
-    function json_encode2($data) {
-        switch (gettype($data)) {
-            case 'boolean':
-              return $data?'true':'false';
-            case 'integer':
-            case 'double':
-              return $data;
-            case 'string':
-              return '"'.strtr($data, array('\\'=>'\\\\','"'=>'\\"')).'"';
-            case 'object':
-              $data = get_object_vars($data);
-            case 'array':
-              $rel = false; // relative array?
-              $key = array_keys($data);
-              foreach ($key as $v) {
-                if (!is_int($v)) {
-                  $rel = true;
-                  break;
-                }
-              }
-
-              $arr = array();
-              foreach ($data as $k=>$v) {
-                $arr[] = ($rel?'"'.strtr($k, array('\\'=>'\\\\','"'=>'\\"')).'":':'').json_encode2($v);
-              }
-
-              return $rel?'{'.join(',', $arr).'}':'['.join(',', $arr).']';
-            default:
-              return '""';
-        }
-    }
-
-
-    function isCrawler($agent = null) {
-        if(!$agent) $agent = $_SERVER['HTTP_USER_AGENT'];
-        $check_agent = array('bot', 'spider', 'google', 'yahoo', 'daum', 'teoma', 'fish', 'hanrss', 'facebook');
-        $check_ip = array(
-            '211.245.21.11*' /* mixsh */
-        );
-
-        foreach($check_agent as $str) {
-            if(stristr($agent, $str) != FALSE) return true;
-        }
-
-        $check_ip = '/^('.implode($check_ip, '|').')/';
-        $check_ip = str_replace('.', '\.', $check_ip);
-        $check_ip = str_replace('*', '.+', $check_ip);
-        $check_ip = str_replace('?', '.?', $check_ip);
-
-        if(preg_match($check_ip, $_SERVER['REMOTE_ADDR'], $matches)) return true;
-
-        return false;
-    }
-
-	function stripEmbedTagForAdmin(&$content, $writer_member_srl)
-	{
-		if(!Context::get('is_logged')) return;
-		$oModuleModel = &getModel('module');
-		$logged_info = Context::get('logged_info');
-
-		if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)) )
-		{   
-			if($writer_member_srl)
-			{
-				$oMemberModel =& getModel('member');
-				$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
-				if($member_info->is_admin == "Y")
-				{
-					return;
-				}
-			}
-			$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
-			$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
-			$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
-			$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
-		}
-
-		return;
-	}
-
-	function requirePear()
-	{
-		if(version_compare(PHP_VERSION, "5.3.0") < 0)
-		{
-			set_include_path(_XE_PATH_."libs/PEAR");	
-		}
-		else
-		{
-			set_include_path(_XE_PATH_."libs/PEAR.1.9");	
-
-		}
-	}
-
-?>
+<?php
+    /**
+     * @file   config/func.inc.php
+     * @author NHN (developers@xpressengine.com)
+     * @brief function library files for convenience
+    **/
+
+    if(!defined('__XE__') && !defined('__ZBXE__')) exit();
+
+    /**
+     * @brief define clone for php5
+     **/
+    if (version_compare(phpversion(), '5.0') < 0) {
+        eval('
+            function clone($object) {
+            return $object;
+            }
+        ');
+    }
+
+    /**
+     * @brief define an empty function to avoid errors when iconv function doesn't exist
+     **/
+    if(!function_exists('iconv')) {
+        eval('
+            function iconv($in_charset, $out_charset, $str) {
+                return $str;
+            }
+        ');
+	}
+
+	if ( !function_exists('htmlspecialchars_decode') )
+	{
+		function htmlspecialchars_decode($text)
+		{
+			return strtr($text, array_flip(get_html_translation_table(HTML_SPECIALCHARS)));
+		}
+	}
+
+    // time zone
+    $time_zone = array(
+        '-1200' => '[GMT -12:00] Baker Island Time',
+        '-1100' => '[GMT -11:00] Niue Time, Samoa Standard Time',
+        '-1000' => '[GMT -10:00] Hawaii-Aleutian Standard Time, Cook Island Time',
+        '-0930' => '[GMT -09:30] Marquesas Islands Time',
+        '-0900' => '[GMT -09:00] Alaska Standard Time, Gambier Island Time',
+        '-0800' => '[GMT -08:00] Pacific Standard Time',
+        '-0700' => '[GMT -07:00] Mountain Standard Time',
+        '-0600' => '[GMT -06:00] Central Standard Time',
+        '-0500' => '[GMT -05:00] Eastern Standard Time',
+        '-0400' => '[GMT -04:00] Atlantic Standard Time',
+        '-0330' => '[GMT -03:30] Newfoundland Standard Time',
+        '-0300' => '[GMT -03:00] Amazon Standard Time, Central Greenland Time',
+        '-0200' => '[GMT -02:00] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
+        '-0100' => '[GMT -01:00] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
+        '0000'  => '[GMT  00:00] Western European Time, Greenwich Mean Time',
+        '+0100' => '[GMT +01:00] Central European Time, West African Time',
+        '+0200' => '[GMT +02:00] Eastern European Time, Central African Time',
+        '+0300' => '[GMT +03:00] Moscow Standard Time, Eastern African Time',
+        '+0330' => '[GMT +03:30] Iran Standard Time',
+        '+0400' => '[GMT +04:00] Gulf Standard Time, Samara Standard Time',
+        '+0430' => '[GMT +04:30] Afghanistan Time',
+        '+0500' => '[GMT +05:00] Pakistan Standard Time, Yekaterinburg Standard Time',
+        '+0530' => '[GMT +05:30] Indian Standard Time, Sri Lanka Time',
+        '+0545' => '[GMT +05:45] Nepal Time',
+        '+0600' => '[GMT +06:00] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
+        '+0630' => '[GMT +06:30] Cocos Islands Time, Myanmar Time',
+        '+0700' => '[GMT +07:00] Indochina Time, Krasnoyarsk Standard Time',
+        '+0800' => '[GMT +08:00] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
+        '+0845' => '[GMT +08:45] Southeastern Western Australia Standard Time',
+        '+0900' => '[GMT +09:00] Korea Standard Time, Japan Standard Time, China Standard Time',
+        '+0930' => '[GMT +09:30] Australian Central Standard Time',
+        '+1000' => '[GMT +10:00] Australian Eastern Standard Time, Vladivostok Standard Time',
+        '+1030' => '[GMT +10:30] Lord Howe Standard Time',
+        '+1100' => '[GMT +11:00] Solomon Island Time, Magadan Standard Time',
+        '+1130' => '[GMT +11:30] Norfolk Island Time',
+        '+1200' => '[GMT +12:00] New Zealand Time, Fiji Time, Kamchatka Standard Time',
+        '+1245' => '[GMT +12:45] Chatham Islands Time',
+        '+1300' => '[GMT +13:00] Tonga Time, Phoenix Islands Time',
+        '+1400' => '[GMT +14:00] Line Island Time'
+    ) ;
+
+    /**
+     * @brief define a function to use ModuleHandler::getModuleObject ($module_name, $type)
+     * @param module_name
+     * @param type disp, proc, controller, class
+     * @param kind admin, null
+     * @return module instance
+     **/
+    function &getModule($module_name, $type = 'view', $kind = '') {
+        return ModuleHandler::getModuleInstance($module_name, $type, $kind);
+    }
+
+    /**
+     * @brief create a controller instance of the module
+     * @param module_name
+     * @return module controller instance
+     **/
+    function &getController($module_name) {
+        return getModule($module_name, 'controller');
+    }
+
+    /**
+     * @brief create a controller instance of the module
+     * @param module_name
+     * @return module admin controller instance
+     **/
+    function &getAdminController($module_name) {
+        return getModule($module_name, 'controller','admin');
+    }
+
+    /**
+     * @brief create a view instance of the module
+     * @param module_name
+     * @return module view instance
+     **/
+    function &getView($module_name) {
+        return getModule($module_name, 'view');
+    }
+
+    /**
+     * @brief create a view instance of the module
+     * @param module_name
+     * @return module mobile instance
+     **/
+    function &getMobile($module_name) {
+        return getModule($module_name, 'mobile');
+    }
+
+    /**
+     * @brief module의 admin view 객체 생성용
+     * @param module_name 모듈이름
+     * @return module admin view instance
+     **/
+    function &getAdminView($module_name) {
+        return getModule($module_name, 'view','admin');
+    }
+
+    /**
+     * @brief create a model instance of the module
+     * @param module_name
+     * @return module model instance
+     **/
+    function &getModel($module_name) {
+        return getModule($module_name, 'model');
+    }
+
+    /**
+     * @brief create an admin model instance of the module
+     * @param module_name
+     * @return module admin model instance
+     **/
+    function &getAdminModel($module_name) {
+        return getModule($module_name, 'model','admin');
+    }
+
+    /**
+     * @brief create an api instance of the module
+     * @param module_name
+     * @return module api class instance
+     **/
+    function &getAPI($module_name) {
+        return getModule($module_name, 'api');
+    }
+
+    /**
+     * @brief create a wap instance of the module
+     * @param module_name
+     * @return module wap class instance
+     **/
+    function &getWAP($module_name) {
+        return getModule($module_name, 'wap');
+    }
+
+    /**
+     * @brief create a class instance of the module
+     * @param module_name
+     * @return module class instance
+     **/
+    function &getClass($module_name) {
+        return getModule($module_name, 'class');
+    }
+
+    /**
+     * @brief the alias of DB::executeQuery() 
+     * @param query_id (module name.query XML file)
+     * @param argument values of args object
+     * @return results
+     **/
+    function executeQuery($query_id, $args = null, $arg_columns = null) {
+        $oDB = &DB::getInstance();
+        return $oDB->executeQuery($query_id, $args, $arg_columns);
+    }
+
+    /**
+     * @brief function to handle the result of DB::executeQuery() as an array
+     * @param query_id(module name.query XML file)
+     * @param argument values of args object
+     * @return results
+     **/
+    function executeQueryArray($query_id, $args = null, $arg_columns = null) {
+        $oDB = &DB::getInstance();
+        $output = $oDB->executeQuery($query_id, $args, $arg_columns);
+        if(!is_array($output->data) && count($output->data) > 0){
+            $output->data = array($output->data);
+        }
+        return $output;
+    }
+
+    /**
+     * @brief DB:: alias of getNextSequence() 
+     * @return big int
+     **/
+    function getNextSequence() {
+        $oDB = &DB::getInstance();
+        return $oDB->getNextSequence();
+    }
+
+    /**
+     * @brief define a function to use Context::getUrl()
+     * @return string
+     *
+     * getUrl() returns the URL transformed from given arguments of RequestURI\n
+     * 1. argument format follows as (key, value).\.
+     * ex) getUrl('key1', 'val1', 'key2',''): transform key1 and key2 to val1 and '' respectively\n
+     * 2. returns URL without the argument if no argument is given.
+     * 3. URL made of args_list added to RequestUri if the first argument value is ''.
+     **/
+    function getUrl() {
+        $num_args  = func_num_args();
+        $args_list = func_get_args();
+
+		if($num_args) $url = Context::getUrl($num_args, $args_list);
+		else $url = Context::getRequestUri();
+
+		return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
+    }
+
+    function getNotEncodedUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+
+		if($num_args) $url = Context::getUrl($num_args, $args_list, null, false);
+		else $url = Context::getRequestUri();
+
+		return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
+    }
+
+    function getAutoEncodedUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+
+		if($num_args) $url = Context::getUrl($num_args, $args_list, null, true, true);
+		else $url = Context::getRequestUri();
+
+		return preg_replace('@\berror_return_url=[^&]*|\w+=(?:&|$)@', '', $url);
+    }
+    /**
+     * @brief return the value adding request uri to getUrl()
+     * to get the full url
+     **/
+    function getFullUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+		$request_uri = Context::getRequestUri();
+        if(!$num_args) return $request_uri;
+
+        $url = Context::getUrl($num_args, $args_list);
+        if(!preg_match('/^http/i',$url)){
+			preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match);
+			return substr($match[0],0,-1).$url;
+		}
+        return $url;
+    }
+
+    function getNotEncodedFullUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+		$request_uri = Context::getRequestUri();
+        if(!$num_args) return $request_uri;
+
+        $url = Context::getUrl($num_args, $args_list);
+        if(!preg_match('/^http/i',$url)){
+			preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match);
+			$url = Context::getUrl($num_args, $args_list, null, false);
+			return substr($match[0],0,-1).$url;
+		}
+        return $url;
+    }
+
+    /**
+     * @brief Context:: getUrl() function is declared as easier to write
+     * @return string
+     *
+     * getSiteUrl() returns the URL by transforming the given argument value of domain\n
+     * The first argument should consist of domain("http://" not included) and path
+     * 
+     **/
+    function getSiteUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+
+        if(!$num_args) return Context::getRequestUri();
+
+        $domain = array_shift($args_list);
+        $num_args = count($args_list);
+
+        return Context::getUrl($num_args, $args_list, $domain);
+    }
+
+    function getNotEncodedSiteUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+
+        if(!$num_args) return Context::getRequestUri();
+
+        $domain = array_shift($args_list);
+        $num_args = count($args_list);
+
+        return Context::getUrl($num_args, $args_list, $domain, false);
+    }
+
+    /**
+     * @brief return the value adding request uri to the getSiteUrl()
+     * To get the full url
+     **/
+    function getFullSiteUrl() {
+        $num_args = func_num_args();
+        $args_list = func_get_args();
+
+		$request_uri = Context::getRequestUri();
+        if(!$num_args) return $request_uri;
+
+        $domain = array_shift($args_list);
+        $num_args = count($args_list);
+
+        $url = Context::getUrl($num_args, $args_list, $domain);
+        if(!preg_match('/^http/i',$url)){
+			preg_match('/^(http|https):\/\/([^\/]+)\//',$request_uri,$match);
+			return substr($match[0],0,-1).$url;
+		}
+        return $url;
+    }
+
+    /**
+     * @brief return if domain of the virtual site is url type or id type
+     **/
+    function isSiteID($domain) {
+        return preg_match('/^([a-z0-9\_]+)$/i', $domain);
+    }
+
+    /**
+     * @brief put a given tail after trimming string to the specified size
+     * @param the original string to trim
+     * @param cut_size: the size to be
+     * @param tail: tail to put in the end of the string after trimming
+     * @return string
+     **/
+    function cut_str($string,$cut_size=0,$tail = '...') {
+        if($cut_size<1 || !$string) return $string;
+
+        $chars = Array(12, 4, 3, 5, 7, 7, 11, 8, 4, 5, 5, 6, 6, 4, 6, 4, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 4, 4, 8, 6, 8, 6, 10, 8, 8, 9, 8, 8, 7, 9, 8, 3, 6, 7, 7, 11, 8, 9, 8, 9, 8, 8, 7, 8, 8, 10, 8, 8, 8, 6, 11, 6, 6, 6, 4, 7, 7, 7, 7, 7, 3, 7, 7, 3, 3, 6, 3, 9, 7, 7, 7, 7, 4, 7, 3, 7, 6, 10, 6, 6, 7, 6, 6, 6, 9);
+        $max_width = $cut_size*$chars[0]/2;
+        $char_width = 0;
+
+        $string_length = strlen($string);
+        $char_count = 0;
+
+        $idx = 0;
+        while($idx < $string_length && $char_count < $cut_size && $char_width <= $max_width) {
+            $c = ord(substr($string, $idx,1));
+            $char_count++;
+            if($c<128) {
+                $char_width += (int)$chars[$c-32];
+                $idx++;
+            }
+            else if (191<$c && $c < 224) {
+			          $char_width += $chars[4];
+			          $idx += 2;
+		        }
+            else {
+                $char_width += $chars[0];
+                $idx += 3;
+            }
+        }
+        $output = substr($string,0,$idx);
+        if(strlen($output)<$string_length) $output .= $tail;
+        return $output;
+    }
+
+    function zgap() {
+        $time_zone = $GLOBALS['_time_zone'];
+        if($time_zone < 0) $to = -1; else $to = 1;
+        $t_hour = substr($time_zone, 1, 2) * $to;
+        $t_min = substr($time_zone, 3, 2) * $to;
+
+        $server_time_zone = date("O");
+        if($server_time_zone < 0) $so = -1; else $so = 1;
+        $c_hour = substr($server_time_zone, 1, 2) * $so;
+        $c_min = substr($server_time_zone, 3, 2) * $so;
+
+        $g_min = $t_min - $c_min;
+        $g_hour = $t_hour - $c_hour;
+
+        $gap = $g_min*60 + $g_hour*60*60;
+        return $gap;
+    }
+
+    /**
+     * @brief YYYYMMDDHHIISS format changed to unix time value
+     * @param str: time value in format of YYYYMMDDHHIISS
+     * @return int
+     **/
+    function ztime($str) {
+        if(!$str) return;
+        $hour = (int)substr($str,8,2);
+        $min = (int)substr($str,10,2);
+        $sec = (int)substr($str,12,2);
+        $year = (int)substr($str,0,4);
+        $month = (int)substr($str,4,2);
+        $day = (int)substr($str,6,2);
+        if(strlen($str) <= 8) {
+            $gap = 0;
+        } else {
+            $gap = zgap();
+        }
+
+        return mktime($hour, $min, $sec, $month?$month:1, $day?$day:1, $year)+$gap;
+    }
+
+    /**
+     * @brief If the recent post within a day, output format of YmdHis is "min/hours ago from now". If not within a day, it return format string.
+     **/
+    function getTimeGap($date, $format = 'Y.m.d') {
+        $gap = time() + zgap() - ztime($date);
+
+        $lang_time_gap = Context::getLang('time_gap');
+        if($gap<60) $buff = sprintf($lang_time_gap['min'], (int)($gap / 60)+1);
+        elseif($gap<60*60) $buff =  sprintf($lang_time_gap['mins'], (int)($gap / 60)+1);
+        elseif($gap<60*60*2) $buff =  sprintf($lang_time_gap['hour'], (int)($gap / 60 /60)+1);
+        elseif($gap<60*60*24) $buff =  sprintf($lang_time_gap['hours'], (int)($gap / 60 /60)+1);
+        else $buff =  zdate($date, $format);
+        return $buff;
+    }
+
+    /**
+     * @brief Name of the month return
+     **/
+    function getMonthName($month, $short = true) {
+        $short_month = array('','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+        $long_month = array('','January','February','March','April','May','June','July','August','September','October','November','December');
+        return !$short?$long_month[$month]:$short_month[$month];
+    }
+
+    /**
+     * @brief change the time format YYYYMMDDHHIISS to the user defined format
+     * @param string|int str is YYYYMMDDHHIISS format time values
+     * @param string format is time format of php date() function
+     * @param bool conversion means whether to convert automatically according to the language
+     * @return string
+     **/
+    function zdate($str, $format = 'Y-m-d H:i:s', $conversion=true) {
+        // return null if no target time is specified
+        if(!$str) return;
+        // convert the date format according to the language
+        if($conversion == true) {
+            switch(Context::getLangType()) {
+                case 'en' :
+                case 'es' :
+                        if($format == 'Y-m-d') $format = 'M d, Y';
+                        elseif($format == 'Y-m-d H:i:s') $format = 'M d, Y H:i:s';
+                        elseif($format == 'Y-m-d H:i') $format = 'M d, Y H:i';
+                    break;
+                case 'vi' :
+                        if($format == 'Y-m-d') $format = 'd-m-Y';
+                        elseif($format == 'Y-m-d H:i:s') $format = 'H:i:s d-m-Y';
+                        elseif($format == 'Y-m-d H:i') $format = 'H:i d-m-Y';
+                    break;
+
+            }
+        }
+
+        // If year value is less than 1970, handle it separately.
+        if((int)substr($str,0,4) < 1970) {
+            $hour  = (int)substr($str,8,2);
+            $min   = (int)substr($str,10,2);
+            $sec   = (int)substr($str,12,2);
+            $year  = (int)substr($str,0,4);
+            $month = (int)substr($str,4,2);
+            $day   = (int)substr($str,6,2);
+
+			// leading zero?
+			$lz = create_function('$n', 'return ($n>9?"":"0").$n;');
+
+			$trans = array(
+				'Y'=>$year,
+				'y'=>$lz($year%100),
+				'm'=>$lz($month),
+				'n'=>$month,
+				'd'=>$lz($day),
+				'j'=>$day,
+				'G'=>$hour,
+				'H'=>$lz($hour),
+				'g'=>$hour%12,
+				'h'=>$lz($hour%12),
+				'i'=>$lz($min),
+				's'=>$lz($sec),
+				'M'=>getMonthName($month),
+				'F'=>getMonthName($month,false)
+			);
+
+            $string = strtr($format, $trans);
+        } else {
+            // if year value is greater than 1970, get unixtime by using ztime() for date() function's argument. 
+            $string = date($format, ztime($str));
+        }
+        // change day and am/pm for each language
+        $unit_week = Context::getLang('unit_week');
+        $unit_meridiem = Context::getLang('unit_meridiem');
+        $string = str_replace(array('Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sunday'),$unit_week, $string);
+        $string = str_replace(array('am','pm','AM','PM'), $unit_meridiem, $string);
+        return $string;
+    }
+
+	function getEncodeEmailAddress($email) {
+	    $return = '';
+		for ($i=0,$c=strlen($email);$i<$c;$i++) {
+			$return .= '&#' . (rand(0,1)==0 ? ord($email[$i]) : 'X'.dechex(ord($email[$i]))) . ';';
+		}
+		return $return;
+	}
+
+    /**
+     * @brief prints debug messages 
+     * @param debug_output target object to be printed
+     * @param display_line boolean flag whether to print seperator (default:true)
+     * @return none
+     *
+     * Display $buff contents into the file ./files/_debug_message.php.
+     * You can see the file on your prompt by command: tail-f./files/_debug_message.php
+     **/
+    function debugPrint($debug_output = null, $display_option = true, $file = '_debug_message.php') {
+        if(!(__DEBUG__ & 1)) return;
+
+        static $firephp;
+        $bt = debug_backtrace();
+        if(is_array($bt)) $first = array_shift($bt);
+        $file_name = array_pop(explode(DIRECTORY_SEPARATOR, $first['file']));
+        $line_num = $first['line'];
+
+        if(__DEBUG_OUTPUT__ == 2 && version_compare(PHP_VERSION, '6.0.0') === -1) {
+            if(!isset($firephp)) $firephp = FirePHP::getInstance(true);
+            if(function_exists("memory_get_usage"))
+            {
+                $label = sprintf('[%s:%d] (m:%s)', $file_name, $line_num, FileHandler::filesize(memory_get_usage()));
+            }
+            else
+            {
+                $label = sprintf('[%s:%d] ', $file_name, $line_num);
+            }
+            // Check a FirePHP option
+            if($display_option === 'TABLE') $label = $display_option;
+            // Check if the IP specified by __DEBUG_PROTECT__ option is same as the access IP.
+            if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+                $debug_output = 'The IP address is not allowed. Change the value of __DEBUG_PROTECT_IP__ into your IP address in config/config.user.inc.php or config/config.inc.php';
+                $label = null;
+            }
+
+            $firephp->fb($debug_output, $label);
+
+        } else {
+            if(__DEBUG_PROTECT__ === 1 && __DEBUG_PROTECT_IP__ != $_SERVER['REMOTE_ADDR']) {
+                return;
+            }
+            $debug_file = _XE_PATH_.'files/'.$file;
+            if(function_exists("memory_get_usage"))
+            {
+                $debug_output = sprintf("[%s %s:%d] - mem(%s)\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, FileHandler::filesize(memory_get_usage()), print_r($debug_output, true));
+            }
+            else
+            {
+                $debug_output = sprintf("[%s %s:%d]\n%s\n", date('Y-m-d H:i:s'), $file_name, $line_num, print_r($debug_output, true));
+            }
+
+            if($display_option === true) $debug_output = str_repeat('=', 40)."\n".$debug_output.str_repeat('-', 40);
+            $debug_output = "\n<?php\n/*".$debug_output."*/\n?>\n";
+
+            if(@!$fp = fopen($debug_file, 'a')) return;
+            fwrite($fp, $debug_output);
+            fclose($fp);
+        }
+    }
+
+
+    /**
+     * @brief microtime() return
+     * @return float
+     **/
+    function getMicroTime() {
+        list($time1, $time2) = explode(' ', microtime());
+        return (float)$time1 + (float)$time2;
+    }
+
+    /**
+     * @brief Delete the second object vars from the first argument
+     * @param target_obj is an original object
+     * @param del_obj is object vars to delete from the original object
+     * @return object
+     **/
+    function delObjectVars($target_obj, $del_obj) {
+        if(!is_object($target_obj)) return;
+        if(!is_object($del_obj)) return;
+
+        $target_vars = get_object_vars($target_obj);
+        $del_vars = get_object_vars($del_obj);
+
+        $target = array_keys($target_vars);
+        $del = array_keys($del_vars);
+        if(!count($target)||!count($del)) return $target_obj;
+
+        $return_obj = NULL;
+
+        $target_count = count($target);
+        for($i = 0; $i < $target_count; $i++) {
+            $target_key = $target[$i];
+            if(!in_array($target_key, $del)) $return_obj->{$target_key} = $target_obj->{$target_key};
+        }
+
+        return $return_obj;
+    }
+
+    /**
+     * @brief change error_handing to debugPrint on php5 higher 
+     * @param errno
+     * @param errstr
+     * @return file
+     * @return line
+     **/
+    function handleError($errno, $errstr, $file, $line) {
+        if(!__DEBUG__) return;
+        $errors = array(E_USER_ERROR, E_ERROR, E_PARSE);
+        if(!in_array($errno, $errors)) return;
+
+        $output = sprintf("Fatal error : %s - %d", $file, $line);
+        $output .= sprintf("%d - %s", $errno, $errstr);
+
+        debugPrint($output);
+    }
+
+    /**
+     * @brief Trim a given number to a fiven size recursively
+     * @param no : a given number
+     * @param size : a given digits
+     **/
+    function getNumberingPath($no, $size=3) {
+        $mod = pow(10, $size);
+        $output = sprintf('%0'.$size.'d/', $no%$mod);
+        if($no >= $mod) $output .= getNumberingPath((int)$no/$mod, $size);
+        return $output;
+    }
+
+    /**
+     * @brief decode the URL in Korean
+     **/
+    function url_decode($str) {
+        return preg_replace('/%u([[:alnum:]]{4})/', '&#x\\1;',$str);
+    }
+
+    /**
+     * @brief Pre-block the codes which may be hacking attempts
+     **/
+    function removeHackTag($content) {
+        // change the specific tags to the common texts
+        $content = preg_replace('@<(\/?(?:html|body|head|title|meta|base|link|script|style|applet|iframe)[\s>])@i', '&lt;$1', $content);
+
+        /**
+         * Remove codes to abuse the admin session in src by tags of imaages and video postings
+         * - Issue reported by Sangwon Kim
+         **/
+		$content = preg_replace_callback('@<(/?)([a-z]+[0-9]?)((?>"[^"]*"|\'[^\']*\'|[^>])*?\b(?:on[a-z]+|data|style|background|href|(?:dyn|low)?src)\s*=[\s\S]*?)(/?)>@i', 'removeSrcHack', $content);
+
+		// xmp tag 확인 및 추가
+		$content = checkXmpTag($content);
+
+        return $content;
+    }
+
+    /**
+     * @brief xmp tag 확인 및 닫히지 않은 경우 추가
+     **/
+	function checkXmpTag($content) {
+		$content = preg_replace('@<(/?)xmp.*?>@i', '<\1xmp>', $content);
+
+		if(($start_xmp = strrpos($content, '<xmp>')) !==false) {
+			if(($close_xmp = strrpos($content, '</xmp>')) === false) $content .= '</xmp>';
+			else if($close_xmp < $start_xmp) $content .= '</xmp>';
+		}
+		
+		return $content;
+	}
+
+    function removeSrcHack($match) {
+        $tag = strtolower($match[2]);
+
+		// xmp tag 정리
+		if($tag=='xmp') return "<{$match[1]}xmp>";
+ 		if($match[1]) return $match[0];
+		if($match[4]) $match[4] = ' '.$match[4];
+
+		$attrs = array();
+		if(preg_match_all('/([\w:-]+)\s*=(?:\s*(["\']))?(?(2)(.*?)\2|([^ ]+))/s', $match[3], $m)) {
+			foreach($m[1] as $idx=>$name){
+				if(substr($name,0,2) == 'on') continue;
+
+				$val = preg_replace('/&#(?:x([a-fA-F0-9]+)|0*(\d+));/e','chr("\\1"?0x00\\1:\\2+0)',$m[3][$idx].$m[4][$idx]);
+				$val = preg_replace('/^\s+|[\t\n\r]+/', '', $val);
+
+				if(preg_match('/^[a-z]+script:/i', $val)) continue;
+
+				$attrs[$name] = $val;
+			}
+		}
+
+		if(isset($attrs['style']) && preg_match('@(?:/\*|\*/|\n|:\s*expression\s*\()@i', $attrs['style'])) {
+			unset($attrs['style']);
+		}
+
+		$attr = array();
+		foreach($attrs as $name=>$val) {
+			$val    = str_replace('"', '&quot;', $val);
+			$attr[] = $name."=\"{$val}\"";
+		}
+		$attr = count($attr)?' '.implode(' ',$attr):'';
+
+        return "<{$match[1]}{$tag}{$attr}{$match[4]}>";
+    }
+
+    // convert hexa value to RGB
+    if(!function_exists('hexrgb')) {
+        function hexrgb($hexstr) {
+          $int = hexdec($hexstr);
+
+          return array('red' => 0xFF & ($int >> 0x10),
+                       'green' => 0xFF & ($int >> 0x8),
+                       'blue' => 0xFF & $int);
+        }
+    }
+
+    /**
+     * @brief php function for mysql old_password()
+     * provides backward compatibility for zero board4 which uses old_password() of mysql 4.1 earlier versions. 
+     * the function implemented by referring to the source codes of password.c file in mysql
+     **/
+    function mysql_pre4_hash_password($password) {
+        $nr = 1345345333;
+        $add = 7;
+        $nr2 = 0x12345671;
+
+        settype($password, "string");
+
+        for ($i=0; $i<strlen($password); $i++) {
+            if ($password[$i] == ' ' || $password[$i] == '\t') continue;
+            $tmp = ord($password[$i]);
+            $nr ^= ((($nr & 63) + $add) * $tmp) + ($nr << 8);
+            $nr2 += ($nr2 << 8) ^ $nr;
+            $add += $tmp;
+        }
+        $result1 = sprintf("%08lx", $nr & ((1 << 31) -1));
+        $result2 = sprintf("%08lx", $nr2 & ((1 << 31) -1));
+
+        if($result1 == '80000000') $nr += 0x80000000;
+        if($result2 == '80000000') $nr2 += 0x80000000;
+
+        return sprintf("%08lx%08lx", $nr, $nr2);
+    }
+
+    /**
+     * return the requested script path
+     **/
+    function getScriptPath() {
+        static $url = null;
+        if($url == null) $url = preg_replace('/\/tools\//i','/',preg_replace('/index.php$/i','',str_replace('\\','/',$_SERVER['SCRIPT_NAME'])));
+        return $url;
+    }
+
+    /**
+     * return the requested script path
+     **/
+	function getRequestUriByServerEnviroment()
+	{
+		return $_SERVER['REQUEST_URI'];
+	}
+
+    /**
+     * php unescape function of javascript's escape
+     * Function converts an Javascript escaped string back into a string with specified charset (default is UTF-8).
+     * Modified function from http://pure-essence.net/stuff/code/utf8RawUrlDecode.phps
+     **/
+    function utf8RawUrlDecode ($source) {
+        $decodedStr = '';
+        $pos = 0;
+        $len = strlen ($source);
+        while ($pos < $len) {
+            $charAt = substr ($source, $pos, 1);
+            if ($charAt == '%') {
+                $pos++;
+                $charAt = substr ($source, $pos, 1);
+                if ($charAt == 'u') {
+                    // we got a unicode character
+                    $pos++;
+                    $unicodeHexVal = substr ($source, $pos, 4);
+                    $unicode = hexdec ($unicodeHexVal);
+                    $decodedStr .= _code2utf($unicode);
+                    $pos += 4;
+                }
+                else {
+                    // we have an escaped ascii character
+                    $hexVal = substr ($source, $pos, 2);
+                    $decodedStr .= chr (hexdec ($hexVal));
+                    $pos += 2;
+                }
+            } else {
+                $decodedStr .= $charAt;
+                $pos++;
+            }
+        }
+        return $decodedStr;
+    }
+
+    function _code2utf($num){
+        if($num<128)return chr($num);
+        if($num<2048)return chr(($num>>6)+192).chr(($num&63)+128);
+        if($num<65536)return chr(($num>>12)+224).chr((($num>>6)&63)+128).chr(($num&63)+128);
+        if($num<2097152)return chr(($num>>18)+240).chr((($num>>12)&63)+128).chr((($num>>6)&63)+128) .chr(($num&63)+128);
+        return '';
+    }
+
+
+    function detectUTF8($string, $return_convert = false, $urldecode = true) {
+        if($urldecode) $string = urldecode($string);
+
+        $sample = iconv('utf-8', 'utf-8', $string);
+        $is_utf8 = (md5($sample) == md5($string));
+
+        if(!$urldecode) $string = urldecode($string);
+
+        if($return_convert) return ($is_utf8) ? $string : iconv('euc-kr', 'utf-8', $string);
+
+        return $is_utf8;
+    }
+
+
+    function json_encode2($data) {
+        switch (gettype($data)) {
+            case 'boolean':
+              return $data?'true':'false';
+            case 'integer':
+            case 'double':
+              return $data;
+            case 'string':
+              return '"'.strtr($data, array('\\'=>'\\\\','"'=>'\\"')).'"';
+            case 'object':
+              $data = get_object_vars($data);
+            case 'array':
+              $rel = false; // relative array?
+              $key = array_keys($data);
+              foreach ($key as $v) {
+                if (!is_int($v)) {
+                  $rel = true;
+                  break;
+                }
+              }
+
+              $arr = array();
+              foreach ($data as $k=>$v) {
+                $arr[] = ($rel?'"'.strtr($k, array('\\'=>'\\\\','"'=>'\\"')).'":':'').json_encode2($v);
+              }
+
+              return $rel?'{'.join(',', $arr).'}':'['.join(',', $arr).']';
+            default:
+              return '""';
+        }
+    }
+
+
+    function isCrawler($agent = null) {
+        if(!$agent) $agent = $_SERVER['HTTP_USER_AGENT'];
+        $check_agent = array('bot', 'spider', 'google', 'yahoo', 'daum', 'teoma', 'fish', 'hanrss', 'facebook');
+        $check_ip = array(
+            '211.245.21.11*' /* mixsh */
+        );
+
+        foreach($check_agent as $str) {
+            if(stristr($agent, $str) != FALSE) return true;
+        }
+
+        $check_ip = '/^('.implode($check_ip, '|').')/';
+        $check_ip = str_replace('.', '\.', $check_ip);
+        $check_ip = str_replace('*', '.+', $check_ip);
+        $check_ip = str_replace('?', '.?', $check_ip);
+
+        if(preg_match($check_ip, $_SERVER['REMOTE_ADDR'], $matches)) return true;
+
+        return false;
+    }
+
+	function stripEmbedTagForAdmin(&$content, $writer_member_srl)
+	{
+		if(!Context::get('is_logged')) return;
+		$oModuleModel = &getModel('module');
+		$logged_info = Context::get('logged_info');
+
+		if($writer_member_srl != $logged_info->member_srl && ($logged_info->is_admin == "Y" || $oModuleModel->isSiteAdmin($logged_info)) )
+		{   
+			if($writer_member_srl)
+			{
+				$oMemberModel =& getModel('member');
+				$member_info = $oMemberModel->getMemberInfoByMemberSrl($writer_member_srl);
+				if($member_info->is_admin == "Y")
+				{
+					return;
+				}
+			}
+			$security_msg = "<div style='border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;'><p style='margin: 1em;'>".Context::getLang('security_warning_embed')."</p></div>";
+			$content = preg_replace('/<object[^>]+>(.*?<\/object>)?/is', $security_msg, $content);
+			$content = preg_replace('/<embed[^>]+>(\s*<\/embed>)?/is', $security_msg, $content);
+			$content = preg_replace('/<img[^>]+editor_component="multimedia_link"[^>]*>(\s*<\/img>)?/is', $security_msg, $content);
+		}
+
+		return;
+	}
+
+	function requirePear()
+	{
+		if(version_compare(PHP_VERSION, "5.3.0") < 0)
+		{
+			set_include_path(_XE_PATH_."libs/PEAR");	
+		}
+		else
+		{
+			set_include_path(_XE_PATH_."libs/PEAR.1.9");	
+
+		}
+	}
+
+	function htmlHeader()
+	{
+		echo <<<HTMLHEADER
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html lang="ko" xml:lang="ko" xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+</head>
+<body>
+HTMLHEADER;
+	}
+
+	function htmlFooter()
+	{
+		echo '</body></html>';
+	}
+
+	function alertScript($msg)
+	{
+		if(!$msg) return;
+		echo '<script  type="text/javascript">alert("'.$msg.'");</script>';
+	}
+
+	function closePopupScript()
+	{
+		echo '<script  type="text/javascript">window.close();</script>';
+	}
+
+	function reload($isOpener = false)
+	{
+		$reloadScript = $isOpener ? 'window.opener.location.reload()' : 'document.location.reload()';
+
+		echo '<script  type="text/javascript">'.$reloadScript.'</script>';
+	}
+?>
diff --git a/config/package.inc.php b/config/package.inc.php
new file mode 100644
index 000000000..918b652cd
--- /dev/null
+++ b/config/package.inc.php
@@ -0,0 +1,5 @@
+<?php
+define('_XE_PACKAGE_','XE');
+define('_XE_LOCATION_','ko');
+define('_XE_LOCATION_SITE_','http://www.xpressengine.com/');
+define('_XE_DOWNLOAD_SERVER_','http://download.xpressengine.com/');
diff --git a/index.php b/index.php
index 5d00d1694..2a25abc6f 100644
--- a/index.php
+++ b/index.php
@@ -1,61 +1,62 @@
-<?php 
-    /**
-     * @file  index.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief 시작 페이지
-     *
-     * Request Argument에서 mid, act로 module 객체를 찾아서 생성하고 \n
-     * 모듈 정보를 세팅함
-     *
-     * @mainpage XpressEngine 
-     * @section intro 소개
-     * XE 는 오픈 프로젝트로 개발되는 오픈 소스입니다.\n
-     * 자세한 내용은 아래 링크를 참조하세요.
-     * - 공식홈페이지        : http://www.xpressengine.com
-     * - SVN Repository      : http://svn.xpressengine.net/xe
-     * \n
-     * "XpressEngine (XE)" is free software; you can redistribute it and/or \n
-     * modify it under the terms of the GNU Lesser General Public \n
-     * License as published by the Free Software Foundation; either \n
-     * version 2.1 of the License, or (at your option) any later version. \n
-     * \n
-     * 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
-     * Lesser General Public License for more details.
-     * \n
-     * 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
-     *
-     **/
-
-    /**
-     * @brief 기본적인 상수 선언,  웹에서 직접 호출되는 것을 막기 위해 체크하는 상수 선언
-     **/
-    define('__ZBXE__', true);
-
-    /**
-     * @brief 필요한 설정 파일들을 include 
-     **/
-    require('./config/config.inc.php');
-
-    /**
-     * @brief Context 객체를 생성하여 초기화
-     * 모든 Request Argument/ 환경변수등을 세팅
-     **/
-    $oContext = &Context::getInstance();
-    $oContext->init();
-
-    /**
-     * @brief default_url 이 설정되어 있고 현재 url이 default_url과 다르면 SSO인증을 위한 rediret 시도 후 모듈 동작
-     **/
-    if($oContext->checkSSO()) {
-        $oModuleHandler = new ModuleHandler();
-        if($oModuleHandler->init()) {
-            $oModule = &$oModuleHandler->procModule();
-            $oModuleHandler->displayContent($oModule);
-        }
-    }
-    $oContext->close();
-?>
+<?php
+    /**
+     * @file  index.php
+     * @author NHN (developers@xpressengine.com)
+     * @brief Start page
+     *
+     * Find and create module object by mif, act in Request Argument \n
+     * Set module information
+     *
+     * @mainpage XpressEngine
+     * @section intro introduction
+     * XE is an opensource and being developed in the opensource project. \N
+     * For more information, please see the link below.
+     * - Official website: http://www.xpressengine.com
+     * - SVN Repository      : http://svn.xpressengine.net/xe
+     * \n
+     * "XpressEngine (XE)" is free software; you can redistribute it and/or \n
+     * modify it under the terms of the GNU Lesser General Public \n
+     * License as published by the Free Software Foundation; either \n
+     * version 2.1 of the License, or (at your option) any later version. \n
+     * \n
+     * 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
+     * Lesser General Public License for more details.
+     * \n
+     * 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
+     *
+     **/
+
+    /**
+     * @brief Declare constants for generic use and for checking to avoid a direct call from the Web
+     **/
+	define('__XE__',   true);
+    define('__ZBXE__', true); // deprecated : __ZBXE__ will be removed. Use __XE__ instead.
+
+    /**
+     * @brief Include the necessary configuration files
+     **/
+    require('./config/config.inc.php');
+
+    /**
+     * @brief Initialize by creating Context object
+     * Set all Request Argument/Environment variables
+     **/
+    $oContext = &Context::getInstance();
+    $oContext->init();
+
+    /**
+     * @brief If default_url is set and it is different from the current url, attempt to redirect for SSO authentication and then process the module
+     **/
+    if($oContext->checkSSO()) {
+        $oModuleHandler = new ModuleHandler();
+        if($oModuleHandler->init()) {
+            $oModule = &$oModuleHandler->procModule();
+            $oModuleHandler->displayContent($oModule);
+        }
+    }
+    $oContext->close();
+?>
diff --git a/layouts/user_layout/conf/info.xml b/layouts/user_layout/conf/info.xml
new file mode 100644
index 000000000..e169ac982
--- /dev/null
+++ b/layouts/user_layout/conf/info.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">테스트 레이아웃</title>
+    <title xml:lang="en">Test Layout</title>
+    <title xml:lang="jp">テストのレイアウト</title>
+    <description xml:lang="ko">디자인이 없는 테스트 레이아웃입니다. 새 스킨을 만들 때 이 레이아웃 사본을 사용하면 좋습니다.</description>
+    <description xml:lang="en">Is not designed for testing the layout. When you create a new skin, we recommend you copy the layout.</description>
+    <description xml:lang="jp">デザインがないテストレイアウトです。新しいスキンを作成するときに、レイアウトのコピーを使用してください。</description>
+    <version>1.0</version>
+    <date>2010-12-24</date>
+    <author email_address="user@user.com" link="http://user-define.com/">
+        <name xml:lang="ko">제작자 이름</name>
+        <name xml:lang="en">Maker Name</name>
+        <name xml:lang="jp">製作者名</name>
+    </author>
+    <menus>
+        <menu name="global_menu" maxdepth="2" default="true">
+            <title xml:lang="ko">전역 메뉴</title>
+            <title xml:lang="en">Global Menu</title>
+            <title xml:lang="jp">グローバルメニュー</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/layouts/user_layout/layout.html b/layouts/user_layout/layout.html
new file mode 100644
index 000000000..0a2f46f6f
--- /dev/null
+++ b/layouts/user_layout/layout.html
@@ -0,0 +1,47 @@
+<load target="user_layout.css" />
+<div class="user_layout">
+	<div class="header">
+		<h1>Site Logo</h1>
+		<form action="{getUrl()}" method="get" class="search">
+			<input type="hidden" name="vid" value="{$vid}" />
+			<input type="hidden" name="mid" value="{$mid}" />
+			<input type="hidden" name="act" value="IS" />
+			<input type="text" name="is_keyword" value="{$is_keyword}" title="{$lang->cmd_search}" />
+			<input type="submit" value="{$lang->cmd_search}" />
+		</form>
+		<hr />
+		<div class="gnb">
+			.gnb
+			<ul>
+				<li loop="$global_menu->list=>$key1,$val1" class="active"|cond="$val1['selected']"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a>
+					<ul cond="$val1['list']">
+						<li loop="$val1['list']=>$key2,$val2" class="active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a></li>
+					</ul>
+				</li>
+			</ul>
+		</div>
+	</div>
+	<hr />
+	<div class="body">
+		<div class="lnb">
+			<div class="account">
+				<img widget="login_info" skin="xe_official" />
+			</div>
+			<hr />
+			.lnb
+			<h2 loop="$global_menu->list=>$key1,$val1" cond="$val1['selected']"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a></h2>
+			<ul loop="$global_menu->list=>$key1,$val1" cond="$val1['selected'] && $val1['list']">
+				<li loop="$val1['list']=>$key2,$val2" class="active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a>
+					<ul cond="$val2['list']">
+						<li loop="$val2['list']=>$key3,$val3" class="active"|cond="$val3['selected']"><a href="{$val3['href']}" target="_blank"|cond="$val3['open_window']=='Y'">{$val3['link']}</a>
+						</li>
+					</ul>
+				</li>
+			</ul>
+		</div>
+		<hr />
+		<div class="content">.content{$content}</div>
+	</div>
+	<hr />
+	<div class="footer">.footer</div>
+</div>
diff --git a/layouts/user_layout/thumbnail.png b/layouts/user_layout/thumbnail.png
new file mode 100644
index 000000000..9fb0485f0
Binary files /dev/null and b/layouts/user_layout/thumbnail.png differ
diff --git a/layouts/user_layout/user_layout.css b/layouts/user_layout/user_layout.css
new file mode 100644
index 000000000..d384338f0
--- /dev/null
+++ b/layouts/user_layout/user_layout.css
@@ -0,0 +1,15 @@
+@charset "utf-8";
+/* Layout */
+hr{display:none}
+form, fieldset{border:0;margin:0;padding:0}
+.user_layout{width:960px;margin:0 auto}
+.header{zoom:1;background:#ddd}
+.header:after{content:"";display:block;clear:both}
+.header .search{float:right}
+.gnb{float:left}
+.body{margin:20px 0;zoom:1;background:#eee}
+.body:after{content:"";display:block;clear:both}
+.lnb{float:left;width:200px;background:#ddd}
+.account{}
+.content{float:right;width:740px;background:#ddd}
+.footer{background:#ddd}
\ No newline at end of file
diff --git a/layouts/user_layout/user_layout.js b/layouts/user_layout/user_layout.js
new file mode 100644
index 000000000..19a0de06c
--- /dev/null
+++ b/layouts/user_layout/user_layout.js
@@ -0,0 +1,5 @@
+// <![CDATA[
+jQuery(function($){
+	//
+});
+// ]]>
diff --git a/layouts/xe_official/conf/info.xml b/layouts/xe_official/conf/info.xml
index c826599ee..55e14a402 100644
--- a/layouts/xe_official/conf/info.xml
+++ b/layouts/xe_official/conf/info.xml
@@ -1,57 +1,57 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <layout version="0.2">
-    <title xml:lang="ko">XE Official</title>
-    <title xml:lang="jp">XE Official</title>
-    <title xml:lang="en">XE Official</title>
-    <title xml:lang="ge">XE Official</title>
-    <title xml:lang="ru">XE Official</title>
-    <title xml:lang="es">XE Official</title>
-    <title xml:lang="zh-CN">XE Official</title>
-    <title xml:lang="zh-TW">XE Official</title>
-    <title xml:lang="vi">XE Official</title>
-    <title xml:lang="tr">XE Official</title>
+    <title xml:lang="ko">XE 공식 사이트 레이아웃</title>
+    <title xml:lang="jp">XE公式サイトレイアウト</title>
+    <title xml:lang="en">XE Official website layout</title>
+    <title xml:lang="ge">XE Offizielle Website-Layout</title>
+    <title xml:lang="ru">XE Официальный сайт макет</title>
+    <title xml:lang="es">Diseño oficial de la página web de XE</title>
+    <title xml:lang="zh-CN">XE 官方网站布局</title>
+    <title xml:lang="zh-TW">XE 官方網站版面</title>
+    <title xml:lang="vi">Giao diện chính thức của XE</title>
+    <title xml:lang="tr">XE Resmi Websitesi Yerleşim Düzeni</title>
     <description xml:lang="ko">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        XE 공식 사이트 레이아웃입니다.
         제작 : NHN
     </description>
     <description xml:lang="jp">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        XEの公式サイトのレイアウトです。
         제작 : NHN
     </description>
     <description xml:lang="en">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        This layout is the Official website layout for XE.
         제작 : NHN
     </description>
     <description xml:lang="ge">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        Dieses Layout ist das XE Offizielle Website-Layout.
         제작 : NHN
     </description>
     <description xml:lang="ru">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        Этот формат является XE Официальный сайт компоновку.
         제작 : NHN
     </description>
     <description xml:lang="es">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        Este diseño is el diseño oficial de la página web de Zerobard XE.
         제작 : NHN
     </description>
     <description xml:lang="zh-CN">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        XE官方网站布局。
         제작 : NHN
     </description>
     <description xml:lang="zh-TW">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        XE官方網站版面。
         제작 : NHN
     </description>
 	<description xml:lang="vi">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        Đây là giao diện chính thức của XE.
         제작 : NHN
     </description>
 	<description xml:lang="tr">
-        2007년 XE 공식 사이트 레이아웃. 2011년 코드 리펙토링.
+        Bu yerleşim düzeni, XE'nin resmi website yerleşim düzenidir.
         제작 : NHN
     </description>    
-    <version>1.0</version>
-    <date>2011-03-29</date>
+    <version>0.1</version>
+    <date>2007-08-01</date>
     <link>http://xpressengine.com/</link>
 
     <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
@@ -83,7 +83,7 @@
             <description xml:lang="jp">希望するカラーセットを選択して下さい。</description>
             <description xml:lang="zh-CN">请选择颜色。</description>
             <description xml:lang="zh-TW">請選擇顏色。</description>
-            <description xml:lang="en">Please select a colorset you want.</description>
+            <description xml:lang="en">Please select the colorset you want.</description>
             <description xml:lang="ge">Bitte wählen Sie ein colorset Sie wollen.</description>
             <description xml:lang="ru">Выберите colorset хотите.</description>
             <description xml:lang="es">Seleccione set de colores que desea.</description>
@@ -98,8 +98,8 @@
                 <title xml:lang="es">Básico</title>
                 <title xml:lang="zh-CN">默认</title>
                 <title xml:lang="zh-TW">預設</title>
-				<title xml:lang="vi">Cơ bản</title>
-				<title xml:lang="tr">Temel</title>
+		<title xml:lang="vi">Cơ bản</title>
+        <title xml:lang="tr">Temel</title>
             </options>
             <options value="black">
                 <title xml:lang="ko">검은색</title>
@@ -127,7 +127,7 @@
             </options>
         </var>
         <var name="logo_image" type="image">
-            <title xml:lang="ko">로고 이미지</title>
+            <title xml:lang="ko">로고이미지</title>
             <title xml:lang="jp">ロゴイメージ</title>
             <title xml:lang="zh-CN">LOGO图片</title>
             <title xml:lang="zh-TW">Logo圖片</title>
@@ -137,39 +137,17 @@
             <title xml:lang="es">Imagen del logotipo</title>
 	    	<title xml:lang="vi">Hình Logo</title>
             <title xml:lang="tr">Logo resmi</title>
-            <description xml:lang="ko">레이아웃의 상단에 표시될 로고 이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
             <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージをお勧めします。。)</description>
             <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。</description>
             <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為23px的透明圖片。)</description>
-            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of the layout. (Transparent image with height of 23px is recommended.)</description>
             <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
             <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
             <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
 	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 23px.)</description>
             <description xml:lang="tr">Lütfen yerleşim düzeninin üst kısmında görüntülenecek bir resim girişi yapınız. (23px uzunluğunda net bir resim seçmeniz önerilir)</description>
         </var>
-        <var name="logo_image_alt" type="text">
-            <title xml:lang="ko">로고 이미지 alt</title>
-            <title xml:lang="jp">ロゴイメージ alt</title>
-            <title xml:lang="zh-CN">LOGO图片 alt</title>
-            <title xml:lang="zh-TW">Logo圖片 alt</title>
-            <title xml:lang="en">Logo image alt</title>
-            <title xml:lang="ge">Logobildes alt</title>
-            <title xml:lang="ru">Изображения логотипа alt</title>
-            <title xml:lang="es">Imagen del logotipo alt</title>
-	    	<title xml:lang="vi">Hình Logo alt</title>
-            <title xml:lang="tr">Logo resmi alt</title>
-			<description xml:lang="ko">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="jp">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="zh-CN">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="zh-TW">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="en">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="ge">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="ru">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="es">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="vi">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-			<description xml:lang="tr">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
-        </var>
         <var name="index_url" type="text">
             <title xml:lang="ko">홈 페이지 URL</title>
             <title xml:lang="jp">ホームページURL</title>
@@ -185,7 +163,7 @@
             <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
             <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
             <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
-            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo.</description>
             <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
             <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
             <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
@@ -207,7 +185,7 @@
             <description xml:lang="jp">背景イメージを使う場合は、登録して下さい。</description>
             <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
             <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
-            <description xml:lang="en">Please input if you want to use background image.</description>
+            <description xml:lang="en">Please input if you want to use the background image.</description>
             <description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
             <description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
             <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
@@ -217,7 +195,7 @@
     </extra_vars>
 
     <menus>
-        <menu name="main_menu" maxdepth="2" default="true">
+        <menu name="main_menu" maxdepth="3" default="true">
             <title xml:lang="ko">상단 메뉴</title>
             <title xml:lang="jp">上段用メニュー</title>
             <title xml:lang="zh-CN">主菜单</title>
diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html
index ee310e92c..6c802c9bc 100644
--- a/layouts/xe_official/layout.html
+++ b/layouts/xe_official/layout.html
@@ -1,5 +1,5 @@
 <load target="js/xe_official.js" />
-<load target="css/default.css" cond="$layout_info->colorset=='default'" />
+<load target="css/default.css" cond="$layout_info->colorset=='default' || !$layout_info->colorset" />
 <load target="css/white.css" cond="$layout_info->colorset=='white'" />
 <load target="css/black.css" cond="$layout_info->colorset=='black'" />
 <style type="text/css" cond="$layout_info->background_image">
diff --git a/layouts/xe_official/thumbnail.png b/layouts/xe_official/thumbnail.png
new file mode 100644
index 000000000..c2fbad20b
Binary files /dev/null and b/layouts/xe_official/thumbnail.png differ
diff --git a/libs/PEAR.1.9/HTTP/Request2.php b/libs/PEAR.1.9/HTTP/Request2.php
index 980d2c343..1347d6ece 100644
--- a/libs/PEAR.1.9/HTTP/Request2.php
+++ b/libs/PEAR.1.9/HTTP/Request2.php
@@ -1,861 +1,861 @@
-<?php
-/**
- * Class representing a HTTP request message
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Request2.php 298246 2010-04-21 10:41:16Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * A class representing an URL as per RFC 3986.
- */
-require_once 'Net/URL2.php';
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * Class representing a HTTP request message
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.5.2
- * @link       http://tools.ietf.org/html/rfc2616#section-5
- */
-class HTTP_Request2 implements SplSubject
-{
-   /**#@+
-    * Constants for HTTP request methods
-    *
-    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
-    */
-    const METHOD_OPTIONS = 'OPTIONS';
-    const METHOD_GET     = 'GET';
-    const METHOD_HEAD    = 'HEAD';
-    const METHOD_POST    = 'POST';
-    const METHOD_PUT     = 'PUT';
-    const METHOD_DELETE  = 'DELETE';
-    const METHOD_TRACE   = 'TRACE';
-    const METHOD_CONNECT = 'CONNECT';
-   /**#@-*/
-
-   /**#@+
-    * Constants for HTTP authentication schemes
-    *
-    * @link http://tools.ietf.org/html/rfc2617
-    */
-    const AUTH_BASIC  = 'basic';
-    const AUTH_DIGEST = 'digest';
-   /**#@-*/
-
-   /**
-    * Regular expression used to check for invalid symbols in RFC 2616 tokens
-    * @link http://pear.php.net/bugs/bug.php?id=15630
-    */
-    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';
-
-   /**
-    * Regular expression used to check for invalid symbols in cookie strings
-    * @link http://pear.php.net/bugs/bug.php?id=15630
-    * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-    */
-    const REGEXP_INVALID_COOKIE = '/[\s,;]/';
-
-   /**
-    * Fileinfo magic database resource
-    * @var  resource
-    * @see  detectMimeType()
-    */
-    private static $_fileinfoDb;
-
-   /**
-    * Observers attached to the request (instances of SplObserver)
-    * @var  array
-    */
-    protected $observers = array();
-
-   /**
-    * Request URL
-    * @var  Net_URL2
-    */
-    protected $url;
-
-   /**
-    * Request method
-    * @var  string
-    */
-    protected $method = self::METHOD_GET;
-
-   /**
-    * Authentication data
-    * @var  array
-    * @see  getAuth()
-    */
-    protected $auth;
-
-   /**
-    * Request headers
-    * @var  array
-    */
-    protected $headers = array();
-
-   /**
-    * Configuration parameters
-    * @var  array
-    * @see  setConfig()
-    */
-    protected $config = array(
-        'adapter'           => 'HTTP_Request2_Adapter_Socket',
-        'connect_timeout'   => 10,
-        'timeout'           => 0,
-        'use_brackets'      => true,
-        'protocol_version'  => '1.1',
-        'buffer_size'       => 16384,
-        'store_body'        => true,
-
-        'proxy_host'        => '',
-        'proxy_port'        => '',
-        'proxy_user'        => '',
-        'proxy_password'    => '',
-        'proxy_auth_scheme' => self::AUTH_BASIC,
-
-        'ssl_verify_peer'   => true,
-        'ssl_verify_host'   => true,
-        'ssl_cafile'        => null,
-        'ssl_capath'        => null,
-        'ssl_local_cert'    => null,
-        'ssl_passphrase'    => null,
-
-        'digest_compat_ie'  => false,
-
-        'follow_redirects'  => false,
-        'max_redirects'     => 5,
-        'strict_redirects'  => false
-    );
-
-   /**
-    * Last event in request / response handling, intended for observers
-    * @var  array
-    * @see  getLastEvent()
-    */
-    protected $lastEvent = array(
-        'name' => 'start',
-        'data' => null
-    );
-
-   /**
-    * Request body
-    * @var  string|resource
-    * @see  setBody()
-    */
-    protected $body = '';
-
-   /**
-    * Array of POST parameters
-    * @var  array
-    */
-    protected $postParams = array();
-
-   /**
-    * Array of file uploads (for multipart/form-data POST requests)
-    * @var  array
-    */
-    protected $uploads = array();
-
-   /**
-    * Adapter used to perform actual HTTP request
-    * @var  HTTP_Request2_Adapter
-    */
-    protected $adapter;
-
-
-   /**
-    * Constructor. Can set request URL, method and configuration array.
-    *
-    * Also sets a default value for User-Agent header.
-    *
-    * @param    string|Net_Url2     Request URL
-    * @param    string              Request method
-    * @param    array               Configuration for this Request instance
-    */
-    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
-    {
-        $this->setConfig($config);
-        if (!empty($url)) {
-            $this->setUrl($url);
-        }
-        if (!empty($method)) {
-            $this->setMethod($method);
-        }
-        $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 ' .
-                         '(http://pear.php.net/package/http_request2) ' .
-                         'PHP/' . phpversion());
-    }
-
-   /**
-    * Sets the URL for this request
-    *
-    * If the URL has userinfo part (username & password) these will be removed
-    * and converted to auth data. If the URL does not have a path component,
-    * that will be set to '/'.
-    *
-    * @param    string|Net_URL2 Request URL
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
-    */
-    public function setUrl($url)
-    {
-        if (is_string($url)) {
-            $url = new Net_URL2(
-                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
-            );
-        }
-        if (!$url instanceof Net_URL2) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');
-        }
-        // URL contains username / password?
-        if ($url->getUserinfo()) {
-            $username = $url->getUser();
-            $password = $url->getPassword();
-            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
-            $url->setUserinfo('');
-        }
-        if ('' == $url->getPath()) {
-            $url->setPath('/');
-        }
-        $this->url = $url;
-
-        return $this;
-    }
-
-   /**
-    * Returns the request URL
-    *
-    * @return   Net_URL2
-    */
-    public function getUrl()
-    {
-        return $this->url;
-    }
-
-   /**
-    * Sets the request method
-    *
-    * @param    string
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception if the method name is invalid
-    */
-    public function setMethod($method)
-    {
-        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
-        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
-            throw new HTTP_Request2_Exception("Invalid request method '{$method}'");
-        }
-        $this->method = $method;
-
-        return $this;
-    }
-
-   /**
-    * Returns the request method
-    *
-    * @return   string
-    */
-    public function getMethod()
-    {
-        return $this->method;
-    }
-
-   /**
-    * Sets the configuration parameter(s)
-    *
-    * The following parameters are available:
-    * <ul>
-    *   <li> 'adapter'           - adapter to use (string)</li>
-    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>
-    *   <li> 'timeout'           - Total number of seconds a request can take.
-    *                              Use 0 for no limit, should be greater than
-    *                              'connect_timeout' if set (integer)</li>
-    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>
-    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>
-    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>
-    *   <li> 'store_body'        - Whether to store response body in response object.
-    *                              Set to false if receiving a huge response and
-    *                              using an Observer to save it (boolean)</li>
-    *   <li> 'proxy_host'        - Proxy server host (string)</li>
-    *   <li> 'proxy_port'        - Proxy server port (integer)</li>
-    *   <li> 'proxy_user'        - Proxy auth username (string)</li>
-    *   <li> 'proxy_password'    - Proxy auth password (string)</li>
-    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>
-    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>
-    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL
-    *                              certificate matches host name (bool)</li>
-    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer
-    *                              with (use with 'ssl_verify_peer') (string)</li>
-    *   <li> 'ssl_capath'        - Directory holding multiple Certificate
-    *                              Authority files (string)</li>
-    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>
-    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate
-    *                              was encoded (string)</li>
-    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6
-    *                              in using URL without query string in digest
-    *                              authentication (boolean)</li>
-    *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>
-    *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>
-    *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and
-    *                              302 (true, needed for compatibility with RFC 2616)
-    *                              or switch to GET (false, needed for compatibility with most
-    *                              browsers) (boolean)</li>
-    * </ul>
-    *
-    * @param    string|array    configuration parameter name or array
-    *                           ('parameter name' => 'parameter value')
-    * @param    mixed           parameter value if $nameOrConfig is not an array
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception If the parameter is unknown
-    */
-    public function setConfig($nameOrConfig, $value = null)
-    {
-        if (is_array($nameOrConfig)) {
-            foreach ($nameOrConfig as $name => $value) {
-                $this->setConfig($name, $value);
-            }
-
-        } else {
-            if (!array_key_exists($nameOrConfig, $this->config)) {
-                throw new HTTP_Request2_Exception(
-                    "Unknown configuration parameter '{$nameOrConfig}'"
-                );
-            }
-            $this->config[$nameOrConfig] = $value;
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the value(s) of the configuration parameter(s)
-    *
-    * @param    string  parameter name
-    * @return   mixed   value of $name parameter, array of all configuration
-    *                   parameters if $name is not given
-    * @throws   HTTP_Request2_Exception If the parameter is unknown
-    */
-    public function getConfig($name = null)
-    {
-        if (null === $name) {
-            return $this->config;
-        } elseif (!array_key_exists($name, $this->config)) {
-            throw new HTTP_Request2_Exception(
-                "Unknown configuration parameter '{$name}'"
-            );
-        }
-        return $this->config[$name];
-    }
-
-   /**
-    * Sets the autentification data
-    *
-    * @param    string  user name
-    * @param    string  password
-    * @param    string  authentication scheme
-    * @return   HTTP_Request2
-    */
-    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
-    {
-        if (empty($user)) {
-            $this->auth = null;
-        } else {
-            $this->auth = array(
-                'user'     => (string)$user,
-                'password' => (string)$password,
-                'scheme'   => $scheme
-            );
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the authentication data
-    *
-    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'
-    * is one of the HTTP_Request2::AUTH_* constants.
-    *
-    * @return   array
-    */
-    public function getAuth()
-    {
-        return $this->auth;
-    }
-
-   /**
-    * Sets request header(s)
-    *
-    * The first parameter may be either a full header string 'header: value' or
-    * header name. In the former case $value parameter is ignored, in the latter
-    * the header's value will either be set to $value or the header will be
-    * removed if $value is null. The first parameter can also be an array of
-    * headers, in that case method will be called recursively.
-    *
-    * Note that headers are treated case insensitively as per RFC 2616.
-    *
-    * <code>
-    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'
-    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'
-    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'
-    * $req->setHeader('FOO'); // removes 'Foo' header from request
-    * </code>
-    *
-    * @param    string|array    header name, header string ('Header: value')
-    *                           or an array of headers
-    * @param    string|null     header value, header will be removed if null
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
-    */
-    public function setHeader($name, $value = null)
-    {
-        if (is_array($name)) {
-            foreach ($name as $k => $v) {
-                if (is_string($k)) {
-                    $this->setHeader($k, $v);
-                } else {
-                    $this->setHeader($v);
-                }
-            }
-        } else {
-            if (null === $value && strpos($name, ':')) {
-                list($name, $value) = array_map('trim', explode(':', $name, 2));
-            }
-            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
-            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
-                throw new HTTP_Request2_Exception("Invalid header name '{$name}'");
-            }
-            // Header names are case insensitive anyway
-            $name = strtolower($name);
-            if (null === $value) {
-                unset($this->headers[$name]);
-            } else {
-                $this->headers[$name] = $value;
-            }
-        }
-
-        return $this;
-    }
-
-   /**
-    * Returns the request headers
-    *
-    * The array is of the form ('header name' => 'header value'), header names
-    * are lowercased
-    *
-    * @return   array
-    */
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-   /**
-    * Appends a cookie to "Cookie:" header
-    *
-    * @param    string  cookie name
-    * @param    string  cookie value
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
-    */
-    public function addCookie($name, $value)
-    {
-        $cookie = $name . '=' . $value;
-        if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
-            throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
-        }
-        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
-        $this->setHeader('cookie', $cookies . $cookie);
-
-        return $this;
-    }
-
-   /**
-    * Sets the request body
-    *
-    * @param    string  Either a string with the body or filename containing body
-    * @param    bool    Whether first parameter is a filename
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
-    */
-    public function setBody($body, $isFilename = false)
-    {
-        if (!$isFilename) {
-            if (!$body instanceof HTTP_Request2_MultipartBody) {
-                $this->body = (string)$body;
-            } else {
-                $this->body = $body;
-            }
-        } else {
-            if (!($fp = @fopen($body, 'rb'))) {
-                throw new HTTP_Request2_Exception("Cannot open file {$body}");
-            }
-            $this->body = $fp;
-            if (empty($this->headers['content-type'])) {
-                $this->setHeader('content-type', self::detectMimeType($body));
-            }
-        }
-        $this->postParams = $this->uploads = array();
-
-        return $this;
-    }
-
-   /**
-    * Returns the request body
-    *
-    * @return   string|resource|HTTP_Request2_MultipartBody
-    */
-    public function getBody()
-    {
-        if (self::METHOD_POST == $this->method &&
-            (!empty($this->postParams) || !empty($this->uploads))
-        ) {
-            if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {
-                $body = http_build_query($this->postParams, '', '&');
-                if (!$this->getConfig('use_brackets')) {
-                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);
-                }
-                // support RFC 3986 by not encoding '~' symbol (request #15368)
-                return str_replace('%7E', '~', $body);
-
-            } elseif ('multipart/form-data' == $this->headers['content-type']) {
-                require_once 'HTTP/Request2/MultipartBody.php';
-                return new HTTP_Request2_MultipartBody(
-                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')
-                );
-            }
-        }
-        return $this->body;
-    }
-
-   /**
-    * Adds a file to form-based file upload
-    *
-    * Used to emulate file upload via a HTML form. The method also sets
-    * Content-Type of HTTP request to 'multipart/form-data'.
-    *
-    * If you just want to send the contents of a file as the body of HTTP
-    * request you should use setBody() method.
-    *
-    * @param    string  name of file-upload field
-    * @param    mixed   full name of local file
-    * @param    string  filename to send in the request
-    * @param    string  content-type of file being uploaded
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
-    */
-    public function addUpload($fieldName, $filename, $sendFilename = null,
-                              $contentType = null)
-    {
-        if (!is_array($filename)) {
-            if (!($fp = @fopen($filename, 'rb'))) {
-                throw new HTTP_Request2_Exception("Cannot open file {$filename}");
-            }
-            $this->uploads[$fieldName] = array(
-                'fp'        => $fp,
-                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,
-                'size'      => filesize($filename),
-                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType
-            );
-        } else {
-            $fps = $names = $sizes = $types = array();
-            foreach ($filename as $f) {
-                if (!is_array($f)) {
-                    $f = array($f);
-                }
-                if (!($fp = @fopen($f[0], 'rb'))) {
-                    throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
-                }
-                $fps[]   = $fp;
-                $names[] = empty($f[1])? basename($f[0]): $f[1];
-                $sizes[] = filesize($f[0]);
-                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
-            }
-            $this->uploads[$fieldName] = array(
-                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
-            );
-        }
-        if (empty($this->headers['content-type']) ||
-            'application/x-www-form-urlencoded' == $this->headers['content-type']
-        ) {
-            $this->setHeader('content-type', 'multipart/form-data');
-        }
-
-        return $this;
-    }
-
-   /**
-    * Adds POST parameter(s) to the request.
-    *
-    * @param    string|array    parameter name or array ('name' => 'value')
-    * @param    mixed           parameter value (can be an array)
-    * @return   HTTP_Request2
-    */
-    public function addPostParameter($name, $value = null)
-    {
-        if (!is_array($name)) {
-            $this->postParams[$name] = $value;
-        } else {
-            foreach ($name as $k => $v) {
-                $this->addPostParameter($k, $v);
-            }
-        }
-        if (empty($this->headers['content-type'])) {
-            $this->setHeader('content-type', 'application/x-www-form-urlencoded');
-        }
-
-        return $this;
-    }
-
-   /**
-    * Attaches a new observer
-    *
-    * @param    SplObserver
-    */
-    public function attach(SplObserver $observer)
-    {
-        foreach ($this->observers as $attached) {
-            if ($attached === $observer) {
-                return;
-            }
-        }
-        $this->observers[] = $observer;
-    }
-
-   /**
-    * Detaches an existing observer
-    *
-    * @param    SplObserver
-    */
-    public function detach(SplObserver $observer)
-    {
-        foreach ($this->observers as $key => $attached) {
-            if ($attached === $observer) {
-                unset($this->observers[$key]);
-                return;
-            }
-        }
-    }
-
-   /**
-    * Notifies all observers
-    */
-    public function notify()
-    {
-        foreach ($this->observers as $observer) {
-            $observer->update($this);
-        }
-    }
-
-   /**
-    * Sets the last event
-    *
-    * Adapters should use this method to set the current state of the request
-    * and notify the observers.
-    *
-    * @param    string  event name
-    * @param    mixed   event data
-    */
-    public function setLastEvent($name, $data = null)
-    {
-        $this->lastEvent = array(
-            'name' => $name,
-            'data' => $data
-        );
-        $this->notify();
-    }
-
-   /**
-    * Returns the last event
-    *
-    * Observers should use this method to access the last change in request.
-    * The following event names are possible:
-    * <ul>
-    *   <li>'connect'                 - after connection to remote server,
-    *                                   data is the destination (string)</li>
-    *   <li>'disconnect'              - after disconnection from server</li>
-    *   <li>'sentHeaders'             - after sending the request headers,
-    *                                   data is the headers sent (string)</li>
-    *   <li>'sentBodyPart'            - after sending a part of the request body,
-    *                                   data is the length of that part (int)</li>
-    *   <li>'receivedHeaders'         - after receiving the response headers,
-    *                                   data is HTTP_Request2_Response object</li>
-    *   <li>'receivedBodyPart'        - after receiving a part of the response
-    *                                   body, data is that part (string)</li>
-    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still
-    *                                   encoded by Content-Encoding</li>
-    *   <li>'receivedBody'            - after receiving the complete response
-    *                                   body, data is HTTP_Request2_Response object</li>
-    * </ul>
-    * Different adapters may not send all the event types. Mock adapter does
-    * not send any events to the observers.
-    *
-    * @return   array   The array has two keys: 'name' and 'data'
-    */
-    public function getLastEvent()
-    {
-        return $this->lastEvent;
-    }
-
-   /**
-    * Sets the adapter used to actually perform the request
-    *
-    * You can pass either an instance of a class implementing HTTP_Request2_Adapter
-    * or a class name. The method will only try to include a file if the class
-    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this
-    * prefix to the class name if it doesn't contain any underscores, so that
-    * <code>
-    * $request->setAdapter('curl');
-    * </code>
-    * will work.
-    *
-    * @param    string|HTTP_Request2_Adapter
-    * @return   HTTP_Request2
-    * @throws   HTTP_Request2_Exception
-    */
-    public function setAdapter($adapter)
-    {
-        if (is_string($adapter)) {
-            if (!class_exists($adapter, false)) {
-                if (false === strpos($adapter, '_')) {
-                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
-                }
-                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
-                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
-                }
-                if (!class_exists($adapter, false)) {
-                    throw new HTTP_Request2_Exception("Class {$adapter} not found");
-                }
-            }
-            $adapter = new $adapter;
-        }
-        if (!$adapter instanceof HTTP_Request2_Adapter) {
-            throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');
-        }
-        $this->adapter = $adapter;
-
-        return $this;
-    }
-
-   /**
-    * Sends the request and returns the response
-    *
-    * @throws   HTTP_Request2_Exception
-    * @return   HTTP_Request2_Response
-    */
-    public function send()
-    {
-        // Sanity check for URL
-        if (!$this->url instanceof Net_URL2) {
-            throw new HTTP_Request2_Exception('No URL given');
-        } elseif (!$this->url->isAbsolute()) {
-            throw new HTTP_Request2_Exception('Absolute URL required');
-        } elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {
-            throw new HTTP_Request2_Exception('Not a HTTP URL');
-        }
-        if (empty($this->adapter)) {
-            $this->setAdapter($this->getConfig('adapter'));
-        }
-        // magic_quotes_runtime may break file uploads and chunked response
-        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
-        if ($magicQuotes = get_magic_quotes_runtime()) {
-            set_magic_quotes_runtime(false);
-        }
-        // force using single byte encoding if mbstring extension overloads
-        // strlen() and substr(); see bug #1781, bug #10605
-        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-
-        try {
-            $response = $this->adapter->sendRequest($this);
-        } catch (Exception $e) {
-        }
-        // cleanup in either case (poor man's "finally" clause)
-        if ($magicQuotes) {
-            set_magic_quotes_runtime(true);
-        }
-        if (!empty($oldEncoding)) {
-            mb_internal_encoding($oldEncoding);
-        }
-        // rethrow the exception
-        if (!empty($e)) {
-            throw $e;
-        }
-        return $response;
-    }
-
-   /**
-    * Tries to detect MIME type of a file
-    *
-    * The method will try to use fileinfo extension if it is available,
-    * deprecated mime_content_type() function in the other case. If neither
-    * works, default 'application/octet-stream' MIME type is returned
-    *
-    * @param    string  filename
-    * @return   string  file MIME type
-    */
-    protected static function detectMimeType($filename)
-    {
-        // finfo extension from PECL available
-        if (function_exists('finfo_open')) {
-            if (!isset(self::$_fileinfoDb)) {
-                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
-            }
-            if (self::$_fileinfoDb) {
-                $info = finfo_file(self::$_fileinfoDb, $filename);
-            }
-        }
-        // (deprecated) mime_content_type function available
-        if (empty($info) && function_exists('mime_content_type')) {
-            return mime_content_type($filename);
-        }
-        return empty($info)? 'application/octet-stream': $info;
-    }
-}
+<?php
+/**
+ * Class representing a HTTP request message
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Request2.php 298246 2010-04-21 10:41:16Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * A class representing an URL as per RFC 3986.
+ */
+require_once 'Net/URL2.php';
+
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
+
+/**
+ * Class representing a HTTP request message
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 0.5.2
+ * @link       http://tools.ietf.org/html/rfc2616#section-5
+ */
+class HTTP_Request2 implements SplSubject
+{
+   /**#@+
+    * Constants for HTTP request methods
+    *
+    * @link http://tools.ietf.org/html/rfc2616#section-5.1.1
+    */
+    const METHOD_OPTIONS = 'OPTIONS';
+    const METHOD_GET     = 'GET';
+    const METHOD_HEAD    = 'HEAD';
+    const METHOD_POST    = 'POST';
+    const METHOD_PUT     = 'PUT';
+    const METHOD_DELETE  = 'DELETE';
+    const METHOD_TRACE   = 'TRACE';
+    const METHOD_CONNECT = 'CONNECT';
+   /**#@-*/
+
+   /**#@+
+    * Constants for HTTP authentication schemes
+    *
+    * @link http://tools.ietf.org/html/rfc2617
+    */
+    const AUTH_BASIC  = 'basic';
+    const AUTH_DIGEST = 'digest';
+   /**#@-*/
+
+   /**
+    * Regular expression used to check for invalid symbols in RFC 2616 tokens
+    * @link http://pear.php.net/bugs/bug.php?id=15630
+    */
+    const REGEXP_INVALID_TOKEN = '![\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]!';
+
+   /**
+    * Regular expression used to check for invalid symbols in cookie strings
+    * @link http://pear.php.net/bugs/bug.php?id=15630
+    * @link http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
+    */
+    const REGEXP_INVALID_COOKIE = '/[\s,;]/';
+
+   /**
+    * Fileinfo magic database resource
+    * @var  resource
+    * @see  detectMimeType()
+    */
+    private static $_fileinfoDb;
+
+   /**
+    * Observers attached to the request (instances of SplObserver)
+    * @var  array
+    */
+    protected $observers = array();
+
+   /**
+    * Request URL
+    * @var  Net_URL2
+    */
+    protected $url;
+
+   /**
+    * Request method
+    * @var  string
+    */
+    protected $method = self::METHOD_GET;
+
+   /**
+    * Authentication data
+    * @var  array
+    * @see  getAuth()
+    */
+    protected $auth;
+
+   /**
+    * Request headers
+    * @var  array
+    */
+    protected $headers = array();
+
+   /**
+    * Configuration parameters
+    * @var  array
+    * @see  setConfig()
+    */
+    protected $config = array(
+        'adapter'           => 'HTTP_Request2_Adapter_Socket',
+        'connect_timeout'   => 10,
+        'timeout'           => 0,
+        'use_brackets'      => true,
+        'protocol_version'  => '1.1',
+        'buffer_size'       => 16384,
+        'store_body'        => true,
+
+        'proxy_host'        => '',
+        'proxy_port'        => '',
+        'proxy_user'        => '',
+        'proxy_password'    => '',
+        'proxy_auth_scheme' => self::AUTH_BASIC,
+
+        'ssl_verify_peer'   => true,
+        'ssl_verify_host'   => true,
+        'ssl_cafile'        => null,
+        'ssl_capath'        => null,
+        'ssl_local_cert'    => null,
+        'ssl_passphrase'    => null,
+
+        'digest_compat_ie'  => false,
+
+        'follow_redirects'  => false,
+        'max_redirects'     => 5,
+        'strict_redirects'  => false
+    );
+
+   /**
+    * Last event in request / response handling, intended for observers
+    * @var  array
+    * @see  getLastEvent()
+    */
+    protected $lastEvent = array(
+        'name' => 'start',
+        'data' => null
+    );
+
+   /**
+    * Request body
+    * @var  string|resource
+    * @see  setBody()
+    */
+    protected $body = '';
+
+   /**
+    * Array of POST parameters
+    * @var  array
+    */
+    protected $postParams = array();
+
+   /**
+    * Array of file uploads (for multipart/form-data POST requests)
+    * @var  array
+    */
+    protected $uploads = array();
+
+   /**
+    * Adapter used to perform actual HTTP request
+    * @var  HTTP_Request2_Adapter
+    */
+    protected $adapter;
+
+
+   /**
+    * Constructor. Can set request URL, method and configuration array.
+    *
+    * Also sets a default value for User-Agent header.
+    *
+    * @param    string|Net_Url2     Request URL
+    * @param    string              Request method
+    * @param    array               Configuration for this Request instance
+    */
+    public function __construct($url = null, $method = self::METHOD_GET, array $config = array())
+    {
+        $this->setConfig($config);
+        if (!empty($url)) {
+            $this->setUrl($url);
+        }
+        if (!empty($method)) {
+            $this->setMethod($method);
+        }
+        $this->setHeader('user-agent', 'HTTP_Request2/0.5.2 ' .
+                         '(http://pear.php.net/package/http_request2) ' .
+                         'PHP/' . phpversion());
+    }
+
+   /**
+    * Sets the URL for this request
+    *
+    * If the URL has userinfo part (username & password) these will be removed
+    * and converted to auth data. If the URL does not have a path component,
+    * that will be set to '/'.
+    *
+    * @param    string|Net_URL2 Request URL
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception
+    */
+    public function setUrl($url)
+    {
+        if (is_string($url)) {
+            $url = new Net_URL2(
+                $url, array(Net_URL2::OPTION_USE_BRACKETS => $this->config['use_brackets'])
+            );
+        }
+        if (!$url instanceof Net_URL2) {
+            throw new HTTP_Request2_Exception('Parameter is not a valid HTTP URL');
+        }
+        // URL contains username / password?
+        if ($url->getUserinfo()) {
+            $username = $url->getUser();
+            $password = $url->getPassword();
+            $this->setAuth(rawurldecode($username), $password? rawurldecode($password): '');
+            $url->setUserinfo('');
+        }
+        if ('' == $url->getPath()) {
+            $url->setPath('/');
+        }
+        $this->url = $url;
+
+        return $this;
+    }
+
+   /**
+    * Returns the request URL
+    *
+    * @return   Net_URL2
+    */
+    public function getUrl()
+    {
+        return $this->url;
+    }
+
+   /**
+    * Sets the request method
+    *
+    * @param    string
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception if the method name is invalid
+    */
+    public function setMethod($method)
+    {
+        // Method name should be a token: http://tools.ietf.org/html/rfc2616#section-5.1.1
+        if (preg_match(self::REGEXP_INVALID_TOKEN, $method)) {
+            throw new HTTP_Request2_Exception("Invalid request method '{$method}'");
+        }
+        $this->method = $method;
+
+        return $this;
+    }
+
+   /**
+    * Returns the request method
+    *
+    * @return   string
+    */
+    public function getMethod()
+    {
+        return $this->method;
+    }
+
+   /**
+    * Sets the configuration parameter(s)
+    *
+    * The following parameters are available:
+    * <ul>
+    *   <li> 'adapter'           - adapter to use (string)</li>
+    *   <li> 'connect_timeout'   - Connection timeout in seconds (integer)</li>
+    *   <li> 'timeout'           - Total number of seconds a request can take.
+    *                              Use 0 for no limit, should be greater than
+    *                              'connect_timeout' if set (integer)</li>
+    *   <li> 'use_brackets'      - Whether to append [] to array variable names (bool)</li>
+    *   <li> 'protocol_version'  - HTTP Version to use, '1.0' or '1.1' (string)</li>
+    *   <li> 'buffer_size'       - Buffer size to use for reading and writing (int)</li>
+    *   <li> 'store_body'        - Whether to store response body in response object.
+    *                              Set to false if receiving a huge response and
+    *                              using an Observer to save it (boolean)</li>
+    *   <li> 'proxy_host'        - Proxy server host (string)</li>
+    *   <li> 'proxy_port'        - Proxy server port (integer)</li>
+    *   <li> 'proxy_user'        - Proxy auth username (string)</li>
+    *   <li> 'proxy_password'    - Proxy auth password (string)</li>
+    *   <li> 'proxy_auth_scheme' - Proxy auth scheme, one of HTTP_Request2::AUTH_* constants (string)</li>
+    *   <li> 'ssl_verify_peer'   - Whether to verify peer's SSL certificate (bool)</li>
+    *   <li> 'ssl_verify_host'   - Whether to check that Common Name in SSL
+    *                              certificate matches host name (bool)</li>
+    *   <li> 'ssl_cafile'        - Cerificate Authority file to verify the peer
+    *                              with (use with 'ssl_verify_peer') (string)</li>
+    *   <li> 'ssl_capath'        - Directory holding multiple Certificate
+    *                              Authority files (string)</li>
+    *   <li> 'ssl_local_cert'    - Name of a file containing local cerificate (string)</li>
+    *   <li> 'ssl_passphrase'    - Passphrase with which local certificate
+    *                              was encoded (string)</li>
+    *   <li> 'digest_compat_ie'  - Whether to imitate behaviour of MSIE 5 and 6
+    *                              in using URL without query string in digest
+    *                              authentication (boolean)</li>
+    *   <li> 'follow_redirects'  - Whether to automatically follow HTTP Redirects (boolean)</li>
+    *   <li> 'max_redirects'     - Maximum number of redirects to follow (integer)</li>
+    *   <li> 'strict_redirects'  - Whether to keep request method on redirects via status 301 and
+    *                              302 (true, needed for compatibility with RFC 2616)
+    *                              or switch to GET (false, needed for compatibility with most
+    *                              browsers) (boolean)</li>
+    * </ul>
+    *
+    * @param    string|array    configuration parameter name or array
+    *                           ('parameter name' => 'parameter value')
+    * @param    mixed           parameter value if $nameOrConfig is not an array
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception If the parameter is unknown
+    */
+    public function setConfig($nameOrConfig, $value = null)
+    {
+        if (is_array($nameOrConfig)) {
+            foreach ($nameOrConfig as $name => $value) {
+                $this->setConfig($name, $value);
+            }
+
+        } else {
+            if (!array_key_exists($nameOrConfig, $this->config)) {
+                throw new HTTP_Request2_Exception(
+                    "Unknown configuration parameter '{$nameOrConfig}'"
+                );
+            }
+            $this->config[$nameOrConfig] = $value;
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns the value(s) of the configuration parameter(s)
+    *
+    * @param    string  parameter name
+    * @return   mixed   value of $name parameter, array of all configuration
+    *                   parameters if $name is not given
+    * @throws   HTTP_Request2_Exception If the parameter is unknown
+    */
+    public function getConfig($name = null)
+    {
+        if (null === $name) {
+            return $this->config;
+        } elseif (!array_key_exists($name, $this->config)) {
+            throw new HTTP_Request2_Exception(
+                "Unknown configuration parameter '{$name}'"
+            );
+        }
+        return $this->config[$name];
+    }
+
+   /**
+    * Sets the autentification data
+    *
+    * @param    string  user name
+    * @param    string  password
+    * @param    string  authentication scheme
+    * @return   HTTP_Request2
+    */
+    public function setAuth($user, $password = '', $scheme = self::AUTH_BASIC)
+    {
+        if (empty($user)) {
+            $this->auth = null;
+        } else {
+            $this->auth = array(
+                'user'     => (string)$user,
+                'password' => (string)$password,
+                'scheme'   => $scheme
+            );
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns the authentication data
+    *
+    * The array has the keys 'user', 'password' and 'scheme', where 'scheme'
+    * is one of the HTTP_Request2::AUTH_* constants.
+    *
+    * @return   array
+    */
+    public function getAuth()
+    {
+        return $this->auth;
+    }
+
+   /**
+    * Sets request header(s)
+    *
+    * The first parameter may be either a full header string 'header: value' or
+    * header name. In the former case $value parameter is ignored, in the latter
+    * the header's value will either be set to $value or the header will be
+    * removed if $value is null. The first parameter can also be an array of
+    * headers, in that case method will be called recursively.
+    *
+    * Note that headers are treated case insensitively as per RFC 2616.
+    *
+    * <code>
+    * $req->setHeader('Foo: Bar'); // sets the value of 'Foo' header to 'Bar'
+    * $req->setHeader('FoO', 'Baz'); // sets the value of 'Foo' header to 'Baz'
+    * $req->setHeader(array('foo' => 'Quux')); // sets the value of 'Foo' header to 'Quux'
+    * $req->setHeader('FOO'); // removes 'Foo' header from request
+    * </code>
+    *
+    * @param    string|array    header name, header string ('Header: value')
+    *                           or an array of headers
+    * @param    string|null     header value, header will be removed if null
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception
+    */
+    public function setHeader($name, $value = null)
+    {
+        if (is_array($name)) {
+            foreach ($name as $k => $v) {
+                if (is_string($k)) {
+                    $this->setHeader($k, $v);
+                } else {
+                    $this->setHeader($v);
+                }
+            }
+        } else {
+            if (null === $value && strpos($name, ':')) {
+                list($name, $value) = array_map('trim', explode(':', $name, 2));
+            }
+            // Header name should be a token: http://tools.ietf.org/html/rfc2616#section-4.2
+            if (preg_match(self::REGEXP_INVALID_TOKEN, $name)) {
+                throw new HTTP_Request2_Exception("Invalid header name '{$name}'");
+            }
+            // Header names are case insensitive anyway
+            $name = strtolower($name);
+            if (null === $value) {
+                unset($this->headers[$name]);
+            } else {
+                $this->headers[$name] = $value;
+            }
+        }
+
+        return $this;
+    }
+
+   /**
+    * Returns the request headers
+    *
+    * The array is of the form ('header name' => 'header value'), header names
+    * are lowercased
+    *
+    * @return   array
+    */
+    public function getHeaders()
+    {
+        return $this->headers;
+    }
+
+   /**
+    * Appends a cookie to "Cookie:" header
+    *
+    * @param    string  cookie name
+    * @param    string  cookie value
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception
+    */
+    public function addCookie($name, $value)
+    {
+        $cookie = $name . '=' . $value;
+        if (preg_match(self::REGEXP_INVALID_COOKIE, $cookie)) {
+            throw new HTTP_Request2_Exception("Invalid cookie: '{$cookie}'");
+        }
+        $cookies = empty($this->headers['cookie'])? '': $this->headers['cookie'] . '; ';
+        $this->setHeader('cookie', $cookies . $cookie);
+
+        return $this;
+    }
+
+   /**
+    * Sets the request body
+    *
+    * @param    string  Either a string with the body or filename containing body
+    * @param    bool    Whether first parameter is a filename
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception
+    */
+    public function setBody($body, $isFilename = false)
+    {
+        if (!$isFilename) {
+            if (!$body instanceof HTTP_Request2_MultipartBody) {
+                $this->body = (string)$body;
+            } else {
+                $this->body = $body;
+            }
+        } else {
+            if (!($fp = @fopen($body, 'rb'))) {
+                throw new HTTP_Request2_Exception("Cannot open file {$body}");
+            }
+            $this->body = $fp;
+            if (empty($this->headers['content-type'])) {
+                $this->setHeader('content-type', self::detectMimeType($body));
+            }
+        }
+        $this->postParams = $this->uploads = array();
+
+        return $this;
+    }
+
+   /**
+    * Returns the request body
+    *
+    * @return   string|resource|HTTP_Request2_MultipartBody
+    */
+    public function getBody()
+    {
+        if (self::METHOD_POST == $this->method &&
+            (!empty($this->postParams) || !empty($this->uploads))
+        ) {
+            if ('application/x-www-form-urlencoded' == $this->headers['content-type']) {
+                $body = http_build_query($this->postParams, '', '&');
+                if (!$this->getConfig('use_brackets')) {
+                    $body = preg_replace('/%5B\d+%5D=/', '=', $body);
+                }
+                // support RFC 3986 by not encoding '~' symbol (request #15368)
+                return str_replace('%7E', '~', $body);
+
+            } elseif ('multipart/form-data' == $this->headers['content-type']) {
+                require_once 'HTTP/Request2/MultipartBody.php';
+                return new HTTP_Request2_MultipartBody(
+                    $this->postParams, $this->uploads, $this->getConfig('use_brackets')
+                );
+            }
+        }
+        return $this->body;
+    }
+
+   /**
+    * Adds a file to form-based file upload
+    *
+    * Used to emulate file upload via a HTML form. The method also sets
+    * Content-Type of HTTP request to 'multipart/form-data'.
+    *
+    * If you just want to send the contents of a file as the body of HTTP
+    * request you should use setBody() method.
+    *
+    * @param    string  name of file-upload field
+    * @param    mixed   full name of local file
+    * @param    string  filename to send in the request
+    * @param    string  content-type of file being uploaded
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception
+    */
+    public function addUpload($fieldName, $filename, $sendFilename = null,
+                              $contentType = null)
+    {
+        if (!is_array($filename)) {
+            if (!($fp = @fopen($filename, 'rb'))) {
+                throw new HTTP_Request2_Exception("Cannot open file {$filename}");
+            }
+            $this->uploads[$fieldName] = array(
+                'fp'        => $fp,
+                'filename'  => empty($sendFilename)? basename($filename): $sendFilename,
+                'size'      => filesize($filename),
+                'type'      => empty($contentType)? self::detectMimeType($filename): $contentType
+            );
+        } else {
+            $fps = $names = $sizes = $types = array();
+            foreach ($filename as $f) {
+                if (!is_array($f)) {
+                    $f = array($f);
+                }
+                if (!($fp = @fopen($f[0], 'rb'))) {
+                    throw new HTTP_Request2_Exception("Cannot open file {$f[0]}");
+                }
+                $fps[]   = $fp;
+                $names[] = empty($f[1])? basename($f[0]): $f[1];
+                $sizes[] = filesize($f[0]);
+                $types[] = empty($f[2])? self::detectMimeType($f[0]): $f[2];
+            }
+            $this->uploads[$fieldName] = array(
+                'fp' => $fps, 'filename' => $names, 'size' => $sizes, 'type' => $types
+            );
+        }
+        if (empty($this->headers['content-type']) ||
+            'application/x-www-form-urlencoded' == $this->headers['content-type']
+        ) {
+            $this->setHeader('content-type', 'multipart/form-data');
+        }
+
+        return $this;
+    }
+
+   /**
+    * Adds POST parameter(s) to the request.
+    *
+    * @param    string|array    parameter name or array ('name' => 'value')
+    * @param    mixed           parameter value (can be an array)
+    * @return   HTTP_Request2
+    */
+    public function addPostParameter($name, $value = null)
+    {
+        if (!is_array($name)) {
+            $this->postParams[$name] = $value;
+        } else {
+            foreach ($name as $k => $v) {
+                $this->addPostParameter($k, $v);
+            }
+        }
+        if (empty($this->headers['content-type'])) {
+            $this->setHeader('content-type', 'application/x-www-form-urlencoded');
+        }
+
+        return $this;
+    }
+
+   /**
+    * Attaches a new observer
+    *
+    * @param    SplObserver
+    */
+    public function attach(SplObserver $observer)
+    {
+        foreach ($this->observers as $attached) {
+            if ($attached === $observer) {
+                return;
+            }
+        }
+        $this->observers[] = $observer;
+    }
+
+   /**
+    * Detaches an existing observer
+    *
+    * @param    SplObserver
+    */
+    public function detach(SplObserver $observer)
+    {
+        foreach ($this->observers as $key => $attached) {
+            if ($attached === $observer) {
+                unset($this->observers[$key]);
+                return;
+            }
+        }
+    }
+
+   /**
+    * Notifies all observers
+    */
+    public function notify()
+    {
+        foreach ($this->observers as $observer) {
+            $observer->update($this);
+        }
+    }
+
+   /**
+    * Sets the last event
+    *
+    * Adapters should use this method to set the current state of the request
+    * and notify the observers.
+    *
+    * @param    string  event name
+    * @param    mixed   event data
+    */
+    public function setLastEvent($name, $data = null)
+    {
+        $this->lastEvent = array(
+            'name' => $name,
+            'data' => $data
+        );
+        $this->notify();
+    }
+
+   /**
+    * Returns the last event
+    *
+    * Observers should use this method to access the last change in request.
+    * The following event names are possible:
+    * <ul>
+    *   <li>'connect'                 - after connection to remote server,
+    *                                   data is the destination (string)</li>
+    *   <li>'disconnect'              - after disconnection from server</li>
+    *   <li>'sentHeaders'             - after sending the request headers,
+    *                                   data is the headers sent (string)</li>
+    *   <li>'sentBodyPart'            - after sending a part of the request body,
+    *                                   data is the length of that part (int)</li>
+    *   <li>'receivedHeaders'         - after receiving the response headers,
+    *                                   data is HTTP_Request2_Response object</li>
+    *   <li>'receivedBodyPart'        - after receiving a part of the response
+    *                                   body, data is that part (string)</li>
+    *   <li>'receivedEncodedBodyPart' - as 'receivedBodyPart', but data is still
+    *                                   encoded by Content-Encoding</li>
+    *   <li>'receivedBody'            - after receiving the complete response
+    *                                   body, data is HTTP_Request2_Response object</li>
+    * </ul>
+    * Different adapters may not send all the event types. Mock adapter does
+    * not send any events to the observers.
+    *
+    * @return   array   The array has two keys: 'name' and 'data'
+    */
+    public function getLastEvent()
+    {
+        return $this->lastEvent;
+    }
+
+   /**
+    * Sets the adapter used to actually perform the request
+    *
+    * You can pass either an instance of a class implementing HTTP_Request2_Adapter
+    * or a class name. The method will only try to include a file if the class
+    * name starts with HTTP_Request2_Adapter_, it will also try to prepend this
+    * prefix to the class name if it doesn't contain any underscores, so that
+    * <code>
+    * $request->setAdapter('curl');
+    * </code>
+    * will work.
+    *
+    * @param    string|HTTP_Request2_Adapter
+    * @return   HTTP_Request2
+    * @throws   HTTP_Request2_Exception
+    */
+    public function setAdapter($adapter)
+    {
+        if (is_string($adapter)) {
+            if (!class_exists($adapter, false)) {
+                if (false === strpos($adapter, '_')) {
+                    $adapter = 'HTTP_Request2_Adapter_' . ucfirst($adapter);
+                }
+                if (preg_match('/^HTTP_Request2_Adapter_([a-zA-Z0-9]+)$/', $adapter)) {
+                    include_once str_replace('_', DIRECTORY_SEPARATOR, $adapter) . '.php';
+                }
+                if (!class_exists($adapter, false)) {
+                    throw new HTTP_Request2_Exception("Class {$adapter} not found");
+                }
+            }
+            $adapter = new $adapter;
+        }
+        if (!$adapter instanceof HTTP_Request2_Adapter) {
+            throw new HTTP_Request2_Exception('Parameter is not a HTTP request adapter');
+        }
+        $this->adapter = $adapter;
+
+        return $this;
+    }
+
+   /**
+    * Sends the request and returns the response
+    *
+    * @throws   HTTP_Request2_Exception
+    * @return   HTTP_Request2_Response
+    */
+    public function send()
+    {
+        // Sanity check for URL
+        if (!$this->url instanceof Net_URL2) {
+            throw new HTTP_Request2_Exception('No URL given');
+        } elseif (!$this->url->isAbsolute()) {
+            throw new HTTP_Request2_Exception('Absolute URL required');
+        } elseif (!in_array(strtolower($this->url->getScheme()), array('https', 'http'))) {
+            throw new HTTP_Request2_Exception('Not a HTTP URL');
+        }
+        if (empty($this->adapter)) {
+            $this->setAdapter($this->getConfig('adapter'));
+        }
+        // magic_quotes_runtime may break file uploads and chunked response
+        // processing; see bug #4543. Don't use ini_get() here; see bug #16440.
+        if ($magicQuotes = get_magic_quotes_runtime()) {
+            set_magic_quotes_runtime(false);
+        }
+        // force using single byte encoding if mbstring extension overloads
+        // strlen() and substr(); see bug #1781, bug #10605
+        if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+            $oldEncoding = mb_internal_encoding();
+            mb_internal_encoding('iso-8859-1');
+        }
+
+        try {
+            $response = $this->adapter->sendRequest($this);
+        } catch (Exception $e) {
+        }
+        // cleanup in either case (poor man's "finally" clause)
+        if ($magicQuotes) {
+            set_magic_quotes_runtime(true);
+        }
+        if (!empty($oldEncoding)) {
+            mb_internal_encoding($oldEncoding);
+        }
+        // rethrow the exception
+        if (!empty($e)) {
+            throw $e;
+        }
+        return $response;
+    }
+
+   /**
+    * Tries to detect MIME type of a file
+    *
+    * The method will try to use fileinfo extension if it is available,
+    * deprecated mime_content_type() function in the other case. If neither
+    * works, default 'application/octet-stream' MIME type is returned
+    *
+    * @param    string  filename
+    * @return   string  file MIME type
+    */
+    protected static function detectMimeType($filename)
+    {
+        // finfo extension from PECL available
+        if (function_exists('finfo_open')) {
+            if (!isset(self::$_fileinfoDb)) {
+                self::$_fileinfoDb = @finfo_open(FILEINFO_MIME);
+            }
+            if (self::$_fileinfoDb) {
+                $info = finfo_file(self::$_fileinfoDb, $filename);
+            }
+        }
+        // (deprecated) mime_content_type function available
+        if (empty($info) && function_exists('mime_content_type')) {
+            return mime_content_type($filename);
+        }
+        return empty($info)? 'application/octet-stream': $info;
+    }
+}
 ?>
\ No newline at end of file
diff --git a/libs/PEAR.1.9/HTTP/Request2/Adapter.php b/libs/PEAR.1.9/HTTP/Request2/Adapter.php
index 8e3a7891f..8ebbf4607 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Adapter.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Adapter.php
@@ -1,154 +1,154 @@
-<?php
-/**
- * Base class for HTTP_Request2 adapters
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Adapter.php 291118 2009-11-21 17:58:23Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Class representing a HTTP response
- */
-require_once 'HTTP/Request2/Response.php';
-
-/**
- * Base class for HTTP_Request2 adapters
- *
- * HTTP_Request2 class itself only defines methods for aggregating the request
- * data, all actual work of sending the request to the remote server and
- * receiving its response is performed by adapters.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.5.2
- */
-abstract class HTTP_Request2_Adapter
-{
-   /**
-    * A list of methods that MUST NOT have a request body, per RFC 2616
-    * @var  array
-    */
-    protected static $bodyDisallowed = array('TRACE');
-
-   /**
-    * Methods having defined semantics for request body
-    *
-    * Content-Length header (indicating that the body follows, section 4.3 of
-    * RFC 2616) will be sent for these methods even if no body was added
-    *
-    * @var  array
-    * @link http://pear.php.net/bugs/bug.php?id=12900
-    * @link http://pear.php.net/bugs/bug.php?id=14740
-    */
-    protected static $bodyRequired = array('POST', 'PUT');
-
-   /**
-    * Request being sent
-    * @var  HTTP_Request2
-    */
-    protected $request;
-
-   /**
-    * Request body
-    * @var  string|resource|HTTP_Request2_MultipartBody
-    * @see  HTTP_Request2::getBody()
-    */
-    protected $requestBody;
-
-   /**
-    * Length of the request body
-    * @var  integer
-    */
-    protected $contentLength;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    abstract public function sendRequest(HTTP_Request2 $request);
-
-   /**
-    * Calculates length of the request body, adds proper headers
-    *
-    * @param    array   associative array of request headers, this method will
-    *                   add proper 'Content-Length' and 'Content-Type' headers
-    *                   to this array (or remove them if not needed)
-    */
-    protected function calculateRequestLength(&$headers)
-    {
-        $this->requestBody = $this->request->getBody();
-
-        if (is_string($this->requestBody)) {
-            $this->contentLength = strlen($this->requestBody);
-        } elseif (is_resource($this->requestBody)) {
-            $stat = fstat($this->requestBody);
-            $this->contentLength = $stat['size'];
-            rewind($this->requestBody);
-        } else {
-            $this->contentLength = $this->requestBody->getLength();
-            $headers['content-type'] = 'multipart/form-data; boundary=' .
-                                       $this->requestBody->getBoundary();
-            $this->requestBody->rewind();
-        }
-
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            // No body: send a Content-Length header nonetheless (request #12900),
-            // but do that only for methods that require a body (bug #14740)
-            if (in_array($this->request->getMethod(), self::$bodyRequired)) {
-                $headers['content-length'] = 0;
-            } else {
-                unset($headers['content-length']);
-                // if the method doesn't require a body and doesn't have a
-                // body, don't send a Content-Type header. (request #16799)
-                unset($headers['content-type']);
-            }
-        } else {
-            if (empty($headers['content-type'])) {
-                $headers['content-type'] = 'application/x-www-form-urlencoded';
-            }
-            $headers['content-length'] = $this->contentLength;
-        }
-    }
-}
-?>
+<?php
+/**
+ * Base class for HTTP_Request2 adapters
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Adapter.php 291118 2009-11-21 17:58:23Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Class representing a HTTP response
+ */
+require_once 'HTTP/Request2/Response.php';
+
+/**
+ * Base class for HTTP_Request2 adapters
+ *
+ * HTTP_Request2 class itself only defines methods for aggregating the request
+ * data, all actual work of sending the request to the remote server and
+ * receiving its response is performed by adapters.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 0.5.2
+ */
+abstract class HTTP_Request2_Adapter
+{
+   /**
+    * A list of methods that MUST NOT have a request body, per RFC 2616
+    * @var  array
+    */
+    protected static $bodyDisallowed = array('TRACE');
+
+   /**
+    * Methods having defined semantics for request body
+    *
+    * Content-Length header (indicating that the body follows, section 4.3 of
+    * RFC 2616) will be sent for these methods even if no body was added
+    *
+    * @var  array
+    * @link http://pear.php.net/bugs/bug.php?id=12900
+    * @link http://pear.php.net/bugs/bug.php?id=14740
+    */
+    protected static $bodyRequired = array('POST', 'PUT');
+
+   /**
+    * Request being sent
+    * @var  HTTP_Request2
+    */
+    protected $request;
+
+   /**
+    * Request body
+    * @var  string|resource|HTTP_Request2_MultipartBody
+    * @see  HTTP_Request2::getBody()
+    */
+    protected $requestBody;
+
+   /**
+    * Length of the request body
+    * @var  integer
+    */
+    protected $contentLength;
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    abstract public function sendRequest(HTTP_Request2 $request);
+
+   /**
+    * Calculates length of the request body, adds proper headers
+    *
+    * @param    array   associative array of request headers, this method will
+    *                   add proper 'Content-Length' and 'Content-Type' headers
+    *                   to this array (or remove them if not needed)
+    */
+    protected function calculateRequestLength(&$headers)
+    {
+        $this->requestBody = $this->request->getBody();
+
+        if (is_string($this->requestBody)) {
+            $this->contentLength = strlen($this->requestBody);
+        } elseif (is_resource($this->requestBody)) {
+            $stat = fstat($this->requestBody);
+            $this->contentLength = $stat['size'];
+            rewind($this->requestBody);
+        } else {
+            $this->contentLength = $this->requestBody->getLength();
+            $headers['content-type'] = 'multipart/form-data; boundary=' .
+                                       $this->requestBody->getBoundary();
+            $this->requestBody->rewind();
+        }
+
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength
+        ) {
+            // No body: send a Content-Length header nonetheless (request #12900),
+            // but do that only for methods that require a body (bug #14740)
+            if (in_array($this->request->getMethod(), self::$bodyRequired)) {
+                $headers['content-length'] = 0;
+            } else {
+                unset($headers['content-length']);
+                // if the method doesn't require a body and doesn't have a
+                // body, don't send a Content-Type header. (request #16799)
+                unset($headers['content-type']);
+            }
+        } else {
+            if (empty($headers['content-type'])) {
+                $headers['content-type'] = 'application/x-www-form-urlencoded';
+            }
+            $headers['content-length'] = $this->contentLength;
+        }
+    }
+}
+?>
diff --git a/libs/PEAR.1.9/HTTP/Request2/Adapter/Curl.php b/libs/PEAR.1.9/HTTP/Request2/Adapter/Curl.php
index 4c520d353..3d9833403 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Adapter/Curl.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Adapter/Curl.php
@@ -1,461 +1,461 @@
-<?php
-/**
- * Adapter for HTTP_Request2 wrapping around cURL extension
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Curl.php 291118 2009-11-21 17:58:23Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Adapter for HTTP_Request2 wrapping around cURL extension
- *
- * @category    HTTP
- * @package     HTTP_Request2
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 0.5.2
- */
-class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
-{
-   /**
-    * Mapping of header names to cURL options
-    * @var  array
-    */
-    protected static $headerMap = array(
-        'accept-encoding' => CURLOPT_ENCODING,
-        'cookie'          => CURLOPT_COOKIE,
-        'referer'         => CURLOPT_REFERER,
-        'user-agent'      => CURLOPT_USERAGENT
-    );
-
-   /**
-    * Mapping of SSL context options to cURL options
-    * @var  array
-    */
-    protected static $sslContextMap = array(
-        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
-        'ssl_cafile'      => CURLOPT_CAINFO,
-        'ssl_capath'      => CURLOPT_CAPATH,
-        'ssl_local_cert'  => CURLOPT_SSLCERT,
-        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
-   );
-
-   /**
-    * Response being received
-    * @var  HTTP_Request2_Response
-    */
-    protected $response;
-
-   /**
-    * Whether 'sentHeaders' event was sent to observers
-    * @var  boolean
-    */
-    protected $eventSentHeaders = false;
-
-   /**
-    * Whether 'receivedHeaders' event was sent to observers
-    * @var boolean
-    */
-    protected $eventReceivedHeaders = false;
-
-   /**
-    * Position within request body
-    * @var  integer
-    * @see  callbackReadBody()
-    */
-    protected $position = 0;
-
-   /**
-    * Information about last transfer, as returned by curl_getinfo()
-    * @var  array
-    */
-    protected $lastInfo;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (!extension_loaded('curl')) {
-            throw new HTTP_Request2_Exception('cURL extension not available');
-        }
-
-        $this->request              = $request;
-        $this->response             = null;
-        $this->position             = 0;
-        $this->eventSentHeaders     = false;
-        $this->eventReceivedHeaders = false;
-
-        try {
-            if (false === curl_exec($ch = $this->createCurlHandle())) {
-                $errorMessage = 'Error sending request: #' . curl_errno($ch) .
-                                                       ' ' . curl_error($ch);
-            }
-        } catch (Exception $e) {
-        }
-        $this->lastInfo = curl_getinfo($ch);
-        curl_close($ch);
-
-        $response = $this->response;
-        unset($this->request, $this->requestBody, $this->response);
-
-        if (!empty($e)) {
-            throw $e;
-        } elseif (!empty($errorMessage)) {
-            throw new HTTP_Request2_Exception($errorMessage);
-        }
-
-        if (0 < $this->lastInfo['size_download']) {
-            $request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
-
-   /**
-    * Returns information about last transfer
-    *
-    * @return   array   associative array as returned by curl_getinfo()
-    */
-    public function getInfo()
-    {
-        return $this->lastInfo;
-    }
-
-   /**
-    * Creates a new cURL handle and populates it with data from the request
-    *
-    * @return   resource    a cURL handle, as created by curl_init()
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function createCurlHandle()
-    {
-        $ch = curl_init();
-
-        curl_setopt_array($ch, array(
-            // setup write callbacks
-            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
-            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
-            // buffer size
-            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
-            // connection timeout
-            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
-            // save full outgoing headers, in case someone is interested
-            CURLINFO_HEADER_OUT    => true,
-            // request url
-            CURLOPT_URL            => $this->request->getUrl()->getUrl()
-        ));
-
-        // set up redirects
-        if (!$this->request->getConfig('follow_redirects')) {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-        } else {
-            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
-            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
-            // limit redirects to http(s), works in 5.2.10+
-            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
-                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
-            }
-            // works sometime after 5.3.0, http://bugs.php.net/bug.php?id=49571
-            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR ')) {
-                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
-            }
-        }
-
-        // request timeout
-        if ($timeout = $this->request->getConfig('timeout')) {
-            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
-        }
-
-        // set HTTP version
-        switch ($this->request->getConfig('protocol_version')) {
-            case '1.0':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
-                break;
-            case '1.1':
-                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
-        }
-
-        // set request method
-        switch ($this->request->getMethod()) {
-            case HTTP_Request2::METHOD_GET:
-                curl_setopt($ch, CURLOPT_HTTPGET, true);
-                break;
-            case HTTP_Request2::METHOD_POST:
-                curl_setopt($ch, CURLOPT_POST, true);
-                break;
-            case HTTP_Request2::METHOD_HEAD:
-                curl_setopt($ch, CURLOPT_NOBODY, true);
-                break;
-            default:
-                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
-        }
-
-        // set proxy, if needed
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
-            }
-            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
-            if ($user = $this->request->getConfig('proxy_user')) {
-                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
-                            $this->request->getConfig('proxy_password'));
-                switch ($this->request->getConfig('proxy_auth_scheme')) {
-                    case HTTP_Request2::AUTH_BASIC:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
-                        break;
-                    case HTTP_Request2::AUTH_DIGEST:
-                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
-                }
-            }
-        }
-
-        // set authentication data
-        if ($auth = $this->request->getAuth()) {
-            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
-            switch ($auth['scheme']) {
-                case HTTP_Request2::AUTH_BASIC:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-                    break;
-                case HTTP_Request2::AUTH_DIGEST:
-                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
-            }
-        }
-
-        // set SSL options
-        if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_verify_host' == $name && null !== $value) {
-                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
-                } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
-                    curl_setopt($ch, self::$sslContextMap[$name], $value);
-                }
-            }
-        }
-
-        $headers = $this->request->getHeaders();
-        // make cURL automagically send proper header
-        if (!isset($headers['accept-encoding'])) {
-            $headers['accept-encoding'] = '';
-        }
-
-        // set headers having special cURL keys
-        foreach (self::$headerMap as $name => $option) {
-            if (isset($headers[$name])) {
-                curl_setopt($ch, $option, $headers[$name]);
-                unset($headers[$name]);
-            }
-        }
-
-        $this->calculateRequestLength($headers);
-        if (isset($headers['content-length'])) {
-            $this->workaroundPhpBug47204($ch, $headers);
-        }
-
-        // set headers not having special keys
-        $headersFmt = array();
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersFmt[]  = $canonicalName . ': ' . $value;
-        }
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
-
-        return $ch;
-    }
-
-   /**
-    * Workaround for PHP bug #47204 that prevents rewinding request body
-    *
-    * The workaround consists of reading the entire request body into memory
-    * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
-    * file uploads, use Socket adapter instead.
-    *
-    * @param    resource    cURL handle
-    * @param    array       Request headers
-    */
-    protected function workaroundPhpBug47204($ch, &$headers)
-    {
-        // no redirects, no digest auth -> probably no rewind needed
-        if (!$this->request->getConfig('follow_redirects')
-            && (!($auth = $this->request->getAuth())
-                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
-        ) {
-            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
-
-        // rewind may be needed, read the whole body into memory
-        } else {
-            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
-                $this->requestBody = $this->requestBody->__toString();
-
-            } elseif (is_resource($this->requestBody)) {
-                $fp = $this->requestBody;
-                $this->requestBody = '';
-                while (!feof($fp)) {
-                    $this->requestBody .= fread($fp, 16384);
-                }
-            }
-            // curl hangs up if content-length is present
-            unset($headers['content-length']);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
-        }
-    }
-
-   /**
-    * Callback function called by cURL for reading the request body
-    *
-    * @param    resource    cURL handle
-    * @param    resource    file descriptor (not used)
-    * @param    integer     maximum length of data to return
-    * @return   string      part of the request body, up to $length bytes
-    */
-    protected function callbackReadBody($ch, $fd, $length)
-    {
-        if (!$this->eventSentHeaders) {
-            $this->request->setLastEvent(
-                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-            );
-            $this->eventSentHeaders = true;
-        }
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength || $this->position >= $this->contentLength
-        ) {
-            return '';
-        }
-        if (is_string($this->requestBody)) {
-            $string = substr($this->requestBody, $this->position, $length);
-        } elseif (is_resource($this->requestBody)) {
-            $string = fread($this->requestBody, $length);
-        } else {
-            $string = $this->requestBody->read($length);
-        }
-        $this->request->setLastEvent('sentBodyPart', strlen($string));
-        $this->position += strlen($string);
-        return $string;
-    }
-
-   /**
-    * Callback function called by cURL for saving the response headers
-    *
-    * @param    resource    cURL handle
-    * @param    string      response header (with trailing CRLF)
-    * @return   integer     number of bytes saved
-    * @see      HTTP_Request2_Response::parseHeaderLine()
-    */
-    protected function callbackWriteHeader($ch, $string)
-    {
-        // we may receive a second set of headers if doing e.g. digest auth
-        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
-            // don't bother with 100-Continue responses (bug #15785)
-            if (!$this->eventSentHeaders ||
-                $this->response->getStatus() >= 200
-            ) {
-                $this->request->setLastEvent(
-                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
-                );
-            }
-            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
-            // if body wasn't read by a callback, send event with total body size
-            if ($upload > $this->position) {
-                $this->request->setLastEvent(
-                    'sentBodyPart', $upload - $this->position
-                );
-                $this->position = $upload;
-            }
-            $this->eventSentHeaders = true;
-            // we'll need a new response object
-            if ($this->eventReceivedHeaders) {
-                $this->eventReceivedHeaders = false;
-                $this->response             = null;
-            }
-        }
-        if (empty($this->response)) {
-            $this->response = new HTTP_Request2_Response($string, false);
-        } else {
-            $this->response->parseHeaderLine($string);
-            if ('' == trim($string)) {
-                // don't bother with 100-Continue responses (bug #15785)
-                if (200 <= $this->response->getStatus()) {
-                    $this->request->setLastEvent('receivedHeaders', $this->response);
-                }
-                // for versions lower than 5.2.10, check the redirection URL protocol
-                if ($this->request->getConfig('follow_redirects') && !defined('CURLOPT_REDIR_PROTOCOLS')
-                    && $this->response->isRedirect()
-                ) {
-                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
-                    if ($redirectUrl->isAbsolute()
-                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-                    ) {
-                        return -1;
-                    }
-                }
-                $this->eventReceivedHeaders = true;
-            }
-        }
-        return strlen($string);
-    }
-
-   /**
-    * Callback function called by cURL for saving the response body
-    *
-    * @param    resource    cURL handle (not used)
-    * @param    string      part of the response body
-    * @return   integer     number of bytes saved
-    * @see      HTTP_Request2_Response::appendBody()
-    */
-    protected function callbackWriteBody($ch, $string)
-    {
-        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
-        // response doesn't start with proper HTTP status line (see bug #15716)
-        if (empty($this->response)) {
-            throw new HTTP_Request2_Exception("Malformed response: {$string}");
-        }
-        if ($this->request->getConfig('store_body')) {
-            $this->response->appendBody($string);
-        }
-        $this->request->setLastEvent('receivedBodyPart', $string);
-        return strlen($string);
-    }
-}
-?>
+<?php
+/**
+ * Adapter for HTTP_Request2 wrapping around cURL extension
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Curl.php 291118 2009-11-21 17:58:23Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Adapter for HTTP_Request2 wrapping around cURL extension
+ *
+ * @category    HTTP
+ * @package     HTTP_Request2
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 0.5.2
+ */
+class HTTP_Request2_Adapter_Curl extends HTTP_Request2_Adapter
+{
+   /**
+    * Mapping of header names to cURL options
+    * @var  array
+    */
+    protected static $headerMap = array(
+        'accept-encoding' => CURLOPT_ENCODING,
+        'cookie'          => CURLOPT_COOKIE,
+        'referer'         => CURLOPT_REFERER,
+        'user-agent'      => CURLOPT_USERAGENT
+    );
+
+   /**
+    * Mapping of SSL context options to cURL options
+    * @var  array
+    */
+    protected static $sslContextMap = array(
+        'ssl_verify_peer' => CURLOPT_SSL_VERIFYPEER,
+        'ssl_cafile'      => CURLOPT_CAINFO,
+        'ssl_capath'      => CURLOPT_CAPATH,
+        'ssl_local_cert'  => CURLOPT_SSLCERT,
+        'ssl_passphrase'  => CURLOPT_SSLCERTPASSWD
+   );
+
+   /**
+    * Response being received
+    * @var  HTTP_Request2_Response
+    */
+    protected $response;
+
+   /**
+    * Whether 'sentHeaders' event was sent to observers
+    * @var  boolean
+    */
+    protected $eventSentHeaders = false;
+
+   /**
+    * Whether 'receivedHeaders' event was sent to observers
+    * @var boolean
+    */
+    protected $eventReceivedHeaders = false;
+
+   /**
+    * Position within request body
+    * @var  integer
+    * @see  callbackReadBody()
+    */
+    protected $position = 0;
+
+   /**
+    * Information about last transfer, as returned by curl_getinfo()
+    * @var  array
+    */
+    protected $lastInfo;
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        if (!extension_loaded('curl')) {
+            throw new HTTP_Request2_Exception('cURL extension not available');
+        }
+
+        $this->request              = $request;
+        $this->response             = null;
+        $this->position             = 0;
+        $this->eventSentHeaders     = false;
+        $this->eventReceivedHeaders = false;
+
+        try {
+            if (false === curl_exec($ch = $this->createCurlHandle())) {
+                $errorMessage = 'Error sending request: #' . curl_errno($ch) .
+                                                       ' ' . curl_error($ch);
+            }
+        } catch (Exception $e) {
+        }
+        $this->lastInfo = curl_getinfo($ch);
+        curl_close($ch);
+
+        $response = $this->response;
+        unset($this->request, $this->requestBody, $this->response);
+
+        if (!empty($e)) {
+            throw $e;
+        } elseif (!empty($errorMessage)) {
+            throw new HTTP_Request2_Exception($errorMessage);
+        }
+
+        if (0 < $this->lastInfo['size_download']) {
+            $request->setLastEvent('receivedBody', $response);
+        }
+        return $response;
+    }
+
+   /**
+    * Returns information about last transfer
+    *
+    * @return   array   associative array as returned by curl_getinfo()
+    */
+    public function getInfo()
+    {
+        return $this->lastInfo;
+    }
+
+   /**
+    * Creates a new cURL handle and populates it with data from the request
+    *
+    * @return   resource    a cURL handle, as created by curl_init()
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function createCurlHandle()
+    {
+        $ch = curl_init();
+
+        curl_setopt_array($ch, array(
+            // setup write callbacks
+            CURLOPT_HEADERFUNCTION => array($this, 'callbackWriteHeader'),
+            CURLOPT_WRITEFUNCTION  => array($this, 'callbackWriteBody'),
+            // buffer size
+            CURLOPT_BUFFERSIZE     => $this->request->getConfig('buffer_size'),
+            // connection timeout
+            CURLOPT_CONNECTTIMEOUT => $this->request->getConfig('connect_timeout'),
+            // save full outgoing headers, in case someone is interested
+            CURLINFO_HEADER_OUT    => true,
+            // request url
+            CURLOPT_URL            => $this->request->getUrl()->getUrl()
+        ));
+
+        // set up redirects
+        if (!$this->request->getConfig('follow_redirects')) {
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
+        } else {
+            curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+            curl_setopt($ch, CURLOPT_MAXREDIRS, $this->request->getConfig('max_redirects'));
+            // limit redirects to http(s), works in 5.2.10+
+            if (defined('CURLOPT_REDIR_PROTOCOLS')) {
+                curl_setopt($ch, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS);
+            }
+            // works sometime after 5.3.0, http://bugs.php.net/bug.php?id=49571
+            if ($this->request->getConfig('strict_redirects') && defined('CURLOPT_POSTREDIR ')) {
+                curl_setopt($ch, CURLOPT_POSTREDIR, 3);
+            }
+        }
+
+        // request timeout
+        if ($timeout = $this->request->getConfig('timeout')) {
+            curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
+        }
+
+        // set HTTP version
+        switch ($this->request->getConfig('protocol_version')) {
+            case '1.0':
+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_0);
+                break;
+            case '1.1':
+                curl_setopt($ch, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_1_1);
+        }
+
+        // set request method
+        switch ($this->request->getMethod()) {
+            case HTTP_Request2::METHOD_GET:
+                curl_setopt($ch, CURLOPT_HTTPGET, true);
+                break;
+            case HTTP_Request2::METHOD_POST:
+                curl_setopt($ch, CURLOPT_POST, true);
+                break;
+            case HTTP_Request2::METHOD_HEAD:
+                curl_setopt($ch, CURLOPT_NOBODY, true);
+                break;
+            default:
+                curl_setopt($ch, CURLOPT_CUSTOMREQUEST, $this->request->getMethod());
+        }
+
+        // set proxy, if needed
+        if ($host = $this->request->getConfig('proxy_host')) {
+            if (!($port = $this->request->getConfig('proxy_port'))) {
+                throw new HTTP_Request2_Exception('Proxy port not provided');
+            }
+            curl_setopt($ch, CURLOPT_PROXY, $host . ':' . $port);
+            if ($user = $this->request->getConfig('proxy_user')) {
+                curl_setopt($ch, CURLOPT_PROXYUSERPWD, $user . ':' .
+                            $this->request->getConfig('proxy_password'));
+                switch ($this->request->getConfig('proxy_auth_scheme')) {
+                    case HTTP_Request2::AUTH_BASIC:
+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_BASIC);
+                        break;
+                    case HTTP_Request2::AUTH_DIGEST:
+                        curl_setopt($ch, CURLOPT_PROXYAUTH, CURLAUTH_DIGEST);
+                }
+            }
+        }
+
+        // set authentication data
+        if ($auth = $this->request->getAuth()) {
+            curl_setopt($ch, CURLOPT_USERPWD, $auth['user'] . ':' . $auth['password']);
+            switch ($auth['scheme']) {
+                case HTTP_Request2::AUTH_BASIC:
+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+                    break;
+                case HTTP_Request2::AUTH_DIGEST:
+                    curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST);
+            }
+        }
+
+        // set SSL options
+        if (0 == strcasecmp($this->request->getUrl()->getScheme(), 'https')) {
+            foreach ($this->request->getConfig() as $name => $value) {
+                if ('ssl_verify_host' == $name && null !== $value) {
+                    curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, $value? 2: 0);
+                } elseif (isset(self::$sslContextMap[$name]) && null !== $value) {
+                    curl_setopt($ch, self::$sslContextMap[$name], $value);
+                }
+            }
+        }
+
+        $headers = $this->request->getHeaders();
+        // make cURL automagically send proper header
+        if (!isset($headers['accept-encoding'])) {
+            $headers['accept-encoding'] = '';
+        }
+
+        // set headers having special cURL keys
+        foreach (self::$headerMap as $name => $option) {
+            if (isset($headers[$name])) {
+                curl_setopt($ch, $option, $headers[$name]);
+                unset($headers[$name]);
+            }
+        }
+
+        $this->calculateRequestLength($headers);
+        if (isset($headers['content-length'])) {
+            $this->workaroundPhpBug47204($ch, $headers);
+        }
+
+        // set headers not having special keys
+        $headersFmt = array();
+        foreach ($headers as $name => $value) {
+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+            $headersFmt[]  = $canonicalName . ': ' . $value;
+        }
+        curl_setopt($ch, CURLOPT_HTTPHEADER, $headersFmt);
+
+        return $ch;
+    }
+
+   /**
+    * Workaround for PHP bug #47204 that prevents rewinding request body
+    *
+    * The workaround consists of reading the entire request body into memory
+    * and setting it as CURLOPT_POSTFIELDS, so it isn't recommended for large
+    * file uploads, use Socket adapter instead.
+    *
+    * @param    resource    cURL handle
+    * @param    array       Request headers
+    */
+    protected function workaroundPhpBug47204($ch, &$headers)
+    {
+        // no redirects, no digest auth -> probably no rewind needed
+        if (!$this->request->getConfig('follow_redirects')
+            && (!($auth = $this->request->getAuth())
+                || HTTP_Request2::AUTH_DIGEST != $auth['scheme'])
+        ) {
+            curl_setopt($ch, CURLOPT_READFUNCTION, array($this, 'callbackReadBody'));
+
+        // rewind may be needed, read the whole body into memory
+        } else {
+            if ($this->requestBody instanceof HTTP_Request2_MultipartBody) {
+                $this->requestBody = $this->requestBody->__toString();
+
+            } elseif (is_resource($this->requestBody)) {
+                $fp = $this->requestBody;
+                $this->requestBody = '';
+                while (!feof($fp)) {
+                    $this->requestBody .= fread($fp, 16384);
+                }
+            }
+            // curl hangs up if content-length is present
+            unset($headers['content-length']);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $this->requestBody);
+        }
+    }
+
+   /**
+    * Callback function called by cURL for reading the request body
+    *
+    * @param    resource    cURL handle
+    * @param    resource    file descriptor (not used)
+    * @param    integer     maximum length of data to return
+    * @return   string      part of the request body, up to $length bytes
+    */
+    protected function callbackReadBody($ch, $fd, $length)
+    {
+        if (!$this->eventSentHeaders) {
+            $this->request->setLastEvent(
+                'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
+            );
+            $this->eventSentHeaders = true;
+        }
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength || $this->position >= $this->contentLength
+        ) {
+            return '';
+        }
+        if (is_string($this->requestBody)) {
+            $string = substr($this->requestBody, $this->position, $length);
+        } elseif (is_resource($this->requestBody)) {
+            $string = fread($this->requestBody, $length);
+        } else {
+            $string = $this->requestBody->read($length);
+        }
+        $this->request->setLastEvent('sentBodyPart', strlen($string));
+        $this->position += strlen($string);
+        return $string;
+    }
+
+   /**
+    * Callback function called by cURL for saving the response headers
+    *
+    * @param    resource    cURL handle
+    * @param    string      response header (with trailing CRLF)
+    * @return   integer     number of bytes saved
+    * @see      HTTP_Request2_Response::parseHeaderLine()
+    */
+    protected function callbackWriteHeader($ch, $string)
+    {
+        // we may receive a second set of headers if doing e.g. digest auth
+        if ($this->eventReceivedHeaders || !$this->eventSentHeaders) {
+            // don't bother with 100-Continue responses (bug #15785)
+            if (!$this->eventSentHeaders ||
+                $this->response->getStatus() >= 200
+            ) {
+                $this->request->setLastEvent(
+                    'sentHeaders', curl_getinfo($ch, CURLINFO_HEADER_OUT)
+                );
+            }
+            $upload = curl_getinfo($ch, CURLINFO_SIZE_UPLOAD);
+            // if body wasn't read by a callback, send event with total body size
+            if ($upload > $this->position) {
+                $this->request->setLastEvent(
+                    'sentBodyPart', $upload - $this->position
+                );
+                $this->position = $upload;
+            }
+            $this->eventSentHeaders = true;
+            // we'll need a new response object
+            if ($this->eventReceivedHeaders) {
+                $this->eventReceivedHeaders = false;
+                $this->response             = null;
+            }
+        }
+        if (empty($this->response)) {
+            $this->response = new HTTP_Request2_Response($string, false);
+        } else {
+            $this->response->parseHeaderLine($string);
+            if ('' == trim($string)) {
+                // don't bother with 100-Continue responses (bug #15785)
+                if (200 <= $this->response->getStatus()) {
+                    $this->request->setLastEvent('receivedHeaders', $this->response);
+                }
+                // for versions lower than 5.2.10, check the redirection URL protocol
+                if ($this->request->getConfig('follow_redirects') && !defined('CURLOPT_REDIR_PROTOCOLS')
+                    && $this->response->isRedirect()
+                ) {
+                    $redirectUrl = new Net_URL2($this->response->getHeader('location'));
+                    if ($redirectUrl->isAbsolute()
+                        && !in_array($redirectUrl->getScheme(), array('http', 'https'))
+                    ) {
+                        return -1;
+                    }
+                }
+                $this->eventReceivedHeaders = true;
+            }
+        }
+        return strlen($string);
+    }
+
+   /**
+    * Callback function called by cURL for saving the response body
+    *
+    * @param    resource    cURL handle (not used)
+    * @param    string      part of the response body
+    * @return   integer     number of bytes saved
+    * @see      HTTP_Request2_Response::appendBody()
+    */
+    protected function callbackWriteBody($ch, $string)
+    {
+        // cURL calls WRITEFUNCTION callback without calling HEADERFUNCTION if
+        // response doesn't start with proper HTTP status line (see bug #15716)
+        if (empty($this->response)) {
+            throw new HTTP_Request2_Exception("Malformed response: {$string}");
+        }
+        if ($this->request->getConfig('store_body')) {
+            $this->response->appendBody($string);
+        }
+        $this->request->setLastEvent('receivedBodyPart', $string);
+        return strlen($string);
+    }
+}
+?>
diff --git a/libs/PEAR.1.9/HTTP/Request2/Adapter/Mock.php b/libs/PEAR.1.9/HTTP/Request2/Adapter/Mock.php
index 17e9e08d9..fdedccac0 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Adapter/Mock.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Adapter/Mock.php
@@ -1,171 +1,171 @@
-<?php
-/**
- * Mock adapter intended for testing
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Mock.php 290192 2009-11-03 21:29:32Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Mock adapter intended for testing
- *
- * Can be used to test applications depending on HTTP_Request2 package without
- * actually performing any HTTP requests. This adapter will return responses
- * previously added via addResponse()
- * <code>
- * $mock = new HTTP_Request2_Adapter_Mock();
- * $mock->addResponse("HTTP/1.1 ... ");
- *
- * $request = new HTTP_Request2();
- * $request->setAdapter($mock);
- *
- * // This will return the response set above
- * $response = $req->send();
- * </code>
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.5.2
- */
-class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
-{
-   /**
-    * A queue of responses to be returned by sendRequest()
-    * @var  array
-    */
-    protected $responses = array();
-
-   /**
-    * Returns the next response from the queue built by addResponse()
-    *
-    * If the queue is empty it will return default empty response with status 400,
-    * if an Exception object was added to the queue it will be thrown.
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        if (count($this->responses) > 0) {
-            $response = array_shift($this->responses);
-            if ($response instanceof HTTP_Request2_Response) {
-                return $response;
-            } else {
-                // rethrow the exception
-                $class   = get_class($response);
-                $message = $response->getMessage();
-                $code    = $response->getCode();
-                throw new $class($message, $code);
-            }
-        } else {
-            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
-        }
-    }
-
-   /**
-    * Adds response to the queue
-    *
-    * @param    mixed   either a string, a pointer to an open file,
-    *                   an instance of HTTP_Request2_Response or Exception
-    * @throws   HTTP_Request2_Exception
-    */
-    public function addResponse($response)
-    {
-        if (is_string($response)) {
-            $response = self::createResponseFromString($response);
-        } elseif (is_resource($response)) {
-            $response = self::createResponseFromFile($response);
-        } elseif (!$response instanceof HTTP_Request2_Response &&
-                  !$response instanceof Exception
-        ) {
-            throw new HTTP_Request2_Exception('Parameter is not a valid response');
-        }
-        $this->responses[] = $response;
-    }
-
-   /**
-    * Creates a new HTTP_Request2_Response object from a string
-    *
-    * @param    string
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function createResponseFromString($str)
-    {
-        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
-        $headerLines = explode("\n", $parts[0]);
-        $response    = new HTTP_Request2_Response(array_shift($headerLines));
-        foreach ($headerLines as $headerLine) {
-            $response->parseHeaderLine($headerLine);
-        }
-        $response->parseHeaderLine('');
-        if (isset($parts[1])) {
-            $response->appendBody($parts[1]);
-        }
-        return $response;
-    }
-
-   /**
-    * Creates a new HTTP_Request2_Response object from a file
-    *
-    * @param    resource    file pointer returned by fopen()
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function createResponseFromFile($fp)
-    {
-        $response = new HTTP_Request2_Response(fgets($fp));
-        do {
-            $headerLine = fgets($fp);
-            $response->parseHeaderLine($headerLine);
-        } while ('' != trim($headerLine));
-
-        while (!feof($fp)) {
-            $response->appendBody(fread($fp, 8192));
-        }
-        return $response;
-    }
-}
+<?php
+/**
+ * Mock adapter intended for testing
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Mock.php 290192 2009-11-03 21:29:32Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Mock adapter intended for testing
+ *
+ * Can be used to test applications depending on HTTP_Request2 package without
+ * actually performing any HTTP requests. This adapter will return responses
+ * previously added via addResponse()
+ * <code>
+ * $mock = new HTTP_Request2_Adapter_Mock();
+ * $mock->addResponse("HTTP/1.1 ... ");
+ *
+ * $request = new HTTP_Request2();
+ * $request->setAdapter($mock);
+ *
+ * // This will return the response set above
+ * $response = $req->send();
+ * </code>
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 0.5.2
+ */
+class HTTP_Request2_Adapter_Mock extends HTTP_Request2_Adapter
+{
+   /**
+    * A queue of responses to be returned by sendRequest()
+    * @var  array
+    */
+    protected $responses = array();
+
+   /**
+    * Returns the next response from the queue built by addResponse()
+    *
+    * If the queue is empty it will return default empty response with status 400,
+    * if an Exception object was added to the queue it will be thrown.
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        if (count($this->responses) > 0) {
+            $response = array_shift($this->responses);
+            if ($response instanceof HTTP_Request2_Response) {
+                return $response;
+            } else {
+                // rethrow the exception
+                $class   = get_class($response);
+                $message = $response->getMessage();
+                $code    = $response->getCode();
+                throw new $class($message, $code);
+            }
+        } else {
+            return self::createResponseFromString("HTTP/1.1 400 Bad Request\r\n\r\n");
+        }
+    }
+
+   /**
+    * Adds response to the queue
+    *
+    * @param    mixed   either a string, a pointer to an open file,
+    *                   an instance of HTTP_Request2_Response or Exception
+    * @throws   HTTP_Request2_Exception
+    */
+    public function addResponse($response)
+    {
+        if (is_string($response)) {
+            $response = self::createResponseFromString($response);
+        } elseif (is_resource($response)) {
+            $response = self::createResponseFromFile($response);
+        } elseif (!$response instanceof HTTP_Request2_Response &&
+                  !$response instanceof Exception
+        ) {
+            throw new HTTP_Request2_Exception('Parameter is not a valid response');
+        }
+        $this->responses[] = $response;
+    }
+
+   /**
+    * Creates a new HTTP_Request2_Response object from a string
+    *
+    * @param    string
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public static function createResponseFromString($str)
+    {
+        $parts       = preg_split('!(\r?\n){2}!m', $str, 2);
+        $headerLines = explode("\n", $parts[0]);
+        $response    = new HTTP_Request2_Response(array_shift($headerLines));
+        foreach ($headerLines as $headerLine) {
+            $response->parseHeaderLine($headerLine);
+        }
+        $response->parseHeaderLine('');
+        if (isset($parts[1])) {
+            $response->appendBody($parts[1]);
+        }
+        return $response;
+    }
+
+   /**
+    * Creates a new HTTP_Request2_Response object from a file
+    *
+    * @param    resource    file pointer returned by fopen()
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public static function createResponseFromFile($fp)
+    {
+        $response = new HTTP_Request2_Response(fgets($fp));
+        do {
+            $headerLine = fgets($fp);
+            $response->parseHeaderLine($headerLine);
+        } while ('' != trim($headerLine));
+
+        while (!feof($fp)) {
+            $response->appendBody(fread($fp, 8192));
+        }
+        return $response;
+    }
+}
 ?>
\ No newline at end of file
diff --git a/libs/PEAR.1.9/HTTP/Request2/Adapter/Socket.php b/libs/PEAR.1.9/HTTP/Request2/Adapter/Socket.php
index e7afdbd3f..a9c9ea361 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Adapter/Socket.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Adapter/Socket.php
@@ -1,1046 +1,1046 @@
-<?php
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Socket.php 290921 2009-11-18 17:31:58Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for HTTP_Request2 adapters
- */
-require_once 'HTTP/Request2/Adapter.php';
-
-/**
- * Socket-based adapter for HTTP_Request2
- *
- * This adapter uses only PHP sockets and will work on almost any PHP
- * environment. Code is based on original HTTP_Request PEAR package.
- *
- * @category    HTTP
- * @package     HTTP_Request2
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 0.5.2
- */
-class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
-{
-   /**
-    * Regular expression for 'token' rule from RFC 2616
-    */
-    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
-
-   /**
-    * Regular expression for 'quoted-string' rule from RFC 2616
-    */
-    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
-
-   /**
-    * Connected sockets, needed for Keep-Alive support
-    * @var  array
-    * @see  connect()
-    */
-    protected static $sockets = array();
-
-   /**
-    * Data for digest authentication scheme
-    *
-    * The keys for the array are URL prefixes.
-    *
-    * The values are associative arrays with data (realm, nonce, nonce-count,
-    * opaque...) needed for digest authentication. Stored here to prevent making
-    * duplicate requests to digest-protected resources after we have already
-    * received the challenge.
-    *
-    * @var  array
-    */
-    protected static $challenges = array();
-
-   /**
-    * Connected socket
-    * @var  resource
-    * @see  connect()
-    */
-    protected $socket;
-
-   /**
-    * Challenge used for server digest authentication
-    * @var  array
-    */
-    protected $serverChallenge;
-
-   /**
-    * Challenge used for proxy digest authentication
-    * @var  array
-    */
-    protected $proxyChallenge;
-
-   /**
-    * Sum of start time and global timeout, exception will be thrown if request continues past this time
-    * @var  integer
-    */
-    protected $deadline = null;
-
-   /**
-    * Remaining length of the current chunk, when reading chunked response
-    * @var  integer
-    * @see  readChunked()
-    */
-    protected $chunkLength = 0;
-
-   /**
-    * Remaining amount of redirections to follow
-    *
-    * Starts at 'max_redirects' configuration parameter and is reduced on each
-    * subsequent redirect. An Exception will be thrown once it reaches zero.
-    *
-    * @var  integer
-    */
-    protected $redirectCountdown = null;
-
-   /**
-    * Sends request to the remote server and returns its response
-    *
-    * @param    HTTP_Request2
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    public function sendRequest(HTTP_Request2 $request)
-    {
-        $this->request = $request;
-
-        // Use global request timeout if given, see feature requests #5735, #8964
-        if ($timeout = $request->getConfig('timeout')) {
-            $this->deadline = time() + $timeout;
-        } else {
-            $this->deadline = null;
-        }
-
-        try {
-            $keepAlive = $this->connect();
-            $headers   = $this->prepareHeaders();
-            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // provide request headers to the observer, see request #7633
-            $this->request->setLastEvent('sentHeaders', $headers);
-            $this->writeBody();
-
-            if ($this->deadline && time() > $this->deadline) {
-                throw new HTTP_Request2_Exception(
-                    'Request timed out after ' .
-                    $request->getConfig('timeout') . ' second(s)'
-                );
-            }
-
-            $response = $this->readResponse();
-
-            if (!$this->canKeepAlive($keepAlive, $response)) {
-                $this->disconnect();
-            }
-
-            if ($this->shouldUseProxyDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($this->shouldUseServerDigestAuth($response)) {
-                return $this->sendRequest($request);
-            }
-            if ($authInfo = $response->getHeader('authentication-info')) {
-                $this->updateChallenge($this->serverChallenge, $authInfo);
-            }
-            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
-                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
-            }
-
-        } catch (Exception $e) {
-            $this->disconnect();
-        }
-
-        unset($this->request, $this->requestBody);
-
-        if (!empty($e)) {
-            throw $e;
-        }
-
-        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
-            return $response;
-        } else {
-            return $this->handleRedirect($request, $response);
-        }
-    }
-
-   /**
-    * Connects to the remote server
-    *
-    * @return   bool    whether the connection can be persistent
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function connect()
-    {
-        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
-        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $headers = $this->request->getHeaders();
-        $reqHost = $this->request->getUrl()->getHost();
-        if (!($reqPort = $this->request->getUrl()->getPort())) {
-            $reqPort = $secure? 443: 80;
-        }
-
-        if ($host = $this->request->getConfig('proxy_host')) {
-            if (!($port = $this->request->getConfig('proxy_port'))) {
-                throw new HTTP_Request2_Exception('Proxy port not provided');
-            }
-            $proxy = true;
-        } else {
-            $host  = $reqHost;
-            $port  = $reqPort;
-            $proxy = false;
-        }
-
-        if ($tunnel && !$proxy) {
-            throw new HTTP_Request2_Exception(
-                "Trying to perform CONNECT request without proxy"
-            );
-        }
-        if ($secure && !in_array('ssl', stream_get_transports())) {
-            throw new HTTP_Request2_Exception(
-                'Need OpenSSL support for https:// requests'
-            );
-        }
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
-        // connection token to a proxy server...
-        if ($proxy && !$secure &&
-            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
-        ) {
-            $this->request->setHeader('connection');
-        }
-
-        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
-                      empty($headers['connection'])) ||
-                     (!empty($headers['connection']) &&
-                      'Keep-Alive' == $headers['connection']);
-        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
-
-        $options = array();
-        if ($secure || $tunnel) {
-            foreach ($this->request->getConfig() as $name => $value) {
-                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
-                    if ('ssl_verify_host' == $name) {
-                        if ($value) {
-                            $options['CN_match'] = $reqHost;
-                        }
-                    } else {
-                        $options[substr($name, 4)] = $value;
-                    }
-                }
-            }
-            ksort($options);
-        }
-
-        // Changing SSL context options after connection is established does *not*
-        // work, we need a new connection if options change
-        $remote    = $host . ':' . $port;
-        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
-                     (empty($options)? '': ':' . serialize($options));
-        unset($this->socket);
-
-        // We use persistent connections and have a connected socket?
-        // Ensure that the socket is still connected, see bug #16149
-        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
-            !feof(self::$sockets[$socketKey])
-        ) {
-            $this->socket =& self::$sockets[$socketKey];
-
-        } elseif ($secure && $proxy && !$tunnel) {
-            $this->establishTunnel();
-            $this->request->setLastEvent(
-                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
-            );
-            self::$sockets[$socketKey] =& $this->socket;
-
-        } else {
-            // Set SSL context options if doing HTTPS request or creating a tunnel
-            $context = stream_context_create();
-            foreach ($options as $name => $value) {
-                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
-                    throw new HTTP_Request2_Exception(
-                        "Error setting SSL context option '{$name}'"
-                    );
-                }
-            }
-            $this->socket = @stream_socket_client(
-                $remote, $errno, $errstr,
-                $this->request->getConfig('connect_timeout'),
-                STREAM_CLIENT_CONNECT, $context
-            );
-            if (!$this->socket) {
-                throw new HTTP_Request2_Exception(
-                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
-                );
-            }
-            $this->request->setLastEvent('connect', $remote);
-            self::$sockets[$socketKey] =& $this->socket;
-        }
-        return $keepAlive;
-    }
-
-   /**
-    * Establishes a tunnel to a secure remote server via HTTP CONNECT request
-    *
-    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
-    * sees that we are connected to a proxy server (duh!) rather than the server
-    * that presents its certificate.
-    *
-    * @link     http://tools.ietf.org/html/rfc2817#section-5.2
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function establishTunnel()
-    {
-        $donor   = new self;
-        $connect = new HTTP_Request2(
-            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
-            array_merge($this->request->getConfig(),
-                        array('adapter' => $donor))
-        );
-        $response = $connect->send();
-        // Need any successful (2XX) response
-        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
-            throw new HTTP_Request2_Exception(
-                'Failed to connect via HTTPS proxy. Proxy response: ' .
-                $response->getStatus() . ' ' . $response->getReasonPhrase()
-            );
-        }
-        $this->socket = $donor->socket;
-
-        $modes = array(
-            STREAM_CRYPTO_METHOD_TLS_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
-            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
-        );
-
-        foreach ($modes as $mode) {
-            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
-                return;
-            }
-        }
-        throw new HTTP_Request2_Exception(
-            'Failed to enable secure connection when connecting through proxy'
-        );
-    }
-
-   /**
-    * Checks whether current connection may be reused or should be closed
-    *
-    * @param    boolean                 whether connection could be persistent
-    *                                   in the first place
-    * @param    HTTP_Request2_Response  response object to check
-    * @return   boolean
-    */
-    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
-    {
-        // Do not close socket on successful CONNECT request
-        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-            200 <= $response->getStatus() && 300 > $response->getStatus()
-        ) {
-            return true;
-        }
-
-        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
-                       null !== $response->getHeader('content-length');
-        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
-                       (null === $response->getHeader('connection') &&
-                        '1.1' == $response->getVersion());
-        return $requestKeepAlive && $lengthKnown && $persistent;
-    }
-
-   /**
-    * Disconnects from the remote server
-    */
-    protected function disconnect()
-    {
-        if (is_resource($this->socket)) {
-            fclose($this->socket);
-            $this->socket = null;
-            $this->request->setLastEvent('disconnect');
-        }
-    }
-
-   /**
-    * Handles HTTP redirection
-    *
-    * This method will throw an Exception if redirect to a non-HTTP(S) location
-    * is attempted, also if number of redirects performed already is equal to
-    * 'max_redirects' configuration parameter.
-    *
-    * @param    HTTP_Request2               Original request
-    * @param    HTTP_Request2_Response      Response containing redirect
-    * @return   HTTP_Request2_Response      Response from a new location
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function handleRedirect(HTTP_Request2 $request,
-                                      HTTP_Request2_Response $response)
-    {
-        if (is_null($this->redirectCountdown)) {
-            $this->redirectCountdown = $request->getConfig('max_redirects');
-        }
-        if (0 == $this->redirectCountdown) {
-            // Copying cURL behaviour
-            throw new HTTP_Request2_Exception(
-                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
-            );
-        }
-        $redirectUrl = new Net_URL2(
-            $response->getHeader('location'),
-            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
-        );
-        // refuse non-HTTP redirect
-        if ($redirectUrl->isAbsolute()
-            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
-        ) {
-            throw new HTTP_Request2_Exception(
-                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
-            );
-        }
-        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
-        // but in practice it is often not
-        if (!$redirectUrl->isAbsolute()) {
-            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
-        }
-        $redirect = clone $request;
-        $redirect->setUrl($redirectUrl);
-        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
-             && in_array($response->getStatus(), array(301, 302)))
-        ) {
-            $redirect->setMethod(HTTP_Request2::METHOD_GET);
-            $redirect->setBody('');
-        }
-
-        if (0 < $this->redirectCountdown) {
-            $this->redirectCountdown--;
-        }
-        return $this->sendRequest($redirect);
-    }
-
-   /**
-    * Checks whether another request should be performed with server digest auth
-    *
-    * Several conditions should be satisfied for it to return true:
-    *   - response status should be 401
-    *   - auth credentials should be set in the request object
-    *   - response should contain WWW-Authenticate header with digest challenge
-    *   - there is either no challenge stored for this URL or new challenge
-    *     contains stale=true parameter (in other case we probably just failed
-    *     due to invalid username / password)
-    *
-    * The method stores challenge values in $challenges static property
-    *
-    * @param    HTTP_Request2_Response  response to check
-    * @return   boolean whether another request should be performed
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
-    {
-        // no sense repeating a request if we don't have credentials
-        if (401 != $response->getStatus() || !$this->request->getAuth()) {
-            return false;
-        }
-        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
-            return false;
-        }
-
-        $url    = $this->request->getUrl();
-        $scheme = $url->getScheme();
-        $host   = $scheme . '://' . $url->getHost();
-        if ($port = $url->getPort()) {
-            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
-                (0 == strcasecmp($scheme, 'https') && 443 != $port)
-            ) {
-                $host .= ':' . $port;
-            }
-        }
-
-        if (!empty($challenge['domain'])) {
-            $prefixes = array();
-            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
-                // don't bother with different servers
-                if ('/' == substr($prefix, 0, 1)) {
-                    $prefixes[] = $host . $prefix;
-                }
-            }
-        }
-        if (empty($prefixes)) {
-            $prefixes = array($host . '/');
-        }
-
-        $ret = true;
-        foreach ($prefixes as $prefix) {
-            if (!empty(self::$challenges[$prefix]) &&
-                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-            ) {
-                // probably credentials are invalid
-                $ret = false;
-            }
-            self::$challenges[$prefix] =& $challenge;
-        }
-        return $ret;
-    }
-
-   /**
-    * Checks whether another request should be performed with proxy digest auth
-    *
-    * Several conditions should be satisfied for it to return true:
-    *   - response status should be 407
-    *   - proxy auth credentials should be set in the request object
-    *   - response should contain Proxy-Authenticate header with digest challenge
-    *   - there is either no challenge stored for this proxy or new challenge
-    *     contains stale=true parameter (in other case we probably just failed
-    *     due to invalid username / password)
-    *
-    * The method stores challenge values in $challenges static property
-    *
-    * @param    HTTP_Request2_Response  response to check
-    * @return   boolean whether another request should be performed
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
-    {
-        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
-            return false;
-        }
-        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
-            return false;
-        }
-
-        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
-               ':' . $this->request->getConfig('proxy_port');
-
-        if (!empty(self::$challenges[$key]) &&
-            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
-        ) {
-            $ret = false;
-        } else {
-            $ret = true;
-        }
-        self::$challenges[$key] = $challenge;
-        return $ret;
-    }
-
-   /**
-    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
-    *
-    * There is a problem with implementation of RFC 2617: several of the parameters
-    * are defined as quoted-string there and thus may contain backslash escaped
-    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
-    * just value of quoted-string X without surrounding quotes, it doesn't speak
-    * about removing backslash escaping.
-    *
-    * Now realm parameter is user-defined and human-readable, strange things
-    * happen when it contains quotes:
-    *   - Apache allows quotes in realm, but apparently uses realm value without
-    *     backslashes for digest computation
-    *   - Squid allows (manually escaped) quotes there, but it is impossible to
-    *     authorize with either escaped or unescaped quotes used in digest,
-    *     probably it can't parse the response (?)
-    *   - Both IE and Firefox display realm value with backslashes in
-    *     the password popup and apparently use the same value for digest
-    *
-    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
-    * quoted-string handling, unfortunately that means failure to authorize
-    * sometimes
-    *
-    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
-    * @return   mixed   associative array with challenge parameters, false if
-    *                   no challenge is present in header value
-    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
-    */
-    protected function parseDigestChallenge($headerValue)
-    {
-        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
-        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
-        if (!preg_match($challenge, $headerValue, $matches)) {
-            return false;
-        }
-
-        preg_match_all('!' . $authParam . '!', $matches[0], $params);
-        $paramsAry   = array();
-        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
-                             'algorithm', 'qop');
-        for ($i = 0; $i < count($params[0]); $i++) {
-            // section 3.2.1: Any unrecognized directive MUST be ignored.
-            if (in_array($params[1][$i], $knownParams)) {
-                if ('"' == substr($params[2][$i], 0, 1)) {
-                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-                } else {
-                    $paramsAry[$params[1][$i]] = $params[2][$i];
-                }
-            }
-        }
-        // we only support qop=auth
-        if (!empty($paramsAry['qop']) &&
-            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
-        ) {
-            throw new HTTP_Request2_Exception(
-                "Only 'auth' qop is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['qop']}'"
-            );
-        }
-        // we only support algorithm=MD5
-        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
-            throw new HTTP_Request2_Exception(
-                "Only 'MD5' algorithm is currently supported in digest authentication, " .
-                "server requested '{$paramsAry['algorithm']}'"
-            );
-        }
-
-        return $paramsAry;
-    }
-
-   /**
-    * Parses [Proxy-]Authentication-Info header value and updates challenge
-    *
-    * @param    array   challenge to update
-    * @param    string  value of [Proxy-]Authentication-Info header
-    * @todo     validate server rspauth response
-    */
-    protected function updateChallenge(&$challenge, $headerValue)
-    {
-        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
-                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
-        $paramsAry   = array();
-
-        preg_match_all($authParam, $headerValue, $params);
-        for ($i = 0; $i < count($params[0]); $i++) {
-            if ('"' == substr($params[2][$i], 0, 1)) {
-                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
-            } else {
-                $paramsAry[$params[1][$i]] = $params[2][$i];
-            }
-        }
-        // for now, just update the nonce value
-        if (!empty($paramsAry['nextnonce'])) {
-            $challenge['nonce'] = $paramsAry['nextnonce'];
-            $challenge['nc']    = 1;
-        }
-    }
-
-   /**
-    * Creates a value for [Proxy-]Authorization header when using digest authentication
-    *
-    * @param    string  user name
-    * @param    string  password
-    * @param    string  request URL
-    * @param    array   digest challenge parameters
-    * @return   string  value of [Proxy-]Authorization request header
-    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
-    */
-    protected function createDigestResponse($user, $password, $url, &$challenge)
-    {
-        if (false !== ($q = strpos($url, '?')) &&
-            $this->request->getConfig('digest_compat_ie')
-        ) {
-            $url = substr($url, 0, $q);
-        }
-
-        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
-        $a2 = md5($this->request->getMethod() . ':' . $url);
-
-        if (empty($challenge['qop'])) {
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
-        } else {
-            $challenge['cnonce'] = 'Req2.' . rand();
-            if (empty($challenge['nc'])) {
-                $challenge['nc'] = 1;
-            }
-            $nc     = sprintf('%08x', $challenge['nc']++);
-            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
-                          $challenge['cnonce'] . ':auth:' . $a2);
-        }
-        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
-               'realm="' . $challenge['realm'] . '", ' .
-               'nonce="' . $challenge['nonce'] . '", ' .
-               'uri="' . $url . '", ' .
-               'response="' . $digest . '"' .
-               (!empty($challenge['opaque'])?
-                ', opaque="' . $challenge['opaque'] . '"':
-                '') .
-               (!empty($challenge['qop'])?
-                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
-                '');
-    }
-
-   /**
-    * Adds 'Authorization' header (if needed) to request headers array
-    *
-    * @param    array   request headers
-    * @param    string  request host (needed for digest authentication)
-    * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
-    {
-        if (!($auth = $this->request->getAuth())) {
-            return;
-        }
-        switch ($auth['scheme']) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['authorization'] =
-                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->serverChallenge);
-                $fullUrl = ('/' == $requestUrl[0])?
-                           $this->request->getUrl()->getScheme() . '://' .
-                            $requestHost . $requestUrl:
-                           $requestUrl;
-                foreach (array_keys(self::$challenges) as $key) {
-                    if ($key == substr($fullUrl, 0, strlen($key))) {
-                        $headers['authorization'] = $this->createDigestResponse(
-                            $auth['user'], $auth['password'],
-                            $requestUrl, self::$challenges[$key]
-                        );
-                        $this->serverChallenge =& self::$challenges[$key];
-                        break;
-                    }
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
-                );
-        }
-    }
-
-   /**
-    * Adds 'Proxy-Authorization' header (if needed) to request headers array
-    *
-    * @param    array   request headers
-    * @param    string  request URL (needed for digest authentication)
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
-    {
-        if (!$this->request->getConfig('proxy_host') ||
-            !($user = $this->request->getConfig('proxy_user')) ||
-            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
-             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
-        ) {
-            return;
-        }
-
-        $password = $this->request->getConfig('proxy_password');
-        switch ($this->request->getConfig('proxy_auth_scheme')) {
-            case HTTP_Request2::AUTH_BASIC:
-                $headers['proxy-authorization'] =
-                    'Basic ' . base64_encode($user . ':' . $password);
-                break;
-
-            case HTTP_Request2::AUTH_DIGEST:
-                unset($this->proxyChallenge);
-                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
-                            ':' . $this->request->getConfig('proxy_port');
-                if (!empty(self::$challenges[$proxyUrl])) {
-                    $headers['proxy-authorization'] = $this->createDigestResponse(
-                        $user, $password,
-                        $requestUrl, self::$challenges[$proxyUrl]
-                    );
-                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
-                }
-                break;
-
-            default:
-                throw new HTTP_Request2_Exception(
-                    "Unknown HTTP authentication scheme '" .
-                    $this->request->getConfig('proxy_auth_scheme') . "'"
-                );
-        }
-    }
-
-
-   /**
-    * Creates the string with the Request-Line and request headers
-    *
-    * @return   string
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function prepareHeaders()
-    {
-        $headers = $this->request->getHeaders();
-        $url     = $this->request->getUrl();
-        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
-        $host    = $url->getHost();
-
-        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
-        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
-            $host .= ':' . (empty($port)? $defaultPort: $port);
-        }
-        // Do not overwrite explicitly set 'Host' header, see bug #16146
-        if (!isset($headers['host'])) {
-            $headers['host'] = $host;
-        }
-
-        if ($connect) {
-            $requestUrl = $host;
-
-        } else {
-            if (!$this->request->getConfig('proxy_host') ||
-                0 == strcasecmp($url->getScheme(), 'https')
-            ) {
-                $requestUrl = '';
-            } else {
-                $requestUrl = $url->getScheme() . '://' . $host;
-            }
-            $path        = $url->getPath();
-            $query       = $url->getQuery();
-            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
-        }
-
-        if ('1.1' == $this->request->getConfig('protocol_version') &&
-            extension_loaded('zlib') && !isset($headers['accept-encoding'])
-        ) {
-            $headers['accept-encoding'] = 'gzip, deflate';
-        }
-
-        $this->addAuthorizationHeader($headers, $host, $requestUrl);
-        $this->addProxyAuthorizationHeader($headers, $requestUrl);
-        $this->calculateRequestLength($headers);
-
-        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
-                      $this->request->getConfig('protocol_version') . "\r\n";
-        foreach ($headers as $name => $value) {
-            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
-        }
-        return $headersStr . "\r\n";
-    }
-
-   /**
-    * Sends the request body
-    *
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function writeBody()
-    {
-        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
-            0 == $this->contentLength
-        ) {
-            return;
-        }
-
-        $position   = 0;
-        $bufferSize = $this->request->getConfig('buffer_size');
-        while ($position < $this->contentLength) {
-            if (is_string($this->requestBody)) {
-                $str = substr($this->requestBody, $position, $bufferSize);
-            } elseif (is_resource($this->requestBody)) {
-                $str = fread($this->requestBody, $bufferSize);
-            } else {
-                $str = $this->requestBody->read($bufferSize);
-            }
-            if (false === @fwrite($this->socket, $str, strlen($str))) {
-                throw new HTTP_Request2_Exception('Error writing request');
-            }
-            // Provide the length of written string to the observer, request #7630
-            $this->request->setLastEvent('sentBodyPart', strlen($str));
-            $position += strlen($str);
-        }
-    }
-
-   /**
-    * Reads the remote server's response
-    *
-    * @return   HTTP_Request2_Response
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function readResponse()
-    {
-        $bufferSize = $this->request->getConfig('buffer_size');
-
-        do {
-            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
-            do {
-                $headerLine = $this->readLine($bufferSize);
-                $response->parseHeaderLine($headerLine);
-            } while ('' != $headerLine);
-        } while (in_array($response->getStatus(), array(100, 101)));
-
-        $this->request->setLastEvent('receivedHeaders', $response);
-
-        // No body possible in such responses
-        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
-            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
-             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
-            in_array($response->getStatus(), array(204, 304))
-        ) {
-            return $response;
-        }
-
-        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
-        $length  = $response->getHeader('content-length');
-        $hasBody = false;
-        if ($chunked || null === $length || 0 < intval($length)) {
-            // RFC 2616, section 4.4:
-            // 3. ... If a message is received with both a
-            // Transfer-Encoding header field and a Content-Length header field,
-            // the latter MUST be ignored.
-            $toRead = ($chunked || null === $length)? null: $length;
-            $this->chunkLength = 0;
-
-            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
-                if ($chunked) {
-                    $data = $this->readChunked($bufferSize);
-                } elseif (is_null($toRead)) {
-                    $data = $this->fread($bufferSize);
-                } else {
-                    $data    = $this->fread(min($toRead, $bufferSize));
-                    $toRead -= strlen($data);
-                }
-                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
-                    break;
-                }
-
-                $hasBody = true;
-                if ($this->request->getConfig('store_body')) {
-                    $response->appendBody($data);
-                }
-                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
-                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
-                } else {
-                    $this->request->setLastEvent('receivedBodyPart', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            $this->request->setLastEvent('receivedBody', $response);
-        }
-        return $response;
-    }
-
-   /**
-    * Reads until either the end of the socket or a newline, whichever comes first
-    *
-    * Strips the trailing newline from the returned data, handles global
-    * request timeout. Method idea borrowed from Net_Socket PEAR package.
-    *
-    * @param    int     buffer size to use for reading
-    * @return   Available data up to the newline (not including newline)
-    * @throws   HTTP_Request2_Exception     In case of timeout
-    */
-    protected function readLine($bufferSize)
-    {
-        $line = '';
-        while (!feof($this->socket)) {
-            if ($this->deadline) {
-                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-            }
-            $line .= @fgets($this->socket, $bufferSize);
-            $info  = stream_get_meta_data($this->socket);
-            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-                $reason = $this->deadline
-                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                          : 'due to default_socket_timeout php.ini setting';
-                throw new HTTP_Request2_Exception("Request timed out {$reason}");
-            }
-            if (substr($line, -1) == "\n") {
-                return rtrim($line, "\r\n");
-            }
-        }
-        return $line;
-    }
-
-   /**
-    * Wrapper around fread(), handles global request timeout
-    *
-    * @param    int     Reads up to this number of bytes
-    * @return   Data read from socket
-    * @throws   HTTP_Request2_Exception     In case of timeout
-    */
-    protected function fread($length)
-    {
-        if ($this->deadline) {
-            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
-        }
-        $data = fread($this->socket, $length);
-        $info = stream_get_meta_data($this->socket);
-        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
-            $reason = $this->deadline
-                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
-                      : 'due to default_socket_timeout php.ini setting';
-            throw new HTTP_Request2_Exception("Request timed out {$reason}");
-        }
-        return $data;
-    }
-
-   /**
-    * Reads a part of response body encoded with chunked Transfer-Encoding
-    *
-    * @param    int     buffer size to use for reading
-    * @return   string
-    * @throws   HTTP_Request2_Exception
-    */
-    protected function readChunked($bufferSize)
-    {
-        // at start of the next chunk?
-        if (0 == $this->chunkLength) {
-            $line = $this->readLine($bufferSize);
-            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                throw new HTTP_Request2_Exception(
-                    "Cannot decode chunked response, invalid chunk length '{$line}'"
-                );
-            } else {
-                $this->chunkLength = hexdec($matches[1]);
-                // Chunk with zero length indicates the end
-                if (0 == $this->chunkLength) {
-                    $this->readLine($bufferSize);
-                    return '';
-                }
-            }
-        }
-        $data = $this->fread(min($this->chunkLength, $bufferSize));
-        $this->chunkLength -= strlen($data);
-        if (0 == $this->chunkLength) {
-            $this->readLine($bufferSize); // Trailing CRLF
-        }
-        return $data;
-    }
-}
-
+<?php
+/**
+ * Socket-based adapter for HTTP_Request2
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Socket.php 290921 2009-11-18 17:31:58Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for HTTP_Request2 adapters
+ */
+require_once 'HTTP/Request2/Adapter.php';
+
+/**
+ * Socket-based adapter for HTTP_Request2
+ *
+ * This adapter uses only PHP sockets and will work on almost any PHP
+ * environment. Code is based on original HTTP_Request PEAR package.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request2
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 0.5.2
+ */
+class HTTP_Request2_Adapter_Socket extends HTTP_Request2_Adapter
+{
+   /**
+    * Regular expression for 'token' rule from RFC 2616
+    */
+    const REGEXP_TOKEN = '[^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+';
+
+   /**
+    * Regular expression for 'quoted-string' rule from RFC 2616
+    */
+    const REGEXP_QUOTED_STRING = '"(?:\\\\.|[^\\\\"])*"';
+
+   /**
+    * Connected sockets, needed for Keep-Alive support
+    * @var  array
+    * @see  connect()
+    */
+    protected static $sockets = array();
+
+   /**
+    * Data for digest authentication scheme
+    *
+    * The keys for the array are URL prefixes.
+    *
+    * The values are associative arrays with data (realm, nonce, nonce-count,
+    * opaque...) needed for digest authentication. Stored here to prevent making
+    * duplicate requests to digest-protected resources after we have already
+    * received the challenge.
+    *
+    * @var  array
+    */
+    protected static $challenges = array();
+
+   /**
+    * Connected socket
+    * @var  resource
+    * @see  connect()
+    */
+    protected $socket;
+
+   /**
+    * Challenge used for server digest authentication
+    * @var  array
+    */
+    protected $serverChallenge;
+
+   /**
+    * Challenge used for proxy digest authentication
+    * @var  array
+    */
+    protected $proxyChallenge;
+
+   /**
+    * Sum of start time and global timeout, exception will be thrown if request continues past this time
+    * @var  integer
+    */
+    protected $deadline = null;
+
+   /**
+    * Remaining length of the current chunk, when reading chunked response
+    * @var  integer
+    * @see  readChunked()
+    */
+    protected $chunkLength = 0;
+
+   /**
+    * Remaining amount of redirections to follow
+    *
+    * Starts at 'max_redirects' configuration parameter and is reduced on each
+    * subsequent redirect. An Exception will be thrown once it reaches zero.
+    *
+    * @var  integer
+    */
+    protected $redirectCountdown = null;
+
+   /**
+    * Sends request to the remote server and returns its response
+    *
+    * @param    HTTP_Request2
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    public function sendRequest(HTTP_Request2 $request)
+    {
+        $this->request = $request;
+
+        // Use global request timeout if given, see feature requests #5735, #8964
+        if ($timeout = $request->getConfig('timeout')) {
+            $this->deadline = time() + $timeout;
+        } else {
+            $this->deadline = null;
+        }
+
+        try {
+            $keepAlive = $this->connect();
+            $headers   = $this->prepareHeaders();
+            if (false === @fwrite($this->socket, $headers, strlen($headers))) {
+                throw new HTTP_Request2_Exception('Error writing request');
+            }
+            // provide request headers to the observer, see request #7633
+            $this->request->setLastEvent('sentHeaders', $headers);
+            $this->writeBody();
+
+            if ($this->deadline && time() > $this->deadline) {
+                throw new HTTP_Request2_Exception(
+                    'Request timed out after ' .
+                    $request->getConfig('timeout') . ' second(s)'
+                );
+            }
+
+            $response = $this->readResponse();
+
+            if (!$this->canKeepAlive($keepAlive, $response)) {
+                $this->disconnect();
+            }
+
+            if ($this->shouldUseProxyDigestAuth($response)) {
+                return $this->sendRequest($request);
+            }
+            if ($this->shouldUseServerDigestAuth($response)) {
+                return $this->sendRequest($request);
+            }
+            if ($authInfo = $response->getHeader('authentication-info')) {
+                $this->updateChallenge($this->serverChallenge, $authInfo);
+            }
+            if ($proxyInfo = $response->getHeader('proxy-authentication-info')) {
+                $this->updateChallenge($this->proxyChallenge, $proxyInfo);
+            }
+
+        } catch (Exception $e) {
+            $this->disconnect();
+        }
+
+        unset($this->request, $this->requestBody);
+
+        if (!empty($e)) {
+            throw $e;
+        }
+
+        if (!$request->getConfig('follow_redirects') || !$response->isRedirect()) {
+            return $response;
+        } else {
+            return $this->handleRedirect($request, $response);
+        }
+    }
+
+   /**
+    * Connects to the remote server
+    *
+    * @return   bool    whether the connection can be persistent
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function connect()
+    {
+        $secure  = 0 == strcasecmp($this->request->getUrl()->getScheme(), 'https');
+        $tunnel  = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+        $headers = $this->request->getHeaders();
+        $reqHost = $this->request->getUrl()->getHost();
+        if (!($reqPort = $this->request->getUrl()->getPort())) {
+            $reqPort = $secure? 443: 80;
+        }
+
+        if ($host = $this->request->getConfig('proxy_host')) {
+            if (!($port = $this->request->getConfig('proxy_port'))) {
+                throw new HTTP_Request2_Exception('Proxy port not provided');
+            }
+            $proxy = true;
+        } else {
+            $host  = $reqHost;
+            $port  = $reqPort;
+            $proxy = false;
+        }
+
+        if ($tunnel && !$proxy) {
+            throw new HTTP_Request2_Exception(
+                "Trying to perform CONNECT request without proxy"
+            );
+        }
+        if ($secure && !in_array('ssl', stream_get_transports())) {
+            throw new HTTP_Request2_Exception(
+                'Need OpenSSL support for https:// requests'
+            );
+        }
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive
+        // connection token to a proxy server...
+        if ($proxy && !$secure &&
+            !empty($headers['connection']) && 'Keep-Alive' == $headers['connection']
+        ) {
+            $this->request->setHeader('connection');
+        }
+
+        $keepAlive = ('1.1' == $this->request->getConfig('protocol_version') &&
+                      empty($headers['connection'])) ||
+                     (!empty($headers['connection']) &&
+                      'Keep-Alive' == $headers['connection']);
+        $host = ((!$secure || $proxy)? 'tcp://': 'ssl://') . $host;
+
+        $options = array();
+        if ($secure || $tunnel) {
+            foreach ($this->request->getConfig() as $name => $value) {
+                if ('ssl_' == substr($name, 0, 4) && null !== $value) {
+                    if ('ssl_verify_host' == $name) {
+                        if ($value) {
+                            $options['CN_match'] = $reqHost;
+                        }
+                    } else {
+                        $options[substr($name, 4)] = $value;
+                    }
+                }
+            }
+            ksort($options);
+        }
+
+        // Changing SSL context options after connection is established does *not*
+        // work, we need a new connection if options change
+        $remote    = $host . ':' . $port;
+        $socketKey = $remote . (($secure && $proxy)? "->{$reqHost}:{$reqPort}": '') .
+                     (empty($options)? '': ':' . serialize($options));
+        unset($this->socket);
+
+        // We use persistent connections and have a connected socket?
+        // Ensure that the socket is still connected, see bug #16149
+        if ($keepAlive && !empty(self::$sockets[$socketKey]) &&
+            !feof(self::$sockets[$socketKey])
+        ) {
+            $this->socket =& self::$sockets[$socketKey];
+
+        } elseif ($secure && $proxy && !$tunnel) {
+            $this->establishTunnel();
+            $this->request->setLastEvent(
+                'connect', "ssl://{$reqHost}:{$reqPort} via {$host}:{$port}"
+            );
+            self::$sockets[$socketKey] =& $this->socket;
+
+        } else {
+            // Set SSL context options if doing HTTPS request or creating a tunnel
+            $context = stream_context_create();
+            foreach ($options as $name => $value) {
+                if (!stream_context_set_option($context, 'ssl', $name, $value)) {
+                    throw new HTTP_Request2_Exception(
+                        "Error setting SSL context option '{$name}'"
+                    );
+                }
+            }
+            $this->socket = @stream_socket_client(
+                $remote, $errno, $errstr,
+                $this->request->getConfig('connect_timeout'),
+                STREAM_CLIENT_CONNECT, $context
+            );
+            if (!$this->socket) {
+                throw new HTTP_Request2_Exception(
+                    "Unable to connect to {$remote}. Error #{$errno}: {$errstr}"
+                );
+            }
+            $this->request->setLastEvent('connect', $remote);
+            self::$sockets[$socketKey] =& $this->socket;
+        }
+        return $keepAlive;
+    }
+
+   /**
+    * Establishes a tunnel to a secure remote server via HTTP CONNECT request
+    *
+    * This method will fail if 'ssl_verify_peer' is enabled. Probably because PHP
+    * sees that we are connected to a proxy server (duh!) rather than the server
+    * that presents its certificate.
+    *
+    * @link     http://tools.ietf.org/html/rfc2817#section-5.2
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function establishTunnel()
+    {
+        $donor   = new self;
+        $connect = new HTTP_Request2(
+            $this->request->getUrl(), HTTP_Request2::METHOD_CONNECT,
+            array_merge($this->request->getConfig(),
+                        array('adapter' => $donor))
+        );
+        $response = $connect->send();
+        // Need any successful (2XX) response
+        if (200 > $response->getStatus() || 300 <= $response->getStatus()) {
+            throw new HTTP_Request2_Exception(
+                'Failed to connect via HTTPS proxy. Proxy response: ' .
+                $response->getStatus() . ' ' . $response->getReasonPhrase()
+            );
+        }
+        $this->socket = $donor->socket;
+
+        $modes = array(
+            STREAM_CRYPTO_METHOD_TLS_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv3_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv23_CLIENT,
+            STREAM_CRYPTO_METHOD_SSLv2_CLIENT
+        );
+
+        foreach ($modes as $mode) {
+            if (stream_socket_enable_crypto($this->socket, true, $mode)) {
+                return;
+            }
+        }
+        throw new HTTP_Request2_Exception(
+            'Failed to enable secure connection when connecting through proxy'
+        );
+    }
+
+   /**
+    * Checks whether current connection may be reused or should be closed
+    *
+    * @param    boolean                 whether connection could be persistent
+    *                                   in the first place
+    * @param    HTTP_Request2_Response  response object to check
+    * @return   boolean
+    */
+    protected function canKeepAlive($requestKeepAlive, HTTP_Request2_Response $response)
+    {
+        // Do not close socket on successful CONNECT request
+        if (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+            200 <= $response->getStatus() && 300 > $response->getStatus()
+        ) {
+            return true;
+        }
+
+        $lengthKnown = 'chunked' == strtolower($response->getHeader('transfer-encoding')) ||
+                       null !== $response->getHeader('content-length');
+        $persistent  = 'keep-alive' == strtolower($response->getHeader('connection')) ||
+                       (null === $response->getHeader('connection') &&
+                        '1.1' == $response->getVersion());
+        return $requestKeepAlive && $lengthKnown && $persistent;
+    }
+
+   /**
+    * Disconnects from the remote server
+    */
+    protected function disconnect()
+    {
+        if (is_resource($this->socket)) {
+            fclose($this->socket);
+            $this->socket = null;
+            $this->request->setLastEvent('disconnect');
+        }
+    }
+
+   /**
+    * Handles HTTP redirection
+    *
+    * This method will throw an Exception if redirect to a non-HTTP(S) location
+    * is attempted, also if number of redirects performed already is equal to
+    * 'max_redirects' configuration parameter.
+    *
+    * @param    HTTP_Request2               Original request
+    * @param    HTTP_Request2_Response      Response containing redirect
+    * @return   HTTP_Request2_Response      Response from a new location
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function handleRedirect(HTTP_Request2 $request,
+                                      HTTP_Request2_Response $response)
+    {
+        if (is_null($this->redirectCountdown)) {
+            $this->redirectCountdown = $request->getConfig('max_redirects');
+        }
+        if (0 == $this->redirectCountdown) {
+            // Copying cURL behaviour
+            throw new HTTP_Request2_Exception(
+                'Maximum (' . $request->getConfig('max_redirects') . ') redirects followed'
+            );
+        }
+        $redirectUrl = new Net_URL2(
+            $response->getHeader('location'),
+            array(Net_URL2::OPTION_USE_BRACKETS => $request->getConfig('use_brackets'))
+        );
+        // refuse non-HTTP redirect
+        if ($redirectUrl->isAbsolute()
+            && !in_array($redirectUrl->getScheme(), array('http', 'https'))
+        ) {
+            throw new HTTP_Request2_Exception(
+                'Refusing to redirect to a non-HTTP URL ' . $redirectUrl->__toString()
+            );
+        }
+        // Theoretically URL should be absolute (see http://tools.ietf.org/html/rfc2616#section-14.30),
+        // but in practice it is often not
+        if (!$redirectUrl->isAbsolute()) {
+            $redirectUrl = $request->getUrl()->resolve($redirectUrl);
+        }
+        $redirect = clone $request;
+        $redirect->setUrl($redirectUrl);
+        if (303 == $response->getStatus() || (!$request->getConfig('strict_redirects')
+             && in_array($response->getStatus(), array(301, 302)))
+        ) {
+            $redirect->setMethod(HTTP_Request2::METHOD_GET);
+            $redirect->setBody('');
+        }
+
+        if (0 < $this->redirectCountdown) {
+            $this->redirectCountdown--;
+        }
+        return $this->sendRequest($redirect);
+    }
+
+   /**
+    * Checks whether another request should be performed with server digest auth
+    *
+    * Several conditions should be satisfied for it to return true:
+    *   - response status should be 401
+    *   - auth credentials should be set in the request object
+    *   - response should contain WWW-Authenticate header with digest challenge
+    *   - there is either no challenge stored for this URL or new challenge
+    *     contains stale=true parameter (in other case we probably just failed
+    *     due to invalid username / password)
+    *
+    * The method stores challenge values in $challenges static property
+    *
+    * @param    HTTP_Request2_Response  response to check
+    * @return   boolean whether another request should be performed
+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    */
+    protected function shouldUseServerDigestAuth(HTTP_Request2_Response $response)
+    {
+        // no sense repeating a request if we don't have credentials
+        if (401 != $response->getStatus() || !$this->request->getAuth()) {
+            return false;
+        }
+        if (!$challenge = $this->parseDigestChallenge($response->getHeader('www-authenticate'))) {
+            return false;
+        }
+
+        $url    = $this->request->getUrl();
+        $scheme = $url->getScheme();
+        $host   = $scheme . '://' . $url->getHost();
+        if ($port = $url->getPort()) {
+            if ((0 == strcasecmp($scheme, 'http') && 80 != $port) ||
+                (0 == strcasecmp($scheme, 'https') && 443 != $port)
+            ) {
+                $host .= ':' . $port;
+            }
+        }
+
+        if (!empty($challenge['domain'])) {
+            $prefixes = array();
+            foreach (preg_split('/\\s+/', $challenge['domain']) as $prefix) {
+                // don't bother with different servers
+                if ('/' == substr($prefix, 0, 1)) {
+                    $prefixes[] = $host . $prefix;
+                }
+            }
+        }
+        if (empty($prefixes)) {
+            $prefixes = array($host . '/');
+        }
+
+        $ret = true;
+        foreach ($prefixes as $prefix) {
+            if (!empty(self::$challenges[$prefix]) &&
+                (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+            ) {
+                // probably credentials are invalid
+                $ret = false;
+            }
+            self::$challenges[$prefix] =& $challenge;
+        }
+        return $ret;
+    }
+
+   /**
+    * Checks whether another request should be performed with proxy digest auth
+    *
+    * Several conditions should be satisfied for it to return true:
+    *   - response status should be 407
+    *   - proxy auth credentials should be set in the request object
+    *   - response should contain Proxy-Authenticate header with digest challenge
+    *   - there is either no challenge stored for this proxy or new challenge
+    *     contains stale=true parameter (in other case we probably just failed
+    *     due to invalid username / password)
+    *
+    * The method stores challenge values in $challenges static property
+    *
+    * @param    HTTP_Request2_Response  response to check
+    * @return   boolean whether another request should be performed
+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    */
+    protected function shouldUseProxyDigestAuth(HTTP_Request2_Response $response)
+    {
+        if (407 != $response->getStatus() || !$this->request->getConfig('proxy_user')) {
+            return false;
+        }
+        if (!($challenge = $this->parseDigestChallenge($response->getHeader('proxy-authenticate')))) {
+            return false;
+        }
+
+        $key = 'proxy://' . $this->request->getConfig('proxy_host') .
+               ':' . $this->request->getConfig('proxy_port');
+
+        if (!empty(self::$challenges[$key]) &&
+            (empty($challenge['stale']) || strcasecmp('true', $challenge['stale']))
+        ) {
+            $ret = false;
+        } else {
+            $ret = true;
+        }
+        self::$challenges[$key] = $challenge;
+        return $ret;
+    }
+
+   /**
+    * Extracts digest method challenge from (WWW|Proxy)-Authenticate header value
+    *
+    * There is a problem with implementation of RFC 2617: several of the parameters
+    * are defined as quoted-string there and thus may contain backslash escaped
+    * double quotes (RFC 2616, section 2.2). However, RFC 2617 defines unq(X) as
+    * just value of quoted-string X without surrounding quotes, it doesn't speak
+    * about removing backslash escaping.
+    *
+    * Now realm parameter is user-defined and human-readable, strange things
+    * happen when it contains quotes:
+    *   - Apache allows quotes in realm, but apparently uses realm value without
+    *     backslashes for digest computation
+    *   - Squid allows (manually escaped) quotes there, but it is impossible to
+    *     authorize with either escaped or unescaped quotes used in digest,
+    *     probably it can't parse the response (?)
+    *   - Both IE and Firefox display realm value with backslashes in
+    *     the password popup and apparently use the same value for digest
+    *
+    * HTTP_Request2 follows IE and Firefox (and hopefully RFC 2617) in
+    * quoted-string handling, unfortunately that means failure to authorize
+    * sometimes
+    *
+    * @param    string  value of WWW-Authenticate or Proxy-Authenticate header
+    * @return   mixed   associative array with challenge parameters, false if
+    *                   no challenge is present in header value
+    * @throws   HTTP_Request2_Exception in case of unsupported challenge parameters
+    */
+    protected function parseDigestChallenge($headerValue)
+    {
+        $authParam   = '(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')';
+        $challenge   = "!(?<=^|\\s|,)Digest ({$authParam}\\s*(,\\s*|$))+!";
+        if (!preg_match($challenge, $headerValue, $matches)) {
+            return false;
+        }
+
+        preg_match_all('!' . $authParam . '!', $matches[0], $params);
+        $paramsAry   = array();
+        $knownParams = array('realm', 'domain', 'nonce', 'opaque', 'stale',
+                             'algorithm', 'qop');
+        for ($i = 0; $i < count($params[0]); $i++) {
+            // section 3.2.1: Any unrecognized directive MUST be ignored.
+            if (in_array($params[1][$i], $knownParams)) {
+                if ('"' == substr($params[2][$i], 0, 1)) {
+                    $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+                } else {
+                    $paramsAry[$params[1][$i]] = $params[2][$i];
+                }
+            }
+        }
+        // we only support qop=auth
+        if (!empty($paramsAry['qop']) &&
+            !in_array('auth', array_map('trim', explode(',', $paramsAry['qop'])))
+        ) {
+            throw new HTTP_Request2_Exception(
+                "Only 'auth' qop is currently supported in digest authentication, " .
+                "server requested '{$paramsAry['qop']}'"
+            );
+        }
+        // we only support algorithm=MD5
+        if (!empty($paramsAry['algorithm']) && 'MD5' != $paramsAry['algorithm']) {
+            throw new HTTP_Request2_Exception(
+                "Only 'MD5' algorithm is currently supported in digest authentication, " .
+                "server requested '{$paramsAry['algorithm']}'"
+            );
+        }
+
+        return $paramsAry;
+    }
+
+   /**
+    * Parses [Proxy-]Authentication-Info header value and updates challenge
+    *
+    * @param    array   challenge to update
+    * @param    string  value of [Proxy-]Authentication-Info header
+    * @todo     validate server rspauth response
+    */
+    protected function updateChallenge(&$challenge, $headerValue)
+    {
+        $authParam   = '!(' . self::REGEXP_TOKEN . ')\\s*=\\s*(' .
+                       self::REGEXP_TOKEN . '|' . self::REGEXP_QUOTED_STRING . ')!';
+        $paramsAry   = array();
+
+        preg_match_all($authParam, $headerValue, $params);
+        for ($i = 0; $i < count($params[0]); $i++) {
+            if ('"' == substr($params[2][$i], 0, 1)) {
+                $paramsAry[$params[1][$i]] = substr($params[2][$i], 1, -1);
+            } else {
+                $paramsAry[$params[1][$i]] = $params[2][$i];
+            }
+        }
+        // for now, just update the nonce value
+        if (!empty($paramsAry['nextnonce'])) {
+            $challenge['nonce'] = $paramsAry['nextnonce'];
+            $challenge['nc']    = 1;
+        }
+    }
+
+   /**
+    * Creates a value for [Proxy-]Authorization header when using digest authentication
+    *
+    * @param    string  user name
+    * @param    string  password
+    * @param    string  request URL
+    * @param    array   digest challenge parameters
+    * @return   string  value of [Proxy-]Authorization request header
+    * @link     http://tools.ietf.org/html/rfc2617#section-3.2.2
+    */
+    protected function createDigestResponse($user, $password, $url, &$challenge)
+    {
+        if (false !== ($q = strpos($url, '?')) &&
+            $this->request->getConfig('digest_compat_ie')
+        ) {
+            $url = substr($url, 0, $q);
+        }
+
+        $a1 = md5($user . ':' . $challenge['realm'] . ':' . $password);
+        $a2 = md5($this->request->getMethod() . ':' . $url);
+
+        if (empty($challenge['qop'])) {
+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $a2);
+        } else {
+            $challenge['cnonce'] = 'Req2.' . rand();
+            if (empty($challenge['nc'])) {
+                $challenge['nc'] = 1;
+            }
+            $nc     = sprintf('%08x', $challenge['nc']++);
+            $digest = md5($a1 . ':' . $challenge['nonce'] . ':' . $nc . ':' .
+                          $challenge['cnonce'] . ':auth:' . $a2);
+        }
+        return 'Digest username="' . str_replace(array('\\', '"'), array('\\\\', '\\"'), $user) . '", ' .
+               'realm="' . $challenge['realm'] . '", ' .
+               'nonce="' . $challenge['nonce'] . '", ' .
+               'uri="' . $url . '", ' .
+               'response="' . $digest . '"' .
+               (!empty($challenge['opaque'])?
+                ', opaque="' . $challenge['opaque'] . '"':
+                '') .
+               (!empty($challenge['qop'])?
+                ', qop="auth", nc=' . $nc . ', cnonce="' . $challenge['cnonce'] . '"':
+                '');
+    }
+
+   /**
+    * Adds 'Authorization' header (if needed) to request headers array
+    *
+    * @param    array   request headers
+    * @param    string  request host (needed for digest authentication)
+    * @param    string  request URL (needed for digest authentication)
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function addAuthorizationHeader(&$headers, $requestHost, $requestUrl)
+    {
+        if (!($auth = $this->request->getAuth())) {
+            return;
+        }
+        switch ($auth['scheme']) {
+            case HTTP_Request2::AUTH_BASIC:
+                $headers['authorization'] =
+                    'Basic ' . base64_encode($auth['user'] . ':' . $auth['password']);
+                break;
+
+            case HTTP_Request2::AUTH_DIGEST:
+                unset($this->serverChallenge);
+                $fullUrl = ('/' == $requestUrl[0])?
+                           $this->request->getUrl()->getScheme() . '://' .
+                            $requestHost . $requestUrl:
+                           $requestUrl;
+                foreach (array_keys(self::$challenges) as $key) {
+                    if ($key == substr($fullUrl, 0, strlen($key))) {
+                        $headers['authorization'] = $this->createDigestResponse(
+                            $auth['user'], $auth['password'],
+                            $requestUrl, self::$challenges[$key]
+                        );
+                        $this->serverChallenge =& self::$challenges[$key];
+                        break;
+                    }
+                }
+                break;
+
+            default:
+                throw new HTTP_Request2_Exception(
+                    "Unknown HTTP authentication scheme '{$auth['scheme']}'"
+                );
+        }
+    }
+
+   /**
+    * Adds 'Proxy-Authorization' header (if needed) to request headers array
+    *
+    * @param    array   request headers
+    * @param    string  request URL (needed for digest authentication)
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function addProxyAuthorizationHeader(&$headers, $requestUrl)
+    {
+        if (!$this->request->getConfig('proxy_host') ||
+            !($user = $this->request->getConfig('proxy_user')) ||
+            (0 == strcasecmp('https', $this->request->getUrl()->getScheme()) &&
+             HTTP_Request2::METHOD_CONNECT != $this->request->getMethod())
+        ) {
+            return;
+        }
+
+        $password = $this->request->getConfig('proxy_password');
+        switch ($this->request->getConfig('proxy_auth_scheme')) {
+            case HTTP_Request2::AUTH_BASIC:
+                $headers['proxy-authorization'] =
+                    'Basic ' . base64_encode($user . ':' . $password);
+                break;
+
+            case HTTP_Request2::AUTH_DIGEST:
+                unset($this->proxyChallenge);
+                $proxyUrl = 'proxy://' . $this->request->getConfig('proxy_host') .
+                            ':' . $this->request->getConfig('proxy_port');
+                if (!empty(self::$challenges[$proxyUrl])) {
+                    $headers['proxy-authorization'] = $this->createDigestResponse(
+                        $user, $password,
+                        $requestUrl, self::$challenges[$proxyUrl]
+                    );
+                    $this->proxyChallenge =& self::$challenges[$proxyUrl];
+                }
+                break;
+
+            default:
+                throw new HTTP_Request2_Exception(
+                    "Unknown HTTP authentication scheme '" .
+                    $this->request->getConfig('proxy_auth_scheme') . "'"
+                );
+        }
+    }
+
+
+   /**
+    * Creates the string with the Request-Line and request headers
+    *
+    * @return   string
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function prepareHeaders()
+    {
+        $headers = $this->request->getHeaders();
+        $url     = $this->request->getUrl();
+        $connect = HTTP_Request2::METHOD_CONNECT == $this->request->getMethod();
+        $host    = $url->getHost();
+
+        $defaultPort = 0 == strcasecmp($url->getScheme(), 'https')? 443: 80;
+        if (($port = $url->getPort()) && $port != $defaultPort || $connect) {
+            $host .= ':' . (empty($port)? $defaultPort: $port);
+        }
+        // Do not overwrite explicitly set 'Host' header, see bug #16146
+        if (!isset($headers['host'])) {
+            $headers['host'] = $host;
+        }
+
+        if ($connect) {
+            $requestUrl = $host;
+
+        } else {
+            if (!$this->request->getConfig('proxy_host') ||
+                0 == strcasecmp($url->getScheme(), 'https')
+            ) {
+                $requestUrl = '';
+            } else {
+                $requestUrl = $url->getScheme() . '://' . $host;
+            }
+            $path        = $url->getPath();
+            $query       = $url->getQuery();
+            $requestUrl .= (empty($path)? '/': $path) . (empty($query)? '': '?' . $query);
+        }
+
+        if ('1.1' == $this->request->getConfig('protocol_version') &&
+            extension_loaded('zlib') && !isset($headers['accept-encoding'])
+        ) {
+            $headers['accept-encoding'] = 'gzip, deflate';
+        }
+
+        $this->addAuthorizationHeader($headers, $host, $requestUrl);
+        $this->addProxyAuthorizationHeader($headers, $requestUrl);
+        $this->calculateRequestLength($headers);
+
+        $headersStr = $this->request->getMethod() . ' ' . $requestUrl . ' HTTP/' .
+                      $this->request->getConfig('protocol_version') . "\r\n";
+        foreach ($headers as $name => $value) {
+            $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+            $headersStr   .= $canonicalName . ': ' . $value . "\r\n";
+        }
+        return $headersStr . "\r\n";
+    }
+
+   /**
+    * Sends the request body
+    *
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function writeBody()
+    {
+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||
+            0 == $this->contentLength
+        ) {
+            return;
+        }
+
+        $position   = 0;
+        $bufferSize = $this->request->getConfig('buffer_size');
+        while ($position < $this->contentLength) {
+            if (is_string($this->requestBody)) {
+                $str = substr($this->requestBody, $position, $bufferSize);
+            } elseif (is_resource($this->requestBody)) {
+                $str = fread($this->requestBody, $bufferSize);
+            } else {
+                $str = $this->requestBody->read($bufferSize);
+            }
+            if (false === @fwrite($this->socket, $str, strlen($str))) {
+                throw new HTTP_Request2_Exception('Error writing request');
+            }
+            // Provide the length of written string to the observer, request #7630
+            $this->request->setLastEvent('sentBodyPart', strlen($str));
+            $position += strlen($str);
+        }
+    }
+
+   /**
+    * Reads the remote server's response
+    *
+    * @return   HTTP_Request2_Response
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function readResponse()
+    {
+        $bufferSize = $this->request->getConfig('buffer_size');
+
+        do {
+            $response = new HTTP_Request2_Response($this->readLine($bufferSize), true);
+            do {
+                $headerLine = $this->readLine($bufferSize);
+                $response->parseHeaderLine($headerLine);
+            } while ('' != $headerLine);
+        } while (in_array($response->getStatus(), array(100, 101)));
+
+        $this->request->setLastEvent('receivedHeaders', $response);
+
+        // No body possible in such responses
+        if (HTTP_Request2::METHOD_HEAD == $this->request->getMethod() ||
+            (HTTP_Request2::METHOD_CONNECT == $this->request->getMethod() &&
+             200 <= $response->getStatus() && 300 > $response->getStatus()) ||
+            in_array($response->getStatus(), array(204, 304))
+        ) {
+            return $response;
+        }
+
+        $chunked = 'chunked' == $response->getHeader('transfer-encoding');
+        $length  = $response->getHeader('content-length');
+        $hasBody = false;
+        if ($chunked || null === $length || 0 < intval($length)) {
+            // RFC 2616, section 4.4:
+            // 3. ... If a message is received with both a
+            // Transfer-Encoding header field and a Content-Length header field,
+            // the latter MUST be ignored.
+            $toRead = ($chunked || null === $length)? null: $length;
+            $this->chunkLength = 0;
+
+            while (!feof($this->socket) && (is_null($toRead) || 0 < $toRead)) {
+                if ($chunked) {
+                    $data = $this->readChunked($bufferSize);
+                } elseif (is_null($toRead)) {
+                    $data = $this->fread($bufferSize);
+                } else {
+                    $data    = $this->fread(min($toRead, $bufferSize));
+                    $toRead -= strlen($data);
+                }
+                if ('' == $data && (!$this->chunkLength || feof($this->socket))) {
+                    break;
+                }
+
+                $hasBody = true;
+                if ($this->request->getConfig('store_body')) {
+                    $response->appendBody($data);
+                }
+                if (!in_array($response->getHeader('content-encoding'), array('identity', null))) {
+                    $this->request->setLastEvent('receivedEncodedBodyPart', $data);
+                } else {
+                    $this->request->setLastEvent('receivedBodyPart', $data);
+                }
+            }
+        }
+
+        if ($hasBody) {
+            $this->request->setLastEvent('receivedBody', $response);
+        }
+        return $response;
+    }
+
+   /**
+    * Reads until either the end of the socket or a newline, whichever comes first
+    *
+    * Strips the trailing newline from the returned data, handles global
+    * request timeout. Method idea borrowed from Net_Socket PEAR package.
+    *
+    * @param    int     buffer size to use for reading
+    * @return   Available data up to the newline (not including newline)
+    * @throws   HTTP_Request2_Exception     In case of timeout
+    */
+    protected function readLine($bufferSize)
+    {
+        $line = '';
+        while (!feof($this->socket)) {
+            if ($this->deadline) {
+                stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+            }
+            $line .= @fgets($this->socket, $bufferSize);
+            $info  = stream_get_meta_data($this->socket);
+            if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+                $reason = $this->deadline
+                          ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                          : 'due to default_socket_timeout php.ini setting';
+                throw new HTTP_Request2_Exception("Request timed out {$reason}");
+            }
+            if (substr($line, -1) == "\n") {
+                return rtrim($line, "\r\n");
+            }
+        }
+        return $line;
+    }
+
+   /**
+    * Wrapper around fread(), handles global request timeout
+    *
+    * @param    int     Reads up to this number of bytes
+    * @return   Data read from socket
+    * @throws   HTTP_Request2_Exception     In case of timeout
+    */
+    protected function fread($length)
+    {
+        if ($this->deadline) {
+            stream_set_timeout($this->socket, max($this->deadline - time(), 1));
+        }
+        $data = fread($this->socket, $length);
+        $info = stream_get_meta_data($this->socket);
+        if ($info['timed_out'] || $this->deadline && time() > $this->deadline) {
+            $reason = $this->deadline
+                      ? 'after ' . $this->request->getConfig('timeout') . ' second(s)'
+                      : 'due to default_socket_timeout php.ini setting';
+            throw new HTTP_Request2_Exception("Request timed out {$reason}");
+        }
+        return $data;
+    }
+
+   /**
+    * Reads a part of response body encoded with chunked Transfer-Encoding
+    *
+    * @param    int     buffer size to use for reading
+    * @return   string
+    * @throws   HTTP_Request2_Exception
+    */
+    protected function readChunked($bufferSize)
+    {
+        // at start of the next chunk?
+        if (0 == $this->chunkLength) {
+            $line = $this->readLine($bufferSize);
+            if (!preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+                throw new HTTP_Request2_Exception(
+                    "Cannot decode chunked response, invalid chunk length '{$line}'"
+                );
+            } else {
+                $this->chunkLength = hexdec($matches[1]);
+                // Chunk with zero length indicates the end
+                if (0 == $this->chunkLength) {
+                    $this->readLine($bufferSize);
+                    return '';
+                }
+            }
+        }
+        $data = $this->fread(min($this->chunkLength, $bufferSize));
+        $this->chunkLength -= strlen($data);
+        if (0 == $this->chunkLength) {
+            $this->readLine($bufferSize); // Trailing CRLF
+        }
+        return $data;
+    }
+}
+
 ?>
\ No newline at end of file
diff --git a/libs/PEAR.1.9/HTTP/Request2/Exception.php b/libs/PEAR.1.9/HTTP/Request2/Exception.php
index 4109f89d0..2b960fc20 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Exception.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Exception.php
@@ -1,62 +1,62 @@
-<?php
-/**
- * Exception class for HTTP_Request2 package
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Exception.php 290192 2009-11-03 21:29:32Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Base class for exceptions in PEAR
- */
-require_once 'PEAR/Exception.php';
-
-/**
- * Exception class for HTTP_Request2 package
- *
- * Such a class is required by the Exception RFC:
- * http://pear.php.net/pepr/pepr-proposal-show.php?id=132
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @version    Release: 0.5.2
- */
-class HTTP_Request2_Exception extends PEAR_Exception
-{
-}
+<?php
+/**
+ * Exception class for HTTP_Request2 package
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Exception.php 290192 2009-11-03 21:29:32Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Base class for exceptions in PEAR
+ */
+require_once 'PEAR/Exception.php';
+
+/**
+ * Exception class for HTTP_Request2 package
+ *
+ * Such a class is required by the Exception RFC:
+ * http://pear.php.net/pepr/pepr-proposal-show.php?id=132
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @version    Release: 0.5.2
+ */
+class HTTP_Request2_Exception extends PEAR_Exception
+{
+}
 ?>
\ No newline at end of file
diff --git a/libs/PEAR.1.9/HTTP/Request2/MultipartBody.php b/libs/PEAR.1.9/HTTP/Request2/MultipartBody.php
index e2cc547d1..f640de3e7 100644
--- a/libs/PEAR.1.9/HTTP/Request2/MultipartBody.php
+++ b/libs/PEAR.1.9/HTTP/Request2/MultipartBody.php
@@ -1,274 +1,274 @@
-<?php
-/**
- * Helper class for building multipart/form-data request body
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: MultipartBody.php 290192 2009-11-03 21:29:32Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Class for building multipart/form-data request body
- *
- * The class helps to reduce memory consumption by streaming large file uploads
- * from disk, it also allows monitoring of upload progress (see request #7630)
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.5.2
- * @link       http://tools.ietf.org/html/rfc1867
- */
-class HTTP_Request2_MultipartBody
-{
-   /**
-    * MIME boundary
-    * @var  string
-    */
-    private $_boundary;
-
-   /**
-    * Form parameters added via {@link HTTP_Request2::addPostParameter()}
-    * @var  array
-    */
-    private $_params = array();
-
-   /**
-    * File uploads added via {@link HTTP_Request2::addUpload()}
-    * @var  array
-    */
-    private $_uploads = array();
-
-   /**
-    * Header for parts with parameters
-    * @var  string
-    */
-    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
-
-   /**
-    * Header for parts with uploads
-    * @var  string
-    */
-    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
-
-   /**
-    * Current position in parameter and upload arrays
-    *
-    * First number is index of "current" part, second number is position within
-    * "current" part
-    *
-    * @var  array
-    */
-    private $_pos = array(0, 0);
-
-
-   /**
-    * Constructor. Sets the arrays with POST data.
-    *
-    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}
-    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
-    * @param    bool    whether to append brackets to array variable names
-    */
-    public function __construct(array $params, array $uploads, $useBrackets = true)
-    {
-        $this->_params = self::_flattenArray('', $params, $useBrackets);
-        foreach ($uploads as $fieldName => $f) {
-            if (!is_array($f['fp'])) {
-                $this->_uploads[] = $f + array('name' => $fieldName);
-            } else {
-                for ($i = 0; $i < count($f['fp']); $i++) {
-                    $upload = array(
-                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
-                    );
-                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
-                        $upload[$key] = $f[$key][$i];
-                    }
-                    $this->_uploads[] = $upload;
-                }
-            }
-        }
-    }
-
-   /**
-    * Returns the length of the body to use in Content-Length header
-    *
-    * @return   integer
-    */
-    public function getLength()
-    {
-        $boundaryLength     = strlen($this->getBoundary());
-        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
-        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
-        $length             = $boundaryLength + 6;
-        foreach ($this->_params as $p) {
-            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
-        }
-        foreach ($this->_uploads as $u) {
-            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
-                       strlen($u['filename']) + $u['size'] + 2;
-        }
-        return $length;
-    }
-
-   /**
-    * Returns the boundary to use in Content-Type header
-    *
-    * @return   string
-    */
-    public function getBoundary()
-    {
-        if (empty($this->_boundary)) {
-            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
-        }
-        return $this->_boundary;
-    }
-
-   /**
-    * Returns next chunk of request body
-    *
-    * @param    integer Amount of bytes to read
-    * @return   string  Up to $length bytes of data, empty string if at end
-    */
-    public function read($length)
-    {
-        $ret         = '';
-        $boundary    = $this->getBoundary();
-        $paramCount  = count($this->_params);
-        $uploadCount = count($this->_uploads);
-        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
-            $oldLength = $length;
-            if ($this->_pos[0] < $paramCount) {
-                $param = sprintf($this->_headerParam, $boundary,
-                                 $this->_params[$this->_pos[0]][0]) .
-                         $this->_params[$this->_pos[0]][1] . "\r\n";
-                $ret    .= substr($param, $this->_pos[1], $length);
-                $length -= min(strlen($param) - $this->_pos[1], $length);
-
-            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
-                $pos    = $this->_pos[0] - $paramCount;
-                $header = sprintf($this->_headerUpload, $boundary,
-                                  $this->_uploads[$pos]['name'],
-                                  $this->_uploads[$pos]['filename'],
-                                  $this->_uploads[$pos]['type']);
-                if ($this->_pos[1] < strlen($header)) {
-                    $ret    .= substr($header, $this->_pos[1], $length);
-                    $length -= min(strlen($header) - $this->_pos[1], $length);
-                }
-                $filePos  = max(0, $this->_pos[1] - strlen($header));
-                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
-                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
-                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
-                }
-                if ($length > 0) {
-                    $start   = $this->_pos[1] + ($oldLength - $length) -
-                               strlen($header) - $this->_uploads[$pos]['size'];
-                    $ret    .= substr("\r\n", $start, $length);
-                    $length -= min(2 - $start, $length);
-                }
-
-            } else {
-                $closing  = '--' . $boundary . "--\r\n";
-                $ret     .= substr($closing, $this->_pos[1], $length);
-                $length  -= min(strlen($closing) - $this->_pos[1], $length);
-            }
-            if ($length > 0) {
-                $this->_pos     = array($this->_pos[0] + 1, 0);
-            } else {
-                $this->_pos[1] += $oldLength;
-            }
-        }
-        return $ret;
-    }
-
-   /**
-    * Sets the current position to the start of the body
-    *
-    * This allows reusing the same body in another request
-    */
-    public function rewind()
-    {
-        $this->_pos = array(0, 0);
-        foreach ($this->_uploads as $u) {
-            rewind($u['fp']);
-        }
-    }
-
-   /**
-    * Returns the body as string
-    *
-    * Note that it reads all file uploads into memory so it is a good idea not
-    * to use this method with large file uploads and rely on read() instead.
-    *
-    * @return   string
-    */
-    public function __toString()
-    {
-        $this->rewind();
-        return $this->read($this->getLength());
-    }
-
-
-   /**
-    * Helper function to change the (probably multidimensional) associative array
-    * into the simple one.
-    *
-    * @param    string  name for item
-    * @param    mixed   item's values
-    * @param    bool    whether to append [] to array variables' names
-    * @return   array   array with the following items: array('item name', 'item value');
-    */
-    private static function _flattenArray($name, $values, $useBrackets)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
-            }
-            return $ret;
-        }
-    }
-}
-?>
+<?php
+/**
+ * Helper class for building multipart/form-data request body
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: MultipartBody.php 290192 2009-11-03 21:29:32Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Class for building multipart/form-data request body
+ *
+ * The class helps to reduce memory consumption by streaming large file uploads
+ * from disk, it also allows monitoring of upload progress (see request #7630)
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 0.5.2
+ * @link       http://tools.ietf.org/html/rfc1867
+ */
+class HTTP_Request2_MultipartBody
+{
+   /**
+    * MIME boundary
+    * @var  string
+    */
+    private $_boundary;
+
+   /**
+    * Form parameters added via {@link HTTP_Request2::addPostParameter()}
+    * @var  array
+    */
+    private $_params = array();
+
+   /**
+    * File uploads added via {@link HTTP_Request2::addUpload()}
+    * @var  array
+    */
+    private $_uploads = array();
+
+   /**
+    * Header for parts with parameters
+    * @var  string
+    */
+    private $_headerParam = "--%s\r\nContent-Disposition: form-data; name=\"%s\"\r\n\r\n";
+
+   /**
+    * Header for parts with uploads
+    * @var  string
+    */
+    private $_headerUpload = "--%s\r\nContent-Disposition: form-data; name=\"%s\"; filename=\"%s\"\r\nContent-Type: %s\r\n\r\n";
+
+   /**
+    * Current position in parameter and upload arrays
+    *
+    * First number is index of "current" part, second number is position within
+    * "current" part
+    *
+    * @var  array
+    */
+    private $_pos = array(0, 0);
+
+
+   /**
+    * Constructor. Sets the arrays with POST data.
+    *
+    * @param    array   values of form fields set via {@link HTTP_Request2::addPostParameter()}
+    * @param    array   file uploads set via {@link HTTP_Request2::addUpload()}
+    * @param    bool    whether to append brackets to array variable names
+    */
+    public function __construct(array $params, array $uploads, $useBrackets = true)
+    {
+        $this->_params = self::_flattenArray('', $params, $useBrackets);
+        foreach ($uploads as $fieldName => $f) {
+            if (!is_array($f['fp'])) {
+                $this->_uploads[] = $f + array('name' => $fieldName);
+            } else {
+                for ($i = 0; $i < count($f['fp']); $i++) {
+                    $upload = array(
+                        'name' => ($useBrackets? $fieldName . '[' . $i . ']': $fieldName)
+                    );
+                    foreach (array('fp', 'filename', 'size', 'type') as $key) {
+                        $upload[$key] = $f[$key][$i];
+                    }
+                    $this->_uploads[] = $upload;
+                }
+            }
+        }
+    }
+
+   /**
+    * Returns the length of the body to use in Content-Length header
+    *
+    * @return   integer
+    */
+    public function getLength()
+    {
+        $boundaryLength     = strlen($this->getBoundary());
+        $headerParamLength  = strlen($this->_headerParam) - 4 + $boundaryLength;
+        $headerUploadLength = strlen($this->_headerUpload) - 8 + $boundaryLength;
+        $length             = $boundaryLength + 6;
+        foreach ($this->_params as $p) {
+            $length += $headerParamLength + strlen($p[0]) + strlen($p[1]) + 2;
+        }
+        foreach ($this->_uploads as $u) {
+            $length += $headerUploadLength + strlen($u['name']) + strlen($u['type']) +
+                       strlen($u['filename']) + $u['size'] + 2;
+        }
+        return $length;
+    }
+
+   /**
+    * Returns the boundary to use in Content-Type header
+    *
+    * @return   string
+    */
+    public function getBoundary()
+    {
+        if (empty($this->_boundary)) {
+            $this->_boundary = '--' . md5('PEAR-HTTP_Request2-' . microtime());
+        }
+        return $this->_boundary;
+    }
+
+   /**
+    * Returns next chunk of request body
+    *
+    * @param    integer Amount of bytes to read
+    * @return   string  Up to $length bytes of data, empty string if at end
+    */
+    public function read($length)
+    {
+        $ret         = '';
+        $boundary    = $this->getBoundary();
+        $paramCount  = count($this->_params);
+        $uploadCount = count($this->_uploads);
+        while ($length > 0 && $this->_pos[0] <= $paramCount + $uploadCount) {
+            $oldLength = $length;
+            if ($this->_pos[0] < $paramCount) {
+                $param = sprintf($this->_headerParam, $boundary,
+                                 $this->_params[$this->_pos[0]][0]) .
+                         $this->_params[$this->_pos[0]][1] . "\r\n";
+                $ret    .= substr($param, $this->_pos[1], $length);
+                $length -= min(strlen($param) - $this->_pos[1], $length);
+
+            } elseif ($this->_pos[0] < $paramCount + $uploadCount) {
+                $pos    = $this->_pos[0] - $paramCount;
+                $header = sprintf($this->_headerUpload, $boundary,
+                                  $this->_uploads[$pos]['name'],
+                                  $this->_uploads[$pos]['filename'],
+                                  $this->_uploads[$pos]['type']);
+                if ($this->_pos[1] < strlen($header)) {
+                    $ret    .= substr($header, $this->_pos[1], $length);
+                    $length -= min(strlen($header) - $this->_pos[1], $length);
+                }
+                $filePos  = max(0, $this->_pos[1] - strlen($header));
+                if ($length > 0 && $filePos < $this->_uploads[$pos]['size']) {
+                    $ret     .= fread($this->_uploads[$pos]['fp'], $length);
+                    $length  -= min($length, $this->_uploads[$pos]['size'] - $filePos);
+                }
+                if ($length > 0) {
+                    $start   = $this->_pos[1] + ($oldLength - $length) -
+                               strlen($header) - $this->_uploads[$pos]['size'];
+                    $ret    .= substr("\r\n", $start, $length);
+                    $length -= min(2 - $start, $length);
+                }
+
+            } else {
+                $closing  = '--' . $boundary . "--\r\n";
+                $ret     .= substr($closing, $this->_pos[1], $length);
+                $length  -= min(strlen($closing) - $this->_pos[1], $length);
+            }
+            if ($length > 0) {
+                $this->_pos     = array($this->_pos[0] + 1, 0);
+            } else {
+                $this->_pos[1] += $oldLength;
+            }
+        }
+        return $ret;
+    }
+
+   /**
+    * Sets the current position to the start of the body
+    *
+    * This allows reusing the same body in another request
+    */
+    public function rewind()
+    {
+        $this->_pos = array(0, 0);
+        foreach ($this->_uploads as $u) {
+            rewind($u['fp']);
+        }
+    }
+
+   /**
+    * Returns the body as string
+    *
+    * Note that it reads all file uploads into memory so it is a good idea not
+    * to use this method with large file uploads and rely on read() instead.
+    *
+    * @return   string
+    */
+    public function __toString()
+    {
+        $this->rewind();
+        return $this->read($this->getLength());
+    }
+
+
+   /**
+    * Helper function to change the (probably multidimensional) associative array
+    * into the simple one.
+    *
+    * @param    string  name for item
+    * @param    mixed   item's values
+    * @param    bool    whether to append [] to array variables' names
+    * @return   array   array with the following items: array('item name', 'item value');
+    */
+    private static function _flattenArray($name, $values, $useBrackets)
+    {
+        if (!is_array($values)) {
+            return array(array($name, $values));
+        } else {
+            $ret = array();
+            foreach ($values as $k => $v) {
+                if (empty($name)) {
+                    $newName = $k;
+                } elseif ($useBrackets) {
+                    $newName = $name . '[' . $k . ']';
+                } else {
+                    $newName = $name;
+                }
+                $ret = array_merge($ret, self::_flattenArray($newName, $v, $useBrackets));
+            }
+            return $ret;
+        }
+    }
+}
+?>
diff --git a/libs/PEAR.1.9/HTTP/Request2/Observer/Log.php b/libs/PEAR.1.9/HTTP/Request2/Observer/Log.php
index add4a2ff0..7df821ef4 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Observer/Log.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Observer/Log.php
@@ -1,215 +1,215 @@
-<?php
-/**
- * An observer useful for debugging / testing.
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  SVN: $Id: Log.php 293416 2010-01-11 18:06:15Z avb $
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * A debug observer useful for debugging / testing.
- *
- * This observer logs to a log target data corresponding to the various request
- * and response events, it logs by default to php://output but can be configured
- * to log to a file or via the PEAR Log package.
- *
- * A simple example:
- * <code>
- * require_once 'HTTP/Request2.php';
- * require_once 'HTTP/Request2/Observer/Log.php';
- *
- * $request  = new HTTP_Request2('http://www.example.com');
- * $observer = new HTTP_Request2_Observer_Log();
- * $request->attach($observer);
- * $request->send();
- * </code>
- *
- * A more complex example with PEAR Log:
- * <code>
- * require_once 'HTTP/Request2.php';
- * require_once 'HTTP/Request2/Observer/Log.php';
- * require_once 'Log.php';
- *
- * $request  = new HTTP_Request2('http://www.example.com');
- * // we want to log with PEAR log
- * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));
- *
- * // we only want to log received headers
- * $observer->events = array('receivedHeaders');
- *
- * $request->attach($observer);
- * $request->send();
- * </code>
- *
- * @category HTTP
- * @package  HTTP_Request2
- * @author   David Jean Louis <izi@php.net>
- * @author   Alexey Borzov <avb@php.net>
- * @license  http://opensource.org/licenses/bsd-license.php New BSD License
- * @version  Release: 0.5.2
- * @link     http://pear.php.net/package/HTTP_Request2
- */
-class HTTP_Request2_Observer_Log implements SplObserver
-{
-    // properties {{{
-
-    /**
-     * The log target, it can be a a resource or a PEAR Log instance.
-     *
-     * @var resource|Log $target
-     */
-    protected $target = null;
-
-    /**
-     * The events to log.
-     *
-     * @var array $events
-     */
-    public $events = array(
-        'connect',
-        'sentHeaders',
-        'sentBodyPart',
-        'receivedHeaders',
-        'receivedBody',
-        'disconnect',
-    );
-
-    // }}}
-    // __construct() {{{
-
-    /**
-     * Constructor.
-     *
-     * @param mixed $target Can be a file path (default: php://output), a resource,
-     *                      or an instance of the PEAR Log class.
-     * @param array $events Array of events to listen to (default: all events)
-     *
-     * @return void
-     */
-    public function __construct($target = 'php://output', array $events = array())
-    {
-        if (!empty($events)) {
-            $this->events = $events;
-        }
-        if (is_resource($target) || $target instanceof Log) {
-            $this->target = $target;
-        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
-            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
-        }
-    }
-
-    // }}}
-    // update() {{{
-
-    /**
-     * Called when the request notifies us of an event.
-     *
-     * @param HTTP_Request2 $subject The HTTP_Request2 instance
-     *
-     * @return void
-     */
-    public function update(SplSubject $subject)
-    {
-        $event = $subject->getLastEvent();
-        if (!in_array($event['name'], $this->events)) {
-            return;
-        }
-
-        switch ($event['name']) {
-        case 'connect':
-            $this->log('* Connected to ' . $event['data']);
-            break;
-        case 'sentHeaders':
-            $headers = explode("\r\n", $event['data']);
-            array_pop($headers);
-            foreach ($headers as $header) {
-                $this->log('> ' . $header);
-            }
-            break;
-        case 'sentBodyPart':
-            $this->log('> ' . $event['data'] . ' byte(s) sent');
-            break;
-        case 'receivedHeaders':
-            $this->log(sprintf('< HTTP/%s %s %s',
-                $event['data']->getVersion(),
-                $event['data']->getStatus(),
-                $event['data']->getReasonPhrase()));
-            $headers = $event['data']->getHeader();
-            foreach ($headers as $key => $val) {
-                $this->log('< ' . $key . ': ' . $val);
-            }
-            $this->log('< ');
-            break;
-        case 'receivedBody':
-            $this->log($event['data']->getBody());
-            break;
-        case 'disconnect':
-            $this->log('* Disconnected');
-            break;
-        }
-    }
-
-    // }}}
-    // log() {{{
-
-    /**
-     * Logs the given message to the configured target.
-     *
-     * @param string $message Message to display
-     *
-     * @return void
-     */
-    protected function log($message)
-    {
-        if ($this->target instanceof Log) {
-            $this->target->debug($message);
-        } elseif (is_resource($this->target)) {
-            fwrite($this->target, $message . "\r\n");
-        }
-    }
-
-    // }}}
-}
-
+<?php
+/**
+ * An observer useful for debugging / testing.
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   David Jean Louis <izi@php.net>
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version  SVN: $Id: Log.php 293416 2010-01-11 18:06:15Z avb $
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
+
+/**
+ * A debug observer useful for debugging / testing.
+ *
+ * This observer logs to a log target data corresponding to the various request
+ * and response events, it logs by default to php://output but can be configured
+ * to log to a file or via the PEAR Log package.
+ *
+ * A simple example:
+ * <code>
+ * require_once 'HTTP/Request2.php';
+ * require_once 'HTTP/Request2/Observer/Log.php';
+ *
+ * $request  = new HTTP_Request2('http://www.example.com');
+ * $observer = new HTTP_Request2_Observer_Log();
+ * $request->attach($observer);
+ * $request->send();
+ * </code>
+ *
+ * A more complex example with PEAR Log:
+ * <code>
+ * require_once 'HTTP/Request2.php';
+ * require_once 'HTTP/Request2/Observer/Log.php';
+ * require_once 'Log.php';
+ *
+ * $request  = new HTTP_Request2('http://www.example.com');
+ * // we want to log with PEAR log
+ * $observer = new HTTP_Request2_Observer_Log(Log::factory('console'));
+ *
+ * // we only want to log received headers
+ * $observer->events = array('receivedHeaders');
+ *
+ * $request->attach($observer);
+ * $request->send();
+ * </code>
+ *
+ * @category HTTP
+ * @package  HTTP_Request2
+ * @author   David Jean Louis <izi@php.net>
+ * @author   Alexey Borzov <avb@php.net>
+ * @license  http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version  Release: 0.5.2
+ * @link     http://pear.php.net/package/HTTP_Request2
+ */
+class HTTP_Request2_Observer_Log implements SplObserver
+{
+    // properties {{{
+
+    /**
+     * The log target, it can be a a resource or a PEAR Log instance.
+     *
+     * @var resource|Log $target
+     */
+    protected $target = null;
+
+    /**
+     * The events to log.
+     *
+     * @var array $events
+     */
+    public $events = array(
+        'connect',
+        'sentHeaders',
+        'sentBodyPart',
+        'receivedHeaders',
+        'receivedBody',
+        'disconnect',
+    );
+
+    // }}}
+    // __construct() {{{
+
+    /**
+     * Constructor.
+     *
+     * @param mixed $target Can be a file path (default: php://output), a resource,
+     *                      or an instance of the PEAR Log class.
+     * @param array $events Array of events to listen to (default: all events)
+     *
+     * @return void
+     */
+    public function __construct($target = 'php://output', array $events = array())
+    {
+        if (!empty($events)) {
+            $this->events = $events;
+        }
+        if (is_resource($target) || $target instanceof Log) {
+            $this->target = $target;
+        } elseif (false === ($this->target = @fopen($target, 'ab'))) {
+            throw new HTTP_Request2_Exception("Unable to open '{$target}'");
+        }
+    }
+
+    // }}}
+    // update() {{{
+
+    /**
+     * Called when the request notifies us of an event.
+     *
+     * @param HTTP_Request2 $subject The HTTP_Request2 instance
+     *
+     * @return void
+     */
+    public function update(SplSubject $subject)
+    {
+        $event = $subject->getLastEvent();
+        if (!in_array($event['name'], $this->events)) {
+            return;
+        }
+
+        switch ($event['name']) {
+        case 'connect':
+            $this->log('* Connected to ' . $event['data']);
+            break;
+        case 'sentHeaders':
+            $headers = explode("\r\n", $event['data']);
+            array_pop($headers);
+            foreach ($headers as $header) {
+                $this->log('> ' . $header);
+            }
+            break;
+        case 'sentBodyPart':
+            $this->log('> ' . $event['data'] . ' byte(s) sent');
+            break;
+        case 'receivedHeaders':
+            $this->log(sprintf('< HTTP/%s %s %s',
+                $event['data']->getVersion(),
+                $event['data']->getStatus(),
+                $event['data']->getReasonPhrase()));
+            $headers = $event['data']->getHeader();
+            foreach ($headers as $key => $val) {
+                $this->log('< ' . $key . ': ' . $val);
+            }
+            $this->log('< ');
+            break;
+        case 'receivedBody':
+            $this->log($event['data']->getBody());
+            break;
+        case 'disconnect':
+            $this->log('* Disconnected');
+            break;
+        }
+    }
+
+    // }}}
+    // log() {{{
+
+    /**
+     * Logs the given message to the configured target.
+     *
+     * @param string $message Message to display
+     *
+     * @return void
+     */
+    protected function log($message)
+    {
+        if ($this->target instanceof Log) {
+            $this->target->debug($message);
+        } elseif (is_resource($this->target)) {
+            fwrite($this->target, $message . "\r\n");
+        }
+    }
+
+    // }}}
+}
+
 ?>
\ No newline at end of file
diff --git a/libs/PEAR.1.9/HTTP/Request2/Response.php b/libs/PEAR.1.9/HTTP/Request2/Response.php
index 30679c880..f27ea51f4 100644
--- a/libs/PEAR.1.9/HTTP/Request2/Response.php
+++ b/libs/PEAR.1.9/HTTP/Request2/Response.php
@@ -1,559 +1,559 @@
-<?php
-/**
- * Class representing a HTTP response
- *
- * PHP version 5
- *
- * LICENSE:
- *
- * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * The names of the authors may not be used to endorse or promote products
- *      derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @license    http://opensource.org/licenses/bsd-license.php New BSD License
- * @version    SVN: $Id: Response.php 290520 2009-11-11 20:09:42Z avb $
- * @link       http://pear.php.net/package/HTTP_Request2
- */
-
-/**
- * Exception class for HTTP_Request2 package
- */
-require_once 'HTTP/Request2/Exception.php';
-
-/**
- * Class representing a HTTP response
- *
- * The class is designed to be used in "streaming" scenario, building the
- * response as it is being received:
- * <code>
- * $statusLine = read_status_line();
- * $response = new HTTP_Request2_Response($statusLine);
- * do {
- *     $headerLine = read_header_line();
- *     $response->parseHeaderLine($headerLine);
- * } while ($headerLine != '');
- *
- * while ($chunk = read_body()) {
- *     $response->appendBody($chunk);
- * }
- *
- * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());
- * </code>
- *
- *
- * @category   HTTP
- * @package    HTTP_Request2
- * @author     Alexey Borzov <avb@php.net>
- * @version    Release: 0.5.2
- * @link       http://tools.ietf.org/html/rfc2616#section-6
- */
-class HTTP_Request2_Response
-{
-   /**
-    * HTTP protocol version (e.g. 1.0, 1.1)
-    * @var  string
-    */
-    protected $version;
-
-   /**
-    * Status code
-    * @var  integer
-    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-    */
-    protected $code;
-
-   /**
-    * Reason phrase
-    * @var  string
-    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
-    */
-    protected $reasonPhrase;
-
-   /**
-    * Associative array of response headers
-    * @var  array
-    */
-    protected $headers = array();
-
-   /**
-    * Cookies set in the response
-    * @var  array
-    */
-    protected $cookies = array();
-
-   /**
-    * Name of last header processed by parseHederLine()
-    *
-    * Used to handle the headers that span multiple lines
-    *
-    * @var  string
-    */
-    protected $lastHeader = null;
-
-   /**
-    * Response body
-    * @var  string
-    */
-    protected $body = '';
-
-   /**
-    * Whether the body is still encoded by Content-Encoding
-    *
-    * cURL provides the decoded body to the callback; if we are reading from
-    * socket the body is still gzipped / deflated
-    *
-    * @var  bool
-    */
-    protected $bodyEncoded;
-
-   /**
-    * Associative array of HTTP status code / reason phrase.
-    *
-    * @var  array
-    * @link http://tools.ietf.org/html/rfc2616#section-10
-    */
-    protected static $phrases = array(
-
-        // 1xx: Informational - Request received, continuing process
-        100 => 'Continue',
-        101 => 'Switching Protocols',
-
-        // 2xx: Success - The action was successfully received, understood and
-        // accepted
-        200 => 'OK',
-        201 => 'Created',
-        202 => 'Accepted',
-        203 => 'Non-Authoritative Information',
-        204 => 'No Content',
-        205 => 'Reset Content',
-        206 => 'Partial Content',
-
-        // 3xx: Redirection - Further action must be taken in order to complete
-        // the request
-        300 => 'Multiple Choices',
-        301 => 'Moved Permanently',
-        302 => 'Found',  // 1.1
-        303 => 'See Other',
-        304 => 'Not Modified',
-        305 => 'Use Proxy',
-        307 => 'Temporary Redirect',
-
-        // 4xx: Client Error - The request contains bad syntax or cannot be
-        // fulfilled
-        400 => 'Bad Request',
-        401 => 'Unauthorized',
-        402 => 'Payment Required',
-        403 => 'Forbidden',
-        404 => 'Not Found',
-        405 => 'Method Not Allowed',
-        406 => 'Not Acceptable',
-        407 => 'Proxy Authentication Required',
-        408 => 'Request Timeout',
-        409 => 'Conflict',
-        410 => 'Gone',
-        411 => 'Length Required',
-        412 => 'Precondition Failed',
-        413 => 'Request Entity Too Large',
-        414 => 'Request-URI Too Long',
-        415 => 'Unsupported Media Type',
-        416 => 'Requested Range Not Satisfiable',
-        417 => 'Expectation Failed',
-
-        // 5xx: Server Error - The server failed to fulfill an apparently
-        // valid request
-        500 => 'Internal Server Error',
-        501 => 'Not Implemented',
-        502 => 'Bad Gateway',
-        503 => 'Service Unavailable',
-        504 => 'Gateway Timeout',
-        505 => 'HTTP Version Not Supported',
-        509 => 'Bandwidth Limit Exceeded',
-
-    );
-
-   /**
-    * Constructor, parses the response status line
-    *
-    * @param    string  Response status line (e.g. "HTTP/1.1 200 OK")
-    * @param    bool    Whether body is still encoded by Content-Encoding
-    * @throws   HTTP_Request2_Exception if status line is invalid according to spec
-    */
-    public function __construct($statusLine, $bodyEncoded = true)
-    {
-        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
-            throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");
-        }
-        $this->version = $m[1];
-        $this->code    = intval($m[2]);
-        if (!empty($m[3])) {
-            $this->reasonPhrase = trim($m[3]);
-        } elseif (!empty(self::$phrases[$this->code])) {
-            $this->reasonPhrase = self::$phrases[$this->code];
-        }
-        $this->bodyEncoded = (bool)$bodyEncoded;
-    }
-
-   /**
-    * Parses the line from HTTP response filling $headers array
-    *
-    * The method should be called after reading the line from socket or receiving
-    * it into cURL callback. Passing an empty string here indicates the end of
-    * response headers and triggers additional processing, so be sure to pass an
-    * empty string in the end.
-    *
-    * @param    string  Line from HTTP response
-    */
-    public function parseHeaderLine($headerLine)
-    {
-        $headerLine = trim($headerLine, "\r\n");
-
-        // empty string signals the end of headers, process the received ones
-        if ('' == $headerLine) {
-            if (!empty($this->headers['set-cookie'])) {
-                $cookies = is_array($this->headers['set-cookie'])?
-                           $this->headers['set-cookie']:
-                           array($this->headers['set-cookie']);
-                foreach ($cookies as $cookieString) {
-                    $this->parseCookie($cookieString);
-                }
-                unset($this->headers['set-cookie']);
-            }
-            foreach (array_keys($this->headers) as $k) {
-                if (is_array($this->headers[$k])) {
-                    $this->headers[$k] = implode(', ', $this->headers[$k]);
-                }
-            }
-
-        // string of the form header-name: header value
-        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
-            $name  = strtolower($m[1]);
-            $value = trim($m[2]);
-            if (empty($this->headers[$name])) {
-                $this->headers[$name] = $value;
-            } else {
-                if (!is_array($this->headers[$name])) {
-                    $this->headers[$name] = array($this->headers[$name]);
-                }
-                $this->headers[$name][] = $value;
-            }
-            $this->lastHeader = $name;
-
-        // continuation of a previous header
-        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
-            if (!is_array($this->headers[$this->lastHeader])) {
-                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
-            } else {
-                $key = count($this->headers[$this->lastHeader]) - 1;
-                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
-            }
-        }
-    }
-
-   /**
-    * Parses a Set-Cookie header to fill $cookies array
-    *
-    * @param    string    value of Set-Cookie header
-    * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
-    */
-    protected function parseCookie($cookieString)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($cookieString, ';')) {
-            $pos = strpos($cookieString, '=');
-            $cookie['name']  = trim(substr($cookieString, 0, $pos));
-            $cookie['value'] = trim(substr($cookieString, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $cookieString);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->cookies[] = $cookie;
-    }
-
-   /**
-    * Appends a string to the response body
-    * @param    string
-    */
-    public function appendBody($bodyChunk)
-    {
-        $this->body .= $bodyChunk;
-    }
-
-   /**
-    * Returns the status code
-    * @return   integer
-    */
-    public function getStatus()
-    {
-        return $this->code;
-    }
-
-   /**
-    * Returns the reason phrase
-    * @return   string
-    */
-    public function getReasonPhrase()
-    {
-        return $this->reasonPhrase;
-    }
-
-   /**
-    * Whether response is a redirect that can be automatically handled by HTTP_Request2
-    * @return   bool
-    */
-    public function isRedirect()
-    {
-        return in_array($this->code, array(300, 301, 302, 303, 307))
-               && isset($this->headers['location']);
-    }
-
-   /**
-    * Returns either the named header or all response headers
-    *
-    * @param    string          Name of header to return
-    * @return   string|array    Value of $headerName header (null if header is
-    *                           not present), array of all response headers if
-    *                           $headerName is null
-    */
-    public function getHeader($headerName = null)
-    {
-        if (null === $headerName) {
-            return $this->headers;
-        } else {
-            $headerName = strtolower($headerName);
-            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
-        }
-    }
-
-   /**
-    * Returns cookies set in response
-    *
-    * @return   array
-    */
-    public function getCookies()
-    {
-        return $this->cookies;
-    }
-
-   /**
-    * Returns the body of the response
-    *
-    * @return   string
-    * @throws   HTTP_Request2_Exception if body cannot be decoded
-    */
-    public function getBody()
-    {
-        if (!$this->bodyEncoded ||
-            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
-        ) {
-            return $this->body;
-
-        } else {
-            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-                $oldEncoding = mb_internal_encoding();
-                mb_internal_encoding('iso-8859-1');
-            }
-
-            try {
-                switch (strtolower($this->getHeader('content-encoding'))) {
-                    case 'gzip':
-                        $decoded = self::decodeGzip($this->body);
-                        break;
-                    case 'deflate':
-                        $decoded = self::decodeDeflate($this->body);
-                }
-            } catch (Exception $e) {
-            }
-
-            if (!empty($oldEncoding)) {
-                mb_internal_encoding($oldEncoding);
-            }
-            if (!empty($e)) {
-                throw $e;
-            }
-            return $decoded;
-        }
-    }
-
-   /**
-    * Get the HTTP version of the response
-    *
-    * @return   string
-    */
-    public function getVersion()
-    {
-        return $this->version;
-    }
-
-   /**
-    * Decodes the message-body encoded by gzip
-    *
-    * The real decoding work is done by gzinflate() built-in function, this
-    * method only parses the header and checks data for compliance with
-    * RFC 1952
-    *
-    * @param    string  gzip-encoded data
-    * @return   string  decoded data
-    * @throws   HTTP_Request2_Exception
-    * @link     http://tools.ietf.org/html/rfc1952
-    */
-    public static function decodeGzip($data)
-    {
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        if (!function_exists('gzinflate')) {
-            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 2) {
-            if ($length - $headerLength - 2 < 8) {
-                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                throw new HTTP_Request2_Exception('Header CRC check failed');
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
-        $unpacked = gzinflate(substr($data, $headerLength, -8));
-        if (false === $unpacked) {
-            throw new HTTP_Request2_Exception('gzinflate() call failed');
-        } elseif ($dataSize != strlen($unpacked)) {
-            throw new HTTP_Request2_Exception('Data size check failed');
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            throw new HTTP_Request2_Exception('Data CRC check failed');
-        }
-        return $unpacked;
-    }
-
-   /**
-    * Decodes the message-body encoded by deflate
-    *
-    * @param    string  deflate-encoded data
-    * @return   string  decoded data
-    * @throws   HTTP_Request2_Exception
-    */
-    public static function decodeDeflate($data)
-    {
-        if (!function_exists('gzuncompress')) {
-            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
-        }
-        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
-        // while many applications send raw deflate stream from RFC 1951.
-        // We should check for presence of zlib header and use gzuncompress() or
-        // gzinflate() as needed. See bug #15305
-        $header = unpack('n', substr($data, 0, 2));
-        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
-    }
-}
+<?php
+/**
+ * Class representing a HTTP response
+ *
+ * PHP version 5
+ *
+ * LICENSE:
+ *
+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    * Redistributions of source code must retain the above copyright
+ *      notice, this list of conditions and the following disclaimer.
+ *    * Redistributions in binary form must reproduce the above copyright
+ *      notice, this list of conditions and the following disclaimer in the
+ *      documentation and/or other materials provided with the distribution.
+ *    * The names of the authors may not be used to endorse or promote products
+ *      derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version    SVN: $Id: Response.php 290520 2009-11-11 20:09:42Z avb $
+ * @link       http://pear.php.net/package/HTTP_Request2
+ */
+
+/**
+ * Exception class for HTTP_Request2 package
+ */
+require_once 'HTTP/Request2/Exception.php';
+
+/**
+ * Class representing a HTTP response
+ *
+ * The class is designed to be used in "streaming" scenario, building the
+ * response as it is being received:
+ * <code>
+ * $statusLine = read_status_line();
+ * $response = new HTTP_Request2_Response($statusLine);
+ * do {
+ *     $headerLine = read_header_line();
+ *     $response->parseHeaderLine($headerLine);
+ * } while ($headerLine != '');
+ *
+ * while ($chunk = read_body()) {
+ *     $response->appendBody($chunk);
+ * }
+ *
+ * var_dump($response->getHeader(), $response->getCookies(), $response->getBody());
+ * </code>
+ *
+ *
+ * @category   HTTP
+ * @package    HTTP_Request2
+ * @author     Alexey Borzov <avb@php.net>
+ * @version    Release: 0.5.2
+ * @link       http://tools.ietf.org/html/rfc2616#section-6
+ */
+class HTTP_Request2_Response
+{
+   /**
+    * HTTP protocol version (e.g. 1.0, 1.1)
+    * @var  string
+    */
+    protected $version;
+
+   /**
+    * Status code
+    * @var  integer
+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
+    */
+    protected $code;
+
+   /**
+    * Reason phrase
+    * @var  string
+    * @link http://tools.ietf.org/html/rfc2616#section-6.1.1
+    */
+    protected $reasonPhrase;
+
+   /**
+    * Associative array of response headers
+    * @var  array
+    */
+    protected $headers = array();
+
+   /**
+    * Cookies set in the response
+    * @var  array
+    */
+    protected $cookies = array();
+
+   /**
+    * Name of last header processed by parseHederLine()
+    *
+    * Used to handle the headers that span multiple lines
+    *
+    * @var  string
+    */
+    protected $lastHeader = null;
+
+   /**
+    * Response body
+    * @var  string
+    */
+    protected $body = '';
+
+   /**
+    * Whether the body is still encoded by Content-Encoding
+    *
+    * cURL provides the decoded body to the callback; if we are reading from
+    * socket the body is still gzipped / deflated
+    *
+    * @var  bool
+    */
+    protected $bodyEncoded;
+
+   /**
+    * Associative array of HTTP status code / reason phrase.
+    *
+    * @var  array
+    * @link http://tools.ietf.org/html/rfc2616#section-10
+    */
+    protected static $phrases = array(
+
+        // 1xx: Informational - Request received, continuing process
+        100 => 'Continue',
+        101 => 'Switching Protocols',
+
+        // 2xx: Success - The action was successfully received, understood and
+        // accepted
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+
+        // 3xx: Redirection - Further action must be taken in order to complete
+        // the request
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',  // 1.1
+        303 => 'See Other',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+
+        // 4xx: Client Error - The request contains bad syntax or cannot be
+        // fulfilled
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        402 => 'Payment Required',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+
+        // 5xx: Server Error - The server failed to fulfill an apparently
+        // valid request
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported',
+        509 => 'Bandwidth Limit Exceeded',
+
+    );
+
+   /**
+    * Constructor, parses the response status line
+    *
+    * @param    string  Response status line (e.g. "HTTP/1.1 200 OK")
+    * @param    bool    Whether body is still encoded by Content-Encoding
+    * @throws   HTTP_Request2_Exception if status line is invalid according to spec
+    */
+    public function __construct($statusLine, $bodyEncoded = true)
+    {
+        if (!preg_match('!^HTTP/(\d\.\d) (\d{3})(?: (.+))?!', $statusLine, $m)) {
+            throw new HTTP_Request2_Exception("Malformed response: {$statusLine}");
+        }
+        $this->version = $m[1];
+        $this->code    = intval($m[2]);
+        if (!empty($m[3])) {
+            $this->reasonPhrase = trim($m[3]);
+        } elseif (!empty(self::$phrases[$this->code])) {
+            $this->reasonPhrase = self::$phrases[$this->code];
+        }
+        $this->bodyEncoded = (bool)$bodyEncoded;
+    }
+
+   /**
+    * Parses the line from HTTP response filling $headers array
+    *
+    * The method should be called after reading the line from socket or receiving
+    * it into cURL callback. Passing an empty string here indicates the end of
+    * response headers and triggers additional processing, so be sure to pass an
+    * empty string in the end.
+    *
+    * @param    string  Line from HTTP response
+    */
+    public function parseHeaderLine($headerLine)
+    {
+        $headerLine = trim($headerLine, "\r\n");
+
+        // empty string signals the end of headers, process the received ones
+        if ('' == $headerLine) {
+            if (!empty($this->headers['set-cookie'])) {
+                $cookies = is_array($this->headers['set-cookie'])?
+                           $this->headers['set-cookie']:
+                           array($this->headers['set-cookie']);
+                foreach ($cookies as $cookieString) {
+                    $this->parseCookie($cookieString);
+                }
+                unset($this->headers['set-cookie']);
+            }
+            foreach (array_keys($this->headers) as $k) {
+                if (is_array($this->headers[$k])) {
+                    $this->headers[$k] = implode(', ', $this->headers[$k]);
+                }
+            }
+
+        // string of the form header-name: header value
+        } elseif (preg_match('!^([^\x00-\x1f\x7f-\xff()<>@,;:\\\\"/\[\]?={}\s]+):(.+)$!', $headerLine, $m)) {
+            $name  = strtolower($m[1]);
+            $value = trim($m[2]);
+            if (empty($this->headers[$name])) {
+                $this->headers[$name] = $value;
+            } else {
+                if (!is_array($this->headers[$name])) {
+                    $this->headers[$name] = array($this->headers[$name]);
+                }
+                $this->headers[$name][] = $value;
+            }
+            $this->lastHeader = $name;
+
+        // continuation of a previous header
+        } elseif (preg_match('!^\s+(.+)$!', $headerLine, $m) && $this->lastHeader) {
+            if (!is_array($this->headers[$this->lastHeader])) {
+                $this->headers[$this->lastHeader] .= ' ' . trim($m[1]);
+            } else {
+                $key = count($this->headers[$this->lastHeader]) - 1;
+                $this->headers[$this->lastHeader][$key] .= ' ' . trim($m[1]);
+            }
+        }
+    }
+
+   /**
+    * Parses a Set-Cookie header to fill $cookies array
+    *
+    * @param    string    value of Set-Cookie header
+    * @link     http://web.archive.org/web/20080331104521/http://cgi.netscape.com/newsref/std/cookie_spec.html
+    */
+    protected function parseCookie($cookieString)
+    {
+        $cookie = array(
+            'expires' => null,
+            'domain'  => null,
+            'path'    => null,
+            'secure'  => false
+        );
+
+        // Only a name=value pair
+        if (!strpos($cookieString, ';')) {
+            $pos = strpos($cookieString, '=');
+            $cookie['name']  = trim(substr($cookieString, 0, $pos));
+            $cookie['value'] = trim(substr($cookieString, $pos + 1));
+
+        // Some optional parameters are supplied
+        } else {
+            $elements = explode(';', $cookieString);
+            $pos = strpos($elements[0], '=');
+            $cookie['name']  = trim(substr($elements[0], 0, $pos));
+            $cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+            for ($i = 1; $i < count($elements); $i++) {
+                if (false === strpos($elements[$i], '=')) {
+                    $elName  = trim($elements[$i]);
+                    $elValue = null;
+                } else {
+                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+                }
+                $elName = strtolower($elName);
+                if ('secure' == $elName) {
+                    $cookie['secure'] = true;
+                } elseif ('expires' == $elName) {
+                    $cookie['expires'] = str_replace('"', '', $elValue);
+                } elseif ('path' == $elName || 'domain' == $elName) {
+                    $cookie[$elName] = urldecode($elValue);
+                } else {
+                    $cookie[$elName] = $elValue;
+                }
+            }
+        }
+        $this->cookies[] = $cookie;
+    }
+
+   /**
+    * Appends a string to the response body
+    * @param    string
+    */
+    public function appendBody($bodyChunk)
+    {
+        $this->body .= $bodyChunk;
+    }
+
+   /**
+    * Returns the status code
+    * @return   integer
+    */
+    public function getStatus()
+    {
+        return $this->code;
+    }
+
+   /**
+    * Returns the reason phrase
+    * @return   string
+    */
+    public function getReasonPhrase()
+    {
+        return $this->reasonPhrase;
+    }
+
+   /**
+    * Whether response is a redirect that can be automatically handled by HTTP_Request2
+    * @return   bool
+    */
+    public function isRedirect()
+    {
+        return in_array($this->code, array(300, 301, 302, 303, 307))
+               && isset($this->headers['location']);
+    }
+
+   /**
+    * Returns either the named header or all response headers
+    *
+    * @param    string          Name of header to return
+    * @return   string|array    Value of $headerName header (null if header is
+    *                           not present), array of all response headers if
+    *                           $headerName is null
+    */
+    public function getHeader($headerName = null)
+    {
+        if (null === $headerName) {
+            return $this->headers;
+        } else {
+            $headerName = strtolower($headerName);
+            return isset($this->headers[$headerName])? $this->headers[$headerName]: null;
+        }
+    }
+
+   /**
+    * Returns cookies set in response
+    *
+    * @return   array
+    */
+    public function getCookies()
+    {
+        return $this->cookies;
+    }
+
+   /**
+    * Returns the body of the response
+    *
+    * @return   string
+    * @throws   HTTP_Request2_Exception if body cannot be decoded
+    */
+    public function getBody()
+    {
+        if (!$this->bodyEncoded ||
+            !in_array(strtolower($this->getHeader('content-encoding')), array('gzip', 'deflate'))
+        ) {
+            return $this->body;
+
+        } else {
+            if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+                $oldEncoding = mb_internal_encoding();
+                mb_internal_encoding('iso-8859-1');
+            }
+
+            try {
+                switch (strtolower($this->getHeader('content-encoding'))) {
+                    case 'gzip':
+                        $decoded = self::decodeGzip($this->body);
+                        break;
+                    case 'deflate':
+                        $decoded = self::decodeDeflate($this->body);
+                }
+            } catch (Exception $e) {
+            }
+
+            if (!empty($oldEncoding)) {
+                mb_internal_encoding($oldEncoding);
+            }
+            if (!empty($e)) {
+                throw $e;
+            }
+            return $decoded;
+        }
+    }
+
+   /**
+    * Get the HTTP version of the response
+    *
+    * @return   string
+    */
+    public function getVersion()
+    {
+        return $this->version;
+    }
+
+   /**
+    * Decodes the message-body encoded by gzip
+    *
+    * The real decoding work is done by gzinflate() built-in function, this
+    * method only parses the header and checks data for compliance with
+    * RFC 1952
+    *
+    * @param    string  gzip-encoded data
+    * @return   string  decoded data
+    * @throws   HTTP_Request2_Exception
+    * @link     http://tools.ietf.org/html/rfc1952
+    */
+    public static function decodeGzip($data)
+    {
+        $length = strlen($data);
+        // If it doesn't look like gzip-encoded data, don't bother
+        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+            return $data;
+        }
+        if (!function_exists('gzinflate')) {
+            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
+        }
+        $method = ord(substr($data, 2, 1));
+        if (8 != $method) {
+            throw new HTTP_Request2_Exception('Error parsing gzip header: unknown compression method');
+        }
+        $flags = ord(substr($data, 3, 1));
+        if ($flags & 224) {
+            throw new HTTP_Request2_Exception('Error parsing gzip header: reserved bits are set');
+        }
+
+        // header is 10 bytes minimum. may be longer, though.
+        $headerLength = 10;
+        // extra fields, need to skip 'em
+        if ($flags & 4) {
+            if ($length - $headerLength - 2 < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $extraLength = unpack('v', substr($data, 10, 2));
+            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $headerLength += $extraLength[1] + 2;
+        }
+        // file name, need to skip that
+        if ($flags & 8) {
+            if ($length - $headerLength - 1 < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $filenameLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $headerLength += $filenameLength + 1;
+        }
+        // comment, need to skip that also
+        if ($flags & 16) {
+            if ($length - $headerLength - 1 < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $commentLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $headerLength += $commentLength + 1;
+        }
+        // have a CRC for header. let's check
+        if ($flags & 2) {
+            if ($length - $headerLength - 2 < 8) {
+                throw new HTTP_Request2_Exception('Error parsing gzip header: data too short');
+            }
+            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+            $crcStored = unpack('v', substr($data, $headerLength, 2));
+            if ($crcReal != $crcStored[1]) {
+                throw new HTTP_Request2_Exception('Header CRC check failed');
+            }
+            $headerLength += 2;
+        }
+        // unpacked data CRC and size at the end of encoded data
+        $tmp = unpack('V2', substr($data, -8));
+        $dataCrc  = $tmp[1];
+        $dataSize = $tmp[2];
+
+        // finally, call the gzinflate() function
+        // don't pass $dataSize to gzinflate, see bugs #13135, #14370
+        $unpacked = gzinflate(substr($data, $headerLength, -8));
+        if (false === $unpacked) {
+            throw new HTTP_Request2_Exception('gzinflate() call failed');
+        } elseif ($dataSize != strlen($unpacked)) {
+            throw new HTTP_Request2_Exception('Data size check failed');
+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+            throw new HTTP_Request2_Exception('Data CRC check failed');
+        }
+        return $unpacked;
+    }
+
+   /**
+    * Decodes the message-body encoded by deflate
+    *
+    * @param    string  deflate-encoded data
+    * @return   string  decoded data
+    * @throws   HTTP_Request2_Exception
+    */
+    public static function decodeDeflate($data)
+    {
+        if (!function_exists('gzuncompress')) {
+            throw new HTTP_Request2_Exception('Unable to decode body: gzip extension not available');
+        }
+        // RFC 2616 defines 'deflate' encoding as zlib format from RFC 1950,
+        // while many applications send raw deflate stream from RFC 1951.
+        // We should check for presence of zlib header and use gzuncompress() or
+        // gzinflate() as needed. See bug #15305
+        $header = unpack('n', substr($data, 0, 2));
+        return (0 == $header[1] % 31)? gzuncompress($data): gzinflate($data);
+    }
+}
 ?>
\ No newline at end of file
diff --git a/libs/PEAR/HTTP/Request.php b/libs/PEAR/HTTP/Request.php
index 67062ccd6..96fc2e5ba 100644
--- a/libs/PEAR/HTTP/Request.php
+++ b/libs/PEAR/HTTP/Request.php
@@ -1,1461 +1,1461 @@
-<?php
-/**
- * Class for performing HTTP requests
- *
- * PHP versions 4 and 5
- * 
- * LICENSE:
- *
- * Copyright (c) 2002-2007, Richard Heyes
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * o Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * o Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * o The names of the authors may not be used to endorse or promote
- *   products derived from this software without specific prior written
- *   permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes <richard@phpguru.org>
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2002-2007 Richard Heyes
- * @license     http://opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id: Request.php,v 1.55 2007/05/18 19:20:12 avb Exp $
- * @link        http://pear.php.net/package/HTTP_Request/ 
- */
-
-/**
- * PEAR and PEAR_Error classes (for error handling)
- */
-require_once 'PEAR.php';
-/**
- * Socket class
- */
-require_once 'Net/Socket.php';
-/**
- * URL handling class
- */ 
-require_once 'Net/URL.php';
-
-/**#@+
- * Constants for HTTP request methods
- */ 
-define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
-define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
-define('HTTP_REQUEST_METHOD_POST',    'POST',    true);
-define('HTTP_REQUEST_METHOD_PUT',     'PUT',     true);
-define('HTTP_REQUEST_METHOD_DELETE',  'DELETE',  true);
-define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
-define('HTTP_REQUEST_METHOD_TRACE',   'TRACE',   true);
-/**#@-*/
-
-/**#@+
- * Constants for HTTP protocol versions
- */
-define('HTTP_REQUEST_HTTP_VER_1_0', '1.0', true);
-define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
-/**#@-*/
-
-if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
-   /**
-    * Whether string functions are overloaded by their mbstring equivalents 
-    */
-    define('HTTP_REQUEST_MBSTRING', true);
-} else {
-   /**
-    * @ignore
-    */
-    define('HTTP_REQUEST_MBSTRING', false);
-}
-
-/**
- * Class for performing HTTP requests
- *
- * Simple example (fetches yahoo.com and displays it):
- * <code>
- * $a = &new HTTP_Request('http://www.yahoo.com/');
- * $a->sendRequest();
- * echo $a->getResponseBody();
- * </code>
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes <richard@phpguru.org>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 1.4.1
- */
-class HTTP_Request
-{
-   /**#@+
-    * @access private
-    */
-    /**
-    * Instance of Net_URL
-    * @var Net_URL
-    */
-    var $_url;
-
-    /**
-    * Type of request
-    * @var string
-    */
-    var $_method;
-
-    /**
-    * HTTP Version
-    * @var string
-    */
-    var $_http;
-
-    /**
-    * Request headers
-    * @var array
-    */
-    var $_requestHeaders;
-
-    /**
-    * Basic Auth Username
-    * @var string
-    */
-    var $_user;
-    
-    /**
-    * Basic Auth Password
-    * @var string
-    */
-    var $_pass;
-
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-    
-    /**
-    * Proxy server
-    * @var string
-    */
-    var $_proxy_host;
-    
-    /**
-    * Proxy port
-    * @var integer
-    */
-    var $_proxy_port;
-    
-    /**
-    * Proxy username
-    * @var string
-    */
-    var $_proxy_user;
-    
-    /**
-    * Proxy password
-    * @var string
-    */
-    var $_proxy_pass;
-
-    /**
-    * Post data
-    * @var array
-    */
-    var $_postData;
-
-   /**
-    * Request body  
-    * @var string
-    */
-    var $_body;
-
-   /**
-    * A list of methods that MUST NOT have a request body, per RFC 2616
-    * @var array
-    */
-    var $_bodyDisallowed = array('TRACE');
-
-   /**
-    * Files to post 
-    * @var array
-    */
-    var $_postFiles = array();
-
-    /**
-    * Connection timeout.
-    * @var float
-    */
-    var $_timeout;
-    
-    /**
-    * HTTP_Response object
-    * @var HTTP_Response
-    */
-    var $_response;
-    
-    /**
-    * Whether to allow redirects
-    * @var boolean
-    */
-    var $_allowRedirects;
-    
-    /**
-    * Maximum redirects allowed
-    * @var integer
-    */
-    var $_maxRedirects;
-    
-    /**
-    * Current number of redirects
-    * @var integer
-    */
-    var $_redirects;
-
-   /**
-    * Whether to append brackets [] to array variables
-    * @var bool
-    */
-    var $_useBrackets = true;
-
-   /**
-    * Attached listeners
-    * @var array
-    */
-    var $_listeners = array();
-
-   /**
-    * Whether to save response body in response object property  
-    * @var bool
-    */
-    var $_saveBody = true;
-
-   /**
-    * Timeout for reading from socket (array(seconds, microseconds))
-    * @var array
-    */
-    var $_readTimeout = null;
-
-   /**
-    * Options to pass to Net_Socket::connect. See stream_context_create
-    * @var array
-    */
-    var $_socketOptions = null;
-   /**#@-*/
-
-    /**
-    * Constructor
-    *
-    * Sets up the object
-    * @param    string  The url to fetch/access
-    * @param    array   Associative array of parameters which can have the following keys:
-    * <ul>
-    *   <li>method         - Method to use, GET, POST etc (string)</li>
-    *   <li>http           - HTTP Version to use, 1.0 or 1.1 (string)</li>
-    *   <li>user           - Basic Auth username (string)</li>
-    *   <li>pass           - Basic Auth password (string)</li>
-    *   <li>proxy_host     - Proxy server host (string)</li>
-    *   <li>proxy_port     - Proxy server port (integer)</li>
-    *   <li>proxy_user     - Proxy auth username (string)</li>
-    *   <li>proxy_pass     - Proxy auth password (string)</li>
-    *   <li>timeout        - Connection timeout in seconds (float)</li>
-    *   <li>allowRedirects - Whether to follow redirects or not (bool)</li>
-    *   <li>maxRedirects   - Max number of redirects to follow (integer)</li>
-    *   <li>useBrackets    - Whether to append [] to array variable names (bool)</li>
-    *   <li>saveBody       - Whether to save response body in response object property (bool)</li>
-    *   <li>readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))</li>
-    *   <li>socketOptions  - Options to pass to Net_Socket object (array)</li>
-    * </ul>
-    * @access public
-    */
-    function HTTP_Request($url = '', $params = array())
-    {
-        $this->_method         =  HTTP_REQUEST_METHOD_GET;
-        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
-        $this->_requestHeaders = array();
-        $this->_postData       = array();
-        $this->_body           = null;
-
-        $this->_user = null;
-        $this->_pass = null;
-
-        $this->_proxy_host = null;
-        $this->_proxy_port = null;
-        $this->_proxy_user = null;
-        $this->_proxy_pass = null;
-
-        $this->_allowRedirects = false;
-        $this->_maxRedirects   = 3;
-        $this->_redirects      = 0;
-
-        $this->_timeout  = null;
-        $this->_response = null;
-
-        foreach ($params as $key => $value) {
-            $this->{'_' . $key} = $value;
-        }
-
-        if (!empty($url)) {
-            $this->setURL($url);
-        }
-
-        // Default useragent
-        $this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
-
-        // We don't do keep-alives by default
-        $this->addHeader('Connection', 'close');
-
-        // Basic authentication
-        if (!empty($this->_user)) {
-            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
-        }
-
-        // Proxy authentication (see bug #5913)
-        if (!empty($this->_proxy_user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
-        }
-
-        // Use gzip encoding if possible
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
-            $this->addHeader('Accept-Encoding', 'gzip');
-        }
-    }
-    
-    /**
-    * Generates a Host header for HTTP/1.1 requests
-    *
-    * @access private
-    * @return string
-    */
-    function _generateHostHeader()
-    {
-        if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-
-        } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
-            $host = $this->_url->host . ':' . $this->_url->port;
-        
-        } else {
-            $host = $this->_url->host;
-        }
-
-        return $host;
-    }
-    
-    /**
-    * Resets the object to its initial state (DEPRECATED).
-    * Takes the same parameters as the constructor.
-    *
-    * @param  string $url    The url to be requested
-    * @param  array  $params Associative array of parameters
-    *                        (see constructor for details)
-    * @access public
-    * @deprecated deprecated since 1.2, call the constructor if this is necessary
-    */
-    function reset($url, $params = array())
-    {
-        $this->HTTP_Request($url, $params);
-    }
-
-    /**
-    * Sets the URL to be requested
-    *
-    * @param  string The url to be requested
-    * @access public
-    */
-    function setURL($url)
-    {
-        $this->_url = &new Net_URL($url, $this->_useBrackets);
-
-        if (!empty($this->_url->user) || !empty($this->_url->pass)) {
-            $this->setBasicAuth($this->_url->user, $this->_url->pass);
-        }
-
-        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
-            $this->addHeader('Host', $this->_generateHostHeader());
-        }
-
-        // set '/' instead of empty path rather than check later (see bug #8662)
-        if (empty($this->_url->path)) {
-            $this->_url->path = '/';
-        } 
-    }
-    
-   /**
-    * Returns the current request URL  
-    *
-    * @return   string  Current request URL
-    * @access   public
-    */
-    function getUrl()
-    {
-        return empty($this->_url)? '': $this->_url->getUrl();
-    }
-
-    /**
-    * Sets a proxy to be used
-    *
-    * @param string     Proxy host
-    * @param int        Proxy port
-    * @param string     Proxy username
-    * @param string     Proxy password
-    * @access public
-    */
-    function setProxy($host, $port = 8080, $user = null, $pass = null)
-    {
-        $this->_proxy_host = $host;
-        $this->_proxy_port = $port;
-        $this->_proxy_user = $user;
-        $this->_proxy_pass = $pass;
-
-        if (!empty($user)) {
-            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-        }
-    }
-
-    /**
-    * Sets basic authentication parameters
-    *
-    * @param string     Username
-    * @param string     Password
-    */
-    function setBasicAuth($user, $pass)
-    {
-        $this->_user = $user;
-        $this->_pass = $pass;
-
-        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
-    }
-
-    /**
-    * Sets the method to be used, GET, POST etc.
-    *
-    * @param string     Method to use. Use the defined constants for this
-    * @access public
-    */
-    function setMethod($method)
-    {
-        $this->_method = $method;
-    }
-
-    /**
-    * Sets the HTTP version to use, 1.0 or 1.1
-    *
-    * @param string     Version to use. Use the defined constants for this
-    * @access public
-    */
-    function setHttpVer($http)
-    {
-        $this->_http = $http;
-    }
-
-    /**
-    * Adds a request header
-    *
-    * @param string     Header name
-    * @param string     Header value
-    * @access public
-    */
-    function addHeader($name, $value)
-    {
-        $this->_requestHeaders[strtolower($name)] = $value;
-    }
-
-    /**
-    * Removes a request header
-    *
-    * @param string     Header name to remove
-    * @access public
-    */
-    function removeHeader($name)
-    {
-        if (isset($this->_requestHeaders[strtolower($name)])) {
-            unset($this->_requestHeaders[strtolower($name)]);
-        }
-    }
-
-    /**
-    * Adds a querystring parameter
-    *
-    * @param string     Querystring parameter name
-    * @param string     Querystring parameter value
-    * @param bool       Whether the value is already urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        $this->_url->addQueryString($name, $value, $preencoded);
-    }    
-    
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param string     The querystring data. Should be of the format foo=bar&x=y etc
-    * @param bool       Whether data is already urlencoded or not, default = already encoded
-    * @access public
-    */
-    function addRawQueryString($querystring, $preencoded = true)
-    {
-        $this->_url->addRawQueryString($querystring, $preencoded);
-    }
-
-    /**
-    * Adds postdata items
-    *
-    * @param string     Post data name
-    * @param string     Post data value
-    * @param bool       Whether data is already urlencoded or not, default = not
-    * @access public
-    */
-    function addPostData($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->_postData[$name] = $value;
-        } else {
-            $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
-        }
-    }
-
-   /**
-    * Recursively applies the callback function to the value
-    * 
-    * @param    mixed   Callback function
-    * @param    mixed   Value to process
-    * @access   private
-    * @return   mixed   Processed value
-    */
-    function _arrayMapRecursive($callback, $value)
-    {
-        if (!is_array($value)) {
-            return call_user_func($callback, $value);
-        } else {
-            $map = array();
-            foreach ($value as $k => $v) {
-                $map[$k] = $this->_arrayMapRecursive($callback, $v);
-            }
-            return $map;
-        }
-    }
-
-   /**
-    * Adds a file to upload
-    * 
-    * This also changes content-type to 'multipart/form-data' for proper upload
-    * 
-    * @access public
-    * @param  string    name of file-upload field
-    * @param  mixed     file name(s)
-    * @param  mixed     content-type(s) of file(s) being uploaded
-    * @return bool      true on success
-    * @throws PEAR_Error
-    */
-    function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
-    {
-        if (!is_array($fileName) && !is_readable($fileName)) {
-            return PEAR::raiseError("File '{$fileName}' is not readable");
-        } elseif (is_array($fileName)) {
-            foreach ($fileName as $name) {
-                if (!is_readable($name)) {
-                    return PEAR::raiseError("File '{$name}' is not readable");
-                }
-            }
-        }
-        $this->addHeader('Content-Type', 'multipart/form-data');
-        $this->_postFiles[$inputName] = array(
-            'name' => $fileName,
-            'type' => $contentType
-        );
-        return true;
-    }
-
-    /**
-    * Adds raw postdata (DEPRECATED)
-    *
-    * @param string     The data
-    * @param bool       Whether data is preencoded or not, default = already encoded
-    * @access public
-    * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
-    */
-    function addRawPostData($postdata, $preencoded = true)
-    {
-        $this->_body = $preencoded ? $postdata : urlencode($postdata);
-    }
-
-   /**
-    * Sets the request body (for POST, PUT and similar requests)
-    *
-    * @param    string  Request body
-    * @access   public
-    */
-    function setBody($body)
-    {
-        $this->_body = $body;
-    }
-
-    /**
-    * Clears any postdata that has been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios.
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearPostData()
-    {
-        $this->_postData = null;
-    }
-
-    /**
-    * Appends a cookie to "Cookie:" header
-    * 
-    * @param string $name cookie name
-    * @param string $value cookie value
-    * @access public
-    */
-    function addCookie($name, $value)
-    {
-        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
-        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
-    }
-    
-    /**
-    * Clears any cookies that have been added (DEPRECATED). 
-    * 
-    * Useful for multiple request scenarios
-    *
-    * @access public
-    * @deprecated deprecated since 1.2
-    */
-    function clearCookies()
-    {
-        $this->removeHeader('Cookie');
-    }
-
-    /**
-    * Sends the request
-    *
-    * @access public
-    * @param  bool   Whether to store response body in Response object property,
-    *                set this to false if downloading a LARGE file and using a Listener
-    * @return mixed  PEAR error on error, true otherwise
-    */
-    function sendRequest($saveBody = true)
-    {
-        if (!is_a($this->_url, 'Net_URL')) {
-            return PEAR::raiseError('No URL given.');
-        }
-
-        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
-        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
-
-        // 4.3.0 supports SSL connections using OpenSSL. The function test determines
-        // we running on at least 4.3.0
-        if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
-            if (isset($this->_proxy_host)) {
-                return PEAR::raiseError('HTTPS proxies are not supported.');
-            }
-            $host = 'ssl://' . $host;
-        }
-
-        // magic quotes may fuck up file uploads and chunked response processing
-        $magicQuotes = ini_get('magic_quotes_runtime');
-        ini_set('magic_quotes_runtime', false);
-
-        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
-        // connection token to a proxy server...
-        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
-            'Keep-Alive' == $this->_requestHeaders['connection'])
-        {
-            $this->removeHeader('connection');
-        }
-
-        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
-                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
-        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
-        $sockKey   = $host . ':' . $port;
-        unset($this->_sock);
-
-        // There is a connected socket in the "static" property?
-        if ($keepAlive && !empty($sockets[$sockKey]) &&
-            !empty($sockets[$sockKey]->fp)) 
-        {
-            $this->_sock =& $sockets[$sockKey];
-            $err = null;
-        } else {
-            $this->_notify('connect');
-            $this->_sock =& new Net_Socket();
-            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
-        }
-        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
-
-        if (!PEAR::isError($err)) {
-            if (!empty($this->_readTimeout)) {
-                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
-            }
-
-            $this->_notify('sentRequest');
-
-            // Read the response
-            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
-            $err = $this->_response->process(
-                $this->_saveBody && $saveBody,
-                HTTP_REQUEST_METHOD_HEAD != $this->_method
-            );
-
-            if ($keepAlive) {
-                $keepAlive = (isset($this->_response->_headers['content-length'])
-                              || (isset($this->_response->_headers['transfer-encoding'])
-                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
-                if ($keepAlive) {
-                    if (isset($this->_response->_headers['connection'])) {
-                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
-                    } else {
-                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
-                    }
-                }
-            }
-        }
-
-        ini_set('magic_quotes_runtime', $magicQuotes);
-
-        if (PEAR::isError($err)) {
-            return $err;
-        }
-
-        if (!$keepAlive) {
-            $this->disconnect();
-        // Store the connected socket in "static" property
-        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
-            $sockets[$sockKey] =& $this->_sock;
-        }
-
-        // Check for redirection
-        if (    $this->_allowRedirects
-            AND $this->_redirects <= $this->_maxRedirects
-            AND $this->getResponseCode() > 300
-            AND $this->getResponseCode() < 399
-            AND !empty($this->_response->_headers['location'])) {
-
-            
-            $redirect = $this->_response->_headers['location'];
-
-            // Absolute URL
-            if (preg_match('/^https?:\/\//i', $redirect)) {
-                $this->_url = &new Net_URL($redirect);
-                $this->addHeader('Host', $this->_generateHostHeader());
-            // Absolute path
-            } elseif ($redirect{0} == '/') {
-                $this->_url->path = $redirect;
-            
-            // Relative path
-            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $redirect = Net_URL::resolvePath($redirect);
-                $this->_url->path = $redirect;
-                
-            // Filename, no path
-            } else {
-                if (substr($this->_url->path, -1) == '/') {
-                    $redirect = $this->_url->path . $redirect;
-                } else {
-                    $redirect = dirname($this->_url->path) . '/' . $redirect;
-                }
-                $this->_url->path = $redirect;
-            }
-
-            $this->_redirects++;
-            return $this->sendRequest($saveBody);
-
-        // Too many redirects
-        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
-            return PEAR::raiseError('Too many redirects');
-        }
-
-        return true;
-    }
-
-    /**
-     * Disconnect the socket, if connected. Only useful if using Keep-Alive.
-     *
-     * @access public
-     */
-    function disconnect()
-    {
-        if (!empty($this->_sock) && !empty($this->_sock->fp)) {
-            $this->_notify('disconnect');
-            $this->_sock->disconnect();
-        }
-    }
-
-    /**
-    * Returns the response code
-    *
-    * @access public
-    * @return mixed     Response code, false if not set
-    */
-    function getResponseCode()
-    {
-        return isset($this->_response->_code) ? $this->_response->_code : false;
-    }
-
-    /**
-    * Returns either the named header or all if no name given
-    *
-    * @access public
-    * @param string     The header name to return, do not set to get all headers
-    * @return mixed     either the value of $headername (false if header is not present)
-    *                   or an array of all headers
-    */
-    function getResponseHeader($headername = null)
-    {
-        if (!isset($headername)) {
-            return isset($this->_response->_headers)? $this->_response->_headers: array();
-        } else {
-            $headername = strtolower($headername);
-            return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
-        }
-    }
-
-    /**
-    * Returns the body of the response
-    *
-    * @access public
-    * @return mixed     response body, false if not set
-    */
-    function getResponseBody()
-    {
-        return isset($this->_response->_body) ? $this->_response->_body : false;
-    }
-
-    /**
-    * Returns cookies set in response
-    * 
-    * @access public
-    * @return mixed     array of response cookies, false if none are present
-    */
-    function getResponseCookies()
-    {
-        return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
-    }
-
-    /**
-    * Builds the request string
-    *
-    * @access private
-    * @return string The request string
-    */
-    function _buildRequest()
-    {
-        $separator = ini_get('arg_separator.output');
-        ini_set('arg_separator.output', '&');
-        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
-        ini_set('arg_separator.output', $separator);
-
-        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
-        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
-        $path = $this->_url->path . $querystring;
-        $url  = $host . $port . $path;
-
-        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
-
-        if (in_array($this->_method, $this->_bodyDisallowed) ||
-            (empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
-             (empty($this->_postData) && empty($this->_postFiles)))))
-        {
-            $this->removeHeader('Content-Type');
-        } else {
-            if (empty($this->_requestHeaders['content-type'])) {
-                // Add default content-type
-                $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
-            } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
-                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
-                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
-            }
-        }
-
-        // Request Headers
-        if (!empty($this->_requestHeaders)) {
-            foreach ($this->_requestHeaders as $name => $value) {
-                $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
-                $request      .= $canonicalName . ': ' . $value . "\r\n";
-            }
-        }
-
-        // No post data or wrong method, so simply add a final CRLF
-        if (in_array($this->_method, $this->_bodyDisallowed) || 
-            (HTTP_REQUEST_METHOD_POST != $this->_method && empty($this->_body))) {
-
-            $request .= "\r\n";
-
-        // Post data if it's an array
-        } elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
-                  (!empty($this->_postData) || !empty($this->_postFiles))) {
-
-            // "normal" POST request
-            if (!isset($boundary)) {
-                $postdata = implode('&', array_map(
-                    create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
-                    $this->_flattenArray('', $this->_postData)
-                ));
-
-            // multipart request, probably with file uploads
-            } else {
-                $postdata = '';
-                if (!empty($this->_postData)) {
-                    $flatData = $this->_flattenArray('', $this->_postData);
-                    foreach ($flatData as $item) {
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
-                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
-                    }
-                }
-                foreach ($this->_postFiles as $name => $value) {
-                    if (is_array($value['name'])) {
-                        $varname       = $name . ($this->_useBrackets? '[]': '');
-                    } else {
-                        $varname       = $name;
-                        $value['name'] = array($value['name']);
-                    }
-                    foreach ($value['name'] as $key => $filename) {
-                        $fp   = fopen($filename, 'r');
-                        $data = fread($fp, filesize($filename));
-                        fclose($fp);
-                        $basename = basename($filename);
-                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
-
-                        $postdata .= '--' . $boundary . "\r\n";
-                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
-                        $postdata .= "\r\nContent-Type: " . $type;
-                        $postdata .= "\r\n\r\n" . $data . "\r\n";
-                    }
-                }
-                $postdata .= '--' . $boundary . "--\r\n";
-            }
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
-                        "\r\n\r\n";
-            $request .= $postdata;
-
-        // Explicitly set request body
-        } elseif (!empty($this->_body)) {
-
-            $request .= 'Content-Length: ' .
-                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
-                        "\r\n\r\n";
-            $request .= $this->_body;
-        }
-        
-        return $request;
-    }
-
-   /**
-    * Helper function to change the (probably multidimensional) associative array
-    * into the simple one.
-    *
-    * @param    string  name for item
-    * @param    mixed   item's values
-    * @return   array   array with the following items: array('item name', 'item value');
-    * @access   private
-    */
-    function _flattenArray($name, $values)
-    {
-        if (!is_array($values)) {
-            return array(array($name, $values));
-        } else {
-            $ret = array();
-            foreach ($values as $k => $v) {
-                if (empty($name)) {
-                    $newName = $k;
-                } elseif ($this->_useBrackets) {
-                    $newName = $name . '[' . $k . ']';
-                } else {
-                    $newName = $name;
-                }
-                $ret = array_merge($ret, $this->_flattenArray($newName, $v));
-            }
-            return $ret;
-        }
-    }
-
-
-   /**
-    * Adds a Listener to the list of listeners that are notified of
-    * the object's events
-    * 
-    * Events sent by HTTP_Request object
-    * - 'connect': on connection to server
-    * - 'sentRequest': after the request was sent
-    * - 'disconnect': on disconnection from server
-    *
-    * Events sent by HTTP_Response object
-    * - 'gotHeaders': after receiving response headers (headers are passed in $data)
-    * - 'tick': on receiving a part of response body (the part is passed in $data)
-    * - 'gzTick': on receiving a gzip-encoded part of response body (ditto)
-    * - 'gotBody': after receiving the response body (passes the decoded body in $data if it was gzipped)
-    *
-    * @param    HTTP_Request_Listener   listener to attach
-    * @return   boolean                 whether the listener was successfully attached
-    * @access   public
-    */
-    function attach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener')) {
-            return false;
-        }
-        $this->_listeners[$listener->getId()] =& $listener;
-        return true;
-    }
-
-
-   /**
-    * Removes a Listener from the list of listeners 
-    * 
-    * @param    HTTP_Request_Listener   listener to detach
-    * @return   boolean                 whether the listener was successfully detached
-    * @access   public
-    */
-    function detach(&$listener)
-    {
-        if (!is_a($listener, 'HTTP_Request_Listener') || 
-            !isset($this->_listeners[$listener->getId()])) {
-            return false;
-        }
-        unset($this->_listeners[$listener->getId()]);
-        return true;
-    }
-
-
-   /**
-    * Notifies all registered listeners of an event.
-    * 
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @access   private
-    * @see      HTTP_Request::attach()
-    */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
-}
-
-
-/**
- * Response class to complement the Request class
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Richard Heyes <richard@phpguru.org>
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 1.4.1
- */
-class HTTP_Response
-{
-    /**
-    * Socket object
-    * @var Net_Socket
-    */
-    var $_sock;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $_protocol;
-    
-    /**
-    * Return code
-    * @var string
-    */
-    var $_code;
-    
-    /**
-    * Response headers
-    * @var array
-    */
-    var $_headers;
-
-    /**
-    * Cookies set in response  
-    * @var array
-    */
-    var $_cookies;
-
-    /**
-    * Response body
-    * @var string
-    */
-    var $_body = '';
-
-   /**
-    * Used by _readChunked(): remaining length of the current chunk
-    * @var string
-    */
-    var $_chunkLength = 0;
-
-   /**
-    * Attached listeners
-    * @var array
-    */
-    var $_listeners = array();
-
-   /**
-    * Bytes left to read from message-body
-    * @var null|int
-    */
-    var $_toRead;
-
-    /**
-    * Constructor
-    *
-    * @param  Net_Socket    socket to read the response from
-    * @param  array         listeners attached to request
-    */
-    function HTTP_Response(&$sock, &$listeners)
-    {
-        $this->_sock      =& $sock;
-        $this->_listeners =& $listeners;
-    }
-
-
-   /**
-    * Processes a HTTP response
-    * 
-    * This extracts response code, headers, cookies and decodes body if it 
-    * was encoded in some way
-    *
-    * @access public
-    * @param  bool      Whether to store response body in object property, set
-    *                   this to false if downloading a LARGE file and using a Listener.
-    *                   This is assumed to be true if body is gzip-encoded.
-    * @param  bool      Whether the response can actually have a message-body.
-    *                   Will be set to false for HEAD requests.
-    * @throws PEAR_Error
-    * @return mixed     true on success, PEAR_Error in case of malformed response
-    */
-    function process($saveBody = true, $canHaveBody = true)
-    {
-        do {
-            $line = $this->_sock->readLine();
-            if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
-                return PEAR::raiseError('Malformed response.');
-            } else {
-                $this->_protocol = 'HTTP/' . $http_version;
-                $this->_code     = intval($returncode);
-            }
-            while ('' !== ($header = $this->_sock->readLine())) {
-                $this->_processHeader($header);
-            }
-        } while (100 == $this->_code);
-
-        $this->_notify('gotHeaders', $this->_headers);
-
-        // RFC 2616, section 4.4:
-        // 1. Any response message which "MUST NOT" include a message-body ... 
-        // is always terminated by the first empty line after the header fields 
-        // 3. ... If a message is received with both a
-        // Transfer-Encoding header field and a Content-Length header field,
-        // the latter MUST be ignored.
-        $canHaveBody = $canHaveBody && $this->_code >= 200 && 
-                       $this->_code != 204 && $this->_code != 304;
-
-        // If response body is present, read it and decode
-        $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
-        $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
-        $hasBody = false;
-        if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
-                0 != $this->_headers['content-length']))
-        {
-            if ($chunked || !isset($this->_headers['content-length'])) {
-                $this->_toRead = null;
-            } else {
-                $this->_toRead = $this->_headers['content-length'];
-            }
-            while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
-                if ($chunked) {
-                    $data = $this->_readChunked();
-                } elseif (is_null($this->_toRead)) {
-                    $data = $this->_sock->read(4096);
-                } else {
-                    $data = $this->_sock->read(min(4096, $this->_toRead));
-                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-                }
-                if ('' == $data) {
-                    break;
-                } else {
-                    $hasBody = true;
-                    if ($saveBody || $gzipped) {
-                        $this->_body .= $data;
-                    }
-                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
-                }
-            }
-        }
-
-        if ($hasBody) {
-            // Uncompress the body if needed
-            if ($gzipped) {
-                $body = $this->_decodeGzip($this->_body);
-                if (PEAR::isError($body)) {
-                    return $body;
-                }
-                $this->_body = $body;
-                $this->_notify('gotBody', $this->_body);
-            } else {
-                $this->_notify('gotBody');
-            }
-        }
-        return true;
-    }
-
-
-   /**
-    * Processes the response header
-    *
-    * @access private
-    * @param  string    HTTP header
-    */
-    function _processHeader($header)
-    {
-        if (false === strpos($header, ':')) {
-            return;
-        }
-        list($headername, $headervalue) = explode(':', $header, 2);
-        $headername  = strtolower($headername);
-        $headervalue = ltrim($headervalue);
-        
-        if ('set-cookie' != $headername) {
-            if (isset($this->_headers[$headername])) {
-                $this->_headers[$headername] .= ',' . $headervalue;
-            } else {
-                $this->_headers[$headername]  = $headervalue;
-            }
-        } else {
-            $this->_parseCookie($headervalue);
-        }
-    }
-
-
-   /**
-    * Parse a Set-Cookie header to fill $_cookies array
-    *
-    * @access private
-    * @param  string    value of Set-Cookie header
-    */
-    function _parseCookie($headervalue)
-    {
-        $cookie = array(
-            'expires' => null,
-            'domain'  => null,
-            'path'    => null,
-            'secure'  => false
-        );
-
-        // Only a name=value pair
-        if (!strpos($headervalue, ';')) {
-            $pos = strpos($headervalue, '=');
-            $cookie['name']  = trim(substr($headervalue, 0, $pos));
-            $cookie['value'] = trim(substr($headervalue, $pos + 1));
-
-        // Some optional parameters are supplied
-        } else {
-            $elements = explode(';', $headervalue);
-            $pos = strpos($elements[0], '=');
-            $cookie['name']  = trim(substr($elements[0], 0, $pos));
-            $cookie['value'] = trim(substr($elements[0], $pos + 1));
-
-            for ($i = 1; $i < count($elements); $i++) {
-                if (false === strpos($elements[$i], '=')) {
-                    $elName  = trim($elements[$i]);
-                    $elValue = null;
-                } else {
-                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
-                }
-                $elName = strtolower($elName);
-                if ('secure' == $elName) {
-                    $cookie['secure'] = true;
-                } elseif ('expires' == $elName) {
-                    $cookie['expires'] = str_replace('"', '', $elValue);
-                } elseif ('path' == $elName || 'domain' == $elName) {
-                    $cookie[$elName] = urldecode($elValue);
-                } else {
-                    $cookie[$elName] = $elValue;
-                }
-            }
-        }
-        $this->_cookies[] = $cookie;
-    }
-
-
-   /**
-    * Read a part of response body encoded with chunked Transfer-Encoding
-    * 
-    * @access private
-    * @return string
-    */
-    function _readChunked()
-    {
-        // at start of the next chunk?
-        if (0 == $this->_chunkLength) {
-            $line = $this->_sock->readLine();
-            if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
-                $this->_chunkLength = hexdec($matches[1]); 
-                // Chunk with zero length indicates the end
-                if (0 == $this->_chunkLength) {
-                    $this->_sock->readLine(); // make this an eof()
-                    return '';
-                }
-            } else {
-                return '';
-            }
-        }
-        $data = $this->_sock->read($this->_chunkLength);
-        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
-        if (0 == $this->_chunkLength) {
-            $this->_sock->readLine(); // Trailing CRLF
-        }
-        return $data;
-    }
-
-
-   /**
-    * Notifies all registered listeners of an event.
-    * 
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @access   private
-    * @see HTTP_Request::_notify()
-    */
-    function _notify($event, $data = null)
-    {
-        foreach (array_keys($this->_listeners) as $id) {
-            $this->_listeners[$id]->update($this, $event, $data);
-        }
-    }
-
-
-   /**
-    * Decodes the message-body encoded by gzip
-    *
-    * The real decoding work is done by gzinflate() built-in function, this
-    * method only parses the header and checks data for compliance with
-    * RFC 1952  
-    *
-    * @access   private
-    * @param    string  gzip-encoded data
-    * @return   string  decoded data
-    */
-    function _decodeGzip($data)
-    {
-        if (HTTP_REQUEST_MBSTRING) {
-            $oldEncoding = mb_internal_encoding();
-            mb_internal_encoding('iso-8859-1');
-        }
-        $length = strlen($data);
-        // If it doesn't look like gzip-encoded data, don't bother
-        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
-            return $data;
-        }
-        $method = ord(substr($data, 2, 1));
-        if (8 != $method) {
-            return PEAR::raiseError('_decodeGzip(): unknown compression method');
-        }
-        $flags = ord(substr($data, 3, 1));
-        if ($flags & 224) {
-            return PEAR::raiseError('_decodeGzip(): reserved bits are set');
-        }
-
-        // header is 10 bytes minimum. may be longer, though.
-        $headerLength = 10;
-        // extra fields, need to skip 'em
-        if ($flags & 4) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $extraLength = unpack('v', substr($data, 10, 2));
-            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $headerLength += $extraLength[1] + 2;
-        }
-        // file name, need to skip that
-        if ($flags & 8) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $filenameLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $headerLength += $filenameLength + 1;
-        }
-        // comment, need to skip that also
-        if ($flags & 16) {
-            if ($length - $headerLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $commentLength = strpos(substr($data, $headerLength), chr(0));
-            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $headerLength += $commentLength + 1;
-        }
-        // have a CRC for header. let's check
-        if ($flags & 1) {
-            if ($length - $headerLength - 2 < 8) {
-                return PEAR::raiseError('_decodeGzip(): data too short');
-            }
-            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
-            $crcStored = unpack('v', substr($data, $headerLength, 2));
-            if ($crcReal != $crcStored[1]) {
-                return PEAR::raiseError('_decodeGzip(): header CRC check failed');
-            }
-            $headerLength += 2;
-        }
-        // unpacked data CRC and size at the end of encoded data
-        $tmp = unpack('V2', substr($data, -8));
-        $dataCrc  = $tmp[1];
-        $dataSize = $tmp[2];
-
-        // finally, call the gzinflate() function
-        $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
-        if (false === $unpacked) {
-            return PEAR::raiseError('_decodeGzip(): gzinflate() call failed');
-        } elseif ($dataSize != strlen($unpacked)) {
-            return PEAR::raiseError('_decodeGzip(): data size check failed');
-        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
-            return PEAR::raiseError('_decodeGzip(): data CRC check failed');
-        }
-        if (HTTP_REQUEST_MBSTRING) {
-            mb_internal_encoding($oldEncoding);
-        }
-        return $unpacked;
-    }
-} // End class HTTP_Response
-?>
+<?php
+/**
+ * Class for performing HTTP requests
+ *
+ * PHP versions 4 and 5
+ * 
+ * LICENSE:
+ *
+ * Copyright (c) 2002-2007, Richard Heyes
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Richard Heyes <richard@phpguru.org>
+ * @author      Alexey Borzov <avb@php.net>
+ * @copyright   2002-2007 Richard Heyes
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: Request.php,v 1.55 2007/05/18 19:20:12 avb Exp $
+ * @link        http://pear.php.net/package/HTTP_Request/ 
+ */
+
+/**
+ * PEAR and PEAR_Error classes (for error handling)
+ */
+require_once 'PEAR.php';
+/**
+ * Socket class
+ */
+require_once 'Net/Socket.php';
+/**
+ * URL handling class
+ */ 
+require_once 'Net/URL.php';
+
+/**#@+
+ * Constants for HTTP request methods
+ */ 
+define('HTTP_REQUEST_METHOD_GET',     'GET',     true);
+define('HTTP_REQUEST_METHOD_HEAD',    'HEAD',    true);
+define('HTTP_REQUEST_METHOD_POST',    'POST',    true);
+define('HTTP_REQUEST_METHOD_PUT',     'PUT',     true);
+define('HTTP_REQUEST_METHOD_DELETE',  'DELETE',  true);
+define('HTTP_REQUEST_METHOD_OPTIONS', 'OPTIONS', true);
+define('HTTP_REQUEST_METHOD_TRACE',   'TRACE',   true);
+/**#@-*/
+
+/**#@+
+ * Constants for HTTP protocol versions
+ */
+define('HTTP_REQUEST_HTTP_VER_1_0', '1.0', true);
+define('HTTP_REQUEST_HTTP_VER_1_1', '1.1', true);
+/**#@-*/
+
+if (extension_loaded('mbstring') && (2 & ini_get('mbstring.func_overload'))) {
+   /**
+    * Whether string functions are overloaded by their mbstring equivalents 
+    */
+    define('HTTP_REQUEST_MBSTRING', true);
+} else {
+   /**
+    * @ignore
+    */
+    define('HTTP_REQUEST_MBSTRING', false);
+}
+
+/**
+ * Class for performing HTTP requests
+ *
+ * Simple example (fetches yahoo.com and displays it):
+ * <code>
+ * $a = &new HTTP_Request('http://www.yahoo.com/');
+ * $a->sendRequest();
+ * echo $a->getResponseBody();
+ * </code>
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Richard Heyes <richard@phpguru.org>
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 1.4.1
+ */
+class HTTP_Request
+{
+   /**#@+
+    * @access private
+    */
+    /**
+    * Instance of Net_URL
+    * @var Net_URL
+    */
+    var $_url;
+
+    /**
+    * Type of request
+    * @var string
+    */
+    var $_method;
+
+    /**
+    * HTTP Version
+    * @var string
+    */
+    var $_http;
+
+    /**
+    * Request headers
+    * @var array
+    */
+    var $_requestHeaders;
+
+    /**
+    * Basic Auth Username
+    * @var string
+    */
+    var $_user;
+    
+    /**
+    * Basic Auth Password
+    * @var string
+    */
+    var $_pass;
+
+    /**
+    * Socket object
+    * @var Net_Socket
+    */
+    var $_sock;
+    
+    /**
+    * Proxy server
+    * @var string
+    */
+    var $_proxy_host;
+    
+    /**
+    * Proxy port
+    * @var integer
+    */
+    var $_proxy_port;
+    
+    /**
+    * Proxy username
+    * @var string
+    */
+    var $_proxy_user;
+    
+    /**
+    * Proxy password
+    * @var string
+    */
+    var $_proxy_pass;
+
+    /**
+    * Post data
+    * @var array
+    */
+    var $_postData;
+
+   /**
+    * Request body  
+    * @var string
+    */
+    var $_body;
+
+   /**
+    * A list of methods that MUST NOT have a request body, per RFC 2616
+    * @var array
+    */
+    var $_bodyDisallowed = array('TRACE');
+
+   /**
+    * Files to post 
+    * @var array
+    */
+    var $_postFiles = array();
+
+    /**
+    * Connection timeout.
+    * @var float
+    */
+    var $_timeout;
+    
+    /**
+    * HTTP_Response object
+    * @var HTTP_Response
+    */
+    var $_response;
+    
+    /**
+    * Whether to allow redirects
+    * @var boolean
+    */
+    var $_allowRedirects;
+    
+    /**
+    * Maximum redirects allowed
+    * @var integer
+    */
+    var $_maxRedirects;
+    
+    /**
+    * Current number of redirects
+    * @var integer
+    */
+    var $_redirects;
+
+   /**
+    * Whether to append brackets [] to array variables
+    * @var bool
+    */
+    var $_useBrackets = true;
+
+   /**
+    * Attached listeners
+    * @var array
+    */
+    var $_listeners = array();
+
+   /**
+    * Whether to save response body in response object property  
+    * @var bool
+    */
+    var $_saveBody = true;
+
+   /**
+    * Timeout for reading from socket (array(seconds, microseconds))
+    * @var array
+    */
+    var $_readTimeout = null;
+
+   /**
+    * Options to pass to Net_Socket::connect. See stream_context_create
+    * @var array
+    */
+    var $_socketOptions = null;
+   /**#@-*/
+
+    /**
+    * Constructor
+    *
+    * Sets up the object
+    * @param    string  The url to fetch/access
+    * @param    array   Associative array of parameters which can have the following keys:
+    * <ul>
+    *   <li>method         - Method to use, GET, POST etc (string)</li>
+    *   <li>http           - HTTP Version to use, 1.0 or 1.1 (string)</li>
+    *   <li>user           - Basic Auth username (string)</li>
+    *   <li>pass           - Basic Auth password (string)</li>
+    *   <li>proxy_host     - Proxy server host (string)</li>
+    *   <li>proxy_port     - Proxy server port (integer)</li>
+    *   <li>proxy_user     - Proxy auth username (string)</li>
+    *   <li>proxy_pass     - Proxy auth password (string)</li>
+    *   <li>timeout        - Connection timeout in seconds (float)</li>
+    *   <li>allowRedirects - Whether to follow redirects or not (bool)</li>
+    *   <li>maxRedirects   - Max number of redirects to follow (integer)</li>
+    *   <li>useBrackets    - Whether to append [] to array variable names (bool)</li>
+    *   <li>saveBody       - Whether to save response body in response object property (bool)</li>
+    *   <li>readTimeout    - Timeout for reading / writing data over the socket (array (seconds, microseconds))</li>
+    *   <li>socketOptions  - Options to pass to Net_Socket object (array)</li>
+    * </ul>
+    * @access public
+    */
+    function HTTP_Request($url = '', $params = array())
+    {
+        $this->_method         =  HTTP_REQUEST_METHOD_GET;
+        $this->_http           =  HTTP_REQUEST_HTTP_VER_1_1;
+        $this->_requestHeaders = array();
+        $this->_postData       = array();
+        $this->_body           = null;
+
+        $this->_user = null;
+        $this->_pass = null;
+
+        $this->_proxy_host = null;
+        $this->_proxy_port = null;
+        $this->_proxy_user = null;
+        $this->_proxy_pass = null;
+
+        $this->_allowRedirects = false;
+        $this->_maxRedirects   = 3;
+        $this->_redirects      = 0;
+
+        $this->_timeout  = null;
+        $this->_response = null;
+
+        foreach ($params as $key => $value) {
+            $this->{'_' . $key} = $value;
+        }
+
+        if (!empty($url)) {
+            $this->setURL($url);
+        }
+
+        // Default useragent
+        $this->addHeader('User-Agent', 'PEAR HTTP_Request class ( http://pear.php.net/ )');
+
+        // We don't do keep-alives by default
+        $this->addHeader('Connection', 'close');
+
+        // Basic authentication
+        if (!empty($this->_user)) {
+            $this->addHeader('Authorization', 'Basic ' . base64_encode($this->_user . ':' . $this->_pass));
+        }
+
+        // Proxy authentication (see bug #5913)
+        if (!empty($this->_proxy_user)) {
+            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($this->_proxy_user . ':' . $this->_proxy_pass));
+        }
+
+        // Use gzip encoding if possible
+        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && extension_loaded('zlib')) {
+            $this->addHeader('Accept-Encoding', 'gzip');
+        }
+    }
+    
+    /**
+    * Generates a Host header for HTTP/1.1 requests
+    *
+    * @access private
+    * @return string
+    */
+    function _generateHostHeader()
+    {
+        if ($this->_url->port != 80 AND strcasecmp($this->_url->protocol, 'http') == 0) {
+            $host = $this->_url->host . ':' . $this->_url->port;
+
+        } elseif ($this->_url->port != 443 AND strcasecmp($this->_url->protocol, 'https') == 0) {
+            $host = $this->_url->host . ':' . $this->_url->port;
+
+        } elseif ($this->_url->port == 443 AND strcasecmp($this->_url->protocol, 'https') == 0 AND strpos($this->_url->url, ':443') !== false) {
+            $host = $this->_url->host . ':' . $this->_url->port;
+        
+        } else {
+            $host = $this->_url->host;
+        }
+
+        return $host;
+    }
+    
+    /**
+    * Resets the object to its initial state (DEPRECATED).
+    * Takes the same parameters as the constructor.
+    *
+    * @param  string $url    The url to be requested
+    * @param  array  $params Associative array of parameters
+    *                        (see constructor for details)
+    * @access public
+    * @deprecated deprecated since 1.2, call the constructor if this is necessary
+    */
+    function reset($url, $params = array())
+    {
+        $this->HTTP_Request($url, $params);
+    }
+
+    /**
+    * Sets the URL to be requested
+    *
+    * @param  string The url to be requested
+    * @access public
+    */
+    function setURL($url)
+    {
+        $this->_url = &new Net_URL($url, $this->_useBrackets);
+
+        if (!empty($this->_url->user) || !empty($this->_url->pass)) {
+            $this->setBasicAuth($this->_url->user, $this->_url->pass);
+        }
+
+        if (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http) {
+            $this->addHeader('Host', $this->_generateHostHeader());
+        }
+
+        // set '/' instead of empty path rather than check later (see bug #8662)
+        if (empty($this->_url->path)) {
+            $this->_url->path = '/';
+        } 
+    }
+    
+   /**
+    * Returns the current request URL  
+    *
+    * @return   string  Current request URL
+    * @access   public
+    */
+    function getUrl()
+    {
+        return empty($this->_url)? '': $this->_url->getUrl();
+    }
+
+    /**
+    * Sets a proxy to be used
+    *
+    * @param string     Proxy host
+    * @param int        Proxy port
+    * @param string     Proxy username
+    * @param string     Proxy password
+    * @access public
+    */
+    function setProxy($host, $port = 8080, $user = null, $pass = null)
+    {
+        $this->_proxy_host = $host;
+        $this->_proxy_port = $port;
+        $this->_proxy_user = $user;
+        $this->_proxy_pass = $pass;
+
+        if (!empty($user)) {
+            $this->addHeader('Proxy-Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+        }
+    }
+
+    /**
+    * Sets basic authentication parameters
+    *
+    * @param string     Username
+    * @param string     Password
+    */
+    function setBasicAuth($user, $pass)
+    {
+        $this->_user = $user;
+        $this->_pass = $pass;
+
+        $this->addHeader('Authorization', 'Basic ' . base64_encode($user . ':' . $pass));
+    }
+
+    /**
+    * Sets the method to be used, GET, POST etc.
+    *
+    * @param string     Method to use. Use the defined constants for this
+    * @access public
+    */
+    function setMethod($method)
+    {
+        $this->_method = $method;
+    }
+
+    /**
+    * Sets the HTTP version to use, 1.0 or 1.1
+    *
+    * @param string     Version to use. Use the defined constants for this
+    * @access public
+    */
+    function setHttpVer($http)
+    {
+        $this->_http = $http;
+    }
+
+    /**
+    * Adds a request header
+    *
+    * @param string     Header name
+    * @param string     Header value
+    * @access public
+    */
+    function addHeader($name, $value)
+    {
+        $this->_requestHeaders[strtolower($name)] = $value;
+    }
+
+    /**
+    * Removes a request header
+    *
+    * @param string     Header name to remove
+    * @access public
+    */
+    function removeHeader($name)
+    {
+        if (isset($this->_requestHeaders[strtolower($name)])) {
+            unset($this->_requestHeaders[strtolower($name)]);
+        }
+    }
+
+    /**
+    * Adds a querystring parameter
+    *
+    * @param string     Querystring parameter name
+    * @param string     Querystring parameter value
+    * @param bool       Whether the value is already urlencoded or not, default = not
+    * @access public
+    */
+    function addQueryString($name, $value, $preencoded = false)
+    {
+        $this->_url->addQueryString($name, $value, $preencoded);
+    }    
+    
+    /**
+    * Sets the querystring to literally what you supply
+    *
+    * @param string     The querystring data. Should be of the format foo=bar&x=y etc
+    * @param bool       Whether data is already urlencoded or not, default = already encoded
+    * @access public
+    */
+    function addRawQueryString($querystring, $preencoded = true)
+    {
+        $this->_url->addRawQueryString($querystring, $preencoded);
+    }
+
+    /**
+    * Adds postdata items
+    *
+    * @param string     Post data name
+    * @param string     Post data value
+    * @param bool       Whether data is already urlencoded or not, default = not
+    * @access public
+    */
+    function addPostData($name, $value, $preencoded = false)
+    {
+        if ($preencoded) {
+            $this->_postData[$name] = $value;
+        } else {
+            $this->_postData[$name] = $this->_arrayMapRecursive('urlencode', $value);
+        }
+    }
+
+   /**
+    * Recursively applies the callback function to the value
+    * 
+    * @param    mixed   Callback function
+    * @param    mixed   Value to process
+    * @access   private
+    * @return   mixed   Processed value
+    */
+    function _arrayMapRecursive($callback, $value)
+    {
+        if (!is_array($value)) {
+            return call_user_func($callback, $value);
+        } else {
+            $map = array();
+            foreach ($value as $k => $v) {
+                $map[$k] = $this->_arrayMapRecursive($callback, $v);
+            }
+            return $map;
+        }
+    }
+
+   /**
+    * Adds a file to upload
+    * 
+    * This also changes content-type to 'multipart/form-data' for proper upload
+    * 
+    * @access public
+    * @param  string    name of file-upload field
+    * @param  mixed     file name(s)
+    * @param  mixed     content-type(s) of file(s) being uploaded
+    * @return bool      true on success
+    * @throws PEAR_Error
+    */
+    function addFile($inputName, $fileName, $contentType = 'application/octet-stream')
+    {
+        if (!is_array($fileName) && !is_readable($fileName)) {
+            return PEAR::raiseError("File '{$fileName}' is not readable");
+        } elseif (is_array($fileName)) {
+            foreach ($fileName as $name) {
+                if (!is_readable($name)) {
+                    return PEAR::raiseError("File '{$name}' is not readable");
+                }
+            }
+        }
+        $this->addHeader('Content-Type', 'multipart/form-data');
+        $this->_postFiles[$inputName] = array(
+            'name' => $fileName,
+            'type' => $contentType
+        );
+        return true;
+    }
+
+    /**
+    * Adds raw postdata (DEPRECATED)
+    *
+    * @param string     The data
+    * @param bool       Whether data is preencoded or not, default = already encoded
+    * @access public
+    * @deprecated       deprecated since 1.3.0, method setBody() should be used instead
+    */
+    function addRawPostData($postdata, $preencoded = true)
+    {
+        $this->_body = $preencoded ? $postdata : urlencode($postdata);
+    }
+
+   /**
+    * Sets the request body (for POST, PUT and similar requests)
+    *
+    * @param    string  Request body
+    * @access   public
+    */
+    function setBody($body)
+    {
+        $this->_body = $body;
+    }
+
+    /**
+    * Clears any postdata that has been added (DEPRECATED). 
+    * 
+    * Useful for multiple request scenarios.
+    *
+    * @access public
+    * @deprecated deprecated since 1.2
+    */
+    function clearPostData()
+    {
+        $this->_postData = null;
+    }
+
+    /**
+    * Appends a cookie to "Cookie:" header
+    * 
+    * @param string $name cookie name
+    * @param string $value cookie value
+    * @access public
+    */
+    function addCookie($name, $value)
+    {
+        $cookies = isset($this->_requestHeaders['cookie']) ? $this->_requestHeaders['cookie']. '; ' : '';
+        $this->addHeader('Cookie', $cookies . $name . '=' . $value);
+    }
+    
+    /**
+    * Clears any cookies that have been added (DEPRECATED). 
+    * 
+    * Useful for multiple request scenarios
+    *
+    * @access public
+    * @deprecated deprecated since 1.2
+    */
+    function clearCookies()
+    {
+        $this->removeHeader('Cookie');
+    }
+
+    /**
+    * Sends the request
+    *
+    * @access public
+    * @param  bool   Whether to store response body in Response object property,
+    *                set this to false if downloading a LARGE file and using a Listener
+    * @return mixed  PEAR error on error, true otherwise
+    */
+    function sendRequest($saveBody = true)
+    {
+        if (!is_a($this->_url, 'Net_URL')) {
+            return PEAR::raiseError('No URL given.');
+        }
+
+        $host = isset($this->_proxy_host) ? $this->_proxy_host : $this->_url->host;
+        $port = isset($this->_proxy_port) ? $this->_proxy_port : $this->_url->port;
+
+        // 4.3.0 supports SSL connections using OpenSSL. The function test determines
+        // we running on at least 4.3.0
+        if (strcasecmp($this->_url->protocol, 'https') == 0 AND function_exists('file_get_contents') AND extension_loaded('openssl')) {
+            if (isset($this->_proxy_host)) {
+                return PEAR::raiseError('HTTPS proxies are not supported.');
+            }
+            $host = 'ssl://' . $host;
+        }
+
+        // magic quotes may fuck up file uploads and chunked response processing
+        $magicQuotes = ini_get('magic_quotes_runtime');
+        ini_set('magic_quotes_runtime', false);
+
+        // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive 
+        // connection token to a proxy server...
+        if (isset($this->_proxy_host) && !empty($this->_requestHeaders['connection']) &&
+            'Keep-Alive' == $this->_requestHeaders['connection'])
+        {
+            $this->removeHeader('connection');
+        }
+
+        $keepAlive = (HTTP_REQUEST_HTTP_VER_1_1 == $this->_http && empty($this->_requestHeaders['connection'])) ||
+                     (!empty($this->_requestHeaders['connection']) && 'Keep-Alive' == $this->_requestHeaders['connection']);
+        $sockets   = &PEAR::getStaticProperty('HTTP_Request', 'sockets');
+        $sockKey   = $host . ':' . $port;
+        unset($this->_sock);
+
+        // There is a connected socket in the "static" property?
+        if ($keepAlive && !empty($sockets[$sockKey]) &&
+            !empty($sockets[$sockKey]->fp)) 
+        {
+            $this->_sock =& $sockets[$sockKey];
+            $err = null;
+        } else {
+            $this->_notify('connect');
+            $this->_sock =& new Net_Socket();
+            $err = $this->_sock->connect($host, $port, null, $this->_timeout, $this->_socketOptions);
+        }
+        PEAR::isError($err) or $err = $this->_sock->write($this->_buildRequest());
+
+        if (!PEAR::isError($err)) {
+            if (!empty($this->_readTimeout)) {
+                $this->_sock->setTimeout($this->_readTimeout[0], $this->_readTimeout[1]);
+            }
+
+            $this->_notify('sentRequest');
+
+            // Read the response
+            $this->_response = &new HTTP_Response($this->_sock, $this->_listeners);
+            $err = $this->_response->process(
+                $this->_saveBody && $saveBody,
+                HTTP_REQUEST_METHOD_HEAD != $this->_method
+            );
+
+            if ($keepAlive) {
+                $keepAlive = (isset($this->_response->_headers['content-length'])
+                              || (isset($this->_response->_headers['transfer-encoding'])
+                                  && strtolower($this->_response->_headers['transfer-encoding']) == 'chunked'));
+                if ($keepAlive) {
+                    if (isset($this->_response->_headers['connection'])) {
+                        $keepAlive = strtolower($this->_response->_headers['connection']) == 'keep-alive';
+                    } else {
+                        $keepAlive = 'HTTP/'.HTTP_REQUEST_HTTP_VER_1_1 == $this->_response->_protocol;
+                    }
+                }
+            }
+        }
+
+        ini_set('magic_quotes_runtime', $magicQuotes);
+
+        if (PEAR::isError($err)) {
+            return $err;
+        }
+
+        if (!$keepAlive) {
+            $this->disconnect();
+        // Store the connected socket in "static" property
+        } elseif (empty($sockets[$sockKey]) || empty($sockets[$sockKey]->fp)) {
+            $sockets[$sockKey] =& $this->_sock;
+        }
+
+        // Check for redirection
+        if (    $this->_allowRedirects
+            AND $this->_redirects <= $this->_maxRedirects
+            AND $this->getResponseCode() > 300
+            AND $this->getResponseCode() < 399
+            AND !empty($this->_response->_headers['location'])) {
+
+            
+            $redirect = $this->_response->_headers['location'];
+
+            // Absolute URL
+            if (preg_match('/^https?:\/\//i', $redirect)) {
+                $this->_url = &new Net_URL($redirect);
+                $this->addHeader('Host', $this->_generateHostHeader());
+            // Absolute path
+            } elseif ($redirect{0} == '/') {
+                $this->_url->path = $redirect;
+            
+            // Relative path
+            } elseif (substr($redirect, 0, 3) == '../' OR substr($redirect, 0, 2) == './') {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $redirect = Net_URL::resolvePath($redirect);
+                $this->_url->path = $redirect;
+                
+            // Filename, no path
+            } else {
+                if (substr($this->_url->path, -1) == '/') {
+                    $redirect = $this->_url->path . $redirect;
+                } else {
+                    $redirect = dirname($this->_url->path) . '/' . $redirect;
+                }
+                $this->_url->path = $redirect;
+            }
+
+            $this->_redirects++;
+            return $this->sendRequest($saveBody);
+
+        // Too many redirects
+        } elseif ($this->_allowRedirects AND $this->_redirects > $this->_maxRedirects) {
+            return PEAR::raiseError('Too many redirects');
+        }
+
+        return true;
+    }
+
+    /**
+     * Disconnect the socket, if connected. Only useful if using Keep-Alive.
+     *
+     * @access public
+     */
+    function disconnect()
+    {
+        if (!empty($this->_sock) && !empty($this->_sock->fp)) {
+            $this->_notify('disconnect');
+            $this->_sock->disconnect();
+        }
+    }
+
+    /**
+    * Returns the response code
+    *
+    * @access public
+    * @return mixed     Response code, false if not set
+    */
+    function getResponseCode()
+    {
+        return isset($this->_response->_code) ? $this->_response->_code : false;
+    }
+
+    /**
+    * Returns either the named header or all if no name given
+    *
+    * @access public
+    * @param string     The header name to return, do not set to get all headers
+    * @return mixed     either the value of $headername (false if header is not present)
+    *                   or an array of all headers
+    */
+    function getResponseHeader($headername = null)
+    {
+        if (!isset($headername)) {
+            return isset($this->_response->_headers)? $this->_response->_headers: array();
+        } else {
+            $headername = strtolower($headername);
+            return isset($this->_response->_headers[$headername]) ? $this->_response->_headers[$headername] : false;
+        }
+    }
+
+    /**
+    * Returns the body of the response
+    *
+    * @access public
+    * @return mixed     response body, false if not set
+    */
+    function getResponseBody()
+    {
+        return isset($this->_response->_body) ? $this->_response->_body : false;
+    }
+
+    /**
+    * Returns cookies set in response
+    * 
+    * @access public
+    * @return mixed     array of response cookies, false if none are present
+    */
+    function getResponseCookies()
+    {
+        return isset($this->_response->_cookies) ? $this->_response->_cookies : false;
+    }
+
+    /**
+    * Builds the request string
+    *
+    * @access private
+    * @return string The request string
+    */
+    function _buildRequest()
+    {
+        $separator = ini_get('arg_separator.output');
+        ini_set('arg_separator.output', '&');
+        $querystring = ($querystring = $this->_url->getQueryString()) ? '?' . $querystring : '';
+        ini_set('arg_separator.output', $separator);
+
+        $host = isset($this->_proxy_host) ? $this->_url->protocol . '://' . $this->_url->host : '';
+        $port = (isset($this->_proxy_host) AND $this->_url->port != 80) ? ':' . $this->_url->port : '';
+        $path = $this->_url->path . $querystring;
+        $url  = $host . $port . $path;
+
+        $request = $this->_method . ' ' . $url . ' HTTP/' . $this->_http . "\r\n";
+
+        if (in_array($this->_method, $this->_bodyDisallowed) ||
+            (empty($this->_body) && (HTTP_REQUEST_METHOD_POST != $this->_method ||
+             (empty($this->_postData) && empty($this->_postFiles)))))
+        {
+            $this->removeHeader('Content-Type');
+        } else {
+            if (empty($this->_requestHeaders['content-type'])) {
+                // Add default content-type
+                $this->addHeader('Content-Type', 'application/x-www-form-urlencoded');
+            } elseif ('multipart/form-data' == $this->_requestHeaders['content-type']) {
+                $boundary = 'HTTP_Request_' . md5(uniqid('request') . microtime());
+                $this->addHeader('Content-Type', 'multipart/form-data; boundary=' . $boundary);
+            }
+        }
+
+        // Request Headers
+        if (!empty($this->_requestHeaders)) {
+            foreach ($this->_requestHeaders as $name => $value) {
+                $canonicalName = implode('-', array_map('ucfirst', explode('-', $name)));
+                $request      .= $canonicalName . ': ' . $value . "\r\n";
+            }
+        }
+
+        // No post data or wrong method, so simply add a final CRLF
+        if (in_array($this->_method, $this->_bodyDisallowed) || 
+            (HTTP_REQUEST_METHOD_POST != $this->_method && empty($this->_body))) {
+
+            $request .= "\r\n";
+
+        // Post data if it's an array
+        } elseif (HTTP_REQUEST_METHOD_POST == $this->_method && 
+                  (!empty($this->_postData) || !empty($this->_postFiles))) {
+
+            // "normal" POST request
+            if (!isset($boundary)) {
+                $postdata = implode('&', array_map(
+                    create_function('$a', 'return $a[0] . \'=\' . $a[1];'), 
+                    $this->_flattenArray('', $this->_postData)
+                ));
+
+            // multipart request, probably with file uploads
+            } else {
+                $postdata = '';
+                if (!empty($this->_postData)) {
+                    $flatData = $this->_flattenArray('', $this->_postData);
+                    foreach ($flatData as $item) {
+                        $postdata .= '--' . $boundary . "\r\n";
+                        $postdata .= 'Content-Disposition: form-data; name="' . $item[0] . '"';
+                        $postdata .= "\r\n\r\n" . urldecode($item[1]) . "\r\n";
+                    }
+                }
+                foreach ($this->_postFiles as $name => $value) {
+                    if (is_array($value['name'])) {
+                        $varname       = $name . ($this->_useBrackets? '[]': '');
+                    } else {
+                        $varname       = $name;
+                        $value['name'] = array($value['name']);
+                    }
+                    foreach ($value['name'] as $key => $filename) {
+                        $fp   = fopen($filename, 'r');
+                        $data = fread($fp, filesize($filename));
+                        fclose($fp);
+                        $basename = basename($filename);
+                        $type     = is_array($value['type'])? @$value['type'][$key]: $value['type'];
+
+                        $postdata .= '--' . $boundary . "\r\n";
+                        $postdata .= 'Content-Disposition: form-data; name="' . $varname . '"; filename="' . $basename . '"';
+                        $postdata .= "\r\nContent-Type: " . $type;
+                        $postdata .= "\r\n\r\n" . $data . "\r\n";
+                    }
+                }
+                $postdata .= '--' . $boundary . "--\r\n";
+            }
+            $request .= 'Content-Length: ' .
+                        (HTTP_REQUEST_MBSTRING? mb_strlen($postdata, 'iso-8859-1'): strlen($postdata)) .
+                        "\r\n\r\n";
+            $request .= $postdata;
+
+        // Explicitly set request body
+        } elseif (!empty($this->_body)) {
+
+            $request .= 'Content-Length: ' .
+                        (HTTP_REQUEST_MBSTRING? mb_strlen($this->_body, 'iso-8859-1'): strlen($this->_body)) .
+                        "\r\n\r\n";
+            $request .= $this->_body;
+        }
+        
+        return $request;
+    }
+
+   /**
+    * Helper function to change the (probably multidimensional) associative array
+    * into the simple one.
+    *
+    * @param    string  name for item
+    * @param    mixed   item's values
+    * @return   array   array with the following items: array('item name', 'item value');
+    * @access   private
+    */
+    function _flattenArray($name, $values)
+    {
+        if (!is_array($values)) {
+            return array(array($name, $values));
+        } else {
+            $ret = array();
+            foreach ($values as $k => $v) {
+                if (empty($name)) {
+                    $newName = $k;
+                } elseif ($this->_useBrackets) {
+                    $newName = $name . '[' . $k . ']';
+                } else {
+                    $newName = $name;
+                }
+                $ret = array_merge($ret, $this->_flattenArray($newName, $v));
+            }
+            return $ret;
+        }
+    }
+
+
+   /**
+    * Adds a Listener to the list of listeners that are notified of
+    * the object's events
+    * 
+    * Events sent by HTTP_Request object
+    * - 'connect': on connection to server
+    * - 'sentRequest': after the request was sent
+    * - 'disconnect': on disconnection from server
+    *
+    * Events sent by HTTP_Response object
+    * - 'gotHeaders': after receiving response headers (headers are passed in $data)
+    * - 'tick': on receiving a part of response body (the part is passed in $data)
+    * - 'gzTick': on receiving a gzip-encoded part of response body (ditto)
+    * - 'gotBody': after receiving the response body (passes the decoded body in $data if it was gzipped)
+    *
+    * @param    HTTP_Request_Listener   listener to attach
+    * @return   boolean                 whether the listener was successfully attached
+    * @access   public
+    */
+    function attach(&$listener)
+    {
+        if (!is_a($listener, 'HTTP_Request_Listener')) {
+            return false;
+        }
+        $this->_listeners[$listener->getId()] =& $listener;
+        return true;
+    }
+
+
+   /**
+    * Removes a Listener from the list of listeners 
+    * 
+    * @param    HTTP_Request_Listener   listener to detach
+    * @return   boolean                 whether the listener was successfully detached
+    * @access   public
+    */
+    function detach(&$listener)
+    {
+        if (!is_a($listener, 'HTTP_Request_Listener') || 
+            !isset($this->_listeners[$listener->getId()])) {
+            return false;
+        }
+        unset($this->_listeners[$listener->getId()]);
+        return true;
+    }
+
+
+   /**
+    * Notifies all registered listeners of an event.
+    * 
+    * @param    string  Event name
+    * @param    mixed   Additional data
+    * @access   private
+    * @see      HTTP_Request::attach()
+    */
+    function _notify($event, $data = null)
+    {
+        foreach (array_keys($this->_listeners) as $id) {
+            $this->_listeners[$id]->update($this, $event, $data);
+        }
+    }
+}
+
+
+/**
+ * Response class to complement the Request class
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Richard Heyes <richard@phpguru.org>
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 1.4.1
+ */
+class HTTP_Response
+{
+    /**
+    * Socket object
+    * @var Net_Socket
+    */
+    var $_sock;
+
+    /**
+    * Protocol
+    * @var string
+    */
+    var $_protocol;
+    
+    /**
+    * Return code
+    * @var string
+    */
+    var $_code;
+    
+    /**
+    * Response headers
+    * @var array
+    */
+    var $_headers;
+
+    /**
+    * Cookies set in response  
+    * @var array
+    */
+    var $_cookies;
+
+    /**
+    * Response body
+    * @var string
+    */
+    var $_body = '';
+
+   /**
+    * Used by _readChunked(): remaining length of the current chunk
+    * @var string
+    */
+    var $_chunkLength = 0;
+
+   /**
+    * Attached listeners
+    * @var array
+    */
+    var $_listeners = array();
+
+   /**
+    * Bytes left to read from message-body
+    * @var null|int
+    */
+    var $_toRead;
+
+    /**
+    * Constructor
+    *
+    * @param  Net_Socket    socket to read the response from
+    * @param  array         listeners attached to request
+    */
+    function HTTP_Response(&$sock, &$listeners)
+    {
+        $this->_sock      =& $sock;
+        $this->_listeners =& $listeners;
+    }
+
+
+   /**
+    * Processes a HTTP response
+    * 
+    * This extracts response code, headers, cookies and decodes body if it 
+    * was encoded in some way
+    *
+    * @access public
+    * @param  bool      Whether to store response body in object property, set
+    *                   this to false if downloading a LARGE file and using a Listener.
+    *                   This is assumed to be true if body is gzip-encoded.
+    * @param  bool      Whether the response can actually have a message-body.
+    *                   Will be set to false for HEAD requests.
+    * @throws PEAR_Error
+    * @return mixed     true on success, PEAR_Error in case of malformed response
+    */
+    function process($saveBody = true, $canHaveBody = true)
+    {
+        do {
+            $line = $this->_sock->readLine();
+            if (sscanf($line, 'HTTP/%s %s', $http_version, $returncode) != 2) {
+                return PEAR::raiseError('Malformed response.');
+            } else {
+                $this->_protocol = 'HTTP/' . $http_version;
+                $this->_code     = intval($returncode);
+            }
+            while ('' !== ($header = $this->_sock->readLine())) {
+                $this->_processHeader($header);
+            }
+        } while (100 == $this->_code);
+
+        $this->_notify('gotHeaders', $this->_headers);
+
+        // RFC 2616, section 4.4:
+        // 1. Any response message which "MUST NOT" include a message-body ... 
+        // is always terminated by the first empty line after the header fields 
+        // 3. ... If a message is received with both a
+        // Transfer-Encoding header field and a Content-Length header field,
+        // the latter MUST be ignored.
+        $canHaveBody = $canHaveBody && $this->_code >= 200 && 
+                       $this->_code != 204 && $this->_code != 304;
+
+        // If response body is present, read it and decode
+        $chunked = isset($this->_headers['transfer-encoding']) && ('chunked' == $this->_headers['transfer-encoding']);
+        $gzipped = isset($this->_headers['content-encoding']) && ('gzip' == $this->_headers['content-encoding']);
+        $hasBody = false;
+        if ($canHaveBody && ($chunked || !isset($this->_headers['content-length']) || 
+                0 != $this->_headers['content-length']))
+        {
+            if ($chunked || !isset($this->_headers['content-length'])) {
+                $this->_toRead = null;
+            } else {
+                $this->_toRead = $this->_headers['content-length'];
+            }
+            while (!$this->_sock->eof() && (is_null($this->_toRead) || 0 < $this->_toRead)) {
+                if ($chunked) {
+                    $data = $this->_readChunked();
+                } elseif (is_null($this->_toRead)) {
+                    $data = $this->_sock->read(4096);
+                } else {
+                    $data = $this->_sock->read(min(4096, $this->_toRead));
+                    $this->_toRead -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+                }
+                if ('' == $data) {
+                    break;
+                } else {
+                    $hasBody = true;
+                    if ($saveBody || $gzipped) {
+                        $this->_body .= $data;
+                    }
+                    $this->_notify($gzipped? 'gzTick': 'tick', $data);
+                }
+            }
+        }
+
+        if ($hasBody) {
+            // Uncompress the body if needed
+            if ($gzipped) {
+                $body = $this->_decodeGzip($this->_body);
+                if (PEAR::isError($body)) {
+                    return $body;
+                }
+                $this->_body = $body;
+                $this->_notify('gotBody', $this->_body);
+            } else {
+                $this->_notify('gotBody');
+            }
+        }
+        return true;
+    }
+
+
+   /**
+    * Processes the response header
+    *
+    * @access private
+    * @param  string    HTTP header
+    */
+    function _processHeader($header)
+    {
+        if (false === strpos($header, ':')) {
+            return;
+        }
+        list($headername, $headervalue) = explode(':', $header, 2);
+        $headername  = strtolower($headername);
+        $headervalue = ltrim($headervalue);
+        
+        if ('set-cookie' != $headername) {
+            if (isset($this->_headers[$headername])) {
+                $this->_headers[$headername] .= ',' . $headervalue;
+            } else {
+                $this->_headers[$headername]  = $headervalue;
+            }
+        } else {
+            $this->_parseCookie($headervalue);
+        }
+    }
+
+
+   /**
+    * Parse a Set-Cookie header to fill $_cookies array
+    *
+    * @access private
+    * @param  string    value of Set-Cookie header
+    */
+    function _parseCookie($headervalue)
+    {
+        $cookie = array(
+            'expires' => null,
+            'domain'  => null,
+            'path'    => null,
+            'secure'  => false
+        );
+
+        // Only a name=value pair
+        if (!strpos($headervalue, ';')) {
+            $pos = strpos($headervalue, '=');
+            $cookie['name']  = trim(substr($headervalue, 0, $pos));
+            $cookie['value'] = trim(substr($headervalue, $pos + 1));
+
+        // Some optional parameters are supplied
+        } else {
+            $elements = explode(';', $headervalue);
+            $pos = strpos($elements[0], '=');
+            $cookie['name']  = trim(substr($elements[0], 0, $pos));
+            $cookie['value'] = trim(substr($elements[0], $pos + 1));
+
+            for ($i = 1; $i < count($elements); $i++) {
+                if (false === strpos($elements[$i], '=')) {
+                    $elName  = trim($elements[$i]);
+                    $elValue = null;
+                } else {
+                    list ($elName, $elValue) = array_map('trim', explode('=', $elements[$i]));
+                }
+                $elName = strtolower($elName);
+                if ('secure' == $elName) {
+                    $cookie['secure'] = true;
+                } elseif ('expires' == $elName) {
+                    $cookie['expires'] = str_replace('"', '', $elValue);
+                } elseif ('path' == $elName || 'domain' == $elName) {
+                    $cookie[$elName] = urldecode($elValue);
+                } else {
+                    $cookie[$elName] = $elValue;
+                }
+            }
+        }
+        $this->_cookies[] = $cookie;
+    }
+
+
+   /**
+    * Read a part of response body encoded with chunked Transfer-Encoding
+    * 
+    * @access private
+    * @return string
+    */
+    function _readChunked()
+    {
+        // at start of the next chunk?
+        if (0 == $this->_chunkLength) {
+            $line = $this->_sock->readLine();
+            if (preg_match('/^([0-9a-f]+)/i', $line, $matches)) {
+                $this->_chunkLength = hexdec($matches[1]); 
+                // Chunk with zero length indicates the end
+                if (0 == $this->_chunkLength) {
+                    $this->_sock->readLine(); // make this an eof()
+                    return '';
+                }
+            } else {
+                return '';
+            }
+        }
+        $data = $this->_sock->read($this->_chunkLength);
+        $this->_chunkLength -= HTTP_REQUEST_MBSTRING? mb_strlen($data, 'iso-8859-1'): strlen($data);
+        if (0 == $this->_chunkLength) {
+            $this->_sock->readLine(); // Trailing CRLF
+        }
+        return $data;
+    }
+
+
+   /**
+    * Notifies all registered listeners of an event.
+    * 
+    * @param    string  Event name
+    * @param    mixed   Additional data
+    * @access   private
+    * @see HTTP_Request::_notify()
+    */
+    function _notify($event, $data = null)
+    {
+        foreach (array_keys($this->_listeners) as $id) {
+            $this->_listeners[$id]->update($this, $event, $data);
+        }
+    }
+
+
+   /**
+    * Decodes the message-body encoded by gzip
+    *
+    * The real decoding work is done by gzinflate() built-in function, this
+    * method only parses the header and checks data for compliance with
+    * RFC 1952  
+    *
+    * @access   private
+    * @param    string  gzip-encoded data
+    * @return   string  decoded data
+    */
+    function _decodeGzip($data)
+    {
+        if (HTTP_REQUEST_MBSTRING) {
+            $oldEncoding = mb_internal_encoding();
+            mb_internal_encoding('iso-8859-1');
+        }
+        $length = strlen($data);
+        // If it doesn't look like gzip-encoded data, don't bother
+        if (18 > $length || strcmp(substr($data, 0, 2), "\x1f\x8b")) {
+            return $data;
+        }
+        $method = ord(substr($data, 2, 1));
+        if (8 != $method) {
+            return PEAR::raiseError('_decodeGzip(): unknown compression method');
+        }
+        $flags = ord(substr($data, 3, 1));
+        if ($flags & 224) {
+            return PEAR::raiseError('_decodeGzip(): reserved bits are set');
+        }
+
+        // header is 10 bytes minimum. may be longer, though.
+        $headerLength = 10;
+        // extra fields, need to skip 'em
+        if ($flags & 4) {
+            if ($length - $headerLength - 2 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $extraLength = unpack('v', substr($data, 10, 2));
+            if ($length - $headerLength - 2 - $extraLength[1] < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $headerLength += $extraLength[1] + 2;
+        }
+        // file name, need to skip that
+        if ($flags & 8) {
+            if ($length - $headerLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $filenameLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $filenameLength || $length - $headerLength - $filenameLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $headerLength += $filenameLength + 1;
+        }
+        // comment, need to skip that also
+        if ($flags & 16) {
+            if ($length - $headerLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $commentLength = strpos(substr($data, $headerLength), chr(0));
+            if (false === $commentLength || $length - $headerLength - $commentLength - 1 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $headerLength += $commentLength + 1;
+        }
+        // have a CRC for header. let's check
+        if ($flags & 1) {
+            if ($length - $headerLength - 2 < 8) {
+                return PEAR::raiseError('_decodeGzip(): data too short');
+            }
+            $crcReal   = 0xffff & crc32(substr($data, 0, $headerLength));
+            $crcStored = unpack('v', substr($data, $headerLength, 2));
+            if ($crcReal != $crcStored[1]) {
+                return PEAR::raiseError('_decodeGzip(): header CRC check failed');
+            }
+            $headerLength += 2;
+        }
+        // unpacked data CRC and size at the end of encoded data
+        $tmp = unpack('V2', substr($data, -8));
+        $dataCrc  = $tmp[1];
+        $dataSize = $tmp[2];
+
+        // finally, call the gzinflate() function
+        $unpacked = @gzinflate(substr($data, $headerLength, -8), $dataSize);
+        if (false === $unpacked) {
+            return PEAR::raiseError('_decodeGzip(): gzinflate() call failed');
+        } elseif ($dataSize != strlen($unpacked)) {
+            return PEAR::raiseError('_decodeGzip(): data size check failed');
+        } elseif ((0xffffffff & $dataCrc) != (0xffffffff & crc32($unpacked))) {
+            return PEAR::raiseError('_decodeGzip(): data CRC check failed');
+        }
+        if (HTTP_REQUEST_MBSTRING) {
+            mb_internal_encoding($oldEncoding);
+        }
+        return $unpacked;
+    }
+} // End class HTTP_Response
+?>
diff --git a/libs/PEAR/HTTP/Request/Listener.php b/libs/PEAR/HTTP/Request/Listener.php
index f0408b004..928ac5e68 100644
--- a/libs/PEAR/HTTP/Request/Listener.php
+++ b/libs/PEAR/HTTP/Request/Listener.php
@@ -1,106 +1,106 @@
-<?php
-/**
- * Listener for HTTP_Request and HTTP_Response objects
- *
- * PHP versions 4 and 5
- * 
- * LICENSE:
- *
- * Copyright (c) 2002-2007, Richard Heyes
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * o Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * o Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * o The names of the authors may not be used to endorse or promote
- *   products derived from this software without specific prior written
- *   permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Alexey Borzov <avb@php.net>
- * @copyright   2002-2007 Richard Heyes
- * @license     http://opensource.org/licenses/bsd-license.php New BSD License
- * @version     CVS: $Id: Listener.php,v 1.3 2007/05/18 10:33:31 avb Exp $
- * @link        http://pear.php.net/package/HTTP_Request/ 
- */
-
-/**
- * Listener for HTTP_Request and HTTP_Response objects
- *
- * This class implements the Observer part of a Subject-Observer
- * design pattern.
- *
- * @category    HTTP
- * @package     HTTP_Request
- * @author      Alexey Borzov <avb@php.net>
- * @version     Release: 1.4.1
- */
-class HTTP_Request_Listener 
-{
-   /**
-    * A listener's identifier
-    * @var string
-    */
-    var $_id;
-
-   /**
-    * Constructor, sets the object's identifier
-    *
-    * @access public
-    */
-    function HTTP_Request_Listener()
-    {
-        $this->_id = md5(uniqid('http_request_', 1));
-    }
-
-
-   /**
-    * Returns the listener's identifier
-    *
-    * @access public
-    * @return string
-    */
-    function getId()
-    {
-        return $this->_id;
-    }
-
-
-   /**
-    * This method is called when Listener is notified of an event
-    *
-    * @access   public
-    * @param    object  an object the listener is attached to
-    * @param    string  Event name
-    * @param    mixed   Additional data
-    * @abstract
-    */
-    function update(&$subject, $event, $data = null)
-    {
-        echo "Notified of event: '$event'\n";
-        if (null !== $data) {
-            echo "Additional data: ";
-            var_dump($data);
-        }
-    }
-}
-?>
+<?php
+/**
+ * Listener for HTTP_Request and HTTP_Response objects
+ *
+ * PHP versions 4 and 5
+ * 
+ * LICENSE:
+ *
+ * Copyright (c) 2002-2007, Richard Heyes
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * o Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * o Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ * o The names of the authors may not be used to endorse or promote
+ *   products derived from this software without specific prior written
+ *   permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Alexey Borzov <avb@php.net>
+ * @copyright   2002-2007 Richard Heyes
+ * @license     http://opensource.org/licenses/bsd-license.php New BSD License
+ * @version     CVS: $Id: Listener.php,v 1.3 2007/05/18 10:33:31 avb Exp $
+ * @link        http://pear.php.net/package/HTTP_Request/ 
+ */
+
+/**
+ * Listener for HTTP_Request and HTTP_Response objects
+ *
+ * This class implements the Observer part of a Subject-Observer
+ * design pattern.
+ *
+ * @category    HTTP
+ * @package     HTTP_Request
+ * @author      Alexey Borzov <avb@php.net>
+ * @version     Release: 1.4.1
+ */
+class HTTP_Request_Listener 
+{
+   /**
+    * A listener's identifier
+    * @var string
+    */
+    var $_id;
+
+   /**
+    * Constructor, sets the object's identifier
+    *
+    * @access public
+    */
+    function HTTP_Request_Listener()
+    {
+        $this->_id = md5(uniqid('http_request_', 1));
+    }
+
+
+   /**
+    * Returns the listener's identifier
+    *
+    * @access public
+    * @return string
+    */
+    function getId()
+    {
+        return $this->_id;
+    }
+
+
+   /**
+    * This method is called when Listener is notified of an event
+    *
+    * @access   public
+    * @param    object  an object the listener is attached to
+    * @param    string  Event name
+    * @param    mixed   Additional data
+    * @abstract
+    */
+    function update(&$subject, $event, $data = null)
+    {
+        echo "Notified of event: '$event'\n";
+        if (null !== $data) {
+            echo "Additional data: ";
+            var_dump($data);
+        }
+    }
+}
+?>
diff --git a/libs/PEAR/Net/URL.php b/libs/PEAR/Net/URL.php
index da48c746b..6331fc0ac 100644
--- a/libs/PEAR/Net/URL.php
+++ b/libs/PEAR/Net/URL.php
@@ -1,410 +1,410 @@
-<?php
-// +-----------------------------------------------------------------------+
-// | Copyright (c) 2002-2004, Richard Heyes                                |
-// | All rights reserved.                                                  |
-// |                                                                       |
-// | Redistribution and use in source and binary forms, with or without    |
-// | modification, are permitted provided that the following conditions    |
-// | are met:                                                              |
-// |                                                                       |
-// | o Redistributions of source code must retain the above copyright      |
-// |   notice, this list of conditions and the following disclaimer.       |
-// | o Redistributions in binary form must reproduce the above copyright   |
-// |   notice, this list of conditions and the following disclaimer in the |
-// |   documentation and/or other materials provided with the distribution.|
-// | o The names of the authors may not be used to endorse or promote      |
-// |   products derived from this software without specific prior written  |
-// |   permission.                                                         |
-// |                                                                       |
-// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
-// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
-// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
-// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
-// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
-// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
-// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
-// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
-// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
-// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
-// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
-// |                                                                       |
-// +-----------------------------------------------------------------------+
-// | Author: Richard Heyes <richard at php net>                            |
-// +-----------------------------------------------------------------------+
-//
-// $Id: URL.php,v 1.36 2004/06/19 18:58:50 richard Exp $
-//
-// Net_URL Class
-
-class Net_URL
-{
-    /**
-    * Full url
-    * @var string
-    */
-    var $url;
-
-    /**
-    * Protocol
-    * @var string
-    */
-    var $protocol;
-
-    /**
-    * Username
-    * @var string
-    */
-    var $username;
-
-    /**
-    * Password
-    * @var string
-    */
-    var $password;
-
-    /**
-    * Host
-    * @var string
-    */
-    var $host;
-
-    /**
-    * Port
-    * @var integer
-    */
-    var $port;
-
-    /**
-    * Path
-    * @var string
-    */
-    var $path;
-
-    /**
-    * Query string
-    * @var array
-    */
-    var $querystring;
-
-    /**
-    * Anchor
-    * @var string
-    */
-    var $anchor;
-
-    /**
-    * Whether to use []
-    * @var bool
-    */
-    var $useBrackets;
-
-    /**
-    * PHP4 Constructor
-    *
-    * @see __construct()
-    */
-    function Net_URL($url = null, $useBrackets = true)
-    {
-        $this->__construct($url, $useBrackets);
-    }
-
-    /**
-    * PHP5 Constructor
-    *
-    * Parses the given url and stores the various parts
-    * Defaults are used in certain cases
-    *
-    * @param string $url         Optional URL
-    * @param bool   $useBrackets Whether to use square brackets when
-    *                            multiple querystrings with the same name
-    *                            exist
-    */
-    function __construct($url = null, $useBrackets = true)
-    {
-        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
-
-        $this->useBrackets = $useBrackets;
-        $this->url         = $url;
-        $this->user        = '';
-        $this->pass        = '';
-        $this->host        = '';
-        $this->port        = 80;
-        $this->path        = '';
-        $this->querystring = array();
-        $this->anchor      = '';
-
-        // Only use defaults if not an absolute URL given
-        if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
-
-            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
-
-            /**
-            * Figure out host/port
-            */
-            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
-                $host = $matches[1];
-                if (!empty($matches[3])) {
-                    $port = $matches[3];
-                } else {
-                    $port = $this->getStandardPort($this->protocol);
-                }
-            }
-
-            $this->user        = '';
-            $this->pass        = '';
-            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
-            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
-            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
-            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
-            $this->anchor      = '';
-        }
-
-        // Parse the url and store the various parts
-        if (!empty($url)) {
-            $urlinfo = parse_url($url);
-
-            // Default querystring
-            $this->querystring = array();
-
-            foreach ($urlinfo as $key => $value) {
-                switch ($key) {
-                    case 'scheme':
-                        $this->protocol = $value;
-                        $this->port     = $this->getStandardPort($value);
-                        break;
-
-                    case 'user':
-                    case 'pass':
-                    case 'host':
-                    case 'port':
-                        $this->$key = $value;
-                        break;
-
-                    case 'path':
-                        if ($value{0} == '/') {
-                            $this->path = $value;
-                        } else {
-                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
-                            $this->path = sprintf('%s/%s', $path, $value);
-                        }
-                        break;
-
-                    case 'query':
-                        $this->querystring = $this->_parseRawQueryString($value);
-                        break;
-
-                    case 'fragment':
-                        $this->anchor = $value;
-                        break;
-                }
-            }
-        }
-    }
-
-    /**
-    * Returns full url
-    *
-    * @return string Full url
-    * @access public
-    */
-    function getURL()
-    {
-        $querystring = $this->getQueryString();
-
-        $this->url = $this->protocol . '://'
-                   . $this->user . (!empty($this->pass) ? ':' : '')
-                   . $this->pass . (!empty($this->user) ? '@' : '')
-                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
-                   . $this->path
-                   . (!empty($querystring) ? '?' . $querystring : '')
-                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
-
-        return $this->url;
-    }
-
-    /**
-    * Adds a querystring item
-    *
-    * @param  string $name       Name of item
-    * @param  string $value      Value of item
-    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
-    * @access public
-    */
-    function addQueryString($name, $value, $preencoded = false)
-    {
-        if ($preencoded) {
-            $this->querystring[$name] = $value;
-        } else {
-            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
-        }
-    }
-
-    /**
-    * Removes a querystring item
-    *
-    * @param  string $name Name of item
-    * @access public
-    */
-    function removeQueryString($name)
-    {
-        if (isset($this->querystring[$name])) {
-            unset($this->querystring[$name]);
-        }
-    }
-
-    /**
-    * Sets the querystring to literally what you supply
-    *
-    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
-    * @access public
-    */
-    function addRawQueryString($querystring)
-    {
-        $this->querystring = $this->_parseRawQueryString($querystring);
-    }
-
-    /**
-    * Returns flat querystring
-    *
-    * @return string Querystring
-    * @access public
-    */
-    function getQueryString()
-    {
-        if (!empty($this->querystring)) {
-            foreach ($this->querystring as $name => $value) {
-                if (is_array($value)) {
-                    foreach ($value as $k => $v) {
-                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
-                    }
-                } elseif (!is_null($value)) {
-                    $querystring[] = $name . '=' . $value;
-                } else {
-                    $querystring[] = $name;
-                }
-            }
-            $querystring = implode(ini_get('arg_separator.output'), $querystring);
-        } else {
-            $querystring = '';
-        }
-
-        return $querystring;
-    }
-
-    /**
-    * Parses raw querystring and returns an array of it
-    *
-    * @param  string  $querystring The querystring to parse
-    * @return array                An array of the querystring data
-    * @access private
-    */
-    function _parseRawQuerystring($querystring)
-    {
-        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
-        $return = array();
-
-        foreach ($parts as $part) {
-            if (strpos($part, '=') !== false) {
-                $value = substr($part, strpos($part, '=') + 1);
-                $key   = substr($part, 0, strpos($part, '='));
-            } else {
-                $value = null;
-                $key   = $part;
-            }
-            if (substr($key, -2) == '[]') {
-                $key = substr($key, 0, -2);
-                if (@!is_array($return[$key])) {
-                    $return[$key]   = array();
-                    $return[$key][] = $value;
-                } else {
-                    $return[$key][] = $value;
-                }
-            } elseif (!$this->useBrackets AND !empty($return[$key])) {
-                $return[$key]   = (array)$return[$key];
-                $return[$key][] = $value;
-            } else {
-                $return[$key] = $value;
-            }
-        }
-
-        return $return;
-    }
-
-    /**
-    * Resolves //, ../ and ./ from a path and returns
-    * the result. Eg:
-    *
-    * /foo/bar/../boo.php    => /foo/boo.php
-    * /foo/bar/../../boo.php => /boo.php
-    * /foo/bar/.././/boo.php => /foo/boo.php
-    *
-    * This method can also be called statically.
-    *
-    * @param  string $url URL path to resolve
-    * @return string      The result
-    */
-    function resolvePath($path)
-    {
-        $path = explode('/', str_replace('//', '/', $path));
-
-        for ($i=0; $i<count($path); $i++) {
-            if ($path[$i] == '.') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
-                unset($path[$i]);
-                unset($path[$i-1]);
-                $path = array_values($path);
-                $i -= 2;
-
-            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
-                unset($path[$i]);
-                $path = array_values($path);
-                $i--;
-
-            } else {
-                continue;
-            }
-        }
-
-        return implode('/', $path);
-    }
-
-    /**
-    * Returns the standard port number for a protocol
-    *
-    * @param  string  $scheme The protocol to lookup
-    * @return integer         Port number or NULL if no scheme matches
-    *
-    * @author Philippe Jausions <Philippe.Jausions@11abacus.com>
-    */
-    function getStandardPort($scheme)
-    {
-        switch (strtolower($scheme)) {
-            case 'http':    return 80;
-            case 'https':   return 443;
-            case 'ftp':     return 21;
-            case 'imap':    return 143;
-            case 'imaps':   return 993;
-            case 'pop3':    return 110;
-            case 'pop3s':   return 995;
-            default:        return null;
-       }
-    }
-
-    /**
-    * Forces the URL to a particular protocol
-    *
-    * @param string  $protocol Protocol to force the URL to
-    * @param integer $port     Optional port (standard port is used by default)
-    */
-    function setProtocol($protocol, $port = null)
-    {
-        $this->protocol = $protocol;
-        $this->port = is_null($port) ? $this->getStandardPort() : $port;
-    }
-
-}
-?>
+<?php
+// +-----------------------------------------------------------------------+
+// | Copyright (c) 2002-2004, Richard Heyes                                |
+// | All rights reserved.                                                  |
+// |                                                                       |
+// | Redistribution and use in source and binary forms, with or without    |
+// | modification, are permitted provided that the following conditions    |
+// | are met:                                                              |
+// |                                                                       |
+// | o Redistributions of source code must retain the above copyright      |
+// |   notice, this list of conditions and the following disclaimer.       |
+// | o Redistributions in binary form must reproduce the above copyright   |
+// |   notice, this list of conditions and the following disclaimer in the |
+// |   documentation and/or other materials provided with the distribution.|
+// | o The names of the authors may not be used to endorse or promote      |
+// |   products derived from this software without specific prior written  |
+// |   permission.                                                         |
+// |                                                                       |
+// | THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS   |
+// | "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT     |
+// | LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
+// | A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT  |
+// | OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
+// | SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT      |
+// | LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
+// | DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
+// | THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT   |
+// | (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
+// | OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  |
+// |                                                                       |
+// +-----------------------------------------------------------------------+
+// | Author: Richard Heyes <richard at php net>                            |
+// +-----------------------------------------------------------------------+
+//
+// $Id: URL.php,v 1.36 2004/06/19 18:58:50 richard Exp $
+//
+// Net_URL Class
+
+class Net_URL
+{
+    /**
+    * Full url
+    * @var string
+    */
+    var $url;
+
+    /**
+    * Protocol
+    * @var string
+    */
+    var $protocol;
+
+    /**
+    * Username
+    * @var string
+    */
+    var $username;
+
+    /**
+    * Password
+    * @var string
+    */
+    var $password;
+
+    /**
+    * Host
+    * @var string
+    */
+    var $host;
+
+    /**
+    * Port
+    * @var integer
+    */
+    var $port;
+
+    /**
+    * Path
+    * @var string
+    */
+    var $path;
+
+    /**
+    * Query string
+    * @var array
+    */
+    var $querystring;
+
+    /**
+    * Anchor
+    * @var string
+    */
+    var $anchor;
+
+    /**
+    * Whether to use []
+    * @var bool
+    */
+    var $useBrackets;
+
+    /**
+    * PHP4 Constructor
+    *
+    * @see __construct()
+    */
+    function Net_URL($url = null, $useBrackets = true)
+    {
+        $this->__construct($url, $useBrackets);
+    }
+
+    /**
+    * PHP5 Constructor
+    *
+    * Parses the given url and stores the various parts
+    * Defaults are used in certain cases
+    *
+    * @param string $url         Optional URL
+    * @param bool   $useBrackets Whether to use square brackets when
+    *                            multiple querystrings with the same name
+    *                            exist
+    */
+    function __construct($url = null, $useBrackets = true)
+    {
+        $HTTP_SERVER_VARS  = !empty($_SERVER) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
+
+        $this->useBrackets = $useBrackets;
+        $this->url         = $url;
+        $this->user        = '';
+        $this->pass        = '';
+        $this->host        = '';
+        $this->port        = 80;
+        $this->path        = '';
+        $this->querystring = array();
+        $this->anchor      = '';
+
+        // Only use defaults if not an absolute URL given
+        if (!preg_match('/^[a-z0-9]+:\/\//i', $url)) {
+
+            $this->protocol    = (@$HTTP_SERVER_VARS['HTTPS'] == 'on' ? 'https' : 'http');
+
+            /**
+            * Figure out host/port
+            */
+            if (!empty($HTTP_SERVER_VARS['HTTP_HOST']) AND preg_match('/^(.*)(:([0-9]+))?$/U', $HTTP_SERVER_VARS['HTTP_HOST'], $matches)) {
+                $host = $matches[1];
+                if (!empty($matches[3])) {
+                    $port = $matches[3];
+                } else {
+                    $port = $this->getStandardPort($this->protocol);
+                }
+            }
+
+            $this->user        = '';
+            $this->pass        = '';
+            $this->host        = !empty($host) ? $host : (isset($HTTP_SERVER_VARS['SERVER_NAME']) ? $HTTP_SERVER_VARS['SERVER_NAME'] : 'localhost');
+            $this->port        = !empty($port) ? $port : (isset($HTTP_SERVER_VARS['SERVER_PORT']) ? $HTTP_SERVER_VARS['SERVER_PORT'] : $this->getStandardPort($this->protocol));
+            $this->path        = !empty($HTTP_SERVER_VARS['PHP_SELF']) ? $HTTP_SERVER_VARS['PHP_SELF'] : '/';
+            $this->querystring = isset($HTTP_SERVER_VARS['QUERY_STRING']) ? $this->_parseRawQuerystring($HTTP_SERVER_VARS['QUERY_STRING']) : null;
+            $this->anchor      = '';
+        }
+
+        // Parse the url and store the various parts
+        if (!empty($url)) {
+            $urlinfo = parse_url($url);
+
+            // Default querystring
+            $this->querystring = array();
+
+            foreach ($urlinfo as $key => $value) {
+                switch ($key) {
+                    case 'scheme':
+                        $this->protocol = $value;
+                        $this->port     = $this->getStandardPort($value);
+                        break;
+
+                    case 'user':
+                    case 'pass':
+                    case 'host':
+                    case 'port':
+                        $this->$key = $value;
+                        break;
+
+                    case 'path':
+                        if ($value{0} == '/') {
+                            $this->path = $value;
+                        } else {
+                            $path = dirname($this->path) == DIRECTORY_SEPARATOR ? '' : dirname($this->path);
+                            $this->path = sprintf('%s/%s', $path, $value);
+                        }
+                        break;
+
+                    case 'query':
+                        $this->querystring = $this->_parseRawQueryString($value);
+                        break;
+
+                    case 'fragment':
+                        $this->anchor = $value;
+                        break;
+                }
+            }
+        }
+    }
+
+    /**
+    * Returns full url
+    *
+    * @return string Full url
+    * @access public
+    */
+    function getURL()
+    {
+        $querystring = $this->getQueryString();
+
+        $this->url = $this->protocol . '://'
+                   . $this->user . (!empty($this->pass) ? ':' : '')
+                   . $this->pass . (!empty($this->user) ? '@' : '')
+                   . $this->host . ($this->port == $this->getStandardPort($this->protocol) ? '' : ':' . $this->port)
+                   . $this->path
+                   . (!empty($querystring) ? '?' . $querystring : '')
+                   . (!empty($this->anchor) ? '#' . $this->anchor : '');
+
+        return $this->url;
+    }
+
+    /**
+    * Adds a querystring item
+    *
+    * @param  string $name       Name of item
+    * @param  string $value      Value of item
+    * @param  bool   $preencoded Whether value is urlencoded or not, default = not
+    * @access public
+    */
+    function addQueryString($name, $value, $preencoded = false)
+    {
+        if ($preencoded) {
+            $this->querystring[$name] = $value;
+        } else {
+            $this->querystring[$name] = is_array($value) ? array_map('rawurlencode', $value): rawurlencode($value);
+        }
+    }
+
+    /**
+    * Removes a querystring item
+    *
+    * @param  string $name Name of item
+    * @access public
+    */
+    function removeQueryString($name)
+    {
+        if (isset($this->querystring[$name])) {
+            unset($this->querystring[$name]);
+        }
+    }
+
+    /**
+    * Sets the querystring to literally what you supply
+    *
+    * @param  string $querystring The querystring data. Should be of the format foo=bar&x=y etc
+    * @access public
+    */
+    function addRawQueryString($querystring)
+    {
+        $this->querystring = $this->_parseRawQueryString($querystring);
+    }
+
+    /**
+    * Returns flat querystring
+    *
+    * @return string Querystring
+    * @access public
+    */
+    function getQueryString()
+    {
+        if (!empty($this->querystring)) {
+            foreach ($this->querystring as $name => $value) {
+                if (is_array($value)) {
+                    foreach ($value as $k => $v) {
+                        $querystring[] = $this->useBrackets ? sprintf('%s[%s]=%s', $name, $k, $v) : ($name . '=' . $v);
+                    }
+                } elseif (!is_null($value)) {
+                    $querystring[] = $name . '=' . $value;
+                } else {
+                    $querystring[] = $name;
+                }
+            }
+            $querystring = implode(ini_get('arg_separator.output'), $querystring);
+        } else {
+            $querystring = '';
+        }
+
+        return $querystring;
+    }
+
+    /**
+    * Parses raw querystring and returns an array of it
+    *
+    * @param  string  $querystring The querystring to parse
+    * @return array                An array of the querystring data
+    * @access private
+    */
+    function _parseRawQuerystring($querystring)
+    {
+        $parts  = preg_split('/[' . preg_quote(ini_get('arg_separator.input'), '/') . ']/', $querystring, -1, PREG_SPLIT_NO_EMPTY);
+        $return = array();
+
+        foreach ($parts as $part) {
+            if (strpos($part, '=') !== false) {
+                $value = substr($part, strpos($part, '=') + 1);
+                $key   = substr($part, 0, strpos($part, '='));
+            } else {
+                $value = null;
+                $key   = $part;
+            }
+            if (substr($key, -2) == '[]') {
+                $key = substr($key, 0, -2);
+                if (@!is_array($return[$key])) {
+                    $return[$key]   = array();
+                    $return[$key][] = $value;
+                } else {
+                    $return[$key][] = $value;
+                }
+            } elseif (!$this->useBrackets AND !empty($return[$key])) {
+                $return[$key]   = (array)$return[$key];
+                $return[$key][] = $value;
+            } else {
+                $return[$key] = $value;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+    * Resolves //, ../ and ./ from a path and returns
+    * the result. Eg:
+    *
+    * /foo/bar/../boo.php    => /foo/boo.php
+    * /foo/bar/../../boo.php => /boo.php
+    * /foo/bar/.././/boo.php => /foo/boo.php
+    *
+    * This method can also be called statically.
+    *
+    * @param  string $url URL path to resolve
+    * @return string      The result
+    */
+    function resolvePath($path)
+    {
+        $path = explode('/', str_replace('//', '/', $path));
+
+        for ($i=0; $i<count($path); $i++) {
+            if ($path[$i] == '.') {
+                unset($path[$i]);
+                $path = array_values($path);
+                $i--;
+
+            } elseif ($path[$i] == '..' AND ($i > 1 OR ($i == 1 AND $path[0] != '') ) ) {
+                unset($path[$i]);
+                unset($path[$i-1]);
+                $path = array_values($path);
+                $i -= 2;
+
+            } elseif ($path[$i] == '..' AND $i == 1 AND $path[0] == '') {
+                unset($path[$i]);
+                $path = array_values($path);
+                $i--;
+
+            } else {
+                continue;
+            }
+        }
+
+        return implode('/', $path);
+    }
+
+    /**
+    * Returns the standard port number for a protocol
+    *
+    * @param  string  $scheme The protocol to lookup
+    * @return integer         Port number or NULL if no scheme matches
+    *
+    * @author Philippe Jausions <Philippe.Jausions@11abacus.com>
+    */
+    function getStandardPort($scheme)
+    {
+        switch (strtolower($scheme)) {
+            case 'http':    return 80;
+            case 'https':   return 443;
+            case 'ftp':     return 21;
+            case 'imap':    return 143;
+            case 'imaps':   return 993;
+            case 'pop3':    return 110;
+            case 'pop3s':   return 995;
+            default:        return null;
+       }
+    }
+
+    /**
+    * Forces the URL to a particular protocol
+    *
+    * @param string  $protocol Protocol to force the URL to
+    * @param integer $port     Optional port (standard port is used by default)
+    */
+    function setProtocol($protocol, $port = null)
+    {
+        $this->protocol = $protocol;
+        $this->port = is_null($port) ? $this->getStandardPort() : $port;
+    }
+
+}
+?>
diff --git a/libs/ftp.class.php b/libs/ftp.class.php
index d49a2efbb..417a3a83b 100644
--- a/libs/ftp.class.php
+++ b/libs/ftp.class.php
@@ -1,530 +1,530 @@
-<?php
-    /*********************************************************************
-     *
-     *    PHP FTP Client Class By TOMO ( groove@spencernetwork.org )
-	 *    Modified By NHN ( developers@xpressengine.com )
-     *
-     *  - Version 0.13 (2010/09/29)
-	 *
-     *  - This script is free but without any warranty.
-     *  - You can freely copy, use, modify or redistribute this script
-     *    for any purpose.
-     *  - But please do not erase this information!!.
-	 *
-	 *  Change log
-	 *  - Version 0.13 (2010/09/29)
-	 *    . use preg functions instead of ereg functions
-	 *  - Version 0.12 (2002/01/11)
-     *
-     ********************************************************************/
-
-    /*********************************************************************
-     * List of available functions
-     * ftp_connect($server, $port = 21)
-     * ftp_login($user, $pass)
-     * ftp_pwd()
-     * ftp_size($pathname)
-     * ftp_mdtm($pathname)
-     * ftp_systype()
-     * ftp_cdup()
-     * ftp_chdir($pathname)
-     * ftp_delete($pathname)
-     * ftp_rmdir($pathname)
-     * ftp_mkdir($pathname)
-     * ftp_file_exists($pathname)
-     * ftp_rename($from, $to)
-     * ftp_nlist($arg = "", $pathname = "")
-     * ftp_rawlist($pathname = "")
-     * ftp_get($localfile, $remotefile, $mode = 1)
-     * ftp_put($remotefile, $localfile, $mode = 1)
-     * ftp_site($command)
-     * ftp_quit()
-     *********************************************************************/
-
-    class ftp
-    {
-        /* Public variables */
-        var $debug;
-        var $umask;
-        var $timeout;
-
-        /* Private variables */
-        var $ftp_sock;
-        var $ftp_resp;
-
-        /* Constractor */
-        function ftp()
-        {
-            $this->debug = false;
-            $this->umask = 0022;
-            $this->timeout = 30;
-
-            if (!defined("FTP_BINARY")) {
-                define("FTP_BINARY", 1);
-            }
-            if (!defined("FTP_ASCII")) {
-                define("FTP_ASCII", 0);
-            }
-
-            $this->ftp_resp = "";
-        }
-
-        /* Public functions */
-        function ftp_connect($server, $port = 21)
-        {
-            $this->ftp_debug("Trying to ".$server.":".$port." ...\n");
-            $this->ftp_sock = @fsockopen($server, $port, $errno, $errstr, $this->timeout);
-
-            if (!$this->ftp_sock || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host \"".$server.":".$port."\"\n");
-                $this->ftp_debug("Error : fsockopen() ".$errstr." (".$errno.")\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host \"".$server.":".$port."\"\n");
-
-            return TRUE;
-        }
-
-        function ftp_login($user, $pass)
-        {
-            $this->ftp_putcmd("USER", $user);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : USER command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("PASS", $pass);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : PASS command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Authentication succeeded\n");
-
-            return TRUE;
-        }
-
-        function ftp_pwd()
-        {
-            $this->ftp_putcmd("PWD");
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : PWD command failed\n");
-                return FALSE;
-            }
-
-            return preg_replace("@^[0-9]{3} \"(.+)\" .+\r\n@", "\\1", $this->ftp_resp);
-        }
-
-        function ftp_size($pathname)
-        {
-            $this->ftp_putcmd("SIZE", $pathname);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : SIZE command failed\n");
-                return -1;
-            }
-
-            return preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
-        }
-
-        function ftp_mdtm($pathname)
-        {
-            $this->ftp_putcmd("MDTM", $pathname);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : MDTM command failed\n");
-                return -1;
-            }
-            $mdtm = preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
-            $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
-            $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
-
-            return $timestamp;
-        }
-
-        function ftp_systype()
-        {
-            $this->ftp_putcmd("SYST");
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : SYST command failed\n");
-                return FALSE;
-            }
-            $DATA = explode(" ", $this->ftp_resp);
-
-            return $DATA[1];
-        }
-
-        function ftp_cdup()
-        {
-            $this->ftp_putcmd("CDUP");
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : CDUP command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_chdir($pathname)
-        {
-            $this->ftp_putcmd("CWD", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : CWD command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_delete($pathname)
-        {
-            $this->ftp_putcmd("DELE", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : DELE command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_rmdir($pathname)
-        {
-            $this->ftp_putcmd("RMD", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : RMD command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_mkdir($pathname)
-        {
-            $this->ftp_putcmd("MKD", $pathname);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : MKD command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_file_exists($pathname)
-        {
-            if (!($remote_list = $this->ftp_nlist("-a"))) {
-                $this->ftp_debug("Error : Cannot get remote file list\n");
-                return -1;
-            }
-            
-            reset($remote_list);
-            while (list(,$value) = each($remote_list)) {
-                if ($value == $pathname) {
-                    $this->ftp_debug("Remote file ".$pathname." exists\n");
-                    return 1;
-                }
-            }
-            $this->ftp_debug("Remote file ".$pathname." does not exist\n");
-
-            return 0;
-        }
-
-        function ftp_rename($from, $to)
-        {
-            $this->ftp_putcmd("RNFR", $from);
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : RNFR command failed\n");
-                return FALSE;
-            }
-            $this->ftp_putcmd("RNTO", $to);
-
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : RNTO command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_nlist($arg = "", $pathname = "")
-        {
-            if (!($string = $this->ftp_pasv())) {
-                return FALSE;
-            }
-
-            if ($arg == "") {
-                $nlst = "NLST";
-            } else {
-                $nlst = "NLST ".$arg;
-            }
-            $this->ftp_putcmd($nlst, $pathname);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : NLST command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host\n");
-
-			$list = array();
-            while (!feof($sock_data)) {
-                $list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
-            }
-            $this->ftp_close_data_connection($sock_data);
-            $this->ftp_debug(implode("\n", $list));
-
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : NLST command failed\n");
-                return FALSE;
-            }
-
-            return $list;
-        }
-
-        function ftp_rawlist($pathname = "")
-        {
-            if (!($string = $this->ftp_pasv())) {
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("LIST", $pathname);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : LIST command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_debug("Connected to remote host\n");
-
-            while (!feof($sock_data)) {
-                $list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
-            }
-            $this->ftp_debug(implode("\n", $list));
-            $this->ftp_close_data_connection($sock_data);
-
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : LIST command failed\n");
-                return FALSE;
-            }
-
-            return $list;
-        }
-
-        function ftp_get($localfile, $remotefile, $mode = 1)
-        {
-            umask($this->umask);
-
-            if (@file_exists($localfile)) {
-                $this->ftp_debug("Warning : local file will be overwritten\n");
-            }
-
-            $fp = @fopen($localfile, "w");
-            if (!$fp) {
-                $this->ftp_debug("Error : Cannot create \"".$localfile."\"");
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-
-            if (!$this->ftp_type($mode)) {
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-
-            if (!($string = $this->ftp_pasv())) {
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("RETR", $remotefile);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : GET command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host\n");
-            $this->ftp_debug("Retrieving remote file \"".$remotefile."\" to local file \"".$localfile."\"\n");
-            while (!feof($sock_data)) {
-                fputs($fp, fread($sock_data, 4096));
-            }
-            fclose($fp);
-
-            $this->ftp_close_data_connection($sock_data);
-
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : GET command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_put($remotefile, $localfile, $mode = 1)
-        {
-            
-            if (!@file_exists($localfile)) {
-                $this->ftp_debug("Error : No such file or directory \"".$localfile."\"\n");
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            $fp = @fopen($localfile, "r");
-            if (!$fp) {
-                $this->ftp_debug("Error : Cannot read file \"".$localfile."\"\n");
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            if (!$this->ftp_type($mode)) {
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            if (!($string = $this->ftp_pasv())) {
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-
-            $this->ftp_putcmd("STOR", $remotefile);
-
-            $sock_data = $this->ftp_open_data_connection($string);
-            if (!$sock_data || !$this->ftp_ok()) {
-                $this->ftp_debug("Error : Cannot connect to remote host\n");
-                $this->ftp_debug("Error : PUT command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Connected to remote host\n");
-            $this->ftp_debug("Storing local file \"".$localfile."\" to remote file \"".$remotefile."\"\n");
-            while (!feof($fp)) {
-                fputs($sock_data, fread($fp, 4096));
-            }
-            fclose($fp);
-
-            $this->ftp_close_data_connection($sock_data);
-
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : PUT command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_site($command)
-        {
-            $this->ftp_putcmd("SITE", $command);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : SITE command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_quit()
-        {
-            $this->ftp_putcmd("QUIT");
-            if (!$this->ftp_ok() || !fclose($this->ftp_sock)) {
-                $this->ftp_debug("Error : QUIT command failed\n");
-                return FALSE;
-            }
-            $this->ftp_debug("Disconnected from remote host\n");
-            return TRUE;
-        }
-
-        /* Private Functions */
-
-        function ftp_type($mode)
-        {
-            if ($mode) {
-                $type = "I"; //Binary mode
-            } else {
-                $type = "A"; //ASCII mode
-            }
-            $this->ftp_putcmd("TYPE", $type);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : TYPE command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_port($ip_port)
-        {
-            $this->ftp_putcmd("PORT", $ip_port);
-            $response = $this->ftp_ok();
-            if (!$response) {
-                $this->ftp_debug("Error : PORT command failed\n");
-            }
-            return $response;
-        }
-
-        function ftp_pasv()
-        {
-            $this->ftp_putcmd("PASV");
-            if (!$this->ftp_ok()) {
-                $this->ftp_debug("Error : PASV command failed\n");
-                return FALSE;
-            }
-
-            $ip_port = preg_replace("@^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*\r\n$@", "\\1", $this->ftp_resp);
-            return $ip_port;
-        }
-
-        function ftp_putcmd($cmd, $arg = "")
-        {
-            if ($arg != "") {
-                $cmd = $cmd." ".$arg;
-            }
-
-            fputs($this->ftp_sock, $cmd."\r\n");
-            $this->ftp_debug("> ".$cmd."\n");
-
-            return TRUE;
-        }
-
-        function ftp_ok()
-        {
-            $this->ftp_resp = "";
-            do {
-                $res = fgets($this->ftp_sock, 512);
-                $this->ftp_resp .= $res;
-            } while (substr($res, 3, 1) != " ");
-
-            $this->ftp_debug(str_replace("\r\n", "\n", $this->ftp_resp));
-
-            if (!preg_match("@^[123]@", $this->ftp_resp)) {
-                return FALSE;
-            }
-
-            return TRUE;
-        }
-
-        function ftp_close_data_connection($sock)
-        {
-            $this->ftp_debug("Disconnected from remote host\n");
-            return fclose($sock);
-        }
-
-        function ftp_open_data_connection($ip_port)
-        {
-            if (!preg_match("@[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+@", $ip_port)) {
-                $this->ftp_debug("Error : Illegal ip-port format(".$ip_port.")\n");
-                return FALSE;
-            }
-
-            $DATA = explode(",", $ip_port);
-            $ipaddr = $DATA[0].".".$DATA[1].".".$DATA[2].".".$DATA[3];
-            $port   = $DATA[4]*256 + $DATA[5];
-            $this->ftp_debug("Trying to ".$ipaddr.":".$port." ...\n");
-            $data_connection = @fsockopen($ipaddr, $port, $errno, $errstr);
-            if (!$data_connection) {
-                $this->ftp_debug("Error : Cannot open data connection to ".$ipaddr.":".$port."\n");
-                $this->ftp_debug("Error : ".$errstr." (".$errno.")\n");
-                return FALSE;
-            }
-
-            return $data_connection;
-        }
-
-        function ftp_debug($message = "")
-        {
-            if ($this->debug) {
-                echo $message;
-            }
-
-            return TRUE;
-        }
-    }
-?>
+<?php
+    /*********************************************************************
+     *
+     *    PHP FTP Client Class By TOMO ( groove@spencernetwork.org )
+	 *    Modified By NHN ( developers@xpressengine.com )
+     *
+     *  - Version 0.13 (2010/09/29)
+	 *
+     *  - This script is free but without any warranty.
+     *  - You can freely copy, use, modify or redistribute this script
+     *    for any purpose.
+     *  - But please do not erase this information!!.
+	 *
+	 *  Change log
+	 *  - Version 0.13 (2010/09/29)
+	 *    . use preg functions instead of ereg functions
+	 *  - Version 0.12 (2002/01/11)
+     *
+     ********************************************************************/
+
+    /*********************************************************************
+     * List of available functions
+     * ftp_connect($server, $port = 21)
+     * ftp_login($user, $pass)
+     * ftp_pwd()
+     * ftp_size($pathname)
+     * ftp_mdtm($pathname)
+     * ftp_systype()
+     * ftp_cdup()
+     * ftp_chdir($pathname)
+     * ftp_delete($pathname)
+     * ftp_rmdir($pathname)
+     * ftp_mkdir($pathname)
+     * ftp_file_exists($pathname)
+     * ftp_rename($from, $to)
+     * ftp_nlist($arg = "", $pathname = "")
+     * ftp_rawlist($pathname = "")
+     * ftp_get($localfile, $remotefile, $mode = 1)
+     * ftp_put($remotefile, $localfile, $mode = 1)
+     * ftp_site($command)
+     * ftp_quit()
+     *********************************************************************/
+
+    class ftp
+    {
+        /* Public variables */
+        var $debug;
+        var $umask;
+        var $timeout;
+
+        /* Private variables */
+        var $ftp_sock;
+        var $ftp_resp;
+
+        /* Constractor */
+        function ftp()
+        {
+            $this->debug = false;
+            $this->umask = 0022;
+            $this->timeout = 30;
+
+            if (!defined("FTP_BINARY")) {
+                define("FTP_BINARY", 1);
+            }
+            if (!defined("FTP_ASCII")) {
+                define("FTP_ASCII", 0);
+            }
+
+            $this->ftp_resp = "";
+        }
+
+        /* Public functions */
+        function ftp_connect($server, $port = 21)
+        {
+            $this->ftp_debug("Trying to ".$server.":".$port." ...\n");
+            $this->ftp_sock = @fsockopen($server, $port, $errno, $errstr, $this->timeout);
+
+            if (!$this->ftp_sock || !$this->ftp_ok()) {
+                $this->ftp_debug("Error : Cannot connect to remote host \"".$server.":".$port."\"\n");
+                $this->ftp_debug("Error : fsockopen() ".$errstr." (".$errno.")\n");
+                return FALSE;
+            }
+            $this->ftp_debug("Connected to remote host \"".$server.":".$port."\"\n");
+
+            return TRUE;
+        }
+
+        function ftp_login($user, $pass)
+        {
+            $this->ftp_putcmd("USER", $user);
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : USER command failed\n");
+                return FALSE;
+            }
+
+            $this->ftp_putcmd("PASS", $pass);
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : PASS command failed\n");
+                return FALSE;
+            }
+            $this->ftp_debug("Authentication succeeded\n");
+
+            return TRUE;
+        }
+
+        function ftp_pwd()
+        {
+            $this->ftp_putcmd("PWD");
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : PWD command failed\n");
+                return FALSE;
+            }
+
+            return preg_replace("@^[0-9]{3} \"(.+)\" .+\r\n@", "\\1", $this->ftp_resp);
+        }
+
+        function ftp_size($pathname)
+        {
+            $this->ftp_putcmd("SIZE", $pathname);
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : SIZE command failed\n");
+                return -1;
+            }
+
+            return preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
+        }
+
+        function ftp_mdtm($pathname)
+        {
+            $this->ftp_putcmd("MDTM", $pathname);
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : MDTM command failed\n");
+                return -1;
+            }
+            $mdtm = preg_replace("@^[0-9]{3} ([0-9]+)\r\n@", "\\1", $this->ftp_resp);
+            $date = sscanf($mdtm, "%4d%2d%2d%2d%2d%2d");
+            $timestamp = mktime($date[3], $date[4], $date[5], $date[1], $date[2], $date[0]);
+
+            return $timestamp;
+        }
+
+        function ftp_systype()
+        {
+            $this->ftp_putcmd("SYST");
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : SYST command failed\n");
+                return FALSE;
+            }
+            $DATA = explode(" ", $this->ftp_resp);
+
+            return $DATA[1];
+        }
+
+        function ftp_cdup()
+        {
+            $this->ftp_putcmd("CDUP");
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : CDUP command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_chdir($pathname)
+        {
+            $this->ftp_putcmd("CWD", $pathname);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : CWD command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_delete($pathname)
+        {
+            $this->ftp_putcmd("DELE", $pathname);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : DELE command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_rmdir($pathname)
+        {
+            $this->ftp_putcmd("RMD", $pathname);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : RMD command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_mkdir($pathname)
+        {
+            $this->ftp_putcmd("MKD", $pathname);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : MKD command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_file_exists($pathname)
+        {
+            if (!($remote_list = $this->ftp_nlist("-a"))) {
+                $this->ftp_debug("Error : Cannot get remote file list\n");
+                return -1;
+            }
+            
+            reset($remote_list);
+            while (list(,$value) = each($remote_list)) {
+                if ($value == $pathname) {
+                    $this->ftp_debug("Remote file ".$pathname." exists\n");
+                    return 1;
+                }
+            }
+            $this->ftp_debug("Remote file ".$pathname." does not exist\n");
+
+            return 0;
+        }
+
+        function ftp_rename($from, $to)
+        {
+            $this->ftp_putcmd("RNFR", $from);
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : RNFR command failed\n");
+                return FALSE;
+            }
+            $this->ftp_putcmd("RNTO", $to);
+
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : RNTO command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_nlist($arg = "", $pathname = "")
+        {
+            if (!($string = $this->ftp_pasv())) {
+                return FALSE;
+            }
+
+            if ($arg == "") {
+                $nlst = "NLST";
+            } else {
+                $nlst = "NLST ".$arg;
+            }
+            $this->ftp_putcmd($nlst, $pathname);
+
+            $sock_data = $this->ftp_open_data_connection($string);
+            if (!$sock_data || !$this->ftp_ok()) {
+                $this->ftp_debug("Error : Cannot connect to remote host\n");
+                $this->ftp_debug("Error : NLST command failed\n");
+                return FALSE;
+            }
+            $this->ftp_debug("Connected to remote host\n");
+
+			$list = array();
+            while (!feof($sock_data)) {
+                $list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
+            }
+            $this->ftp_close_data_connection($sock_data);
+            $this->ftp_debug(implode("\n", $list));
+
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : NLST command failed\n");
+                return FALSE;
+            }
+
+            return $list;
+        }
+
+        function ftp_rawlist($pathname = "")
+        {
+            if (!($string = $this->ftp_pasv())) {
+                return FALSE;
+            }
+
+            $this->ftp_putcmd("LIST", $pathname);
+
+            $sock_data = $this->ftp_open_data_connection($string);
+            if (!$sock_data || !$this->ftp_ok()) {
+                $this->ftp_debug("Error : Cannot connect to remote host\n");
+                $this->ftp_debug("Error : LIST command failed\n");
+                return FALSE;
+            }
+
+            $this->ftp_debug("Connected to remote host\n");
+
+            while (!feof($sock_data)) {
+                $list[] = preg_replace("@[\r\n]@", "", fgets($sock_data, 512));
+            }
+            $this->ftp_debug(implode("\n", $list));
+            $this->ftp_close_data_connection($sock_data);
+
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : LIST command failed\n");
+                return FALSE;
+            }
+
+            return $list;
+        }
+
+        function ftp_get($localfile, $remotefile, $mode = 1)
+        {
+            umask($this->umask);
+
+            if (@file_exists($localfile)) {
+                $this->ftp_debug("Warning : local file will be overwritten\n");
+            }
+
+            $fp = @fopen($localfile, "w");
+            if (!$fp) {
+                $this->ftp_debug("Error : Cannot create \"".$localfile."\"");
+                $this->ftp_debug("Error : GET command failed\n");
+                return FALSE;
+            }
+
+            if (!$this->ftp_type($mode)) {
+                $this->ftp_debug("Error : GET command failed\n");
+                return FALSE;
+            }
+
+            if (!($string = $this->ftp_pasv())) {
+                $this->ftp_debug("Error : GET command failed\n");
+                return FALSE;
+            }
+
+            $this->ftp_putcmd("RETR", $remotefile);
+
+            $sock_data = $this->ftp_open_data_connection($string);
+            if (!$sock_data || !$this->ftp_ok()) {
+                $this->ftp_debug("Error : Cannot connect to remote host\n");
+                $this->ftp_debug("Error : GET command failed\n");
+                return FALSE;
+            }
+            $this->ftp_debug("Connected to remote host\n");
+            $this->ftp_debug("Retrieving remote file \"".$remotefile."\" to local file \"".$localfile."\"\n");
+            while (!feof($sock_data)) {
+                fputs($fp, fread($sock_data, 4096));
+            }
+            fclose($fp);
+
+            $this->ftp_close_data_connection($sock_data);
+
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : GET command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_put($remotefile, $localfile, $mode = 1)
+        {
+            
+            if (!@file_exists($localfile)) {
+                $this->ftp_debug("Error : No such file or directory \"".$localfile."\"\n");
+                $this->ftp_debug("Error : PUT command failed\n");
+                return FALSE;
+            }
+
+            $fp = @fopen($localfile, "r");
+            if (!$fp) {
+                $this->ftp_debug("Error : Cannot read file \"".$localfile."\"\n");
+                $this->ftp_debug("Error : PUT command failed\n");
+                return FALSE;
+            }
+
+            if (!$this->ftp_type($mode)) {
+                $this->ftp_debug("Error : PUT command failed\n");
+                return FALSE;
+            }
+
+            if (!($string = $this->ftp_pasv())) {
+                $this->ftp_debug("Error : PUT command failed\n");
+                return FALSE;
+            }
+
+            $this->ftp_putcmd("STOR", $remotefile);
+
+            $sock_data = $this->ftp_open_data_connection($string);
+            if (!$sock_data || !$this->ftp_ok()) {
+                $this->ftp_debug("Error : Cannot connect to remote host\n");
+                $this->ftp_debug("Error : PUT command failed\n");
+                return FALSE;
+            }
+            $this->ftp_debug("Connected to remote host\n");
+            $this->ftp_debug("Storing local file \"".$localfile."\" to remote file \"".$remotefile."\"\n");
+            while (!feof($fp)) {
+                fputs($sock_data, fread($fp, 4096));
+            }
+            fclose($fp);
+
+            $this->ftp_close_data_connection($sock_data);
+
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : PUT command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_site($command)
+        {
+            $this->ftp_putcmd("SITE", $command);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : SITE command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_quit()
+        {
+            $this->ftp_putcmd("QUIT");
+            if (!$this->ftp_ok() || !fclose($this->ftp_sock)) {
+                $this->ftp_debug("Error : QUIT command failed\n");
+                return FALSE;
+            }
+            $this->ftp_debug("Disconnected from remote host\n");
+            return TRUE;
+        }
+
+        /* Private Functions */
+
+        function ftp_type($mode)
+        {
+            if ($mode) {
+                $type = "I"; //Binary mode
+            } else {
+                $type = "A"; //ASCII mode
+            }
+            $this->ftp_putcmd("TYPE", $type);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : TYPE command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_port($ip_port)
+        {
+            $this->ftp_putcmd("PORT", $ip_port);
+            $response = $this->ftp_ok();
+            if (!$response) {
+                $this->ftp_debug("Error : PORT command failed\n");
+            }
+            return $response;
+        }
+
+        function ftp_pasv()
+        {
+            $this->ftp_putcmd("PASV");
+            if (!$this->ftp_ok()) {
+                $this->ftp_debug("Error : PASV command failed\n");
+                return FALSE;
+            }
+
+            $ip_port = preg_replace("@^.+ \\(?([0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+)\\)?.*\r\n$@", "\\1", $this->ftp_resp);
+            return $ip_port;
+        }
+
+        function ftp_putcmd($cmd, $arg = "")
+        {
+            if ($arg != "") {
+                $cmd = $cmd." ".$arg;
+            }
+
+            fputs($this->ftp_sock, $cmd."\r\n");
+            $this->ftp_debug("> ".$cmd."\n");
+
+            return TRUE;
+        }
+
+        function ftp_ok()
+        {
+            $this->ftp_resp = "";
+            do {
+                $res = fgets($this->ftp_sock, 512);
+                $this->ftp_resp .= $res;
+            } while (substr($res, 3, 1) != " ");
+
+            $this->ftp_debug(str_replace("\r\n", "\n", $this->ftp_resp));
+
+            if (!preg_match("@^[123]@", $this->ftp_resp)) {
+                return FALSE;
+            }
+
+            return TRUE;
+        }
+
+        function ftp_close_data_connection($sock)
+        {
+            $this->ftp_debug("Disconnected from remote host\n");
+            return fclose($sock);
+        }
+
+        function ftp_open_data_connection($ip_port)
+        {
+            if (!preg_match("@[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]{1,3},[0-9]+,[0-9]+@", $ip_port)) {
+                $this->ftp_debug("Error : Illegal ip-port format(".$ip_port.")\n");
+                return FALSE;
+            }
+
+            $DATA = explode(",", $ip_port);
+            $ipaddr = $DATA[0].".".$DATA[1].".".$DATA[2].".".$DATA[3];
+            $port   = $DATA[4]*256 + $DATA[5];
+            $this->ftp_debug("Trying to ".$ipaddr.":".$port." ...\n");
+            $data_connection = @fsockopen($ipaddr, $port, $errno, $errstr);
+            if (!$data_connection) {
+                $this->ftp_debug("Error : Cannot open data connection to ".$ipaddr.":".$port."\n");
+                $this->ftp_debug("Error : ".$errstr." (".$errno.")\n");
+                return FALSE;
+            }
+
+            return $data_connection;
+        }
+
+        function ftp_debug($message = "")
+        {
+            if ($this->debug) {
+                echo $message;
+            }
+
+            return TRUE;
+        }
+    }
+?>
diff --git a/libs/tar.class.php b/libs/tar.class.php
index d6d72f4e4..66294278d 100644
--- a/libs/tar.class.php
+++ b/libs/tar.class.php
@@ -1,558 +1,558 @@
-<?php
-/*
-=======================================================================
-Name:
-    tar Class
-
-Author:
-    Josh Barger <joshb@npt.com>
-
-Description:
-    This class reads and writes Tape-Archive (TAR) Files and Gzip
-    compressed TAR files, which are mainly used on UNIX systems.
-    This class works on both windows AND unix systems, and does
-    NOT rely on external applications!! Woohoo!
-
-Usage:
-    Copyright (C) 2002  Josh Barger
-
-    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 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
-    Lesser General Public License for more details at:
-        http://www.gnu.org/copyleft/lesser.html
-
-    If you use this script in your application/website, please
-    send me an e-mail letting me know about it :)
-
-Bugs:
-    Please report any bugs you might find to my e-mail address
-    at joshb@npt.com.  If you have already created a fix/patch
-    for the bug, please do send it to me so I can incorporate it into my release.
-
-Version History:
-    1.0 04/10/2002  - InitialRelease
-
-    2.0 04/11/2002  - Merged both tarReader and tarWriter
-                  classes into one
-                - Added support for gzipped tar files
-                  Remember to name for .tar.gz or .tgz
-                  if you use gzip compression!
-                  :: THIS REQUIRES ZLIB EXTENSION ::
-                - Added additional comments to
-                  functions to help users
-                - Added ability to remove files and
-                  directories from archive
-    2.1 04/12/2002  - Fixed serious bug in generating tar
-                - Created another example file
-                - Added check to make sure ZLIB is
-                  installed before running GZIP
-                  compression on TAR
-    2.2 05/07/2002  - Added automatic detection of Gzipped
-                  tar files (Thanks go to J?gen Falch
-                  for the idea)
-                - Changed "private" functions to have
-                  special function names beginning with
-                  two underscores
-=======================================================================
-*/
-
-class tar {
-    // Unprocessed Archive Information
-    var $filename;
-    var $isGzipped;
-    var $tar_file;
-
-    // Processed Archive Information
-    var $files;
-    var $directories;
-    var $numFiles;
-    var $numDirectories;
-
-
-    // Class Constructor -- Does nothing...
-    function tar() {
-        return true;
-    }
-
-
-    // Computes the unsigned Checksum of a file's header
-    // to try to ensure valid file
-    // PRIVATE ACCESS FUNCTION
-    function __computeUnsignedChecksum($bytestring) {
-        for($i=0; $i<512; $i++)
-            $unsigned_chksum += ord($bytestring[$i]);
-        for($i=0; $i<8; $i++)
-            $unsigned_chksum -= ord($bytestring[148 + $i]);
-        $unsigned_chksum += ord(" ") * 8;
-
-        return $unsigned_chksum;
-    }
-
-
-    // Converts a NULL padded string to a non-NULL padded string
-    // PRIVATE ACCESS FUNCTION
-    function __parseNullPaddedString($string) {
-        $position = strpos($string,chr(0));
-        return substr($string,0,$position);
-    }
-
-
-    // This function parses the current TAR file
-    // PRIVATE ACCESS FUNCTION
-    function __parseTar() {
-        // Read Files from archive
-        $tar_length = strlen($this->tar_file);
-        $main_offset = 0;
-        while($main_offset < $tar_length) {
-            // If we read a block of 512 nulls, we are at the end of the archive
-            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
-                break;
-
-            // Parse file name
-            $file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
-
-            // Parse the file mode
-            $file_mode      = substr($this->tar_file,$main_offset + 100,8);
-
-            // Parse the file user ID
-            $file_uid       = octdec(substr($this->tar_file,$main_offset + 108,8));
-
-            // Parse the file group ID
-            $file_gid       = octdec(substr($this->tar_file,$main_offset + 116,8));
-
-            // Parse the file size
-            $file_size      = octdec(substr($this->tar_file,$main_offset + 124,12));
-
-            // Parse the file update time - unix timestamp format
-            $file_time      = octdec(substr($this->tar_file,$main_offset + 136,12));
-
-            // Parse Checksum
-            $file_chksum        = octdec(substr($this->tar_file,$main_offset + 148,6));
-
-            // Parse user name
-            $file_uname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 265,32));
-
-            // Parse Group name
-            $file_gname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32));
-
-            // Make sure our file is valid
-            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
-                return false;
-
-            // Parse File Contents
-            $file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
-
-            /*  ### Unused Header Information ###
-                $activeFile["typeflag"]     = substr($this->tar_file,$main_offset + 156,1);
-                $activeFile["linkname"]     = substr($this->tar_file,$main_offset + 157,100);
-                $activeFile["magic"]        = substr($this->tar_file,$main_offset + 257,6);
-                $activeFile["version"]      = substr($this->tar_file,$main_offset + 263,2);
-                $activeFile["devmajor"]     = substr($this->tar_file,$main_offset + 329,8);
-                $activeFile["devminor"]     = substr($this->tar_file,$main_offset + 337,8);
-                $activeFile["prefix"]       = substr($this->tar_file,$main_offset + 345,155);
-                $activeFile["endheader"]    = substr($this->tar_file,$main_offset + 500,12);
-            */
-
-            if($file_size > 0) {
-                // Increment number of files
-                $this->numFiles++;
-
-                // Create us a new file in our array
-                $activeFile = &$this->files[];
-
-                // Asign Values
-                $activeFile["name"]     = $file_name;
-                $activeFile["mode"]     = $file_mode;
-                $activeFile["size"]     = $file_size;
-                $activeFile["time"]     = $file_time;
-                $activeFile["user_id"]      = $file_uid;
-                $activeFile["group_id"]     = $file_gid;
-                $activeFile["user_name"]    = $file_uname;
-                $activeFile["group_name"]   = $file_gname;
-                $activeFile["checksum"]     = $file_chksum;
-                $activeFile["file"]     = $file_contents;
-
-            } else {
-                // Increment number of directories
-                $this->numDirectories++;
-
-                // Create a new directory in our array
-                $activeDir = &$this->directories[];
-
-                // Assign values
-                $activeDir["name"]      = $file_name;
-                $activeDir["mode"]      = $file_mode;
-                $activeDir["time"]      = $file_time;
-                $activeDir["user_id"]       = $file_uid;
-                $activeDir["group_id"]      = $file_gid;
-                $activeDir["user_name"]     = $file_uname;
-                $activeDir["group_name"]    = $file_gname;
-                $activeDir["checksum"]      = $file_chksum;
-            }
-
-            // Move our offset the number of blocks we have processed
-            $main_offset += 512 + (ceil($file_size / 512) * 512);
-        }
-
-        return true;
-    }
-
-
-    // Read a non gzipped tar file in for processing
-    // PRIVATE ACCESS FUNCTION
-    function __readTar($filename='') {
-        // Set the filename to load
-        if(!$filename)
-            $filename = $this->filename;
-
-        // Read in the TAR file
-        $fp = fopen($filename,"rb");
-        $this->tar_file = fread($fp,filesize($filename));
-        fclose($fp);
-
-        if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
-            if(!function_exists("gzinflate"))
-                return false;
-
-            $this->isGzipped = TRUE;
-
-            $this->tar_file = gzinflate(substr($this->tar_file,10,-4));
-        }
-
-        // Parse the TAR file
-        $this->__parseTar();
-
-        return true;
-    }
-
-
-    // Generates a TAR file from the processed data
-    // PRIVATE ACCESS FUNCTION
-    function __generateTAR() {
-        // Clear any data currently in $this->tar_file
-        unset($this->tar_file);
-
-        // Generate Records for each directory, if we have directories
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                unset($header);
-
-                // Generate tar header for this directory
-                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
-                $header .= str_pad($information["name"],100,chr(0));
-                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct(0),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_repeat(" ",8);
-                $header .= "5";
-                $header .= str_repeat(chr(0),100);
-                $header .= str_pad("ustar",6,chr(32));
-                $header .= chr(32) . chr(0);
-                $header .= str_pad("",32,chr(0));
-                $header .= str_pad("",32,chr(0));
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),155);
-                $header .= str_repeat(chr(0),12);
-
-                // Compute header checksum
-                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
-                for($i=0; $i<6; $i++) {
-                    $header[(148 + $i)] = substr($checksum,$i,1);
-                }
-                $header[154] = chr(0);
-                $header[155] = chr(32);
-
-                // Add new tar formatted data to tar file contents
-                $this->tar_file .= $header;
-            }
-        }
-
-        // Generate Records for each file, if we have files (We should...)
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                unset($header);
-
-                // Generate the TAR header for this file
-                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
-                $header .= str_pad($information["name"],100,chr(0));
-                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["size"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
-                $header .= str_repeat(" ",8);
-                $header .= "0";
-                $header .= str_repeat(chr(0),100);
-                $header .= str_pad("ustar",6,chr(32));
-                $header .= chr(32) . chr(0);
-                $header .= str_pad($information["user_name"],32,chr(0));    // How do I get a file's user name from PHP?
-                $header .= str_pad($information["group_name"],32,chr(0));   // How do I get a file's group name from PHP?
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),8);
-                $header .= str_repeat(chr(0),155);
-                $header .= str_repeat(chr(0),12);
-
-                // Compute header checksum
-                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
-                for($i=0; $i<6; $i++) {
-                    $header[(148 + $i)] = substr($checksum,$i,1);
-                }
-                $header[154] = chr(0);
-                $header[155] = chr(32);
-
-                // Pad file contents to byte count divisible by 512
-                $file_contents = str_pad($information["file"],(ceil($information["size"] / 512) * 512),chr(0));
-
-                // Add new tar formatted data to tar file contents
-                $this->tar_file .= $header . $file_contents;
-            }
-        }
-
-        // Add 512 bytes of NULLs to designate EOF
-        $this->tar_file .= str_repeat(chr(0),512);
-
-        return true;
-    }
-
-
-    // Open a TAR file
-    function openTAR($filename) {
-        // Clear any values from previous tar archives
-        unset($this->filename);
-        unset($this->isGzipped);
-        unset($this->tar_file);
-        unset($this->files);
-        unset($this->directories);
-        unset($this->numFiles);
-        unset($this->numDirectories);
-
-        // If the tar file doesn't exist...
-        if(!file_exists($filename))
-            return false;
-
-        $this->filename = $filename;
-
-        // Parse this file
-        $this->__readTar();
-
-        return true;
-    }
-
-
-    // Appends a tar file to the end of the currently opened tar file
-    function appendTar($filename) {
-        // If the tar file doesn't exist...
-        if(!file_exists($filename))
-            return false;
-
-        $this->__readTar($filename);
-
-        return true;
-    }
-
-
-    // Retrieves information about a file in the current tar archive
-    function getFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
-                    return $information;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Retrieves information about a directory in the current tar archive
-    function getDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
-                    return $information;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Check if this tar archive contains a specific file
-    function containsFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename)
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Check if this tar archive contains a specific directory
-    function containsDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname)
-                    return true;
-            }
-        }
-
-        return false;
-    }
-
-
-    // Add a directory to this tar archive
-    function addDirectory($dirname) {
-        if(!file_exists($dirname))
-            return false;
-
-        // Get directory information
-        $file_information = stat($dirname);
-
-        // Add directory to processed data
-        $this->numDirectories++;
-        $activeDir      = &$this->directories[];
-        $activeDir["name"]  = $dirname;
-        $activeDir["mode"]  = $file_information["mode"];
-        $activeDir["time"]  = $file_information["time"];
-        $activeDir["user_id"]   = $file_information["uid"];
-        $activeDir["group_id"]  = $file_information["gid"];
-        $activeDir["checksum"]  = $checksum;
-
-        return true;
-    }
-
-
-    // Add a file to the tar archive
-    function addFile($filename,$from=null,$to=null) {
-        // Make sure the file we are adding exists!
-        if(!file_exists($filename))
-            return false;
-
-        if(filesize($filename)==0)
-            return false;
-
-        // Make sure there are no other files in the archive that have this same filename
-        if($this->containsFile($filename))
-            return false;
-
-        // Get file information
-        $file_information = stat($filename);
-
-        // Read in the file's contents
-        $fp = fopen($filename,"rb");
-        $file_contents = fread($fp,filesize($filename));
-        fclose($fp);
-
-        if($from && $to){
-            $file_contents = str_replace($from,$to,$file_contents);
-            $file_information["size"] = strlen($file_contents);
-        }
-
-        // Add file to processed data
-        $this->numFiles++;
-        $activeFile         = &$this->files[];
-        $activeFile["name"]     = $filename;
-        $activeFile["mode"]     = $file_information["mode"];
-        $activeFile["user_id"]      = $file_information["uid"];
-        $activeFile["group_id"]     = $file_information["gid"];
-        $activeFile["size"]     = $file_information["size"];
-        $activeFile["time"]     = $file_information["mtime"];
-        $activeFile["checksum"]     = $checksum;
-        $activeFile["user_name"]    = "";
-        $activeFile["group_name"]   = "";
-        $activeFile["file"]     = $file_contents;
-
-        return true;
-    }
-
-
-    // Remove a file from the tar archive
-    function removeFile($filename) {
-        if($this->numFiles > 0) {
-            foreach($this->files as $key => $information) {
-                if($information["name"] == $filename) {
-                    $this->numFiles--;
-                    unset($this->files[$key]);
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    // Remove a directory from the tar archive
-    function removeDirectory($dirname) {
-        if($this->numDirectories > 0) {
-            foreach($this->directories as $key => $information) {
-                if($information["name"] == $dirname) {
-                    $this->numDirectories--;
-                    unset($this->directories[$key]);
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-
-    // Write the currently loaded tar archive to disk
-    function saveTar() {
-        if(!$this->filename)
-            return false;
-
-        // Write tar to current file using specified gzip compression
-        $this->toTar($this->filename,$this->isGzipped);
-
-        return true;
-    }
-
-
-    // Saves tar archive to a different file than the current file
-    function toTar($filename,$useGzip) {
-        if(!$filename)
-            return false;
-
-        // Encode processed files into TAR file format
-        $this->__generateTar();
-
-        // GZ Compress the data if we need to
-        if($useGzip) {
-            // Make sure we have gzip support
-            if(!function_exists("gzencode"))
-                return false;
-
-            $file = gzencode($this->tar_file);
-        } else {
-            $file = $this->tar_file;
-        }
-
-        // Write the TAR file
-        $fp = fopen($filename,"wb");
-        fwrite($fp,$file);
-        fclose($fp);
-
-        return true;
-    }
-
-
-    function toTarStream() {
-        $this->__generateTar();
-        return $this->tar_file;
-    }
-}
-?>
+<?php
+/*
+=======================================================================
+Name:
+    tar Class
+
+Author:
+    Josh Barger <joshb@npt.com>
+
+Description:
+    This class reads and writes Tape-Archive (TAR) Files and Gzip
+    compressed TAR files, which are mainly used on UNIX systems.
+    This class works on both windows AND unix systems, and does
+    NOT rely on external applications!! Woohoo!
+
+Usage:
+    Copyright (C) 2002  Josh Barger
+
+    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 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
+    Lesser General Public License for more details at:
+        http://www.gnu.org/copyleft/lesser.html
+
+    If you use this script in your application/website, please
+    send me an e-mail letting me know about it :)
+
+Bugs:
+    Please report any bugs you might find to my e-mail address
+    at joshb@npt.com.  If you have already created a fix/patch
+    for the bug, please do send it to me so I can incorporate it into my release.
+
+Version History:
+    1.0 04/10/2002  - InitialRelease
+
+    2.0 04/11/2002  - Merged both tarReader and tarWriter
+                  classes into one
+                - Added support for gzipped tar files
+                  Remember to name for .tar.gz or .tgz
+                  if you use gzip compression!
+                  :: THIS REQUIRES ZLIB EXTENSION ::
+                - Added additional comments to
+                  functions to help users
+                - Added ability to remove files and
+                  directories from archive
+    2.1 04/12/2002  - Fixed serious bug in generating tar
+                - Created another example file
+                - Added check to make sure ZLIB is
+                  installed before running GZIP
+                  compression on TAR
+    2.2 05/07/2002  - Added automatic detection of Gzipped
+                  tar files (Thanks go to J?gen Falch
+                  for the idea)
+                - Changed "private" functions to have
+                  special function names beginning with
+                  two underscores
+=======================================================================
+*/
+
+class tar {
+    // Unprocessed Archive Information
+    var $filename;
+    var $isGzipped;
+    var $tar_file;
+
+    // Processed Archive Information
+    var $files;
+    var $directories;
+    var $numFiles;
+    var $numDirectories;
+
+
+    // Class Constructor -- Does nothing...
+    function tar() {
+        return true;
+    }
+
+
+    // Computes the unsigned Checksum of a file's header
+    // to try to ensure valid file
+    // PRIVATE ACCESS FUNCTION
+    function __computeUnsignedChecksum($bytestring) {
+        for($i=0; $i<512; $i++)
+            $unsigned_chksum += ord($bytestring[$i]);
+        for($i=0; $i<8; $i++)
+            $unsigned_chksum -= ord($bytestring[148 + $i]);
+        $unsigned_chksum += ord(" ") * 8;
+
+        return $unsigned_chksum;
+    }
+
+
+    // Converts a NULL padded string to a non-NULL padded string
+    // PRIVATE ACCESS FUNCTION
+    function __parseNullPaddedString($string) {
+        $position = strpos($string,chr(0));
+        return substr($string,0,$position);
+    }
+
+
+    // This function parses the current TAR file
+    // PRIVATE ACCESS FUNCTION
+    function __parseTar() {
+        // Read Files from archive
+        $tar_length = strlen($this->tar_file);
+        $main_offset = 0;
+        while($main_offset < $tar_length) {
+            // If we read a block of 512 nulls, we are at the end of the archive
+            if(substr($this->tar_file,$main_offset,512) == str_repeat(chr(0),512))
+                break;
+
+            // Parse file name
+            $file_name      = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset,100));
+
+            // Parse the file mode
+            $file_mode      = substr($this->tar_file,$main_offset + 100,8);
+
+            // Parse the file user ID
+            $file_uid       = octdec(substr($this->tar_file,$main_offset + 108,8));
+
+            // Parse the file group ID
+            $file_gid       = octdec(substr($this->tar_file,$main_offset + 116,8));
+
+            // Parse the file size
+            $file_size      = octdec(substr($this->tar_file,$main_offset + 124,12));
+
+            // Parse the file update time - unix timestamp format
+            $file_time      = octdec(substr($this->tar_file,$main_offset + 136,12));
+
+            // Parse Checksum
+            $file_chksum        = octdec(substr($this->tar_file,$main_offset + 148,6));
+
+            // Parse user name
+            $file_uname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 265,32));
+
+            // Parse Group name
+            $file_gname     = $this->__parseNullPaddedString(substr($this->tar_file,$main_offset + 297,32));
+
+            // Make sure our file is valid
+            if($this->__computeUnsignedChecksum(substr($this->tar_file,$main_offset,512)) != $file_chksum)
+                return false;
+
+            // Parse File Contents
+            $file_contents      = substr($this->tar_file,$main_offset + 512,$file_size);
+
+            /*  ### Unused Header Information ###
+                $activeFile["typeflag"]     = substr($this->tar_file,$main_offset + 156,1);
+                $activeFile["linkname"]     = substr($this->tar_file,$main_offset + 157,100);
+                $activeFile["magic"]        = substr($this->tar_file,$main_offset + 257,6);
+                $activeFile["version"]      = substr($this->tar_file,$main_offset + 263,2);
+                $activeFile["devmajor"]     = substr($this->tar_file,$main_offset + 329,8);
+                $activeFile["devminor"]     = substr($this->tar_file,$main_offset + 337,8);
+                $activeFile["prefix"]       = substr($this->tar_file,$main_offset + 345,155);
+                $activeFile["endheader"]    = substr($this->tar_file,$main_offset + 500,12);
+            */
+
+            if($file_size > 0) {
+                // Increment number of files
+                $this->numFiles++;
+
+                // Create us a new file in our array
+                $activeFile = &$this->files[];
+
+                // Asign Values
+                $activeFile["name"]     = $file_name;
+                $activeFile["mode"]     = $file_mode;
+                $activeFile["size"]     = $file_size;
+                $activeFile["time"]     = $file_time;
+                $activeFile["user_id"]      = $file_uid;
+                $activeFile["group_id"]     = $file_gid;
+                $activeFile["user_name"]    = $file_uname;
+                $activeFile["group_name"]   = $file_gname;
+                $activeFile["checksum"]     = $file_chksum;
+                $activeFile["file"]     = $file_contents;
+
+            } else {
+                // Increment number of directories
+                $this->numDirectories++;
+
+                // Create a new directory in our array
+                $activeDir = &$this->directories[];
+
+                // Assign values
+                $activeDir["name"]      = $file_name;
+                $activeDir["mode"]      = $file_mode;
+                $activeDir["time"]      = $file_time;
+                $activeDir["user_id"]       = $file_uid;
+                $activeDir["group_id"]      = $file_gid;
+                $activeDir["user_name"]     = $file_uname;
+                $activeDir["group_name"]    = $file_gname;
+                $activeDir["checksum"]      = $file_chksum;
+            }
+
+            // Move our offset the number of blocks we have processed
+            $main_offset += 512 + (ceil($file_size / 512) * 512);
+        }
+
+        return true;
+    }
+
+
+    // Read a non gzipped tar file in for processing
+    // PRIVATE ACCESS FUNCTION
+    function __readTar($filename='') {
+        // Set the filename to load
+        if(!$filename)
+            $filename = $this->filename;
+
+        // Read in the TAR file
+        $fp = fopen($filename,"rb");
+        $this->tar_file = fread($fp,filesize($filename));
+        fclose($fp);
+
+        if($this->tar_file[0] == chr(31) && $this->tar_file[1] == chr(139) && $this->tar_file[2] == chr(8)) {
+            if(!function_exists("gzinflate"))
+                return false;
+
+            $this->isGzipped = TRUE;
+
+            $this->tar_file = gzinflate(substr($this->tar_file,10,-4));
+        }
+
+        // Parse the TAR file
+        $this->__parseTar();
+
+        return true;
+    }
+
+
+    // Generates a TAR file from the processed data
+    // PRIVATE ACCESS FUNCTION
+    function __generateTAR() {
+        // Clear any data currently in $this->tar_file
+        unset($this->tar_file);
+
+        // Generate Records for each directory, if we have directories
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                unset($header);
+
+                // Generate tar header for this directory
+                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
+                $header .= str_pad($information["name"],100,chr(0));
+                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct(0),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_repeat(" ",8);
+                $header .= "5";
+                $header .= str_repeat(chr(0),100);
+                $header .= str_pad("ustar",6,chr(32));
+                $header .= chr(32) . chr(0);
+                $header .= str_pad("",32,chr(0));
+                $header .= str_pad("",32,chr(0));
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),155);
+                $header .= str_repeat(chr(0),12);
+
+                // Compute header checksum
+                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
+                for($i=0; $i<6; $i++) {
+                    $header[(148 + $i)] = substr($checksum,$i,1);
+                }
+                $header[154] = chr(0);
+                $header[155] = chr(32);
+
+                // Add new tar formatted data to tar file contents
+                $this->tar_file .= $header;
+            }
+        }
+
+        // Generate Records for each file, if we have files (We should...)
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                unset($header);
+
+                // Generate the TAR header for this file
+                // Filename, Permissions, UID, GID, size, Time, checksum, typeflag, linkname, magic, version, user name, group name, devmajor, devminor, prefix, end
+                $header .= str_pad($information["name"],100,chr(0));
+                $header .= str_pad(decoct($information["mode"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["user_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["group_id"]),7,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["size"]),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_pad(decoct($information["time"]),11,"0",STR_PAD_LEFT) . chr(0);
+                $header .= str_repeat(" ",8);
+                $header .= "0";
+                $header .= str_repeat(chr(0),100);
+                $header .= str_pad("ustar",6,chr(32));
+                $header .= chr(32) . chr(0);
+                $header .= str_pad($information["user_name"],32,chr(0));    // How do I get a file's user name from PHP?
+                $header .= str_pad($information["group_name"],32,chr(0));   // How do I get a file's group name from PHP?
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),8);
+                $header .= str_repeat(chr(0),155);
+                $header .= str_repeat(chr(0),12);
+
+                // Compute header checksum
+                $checksum = str_pad(decoct($this->__computeUnsignedChecksum($header)),6,"0",STR_PAD_LEFT);
+                for($i=0; $i<6; $i++) {
+                    $header[(148 + $i)] = substr($checksum,$i,1);
+                }
+                $header[154] = chr(0);
+                $header[155] = chr(32);
+
+                // Pad file contents to byte count divisible by 512
+                $file_contents = str_pad($information["file"],(ceil($information["size"] / 512) * 512),chr(0));
+
+                // Add new tar formatted data to tar file contents
+                $this->tar_file .= $header . $file_contents;
+            }
+        }
+
+        // Add 512 bytes of NULLs to designate EOF
+        $this->tar_file .= str_repeat(chr(0),512);
+
+        return true;
+    }
+
+
+    // Open a TAR file
+    function openTAR($filename) {
+        // Clear any values from previous tar archives
+        unset($this->filename);
+        unset($this->isGzipped);
+        unset($this->tar_file);
+        unset($this->files);
+        unset($this->directories);
+        unset($this->numFiles);
+        unset($this->numDirectories);
+
+        // If the tar file doesn't exist...
+        if(!file_exists($filename))
+            return false;
+
+        $this->filename = $filename;
+
+        // Parse this file
+        $this->__readTar();
+
+        return true;
+    }
+
+
+    // Appends a tar file to the end of the currently opened tar file
+    function appendTar($filename) {
+        // If the tar file doesn't exist...
+        if(!file_exists($filename))
+            return false;
+
+        $this->__readTar($filename);
+
+        return true;
+    }
+
+
+    // Retrieves information about a file in the current tar archive
+    function getFile($filename) {
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                if($information["name"] == $filename)
+                    return $information;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Retrieves information about a directory in the current tar archive
+    function getDirectory($dirname) {
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                if($information["name"] == $dirname)
+                    return $information;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Check if this tar archive contains a specific file
+    function containsFile($filename) {
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                if($information["name"] == $filename)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Check if this tar archive contains a specific directory
+    function containsDirectory($dirname) {
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                if($information["name"] == $dirname)
+                    return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    // Add a directory to this tar archive
+    function addDirectory($dirname) {
+        if(!file_exists($dirname))
+            return false;
+
+        // Get directory information
+        $file_information = stat($dirname);
+
+        // Add directory to processed data
+        $this->numDirectories++;
+        $activeDir      = &$this->directories[];
+        $activeDir["name"]  = $dirname;
+        $activeDir["mode"]  = $file_information["mode"];
+        $activeDir["time"]  = $file_information["time"];
+        $activeDir["user_id"]   = $file_information["uid"];
+        $activeDir["group_id"]  = $file_information["gid"];
+        $activeDir["checksum"]  = $checksum;
+
+        return true;
+    }
+
+
+    // Add a file to the tar archive
+    function addFile($filename,$from=null,$to=null) {
+        // Make sure the file we are adding exists!
+        if(!file_exists($filename))
+            return false;
+
+        if(filesize($filename)==0)
+            return false;
+
+        // Make sure there are no other files in the archive that have this same filename
+        if($this->containsFile($filename))
+            return false;
+
+        // Get file information
+        $file_information = stat($filename);
+
+        // Read in the file's contents
+        $fp = fopen($filename,"rb");
+        $file_contents = fread($fp,filesize($filename));
+        fclose($fp);
+
+        if($from && $to){
+            $file_contents = str_replace($from,$to,$file_contents);
+            $file_information["size"] = strlen($file_contents);
+        }
+
+        // Add file to processed data
+        $this->numFiles++;
+        $activeFile         = &$this->files[];
+        $activeFile["name"]     = $filename;
+        $activeFile["mode"]     = $file_information["mode"];
+        $activeFile["user_id"]      = $file_information["uid"];
+        $activeFile["group_id"]     = $file_information["gid"];
+        $activeFile["size"]     = $file_information["size"];
+        $activeFile["time"]     = $file_information["mtime"];
+        $activeFile["checksum"]     = $checksum;
+        $activeFile["user_name"]    = "";
+        $activeFile["group_name"]   = "";
+        $activeFile["file"]     = $file_contents;
+
+        return true;
+    }
+
+
+    // Remove a file from the tar archive
+    function removeFile($filename) {
+        if($this->numFiles > 0) {
+            foreach($this->files as $key => $information) {
+                if($information["name"] == $filename) {
+                    $this->numFiles--;
+                    unset($this->files[$key]);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    // Remove a directory from the tar archive
+    function removeDirectory($dirname) {
+        if($this->numDirectories > 0) {
+            foreach($this->directories as $key => $information) {
+                if($information["name"] == $dirname) {
+                    $this->numDirectories--;
+                    unset($this->directories[$key]);
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+
+    // Write the currently loaded tar archive to disk
+    function saveTar() {
+        if(!$this->filename)
+            return false;
+
+        // Write tar to current file using specified gzip compression
+        $this->toTar($this->filename,$this->isGzipped);
+
+        return true;
+    }
+
+
+    // Saves tar archive to a different file than the current file
+    function toTar($filename,$useGzip) {
+        if(!$filename)
+            return false;
+
+        // Encode processed files into TAR file format
+        $this->__generateTar();
+
+        // GZ Compress the data if we need to
+        if($useGzip) {
+            // Make sure we have gzip support
+            if(!function_exists("gzencode"))
+                return false;
+
+            $file = gzencode($this->tar_file);
+        } else {
+            $file = $this->tar_file;
+        }
+
+        // Write the TAR file
+        $fp = fopen($filename,"wb");
+        fwrite($fp,$file);
+        fclose($fp);
+
+        return true;
+    }
+
+
+    function toTarStream() {
+        $this->__generateTar();
+        return $this->tar_file;
+    }
+}
+?>
diff --git a/m.layouts/default/conf/info.xml b/m.layouts/default/conf/info.xml
index 23307bdee..bffa955ba 100644
--- a/m.layouts/default/conf/info.xml
+++ b/m.layouts/default/conf/info.xml
@@ -1,106 +1,106 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layout version="0.2">
-    <title xml:lang="ko">XE 공식 사이트 모바일 레이아웃</title>
-    <title xml:lang="en">XE Official Mobile layout</title>
-    <title xml:lang="zh-CN">官方移动版布局</title>
-    <title xml:lang="zh-TW">XE Mobile 官方版面</title>
-    <title xml:lang="tr">XE Resmi Hareketli Yerleşim Düzeni</title>
-    <description xml:lang="ko">
-        XE 공식 모바일 레이아웃입니다.
-        NHN (developers@xpressengine.com) 
-    </description>
-    <description xml:lang="en">
-        This layout is the XE Official website layout.
-        NHN (developers@xpressengine.com) 
-    </description>
-    <description xml:lang="zh-CN">
-        官方移动版布局。
-        NHN (developers@xpressengine.com) 
-    </description>
-    <description xml:lang="zh-TW">
-        XE Mobile 官方網站版面。
-        NHN (developers@xpressengine.com) 
-    </description>
-    <description xml:lang="tr">
-        Bu yerleşim düzeni, XE Resmi website yerleşim düzenidir.
-        NHN (developers@xpressengine.com) 
-    </description>
-    <version>0.1</version>
-    <date>2010-08-20</date>
-    <link>http://xpressengine.com/</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-    <extra_vars>
-    	<var name="index_title" type="text">
-            <title xml:lang="ko">홈페이지 Title</title>
-            <title xml:lang="en">Homepage Title</title>
-            <title xml:lang="zh-CN">网站标题</title>
-            <title xml:lang="zh-TW">首頁標題</title>
-            <title xml:lang="tr">Anasayfa Başlığı</title>
-		</var>
-        <var name="logo_image" type="image">
-            <title xml:lang="ko">로고이미지</title>
-            <title xml:lang="jp">ロゴイメージ</title>
-            <title xml:lang="zh-CN">LOGO图片</title>
-            <title xml:lang="zh-TW">Logo圖片</title>
-            <title xml:lang="en">Logo image</title>
-            <title xml:lang="ge">Logobildes</title>
-            <title xml:lang="ru">Изображения логотипа</title>
-            <title xml:lang="es">Imagen del logotipo</title>
-	    	<title xml:lang="vi">Hình Logo</title>
-	    	<title xml:lang="tr">Logo resmi</title>
-            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 28px인 투명 이미지가 가장 어울립니다)</description>
-            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が28pxである透明イメージをお勧めします。。)</description>
-            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为28px的透明图片为适)。</description>
-            <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為 28px 的透明圖片。)</description>
-            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 28px is recommended.)</description>
-            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 28px wird empfohlen).</description>
-            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 28px рекомендуется.)</description>
-            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 28px.</description>
-	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 28px.)</description>
-	    	<description xml:lang="tr">Lütfen yerleşim düzeninin üst kısmında gösterilecek bir logo resmi giriniz. (Önerilen resim 28px uzunluğunda, transparan ayarda bir resimdir.)</description>
-        </var>
-        <var name="index_url" type="text">
-            <title xml:lang="ko">홈 페이지 URL</title>
-            <title xml:lang="jp">ホームページURL</title>
-            <title xml:lang="zh-CN">主页地址</title>
-            <title xml:lang="zh-TW">主頁網址</title>
-            <title xml:lang="en">Homepage URL</title>
-            <title xml:lang="ge">Homepage URL</title>
-            <title xml:lang="ru">Домашняя страница URL</title>
-            <title xml:lang="es">URL de la página web</title>
-	    	<title xml:lang="vi">URL Trang chủ</title>
-	    	<title xml:lang="tr">Anasayfa URLsi</title>
-            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
-            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
-            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
-            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
-            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
-            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
-            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
-            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
-	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
-	    	<description xml:lang="tr">Lütfen kullanıcıların logoya tıkladıklarında yönlendirilecekleri bir URL giriniz</description>
-        </var>
-    </extra_vars>
-    <menus>
-        <menu name="main_menu" maxdepth="3" default="true">
-            <title xml:lang="ko">상단 메뉴</title>
-            <title xml:lang="jp">上段用メニュー</title>
-            <title xml:lang="zh-CN">主菜单</title>
-            <title xml:lang="zh-TW">主選單</title>
-            <title xml:lang="en">Top menu</title>
-            <title xml:lang="ge">Top Menü</title>
-            <title xml:lang="ru">Верхнее меню</title>
-            <title xml:lang="es">Menú Principal</title>
-            <title xml:lang="tr">Ana Menü</title>
-	    <title xml:lang="vi">Menu trên</title>
-        </menu>
-    </menus>
-</layout>
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE 공식 사이트 모바일 레이아웃</title>
+    <title xml:lang="en">XE Official Mobile layout</title>
+    <title xml:lang="zh-CN">官方移动版布局</title>
+    <title xml:lang="zh-TW">XE Mobile 官方版面</title>
+    <title xml:lang="tr">XE Resmi Hareketli Yerleşim Düzeni</title>
+    <description xml:lang="ko">
+        XE 공식 모바일 레이아웃입니다.
+        NHN (developers@xpressengine.com) 
+    </description>
+    <description xml:lang="en">
+        This layout is the Official website layout for XE.
+        NHN (developers@xpressengine.com) 
+    </description>
+    <description xml:lang="zh-CN">
+        官方移动版布局。
+        NHN (developers@xpressengine.com) 
+    </description>
+    <description xml:lang="zh-TW">
+        XE Mobile 官方網站版面。
+        NHN (developers@xpressengine.com) 
+    </description>
+    <description xml:lang="tr">
+        Bu yerleşim düzeni, XE Resmi website yerleşim düzenidir.
+        NHN (developers@xpressengine.com) 
+    </description>
+    <version>0.1</version>
+    <date>2010-08-20</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+    <extra_vars>
+    	<var name="index_title" type="text">
+            <title xml:lang="ko">홈페이지 Title</title>
+            <title xml:lang="en">Homepage Title</title>
+            <title xml:lang="zh-CN">网站标题</title>
+            <title xml:lang="zh-TW">首頁標題</title>
+            <title xml:lang="tr">Anasayfa Başlığı</title>
+		</var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+	    	<title xml:lang="vi">Hình Logo</title>
+	    	<title xml:lang="tr">Logo resmi</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 28px인 투명 이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が28pxである透明イメージをお勧めします。。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为28px的透明图片为适)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為 28px 的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of the layout. (A transparent image with height of 28px is recommended.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 28px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 28px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 28px.</description>
+	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 28px.)</description>
+	    	<description xml:lang="tr">Lütfen yerleşim düzeninin üst kısmında gösterilecek bir logo resmi giriniz. (Önerilen resim 28px uzunluğunda, transparan ayarda bir resimdir.)</description>
+        </var>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+	    	<title xml:lang="vi">URL Trang chủ</title>
+	    	<title xml:lang="tr">Anasayfa URLsi</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
+	    	<description xml:lang="tr">Lütfen kullanıcıların logoya tıkladıklarında yönlendirilecekleri bir URL giriniz</description>
+        </var>
+    </extra_vars>
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段用メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+            <title xml:lang="tr">Ana Menü</title>
+	    <title xml:lang="vi">Menu trên</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/m.layouts/default/layout.html b/m.layouts/default/layout.html
index 2aa191d97..799ec13f0 100644
--- a/m.layouts/default/layout.html
+++ b/m.layouts/default/layout.html
@@ -1,28 +1,28 @@
-<!--%import("mx.css")-->
-<div class="hd">
-	<!--@if($layout_info->logo_image)-->
-	<h1 class="h1"><a href="{$layout_info->index_url}"><img src="{$layout_info->logo_image}" alt="{$layout_info->index_title}" /></a></h1>
-	<!--@elseif($layout_info->index_title)-->
-	<h1 class="h1"><a href="{$layout_info->index_url}">{$layout_info->index_title}</a></h1>
-	<!--@else-->
-	<h1 class="h1"><a href="{$layout_info->index_url}">Mobile XE</a></h1>
-	<!--@end-->
-	<!--@if($layout_info->menu->main_menu->menu_srl)-->
-		<!--@if($act=='dispMenuMenu')-->
-		<div class="fr"><button type="button" class="muon" onclick="history.back()">{$lang->cmd_back}</button></div>
-		<!--@else-->
-		<div class="fr"><a href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" class="mu">Menu</a></div>
-		<!--@end-->
-	<!--@end-->
-</div>
-{$content}
-<ul class="ft">
-	<!--@if($is_logged)-->
-	<li class="fl"><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
-	<!--@elseif($act!='dispMemberLoginForm')-->
-	<li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
-	<!--@end-->
-	<li class="fr"><a href="{getUrl('m',0)}">PC</a></li>
-	<li class="fr"><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li>
-</ul>
-<p class="cr">{$layout_info->index_title}</p>
+<!--%import("mx.css")-->
+<div class="hd">
+	<!--@if($layout_info->logo_image)-->
+	<h1 class="h1"><a href="{$layout_info->index_url}"><img src="{$layout_info->logo_image}" alt="{$layout_info->index_title}" /></a></h1>
+	<!--@elseif($layout_info->index_title)-->
+	<h1 class="h1"><a href="{$layout_info->index_url}">{$layout_info->index_title}</a></h1>
+	<!--@else-->
+	<h1 class="h1"><a href="{$layout_info->index_url}">Mobile XE</a></h1>
+	<!--@end-->
+	<!--@if($layout_info->menu->main_menu->menu_srl)-->
+		<!--@if($act=='dispMenuMenu')-->
+		<div class="fr"><button type="button" class="muon" onclick="history.back()">{$lang->cmd_back}</button></div>
+		<!--@else-->
+		<div class="fr"><a href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" class="mu">Menu</a></div>
+		<!--@end-->
+	<!--@end-->
+</div>
+{$content}
+<ul class="ft">
+	<!--@if($is_logged)-->
+	<li class="fl"><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
+	<!--@elseif($act!='dispMemberLoginForm')-->
+	<li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
+	<!--@end-->
+	<li class="fr"><a href="{getUrl('m',0)}">PC</a></li>
+	<li class="fr"><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li>
+</ul>
+<p class="cr">{$layout_info->index_title}</p>
diff --git a/m.layouts/default/mx.css b/m.layouts/default/mx.css
index 385b5d9b5..63f7692a9 100644
--- a/m.layouts/default/mx.css
+++ b/m.layouts/default/mx.css
@@ -1,24 +1,24 @@
-@charset "utf-8";
-/* Mobile XE (/m.layouts/default/) */
-body{margin:0;background:#fff;color:#000;word-wrap:break-word}
-body,input,textarea,select,button,table{font-family:Tahoma,Geneva,sans-serif}
-/* Common */
-.fl{float:left}
-.fr{float:right}
-/* Header */
-.hd{min-height:28px;line-height:28px;padding:6px;margin:0 0 1px 0;border-bottom:2px solid #8d7de1;background:#444 -webkit-gradient(linear,0% 0%,0% 100%,from(#434343),to(#0d0d0d));background:#444 -moz-linear-gradient(top,#434343,#0d0d0d);background-color:#444;*zoom:1}
-.hd:after{content:"";margin:0 -6px;position:relative;top:9px;display:block;clear:both;height:1px;background:#6352d2}
-.hd .h1{float:left;display:inline;color:#fff;font-size:24px;margin:0;font-weight:bold}
-.hd .h1 a{color:#fff}
-.hd .h1 img{border:0}
-.hd .mu{display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b}
-.hd .mu:after{content:"›";margin:0 0 0 3px;font-size:24px;vertical-align:middle;position:relative;top:-2px}
-.hd .muon{cursor:pointer;display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b}
-.hd .muon:before{content:"‹";font-weight:bold;font-size:16px;line-height:16px;margin:0 2px 0 0;font-family:Verdana, Geneva, sans-serif}
-/* Footer */
-.ft{padding:0;margin:0;list-style:none;background:#868686;overflow:hidden;zoom:1}
-.ft:after{content:"";display:block;clear:both}
-.ft li{margin:0;padding:0;border:1px solid #9c9a99;border-top:0;border-bottom:0;margin:0 -1px;background:#868686}
-.ft a{display:inline-block;padding:0 15px;color:#fff;text-shadow:0 0 2px #000;font-size:12px;font-weight:bold;line-height:32px;text-decoration:none}
-/* Copyright */
+@charset "utf-8";
+/* Mobile XE (/m.layouts/default/) */
+body{margin:0;background:#fff;color:#000;word-wrap:break-word}
+body,input,textarea,select,button,table{font-family:Tahoma,Geneva,sans-serif}
+/* Common */
+.fl{float:left}
+.fr{float:right}
+/* Header */
+.hd{min-height:28px;line-height:28px;padding:6px;margin:0 0 1px 0;border-bottom:2px solid #8d7de1;background:#444 -webkit-gradient(linear,0% 0%,0% 100%,from(#434343),to(#0d0d0d));background:#444 -moz-linear-gradient(top,#434343,#0d0d0d);background-color:#444;*zoom:1}
+.hd:after{content:"";margin:0 -6px;position:relative;top:9px;display:block;clear:both;height:1px;background:#6352d2}
+.hd .h1{float:left;display:inline;color:#fff;font-size:24px;margin:0;font-weight:bold}
+.hd .h1 a{color:#fff}
+.hd .h1 img{border:0}
+.hd .mu{display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b}
+.hd .mu:after{content:"›";margin:0 0 0 3px;font-size:24px;vertical-align:middle;position:relative;top:-2px}
+.hd .muon{cursor:pointer;display:inline-block;height:26px;line-height:26px;padding:0 10px;font-size:12px;font-weight:bold;color:#fff;text-decoration:none;box-shadow:0 0 1px #000;-webkit-box-shadow:0 0 1px #000;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;background:#1b1b1b -webkit-gradient(linear,0% 0%,0% 100%,from(#777),to(#373737),color-stop(0.5,#323232),color-stop(0.5,#1b1b1b));background:#1b1b1b -moz-linear-gradient(top,#777,#373737);background-color:#1b1b1b}
+.hd .muon:before{content:"‹";font-weight:bold;font-size:16px;line-height:16px;margin:0 2px 0 0;font-family:Verdana, Geneva, sans-serif}
+/* Footer */
+.ft{padding:0;margin:0;list-style:none;background:#868686;overflow:hidden;zoom:1}
+.ft:after{content:"";display:block;clear:both}
+.ft li{margin:0;padding:0;border:1px solid #9c9a99;border-top:0;border-bottom:0;margin:0 -1px;background:#868686}
+.ft a{display:inline-block;padding:0 15px;color:#fff;text-shadow:0 0 2px #000;font-size:12px;font-weight:bold;line-height:32px;text-decoration:none}
+/* Copyright */
 .cr{margin:0;text-align:center;background:#f2f0ec;color:#494949;font-size:11px;line-height:26px}
\ No newline at end of file
diff --git a/m.layouts/simpleGray/conf/info.xml b/m.layouts/simpleGray/conf/info.xml
index da471b91d..eee95afd3 100644
--- a/m.layouts/simpleGray/conf/info.xml
+++ b/m.layouts/simpleGray/conf/info.xml
@@ -1,89 +1,89 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layout version="0.2">
-    <title xml:lang="ko">XE 심플 그레이 레이아웃</title>
-    <title xml:lang="en">XE simple gray layout</title>
-    <title xml:lang="zh-CN">官方移动版布局</title>
-    <title xml:lang="zh-TW">XE Mobile 官方版面</title>
-    <title xml:lang="tr">XE basit gri yerleşim düzeni</title>
-    <description xml:lang="ko">
-        XE 심플 그레이 레이아웃입니다.
-        디자인, 퍼블리싱 : 정찬명
-        레이아웃 제작 : haneul 
-    </description>
-    <description xml:lang="en">
-        This layout is the XE Official website layout.
-        Design, HTML/CSS : Chan-Myung Jeong
-        Layout producer : haneul 
-    </description>
-    <description xml:lang="zh-CN">
-        官方移动版布局。
-        Design, HTML/CSS : Chan-Myung Jeong
-        Layout producer : haneul 
-    </description>
-    <description xml:lang="tr">
-        官方移动版布局。
-        Design, HTML/CSS : Chan-Myung Jeong
-        Layout producer : haneul 
-    </description>
-    <description xml:lang="zh-TW">
-        XE Mobile 官方網站版面。
-        Design, HTML/CSS : Chan-Myung Jeong
-        Layout producer : haneul 
-    </description>
-    <version>0.1</version>
-    <date>2010-06-10</date>
-    <link>http://xpressengine.com</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-    <extra_vars>
-    	<var name="index_title" type="text">
-            <title xml:lang="ko">홈페이지 Title</title>
-            <title xml:lang="en">Homepage Title</title>
-            <title xml:lang="zh-CN">网站标题</title>
-            <title xml:lang="zh-TW">首頁標題</title>
-            <title xml:lang="tr">Anasayfa URLsi</title>
-	</var>
-        <var name="index_url" type="text">
-            <title xml:lang="ko">홈 페이지 URL</title>
-            <title xml:lang="jp">ホームページURL</title>
-            <title xml:lang="zh-CN">主页地址</title>
-            <title xml:lang="zh-TW">主頁網址</title>
-            <title xml:lang="en">Homepage URL</title>
-            <title xml:lang="ge">Homepage URL</title>
-            <title xml:lang="ru">Домашняя страница URL</title>
-            <title xml:lang="es">URL de la página web</title>
-	    	<title xml:lang="vi">URL Trang chủ</title>
-	    	<title xml:lang="tr">Anasayfa URLsi</title>
-            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
-            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
-            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
-            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
-            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
-            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
-            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
-            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
-	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
-	    	<description xml:lang="tr">Lütfen kullanıcıların logoya tıkladıklarında yönlendirilecekleri URL adresini giriniz</description>
-        </var>
-    </extra_vars>
-    <menus>
-        <menu name="main_menu" maxdepth="3" default="true">
-            <title xml:lang="ko">상단 메뉴</title>
-            <title xml:lang="jp">上段用メニュー</title>
-            <title xml:lang="zh-CN">主菜单</title>
-            <title xml:lang="zh-TW">主選單</title>
-            <title xml:lang="en">Top menu</title>
-            <title xml:lang="ge">Top Menü</title>
-            <title xml:lang="ru">Верхнее меню</title>
-            <title xml:lang="es">Menú Principal</title>
-            <title xml:lang="tr">Ana Menü</title>
-	    <title xml:lang="vi">Menu trên</title>
-        </menu>
-    </menus>
-</layout>
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE 심플 그레이 레이아웃</title>
+    <title xml:lang="en">XE simple gray layout</title>
+    <title xml:lang="zh-CN">官方移动版布局</title>
+    <title xml:lang="zh-TW">XE Mobile 官方版面</title>
+    <title xml:lang="tr">XE basit gri yerleşim düzeni</title>
+    <description xml:lang="ko">
+        XE 심플 그레이 레이아웃입니다.
+        디자인, 퍼블리싱 : 정찬명
+        레이아웃 제작 : haneul 
+    </description>
+    <description xml:lang="en">
+        This layout is the Official website layout of XE.
+        Design, HTML/CSS : Chan-Myung Jeong
+        Layout producer : haneul 
+    </description>
+    <description xml:lang="zh-CN">
+        官方移动版布局。
+        Design, HTML/CSS : Chan-Myung Jeong
+        Layout producer : haneul 
+    </description>
+    <description xml:lang="tr">
+        官方移动版布局。
+        Design, HTML/CSS : Chan-Myung Jeong
+        Layout producer : haneul 
+    </description>
+    <description xml:lang="zh-TW">
+        XE Mobile 官方網站版面。
+        Design, HTML/CSS : Chan-Myung Jeong
+        Layout producer : haneul 
+    </description>
+    <version>0.1</version>
+    <date>2010-06-10</date>
+    <link>http://xpressengine.com</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+    <extra_vars>
+    	<var name="index_title" type="text">
+            <title xml:lang="ko">홈페이지 Title</title>
+            <title xml:lang="en">Homepage Title</title>
+            <title xml:lang="zh-CN">网站标题</title>
+            <title xml:lang="zh-TW">首頁標題</title>
+            <title xml:lang="tr">Anasayfa URLsi</title>
+	</var>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+	    	<title xml:lang="vi">URL Trang chủ</title>
+	    	<title xml:lang="tr">Anasayfa URLsi</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
+	    	<description xml:lang="tr">Lütfen kullanıcıların logoya tıkladıklarında yönlendirilecekleri URL adresini giriniz</description>
+        </var>
+    </extra_vars>
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段用メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+            <title xml:lang="tr">Ana Menü</title>
+	    <title xml:lang="vi">Menu trên</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/m.layouts/simpleGray/layout.html b/m.layouts/simpleGray/layout.html
index 33828c342..a375244a4 100644
--- a/m.layouts/simpleGray/layout.html
+++ b/m.layouts/simpleGray/layout.html
@@ -1,18 +1,18 @@
-<!--%import("mx.css")-->
-<div class="eg hd">
-	<h1 class="h1"><a href="{$layout_info->index_url}">{$layout_info->index_title}</a></h1>
-	<!--@if($layout_info->menu->main_menu->menu_srl)-->
-	<div class="fr"><a href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" class="bn">{$lang->menu}</a></div>
-	<!--@end-->
-</div>
-{$content}
-<ul class="eg ft">
-	<!--@if($is_logged)-->
-	<li class="fl"><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
-	<!--@elseif($act!='dispMemberLoginForm')-->
-	<li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
-	<!--@end-->
-	<li class="fr"><a href="{getUrl('m',0)}">PC</a></li>
-	<li class="fr"><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li>
-</ul>
-<p class="cr">{$layout_info->index_title}</p>
+<!--%import("mx.css")-->
+<div class="eg hd">
+	<h1 class="h1"><a href="{$layout_info->index_url}">{$layout_info->index_title}</a></h1>
+	<!--@if($layout_info->menu->main_menu->menu_srl)-->
+	<div class="fr"><a href="{getUrl('act','dispMenuMenu','menu_srl',$layout_info->menu->main_menu->menu_srl)}" class="bn">{$lang->menu}</a></div>
+	<!--@end-->
+</div>
+{$content}
+<ul class="eg ft">
+	<!--@if($is_logged)-->
+	<li class="fl"><a href="{getUrl('act','dispMemberLogout')}">{$lang->cmd_logout}</a></li>
+	<!--@elseif($act!='dispMemberLoginForm')-->
+	<li class="fl"><a href="{getUrl('act','dispMemberLoginForm')}">{$lang->cmd_login}</a></li>
+	<!--@end-->
+	<li class="fr"><a href="{getUrl('m',0)}">PC</a></li>
+	<li class="fr"><a href="{getUrl('act','dispModuleChangeLang','oldact',$act)}">LANG</a></li>
+</ul>
+<p class="cr">{$layout_info->index_title}</p>
diff --git a/m.layouts/simpleGray/mx.css b/m.layouts/simpleGray/mx.css
index 188b12fe7..e4bd8fa4e 100644
--- a/m.layouts/simpleGray/mx.css
+++ b/m.layouts/simpleGray/mx.css
@@ -1,36 +1,36 @@
-@charset "utf-8";
-/* Mobile XE */
-body{margin:0;background:#fff;color:#000;word-wrap:break-word}
-body,input,textarea,select,button,table{font-family:Tahoma, Geneva, sans-serif}
-/* Common Class */
-.fl{float:left}
-.fr{float:right}
-.cb{clear:both}
-/* Edge = Header/Footer */
-.eg{position:relative;background:#666;*zoom:1}
-.eg:after{content:"";display:block;clear:both}
-.eg a{text-decoration:none}
-/* Header */
-.hd{padding:10px;border-top:3px solid #444}
-.hd .h1{float:left;display:inline;color:#fff;font-size:24px;margin:0;font-weight:bold;text-shadow:0 0 3px #000}
-.hd .h1 a{color:#fff}
-.hd .bn{font-size:12px}
-/* Footer */
-.ft{padding:0 5px;margin:0;list-style:none}
-.ft a{display:inline-block;padding:10px;color:#fff;text-shadow:0 0 2px #000;font-size:14px;font-weight:bold}
-/* Copyright */
-.cr{margin:0;padding:5px 15px;text-align:center;background:#444;color:#ccc;text-shadow:0 0 2px #000;font-size:12px;font-weight:bold}
-/* Search */
-.sh{position:relative;text-align:center}
-.sh .itx{width:80%;background:none;border:5px solid #333;margin:10px}
-/* Definition */
-.dl{margin:10px}
-.dl dt{margin:0;padding:0;font-weight:bold}
-.dl dd{margin:0 0 10px 0;padding:0;color:#666}
-/* Graph Horizontal */
-.gh{list-style:none;margin:10px;padding:0}
-.gh li{position:relative;margin:5px 0}
-.gh .bar{position:absolute;z-index:-1;height:100%;width:0;background:#ddd}
-.gh em{color:#f60}
-/* Button */
-.bn{display:inline-block;padding:5px 10px;font-weight:normal;font-size:14px;border:1px solid #333;background:#eee;color:#000;text-shadow:1px 1px 0 #fff;box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;-webkit-box-shadow:0 0 3px #333;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;text-decoration:none}
+@charset "utf-8";
+/* Mobile XE */
+body{margin:0;background:#fff;color:#000;word-wrap:break-word}
+body,input,textarea,select,button,table{font-family:Tahoma, Geneva, sans-serif}
+/* Common Class */
+.fl{float:left}
+.fr{float:right}
+.cb{clear:both}
+/* Edge = Header/Footer */
+.eg{position:relative;background:#666;*zoom:1}
+.eg:after{content:"";display:block;clear:both}
+.eg a{text-decoration:none}
+/* Header */
+.hd{padding:10px;border-top:3px solid #444}
+.hd .h1{float:left;display:inline;color:#fff;font-size:24px;margin:0;font-weight:bold;text-shadow:0 0 3px #000}
+.hd .h1 a{color:#fff}
+.hd .bn{font-size:12px}
+/* Footer */
+.ft{padding:0 5px;margin:0;list-style:none}
+.ft a{display:inline-block;padding:10px;color:#fff;text-shadow:0 0 2px #000;font-size:14px;font-weight:bold}
+/* Copyright */
+.cr{margin:0;padding:5px 15px;text-align:center;background:#444;color:#ccc;text-shadow:0 0 2px #000;font-size:12px;font-weight:bold}
+/* Search */
+.sh{position:relative;text-align:center}
+.sh .itx{width:80%;background:none;border:5px solid #333;margin:10px}
+/* Definition */
+.dl{margin:10px}
+.dl dt{margin:0;padding:0;font-weight:bold}
+.dl dd{margin:0 0 10px 0;padding:0;color:#666}
+/* Graph Horizontal */
+.gh{list-style:none;margin:10px;padding:0}
+.gh li{position:relative;margin:5px 0}
+.gh .bar{position:absolute;z-index:-1;height:100%;width:0;background:#ddd}
+.gh em{color:#f60}
+/* Button */
+.bn{display:inline-block;padding:5px 10px;font-weight:normal;font-size:14px;border:1px solid #333;background:#eee;color:#000;text-shadow:1px 1px 0 #fff;box-shadow:0 0 3px #333;-moz-box-shadow:0 0 3px #333;-webkit-box-shadow:0 0 3px #333;border-radius:3px;-moz-border-radius:3px;-webkit-border-radius:3px;text-decoration:none}
diff --git a/modules/addon/addon.admin.controller.php b/modules/addon/addon.admin.controller.php
index 0909619ba..3a3209e7f 100644
--- a/modules/addon/addon.admin.controller.php
+++ b/modules/addon/addon.admin.controller.php
@@ -1,103 +1,196 @@
-<?php
-    /**
-     * @class  addonAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  addon 모듈의 admin controller class
-     **/
-
-    require_once(_XE_PATH_.'modules/addon/addon.controller.php');
-
-    class addonAdminController extends addonController {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 애드온의 활성/비활성 체인지
-         **/
-        function procAddonAdminToggleActivate() {
-            $oAddonModel = &getAdminModel('addon');
-
-            $site_module_info = Context::get('site_module_info');
-
-            // addon값을 받아옴
-            $addon = Context::get('addon');
-			$type = Context::get('type');
-			if(!$type) $type = "pc";
-            if($addon) {
-                // 활성화 되어 있으면 비활성화 시킴
-                if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type)) $this->doDeactivate($addon, $site_module_info->site_srl, $type);
-
-                // 비활성화 되어 있으면 활성화 시킴
-                else $this->doActivate($addon, $site_module_info->site_srl, $type);
-            }
-
-            $this->makeCacheFile($site_module_info->site_srl, $type);
-        }
-
-        /**
-         * @brief 애드온 설정 정보 입력
-         **/
-        function procAddonAdminSetupAddon() {
-            $args = Context::getRequestVars();
-            $addon_name = $args->addon_name;
-            unset($args->module);
-            unset($args->act);
-            unset($args->addon_name);
-            unset($args->body);
-
-            $site_module_info = Context::get('site_module_info');
-
-            $this->doSetup($addon_name, $args, $site_module_info->site_srl);
-
-            $this->makeCacheFile($site_module_info->site_srl, "pc");
-            $this->makeCacheFile($site_module_info->site_srl, "mobile");
-        }
-
-
-
-        /**
-         * @brief 애드온 추가
-         * DB에 애드온을 추가함
-         **/
-        function doInsert($addon, $site_srl = 0) {
-            $args->addon = $addon;
-            $args->is_used = 'N';
-            if(!$site_srl) return executeQuery('addon.insertAddon', $args);
-            $args->site_srl = $site_srl;
-            return executeQuery('addon.insertSiteAddon', $args);
-        }
-
-        /**
-         * @brief 애드온 활성화 
-         * addons라는 테이블에 애드온의 활성화 상태를 on 시켜줌
-         **/
-        function doActivate($addon, $site_srl = 0, $type = "pc") {
-            $args->addon = $addon;
-			if($type == "pc") $args->is_used = 'Y';
-			else $args->is_used_m = "Y";
-            if(!$site_srl) return executeQuery('addon.updateAddon', $args);
-            $args->site_srl = $site_srl;
-            return executeQuery('addon.updateSiteAddon', $args);
-        }
-
-        /**
-         * @brief 애드온 비활성화 
-         *
-         * addons라는 테이블에 애드온의 이름을 제거하는 것으로 비활성화를 시키게 된다
-         **/
-        function doDeactivate($addon, $site_srl = 0, $type = "pc") {
-            $args->addon = $addon;
-			if($type == "pc") $args->is_used = 'N';
-			else $args->is_used_m = 'N';
-            if(!$site_srl) return executeQuery('addon.updateAddon', $args);
-            $args->site_srl = $site_srl;
-            return executeQuery('addon.updateSiteAddon', $args);
-        }
-
-
-    }
-?>
+<?php
+    /**
+     * @class  addonAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of addon modules
+     **/
+
+    require_once(_XE_PATH_.'modules/addon/addon.controller.php');
+
+    class addonAdminController extends addonController {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+		/**
+		 * @brief Set addon activate
+		 **/
+		function procAddonAdminSaveActivate()
+		{
+			$pc = Context::get('pc');
+			$mobile = Context::get('mobile');
+			$fixed = Context::get('fixed');
+			
+			$site_module_info = Context::get('site_module_info');
+			
+			if($site_module_info->site_srl) $site_srl = $site_module_info->site_srl;
+			else $site_srl = 0;
+
+			if (!$pc) $pc = array();
+			if (!$mobile) $mobile = array();
+			if (!$fixed) $fixed = array();
+
+			if (!is_array($pc)) $pc = array($pc);
+			if (!is_array($mobile)) $pc = array($mobile);
+			if (!is_array($fixed)) $pc = array($fixed);
+
+			// get current addon info
+			$oModel = &getAdminModel('addon');
+			$currentAddonList = $oModel->getAddonList($site_srl, 'site');
+
+			// get need update addon list
+			$updateList = array();
+			foreach($currentAddonList as $addon)
+			{
+				if ($addon->activated !== in_array($addon->addon_name, $pc))
+				{
+					$updateList[] = $addon->addon_name;
+					continue;
+				}
+
+				if ($addon->mactivated !== in_array($addon->addon_name, $mobile))
+				{
+					$updateList[] = $addon->addon_name;
+					continue;
+				}
+
+				if ($addon->fixed !== in_array($addon->addon_name, $fixed))
+				{
+					$updateList[] = $addon->addon_name;
+					continue;
+				}
+			}
+
+			// update
+			foreach($updateList as $targetAddon)
+			{
+				unset($args);
+
+				if (in_array($targetAddon, $pc))
+					$args->is_used = 'Y';
+				else
+					$args->is_used = 'N';
+
+				if (in_array($targetAddon, $mobile))
+					$args->is_used_m = 'Y';
+				else
+					$args->is_used_m = 'N';
+
+				if (in_array($targetAddon, $fixed))
+					$args->fixed = 'Y';
+				else
+					$args->fixed = 'N';
+
+				$args->addon = $targetAddon;
+				$args->site_srl = $site_srl;
+
+				$output = executeQuery('addon.updateSiteAddon', $args);
+				if (!$output->toBool()) return $output;
+			}
+
+			if (count($updateList))
+			{
+				$this->makeCacheFile($site_srl, 'pc', 'site');
+				$this->makeCacheFile($site_srl, 'mobile', 'site');
+			}
+
+			if (Context::get('success_return_url'))
+			{
+				$this->setRedirectUrl(Context::get('success_return_url'));
+			}
+			else
+			{
+				$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAddonAdminIndex'));
+			}
+		}
+
+        /**
+         * @brief Add active/inactive change
+         **/
+        function procAddonAdminToggleActivate() {
+			$oAddonModel = &getAdminModel('addon');
+
+			$site_module_info = Context::get('site_module_info');
+			// batahom addon values
+			$addon = Context::get('addon');
+			$type = Context::get('type');
+			if(!$type) $type = "pc";
+			if($addon) {
+				// If enabled Disables
+				if($oAddonModel->isActivatedAddon($addon, $site_module_info->site_srl, $type)) $this->doDeactivate($addon, $site_module_info->site_srl, $type);
+				// If it is disabled Activate
+				else $this->doActivate($addon, $site_module_info->site_srl, $type);
+			}
+
+			$this->makeCacheFile($site_module_info->site_srl, $type);
+        }
+
+        /**
+         * @brief Add the configuration information input
+         **/
+        function procAddonAdminSetupAddon() {
+            $args = Context::getRequestVars();
+			$module = $args->module;
+            $addon_name = $args->addon_name;
+            unset($args->module);
+            unset($args->act);
+            unset($args->addon_name);
+            unset($args->body);
+			unset($args->error_return_url);
+
+            $site_module_info = Context::get('site_module_info');
+
+            $output = $this->doSetup($addon_name, $args, $site_module_info->site_srl, 'site');
+			if (!$output->toBool()) return $output;
+
+            $this->makeCacheFile($site_module_info->site_srl, "pc", 'site');
+            $this->makeCacheFile($site_module_info->site_srl, "mobile", 'site');
+
+			$this->setRedirectUrl(getNotEncodedUrl('', 'module', $module, 'act', 'dispAddonAdminSetup', 'selected_addon', $addon_name));
+        }
+
+
+
+        /**
+         * @brief Add-on
+         * Adds Add to DB
+         **/
+        function doInsert($addon, $site_srl = 0, $gtype = 'site', $isUsed = 'N') {
+            $args->addon = $addon;
+            $args->is_used = $isUsed;
+            if($gtype == 'global') return executeQuery('addon.insertAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.insertSiteAddon', $args);
+        }
+
+        /**
+         * @brief Add-activated
+         * addons add-ons to the table on the activation state sikyeojum
+         **/
+        function doActivate($addon, $site_srl = 0, $type = "pc", $gtype = 'site') {
+            $args->addon = $addon;
+			if($type == "pc") $args->is_used = 'Y';
+			else $args->is_used_m = "Y";
+            if($gtype == 'global') return executeQuery('addon.updateAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.updateSiteAddon', $args);
+        }
+
+        /**
+         * @brief Disable Add-ons
+         *
+         * addons add a table to remove the name of the deactivation is sikige
+         **/
+        function doDeactivate($addon, $site_srl = 0, $type = "pc", $gtype = 'site') {
+            $args->addon = $addon;
+			if($type == "pc") $args->is_used = 'N';
+			else $args->is_used_m = 'N';
+            if($gtype == 'global') return executeQuery('addon.updateAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.updateSiteAddon', $args);
+        }
+    }
+?>
diff --git a/modules/addon/addon.admin.model.php b/modules/addon/addon.admin.model.php
index b6efdaa01..5c49258b6 100644
--- a/modules/addon/addon.admin.model.php
+++ b/modules/addon/addon.admin.model.php
@@ -1,313 +1,337 @@
-<?php
-    /**
-     * @class  addonAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  addon 모듈의 admin model class
-     **/
-
-    class addonAdminModel extends addon {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 애드온의 경로를 구함
-         **/
-        function getAddonPath($addon_name) {
-            $class_path = sprintf('./addons/%s/', $addon_name);
-            if(is_dir($class_path)) return $class_path;
-            return "";
-        }
-
-        /**
-         * @brief 애드온의 종류와 정보를 구함
-         **/
-        function getAddonList($site_srl = 0) {
-            // activated된 애드온 목록을 구함
-            $inserted_addons = $this->getInsertedAddons($site_srl);
-
-            // 다운받은 애드온과 설치된 애드온의 목록을 구함
-            $searched_list = FileHandler::readDir('./addons');
-            $searched_count = count($searched_list);
-            if(!$searched_count) return;
-            sort($searched_list);
-
-            for($i=0;$i<$searched_count;$i++) {
-                // 애드온의 이름
-                $addon_name = $searched_list[$i];
-				if($addon_name == "smartphone") continue;
-
-                // 애드온의 경로 (files/addons가 우선)
-                $path = $this->getAddonPath($addon_name);
-
-                // 해당 애드온의 정보를 구함
-                unset($info);
-                $info = $this->getAddonInfoXml($addon_name, $site_srl);
-
-                $info->addon = $addon_name;
-                $info->path = $path;
-                $info->activated = false;
-				$info->mactivated = false;
-
-                // DB에 입력되어 있는지 확인
-                if(!in_array($addon_name, array_keys($inserted_addons))) {
-                    // DB에 입력되어 있지 않으면 입력 (model에서 이런짓 하는거 싫지만 귀찮아서.. ㅡ.ㅜ)
-                    $oAddonAdminController = &getAdminController('addon');
-                    $oAddonAdminController->doInsert($addon_name, $site_srl);
-
-                // 활성화 되어 있는지 확인
-                } else {
-                    if($inserted_addons[$addon_name]->is_used=='Y') $info->activated = true;
-                    if($inserted_addons[$addon_name]->is_used_m=='Y') $info->mactivated = true;
-                }
-
-                $list[] = $info;
-            }
-            return $list;
-        }
-
-        /**
-         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
-         **/
-        function getAddonInfoXml($addon, $site_srl = 0) {
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            $addon_path = $this->getAddonPath($addon);
-            if(!$addon_path) return;
-
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $xml_file = sprintf("%sconf/info.xml", $addon_path);
-            if(!file_exists($xml_file)) return;
-
-            $oXmlParser = new XmlParser();
-            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-            $xml_obj = $tmp_xml_obj->addon;
-
-            if(!$xml_obj) return;
-
-
-            // DB에 설정된 내역을 가져온다
-            $db_args->addon = $addon;
-            if(!$site_srl) $output = executeQuery('addon.getAddonInfo',$db_args);
-            else {
-                $db_args->site_srl = $site_srl;
-                $output = executeQuery('addon.getSiteAddonInfo',$db_args);
-            }
-            $extra_vals = unserialize($output->data->extra_vars);
-
-            if($extra_vals->mid_list) {
-                $addon_info->mid_list = $extra_vals->mid_list;
-            } else {
-                $addon_info->mid_list = array();
-            }
-
-
-            // 애드온 정보
-            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
-                // addon format v0.2
-                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-
-                $addon_info->addon_name = $addon;
-                $addon_info->title = $xml_obj->title->body;
-                $addon_info->description = trim($xml_obj->description->body);
-                $addon_info->version = $xml_obj->version->body;
-                $addon_info->homepage = $xml_obj->link->body;
-                $addon_info->license = $xml_obj->license->body;
-                $addon_info->license_link = $xml_obj->license->attrs->link;
-
-                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-                else $author_list = $xml_obj->author;
-
-                foreach($author_list as $author) {
-                    unset($author_obj);
-                    $author_obj->name = $author->name->body;
-                    $author_obj->email_address = $author->attrs->email_address;
-                    $author_obj->homepage = $author->attrs->link;
-                    $addon_info->author[] = $author_obj;
-                }
-
-                // 확장변수를 정리
-                if($xml_obj->extra_vars) {
-                    $extra_var_groups = $xml_obj->extra_vars->group;
-                    if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-                    if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-
-                    foreach($extra_var_groups as $group) {
-                        $extra_vars = $group->var;
-                        if(!is_array($group->var)) $extra_vars = array($group->var);
-
-                        foreach($extra_vars as $key => $val) {
-                            unset($obj);
-                            if(!$val->attrs->type) { $val->attrs->type = 'text'; }
-
-                            $obj->group = $group->title->body;
-                            $obj->name = $val->attrs->name;
-                            $obj->title = $val->title->body;
-                            $obj->type = $val->attrs->type;
-                            $obj->description = $val->description->body;
-                            $obj->value = $extra_vals->{$obj->name};
-                            if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
-                            if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
-
-                            // 'select'type에서 option목록을 구한다.
-                            if(is_array($val->options)) {
-                                $option_count = count($val->options);
-
-                                for($i = 0; $i < $option_count; $i++) {
-                                    $obj->options[$i]->title = $val->options[$i]->title->body;
-                                    $obj->options[$i]->value = $val->options[$i]->attrs->value;
-                                }
-                            } else {
-                                $obj->options[0]->title = $val->options[0]->title->body;
-                                $obj->options[0]->value = $val->options[0]->attrs->value;
-                            }
-
-                            $addon_info->extra_vars[] = $obj;
-                        }
-                    }
-                }
-
-                // history
-                if($xml_obj->history) {
-                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
-                    else $history = $xml_obj->history;
-
-                    foreach($history as $item) {
-                        unset($obj);
-
-                        if($item->author) {
-                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
-
-                            foreach($obj->author_list as $author) {
-                                unset($author_obj);
-                                $author_obj->name = $author->name->body;
-                                $author_obj->email_address = $author->attrs->email_address;
-                                $author_obj->homepage = $author->attrs->link;
-                                $obj->author[] = $author_obj;
-                            }
-                        }
-
-                        $obj->name = $item->name->body;
-                        $obj->email_address = $item->attrs->email_address;
-                        $obj->homepage = $item->attrs->link;
-                        $obj->version = $item->attrs->version;
-                        $obj->date = $item->attrs->date;
-                        $obj->description = $item->description->body;
-
-                        if($item->log) {
-                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
-
-                            foreach($obj->log as $log) {
-                                unset($log_obj);
-                                $log_obj->text = $log->body;
-                                $log_obj->link = $log->attrs->link;
-                                $obj->logs[] = $log_obj;
-                            }
-                        }
-
-                        $addon_info->history[] = $obj;
-                    }
-                }
-
-
-            } else {
-                // addon format 0.1
-                $addon_info->addon_name = $addon;
-                $addon_info->title = $xml_obj->title->body;
-                $addon_info->description = trim($xml_obj->author->description->body);
-                $addon_info->version = $xml_obj->attrs->version;
-                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $author_obj->name = $xml_obj->author->name->body;
-                $author_obj->email_address = $xml_obj->author->attrs->email_address;
-                $author_obj->homepage = $xml_obj->author->attrs->link;
-                $addon_info->author[] = $author_obj;
-
-                if($xml_obj->extra_vars) {
-                    // 확장변수를 정리
-                    $extra_var_groups = $xml_obj->extra_vars->group;
-                    if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-                    if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-                    foreach($extra_var_groups as $group) {
-                        $extra_vars = $group->var;
-                        if(!is_array($group->var)) $extra_vars = array($group->var);
-
-                        foreach($extra_vars as $key => $val) {
-                            unset($obj);
-                            if(!$val->type->body) { $val->type->body = 'text'; }
-
-                            $obj->group = $group->title->body;
-                            $obj->name = $val->attrs->name;
-                            $obj->title = $val->title->body;
-                            $obj->type = $val->type->body;
-                            $obj->description = $val->description->body;
-                            $obj->value = $extra_vals->{$obj->name};
-                            if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
-                            if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
-
-                            // 'select'type에서 option목록을 구한다.
-                            if(is_array($val->options)) {
-                                $option_count = count($val->options);
-
-                                for($i = 0; $i < $option_count; $i++) {
-                                    $obj->options[$i]->title = $val->options[$i]->title->body;
-                                    $obj->options[$i]->value = $val->options[$i]->value->body;
-                                }
-                            }
-
-                            $addon_info->extra_vars[] = $obj;
-                        }
-                    }
-                }
-
-            }
-
-
-
-            return $addon_info;
-        }
-
-        /**
-         * @brief 활성화된 애드온 목록을 구해옴
-         **/
-        function getInsertedAddons($site_srl = 0) {
-            $args->list_order = 'addon';
-            if(!$site_srl) $output = executeQuery('addon.getAddons', $args);
-            else {
-                $args->site_srl = $site_srl;
-                $output = executeQuery('addon.getSiteAddons', $args);
-            }
-            if(!$output->data) return array();
-            if(!is_array($output->data)) $output->data = array($output->data);
-
-            $activated_count = count($output->data);
-            for($i=0;$i<$activated_count;$i++) {
-                $addon = $output->data[$i];
-                $addon_list[$addon->addon] = $addon;
-            }
-            return $addon_list;
-        }
-
-        /**
-         * @brief 애드온이 활성화 되어 있는지 체크
-         **/
-        function isActivatedAddon($addon, $site_srl = 0, $type = "pc") {
-            $args->addon = $addon;
-            if(!$site_srl) {
-				if($type == "pc") $output = executeQuery('addon.getAddonIsActivated', $args);
-				else $output = executeQuery('addon.getMAddonIsActivated', $args);
-			}
-            else {
-                $args->site_srl = $site_srl;
-				if($type == "pc") $output = executeQuery('addon.getSiteAddonIsActivated', $args);
-				else $output = executeQuery('addon.getSiteMAddonIsActivated', $args);
-            }
-            if($output->data->count>0) return true;
-            return false;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  addonAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin model class of addon modules
+     **/
+
+    class addonAdminModel extends addon {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Wanted to add the path to
+         **/
+        function getAddonPath($addon_name) {
+            $class_path = sprintf('./addons/%s/', $addon_name);
+            if(is_dir($class_path)) return $class_path;
+            return "";
+        }
+
+		/**
+		 * @brief Get addon list for super admin
+		 **/
+		function getAddonListForSuperAdmin()
+		{
+			$addonList = $this->getAddonList(0, 'site');
+
+			$oAutoinstallModel = &getModel('autoinstall');
+			foreach($addonList as $key => $addon)
+			{
+				// get easyinstall remove url
+				$packageSrl = $oAutoinstallModel->getPackageSrlByPath($addon->path);
+				$addonList[$key]->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl);
+
+				// get easyinstall need update
+				$package = $oAutoinstallModel->getInstalledPackages($packageSrl);
+				$addonList[$key]->need_update = $package[$packageSrl]->need_update;
+
+				// get easyinstall update url
+				if ($addonList[$key]->need_update == 'Y')
+				{
+					$addonList[$key]->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
+				}
+			}
+
+			return $addonList;
+		}
+
+        /**
+         * @brief Wanted to add the kind of information and
+         **/
+        function getAddonList($site_srl = 0, $gtype = 'site') {
+            // Wanted to add a list of activated
+            $inserted_addons = $this->getInsertedAddons($site_srl, $gtype);
+            // Downloaded and installed add-on to the list of Wanted
+            $searched_list = FileHandler::readDir('./addons','/^([a-zA-Z0-9-_]+)$/');
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+            sort($searched_list);
+
+			$oAddonAdminController = &getAdminController('addon');
+
+            for($i=0;$i<$searched_count;$i++) {
+                // Add the name of
+                $addon_name = $searched_list[$i];
+				if($addon_name == "smartphone") continue;
+                // Add the path (files/addons precedence)
+                $path = $this->getAddonPath($addon_name);
+                // Wanted information on the add-on
+                unset($info);
+                $info = $this->getAddonInfoXml($addon_name, $site_srl, $gtype);
+
+                $info->addon = $addon_name;
+                $info->path = $path;
+                $info->activated = false;
+				$info->mactivated = false;
+				$info->fixed = false;
+                // Check if a permossion is granted entered in DB
+                if(!in_array($addon_name, array_keys($inserted_addons))) {
+                    // If not, type in the DB type (model, perhaps because of the hate doing this haneungeo .. ㅡ. ㅜ)
+                    $oAddonAdminController->doInsert($addon_name, $site_srl, $type);
+                // Is activated
+                } else {
+                    if($inserted_addons[$addon_name]->is_used=='Y') $info->activated = true;
+                    if($inserted_addons[$addon_name]->is_used_m=='Y') $info->mactivated = true;
+					if ($gtype == 'global' && $inserted_addons[$addon_name]->is_fixed == 'Y') $info->fixed = true;
+                }
+
+                $list[] = $info;
+            }
+            return $list;
+        }
+
+        /**
+         * @brief Modules conf/info.xml wanted to read the information
+         **/
+        function getAddonInfoXml($addon, $site_srl = 0, $gtype = 'site') {
+            // Get a path of the requested module. Return if not exists.
+            $addon_path = $this->getAddonPath($addon);
+            if(!$addon_path) return;
+            // Read the xml file for module skin information
+            $xml_file = sprintf("%sconf/info.xml", $addon_path);
+            if(!file_exists($xml_file)) return;
+
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            $xml_obj = $tmp_xml_obj->addon;
+
+            if(!$xml_obj) return;
+
+
+            // DB is set to bring history
+            $db_args->addon = $addon;
+            if($gtype == 'global') $output = executeQuery('addon.getAddonInfo',$db_args);
+            else {
+                $db_args->site_srl = $site_srl;
+                $output = executeQuery('addon.getSiteAddonInfo',$db_args);
+            }
+            $extra_vals = unserialize($output->data->extra_vars);
+
+            if($extra_vals->mid_list) {
+                $addon_info->mid_list = $extra_vals->mid_list;
+            } else {
+                $addon_info->mid_list = array();
+            }
+
+
+            // Add information
+            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
+                // addon format v0.2
+                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+
+                $addon_info->addon_name = $addon;
+                $addon_info->title = $xml_obj->title->body;
+                $addon_info->description = trim($xml_obj->description->body);
+                $addon_info->version = $xml_obj->version->body;
+                $addon_info->homepage = $xml_obj->link->body;
+                $addon_info->license = $xml_obj->license->body;
+                $addon_info->license_link = $xml_obj->license->attrs->link;
+
+                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+                else $author_list = $xml_obj->author;
+
+                foreach($author_list as $author) {
+                    unset($author_obj);
+                    $author_obj->name = $author->name->body;
+                    $author_obj->email_address = $author->attrs->email_address;
+                    $author_obj->homepage = $author->attrs->link;
+                    $addon_info->author[] = $author_obj;
+                }
+
+                // Expand the variable order
+                if($xml_obj->extra_vars) {
+                    $extra_var_groups = $xml_obj->extra_vars->group;
+                    if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                    if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+
+                    foreach($extra_var_groups as $group) {
+                        $extra_vars = $group->var;
+                        if(!is_array($group->var)) $extra_vars = array($group->var);
+
+                        foreach($extra_vars as $key => $val) {
+                            unset($obj);
+                            if(!$val->attrs->type) { $val->attrs->type = 'text'; }
+
+                            $obj->group = $group->title->body;
+                            $obj->name = $val->attrs->name;
+                            $obj->title = $val->title->body;
+                            $obj->type = $val->attrs->type;
+                            $obj->description = $val->description->body;
+                            $obj->value = $extra_vals->{$obj->name};
+                            if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
+                            if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
+
+                            // 'Select'type obtained from the option list.
+                            if(is_array($val->options)) {
+                                $option_count = count($val->options);
+
+                                for($i = 0; $i < $option_count; $i++) {
+                                    $obj->options[$i]->title = $val->options[$i]->title->body;
+                                    $obj->options[$i]->value = $val->options[$i]->attrs->value;
+                                }
+                            } else {
+                                $obj->options[0]->title = $val->options[0]->title->body;
+                                $obj->options[0]->value = $val->options[0]->attrs->value;
+                            }
+
+                            $addon_info->extra_vars[] = $obj;
+                        }
+                    }
+                }
+
+                // history
+                if($xml_obj->history) {
+                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
+                    else $history = $xml_obj->history;
+
+                    foreach($history as $item) {
+                        unset($obj);
+
+                        if($item->author) {
+                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
+
+                            foreach($obj->author_list as $author) {
+                                unset($author_obj);
+                                $author_obj->name = $author->name->body;
+                                $author_obj->email_address = $author->attrs->email_address;
+                                $author_obj->homepage = $author->attrs->link;
+                                $obj->author[] = $author_obj;
+                            }
+                        }
+
+                        $obj->name = $item->name->body;
+                        $obj->email_address = $item->attrs->email_address;
+                        $obj->homepage = $item->attrs->link;
+                        $obj->version = $item->attrs->version;
+                        $obj->date = $item->attrs->date;
+                        $obj->description = $item->description->body;
+
+                        if($item->log) {
+                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
+
+                            foreach($obj->log as $log) {
+                                unset($log_obj);
+                                $log_obj->text = $log->body;
+                                $log_obj->link = $log->attrs->link;
+                                $obj->logs[] = $log_obj;
+                            }
+                        }
+
+                        $addon_info->history[] = $obj;
+                    }
+                }
+
+
+            } else {
+                // addon format 0.1
+                $addon_info->addon_name = $addon;
+                $addon_info->title = $xml_obj->title->body;
+                $addon_info->description = trim($xml_obj->author->description->body);
+                $addon_info->version = $xml_obj->attrs->version;
+                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $addon_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $author_obj->name = $xml_obj->author->name->body;
+                $author_obj->email_address = $xml_obj->author->attrs->email_address;
+                $author_obj->homepage = $xml_obj->author->attrs->link;
+                $addon_info->author[] = $author_obj;
+
+                if($xml_obj->extra_vars) {
+                    // Expand the variable order
+                    $extra_var_groups = $xml_obj->extra_vars->group;
+                    if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                    if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+                    foreach($extra_var_groups as $group) {
+                        $extra_vars = $group->var;
+                        if(!is_array($group->var)) $extra_vars = array($group->var);
+
+                        foreach($extra_vars as $key => $val) {
+                            unset($obj);
+                            if(!$val->type->body) { $val->type->body = 'text'; }
+
+                            $obj->group = $group->title->body;
+                            $obj->name = $val->attrs->name;
+                            $obj->title = $val->title->body;
+                            $obj->type = $val->type->body;
+                            $obj->description = $val->description->body;
+                            $obj->value = $extra_vals->{$obj->name};
+                            if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
+                            if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
+                            // 'Select'type obtained from the option list.
+                            if(is_array($val->options)) {
+                                $option_count = count($val->options);
+
+                                for($i = 0; $i < $option_count; $i++) {
+                                    $obj->options[$i]->title = $val->options[$i]->title->body;
+                                    $obj->options[$i]->value = $val->options[$i]->value->body;
+                                }
+                            }
+
+                            $addon_info->extra_vars[] = $obj;
+                        }
+                    }
+                }
+
+            }
+
+
+
+            return $addon_info;
+        }
+
+        /**
+         * @brief Add to the list of active guhaeom
+         **/
+        function getInsertedAddons($site_srl = 0, $gtype = 'site') {
+            $args->list_order = 'addon';
+            if($gtype == 'global') $output = executeQuery('addon.getAddons', $args);
+            else {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('addon.getSiteAddons', $args);
+            }
+            if(!$output->data) return array();
+            if(!is_array($output->data)) $output->data = array($output->data);
+
+            $activated_count = count($output->data);
+            for($i=0;$i<$activated_count;$i++) {
+                $addon = $output->data[$i];
+                $addon_list[$addon->addon] = $addon;
+            }
+            return $addon_list;
+        }
+
+        /**
+         * @brief Add-on is enabled, check whether
+         **/
+        function isActivatedAddon($addon, $site_srl = 0, $type = "pc", $gtype = 'site') {
+            $args->addon = $addon;
+            if($gtype == 'global') {
+				if($type == "pc") $output = executeQuery('addon.getAddonIsActivated', $args);
+				else $output = executeQuery('addon.getMAddonIsActivated', $args);
+			}
+            else {
+                $args->site_srl = $site_srl;
+				if($type == "pc") $output = executeQuery('addon.getSiteAddonIsActivated', $args);
+				else $output = executeQuery('addon.getSiteMAddonIsActivated', $args);
+            }
+            if($output->data->count>0) return true;
+            return false;
+        }
+
+    }
+?>
diff --git a/modules/addon/addon.admin.view.php b/modules/addon/addon.admin.view.php
index 9e4b575a6..1dc31eaa7 100644
--- a/modules/addon/addon.admin.view.php
+++ b/modules/addon/addon.admin.view.php
@@ -1,107 +1,109 @@
-<?php
-    /**
-     * @class  addonAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  addon 모듈의 admin view class
-     **/
-
-    class addonAdminView extends addon {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 애드온 관리 메인 페이지 (목록 보여줌)
-         **/
-        function dispAddonAdminIndex() {
-            $site_module_info = Context::get('site_module_info');
-
-            // 애드온 목록을 세팅
-            $oAddonModel = &getAdminModel('addon');
-            $addon_list = $oAddonModel->getAddonList($site_module_info->site_srl);
-            Context::set('addon_list', $addon_list);
-
-			$security = new Security();
-			$security->encodeHTML('addon_list..', 'addon_list..author..');
-
-            // 템플릿 패스 및 파일을 지정
-            $this->setTemplateFile('addon_list');
-        }
-
-        /**
-         * @biref 애드온 세부 설정 팝업 출력
-         **/
-        function dispAddonAdminSetup() {
-            $site_module_info = Context::get('site_module_info');
-
-            // 요청된 애드온을 구함
-            $selected_addon = Context::get('selected_addon');
-
-            // 요청된 애드온의 정보를 구함
-            $oAddonModel = &getAdminModel('addon');
-            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon, $site_module_info->site_srl);
-            Context::set('addon_info', $addon_info);
-
-            // mid 목록을 가져옴
-            $oModuleModel = &getModel('module');
-            $oModuleAdminModel = &getAdminModel('module');
-
-            if($site_module_info->site_srl) $args->site_srl = $site_module_info->site_srl;
-            $mid_list = $oModuleModel->getMidList($args);
-
-            // module_category와 module의 조합
-            if(!$site_module_info->site_srl) {
-                // 모듈 카테고리 목록을 구함
-                $module_categories = $oModuleModel->getModuleCategories();
-
-                if($mid_list) {
-                    foreach($mid_list as $module_srl => $module) {
-                        $module_categories[$module->module_category_srl]->list[$module_srl] = $module;
-                    }
-                }
-            } else {
-                $module_categories[0]->list = $mid_list;
-            }
-
-            Context::set('mid_list',$module_categories);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 패스 및 파일을 지정
-            $this->setTemplateFile('setup_addon');
-
-			$security = new Security();
-			$security->encodeHTML('addon_info.', 'addon_info.author..', 'mid_list....');
-        }
-
-        /**
-         * @brief 애드온의 상세 정보(conf/info.xml)를 팝업 출력
-         **/
-        function dispAddonAdminInfo() {
-            $site_module_info = Context::get('site_module_info');
-
-            // 요청된 애드온을 구함
-            $selected_addon = Context::get('selected_addon');
-
-            // 요청된 애드온의 정보를 구함
-            $oAddonModel = &getAdminModel('addon');
-            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon, $site_module_info->site_srl);
-            Context::set('addon_info', $addon_info);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 패스 및 파일을 지정
-            $this->setTemplateFile('addon_info');
-
-			$security = new Security();
-			$security->encodeHTML('addon_info.', 'addon_info.author..');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  addonAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of addon modules
+     **/
+
+    class addonAdminView extends addon {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Add Management main page (showing the list)
+         **/
+        function dispAddonAdminIndex() {
+			$oAdminModel = &getAdminModel('admin');
+
+            // Add to the list settings
+            $oAddonModel = &getAdminModel('addon');
+            $addon_list = $oAddonModel->getAddonListForSuperAdmin();
+
+			$security = new Security($addon_list);
+			$addon_list = $security->encodeHTML('..', '..author..');
+
+			foreach($addon_list as $no => $addon_info)
+			{
+				$addon_list[$no]->description = nl2br(trim($addon_info->description));
+			}
+
+            Context::set('addon_list', $addon_list);
+			Context::set('addon_count', count($addon_list));
+            // Template specifies the path and file
+            $this->setTemplateFile('addon_list');
+        }
+
+        /**
+         * @biref Setting out the details pop-up add-on
+         **/
+        function dispAddonAdminSetup() {
+            $site_module_info = Context::get('site_module_info');
+            // Wanted to add the requested
+            $selected_addon = Context::get('selected_addon');
+            // Wanted to add the requested information
+            $oAddonModel = &getAdminModel('addon');
+            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon, $site_module_info->site_srl, 'site');
+            Context::set('addon_info', $addon_info);
+            // Get a mid list
+            $oModuleModel = &getModel('module');
+            $oModuleAdminModel = &getAdminModel('module');
+
+            if($site_module_info->site_srl) $args->site_srl = $site_module_info->site_srl;
+			$columnList = array('module_srl', 'module_category_srl', 'mid', 'browser_title');
+            $mid_list = $oModuleModel->getMidList($args, $columnList);
+            // module_category and module combination
+            if(!$site_module_info->site_srl) {
+                // Get a list of module categories
+                $module_categories = $oModuleModel->getModuleCategories();
+
+                if(is_array($mid_list)) {
+                    foreach($mid_list as $module_srl => $module) {
+                        $module_categories[$module->module_category_srl]->list[$module_srl] = $module;
+                    }
+                }
+            } else {
+                $module_categories[0]->list = $mid_list;
+            }
+
+            Context::set('mid_list',$module_categories);
+
+            // Template specifies the path and file
+            $this->setTemplateFile('setup_addon');
+
+			if(Context::get('module') != 'admin')
+			{
+				$this->setLayoutPath('./common/tpl');
+				$this->setLayoutFile('popup_layout');
+			}
+
+			$security = new Security();
+			$security->encodeHTML('addon_info.', 'addon_info.author..', 'mid_list....');
+        }
+
+        /**
+         * @brief Add details (conf/info.xml) a pop-out
+         **/
+        function dispAddonAdminInfo() {
+            $site_module_info = Context::get('site_module_info');
+            // Wanted to add the requested
+            $selected_addon = Context::get('selected_addon');
+            // Wanted to add the requested information
+            $oAddonModel = &getAdminModel('addon');
+            $addon_info = $oAddonModel->getAddonInfoXml($selected_addon, $site_module_info->site_srl);
+            Context::set('addon_info', $addon_info);
+            // Set the layout to be pop-up
+            $this->setLayoutFile('popup_layout');
+            // Template specifies the path and file
+            $this->setTemplateFile('addon_info');
+
+			$security = new Security();
+			$security->encodeHTML('addon_info.', 'addon_info.author..');
+        }
+
+    }
+?>
diff --git a/modules/addon/addon.class.php b/modules/addon/addon.class.php
index 7472e19dd..3e95b9bb7 100644
--- a/modules/addon/addon.class.php
+++ b/modules/addon/addon.class.php
@@ -1,71 +1,87 @@
-<?php
-    /**
-     * @class  addon
-     * @author NHN (developers@xpressengine.com)
-     * @brief  addon 모듈의 high class
-     **/
-
-    class addon extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // 몇가지 애드온을 등록
-            $oAddonController = &getAdminController('addon');
-            $oAddonController->doInsert('autolink');
-            $oAddonController->doInsert('blogapi');
-            $oAddonController->doInsert('counter');
-            $oAddonController->doInsert('member_communication');
-            $oAddonController->doInsert('member_extra_info');
-            $oAddonController->doInsert('mobile');
-            $oAddonController->doInsert('referer');
-            $oAddonController->doInsert('resize_image');
-            $oAddonController->doInsert('openid_delegation_id');
-            $oAddonController->doInsert('point_level_icon');
-
-            // 몇가지 애드온을 기본 활성화 상태로 변경
-            $oAddonController->doActivate('autolink');
-            $oAddonController->doActivate('counter');
-            $oAddonController->doActivate('member_communication');
-            $oAddonController->doActivate('member_extra_info');
-            $oAddonController->doActivate('mobile');
-            $oAddonController->doActivate('referer');
-            $oAddonController->doActivate('resize_image');
-            $oAddonController->makeCacheFile(0);
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-			if(!$oDB->isColumnExists("addons", "is_used_m")) return true;
-			if(!$oDB->isColumnExists("addons_site", "is_used_m")) return true;
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-			if(!$oDB->isColumnExists("addons", "is_used_m")) {
-				$oDB->addColumn("addons", "is_used_m", "char", 1, "N", true);
-			}
-			if(!$oDB->isColumnExists("addons_site", "is_used_m")) { 
-				$oDB->addColumn("addons_site", "is_used_m", "char", 1, "N", true);
-			}
-            return new Object();
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            FileHandler::removeFilesInDir('./files/cache/addons');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  addon
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of addon modules
+     **/
+
+    class addon extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register to add a few
+            $oAddonController = &getAdminController('addon');
+            $oAddonController->doInsert('autolink', 0, 'site', 'Y');
+            $oAddonController->doInsert('blogapi');
+            $oAddonController->doInsert('counter', 0, 'site', 'Y');
+            $oAddonController->doInsert('member_communication', 0, 'site', 'Y');
+            $oAddonController->doInsert('member_extra_info', 0, 'site', 'Y');
+            $oAddonController->doInsert('mobile', 0, 'site', 'Y');
+            $oAddonController->doInsert('resize_image', 0, 'site', 'Y');
+            $oAddonController->doInsert('openid_delegation_id');
+            $oAddonController->doInsert('point_level_icon');
+
+            $oAddonController->makeCacheFile(0);
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+			if(!$oDB->isColumnExists("addons", "is_used_m")) return true;
+			if(!$oDB->isColumnExists("addons_site", "is_used_m")) return true;
+
+			// 2011. 7. 29. add is_fixed column
+			if (!$oDB->isColumnExists('addons', 'is_fixed')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+			if(!$oDB->isColumnExists("addons", "is_used_m")) {
+				$oDB->addColumn("addons", "is_used_m", "char", 1, "N", true);
+			}
+			if(!$oDB->isColumnExists("addons_site", "is_used_m")) {
+				$oDB->addColumn("addons_site", "is_used_m", "char", 1, "N", true);
+			}
+
+			// 2011. 7. 29. add is_fixed column
+			if (!$oDB->isColumnExists('addons', 'is_fixed'))
+			{
+				$oDB->addColumn('addons', 'is_fixed', 'char', 1, 'N', true);
+
+				// move addon info to addon_site table
+				$output = executeQueryArray('addon.getAddons');
+				if ($output->data)
+				{
+					foreach($output->data as $row)
+					{
+						$args->site_srl = 0;
+						$args->addon = $row->addon;
+						$args->is_used = $row->is_used;
+						$args->is_used_m = $row->is_used_m;
+						$args->extra_vars = $row->extra_vars;
+						executeQuery('addon.insertSiteAddon', $args);
+					}
+				}
+			}
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+
+    }
+?>
diff --git a/modules/addon/addon.controller.php b/modules/addon/addon.controller.php
index 7e29d2267..051f6965d 100644
--- a/modules/addon/addon.controller.php
+++ b/modules/addon/addon.controller.php
@@ -1,185 +1,183 @@
-<?php
-    /**
-     * @class  addonController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  addon 모듈의 controller class
-     **/
-
-
-    class addonController extends addon {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 메인/ 가상 사이트별 애드온 캐시 파일의 위치를 구함
-         **/
-        function getCacheFilePath($type = "pc") {
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = $site_module_info->site_srl;
-
-            $addon_path = _XE_PATH_.'files/cache/addons/';
-
-            if($site_srl) $addon_file = $addon_path.$site_srl.$type.'.acivated_addons.cache.php';
-            else $addon_file = $addon_path.$type.'acivated_addons.cache.php';
-
-            if($this->addon_file_called) return $addon_file;
-            $this->addon_file_called = true;
-
-            if(!is_dir($addon_path)) FileHandler::makeDir($addon_path);
-            if(!file_exists($addon_file)) $this->makeCacheFile($site_srl, $type);
-            return $addon_file;
-        }
-
-
-        /**
-         * @brief 애드온 mid 추가 설정 
-         **/
-        function _getMidList($selected_addon, $site_srl = 0) {
-
-            $oAddonAdminModel = &getAdminModel('addon');
-            $addon_info = $oAddonAdminModel->getAddonInfoXml($selected_addon, $site_srl);
-            return $addon_info->mid_list;
-        }
-
-
-
-        /**
-         * @brief 애드온 mid 추가 설정 
-         **/
-        function _setAddMid($selected_addon,$mid, $site_srl=0) {
-
-            // 요청된 애드온의 정보를 구함
-            $mid_list = $this->_getMidList($selected_addon, $site_srl);
-
-            $mid_list[] = $mid;
-            $new_mid_list = array_unique($mid_list);
-            $this->_setMid($selected_addon,$new_mid_list, $site_srl);
-        }
-
-
-        /**
-         * @brief 애드온 mid 추가 설정 
-         **/
-        function _setDelMid($selected_addon,$mid,$site_srl=0) {
-
-            // 요청된 애드온의 정보를 구함
-            $mid_list = $this->_getMidList($selected_addon,$site_srl);
-
-            $new_mid_list = array();
-            if(is_array($mid_list)){
-                for($i=0,$c=count($mid_list);$i<$c;$i++){
-                    if($mid_list[$i] != $mid) $new_mid_list[] = $mid_list[$i];
-                }
-            }else{
-                $new_mid_list[] = $mid;
-            }
-
-
-            $this->_setMid($selected_addon,$new_mid_list,$site_srl);
-        }
-
-        /**
-         * @brief 애드온 mid 추가 설정 
-         **/
-        function _setMid($selected_addon,$mid_list,$site_srl=0) {
-            $args->mid_list =  join('|@|',$mid_list);
-            $this->doSetup($selected_addon, $args,$site_srl);
-            $this->makeCacheFile($site_srl);
-        }
-
-
-        /**
-         * @brief 애드온 mid 추가
-         **/
-        function procAddonSetupAddonAddMid() {
-            $site_module_info = Context::get('site_module_info');
-
-            $args = Context::getRequestVars();
-            $addon_name = $args->addon_name;
-            $mid = $args->mid;
-            $this->_setAddMid($addon_name,$mid,$site_module_info->site_srl);
-        }
-
-        /**
-         * @brief 애드온 mid 삭제
-         **/
-        function procAddonSetupAddonDelMid() {
-            $site_module_info = Context::get('site_module_info');
-
-            $args = Context::getRequestVars();
-            $addon_name = $args->addon_name;
-            $mid = $args->mid;
-
-            $this->_setDelMid($addon_name,$mid,$site_module_info->site_srl);
-        }
-
-        /**
-         * @brief 캐시 파일 생성
-         **/
-        function makeCacheFile($site_srl = 0, $type = "pc") {
-            // 모듈에서 애드온을 사용하기 위한 캐시 파일 생성
-            $buff = "";
-            $oAddonModel = &getAdminModel('addon');
-            $addon_list = $oAddonModel->getInsertedAddons($site_srl, $type);
-            foreach($addon_list as $addon => $val) {
-                if($val->addon == "smartphone") continue;
-				if(!is_dir(_XE_PATH_.'addons/'.$addon)) continue;
-                if(($type == "pc" && $val->is_used != 'Y') || ($type == "mobile" && $val->is_used_m != 'Y')) continue; 
-
-                $extra_vars = unserialize($val->extra_vars);
-                $mid_list = $extra_vars->mid_list;
-                if(!is_array($mid_list)||!count($mid_list)) $mid_list = null;
-                $mid_list = base64_encode(serialize($mid_list));
-
-                if($val->extra_vars) {
-                    unset($extra_vars);
-                    $extra_vars = base64_encode($val->extra_vars);
-                }
-
-                $buff .= sprintf(' $_ml = unserialize(base64_decode("%s")); if(file_exists("%saddons/%s/%s.addon.php") && (!is_array($_ml) || in_array($_m, $_ml))) { unset($addon_info); $addon_info = unserialize(base64_decode("%s")); $addon_path = "%saddons/%s/"; @include("%saddons/%s/%s.addon.php"); }', $mid_list, _XE_PATH_, $addon, $addon, $extra_vars, _XE_PATH_, $addon, _XE_PATH_, $addon, $addon);
-            }
-
-            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $_m = Context::get(\'mid\'); %s ?>', $buff);
-
-            $addon_path = _XE_PATH_.'files/cache/addons/';
-            if(!is_dir($addon_path)) FileHandler::makeDir($addon_path);
-
-            if($site_srl) $addon_file = $addon_path.$site_srl.$type.'.acivated_addons.cache.php';
-            else $addon_file = $addon_path.$type.'acivated_addons.cache.php';
-
-            FileHandler::writeFile($addon_file, $buff);
-        }
-
-        /**
-         * @brief 애드온 설정
-         **/
-        function doSetup($addon, $extra_vars,$site_srl=0) {
-            if($extra_vars->mid_list) $extra_vars->mid_list = explode('|@|', $extra_vars->mid_list);
-            $args->addon = $addon;
-            $args->extra_vars = serialize($extra_vars);
-            if(!$site_srl) return executeQuery('addon.updateAddon', $args);
-            $args->site_srl = $site_srl;
-            return executeQuery('addon.updateSiteAddon', $args);
-        }
-
-        /**
-         * @brief 가상 사이트에서의 애드온 정보 제거
-         **/
-        function removeAddonConfig($site_srl) {
-            $addon_path = _XE_PATH_.'files/cache/addons/';
-            $addon_file = $addon_path.$site_srl.'.acivated_addons.cache.php';
-            if(file_exists($addon_file)) FileHandler::removeFile($addon_file);
-
-            $args->site_srl = $site_srl;
-            executeQuery('addon.deleteSiteAddons', $args);
-
-
-        }
-
-
-    }
-?>
+<?php
+    /**
+     * @class  addonController
+     * @author NHN (developers@xpressengine.com)
+     * @brief addon module's controller class
+     **/
+
+
+    class addonController extends addon {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Main/Virtual-specific add-on file, the location of the cache Wanted
+         **/
+        function getCacheFilePath($type = "pc") {
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = $site_module_info->site_srl;
+
+            $addon_path = _XE_PATH_.'files/cache/addons/';
+
+            $addon_file = $addon_path.$site_srl.$type.'.acivated_addons.cache.php';
+
+            if($this->addon_file_called) return $addon_file;
+            $this->addon_file_called = true;
+
+            if(!is_dir($addon_path)) FileHandler::makeDir($addon_path);
+            if(!file_exists($addon_file)) $this->makeCacheFile($site_srl, $type);
+            return $addon_file;
+        }
+
+
+        /**
+         * @brief Add-on mid settings
+         **/
+        function _getMidList($selected_addon, $site_srl = 0) {
+
+            $oAddonAdminModel = &getAdminModel('addon');
+            $addon_info = $oAddonAdminModel->getAddonInfoXml($selected_addon, $site_srl);
+            return $addon_info->mid_list;
+        }
+
+
+
+        /**
+         * @brief Add-on mid settings
+         **/
+        function _setAddMid($selected_addon,$mid, $site_srl=0) {
+            // Wanted to add the requested information
+            $mid_list = $this->_getMidList($selected_addon, $site_srl);
+
+            $mid_list[] = $mid;
+            $new_mid_list = array_unique($mid_list);
+            $this->_setMid($selected_addon,$new_mid_list, $site_srl);
+        }
+
+
+        /**
+         * @brief Add-on mid settings
+         **/
+        function _setDelMid($selected_addon,$mid,$site_srl=0) {
+            // Wanted to add the requested information
+            $mid_list = $this->_getMidList($selected_addon,$site_srl);
+
+            $new_mid_list = array();
+            if(is_array($mid_list)){
+                for($i=0,$c=count($mid_list);$i<$c;$i++){
+                    if($mid_list[$i] != $mid) $new_mid_list[] = $mid_list[$i];
+                }
+            }else{
+                $new_mid_list[] = $mid;
+            }
+
+
+            $this->_setMid($selected_addon,$new_mid_list,$site_srl);
+        }
+
+        /**
+         * @brief Add-on mid settings
+         **/
+        function _setMid($selected_addon,$mid_list,$site_srl=0) {
+            $args->mid_list =  join('|@|',$mid_list);
+            $this->doSetup($selected_addon, $args,$site_srl);
+            $this->makeCacheFile($site_srl);
+        }
+
+
+        /**
+         * @brief Add mid-on
+         **/
+        function procAddonSetupAddonAddMid() {
+            $site_module_info = Context::get('site_module_info');
+
+            $args = Context::getRequestVars();
+            $addon_name = $args->addon_name;
+            $mid = $args->mid;
+            $this->_setAddMid($addon_name,$mid,$site_module_info->site_srl);
+        }
+
+        /**
+         * @brief Add mid Delete
+         **/
+        function procAddonSetupAddonDelMid() {
+            $site_module_info = Context::get('site_module_info');
+
+            $args = Context::getRequestVars();
+            $addon_name = $args->addon_name;
+            $mid = $args->mid;
+
+            $this->_setDelMid($addon_name,$mid,$site_module_info->site_srl);
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function makeCacheFile($site_srl = 0, $type = "pc", $gtype = 'site') {
+            // Add-on module for use in creating the cache file
+            $buff = "";
+            $oAddonModel = &getAdminModel('addon');
+            $addon_list = $oAddonModel->getInsertedAddons($site_srl, $gtype);
+            foreach($addon_list as $addon => $val) {
+                if($val->addon == "smartphone") continue;
+				if(!is_dir(_XE_PATH_.'addons/'.$addon)) continue;
+				if(($type == "pc" && $val->is_used != 'Y') || ($type == "mobile" && $val->is_used_m != 'Y') || ($gtype == 'global' && $val->is_fixed != 'Y')) continue;
+
+                $extra_vars = unserialize($val->extra_vars);
+                $mid_list = $extra_vars->mid_list;
+                if(!is_array($mid_list)||!count($mid_list)) $mid_list = null;
+                $mid_list = base64_encode(serialize($mid_list));
+
+                if($val->extra_vars) {
+                    unset($extra_vars);
+                    $extra_vars = base64_encode($val->extra_vars);
+                }
+
+                $buff .= sprintf(' $_ml = unserialize(base64_decode("%s")); if(file_exists("%saddons/%s/%s.addon.php") && (!is_array($_ml) || in_array($_m, $_ml))) { unset($addon_info); $addon_info = unserialize(base64_decode("%s")); $addon_path = "%saddons/%s/"; @include("%saddons/%s/%s.addon.php"); }', $mid_list, _XE_PATH_, $addon, $addon, $extra_vars, _XE_PATH_, $addon, _XE_PATH_, $addon, $addon);
+            }
+
+            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $_m = Context::get(\'mid\'); %s ?>', $buff);
+
+            $addon_path = _XE_PATH_.'files/cache/addons/';
+            if(!is_dir($addon_path)) FileHandler::makeDir($addon_path);
+
+            if($gtype == 'site') $addon_file = $addon_path.$site_srl.$type.'.acivated_addons.cache.php';
+            else $addon_file = $addon_path.$type.'.acivated_addons.cache.php';
+
+            FileHandler::writeFile($addon_file, $buff);
+        }
+
+        /**
+         * @brief Add-On Set
+         **/
+        function doSetup($addon, $extra_vars,$site_srl=0, $gtype = 'site') {
+            if(!is_array($extra_vars->mid_list))	unset($extra_vars->mid_list);
+
+            $args->addon = $addon;
+            $args->extra_vars = serialize($extra_vars);
+            if($gtype == 'global') return executeQuery('addon.updateAddon', $args);
+            $args->site_srl = $site_srl;
+            return executeQuery('addon.updateSiteAddon', $args);
+        }
+
+        /**
+         * @brief Remove add-on information in the virtual site
+         **/
+        function removeAddonConfig($site_srl) {
+            $addon_path = _XE_PATH_.'files/cache/addons/';
+            $addon_file = $addon_path.$site_srl.'.acivated_addons.cache.php';
+            if(file_exists($addon_file)) FileHandler::removeFile($addon_file);
+
+            $args->site_srl = $site_srl;
+            executeQuery('addon.deleteSiteAddons', $args);
+
+
+        }
+
+
+    }
+?>
diff --git a/modules/addon/conf/info.xml b/modules/addon/conf/info.xml
index 5deb7c53b..08e9f22f1 100644
--- a/modules/addon/conf/info.xml
+++ b/modules/addon/conf/info.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">애드온</title>
-    <title xml:lang="en">Addon</title>
-    <title xml:lang="vi">Addon</title>
-    <title xml:lang="es">Addon</title>
-    <title xml:lang="zh-CN">插件管理</title>
-    <title xml:lang="jp">アドオン</title>
-    <title xml:lang="fr">Additions</title>
-    <title xml:lang="ru">Аддон</title>
-    <title xml:lang="zh-TW">附加元件</title>
-    <title xml:lang="tr">Eklenti</title>
-    <description xml:lang="ko">애드온을 등록하거나 사용/미사용을 설정하는 애드온 관리 모듈입니다.</description>
-    <description xml:lang="en">This module is for maintaining addons which can toggle use and disuse states.</description>
-    <description xml:lang="vi">Module này dành cho việc bảo trì những Addon đang sử dụng và không sử dụng.</description>
-    <description xml:lang="es">Este Módulo es para agregar Addons, como también el manejo de ellos.</description>
-    <description xml:lang="zh-CN">登录插件或设置启用/禁用插件的管理模块。</description>
-    <description xml:lang="jp">アドオンの「登録、使用・未使用」などを設定する管理モジュールです。</description>
-    <description xml:lang="fr">Ce module est pour les Additions de maintien qui peuvent basculer des états d'utilisation et de désuétude. </description>
-    <description xml:lang="ru">Этот модуль служит для управления аддонами, использование которых Вы можете включать и выключать.</description>
-    <description xml:lang="zh-TW">設定附加元件「登錄、啟用、禁用」的管理模組。</description>
-    <description xml:lang="tr">Bu modül, kullanımı değişebilecek veya kullanım dışı kalabilecek eklentileri korumak içindir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>utility</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="fr">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">애드온</title>
+    <title xml:lang="en">Addon</title>
+    <title xml:lang="vi">Addon</title>
+    <title xml:lang="es">Addon</title>
+    <title xml:lang="zh-CN">插件管理</title>
+    <title xml:lang="jp">アドオン</title>
+    <title xml:lang="fr">Additions</title>
+    <title xml:lang="ru">Аддон</title>
+    <title xml:lang="zh-TW">附加元件</title>
+    <title xml:lang="tr">Eklenti</title>
+    <description xml:lang="ko">애드온을 등록하거나 사용/미사용을 설정하는 애드온 관리 모듈입니다.</description>
+    <description xml:lang="en">This module is for maintaining addons which can toggle between two states when use and not used.</description>
+    <description xml:lang="vi">Module này dành cho việc bảo trì những Addon đang sử dụng và không sử dụng.</description>
+    <description xml:lang="es">Este Módulo es para agregar Addons, como también el manejo de ellos.</description>
+    <description xml:lang="zh-CN">登录插件或设置启用/禁用插件的管理模块。</description>
+    <description xml:lang="jp">アドオンの「登録、使用・未使用」などを設定する管理モジュールです。</description>
+    <description xml:lang="fr">Ce module est pour les Additions de maintien qui peuvent basculer des états d'utilisation et de désuétude. </description>
+    <description xml:lang="ru">Этот модуль служит для управления аддонами, использование которых Вы можете включать и выключать.</description>
+    <description xml:lang="zh-TW">設定附加元件「登錄、啟用、禁用」的管理模組。</description>
+    <description xml:lang="tr">Bu modül, kullanımı değişebilecek veya kullanım dışı kalabilecek eklentileri korumak içindir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>utility</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="fr">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/addon/conf/module.xml b/modules/addon/conf/module.xml
index 6daf7c96d..c6ad4833c 100644
--- a/modules/addon/conf/module.xml
+++ b/modules/addon/conf/module.xml
@@ -3,12 +3,28 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispAddonAdminIndex" type="view" standalone="true" admin_index="true" />
+        <action name="dispAddonAdminIndex" type="view" standalone="true" admin_index="true" menu_name="installedAddon" menu_index="true" />
         <action name="dispAddonAdminInfo" type="view" standalone="true" />
-        <action name="dispAddonAdminSetup" type="view" standalone="true" />
+        <action name="dispAddonAdminSetup" type="view" standalone="true" menu_name="installedAddon" />
         <action name="procAddonAdminToggleActivate" type="controller" standalone="true" />
-        <action name="procAddonAdminSetupAddon" type="controller" standalone="true" />
+        <action name="procAddonAdminSetupAddon" type="controller" standalone="true" ruleset="updateAddonSetup" />
         <action name="procAddonSetupAddonAddMid" type="controller" />
         <action name="procAddonSetupAddonDelMid" type="controller" />
+		<action name="procAddonAdminSaveActivate" type="controller" />
     </actions>
+	<menus>
+		<menu name="installedAddon">
+			<title xml:lang="en">Installed Addon</title>
+			<title xml:lang="ko">설치된 애드온</title>
+			<title xml:lang="zh-CN">Installed Addon</title>
+			<title xml:lang="jp">Installed Addon</title>
+			<title xml:lang="es">Installed Addon</title>
+			<title xml:lang="ru">Installed Addon</title>
+			<title xml:lang="fr">Installed Addon</title>
+			<title xml:lang="zh-TW">Installed Addon</title>
+			<title xml:lang="vi">Installed Addon</title>
+			<title xml:lang="mn">Installed Addon</title>
+			<title xml:lang="tr">Installed Addon</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/addon/lang/en.lang.php b/modules/addon/lang/en.lang.php
deleted file mode 100644
index 9055040d1..000000000
--- a/modules/addon/lang/en.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack
-     **/
-
-    $lang->addon = "Addon";
-
-    $lang->addon_info = 'Summary of this Addon';
-    $lang->addon_maker = 'Author of this Addon';
-    $lang->addon_license = 'License';
-    $lang->addon_history = 'Addon History';
-
-    $lang->about_addon_mid = "Addons can select targets.<br />(All targets will be selected when nothing is selected)";
-    $lang->about_addon = 'Addons control many actions performed in your site rather than display HTML results.<br />You can control useful functions simply by toggling ON/OFF switch';
-?>
diff --git a/modules/addon/lang/es.lang.php b/modules/addon/lang/es.lang.php
deleted file mode 100644
index 47b52c84f..000000000
--- a/modules/addon/lang/es.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @archivo   es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español 
-     **/
-
-    $lang->addon = "Addon";
-
-    $lang->addon_info = 'Información de Addon';
-    $lang->addon_maker = 'Autor de Addon';
-    $lang->addon_license = 'License';
-    $lang->addon_history = 'Historia de Addon ';
-
-    $lang->about_addon_mid = "Add-ons se puede utilizar para especificar el destino. <br /> (Todo gratis, están disponibles en todos los destinos)";
-    $lang->about_addon = 'Addon is para controlar las acciones y no para mostrar el resultado en HTML.<br /> Sólo con activar o desactivar el addon que desee, podrá obtener funciones útiles para la administración de tu sitio web.';
-?>
diff --git a/modules/addon/lang/fr.lang.php b/modules/addon/lang/fr.lang.php
deleted file mode 100644
index adff0133d..000000000
--- a/modules/addon/lang/fr.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   modules/addon/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent(PierreDuvent@gamil.com)
-     * @brief  Paquet du langage en français pour le module de Compagnon
-     **/
-
-    $lang->addon = "Compagnon";
-
-    $lang->addon_info = 'Le résumé de la Compagnon';
-    $lang->addon_maker = 'L\'Auteur de la Compagnon';
-    $lang->addon_license = 'Licence';
-    $lang->addon_history = 'L\'Histoire de la Compagnon';
-
-    $lang->about_addon_mid = "On peut choisir des objets dans lesquels la Compagnon soit utilisé.<br />(Tout sera choisi quand rien n'est choisi.)";
-    $lang->about_addon = 'La Compagnon, c\'est pour contrôler les actions plutôt d\'imprimer des résultats de HTML.<br/>Par la Touche à Bascule des compagnons que vous voulez faire marcher ou arrêter, vous pouvez appliquer les fonctions très utiles à administrer votre site Web.';
-?>
\ No newline at end of file
diff --git a/modules/addon/lang/jp.lang.php b/modules/addon/lang/jp.lang.php
deleted file mode 100644
index 724d4e9c0..000000000
--- a/modules/addon/lang/jp.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   modules/addon/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  日本語言語パッケージ
-     **/
-
-    $lang->addon = 'アドオン';
-
-    $lang->addon_info = 'アドオン情報';
-    $lang->addon_maker = 'アドオン制作者';
-    $lang->addon_license = 'ライセンス';
-    $lang->addon_history = '変更履歴';
-
-    $lang->about_addon_mid = 'アドオンが使われる対象を指定します。<br />(選択なしの場合、全てのモジュールが利用可能対象)';
-    $lang->about_addon = 'アドオンは、HTMLの出力をコントロールすると言うより、動作を制御する役割をします。お好みのアドオンを「使用/未使用」に設定するだけで、サイトの運営に有用な機能が利用出来ます。';
-?>
diff --git a/modules/addon/lang/ko.lang.php b/modules/addon/lang/ko.lang.php
deleted file mode 100644
index 39798220b..000000000
--- a/modules/addon/lang/ko.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩
-     **/
-
-    $lang->addon = '애드온';
-
-    $lang->addon_info = '애드온 정보';
-    $lang->addon_maker = '애드온 제작자';
-    $lang->addon_license = '라이선스';
-    $lang->addon_history = '변경 이력';
-
-    $lang->about_addon_mid = '애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제 시 모든 대상에서 사용 가능합니다.)';
-    $lang->about_addon = '애드온은 HTML결과물을 출력하기보다는 동작을 제어하는 역할을 합니다.<br />원하시는 애드온을 ON/OFF 하시는 것만으로도 사이트 운영에 유용한 기능을 연동할 수 있습니다.';
-?>
diff --git a/modules/addon/lang/lang.xml b/modules/addon/lang/lang.xml
new file mode 100644
index 000000000..fab1df206
--- /dev/null
+++ b/modules/addon/lang/lang.xml
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="addon">
+		<value xml:lang="ko"><![CDATA[애드온]]></value>
+		<value xml:lang="en"><![CDATA[Addon]]></value>
+		<value xml:lang="jp"><![CDATA[アドオン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[插件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[附加元件]]></value>
+		<value xml:lang="fr"><![CDATA[Compagnon]]></value>
+		<value xml:lang="ru"><![CDATA[Аддон]]></value>
+		<value xml:lang="tr"><![CDATA[Eklentiler]]></value>
+	</item>
+	<item name="addon_info">
+		<value xml:lang="ko"><![CDATA[애드온 정보]]></value>
+		<value xml:lang="en"><![CDATA[Summary of this Addon]]></value>
+		<value xml:lang="jp"><![CDATA[アドオン情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[插件信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料]]></value>
+		<value xml:lang="fr"><![CDATA[Le résumé de la Compagnon]]></value>
+		<value xml:lang="ru"><![CDATA[Информация об аддоне]]></value>
+		<value xml:lang="es"><![CDATA[Información de Addon]]></value>
+		<value xml:lang="tr"><![CDATA[Eklenti Özeti]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin về Addon]]></value>
+	</item>
+	<item name="addon_maker">
+		<value xml:lang="ko"><![CDATA[애드온 제작자]]></value>
+		<value xml:lang="en"><![CDATA[Author of this Addon]]></value>
+		<value xml:lang="jp"><![CDATA[アドオン制作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[插件作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[作者]]></value>
+		<value xml:lang="fr"><![CDATA[L'Auteur de la Compagnon]]></value>
+		<value xml:lang="ru"><![CDATA[Автор аддона]]></value>
+		<value xml:lang="es"><![CDATA[Autor de Addon]]></value>
+		<value xml:lang="tr"><![CDATA[Eklenti Tasarımcısı]]></value>
+		<value xml:lang="vi"><![CDATA[Tác giả của Addon]]></value>
+	</item>
+	<item name="addon_license">
+		<value xml:lang="ko"><![CDATA[라이선스]]></value>
+		<value xml:lang="en"><![CDATA[License]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="fr"><![CDATA[Licence]]></value>
+		<value xml:lang="tr"><![CDATA[Lisans]]></value>
+		<value xml:lang="vi"><![CDATA[Giấy phép]]></value>
+	</item>
+	<item name="addon_history">
+		<value xml:lang="ko"><![CDATA[변경 이력]]></value>
+		<value xml:lang="en"><![CDATA[Addon History]]></value>
+		<value xml:lang="jp"><![CDATA[変更履歴]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新纪录 ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新紀錄]]></value>
+		<value xml:lang="fr"><![CDATA[L'Histoire de la Compagnon]]></value>
+		<value xml:lang="ru"><![CDATA[История аддона]]></value>
+		<value xml:lang="es"><![CDATA[Historia de Addon ]]></value>
+		<value xml:lang="tr"><![CDATA[Eklenti Geçmişi]]></value>
+		<value xml:lang="vi"><![CDATA[Lịch sử]]></value>
+	</item>
+	<item name="about_addon_mid">
+		<value xml:lang="ko"><![CDATA[애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제 시 모든 대상에서 사용 가능합니다.)]]></value>
+		<value xml:lang="en"><![CDATA[Select a target where the added is used.<br />(If you select none, the addon will be used on all targets.)]]></value>
+		<value xml:lang="jp"><![CDATA[アドオンを使用する対象を指定します。<br />(選択しない場合、すべてのモジュールが利用可能対象となります]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定使用插件的对象。<br />(全部解除表示可用在所有对象。)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定使用附加元件的目標。<br />(全部不選取表示可用在所有目標。)]]></value>
+		<value xml:lang="fr"><![CDATA[On peut choisir des objets dans lesquels la Compagnon soit utilisé.<br />(Tout sera choisi quand rien n'est choisi.)]]></value>
+		<value xml:lang="ru"><![CDATA[애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)]]></value>
+		<value xml:lang="es"><![CDATA[Add-ons se puede utilizar para especificar el destino. <br /> (Todo gratis, están disponibles en todos los destinos)]]></value>
+		<value xml:lang="tr"><![CDATA[Eklentiler, hedef seçebilirler.<br />(Herhangi bir seçim yapılmadığında, tüm hedefler seçilecektir.)]]></value>
+		<value xml:lang="vi"><![CDATA[Addon có thể chọn những vị trí.<br />(Tất cả những vị trí mà chưa Addon nào sử dụng.)]]></value>
+	</item>
+	<item name="about_addon">
+		<value xml:lang="ko"><![CDATA[애드온은 HTML결과물을 출력하기보다는 동작을 제어하는 역할을 합니다.<br />원하시는 애드온을 ON/OFF 하시는 것만으로도 사이트 운영에 유용한 기능을 연동할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Addons control many actions performed in your site rather than display HTML results.<br />You can control useful functions simply by switching ON/OFF of addons.]]></value>
+		<value xml:lang="jp"><![CDATA[アドオンは、HTMLの出力をコントロールするというより、動作を制御する役割をします。アドオンを「使用/未使用」に設定するだけで、サイトの運営に有用な機能を利用できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[插件就是对动作(Action)的有效控制来给核心程序提供扩展功能的一种组件。<br />只需启用/禁用操作，即可为网站提供强大的扩展功能。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[附加元件可對 Action進行控制並可擴展核心程式功能，而不是顯示輸出 HTML結果。<br />『啟用/禁用』附加元件，以增強網站的功能。]]></value>
+		<value xml:lang="fr"><![CDATA[La Compagnon, c'est pour contrôler les actions plutôt d'imprimer des résultats de HTML.<br/>Par la Touche à Bascule des compagnons que vous voulez faire marcher ou arrêter, vous pouvez appliquer les fonctions très utiles à administrer votre site Web.]]></value>
+		<value xml:lang="ru"><![CDATA[Аддон служит больше для контролирования действий, чем для отображения HTML-результатов.<br />Простым включением/выключением любых аддонов, Вы можете использовать очень полезные функции для администрирования Вашего веб-сайта]]></value>
+		<value xml:lang="es"><![CDATA[Addon is para controlar las acciones y no para mostrar el resultado en HTML.<br /> Sólo con activar o desactivar el addon que desee, podrá obtener funciones útiles para la administración de tu sitio web.]]></value>
+		<value xml:lang="tr"><![CDATA[Eklentiler, HTML sonuçlarını göstermek yerine sitenizde gerçekleştirilen birçok eylemi kontrol ederler, .<br />Kullanışlı işlevleri, AÇIK/KAPALI anahtarını değiştirerek, kolayca kontrol edebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Addon có nhiệm vụ hiển thị và kiểm soát kết quả HTML.<br />Bạn có thể mở hoặc tắt bất cứ Addon nào bạn muốn.]]></value>
+	</item>
+	<item name="installed_addon">
+		<value xml:lang="ko"><![CDATA[설치된 애드온]]></value>
+		<value xml:lang="en"><![CDATA[Installed Addon]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされているアドオン]]></value>
+	</item>
+	<item name="about_installed_addon">
+		<value xml:lang="ko"><![CDATA[PC, Mobile에 체크하면 애드온을 켤 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Check PC and Mobile to switch on the addon.]]></value>
+		<value xml:lang="jp"><![CDATA[PC、Mobileを選択するとアドオンを使用できます。]]></value>
+	</item>
+	<item name="fixed">
+		<value xml:lang="ko"><![CDATA[고정]]></value>
+		<value xml:lang="en"><![CDATA[Fixed]]></value>
+		<value xml:lang="jp"><![CDATA[固定]]></value>
+	</item>
+	<item name="about_fixed">
+		<value xml:lang="ko"><![CDATA[체크하면 사이트 관리자가 이 설정을 변경할 수 없음.]]></value>
+		<value xml:lang="en"><![CDATA[Check this, and the site administrator cannot change this setting.]]></value>
+		<value xml:lang="jp"><![CDATA[選択すると、サイトマネージャーがこの設定を変更することができません。]]></value>
+	</item>
+	<item name="msg_not_exist_option">
+		<value xml:lang="ko"><![CDATA[이 애드온은 설정이 존재하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Configuration for this addon does not exist.]]></value>
+		<value xml:lang="jp"><![CDATA[このアドオンは、設定がありません。]]></value>
+	</item>
+</lang>
diff --git a/modules/addon/lang/ru.lang.php b/modules/addon/lang/ru.lang.php
deleted file mode 100644
index 6e802f1dc..000000000
--- a/modules/addon/lang/ru.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->addon = "Аддон";
-
-    $lang->addon_info = 'Информация об аддоне';
-    $lang->addon_maker = 'Автор аддона';
-    $lang->addon_license = 'License';
-    $lang->addon_history = 'История аддона';
-
-    $lang->about_addon_mid = "애드온이 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)";
-    $lang->about_addon = 'Аддон служит больше для контролирования действий, чем для отображения HTML-результатов.<br />Простым включением/выключением любых аддонов, Вы можете использовать очень полезные функции для администрирования Вашего веб-сайта';
-?>
diff --git a/modules/addon/lang/tr.lang.php b/modules/addon/lang/tr.lang.php
deleted file mode 100644
index 508344c7f..000000000
--- a/modules/addon/lang/tr.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack
-     **/
-
-    $lang->addon = "Eklentiler";
-
-    $lang->addon_info = 'Eklenti Özeti';
-    $lang->addon_maker = 'Eklenti Tasarımcısı';
-    $lang->addon_license = 'Lisans';
-    $lang->addon_history = 'Eklenti Geçmişi';
-
-    $lang->about_addon_mid = "Eklentiler, hedef seçebilirler.<br />(Herhangi bir seçim yapılmadığında, tüm hedefler seçilecektir.)";
-    $lang->about_addon = 'Eklentiler, HTML sonuçlarını göstermek yerine sitenizde gerçekleştirilen birçok eylemi kontrol ederler, .<br />Kullanışlı işlevleri, AÇIK/KAPALI anahtarını değiştirerek, kolayca kontrol edebilirsiniz.';
-?>
diff --git a/modules/addon/lang/vi.lang.php b/modules/addon/lang/vi.lang.php
deleted file mode 100644
index e9c717b4b..000000000
--- a/modules/addon/lang/vi.lang.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-			
-    $lang->addon = "Addon";
-
-    $lang->addon_info = 'Thông tin về Addon';
-    $lang->addon_maker = 'Tác giả của Addon';
-    $lang->addon_license = 'Giấy phép';
-    $lang->addon_history = 'Lịch sử';
-
-    $lang->about_addon_mid = "Addon có thể chọn những vị trí.<br />(Tất cả những vị trí mà chưa Addon nào sử dụng.)";
-    $lang->about_addon = 'Addon có nhiệm vụ hiển thị và kiểm soát kết quả HTML.<br />Bạn có thể mở hoặc tắt bất cứ Addon nào bạn muốn.';
-?>
diff --git a/modules/addon/lang/zh-CN.lang.php b/modules/addon/lang/zh-CN.lang.php
deleted file mode 100644
index 6b8d088bb..000000000
--- a/modules/addon/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  简体中文语言包 
-     **/
-
-    $lang->addon = "插件";
-
-    $lang->addon_info = '插件信息';
-    $lang->addon_maker = '插件作者';
-    $lang->addon_license = '版权';
-    $lang->addon_history = '更新纪录 ';
-
-    $lang->about_addon_mid = "可以指定使用插件的对象。<br />(全部解除表示可用在所有对象。)";
-    $lang->about_addon = '插件就是对动作(Action)的有效控制来给核心程序提供扩展功能的一种组件。<br />只需启用/禁用操作，即可为网站提供强大的扩展功能。';
-?>
diff --git a/modules/addon/lang/zh-TW.lang.php b/modules/addon/lang/zh-TW.lang.php
deleted file mode 100644
index e93aea072..000000000
--- a/modules/addon/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   modules/addon/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  附加元件(addon)模組正體中文語言
-     **/
-
-    $lang->addon = "附加元件";
-
-    $lang->addon_info = '資料';
-    $lang->addon_maker = '作者';
-    $lang->addon_license = '版權';
-    $lang->addon_history = '更新紀錄';
-
-    $lang->about_addon_mid = "可以指定使用附加元件的目標。<br />(全部不選取表示可用在所有目標。)";
-    $lang->about_addon = '附加元件可擴展程式功能，而不是顯示輸出HTML結果。<br />『啟用/禁用』附加元件，以增強網站的功能。';
-?>
diff --git a/modules/addon/queries/insertSiteAddon.xml b/modules/addon/queries/insertSiteAddon.xml
index 6aa9fc618..7a7927b1e 100644
--- a/modules/addon/queries/insertSiteAddon.xml
+++ b/modules/addon/queries/insertSiteAddon.xml
@@ -6,6 +6,8 @@
       <column name="site_srl" var="site_srl" notnull="notnull" />
       <column name="addon" var="addon" notnull="notnull" />
       <column name="is_used" var="is_used" default="N" notnull="notnull" />
+	  <column name="is_used_m" var="is_used_m" default="N" />
+	  <column name="extra_vars" var="extra_vars" />
       <column name="regdate" var="regdate" default="curdate()" />
     </columns>
 </query>
diff --git a/modules/addon/queries/updateAddon.xml b/modules/addon/queries/updateAddon.xml
index 433f65d8d..b6c3143c4 100644
--- a/modules/addon/queries/updateAddon.xml
+++ b/modules/addon/queries/updateAddon.xml
@@ -5,6 +5,7 @@
     <columns>
       <column name="is_used" var="is_used" />
       <column name="is_used_m" var="is_used_m" />
+	  <column name="is_fixed" var="fixed" />
       <column name="extra_vars" var="extra_vars" />
     </columns>
     <conditions>
diff --git a/modules/addon/ruleset/updateAddonSetup.xml b/modules/addon/ruleset/updateAddonSetup.xml
new file mode 100644
index 000000000..e06b6da3e
--- /dev/null
+++ b/modules/addon/ruleset/updateAddonSetup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+	<customrules>
+	</customrules>
+	<fields>
+		<field name="addon_name" required="true" />
+	</fields>
+</ruleset>
\ No newline at end of file
diff --git a/modules/addon/schemas/addons.xml b/modules/addon/schemas/addons.xml
index 60c547497..3f1a86c3b 100644
--- a/modules/addon/schemas/addons.xml
+++ b/modules/addon/schemas/addons.xml
@@ -2,6 +2,7 @@
     <column name="addon" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
     <column name="is_used" type="char" size="1" default="Y" notnull="notnull" />
     <column name="is_used_m" type="char" size="1" default="N" notnull="notnull" />
+	<column name="is_fixed" type="char" size="1" default="N" notnull="notnull" />
     <column name="extra_vars" type="text" />
     <column name="regdate" type="date" index="idx_regdate" />
 </table>
diff --git a/modules/addon/tpl/addon_info.html b/modules/addon/tpl/addon_info.html
index dd13c3513..164444581 100644
--- a/modules/addon/tpl/addon_info.html
+++ b/modules/addon/tpl/addon_info.html
@@ -1,86 +1,78 @@
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->addon_maker}</h3>
-</div>
-
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->title}</div></th>
-        <td>{$addon_info->title} ver. {$addon_info->version}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->author}</div></th>
-        <td>
-            <!--@foreach($addon_info->author as $author)-->
-            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
-            <!--@endforeach-->
-        </td>
-    </tr>
+<h1 class="h1">{$lang->addon_maker}</h1>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+	<tr>
+		<th scope="row">{$lang->title}</th>
+		<td>{$addon_info->title} ver. {$addon_info->version}</td>
+	</tr>
+	<tr>
+		<th scope="row">{$lang->author}</th>
+		<td>
+			<!--@foreach($addon_info->author as $author)-->
+			{$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
+			<!--@endforeach-->
+		</td>
+	</tr>
 <!--@if($addon_info->homepage)-->
-    <tr>
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$addon_info->homepage}" onclick="window.open(this.href);return false;">{$addon_info->homepage}</a></td>
-    </tr><!--@end-->
-    <tr>
-        <th scope="row"><div>{$lang->regdate}</div></th>
-        <td>{zdate($addon_info->date, 'Y-m-d')}</td>
-    </tr>
+	<tr>
+		<th scope="row">{$lang->homepage}</th>
+		<td><a href="{$addon_info->homepage}" onclick="window.open(this.href);return false;">{$addon_info->homepage}</a></td>
+	</tr><!--@end-->
+	<tr>
+		<th scope="row">{$lang->regdate}</th>
+		<td>{zdate($addon_info->date, 'Y-m-d')}</td>
+	</tr>
 <!--@if($addon_info->license || $addon_info->license_link)-->
-    <tr>
-        <th scope="row"><div>{$lang->addon_license}</div></th>
-        <td>
-            {nl2br(trim($addon_info->license))}
-        <!--@if($addon_info->license_link)-->
-            <p><a href="{$addon_info->license_link}" onclick="window.close(); return false;">{$addon_info->license_link}</a></p>
-        <!--@end-->
-        </td>
-    </tr><!--@end-->
+	<tr>
+		<th scope="row">{$lang->addon_license}</th>
+		<td>
+			{nl2br(trim($addon_info->license))}
+		<!--@if($addon_info->license_link)-->
+			<p><a href="{$addon_info->license_link}" onclick="window.close(); return false;">{$addon_info->license_link}</a></p>
+		<!--@end-->
+		</td>
+	</tr><!--@end-->
 <!--@if($addon_info->description)-->
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br(trim($addon_info->description))}</td>
-    </tr><!--@end-->
-    </table>
-
+	<tr>
+		<th scope="row">{$lang->description}</th>
+		<td>{nl2br(trim($addon_info->description))}</td>
+	</tr><!--@end-->
+	</table>
 </div>
 
 <!--@if($addon_info->history)-->
-<div id="popHistoryHeader">
-    <h3 class="xeAdmin">{$lang->addon_history}</h3>
-</div>
+<h1 class="h1">{$lang->addon_history}</h1>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+	<col width="100" />
+	<col />
 
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
-    <col width="100" />
-    <col />
-
-    <!--@foreach($addon_info->history as $history)-->
-    <tr>
-        <th scope="row"><div>
-            {$history->version}<br />
-            {$history->date}
-        </div></th>
-        <td>
-            <!--@foreach($history->author as $author)-->
-            <p>{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a> / <a href="mailto:{$author->email_address}">{$author->email_address}</a>)</p>
-            <!--@endforeach-->
-            <!--@if($history->description)-->
-            <p>{nl2br(trim($history->description))}</p>
-            <!--@endif-->
-            <!--@if($history->logs)-->
-            <ul>
-                <!--@foreach($history->logs as $log)-->
-                <!--@if($log->link)-->
-                <li><a href="{$log->link}">{$log->text}</a></li>
-                <!--@else-->
-                <li>{$log->text}</li>
-                <!--@endif-->
-                <!--@endforeach-->
-            </ul>
-            <!--@endif-->
-        </td>
-    </tr>
-    <!--@endforeach-->
-    </table>
+	<!--@foreach($addon_info->history as $history)-->
+	<tr>
+		<th scope="row">
+			{$history->version}<br />
+			{$history->date}			</th>
+		<td>
+			<!--@foreach($history->author as $author)-->
+			<p>{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a> / <a href="mailto:{$author->email_address}">{$author->email_address}</a>)</p>
+			<!--@endforeach-->
+			<!--@if($history->description)-->
+			<p>{nl2br(trim($history->description))}</p>
+			<!--@endif-->
+			<!--@if($history->logs)-->
+			<ul>
+				<!--@foreach($history->logs as $log)-->
+				<!--@if($log->link)-->
+				<li><a href="{$log->link}">{$log->text}</a></li>
+				<!--@else-->
+				<li>{$log->text}</li>
+				<!--@endif-->
+				<!--@endforeach-->
+			</ul>
+			<!--@endif-->
+		</td>
+	</tr>
+	<!--@endforeach-->
+	</table>
 </div>
 <!--@endif-->
diff --git a/modules/addon/tpl/addon_list.html b/modules/addon/tpl/addon_list.html
index 9e18c9b48..79ebb8bc3 100644
--- a/modules/addon/tpl/addon_list.html
+++ b/modules/addon/tpl/addon_list.html
@@ -1,70 +1,54 @@
-<!--%import("filter/toggle_activate_addon.xml")-->
-<!--%import("js/addon.js")-->
+<form action="./" method="post">
+	<input type="hidden" name="module" value="addon" />
+	<input type="hidden" name="act" value="procAddonAdminSaveActivate" />
+	<input type="hidden" name="sccess_return_url" value="{getRequestUriByServerEnviroment()}" />
 
-<h3 class="xeAdmin">{$lang->addon} <span class="gray">{$lang->cmd_management}</span></h3>
-<div class="infoText">{nl2br($lang->about_addon)}</div>
-
-<!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
-<form id="fo_addon" action="./" method="get">
-    <input type="hidden" name="addon" value="" />
-    <input type="hidden" name="type" value="" />
+	<h1 class="h1">{$lang->installed_addon}</h1>
+	<p>{$lang->about_installed_addon}</p>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+	<div class="table even easyList">
+		<table width="100%" border="1" cellspacing="0">
+			<caption>All({$addon_count})</caption>
+			<thead>
+				<tr>
+					<th scope="col" class="title">{$lang->addon_name}</th>
+					<th scope="col">{$lang->version}</th>
+					<th scope="col">{$lang->author}</th>
+					<th scope="col">{$lang->installed_path}</th>
+					<th scope="col">{$lang->cmd_setup}</th>
+					<th scope="col">PC</th>
+					<th scope="col">Mobile</th>
+					<th scope="col">{$lang->cmd_delete}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr loop="$addon_list => $addon">
+					<td class="title">
+						<p><strong>{$addon->title}</strong></p>
+						<p>{$addon->description}</p>
+						<p cond="$addon->need_update == 'Y'" class="update">
+							{$lang->msg_avail_easy_update} <a href="{$addon->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
+						</p>
+					</td>
+					<td>{$addon->version}</td>
+					<td>
+						<block loop="$addon->author => $author">
+							<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
+							<block cond="!$author->homepage">{$author->name}</block>
+						</block>
+					</td>
+					<td>{$addon->path}</td>
+					<td><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td>
+					<td><input type="checkbox" name="pc[]" title="PC" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->activated" /></td>
+					<td><input type="checkbox" name="mobile[]" title="Mobile" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->mactivated" /></td>
+					<td><a cond="$addon->remove_url" href="{$addon->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </form>
-
-<!-- 애드온의 목록 -->
-<table cellspacing="0" class="crossTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->addon_name}</div></th>
-        <th scope="col"><div>{$lang->version}</div></th>
-        <th scope="col"><div>{$lang->author}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col" class="wide"><div>{$lang->installed_path}</div></th>
-        <th scope="col"><div>{$lang->cmd_setup}</div></th>
-        <th scope="col"><div>PC</div></th>
-        <th scope="col"><div>Mobile</div></th>
-    </tr>
-</thead>
-
-<tbody>
-<!--@foreach($addon_list as $key => $val)-->
-<tr>
-    <th scope="row" rowspan="2">
-        <div>
-            <a href="{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false">{$val->title}</a> <br />
-            ({$val->addon})
-        </div>
-    </th>
-    <td>{$val->version}</td>
-    <td>
-        <!--@foreach($val->author as $author)-->
-        <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
-        <!--@endforeach-->
-    </td>
-    <td>{zdate($val->date, 'Y-m-d')}</td>
-    <td>{$val->path}</td>
-    <td><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" title="{htmlspecialchars($lang->cmd_setup)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
-    <td>
-        <!--@if($val->activated)-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
-        <!--@else-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
-        <!--@end-->
-    </td>
-    <td>
-        <!--@if($val->mactivated)-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}','mobile');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
-        <!--@else-->
-        <a href="#" onclick="doToggleAddon('{$val->addon}','mobile');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
-        <!--@end-->
-    </td>
-
-</tr>
-<tr>
-    <td colspan="6">
-        {nl2br($val->description)}&nbsp;
-    </td>
-</tr>
-<!--@end-->
-</tbody>
-
-</table>
diff --git a/modules/addon/tpl/js/addon.js b/modules/addon/tpl/js/addon.js
index d2d0ce745..b9e54b394 100644
--- a/modules/addon/tpl/js/addon.js
+++ b/modules/addon/tpl/js/addon.js
@@ -9,12 +9,3 @@ function doToggleAddon(addon, type) {
     fo_obj.type.value = type;
     procFilter(fo_obj, toggle_activate_addon);
 }
-
-// 관리자 제어판 페이지용
-function doToggleAddonInAdmin(obj, addon, type) {
-    var params = new Array();
-    params['addon'] = addon;
-	if(typeof(type) == "undefined") type = "pc";
-	params['type'] = type;
-    exec_xml('addon','procAddonAdminToggleActivate',params,function() { if(/Active/.test(obj.className)) obj.className = "buttonSet buttonDisable"; else obj.className = "buttonSet buttonActive"; } );
-}
diff --git a/modules/addon/tpl/setup_addon.html b/modules/addon/tpl/setup_addon.html
index 3b85be19f..1d3b4cbe6 100644
--- a/modules/addon/tpl/setup_addon.html
+++ b/modules/addon/tpl/setup_addon.html
@@ -1,105 +1,77 @@
-<!--%import("filter/setup_addon.xml")-->
-<!--%import("css/addon.css")-->
-<!--%import("js/addon.js")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_setup}</h3>
+<h1 class="h1">{$lang->installed_addon}</h1>
+<h2 class="h2">{$addon_info->title}</h2>
+<ul>
+	<li>{$lang->version}: {$addon_info->version} ({zdate($addon_info->date, 'Y-m-d')})</li>
+	<li>
+		{$lang->author}:
+		<block loop="$addon_info->author => $author">
+			{$author->name} (<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->homepage}</a>, <a cond="$author->email_address" href="mailto:{$author->email_address}">{$author->email_address}</a>) <br />
+		</block>
+	</li>
+	<li cond="$addon_info->homepage">{$lang->homepage}: <a href="{$addon_info->homepage}" target="_blank">{$addon_info->homepage}</a></li>
+</ul>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<form action="./" method="post" class="form">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="procAddonAdminSetupAddon" />
+	<input type="hidden" name="addon_name" value="{$addon_info->addon_name}" />
 
-<form action="./" method="get" onsubmit="return procFilter(this, setup_addon);">
-<input type="hidden" name="addon_name" value="{$addon_info->addon_name}" />
-
-    <div id="popBody">
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <th scope="row"><div><label for="textfield1">{$lang->title}</label></div></th>
-            <td>{$addon_info->title} ver. {$addon_info->version} ({zdate($addon_info->date, 'Y-m-d')})</td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->author}</div></th>
-            <td>
-            <!--@foreach($addon_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
-            <!--@endforeach-->
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div><label for="textfield2">{$lang->homepage}</label></div></th>
-            <td class="blue"><a href="{$addon_info->homepage}" onclick="window.open(this.href);return false;">{$addon_info->homepage}</a>&nbsp;</td>
-        </tr>
-
-        <!--@foreach($addon_info->extra_vars as $id => $var)-->
-
-        <!--@if($var->group && ((!$group) || $group != $var->group))-->
-        {@$group = $var->group}
-        </table>
-
-        <h4 class="xeAdmin">{$group}</h4>
-        <table cellspacing="0" class="rowTable">
-        <col width="100" />
-        <col width="*" />
-        <!--@end-->
-
-        <tr class="row{$cycle_idx}">
-            <th scope="row"><div>{$var->title}</div></th>
-            <td>
-                <!--@if($var->type == 'text')-->
-                <input type="text" name="{$var->name}" id="{$var->name}" value="{htmlspecialchars($var->value)}" class="inputTypeText w400 lang_code" />
-
-                <!--@elseif($var->type == 'textarea')-->
-                <textarea name="{$var->name}" id="{$var->name}" class="inputTypeTextArea lang_code">{htmlspecialchars($var->value)}</textarea>
-
-                <!--@elseif($var->type == 'select')-->
-                <select name="{$var->name}">
-                    <!--@foreach($var->options as $val)-->
-                    <option value="{$val->value}"<!--@if($var->value == $val->value)--> selected="selected"<!--@end-->>{$val->title}</option>
-                    <!--@end-->
-                </select>
-                <!--@end-->
-                <p class="clear">{nl2br($var->description)}</p>
-            </td>
-        </tr>
-        <!--@end-->
-
-        <!--@if($group)-->
-        </table>
-        <table cellspacing="0" class="rowTable">
-        <!--@end-->
-
-        <!--@if($mid_list)-->
-        <tr>
-            <th scope="row"><div>
-                {$lang->module}
-                <input type="checkbox" onclick="XE.checkboxToggleAll('mid_list'); return false;" />
-            </div></th>
-            <td>
-                <p>{$lang->about_addon_mid}</p>
-                <!--@foreach($mid_list as $module_category_srl => $modules)-->
-                    <div class="module_category_title">
-                        <input type="checkbox" onclick="XE.checkboxToggleAll('mid_list', { wrap:'section_{$module_category_srl}' });" />
-                    <!--@if($modules->title)-->
-                        {$modules->title}
-                    <!--@else-->
-                        {$lang->none_category}
-                    <!--@end-->
-                    </div>
-
-                    <div id="section_{$module_category_srl}">
-                    <!--@foreach($modules->list as $key => $val)-->
-                        <div class="module_list">
-                            <input type="checkbox" value="{$key}" name="mid_list" id="chk_mid_list_{$key}" <!--@if(in_array($key, $addon_info->mid_list))-->checked="checked"<!--@end--> />
-                            <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
-                        </div>
-                    <!--@end-->
-                    </div>
-                <!--@end-->
-            </td>
-        </tr>
-        <!--@endif-->
-        </table>
-    </div>
-
-    <div id="popFooter">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" /></span>
-    </div>
+	<block cond="count($addon_info->extra_vars)">
+		<block loop="$addon_info->extra_vars => $id, $var">
+			<block cond="!$not_first && !$var->group"><ul></block>
+			<block cond="$group != $var->group">
+				<block cond="$not_first"></ul></block>
+				<h3 class="h3">{$var->group}</h3>
+				<ul>
+				{@$group = $var->group}
+			</block>
+			{@$not_first = true}
+			<li>
+				<p class="q"><label for="{$var->name}">{$var->title}</label></p>
+				<p class="a">
+					<input cond="$var->type == 'text'" type="text" name="{$var->name}" id="{$var->name}" value="{htmlspecialchars($var->value)}" class="lang_code">
+					<textarea cond="$var->type == 'textarea'" name="{$var->name}" id="{$var->name}" class="lang_code">{htmlspecialchars($var->value)}</textarea>
+					<select cond="$var->type == 'select'" name="{$var->name}" id="{$var->name}">
+						<option loop="$var->options => $option" value="{$option->value}" selected="selected"|cond="$var->value == $option->value">{$option->title}</option>
+					</select>
+				</p>
+				<p class="desc">{nl2br($var->description)}</p>
+			</li>
+		</block>
+		</ul>
+	</block>
+	<div cond="!count($addon_info->extra_vars)" class="message info">
+		<p>{$lang->msg_not_exist_option}</p>
+	</div>
+	<block cond="$mid_list">
+		<h3 class="h3">{$lang->module}</h3>
+		<p>{$lang->about_addon_mid}</p>
+		<p><input type="checkbox" id="check_all" /> <label for="check_all">Check all</label></p>
+		<fieldset loop="$mid_list => $module_category_srl, $modules" style="border: 1px solid #ccc; margin:1em 0; padding:.5em 1em">
+			<legend cond="$modules->title">{$modules->title}</legend>
+			<legend cond="!$modules->title">{$lang->none_category}</legend>
+			<div loop="$modules->list => $key, $val">
+				<input type="checkbox" value="{$key}" name="mid_list[]" id="chk_mid_list_{$key}" checked="checked"|cond="in_array($key, $addon_info->mid_list)"/>
+				<label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+			</div>
+		</fieldset>
+	</block>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </form>
+</block>
+<script type="text/javascript">
+(function($){
+	$('#check_all')
+		.bind('click', function(e){
+			if (this.checked){
+				$('input[name=mid_list\\[\\]]').attr('checked', 'checked');
+			}else{
+				$('input[name=mid_list\\[\\]]').removeAttr('checked');
+			}
+		});
+})(jQuery);
+</script>
diff --git a/modules/admin/admin.admin.controller.php b/modules/admin/admin.admin.controller.php
index f7fcb8bb5..353274717 100644
--- a/modules/admin/admin.admin.controller.php
+++ b/modules/admin/admin.admin.controller.php
@@ -1,83 +1,320 @@
-<?php
-    /**
-     * @class  adminAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  admin controller class of admin module
-     **/
-
-    class adminAdminController extends admin {
-        /**
-         * @brief initialization
-         * @return none
-         **/
-        function init() {
-            // forbit access if the user is not an administrator
-            $oMemberModel = &getModel('member');
-            $logged_info = $oMemberModel->getLoggedInfo();
-            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
-        }
-
-        /**
-         * @brief Regenerate all cache files
-         * @return none
-         **/
-        function procAdminRecompileCacheFile() {
-			// rename cache dir
-			$temp_cache_dir = './files/cache_'. time();
-			FileHandler::rename('./files/cache', $temp_cache_dir);
-			FileHandler::makeDir('./files/cache');
-
-            // remove debug files 
-            FileHandler::removeFile(_XE_PATH_.'files/_debug_message.php');
-            FileHandler::removeFile(_XE_PATH_.'files/_debug_db_query.php');
-            FileHandler::removeFile(_XE_PATH_.'files/_db_slow_query.php');
-			
-            $oModuleModel = &getModel('module');
-            $module_list = $oModuleModel->getModuleList();
-
-            // call recompileCache for each module
-            foreach($module_list as $module) {
-                $oModule = null;
-                $oModule = &getClass($module->module);
-                if(method_exists($oModule, 'recompileCache')) $oModule->recompileCache();
-            }
-
-			// remove cache dir
-			$tmp_cache_list = FileHandler::readDir('./files','/(^cache_[0-9]+)/');
-			if($tmp_cache_list){
-				foreach($tmp_cache_list as $tmp_dir){
-					if($tmp_dir) FileHandler::removeDir('./files/'.$tmp_dir);
-				}
-			}
-
-			$truncated = array();
-			$oObjectCacheHandler = &CacheHandler::getInstance();
-			$oTemplateCacheHandler = &CacheHandler::getInstance('template');
-
-			if($oObjectCacheHandler->isSupport()){
-				$truncated[] = $oObjectCacheHandler->truncate();
-			}
-			
-			if($oTemplateCacheHandler->isSupport()){
-				$truncated[] = $oTemplateCacheHandler->truncate();
-			}
-
-			if(count($truncated) && in_array(false,$truncated)){
-				return new Object(-1,'msg_self_restart_cache_engine');
-			}
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief Logout
-         * @return none
-         **/
-        function procAdminLogout() {
-            $oMemberController = &getController('member');
-            $oMemberController->procMemberLogout();
-
-			header('Location: '.getNotEncodedUrl('', 'module','admin'));
-        }
-    }
-?>
+<?php
+    /**
+     * @class  adminAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief  admin controller class of admin module
+     **/
+
+    class adminAdminController extends admin {
+        /**
+         * @brief initialization
+         * @return none
+         **/
+        function init() {
+            // forbit access if the user is not an administrator
+            $oMemberModel = &getModel('member');
+            $logged_info = $oMemberModel->getLoggedInfo();
+            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
+        }
+
+		function procAdminMenuReset(){
+			$menuSrl = Context::get('menu_srl');
+			if (!$menuSrl) return $this->stop('msg_invalid_request');
+
+			$oMenuAdminController = &getAdminController('menu');
+			$output = $oMenuAdminController->deleteMenu($menuSrl);
+			if (!$output->toBool()) return $output;
+
+			FileHandler::removeDir('./files/cache/menu/admin_lang/');
+
+			$this->setRedirectUrl(Context::get('error_return_url'));
+		}
+
+        /**
+         * @brief Regenerate all cache files
+         * @return none
+         **/
+        function procAdminRecompileCacheFile() {
+			// rename cache dir
+			$temp_cache_dir = './files/cache_'. time();
+			FileHandler::rename('./files/cache', $temp_cache_dir);
+			FileHandler::makeDir('./files/cache');
+
+            // remove debug files
+            FileHandler::removeFile(_XE_PATH_.'files/_debug_message.php');
+            FileHandler::removeFile(_XE_PATH_.'files/_debug_db_query.php');
+            FileHandler::removeFile(_XE_PATH_.'files/_db_slow_query.php');
+
+            $oModuleModel = &getModel('module');
+            $module_list = $oModuleModel->getModuleList();
+
+            // call recompileCache for each module
+            foreach($module_list as $module) {
+                $oModule = null;
+                $oModule = &getClass($module->module);
+                if(method_exists($oModule, 'recompileCache')) $oModule->recompileCache();
+            }
+
+			// remove cache
+			$truncated = array();
+			$oObjectCacheHandler = &CacheHandler::getInstance('object');
+			$oTemplateCacheHandler = &CacheHandler::getInstance('template');
+
+			if($oObjectCacheHandler->isSupport()){
+				$truncated[] = $oObjectCacheHandler->truncate();
+			}
+
+			if($oTemplateCacheHandler->isSupport()){
+				$truncated[] = $oTemplateCacheHandler->truncate();
+			}
+
+			if(count($truncated) && in_array(false,$truncated)){
+				return new Object(-1,'msg_self_restart_cache_engine');
+			}
+
+
+			// remove cache dir
+			$tmp_cache_list = FileHandler::readDir('./files','/(^cache_[0-9]+)/');
+			if($tmp_cache_list){
+				foreach($tmp_cache_list as $tmp_dir){
+					if($tmp_dir) FileHandler::removeDir('./files/'.$tmp_dir);
+				}
+			}
+
+            $this->setMessage('success_updated');
+        }
+
+        /**
+         * @brief Logout
+         * @return none
+         **/
+        function procAdminLogout() {
+            $oMemberController = &getController('member');
+            $oMemberController->procMemberLogout();
+
+			header('Location: '.getNotEncodedUrl('', 'module','admin'));
+        }
+
+		function procAdminInsertThemeInfo(){
+			$vars = Context::getRequestVars();
+			$theme_file = _XE_PATH_.'files/theme/theme_info.php';
+
+			$theme_output = sprintf('$theme_info->theme=\'%s\';', $vars->themeItem);
+			$theme_output = $theme_output.sprintf('$theme_info->layout=%s;', $vars->layout);
+
+			$site_info = Context::get('site_module_info');
+
+			$args->site_srl = $site_info->site_srl;
+			$args->layout_srl = $vars->layout;
+			// layout submit
+			$output = executeQuery('layout.updateAllLayoutInSiteWithTheme', $args);
+			if (!$output->toBool()) return $output;
+
+			$skin_args->site_srl = $site_info->site_srl;
+
+			foreach($vars as $key=>$val){
+				$pos = strpos($key, '-skin');
+				if ($pos === false) continue;
+				if ($val != '__skin_none__'){
+					$module = substr($key, 0, $pos);
+					$theme_output = $theme_output.sprintf('$theme_info->skin_info[%s]=\'%s\';', $module, $val);
+					$skin_args->skin = $val;
+					$skin_args->module = $module;
+					if ($module == 'page')
+					{
+						$article_output = executeQueryArray('page.getArticlePageSrls');
+						if (count($article_output->data)>0){
+							$article_module_srls = array();
+							foreach($article_output->data as $val){
+								$article_module_srls[] = $val->module_srl;
+							}
+							$skin_args->module_srls = implode(',', $article_module_srls);
+						}
+					}
+					$skin_output = executeQuery('module.updateAllModuleSkinInSiteWithTheme', $skin_args);
+					if (!$skin_output->toBool()) return $skin_output;
+
+					$oModuleModel = &getModel('module');
+					$module_config = $oModuleModel->getModuleConfig($module, $site_info->site_srl);
+					$module_config->skin = $val;
+					$oModuleController = &getController('module');
+					$oModuleController->insertModuleConfig($module, $module_config, $site_info->site_srl);
+				}
+			}
+
+            $theme_buff = sprintf(
+                '<?php '.
+                'if(!defined("__ZBXE__")) exit(); '.
+				'%s'.
+                '?>',
+				$theme_output
+            );
+            // Save File
+            FileHandler::writeFile($theme_file, $theme_buff);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+                $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminTheme');
+                header('location:'.$returnUrl);
+                return;
+            }
+            else return $output;
+		}
+
+		/**
+		 * @brief Toggle favorite
+		 **/
+		function procAdminToggleFavorite()
+		{
+			$siteSrl = Context::get('site_srl');
+			$moduleName = Context::get('module_name');
+
+			// check favorite exists
+			$oModel = &getAdminModel('admin');
+			$output = $oModel->isExistsFavorite($siteSrl, $moduleName);
+			if (!$output->toBool()) return $output;
+
+			// if exists, delete favorite
+			if ($output->get('result'))
+			{
+				$favoriteSrl = $output->get('favoriteSrl');
+				$output = $this->_deleteFavorite($favoriteSrl);
+				$result = 'off';
+			}
+
+			// if not exists, insert favorite
+			else
+			{
+				$output = $this->_insertFavorite($siteSrl, $moduleName);
+				$result = 'on';
+			}
+
+			if (!$output->toBool()) return $output;
+
+			$this->add('result', $result);
+			$this->setRedirectUrl(Context::get('error_return_url'));
+		}
+
+		/**
+		 * @brief enviroment gathering agreement
+		 **/
+		function procAdminEnviromentGatheringAgreement()
+		{
+			$isAgree = Context::get('is_agree');
+			if($isAgree == 'true') $_SESSION['enviroment_gather'] = 'Y';
+			else $_SESSION['enviroment_gather'] = 'N';
+
+			$redirectUrl = getUrl('', 'module', 'admin');
+			$this->setRedirectUrl($redirectUrl);
+		}
+
+		/**
+		 * @brief admin config update
+		 **/
+		function procAdminUpdateConfig()
+		{
+			$adminTitle = Context::get('adminTitle');
+            $file = $_FILES['adminLogo'];
+
+            $oModuleModel = &getModel('module');
+            $oAdminConfig = $oModuleModel->getModuleConfig('admin');
+
+			if($file['tmp_name'])
+			{
+				$target_path = 'files/attach/images/admin/';
+				FileHandler::makeDir($target_path);
+
+				// Get file information
+				list($width, $height, $type, $attrs) = @getimagesize($file['tmp_name']);
+				if($type == 3) $ext = 'png';
+				elseif($type == 2) $ext = 'jpg';
+				else $ext = 'gif';
+
+				$target_filename = sprintf('%s%s.%s.%s', $target_path, 'adminLogo', date('YmdHis'), $ext);
+				@move_uploaded_file($file['tmp_name'], $target_filename);
+
+				$oAdminConfig->adminLogo = $target_filename;
+			}
+			if($adminTitle) $oAdminConfig->adminTitle = strip_tags($adminTitle);
+			else unset($oAdminConfig->adminTitle);
+
+			if($oAdminConfig)
+			{
+				$oModuleController = &getController('module');
+				$oModuleController->insertModuleConfig('admin', $oAdminConfig);
+			}
+
+			$this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+                $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
+				$this->setRedirectUrl($returnUrl);
+                return;
+            }
+		}
+
+		/**
+		 * @brief admin logo delete
+		 **/
+		function procAdminDeleteLogo()
+		{
+            $oModuleModel = &getModel('module');
+            $oAdminConfig = $oModuleModel->getModuleConfig('admin');
+
+            FileHandler::removeFile(_XE_PATH_.$oAdminConfig->adminLogo);
+			unset($oAdminConfig->adminLogo);
+
+			$oModuleController = &getController('module');
+			$oModuleController->insertModuleConfig('admin', $oAdminConfig);
+
+			$this->setMessage('success_deleted', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+                $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
+				$this->setRedirectUrl($returnUrl);
+                return;
+            }
+		}
+
+		/**
+		 * @brief Insert favorite
+		 **/
+		function _insertFavorite($siteSrl, $module, $type = 'module')
+		{
+			$args->adminFavoriteSrl = getNextSequence();
+			$args->site_srl = $siteSrl;
+			$args->module = $module;
+			$args->type = $type;
+			$output = executeQuery('admin.insertFavorite', $args);
+			return $output;
+		}
+
+		/**
+		 * @brief Delete favorite
+		 **/
+		function _deleteFavorite($favoriteSrl)
+		{
+			$args->admin_favorite_srl = $favoriteSrl;
+			$output = executeQuery('admin.deleteFavorite', $args);
+			return $output;
+		}
+
+		/**
+		 * @brief Delete favorite
+		 **/
+		function _deleteAllFavorite()
+		{
+			$args = null;
+			$output = executeQuery('admin.deleteAllFavorite', $args);
+			return $output;
+		}
+
+		function procAdminRemoveIcons(){
+			$iconname = Context::get('iconname');
+			$file_exist = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			if($file_exist) {
+				@FileHandler::removeFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			} else {
+				return new Object(-1,'fail_to_delete');
+			}
+			$this->setMessage('success_deleted');
+		}
+    }
+?>
diff --git a/modules/admin/admin.admin.model.php b/modules/admin/admin.admin.model.php
index 501562271..bc32476da 100644
--- a/modules/admin/admin.admin.model.php
+++ b/modules/admin/admin.admin.model.php
@@ -3,6 +3,7 @@
     class adminAdminModel extends admin
     {
         var $pwd;
+		var $gnbLangBuffer;
 
         function getSFTPList()
         {
@@ -42,7 +43,7 @@
             set_time_limit(5);
             require_once(_XE_PATH_.'libs/ftp.class.php');
             $ftp_info =  Context::getRequestVars();
-            if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) 
+            if(!$ftp_info->ftp_user || !$ftp_info->ftp_password)
             {
                 return new Object(-1, 'msg_ftp_invalid_auth_info');
             }
@@ -54,8 +55,7 @@
                 $ftp_info->ftp_host = "127.0.0.1";
             }
 
-			if (!$ftp_info->ftp_port)
-			{
+			if (!$ftp_info->ftp_port || !is_numeric ($ftp_info->ftp_port)) {
 				$ftp_info->ftp_port = "21";
 			}
 
@@ -88,5 +88,360 @@
             }
             $this->add('list', $list);
         }
-    }
-?>
+
+		function getEnv($type='WORKING') {
+
+			 $skip = array(
+					 	'ext' => array('pcre','json','hash','dom','session','spl','standard','date','ctype','tokenizer','apache2handler','filter','posix','reflection','pdo')
+						,'module' => array('addon','admin','autoinstall', 'comment', 'communication', 'counter', 'document', 'editor', 'file', 'importer', 'install', 'integration_search', 'layout', 'member', 'menu', 'message', 'module', 'opage', 'page', 'point', 'poll', 'rss', 'session', 'spamfilter', 'tag',  'trackback', 'trash', 'widget')
+						,'addon' => array('autolink', 'blogapi', 'captcha', 'counter', 'member_communication', 'member_extra_info', 'mobile', 'openid_delegation_id', 'point_level_icon', 'resize_image' )
+					);
+
+			$info = array();
+			$info['type'] = ($type !='INSTALL' ? 'WORKING' : 'INSTALL');
+			$info['location'] = _XE_LOCATION_;
+			$info['package'] = _XE_PACKAGE_;
+			$info['host'] = $db_type->default_url ? $db_type->default_url : getFullUrl();
+			$info['app'] = $_SERVER['SERVER_SOFTWARE'];
+			$info['xe_version'] = __ZBXE_VERSION__;
+			$info['php'] = phpversion();
+
+			$db_info = Context::getDBInfo();
+			$info['db_type'] = Context::getDBType();
+			$info['use_rewrite'] = $db_info->use_rewrite;
+			$info['use_db_session'] = $db_info->use_db_session == 'Y' ?'Y':'N';
+			$info['use_ssl'] = $db_info->use_ssl;
+
+			$info['phpext'] = '';
+			foreach (get_loaded_extensions() as $ext) {
+				$ext = strtolower($ext);
+				if(in_array($ext, $skip['ext'])) continue;
+				$info['phpext'] .= '|'. $ext;
+			}
+			$info['phpext'] = substr($info['phpext'],1);
+
+			$info['module'] = '';
+			$oModuleModel = &getModel('module');
+			$module_list = $oModuleModel->getModuleList();
+			foreach($module_list as $module){
+				if(in_array($module->module, $skip['module'])) continue;
+				$info['module']  .= '|'.$module->module;
+			}
+			$info['module'] = substr($info['module'],1);
+
+			$info['addon'] = '';
+			$oAddonAdminModel = &getAdminModel('addon');
+			$addon_list = $oAddonAdminModel->getAddonList();
+			foreach($addon_list as $addon){
+				if(in_array($addon->addon, $skip['addon'])) continue;
+				$info['addon'] .= '|'.$addon->addon;
+			}
+			$info['addon'] = substr($info['addon'],1);
+
+			$param = '';
+			foreach($info as $k => $v){
+				if($v) $param .= sprintf('&%s=%s',$k,urlencode($v));
+			}
+			$param = substr($param, 1);
+
+			return $param;
+		}
+
+		function getThemeList(){
+			$path = _XE_PATH_.'themes';
+			$list = FileHandler::readDir($path);
+
+			$theme_info = array();
+			if(count($list) > 0){
+				foreach($list as $val){
+					$theme_info[$val] = $this->getThemeInfo($val);
+				}
+			}
+
+			return $theme_info;
+		}
+
+		function getThemeInfo($theme_name, $layout_list = null){
+			if ($GLOBALS['__ThemeInfo__'][$theme_name]) return $GLOBALS['__ThemeInfo__'][$theme_name];
+
+			$info_file = _XE_PATH_.'themes/'.$theme_name.'/conf/info.xml';
+            if(!file_exists($info_file)) return;
+
+            $oXmlParser = new XmlParser();
+            $_xml_obj = $oXmlParser->loadXmlFile($info_file);
+
+            if(!$_xml_obj->theme) return;
+            $xml_obj = $_xml_obj->theme;
+            if(!$_xml_obj->theme) return;
+
+            // 스킨이름
+			$theme_info->name = $theme_name;
+            $theme_info->title = $xml_obj->title->body;
+			$thumbnail = './themes/'.$theme_name.'/thumbnail.png';
+			$theme_info->thumbnail = (file_exists($thumbnail))?$thumbnail:null;
+			$theme_info->version = $xml_obj->version->body;
+			sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+			$theme_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+			$theme_info->description = $xml_obj->description->body;
+			$theme_info->path = './themes/'.$theme_name.'/';
+
+			if(!is_array($xml_obj->publisher)) $publisher_list[] = $xml_obj->publisher;
+			else $publisher_list = $xml_obj->publisher;
+
+			foreach($publisher_list as $publisher) {
+				unset($publisher_obj);
+				$publisher_obj->name = $publisher->name->body;
+				$publisher_obj->email_address = $publisher->attrs->email_address;
+				$publisher_obj->homepage = $publisher->attrs->link;
+				$theme_info->publisher[] = $publisher_obj;
+			}
+
+			$layout = $xml_obj->layout;
+			$layout_path = $layout->directory->attrs->path;
+			$layout_parse = explode('/',$layout_path);
+			switch($layout_parse[1]){
+				case 'themes' : {
+									$layout_info->name = $theme_name.'.'.$layout_parse[count($layout_parse)-1];
+									break;
+								}
+				case 'layouts' : {
+									$layout_info->name = $layout_parse[count($layout_parse)-1];
+									 break;
+								}
+			}
+			$layout_info->path = $layout_path;
+
+			$site_info = Context::get('site_module_info');
+			// check layout instance
+			$is_new_layout = true;
+			$oLayoutModel = &getModel('layout');
+			$layout_info_list = array();
+			$layout_list = $oLayoutModel->getLayoutList($site_info->site_srl);
+			if ($layout_list){
+				foreach($layout_list as $val){
+					if ($val->layout == $layout_info->name){
+						$is_new_layout = false;
+						$layout_info->layout_srl = $val->layout_srl;
+						break;
+					}
+				}
+			}
+
+			if ($is_new_layout){
+				$site_module_info = Context::get('site_module_info');
+				$args->site_srl = (int)$site_module_info->site_srl;
+				$args->layout_srl = getNextSequence();
+				$args->layout = $layout_info->name;
+				$args->title = $layout_info->name.'InTheme';
+				$args->layout_type = "P";
+				// Insert into the DB
+				$oLayoutAdminController = &getAdminController('layout');
+				$output = $oLayoutAdminController->insertLayout($args);
+				$layout_info->layout_srl = $args->layout_srl;
+			}
+
+			$theme_info->layout_info = $layout_info;
+
+			$skin_infos = $xml_obj->skininfos;
+			if(is_array($skin_infos->skininfo))$skin_list = $skin_infos->skininfo;
+			else $skin_list = array($skin_infos->skininfo);
+
+			$oModuleModel = &getModel('module');
+			$skins = array();
+			foreach($skin_list as $val){
+				unset($skin_info);
+				unset($skin_parse);
+				$skin_parse = explode('/',$val->directory->attrs->path);
+				switch($skin_parse[1]){
+					case 'themes' : {
+										$is_theme = true;
+										$module_name = $skin_parse[count($skin_parse)-1];
+										$skin_info->name = $theme_name.'.'.$module_name;
+										break;
+									}
+					case 'modules' : {
+										$is_theme = false;
+										 $module_name = $skin_parse[2];
+										 $skin_info->name = $skin_parse[count($skin_parse)-1];
+										 break;
+									}
+				}
+				$skin_info->path = $val->directory->attrs->path;
+				$skins[$module_name] = $skin_info;
+
+				if ($is_theme){
+					if (!$GLOBALS['__ThemeModuleSkin__'][$module_name]){
+						$GLOBALS['__ThemeModuleSkin__'][$module_name] = array();
+						$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'] = array();
+						$moduleInfo = $oModuleModel->getModuleInfoXml($module_name);
+						$GLOBALS['__ThemeModuleSkin__'][$module_name]['title'] = $moduleInfo->title;
+					}
+					$GLOBALS['__ThemeModuleSkin__'][$module_name]['skins'][$skin_info->name] = $oModuleModel->loadSkinInfo($skin_info->path, '', '');
+				}
+			}
+			$theme_info->skin_infos = $skins;
+
+			$GLOBALS['__ThemeInfo__'][$theme_name] = $theme_info;
+			return $theme_info;
+		}
+
+		function getModulesSkinList(){
+			if ($GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__']) return $GLOBALS['__ThemeModuleSkin__'];
+            $searched_list = FileHandler::readDir('./modules');
+            sort($searched_list);
+
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+
+			$exceptionModule = array('editor', 'poll', 'homepage', 'textyle');
+
+			$oModuleModel = &getModel('module');
+            foreach($searched_list as $val) {
+				$skin_list = $oModuleModel->getSkins('./modules/'.$val);
+
+				if (is_array($skin_list) && count($skin_list) > 0 && !in_array($val, $exceptionModule)){
+					if(!$GLOBALS['__ThemeModuleSkin__'][$val]){
+						$GLOBALS['__ThemeModuleSkin__'][$val] = array();
+						$moduleInfo = $oModuleModel->getModuleInfoXml($val);
+						$GLOBALS['__ThemeModuleSkin__'][$val]['title'] = $moduleInfo->title;
+						$GLOBALS['__ThemeModuleSkin__'][$val]['skins'] = array();
+					}
+					$GLOBALS['__ThemeModuleSkin__'][$val]['skins'] = array_merge($GLOBALS['__ThemeModuleSkin__'][$val]['skins'], $skin_list);
+				}
+			}
+			$GLOBALS['__ThemeModuleSkin__']['__IS_PARSE__'] = true;
+
+			return $GLOBALS['__ThemeModuleSkin__'];
+		}
+
+		function getAdminMenuLang()
+		{
+			$currentLang = Context::getLangType();
+			$cacheFile = sprintf('./files/cache/menu/admin_lang/adminMenu.%s.lang.php', $currentLang);
+
+            // Update if no cache file exists or it is older than xml file
+            if(!is_readable($cacheFile))
+			{
+				$oModuleModel = &getModel('module');
+				$installed_module_list = $oModuleModel->getModulesXmlInfo();
+
+				$this->gnbLangBuffer = '<?php ';
+				foreach($installed_module_list AS $key=>$value)
+				{
+					$moduleActionInfo = $oModuleModel->getModuleActionXml($value->module);
+					if(is_object($moduleActionInfo->menu))
+					{
+						foreach($moduleActionInfo->menu AS $key2=>$value2)
+						{
+							$lang->menu_gnb_sub[$key2] = $value2->title;
+							$this->gnbLangBuffer .=sprintf('$lang->menu_gnb_sub[\'%s\'] = \'%s\';', $key2, $value2->title);
+						}
+					}
+				}
+				$this->gnbLangBuffer .= ' ?>';
+				FileHandler::writeFile($cacheFile, $this->gnbLangBuffer);
+			}
+			else include $cacheFile;
+
+			return $lang->menu_gnb_sub;
+		}
+
+		/**
+		 * @brief Get admin favorite list
+		 **/
+		function getFavoriteList($siteSrl = 0, $isGetModuleInfo = false)
+		{
+			$args->site_srl = $siteSrl;
+			$output = executeQueryArray('admin.getFavoriteList', $args);
+			if (!$output->toBool()) return $output;
+			if (!$output->data) return new Object();
+
+			if($isGetModuleInfo && is_array($output->data))
+			{
+				$oModuleModel = &getModel('module');
+				foreach($output->data AS $key=>$value)
+				{
+					$moduleInfo = $oModuleModel->getModuleInfoXml($value->module);
+					$output->data[$key]->admin_index_act = $moduleInfo->admin_index_act;
+					$output->data[$key]->title = $moduleInfo->title;
+				}
+			}
+
+			$returnObject = new Object();
+			$returnObject->add('favoriteList', $output->data);
+			return $returnObject;
+		}
+
+		/**
+		 * @brief Check available insert favorite
+		 **/
+		function isExistsFavorite($siteSrl, $module)
+		{
+			$args->site_srl = $siteSrl;
+			$args->module = $module;
+			$output = executeQuery('admin.getFavorite', $args);
+			if (!$output->toBool()) return $output;
+
+			$returnObject = new Object();
+			if ($output->data)
+			{
+				$returnObject->add('result', true);
+				$returnObject->add('favoriteSrl', $output->data->admin_favorite_srl);
+			}
+			else
+			{
+				$returnObject->add('result', false);
+			}
+
+			return $returnObject;
+		}
+
+        /**
+         * @brief Return site list
+         **/
+		function getSiteAllList()
+		{
+			if(Context::get('domain')) $args->domain = Context::get('domain');
+			$columnList = array('domain', 'site_srl');
+
+			$siteList = array();
+			$output = executeQueryArray('admin.getSiteAllList', $args, $columnList);
+			if($output->toBool()) $siteList = $output->data;
+
+			$this->add('site_list', $siteList);
+		}
+
+        /**
+         * @brief Return site count
+         **/
+		function getSiteCountByDate($date = '')
+		{
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+
+			$output = executeQuery('admin.getSiteCountByDate', $args);
+			if(!$output->toBool()) return 0;
+
+			return $output->data->count;
+		}
+
+		function getFaviconUrl()
+		{
+			return $this->iconUrlCheck('favicon.ico','faviconSample.png');
+		}
+
+		function getMobileIconUrl()
+		{
+			return $this->iconUrlCheck('mobicon.png','mobiconSample.png');
+		}
+
+		function iconUrlCheck($iconname,$default_icon_name)
+		{
+			$file_exsit = FileHandler::readFile(_XE_PATH_.'files/attach/xeicon/'.$iconname);
+			if(!$file_exsit){
+				$icon_url = './modules/admin/tpl/img/'.$default_icon_name	;
+			} else {
+				$icon_url = $db_info->default_url.'files/attach/xeicon/'.$iconname;
+			}
+			return $icon_url;
+		}
+	}
diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 8e467dd5c..634659c4b 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -1,363 +1,499 @@
-<?php
-    /**
-     * @class  adminAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  admin view class of admin module
-     **/
-
-    class adminAdminView extends admin {
-
-        /**
-         * @brief Initilization
-         * @return none
-         **/
-        function init() {
-
-            // forbit access if the user is not an administrator
-            $oMemberModel = &getModel('member');
-            $logged_info = $oMemberModel->getLoggedInfo();
-            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
-
-            // change into administration layout
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setLayoutPath($this->getTemplatePath());
-            $this->setLayoutFile('layout.html');
-
-			$this->loadSideBar();
-
-            // Retrieve the list of installed modules
-
-            $db_info = Context::getDBInfo();
-
-            Context::set('time_zone_list', $GLOBALS['time_zone']);
-            Context::set('time_zone', $GLOBALS['_time_zone']);
-            Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
-            Context::set('use_sso', $db_info->use_sso=='Y'?'Y':'N');
-            Context::set('use_spaceremover', $db_info->use_spaceremover?$db_info->use_spaceremover:'Y');
-            Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N');
-            Context::set('use_db_session', $db_info->use_db_session=='N'?'N':'Y');
-            Context::set('use_mobile_view', $db_info->use_mobile_view =='Y'?'Y':'N');
-            Context::set('use_ssl', $db_info->use_ssl?$db_info->use_ssl:"none");
-            if($db_info->http_port) Context::set('http_port', $db_info->http_port);
-            if($db_info->https_port) Context::set('https_port', $db_info->https_port);
-
-        }
-
-		function loadSideBar()
-		{
-            $oModuleModel = &getModel('module');
-            $installed_module_list = $oModuleModel->getModulesXmlInfo();
-
-            $installed_modules = $package_modules = array();
-            $package_idx = 0;
-            foreach($installed_module_list as $key => $val) {
-				if($val->category == 'migration') $val->category = 'system';
-				if($val->category == 'interlock') $val->category = 'accessory';
-				if($val->category == 'statistics') $val->category = 'accessory';
-
-                if($val->module == 'admin' || !$val->admin_index_act) continue;
-                // get action information
-                $action_spec = $oModuleModel->getModuleActionXml($val->module);
-                $actions = array();
-                if($action_spec->default_index_act) $actions[] = $action_spec->default_index_act;
-                if($action_spec->admin_index_act) $actions[] = $action_spec->admin_index_act;
-                if($action_spec->action) foreach($action_spec->action as $k => $v) $actions[] = $k;
-
-                $obj = null;
-                $obj->category = $val->category;
-                $obj->title = $val->title;
-                $obj->description = $val->description;
-                $obj->index_act = $val->admin_index_act;
-                if(in_array(Context::get('act'), $actions)) $obj->selected = true;
-
-                // Packages
-                if($val->category == 'package') {
-                    if($package_idx == 0) $obj->position = "first";
-                    else $obj->position = "mid";
-                    $package_modules[] = $obj;
-                    $package_idx ++;
-                    if($obj->selected) Context::set('package_selected',true);
-                // Modules
-                } else {
-                    $installed_modules[] = $obj;
-                }
-                if($obj->selected) {
-                    Context::set('selected_module_category', $val->category);
-                    Context::set('selected_module_info', $val);
-                }
-            }
-            if(count($package_modules)) $package_modules[count($package_modules)-1]->position = 'end';
-            Context::set('package_modules', $package_modules);
-            Context::set('installed_modules', $installed_modules);
-            Context::setBrowserTitle("XE Admin Page");
-
-			// add javascript tooltip plugin - gony
-			Context::loadJavascriptPlugin('qtip');
-			Context::loadJavascriptPlugin('watchinput');
-
-			$security = new Security();
-			$security->encodeHTML('selected_module_info.', 'selected_module_info.author..', 'package_modules..', 'installed_modules..');
-		}
-
-        /**
-         * @brief Display main administration page
-         * @return none
-         **/
-        function dispAdminIndex() {
-            //Retrieve recent news and set them into context
-            $newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php", Context::getLangType());
-            $cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_,Context::getLangType());
-            if(!file_exists($cache_file) || filemtime($cache_file)+ 60*60 < time()) {
-                // Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
-                // Ensure to access the administration page even though news cannot be displayed
-                FileHandler::writeFile($cache_file,'');
-                FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL'=>getFullUrl('')));
-            }
-
-            if(file_exists($cache_file)) {
-                $oXml = new XmlParser();
-                $buff = $oXml->parse(FileHandler::readFile($cache_file));
-
-                $item = $buff->zbxe_news->item;
-                if($item) {
-                    if(!is_array($item)) $item = array($item);
-
-                    foreach($item as $key => $val) {
-                        $obj = null;
-                        $obj->title = $val->body;
-                        $obj->date = $val->attrs->date;
-                        $obj->url = $val->attrs->url;
-                        $news[] = $obj;
-                    }
-                    Context::set('news', $news);
-                }
-                Context::set('released_version', $buff->zbxe_news->attrs->released_version);
-                Context::set('download_link', $buff->zbxe_news->attrs->download_link);
-            }
-
-            // DB Information
-            $db_info = Context::getDBInfo();
-            Context::set('selected_lang', $db_info->lang_type);
-
-            // Current Version and Installed Path
-            Context::set('current_version', __ZBXE_VERSION__);
-            Context::set('installed_path', realpath('./'));
-
-            // Get list of modules
-            $oModuleModel = &getModel('module');
-            $module_list = $oModuleModel->getModuleList();
-            Context::set('module_list', $module_list);
-
-            // Get list of addons
-            $oAddonModel = &getAdminModel('addon');
-            $addon_list = $oAddonModel->getAddonList();
-            Context::set('addon_list', $addon_list);
-
-            // 방문자수
-            $time = time();
-            $w = date("D");
-            while(date("D",$time) != "Sat") {
-                $time += 60*60*24;
-            }
-            $end_time = $time;
-            $end_date = date("Ymd",$time);
-            $time -= 60*60*24;
-            while(date("D",$time)!="Sun") {
-                $thisWeek[] = date("Ymd",$time);
-                $time -= 60*60*24;
-            }
-            $start_time = $time;
-            $start_date = date("Ymd",$time-60*60*24*7);
-
-            $args->start_date = $start_date;
-            $args->end_date = $end_date;
-            $output = executeQueryArray('admin.getVisitors', $args);
-            if(count($output->data)) {
-                foreach($output->data as $key => $val) {
-                    $visitors[$val->regdate] = $val->unique_visitor;
-                }
-            }
-            $output = executeQueryArray('admin.getSiteVisitors', $args);
-            if(count($output->data)) {
-                foreach($output->data as $key => $val) {
-                    $visitors[$val->regdate] += $val->unique_visitor;
-                }
-            }
-            $status->week_max = 0;
-            if(count($visitors)) {
-                foreach($visitors as $key => $val) {
-                    if($val>$status->week_max) $status->week_max = $val;
-                }
-            }
-
-            for($i=$start_time;$i<=$end_time;$i+=60*60*24) {
-				$status->thisWeekSum += $visitors[date("Ymd",$i)];
-                $status->week[date("Y.m.d",$i)]->this = (int)$visitors[date("Ymd",$i)];
-                $status->week[date("Y.m.d",$i)]->last = (int)$visitors[date("Ymd",$i-60*60*24*7)];
-            }
-
-            // 각종 통계 정보를 구함
-            $output = executeQuery('admin.getTotalVisitors');
-            $status->total_visitor = $output->data->count;
-            $output = executeQuery('admin.getTotalSiteVisitors');
-            $status->total_visitor += $output->data->count;
-            $status->visitor = $visitors[date("Ymd")];
-
-            // 오늘의 댓글 수
-            $args->regdate = date("Ymd");
-            $output = executeQuery('admin.getTodayCommentCount', $args);
-            $status->comment_count = $output->data->count;
-
-            // 오늘의 엮인글 수
-            $args->regdate = date("Ymd");
-            $output = executeQuery('admin.getTodayTrackbackCount', $args);
-            $status->trackback_count = $output->data->count;
-            Context::set('status', $status);
-
-            // Get statistics
-            $args->date = date("Ymd000000", time()-60*60*24);
-            $today = date("Ymd");
-
-            // Member Status
-            $output = executeQueryArray("admin.getMemberStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->member->today = $var->count;
-                    } else {
-                        $status->member->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getMemberCount", $args);
-            $status->member->total = $output->data->count;
-
-            // Document Status
-            $output = executeQueryArray("admin.getDocumentStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->document->today = $var->count;
-                    } else {
-                        $status->document->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getDocumentCount", $args);
-            $status->document->total = $output->data->count;
-
-            // Comment Status
-            $output = executeQueryArray("admin.getCommentStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->comment->today = $var->count;
-                    } else {
-                        $status->comment->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getCommentCount", $args);
-            $status->comment->total = $output->data->count;
-
-            // Trackback Status
-            $output = executeQueryArray("admin.getTrackbackStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->trackback->today = $var->count;
-                    } else {
-                        $status->trackback->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getTrackbackCount", $args);
-            $status->trackback->total = $output->data->count;
-
-            // Attached files Status
-            $output = executeQueryArray("admin.getFileStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->file->today = $var->count;
-                    } else {
-                        $status->file->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getFileCount", $args);
-            $status->file->total = $output->data->count;
-
-            // Reported documents Status
-            $output = executeQueryArray("admin.getDocumentDeclaredStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->documentDeclared->today = $var->count;
-                    } else {
-                        $status->documentDeclared->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getDocumentDeclaredCount", $args);
-            $status->documentDeclared->total = $output->data->count;
-
-            // Reported comments Status
-            $output = executeQueryArray("admin.getCommentDeclaredStatus", $args);
-            if($output->data) {
-                foreach($output->data as $var) {
-                    if($var->date == $today) {
-                        $status->commentDeclared->today = $var->count;
-                    } else {
-                        $status->commentDeclared->yesterday = $var->count;
-                    }
-                }
-            }
-            $output = executeQuery("admin.getCommentDeclaredCount", $args);
-            $status->commentDeclared->total = $output->data->count;
-
-            $site_args->site_srl = 0;
-            $output = executeQuery('module.getSiteInfo', $site_args);
-
-            Context::set('start_module', $output->data);
-
-            Context::set('status', $status);
-            Context::set('layout','none');
-            $this->setTemplateFile('index');
-
-			$security = new Security();
-			$security->encodeHTML('news..', 'released_version', 'download_link', 'selected_lang', 'module_list..', 'module_list..author..', 'addon_list..', 'addon_list..author..', 'start_module.');
-        }
-
-        /**
-         * @brief Display Configuration(settings) page
-         * @return none
-         **/
-        function dispAdminConfig() {
-            $db_info = Context::getDBInfo();
-
-            Context::set('sftp_support', function_exists(ssh2_sftp));
-
-            Context::set('selected_lang', $db_info->lang_type);
-
-            Context::set('default_url', $db_info->default_url);
-
-            Context::set('langs', Context::loadLangSupported());
-
-            Context::set('lang_selected', Context::loadLangSelected());
-
-			Context::set('use_mobile_view', $db_info->use_mobile_view=="Y"?'Y':'N');
-
-            $ftp_info = Context::getFTPInfo();
-            Context::set('ftp_info', $ftp_info);
-
-            $site_args->site_srl = 0;
-            $output = executeQuery('module.getSiteInfo', $site_args);
-            Context::set('start_module', $output->data);
-
-            Context::set('pwd',$pwd);
-            Context::set('layout','none');
-            $this->setTemplateFile('config');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  adminAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief  admin view class of admin module
+     **/
+
+    class adminAdminView extends admin {
+
+		var $layout_list;
+		var $easyinstallCheckFile = './files/env/easyinstall_last';
+
+        /**
+         * @brief Initilization
+         * @return none
+         **/
+        function init() {
+            // forbit access if the user is not an administrator
+            $oMemberModel = &getModel('member');
+            $logged_info = $oMemberModel->getLoggedInfo();
+            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
+
+            // change into administration layout
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setLayoutPath($this->getTemplatePath());
+            $this->setLayoutFile('layout.html');
+
+			$this->makeGnbUrl();
+
+            // Retrieve the list of installed modules
+
+            $db_info = Context::getDBInfo();
+
+            Context::set('time_zone_list', $GLOBALS['time_zone']);
+            Context::set('time_zone', $GLOBALS['_time_zone']);
+            Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
+            Context::set('use_sso', $db_info->use_sso=='Y'?'Y':'N');
+            Context::set('use_html5', $db_info->use_html5=='Y'?'Y':'N');
+            Context::set('use_spaceremover', $db_info->use_spaceremover?$db_info->use_spaceremover:'Y');//not use
+            Context::set('qmail_compatibility', $db_info->qmail_compatibility=='Y'?'Y':'N');
+            Context::set('use_db_session', $db_info->use_db_session=='N'?'N':'Y');
+            Context::set('use_mobile_view', $db_info->use_mobile_view =='Y'?'Y':'N');
+            Context::set('use_ssl', $db_info->use_ssl?$db_info->use_ssl:"none");
+			Context::set('use_cdn', $db_info->use_cdn?$db_info->use_cdn:"none");
+            if($db_info->http_port) Context::set('http_port', $db_info->http_port);
+            if($db_info->https_port) Context::set('https_port', $db_info->https_port);
+
+			$this->showSendEnv();
+			$this->checkEasyinstall();
+        }
+
+		function checkEasyinstall()
+		{
+			$lastTime = (int)FileHandler::readFile($this->easyinstallCheckFile);
+			if ($lastTime > time() - 60*60*24*30) return;
+
+			$oAutoinstallModel = &getModel('autoinstall');
+			$params = array();
+			$params["act"] = "getResourceapiLastupdate";
+			$body = XmlGenerater::generate($params);
+			$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
+			$xml_lUpdate = new XmlParser();
+			$lUpdateDoc = $xml_lUpdate->parse($buff);
+			$updateDate = $lUpdateDoc->response->updatedate->body;
+
+			if (!$updateDate)
+			{
+				$this->_markingCheckEasyinstall();
+				return;
+			}
+
+			$item = $oAutoinstallModel->getLatestPackage();
+			if(!$item || $item->updatedate < $updateDate)
+			{
+				$oController = &getAdminController('autoinstall');
+				$oController->_updateinfo();
+			}
+			$this->_markingCheckEasyinstall();
+		}
+
+		function _markingCheckEasyinstall()
+		{
+			$currentTime = time();
+			FileHandler::writeFile($this->easyinstallCheckFile, $currentTime);
+		}
+
+		function makeGnbUrl($module = 'admin')
+		{
+			global $lang;
+
+			$oAdminAdminModel   = &getAdminModel('admin');
+			$lang->menu_gnb_sub = $oAdminAdminModel->getAdminMenuLang();
+
+			$oMenuAdminModel = &getAdminModel('menu');
+			$menu_info = $oMenuAdminModel->getMenuByTitle('__XE_ADMIN__');
+			Context::set('admin_menu_srl', $menu_info->menu_srl);
+
+			if(!is_readable($menu_info->php_file)) return;
+
+			include $menu_info->php_file;
+
+            $oModuleModel = &getModel('module');
+			$moduleActionInfo = $oModuleModel->getModuleActionXml($module);
+
+			$currentAct   = Context::get('act');
+			$subMenuTitle = '';
+			foreach((array)$moduleActionInfo->menu as $key=>$value)
+			{
+				if(isset($value->acts) && is_array($value->acts) && in_array($currentAct, $value->acts))
+				{
+					$subMenuTitle = $value->title;
+					break;
+				}
+			}
+
+			$parentSrl = 0;
+			foreach((array)$menu->list as $parentKey=>$parentMenu)
+			{
+				if(!is_array($parentMenu['list']) || !count($parentMenu['list'])) continue;
+				if($parentMenu['href'] == '#' && count($parentMenu['list'])) {
+					$firstChild = current($parentMenu['list']);
+ 					$menu->list[$parentKey]['href'] = $firstChild['href'];
+				}
+
+				foreach($parentMenu['list'] as $childKey=>$childMenu)
+				{
+					if($subMenuTitle == $childMenu['text'])
+					{
+						$parentSrl = $childMenu['parent_srl'];
+						break;
+					}
+				}
+			}
+
+			// Admin logo, title setup
+			$objConfig = $oModuleModel->getModuleConfig('admin');
+			$gnbTitleInfo->adminTitle = $objConfig->adminTitle ? $objConfig->adminTitle:'XE Admin';
+			$gnbTitleInfo->adminLogo  = $objConfig->adminLogo ? $objConfig->adminLogo:'modules/admin/tpl/img/xe.h1.png';
+
+			$browserTitle = ($subMenuTitle ? $subMenuTitle : 'Dashboard').' - '.$gnbTitleInfo->adminTitle;
+
+			// Get list of favorite
+			$oAdminAdminModel = &getAdminModel('admin');
+			$output = $oAdminAdminModel->getFavoriteList(0, true);
+            Context::set('favorite_list', $output->get('favoriteList'));
+
+			Context::set('subMenuTitle', $subMenuTitle);
+			Context::set('gnbUrlList',   $menu->list);
+			Context::set('parentSrl',    $parentSrl);
+			Context::set('gnb_title_info', $gnbTitleInfo);
+            Context::setBrowserTitle($browserTitle);
+		}
+
+		function loadSideBar()
+		{
+            $oModuleModel = &getModel('module');
+            $installed_module_list = $oModuleModel->getModulesXmlInfo();
+
+            $installed_modules = $package_modules = array();
+            $package_idx = 0;
+            foreach($installed_module_list as $key => $val) {
+				if($val->category == 'migration') $val->category = 'system';
+				if($val->category == 'interlock') $val->category = 'accessory';
+				if($val->category == 'statistics') $val->category = 'accessory';
+
+                if($val->module == 'admin' || !$val->admin_index_act) continue;
+                // get action information
+                $action_spec = $oModuleModel->getModuleActionXml($val->module);
+                $actions = array();
+                if($action_spec->default_index_act) $actions[] = $action_spec->default_index_act;
+                if($action_spec->admin_index_act) $actions[] = $action_spec->admin_index_act;
+                if($action_spec->action) foreach($action_spec->action as $k => $v) $actions[] = $k;
+
+                $obj = null;
+                $obj->category = $val->category;
+                $obj->title = $val->title;
+                $obj->description = $val->description;
+                $obj->index_act = $val->admin_index_act;
+                if(in_array(Context::get('act'), $actions)) $obj->selected = true;
+
+                // Packages
+                if($val->category == 'package') {
+                    if($package_idx == 0) $obj->position = "first";
+                    else $obj->position = "mid";
+                    $package_modules[] = $obj;
+                    $package_idx ++;
+                    if($obj->selected) Context::set('package_selected',true);
+                // Modules
+                } else {
+                    $installed_modules[] = $obj;
+                }
+                if($obj->selected) {
+                    Context::set('selected_module_category', $val->category);
+                    Context::set('selected_module_info', $val);
+                }
+            }
+            if(count($package_modules)) $package_modules[count($package_modules)-1]->position = 'end';
+            Context::set('package_modules', $package_modules);
+            Context::set('installed_modules', $installed_modules);
+            Context::setBrowserTitle("XE Admin Page");
+
+			// add javascript tooltip plugin - gony
+			Context::loadJavascriptPlugin('qtip');
+			Context::loadJavascriptPlugin('watchinput');
+
+			$security = new Security();
+			$security->encodeHTML('selected_module_info.', 'selected_module_info.author..', 'package_modules..', 'installed_modules..');
+		}
+
+        /**
+         * @brief Display Super Admin Dashboard
+         * @return none
+         **/
+        function dispAdminIndex() {
+            // Get statistics
+            $args->date = date("Ymd000000", time()-60*60*24);
+            $today = date("Ymd");
+
+            // Member Status
+			$oMemberAdminModel = &getAdminModel('member');
+			$status->member->todayCount = $oMemberAdminModel->getMemberCountByDate($today);
+			$status->member->totalCount = $oMemberAdminModel->getMemberCountByDate();
+
+            // Document Status
+			$oDocumentAdminModel = &getAdminModel('document');
+			$statusList = array('PUBLIC', 'SECRET');
+			$status->document->todayCount = $oDocumentAdminModel->getDocumentCountByDate($today, array(), $statusList);
+			$status->document->totalCount = $oDocumentAdminModel->getDocumentCountByDate('', array(), $statusList);
+
+            // Comment Status
+			$oCommentModel = &getModel('comment');
+			$status->comment->todayCount = $oCommentModel->getCommentCountByDate($today);
+			$status->comment->totalCount = $oCommentModel->getCommentCountByDate();
+
+            // Trackback Status
+			$oTrackbackAdminModel = &getAdminModel('trackback');
+			$status->trackback->todayCount = $oTrackbackAdminModel->getTrackbackCountByDate($today);
+			$status->trackback->totalCount = $oTrackbackAdminModel->getTrackbackCountByDate();
+
+            // Attached files Status
+			$oFileAdminModel = &getAdminModel('file');
+			$status->file->todayCount = $oFileAdminModel->getFilesCountByDate($today);
+			$status->file->totalCount = $oFileAdminModel->getFilesCountByDate();
+
+            Context::set('status', $status);
+
+            // Latest Document
+			$oDocumentModel = &getModel('document');
+			$columnList = array('document_srl', 'module_srl', 'category_srl', 'title', 'nick_name', 'member_srl');
+			$args->list_count = 5;;
+			$output = $oDocumentModel->getDocumentList($args, false, false, $columnList);
+            Context::set('latestDocumentList', $output->data);
+			unset($args, $output, $columnList);
+
+			// Latest Comment
+			$oCommentModel = &getModel('comment');
+			$columnList = array('comment_srl', 'module_srl', 'document_srl', 'content', 'nick_name', 'member_srl');
+			$args->list_count = 5;
+			$output = $oCommentModel->getNewestCommentList($args, $columnList);
+			if(is_array($output))
+			{
+				foreach($output AS $key=>$value)
+				{
+					$value->content = strip_tags($value->content);
+				}
+			}
+            Context::set('latestCommentList', $output);
+			unset($args, $output, $columnList);
+
+			//Latest Trackback
+			$oTrackbackModel = &getModel('trackback');
+			$columnList = array();
+			$args->list_count = 5;
+			$output =$oTrackbackModel->getNewestTrackbackList($args);
+            Context::set('latestTrackbackList', $output->data);
+			unset($args, $output, $columnList);
+
+            //Retrieve recent news and set them into context
+            $newest_news_url = sprintf("http://news.xpressengine.com/%s/news.php?version=%s&package=%s", _XE_LOCATION_, __ZBXE_VERSION__, _XE_PACKAGE_);
+            $cache_file = sprintf("%sfiles/cache/newest_news.%s.cache.php", _XE_PATH_, _XE_LOCATION_);
+            if(!file_exists($cache_file) || filemtime($cache_file)+ 60*60 < time()) {
+                // Considering if data cannot be retrieved due to network problem, modify filemtime to prevent trying to reload again when refreshing administration page
+                // Ensure to access the administration page even though news cannot be displayed
+                FileHandler::writeFile($cache_file,'');
+                FileHandler::getRemoteFile($newest_news_url, $cache_file, null, 1, 'GET', 'text/html', array('REQUESTURL'=>getFullUrl('')));
+            }
+
+            if(file_exists($cache_file)) {
+                $oXml = new XmlParser();
+                $buff = $oXml->parse(FileHandler::readFile($cache_file));
+
+                $item = $buff->zbxe_news->item;
+                if($item) {
+                    if(!is_array($item)) $item = array($item);
+
+                    foreach($item as $key => $val) {
+                        $obj = null;
+                        $obj->title = $val->body;
+                        $obj->date = $val->attrs->date;
+                        $obj->url = $val->attrs->url;
+                        $news[] = $obj;
+                    }
+                    Context::set('news', $news);
+                }
+                Context::set('released_version', $buff->zbxe_news->attrs->released_version);
+                Context::set('download_link', $buff->zbxe_news->attrs->download_link);
+            }
+
+            // Get list of modules
+            $oModuleModel = &getModel('module');
+            $module_list = $oModuleModel->getModuleList();
+			if(is_array($module_list))
+			{
+				$isUpdated = false;
+				foreach($module_list AS $key=>$value)
+				{
+					if($value->need_install || $value->need_update)
+						$isUpdated = true;
+				}
+			}
+            Context::set('module_list', $module_list);
+            Context::set('isUpdated', $isUpdated);
+
+			// gathering enviroment check
+			$path = FileHandler::getRealPath('./files/env/'.__ZBXE_VERSION__);
+			$isEnviromentGatheringAgreement = false;
+			if(file_exists($path)) $isEnviromentGatheringAgreement = true;
+			Context::set('isEnviromentGatheringAgreement', $isEnviromentGatheringAgreement);
+            Context::set('layout','none');
+
+            $this->setTemplateFile('index');
+        }
+
+        /**
+         * @brief Display Configuration(settings) page
+         * @return none
+         **/
+        function dispAdminConfigGeneral() {
+		    Context::loadLang('modules/install/lang');
+
+            $db_info = Context::getDBInfo();
+
+			Context::set('sftp_support', function_exists(ssh2_sftp));
+
+            Context::set('selected_lang', $db_info->lang_type);
+
+			Context::set('default_url', $db_info->default_url);
+            Context::set('langs', Context::loadLangSupported());
+
+            Context::set('lang_selected', Context::loadLangSelected());
+
+			$admin_ip_list = preg_replace("/[,]+/","\r\n",$db_info->admin_ip_list);
+            Context::set('admin_ip_list', $admin_ip_list);
+
+			$oAdminModel = &getAdminModel('admin');
+			$favicon_url = $oAdminModel->getFaviconUrl();
+			$mobicon_url = $oAdminModel->getMobileIconUrl();
+            Context::set('favicon_url', $favicon_url);
+			Context::set('mobicon_url', $mobicon_url);
+
+			$oDocumentModel = &getModel('document');
+			$config = $oDocumentModel->getDocumentConfig();
+       		Context::set('thumbnail_type',$config->thumbnail_type);
+			
+			Context::set('IP',$_SERVER['REMOTE_ADDR']);
+			
+			$oModuleModel = &getModel('module');
+			$config = $oModuleModel->getModuleConfig('module');
+       		Context::set('htmlFooter',$config->htmlFooter);
+
+
+			$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');
+			$start_module = $oModuleModel->getSiteInfo(0, $columnList);
+            Context::set('start_module', $start_module);
+
+            Context::set('pwd',$pwd);
+            $this->setTemplateFile('config_general');
+
+			$security = new Security();
+			$security->encodeHTML('news..', 'released_version', 'download_link', 'selected_lang', 'module_list..', 'module_list..author..', 'addon_list..', 'addon_list..author..', 'start_module.');
+        }
+
+        /**
+         * @brief Display Configuration(settings) page
+         * @return none
+         **/
+        function dispAdminConfigFtp() {
+		    Context::loadLang('modules/install/lang');
+
+            $ftp_info = Context::getFTPInfo();
+            Context::set('ftp_info', $ftp_info);
+
+            $this->setTemplateFile('config_ftp');
+
+//			$security = new Security();
+//			$security->encodeHTML('ftp_info..');
+
+        }
+
+		/**
+         * @brief Display Admin Menu Configuration(settings) page
+         * @return none
+         **/
+		function dispAdminSetup()
+		{
+			$oModuleModel = &getModel('module');
+			$configObject = $oModuleModel->getModuleConfig('admin');
+
+			$oMenuAdminModel = &getAdminModel('menu');
+			$output = $oMenuAdminModel->getMenuByTitle('__XE_ADMIN__');
+
+			Context::set('menu_srl', $output->menu_srl);
+			Context::set('menu_title', $output->title);
+			Context::set('config_object', $configObject);
+            $this->setTemplateFile('admin_setup');
+		}
+
+
+		function showSendEnv() {
+			if(Context::getResponseMethod() != 'HTML') return;
+
+			$server = 'http://collect.xpressengine.com/env/img.php?';
+			$path = './files/env/';
+			$install_env = $path . 'install';
+
+			if(file_exists(FileHandler::getRealPath($install_env))) {
+				$oAdminAdminModel = &getAdminModel('admin');
+				$params = $oAdminAdminModel->getEnv('INSTALL');
+				$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
+				Context::addHtmlFooter($img);
+
+				FileHandler::removeDir($path);
+				FileHandler::writeFile($path.__ZBXE_VERSION__,'1');
+
+			}
+			else if(isset($_SESSION['enviroment_gather']) && !file_exists(FileHandler::getRealPath($path.__ZBXE_VERSION__)))
+			{
+				if($_SESSION['enviroment_gather']=='Y')
+				{
+					$oAdminAdminModel = &getAdminModel('admin');
+					$params = $oAdminAdminModel->getEnv();
+					$img = sprintf('<img src="%s" alt="" style="height:0px;width:0px" />', $server.$params);
+					Context::addHtmlFooter($img);
+				}
+
+				FileHandler::removeDir($path);
+				FileHandler::writeFile($path.__ZBXE_VERSION__,'1');
+				unset($_SESSION['enviroment_gather']);
+			}
+		}
+
+		function dispAdminTheme(){
+			// choice theme file
+			$theme_file = _XE_PATH_.'files/theme/theme_info.php';
+			if(is_readable($theme_file)){
+				@include($theme_file);
+				Context::set('current_layout', $theme_info->layout);
+				Context::set('theme_info', $theme_info);
+			}
+			else{
+				$oModuleModel = &getModel('module');
+				$default_mid = $oModuleModel->getDefaultMid();
+				Context::set('current_layout', $default_mid->layout_srl);
+			}
+
+			// layout list
+			$oLayoutModel = &getModel('layout');
+			// theme 정보 읽기
+
+			$oAdminModel = &getAdminModel('admin');
+			$theme_list = $oAdminModel->getThemeList();
+			$layouts = $oLayoutModel->getLayoutList(0);
+			$layout_list = array();
+			if (is_array($layouts)){
+				foreach($layouts as $val){
+					unset($layout_info);
+					$layout_info = $oLayoutModel->getLayout($val->layout_srl);
+					if (!$layout_info) continue;
+					$layout_parse = explode('.', $layout_info->layout);
+					if (count($layout_parse) == 2){
+						$thumb_path = sprintf('./themes/%s/layout/%s/thumbnail.png', $layout_parse[0], $layout_parse[1]);
+					}
+					else{
+						$thumb_path = './layouts/'.$layout_info->layout.'/thumbnail.png';
+					}
+					$layout_info->thumbnail = (is_readable($thumb_path))?$thumb_path:null;
+					$layout_list[] = $layout_info;
+				}
+			}
+			Context::set('theme_list', $theme_list);
+			Context::set('layout_list', $layout_list);
+
+			// 설치된module 정보 가져오기
+			$module_list = $oAdminModel->getModulesSkinList();
+			Context::set('module_list', $module_list);
+
+			$this->setTemplateFile('theme');
+		}
+    }
diff --git a/modules/admin/admin.class.php b/modules/admin/admin.class.php
index 24e43df67..8b106134d 100644
--- a/modules/admin/admin.class.php
+++ b/modules/admin/admin.class.php
@@ -1,59 +1,285 @@
-<?php
-    /**
-     * @class  admin
-     * @author NHN (developers@xpressengine.com)
-     * @brief  base class of admin module 
-     **/
-
-    class admin extends ModuleObject {
-
-        /**
-         * @brief install admin module 
-         * @return new Object
-         **/
-        function moduleInstall() {
-            return new Object();
-        }
-
-        /**
-         * @brief if update is necessary it returns true
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief update module 
-         * @return new Object
-         **/
-        function moduleUpdate() {
-            return new Object();
-        }
-
-        /**
-         * @brief regenerate cache file
-         * @return none
-         **/
-        function recompileCache() {
-
-            // remove compiled templates
-            FileHandler::removeFilesInDir("./files/cache/template_compiled");
-
-            // remove optimized files 
-            FileHandler::removeFilesInDir("./files/cache/optimized");
-
-            // remove js_filter_compiled files 
-            FileHandler::removeFilesInDir("./files/cache/js_filter_compiled");
-
-            // remove cached queries 
-            FileHandler::removeFilesInDir("./files/cache/queries");
-
-            // remove ./files/cache/news* files 
-            $directory = dir(_XE_PATH_."files/cache/");
-            while($entry = $directory->read()) {
-                if(substr($entry,0,11)=='newest_news') FileHandler::removeFile("./files/cache/".$entry);
-            }
-            $directory->close();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  admin
+     * @author NHN (developers@xpressengine.com)
+     * @brief  base class of admin module
+     **/
+
+    class admin extends ModuleObject {
+
+        /**
+         * @brief install admin module
+         * @return new Object
+         **/
+        function moduleInstall() {
+            return new Object();
+        }
+
+        /**
+         * @brief if update is necessary it returns true
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists("admin_favorite", "type")) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief update module
+         * @return new Object
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists("admin_favorite", "type"))
+			{
+				$oAdminAdminModel = &getAdminModel('admin');
+				$output = $oAdminAdminModel->getFavoriteList();
+				$favoriteList = $output->get('favoriteList');
+
+				$oDB->dropColumn('admin_favorite', 'admin_favorite_srl');
+            	$oDB->addColumn('admin_favorite',"admin_favorite_srl","number",11,0);
+            	$oDB->addColumn('admin_favorite',"type","varchar",30, 'module');
+				if(is_array($favoriteList))
+				{
+					$oAdminAdminController = &getAdminController('admin');
+					$oAdminAdminController->_deleteAllFavorite();
+					foreach($favoriteList AS $key=>$value)
+					{
+						$oAdminAdminController->_insertFavorite($value->site_srl, $value->module);
+					}
+				}
+			}
+            return new Object();
+        }
+
+        /**
+         * @brief regenerate cache file
+         * @return none
+         **/
+        function recompileCache() {
+        }
+
+        /**
+         * @brief regenerate xe admin default menu
+         * @return none
+         **/
+		function createXeAdminMenu()
+		{
+			//insert menu
+            $args->title = '__XE_ADMIN__';
+            $args->menu_srl = getNextSequence();
+            $args->listorder = $args->menu_srl * -1;
+            $output = executeQuery('menu.insertMenu', $args);
+			$menuSrl = $args->menu_srl;
+			unset($args);
+
+			// gnb item create
+			$gnbList = array('dashboard', 'site', 'user', 'content', 'theme', 'extensions', 'configuration');
+			foreach($gnbList AS $key=>$value)
+			{
+				//insert menu item
+				$args->menu_srl = $menuSrl;
+				$args->menu_item_srl = getNextSequence();
+				$args->name = '{$lang->menu_gnb[\''.$value.'\']}';
+				if($value == 'dashboard') $args->url = getUrl('', 'module', 'admin');
+				else $args->url = '#';
+				$args->listorder = -1*$args->menu_item_srl;
+                $output = executeQuery('menu.insertMenuItem', $args);
+			}
+
+			$oMenuAdminModel = &getAdminModel('menu');
+			$columnList = array('menu_item_srl', 'name');
+			$output = $oMenuAdminModel->getMenuItems($menuSrl, 0, $columnList);
+			if(is_array($output->data))
+			{
+				foreach($output->data AS $key=>$value)
+				{
+					preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $value->name, $m);
+					$gnbDBList[$m[1]] = $value->menu_item_srl;
+				}
+			}
+			unset($args);
+
+			$gnbModuleList = array(
+				0=>array(
+					'module'=>'menu',
+					'subMenu'=>array('siteMap'),
+				),
+				1=>array(
+					'module'=>'member',
+					'subMenu'=>array('userList', 'userSetting', 'userGroup'),
+				),
+				2=>array(
+					'module'=>'document',
+					'subMenu'=>array('document'),
+				),
+				3=>array(
+					'module'=>'comment',
+					'subMenu'=>array('comment'),
+				),
+				4=>array(
+					'module'=>'trackback',
+					'subMenu'=>array('trackback'),
+				),
+				5=>array(
+					'module'=>'file',
+					'subMenu'=>array('file'),
+				),
+				6=>array(
+					'module'=>'poll',
+					'subMenu'=>array('poll'),
+				),
+				7=>array(
+					'module'=>'rss',
+					'subMenu'=>array('rss'),
+				),
+				8=>array(
+					'module'=>'module',
+					'subMenu'=>array('multilingual'),
+				),
+				9=>array(
+					'module'=>'importer',
+					'subMenu'=>array('importer'),
+				),
+				10=>array(
+					'module'=>'trash',
+					'subMenu'=>array('trash'),
+				),
+				11=>array(
+					'module'=>'admin',
+					'subMenu'=>array('theme'),
+				),
+				12=>array(
+					'module'=>'autoinstall',
+					'subMenu'=>array('easyInstall'),
+				),
+				13=>array(
+					'module'=>'layout',
+					'subMenu'=>array('installedLayout'),
+				),
+				14=>array(
+					'module'=>'module',
+					'subMenu'=>array('installedModule'),
+				),
+				15=>array(
+					'module'=>'widget',
+					'subMenu'=>array('installedWidget'),
+				),
+				16=>array(
+					'module'=>'addon',
+					'subMenu'=>array('installedAddon'),
+				),
+				17=>array(
+					'module'=>'editor',
+					'subMenu'=>array('editor'),
+				),
+				18=>array(
+					'module'=>'spamfilter',
+					'subMenu'=>array('spamFilter'),
+				),
+				19=>array(
+					'module'=>'admin',
+					'subMenu'=>array('adminConfigurationGeneral', 'adminConfigurationFtp', 'adminMenuSetup'),
+				),
+				20=>array(
+					'module'=>'file',
+					'subMenu'=>array('fileUpload'),
+				),
+				21=>array(
+					'module'=>'module',
+					'subMenu'=>array('filebox'),
+				),
+				22=>array(
+					'module'=>'point',
+					'subMenu'=>array('point')
+				),
+			);
+
+			$oMemberModel = &getModel('member');
+			$output = $oMemberModel->getAdminGroup(array('group_srl'));
+			$adminGroupSrl = $output->group_srl;
+
+			// gnb sub item create
+			// common argument setting
+			$args->menu_srl = $menuSrl;
+			$args->open_window = 'N';
+			$args->expand = 'N';
+			$args->normal_btn = '';
+			$args->hover_btn = '';
+			$args->active_btn = '';
+			$args->group_srls = $adminGroupSrl;
+            $oModuleModel = &getModel('module');
+
+			foreach($gnbModuleList AS $key=>$value)
+			{
+				if(is_array($value['subMenu']))
+				{
+					$moduleActionInfo = $oModuleModel->getModuleActionXml($value['module']);
+					foreach($value['subMenu'] AS $key2=>$value2)
+					{
+						$gnbKey = "'".$this->_getGnbKey($value2)."'";
+
+						//insert menu item
+						$args->menu_item_srl = getNextSequence();
+						$args->parent_srl = $gnbDBList[$gnbKey];
+						$args->name = '{$lang->menu_gnb_sub[\''.$value2.'\']}';
+						$args->url = 'index.php?module=admin&act='.$moduleActionInfo->menu->{$value2}->index;
+						$args->listorder = -1*$args->menu_item_srl;
+						$output = executeQuery('menu.insertMenuItem', $args);
+					}
+				}
+			}
+
+			$oMenuAdminConroller = &getAdminController('menu');
+			$oMenuAdminConroller->makeXmlFile($menuSrl);
+		}
+
+		function _getGnbKey($menuName)
+		{
+			switch($menuName) {
+				case 'siteMap':
+					return 'site';
+					break;
+				case 'userList':
+				case 'userSetting':
+				case 'userGroup':
+				case 'point':
+					return 'user';
+					break;
+				case 'document':
+				case 'comment':
+				case 'trackback':
+				case 'file':
+				case 'poll':
+				case 'rss':
+				case 'multilingual':
+				case 'importer':
+				case 'trash':
+					return 'content';
+					break;
+				case 'theme':
+					return 'theme';
+					break;
+				case 'easyInstall':
+				case 'installedLayout':
+				case 'installedModule':
+				case 'installedWidget':
+				case 'installedAddon':
+				case 'editor':
+				case 'spamFilter':
+					return 'extensions';
+					break;
+				case 'adminConfigurationGeneral':
+				case 'adminConfigurationFtp':
+				case 'adminMenuSetup':
+				case 'fileUpload':
+				case 'filebox':
+					return 'configuration';
+					break;
+				default:
+					return 'extensions';
+			}
+		}
+    }
+?>
diff --git a/modules/admin/conf/info.xml b/modules/admin/conf/info.xml
index 2b55b624e..38252f67e 100644
--- a/modules/admin/conf/info.xml
+++ b/modules/admin/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">관리자 모듈</title>
-    <title xml:lang="en">Administrator Module</title>
-    <title xml:lang="vi">Administrator Module</title>
-    <title xml:lang="es">Módulo del administrador</title>
-    <title xml:lang="zh-CN">管理员模块</title>
-    <title xml:lang="jp">管理者用モジュール</title>
-    <title xml:lang="ru">Модуль администратора</title>
-    <title xml:lang="zh-TW">管理員模組</title>
-    <title xml:lang="tr">Yönetici Modülü</title>
-    <description xml:lang="ko">각 모듈들의 기능을 나열하고 관리자용 레이아웃을 적용하여 관리 기능을 사용할 수 있도록 하는 모듈입니다.</description>
-    <description xml:lang="en">This module shows a list of features of each module, and enables you to use a quite few of managers by applying layout for administrator.</description>
-    <description xml:lang="vi">Module này hiển thị thông tin của những Module đã được cài đặt, và cho phép bạn sử dụng quyền của Administrator để thiết lập giao diện.</description>
-    <description xml:lang="es">Este módulo muestra una lista de características de cada módulo, en donde puede activar la función de la administracion aplicando el diseño del administrador.</description>
-    <description xml:lang="zh-CN">列出各模块的功能并使用管理员布局，可以让其使用管理功能的模块。</description>
-    <description xml:lang="jp">各モジュールの機能を表示し、かつ管理者用のレイアウトを適用させて、管理機能が使用出来るようにします。</description>
-    <description xml:lang="ru">Этот модуль показывает список возможностей каждого модуля, и позволяет Вам использовать несколько менеджеров, применяя лейаут для администратора.</description>
-    <description xml:lang="zh-TW">列出各模組的功能及使用管理員版面，並可使用管理功能的模組。</description>
-    <description xml:lang="tr">Bu modül size, her modülün özelliklerini barındıran bir liste gösterir ve yöneticiler için yerleşim düzeni uygulayarak, yöneticilerin birkaçını kullanma imkanı sunar.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>system</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">관리자 모듈</title>
+    <title xml:lang="en">Administrator Module</title>
+    <title xml:lang="vi">Administrator Module</title>
+    <title xml:lang="es">Módulo del administrador</title>
+    <title xml:lang="zh-CN">管理员模块</title>
+    <title xml:lang="jp">管理者用モジュール</title>
+    <title xml:lang="ru">Модуль администратора</title>
+    <title xml:lang="zh-TW">管理員模組</title>
+    <title xml:lang="tr">Yönetici Modülü</title>
+    <description xml:lang="ko">각 모듈들의 기능을 나열하고 관리자용 레이아웃을 적용하여 관리 기능을 사용할 수 있도록 하는 모듈입니다.</description>
+    <description xml:lang="en">This module shows a list of features for each module. By applying the administrator layout it is possible to use administrator features.</description>
+    <description xml:lang="vi">Module này hiển thị thông tin của những Module đã được cài đặt, và cho phép bạn sử dụng quyền của Administrator để thiết lập giao diện.</description>
+    <description xml:lang="es">Este módulo muestra una lista de características de cada módulo, en donde puede activar la función de la administracion aplicando el diseño del administrador.</description>
+    <description xml:lang="zh-CN">列出各模块的功能并使用管理员布局，可以让其使用管理功能的模块。</description>
+    <description xml:lang="jp">各モジュールの機能を表示し、かつ管理者用のレイアウトを適用させて、管理機能が使用出来るようにします。</description>
+    <description xml:lang="ru">Этот модуль показывает список возможностей каждого модуля, и позволяет Вам использовать несколько менеджеров, применяя лейаут для администратора.</description>
+    <description xml:lang="zh-TW">列出各模組的功能及使用管理員版面，並可使用管理功能的模組。</description>
+    <description xml:lang="tr">Bu modül size, her modülün özelliklerini barındıran bir liste gösterir ve yöneticiler için yerleşim düzeni uygulayarak, yöneticilerin birkaçını kullanma imkanı sunar.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>system</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/admin/conf/module.xml b/modules/admin/conf/module.xml
index 853f8f60a..3d0e14120 100644
--- a/modules/admin/conf/module.xml
+++ b/modules/admin/conf/module.xml
@@ -4,10 +4,76 @@
     <permissions />
     <actions>
         <action name="dispAdminIndex" type="view" standalone="true" index="true" />
-        <action name="dispAdminConfig" type="view" standalone="true" />
+        <action name="dispAdminConfigGeneral" type="view" standalone="true" menu_name="adminConfigurationGeneral" menu_index="true" />
+        <action name="dispAdminConfigFtp" type="view" standalone="true" menu_name="adminConfigurationFtp" menu_index="true" />
+        <action name="dispAdminTheme" type="view" standalone="true" menu_name="theme" menu_index="true" />
+        <action name="dispAdminSetup" type="view" standalone="true" menu_name="adminMenuSetup" menu_index="true" />
 
-        <action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
+        <action name="procAdminRemoveIcons" type="controller" standalone="true" />
+		<action name="procAdminRecompileCacheFile" type="controller" standalone="true" />
         <action name="procAdminLogout" type="controller" standalone="true" />
+        <action name="procAdminInsertThemeInfo" type="controller" standalone="true" ruleset="insertThemeInfo" />
+		<action name="procAdminToggleFavorite" type="controller" ruleset="toggleFavorite" />
+		<action name="procAdminEnviromentGatheringAgreement" type="controller" standalone="true" />
+		<action name="procAdminUpdateConfig" type="controller" standalone="true" />
+		<action name="procAdminDeleteLogo" type="controller" standalone="true" />
+		<action name="procAdminMenuReset" type="controller" />
+
         <action name="getAdminFTPList" type="model" standalone="true" />
+        <action name="getSiteAllList" type="model" standalone="true" />
     </actions>
+	<menus>
+		<menu name="adminConfigurationGeneral" type="all">
+			<title xml:lang="en">General</title>
+			<title xml:lang="ko">일반</title>
+			<title xml:lang="zh-CN">General</title>
+			<title xml:lang="jp">General</title>
+			<title xml:lang="es">General</title>
+			<title xml:lang="ru">General</title>
+			<title xml:lang="fr">General</title>
+			<title xml:lang="zh-TW">General</title>
+			<title xml:lang="vi">General</title>
+			<title xml:lang="mn">General</title>
+			<title xml:lang="tr">General</title>
+		</menu>
+		<menu name="adminMenuSetup" type="all">
+			<title xml:lang="en">Admin Setup</title>
+			<title xml:lang="ko">관리자 설정</title>
+			<title xml:lang="zh-CN">Admin Setup</title>
+			<title xml:lang="jp">Admin Setup</title>
+			<title xml:lang="es">Admin Setup</title>
+			<title xml:lang="ru">Admin Setup</title>
+			<title xml:lang="fr">Admin Setup</title>
+			<title xml:lang="zh-TW">Admin Setup</title>
+			<title xml:lang="vi">Admin Setup</title>
+			<title xml:lang="mn">Admin Setup</title>
+			<title xml:lang="tr">Admin Setup</title>
+		</menu>
+		<menu name="adminConfigurationFtp" type="all">
+			<title xml:lang="en">FTP Configuration</title>
+			<title xml:lang="ko">FTP 설정</title>
+			<title xml:lang="zh-CN">FTP Configuration</title>
+			<title xml:lang="jp">FTP Configuration</title>
+			<title xml:lang="es">FTP Configuration</title>
+			<title xml:lang="ru">FTP Configuration</title>
+			<title xml:lang="fr">FTP Configuration</title>
+			<title xml:lang="zh-TW">FTP Configuration</title>
+			<title xml:lang="vi">FTP Configuration</title>
+			<title xml:lang="mn">FTP Configuration</title>
+			<title xml:lang="tr">FTP Configuration</title>
+		</menu>
+		<menu name="theme" type="site">
+			<title xml:lang="en">Theme</title>
+			<title xml:lang="ko">테마</title>
+			<title xml:lang="zh-CN">Theme</title>
+			<title xml:lang="jp">Theme</title>
+			<title xml:lang="es">Theme</title>
+			<title xml:lang="ru">Theme</title>
+			<title xml:lang="fr">Theme</title>
+			<title xml:lang="zh-TW">Theme</title>
+			<title xml:lang="vi">Theme</title>
+			<title xml:lang="mn">Theme</title>
+			<title xml:lang="tr">Theme</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/admin/lang/en.lang.php b/modules/admin/lang/en.lang.php
deleted file mode 100644
index fb8b296bc..000000000
--- a/modules/admin/lang/en.lang.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only basic words are included here)
-     **/
-
-    $lang->admin_info = 'Administrator Info';
-    $lang->admin_index = 'Index Admin Page';
-    $lang->control_panel = 'Dashboard';
-    $lang->start_module = 'Default Module';
-    $lang->about_start_module = 'You can specify default module of the site.';
-
-    $lang->module_category_title = array(
-        'service' => 'Services',
-        'member' => 'Members',
-        'content' => 'Contents',
-        'statistics' => 'Statistics',
-        'construction' => 'Construction',
-        'utility' => 'Utilities',
-        'interlock' => 'Embedded',
-        'accessory' => 'Accessories',
-        'migration' => 'Data Migration',
-        'system' => 'System Setting',
-    );
-
-    $lang->newest_news = "Latest News";
-    
-    $lang->env_setup = "Setting";
-    $lang->default_url = "Default URL";
-    $lang->about_default_url = "If you use a virtual site feature (e.g., cafeXE), input default URL (parent-site's address), then SSO would be enabled, thus connection to documents/modules works properly. ";
-
-    $lang->env_information = "Environment Information";
-    $lang->current_version = "Current Version";
-    $lang->current_path = "Installed Path";
-    $lang->released_version = "Latest Version";
-    $lang->about_download_link = "New version of Zerboard XE is now available!\nPlease click the download link to get the latest version.";
-    
-    $lang->item_module = "Module List";
-    $lang->item_addon  = "Addon List";
-    $lang->item_widget = "Widget List";
-    $lang->item_layout = "Layout List";
-
-    $lang->module_name = "Module Name";
-    $lang->addon_name = "Addon Name";
-    $lang->version = "Version";
-    $lang->author = "Developer";
-    $lang->table_count = "Number of Table";
-    $lang->installed_path = "Installed Path";
-
-    $lang->cmd_shortcut_management = "Edit Menu";
-
-    $lang->msg_is_not_administrator = 'Administrator Only';
-    $lang->msg_manage_module_cannot_delete = 'Shortcuts of module, addon, layout, widget cannot be removed';
-    $lang->msg_default_act_is_null = 'Shortcut could not be registered because default admin Action is not set';
-
-    $lang->welcome_to_xe = 'Welcome to the admin page of XE';
-    $lang->about_admin_page = "Admin page is still under development,\nWe will add essential contents by accepting many good suggestions during Closebeta.";
-    $lang->about_lang_env = "To apply selected language as default language, click on the Save button.";
-
-    $lang->xe_license = 'XE complies with the GPL';
-    $lang->about_shortcut = 'You may remove shortcuts of modules which are registered on frequently using module list';
-
-    $lang->yesterday = "Yesterday";
-    $lang->today = "Today";
-
-    $lang->cmd_lang_select = "Language";
-    $lang->about_cmd_lang_select = "Only selected languages will be served.";
-    $lang->about_recompile_cache = "You can delete useless or invalid cache files.";
-    $lang->use_ssl = "Use SSL";
-    $lang->ssl_options = array(
-        'none' => "Never",
-        'optional' => "Optional",
-        'always' => "Always"
-    );
-    $lang->about_use_ssl = "In case of 'Optional', SSL will be used for actions such as signing up / changing information. And for 'Always', your site will be served only via https.";
-    $lang->server_ports = "Server Port";
-    $lang->about_server_ports = "If your web server does not use 80 for HTTP or 443 for HTTPS port, you should specify server ports";
-    $lang->use_db_session = 'Use Session DB';
-    $lang->about_db_session = 'It will use php session with DB when authenticating.<br/>Websites with infrequent usage of web server may expect faster response when this function is disabled.<br/>However session DB will make it unable to get current users, so you cannot use related functions.';
-    $lang->sftp = "Use SFTP";
-    $lang->ftp_get_list = "Get List";
-    $lang->ftp_remove_info = 'Remove FTP Info.';
-	$lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.';
-	$lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.';
-	$lang->mobile_view = 'Mobile View';
-	$lang->about_mobile_view = 'Mobile View will display the best layout when accessing with smartphones.';
-    $lang->autoinstall = 'EasyInstall';
-
-    $lang->last_week = 'Last week';
-    $lang->this_week = 'This week';
-?>
diff --git a/modules/admin/lang/es.lang.php b/modules/admin/lang/es.lang.php
deleted file mode 100644
index 83ec529c3..000000000
--- a/modules/admin/lang/es.lang.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-    /**
-     * @archivo   es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma español (sólo los básicos)
-     **/
-
-    $lang->admin_info = 'Administrador de Información';
-    $lang->admin_index = 'Índice de la página admin';
-    $lang->control_panel = 'Control panel';
-    $lang->start_module = 'Módulo de inicio';
-    $lang->about_start_module = 'Puede especificar el módulo de inicio por defecto.';
-
-    $lang->module_category_title = array(
-        'service' => 'Service Setting',
-        'member' => 'Member Setting',
-        'content' => 'Content Setting',
-        'statistics' => 'Statistics',
-        'construction' => 'Construction',
-        'utility' => 'Utility Setting',
-        'interlock' => 'Interlock Setting',
-        'accessory' => 'Accessories',
-        'migration' => 'Data Migration',
-        'system' => 'System Setting',
-    );
-
-
-    $lang->newest_news = "Noticias recientes";
-    
-    $lang->env_setup = "Configuración";
-    $lang->default_url = "기본 URL";
-    $lang->about_default_url = "XE sitio virtual (cafeXE, etc) tiene que introducir la URL base, al utilizar las capacidades de trabajo virtual y el tema de autenticación sayiteugan / módulos y las conexiones se realizan correctamente. (Ej: http:// dominio / ruta de instalación)";
-
-    $lang->env_information = "Información Ambiental";
-    $lang->current_version = "Versión actual";
-    $lang->current_path = "Instalado Sendero";
-    $lang->released_version = "Versión más reciente";
-    $lang->about_download_link = "La versión más reciente Zerboard XE está disponible.\nPara descargar la versión más reciente, haga clic en enlace de descarga.";
-	
-    $lang->item_module = "Lista de Módulos";
-    $lang->item_addon  = "Lista de Addons";
-    $lang->item_widget = "Lista de Widgets";
-    $lang->item_layout = "Liasta de Diseños";
-
-    $lang->module_name = "Nombre del Módulo";
-    $lang->addon_name = "Nombre de Addon";
-    $lang->version = "Versión";
-    $lang->author = "Autor";
-    $lang->table_count = "Número de los tableros";
-    $lang->installed_path = "Ruta de instalación";
-
-    $lang->cmd_shortcut_management = "Editar el Menú";
-
-    $lang->msg_is_not_administrator = 'Sólo se permite el ingreso del administrador.';
-    $lang->msg_manage_module_cannot_delete = 'No se puede eliminar acceso directo del Módulo, Addon, Diseño y Widget.';
-    $lang->msg_default_act_is_null = 'No se puede registrar acceso directo por no estar determinada la acción del administrador predefinido.';
-	
-    $lang->welcome_to_xe = 'Esta es la página del Administrador de XE';
-    $lang->about_admin_page = "La página del Administrador aún está en desarrollo.";
-    $lang->about_lang_env = "Para aplicar idioma seleccionado conjunto de los usuarios, como por defecto, haga clic en el botón [Guardar] el cambio.";
-
-
-    $lang->xe_license = 'XE está bajo la Licencia de GPL';
-    $lang->about_shortcut = 'Puede Eliminar los accesos directos de módulos, los cuales fueron registrados en la lista de módulos usados frecuentemente';
-
-    $lang->yesterday = "Yesterday";
-    $lang->today = "Today";
-
-    $lang->cmd_lang_select = "Selección de Idioma";
-    $lang->about_cmd_lang_select = "Seleccione el idioma es sólo el servicio";
-    $lang->about_recompile_cache = "Inválido inútil archivo de caché puede organizar jyeotgeona";
-    $lang->use_ssl = "Usar SSL";
-    $lang->ssl_options = array(
-        'none' => "Desactivar",
-        'optional' => "Opcionalmente el",
-        'always' => "Utilice siempre el"
-    );
-    $lang->about_use_ssl = "Opcionalmente, la composición de suscripción / editar la información y el uso de SSL especificada en la acción es siempre el uso de SSL para todos los servicios que se utilizarán";
-    $lang->server_ports = "Especifique el puerto del servidor";
-    $lang->about_server_ports = "80 de HTTP, HTTPS al puerto 443 si se utiliza otro que se especifique lo contrario, el puerto va a necesitar.";
-    $lang->use_db_session = '인증 세션 DB 사용';
-    $lang->about_db_session = '인증시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용율이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.';
-    $lang->sftp = "Use SFTP";
-    $lang->ftp_get_list = "Get List";
-    $lang->ftp_remove_info = 'Remove FTP Info.';
-	$lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.';
-	$lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.';
-	$lang->mobile_view = 'Use Mobile View';
-	$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';
-    $lang->autoinstall = 'EasyInstall';
-
-    $lang->last_week = 'Last week';
-    $lang->this_week = 'This week';
-?>
diff --git a/modules/admin/lang/fr.lang.php b/modules/admin/lang/fr.lang.php
deleted file mode 100644
index ce6840000..000000000
--- a/modules/admin/lang/fr.lang.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-    /**
-     * @file   modules/admin/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent(PierreDuvent@gamil.com)
-     * @brief  Paquet du langage en français pour le module d\'Administration
-     **/
-
-    $lang->admin_info = 'Informations d\'Administrateur';
-    $lang->admin_index = 'Page de l\'indice pour l\'Administrateur';
-    $lang->control_panel = 'Control panel';
-    $lang->start_module = 'Start Module';
-    $lang->about_start_module = 'Vous pouvez spécifier début module par défaut.';
-
-    $lang->module_category_title = array(
-        'service' => 'Service Setting',
-        'member' => 'Member Setting',
-        'content' => 'Content Setting',
-        'statistics' => 'Statistics',
-        'construction' => 'Construction',
-        'utility' => 'Utility Setting',
-        'interlock' => 'Interlock Setting',
-        'accessory' => 'Accessories',
-        'migration' => 'Data Migration',
-        'system' => 'System Setting',
-    );
-
-    $lang->newest_news = "Dernières Nouvelles";
-    
-    $lang->env_setup = "Configuration";
-    $lang->default_url = "기본 URL";
-    $lang->about_default_url = "XE 가상 사이트(cafeXE등)의 기능을 사용할때 기본 URL을 입력해 주셔야 가상 사이트간 인증 연동이 되고 게시글/모듈등의 연결이 정상적으로 이루어집니다. (ex: http://도메인/설치경로)";
-
-
-    $lang->env_information = "Informations de l'Environnement";
-    $lang->current_version = "Version Courante";
-    $lang->current_path = "Chemin Installé";
-    $lang->released_version = "Dernière Version";
-    $lang->about_download_link = "Nouvelle version est disponible.\nPour télécharger la dernière version, cliquez le lien.";
-    
-    $lang->item_module = "Liste des Modules";
-    $lang->item_addon  = "Liste des Compagnons";
-    $lang->item_widget = "Liste des Gadgets";
-    $lang->item_layout = "Liste des Mises en Pages";
-
-    $lang->module_name = "Nom de Module";
-    $lang->addon_name = "Nom de Compagnon";
-    $lang->version = "Version";
-    $lang->author = "Auteur";
-    $lang->table_count = "Somme de Tables";
-    $lang->installed_path = "Chemin Installé";
-
-    $lang->cmd_shortcut_management = "Editer le Menu";
-
-    $lang->msg_is_not_administrator = 'Administrateur seulement';
-    $lang->msg_manage_module_cannot_delete = 'On ne peut pas supprimer les raccourcis pour les modules, les compagnons, les mises en page ou les gadgets';
-    $lang->msg_default_act_is_null = 'on ne peut pas enrégistrer les raccourcis parce que les Actions Par Défaut de l\'Administrateur ne sont pas établies';
-
-    $lang->welcome_to_xe = 'Bienvenue sur la Page d\'Administration du XE';
-    $lang->about_admin_page = "La Page d\'Administration est encore en train de développer,\nNous allons ajouter des contenus essentiels par accepter beauoup de bons suggestions pendant Béta Proche.";
-    $lang->about_lang_env = "Vous pouvez fixer la Langue Par Défaut par cliquer le boutton [Conserver] au-dessous. Les visiteurs vont voir tous les menus et les messages en langue que vous choisissez.";
-
-    $lang->xe_license = 'XE s\'applique la GPL';
-    $lang->about_shortcut = 'Vous pouvez supprimer les raccourcis pour les modules qui sont enrgistrés sur le liste des modules qui sont utilisés fréquemment';
-
-    $lang->yesterday = "Yesterday";
-    $lang->today = "Today";
-
-    $lang->cmd_lang_select = "langue";
-    $lang->about_cmd_lang_select = "La langue choisie seulement sera servie";
-    $lang->about_recompile_cache = "Vous pouvez arranger les fichiers inutils ou les fichiers invalides d'antémémoire";
-    $lang->use_ssl = "Utiliser SSL";
-    $lang->ssl_options = array(
-        'none' => "Ne Pas utiliser",
-        'optional' => "Optionnel",
-        'always' => "Toujours"
-    );
-    $lang->about_use_ssl = "Si l'on choisit 'Optionnel' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l'on choisit 'Toujours', on utilise protocole SSL dans tous les services.";
-    $lang->server_ports = "déclarer le port de serveur";
-    $lang->about_server_ports = "Si l'on ne veut pas utiliser le port 80 pour HTTP mais un autre port, ou bien, si l'on ne veut pas utiliser le port 443 pour HTTPS mais un autre port, on doit déclarer les ports.";
-    $lang->use_db_session = '인증 세션 DB 사용';
-    $lang->about_db_session = '인증시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용율이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.';
-    $lang->sftp = "Use SFTP";
-    $lang->ftp_get_list = "Get List";
-    $lang->ftp_remove_info = 'Remove FTP Info.';
-	$lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.';
-	$lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.';
-	$lang->mobile_view = 'Use Mobile View';
-	$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';
-    $lang->autoinstall = 'EasyInstall';
-
-    $lang->last_week = 'Last week';
-    $lang->this_week = 'This week';
-?>
diff --git a/modules/admin/lang/jp.lang.php b/modules/admin/lang/jp.lang.php
deleted file mode 100644
index e8faa66fe..000000000
--- a/modules/admin/lang/jp.lang.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-    /**
-     * @file   modules/admin/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ // 細かい修正：liahona
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    $lang->admin_info = '管理者情報';
-    $lang->admin_index = '管理者トップページ';
-    $lang->control_panel = 'コントロールパネル';
-    $lang->start_module = '初期起動モジュール';
-    $lang->about_start_module = 'デフォルトで起動するモジュールを指定することができます。';
-
-    $lang->module_category_title = array(
-        'service' => 'サービス管理',
-        'member' => '会員管理',
-        'content' => 'コンテンツ管理',
-        'statistics' => '統計確認',
-        'construction' => 'サイト設定',
-        'utility' => '機能設定',
-        'interlock' => '連動設定',
-        'accessory' => '付加機能設定',
-        'migration' => 'データ管理／復元',
-        'system' => 'システム管理',
-    );
-
-    $lang->newest_news = '最新ニュース';
-
-    $lang->env_setup = '環境設定';
-    $lang->default_url = '基本URL';
-    $lang->about_default_url = '複数のバーチャル（Virtual）サイトを運営する場合、どちらからログインしてもバーチャル（Virtual）サイトの間でログイン情報を維持出来るようにするためには、基本になるサイトでのXEをインストールしたurlを登録して下さい。 (例: http://ドメイン/インストールパス)';
-
-
-    $lang->env_information = '環境情報';
-    $lang->current_version = 'インストール済みバージョン';
-    $lang->current_path = 'インストールパス';
-    $lang->released_version = '最新バージョン';
-    $lang->about_download_link = "新しいバージョンが配布されています。\n｢ダウンロード｣リンクをクリックするとダウンロード出来ます。";
-
-    $lang->item_module = 'モジュールリスト';
-    $lang->item_addon  = 'アドオンリスト';
-    $lang->item_widget = 'ウィジェットリスト';
-    $lang->item_layout = 'レイアウトリスト';
-
-    $lang->module_name = 'モジュール名';
-    $lang->addon_name = 'アドオン名';
-    $lang->version = 'バージョン';
-    $lang->author = '制作者';
-    $lang->table_count = 'テーブル数';
-    $lang->installed_path = 'インストールパス';
-
-    $lang->cmd_shortcut_management = 'メニューの編集';
-
-    $lang->msg_is_not_administrator = '管理者のみアクセス出来ます';
-    $lang->msg_manage_module_cannot_delete = 'モジュール、アドオン、ウィジェットのショットカットは削除出来ません。';
-    $lang->msg_default_act_is_null = 'デフォルトの管理者のアクションが指定されていないため、ショットカットを登録することが出来ません。';
-
-    $lang->welcome_to_xe = 'XEの管理者ページです。';
-    $lang->about_lang_env = '初めてサイトに訪問したユーザーに対し、上記の選択した言語でサイトを表示させるためには、必ず下記の「保存」ボタンをクリックして適用して下さい。';
-
-    $lang->xe_license = 'XEのライセンスはGPLです。';
-    $lang->about_shortcut = 'よく使用するモジュールに登録されたショートカットは削除出来ます。';
-
-    $lang->yesterday = '昨日';
-    $lang->today = '今日';
-
-    $lang->cmd_lang_select = '言語選択';
-    $lang->about_cmd_lang_select = '選択した言語だけでサービスを行います。';
-    $lang->about_recompile_cache = '要らないかごみのキャッシューファイルを整理します。';
-    $lang->use_ssl = 'SSL環境設定';
-    $lang->ssl_options = array(
-        'none' => '使わない',
-        'optional' => '部分的に使う',
-        'always' => '常に使う'
-    );
-    $lang->about_use_ssl = '「部分的に使う場合」は「会員登録/会員情報変更」など特定のactionでSSLを利用する場合、「常に使う」は全てのサービスがSSLを使う場合に選択します。';
-    $lang->server_ports = 'サーバーポート指定';
-    $lang->about_server_ports = '一般的に使われているHTTPの80、HTTPSの443以外の他のポートを使うために、ポートを指定して下さい。';
-    $lang->use_db_session = 'DBで認証セッション管理';
-    $lang->about_db_session = '認証の時に使われるPHPセッションをDBで使う機能です。<br />ウェブサーバーの負荷が低いサイトではこの機能をオフにすることでむしろサイトのレスポンスが向上されることもあります。<br />また、この機能をオンにすると、「現在ログイン中の会員」の機能が不可になります。';
-    $lang->sftp = "SFTP使用";
-    $lang->ftp_get_list = "ディレクトリ目録要請";
-    $lang->ftp_remove_info = 'FTP情報削除';
-	$lang->msg_ftp_invalid_path = '指定されたFTPパスへのアクセスに失敗しました。';
-	$lang->msg_self_restart_cache_engine = 'メムキャッシュドまたはキャッシュデーモンを再起動して下さい。';
-	$lang->mobile_view = 'モバイルスキン使用';
-	$lang->about_mobile_view = 'スマート携帯などを通じてサイトに接続した場合、モバイル画面に最適化されたレイアウトを使用するように設定します。';
-
-	$lang->autoinstall = 'イージーインストール';
-
-    $lang->last_week = '先週';
-    $lang->this_week = '今週';
-?>
diff --git a/modules/admin/lang/ko.lang.php b/modules/admin/lang/ko.lang.php
deleted file mode 100644
index 04109ef36..000000000
--- a/modules/admin/lang/ko.lang.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-    /**
-     * @file   ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->admin_info = '관리자 정보';
-    $lang->admin_index = '관리자 초기 페이지';
-    $lang->control_panel = '제어판';
-    $lang->start_module = '시작 모듈';
-    $lang->about_start_module = '사이트 접속 시 기본으로 호출될 모듈을 지정할 수 있습니다.';
-
-    $lang->module_category_title = array(
-        'service' => '서비스 관리',
-        'member' => '회원 관리',
-        'content' => '정보 관리',
-        'statistics' => '통계 열람',
-        'construction' => '사이트 설정',
-        'utility' => '기능 설정',
-        'interlock' => '연동 설정',
-        'accessory' => '부가 기능 설정',
-        'migration' => '데이터 관리/복원',
-        'system' => '시스템 관리',
-    );
-
-    $lang->newest_news = '최신 소식';
-
-    $lang->env_setup = '환경 설정';
-    $lang->default_url = '기본 URL';
-    $lang->about_default_url = 'XE 가상 사이트(cafeXE 등)의 기능을 사용할 때 기본 URL을 입력하셔야 가상 사이트간 인증 연동이 되고 게시글, 모듈 등의 연결이 정상적으로 이루어집니다. (예: http://도메인/설치경로)';
-
-
-    $lang->env_information = '환경 정보';
-    $lang->current_version = '설치된 버전';
-    $lang->current_path = '설치된 경로';
-    $lang->released_version = '최신 버전';
-    $lang->about_download_link = "최신 버전이 배포되었습니다.\ndownload 링크를 클릭하시면 다운 받으실 수 있습니다.";
-
-    $lang->item_module = '모듈 목록';
-    $lang->item_addon  = '애드온 목록';
-    $lang->item_widget = '위젯 목록';
-    $lang->item_layout = '레이아웃 목록';
-
-    $lang->module_name = '모듈 이름';
-    $lang->addon_name = '애드온 이름';
-    $lang->version = '버전';
-    $lang->author = '제작자';
-    $lang->table_count = '테이블 수';
-    $lang->installed_path = '설치 경로';
-
-    $lang->cmd_shortcut_management = '메뉴 편집하기';
-
-    $lang->msg_is_not_administrator = '관리자만 접속이 가능합니다.';
-    $lang->msg_manage_module_cannot_delete = '모듈, 애드온, 레이아웃, 위젯 모듈의 바로가기는 삭제 불가능합니다.';
-    $lang->msg_default_act_is_null = '기본 관리자 Action이 지정되어 있지 않아 바로가기 등록을 할 수 없습니다.';
-
-    $lang->welcome_to_xe = 'XE 관리자';
-    $lang->about_lang_env = '처음 방문하는 사용자들의 언어 설정을 동일하게 하려면, 원하는 언어로 변경 후 아래 [저장] 버튼을 클릭하시면 됩니다.';
-
-    $lang->xe_license = 'XE는 GPL을 따릅니다.';
-    $lang->about_shortcut = '자주 사용하는 모듈에 등록된 모듈의 바로가기를 삭제할 수 있습니다.';
-
-    $lang->yesterday = '어제';
-    $lang->today = '오늘';
-
-    $lang->cmd_lang_select = '언어선택';
-    $lang->about_cmd_lang_select = '선택된 언어들만 서비스 됩니다.';
-    $lang->about_recompile_cache = '쓸모 없어졌거나 잘못된 캐시파일들을 정리할 수 있습니다.';
-    $lang->use_ssl = 'SSL 사용';
-    $lang->ssl_options = array(
-        'none' => '사용 안함',
-        'optional' => '선택적으로',
-        'always' => '항상 사용'
-    );
-    $lang->about_use_ssl = '\'선택적으로\'는 회원가입, 정보수정 등의 지정된 action에서 SSL을 사용하고 \'항상 사용\'은 모든 서비스에 SSL을 사용 합니다.';
-    $lang->server_ports = '서버포트지정';
-    $lang->about_server_ports = 'HTTP는 80, HTTPS는 443 이 아닌, 다른 포트를 사용할 경우에 포트를 지정해 주어야 합니다.';
-    $lang->use_db_session = '인증 세션 DB 사용';
-    $lang->about_db_session = '인증 시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용률이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다.<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.';
-    $lang->sftp = 'SFTP 사용'; 
-    $lang->ftp_get_list = '목록 가져오기';
-    $lang->ftp_remove_info = 'FTP 정보 삭제';
-	$lang->msg_ftp_invalid_path = 'FTP Path를 읽을 수 없습니다.';
-	$lang->msg_self_restart_cache_engine = 'Memcached 또는 캐쉬데몬을 재시작 해주세요.';
-	$lang->mobile_view = '모바일 뷰 사용';
-	$lang->about_mobile_view = '스마트폰 등을 이용하여 접속할 때 모바일 화면에 최적화된 레이아웃을 이용하도록 합니다.';
-
-	$lang->autoinstall = '쉬운 설치';
-
-    $lang->last_week = '지난 주';
-    $lang->this_week = '이번 주';
-?>
diff --git a/modules/admin/lang/lang.xml b/modules/admin/lang/lang.xml
new file mode 100644
index 000000000..ad478950e
--- /dev/null
+++ b/modules/admin/lang/lang.xml
@@ -0,0 +1,1275 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>	
+	<item name="subtitle_primary">
+		<value xml:lang="ko"><![CDATA[기본]]></value>
+		<value xml:lang="en"><![CDATA[Primary]]></value>
+		<value xml:lang="jp"><![CDATA[基本]]></value>
+	</item>
+	<item name="subtitle_advanced">
+		<value xml:lang="ko"><![CDATA[고급]]></value>
+		<value xml:lang="en"><![CDATA[Advanced]]></value>
+		<value xml:lang="jp"><![CDATA[上級]]></value>
+	</item>
+	<item name="subtitle_etc">
+		<value xml:lang="ko"><![CDATA[기타]]></value>
+		<value xml:lang="en"><![CDATA[Others]]></value>
+		<value xml:lang="jp"><![CDATA[その他]]></value>
+	</item>
+	<item name="current_state">
+		<value xml:lang="ko"><![CDATA[현황]]></value>
+		<value xml:lang="en"><![CDATA[Current state]]></value>
+		<value xml:lang="jp"><![CDATA[現況]]></value>
+	</item>
+	<item name="latest_document">
+		<value xml:lang="ko"><![CDATA[최근 글]]></value>
+		<value xml:lang="en"><![CDATA[Latest Document]]></value>
+		<value xml:lang="jp"><![CDATA[最新記事]]></value>
+	</item>
+	<item name="latest_comment">
+		<value xml:lang="ko"><![CDATA[최근 댓글]]></value>
+		<value xml:lang="en"><![CDATA[Latest Comment]]></value>
+		<value xml:lang="jp"><![CDATA[最新のコメント]]></value>
+	</item>
+	<item name="latest_trackback">
+		<value xml:lang="ko"><![CDATA[최근 엮인글]]></value>
+		<value xml:lang="en"><![CDATA[Latest Trackback]]></value>
+		<value xml:lang="jp"><![CDATA[最新のトラックバック]]></value>
+	</item>
+	<item name="admin_info">
+		<value xml:lang="ko"><![CDATA[관리자 정보]]></value>
+		<value xml:lang="en"><![CDATA[Administrator Info]]></value>
+		<value xml:lang="jp"><![CDATA[管理者情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員資訊]]></value>
+		<value xml:lang="fr"><![CDATA[Informations d'Administrateur]]></value>
+		<value xml:lang="ru"><![CDATA[Информация администратора]]></value>
+		<value xml:lang="es"><![CDATA[Administrador de Información]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin Administrator]]></value>
+	</item>
+	<item name="admin_index">
+		<value xml:lang="ko"><![CDATA[관리자 초기 페이지]]></value>
+		<value xml:lang="en"><![CDATA[Index Admin Page]]></value>
+		<value xml:lang="jp"><![CDATA[管理者トップページ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理首页]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理頁面]]></value>
+		<value xml:lang="fr"><![CDATA[Page de l'indice pour l'Administrateur]]></value>
+		<value xml:lang="ru"><![CDATA[Индексная страница администратора]]></value>
+		<value xml:lang="es"><![CDATA[Índice de la página admin]]></value>
+		<value xml:lang="tr"><![CDATA[Indeks Yönetici Sayfası]]></value>
+		<value xml:lang="vi"><![CDATA[Trang chủ Admin]]></value>
+	</item>
+	<item name="control_panel">
+		<value xml:lang="ko"><![CDATA[제어판]]></value>
+		<value xml:lang="en"><![CDATA[Dashboard]]></value>
+		<value xml:lang="jp"><![CDATA[コントロールパネル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控制面板]]></value>
+		<value xml:lang="zh-TW"><![CDATA[控制介面]]></value>
+		<value xml:lang="fr"><![CDATA[Control panel]]></value>
+		<value xml:lang="ru"><![CDATA[Контрольная панель]]></value>
+		<value xml:lang="es"><![CDATA[Control panel]]></value>
+		<value xml:lang="vi"><![CDATA[Bảng điều khiển]]></value>
+	</item>
+	<item name="start_module">
+		<value xml:lang="ko"><![CDATA[시작 모듈]]></value>
+		<value xml:lang="en"><![CDATA[Default Module]]></value>
+		<value xml:lang="jp"><![CDATA[初期起動モジュール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[首页模块]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預設首頁]]></value>
+		<value xml:lang="fr"><![CDATA[Start Module]]></value>
+		<value xml:lang="ru"><![CDATA[Стартовый модуль]]></value>
+		<value xml:lang="es"><![CDATA[Módulo de inicio]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan Modül]]></value>
+		<value xml:lang="vi"><![CDATA[Module trang chủ]]></value>
+	</item>
+	<item name="about_start_module">
+		<value xml:lang="ko"><![CDATA[사이트 접속 시 기본으로 호출될 모듈을 지정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can specify the default module for the site.]]></value>
+		<value xml:lang="jp"><![CDATA[サイトへ接続した際にデフォルトで起動するモジュールを指定することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可指定用户访问网站时的默认首页模块。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可將所選擇的模組作為預設首頁。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez spécifier début module par défaut.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете указать модуль запуска по умолчанию.]]></value>
+		<value xml:lang="es"><![CDATA[Puede especificar el módulo de inicio por defecto.]]></value>
+		<value xml:lang="tr"><![CDATA[Sitenin varsayılan modülünü belirleyebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chọn một Module và đặt là trang chủ của Website.]]></value>
+	</item>
+	<item name="module_category_title" type="array">
+		<item name="service">
+			<value xml:lang="ko"><![CDATA[서비스 관리]]></value>
+			<value xml:lang="en"><![CDATA[Services]]></value>
+			<value xml:lang="jp"><![CDATA[サービス管理]]></value>
+			<value xml:lang="zh-CN"><![CDATA[应用管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[服務設定]]></value>
+			<value xml:lang="fr"><![CDATA[Service Setting]]></value>
+			<value xml:lang="ru"><![CDATA[Service Setting]]></value>
+			<value xml:lang="es"><![CDATA[Service Setting]]></value>
+			<value xml:lang="tr"><![CDATA[Hizmetler]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập dịch vụ]]></value>
+		</item>
+		<item name="member">
+			<value xml:lang="ko"><![CDATA[회원 관리]]></value>
+			<value xml:lang="en"><![CDATA[Members]]></value>
+			<value xml:lang="jp"><![CDATA[会員管理]]></value>
+			<value xml:lang="zh-CN"><![CDATA[用户管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[會員管理]]></value>
+			<value xml:lang="fr"><![CDATA[Member Setting]]></value>
+			<value xml:lang="ru"><![CDATA[Member Setting]]></value>
+			<value xml:lang="es"><![CDATA[Member Setting]]></value>
+			<value xml:lang="tr"><![CDATA[Yöneticiler]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập thành viên]]></value>
+		</item>
+		<item name="content">
+			<value xml:lang="ko"><![CDATA[정보 관리]]></value>
+			<value xml:lang="en"><![CDATA[Contents]]></value>
+			<value xml:lang="jp"><![CDATA[コンテンツ管理]]></value>
+			<value xml:lang="zh-CN"><![CDATA[资源管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[內容管理]]></value>
+			<value xml:lang="fr"><![CDATA[Content Setting]]></value>
+			<value xml:lang="ru"><![CDATA[Content Setting]]></value>
+			<value xml:lang="es"><![CDATA[Content Setting]]></value>
+			<value xml:lang="tr"><![CDATA[İçerikler]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập nội dung]]></value>
+		</item>
+		<item name="statistics">
+			<value xml:lang="ko"><![CDATA[통계 열람]]></value>
+			<value xml:lang="en"><![CDATA[Statistics]]></value>
+			<value xml:lang="jp"><![CDATA[統計確認]]></value>
+			<value xml:lang="zh-CN"><![CDATA[统计管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[統計資料]]></value>
+			<value xml:lang="tr"><![CDATA[İstatistikler]]></value>
+			<value xml:lang="vi"><![CDATA[Thống kê]]></value>
+		</item>
+		<item name="construction">
+			<value xml:lang="ko"><![CDATA[사이트 설정]]></value>
+			<value xml:lang="en"><![CDATA[Construction]]></value>
+			<value xml:lang="jp"><![CDATA[サイト設定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[界面管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[界面設定]]></value>
+			<value xml:lang="tr"><![CDATA[Yapı]]></value>
+			<value xml:lang="vi"><![CDATA[Xây dựng giao diện]]></value>
+		</item>
+		<item name="utility">
+			<value xml:lang="ko"><![CDATA[기능 설정]]></value>
+			<value xml:lang="en"><![CDATA[Utilities]]></value>
+			<value xml:lang="jp"><![CDATA[機能設定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[扩展管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[擴充功能]]></value>
+			<value xml:lang="fr"><![CDATA[Utility Setting]]></value>
+			<value xml:lang="ru"><![CDATA[Utility Setting]]></value>
+			<value xml:lang="es"><![CDATA[Utility Setting]]></value>
+			<value xml:lang="tr"><![CDATA[Yardımcı Uygulamalar]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập tiện ích]]></value>
+		</item>
+		<item name="interlock">
+			<value xml:lang="ko"><![CDATA[연동 설정]]></value>
+			<value xml:lang="en"><![CDATA[Embedded]]></value>
+			<value xml:lang="jp"><![CDATA[連動設定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[辅助联动]]></value>
+			<value xml:lang="zh-TW"><![CDATA[連動設定]]></value>
+			<value xml:lang="fr"><![CDATA[Interlock Setting]]></value>
+			<value xml:lang="ru"><![CDATA[Interlock Setting]]></value>
+			<value xml:lang="es"><![CDATA[Interlock Setting]]></value>
+			<value xml:lang="tr"><![CDATA[Gömülü]]></value>
+			<value xml:lang="vi"><![CDATA[Tiện ích nâng cao]]></value>
+		</item>
+		<item name="accessory">
+			<value xml:lang="ko"><![CDATA[부가 기능 설정]]></value>
+			<value xml:lang="en"><![CDATA[Accessories]]></value>
+			<value xml:lang="jp"><![CDATA[付加機能設定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[附加功能]]></value>
+			<value xml:lang="zh-TW"><![CDATA[附加功能]]></value>
+			<value xml:lang="tr"><![CDATA[Donatılar]]></value>
+			<value xml:lang="vi"><![CDATA[Dịch vụ phụ]]></value>
+		</item>
+		<item name="migration">
+			<value xml:lang="ko"><![CDATA[데이터 관리/복원]]></value>
+			<value xml:lang="en"><![CDATA[Data Migration]]></value>
+			<value xml:lang="jp"><![CDATA[データ管理／復元]]></value>
+			<value xml:lang="zh-CN"><![CDATA[数据导入]]></value>
+			<value xml:lang="zh-TW"><![CDATA[資料轉換]]></value>
+			<value xml:lang="tr"><![CDATA[Veri Geçişi]]></value>
+			<value xml:lang="vi"><![CDATA[Chuyển đổi dữ liệu]]></value>
+		</item>
+		<item name="system">
+			<value xml:lang="ko"><![CDATA[시스템 관리]]></value>
+			<value xml:lang="en"><![CDATA[System Setting]]></value>
+			<value xml:lang="jp"><![CDATA[システム管理]]></value>
+			<value xml:lang="zh-CN"><![CDATA[系统管理]]></value>
+			<value xml:lang="zh-TW"><![CDATA[系統管理]]></value>
+			<value xml:lang="tr"><![CDATA[Sistem Ayarları]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập hệ thống]]></value>
+		</item>
+	</item>
+	<item name="menu_gnb" type="array">
+		<item name="dashboard">
+			<value xml:lang="ko"><![CDATA[제어판]]></value>
+			<value xml:lang="en"><![CDATA[Dashboard]]></value>
+			<value xml:lang="jp"><![CDATA[ダッシュボード]]></value>
+		</item>
+		<item name="site">
+			<value xml:lang="ko"><![CDATA[사이트]]></value>
+			<value xml:lang="en"><![CDATA[Site]]></value>
+			<value xml:lang="jp"><![CDATA[サイト]]></value>
+		</item>
+		<item name="user">
+			<value xml:lang="ko"><![CDATA[회원]]></value>
+			<value xml:lang="en"><![CDATA[Member]]></value>
+			<value xml:lang="jp"><![CDATA[会員]]></value>
+		</item>
+		<item name="content">
+			<value xml:lang="ko"><![CDATA[콘텐츠]]></value>
+			<value xml:lang="en"><![CDATA[Content]]></value>
+			<value xml:lang="jp"><![CDATA[コンテンツ]]></value>
+		</item>
+		<item name="theme">
+			<value xml:lang="ko"><![CDATA[테마]]></value>
+			<value xml:lang="en"><![CDATA[Theme]]></value>
+			<value xml:lang="jp"><![CDATA[テーマ]]></value>
+		</item>
+		<item name="extensions">
+			<value xml:lang="ko"><![CDATA[확장기능]]></value>
+			<value xml:lang="en"><![CDATA[Extensions]]></value>
+			<value xml:lang="jp"><![CDATA[拡張機能]]></value>
+		</item>
+		<item name="configuration">
+			<value xml:lang="ko"><![CDATA[설정]]></value>
+			<value xml:lang="en"><![CDATA[Settings]]></value>
+			<value xml:lang="jp"><![CDATA[設定]]></value>
+		</item>
+	</item>
+	<item name="newest_news">
+		<value xml:lang="ko"><![CDATA[최신 소식]]></value>
+		<value xml:lang="en"><![CDATA[Latest News]]></value>
+		<value xml:lang="jp"><![CDATA[最新ニュース]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最新消息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最新消息]]></value>
+		<value xml:lang="fr"><![CDATA[Dernières Nouvelles]]></value>
+		<value xml:lang="ru"><![CDATA[Последние новости]]></value>
+		<value xml:lang="es"><![CDATA[Noticias recientes]]></value>
+		<value xml:lang="tr"><![CDATA[Son Gelişmeler]]></value>
+		<value xml:lang="vi"><![CDATA[Tin mới nhất]]></value>
+	</item>
+	<item name="env_setup">
+		<value xml:lang="ko"><![CDATA[환경 설정]]></value>
+		<value xml:lang="en"><![CDATA[Settings]]></value>
+		<value xml:lang="jp"><![CDATA[環境設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[系统设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[系統設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration]]></value>
+		<value xml:lang="ru"><![CDATA[Настройка]]></value>
+		<value xml:lang="es"><![CDATA[Configuración]]></value>
+		<value xml:lang="tr"><![CDATA[Ayarlar]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập ]]></value>
+	</item>
+	<item name="default_url">
+		<value xml:lang="ko"><![CDATA[기본 URL]]></value>
+		<value xml:lang="en"><![CDATA[Default URL]]></value>
+		<value xml:lang="jp"><![CDATA[基本URL]]></value>
+		<value xml:lang="zh-CN"><![CDATA[XE通行证]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預設網址]]></value>
+		<value xml:lang="ru"><![CDATA[Основной URL]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan URL]]></value>
+		<value xml:lang="vi"><![CDATA[URL mặc định]]></value>
+	</item>
+	<item name="about_default_url">
+		<value xml:lang="ko"><![CDATA[여러 사이트를 운영할 때 기본 URL이 필요합니다. XE 설치 경로를 포함한 URL을 입력하세요. (예: http://도메인/설치경로)]]></value>
+		<value xml:lang="en"><![CDATA[Enter a default URL to be used to control multiple websites, including XE installation path. E.g.) http://domain//installation path)]]></value>
+		<value xml:lang="jp"><![CDATA[複数のサイトを運営する際の基本URLが必要です。XEインストールパスを含むURLを入力してください。(例：http://ドメイン/インストールパス)]]></value>
+	</item>
+	<item name="env_information">
+		<value xml:lang="ko"><![CDATA[환경 정보]]></value>
+		<value xml:lang="en"><![CDATA[Environment Information]]></value>
+		<value xml:lang="jp"><![CDATA[環境情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[系统信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[系統資訊]]></value>
+		<value xml:lang="fr"><![CDATA[Informations de l'Environnement]]></value>
+		<value xml:lang="ru"><![CDATA[Информация окружения]]></value>
+		<value xml:lang="es"><![CDATA[Información Ambiental]]></value>
+		<value xml:lang="tr"><![CDATA[Ortam Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin]]></value>
+	</item>
+	<item name="current_version">
+		<value xml:lang="ko"><![CDATA[설치된 버전]]></value>
+		<value xml:lang="en"><![CDATA[Current Version]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされているバージョン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装版本]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝版本]]></value>
+		<value xml:lang="fr"><![CDATA[Version Courante]]></value>
+		<value xml:lang="ru"><![CDATA[Текущая версия]]></value>
+		<value xml:lang="es"><![CDATA[Versión actual]]></value>
+		<value xml:lang="tr"><![CDATA[Güncel Sürüm]]></value>
+		<value xml:lang="vi"><![CDATA[Phiên bản]]></value>
+	</item>
+	<item name="current_path">
+		<value xml:lang="ko"><![CDATA[설치된 경로]]></value>
+		<value xml:lang="en"><![CDATA[Installed Path]]></value>
+		<value xml:lang="jp"><![CDATA[インストールパス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝路徑]]></value>
+		<value xml:lang="fr"><![CDATA[Chemin Installé]]></value>
+		<value xml:lang="ru"><![CDATA[Текущий путь]]></value>
+		<value xml:lang="es"><![CDATA[Instalado Sendero]]></value>
+		<value xml:lang="tr"><![CDATA[Yükleme Yolu]]></value>
+		<value xml:lang="vi"><![CDATA[Thư mục cài đặt]]></value>
+	</item>
+	<item name="released_version">
+		<value xml:lang="ko"><![CDATA[최신 버전]]></value>
+		<value xml:lang="en"><![CDATA[Latest Version]]></value>
+		<value xml:lang="jp"><![CDATA[最新バージョン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最新版本]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最新版本]]></value>
+		<value xml:lang="fr"><![CDATA[Dernière Version]]></value>
+		<value xml:lang="ru"><![CDATA[Последняя версия]]></value>
+		<value xml:lang="es"><![CDATA[Versión más reciente]]></value>
+		<value xml:lang="tr"><![CDATA[Son Sürüm]]></value>
+		<value xml:lang="vi"><![CDATA[Phiên bản mới nhất]]></value>
+	</item>
+	<item name="about_download_link">
+		<value xml:lang="ko"><![CDATA[최신 버전이 배포되었습니다.
+download 링크를 클릭하시면 다운 받으실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[New version of XE is now available!
+Please click the download link to get the latest version.]]></value>
+		<value xml:lang="jp"><![CDATA[新しいバージョンが配布されています。
+｢ダウンロード｣リンクをクリックするとダウンロードできます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[官方网站已发布最新版本XE。
+请点击[下载]链接下载最新版本。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[官方網站已發佈最新版本。
+請按[下載]下載最新版本。]]></value>
+		<value xml:lang="fr"><![CDATA[Nouvelle version est disponible.
+Pour télécharger la dernière version, cliquez le lien.]]></value>
+		<value xml:lang="ru"><![CDATA[Новая версия XE доступна.
+		Чтобы скачать последнюю версию, нажмите ссылку закачки]]></value>
+		<value xml:lang="es"><![CDATA[La versión más reciente Zerboard XE está disponible.
+Para descargar la versión más reciente, haga clic en enlace de descarga.]]></value>
+		<value xml:lang="tr"><![CDATA[Zeroboard XE'nin yeni sürümü yayımlandı!
+Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã có phiên bản mới nhất của XE.
+ Hãy bấm vào Link để Download.]]></value>
+	</item>
+	<item name="item_module">
+		<value xml:lang="ko"><![CDATA[모듈 목록]]></value>
+		<value xml:lang="en"><![CDATA[Module List]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Modules]]></value>
+		<value xml:lang="ru"><![CDATA[Список модулей]]></value>
+		<value xml:lang="es"><![CDATA[Lista de Módulos]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Module]]></value>
+	</item>
+	<item name="item_addon">
+		<value xml:lang="ko"><![CDATA[애드온 목록]]></value>
+		<value xml:lang="en"><![CDATA[Addon List]]></value>
+		<value xml:lang="jp"><![CDATA[アドオンリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[插件目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[元件列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Compagnons]]></value>
+		<value xml:lang="ru"><![CDATA[Список аддонов]]></value>
+		<value xml:lang="es"><![CDATA[Lista de Addons]]></value>
+		<value xml:lang="tr"><![CDATA[Eklenti Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Addon]]></value>
+	</item>
+	<item name="item_widget">
+		<value xml:lang="ko"><![CDATA[위젯 목록]]></value>
+		<value xml:lang="en"><![CDATA[Widget List]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェットリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Gadgets]]></value>
+		<value xml:lang="ru"><![CDATA[Список виджетов]]></value>
+		<value xml:lang="es"><![CDATA[Lista de Widgets]]></value>
+		<value xml:lang="tr"><![CDATA[Widget Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Widget]]></value>
+	</item>
+	<item name="item_layout">
+		<value xml:lang="ko"><![CDATA[레이아웃 목록]]></value>
+		<value xml:lang="en"><![CDATA[Layout List]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Mises en Pages]]></value>
+		<value xml:lang="ru"><![CDATA[Список лейаутов]]></value>
+		<value xml:lang="es"><![CDATA[Liasta de Diseños]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Layout]]></value>
+	</item>
+	<item name="module_name">
+		<value xml:lang="ko"><![CDATA[모듈 이름]]></value>
+		<value xml:lang="en"><![CDATA[Module Name]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Module]]></value>
+		<value xml:lang="ru"><![CDATA[Имя модуля]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del Módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Modül İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Module]]></value>
+	</item>
+	<item name="addon_name">
+		<value xml:lang="ko"><![CDATA[애드온 이름]]></value>
+		<value xml:lang="en"><![CDATA[Addon Name]]></value>
+		<value xml:lang="jp"><![CDATA[アドオン名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[插件名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[元件名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Compagnon]]></value>
+		<value xml:lang="ru"><![CDATA[Имя аддона]]></value>
+		<value xml:lang="es"><![CDATA[Nombre de Addon]]></value>
+		<value xml:lang="tr"><![CDATA[Eklenti İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Addon]]></value>
+	</item>
+	<item name="version">
+		<value xml:lang="ko"><![CDATA[버전]]></value>
+		<value xml:lang="en"><![CDATA[Version]]></value>
+		<value xml:lang="jp"><![CDATA[バージョン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版本]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版本]]></value>
+		<value xml:lang="ru"><![CDATA[Версия]]></value>
+		<value xml:lang="es"><![CDATA[Versión]]></value>
+		<value xml:lang="tr"><![CDATA[Sürüm]]></value>
+		<value xml:lang="vi"><![CDATA[Phiên bản]]></value>
+	</item>
+	<item name="table_count">
+		<value xml:lang="ko"><![CDATA[테이블 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of Table]]></value>
+		<value xml:lang="jp"><![CDATA[テーブル数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[表格数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[表格數]]></value>
+		<value xml:lang="fr"><![CDATA[Somme de Tables]]></value>
+		<value xml:lang="ru"><![CDATA[Номер таблицы]]></value>
+		<value xml:lang="es"><![CDATA[Número de los tableros]]></value>
+		<value xml:lang="tr"><![CDATA[Tablo Numarası]]></value>
+		<value xml:lang="vi"><![CDATA[Table]]></value>
+	</item>
+	<item name="installed_path">
+		<value xml:lang="ko"><![CDATA[설치 경로]]></value>
+		<value xml:lang="en"><![CDATA[Installed Path]]></value>
+		<value xml:lang="jp"><![CDATA[インストールパス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝路徑]]></value>
+		<value xml:lang="fr"><![CDATA[Chemin Installé]]></value>
+		<value xml:lang="ru"><![CDATA[Путь установки]]></value>
+		<value xml:lang="es"><![CDATA[Ruta de instalación]]></value>
+		<value xml:lang="tr"><![CDATA[Yükleme Yolu]]></value>
+		<value xml:lang="vi"><![CDATA[Thư mục đã cài đặt]]></value>
+	</item>
+	<item name="cmd_shortcut_management">
+		<value xml:lang="ko"><![CDATA[메뉴 편집하기]]></value>
+		<value xml:lang="en"><![CDATA[Edit Menu]]></value>
+		<value xml:lang="jp"><![CDATA[メニューの編集]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编辑菜单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[編輯選單]]></value>
+		<value xml:lang="fr"><![CDATA[Editer le Menu]]></value>
+		<value xml:lang="ru"><![CDATA[Редактировать меню]]></value>
+		<value xml:lang="es"><![CDATA[Editar el Menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa Menu]]></value>
+	</item>
+	<item name="msg_is_not_administrator">
+		<value xml:lang="ko"><![CDATA[관리자만 접속이 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Administrator Only]]></value>
+		<value xml:lang="jp"><![CDATA[管理者のみアクセスできます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只允许管理员访问]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只有管理員才可以檢視]]></value>
+		<value xml:lang="fr"><![CDATA[Administrateur seulement]]></value>
+		<value xml:lang="ru"><![CDATA[Только для администраторов!]]></value>
+		<value xml:lang="es"><![CDATA[Sólo se permite el ingreso del administrador.]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece Yöneticiler]]></value>
+		<value xml:lang="vi"><![CDATA[Dành riêng Administrator]]></value>
+	</item>
+	<item name="msg_manage_module_cannot_delete">
+		<value xml:lang="ko"><![CDATA[모듈, 애드온, 레이아웃, 위젯 모듈의 바로가기는 삭제 불가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Shortcuts of module, addon, layout, widget cannot be removed.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール、アドオン、レイアウト、ウィジェットモジュールのショートカットは、削除できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块，插件，布局，控件模块的快捷菜单是不能删除的。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組，附加元件，版面設計，Widget的快速選單是無法刪除的。]]></value>
+		<value xml:lang="fr"><![CDATA[On ne peut pas supprimer les raccourcis pour les modules, les compagnons, les mises en page ou les gadgets]]></value>
+		<value xml:lang="ru"><![CDATA[Ярлыки модулей, аддонов, лейаутов, виджетов не могут быть удалены]]></value>
+		<value xml:lang="es"><![CDATA[No se puede eliminar acceso directo del Módulo, Addon, Diseño y Widget.]]></value>
+		<value xml:lang="tr"><![CDATA[Modüllerin, eklentilerin, yerleşim düzenlerinin, widgetların kısayolları silinemez.]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể xóa những phím tắt của Module, Addon, Layout, Widget.]]></value>
+	</item>
+	<item name="msg_default_act_is_null">
+		<value xml:lang="ko"><![CDATA[기본 관리자 Action이 지정되어 있지 않아 바로가기 등록을 할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Shortcut could not be registered because the default admin Action is not set.]]></value>
+		<value xml:lang="jp"><![CDATA[デフォルトの管理者アクションが指定されていないため、ショートカットを登録することができません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有指定默认管理员的动作，是不能添加到快捷菜单的。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有指定預設管理員的動作，是無法新增到快速選單的。]]></value>
+		<value xml:lang="fr"><![CDATA[on ne peut pas enrégistrer les raccourcis parce que les Actions Par Défaut de l'Administrateur ne sont pas établies]]></value>
+		<value xml:lang="ru"><![CDATA[Ярлык не может быть зарегистрирован, поскольку стандартное административное действие не установлено]]></value>
+		<value xml:lang="es"><![CDATA[No se puede registrar acceso directo por no estar determinada la acción del administrador predefinido.]]></value>
+		<value xml:lang="tr"><![CDATA[Kısayol varsayılan yönetici eylemi ayarlanmadığından kayıt edilemiyor.]]></value>
+		<value xml:lang="vi"><![CDATA[Phím tắt đã không được tạo, bởi vì bạn không được đặt quyền là quản lý toàn diện.]]></value>
+	</item>
+	<item name="welcome_to_xe">
+		<value xml:lang="ko"><![CDATA[XE 관리자]]></value>
+		<value xml:lang="en"><![CDATA[Welcome to the admin page of XE]]></value>
+		<value xml:lang="jp"><![CDATA[XEの管理者ページです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[XE 管理页面]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XE管理頁面]]></value>
+		<value xml:lang="fr"><![CDATA[Bienvenue sur la Page d'Administration du XE]]></value>
+		<value xml:lang="ru"><![CDATA[Добро пожаловать на страницу администратора XE]]></value>
+		<value xml:lang="es"><![CDATA[Esta es la página del Administrador de XE]]></value>
+		<value xml:lang="tr"><![CDATA[XE Yönetici Sayfasına Hoşgeldiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Chào mừng bạn đến với trang quản lý của XE!]]></value>
+	</item>
+	<item name="about_lang_env">
+		<value xml:lang="ko"><![CDATA[처음 방문하는 사용자들의 언어 설정을 동일하게 하려면, 원하는 언어로 변경 후 아래 [저장] 버튼을 클릭하시면 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[To set the selected language as the default language, click the Save button.]]></value>
+		<value xml:lang="jp"><![CDATA[初めてサイトに訪問したユーザーに、上記での選択言語でサイトを表示させるためには、必ず下記の「保存」ボタンをクリックして適用してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置显示给首次访问者的同一语言环境。修改语言环境后请点击 [保存] 按钮进行保存。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇預設語言。選擇完畢後，請按[儲存]按鈕。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez fixer la Langue Par Défaut par cliquer le boutton [Conserver] au-dessous. Les visiteurs vont voir tous les menus et les messages en langue que vous choisissez.]]></value>
+		<value xml:lang="ru"><![CDATA[Чтобы применить выбранный язык для пользователей как страндартный, нажмите кнопку Сохранить [Save] после изменения]]></value>
+		<value xml:lang="es"><![CDATA[Para aplicar idioma seleccionado conjunto de los usuarios, como por defecto, haga clic en el botón [Guardar] el cambio.]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen dili varsayılan dil olarak uygulamak için, lütfen Kaydet tuşuna basınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Để hiển thị ngôn ngữ đã chọn là mặc định. Hãy bấm [Lưu] phía dưới để lưu lại.]]></value>
+	</item>
+	<item name="xe_license">
+		<value xml:lang="ko"><![CDATA[XE는 GPL을 따릅니다.]]></value>
+		<value xml:lang="en"><![CDATA[XE complies with the GPL.]]></value>
+		<value xml:lang="jp"><![CDATA[XEのライセンスはGPLです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[XE遵循 GPL协议]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XE遵循 GPL協議]]></value>
+		<value xml:lang="fr"><![CDATA[XE s'applique la GPL]]></value>
+		<value xml:lang="ru"><![CDATA[XE подчиняется Стандартной Общественной Лицензии GPL]]></value>
+		<value xml:lang="es"><![CDATA[XE está bajo la Licencia de GPL]]></value>
+		<value xml:lang="tr"><![CDATA[XE GPL ile uyumludur]]></value>
+		<value xml:lang="vi"><![CDATA[XE sử dụng giấy phép GPL]]></value>
+	</item>
+	<item name="about_shortcut">
+		<value xml:lang="ko"><![CDATA[자주 사용하는 모듈에 등록된 모듈의 바로가기를 삭제할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may remove shortcuts of modules which are registered on frequently used module list.]]></value>
+		<value xml:lang="jp"><![CDATA[よく使うモジュールに登録されているモジュールのショートカットは、削除できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以删除添加到常用模块中的快捷菜单。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以刪除新增到常用模組中的快速選單。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez supprimer les raccourcis pour les modules qui sont enrgistrés sur le liste des modules qui sont utilisés fréquemment]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете удалить ярлыки модулей, зарегистрированных в списке часто используемых модулей]]></value>
+		<value xml:lang="es"><![CDATA[Puede Eliminar los accesos directos de módulos, los cuales fueron registrados en la lista de módulos usados frecuentemente]]></value>
+		<value xml:lang="tr"><![CDATA[Sık kullanılan modüller listesine kaydedilmiş modüllerin kısayollarını silebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể loại bỏ phím tắt của Module được sử dụng thường xuyên trên danh sách.]]></value>
+	</item>
+	<item name="yesterday">
+		<value xml:lang="ko"><![CDATA[어제]]></value>
+		<value xml:lang="en"><![CDATA[Yesterday]]></value>
+		<value xml:lang="jp"><![CDATA[昨日]]></value>
+		<value xml:lang="zh-TW"><![CDATA[昨天]]></value>
+		<value xml:lang="ru"><![CDATA[Вчера]]></value>
+		<value xml:lang="tr"><![CDATA[Dün]]></value>
+		<value xml:lang="vi"><![CDATA[Hôm qua]]></value>
+	</item>
+	<item name="today">
+		<value xml:lang="ko"><![CDATA[오늘]]></value>
+		<value xml:lang="en"><![CDATA[Today]]></value>
+		<value xml:lang="jp"><![CDATA[今日]]></value>
+		<value xml:lang="zh-TW"><![CDATA[今天]]></value>
+		<value xml:lang="ru"><![CDATA[Сегодня]]></value>
+		<value xml:lang="tr"><![CDATA[Bugün]]></value>
+		<value xml:lang="vi"><![CDATA[Hôm nay]]></value>
+	</item>
+	<item name="about_lang_select">
+		<value xml:lang="ko"><![CDATA[지원할 언어를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select a language.]]></value>
+		<value xml:lang="jp"><![CDATA[サポート言語を選択してください。]]></value>
+	</item>
+	<item name="about_default_lang">
+		<value xml:lang="ko"><![CDATA[기본 언어를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select default language.]]></value>
+	</item>
+	<item name="about_recompile_cache">
+		<value xml:lang="ko"><![CDATA[쓸모 없어졌거나 잘못된 캐시파일들을 지우시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Delete useless or invalid cache files?]]></value>
+		<value xml:lang="jp"><![CDATA[必要なくなったり、無効なキャッシュファイルを削除しますか？]]></value>
+	</item>
+	<item name="confirm_run">
+		<value xml:lang="ko"><![CDATA[오랜 시간이 걸릴 수 있습니다. 실행하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[It may take a long time. Do you want to run?]]></value>
+	</item>
+	<item name="use_ssl">
+		<value xml:lang="ko"><![CDATA[SSL(Secure Sockets Layer)을 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to use Secure Sockets Layer (SSL)?]]></value>
+		<value xml:lang="jp"><![CDATA[SSL(Secure Sockets Layer)を使用しますか?]]></value>
+	</item>
+	<item name="ssl_options" type="array">
+		<item name="none">
+			<value xml:lang="ko"><![CDATA[사용 안함]]></value>
+			<value xml:lang="en"><![CDATA[Never]]></value>
+			<value xml:lang="jp"><![CDATA[使わない]]></value>
+			<value xml:lang="zh-CN"><![CDATA[不使用]]></value>
+			<value xml:lang="zh-TW"><![CDATA[關閉]]></value>
+			<value xml:lang="fr"><![CDATA[Ne Pas utiliser]]></value>
+			<value xml:lang="ru"><![CDATA[Никогда]]></value>
+			<value xml:lang="es"><![CDATA[Desactivar]]></value>
+			<value xml:lang="tr"><![CDATA[Hiçbir zaman]]></value>
+			<value xml:lang="vi"><![CDATA[Không sử dụng]]></value>
+		</item>
+		<item name="optional">
+			<value xml:lang="ko"><![CDATA[선택적으로]]></value>
+			<value xml:lang="en"><![CDATA[Optional]]></value>
+			<value xml:lang="jp"><![CDATA[部分的に使う]]></value>
+			<value xml:lang="zh-CN"><![CDATA[选择性]]></value>
+			<value xml:lang="zh-TW"><![CDATA[手動]]></value>
+			<value xml:lang="fr"><![CDATA[Optionnel]]></value>
+			<value xml:lang="ru"><![CDATA[На выбор]]></value>
+			<value xml:lang="es"><![CDATA[Opcionalmente el]]></value>
+			<value xml:lang="tr"><![CDATA[İsteğe Bağlı]]></value>
+			<value xml:lang="vi"><![CDATA[Tùy chỉnh]]></value>
+		</item>
+		<item name="always">
+			<value xml:lang="ko"><![CDATA[항상 사용]]></value>
+			<value xml:lang="en"><![CDATA[Always]]></value>
+			<value xml:lang="jp"><![CDATA[常に使う]]></value>
+			<value xml:lang="zh-CN"><![CDATA[使用]]></value>
+			<value xml:lang="zh-TW"><![CDATA[開啟]]></value>
+			<value xml:lang="fr"><![CDATA[Toujours]]></value>
+			<value xml:lang="ru"><![CDATA[Всегда]]></value>
+			<value xml:lang="es"><![CDATA[Utilice siempre el]]></value>
+			<value xml:lang="tr"><![CDATA[Her zaman]]></value>
+			<value xml:lang="vi"><![CDATA[Luôn luôn]]></value>
+		</item>
+	</item>
+	<item name="about_use_ssl">
+		<value xml:lang="ko"><![CDATA['선택적으로'는 회원가입, 정보수정 등의 지정된 action에서 SSL을 사용합니다.<br /> '항상 사용'은 모든 서비스에 SSL을 사용 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Select 'Optional' to use SSL for the specified actions such as signing up and changing information.<br /> 'Always' to use SSL for all services.]]></value>
+		<value xml:lang="jp"><![CDATA[「部分的に使う」は、「会員登録/会員情報変更」など指定のアクションでSSLを利用する場合。「常に使う」は、すべてのサービスにSSLを使う場合に選択します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择性使用选项应用于新用户注册/修改用户信息等已指定的action当中，使用选项应用于所有服务。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL功能。<br/>選擇開啟時，所有的服務都會使用 SSL功能。]]></value>
+		<value xml:lang="fr"><![CDATA[Si l'on choisit 'Optionnel' , on utilise protocole SSL seulement dans quelques services comme inscription ou modification. Si l'on choisit 'Toujours', on utilise protocole SSL dans tous les services.]]></value>
+		<value xml:lang="ru"><![CDATA[In case of "Optional", SSL will be used for actions such as signing up / changing information. And for "Always", your site will be served only via https]]></value>
+		<value xml:lang="es"><![CDATA[Opcionalmente, la composición de suscripción / editar la información y el uso de SSL especificada en la acción es siempre el uso de SSL para todos los servicios que se utilizarán]]></value>
+		<value xml:lang="tr"><![CDATA['İsteği Bağlı' seçiminde; SSL, kayıt olma/bilgi değiştirme gibi eylemler için kullanılacaktır. 'Her zaman' seçiminde, siteniz sadece http yoluyla hizmet verecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn chọn 'Tùy chỉnh', SSL sẽ sử dụng và những công việc như đăng kí, sửa thông tin thành viên, .<br />Chỉ chọn 'Luôn luôn' khi Website của bạn đang chạy trên Server có hỗ trợ https.]]></value>
+	</item>
+	<item name="server_ports">
+		<value xml:lang="ko"><![CDATA[서버포트지정]]></value>
+		<value xml:lang="en"><![CDATA[Server Port]]></value>
+		<value xml:lang="jp"><![CDATA[サーバーポート指定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[指定服务器端口]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主機埠口]]></value>
+		<value xml:lang="fr"><![CDATA[déclarer le port de serveur]]></value>
+		<value xml:lang="es"><![CDATA[Especifique el puerto del servidor]]></value>
+		<value xml:lang="tr"><![CDATA[Sunucu Bağlantı Noktası (port)]]></value>
+		<value xml:lang="vi"><![CDATA[Cổng kết nối]]></value>
+	</item>
+	<item name="about_server_ports">
+		<value xml:lang="ko"><![CDATA[HTTP는 80, HTTPS는 443 이 아닌, 다른 포트를 사용할 경우에 포트를 지정해 주어야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[If your web server does not use 80 for HTTP or 443 for HTTPS port, you should specify server ports.]]></value>
+		<value xml:lang="jp"><![CDATA[一般的に使われているHTTPの80、HTTPSの443以外の他のポートを使うには、ポートを指定してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用除HTTP（80）, HTTPS（443）以外的端口时，必须得指定该服务器端口号。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[HTTP、HTTPS預設埠口分別是『80』、『443』<br />如果想使用其他的埠口的話，請自行設定。]]></value>
+		<value xml:lang="fr"><![CDATA[Si l'on ne veut pas utiliser le port 80 pour HTTP mais un autre port, ou bien, si l'on ne veut pas utiliser le port 443 pour HTTPS mais un autre port, on doit déclarer les ports.]]></value>
+		<value xml:lang="es"><![CDATA[80 de HTTP, HTTPS al puerto 443 si se utiliza otro que se especifique lo contrario, el puerto va a necesitar.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer web sunucunuz, HTTP bağlantı noktaları için 80 ya da HTTPS 443 portunu kullanmıyorsa, sunucu bağlantı noktalarını belirtmeniz gerekmektedir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu Host của bạn sử dụng cổng khác cổng mặc định 80 cho HTTP, 443 cho HTTPS, bạn nên xác định và nhập chính xác cổng kết nối.]]></value>
+	</item>
+	<item name="use_db_session">
+		<value xml:lang="ko"><![CDATA[인증 세션 DB 사용]]></value>
+		<value xml:lang="en"><![CDATA[Use Session DB]]></value>
+		<value xml:lang="jp"><![CDATA[DBで認証セッション管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[DB储存认证会话]]></value>
+		<value xml:lang="zh-TW"><![CDATA[DB session認證]]></value>
+		<value xml:lang="tr"><![CDATA[Oturum Veritabanı Kullanımı]]></value>
+		<value xml:lang="vi"><![CDATA[Xác nhận Database]]></value>
+	</item>
+	<item name="about_db_session">
+		<value xml:lang="ko"><![CDATA[인증 시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용률이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다.<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[This setting will use PHP session used for authentication as DB.<br/>For the Websites which do not use web server frequently, you can uncheck this setting to improve response time.<br/>However, session DB will make it difficult to get current users, so you cannot use related functions.]]></value>
+		<value xml:lang="jp"><![CDATA[認証の際に使われるPHPセッションをDBで使う機能です。<br />ウェブサーバーの負荷が低いサイトではこの機能をオフにすることでむしろサイトのレスポンスが向上されることもあります。<br />ただし、この機能をオンにすると、「現在ログイン中の会員」の機能を利用できなくなります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用DB储存认证时的PHP会话。<br/>服务器使用率较少的网站建议不要勾选此项(可提高网站访问速度)。<br/>只是无法统计在线会员。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用 PHP session進行 DB認證。<br/>關閉此功能對於負荷較低的網站可提高效率。<br/>使用此功能會無法統計線上人數。]]></value>
+		<value xml:lang="fr"><![CDATA[인증시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용율이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.]]></value>
+		<value xml:lang="ru"><![CDATA[It will use php session with DB when authenticating.<br/>Websites with infrequent usage of web server may expect faster response when this function is disabled.<br/>However session DB will make it unable to get current users, so you cannot use related functions]]></value>
+		<value xml:lang="es"><![CDATA[인증시 사용되는 PHP 세션을 DB로 사용하는 기능입니다.<br/>웹서버의 사용율이 낮은 사이트에서는 비활성화시 사이트 응답 속도가 향상될 수 있습니다<br/>단 현재 접속자를 구할 수 없어 관련된 기능을 사용할 수 없게 됩니다.]]></value>
+		<value xml:lang="tr"><![CDATA[Yetersiz web sunucusu kullanımı olan websiteleri için, bu özellik devredışı bırakıldığı zaman daha hızlı bir tepki beklenebilir.<br/>Ancak oturum veritabanı, mevcut kullanıcılar için veritabanını erişilemez hâle getirecektir ve ilgili işler kullanılamaz hale gelecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[PHP sẽ xác nhận với Database. Có thể cải thiện được tốc độ của Website.]]></value>
+	</item>
+	<item name="qmail_compatibility">
+        	<value xml:lang="ko"><![CDATA[Qmail 사용]]></value>
+	        <value xml:lang="en"><![CDATA[Enable Qmail]]></value>
+			<value xml:lang="jp"><![CDATA[Qmail使用]]></value>
+	</item>
+	<item name="sftp">
+		<value xml:lang="ko"><![CDATA[SFTP 사용]]></value>
+		<value xml:lang="en"><![CDATA[Use SFTP]]></value>
+		<value xml:lang="jp"><![CDATA[SFTP使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用sSFTP]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用 SFTP]]></value>
+		<value xml:lang="tr"><![CDATA[SFTP Kullan]]></value>
+		<value xml:lang="vi"><![CDATA[Sử dụng SFTP]]></value>
+	</item>
+	<item name="ftp_get_list">
+		<value xml:lang="ko"><![CDATA[목록 가져오기]]></value>
+		<value xml:lang="en"><![CDATA[Get List]]></value>
+		<value xml:lang="jp"><![CDATA[ディレクトリ目録要求]]></value>
+		<value xml:lang="zh-CN"><![CDATA[载入列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[取得列表]]></value>
+		<value xml:lang="tr"><![CDATA[Listeyi Al]]></value>
+		<value xml:lang="vi"><![CDATA[Nhận danh sách]]></value>
+	</item>
+	<item name="ftp_remove_info">
+		<value xml:lang="ko"><![CDATA[FTP 정보 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Remove FTP Info.]]></value>
+		<value xml:lang="jp"><![CDATA[FTP情報削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除FTP信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移除 FTP 資料]]></value>
+		<value xml:lang="ru"><![CDATA[Remove FTP Info]]></value>
+		<value xml:lang="tr"><![CDATA[FTP Bilgisini Sil.]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa thông tin FTP.]]></value>
+	</item>
+	<item name="msg_ftp_invalid_path">
+		<value xml:lang="ko"><![CDATA[FTP Path를 읽을 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to read the specified FTP Path.]]></value>
+		<value xml:lang="jp"><![CDATA[指定されたFTPパスへのアクセスに失敗しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无法读取FTP路径。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[指定的 FTP 路徑讀取失敗。]]></value>
+		<value xml:lang="tr"><![CDATA[Belirtilen FTP Yolunu okuma işlemi başarız oldu.]]></value>
+		<value xml:lang="vi"><![CDATA[Không tìm thấy thông tin của thư mục bạn đã nhập trên FTP.]]></value>
+	</item>
+	<item name="about_use_ftp_passive_mode">
+		<value xml:lang="ko"><![CDATA[Passive 모드를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Use FTP Passive Mode?]]></value>
+		<value xml:lang="jp"><![CDATA[Passiveモードを使用しますか?]]></value>
+	</item>
+	<item name="about_use_sftp_support">
+		<value xml:lang="ko"><![CDATA[SFTP 를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Use SFTP?]]></value>
+	</item>	
+	<item name="msg_self_restart_cache_engine">
+		<value xml:lang="ko"><![CDATA[Memcached 또는 캐쉬데몬을 재시작 해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please restart Memcached or cache daemon.]]></value>
+		<value xml:lang="jp"><![CDATA[メムキャッシュドまたはキャッシュデーモンを再起動してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请重新启动Memcached或CacheDaemon。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請重新啟動 Memcached/cache daemon快取程式。]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen önbellek geri plan yordamını veya Memcached' ı yeniden başlatınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy thiết lập lại bộ nhớ Cache hoặc Deamon Cache.]]></value>
+	</item>
+	<item name="autoinstall">
+		<value xml:lang="ko"><![CDATA[쉬운 설치]]></value>
+		<value xml:lang="en"><![CDATA[EasyInstall]]></value>
+		<value xml:lang="jp"><![CDATA[イージーインストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装·更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[自動安裝]]></value>
+		<value xml:lang="tr"><![CDATA[KolayKurulum]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật tự động]]></value>
+	</item>
+	<item name="last_week">
+		<value xml:lang="ko"><![CDATA[지난 주]]></value>
+		<value xml:lang="en"><![CDATA[Last week]]></value>
+		<value xml:lang="jp"><![CDATA[先週]]></value>
+		<value xml:lang="zh-TW"><![CDATA[上週]]></value>
+		<value xml:lang="tr"><![CDATA[Geçen Hafta]]></value>
+	</item>
+	<item name="this_week">
+		<value xml:lang="ko"><![CDATA[이번 주]]></value>
+		<value xml:lang="en"><![CDATA[This week]]></value>
+		<value xml:lang="jp"><![CDATA[今週]]></value>
+		<value xml:lang="zh-TW"><![CDATA[本週]]></value>
+		<value xml:lang="tr"><![CDATA[Bu Hafta]]></value>
+	</item>
+	<item name="trash">
+		<value xml:lang="ko"><![CDATA[휴지통]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
+		<value xml:lang="zh-CN"><![CDATA[垃圾]]></value>
+		<value xml:lang="zh-TW"><![CDATA[垃圾]]></value>
+		<value xml:lang="fr"><![CDATA[Poubelle]]></value>
+		<value xml:lang="ru"><![CDATA[мусор]]></value>
+		<value xml:lang="es"><![CDATA[Basura]]></value>
+		<value xml:lang="tr"><![CDATA[çöp]]></value>
+		<value xml:lang="vi"><![CDATA[Thùng rác]]></value>
+	</item>
+	<item name="accusation">
+		<value xml:lang="ko"><![CDATA[신고]]></value>
+		<value xml:lang="en"><![CDATA[Report]]></value>
+		<value xml:lang="jp"><![CDATA[通報]]></value>
+	</item>
+	<item name="status">
+		<value xml:lang="ko"><![CDATA[상태]]></value>
+		<value xml:lang="en"><![CDATA[Status]]></value>
+		<value xml:lang="jp"><![CDATA[状態]]></value>
+	</item>
+	<item name="action">
+		<value xml:lang="ko"><![CDATA[실행]]></value>
+		<value xml:lang="en"><![CDATA[Execute]]></value>
+		<value xml:lang="jp"><![CDATA[実行]]></value>
+	</item>
+	<item name="select_module_id">
+		<value xml:lang="ko"><![CDATA[모듈 아이디를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select a module ID.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールIDを選択してください。]]></value>
+	</item>
+	<item name="use_cdn">
+		<value xml:lang="ko"><![CDATA[CDN 사용]]></value>
+		<value xml:lang="en"><![CDATA[Use CDN]]></value>
+		<value xml:lang="jp"><![CDATA[CDN使用]]></value>
+	</item>
+	<item name="about_use_rewrite">
+		<value xml:lang="ko"><![CDATA[짧은 주소를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to use Rewrite Mod?]]></value>
+		<value xml:lang="jp"><![CDATA[短縮アドレスを使用しますか？]]></value>
+	</item>
+	<item name="about_timezone">
+		<value xml:lang="ko"><![CDATA[현지 표준시를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Set the local standard time.]]></value>
+		<value xml:lang="jp"><![CDATA[現地の標準時間を設定してください。]]></value>
+	</item>
+	<item name="about_html_dtd">
+		<value xml:lang="ko"><![CDATA[HTML DTD를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Set HTML DTD.]]></value>
+		<value xml:lang="jp"><![CDATA[HTML DTDを設定してください。]]></value>
+	</item>
+	<item name="html5">
+		<value xml:lang="ko"><![CDATA[HTML5]]></value>
+		<value xml:lang="en"><![CDATA[HTML5]]></value>
+	</item>
+	<item name="xhtml_transitional">
+		<value xml:lang="ko"><![CDATA[XHTML 1.0 Transitional]]></value>
+		<value xml:lang="en"><![CDATA[XHTML 1.0 Transitional]]></value>
+	</item>
+	<item name="about_html_dtd">
+		<value xml:lang="ko"><![CDATA[HTML DTD를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Set HTML DTD.]]></value>
+		<value xml:lang="jp"><![CDATA[HTML DTDを設定してください。]]></value>
+	</item>
+	<item name="about_question_mobile_view">
+		<value xml:lang="ko"><![CDATA[모바일 기기에서 접속할 때 모바일 페이지를 보여줄까요?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to show the mobile page when users access the website with their mobile phone?]]></value>
+		<value xml:lang="jp"><![CDATA[モバイル機器で接続した際にモバイルページを表示しますか？]]></value>
+	</item>
+	<item name="about_thumbnail_type">
+		<value xml:lang="ko"><![CDATA[썸네일 생성 방식을 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select thumbnail type.]]></value>
+		<value xml:lang="jp"><![CDATA[サムネイルの生成方式を選択してください。]]></value>
+	</item>
+	<item name="input_footer_script">
+		<value xml:lang="ko"><![CDATA[풋터 스크립트 삽입]]></value>
+		<value xml:lang="en"><![CDATA[Input footer script]]></value>
+	</item>
+	<item name="detail_input_footer_script">
+		<value xml:lang="ko"><![CDATA[최하단에 코드를 삽입합니다. <br />관리자 페이지에서는 수행되지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The script is inserted into the bottom of body. <br /> Manager page does not work.]]></value>
+	</item>
+	<item name="corp">
+		<value xml:lang="ko"><![CDATA[Crop(잘라내기)]]></value>
+		<value xml:lang="en"><![CDATA[Crop(Cut)]]></value>
+		<value xml:lang="jp"><![CDATA[切り取り]]></value>
+	</item>
+	<item name="ratio">
+		<value xml:lang="ko"><![CDATA[Ratio(비율 맞추기)]]></value>
+		<value xml:lang="en"><![CDATA[Ratio(Keep Aspect)]]></value>
+		<value xml:lang="jp"><![CDATA[Ratio(縦横の比率をキープ)]]></value>
+	</item>
+	<item name="ratio">
+		<value xml:lang="ko"><![CDATA[Ratio(비율 맞추기)]]></value>
+		<value xml:lang="en"><![CDATA[Ratio(Keep Aspect)]]></value>
+		<value xml:lang="jp"><![CDATA[Ratio(縦横の比率をキープ)]]></value>
+	</item>
+	<item name="about_admin_ip_limit">
+		<value xml:lang="ko"><![CDATA[관리자 페이지로 접근가능한 IP대역을 지정합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Sepcify IP address band that can access the admin page.]]></value>
+		<value xml:lang="jp"><![CDATA[管理者ページへアクセス可能なIP帯域を指定します。]]></value>
+	</item>
+	<item name="local_ip_address">
+		<value xml:lang="ko"><![CDATA[로컬 IP 주소]]></value>
+		<value xml:lang="en"><![CDATA[Local IP address]]></value>
+	</item>
+	<item name="detail_about_admin_ip_limit">
+		<value xml:lang="ko"><![CDATA[해당 IP에 대해서만 관리자 페이지로 접근이 가능하므로 주의해주시기 바랍니다.<br /> IP대역 정보는 /files/config/db.config.php 파일에 저장됩니다.<br />여러개의 항목은 줄을 바꾸어 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please note that only the specified IP addresses can access the admin page.<br /> The information on IP address band is stored in  /files/config/db.config.php.<br />Change the line to multiple IP.]]></value>
+	　　<value xml:lang="jp"><![CDATA[該当IPについてのみ管理者ページへアクセスできるため、注意してください。<br />IP帯域情報は、/files/config/db.config.php ファイルに保存されます。<br />Change the line to multiple IP.]]></value>
+	</item>
+	<item name="detail_about_ftp_info">
+		<value xml:lang="ko"><![CDATA[
+	FTP 정보를 입력하면 쉬운 설치를 가능하도록 합니다.<br />
+	FTP정보는 files/config/ftp.config.php 파일에 저장됩니다.<br />
+	쉬운 설치가 불가능한 경우 PHP의 safe_mode를 On으로 변경해야 합니다.
+]]></value>
+		<value xml:lang="en"><![CDATA[
+	When you enter FTP information to enable easy installation.<br />
+	The information on FTP is stored in files/config/ftp.config.php.<br />
+	If you are unable to easy install, PHP's 'safe_mode' must be changed 'On'
+]]></value>
+	</item>
+	<item name="allow_use_favicon">
+		<value xml:lang="ko"><![CDATA[파비콘을 사용할까요?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to use favicon?]]></value>
+		<value xml:lang="jp"><![CDATA[ファビコンを使用しますか?]]></value>
+	</item>
+	<item name="about_use_favicon">
+		<value xml:lang="ko"><![CDATA[16 x 16 크기의 <em>*.ico</em> 파일만 업로드 가능.]]></value>
+		<value xml:lang="en"><![CDATA[You can upload 16x16 size <em>*.ico</em> file only.]]></value>
+		<value xml:lang="jp"><![CDATA[16 x 16 サイズの<em>*.ico</em> ファイルのみ登録できます。]]></value>
+	</item>
+	<item name="allow_use_mobile_icon">
+		<value xml:lang="ko"><![CDATA[모바일 홈 화면 아이콘을 사용할까요?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to use the mobile home screen icon?]]></value>
+		<value xml:lang="jp"><![CDATA[モバイル待ち受け画面のアイコンを使用しますか?]]></value>
+	</item>
+	<item name="detail_use_mobile_icon">
+		<value xml:lang="ko"><![CDATA[57 x 57 또는 114 x 114 크기의 <em>*.png</em> 파일만 업로드 가능.]]></value>
+		<value xml:lang="en"><![CDATA[You can upload 57x57 or 114x114 size <em>*.png</em> file only.]]></value>
+		<value xml:lang="jp"><![CDATA[57 x 57 、または114 x 114 サイズの<em>*.png</em> ファイルのみ登録できます。]]></value>
+	</item>
+	<item name="about_use_sso">
+		<value xml:lang="ko"><![CDATA[SSO(Single Sign On)를 사용하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to use Single Sign On (SSO)?]]></value>
+		<value xml:lang="jp"><![CDATA[SSO(Single Sign On)を使用しますか?]]></value>
+	</item>
+	<item name="about_cdn">
+		<value xml:lang="ko"><![CDATA[XE core의 css, js 파일을 CDN으로부터 제공받으려면 체크하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Check this to get css and js files of XE core from CDN.]]></value>
+		<value xml:lang="jp"><![CDATA[XE coreのcss、jsファイルをCDNより取得するには、チェックしてください。]]></value>
+	</item>
+	<item name="about_arrange_session">
+		<value xml:lang="ko"><![CDATA[세션을 정리하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to clean up session?]]></value>
+		<value xml:lang="jp"><![CDATA[セッションを整理しますか？]]></value>
+	</item>
+	<item name="cmd_clear_session">
+		<value xml:lang="ko"><![CDATA[세션 정리]]></value>
+		<value xml:lang="en"><![CDATA[Clean up session]]></value>
+		<value xml:lang="jp"><![CDATA[セッション整理]]></value>
+	</item>
+	<item name="msg_not_correct_iconname">
+		<value xml:lang="ko"><![CDATA[아이콘 형식이 바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid icon type]]></value>
+		<value xml:lang="jp"><![CDATA[アイコン形式が正しくありません。]]></value>
+	</item>
+	<item name="msg_possible_only_file">
+		<value xml:lang="ko"><![CDATA[파일만 업로드 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can upload files only.]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルのみアップロード可能です。]]></value>
+	</item>
+	<item name="save">
+		<value xml:lang="ko"><![CDATA[저장]]></value>
+		<value xml:lang="en"><![CDATA[Save]]></value>
+		<value xml:lang="jp"><![CDATA[保存]]></value>
+	</item>
+	<item name="view">
+		<value xml:lang="ko"><![CDATA[보기]]></value>
+		<value xml:lang="en"><![CDATA[View]]></value>
+		<value xml:lang="jp"><![CDATA[表示]]></value>
+	</item>
+	<item name="select">
+		<value xml:lang="ko"><![CDATA[선택]]></value>
+		<value xml:lang="en"><![CDATA[Select]]></value>
+		<value xml:lang="jp"><![CDATA[選択]]></value>
+	</item>
+	<item name="delete">
+		<value xml:lang="ko"><![CDATA[삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete]]></value>
+		<value xml:lang="jp"><![CDATA[削除]]></value>
+	</item>
+	<item name="add">
+		<value xml:lang="ko"><![CDATA[추가]]></value>
+		<value xml:lang="en"><![CDATA[Add]]></value>
+		<value xml:lang="jp"><![CDATA[追加]]></value>
+	</item>
+	<item name="theme_desc">
+		<value xml:lang="ko"><![CDATA[테마는 레이아웃을 포함하여 현재 설치된 모듈의 스킨을 묶은 개념입니다. 테마를 선택하면 'Skin Setting' 항목을 알아서 선택합니다. 테마 일부가 마음에 들지 않으면 'Skin Setting'에서 테마 일부를 다시 설정 할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Theme is a set of skins for modules currently installed including layouts. When you select Theme, 'Skin Setting' is automatically selected. If you don't like some of the theme, you can edit it on 'Skin Setting'.]]></value>
+		<value xml:lang="jp"><![CDATA[テーマは、レイアウトを含み現在インストールされているモジュールのスキンをまとめたものです。テーマを選択すると、「スキン設定」項目が自動的に選択されます。テーマの一部が気に入らない場合は、「スキン設定」でテーマの一部を再設定できます。]]></value>
+	</item>
+	<item name="selected_theme">
+		<value xml:lang="ko"><![CDATA[선택한 테마]]></value>
+		<value xml:lang="en"><![CDATA[Selected Theme]]></value>
+		<value xml:lang="jp"><![CDATA[選択したテーマ]]></value>
+	</item>
+	<item name="no_selected_theme_desc">
+		<value xml:lang="ko"><![CDATA[관리자가 설정한 테마입니다. 테마를 설정하지 않은 경우 디폴트로 노출됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[This is a defult theme specified by the administrator. If you don't specify one, this theme will be shown by default.]]></value>
+		<value xml:lang="jp"><![CDATA[管理者が設定したテーマです。テーマを設定しない場合、デフォルト表示されます。]]></value>
+	</item>
+	<item name="user_define_skin_select_desc">
+		<value xml:lang="ko"><![CDATA[테마의 일부가 마음에 들지 않으면 스킨을 직접 선택하세요. 스킨을 직접 선택하면 'Theme Setting' 설정은 'User Defined'로 설정됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[If you don't like some of the theme, select a skin for yourself. When you select your own skin, 'Theme Setting' is set to 'User Defined'.]]></value>
+　　　　<value xml:lang="jp"><![CDATA[テーマの一部が気に入らなかった場合、スキンを選択してください。スキンを選択すると、「テーマ設定」は、「ユーザー定義」に設定されます。]]></value>
+		</item>
+	<item name="selected_layout">
+		<value xml:lang="ko"><![CDATA[선택한 레이아웃]]></value>
+		<value xml:lang="en"><![CDATA[Selected Layout]]></value>
+		<value xml:lang="jp"><![CDATA[選択したレイアウト]]></value>
+	</item>
+	<item name="selected_skin">
+		<value xml:lang="ko"><![CDATA[선택한 %s 스킨]]></value>
+		<value xml:lang="en"><![CDATA[Selected %s Skin]]></value>
+		<value xml:lang="jp"><![CDATA[選択した%sスキン]]></value>
+	</item>
+	<item name="no_selected_skin">
+		<value xml:lang="ko"><![CDATA[선택한 %s 스킨 없음]]></value>
+		<value xml:lang="en"><![CDATA[No Selected %s Skin]]></value>
+		<value xml:lang="jp"><![CDATA[選択した%sスキンなし]]></value>
+	</item>
+	<item name="no_selected_skin_desc">
+		<value xml:lang="ko"><![CDATA[선택한 테마에는 이 항목에 대한 스킨 정보가 없습니다. 스킨을 직접 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[The selected theme has no skin information for this item. Select a skin.]]></value>
+		<value xml:lang="jp"><![CDATA[選択したテーマには、この項目についてのスキン情報がありません。スキンを直接選択してください。]]></value>
+	</item>
+	<item name="no_select">
+		<value xml:lang="ko"><![CDATA[선택안함]]></value>
+		<value xml:lang="en"><![CDATA[No Select]]></value>
+		<value xml:lang="jp"><![CDATA[選択しない]]></value>
+	</item>
+	<item name="admin_logo">
+		<value xml:lang="ko"><![CDATA[관리자 페이지 로고]]></value>
+		<value xml:lang="en"><![CDATA[Admin Page Logo]]></value>
+		<value xml:lang="jp"><![CDATA[管理者ページロゴ]]></value>
+	</item>
+	<item name="admin_title">
+		<value xml:lang="ko"><![CDATA[관리자 페이지 제목]]></value>
+		<value xml:lang="en"><![CDATA[Admin Page Title]]></value>
+		<value xml:lang="jp"><![CDATA[管理者ページタイトル]]></value>
+	</item>
+	<item name="admin_menu_add">
+		<value xml:lang="ko"><![CDATA[관리자 메뉴 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Admin Menu]]></value>
+		<value xml:lang="jp"><![CDATA[管理者メニュー追加]]></value>
+	</item>
+	<item name="bug_report">
+		<value xml:lang="ko"><![CDATA[버그 리포트]]></value>
+		<value xml:lang="en"><![CDATA[Bug Report]]></value>
+	</item>
+	<item name="theme_setting">
+		<value xml:lang="ko"><![CDATA[테마 설정]]></value>
+		<value xml:lang="en"><![CDATA[Theme Setting]]></value>
+	</item>
+	<item name="skin_setting">
+		<value xml:lang="ko"><![CDATA[스킨 설정]]></value>
+		<value xml:lang="en"><![CDATA[Skin Setting]]></value>
+	</item> 
+	<item name="msg_thumbnail_not_exist">
+		<value xml:lang="ko"><![CDATA[썸네일이 없습니다]]></value>
+		<value xml:lang="en"><![CDATA[Thumbnail does not exist]]></value>
+	</item>
+	<item name="user_theme">
+		<value xml:lang="ko"><![CDATA[사용자 테마]]></value>
+		<value xml:lang="en"><![CDATA[User Theme]]></value>
+	</item>
+	<item name="user_define">
+		<value xml:lang="ko"><![CDATA[사용자 정의 테마]]></value>
+		<value xml:lang="en"><![CDATA[User Defined]]></value>
+	</item>
+	<item name="by_you"> 
+		<value xml:lang="ko"><![CDATA[사용자 설정]]></value>
+		<value xml:lang="en"><![CDATA[By You]]></value>
+	</item>
+	<item name="update_available">
+		<value xml:lang="ko"><![CDATA[업데이트 가능]]></value>
+		<value xml:lang="en"><![CDATA[Update Available]]></value>
+	</item> 
+	<item name="admin_menu_setup">
+		<value xml:lang="ko"><![CDATA[관리자 메뉴 설정]]></value>
+		<value xml:lang="en"><![CDATA[Admin Menu Setup]]></value> 
+	</item>
+	<item name="no_data">
+		<value xml:lang="ko"><![CDATA[등록된 데이터가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is no data.]]></value> 
+	</item>
+	<item name="cmd_admin_menu_reset">
+		<value xml:lang="ko"><![CDATA[관리자 메뉴 초기화]]></value>
+		<value xml:lang="en"><![CDATA[Reset admin menu]]></value> 
+	</item>
+	<item name="confirm_reset_admin_menu">
+		<value xml:lang="ko"><![CDATA[관리자 메뉴를 초기화하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to initialize the admin menu?]]></value> 
+	</item>
+	<item name="ftp_form_title">
+		<value xml:lang="ko"><![CDATA[FTP 계정 정보 입력]]></value>
+		<value xml:lang="en"><![CDATA[FTP Account Information]]></value>
+		<value xml:lang="jp"><![CDATA[サーバーのFTP情報の入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[设置FTP信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入 FTP 資訊]]></value>
+		<value xml:lang="fr"><![CDATA[FTP 정보 입력]]></value>
+		<value xml:lang="de"><![CDATA[FTP-Server festlegen]]></value>
+		<value xml:lang="ru"><![CDATA[Введите данные FTP]]></value>
+		<value xml:lang="es"><![CDATA[Datos de conexión para FTP]]></value>
+		<value xml:lang="tr"><![CDATA[FTP Hesap Bilgileri]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin FTP]]></value>
+		<value xml:lang="mn"><![CDATA[FTP мэдээлэл оруулах]]></value>
+	</item>
+	<item name="ftp">
+		<value xml:lang="ko"><![CDATA[FTP]]></value>
+		<value xml:lang="en"><![CDATA[FTP]]></value>
+		<value xml:lang="jp"><![CDATA[FTP]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP]]></value>
+		<value xml:lang="zh-TW"><![CDATA[FTP]]></value>
+		<value xml:lang="fr"><![CDATA[FTP]]></value>
+		<value xml:lang="de"><![CDATA[FTP]]></value>
+		<value xml:lang="ru"><![CDATA[FTP]]></value>
+		<value xml:lang="es"><![CDATA[FTP]]></value>
+		<value xml:lang="tr"><![CDATA[FTP]]></value>
+		<value xml:lang="vi"><![CDATA[FTP]]></value>
+		<value xml:lang="mn"><![CDATA[FTP]]></value>
+	</item>
+	<item name="ftp_host">
+		<value xml:lang="ko"><![CDATA[FTP 서버 주소]]></value>
+		<value xml:lang="en"><![CDATA[FTP hostname]]></value>
+		<value xml:lang="jp"><![CDATA[FTPサーバーアドレス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP服务器名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[FTP 主機名稱]]></value>
+		<value xml:lang="de"><![CDATA[FTP-Server hostname]]></value>
+		<value xml:lang="tr"><![CDATA[FTP sistem adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Host FTP]]></value>
+	</item>
+	<item name="ftp_port">
+		<value xml:lang="ko"><![CDATA[FTP port]]></value>
+		<value xml:lang="en"><![CDATA[FTP port]]></value>
+		<value xml:lang="jp"><![CDATA[FTPポート番号（port）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP端口]]></value>
+		<value xml:lang="zh-TW"><![CDATA[FTP 埠口]]></value>
+		<value xml:lang="de"><![CDATA[FTP Port]]></value>
+		<value xml:lang="tr"><![CDATA[FTP portu]]></value>
+		<value xml:lang="vi"><![CDATA[Cổng kết nối]]></value>
+	</item>
+	<item name="about_ftp_password">
+		<value xml:lang="ko"><![CDATA[FTP Password는 저장되지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[FTP password will not be stored.]]></value>
+		<value xml:lang="jp"><![CDATA[FTP情報は保存できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP密码不会被保存。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不會儲存 FTP 密碼]]></value>
+		<value xml:lang="de"><![CDATA[Das Passwort des FTPs wird nicht gespeichert.]]></value>
+		<value xml:lang="tr"><![CDATA[FTP şifresi saklanmayacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu của FTP sẽ không lưu lại]]></value>
+	</item>
+	<item name="cmd_check_ftp_connect">
+		<value xml:lang="ko"><![CDATA[FTP 접속 확인]]></value>
+		<value xml:lang="en"><![CDATA[Check FTP Connection]]></value>
+		<value xml:lang="jp"><![CDATA[FTP接続を確認する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[测试FTP连接]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢查 FTP 連線]]></value>
+		<value xml:lang="de"><![CDATA[Verbindung des FTPs checken]]></value>
+		<value xml:lang="es"><![CDATA[conexión de FTP confirmada]]></value>
+		<value xml:lang="tr"><![CDATA[FTP Bağlantısını kontrol ediniz]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểm tra kết nối bằng FTP]]></value>
+		<value xml:lang="mn"><![CDATA[FTP холболт шалгах]]></value>
+	</item>
+	<item name="msg_safe_mode_ftp_needed">
+		<value xml:lang="ko"><![CDATA[PHP의 <strong>safe_mode=On</strong>일 경우 XE의 정상적인 동작을 돕습니다.]]></value>
+		<value xml:lang="en"><![CDATA[When safe_mode setting of PHP is On, you should enter FTP account information to install XE.]]></value>
+		<value xml:lang="jp"><![CDATA[PHPのsafe_modeがOnの場合、FTP情報を登録することで、XEのインストール及び利用が可能になります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[当PHP的safe_mode=On时，请必须输入相关FTP信息，否则将无法正常安装或使用XE程序。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[當 PHP 的安全模式(safe_mode)開啟時，請輸入相關 FTP 資訊，否則無法正常安裝或使用程式。]]></value>
+		<value xml:lang="fr"><![CDATA[PHP의 safe_mode가 On일 경우 FTP 정보를 꼭 입력해주셔야 XE의 설치 및 사용이 가능합니다]]></value>
+		<value xml:lang="de"><![CDATA[Zur Installation und Nutzung des XEs muss die Angabe des FTPs festgestellt werden, wenn safe_mode in PHP 'An' ist.]]></value>
+		<value xml:lang="es"><![CDATA[Si la la variable safe_mode está activa[safe_mode=On], debe rellenar los datos de FTP para seguir instalando y usar con normalidad el XE.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer PHP güvenli mod ayarları etkinse, XE'yi kurmak için FTP hesap bilgilerini girmelisiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu safe_mode của PHP mở, bạn có thể cài đặt các thành phần bổ xung cho XE một cách tự động qua FTP.]]></value>
+		<value xml:lang="mn"><![CDATA[PHP의 safe_mode가 Onбайх тохиолдолд , FTP мэдээллийг заавал оруулснаар XE идэвжvvлэх болон хэрэглэх боломжтой болно.]]></value>
+	</item>
+	<item name="msg_safe_mode_ftp_needed2">
+		<value xml:lang="ko"><![CDATA[모듈의 쉬운 설치 또는 업데이트가 가능해 집니다.]]></value>
+		<value xml:lang="en"><![CDATA[Easy installation or update of module is enabled.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールのイージーインストール、または更新が可能になります。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可用的安裝或更新。]]></value>
+	</item>
+	<item name="msg_safe_mode_ftp_config">
+		<value xml:lang="ko"><![CDATA[이 정보는 <strong>files/config/ftp.config.php</strong> 파일에 저장 됩니다. 설치 후 환경설정 페이지에서도 등록, 변경, 제거 할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[This information is stored in <strong>files/config/ftp.config.php</strong>. You can add, change or delete this on the Settings page after the installation.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[此資料會儲存在 <strong>files/config/ftp.config.php</strong> 檔案中。 安裝後可在設定頁面中新增、更改或刪除此資訊。]]></value>
+		<value xml:lang="de"><![CDATA[Die Angabe wird unter <strong>files/config/ftp.config.php</strong> gespeichert. Nach der Installation ist es auch möglich, dass die Angabe von Administrator modifiziert oder gelöscht werden kann.]]></value>
+	</item>
+	<item name="msg_ftp_not_connected">
+		<value xml:lang="ko"><![CDATA[localhost로의 FTP 접속 오류가 발생했습니다. FTP 포트 번호를 확인해주시거나 FTP 서비스가 가능한지 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Connection to the localhost via FTP failed. Please check the port number and whether the FTP service is available.]]></value>
+		<value xml:lang="jp"><![CDATA[localhostへのFTP接続エラーが発生しました。FTPポート(port)番号をはじめ、FTPサービスが可能であるかを確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发生本地(localhost)FTP连接错误。请确认ftp端口号及支持ftp服务与否。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[本地(localhost) FTP連線錯誤。請檢查 FTP 埠口並確認是否支援 FTP 功能。]]></value>
+		<value xml:lang="fr"><![CDATA[localhost로의 FTP 접속 오류가 발생하였습니다. ftp 포트 번호를 확인해주시거나 ftp 서비스가 가능한지 확인해주세요]]></value>
+		<value xml:lang="de"><![CDATA[Ein Verbindungsfehler des FTPs an localhost ist aufgetreten. Bitte FTP_Port checken, oder ob FTP_Service möglich ist.]]></value>
+		<value xml:lang="ru"><![CDATA[Connection to localhost via FTP failed. Please check the port number and if FTP service is available.]]></value>
+		<value xml:lang="es"><![CDATA[Ha ocurrico un error de conexión al FTP del localhost. Verifique el puerto del FTP y/o el funcionamiento del servicio FTP.]]></value>
+		<value xml:lang="tr"><![CDATA[Yerel web alanına FTP bağlantısı sağlanamadı. Lütfen port numarasını ve FTP servisinin mevcut olup-olmadığını kontrol ediniz .]]></value>
+		<value xml:lang="vi"><![CDATA[Kết nối bằng FTP không thành công. Xin vui lòng kiểm tra lại thông tin tài khoản và cổng kết nối!]]></value>
+		<value xml:lang="mn"><![CDATA[localhost-ын FTP холболт амжилтгvй боллоо. FTP дугаараа шалгах буюу эсвэл FTP vйлчилгээг ашиглах боломжтой эсэхээ шалгана уу.]]></value>
+	</item>
+	<item name="msg_ftp_invalid_auth_info">
+		<value xml:lang="ko"><![CDATA[입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Authentication failed. Please check the username and password.]]></value>
+		<value xml:lang="jp"><![CDATA[ログインに失敗しました。FTPアクセス情報を再度確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP登录失败。请确认输入的FTP信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[FTP登入失敗。請確認輸入的 FTP 資訊。]]></value>
+		<value xml:lang="fr"><![CDATA[입력하신 FTP 정보로 로그인을 하지 못했습니다. FTP정보를 확인해주세요]]></value>
+		<value xml:lang="de"><![CDATA[Anmeldungsfehler mit der Angabe des FTPs Bitte die Angabe des FTPs festlegen.]]></value>
+		<value xml:lang="es"><![CDATA[Los datos de login para el FTP no son correctos. Veriféquelos.]]></value>
+		<value xml:lang="tr"><![CDATA[Kimlik doğrulama başarısız oldu. Lütfen kullanıcı adını ve şifreyi kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xác nhận thất bại. Xin vui lòng kiểm tra lại tên sử dụng và mật khẩu.]]></value>
+		<value xml:lang="mn"><![CDATA[Таны оруулсан FTP мэдээллээр нэвтэрч чадсангvй. FTPмэдээллээ шалгана уу.]]></value>
+	</item>
+	<item name="msg_ftp_mkdir_fail">
+		<value xml:lang="ko"><![CDATA[FTP를 이용한 디렉토리 생성 명령에 실패했습니다. FTP 서버의 설정을 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to create a directory using FTP. Please check the permission of FTP account.]]></value>
+		<value xml:lang="jp"><![CDATA[FTPでのディレクトリ生成に失敗しました。FTPサーバーの設定を再度確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[新建文件夹失败。请确认 FTP服务器设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增資料夾失敗。請確認 FTP 主機設置。]]></value>
+		<value xml:lang="fr"><![CDATA[FTP를 이용한 디렉토리 생성 명령을 실패하였습니다. FTP 서버의 설정을 확인해주세요]]></value>
+		<value xml:lang="de"><![CDATA[Der Befehl von Herstellung des Verzeichnisses durch FTP ist gescheitert. FTP_Server festlegen.]]></value>
+		<value xml:lang="es"><![CDATA[Ha fallado el comando de FTP para la creación de directorio. Verifique la configuración del servicio FTP en el servidor]]></value>
+		<value xml:lang="tr"><![CDATA[Dizin oluşturma başarısız oldu. Lütfen FTP hesap iznini kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Lỗi khi tạo thư mục. Xin vui lòng kiểm tra lại quyền truy cập FTP.]]></value>
+		<value xml:lang="mn"><![CDATA[FTP-г ашиглан eгсeн eгeгдлийг биелvvлж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.]]></value>
+	</item>
+	<item name="msg_ftp_chmod_fail">
+		<value xml:lang="ko"><![CDATA[FTP를 이용한 디렉토리의 속성 변경에 실패했습니다. FTP 서버의 설정을 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Chmod failed. Please check the permission and configuration of the FTP server.]]></value>
+		<value xml:lang="jp"><![CDATA[FTPでのディレクトリ属性変更に失敗しました。FTPサーバーの設定を再度確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改文件夹属性失败。请确认 FTP服务器设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改資料夾權限失敗。請確認 FTP 主機設置。]]></value>
+		<value xml:lang="fr"><![CDATA[FTP를 이용한 디렉토리의 속성 변경을 실패하였습니다. FTP 서버의 설정을 확인해주세요]]></value>
+		<value xml:lang="de"><![CDATA[Die Modifikation der Zugriffsberechtigung des Verzeichnisses durch FTP ist gescheitert. FTP_Server festlegen.]]></value>
+		<value xml:lang="ru"><![CDATA[Chmod failed. Please check the permission and configuration of FTP server.]]></value>
+		<value xml:lang="es"><![CDATA[Ha fallado el comando de FTP para la modificación de atributos de directorio. Verifique la configuración del servicio FTP en el servidor.]]></value>
+		<value xml:lang="tr"><![CDATA[Chmod başarılamadı. Lütfen FTP sunucusunun izin ve yapılandırmasını kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[CHMOD thất bại. Xin vui lòng kiểm tra lại.]]></value>
+		<value xml:lang="mn"><![CDATA[FTP-г ашиглан eeрчлeлтийг хийж чадсангvй. FTP серверийн идэвхжvvлэлтээ шалгана уу.]]></value>
+	</item>
+	<item name="msg_ftp_connect_success">
+		<value xml:lang="ko"><![CDATA[FTP 접속 및 인증에 성공했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Successfully connected to FTP server and authenticated.]]></value>
+		<value xml:lang="jp"><![CDATA[FTP接続、および認証に成功しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP连接成功。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[FTP連線成功。]]></value>
+		<value xml:lang="fr"><![CDATA[FTP 접속 및 인증 성공하였습니다]]></value>
+		<value xml:lang="de"><![CDATA[Die Verbindung zu FTP ist erfolgreich und verifiziert.]]></value>		
+		<value xml:lang="es"><![CDATA[conexión con éxito al FTP]]></value>
+		<value xml:lang="tr"><![CDATA[FTP sunucusu için bağlantı ve kimlik doğrulama sağlandı.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã xác nhận và kết nối thành công tới máy chủ bằng FTP.]]></value>
+		<value xml:lang="mn"><![CDATA[FTP холболт болон баталгаажуулалт хийгдлээ.]]></value>
+	</item>
+	<item name="ftp_path_title">
+		<value xml:lang="ko"><![CDATA[FTP 경로 정보 입력]]></value>
+		<value xml:lang="en"><![CDATA[FTP Path Information]]></value>
+		<value xml:lang="jp"><![CDATA[FTPパス情報入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入FTP路径信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入 FTP 路經]]></value>
+		<value xml:lang="de"><![CDATA[Pfad des FTPs eingeben]]></value>
+		<value xml:lang="tr"><![CDATA[FTP Yolu Bilgileri]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập thông tin đường dẫn của FTP.]]></value>
+	</item>
+	<item name="msg_ftp_installed_realpath">
+		<value xml:lang="ko"><![CDATA[설치된 XE의 절대경로]]></value>
+		<value xml:lang="en"><![CDATA[Absolute Path of XE]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされたXEの絶対パス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[XE绝对路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XE絕對路經]]></value>
+		<value xml:lang="de"><![CDATA[absoluter Pfad, in dem XE installiert ist.]]></value>
+		<value xml:lang="tr"><![CDATA[XE Salt Yolu]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn thư mục đã cài đặt XE]]></value>
+	</item>
+	<item name="msg_ftp_installed_ftp_realpath">
+		<value xml:lang="ko"><![CDATA[설치된 XE의 FTP 경로 설정]]></value>
+		<value xml:lang="en"><![CDATA[Absolute FTP Path of XE]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされたXEのFTP絶対パス設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[FTP绝对路径设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XE的 FTP 絕對路經]]></value>
+		<value xml:lang="fr"><![CDATA[설치된 XE의 FTP 절대경로 설정]]></value>
+		<value xml:lang="de"><![CDATA[absoluten Pfad des FTPs, in dem XE installiert ist, festlegen.]]></value>
+		<value xml:lang="es"><![CDATA[설치된 XE의 FTP 절대경로 설정]]></value>
+		<value xml:lang="tr"><![CDATA[XE Salt FTP Yolu]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn tuyệt đối của thư mục cài đặt XE trên FTP]]></value>
+	</item>
+	<item name="admin_setup">
+		<value xml:lang="ko"><![CDATA[관리자 설정]]></value>
+		<value xml:lang="en"><![CDATA[Admin Setup]]></value>
+	</item>
+</lang>
diff --git a/modules/admin/lang/ru.lang.php b/modules/admin/lang/ru.lang.php
deleted file mode 100644
index 32d906621..000000000
--- a/modules/admin/lang/ru.lang.php
+++ /dev/null
@@ -1,91 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack for XE
-     **/
-
-    $lang->admin_info = 'Информация администратора';
-    $lang->admin_index = 'Индексная страница администратора';
-    $lang->control_panel = 'Контрольная панель';
-    $lang->start_module = 'Стартовый модуль';
-    $lang->about_start_module = 'Вы можете указать модуль запуска по умолчанию.';
-
-    $lang->module_category_title = array(
-        'service' => 'Service Setting',
-        'member' => 'Member Setting',
-        'content' => 'Content Setting',
-        'statistics' => 'Statistics',
-        'construction' => 'Construction',
-        'utility' => 'Utility Setting',
-        'interlock' => 'Interlock Setting',
-        'accessory' => 'Accessories',
-        'migration' => 'Data Migration',
-        'system' => 'System Setting',
-    );
-
-    $lang->newest_news = 'Последние новости';
-    
-    $lang->env_setup = 'Настройка';
-    $lang->default_url = 'Основной URL';
-    $lang->about_default_url = 'If you use a virtual site feature (e.g., cafeXE), input default URL (parent-sites address), then SSO would be enabled, thus connection to documents/modules works properly';
-
-	$lang->env_information = 'Информация окружения';
-    $lang->current_version = 'Текущая версия';
-    $lang->current_path = 'Текущий путь';
-    $lang->released_version = 'Последняя версия';
-    $lang->about_download_link = 'Новая версия XE доступна.\nЧтобы скачать последнюю версию, нажмите ссылку закачки';
-    
-    $lang->item_module = 'Список модулей';
-    $lang->item_addon  = 'Список аддонов';
-    $lang->item_widget = 'Список виджетов';
-    $lang->item_layout = 'Список лейаутов';
-
-    $lang->module_name = 'Имя модуля';
-    $lang->addon_name = 'Имя аддона';
-    $lang->version = 'Версия';
-    $lang->author = 'Разработчик';
-    $lang->table_count = 'Номер таблицы';
-    $lang->installed_path = 'Путь установки';
-
-    $lang->cmd_shortcut_management = 'Редактировать меню';
-
-    $lang->msg_is_not_administrator = 'Только для администраторов!';
-    $lang->msg_manage_module_cannot_delete = 'Ярлыки модулей, аддонов, лейаутов, виджетов не могут быть удалены';
-    $lang->msg_default_act_is_null = 'Ярлык не может быть зарегистрирован, поскольку стандартное административное действие не установлено';
-
-    $lang->welcome_to_xe = 'Добро пожаловать на страницу администратора XE';
-    $lang->about_lang_env = 'Чтобы применить выбранный язык для пользователей как страндартный, нажмите кнопку Сохранить [Save] после изменения';
-
-    $lang->xe_license = 'XE подчиняется Стандартной Общественной Лицензии GPL';
-    $lang->about_shortcut = 'Вы можете удалить ярлыки модулей, зарегистрированных в списке часто используемых модулей';
-
-    $lang->yesterday = 'Вчера';
-    $lang->today = 'Сегодня';
-
-    $lang->cmd_lang_select = 'Выбор языка';
-    $lang->about_cmd_lang_select = 'Возможно использование только выбранных языков';
-    $lang->about_recompile_cache = 'You can delete useless or invalid cache files';
-    $lang->use_ssl = 'Использовать SSL';
-    $lang->ssl_options = array(
-        'none' => 'Никогда',
-        'optional' => 'На выбор',
-        'always' => 'Всегда'
-    );
-    $lang->about_use_ssl = 'In case of "Optional", SSL will be used for actions such as signing up / changing information. And for "Always", your site will be served only via https';
-    $lang->server_ports = 'Server Port';
-    $lang->about_server_ports = 'If your web server does not use 80 for HTTP or 443 for HTTPS port, you should specify server ports';
-    $lang->use_db_session = 'Use Session DB';
-    $lang->about_db_session = 'It will use php session with DB when authenticating.<br/>Websites with infrequent usage of web server may expect faster response when this function is disabled.<br/>However session DB will make it unable to get current users, so you cannot use related functions';
-    $lang->sftp = 'Use SFTP';
-    $lang->ftp_get_list = 'Get List';
-    $lang->ftp_remove_info = 'Remove FTP Info';
-	$lang->msg_ftp_invalid_path = 'Failed to read the specified FTP Path.';
-	$lang->msg_self_restart_cache_engine = 'Please restart Memcached or cache daemon.';
-	$lang->mobile_view = 'Use Mobile View';
-	$lang->about_mobile_view = 'If accessing with a smartphone, display content with mobile layout.';
-    $lang->autoinstall = 'EasyInstall';
-
-    $lang->last_week = 'Last week';
-    $lang->this_week = 'This week';
-?>
diff --git a/modules/admin/lang/tr.lang.php b/modules/admin/lang/tr.lang.php
deleted file mode 100644
index 5a887d3b5..000000000
--- a/modules/admin/lang/tr.lang.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only basic words are included here)
-     **/
-
-    $lang->admin_info = 'Yönetici Bilgisi';
-    $lang->admin_index = 'Indeks Yönetici Sayfası';
-    $lang->control_panel = 'Dashboard';
-    $lang->start_module = 'Varsayılan Modül';
-    $lang->about_start_module = 'Sitenin varsayılan modülünü belirleyebilirsiniz.';
-
-    $lang->module_category_title = array(
-        'service' => 'Hizmetler',
-        'member' => 'Yöneticiler',
-        'content' => 'İçerikler',
-        'statistics' => 'İstatistikler',
-        'construction' => 'Yapı',
-        'utility' => 'Yardımcı Uygulamalar',
-        'interlock' => 'Gömülü',
-        'accessory' => 'Donatılar',
-        'migration' => 'Veri Geçişi',
-        'system' => 'Sistem Ayarları',
-    );
-
-    $lang->newest_news = "Son Gelişmeler";
-    
-    $lang->env_setup = "Ayarlar";
-    $lang->default_url = "Varsayılan URL";
-    $lang->about_default_url = "Eğer sanal site özelliği kullanıyorsanız (örneğin, cafeXE), varsayılan URL girdisini yapınız (üst-sitenin adresi), SSO etkinleştirilecektir, böylece belgelere/modüllere sağlanan bağlantı uygun bir şekilde çalışacaktır. ";
-
-    $lang->env_information = "Ortam Bilgisi";
-    $lang->current_version = "Güncel Sürüm";
-    $lang->current_path = "Yükleme Yolu";
-    $lang->released_version = "Son Sürüm";
-    $lang->about_download_link = "Zeroboard XE'nin yeni sürümü yayımlandı!\nLütfen son sürümü için indirme linkine tıklayınız.";
-    
-    $lang->item_module = "Modül Listesi";
-    $lang->item_addon  = "Eklenti Listesi";
-    $lang->item_widget = "Widget Listesi";
-    $lang->item_layout = "Yerleşim Düzeni Listesi";
-
-    $lang->module_name = "Modül İsmi";
-    $lang->addon_name = "Eklenti İsmi";
-    $lang->version = "Sürüm";
-    $lang->author = "Geliştirici";
-    $lang->table_count = "Tablo Numarası";
-    $lang->installed_path = "Yükleme Yolu";
-
-    $lang->cmd_shortcut_management = "Menü Düzenle";
-
-    $lang->msg_is_not_administrator = 'Sadece Yöneticiler';
-    $lang->msg_manage_module_cannot_delete = 'Modüllerin, eklentilerin, yerleşim düzenlerinin, widgetların kısayolları silinemez.';
-    $lang->msg_default_act_is_null = 'Kısayol varsayılan yönetici eylemi ayarlanmadığından kayıt edilemiyor.';
-
-    $lang->welcome_to_xe = 'XE Yönetici Sayfasına Hoşgeldiniz';
-    $lang->about_admin_page = "Yönetici sayfası hâla geliştirilmektedir,\nClosebeta sürecinde birçok iyi öneriyi kabul ederek gerekli içerikleri ekleyeceğiz.";
-    $lang->about_lang_env = "Seçilen dili varsayılan dil olarak uygulamak için, lütfen Kaydet tuşuna basınız.";
-
-    $lang->xe_license = 'XE GPL ile uyumludur';
-    $lang->about_shortcut = 'Sık kullanılan modüller listesine kaydedilmiş modüllerin kısayollarını silebilirsiniz.';
-
-    $lang->yesterday = "Dün";
-    $lang->today = "Bugün";
-
-    $lang->cmd_lang_select = "Dil";
-    $lang->about_cmd_lang_select = "Sadece seçili dillerde hizmet verecektir.";
-    $lang->about_recompile_cache = "Gereksiz veya geçersiz önbellek dosyalarını silebilirsiniz.";
-    $lang->use_ssl = "SSL Kullan";
-    $lang->ssl_options = array(
-        'none' => "Hiçbir zaman",
-        'optional' => "İsteğe Bağlı",
-        'always' => "Her zaman"
-    );
-    $lang->about_use_ssl = "'İsteği Bağlı' seçiminde; SSL, kayıt olma/bilgi değiştirme gibi eylemler için kullanılacaktır. 'Her zaman' seçiminde, siteniz sadece http yoluyla hizmet verecektir.";
-    $lang->server_ports = "Sunucu Bağlantı Noktası (port)";
-    $lang->about_server_ports = "Eğer web sunucunuz, HTTP bağlantı noktaları için 80 ya da HTTPS 443 portunu kullanmıyorsa, sunucu bağlantı noktalarını belirtmeniz gerekmektedir.";
-    $lang->use_db_session = 'Oturum Veritabanı Kullanımı';
-    $lang->about_db_session = 'Yetersiz web sunucusu kullanımı olan websiteleri için, bu özellik devredışı bırakıldığı zaman daha hızlı bir tepki beklenebilir.<br/>Ancak oturum veritabanı, mevcut kullanıcılar için veritabanını erişilemez hâle getirecektir ve ilgili işler kullanılamaz hale gelecektir.';
-    $lang->sftp = "SFTP Kullan";
-    $lang->ftp_get_list = "Listeyi Al";
-    $lang->ftp_remove_info = 'FTP Bilgisini Sil.';
-	$lang->msg_ftp_invalid_path = 'Belirtilen FTP Yolunu okuma işlemi başarız oldu.';
-	$lang->msg_self_restart_cache_engine = 'Lütfen önbellek geri plan yordamını veya Memcached\' ı yeniden başlatınız.';
-	$lang->mobile_view = 'Hareketli Görünümü';
-	$lang->about_mobile_view = 'Hareketli görünümü, mobil cihazlarla giriş yapılırken, mobil cihazlara uygun en iyi yerleşim düzenini göstermek içindir.';
-    $lang->autoinstall = 'KolayKurulum';
-
-    $lang->last_week = 'Geçen Hafta';
-    $lang->this_week = 'Bu Hafta';
-?>
diff --git a/modules/admin/lang/vi.lang.php b/modules/admin/lang/vi.lang.php
deleted file mode 100644
index 22cba1de4..000000000
--- a/modules/admin/lang/vi.lang.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  DucDuy Dao (webmaster@xpressengine.vn)								  ░░
-			░░	* @Website:  http://xpressengine.vn												  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-*/
-			
-    $lang->admin_info = 'Thông tin Administrator';
-    $lang->admin_index = 'Trang chủ Admin';
-    $lang->control_panel = 'Bảng điều khiển';
-    $lang->start_module = 'Module trang chủ';
-    $lang->about_start_module = 'Bạn có thể chọn một Module và đặt là trang chủ của Website.';
-
-    $lang->module_category_title = array(
-        'service' => 'Thiết lập dịch vụ',
-        'member' => 'Thiết lập thành viên',
-        'content' => 'Thiết lập nội dung',
-        'statistics' => 'Thống kê',
-        'construction' => 'Xây dựng giao diện',
-        'utility' => 'Thiết lập tiện ích',
-        'interlock' => 'Tiện ích nâng cao',
-        'accessory' => 'Dịch vụ phụ',
-        'migration' => 'Chuyển đổi dữ liệu',
-        'system' => 'Thiết lập hệ thống',
-    );
-
-    $lang->newest_news = "Tin mới nhất";
-    
-    $lang->env_setup = "Thiết lập ";
-    $lang->default_url = "URL mặc định";
-    $lang->about_default_url = "Nếu bạn sử dụng tính năng trang Web ảo (Ví dụ: PlanetXE, cafeXE), hãy chọn URL mặc định (địa chỉ trang chủ), khi khi kích hoạt SSO với thư mục hay Module làm việc.";
-
-    $lang->env_information = "Thông tin";
-    $lang->current_version = "Phiên bản";
-    $lang->current_path = "Thư mục cài đặt";
-    $lang->released_version = "Phiên bản mới nhất";
-    $lang->about_download_link = "Đã có phiên bản mới nhất của XE.\n Hãy bấm vào Link để Download.";
-    
-    $lang->item_module = "Danh sách Module";
-    $lang->item_addon  = "Danh sách Addon";
-    $lang->item_widget = "Danh sách Widget";
-    $lang->item_layout = "Danh sách Layout";
-
-    $lang->module_name = "Tên Module";
-    $lang->addon_name = "Tên Addon";
-    $lang->version = "Phiên bản";
-    $lang->author = "Thiết kế";
-    $lang->table_count = "Table";
-    $lang->installed_path = "Thư mục đã cài đặt";
-
-    $lang->cmd_shortcut_management = "Sửa Menu";
-
-    $lang->msg_is_not_administrator = 'Dành riêng Administrator';
-    $lang->msg_manage_module_cannot_delete = 'Không thể xóa những phím tắt của Module, Addon, Layout, Widget.';
-    $lang->msg_default_act_is_null = 'Phím tắt đã không được tạo, bởi vì bạn không được đặt quyền là quản lý toàn diện.';
-
-    $lang->welcome_to_xe = 'Chào mừng bạn đến với trang quản lý của XE!';
-    $lang->about_admin_page = "Trang Admin này vẫn đang được phát triển,\n Chúng tôi sẽ thêm vào những nội dung chủ yếu từ những ý kiến của người sử dụng.";
-    $lang->about_lang_env = "Để hiển thị ngôn ngữ đã chọn là mặc định. Hãy bấm [Lưu] phía dưới để lưu lại.";
-
-    $lang->xe_license = 'XE sử dụng giấy phép GPL';
-    $lang->about_shortcut = 'Bạn có thể loại bỏ phím tắt của Module được sử dụng thường xuyên trên danh sách.';
-
-    $lang->yesterday = "Hôm qua";
-    $lang->today = "Hôm nay";
-
-    $lang->cmd_lang_select = "Ngôn ngữ";
-    $lang->about_cmd_lang_select = "Chỉ chọn được những ngôn ngữ có sẵn.";
-    $lang->about_recompile_cache = "Bạn có thể sắp xếp lại File Cache cho những việc đã làm hoặc bị lỗi.";
-    $lang->use_ssl = "Sử dụng SSL";
-    $lang->ssl_options = array(
-        'none' => "Không sử dụng",
-        'optional' => "Tùy chỉnh",
-        'always' => "Luôn luôn"
-    );
-    $lang->about_use_ssl = "Nếu bạn chọn 'Tùy chỉnh', SSL sẽ sử dụng và những công việc như đăng kí, sửa thông tin thành viên, .<br />Chỉ chọn 'Luôn luôn' khi Website của bạn đang chạy trên Server có hỗ trợ https.";
-    $lang->server_ports = "Cổng kết nối";
-    $lang->about_server_ports = "Nếu Host của bạn sử dụng cổng khác cổng mặc định 80 cho HTTP, 443 cho HTTPS, bạn nên xác định và nhập chính xác cổng kết nối.";
-    $lang->use_db_session = 'Xác nhận Database';
-    $lang->about_db_session = 'PHP sẽ xác nhận với Database. Có thể cải thiện được tốc độ của Website.';
-    $lang->sftp = "Sử dụng SFTP";
-    $lang->ftp_get_list = "Nhận danh sách";
-    $lang->ftp_remove_info = 'Xóa thông tin FTP.';
-	$lang->msg_ftp_invalid_path = 'Không tìm thấy thông tin của thư mục bạn đã nhập trên FTP.';
-	$lang->msg_self_restart_cache_engine = 'Hãy thiết lập lại bộ nhớ Cache hoặc Deamon Cache.';
-	$lang->mobile_view = 'Xem bằng di động';
-	$lang->about_mobile_view = 'Nếu truy cập bằng thiết bị di động, nội dung sẽ được bố trí theo từng loại thiết bị.';
-    $lang->autoinstall = 'Cập nhật tự động';
-
-    $lang->last_week = 'Last week';
-    $lang->this_week = 'This week';
-?>
diff --git a/modules/admin/lang/zh-CN.lang.php b/modules/admin/lang/zh-CN.lang.php
deleted file mode 100644
index 4112797e7..000000000
--- a/modules/admin/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  简体中文语言包
-     **/
-
-    $lang->admin_info = '管理员信息';
-    $lang->admin_index = '管理首页';
-    $lang->control_panel = '控制面板';
-    $lang->start_module = '首页模块';
-    $lang->about_start_module = '可指定用户访问网站时的默认首页模块。';
-
-    $lang->module_category_title = array(
-        'service' => '应用管理',
-        'member' => '用户管理',
-        'content' => '资源管理',
-        'statistics' => '统计管理',
-        'construction' => '界面管理',
-        'utility' => '扩展管理',
-        'interlock' => '辅助联动',
-        'accessory' => '附加功能',
-        'migration' => '数据导入',
-        'system' => '系统管理',
-    );
-
-    $lang->newest_news = "最新消息";
-
-    $lang->env_setup = "系统设置";
-    $lang->default_url = "XE通行证";
-    $lang->about_default_url = "请输入默认站点的XE安装地址(ex: http://域名/xe)。 <br /><strong>说明：</strong>简单的说，就是绑定帐号系统。只需要登录一次，就可以在用站点模块生成的多个子站点中随意漫游。";
-
-
-    $lang->env_information = "系统信息";
-    $lang->current_version = "安装版本";
-    $lang->current_path = "安装路径";
-    $lang->released_version = "最新版本";
-    $lang->about_download_link = "官方网站已发布最新版本XE。\n请点击[下载]链接下载最新版本。";
-
-    $lang->item_module = "模块目录";
-    $lang->item_addon  = "插件目录";
-    $lang->item_widget = "控件目录";
-    $lang->item_layout = "布局目录";
-
-    $lang->module_name = "模块名称";
-    $lang->addon_name = "插件名称";
-    $lang->version = "版本";
-    $lang->author = "作者";
-    $lang->table_count = "表格数";
-    $lang->installed_path = "安装路径";
-
-    $lang->cmd_shortcut_management = "编辑菜单";
-
-    $lang->msg_is_not_administrator = '只允许管理员访问';
-    $lang->msg_manage_module_cannot_delete = '模块，插件，布局，控件模块的快捷菜单是不能删除的。';
-    $lang->msg_default_act_is_null = '没有指定默认管理员的动作，是不能添加到快捷菜单的。';
-
-    $lang->welcome_to_xe = 'XE 管理页面';
-    $lang->about_lang_env = "可以设置显示给首次访问者的同一语言环境。修改语言环境后请点击 [保存] 按钮进行保存。";
-
-    $lang->xe_license = 'XE遵循 GPL协议';
-    $lang->about_shortcut = '可以删除添加到常用模块中的快捷菜单。';
-
-    $lang->yesterday = "Yesterday";
-    $lang->today = "Today";
-
-    $lang->cmd_lang_select = "多国语言支持";
-    $lang->about_cmd_lang_select = "请选择要使用的语言。";
-    $lang->about_recompile_cache = "整理无用的或错误的缓冲文件。";
-    $lang->use_ssl = "SSL使用";
-    $lang->ssl_options = array(
-        'none' => "不使用",
-        'optional' => "选择性",
-        'always' => "使用"
-    );
-    $lang->about_use_ssl = "选择性使用选项应用于新用户注册/修改用户信息等已指定的action当中，使用选项应用于所有服务。";
-    $lang->server_ports = "指定服务器端口";
-    $lang->about_server_ports = "使用除HTTP（80）, HTTPS（443）以外的端口时，必须得指定该服务器端口号。";
-    $lang->use_db_session = 'DB储存认证会话';
-    $lang->about_db_session = '用DB储存认证时的PHP会话。<br/>服务器使用率较少的网站建议不要勾选此项(可提高网站访问速度)。<br/>只是无法统计在线会员。';
-    $lang->sftp = '使用sSFTP'; 
-    $lang->ftp_get_list = '载入列表';
-    $lang->ftp_remove_info = '删除FTP信息';
-    $lang->msg_ftp_invalid_path = '无法读取FTP路径。';
-    $lang->msg_self_restart_cache_engine = '请重新启动Memcached或CacheDaemon。';
-    $lang->mobile_view = '开启移动版';
-    $lang->about_mobile_view = '为智能手机访问网站，提供最佳视觉效果。';
-    $lang->autoinstall = '安装·更新';
-
-    $lang->last_week = 'Last week';
-    $lang->this_week = 'This week';
-?>
diff --git a/modules/admin/lang/zh-TW.lang.php b/modules/admin/lang/zh-TW.lang.php
deleted file mode 100644
index 7c3f39d46..000000000
--- a/modules/admin/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,92 +0,0 @@
-<?php
-    /**
-     * @file   modules/admin/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  管理(admin)模組正體中文語言 (包含基本內容)
-     **/
-
-    $lang->admin_info = '管理員資訊';
-    $lang->admin_index = '管理頁面';
-    $lang->control_panel = '控制介面';
-    $lang->start_module = '預設首頁';
-    $lang->about_start_module = '可將所選擇的模組作為預設首頁。';
-
-    $lang->module_category_title = array(
-        'service' => '服務設定',
-        'member' => '會員管理',
-        'content' => '內容管理',
-        'statistics' => '統計資料',
-        'construction' => '界面設定',
-        'utility' => '擴充功能',
-        'interlock' => '連動設定',
-        'accessory' => '附加功能管理',
-        'migration' => '資料轉換',
-        'system' => '系統管理',
-    );
-
-    $lang->newest_news = "最新消息";
-
-    $lang->env_setup = "系統設置";
-    $lang->default_url = "預設網址";
-    $lang->about_default_url = "XE虛擬網站必須要先輸入預設的網址確保虛擬網站的運作，請輸入預設程式安裝路徑。<br />(例: http://網域名稱/安裝路徑)";
-
-
-    $lang->env_information = "系統資訊";
-    $lang->current_version = "安裝版本";
-    $lang->current_path = "安裝路徑";
-    $lang->released_version = "最新版本";
-    $lang->about_download_link = "官方網站已發佈最新版本。\n請按[下載]下載最新版本。";
-
-    $lang->item_module = "模組列表";
-    $lang->item_addon  = "元件列表";
-    $lang->item_widget = "Widget列表";
-    $lang->item_layout = "版面列表";
-
-    $lang->module_name = "模組名稱";
-    $lang->addon_name = "元件名稱";
-    $lang->version = "版本";
-    $lang->author = "作者";
-    $lang->table_count = "表格數";
-    $lang->installed_path = "安裝路徑";
-
-    $lang->cmd_shortcut_management = "編輯選單";
-
-    $lang->msg_is_not_administrator = '只有管理員才可以檢視';
-    $lang->msg_manage_module_cannot_delete = '模組，附加元件，版面設計，Widget的快速選單是無法刪除的。';
-    $lang->msg_default_act_is_null = '沒有指定預設管理員的動作，是無法新增到快速選單的。';
-
-    $lang->welcome_to_xe = 'XE管理頁面';
-    $lang->about_lang_env = "請選擇預設語言。選擇完畢後，請按[儲存]按鈕。";
-
-    $lang->xe_license = 'XE遵循 GPL 協議';
-    $lang->about_shortcut = '可以刪除新增到常用模組中的快速選單。';
-
-    $lang->yesterday = "昨天";
-    $lang->today = "今天";
-
-    $lang->cmd_lang_select = "選擇語言";
-    $lang->about_cmd_lang_select = "只提供所選擇的語言服務";
-    $lang->about_recompile_cache = "可有效的整理錯誤的暫存檔";
-    $lang->use_ssl = "SSL功能";
-    $lang->ssl_options = array(
-        'none' => "關閉",
-        'optional' => "手動",
-        'always' => "開啟"
-    );
-    $lang->about_use_ssl = "選擇手動時，在會員註冊或修改資料等動作時才會使用 SSL 功能。<br/>選擇開啟時，所有的服務都會使用 SSL 功能。";
-    $lang->server_ports = "主機埠口";
-    $lang->about_server_ports = "HTTP、HTTPS預設埠口分別是『80』、『443』<br />如果想使用其他的埠口的話，請自行設定。";
-    $lang->use_db_session = 'DB session認證';
-    $lang->about_db_session = '使用 PHP session 進行 DB 認證。<br/>關閉此功能對於負荷較低的網站可提高效率。<br/>使用此功能會無法統計線上人數。';
-    $lang->sftp = "使用 SFTP";
-    $lang->ftp_get_list = "取得列表";
-    $lang->ftp_remove_info = '移除 FTP 資料';
-	$lang->msg_ftp_invalid_path = '指定的 FTP 路徑讀取失敗。';
-	$lang->msg_self_restart_cache_engine = '請重新啟動 Memcached 快取程式。';
-	$lang->mobile_view = '手機瀏覽';
-	$lang->about_mobile_view = '使用手機瀏覽時將會顯示最適當的畫面。';
-    $lang->autoinstall = '自動安裝';
-
-    $lang->last_week = '上週';
-    $lang->this_week = '本週';
-?>
diff --git a/modules/admin/queries/deleteAllFavorite.xml b/modules/admin/queries/deleteAllFavorite.xml
new file mode 100644
index 000000000..20770685f
--- /dev/null
+++ b/modules/admin/queries/deleteAllFavorite.xml
@@ -0,0 +1,5 @@
+<query id="deleteAllFavorite" action="delete">
+	<tables>
+		<table name="admin_favorite" />
+	</tables>
+</query>
diff --git a/modules/admin/queries/deleteFavorite.xml b/modules/admin/queries/deleteFavorite.xml
new file mode 100644
index 000000000..20732bf71
--- /dev/null
+++ b/modules/admin/queries/deleteFavorite.xml
@@ -0,0 +1,8 @@
+<query id="deleteFavorite" action="delete">
+	<tables>
+		<table name="admin_favorite" />
+	</tables>
+	<conditions>
+		<condition operation="equal" column="admin_favorite_srl" var="admin_favorite_srl" filter="number" notnull="notnull" />
+	</conditions>
+</query>
diff --git a/modules/admin/queries/getFavorite.xml b/modules/admin/queries/getFavorite.xml
new file mode 100644
index 000000000..9d7e9f850
--- /dev/null
+++ b/modules/admin/queries/getFavorite.xml
@@ -0,0 +1,16 @@
+<query id="getFavorite" action="select">
+	<tables>
+		<table name="admin_favorite" />
+	</tables>
+	<columns>
+		<column name="*" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="admin_favorite_srl" var="favorite_srl" />
+		<condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
+		<condition operation="equal" column="module" var="module" pipe="and" />
+	</conditions>
+	<navigation>
+		<index var="sort_index" default="admin_favorite_srl" order="desc" />
+	</navigation>
+</query>
diff --git a/modules/admin/queries/getFavoriteList.xml b/modules/admin/queries/getFavoriteList.xml
new file mode 100644
index 000000000..027db1d3c
--- /dev/null
+++ b/modules/admin/queries/getFavoriteList.xml
@@ -0,0 +1,12 @@
+<query id="getFavoriteList" action="select">
+	<tables>
+		<table name="admin_favorite" />
+	</tables>
+	<columns>
+		<column name="*" />
+	</columns>
+	<conditions>
+		<condition operation="equal" column="site_srl" var="site_srl" />
+		<condition operation="equal" column="module" var="module" pipe="and" />
+	</conditions>
+</query>
diff --git a/modules/admin/queries/getSiteAllList.xml b/modules/admin/queries/getSiteAllList.xml
new file mode 100644
index 000000000..51af7b60e
--- /dev/null
+++ b/modules/admin/queries/getSiteAllList.xml
@@ -0,0 +1,12 @@
+<query id="getSiteAllList" action="select">
+    <tables>
+        <table name="sites" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="site_srl" var="siteSrls" />
+        <condition operation="like" column="domain" var="domain" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/admin/queries/getSiteCountByDate.xml b/modules/admin/queries/getSiteCountByDate.xml
new file mode 100644
index 000000000..68668f1e4
--- /dev/null
+++ b/modules/admin/queries/getSiteCountByDate.xml
@@ -0,0 +1,11 @@
+<query id="getSiteCountByDate" action="select">
+    <tables>
+        <table name="sites" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+		<condition operation="like_prefix" column="regdate" var="regDate" />
+    </conditions>
+</query>
diff --git a/modules/admin/queries/insertFavorite.xml b/modules/admin/queries/insertFavorite.xml
new file mode 100644
index 000000000..084e5a0bb
--- /dev/null
+++ b/modules/admin/queries/insertFavorite.xml
@@ -0,0 +1,11 @@
+<query id="insertFavorite" action="insert">
+	<tables>
+		<table name="admin_favorite" />
+	</tables>
+	<columns>
+		<column name="admin_favorite_srl" var="adminFavoriteSrl" filter="number" notnull="notnull" />
+		<column name="site_srl" var="site_srl" filter="number" notnull="notnull" />
+		<column name="module" var="module" notnull="notnull" />
+		<column name="type" var="favoriteType" default="module" />
+	</columns>
+</query>
diff --git a/modules/admin/ruleset/insertThemeInfo.xml b/modules/admin/ruleset/insertThemeInfo.xml
new file mode 100644
index 000000000..73d19183a
--- /dev/null
+++ b/modules/admin/ruleset/insertThemeInfo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="themeItem" required="true" />
+		<field name="layout" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/admin/ruleset/toggleFavorite.xml b/modules/admin/ruleset/toggleFavorite.xml
new file mode 100644
index 000000000..b2a4e7f1e
--- /dev/null
+++ b/modules/admin/ruleset/toggleFavorite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+	<customrules />
+	<fields>
+		<field name="site_srl" required="true" rule="number" />
+		<field name="module_name" required="true" />		
+    </fields>
+</ruleset>
diff --git a/modules/admin/schemas/admin_favorite.xml b/modules/admin/schemas/admin_favorite.xml
new file mode 100644
index 000000000..301d7e979
--- /dev/null
+++ b/modules/admin/schemas/admin_favorite.xml
@@ -0,0 +1,6 @@
+<table name="admin_favorite">
+	<column name="admin_favorite_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" auto_increment="auto_increment" />
+	<column name="site_srl" type="number" size="11" default="0" />
+	<column name="module" type="varchar" size="80" />
+	<column name="type" type="varchar" size="30" />
+</table>
diff --git a/modules/admin/tpl/_footer.html b/modules/admin/tpl/_footer.html
deleted file mode 100644
index f6784b0b7..000000000
--- a/modules/admin/tpl/_footer.html
+++ /dev/null
@@ -1,6 +0,0 @@
-    </div>
-	<hr />
-	<div class="footer">
-        <address><a href="http://www.xpressengine.com" onclick="window.open(this.href);return false;">Powered by <strong>X</strong>press <strong>E</strong>ngine</a></address>
-	</div>
-</div>
diff --git a/modules/admin/tpl/_header.html b/modules/admin/tpl/_header.html
deleted file mode 100644
index 74cd6a50e..000000000
--- a/modules/admin/tpl/_header.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--%import("css/layout.css")-->
-<!--%import("js/admin.js")-->
-<div id="xeAdmin" class="<!--@if($package_selected || strstr($act,'Autoinstall'))-->c<!--@elseif(!$act || ($act == 'dispAdminIndex' || $act == 'dispAdminConfig'))-->ece<!--@else-->ec<!--@end-->">
-	<div class="header">
-		<h1 class="xeAdmin"><a href="{getUrl('','module','admin')}">XpressEngine</a></h1>
-		<ul class="gnb">
-            <li><a href="{getUrl('module','admin','act','procAdminLogout')}">Sign out</a></li>
-			<!--@if($logged_info->is_admin=='Y')--><li><a href="{getUrl('','module','admin','act','dispAdminConfig')}">Settings</a></li><!--@end-->
-			<li><a href="#" onclick="toggleAdminLang();return false;">Language</a>
-				<ul id="adminLang">
-                    <!--@foreach($lang_supported as $key => $val)-->
-					<li <!--@if($key == $lang_type)-->class="open"<!--@end-->><a href="#" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
-                    <!--@end-->
-				</ul>
-			</li>
-		</ul>
-		<ul class="lnb">
-			<li class="core <!--@if(!$package_selected && !strstr($act,'Autoinstall'))-->selected<!--@end-->"><a href="{getUrl('','module','admin')}">{$lang->control_panel}</a></li>
-			<li class="core <!--@if(strstr($act, 'Autoinstall'))-->selected<!--@end-->"><a href="{getUrl('','module','admin','act','dispAutoinstallAdminIndex')}">{$lang->autoinstall}</a></li>
-
-            <!--@foreach($package_modules as $key => $val)-->
-                <li class="{$val->position} <!--@if($val->selected)-->selected<!--@end-->"><a href="{getUrl('','module','admin','act',$val->index_act)}" title="{trim($val->description)}">{$val->title}</a></li>
-            <!--@end-->
-		</ul>
-	</div>
-	<hr />
-	<div class="body">
-		<div class="extension e1">
-			<div class="section">
-
-				<div id="search_nav">
-					<input type="text" size="12" />
-					<button type="button"></button>
-				</div>
-
-				<ul class="navigation">
-					{@$_c = explode(',',$_COOKIE['XEAM'])}
-                    <!--@foreach($lang->module_category_title as $key => $val)-->
-						<!--@if($key != 'migration' && $key != 'interlock' && $key != 'statistics')-->
-
-						<!--@if(in_array($key,$_c)&&$key!=$selected_module_category)-->
-							{@$_cs = true;}
-						<!--@else-->
-							{@$_cs = false;}
-						<!--@end-->
-					<li id="module_{$key}" class="parent <!--@if($_cs)-->close<!--@end--> <!--@if($key==$selected_module_category)-->active<!--@end-->"><a href="#"  onclick="toggleModuleMenu('{$key}'); return false;" class="parent">{$val}</a>
-						<ul>
-                            <!--@foreach($installed_modules as $k => $v)-->
-                            <!--@if($v->category == $key)-->
-                            <li <!--@if($v->selected)-->class="active"<!--@end-->><a href="{getUrl('','module','admin','act',$v->index_act)}" title="{$v->description}">{$v->title}</a></li>
-                            <!--@end-->
-                            <!--@end-->
-						</ul>
-					</li>
-                    <!--@end-->
-                    <!--@end-->
-                </ul>
-            </div>
-		</div>
-		<hr />
diff --git a/modules/admin/tpl/_spFooter.html b/modules/admin/tpl/_spFooter.html
new file mode 100644
index 000000000..62283c078
--- /dev/null
+++ b/modules/admin/tpl/_spFooter.html
@@ -0,0 +1,20 @@
+	</div>
+	<div class="footer">
+		<p class="power">Powered by <strong><a href="{_XE_LOCATION_SITE_}">XE</a></strong> (ver. {__ZBXE_VERSION__}).</p>
+		<p class="cache">
+			<button type="button" class="text" onclick="doResetAdminMenu();">{$lang->cmd_admin_menu_reset}</button>
+			<button type="button" class="text" onclick="doRecompileCacheFile();">{$lang->cmd_remake_cache}</button>
+			<button type="button" class="text" onclick="doClearSession();">{$lang->cmd_clear_session}</button>
+			<a href="http://code.google.com/p/xe-core/issues/entry">{$lang->bug_report}</a>
+		</p>
+	</div>
+</div>
+<script type="text/javascript">
+xe.current_lang = '{$lang_type}';
+xe.lang.confirm_run = '{$lang->confirm_run}';
+xe.lang.confirm_reset_admin_menu = '{$lang->confirm_reset_admin_menu}';
+admin_menu_srl = '{$admin_menu_srl}';
+</script>
+
+<load target="./js/config.js" usecdn="true" />
+<load target="../../session/tpl/js/session.js" usecdn="true" />
diff --git a/modules/admin/tpl/_spHeader.html b/modules/admin/tpl/_spHeader.html
new file mode 100644
index 000000000..3d7408441
--- /dev/null
+++ b/modules/admin/tpl/_spHeader.html
@@ -0,0 +1,45 @@
+{@Context::addHtmlHeader('<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=yes" />')}
+<div class="x">
+	<p class="skipNav"><a href="#content">Skip Navigation</a></p>
+	<div class="header">
+		<h1><a href="{getUrl('','module','admin')}"><img src="{getUrl('')}{$gnb_title_info->adminLogo}" alt="{$gnb_title_info->adminTitle}" /> {$gnb_title_info->adminTitle}</a></h1>
+		<p class="site"><a href="{getFullUrl('')}">{getFullUrl('')}</a></p>
+		<div class="account">
+			<ul>
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'is_admin', 'Y', 'member_srl', $logged_info->member_srl)}">{$logged_info->email_address}</a></li>
+				<li><a href="{getUrl('', 'module','admin','act','procAdminLogout')}">Log-out</a></li>
+				<li><a href="#language" class="tgAnchor language" data-effect="slide" data-duration="100">{$lang_supported[$lang_type]}</a>
+					<ul class="tgContent" id="language">
+						<li loop="$lang_supported=>$key,$val" class="selected"|cond="$key==$lang_type"><a href="{getUrl('l',$key)}" data-langcode="{$key}" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
+					</ul>
+				</li>
+			</ul>
+		</div>
+		<div class="gnb jx">
+			<ul>
+				<li loop="$gnbUrlList=>$key,$value" class="activeOn"|cond="$parentSrl==$key"><a href="{$value['href']}">{$value['text']}</a>
+					<ul cond="count($value['list'])">
+						<li loop="$value['list']=>$key2,$value2"><a href="{$value2['href']}">{$value2['text']}</a></li>
+					</ul>
+				</li>
+			</ul>
+		</div>
+		<div class="bmk">
+			<a href="#bmk" class="tgAnchor" data-effect="fade" data-duration="200">{$lang->favorite}</a>
+			<ul id="bmk" class="tgContent">
+				<li loop="$favorite_list => $favorite">
+					<a href="{getUrl('act', $favorite->admin_index_act)}">{$favorite->title}</a>
+					<form class="action" action="">
+						<input type="hidden" name="module" value="admin" />
+						<input type="hidden" name="act" value="procAdminToggleFavorite" />
+						<input type="hidden" name="site_srl" value="0" />
+						<input type="hidden" name="module_name" value="{$favorite->module}" />
+						<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+						<button type="submit" class="text" title="{$lang->cmd_delete}">x</button>
+					</form>
+				</li>
+				<li cond="!is_array($favorite_list) || count($favorite_list) < 1">{$lang->no_data}</li>
+			</ul>
+		</div>
+	</div>
+	<div class="body">
diff --git a/modules/admin/tpl/_spLnb.content.html b/modules/admin/tpl/_spLnb.content.html
new file mode 100644
index 000000000..986f7427d
--- /dev/null
+++ b/modules/admin/tpl/_spLnb.content.html
@@ -0,0 +1,10 @@
+<div class="lnb">
+	<h2 class="h2">{$gnbUrlList[$parentSrl]['text']}</h2>
+	<ul>
+		<!--@if(count($gnbUrlList[$parentSrl]['list']) > 0)-->
+		<!--@foreach($gnbUrlList[$parentSrl]['list'] AS $key=>$value)-->
+		<li <!--@if($value['text'] == $subMenuTitle)-->class="active"<!--@end-->><a href="{html_entity_decode($value['href'])}">{$value['text']}</a></li>
+		<!--@end-->
+		<!--@end-->
+	</ul>
+</div>
\ No newline at end of file
diff --git a/modules/admin/tpl/admin_setup.html b/modules/admin/tpl/admin_setup.html
new file mode 100644
index 000000000..927bb5e2d
--- /dev/null
+++ b/modules/admin/tpl/admin_setup.html
@@ -0,0 +1,85 @@
+<load target="./js/menu_setup.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<h1 class="h1">{$lang->admin_setup}</h1>
+<form action="./" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="admin" />
+	<input type="hidden" name="act" value="procAdminUpdateConfig" />
+	<fieldset class="section">
+		<h2 class="h2">{$lang->admin_title}</h2>
+		<ul class="form">
+			<li>
+				<p class="q"><label for="adminLogo">{$lang->admin_logo}</label></p>
+				<p class="a">
+					<!--@if($config_object->adminLogo)-->
+					<img src="{getUrl('').$config_object->adminLogo}" />
+					<button type="submit" value="procAdminDeleteLogo" name="act" class="text">{$lang->cmd_delete}</button>
+					<!--@else-->
+					<img src="{getUrl('')}{$gnb_title_info->adminLogo}" />
+					<!--@end-->
+				</p>
+				<p class="a"><input type="file" name="adminLogo" id="adminLogo" /></p>
+			</li>
+			<li>
+				<p class="q"><label for="adminTitle">{$lang->admin_title}</label></p>
+				<p class="a"><input type="text" name="adminTitle" id="adminTitle" value="{$config_object->adminTitle}" /></p>
+			</li>
+		</ul>
+		<p class="btnArea"><span class="btn small"><button value="procAdminUpdateConfig" name="act" type="submit">{$lang->cmd_save}</button></span></p>
+	</fieldset>
+</form>
+<form id="listForm" action="./" class="siteMap" method="post">
+	<input type="hidden" name="module" value="admin" />
+	<input type="hidden" name="act" value="procMenuAdminDeleteItem" />
+	<input type="hidden" name="menu_srl" value="{$menu_srl}" />
+	<input type="hidden" name="title" value="{$menu_title}" />
+	<input type="hidden" name="menu_item_srl" value="" />
+	<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispAdminSetup')}" />
+	<fieldset class="section">
+	<h2 class="h2">{$lang->admin_menu_setup}</h2>
+	<div class="adminMenu portlet">
+		<ul class="lined">
+			<li class="parent" loop="$gnbUrlList=>$key,$value">
+				<input type="hidden" name="parent_key[]" value="{$value['parent_srl']}" class="_parent_key" />
+				<input type="hidden" name="item_key[]" value="{$value['node_srl']}" class="_item_key" />
+				<span>{$value['text']}</span> <span class="side"><a href="#editMenu" class="modalAnchor _add">{$lang->add}</a></span>
+				<ul cond="is_array($value['list']) && count($value['list'])>0">
+					<li loop="$value['list']=>$key2,$value2">
+					<input type="hidden" name="parent_key[]" value="{$value2['parent_srl']}" class="_parent_key" />
+					<input type="hidden" name="item_key[]" value="{$value2['node_srl']}" class="_item_key" />
+					<span>{$value2['text']}</span><span class="side"><a href="#delete" class="_child_delete">{$lang->delete}</a></span>
+					</li>
+				</ul>
+			</li>
+		</ul>
+		<p class="btnArea">
+			<span class="btn small" style="float: left;"><button value="procAdminMenuReset" name="act" type="submit">{$lang->cmd_reset}</button></span>
+			<span class="btn small"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span>
+		</p>
+	</div>
+	</fieldset>
+</form>
+<div class="modal" id="editMenu">
+	<div class="fg">
+		<form id="editForm" action="./" class="form">
+		<input type="hidden" name="module" value="menu" />
+		<input type="hidden" name="act" value="procMenuAdminInsertItemForAdminMenu" />
+		<input type="hidden" name="menu_srl" value="{$menu_srl}" />
+		<input type="hidden" name="parent_srl" value="" />
+			<h2 class="h2">{$lang->admin_menu_add}</h2>
+			<ul>
+				<li>
+					<p class="q"><label for="name">{$lang->module}</label></p>
+					<div class="a">
+						<select name="menu_name" id="menuNameList">
+						</select>
+					</div>
+				</li>
+			</ul>
+			<div class="btnArea">
+				<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/modules/admin/tpl/config.html b/modules/admin/tpl/config.html
deleted file mode 100644
index a20534e69..000000000
--- a/modules/admin/tpl/config.html
+++ /dev/null
@@ -1,224 +0,0 @@
-<!--#include("_header.html")-->
-
-<!--%import("./filter/update_env_config.xml")-->
-<!--%import("./filter/update_lang_select.xml")-->
-<!--%import("./filter/install_ftp_info.xml")-->
-<!--%import("./filter/install_ftp_path.xml")-->
-<!--%import("../../install/lang")-->
-<!--%import("../../install/tpl/js/install_admin.js",optimized=false)-->
-<!--%import("./js/config.js")-->
-
-<script type="text/javascript">
-    function insertSelectedModule(id, module_srl, mid, browser_title) {
-        var obj= xGetElementById('_'+id);
-        var sObj = xGetElementById(id);
-        sObj.value = module_srl;
-        obj.value = decodeURIComponent(browser_title.replace(/\+/g," "))+' ('+mid+')';
-    }
-    var xe_root = "{_XE_PATH_}";
-</script>
-
-<div class="content">
-
-    <h4 class="xeAdmin">{$lang->cmd_setup}</h4>
-
-    <form action="./" method="get" onsubmit="return procFilter(this, update_env_config);">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th><div>{$lang->use_rewrite}</div></th>
-        <td>
-            <input type="checkbox" name="use_rewrite" value="Y"  <!--@if($use_rewrite=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_rewrite}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_sso}</div></th>
-        <td>
-            <input type="checkbox" name="use_sso" value="Y"  <!--@if($use_sso=='Y')-->checked="checked"<!--@end--> />
-			<p>{$lang->about_sso}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->default_url}</div></th>
-        <td>
-            <input type="text" name="default_url" value="{$default_url}" class="inputTypeText w300"/>
-            <p>{$lang->about_default_url}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->start_module}</div></th>
-        <td>
-            <input type="hidden" name="index_module_srl" id="target_module" value="{$start_module->index_module_srl}" />
-            <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" value="{$start_module->mid} ({htmlspecialchars($start_module->browser_title)})" readonly="readonly" />
-			<a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
-        </td>
-    </tr>
-    <tr>
-        <th><div>Language</div></th>
-        <td>
-            <select name="change_lang_type">
-                <!--@foreach($lang_supported as $key => $val)-->
-                    <option value="{$key}" <!--@if($key==$selected_lang)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@endforeach-->
-            </select>
-            <p>{$lang->about_lang_env}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->time_zone}</div></th>
-        <td>
-            <select name="time_zone" class="fullWidth">
-                <!--@foreach($time_zone_list as $key => $val)-->
-                <option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@endforeach-->
-            </select>
-            <p>{$lang->about_time_zone}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->qmail_compatibility}</div></th>
-        <td>
-            <input type="checkbox" name="qmail_compatibility" value="Y"  <!--@if($qmail_compatibility=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_qmail_compatibility}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_db_session}</div></th>
-        <td>
-            <input type="checkbox" name="use_db_session" value="Y"  <!--@if($use_db_session=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_db_session}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->use_ssl}</div></th>
-        <td>
-            <select name="use_ssl">
-            <!--@foreach($lang->ssl_options as $key => $val)-->
-                <option value="{$key}" <!--@if($key == $use_ssl)-->selected<!--@end--> >{$val}</option>
-            <!--@endforeach-->
-            </select>
-            <p>{$lang->about_use_ssl}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->server_ports}</div></th>
-        <td>
-            HTTP : <input type="text" name="http_port" class="inputTypeText" size="5" value="{$http_port}">, 
-            HTTPS: <input type="text" name="https_port" class="inputTypeText" size="5" value="{$https_port}">
-            <p>{$lang->about_server_ports}</p>
-        </td>
-    </tr>
-	<tr>
-		<th><div>{$lang->mobile_view}</div></th>
-        <td>
-            <input type="checkbox" name="use_mobile_view" value="Y"  <!--@if($use_mobile_view=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_mobile_view}</p>
-        </td>
-	</tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </th>
-    </tr>
-    </table>
-    </form>
-
-
-    <h4 class="xeAdmin" id="ftpSetup">{$lang->ftp_form_title}</h4>
-    <p class="summary">{$lang->about_ftp_info}</p>
-    <form action="./" method="post" onsubmit="return procFilter(this, install_ftp_info);" id="ftp_form">
-    <table cellspacing="0" class="rowTable">
-
-    <tr>
-        <th scope="col"><div><label for="textfield21">{$lang->user_id}</label></div></th>
-        <td><input type="text" id="textfield21" name="ftp_user" value="{$ftp_info->ftp_user}" class="inputTypeText" />
-    </tr>
-    <tr>
-        <th scope="col"><div><label for="textfield22">{$lang->password} ({$lang->about_ftp_password})</label></div></th>
-        <td><input id="textfield22" type="password" name="ftp_password" value="" class="inputTypeText" /></td>
-    </tr>
-    <tr>
-        <th scope="col"><div><label for="textfield23">{$lang->ftp_host} (default: 127.0.0.1)</label></div></th>
-        <td><input id="textfield23" type="text" name="ftp_host" value="{$ftp_info->ftp_host}" class="inputTypeText" /></td> 
-    </tr>
-    <tr>
-        <th scope="col"><div><label for="textfield24">{$lang->ftp_port} (default: 21) </label></div></th>
-        <td><input id="textfield24" type="text" name="ftp_port" value="{$ftp_info->ftp_port}" class="inputTypeText" /></td>
-    </tr>
-	<tr>
-		<th scope="col"><div><label for="checkboxpasv">FTP Passive mode</label></div></th>
-		<td><input type="checkbox" id="checkboxpasv" name="ftp_pasv" value="Y" <!--@if($ftp_info->ftp_pasv!="N")-->checked="checked"<!--@end--> /></td>
-	</tr>
-    <!--@if($sftp_support)-->
-    <tr>
-        <th scope="col"><div><label for="checkbox25">{$lang->sftp}</label></div></th>
-        <td><input type="checkbox" id="checkbox25" name="sftp" value="Y" <!--@if($ftp_info->sftp=="Y")-->checked="checked"<!--@end--> /></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th scope="col" rowspan="2"><div>{$lang->msg_ftp_installed_ftp_realpath}<br /><br/>{$lang->msg_ftp_installed_realpath}:<br/> {_XE_PATH_}</div></th>
-        <td>
-            <input type="text" name="ftp_root_path" value="{$ftp_info->ftp_root_path}" class="inputTypeText w400" /> 
-        </td>
-    </tr>
-    <tr id="ftplist">
-        <td>
-            <div>
-					<span class="button blue strong"><input type="button" onclick="getFTPList(); return false;" value="{$lang->ftp_get_list}"></span>
-            </div>
-        </td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button blue strong"><input type="button" onclick="removeFTPInfo(); return false;" value="{$lang->ftp_remove_info}"></span>
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        </th>
-    </tr>
-    </table>
-    </form>
-</div>
-
-<hr />
-
-<div class="extension e2">
-    <div class="section">
-
-        <h4 class="xeAdmin">{$lang->cmd_lang_select}</h4>
-        <p class="summary">{$lang->about_cmd_lang_select}</p>
-        <form action="./" method="get" onsubmit="return procFilter(this, update_lang_select);">
-        <table cellspacing="0" class="rowTable">
-        <!--@foreach($langs as $key => $val)-->
-        <tr>
-            <td>
-				<!--@if($key==$selected_lang)-->
-					<input type="hidden" name="selected_lang[]" value="{$key}" />
-					<input type="checkbox" checked="checked" disabled="disabled" />
-					<label>{$val}</label>
-				<!--@else-->
-					<input id="lang_{$key}" type="checkbox" name="selected_lang[]" value="{$key}" <!--@if(isset($lang_selected[$key]))-->checked="checked"<!--@end--> />
-					<label for="lang_{$key}">{$val}</label>
-				<!--@end-->
-            </td>
-        </tr>
-        <!--@endforeach-->
-        <tr>
-            <th class="button">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-            </th>
-        </tr>
-        </table>
-        </form>
-
-        <h4 class="xeAdmin">{$lang->cmd_remake_cache}</h4>
-        <p class="summary">{$lang->about_recompile_cache}</p>
-        <table cellspacing="0" class="colTable">
-        <tr>
-            <th class="button">
-                <span class="button black strong"><input type="button" value="{$lang->cmd_remake_cache}" onclick="doRecompileCacheFile(); return false;"/></span>
-            </th>
-        </tr>
-        </table>
-    </div>
-</div>
-
-<!--#include("_footer.html")-->
diff --git a/modules/admin/tpl/config_ftp.html b/modules/admin/tpl/config_ftp.html
new file mode 100644
index 000000000..886a48006
--- /dev/null
+++ b/modules/admin/tpl/config_ftp.html
@@ -0,0 +1,62 @@
+<load target="./js/config.js" usecdn="true" />
+<load target="../install/lang/lang.xml" usecdn="true" />
+<load target="../../session/tpl/js/session.js" usecdn="true" />
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="installFtpInfo" action="./" method="post" id="ftp_form" class="form" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="install" />
+	<input type="hidden" name="act" value="procInstallAdminSaveFTPInfo" />
+	<fieldset class="section">
+		<h1 class="h1">{$lang->menu_gnb_sub['adminConfigurationFtp']}</h1>
+		<ul>
+			<li>
+				<p class="q"><label for="ftp_host">{$lang->ftp_host}</label> [<a href="#helpFTP" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpFTP">
+					<p>{$lang->detail_about_ftp_info}</p>
+				</div>
+				<p class="a"><input type="text" name="ftp_host" id="ftp_host" value="{$ftp_info->ftp_host}" /><span class="desc">Default : 127.0.0.1</span></p>
+			</li>
+			<li>
+				<p class="q"><label for="ftp_user">{$lang->user_id}</label></p>
+				<p class="a"><input type="text" name="ftp_user" id="ftp_user" value="{$ftp_info->ftp_user}" /></p>
+			<li>
+				<p class="q"><label for="ftp_password">{$lang->password}</label></p>
+				<p class="a"><input type="password" name="ftp_password" id="ftp_password" value="" /> <span class="desc">{$lang->about_ftp_password}</span></p>
+			</li>
+			<li>
+				<p class="q"><label for="ftp_port">{$lang->ftp_port}</label></p>
+				<p class="a"><input type="text" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port}" /><span class="desc">Default : 21</span></p>
+			</li>
+			<li>
+				<p class="q"><label for="ftp_passive">{$lang->about_use_ftp_passive_mode}</label></p>
+				<p class="a">
+					<input type="radio" name="ftp_pasv" id="ftp_passive_y" value="Y" <!--@if($ftp_info->ftp_pasv == 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="ftp_pasv" id="ftp_passive_n" value="N" <!--@if($ftp_info->ftp_pasv != 'Y')-->checked="checked" <!--@end-->/> <label for="ftp_passive_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="sftp">{$lang->about_use_sftp_support}</label></p>
+				<p class="a">
+					<input type="radio" name="sftp" id="sftp_y" value="Y" <!--@if($ftp_info->sftp == 'Y')-->checked="checked" <!--@end-->/> <label for="sftp_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="sftp" id="sftp_n" value="N" <!--@if($ftp_info->sftp != 'Y')-->checked="checked" <!--@end-->/> <label for="sftp_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="ftp_path">{$lang->msg_ftp_installed_ftp_realpath}</label></p>
+				<p class="a">
+					<input type="text" name="ftp_root_path" id="ftp_root_path" value="{$ftp_info->ftp_root_path}" />
+					<a href="#ftpSuggestion" onclick="getFTPList(); return false;" class="tgAnchor">{$lang->ftp_get_list}</a>
+
+				</p>
+				<div id="ftpSuggestion">
+				</div>
+				<p class="desc">{$lang->msg_ftp_installed_realpath} : {_XE_PATH_} </p>
+			</li>
+		</ul>
+	</fieldset>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
+</form>
diff --git a/modules/admin/tpl/config_general.html b/modules/admin/tpl/config_general.html
new file mode 100644
index 000000000..a012517f2
--- /dev/null
+++ b/modules/admin/tpl/config_general.html
@@ -0,0 +1,225 @@
+<script type="text/javascript">
+jQuery(function($){
+	$('#favicon').change(function(){
+		var re_favicon = /[^.]+\.ico$/
+		if(re_favicon.test($(this).val()) != true){
+			alert('*.ico {$lang->msg_possible_only_file}');
+			return false;
+		}
+	});
+	$('#mobicon').change(function(){
+		var re_favicon = /[^.]+\.png$/
+		if(re_favicon.test($(this).val()) != true){
+			alert('*.png {$lang->msg_possible_only_file}');
+			return false;
+		}
+	});
+});
+</script>
+<load target="./js/config.js" usecdn="true" />
+<load target="../install/lang/lang.xml" usecdn="true" />
+<load target="../../session/tpl/js/session.js" usecdn="true" />
+
+<form action="" method="post" id="ftp_form" class="form" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="install" />
+	<input type="hidden" name="act" value="procInstallAdminConfig" />
+	<h1 class="h1">{$lang->menu_gnb_sub['adminConfigurationGeneral']}</h1>
+	<fieldset class="section">
+		<h2 class="h2">{$lang->subtitle_primary}</h2>
+		<ul>
+			<li class="modulefinder">
+				<p class="q">{$lang->about_start_module}</p>
+				<p class="a">
+					<input type="hidden" name="index_module_srl" id="index_module_srl" value="{$start_module->index_module_srl}" />
+					<input type="text" name="_target_module" id="_target_module" value="{$start_module->browser_title} ({$start_module->mid})" readonly />
+					<a href="#modalWindow" class="modalAnchor" onClick="viewSiteSearch()">{$lang->cmd_find}</a> </p>
+					<p class="site_keyword_search" style="display:none">
+						<input type="text" name="site_keyword" /> <a href="#suggestion3" class="tgAnchor findsite">{$lang->cmd_confirm}</a>
+						<div id="suggestion3" class="tgContent suggestion" >
+							<ul></ul>
+						</div>
+					</p>						
+					<p>
+						<select class="moduleList" style="width:290px"></select>
+					</p>
+					<p>
+						<select class="moduleIdList" style="width:290px"></select>
+						<a href="#" id="sitefind_addBtn" onclick="setStartModule()" style="display:none;">{$lang->cmd_select}</a>
+					</p>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->about_lang_select}</p>
+				<p class="a">
+					<!--@foreach($langs as $key => $val)-->
+					<!--@if($key==$selected_lang)-->
+					<input type="hidden" name="selected_lang[]" value="{$key}" />
+					<input type="checkbox" checked="checked" disabled="disabled" />
+					<label>{$val}</label>
+					<!--@else-->
+					<input type="checkbox" name="selected_lang[]" id="lang_{$key}" value="{$key}" <!--@if(isset($lang_selected[$key]))-->checked="checked" <!--@end-->/>
+					<label for="lang_{$key}">{$val}</label>
+					<!--@end-->
+					<!--@endforeach-->
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="">{$lang->about_default_lang}</label></p>
+				<p class="a">
+					<select name="change_lang_type">
+						<!--@foreach($lang_supported as $key => $val)-->
+						<option value="{$key}" <!--@if($key==$selected_lang)-->selected="selected"<!--@end-->>{$val}</option>
+						<!--@endforeach-->
+					</select>						
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="time_zone">{$lang->about_timezone}</label></p>
+				<p class="a">
+					<select name="time_zone" id="time_zone" class="fullWidth">
+						<!--@foreach($time_zone_list as $key => $val)-->
+						<option value="{$key}" <!--@if($time_zone==$key)-->selected="selected"<!--@end-->>{$val}</option>
+						<!--@endforeach-->
+					</select>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->about_question_mobile_view}</p>
+				<p class="a">
+					<input type="radio" name="use_mobile_view" id="use_mobile_view_y" value="Y" <!--@if($use_mobile_view == 'Y')-->checked="checked" <!--@end-->/> <label for="use_mobile_view_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="use_mobile_view" id="use_mobile_view_n" value="N" <!--@if($use_mobile_view != 'Y')-->checked="checked" <!--@end-->/> <label for="use_mobile_view_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->about_thumbnail_type}</p>
+				<p class="a">
+					<input type="radio" name="thumbnail_type" id="thumbnail_type_crop" value="corp" <!--@if($thumbnail_type != 'ratio')-->checked="checked" <!--@end-->/>
+					<label for="thumbnail_type_crop">{$lang->corp}</label>
+					<input type="radio" name="thumbnail_type" id="thumbnail_type_ratio" value="ratio" <!--@if($thumbnail_type == 'ratio')-->checked="checked" <!--@end-->/>
+					<label for="thumbnail_type_ratio">{$lang->ratio}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="htmlFooter">{$lang->input_footer_script}</label>[<a href="#helpFooter" class="tgAnchor">?</a>]<p>
+				<div class="tgContent layer" id="helpFooter">
+					<p>{$lang->detail_input_footer_script}</p>
+				</div>	
+				<p class="a">
+					<textarea name="htmlFooter" id="htmlFooter" rows="4" cols="42">{$htmlFooter}</textarea>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->allow_use_favicon}</p>
+				<p class="a faviconPreview">
+					<img src="{$favicon_url}" alt="favicon" width="16" height="16" class="fn1">
+					<img src="{$favicon_url}" alt="favicon Image" width="16" height="16" class="fn2">
+					<a href="javascript:deleteIcon('favicon\.ico');">{$lang->cmd_delete}</a>
+				</p>
+				<p class="a"><input type="file" name="favicon" id="favicon" title="favicon" /> <span class="desc">{$lang->about_use_favicon}</span></p>
+			</li>
+			<li>
+				<p class="q">{$lang->allow_use_mobile_icon}</p>
+				<p class="a mobiconPreview">
+					<img src="{$mobicon_url}" alt="Mobile Home Icon" width="32" height="32" />
+					<span>www</span>
+					<a href="javascript:deleteIcon('mobicon\.png');">{$lang->cmd_delete}</a>
+				</p>
+				<p class="a"><input type="file" name="mobicon" id="mobicon" title="Mobile Home Icon"/> <span class="desc">{$lang->detail_use_mobile_icon}</span></p>
+			</li>
+		</ul>
+	</fieldset>
+	<fieldset class="section">
+		<h2 class="h2">{$lang->subtitle_advanced}</h2>
+		<ul>
+			<li>
+				<p class="q"><label for="admin_ip">{$lang->about_admin_ip_limit}</label>[<a href="#helpAdminip" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpAdminip">
+					<p>{$lang->detail_about_admin_ip_limit}</p>
+				</div>
+				<p class="a">
+					<textarea name="admin_ip_list" id="admin_ip_list" rows="4" cols="42">{$admin_ip_list}</textarea>
+					{$lang->local_ip_address} : {$IP}</p>
+			</li>
+			<li>
+				<p class="q"><label for="default_url">{$lang->default_url}</label>[<a href="#helpDefaulturl" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpDefaulturl">
+					<p>{$lang->about_default_url}</p>
+				</div>
+				<p class="a"><input type="text" name="default_url" id="default_url" value="{$default_url}"/></p>
+			</li>
+			<li>
+				<p class="q"><label for="use_ssl">{$lang->use_ssl}</label>[<a href="#helpUsessl" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpUsessl">
+					<p>{$lang->about_use_ssl}</p>
+				</div>
+				<p class="a">
+					<!--@foreach($lang->ssl_options as $key => $val)-->
+					<input type="radio" name="use_ssl" id="ssl_{$key}" value="{$key}" <!--@if($use_ssl==$key)-->checked="checked" <!--@end-->/> <label for="ssl_{$key}">{$val}</label>
+					<!--@endforeach-->
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->server_ports}</p>
+				<p class="a">
+					<label for="">HTTP:</label> <input type="text" name="http_port" id="http_port" size="5" value="{$http_port}" style="width:40px" />
+					&nbsp;&nbsp;
+					<label for="">HTTPS:</label> <input type="text" name="https_port" id="https_port" size="5" value="{$https_port}" style="width:40px" />
+				</p>
+			</li>
+			<li cond="__XE_CDN_VERSION__!='%__XE_CDN_VERSION__%'">
+				<p class="q">{$lang->about_cdn}</p>
+				<p class="a">
+					<input type="radio" name="use_cdn" id="cdn_y" value="Y" <!--@if($use_cdn=='Y')-->checked="checked" <!--@end-->/> <label for="cdn_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="use_cdn" id="cdn_n" value="N" <!--@if($use_cdn!='Y')-->checked="checked" <!--@end-->/> <label for="cdn_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="">{$lang->about_use_rewrite}</label></p>
+				<p class="a">
+					<input type="radio" name="use_rewrite" id="use_rewrite_y" value="Y" <!--@if($use_rewrite == 'Y')-->checked="checked" <!--@end-->/> <label for="use_rewrite_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="use_rewrite" id="use_rewrite_n" value="N" <!--@if($use_rewrite != 'Y')-->checked="checked" <!--@end-->/> <label for="use_rewrite_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="use_sso">{$lang->about_use_sso}</label>[<a href="#helpUsesso" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpUsesso">
+					<p>{$lang->about_sso}</p>
+				</div>
+				<p class="a">
+					<input type="radio" name="use_sso" id="sso_y" value="Y" <!--@if($use_sso=='Y')-->checked="checked" <!--@end-->/> <label for="sso_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="use_sso" id="sso_n" value="N" <!--@if($use_sso!='Y')-->checked="checked" <!--@end-->/> <label for="sso_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="">{$lang->use_db_session}</label>[<a href="#helpUsedbSession" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpUsedbSession">
+					<p>{$lang->about_db_session}</p>
+				</div>
+				<p class="a">
+					<input type="radio" name="use_db_session" id="use_db_session_y" value="Y" <!--@if($use_db_session=='Y')-->checked="checked" <!--@end-->/> <label for="use_db_session_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="use_db_session" id="use_db_session_n" value="N" <!--@if($use_db_session!='Y')-->checked="checked" <!--@end-->/> <label for="use_db_session_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="">{$lang->qmail_compatibility}</label>[<a href="#helpQmail" class="tgAnchor">?</a>]</p>
+				<div class="tgContent layer" id="helpQmail">
+					<p>{$lang->about_qmail_compatibility}</p>
+				</div>
+				<p class="a">
+					<input type="radio" name="qmail_compatibility" id="qmail_compatibility_y" value="Y" <!--@if($qmail_compatibility=='Y')-->checked="checked" <!--@end-->/> <label for="qmail_compatibility_y">{$lang->cmd_yes}</label>
+					<input type="radio" name="qmail_compatibility" id="qmail_compatibility_n" value="N" <!--@if($qmail_compatibility!='Y')-->checked="checked" <!--@end-->/> <label for="qmail_compatibility_n">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->about_html_dtd}</p>
+				<p class="a">
+					<input type="radio" name="use_html5" id="xhtml" value="N" <!--@if($use_html5 != 'Y')-->checked="checked" <!--@end-->/> <label for="xhtml">{$lang->xhtml_transitional}</label>
+					<input type="radio" name="use_html5" id="html5" value="Y"  <!--@if($use_html5 == 'Y')-->checked="checked" <!--@end-->/> <label for="html5">{$lang->html5}</label>
+				</p>
+			</li>
+		</ul>
+	</fieldset>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
+</form>
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 655d94d92..722fcdc97 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -1,227 +1,681 @@
 @charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-#xeAdmin .open{ display:block !important;}
-#xeAdmin h1.xeAdmin { float:left; white-space:nowrap; margin:0;padding:0;}
-#xeAdmin caption{ text-align:left;}
-#xeAdmin button{ cursor:pointer;}
-#xeAdmin hr{ display:none;}
-#xeAdmin fieldset{ border:0;}
-#xeAdmin fieldset legend{ font-size:0; line-height:0; position:absolute; visibility:hidden;}
-#xeAdmin .section{ margin-bottom:20px;}
-#xeAdmin .buttonArea{ text-align:center; padding:15px 0;}
-#xeAdmin button.text{ background:none; border:0; color:#0000ee;}
-#xeAdmin img.graphHr{ height:5px; vertical-align:middle;}
-#xeAdmin .ac{ text-align:center;}
-#xeAdmin .al{ text-align:left;}
-#xeAdmin .ar{ text-align:right;}
-
-.crossTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
-.crossTable th div { white-space:nowrap; }
-.crossTable th,
-.crossTable td{ border:0; padding:5px 10px; vertical-align:top;}
-.crossTable th{ background:#f4f4f4;}
-.crossTable thead th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
-.crossTable thead th:first-child{ background-image:none;}
-.crossTable tbody th{ border-bottom:1px solid #e5e5e5; text-align:left;}
-.crossTable td{ border-bottom:1px solid #f0f0f0;}
-
-.colTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
-.colTable th div { white-space:nowrap; }
-.colTable tr.bg0{ background:#fff;}
-.colTable tr.bg1{ background:#f8f8f8;}
-.colTable th,
-.colTable td{ border:0; padding:5px 10px; vertical-align:top;}
-.colTable th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background:#f4f4f4; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
-.colTable th:first-child{ background-image:none;}
-.colTable td{ border-bottom:1px solid #f0f0f0;}
-
-.rowTable{ width:100%; border:0; border-top:2px solid #cfcfcf; margin:0 0 20px 0; padding:0;}
-.rowTable th div { white-space:nowrap; }
-.rowTable tr.bg0{ background:#fff;}
-.rowTable tr.bg1{ background:#f8f8f8;}
-.rowTable th,
-.rowTable td{ border:0; padding:5px 10px; text-align:left; vertical-align:top;}
-.rowTable th{ background:#f4f4f4;}
-.rowTable tbody th{ border-bottom:1px solid #e5e5e5;}
-.rowTable td{ border-bottom:1px solid #f0f0f0;}
-
-.rowTable th.button, .colTable th.button, .crossTable th.button { text-align:right; }
-.rowTable td.alert, .colTable td.alert, .crossTable td.alert  { color:red !important; }
-.rowTable td.alert a, .colTable td.alert a, .crossTable td.alert a { text-decoration:none; color:red !important; }
-
-.colTable td.wide, .rowTable td.wide, .crossTable td.wide { width:100%;}
-
-.e1 .navigation { list-style:none; position:relative; *zoom:1; margin:0; padding:0; border-bottom:1px solid #c2c2c2;}
-.e1 .navigation ul { list-style:none; position:relative; *zoom:1; margin:0; padding:0;}
-.e1 .navigation li { list-style:none; position:relative; *zoom:1; margin:0; padding:0; background-color:#f7f7f7; }
-.e1 .navigation li a.parent { border-top:1px solid #c2c2c2; display:block; padding:10px 20px 10px 35px ;background-image:url(../img/iconNavigation.gif); background-repeat:no-repeat; background-position:160px -35px; font-weight:bold; color:#888; text-decoration:none;}
-.e1 .navigation li.close a.parent { background-position:160px 13px; border-bottom:none; }
-
-#module_service { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px 10px;}
-#module_member { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px -40px;}
-#module_content { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px -90px;}
-#module_construction { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px -140px;}
-#module_utility { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px -190px;}
-#module_accessory { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px -240px;}
-#module_system { background-image:url(../img/mIcon.gif); background-repeat:no-repeat; background-position:10px -290px;}
-
-.e1 .navigation li ul{ border-top:1px solid #d2d2d2; margin:0; padding:5px 0; background-color:#fff;}
-.e1 .navigation li ul li { margin:5px 0; padding:0 10px 0 35px; background-color:#fff;}
-.e1 .navigation li.close ul{ display:none;}
-.e1 .navigation li ul li a { text-decoration:none; }
-.e1 .navigation li ul li a:hover { font-weight:bold; text-decoration:none; letter-spacing:-1px;}
-.e1 .navigation li ul li.active a { color:#ea3f22; letter-spacing:-1px;}
-
-.e2 .section{ margin-left:20px;}
-.e2 .section h4.xeAdmin { margin:10px 0 0 0; padding:0 0 0 25px; }
-.e2 .section .date{ background:url(../img/lineVrText.gif) no-repeat left center; font-size:9px; padding-left:5px;}
-.e2 .section .contentBox { padding:10px 0; margin:0 0 20px 0; border-bottom:1px solid #ccc;}
-
-.e2 table tbody td{ text-align:left; word-break:break-all; -ms-word-break:break-all; }
-
-#xeAdmin .localNavigation { position:relative; border-bottom:1px solid #ccc; *zoom:1; margin:0 0 40px 0; padding:0; font-size:12px;}
-#xeAdmin .localNavigation:after {content:""; display:block; clear:both;}
-#xeAdmin .localNavigation ul{ display:none; position:absolute; top:40px; left:0; list-style:none; margin:0; padding:0; overflow:hidden;}
-#xeAdmin .localNavigation li{ list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
-#xeAdmin .localNavigation li a{ float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(../img/bgTab.gif) repeat-x; text-decoration:none !important; color:#666}
-#xeAdmin .localNavigation li.on { margin-bottom:-1px;}
-#xeAdmin .localNavigation li.on ul{ display:block;}
-#xeAdmin .localNavigation li.on a{ height:19px; background:none; font-weight:bold;}
-#xeAdmin .localNavigation li li{ position:relative; left:-1px; display:inline; float:none; margin:0; padding:0 6px 0 10px; border-left:1px solid #ddd;}
-#xeAdmin .localNavigation li li a{ font-weight:normal !important; float:none; padding:0; height:auto; border:0; background:none;}
-#xeAdmin .localNavigation li li.on a{ font-weight:bold !important;}
-
-#xeAdmin h3.xeAdmin {border-bottom:2px solid #ccc; padding:5px 0 5px 25px; margin:0 0 10px 0; background:url(../img/iconH2.gif) no-repeat left center;}
-#xeAdmin h4.xeAdmin {padding:5px 0 5px 20px; background:url(../img/iconH3.gif) no-repeat left center;}
-#xeAdmin h4.xeAdmin span.vr { font-size:11px; color:#AAA; }
-#xeAdmin h4.xeAdmin a.view { font-size:11px; font-family:vertical; color:#777e86; }
-#xeAdmin p.summary, div.infoText { margin:0 0 15px 0; line-height:1.6;}
-
-.layer { display:none; position:absolute; border:2px solid #777; margin:0; font-size:12px; background:#fff;}
-.layer * { margin:0; padding:0; font-size:12px; }
-.layer h4.xeAdmin { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
-.layer .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
-.layer .xButton span { position:relative; z-index:-1; visibility:hidden; }
-.layer .layerBody{ margin:15px;}
-
-.boxModelControler select { margin-bottom:3px; }
-.boxModelControler .inputText { border:1px solid #ccc; padding:2px 3px; margin-bottom:3px; vertical-align:top; *margin-top:-1px; }
-.boxModelControler .inputCheck { width:13px; height:13px; vertical-align:middle; }
-.boxModelControler .layerBody { margin:15px; }
-.boxModelControler .preview{ overflow:hidden; margin-bottom:20px;}
-.boxModelControler .dragAble { position:relative; padding:15px 0 0 15px; background:url(../img/bgRuler.gif) no-repeat; *zoom:1; cursor:move;}
-.boxModelControler .dragAble .prevGrid { position:relative; margin:-1px; background:url(../img/bgGrid.gif) 0 0; border:1px solid #000; *zoom:1;}
-.boxModelControler .dragAble .prevBox { position:relative; }
-.boxModelControler .dragAble .prevBox .prevContent { position:relative; }
-.boxModelControler .boxModelTable { width:100%; border:0; border-bottom:1px solid #ddd; margin:0; padding:0;}
-.boxModelControler .boxModelTable th,
-.boxModelControler .boxModelTable td { border:0; border-top:1px solid #ddd; vertical-align:top; padding:5px 10px; text-align:left; }
-.boxModelControler .boxModelTable th { height:50px; *height:40px; background:#f1f1f1; padding-left:70px; background-repeat:no-repeat; background-position:10px 10px; }
-.boxModelControler .boxModelTable th.width { background-image:url(../img/exWidth.gif); }
-.boxModelControler .boxModelTable th.margin { background-image:url(../img/exMargin.gif); }
-.boxModelControler .boxModelTable th.padding { background-image:url(../img/exPadding.gif); }
-.boxModelControler .boxModelTable th.border { background-image:url(../img/exBorder.gif); }
-.boxModelControler .boxModelTable th.bgColor { background-image:url(../img/exBgColor.gif); }
-.boxModelControler .boxModelTable th.bgImage { background-image:url(../img/exBgImage.gif); }
-.boxModelControler .boxModelTable th sup { font-weight:normal; font-size:11px; font-family:Dotum; color:#999; }
-.boxModelControler .boxModelTable td dl.iList dt { display:inline; position:relative; top:3px; }
-.boxModelControler .boxModelTable td dl.iList dd { display:inline; }
-.boxModelControler .boxModelTable td dl.dList dt { float:left; clear:left; margin-right:5px; padding-top:3px; }
-.boxModelControler .boxModelTable td dl.dList dd { clear:right; }
-.boxModelControler .colorPicker { position:relative; display:inline; vertical-align:top; }
-.boxModelControler .colorPicker .picker { position:relative; top:2px; left:-22px; width:16px; height:16px; border:1px solid #ccc; background-color:transparent; background-position:right top; cursor:pointer; vertical-align:top; }
-.boxModelControler .colorPicker .picker span { font-size:0; line-height:0; z-index:-1; visibility:hidden; }
-.boxModelControler .colorPicker .palette { position:absolute; top:0px; left:0; display:none; width:272px; height:64px; list-style:none; margin:0; padding:1px 0 0 1px; border:1px solid #ccc; background:#fff; overflow:hidden; }
-.boxModelControler .colorPicker .palette.open { display:block; }
-.boxModelControler .colorPicker .palette li { float:left; margin:0 1px 1px 0; font-size:0; line-height:0; }
-.boxModelControler .colorPicker .palette li button { width:15px; height:15px; border:0; cursor:pointer; }
-.boxModelControler .colorPicker .palette li button span { position:relative; z-index:-1; font-size:0; line-height:0; visibility:hidden; }
-.boxModelControler .colorPicker .palette li button.transparent { background:url(../img/bgNone.gif) no-repeat right top; border:1px solid #ddd; }
-.boxModelControler .borderDetach { display:none; }
-.boxModelControler .borderDetach.open { display:block; }
-.boxModelControler .buttonArea{ padding:15px 0 0 0; text-align:center;}
-
-#popup_content { border:2px solid #777; margin:0; font-size:12px; background:#fff; position:relative;}
-#popup_content .xButton { position:absolute; top:9px; right:18px; width:15px; height:14px; padding:0; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
-#popup_content .xButton span { position:relative; z-index:-1; visibility:hidden; }
-#popup_content * { font-size:12px; }
-#popHeadder h4.xeAdmin, #popHeadder h1.xeAdmin, #popHeadder h3.xeAdmin { font-size:14px !important; font-family:Dotum !important; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; border:none !important; margin:0 !important;}
-#popHeader h4.xeAdmin, #popHeader h1.xeAdmin, #popHeader h3.xeAdmin { font-size:14px !important; font-family:Dotum !important; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; border:none !important; margin:0 !important;}
-#popHeader, #popBody, #popFooter { position:relative; *zoom:1; overflow:hidden;}
-#popBody, #popHistoryBody { margin:15px !important;}
-#popFooter { padding:10px 0 0 0; height:28px; text-align:center; background:#f4f4f4;}
-#popHeader { }
-#popHeader.wide { width:600px;}
-
-.adminTable { width:100%; border:1px solid #EEE; border-bottom:none; border-right:none; margin-bottom:15px; }
-.adminTable caption { background:url("../img/n_caption_head.gif") no-repeat left top; padding:8px 0 5px 30px; text-align:left; font-weight:bold !important; color:#FFFFFF !important; background-color:#888 !important; border-bottom:1px solid #FFFFFF; font-size:12px !important;}
-.adminTable thead tr th div { text-align:center;}
-.adminTable thead tr th { background-color:#AAA; color:#FFFFFF !important; }
-.adminTable tr th { background-color:#FFFFFF; padding:6px; font-weight:bold; text-align:left; color:#666; border-right:1px solid #EEE; border-bottom:1px solid #EEE; }
-.adminTable tr.row2 th { background-color:#F3F3F3; }
-.adminTable tr th { width:10px; }
-.adminTable tr th div { white-space:nowrap; margin:0 5px; }
-.adminTable tr th select { height:20px; }
-.adminTable tr th.wide { width:100%; }
-.adminTable tr th.half_wide { width:50%; }
-.adminTable tr th.quarter_wide { width:25%; }
-.adminTable tr td.wide { width:100%; }
-.adminTable tr td { background-color:#FFFFFF;white-space:normal; font-weight:normal; text-align:left; color:#222222;  border-bottom:1px solid #EEE; border-right:1px solid #EEE; padding:4px 6px 4px 6px;}
-.adminTable tr.row2 td { background-color:#F3F3F3; }
-.adminTable tr a { color:#222222; text-decoration:none; }
-.adminTable tr a:hover { color:#3D83B8; }
-.adminTable tr td.nowrap { white-space:nowrap !important; }
-.adminTable tr td.alert, .adminTable tr td.alert a { color:red; }
-.adminTable tr td.number { font-size:8pt; font-family:tahoma; color:#27536C; }
-.adminTable tr td.date,
-.adminTable tr td span.date { font-size:8pt; font-family:tahoma; color:#666666;}
-.adminTable tr td.center { text-align:center; }
-.adminTable tr td.right { text-align:right; }
-.adminTable tr td.paper { background:transparent url("../img/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr.row2 td.paper { background:#F3F3F3 url("../img/n_paper_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr td.circle { background:#FFFFFF url("../img/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr.row2 td.circle { background:#F3F3F3 url("../img/n_circle_bullet.gif") no-repeat 6px 8px; padding-left:20px; }
-.adminTable tr td strong.alert { color:red; }
-.adminTable tr td p { padding:0; margin:5px 0 0 5px; color:#777777; }
-.adminTable tr td p a { color:#9F875F; font-weight:bold; text-decoration:underline; }
-.adminTable tr td.modify a,
-.adminTable tr td.delete a,
-.adminTable tr td.copy a,
-.adminTable tr td.setup a,
-.adminTable tr td.activated a,
-.adminTable tr td.deactivated a,
-.adminTable tr td.moveupdown a,
-.adminTable tr td.selectAll a,
-.adminTable tr td.deSelectAll a,
-.adminTable tr td.view a { margin:0 auto; }
-.adminTable tr td.modify a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_modify.gif") no-repeat left top; }
-.adminTable tr td.delete a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_delete.gif") no-repeat left top; }
-.adminTable tr td.copy a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_copy.gif") no-repeat left top; }
-.adminTable tr td.view a { width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_view.gif") no-repeat left top; }
-.adminTable tr td.setup a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_setup.gif") no-repeat left top; }
-.adminTable tr td.activated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_light_on.gif") no-repeat left top; }
-.adminTable tr td.deactivated a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_light_off.gif") no-repeat left top;   }
-.adminTable tr td.selectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_select_all.gif") no-repeat left top; }
-.adminTable tr td.deSelectAll a { width:16px; height:16px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_icon_remove.gif") no-repeat left top; }
-.adminTable tr td.moveupdown a.up { float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_button_up.gif") no-repeat left top; margin-right:5px; }
-.adminTable tr td.moveupdown a.down{ float:left; width:14px; height:14px; overflow:hidden; display:block; font-size:1px; line-height:100px; background:url("../img/n_button_down.gif") no-repeat left top; }
-.adminTable tr td.blue, .adminTable tr td.blue a { color:blue; } 
-.adminTable tr td.red, .adminTable tr td.red a { color:red; }
-
-.fullWidth { width:80%; }
-
-.adminLeftContent { float:left; width:60%; margin-right:2%; _margin-right:1.9%;}
-.adminRightExtra { float:left; width:38%; }
-.serverresponse { background: #FFFFFF url(../../../../common/tpl/images/loading.gif) no-repeat scroll 5px 5px; height:30px; padding-left:25px; padding-top:5px;  }
-
-#search_nav { border:3px solid #ccc; margin:0; padding:3px; }
-#search_nav input { border:0; height:17px; width:140px; padding:3px 0 0 4px; vertical-align:middle;}
-#search_nav button { padding:0; border:0; height:17px; width:17px; background:transparent url(../img/buttonSearch.gif) no-repeat center; vertical-align:middle;}
-#search_nav button.close {background:transparent url(../img/buttonClose.gif) no-repeat center;}
-.e1 .section ._result{ list-style:none; margin:10px 0 0 0; padding:0;}
-.e1 .section ._result li{ margin:0;}
-.e1 .section ._result a{ display:block; color:#767676; padding:4px 5px 4px 10px;}
-.e1 .section ._result a:hover,
-.e1 .section ._result a:active,
-.e1 .section ._result a:focus{ background:#f8f8f8;}
+/* Element Reset */
+header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{display:block}
+.x,
+.x table,
+.x input,
+.x textarea,
+.x select,
+.x button{font-family:Tahoma,Geneva,sans-serif;font-size:12px;color:#333}
+.x button,
+.x input[type=submit],
+.x input[type=reset],
+.x input[type=button]{cursor:pointer;overflow:visible}
+.x img{border:0}
+.x p{line-height:1.5}
+/* Section & Heading */
+.x .section{margin:1em 0;padding:0;border:0}
+.x .h1, 
+.x .h2, 
+.x .h3, 
+.x .h4{position:relative;border-style:solid;border-top:0;border-right:0;zoom:1;padding-left:8px}
+.x .h1{border-width:4px;font-size:24px;border-color:#666}
+.x .h2{border-width:3px;font-size:20px;border-color:#888}
+.x .h3{border-width:2px;font-size:16px;border-color:#aaa}
+.x .h4{border-width:1px;font-size:12px;border-color:#ccc}
+.x .h1 + ul,
+.x .h2 + ul,
+.x .h3 + ul,
+.x .h4 + ul,
+.x .h1 + .table table, 
+.x .h2 + .table table, 
+.x .h3 + .table table, 
+.x .h4 + .table table{border-top:0 !important;margin-top:-1em !important}
+/* Portlet */
+.x .portlet{position:relative;border:1px solid #e9e9e9;margin:1em 0;padding:0;background:#fff;zoom:1;overflow:hidden;border-radius:5px}
+.x .portlet h2, 
+.x .portlet h3{margin:0;padding:.5em 1em;font-size:14px;border:1px solid #fff;border-bottom:1px solid #e9e9e9;background:#f7f7f7;border-radius:5px 5px 0 0}
+.x .portlet p{margin:1em 1.2em}
+.x .portlet li{position:relative;padding-right:8em}
+.x .portlet .lined{margin:1px !important;padding:0;list-style:none}
+.x .portlet .lined li{padding:.5em 8em .5em 1em;border-top:1px solid #eee;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}
+.x .portlet .lined li:first-child{border:0}
+.x .portlet .side{position:absolute;top:0;_top:1px;right:0;color:#666;background:#fff;padding:0 1em}
+.x .portlet .lined .side{padding:.5em 1em}
+.x .portlet .more{position:absolute;top:.5em;right:1em;text-decoration:none !important;color:#666}
+.x .portlet .more span{color:#999}
+.x .portlet .action{text-align:right;top:0;right:0;padding:.5em 1em .5em 3em;background:#fff;background:-webkit-gradient(linear, 0% 0%, 100% 0%, from(rgba(255,255,255,0)), to(rgba(255,255,255,1)), color-stop(15%, #fff));background:-moz-linear-gradient(left, rgba(255,255,255,0) 0, rgba(255,255,255,1) 15%)}
+.x .portlet .action a,
+.x .portlet .action button{margin-left:1em}
+.x .portlet .btnArea{border-top:1px solid #ddd;margin:0;padding:.5em 1em;margin:0 1px 1px 1px;background:#f7f7f7;border-radius:0 0 5px 5px}
+/* Table */
+.x .table{margin:1em 0}
+.x .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc}
+.x .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}
+.x .table caption:after{content:"";display:block;clear:both}
+.x .table caption a{font-weight:normal}
+.x .table caption em{float:right;margin-left:1em}
+.x .table caption strong{color:#e00}
+.x .table caption .side{float:right;font-weight:normal;margin-left:1em}
+.x .table th,
+.x .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap}
+.x .table th{background:#f8f8f8}
+.x .table thead th{border-bottom:1px solid #999}
+.x .table tfoot td{font-weight:bold;background:#f8f8f8}
+.x .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa}
+.x .table td>input[type=text]{margin:-1px 0 !important;vertical-align:middle}
+.x .table img{vertical-align:middle}
+.x .table em{font-style:normal;font-weight:normal;color:#e00}
+.x .table th.title,
+.x .table td.title,
+.x .table th.text,
+.x .table td.text{white-space:normal;width:100%}
+.x .table td[colspan]{white-space:normal}
+/* Form */
+.x .form{margin:1em 0;padding:0}
+.x .form fieldset{margin:0 0 2em 0;padding:0;border:0}
+.x .form.search fieldset{border:1px solid #ccc;padding:5px 15px;border-radius:3px}
+.x .form em{font-style:normal;color:#e00}
+.x .form label{line-height:1;vertical-align:middle}
+.x .form input[type=radio]+label,
+.x .form input[type=checkbox]+label{margin-right:1em}
+.x .form input[type=checkbox]+label,
+.x .form input[type=radio]+label,
+.x .form input[type=file]{cursor:pointer}
+.x .form ul{position:relative;margin:1em 0;padding:0;list-style:none;border-top:2px solid #ccc;border-bottom:1px solid #ccc;zoom:1}
+.x .form li{list-style:none;border:1px solid #ddd;border-left:0;border-right:0;margin:-1px 0;padding:8px 0;vertical-align:top;zoom:1}
+.x .form li:first-child{border-top:0}
+.x .form li>label:first-child{display:block;font-weight:bold}
+.x .form li label em{font-weight:normal}
+.x .form label.overlap{position:absolute;color:#aaa}
+.x .form input[type=text],
+.x .form input[type=password],
+.x .form input[type=file],
+.x .form textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
+.x .form input[type=text],
+.x .form input[type=password],
+.x .form input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}
+.x .form input[type=text].loading,
+.x .form input.loading[type=password]{padding-right:24px;width:260px;background:transparent url(../img/preLoader16.gif) no-repeat 265px center}
+.x .form input[type=checkbox],
+.x .form input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle}
+.x .form input[type=text][disabled=disabled],
+.x .form input[type=password][disabled=disabled],
+.x .form input[type=radio][disabled=disabled],
+.x .form input[type=checkbox][disabled=disabled],
+.x .form select[disabled=disabled],
+.x .form textarea[disabled=disabled]{background:#ddd;text-shadow:1px 1px 0 #fff}
+.x .form textarea{padding:3px 4px;vertical-align:top}
+.x .form span.desc, 
+.x .form em.desc{line-height:22px;vertical-align:middle;margin:0 10px}
+.x .form p.desc{margin:.25em 0;line-height:1.4}
+.x .form .q{font-weight:bold;margin:0 0 5px 0}
+.x .form .a{margin:0 0 5px 0}
+.x .form .tgForm{margin-right:1em}
+/* Global Navigation Bar */
+.x .gnb{position:relative;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1}
+.x .gnb ul{margin:0;padding:0 0 0 20px;list-style:none;border:1px solid #fff;border-left:0;border-right:0;zoom:1}
+.x .gnb ul ul{position:absolute;top:30px;left:0;border:1px solid #ccc;border-top:0;padding:1px 0 0 0;background:#fff}
+.x .gnb ul:after{content:"";display:block;clear:both}
+.x .gnb li{position:relative;float:left;border:1px solid #fff;border-top:0;border-bottom:0;margin:0 -1px 0 0}
+.x .gnb li li{float:none;clear:both;overflow:hidden;border:0;border-top:1px dotted #ccc;margin:0;padding:2px}
+.x .gnb li li:first-child{border:0}
+.x .gnb li a{float:left;font-weight:bold;color:#333;font-size:12px;height:14px;padding:8px 18px;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1}
+.x .gnb li a:hover,
+.x .gnb li a:active,
+.x .gnb li a:focus,
+.x .gnb li.active a{background:#f4f4f4;border:1px solid #ccc;border-bottom:0;padding:7px 17px 8px 17px}
+.x .gnb li.activeOn a{background:#fff;border:1px solid #ccc;border-bottom:0;padding:7px 17px 8px 17px}
+.x .gnb li.active li a{display:block;float:none;color:#555;background:#fff;padding:5px 15px !important;font-weight:normal !important;border:0 !important}
+.x .gnb li.active li a:hover,
+.x .gnb li.active li a:active,
+.x .gnb li.active li a:focus{border:0;background:#eee}
+.x .gnb .setting{position:absolute;top:8px;right:2em;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;background:url(../img/iconSetting.gif) no-repeat center}
+.x .gnb.jx ul{display:block;position:static;padding:0}
+.x .gnb.jx li{float:none;clear:both;border-top:1px solid #ccc}
+.x .gnb.jx ul ul{border:0}
+.x .gnb.jx li li{border:0}
+.x .gnb.jx li a{float:none;display:block}
+.x .gnb.jx li a:hover,
+.x .gnb.jx li a:active,
+.x .gnb.jx li a:focus{background:none}
+.x .gnb.jx li.activeOn>a{background:#ddd}
+@media only all and (max-width:860px){
+.x .gnb ul{padding-left:1em}
+.x .gnb .setting{right:1em}
+}
+@media only all and (max-width:640px){
+.x .gnb ul{display:block;position:static;padding:0}
+.x .gnb li{float:none;clear:both;border-top:1px solid #ccc}
+.x .gnb ul ul{border:0;position:static}
+.x .gnb li li{border:0}
+.x .gnb li a{float:none;display:block}
+.x .gnb li a:hover,
+.x .gnb li a:active,
+.x .gnb li a:focus{background:none}
+.x .gnb li.activeOn>a{background:#ddd}
+}
+/* Favorite */
+.x .bmk{position:absolute;right:20px;bottom:10px;padding:0 0 0 20px;background:url(../img/iconFavorite.gif) no-repeat 0 -16px}
+.x .bmk>a{text-shadow:0 1px 0 #fff}
+.x .bmk ul{position:absolute;top:140%;right:0;list-style:none;margin:0;padding:5px 10px;border:1px solid #aaa;border-radius:5px;background:#fff;box-shadow:1px 1px 3px #aaa}
+.x .bmk li{position:relative;padding:3px 30px 3px 0;white-space:nowrap}
+.x .bmk li .action{position:absolute;top:0;right:0}
+.x .bmk li .action .text{text-decoration:none;width:16px;text-align:center;margin:0}
+@media only all and (max-width:640px){
+.x .bmk{position:static;background-color:#fff;padding:10px 20px;background:#fff}
+.x .bmk .tgAnchor{display:block}
+.x .bmk ul{position:relative;border:0;border-top:1px solid #ccc;border-radius:0;box-shadow:none;padding:0;margin:5px 0 0 0}
+.x .bmk li{position:relative;top:-1px;border-top:1px dotted #ccc}
+}
+/* Local Navigation */
+.x .lnb{position:relative;float:left;width:210px;margin:1em 0 1em -240px;line-height:normal;zoom:1;display:inline}
+.x .lnb .h2{margin-top:0;border-left:0;padding-left:0}
+.x .lnb ul{margin:0 !important;padding:0;list-style:none}
+.x .lnb li{position:relative;margin:0 0 -1px 0;vertical-align:top;zoom:1}
+.x .lnb li a{display:block;position:relative;padding:8px 10px;text-decoration:none;color:#666;font-weight:bold;background:#fafafa;border:1px solid #eee;zoom:1}
+.x .lnb li a .i{position:absolute;top:50%;left:100%;margin:-4px 0 0 -16px;width:8px;height:8px;color:#ccc;background:url(../img/iconNavVr.gif) no-repeat left top}
+.x .lnb li ul{padding:5px 0;background:#fff}
+.x .lnb li li{margin:0;border-top:1px dotted #ddd}
+.x .lnb li li:first-child{border:0}
+.x .lnb li li a{font-weight:normal;background:#fff;padding:5px 10px;border:0}
+.x .lnb li li a span{color:#666}
+.x .lnb li.active{border:1px solid #ccc;z-index:2}
+.x .lnb li li.active{border:0}
+.x .lnb li.active a{color:#000;border:0}
+.x .lnb li.active .i{background-position:0 -44px}
+.x .lnb li.active li a{border:0}
+.x .lnb li.active ul{display:block;border-top:1px solid #eee}
+.x .lnb li.active li.active a span{color:#13b200;font-weight:bold;letter-spacing:-1px}
+/* Content Navigation */
+.x .cnb{margin:1em 0;position:relative;zoom:1}
+.x .cnb:after{content:"";display:block;clear:both}
+.x .cnb ul{list-style:none;margin:0;padding:0}
+.x .cnb li{display:inline}
+.x .cnb li:before{content:"| ";color:#ccc}
+.x .cnb li:first-child:before{content:""}
+.x .cnb .active,
+.x .cnb .active a{font-weight:bold;color:#333;text-decoration:none}
+.x .cnb .side{float:right}
+/* Pagination */
+.x .pagination{margin:1em 0;text-align:center;line-height:normal}
+.x .pagination *{vertical-align:middle}
+.x .pagination a,
+.x .pagination strong{position:relative;display:inline-block;padding:2px 4px;font-weight:bold;text-decoration:none;line-height:normal;color:#333 !important;vertical-align:middle}
+.x .pagination a:hover,
+.x .pagination a:active,
+.x .pagination a:focus{border:1px solid #ddd;margin:0 -1px}
+.x .pagination strong{color:#e00 !important;font-size:20px}
+.x .pagination .direction{font-weight:normal;white-space:nowrap}
+.x .pagination .direction:hover,
+.x .pagination .direction:active,
+.x .pagination .direction:focus{border:0;margin:0;text-decoration:underline}
+.x .pagination input{width:30px;text-align:center}
+.x .pagination button{overflow:visible}
+/* Star Rating */
+.x .starRating, 
+.x .starRating span{display:inline-block;height:14px;background:transparent url(../img/iconStarRating.gif) no-repeat;overflow:hidden}
+.x .starRating{width:79px;vertical-align:top}
+.x .starRating span{font-size:0;line-height:0;vertical-align:top;text-indent:-100px;*text-indent:0;background-position:0 -14px}
+/* Progress */
+.x .prgrs{white-space:nowrap;line-height:normal;vertical-align:middle}
+.x .prgrs *{vertical-align:middle}
+.x .prgrs .pBar{position:relative;display:inline-block;background:#e9e9e9;margin:0 5px 0 0}
+.x .prgrs .pAction{display:inline-block;vertical-align:top;background:#99a6b6}
+.x .prgrs .pNum{position:absolute;width:100%;left:0;top:0;text-align:center;text-shadow:1px 1px 0 #fff}
+.x .prgrs.prgrsSmall{font-size:14px;line-height:14px}
+.x .prgrs.prgrsSmall .pBar,
+.x .prgrs.prgrsSmall .pAction,
+.x .prgrs.prgrsSmall .pNum{height:16px;line-height:16px;font-size:11px}
+.x .prgrs.prgrsMedium{font-size:24px;line-height:24px}
+.x .prgrs.prgrsMedium .pBar,
+.x .prgrs.prgrsMedium .pAction,
+.x .prgrs.prgrsMedium .pNum{height:22px;line-height:22px;font-size:12px}
+.x .prgrs.prgrsLarge{font-size:38px;line-height:38px}
+.x .prgrs.prgrsLarge .pBar,
+.x .prgrs.prgrsLarge .pAction,
+.x .prgrs.prgrsLarge .pNum{height:34px;line-height:34px;font-size:14px}
+/* Modal Window */
+.modal{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}
+.modal .bg{position:absolute;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1}
+.modal .fg{position:relative;width:80%;margin:5em auto;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;z-index:3;zoom:1;border-radius:5px;box-shadow:0 0 6px #000}
+.modal ul, 
+.modal ol, 
+.modal .lined, 
+.modal .table{margin-bottom:1em}
+.modal .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}
+.modalClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px}
+.modalBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden}
+html.modalContainer,
+body.modalContainer{_height:100%;_width:100%} /* IE6 only */ 
+/* Layer */
+.x .layer,
+.x.layer{position:absolute;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;z-index:2;zoom:1;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}
+.x .layer h2{font-size:14px}
+.x .layer ul, 
+.x .layer ol, 
+.x .layer .lined, 
+.x .layer .table{margin-bottom:1em}
+.x .layerClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px}
+.x .layerBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden}
+/* H2 Anchor */
+.x .h2Anchor{position:absolute;right:0;border:0;background:none;color:#00f;text-decoration:underline}
+/* Skip Navigation */
+.x .skipNav{margin:0;text-align:center}
+.x .skipNav a{position:absolute;width:1px;height:1px;display:block;font-weight:bold;padding:10px 0}
+.x .skipNav a:hover,
+.x .skipNav a:active,
+.x .skipNav a:focus{position:relative;width:auto;height:auto}
+/* Header */
+.x .header{position:relative;z-index:2;padding:30px 0 0 0;background:#4c4c4c;box-shadow:0 0 10px #aaa;zoom:1;border-radius:5px 5px 0 0}
+.x .header:after{content:"";display:block;clear:both}
+.x .header a{text-decoration:none}
+.x .header h1{margin:0 15px 10px 20px;font-size:24px;line-height:32px;display:inline-block;zoom:1}
+.x .header h1 *{vertical-align:middle}
+.x .header h1 a{color:#fff;text-shadow:1px 1px 0 #000;filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);zoom:1}
+.x .header h1 .url{font-size:12px;font-weight:normal}
+.x .header .site{margin:0;display:inline-block;zoom:1}
+.x .header .site a{color:#fff;text-decoration:underline}
+.x .header #moveSiteList{padding:10px 1em 5px 1em;margin:0}
+.x .header #moveSiteList ul{list-style:none;margin:0;padding:0}
+.x .header #moveSiteList li{white-space:nowrap;margin:0;padding:4px 0;border-bottom:1px dotted #ccc}
+.x .header #siteMapList{padding:0 1em 1em 1em;margin:0}
+.x .header #siteMapList li{white-space:nowrap}
+.x .header .account{position:absolute;z-index:3;width:100%;top:0;right:0;white-space:nowrap;text-align:right;background:#333;border-bottom:1px solid #656565;color:#fff;font-size:12px;border-radius:5px 5px 0 0}
+.x .header .account ul{margin:0 2px 0 0;padding:5px 20px 5px 0;list-style:none}
+.x .header .account li{position:relative;display:inline;border-left:1px solid #666;padding:0 6px 0 10px}
+.x .header .account li:first-child{border:0}
+.x .header .account a{color:#fff;display:inline-block;height:14px}
+.x .header .account a.language{padding-right:16px;background:url(../img/iconArrow.gif) no-repeat right -160px}
+.x .header #language{position:absolute;top:19px;right:-2em;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}
+.x .header #language li{border:0;display:block;padding:1px 8px 1px 10px;text-align:left;line-height:1}
+.x .header #language li.selected{background:url(../img/iconCheck.gif) no-repeat left center}
+.x .header #language li.selected a{text-decoration:underline}
+.x .header h1 a:hover,
+.x .header h1 a:active,
+.x .header h1 a:focus,
+.x .header .account a:hover,
+.x .header .account a:active,
+.x .header .account a:focus{color:#6e9cf2;text-decoration:underline}
+/* Footer */
+.x .footer{border-top:1px solid #ddd;text-align:center;font-size:12px;padding:1.5em 0;zoom:1}
+.x .footer:after{content:"";display:block;clear:both}
+.x .footer p{margin:0}
+.x .footer .power{float:left}
+.x .footer .cache{float:right}
+/* Body */
+.x .body{position:relative;z-index:1;padding:1em 20px 1em 260px;zoom:1}
+.x .body:after{content:"";display:block;clear:both}
+/* Content */
+.x .content{float:right;width:100%;margin-left:-230px;zoom:1}
+.x .content:after{content:"";display:block;clear:both}
+.x .content a{color:#33a}
+.x .content a:hover,
+.x .content a:active,
+.x .content a:focus{color:#a33}
+.x .content .portlet a{text-decoration:none}
+.x .content .portlet a:hover,
+.x .content .portlet a:active,
+.x .content .portlet a:focus{text-decoration:underline}
+/* Dashboard */
+.x .dashboard{position:relative;float:none;width:auto;margin-left:-230px}
+.x .dashboard .portlet{float:left;width:48%;margin-right:1em}
+.x .dashboard .portlet:nth-of-type(odd){float:left;width:49%;margin-right:0}
+.x .dashboard .portlet:nth-of-type(even){float:right;width:49%;margin-right:0}
+@media only all and (min-width:1300px){
+.x .dashboard .portlet{float:left !important;width:32% !important;margin-right:1em !important}
+}
+/* Single Column*/
+.x .single{position:relative;float:none;width:auto;margin-left:-240px}
+/* Search */
+.x .search{zoom:1}
+.x .search:after{content:"";display:block;clear:both}
+.x .search .pagination{float:left;text-align:left}
+.x .search form{float:right;margin:1em 0}
+.x .search form *{vertical-align:middle}
+/* Site Map */
+.x .siteMap h2 input{font-size:14px;font-weight:bold;padding:0 .5em}
+.x .siteMap label{cursor:text}
+.x .siteMap .lined ul{padding:0;margin:0;border-top:1px solid #eee;zoom:1}
+.x .siteMap .lined li{position:relative;padding:0;margin:0;cursor:all-scroll;list-style:none;zoom:1}
+.x .siteMap .lined li li{border-top:1px solid #eee}
+.x .siteMap li li{text-indent:18px}
+.x .siteMap li li li{text-indent:36px}
+.x .siteMap li li li li{text-indent:54px}
+.x .siteMap li li li li li{text-indent:72px}
+.x .siteMap li li li li li li{text-indent:90px}
+.x .siteMap li li li li li li li{text-indent:108px}
+.x .siteMap li li li li li li li li{text-indent:126px}
+.x .siteMap li li li li li li li li li{text-indent:144px}
+.x .siteMap li li li li li li li li li li{text-indent:162px}
+.x .siteMap li li li li li li li li li li li{text-indent:180px}
+.x .siteMap li li li li li li li li li li li li{text-indent:198px}
+.x .siteMap li *{vertical-align:middle}
+.x .siteMap li .moveTo+input{width:200px;border:0;padding:0 .5em}
+.x .siteMap li .moveTo+input:hover,
+.x .siteMap li .moveTo+input:active,
+.x .siteMap li .moveTo+input:focus{border:1px dotted #ccc;overflow:visible}
+.x .siteMap .moveTo{position:relative;z-index:2;width:22px;height:32px;padding:32px 0 0 0;margin:0 3px;_margin-top:-1px;overflow:hidden;background:#fff url(../img/iconMoveTo.gif) no-repeat center 0;border:0;cursor:move}
+.x .siteMap li.active,
+.x .siteMap li.active .moveTo{background-color:#f7f7f7}
+.x .siteMap li.active li,
+.x .siteMap li.active ul{border-top-color:#f7f7f7}
+.x .siteMap li.active .moveTo{background-position:center -32px}
+.x .siteMap .vr,
+.x .siteMap .hr{display:none;position:absolute;z-index:1;left:14px;border:0px solid #ccc;overflow:hidden}
+.x .siteMap .vr{top:-16px;height:100%;border-left-width:1px}
+.x .siteMap .hr{top:16px;width:16px;border-top-width:1px}
+.x .siteMap li.active .vr,
+.x .siteMap li.active li .hr{display:block}
+.x .siteMap li li .vr,
+.x .siteMap li li li .hr{left:32px}
+.x .siteMap li li li .vr,
+.x .siteMap li li li li .hr{left:50px}
+.x .siteMap li li li li .vr,
+.x .siteMap li li li li li .hr{left:68px}
+.x .siteMap li li li li li .vr,
+.x .siteMap li li li li li li .hr{left:86px}
+.x .siteMap li li li li li li .vr,
+.x .siteMap li li li li li li li .hr{left:104px}
+.x .siteMap li li li li li li li .vr,
+.x .siteMap li li li li li li li li .hr{left:122px}
+.x .siteMap li li li li li li li li .vr,
+.x .siteMap li li li li li li li li li .hr{left:140px}
+.x .siteMap li li li li li li li li li .vr,
+.x .siteMap li li li li li li li li li li .hr{left:158px}
+.x .siteMap li li li li li li li li li li .vr,
+.x .siteMap li li li li li li li li li li li .hr{left:176px}
+.x .siteMap li li li li li li li li li li li .vr,
+.x .siteMap li li li li li li li li li li li li .hr{left:336px}
+.x .siteMap .side{padding-top:0 !important;padding-bottom:0 !important;line-height:30px;background:transparent !important}
+.x .siteMap .side button{text-indent:0;line-height:1}
+.x .siteMap .tgMap{position:absolute;top:12px;right:1em;padding:0 16px 0 0;line-height:16px;background:url(../img/iconArrow.gif) no-repeat right -126px}
+.x .siteMap.fold .tgMap{background-position:right -158px}
+.x .siteMap.fold .h2{border-bottom-color:#fff;border-radius:5px}
+.x .siteMap .placeholder{background:#bbb}
+.x .siteMap .draggable,
+.x .siteMap .draggable .moveTo{background-color:#ddd}
+.x .siteMap .draggable .summary{border-left:1px solid #ccc;padding-left:10px;margin-left:10px;font-size:11px;color:#999}
+.x .siteMap a.ms{text-decoration:underline}
+/* Multilingual */
+.x .langEdit{background:#fff;position:absolute;*left:0;*margin-top:28px;z-index:10}
+.x .langEdit ul{border-top:1px solid #ccc;border-left:1px solid #eee;border-right:1px solid #eee;margin:0}
+.x .langEdit li{padding:.5em 10px}
+.x .langEdit input[type=text]{width:220px;padding-right:40px}
+.x .langEdit label{left:15px !important}
+.x .langEdit .action{border:1px solid #eee;width:268px;padding:0 10px}
+.x .langEdit p, 
+.x .langEdit .btnArea{white-space:normal}
+.x .langEdit .langList,
+.x .langEdit .langEditControls{box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}
+.x .langEdit .langList{margin:0 -1px 0 0;display:none}
+.x .langEdit .langList li{white-space:nowrap;color:#ccc;width:270px} 
+.x .langEdit .langList li span{display:inline-block;width:80px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:#767676}
+.x .langEdit .langList li a{display:inline-block;width:80px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}
+.x .langEdit .langList li.active{background:url(../img/iconArrow.gif) no-repeat right -188px}
+.x .langEdit.showChild .langList{display:block}
+.x .langEdit .langInput{background:#fff}
+.x .langEdit .langInput h2{padding:5px 10px;margin:0 0 -1px 0;font-size:12px;font-weight:normal;color:#666;border:1px solid #eee;border-top-color:#ccc}
+.x .langEdit .langInput h2 strong{color:#000;font-size:14px}
+.x .langEdit.showChild .langInput{position:absolute;left:285px;top:0}
+.x .langEdit li.en input, 
+.x .langEdit li.en textarea, 
+.x .mLangEdit li.en textarea{background:url(../img/flag.us.gif) no-repeat 99% 5px}
+.x .langEdit li.ko input, 
+.x .langEdit li.ko textarea, 
+.x .mLangEdit li.ko textarea{background:url(../img/flag.kr.gif) no-repeat 99% 5px}
+.x .langEdit li.jp input, 
+.x .langEdit li.jp textarea, 
+.x .mLangEdit li.jp textarea{background:url(../img/flag.jp.gif) no-repeat 99% 5px}
+.x .langEdit li.fr input, 
+.x .langEdit li.fr textarea, 
+.x .mLangEdit li.fr textarea{background:url(../img/flag.fr.gif) no-repeat 99% 5px}
+.x .langEdit li.de input, 
+.x .langEdit li.de textarea, 
+.x .mLangEdit li.de textarea{background:url(../img/flag.de.gif) no-repeat 99% 5px}
+.x .langEdit li.ru input, 
+.x .langEdit li.ru textarea, 
+.x .mLangEdit li.ru textarea{background:url(../img/flag.ru.gif) no-repeat 99% 5px}
+.x .langEdit li.es input, 
+.x .langEdit li.es textarea, 
+.x .mLangEdit li.es textarea{background:url(../img/flag.es.gif) no-repeat 99% 5px}
+.x .langEdit li.tr input, 
+.x .langEdit li.tr textarea, 
+.x .mLangEdit li.tr textarea{background:url(../img/flag.tr.gif) no-repeat 99% 5px}
+.x .langEdit li.vi input, 
+.x .langEdit li.vi textarea, 
+.x .mLangEdit li.vi textarea{background:url(../img/flag.vn.gif) no-repeat 99% 5px}
+.x .langEdit li.mn input, 
+.x .langEdit li.mn textarea, 
+.x .mLangEdit li.mn textarea{background:url(../img/flag.mn.gif) no-repeat 99% 5px}
+.x .langEdit li.zh-CN input, 
+.x .langEdit li.zh-CN textarea, 
+.x .mLangEdit li.zh-CN textarea{background:url(../img/flag.cn.gif) no-repeat 99% 5px}
+.x .langEdit li.zh-TW input, 
+.x .langEdit li.zh-TW textarea, 
+.x .mLangEdit li.zh-TW textarea{background:url(../img/flag.tw.gif) no-repeat 99% 5px}
+.x .mLangEdit.en strong{background:url(../img/flag.us.gif) no-repeat 0 10px}
+.x .mLangEdit.ko strong{background:url(../img/flag.kr.gif) no-repeat 0 10px}
+.x .mLangEdit.jp strong{background:url(../img/flag.jp.gif) no-repeat 0 10px}
+.x .mLangEdit.fr strong{background:url(../img/flag.fr.gif) no-repeat 0 10px}
+.x .mLangEdit.de strong{background:url(../img/flag.de.gif) no-repeat 0 10px}
+.x .mLangEdit.ru strong{background:url(../img/flag.ru.gif) no-repeat 0 10px}
+.x .mLangEdit.es strong{background:url(../img/flag.es.gif) no-repeat 0 10px}
+.x .mLangEdit.tr strong{background:url(../img/flag.tr.gif) no-repeat 0 10px}
+.x .mLangEdit.vi strong{background:url(../img/flag.vn.gif) no-repeat 0 10px}
+.x .mLangEdit.mn strong{background:url(../img/flag.mn.gif) no-repeat 0 10px}
+.x .mLangEdit.zh-CN strong{background:url(../img/flag.cn.gif) no-repeat 0 10px}
+.x .mLangEdit.zh-TW strong{background:url(../img/flag.tw.gif) no-repeat 0 10px}
+.x .mLangEdit ul ul{border:0}
+.x .mLangEdit li{position:relative;padding:0}
+.x .mLangEdit li strong{display:inline-block;padding:6px 100px 8px 24px;font-weight:normal;line-height:1.5}
+.x .mLangEdit li .side{position:absolute;top:8px;right:0;padding-right:18px;background:url(../img/iconArrow.gif) no-repeat right -160px}
+.x .mLangEdit li li{border:0;padding-right:36px}
+.x .mLangEdit li textarea{width:100%;height:16px;padding-right:30px;resize:vertical;line-height:1.4}
+.x .mLangEdit li label{top:8px !important}
+.x .mLangEdit li.active{background:#FFFDEF}
+.x .mLangEdit li.active strong{font-weight:bold}
+.x .mLangEdit li.active .side{background-position:right -128px}
+.modal .mLangEdit ul{padding-bottom:1em}
+.modal .mLangEdit li{border:0;padding-right:36px}
+/* Suggestion */
+.x .suggestion{display:none;position:absolute;background:#fff;z-index:10;_height:200px;max-height:200px;overflow:auto;*left:0;*margin-top:28px;box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}
+.x .suggestion ul{border-top:1px solid #ccc;border-left:1px solid #eee;border-right:1px solid #eee;margin:0}
+.x .suggestion li{padding:0}
+.x .suggestion li:last-child{border-bottom:0}
+.x .suggestion li button{border:0;background:#fff;text-align:left;width:288px;padding:2px 4px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.x .suggestion li button:hover,
+.x .suggestion li button:active,
+.x .suggestion li button:focus,
+.x .suggestion li button.active{background:#eee}
+/* Image Mark */
+.x #imageMark{right:0}
+/* Easy Installer */
+.x .easyNav{position:relative;border:1px solid #e9e9e9;zoom:1}
+.x .easyNav:after{content:"";display:block;clear:both}
+.x .easyNav h2{font-size:16px}
+.x .easyNav .category{width:30%;float:left;margin:0 2em;display:inline}
+.x .easyNav .filter{position:absolute;top:0;right:0;margin:1em 2em;text-align:right}
+.x .easyList td p{margin-top:0}
+.x .easyList td p.update{background:#ffc;padding:.5em 1em;border:1px solid #fc9;border-left:0;border-right:0;text-align:center}
+/* Font Preview */
+.x .fontPreview{width:96%;border:1px solid #e9e9e9;zoom:1;padding:1em 2em;margin:.5em 0}
+/* FTP Suggestion */
+.x #ftpSuggestion{background:#fff;box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}
+.x #ftpSuggestion ul{border-left:1px solid #eee;border-right:1px solid #eee}
+.x #ftpSuggestion li{padding:0}
+.x #ftpSuggestion li button{border:0;background:#fff;text-align:left;width:288px}
+.x #ftpSuggestion li button:hover,
+.x #ftpSuggestion li button:active,
+.x #ftpSuggestion li button:focus{background:#eee}
+/* Theme & Skin Preview */
+.x .thumbPreview li{position:relative;padding-left:10px;padding-right:10px}
+.x .thumbPreview li.active.highlight{background:#f9f9f9}
+.x .thumbPreview .prevToggle{position:absolute;top:8px;right:10px;line-height:16px;padding:0 18px 0 0;text-decoration:none;background:url(../img/iconArrow.gif) no-repeat right -32px}
+.x .thumbPreview li.active .prevToggle{background-position:right 0}
+.x .thumbPreview .a{border:0;margin:0;zoom:1}
+.x .thumbPreview .a:after{content:"";display:block;clear:both}
+.x .thumbPreview .i{float:left;vertical-align:top;margin:0 1em 1em 0;padding:0;border:0;zoom:1}
+.x .thumbPreview .i:after{content:"";display:block;clear:both}
+.x .thumbPreview .i .thumb{position:relative;width:124px;height:84px;padding:0;margin-bottom:3px;text-align:center;overflow:hidden;border:1px solid #ddd;display:block;cursor:pointer;background:#fff}
+.x .thumbPreview .i .thumb .frame{position:absolute;width:120px;height:80px;left:0;top:0;border:2px solid #fff;overflow:hidden}
+.x .thumbPreview .i .thumb img{width:120px;margin:0}
+.x .thumbPreview .i label{display:block;position:relative;top:0;left:2px;width:122px;height:1.1em;margin:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
+.x .thumbPreview .i input{display:none}
+.x .thumbPreview .i ul{display:none}
+.x .thumbPreview .selected .i{display:block;float:none}
+.x .thumbPreview .selected .i .thumb{float:left;width:186px;height:126px;margin:0 1em 0 0;border:2px solid #eee}
+.x .thumbPreview .selected .i .thumb .frame{width:180px;height:120px;border-width:3px}
+.x .thumbPreview li.active.highlight .selected .i .thumb{border-color:#5ea8f6}
+.x .thumbPreview .selected .i .thumb img{width:180px;position:relative}
+.x .thumbPreview li.active .selected .i .thumb img{z-index:auto}
+.x .thumbPreview .selected .i label{cursor:text}
+.x .thumbPreview .selected .i ul{display:block;list-style:none;border:0;margin:1em 0 1em 200px}
+.x .thumbPreview .selected .i li{border:0;padding:0;margin:0 0 .2em 0}
+.x .thumbPreview.jx .i label{display:inline;width:auto}
+.x .thumbPreview.jx .i.noDirection{display:none}
+.x .thumbPreview.jx .i input{display:inline}
+.x #skin .showAll{float:right;border:0;overflow:visible;padding:0 18px 0 0;cursor:pointer;color:#00f;background:url(../img/iconArrow.gif) no-repeat right -32px}
+.x #skin .showAll.hideAll{background-position:right 0}
+/* Favorite On | Off */
+.x .fvOff,
+.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:url(../img/iconFavorite.gif) no-repeat}
+.x .fvOn{background-position:0 -16px}
+/* Up-Down Dragable */
+.x .uDrag .wrap{position:relative;padding-left:20px}
+.x .uDrag li>.wrap{margin:0 0 0 8px}
+.x .uDrag .dragActive{background:#FFD}
+.x .uDrag .dragActive th,
+.x .uDrag .dragActive td{background:none !important}
+.x .uDrag .dragBtn{position:absolute;width:8px;height:100%;padding:0;overflow:hidden;background:url(../img/bgDragable.gif);top:1px;left:0;text-indent:12px;border:0;cursor:n-resize;white-space:nowrap}
+/* Favicon Preview */
+.x .faviconPreview{position:relative;padding:60px 0 0 200px;background:url(../img/bgFavicon.gif) no-repeat}
+.x .faviconPreview img{position:absolute}
+.x .faviconPreview .fn1{top:30px;left:12px}
+.x .faviconPreview .fn2{top:55px;left:68px}
+/* Mobile Icon Preview */
+.x .mobiconPreview{position:relative;padding:252px 0 0 200px;background:url(../img/bgMobileTop.png) no-repeat}
+.x .mobiconPreview img{position:absolute;top:20px;left:10px}
+.x .mobiconPreview span{position:absolute;width:32px;text-align:center;top:52px;left:10px;color:#fff;font-size:9px}
+/* Text List */
+.x .textList{border:1px solid #ddd !important;line-height:1.5em;height:18.5em;overflow:auto}
+.x .textList li{border:0;padding:.25em 1em;height:1.5em;white-space:nowrap;overflow:hidden}
+.x .textList li:nth-child(even){background:#eee}
+.x .textList li a{float:right}
+/* File Box */
+.x .fileBox li{position:relative}
+.x .fileBox li img{max-width:100%}
+.x .fileBox .portlet ul{margin:1em;list-style:none;padding:0;border:0}
+.x .fileBox .portlet li{border-top:1px solid #ddd;border-bottom:0;padding:8px 0}
+.x .fileBox .side{position:absolute;top:8px;right:0}
+/* Messages */
+.x .desc.error{color:#f00}
+.x .desc.success{color:#080}
+/* Icon Button */
+.x a.iSetting{display:inline-block;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;vertical-align:middle;background:url(../img/iconSetting.gif) no-repeat}
+.x a.cMenu{display:inline-block;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;vertical-align:middle;background:url(../../../../common/img/icon.bubble.png) no-repeat}
+/* Responsive Layout */
+@media only all and (max-width:860px){
+.x .header h1{margin-left:.7em}
+.x .header .account ul{padding-right:10px}
+.x .body{padding:0}
+.x .content{float:none;margin-left:0}
+.x .lnb{float:none;width:auto;margin:1em 0}
+.x .dashboard .portlet{float:none !important;width:auto !important;margin-right:0}
+.modal .fg,
+.wfsr .fg{width:auto}
+.x .easyNav .category{float:none;display:block;width:auto}
+.x .easyNav .filter{position:static}
+}
+@media only all and (max-width:640px){
+.x .skipNav a{position:relative;width:auto;height:auto}
+.modal{position:absolute}
+}
+/* Legacy Code (Don't use it. It will be removed as soon as possible.) */
+.x h3.xeAdmin,
+.x h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1}
+.x h3.xeAdmin{border-bottom-width:4px;font-size:24px}
+.x h4.xeAdmin{border-bottom-width:3px;font-size:20px}
+.x h5.xeAdmin{border-bottom-width:2px;font-size:16px}
+.x h6.xeAdmin{border-bottom-width:1px;font-size:12px}
+.x .adminSearch{margin:1em 0}
+.x .adminSearch fieldset{border:1px solid #ccc;margin:0;padding:.5em 1em}
+.x .localNavigation{padding:0;list-style:none}
+.x .localNavigation li{display:inline}
+.x .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none}
+.x .localNavigation li:before{content:"| "}
+.x .localNavigation li:first-child:before{content:""}
+.x .summary{margin:1em 0}
+.x .rowTable,
+.x .colTable,
+.x .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%}
+.x .rowTable caption,
+.x .colTable caption,
+.x .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}
+.x .rowTable caption:after,
+.x .colTable caption:after,
+.x .crossTable caption:after{content:"";display:block;clear:both}
+.x .rowTable caption a,
+.x .colTable caption a,
+.x .crossTable caption a{font-weight:normal}
+.x .rowTable caption em,
+.x .colTable caption em,
+.x .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em}
+.x .rowTable caption strong,
+.x .colTable caption strong,
+.x .crossTable caption strong{color:#e00}
+.x .rowTable caption .side,
+.x .colTable caption .side,
+.x .crossTable caption .side{float:right;font-weight:normal;margin-left:1em}
+.x .rowTable th,
+.x .rowTable td,
+.x .colTable th,
+.x .rowTable td,
+.x .crossTable th,
+.x .rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd}
+.x .rowTable th,
+.x .colTable th,
+.x .crossTable th{background:#f8f8f8;white-space:nowrap}
+.x .rowTable thead th,
+.x .colTable thead th,
+.x .crossTable thead th{border-bottom:1px solid #999}
+.x .rowTable tfoot td,
+.x .colTable tfoot td,
+.x .crossTable tfoot td{font-weight:bold;background:#f8f8f8}
+.x .rowTable.even tbody tr:nth-of-type(even) td,
+.x .colTable.even tbody tr:nth-of-type(even) td,
+.x .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa}
+.x .rowTable td>input[type=text],
+.x .colTable td>input[type=text],
+.x .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle}
+.x .rowTable img,
+.x .colTable img,
+.x .crossTable img{vertical-align:middle}
+.x .rowTable .title,
+.x .colTable .title,
+.x .crossTable .title,
+.x .rowTable .text,
+.x .colTable .text,
+.x .crossTable .text{white-space:normal}
+.x .rowTable input[type=text],
+.x .colTable input[type=text],
+.x .crossTable input[type=text],
+.x .rowTable input[type=password],
+.x .colTable input[type=password],
+.x .crossTable input[type=password],
+.x .rowTable input[type=file],
+.x .colTable input[type=file],
+.x .crossTable input[type=file],
+.x .rowTable textarea,
+.x .colTable textarea,
+.x .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
+.x .rowTable input[type=text],
+.x .colTable input[type=text],
+.x .crossTable input[type=text],
+.x .rowTable input[type=password],
+.x .colTable input[type=password],
+.x .crossTable input[type=password],
+.x .rowTable input[type=file],
+.x .colTable input[type=file],
+.x .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}
+.x .clear:after{content:"";display:block;clear:both}
diff --git a/modules/admin/tpl/css/admin.min.css b/modules/admin/tpl/css/admin.min.css
new file mode 100644
index 000000000..ec01555dd
--- /dev/null
+++ b/modules/admin/tpl/css/admin.min.css
@@ -0,0 +1 @@
+@charset "utf-8";/* Element Reset */header,footer,section,article,aside,nav,hgroup,details,menu,figure,figcaption{display:block}.x,.x table,.x input,.x textarea,.x select,.x button{font-family:Tahoma,Geneva,sans-serif;font-size:12px;color:#333}.x button,.x input[type=submit],.x input[type=reset],.x input[type=button]{cursor:pointer;overflow:visible}.x img{border:0}.x p{line-height:1.5}/* Section & Heading */.x .section{margin:1em 0;padding:0;border:0}.x .h1, .x .h2, .x .h3, .x .h4{position:relative;border-style:solid;border-top:0;border-right:0;zoom:1;padding-left:8px}.x .h1{border-width:4px;font-size:24px;border-color:#666}.x .h2{border-width:3px;font-size:20px;border-color:#888}.x .h3{border-width:2px;font-size:16px;border-color:#aaa}.x .h4{border-width:1px;font-size:12px;border-color:#ccc}.x .h1 + ul,.x .h2 + ul,.x .h3 + ul,.x .h4 + ul,.x .h1 + .table table, .x .h2 + .table table, .x .h3 + .table table, .x .h4 + .table table{border-top:0 !important;margin-top:-1em !important}/* Portlet */.x .portlet{position:relative;border:1px solid #e9e9e9;margin:1em 0;padding:0;background:#fff;zoom:1;overflow:hidden;border-radius:5px}.x .portlet h2, .x .portlet h3{margin:0;padding:.5em 1em;font-size:14px;border:1px solid #fff;border-bottom:1px solid #e9e9e9;background:#f7f7f7;border-radius:5px 5px 0 0}.x .portlet p{margin:1em 1.2em}.x .portlet li{position:relative;padding-right:8em}.x .portlet .lined{margin:1px !important;padding:0;list-style:none}.x .portlet .lined li{padding:.5em 8em .5em 1em;border-top:1px solid #eee;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;-o-text-overflow:ellipsis}.x .portlet .lined li:first-child{border:0}.x .portlet .side{position:absolute;top:0;_top:1px;right:0;color:#666;background:#fff;padding:0 1em}.x .portlet .lined .side{padding:.5em 1em}.x .portlet .more{position:absolute;top:.5em;right:1em;text-decoration:none !important;color:#666}.x .portlet .more span{color:#999}.x .portlet .action{text-align:right;top:0;right:0;padding:.5em 1em .5em 3em;background:#fff;background:-webkit-gradient(linear, 0% 0%, 100% 0%, from(rgba(255,255,255,0)), to(rgba(255,255,255,1)), color-stop(15%, #fff));background:-moz-linear-gradient(left, rgba(255,255,255,0) 0, rgba(255,255,255,1) 15%)}.x .portlet .action a,.x .portlet .action button{margin-left:1em}.x .portlet .btnArea{border-top:1px solid #ddd;margin:0;padding:.5em 1em;margin:0 1px 1px 1px;background:#f7f7f7;border-radius:0 0 5px 5px}/* Table */.x .table{margin:1em 0}.x .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc}.x .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}.x .table caption:after{content:"";display:block;clear:both}.x .table caption a{font-weight:normal}.x .table caption em{float:right;margin-left:1em}.x .table caption strong{color:#e00}.x .table caption .side{float:right;font-weight:normal;margin-left:1em}.x .table th,.x .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap}.x .table th{background:#f8f8f8}.x .table thead th{border-bottom:1px solid #999}.x .table tfoot td{font-weight:bold;background:#f8f8f8}.x .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa}.x .table td>input[type=text]{margin:-1px 0 !important;vertical-align:middle}.x .table img{vertical-align:middle}.x .table em{font-style:normal;font-weight:normal;color:#e00}.x .table th.title,.x .table td.title,.x .table th.text,.x .table td.text{white-space:normal;width:100%}.x .table td[colspan]{white-space:normal}/* Form */.x .form{margin:1em 0;padding:0}.x .form fieldset{margin:0 0 2em 0;padding:0;border:0}.x .form.search fieldset{border:1px solid #ccc;padding:5px 15px;border-radius:3px}.x .form em{font-style:normal;color:#e00}.x .form label{line-height:1;vertical-align:middle}.x .form input[type=radio]+label,.x .form input[type=checkbox]+label{margin-right:1em}.x .form input[type=checkbox]+label,.x .form input[type=radio]+label,.x .form input[type=file]{cursor:pointer}.x .form ul{position:relative;margin:1em 0;padding:0;list-style:none;border-top:2px solid #ccc;border-bottom:1px solid #ccc;zoom:1}.x .form li{list-style:none;border:1px solid #ddd;border-left:0;border-right:0;margin:-1px 0;padding:8px 0;vertical-align:top;zoom:1}.x .form li:first-child{border-top:0}.x .form li>label:first-child{display:block;font-weight:bold}.x .form li label em{font-weight:normal}.x .form label.overlap{position:absolute;color:#aaa}.x .form input[type=text],.x .form input[type=password],.x .form input[type=file],.x .form textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}.x .form input[type=text],.x .form input[type=password],.x .form input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}.x .form input[type=text].loading,.x .form input.loading[type=password]{padding-right:24px;width:260px;background:transparent url(../img/preLoader16.gif) no-repeat 265px center}.x .form input[type=checkbox],.x .form input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle}.x .form input[type=text][disabled=disabled],.x .form input[type=password][disabled=disabled],.x .form input[type=radio][disabled=disabled],.x .form input[type=checkbox][disabled=disabled],.x .form select[disabled=disabled],.x .form textarea[disabled=disabled]{background:#ddd;text-shadow:1px 1px 0 #fff}.x .form textarea{padding:3px 4px;vertical-align:top}.x .form span.desc, .x .form em.desc{line-height:22px;vertical-align:middle;margin:0 10px}.x .form p.desc{margin:.25em 0;line-height:1.4}.x .form .q{font-weight:bold;margin:0 0 5px 0}.x .form .a{margin:0 0 5px 0}.x .form .tgForm{margin-right:1em}/* Global Navigation Bar */.x .gnb{position:relative;clear:both;border:1px solid #c1c1c1;border-left:0;border-right:0;background-color:#efefef;background:#efefef -webkit-gradient(linear, 0% 0%, 0% 100%, from(#efefef), to(#dcdcdc));background:#efefef -moz-linear-gradient(top, #efefef, #dcdcdc);filter:progid:DXImageTransform.Microsoft.gradient(startColorStr=#efefef, endColorStr=#dcdcdc);zoom:1}.x .gnb ul{margin:0;padding:0 0 0 20px;list-style:none;border:1px solid #fff;border-left:0;border-right:0;zoom:1}.x .gnb ul ul{position:absolute;top:30px;left:0;border:1px solid #ccc;border-top:0;padding:1px 0 0 0;background:#fff}.x .gnb ul:after{content:"";display:block;clear:both}.x .gnb li{position:relative;float:left;border:1px solid #fff;border-top:0;border-bottom:0;margin:0 -1px 0 0}.x .gnb li li{float:none;clear:both;overflow:hidden;border:0;border-top:1px dotted #ccc;margin:0;padding:2px}.x .gnb li li:first-child{border:0}.x .gnb li a{float:left;font-weight:bold;color:#333;font-size:12px;height:14px;padding:8px 18px;white-space:nowrap;text-decoration:none;text-shadow:0 1px 0 #fff;zoom:1}.x .gnb li a:hover,.x .gnb li a:active,.x .gnb li a:focus,.x .gnb li.active a{background:#f4f4f4;border:1px solid #ccc;border-bottom:0;padding:7px 17px 8px 17px}.x .gnb li.activeOn a{background:#fff;border:1px solid #ccc;border-bottom:0;padding:7px 17px 8px 17px}.x .gnb li.active li a{display:block;float:none;color:#555;background:#fff;padding:5px 15px !important;font-weight:normal !important;border:0 !important}.x .gnb li.active li a:hover,.x .gnb li.active li a:active,.x .gnb li.active li a:focus{border:0;background:#eee}.x .gnb .setting{position:absolute;top:8px;right:2em;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;background:url(../img/iconSetting.gif) no-repeat center}.x .gnb.jx ul{display:block;position:static;padding:0}.x .gnb.jx li{float:none;clear:both;border-top:1px solid #ccc}.x .gnb.jx ul ul{border:0}.x .gnb.jx li li{border:0}.x .gnb.jx li a{float:none;display:block}.x .gnb.jx li a:hover,.x .gnb.jx li a:active,.x .gnb.jx li a:focus{background:none}.x .gnb.jx li.activeOn>a{background:#ddd}@media only all and (max-width:860px){.x .gnb ul{padding-left:1em}.x .gnb .setting{right:1em}}@media only all and (max-width:640px){.x .gnb ul{display:block;position:static;padding:0}.x .gnb li{float:none;clear:both;border-top:1px solid #ccc}.x .gnb ul ul{border:0;position:static}.x .gnb li li{border:0}.x .gnb li a{float:none;display:block}.x .gnb li a:hover,.x .gnb li a:active,.x .gnb li a:focus{background:none}.x .gnb li.activeOn>a{background:#ddd}}/* Favorite */.x .bmk{position:absolute;right:20px;bottom:10px;padding:0 0 0 20px;background:url(../img/iconFavorite.gif) no-repeat 0 -16px}.x .bmk>a{text-shadow:0 1px 0 #fff}.x .bmk ul{position:absolute;top:140%;right:0;list-style:none;margin:0;padding:5px 10px;border:1px solid #aaa;border-radius:5px;background:#fff;box-shadow:1px 1px 3px #aaa}.x .bmk li{position:relative;padding:3px 30px 3px 0;white-space:nowrap}.x .bmk li .action{position:absolute;top:0;right:0}.x .bmk li .action .text{text-decoration:none;width:16px;text-align:center;margin:0}@media only all and (max-width:640px){.x .bmk{position:static;background-color:#fff;padding:10px 20px;background:#fff}.x .bmk .tgAnchor{display:block}.x .bmk ul{position:relative;border:0;border-top:1px solid #ccc;border-radius:0;box-shadow:none;padding:0;margin:5px 0 0 0}.x .bmk li{position:relative;top:-1px;border-top:1px dotted #ccc}}/* Local Navigation */.x .lnb{position:relative;float:left;width:210px;margin:1em 0 1em -240px;line-height:normal;zoom:1;display:inline}.x .lnb .h2{margin-top:0;border-left:0;padding-left:0}.x .lnb ul{margin:0 !important;padding:0;list-style:none}.x .lnb li{position:relative;margin:0 0 -1px 0;vertical-align:top;zoom:1}.x .lnb li a{display:block;position:relative;padding:8px 10px;text-decoration:none;color:#666;font-weight:bold;background:#fafafa;border:1px solid #eee;zoom:1}.x .lnb li a .i{position:absolute;top:50%;left:100%;margin:-4px 0 0 -16px;width:8px;height:8px;color:#ccc;background:url(../img/iconNavVr.gif) no-repeat left top}.x .lnb li ul{padding:5px 0;background:#fff}.x .lnb li li{margin:0;border-top:1px dotted #ddd}.x .lnb li li:first-child{border:0}.x .lnb li li a{font-weight:normal;background:#fff;padding:5px 10px;border:0}.x .lnb li li a span{color:#666}.x .lnb li.active{border:1px solid #ccc;z-index:2}.x .lnb li li.active{border:0}.x .lnb li.active a{color:#000;border:0}.x .lnb li.active .i{background-position:0 -44px}.x .lnb li.active li a{border:0}.x .lnb li.active ul{display:block;border-top:1px solid #eee}.x .lnb li.active li.active a span{color:#13b200;font-weight:bold;letter-spacing:-1px}/* Content Navigation */.x .cnb{margin:1em 0;position:relative;zoom:1}.x .cnb:after{content:"";display:block;clear:both}.x .cnb ul{list-style:none;margin:0;padding:0}.x .cnb li{display:inline}.x .cnb li:before{content:"| ";color:#ccc}.x .cnb li:first-child:before{content:""}.x .cnb .active,.x .cnb .active a{font-weight:bold;color:#333;text-decoration:none}.x .cnb .side{float:right}/* Pagination */.x .pagination{margin:1em 0;text-align:center;line-height:normal}.x .pagination *{vertical-align:middle}.x .pagination a,.x .pagination strong{position:relative;display:inline-block;padding:2px 4px;font-weight:bold;text-decoration:none;line-height:normal;color:#333 !important;vertical-align:middle}.x .pagination a:hover,.x .pagination a:active,.x .pagination a:focus{border:1px solid #ddd;margin:0 -1px}.x .pagination strong{color:#e00 !important;font-size:20px}.x .pagination .direction{font-weight:normal;white-space:nowrap}.x .pagination .direction:hover,.x .pagination .direction:active,.x .pagination .direction:focus{border:0;margin:0;text-decoration:underline}.x .pagination input{width:30px;text-align:center}.x .pagination button{overflow:visible}/* Star Rating */.x .starRating, .x .starRating span{display:inline-block;height:14px;background:transparent url(../img/iconStarRating.gif) no-repeat;overflow:hidden}.x .starRating{width:79px;vertical-align:top}.x .starRating span{font-size:0;line-height:0;vertical-align:top;text-indent:-100px;*text-indent:0;background-position:0 -14px}/* Progress */.x .prgrs{white-space:nowrap;line-height:normal;vertical-align:middle}.x .prgrs *{vertical-align:middle}.x .prgrs .pBar{position:relative;display:inline-block;background:#e9e9e9;margin:0 5px 0 0}.x .prgrs .pAction{display:inline-block;vertical-align:top;background:#99a6b6}.x .prgrs .pNum{position:absolute;width:100%;left:0;top:0;text-align:center;text-shadow:1px 1px 0 #fff}.x .prgrs.prgrsSmall{font-size:14px;line-height:14px}.x .prgrs.prgrsSmall .pBar,.x .prgrs.prgrsSmall .pAction,.x .prgrs.prgrsSmall .pNum{height:16px;line-height:16px;font-size:11px}.x .prgrs.prgrsMedium{font-size:24px;line-height:24px}.x .prgrs.prgrsMedium .pBar,.x .prgrs.prgrsMedium .pAction,.x .prgrs.prgrsMedium .pNum{height:22px;line-height:22px;font-size:12px}.x .prgrs.prgrsLarge{font-size:38px;line-height:38px}.x .prgrs.prgrsLarge .pBar,.x .prgrs.prgrsLarge .pAction,.x .prgrs.prgrsLarge .pNum{height:34px;line-height:34px;font-size:14px}/* Modal Window */.modal{position:absolute;top:0;left:0;width:100%;_height:100%;min-height:100%;z-index:100}.modal .bg{position:absolute;background:#000;_background:none;width:100%;height:100%;opacity:.5;z-index:2;filter:progid:DXImageTransform.Microsoft.Alpha(opacity=50);zoom:1}.modal .fg{position:relative;width:80%;margin:5em auto;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;z-index:3;zoom:1;border-radius:5px;box-shadow:0 0 6px #000}.modal ul, .modal ol, .modal .lined, .modal .table{margin-bottom:1em}.modal .ie6{position:absolute;left:0;top:0;width:100%;height:100%;border:0;opacity:0;filter:alpha(opacity=0);z-index:1}.modalClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px}.modalBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden}html.modalContainer,body.modalContainer{_height:100%;_width:100%} /* IE6 only */ /* Layer */.x .layer,.x.layer{position:absolute;background:#fff;padding:0 1em;*padding:1em;border:8px solid #ddd;z-index:2;zoom:1;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px;box-shadow:0 0 6px #666;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}.x .layer h2{font-size:14px}.x .layer ul, .x .layer ol, .x .layer .lined, .x .layer .table{margin-bottom:1em}.x .layerClose{position:absolute;right:-8px;top:-8px;border:0;background:#ddd;padding:0;width:28px;height:28px;font-size:14px;font-weight:bold;cursor:pointer;color:#999;border-radius:5px;-moz-border-radius:5px;-webkit-border-radius:5px}.x .layerBlur{position:absolute;top:0;right:0;border:0;background:none;padding:0;width:1px;height:1px;overflow:hidden}/* H2 Anchor */.x .h2Anchor{position:absolute;right:0;border:0;background:none;color:#00f;text-decoration:underline}/* Skip Navigation */.x .skipNav{margin:0;text-align:center}.x .skipNav a{position:absolute;width:1px;height:1px;display:block;font-weight:bold;padding:10px 0}.x .skipNav a:hover,.x .skipNav a:active,.x .skipNav a:focus{position:relative;width:auto;height:auto}/* Header */.x .header{position:relative;z-index:2;padding:30px 0 0 0;background:#4c4c4c;box-shadow:0 0 10px #aaa;zoom:1;border-radius:5px 5px 0 0}.x .header:after{content:"";display:block;clear:both}.x .header a{text-decoration:none}.x .header h1{margin:0 15px 10px 20px;font-size:24px;line-height:32px;display:inline-block;zoom:1}.x .header h1 *{vertical-align:middle}.x .header h1 a{color:#fff;text-shadow:1px 1px 0 #000;filter:progid:DXImageTransform.Microsoft.dropshadow(OffX=1, OffY=1, Color=#000000, Positive=true);zoom:1}.x .header h1 .url{font-size:12px;font-weight:normal}.x .header .site{margin:0;display:inline-block;zoom:1}.x .header .site a{color:#fff;text-decoration:underline}.x .header #moveSiteList{padding:10px 1em 5px 1em;margin:0}.x .header #moveSiteList ul{list-style:none;margin:0;padding:0}.x .header #moveSiteList li{white-space:nowrap;margin:0;padding:4px 0;border-bottom:1px dotted #ccc}.x .header #siteMapList{padding:0 1em 1em 1em;margin:0}.x .header #siteMapList li{white-space:nowrap}.x .header .account{position:absolute;z-index:3;width:100%;top:0;right:0;white-space:nowrap;text-align:right;background:#333;border-bottom:1px solid #656565;color:#fff;font-size:12px;border-radius:5px 5px 0 0}.x .header .account ul{margin:0 2px 0 0;padding:5px 20px 5px 0;list-style:none}.x .header .account li{position:relative;display:inline;border-left:1px solid #666;padding:0 6px 0 10px}.x .header .account li:first-child{border:0}.x .header .account a{color:#fff;display:inline-block;height:14px}.x .header .account a.language{padding-right:16px;background:url(../img/iconArrow.gif) no-repeat right -160px}.x .header #language{position:absolute;top:19px;right:-2em;padding:6px 4px !important;border:1px solid #666;border-top:0;background:#333}.x .header #language li{border:0;display:block;padding:1px 8px 1px 10px;text-align:left;line-height:1}.x .header #language li.selected{background:url(../img/iconCheck.gif) no-repeat left center}.x .header #language li.selected a{text-decoration:underline}.x .header h1 a:hover,.x .header h1 a:active,.x .header h1 a:focus,.x .header .account a:hover,.x .header .account a:active,.x .header .account a:focus{color:#6e9cf2;text-decoration:underline}/* Footer */.x .footer{border-top:1px solid #ddd;text-align:center;font-size:12px;padding:1.5em 0;zoom:1}.x .footer:after{content:"";display:block;clear:both}.x .footer p{margin:0}.x .footer .power{float:left}.x .footer .cache{float:right}/* Body */.x .body{position:relative;z-index:1;padding:1em 20px 1em 260px;zoom:1}.x .body:after{content:"";display:block;clear:both}/* Content */.x .content{float:right;width:100%;margin-left:-230px;zoom:1}.x .content:after{content:"";display:block;clear:both}.x .content a{color:#33a}.x .content a:hover,.x .content a:active,.x .content a:focus{color:#a33}.x .content .portlet a{text-decoration:none}.x .content .portlet a:hover,.x .content .portlet a:active,.x .content .portlet a:focus{text-decoration:underline}/* Dashboard */.x .dashboard{position:relative;float:none;width:auto;margin-left:-230px}.x .dashboard .portlet{float:left;width:48%;margin-right:1em}.x .dashboard .portlet:nth-of-type(odd){float:left;width:49%;margin-right:0}.x .dashboard .portlet:nth-of-type(even){float:right;width:49%;margin-right:0}@media only all and (min-width:1300px){.x .dashboard .portlet{float:left !important;width:32% !important;margin-right:1em !important}}/* Single Column*/.x .single{position:relative;float:none;width:auto;margin-left:-240px}/* Search */.x .search{zoom:1}.x .search:after{content:"";display:block;clear:both}.x .search .pagination{float:left;text-align:left}.x .search form{float:right;margin:1em 0}.x .search form *{vertical-align:middle}/* Site Map */.x .siteMap h2 input{font-size:14px;font-weight:bold;padding:0 .5em}.x .siteMap label{cursor:text}.x .siteMap .lined ul{padding:0;margin:0;border-top:1px solid #eee;zoom:1}.x .siteMap .lined li{position:relative;padding:0;margin:0;cursor:all-scroll;list-style:none;zoom:1}.x .siteMap .lined li li{border-top:1px solid #eee}.x .siteMap li li{text-indent:18px}.x .siteMap li li li{text-indent:36px}.x .siteMap li li li li{text-indent:54px}.x .siteMap li li li li li{text-indent:72px}.x .siteMap li li li li li li{text-indent:90px}.x .siteMap li li li li li li li{text-indent:108px}.x .siteMap li li li li li li li li{text-indent:126px}.x .siteMap li li li li li li li li li{text-indent:144px}.x .siteMap li li li li li li li li li li{text-indent:162px}.x .siteMap li li li li li li li li li li li{text-indent:180px}.x .siteMap li li li li li li li li li li li li{text-indent:198px}.x .siteMap li *{vertical-align:middle}.x .siteMap li .moveTo+input{width:200px;border:0;padding:0 .5em}.x .siteMap li .moveTo+input:hover,.x .siteMap li .moveTo+input:active,.x .siteMap li .moveTo+input:focus{border:1px dotted #ccc;overflow:visible}.x .siteMap .moveTo{position:relative;z-index:2;width:22px;height:32px;padding:32px 0 0 0;margin:0 3px;_margin-top:-1px;overflow:hidden;background:#fff url(../img/iconMoveTo.gif) no-repeat center 0;border:0;cursor:move}.x .siteMap li.active,.x .siteMap li.active .moveTo{background-color:#f7f7f7}.x .siteMap li.active li,.x .siteMap li.active ul{border-top-color:#f7f7f7}.x .siteMap li.active .moveTo{background-position:center -32px}.x .siteMap .vr,.x .siteMap .hr{display:none;position:absolute;z-index:1;left:14px;border:0px solid #ccc;overflow:hidden}.x .siteMap .vr{top:-16px;height:100%;border-left-width:1px}.x .siteMap .hr{top:16px;width:16px;border-top-width:1px}.x .siteMap li.active .vr,.x .siteMap li.active li .hr{display:block}.x .siteMap li li .vr,.x .siteMap li li li .hr{left:32px}.x .siteMap li li li .vr,.x .siteMap li li li li .hr{left:50px}.x .siteMap li li li li .vr,.x .siteMap li li li li li .hr{left:68px}.x .siteMap li li li li li .vr,.x .siteMap li li li li li li .hr{left:86px}.x .siteMap li li li li li li .vr,.x .siteMap li li li li li li li .hr{left:104px}.x .siteMap li li li li li li li .vr,.x .siteMap li li li li li li li li .hr{left:122px}.x .siteMap li li li li li li li li .vr,.x .siteMap li li li li li li li li li .hr{left:140px}.x .siteMap li li li li li li li li li .vr,.x .siteMap li li li li li li li li li li .hr{left:158px}.x .siteMap li li li li li li li li li li .vr,.x .siteMap li li li li li li li li li li li .hr{left:176px}.x .siteMap li li li li li li li li li li li .vr,.x .siteMap li li li li li li li li li li li li .hr{left:336px}.x .siteMap .side{padding-top:0 !important;padding-bottom:0 !important;line-height:30px;background:transparent !important}.x .siteMap .side button{text-indent:0;line-height:1}.x .siteMap .tgMap{position:absolute;top:12px;right:1em;padding:0 16px 0 0;line-height:16px;background:url(../img/iconArrow.gif) no-repeat right -126px}.x .siteMap.fold .tgMap{background-position:right -158px}.x .siteMap.fold .h2{border-bottom-color:#fff;border-radius:5px}.x .siteMap .placeholder{background:#bbb}.x .siteMap .draggable,.x .siteMap .draggable .moveTo{background-color:#ddd}.x .siteMap .draggable .summary{border-left:1px solid #ccc;padding-left:10px;margin-left:10px;font-size:11px;color:#999}.x .siteMap a.ms{text-decoration:underline}/* Multilingual */.x .langEdit{background:#fff;position:absolute;*left:0;*margin-top:28px;z-index:10}.x .langEdit ul{border-top:1px solid #ccc;border-left:1px solid #eee;border-right:1px solid #eee;margin:0}.x .langEdit li{padding:.5em 10px}.x .langEdit input[type=text]{width:220px;padding-right:40px}.x .langEdit label{left:15px !important}.x .langEdit .action{border:1px solid #eee;width:268px;padding:0 10px}.x .langEdit p, .x .langEdit .btnArea{white-space:normal}.x .langEdit .langList,.x .langEdit .langEditControls{box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}.x .langEdit .langList{margin:0 -1px 0 0;display:none}.x .langEdit .langList li{white-space:nowrap;color:#ccc;width:270px} .x .langEdit .langList li span{display:inline-block;width:80px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;color:#767676}.x .langEdit .langList li a{display:inline-block;width:80px;overflow:hidden;white-space:nowrap;text-overflow:ellipsis}.x .langEdit .langList li.active{background:url(../img/iconArrow.gif) no-repeat right -188px}.x .langEdit.showChild .langList{display:block}.x .langEdit .langInput{background:#fff}.x .langEdit .langInput h2{padding:5px 10px;margin:0 0 -1px 0;font-size:12px;font-weight:normal;color:#666;border:1px solid #eee;border-top-color:#ccc}.x .langEdit .langInput h2 strong{color:#000;font-size:14px}.x .langEdit.showChild .langInput{position:absolute;left:285px;top:0}.x .langEdit li.en input, .x .langEdit li.en textarea, .x .mLangEdit li.en textarea{background:url(../img/flag.us.gif) no-repeat 99% 5px}.x .langEdit li.ko input, .x .langEdit li.ko textarea, .x .mLangEdit li.ko textarea{background:url(../img/flag.kr.gif) no-repeat 99% 5px}.x .langEdit li.jp input, .x .langEdit li.jp textarea, .x .mLangEdit li.jp textarea{background:url(../img/flag.jp.gif) no-repeat 99% 5px}.x .langEdit li.fr input, .x .langEdit li.fr textarea, .x .mLangEdit li.fr textarea{background:url(../img/flag.fr.gif) no-repeat 99% 5px}.x .langEdit li.de input, .x .langEdit li.de textarea, .x .mLangEdit li.de textarea{background:url(../img/flag.de.gif) no-repeat 99% 5px}.x .langEdit li.ru input, .x .langEdit li.ru textarea, .x .mLangEdit li.ru textarea{background:url(../img/flag.ru.gif) no-repeat 99% 5px}.x .langEdit li.es input, .x .langEdit li.es textarea, .x .mLangEdit li.es textarea{background:url(../img/flag.es.gif) no-repeat 99% 5px}.x .langEdit li.tr input, .x .langEdit li.tr textarea, .x .mLangEdit li.tr textarea{background:url(../img/flag.tr.gif) no-repeat 99% 5px}.x .langEdit li.vi input, .x .langEdit li.vi textarea, .x .mLangEdit li.vi textarea{background:url(../img/flag.vn.gif) no-repeat 99% 5px}.x .langEdit li.mn input, .x .langEdit li.mn textarea, .x .mLangEdit li.mn textarea{background:url(../img/flag.mn.gif) no-repeat 99% 5px}.x .langEdit li.zh-CN input, .x .langEdit li.zh-CN textarea, .x .mLangEdit li.zh-CN textarea{background:url(../img/flag.cn.gif) no-repeat 99% 5px}.x .langEdit li.zh-TW input, .x .langEdit li.zh-TW textarea, .x .mLangEdit li.zh-TW textarea{background:url(../img/flag.tw.gif) no-repeat 99% 5px}.x .mLangEdit.en strong{background:url(../img/flag.us.gif) no-repeat 0 10px}.x .mLangEdit.ko strong{background:url(../img/flag.kr.gif) no-repeat 0 10px}.x .mLangEdit.jp strong{background:url(../img/flag.jp.gif) no-repeat 0 10px}.x .mLangEdit.fr strong{background:url(../img/flag.fr.gif) no-repeat 0 10px}.x .mLangEdit.de strong{background:url(../img/flag.de.gif) no-repeat 0 10px}.x .mLangEdit.ru strong{background:url(../img/flag.ru.gif) no-repeat 0 10px}.x .mLangEdit.es strong{background:url(../img/flag.es.gif) no-repeat 0 10px}.x .mLangEdit.tr strong{background:url(../img/flag.tr.gif) no-repeat 0 10px}.x .mLangEdit.vi strong{background:url(../img/flag.vn.gif) no-repeat 0 10px}.x .mLangEdit.mn strong{background:url(../img/flag.mn.gif) no-repeat 0 10px}.x .mLangEdit.zh-CN strong{background:url(../img/flag.cn.gif) no-repeat 0 10px}.x .mLangEdit.zh-TW strong{background:url(../img/flag.tw.gif) no-repeat 0 10px}.x .mLangEdit ul ul{border:0}.x .mLangEdit li{position:relative;padding:0}.x .mLangEdit li strong{display:inline-block;padding:6px 100px 8px 24px;font-weight:normal;line-height:1.5}.x .mLangEdit li .side{position:absolute;top:8px;right:0;padding-right:18px;background:url(../img/iconArrow.gif) no-repeat right -160px}.x .mLangEdit li li{border:0;padding-right:36px}.x .mLangEdit li textarea{width:100%;height:16px;padding-right:30px;resize:vertical;line-height:1.4}.x .mLangEdit li label{top:8px !important}.x .mLangEdit li.active{background:#FFFDEF}.x .mLangEdit li.active strong{font-weight:bold}.x .mLangEdit li.active .side{background-position:right -128px}.modal .mLangEdit ul{padding-bottom:1em}.modal .mLangEdit li{border:0;padding-right:36px}/* Suggestion */.x .suggestion{display:none;position:absolute;background:#fff;z-index:10;_height:200px;max-height:200px;overflow:auto;*left:0;*margin-top:28px;box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}.x .suggestion ul{border-top:1px solid #ccc;border-left:1px solid #eee;border-right:1px solid #eee;margin:0}.x .suggestion li{padding:0}.x .suggestion li:last-child{border-bottom:0}.x .suggestion li button{border:0;background:#fff;text-align:left;width:288px;padding:2px 4px;display:block;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.x .suggestion li button:hover,.x .suggestion li button:active,.x .suggestion li button:focus,.x .suggestion li button.active{background:#eee}/* Image Mark */.x #imageMark{right:0}/* Easy Installer */.x .easyNav{position:relative;border:1px solid #e9e9e9;zoom:1}.x .easyNav:after{content:"";display:block;clear:both}.x .easyNav h2{font-size:16px}.x .easyNav .category{width:30%;float:left;margin:0 2em;display:inline}.x .easyNav .filter{position:absolute;top:0;right:0;margin:1em 2em;text-align:right}.x .easyList td p{margin-top:0}.x .easyList td p.update{background:#ffc;padding:.5em 1em;border:1px solid #fc9;border-left:0;border-right:0;text-align:center}/* Font Preview */.x .fontPreview{width:96%;border:1px solid #e9e9e9;zoom:1;padding:1em 2em;margin:.5em 0}/* FTP Suggestion */.x #ftpSuggestion{background:#fff;box-shadow:3px 3px 6px #999;filter:progid:DXImageTransform.Microsoft.Shadow(color=#999999,direction=135, strength=5)}.x #ftpSuggestion ul{border-left:1px solid #eee;border-right:1px solid #eee}.x #ftpSuggestion li{padding:0}.x #ftpSuggestion li button{border:0;background:#fff;text-align:left;width:288px}.x #ftpSuggestion li button:hover,.x #ftpSuggestion li button:active,.x #ftpSuggestion li button:focus{background:#eee}/* Theme & Skin Preview */.x .thumbPreview li{position:relative;padding-left:10px;padding-right:10px}.x .thumbPreview li.active.highlight{background:#f9f9f9}.x .thumbPreview .prevToggle{position:absolute;top:8px;right:10px;line-height:16px;padding:0 18px 0 0;text-decoration:none;background:url(../img/iconArrow.gif) no-repeat right -32px}.x .thumbPreview li.active .prevToggle{background-position:right 0}.x .thumbPreview .a{border:0;margin:0;zoom:1}.x .thumbPreview .a:after{content:"";display:block;clear:both}.x .thumbPreview .i{float:left;vertical-align:top;margin:0 1em 1em 0;padding:0;border:0;zoom:1}.x .thumbPreview .i:after{content:"";display:block;clear:both}.x .thumbPreview .i .thumb{position:relative;width:124px;height:84px;padding:0;margin-bottom:3px;text-align:center;overflow:hidden;border:1px solid #ddd;display:block;cursor:pointer;background:#fff}.x .thumbPreview .i .thumb .frame{position:absolute;width:120px;height:80px;left:0;top:0;border:2px solid #fff;overflow:hidden}.x .thumbPreview .i .thumb img{width:120px;margin:0}.x .thumbPreview .i label{display:block;position:relative;top:0;left:2px;width:122px;height:1.1em;margin:0;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x .thumbPreview .i input{display:none}.x .thumbPreview .i ul{display:none}.x .thumbPreview .selected .i{display:block;float:none}.x .thumbPreview .selected .i .thumb{float:left;width:186px;height:126px;margin:0 1em 0 0;border:2px solid #eee}.x .thumbPreview .selected .i .thumb .frame{width:180px;height:120px;border-width:3px}.x .thumbPreview li.active.highlight .selected .i .thumb{border-color:#5ea8f6}.x .thumbPreview .selected .i .thumb img{width:180px;position:relative}.x .thumbPreview li.active .selected .i .thumb img{z-index:auto}.x .thumbPreview .selected .i label{cursor:text}.x .thumbPreview .selected .i ul{display:block;list-style:none;border:0;margin:1em 0 1em 200px}.x .thumbPreview .selected .i li{border:0;padding:0;margin:0 0 .2em 0}.x .thumbPreview.jx .i label{display:inline;width:auto}.x .thumbPreview.jx .i.noDirection{display:none}.x .thumbPreview.jx .i input{display:inline}.x #skin .showAll{float:right;border:0;overflow:visible;padding:0 18px 0 0;cursor:pointer;color:#00f;background:url(../img/iconArrow.gif) no-repeat right -32px}.x #skin .showAll.hideAll{background-position:right 0}/* Favorite On | Off */.x .fvOff,.x .fvOn{display:inline-block;width:16px;height:16px;overflow:hidden;text-indent:16px;background:url(../img/iconFavorite.gif) no-repeat}.x .fvOn{background-position:0 -16px}/* Up-Down Dragable */.x .uDrag .wrap{position:relative;padding-left:20px}.x .uDrag li>.wrap{margin:0 0 0 8px}.x .uDrag .dragActive{background:#FFD}.x .uDrag .dragActive th,.x .uDrag .dragActive td{background:none !important}.x .uDrag .dragBtn{position:absolute;width:8px;height:100%;padding:0;overflow:hidden;background:url(../img/bgDragable.gif);top:1px;left:0;text-indent:12px;border:0;cursor:n-resize;white-space:nowrap}/* Favicon Preview */.x .faviconPreview{position:relative;padding:60px 0 0 200px;background:url(../img/bgFavicon.gif) no-repeat}.x .faviconPreview img{position:absolute}.x .faviconPreview .fn1{top:30px;left:12px}.x .faviconPreview .fn2{top:55px;left:68px}/* Mobile Icon Preview */.x .mobiconPreview{position:relative;padding:252px 0 0 200px;background:url(../img/bgMobileTop.png) no-repeat}.x .mobiconPreview img{position:absolute;top:20px;left:10px}.x .mobiconPreview span{position:absolute;width:32px;text-align:center;top:52px;left:10px;color:#fff;font-size:9px}/* Text List */.x .textList{border:1px solid #ddd !important;line-height:1.5em;height:18.5em;overflow:auto}.x .textList li{border:0;padding:.25em 1em;height:1.5em;white-space:nowrap;overflow:hidden}.x .textList li:nth-child(even){background:#eee}.x .textList li a{float:right}/* File Box */.x .fileBox li{position:relative}.x .fileBox li img{max-width:100%}.x .fileBox .portlet ul{margin:1em;list-style:none;padding:0;border:0}.x .fileBox .portlet li{border-top:1px solid #ddd;border-bottom:0;padding:8px 0}.x .fileBox .side{position:absolute;top:8px;right:0}/* Messages */.x .desc.error{color:#f00}.x .desc.success{color:#080}/* Icon Button */.x a.iSetting{display:inline-block;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;vertical-align:middle;background:url(../img/iconSetting.gif) no-repeat}.x a.cMenu{display:inline-block;width:16px;height:0;padding:16px 0 0 0;overflow:hidden;vertical-align:middle;background:url(../../../../common/img/icon.bubble.png) no-repeat}/* Responsive Layout */@media only all and (max-width:860px){.x .header h1{margin-left:.7em}.x .header .account ul{padding-right:10px}.x .body{padding:0}.x .content{float:none;margin-left:0}.x .lnb{float:none;width:auto;margin:1em 0}.x .dashboard .portlet{float:none !important;width:auto !important;margin-right:0}.modal .fg,.wfsr .fg{width:auto}.x .easyNav .category{float:none;display:block;width:auto}.x .easyNav .filter{position:static}}@media only all and (max-width:640px){.x .skipNav a{position:relative;width:auto;height:auto}.modal{position:absolute}}/* Legacy Code (Don't use it. It will be removed as soon as possible.) */.x h3.xeAdmin,.x h4.xeAdmin{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1}.x h3.xeAdmin{border-bottom-width:4px;font-size:24px}.x h4.xeAdmin{border-bottom-width:3px;font-size:20px}.x h5.xeAdmin{border-bottom-width:2px;font-size:16px}.x h6.xeAdmin{border-bottom-width:1px;font-size:12px}.x .adminSearch{margin:1em 0}.x .adminSearch fieldset{border:1px solid #ccc;margin:0;padding:.5em 1em}.x .localNavigation{padding:0;list-style:none}.x .localNavigation li{display:inline}.x .localNavigation li.on a{font-weight:bold;color:#333;text-decoration:none}.x .localNavigation li:before{content:"| "}.x .localNavigation li:first-child:before{content:""}.x .summary{margin:1em 0}.x .rowTable,.x .colTable,.x .crossTable{margin:1em 0;border:0;border-collapse:collapse;border-top:2px solid #ccc;width:100%}.x .rowTable caption,.x .colTable caption,.x .crossTable caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}.x .rowTable caption:after,.x .colTable caption:after,.x .crossTable caption:after{content:"";display:block;clear:both}.x .rowTable caption a,.x .colTable caption a,.x .crossTable caption a{font-weight:normal}.x .rowTable caption em,.x .colTable caption em,.x .crossTable caption em{float:right;font-style:normal;font-weight:normal;color:#e00;margin-left:1em}.x .rowTable caption strong,.x .colTable caption strong,.x .crossTable caption strong{color:#e00}.x .rowTable caption .side,.x .colTable caption .side,.x .crossTable caption .side{float:right;font-weight:normal;margin-left:1em}.x .rowTable th,.x .rowTable td,.x .colTable th,.x .rowTable td,.x .crossTable th,.x .rowTable td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd}.x .rowTable th,.x .colTable th,.x .crossTable th{background:#f8f8f8;white-space:nowrap}.x .rowTable thead th,.x .colTable thead th,.x .crossTable thead th{border-bottom:1px solid #999}.x .rowTable tfoot td,.x .colTable tfoot td,.x .crossTable tfoot td{font-weight:bold;background:#f8f8f8}.x .rowTable.even tbody tr:nth-of-type(even) td,.x .colTable.even tbody tr:nth-of-type(even) td,.x .crossTable.even tbody tr:nth-of-type(even) td{background-color:#fafafa}.x .rowTable td>input[type=text],.x .colTable td>input[type=text],.x .crossTable td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle}.x .rowTable img,.x .colTable img,.x .crossTable img{vertical-align:middle}.x .rowTable .title,.x .colTable .title,.x .crossTable .title,.x .rowTable .text,.x .colTable .text,.x .crossTable .text{white-space:normal}.x .rowTable input[type=text],.x .colTable input[type=text],.x .crossTable input[type=text],.x .rowTable input[type=password],.x .colTable input[type=password],.x .crossTable input[type=password],.x .rowTable input[type=file],.x .colTable input[type=file],.x .crossTable input[type=file],.x .rowTable textarea,.x .colTable textarea,.x .crossTable textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}.x .rowTable input[type=text],.x .colTable input[type=text],.x .crossTable input[type=text],.x .rowTable input[type=password],.x .colTable input[type=password],.x .crossTable input[type=password],.x .rowTable input[type=file],.x .colTable input[type=file],.x .crossTable input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}.x .clear:after{content:"";display:block;clear:both}
\ No newline at end of file
diff --git a/modules/admin/tpl/css/admin_jp.css b/modules/admin/tpl/css/admin_jp.css
new file mode 100644
index 000000000..4e4ddba27
--- /dev/null
+++ b/modules/admin/tpl/css/admin_jp.css
@@ -0,0 +1,7 @@
+@charset "utf-8";
+.x,
+.x table,
+.x input,
+.x textarea,
+.x select,
+.x button{font-family:"MS PGothic",Osaka,Arial,sans-serif}
diff --git a/modules/admin/tpl/css/admin_ko.css b/modules/admin/tpl/css/admin_ko.css
new file mode 100644
index 000000000..7c900f069
--- /dev/null
+++ b/modules/admin/tpl/css/admin_ko.css
@@ -0,0 +1,7 @@
+@charset "utf-8";
+.x,
+.x table,
+.x input,
+.x textarea,
+.x select,
+.x button{font-family:나눔고딕,NanumGothic,"맑은 고딕","Malgun Gothic",AppleGothic,돋움,Dotum,굴림,Gulim,sans-serif}
diff --git a/modules/admin/tpl/css/dashboard.css b/modules/admin/tpl/css/dashboard.css
deleted file mode 100644
index ba9196adf..000000000
--- a/modules/admin/tpl/css/dashboard.css
+++ /dev/null
@@ -1,123 +0,0 @@
-/* Dashboard Header */
-.dashboardHeader{ position:relative; padding:29px 0 23px 0; border-bottom:2px solid #cbd4df; background:url(../img/iconH3dashboard.gif) no-repeat left center;}
-.dashboardHeader .h3{ font-size:18px; text-indent:50px; margin:0;}
-
-/* Dashboard Notice */
-.dashboardNotice{ padding:10px 0 0 0;}
-.dashboardNotice .h4{ margin:0 0 12px 0; color:#ea3f22; font-size:11px;}
-.dashboardNotice button{ position:absolute; top:10px; right:0; font-size:11px; color:#8b8b8b; padding:0 0 0 10px; text-align:right; border:0; background-color:transparent; background-image:url(../img/iconDashboardNoticeOpen.gif); background-repeat:no-repeat; background-position:left -25px; cursor:pointer; *zoom:1; overflow:visible;}
-.dashboardNotice.open button{ background-position:left 5px;}
-.dashboardNotice ul{ height:0; margin:0; padding:0; list-style:none; font-size:12px; line-height:1;}
-.dashboardNotice.open ul{ height:auto; padding:10px 0 5px 9px; border-top:1px solid #ededed;}
-.dashboardNotice li{ display:none; margin:0 0 7px 0; padding:0 0 0 13px; background:url(../img/iconDashboardSummary.gif) no-repeat left center;}
-.dashboardNotice li.first{ position:absolute; top:11px; left:90px; display:block; background:none; padding:0; margin:0;}
-.dashboardNotice li.first .date{ display:none;}
-.dashboardNotice.open li{ display:block;}
-.dashboardNotice.open li.first{ position:static; margin:0 0 7px 0; padding:0 0 0 13px; background:url(../img/iconDashboardSummary.gif) no-repeat left center;}
-.dashboardNotice li a{ text-decoration:none; color:#555; margin-right:15px;}
-.dashboardNotice li a:hover,
-.dashboardNotice li a:active,
-.dashboardNotice li a:focus{ text-decoration:underline;}
-.dashboardNotice li .date{ color:#8b8b8b; font-size:11px;}
-.dashboardNotice.open li.first .date{ display:inline;}
-
-/* Dashboard Statistic */
-.dashboardStatistic{ position:relative; width:100%; height:183px; _height:189px; *zoom:1; margin-bottom:30px;}
-.dashboardStatistic .statistic{ position:relative; height:138px; padding:20px 20px 25px 20px; background:url(../img/bgDashboardStatistic.gif) repeat-x left top; font-size:12px; line-height:1;}
-.dashboardStatistic .statistic:after{ content:""; display:block; clear:both;}
-.dashboardStatistic .outline{position:absolute; overflow:hidden; font-size:0; line-height:0; background-image:url(../img/bgDashboardStatistic.gif);}
-.dashboardStatistic .outline.ml{ top:0; left:-2px; width:4px; height:100%; background-position:left -300px; background-repeat:no-repeat;}
-.dashboardStatistic .outline.mr{ top:0; right:-2px; width:4px; height:100%; background-position:right -300px; background-repeat:no-repeat;}
-.dashboardStatistic .outline.tc{ top:0; left:0; width:100%; height:3px; background-position:left -600px; background-repeat:repeat-x;}
-.dashboardStatistic .outline.bc{ bottom:0; left:0; width:100%; height:5px; background-position:left bottom; background-repeat:repeat-x;}
-.dashboardStatistic .outline.tl{ top:0; left:-2px; width:4px; height:3px; background-position:left -603px; background-repeat:no-repeat;}
-.dashboardStatistic .outline.tr{ top:0; right:-2px; width:4px; height:3px; background-position:right -603px; background-repeat:no-repeat;}
-.dashboardStatistic .outline.bl{ bottom:0; left:-2px; width:4px; height:5px; background-position:left -606px; background-repeat:no-repeat;}
-.dashboardStatistic .outline.br{ bottom:0; right:-2px; width:4px; height:5px; background-position:right -606px; background-repeat:no-repeat;}
-
-.dashboardStatistic .statistic h4{ font-size:12px; height:22px; width:67%; margin:0 0 10px 0; background:url(../img/bgDashboardStatisticHeader.gif) repeat-x 0 -22px; text-align:center;}
-.dashboardStatistic .statistic h4 span{ display:block; height:18px; padding-top:4px; margin:0 1px; color:#747482; background:url(../img/bgDashboardStatisticHeader.gif) repeat-x;}
-.dashboardStatistic .statistic h4 em{ font-style:normal; font-size:9px; color:#b7b7c4; margin-left:5px;}
-
-.dashboardStatistic dl{ position:relative; float:left; height:100px; margin:0; background:url(../img/vrDashboardStatistic.gif) no-repeat left center;}
-.dashboardStatistic dt { position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; visibility:hidden;}
-.dashboardStatistic dd { position:absolute; margin:0; padding-top:40px; width:100%; text-align:center; background-image:url(../img/iconDashboardStatistic.gif); background-repeat:no-repeat; font-size:56px; font-weight:bold;}
-.dashboardStatistic dd object,
-.dashboardStatistic dd embed{ vertical-align:top;}
-.dashboardStatistic dl.visit{ background:none; width:28%;}
-.dashboardStatistic dl.visit dd{ background-position:center 5px; color:#e3391d ;}
-.dashboardStatistic dl.reply { background:none; width:22%;}
-.dashboardStatistic dl.reply dd{ background-position:center -195px; color:#28313d;}
-.dashboardStatistic dl.trackback { background:none; width:15%;}
-.dashboardStatistic dl.trackback dd{ background-position:center -395px; color:#4e4f54;}
-
-.dashboardStatistic .summary{ float:right; width:30%; margin-top:-27px;}
-.dashboardStatistic .summary caption{ position:relative; padding-bottom:20px; text-align:left; font-size:12px; line-height:1; font-weight:bold; color:#626972;}
-.dashboardStatistic .summary table,
-.dashboardStatistic .summary th,
-.dashboardStatistic .summary td{ border-spacing:0; border:0; font-weight:normal; text-align:left;}
-.dashboardStatistic .summary table{ width:100%; border-bottom:1px solid #e3e6e6;}
-.dashboardStatistic .summary th,
-.dashboardStatistic .summary td{ padding-top:6px; padding-bottom:6px; border-top:1px solid #e3e6e6; vertical-align:top;}
-.dashboardStatistic .summary th{ padding-left:18px; padding-right:12px; white-space:nowrap; color:#8b8b8b; background:url(../img/iconDashboardSummary.gif) no-repeat 2px 9px;}
-.dashboardStatistic .summary td{ color:#555;}
-.dashboardStatistic .summary td strong{ font-size:11px; color:#ea3f22;}
-.dashboardStatistic .summary td .description{ color:#8b8b8b;}
-.dashboardStatistic .summary td .description strong{ color:#8b8b8b;}
-
-/* Dashboard Wire */
-.dashboardH4{ margin:0 0 7px 0; font-size:14px; color:#555;}
-.dashboardH4 a { font-size:11px; color:#b1b1b1; font-style:normal; margin-left:5px;}
-.dashboardH4 em{ font-size:11px; color:#b1b1b1; font-style:normal; margin-left:5px;}
-.dashboardMoreTop{ position:absolute; top:4px; right:0; padding-left:7px; font-size:11px; display:block; white-space:nowrap; color:#8a919a; text-decoration:none; background:url(../img/iconMoreTop.gif) no-repeat left center;}
-
-.dashboardWire{ position:relative; margin-bottom:40px; border-top:2px solid #cbd4df; border-left:1px solid #e3e5e7; border-right:1px solid #e3e5e7; border-bottom:1px solid #f1f1f1; background:#fff; *border-bottom:1px solid #d0d1d2; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='1', Color='#f1f1f1', positive='true');}
-.dashboardWire:after{ content:""; display:block; height:1px; background:#d0d1d2; overflow:hidden;}
-.dashboardWire .buttonArea{ padding:8px 14px; background:#fafafa; border-top:1px solid #e3e5e7; text-align:right; position:relative;}
-.dashboardWire ul{ position:relative; list-style:none; margin:0; padding:0; font-size:12px; overflow:hidden;}
-.dashboardWire li{ position:relative; top:-1px; border-top:1px solid #e3e5e7;}
-
-.dashboardWire blockquote{ margin:0;}
-.dashboardWire .noData{ color:#767676; padding:0 2em;}
-
-.dashboardWire .legend{ position:absolute; top:15px; left:20px; margin:0; white-space:nowrap; font-size:12px;}
-.dashboardWire .legend *{ display:inline;}
-.dashboardWire .legend dt img{ border:1px solid;}
-.dashboardWire .legend dt.past img{ border-color:#c3d1db;}
-.dashboardWire .legend dt.today img{ border-color:#dc3835;}
-.dashboardWire .legend dd{ font-size:11px; color:#b1b1b1; margin:0 5px 0 0;}
-
-.dashboardWire .summary{ position:absolute; top:15px; right:20px; margin:0; white-space:nowrap; font-size:12px;}
-.dashboardWire .summary *{ display:inline;}
-.dashboardWire .summary dt{ margin-left:10px; color:#555;}
-.dashboardWire .summary dd{ margin:0; font-size:11px; font-weight:bold; color:#ea3f22;}
-
-.dashboardWire .graph{ position:relative; height:131px; padding-top:63px; margin:0 20px 26px 20px; background:url(../img/bgDashboardGraph.gif) repeat-x 0 63px;}
-.dashboardWire .graph:after{ content:""; display:block; clear:both;}
-.dashboardWire .graph dl{ position:relative; float:left; width:10%; height:100%; margin:0 2%; *margin:0 1.8%; _margin:0 2% 0 1.1%;}
-.dashboardWire .graph dl dt{ position:absolute; width:100%; text-align:center; font-size:9px; bottom:-16px; color:#707070;}
-.dashboardWire .graph dl dd{ position:absolute; bottom:6px; width:30%; margin:0; border:1px solid; font-size:0; line-height:0; overflow:hidden;}
-.dashboardWire .graph dl dd.past{ left:0; border-color:#c3d1db; background:#d0dde5;}
-.dashboardWire .graph dl dd.today{ right:0; border-color:#dc3835; background:#fe5656;}
-.dashboardWire .graph dl dd span{ position:relative; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
-.dashboardWire .graph object,
-.dashboardWire .graph embed{ margin-top:-20px;}
-
-.dashboardWire a{ text-decoration:none; color:#648AB9;}
-.dashboardWire a:hover,
-.dashboardWire a:active,
-.dashboardWire a:focus{ text-decoration:underline;}
-
-.section table,
-.section th,
-.section td{ border-spacing:0; border:0; font-weight:normal; text-align:left;}
-.section table{ width:100%; border-bottom:1px solid #e3e6e6;}
-.section th,
-.section td{ padding-top:6px; padding-bottom:6px; border-top:1px solid #e3e6e6; vertical-align:top;}
-.section th{ padding-left:18px; padding-right:12px; color:#8b8b8b; background:url(../img/iconDashboardSummary.gif) no-repeat 2px 9px;}
-.section td{ color:#555;}
-.section td strong{ font-size:11px; color:#ea3f22;}
-.section td.center { text-align:center;}
-.section td .description{ color:#8b8b8b;}
-.section td .description strong{ color:#8b8b8b;}
-.section thead th{ background:none; background-color:#efefef; font-weight:bold; padding:6px 5px 6px 5px; }
diff --git a/modules/admin/tpl/css/font.css b/modules/admin/tpl/css/font.css
deleted file mode 100755
index 4175d6a71..000000000
--- a/modules/admin/tpl/css/font.css
+++ /dev/null
@@ -1,60 +0,0 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-#xeAdmin{ font-family:Sans-serif;}
-
-#xeAdmin a{ text-decoration:none !important;}
-#xeAdmin a:hover,
-#xeAdmin a:active,
-#xeAdmin a:focus{ text-decoration:underline !important;}
-
-#xeAdmin h1.xeAdmin a{ text-decoration:none !important; font-family:Arial; font-size:16px; color:#fff; margin:0; padding:0;}
-#xeAdmin table th{ color:#666;}
-#xeAdmin table th a { color:#666;}
-#xeAdmin table td{ color:#767676;}
-#xeAdmin table td a { color:#767676;}
-#xeAdmin caption{ font-size:11px; font-family:Tahoma; color:#767676;}
-#xeAdmin div.summary { font-size:11px; font-family:Tahoma; color:#767676;}
-#xeAdmin div.summary strong { font-weight:normal; }
-#xeAdmin button.text{ font-size:12px;}
-#xeAdmin em,
-#xeAdmin address{ font-style:normal;}
-#xeAdmin select{ font-size:12px;}
-#xeAdmin input{ font-size:12px;}
-#xeAdmin .buttonTypeGo{ padding:0; cursor:pointer;}
-
-#xeAdmin .footer address{ font:10px Tahoma;}
-#xeAdmin .footer address a{ color:#777e86; }
-#xeAdmin .gnb li a { color:#777e86; font-size:11px; font-family:Tahoma;}
-#adminLang li a{ font-size:12px;}
-#xeAdmin .lnb li,
-#xeAdmin .lnb li a{ color:#fff; font-size:14px; font-family:Dotum, Tahoma;}
-
-#xeAdmin .path{ color:#ccc; font-size:11px;}
-#xeAdmin .path a{ color:#767676; font-size:11px; font-family:Dotum, Sans-serif;}
-
-.e1 .navigation li a{ color:#000; text-decoration:none;}
-.e1 .navigation li ul li a{ color:#767676;}
-.e1 .navigation li ul li.active a{ font-weight:bold; color:#666;}
-
-.e2 .section h2.xeAdmin { font-size:12px; margin:0; padding:0;}
-.e2 .section h2.xeAdmin  .date{ font:Tahoma; color:#999;}
-
-.e2 table tbody th{ font-weight:normal; font-family:Dotum;}
-
-.e2 .notice li a{ color:#666; }
-.e2 .notice li .date{ color:#767676; font:10px Tahoma;}
-
-.localNavigation li a{ text-decoration:none !important; color:#666;}
-.localNavigation li.active a{ font-weight:bold; color:#1e6aac;}
-
-#xeAdmin h2.xeAdmin  { font-size:12px;}
-#xeAdmin h3.xeAdmin { font-size:12px; color:#666; margin:0; padding:0;}
-#xeAdmin p.summary{ color:#767676;}
-#xeAdmin p.summary a { text-decoration:none; color:#767676; }
-#xeAdmin p.summary.red { color:#A54D4D; }
-#xeAdmin p.summary.red a { text-decoration:none; color:#A54D4D; }
-#xeAdmin div.infoText { color:#767676;}
-#xeAdmin div.infoText p.warning{ margin:0 0 10px 0; padding:0 0 0 25px; background:url(../img/iconWarning.gif) no-repeat left top;}
-#xeAdmin div.infoText p.update{ margin:0 0 10px 0; padding:0 0 0 25px; background:url(../img/iconRefresh.gif) no-repeat left top;}
-#xeAdmin .buttonAction{}
diff --git a/modules/admin/tpl/css/layout.css b/modules/admin/tpl/css/layout.css
deleted file mode 100755
index 3cd75b92a..000000000
--- a/modules/admin/tpl/css/layout.css
+++ /dev/null
@@ -1,47 +0,0 @@
-@charset "utf-8";
-
-/* NHN (developers@xpressengine.com) */
-
-#xeAdmin .header{ position:relative; height:62px; padding:10px 15px 10px 30px; background:url(../img/bgHeader.gif) repeat-x; z-index:10;}
-#xeAdmin .footer{ height:26px; padding-top:10px; background:url(../img/bgFooter.gif) repeat-x; text-align:center;}
-#xeAdmin .gnb{ position:relative; float:right; white-space:nowrap; clear:right; margin:0; padding:0;}
-#xeAdmin .gnb li{ position:relative; float:left; margin:0 15px 0 0; padding:0;list-style:none;}
-
-#xeAdmin .gnb #adminLang { position:absolute; top:18px; right:0; display:none; background:#fff; margin:0; padding:5px; border:1px solid #ddd; z-index:999;}
-#xeAdmin .gnb #adminLang li{ float:none; margin:0;}
-
-.body{ position:relative; margin:0; padding:0 0 0 200px; background:url(../img/lineBody.gif) repeat-y 180px 0; *zoom:1;}
-.body:after {content:""; display:block; clear:both;}
-.c .body { padding:20px; background:none; }
-.ece .body {padding-right:340px;}
-.ec .body {padding-right:20px;}
-.extension{ position:relative;}
-.body .e1 { float:left; width:180px; margin-right:-180px; left:-200px;}
-.content { position:relative; width:100%; margin-right:-100%; float:left; padding:0;}
-.ec .content { padding-top:10px; }
-.c .e1, .c .e2 { display:none; }
-.ece .e2 { width:300px; float:right; right:-320px; border-left:1px solid #ddd; padding-bottom:20px;}
-.ec .e2 { display:none;}
-
-#xeAdmin .lnb { position:relative; left:-3px; float:left; clear:left; margin:5px 0 0 0; padding:0;}
-#xeAdmin .lnb li,
-#xeAdmin .lnb li a{ position:relative; float:left; background:url(../img/buttonLNB.gif) no-repeat; white-space:nowrap;}
-#xeAdmin .lnb li{ margin:0 1px 0 0; padding:0;list-style:none; background-position:0 0;}
-#xeAdmin .lnb li a{ left:1px; height:30px; padding:10px 15px 0 15px; text-decoration:none !important; background-position:right 0;}
-#xeAdmin .lnb li.core{ margin-right:6px; background-position:0 -50px;}
-#xeAdmin .lnb li.core a{ padding-right:20px; left:5px; background-position:right -50px;}
-#xeAdmin .lnb li.first{ background-position:0 -50px; margin-right:5px;}
-#xeAdmin .lnb li.first a{ left:5px;}
-#xeAdmin .lnb li.end{}
-#xeAdmin .lnb li.end a{ padding-right:20px; background-position:right -50px;}
-
-#xeAdmin .lnb li.core.selected { background-position:0 -150px;}
-#xeAdmin .lnb li.core.selected  a{ background-position:right -150px;}
-#xeAdmin .lnb li.first.selected { background-position:0 -150px;}
-#xeAdmin .lnb li.first.selected  a{ background-position:right -100px;}
-#xeAdmin .lnb li.mid.selected { background-position:0 -100px;}
-#xeAdmin .lnb li.mid.selected  a{ background-position:right -100px;}
-#xeAdmin .lnb li.end.selected { background-position:0 -100px;}
-#xeAdmin .lnb li.end.selected  a{ background-position:right -150px;}
-
-#xeAdmin .path{ padding:0 0 0 25px; margin:0 0 20px 0; background:url(../img/iconPath.gif) no-repeat left center;}
diff --git a/modules/admin/tpl/css/pagination.css b/modules/admin/tpl/css/pagination.css
deleted file mode 100755
index 0ba0ff1b0..000000000
--- a/modules/admin/tpl/css/pagination.css
+++ /dev/null
@@ -1,85 +0,0 @@
-@charset "utf-8"; 
-/* NHN (developers@xpressengine.com) */
-
-/* Pagination Reset */
-#xeAdmin .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
-#xeAdmin .pagination *{ margin:0; padding:0;}
-#xeAdmin .pagination img{ border:0;}
-#xeAdmin .pagination a,
-#xeAdmin .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-#xeAdmin .pagination a:hover,
-#xeAdmin .pagination a:active,
-#xeAdmin .pagination a:focus{ background-color:#f4f4f4 !important; }
-#xeAdmin .pagination strong{ color:#ff6600 !important;}
-#xeAdmin .pagination a.prev,
-#xeAdmin .pagination a.prevEnd,
-#xeAdmin .pagination a.next,
-#xeAdmin .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-#xeAdmin .pagination.a1 a,
-#xeAdmin .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-#xeAdmin .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
-#xeAdmin .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
-#xeAdmin .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
-#xeAdmin .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination A2 */
-#xeAdmin .pagination.a2 a,
-#xeAdmin .pagination.a2 strong{ margin:0 -4px; padding:0 10px 0 8px; font-weight:bold; font-size:11px; border:none; border-left:1px solid #ddd; border-right:1px solid #ccc; background:#fff; }
-#xeAdmin .pagination.a2 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
-#xeAdmin .pagination.a2 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
-#xeAdmin .pagination.a2 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
-#xeAdmin .pagination.a2 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
-
-/* Pagination B1 */
-#xeAdmin .pagination.b1 a,
-#xeAdmin .pagination.b1 strong{ margin:0 -2px; padding:2px 8px; font-weight:bold; font-size:12px;}
-#xeAdmin .pagination.b1 a.prev,
-#xeAdmin .pagination.b1 a.prevEnd{ padding-left:16px; background:url(../img/arrowPrevB1.gif) no-repeat left center; }
-#xeAdmin .pagination.b1 a.next,
-#xeAdmin .pagination.b1 a.nextEnd{ padding-right:16px; background:url(../img/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination B2 */
-#xeAdmin .pagination.b2 a,
-#xeAdmin .pagination.b2 strong{ margin:0 -2px; padding:2px 6px; font-size:11px;}
-#xeAdmin .pagination.b2 a.prev,
-#xeAdmin .pagination.b2 a.prevEnd{ padding-left:12px; background:url(../img/arrowPrevB1.gif) no-repeat left center; }
-#xeAdmin .pagination.b2 a.next,
-#xeAdmin .pagination.b2 a.nextEnd{ padding-right:12px; background:url(../img/arrowNextB1.gif) no-repeat right center; }
-
-/* Pagination C1 */
-#xeAdmin .pagination.c1 a,
-#xeAdmin .pagination.c1 strong{ margin:0 -2px; padding:2px 4px; font-size:12px;}
-#xeAdmin .pagination.c1 a.prev,
-#xeAdmin .pagination.c1 a.prevEnd,
-#xeAdmin .pagination.c1 a.next,
-#xeAdmin .pagination.c1 a.nextEnd{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-#xeAdmin .pagination.c1 a.prev,
-#xeAdmin .pagination.c1 a.prevEnd{ background:url(../img/arrowPrevC1.gif) no-repeat center;}
-#xeAdmin .pagination.c1 a.next,
-#xeAdmin .pagination.c1 a.nextEnd{ background:url(../img/arrowNextC1.gif) no-repeat center;}
-#xeAdmin .pagination.c1 a.prev span,
-#xeAdmin .pagination.c1 a.prevEnd span,
-#xeAdmin .pagination.c1 a.next span,
-#xeAdmin .pagination.c1 a.nextEnd span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* Pagination C2 */
-#xeAdmin .pagination.c2 a,
-#xeAdmin .pagination.c2 strong{ margin:0 -2px; padding:2px 4px; font-size:11px;}
-#xeAdmin .pagination.c2 a.prev,
-#xeAdmin .pagination.c2 a.prevEnd,
-#xeAdmin .pagination.c2 a.next,
-#xeAdmin .pagination.c2 a.nextEnd{ display:inline-block; width:13px; height:14px; padding:3px 4px; margin:0;}
-#xeAdmin .pagination.c2 a.prev,
-#xeAdmin .pagination.c2 a.prevEnd{ background:url(../img/arrowPrevC1.gif) no-repeat center;}
-#xeAdmin .pagination.c2 a.next,
-#xeAdmin .pagination.c2 a.nextEnd{ background:url(../img/arrowNextC1.gif) no-repeat center;}
-#xeAdmin .pagination.c2 a.prev span,
-#xeAdmin .pagination.c2 a.prevEnd span,
-#xeAdmin .pagination.c2 a.next span,
-#xeAdmin .pagination.c2 a.nextEnd span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-
-
-
diff --git a/modules/admin/tpl/filter/install_ftp_info.xml b/modules/admin/tpl/filter/install_ftp_info.xml
index 2e27c569e..e33c6e2fd 100644
--- a/modules/admin/tpl/filter/install_ftp_info.xml
+++ b/modules/admin/tpl/filter/install_ftp_info.xml
@@ -1,7 +1,7 @@
 <filter name="install_ftp_info" module="install" act="procInstallAdminSaveFTPInfo" >
     <form>
         <node target="ftp_user" required="true" />
-        <node target="ftp_port" required="true" />
+        <node target="ftp_port" required="false" filter="number" />
         <node target="ftp_root_path" required="true" />
         <node target="sftp" />
     </form>
diff --git a/modules/admin/tpl/img/bgDashboardGraph.gif b/modules/admin/tpl/img/bgDashboardGraph.gif
deleted file mode 100644
index f11245f1d..000000000
Binary files a/modules/admin/tpl/img/bgDashboardGraph.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgDashboardStatistic.gif b/modules/admin/tpl/img/bgDashboardStatistic.gif
deleted file mode 100644
index 3742b9aa5..000000000
Binary files a/modules/admin/tpl/img/bgDashboardStatistic.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgDashboardStatisticHeader.gif b/modules/admin/tpl/img/bgDashboardStatisticHeader.gif
deleted file mode 100644
index 3f6f9d7a9..000000000
Binary files a/modules/admin/tpl/img/bgDashboardStatisticHeader.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgDragable.gif b/modules/admin/tpl/img/bgDragable.gif
new file mode 100644
index 000000000..92fcd2298
Binary files /dev/null and b/modules/admin/tpl/img/bgDragable.gif differ
diff --git a/modules/admin/tpl/img/bgFavicon.gif b/modules/admin/tpl/img/bgFavicon.gif
new file mode 100644
index 000000000..a797561cd
Binary files /dev/null and b/modules/admin/tpl/img/bgFavicon.gif differ
diff --git a/modules/admin/tpl/img/bgFooter.gif b/modules/admin/tpl/img/bgFooter.gif
deleted file mode 100755
index d49c3c5f8..000000000
Binary files a/modules/admin/tpl/img/bgFooter.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgGrid.gif b/modules/admin/tpl/img/bgGrid.gif
deleted file mode 100755
index 199260772..000000000
Binary files a/modules/admin/tpl/img/bgGrid.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgHeader.gif b/modules/admin/tpl/img/bgHeader.gif
deleted file mode 100755
index 507a80c7d..000000000
Binary files a/modules/admin/tpl/img/bgHeader.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgMobileTop.png b/modules/admin/tpl/img/bgMobileTop.png
new file mode 100644
index 000000000..d2512de2b
Binary files /dev/null and b/modules/admin/tpl/img/bgMobileTop.png differ
diff --git a/modules/admin/tpl/img/bgNone.gif b/modules/admin/tpl/img/bgNone.gif
deleted file mode 100755
index 1289ebbc2..000000000
Binary files a/modules/admin/tpl/img/bgNone.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgRuler.gif b/modules/admin/tpl/img/bgRuler.gif
deleted file mode 100755
index 53ad33c26..000000000
Binary files a/modules/admin/tpl/img/bgRuler.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/bgTransparent.gif b/modules/admin/tpl/img/bgTransparent.gif
deleted file mode 100755
index c4440e217..000000000
Binary files a/modules/admin/tpl/img/bgTransparent.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/btnPlusMinus.gif b/modules/admin/tpl/img/btnPlusMinus.gif
new file mode 100644
index 000000000..d413d4e24
Binary files /dev/null and b/modules/admin/tpl/img/btnPlusMinus.gif differ
diff --git a/modules/admin/tpl/img/buttonLNB.gif b/modules/admin/tpl/img/buttonLNB.gif
deleted file mode 100755
index d29eb9de3..000000000
Binary files a/modules/admin/tpl/img/buttonLNB.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/buttonSearch.gif b/modules/admin/tpl/img/buttonSearch.gif
deleted file mode 100644
index 189a7fd7e..000000000
Binary files a/modules/admin/tpl/img/buttonSearch.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/exBgColor.gif b/modules/admin/tpl/img/exBgColor.gif
deleted file mode 100755
index a917cf235..000000000
Binary files a/modules/admin/tpl/img/exBgColor.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/exBgImage.gif b/modules/admin/tpl/img/exBgImage.gif
deleted file mode 100755
index d8e97fafa..000000000
Binary files a/modules/admin/tpl/img/exBgImage.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/exBorder.gif b/modules/admin/tpl/img/exBorder.gif
deleted file mode 100755
index 2784b21f9..000000000
Binary files a/modules/admin/tpl/img/exBorder.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/exMargin.gif b/modules/admin/tpl/img/exMargin.gif
deleted file mode 100755
index d8d54d815..000000000
Binary files a/modules/admin/tpl/img/exMargin.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/exPadding.gif b/modules/admin/tpl/img/exPadding.gif
deleted file mode 100755
index 220e75ccc..000000000
Binary files a/modules/admin/tpl/img/exPadding.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/exWidth.gif b/modules/admin/tpl/img/exWidth.gif
deleted file mode 100755
index 6a2cfe51a..000000000
Binary files a/modules/admin/tpl/img/exWidth.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/faviconSample.png b/modules/admin/tpl/img/faviconSample.png
new file mode 100644
index 000000000..f056c3aaa
Binary files /dev/null and b/modules/admin/tpl/img/faviconSample.png differ
diff --git a/modules/admin/tpl/img/flag.cn.gif b/modules/admin/tpl/img/flag.cn.gif
new file mode 100644
index 000000000..b05253097
Binary files /dev/null and b/modules/admin/tpl/img/flag.cn.gif differ
diff --git a/modules/admin/tpl/img/flag.de.gif b/modules/admin/tpl/img/flag.de.gif
new file mode 100644
index 000000000..75728ddf2
Binary files /dev/null and b/modules/admin/tpl/img/flag.de.gif differ
diff --git a/modules/admin/tpl/img/flag.es.gif b/modules/admin/tpl/img/flag.es.gif
new file mode 100644
index 000000000..c27d65e5f
Binary files /dev/null and b/modules/admin/tpl/img/flag.es.gif differ
diff --git a/modules/admin/tpl/img/flag.fr.gif b/modules/admin/tpl/img/flag.fr.gif
new file mode 100644
index 000000000..43d0b8017
Binary files /dev/null and b/modules/admin/tpl/img/flag.fr.gif differ
diff --git a/modules/admin/tpl/img/flag.jp.gif b/modules/admin/tpl/img/flag.jp.gif
new file mode 100644
index 000000000..444c1d05c
Binary files /dev/null and b/modules/admin/tpl/img/flag.jp.gif differ
diff --git a/modules/admin/tpl/img/flag.kr.gif b/modules/admin/tpl/img/flag.kr.gif
new file mode 100644
index 000000000..1cddbe75b
Binary files /dev/null and b/modules/admin/tpl/img/flag.kr.gif differ
diff --git a/modules/admin/tpl/img/flag.mn.gif b/modules/admin/tpl/img/flag.mn.gif
new file mode 100644
index 000000000..dff8ea5a6
Binary files /dev/null and b/modules/admin/tpl/img/flag.mn.gif differ
diff --git a/modules/admin/tpl/img/flag.ru.gif b/modules/admin/tpl/img/flag.ru.gif
new file mode 100644
index 000000000..b525c4623
Binary files /dev/null and b/modules/admin/tpl/img/flag.ru.gif differ
diff --git a/modules/admin/tpl/img/flag.tr.gif b/modules/admin/tpl/img/flag.tr.gif
new file mode 100644
index 000000000..e407d553d
Binary files /dev/null and b/modules/admin/tpl/img/flag.tr.gif differ
diff --git a/modules/admin/tpl/img/flag.tw.gif b/modules/admin/tpl/img/flag.tw.gif
new file mode 100644
index 000000000..cacfd9b7a
Binary files /dev/null and b/modules/admin/tpl/img/flag.tw.gif differ
diff --git a/modules/admin/tpl/img/flag.us.gif b/modules/admin/tpl/img/flag.us.gif
new file mode 100644
index 000000000..8f198f73a
Binary files /dev/null and b/modules/admin/tpl/img/flag.us.gif differ
diff --git a/modules/admin/tpl/img/flag.vn.gif b/modules/admin/tpl/img/flag.vn.gif
new file mode 100644
index 000000000..f1e20c941
Binary files /dev/null and b/modules/admin/tpl/img/flag.vn.gif differ
diff --git a/modules/admin/tpl/img/graphHr.gif b/modules/admin/tpl/img/graphHr.gif
deleted file mode 100755
index 8193ad5f7..000000000
Binary files a/modules/admin/tpl/img/graphHr.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconArrow.gif b/modules/admin/tpl/img/iconArrow.gif
new file mode 100644
index 000000000..eff3728a4
Binary files /dev/null and b/modules/admin/tpl/img/iconArrow.gif differ
diff --git a/modules/admin/tpl/img/iconCheck.gif b/modules/admin/tpl/img/iconCheck.gif
old mode 100755
new mode 100644
index e4eb0fbd1..099fe5c96
Binary files a/modules/admin/tpl/img/iconCheck.gif and b/modules/admin/tpl/img/iconCheck.gif differ
diff --git a/modules/admin/tpl/img/iconDashboardNoticeOpen.gif b/modules/admin/tpl/img/iconDashboardNoticeOpen.gif
deleted file mode 100644
index ed016b68e..000000000
Binary files a/modules/admin/tpl/img/iconDashboardNoticeOpen.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconDashboardStatistic.gif b/modules/admin/tpl/img/iconDashboardStatistic.gif
deleted file mode 100644
index 04deae544..000000000
Binary files a/modules/admin/tpl/img/iconDashboardStatistic.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconDashboardSummary.gif b/modules/admin/tpl/img/iconDashboardSummary.gif
deleted file mode 100644
index 56744ce40..000000000
Binary files a/modules/admin/tpl/img/iconDashboardSummary.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconFavorite.gif b/modules/admin/tpl/img/iconFavorite.gif
new file mode 100644
index 000000000..65d4d3d10
Binary files /dev/null and b/modules/admin/tpl/img/iconFavorite.gif differ
diff --git a/modules/admin/tpl/img/iconH3dashboard.gif b/modules/admin/tpl/img/iconH3dashboard.gif
deleted file mode 100644
index 0f1cd4630..000000000
Binary files a/modules/admin/tpl/img/iconH3dashboard.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconMoveTo.gif b/modules/admin/tpl/img/iconMoveTo.gif
new file mode 100644
index 000000000..45ce5b342
Binary files /dev/null and b/modules/admin/tpl/img/iconMoveTo.gif differ
diff --git a/modules/admin/tpl/img/iconNavVr.gif b/modules/admin/tpl/img/iconNavVr.gif
new file mode 100644
index 000000000..b2c80171f
Binary files /dev/null and b/modules/admin/tpl/img/iconNavVr.gif differ
diff --git a/modules/admin/tpl/img/iconNavigation.gif b/modules/admin/tpl/img/iconNavigation.gif
deleted file mode 100755
index dc7c2886f..000000000
Binary files a/modules/admin/tpl/img/iconNavigation.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconPath.gif b/modules/admin/tpl/img/iconPath.gif
deleted file mode 100755
index 6cc5f1635..000000000
Binary files a/modules/admin/tpl/img/iconPath.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconRefresh.gif b/modules/admin/tpl/img/iconRefresh.gif
deleted file mode 100644
index 9d1304ccd..000000000
Binary files a/modules/admin/tpl/img/iconRefresh.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconSetting.gif b/modules/admin/tpl/img/iconSetting.gif
new file mode 100644
index 000000000..d5a2ad29d
Binary files /dev/null and b/modules/admin/tpl/img/iconSetting.gif differ
diff --git a/modules/admin/tpl/img/iconStarRating.gif b/modules/admin/tpl/img/iconStarRating.gif
new file mode 100644
index 000000000..4f901e905
Binary files /dev/null and b/modules/admin/tpl/img/iconStarRating.gif differ
diff --git a/modules/admin/tpl/img/iconWarning.gif b/modules/admin/tpl/img/iconWarning.gif
deleted file mode 100644
index 822de82cc..000000000
Binary files a/modules/admin/tpl/img/iconWarning.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/iconWindow.gif b/modules/admin/tpl/img/iconWindow.gif
new file mode 100644
index 000000000..7c318f880
Binary files /dev/null and b/modules/admin/tpl/img/iconWindow.gif differ
diff --git a/modules/admin/tpl/img/iconX.gif b/modules/admin/tpl/img/iconX.gif
deleted file mode 100755
index ba29ae14a..000000000
Binary files a/modules/admin/tpl/img/iconX.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/lineBody.gif b/modules/admin/tpl/img/lineBody.gif
deleted file mode 100755
index f4fb45e16..000000000
Binary files a/modules/admin/tpl/img/lineBody.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/lineTree.gif b/modules/admin/tpl/img/lineTree.gif
new file mode 100644
index 000000000..ad659a679
Binary files /dev/null and b/modules/admin/tpl/img/lineTree.gif differ
diff --git a/modules/admin/tpl/img/mIcon.gif b/modules/admin/tpl/img/mIcon.gif
deleted file mode 100644
index 5a9664d60..000000000
Binary files a/modules/admin/tpl/img/mIcon.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/mobiconSample.png b/modules/admin/tpl/img/mobiconSample.png
new file mode 100644
index 000000000..5042b5aa0
Binary files /dev/null and b/modules/admin/tpl/img/mobiconSample.png differ
diff --git a/modules/admin/tpl/img/msg.Info.png b/modules/admin/tpl/img/msg.Info.png
new file mode 100644
index 000000000..a6f3565c5
Binary files /dev/null and b/modules/admin/tpl/img/msg.Info.png differ
diff --git a/modules/admin/tpl/img/msg.error.png b/modules/admin/tpl/img/msg.error.png
new file mode 100644
index 000000000..7d9c1a68b
Binary files /dev/null and b/modules/admin/tpl/img/msg.error.png differ
diff --git a/modules/admin/tpl/img/msg.update.png b/modules/admin/tpl/img/msg.update.png
new file mode 100644
index 000000000..598afd0a3
Binary files /dev/null and b/modules/admin/tpl/img/msg.update.png differ
diff --git a/modules/admin/tpl/img/n_button_down.gif b/modules/admin/tpl/img/n_button_down.gif
deleted file mode 100644
index d89fe1a5a..000000000
Binary files a/modules/admin/tpl/img/n_button_down.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_button_up.gif b/modules/admin/tpl/img/n_button_up.gif
deleted file mode 100644
index 1660d5ced..000000000
Binary files a/modules/admin/tpl/img/n_button_up.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_caption_head.gif b/modules/admin/tpl/img/n_caption_head.gif
deleted file mode 100644
index a1577e609..000000000
Binary files a/modules/admin/tpl/img/n_caption_head.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_circle_bullet.gif b/modules/admin/tpl/img/n_circle_bullet.gif
deleted file mode 100644
index 58386fd7c..000000000
Binary files a/modules/admin/tpl/img/n_circle_bullet.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_icon_copy.gif b/modules/admin/tpl/img/n_icon_copy.gif
deleted file mode 100644
index a5ab0a98b..000000000
Binary files a/modules/admin/tpl/img/n_icon_copy.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_icon_delete.gif b/modules/admin/tpl/img/n_icon_delete.gif
deleted file mode 100644
index 037c521cb..000000000
Binary files a/modules/admin/tpl/img/n_icon_delete.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_icon_modify.gif b/modules/admin/tpl/img/n_icon_modify.gif
deleted file mode 100644
index 203b25e3e..000000000
Binary files a/modules/admin/tpl/img/n_icon_modify.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_icon_remove.gif b/modules/admin/tpl/img/n_icon_remove.gif
deleted file mode 100644
index aad07232d..000000000
Binary files a/modules/admin/tpl/img/n_icon_remove.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_icon_select_all.gif b/modules/admin/tpl/img/n_icon_select_all.gif
deleted file mode 100644
index e4795c7ed..000000000
Binary files a/modules/admin/tpl/img/n_icon_select_all.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_icon_view.gif b/modules/admin/tpl/img/n_icon_view.gif
deleted file mode 100644
index 79eb97164..000000000
Binary files a/modules/admin/tpl/img/n_icon_view.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_light_off.gif b/modules/admin/tpl/img/n_light_off.gif
deleted file mode 100644
index 3d5246a89..000000000
Binary files a/modules/admin/tpl/img/n_light_off.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_light_on.gif b/modules/admin/tpl/img/n_light_on.gif
deleted file mode 100644
index c58691a86..000000000
Binary files a/modules/admin/tpl/img/n_light_on.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_paper_bullet.gif b/modules/admin/tpl/img/n_paper_bullet.gif
deleted file mode 100644
index 127f18e66..000000000
Binary files a/modules/admin/tpl/img/n_paper_bullet.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/n_setup.gif b/modules/admin/tpl/img/n_setup.gif
deleted file mode 100644
index a620bceae..000000000
Binary files a/modules/admin/tpl/img/n_setup.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/preLoader16.gif b/modules/admin/tpl/img/preLoader16.gif
new file mode 100644
index 000000000..bce84bcc4
Binary files /dev/null and b/modules/admin/tpl/img/preLoader16.gif differ
diff --git a/modules/admin/tpl/img/vrDashboardStatistic.gif b/modules/admin/tpl/img/vrDashboardStatistic.gif
deleted file mode 100644
index 2c5b11f4e..000000000
Binary files a/modules/admin/tpl/img/vrDashboardStatistic.gif and /dev/null differ
diff --git a/modules/admin/tpl/img/xe.h1.png b/modules/admin/tpl/img/xe.h1.png
new file mode 100644
index 000000000..30e3157b6
Binary files /dev/null and b/modules/admin/tpl/img/xe.h1.png differ
diff --git a/modules/admin/tpl/index.html b/modules/admin/tpl/index.html
index e4663d929..453634227 100644
--- a/modules/admin/tpl/index.html
+++ b/modules/admin/tpl/index.html
@@ -1,314 +1,134 @@
-<!--#include("_header.html")-->
-
-<!--%import("./css/dashboard.css")-->
-<!--%import("../../install/lang")-->
-<!--%import("../../module/tpl/js/module_admin.js")-->
-<!--%import("../../session/tpl/js/session.js")-->
-<!--%import("../../addon/tpl/js/addon.js")-->
-<!--%import("../../addon/tpl/filter/toggle_activate_addon.xml")-->
-
-<div class="content">
-	<!-- Dashboard Header -->
-	<div class="dashboardHeader">
-		<h3 class="h3">{$lang->admin_index}</h3>
-	</div>
-	<!-- /Dashboard Header -->
-
-	<!-- Dashboard Statistic -->
-	<div class="section dashboardStatistic">
-		<div class="statistic">
-			<h4><span>TODAY <em>{date('Y.m.d')}</em></span></h4>
-			<dl class="visit">
-				<dt>{$lang->today_visitor}</dt>
-
-				<dd>
-					<object title="visitor" height="50" width="100%" align="middle" id="count_red" class="F1239845427590201480_undefined" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000">
-						<param value="{getUrl()}modules/admin/tpl/swf/count.swf" name="movie"/>
-						<param value="high" name="quality"/>
-						<param value="#FFFFFF" name="bgColor"/>
-						<param value="always" name="allowScriptAccess"/>
-						<param value="transparent" name="wmode"/>
-						<param value="false" name="menu"/>
-						<param value="true" name="allowFullScreen"/>
-						<param value="colorType=red&amp;viewNum={$status->visitor}" name="flashVars"/>
-						<!--[if !IE]> <-->
-						<object title="{$status->visitor}" height="50" width="100%" align="middle" name="count_red" class="F1239845427590201480_undefined" data="{getUrl()}modules/admin/tpl/swf/count.swf" type="application/x-shockwave-flash">
-							<param value="colorType=red&amp;viewNum={$status->visitor}" name="flashVars"/>
-							<param value="transparent" name="wmode"/>
-							{$status->visitor}
-						</object>
-						<!--> <![endif]-->
-					</object>
-				</dd>
-			</dl>
-			<dl class="reply">
-				<dt>{$lang->today_comments}</dt>
-				<dd>
-					<object title="{$status->comment->today}" height="50" width="100%" align="middle" id="count_blue" class="F1239845427590201480_undefined" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000">
-						<param value="{getUrl()}modules/admin/tpl/swf/count.swf" name="movie"/>
-						<param value="high" name="quality"/>
-						<param value="#FFFFFF" name="bgColor"/>
-						<param value="always" name="allowScriptAccess"/>
-						<param value="transparent" name="wmode"/>
-						<param value="false" name="menu"/>
-						<param value="true" name="allowFullScreen"/>
-						<param value="colorType=blue&amp;viewNum={$status->comment_count}" name="flashVars"/>
-						<!--[if !IE]> <-->
-						<object title="{$status->comment->today}" height="50" width="100%" align="middle" name="count_blue" class="F1239845427590201480_undefined" data="{getUrl()}modules/admin/tpl/swf/count.swf" type="application/x-shockwave-flash">
-							<param value="colorType=blue&amp;viewNum={$status->comment_count}" name="flashVars"/>
-							<param value="transparent" name="wmode"/>
-							{$status->comment->today}
-						</object>
-						<!--> <![endif]-->
-					</object>
-				</dd>
-			</dl>
-			<dl class="trackback">
-				<dt>{$lang->today_trackbacks}</dt>
-				<dd>
-					<object title="{$status->trackback->today}" height="50" width="100%" align="middle" id="count_gray" class="F1239845427590201480_undefined" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,0,0" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000">
-						<param value="{getUrl()}modules/admin/tpl/swf/count.swf" name="movie"/>
-						<param value="high" name="quality"/>
-						<param value="#FFFFFF" name="bgColor"/>
-						<param value="always" name="allowScriptAccess"/>
-						<param value="transparent" name="wmode"/>
-						<param value="false" name="menu"/>
-						<param value="true" name="allowFullScreen"/>
-						<param value="colorType=gray&amp;viewNum={$status->trackback_count}" name="flashVars"/>
-						<!--[if !IE]> <-->
-						<object title="{$status->trackback->today}" height="50" width="100%" align="middle" name="count_gray" class="F1239845427590201480_undefined" data="{getUrl()}modules/admin/tpl/swf/count.swf" type="application/x-shockwave-flash">
-							<param value="colorType=gray&amp;viewNum={$status->trackback_count}" name="flashVars"/>
-							<param value="transparent" name="wmode"/>
-							{$status->trackback->today}
-						</object>
-						<!--> <![endif]-->
-					</object>
-				</dd>
-			</dl>
-			<div class="summary">
-				<table border="1" cellspacing="0">
-					<tr>
-						<th scope="row"><a href="{getUrl('','module','admin','act','dispMemberAdminList')}">{$lang->member}</a></th>
-						<td><strong>{number_format($status->member->total)}</strong> <span class="description">(+<a href="{getUrl('','module','admin','act','dispMemberAdminList','search_target','regdate','search_keyword',date("Ymd"))}"><strong>{number_format($status->member->today)}</strong></a>)</span></td>
-					</tr>
-					<tr>
-						<th scope="row"><a href="{getUrl('','module','admin','act','dispDocumentAdminList')}">{$lang->document}</a></th>
-						<td><strong>{number_format($status->document->total)}</strong> <span class="description">(+<a href="{getUrl('','module','admin','act','dispDocumentAdminList','search_target','regdate','search_keyword',date("Ymd"))}"><strong>{number_format($status->document->today)}</strong></a>,-<a href="{getUrl('','module','admin','act','dispDocumentAdminDeclared')}"><strong>{number_format($status->documentDeclared->total)}</strong></a>)</span></td>
-					</tr>
-					<tr>
-						<th scope="row"><a href="{getUrl('','module','admin','act','dispCommentAdminList')}">{$lang->comment}</a></th>
-						<td><strong>{number_format($status->comment->total)}</strong> <span class="description">(+<a href="{getUrl('','module','admin','act','dispCommentAdminList','search_target','regdate','search_keyword',date("Ymd"))}"><strong>{number_format($status->comment->today)}</strong></a>,-<a href="{getUrl('','module','admin','act','dispCommentAdminDeclared')}"><strong>{number_format($status->commentDeclared->total)}</strong></a>)</span></td>
-					</tr>
-					<tr>
-						<th scope="row"><a href="{getUrl('','module','admin','act','dispTrackbackAdminList')}">{$lang->trackback}</a></th>
-						<td><strong>{number_format($status->trackback->total)}</strong> <span class="description">(+<a href="{getUrl('','module','admin','act','dispTrackbackAdminList','search_target','regdate','search_keyword',date("Ymd"))}"><strong>{number_format($status->trackback->today)}</strong></a>)</span></td>
-					</tr>
-					<tr>
-						<th scope="row"><a href="{getUrl('','module','admin','act','dispFileAdminList')}">{$lang->file}</a></th>
-						<td><strong>{number_format($status->file->total)}</strong> <span class="description">(+<a href="{getUrl('','module','admin','act','dispFileAdminList','search_target','regdate','search_keyword',date("Ymd"))}"><strong>{number_format($status->file->today)}</strong></a>)</span></td>
-					</tr>
-				</table>
-			</div>
-		</div>
-		<span class="outline ml"></span>
-		<span class="outline mr"></span>
-		<span class="outline tc"></span>
-		<span class="outline bc"></span>
-		<span class="outline tl"></span>
-		<span class="outline tr"></span>
-
-		<span class="outline bl"></span>
-		<span class="outline br"></span>
-	</div>
-	<!-- /Dashboard Statistic -->
-
-	<!-- Visotors Graph -->
-	<div class="section">
-
-		<h4 class="dashboardH4">{$lang->counter} <em>{date("Y.m.d")}</em></h4>
-		<div class="dashboardWire">
-			<dl class="legend">
-				<dt class="past"><img src="../../../common/tpl/images/blank.gif" width="5" height="5" alt="{$lang->yesterday}" /></dt>
-				<dd>{$lang->last_week}</dd>
-				<dt class="today"><img src="../../../common/tpl/images/blank.gif" width="5" height="5" alt="{$lang->today}" /></dt>
-				<dd>{$lang->this_week}</dd>
-
-			</dl>
-			<dl class="summary">
-				<dt>{$lang->today}</dt>
-				<dd>{number_format($status->visitor)}</dd>
-				<dt>{$lang->this_week}</dt>
-				<dd>{number_format($status->thisWeekSum)}</dd>
-				<dt>{$lang->total}</dt>
-				<dd>{number_format($status->total_visitor)}</dd>
-			</dl>
-			<div class="graph">
-				<!--@foreach($status->week as $key => $val)-->
-				<dl>
-					<dt><!--@if($key==date("Ymd"))--><strong>{$key}</strong><!--@else-->{$key}<!--@end--></dt>
-					<dd class="past" style="height:{$val->last/$status->week_max * 100}%" title="{$lang->last_week}:{number_format($val->last)}"><span>{$lang->last_week}:{number_format($val->last)}</span></dd>
-					<dd class="today" style="height:{$val->this/$status->week_max * 100}%" title="{$lang->this_week}:{number_format($val->this)}"><span>{$lang->this_week}:{number_format($val->this)}</span></dd>
-
-				</dl>
-				<!--@end-->
-			</div>
-		</div>
-	</div>
-	<!-- /Visotors Graph -->
-
-	<div class="section">
-	<h4 class="dashboardH4">{$lang->env_information} <a href="{getUrl('','module','admin','act','dispAdminConfig')}">{$lang->cmd_setup}</a></h4>
-        <!--@if(version_compare($current_version, $released_version, '<'))-->
-        <p class="summary red">{nl2br($lang->about_download_link)} [<a href="{$download_link}" onclick="window.open(this.href);return false;">{$lang->cmd_download}</a>]</p>
-        <!--@end-->
-        <table>
-		<col width="160" />
-		<col width="*" />
-        <tbody>
-        <tr>
-            <th><div>{$lang->current_version}</div></th>
-            <td class="wide">
-                <strong>{$current_version}</strong><!--@if($current_version == $released_version)--> [<a href="{$download_link}" onclick="window.open(this.href);return false;">{$lang->cmd_view}</a>]<!--@end-->
-            </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->current_path}</div></th>
-            <td>{$installed_path}/</td>
-        </tr>
-        <tr>
-            <th><div>{$lang->start_module}</div></th>
-            <td><a href="{getSiteUrl('','','mid',$start_module->mid)}" onclick="window.open(this.href);return false;">{$start_module->browser_title}</a></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->time_zone}</div></th>
-            <td><!--@foreach($time_zone_list as $key => $val)--><!--@if($time_zone==$key)-->{substr($val,1,10)}<!--@end--><!--@endforeach--></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->use_rewrite}</div></th>
-            <td><!--@if($use_rewrite=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->use_sso}</div></th>
-            <td><!--@if($use_sso=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-        </tr>
-		<tr>
-			<th><div>{$lang->mobile_view}</div></th>
-			<td><!--@if($use_mobile_view=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-		</tr>
-        <tr>
-            <th><div>Language</div></th>
-            <td><!--@foreach($lang_supported as $key => $val)--><!--@if($key == $selected_lang)-->{$val}<!--@endif--><!--@endforeach--></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->qmail_compatibility}</div></th>
-            <td><!--@if($qmail_compatibility=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->use_db_session}</div></th>
-            <td><!--@if($use_db_session =='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
-        </tr>
-        </tbody>
-        </table>
-	</div>
-</div>
-
-<div class="extension e2">
-    <div class="section">
-		<div class="contentBox">
-			<span class="button"><input type="button" value="{$lang->cmd_remake_cache}" onclick="doRecompileCacheFile(); return false;"/></span>
-			<span class="button"><input type="button" value="{$lang->cmd_clear_session}" onclick="doClearSession(); return false; "/></span>
-		</div>
-	</div>
-
-	{@$_show_modules = false; }
-	<!--@foreach($module_list as $key => $val)-->
-		<!--@if($val->need_install || $val->need_update)-->
-			{@$_show_modules = true; }
-		<!--@end-->
-	<!--@end-->
-	<!--@if($_show_modules)-->
-	<div class="section">
-        <table>
-		<thead>
-			<th colspan="2">{$lang->module}</th>
-		</thead>
-        <tbody>
-        <!--@foreach($module_list as $key => $val)-->
-			<!--@if($val->need_install || $val->need_update)-->
-            <tr>
-                <th><a href="{getUrl('','module','admin','act',$val->admin_index_act)}" title="{trim(htmlspecialchars($val->description))}">{$val->title}</a> ({$val->module})</th>
-                <td class="alert">
-                    <!--@if($val->need_install)-->
-                        <a href="#" onclick="doInstallModule('{$val->module}');return false;" title="{htmlspecialchars($lang->cmd_install)}">{$lang->cmd_install}</a>
-                    <!--@elseif($val->need_update)-->
-                        <a href="#" onclick="doUpdateModule('{$val->module}'); return false;" title="{htmlspecialchars($lang->cmd_update)}">{$lang->cmd_update}</a>
-                    <!--@else-->
-					&nbsp;
-                    <!--@end-->
-                </td>
-            </tr>
-			<!--@end-->
-        <!--@end-->
-        </tbody>
-        </table>
-	</div>
-	<!--@end-->
-
-	<!--@if($news)-->
-    <div class="section">
-        <table>
-		<thead>
-			<th colspan="2">{$lang->newest_news}</th>
-		</thead>
-        <tbody>
-        <!--@foreach($news as $key => $val)-->
-        <tr>
-			<th><a href="{$val->url}" onclick="window.open(this.href);return false;" class="fl">{cut_str($val->title,36)}</a></th>
-            <td><span class="date fr">{zdate($val->date,"y-m-d")}</span></td>
-        </tr>
-        <!--@endforeach-->
-        </tbody>
-        </table>
-	</div>
-	<!--@endif-->
-
-	<div class="section">
-		<form id="fo_addon" action="./" method="get">
-			<input type="hidden" name="addon" value="" />
-		</form>
-		<table>
-		<thead>
-			<tr>
-				<th>{$lang->addon}</th>
-				<th>{$lang->cmd_setup}</th>
-				<th>PC</th>
-				<th>Mobile</th>
-			</tr>
-		</thead>
-		<tbody>
-		<!--@foreach($addon_list as $key => $val)-->
-		<tr>
-			<th><a href="{getUrl('','module','addon','act','dispAddonAdminInfo','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false">{cut_str($val->title,24)}</a></th>
-			<td class="center"><a href="{getUrl('','module','addon','act','dispAddonAdminSetup','selected_addon',$val->addon)}" onclick="popopen(this.href,'addon_info');return false" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
-			<td class="center">
-				<!--@if($val->activated)-->
-				<a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
-				<!--@else-->
-				<a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
-				<!--@end-->
-			</td>
-			<td class="center">
-				<!--@if($val->mactivated)-->
-				<a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}', 'mobile');return false;" title="{htmlspecialchars($lang->use)}" class="buttonSet buttonActive"><span>{$lang->use}</span></a>
-				<!--@else-->
-				<a href="#" onclick="doToggleAddonInAdmin(this, '{$val->addon}', 'mobile');return false;" title="{htmlspecialchars($lang->notuse)}" class="buttonSet buttonDisable"><span>{$lang->notuse}</span></a>
-				<!--@end-->
-			</td>
-		</tr>
-		<!--@end-->
-		</tbody>
-		</table>
-    </div>
-</div>
-
-<!--#include("_footer.html")-->
+<!--#include("./_spHeader.html")-->
+<div class="content dashboard" id="content">
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+	<!--@if(!$isEnviromentGatheringAgreement)-->
+	<form action="./" method="post" class="message info">
+	<input type="hidden" name="module" value="admin" />
+	<input type="hidden" name="act" value="procAdminEnviromentGatheringAgreement" />
+		<h2>{$lang->install_env_agreement}</h2>
+		<p>{$lang->install_env_agreement_desc}</p>
+		<div class="btnArea">
+			<span class="btn"><button type="submit" name="is_agree" value="true">{$lang->agree}</button></span>
+			<span class="btn"><button type="submit" name="is_agree" value="false">{$lang->disagree}</button></span>
+		</div>
+	</form>
+	<!--@end-->
+	<!--@if($isUpdated)-->
+	<div class="message update">
+		<h2>{$lang->update_available}</h2>
+		<ul>
+		<!--@foreach($module_list AS $key => $value)-->
+			<!--@if($value->need_install)-->
+			<li><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$value->module}</a> - <a href="#" onclick="doInstallModule('{$value->module}');return false;">{$lang->cmd_install}</a></li>
+			<!--@else if($value->need_update)-->
+			<li><a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$value->module}</a> - <a href="#" onclick="doUpdateModule('{$value->module}')">{$lang->cmd_update}</a></li>
+			<!--@end-->
+		<!--@end-->
+		</ul>
+	</div>
+	<!--@end-->
+	<div class="section">
+		<div class="portlet">
+			<h2 class="h2">{$lang->current_state}</h2>
+			<ul class="lined">
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminList')}">{$lang->menu_gnb['user']}</a> <span class="side">{number_format($status->member->totalCount)}(<!--@if($status->member->todayCount > 0)-->+<!--@end-->{number_format($status->member->todayCount)})</span></li>
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">{$lang->menu_gnb_sub['document']}</a> <span class="side">{number_format($status->document->totalCount)}(<!--@if($status->document->todayCount > 0)-->+<!--@end-->{number_format($status->document->todayCount)})</span></li>
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispCommentAdminList')}">{$lang->menu_gnb_sub['comment']}</a> <span class="side">{number_format($status->comment->totalCount)}(<!--@if($status->comment->todayCount > 0)-->+<!--@end-->{$status->comment->todayCount})</span></li>
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList')}">{$lang->menu_gnb_sub['trackback']}</a> <span class="side">{number_format($status->trackback->totalCount)}(<!--@if($status->trackback->todayCount > 0)-->+<!--@end-->{$status->trackback->todayCount})</span></li>
+				<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList')}">{$lang->menu_gnb_sub['file']}</a> <span class="side">{number_format($status->file->totalCount)}(<!--@if($status->file->todayCount > 0)-->+<!--@end-->{number_format($status->file->todayCount)})</span></li>
+			</ul>
+		</div>
+		<div class="portlet">
+			<h2 class="h2">{$lang->latest_document}</h2>
+			<ul class="lined">
+				<!--@foreach($latestDocumentList AS $key=>$value)-->
+				{@$document = $value->variables}
+				<li>
+					<a href="{getUrl('', 'document_srl', $document['document_srl'])}" target="_blank"><!--@if(trim($value->getTitle()))-->{$value->getTitle()}<!--@else--><strong>{$lang->no_title_document}</strong><!--@end--></a> <span class="side">{$document['nick_name']}</span>
+					<span class="action">
+						<form>
+						<input type="hidden" name="module" value="admin" />
+						<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
+						<input type="hidden" name="cart[]" value="{$document['document_srl']}" />
+						<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+						<button type="submit" name="type" value="trash" class="text">{$lang->cmd_trash}</button>
+						<button type="submit" name="type" value="delete" class="text">{$lang->cmd_delete}</button>
+						</form>
+					</span>
+				</li>
+				<!--@end-->
+				<li cond="!is_array($latestDocumentList) || count($latestDocumentList) < 1">{$lang->no_data}</li>
+			</ul>
+		</div>
+		<div class="portlet">
+			<h2 class="h2">{$lang->latest_comment}</h2>
+			<ul class="lined">
+				<!--@foreach($latestCommentList AS $key=>$value)-->
+				<li>
+					<a href="{getUrl('', 'document_srl', $value->document_srl)}#comment_{$value->comment_srl}" target="_blank"><!--@if(trim($value->content))-->{$value->getSummary()}<!--@else--><strong>{$lang->no_text_comment}</strong><!--@end--></a> <span class="side">{$value->nick_name}</span> 
+					<span class="action">
+						<form>
+						<input type="hidden" name="module" value="admin" />
+						<input type="hidden" name="act" value="procCommentAdminDeleteChecked" />
+						<input type="hidden" name="cart[]" value="{$value->comment_srl}" />
+						<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+						<button type="submit" name="is_trash" value="true" class="text">{$lang->cmd_trash}</button>
+						<button type="submit" name="is_trash" value="false" class="text">{$lang->cmd_delete}</button>
+						</form>
+					</span>
+				</li>
+				<!--@end-->
+				<li cond="!is_array($latestCommentList) || count($latestCommentList) < 1">{$lang->no_data}</li>
+			</ul>
+		</div>
+		<div class="portlet">
+			<h2 class="h2">{$lang->latest_trackback}</h2>
+			<ul class="lined">
+				<!--@foreach($latestTrackbackList AS $key=>$value)-->
+				<li>
+					<a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{$value->blog_name}</span>
+					<span class="action">
+						<form>
+						<input type="hidden" name="module" value="admin" />
+						<input type="hidden" name="act" value="procTrackbackAdminDeleteChecked" />
+						<input type="hidden" name="cart[]" value="{$value->trackback_srl}" />
+						<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+						<button type="submit" class="text">{$lang->cmd_delete}</button>
+						</form>
+					</span>
+				</li>
+				<!--@end-->
+				<li cond="!is_array($latestTrackbackList) || count($latestTrackbackList) < 1">{$lang->no_data}</li>
+			</ul>
+		</div>
+		<div class="portlet">
+			<h2 class="h2">{$lang->notice}</h2>
+			<ul class="lined">
+				<!--@foreach($news AS $key=>$value)-->
+				<li><a href="{$value->url}" target="_blank">{$value->title}</a> <span class="side">{zdate($value->date, 'Y-m-d')}</span></li>
+				<!--@end-->
+				<li cond="!is_array($news) || count($news) < 1">{$lang->no_data}</li>
+			</ul>
+		</div>
+		<div class="portlet">
+			<h2 class="h2">{$lang->favorite}</h2>
+			<ul class="lined">
+				<li loop="$favorite_list => $favorite">
+					<a href="{getUrl('act', $favorite->admin_index_act)}">{$favorite->title}</a>
+					<form class="action" action="">
+						<input type="hidden" name="module" value="admin" />
+						<input type="hidden" name="act" value="procAdminToggleFavorite" />
+						<input type="hidden" name="site_srl" value="0" />
+						<input type="hidden" name="module_name" value="{$favorite->module}" />
+						<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin')}" />
+						<button type="submit" class="text">{$lang->cmd_delete}</button>
+					</form>
+				</li>
+				<li cond="!is_array($favorite_list) || count($favorite_list) < 1">{$lang->no_data}</li>
+			</UL>
+		</div>
+	</div>
+</div>
+<!--#include("./_spFooter.html")-->
diff --git a/modules/admin/tpl/js/admin.js b/modules/admin/tpl/js/admin.js
index 322232010..684c50eab 100644
--- a/modules/admin/tpl/js/admin.js
+++ b/modules/admin/tpl/js/admin.js
@@ -1,157 +1,1182 @@
-/**
- * @file   admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  admin 모듈의 javascript
- **/
-
-// 캐시파일 모두 재 생성
-function doRecompileCacheFile() {
-    exec_xml("admin","procAdminRecompileCacheFile", new Array(), completeMessage);
-}
-
-// 모듈 목록 오픈
-function toggleModuleMenu(category) {
-	jQuery('#module_'+category).toggleClass('close');
-	
-	var arr = new Array();
-	jQuery('ul.navigation > li').each(function(){
-		var o = jQuery(this);
-		if(!o.hasClass('close')) return;
-		var idx = o.attr('id').replace(/^module_/,'');
-		arr.push(idx);
-	});
-	var expire= new Date();
-	expire.setTime(expire.getTime()+(7000*24*3600000));
-	xSetCookie('XEAM',arr.join(','),expire,'/');
-}
-
-// 메인 모듈/ 애드온 토글
-function toggleModuleAddon(target) {
-	var b = (target == 'module');
-
-	jQuery('#moduleOn').attr('class', b?'on':'');
-	jQuery('#addonOn').attr('class', b?'':'on');
-	jQuery('#xeModules')[b?'show':'hide']();
-	jQuery('#xeAddons')[b?'hide':'show']();
-}
-
-// toggle language list
-function toggleAdminLang() {
-	jQuery('#adminLang').toggleClass('open');
-}
-
-// string to regex(초성검색용)
-function str2regex(str) {
-	// control chars
-	str = str.replace(/([\[\]\{\}\(\)\*\-\+\!\?\^\|\\])/g, '\\$1');
-
-	// find consonants and replace it
-	str = str.replace(/[ㄱ-ㅎ]/g, function(c){
-		var c_order = 'ㄱㄲㄴㄷㄸㄹㅁㅂㅃㅅㅆㅇㅈㅉㅊㅋㅌㅍㅎ'.indexOf(c);
-		var ch_first = String.fromCharCode(0xAC00 + c_order*21*28 + 0 + 0);
-		var ch_last  = String.fromCharCode(0xAC00 + c_order*21*28 + 20*28 + 27);
-
-		return '['+ch_first+'-'+ch_last+']';
-	});
-
-	return new RegExp(str, 'ig');
-}
-
-jQuery(function($){
-	// paint table rows
-    jQuery("table.rowTable tr").attr('class','').filter(":nth-child(even)").attr('class','bg1');
-
-	// set menu tooltip - taggon
-	$('ul.navigation:first > li').each(function(){
-		var texts = [];
-		$(this).find('li').each(function(){
-			texts.push($(this).text());
-		});
-
-		if (!texts.length) return true;
-
-		$(this).find('>a').qtip({
-			content : texts.join(', '),
-			position : {
-				corner : {
-					target:'rightMiddle',
-					tooltip:'leftMiddle'
-				},
-				adjust : {
-					x : -30
-				}
-			},
-			style : {
-				name : 'cream',
-				tip : true,
-				textAlign : 'center',
-				padding : 5,
-				border : {
-					radius : 2
-				}
-			}
-		});
-	});
-
-	// menu search
-	var nav = $('#search_nav + ul.navigation');
-	var inp = $('#search_nav input[type=text]:first');
-	var btn = $('#search_nav button:first');
-	var result = $('<ul class="_result" />');
-
-    if(inp.length == 0) return;
-
-	nav.after( result.hide() );
-
-	inp.keydown(function(event){
-			if (event.keyCode == 27) { // ESC
-				$(this).val('');
-				if ($.browser.msie) $(this).keypress();
-			}
-		})
-		.watch_input({
-			oninput : function() {
-				var str = $.trim( $(this).val() );
-
-				if (str.length == 0) {
-					nav.show();
-					result.hide();
-					btn.removeClass('close');
-					return false;
-				}
-
-				// remove all sub nodes
-				result.empty();
-
-				var regex = str2regex(str);
-				nav.find('li li > a').each(function(){
-					var text = $(this).text();
-
-					if (regex.exec(text) != null) {
-						$(this).parent().clone().appendTo(result);
-					}
-
-					// fix regular expression bug
-					regex.exec('');
-				});
-
-				nav.hide();
-				result.show();
-				btn.addClass('close');
-			}
-		});
-
-	// cancel search
-	btn.click(function(){
-		if ($(this).hasClass('close')) {
-			$(this).removeClass('close');
-
-			inp.focus();
-			inp.val('');
-			inp.keydown();
-		} 
-
-		return false;
-	});
-
-});
+/* NHN (developers@xpressengine.com) */
+jQuery(function($){
+	// Constants
+	var ESC_KEY = 27;
+
+	// Overlapping label
+	$('.form li').find('>input:text,>input:password,>textarea')
+ 		.filter('input[value!=""],textarea:not(:empty)').prev('label').css('visibility','hidden').end().end()
+		.prev('label')
+			.addClass('overlap')
+			.css({top:'15px',left:'5px'})
+			.next()
+				.focus(function(){
+					var $label = $(this).prev().stop().animate({opacity:0, left:'25px'},'fast',function(){ $label.css('visibility','hidden') });
+				})
+				.blur(function(){
+					var $this = $(this), $label;
+					if($.trim($this.val()) == '') {
+						$label = $this.prev().stop().css('visibility','visible').animate({opacity:1, left:'5px'},'fast');
+					}
+				})
+			.end()
+			.parent()
+				.css('position', 'relative');
+
+	// Make selected checkbox elements bold
+	var $rc_label = $('input:radio+label,input:checkbox+label'), $input_rc = $rc_label.prev('input');
+	$input_rc
+		.change(function(){
+			var name = $(this).attr('name');
+			$input_rc
+				.filter(function(){ return this.name == name })
+				.next('label').css('font-weight', 'normal').end()
+				.filter(':checked')
+					.next('label').css('font-weight', 'bold').end();
+		})
+		.change();
+
+	// Toogle checkbox all
+	$('.form th>input:checkbox')
+		.change(function() {
+			var $this = $(this), name = $this.data('name');
+
+			$this.closest('table')
+				.find('input:checkbox')
+					.filter(function(){
+						var $this = $(this);
+						return !$this.prop('disabled') && (($this.attr('name') == name) || ($this.data('name') == name));
+					})
+						.prop('checked', $this.prop('checked'))
+					.end()
+				.end()
+				.trigger('update.checkbox', [name, this.checked]);
+		});
+
+	// pagination
+	$.fn.xePagination = function(){
+		this
+			.not('.xe-pagination')
+			.addClass('xe-pagination')
+			.find('span.tgContent').css('whiteSpace', 'nowrap').end()
+			.find('a.tgAnchor')
+				.each(function(idx){
+					var $this = $(this);
+					$this.after( $($this.attr('href')) );
+				})
+			.end();
+
+		return this;
+	};
+	$('.pagination').xePagination();
+
+	// Portlet Action
+	$('.portlet .action')
+		.css({display:'none',position:'absolute'})
+		.parent()
+			.mouseleave(function(){ $(this).find('>.action').fadeOut(100); })
+			.mouseenter(function(){ $(this).find('>.action').fadeIn(100); })
+			.focusin(function(){ $(this).mouseenter() })
+			.focusout(function(){
+				var $this = $(this), timer;
+
+				clearTimeout($this.data('timer'));
+				timer = setTimeout(function(){ if(!$this.find(':focus').length) $this.mouseleave() }, 10);
+
+				$this.data('timer', timer);
+			});
+
+	// Display the dashboard in two column
+	$(window).resize(function(){
+		if($(document).width() < 1300){
+			$('.dashboard>.section>br').remove();
+			$('.dashboard>.section>.portlet:odd').after('<br style="clear:both" />');
+		} else {
+			$('.dashboard>.section>br').remove();
+			$('.dashboard>.section>.portlet:eq(2),.dashboard>.section>.portlet:eq(5)').after('<br style="clear:both" />');
+		}
+	});
+	$(window).resize();
+
+
+	// Popup list : 'Move to site' and 'Site map'
+	$('.header>.siteTool>a.i')
+		.bind('before-open.tc', function(){
+			$(this)
+				.addClass('active')
+				.next('div.tgContent')
+					.find('>.section:gt(0)').hide().end()
+					.find('>.btnArea>button').show();
+		})
+		.bind('after-close.tc', function(){
+			$(this).removeClass('active');
+		})
+		.next('#siteMapList')
+			.find('>.section:last')
+				.after('<p class="btnArea"><button type="button">&rsaquo; more</button></p>')
+				.find('+p>button')
+					.click(function(){
+						// Display all sections then hide this button
+						$(this).hide().parent().prevAll('.section').show();
+					});
+
+	$.fn.xeMask = function(){
+		this
+			.each(function(){
+				var $this = $(this), text = $this.text();
+				var reg_mail = /^([\w\-\.]+?)@(([\w-]+\.)+[a-z]{2,})$/ig;
+
+				if(reg_mail.test(text)) {
+					$this
+						.html(text.replace(/(@.+)$/, '<span class="ellipsis">...</span><span class="cover">$1</span>'))
+						.find('>.ellipsis')
+							.css({position:'absolute',zIndex:1})
+							.hover(
+								function(){ $(this).next('.cover').mouseover() },
+								function(){ $(this).next('.cover').mouseout() }
+							)
+						.end()
+						.find('>.cover')
+							.css({zIndex:2,opacity:0})
+							.hover(
+								function(){ $(this).css('opacity',1).prev('span').css('visibility','hidden') },
+								function(){ $(this).css('opacity',0).prev('span').css('visibility','visible') }
+							)
+						.end();
+				}
+			})
+	};
+	$('.masked').xeMask();
+});
+
+// Global Navigation Bar
+jQuery(function($){
+
+$.fn.xeMenu = function(){
+	this
+		.removeClass('jx')
+		.attr('role', 'navigation') // WAI-ARIA role
+		.find('li')
+			.attr('role', 'menuitem') // WAI-ARIA role
+			.find('>ul').hide().end()
+			.filter(':has(>ul)')
+				.attr('aria-haspopup', 'true') // WAI-ARIA
+			.end()
+		.end()
+		.delegate('li', {
+			mouseover : function(){
+				$(this)
+					.addClass('active')
+					.find('>ul').show().end()
+					.parentsUntil('.gnb')
+						.filter('li').addClass('active').end()
+					.end()
+			},
+			mouseleave : function(){
+				$(this)
+					.removeClass('active')
+					.find('>ul').hide();
+			},
+			focusout : function(){
+				var $this = $(this);
+				setTimeout(function(){
+					if(!$this.find(':focus').length) {
+						$this.removeClass('active').find('>ul').hide();
+					}
+				}, 1);
+			}
+		})
+		.delegate('a', {
+			focus : function(){
+				$(this).parent('li').mouseover();
+			}
+		});
+};
+
+$('div.gnb').xeMenu();
+
+});
+
+// Modal Window
+jQuery(function($){
+
+var ESC = 27;
+
+$.fn.xeModalWindow = function(){
+	this
+		.not('.xe-modal-window')
+		.addClass('xe-modal-window')
+		.each(function(){
+			$( $(this).attr('href') ).addClass('x').hide();
+		})
+		.click(function(){
+			var $this = $(this), $modal, $btnClose, disabled;
+
+			// get and initialize modal window
+			$modal = $( $this.attr('href') );
+			if(!$modal.parent('body').length) {
+				$btnClose = $('<button type="button" class="modalClose" title="Close this layer">X</button>');
+				$btnClose.click(function(){ $modal.data('anchor').trigger('close.mw') });
+
+				$modal
+					.prepend('<span class="bg"></span>')
+					.append('<!--[if IE 6]><iframe class="ie6"></iframe><![endif]-->')
+					.find('>.fg')
+						.prepend($btnClose)
+						.append($btnClose.clone(true))
+					.end()
+					.appendTo('body');
+			}
+
+			// set the related anchor
+			$modal.data('anchor', $this);
+
+			if($modal.data('state') == 'showing') {
+				$this.trigger('close.mw');
+			} else {
+				$this.trigger('open.mw');
+			}
+
+			return false;
+		})
+		.bind('open.mw', function(){
+			var $this = $(this), before_event, $modal, duration;
+
+			// before event trigger
+			before_event = $.Event('before-open.mw');
+			$this.trigger(before_event);
+
+			// is event canceled?
+			if(before_event.isDefaultPrevented()) return false;
+
+			// get modal window
+			$modal = $( $this.attr('href') );
+
+			// get duration
+			duration = $this.data('duration') || 'fast';
+
+			// set state : showing
+			$modal.data('state', 'showing');
+
+			// workaroud for IE6
+			$('html,body').addClass('modalContainer');
+
+			// after event trigger
+			function after(){ $this.trigger('after-open.mw') };
+
+			$(document).bind('keydown.mw', function(event){
+				if(event.which == ESC) {
+					$this.trigger('close.mw');
+					return false;
+				}
+			});
+
+			$modal
+				.fadeIn(duration, after)
+				.find('>.bg').height($(document).height()).end()
+				.find('button.modalClose:first').focus();
+		})
+		.bind('close.mw', function(){
+			var $this = $(this), before_event, $modal, duration;
+
+			// before event trigger
+			before_event = $.Event('before-close.mw');
+			$this.trigger(before_event);
+
+			// is event canceled?
+			if(before_event.isDefaultPrevented()) return false;
+
+			// get modal window
+			$modal = $( $this.attr('href') );
+
+			// get duration
+			duration = $this.data('duration') || 'fast';
+
+			// set state : hiding
+			$modal.data('state', 'hiding');
+
+			// workaroud for IE6
+			$('html,body').removeClass('modalContainer');
+
+			// after event trigger
+			function after(){ $this.trigger('after-close.mw') };
+
+			$modal.fadeOut(duration, after);
+			$this.focus();
+		});
+};
+$('a.modalAnchor').xeModalWindow();
+$('div.modal').addClass('x').hide();
+
+});
+
+// Content Toggler
+jQuery(function($){
+
+var dont_close_this_time = false;
+var ESC = 27;
+
+$.fn.xeContentToggler = function(){
+	this
+		.not('.xe-content-toggler')
+		.addClass('xe-content-toggler')
+		.each(function(){
+			var $anchor = $(this); $layer = $($anchor.attr('href'));
+
+			$layer.hide()
+				.not('.xe-toggling-content')
+				.addClass('xe-toggling-content')
+				.mousedown(function(event){ dont_close_this_time = true })
+				.focusout(function(event){
+					setTimeout(function(){
+						if(!dont_close_this_time && !$layer.find(':focus').length && $layer.data('state') == 'showing') $anchor.trigger('close.tc');
+						dont_close_this_time = false;
+					}, 1);
+				});
+		})
+		.click(function(){
+			var $this = $(this), $layer;
+
+			// get content container
+			$layer = $( $this.attr('href') );
+
+			// set anchor object
+			$layer.data('anchor', $this);
+
+			if($layer.data('state') == 'showing') {
+				$this.trigger('close.tc');
+			} else {
+				$this.trigger('open.tc');
+			}
+
+			return false;
+		})
+		.bind('open.tc', function(){
+			var $this = $(this), $layer, effect, duration;
+
+			// get content container
+			$layer = $( $this.attr('href') );
+
+			// get effeect
+			effect = $this.data('effect');
+
+			// get duration
+			duration = $this.data('duration') || 'fast';
+
+			// set state : showing
+			$layer.data('state', 'showing');
+
+			// before event trigger
+			$this.trigger('before-open.tc');
+
+			dont_close_this_time = false;
+
+			// When mouse button is down or when ESC key is pressed close this layer
+			$(document)
+				.unbind('mousedown.tc keydown.tc')
+				.bind('mousedown.tc keydown.tc',
+					function(event){
+						if(event) {
+							if(event.type == 'keydown' && event.which != ESC) return true;
+							if(event.type == 'mousedown') {
+								var $t = $(event.target);
+								if($t.is('html,.tgAnchor,.tgContent') || $layer.has($t).length) return true;
+							}
+						}
+
+						$this.trigger('close.tc');
+
+						return false;
+					}
+				);
+
+			// triggering after
+			function trigger_after(){ $this.trigger('after-open.tc') }
+
+			switch(effect) {
+				case 'slide':
+					$layer.slideDown(duration, trigger_after);
+					break;
+				case 'slide-h':
+					var w = $layer.css({'overflow-x':'',width:''}).width();
+					$layer
+						.show()
+						.css({'overflow-x':'hidden',width:'0px'})
+						.animate({width:w}, duration, function(){ $layer.css({'overflow-x':'',width:''}); trigger_after(); });
+					break;
+				case 'fade':
+					$layer.fadeIn(duration, trigger_after);
+					break;
+				default:
+					$layer.show();
+					$this.trigger('after-open.tc');
+			}
+		})
+		.bind('close.tc', function(){
+			var $this = $(this), $layer, effect, duration;
+
+			// unbind document's event handlers
+			$(document).unbind('mousedown.tc keydown.tc');
+
+			// get content container
+			$layer = $( $this.attr('href') );
+
+			// get effeect
+			effect = $this.data('effect');
+
+			// get duration
+			duration = $this.data('duration') || 'fast';
+
+			// set state : hiding
+			$layer.data('state', 'hiding');
+
+			// before event trigger
+			$this.trigger('before-close.tc');
+
+			// triggering after
+			function trigger_after(){ $this.trigger('after-close.tc') };
+
+			// close this layer
+			switch(effect) {
+				case 'slide':
+					$layer.slideUp(duration, trigger_after);
+					break;
+				case 'slide-h':
+					$layer.animate({width:0}, duration, function(){ $layer.hide(); trigger_after(); });
+					break;
+				case 'fade':
+					$layer.fadeOut(duration, trigger_after);
+					break;
+				default:
+					$layer.hide();
+					$this.trigger('after-close.tc');
+			}
+		});
+
+	return this;
+};
+
+$('a.tgAnchor').xeContentToggler();
+
+});
+
+// Module finder
+jQuery(function($){
+
+$.fn.xeModuleFinder = function(){
+	this
+		.not('.xe-module-finder')
+		.addClass('xe-module-finder')
+		.find('a.tgAnchor.findsite')
+			.bind('before-open.tc', function(){
+				var $this, $ul, val;
+
+				$this = $(this);
+				$ul   = $($this.attr('href')).find('>ul');
+				val   = $this.prev('input:text').val();
+
+				function on_complete(data) {
+					var $li, list = data.site_list, i, c;
+
+					$ul.empty();
+					$this.closest('.modulefinder').find('.moduleList,.moduleIdList').attr('disabled','disabled');
+
+					if(data.error || !$.isArray(list)) {
+						$this.trigger('close.tc');
+						return;
+					}
+
+					for(i=0,c=list.length; i < c; i++) {
+						$li = $('<li />').appendTo($ul);
+						$('<button type="button" />').text(list[i].domain).data('site_srl', list[i].site_srl).appendTo($li);
+					}
+				};
+
+				$.exec_json('admin.getSiteAllList', {domain:val}, on_complete);
+			})
+		.end()
+		.find('.tgContent.suggestion')
+			.delegate('button','click',function(){
+				var $this, $finder;
+
+				$this    = $(this);
+				$finder  = $this.closest('.modulefinder');
+
+				function on_complete(data) {
+					var $mod_select, list = data.module_list, x;
+
+					if(data.error || !list) return;
+
+					$mod_select = $finder.find('.moduleList').data('module_list', list).removeAttr('disabled').empty();
+					for(x in list) {
+						if(!list.hasOwnProperty(x)) continue;
+						$('<option />').attr('value', x).text(list[x].title).appendTo($mod_select);
+					}
+					$mod_select.prop('selectedIndex', 0).change().focus();
+
+					if(!$mod_select.is(':visible')) {
+						$mod_select
+							.slideDown(100, function(){
+								$finder.find('.moduleIdList:not(:visible)').slideDown(100).trigger('show');
+							})
+							.trigger('show');
+					}
+				};
+
+				$finder.find('a.tgAnchor.findsite').trigger('close.tc');
+
+				$.exec_json('module.procModuleAdminGetList', {site_srl:$this.data('site_srl')}, on_complete);
+			})
+		.end()
+		.find('.moduleList,.moduleIdList').hide().end()
+		.find('.moduleList')
+			.change(function(){
+				var $this, $mid_select, val, list;
+
+				$this   = $(this);
+				val     = $this.val();
+				list    = $this.data('module_list');
+
+				if(!list[val]) return;
+
+				list = list[val].list;
+				$mid_select = $this.closest('.modulefinder').find('.moduleIdList').removeAttr('disabled').empty();
+
+				for(var x in list) {
+					if(!list.hasOwnProperty(x)) continue;
+					$('<option />').attr('value', list[x].module_srl).text(list[x].browser_title).appendTo($mid_select);
+				}
+				$mid_select.prop('selectedIndex', 0).change();
+			});
+
+	return this;
+};
+$('.modulefinder').xeModuleFinder();
+
+});
+
+// Sortable table
+jQuery(function($){
+
+var
+	dragging = false,
+	$holder  = $('<tr class="placeholder"><td>&nbsp;</td></tr>');
+
+$.fn.xeSortableTable = function(){
+	this
+		.not('.xe-sortable-table')
+		.addClass('xe-sortable-table')
+		.delegate('button.dragBtn', 'mousedown.st', function(event){
+			var $this, $tr, $table, $th, height, width, offset, position, offsets, i, dropzone, cols, ofspar;
+
+			if(event.which != 1) return;
+
+			$this  = $(this);
+			$tr    = $this.closest('tr');
+			$table = $this.closest('table');
+			ofspar = $table.get(0).offsetParent;
+			height = $tr.height();
+			width  = $tr.width();
+
+			// before event trigger
+			before_event = $.Event('before-drag.st');
+			$table.trigger(before_event);
+
+			// is event canceled?
+			if(before_event.isDefaultPrevented()) return false;
+
+			position = {x:event.pageX, y:event.pageY};
+			offset   = getOffset($tr.get(0), ofspar);
+
+			$clone = $tr.attr('target', true).clone(true).appendTo($table);
+
+			// get colspan
+			cols = ($th=$table.find('thead th')).length;
+			$th.filter('[colspan]').attr('colspan', function(idx,attr){ cols += attr - 1; });
+			$holder.find('td').attr('colspan', cols);
+
+			// get offsets of all list-item elements
+			offsets = [];
+			$table.find('tbody>tr:not([target],.sticky,:hidden)').each(function() {
+				var $this = $(this), o;
+
+				o = getOffset(this, ofspar);
+				offsets.push({top:o.top, bottom:o.top+$this.height(), $item:$this});
+			});
+
+			$clone
+				.addClass('draggable')
+				.css({
+					position: 'absolute',
+					opacity : .6,
+					width   : width,
+					height  : height,
+					left    : offset.left,
+					top     : offset.top,
+					zIndex  : 100
+				});
+
+			// Set a place holder
+			$holder
+				.css({
+					position:'absolute',
+					opacity : .6,
+					width   : width,
+					height  : '10px',
+					left    : offset.left,
+					top     : offset.top,
+					backgroundColor : '#bbb',
+					overflow: 'hidden',
+					zIndex  : 99
+				})
+				.appendTo($table);
+
+			$tr.css('opacity', .6);
+
+			$(document)
+				.unbind('mousedown.st mouseup.st')
+				.bind('mousemove.st', function(event) {
+					var diff, nTop, item, i, c, o;
+
+					dropzone = null;
+
+					diff = {x:position.x-event.pageX, y:position.y-event.pageY};
+					nTop = offset.top - diff.y;
+
+					for(i=0,c=offsets.length; i < c; i++) {
+						o = offsets[i];
+						if( (i && o.top > nTop) || ((i < c-1) && o.bottom < nTop)) continue;
+
+						dropzone = {element:o.$item};
+						if(o.top > nTop - 12) {
+							dropzone.state = 'before';
+							$holder.css('top', o.top-5);
+						} else {
+							dropzone.state = 'after';
+							$holder.css('top', o.bottom-5);
+						}
+					}
+
+					$clone.css({top:nTop});
+				})
+				.bind('mouseup.st', function(event) {
+					var $dropzone;
+
+					dragging = false;
+
+					$(document).unbind('mousemove.st mouseup.st');
+					$tr.removeAttr('target').css('opacity', '');
+					$clone.remove();
+					$holder.remove();
+
+					if(!dropzone) return;
+					$dropzone = $(dropzone.element);
+
+					// use the clone for animation
+					$dropzone[dropzone.state]($tr);
+
+					$table.trigger('after-drag.st');
+				});
+		})
+
+	return this;
+};
+$('table.sortable').xeSortableTable();
+
+
+function getOffset(elem, offsetParent) {
+	var top = 0, left = 0;
+
+	while(elem && elem != offsetParent) {
+		top  += elem.offsetTop;
+		left += elem.offsetLeft;
+
+		elem = elem.offsetParent;
+	}
+
+	return {top:top, left:left};
+}
+
+});
+
+// Language selector
+jQuery(function($){
+
+var w_timer = null, r_timer = null, r_idx = 0, f_timer = null, skip_textchange=false, keep_showing=false, $suggest;
+var ESC=27, UP=38, DOWN=40, ENTER=13;
+
+$('.multiLangEdit')
+	.delegate('input.vLang:text,textarea.vLang', {
+		textchange : function(){
+			var $this = $(this), val = $.trim($this.val()), $ul, $container;
+
+			if(r_timer) {
+				clearTimeout(r_timer);
+				r_timer = null;
+			}
+
+			$container = $this.data('mle-container');
+			$ul        = $suggest.find('>ul');
+
+			if(!val || skip_textchange) {
+				skip_textchange = false;
+				$ul.parent().hide();
+				$this.prev('input.vLang').val('');
+				return;
+			}
+
+			// remove lagnauge key
+			$this.data('mle-langkey').val('');
+			
+			// copy current string to hidden input
+			$this.prev('input.vLang').val(val);
+
+			function request() {
+				$this.addClass('loading');
+
+				if($ul.parent().is(':visible')) $ul.parent().hide();
+
+				show_waiting_message = false;
+				$.exec_json(
+					'module.getLangListByLangcodeForAutoComplete',
+					{search_keyword:val},
+					(function(i){ return function(data){ on_complete(data,i) } })(r_idx++)
+				);
+				show_waiting_message = true;
+			};
+
+			function on_complete(data, idx){
+				var results = data.results, $btn, i, c;
+
+				if(data.error || !results || (r_idx != idx+1)) return;
+
+				$this.removeClass('loading');
+
+				$ul.empty();
+				for(i=0,c=results.length; i < c; i++) {
+					$btn = $('<button type="button" class="_btnLang" />').data('langkey', results[i].name).text(results[i].value);
+					$('<li />').append($btn).appendTo($ul);
+				}
+				$suggest.trigger('show');
+			};
+
+			r_timer = setTimeout(request, 100);
+		},
+		keydown : function(event){
+			var $this, $ul, $active, $after, key = event.which;
+
+			$this = $(this);
+			$ul   = $suggest.find('>ul');
+
+			if(!$suggest.is(':visible') || $.inArray(key, [UP,DOWN,ENTER,ESC]) < 0) return true;
+
+			if(key == ESC) {
+				$suggest.trigger('hide');
+				return false;
+			}
+
+			$active = $ul.find('button.active');
+
+			if(key == ENTER) {
+				$active.click();
+				return false;
+			}
+
+			if(!$active.length) {
+				$ul.find('li>button:first').addClass('active');
+				return false;
+			}
+
+			// Move the cursor
+			if(key == UP) {
+				$after = $active.parent().prev('li').find('>button');
+				if(!$after.length) $after = $ul.find('>li:last>button');
+			} else if(key == DOWN) {
+				$after = $active.parent().next('li').find('>button');
+				if(!$after.length) $after = $ul.find('>li:first>button');
+			}
+
+			$active.removeClass('active');
+			$after.addClass('active');
+
+			return false;
+		},
+		focus : function(){
+			var $this = $(this), oldValue = $.trim($this.val()), $mle = $this.closest('.multiLangEdit');
+
+			$this.after($suggest);
+			if(!$this.data('mle-container')) $this.data('mle-container', $mle);
+			if(!$this.data('mle-langkey')) $this.data('mle-langkey', $mle.find('input.vLang:first'));
+
+			(function(){
+				var value = $.trim($this.val());
+
+				if(value != oldValue) {
+					oldValue = value;
+					$this.trigger('textchange');
+				}
+				w_timer = setTimeout(arguments.callee, 50);
+			})();
+		},
+		blur : function(){
+			clearTimeout(w_timer);
+			w_timer = null;
+
+			$(this).closest('.multiLangEdit').focusout();
+		},
+		focusout : function(){
+			var $this = $(this);
+
+			clearTimeout(f_timer);
+			f_timer = setTimeout(function(){
+				if(keep_showing) {
+					keep_showing = false;
+					return;
+				}
+				if(!$this.find(':focus').is('.vLang,button._btnLang')) $suggest.trigger('hide');
+			}, 10);
+		}
+	})
+	.delegate('a.tgAnchor.editUserLang', {
+		'before-open.tc' : function(){
+			var $this, $layer, $mle, $vlang, key, text, api, params;
+
+			$this  = $(this);
+			$layer = $($this.attr('href')).insertBefore($this);
+			$mle   = $this.closest('.multiLangEdit');
+			$vlang = $mle.find('input.vLang,textarea.vLang');
+
+			key  = $vlang.eq(0).val();
+			text = $vlang.eq(1).val();
+
+			// initialize the layer
+			initLayer($layer);
+
+			// reset
+			$layer.trigger('multilang-reset').removeClass('showChild').find('.langList').empty().end();
+			$layer.find('.langInput li.'+xe.current_lang).find('>input:text,>textarea').val(text).prev('label').css('visibility','hidden');
+
+			// hide suggestion layer
+			$suggest.trigger('hide');
+
+			if(/^\$user_lang->(.+)$/.test(key)) {
+				api = 'module.getModuleAdminLangListByName';
+				params = {lang_name:RegExp.$1};
+			} else {
+				api = 'module.getModuleAdminLangListByValue';
+				params = {value:text};
+			}
+
+			function on_complete(data) {
+				var list = data.lang_list, obj, i, c, name, $langlist;
+
+				if(data.error || !list) return;
+
+				list = extractList(list);
+
+				// set data
+				$layer.data('multilang-list', list);
+
+				// make language list
+				$langlist = $layer.find('.langList');
+				$.each(list, function(key){
+					var $li = $('<li />').appendTo($langlist);
+
+					var anchor_id = $layer.data('layer_index');
+					$('<a href="#langInput_'+anchor_id+'" class="langItem" />')
+						.text(this[xe.current_lang])
+						.data('multilang-name', key)
+						.appendTo($li);
+				});
+
+				if(count(list) > 1) $layer.addClass('showChild');
+
+				$layer.find('.langList>li>a:first').click();
+
+			};
+
+			show_waiting_message = false;
+			$.exec_json(api, params, on_complete);
+			show_waiting_message = true;
+		}
+	})
+	.delegate('button._btnLang', {
+		click : function(){
+			var $this = $(this);
+
+			skip_textchange = true;
+
+			$suggest.trigger('hide');
+
+			$this.closest('.multiLangEdit')
+				.find('input.vLang,textarea.vLang')
+					.eq(0).val($this.data('langkey')).end()
+					.eq(1).val($this.text()).end();
+
+			return false;
+		},
+		mousedown : function(){ keep_showing = true },
+		focus : function(){
+			$(this).mouseover();
+		},
+		mouseover : function(){
+			$(this).closest('ul').find('button.active').removeClass('active');
+		}
+	});
+
+$suggest = $('<div class="suggestion"><ul></ul></div>')
+	.bind('show', function(){
+		$(this).show();
+	})
+	.bind('hide', function(){
+		$(this).hide();
+	});
+
+var layer_index = 0;
+function initLayer($layer) {
+	var $submit, $input, value='', current_status = 0, mode, cmd_add, cmd_edit, status_texts=[];
+	var USE = 0, UPDATE_AND_USE = 1, MODE_SAVE = 0, MODE_UPDATE = 1;
+
+	if($layer.data('init-multilang-editor')) return;
+
+	$layer
+		.data('init-multilang-editor', true)
+		.bind('multilang-reset', function(){
+			$layer
+				.data('multilang-current-name', '')
+				.find('.langInput li').find('>input:text,>textarea').val(' ').prev('label').css('visibility','visible');
+
+			mode = MODE_SAVE;
+			setTitleText();
+		})
+		.find('h2 a')
+			.click(function(){
+				mode = !mode;
+				setTitleText();
+
+				return false;
+			})
+		.end()
+		.delegate('a.langItem', 'click', function(){
+			var $this = $(this), $controls, list, name, i, c;
+
+			list = $layer.data('multilang-list');
+			name = $this.data('multilang-name');
+
+			if(!list || !list[name]) return;
+			list = list[name];
+
+			$controls = $layer.find('.langInput');
+
+			$layer
+				.trigger('multilang-reset') // reset
+				.find('.langList li.active').removeClass('active').end()
+				.data('multilang-current-name', name);
+
+			$this.parent('li').addClass('active');
+
+			for(var code in list) {
+				if(!list.hasOwnProperty(code)) continue;
+				$controls.find('li.'+code).find('>input:text,>textarea').data('multilang-value',list[code]).val(list[code]).prev('label').css('visibility','hidden');
+			}
+
+			value = get_value();
+
+			current_status = 0;
+			$submit.val(status_texts[current_status]);
+
+			mode = MODE_UPDATE;
+			setTitleText();
+
+			return false;
+		})
+		.data('layer_index', layer_index)
+		.find('.langInput').attr('id', 'langInput_' + layer_index++);
+
+	cmd_edit = $layer.find('h2 strong').text();
+	cmd_add  = $layer.find('h2 a').text();
+
+	$input = $layer.find('input:text,textarea')
+		.change(function(){
+			var status = (get_value() == value)?USE:UPDATE_AND_USE;
+
+			if(status != current_status) {
+				$submit.val(status_texts[current_status=status]);
+			}
+		});
+
+	function get_value() {
+		var text = [];
+		$input.each(function(){ text.push(this.value); });
+		return text.join('\n');
+	};
+
+	function setTitleText() {
+		if(!$layer.data('multilang-current-name')) {
+			$layer.find('h2').find('strong').text(cmd_add).end().find('a').hide();
+		} else {
+			$layer.find('h2')
+				.find('strong').text(mode==MODE_SAVE?cmd_add:cmd_edit).end()
+				.find('a').text(mode==MODE_SAVE?cmd_edit:cmd_add).show().end();
+		}
+	};
+
+	// process the submit button
+	$submit = $layer.find('input[type=submit]')
+		.click(function(){
+			var name = $layer.data('multilang-current-name');
+
+			function use_lang() {
+				$layer.hide().closest('.multiLangEdit').find('.vLang')
+					.eq(0).val('$user_lang->'+name).end()
+					.eq(1).val($layer.find('.langInput li.'+xe.current_lang).find('>input:text,>textarea').val()).end();
+			};
+
+			function save_lang() {
+				var params = {};
+ 				if(name && mode == MODE_UPDATE) params.lang_name = name;
+
+ 				$input.each(function(k,v){ var $this = $(this); params[$this.parent('li').attr('class')] = $this.val() });
+
+ 				$.exec_json('module.procModuleAdminInsertLang', params, on_complete);
+			};
+
+			function on_complete(data) {
+				if(!data || data.error || !data.name) return;
+
+				name = data.name;
+				use_lang();
+			};
+
+			(get_value() == value) ? use_lang() : save_lang();
+
+
+			return false;
+		});
+	status_texts = $submit.val().split('|');
+	$submit.val(status_texts[USE]);
+};
+
+function extractList(list) {
+	var i, c, obj={}, item;
+
+	for(i=0,c=list.length; i < c; i++) {
+		item = list[i];
+
+		if(!obj[item.name]) obj[item.name] = {};
+
+		obj[item.name][item.lang_code] = item.value;
+	}
+
+	return obj;
+};
+
+function count(obj) {
+	var size = 0;
+	for(var x in obj) {
+		if(obj.hasOwnProperty(x)) size++;
+	}
+	return size;
+};
+
+});
+
+// filebox
+jQuery(function($){
+
+$('.filebox')
+	.bind('before-open.mw', function(){
+		var $this, $list, $parentObj;
+		var anchor;
+
+		$this = $(this);
+		anchor = $this.attr('href');
+
+		$list = $(anchor).find('.filebox_list');
+
+		function on_complete(data){
+			$list.html(data.html);
+
+			$list.find('.lined .select')
+				.bind('click', function(event){
+					var selectedImgSrc = $(this).parent().find('img.filebox_item').attr('src');
+					$this.trigger('filebox.selected', [selectedImgSrc]);
+					$this.trigger('close.mw');
+					return false;
+				});
+
+			$list.find('.pagination')
+				.find('a')
+				.filter(function(){
+					if ($(this).hasClass('tgAnchor')) return false;
+					return true;
+				})
+				.bind('click', function(){
+					var page = $(this).attr('page');
+
+					$.exec_json('module.getFileBoxListHtml', {'page': page}, on_complete);
+					$(window).scrollTop($(anchor).find('.modalClose').offset().top);
+					return false;
+				});
+
+			$('#FileBoxGoTo')
+				.find('button')
+				.bind('click', function(){
+					var page = $(this).prev('input').val();
+
+					$.exec_json('module.getFileBoxListHtml', {'page': page}, on_complete);
+					$(window).scrollTop($(anchor).find('.modalClose').offset().top);
+					return false;
+				});
+		}
+
+		$.exec_json('module.getFileBoxListHtml', {'page': '1'}, on_complete);
+	});
+
+});
+
+/* insert fog layer */
+function showWaitingFogLayer() {
+	var $bg = jQuery('<span class="bg"></span>');
+	$bg.height(jQuery(window).height());
+	jQuery('.wfsr')
+		.wrap('<div class="wfsr_fog" />')
+		.before($bg);
+}
+
+function hideWaitingFogLayer() {
+	jQuery('.wfsr').prev('span').remove();
+	jQuery('.wfsr').unwrap();
+}
+
+/* install module */
+function doInstallModule(module) {
+    var params = new Array();
+    params['module_name'] = module;
+    exec_xml('install','procInstallAdminInstall',params, completeInstallModule);
+	showWaitingFogLayer();
+}
+
+/* upgrade module */
+function doUpdateModule(module) {
+    var params = new Array();
+    params['module_name'] = module;
+    exec_xml('install','procInstallAdminUpdate',params, completeInstallModule);
+	showWaitingFogLayer();
+}
+
+function completeInstallModule(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+jQuery(document).ready(function($){
+	$('body').ajaxComplete(function(){ hideWaitingFogLayer() });
+});
+
+/* admin single column layout */
+jQuery(function($){
+	if($('.x>.body>.lnb').length == 0){ // When it have no lnb
+		$('.x>.body>.content').addClass('single'); // Add class single
+	}
+});
diff --git a/modules/admin/tpl/js/admin.min.js b/modules/admin/tpl/js/admin.min.js
new file mode 100644
index 000000000..ce047bad5
--- /dev/null
+++ b/modules/admin/tpl/js/admin.min.js
@@ -0,0 +1,38 @@
+jQuery(function(a){a(".form li").find(">input:text,>input:password,>textarea").filter('input[value!=""],textarea:not(:empty)').prev("label").css("visibility","hidden").end().end().prev("label").addClass("overlap").css({top:"15px",left:"5px"}).next().focus(function(){var b=a(this).prev().stop().animate({opacity:0,left:"25px"},"fast",function(){b.css("visibility","hidden")})}).blur(function(){var b=a(this);a.trim(b.val())==""&&b.prev().stop().css("visibility","visible").animate({opacity:1,left:"5px"},
+"fast")}).end().parent().css("position","relative");var c=a("input:radio+label,input:checkbox+label").prev("input");c.change(function(){var b=a(this).attr("name");c.filter(function(){return this.name==b}).next("label").css("font-weight","normal").end().filter(":checked").next("label").css("font-weight","bold").end()}).change();a(".form th>input:checkbox").change(function(){var b=a(this),d=b.data("name");b.closest("table").find("input:checkbox").filter(function(){var b=a(this);return!b.prop("disabled")&&
+(b.attr("name")==d||b.data("name")==d)}).prop("checked",b.prop("checked")).end().end().trigger("update.checkbox",[d,this.checked])});a.fn.xePagination=function(){this.not(".xe-pagination").addClass("xe-pagination").find("span.tgContent").css("whiteSpace","nowrap").end().find("a.tgAnchor").each(function(){var b=a(this);b.after(a(b.attr("href")))}).end();return this};a(".pagination").xePagination();a(".portlet .action").css({display:"none",position:"absolute"}).parent().mouseleave(function(){a(this).find(">.action").fadeOut(100)}).mouseenter(function(){a(this).find(">.action").fadeIn(100)}).focusin(function(){a(this).mouseenter()}).focusout(function(){var b=
+a(this),d;clearTimeout(b.data("timer"));d=setTimeout(function(){b.find(":focus").length||b.mouseleave()},10);b.data("timer",d)});a(window).resize(function(){a(document).width()<1300?(a(".dashboard>.section>br").remove(),a(".dashboard>.section>.portlet:odd").after('<br style="clear:both" />')):(a(".dashboard>.section>br").remove(),a(".dashboard>.section>.portlet:eq(2),.dashboard>.section>.portlet:eq(5)").after('<br style="clear:both" />'))});a(window).resize();a(".header>.siteTool>a.i").bind("before-open.tc",
+function(){a(this).addClass("active").next("div.tgContent").find(">.section:gt(0)").hide().end().find(">.btnArea>button").show()}).bind("after-close.tc",function(){a(this).removeClass("active")}).next("#siteMapList").find(">.section:last").after('<p class="btnArea"><button type="button">&rsaquo; more</button></p>').find("+p>button").click(function(){a(this).hide().parent().prevAll(".section").show()});a.fn.xeMask=function(){this.each(function(){var b=a(this),d=b.text();/^([\w\-\.]+?)@(([\w-]+\.)+[a-z]{2,})$/ig.test(d)&&
+b.html(d.replace(/(@.+)$/,'<span class="ellipsis">...</span><span class="cover">$1</span>')).find(">.ellipsis").css({position:"absolute",zIndex:1}).hover(function(){a(this).next(".cover").mouseover()},function(){a(this).next(".cover").mouseout()}).end().find(">.cover").css({zIndex:2,opacity:0}).hover(function(){a(this).css("opacity",1).prev("span").css("visibility","hidden")},function(){a(this).css("opacity",0).prev("span").css("visibility","visible")}).end()})};a(".masked").xeMask()});
+jQuery(function(a){a.fn.xeMenu=function(){this.removeClass("jx").attr("role","navigation").find("li").attr("role","menuitem").find(">ul").hide().end().filter(":has(>ul)").attr("aria-haspopup","true").end().end().delegate("li",{mouseover:function(){a(this).addClass("active").find(">ul").show().end().parentsUntil(".gnb").filter("li").addClass("active").end().end()},mouseleave:function(){a(this).removeClass("active").find(">ul").hide()},focusout:function(){var c=a(this);setTimeout(function(){c.find(":focus").length||
+c.removeClass("active").find(">ul").hide()},1)}}).delegate("a",{focus:function(){a(this).parent("li").mouseover()}})};a("div.gnb").xeMenu()});
+jQuery(function(a){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 c=a(this),b,d;b=a(c.attr("href"));b.parent("body").length||(d=a('<button type="button" class="modalClose" title="Close this layer">X</button>'),d.click(function(){b.data("anchor").trigger("close.mw")}),b.prepend('<span class="bg"></span>').append('<\!--[if IE 6]><iframe class="ie6"></iframe><![endif]--\>').find(">.fg").prepend(d).append(d.clone(true)).end().appendTo("body"));
+b.data("anchor",c);b.data("state")=="showing"?c.trigger("close.mw"):c.trigger("open.mw");return false}).bind("open.mw",function(){var c=a(this),b,d;b=a.Event("before-open.mw");c.trigger(b);if(b.isDefaultPrevented())return false;b=a(c.attr("href"));d=c.data("duration")||"fast";b.data("state","showing");a("html,body").addClass("modalContainer");a(document).bind("keydown.mw",function(a){if(a.which==27)return c.trigger("close.mw"),false});b.fadeIn(d,function(){c.trigger("after-open.mw")}).find(">.bg").height(a(document).height()).end().find("button.modalClose:first").focus()}).bind("close.mw",
+function(){var c=a(this),b,d;b=a.Event("before-close.mw");c.trigger(b);if(b.isDefaultPrevented())return false;b=a(c.attr("href"));d=c.data("duration")||"fast";b.data("state","hiding");a("html,body").removeClass("modalContainer");b.fadeOut(d,function(){c.trigger("after-close.mw")});c.focus()})};a("a.modalAnchor").xeModalWindow();a("div.modal").addClass("x").hide()});
+jQuery(function(a){var c=false;a.fn.xeContentToggler=function(){this.not(".xe-content-toggler").addClass("xe-content-toggler").each(function(){var b=a(this);$layer=a(b.attr("href"));$layer.hide().not(".xe-toggling-content").addClass("xe-toggling-content").mousedown(function(){c=true}).focusout(function(){setTimeout(function(){!c&&!$layer.find(":focus").length&&$layer.data("state")=="showing"&&b.trigger("close.tc");c=false},1)})}).click(function(){var b=a(this),d;d=a(b.attr("href"));d.data("anchor",
+b);d.data("state")=="showing"?b.trigger("close.tc"):b.trigger("open.tc");return false}).bind("open.tc",function(){function b(){d.trigger("after-open.tc")}var d=a(this),g,f,e;g=a(d.attr("href"));f=d.data("effect");e=d.data("duration")||"fast";g.data("state","showing");d.trigger("before-open.tc");c=false;a(document).unbind("mousedown.tc keydown.tc").bind("mousedown.tc keydown.tc",function(b){if(b){if(b.type=="keydown"&&b.which!=27)return true;if(b.type=="mousedown"&&(b=a(b.target),b.is("html,.tgAnchor,.tgContent")||
+g.has(b).length))return true}d.trigger("close.tc");return false});switch(f){case "slide":g.slideDown(e,b);break;case "slide-h":f=g.css({"overflow-x":"",width:""}).width();g.show().css({"overflow-x":"hidden",width:"0px"}).animate({width:f},e,function(){g.css({"overflow-x":"",width:""});b()});break;case "fade":g.fadeIn(e,b);break;default:g.show(),d.trigger("after-open.tc")}}).bind("close.tc",function(){function b(){d.trigger("after-close.tc")}var d=a(this),c,f,e;a(document).unbind("mousedown.tc keydown.tc");
+c=a(d.attr("href"));f=d.data("effect");e=d.data("duration")||"fast";c.data("state","hiding");d.trigger("before-close.tc");switch(f){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(),d.trigger("after-close.tc")}});return this};a("a.tgAnchor").xeContentToggler()});
+jQuery(function(a){a.fn.xeModuleFinder=function(){this.not(".xe-module-finder").addClass("xe-module-finder").find("a.tgAnchor.findsite").bind("before-open.tc",function(){var c,b,d;c=a(this);b=a(c.attr("href")).find(">ul");d=c.prev("input:text").val();a.exec_json("admin.getSiteAllList",{domain:d},function(d){var f=d.site_list,e,i;b.empty();c.closest(".modulefinder").find(".moduleList,.moduleIdList").attr("disabled","disabled");if(d.error||!a.isArray(f))c.trigger("close.tc");else for(e=0,i=f.length;e<
+i;e++)d=a("<li />").appendTo(b),a('<button type="button" />').text(f[e].domain).data("site_srl",f[e].site_srl).appendTo(d)})}).end().find(".tgContent.suggestion").delegate("button","click",function(){var c,b;c=a(this);b=c.closest(".modulefinder");b.find("a.tgAnchor.findsite").trigger("close.tc");a.exec_json("module.procModuleAdminGetList",{site_srl:c.data("site_srl")},function(d){var c=d.module_list,f;if(!d.error&&c){d=b.find(".moduleList").data("module_list",c).removeAttr("disabled").empty();for(f in c)c.hasOwnProperty(f)&&
+a("<option />").attr("value",f).text(c[f].title).appendTo(d);d.prop("selectedIndex",0).change().focus();d.is(":visible")||d.slideDown(100,function(){b.find(".moduleIdList:not(:visible)").slideDown(100).trigger("show")}).trigger("show")}})}).end().find(".moduleList,.moduleIdList").hide().end().find(".moduleList").change(function(){var c,b,d;c=a(this);b=c.val();d=c.data("module_list");if(d[b]){d=d[b].list;c=c.closest(".modulefinder").find(".moduleIdList").removeAttr("disabled").empty();for(var g in d)d.hasOwnProperty(g)&&
+a("<option />").attr("value",d[g].module_srl).text(d[g].browser_title).appendTo(c);c.prop("selectedIndex",0).change()}});return this};a(".modulefinder").xeModuleFinder()});
+jQuery(function(a){function c(a,b){for(var c=0,e=0;a&&a!=b;)c+=a.offsetTop,e+=a.offsetLeft,a=a.offsetParent;return{top:c,left:e}}var b=a('<tr class="placeholder"><td>&nbsp;</td></tr>');a.fn.xeSortableTable=function(){this.not(".xe-sortable-table").addClass("xe-sortable-table").delegate("button.dragBtn","mousedown.st",function(d){var g,f,e,i,k,h,j,m,l,n;if(d.which==1){f=a(this);e=f.closest("tr");i=f.closest("table");n=i.get(0).offsetParent;f=e.height();k=e.width();before_event=a.Event("before-drag.st");
+i.trigger(before_event);if(before_event.isDefaultPrevented())return false;g=d.pageY;h=c(e.get(0),n);$clone=e.attr("target",true).clone(true).appendTo(i);l=(d=i.find("thead th")).length;d.filter("[colspan]").attr("colspan",function(a,b){l+=b-1});b.find("td").attr("colspan",l);j=[];i.find("tbody>tr:not([target],.sticky,:hidden)").each(function(){var b=a(this),d;d=c(this,n);j.push({top:d.top,bottom:d.top+b.height(),$item:b})});$clone.addClass("draggable").css({position:"absolute",opacity:0.6,width:k,
+height:f,left:h.left,top:h.top,zIndex:100});b.css({position:"absolute",opacity:0.6,width:k,height:"10px",left:h.left,top:h.top,backgroundColor:"#bbb",overflow:"hidden",zIndex:99}).appendTo(i);e.css("opacity",0.6);a(document).unbind("mousedown.st mouseup.st").bind("mousemove.st",function(a){var d,c,l;m=null;a=h.top-(g-a.pageY);for(d=0,c=j.length;d<c;d++)if(l=j[d],!(d&&l.top>a||d<c-1&&l.bottom<a))m={element:l.$item},l.top>a-12?(m.state="before",b.css("top",l.top-5)):(m.state="after",b.css("top",l.bottom-
+5));$clone.css({top:a})}).bind("mouseup.st",function(){a(document).unbind("mousemove.st mouseup.st");e.removeAttr("target").css("opacity","");$clone.remove();b.remove();m&&(a(m.element)[m.state](e),i.trigger("after-drag.st"))})}});return this};a("table.sortable").xeSortableTable()});
+jQuery(function(a){function c(b){function d(){var a=[];f.each(function(){a.push(this.value)});return a.join("\n")}function c(){b.data("multilang-current-name")?b.find("h2").find("strong").text(i==q?h:k).end().find("a").text(i==q?k:h).show().end():b.find("h2").find("strong").text(h).end().find("a").hide()}var e,f,g="",j=0,i,h,k,o=[],q=0,s=1;b.data("init-multilang-editor")||(b.data("init-multilang-editor",true).bind("multilang-reset",function(){b.data("multilang-current-name","").find(".langInput li").find(">input:text,>textarea").val(" ").prev("label").css("visibility",
+"visible");i=q;c()}).find("h2 a").click(function(){i=!i;c();return false}).end().delegate("a.langItem","click",function(){var f=a(this),r,h,k;h=b.data("multilang-list");k=f.data("multilang-name");if(h&&h[k]){h=h[k];r=b.find(".langInput");b.trigger("multilang-reset").find(".langList li.active").removeClass("active").end().data("multilang-current-name",k);f.parent("li").addClass("active");for(var p in h)h.hasOwnProperty(p)&&r.find("li."+p).find(">input:text,>textarea").data("multilang-value",h[p]).val(h[p]).prev("label").css("visibility",
+"hidden");g=d();j=0;e.val(o[j]);i=s;c();return false}}).data("layer_index",m).find(".langInput").attr("id","langInput_"+m++),k=b.find("h2 strong").text(),h=b.find("h2 a").text(),f=b.find("input:text,textarea").change(function(){var a=d()==g?0:1;a!=j&&e.val(o[j=a])}),e=b.find("input[type=submit]").click(function(){function c(){b.hide().closest(".multiLangEdit").find(".vLang").eq(0).val("$user_lang->"+h).end().eq(1).val(b.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val()).end()}
+function e(){var b={};if(h&&i==s)b.lang_name=h;f.each(function(){var d=a(this);b[d.parent("li").attr("class")]=d.val()});a.exec_json("module.procModuleAdminInsertLang",b,t)}function t(a){if(a&&!a.error&&a.name)h=a.name,c()}var h=b.data("multilang-current-name");d()==g?c():e();return false}),o=e.val().split("|"),e.val(o[0]))}function b(a){var b,d,c={},e;for(b=0,d=a.length;b<d;b++)e=a[b],c[e.name]||(c[e.name]={}),c[e.name][e.lang_code]=e.value;return c}function d(a){var b=0,d;for(d in a)a.hasOwnProperty(d)&&
+b++;return b}var g=null,f=null,e=0,i=null,k=false,h=false,j;a(".multiLangEdit").delegate("input.vLang:text,textarea.vLang",{textchange:function(){var b=a(this),d=a.trim(b.val()),c;f&&(clearTimeout(f),f=null);b.data("mle-container");c=j.find(">ul");!d||k?(k=false,c.parent().hide(),b.prev("input.vLang").val("")):(b.data("mle-langkey").val(""),b.prev("input.vLang").val(d),f=setTimeout(function(){b.addClass("loading");c.parent().is(":visible")&&c.parent().hide();show_waiting_message=false;a.exec_json("module.getLangListByLangcodeForAutoComplete",
+{search_keyword:d},function(d){return function(f){var h=f.results,g,n;if(!f.error&&h&&e==d+1){b.removeClass("loading");c.empty();for(g=0,n=h.length;g<n;g++)f=a('<button type="button" class="_btnLang" />').data("langkey",h[g].name).text(h[g].value),a("<li />").append(f).appendTo(c);j.trigger("show")}}}(e++));show_waiting_message=true},100))},keydown:function(b){var d,c,e=b.which;a(this);b=j.find(">ul");if(!j.is(":visible")||a.inArray(e,[38,40,13,27])<0)return true;if(e==27)return j.trigger("hide"),
+false;d=b.find("button.active");if(e==13)return d.click(),false;if(!d.length)return b.find("li>button:first").addClass("active"),false;e==38?(c=d.parent().prev("li").find(">button"),c.length||(c=b.find(">li:last>button"))):e==40&&(c=d.parent().next("li").find(">button"),c.length||(c=b.find(">li:first>button")));d.removeClass("active");c.addClass("active");return false},focus:function(){var b=a(this),d=a.trim(b.val()),c=b.closest(".multiLangEdit");b.after(j);b.data("mle-container")||b.data("mle-container",
+c);b.data("mle-langkey")||b.data("mle-langkey",c.find("input.vLang:first"));(function(){var c=a.trim(b.val());c!=d&&(d=c,b.trigger("textchange"));g=setTimeout(arguments.callee,50)})()},blur:function(){clearTimeout(g);g=null;a(this).closest(".multiLangEdit").focusout()},focusout:function(){var b=a(this);clearTimeout(i);i=setTimeout(function(){h?h=false:b.find(":focus").is(".vLang,button._btnLang")||j.trigger("hide")},10)}}).delegate("a.tgAnchor.editUserLang",{"before-open.tc":function(){var e,f,g;
+e=a(this);f=a(e.attr("href")).insertBefore(e);g=e.closest(".multiLangEdit").find("input.vLang,textarea.vLang");e=g.eq(0).val();g=g.eq(1).val();c(f);f.trigger("multilang-reset").removeClass("showChild").find(".langList").empty().end();f.find(".langInput li."+xe.current_lang).find(">input:text,>textarea").val(g).prev("label").css("visibility","hidden");j.trigger("hide");/^\$user_lang->(.+)$/.test(e)?(e="module.getModuleAdminLangListByName",g={lang_name:RegExp.$1}):(e="module.getModuleAdminLangListByValue",
+g={value:g});show_waiting_message=false;a.exec_json(e,g,function(c){var e=c.lang_list,g;!c.error&&e&&(e=b(e),f.data("multilang-list",e),g=f.find(".langList"),a.each(e,function(b){var c=a("<li />").appendTo(g),d=f.data("layer_index");a('<a href="#langInput_'+d+'" class="langItem" />').text(this[xe.current_lang]).data("multilang-name",b).appendTo(c)}),d(e)>1&&f.addClass("showChild"),f.find(".langList>li>a:first").click())});show_waiting_message=true}}).delegate("button._btnLang",{click:function(){var b=
+a(this);k=true;j.trigger("hide");b.closest(".multiLangEdit").find("input.vLang,textarea.vLang").eq(0).val(b.data("langkey")).end().eq(1).val(b.text()).end();return false},mousedown:function(){h=true},focus:function(){a(this).mouseover()},mouseover:function(){a(this).closest("ul").find("button.active").removeClass("active")}});j=a('<div class="suggestion"><ul></ul></div>').bind("show",function(){a(this).show()}).bind("hide",function(){a(this).hide()});var m=0});
+jQuery(function(a){a(".filebox").bind("before-open.mw",function(){function c(f){d.html(f.html);d.find(".lined .select").bind("click",function(){var c=a(this).parent().find("img.filebox_item").attr("src");b.trigger("filebox.selected",[c]);b.trigger("close.mw");return false});d.find(".pagination").find("a").filter(function(){return a(this).hasClass("tgAnchor")?false:true}).bind("click",function(){var b=a(this).attr("page");a.exec_json("module.getFileBoxListHtml",{page:b},c);a(window).scrollTop(a(g).find(".modalClose").offset().top);
+return false});a("#FileBoxGoTo").find("button").bind("click",function(){var b=a(this).prev("input").val();a.exec_json("module.getFileBoxListHtml",{page:b},c);a(window).scrollTop(a(g).find(".modalClose").offset().top);return false})}var b,d,g;b=a(this);g=b.attr("href");d=a(g).find(".filebox_list");a.exec_json("module.getFileBoxListHtml",{page:"1"},c)})});
+function showWaitingFogLayer(){var a=jQuery('<span class="bg"></span>');a.height(jQuery(window).height());jQuery(".wfsr").wrap('<div class="wfsr_fog" />').before(a)}function hideWaitingFogLayer(){jQuery(".wfsr").prev("span").remove();jQuery(".wfsr").unwrap()}function doInstallModule(a){var c=[];c.module_name=a;exec_xml("install","procInstallAdminInstall",c,completeInstallModule);showWaitingFogLayer()}
+function doUpdateModule(a){var c=[];c.module_name=a;exec_xml("install","procInstallAdminUpdate",c,completeInstallModule);showWaitingFogLayer()}function completeInstallModule(a){alert(a.message);location.reload()}jQuery(document).ready(function(a){a("body").ajaxComplete(function(){hideWaitingFogLayer()})});jQuery(function(a){a(".x>.body>.lnb").length==0&&a(".x>.body>.content").addClass("single")});
diff --git a/modules/admin/tpl/js/config.js b/modules/admin/tpl/js/config.js
index 3915fa5e9..8e3c5ad1c 100644
--- a/modules/admin/tpl/js/config.js
+++ b/modules/admin/tpl/js/config.js
@@ -1,3 +1,18 @@
+jQuery(function($){
+	$('.tgContent ul').bind('click', function(){
+		$('#sitefind_addBtn').css('display','');
+	});
+});
+function setStartModule(){
+	var target_module = jQuery('.moduleIdList option:selected').text();
+	var index_module_srl = jQuery('.moduleIdList').val(); 
+	jQuery('#_target_module').val(target_module);
+	jQuery('#index_module_srl').val(index_module_srl);
+	jQuery('.moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn').css('display','none');
+}
+function viewSiteSearch(){
+	jQuery(".site_keyword_search").css("display","");	
+}
 function getFTPList(pwd)
 {
     var form = jQuery("#ftp_form").get(0);
@@ -7,19 +22,24 @@ function getFTPList(pwd)
     }
     else
     {
-        if(!form.ftp_root_path.value)
+        if(!form.ftp_root_path.value && typeof(form.sftp) != 'undefined' && form.sftp.checked)
         {
-            if(typeof(form.sftp) != 'undefined' && form.sftp.checked) {
-                form.ftp_root_path.value = xe_root;
-            }
-            else
-            {
-                form.ftp_root_path.value = "/";
-            }
+            form.ftp_root_path.value = xe_root;
+        }
+		else
+        {
+          form.ftp_root_path.value = "/";
         }
     }
-    var params={}, data=jQuery("#ftp_form").serializeArray();
-    jQuery.each(data, function(i, field){ params[field.name] = field.value });
+
+    var params= new Array();
+	//ftp_pasv not used
+	params['ftp_user'] = jQuery("#ftp_user").val();
+	params['ftp_password'] =jQuery("#ftp_password").val();
+	params['ftp_host'] = jQuery("#ftp_host").val();
+	params['ftp_port'] = jQuery("#ftp_port").val();
+	params['ftp_root_path'] = jQuery("#ftp_root_path").val();
+
     exec_xml('admin', 'getAdminFTPList', params, completeGetFtpInfo, ['list', 'error', 'message'], params, form);
 }
 
@@ -37,7 +57,8 @@ function completeGetFtpInfo(ret_obj)
         alert(ret_obj['message']);
         return;
     }
-    var e = jQuery("#ftplist").empty();
+    var e = jQuery("#ftpSuggestion").empty();
+
     var list = "";
     if(!jQuery.isArray(ret_obj['list']['item']))
     {
@@ -52,26 +73,65 @@ function completeGetFtpInfo(ret_obj)
         arr.pop();
         arr.push("");
         target = arr.join("/");
-        list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+target+"')\">../</a></li>";
+        list = list + "<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>";
     }
-    
+
     for(var i=0;i<ret_obj['list']['item'].length;i++)
-    {   
+    {
         var v = ret_obj['list']['item'][i];
         if(v == "../")
         {
             continue;
-        } 
+        }
         else if( v == "./")
         {
             continue;
         }
         else
         {
-            list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</a></li>";
+            list = list + "<li><button type='button' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</button></li>";
         }
     }
-
-    list = "<td><ul>"+list+"</ul></td>";
+    list = "<ul>"+list+"</ul>";
     e.append(jQuery(list));
 }
+
+var icon = null;
+function deleteIcon(iconname){
+	var params = new Array();
+	params['iconname'] = iconname;
+	exec_xml('admin', 'procAdminRemoveIcons', params, iconDeleteMessage, ['error', 'message'], params);
+	icon = iconname;
+}
+function iconDeleteMessage(ret_obj){
+	alert(ret_obj['message']);
+
+	if (ret_obj['error'] == '0')
+	{
+		if (icon == 'favicon.ico'){
+			jQuery('.faviconPreview img').attr('src', 'modules/admin/tpl/img/faviconSample.png');
+		}else if (icon == 'mobicon.png'){
+			jQuery('.mobiconPreview img').attr('src', 'modules/admin/tpl/img/mobiconSample.png');
+		}
+	}
+}
+function doRecompileCacheFile() {
+	if (!confirm(xe.lang.confirm_run)) return;
+	var params = new Array();
+	exec_xml("admin","procAdminRecompileCacheFile", params, completeCacheMessage);
+	showWaitingFogLayer();
+}
+function completeCacheMessage(ret_obj) {
+    alert(ret_obj['message']);
+}
+
+function doResetAdminMenu() {
+	if (!confirm(xe.lang.confirm_reset_admin_menu)) return;
+	var params = new Array();
+	params['menu_srl'] = admin_menu_srl;
+	exec_xml("admin","procAdminMenuReset", params, completeResetAdminMenu);
+	showWaitingFogLayer();
+}
+function completeResetAdminMenu(ret_obj) {
+	document.location.reload();
+}
diff --git a/modules/admin/tpl/js/config.min.js b/modules/admin/tpl/js/config.min.js
new file mode 100644
index 000000000..f396ea946
--- /dev/null
+++ b/modules/admin/tpl/js/config.min.js
@@ -0,0 +1,6 @@
+jQuery(function(a){a(".tgContent ul").bind("click",function(){a("#sitefind_addBtn").css("display","")})});function setStartModule(){var a=jQuery(".moduleIdList option:selected").text(),b=jQuery(".moduleIdList").val();jQuery("#_target_module").val(a);jQuery("#index_module_srl").val(b);jQuery(".moduleList,.moduleIdList, .site_keyword_search, #sitefind_addBtn").css("display","none")}function viewSiteSearch(){jQuery(".site_keyword_search").css("display","")}
+function getFTPList(a){var b=jQuery("#ftp_form").get(0);b.ftp_root_path.value=typeof a!="undefined"?a:!b.ftp_root_path.value&&typeof b.sftp!="undefined"&&b.sftp.checked?xe_root:"/";a=[];a.ftp_user=jQuery("#ftp_user").val();a.ftp_password=jQuery("#ftp_password").val();a.ftp_host=jQuery("#ftp_host").val();a.ftp_port=jQuery("#ftp_port").val();a.ftp_root_path=jQuery("#ftp_root_path").val();exec_xml("admin","getAdminFTPList",a,completeGetFtpInfo,["list","error","message"],a,b)}
+function removeFTPInfo(){var a={};exec_xml("install","procInstallAdminRemoveFTPInfo",a,filterAlertMessage,["error","message"],a)}
+function completeGetFtpInfo(a){if(a.error!=0)alert(a.error),alert(a.message);else{var b=jQuery("#ftpSuggestion").empty(),c="";jQuery.isArray(a.list.item)||(a.list.item=[a.list.item]);pwd=jQuery("#ftp_form").get(0).ftp_root_path.value;pwd!="/"&&(arr=pwd.split("/"),arr.pop(),arr.pop(),arr.push(""),target=arr.join("/"),c=c+"<li><button type='button' onclick=\"getFTPList('"+target+"')\">../</button></li>");for(var e=0;e<a.list.item.length;e++){var d=a.list.item[e];d!="../"&&d!="./"&&(c=c+"<li><button type='button' onclick=\"getFTPList('"+
+pwd+d+"')\">"+d+"</button></li>")}b.append(jQuery("<ul>"+c+"</ul>"))}}var icon=null;function deleteIcon(a){var b=[];b.iconname=a;exec_xml("admin","procAdminRemoveIcons",b,iconDeleteMessage,["error","message"],b);icon=a}function iconDeleteMessage(a){alert(a.message);a.error=="0"&&(icon=="favicon.ico"?jQuery(".faviconPreview img").attr("src","modules/admin/tpl/img/faviconSample.png"):icon=="mobicon.png"&&jQuery(".mobiconPreview img").attr("src","modules/admin/tpl/img/mobiconSample.png"))}
+function doRecompileCacheFile(){confirm(xe.lang.confirm_run)&&(exec_xml("admin","procAdminRecompileCacheFile",[],completeCacheMessage),showWaitingFogLayer())}function completeCacheMessage(a){alert(a.message)}function doResetAdminMenu(){if(confirm(xe.lang.confirm_reset_admin_menu)){var a=[];a.menu_srl=admin_menu_srl;exec_xml("admin","procAdminMenuReset",a,completeResetAdminMenu);showWaitingFogLayer()}}function completeResetAdminMenu(){document.location.reload()};
diff --git a/modules/admin/tpl/js/menu_setup.js b/modules/admin/tpl/js/menu_setup.js
new file mode 100644
index 000000000..6a28582ee
--- /dev/null
+++ b/modules/admin/tpl/js/menu_setup.js
@@ -0,0 +1,234 @@
+jQuery(function($){
+	var menuList;
+	var parentSrl;
+	var editForm = $('#editForm');
+	var listForm = $('#listForm');
+
+	$('a._add').click(function(){
+		parentSrl = $(this).parent().prevAll('._item_key').val();
+		editForm.find('input[name=parent_srl]').val(parentSrl);
+		if(!menuList)
+		{
+			var params = new Array();
+			var response_tags = new Array('menuList');
+			exec_xml("menu","procMenuAdminAllActList", params, completeGetActList, response_tags);
+		}
+	});
+
+	function completeGetActList(obj)
+	{
+		var $optgroup;
+
+		moduleList = obj.menuList;
+		if(moduleList)
+		{
+ 			var menuNameList = $('#menuNameList');
+			for(var x in moduleList)
+			{
+				var menuList = moduleList[x];
+				$optgroup = $('<optgroup label="'+x+'" />').appendTo(menuNameList);
+				for(var y in menuList)
+				{
+					$optgroup.append('<option value="'+x+':'+y+'">'+menuList[y].title+'</option>');
+				}
+			}
+		}
+	}
+
+	$('a._parent_delete').click(function() {
+		var menu_item_srl = $(this).parent().prevAll('._parent_key').val();
+		listForm.find('input[name=menu_item_srl]').val(menu_item_srl);
+		listForm.submit();
+	});
+
+	$('a._child_delete').click(function() {
+		var menu_item_srl = $(this).parents('li').find('._item_key').val();
+		listForm.find('input[name=menu_item_srl]').val(menu_item_srl);
+		listForm.submit();
+	});
+});
+
+// menu - drag and drop
+jQuery(function($){
+
+$('form.siteMap')
+	.delegate('li:not(.placeholder)', 'dropped.st', function() {
+		var $this = $(this), $pkey, $mkey, is_child;
+
+		$pkey = $this.find('>input._parent_key');
+		is_child = !!$this.parent('ul').parent('li').length;
+
+		if(is_child) {
+			$pkey.val($this.parent('ul').parent('li').find('>input._item_key').val());
+		} else {
+			$pkey.val('0');
+		}
+	})
+
+var 
+	dragging = false,
+	$holder  = $('<li class="placeholder">');
+
+$('div.adminMenu')
+	.delegate('li:not(.placeholder,.parent)', {
+		'mousedown.st' : function(event) {
+			var $this, $uls, $ul, width, height, offset, position, offsets, i, dropzone, wrapper='';
+
+			if($(event.target).is('a,input,label,textarea') || event.which != 1) return;
+
+			dragging = true;
+
+			$this  = $(this);
+			height = $this.height();
+			width  = $this.width();
+			$uls   = $this.parentsUntil('.siteMap').filter('ul');
+			$ul    = $uls.eq(-1);
+
+			$ul.css('position', 'relative');
+
+			position = {x:event.pageX, y:event.pageY};
+			offset   = getOffset(this, $ul.get(0));
+
+			$clone = $this.clone(true).attr('target', true);
+
+			for(i=$uls.length-1; i; i--) {
+				$clone = $clone.wrap('<li><ul /></li>').parent().parent();
+			}
+
+			// get offsets of all list-item elements
+			offsets = [];
+			$ul.find('li').each(function(idx) {
+				if($this[0] === this || $this.has(this).length) return true;
+
+				var o = getOffset(this, $ul.get(0));
+				offsets.push({top:o.top, bottom:o.top+32, $item:$(this)});
+			});
+
+			// Remove unnecessary elements from the clone, set class name and styles.
+			// Append it to the list
+			$clone
+				.find('.side,input').remove().end()
+				.addClass('draggable')
+				.css({
+					position: 'absolute',
+					opacity : .6,
+					width   : width,
+					height  : height,
+					left    : offset.left,
+					top     : offset.top,
+					zIndex  : 100
+				})
+				.appendTo($ul.eq(0));
+
+			// Set a place holder
+			$holder
+				.css({
+					position:'absolute',
+					opacity : .6,
+					width   : width,
+					height  : '10px',
+					left    : offset.left,
+					top     : offset.top,
+					zIndex  :99
+				})
+				.appendTo($ul.eq(0));
+
+			$this.css('opacity', .6);
+
+			$(document)
+				.unbind('mousemove.st mouseup.st')
+				.bind('mousemove.st', function(event) {
+					var diff, nTop, item, i, c, o;
+
+					dropzone = null;
+
+					diff = {x:position.x-event.pageX, y:position.y-event.pageY};
+					nTop = offset.top - diff.y;
+					
+					for(i=0,c=offsets.length; i < c; i++) {
+						o = offsets[i];
+						if(o.top > nTop || o.bottom < nTop) continue;
+
+						dropzone = {element:o.$item};
+						if(o.$item.hasClass('parent')) {
+							dropzone.state = 'prepend';
+							$holder.css('top', o.bottom-5);
+						} else if(o.top > nTop - 12) {
+							dropzone.state = 'before';
+							$holder.css('top', o.top-5);
+						} else {
+							dropzone.state = 'after';
+							$holder.css('top', o.bottom-5);
+						}
+					}
+
+					$clone.css({top:nTop});
+				})
+				.bind('mouseup.st', function(event) {
+					var $dropzone, $li;
+
+					dragging = false;
+
+					$(document).unbind('mousemove.st mouseup.st');
+					$this.css('opacity', '');
+					$clone.remove();
+					$holder.remove();
+
+					// dummy list item for animation
+					$li = $('<li />').height($this.height());
+
+					if(!dropzone) return;
+					$dropzone = $(dropzone.element);
+
+					$this.before($li);
+
+					if(dropzone.state == 'prepend') {
+						if(!$dropzone.find('>ul').length) $dropzone.find('>.side').after('<ul>');
+						$dropzone.find('>ul').prepend($this.hide());
+					} else {
+						$dropzone[dropzone.state]($this.hide());
+					}
+
+					$this.slideDown(100, function(){ $this.removeClass('active') });
+					$li.slideUp(100, function(){ var $par = $li.parent(); $li.remove(); if(!$par.children('li').length) $par.remove()  });
+
+					// trigger 'dropped.st' event
+					$this.trigger('dropped.st');
+				});
+
+			return false;
+		},
+		'mouseover.st' : function() {
+			if(!dragging) $(this).addClass('active');
+			return false;
+		},
+		'mouseout.st' : function() {
+			if(!dragging) $(this).removeClass('active');
+			return false;
+		}
+	})
+	.find('li')
+		.prepend('<button type="button" class="moveTo">Move to</button>')
+		.filter('.parent')
+			.find('>button.moveTo').css({'visibility':'hidden','margin-left':'-12px'}).end()
+		.end()
+	.end()
+
+$('<div id="dropzone-marker" />')
+	.css({display:'none',position:'absolute',backgroundColor:'#000',opacity:0.7})
+	.appendTo('body');
+
+function getOffset(elem, offsetParent) {
+	var top = 0, left = 0;
+
+	while(elem && elem != offsetParent) {
+		top  += elem.offsetTop;
+		left += elem.offsetLeft;
+
+		elem = elem.offsetParent;
+	}
+
+	return {top:top, left:left};
+}
+
+});
diff --git a/modules/admin/tpl/js/menu_setup.min.js b/modules/admin/tpl/js/menu_setup.min.js
new file mode 100644
index 000000000..cdc4e5e69
--- /dev/null
+++ b/modules/admin/tpl/js/menu_setup.min.js
@@ -0,0 +1,8 @@
+jQuery(function(b){function k(a){if(moduleList=a.menuList){var d=b("#menuNameList"),g;for(g in moduleList){var e=moduleList[g],a=b('<optgroup label="'+g+'" />').appendTo(d),c;for(c in e)a.append('<option value="'+g+":"+c+'">'+e[c].title+"</option>")}}}var c,h=b("#editForm"),a=b("#listForm");b("a._add").click(function(){c=b(this).parent().prevAll("._item_key").val();h.find("input[name=parent_srl]").val(c);exec_xml("menu","procMenuAdminAllActList",[],k,["menuList"])});b("a._parent_delete").click(function(){var i=
+b(this).parent().prevAll("._parent_key").val();a.find("input[name=menu_item_srl]").val(i);a.submit()});b("a._child_delete").click(function(){var i=b(this).parents("li").find("._item_key").val();a.find("input[name=menu_item_srl]").val(i);a.submit()})});
+jQuery(function(b){function k(a,b){for(var d=0,c=0;a&&a!=b;)d+=a.offsetTop,c+=a.offsetLeft,a=a.offsetParent;return{top:d,left:c}}b("form.siteMap").delegate("li:not(.placeholder)","dropped.st",function(){var a=b(this),c;c=a.find(">input._parent_key");a.parent("ul").parent("li").length?c.val(a.parent("ul").parent("li").find(">input._item_key").val()):c.val("0")});var c=false,h=b('<li class="placeholder">');b("div.adminMenu").delegate("li:not(.placeholder,.parent)",{"mousedown.st":function(a){var i,
+d,g,e,m,n,j,l,f;if(!(b(a.target).is("a,input,label,textarea")||a.which!=1)){c=true;d=b(this);n=d.height();m=d.width();g=d.parentsUntil(".siteMap").filter("ul");e=g.eq(-1);e.css("position","relative");i=a.pageY;j=k(this,e.get(0));$clone=d.clone(true).attr("target",true);for(a=g.length-1;a;a--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();l=[];e.find("li").each(function(){if(d[0]===this||d.has(this).length)return true;var a=k(this,e.get(0));l.push({top:a.top,bottom:a.top+32,$item:b(this)})});
+$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:0.6,width:m,height:n,left:j.left,top:j.top,zIndex:100}).appendTo(e.eq(0));h.css({position:"absolute",opacity:0.6,width:m,height:"10px",left:j.left,top:j.top,zIndex:99}).appendTo(e.eq(0));d.css("opacity",0.6);b(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,d,c;f=null;a=j.top-(i-a.pageY);for(b=0,d=l.length;b<d;b++)if(c=l[b],!(c.top>a||c.bottom<a))f={element:c.$item},c.$item.hasClass("parent")?
+(f.state="prepend",h.css("top",c.bottom-5)):c.top>a-12?(f.state="before",h.css("top",c.top-5)):(f.state="after",h.css("top",c.bottom-5));$clone.css({top:a})}).bind("mouseup.st",function(){var a,e;c=false;b(document).unbind("mousemove.st mouseup.st");d.css("opacity","");$clone.remove();h.remove();e=b("<li />").height(d.height());if(f){a=b(f.element);d.before(e);if(f.state=="prepend")a.find(">ul").length||a.find(">.side").after("<ul>"),a.find(">ul").prepend(d.hide());else a[f.state](d.hide());d.slideDown(100,
+function(){d.removeClass("active")});e.slideUp(100,function(){var a=e.parent();e.remove();a.children("li").length||a.remove()});d.trigger("dropped.st")}});return false}},"mouseover.st":function(){c||b(this).addClass("active");return false},"mouseout.st":function(){c||b(this).removeClass("active");return false}}).find("li").prepend('<button type="button" class="moveTo">Move to</button>').filter(".parent").find(">button.moveTo").css({visibility:"hidden","margin-left":"-12px"}).end().end().end();b('<div id="dropzone-marker" />').css({display:"none",
+position:"absolute",backgroundColor:"#000",opacity:0.7}).appendTo("body")});
diff --git a/modules/admin/tpl/js/minify.ini b/modules/admin/tpl/js/minify.ini
new file mode 100644
index 000000000..25dad2c84
--- /dev/null
+++ b/modules/admin/tpl/js/minify.ini
@@ -0,0 +1,2 @@
+[option]
+use_closure_compiler=true
diff --git a/modules/admin/tpl/js/sitemap.js b/modules/admin/tpl/js/sitemap.js
new file mode 100644
index 000000000..c4207f859
--- /dev/null
+++ b/modules/admin/tpl/js/sitemap.js
@@ -0,0 +1,199 @@
+/* NHN (developers@xpressengine.com) */
+jQuery(function($){
+
+var 
+	dragging = false,
+	$holder  = $('<li class="placeholder">');
+
+$('form.siteMap')
+	.delegate('li:not(.placeholder)', {
+		'mousedown.st' : function(event) {
+			var $this, $uls, $ul, width, height, offset, position, offsets, i, dropzone, wrapper='';
+
+			if($(event.target).is('a,input,label,textarea') || event.which != 1) return;
+
+			dragging = true;
+
+			$this  = $(this);
+			height = $this.height();
+			width  = $this.width();
+			$uls   = $this.parentsUntil('.siteMap').filter('ul');
+			$ul    = $uls.eq(-1);
+
+			$ul.css('position', 'relative');
+
+			position = {x:event.pageX, y:event.pageY};
+			offset   = getOffset(this, $ul.get(0));
+
+			$clone = $this.clone(true).attr('target', true);
+
+			for(i=$uls.length-1; i; i--) {
+				$clone = $clone.wrap('<li><ul /></li>').parent().parent();
+			}
+
+			// get offsets of all list-item elements
+			offsets = [];
+			$ul.find('li').each(function(idx) {
+				if($this[0] === this || $this.has(this).length) return true;
+
+				var o = getOffset(this, $ul.get(0));
+				offsets.push({top:o.top, bottom:o.top+32, item:this});
+			});
+
+			// Remove unnecessary elements from the clone, set class name and styles.
+			// Append it to the list
+			$clone
+				.find('.side,input').remove().end()
+				.addClass('draggable')
+				.css({
+					position: 'absolute',
+					opacity : .6,
+					width   : width,
+					height  : height,
+					left    : offset.left,
+					top     : offset.top,
+					zIndex  : 100
+				})
+				.appendTo($ul.eq(0));
+
+			// Set a place holder
+			$holder
+				.css({
+					position:'absolute',
+					opacity : .6,
+					width   : width,
+					height  : '5px',
+					left    : offset.left,
+					top     : offset.top,
+					zIndex  :99
+				})
+				.appendTo($ul.eq(0));
+
+			$this.css('opacity', .6);
+
+			$(document)
+				.unbind('mousemove.st mouseup.st')
+				.bind('mousemove.st', function(event) {
+					var diff, nTop, item, i, c, o, t;
+
+					dropzone = null;
+
+					diff = {x:position.x-event.pageX, y:position.y-event.pageY};
+					nTop = offset.top - diff.y;
+					
+					for(i=0,c=offsets.length; i < c; i++) {
+						t = nTop;
+						o = offsets[i];
+
+						if(i == 0 && t < o.top) t = o.top;
+						if(i == c-1 && t > o.bottom) t = o.bottom;
+
+						if(o.top <= t && o.bottom >= t) { 
+							dropzone = {element:o.item, state:setHolder(o,t)};
+							break;
+						}
+					}
+
+					$clone.css({top:nTop});
+				})
+				.bind('mouseup.st', function(event) {
+					var $dropzone, $li;
+
+					dragging = false;
+
+					$(document).unbind('mousemove.st mouseup.st');
+					$this.css('opacity', '');
+					$clone.remove();
+					$holder.remove();
+
+					// dummy list item for animation
+					$li = $('<li />').height($this.height());
+
+					if(!dropzone) return;
+					$dropzone = $(dropzone.element);
+
+					$this.before($li);
+
+					if(dropzone.state == 'prepend') {
+						if(!$dropzone.find('>ul').length) $dropzone.find('>.side').after('<ul>');
+						$dropzone.find('>ul').prepend($this.hide());
+					} else {
+						$dropzone[dropzone.state]($this.hide());
+					}
+
+					$this.slideDown(100, function(){ $this.removeClass('active') });
+					$li.slideUp(100, function(){ var $par = $li.parent(); $li.remove(); if(!$par.children('li').length) $par.remove()  });
+
+					// trigger 'dropped.st' event
+					$this.trigger('dropped.st');
+				});
+
+			return false;
+		},
+		'mouseover.st' : function() {
+			if(!dragging) $(this).addClass('active');
+			return false;
+		},
+		'mouseout.st' : function() {
+			if(!dragging) $(this).removeClass('active');
+			return false;
+		}
+	})
+	.find('li')
+		.prepend('<button type="button" class="moveTo">Move to</button>')
+		.append('<span class="vr"></span><span class="hr"></span>')
+		.find('input:text')
+			.focus(function(){
+				var $this = $(this), $label = $this.prev('label'), $par = $this.parent();
+
+				$this.width($par.width() - (parseInt($par.css('text-indent'))||0) - $this.next('.side').width() - 60).css('opacity', '');
+				$label.hide();
+			})
+			.blur(function(){
+				var $this = $(this), $label = $this.prev('label'), val = $this.val();
+
+				$this.width(0).css('opacity', 0);
+				$label.removeClass('no-text').empty().text(val).show();
+				if(!val) $label.addClass('no-text').text('---');
+			})
+			.each(function(i,input){
+				var $this = $(this), id='sitemap-id-'+i;
+
+				$this
+					.attr('id', id)
+					.css({width:0,opacity:0,overflow:'hidden'})
+					.before('<label />')
+						.prev('label')
+						.attr('for', id)
+						.text($this.val());
+			})
+		.end()
+	.end()
+
+function getOffset(elem, offsetParent) {
+	var top = 0, left = 0;
+
+	while(elem && elem != offsetParent) {
+		top  += elem.offsetTop;
+		left += elem.offsetLeft;
+
+		elem = elem.offsetParent;
+	}
+
+	return {top:top, left:left};
+}
+
+function setHolder(info, yPos) {
+	if(Math.abs(info.top-yPos) <= 3) {
+		$holder.css({top:info.top-3,height:'5px'});
+		return 'before';
+	} else if(Math.abs(info.bottom-yPos) <= 3) {
+		$holder.css({top:info.bottom-3,height:'5px'});
+		return 'after';
+	} else {
+		$holder.css({top:info.top+3,height:'27px'});
+		return 'prepend';
+	}
+}
+
+});
diff --git a/modules/admin/tpl/js/sitemap.min.js b/modules/admin/tpl/js/sitemap.min.js
new file mode 100644
index 000000000..24c5de48c
--- /dev/null
+++ b/modules/admin/tpl/js/sitemap.min.js
@@ -0,0 +1,6 @@
+jQuery(function(c){function o(a,c){for(var b=0,h=0;a&&a!=c;)b+=a.offsetTop,h+=a.offsetLeft,a=a.offsetParent;return{top:b,left:h}}var l=false,k=c('<li class="placeholder">');c("form.siteMap").delegate("li:not(.placeholder)",{"mousedown.st":function(a){var d,b,h,g,n,p,i,m,j;if(!(c(a.target).is("a,input,label,textarea")||a.which!=1)){l=true;b=c(this);p=b.height();n=b.width();h=b.parentsUntil(".siteMap").filter("ul");g=h.eq(-1);g.css("position","relative");d=a.pageY;i=o(this,g.get(0));$clone=b.clone(true).attr("target",
+true);for(a=h.length-1;a;a--)$clone=$clone.wrap("<li><ul /></li>").parent().parent();m=[];g.find("li").each(function(){if(b[0]===this||b.has(this).length)return true;var a=o(this,g.get(0));m.push({top:a.top,bottom:a.top+32,item:this})});$clone.find(".side,input").remove().end().addClass("draggable").css({position:"absolute",opacity:0.6,width:n,height:p,left:i.left,top:i.top,zIndex:100}).appendTo(g.eq(0));k.css({position:"absolute",opacity:0.6,width:n,height:"5px",left:i.left,top:i.top,zIndex:99}).appendTo(g.eq(0));
+b.css("opacity",0.6);c(document).unbind("mousemove.st mouseup.st").bind("mousemove.st",function(a){var b,c,e,f;j=null;a=i.top-(d-a.pageY);for(b=0,c=m.length;b<c;b++){f=a;e=m[b];if(b==0&&f<e.top)f=e.top;if(b==c-1&&f>e.bottom)f=e.bottom;if(e.top<=f&&e.bottom>=f){b=e.item;Math.abs(e.top-f)<=3?(k.css({top:e.top-3,height:"5px"}),f="before"):Math.abs(e.bottom-f)<=3?(k.css({top:e.bottom-3,height:"5px"}),f="after"):(k.css({top:e.top+3,height:"27px"}),f="prepend");j={element:b,state:f};break}}$clone.css({top:a})}).bind("mouseup.st",
+function(){var a,d;l=false;c(document).unbind("mousemove.st mouseup.st");b.css("opacity","");$clone.remove();k.remove();d=c("<li />").height(b.height());if(j){a=c(j.element);b.before(d);if(j.state=="prepend")a.find(">ul").length||a.find(">.side").after("<ul>"),a.find(">ul").prepend(b.hide());else a[j.state](b.hide());b.slideDown(100,function(){b.removeClass("active")});d.slideUp(100,function(){var a=d.parent();d.remove();a.children("li").length||a.remove()});b.trigger("dropped.st")}});return false}},
+"mouseover.st":function(){l||c(this).addClass("active");return false},"mouseout.st":function(){l||c(this).removeClass("active");return false}}).find("li").prepend('<button type="button" class="moveTo">Move to</button>').append('<span class="vr"></span><span class="hr"></span>').find("input:text").focus(function(){var a=c(this),d=a.prev("label"),b=a.parent();a.width(b.width()-(parseInt(b.css("text-indent"))||0)-a.next(".side").width()-60).css("opacity","");d.hide()}).blur(function(){var a=c(this),
+d=a.prev("label"),b=a.val();a.width(0).css("opacity",0);d.removeClass("no-text").empty().text(b).show();b||d.addClass("no-text").text("---")}).each(function(a){var d=c(this),a="sitemap-id-"+a;d.attr("id",a).css({width:0,opacity:0,overflow:"hidden"}).before("<label />").prev("label").attr("for",a).text(d.val())}).end().end()});
diff --git a/modules/admin/tpl/js/theme.js b/modules/admin/tpl/js/theme.js
new file mode 100644
index 000000000..2fdd0a2fd
--- /dev/null
+++ b/modules/admin/tpl/js/theme.js
@@ -0,0 +1,165 @@
+jQuery(function($){
+
+$('#theme,#skin')
+	// 'show all' button
+	.find('button.showAll')
+		.text('Show All')
+		.click(function(){
+			var $this = $(this), $thumbarea = $('#skin').find('>.thumbPreview');
+
+			if($this.toggleClass('hideAll').hasClass('hideAll')) {
+				$this.text('Hide All');
+				$thumbarea.children('li')
+					.addClass('active')
+					.removeClass('highlight')
+					.eq(0).addClass('highlight').end()
+					.find('>ul.a:not(.selected)').show();
+			} else {
+				$this.text('Show All');
+				$thumbarea.children('li')
+					.removeClass('active highlight')
+					.find('>ul.a:not(.selected)').hide();
+			}
+		})
+	.end()
+	// all thumbnail area
+	.find('>.thumbPreview')
+		.removeClass('jx')
+		// thumbnail list
+		.find('ul.a')
+			.hide()
+			.before('<ul class="a selected"></ul>')
+			.prev('ul.a')
+				.each(function(){
+					var $this = $(this);
+
+					$this
+						.delegate('span.thumb', 'click', function(){
+							$(this).closest('.a').nextAll('a.prevToggle:first').trigger('toggle.tp');
+							return false;
+						})
+						.append($this.next('.a').find('>li.noDirection:first'));
+				})
+			.end()
+			.after('<a href="#toggle-tp" class="prevToggle">Show</a>')
+			.next('a.prevToggle')
+				.bind('toggle.tp', function(){
+					var $list = $(this).prev('.a'), $items, duration = 100;
+
+					$items = $list.closest('.thumbPreview').children('li').removeClass('highlight').end();
+
+					if($list.parent().toggleClass('active').hasClass('active')) {
+						$list.slideDown(duration).closest('li').addClass('highlight');
+					} else {
+						$list.slideUp(duration);
+					}
+				})
+				.click(function(){ $(this).trigger('toggle.tp'); return false; })
+			.end()
+			// thumbnail act as a label for a radio button
+			.find('span.thumb')
+				.attr('role', 'radio') // WAI-ARIA role
+				.click(function(){
+					$(this).next('input:radio').prop('checked', true).change();
+				})
+			.end()
+			.find('> .i > label').attr('title', function(){ return $(this).text() }).end()
+			.find('input:radio')
+				.bind('redraw', function(){
+					var $this = $(this), $big = $this.closest('.a').prev('.a'), val = $this.val();
+
+					// skip following actions if this checkbox was selected just before
+					if(val == $big.find('>li:eq(1)').data('value')) return;
+
+					$big.find('>li:not(.noDirection)').remove();
+
+					if(!val) { // select none
+						$big.children('li.noDirection').show();
+					} else {
+						$this.closest('li').clone()
+							.find('input:radio').remove().end()
+							.find('label')
+								.wrapInner('<strong>')
+ 								.find('>strong')
+									.text(function(){ return $(this).attr('title') })
+									.unwrap()
+								.end()
+							.end()
+							.appendTo($big);
+
+						$big.find('>li.noDirection').hide();
+					}
+				})
+				.change(function(){
+					var $this = $(this);
+
+					$this.trigger('redraw');
+
+					// reselect theme
+					if($this.attr('name') != 'themeItem') {
+						$('#theme').trigger('select-theme');
+					}
+				})
+				.filter(':checked').change().end()
+				.filter('[name="themeItem"]')
+					.change(function(){
+						var $this = $(this), themes, thm, $radios, name;
+
+						themes = $('#theme').data('themes') || {};
+						thm = themes[$this.val()];
+
+						if(!thm) return;
+
+						$radios = $('#skin').find('.i > input:radio').filter('[value=""]').prop('checked', true).end();
+
+						for(var x in thm) {
+							if(!thm.hasOwnProperty(x)) continue;
+
+							name = (x == 'layout')?x:x+'-skin';
+
+							if(thm[x]) $radios.filter('[name="'+name+'"][value="'+thm[x]+'"]').prop('checked', true);
+						}
+
+						$radios.filter(':checked').trigger('redraw');
+					})
+				.end()
+
+$('#theme')
+	.bind('select-theme', function(){
+		var $this = $(this), themes, $radios, form, selection, sel_obj={}, sel_str, name;
+
+		themes  = $this.data('themes') || {};
+		$radios = $('#skin').find('.i > input:radio');
+		selection = $radios.filter(':checked[value!=""]').get();
+		form = $radios.get(0).form;
+
+		for(var i=0,c=selection.length; i < c; i++) {
+			name = selection[i].name.match(/^layout|(\w+)-skin$/);
+			sel_obj[name[1]||name[0]] = selection[i].value;
+		}
+
+		function obj2str(obj){
+			var s = '';
+			for(var x in obj) {
+				if(!obj.hasOwnProperty(x)) continue;
+				if(x != 'layout' && !form.elements[x+'-skin']) continue;
+				s += x+'\t'+obj[x]+'\n';
+			}
+			return s;
+		}
+
+		sel_str = obj2str(sel_obj);
+
+		// no matched theme => this theme is user-defined
+		for(var thm in themes) {
+			if(!themes.hasOwnProperty(thm)) continue;
+			if(sel_str == obj2str(themes[thm])) {
+				$this.find('input:radio[name="themeItem"][value="'+thm+'"]').prop('checked', true).change();
+				return;
+			}
+		}
+
+		$this.find('input:radio[name="themeItem"][value="user_define"]').prop('checked', true).change();
+	});
+
+});
diff --git a/modules/admin/tpl/js/theme.min.js b/modules/admin/tpl/js/theme.min.js
new file mode 100644
index 000000000..77ef4d8b5
--- /dev/null
+++ b/modules/admin/tpl/js/theme.min.js
@@ -0,0 +1,6 @@
+jQuery(function(c){c("#theme,#skin").find("button.showAll").text("Show All").click(function(){var a=c(this),b=c("#skin").find(">.thumbPreview");a.toggleClass("hideAll").hasClass("hideAll")?(a.text("Hide All"),b.children("li").addClass("active").removeClass("highlight").eq(0).addClass("highlight").end().find(">ul.a:not(.selected)").show()):(a.text("Show All"),b.children("li").removeClass("active highlight").find(">ul.a:not(.selected)").hide())}).end().find(">.thumbPreview").removeClass("jx").find("ul.a").hide().before('<ul class="a selected"></ul>').prev("ul.a").each(function(){var a=
+c(this);a.delegate("span.thumb","click",function(){c(this).closest(".a").nextAll("a.prevToggle:first").trigger("toggle.tp");return false}).append(a.next(".a").find(">li.noDirection:first"))}).end().after('<a href="#toggle-tp" class="prevToggle">Show</a>').next("a.prevToggle").bind("toggle.tp",function(){var a=c(this).prev(".a");a.closest(".thumbPreview").children("li").removeClass("highlight").end();a.parent().toggleClass("active").hasClass("active")?a.slideDown(100).closest("li").addClass("highlight"):
+a.slideUp(100)}).click(function(){c(this).trigger("toggle.tp");return false}).end().find("span.thumb").attr("role","radio").click(function(){c(this).next("input:radio").prop("checked",true).change()}).end().find("> .i > label").attr("title",function(){return c(this).text()}).end().find("input:radio").bind("redraw",function(){var a=c(this),b=a.closest(".a").prev(".a"),e=a.val();e!=b.find(">li:eq(1)").data("value")&&(b.find(">li:not(.noDirection)").remove(),e?(a.closest("li").clone().find("input:radio").remove().end().find("label").wrapInner("<strong>").find(">strong").text(function(){return c(this).attr("title")}).unwrap().end().end().appendTo(b),
+b.find(">li.noDirection").hide()):b.children("li.noDirection").show())}).change(function(){var a=c(this);a.trigger("redraw");a.attr("name")!="themeItem"&&c("#theme").trigger("select-theme")}).filter(":checked").change().end().filter('[name="themeItem"]').change(function(){var a=c(this),b,e;if(a=(c("#theme").data("themes")||{})[a.val()]){b=c("#skin").find(".i > input:radio").filter('[value=""]').prop("checked",true).end();for(var d in a)a.hasOwnProperty(d)&&(e=d=="layout"?d:d+"-skin",a[d]&&b.filter('[name="'+
+e+'"][value="'+a[d]+'"]').prop("checked",true));b.filter(":checked").trigger("redraw")}}).end();c("#theme").bind("select-theme",function(){function a(a){var c="",b;for(b in a)if(a.hasOwnProperty(b)&&(b=="layout"||i.elements[b+"-skin"]))c+=b+"\t"+a[b]+"\n";return c}var b=c(this),e,d,i,f,j={};e=b.data("themes")||{};d=c("#skin").find(".i > input:radio");f=d.filter(':checked[value!=""]').get();i=d.get(0).form;for(var g=0,k=f.length;g<k;g++)d=f[g].name.match(/^layout|(\w+)-skin$/),j[d[1]||d[0]]=f[g].value;
+f=a(j);for(var h in e)if(e.hasOwnProperty(h)&&f==a(e[h])){b.find('input:radio[name="themeItem"][value="'+h+'"]').prop("checked",true).change();return}b.find('input:radio[name="themeItem"][value="user_define"]').prop("checked",true).change()})});
diff --git a/modules/admin/tpl/layout.html b/modules/admin/tpl/layout.html
index 0873f9da2..d54564993 100644
--- a/modules/admin/tpl/layout.html
+++ b/modules/admin/tpl/layout.html
@@ -1,19 +1,8 @@
-<!--#include("./_header.html")-->
-
-		<div class="content">
-            <!--@if($logged_info->is_admin == 'Y')-->
-            <p class="path">
-                <a href="{getUrl('','module','admin')}">{$lang->admin_index}</a> 
-                <!--@if($selected_module_info)-->
-                &gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$selected_module_info->admin_index_act)}">{$selected_module_info->title}</a>
-                <!--@end-->
-                <!--@if($module_info)-->
-                &gt; <a href="{getUrl('','mid',$mid,'module',$module,'act',$selected_module_info->admin_index_act)}">{$module_info->browser_title}</a>
-                [<a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href);return false;">{$lang->cmd_view}</a>]
-                <!--@end-->
-            </p>
-            <!--@end-->
-            {$content}
-        </div>
-
-<!--#include("./_footer.html")-->
+<!--#include("./_spHeader.html")-->
+<div class="content" id="content">
+	{$content}
+</div>
+<!--@if($parentSrl != 0)-->
+<!--#include("./_spLnb.content.html")-->
+<!--@end-->
+<!--#include("./_spFooter.html")-->
diff --git a/modules/admin/tpl/swf/count.swf b/modules/admin/tpl/swf/count.swf
deleted file mode 100644
index f0b906ccc..000000000
Binary files a/modules/admin/tpl/swf/count.swf and /dev/null differ
diff --git a/modules/admin/tpl/theme.html b/modules/admin/tpl/theme.html
new file mode 100644
index 000000000..ddd142866
--- /dev/null
+++ b/modules/admin/tpl/theme.html
@@ -0,0 +1,128 @@
+<load target="js/theme.js" type="body" usecdn="true" />
+
+<script type="text/javascript">
+jQuery(function($){
+
+var themes = {};
+
+<!--@foreach($theme_list as $key=>$val)-->
+{@$skins = array()}
+<!--@foreach($val->skin_infos as $module=>$skin_info)-->
+	{@$skins[] = "'".$module."' : '".$skin_info->name."'";}
+<!--@end-->
+themes['{$key}'] = {
+	'layout': '{$val->layout_info->layout_srl}',
+	{implode(',',$skins)}
+};
+
+<!--@end-->
+$('#theme').data('themes', themes);
+
+});
+</script>
+
+	<h1 class="h1">{$lang->menu_gnb_sub['theme']}</h1>
+	<p class="xe_validator_error">{$XE_VALIDATOR_ERROR}</p>
+	<form ruleset="insertThemeInfo" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="admin" />
+	<input type="hidden" name="act" value="procAdminInsertThemeInfo">
+		<fieldset id="theme">
+			<h2 class="h2">{$lang->theme_setting}</h2>
+			<p>{$lang->theme_desc}</p>
+			<ul class="thumbPreview">
+				<li>
+					<p class="q">{$lang->selected_theme}</p>
+					<ul class="a">
+						{@$current_theme = ($theme_info)?$theme_info->theme:'user_define'}
+						<li class="i" loop="$theme_list=>$key,$val">
+							<span class="thumb"><!--@if($val->thumbnail)--><img src="{$val->thumbnail}" alt="" /><!--@else-->{$lang->msg_thumbnail_not_exist}<!--@end--></span>
+							<input type="radio" name="themeItem" id="{$key}" value="{$key}" <!--@if($key == $current_theme)-->checked="checked"<!--@end--> />
+							<label for="{$key}">{$val->title}({$key})</label>
+							<ul>
+								<li>&middot; {$lang->version}: {$val->version}</li>
+								<li>&middot; {$lang->author}:
+									<!--@foreach($val->publisher as $publisher)-->
+									<a href="{$publisher->homepage}" cond="$publisher->homepage">{$publisher->name}</a>
+									<!--@if(!$publisher->homepage)-->{$publisher->name}<!--@end-->
+									<!--@endforeach-->
+								</li>
+								<li>&middot; {$lang->description}: {$val->description}</li>
+								<li>&middot; {$lang->path}: {$val->path}</li>
+							</ul>
+						</li>
+						<li class="i userDefine">
+							<span class="thumb">{$lang->by_you}</span>
+							<input type="radio" name="themeItem" id="theme_user_define" value="user_define" <!--@if($current_theme == 'user_define')-->checked="checked"<!--@end--> />
+							<label for="theme_user_define">{$lang->user_define}</label>
+							<ul>
+								<li>&middot; {$lang->description}: {$lang->no_selected_theme_desc}</li>
+							</ul>
+						</li>
+					</ul>
+				</li>
+			</ul>
+		</fieldset>
+		<fieldset id="skin">
+			<p>{$lang->user_define_skin_select_desc} <button type="button" class="showAll"></button></p>
+			<ul class="thumbPreview jx">
+				<li data-skintype="layout">
+					<p class="q">{$lang->selected_layout}</p>
+					<ul class="a">
+						<li class="i" loop="$layout_list=>$val">
+							<span class="thumb"><span class="frame"><!--@if($val->thumbnail)--><img src="{$val->thumbnail}" alt="" /><!--@else-->{$lang->msg_thumbnail_not_exist}<!--@end--></span></span>
+							<input type="radio" name="layout" id="layout_{$val->layout_srl}" value="{$val->layout_srl}" <!--@if($val->layout_srl == $current_layout)-->checked="checked"<!--@end--> />
+							<label for="layout_{$val->layout_srl}">{$val->layout_title.'('.$val->layout.')'}</label>
+							<ul>
+								<li>&middot; {$lang->version}: {$val->version}</li>
+								<li>&middot; {$lang->author}:
+									<!--@foreach($val->author as $author)-->
+									<a href="{$author->homepage}" cond="$author->homepage">{$author->name}</a>
+									<!--@if(!$author->homepage)-->{$author->name}<!--@end-->
+									<!--@endforeach-->
+								</li>
+								<li>&middot; {$lang->description}: {$val->description}</li>
+								<li>&middot; {$lang->path}: {$val->path}</li>
+								<li>&middot; {$lang->cmd_setup}: <a href="{getUrl('', 'module', 'admin', 'act', 'dispLayoutAdminModify', 'layout', $val->layout,'layout_srl', $val->layout_srl)}">{$lang->cmd_edit}</a></li>
+							</ul>
+						</li>
+					</ul>
+				</li>
+				<li loop="$module_list=>$mkey,$mval" cond="$mkey!='__IS_PARSE__'" data-skintype="{$mkey}">
+					<p class="q">{sprintf($lang->selected_skin, $mval['title'])}</p>
+					<ul class="a">
+						<li class="i noDirection" cond="!$theme_info->skin_info[$mkey]">
+							<span class="thumb"><span class="frame"></span></span>
+							<strong>{sprintf($lang->no_selected_skin, $mval['title'])}</strong>
+							<ul>
+								<li>{$lang->no_selected_skin_desc}</li>
+							</ul>
+						</li>
+						<li class="i" loop="$mval['skins']=>$skey,$sval">
+							{@ $id = $mkey.'_'.$skey }
+							<span class="thumb"><span class="frame"><!--@if($sval->thumbnail)--><img src="{$sval->thumbnail}" alt="" /><!--@else-->{$lang->msg_thumbnail_not_exist}<!--@end--></span></span>
+							<input type="radio" name="{$mkey}-skin" id="{$id}" value="{$skey}" checked="checked"|cond="$theme_info->skin_info[$mkey]==$skey" />
+							<label for="{$id}">{$sval->title.'('.$skey.')'}</label>
+							<ul>
+								<li>&middot; {$lang->version}: {$sval->version}</li>
+								<li>&middot; {$lang->author}:
+									<!--@foreach($sval->author as $author)-->
+									<a href="{$author->homepage}" cond="$author->homepage">{$author->name}</a>
+									<!--@if(!$author->homepage)-->{$author->name}<!--@end-->
+									<!--@endforeach-->
+								</li>
+								<li>&middot; {$lang->description}: {$sval->description}</li>
+							</ul>
+						</li>
+						<li class="i">
+							<span class="thumb"><span class="frame">{$lang->msg_thumbnail_not_exist}</span></span>
+							<input type="radio" name="{$mkey}-skin" id="{$mkey}_none" value="" checked="checked"|cond="!$theme_info->skin_info[$mkey]" />
+							<label for="{$mkey}_none">{$lang->no_select}</label>
+						</li>
+					</ul>
+				</li>
+			</ul>
+		</fieldset>
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</form>
diff --git a/modules/adminlogging/adminlogging.class.php b/modules/adminlogging/adminlogging.class.php
new file mode 100644
index 000000000..f4f149957
--- /dev/null
+++ b/modules/adminlogging/adminlogging.class.php
@@ -0,0 +1,39 @@
+<?php
+    /**
+     * @class  admin
+     * @author NHN (developers@xpressengine.com)
+     * @brief  base class of admin module
+     **/
+
+    class adminlogging extends ModuleObject {
+        /**
+         * @brief install admin module
+         * @return new Object
+         **/
+        function moduleInstall() {
+            return new Object();
+        }
+
+        /**
+         * @brief if update is necessary it returns true
+         **/
+        function checkUpdate() {
+            return false;
+        }
+
+        /**
+         * @brief update module
+         * @return new Object
+         **/
+        function moduleUpdate() {
+            return new Object();
+        }
+
+        /**
+         * @brief regenerate cache file
+         * @return none
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/adminlogging/adminlogging.controller.php b/modules/adminlogging/adminlogging.controller.php
new file mode 100644
index 000000000..2d28f82b7
--- /dev/null
+++ b/modules/adminlogging/adminlogging.controller.php
@@ -0,0 +1,33 @@
+<?php
+    /**
+     * @class  adminAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief  admin controller class of admin module
+     **/
+
+    class adminloggingController extends adminlogging {
+        /**
+         * @brief initialization
+         * @return none
+         **/
+        function init() {
+            // forbit access if the user is not an administrator
+            $oMemberModel = &getModel('member');
+            $logged_info = $oMemberModel->getLoggedInfo();
+            if($logged_info->is_admin!='Y') return $this->stop("msg_is_not_administrator");
+        }
+
+		function insertLog($module, $act)
+		{
+			if(!$module || !$act) return;
+
+			$args->module = $module;
+			$args->act = $act;
+			$args->ipaddress = $_SERVER['REMOTE_ADDR'];
+			$args->regdate = date('YmdHis');
+			$args->requestVars = print_r(Context::getRequestVars(), true);
+
+			$output = executeQuery('adminlogging.insertLog', $args);
+		}
+    }
+?>
diff --git a/modules/adminlogging/adminlogging.model.php b/modules/adminlogging/adminlogging.model.php
new file mode 100644
index 000000000..248f40266
--- /dev/null
+++ b/modules/adminlogging/adminlogging.model.php
@@ -0,0 +1,5 @@
+<?php
+
+    class adminloggingModel extends adminlogging
+    {
+	}
diff --git a/modules/adminlogging/conf/info.xml b/modules/adminlogging/conf/info.xml
new file mode 100644
index 000000000..866d49e04
--- /dev/null
+++ b/modules/adminlogging/conf/info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">관리자 로깅</title>
+    <description xml:lang="ko"></description>
+    <version>0.1</version>
+    <date>2011-09-28</date>
+    <category>system</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/adminlogging/conf/module.xml b/modules/adminlogging/conf/module.xml
new file mode 100644
index 000000000..5635c330d
--- /dev/null
+++ b/modules/adminlogging/conf/module.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<module>
+    <grants />
+    <permissions />
+    <actions>
+    </actions>
+</module>
diff --git a/modules/adminlogging/queries/insertLog.xml b/modules/adminlogging/queries/insertLog.xml
new file mode 100644
index 000000000..9c4f6ab06
--- /dev/null
+++ b/modules/adminlogging/queries/insertLog.xml
@@ -0,0 +1,13 @@
+<query id="insertLog" action="insert">
+	<tables>
+		<table name="admin_log" />
+	</tables>
+	<columns>
+		<column name="ipaddress" var="ipaddress" notnull="notnull" />
+		<column name="regdate" var="regdate" />
+		<column name="site_srl" var="siteSrl" filter="number" default="0" />
+		<column name="module" var="module" />
+		<column name="act" var="act" />
+		<column name="request_vars" var="requestVars" />
+	</columns>
+</query>
diff --git a/modules/adminlogging/schemas/admin_log.xml b/modules/adminlogging/schemas/admin_log.xml
new file mode 100644
index 000000000..2c6cd017a
--- /dev/null
+++ b/modules/adminlogging/schemas/admin_log.xml
@@ -0,0 +1,8 @@
+<table name="admin_log">
+    <column name="ipaddress" type="varchar" size="100" notnull="notnull" index="idx_admin_ip" />
+    <column name="regdate" type="date" index="idx_admin_date" />
+	<column name="site_srl" type="number" size="11" default="0" />
+	<column name="module" type="varchar" size="100" />
+	<column name="act" type="varchar" size="100" />
+	<column name="request_vars" type="text" />
+</table>
diff --git a/modules/autoinstall/autoinstall.admin.controller.php b/modules/autoinstall/autoinstall.admin.controller.php
index 0a79006ff..203eebccf 100644
--- a/modules/autoinstall/autoinstall.admin.controller.php
+++ b/modules/autoinstall/autoinstall.admin.controller.php
@@ -1,243 +1,279 @@
-<?php
-    /**
-     * @class  autoinstallAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  autoinstall 모듈의 admin controller class
-     **/
-
-    require_once(_XE_PATH_.'modules/autoinstall/autoinstall.lib.php');
-
-    class autoinstallAdminController extends autoinstall {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        function checkFileCheckSum($file, $checksum){
-            $local_checksum = md5_file(FileHandler::getRealPath($file));
-            return ($local_checksum === $checksum);
-        }
-
-        function _cleanDownloaded($obj){
-            FileHandler::removeDir($obj->download_path);
-        }
-
-        function procAutoinstallAdminUpdateinfo()
-        {
-            $oModel = &getModel('autoinstall');
-            $item = $oModel->getLatestPackage();
-            if($item)
-            {
-                $params["updatedate"] = $item->updatedate;
-            }
-
-            $params["act"] = "getResourceapiUpdate";
-            $body = XmlGenerater::generate($params);
-            $buff = FileHandler::getRemoteResource($this->uri, $body, 3, "POST", "application/xml");
-            $xml = new XmlParser();
-            $xmlDoc = $xml->parse($buff);
-            $this->updateCategory($xmlDoc);
-            $this->updatePackages($xmlDoc);
-            $this->checkInstalled();
-
-            $this->setMessage("success_updated");
-        }
-
-        function checkInstalled()
-        {
-            executeQuery("autoinstall.deleteInstalledPackage");
-            $oModel =& getModel('autoinstall');
-            $packages = $oModel->getPackages();
-            foreach($packages as $package)
-            {
-                $real_path = FileHandler::getRealPath($package->path);
-                if(!file_exists($real_path)) {
-                    continue;
-                }
-
-				$type = $oModel->getTypeFromPath($package->path);
-				if($type == "core")
-				{
-                    $version = __ZBXE_VERSION__; 
-				}
-                else
-                {
-					$config_file = null;
-                    switch($type)
-                    {
-						case "m.layout":
-							$type = "layout";
-						case "module":
-						case "addon":
-						case "layout":
-						case "widget":
-                            $config_file = "/conf/info.xml";
-                        break;
-                        case "component":
-                            $config_file = "/info.xml";
-                        break;
-						case "style":
-						case "m.skin":
-							$type = "skin";
-						case "skin":    
-						case "widgetstyle":
-                            $config_file = "/skin.xml";
-                        break;
-                        case "drcomponent":
-                            $config_file = "/info.xml";
-                            $type = "component";
-                        break;
-                    }
-					if(!$config_file) continue;
-                    $xml = new XmlParser();
-                    $xmlDoc = $xml->loadXmlFile($real_path.$config_file);
-                    if(!$xmlDoc) continue;
-                    $version = $xmlDoc->{$type}->version->body;
-                }
-
-                $args = null;
-                $args->package_srl = $package->package_srl;
-                $args->version = $package->version;
-                $args->current_version = $version;
-                if(version_compare($args->version, $args->current_version, ">"))
-                {
-                    $args->need_update="Y";
-                }
-                else
-                {
-                    $args->need_update="N";
-                }
-
-                $output = executeQuery("autoinstall.insertInstalledPackage", $args);
-            }
-        }
-
-        function procAutoinstallAdminPackageinstall()
-        {
-            @set_time_limit(0);
-            $package_srls = Context::get('package_srl');
-            $oModel =& getModel('autoinstall');
-            $packages = explode(',', $package_srls);
-            $ftp_info =  Context::getFTPInfo();
-            if(!$_SESSION['ftp_password'])
-            {
-                $ftp_password = Context::get('ftp_password');
-            }
-            else
-            {
-                $ftp_password = $_SESSION['ftp_password'];
-            }
-
-            foreach($packages as $package_srl)
-            {
-                $package = $oModel->getPackage($package_srl);
-                if($ftp_info->sftp && $ftp_info->sftp == 'Y')
-                {
-                    $oModuleInstaller = new SFTPModuleInstaller($package);
-                }
-                else if(function_exists(ftp_connect))
-                {
-                    $oModuleInstaller = new PHPFTPModuleInstaller($package);
-                }
-                else
-                {
-                    $oModuleInstaller = new FTPModuleInstaller($package);
-                }
-
-                $oModuleInstaller->setPassword($ftp_password);
-                $output = $oModuleInstaller->install();
-                if(!$output->toBool()) return $output;
-            }
-            $this->setMessage('success_installed');
-        }
-
-        function updatePackages(&$xmlDoc)
-        {
-            $oModel =& getModel('autoinstall');
-            if(!$xmlDoc->response->packages->item) return;
-            if(!is_array($xmlDoc->response->packages->item))
-            {
-                $xmlDoc->response->packages->item = array($xmlDoc->response->packages->item);
-            }
-            $targets = array('package_srl', 'updatedate', 'latest_item_srl', 'path', 'version', 'category_srl');
-            foreach($xmlDoc->response->packages->item as $item)
-            {
-                $args = null;
-                foreach($targets as $target)
-                {
-                    $args->{$target} = $item->{$target}->body;
-                }
-                if($oModel->getPackage($args->package_srl))
-                {
-                    $output = executeQuery("autoinstall.updatePackage", $args);
-                }
-                else
-                {
-                    $output = executeQuery("autoinstall.insertPackage", $args);
-					if(!$output->toBool())
-					{
-						$output = executeQuery("autoinstall.deletePackage", $args);
-						$output = executeQuery("autoinstall.insertPackage", $args);
-					}
-                }
-            }
-        }
-
-        function updateCategory(&$xmlDoc)
-        {
-            executeQuery("autoinstall.deleteCategory", $args);
-            $oModel =& getModel('autoinstall');
-            if(!is_array($xmlDoc->response->categorylist->item))
-            {
-                $xmlDoc->response->categorylist->item = array($xmlDoc->response->categorylist->item);
-            }
-            foreach($xmlDoc->response->categorylist->item as $item)
-            {
-                $args = null;
-                $args->category_srl = $item->category_srl->body;
-                $args->parent_srl = $item->parent_srl->body;
-                $args->title = $item->title->body;
-                executeQuery("autoinstall.insertCategory", $args);
-            }
-        }
-
-		function procAutoinstallAdminUninstallPackage()
-		{
-			$package_srl = Context::get('package_srl');
-            $oModel =& getModel('autoinstall');
-			$package = $oModel->getPackage($package_srl);
-			$path = $package->path;
-
-            if(!$_SESSION['ftp_password'])
-            {
-                $ftp_password = Context::get('ftp_password');
-            }
-            else
-            {
-                $ftp_password = $_SESSION['ftp_password'];
-            }
-            $ftp_info =  Context::getFTPInfo();
-
-			if($ftp_info->sftp && $ftp_info->sftp == 'Y')
-			{
-				$oModuleInstaller = new SFTPModuleInstaller($package);
-			}
-			else if(function_exists(ftp_connect))
-			{
-				$oModuleInstaller = new PHPFTPModuleInstaller($package);
-			}
-			else
-			{
-				$oModuleInstaller = new FTPModuleInstaller($package);
-			}
-
-			$oModuleInstaller->setPassword($ftp_password);
-			$output = $oModuleInstaller->uninstall();
-			if(!$output->toBool()) return $output;
-
-			$this->setMessage('success_deleted');
-		}
-    }
-?>
+<?php
+    /**
+     * @class  autoinstallAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief autoinstall module admin controller class
+     **/
+
+    require_once(_XE_PATH_.'modules/autoinstall/autoinstall.lib.php');
+
+    class autoinstallAdminController extends autoinstall {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        function checkFileCheckSum($file, $checksum){
+            $local_checksum = md5_file(FileHandler::getRealPath($file));
+            return ($local_checksum === $checksum);
+        }
+
+        function _cleanDownloaded($obj){
+            FileHandler::removeDir($obj->download_path);
+        }
+
+        function procAutoinstallAdminUpdateinfo()
+        {
+			$this->_updateinfo();
+            $this->setMessage("success_updated", 'update');
+			$this->setRedirectUrl(Context::get('error_return_url'));
+        }
+
+		function _updateinfo(){
+            $oModel = &getModel('autoinstall');
+            $item = $oModel->getLatestPackage();
+            if($item)
+            {
+                $params["updatedate"] = $item->updatedate;
+            }
+
+            $params["act"] = "getResourceapiUpdate";
+            $body = XmlGenerater::generate($params);
+            $buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
+            $xml = new XmlParser();
+            $xmlDoc = $xml->parse($buff);
+            $this->updateCategory($xmlDoc);
+            $this->updatePackages($xmlDoc);
+            $this->checkInstalled();
+		}
+
+        function checkInstalled()
+        {
+            executeQuery("autoinstall.deleteInstalledPackage");
+            $oModel =& getModel('autoinstall');
+            $packages = $oModel->getPackages();
+            foreach($packages as $package)
+            {
+                $real_path = FileHandler::getRealPath($package->path);
+                if(!file_exists($real_path)) {
+                    continue;
+                }
+
+				$type = $oModel->getTypeFromPath($package->path);
+				if($type == "core")
+				{
+                    $version = __ZBXE_VERSION__;
+				}
+                else
+                {
+					$config_file = null;
+                    switch($type)
+                    {
+						case "m.layout":
+							$type = "layout";
+						case "module":
+						case "addon":
+						case "layout":
+						case "widget":
+                            $config_file = "/conf/info.xml";
+                        break;
+                        case "component":
+                            $config_file = "/info.xml";
+                        break;
+						case "style":
+						case "m.skin":
+							$type = "skin";
+						case "skin":
+						case "widgetstyle":
+                            $config_file = "/skin.xml";
+                        break;
+                        case "drcomponent":
+                            $config_file = "/info.xml";
+                            $type = "component";
+                        break;
+                        case "theme":
+                            $config_file = "/conf/info.xml";
+                            $type = "theme";
+                        break;
+                    }
+					if(!$config_file) continue;
+                    $xml = new XmlParser();
+                    $xmlDoc = $xml->loadXmlFile($real_path.$config_file);
+                    if(!$xmlDoc) continue;
+                    $version = $xmlDoc->{$type}->version->body;
+                }
+
+                $args = null;
+                $args->package_srl = $package->package_srl;
+                $args->version = $package->version;
+                $args->current_version = $version;
+                if(version_compare($args->version, $args->current_version, ">"))
+                {
+                    $args->need_update="Y";
+                }
+                else
+                {
+                    $args->need_update="N";
+                }
+
+                $output = executeQuery("autoinstall.insertInstalledPackage", $args);
+            }
+        }
+
+        function procAutoinstallAdminPackageinstall()
+        {
+            @set_time_limit(0);
+            $package_srls = Context::get('package_srl');
+            $oModel =& getModel('autoinstall');
+            $packages = explode(',', $package_srls);
+            $ftp_info =  Context::getFTPInfo();
+            if(!$_SESSION['ftp_password'])
+            {
+                $ftp_password = Context::get('ftp_password');
+            }
+            else
+            {
+                $ftp_password = $_SESSION['ftp_password'];
+            }
+
+            foreach($packages as $package_srl)
+            {
+                $package = $oModel->getPackage($package_srl);
+                if($ftp_info->sftp && $ftp_info->sftp == 'Y')
+                {
+                    $oModuleInstaller = new SFTPModuleInstaller($package);
+                }
+                else if(function_exists(ftp_connect))
+                {
+                    $oModuleInstaller = new PHPFTPModuleInstaller($package);
+                }
+                else
+                {
+                    $oModuleInstaller = new FTPModuleInstaller($package);
+                }
+
+				$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
+                $oModuleInstaller->setPassword($ftp_password);
+                $output = $oModuleInstaller->install();
+                if(!$output->toBool()) return $output;
+            }
+
+			$this->_updateinfo();
+
+            $this->setMessage('success_installed', 'update');
+
+			if (Context::get('return_url'))
+			{
+				$this->setRedirectUrl(Context::get('return_url'));
+			}
+			else
+			{
+				$this->setRedirectUrl(preg_replace('/act=[^&]*/', 'act=dispAutoinstallAdminIndex', Context::get('error_return_url')));
+			}
+        }
+
+        function updatePackages(&$xmlDoc)
+        {
+            $oModel =& getModel('autoinstall');
+            if(!$xmlDoc->response->packages->item) return;
+            if(!is_array($xmlDoc->response->packages->item))
+            {
+                $xmlDoc->response->packages->item = array($xmlDoc->response->packages->item);
+            }
+            $targets = array('package_srl', 'updatedate', 'latest_item_srl', 'path', 'version', 'category_srl');
+            foreach($xmlDoc->response->packages->item as $item)
+            {
+                $args = null;
+                foreach($targets as $target)
+                {
+                    $args->{$target} = $item->{$target}->body;
+                }
+                if($oModel->getPackage($args->package_srl))
+                {
+                    $output = executeQuery("autoinstall.updatePackage", $args);
+                }
+                else
+                {
+                    $output = executeQuery("autoinstall.insertPackage", $args);
+					if(!$output->toBool())
+					{
+						$output = executeQuery("autoinstall.deletePackage", $args);
+						$output = executeQuery("autoinstall.insertPackage", $args);
+					}
+                }
+            }
+        }
+
+        function updateCategory(&$xmlDoc)
+        {
+            executeQuery("autoinstall.deleteCategory");
+            $oModel =& getModel('autoinstall');
+            if(!is_array($xmlDoc->response->categorylist->item))
+            {
+                $xmlDoc->response->categorylist->item = array($xmlDoc->response->categorylist->item);
+            }
+			$list_order = 0;
+            foreach($xmlDoc->response->categorylist->item as $item)
+            {
+                $args = null;
+                $args->category_srl = $item->category_srl->body;
+                $args->parent_srl = $item->parent_srl->body;
+                $args->title = $item->title->body;
+				$args->list_order = $list_order++;
+                $output = executeQuery("autoinstall.insertCategory", $args);
+            }
+        }
+
+		function procAutoinstallAdminUninstallPackage()
+		{
+			$package_srl = Context::get('package_srl');
+            $oModel =& getModel('autoinstall');
+			$package = $oModel->getPackage($package_srl);
+			$path = $package->path;
+
+            if(!$_SESSION['ftp_password'])
+            {
+                $ftp_password = Context::get('ftp_password');
+            }
+            else
+            {
+                $ftp_password = $_SESSION['ftp_password'];
+            }
+            $ftp_info =  Context::getFTPInfo();
+
+			if($ftp_info->sftp && $ftp_info->sftp == 'Y')
+			{
+				$oModuleInstaller = new SFTPModuleInstaller($package);
+			}
+			else if(function_exists('ftp_connect'))
+			{
+				$oModuleInstaller = new PHPFTPModuleInstaller($package);
+			}
+			else
+			{
+				$oModuleInstaller = new FTPModuleInstaller($package);
+			}
+
+			$oModuleInstaller->setServerUrl(_XE_DOWNLOAD_SERVER_);
+
+			$oModuleInstaller->setPassword($ftp_password);
+			$output = $oModuleInstaller->uninstall();
+			if(!$output->toBool()) return $output;
+
+			$this->_updateinfo();
+
+			$this->setMessage('success_deleted', 'update');
+
+			if (Context::get('return_url'))
+			{
+				$this->setRedirectUrl(Context::get('return_url'));
+			}
+			else
+			{
+				$this->setRedirectUrl(getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstalledPackages'));
+			}
+		}
+    }
+?>
diff --git a/modules/autoinstall/autoinstall.admin.view.php b/modules/autoinstall/autoinstall.admin.view.php
index 004c75314..fa79de62f 100644
--- a/modules/autoinstall/autoinstall.admin.view.php
+++ b/modules/autoinstall/autoinstall.admin.view.php
@@ -1,330 +1,356 @@
-<?php
-    /**
-     * @class  autoinstallAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  autoinstall 모듈의 admin view class
-     **/
-
-
-    class autoinstallAdminView extends autoinstall {
-
-        var $categories;
-		var $ftp_set = false;
-
-	    function init() {
-		    $template_path = sprintf("%stpl/",$this->module_path);
-            Context::set('original_site', $this->original_site);
-            Context::set('uri', $this->uri);
-		    $this->setTemplatePath($template_path);
-
-            $ftp_info =  Context::getFTPInfo();
-            if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
-			else $this->ftp_set = true;
-
-
-            $this->dispCategory();
-            $oModel = &getModel('autoinstall');
-            Context::set('tCount', $oModel->getPackageCount(null));
-            Context::set('iCount', $oModel->getInstalledPackageCount());
-	    }
-
-        function rearrange(&$item, &$targets)
-        {
-            $ret = null;
-            foreach($targets as $target)
-            {
-                $ret->{$target} = $item->{$target}->body;
-            }
-            return $ret;
-        }
-
-        function rearranges($items, $packages = null)
-        {
-            if(!is_array($items)) $items = array($items);
-            $item_list = array();
-            $targets = array('category_srl', 'package_srl', 'item_screenshot_url', 'package_voted', 'package_voter', 'package_description', 'package_downloaded', 'item_regdate', 'title', 'item_version', 'package_star', 'depfrom');
-            $targetpackages = array();
-            foreach($items as $item)
-            {
-                $targetpackages[$item->package_srl->body] = 0;
-            }
-            $oModel = &getModel('autoinstall');
-            if($package == null)
-                $packages = $oModel->getInstalledPackages(array_keys($targetpackages));
-			$depto = array();
-            foreach($items as $item)
-            {
-                $v = $this->rearrange($item, $targets);
-                if($packages[$v->package_srl])
-                {
-                    $v->current_version = $packages[$v->package_srl]->current_version;
-                    $v->need_update = $packages[$v->package_srl]->need_update;
-					$v->type = $oModel->getTypeFromPath($packages[$v->package_srl]->path);
-					if($this->ftp_set && $v->depfrom) {
-						$depfrom = explode("," , $v->depfrom);
-						foreach($depfrom as $package_srl)
-						{
-							$depto[$package_srl][] = $v->package_srl;
-						}
-					}
-					if($v->type == "core") $v->avail_remove = false;
-					else if($v->type == "module") {
-						$v->avail_remove = $oModel->checkRemovable($packages[$v->package_srl]->path);
-					}
-					else $v->avail_remove = true;
-                }
-                $item_list[$v->package_srl] = $v;
-            }
-
-			if(count($depto) > 0)
-			{
-				$installed = $oModel->getInstalledPackages(implode(",", array_keys($depto)));
-				foreach($installed as $key=>$val)
-				{
-					$path = $val->path;
-					$type = $oModel->getTypeFromPath($path);
-					if(!$type || $type == "core") continue;
-					$config_file = $oModel->getConfigFilePath($type);
-					if(!$config_file) continue;
-
-                    $xml = new XmlParser();
-                    $xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($path).$config_file);
-					if(!$xmlDoc) continue;
-					if($type == "drcomponent") $type = "component";
-					if($type == "style" || $type == "m.skin") $type = "skin";
-					if($type == "m.layout") $type = "layout";
-                    $title = $xmlDoc->{$type}->title->body;
-					$installed[$key]->title = $title;
-				}
-
-				Context::set('installed', $installed);
-				foreach($installed as $key=>$val)
-				{
-					foreach($depto[$key] as $package_srl)
-					{
-						$item_list[$package_srl]->avail_remove = false;
-						$item_list[$package_srl]->deps[] = $key;
-					}
-				}
-			}
-
-            return $item_list;
-        }
-
-        function dispAutoinstallAdminInstalledPackages()
-        {
-            $page = Context::get('page');
-            if(!$page) $page = 1;
-            Context::set('page', $page);
-            $oModel = &getModel('autoinstall');
-            $output = $oModel->getInstalledPackageList($page);
-            $package_list = $output->data;
-
-            $params["act"] = "getResourceapiPackages";
-            $params["package_srls"] = implode(",", array_keys($package_list));
-            $body = XmlGenerater::generate($params);
-            $buff = FileHandler::getRemoteResource($this->uri, $body, 3, "POST", "application/xml");
-            $xml_lUpdate = new XmlParser();
-            $xmlDoc = $xml_lUpdate->parse($buff);
-            if($xmlDoc && $xmlDoc->response->packagelist->item)
-            {
-                $item_list = $this->rearranges($xmlDoc->response->packagelist->item, $package_list);
-                $res = array();
-                foreach($package_list as $package_srl => $package)
-                {
-                    $res[] = $item_list[$package_srl];
-                }
-                Context::set('item_list', $res);
-            }
-            Context::set('page_navigation', $output->page_navigation);
-
-            $this->setTemplateFile('index');
-
-			$security = new Security();
-			$security->encodeHTML('item_list..');
-        }
-
-        function dispAutoinstallAdminInstall() {
-            $package_srl = Context::get('package_srl');
-            if(!$package_srl) return $this->dispAutoinstallAdminIndex();
-
-            $params["act"] = "getResourceapiInstallInfo";
-            $params["package_srl"] = $package_srl;
-            $xmlDoc = XmlGenerater::getXmlDoc($params);
-            $oModel = &getModel('autoinstall');
-
-            $targetpackages = array();
-            if($xmlDoc)
-            {
-                $xmlPackage =& $xmlDoc->response->package;
-                $package->package_srl = $xmlPackage->package_srl->body;
-                $package->title = $xmlPackage->title->body;
-                $package->package_description = $xmlPackage->package_description->body;
-                $package->version = $xmlPackage->version->body;
-                $package->path = $xmlPackage->path->body;
-                if($xmlPackage->depends)
-                {
-                    if(!is_array($xmlPackage->depends->item)) $xmlPackage->depends->item = array($xmlPackage->depends->item);
-                    $package->depends = array();
-                    foreach($xmlPackage->depends->item as $item)
-                    {
-                        $dep_item = null;
-                        $dep_item->package_srl = $item->package_srl->body;
-                        $dep_item->title = $item->title->body;
-                        $dep_item->version = $item->version->body;
-                        $dep_item->path = $item->path->body;
-                        $package->depends[] = $dep_item;
-                        $targetpackages[$dep_item->package_srl] = 1;
-                    }
-                    $packages = $oModel->getInstalledPackages(array_keys($targetpackages));
-                    $package->deplist = "";
-                    foreach($package->depends as $key => $dep)
-                    {
-                        if(!$packages[$dep->package_srl]) {
-                            $package->depends[$key]->installed = false;
-                            $package->package_srl .= ",". $dep->package_srl;
-                        }
-                        else {
-                            $package->depends[$key]->installed = true;
-                            $package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
-                            if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
-                            {
-                                $package->depends[$key]->need_update = true;
-                                $package->package_srl .= ",". $dep->package_srl;
-                            }
-                            else
-                            {
-                                $package->need_update = false;
-                            }
-                        }
-                    }
-                }
-                $installedPackage = $oModel->getInstalledPackage($package_srl);
-                if($installedPackage) {
-                    $package->installed = true;
-                    $package->cur_version = $installedPackage->current_version;
-                    $package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
-                }
-                Context::set("package", $package);
-            }
-            if(!$_SESSION['ftp_password'])
-            {
-                Context::set('need_password', true);
-            }
-            $this->setTemplateFile('install');
-
-			$security = new Security();
-			$security->encodeHTML('package.' , 'package.depends..');
-        }
-
-        function dispAutoinstallAdminIndex() {
-            $oModuleModel = &getModel('module');
-			$config = $oModuleModel->getModuleConfig('autoinstall');
-            $ftp_info =  Context::getFTPInfo();
-            if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
-
-            $this->setTemplateFile('index');
-
-            $params = array();
-            $params["act"] = "getResourceapiLastupdate";
-            $body = XmlGenerater::generate($params);
-            $buff = FileHandler::getRemoteResource($this->uri, $body, 3, "POST", "application/xml");
-            $xml_lUpdate = new XmlParser();
-            $lUpdateDoc = $xml_lUpdate->parse($buff);
-            $updateDate = $lUpdateDoc->response->updatedate->body;
-
-            $oModel = &getModel('autoinstall');
-            $item = $oModel->getLatestPackage();
-            if(!$item || $item->updatedate < $updateDate || count($this->categories) < 1)
-            {
-                Context::set('need_update', true);
-                return;
-            }
-
-
-            $page = Context::get('page');
-            if(!$page) $page = 1;
-            Context::set('page', $page);
-
-            $order_type = Context::get('order_type');
-            if(!in_array($order_type, array('asc', 'desc'))) $order_type = 'desc';
-            Context::set('order_type', $order_type);
-
-            $order_target = Context::get('order_target');
-            if(!in_array($order_target, array('newest', 'download', 'popular'))) $order_target = 'newest';
-            Context::set('order_target', $order_target);
-
-            $search_keyword = Context::get('search_keyword');
-
-            $childrenList = Context::get('childrenList');
-            $category_srl = Context::get('category_srl');
-            if($childrenList) $params["category_srl"] = $childrenList;
-            else if($category_srl) $params["category_srl"] = $category_srl;
-
-            $params["act"] = "getResourceapiPackagelist";
-            $params["order_target"] = $order_target;
-            $params["order_type"] = $order_type;
-            $params["page"] = $page;
-            if($search_keyword)
-            {
-                $params["search_keyword"] = $search_keyword;
-            }
-            $xmlDoc = XmlGenerater::getXmlDoc($params);
-            if($xmlDoc && $xmlDoc->response->packagelist->item)
-            {
-                $item_list = $this->rearranges($xmlDoc->response->packagelist->item);
-                Context::set('item_list', $item_list);
-                $array = array('total_count', 'total_page', 'cur_page', 'page_count', 'first_page', 'last_page');
-                $page_nav = $this->rearrange($xmlDoc->response->page_navigation, $array);
-                $page_navigation = new PageHandler($page_nav->total_count, $page_nav->total_page, $page_nav->cur_page, $page_nav->page_count);
-                Context::set('page_navigation', $page_navigation);
-            }
-
-			$security = new Security();
-			$security->encodeHTML('package.' , 'package.depends..');
-
-        }
-
-        function dispCategory()
-        {
-            $oModel = &getModel('autoinstall');
-            $this->categories = &$oModel->getCategoryList();
-            Context::set('categories', $this->categories);
-        }
-
-		function dispAutoinstallAdminUninstall()
-		{
-            $package_srl = Context::get('package_srl');
-            if(!$package_srl) return $this->dispAutoinstallAdminIndex();
-			$oModel =& getModel('autoinstall');
-			$installedPackage = $oModel->getInstalledPackage($package_srl);
-			if(!$installedPackage) return $this->dispAutoinstallAdminInstalledPackages();
-
-            if(!$_SESSION['ftp_password'])
-            {
-                Context::set('need_password', true);
-            }
-			$installedPackage = $oModel->getPackage($package_srl);
-			$path = $installedPackage->path;
-			$type = $oModel->getTypeFromPath($path);
-			if(!$type || $type == "core") $this->stop("msg_invalid_request");
-			$config_file = $oModel->getConfigFilePath($type);
-			if(!$config_file) $this->stop("msg_invalid_request");
-
-			$xml = new XmlParser();
-			$xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($path).$config_file);
-			if(!$xmlDoc) $this->stop("msg_invalid_request");
-			if($type == "drcomponent") $type = "component";
-			if($type == "style") $type = "skin";
-			$title = $xmlDoc->{$type}->title->body;
-			$installedPackage->title = $title;
-			$installedPackage->type = $type;
-			Context::set('package', $installedPackage);
-            $this->setTemplateFile('uninstall');
-            Context::addJsFilter($this->module_path.'tpl/filter', 'uninstall_package.xml');
-
-			$security = new Security();
-			$security->encodeHTML('package.');
-		}
-    }
-?>
+<?php
+    /**
+     * @class  autoinstallAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class in the autoinstall module
+     **/
+
+
+    class autoinstallAdminView extends autoinstall {
+
+        var $categories;
+		var $ftp_set = false;
+
+	    function init() {
+		    $template_path = sprintf("%stpl/",$this->module_path);
+            Context::set('original_site', _XE_LOCATION_SITE_);
+            Context::set('uri', _XE_DOWNLOAD_SERVER_);
+		    $this->setTemplatePath($template_path);
+
+            $ftp_info =  Context::getFTPInfo();
+            if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
+			else $this->ftp_set = true;
+
+
+            $this->dispCategory();
+            $oModel = &getModel('autoinstall');
+            Context::set('tCount', $oModel->getPackageCount(null));
+            Context::set('iCount', $oModel->getInstalledPackageCount());
+	    }
+
+        function rearrange(&$item, &$targets)
+        {
+            $ret = null;
+            foreach($targets as $target)
+            {
+                $ret->{$target} = $item->{$target}->body;
+            }
+            return $ret;
+        }
+
+        function rearranges($items, $packages = null)
+        {
+            if(!is_array($items)) $items = array($items);
+            $item_list = array();
+            $targets = array('category_srl', 'package_srl', 'item_screenshot_url', 'package_voted', 'package_voter', 'package_description', 'package_downloaded', 'item_regdate', 'title', 'item_version', 'package_star', 'depfrom');
+            $targetpackages = array();
+            foreach($items as $item)
+            {
+                $targetpackages[$item->package_srl->body] = 0;
+            }
+            $oModel = &getModel('autoinstall');
+            if($package == null)
+                $packages = $oModel->getInstalledPackages(array_keys($targetpackages));
+			$depto = array();
+            foreach($items as $item)
+            {
+                $v = $this->rearrange($item, $targets);
+				$v->category = $this->categories[$v->category_srl]->title;
+                if($packages[$v->package_srl])
+                {
+                    $v->current_version = $packages[$v->package_srl]->current_version;
+                    $v->need_update = $packages[$v->package_srl]->need_update;
+					$v->type = $oModel->getTypeFromPath($packages[$v->package_srl]->path);
+					if($this->ftp_set && $v->depfrom) {
+						$depfrom = explode("," , $v->depfrom);
+						foreach($depfrom as $package_srl)
+						{
+							$depto[$package_srl][] = $v->package_srl;
+						}
+					}
+					if($v->type == "core") $v->avail_remove = false;
+					else if($v->type == "module") {
+						$v->avail_remove = $oModel->checkRemovable($packages[$v->package_srl]->path);
+					}
+					else $v->avail_remove = true;
+                }
+                $item_list[$v->package_srl] = $v;
+            }
+
+			if(count($depto) > 0)
+			{
+				$installed = $oModel->getInstalledPackages(implode(",", array_keys($depto)));
+				foreach($installed as $key=>$val)
+				{
+					$path = $val->path;
+					$type = $oModel->getTypeFromPath($path);
+					if(!$type || $type == "core") continue;
+					$config_file = $oModel->getConfigFilePath($type);
+					if(!$config_file) continue;
+
+                    $xml = new XmlParser();
+                    $xmlDoc = $xml->loadXmlFile(FileHandler::getRealPath($path).$config_file);
+					if(!$xmlDoc) continue;
+					if($type == "drcomponent") $type = "component";
+					if($type == "style" || $type == "m.skin") $type = "skin";
+					if($type == "m.layout") $type = "layout";
+                    $title = $xmlDoc->{$type}->title->body;
+					$installed[$key]->title = $title;
+				}
+
+				Context::set('installed', $installed);
+
+				foreach($installed as $key=>$val)
+				{
+					foreach($depto[$key] as $package_srl)
+					{
+						$item_list[$package_srl]->avail_remove = false;
+						$item_list[$package_srl]->deps[] = $key;
+					}
+				}
+			}
+
+            return $item_list;
+        }
+
+        function dispAutoinstallAdminInstalledPackages()
+        {
+            $page = Context::get('page');
+            if(!$page) $page = 1;
+            Context::set('page', $page);
+            $oModel = &getModel('autoinstall');
+            $output = $oModel->getInstalledPackageList($page);
+            $package_list = $output->data;
+
+            $params["act"] = "getResourceapiPackages";
+            $params["package_srls"] = implode(",", array_keys($package_list));
+            $body = XmlGenerater::generate($params);
+            $buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
+            $xml_lUpdate = new XmlParser();
+            $xmlDoc = $xml_lUpdate->parse($buff);
+            if($xmlDoc && $xmlDoc->response->packagelist->item)
+            {
+                $item_list = $this->rearranges($xmlDoc->response->packagelist->item, $package_list);
+                $res = array();
+                foreach($package_list as $package_srl => $package)
+                {
+                    $res[] = $item_list[$package_srl];
+                }
+                Context::set('item_list', $res);
+            }
+            Context::set('page_navigation', $output->page_navigation);
+
+            $this->setTemplateFile('index');
+
+			$security = new Security();
+			$security->encodeHTML('item_list..');
+        }
+
+        function dispAutoinstallAdminInstall() {
+            $package_srl = Context::get('package_srl');
+            if(!$package_srl) return $this->dispAutoinstallAdminIndex();
+
+            $params["act"] = "getResourceapiInstallInfo";
+            $params["package_srl"] = $package_srl;
+            $xmlDoc = XmlGenerater::getXmlDoc($params);
+            $oModel = &getModel('autoinstall');
+
+            $targetpackages = array();
+            if($xmlDoc)
+            {
+                $xmlPackage =& $xmlDoc->response->package;
+                $package->package_srl = $xmlPackage->package_srl->body;
+                $package->title = $xmlPackage->title->body;
+                $package->package_description = $xmlPackage->package_description->body;
+                $package->version = $xmlPackage->version->body;
+                $package->path = $xmlPackage->path->body;
+                if($xmlPackage->depends)
+                {
+                    if(!is_array($xmlPackage->depends->item)) $xmlPackage->depends->item = array($xmlPackage->depends->item);
+                    $package->depends = array();
+                    foreach($xmlPackage->depends->item as $item)
+                    {
+                        $dep_item = null;
+                        $dep_item->package_srl = $item->package_srl->body;
+                        $dep_item->title = $item->title->body;
+                        $dep_item->version = $item->version->body;
+                        $dep_item->path = $item->path->body;
+                        $package->depends[] = $dep_item;
+                        $targetpackages[$dep_item->package_srl] = 1;
+                    }
+                    $packages = $oModel->getInstalledPackages(array_keys($targetpackages));
+                    $package->deplist = "";
+                    foreach($package->depends as $key => $dep)
+                    {
+                        if(!$packages[$dep->package_srl]) {
+                            $package->depends[$key]->installed = false;
+                            $package->package_srl .= ",". $dep->package_srl;
+                        }
+                        else {
+                            $package->depends[$key]->installed = true;
+                            $package->depends[$key]->cur_version = $packages[$dep->package_srl]->current_version;
+                            if(version_compare($dep->version, $packages[$dep->package_srl]->current_version, ">"))
+                            {
+                                $package->depends[$key]->need_update = true;
+                                $package->package_srl .= ",". $dep->package_srl;
+                            }
+                            else
+                            {
+                                $package->need_update = false;
+                            }
+                        }
+                    }
+                }
+                $installedPackage = $oModel->getInstalledPackage($package_srl);
+                if($installedPackage) {
+                    $package->installed = true;
+                    $package->cur_version = $installedPackage->current_version;
+                    $package->need_update = version_compare($package->version, $installedPackage->current_version, ">");
+                }
+                Context::set("package", $package);
+            }
+            if(!$_SESSION['ftp_password'])
+            {
+                Context::set('need_password', true);
+            }
+            $this->setTemplateFile('install');
+
+			$security = new Security();
+			$security->encodeHTML('package.' , 'package.depends..');
+        }
+
+        function dispAutoinstallAdminIndex() {
+            $oModuleModel = &getModel('module');
+			$config = $oModuleModel->getModuleConfig('autoinstall');
+            $ftp_info =  Context::getFTPInfo();
+            if(!$ftp_info->ftp_root_path) Context::set('show_ftp_note', true);
+
+            $this->setTemplateFile('index');
+
+            $params = array();
+            $params["act"] = "getResourceapiLastupdate";
+            $body = XmlGenerater::generate($params);
+            $buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
+            $xml_lUpdate = new XmlParser();
+            $lUpdateDoc = $xml_lUpdate->parse($buff);
+            $updateDate = $lUpdateDoc->response->updatedate->body;
+
+			if (!$updateDate)
+			{
+				return $this->stop('msg_connection_fail');
+			}
+
+            $oModel = &getModel('autoinstall');
+            $item = $oModel->getLatestPackage();
+            if(!$item || $item->updatedate < $updateDate || count($this->categories) < 1)
+            {
+				$oController = &getAdminController('autoinstall');
+				$oController->_updateinfo();
+
+				if (!$_SESSION['__XE_EASYINSTALL_REDIRECT__'])
+				{
+					header('location: ' . getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminIndex'));
+					$_SESSION['__XE_EASYINSTALL_REDIRECT__'] = true;
+					return;
+				}
+            }
+			unset($_SESSION['__XE_EASYiNSTALL_REDIRECT__']);
+
+            $page = Context::get('page');
+            if(!$page) $page = 1;
+            Context::set('page', $page);
+
+            $order_type = Context::get('order_type');
+            if(!in_array($order_type, array('asc', 'desc'))) $order_type = 'desc';
+            Context::set('order_type', $order_type);
+
+            $order_target = Context::get('order_target');
+            if(!in_array($order_target, array('newest', 'download', 'popular'))) $order_target = 'newest';
+            Context::set('order_target', $order_target);
+
+            $search_keyword = Context::get('search_keyword');
+
+            $childrenList = Context::get('childrenList');
+            $category_srl = Context::get('category_srl');
+            if($childrenList) $params["category_srl"] = $childrenList;
+            else if($category_srl) $params["category_srl"] = $category_srl;
+
+            $params["act"] = "getResourceapiPackagelist";
+            $params["order_target"] = $order_target;
+            $params["order_type"] = $order_type;
+            $params["page"] = $page;
+            if($search_keyword)
+            {
+                $params["search_keyword"] = $search_keyword;
+            }
+            $xmlDoc = XmlGenerater::getXmlDoc($params);
+            if($xmlDoc && $xmlDoc->response->packagelist->item)
+            {
+                $item_list = $this->rearranges($xmlDoc->response->packagelist->item);
+                Context::set('item_list', $item_list);
+                $array = array('total_count', 'total_page', 'cur_page', 'page_count', 'first_page', 'last_page');
+                $page_nav = $this->rearrange($xmlDoc->response->page_navigation, $array);
+                $page_navigation = new PageHandler($page_nav->total_count, $page_nav->total_page, $page_nav->cur_page, 5);
+                Context::set('page_navigation', $page_navigation);
+            }
+
+			$security = new Security();
+			$security->encodeHTML('package.' , 'package.depends..');
+
+        }
+
+        function dispCategory()
+        {
+            $oModel = &getModel('autoinstall');
+            $this->categories = &$oModel->getCategoryList();
+            Context::set('categories', $this->categories);
+        }
+
+		function dispAutoinstallAdminUninstall()
+		{
+            $package_srl = Context::get('package_srl');
+            if(!$package_srl) return $this->dispAutoinstallAdminIndex();
+			$oModel =& getModel('autoinstall');
+			$installedPackage = $oModel->getInstalledPackage($package_srl);
+			if(!$installedPackage) return $this->dispAutoinstallAdminInstalledPackages();
+
+            if(!$_SESSION['ftp_password'])
+            {
+                Context::set('need_password', true);
+            }
+			$installedPackage = $oModel->getPackage($package_srl);
+			$path = $installedPackage->path;
+			$type = $oModel->getTypeFromPath($path);
+			if(!$type || $type == "core") return $this->stop("msg_invalid_request");
+			$config_file = $oModel->getConfigFilePath($type);
+			if(!$config_file) return $this->stop("msg_invalid_request");
+
+			$params["act"] = "getResourceapiPackages";
+			$params["package_srls"] = $package_srl;
+			$body = XmlGenerater::generate($params);
+			$buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
+			$xml_lUpdate = new XmlParser();
+			$xmlDoc = $xml_lUpdate->parse($buff);
+			if($xmlDoc && $xmlDoc->response->packagelist->item)
+			{
+				$item_list = $this->rearranges($xmlDoc->response->packagelist->item);
+				$installedPackage->title = $item_list[$package_srl]->title;
+				$installedPackage->type = $item_list[$package_srl]->category;
+				$installedPackage->avail_remove = $item_list[$package_srl]->avail_remove;
+				$installedPackage->deps = $item_list[$package_srl]->deps;
+				Context::set('package', $installedPackage);
+            $this->setTemplateFile('uninstall');
+            Context::addJsFilter($this->module_path.'tpl/filter', 'uninstall_package.xml');
+
+				$security = new Security();
+				$security->encodeHTML('package.');
+
+				$this->setTemplateFile('uninstall');
+			}
+			else
+			{
+				return $this->stop('msg_connection_fail');
+			}
+		}
+    }
+?>
diff --git a/modules/autoinstall/autoinstall.class.php b/modules/autoinstall/autoinstall.class.php
index a253e3719..648ff56f6 100644
--- a/modules/autoinstall/autoinstall.class.php
+++ b/modules/autoinstall/autoinstall.class.php
@@ -1,87 +1,126 @@
-<?php
-    /**
-     * @class  autoinstall
-     * @author NHN (developers@xpressengine.com)
-     * @brief  autoinstall 모듈의 high class
-     **/
-
-    class XmlGenerater {
-        function generate(&$params)
-        {
-            $xmlDoc = '<?xml version="1.0" encoding="utf-8" ?><methodCall><params>';
-            if(!is_array($params)) return null;
-            $params["module"] = "resourceapi";
-            foreach($params as $key => $val)
-            {
-                $xmlDoc .= sprintf("<%s><![CDATA[%s]]></%s>", $key, $val, $key);
-            }
-            $xmlDoc .= "</params></methodCall>";
-            return $xmlDoc;
-        }
-
-        function getXmlDoc(&$params)
-        {
-            $body = XmlGenerater::generate($params);
-            $buff = FileHandler::getRemoteResource($this->uri, $body, 3, "POST", "application/xml");
-            if(!$buff) return;
-            $xml = new XmlParser();
-            $xmlDoc = $xml->parse($buff);
-            return $xmlDoc;
-        }
-    }
-
-    class autoinstall extends ModuleObject {
-        var $uri = "http://download.xpressengine.com/";
-        var $original_site = "http://www.xpressengine.com/";
-		var $tmp_dir = './files/cache/autoinstall/';
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB =& DB::getInstance();
-            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml"))  
-                && $oDB->isTableExists("autoinstall_installed_packages"))
-            {
-                return true;
-            }
-            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml"))  
-                && $oDB->isTableExists("autoinstall_remote_categories"))
-            {
-                return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB =& DB::getInstance();
-            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml"))  
-                && $oDB->isTableExists("autoinstall_installed_packages"))
-            {
-                $oDB->dropTable("autoinstall_installed_packages");
-            }
-            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml"))  
-                && $oDB->isTableExists("autoinstall_remote_categories"))
-            {
-                $oDB->dropTable("autoinstall_remote_categories");
-            }
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  autoinstall
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the autoinstall module
+     **/
+
+    class XmlGenerater {
+        function generate(&$params)
+        {
+            $xmlDoc = '<?xml version="1.0" encoding="utf-8" ?><methodCall><params>';
+            if(!is_array($params)) return null;
+            $params["module"] = "resourceapi";
+            foreach($params as $key => $val)
+            {
+                $xmlDoc .= sprintf("<%s><![CDATA[%s]]></%s>", $key, $val, $key);
+            }
+            $xmlDoc .= "</params></methodCall>";
+            return $xmlDoc;
+        }
+
+        function getXmlDoc(&$params)
+        {
+            $body = XmlGenerater::generate($params);
+            $buff = FileHandler::getRemoteResource(_XE_DOWNLOAD_SERVER_, $body, 3, "POST", "application/xml");
+            if(!$buff) return;
+            $xml = new XmlParser();
+            $xmlDoc = $xml->parse($buff);
+            return $xmlDoc;
+        }
+    }
+
+    class autoinstall extends ModuleObject {
+		var $tmp_dir = './files/cache/autoinstall/';
+
+		function autoinstall()
+		{
+			$oModuleModel = &getModel('module');
+			$config = $oModuleModel->getModuleConfig('autoinstall');
+			if ($config->downloadServer != _XE_DOWNLOAD_SERVER_)
+			{
+				$this->stop('msg_not_match_server');
+			}
+		}
+
+        /**
+         * @brief for additional tasks required when installing
+         **/
+        function moduleInstall() {
+			$oModuleController = &getController('module');
+
+			$config->downloadServer = _XE_DOWNLOAD_SERVER_;
+			$oModuleController->insertModuleConfig('autoinstall', $config);
+        }
+
+        /**
+         * @brief method to check if installation is succeeded
+         **/
+        function checkUpdate() {
+            $oDB =& DB::getInstance();
+			$oModuleModel = &getModel('module');
+
+            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml"))
+                && $oDB->isTableExists("autoinstall_installed_packages"))
+            {
+                return true;
+            }
+            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml"))
+                && $oDB->isTableExists("autoinstall_remote_categories"))
+            {
+                return true;
+            }
+
+			// 2011.08.08 add column 'list_order' in ai_remote_categories
+			if (!$oDB->isColumnExists('ai_remote_categories', 'list_order'))	return true;
+
+			// 2011.08.08 set _XE_DOWNLOAD_SERVER_ at module config
+			$config = $oModuleModel->getModuleConfig('autoinstall');
+			if (!isset($config->downloadServer))	return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB =& DB::getInstance();
+			$oModuleModel = &getModel('module');
+			$oModuleController = &getController('module');
+
+            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_installed_packages.xml"))
+                && $oDB->isTableExists("autoinstall_installed_packages"))
+            {
+                $oDB->dropTable("autoinstall_installed_packages");
+            }
+            if(!file_exists(FileHandler::getRealPath("./modules/autoinstall/schemas/autoinstall_remote_categories.xml"))
+                && $oDB->isTableExists("autoinstall_remote_categories"))
+            {
+                $oDB->dropTable("autoinstall_remote_categories");
+            }
+
+			// 2011.08.08 add column 'list_order' in 'ai_remote_categories
+			if (!$oDB->isColumnExists('ai_remote_categories', 'list_order'))
+			{
+				$oDB->addColumn('ai_remote_categories', 'list_order', 'number', 11, null, true);
+				$oDB->addIndex('ai_remote_categories', 'idx_list_order', array('list_order'));
+			}
+
+			// 2011. 08. 08 set _XE_DOWNLOAD_SERVER_ at module config
+			$config = $oModuleModel->getModuleConfig('autoinstall');
+			if (!isset($config->downloadServer)){
+				$config->downloadServer = _XE_DOWNLOAD_SERVER_;
+				$oModuleController->insertModuleConfig('autoinstall', $config);
+			}
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/autoinstall/autoinstall.lib.php b/modules/autoinstall/autoinstall.lib.php
index 28c905ffa..b3d903394 100644
--- a/modules/autoinstall/autoinstall.lib.php
+++ b/modules/autoinstall/autoinstall.lib.php
@@ -2,7 +2,7 @@
 
     class ModuleInstaller {
         var $package = null;
-		var $base_url = 'http://download.xpressengine.com/';
+		var $base_url;
 		var $temp_dir = './files/cache/autoinstall/';
         var $target_path;
         var $download_file;
@@ -10,21 +10,26 @@
         var $download_path;
         var $ftp_password;
 
+		function setServerUrl($url)
+		{
+			$this->base_url = $url;
+		}
+
 		function uninstall()
 		{
 			$oModel =& getModel('autoinstall');
-			$type = $oModel->getTypeFromPath($this->package->path); 
+			$type = $oModel->getTypeFromPath($this->package->path);
 			if($type == "module") {
 				$output = $this->uninstallModule();
 				if(!$output->toBool()) return $output;
 			}
 
-            $output = $this->_connect(); 
-            if(!$output->toBool()) return $output; 
+            $output = $this->_connect();
+            if(!$output->toBool()) return $output;
 
 			$output = $this->_removeDir($this->package->path);
 			$this->_close();
-			return $output; 
+			return $output;
 		}
 
         function setPassword($ftp_password)
@@ -37,7 +42,7 @@
             if($this->package->path == ".")
             {
                 $this->download_file = $this->temp_dir."xe.tar";
-                $this->target_path = ""; 
+                $this->target_path = "";
                 $this->download_path = $this->temp_dir;
             }
             else
@@ -63,11 +68,11 @@
             $path_array = explode("/", $this->package->path);
             $target_name = array_pop($path_array);
 			$oModule =& getModule($target_name, "class");
-			if(!$oModule) return new Object(-1, 'msg_invalid_request');	
-			if(!method_exists($oModule, "moduleUninstall")) return new Object(-1, 'msg_invalid_request'); 
+			if(!$oModule) return new Object(-1, 'msg_invalid_request');
+			if(!method_exists($oModule, "moduleUninstall")) return new Object(-1, 'msg_invalid_request');
 
 			$output = $oModule->moduleUninstall();
-			if(!$output->toBool()) return $output;
+			if(is_subclass_of($output, 'Object') && !$output->toBool()) return $output;
 
             $schema_dir = sprintf('%s/schemas/', $this->package->path);
             $schema_files = FileHandler::readDir($schema_dir);
@@ -160,7 +165,7 @@
 				}
 				else
 				{
-					$output = $this->_removeFile($file_path);	
+					$output = $this->_removeFile($file_path);
 					if(!$output->toBool()) return $output;
 				}
 			}
@@ -183,7 +188,7 @@
 
 		function _connect() {
             if(!$this->ftp_info->ftp_user || !$this->ftp_info->sftp || $this->ftp_info->sftp != 'Y') return new Object(-1,'msg_ftp_invalid_auth_info');
-            
+
             if($this->ftp_info->ftp_host)
             {
                 $ftp_host = $this->ftp_info->ftp_host;
@@ -238,7 +243,7 @@
 
             foreach($file_list as $k => $file){
                 $org_file = $file;
-                if($this->package->path == ".") 
+                if($this->package->path == ".")
                 {
                     $file = substr($file,3);
                 }
@@ -251,7 +256,7 @@
                 }
 
                 ssh2_scp_send($this->connection, FileHandler::getRealPath($this->download_path."/".$org_file), $target_dir."/".$file);
-            } 
+            }
             return new Object();
         }
     }
@@ -281,7 +286,7 @@
             $this->connection = ftp_connect($ftp_host, $this->ftp_info->ftp_port);
             if(!$this->connection) return new Object(-1, 'msg_ftp_not_connected');
 
-            $login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password); 
+            $login_result = @ftp_login($this->connection, $this->ftp_info->ftp_user, $this->ftp_password);
             if(!$login_result)
             {
 				$this->_close();
@@ -289,7 +294,7 @@
             }
 
             $_SESSION['ftp_password'] = $this->ftp_password;
-			if($this->ftp_info->ftp_pasv != "N") 
+			if($this->ftp_info->ftp_pasv != "N")
 			{
 				ftp_pasv($this->connection, true);
 			}
@@ -328,13 +333,13 @@
         function _copyDir(&$file_list) {
             if(!$this->ftp_password) return new Object(-1,'msg_ftp_password_input');
 
-            $output = $this->_connect(); 
+            $output = $this->_connect();
 			if(!$output->toBool()) return $output;
             $target_dir = $this->ftp_info->ftp_root_path.$this->target_path;
 
             foreach($file_list as $k => $file){
                 $org_file = $file;
-                if($this->package->path == ".") 
+                if($this->package->path == ".")
                 {
                     $file = substr($file,3);
                 }
@@ -353,7 +358,7 @@
                     {
                         if(!@ftp_mkdir($this->connection, $ftp_path))
                         {
-                            return new Object(-1, "msg_make_directory_failed");  
+                            return new Object(-1, "msg_make_directory_failed");
                         }
 
                         if(!stristr(PHP_OS, 'win'))
@@ -378,7 +383,7 @@
                 {
                     return new Object(-1, "msg_ftp_upload_failed");
                 }
-            } 
+            }
 
 			$this->_close();
             return new Object();
@@ -447,7 +452,7 @@
             if(!$this->ftp_password) return new Object(-1,'msg_ftp_password_input');
 
             require_once(_XE_PATH_.'libs/ftp.class.php');
-			
+
 			$output = $this->_connect();
 			if(!$output->toBool()) return $output;
 
@@ -456,7 +461,7 @@
 
             foreach($file_list as $k => $file){
                 $org_file = $file;
-                if($this->package->path == ".") 
+                if($this->package->path == ".")
                 {
                     $file = substr($file,3);
                 }
@@ -478,7 +483,7 @@
                     }
                 }
                 $oFtp->ftp_put($target_dir .'/'. $file, FileHandler::getRealPath($this->download_path."/".$org_file));
-            } 
+            }
 
 			$this->_close();
 
diff --git a/modules/autoinstall/autoinstall.model.php b/modules/autoinstall/autoinstall.model.php
index 3a001ca47..38dabeaf0 100644
--- a/modules/autoinstall/autoinstall.model.php
+++ b/modules/autoinstall/autoinstall.model.php
@@ -1,185 +1,246 @@
-<?php
-    /**
-     * @class  autoinstallModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  autoinstall 모듈의 Model class
-     **/
-
-    class autoinstallModel extends autoinstall {
-
-        function getCategory($category_srl)
-        {
-            $args->category_srl = $category_srl;
-            $output = executeQueryArray("autoinstall.getCategory", $args);
-            if(!$output->data) return null;
-            return array_shift($output->data);
-        }
-
-        function getPackages()
-        {
-            $output = executeQueryArray("autoinstall.getPackages");
-            if(!$output->data) return array();
-            return $output->data;
-        }
-
-        function getInstalledPackage($package_srl)
-        {
-            $args->package_srl = $package_srl;
-            $output = executeQueryArray("autoinstall.getInstalledPackage", $args);
-            if(!$output->data) return null;
-            return array_shift($output->data);
-        }
-
-        function getPackage($package_srl)
-        {
-            $args->package_srl = $package_srl;
-            $output = executeQueryArray("autoinstall.getPackage", $args);
-            if(!$output->data) return null;
-            return array_shift($output->data);
-        }
-
-        function getCategoryList()
-        {
-            $output = executeQueryArray("autoinstall.getCategories");
-            if(!$output->toBool() || !$output->data) return array();
-
-            $categoryList = array();
-            foreach($output->data as $category)
-            {
-                $category->children = array();
-                $categoryList[$category->category_srl] = $category;
-            }
-
-            $depth0 = array();
-            foreach($categoryList as $key => $category)
-            {
-                if($category->parent_srl)
-                {
-                    $categoryList[$category->parent_srl]->children[] =& $categoryList[$key];
-                }
-                else
-                {
-                    $depth0[] = $key;
-                }
-            }
-            $resultList = array();
-            foreach($depth0 as $category_srl)
-            {
-                $this->setDepth($categoryList[$category_srl], 0, $categoryList, $resultList);
-            }
-            return $resultList;
-        }
-
-        function getPackageCount($category_srl)
-        {
-            $args->category_srl = $category_srl;
-            $output = executeQuery("autoinstall.getPackageCount", $args);
-            if(!$output->data) return 0;
-            return $output->data->count;
-        }
-
-        function getInstalledPackageCount()
-        {
-            $output = executeQuery("autoinstall.getInstalledPackageCount", $args);
-            if(!$output->data) return 0;
-            return $output->data->count;
-        }
-
-        function setDepth(&$item, $depth, &$list, &$resultList)
-        {
-            $resultList[$item->category_srl] =& $item;
-            $item->depth = $depth;
-            $siblingList = $item->category_srl;
-            foreach($item->children as $child)
-            {
-                $siblingList .= ",".$this->setDepth($list[$child->category_srl], $depth+1, $list, $resultList);
-            }
-            if(count($item->children) < 1) 
-            {
-                $item->nPackages = $this->getPackageCount($item->category_srl);
-            }
-            $item->childrenList = $siblingList;
-            return $siblingList;
-        }
-
-        function getLatestPackage() {
-            $output = executeQueryArray("autoinstall.getLatestPackage");
-            if(!$output->data) return null;
-            return array_shift($output->data);
-        }
-
-        function getInstalledPackages($package_list) {
-            $args->package_list = $package_list;
-            $output = executeQueryArray("autoinstall.getInstalledPackages", $args);
-            $result = array();
-            if(!$output->data) return $result;
-            foreach($output->data as $value)
-            {
-                $result[$value->package_srl] = $value;
-            }
-            return $result;
-        }
-
-        function getInstalledPackageList($page)
-        {
-            $args->page = $page;
-            $output = executeQueryArray("autoinstall.getInstalledPackageList", $args);
-            $res = array();
-            foreach($output->data as $val)
-            {
-                $res[$val->package_srl] = $val;
-            }
-            $output->data = $res;
-            return $output;
-        }
-
-		function getTypeFromPath($path)
-		{
-			if(!$path) return null;
-			if($path == ".") return "core";
-			$path_array = explode("/", $path);
-            $target_name = array_pop($path_array);
-            $type = substr(array_pop($path_array), 0, -1);
-			return $type;
-		}
-
-		function getConfigFilePath($type)
-		{
-			$config_file = null;
-			switch($type)
-			{
-				case "m.layout":
-				case "module":
-					case "addon":
-					case "layout":
-					case "widget":
-					$config_file = "/conf/info.xml";
-				break;
-				case "component":
-					$config_file = "/info.xml";
-				break;
-				case "m.skin":
-				case "skin":    
-				case "widgetstyle":
-				case "style":
-					$config_file = "/skin.xml";
-				break;
-				case "drcomponent":
-					$config_file = "/info.xml";
-				break;
-			}
-			return $config_file;
-		}
-
-		function checkRemovable($path)
-		{
-			$path_array = explode("/", $path);
-            $target_name = array_pop($path_array);
-			$oModule =& getModule($target_name, "class");
-			if(!$oModule) return false;	
-			if(method_exists($oModule, "moduleUninstall")) return true;
-			else return false;
-		}
-
-   }
-?>
+<?php
+    /**
+     * @class  autoinstallModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief Model class of the autoinstall module
+     **/
+
+    class autoinstallModel extends autoinstall {
+
+        function getCategory($category_srl)
+        {
+            $args->category_srl = $category_srl;
+            $output = executeQueryArray("autoinstall.getCategory", $args);
+            if(!$output->data) return null;
+            return array_shift($output->data);
+        }
+
+        function getPackages()
+        {
+            $output = executeQueryArray("autoinstall.getPackages");
+            if(!$output->data) return array();
+            return $output->data;
+        }
+
+        function getInstalledPackage($package_srl)
+        {
+            $args->package_srl = $package_srl;
+            $output = executeQueryArray("autoinstall.getInstalledPackage", $args);
+            if(!$output->data) return null;
+            return array_shift($output->data);
+        }
+
+        function getPackage($package_srl)
+        {
+            $args->package_srl = $package_srl;
+            $output = executeQueryArray("autoinstall.getPackage", $args);
+            if(!$output->data) return null;
+            return array_shift($output->data);
+        }
+
+        function getCategoryList()
+        {
+            $output = executeQueryArray("autoinstall.getCategories");
+            if(!$output->toBool() || !$output->data) return array();
+
+            $categoryList = array();
+            foreach($output->data as $category)
+            {
+                $category->children = array();
+                $categoryList[$category->category_srl] = $category;
+            }
+
+            $depth0 = array();
+            foreach($categoryList as $key => $category)
+            {
+                if($category->parent_srl)
+                {
+                    $categoryList[$category->parent_srl]->children[] =& $categoryList[$key];
+                }
+                else
+                {
+                    $depth0[] = $key;
+                }
+            }
+            $resultList = array();
+            foreach($depth0 as $category_srl)
+            {
+                $this->setDepth($categoryList[$category_srl], 0, $categoryList, $resultList);
+            }
+            return $resultList;
+        }
+
+        function getPackageCount($category_srl)
+        {
+            $args->category_srl = $category_srl;
+            $output = executeQuery("autoinstall.getPackageCount", $args);
+            if(!$output->data) return 0;
+            return $output->data->count;
+        }
+
+        function getInstalledPackageCount()
+        {
+            $output = executeQuery("autoinstall.getInstalledPackageCount", $args);
+            if(!$output->data) return 0;
+            return $output->data->count;
+        }
+
+        function setDepth(&$item, $depth, &$list, &$resultList)
+        {
+            $resultList[$item->category_srl] =& $item;
+            $item->depth = $depth;
+            $siblingList = $item->category_srl;
+            foreach($item->children as $child)
+            {
+                $siblingList .= ",".$this->setDepth($list[$child->category_srl], $depth+1, $list, $resultList);
+            }
+            if(count($item->children) < 1)
+            {
+                $item->nPackages = $this->getPackageCount($item->category_srl);
+            }
+            $item->childrenList = $siblingList;
+            return $siblingList;
+        }
+
+        function getLatestPackage() {
+            $output = executeQueryArray("autoinstall.getLatestPackage");
+            if(!$output->data) return null;
+            return array_shift($output->data);
+        }
+
+        function getInstalledPackages($package_list) {
+            $args->package_list = $package_list;
+            $output = executeQueryArray("autoinstall.getInstalledPackages", $args);
+            $result = array();
+            if(!$output->data) return $result;
+            foreach($output->data as $value)
+            {
+                $result[$value->package_srl] = $value;
+            }
+            return $result;
+        }
+
+        function getInstalledPackageList($page)
+        {
+            $args->page = $page;
+			$args->list_count = 10;
+			$args->page_count = 5;
+            $output = executeQueryArray("autoinstall.getInstalledPackageList", $args);
+            $res = array();
+			if ($output->data)
+			{
+				foreach($output->data as $val)
+				{
+					$res[$val->package_srl] = $val;
+				}
+			}
+            $output->data = $res;
+            return $output;
+        }
+
+		function getTypeFromPath($path)
+		{
+			if(!$path) return null;
+			if($path == ".") return "core";
+			$path_array = explode("/", $path);
+            $target_name = array_pop($path_array);
+            $type = substr(array_pop($path_array), 0, -1);
+			return $type;
+		}
+
+		function getConfigFilePath($type)
+		{
+			$config_file = null;
+			switch($type)
+			{
+				case "m.layout":
+				case "module":
+					case "addon":
+					case "layout":
+					case "widget":
+					$config_file = "/conf/info.xml";
+				break;
+				case "component":
+					$config_file = "/info.xml";
+				break;
+				case "m.skin":
+				case "skin":
+				case "widgetstyle":
+				case "style":
+					$config_file = "/skin.xml";
+				break;
+				case "drcomponent":
+					$config_file = "/info.xml";
+				break;
+			}
+			return $config_file;
+		}
+
+		function checkRemovable($path)
+		{
+			$path_array = explode("/", $path);
+            $target_name = array_pop($path_array);
+			$oModule =& getModule($target_name, "class");
+			if(!$oModule) return false;
+			if(method_exists($oModule, "moduleUninstall")) return true;
+			else return false;
+		}
+
+		function getPackageSrlByPath($path)
+		{
+			if (!$path) return;
+
+			if(substr($path,-1) == '/') $path = substr($path, 0, strlen($path)-1);
+
+			if (!$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path])
+			{
+				$args->path = $path;
+				$output = executeQuery('autoinstall.getPackageSrlByPath', $args);
+
+				$GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path] = $output->data->package_srl;
+			}
+
+			return $GLOBLAS['XE_AUTOINSTALL_PACKAGE_SRL_BY_PATH'][$path];
+		}
+
+		function getRemoveUrlByPackageSrl($packageSrl)
+		{
+            $ftp_info =  Context::getFTPInfo();
+            if (!$ftp_info->ftp_root_path) return;
+			
+			if (!$packageSrl) return;
+
+			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl);
+		}
+
+		function getRemoveUrlByPath($path)
+		{
+			if (!$path) return;
+
+            $ftp_info =  Context::getFTPInfo();
+            if (!$ftp_info->ftp_root_path) return;
+
+			$packageSrl = $this->getPackageSrlByPath($path);
+			if (!$packageSrl) return;
+
+			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminUninstall', 'package_srl', $packageSrl);
+		}
+
+		function getUpdateUrlByPackageSrl($packageSrl)
+		{
+			if (!$packageSrl) return;
+
+			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl);
+		}
+
+		function getUpdateUrlByPath($path)
+		{
+			if (!$path) return;
+
+			$packageSrl = $this->getPackageSrlByPath($path);
+			if (!$packageSrl) return;
+
+			return getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstall', 'package_srl', $packageSrl);
+		}
+   }
+?>
diff --git a/modules/autoinstall/autoinstall.view.php b/modules/autoinstall/autoinstall.view.php
index a925b30a8..dc8b10307 100644
--- a/modules/autoinstall/autoinstall.view.php
+++ b/modules/autoinstall/autoinstall.view.php
@@ -1,26 +1,26 @@
-<?php
-
-    /**
-     * @class  autoinstallView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  autoinstall 모듈의 View class
-     **/
-
-    class autoinstallView extends autoinstall {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-		}
-
-		function dispAutoinstallTest(){
-			$file = "modules.test.tar";
-            $checksum = '549989037bd8401d39b83ca2393d8131';
-			$file = "modules.test.skins.test.tar";
-			$oAutoinstallAdminController = &getAdminController('autoinstall');
-			$output = $oAutoinstallAdminController->install($file, $checksum);
-            return $output;
-		}
-    }
-?>
+<?php
+
+    /**
+     * @class  autoinstallView
+     * @author NHN (developers@xpressengine.com)
+     * @brief View class of the autoinstall module
+     **/
+
+    class autoinstallView extends autoinstall {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+		}
+
+		function dispAutoinstallTest(){
+			$file = "modules.test.tar";
+            $checksum = '549989037bd8401d39b83ca2393d8131';
+			$file = "modules.test.skins.test.tar";
+			$oAutoinstallAdminController = &getAdminController('autoinstall');
+			$output = $oAutoinstallAdminController->install($file, $checksum);
+            return $output;
+		}
+    }
+?>
diff --git a/modules/autoinstall/conf/info.xml b/modules/autoinstall/conf/info.xml
index bdddf4b8f..d57e03849 100644
--- a/modules/autoinstall/conf/info.xml
+++ b/modules/autoinstall/conf/info.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">쉬운 설치</title>
-    <title xml:lang="en">EasyInstaller</title>
-    <title xml:lang="vi">Cài đặt tự động</title>
-    <title xml:lang="zh-TW">自動安裝</title>
-    <title xml:lang="zh-CN">安装·更新</title>
-    <title xml:lang="jp">イージーインストール</title>
-    <title xml:lang="tr">KolayKurulum</title>
-    <description xml:lang="ko">관리자 모드에서 클릭으로 모듈/스킨/레이아웃/위젯/위젯스타일 등을 설치하는 모듈입니다.</description>
-    <description xml:lang="en">With this module, you can install and upgrade your programs including modules, skins, layouts, etc., from www.xpressengine.com by one-click.</description>
-    <description xml:lang="vi">Với Module này, bạn có thể cập nhật và cài đặt các phiên bản một cách tự động. Bao gồm Module, Layout, Widget, Addon, ... từ trang chủ XE bằng một bấm chuột.</description>
-    <description xml:lang="zh-TW">可以藉由此模組安裝、更新程式包括模組、面板、版面等。</description>
-    <description xml:lang="tr">Bu modül ile modüller, dış görünümler, yerleşim düzenleri.. gibi kendi programlarınızı, www.xpressengine.com adresinden tek bir tık ile kurup-düzenleyebilirsiniz. </description>
-    <description xml:lang="zh-CN">很方便的在线安装/更新XE相关模块(模块/皮肤/布局/控件/控件样式等)。</description>
-    <description xml:lang="jp">管理者モードにてクリックだけで、モジュール/スキン/レイアウト/ウィジェット/ウィジェットスタイルのインストールを可能にするモジュールです。</description>
-    <description xml:lang="tr">Bu modülle; modüller, dış görünümler, yerleşim düzenleri vs. gibi programlarınızı www.xpressengine.com adresinden tek tıkla kurabilir ve sürümlerini yükseltebilirsiniz. </description>
-    <version>0.3</version>
-    <date>2009-11-11</date>
-    <category>system</category>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">쉬운 설치</title>
+    <title xml:lang="en">EasyInstaller</title>
+    <title xml:lang="vi">Cài đặt tự động</title>
+    <title xml:lang="zh-TW">自動安裝</title>
+    <title xml:lang="zh-CN">安装·更新</title>
+    <title xml:lang="jp">イージーインストール</title>
+    <title xml:lang="tr">KolayKurulum</title>
+    <description xml:lang="ko">관리자 모드에서 클릭으로 모듈/스킨/레이아웃/위젯/위젯스타일 등을 설치하는 모듈입니다.</description>
+    <description xml:lang="en">With this module, you can install and upgrade your programs including modules, skins, layouts, etc., from www.xpressengine.com with one-click.</description>
+    <description xml:lang="vi">Với Module này, bạn có thể cập nhật và cài đặt các phiên bản một cách tự động. Bao gồm Module, Layout, Widget, Addon, ... từ trang chủ XE bằng một bấm chuột.</description>
+    <description xml:lang="zh-TW">可以藉由此模組安裝、更新程式包括模組、面板、版面等。</description>
+    <description xml:lang="tr">Bu modül ile modüller, dış görünümler, yerleşim düzenleri.. gibi kendi programlarınızı, www.xpressengine.com adresinden tek bir tık ile kurup-düzenleyebilirsiniz. </description>
+    <description xml:lang="zh-CN">很方便的在线安装/更新XE相关模块(模块/皮肤/布局/控件/控件样式等)。</description>
+    <description xml:lang="jp">管理者モードにてクリックだけで、モジュール/スキン/レイアウト/ウィジェット/ウィジェットスタイルのインストールを可能にするモジュールです。</description>
+    <description xml:lang="tr">Bu modülle; modüller, dış görünümler, yerleşim düzenleri vs. gibi programlarınızı www.xpressengine.com adresinden tek tıkla kurabilir ve sürümlerini yükseltebilirsiniz. </description>
+    <version>0.3</version>
+    <date>2009-11-11</date>
+    <category>system</category>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/autoinstall/conf/module.xml b/modules/autoinstall/conf/module.xml
index f2b2b7b26..6540fc33a 100644
--- a/modules/autoinstall/conf/module.xml
+++ b/modules/autoinstall/conf/module.xml
@@ -1,12 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <actions>
-        <action name="dispAutoinstallAdminInstall" type="view" standalone="true" />
-        <action name="dispAutoinstallAdminUninstall" type="view" standalone="true" />
-        <action name="procAutoinstallAdminUninstallPackage" type="controller" standalone="true" />
-        <action name="dispAutoinstallAdminInstalledPackages" type="view" standalone="true" />
-        <action name="dispAutoinstallAdminIndex" type="view" standalone="true" admin_index="true" />
+        <action name="dispAutoinstallAdminInstall" type="view" standalone="true" menu_name="easyInstall" />
+        <action name="dispAutoinstallAdminUninstall" type="view" standalone="true" menu_name="easyInstall" />
+        <action name="procAutoinstallAdminUninstallPackage" type="controller" standalone="true" ruleset="ftp" />
+        <action name="dispAutoinstallAdminInstalledPackages" type="view" standalone="true" menu_name="easyInstall" />
+        <action name="dispAutoinstallAdminIndex" type="view" standalone="true" admin_index="true" menu_name="easyInstall" menu_index="true" />
         <action name="procAutoinstallAdminUpdateinfo" type="controller" standalone="true" />
-        <action name="procAutoinstallAdminPackageinstall" type="controller" standalone="true" />
+        <action name="procAutoinstallAdminPackageinstall" type="controller" standalone="true" ruleset="ftp" />
     </actions>
+	<menus>
+		<menu name="easyInstall">
+			<title xml:lang="en">Easy Install</title>
+			<title xml:lang="ko">쉬운설치</title>
+			<title xml:lang="zh-CN">Easy Install</title>
+			<title xml:lang="jp">Easy Install</title>
+			<title xml:lang="es">Easy Install</title>
+			<title xml:lang="ru">Easy Install</title>
+			<title xml:lang="fr">Easy Install</title>
+			<title xml:lang="zh-TW">Easy Install</title>
+			<title xml:lang="vi">Easy Install</title>
+			<title xml:lang="mn">Easy Install</title>
+			<title xml:lang="tr">Easy Install</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/autoinstall/lang/en.lang.php b/modules/autoinstall/lang/en.lang.php
deleted file mode 100644
index 128114de0..000000000
--- a/modules/autoinstall/lang/en.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Autoinstall(autoinstall) language pack (English)
-     **/
-
-    $lang->autoinstall = 'EasyInstall';
-    $lang->about_autoinstall = 'EasyInstall module will help you install/upgrade programs(skins) for XE.';
-    $lang->package_update = 'Recent Update';
-    $lang->package_downloaded_count = 'Download Count';
-    $lang->need_update = "Please update package list first.";
-
-    $lang->order_newest = "Newest";
-    $lang->order_popular = "Popular";
-    $lang->order_download = "Download";
-    $lang->success_installed = "Successfully Installed";
-    $lang->view_all_package = "View All";
-    $lang->description_ftp_note = "If FTP configuration is not set, installation would not work. Please configure FTP information";
-    $lang->description_update = "If you have upgraded or installed programs without EasyInstall module, please press update button to renew new information.";
-    $lang->install = "Install";
-    $lang->update = "Update";
-    $lang->current_version = "Version";
-    $lang->depending_programs = "This program is depending on ";
-    $lang->require_update = "Update is required.";
-    $lang->require_installation = "Installation is required.";
-    $lang->description_install = "EasyInstall will also install/update all other programs which this program is depending on";
-    $lang->description_download = "If FTP is unavailable, you should manually download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)";
-    $lang->path = "Path";
-    $lang->cmd_download = "Download";
-    $lang->view_installed_packages = "Installed Packages";
-    $lang->msg_ftp_password_input = "Please input FTP password.";
-	$lang->dependant_list = "Dependant package list of current package";
-	$lang->description_uninstall = "Package will be uninstalled. For modules, all data will be deleted.";
-?>
diff --git a/modules/autoinstall/lang/jp.lang.php b/modules/autoinstall/lang/jp.lang.php
deleted file mode 100644
index 0dfc76b35..000000000
--- a/modules/autoinstall/lang/jp.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   modules/autoinstall/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：ミニミ 
-     * @brief  Autoinstall(autoinstall) 日本語基本言語パッケージ
-     **/
-
-    $lang->autoinstall = 'イージーインストール';
-    $lang->about_autoinstall = 'XpressEngineの様々なプログラムを管理者画面上で簡単にインストール・アップグレードするモジュールです。';
-    $lang->package_update = '最新アップデート';
-    $lang->package_downloaded_count = '全体ダウンロード';
-    $lang->need_update = "アップデートが必要です。";
-
-    $lang->order_newest = "新規登録";
-    $lang->order_popular = "人気";
-    $lang->order_download = "ダウンロード";
-    $lang->success_installed = "インストールが成功しました。";
-    $lang->view_all_package = "全てをみる";
-    $lang->description_ftp_note = "FTP設定が完了されないと、イージーインストールが動作しません。 FTP設定を確認して下さい。";
-    $lang->description_update = "新しくインストールしたモジュールバージョン情報などは「アップデート」を押すと反映されます。";
-    $lang->install = "インストール";
-    $lang->update = "アップデート";
-    $lang->current_version = "現インストールバージョン";
-    $lang->depending_programs = "依存プログラム";
-    $lang->require_update = "アップデートが必要です。";
-    $lang->require_installation = "インストールが必要です。";
-    $lang->description_install = "インストールに進みますと、本プログラムが依存している全てのプログラムをアップデート/インストールします。";
-    $lang->description_download = "FTPの利用が出来ない場合は、直接ダウンロードし、サーバー上の該当パスにてインストールして下さい。 (一つ上階層にて解凍します。　./modules/board　の場合 ./modulesにて tarを解凍して下さい。)";
-    $lang->path = "インストールパス";
-    $lang->cmd_download = "ダウンロード";
-    $lang->view_installed_packages = "インストールされたパッケージ";
-    $lang->msg_ftp_password_input = "FTPパスワードを入力して下さい。";
-	$lang->dependant_list = "このパッケージに依存するパッケージのリスト";
-	$lang->description_uninstall = "パッケージを削除します。モジュールの場合、すべてのデータを失います。";
-?>
diff --git a/modules/autoinstall/lang/ko.lang.php b/modules/autoinstall/lang/ko.lang.php
deleted file mode 100644
index 197eb0a66..000000000
--- a/modules/autoinstall/lang/ko.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Autoinstall(autoinstall) 모듈의 기본 언어팩
-     **/
-
-    $lang->autoinstall = '쉬운 설치';
-    $lang->about_autoinstall = 'XpressEngine의 여러 프로그램을 쉽게 설치/업그레이드할 수 있도록 도와주는 모듈입니다.';
-    $lang->package_update = '최근 업데이트';
-    $lang->package_downloaded_count = '전체 다운로드';
-    $lang->need_update = "업데이트가 필요합니다.";
-
-    $lang->order_newest = "신규 등록";
-    $lang->order_popular = "인기";
-    $lang->order_download = "다운로드";
-    $lang->success_installed = "설치가 성공하였습니다.";
-    $lang->view_all_package = "전체 보기";
-    $lang->description_ftp_note = "FTP 설정이 안되어있으면 설치가 진행되지 않습니다. FTP설정을 해주세요";
-    $lang->description_update = "새로 설치한 모듈의 버전 정보등은 업데이트를 눌러주시면 반영됩니다.";
-    $lang->install = "설치";
-    $lang->update = "업데이트";
-    $lang->current_version = "현재 설치 버전";
-    $lang->depending_programs = "의존하고 있는 프로그램";
-    $lang->require_update = "업데이트가 필요합니다.";
-    $lang->require_installation = "설치가 필요합니다.";
-    $lang->description_install = "설치를 진행하면, 이 프로그램이 의존하고 있는 모든 프로그램을 업데이트/설치 합니다.";
-    $lang->description_download = "FTP를 이용할 수 없는 경우, 직접 다운로드 하여 해당 path에 설치하셔야 합니다. (한칸 상위에서 압축을 푸시면 됩니다. ./modules/board의 경우 ./modules에서 tar를 푸세요)";
-    $lang->path = "설치경로";
-    $lang->cmd_download = "다운로드";
-    $lang->view_installed_packages = "설치된 패키지";
-    $lang->msg_ftp_password_input = "FTP 비밀번호를 입력해주세요";
-	$lang->dependant_list = "이 패키지에 의존하는 패키지 목록";
-	$lang->description_uninstall = "패키지를 삭제합니다. 모듈의 경우 모든 데이터가 사라집니다.";
-?>
diff --git a/modules/autoinstall/lang/lang.xml b/modules/autoinstall/lang/lang.xml
new file mode 100644
index 000000000..9d404f402
--- /dev/null
+++ b/modules/autoinstall/lang/lang.xml
@@ -0,0 +1,266 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="autoinstall">
+		<value xml:lang="ko"><![CDATA[쉬운 설치]]></value>
+		<value xml:lang="en"><![CDATA[EasyInstall]]></value>
+		<value xml:lang="jp"><![CDATA[イージーインストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装·更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[自動安裝]]></value>
+		<value xml:lang="tr"><![CDATA[KolayKurulum]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật tự động]]></value>
+	</item>
+	<item name="package_update">
+		<value xml:lang="ko"><![CDATA[최근 업데이트]]></value>
+		<value xml:lang="en"><![CDATA[Recent Update]]></value>
+		<value xml:lang="jp"><![CDATA[最新アップデート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最新更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最近更新]]></value>
+		<value xml:lang="tr"><![CDATA[Son Güncellemeler]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật]]></value>
+	</item>
+	<item name="package_downloaded_count">
+		<value xml:lang="ko"><![CDATA[전체 다운로드]]></value>
+		<value xml:lang="en"><![CDATA[Download Count]]></value>
+		<value xml:lang="jp"><![CDATA[全体ダウンロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[总下载]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載次數]]></value>
+		<value xml:lang="tr"><![CDATA[İndirme Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Lượt Download]]></value>
+	</item>
+	<item name="order_newest">
+		<value xml:lang="ko"><![CDATA[신규 등록]]></value>
+		<value xml:lang="en"><![CDATA[Newest]]></value>
+		<value xml:lang="jp"><![CDATA[新規登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最新发布]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最新發表]]></value>
+		<value xml:lang="ru"><![CDATA[Новый]]></value>
+		<value xml:lang="tr"><![CDATA[En Yeniler]]></value>
+		<value xml:lang="vi"><![CDATA[Mới nhất]]></value>
+	</item>
+	<item name="order_popular">
+		<value xml:lang="ko"><![CDATA[인기]]></value>
+		<value xml:lang="en"><![CDATA[Popular]]></value>
+		<value xml:lang="jp"><![CDATA[人気]]></value>
+		<value xml:lang="zh-CN"><![CDATA[热门]]></value>
+		<value xml:lang="zh-TW"><![CDATA[熱門]]></value>
+		<value xml:lang="ru"><![CDATA[Популярный]]></value>
+		<value xml:lang="tr"><![CDATA[Popüler]]></value>
+		<value xml:lang="vi"><![CDATA[Phổ biến]]></value>
+	</item>
+	<item name="order_download">
+		<value xml:lang="ko"><![CDATA[다운로드]]></value>
+		<value xml:lang="en"><![CDATA[Download]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載]]></value>
+		<value xml:lang="ru"><![CDATA[Скачать]]></value>
+		<value xml:lang="tr"><![CDATA[İndirme]]></value>
+	</item>
+	<item name="success_installed">
+		<value xml:lang="ko"><![CDATA[설치가 성공하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Successfully Installed]]></value>
+		<value xml:lang="jp"><![CDATA[インストールが成功しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装成功！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝成功]]></value>
+		<value xml:lang="ru"><![CDATA[Установлено успешно]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla Kuruldu]]></value>
+		<value xml:lang="vi"><![CDATA[Đã cài đặt thành công.]]></value>
+	</item>
+	<item name="description_ftp_note">
+		<value xml:lang="ko"><![CDATA[%s이 되어 있지 않으면 설치 및 업데이트가 진행되지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[If the %s is not set, the installation or update will not work. Pleas configure the FTP information.]]></value>
+		<value xml:lang="jp"><![CDATA[%sが完了されないと、イージーインストールが動作しません。 FTP設定を確認してください。]]></value>
+		<value xml:lang="ru"><![CDATA[If %s is not set, installation would not work. Please configure FTP information]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請先將 %s好，否則無法執行自動安裝功能。]]></value>
+	</item>
+	<item name="ftp_setup">
+		<value xml:lang="ko"><![CDATA[FTP 설정]]></value>
+		<value xml:lang="en"><![CDATA[FTP configuration]]></value>
+		<value xml:lang="jp"><![CDATA[FTP設定]]></value>
+		<value xml:lang="zh-TW"><![CDATA[FTP設定]]></value>
+	</item>
+	<item name="description_update">
+		<value xml:lang="ko"><![CDATA[쉬운설치 사용전 %s를 해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Click %s before using EasyInstall.]]></value>
+		<value xml:lang="jp"><![CDATA[新しくインストールしたモジュールバージョン情報などは%sを押すと反映されます。]]></value>
+		<value xml:lang="ru"><![CDATA[If you have upgraded or installed programs without EasyInstall module, please press %s to renew new information]]></value>
+	</item>
+	<item name="status_update">
+		<value xml:lang="ko"><![CDATA[상태 업데이트]]></value>
+		<value xml:lang="en"><![CDATA[update button]]></value>
+		<value xml:lang="jp"><![CDATA[アップデート]]></value>
+	</item>
+	<item name="install">
+		<value xml:lang="ko"><![CDATA[설치]]></value>
+		<value xml:lang="en"><![CDATA[Install]]></value>
+		<value xml:lang="jp"><![CDATA[インストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝]]></value>
+		<value xml:lang="ru"><![CDATA[Инсталлировать]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt]]></value>
+	</item>
+	<item name="update">
+		<value xml:lang="ko"><![CDATA[업데이트]]></value>
+		<value xml:lang="en"><![CDATA[Update]]></value>
+		<value xml:lang="jp"><![CDATA[アップデート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新]]></value>
+		<value xml:lang="ru"><![CDATA[Обновить]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelle]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật]]></value>
+	</item>
+	<item name="current_version">
+		<value xml:lang="ko"><![CDATA[설치 버전]]></value>
+		<value xml:lang="en"><![CDATA[Version]]></value>
+		<value xml:lang="jp"><![CDATA[現インストールバージョン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[现用版本]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版本]]></value>
+		<value xml:lang="fr"><![CDATA[Version Courante]]></value>
+		<value xml:lang="es"><![CDATA[Versión actual]]></value>
+		<value xml:lang="tr"><![CDATA[Sürüm]]></value>
+		<value xml:lang="vi"><![CDATA[Phiên bản đang dùng]]></value>
+	</item>
+	<item name="require_update">
+		<value xml:lang="ko"><![CDATA[업데이트가 필요합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Update is required.]]></value>
+		<value xml:lang="jp"><![CDATA[アップデートが必要です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[需要更新]]></value>
+		<value xml:lang="zh-TW"><![CDATA[需要更新]]></value>
+		<value xml:lang="ru"><![CDATA[Update is required]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleme gerekmektedir.]]></value>
+		<value xml:lang="vi"><![CDATA[Yêu cầu cập nhật.]]></value>
+	</item>
+	<item name="require_installation">
+		<value xml:lang="ko"><![CDATA[설치가 필요합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Installation is required.]]></value>
+		<value xml:lang="jp"><![CDATA[インストールが必要です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[需要安装]]></value>
+		<value xml:lang="zh-TW"><![CDATA[需要安裝]]></value>
+		<value xml:lang="ru"><![CDATA[Installation is required]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum gerekmektedir.]]></value>
+		<value xml:lang="vi"><![CDATA[Yêu cầu cài đặt.]]></value>
+	</item>
+	<item name="description_install">
+		<value xml:lang="ko"><![CDATA[설치를 진행하면, 이 프로그램이 의존하고 있는 모든 프로그램을 업데이트/설치 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[EasyInstall will also install/update all other programs which this program depends on.]]></value>
+		<value xml:lang="jp"><![CDATA[インストールに進みますと、このプログラムが依存しているすべてのプログラムをアップデート/インストールします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装时，与其联动的插件/控件也会同时被安装(更新)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[自動安裝也能夠同時安裝與更新其他相關程式]]></value>
+		<value xml:lang="ru"><![CDATA[EasyInstall will also install/update all other programs which this program is depending on]]></value>
+		<value xml:lang="tr"><![CDATA[KolayKurulum, bu program için gerekli olan tüm diğer programları kurup/güncelleştirecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Quá trình Cài đặt / Cập nhật này phụ thuộc vào ]]></value>
+	</item>
+	<item name="description_download">
+		<value xml:lang="ko"><![CDATA[FTP를 이용할 수 없는 경우, 직접 다운로드 하여 해당 path에 설치하셔야 합니다. (한칸 상위에서 압축을 푸시면 됩니다. ./modules/board의 경우 ./modules에서 tar를 푸세요)]]></value>
+		<value xml:lang="en"><![CDATA[If FTP is unavailable, you should manually download and extract it into the target path. (If the target path is ./modules/board, extract it to ./modules)]]></value>
+		<value xml:lang="jp"><![CDATA[FTPの利用ができない場合は、直接ダウンロードし、サーバー上の該当パスにてインストールしてください。 (一つ上の階層にて解凍します。　./modules/board　の場合 ./modulesに tarを解凍してください。)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无法使用FTP时，需得自行下载安装到指定路径。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[如果 FTP無法使用的話，必須要手動下載並解壓縮到目標路徑。(假設目標路徑為 ./modules/board 的話，將檔案解壓縮到 ./modules就可以了)]]></value>
+		<value xml:lang="ru"><![CDATA[If FTP is unavailable, you should manually download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer FTP kullanılamaz durumduysa, indirmeyi kendiniz yapmanız ve dosyaları hedef dizine çıkartmanız gerekmektedir. (eğer hedef yol ./modules/board ise, çıkarma işlemini ./modules yoluna yapınız)]]></value>
+		<value xml:lang="vi"><![CDATA[Khi FTP không được mở, bạn nên tải về và giả nén, sau đó Upload theo đường dẫn. (Nếu đường dẫn là ./modules/board, thì giải nén vào ./modules)]]></value>
+	</item>
+	<item name="path">
+		<value xml:lang="ko"><![CDATA[설치경로]]></value>
+		<value xml:lang="en"><![CDATA[Path]]></value>
+		<value xml:lang="jp"><![CDATA[インストールパス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[路徑]]></value>
+		<value xml:lang="de"><![CDATA[Pfad]]></value>
+		<value xml:lang="tr"><![CDATA[Yol]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn]]></value>
+		<value xml:lang="mn"><![CDATA[Байрлал]]></value>
+	</item>
+	<item name="cmd_download">
+		<value xml:lang="ko"><![CDATA[다운로드]]></value>
+		<value xml:lang="en"><![CDATA[Download]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載]]></value>
+		<value xml:lang="tr"><![CDATA[İndirme]]></value>
+	</item>
+	<item name="description_uninstall">
+		<value xml:lang="ko"><![CDATA[패키지를 삭제합니다. 모듈의 경우 모든 데이터가 사라집니다.]]></value>
+		<value xml:lang="en"><![CDATA[Package will be uninstalled. For modules, all data will be deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[パッケージを削除します。モジュールの場合、すべてのデータを失います。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[确定要删除此数据包吗？如果此数据包为模块，模块中的数据将会全部消失。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移除模組，所有資料將會被刪除。]]></value>
+		<value xml:lang="tr"><![CDATA[Paket kaldırılacaktır. Modüller için, tüm veriler silinecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Loại bỏ gói cài đặt. Tất cả dữ liệu của các gói sẽ đồng thời bị xóa.]]></value>
+	</item>
+	<item name="distribute_version">
+		<value xml:lang="ko"><![CDATA[배포 버전]]></value>
+		<value xml:lang="en"><![CDATA[Distribute version]]></value>
+		<value xml:lang="jp"><![CDATA[配布バージョン]]></value>
+	</item>
+	<item name="run">
+		<value xml:lang="ko"><![CDATA[실행]]></value>
+		<value xml:lang="en"><![CDATA[Run]]></value>
+		<value xml:lang="jp"><![CDATA[実行]]></value>
+	</item>
+	<item name="rate">
+		<value xml:lang="ko"><![CDATA[%s점]]></value>
+		<value xml:lang="en"><![CDATA[%s points]]></value>
+		<value xml:lang="jp"><![CDATA[points]]></value>
+		<value xml:lang="zh-CN"><![CDATA[points]]></value>
+		<value xml:lang="zh-TW"><![CDATA[% points]]></value>
+		<value xml:lang="ru"><![CDATA[points]]></value>
+		<value xml:lang="tr"><![CDATA[points]]></value>
+		<value xml:lang="vi"><![CDATA[points]]></value>
+	</item>
+	<item name="thumbnail">
+		<value xml:lang="ko"><![CDATA[섬네일]]></value>
+		<value xml:lang="en"><![CDATA[Thumbnail]]></value>
+		<value xml:lang="jp"><![CDATA[サムネイル]]></value>
+	</item>
+	<item name="name">
+		<value xml:lang="ko"><![CDATA[이름]]></value>
+		<value xml:lang="en"><![CDATA[Name]]></value>
+		<value xml:lang="jp"><![CDATA[名前]]></value>
+	</item>
+	<item name="about_depending_programs">
+		<value xml:lang="ko"><![CDATA[이 패키지 사용을 위해서는 아래 프로그램이 설치되어 있어야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[To use this package, the following program should have been installed.]]></value>
+		<value xml:lang="jp"><![CDATA[このパッケージを使用するには、下記のプログラムがインストールされていなければなりません。]]></value>
+	</item>
+	<item name="ftp_password">
+		<value xml:lang="ko"><![CDATA[FTP 비밀번호]]></value>
+		<value xml:lang="en"><![CDATA[FTP password]]></value>
+		<value xml:lang="jp"><![CDATA[FTP パスワード]]></value>
+	</item>
+	<item name="msg_dependency_package">
+		<value xml:lang="ko"><![CDATA[이 패키지를 의존하고 있는 다른 패키지가 있기 때문에 삭제할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot remove this package because there exists another packages dependent on this.]]></value>
+		<value xml:lang="jp"><![CDATA[このパッケージに依存している他のパッケージがあるため、削除できません。]]></value>
+	</item>
+	<item name="dependant_list">
+		<value xml:lang="ko"><![CDATA[이 패키지에 의존하는 패키지 목록]]></value>
+		<value xml:lang="en"><![CDATA[Dependant package list of the current package]]></value>
+		<value xml:lang="jp"><![CDATA[このパッケージに依存しているパッケージのリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[联动数据包列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[與此程式相關程式列表]]></value>
+		<value xml:lang="tr"><![CDATA[Mevcut pakete bağlı paket listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Gói cài đặt này phụ thuộc vào các gói khác trong danh sách]]></value>
+	</item>
+	<item name="msg_avail_easy_update">
+		<value xml:lang="ko"><![CDATA[이 항목의 새로운 버전이 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is new version for this item.]]></value>
+		<value xml:lang="jp"><![CDATA[この項目の新しいバージョンがあります。]]></value>
+	</item>
+	<item name="msg_do_you_like_update">
+		<value xml:lang="ko"><![CDATA[업데이트 하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would you like to update?]]></value>
+		<value xml:lang="jp"><![CDATA[アップデートしますか？]]></value>
+	</item>
+	<item name="msg_connection_fail">
+		<value xml:lang="ko"><![CDATA[서버 접속이 원활하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to connect to server.]]></value>
+		<value xml:lang="jp"><![CDATA[サーバに接続できませんでした。]]></value>
+	</item>
+	<item name="msg_not_match_server">
+		<value xml:lang="ko"><![CDATA[서버 설정이 올바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Server settings are incorrect.]]></value>
+		<value xml:lang="jp"><![CDATA[サーバー設定が正しくありません。]]></value>
+	</item>
+</lang>
diff --git a/modules/autoinstall/lang/ru.lang.php b/modules/autoinstall/lang/ru.lang.php
deleted file mode 100644
index 0a15c9cdb..000000000
--- a/modules/autoinstall/lang/ru.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Autoinstall(autoinstall) language pack (English)
-     **/
-
-    $lang->autoinstall = 'EasyInstall';
-    $lang->about_autoinstall = 'EasyInstall module will help you install/upgrade programs(skins) for XE.';
-    $lang->package_update = 'Recent Update';
-    $lang->package_downloaded_count = 'Download Count';
-    $lang->need_update = 'Please update package list first.';
-
-    $lang->order_newest = '����Ӭ���';
-    $lang->order_popular = '������ݬ��߬���';
-    $lang->order_download = '���ܬѬ�Ѭ��';
-    $lang->success_installed = '�����Ѭ߬�Ӭݬ֬߬� ����֬�߬�';
-    $lang->view_all_package = '����ܬѬ٬Ѭ�� �Ӭ��';
-    $lang->description_ftp_note = 'If FTP configuration is not set, installation would not work. Please configure FTP information';
-    $lang->description_update = 'If you have upgraded or installed programs without EasyInstall module, please press update button to renew new information';
-    $lang->install = '���߬��Ѭݬݬڬ��ӬѬ��';
-    $lang->update = '���Ҭ߬�Ӭڬ��';
-    $lang->current_version = 'Version';
-    $lang->depending_programs = 'This program is depending on';
-    $lang->require_update = 'Update is required';
-    $lang->require_installation = 'Installation is required';
-    $lang->description_install = 'EasyInstall will also install/update all other programs which this program is depending on';
-    $lang->description_download = 'If FTP is unavailable, you should manually download it and extract it into target path. (if target path is ./modules/board, extract it at ./modules)';
-    $lang->path = 'Path';
-    $lang->cmd_download = 'Download';
-    $lang->view_installed_packages = 'Installed Packages';
-    $lang->msg_ftp_password_input = 'Please input FTP password';
-	$lang->dependant_list = "�� ��Ű���� �����ϴ� ��Ű�� ���";
-	$lang->description_uninstall = "��Ű���� �����մϴ�. ����� ��� ��� �����Ͱ� ������ϴ�.";
-?>
diff --git a/modules/autoinstall/lang/tr.lang.php b/modules/autoinstall/lang/tr.lang.php
deleted file mode 100644
index ceaeb7009..000000000
--- a/modules/autoinstall/lang/tr.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Autoinstall(autoinstall) language pack (English)
-     **/
-
-    $lang->autoinstall = 'KolayKurulum';
-    $lang->about_autoinstall = 'KolayKurulum modülü size programların(dış görünüm), XE\'ye kurulumunda ve sürüm yükseltmesinde yardımcı olacaktır.';
-    $lang->package_update = 'Son Güncellemeler';
-    $lang->package_downloaded_count = 'İndirme Sayısı';
-    $lang->need_update = "Lütfen önce paket listesini güncelleyiniz.";
-
-    $lang->order_newest = "En Yeniler";
-    $lang->order_popular = "Popüler";
-    $lang->order_download = "İndirme";
-    $lang->success_installed = "Başarıyla Kuruldu";
-    $lang->view_all_package = "Tümünü Göster";
-    $lang->description_ftp_note = "Eğer FTP düzeni ayarlanmadıysa, kurulum çalışmayacaktır.Lütfen FTP bilgisini yapılandırınız.";
-    $lang->description_update = "Eğer KolayKurulum modülünü kullanmadan programları kurduysanız ya da güncelleştirdiyseniz, lütfen yeni bilgiyi uyarlamak için güncelleştir tuşuna basınız.";
-    $lang->install = "Kurulum";
-    $lang->update = "Güncelle";
-    $lang->current_version = "Sürüm";
-    $lang->depending_programs = "Bu program için aşağıdaki program(lar) gereklidir : ";
-    $lang->require_update = "Güncelleme gerekmektedir.";
-    $lang->require_installation = "Kurulum gerekmektedir.";
-    $lang->description_install = "KolayKurulum, bu program için gerekli olan tüm diğer programları kurup/güncelleştirecektir.";
-    $lang->description_download = "Eğer FTP kullanılamaz durumduysa, indirmeyi kendiniz yapmanız ve dosyaları hedef dizine çıkartmanız gerekmektedir. (eğer hedef yol ./modules/board ise, çıkarma işlemini ./modules yoluna yapınız)";
-    $lang->path = "Yol";
-    $lang->cmd_download = "İndirme";
-    $lang->view_installed_packages = "Kurulmuş Paketler";
-    $lang->msg_ftp_password_input = "Lütfen FTP şifresini giriniz.";
-	$lang->dependant_list = "Mevcut pakete bağlı paket listesi";
-	$lang->description_uninstall = "Paket kaldırılacaktır. Modüller için, tüm veriler silinecektir.";
-?>
diff --git a/modules/autoinstall/lang/vi.lang.php b/modules/autoinstall/lang/vi.lang.php
deleted file mode 100644
index 643dac247..000000000
--- a/modules/autoinstall/lang/vi.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Autoinstall(autoinstall) 모듈의 기본 언어팩
-     **/
-
-    $lang->autoinstall = 'Cập nhật tự động';
-    $lang->about_autoinstall = 'Nó sẽ giúp bạn Cài đặt / Nâng cấp phiên bản tự động từ trang chủ XE.';
-    $lang->package_update = 'Cập nhật';
-    $lang->package_downloaded_count = 'Lượt Download';
-    $lang->need_update = "Danh sách phiên bản cần cập nhật.";
-
-    $lang->order_newest = "Mới nhất";
-    $lang->order_popular = "Phổ biến";
-    $lang->order_download = "Download";
-    $lang->success_installed = "Đã cài đặt thành công.";
-    $lang->view_all_package = "Xem tất cả";
-    $lang->description_ftp_note = "Nếu bạn chưa thiết lập FTP, sẽ không thể cài đặt đặt hay cập nhật. Xin hãy thiết lập thông tin FTP.";
-    $lang->description_update = "Nếu bạn cập nhật hay cài đặt mà không sử dụng chương trình cập nhật tự động, xin hãy bấm 'Cập nhật' tại trang quản lý để giữ lại thông tin đã cập nhật của chương trình.";
-    $lang->install = "Cài đặt";
-    $lang->update = "Cập nhật";
-    $lang->current_version = "Phiên bản đang dùng";
-    $lang->depending_programs = "Chương trình này phụ thuộc vào ";
-    $lang->require_update = "Yêu cầu cập nhật.";
-    $lang->require_installation = "Yêu cầu cài đặt.";
-    $lang->description_install = "Quá trình Cài đặt / Cập nhật này phụ thuộc vào ";
-    $lang->description_download = "Khi FTP không được mở, bạn nên tải về và giả nén, sau đó Upload theo đường dẫn. (Nếu đường dẫn là ./modules/board, thì giải nén vào ./modules)";
-    $lang->path = "Đường dẫn";
-    $lang->cmd_download = "Download";
-    $lang->view_installed_packages = "Những gói đã cài đặt";
-    $lang->msg_ftp_password_input = "Hãy nhập mật khẩu của FTP.";
-	$lang->dependant_list = "Gói cài đặt này phụ thuộc vào các gói khác trong danh sách";
-	$lang->description_uninstall = "Loại bỏ gói cài đặt. Tất cả dữ liệu của các gói sẽ đồng thời bị xóa.";
-?>
diff --git a/modules/autoinstall/lang/zh-CN.lang.php b/modules/autoinstall/lang/zh-CN.lang.php
deleted file mode 100644
index 87b3d94bd..000000000
--- a/modules/autoinstall/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)               翻译：guny(space.china@gmail.com)
-     * @brief  在线安装/更新(autoinstall)模块语言包
-     **/
-
-    $lang->autoinstall = '安装·更新';
-    $lang->about_autoinstall = 'Autoinstall是XpressEngine的在线安装/更新模块。';
-    $lang->package_update = '最新更新';
-    $lang->package_downloaded_count = '总下载';
-    $lang->need_update = "有新的更新。";
-
-    $lang->order_newest = "最新发布";
-    $lang->order_popular = "热门";
-    $lang->order_download = "下载";
-    $lang->success_installed = "安装成功！";
-    $lang->view_all_package = "查看全部";
-    $lang->description_ftp_note = "请务必完成FTP设置，否则将无法在线安装(更新)相关模块。";
-    $lang->description_update = "新安装(更新)模块的版本信息，点击Update按钮后才能正常显示。";
-    $lang->install = "安装";
-    $lang->update = "更新";
-    $lang->current_version = "现用版本";
-    $lang->depending_programs = "联动插件/控件";
-    $lang->require_update = "需要更新";
-    $lang->require_installation = "需要安装";
-    $lang->description_install = "安装时，与其联动的插件/控件也会同时被安装(更新)。";
-    $lang->description_download = "无法使用FTP时，需得自行下载安装到指定路径。";
-    $lang->path = "安装路径";
-    $lang->cmd_download = "下载";
-    $lang->view_installed_packages = "已安装的数据包";
-    $lang->msg_ftp_password_input = "请输入FTP密码。";
-    $lang->dependant_list = "联动数据包列表";
-    $lang->description_uninstall = "确定要删除此数据包吗？如果此数据包为模块，模块中的数据将会全部消失。";
-?>
diff --git a/modules/autoinstall/lang/zh-TW.lang.php b/modules/autoinstall/lang/zh-TW.lang.php
deleted file mode 100644
index 00b23e5d0..000000000
--- a/modules/autoinstall/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-    /**
-     * @file   zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  自動安裝(autoinstall)模組正體中文語言
-     **/
-
-    $lang->autoinstall = '自動安裝';
-    $lang->about_autoinstall = '可幫助您安裝及更新 XE 程式和面板。';
-    $lang->package_update = '最近更新';
-    $lang->package_downloaded_count = '下載次數';
-    $lang->need_update = "需要更新。";
-
-    $lang->order_newest = "最新發表";
-    $lang->order_popular = "熱門";
-    $lang->order_download = "下載";
-    $lang->success_installed = "安裝成功";
-    $lang->view_all_package = "全部檢視";
-    $lang->description_ftp_note = "請先將 FTP 設定好，否則無法執行自動安裝功能。";
-    $lang->description_update = "如果您最近不是用自動安裝模組更新或安裝，請按更新按鈕更新。";
-    $lang->install = "安裝";
-    $lang->update = "更新";
-    $lang->current_version = "版本";
-    $lang->depending_programs = "此程式需要安裝";
-    $lang->require_update = "需要更新";
-    $lang->require_installation = "需要安裝";
-    $lang->description_install = "自動安裝也能夠同時安裝與更新其他相關程式";
-    $lang->description_download = "如果 FTP 無法使用的話，必須要手動下載並解壓縮到目標路徑。(假設目標路徑為 ./modules/board 的話，將檔案解壓縮到 ./modules就可以了)";
-    $lang->path = "路徑";
-    $lang->cmd_download = "下載";
-    $lang->view_installed_packages = "已安裝程式";
-    $lang->msg_ftp_password_input = "請輸入 FTP 密碼";
-	$lang->dependant_list = "與此程式相關程式列表";
-	$lang->description_uninstall = "移除模組，所有資料將會被刪除。";
-?>
diff --git a/modules/autoinstall/queries/getCategories.xml b/modules/autoinstall/queries/getCategories.xml
index 8c680a7b3..977fb6e04 100644
--- a/modules/autoinstall/queries/getCategories.xml
+++ b/modules/autoinstall/queries/getCategories.xml
@@ -5,4 +5,7 @@
     <columns>
         <column name="*" />
     </columns>
+	<navigation>
+		<index default="list_order" var="list_order" order="asc" />
+	</navigation>
 </query>
diff --git a/modules/autoinstall/queries/getPackageSrlByPath.xml b/modules/autoinstall/queries/getPackageSrlByPath.xml
new file mode 100644
index 000000000..fef67cbdc
--- /dev/null
+++ b/modules/autoinstall/queries/getPackageSrlByPath.xml
@@ -0,0 +1,11 @@
+<query id="getPackageSqlByPath" action="select">
+    <tables>
+        <table name="autoinstall_packages" />
+    </tables>
+    <columns>
+        <column name="package_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="path" var="path" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/autoinstall/queries/insertCategory.xml b/modules/autoinstall/queries/insertCategory.xml
index ef09fec86..e993dd262 100644
--- a/modules/autoinstall/queries/insertCategory.xml
+++ b/modules/autoinstall/queries/insertCategory.xml
@@ -6,5 +6,6 @@
         <column name="category_srl" var="category_srl" filter="number" notnull="notnull" />
         <column name="parent_srl" var="parent_srl" filter="number" notnull="notnull" />
         <column name="title" var="title" minlength="1" maxlength="250" />
+		<column name="list_order" var="list_order" filter="number" notnull="notnull" />
     </columns>
 </query>
diff --git a/modules/autoinstall/ruleset/ftp.xml b/modules/autoinstall/ruleset/ftp.xml
new file mode 100644
index 000000000..e8f584700
--- /dev/null
+++ b/modules/autoinstall/ruleset/ftp.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+	<customrules>
+	</customrules>
+	<fields>
+		<field name="ftp_password" required="true"/>
+	</fields>
+</ruleset>
diff --git a/modules/autoinstall/schemas/ai_remote_categories.xml b/modules/autoinstall/schemas/ai_remote_categories.xml
index f35939259..27b390f82 100644
--- a/modules/autoinstall/schemas/ai_remote_categories.xml
+++ b/modules/autoinstall/schemas/ai_remote_categories.xml
@@ -2,4 +2,5 @@
     <column name="category_srl" type="number" size="11" default="0" notnull="notnull" primary_key="primary_key" />
     <column name="parent_srl" type="number" size="11" default="0" notnull="notnull" index="idx_parent_srl" />
     <column name="title" type="varchar" size="250" notnull="notnull" />
+	<column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
 </table>
diff --git a/modules/autoinstall/tpl/category.html b/modules/autoinstall/tpl/category.html
new file mode 100644
index 000000000..e7f129adb
--- /dev/null
+++ b/modules/autoinstall/tpl/category.html
@@ -0,0 +1,23 @@
+<div class="easyNav">
+	<div loop="$categories => $category" class="category">
+		<block cond="$category->depth == 0">
+			<h2>{$category->title}</h2>
+			<ul>
+				<li loop="$category->children => $children">
+					<block cond="$children->category_srl == $category_srl">
+						{@$current_category = $children->title}
+						<strong>{$children->title}({$children->nPackages})</strong>
+					</block>
+					<block cond="$children->category_srl != $category_srl"><a href="{getUrl('','module','admin','act','dispAutoinstallAdminIndex','category_srl',$children->category_srl,'childrenList','')}">{$children->title}({$children->nPackages})</a></block>
+				</li>
+			</ul>
+		</block>
+	</div>
+	<p class="filter">
+		<a cond="$act != 'dispAutoinstallAdminIndex'" href="{getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminIndex')}">All({$tCount})</a>
+		<strong cond="$act == 'dispAutoinstallAdminIndex'">All({$tCount})</strong>
+		| 
+		<a cond="$act != 'dispAutoinstallAdminInstalledPackages'" href="{getUrl('', 'module', 'admin', 'act', 'dispAutoinstallAdminInstalledPackages')}">Installed({$iCount})</a>
+		<strong cond="$act == 'dispAutoinstallAdminInstalledPackages'">Installed({$iCount})</strong>
+	</p>
+</div>
diff --git a/modules/autoinstall/tpl/config.html b/modules/autoinstall/tpl/config.html
deleted file mode 100644
index 1edb85f3e..000000000
--- a/modules/autoinstall/tpl/config.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--%import("filter/insert_config.xml")-->
-<!--#include("header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-<table cellspacing="0" class="rowTable">
-<tr>
-    <th scope="col"><div>설치된 XE의 절대경로</div></th>
-    <td>{_XE_PATH_}
-    </td>
-</tr>
-<tr>
-    <th scope="col" rowspan="2"><div>설치된 XE의 FTP 절대경로 설정</div></th>
-    <td>
-        <input type="text" name="ftp_root_path" value="<!--@if($pwd && $pwd!='/')-->{$pwd}<!--@else-->{$config->ftp_root_path}<!--@end-->" class="inputTypeText w400" /> 
-    </td>
-</tr>
-<tr>
-    <td>
-    <!--@if($list)-->
-            <ul>
-    <!--@foreach($list as $k => $v)-->
-        <!--@if($v)-->
-            <li> <a href="{getUrl('pwd',$pwd.$v)}">{$v}</a></li>
-        <!--@end-->
-    <!--@end-->
-            </ul>
-    <!--@end-->
-    </td>
-</tr>
-
-<tr class="row2">
-    <th colspan="2" class="button" style="text-align:center">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-    </th>
-</tr>
-</table>
-</form>
diff --git a/modules/autoinstall/tpl/css/autoinstall.css b/modules/autoinstall/tpl/css/autoinstall.css
index 776413188..5ad21f400 100644
--- a/modules/autoinstall/tpl/css/autoinstall.css
+++ b/modules/autoinstall/tpl/css/autoinstall.css
@@ -1,59 +1,59 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-.install{ border-top:1px solid #ddd; *zoom:1;}
-.install:after{ content:""; display:block; clear:both;}
-
-.aside { width:180px; float:left; margin-right:30px; padding-bottom:30px; }
-
-.aside .categoryBox { background-color:#F8F8F8; padding:10px; width:160px; overflow:hidden; }
-.aside .categoryBox h3 { padding:0 0 10px 0; margin:0 0 10px 0; white-space:nowrap; overflow:hidden; color:#48494E; font-size:11px; font-weight:normal;}
-.aside .categoryBox .bottomLine {background:transparent url(../img/hrE1.gif) repeat-x scroll left bottom;}
-.aside .categoryBox .topLine {background:transparent url(../img/hrE1.gif) repeat-x scroll left top;}
-.aside .categoryBox h3 a { color:#48494E; font-size:12px; font-weight:bold; text-decoration:none; }
-.aside .categoryBox ul.category { margin:10px 0 0 0; padding:0; list-style:none; }
-.aside .categoryBox ul.category li { margin:0 0 10px 10px; }
-.aside .categoryBox ul.category li a.selected { font-weight:bold; color:#2893BB; }
-.aside .categoryBox ul.category li a { text-decoration:none; color:#7B7575; }
-.aside .categoryBox ul.category li span { font-family:verdana; font-size:10px; color:#999; }
-
-.aside .categoryBox ul.resourceManage { margin:0; padding:10px 0 0 0; list-style:none; background:transparent url(../img/hrE1.gif) repeat-x scroll left top; }
-.aside .categoryBox ul.resourceManage li { background:url(../img/btnManage.gif) no-repeat 2px 2px; padding-left:14px; white-space:nowrap; overflow:hidden; margin-bottom:10px; }
-.aside .categoryBox ul.resourceManage li a { text-decoration:none; color:#747474; }
-.aside .categoryBox ul.resourceManage li a.selected { font-weight:bold; }
-
-.aside .searchBox { padding:10px 0; text-align:center; } 
-.aside .searchBox input.input { border:1px solid #ddd; width:120px; height:16px;}
-.aside .searchBox input.submit { vertical-align:middle; }
-
-.install .content { position:relative; *zoom:1; overflow:hidden; width:auto; float:none; margin:0;}
-
-.updateList,
-.updateList th,
-.updateList td{ border:0; vertical-align:top; text-align:left; padding:10px 0;}
-.updateList {width:100%; height:100px; table-layout:fixed;}
-.updateList th,
-.updateList td{ border-bottom:1px dotted #ddd;}
-.updateList  th img { border:1px solid #ccc; padding:2px; overflow:hidden; *zoom:1; }
-.updateList  td { padding:10px 0 0 0;}
-.updateList  td .title{ position:relative;}
-.updateList  td .title h3 { padding:0; margin:0 0 5px 0; font-size:12px;}
-.updateList  td .title a {text-decoration:none; color:#333 !important; }
-.updateList  td .title .buttons{ position:absolute; top:0; right:0;}
-.updateList  td .info p{ margin:0 0 5px 0; line-height:1.5;}
-.updateList  td .info p.desc{ margin:0 100px 10px 0;}
-.updateList  td .info p.meta{ font-size:11px;}
-.updateList  td .info p.meta span{ display:inline-block; line-height:1; padding:0 5px 0 9px;}
-.updateList  td .info p.meta .reputation{ padding:0 5px 0 0;}
-.updateList  td .info p.meta .reputation img{ float:left; margin:-1px 0 0 0;}
-.updateList  td .info p.meta .reputation span{ padding:0 0 0 5px;}
-.updateList  td .info p.meta .lastUpdate{ border-left:1px solid #ddd;}
-.updateList  td .info p.meta .download{ border-left:1px solid #ddd;}
-
-ul.listOrder { position:relative; overflow:hidden; margin:0; padding:10px 0; text-align:left; background:transparent url(../img/hrE1.gif) repeat-x scroll left bottom;}
-ul.listOrder.asc li.arrow { background:url(../img/arrUp.gif) no-repeat right 2px; padding-right:10px; }
-ul.listOrder.desc li.arrow { background:url(../img/arrDown.gif) no-repeat right 2px; padding-right:10px; }
-ul.listOrder li { position:relative; left:-1px; display:inline; margin:0; padding:0 5px 0 9px; border-left:1px solid #ddd;}
-ul.listOrder li.arrow a { text-decoration:none; font-weight:bold; color:#2893BB; }
-ul.listOrder li a { text-decoration:none; color:#7B7575; }
-
-p.caution strong { font-size: 1.2em; font-weight: bold; color: red; } 
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+.install{ border-top:1px solid #ddd; *zoom:1;}
+.install:after{ content:""; display:block; clear:both;}
+
+.aside { width:180px; float:left; margin-right:30px; padding-bottom:30px; }
+
+.aside .categoryBox { background-color:#F8F8F8; padding:10px; width:160px; overflow:hidden; }
+.aside .categoryBox h3 { padding:0 0 10px 0; margin:0 0 10px 0; white-space:nowrap; overflow:hidden; color:#48494E; font-size:11px; font-weight:normal;}
+.aside .categoryBox .bottomLine {background:transparent url(../img/hrE1.gif) repeat-x scroll left bottom;}
+.aside .categoryBox .topLine {background:transparent url(../img/hrE1.gif) repeat-x scroll left top;}
+.aside .categoryBox h3 a { color:#48494E; font-size:12px; font-weight:bold; text-decoration:none; }
+.aside .categoryBox ul.category { margin:10px 0 0 0; padding:0; list-style:none; }
+.aside .categoryBox ul.category li { margin:0 0 10px 10px; }
+.aside .categoryBox ul.category li a.selected { font-weight:bold; color:#2893BB; }
+.aside .categoryBox ul.category li a { text-decoration:none; color:#7B7575; }
+.aside .categoryBox ul.category li span { font-family:verdana; font-size:10px; color:#999; }
+
+.aside .categoryBox ul.resourceManage { margin:0; padding:10px 0 0 0; list-style:none; background:transparent url(../img/hrE1.gif) repeat-x scroll left top; }
+.aside .categoryBox ul.resourceManage li { background:url(../img/btnManage.gif) no-repeat 2px 2px; padding-left:14px; white-space:nowrap; overflow:hidden; margin-bottom:10px; }
+.aside .categoryBox ul.resourceManage li a { text-decoration:none; color:#747474; }
+.aside .categoryBox ul.resourceManage li a.selected { font-weight:bold; }
+
+.aside .searchBox { padding:10px 0; text-align:center; } 
+.aside .searchBox input.input { border:1px solid #ddd; width:120px; height:16px;}
+.aside .searchBox input.submit { vertical-align:middle; }
+
+.install .content { position:relative; *zoom:1; overflow:hidden; width:auto; float:none; margin:0;}
+
+.updateList,
+.updateList th,
+.updateList td{ border:0; vertical-align:top; text-align:left; padding:10px 0;}
+.updateList {width:100%; height:100px; table-layout:fixed;}
+.updateList th,
+.updateList td{ border-bottom:1px dotted #ddd;}
+.updateList  th img { border:1px solid #ccc; padding:2px; overflow:hidden; *zoom:1; }
+.updateList  td { padding:10px 0 0 0;}
+.updateList  td .title{ position:relative;}
+.updateList  td .title h3 { padding:0; margin:0 0 5px 0; font-size:12px;}
+.updateList  td .title a {text-decoration:none; color:#333 !important; }
+.updateList  td .title .buttons{ position:absolute; top:0; right:0;}
+.updateList  td .info p{ margin:0 0 5px 0; line-height:1.5;}
+.updateList  td .info p.desc{ margin:0 100px 10px 0;}
+.updateList  td .info p.meta{ font-size:11px;}
+.updateList  td .info p.meta span{ display:inline-block; line-height:1; padding:0 5px 0 9px;}
+.updateList  td .info p.meta .reputation{ padding:0 5px 0 0;}
+.updateList  td .info p.meta .reputation img{ float:left; margin:-1px 0 0 0;}
+.updateList  td .info p.meta .reputation span{ padding:0 0 0 5px;}
+.updateList  td .info p.meta .lastUpdate{ border-left:1px solid #ddd;}
+.updateList  td .info p.meta .download{ border-left:1px solid #ddd;}
+
+ul.listOrder { position:relative; overflow:hidden; margin:0; padding:10px 0; text-align:left; background:transparent url(../img/hrE1.gif) repeat-x scroll left bottom;}
+ul.listOrder.asc li.arrow { background:url(../img/arrUp.gif) no-repeat right 2px; padding-right:10px; }
+ul.listOrder.desc li.arrow { background:url(../img/arrDown.gif) no-repeat right 2px; padding-right:10px; }
+ul.listOrder li { position:relative; left:-1px; display:inline; margin:0; padding:0 5px 0 9px; border-left:1px solid #ddd;}
+ul.listOrder li.arrow a { text-decoration:none; font-weight:bold; color:#2893BB; }
+ul.listOrder li a { text-decoration:none; color:#7B7575; }
+
+p.caution strong { font-size: 1.2em; font-weight: bold; color: red; } 
diff --git a/modules/autoinstall/tpl/header.html b/modules/autoinstall/tpl/header.html
index 6d226d988..5732b79b6 100644
--- a/modules/autoinstall/tpl/header.html
+++ b/modules/autoinstall/tpl/header.html
@@ -1 +1 @@
-<h3 class="xeAdmin">{$lang->autoinstall} <span class="gray">Beta</span></h3>
+<h1 class="h1">{$lang->autoinstall}</h1>
\ No newline at end of file
diff --git a/modules/autoinstall/tpl/index.html b/modules/autoinstall/tpl/index.html
index f4106888d..018d00ccb 100644
--- a/modules/autoinstall/tpl/index.html
+++ b/modules/autoinstall/tpl/index.html
@@ -1,21 +1,17 @@
-<!--#include("header.html")-->
-<!--%import("css/autoinstall.css")-->
-<!--%import("js/autoinstall.js")-->
-<div class="infoText">
-	<!--@if($show_ftp_note)-->
-	<p class="warning">{$lang->description_ftp_note} <a href="{getUrl('','module','admin','act','dispAdminConfig')}#ftpSetup">FTP Setup</a> </p>
-	<!--@end-->
-	<!--@if($need_update)-->
-	<p class="update">{$lang->need_update}</p>
-	<!--@else-->
-	<p class="update">{$lang->description_update}</p>
-	<!--@end-->
-	<p><span class="button xLarge strong green"><button type="button" onclick="doUpdate()" title="update">Update</button></span></p>
-</div>
-
-<div class="install">
-<!--#include("leftBox.html")-->
-<!--@if($item_list)-->
-    <!--#include("list.html")-->
-<!--@end-->
-</div>
+<include target="header.html" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="" method="post">
+	<input type="hidden" name="module" value="autoinstall" />
+	<input type="hidden" name="act" value="procAutoinstallAdminUpdateinfo" />
+	<p>
+		<block cond="$show_ftp_note">
+			{@$ftp_link = sprintf('<a href="%s#ftpSetup">%s</a>', getUrl('', 'module', 'admin', 'act', 'dispAdminConfig'), $lang->ftp_setup)}
+			{sprintf($lang->description_ftp_note, $ftp_link)}
+		</block>
+		{@$btnUpdate = sprintf('<input type="submit" value="%s" class="text" />', $lang->status_update)}
+		{sprintf($lang->description_update, $btnUpdate)}
+	</p>
+</form>
+<include target="list.html" />
diff --git a/modules/autoinstall/tpl/install.html b/modules/autoinstall/tpl/install.html
index df1bac164..1999bcd85 100644
--- a/modules/autoinstall/tpl/install.html
+++ b/modules/autoinstall/tpl/install.html
@@ -1,30 +1,48 @@
-<!--#include("header.html")-->
-<!--%import("css/autoinstall.css")-->
-<!--%import("js/autoinstall.js")-->
-<div class="infoText">
-	<p><strong>{$package->title}</strong> ver. <strong>{$package->version}</strong> ( <!--@if($package->installed)-->{$lang->current_version}: {$package->cur_version} <!--@if($package->need_update)--> ({$lang->require_update})<!--@end--> <!--@else-->{$lang->require_installation}<!--@end--> )</p>
-	<!--@foreach($package->depends as $dep)-->
-	<dl>
-    <dt><strong>{$lang->depending_programs} :</strong></dt>
-		<dd> {$dep->title} ver. {$dep->version} - 
-			<!--@if($dep->installed)-->{$lang->current_version}: {$dep->cur_version} <!--@if($dep->need_update)--> ({$lang->require_update})<!--@end--> <!--@else-->{$lang->require_installation}<!--@end-->
-            <!--@if($show_ftp_note && ($dep->need_update || !$dep->installed))--><a href="http://download.xpressengine.com/?module=resourceapi&act=procResourceapiDownload&package_srl={$dep->package_srl}">{$lang->cmd_download}</a> ({$lang->path} : {$dep->path})<!--@end-->
-		</dd>
-	</dl>
-	<!--@end-->
-
-    <!--@if(!$package->installed || $package->need_update)-->
-    <!--@if($show_ftp_note)-->
-    <p class="warning">{$lang->description_download}. (<a href="{getUrl('','module','admin','act','dispAdminConfig')}#ftpSetup">FTP Setup</a>) </p>
-    <p>{$lang->path} : {$package->path}</p>
-    <p><a href="http://download.xpressengine.com/?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}" class="button large green strong"><span>{$lang->cmd_download}</span></a></p>
-    <!--@else-->
-	<p>{$lang->description_install}. </p>
-    <!--@if($need_password)-->
-    <p><label for="ftp_password">FTP {$lang->password} ({$lang->about_ftp_password}):</label><input type="password" name="ftp_password" id="ftp_password" class="inputTypeText" /></p>
-    <!--@end-->
-	<p><a href="#" onclick="doInstallPackage('{$package->package_srl}')" class="button large green strong"><span>{$package->installed?$lang->update:$lang->install}</span></a></p>
-    <!--@end-->
-    <!--@end-->
-
-</div>
+<include target="header.html" />
+<load target="js/waiting.js" usecdn="true" />
+
+<h2 class="h2">{$package->title} ver. {$package->version}</h2>
+<p cond="$package->installed">{$lang->current_version}: {$package->cur_version} <block cond="$package->need_update">({$lang->require_update})</block></p>
+<p cond="!$package->installed">{$lang->require_installation}</p>
+<block cond="$package->depends">
+	<p>{$lang->about_depending_programs}</p>
+	<ul>
+	<li loop="$package->depends => $dep">
+		{$dep->title} ver. {$dep->version} -
+		<block cond="$dep->installed">{$lang->current_version}: {$dep->cur_version} <block cond="$dep->need_update">({$lang->require_update})</block></block>
+		<block cond="!$dep->installed">{$lang->require_installation}</block>
+		<block cond="$show_ftp_note && ($dep->need_update || !$dep->installed)">
+			<a href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$dep->package_srl}">{$lang->cmd_download}</a> ({$lang->path}: {$dep->path})
+		</block>
+	</li>
+	</ul>
+</block>
+
+<block cond="!$package->installed || $package->need_update">
+	<block cond="$show_ftp_note">
+		<p>{$lang->description_download}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}#ftpSetup">FTP Setup</a>)</p>
+		<p>{$lang->path}: {$package->path}</p>
+		<p><a href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}">{$lang->cmd_download}</a>
+	</block>
+	<block cond="!$show_ftp_note">
+		<p>{$lang->description_install}</p>
+		<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+			<p>{$XE_VALIDATOR_MESSAGE}</p>
+		</div>
+		<form action="./" class="form" method="post" ruleset="ftp">
+			<input type="hidden" name="module" value="autoinstall" />
+			<input type="hidden" name="act" value="procAutoinstallAdminPackageinstall" />
+			<input type="hidden" name="package_srl" value="{$package->package_srl}" />
+			<input type="hidden" name="return_url" value="{$return_url}" />
+			<input cond="!$need_password" type="hidden" name="ftp_password" value="dummy" />
+
+			<block cond="$need_password">
+				<p class="q"><label for="ftp_password">FTP {$lang->password}</label></p>
+				<p class="a"><input type="password" name="ftp_password" id="ftp_password" value="" /> <span class="desc">{$lang->about_ftp_password}</span></p>
+			</block>
+			<div class="btnArea">
+				<span class="btn medium"><input type="submit" value="{$package->installed?$lang->update:$lang->install}" /></span>
+			</div>
+		</form>
+	</block>
+</block>
diff --git a/modules/autoinstall/tpl/js/autoinstall.js b/modules/autoinstall/tpl/js/autoinstall.js
index 863927c9d..7ba08eda5 100644
--- a/modules/autoinstall/tpl/js/autoinstall.js
+++ b/modules/autoinstall/tpl/js/autoinstall.js
@@ -21,7 +21,9 @@ function doInstallPackage(package_srl) {
 }
 
 function completeUpdateNoMsg(ret_obj) {
-    location.reload();
+    //location.reload();
+	var src = current_url.setQuery('act', 'dispAutoinstallAdminIndex');
+	location.href = src;
 }
 
 function completeInstall(ret_obj) {
diff --git a/modules/autoinstall/tpl/js/waiting.js b/modules/autoinstall/tpl/js/waiting.js
new file mode 100644
index 000000000..c6cdf4d56
--- /dev/null
+++ b/modules/autoinstall/tpl/js/waiting.js
@@ -0,0 +1,15 @@
+(function($){
+	var WaitingStub = xe.createPlugin('waiting_stub', {
+		API_BEFORE_VALIDATE : function(sender, params) {
+			$('.wfsr').html(waiting_message).show();
+		},
+		API_BEFORE_SHOW_ALERT : function(sender, params) {
+			$('.wfsr').hide();
+		}
+	});
+
+	var Validator = xe.getApp('validator')[0];
+		if(Validator){
+			Validator.registerPlugin(new WaitingStub);
+	}
+})(jQuery);
diff --git a/modules/autoinstall/tpl/leftBox.html b/modules/autoinstall/tpl/leftBox.html
deleted file mode 100644
index ca4964a71..000000000
--- a/modules/autoinstall/tpl/leftBox.html
+++ /dev/null
@@ -1,50 +0,0 @@
-<div class="aside">
-    <div class="categoryBox">
-        <h3 class="bottomLine"><a href="{getUrl('act','dispAutoinstallAdminIndex','category_srl','')}">{$lang->view_all_package}</a> <span>({$tCount})</span></h3>
-        {@ $_pDepth = 0;}
-
-        <ul class="category">
-            <!--@foreach($categories as $key => $val)-->
-            <!--@if($_pDepth > $val->depth)-->
-            <!--@for($i=$val->depth; $i<$_pDepth; $i++)-->
-        </ul>
-        </li>
-            <!--@end-->
-            {@ $_pDepth = $val->depth}
-            <!--@end-->
-            <li>
-                <!--@if(count($val->children))-->
-                <a href="{getUrl('','module','admin','act','dispAutoinstallAdminIndex','category_srl',$val->category_srl,'childrenList',$val->childrenList)}"<!--@if($val->category_srl == $category_srl)--> class="selected"<!--@end-->>{$val->title}</a>
-                <!--@else-->
-                <a href="{getUrl('','module','admin','act','dispAutoinstallAdminIndex','category_srl',$val->category_srl,'childrenList','')}"<!--@if($val->category_srl == $category_srl)--> class="selected"<!--@end-->>{$val->title}</a>
-                <!--@end-->
-                <!--@if($val->nPackages)-->
-                <span>({$val->nPackages})</span>
-                <!--@end-->
-            <!--@if(count($val->children))-->
-            {@$_pDepth++}
-        <ul class="category">
-            <!--@else-->
-            </li>
-            <!--@end-->
-            <!--@end-->
-            <!--@for($i=0;$i<$_pDepth;$i++)-->
-        </ul>
-        <!--@end-->
-        </li>
-        </ul>
-        <div class="searchBox bottomLine">
-            <form action="{getUrl()}" method="get">
-                <input type="hidden" name="category_srl" value="{$category_srl}" />
-                <input type="hidden" name="module" value="admin" />
-                <input type="hidden" name="act" value="dispAutoinstallAdminIndex" />
-                <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="input" />
-                <input type="image" src="./img/btn_search.gif" class="submit" />
-            </form>
-        </div>
-        <br />
-        <h3><a href="{getUrl('','module','admin','act','dispAutoinstallAdminInstalledPackages')}">{$lang->view_installed_packages}</a> <span>({$iCount})</span></h3>
-
-    </div>
-
-</div>
diff --git a/modules/autoinstall/tpl/list.html b/modules/autoinstall/tpl/list.html
index 73bba111e..e6e04d3b4 100644
--- a/modules/autoinstall/tpl/list.html
+++ b/modules/autoinstall/tpl/list.html
@@ -1,96 +1,122 @@
-<div class="content">
-    <!--@if($act == "dispAutoinstallAdminIndex")-->
-    <ul class="listOrder {$order_type}">
-        <!--@if($order_target=='newest')-->
-            <!--@if($order_type == 'desc')-->{@$_order_type = 'asc'}<!--@else-->{@$_order_type = 'desc'}<!--@end-->
-        <!--@else-->
-            {@$_order_type = 'desc'}
-        <!--@end-->
-        <li <!--@if($order_target=='newest')-->class="arrow"<!--@end-->><a href="{getUrl('order_target','newest','order_type',$_order_type)}">{$lang->order_newest}</a></li>
-        <!--@if($order_target=='download')-->
-            <!--@if($order_type == 'desc')-->{@$_order_type = 'asc'}<!--@else-->{@$_order_type = 'desc'}<!--@end-->
-        <!--@else-->
-            {@$_order_type = 'desc'}
-        <!--@end-->
-        <li <!--@if($order_target=='download')-->class="arrow"<!--@end-->><a href="{getUrl('order_target','download','order_type',$_order_type)}">{$lang->order_download}</a></li>
-        <!--@if($order_target=='popular')-->
-            <!--@if($order_type == 'desc')-->{@$_order_type = 'asc'}<!--@else-->{@$_order_type = 'desc'}<!--@end-->
-        <!--@else-->
-            {@$_order_type = 'desc'}
-        <!--@end-->
-        <li <!--@if($order_target=='popular')-->class="arrow"<!--@end-->><a href="{getUrl('order_target','popular','order_type',$_order_type)}">{$lang->order_popular}</a></li>
-    </ul>
-    <!--@end-->
-
-    <table class="updateList" border="1" cellspacing="0">
-    <col width="120" /><col />
-    <!--@foreach($item_list as $key => $val)-->
-    <tr>
-        {@ $target_url = $original_site."?mid=download&package_srl=".$val->package_srl; }
-        <th><a href="{$target_url}"><img src="{str_replace('./', $uri, $val->item_screenshot_url)}" width="100" height="100" alt="" /></a></th>
-        <td>
-			<div class="title">
-				<h3>
-					<!--@if($val->category_srl)-->
-					<a href="{getUrl('category_srl',$val->category_srl)}">[{$categories[$val->category_srl]->title}]</a>
-					<!--@end-->
-					<a href="{$target_url}">{$val->title} ver. {$val->item_version}</a>
-				</h3>
-					<!--@if($val->current_version)-->
-					<p>{$lang->current_version} : {$val->current_version}
-						<!--@if($val->deps)-->
-					<br />
-						{$lang->dependant_list}	:
-						<!--@foreach($val->deps as $package_srl)-->
-						{$installed[$package_srl]->title}.
-						<!--@endforeach-->
-						<!--@end-->
-					</p>
-						<div class="buttons">
-						<!--@if($val->avail_remove)-->
-						<a href="{getUrl('act','dispAutoinstallAdminUninstall','package_srl',$val->package_srl)}" class="button red strong"><span>{$lang->cmd_delete}</span></a>
-						<!--@end-->
-						<!--@if($val->need_update == 'Y')-->
-						<a href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$val->package_srl)}" class="button"><span>{$lang->update}</span></a>
-						<!--@end-->
-						</div>
-					<!--@else-->
-					<div class="buttons">
-					<a href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$val->package_srl)}" class="button"><span>{$lang->install}</span></a>
-					</div>
-					<!--@end-->
-			</div>
-			<div class="info">
-				<p class="desc">{cut_str($val->package_description,200)}</p>
-				<p class="meta">
-					<span class="reputation">
-						<!--@for($i=0;$i<5;$i++)-->
-							<!--@if($i<$val->package_star)-->
-							<img src="./img/starOn.gif" alt="" />
-							<!--@else-->
-							<img src="./img/starOff.gif" alt="" />
-							<!--@end-->
-						<!--@end-->
-						<span>{sprintf("%0.1f",$val->package_voted/$val->package_voter*2)}/{number_format($val->package_voter)}</span>
-					</span>
-					<span class="lastUpdate">{$lang->package_update} {zdate($val->item_regdate, "Y-m-d H:i")}</span>
-					<span class="download">{$lang->package_downloaded_count} : {number_format($val->package_downloaded)}</span>
-				</p>
-			</div>
-        </td>
-    </tr>
-    <!--@end-->
-    </table>
-
-    <div class="pagination a1">
-        <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a>
-        <!--@while($page_no = $page_navigation->getNextPage())-->
-            <!--@if($page == $page_no)-->
-                <strong>{$page_no}</strong>
-            <!--@else-->
-                <a href="{getUrl('page',$page_no)}">{$page_no}</a>
-            <!--@end-->
-        <!--@end-->
-        <a href="{getUrl('page',$page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
-    </div>
-</div>
+<include target="category.html" />
+
+<div class="table even easyList">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>
+			<block cond="$current_category">{$current_category}</block>
+			<block cond="!$current_category">All</block>
+			({sprintf('%d', $page_navigation->total_count)})
+			<span cond="$act == 'dispAutoinstallAdminIndex'" class="side">
+				<!--@if($order_target == 'newest')-->
+					<!--@if($order_type == 'desc')-->{@$_newest_order_type = 'asc'}<!--@else-->{@$_newest_order_type = 'desc'}<!--@end-->
+				<!--@else-->
+					{@$_newest_order_type = 'desc'}
+				<!--@end-->
+				<!--@if($order_target == 'download')-->
+					<!--@if($order_type == 'desc')-->{@$_download_order_type = 'asc'}<!--@else-->{@$_download_order_type = 'desc'}<!--@end-->
+				<!--@else-->
+					{@$_download_order_type = 'desc'}
+				<!--@end-->
+				<!--@if($order_target == 'popular')-->
+					<!--@if($order_type == 'desc')-->{@$_popular_order_type = 'asc'}<!--@else-->{@$_popular_order_type = 'desc'}<!--@end-->
+				<!--@else-->
+					{@$_popular_order_type = 'desc'}
+				<!--@end-->
+
+				Sort by
+				<a href="{getUrl('order_target','newest','order_type',$_newest_order_type)}">{$lang->order_newest}<!--@if($order_target == 'newest')--><!--@if($_newest_order_type == 'asc')-->▼<!--@else-->▲<!--@end--><!--@end--></a> |
+				<a href="{getUrl('order_target','download','order_type',$_download_order_type)}">{$lang->order_download}<!--@if($order_target == 'download')--><!--@if($_download_order_type == 'asc')-->▼<!--@else-->▲<!--@end--><!--@end--></a> |
+				<a href="{getUrl('order_target','popular','order_type',$_popular_order_type)}">{$lang->order_popular}<!--@if($order_target == 'popular')--><!--@if($_popular_order_type == 'asc')-->▼<!--@else-->▲<!--@end--><!--@end--></a>
+			</span>
+		</caption>
+		<thead>
+			<tr>
+				<th scope="col">{$lang->category}</th>
+				<th scope="col">{$lang->thumbnail}</th>
+				<th scope="col" class="title">{$lang->name}</th>
+				<th scope="col">{$lang->distribute_version}</th>
+				<th scope="col">{$lang->current_version}</th>
+				<th scope="col">{$lang->run}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr loop="$item_list => $key, $item">
+				{@ $target_url = $original_site."?mid=download&package_srl=".$item->package_srl; }
+				<td>{$item->category}</td>
+				<td><img src="{str_replace('./', $uri, $item->item_screenshot_url)}" alt="" width="100" height="100" /></td>
+				<td class="title">
+					<p><a href="{$target_url}">{htmlspecialchars($item->title)}</a></p>
+					<p>{cut_str(htmlspecialchars($item->package_description),200)}</p>
+					<p>
+						<block cond="(int)$item->package_voter > 0">
+							<span class="starRating"><span style="width:{sprintf("%d",$item->package_voted/$item->package_voter*20)}%">{sprintf($lang->rate, $item->package_start)}</span></span>
+							{sprintf("%0.1f",$item->package_voted/$item->package_voter*2)}/{number_format($item->package_voter)} |
+						</block>
+						<block cond="(int)$item->package_voter <= 0">
+							<span class="starRating"><span style="width:0%">0</span></span>
+							0/0 |
+						</block>
+						{$lang->package_update} {zdate($item->item_regdate, "Y-m-d H:i")} |
+						{$lang->package_downloaded_count} : {number_format($item->package_downloaded)}
+					</p>
+					<p cond="$item->deps">{$lang->dependant_list}:</p>
+					<ul cond="$item->deps">
+						<li loop="$item->deps => $package_srl">{$installed[$package_srl]->title}</li>
+					</ul>
+				</td>
+				<td>{htmlspecialchars($item->item_version)}</td>
+				<td>{htmlspecialchars($item->current_version)}</td>
+				<td>
+					<a cond="!$item->current_version" href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$item->package_srl)}">{$lang->install}</a>
+					<a cond="!$show_ftp_note && $item->current_version && $item->avail_remove" href="{getUrl('act','dispAutoinstallAdminUninstall','package_srl',$item->package_srl)}">{$lang->cmd_delete}</a>
+					<a cond="$item->current_version && $item->need_update == 'Y'" href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$item->package_srl)}">{$lang->update}</a>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<div class="search">
+	<form action="./" class="pagination" cond="$page_navigation">
+		<input type="hidden" name="error_return_url" value="" />
+		<input type="hidden" name="module" value="{$module}" />
+		<input type="hidden" name="act" value="{$act}" />
+		<input cond="$order_target" type="hidden" name="order_target" value="{$order_target}" />
+		<input cond="$order_type" type="hidden" name="order_type" value="{$order_type}" />
+		<input cond="$category_srl" type="hidden" name="category_srl" value="{$category_srl}" />
+		<input cond="$childrenList" type="hidden" name="childrenList" value="{$childrenList}" />
+		<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+
+		<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+		<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+			{@$isGoTo = true}
+			<a href="{getUrl('page', '')}">1</a>
+			<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		</block>
+		<!--@while($page_no = $page_navigation->getNextPage())-->
+			{@$last_page = $page_no}
+			<strong cond="$page_no == $page">{$page_no}</strong>
+			<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+		<!--@end-->
+		<block cond="$last_page != $page_navigation->last_page">
+			{@$isGoTo = true}
+			<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+		</block>
+		<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+		<span cond="$isGoTo" id="goTo" class="tgContent">
+			<input name="page" title="{$lang->cmd_go_to_page}" />
+			<button type="submit">Go</button>
+		</span>
+	</form>
+	<form  cond="$act == 'dispAutoinstallAdminIndex'" action="./">
+		<input type="hidden" name="error_return_url" value="" />
+		<input type="hidden" name="module" value="{$module}" />
+		<input type="hidden" name="act" value="{$act}" />
+		<input cond="$order_target" type="hidden" name="order_target" value="{$order_target}" />
+		<input cond="$order_type" type="hidden" name="order_type" value="{$order_type}" />
+		<input cond="$category_srl" type="hidden" name="category_srl" value="{$category_srl}" />
+		<input cond="$childrenList" type="hidden" name="childrenList" value="{$childrenList}" />
+		<input name="search_keyword" title="Search" value="{$search_keyword}" />
+		<input type="submit" value="Search" />
+	</form>
+</div>
diff --git a/modules/autoinstall/tpl/uninstall.html b/modules/autoinstall/tpl/uninstall.html
index ce81be326..754a0a2a8 100644
--- a/modules/autoinstall/tpl/uninstall.html
+++ b/modules/autoinstall/tpl/uninstall.html
@@ -1,14 +1,40 @@
-<!--#include("header.html")-->
-<!--%import("css/autoinstall.css")-->
-<!--%import("js/autoinstall.js")-->
-<div class="infoText">
-	<p><strong>{$package->title}</strong> [{$package->type}] - {$package->path}</p>
-	<p class="caution"><strong>{$lang->description_uninstall}</strong></p>
-	<form action="./" method="POST" onsubmit="return procFilter(this, uninstall_package);">
-	<input type="hidden" name="package_srl" value="{$package_srl}" />
-    <!--@if($need_password)-->
-    <p><label for="ftp_password">FTP {$lang->password} ({$lang->about_ftp_password}):</label><input type="password" name="ftp_password" id="ftp_password" class="inputTypeText" /></p>
-    <!--@end-->
-	<span class="button strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
+<include target="header.html" />
+<load target="js/waiting.js" usecdn="true" />
+
+<h2 class="h2">{$package->title}</h2>
+<p>{$package->type} ({$package->path})</p>
+
+<block cond="$package->avail_remove">
+	<div class="message info">
+		<p>{$lang->description_uninstall}</p>
+	</div>
+
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+	<form action="./" class="form" method="post" ruleset="ftp">
+		<input type="hidden" name="module" value="autoinstall" />
+		<input type="hidden" name="act" value="procAutoinstallAdminUninstallPackage" />
+		<input type="hidden" name="package_srl" value="{$package_srl}" />
+		<input type="hidden" name="return_url" value="{$return_url}" />
+		<input cond="!$need_password" type="hidden" name="ftp_password" value="dummy" />
+
+		<block cond="$need_password">
+			<p class="q"><label for="ftp_password">FTP {$lang->password}</label></p>
+			<p class="a"><input type="password" name="ftp_password" id="ftp_password" value="" /> <span class="desc">{$lang->about_ftp_password}</span></p>
+		</block>
+
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="{$lang->cmd_delete}" /></span>
+		</div>
 	</form>
-</div>
+</block>
+<block cond="!$package->avail_remove">
+	<div class="message error">
+		<p>{$lang->msg_dependency_package}</p>
+	</div>
+	<p cond="$package->deps">{$lang->dependant_list}:</p>
+	<ul cond="$package->deps">
+		<li loop="$package->deps => $dep_package_srl">{$installed[$dep_package_srl]->title}</li>
+	</ul>
+</block>
diff --git a/modules/comment/comment.admin.controller.php b/modules/comment/comment.admin.controller.php
index 31081b7b5..430605ab5 100644
--- a/modules/comment/comment.admin.controller.php
+++ b/modules/comment/comment.admin.controller.php
@@ -1,72 +1,221 @@
-<?php
-    /**
-     * @class  commentAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment 모듈의 admin controller class
-     **/
-
-    class commentAdminController extends comment {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 관리자 페이지에서 선택된 댓글들을 삭제
-         **/
-        function procCommentAdminDeleteChecked() {
-
-            // 선택된 글이 없으면 오류 표시
-            $cart = Context::get('cart');
-            if(!$cart) return $this->stop('msg_cart_is_null');
-            $comment_srl_list= explode('|@|', $cart);
-            $comment_count = count($comment_srl_list);
-            if(!$comment_count) return $this->stop('msg_cart_is_null');
-
-            $oCommentController = &getController('comment');
-
-            $deleted_count = 0;
-
-            // 글삭제
-            for($i=0;$i<$comment_count;$i++) {
-                $comment_srl = trim($comment_srl_list[$i]);
-                if(!$comment_srl) continue;
-
-                $output = $oCommentController->deleteComment($comment_srl, true);
-                if(!$output->toBool()) continue;
-
-                $deleted_count ++;
-            }
-
-            $this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) );
-        }
-
-        /**
-         * @brief 신고대상을 취소 시킴
-         **/
-        function procCommentAdminCancelDeclare() {
-            $comment_srl = trim(Context::get('comment_srl'));
-
-            if($comment_srl) {
-                $args->comment_srl = $comment_srl;
-                $output = executeQuery('comment.deleteDeclaredComments', $args);
-                if(!$output->toBool()) return $output;
-            }
-        }
-
-        /**
-         * @brief 특정 모듈의 모든 댓글 삭제
-         **/
-        function deleteModuleComments($module_srl) {
-            $args->module_srl = $module_srl;
-            $output = executeQuery('comment.deleteModuleComments', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('comment.deleteModuleCommentsList', $args);
-            return $output;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  commentAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of the comment module
+     **/
+
+    class commentAdminController extends comment {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Delete the selected comment from the administrator page
+         **/
+        function procCommentAdminDeleteChecked() {
+			$isTrash = Context::get('is_trash');
+
+            // Error display if none is selected
+            $cart = Context::get('cart');
+            if(!$cart) return $this->stop('msg_cart_is_null');
+            if(!is_array($cart)) $comment_srl_list= explode('|@|', $cart);
+			else $comment_srl_list = $cart;
+            $comment_count = count($comment_srl_list);
+            if(!$comment_count) return $this->stop('msg_cart_is_null');
+
+			$oCommentController = &getController('comment');
+			// begin transaction
+			$oDB = &DB::getInstance();
+			$oDB->begin();
+
+			// for message send - start
+			$message_content = Context::get('message_content');
+			if($message_content) $message_content = nl2br($message_content);
+
+			if($message_content) {
+				$oCommunicationController = &getController('communication');
+				$oCommentModel = &getModel('comment');
+
+				$logged_info = Context::get('logged_info');
+
+				$title = cut_str($message_content,10,'...');
+				$sender_member_srl = $logged_info->member_srl;
+
+				for($i=0;$i<$comment_count;$i++) {
+					$comment_srl = $comment_srl_list[$i];
+					$oComment = $oCommentModel->getComment($comment_srl, true);
+
+					if(!$oComment->get('member_srl') || $oComment->get('member_srl')==$sender_member_srl) continue;
+
+					$content = sprintf("<div>%s</div><hr /><div style=\"font-weight:bold\">%s</div>",$message_content, $oComment->getContentText(20));
+
+					$oCommunicationController->sendMessage($sender_member_srl, $oComment->get('member_srl'), $title, $content, false);
+				}
+			}
+			// for message send - end
+
+			// comment into trash
+			if($isTrash == 'true') $this->_moveCommentToTrash($comment_srl_list, $oCommentController, $oDB);
+
+			$deleted_count = 0;
+			// Delete the comment posting
+			for($i=0;$i<$comment_count;$i++) {
+				$comment_srl = trim($comment_srl_list[$i]);
+				if(!$comment_srl) continue;
+
+				$output = $oCommentController->deleteComment($comment_srl, true, $isTrash);
+				if(!$output->toBool())
+				{
+					$oDB->rollback();
+					return $output;
+				}
+
+				$deleted_count ++;
+			}
+
+			$oDB->commit();
+
+			$msgCode = '';
+			if($isTrash == 'true') $msgCode = 'success_trashed';
+			else $msgCode = 'success_deleted';
+            //$this->setMessage( sprintf(Context::getLang('msg_checked_comment_is_deleted'), $deleted_count) );
+            $this->setMessage($msgCode, 'info');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommentAdminList', 'search_keyword', $search_keyword, 'search_target', $search_target);
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+		function _moveCommentToTrash($commentSrlList, &$oCommentController, &$oDB)
+		{
+			require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
+
+			if(is_array($commentSrlList))
+			{
+				$logged_info = Context::get('logged_info');
+				$oCommentModel = &getModel('comment');
+				$commentItemList = $oCommentModel->getComments($commentSrlList);
+				$oTrashAdminController = &getAdminController('trash');
+
+				foreach($commentItemList AS  $key=>$oComment)
+				{
+					$oTrashVO = new TrashVO();
+					$oTrashVO->setTrashSrl(getNextSequence());
+					$oTrashVO->setTitle(trim(strip_tags($oComment->variables['content'])));
+					$oTrashVO->setOriginModule('comment');
+					$oTrashVO->setSerializedObject(serialize($oComment->variables));
+
+					$output = $oTrashAdminController->insertTrash($oTrashVO);
+					if (!$output->toBool()) {
+						$oDB->rollback();
+						return $output;
+					}
+				}
+			}
+		}
+
+        /**
+         * @brief cancel the blacklist of abused comments reported by other users
+         **/
+        function procCommentAdminCancelDeclare() {
+            $comment_srl = trim(Context::get('comment_srl'));
+
+            if($comment_srl) {
+                $args->comment_srl = $comment_srl;
+                $output = executeQuery('comment.deleteDeclaredComments', $args);
+                if(!$output->toBool()) return $output;
+            }
+        }
+
+		function procCommentAdminAddCart()
+		{
+			$comment_srl = (int)Context::get('comment_srl');
+
+			$oCommentModel = &getModel('comment');
+			$columnList = array('comment_srl');
+			$commentSrlList = array($comment_srl);
+
+			$output = $oCommentModel->getComments($commentSrlList);
+
+			if(is_array($output))
+			{
+				foreach($output AS $key=>$value)
+				{
+					if($_SESSION['comment_management'][$key]) unset($_SESSION['comment_management'][$key]);
+					else $_SESSION['comment_management'][$key] = true;
+				}
+			}
+		}
+
+        /**
+         * @brief delete all comments of the specific module
+         **/
+        function deleteModuleComments($module_srl) {
+            $args->module_srl = $module_srl;
+            $output = executeQuery('comment.deleteModuleComments', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('comment.deleteModuleCommentsList', $args);
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                // Invalidate newest comments. Per document cache is invalidated inside document admin controller.
+                $oCacheHandler->invalidateGroupKey('newestCommentsList');
+            }
+            return $output;
+        }
+
+        /**
+         * @brief restore comment from trash module, called by trash module
+		 * this method is passived
+         **/
+		function restoreTrash($originObject)
+		{
+			if(is_array($originObject)) $originObject = (object)$originObject;
+
+			$obj->document_srl = $originObject->document_srl;
+			$obj->comment_srl = $originObject->comment_srl;
+			$obj->parent_srl = $originObject->parent_srl;
+			$obj->content = $originObject->content;
+			$obj->password = $originObject->password;
+			$obj->nick_name = $originObject->nick_name;
+			$obj->member_srl = $originObject->member_srl;
+			$obj->email_address = $originObject->email_address;
+			$obj->homepage = $originObject->homepage;
+			$obj->is_secret = $originObject->is_secret;
+			$obj->notify_message = $originObject->notify_message;
+			$obj->module_srl = $originObject->module_srl;
+
+			$oCommentController = &getController('comment');
+			$output = $oCommentController->insertComment($obj);
+
+			return $output;
+		}
+
+        /**
+         * @brief empty comment in trash, called by trash module
+		 * this method is passived
+         **/
+		function emptyTrash($originObject)
+		{
+			$originObject = unserialize($originObject);
+			if(is_array($originObject)) $originObject = (object) $originObject;
+
+			$oComment = new commentItem();
+			$oComment->setAttribute($originObject);
+
+			//already comment deleted, therefore only comment log delete
+			$oCommentController = &getController('comment');
+			$output = $oCommentController->deleteCommentLog($oComment->get('comment_srl'));
+			return $output;
+		}
+    }
+?>
diff --git a/modules/comment/comment.admin.view.php b/modules/comment/comment.admin.view.php
index 00853d496..8dc146f48 100644
--- a/modules/comment/comment.admin.view.php
+++ b/modules/comment/comment.admin.view.php
@@ -1,83 +1,84 @@
-<?php
-    /**
-     * @class  commentAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment 모듈의 admin view 클래스
-     **/
-
-    class commentAdminView extends comment {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 목록 출력 (관리자용)
-         **/
-        function dispCommentAdminList() {
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'list_order'; ///< 소팅 값
-
-            $args->module_srl = Context::get('module_srl');
-
-            // 목록 구함, comment->getCommentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
-            $oCommentModel = &getModel('comment');
-            $output = $oCommentModel->getTotalCommentList($args);
-
-            // 템플릿에 쓰기 위해서 comment_model::getTotalCommentList() 의 return object에 있는 값들을 세팅
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('comment_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            // 템플릿 지정 
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('comment_list');
-        }
-
-        /**
-         * @brief 관리자 페이지의 신고 목록 보기
-         **/
-        function dispCommentAdminDeclared() {
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'comment_declared.declared_count'; ///< 소팅 값
-            $args->order_type = 'desc'; ///< 소팅 정렬 값
-
-            // 목록을 구함
-            $declared_output = executeQuery('comment.getDeclaredList', $args);
-
-            if($declared_output->data && count($declared_output->data)) {
-                $comment_list = array();
-
-                $oCommentModel = &getModel('comment');
-                foreach($declared_output->data as $key => $comment) {
-                    $comment_list[$key] = new commentItem();
-                    $comment_list[$key]->setAttribute($comment);
-                }
-                $declared_output->data = $comment_list;
-            }
-        
-            // 템플릿에 쓰기 위해서 comment_model::getCommentList() 의 return object에 있는 값들을 세팅
-            Context::set('total_count', $declared_output->total_count);
-            Context::set('total_page', $declared_output->total_page);
-            Context::set('page', $declared_output->page);
-            Context::set('comment_list', $declared_output->data);
-            Context::set('page_navigation', $declared_output->page_navigation);
-
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('declared_list');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  commentAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the comment module
+     **/
+
+    class commentAdminView extends comment {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Display the list(for administrators)
+         **/
+        function dispCommentAdminList() {
+            // option to get a list
+            $args->page = Context::get('page'); // /< Page
+            $args->list_count = 30; // / the number of postings to appear on a single page
+            $args->page_count = 5; // / the number of pages to appear on the page navigation
+
+            $args->sort_index = 'list_order'; // /< Sorting values
+
+            $args->module_srl = Context::get('module_srl');
+
+            // get a list by using comment->getCommentList. 
+            $oCommentModel = &getModel('comment');
+			$secretNameList = $oCommentModel->getSecretNameList();
+			$columnList = array('comment_srl', 'document_srl', 'is_secret', 'content', 'comments.member_srl', 'comments.nick_name', 'comments.regdate', 'ipaddress');
+            $output = $oCommentModel->getTotalCommentList($args, $columnList);
+
+            // set values in the return object of comment_model:: getTotalCommentList() in order to use a template.
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('comment_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+            Context::set('secret_name_list', $secretNameList);
+            // set the template 
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('comment_list');
+        }
+
+        /**
+         * @brief show the blacklist of comments in the admin page
+         **/
+        function dispCommentAdminDeclared() {
+            // option to get a blacklist
+            $args->page = Context::get('page'); // /< Page
+            $args->list_count = 30; // /< the number of comment postings to appear on a single page
+            $args->page_count = 10; // /< the number of pages to appear on the page navigation
+
+            $args->sort_index = 'comment_declared.declared_count'; // /< sorting values
+            $args->order_type = 'desc'; // /< sorted value
+
+            // get a list
+            $declared_output = executeQuery('comment.getDeclaredList', $args);
+
+            if($declared_output->data && count($declared_output->data)) {
+                $comment_list = array();
+
+                $oCommentModel = &getModel('comment');
+                foreach($declared_output->data as $key => $comment) {
+                    $comment_list[$key] = new commentItem();
+                    $comment_list[$key]->setAttribute($comment);
+                }
+                $declared_output->data = $comment_list;
+            }
+        
+            // set values in the return object of comment_model:: getCommentList() in order to use a template.
+            Context::set('total_count', $declared_output->total_count);
+            Context::set('total_page', $declared_output->total_page);
+            Context::set('page', $declared_output->page);
+            Context::set('comment_list', $declared_output->data);
+            Context::set('page_navigation', $declared_output->page_navigation);
+            // set the template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('declared_list');
+        }
+    }
+?>
diff --git a/modules/comment/comment.class.php b/modules/comment/comment.class.php
index 260d3b1a1..e51ab28ed 100644
--- a/modules/comment/comment.class.php
+++ b/modules/comment/comment.class.php
@@ -1,105 +1,92 @@
-<?php
-    /**
-     * @class  comment
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment 모듈의 high class
-     **/
-
-    require_once(_XE_PATH_.'modules/comment/comment.item.php');
-
-    class comment extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            // 2007. 10. 17 게시글이 삭제될때 댓글도 삭제되도록 trigger 등록
-            $oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 댓글도 모두 삭제하는 트리거 추가
-            $oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
-
-            // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-
-            // 2007. 10. 17 게시글이 삭제될때 댓글도 삭제되도록 trigger 등록
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after')) return true;
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 댓글도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after')) return true;
-
-            // 2007. 10. 23 댓글에도 추천/ 알림 기능을 위한 컬럼 추가
-            if(!$oDB->isColumnExists("comments","voted_count")) return true;
-            if(!$oDB->isColumnExists("comments","notify_message")) return true;
-
-            // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) return true;
-
-            // 2008. 05. 14 blamed count 컬럼 추가
-            if(!$oDB->isColumnExists("comments", "blamed_count")) return true;
-            if(!$oDB->isColumnExists("comment_voted_log", "point")) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 2007. 10. 17 게시글이 삭제될때 댓글도 삭제되도록 trigger 등록
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
-                $oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 댓글도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after')) 
-                $oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
-
-            // 2007. 10. 23 댓글에도 추천/ 알림 기능을 위한 컬럼 추가
-            if(!$oDB->isColumnExists("comments","voted_count")) {
-                $oDB->addColumn("comments","voted_count", "number","11");
-                $oDB->addIndex("comments","idx_voted_count", array("voted_count"));
-            }
-
-            if(!$oDB->isColumnExists("comments","notify_message")) {
-                $oDB->addColumn("comments","notify_message", "char","1");
-            }
-
-            // 2008. 02. 22 모듈의 추가 설정에서 댓글 추가 설정 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) 
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
-
-            // 2008. 05. 14 blamed count 컬럼 추가
-            if(!$oDB->isColumnExists("comments", "blamed_count")) {
-                $oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, true); 
-                $oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
-            }
-            if(!$oDB->isColumnExists("comment_voted_log", "point"))
-                $oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, true); 
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  comment
+     * @author NHN (developers@xpressengine.com)
+     * @brief comment module's high class
+     **/
+
+    require_once(_XE_PATH_.'modules/comment/comment.item.php');
+
+    class comment extends ModuleObject {
+
+        /**
+         * @brief implemented if additional tasks are required when installing
+         **/
+        function moduleInstall() {
+            // register the action forward (for using on the admin mode)
+            $oModuleController = &getController('module');
+            // 2007. 10. 17 add a trigger to delete comments together with posting deleted
+            $oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
+            // 2007. 10. 17 add a trigger to delete all of comments together with module deleted
+            $oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
+            // 2008. 02. 22 add comment setting when a new module added
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief method to check if installation is succeeded
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            // 2007. 10. 17 add a trigger to delete comments together with posting deleted
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after')) return true;
+            // 2007. 10. 17 add a trigger to delete all of comments together with module deleted
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after')) return true;
+            // 2007. 10. 23 add a column for recommendation votes or notification of the comments
+            if(!$oDB->isColumnExists("comments","voted_count")) return true;
+            if(!$oDB->isColumnExists("comments","notify_message")) return true;
+            // 2008. 02. 22 add comment setting when a new module added
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) return true;
+            // 2008. 05. 14 add a column for blamed count
+            if(!$oDB->isColumnExists("comments", "blamed_count")) return true;
+            if(!$oDB->isColumnExists("comment_voted_log", "point")) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // 2007. 10. 17 add a trigger to delete comments together with posting deleted
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after'))
+                $oModuleController->insertTrigger('document.deleteDocument', 'comment', 'controller', 'triggerDeleteDocumentComments', 'after');
+            // 2007. 10. 17 add a trigger to delete all of comments together with module deleted
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after')) 
+                $oModuleController->insertTrigger('module.deleteModule', 'comment', 'controller', 'triggerDeleteModuleComments', 'after');
+            // 2007. 10. 23 add a column for recommendation votes or notification of the comments
+            if(!$oDB->isColumnExists("comments","voted_count")) {
+                $oDB->addColumn("comments","voted_count", "number","11");
+                $oDB->addIndex("comments","idx_voted_count", array("voted_count"));
+            }
+
+            if(!$oDB->isColumnExists("comments","notify_message")) {
+                $oDB->addColumn("comments","notify_message", "char","1");
+            }
+            // 2008. 02. 22 add comment setting when a new module added
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before')) 
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'comment', 'view', 'triggerDispCommentAdditionSetup', 'before');
+            // 2008. 05. 14 add a column for blamed count
+            if(!$oDB->isColumnExists("comments", "blamed_count")) {
+                $oDB->addColumn('comments', 'blamed_count', 'number', 11, 0, true); 
+                $oDB->addIndex('comments', 'idx_blamed_count', array('blamed_count'));
+            }
+            if(!$oDB->isColumnExists("comment_voted_log", "point"))
+                $oDB->addColumn('comment_voted_log', 'point', 'number', 11, 0, true); 
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Regenerate cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 83a9cef65..86411ee96 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -1,642 +1,692 @@
-<?php
-    /**
-     * @class  commentController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment 모듈의 controller class
-     **/
-
-    class commentController extends comment {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 댓글의 추천을 처리하는 action (Up)
-         **/
-        function procCommentVoteUp() {
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
-
-            $comment_srl = Context::get('target_srl');
-            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
-
-			$oCommentModel = &getModel('comment');
-            $oComment = $oCommentModel->getComment($comment_srl, false, false);
-			$module_srl = $oComment->get('module_srl');
-			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-			$oModuleModel = &getModel('module');
-            $comment_config = $oModuleModel->getModulePartConfig('comment',$module_srl);
-			if($comment_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
-
-            $point = 1;
-            return $this->updateVotedCount($comment_srl, $point);
-        }
-
-        /**
-         * @brief 댓글의 추천을 처리하는 action (Down)
-         **/
-        function procCommentVoteDown() {
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
-
-            $comment_srl = Context::get('target_srl');
-            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
-
-			$oCommentModel = &getModel('comment');
-            $oComment = $oCommentModel->getComment($comment_srl, false, false);
-			$module_srl = $oComment->get('module_srl');
-			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-			$oModuleModel = &getModel('module');
-            $comment_config = $oModuleModel->getModulePartConfig('comment',$module_srl);
-			if($comment_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
-
-            $point = -1;
-            return $this->updateVotedCount($comment_srl, $point);
-        }
-
-        /**
-         * @brief 댓글이 신고될 경우 호출되는 action
-         **/
-        function procCommentDeclare() {
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
-
-            $comment_srl = Context::get('target_srl');
-            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
-
-            return $this->declaredComment($comment_srl);
-        }
-
-        /**
-         * @brief document삭제시 해당 document의 댓글을 삭제하는 trigger
-         **/
-        function triggerDeleteDocumentComments(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            return $this->deleteComments($document_srl, true);
-        }
-
-        /**
-         * @brief module 삭제시 해당 댓글을 모두 삭제하는 trigger
-         **/
-        function triggerDeleteModuleComments(&$obj) {
-            $module_srl = $obj->module_srl;
-            if(!$module_srl) return new Object();
-
-            $oCommentController = &getAdminController('comment');
-            return $oCommentController->deleteModuleComments($module_srl);
-        }
-
-        /**
-         * @brief 코멘트의 권한 부여
-         * 세션값으로 현 접속상태에서만 사용 가능
-         **/
-        function addGrant($comment_srl) {
-            $_SESSION['own_comment'][$comment_srl] = true;
-        }
-
-        /**
-         * @brief 댓글 입력
-         **/
-        function insertComment($obj, $manual_inserted = false) {
-            $obj->__isupdate = false;
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('comment.insertComment', 'before', $obj);
-            if(!$output->toBool()) return $output;
-
-            // document_srl에 해당하는 글이 있는지 확인
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object(-1,'msg_invalid_document');
-
-            // document model 객체 생성
-            $oDocumentModel = &getModel('document');
-
-            // even for manual_inserted if password exists, md5 it.
-            if($obj->password) $obj->password = md5($obj->password);
-            // 원본글을 가져옴
-            if(!$manual_inserted) {
-                $oDocument = $oDocumentModel->getDocument($document_srl);
-
-                if($document_srl != $oDocument->document_srl) return new Object(-1,'msg_invalid_document');
-                if($oDocument->isLocked()) return new Object(-1,'msg_invalid_request');
-
-                if($obj->homepage &&  !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
-
-                // 로그인 된 회원일 경우 회원의 정보를 입력
-                if(Context::get('is_logged')) {
-                    $logged_info = Context::get('logged_info');
-                    $obj->member_srl = $logged_info->member_srl;
-                    $obj->user_id = $logged_info->user_id;
-                    $obj->user_name = $logged_info->user_name;
-                    $obj->nick_name = $logged_info->nick_name;
-                    $obj->email_address = $logged_info->email_address;
-                    $obj->homepage = $logged_info->homepage;
-                }
-            }
-
-            // 로그인정보가 없고 사용자 이름이 없으면 오류 표시
-            if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
-
-            if(!$obj->comment_srl) $obj->comment_srl = getNextSequence();
-
-            // 순서를 정함
-            $obj->list_order = getNextSequence() * -1;
-
-            // 내용에서 XE만의 태그를 삭제
-            $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-			if(Mobile::isFromMobilePhone())
-			{
-				$obj->content = nl2br(htmlspecialchars($obj->content));
-			}
-            if(!$obj->regdate) $obj->regdate = date("YmdHis");
-
-            // 세션에서 최고 관리자가 아니면 iframe, script 제거
-            if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
-
-            if(!$obj->notify_message) $obj->notify_message = 'N';
-            if(!$obj->is_secret) $obj->is_secret = 'N';
-
-            // begin transaction
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 댓글 목록 부분을 먼저 입력
-            $list_args->comment_srl = $obj->comment_srl;
-            $list_args->document_srl = $obj->document_srl;
-            $list_args->module_srl = $obj->module_srl;
-            $list_args->regdate = $obj->regdate;
-
-            // 부모댓글이 없으면 바로 데이터를 설정
-            if(!$obj->parent_srl) {
-                $list_args->head = $list_args->arrange = $obj->comment_srl;
-                $list_args->depth = 0;
-
-            // 부모댓글이 있으면 부모글의 정보를 구해옴
-            } else {
-                // 부모댓글의 정보를 구함
-                $parent_args->comment_srl = $obj->parent_srl;
-                $parent_output = executeQuery('comment.getCommentListItem', $parent_args);
-
-                // 부모댓글이 존재하지 않으면 return
-                if(!$parent_output->toBool() || !$parent_output->data) return;
-                $parent = $parent_output->data;
-
-                $list_args->head = $parent->head;
-                $list_args->depth = $parent->depth+1;
-
-                // depth가 2단계 미만이면 별도의 update문 없이 insert만으로 쓰레드 정리
-                if($list_args->depth<2) {
-                    $list_args->arrange = $obj->comment_srl;
-
-                // depth가 2단계 이상이면 반업데이트 실행
-                } else {
-                    // 부모 댓글과 같은 head를 가지고 depth가 같거나 작은 댓글중 제일 위 댓글을 구함
-                    $p_args->head = $parent->head;
-                    $p_args->arrange = $parent->arrange;
-                    $p_args->depth = $parent->depth;
-                    $output = executeQuery('comment.getCommentParentNextSibling', $p_args);
-
-                    if($output->data->arrange) {
-                        $list_args->arrange = $output->data->arrange;
-                        $output = executeQuery('comment.updateCommentListArrange', $list_args);
-                    } else {
-                        $list_args->arrange = $obj->comment_srl;
-                    }
-
-                }
-            }
-
-            $output = executeQuery('comment.insertCommentList', $list_args);
-            if(!$output->toBool()) return $output;
-
-            // 댓글 본문을 입력
-            $output = executeQuery('comment.insertComment', $obj);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // comment model객체 생성
-            $oCommentModel = &getModel('comment');
-
-            // 해당 글의 전체 댓글 수를 구해옴
-            $comment_count = $oCommentModel->getCommentCount($document_srl);
-
-            // document의 controller 객체 생성
-            $oDocumentController = &getController('document');
-
-            // 해당글의 댓글 수를 업데이트
-            $output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, true);
-
-            // 댓글의 권한을 부여
-            $this->addGrant($obj->comment_srl);
-
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('comment.insertComment', 'after', $obj);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            // commit
-            $oDB->commit();
-
-            if(!$manual_inserted) {
-                // 원본글에 알림(notify_message)가 설정되어 있으면 메세지 보냄
-                $oDocument->notify(Context::getLang('comment'), $obj->content);
-
-                // 원본 댓글이 있고 원본 댓글에 알림(notify_message)가 있으면 메세지 보냄
-                if($obj->parent_srl) {
-                    $oParent = $oCommentModel->getComment($obj->parent_srl);
-					if ($oParent->get('member_srl') != $oDocument->get('member_srl')) {
-						$oParent->notify(Context::getLang('comment'), $obj->content);
-					}
-                }
-            }
-
-
-            $output->add('comment_srl', $obj->comment_srl);
-            return $output;
-        }
-
-        /**
-         * @brief 댓글 수정
-         **/
-        function updateComment($obj, $is_admin = false) {
-            $obj->__isupdate = true;
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('comment.updateComment', 'before', $obj);
-            if(!$output->toBool()) return $output;
-
-            // comment model 객체 생성
-            $oCommentModel = &getModel('comment');
-
-            // 원본 데이터를 가져옴
-            $source_obj = $oCommentModel->getComment($obj->comment_srl);
-            if(!$source_obj->getMemberSrl()) {
-                $obj->member_srl = $source_obj->get('member_srl');
-                $obj->user_name = $source_obj->get('user_name');
-                $obj->nick_name = $source_obj->get('nick_name');
-                $obj->email_address = $source_obj->get('email_address');
-                $obj->homepage = $source_obj->get('homepage');
-            }
-
-            // 권한이 있는지 확인
-            if(!$is_admin && !$source_obj->isGranted()) return new Object(-1, 'msg_not_permitted');
-
-            if($obj->password) $obj->password = md5($obj->password);
-            if($obj->homepage &&  !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
-
-            // 로그인 되어 있고 작성자와 수정자가 동일하면 수정자의 정보를 세팅
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                if($source_obj->member_srl == $logged_info->member_srl) {
-                    $obj->member_srl = $logged_info->member_srl;
-                    $obj->user_name = $logged_info->user_name;
-                    $obj->nick_name = $logged_info->nick_name;
-                    $obj->email_address = $logged_info->email_address;
-                    $obj->homepage = $logged_info->homepage;
-                }
-            }
-
-            // 로그인한 유저가 작성한 글인데 nick_name이 없을 경우
-            if($source_obj->get('member_srl')&& !$obj->nick_name) {
-                $obj->member_srl = $source_obj->get('member_srl');
-                $obj->user_name = $source_obj->get('user_name');
-                $obj->nick_name = $source_obj->get('nick_name');
-                $obj->email_address = $source_obj->get('email_address');
-                $obj->homepage = $source_obj->get('homepage');
-            }
-
-
-			if(!$obj->content) $obj->content = $source_obj->get('content');
-
-            // 내용에서 XE만의 태그를 삭제
-            $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-
-            // 세션에서 최고 관리자가 아니면 iframe, script 제거
-            if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
-
-            // begin transaction
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 업데이트
-            $output = executeQuery('comment.updateComment', $obj);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('comment.updateComment', 'after', $obj);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            // commit
-            $oDB->commit();
-
-            $output->add('comment_srl', $obj->comment_srl);
-            return $output;
-        }
-
-        /**
-         * @brief 댓글 삭제
-         **/
-        function deleteComment($comment_srl, $is_admin = false) {
-
-            // comment model 객체 생성
-            $oCommentModel = &getModel('comment');
-
-            // 기존 댓글이 있는지 확인
-            $comment = $oCommentModel->getComment($comment_srl);
-            if($comment->comment_srl != $comment_srl) return new Object(-1, 'msg_invalid_request');
-            $document_srl = $comment->document_srl;
-
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
-            if(!$output->toBool()) return $output;
-
-            // 해당 댓글에 child가 있는지 확인
-            $child_count = $oCommentModel->getChildCommentCount($comment_srl);
-            if($child_count>0) return new Object(-1, 'fail_to_delete_have_children');
-
-            // 권한이 있는지 확인
-            if(!$is_admin && !$comment->isGranted()) return new Object(-1, 'msg_not_permitted');
-
-            // begin transaction
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 삭제
-            $args->comment_srl = $comment_srl;
-            $output = executeQuery('comment.deleteComment', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $output = executeQuery('comment.deleteCommentList', $args);
-
-            // 댓글 수를 구해서 업데이트
-            $comment_count = $oCommentModel->getCommentCount($document_srl);
-
-            // document의 controller 객체 생성
-            $oDocumentController = &getController('document');
-
-            // 해당글의 댓글 수를 업데이트
-            $output = $oDocumentController->updateCommentCount($document_srl, $comment_count, null, false);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            // commit
-            $oDB->commit();
-
-            $output->add('document_srl', $document_srl);
-            return $output;
-        }
-
-        /**
-         * @brief 특정 글의 모든 댓글 삭제
-         **/
-        function deleteComments($document_srl) {
-            // document model객체 생성
-            $oDocumentModel = &getModel('document');
-            $oCommentModel = &getModel('comment');
-
-            // 권한이 있는지 확인
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists() || !$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
-
-            // 댓글 목록을 가져와서 일단 trigger만 실행 (일괄 삭제를 해야 하기에 최대한 처리 비용을 줄이기 위한 방법)
-            $args->document_srl = $document_srl;
-            $comments = executeQueryArray('comment.getAllComments',$args);
-            if($comments->data) {
-                foreach($comments->data as $key => $comment) {
-                    // trigger 호출 (before)
-                    $output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
-                    if(!$output->toBool()) continue;
-
-                    // trigger 호출 (after)
-                    $output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
-                    if(!$output->toBool()) continue;
-                }
-            }
-
-            // 댓글 본문 삭제
-            $args->document_srl = $document_srl;
-            $output = executeQuery('comment.deleteComments', $args);
-            if(!$output->toBool()) return $output;
-
-            // 댓글 목록 삭제
-            $output = executeQuery('comment.deleteCommentsList', $args);
-
-            return $output;
-        }
-
-        /**
-         * @brief 해당 comment의 추천수 증가
-         **/
-        function updateVotedCount($comment_srl, $point = 1) {
-            if($point > 0) {
-                $failed_voted = 'failed_voted';
-                $success_message = 'success_voted';
-            } else {
-                $failed_voted = 'failed_blamed';
-                $success_message = 'success_blamed';
-            }
-
-            // 세션 정보에 추천 정보가 있으면 중단
-            if($_SESSION['voted_comment'][$comment_srl]) return new Object(-1, $failed_voted);
-
-            $oCommentModel = &getModel('comment');
-            $oComment = $oCommentModel->getComment($comment_srl, false, false);
-
-            // 글의 작성 ip와 현재 접속자의 ip가 동일하면 패스
-            if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
-                $_SESSION['voted_comment'][$comment_srl] = true;
-                return new Object(-1, $failed_voted);
-            }
-
-            // comment의 작성자가 회원일때 조사
-            if($oComment->get('member_srl')) {
-                $oMemberModel = &getModel('member');
-                $member_srl = $oMemberModel->getLoggedMemberSrl();
-
-                // 글쓴이와 현재 로그인 사용자의 정보가 일치하면 읽었다고 생각하고 세션 등록후 패스
-                if($member_srl && $member_srl == $oComment->get('member_srl')) {
-                    $_SESSION['voted_comment'][$comment_srl] = true;
-                    return new Object(-1, $failed_voted);
-                }
-            }
-
-            // 로그인 사용자이면 member_srl, 비회원이면 ipaddress로 판단
-            if($member_srl) {
-                $args->member_srl = $member_srl;
-            } else {
-                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            }
-            $args->comment_srl = $comment_srl;
-            $output = executeQuery('comment.getCommentVotedLogInfo', $args);
-
-            // 로그 정보에 추천 로그가 있으면 세션 등록후 패스
-            if($output->data->count) {
-                $_SESSION['voted_comment'][$comment_srl] = true;
-                return new Object(-1, $failed_voted);
-            }
-
-            // 추천수 업데이트
-            if($point < 0) {
-                $args->blamed_count = $oComment->get('blamed_count') + $point;
-                $output = executeQuery('comment.updateBlamedCount', $args);
-            } else {
-                $args->voted_count = $oComment->get('voted_count') + $point;
-                $output = executeQuery('comment.updateVotedCount', $args);
-            }
-
-            // 로그 남기기
-            $args->point = $point;
-            $output = executeQuery('comment.insertCommentVotedLog', $args);
-
-            // 세션 정보에 남김
-            $_SESSION['voted_comment'][$comment_srl] = true;
-
-            // 결과 리턴
-            return new Object(0, $success_message);
-        }
-
-        /**
-         * @brief 댓글 신고
-         **/
-        function declaredComment($comment_srl) {
-            // 세션 정보에 신고 정보가 있으면 중단
-            if($_SESSION['declared_comment'][$comment_srl]) return new Object(-1, 'failed_declared');
-
-            // 이미 신고되었는지 검사
-            $args->comment_srl = $comment_srl;
-            $output = executeQuery('comment.getDeclaredComment', $args);
-            if(!$output->toBool()) return $output;
-
-            // 문서 원본을 가져옴
-            $oCommentModel = &getModel('comment');
-            $oComment = $oCommentModel->getComment($comment_srl, false, false);
-
-            // 글의 작성 ip와 현재 접속자의 ip가 동일하면 패스
-            if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
-                $_SESSION['declared_comment'][$comment_srl] = true;
-                return new Object(-1, 'failed_declared');
-            }
-
-            // comment의 작성자가 회원일때 조사
-            if($oComment->get('member_srl')) {
-                // member model 객체 생성
-                $oMemberModel = &getModel('member');
-                $member_srl = $oMemberModel->getLoggedMemberSrl();
-
-                // 글쓴이와 현재 로그인 사용자의 정보가 일치하면 읽었다고 생각하고 세션 등록후 패스
-                if($member_srl && $member_srl == $oComment->get('member_srl')) {
-                    $_SESSION['declared_comment'][$comment_srl] = true;
-                    return new Object(-1, 'failed_declared');
-                }
-            }
-
-            // 로그인 사용자이면 member_srl, 비회원이면 ipaddress로 판단
-            if($member_srl) {
-                $args->member_srl = $member_srl;
-            } else {
-                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            }
-            $args->comment_srl = $comment_srl;
-            $output = executeQuery('comment.getCommentDeclaredLogInfo', $args);
-
-            // 로그 정보에 신고 로그가 있으면 세션 등록후 패스
-            if($output->data->count) {
-                $_SESSION['declared_comment'][$comment_srl] = true;
-                return new Object(-1, 'failed_declared');
-            }
-
-            // 신고글 추가
-            if($output->data->declared_count > 0) $output = executeQuery('comment.updateDeclaredComment', $args);
-            else $output = executeQuery('comment.insertDeclaredComment', $args);
-            if(!$output->toBool()) return $output;
-
-            // 로그 남기기
-            $output = executeQuery('comment.insertCommentDeclaredLog', $args);
-
-            // 세션 정보에 남김
-            $_SESSION['declared_comment'][$comment_srl] = true;
-
-            $this->setMessage('success_declared');
-        }
-
-        /**
-         * @brief 댓글의 이 댓글을.. 클릭시 나타나는 팝업 메뉴를 추가하는 method
-         **/
-        function addCommentPopupMenu($url, $str, $icon = '', $target = 'self') {
-            $comment_popup_menu_list = Context::get('comment_popup_menu_list');
-            if(!is_array($comment_popup_menu_list)) $comment_popup_menu_list = array();
-
-            $obj->url = $url;
-            $obj->str = $str;
-            $obj->icon = $icon;
-            $obj->target = $target;
-            $comment_popup_menu_list[] = $obj;
-
-            Context::set('comment_popup_menu_list', $comment_popup_menu_list);
-        }
-
-        /**
-         * @brief 댓글의 모듈별 추가 확장 폼을 저장
-         **/
-        function procCommentInsertModuleConfig() {
-            $module_srl = Context::get('target_module_srl');
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-
-            $comment_config->comment_count = (int)Context::get('comment_count');
-			if(!$comment_config->comment_count) $comment_config->comment_count = 50;
-
-			$comment_config->use_vote_up = Context::get('use_vote_up');
-			if(!$comment_config->use_vote_up) $comment_config->use_vote_up = 'Y';
-
-            $comment_config->use_vote_down = Context::get('use_vote_down');
-            if(!$comment_config->use_vote_down) $comment_config->use_vote_down = 'Y';
-
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                $output = $this->setCommentModuleConfig($srl,$comment_config);
-            }
-
-            $this->setError(-1);
-            $this->setMessage('success_updated');
-        }
-
-		function setCommentModuleConfig($srl, $comment_config){
-            $oModuleController = &getController('module');
-			$oModuleController->insertModulePartConfig('comment',$srl,$comment_config);
-            return new Object();
-		}
-    }
-?>
+<?php
+    /**
+     * @class  commentController
+     * @author NHN (developers@xpressengine.com)
+     * @brief controller class of the comment module
+     **/
+
+    class commentController extends comment {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief action to handle recommendation votes on comments (Up)
+         **/
+        function procCommentVoteUp() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+
+            $comment_srl = Context::get('target_srl');
+            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
+
+			$oCommentModel = &getModel('comment');
+            $oComment = $oCommentModel->getComment($comment_srl, false, false);
+			$module_srl = $oComment->get('module_srl');
+			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+
+			$oModuleModel = &getModel('module');
+            $comment_config = $oModuleModel->getModulePartConfig('comment',$module_srl);
+			if($comment_config->use_vote_up=='N') return new Object(-1, 'msg_invalid_request');
+
+            $point = 1;
+            return $this->updateVotedCount($comment_srl, $point);
+        }
+
+        /**
+         * @brief action to handle recommendation votes on comments (Down)
+         **/
+        function procCommentVoteDown() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+
+            $comment_srl = Context::get('target_srl');
+            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
+
+			$oCommentModel = &getModel('comment');
+            $oComment = $oCommentModel->getComment($comment_srl, false, false);
+			$module_srl = $oComment->get('module_srl');
+			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+
+			$oModuleModel = &getModel('module');
+            $comment_config = $oModuleModel->getModulePartConfig('comment',$module_srl);
+			if($comment_config->use_vote_down=='N') return new Object(-1, 'msg_invalid_request');
+
+            $point = -1;
+            return $this->updateVotedCount($comment_srl, $point);
+        }
+
+        /**
+         * @brief action to be called when a comment posting is reported
+         **/
+        function procCommentDeclare() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
+
+            $comment_srl = Context::get('target_srl');
+            if(!$comment_srl) return new Object(-1, 'msg_invalid_request');
+
+            return $this->declaredComment($comment_srl);
+        }
+
+        /**
+         * @brief trigger to delete its comments together with document deleted
+         **/
+        function triggerDeleteDocumentComments(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+
+            return $this->deleteComments($document_srl, true);
+        }
+
+        /**
+         * @brief trigger to delete corresponding comments when deleting a module
+         **/
+        function triggerDeleteModuleComments(&$obj) {
+            $module_srl = $obj->module_srl;
+            if(!$module_srl) return new Object();
+
+            $oCommentController = &getAdminController('comment');
+            return $oCommentController->deleteModuleComments($module_srl);
+        }
+
+        /**
+         * @brief Authorization of the comments
+         * available only in the current connection of the session value
+         **/
+        function addGrant($comment_srl) {
+            $_SESSION['own_comment'][$comment_srl] = true;
+        }
+
+        /**
+         * @brief Enter comments
+         **/
+        function insertComment($obj, $manual_inserted = false) {
+            $obj->__isupdate = false;
+            // call a trigger (before)
+            $output = ModuleHandler::triggerCall('comment.insertComment', 'before', $obj);
+            if(!$output->toBool()) return $output;
+            // check if a posting of the corresponding document_srl exists
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object(-1,'msg_invalid_document');
+            // get a object of document model
+            $oDocumentModel = &getModel('document');
+
+            // even for manual_inserted if password exists, md5 it.
+            if($obj->password) $obj->password = md5($obj->password);
+            // get the original posting
+            if(!$manual_inserted) {
+                $oDocument = $oDocumentModel->getDocument($document_srl);
+
+                if($document_srl != $oDocument->document_srl) return new Object(-1,'msg_invalid_document');
+                if($oDocument->isLocked()) return new Object(-1,'msg_invalid_request');
+
+                if($obj->homepage &&  !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
+                // input the member's information if logged-in
+                if(Context::get('is_logged')) {
+                    $logged_info = Context::get('logged_info');
+                    $obj->member_srl = $logged_info->member_srl;
+                    $obj->user_id = $logged_info->user_id;
+                    $obj->user_name = $logged_info->user_name;
+                    $obj->nick_name = $logged_info->nick_name;
+                    $obj->email_address = $logged_info->email_address;
+                    $obj->homepage = $logged_info->homepage;
+                }
+            }
+            // error display if neither of log-in info and user name exist.
+            if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
+
+            if(!$obj->comment_srl) $obj->comment_srl = getNextSequence();
+            // determine the order
+            $obj->list_order = getNextSequence() * -1;
+            // remove XE's own tags from the contents
+            $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
+			if(Mobile::isFromMobilePhone())
+			{
+				$obj->content = nl2br(htmlspecialchars($obj->content));
+			}
+            if(!$obj->regdate) $obj->regdate = date("YmdHis");
+            // remove iframe and script if not a top administrator on the session.
+            if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+
+            if(!$obj->notify_message) $obj->notify_message = 'N';
+            if(!$obj->is_secret) $obj->is_secret = 'N';
+
+            // begin transaction
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Enter a list of comments first
+            $list_args->comment_srl = $obj->comment_srl;
+            $list_args->document_srl = $obj->document_srl;
+            $list_args->module_srl = $obj->module_srl;
+            $list_args->regdate = $obj->regdate;
+            // If parent comment doesn't exist, set data directly
+            if(!$obj->parent_srl) {
+                $list_args->head = $list_args->arrange = $obj->comment_srl;
+                $list_args->depth = 0;
+            // If parent comment exists, get information of the parent comment
+            } else {
+                // get information of the parent comment posting
+                $parent_args->comment_srl = $obj->parent_srl;
+                $parent_output = executeQuery('comment.getCommentListItem', $parent_args);
+                // return if no parent comment exists
+                if(!$parent_output->toBool() || !$parent_output->data) return;
+                $parent = $parent_output->data;
+
+                $list_args->head = $parent->head;
+                $list_args->depth = $parent->depth+1;
+                // if the depth of comments is less than 2, execute insert.
+                if($list_args->depth<2) {
+                    $list_args->arrange = $obj->comment_srl;
+                // if the depth of comments is greater than 2, execute update.
+                } else {
+                    // get the top listed comment among those in lower depth and same head with parent's.
+                    $p_args->head = $parent->head;
+                    $p_args->arrange = $parent->arrange;
+                    $p_args->depth = $parent->depth;
+                    $output = executeQuery('comment.getCommentParentNextSibling', $p_args);
+
+                    if($output->data->arrange) {
+                        $list_args->arrange = $output->data->arrange;
+                        $output = executeQuery('comment.updateCommentListArrange', $list_args);
+                    } else {
+                        $list_args->arrange = $obj->comment_srl;
+                    }
+
+                }
+            }
+
+            $output = executeQuery('comment.insertCommentList', $list_args);
+            if(!$output->toBool()) return $output;
+            // insert comment
+            $output = executeQuery('comment.insertComment', $obj);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // creat the comment model object
+            $oCommentModel = &getModel('comment');
+            // get the number of all comments in the posting
+            $comment_count = $oCommentModel->getCommentCount($document_srl);
+            // create the controller object of the document
+            $oDocumentController = &getController('document');
+            // Update the number of comments in the post
+            $output = $oDocumentController->updateCommentCount($document_srl, $comment_count, $obj->nick_name, true);
+            // grant autority of the comment
+            $this->addGrant($obj->comment_srl);
+            // call a trigger(after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('comment.insertComment', 'after', $obj);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            // commit
+            $oDB->commit();
+
+            if(!$manual_inserted) {
+                // send a message if notify_message option in enabled in the original article
+                $oDocument->notify(Context::getLang('comment'), $obj->content);
+                // send a message if notify_message option in enabled in the original comment
+                if($obj->parent_srl) {
+                    $oParent = $oCommentModel->getComment($obj->parent_srl);
+					if ($oParent->get('member_srl') != $oDocument->get('member_srl')) {
+						$oParent->notify(Context::getLang('comment'), $obj->content);
+					}
+                }
+            }
+
+
+            $output->add('comment_srl', $obj->comment_srl);
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $oCacheHandler->invalidateGroupKey('commentList_' . $document_srl);
+                $oCacheHandler->invalidateGroupKey('newestCommentsList');
+            }
+            return $output;
+        }
+
+        /**
+         * @brief fix the comment
+         **/
+        function updateComment($obj, $is_admin = false) {
+            $obj->__isupdate = true;
+            // call a trigger (before)
+            $output = ModuleHandler::triggerCall('comment.updateComment', 'before', $obj);
+            if(!$output->toBool()) return $output;
+            // create a comment model object
+            $oCommentModel = &getModel('comment');
+            // get the original data
+            $source_obj = $oCommentModel->getComment($obj->comment_srl);
+            if(!$source_obj->getMemberSrl()) {
+                $obj->member_srl = $source_obj->get('member_srl');
+                $obj->user_name = $source_obj->get('user_name');
+                $obj->nick_name = $source_obj->get('nick_name');
+                $obj->email_address = $source_obj->get('email_address');
+                $obj->homepage = $source_obj->get('homepage');
+            }
+            // check if permission is granted
+            if(!$is_admin && !$source_obj->isGranted()) return new Object(-1, 'msg_not_permitted');
+
+            if($obj->password) $obj->password = md5($obj->password);
+            if($obj->homepage &&  !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
+            // set modifier's information if logged-in and posting author and modifier are matched.
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                if($source_obj->member_srl == $logged_info->member_srl) {
+                    $obj->member_srl = $logged_info->member_srl;
+                    $obj->user_name = $logged_info->user_name;
+                    $obj->nick_name = $logged_info->nick_name;
+                    $obj->email_address = $logged_info->email_address;
+                    $obj->homepage = $logged_info->homepage;
+                }
+            }
+            // if nick_name of the logged-in author doesn't exist
+            if($source_obj->get('member_srl')&& !$obj->nick_name) {
+                $obj->member_srl = $source_obj->get('member_srl');
+                $obj->user_name = $source_obj->get('user_name');
+                $obj->nick_name = $source_obj->get('nick_name');
+                $obj->email_address = $source_obj->get('email_address');
+                $obj->homepage = $source_obj->get('homepage');
+            }
+
+
+			if(!$obj->content) $obj->content = $source_obj->get('content');
+            // remove XE's wn tags from contents
+            $obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
+            // remove iframe and script if not a top administrator on the session
+            if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+
+            // begin transaction
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Update
+            $output = executeQuery('comment.updateComment', $obj);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('comment.updateComment', 'after', $obj);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            // commit
+            $oDB->commit();
+
+            $output->add('comment_srl', $obj->comment_srl);
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $oCacheHandler->invalidateGroupKey('commentList_' . $obj->document_srl);
+                $oCacheHandler->invalidateGroupKey('newestCommentsList');
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Delete comment
+         **/
+        function deleteComment($comment_srl, $is_admin = false, $isMoveToTrash = false) {
+            // create the comment model object
+            $oCommentModel = &getModel('comment');
+            // check if comment already exists
+            $comment = $oCommentModel->getComment($comment_srl);
+            if($comment->comment_srl != $comment_srl) return new Object(-1, 'msg_invalid_request');
+            $document_srl = $comment->document_srl;
+            // call a trigger (before)
+            $output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
+            if(!$output->toBool()) return $output;
+            // check if child comment exists on the comment
+            $child_count = $oCommentModel->getChildCommentCount($comment_srl);
+            if($child_count>0) return new Object(-1, 'fail_to_delete_have_children');
+            // check if permission is granted
+            if(!$is_admin && !$comment->isGranted()) return new Object(-1, 'msg_not_permitted');
+
+            // begin transaction
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Delete
+            $args->comment_srl = $comment_srl;
+            $output = executeQuery('comment.deleteComment', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $output = executeQuery('comment.deleteCommentList', $args);
+            // update the number of comments
+            $comment_count = $oCommentModel->getCommentCount($document_srl);
+            // create the controller object of the document
+            $oDocumentController = &getController('document');
+            // update comment count of the article posting
+            $output = $oDocumentController->updateCommentCount($document_srl, $comment_count, null, false);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+			if(!$isMoveToTrash)
+			{
+				$this->_deleteDeclaredComments($args);
+				$this->_deleteVotedComments($args);
+			}
+
+            // commit
+            $oDB->commit();
+
+            $output->add('document_srl', $document_srl);
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $oCacheHandler->invalidateGroupKey('commentList_' . $document_srl);
+                $oCacheHandler->invalidateGroupKey('newestCommentsList');
+            }
+            return $output;
+        }
+
+        /**
+         * @brief remove all comment relation log
+         **/
+		function deleteCommentLog()
+		{
+			$this->_deleteDeclaredComments($args);
+			$this->_deleteVotedComments($args);
+			return new Object(0, 'success');
+		}
+
+        /**
+         * @brief remove all comments of the article
+         **/
+        function deleteComments($document_srl) {
+            // create the document model object
+            $oDocumentModel = &getModel('document');
+            $oCommentModel = &getModel('comment');
+            // check if permission is granted
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists() || !$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
+            // get a list of comments and then execute a trigger(way to reduce the processing cost for delete all)
+            $args->document_srl = $document_srl;
+            $comments = executeQueryArray('comment.getAllComments',$args);
+            if($comments->data) {
+				$commentSrlList = array();
+                foreach($comments->data as $key => $comment) {
+					array_push($commentSrlList, $comment->comment_srl);
+                    // call a trigger (before)
+                    $output = ModuleHandler::triggerCall('comment.deleteComment', 'before', $comment);
+                    if(!$output->toBool()) continue;
+                    // call a trigger (after)
+                    $output = ModuleHandler::triggerCall('comment.deleteComment', 'after', $comment);
+                    if(!$output->toBool()) continue;
+                }
+            }
+            // delete the comment
+            $args->document_srl = $document_srl;
+            $output = executeQuery('comment.deleteComments', $args);
+            if(!$output->toBool()) return $output;
+            // Delete a list of comments
+            $output = executeQuery('comment.deleteCommentsList', $args);
+
+			//delete declared, declared_log, voted_log
+			if(is_array($commentSrlList) && count($commentSrlList)>0)
+			{
+				unset($args);
+				$args->comment_srl = join(',', $commentSrlList);
+				$this->_deleteDeclaredComments($args);
+				$this->_deleteVotedComments($args);
+			}
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $oCacheHandler->invalidateGroupKey('commentList_' . $document_srl);
+                $oCacheHandler->invalidateGroupKey('newestCommentsList');
+            }
+
+            return $output;
+        }
+
+		/**
+		 * @brief delete declared comment, log
+		 * @param $commentSrls : srls string (ex: 1, 2,56, 88)
+		 * @return void
+		 **/
+		function _deleteDeclaredComments($commentSrls)
+		{
+			executeQuery('comment.deleteDeclaredComments', $commentSrls);
+			executeQuery('comment.deleteCommentDeclaredLog', $commentSrls);
+		}
+
+		/**
+		 * @brief delete voted comment log
+		 * @param $commentSrls : srls string (ex: 1, 2,56, 88)
+		 * @return void
+		 **/
+		function _deleteVotedComments($commentSrls)
+		{
+			executeQuery('comment.deleteCommentVotedLog', $commentSrls);
+		}
+
+        /**
+         * @brief Increase vote-up counts of the comment
+         **/
+        function updateVotedCount($comment_srl, $point = 1) {
+            if($point > 0) {
+                $failed_voted = 'failed_voted';
+                $success_message = 'success_voted';
+            } else {
+                $failed_voted = 'failed_blamed';
+                $success_message = 'success_blamed';
+            }
+
+            // invalid vote if vote info exists in the session info.
+            if($_SESSION['voted_comment'][$comment_srl]) return new Object(-1, $failed_voted);
+
+            $oCommentModel = &getModel('comment');
+            $oComment = $oCommentModel->getComment($comment_srl, false, false);
+            // invalid vote if both ip addresses between author's and the current user are same.
+            if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
+                $_SESSION['voted_comment'][$comment_srl] = true;
+                return new Object(-1, $failed_voted);
+            }
+            // if the comment author is a member
+            if($oComment->get('member_srl')) {
+                // create the member model object
+                $oMemberModel = &getModel('member');
+                $member_srl = $oMemberModel->getLoggedMemberSrl();
+                // session registered if the author information matches to the current logged-in user's.
+                if($member_srl && $member_srl == $oComment->get('member_srl')) {
+                    $_SESSION['voted_comment'][$comment_srl] = true;
+                    return new Object(-1, $failed_voted);
+                }
+            }
+            // If logged-in, use the member_srl. otherwise use the ipaddress.
+            if($member_srl) {
+                $args->member_srl = $member_srl;
+            } else {
+                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            }
+            $args->comment_srl = $comment_srl;
+            $output = executeQuery('comment.getCommentVotedLogInfo', $args);
+            // session registered if log info contains recommendation vote log.
+            if($output->data->count) {
+                $_SESSION['voted_comment'][$comment_srl] = true;
+                return new Object(-1, $failed_voted);
+            }
+
+            // update the number of votes
+            if($point < 0) {
+                $args->blamed_count = $oComment->get('blamed_count') + $point;
+                $output = executeQuery('comment.updateBlamedCount', $args);
+            } else {
+                $args->voted_count = $oComment->get('voted_count') + $point;
+                $output = executeQuery('comment.updateVotedCount', $args);
+            }
+            // leave logs
+            $args->point = $point;
+            $output = executeQuery('comment.insertCommentVotedLog', $args);
+            // leave into session information
+            $_SESSION['voted_comment'][$comment_srl] = true;
+
+            // Return the result
+            return new Object(0, $success_message);
+        }
+
+        /**
+         * @brief report a blamed comment
+         **/
+        function declaredComment($comment_srl) {
+            // Fail if session information already has a reported document
+            if($_SESSION['declared_comment'][$comment_srl]) return new Object(-1, 'failed_declared');
+            // check if already reported
+            $args->comment_srl = $comment_srl;
+            $output = executeQuery('comment.getDeclaredComment', $args);
+            if(!$output->toBool()) return $output;
+            // get the original comment
+            $oCommentModel = &getModel('comment');
+            $oComment = $oCommentModel->getComment($comment_srl, false, false);
+            // failed if both ip addresses between author's and the current user are same.
+            if($oComment->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
+                $_SESSION['declared_comment'][$comment_srl] = true;
+                return new Object(-1, 'failed_declared');
+            }
+            // if the comment author is a member
+            if($oComment->get('member_srl')) {
+                // create the member model object
+                $oMemberModel = &getModel('member');
+                $member_srl = $oMemberModel->getLoggedMemberSrl();
+                // session registered if the author information matches to the current logged-in user's.
+                if($member_srl && $member_srl == $oComment->get('member_srl')) {
+                    $_SESSION['declared_comment'][$comment_srl] = true;
+                    return new Object(-1, 'failed_declared');
+                }
+            }
+            // If logged-in, use the member_srl. otherwise use the ipaddress.
+            if($member_srl) {
+                $args->member_srl = $member_srl;
+            } else {
+                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            }
+            $args->comment_srl = $comment_srl;
+            $log_output = executeQuery('comment.getCommentDeclaredLogInfo', $args);
+            // session registered if log info contains report log.
+            if($log_output->data->count) {
+                $_SESSION['declared_comment'][$comment_srl] = true;
+                return new Object(-1, 'failed_declared');
+            }
+            // execute insert
+            if($output->data->declared_count > 0) $output = executeQuery('comment.updateDeclaredComment', $args);
+            else $output = executeQuery('comment.insertDeclaredComment', $args);
+            if(!$output->toBool()) return $output;
+            // leave the log
+            $output = executeQuery('comment.insertCommentDeclaredLog', $args);
+            // leave into the session information
+            $_SESSION['declared_comment'][$comment_srl] = true;
+
+            $this->setMessage('success_declared');
+        }
+
+        /**
+         * @brief method to add a pop-up menu when clicking for displaying child comments
+         **/
+        function addCommentPopupMenu($url, $str, $icon = '', $target = 'self') {
+            $comment_popup_menu_list = Context::get('comment_popup_menu_list');
+            if(!is_array($comment_popup_menu_list)) $comment_popup_menu_list = array();
+
+            $obj->url = $url;
+            $obj->str = $str;
+            $obj->icon = $icon;
+            $obj->target = $target;
+            $comment_popup_menu_list[] = $obj;
+
+            Context::set('comment_popup_menu_list', $comment_popup_menu_list);
+        }
+
+        /**
+         * @brief save the comment extension form for each module
+         **/
+        function procCommentInsertModuleConfig() {
+            $module_srl = Context::get('target_module_srl');
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+
+            $comment_config->comment_count = (int)Context::get('comment_count');
+			if(!$comment_config->comment_count) $comment_config->comment_count = 50;
+
+			$comment_config->use_vote_up = Context::get('use_vote_up');
+			if(!$comment_config->use_vote_up) $comment_config->use_vote_up = 'Y';
+
+            $comment_config->use_vote_down = Context::get('use_vote_down');
+            if(!$comment_config->use_vote_down) $comment_config->use_vote_down = 'Y';
+
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                $output = $this->setCommentModuleConfig($srl,$comment_config);
+            }
+
+            $this->setError(-1);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+		function setCommentModuleConfig($srl, $comment_config){
+            $oModuleController = &getController('module');
+			$oModuleController->insertModulePartConfig('comment',$srl,$comment_config);
+            return new Object();
+		}
+
+        /**
+         * @brief get comment all list
+         **/
+		function procCommentGetList()
+		{
+			if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+			$commentSrls = Context::get('comment_srls');
+			if($commentSrls) $commentSrlList = explode(',', $commentSrls);
+
+			if(count($commentSrlList) > 0) {
+				$oCommentModel = &getModel('comment');
+				$commentList = $oCommentModel->getComments($commentSrlList);
+
+				if(is_array($commentList))
+				{
+					foreach($commentList AS $key=>$value)
+					{
+						$value->content = strip_tags($value->content);
+					}
+				}
+			}
+			else
+			{
+				global $lang;
+				$commentList = array();
+				$this->setMessage($lang->no_documents);
+			}
+
+			$this->add('comment_list', $commentList);
+		}
+    }
+?>
diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index 83a653e49..1b3dc95a5 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -2,15 +2,17 @@
     /**
      * @class  commentItem
      * @author NHN (developers@xpressengine.com)
-     * @brief  comment 객체
+     * @brief comment Object
      **/
 
     class commentItem extends Object {
 
         var $comment_srl = 0;
+		var $columnList = array();
 
-        function commentItem($comment_srl = 0) {
+        function commentItem($comment_srl = 0, $columnList = array()) {
             $this->comment_srl = $comment_srl;
+			$this->columnList = $columnList;
             $this->_loadFromDB();
         }
 
@@ -23,7 +25,7 @@
             if(!$this->comment_srl) return;
 
             $args->comment_srl = $this->comment_srl;
-            $output = executeQuery('comment.getComment', $args);
+            $output = executeQuery('comment.getComment', $args, $this->columnList);
 
             $this->setAttribute($output->data);
         }
@@ -35,8 +37,7 @@
             }
             $this->comment_srl = $attribute->comment_srl;
             $this->adds($attribute);
-
-            // 기존 스킨의 호환을 위해 변수를 객체 자신에 재선언
+            // define vars on the object for backward compatibility of skins
             if(count($attribute)) foreach($attribute as $key => $val) $this->{$key} = $val;
         }
 
@@ -101,33 +102,28 @@
         }
 
         function notify($type, $content) {
-            // useNotify가 아니면 return
+            // return if not useNotify
             if(!$this->useNotify()) return;
-
-            // 글쓴이가 로그인 유저가 아니면 패스~
+            // pass if the author is not logged-in user 
             if(!$this->get('member_srl')) return;
-
-            // 현재 로그인한 사용자와 글을 쓴 사용자를 비교하여 동일하면 return
+            // return if the currently logged-in user is an author of the comment.
             $logged_info = Context::get('logged_info');
             if($logged_info->member_srl == $this->get('member_srl')) return;
-
-            // 원본글의 주소를 구함
+            // get where the comment belongs to 
             $oDocumentModel = &getModel('document');
             $oDocument = $oDocumentModel->getDocument($this->get('document_srl'));
-
-            // 변수 정리
+            // Variables
             if($type) $title = "[".$type."] ";
             $title .= cut_str(strip_tags($content), 30, '...');
             $content = sprintf('%s<br /><br />from : <a href="%s#comment_%s" target="_blank">%s</a>',$content, getFullUrl('','document_srl',$this->get('document_srl')), $this->get('comment_srl'),  getFullUrl('','document_srl',$this->get('document_srl')));
             $receiver_srl = $this->get('member_srl');
             $sender_member_srl = $logged_info->member_srl;
-
-            // 쪽지 발송
+            // send a message
             $oCommunicationController = &getController('communication');
             $oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false);
         }
 
-        function getIpaddress() {
+        function getIpAddress() {
             if($this->isGranted()) return $this->get('ipaddress');
             return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/','*.$2.$3.$4', $this->get('ipaddress'));
         }
@@ -177,8 +173,7 @@
 
             $content = $this->get('content');
             stripEmbedTagForAdmin($content, $this->get('member_srl'));
-
-            // 이 댓글을... 팝업메뉴를 출력할 경우
+            // when displaying the comment on the pop-up menu
             if($add_popup_menu && Context::get('is_logged') ) {
                 $content = sprintf(
                         '%s<div class="comment_popup_menu"><a href="#popup_menu_area" class="comment_%d" onclick="return false">%s</a></div>',
@@ -186,8 +181,7 @@
                         $this->comment_srl, Context::getLang('cmd_comment_do')
                 );
             }
-
-            // 컨텐츠에 대한 조작이 가능한 추가 정보를 설정하였을 경우
+            // if additional information which can access contents is set
             if($add_content_info) {
                 $content = sprintf(
                         '<!--BeforeComment(%d,%d)--><div class="comment_%d_%d xe_content">%s</div><!--AfterComment(%d,%d)-->',
@@ -196,7 +190,7 @@
                         $content,
                         $this->comment_srl, $this->get('member_srl')
                 );
-            // 컨텐츠에 대한 조작이 필요하지 않더라도 xe_content라는 클래스명을 꼭 부여
+            // xe_content class name should be specified although content access is not necessary.
             } else {
                 if($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
             }
@@ -206,26 +200,19 @@
 
         function getSummary($str_size = 50, $tail = '...') {
             $content = $this->getContent(false, false);
-
-            // 줄바꿈이 있을 때, 공백문자 삽입
+            // for newline, insert a blank.
             $content = preg_replace('!(<br[\s]*/{0,1}>[\s]*)+!is', ' ', $content);
-
-            // </p>, </div>, </li> 등의 태그를 공백 문자로 치환
+            // replace tags such as </p> , </div> , </li> by blanks.
             $content = str_replace(array('</p>', '</div>', '</li>'), ' ', $content);
-
-            // 태그 제거
+            // Remove tags
             $content = preg_replace('!<([^>]*?)>!is','', $content);
-
-            // < , > , " 를 치환
+            // replace < , >, " 
             $content = str_replace(array('&lt;','&gt;','&quot;','&nbsp;'), array('<','>','"',' '), $content);
-
-            // 연속된 공백문자 삭제
+            // delete a series of blanks
             $content = preg_replace('/ ( +)/is', ' ', $content);
-
-            // 문자열을 자름
+            // truncate strings
             $content = trim(cut_str($content, $str_size, $tail));
-
-            // >, <, "를 다시 복구
+            // restore >, <, , "\
             $content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
 
             return $content;
@@ -288,7 +275,7 @@
         }
 
         /**
-         * @brief 에디터 html을 구해서 return
+         * @brief return the editor html
          **/
         function getEditor() {
             $module_srl = $this->get('module_srl');
@@ -298,7 +285,7 @@
         }
 
         /**
-         * @brief 작성자의 프로필 이미지를 return
+         * @brief return author's profile image
          **/
         function getProfileImage() {
             if(!$this->isExists() || !$this->get('member_srl')) return;
@@ -310,17 +297,15 @@
         }
 
         /**
-         * @brief 작성자의 서명을 return
+         * @brief return author's signiture
          **/
         function getSignature() {
-            // 존재하지 않는 글이면 패스~
+            // pass if the posting not exists.
             if(!$this->isExists() || !$this->get('member_srl')) return;
-
-            // 서명정보를 구함
+            // get the signiture information
             $oMemberModel = &getModel('member');
             $signature = $oMemberModel->getSignature($this->get('member_srl'));
-
-            // 회원모듈에서 서명 최고 높이 지정되었는지 검사
+            // check if max height of the signiture is specified on the member module
             if(!isset($GLOBALS['__member_signature_max_height'])) {
                $oModuleModel = &getModel('module');
                $member_config = $oModuleModel->getModuleConfig('member');
@@ -339,34 +324,27 @@
         }
 
         function getThumbnail($width = 80, $height = 0, $thumbnail_type = '') {
-            // 존재하지 않는 문서일 경우 return false
+            // return false if no doc exists
             if(!$this->comment_srl) return;
-
-            // 높이 지정이 별도로 없으면 정사각형으로 생성
+            // If signiture height setting is omitted, create a square
             if(!$height) $height = $width;
-
-            // 첨부파일이 없거나 내용중 이미지가 없으면 return false;
+            // return false if neigher attached file nor image;
             if(!$this->hasUploadedFiles() && !preg_match("!<img!is", $this->get('content'))) return;
-
-            // 문서 모듈의 기본 설정에서 Thumbnail의 생성 방법을 구함
+            // get thumbail generation info on the doc module configuration.
             if(!in_array($thumbnail_type, array('crop','ratio'))) $thumbnail_type = 'crop';
-
-            // 섬네일 정보 정의
+            // Define thumbnail information
             $thumbnail_path = sprintf('files/cache/thumbnails/%s',getNumberingPath($this->comment_srl, 3));
             $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
             $thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-
-            // 섬네일 파일이 있을 경우 파일의 크기가 0 이면 return false 아니면 경로 return
+            // return false if a size of existing thumbnail file is 0. otherwise return the file path
             if(file_exists($thumbnail_file)) {
                 if(filesize($thumbnail_file)<1) return false;
                 else return $thumbnail_url;
             }
-
-            // 대상 파일
+            // Target file
             $source_file = null;
             $is_tmp_file = false;
-
-            // 첨부된 파일중 이미지 파일이 있으면 찾음
+            // find an image file among attached files
             if($this->hasUploadedFiles()) {
                 $file_list = $this->getUploadedFiles();
                 if(count($file_list)) {
@@ -380,8 +358,7 @@
                     }
                 }
             }
-
-            // 첨부된 파일이 없으면 내용중 이미지 파일을 구함
+            // get an image file from the doc content if no file attached. 
             if(!$source_file) {
                 $content = $this->get('content');
                 $target_src = null;
@@ -411,15 +388,16 @@
             $output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
 
             if($is_tmp_file) FileHandler::removeFile($source_file);
-
-            // 섬네일 생성 성공시 경로 return
+            // return the thumbnail path if successfully generated.
             if($output) return $thumbnail_url;
-
-            // 차후 다시 섬네일 생성을 시도하지 않기 위해 빈 파일을 생성
+            // create an empty file not to attempt to generate the thumbnail afterwards
             else FileHandler::writeFile($thumbnail_file, '','w');
 
             return;
         }
 
+        function isCarted() {
+            return $_SESSION['comment_management'][$this->comment_srl];
+        }
     }
 ?>
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index fe5295b20..a44b16b2b 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -1,468 +1,549 @@
-<?php
-    /**
-     * @class  commentModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment 모듈의 model class
-     **/
-
-    class commentModel extends comment {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 선택된 게시물의 팝업메뉴 표시
-         *
-         * 인쇄, 스크랩, 추천, 비추천, 신고 기능 추가
-         **/
-        function getCommentMenu() {
-
-            // 요청된 게시물 번호와 현재 로그인 정보 구함
-            $comment_srl = Context::get('target_srl');
-            $mid = Context::get('cur_mid');
-            $logged_info = Context::get('logged_info');
-            $act = Context::get('cur_act');
-            
-            // menu_list 에 "표시할글,target,url" 을 배열로 넣는다
-            $menu_list = array();
-
-            // trigger 호출
-            ModuleHandler::triggerCall('comment.getCommentMenu', 'before', $menu_list);
-
-            $oCommentController = &getController('comment');
-
-            // 회원이어야만 가능한 기능
-            if($logged_info->member_srl) {
-
-				$oCommentModel = &getModel('comment');
-				$oComment = $oCommentModel->getComment($comment_srl, false, false);
-				$module_srl = $oComment->get('module_srl');
-				$member_srl = $oComment->get('member_srl');
-
-				$oModuleModel = &getModel('module');
-				$comment_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-				if($comment_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl){
-					// 추천 버튼 추가
-					$url = sprintf("doCallModuleAction('comment','procCommentVoteUp','%s')", $comment_srl);
-					$oCommentController->addCommentPopupMenu($url,'cmd_vote','./modules/document/tpl/icons/vote_up.gif','javascript');
-				}
-				if($comment_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl){
-					// 비추천 버튼 추가
-					$url = sprintf("doCallModuleAction('comment','procCommentVoteDown','%s')", $comment_srl);
-					$oCommentController->addCommentPopupMenu($url,'cmd_vote_down','./modules/document/tpl/icons/vote_down.gif','javascript');
-				}
-
-                // 신고 기능 추가
-                $url = sprintf("doCallModuleAction('comment','procCommentDeclare','%s')", $comment_srl);
-                $oCommentController->addCommentPopupMenu($url,'cmd_declare','./modules/document/tpl/icons/declare.gif','javascript');
-            }
-
-            // trigger 호출 (after)
-            ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
-
-            // 관리자일 경우 ip로 글 찾기
-            if($logged_info->is_admin == 'Y') {
-                $oCommentModel = &getModel('comment');
-                $oComment = $oCommentModel->getComment($comment_srl);
-
-                if($oComment->isExists()) {
-                    // ip주소에 해당하는 글 찾기
-                    $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->get('ipaddress'));
-                    $icon_path = './modules/member/tpl/images/icon_management.gif';
-                    $oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
-
-                    $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment-> getIpAddress());
-                    $oCommentController->addCommentPopupMenu($url,'cmd_add_ip_to_spamfilter','./modules/document/tpl/icons/declare.gif','javascript');
-                }
-            }
-
-            // 팝업메뉴의 언어 변경
-            $menus = Context::get('comment_popup_menu_list');
-            $menus_count = count($menus);
-            for($i=0;$i<$menus_count;$i++) {
-                $menus[$i]->str = Context::getLang($menus[$i]->str);
-            }
-
-            // 최종적으로 정리된 팝업메뉴 목록을 구함
-            $this->add('menus', $menus);
-        }
-
-
-        /**
-         * @brief comment_srl에 권한이 있는지 체크
-         *
-         * 세션 정보만 이용
-         **/
-        function isGranted($comment_srl) {
-            return $_SESSION['own_comment'][$comment_srl];
-        }
-
-        /**
-         * @brief 자식 답글의 갯수 리턴
-         **/
-        function getChildCommentCount($comment_srl) {
-            $args->comment_srl = $comment_srl;
-            $output = executeQuery('comment.getChildCommentCount', $args);
-            return (int)$output->data->count;
-        }
-
-        /**
-         * @brief 댓글 가져오기
-         **/
-        function getComment($comment_srl=0, $is_admin = false) {
-            $oComment = new commentItem($comment_srl);
-            if($is_admin) $oComment->setGrant();
-
-            return $oComment;
-        }
-
-        /**
-         * @brief 여러개의 댓글들을 가져옴 (페이징 아님)
-         **/
-        function getComments($comment_srl_list) {
-            if(is_array($comment_srl_list)) $comment_srls = implode(',',$comment_srl_list);
-
-            // DB에서 가져옴
-            $args->comment_srls = $comment_srls;
-            $output = executeQuery('comment.getComments', $args);
-            if(!$output->toBool()) return;
-            $comment_list = $output->data;
-            if(!$comment_list) return;
-            if(!is_array($comment_list)) $comment_list = array($comment_list);
-
-            $comment_count = count($comment_list);
-            foreach($comment_list as $key => $attribute) {
-                if(!$attribute->comment_srl) continue;
-                $oComment = null;
-                $oComment = new commentItem();
-                $oComment->setAttribute($attribute);
-                if($is_admin) $oComment->setGrant();
-
-                $result[$attribute->comment_srl] = $oComment;
-            }
-            return $result;
-        }
-
-        /**
-         * @brief document_srl 에 해당하는 댓글의 전체 갯수를 가져옴
-         **/
-        function getCommentCount($document_srl) {
-            $args->document_srl = $document_srl;
-            $output = executeQuery('comment.getCommentCount', $args);
-            $total_count = $output->data->count;
-            return (int)$total_count;
-        }
-
-
-        /**
-         * @brief module_srl 에 해당하는 댓글의 전체 갯수를 가져옴
-         **/
-        function getCommentAllCount($module_srl) {
-            $args->module_srl = $module_srl;
-			$output = executeQuery('comment.getCommentCount', $args);
-			$total_count = $output->data->count;
-			
-            return (int)$total_count;
-        }
-
-
-        /** 
-         * @brief mid 에 해당하는 댓글을 가져옴
-         **/
-        function getNewestCommentList($obj) {
-            if($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크 
-            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-            $args->list_count = $obj->list_count;
-
-            $output = executeQuery('comment.getNewestCommentList', $args);
-            if(!$output->toBool()) return $output;
-
-            $comment_list = $output->data;
-            if($comment_list) {
-                if(!is_array($comment_list)) $comment_list = array($comment_list);
-                $comment_count = count($comment_list);
-                foreach($comment_list as $key => $attribute) {
-                    if(!$attribute->comment_srl) continue;
-                    $oComment = null;
-                    $oComment = new commentItem();
-                    $oComment->setAttribute($attribute);
-
-                    $result[$key] = $oComment;
-                }
-                $output->data = $result;
-            }
-            return $result;
-        }
-
-        /** 
-         * @brief document_srl에 해당하는 문서의 댓글 목록을 가져옴
-         **/
-        function getCommentList($document_srl, $page = 0, $is_admin = false, $count = 0) {
-            // 해당 문서의 모듈에 해당하는 댓글 수를 구함
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-
-            // 문서가 존재하지 않으면 return~
-            if(!$oDocument->isExists()) return;
-
-            // 댓글수가 없으면 return~
-            if($oDocument->getCommentCount()<1) return;
-
-            // 정해진 댓글수에 따른 댓글 목록 구함
-            $module_srl = $oDocument->get('module_srl');
-
-            if(!$count) {
-                $comment_config = $this->getCommentConfig($module_srl);
-                $comment_count = $comment_config->comment_count;
-                if(!$comment_count) $comment_count = 50;
-            } else {
-                $comment_count = $count;
-            }
-
-            // 페이지가 없으면 제일 뒤 페이지를 구함
-            if(!$page) $page = (int)( ($oDocument->getCommentCount()-1) / $comment_count) + 1;                
-
-            // 정해진 수에 따라 목록을 구해옴
-            $args->document_srl = $document_srl;
-            $args->list_count = $comment_count;
-            $args->page = $page;
-            $args->page_count = 10;
-            $output = executeQueryArray('comment.getCommentPageList', $args);
-
-            // 쿼리 결과에서 오류가 생기면 그냥 return
-            if(!$output->toBool()) return;
-
-            // 만약 구해온 결과값이 저장된 댓글수와 다르다면 기존의 데이터로 판단하고 댓글 목록 테이블에 데이터 입력
-            if(!$output->data) {
-                $this->fixCommentList($oDocument->get('module_srl'), $document_srl);
-                $output = executeQueryArray('comment.getCommentPageList', $args);
-                if(!$output->toBool()) return;
-            }
-
-            return $output;
-        }
-            
-        /**
-         * @brief document_srl에 해당하는 댓글 목록을 갱신
-         * 정식버전 이전에 사용되던 데이터를 위한 처리
-         **/
-        function fixCommentList($module_srl, $document_srl) {
-            // 일괄 작업이라서 lock 파일을 생성하여 중복 작업이 되지 않도록 한다
-            $lock_file = "./files/cache/tmp/lock.".$document_srl;
-            if(file_exists($lock_file) && filemtime($lock_file)+60*60*10<time()) return;
-            FileHandler::writeFile($lock_file, '');
-
-            // 목록을 구함
-            $args->document_srl = $document_srl;
-            $args->list_order = 'list_order';
-            $output = executeQuery('comment.getCommentList', $args);
-            if(!$output->toBool()) return $output;
-
-            $source_list = $output->data;
-            if(!is_array($source_list)) $source_list = array($source_list);
-
-            // 댓글를 계층형 구조로 정렬
-            $comment_count = count($source_list);
-
-            $root = NULL;
-            $list = NULL;
-            $comment_list = array();
-
-            // 로그인 사용자의 경우 로그인 정보를 일단 구해 놓음
-            $logged_info = Context::get('logged_info');
-
-
-            // loop를 돌면서 코멘트의 계층 구조 만듬 
-            for($i=$comment_count-1;$i>=0;$i--) {
-                $comment_srl = $source_list[$i]->comment_srl;
-                $parent_srl = $source_list[$i]->parent_srl;
-                if(!$comment_srl) continue;
-
-                // 목록을 만듬
-                $list[$comment_srl] = $source_list[$i];
-
-                if($parent_srl) {
-                    $list[$parent_srl]->child[] = &$list[$comment_srl];
-                } else {
-                    $root->child[] = &$list[$comment_srl];
-                }
-            }
-            $this->_arrangeComment($comment_list, $root->child, 0, null);
-
-            // 구해진 값을 db에 입력함
-            if(count($comment_list)) {
-                foreach($comment_list as $comment_srl => $item) {
-                    $comment_args = null;
-                    $comment_args->comment_srl = $comment_srl;
-                    $comment_args->document_srl = $document_srl;
-                    $comment_args->head = $item->head;
-                    $comment_args->arrange = $item->arrange;
-                    $comment_args->module_srl = $module_srl;
-                    $comment_args->regdate = $item->regdate;
-                    $comment_args->depth = $item->depth;
-
-                    executeQuery('comment.insertCommentList', $comment_args);
-                }
-            }
-
-            // 성공시 lock파일 제거
-            FileHandler::removeFile($lock_file);
-        }
-
-        /**
-         * @brief 댓글을 계층형으로 재배치
-         **/
-        function _arrangeComment(&$comment_list, $list, $depth, $parent = null) {
-            if(!count($list)) return;
-            foreach($list as $key => $val) {
-
-                if($parent) $val->head = $parent->head;
-                else $val->head = $val->comment_srl;
-                $val->arrange = count($comment_list)+1;
-
-                if($val->child) {
-                    $val->depth = $depth;
-                    $comment_list[$val->comment_srl] = $val;
-                    $this->_arrangeComment($comment_list,$val->child,$depth+1, $val);
-                    unset($val->child);
-                } else {
-                    $val->depth = $depth;
-                    $comment_list[$val->comment_srl] = $val;
-                }
-            }
-        }
-
-        /**
-         * @brief 모든 댓글를 시간 역순으로 가져옴 (관리자용)
-         **/
-        function getTotalCommentList($obj) {
-            $query_id = 'comment.getTotalCommentList';
-
-            // 변수 설정
-            $args->sort_index = 'list_order';
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-            $args->s_module_srl = $obj->module_srl;
-            $args->exclude_module_srl = $obj->exclude_module_srl;
-
-            // 검색 옵션 정리
-            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
-            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'content' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_content = $search_keyword;
-                        break;
-                    case 'user_id' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_id = $search_keyword;
-                            $query_id = 'comment.getTotalCommentListWithinMember';
-                            $args->sort_index = 'comments.list_order';
-                        break;
-                    case 'user_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_name = $search_keyword;
-                        break;
-                    case 'nick_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_nick_name = $search_keyword;
-                        break;
-                    case 'email_address' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_email_address = $search_keyword;
-                        break;
-                    case 'homepage' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_homepage = $search_keyword;
-                        break;
-                    case 'regdate' :
-                            $args->s_regdate = $search_keyword;
-                        break;
-                    case 'last_update' :
-                            $args->s_last_upate = $search_keyword;
-                        break;
-                    case 'ipaddress' :
-                            $args->s_ipaddress= $search_keyword;
-                        break;
-                    case 'member_srl' :
-                            $args->{"s_".$search_target} = (int)$search_keyword;
-                        break;
-                }
-            }
-
-            // comment.getTotalCommentList 쿼리 실행
-            $output = executeQueryArray($query_id, $args);
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if(!$output->toBool()||!count($output->data)) return $output;
-            foreach($output->data as $key => $val) {
-                unset($_oComment);
-                $_oComment = new CommentItem(0);
-                $_oComment->setAttribute($val);
-                $output->data[$key] = $_oComment;
-            }
-
-            return $output;
-        }
-
-        /**
-         * @brief 모듈별 댓글 설정을 return
-         **/
-        function getCommentConfig($module_srl) {
-            $oModuleModel = &getModel('module');
-            $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
-            if(!isset($comment_config->comment_count)) $comment_config->comment_count = 50;
-            return $comment_config;
-        }
-
-		function getCommentVotedMemberList()
-		{
-			$comment_srl = Context::get('comment_srl');
-			if(!$comment_srl) return new Object(-1,'msg_invalid_request');
-
-			$point = Context::get('point');
-			if($point != -1) $point = 1;
-
-			$oCommentModel = &getModel('comment');
-            $oComment = $oCommentModel->getComment($comment_srl, false, false);
-			$module_srl = $oComment->get('module_srl');
-			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-			$oModuleModel = &getModel('module');
-            $comment_config = $oModuleModel->getModulePartConfig('comment',$module_srl);
-			if($point == -1){
-				if($comment_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request');
-				$args->below_point = 0;
-			}else{
-				if($comment_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
-				$args->more_point = 0;
-			}
-
-			$args->comment_srl = $comment_srl;
-			$output = executeQueryArray('comment.getVotedMemberList',$args);
-			if(!$output->toBool()) return $output;
-
-			$oMemberModel = &getModel('member');
-			if($output->data){
-				foreach($output->data as $k => $d){
-					$profile_image = $oMemberModel->getProfileImage($d->member_srl);
-					$output->data[$k]->src = $profile_image->src;
-				}
-			}
-
-			$this->add('voted_member_list',$output->data);
-		}
-    }
-?>
+<?php
+    /**
+     * @class  commentModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief model class of the comment module
+     **/
+
+    class commentModel extends comment {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief display the pop-up menu of the post
+         *
+         * Print, scrap, vote-up(recommen), vote-down(non-recommend), report features added
+         **/
+        function getCommentMenu() {
+            // get the post's id number and the current login information
+            $comment_srl = Context::get('target_srl');
+            $mid = Context::get('cur_mid');
+            $logged_info = Context::get('logged_info');
+            $act = Context::get('cur_act');
+
+            // array values for menu_list, "comment post, target, url"
+            $menu_list = array();
+            // call a trigger
+            ModuleHandler::triggerCall('comment.getCommentMenu', 'before', $menu_list);
+
+            $oCommentController = &getController('comment');
+            // feature that only member can do
+            if($logged_info->member_srl) {
+
+				$oCommentModel = &getModel('comment');
+				$columnList = array('comment_srl', 'module_srl', 'member_srl', 'ipaddress');
+				$oComment = $oCommentModel->getComment($comment_srl, false, $columnList);
+				$module_srl = $oComment->get('module_srl');
+				$member_srl = $oComment->get('member_srl');
+
+				$oModuleModel = &getModel('module');
+				$comment_config = $oModuleModel->getModulePartConfig('document',$module_srl);
+				if($comment_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl){
+					// Add a vote-up button for positive feedback
+					$url = sprintf("doCallModuleAction('comment','procCommentVoteUp','%s')", $comment_srl);
+					$oCommentController->addCommentPopupMenu($url,'cmd_vote','','javascript');
+				}
+				if($comment_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl){
+					// Add a vote-down button for negative feedback
+					$url = sprintf("doCallModuleAction('comment','procCommentVoteDown','%s')", $comment_srl);
+					$oCommentController->addCommentPopupMenu($url,'cmd_vote_down','','javascript');
+				}
+
+                // Add the report feature against abused posts
+                $url = sprintf("doCallModuleAction('comment','procCommentDeclare','%s')", $comment_srl);
+                $oCommentController->addCommentPopupMenu($url,'cmd_declare','','javascript');
+            }
+            // call a trigger (after)
+            ModuleHandler::triggerCall('comment.getCommentMenu', 'after', $menu_list);
+            // find a comment by IP matching if an administrator.
+            if($logged_info->is_admin == 'Y') {
+                $oCommentModel = &getModel('comment');
+                $oComment = $oCommentModel->getComment($comment_srl);
+
+                if($oComment->isExists()) {
+                    // Find a post of the corresponding ip address
+                    $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','ipaddress','search_keyword',$oComment->getIpAddress());
+                    $oCommentController->addCommentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+
+                    $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oComment->getIpAddress());
+                    $oCommentController->addCommentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript');
+                }
+            }
+            // Changing a language of pop-up menu
+            $menus = Context::get('comment_popup_menu_list');
+            $menus_count = count($menus);
+            for($i=0;$i<$menus_count;$i++) {
+                $menus[$i]->str = Context::getLang($menus[$i]->str);
+            }
+            // get a list of final organized pop-up menus
+            $this->add('menus', $menus);
+        }
+
+
+        /**
+         * @brief check if you have a permission to comment_srl
+         *
+         * use only session information
+         **/
+        function isGranted($comment_srl) {
+            return $_SESSION['own_comment'][$comment_srl];
+        }
+
+        /**
+         * @brief Returns the number of child comments
+         **/
+        function getChildCommentCount($comment_srl) {
+            $args->comment_srl = $comment_srl;
+            $output = executeQuery('comment.getChildCommentCount', $args);
+            return (int)$output->data->count;
+        }
+
+        /**
+         * @brief get the comment
+         **/
+        function getComment($comment_srl=0, $is_admin = false, $columnList = array()) {
+            $oComment = new commentItem($comment_srl, $columnList);
+            if($is_admin) $oComment->setGrant();
+
+            return $oComment;
+        }
+
+        /**
+         * @brief get the multiple comments(not paginating)
+         **/
+        function getComments($comment_srl_list, $columnList = array()) {
+            if(is_array($comment_srl_list)) $comment_srls = implode(',',$comment_srl_list);
+            // fetch from a database
+            $args->comment_srls = $comment_srls;
+            $output = executeQuery('comment.getComments', $args, $columnList);
+            if(!$output->toBool()) return;
+            $comment_list = $output->data;
+            if(!$comment_list) return;
+            if(!is_array($comment_list)) $comment_list = array($comment_list);
+
+            $comment_count = count($comment_list);
+            foreach($comment_list as $key => $attribute) {
+                if(!$attribute->comment_srl) continue;
+                $oComment = null;
+                $oComment = new commentItem();
+                $oComment->setAttribute($attribute);
+                if($is_admin) $oComment->setGrant();
+
+                $result[$attribute->comment_srl] = $oComment;
+            }
+            return $result;
+        }
+
+        /**
+         * @brief get the total number of comments in corresponding with document_srl.
+         **/
+        function getCommentCount($document_srl) {
+            $args->document_srl = $document_srl;
+            $output = executeQuery('comment.getCommentCount', $args);
+            $total_count = $output->data->count;
+            return (int)$total_count;
+        }
+
+        /**
+         * @brief get the total number of comments in corresponding with document_srl.
+         **/
+        function getCommentCountByDate($date = '', $moduleSrlList = array()) {
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+			if(count($moduleSrlList)>0) $args->module_srl = $moduleSrlList;
+
+            $output = executeQuery('comment.getCommentCount', $args);
+			if(!$output->toBool()) return 0;
+
+			return $output->data->count;
+        }
+
+        /**
+         * @brief get the total number of comments in corresponding with module_srl.
+         **/
+        function getCommentAllCount($module_srl) {
+            $args->module_srl = $module_srl;
+			$output = executeQuery('comment.getCommentCount', $args);
+			$total_count = $output->data->count;
+
+            return (int)$total_count;
+        }
+
+
+        /**
+         * @brief get the comment in corresponding with mid.
+         * TODO add commentItems to cache too
+         **/
+        function getNewestCommentList($obj, $columnList = array()) {
+            if($obj->mid) {
+                $oModuleModel = &getModel('module');
+                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+                unset($obj->mid);
+            }
+            // check if module_srl is an arrary.
+            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+            $args->list_count = $obj->list_count;
+        	// cache controll
+			$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+				$object_key = 'object_newest_comment_list:'.$obj->module_srl;
+                                $cache_key = $oCacheHandler->getGroupKey('newestCommentsList', $object_key);
+				$output = $oCacheHandler->get($cache_key);
+			}
+			if(!$output){
+            	$output = executeQuery('comment.getNewestCommentList', $args, $columnList);
+            	if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+			}
+            if(!$output->toBool()) return $output;
+
+            $comment_list = $output->data;
+            if($comment_list) {
+                if(!is_array($comment_list)) $comment_list = array($comment_list);
+                $comment_count = count($comment_list);
+                foreach($comment_list as $key => $attribute) {
+                    if(!$attribute->comment_srl) continue;
+                    $oComment = null;
+                    $oComment = new commentItem();
+                    $oComment->setAttribute($attribute);
+
+                    $result[$key] = $oComment;
+                }
+                $output->data = $result;
+            }
+            return $result;
+        }
+
+        /**
+         * @brief get a comment list of the doc in corresponding woth document_srl.
+         **/
+        function getCommentList($document_srl, $page = 0, $is_admin = false, $count = 0) {
+                if(!isset($document_srl)) return;
+        	// cache controll
+                $oCacheHandler = &CacheHandler::getInstance('object');
+                if($oCacheHandler->isSupport()){
+                        $object_key = 'object:'.$document_srl.'_'.$page.'_'.($is_admin ? 'Y' : 'N') .'_' . $count;
+                        $cache_key = $oCacheHandler->getGroupKey('commentList_' . $document_srl, $object_key);
+                        $output = $oCacheHandler->get($cache_key);
+                }
+        	if(!$output){
+                    // get the number of comments on the document module
+	            $oDocumentModel = &getModel('document');
+                    $columnList = array('document_srl', 'module_srl', 'comment_count');
+	            $oDocument = $oDocumentModel->getDocument($document_srl, false, true, $columnList);
+	            // return if no doc exists.
+	            if(!$oDocument->isExists()) return;
+	            // return if no comment exists
+	            if($oDocument->getCommentCount()<1) return;
+	            // get a list of comments
+	            $module_srl = $oDocument->get('module_srl');
+
+	            if(!$count) {
+	                $comment_config = $this->getCommentConfig($module_srl);
+	                $comment_count = $comment_config->comment_count;
+	                if(!$comment_count) $comment_count = 50;
+	            } else {
+	                $comment_count = $count;
+	            }
+	            // get a very last page if no page exists
+	            if(!$page) $page = (int)( ($oDocument->getCommentCount()-1) / $comment_count) + 1;
+	            // get a list of comments
+	            $args->document_srl = $document_srl;
+	            $args->list_count = $comment_count;
+	            $args->page = $page;
+	            $args->page_count = 10;
+	            $output = executeQueryArray('comment.getCommentPageList', $args);
+	            // return if an error occurs in the query results
+	            if(!$output->toBool()) return;
+	            // insert data into CommentPageList table if the number of results is different from stored comments
+	            if(!$output->data) {
+	                $this->fixCommentList($oDocument->get('module_srl'), $document_srl);
+	                $output = executeQueryArray('comment.getCommentPageList', $args);
+	                if(!$output->toBool()) return;
+	            }
+	            //insert in cache
+	            if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+
+        	}
+
+            return $output;
+        }
+
+        /**
+         * @brief update a list of comments in corresponding with document_srl
+         * take care of previously used data than GA version
+         **/
+        function fixCommentList($module_srl, $document_srl) {
+            // create a lock file to prevent repeated work when performing a batch job
+            $lock_file = "./files/cache/tmp/lock.".$document_srl;
+            if(file_exists($lock_file) && filemtime($lock_file)+60*60*10<time()) return;
+            FileHandler::writeFile($lock_file, '');
+            // get a list
+            $args->document_srl = $document_srl;
+            $args->list_order = 'list_order';
+            $output = executeQuery('comment.getCommentList', $args);
+            if(!$output->toBool()) return $output;
+
+            $source_list = $output->data;
+            if(!is_array($source_list)) $source_list = array($source_list);
+            // Sort comments by the hierarchical structure
+            $comment_count = count($source_list);
+
+            $root = NULL;
+            $list = NULL;
+            $comment_list = array();
+            // get the log-in information for logged-in users
+            $logged_info = Context::get('logged_info');
+            // generate a hierarchical structure of comments for loop
+            for($i=$comment_count-1;$i>=0;$i--) {
+                $comment_srl = $source_list[$i]->comment_srl;
+                $parent_srl = $source_list[$i]->parent_srl;
+                if(!$comment_srl) continue;
+                // generate a list
+                $list[$comment_srl] = $source_list[$i];
+
+                if($parent_srl) {
+                    $list[$parent_srl]->child[] = &$list[$comment_srl];
+                } else {
+                    $root->child[] = &$list[$comment_srl];
+                }
+            }
+            $this->_arrangeComment($comment_list, $root->child, 0, null);
+            // insert values to the database
+            if(count($comment_list)) {
+                foreach($comment_list as $comment_srl => $item) {
+                    $comment_args = null;
+                    $comment_args->comment_srl = $comment_srl;
+                    $comment_args->document_srl = $document_srl;
+                    $comment_args->head = $item->head;
+                    $comment_args->arrange = $item->arrange;
+                    $comment_args->module_srl = $module_srl;
+                    $comment_args->regdate = $item->regdate;
+                    $comment_args->depth = $item->depth;
+
+                    executeQuery('comment.insertCommentList', $comment_args);
+                }
+            }
+            // remove the lock file if successful.
+            FileHandler::removeFile($lock_file);
+        }
+
+        /**
+         * @brief relocate comments in the hierarchical structure
+         **/
+        function _arrangeComment(&$comment_list, $list, $depth, $parent = null) {
+            if(!count($list)) return;
+            foreach($list as $key => $val) {
+
+                if($parent) $val->head = $parent->head;
+                else $val->head = $val->comment_srl;
+                $val->arrange = count($comment_list)+1;
+
+                if($val->child) {
+                    $val->depth = $depth;
+                    $comment_list[$val->comment_srl] = $val;
+                    $this->_arrangeComment($comment_list,$val->child,$depth+1, $val);
+                    unset($val->child);
+                } else {
+                    $val->depth = $depth;
+                    $comment_list[$val->comment_srl] = $val;
+                }
+            }
+        }
+
+        /**
+         * @brief get all the comments in time decending order(for administrators)
+         **/
+        function getTotalCommentList($obj, $columnList = array()) {
+            $query_id = 'comment.getTotalCommentList';
+            // Variables
+            $args->sort_index = 'list_order';
+            $args->page = $obj->page?$obj->page:1;
+            $args->list_count = $obj->list_count?$obj->list_count:20;
+            $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->s_module_srl = $obj->module_srl;
+            $args->exclude_module_srl = $obj->exclude_module_srl;
+            // Search options
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_content = $search_keyword;
+                        break;
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                            $query_id = 'comment.getTotalCommentListWithinMember';
+                            $args->sort_index = 'comments.list_order';
+                        break;
+                    case 'user_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_name = $search_keyword;
+                        break;
+                    case 'nick_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_nick_name = $search_keyword;
+                        break;
+                    case 'email_address' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_email_address = $search_keyword;
+                        break;
+                    case 'homepage' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_homepage = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'last_update' :
+                            $args->s_last_upate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress= $search_keyword;
+                        break;
+                    case 'is_secret' :
+                            $args->s_is_secret= $search_keyword;
+                        break;
+                    case 'member_srl' :
+                            $args->{"s_".$search_target} = (int)$search_keyword;
+                        break;
+                }
+            }
+            // comment.getTotalCommentList query execution
+            $output = executeQueryArray($query_id, $args, $columnList);
+            // return when no result or error occurance
+            if(!$output->toBool()||!count($output->data)) return $output;
+            foreach($output->data as $key => $val) {
+                unset($_oComment);
+                $_oComment = new CommentItem(0);
+                $_oComment->setAttribute($val);
+                $output->data[$key] = $_oComment;
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief get all the comment count in time decending order(for administrators)
+         **/
+        function getTotalCommentCount($obj) {
+            $query_id = 'comment.getTotalCommentCountByGroupStatus';
+            // Variables
+            $args->s_module_srl = $obj->module_srl;
+            $args->exclude_module_srl = $obj->exclude_module_srl;
+            // Search options
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_content = $search_keyword;
+                        break;
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                            $query_id = 'comment.getTotalCommentCountWithinMemberByGroupStatus';
+                        break;
+                    case 'user_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_name = $search_keyword;
+                        break;
+                    case 'nick_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_nick_name = $search_keyword;
+                        break;
+                    case 'email_address' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_email_address = $search_keyword;
+                        break;
+                    case 'homepage' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_homepage = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'last_update' :
+                            $args->s_last_upate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress= $search_keyword;
+                        break;
+                    case 'is_secret' :
+                            $args->s_is_secret= $search_keyword;
+                        break;
+                    case 'member_srl' :
+                            $args->{"s_".$search_target} = (int)$search_keyword;
+                        break;
+                }
+            }
+            $output = executeQueryArray($query_id, $args);
+            // return when no result or error occurance
+            if(!$output->toBool()||!count($output->data)) return $output;
+
+            return $output->data;
+        }
+
+        /**
+         * @brief return a configuration of comments for each module
+         **/
+        function getCommentConfig($module_srl) {
+            $oModuleModel = &getModel('module');
+            $comment_config = $oModuleModel->getModulePartConfig('comment', $module_srl);
+            if(!isset($comment_config->comment_count)) $comment_config->comment_count = 50;
+            return $comment_config;
+        }
+
+		function getCommentVotedMemberList()
+		{
+			$comment_srl = Context::get('comment_srl');
+			if(!$comment_srl) return new Object(-1,'msg_invalid_request');
+
+			$point = Context::get('point');
+			if($point != -1) $point = 1;
+
+			$oCommentModel = &getModel('comment');
+            $oComment = $oCommentModel->getComment($comment_srl, false, false);
+			$module_srl = $oComment->get('module_srl');
+			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+
+			$oModuleModel = &getModel('module');
+            $comment_config = $oModuleModel->getModulePartConfig('comment',$module_srl);
+			if($point == -1){
+				if($comment_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request');
+				$args->below_point = 0;
+			}else{
+				if($comment_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
+				$args->more_point = 0;
+			}
+
+			$args->comment_srl = $comment_srl;
+			$output = executeQueryArray('comment.getVotedMemberList',$args);
+			if(!$output->toBool()) return $output;
+
+			$oMemberModel = &getModel('member');
+			if($output->data){
+				foreach($output->data as $k => $d){
+					$profile_image = $oMemberModel->getProfileImage($d->member_srl);
+					$output->data[$k]->src = $profile_image->src;
+				}
+			}
+
+			$this->add('voted_member_list',$output->data);
+		}
+
+		function getSecretNameList()
+		{
+			global $lang;
+			if(!isset($lang->secret_name_list))
+				return array('Y'=>'Secret', 'N'=>'Public');
+			else return $lang->secret_name_list;
+		}
+    }
+?>
diff --git a/modules/comment/comment.view.php b/modules/comment/comment.view.php
index 9885cbe8f..93f3fef20 100644
--- a/modules/comment/comment.view.php
+++ b/modules/comment/comment.view.php
@@ -1,48 +1,45 @@
-<?php
-    /**
-     * @class  commentView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment 모듈의 view 클래스
-     **/
-
-    class commentView extends comment {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 모듈의 추가 설정에서 댓글 설정을 하는 form 추가
-         **/
-        function triggerDispCommentAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                // 선택된 모듈의 정보를 가져옴
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            // 댓글 설정을 구함
-            $oCommentModel = &getModel('comment');
-            $comment_config = $oCommentModel->getCommentConfig($current_module_srl);
-            Context::set('comment_config', $comment_config);
-
-            // 그룹 목록을 구함
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
-
-            // 템플릿 파일 지정
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'comment_module_config');
-            $obj .= $tpl;
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  commentView
+     * @author NHN (developers@xpressengine.com)
+     * @brief comment module's view class
+     **/
+
+    class commentView extends comment {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief add a form fot comment setting on the additional setting of module
+         **/
+        function triggerDispCommentAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // get information of the selected module
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+            // get the comment configuration
+            $oCommentModel = &getModel('comment');
+            $comment_config = $oCommentModel->getCommentConfig($current_module_srl);
+            Context::set('comment_config', $comment_config);
+            // get a group list
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups();
+            Context::set('group_list', $group_list);
+            // Set a template file
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'comment_module_config');
+            $obj .= $tpl;
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/comment/conf/info.xml b/modules/comment/conf/info.xml
index 39d9b01b3..624c279fc 100644
--- a/modules/comment/conf/info.xml
+++ b/modules/comment/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">댓글</title>
-    <title xml:lang="jp">コメント</title>
-    <title xml:lang="zh-CN">评论管理</title>
-    <title xml:lang="en">Comment</title>
-    <title xml:lang="vi">Bình luận</title>
-    <title xml:lang="es">Commentarios</title>
-    <title xml:lang="ru">Комментарии</title>
-    <title xml:lang="zh-TW">評論</title>
-    <title xml:lang="tr">Yorum</title>
-    <description xml:lang="ko">게시판이나 블로그등의 댓글을 관리하는 모듈입니다.</description>
-    <description xml:lang="jp">掲示板やブログなどのコメントを管理するモジュールです。</description>
-    <description xml:lang="zh-CN">管理版面或博客评论的模块。</description>
-    <description xml:lang="en">Module for managing board/blog's comments</description>
-    <description xml:lang="vi">Module quản lý bình luận của bài viết và sổ lưu niệm</description>
-    <description xml:lang="es">Es el módulo para manejar commentarios en blog o boletínes.</description>
-    <description xml:lang="ru">Модуль для управления комментариями форума/блога.</description>
-    <description xml:lang="zh-TW">管理討論板或部落格評論的模組。</description>
-    <description xml:lang="tr">Pano ve blog yorumlarını yönetme modülü</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>content</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">댓글</title>
+    <title xml:lang="jp">コメント</title>
+    <title xml:lang="zh-CN">评论管理</title>
+    <title xml:lang="en">Comment</title>
+    <title xml:lang="vi">Bình luận</title>
+    <title xml:lang="es">Commentarios</title>
+    <title xml:lang="ru">Комментарии</title>
+    <title xml:lang="zh-TW">評論</title>
+    <title xml:lang="tr">Yorum</title>
+    <description xml:lang="ko">게시판이나 블로그등의 댓글을 관리하는 모듈입니다.</description>
+    <description xml:lang="jp">掲示板やブログなどのコメントを管理するモジュールです。</description>
+    <description xml:lang="zh-CN">管理版面或博客评论的模块。</description>
+    <description xml:lang="en">Module for managing board/blog's comments</description>
+    <description xml:lang="vi">Module quản lý bình luận của bài viết và sổ lưu niệm</description>
+    <description xml:lang="es">Es el módulo para manejar commentarios en blog o boletínes.</description>
+    <description xml:lang="ru">Модуль для управления комментариями форума/блога.</description>
+    <description xml:lang="zh-TW">管理討論板或部落格評論的模組。</description>
+    <description xml:lang="tr">Pano ve blog yorumlarını yönetme modülü</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>content</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/comment/conf/module.xml b/modules/comment/conf/module.xml
index f17582a90..f800cdc05 100644
--- a/modules/comment/conf/module.xml
+++ b/modules/comment/conf/module.xml
@@ -1,17 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
-    <permissions />
+    <permissions>
+		<permission action="procCommentAdminAddCart" target="manager" />
+		<permission action="procCommentGetList" target="manager" />
+    </permissions>
     <actions>
         <action name="getCommentMenu" type="model" standalone="true" />
-        <action name="dispCommentAdminList" type="view" admin_index="true" standalone="true" />
-        <action name="dispCommentAdminDeclared" type="view" standalone="true" />
+        <action name="dispCommentAdminList" type="view" admin_index="true" standalone="true" menu_name="comment" menu_index="true" />
+        <action name="dispCommentAdminDeclared" type="view" standalone="true" menu_name="comment" />
         <action name="procCommentVoteUp" type="controller" standalone="true" />
         <action name="procCommentVoteDown" type="controller" standalone="true" />
         <action name="procCommentDeclare" type="controller" standalone="true" />
         <action name="getCommentVotedMemberList" type="model" standalone="true" />
-        <action name="procCommentInsertModuleConfig" type="controller" standalone="true" />
-        <action name="procCommentAdminDeleteChecked" type="controller" standalone="true" />
+        <action name="procCommentInsertModuleConfig" type="controller" standalone="true" ruleset="insertCommentModuleConfig" />
+        <action name="procCommentAdminDeleteChecked" type="controller" standalone="true" ruleset="deleteChecked" />
         <action name="procCommentAdminCancelDeclare" type="controller" standalone="true" />
+        <action name="procCommentAdminAddCart" type="controller" standalone="true" />
+        <action name="procCommentGetList" type="controller" standalone="true" />
     </actions>
+	<menus>
+		<menu name="comment">
+			<title xml:lang="en">Comment</title>
+			<title xml:lang="ko">댓글</title>
+			<title xml:lang="zh-CN">Comment</title>
+			<title xml:lang="jp">Comment</title>
+			<title xml:lang="es">Comment</title>
+			<title xml:lang="ru">Comment</title>
+			<title xml:lang="fr">Comment</title>
+			<title xml:lang="zh-TW">Comment</title>
+			<title xml:lang="vi">Comment</title>
+			<title xml:lang="mn">Comment</title>
+			<title xml:lang="tr">Comment</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/comment/lang/en.lang.php b/modules/comment/lang/en.lang.php
deleted file mode 100644
index c201816e2..000000000
--- a/modules/comment/lang/en.lang.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment module's basic language pack
-     **/
-	
-    $lang->cmd_comment_do = 'I want to';
-    
-    $lang->comment_list = 'Comments List';
-    $lang->cmd_delete_checked_comment = 'Delete selected item';
-
-    $lang->comment_count = 'Number of Comments';
-	$lang->about_comment_count = 'Display the comments as much as user inputs the number and it will be moved to the List if the comments are over its number.';
-
-    $lang->msg_cart_is_null = 'Please select an article to delete';
-    $lang->msg_checked_comment_is_deleted = '%d comment(s) is(are) successfully deleted.'; 
-
-    $lang->search_target_list = array(
-        'content' => 'Content',
-        'user_id' => 'ID',
-        'user_name' => 'Name',
-        'nick_name' => 'Nickname',
-        'member_srl' => 'Member Serial',
-        'email_address' => 'Email',
-        'homepage' => 'Homepage',
-        'regdate' => 'Date',
-        'last_update' => 'Last update',
-        'ipaddress' => 'IP Address',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/es.lang.php b/modules/comment/lang/es.lang.php
deleted file mode 100644
index 4240bb704..000000000
--- a/modules/comment/lang/es.lang.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/comment/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma español para el módulo de comentarios.
-     **/
-	
-    $lang->cmd_comment_do = 'Usted ...';
-    
-    $lang->comment_list = 'Comentarios Lista';
-    $lang->cmd_delete_checked_comment = 'Eliminar lo seleccionado' ;
-
-    $lang->comment_count = '댓글 수';
-    $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.';
-
-    $lang->msg_cart_is_null = 'Selecciona el commentario que desea eliminar';
-    $lang->msg_checked_comment_is_deleted = '%d comentario eliminado correctamente.';
-
-    $lang->search_target_list = array(
-        'content' => 'Contenido',
-        'user_id' => 'ID',
-        'user_name' => 'Nombre',
-        'nick_name' => 'Apodo',
-        'member_srl' => 'Member Serial',
-        'email_address' => 'Correo Electrónico',
-        'homepage' => 'Página web',
-        'regdate' => 'Fecha del registro',
-        'last_update' => 'Ultima actualización',
-        'ipaddress' => 'Dirección IP',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/fr.lang.php b/modules/comment/lang/fr.lang.php
deleted file mode 100644
index 39960e0be..000000000
--- a/modules/comment/lang/fr.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Commentaire
-     **/
-	
-    $lang->cmd_comment_do = 'Vous voudriez...';
-    
-    $lang->comment_list = 'Liste des Commentaires';
-	$lang->cmd_toggle_checked_comment = 'Renverser les choisis';
-    $lang->cmd_delete_checked_comment = 'Supprimer les choisis';
-
-    $lang->comment_count = 'Limite de Commentaires';
-	$lang->about_comment_count = 'Quand il y a plus de commentaires, ils seront bougés sur le liste.';
-
-    $lang->msg_cart_is_null = 'Choisissez un article à supprimer, S.V.P.';
-    $lang->msg_checked_comment_is_deleted = '%d commentaire(s) est(sont) supprimé(s) avec succés.'; 
-
-    $lang->search_target_list = array(
-        'content' => 'Contenu',
-        'user_id' => 'Compte',
-        'user_name' => 'Nom',
-        'nick_name' => 'Surnom',
-        'member_srl' => 'Numéro de Série du Membre',
-        'email_address' => 'Mél',
-        'homepage' => 'Page d\'Accueil',
-        'regdate' => 'Jour',
-        'last_update' => 'Mise à Jour',
-        'ipaddress' => 'Adresse IP',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/jp.lang.php b/modules/comment/lang/jp.lang.php
deleted file mode 100644
index 05c55c038..000000000
--- a/modules/comment/lang/jp.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com)　翻訳：RisaPapa、ミニミ、liahona
-     * @brief  コメント(comment) モジュールの基本言語パッケージ
-     **/
-	
-    $lang->cmd_comment_do = 'このコメントを…';
-
-    $lang->comment_list = 'コメントリスト';
-	$lang->cmd_toggle_checked_comment = '選択項目の反転';
-    $lang->cmd_delete_checked_comment = '選択項目削除';
-
-    $lang->comment_count = 'コメント数';
-    $lang->about_comment_count = 'コメントを指定した数だけ表示し、それ以上はリスト化します。';
-
-    $lang->msg_cart_is_null = '削除するコメントを選択して下さい。';
-    $lang->msg_checked_comment_is_deleted = '%d個のコメントを削除しました。';
-
-    $lang->search_target_list = array(
-        'content' => '内容',
-        'user_id' => 'ユーザID',
-        'user_name' => '名前',
-        'nick_name' => 'ニックネーム',
-        'member_srl' => '会員番号',
-        'email_address' => 'メールアドレス',
-        'homepage' => 'ホームページURL',
-        'regdate' => '登録日',
-        'last_update' => '最終更新日 ',
-        'ipaddress' => 'IPアドレス',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/ko.lang.php b/modules/comment/lang/ko.lang.php
deleted file mode 100644
index 1c29e83c9..000000000
--- a/modules/comment/lang/ko.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  댓글(comment) 모듈의 기본 언어팩
-     **/
-	
-    $lang->cmd_comment_do = '이 댓글을...';
-
-    $lang->comment_list = '댓글 목록';
-    $lang->cmd_toggle_checked_comment = '선택항목 반전';
-    $lang->cmd_delete_checked_comment = '선택항목 삭제';
-
-    $lang->comment_count = '댓글 수';
-    $lang->about_comment_count = '댓글을 정해진 수 만큼만 표시하고 그 이상일 경우 목록으로 이동할 수 있게 합니다.';
-
-    $lang->msg_cart_is_null = '삭제할 글을 선택해주세요.';
-    $lang->msg_checked_comment_is_deleted = '%d개의 댓글이 삭제되었습니다.';
-
-    $lang->search_target_list = array(
-        'content' => '내용',
-        'user_id' => '아이디',
-        'user_name' => '이름',
-        'nick_name' => '닉네임',
-        'member_srl' => '회원 번호',
-        'email_address' => '이메일 주소',
-        'homepage' => '홈페이지',
-        'regdate' => '등록일',
-        'last_update' => '최근수정일 ',
-        'ipaddress' => 'IP 주소',
-    );
-
-	$lang->no_text_comment = '텍스트가 없는 댓글입니다.';
-?>
diff --git a/modules/comment/lang/lang.xml b/modules/comment/lang/lang.xml
new file mode 100644
index 000000000..5c3d2d856
--- /dev/null
+++ b/modules/comment/lang/lang.xml
@@ -0,0 +1,255 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_comment_do">
+		<value xml:lang="ko"><![CDATA[이 댓글을...]]></value>
+		<value xml:lang="en"><![CDATA[I want to]]></value>
+		<value xml:lang="jp"><![CDATA[このコメントを…]]></value>
+		<value xml:lang="zh-CN"><![CDATA[将把此评论..]]></value>
+		<value xml:lang="zh-TW"><![CDATA[將此評論..]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voudriez...]]></value>
+		<value xml:lang="ru"><![CDATA[Эту запись...]]></value>
+		<value xml:lang="es"><![CDATA[Usted ...]]></value>
+		<value xml:lang="tr"><![CDATA[Şunu yap]]></value>
+		<value xml:lang="vi"><![CDATA[Bình chọn / Phê bình]]></value>
+	</item>
+	<item name="comment_list">
+		<value xml:lang="ko"><![CDATA[댓글 목록]]></value>
+		<value xml:lang="en"><![CDATA[Comments List]]></value>
+		<value xml:lang="jp"><![CDATA[コメントリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[评论列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[評論列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Commentaires]]></value>
+		<value xml:lang="ru"><![CDATA[Список записей]]></value>
+		<value xml:lang="es"><![CDATA[Comentarios Lista]]></value>
+		<value xml:lang="tr"><![CDATA[Yorum Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách bình luận]]></value>
+	</item>
+	<item name="cmd_toggle_checked_comment">
+		<value xml:lang="ko"><![CDATA[선택항목 반전]]></value>
+		<value xml:lang="en"><![CDATA[Invert Selection]]></value>
+		<value xml:lang="jp"><![CDATA[選択項目の反転]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反選]]></value>
+		<value xml:lang="fr"><![CDATA[Renverser les choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить выбранное]]></value>
+	</item>
+	<item name="cmd_delete_checked_comment">
+		<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete selected item]]></value>
+		<value xml:lang="jp"><![CDATA[選択項目削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer les choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить выбранное]]></value>
+		<value xml:lang="es"><![CDATA[Eliminar lo seleccionado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili parçayı sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa những bình luận đã chọn]]></value>
+	</item>
+	<item name="trash">
+		<value xml:lang="ko"><![CDATA[휴지통]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
+	</item>
+	<item name="cmd_trash">
+		<value xml:lang="ko"><![CDATA[휴지통으로 이동]]></value>
+		<value xml:lang="en"><![CDATA[Move to Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱へ移動]]></value>
+	</item>
+	<item name="comment_count">
+		<value xml:lang="ko"><![CDATA[댓글 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメント数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[每页评论数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[每頁評論數]]></value>
+		<value xml:lang="fr"><![CDATA[Limite de Commentaires]]></value>
+		<value xml:lang="de"><![CDATA[Kommentare]]></value>
+		<value xml:lang="ru"><![CDATA[Количество ответов]]></value>
+		<value xml:lang="tr"><![CDATA[Yorum Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số bình luận]]></value>
+		<value xml:lang="mn"><![CDATA[Комментын тоо]]></value>
+	</item>
+	<item name="about_comment_count">
+		<value xml:lang="ko"><![CDATA[댓글을 정해진 수 만큼만 표시하고, 그 이상일 경우 페이지 번호를 표시해서 이동할 수 있게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Display comments and if the number of them is over a specified number, move to the comment list.]]></value>
+		<value xml:lang="jp"><![CDATA[コメントを指定した数だけ表示し、それ以上はリスト化します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定要显示的每页评论数。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定要顯示的每頁評論數。]]></value>
+		<value xml:lang="fr"><![CDATA[Quand il y a plus de commentaires, ils seront bougés sur le liste.]]></value>
+		<value xml:lang="ru"><![CDATA[Отображается указанное количество ответов, после превышения этого количества производится переход к списку.]]></value>
+		<value xml:lang="tr"><![CDATA[Yorumları, kullanıcının girdiği rakam kadar gösterin. Eğer yorum sayısı belirlenen sayıyı aşarsa, yorum Liste'ye taşınır.]]></value>
+		<value xml:lang="vi"><![CDATA[Hiển thị số bình luận được gửi, và nó sẽ tạo một danh sách nếu có nhiều bình luận.]]></value>
+	</item>
+	<item name="msg_cart_is_null">
+		<value xml:lang="ko"><![CDATA[삭제할 글을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select an article to delete.]]></value>
+		<value xml:lang="jp"><![CDATA[削除するコメントを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择要删除的评论。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的評論。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez un article à supprimer, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите записи для удаления.]]></value>
+		<value xml:lang="es"><![CDATA[Selecciona el commentario que desea eliminar]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen silinecek makaleyi seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy chọn một bài viết để xóa.]]></value>
+	</item>
+	<item name="msg_checked_comment_is_deleted">
+		<value xml:lang="ko"><![CDATA[%d개의 댓글을 삭제했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d comment(s) is(are) successfully deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[%d個のコメントを削除しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已删除%d个评论。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已刪除%d個評論。]]></value>
+		<value xml:lang="fr"><![CDATA[%d commentaire(s) est(sont) supprimé(s) avec succés.]]></value>
+		<value xml:lang="ru"><![CDATA[%d записьуспешно удалена]]></value>
+		<value xml:lang="es"><![CDATA[%d comentario eliminado correctamente.]]></value>
+		<value xml:lang="tr"><![CDATA[%d yorum başarıyla silindi.]]></value>
+		<value xml:lang="vi"><![CDATA[%d bình luận đã được xóa.]]></value>
+	</item>
+	<item name="search_target_list" type="array">
+		<item name="content">
+			<value xml:lang="ko"><![CDATA[내용]]></value>
+			<value xml:lang="en"><![CDATA[Content]]></value>
+			<value xml:lang="jp"><![CDATA[内容]]></value>
+			<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+			<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+			<value xml:lang="fr"><![CDATA[Contenu]]></value>
+			<value xml:lang="ru"><![CDATA[Содержание]]></value>
+			<value xml:lang="es"><![CDATA[Contenido]]></value>
+			<value xml:lang="tr"><![CDATA[İçerik]]></value>
+			<value xml:lang="vi"><![CDATA[Nội dung]]></value>
+		</item>
+		<item name="user_id">
+			<value xml:lang="ko"><![CDATA[아이디]]></value>
+			<value xml:lang="en"><![CDATA[ID]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザID]]></value>
+			<value xml:lang="zh-CN"><![CDATA[I D]]></value>
+			<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
+			<value xml:lang="fr"><![CDATA[Compte]]></value>
+			<value xml:lang="vi"><![CDATA[ID người gửi]]></value>
+		</item>
+		<item name="user_name">
+			<value xml:lang="ko"><![CDATA[이름]]></value>
+			<value xml:lang="en"><![CDATA[Name]]></value>
+			<value xml:lang="jp"><![CDATA[名前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
+			<value xml:lang="fr"><![CDATA[Nom]]></value>
+			<value xml:lang="ru"><![CDATA[Имя]]></value>
+			<value xml:lang="es"><![CDATA[Nombre]]></value>
+			<value xml:lang="tr"><![CDATA[İsim]]></value>
+			<value xml:lang="vi"><![CDATA[Tên]]></value>
+		</item>
+		<item name="nick_name">
+			<value xml:lang="ko"><![CDATA[닉네임]]></value>
+			<value xml:lang="en"><![CDATA[Nickname]]></value>
+			<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
+			<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
+			<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
+			<value xml:lang="fr"><![CDATA[Surnom]]></value>
+			<value xml:lang="ru"><![CDATA[Ник]]></value>
+			<value xml:lang="es"><![CDATA[Apodo]]></value>
+			<value xml:lang="tr"><![CDATA[Takma Ad]]></value>
+		</item>
+		<item name="member_srl">
+			<value xml:lang="ko"><![CDATA[회원 번호]]></value>
+			<value xml:lang="en"><![CDATA[Member Serial]]></value>
+			<value xml:lang="jp"><![CDATA[会員番号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[会员编号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[會員編號]]></value>
+			<value xml:lang="fr"><![CDATA[Numéro de Série du Membre]]></value>
+			<value xml:lang="ru"><![CDATA[Номер пользователя]]></value>
+			<value xml:lang="tr"><![CDATA[Üye Dizisi]]></value>
+			<value xml:lang="vi"><![CDATA[Mã số người gửi]]></value>
+		</item>
+		<item name="email_address">
+			<value xml:lang="ko"><![CDATA[이메일 주소]]></value>
+			<value xml:lang="en"><![CDATA[Email]]></value>
+			<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[电子信箱]]></value>
+			<value xml:lang="zh-TW"><![CDATA[電子信箱]]></value>
+			<value xml:lang="fr"><![CDATA[Mél]]></value>
+			<value xml:lang="ru"><![CDATA[Email адрес]]></value>
+			<value xml:lang="es"><![CDATA[Correo Electrónico]]></value>
+			<value xml:lang="tr"><![CDATA[E-posta]]></value>
+		</item>
+		<item name="homepage">
+			<value xml:lang="ko"><![CDATA[홈페이지]]></value>
+			<value xml:lang="en"><![CDATA[Homepage]]></value>
+			<value xml:lang="jp"><![CDATA[ホームページURL]]></value>
+			<value xml:lang="zh-CN"><![CDATA[主页]]></value>
+			<value xml:lang="zh-TW"><![CDATA[主頁]]></value>
+			<value xml:lang="fr"><![CDATA[Page d'Accueil]]></value>
+			<value xml:lang="ru"><![CDATA[Домашняя страница]]></value>
+			<value xml:lang="es"><![CDATA[Página web]]></value>
+			<value xml:lang="tr"><![CDATA[Anasayfa]]></value>
+			<value xml:lang="vi"><![CDATA[Trang chủ]]></value>
+		</item>
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[등록일]]></value>
+			<value xml:lang="en"><![CDATA[Date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[日期]]></value>
+			<value xml:lang="fr"><![CDATA[Jour]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+			<value xml:lang="es"><![CDATA[Fecha del registro]]></value>
+			<value xml:lang="tr"><![CDATA[Tarih]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày]]></value>
+		</item>
+		<item name="last_update">
+			<value xml:lang="ko"><![CDATA[최근수정일 ]]></value>
+			<value xml:lang="en"><![CDATA[Last update]]></value>
+			<value xml:lang="jp"><![CDATA[最終更新日 ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[最后更新 ]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最後更新]]></value>
+			<value xml:lang="fr"><![CDATA[Mise à Jour]]></value>
+			<value xml:lang="ru"><![CDATA[Дата последнего обновления]]></value>
+			<value xml:lang="es"><![CDATA[Ultima actualización]]></value>
+			<value xml:lang="tr"><![CDATA[Son Güncelleştirme]]></value>
+			<value xml:lang="vi"><![CDATA[Cập nhật lần cuối]]></value>
+		</item>
+		<item name="ipaddress">
+			<value xml:lang="ko"><![CDATA[IP 주소]]></value>
+			<value xml:lang="en"><![CDATA[IP Address]]></value>
+			<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
+			<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
+			<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
+			<value xml:lang="es"><![CDATA[Dirección IP]]></value>
+			<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+			<value xml:lang="vi"><![CDATA[IP]]></value>
+		</item>
+		<item name="is_secret">
+			<value xml:lang="ko"><![CDATA[상태]]></value>
+			<value xml:lang="en"><![CDATA[Status]]></value>
+			<value xml:lang="jp"><![CDATA[状態]]></value>
+		</item>
+	</item>
+	<item name="no_text_comment">
+		<value xml:lang="ko"><![CDATA[글자가 없는 댓글입니다.]]></value>
+		<value xml:lang="en"><![CDATA[No text in this comment.]]></value>
+		<value xml:lang="jp"><![CDATA[テキストのないコメントです。]]></value>
+		<value xml:lang="tr"><![CDATA[Bu yorumda herhangi bir metin yok.]]></value>
+	</item>
+	<item name="secret_name_list" type="array">
+		<item name="Y">
+			<value xml:lang="ko"><![CDATA[비밀]]></value>
+			<value xml:lang="en"><![CDATA[Secret]]></value>
+			<value xml:lang="jp"><![CDATA[非公開]]></value>
+		</item>
+		<item name="N">
+			<value xml:lang="ko"><![CDATA[공개]]></value>
+			<value xml:lang="en"><![CDATA[Public]]></value>
+			<value xml:lang="jp"><![CDATA[公開]]></value>
+		</item>
+	</item>
+	<item name="comment_manager">
+		<value xml:lang="ko"><![CDATA[선택한 댓글 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Selected Comment]]></value>
+		<value xml:lang="jp"><![CDATA[選択コメントを管理]]></value>
+	</item>
+	<item name="selected_comment">
+		<value xml:lang="ko"><![CDATA[선택한 댓글]]></value>
+		<value xml:lang="en"><![CDATA[Selected Comment]]></value>
+		<value xml:lang="jp"><![CDATA[選択したコメント]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/comment/lang/ru.lang.php b/modules/comment/lang/ru.lang.php
deleted file mode 100644
index 331c41b70..000000000
--- a/modules/comment/lang/ru.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-	
-    $lang->cmd_comment_do = 'Эту запись...';
-    
-    $lang->comment_list = 'Список записей';
-	$lang->cmd_toggle_checked_comment = 'Изменить выбранное';
-    $lang->cmd_delete_checked_comment = 'Удалить выбранное';
-
-    $lang->comment_count = 'Количество ответов';
-    $lang->about_comment_count = 'Отображается указанное количество ответов, после превышения этого количества производится переход к списку.';
-
-    $lang->msg_cart_is_null = 'Пожалуйста, выберите записи для удаления.';
-    $lang->msg_checked_comment_is_deleted = '%d записьуспешно удалена'; 
-
-    $lang->search_target_list = array(
-        'content' => 'Содержание',
-        'user_id' => 'ID',
-        'user_name' => 'Имя',
-        'nick_name' => 'Ник',
-        'member_srl' => 'Номер пользователя',
-        'email_address' => 'Email адрес',
-        'homepage' => 'Домашняя страница',
-        'regdate' => 'Дата регистрации',
-        'last_update' => 'Дата последнего обновления',
-        'ipaddress' => 'IP-адрес',	
-	);
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/tr.lang.php b/modules/comment/lang/tr.lang.php
deleted file mode 100644
index 56042e612..000000000
--- a/modules/comment/lang/tr.lang.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  comment module's basic language pack
-     **/
-	
-    $lang->cmd_comment_do = 'Şunu yap';
-    
-    $lang->comment_list = 'Yorum Listesi';
-    $lang->cmd_delete_checked_comment = 'Seçili parçayı sil';
-
-    $lang->comment_count = 'Yorum Sayısı';
-	$lang->about_comment_count = 'Yorumları, kullanıcının girdiği rakam kadar gösterin. Eğer yorum sayısı belirlenen sayıyı aşarsa, yorum Liste\'ye taşınır.';
-
-    $lang->msg_cart_is_null = 'Lütfen silinecek makaleyi seçiniz';
-    $lang->msg_checked_comment_is_deleted = '%d yorum başarıyla silindi.'; 
-
-    $lang->search_target_list = array(
-        'content' => 'İçerik',
-        'user_id' => 'ID',
-        'user_name' => 'İsim',
-        'nick_name' => 'Takma Ad',
-        'member_srl' => 'Üye Dizisi',
-        'email_address' => 'E-posta',
-        'homepage' => 'Anasayfa',
-        'regdate' => 'Tarih',
-        'last_update' => 'Son Güncelleştirme',
-        'ipaddress' => 'IP Adresi',
-    );
-
-	$lang->no_text_comment = 'Bu yorumda herhangi bir metin yok.';
-?>
diff --git a/modules/comment/lang/vi.lang.php b/modules/comment/lang/vi.lang.php
deleted file mode 100644
index a8c2629b5..000000000
--- a/modules/comment/lang/vi.lang.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-	
-    $lang->cmd_comment_do = 'Bình chọn / Phê bình';
-    
-    $lang->comment_list = 'Danh sách bình luận';
-    $lang->cmd_delete_checked_comment = 'Xóa những bình luận đã chọn';
-
-    $lang->comment_count = 'Số bình luận';
-	$lang->about_comment_count = 'Hiển thị số bình luận được gửi, và nó sẽ tạo một danh sách nếu có nhiều bình luận.';
-
-    $lang->msg_cart_is_null = 'Xin hãy chọn một bài viết để xóa.';
-    $lang->msg_checked_comment_is_deleted = '%d bình luận đã được xóa.'; 
-
-    $lang->search_target_list = array(
-        'content' => 'Nội dung',
-        'user_id' => 'ID người gửi',
-        'user_name' => 'Tên',
-        'nick_name' => 'Nickname',
-        'member_srl' => 'Mã số người gửi',
-        'email_address' => 'Email',
-        'homepage' => 'Trang chủ',
-        'regdate' => 'Ngày',
-        'last_update' => 'Cập nhật lần cuối',
-        'ipaddress' => 'IP',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/zh-CN.lang.php b/modules/comment/lang/zh-CN.lang.php
deleted file mode 100644
index b2cdf02ac..000000000
--- a/modules/comment/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  评论(comment)模块语言包
-     **/
-	
-    $lang->cmd_comment_do = '将把此评论..';
-    
-    $lang->comment_list = '评论列表';
-    $lang->cmd_toggle_checked_comment = '反选';
-    $lang->cmd_delete_checked_comment = '删除所选';
-
-    $lang->comment_count = '每页评论数';
-    $lang->about_comment_count = '可以指定要显示的每页评论数。';
-
-    $lang->msg_cart_is_null = '请选择要删除的评论。';
-    $lang->msg_checked_comment_is_deleted = '已删除%d个评论。';
-
-    $lang->search_target_list = array(
-        'content' => '内容',
-        'user_id' => 'I D',
-        'user_name' => '姓名',
-        'nick_name' => '昵称',
-        'member_srl' => '会员编号',
-        'email_address' => '电子信箱',
-        'homepage' => '主页',
-        'regdate' => '日期',
-        'last_update' => '最后更新 ',
-        'ipaddress' => 'IP 地址',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/lang/zh-TW.lang.php b/modules/comment/lang/zh-TW.lang.php
deleted file mode 100644
index 0048e4675..000000000
--- a/modules/comment/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/comment/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  評論(comment)模組正體中文語言
-     **/
-	
-    $lang->cmd_comment_do = '將此評論..';
-    
-    $lang->comment_list = '評論列表';
-    $lang->cmd_toggle_checked_comment = '反選';
-    $lang->cmd_delete_checked_comment = '刪除所選';
-
-    $lang->comment_count = '每頁評論數';
-    $lang->about_comment_count = '可以指定要顯示的每頁評論數。';
-
-    $lang->msg_cart_is_null = '請選擇要刪除的評論。';
-    $lang->msg_checked_comment_is_deleted = '已刪除%d個評論。';
-
-    $lang->search_target_list = array(
-        'content' => '內容',
-        'user_id' => '帳號',
-        'user_name' => '姓名',
-        'nick_name' => '暱稱',
-        'member_srl' => '會員編號',
-        'email_address' => '電子信箱',
-        'homepage' => '主頁',
-        'regdate' => '日期',
-        'last_update' => '最後更新',
-        'ipaddress' => 'IP位址',
-    );
-
-	$lang->no_text_comment = 'No text in this comment.';
-?>
diff --git a/modules/comment/queries/deleteCommentDeclaredLog.xml b/modules/comment/queries/deleteCommentDeclaredLog.xml
new file mode 100644
index 000000000..153caf2d4
--- /dev/null
+++ b/modules/comment/queries/deleteCommentDeclaredLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteCommentDeclaredLog" action="delete">
+    <tables>
+        <table name="comment_declared_log" />
+    </tables>
+    <conditions>
+        <condition operation="in" column="comment_srl" var="comment_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/comment/queries/deleteCommentVotedLog.xml b/modules/comment/queries/deleteCommentVotedLog.xml
new file mode 100644
index 000000000..06ac9b320
--- /dev/null
+++ b/modules/comment/queries/deleteCommentVotedLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteCommentVotedLog" action="delete">
+    <tables>
+        <table name="comment_voted_log" />
+    </tables>
+    <conditions>
+        <condition operation="in" column="comment_srl" var="comment_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/comment/queries/getCommentCount.xml b/modules/comment/queries/getCommentCount.xml
index 94b67c0ed..5d96a887f 100644
--- a/modules/comment/queries/getCommentCount.xml
+++ b/modules/comment/queries/getCommentCount.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
 		<condition operation="equal" column="document_srl" var="document_srl" filter="number" />        
-		<condition operation="equal" column="module_srl" var="module_srl" filter="number" pipe="and" />
+		<condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
+		<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/comment/queries/getTotalCommentCountByGroupStatus.xml b/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
new file mode 100644
index 000000000..a93002dea
--- /dev/null
+++ b/modules/comment/queries/getTotalCommentCountByGroupStatus.xml
@@ -0,0 +1,28 @@
+<query id="getTotalCommentList" action="select">
+    <tables>
+        <table name="comments" alias="comments" />
+    </tables>
+    <columns>
+        <column name="is_secret" />
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="s_module_srl" />
+        <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
+        <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="content" var="s_content" pipe="or" />
+            <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="email_address" var="s_email_address" pipe="or" />
+            <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
+            <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="last_update" var="s_last_upate" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
+    </conditions>
+	<groups>
+		<group column="is_secret" />
+	</groups>
+</query>
diff --git a/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml b/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
new file mode 100644
index 000000000..19b345da2
--- /dev/null
+++ b/modules/comment/queries/getTotalCommentCountWithinMemberByGroupStatus.xml
@@ -0,0 +1,28 @@
+<query id="getTotalCommentListWithinMember" action="select">
+    <tables>
+        <table name="comments" alias="comments" />
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="comments.is_secret" />
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="like" column="member.user_id" var="s_user_id" notnull="notnull" />
+        <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="comments.content" var="s_content" />
+            <condition operation="like" column="comments.user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="comments.nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="comments.email_address" var="s_email_address" pipe="or" />
+            <condition operation="like" column="comments.homepage" var="s_homepage" pipe="or" />
+            <condition operation="like_prefix" column="comments.regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="comments.last_update" var="s_last_upate" pipe="or" />
+            <condition operation="like_prefix" column="comments.ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
+    </conditions>
+	<groups>
+		<group column="comments.is_secret" />
+	</groups>
+</query>
diff --git a/modules/comment/queries/getTotalCommentList.xml b/modules/comment/queries/getTotalCommentList.xml
index 8e2bbd081..6c5da970b 100644
--- a/modules/comment/queries/getTotalCommentList.xml
+++ b/modules/comment/queries/getTotalCommentList.xml
@@ -1,6 +1,6 @@
 <query id="getTotalCommentList" action="select">
     <tables>
-        <table name="comments" />
+        <table name="comments" alias="comments" />
     </tables>
     <columns>
         <column name="*" />
@@ -8,6 +8,7 @@
     <conditions>
         <condition operation="in" column="module_srl" var="s_module_srl" />
         <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
+        <condition operation="equal" column="is_secret" var="s_is_secret" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="content" var="s_content" pipe="or" />
             <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
diff --git a/modules/comment/queries/getTotalCommentListWithinMember.xml b/modules/comment/queries/getTotalCommentListWithinMember.xml
index 3ba8771a5..4bc79087f 100644
--- a/modules/comment/queries/getTotalCommentListWithinMember.xml
+++ b/modules/comment/queries/getTotalCommentListWithinMember.xml
@@ -9,6 +9,7 @@
     <conditions>
         <condition operation="like" column="member.user_id" var="s_user_id" notnull="notnull" />
         <condition operation="equal" column="member.member_srl" var="comments.member_srl" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="comments.is_secret" var="s_is_secret" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="comments.content" var="s_content" />
             <condition operation="like" column="comments.user_name" var="s_user_name" pipe="or" />
diff --git a/modules/comment/ruleset/deleteChecked.xml b/modules/comment/ruleset/deleteChecked.xml
new file mode 100644
index 000000000..28789da2a
--- /dev/null
+++ b/modules/comment/ruleset/deleteChecked.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="cart" required="true"/>
+    </fields>
+</ruleset>
diff --git a/modules/comment/ruleset/insertCommentModuleConfig.xml b/modules/comment/ruleset/insertCommentModuleConfig.xml
new file mode 100644
index 000000000..bdd21ae8d
--- /dev/null
+++ b/modules/comment/ruleset/insertCommentModuleConfig.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="comment_count" required="true" rule="number"/>
+    </fields>
+</ruleset>
diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 061c5cdc1..4c595a22e 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -1,75 +1,154 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--#include("./header.html")-->
-
-<!-- 검색 -->
-<div class="fl">
-    <form action="./" method="get" class="adminSearch">
-    <input type="hidden" name="module" value="{$module}" />
-    <input type="hidden" name="act" value="{$act}" />
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-        <fieldset>
-            <select name="search_target">
-                <option value="">{$lang->search_target}</option>
-                <!--@foreach($lang->search_target_list as $key => $val)-->
-                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
-        </fieldset>
-    </form>
-</div>
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 모듈 선택 -->
-<div class="fr">
-    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
-    <span class="button red"><input type="submit" value="{$lang->cmd_delete_checked_comment}" /></span>
-</div>
-
-<!-- 목록 -->
-<table cellspacing="0" class="crossTable clear">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide"><div>{$lang->comment}</div></th>
-        <th scope="col"><div>{$lang->nick_name}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($comment_list as $no => $val)-->
-	{@ $comment = cut_str(trim(strip_tags($val->content)), 200, '...')}
-    <tr>
-        <td class="number center">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$val->comment_srl}" /></td>
-        <td class="left"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" onclick="window.open(this.href);return false;"><!--@if(strlen($comment))-->{$comment}<!--@else--><em style="font-style:italic;">{$lang->no_text_comment}</em><!--@end--></a></td>
-        <td class="nowrap"><span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span></td>
-        <td class="date center nowrap">{(zdate($val->regdate,"Y-m-d\nH:i:s"))}</td>
-        <td class="number left nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl',$module_srl)}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl',$module_srl)}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
+<script type="text/javascript">
+xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
+xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+</script>
+<load target="js/comment_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form id="fo_list" action="./" method="post" class="form">
+	<h1 class="h1">{$lang->comment}</h1>
+	<div class="table even">
+		<div class="cnb">
+			<a href="{getUrl('','act','dispCommentAdminList', 'Y')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>{$lang->all}</a>
+			| <a href="{getUrl('search_target','is_secret','search_keyword', 'N')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'N')-->class="active"<!--@end-->>{$secret_name_list['N']}</a>
+			| <a href="{getUrl('search_target','is_secret','search_keyword', 'Y')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$secret_name_list['Y']}</a>
+		</div>
+		<table width="100%" border="1" cellspacing="0" id="commentListTable">
+			<caption>
+				<!--@if($search_keyword == '')-->
+				{$lang->all}
+				<!--@elseif($search_target == 'is_secret' && $search_keyword == 'N')-->
+				{$secret_name_list['N']}
+				<!--@elseif($search_target == 'is_secret' && $search_keyword == 'Y')-->
+				{$secret_name_list['Y']}
+				<!--@end-->
+				({number_format($total_count)})
+				<div class="side">
+					<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getCommentList();">{$lang->comment_manager}...</a></span>
+				</div>
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col" class="text">{$lang->comment}</th>
+					<th scope="col">{$lang->writer}</th>
+					<th scope="col">{$lang->cmd_vote}(+/-)</th>
+					<th scope="col">{$lang->date}</th>
+					<th scope="col">{$lang->ipaddress}</th>
+					<th scope="col">{$lang->status}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<th scope="col" class="text">{$lang->comment}</th>
+					<th scope="col">{$lang->writer}</th>
+					<th scope="col">{$lang->cmd_vote}(+/-)</th>
+					<th scope="col">{$lang->date}</th>
+					<th scope="col">{$lang->ipaddress}</th>
+					<th scope="col">{$lang->status}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</tfoot>
+			<tbody>
+				<!--@foreach($comment_list as $no => $val)-->
+				{@ $comment = cut_str(trim(strip_tags($val->content)), 200, '...')}
+				<tr>
+					<td class="text"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" target="_blank"><!--@if(strlen($comment))-->{$comment}<!--@else--><em>{$lang->no_text_comment}</em><!--@end--></a></td>
+					<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
+					<td>0/0</td>
+					<td>{(zdate($val->regdate,"Y-m-d\nH:i:s"))}</td>
+					<td><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
+					<td><!--@if($val->isSecret())-->{$secret_name_list['Y']}<!--@else-->{$secret_name_list['N']}<!--@end--></td>
+					<td><input type="checkbox" name="cart" value="{$val->comment_srl}" /></td>
+				</tr>
+				<!--@end-->
+			</tbody>
+		</table>
+		<div class="btnArea">
+			<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getCommentList();">{$lang->comment_manager}...</a></span>
+		</div>
+	</div>
+</form>
+<div class="modal" id="listManager">
+	<form ruleset="deleteChecked" action="./" method="post" class="fg form">
+	<input type="hidden" name="module" value="comment" />
+	<input type="hidden" name="act" value="procCommentAdminDeleteChecked" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="is_trash" value="false" />
+	<input type="hidden" name="search_target" value="{$search_target}" />
+	<input type="hidden" name="search_keyword" value="{$search_keyword}" />
+		<h2 class="h2">{$lang->comment_manager}</h2>
+		<div class="table even">
+			<table width="100%" border="1" cellspacing="0" id="commentManageListTable">
+				<caption>
+				{$lang->selected_comment} <strong id="selectedCommentCount"></strong>
+				</caption>
+				<thead>
+					<tr>
+						<th scope="col" class="title">{$lang->comment}</th>
+						<th scope="col">{$lang->writer}</th>
+						<th scope="col">{$lang->status}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+		</div>
+		<p class="q"><label for="message">{$lang->message_notice}</label></p>
+		<p>
+			<textarea cols="42" rows="3" name="message_content" id="message" style="width:98%"></textarea>
+		</p>
+		<div class="btnArea">
+			<span class="btn"><button type="submit" name="is_trash" value="true">{$lang->cmd_trash}</button></span>
+			<span class="btn"><button type="submit" name="is_trash" value="false">{$lang->cmd_delete}</button></span>
+		</div>
+	</form>
+</div>
+<div class="search">
+<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+</form>
+
+	<form action="./" method="get" class="adminSearch" onsubmit="return checkSearch(this)">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="error_return_url" value="" />
+		<select name="search_target">
+			<option value="">{$lang->search_target}</option>
+			<!--@foreach($lang->search_target_list as $key => $val)-->
+			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+			<!--@end-->
+		</select>
+		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+		<input type="submit" value="{$lang->cmd_search}" />
+		<a href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
+	</form>
+</div>
diff --git a/modules/comment/tpl/comment_module_config.html b/modules/comment/tpl/comment_module_config.html
index 9dea33f29..b6b2e6443 100644
--- a/modules/comment/tpl/comment_module_config.html
+++ b/modules/comment/tpl/comment_module_config.html
@@ -1,44 +1,41 @@
-<!--%import("filter/insert_comment_module_config.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_comment_module_config)">
-<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
-
-    <h4 class="xeAdmin">{$lang->comment}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>    
-        <th><div>{$lang->comment_count}</div></th>
-        <td class="wide">
-			<p>{$lang->about_comment_count}</p>
-            <input type="text" name="comment_count" value="{$comment_config->comment_count}" class="inputTypeText w80" />
-
-        </td>
-    </tr>
-    <tr>    
-        <th><div>{$lang->cmd_vote}</div></th>
-        <td>
-		    <select name="use_vote_up" class="w100">
-                <option value="Y" <!--@if($comment_config->use_vote_up=='Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="S" <!--@if($comment_config->use_vote_up=='S')-->selected="selected"<!--@end-->>{$lang->show_voted_member}</option>
-                <option value="N" <!--@if($comment_config->use_vote_up=='N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-            </select>
-        </td>
-    </tr>
-    <tr>    
-        <th><div>{$lang->cmd_vote_down}</div></th>
-        <td>
-		    <select name="use_vote_down" class="w100">
-                <option value="Y" <!--@if($comment_config->use_vote_down=='Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="S" <!--@if($comment_config->use_vote_down=='S')-->selected="selected"<!--@end-->>{$lang->show_voted_member}</option>
-                <option value="N" <!--@if($comment_config->use_vote_down=='N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-            </select>
-        </td>
-    </tr>
-
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span>
-        </th>
-    </tr>
-    </table>
-
+<form ruleset="insertCommentModuleConfig" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="comment" />
+	<input type="hidden" name="act" value="procCommentInsertModuleConfig" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+    <h3 class="h3">{$lang->comment}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>    
+				<th scope="row"><label for="comment_count">{$lang->comment_count}</label></th>
+				<td class="text">
+					<input type="text" name="comment_count" id="comment_count" value="{$comment_config->comment_count}" style="width:30px" />
+					<span class="desc">{$lang->about_comment_count}</span>
+				</td>
+			</tr>
+			<tr>    
+				<th scope="row"><label for="use_vote_up">{$lang->cmd_vote}</label></th>
+				<td class="text">
+					<select name="use_vote_up" id="use_vote_up">
+						<option value="Y" selected="selected"|cond="$comment_config->use_vote_up=='Y'">{$lang->use}</option>
+						<option value="S" selected="selected"|cond="$comment_config->use_vote_up=='S'">{$lang->use_and_display}</option>
+						<option value="N" selected="selected"|cond="$comment_config->use_vote_up=='N'">{$lang->notuse}</option>
+					</select>
+				</td>
+			</tr>
+			<tr>    
+				<th scope="row"><label for="use_vote_down">{$lang->cmd_vote_down}</label></th>
+				<td class="text">
+					<select name="use_vote_down" id="use_vote_down">
+						<option value="Y" selected="selected"|cond="$comment_config->use_vote_down=='Y'">{$lang->use}</option>
+						<option value="S" selected="selected"|cond="$comment_config->use_vote_down=='S'">{$lang->use_and_display}</option>
+						<option value="N" selected="selected"|cond="$comment_config->use_vote_down=='N'">{$lang->notuse}</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+	</div>
 </form>
diff --git a/modules/comment/tpl/declared_list.html b/modules/comment/tpl/declared_list.html
index aaa6990a5..36fc0d5d4 100644
--- a/modules/comment/tpl/declared_list.html
+++ b/modules/comment/tpl/declared_list.html
@@ -1,55 +1,61 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--#include("header.html")-->
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 목록 -->
-<table cellspacing="0" class="crossTable">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide"><div>{$lang->comment}</div></th>
-        <th scope="col"><div>{$lang->user_name}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->cmd_declare}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($comment_list as $no => $oComment)-->
-    <tr>
-        <td>{$no}</td>
-        <td><input type="checkbox" name="cart" value="{$oComment->get('comment_srl')}" /> <a href="{getUrl('','document_srl',$oComment->get('document_srl'))}#comment_{$oComment->get('comment_srl')}" onclick="window.open(this.href);return false;">{$oComment->getSummary(100)}</a></td>
-        <td><span class="member_{$oComment->getMemberSrl()}">{$oComment->getNickName()}</span></td>
-        <td>{$oComment->getRegdate("Y-m-d")}</td>
-        <td><strong>{$oComment->get('declared_count')}</strong></td>
-        <td>{$oComment->get('ipaddress')}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="6" class="button">
-            <a href="#" onclick="doCancelDeclare();return false;" class="button strong black"><span>{$lang->cmd_cancel_declare}</span></a>
-            <a href="javascript:XE.checkboxToggleAll({ checked:true })" class="button"><span>{$lang->cmd_select_all}</span></a>
-            <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-            <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_comment}" /></span>
-        </th>
-    </tr>
-</tbody>
-</table>
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="clear"></div>
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<!--#include("header.html")-->
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="deleteChecked" id="fo_list" action="./" method="post">
+	<input type="hidden" name="module" value="comment" />
+	<input type="hidden" name="act" value="procCommentAdminDeleteChecked" />
+	<input type="hidden" value="{getUrl('', 'module', $module, 'act', $act)}" name="success_return_url">
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="is_trash" value="false" />
+	
+	<!-- 목록 -->
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+		<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+		<thead>
+			<tr>
+				<th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></th>
+				<th scope="col">{$lang->comment}</th>
+				<th scope="col">{$lang->user_name}</th>
+				<th scope="col">{$lang->date}</th>
+				<th scope="col">{$lang->cmd_declare}</th>
+				<th scope="col">{$lang->ipaddress}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($comment_list as $no => $oComment)-->
+			<tr>
+				<td>{$no}</td>
+				<td><input type="checkbox" name="cart" value="{$oComment->get('comment_srl')}" /> <a href="{getUrl('','document_srl',$oComment->get('document_srl'))}#comment_{$oComment->get('comment_srl')}" onclick="window.open(this.href);return false;">{$oComment->getSummary(100)}</a></td>
+				<td><span class="member_{$oComment->getMemberSrl()}">{$oComment->getNickName()}</span></td>
+				<td>{$oComment->getRegdate("Y-m-d")}</td>
+				<td><strong>{$oComment->get('declared_count')}</strong></td>
+				<td>{$oComment->get('ipaddress')}</td>
+			</tr>
+			<!--@end-->
+		</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><button type="button" onclick="doCancelDeclare();">{$lang->cmd_cancel_declare}</button></span>
+		<span class="btn"><a href="javascript:XE.checkboxToggleAll({ checked:true })">{$lang->cmd_select_all}</a></span>
+		<span class="btn"><a href="javascript:XE.checkboxToggleAll()">{$lang->cmd_reverse_all}</a></span>
+		<span class="btn"><input type="submit" value="{$lang->cmd_delete_checked_comment}" onclick="this.form.is_trash.value=false" /></span>
+		<span class="btn"><input type="submit" name="trash" value="{$lang->cmd_trash}" onclick="this.form.is_trash.value=true" /></span>
+	</div>
+</form>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
diff --git a/modules/comment/tpl/header.html b/modules/comment/tpl/header.html
index 0c77ba665..40b1b9b98 100644
--- a/modules/comment/tpl/header.html
+++ b/modules/comment/tpl/header.html
@@ -1,4 +1,4 @@
-<!--%import("js/comment_admin.js")-->
+<load target="js/comment_admin.js" usecdn="true" />
 
 <h3 class="xeAdmin">{$lang->comment} <span class="gray">{$lang->cmd_management}</span></h3>
 
diff --git a/modules/comment/tpl/js/comment_admin.js b/modules/comment/tpl/js/comment_admin.js
index 7c964af60..b02e83a04 100644
--- a/modules/comment/tpl/js/comment_admin.js
+++ b/modules/comment/tpl/js/comment_admin.js
@@ -16,3 +16,66 @@ function doCancelDeclare() {
 function insertSelectedModule(id, module_srl, mid, browser_title) {
     location.href = current_url.setQuery('module_srl',module_srl);
 }
+
+function completeAddCart(ret_obj, response_tags)
+{
+}
+
+function getCommentList()
+{
+	var commentListTable = jQuery('#commentListTable');
+	var cartList = [];
+	commentListTable.find(':checkbox[name=cart]').each(function(){
+		if(this.checked) cartList.push(this.value); 
+	});
+
+    var params = new Array();
+    var response_tags = ['error','message', 'comment_list'];
+	params["comment_srls"] = cartList.join(",");
+
+    exec_xml('comment','procCommentGetList',params, completeGetCommentList, response_tags);
+}
+
+function completeGetCommentList(ret_obj, response_tags)
+{
+	var htmlListBuffer = '';
+	var statusNameList = {"N":"Public", "Y":"Secret"};
+
+	if(ret_obj['comment_list'] == null)
+	{
+		htmlListBuffer = '<tr>' +
+							'<td colspan="3" style="text-align:center;">'+ret_obj['message']+'</td>' +
+						'</tr>';
+	}
+	else
+	{
+		var comment_list = ret_obj['comment_list']['item'];
+		if(!jQuery.isArray(comment_list)) comment_list = [comment_list];
+		for(var x in comment_list)
+		{
+			var objComment = comment_list[x];
+			htmlListBuffer += '<tr>' +
+								'<td class="title">'+ objComment.content +'</td>' +
+								'<td>'+ objComment.nick_name +'</td>' +
+								'<td>'+ statusNameList[objComment.is_secret] +'</td>' +
+							'</tr>' +
+							'<input type="hidden" name="cart[]" value="'+objComment.comment_srl+'" />';
+		}
+		jQuery('#selectedCommentCount').html(comment_list.length);
+	}
+	jQuery('#commentManageListTable>tbody').html(htmlListBuffer);
+}
+
+function checkSearch(form)
+{
+	if(form.search_target.value == '')
+	{
+		alert(xe.lang.msg_empty_search_target);
+		return false;
+	}
+	if(form.search_keyword.value == '')
+	{
+		alert(xe.lang.msg_empty_search_keyword);
+		return false;
+	}
+}
diff --git a/modules/communication/communication.admin.controller.php b/modules/communication/communication.admin.controller.php
index 9dfdf0c11..1066b38cb 100644
--- a/modules/communication/communication.admin.controller.php
+++ b/modules/communication/communication.admin.controller.php
@@ -1,35 +1,39 @@
-<?php
-    /**
-     * @class  communicationAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 admin controller class
-     **/
-
-    class communicationAdminController extends communication {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief communication 모듈 설정 저장
-         **/
-        function procCommunicationAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args = Context::gets('skin','colorset','editor_skin','editor_colorset');
-
-            if(!$args->skin) $args->skin = "default";
-            if(!$args->colorset) $args->colorset = "white";
-            if(!$args->editor_skin) $args->editor_skin = "default";
-
-            // module Controller 객체 생성하여 입력
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('communication',$args);
-
-            return $output;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  communicationAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief communication module of the admin controller class
+     **/
+
+    class communicationAdminController extends communication {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief save configurations of the communication module
+         **/
+        function procCommunicationAdminInsertConfig() {
+            // get the default information
+            $args = Context::gets('skin','colorset','editor_skin','editor_colorset');
+
+            if(!$args->skin) $args->skin = "default";
+            if(!$args->colorset) $args->colorset = "white";
+            if(!$args->editor_skin) $args->editor_skin = "default";
+            // create the module module Controller object
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('communication',$args);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispCommunicationAdminConfig');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+			else return $output;
+        }
+
+    }
+?>
diff --git a/modules/communication/communication.admin.model.php b/modules/communication/communication.admin.model.php
index 73eae18a9..87967fca5 100644
--- a/modules/communication/communication.admin.model.php
+++ b/modules/communication/communication.admin.model.php
@@ -1,44 +1,44 @@
-<?php
-    /**
-     * @class  communicationAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 admin model class
-     **/
-
-    class communicationAdminModel extends communication {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 지정된 스킨의 컬러셋 선택을 위한 html을 return
-         **/
-        function getCommunicationAdminColorset() {
-            $skin = Context::get('skin');
-            if(!$skin) $tpl = "";
-            else {
-                $oModuleModel = &getModel('module');
-                $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-                Context::set('skin_info', $skin_info);
-
-                $oModuleModel = &getModel('module');
-                $communication_config = $oModuleModel->getModuleConfig('communication');
-                if(!$communication_config->colorset) $communication_config->colorset = "white";
-                Context::set('communication_config', $communication_config);
-				
-				$security = new Security();
-				$security->encodeHTML('skin_info.colorset..title','skin_info.colorset..name');
-				$security->encodeHTML('skin_info.colorset..name');
-
-                $oTemplate = &TemplateHandler::getInstance();
-                $tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
-            }
-
-            $this->add('tpl', $tpl);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  communicationAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief communication module of the admin model class
+     **/
+
+    class communicationAdminModel extends communication {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief return the html to select colorset of the skin
+         **/
+        function getCommunicationAdminColorset() {
+            $skin = Context::get('skin');
+            if(!$skin) $tpl = "";
+            else {
+                $oModuleModel = &getModel('module');
+                $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
+                Context::set('skin_info', $skin_info);
+
+                $oModuleModel = &getModel('module');
+                $communication_config = $oModuleModel->getModuleConfig('communication');
+                if(!$communication_config->colorset) $communication_config->colorset = "white";
+                Context::set('communication_config', $communication_config);
+				
+				$security = new Security();
+				$security->encodeHTML('skin_info.colorset..title','skin_info.colorset..name');
+				$security->encodeHTML('skin_info.colorset..name');
+
+                $oTemplate = &TemplateHandler::getInstance();
+                $tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
+            }
+
+            $this->add('tpl', $tpl);
+        }
+
+    }
+?>
diff --git a/modules/communication/communication.admin.view.php b/modules/communication/communication.admin.view.php
index 65c1311b9..c45f37ccc 100644
--- a/modules/communication/communication.admin.view.php
+++ b/modules/communication/communication.admin.view.php
@@ -1,45 +1,41 @@
-<?php
-    /**
-     * @class  communicationAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 admin view class
-     **/
-
-    class communicationAdminView extends communication {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 쪽지 및 친구등의 관리를 위한 설정
-         **/
-        function dispCommunicationAdminConfig() {
-            // 객체 생성
-            $oEditorModel = &getModel('editor');
-            $oModuleModel = &getModel('module');
-            $oCommunicationModel = &getModel('communication');
-
-            // communication 모듈의 모듈설정 읽음
-            Context::set('communication_config', $oCommunicationModel->getConfig() );
-
-            // 에디터 스킨 목록을 구함
-            Context::set('editor_skin_list', $oEditorModel->getEditorSkinList() );
-
-            // 커뮤니케이션 스킨 목록을 구함
-            Context::set('communication_skin_list', $oModuleModel->getSkins($this->module_path) );
-			
-			$security = new Security();		
-			$security->encodeHTML('communication_config..');
-			$security->encodeHTML('editor_skin_list..');
-			$security->encodeHTML('communication_skin_list..title');			
-
-            // template 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('index');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  communicationAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief communication module of the admin view class
+     **/
+
+    class communicationAdminView extends communication {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief configuration to manage messages and friends
+         **/
+        function dispCommunicationAdminConfig() {
+            // Creating an object
+            $oEditorModel = &getModel('editor');
+            $oModuleModel = &getModel('module');
+            $oCommunicationModel = &getModel('communication');
+            // get the configurations of communication module
+            Context::set('communication_config', $oCommunicationModel->getConfig() );
+            // get a list of editor skins
+            Context::set('editor_skin_list', $oEditorModel->getEditorSkinList() );
+            // get a list of communication skins
+            Context::set('communication_skin_list', $oModuleModel->getSkins($this->module_path) );
+			$security = new Security();		
+			$security->encodeHTML('communication_config..');
+			$security->encodeHTML('editor_skin_list..');
+			$security->encodeHTML('communication_skin_list..title');			
+
+			// specify a template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('index');
+        }
+
+    }
+?>
diff --git a/modules/communication/communication.class.php b/modules/communication/communication.class.php
index caec94eb5..075dc57a6 100644
--- a/modules/communication/communication.class.php
+++ b/modules/communication/communication.class.php
@@ -1,42 +1,42 @@
-<?php
-    /**
-     * @class  communication 
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 high class
-     **/
-
-    class communication extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // 새쪽지 알림을 위한 임시 파일 저장소 생성
-            FileHandler::makeDir('./files/member_extra_info/new_message_flags');
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            if(!is_dir("./files/member_extra_info/new_message_flags")) return true;
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            if(!is_dir("./files/member_extra_info/new_message_flags")) 
-                FileHandler::makeDir('./files/member_extra_info/new_message_flags');
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  communication 
+     * @author NHN (developers@xpressengine.com)
+     * @brief communication module of the high class
+     **/
+
+    class communication extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Create a temporary file storage for one new private message notification
+            FileHandler::makeDir('./files/member_extra_info/new_message_flags');
+            return new Object();
+        }
+
+        /**
+         * @brief method to check if successfully installed.
+         **/
+        function checkUpdate() {
+            if(!is_dir("./files/member_extra_info/new_message_flags")) return true;
+            return false;
+        }
+
+        /**
+         * @brief Update
+         **/
+        function moduleUpdate() {
+            if(!is_dir("./files/member_extra_info/new_message_flags")) 
+                FileHandler::makeDir('./files/member_extra_info/new_message_flags');
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/communication/communication.controller.php b/modules/communication/communication.controller.php
index 15ebfa1af..1c3066901 100644
--- a/modules/communication/communication.controller.php
+++ b/modules/communication/communication.controller.php
@@ -1,418 +1,454 @@
-<?php
-    /**
-     * @class  communicationController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 Controller class
-     **/
-
-    class communicationController extends communication {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 쪽지함 설정 변경
-         **/
-        function procCommunicationUpdateAllowMessage() {
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-
-            $args->allow_message = Context::get('allow_message');
-            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
-
-            $logged_info = Context::get('logged_info');
-            $args->member_srl = $logged_info->member_srl;
-
-            $output = executeQuery('communication.updateAllowMessage', $args);
-
-            return $output;
-        }
-
-        /**
-         * @brief 쪽지 발송
-         **/
-        function procCommunicationSendMessage() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 검사
-            $receiver_srl = Context::get('receiver_srl');
-            if(!$receiver_srl) return new Object(-1, 'msg_not_exists_member');
-
-            $title = trim(Context::get('title'));
-            if(!$title) return new Object(-1, 'msg_title_is_null');
-
-            $content = trim(Context::get('content'));
-            if(!$content) return new Object(-1, 'msg_content_is_null');
-
-            $send_mail = Context::get('send_mail');
-            if($send_mail != 'Y') $send_mail = 'N';
-
-            // 받을 회원이 있는지에 대한 검사
-            $oMemberModel = &getModel('member');
-            $oCommunicationModel = &getModel('communication');
-            $receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-            if($receiver_member_info->member_srl != $receiver_srl) return new Object(-1, 'msg_not_exists_member');
-
-            // 받을 회원의 쪽지 수신여부 검사 (최고관리자이면 패스)
-            if($logged_info->is_admin != 'Y') {
-                if($receiver_member_info->allow_message == 'F') {
-                    if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl)) return new object(-1, 'msg_allow_message_to_friend');
-                } elseif($receiver_member_info->allow_messge == 'N') {
-                    return new object(-1, 'msg_disallow_message');
-                }
-            }
-
-            // 쪽지 발송
-            $output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
-
-            // 메일로도 발송
-            if($output->toBool() && $send_mail == 'Y') {
-                $view_url = Context::getRequestUri();
-                $content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>",$content, $view_url, $view_url);
-                $oMail = new Mail();
-                $oMail->setTitle($title);
-                $oMail->setContent($content);
-                $oMail->setSender($logged_info->user_name, $logged_info->email_address);
-                $oMail->setReceiptor($receiver_member_info->user_name, $receiver_member_info->email_address);
-                $oMail->send();
-            }
-
-            return $output;
-        }
-
-        function sendMessage($sender_srl, $receiver_srl, $title, $content, $sender_log = true) {
-            $content = removeHackTag($content); 
-			$title = htmlspecialchars($title);
-
-            // 보내는 사용자의 쪽지함에 넣을 쪽지
-            $sender_args->sender_srl = $sender_srl;
-            $sender_args->receiver_srl = $receiver_srl;
-            $sender_args->message_type = 'S';
-            $sender_args->title = $title;
-            $sender_args->content = $content;
-            $sender_args->readed = 'N';
-            $sender_args->regdate = date("YmdHis");
-            $sender_args->related_srl = getNextSequence();
-            $sender_args->message_srl = getNextSequence();
-            $sender_args->list_order = getNextSequence()*-1;
-
-            // 받는 회원의 쪽지함에 넣을 쪽지
-            $receiver_args->message_srl = $sender_args->related_srl;
-            $receiver_args->related_srl = 0;
-            $receiver_args->list_order = $sender_args->related_srl*-1;
-            $receiver_args->sender_srl = $sender_srl;
-            if(!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
-            $receiver_args->receiver_srl = $receiver_srl;
-            $receiver_args->message_type = 'R';
-            $receiver_args->title = $title;
-            $receiver_args->content = $content;
-            $receiver_args->readed = 'N';
-            $receiver_args->regdate = date("YmdHis");
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 발송하는 회원의 쪽지함에 넣을 쪽지
-            if($sender_srl && $sender_log) {
-                $output = executeQuery('communication.sendMessage', $sender_args);
-                if(!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-            }
-
-            // 받을 회원의 쪽지함에 넣을 쪽지
-            $output = executeQuery('communication.sendMessage', $receiver_args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 받는 회원의 쪽지 발송 플래그 생성 (파일로 생성)
-            $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($receiver_srl);
-            FileHandler::makeDir($flag_path);
-            $flag_file = sprintf('%s%s', $flag_path, $receiver_srl);
-			$flag_count = FileHandler::readFile($flag_file);
-            FileHandler::writeFile($flag_file, ++$flag_count);
-
-            $oDB->commit();
-
-            return new Object(0,'success_sended');
-        }
-
-        /**
-         * @brief 특정 쪽지를 보관함으로 보냄
-         **/
-        function procCommunicationStoreMessage() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 체크
-            $message_srl = Context::get('message_srl');
-            if(!$message_srl) return new Object(-1,'msg_invalid_request');
-
-            // 쪽지를 가져옴
-            $oCommunicationModel = &getModel('communication');
-            $message = $oCommunicationModel->getSelectedMessage($message_srl);
-            if(!$message || $message->message_type != 'R') return new Object(-1,'msg_invalid_request');
-
-            $args->message_srl = $message_srl;
-            $args->receiver_srl = $logged_info->member_srl;
-            $output = executeQuery('communication.setMessageStored', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 쪽지 삭제
-         **/
-        function procCommunicationDeleteMessage() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            // 변수 체크
-            $message_srl = Context::get('message_srl');
-            if(!$message_srl) return new Object(-1,'msg_invalid_request');
-
-            // 쪽지를 가져옴
-            $oCommunicationModel = &getModel('communication');
-            $message = $oCommunicationModel->getSelectedMessage($message_srl);
-            if(!$message) return new Object(-1,'msg_invalid_request');
-
-            // 발송인+type=S or 수신인+type=R 검사
-            if($message->sender_srl == $member_srl && $message->message_type == 'S') {
-                if(!$message_srl) return new Object(-1, 'msg_invalid_request');
-            } elseif($message->receiver_srl == $member_srl && $message->message_type == 'R') {
-                if(!$message_srl) return new Object(-1, 'msg_invalid_request');
-            }
-
-            // 삭제
-            $args->message_srl = $message_srl;
-            $output = executeQuery('communication.deleteMessage', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 선택된 다수의 쪽지 삭제
-         **/
-        function procCommunicationDeleteMessages() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            // 변수 체크
-            $message_srl_list = trim(Context::get('message_srl_list'));
-            if(!$message_srl_list) return new Object(-1, 'msg_cart_is_null');
-
-            $message_srl_list = explode('|@|', $message_srl_list);
-            if(!count($message_srl_list)) return new Object(-1, 'msg_cart_is_null');
-
-            $message_type = Context::get('message_type');
-            if(!$message_type || !in_array($message_type, array('R','S','T'))) return new Object(-1, 'msg_invalid_request');
-
-            $message_count = count($message_srl_list);
-            $target = array();
-            for($i=0;$i<$message_count;$i++) {
-                $message_srl = (int)trim($message_srl_list[$i]);
-                if(!$message_srl) continue;
-                $target[] = $message_srl;
-            }
-            if(!count($target)) return new Object(-1,'msg_cart_is_null');
-
-            // 삭제
-            $args->message_srls = implode(',',$target);
-            $args->message_type = $message_type;
-
-            if($message_type == 'S') $args->sender_srl = $member_srl;
-            else $args->receiver_srl = $member_srl;
-
-            $output = executeQuery('communication.deleteMessages', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 친구 추가
-         **/
-        function procCommunicationAddFriend() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            $target_srl = (int)trim(Context::get('target_srl'));
-            if(!$target_srl) return new Object(-1,'msg_invalid_request');
-
-            // 변수 정리
-            $args->friend_srl = getNextSequence();
-            $args->list_order = $args->friend_srl * -1;
-            $args->friend_group_srl = Context::get('friend_group_srl');
-            $args->member_srl = $logged_info->member_srl;
-            $args->target_srl = $target_srl;
-            $output = executeQuery('communication.addFriend', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->add('member_srl', $target_srl);
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 등록된 친구의 그룹 이동
-         **/
-        function procCommunicationMoveFriend() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 체크
-            $friend_srl_list = trim(Context::get('friend_srl_list'));
-            if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
-
-            $friend_srl_list = explode('|@|', $friend_srl_list);
-            if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
-
-            $friend_count = count($friend_srl_list);
-            $target = array();
-            for($i=0;$i<$friend_count;$i++) {
-                $friend_srl = (int)trim($friend_srl_list[$i]);
-                if(!$friend_srl) continue;
-                $target[] = $friend_srl;
-            }
-            if(!count($target)) return new Object(-1,'msg_cart_is_null');
-
-            // 변수 정리
-            $args->friend_srls = implode(',',$target);
-            $args->member_srl = $logged_info->member_srl;
-            $args->friend_group_srl = Context::get('target_friend_group_srl');
-
-            $output = executeQuery('communication.moveFriend', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_moved');
-        }
-
-        /**
-         * @brief 친구 삭제
-         **/
-        function procCommunicationDeleteFriend() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            // 변수 체크
-            $friend_srl_list = trim(Context::get('friend_srl_list'));
-            if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
-
-            $friend_srl_list = explode('|@|', $friend_srl_list);
-            if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
-
-            $friend_count = count($friend_srl_list);
-            $target = array();
-            for($i=0;$i<$friend_count;$i++) {
-                $friend_srl = (int)trim($friend_srl_list[$i]);
-                if(!$friend_srl) continue;
-                $target[] = $friend_srl;
-            }
-            if(!count($target)) return new Object(-1,'msg_cart_is_null');
-
-            // 삭제
-            $args->friend_srls = implode(',',$target);
-            $args->member_srl = $logged_info->member_srl;
-            $output = executeQuery('communication.deleteFriend', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 친구 그룹 추가
-         **/
-        function procCommunicationAddFriendGroup() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 정리
-            $args->friend_group_srl = trim(Context::get('friend_group_srl'));
-            $args->member_srl = $logged_info->member_srl;
-            $args->title = Context::get('title'); 
-			$args->title = htmlspecialchars($args->title);
-            if(!$args->title) return new Object(-1, 'msg_invalid_request');
-
-            // friend_group_srl이 있으면 수정
-            if($args->friend_group_srl) {
-                $output = executeQuery('communication.renameFriendGroup', $args);
-                $msg_code = 'success_updated';
-
-            // 아니면 입력
-            } else {
-                $output = executeQuery('communication.addFriendGroup', $args);
-                $msg_code = 'success_registed';
-            }
-
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 친구 그룹 이름 변경
-         **/
-        function procCommunicationRenameFriendGroup() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 정리
-            $args->friend_group_srl= Context::get('friend_group_srl');
-            $args->member_srl = $logged_info->member_srl;
-            $args->title = Context::get('title'); 
-			$args->title = htmlspecialchars($args->title);
-            if(!$args->title) return new Object(-1, 'msg_invalid_request');
-
-            $output = executeQuery('communication.renameFriendGroup', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 친구 그룹 삭제
-         **/
-        function procCommunicationDeleteFriendGroup() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 정리
-            $args->friend_group_srl = Context::get('friend_group_srl');
-            $args->member_srl = $logged_info->member_srl;
-            $output = executeQuery('communication.deleteFriendGroup', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 특정 쪽지의 상태를 읽은 상태로 변경
-         **/
-        function setMessageReaded($message_srl) {
-            $args->message_srl = $message_srl;
-            $args->related_srl = $message_srl;
-            return executeQuery('communication.setMessageReaded', $args);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  communicationController
+     * @author NHN (developers@xpressengine.com)
+     * @brief communication module of the Controller class
+     **/
+
+    class communicationController extends communication {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief change the settings of message box
+         **/
+        function procCommunicationUpdateAllowMessage() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+
+            $args->allow_message = Context::get('allow_message');
+            if(!in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+
+            $output = executeQuery('communication.updateAllowMessage', $args);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type'));
+				header('location:'.$returnUrl);
+				return;
+			}
+            return $output;
+        }
+
+        /**
+         * @brief Send a message
+         **/
+        function procCommunicationSendMessage() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Check variables
+            $receiver_srl = Context::get('receiver_srl');
+            if(!$receiver_srl) return new Object(-1, 'msg_not_exists_member');
+
+            $title = trim(Context::get('title'));
+            if(!$title) return new Object(-1, 'msg_title_is_null');
+
+            $content = trim(Context::get('content'));
+            if(!$content) return new Object(-1, 'msg_content_is_null');
+
+            $send_mail = Context::get('send_mail');
+            if($send_mail != 'Y') $send_mail = 'N';
+            // Check if there is a member to receive a message
+            $oMemberModel = &getModel('member');
+            $oCommunicationModel = &getModel('communication');
+            $receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
+            if($receiver_member_info->member_srl != $receiver_srl) return new Object(-1, 'msg_not_exists_member');
+            // check whether to allow to receive the message(pass if a top-administrator)
+            if($logged_info->is_admin != 'Y') {
+                if($receiver_member_info->allow_message == 'F') {
+                    if(!$oCommunicationModel->isFriend($receiver_member_info->member_srl)) return new object(-1, 'msg_allow_message_to_friend');
+                } elseif($receiver_member_info->allow_messge == 'N') {
+                    return new object(-1, 'msg_disallow_message');
+                }
+            }
+            // send a message
+            $output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
+            // send an e-mail
+            if($output->toBool() && $send_mail == 'Y') {
+                $view_url = Context::getRequestUri();
+                $content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>",$content, $view_url, $view_url);
+                $oMail = new Mail();
+                $oMail->setTitle($title);
+                $oMail->setContent($content);
+                $oMail->setSender($logged_info->nick_name, $logged_info->email_address);
+                $oMail->setReceiptor($receiver_member_info->nick_name, $receiver_member_info->email_address);
+                $oMail->send();
+            }
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				global $lang;
+				htmlHeader();
+				alertScript($lang->success_sended);
+				closePopupScript();
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+            return $output;
+        }
+
+        function sendMessage($sender_srl, $receiver_srl, $title, $content, $sender_log = true) {
+            $content = removeHackTag($content); 
+			$title = htmlspecialchars($title);
+            // messages to save in the sendor's message box
+            $sender_args->sender_srl = $sender_srl;
+            $sender_args->receiver_srl = $receiver_srl;
+            $sender_args->message_type = 'S';
+            $sender_args->title = $title;
+            $sender_args->content = $content;
+            $sender_args->readed = 'N';
+            $sender_args->regdate = date("YmdHis");
+            $sender_args->related_srl = getNextSequence();
+            $sender_args->message_srl = getNextSequence();
+            $sender_args->list_order = getNextSequence()*-1;
+            // messages to save in the receiver's message box
+            $receiver_args->message_srl = $sender_args->related_srl;
+            $receiver_args->related_srl = 0;
+            $receiver_args->list_order = $sender_args->related_srl*-1;
+            $receiver_args->sender_srl = $sender_srl;
+            if(!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
+            $receiver_args->receiver_srl = $receiver_srl;
+            $receiver_args->message_type = 'R';
+            $receiver_args->title = $title;
+            $receiver_args->content = $content;
+            $receiver_args->readed = 'N';
+            $receiver_args->regdate = date("YmdHis");
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // messages to save in the sendor's message box
+            if($sender_srl && $sender_log) {
+                $output = executeQuery('communication.sendMessage', $sender_args);
+                if(!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+            }
+            // messages to save in the receiver's message box
+            $output = executeQuery('communication.sendMessage', $receiver_args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // create a flag that message is sent (in file format) 
+            $flag_path = './files/member_extra_info/new_message_flags/'.getNumberingPath($receiver_srl);
+            FileHandler::makeDir($flag_path);
+            $flag_file = sprintf('%s%s', $flag_path, $receiver_srl);
+			$flag_count = FileHandler::readFile($flag_file);
+            FileHandler::writeFile($flag_file, ++$flag_count);
+
+            $oDB->commit();
+
+            return new Object(0,'success_sended');
+        }
+
+        /**
+         * @brief store a specific message into the archive
+         **/
+        function procCommunicationStoreMessage() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Check variable
+            $message_srl = Context::get('message_srl');
+            if(!$message_srl) return new Object(-1,'msg_invalid_request');
+            // get the message
+            $oCommunicationModel = &getModel('communication');
+            $message = $oCommunicationModel->getSelectedMessage($message_srl);
+            if(!$message || $message->message_type != 'R') return new Object(-1,'msg_invalid_request');
+
+            $args->message_srl = $message_srl;
+            $args->receiver_srl = $logged_info->member_srl;
+            $output = executeQuery('communication.setMessageStored', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief Delete a message
+         **/
+        function procCommunicationDeleteMessage() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            // Check the variable
+            $message_srl = Context::get('message_srl');
+            if(!$message_srl) return new Object(-1,'msg_invalid_request');
+            // Get the message
+            $oCommunicationModel = &getModel('communication');
+            $message = $oCommunicationModel->getSelectedMessage($message_srl);
+            if(!$message) return new Object(-1,'msg_invalid_request');
+            // Check a message type if 'S' or 'R'
+            if($message->sender_srl == $member_srl && $message->message_type == 'S') {
+                if(!$message_srl) return new Object(-1, 'msg_invalid_request');
+            } elseif($message->receiver_srl == $member_srl && $message->message_type == 'R') {
+                if(!$message_srl) return new Object(-1, 'msg_invalid_request');
+            }
+            // Delete
+            $args->message_srl = $message_srl;
+            $output = executeQuery('communication.deleteMessage', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_deleted');
+        }
+
+        /**
+         * @brief Delete the multiple messages
+         **/
+        function procCommunicationDeleteMessages() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            // check variables
+            if(!Context::get('message_srl_list')) return new Object(-1, 'msg_cart_is_null');
+
+            $message_srl_list = Context::get('message_srl_list');
+			if(!is_array($message_srl_list)) $message_srl_list = explode('|@|', trim($message_srl_list));
+            if(!count($message_srl_list)) return new Object(-1, 'msg_cart_is_null');
+
+            $message_type = Context::get('message_type');
+            if(!$message_type || !in_array($message_type, array('R','S','T'))) return new Object(-1, 'msg_invalid_request');
+
+            $message_count = count($message_srl_list);
+            $target = array();
+            for($i=0;$i<$message_count;$i++) {
+                $message_srl = (int)trim($message_srl_list[$i]);
+                if(!$message_srl) continue;
+                $target[] = $message_srl;
+            }
+            if(!count($target)) return new Object(-1,'msg_cart_is_null');
+            // Delete
+            $args->message_srls = implode(',',$target);
+            $args->message_type = $message_type;
+
+            if($message_type == 'S') $args->sender_srl = $member_srl;
+            else $args->receiver_srl = $member_srl;
+
+            $output = executeQuery('communication.deleteMessages', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_deleted');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationMessages', 'message_type', Context::get('message_type'));
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Add a friend
+         **/
+        function procCommunicationAddFriend() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $target_srl = (int)trim(Context::get('target_srl'));
+            if(!$target_srl) return new Object(-1,'msg_invalid_request');
+            // Variable
+            $args->friend_srl = getNextSequence();
+            $args->list_order = $args->friend_srl * -1;
+            $args->friend_group_srl = Context::get('friend_group_srl');
+            $args->member_srl = $logged_info->member_srl;
+            $args->target_srl = $target_srl;
+            $output = executeQuery('communication.addFriend', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->add('member_srl', $target_srl);
+            $this->setMessage('success_registed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				global $lang;
+				htmlHeader();
+				alertScript($lang->success_registed);
+				closePopupScript();
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+        }
+
+        /**
+         * @brief Move a group of the friend
+         **/
+        function procCommunicationMoveFriend() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Check variables
+            $friend_srl_list = trim(Context::get('friend_srl_list'));
+            if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
+
+            $friend_srl_list = explode('|@|', $friend_srl_list);
+            if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
+
+            $friend_count = count($friend_srl_list);
+            $target = array();
+            for($i=0;$i<$friend_count;$i++) {
+                $friend_srl = (int)trim($friend_srl_list[$i]);
+                if(!$friend_srl) continue;
+                $target[] = $friend_srl;
+            }
+            if(!count($target)) return new Object(-1,'msg_cart_is_null');
+            // Variables
+            $args->friend_srls = implode(',',$target);
+            $args->member_srl = $logged_info->member_srl;
+            $args->friend_group_srl = Context::get('target_friend_group_srl');
+
+            $output = executeQuery('communication.moveFriend', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_moved');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Delete a friend 
+         **/
+        function procCommunicationDeleteFriend() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            // Check variables
+            $friend_srl_list = trim(Context::get('friend_srl_list'));
+            if(!$friend_srl_list) return new Object(-1, 'msg_cart_is_null');
+
+            $friend_srl_list = explode('|@|', $friend_srl_list);
+            if(!count($friend_srl_list)) return new Object(-1, 'msg_cart_is_null');
+
+            $friend_count = count($friend_srl_list);
+            $target = array();
+            for($i=0;$i<$friend_count;$i++) {
+                $friend_srl = (int)trim($friend_srl_list[$i]);
+                if(!$friend_srl) continue;
+                $target[] = $friend_srl;
+            }
+            if(!count($target)) return new Object(-1,'msg_cart_is_null');
+            // Delete
+            $args->friend_srls = implode(',',$target);
+            $args->member_srl = $logged_info->member_srl;
+            $output = executeQuery('communication.deleteFriend', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_deleted');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispCommunicationFriend');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Add a group of friends
+         **/
+        function procCommunicationAddFriendGroup() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Variables
+            $args->friend_group_srl = trim(Context::get('friend_group_srl'));
+            $args->member_srl = $logged_info->member_srl;
+            $args->title = Context::get('title'); 
+			$args->title = htmlspecialchars($args->title);
+            if(!$args->title) return new Object(-1, 'msg_invalid_request');
+            // modify if friend_group_srl exists.
+            if($args->friend_group_srl) {
+                $output = executeQuery('communication.renameFriendGroup', $args);
+                $msg_code = 'success_updated';
+            // add if not exists
+            } else {
+                $output = executeQuery('communication.addFriendGroup', $args);
+                $msg_code = 'success_registed';
+            }
+
+            if(!$output->toBool())
+			{
+				if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+					global $lang;
+					htmlHeader();
+					alertScript($lang->fail_to_registed);
+					closePopupScript();
+					htmlFooter();
+					Context::close();
+					exit;
+				}
+				else return $output;
+			}
+			else
+			{
+				if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+					global $lang;
+					htmlHeader();
+					alertScript($lang->success_registed);
+					reload(true);
+					closePopupScript();
+					htmlFooter();
+					Context::close();
+					exit;
+				}
+				else $this->setMessage($msg_code);
+			}
+        }
+
+        /**
+         * @brief change a name of friend group
+         **/
+        function procCommunicationRenameFriendGroup() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Variables
+            $args->friend_group_srl= Context::get('friend_group_srl');
+            $args->member_srl = $logged_info->member_srl;
+            $args->title = Context::get('title'); 
+			$args->title = htmlspecialchars($args->title);
+            if(!$args->title) return new Object(-1, 'msg_invalid_request');
+
+            $output = executeQuery('communication.renameFriendGroup', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_updated');
+        }
+
+        /**
+         * @brief Delete a group of friends
+         **/
+        function procCommunicationDeleteFriendGroup() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Variables
+            $args->friend_group_srl = Context::get('friend_group_srl');
+            $args->member_srl = $logged_info->member_srl;
+            $output = executeQuery('communication.deleteFriendGroup', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_deleted');
+        }
+
+        /**
+         * @brief set a message status to be 'already read'
+         **/
+        function setMessageReaded($message_srl) {
+            $args->message_srl = $message_srl;
+            $args->related_srl = $message_srl;
+            return executeQuery('communication.setMessageReaded', $args);
+        }
+
+    }
+?>
diff --git a/modules/communication/communication.model.php b/modules/communication/communication.model.php
index f24a6974b..f52487114 100644
--- a/modules/communication/communication.model.php
+++ b/modules/communication/communication.model.php
@@ -1,189 +1,184 @@
-<?php
-    /**
-     * @class  communicationModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 Model class
-     **/
-
-    class communicationModel extends communication {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정된 내용을 구함
-         **/
-        function getConfig() {
-            $oModuleModel = &getModel('module');
-            $communication_config = $oModuleModel->getModuleConfig('communication');
-
-            if(!$communication_config->skin) $communication_config->skin = 'default';
-            if(!$communication_config->colorset) $communication_config->colorset = 'white';
-            if(!$communication_config->editor_skin) $communication_config->editor_skin = 'default';
-
-            return $communication_config;
-        }
-
-        /**
-         * @brief 쪽지 내용을 가져옴
-         **/
-        function getSelectedMessage($message_srl) {
-            $logged_info = Context::get('logged_info');
-
-            $args->message_srl = $message_srl;
-            $output = executeQuery('communication.getMessage',$args);
-            $message = $output->data;
-            if(!$message) return ;
-
-            // 보낸 쪽지일 경우 받는 사람 정보를 구함 
-            $oMemberModel = &getModel('member');
-            if($message->sender_srl == $logged_info->member_srl && $message->message_type == 'S') $member_info = $oMemberModel->getMemberInfoByMemberSrl($message->receiver_srl);
-
-            // 보관/받은 쪽지일 경우 보낸 사람 정보를 구함
-            else $member_info = $oMemberModel->getMemberInfoByMemberSrl($message->sender_srl);
-
-            if($member_info) {
-                foreach($member_info as $key => $val) {
-                  if($key != 'regdate') $message->{$key} = $val;
-                }
-            }
-
-            // 받은 쪽지이고 아직 읽지 않았을 경우 읽은 상태로 변경
-            if($message->message_type == 'R' && $message->readed != 'Y') {
-                $oCommunicationController = &getController('communication');
-                $oCommunicationController->setMessageReaded($message_srl);
-            }
-
-
-            return $message;
-        }
-
-        /**
-         * @brief 새 쪽지를 가져옴
-         **/
-        function getNewMessage() {
-            $logged_info = Context::get('logged_info');
-            $args->receiver_srl = $logged_info->member_srl;
-            $args->readed = 'N';
-
-            $output = executeQuery('communication.getNewMessage', $args);
-            if(!count($output->data)) return;
-            $message = array_pop($output->data);
-
-            $oCommunicationController = &getController('communication');
-            $oCommunicationController->setMessageReaded($message->message_srl);
-
-            return $message;
-        }
-
-        /**
-         * @brief 쪽지 목록 가져오기
-         * type = R : 받은 쪽지
-         * type = S : 보낸 쪽지 
-         * type = T : 보관함
-         **/
-        function getMessages($message_type = "R") {
-            $logged_info = Context::get('logged_info');
-
-            switch($message_type) {
-                case 'R' :
-                        $args->member_srl = $logged_info->member_srl;
-                        $args->message_type = 'R';
-                        $query_id = 'communication.getReceivedMessages';
-                    break;
-                case 'T' :
-                        $args->member_srl = $logged_info->member_srl;
-                        $args->message_type = 'T';
-                        $query_id = 'communication.getStoredMessages';
-                    break;
-                default :
-                        $args->member_srl = $logged_info->member_srl;
-                        $args->message_type = 'S';
-                        $query_id = 'communication.getSendedMessages';
-                    break;
-    
-            }
-
-            // 기타 변수들 정리
-            $args->sort_index = 'message.list_order';
-            $args->page = Context::get('page');
-            $args->list_count = 20;
-            $args->page_count = 10;
-            return executeQuery($query_id, $args);
-        }
-
-        /**
-         * @brief 친구 목록 가져오기
-         **/
-        function getFriends($friend_group_srl = 0) {
-            $logged_info = Context::get('logged_info');
-
-            $args->friend_group_srl = $friend_group_srl;
-            $args->member_srl = $logged_info->member_srl;
-
-            // 기타 변수들 정리
-            $args->page = Context::get('page');
-            $args->sort_index = 'friend.list_order';
-            $args->list_count = 10;
-            $args->page_count = 10;
-            $output = executeQuery('communication.getFriends', $args);
-            return $output;
-        }
-
-        /**
-         * @brief 이미 친구로 등록되었는지 검사
-         **/
-        function isAddedFriend($member_srl) {
-            $logged_info = Context::get('logged_info');
-
-            $args->member_srl = $logged_info->member_srl;
-            $args->target_srl = $member_srl;
-            $output = executeQuery('communication.isAddedFriend', $args);
-            return $output->data->count;
-        }
-
-        /**
-         * @brief 특정 친구 그룹 가져오기 
-         **/
-        function getFriendGroupInfo($friend_group_srl) {
-            $logged_info = Context::get('logged_info');
-
-            $args->member_srl = $logged_info->member_srl;
-            $args->friend_group_srl = $friend_group_srl;
-
-            $output = executeQuery('communication.getFriendGroup', $args);
-            return $output->data;
-        }
-
-        /**
-         * @brief 그룹 목록 가져오기
-         **/
-        function getFriendGroups() {
-            $logged_info = Context::get('logged_info');
-            $args->member_srl = $logged_info->member_srl;
-
-            $output = executeQuery('communication.getFriendGroups', $args);
-            $group_list = $output->data;
-            if(!$group_list) return;
-
-            if(!is_array($group_list)) $group_list = array($group_list);
-            return $group_list;
-        }
-
-        /**
-         * @brief 특정 회원의 친구 목록에 포함되어 있는지를 확인
-         **/
-        function isFriend($target_srl) {
-            $logged_info = Context::get('logged_info');
-
-            $args->member_srl = $target_srl;
-            $args->target_srl = $logged_info->member_srl;
-            $output = executeQuery('communication.isAddedFriend', $args);
-            if($output->data->count) return true;
-            return false;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  communicationModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief communication module of the Model class
+     **/
+
+    class communicationModel extends communication {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief get the configuration
+         **/
+        function getConfig() {
+            $oModuleModel = &getModel('module');
+            $communication_config = $oModuleModel->getModuleConfig('communication');
+
+            if(!$communication_config->skin) $communication_config->skin = 'default';
+            if(!$communication_config->colorset) $communication_config->colorset = 'white';
+            if(!$communication_config->editor_skin) $communication_config->editor_skin = 'default';
+
+            return $communication_config;
+        }
+
+        /**
+         * @brief get the message contents
+         **/
+        function getSelectedMessage($message_srl, $columnList = array()) {
+            $logged_info = Context::get('logged_info');
+
+            $args->message_srl = $message_srl;
+            $output = executeQuery('communication.getMessage',$args, $columnList);
+            $message = $output->data;
+            if(!$message) return ;
+            // get recipient's information if it is a sent message
+            $oMemberModel = &getModel('member');
+            if($message->sender_srl == $logged_info->member_srl && $message->message_type == 'S') $member_info = $oMemberModel->getMemberInfoByMemberSrl($message->receiver_srl);
+            // get sendor's information if it is a received/archived message
+            else $member_info = $oMemberModel->getMemberInfoByMemberSrl($message->sender_srl);
+
+            if($member_info) {
+                foreach($member_info as $key => $val) {
+                  if($key != 'regdate') $message->{$key} = $val;
+                }
+            }
+            // change the status if is a received and not yet read message
+            if($message->message_type == 'R' && $message->readed != 'Y') {
+                $oCommunicationController = &getController('communication');
+                $oCommunicationController->setMessageReaded($message_srl);
+            }
+
+
+            return $message;
+        }
+
+        /**
+         * @brief get a new message
+         **/
+        function getNewMessage($columnList = array()) {
+            $logged_info = Context::get('logged_info');
+            $args->receiver_srl = $logged_info->member_srl;
+            $args->readed = 'N';
+
+            $output = executeQuery('communication.getNewMessage', $args, $columnList);
+            if(!count($output->data)) return;
+            $message = array_pop($output->data);
+
+            $oCommunicationController = &getController('communication');
+            $oCommunicationController->setMessageReaded($message->message_srl);
+
+            return $message;
+        }
+
+        /**
+         * @brief get a message list
+         * type = R: Received Message 
+         * type = S: Sent Message
+         * type = T: Archive
+         **/
+        function getMessages($message_type = "R", $columnList = array()) {
+            $logged_info = Context::get('logged_info');
+
+            switch($message_type) {
+                case 'R' :
+                        $args->member_srl = $logged_info->member_srl;
+                        $args->message_type = 'R';
+                        $query_id = 'communication.getReceivedMessages';
+                    break;
+                case 'T' :
+                        $args->member_srl = $logged_info->member_srl;
+                        $args->message_type = 'T';
+                        $query_id = 'communication.getStoredMessages';
+                    break;
+                default :
+                        $args->member_srl = $logged_info->member_srl;
+                        $args->message_type = 'S';
+                        $query_id = 'communication.getSendedMessages';
+                    break;
+    
+            }
+            // Other variables
+            $args->sort_index = 'message.list_order';
+            $args->page = Context::get('page');
+            $args->list_count = 20;
+            $args->page_count = 10;
+            return executeQuery($query_id, $args, $columnList);
+        }
+
+        /**
+         * @brief Get a list of friends
+         **/
+        function getFriends($friend_group_srl = 0, $columnList = array()) {
+            $logged_info = Context::get('logged_info');
+
+            $args->friend_group_srl = $friend_group_srl;
+            $args->member_srl = $logged_info->member_srl;
+            // Other variables
+            $args->page = Context::get('page');
+            $args->sort_index = 'friend.list_order';
+            $args->list_count = 10;
+            $args->page_count = 10;
+            $output = executeQuery('communication.getFriends', $args, $columnList);
+            return $output;
+        }
+
+        /**
+         * @brief check if a friend is already added
+         **/
+        function isAddedFriend($member_srl) {
+            $logged_info = Context::get('logged_info');
+
+            $args->member_srl = $logged_info->member_srl;
+            $args->target_srl = $member_srl;
+            $output = executeQuery('communication.isAddedFriend', $args);
+            return $output->data->count;
+        }
+
+        /**
+         * @brief Get a group of friends
+         **/
+        function getFriendGroupInfo($friend_group_srl) {
+            $logged_info = Context::get('logged_info');
+
+            $args->member_srl = $logged_info->member_srl;
+            $args->friend_group_srl = $friend_group_srl;
+
+            $output = executeQuery('communication.getFriendGroup', $args);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get a list of groups
+         **/
+        function getFriendGroups() {
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+
+            $output = executeQuery('communication.getFriendGroups', $args);
+            $group_list = $output->data;
+            if(!$group_list) return;
+
+            if(!is_array($group_list)) $group_list = array($group_list);
+            return $group_list;
+        }
+
+        /**
+         * @brief check whether to be added in the friend list
+         **/
+        function isFriend($target_srl) {
+            $logged_info = Context::get('logged_info');
+
+            $args->member_srl = $target_srl;
+            $args->target_srl = $logged_info->member_srl;
+            $output = executeQuery('communication.isAddedFriend', $args);
+            if($output->data->count) return true;
+            return false;
+        }
+    }
+?>
diff --git a/modules/communication/communication.view.php b/modules/communication/communication.view.php
index 58c9f17ac..802e4eb37 100644
--- a/modules/communication/communication.view.php
+++ b/modules/communication/communication.view.php
@@ -1,228 +1,219 @@
-<?php
-    /**
-     * @class  communicationView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  communication module의 View class
-     **/
-
-    class communicationView extends communication {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $oCommunicationModel = &getModel('communication');
-
-            $this->communication_config = $oCommunicationModel->getConfig();
-            $skin = $this->communication_config->skin;
-
-            Context::set('communication_config', $this->communication_config);
-
-            $tpl_path = sprintf('%sskins/%s', $this->module_path, $skin);
-            $this->setTemplatePath($tpl_path);
-        }
-
-        /**
-         * @brief 쪽지함 출력
-         **/
-        function dispCommunicationMessages() {
-            // 로그인이 되어 있지 않으면 오류 표시
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 변수 설정
-            $message_srl = Context::get('message_srl');
-            $message_type = Context::get('message_type');
-            if(!in_array($message_type, array('R','S','T'))) {
-                $message_type = 'R';
-                Context::set('message_type', $message_type);
-            }
-
-            $oCommunicationModel = &getModel('communication');
-
-            // message_srl이 있으면 내용 추출
-            if($message_srl) {
-                $message = $oCommunicationModel->getSelectedMessage($message_srl);
-                if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl) ) {
-					stripEmbedTagForAdmin($message->content, $message->sender_srl);
-					Context::set('message', $message);
-				}
-            }
-
-            // 목록 추출
-            $output = $oCommunicationModel->getMessages($message_type);
-
-            // 템플릿에 쓰기 위해서 context::set
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('message_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            $this->setTemplateFile('messages');
-        }
-
-        /**
-         * @brief 새 쪽지 보여줌
-         **/
-        function dispCommunicationNewMessage() {
-            $this->setLayoutFile('popup_layout');
-
-            // 로그인이 되어 있지 않으면 오류 표시
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            $oCommunicationModel = &getModel('communication');
-
-            // 새 쪽지를 가져옴
-            $message = $oCommunicationModel->getNewMessage();
-            if($message) {
-				stripEmbedTagForAdmin($message->content, $message->sender_srl);
-				Context::set('message', $message);
-			}
-            
-            // 플래그 삭제
-            $flag_path = './files/communication_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl);
-            $flag_file = sprintf('%s%s', $flag_path, $logged_info->member_srl);
-            FileHandler::removeFile($flag_file);
-
-            $this->setTemplateFile('new_message');
-        }
-
-        /**
-         * @brief 쪽지 발송 출력
-         **/
-        function dispCommunicationSendMessage() {
-            $this->setLayoutFile("popup_layout");
-            $oCommunicationModel = &getModel('communication');
-            $oMemberModel = &getModel('member');
-
-            // 로그인이 되어 있지 않으면 오류 표시
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 쪽지 받을 사용자 정보 구함
-            $receiver_srl = Context::get('receiver_srl');
-            if(!$receiver_srl || $logged_info->member_srl == $receiver_srl) return $this->stop('msg_not_logged');
-
-            // 답글 쪽지일 경우 원본 메세지의 글번호를 구함
-            $message_srl = Context::get('message_srl');
-            if($message_srl) {
-                $source_message = $oCommunicationModel->getSelectedMessage($message_srl);
-                if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl) {
-                    $source_message->title = "[re] ".$source_message->title;
-                    $source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">".trim($source_message->content)."</div>";
-                    Context::set('source_message', $source_message);
-                }
-            }
-
-            $receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
-            Context::set('receiver_info', $receiver_info);
-
-            // 에디터 모듈의 getEditor를 호출하여 서명용으로 세팅
-            $oEditorModel = &getModel('editor');
-            $option->primary_key_name = 'receiver_srl';
-            $option->content_key_name = 'content';
-            $option->allow_fileupload = false;
-            $option->enable_autosave = false;
-            $option->enable_default_component = true;// false;
-            $option->enable_component = false;
-            $option->resizable = false;
-            $option->disable_html = true;
-            $option->height = 300;
-            $option->skin = $this->communication_config->editor_skin;
-            $option->colorset = $this->communication_config->editor_colorset;
-            $editor = $oEditorModel->getEditor($logged_info->member_srl, $option);
-            Context::set('editor', $editor);
-
-            $this->setTemplateFile('send_message');
-        }
-
-        /**
-         * @brief 친구 목록 보기
-         **/
-        function dispCommunicationFriend() {
-            // 로그인이 되어 있지 않으면 오류 표시
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-
-            $oCommunicationModel = &getModel('communication');
-
-            // 그룹 목록을 가져옴
-            $tmp_group_list = $oCommunicationModel->getFriendGroups();
-            $group_count = count($tmp_group_list);
-            for($i=0;$i<$group_count;$i++) $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i];
-            Context::set('friend_group_list', $friend_group_list);
-
-            // 친구 목록을 가져옴
-            $friend_group_srl = Context::get('friend_group_srl');
-            $output = $oCommunicationModel->getFriends($friend_group_srl);
-            $friend_count = count($output->data);
-            if($friend_count) {
-                foreach($output->data as $key => $val) {
-                    $group_srl = $val->friend_group_srl;
-                    $group_title = $friend_group_list[$group_srl]->title;
-                    if(!$group_title) $group_title = Context::get('default_friend_group');
-                    $output->data[$key]->group_title = $group_title;
-                }
-            }
-
-            // 템플릿에 쓰기 위해서 context::set
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('friend_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            $this->setTemplateFile('friends');
-        }
-
-        /**
-         * @brief 친구 추가
-         **/
-        function dispCommunicationAddFriend() {
-            $this->setLayoutFile("popup_layout");
-
-            // 로그인이 되어 있지 않으면 오류 표시
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            $target_srl = Context::get('target_srl');
-            if(!$target_srl) return $this->stop('msg_invalid_request');
-
-            // 대상 회원의 정보를 구함
-            $oMemberModel = &getModel('member');
-            $oCommunicationModel = &getModel('communication');
-            $communication_info = $oMemberModel->getMemberInfoByMemberSrl($target_srl);
-            if($communication_info->member_srl != $target_srl) return $this->stop('msg_invalid_request');
-            Context::set('target_info', $communication_info);
-
-            // 그룹의 목록을 구함
-            $friend_group_list = $oCommunicationModel->getFriendGroups();
-            Context::set('friend_group_list', $friend_group_list);
-
-            $this->setTemplateFile('add_friend');
-        }
-
-        /**
-         * @brief 친구 그룹 추가
-         **/
-        function dispCommunicationAddFriendGroup() {
-            $this->setLayoutFile("popup_layout");
-
-            // 로그인이 되어 있지 않으면 오류 표시
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            // 그룹 번호가 넘어오면 수정모드로..
-            $friend_group_srl = Context::get('friend_group_srl');
-            if($friend_group_srl) {
-                $oCommunicationModel = &getModel('communication');
-                $friend_group = $oCommunicationModel->getFriendGroupInfo($friend_group_srl);
-                if($friend_group->friend_group_srl == $friend_group_srl) Context::set('friend_group', $friend_group);
-            }
-
-            $this->setTemplateFile('add_friend_group');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  communicationView
+     * @author NHN (developers@xpressengine.com)
+     * @brief View class of communication module
+     **/
+
+    class communicationView extends communication {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $oCommunicationModel = &getModel('communication');
+
+            $this->communication_config = $oCommunicationModel->getConfig();
+            $skin = $this->communication_config->skin;
+
+            Context::set('communication_config', $this->communication_config);
+
+			$config_parse = explode('.', $skin);
+			if (count($config_parse) > 1){
+				$tpl_path = sprintf('./themes/%s/modules/communication/', $config_parse[0]);
+			}else{
+				$tpl_path = sprintf('%sskins/%s', $this->module_path, $skin);
+			}
+            $this->setTemplatePath($tpl_path);
+        }
+
+        /**
+         * @brief Display message box
+         **/
+        function dispCommunicationMessages() {
+            // Error appears if not logged-in
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // Set the variables
+            $message_srl = Context::get('message_srl');
+            $message_type = Context::get('message_type');
+            if(!in_array($message_type, array('R','S','T'))) {
+                $message_type = 'R';
+                Context::set('message_type', $message_type);
+            }
+
+            $oCommunicationModel = &getModel('communication');
+            // extract contents if message_srl exists
+            if($message_srl) {
+				$columnList = array('message_srl', 'sender_srl', 'receiver_srl', 'message_type', 'title', 'content', 'readed', 'regdate');
+                $message = $oCommunicationModel->getSelectedMessage($message_srl, $columnList);
+                if($message->message_srl == $message_srl && ($message->receiver_srl == $logged_info->member_srl || $message->sender_srl == $logged_info->member_srl) ) {
+					stripEmbedTagForAdmin($message->content, $message->sender_srl);
+					Context::set('message', $message);
+				}
+            }
+            // Extract a list
+			$columnList = array('message_srl', 'readed', 'title', 'member.member_srl', 'member.nick_name', 'message.regdate', 'readed_date');
+            $output = $oCommunicationModel->getMessages($message_type, $columnList);
+            // set a template file
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('message_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            $this->setTemplateFile('messages');
+        }
+
+        /**
+         * @brief display a new message
+         **/
+        function dispCommunicationNewMessage() {
+            $this->setLayoutFile('popup_layout');
+            // Error appears if not logged-in
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $oCommunicationModel = &getModel('communication');
+            // get a new message
+			$columnList = array('message_srl', 'member_srl', 'nick_name', 'title', 'content', 'sender_srl');
+            $message = $oCommunicationModel->getNewMessage($columnList);
+            if($message) {
+				stripEmbedTagForAdmin($message->content, $message->sender_srl);
+				Context::set('message', $message);
+			}
+            
+            // Delete a flag
+            $flag_path = './files/communication_extra_info/new_message_flags/'.getNumberingPath($logged_info->member_srl);
+            $flag_file = sprintf('%s%s', $flag_path, $logged_info->member_srl);
+            FileHandler::removeFile($flag_file);
+
+            $this->setTemplateFile('new_message');
+        }
+
+        /**
+         * @brief Display message sending
+         **/
+        function dispCommunicationSendMessage() {
+            $this->setLayoutFile("popup_layout");
+            $oCommunicationModel = &getModel('communication');
+            $oMemberModel = &getModel('member');
+            // Error appears if not logged-in
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // get receipient's information 
+            $receiver_srl = Context::get('receiver_srl');
+            if(!$receiver_srl || $logged_info->member_srl == $receiver_srl) return $this->stop('msg_not_logged');
+            // get message_srl of the original message if it is a reply
+            $message_srl = Context::get('message_srl');
+            if($message_srl) {
+                $source_message = $oCommunicationModel->getSelectedMessage($message_srl);
+                if($source_message->message_srl == $message_srl && $source_message->sender_srl == $receiver_srl) {
+                    $source_message->title = "[re] ".$source_message->title;
+                    $source_message->content = "\r\n<br />\r\n<br /><div style=\"padding-left:5px; border-left:5px solid #DDDDDD;\">".trim($source_message->content)."</div>";
+                    Context::set('source_message', $source_message);
+                }
+            }
+
+            $receiver_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
+            Context::set('receiver_info', $receiver_info);
+            // set a signiture by calling getEditor of the editor module
+            $oEditorModel = &getModel('editor');
+            $option->primary_key_name = 'receiver_srl';
+            $option->content_key_name = 'content';
+            $option->allow_fileupload = false;
+            $option->enable_autosave = false;
+            $option->enable_default_component = true;// false;
+            $option->enable_component = false;
+            $option->resizable = false;
+            $option->disable_html = true;
+            $option->height = 300;
+            $option->skin = $this->communication_config->editor_skin;
+            $option->colorset = $this->communication_config->editor_colorset;
+            $editor = $oEditorModel->getEditor($logged_info->member_srl, $option);
+            Context::set('editor', $editor);
+
+            $this->setTemplateFile('send_message');
+        }
+
+        /**
+         * @brief display a list of friends
+         **/
+        function dispCommunicationFriend() {
+            // Error appears if not logged-in
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+
+            $oCommunicationModel = &getModel('communication');
+            // get a group list
+            $tmp_group_list = $oCommunicationModel->getFriendGroups();
+            $group_count = count($tmp_group_list);
+            for($i=0;$i<$group_count;$i++) $friend_group_list[$tmp_group_list[$i]->friend_group_srl] = $tmp_group_list[$i];
+            Context::set('friend_group_list', $friend_group_list);
+            // get a list of friends
+            $friend_group_srl = Context::get('friend_group_srl');
+			$columnList = array('friend_srl', 'friend_group_srl', 'target_srl', 'member.nick_name', 'friend.regdate');
+            $output = $oCommunicationModel->getFriends($friend_group_srl, $columnList);
+            $friend_count = count($output->data);
+            if($friend_count) {
+                foreach($output->data as $key => $val) {
+                    $group_srl = $val->friend_group_srl;
+                    $group_title = $friend_group_list[$group_srl]->title;
+                    if(!$group_title) $group_title = Context::get('default_friend_group');
+                    $output->data[$key]->group_title = $group_title;
+                }
+            }
+            // set a template file
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('friend_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            $this->setTemplateFile('friends');
+        }
+
+        /**
+         * @brief Add a friend
+         **/
+        function dispCommunicationAddFriend() {
+            $this->setLayoutFile("popup_layout");
+            // error appears if not logged-in
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $target_srl = Context::get('target_srl');
+            if(!$target_srl) return $this->stop('msg_invalid_request');
+            // get information of the member
+            $oMemberModel = &getModel('member');
+            $oCommunicationModel = &getModel('communication');
+            $communication_info = $oMemberModel->getMemberInfoByMemberSrl($target_srl);
+            if($communication_info->member_srl != $target_srl) return $this->stop('msg_invalid_request');
+            Context::set('target_info', $communication_info);
+            // get a group list
+            $friend_group_list = $oCommunicationModel->getFriendGroups();
+            Context::set('friend_group_list', $friend_group_list);
+
+            $this->setTemplateFile('add_friend');
+        }
+
+        /**
+         * @brief Add a group of friends
+         **/
+        function dispCommunicationAddFriendGroup() {
+            $this->setLayoutFile("popup_layout");
+            // error apprears if not logged-in
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            $logged_info = Context::get('logged_info');
+            // change to edit mode when getting the group_srl
+            $friend_group_srl = Context::get('friend_group_srl');
+            if($friend_group_srl) {
+                $oCommunicationModel = &getModel('communication');
+                $friend_group = $oCommunicationModel->getFriendGroupInfo($friend_group_srl);
+                if($friend_group->friend_group_srl == $friend_group_srl) Context::set('friend_group', $friend_group);
+            }
+
+            $this->setTemplateFile('add_friend_group');
+        }
+
+    }
+?>
diff --git a/modules/communication/conf/info.xml b/modules/communication/conf/info.xml
index 58b560547..b98bf9737 100644
--- a/modules/communication/conf/info.xml
+++ b/modules/communication/conf/info.xml
@@ -1,33 +1,33 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">커뮤니케이션</title>
-    <title xml:lang="jp">コミュニケーション</title>
-    <title xml:lang="zh-CN">会员交流</title>
-    <title xml:lang="en">Communication</title>
-    <title xml:lang="ru">Communication</title>
-    <title xml:lang="vi">Liên lạc</title>
-    <title xml:lang="zh-TW">交流</title>
-    <title xml:lang="tr">İletişim</title>
-    <description xml:lang="ko">회원들간의 쪽지, 친구기능을 담당하는 모듈입니다.</description>
-    <description xml:lang="jp">会員間にメッセージや友達管理などコミュニティ機能を提供します。</description>
-    <description xml:lang="zh-CN">管理在线会员间短信息及好友功能的模块。</description>
-    <description xml:lang="en">This module is for managing message, friend functions.</description>
-    <description xml:lang="vi">Module quản lý tin nhắn và bạn bè.</description>
-    <description xml:lang="ru">This module is for managing message, friend functions.</description>
-    <description xml:lang="zh-TW">管理線上會員間短訊及好友功能的模組。</description>
-    <description xml:lang="tr">Bu modül mesaj ve arkadaşlık özelliklerini yönetmek içindir.</description>
-    <version>0.1</version>
-    <date>2008-05-30</date>
-    <category>member</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-		<name xml:lang="ru">NHN</name>
-		<name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">커뮤니케이션</title>
+    <title xml:lang="jp">コミュニケーション</title>
+    <title xml:lang="zh-CN">会员交流</title>
+    <title xml:lang="en">Communication</title>
+    <title xml:lang="ru">Communication</title>
+    <title xml:lang="vi">Liên lạc</title>
+    <title xml:lang="zh-TW">交流</title>
+    <title xml:lang="tr">İletişim</title>
+    <description xml:lang="ko">회원들간의 쪽지, 친구기능을 담당하는 모듈입니다.</description>
+    <description xml:lang="jp">会員間にメッセージや友達管理などコミュニティ機能を提供します。</description>
+    <description xml:lang="zh-CN">管理在线会员间短信息及好友功能的模块。</description>
+    <description xml:lang="en">This module is for managing messages, friend functions.</description>
+    <description xml:lang="vi">Module quản lý tin nhắn và bạn bè.</description>
+    <description xml:lang="ru">This module is for managing message, friend functions.</description>
+    <description xml:lang="zh-TW">管理線上會員間短訊及好友功能的模組。</description>
+    <description xml:lang="tr">Bu modül mesaj ve arkadaşlık özelliklerini yönetmek içindir.</description>
+    <version>0.1</version>
+    <date>2008-05-30</date>
+    <category>member</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+		<name xml:lang="ru">NHN</name>
+		<name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/communication/conf/module.xml b/modules/communication/conf/module.xml
index f219a0d33..7385c3774 100644
--- a/modules/communication/conf/module.xml
+++ b/modules/communication/conf/module.xml
@@ -12,21 +12,21 @@
         <action name="dispCommunicationAddFriendGroup" type="view" standalone="true" />
 
         <action name="procCommunicationUpdateAllowMessage" type="controller" standalone="true" />
-        <action name="procCommunicationSendMessage" type="controller" standalone="true" />
+        <action name="procCommunicationSendMessage" type="controller" standalone="true" ruleset="sendMessage" />
         <action name="procCommunicationStoreMessage" type="controller" standalone="true" />
         <action name="procCommunicationDeleteMessage" type="controller" standalone="true" />
         <action name="procCommunicationDeleteMessages" type="controller" standalone="true" />
 
-        <action name="procCommunicationAddFriend" type="controller" standalone="true" />
-        <action name="procCommunicationMoveFriend" type="controller" standalone="true" />
-        <action name="procCommunicationDeleteFriend" type="controller" standalone="true" />
+        <action name="procCommunicationAddFriend" type="controller" standalone="true" ruleset="addFriend" />
+        <action name="procCommunicationMoveFriend" type="controller" standalone="true" ruleset="deleteCheckedFriend" />
+        <action name="procCommunicationDeleteFriend" type="controller" standalone="true" ruleset="deleteCheckedFriend" />
 
-        <action name="procCommunicationAddFriendGroup" type="controller" standalone="true" />
+        <action name="procCommunicationAddFriendGroup" type="controller" standalone="true" ruleset="addFriendGroup" />
         <action name="procCommunicationRenameFriendGroup" type="controller" standalone="true" />
         <action name="procCommunicationDeleteFriendGroup" type="controller" standalone="true" />
 
         <action name="getCommunicationAdminColorset" type="model" standalone="true" />
-        <action name="procCommunicationAdminInsertConfig" type="controller" standalone="true" />
+        <action name="procCommunicationAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
         <action name="dispCommunicationAdminConfig" type="view" standalone="true" admin_index="true" />
     </actions>
 </module>
diff --git a/modules/communication/lang/en.lang.php b/modules/communication/lang/en.lang.php
deleted file mode 100644
index 8ddeddf7c..000000000
--- a/modules/communication/lang/en.lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only Basic Things)
-     **/
-
-    $lang->communication = 'Communication';
-    $lang->about_communication = 'Communication module is for communications between members with messages or friends.';
-
-    $lang->allow_message = 'Receive Messages';
-    $lang->allow_message_type = array(
-             'Y' => 'Receive All',
-             'N' => 'Reject All',
-             'F' => 'Only Friends',
-        );
-
-    $lang->message_box = array(
-        'R' => 'Received',
-        'S' => 'Sent',
-        'T' => 'Mailbox',
-    );
-    $lang->readed_date = "Read Date"; 
-
-    $lang->sender = 'Sender';
-    $lang->receiver = 'Receiver';
-    $lang->friend_group = 'Friend Group';
-    $lang->default_friend_group = 'Unassigned Group';
-
-    $lang->cmd_send_message = 'Send Message';
-    $lang->cmd_reply_message = 'Reply Message';
-    $lang->cmd_view_friend = 'Friends';
-    $lang->cmd_add_friend = 'Add Friend';
-    $lang->cmd_view_message_box = 'Message Box';
-    $lang->cmd_store = "Save";
-    $lang->cmd_add_friend_group = 'Add Friend Group';
-    $lang->cmd_rename_friend_group = 'Modify Friend Group Name';
-
-    $lang->msg_no_message = 'There is no message';
-    $lang->message_received = 'You have a new message';
-
-    $lang->msg_title_is_null = 'Please input the title of message';
-    $lang->msg_content_is_null = 'Please input the content';
-    $lang->msg_allow_message_to_friend = "Failed to send because receiver only allows friends' messages";
-    $lang->msg_disallow_message = 'Failed to send because receiver rejects message reception';
-
-    $lang->about_allow_message = 'You can decide message reception';
-?>
diff --git a/modules/communication/lang/es.lang.php b/modules/communication/lang/es.lang.php
deleted file mode 100644
index d70c6d4f5..000000000
--- a/modules/communication/lang/es.lang.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-    /**
-     * @file   es.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Spanish Language Pack (Only Basic Things)
-     **/
-
-    $lang->communication = 'Communication';
-    $lang->about_communication = '회원간의 쪽지나 친구 관리등 커뮤니케이션 기능을 수행하는 모듈입니다';
-
-    $lang->allow_message = 'Permitir la recepción del mensaje';
-    $lang->allow_message_type = array(
-             'Y' => 'Recibir todo',
-             'N' => 'Rechazar',
-             'F' => 'Sólo amigos',
-        );
-
-    $lang->message_box = array(
-        'R' => 'Recibido',
-        'S' => 'Enviado',
-        'T' => 'Buzon de Email',
-    );
-
-    $lang->readed_date = "Fecha Leído"; 
-
-    $lang->sender = 'Remitente';
-    $lang->receiver = 'Receptor';
-    $lang->friend_group = 'Grupo de amigos';
-    $lang->default_friend_group = 'Grupo desasignado';
-
-    $lang->cmd_send_message = 'Enviar Mensaje';
-    $lang->cmd_reply_message = 'Responder el mensaje';
-    $lang->cmd_view_friend = 'Amigos';
-    $lang->cmd_add_friend = 'Registrar como Amigo';
-    $lang->cmd_view_message_box = 'Buzón de mensajes';
-    $lang->cmd_store = "Guardar";
-    $lang->cmd_add_friend_group = 'agregar grupo de amigos';
-    $lang->cmd_rename_friend_group = 'Cambiar el nombre del grupo de amigos';
-
-    $lang->msg_no_message = 'No hay mensajes';
-    $lang->message_received = 'Usted ha recibido un mensaje';
-
-    $lang->msg_title_is_null = 'Por favor ingresar el título de la nota';
-    $lang->msg_content_is_null = 'Por favor ingresar el contenido';
-    $lang->msg_allow_message_to_friend = "Falló el envío por permitir sólo mensajes de sus amigos";
-    $lang->msg_disallow_message = 'Falló el envío por ser usuario rechazado para recibir mensajes';
-
-    $lang->about_allow_message = 'Usted puede decidir la recepción del mensaje';
-?>
diff --git a/modules/communication/lang/fr.lang.php b/modules/communication/lang/fr.lang.php
deleted file mode 100644
index c1a3b88aa..000000000
--- a/modules/communication/lang/fr.lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-    /**
-     * @file   fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent(PierreDuvent@gamil.com)
-     * @brief  Paquet du langage en français pour le module de Communication
-     **/
-
-    $lang->communication = 'Communication';
-    $lang->about_communication = 'Ce module exécute des fonctions communicatives comme Messages ou Amis';
-
-    $lang->allow_message = 'Recevoir les Messages';
-    $lang->allow_message_type = array(
-             'Y' => 'Recevoir tout',
-             'N' => 'Refuser tout',
-             'F' => 'Amis seulement',
-        );
-
-    $lang->message_box = array(
-        'R' => 'Reçu',
-        'S' => 'Envoyé',
-        'T' => 'Boîte aux Lettres',
-    );
-    $lang->readed_date = "Jour lu"; 
-
-    $lang->sender = 'Envoyeur';
-    $lang->receiver = 'Receveur';
-    $lang->friend_group = 'Groupe des Amis';
-    $lang->default_friend_group = 'Groupe pas assigné ';
-
-    $lang->cmd_send_message = 'Envoyer un Message';
-    $lang->cmd_reply_message = 'Répondre à un Message';
-    $lang->cmd_view_friend = 'Amis';
-    $lang->cmd_add_friend = 'Inscrire des Amis';
-    $lang->cmd_view_message_box = 'Lire des Messages';
-    $lang->cmd_store = "Conserver";
-    $lang->cmd_add_friend_group = 'Ajouter un Groupe des Amis';
-    $lang->cmd_rename_friend_group = 'Modifier le Nom du Groupe des Amis';
-
-    $lang->msg_no_message = 'Nul Message';
-    $lang->message_received = 'Nouveau message';
-
-    $lang->msg_title_is_null = 'Entrez le titre du message, S.V.P.';
-    $lang->msg_content_is_null = 'Entrez le contenu, S.V.P.';
-    $lang->msg_allow_message_to_friend = "Echoué à envoyer parce que le receveur permet seulement les messages des Amis.";
-    $lang->msg_disallow_message = 'Echoué à envoyer parce que le receveur refuse la réception des messages';
-
-    $lang->about_allow_message = 'Vous pouvez refuser la réception des messages';
-?>
diff --git a/modules/communication/lang/jp.lang.php b/modules/communication/lang/jp.lang.php
deleted file mode 100644
index be4a29728..000000000
--- a/modules/communication/lang/jp.lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-    /**
-     * @file   modules/member/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ、liahona
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    $lang->communication = 'コミュニケーション';
-    $lang->about_communication = '会員間にメッセージや友達管理などコミュニティ機能を提供するモジュールです。';
-
-    $lang->allow_message = 'メッセージの受信';
-    $lang->allow_message_type = array(
-             'Y' => '全て受信',
-             'N' => '全て受信しない',
-             'F' => '友達からのみ受信する',
-        );
-
-    $lang->message_box = array(
-        'R' => 'メッセージ受信箱',
-        'S' => 'メッセージ送信箱',
-        'T' => '保存箱',
-    );
-
-    $lang->readed_date = '開封時間'; 
-
-    $lang->sender = '送信者';
-    $lang->receiver = '受信者';
-    $lang->friend_group = '友達グループ';
-    $lang->default_friend_group = 'グループ未指定';
-
-    $lang->cmd_send_message = 'メッセージ送信';
-    $lang->cmd_reply_message = 'メッセージ返信';
-    $lang->cmd_view_friend = '友達リスト';
-    $lang->cmd_add_friend = '友達登録';
-    $lang->cmd_view_message_box = 'メッセージ';
-    $lang->cmd_store = '保存';
-    $lang->cmd_add_friend_group = '友達グループ追加';
-    $lang->cmd_rename_friend_group = '友達グループ名変更';
-
-    $lang->msg_no_message = 'メッセージがありません。';
-    $lang->message_received = 'メッセージが届きました。';
-
-    $lang->msg_title_is_null = 'メッセージのタイトルを入力して下さい。';
-    $lang->msg_content_is_null = '内容を入力して下さい。';
-    $lang->msg_allow_message_to_friend = '友達からのみメッセージを受信出来るように設定したユーザであるため、送信出来ませんでした。';
-    $lang->msg_disallow_message = 'メッセージの受信を拒否している受信者であるため、送信出来ませんでした。';
-    $lang->about_allow_message = 'メッセージを受信するかを設定します。';
-?>
diff --git a/modules/communication/lang/ko.lang.php b/modules/communication/lang/ko.lang.php
deleted file mode 100644
index 35186374e..000000000
--- a/modules/communication/lang/ko.lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-    /**
-     * @file   modules/communication/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->communication = '커뮤니케이션';
-    $lang->about_communication = '회원 간의 쪽지나 친구 관리 등 커뮤니케이션 기능을 수행하는 모듈입니다.';
-
-    $lang->allow_message = '쪽지 수신 허용';
-    $lang->allow_message_type = array(
-             'Y' => '전체 수신',
-             'N' => '거부',
-             'F' => '친구만 허용',
-        );
-
-    $lang->message_box = array(
-        'R' => '받은 쪽지함',
-        'S' => '보낸 쪽지함',
-        'T' => '보관함',
-    );
-
-    $lang->readed_date = '읽은 시간';
-
-    $lang->sender = '보낸이';
-    $lang->receiver = '받는이';
-    $lang->friend_group = '친구 그룹';
-    $lang->default_friend_group = '그룹 미지정';
-
-    $lang->cmd_send_message = '쪽지 보내기';
-    $lang->cmd_reply_message = '쪽지 답장';
-    $lang->cmd_view_friend = '친구 보기';
-    $lang->cmd_add_friend = '친구 등록';
-    $lang->cmd_view_message_box = '쪽지함 보기';
-    $lang->cmd_store = '보관';
-    $lang->cmd_add_friend_group = '친구 그룹 추가';
-    $lang->cmd_rename_friend_group = '친구 그룹 이름 변경';
-
-    $lang->msg_no_message = '쪽지가 없습니다.';
-    $lang->message_received = '쪽지가 왔습니다.';
-
-    $lang->msg_title_is_null = '쪽지 제목을 입력해주세요.';
-    $lang->msg_content_is_null = '내용을 입력해주세요.';
-    $lang->msg_allow_message_to_friend = '친구에게만 쪽지 발송을 허용한 사용자라서 쪽지 발송을 하지 못했습니다.';
-    $lang->msg_disallow_message = '쪽지 수신을 거부한 사용자라서 쪽지 발송을 하지 못했습니다.';
-    $lang->about_allow_message = '쪽지 수신 여부를 결정할 수 있습니다.';
-?>
diff --git a/modules/communication/lang/lang.xml b/modules/communication/lang/lang.xml
new file mode 100644
index 000000000..58ff11d1f
--- /dev/null
+++ b/modules/communication/lang/lang.xml
@@ -0,0 +1,357 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="communication">
+		<value xml:lang="ko"><![CDATA[커뮤니케이션]]></value>
+		<value xml:lang="en"><![CDATA[Communication]]></value>
+		<value xml:lang="jp"><![CDATA[コミュニケーション]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员交流]]></value>
+		<value xml:lang="zh-TW"><![CDATA[交流]]></value>
+		<value xml:lang="ru"><![CDATA[Общение]]></value>
+		<value xml:lang="tr"><![CDATA[İletişim]]></value>
+		<value xml:lang="vi"><![CDATA[Thông báo]]></value>
+	</item>
+	<item name="about_communication">
+		<value xml:lang="ko"><![CDATA[회원 간의 쪽지나 친구 관리 등 커뮤니케이션 기능을 수행하는 모듈입니다.]]></value>
+		<value xml:lang="en"><![CDATA[This module is used for communication between members, such as exchanging messages or mamaging friends.]]></value>
+		<value xml:lang="jp"><![CDATA[会員間でメッセージや友達管理などコミュニティ機能を提供するモジュールです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理在线会员间短信息及好友功能的模块。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理短訊息及好友功能的模組。]]></value>
+		<value xml:lang="fr"><![CDATA[Ce module exécute des fonctions communicatives comme Messages ou Amis]]></value>
+		<value xml:lang="ru"><![CDATA[Модуль для общения между пользователями]]></value>
+		<value xml:lang="es"><![CDATA[회원간의 쪽지나 친구 관리등 커뮤니케이션 기능을 수행하는 모듈입니다]]></value>
+		<value xml:lang="tr"><![CDATA[İletişim modülü; üyelerin, mesajlaşması ve arkadaşlarıyla iletişimleri için kullanılan modüldür.]]></value>
+		<value xml:lang="vi"><![CDATA[Module này thực hiện chức năng giao tiếp, tin nhắn hay bạn bè.]]></value>
+	</item>
+	<item name="allow_message">
+		<value xml:lang="ko"><![CDATA[쪽지 수신 허용]]></value>
+		<value xml:lang="en"><![CDATA[Receive Messages]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージの受信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[接收短消息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[接收短訊息]]></value>
+		<value xml:lang="fr"><![CDATA[Recevoir les Messages]]></value>
+		<value xml:lang="ru"><![CDATA[Получать сообщения]]></value>
+		<value xml:lang="es"><![CDATA[Permitir la recepción del mensaje]]></value>
+		<value xml:lang="vi"><![CDATA[Nhận tin nhắn]]></value>
+	</item>
+	<item name="allow_message_type" type="array">
+		<item name="Y">
+			<value xml:lang="ko"><![CDATA[전체 수신]]></value>
+			<value xml:lang="en"><![CDATA[Receive All]]></value>
+			<value xml:lang="jp"><![CDATA[すべて受信]]></value>
+			<value xml:lang="zh-CN"><![CDATA[全部接收]]></value>
+			<value xml:lang="zh-TW"><![CDATA[全部接收]]></value>
+			<value xml:lang="fr"><![CDATA[Recevoir tout]]></value>
+			<value xml:lang="ru"><![CDATA[Принимать все]]></value>
+			<value xml:lang="es"><![CDATA[Recibir todo]]></value>
+			<value xml:lang="tr"><![CDATA[Hepsini Al]]></value>
+			<value xml:lang="vi"><![CDATA[Nhận tất cả]]></value>
+		</item>
+		<item name="N">
+			<value xml:lang="ko"><![CDATA[거부]]></value>
+			<value xml:lang="en"><![CDATA[Reject All]]></value>
+			<value xml:lang="jp"><![CDATA[すべて受信しない]]></value>
+			<value xml:lang="zh-CN"><![CDATA[拒收]]></value>
+			<value xml:lang="zh-TW"><![CDATA[全部拒收]]></value>
+			<value xml:lang="fr"><![CDATA[Refuser tout]]></value>
+			<value xml:lang="ru"><![CDATA[Отклонять все]]></value>
+			<value xml:lang="es"><![CDATA[Rechazar]]></value>
+			<value xml:lang="tr"><![CDATA[Hepsini Geri Çevir]]></value>
+			<value xml:lang="vi"><![CDATA[Từ chối tất cả]]></value>
+		</item>
+		<item name="F">
+			<value xml:lang="ko"><![CDATA[친구만 허용]]></value>
+			<value xml:lang="en"><![CDATA[Only Friends]]></value>
+			<value xml:lang="jp"><![CDATA[友達からのみ受信する]]></value>
+			<value xml:lang="zh-CN"><![CDATA[只允许好友]]></value>
+			<value xml:lang="zh-TW"><![CDATA[只允許好友]]></value>
+			<value xml:lang="fr"><![CDATA[Amis seulement]]></value>
+			<value xml:lang="ru"><![CDATA[Принимать только от друзей]]></value>
+			<value xml:lang="es"><![CDATA[Sólo amigos]]></value>
+			<value xml:lang="tr"><![CDATA[Sadece Arkadaşlar]]></value>
+			<value xml:lang="vi"><![CDATA[Chỉ bạn bè]]></value>
+		</item>
+	</item>
+	<item name="message_box" type="array">
+		<item name="R">
+			<value xml:lang="ko"><![CDATA[받은 쪽지함]]></value>
+			<value xml:lang="en"><![CDATA[Inbox]]></value>
+			<value xml:lang="jp"><![CDATA[メッセージ受信箱]]></value>
+			<value xml:lang="zh-CN"><![CDATA[收件箱]]></value>
+			<value xml:lang="zh-TW"><![CDATA[收信箱]]></value>
+			<value xml:lang="fr"><![CDATA[Reçu]]></value>
+			<value xml:lang="ru"><![CDATA[Полученные]]></value>
+			<value xml:lang="es"><![CDATA[Recibido]]></value>
+			<value xml:lang="tr"><![CDATA[Gelen]]></value>
+			<value xml:lang="vi"><![CDATA[Đã nhận]]></value>
+		</item>
+		<item name="S">
+			<value xml:lang="ko"><![CDATA[보낸 쪽지함]]></value>
+			<value xml:lang="en"><![CDATA[Sent]]></value>
+			<value xml:lang="jp"><![CDATA[メッセージ送信箱]]></value>
+			<value xml:lang="zh-CN"><![CDATA[发件箱]]></value>
+			<value xml:lang="zh-TW"><![CDATA[寄信箱]]></value>
+			<value xml:lang="fr"><![CDATA[Envoyé]]></value>
+			<value xml:lang="ru"><![CDATA[Отправленные]]></value>
+			<value xml:lang="es"><![CDATA[Enviado]]></value>
+			<value xml:lang="tr"><![CDATA[Gönderilmiş]]></value>
+			<value xml:lang="vi"><![CDATA[Gửi]]></value>
+		</item>
+		<item name="T">
+			<value xml:lang="ko"><![CDATA[보관함]]></value>
+			<value xml:lang="en"><![CDATA[Archive]]></value>
+			<value xml:lang="jp"><![CDATA[保存箱]]></value>
+			<value xml:lang="zh-CN"><![CDATA[保管箱]]></value>
+			<value xml:lang="zh-TW"><![CDATA[儲存箱]]></value>
+			<value xml:lang="fr"><![CDATA[Boîte aux Lettres]]></value>
+			<value xml:lang="ru"><![CDATA[Почтовый ящик]]></value>
+			<value xml:lang="es"><![CDATA[Buzon de Email]]></value>
+			<value xml:lang="tr"><![CDATA[PostaKutusu]]></value>
+			<value xml:lang="vi"><![CDATA[Hòm thư]]></value>
+		</item>
+	</item>
+	<item name="readed_date">
+		<value xml:lang="ko"><![CDATA[읽은 시간]]></value>
+		<value xml:lang="en"><![CDATA[Read Date]]></value>
+		<value xml:lang="jp"><![CDATA[開封時間]]></value>
+		<value xml:lang="zh-CN"><![CDATA[阅读日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[閱讀日期]]></value>
+		<value xml:lang="fr"><![CDATA[Jour lu]]></value>
+		<value xml:lang="ru"><![CDATA[Дата прочтения сообщения]]></value>
+		<value xml:lang="es"><![CDATA[Fecha Leído]]></value>
+		<value xml:lang="tr"><![CDATA[Okuma Tarihi]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày đọc]]></value>
+	</item>
+	<item name="sender">
+		<value xml:lang="ko"><![CDATA[보낸이]]></value>
+		<value xml:lang="en"><![CDATA[From]]></value>
+		<value xml:lang="jp"><![CDATA[送信者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[寄件人]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寄件人]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyeur]]></value>
+		<value xml:lang="ru"><![CDATA[Отправитель]]></value>
+		<value xml:lang="es"><![CDATA[Remitente]]></value>
+		<value xml:lang="tr"><![CDATA[Gönderen]]></value>
+		<value xml:lang="vi"><![CDATA[Người gửi]]></value>
+	</item>
+	<item name="receiver">
+		<value xml:lang="ko"><![CDATA[받는이]]></value>
+		<value xml:lang="en"><![CDATA[To]]></value>
+		<value xml:lang="jp"><![CDATA[受信者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[收件人]]></value>
+		<value xml:lang="zh-TW"><![CDATA[收件人]]></value>
+		<value xml:lang="fr"><![CDATA[Receveur]]></value>
+		<value xml:lang="ru"><![CDATA[Получатель]]></value>
+		<value xml:lang="es"><![CDATA[Receptor]]></value>
+		<value xml:lang="tr"><![CDATA[Alıcı]]></value>
+		<value xml:lang="vi"><![CDATA[Người nhận]]></value>
+	</item>
+	<item name="friend_group">
+		<value xml:lang="ko"><![CDATA[친구 그룹]]></value>
+		<value xml:lang="en"><![CDATA[Friend Group]]></value>
+		<value xml:lang="jp"><![CDATA[友達グループ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[好友组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[好友群組]]></value>
+		<value xml:lang="fr"><![CDATA[Groupe des Amis]]></value>
+		<value xml:lang="ru"><![CDATA[Группа Друзья]]></value>
+		<value xml:lang="es"><![CDATA[Grupo de amigos]]></value>
+		<value xml:lang="tr"><![CDATA[Arkadaş Grubu]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm bạn]]></value>
+	</item>
+	<item name="default_friend_group">
+		<value xml:lang="ko"><![CDATA[그룹 미지정]]></value>
+		<value xml:lang="en"><![CDATA[Unassigned Group]]></value>
+		<value xml:lang="jp"><![CDATA[グループ未指定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[组未指定]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組未指定]]></value>
+		<value xml:lang="fr"><![CDATA[Groupe pas assigné ]]></value>
+		<value xml:lang="ru"><![CDATA[Незарегистрированная группа]]></value>
+		<value xml:lang="es"><![CDATA[Grupo desasignado]]></value>
+		<value xml:lang="tr"><![CDATA[Atanmamış Grup]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm mặc định]]></value>
+	</item>
+	<item name="cmd_send_message">
+		<value xml:lang="ko"><![CDATA[쪽지 보내기]]></value>
+		<value xml:lang="en"><![CDATA[Send Message]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージ送信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送短消息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送短訊息]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyer un Message]]></value>
+		<value xml:lang="ru"><![CDATA[Отправить сообщение]]></value>
+		<value xml:lang="es"><![CDATA[Enviar Mensaje]]></value>
+		<value xml:lang="tr"><![CDATA[Mesaj Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi tin nhắn]]></value>
+	</item>
+	<item name="cmd_reply_message">
+		<value xml:lang="ko"><![CDATA[쪽지 답장]]></value>
+		<value xml:lang="en"><![CDATA[Reply Message]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージ返信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[回复短消息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[回覆短訊息]]></value>
+		<value xml:lang="fr"><![CDATA[Répondre à un Message]]></value>
+		<value xml:lang="ru"><![CDATA[Ответить]]></value>
+		<value xml:lang="es"><![CDATA[Responder el mensaje]]></value>
+		<value xml:lang="tr"><![CDATA[Mesajı Yanıtla]]></value>
+		<value xml:lang="vi"><![CDATA[Trả lời tin nhắn]]></value>
+	</item>
+	<item name="cmd_view_friend">
+		<value xml:lang="ko"><![CDATA[친구 보기]]></value>
+		<value xml:lang="en"><![CDATA[Friends]]></value>
+		<value xml:lang="jp"><![CDATA[友達リスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[我的好友]]></value>
+		<value xml:lang="zh-TW"><![CDATA[我的好友]]></value>
+		<value xml:lang="fr"><![CDATA[Amis]]></value>
+		<value xml:lang="ru"><![CDATA[Друзья]]></value>
+		<value xml:lang="es"><![CDATA[Amigos]]></value>
+		<value xml:lang="tr"><![CDATA[Arkadaşlar]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn bè]]></value>
+	</item>
+	<item name="cmd_add_friend">
+		<value xml:lang="ko"><![CDATA[친구 등록]]></value>
+		<value xml:lang="en"><![CDATA[Add Friend]]></value>
+		<value xml:lang="jp"><![CDATA[友達登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[加为好友]]></value>
+		<value xml:lang="zh-TW"><![CDATA[加為好友]]></value>
+		<value xml:lang="fr"><![CDATA[Inscrire des Amis]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить в друзья]]></value>
+		<value xml:lang="es"><![CDATA[Registrar como Amigo]]></value>
+		<value xml:lang="tr"><![CDATA[Arkadaş Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm bạn]]></value>
+	</item>
+	<item name="cmd_view_message_box">
+		<value xml:lang="ko"><![CDATA[쪽지함 보기]]></value>
+		<value xml:lang="en"><![CDATA[Message Box]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[短信箱]]></value>
+		<value xml:lang="zh-TW"><![CDATA[短訊箱]]></value>
+		<value xml:lang="fr"><![CDATA[Lire des Messages]]></value>
+		<value xml:lang="ru"><![CDATA[Личные сообщений]]></value>
+		<value xml:lang="es"><![CDATA[Buzón de mensajes]]></value>
+		<value xml:lang="tr"><![CDATA[Mesaj Kutusu]]></value>
+		<value xml:lang="vi"><![CDATA[Hộp tin nhắn]]></value>
+	</item>
+	<item name="cmd_store">
+		<value xml:lang="ko"><![CDATA[보관]]></value>
+		<value xml:lang="en"><![CDATA[Save]]></value>
+		<value xml:lang="jp"><![CDATA[保存]]></value>
+		<value xml:lang="zh-CN"><![CDATA[保管]]></value>
+		<value xml:lang="zh-TW"><![CDATA[儲存]]></value>
+		<value xml:lang="fr"><![CDATA[Conserver]]></value>
+		<value xml:lang="ru"><![CDATA[Сохранить]]></value>
+		<value xml:lang="es"><![CDATA[Guardar]]></value>
+		<value xml:lang="tr"><![CDATA[Kaydet]]></value>
+		<value xml:lang="vi"><![CDATA[Lưu]]></value>
+	</item>
+	<item name="cmd_add_friend_group">
+		<value xml:lang="ko"><![CDATA[친구 그룹 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Friend Group]]></value>
+		<value xml:lang="jp"><![CDATA[友達グループ追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加好友组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增好友群組]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un Groupe des Amis]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить в группу друзей]]></value>
+		<value xml:lang="es"><![CDATA[agregar grupo de amigos]]></value>
+		<value xml:lang="tr"><![CDATA[Arkadaş Grubu Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm nhóm bạn]]></value>
+	</item>
+	<item name="cmd_rename_friend_group">
+		<value xml:lang="ko"><![CDATA[친구 그룹 이름 변경]]></value>
+		<value xml:lang="en"><![CDATA[Modify Friend Group Name]]></value>
+		<value xml:lang="jp"><![CDATA[友達グループ名変更]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改好友组名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改好友群組名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Modifier le Nom du Groupe des Amis]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить имя группы друзей]]></value>
+		<value xml:lang="es"><![CDATA[Cambiar el nombre del grupo de amigos]]></value>
+		<value xml:lang="tr"><![CDATA[Arkadaş Grubu İsmini Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sử tên nhóm]]></value>
+	</item>
+	<item name="msg_no_message">
+		<value xml:lang="ko"><![CDATA[쪽지가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is no message.]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージがありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有短消息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有短訊息。]]></value>
+		<value xml:lang="fr"><![CDATA[Nul Message]]></value>
+		<value xml:lang="ru"><![CDATA[Сообщений нет]]></value>
+		<value xml:lang="es"><![CDATA[No hay mensajes]]></value>
+		<value xml:lang="tr"><![CDATA[Mesaj yok]]></value>
+		<value xml:lang="vi"><![CDATA[Không có tin nhắn nào.]]></value>
+	</item>
+	<item name="message_received">
+		<value xml:lang="ko"><![CDATA[쪽지가 왔습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have a new message.]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージが届きました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您有新消息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您有新訊息。]]></value>
+		<value xml:lang="fr"><![CDATA[Nouveau message]]></value>
+		<value xml:lang="ru"><![CDATA[У Вас новое сообщение]]></value>
+		<value xml:lang="es"><![CDATA[Usted ha recibido un mensaje]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni bir mesajınız var]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có tin nhắn mới.]]></value>
+	</item>
+	<item name="msg_title_is_null">
+		<value xml:lang="ko"><![CDATA[쪽지 제목을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the title of message.]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージのタイトルを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入短消息标题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入短訊息標題。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le titre du message, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите тему сообщения]]></value>
+		<value xml:lang="es"><![CDATA[Por favor ingresar el título de la nota]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen mesaj başlığı giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng nhập tiêu đề của tin nhắn.]]></value>
+	</item>
+	<item name="msg_content_is_null">
+		<value xml:lang="ko"><![CDATA[내용을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the content.]]></value>
+		<value xml:lang="jp"><![CDATA[内容を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入内容。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入內容。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le contenu, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите содержание]]></value>
+		<value xml:lang="es"><![CDATA[Por favor ingresar el contenido]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen içeriği giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng nhập nội dung.]]></value>
+	</item>
+	<item name="msg_allow_message_to_friend">
+		<value xml:lang="ko"><![CDATA[친구에게만 쪽지 발송을 허용한 사용자라서 쪽지 발송을 하지 못했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to send a message because the recipient accepts messages from friends only.]]></value>
+		<value xml:lang="jp"><![CDATA[友達からのみメッセージを受信できるように設定したユーザーであるため、送信できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[因其为只允许接收好友短消息的用户，所以不能发送短消息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只允許接收好友短訊息的用戶，不能發送短訊息。]]></value>
+		<value xml:lang="fr"><![CDATA[Echoué à envoyer parce que le receveur permet seulement les messages des Amis.]]></value>
+		<value xml:lang="ru"><![CDATA[Сообщение не отправлено, поскольку являетесь пользователем, имеющим право посылать сообщения только друзьям]]></value>
+		<value xml:lang="es"><![CDATA[Falló el envío por permitir sólo mensajes de sus amigos]]></value>
+		<value xml:lang="tr"><![CDATA[Alıcı yalnızca arkadaşlarından gelen mesajları kabul ettiği için mesaj gönderilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể gửi vì người nhận chỉ chấp nhận những tin nhắn từ bạn bè của họ.]]></value>
+	</item>
+	<item name="msg_disallow_message">
+		<value xml:lang="ko"><![CDATA[쪽지 수신을 거부한 사용자라서 쪽지 발송을 하지 못했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to send a message because the recipient blocked receiving messages.]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージの受信を拒否している受信者であるため、送信できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[因其为拒绝接收短消息的用户，所以不能发送短消息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[拒絕接收短訊息的用戶，不能發送短訊息。]]></value>
+		<value xml:lang="fr"><![CDATA[Echoué à envoyer parce que le receveur refuse la réception des messages]]></value>
+		<value xml:lang="ru"><![CDATA[Сообщение не отправлено, поскольку получатель запретил прием сообщений]]></value>
+		<value xml:lang="es"><![CDATA[Falló el envío por ser usuario rechazado para recibir mensajes]]></value>
+		<value xml:lang="tr"><![CDATA[Alıcı mesaj alımını kapattığı için mesaj gönderilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể gửi vì người nhận đã từ chối nhận tin nhắn.]]></value>
+	</item>
+	<item name="about_allow_message">
+		<value xml:lang="ko"><![CDATA[쪽지 수신 여부를 결정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can set whether to receive messages or not.]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージを受信するか設定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以选择短消息接收与否。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可選擇是否接收短訊息。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez refuser la réception des messages]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить режим принятия сообщений]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede decidir la recepción del mensaje]]></value>
+		<value xml:lang="tr"><![CDATA[Mesaj alımını belirleyebilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đồng ý nhận tin nhắn.]]></value>
+	</item>
+	<item name="message_notice">
+		<value xml:lang="ko"><![CDATA[저작자에게 쪽지를 발송해서 이 사실을 알립니다. 작성하지 않으면 발송하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Send a message to the author about this. If you don't write a message, it is not sent.]]></value>
+		<value xml:lang="jp"><![CDATA[作成者にメッセージを送信し、知らせます。作成しなければ送信されません。]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/communication/lang/ru.lang.php b/modules/communication/lang/ru.lang.php
deleted file mode 100644
index e85546a84..000000000
--- a/modules/communication/lang/ru.lang.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->communication = 'Общение';
-    $lang->about_communication = 'Модуль для общения между пользователями';
-
-    $lang->allow_message = 'Получать сообщения';
-    $lang->allow_message_type = array(
-             'Y' => 'Принимать все',
-             'N' => 'Отклонять все',
-             'F' => 'Принимать только от друзей',
-                );
-
-
-    $lang->message_box = array(
-        'R' => 'Полученные',
-        'S' => 'Отправленные',
-        'T' => 'Почтовый ящик',
-    );
-
-    $lang->readed_date = "Дата прочтения сообщения"; 
-
-    $lang->sender = 'Отправитель';
-    $lang->receiver = 'Получатель';
-    $lang->friend_group = 'Группа Друзья';
-    $lang->default_friend_group = 'Незарегистрированная группа';
-
-    $lang->cmd_send_message = 'Отправить сообщение';
-    $lang->cmd_reply_message = 'Ответить';
-    $lang->cmd_view_friend = 'Друзья';
-    $lang->cmd_add_friend = 'Добавить в друзья';
-    $lang->cmd_view_message_box = 'Личные сообщений';
-    $lang->cmd_store = "Сохранить";
-    $lang->cmd_add_friend_group = 'Добавить в группу друзей';
-    $lang->cmd_rename_friend_group = 'Изменить имя группы друзей';
-
-    $lang->msg_no_message = 'Сообщений нет';
-    $lang->message_received = 'У Вас новое сообщение';
-
-    $lang->msg_title_is_null = 'Пожалуйста, введите тему сообщения';
-    $lang->msg_content_is_null = 'Пожалуйста, введите содержание';
-    $lang->msg_allow_message_to_friend = "Сообщение не отправлено, поскольку являетесь пользователем, имеющим право посылать сообщения только друзьям";
-    $lang->msg_disallow_message = 'Сообщение не отправлено, поскольку получатель запретил прием сообщений';
-    $lang->about_allow_message = 'Вы можете установить режим принятия сообщений';
-?>
diff --git a/modules/communication/lang/tr.lang.php b/modules/communication/lang/tr.lang.php
deleted file mode 100644
index 62607e379..000000000
--- a/modules/communication/lang/tr.lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only Basic Things)
-     **/
-
-    $lang->communication = 'İletişim';
-    $lang->about_communication = 'İletişim modülü; üyelerin, mesajlaşması ve arkadaşlarıyla iletişimleri için kullanılan modüldür.';
-
-    $lang->allow_message = 'Receive Messages';
-    $lang->allow_message_type = array(
-             'Y' => 'Hepsini Al',
-             'N' => 'Hepsini Geri Çevir',
-             'F' => 'Sadece Arkadaşlar',
-        );
-
-    $lang->message_box = array(
-        'R' => 'Gelen',
-        'S' => 'Gönderilmiş',
-        'T' => 'PostaKutusu',
-    );
-    $lang->readed_date = "Okuma Tarihi"; 
-
-    $lang->sender = 'Gönderen';
-    $lang->receiver = 'Alıcı';
-    $lang->friend_group = 'Arkadaş Grubu';
-    $lang->default_friend_group = 'Atanmamış Grup';
-
-    $lang->cmd_send_message = 'Mesaj Gönder';
-    $lang->cmd_reply_message = 'Mesajı Yanıtla';
-    $lang->cmd_view_friend = 'Arkadaşlar';
-    $lang->cmd_add_friend = 'Arkadaş Ekle';
-    $lang->cmd_view_message_box = 'Mesaj Kutusu';
-    $lang->cmd_store = "Kaydet";
-    $lang->cmd_add_friend_group = 'Arkadaş Grubu Ekle';
-    $lang->cmd_rename_friend_group = 'Arkadaş Grubu İsmini Düzenle';
-
-    $lang->msg_no_message = 'Mesaj yok';
-    $lang->message_received = 'Yeni bir mesajınız var';
-
-    $lang->msg_title_is_null = 'Lütfen mesaj başlığı giriniz';
-    $lang->msg_content_is_null = 'Lütfen içeriği giriniz';
-    $lang->msg_allow_message_to_friend = "Alıcı yalnızca arkadaşlarından gelen mesajları kabul ettiği için mesaj gönderilemedi";
-    $lang->msg_disallow_message = 'Alıcı mesaj alımını kapattığı için mesaj gönderilemedi';
-
-    $lang->about_allow_message = 'Mesaj alımını belirleyebilirsiniz';
-?>
diff --git a/modules/communication/lang/vi.lang.php b/modules/communication/lang/vi.lang.php
deleted file mode 100644
index ef9514c86..000000000
--- a/modules/communication/lang/vi.lang.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->communication = 'Thông báo';
-    $lang->about_communication = 'Module này thực hiện chức năng giao tiếp, tin nhắn hay bạn bè.';
-
-    $lang->allow_message = 'Nhận tin nhắn';
-    $lang->allow_message_type = array(
-             'Y' => 'Nhận tất cả',
-             'N' => 'Từ chối tất cả',
-             'F' => 'Chỉ bạn bè',
-        );
-
-    $lang->message_box = array(
-        'R' => 'Đã nhận',
-        'S' => 'Gửi',
-        'T' => 'Hòm thư',
-    );
-    $lang->readed_date = "Ngày đọc"; 
-
-    $lang->sender = 'Người gửi';
-    $lang->receiver = 'Người nhận';
-    $lang->friend_group = 'Nhóm bạn';
-    $lang->default_friend_group = 'Nhóm mặc định';
-
-    $lang->cmd_send_message = 'Gửi tin nhắn';
-    $lang->cmd_reply_message = 'Trả lời tin nhắn';
-    $lang->cmd_view_friend = 'Bạn bè';
-    $lang->cmd_add_friend = 'Thêm bạn';
-    $lang->cmd_view_message_box = 'Hộp tin nhắn';
-    $lang->cmd_store = "Lưu";
-    $lang->cmd_add_friend_group = 'Thêm nhóm bạn';
-    $lang->cmd_rename_friend_group = 'Sử tên nhóm';
-
-    $lang->msg_no_message = 'Không có tin nhắn nào.';
-    $lang->message_received = 'Bạn có tin nhắn mới.';
-
-    $lang->msg_title_is_null = 'Xin vui lòng nhập tiêu đề của tin nhắn.';
-    $lang->msg_content_is_null = 'Xin vui lòng nhập nội dung.';
-    $lang->msg_allow_message_to_friend = "Không thể gửi vì người nhận chỉ chấp nhận những tin nhắn từ bạn bè của họ.";
-    $lang->msg_disallow_message = 'Không thể gửi vì người nhận đã từ chối nhận tin nhắn.';
-
-    $lang->about_allow_message = 'Bạn có thể đồng ý nhận tin nhắn.';
-?>
diff --git a/modules/communication/lang/zh-CN.lang.php b/modules/communication/lang/zh-CN.lang.php
deleted file mode 100644
index e587513eb..000000000
--- a/modules/communication/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  简体中文语言包 (只收录基本内容)
-     **/
-
-    $lang->communication = '会员交流';
-    $lang->about_communication = '管理在线会员间短信息及好友功能的模块。';
-
-    $lang->allow_message = '接收短消息';
-    $lang->allow_message_type = array(
-             'Y' => '全部接收',
-             'N' => '拒收',
-             'F' => '只允许好友',
-        );
-
-    $lang->message_box = array(
-        'R' => '收件箱',
-        'S' => '发件箱',
-        'T' => '保管箱',
-    );
-
-    $lang->readed_date = "阅读日期"; 
-
-    $lang->sender = '寄件人';
-    $lang->receiver = '收件人';
-    $lang->friend_group = '好友组';
-    $lang->default_friend_group = '组未指定';
-
-    $lang->cmd_send_message = '发送短消息';
-    $lang->cmd_reply_message = '回复短消息';
-    $lang->cmd_view_friend = '我的好友';
-    $lang->cmd_add_friend = '加为好友';
-    $lang->cmd_view_message_box = '短信箱';
-    $lang->cmd_store = "保管";
-    $lang->cmd_add_friend_group = '添加好友组';
-    $lang->cmd_rename_friend_group = '修改好友组名称';
-
-    $lang->msg_no_message = '没有短消息。';
-    $lang->message_received = '您有新消息。';
-
-    $lang->msg_title_is_null = '请输入短消息标题。';
-    $lang->msg_content_is_null = '请输入内容。';
-    $lang->msg_allow_message_to_friend = '因其为只允许接收好友短消息的用户，所以不能发送短消息。';
-    $lang->msg_disallow_message = '因其为拒绝接收短消息的用户，所以不能发送短消息。';
-
-    $lang->about_allow_message = '可以选择短消息接收与否。';
-?>
diff --git a/modules/communication/lang/zh-TW.lang.php b/modules/communication/lang/zh-TW.lang.php
deleted file mode 100644
index 2b62b46c9..000000000
--- a/modules/communication/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-    /**
-     * @file   modules/communication/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  交流(communication)模組正體中文語言
-     **/
-
-    $lang->communication = '交流';
-    $lang->about_communication = '管理短訊息及好友功能的模組。';
-
-    $lang->allow_message = '接收短訊息';
-    $lang->allow_message_type = array(
-             'Y' => '全部接收',
-             'N' => '全部拒收',
-             'F' => '只允許好友',
-        );
-
-    $lang->message_box = array(
-        'R' => '收信箱',
-        'S' => '寄信箱',
-        'T' => '儲存箱',
-    );
-
-    $lang->readed_date = "閱讀日期"; 
-
-    $lang->sender = '寄件人';
-    $lang->receiver = '收件人';
-    $lang->friend_group = '好友群組';
-    $lang->default_friend_group = '群組未指定';
-
-    $lang->cmd_send_message = '發送短訊息';
-    $lang->cmd_reply_message = '回覆短訊息';
-    $lang->cmd_view_friend = '檢視好友';
-    $lang->cmd_add_friend = '加為好友';
-    $lang->cmd_view_message_box = '檢視短訊箱';
-    $lang->cmd_store = "儲存";
-    $lang->cmd_add_friend_group = '新增好友群組';
-    $lang->cmd_rename_friend_group = '修改好友群組名稱';
-
-    $lang->msg_no_message = '沒有短訊息。';
-    $lang->message_received = '您有新訊息。';
-
-    $lang->msg_title_is_null = '請輸入短訊息標題。';
-    $lang->msg_content_is_null = '請輸入內容。';
-    $lang->msg_allow_message_to_friend = '只允許接收好友短訊息的用戶，不能發送短訊息。';
-    $lang->msg_disallow_message = '拒絕接收短訊息的用戶，不能發送短訊息。';
-    $lang->about_allow_message = '可選擇是否接收短訊息。';
-?>
diff --git a/modules/communication/ruleset/addFriend.xml b/modules/communication/ruleset/addFriend.xml
new file mode 100644
index 000000000..27e72cf1e
--- /dev/null
+++ b/modules/communication/ruleset/addFriend.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+    </fields>
+</ruleset>
diff --git a/modules/communication/ruleset/addFriendGroup.xml b/modules/communication/ruleset/addFriendGroup.xml
new file mode 100644
index 000000000..b65ad171e
--- /dev/null
+++ b/modules/communication/ruleset/addFriendGroup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" length="1:240"/>
+    </fields>
+</ruleset>
diff --git a/modules/communication/ruleset/deleteCheckedFriend.xml b/modules/communication/ruleset/deleteCheckedFriend.xml
new file mode 100644
index 000000000..be9225a7e
--- /dev/null
+++ b/modules/communication/ruleset/deleteCheckedFriend.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="friend_srl_list" required="true"/>
+    </fields>
+</ruleset>
diff --git a/modules/communication/ruleset/insertConfig.xml b/modules/communication/ruleset/insertConfig.xml
new file mode 100644
index 000000000..27e72cf1e
--- /dev/null
+++ b/modules/communication/ruleset/insertConfig.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+    </fields>
+</ruleset>
diff --git a/modules/communication/ruleset/moveCheckedFriend.xml b/modules/communication/ruleset/moveCheckedFriend.xml
new file mode 100644
index 000000000..be9225a7e
--- /dev/null
+++ b/modules/communication/ruleset/moveCheckedFriend.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="friend_srl_list" required="true"/>
+    </fields>
+</ruleset>
diff --git a/modules/communication/ruleset/sendMessage.xml b/modules/communication/ruleset/sendMessage.xml
new file mode 100644
index 000000000..d194754f6
--- /dev/null
+++ b/modules/communication/ruleset/sendMessage.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" length="1:240"/>
+		<field name="content" required="true" length="1:"/>
+    </fields>
+</ruleset>
diff --git a/modules/communication/skins/default/add_friend.html b/modules/communication/skins/default/add_friend.html
index 70f1ac9a1..d8721862b 100644
--- a/modules/communication/skins/default/add_friend.html
+++ b/modules/communication/skins/default/add_friend.html
@@ -1,36 +1,33 @@
-<!--%import("filter/add_friend.xml")-->
-<!--%import("js/communication.js")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_add_friend}</h3>
+<load target="filter/add_friend.xml" />
+<load target="css/communication.css" />
+<load target="js/communication.js" />
+<h1 class="h1">{$lang->cmd_add_friend}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="get" onsubmit="return procFilter(this, add_friend)">
-<input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
-
-<div id="popBody">
-
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <th><div>{$lang->nick_name}</div></th>
-            <td><div class="member_{$target_info->member_srl}">{$target_info->nick_name}</div></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->friend_group}</div></th>
-            <td colspan="2">
-                <select name="friend_group_srl" class="fl">
-                    <option value="">{$lang->default_friend_group}</option>
-                    <!--@foreach($friend_group_list as $key => $val)-->
-                    <option value="{$val->friend_group_srl}">{$val->title}</option>
-                    <!--@end-->
-                </select> <a href="{getUrl('act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_add_friend_group}</span></a></span>
-            </td>
-        </tr>
-        </table>
-</div>
-
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_add_friend}" /></span>
-</div>
-
+<form ruleset="addFriend" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="communication" />
+	<input type="hidden" name="act" value="procCommunicationAddFriend" />
+	<input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->nick_name}</th>
+				<td>{$target_info->nick_name}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="friend_group_srl">{$lang->friend_group}</label></th>
+				<td>
+					<select name="friend_group_srl" id="friend_group_srl">
+						<option value="">{$lang->default_friend_group}</option>
+						<option loop="$friend_group_list => $key,$val" value="{$val->friend_group_srl}">{$val->title}</option>
+					</select> 
+					<a href="{getUrl('act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_add_friend}" /></span>
+	</div>
 </form>
diff --git a/modules/communication/skins/default/add_friend_group.html b/modules/communication/skins/default/add_friend_group.html
index 8283a8740..b558cfd73 100644
--- a/modules/communication/skins/default/add_friend_group.html
+++ b/modules/communication/skins/default/add_friend_group.html
@@ -1,30 +1,30 @@
-<!--%import("filter/add_friend_group.xml")-->
-<!--%import("js/communication.js")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">
-        <!--@if($friend_group->friend_group_srl)-->
-            {$lang->cmd_rename_friend_group}
-        <!--@else-->
-            {$lang->cmd_add_friend_group}
-        <!--@end-->
-    </h3>
-</div>
-<form action="./" method="get" onsubmit="return procFilter(this, add_friend_group)">
-<input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
-
-<div id="popBody">
-
-        <div class="text">
-            <p>{$lang->msg_insert_group_name}</p>
-            <input name="title" type="text" class="inputTypeText" value="{htmlspecialchars($friend_group->title)}"/>
-        </div>
-</div>
-<div id="popFooter">
-    <!--@if($friend_group->friend_group_srl)-->
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" /></span>
-    <!--@else-->
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_insert}" /></span>
-    <!--@end-->
+<load target="css/communication.css" />
+<load target="js/communication.js" />
+<h1 class="h1">
+	<!--@if($friend_group->friend_group_srl)-->
+		{$lang->cmd_rename_friend_group}
+	<!--@else-->
+		{$lang->cmd_add_friend_group}
+	<!--@end-->
+</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<form ruleset="addFriendGroup" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="communication" />
+	<input type="hidden" name="act" value="procCommunicationAddFriendGroup" />
+	<input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
+	<ul>
+		<li>
+			<p class="q">{$lang->msg_insert_group_name}</p>
+			<p class="a"><input name="title" type="text" value="{htmlspecialchars($friend_group->title)}"/></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<!--@if($friend_group->friend_group_srl)-->
+		<span class="btn"><input type="submit" value="{$lang->cmd_modify}" /></span>
+		<!--@else-->
+		<span class="btn"><input type="submit" value="{$lang->cmd_insert}" /></span>
+		<!--@end-->
+	</div>
 </form>
diff --git a/modules/communication/skins/default/common_header.html b/modules/communication/skins/default/common_header.html
index 7eaeb6c65..2b4d2fbe7 100644
--- a/modules/communication/skins/default/common_header.html
+++ b/modules/communication/skins/default/common_header.html
@@ -1,11 +1,10 @@
-<!--%import("js/communication.js")-->
-<!--%import("css/default.css")-->
-
-<div id="communicationModule">
-    <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
-    <ul class="localNavigation">
-        <!--@foreach($logged_info->menu_list as $key => $val)-->
-        <li <!--@if($key == $act)-->class="on"<!--@end-->><a href="{getUrl('act',$key)}">{Context::getLang($val)}</a></li>
-        <!--@end-->
-    </ul>
-    <!--@end-->
+<load target="css/communication.css" />
+<load target="js/communication.js" />
+<div class="xc">
+    <div class="nav" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
+		<ul>
+			<li loop="$logged_info->menu_list => $key,$val" class="active"|cond="$key==$act">
+				<a href="{getUrl('act',$key)}"><span>{Context::getLang($val)}</span></a>
+			</li>
+		</ul>
+	</div>
diff --git a/modules/communication/skins/default/css/communication.css b/modules/communication/skins/default/css/communication.css
new file mode 100644
index 000000000..b6d8b0533
--- /dev/null
+++ b/modules/communication/skins/default/css/communication.css
@@ -0,0 +1,113 @@
+@charset "utf-8";
+/* Element Reset */
+.xc,
+.xc table,
+.xc input,
+.xc textarea,
+.xc select,
+.xc button{font-family:Tahoma,Geneva,sans-serif;font-size:12px;color:#333}
+.xc button,
+.xc input[type=submit],
+.xc input[type=reset],
+.xc input[type=button]{cursor:pointer;overflow:visible}
+.xc img{border:0}
+.xc p{line-height:1.5}
+/* Heading */
+.xc .h1, 
+.xc .h2, 
+.xc .h3, 
+.xc .h4{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1}
+.xc .h1{border-bottom-width:4px;font-size:24px}
+.xc .h2{border-bottom-width:3px;font-size:20px}
+.xc .h3{border-bottom-width:2px;font-size:16px}
+.xc .h4{border-bottom-width:1px;font-size:12px}
+/* Lined Tab Navigation */
+.xc .nav{padding:0;margin:1em 0}
+.xc .nav ul{position:relative;margin:0;padding:0;list-style:none;border-bottom:1px solid #ccc;zoom:1}
+.xc .nav ul:after{content:"";display:block;clear:both}
+.xc .nav li{float:left;margin-bottom:-1px}
+.xc .nav li a{position:relative;float:left;text-decoration:none;border:1px solid #eee;border-bottom-color:#ccc;background:#fafafa;color:#333}
+.xc .nav li a span{display:inline-block;height:14px;padding:6px 15px 6px 15px;letter-spacing:-1px;cursor:pointer}
+.xc .nav li.active a{border:1px solid #ccc;border-bottom:1px solid #fff;margin-top:-1px;background:transparent}
+.xc .nav li.active a span{padding-top:7px;font-weight:bold}
+/* Form */
+.xc .form{margin:1em 0;padding:0}
+.xc .form fieldset{margin:0 0 2em 0;padding:0;border:0}
+.xc .form em{font-style:normal;color:#e00}
+.xc .form label{margin-right:1em;line-height:1;vertical-align:middle}
+.xc .form input[type=checkbox]+label,
+.xc .form input[type=radio]+label,
+.xc .form input[type=file]{cursor:pointer}
+.xc .form ul{position:relative;margin:0;padding:0;list-style:none;border-top:2px solid #ccc;border-bottom:1px solid #ccc;zoom:1}
+.xc .form li{list-style:none;border:1px solid #ddd;border-left:0;border-right:0;margin:-1px 0;padding:8px 0;vertical-align:top;zoom:1}
+.xc .form li:first-child{border-top:0}
+.xc .form li>label:first-child{display:block;font-weight:bold}
+.xc .form li label em{font-weight:normal}
+.xc .form label.overlap{position:absolute;color:#aaa}
+.xc .form input[type=text],
+.xc .form input[type=password],
+.xc .form input[type=file],
+.xc .form textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
+.xc .form input[type=text],
+.xc .form input[type=password],
+.xc .form input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}
+.xc .form input[type=text].loading,
+.xc .form input.loading[type=password]{padding-right:24px;width:260px;background:transparent url(../img/preLoader16.gif) no-repeat 265px center}
+.xc .form input[type=checkbox],
+.xc .form input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle}
+.xc .form input[type=text][disabled=disabled],
+.xc .form input[type=password][disabled=disabled],
+.xc .form input[type=checkbox][disabled=disabled],
+.xc .form input[type=radio][disabled=disabled],
+.xc .form input[type=file][disabled=disabled],
+.xc .form textarea[disabled=disabled],
+.xc .form select[disabled=disabled]{background:#ddd !important;text-shadow:1px 1px 0 #fff}
+.xc .form textarea{padding:3px 4px;vertical-align:top}
+.xc .form span.desc, 
+.xc .form em.desc{line-height:22px;vertical-align:middle;margin:0 10px}
+.xc .form p.desc{margin:.25em 0;line-height:1.4}
+.xc .form .q{font-weight:bold;margin:0 0 5px 0}
+.xc .form .a{margin:0 0 5px 0}
+.xc .form .tgForm{margin-right:1em}
+.xc .form .h1 + ul,
+.xc .form .h2 + ul,
+.xc .form .h3 + ul,
+.xc .form .h4 + ul{border-top:0}
+/* Table */
+.xc .table{margin:1em 0}
+.xc .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc}
+.xc .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}
+.xc .table caption:after{content:"";display:block;clear:both}
+.xc .table caption a{font-weight:normal}
+.xc .table caption em{float:right;margin-left:1em}
+.xc .table caption strong{color:#e00}
+.xc .table caption .side{float:right;font-weight:normal;margin-left:1em}
+.xc .table th,
+.xc .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap}
+.xc .table th{background:#f8f8f8}
+.xc .table thead th{border-bottom:1px solid #999}
+.xc .table tfoot td{font-weight:bold;background:#f8f8f8}
+.xc .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa}
+.xc .table td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle}
+.xc .table img{vertical-align:middle}
+.xc .table em{font-style:normal;font-weight:normal;color:#e00}
+.xc .table .title,
+.xc .table .text{white-space:normal}
+/* Pagination */
+.xc .pagination{margin:1em 0;text-align:center;line-height:normal}
+.xc .pagination *{vertical-align:middle}
+.xc .pagination a,
+.xc .pagination strong{position:relative;display:inline-block;padding:2px 4px;font-weight:bold;text-decoration:none;line-height:normal;color:#333 !important;vertical-align:middle}
+.xc .pagination a:hover,
+.xc .pagination a:active,
+.xc .pagination a:focus{border:1px solid #ddd;margin:0 -1px}
+.xc .pagination strong{color:#e00 !important;font-size:20px}
+.xc .pagination .direction{font-weight:normal;white-space:nowrap}
+.xc .pagination .direction:hover,
+.xc .pagination .direction:active,
+.xc .pagination .direction:focus{border:0;margin:0;text-decoration:underline}
+.xc .pagination input{width:30px;text-align:center}
+.xc .pagination button{overflow:visible}
+/* Text Button */
+.xc input.text, 
+.xc button.text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a;background:none;text-decoration:underline}
diff --git a/modules/communication/skins/default/css/default.css b/modules/communication/skins/default/css/default.css
deleted file mode 100644
index 81c1ca0cc..000000000
--- a/modules/communication/skins/default/css/default.css
+++ /dev/null
@@ -1,123 +0,0 @@
-@charset "utf-8";
-
-#communicationModule h3 {border-bottom:2px solid #ccc; padding:5px 0 5px 25px; margin:0 0 10px 0; background:url(../img/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
-#communicationModule h4 {padding:5px 0 5px 20px; background:url(../img/iconH3.gif) no-repeat left center;}
-#communicationModule h4 span.vr { font-size:11px; color:#AAA; }
-#communicationModule h4 a.view { font-size:11px; font-family:vertical; color:#777e86; }
-#communicationModule p.summary, 
-#communicationModule div.infoText { margin:0 0 15px 0; line-height:1.6;}
-#communicationModule p.summary{ color:#888;}
-#communicationModule p.summary a { text-decoration:none; color:#888; }
-#communicationModule p.summary.red { color:#A54D4D; }
-#communicationModule p.summary.red a { text-decoration:none; color:#A54D4D; }
-#communicationModule div.infoText { color:#888;}
-
-#communicationModule .agreementBox { border:1px solid #CCC; margin:10px 0 0 0; padding:10px; border-bottom:none; height:200px; overflow-y:scroll;}
-#communicationModule .agreementButton { background-color:#EFEFEF; padding:10px; border:1px solid #CCC; border-top:none; margin-bottom:10px;}
-
-#communicationModule .localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; }
-#communicationModule .localNavigation:after {content:""; display:block; clear:both;}
-#communicationModule .localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
-#communicationModule .localNavigation li a{ float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(../img/bgTab.gif) repeat-x;}
-#communicationModule .localNavigation li a{ text-decoration:none !important; color:#666;}
-#communicationModule .localNavigation li.active a{ font-weight:bold; color:#1e6aac;}
-#communicationModule .localNavigation li.on { margin-bottom:-1px;}
-#communicationModule .localNavigation li.on a{ height:19px; background:none;}
-
-#communicationModule .layer { display:none; position:absolute; border:2px solid #777; margin:0; font-size:12px; background:#fff;}
-#communicationModule .layer * { margin:0; padding:0; font-size:12px; }
-#communicationModule .layer h4 { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
-#communicationModule .layer .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
-#communicationModule .layer .xButton span { position:relative; z-index:-1; visibility:hidden; }
-#communicationModule .layer .layerBody{ margin:15px;}
-
-#communicationModule .crossTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
-#communicationModule .crossTable th div { white-space:nowrap; }
-#communicationModule .crossTable th,
-#communicationModule .crossTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
-#communicationModule .crossTable thead th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
-#communicationModule .crossTable thead th:first-child{ background-image:none;}
-#communicationModule .crossTable tbody th{ border-bottom:1px solid #e5e5e5; text-align:left;}
-#communicationModule .crossTable td{ border-bottom:1px solid #f0f0f0;}
-
-#communicationModule .colTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
-#communicationModule .colTable th div { white-space:nowrap; }
-#communicationModule .colTable th,
-#communicationModule .colTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
-#communicationModule .colTable th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background:#f4f4f4; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
-#communicationModule .colTable th:first-child{ background-image:none;}
-#communicationModule .colTable td{ border-bottom:1px solid #f0f0f0;}
-
-#communicationModule .rowTable{ width:100%; border:0; border-top:2px solid #cfcfcf; margin:0 0 20px 0; padding:0;}
-#communicationModule .rowTable th div { white-space:nowrap; }
-#communicationModule .rowTable th,
-#communicationModule .rowTable td{ border:0; padding:10px 10px; text-align:left; vertical-align:top; font-weight:normal;}
-#communicationModule .rowTable tbody th{ border-bottom:1px solid #e5e5e5;}
-#communicationModule .rowTable td{ border-bottom:1px solid #e5e5e5;}
-
-#communicationModule .rowTable th.button, 
-#communicationModule .colTable th.button, 
-#communicationModule .crossTable th.button { text-align:right; background:#EAEAEA; }
-
-#communicationModule .colTable td a,
-#communicationModule .rowTable td a,
-#communicationModule .crossTable td a { color:#000; text-decoration:none; }
-
-#communicationModule .colTable td.wide, 
-#communicationModule .rowTable td.wide, 
-#communicationModule .crossTable td.wide { width:100%;}
-
-#communicationModule .rowTable th.title,
-#communicationModule .crossTable th.title,
-#communicationModule .colTable th.title { padding:10px; font-weight:bold; text-align:center; border-bottom:1px solid #DDD;  background:url(../img/bgTab.gif) repeat-x left bottom;}
-
-#communicationModule .rowTable th.title *,
-#communicationModule .crossTable th.title *,
-#communicationModule .colTable th.title * { padding:0; margin:0; vertical-align:middle; }
-
-#communicationModule p { margin:3px 0 0 0; padding:0;}
-#dummy_check_nick_name { color:red; margin:3px 0 0 0; padding:0; }
-#communicationModule .require { color:red; font-size:10px; font-family:tahoma; font-weight:bold; margin-left:5px; }
-#communicationModule .publicItem { margin:5px 0 0 0; padding:0; color:#aaa; }
-#communicationModule .publicItem input { padding:0; margin: 0; }
-
-#communicationModule caption{ font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
-
-#communicationModule td.openids div { float:left; margin-right:10px; margin-bottom:10px; }
-#communicationModule td.openids div a { color:#AAA; text-decoration:none;}
-#communicationModule .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:200px;}
-#communicationModule .insertOpenID { clear:both; margin-top:10px; }
-#communicationModule .savedContent { margin-top:10px; border:1px solid #EEE; padding:10px; }
-
-#communicationModule .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
-#communicationModule .pagination *{ margin:0; padding:0;}
-#communicationModule .pagination img{ border:0;}
-#communicationModule .pagination a,
-#communicationModule .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-#communicationModule .pagination a:hover,
-#communicationModule .pagination a:active,
-#communicationModule .pagination a:focus{ background-color:#f4f4f4 !important; }
-#communicationModule .pagination strong{ color:#ff6600 !important;}
-#communicationModule .pagination a.prev,
-#communicationModule .pagination a.prevEnd,
-#communicationModule .pagination a.next,
-#communicationModule .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-#communicationModule .pagination.a1 a,
-#communicationModule .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-#communicationModule .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
-#communicationModule .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
-#communicationModule .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
-#communicationModule .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
-
-#communicationModule .regdate { font-size:10px; font-family:tahoma; color:#AAA; }
-#communicationModule .readed_date  { font-size:10px; font-family:tahoma; color:#888; letter-spacing:-1px;}
-
-#communicationModule .xeMessages ,
-#communicationModule .xeGroups { position:relative; }
-#communicationModule .xeMessages select ,
-#communicationModule .xeGroups select { margin:0; padding:0; vertical-align:middle; }
-#communicationModule .xeGroups .setupGroup, 
-#communicationModule .xeMessages .setupMessage { position:absolute; right:0; top:0;}
-
-#communicationModule .jumpMenu { margin-bottom:5px; text-align:right; }
diff --git a/modules/communication/skins/default/friends.html b/modules/communication/skins/default/friends.html
index d8931181e..9ac3c1877 100644
--- a/modules/communication/skins/default/friends.html
+++ b/modules/communication/skins/default/friends.html
@@ -1,86 +1,77 @@
-<!--#include("./common_header.html")-->
-
-<!--%import("filter/delete_checked_friend.xml")-->
-<!--%import("filter/delete_friend_group.xml")-->
-<!--%import("filter/move_friend.xml")-->
-
-<div class="xeGroups">
-
-    <h3>{$member_title = $lang->cmd_view_friend } ({$total_count})</h3>
-
-    <form id="fo_friend_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
-
-        <div class="setupGroup">
-            <select name="friend_group_list" id="friend_group_list">
-                <!--@foreach($friend_group_list as $key => $val)-->
-                <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
-                <!--@end-->
-            </select>
-            <a href="#" onclick="doRenameFriendGroup();return false;" class="button small blue"><span>{$lang->cmd_modify}</span></a>
-            <a href="#" onclick="doDeleteFriendGroup();return false;" class="button small red"><span>{$lang->cmd_delete}</span></a>
-            <a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="button small black strong"><span>{$lang->cmd_add_friend_group}</span></a>
-        </div>
-
-        <div class="jumpMenu">
-            <select name="jumpMenu" id="jumpMenu">
-                <option value="">{$lang->default_friend_group}</option>
-                <!--@foreach($friend_group_list as $key => $val)-->
-                <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
-                <!--@end-->
-            </select><a href="#" onclick="doJumpFriendGroup(); return false;" class="small button"><span>{$lang->cmd_move}</span></a>
-        </div>
-
-        <table cellspacing="0" class="colTable">
-        <tr>
-            <th class="title"><div>{$lang->friend_group}<div></th>
-            <th class="title"><div><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' }); return false;" /> {$lang->nick_name}<div></th>
-            <th class="title"><div>{$lang->regdate}<div></th>
-        </tr>
-        <tbody>
-            <!--@foreach($friend_list as $no => $val)-->
-            <tr>
-                <td class="nowrap">{$val->group_title?$val->group_title:"&nbsp;"}</td>
-                <td class="nowrap"><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /><span class="member_{$val->target_srl}">{$val->nick_name}</span></td>
-                <td class="nowrap"><span class="regdate">{zdate($val->regdate,"Y-m-d")}</span></td>
-            </tr>
-            <!--@end-->
-            <tr>
-                <th class="button" colspan="3">
-                    <select name="target_friend_group_srl">
-                        <!--@foreach($friend_group_list as $key => $val)-->
-                        <option value="{$val->friend_group_srl}">{$val->title}</option>
-                        <!--@end-->
-                    </select>
-                    <a href="#" onclick="doMoveFriend();return false;" class="small button blue"><span>{$lang->cmd_move}</span></a>
-                    <span class="small button red"><input type="submit" value="{$lang->cmd_delete}" /></span>
-                    <a href="{getUrl('act','','message_type','','friend_gruop_srl','')}" class="small button"><span>{$lang->cmd_back}</span></a>
-                </th>
-            </tr>
-        </tbody>
-        </table>
-
-        <!-- 페이지 네비게이션 -->
-        <div class="pagination a1">
-            <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-            <!--@while($page_no = $page_navigation->getNextPage())-->
-                <!--@if($page == $page_no)-->
-                    <strong>{$page_no}</strong> 
-                <!--@else-->
-                    <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
-                <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
-        </div>
-
-
-    </form>
-
-
-    <!-- 그룹 삭제를 위한 빈 form -->
-    <form action="./" method="get" id="for_delete_group">
-        <input type="hidden" name="friend_group_srl" value="" />
-    </form>
-</div>
-
-
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+<load target="filter/delete_friend_group.xml" />
+<load target="filter/move_friend.xml" />
+<h1 class="h1">{$member_title = $lang->cmd_view_friend }</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="deleteCheckedFriend" id="fo_friend_list" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="communication" />
+	<input type="hidden" name="act" value="procCommunicationDeleteFriend" />
+
+	<div class="btnArea">
+		<span class="etc">
+			<select name="jumpMenu" id="jumpMenu">
+				<option value="">{$lang->default_friend_group}</option>
+				<!--@foreach($friend_group_list as $key => $val)-->
+				<option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+				<!--@end-->
+			</select>
+			<button type="button" onclick="doJumpFriendGroup()">{$lang->cmd_move}</button>
+		</span>
+		<select name="friend_group_list" id="friend_group_list">
+			<!--@foreach($friend_group_list as $key => $val)-->
+			<option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+			<!--@end-->
+		</select>
+		<button type="button" onclick="doRenameFriendGroup();return false;">{$lang->cmd_modify}</button>
+		<button type="button" onclick="doDeleteFriendGroup();return false;">{$lang->cmd_delete}</button>
+		<a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;">{$lang->cmd_add_friend_group}</a>
+	</div>
+
+	<div class="table even">
+		<table width="100%" border="1" cellspacing="0">
+			<caption>Total: {$total_count}</caption>
+			<thead>
+				<tr>
+					<th>{$lang->friend_group}</th>
+					<th>{$lang->nick_name}</th>
+					<th>{$lang->regdate}</th>
+					<th><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' });" /></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr loop="$friend_list => $no,$val">
+					<td>{$val->group_title?$val->group_title:"&nbsp;"}</td>
+					<td><a href="#popup_menu_area" class="member_{$val->target_srl}">{$val->nick_name}</a></td>
+					<td>{zdate($val->regdate,"Y-m-d")}</td>
+					<td><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<select name="target_friend_group_srl">
+			<!--@foreach($friend_group_list as $key => $val)-->
+			<option value="{$val->friend_group_srl}">{$val->title}</option>
+			<!--@end-->
+		</select>
+		<button type="submit" name="act" value="procCommunicationMoveFriend">{$lang->cmd_move}</button>
+		<button type="submit" name="act" value="procCommunicationDeleteFriend">{$lang->cmd_delete}</button>
+	</div>
+	<div class="pagination">
+		<a href="{getUrl('page','','document_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+		<!--@while($page_no = $page_navigation->getNextPage())-->
+			<!--@if($page == $page_no)-->
+				<strong>{$page_no}</strong> 
+			<!--@else-->
+				<a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+			<!--@end-->
+		<!--@end-->
+		<a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+	</div>
+</form>
+<form action="./" method="get" id="for_delete_group">
+	<input type="hidden" name="friend_group_srl" value="" />
+</form>
+<include target="./common_footer.html" />
diff --git a/modules/communication/skins/default/messages.html b/modules/communication/skins/default/messages.html
index fefb2d320..63f22eb37 100644
--- a/modules/communication/skins/default/messages.html
+++ b/modules/communication/skins/default/messages.html
@@ -1,123 +1,99 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/delete_checked_message.xml")-->
-<!--%import("filter/update_allow_message.xml")-->
-
-<div class="xeMessages">
-    <form action="./" method="POST" onsubmit="return procFilter(this, update_allow_message)" class="setupMessage">
-        <select name="allow_message">
-            <!--@foreach($lang->allow_message_type as $key => $val)-->
-            <option value="{$key}" <!--@if($logged_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <span class="button"><input type="submit" value="{$lang->cmd_save}"></span>
-    </form>
-
-
-    <form action="./" method="GET" onsubmit="location.href=current_url.setQuery('message_srl','').setQuery('message_type',this.message_box.options[this.message_box.selectedIndex].value); return false;">
-    <h3>
-        <select name="message_box">
-            <!--@foreach($lang->message_box as $key => $val)-->
-            <option <!--@if($key==$message_type)-->selected="selected"<!--@end--> value="{$key}" >{$val}</option>
-            <!--@end-->
-        </select>
-        <span class="button"><input type="submit" value="{$lang->cmd_select}" /></span>
-    </h3>
-    </form>
-
-
-    <!--@if($message)-->
-    <table class="colTable">
-    <tr>
-        <th class="title"><div>{$message->title}</div></th>
-    </tr>
-    <tr>
-        <td>
-            <span class="member_{$message->member_srl}">{$message->nick_name}</span>
-            <span class="regdate">{zdate($message->regdate, "Y.m.d H:i:s")}</span>
-        </td>
-    </tr>
-    <tr>
-        <td>
-            <div class="xe_content">{$message->content}</div>
-        </td>
-    </tr>
-    <tr>
-        <th class="button">
-            <!--@if($message->message_type != "S" && $message->member_srl != $logged_info->member_srl)-->
-            <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button black strong"><span>{$lang->cmd_reply_message}</span></a>
-            <!--@end-->
-            <!--@if($message->message_type == "R")-->
-            <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button green"><span>{$lang->cmd_store}</span></a>
-            <!--@end-->
-            <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
-        </th>
-    </tr>
-    </table>
-    <!--@end-->
-
-    <form action="./" method="get" onsubmit="return procFilter(this, delete_checked_message)" id="fo_message_list">
-    <input type="hidden" name="message_type" value="{$message_type}" />
-
-        <table cellspacing="0" class="rowTable">
-        <thead>
-        <tr>
-            <th class="title"><div>
-                <input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('message_srl_list', { wrap:'fo_message_list' }); return false;" />
-                {$lang->title}
-            </div></th>
-            <th class="title"><div>
-                <!--@if($message_type == "S")-->
-                    {$lang->receiver}
-                <!--@else-->
-                    {$lang->sender}
-                <!--@end-->
-            </div></th>
-            <th class="title"><div>{$lang->regdate}</div></th>
-        </tr>
-        </thead>
-
-        <tbody>
-            <!--@foreach($message_list as $no => $val)-->
-            <tr>
-                <td class="wide">
-                    <input name="message_srl_list" type="checkbox" value="{$val->message_srl}" />
-                    <!--@if($val->readed=='Y')-->
-                        <a href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a>
-                    <!--@else-->
-                        <span style="font-weight:bold"><a href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a></span>
-                    <!--@end-->
-                </td>
-                <td class="nowrap">
-                    <div class="member_{$val->member_srl}">{$val->nick_name}</div></td>
-                </td>
-                <td class="nowrap">
-                    <div class="regdate">{zdate($val->regdate,"Y-m-d")}</div>
-                    <!--@if($val->readed=="Y")--><div class="readed_date">{zdate($val->readed_date,"Y-m-d H:i:s")}</div><!--@end-->
-                </td>
-            </tr>
-            <!--@end-->
-            <tr>
-                <th colspan="4" class="button">
-                    <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
-                </th>
-            </tr>
-        </tbody>
-        </table>
-
-    </form>
-
-    <!-- 페이지 네비게이션 -->
-    <div class="pagination a1">
-        <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-        <!--@while($page_no = $page_navigation->getNextPage())-->
-            <!--@if($page == $page_no)-->
-                <strong>{$page_no}</strong> 
-            <!--@else-->
-                <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
-            <!--@end-->
-        <!--@end-->
-        <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
-    </div>
-</div>
-
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+<load target="filter/delete_checked_message.xml" />
+<load target="filter/update_allow_message.xml" />
+<div class="btnArea">
+	<form action="./" method="GET" class="etc" onsubmit="location.href=current_url.setQuery('message_srl','').setQuery('message_type',this.message_box.options[this.message_box.selectedIndex].value); return false;">
+		<select name="message_box">
+			<option loop="$lang->message_box => $key,$val" selected="selected"|cond="$key==$message_type" value="{$key}" >{$val}</option>
+		</select>
+		<input type="submit" value="{$lang->cmd_select}" />
+	</form>
+	<form action="./" method="POST" class="setupMessage">
+		<input type="hidden" name="module" value="communication" />
+		<input type="hidden" name="act" value="procCommunicationUpdateAllowMessage" />
+		<input type="hidden" name="message_type" value="{$message_type}" />
+		<select name="allow_message">
+			<option loop="$lang->allow_message_type => $key,$val" value="{$key}" selected="selected"|cond="$logged_info->allow_message==$key">{$val}</option>
+		</select>
+		<input type="submit" value="{$lang->cmd_save}">
+	</form>
+</div>
+<div class="table even" cond="$message">
+	<table width="100%" border="1" cellspacing="0">
+		<tr>
+			<th class="title">{$message->title}</th>
+		</tr>
+		<tr>
+			<td>
+				<a href="popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a>
+				{zdate($message->regdate, "Y.m.d H:i")}
+			</td>
+		</tr>
+		<tr>
+			<td class="text">
+				<div class="xe_content">{$message->content}</div>
+			</td>
+		</tr>
+	</table>
+	<div class="btnArea">
+		<button cond="$message->message_type != 'S' && $message->member_srl != $logged_info->member_srl" type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');">{$lang->cmd_reply_message}</button>
+		<button cond="$message->message_type == 'R'" type="button" onclick="doStoreMessage('{$message->message_srl}');">{$lang->cmd_store}</button>
+		<button type="button" onclick="doDeleteMessage('{$message->message_srl}');">{$lang->cmd_delete}</button>
+	</div>
+</div>
+
+<form action="./" method="get" id="fo_message_list">
+	<input type="hidden" name="module" value="communication" />
+	<input type="hidden" name="act" value="procCommunicationDeleteMessages" />
+	<input type="hidden" name="message_type" value="{$message_type}" />
+	<div class="table even">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col" class="title">{$lang->title}</th>
+					<th scope="col">
+						<!--@if($message_type == "S")-->
+						{$lang->receiver}
+						<!--@else-->
+						{$lang->sender}
+						<!--@end-->
+					</th>
+					<th scope="col">{$lang->regdate}</th>
+					<th scope="col">{$lang->readed_date}</th>
+					<th scope="col"><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('message_srl_list', { wrap:'fo_message_list' });" /></th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr loop="$message_list => $no,$val">
+					<td class="title">
+						<a cond="$val->readed=='Y'" href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a>
+						<a cond="$val->readed!='Y'" href="{getUrl('message_srl',$val->message_srl)}"><strong>{$val->title}</strong></a>
+					</td>
+					<td>
+						<a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a>
+					</td>
+					<td> 
+						{zdate($val->regdate,"Y-m-d")}
+					</td>
+					<td><block cond="$val->readed=='Y'">{zdate($val->readed_date,"Y-m-d H:i")}</block>&nbsp;</td>
+					<td><input name="message_srl_list[]" type="checkbox" value="{$val->message_srl}" /></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<input type="submit" value="{$lang->cmd_delete}" />
+	</div>
+</form>
+<div class="pagination">
+	<a href="{getUrl('page','','document_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		<!--@if($page == $page_no)-->
+			<strong>{$page_no}</strong> 
+		<!--@else-->
+			<a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+		<!--@end-->
+	<!--@end-->
+	<a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+<include target="./common_footer.html" />
diff --git a/modules/communication/skins/default/new_message.html b/modules/communication/skins/default/new_message.html
index 90a7de5ce..496bb5b80 100644
--- a/modules/communication/skins/default/new_message.html
+++ b/modules/communication/skins/default/new_message.html
@@ -1,39 +1,29 @@
-<!--%import("js/communication.js")-->
+<load target="js/communication.js" />
 <!--@if($message)-->
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->message_received}</h3>
-</div>
-
-<div id="popBody">
-
-    <table cellspacing="0" class="rowTable">
-    <!--@if($message->member_srl != $logged_info->member_srl)-->
-    <tr>
-        <th><div>{$lang->sender}</div></th>
-        <td><div class="member_{$message->member_srl}">{$message->nick_name}</div></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th><div>{$lang->title}</div></th>
-        <td>{htmlspecialchars($message->title)}</td>
-    </tr>
-    <tr>
-        <td colspan="2">{$message->content}</td>
-    </tr>
+<h1 class="h1">{$lang->message_received}</h1>
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
+		<!--@if($message->member_srl != $logged_info->member_srl)-->
+		<tr>
+			<th scope="row">{$lang->sender}</th>
+			<td><a href="#popup_menu_area" class="member_{$message->member_srl}">{$message->nick_name}</a></td>
+		</tr>
+		<!--@end-->
+		<tr>
+			<th scope="row">{$lang->title}</th>
+			<td class="title">{htmlspecialchars($message->title)}</td>
+		</tr>
+		<tr>
+			<td colspan="2" class="xe_content">{$message->content}</td>
+		</tr>
     </table>
 </div>
-
-<div id="popFooter">
-    <a href="#" onclick="location.href=location.href;return false;" class="button black strong"><span>{$lang->cmd_next}</span></a>
+<div class="btnArea">
+    <span class="etc"><button type="button" onclick="location.href=location.href;return false;">{$lang->cmd_next}</button></span>
     <!--@if($message->member_srl != $logged_info->member_srl)-->
-        <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_reply_message}</span></a>
+        <button type="button" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;">{$lang->cmd_reply_message}</button>
     <!--@end-->
-    <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button blue"><span>{$lang->cmd_store}</span></a>
-    <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+    <button type="button" onclick="doStoreMessage('{$message->message_srl}');return false;">{$lang->cmd_store}</button>
+    <button type="button" onclick="doDeleteMessage('{$message->message_srl}');return false;">{$lang->cmd_delete}</button>
 </div>
-
-<!--@else-->
-<script type="text/javascript">
-    window.close();
-</script>
 <!--@end-->
diff --git a/modules/communication/skins/default/send_message.html b/modules/communication/skins/default/send_message.html
index 7e9c0402d..07cb65fd2 100644
--- a/modules/communication/skins/default/send_message.html
+++ b/modules/communication/skins/default/send_message.html
@@ -1,41 +1,31 @@
-<!--%import("filter/send_message.xml")-->
-<!--%import("js/communication.js")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_send_message}</h3>
+<load target="js/communication.js" />
+<h1 class="h1">{$lang->cmd_send_message}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="get" onsubmit="return procFilter(this, send_message)">
-<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
-<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
-
-<div id="popBody">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th><div><label for="textfield1">{$lang->receiver}</label></div></th>
-        <td><div class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</div></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->title}</div></th>
-        <td><input type="text" name="title" id="message_title" class="inputTypeText w300" value="{$source_message->title}"/></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->cmd_option}</div></th>
-        <td><input type="checkbox" value="Y" name="send_mail"  /> {$lang->cmd_send_mail}</td>
-    </tr>
-    </table>
-
-    {$editor}
-
-</div>
-
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_send_message}" class="editor_button" accesskey="s" /></span>
-</div>
-
+<form ruleset="sendMessage" action="./" method="get">
+	<input type="hidden" name="module" value="communication" />
+	<input type="hidden" name="act" value="procCommunicationSendMessage" />
+	<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
+	<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0" class="form">
+			<tr>
+				<th scope="row"><label for="textfield1">{$lang->receiver}</label></th>
+				<td>{$receiver_info->nick_name}</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->title}</th>
+				<td><input type="text" name="title" id="message_title" value="{$source_message->title}"/></td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->cmd_option}</th>
+				<td><input type="checkbox" value="Y" name="send_mail" /> {$lang->cmd_send_mail}</td>
+			</tr>
+		</table>
+		{$editor}
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_send_message}" /></span>
+	</div>
 </form>
-
-<script type="text/javascript">
-    xAddEventListener(window, 'load', function() { xGetElementById("message_title").focus(); });
-</script>
diff --git a/modules/communication/skins/default/skin.xml b/modules/communication/skins/default/skin.xml
index ed3560255..14c240e70 100644
--- a/modules/communication/skins/default/skin.xml
+++ b/modules/communication/skins/default/skin.xml
@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">기본 스킨</title>
-    <title xml:lang="zh-CN">默认皮肤</title>
-    <title xml:lang="jp">基本スキン</title>
-    <title xml:lang="en">Default Skin</title>
-    <title xml:lang="vi">Skin Mặc định</title>
-    <title xml:lang="es">Por defecto piel</title>
-    <title xml:lang="ru">기본 스킨</title>
-    <title xml:lang="zh-TW">預設面板</title>
-    <title xml:lang="tr">Varsayılan Dış Görünüm</title>
-    <description xml:lang="ko">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="zh-CN">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="jp">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="en">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="vi">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="es">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="ru">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="zh-TW">
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="tr">
-        NHN (developers@xpressengine.com)
-    </description>
-    <version>0.1</version>
-    <date>2008-05-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="white" src="screenshot/white.gif">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="en">default</title>
-            <title xml:lang="vi">Mặc định</title>
-            <title xml:lang="es">Por defecto</title>
-            <title xml:lang="ru">умолчанию</title>
-            <title xml:lang="zh-TW">預設</title>
-            <title xml:lang="tr">varsayılan</title>
-        </color>
-        <color name="cyan" src="screenshot/cyan.gif">
-          <title xml:lang="ko">청록색</title>
-          <title xml:lang="jp">青緑</title>
-          <title xml:lang="zh-CN">青绿色</title>
-          <title xml:lang="en">cyan</title>
-          <title xml:lang="vi">Cyan</title>
-          <title xml:lang="es">Cian</title>
-          <title xml:lang="ru">бирюзовый</title>
-          <title xml:lang="zh-TW">青綠色</title>
-          <title xml:lang="tr">Deniz Mavisi</title>
-        </color>
-        <color name="green" src="screenshot/green.gif">
-          <title xml:lang="ko">초록색</title>
-          <title xml:lang="jp">緑</title>
-          <title xml:lang="zh-CN">绿色</title>
-          <title xml:lang="en">green</title>
-          <title xml:lang="vi">Green</title>
-          <title xml:lang="es">Verde</title>
-          <title xml:lang="ru">зеленый</title>
-          <title xml:lang="zh-TW">綠色</title>
-          <title xml:lang="tr">Yeşil</title>
-        </color>
-        <color name="red" src="screenshot/red.gif">
-          <title xml:lang="ko">빨간색</title>
-          <title xml:lang="jp">赤</title>
-          <title xml:lang="zh-CN">红色</title>
-          <title xml:lang="en">red</title>
-          <title xml:lang="vi">Red</title>
-          <title xml:lang="es">Roja</title>
-          <title xml:lang="ru">красный</title>
-          <title xml:lang="zh-TW">紅色</title>
-          <title xml:lang="tr">Kırmızı</title>
-        </color>
-        <color name="purple" src="screenshot/purple.gif">
-          <title xml:lang="ko">보라색</title>
-          <title xml:lang="jp">紫</title>
-          <title xml:lang="zh-CN">紫色</title>
-          <title xml:lang="en">purple</title>
-          <title xml:lang="vi">Purple</title>
-          <title xml:lang="es">Púrpura</title>
-          <title xml:lang="ru">Лиловый</title>
-          <title xml:lang="zh-TW">紫色</title>
-          <title xml:lang="tr">Mor</title>
-        </color>
-        <color name="black" src="screenshot/black.gif">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="vi">Black</title>
-            <title xml:lang="ru">Черного</title>
-            <title xml:lang="es">Negro</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-            <title xml:lang="tr">Siyah</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">기본 스킨</title>
+    <title xml:lang="zh-CN">默认皮肤</title>
+    <title xml:lang="jp">基本スキン</title>
+    <title xml:lang="en">Default Skin</title>
+    <title xml:lang="vi">Skin Mặc định</title>
+    <title xml:lang="es">Por defecto piel</title>
+    <title xml:lang="ru">기본 스킨</title>
+    <title xml:lang="zh-TW">預設面板</title>
+    <title xml:lang="tr">Varsayılan Dış Görünüm</title>
+    <description xml:lang="ko">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="jp">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="vi">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="es">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="ru">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-TW">
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="tr">
+        NHN (developers@xpressengine.com)
+    </description>
+    <version>0.1</version>
+    <date>2008-05-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white" src="screenshot/white.gif">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="es">Por defecto</title>
+            <title xml:lang="ru">умолчанию</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">varsayılan</title>
+        </color>
+        <color name="cyan" src="screenshot/cyan.gif">
+          <title xml:lang="ko">청록색</title>
+          <title xml:lang="jp">青緑</title>
+          <title xml:lang="zh-CN">青绿色</title>
+          <title xml:lang="en">cyan</title>
+          <title xml:lang="vi">Cyan</title>
+          <title xml:lang="es">Cian</title>
+          <title xml:lang="ru">бирюзовый</title>
+          <title xml:lang="zh-TW">青綠色</title>
+          <title xml:lang="tr">Deniz Mavisi</title>
+        </color>
+        <color name="green" src="screenshot/green.gif">
+          <title xml:lang="ko">초록색</title>
+          <title xml:lang="jp">緑</title>
+          <title xml:lang="zh-CN">绿色</title>
+          <title xml:lang="en">green</title>
+          <title xml:lang="vi">Green</title>
+          <title xml:lang="es">Verde</title>
+          <title xml:lang="ru">зеленый</title>
+          <title xml:lang="zh-TW">綠色</title>
+          <title xml:lang="tr">Yeşil</title>
+        </color>
+        <color name="red" src="screenshot/red.gif">
+          <title xml:lang="ko">빨간색</title>
+          <title xml:lang="jp">赤</title>
+          <title xml:lang="zh-CN">红色</title>
+          <title xml:lang="en">red</title>
+          <title xml:lang="vi">Red</title>
+          <title xml:lang="es">Roja</title>
+          <title xml:lang="ru">красный</title>
+          <title xml:lang="zh-TW">紅色</title>
+          <title xml:lang="tr">Kırmızı</title>
+        </color>
+        <color name="purple" src="screenshot/purple.gif">
+          <title xml:lang="ko">보라색</title>
+          <title xml:lang="jp">紫</title>
+          <title xml:lang="zh-CN">紫色</title>
+          <title xml:lang="en">purple</title>
+          <title xml:lang="vi">Purple</title>
+          <title xml:lang="es">Púrpura</title>
+          <title xml:lang="ru">Лиловый</title>
+          <title xml:lang="zh-TW">紫色</title>
+          <title xml:lang="tr">Mor</title>
+        </color>
+        <color name="black" src="screenshot/black.gif">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="vi">Black</title>
+            <title xml:lang="ru">Черного</title>
+            <title xml:lang="es">Negro</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+            <title xml:lang="tr">Siyah</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/modules/communication/tpl/colorset_list.html b/modules/communication/tpl/colorset_list.html
index 84223d3b7..22c8bd9fe 100644
--- a/modules/communication/tpl/colorset_list.html
+++ b/modules/communication/tpl/colorset_list.html
@@ -12,5 +12,4 @@
     <img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
     <!--@end-->
 </div>
-<!--@if($key%2==1)--><div class="clear"></div><!--@end-->
 <!--@end-->
diff --git a/modules/communication/tpl/index.html b/modules/communication/tpl/index.html
index 9523c0eef..372764b57 100644
--- a/modules/communication/tpl/index.html
+++ b/modules/communication/tpl/index.html
@@ -1,54 +1,50 @@
-<!--%import("js/communication_admin.js")-->
-<!--%import("../../editor/tpl/js/editor_module_config.js",optimized=false)-->
-<!--%import("filter/insert_config.xml")-->
-
-<h3 class="xeAdmin">{$lang->communication} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<div class="infoText">{nl2br($lang->about_communication)}</div>
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->editor_skin}</div></th>
-        <td>
-            <select name="editor_skin" onchange="getEditorSkinColorList(this.value)">
-            <!--@foreach($editor_skin_list as $editor_skin)-->
-            <option value="{$editor_skin}" <!--@if($editor_skin==$communication_config->editor_skin)-->selected="selected"<!--@end-->>{$editor_skin}</option>
-            <!--@end-->
-            </select>
-            <select name="editor_colorset" id="sel_editor_colorset" style="display:none">
-            </select>
-            <script type="text/javascript">//<![CDATA[
-                getEditorSkinColorList('{$communication_config->editor_skin}','{$communication_config->editor_colorset}');
-            //]]></script>
-        </td>
-    </tr>
-
-    <tr>
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td>
-            <select name="skin" onchange="doGetSkinColorset(this.options[this.selectedIndex].value);return false;">
-            <!--@foreach($communication_skin_list as $key=>$val)-->
-            <option value="{$key}" <!--@if($key==$communication_config->skin)-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td><div id="communication_colorset"></div></td>
-    </tr>
-
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        </th>
-    </tr>
-    </table>
-
+<load target="js/communication_admin.js" usecdn="true" />
+<load target="../../editor/tpl/js/editor_module_config.js" usecdn="true" />
+<h1 class="h1">{$lang->communication} <em>{$lang->cmd_management}</em></h1>
+<p>{nl2br($lang->about_communication)}</p>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertConfig" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="communication" />
+	<input type="hidden" name="act" value="procCommunicationAdminInsertConfig">
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->editor_skin}</th>
+				<td>
+					<select name="editor_skin" onchange="getEditorSkinColorList(this.value)">
+					<!--@foreach($editor_skin_list as $editor_skin)-->
+					<option value="{$editor_skin}" <!--@if($editor_skin==$communication_config->editor_skin)-->selected="selected"<!--@end-->>{$editor_skin}</option>
+					<!--@end-->
+					</select>
+					<select name="editor_colorset" id="sel_editor_colorset" style="display:none">
+					</select>
+					<script type="text/javascript">//<![CDATA[
+						getEditorSkinColorList('{$communication_config->editor_skin}','{$communication_config->editor_colorset}');
+					//]]></script>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->skin}</th>
+				<td>
+					<select name="skin" onchange="doGetSkinColorset(this.options[this.selectedIndex].value);return false;">
+					<!--@foreach($communication_skin_list as $key=>$val)-->
+					<option value="{$key}" <!--@if($key==$communication_config->skin)-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->colorset}</th>
+				<td><div id="communication_colorset"></div></td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
-
 <script type="text/javascript">
     jQuery(function() { doGetSkinColorset("{$communication_config->skin}"); });
 </script>
diff --git a/modules/counter/conf/info.xml b/modules/counter/conf/info.xml
index c3c3c2529..2b610bf04 100644
--- a/modules/counter/conf/info.xml
+++ b/modules/counter/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">접속통계</title>
-    <title xml:lang="zh-CN">访问统计</title>
-    <title xml:lang="en">Counter</title>
-    <title xml:lang="vi">Counter</title>
-    <title xml:lang="es">Contador</title>
-    <title xml:lang="jp">アクセスカウンター</title>
-    <title xml:lang="ru">Базовый счетчик</title>
-    <title xml:lang="zh-TW">基本統計</title>
-    <title xml:lang="tr">Sayaç</title>
-    <description xml:lang="ko">기본 접속 통계 프로그램입니다.</description>
-    <description xml:lang="zh-CN">默认访问统计程序。</description>
-    <description xml:lang="en">Basic connection statistics program.</description>
-    <description xml:lang="vi">Chương trình thống kê kết nối cơ bản.</description>
-    <description xml:lang="es">Programa básico para la estadística de la conección.</description>
-    <description xml:lang="jp">デフォルトアクセス統計のプログラムです。</description>
-    <description xml:lang="ru">Базовая программа статистики подключений.</description>
-    <description xml:lang="zh-TW">預設的統計程式。</description>
-    <description xml:lang="tr">Temel bağlantı istatistik programı.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>statistics</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">접속통계</title>
+    <title xml:lang="zh-CN">访问统计</title>
+    <title xml:lang="en">Counter</title>
+    <title xml:lang="vi">Counter</title>
+    <title xml:lang="es">Contador</title>
+    <title xml:lang="jp">アクセスカウンター</title>
+    <title xml:lang="ru">Базовый счетчик</title>
+    <title xml:lang="zh-TW">基本統計</title>
+    <title xml:lang="tr">Sayaç</title>
+    <description xml:lang="ko">기본 접속 통계 프로그램입니다.</description>
+    <description xml:lang="zh-CN">默认访问统计程序。</description>
+    <description xml:lang="en">Basic connection statistics program.</description>
+    <description xml:lang="vi">Chương trình thống kê kết nối cơ bản.</description>
+    <description xml:lang="es">Programa básico para la estadística de la conección.</description>
+    <description xml:lang="jp">デフォルトアクセス統計のプログラムです。</description>
+    <description xml:lang="ru">Базовая программа статистики подключений.</description>
+    <description xml:lang="zh-TW">預設的統計程式。</description>
+    <description xml:lang="tr">Temel bağlantı istatistik programı.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>statistics</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/counter/counter.admin.view.php b/modules/counter/counter.admin.view.php
index 8ef40d49e..5e3565892 100644
--- a/modules/counter/counter.admin.view.php
+++ b/modules/counter/counter.admin.view.php
@@ -1,50 +1,47 @@
-<?php
-    /**
-     * @class  counterAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  counter 모듈의 Admin view class
-     **/
-
-    class counterAdminView extends counter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 템플릿 경로 지정 
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 관리자 페이지 초기화면
-         **/
-        function dispCounterAdminIndex() {
-            // 정해진 일자가 없으면 오늘자로 설정
-            $selected_date = Context::get('selected_date');
-            if(!$selected_date) $selected_date = date("Ymd");
-            Context::set('selected_date', $selected_date);
-
-            // counter model 객체 생성
-            $oCounterModel = &getModel('counter');
-
-            // 전체 카운터 및 지정된 일자의 현황 가져오기
-            $site_module_info = Context::get('site_module_info');
-            $status = $oCounterModel->getStatus(array(0,$selected_date),$site_module_info->site_srl);
-            Context::set('total_counter', $status[0]);
-            Context::set('selected_day_counter', $status[$selected_date]);
-
-            // 시간, 일, 월, 년도별로 데이터 가져오기
-            $type = Context::get('type');
-            if(!$type) {
-                $type = 'day';
-                Context::set('type',$type);
-            }
-            $detail_status = $oCounterModel->getHourlyStatus($type, $selected_date, $site_module_info->site_srl);
-            Context::set('detail_status', $detail_status);
-            
-            // 표시
-            $this->setTemplateFile('index');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  counterAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief Admin view class of counter module
+     **/
+
+    class counterAdminView extends counter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // set the template path
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Admin page 
+         **/
+        function dispCounterAdminIndex() {
+            // set today's if no date is given
+            $selected_date = Context::get('selected_date');
+            if(!$selected_date) $selected_date = date("Ymd");
+            Context::set('selected_date', $selected_date);
+            // create the counter model object
+            $oCounterModel = &getModel('counter');
+            // get a total count and daily count
+            $site_module_info = Context::get('site_module_info');
+            $status = $oCounterModel->getStatus(array(0,$selected_date),$site_module_info->site_srl);
+            Context::set('total_counter', $status[0]);
+            Context::set('selected_day_counter', $status[$selected_date]);
+            // get data by time, day, month, and year
+            $type = Context::get('type');
+            if(!$type) {
+                $type = 'day';
+                Context::set('type',$type);
+            }
+            $detail_status = $oCounterModel->getHourlyStatus($type, $selected_date, $site_module_info->site_srl);
+            Context::set('detail_status', $detail_status);
+            
+            // display
+            $this->setTemplateFile('index');
+        }
+
+    }
+?>
diff --git a/modules/counter/counter.class.php b/modules/counter/counter.class.php
index a6f9a9b72..80dcfe842 100644
--- a/modules/counter/counter.class.php
+++ b/modules/counter/counter.class.php
@@ -1,55 +1,53 @@
-<?php
-    /**
-     * @class  counter
-     * @author NHN (developers@xpressengine.com)
-     * @brief  counter 모듈의 high class
-     **/
-
-    class counter extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            $oCounterController = &getController('counter');
-
-            // 0 일자로 기록될 전체 방문 기록 row 추가
-            //$oCounterController->insertTotalStatus();
-
-            // 오늘자 row입력
-            //$oCounterController->insertTodayStatus();
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            // 카운터에 site_srl추가
-            $oDB = &DB::getInstance();
-            if(!$oDB->isColumnExists('counter_log', 'site_srl')) return true;
-            if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) return true;
-            
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            // 카운터에 site_srl추가
-            $oDB = &DB::getInstance();
-            if(!$oDB->isColumnExists('counter_log', 'site_srl')) $oDB->addColumn('counter_log','site_srl','number',11,0,true);
-            if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) $oDB->addIndex('counter_log','idx_site_counter_log',array('site_srl','ipaddress'),false);
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  counter
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of counter module
+     **/
+
+    class counter extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            $oCounterController = &getController('counter');
+            // add a row for the total visit history 
+            //$oCounterController->insertTotalStatus();
+            // add a row for today's status
+            //$oCounterController->insertTodayStatus();
+
+            return new Object();
+        }
+
+        /**
+         * @brief method if successfully installed
+         **/
+        function checkUpdate() {
+            // Add site_srl to the counter
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists('counter_log', 'site_srl')) return true;
+            if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) return true;
+            
+            return false;
+        }
+
+        /**
+         * @brief Update
+         **/
+        function moduleUpdate() {
+            // Add site_srl to the counter
+            $oDB = &DB::getInstance();
+            if(!$oDB->isColumnExists('counter_log', 'site_srl')) $oDB->addColumn('counter_log','site_srl','number',11,0,true);
+            if(!$oDB->isIndexExists('counter_log','idx_site_counter_log')) $oDB->addIndex('counter_log','idx_site_counter_log',array('site_srl','ipaddress'),false);
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/counter/counter.controller.php b/modules/counter/counter.controller.php
index 19708a8a6..c4b6b3c21 100644
--- a/modules/counter/counter.controller.php
+++ b/modules/counter/counter.controller.php
@@ -1,145 +1,145 @@
-<?php
-    /**
-     * @class  counterController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  counter 모듈의 controller class
-     **/
-
-    class counterController extends counter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 카운터 기록
-         **/
-        function procCounterExecute() {
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = (int)$site_module_info->site_srl;
-
-            // 로그를 검사
-            $oCounterModel = &getModel('counter');
-
-            // 오늘자 row가 있는지 체크하여 없으면 등록
-            if(!$oCounterModel->isInsertedTodayStatus($site_srl)) {
-                $this->insertTodayStatus(0,$site_srl);
-
-            // 기존 row가 있으면 사용자 체크 
-            } else {
-
-                // 등록되어 있지 않은 아이피일 경우
-                if(!$oCounterModel->isLogged($site_srl)) {
-                    // 로그 등록
-                    $this->insertLog($site_srl);
-
-                    // unique 및 pageview 등록
-                    $this->insertUniqueVisitor($site_srl);
-                } else {
-                    // pageview 등록
-                    $this->insertPageView($site_srl);
-                }
-            }
-
-            $oDB->commit();
-        }
-
-        /**
-         * @brief 로그 등록 
-         **/
-        function insertLog($site_srl=0) {
-            $args->regdate = date("YmdHis");
-            $args->user_agent = substr ($_SERVER['HTTP_USER_AGENT'], 0, 250);
-            $args->site_srl = $site_srl;
-            return executeQuery('counter.insertCounterLog', $args);
-        }
-
-        /**
-         * @brief unique visitor 등록
-         **/
-        function insertUniqueVisitor($site_srl=0) {
-            if($site_srl) {
-				$args->regdate = '0';
-                $args->site_srl = $site_srl;
-                $output = executeQuery('counter.updateSiteCounterUnique', $args);
-				$args->regdate = date('Ymd');
-                $output = executeQuery('counter.updateSiteCounterUnique', $args);
-            } else {
-				$args->regdate = '0';
-                $output = executeQuery('counter.updateCounterUnique', $args);
-				$args->regdate = date('Ymd');
-                $output = executeQuery('counter.updateCounterUnique', $args);
-            }
-        }
-
-        /**
-         * @brief pageview 등록
-         **/
-        function insertPageView($site_srl=0) {
-            if($site_srl) { 
-				$args->regdate = '0';
-                $args->site_srl = $site_srl;
-                executeQuery('counter.updateSiteCounterPageview', $args);
-				$args->regdate = date('Ymd');
-                executeQuery('counter.updateSiteCounterPageview', $args);
-            } else {
-				$args->regdate = '0';
-                executeQuery('counter.updateCounterPageview', $args);
-				$args->regdate = date('Ymd');
-                executeQuery('counter.updateCounterPageview', $args);
-            }
-        }
-
-        /**
-         * @brief 전체 카운터 status 추가
-         **/
-        function insertTotalStatus($site_srl=0) {
-            $args->regdate = 0;
-            if($site_srl) {
-                $args->site_srl = $site_srl;
-                executeQuery('counter.insertSiteTodayStatus', $args);
-            } else {
-                executeQuery('counter.insertTodayStatus', $args);
-            }
-        }
-
-        /**
-         * @brief 오늘자 카운터 status 추가
-         **/
-        function insertTodayStatus($regdate = 0, $site_srl=0) {
-            if($regdate) $args->regdate = $regdate;
-            else $args->regdate = date("Ymd");
-            if($site_srl) {
-                $args->site_srl = $site_srl;
-                $query_id = 'counter.insertSiteTodayStatus';
-
-                $u_args->site_srl = $site_srl; ///< 일별 row입력시 전체 row (regdate=0)도 같이 입력 시도
-                executeQuery($query_id, $u_args);
-            } else {
-                $query_id = 'counter.insertTodayStatus';
-                executeQuery($query_id); ///< 일별 row입력시 전체 row (regdate=0)도 같이 입력 시도
-            }
-            $output = executeQuery($query_id, $args);
-
-            // 로그 등록
-            $this->insertLog($site_srl);
-
-            // unique 및 pageview 등록
-            $this->insertUniqueVisitor($site_srl);
-        }
-
-        /**
-         * @brief 특정 가상 사이트의 카운터 로그 삭제
-         **/
-        function deleteSiteCounterLogs($site_srl) {
-            $args->site_srl = $site_srl;
-            executeQuery('counter.deleteSiteCounter',$args);
-            executeQuery('counter.deleteSiteCounterLog',$args);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  counterController
+     * @author NHN (developers@xpressengine.com)
+     * @brief counter module's controller class
+     **/
+
+    class counterController extends counter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Counter logs
+		 * @deprecated, if want use below function, you can use 'counterExecute' function instead this function
+         **/
+        function procCounterExecute() {
+        }
+
+        /**
+         * @brief Counter logs
+         **/
+        function counterExecute() {
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+            // Check the logs
+            $oCounterModel = &getModel('counter');
+            // Register today's row if not exist
+            if(!$oCounterModel->isInsertedTodayStatus($site_srl)) {
+                $this->insertTodayStatus(0,$site_srl);
+            // check user if the previous row exists
+            } else {
+                // If unregistered IP
+                if(!$oCounterModel->isLogged($site_srl)) {
+                    // Leave logs
+                    $this->insertLog($site_srl);
+                    // Register unique and pageview
+                    $this->insertUniqueVisitor($site_srl);
+                } else {
+                    //  Register pageview
+                    $this->insertPageView($site_srl);
+                }
+            }
+
+            $oDB->commit();
+        }
+
+        /**
+         * @brief Leave logs
+         **/
+        function insertLog($site_srl=0) {
+            $args->regdate = date("YmdHis");
+            $args->user_agent = substr ($_SERVER['HTTP_USER_AGENT'], 0, 250);
+            $args->site_srl = $site_srl;
+            return executeQuery('counter.insertCounterLog', $args);
+        }
+
+        /**
+         * @brief Register the unique visitor
+         **/
+        function insertUniqueVisitor($site_srl=0) {
+            if($site_srl) {
+				$args->regdate = '0';
+                $args->site_srl = $site_srl;
+                $output = executeQuery('counter.updateSiteCounterUnique', $args);
+				$args->regdate = date('Ymd');
+                $output = executeQuery('counter.updateSiteCounterUnique', $args);
+            } else {
+				$args->regdate = '0';
+                $output = executeQuery('counter.updateCounterUnique', $args);
+				$args->regdate = date('Ymd');
+                $output = executeQuery('counter.updateCounterUnique', $args);
+            }
+        }
+
+        /**
+         * @brief Register pageview
+         **/
+        function insertPageView($site_srl=0) {
+            if($site_srl) { 
+				$args->regdate = '0';
+                $args->site_srl = $site_srl;
+                executeQuery('counter.updateSiteCounterPageview', $args);
+				$args->regdate = date('Ymd');
+                executeQuery('counter.updateSiteCounterPageview', $args);
+            } else {
+				$args->regdate = '0';
+                executeQuery('counter.updateCounterPageview', $args);
+				$args->regdate = date('Ymd');
+                executeQuery('counter.updateCounterPageview', $args);
+            }
+        }
+
+        /**
+         * @brief Add the total counter status
+         **/
+        function insertTotalStatus($site_srl=0) {
+            $args->regdate = 0;
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                executeQuery('counter.insertSiteTodayStatus', $args);
+            } else {
+                executeQuery('counter.insertTodayStatus', $args);
+            }
+        }
+
+        /**
+         * @brief Add today's counter status
+         **/
+        function insertTodayStatus($regdate = 0, $site_srl=0) {
+            if($regdate) $args->regdate = $regdate;
+            else $args->regdate = date("Ymd");
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $query_id = 'counter.insertSiteTodayStatus';
+
+                $u_args->site_srl = $site_srl; // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
+                executeQuery($query_id, $u_args);
+            } else {
+                $query_id = 'counter.insertTodayStatus';
+                executeQuery($query_id); // /< when inserting a daily row, attempt to inser total rows(where regdate=0) together
+            }
+            $output = executeQuery($query_id, $args);
+            // Leave logs
+            $this->insertLog($site_srl);
+            // Register unique and pageview
+            $this->insertUniqueVisitor($site_srl);
+        }
+
+        /**
+         * @brief Delete counter logs of the specific virtual site
+         **/
+        function deleteSiteCounterLogs($site_srl) {
+            $args->site_srl = $site_srl;
+            executeQuery('counter.deleteSiteCounter',$args);
+            executeQuery('counter.deleteSiteCounterLog',$args);
+        }
+    }
+?>
diff --git a/modules/counter/counter.model.php b/modules/counter/counter.model.php
index bcdc3a7ac..9b26f33fe 100644
--- a/modules/counter/counter.model.php
+++ b/modules/counter/counter.model.php
@@ -1,201 +1,200 @@
-<?php
-    /**
-     * @class  counterModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  counter 모듈의 Model class
-     **/
-
-    class counterModel extends counter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 로그 검사
-         **/
-        function isLogged($site_srl=0) {
-            $args->regdate = date("Ymd");
-            $args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            $args->site_srl = $site_srl;
-            $output = executeQuery('counter.getCounterLog', $args);
-            return $output->data->count?true:false;
-        }
-
-        /**
-         * @brief 오늘자 카운터 현황 row 있는지 체크
-         **/
-        function isInsertedTodayStatus($site_srl=0) {
-            $args->regdate = date("Ymd");
-            if($site_srl) {
-                $args->site_srl = $site_srl;
-                $output = executeQuery('counter.getSiteTodayStatus', $args);
-            } else {
-                $output = executeQuery('counter.getTodayStatus', $args);
-            }
-            return $output->data->count?true:false;
-        }
-
-        /**
-         * @brief 특정 일의 접속 통계를 가져옴
-         **/
-        function getStatus($selected_date, $site_srl=0) {
-            // 여러개의 날짜 로그를 가져올 경우
-            if(is_array($selected_date)) {
-                $date_count = count($selected_date);
-                $args->regdate = implode(',',$selected_date);
-
-            // 단일 날짜의 로그를 가져올 경우
-            } else {
-                if(strlen($selected_date)==8) $selected_date = $selected_date;
-                $args->regdate = $selected_date;
-            }
-
-            if($site_srl) {
-                $args->site_srl = $site_srl;
-                $output = executeQuery('counter.getSiteCounterStatusDays', $args);
-            } else {
-                $output = executeQuery('counter.getCounterStatusDays', $args);
-            }
-            $status = $output->data;
-
-            if(!is_array($selected_date)) return $status;
-
-            if(!is_array($status)) $status = array($status);
-            unset($output);
-
-            foreach($status as $key => $val) {
-                $output[substr($val->regdate,0,8)] = $val;
-            }
-            return $output;
-        }
-
-        /**
-         * @brief 지정된 일자의 시간대별 로그 가져오기
-         **/
-        function getHourlyStatus($type='hour', $selected_date, $site_srl=0) {
-            $max = 0;
-            $sum = 0;
-            switch($type) {
-                case 'year' :
-                        // 카운터 시작일 구함
-                        if($site_srl) {
-                            $args->site_srl = $site_srl;
-                            $output = executeQuery('counter.getSiteStartLogDate', $args);
-                        } else {
-                            $output = executeQuery('counter.getStartLogDate');
-                        }
-                        $start_year = substr($output->data->regdate,0,4);
-                        if(!$start_year) $start_year = date("Y");
-                        for($i=$start_year;$i<=date("Y");$i++) {
-                            unset($args);
-                            $args->start_date = sprintf('%04d0000', $i);
-                            $args->end_date = sprintf('%04d1231', $i);
-                            if($site_srl) {
-                                $args->site_srl = $site_srl;
-                                $output = executeQuery('counter.getSiteCounterStatus', $args);
-                            } else { 
-                                $output = executeQuery('counter.getCounterStatus', $args);
-                            }
-                            $count = (int)$output->data->unique_visitor;
-                            $status->list[$i] = $count;
-                            if($count>$max) $max = $count;
-                            $sum += $count;
-                        }
-                    break;
-                case 'week' :
-                        $time = strtotime($selected_date);
-                        $w = date("D");
-                        while(date("D",$time) != "Sun") {
-                            $time += 60*60*24;
-                        }
-                        $time -= 60*60*24;
-                        while(date("D",$time)!="Sun") {
-                            $thisWeek[] = date("Ymd",$time);
-                            $time -= 60*60*24;
-                        }
-                        $thisWeek[] = date("Ymd",$time);
-                        asort($thisWeek);
-                        foreach($thisWeek as $day) {
-                            unset($args);
-                            $args->start_date = $day;
-                            $args->end_date = $day;
-                            if($site_srl) {
-                                $args->site_srl = $site_srl;
-                                $output = executeQuery('counter.getSiteCounterStatus', $args);
-                            } else { 
-                                $output = executeQuery('counter.getCounterStatus', $args);
-                            }
-                            $count = (int)$output->data->unique_visitor;
-                            $status->list[$day] = (int)$count;
-                            if($count>$max) $max = $count;
-                            $sum += $count;
-                        }
-                    break;
-                case 'month' :
-                        $year = substr($selected_date, 0, 4);
-                        for($i=1;$i<=12;$i++) {
-                            unset($args);
-                            $args->start_date = sprintf('%04d%02d00', $year, $i);
-                            $args->end_date = sprintf('%04d%02d31', $year, $i);
-                            if($site_srl) {
-                                $args->site_srl = $site_srl;
-                                $output = executeQuery('counter.getSiteCounterStatus', $args);
-                            } else { 
-                                $output = executeQuery('counter.getCounterStatus', $args);
-                            }
-                            $count = (int)$output->data->unique_visitor;
-                            $status->list[$i] = (int)$count;
-                            if($count>$max) $max = $count;
-                            $sum += $count;
-                        }
-                    break;
-                case 'hour' :
-                        for($i=0;$i<24;$i++) {
-                            unset($args);
-                            $args->start_date = sprintf('%08d%02d0000', $selected_date, $i);
-                            $args->end_date = sprintf('%08d%02d5959', $selected_date, $i);
-                            if($site_srl) {
-                                $args->site_srl = $site_srl;
-                                $output = executeQuery('counter.getSiteCounterLogStatus', $args);
-                            } else { 
-                                $args->site_srl = 0;
-                                $output = executeQuery('counter.getCounterLogStatus', $args);
-                            }
-                            $count = (int)$output->data->count;
-                            $status->list[$i] = $count;
-                            if($count>$max) $max = $count;
-                            $sum += $count;
-                        }
-                    break;
-                default : 
-                        $year = substr($selected_date, 0, 4);
-                        $month = substr($selected_date, 4, 2);
-                        $end_day = date('t', mktime(0,0,0,$month,1,$year));
-                        for($i=1;$i<=$end_day;$i++) {
-                            unset($args);
-                            $args->start_date = sprintf('%04d%02d%02d', $year, $month, $i);
-                            $args->end_date = sprintf('%04d%02d%02d', $year, $month, $i);
-                            if($site_srl) {
-                                $args->site_srl = $site_srl;
-                                $output = executeQuery('counter.getSiteCounterStatus', $args);
-                            } else { 
-                                $output = executeQuery('counter.getCounterStatus', $args);
-                            }
-                            $count = (int)$output->data->unique_visitor;
-                            $status->list[$i] = $count;
-                            if($count>$max) $max = $count;
-                            $sum += $count;
-                        }
-                    break;
-            }
-
-            $status->max = $max;
-            $status->sum = $sum;
-            return $status;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  counterModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief Model class of counter module
+     **/
+
+    class counterModel extends counter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Verify logs
+         **/
+        function isLogged($site_srl=0) {
+            $args->regdate = date("Ymd");
+            $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            $args->site_srl = $site_srl;
+            $output = executeQuery('counter.getCounterLog', $args);
+            return $output->data->count?true:false;
+        }
+
+        /**
+         * @brief Check if a row of today's counter status exists 
+         **/
+        function isInsertedTodayStatus($site_srl=0) {
+            $args->regdate = date("Ymd");
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('counter.getSiteTodayStatus', $args);
+            } else {
+                $output = executeQuery('counter.getTodayStatus', $args);
+            }
+            return $output->data->count?true:false;
+        }
+
+        /**
+         * @brief Get access statistics for a given date
+         **/
+        function getStatus($selected_date, $site_srl=0) {
+            // If more than one date logs are selected
+            if(is_array($selected_date)) {
+                $date_count = count($selected_date);
+                $args->regdate = implode(',',$selected_date);
+            // If a single date log is selected
+            } else {
+                if(strlen($selected_date)==8) $selected_date = $selected_date;
+                $args->regdate = $selected_date;
+            }
+
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('counter.getSiteCounterStatusDays', $args);
+            } else {
+                $output = executeQuery('counter.getCounterStatusDays', $args);
+            }
+            $status = $output->data;
+
+            if(!is_array($selected_date)) return $status;
+
+            if(!is_array($status)) $status = array($status);
+            unset($output);
+
+            foreach($status as $key => $val) {
+                $output[substr($val->regdate,0,8)] = $val;
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Select hourly logs of a given date
+         **/
+        function getHourlyStatus($type='hour', $selected_date, $site_srl=0) {
+            $max = 0;
+            $sum = 0;
+            switch($type) {
+                case 'year' :
+                        // Get a date to start counting
+                        if($site_srl) {
+                            $args->site_srl = $site_srl;
+                            $output = executeQuery('counter.getSiteStartLogDate', $args);
+                        } else {
+                            $output = executeQuery('counter.getStartLogDate');
+                        }
+                        $start_year = substr($output->data->regdate,0,4);
+                        if(!$start_year) $start_year = date("Y");
+                        for($i=$start_year;$i<=date("Y");$i++) {
+                            unset($args);
+                            $args->start_date = sprintf('%04d0000', $i);
+                            $args->end_date = sprintf('%04d1231', $i);
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
+                            $status->list[$i] = $count;
+                            if($count>$max) $max = $count;
+                            $sum += $count;
+                        }
+                    break;
+                case 'week' :
+                        $time = strtotime($selected_date);
+                        $w = date("D");
+                        while(date("D",$time) != "Sun") {
+                            $time += 60*60*24;
+                        }
+                        $time -= 60*60*24;
+                        while(date("D",$time)!="Sun") {
+                            $thisWeek[] = date("Ymd",$time);
+                            $time -= 60*60*24;
+                        }
+                        $thisWeek[] = date("Ymd",$time);
+                        asort($thisWeek);
+                        foreach($thisWeek as $day) {
+                            unset($args);
+                            $args->start_date = $day;
+                            $args->end_date = $day;
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
+                            $status->list[$day] = (int)$count;
+                            if($count>$max) $max = $count;
+                            $sum += $count;
+                        }
+                    break;
+                case 'month' :
+                        $year = substr($selected_date, 0, 4);
+                        for($i=1;$i<=12;$i++) {
+                            unset($args);
+                            $args->start_date = sprintf('%04d%02d00', $year, $i);
+                            $args->end_date = sprintf('%04d%02d31', $year, $i);
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
+                            $status->list[$i] = (int)$count;
+                            if($count>$max) $max = $count;
+                            $sum += $count;
+                        }
+                    break;
+                case 'hour' :
+                        for($i=0;$i<24;$i++) {
+                            unset($args);
+                            $args->start_date = sprintf('%08d%02d0000', $selected_date, $i);
+                            $args->end_date = sprintf('%08d%02d5959', $selected_date, $i);
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterLogStatus', $args);
+                            } else { 
+                                $args->site_srl = 0;
+                                $output = executeQuery('counter.getCounterLogStatus', $args);
+                            }
+                            $count = (int)$output->data->count;
+                            $status->list[$i] = $count;
+                            if($count>$max) $max = $count;
+                            $sum += $count;
+                        }
+                    break;
+                default : 
+                        $year = substr($selected_date, 0, 4);
+                        $month = substr($selected_date, 4, 2);
+                        $end_day = date('t', mktime(0,0,0,$month,1,$year));
+                        for($i=1;$i<=$end_day;$i++) {
+                            unset($args);
+                            $args->start_date = sprintf('%04d%02d%02d', $year, $month, $i);
+                            $args->end_date = sprintf('%04d%02d%02d', $year, $month, $i);
+                            if($site_srl) {
+                                $args->site_srl = $site_srl;
+                                $output = executeQuery('counter.getSiteCounterStatus', $args);
+                            } else { 
+                                $output = executeQuery('counter.getCounterStatus', $args);
+                            }
+                            $count = (int)$output->data->unique_visitor;
+                            $status->list[$i] = $count;
+                            if($count>$max) $max = $count;
+                            $sum += $count;
+                        }
+                    break;
+            }
+
+            $status->max = $max;
+            $status->sum = $sum;
+            return $status;
+        }
+
+    }
+?>
diff --git a/modules/counter/lang/en.lang.php b/modules/counter/lang/en.lang.php
deleted file mode 100644
index be9fe5756..000000000
--- a/modules/counter/lang/en.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only basic contents are listed)
-     **/
-
-    $lang->counter = "Counter";
-    $lang->cmd_select_date = 'Select Date';
-    $lang->cmd_select_counter_type = array(
-        'hour' => 'By Hour',
-        'day' => 'By Day',
-        'month' => 'By Month',
-        'year' => 'By Year',
-    );
-
-    $lang->total_counter = 'Total Status';
-    $lang->selected_day_counter = 'Status of Selected Day';
-
-    $lang->unique_visitor = 'Visitors';
-    $lang->pageview = 'Pageview';
-
-    $lang->today = 'today';
-    $lang->yesterday = 'yesterday';
-?>
diff --git a/modules/counter/lang/es.lang.php b/modules/counter/lang/es.lang.php
deleted file mode 100644
index 9e5b3df5e..000000000
--- a/modules/counter/lang/es.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/counter/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma español para el contador.
-     **/
-
-    $lang->counter = "Contador";
-    $lang->cmd_select_date = 'Selecciona la fecha';
-    $lang->cmd_select_counter_type = array(
-        'hour' => 'por hora',
-        'day' => 'por día',
-        'month' => 'por mes',
-        'year' => 'por año',
-    );
-
-    $lang->total_counter = 'Estado actual Total';
-    $lang->selected_day_counter = 'Estado actual del día seleccionado';
-
-    $lang->unique_visitor = 'visitante';
-    $lang->pageview = 'Ver página';
-
-    $lang->today = 'today';
-    $lang->yesterday = 'yesterday';
-?>
diff --git a/modules/counter/lang/fr.lang.php b/modules/counter/lang/fr.lang.php
deleted file mode 100644
index 5aad22fa2..000000000
--- a/modules/counter/lang/fr.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Comppteur
-     **/
-
-    $lang->counter = "Coumpteur";
-    $lang->cmd_select_date = 'Choisir un Jour';
-    $lang->cmd_select_counter_type = array(
-        'hour' => 'Par Heure',
-        'day' => 'Par Jour',
-        'month' => 'Par Mois',
-        'year' => 'Par Année',
-    );
-
-    $lang->total_counter = 'Statut Total';
-    $lang->selected_day_counter = 'Statut Journal';
-
-    $lang->unique_visitor = 'Visiteurs';
-    $lang->pageview = 'Vues';
-
-    $lang->today = 'today';
-    $lang->yesterday = 'yesterday';
-?>
diff --git a/modules/counter/lang/jp.lang.php b/modules/counter/lang/jp.lang.php
deleted file mode 100644
index e0e4807b7..000000000
--- a/modules/counter/lang/jp.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    $lang->counter = 'カウンター';
-    $lang->cmd_select_date = '日付選択';
-    $lang->cmd_select_counter_type = array(
-        'hour' => '時間帯別',
-        'day' => '日別',
-        'month' => '月別',
-        'year' => '年度別',
-    );
-
-    $lang->total_counter = 'トータル';
-    $lang->selected_day_counter = '選択日の情報';
-
-    $lang->unique_visitor = '訪問者';
-    $lang->pageview = 'ページビュー';
-
-    $lang->today = '今日';
-    $lang->yesterday = '昨日';
-?>
diff --git a/modules/counter/lang/ko.lang.php b/modules/counter/lang/ko.lang.php
deleted file mode 100644
index b8dca9adb..000000000
--- a/modules/counter/lang/ko.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->counter = '접속 통계';
-    $lang->cmd_select_date = '날짜 선택';
-    $lang->cmd_select_counter_type = array(
-        'hour' => '시간대별',
-        'day' => '일별',
-        'month' => '월별',
-        'year' => '연도별',
-    );
-
-    $lang->total_counter = '전체현황';
-    $lang->selected_day_counter = '선택일 현황';
-
-    $lang->unique_visitor = '방문자';
-    $lang->pageview = '페이지뷰';
-
-    $lang->today = '오늘';
-    $lang->yesterday = '어제';
-?>
diff --git a/modules/counter/lang/lang.xml b/modules/counter/lang/lang.xml
new file mode 100644
index 000000000..89e93f365
--- /dev/null
+++ b/modules/counter/lang/lang.xml
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="counter">
+		<value xml:lang="ko"><![CDATA[접속 통계]]></value>
+		<value xml:lang="en"><![CDATA[Counter]]></value>
+		<value xml:lang="jp"><![CDATA[カウンター]]></value>
+		<value xml:lang="zh-CN"><![CDATA[访问统计]]></value>
+		<value xml:lang="zh-TW"><![CDATA[訪問統計]]></value>
+		<value xml:lang="fr"><![CDATA[Coumpteur]]></value>
+		<value xml:lang="ru"><![CDATA[Счетчик посетителей]]></value>
+		<value xml:lang="es"><![CDATA[Contador]]></value>
+		<value xml:lang="tr"><![CDATA[Sayaç]]></value>
+		<value xml:lang="vi"><![CDATA[Lượt truy cập]]></value>
+	</item>
+	<item name="cmd_select_date">
+		<value xml:lang="ko"><![CDATA[날짜 선택]]></value>
+		<value xml:lang="en"><![CDATA[Select Date]]></value>
+		<value xml:lang="jp"><![CDATA[日付選択]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇日期]]></value>
+		<value xml:lang="fr"><![CDATA[Choisir un Jour]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите дату]]></value>
+		<value xml:lang="es"><![CDATA[Selecciona la fecha]]></value>
+		<value xml:lang="tr"><![CDATA[Tarih Seç]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn ngày]]></value>
+	</item>
+	<item name="cmd_select_counter_type" type="array">
+		<item name="hour">
+			<value xml:lang="ko"><![CDATA[시간대별]]></value>
+			<value xml:lang="en"><![CDATA[By Hour]]></value>
+			<value xml:lang="jp"><![CDATA[時間帯別]]></value>
+			<value xml:lang="zh-CN"><![CDATA[按时]]></value>
+			<value xml:lang="zh-TW"><![CDATA[按時]]></value>
+			<value xml:lang="fr"><![CDATA[Par Heure]]></value>
+			<value xml:lang="ru"><![CDATA[По часам]]></value>
+			<value xml:lang="es"><![CDATA[por hora]]></value>
+			<value xml:lang="tr"><![CDATA[Saate Göre]]></value>
+			<value xml:lang="vi"><![CDATA[Theo giờ]]></value>
+		</item>
+		<item name="day">
+			<value xml:lang="ko"><![CDATA[일별]]></value>
+			<value xml:lang="en"><![CDATA[By Day]]></value>
+			<value xml:lang="jp"><![CDATA[日別]]></value>
+			<value xml:lang="zh-CN"><![CDATA[按天]]></value>
+			<value xml:lang="zh-TW"><![CDATA[按天]]></value>
+			<value xml:lang="fr"><![CDATA[Par Jour]]></value>
+			<value xml:lang="ru"><![CDATA[По дням]]></value>
+			<value xml:lang="es"><![CDATA[por día]]></value>
+			<value xml:lang="tr"><![CDATA[Güne Göre]]></value>
+			<value xml:lang="vi"><![CDATA[Theo ngày]]></value>
+		</item>
+		<item name="month">
+			<value xml:lang="ko"><![CDATA[월별]]></value>
+			<value xml:lang="en"><![CDATA[By Month]]></value>
+			<value xml:lang="jp"><![CDATA[月別]]></value>
+			<value xml:lang="zh-CN"><![CDATA[按月]]></value>
+			<value xml:lang="zh-TW"><![CDATA[按月]]></value>
+			<value xml:lang="fr"><![CDATA[Par Mois]]></value>
+			<value xml:lang="ru"><![CDATA[По месяцам]]></value>
+			<value xml:lang="es"><![CDATA[por mes]]></value>
+			<value xml:lang="tr"><![CDATA[Aya Göre]]></value>
+			<value xml:lang="vi"><![CDATA[Theo tháng]]></value>
+		</item>
+		<item name="year">
+			<value xml:lang="ko"><![CDATA[연도별]]></value>
+			<value xml:lang="en"><![CDATA[By Year]]></value>
+			<value xml:lang="jp"><![CDATA[年度別]]></value>
+			<value xml:lang="zh-CN"><![CDATA[按年]]></value>
+			<value xml:lang="zh-TW"><![CDATA[按年]]></value>
+			<value xml:lang="fr"><![CDATA[Par Année]]></value>
+			<value xml:lang="ru"><![CDATA[По годам]]></value>
+			<value xml:lang="es"><![CDATA[por año]]></value>
+			<value xml:lang="tr"><![CDATA[Yıla Göre]]></value>
+			<value xml:lang="vi"><![CDATA[Theo năm]]></value>
+		</item>
+	</item>
+	<item name="total_counter">
+		<value xml:lang="ko"><![CDATA[전체현황]]></value>
+		<value xml:lang="en"><![CDATA[Total Status]]></value>
+		<value xml:lang="jp"><![CDATA[トータル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[总揽]]></value>
+		<value xml:lang="zh-TW"><![CDATA[總共]]></value>
+		<value xml:lang="fr"><![CDATA[Statut Total]]></value>
+		<value xml:lang="ru"><![CDATA[Общее состояние]]></value>
+		<value xml:lang="es"><![CDATA[Estado actual Total]]></value>
+		<value xml:lang="tr"><![CDATA[Genel Durum]]></value>
+		<value xml:lang="vi"><![CDATA[Tổng số lượt truy cập]]></value>
+	</item>
+	<item name="selected_day_counter">
+		<value xml:lang="ko"><![CDATA[선택일 현황]]></value>
+		<value xml:lang="en"><![CDATA[Status of the selected day]]></value>
+		<value xml:lang="jp"><![CDATA[選択日の情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[指定日概况]]></value>
+		<value xml:lang="zh-TW"><![CDATA[指定日概況]]></value>
+		<value xml:lang="fr"><![CDATA[Statut Journal]]></value>
+		<value xml:lang="ru"><![CDATA[Состояние на выбранный день]]></value>
+		<value xml:lang="es"><![CDATA[Estado actual del día seleccionado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen Günün Durumu]]></value>
+		<value xml:lang="vi"><![CDATA[Số truy cập trong ngày]]></value>
+	</item>
+	<item name="unique_visitor">
+		<value xml:lang="ko"><![CDATA[방문자]]></value>
+		<value xml:lang="en"><![CDATA[Visitors]]></value>
+		<value xml:lang="jp"><![CDATA[訪問者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[访问者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[訪問者]]></value>
+		<value xml:lang="fr"><![CDATA[Visiteurs]]></value>
+		<value xml:lang="ru"><![CDATA[Посетителей]]></value>
+		<value xml:lang="es"><![CDATA[visitante]]></value>
+		<value xml:lang="tr"><![CDATA[Ziyaretçiler]]></value>
+		<value xml:lang="vi"><![CDATA[Số lượt xem]]></value>
+	</item>
+	<item name="pageview">
+		<value xml:lang="ko"><![CDATA[페이지뷰]]></value>
+		<value xml:lang="en"><![CDATA[Pageview]]></value>
+		<value xml:lang="jp"><![CDATA[ページビュー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[页面浏览]]></value>
+		<value xml:lang="zh-TW"><![CDATA[頁面瀏覽]]></value>
+		<value xml:lang="fr"><![CDATA[Vues]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотров страниц]]></value>
+		<value xml:lang="es"><![CDATA[Ver página]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfa Gösterimi]]></value>
+		<value xml:lang="vi"><![CDATA[Số trang]]></value>
+	</item>
+	<item name="today">
+		<value xml:lang="ko"><![CDATA[오늘]]></value>
+		<value xml:lang="en"><![CDATA[today]]></value>
+		<value xml:lang="jp"><![CDATA[今日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[今日]]></value>
+		<value xml:lang="zh-TW"><![CDATA[今天]]></value>
+		<value xml:lang="ru"><![CDATA[Сегодня]]></value>
+		<value xml:lang="tr"><![CDATA[bugün]]></value>
+		<value xml:lang="vi"><![CDATA[Hôm nay]]></value>
+	</item>
+	<item name="yesterday">
+		<value xml:lang="ko"><![CDATA[어제]]></value>
+		<value xml:lang="en"><![CDATA[yesterday]]></value>
+		<value xml:lang="jp"><![CDATA[昨日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[昨日]]></value>
+		<value xml:lang="zh-TW"><![CDATA[昨天]]></value>
+		<value xml:lang="ru"><![CDATA[Вчера]]></value>
+		<value xml:lang="tr"><![CDATA[dün]]></value>
+		<value xml:lang="vi"><![CDATA[Hôm qua]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/counter/lang/ru.lang.php b/modules/counter/lang/ru.lang.php
deleted file mode 100644
index 4bec4020b..000000000
--- a/modules/counter/lang/ru.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->counter = "Счетчик посетителей";
-    $lang->cmd_select_date = 'Выберите дату';
-    $lang->cmd_select_counter_type = array(
-        'hour' => 'По часам',
-        'day' => 'По дням',
-        'month' => 'По месяцам',
-        'year' => 'По годам',
-    );
-
-    $lang->total_counter = 'Общее состояние';
-    $lang->selected_day_counter = 'Состояние на выбранный день';
-
-    $lang->unique_visitor = 'Посетителей';
-    $lang->pageview = 'Просмотров страниц';
-
-    $lang->today = 'Сегодня';
-    $lang->yesterday = 'Вчера';
-?>
diff --git a/modules/counter/lang/tr.lang.php b/modules/counter/lang/tr.lang.php
deleted file mode 100644
index 69aa1c8aa..000000000
--- a/modules/counter/lang/tr.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only basic contents are listed)
-     **/
-
-    $lang->counter = "Sayaç";
-    $lang->cmd_select_date = 'Tarih Seç';
-    $lang->cmd_select_counter_type = array(
-        'hour' => 'Saate Göre',
-        'day' => 'Güne Göre',
-        'month' => 'Aya Göre',
-        'year' => 'Yıla Göre',
-    );
-
-    $lang->total_counter = 'Genel Durum';
-    $lang->selected_day_counter = 'Seçilen Günün Durumu';
-
-    $lang->unique_visitor = 'Ziyaretçiler';
-    $lang->pageview = 'Sayfa Gösterimi';
-
-    $lang->today = 'bugün';
-    $lang->yesterday = 'dün';
-?>
diff --git a/modules/counter/lang/vi.lang.php b/modules/counter/lang/vi.lang.php
deleted file mode 100644
index aa74830fa..000000000
--- a/modules/counter/lang/vi.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->counter = "Lượt truy cập";
-    $lang->cmd_select_date = 'Chọn ngày';
-    $lang->cmd_select_counter_type = array(
-        'hour' => 'Theo giờ',
-        'day' => 'Theo ngày',
-        'month' => 'Theo tháng',
-        'year' => 'Theo năm',
-    );
-
-    $lang->total_counter = 'Tổng số lượt truy cập';
-    $lang->selected_day_counter = 'Số truy cập trong ngày';
-
-    $lang->unique_visitor = 'Số lượt xem';
-    $lang->pageview = 'Số trang';
-
-    $lang->today = 'Hôm nay';
-    $lang->yesterday = 'Hôm qua';
-?>
diff --git a/modules/counter/lang/zh-CN.lang.php b/modules/counter/lang/zh-CN.lang.php
deleted file mode 100644
index 79459993e..000000000
--- a/modules/counter/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  简体中文语言包
-     **/
-
-    $lang->counter = "访问统计";
-    $lang->cmd_select_date = '选择日期';
-    $lang->cmd_select_counter_type = array(
-        'hour' => '按时',
-        'day' => '按天',
-        'month' => '按月',
-        'year' => '按年',
-    );
-
-    $lang->total_counter = '总揽';
-    $lang->selected_day_counter = '指定日概况';
-
-    $lang->unique_visitor = '访问者';
-    $lang->pageview = '页面浏览';
-
-    $lang->today = '今日';
-    $lang->yesterday = '昨日';
-?>
diff --git a/modules/counter/lang/zh-TW.lang.php b/modules/counter/lang/zh-TW.lang.php
deleted file mode 100644
index 7b516a7a3..000000000
--- a/modules/counter/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/counter/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  訪問統計(counter)模組正體中文語言
-     **/
-
-    $lang->counter = "訪問統計";
-    $lang->cmd_select_date = '選擇日期';
-    $lang->cmd_select_counter_type = array(
-        'hour' => '按時',
-        'day' => '按天',
-        'month' => '按月',
-        'year' => '按年',
-    );
-
-    $lang->total_counter = '總共';
-    $lang->selected_day_counter = '指定日概況';
-
-    $lang->unique_visitor = '訪問者';
-    $lang->pageview = '頁面瀏覽';
-
-    $lang->today = '今天';
-    $lang->yesterday = '昨天';
-?>
diff --git a/modules/counter/tpl/index.html b/modules/counter/tpl/index.html
index 69488aa0f..25ae29d7e 100644
--- a/modules/counter/tpl/index.html
+++ b/modules/counter/tpl/index.html
@@ -1,78 +1,70 @@
-<load target="js/counter_admin.js" />
-<load target="counter.css" />
+<load target="js/counter_admin.js" usecdn="true" />
+<load target="counter.css" usecdn="true" />
 
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui.datepicker")-->
 
 <script type="text/javascript">
     function moveDate() {
-        xGetElementById('fo_calendar').submit();
+		document.forms['calendar'].submit();
         return true;
     }
 </script>
-
-
-<h3 class="xeAdmin">{$lang->counter} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<div class="header4 gap1">
-
-    <form action="./index.php" method="get" id="fo_calendar">
+<h3 class="h3">{$lang->counter} {$lang->cmd_management}</h3>
+<form action="./index.php" method="get" name="calendar" id="fo_calendar">
     <input type="hidden" name="module" value="{$module}" />
     <input type="hidden" name="act" value="{$act}" />
     <input type="hidden" name="selected_date" id="selected_date" value="{zDate('Ymd',$selected_date)}" />
-
-    <table cellspacing="0" class="colTable">
-    <thead>
-    <tr>
-        <th scope="row" class="half_wide"><div>{$lang->total_counter}</div></th>
-        <th scope="row" class="half_wide">
-            <div>
-                <span id="str_selected_date">{zdate($selected_date, "Y-m-d")}</span>
-<input type="hidden" class="inputDate" value="{zdate($selected_date,'Y-m-d')}" />
-                <script type="text/javascript">
-(function($){
-    $(function(){
-        var option = {
-            changeMonth: true,
-            changeYear: true,
-            gotoCurrent: false
-            ,yearRange:'-100:+10'
-            ,showOn:"button"
-            ,buttonImage:"./modules/counter/tpl/images/buttonCalendar.gif"
-            ,buttonImageOnly:true
-            ,mandatory:true
-            ,onSelect:function(){
-                $("#str_selected_date").html(this.value);
-                $("#selected_date").val(this.value.replace(/-/g,''));
-                moveDate();
-            }
-        };
-
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-    });
-})(jQuery);
-                </script>
-            </div>
-        </th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-        <td class="number center">Visitor <strong>{number_format($total_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($total_counter->pageview)}</strong></td>
-        <td class="number center">Visitor : <strong>{number_format($selected_day_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($selected_day_counter->pageview)}</strong></td>
-    </tr>
-    </tbody>
-    </table>
-
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+			<tr>
+				<th scope="row">{$lang->total_counter}</th>
+				<th scope="row"> <span id="str_selected_date">{zdate($selected_date, "Y-m-d")}</span>
+						<input type="hidden" class="inputDate" value="{zdate($selected_date,'Y-m-d')}" />
+<script type="text/javascript">
+	(function($){
+		$(function(){
+			var option = {
+				changeMonth: true
+				,changeYear: true
+				,gotoCurrent: false
+				,dateFormat:'yy-mm-dd'
+				,yearRange:'-100:+10'
+				,showOn:"button"
+				,buttonImage:"./modules/counter/tpl/images/buttonCalendar.gif"
+				,buttonImageOnly:true
+				,mandatory:true
+				,onSelect:function(){
+					$("#str_selected_date").html(this.value);
+					$("#selected_date").val(this.value.replace(/-/g,''));
+					moveDate();
+				}
+			};
+	
+			$.extend(option,$.datepicker.regional['{$lang_type}']);
+			$(".inputDate").datepicker(option);
+		});
+	})(jQuery);
+</script>				</th>
+			</tr>
+			</thead>
+			<tbody>
+			<tr>
+				<td>Visitor <strong>{number_format($total_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($total_counter->pageview)}</strong></td>
+				<td>Visitor : <strong>{number_format($selected_day_counter->unique_visitor)}</strong> &nbsp;/&nbsp; Pageview : <strong>{number_format($selected_day_counter->pageview)}</strong></td>
+			</tr>
+			</tbody>
+			</table>
+	</div>
     </form>
-
-    <ul class="localNavigation">
-        <!--@foreach($lang->cmd_select_counter_type as $key => $val)-->
-        <li <!--@if($type==$key || (!$type && $key == "hour"))-->class="on"<!--@end-->><a href="{getUrl('type',$key)}">{$val}</a></li>
-        <!--@end-->
-    </ul>
-</div>
+	<div class="cnb">
+		<ul>
+			<!--@foreach($lang->cmd_select_counter_type as $key => $val)-->
+			<li <!--@if($type==$key || (!$type && $key == "hour"))-->class="active"<!--@end-->><a href="{getUrl('type',$key)}">{$val}</a></li>
+			<!--@end-->
+		</ul>
+	</div>
 
 
 <!-- 일자를 옮기는 form -->
@@ -84,55 +76,49 @@
 
 
 <!-- unique visitor 그래프 -->
-<table cellspacing="0" class="rowTable">
-<!--@foreach($detail_status->list as $key => $val)-->
-    <!--@if($detail_status->sum>0)-->
-        {@$percent   = sprintf("%0.2f", $val / $detail_status->sum * 100 )}
-        {@$img_width = sprintf("%d", $val / $detail_status->max * 100 )}
-    <!--@else-->
-        {@$percent = 0}
-        {@$img_width = 1}
-    <!--@end-->
-<tr>
-    <!--@if(Context::getLangType()=='en')-->
-    <th scope="row">
-        <div>
-        <!--// 시간대별 -->
-        <!--@if($type == 'year')-->
-            <em>{$key}</em>
-        <!--@elseif($type == 'month')-->
-            <em>{$key}</em>
-        <!--@elseif($type == 'day')-->
-            <em>{$key}</em> {$lang->unit_day}
-        <!--@else-->
-            <em>{$key}</em>
-        <!--@end-->
-        </div>
-    </th>
-    <!--@else-->
-    <th scope="row">
-        <div>
-        <!--// 시간대별 -->
-        <!--@if($type == 'year')-->
-            <em>{$key}</em> {$lang->unit_year}
-        <!--@elseif($type == 'month')-->
-            <em>{$key}</em> {$lang->unit_month}
-        <!--@elseif($type == 'day')-->
-            <em>{$key}</em> {$lang->unit_day}
-        <!--@else-->
-            <em>{$key}</em> {$lang->unit_hour}
-        <!--@end-->
-        </div>
-    </th>
-    <!--@end-->
-	{@ $img_width = (int)$percent; $img_width = $img_width?$img_width.'%':'3px'; }
-    <td class="wide">
-		<div class="barContainer">
-			<span class="graphHr" style="width:{$img_width}">
-				<span>{number_format($val)}({$percent}%)</span>
-			</span>
-		</div>
-    </td>
-</tr>
-<!--@end-->
-</table>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+	<!--@foreach($detail_status->list as $key => $val)-->
+		<!--@if($detail_status->sum>0)-->
+			{@$percent   = sprintf("%0.2f", $val / $detail_status->sum * 100 )}
+			{@$img_width = sprintf("%d", $val / $detail_status->max * 100 )}
+		<!--@else-->
+			{@$percent = 0}
+			{@$img_width = 1}
+		<!--@end-->
+	<tr>
+		<!--@if(Context::getLangType()=='en')-->
+		<th scope="row"> <!--// 시간대별 -->
+			<!--@if($type == 'year')-->
+				<em>{$key}</em>
+			<!--@elseif($type == 'month')-->
+				<em>{$key}</em>
+			<!--@elseif($type == 'day')-->
+				<em>{$key}</em> {$lang->unit_day}
+			<!--@else-->
+				<em>{$key}</em>
+			<!--@end-->			</th>
+		<!--@else-->
+		<th scope="row"> <!--// 시간대별 -->
+			<!--@if($type == 'year')-->
+				<em>{$key}</em> {$lang->unit_year}
+			<!--@elseif($type == 'month')-->
+				<em>{$key}</em> {$lang->unit_month}
+			<!--@elseif($type == 'day')-->
+				<em>{$key}</em> {$lang->unit_day}
+			<!--@else-->
+				<em>{$key}</em> {$lang->unit_hour}
+			<!--@end-->			</th>
+		<!--@end-->
+		{@ $img_width = (int)$percent; $img_width = $img_width?$img_width.'%':'3px'; }
+		<td >
+			<div class="barContainer">
+				<span class="graphHr" style="width:{$img_width}">
+					<span>{number_format($val)}({$percent}%)</span>
+				</span>
+			</div>
+		</td>
+	</tr>
+	<!--@end-->
+	</table>
+</div>
diff --git a/modules/document/conf/info.xml b/modules/document/conf/info.xml
index 904703404..f0fc08499 100644
--- a/modules/document/conf/info.xml
+++ b/modules/document/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">문서</title>
-    <title xml:lang="en">Document</title>
-    <title xml:lang="vi">Bài viết</title>
-    <title xml:lang="es">Documento</title>
-    <title xml:lang="zh-CN">主题管理</title>
-    <title xml:lang="jp">ドキュメント</title>
-    <title xml:lang="ru">Документы</title>
-    <title xml:lang="zh-TW">主題</title>
-    <title xml:lang="tr">Belge</title>
-    <description xml:lang="ko">게시판, 블로그등의 모듈에서 사용되는 문서를 관리하는 모듈입니다. </description>
-    <description xml:lang="en">Module for managing documents used in board, blog, etc.</description>
-    <description xml:lang="vi">Module quản lý bài viết trên Board, Sổ lưu niệm và những mục khác.</description>
-    <description xml:lang="es">Módulo para manejar los documentos en blog y en los tableros.</description>
-    <description xml:lang="zh-CN">管理版面，博客等处主题的模块。 </description>
-    <description xml:lang="jp">掲示板、ブログなどのモジュールで使用されるドキュメント（書き込み）を管理します。</description>
-    <description xml:lang="ru">Модуль для управления документами в форуме, блоге и прочее.</description>
-    <description xml:lang="zh-TW">管理討論板，部落格等主題的模組。 </description>
-    <description xml:lang="tr">Panoda, blogda, vb., kullanılan belgeleri yönetmek için olan modüldür.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>content</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">문서</title>
+    <title xml:lang="en">Document</title>
+    <title xml:lang="vi">Bài viết</title>
+    <title xml:lang="es">Documento</title>
+    <title xml:lang="zh-CN">主题管理</title>
+    <title xml:lang="jp">ドキュメント</title>
+    <title xml:lang="ru">Документы</title>
+    <title xml:lang="zh-TW">主題</title>
+    <title xml:lang="tr">Belge</title>
+    <description xml:lang="ko">게시판, 블로그등의 모듈에서 사용되는 문서를 관리하는 모듈입니다. </description>
+    <description xml:lang="en">Module for managing documents used in a board, blog, etc.</description>
+    <description xml:lang="vi">Module quản lý bài viết trên Board, Sổ lưu niệm và những mục khác.</description>
+    <description xml:lang="es">Módulo para manejar los documentos en blog y en los tableros.</description>
+    <description xml:lang="zh-CN">管理版面，博客等处主题的模块。 </description>
+    <description xml:lang="jp">掲示板、ブログなどのモジュールで使用されるドキュメント（書き込み）を管理します。</description>
+    <description xml:lang="ru">Модуль для управления документами в форуме, блоге и прочее.</description>
+    <description xml:lang="zh-TW">管理討論板，部落格等主題的模組。 </description>
+    <description xml:lang="tr">Panoda, blogda, vb., kullanılan belgeleri yönetmek için olan modüldür.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>content</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index 65c226c30..93c9d55d8 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -2,6 +2,8 @@
 <module>
     <grants />
     <permissions>
+        <permission action="dispDocumentAdminList" target="manager" />
+
         <permission action="dispDocumentManageDocument" target="member" />
         <permission action="getDocumentCategories" target="member" />
         <permission action="getDocumentCategoryTplInfo" target="member" />
@@ -17,6 +19,7 @@
         <action name="dispDocumentPrint" type="view" standalone="true" />
         <action name="dispDocumentPreview" type="view" standalone="true" />
         <action name="dispDocumentManageDocument" type="view" standalone="true" />
+        <action name="dispTempSavedList" type="view" standalone="true" />
 
         <action name="getDocumentCategories" type="model" standalone="true" />
         <action name="getDocumentMenu" type="model" standalone="true" />
@@ -28,26 +31,28 @@
         <action name="procDocumentManageCheckedDocument" type="controller" standalone="true" />
         <action name="procDocumentInsertModuleConfig" type="controller" standalone="true" />
 
-        <action name="dispDocumentAdminList" type="view" admin_index="true" standalone="true" />
+        <action name="dispDocumentAdminList" type="view" admin_index="true" standalone="true" menu_name="document" menu_index="true" />
         <action name="dispDocumentAdminConfig" type="view" standalone="true" />
-        <action name="dispDocumentAdminAlias" type="view" standalone="true" />
-        <action name="dispDocumentAdminDeclared" type="view" standalone="true" />
-        <action name="dispDocumentAdminTrashList" type="view" standalone="true" />
+        <action name="dispDocumentAdminAlias" type="view" standalone="true" menu_name="document" />
+        <action name="dispDocumentAdminDeclared" type="view" standalone="true" menu_name="document" />
+        <action name="dispDocumentAdminTrashList" type="view" standalone="true" menu_name="document" />
 
         <action name="getDocumentCategoryTplInfo" type="model" standalone="true" />
         <action name="getDocumentVotedMemberList" type="model" standalone="true" />
 
-        <action name="procDocumentInsertCategory" type="controller" standalone="true" />
+        <action name="procDocumentInsertCategory" type="controller" standalone="true" ruleset="insertCategory" />
         <action name="procDocumentDeleteCategory" type="controller" standalone="true" />
         <action name="procDocumentMoveCategory" type="controller" standalone="true" />
         <action name="procDocumentMakeXmlFile" type="controller" standalone="true" />
+        <action name="procDocumentTempSave" type="controller" standalone="true" />
+        <action name="procDocumentGetList" type="controller" standalone="true" />
 
-        <action name="procDocumentAdminInsertAlias" type="controller" standalone="true" />
-        <action name="procDocumentAdminDeleteAlias" type="controller" standalone="true" />
+        <action name="procDocumentAdminInsertAlias" type="controller" standalone="true" ruleset="insertAlias" />
+        <action name="procDocumentAdminDeleteAlias" type="controller" standalone="true" ruleset="deleteAlias" />
         <action name="procDocumentAdminRestoreTrash" type="controller" standalone="true" />
         <action name="procDocumentAdminMoveExtraVar" type="controller" standalone="true" />
 
-        <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" />
+        <action name="procDocumentAdminInsertExtraVar" type="controller" standalone="true" ruleset="insertExtraVar" />
         <action name="procDocumentAdminDeleteExtraVar" type="controller" standalone="true" />
         <action name="procDocumentAdminDeleteChecked" type="controller" standalone="true" />
         <action name="procDocumentAdminInsertConfig" type="controller" standalone="true" />
@@ -55,4 +60,19 @@
         <action name="procDocumentAdminCancelDeclare" type="controller" standalone="true" />
 	
     </actions>
+	<menus>
+		<menu name="document">
+			<title xml:lang="en">Document</title>
+			<title xml:lang="ko">문서</title>
+			<title xml:lang="zh-CN">Document</title>
+			<title xml:lang="jp">Document</title>
+			<title xml:lang="es">Document</title>
+			<title xml:lang="ru">Document</title>
+			<title xml:lang="fr">Document</title>
+			<title xml:lang="zh-TW">Document</title>
+			<title xml:lang="vi">Document</title>
+			<title xml:lang="mn">Document</title>
+			<title xml:lang="tr">Document</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 0e83aa3c7..a342c27c8 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -2,29 +2,28 @@
     /**
      * @class  documentAdminController
      * @author NHN (developers@xpressengine.com)
-     * @brief  document 모듈의 admin controller 클래스
+     * @brief document the module's admin controller class
      **/
 
     class documentAdminController extends document {
 
         /**
-         * @brief 초기화
+         * @brief Initialization
          **/
         function init() {
         }
 
         /**
-         * @brief 관리자 페이지에서 선택된 문서들 삭제
+         * @brief Remove the selected docs from admin page
          **/
         function procDocumentAdminDeleteChecked() {
-            // 선택된 글이 없으면 오류 표시
+            // error appears if no doc is selected
             $cart = Context::get('cart');
             if(!$cart) return $this->stop('msg_cart_is_null');
             $document_srl_list= explode('|@|', $cart);
             $document_count = count($document_srl_list);
             if(!$document_count) return $this->stop('msg_cart_is_null');
-
-            // 글삭제
+            // Delete a doc
             $oDocumentController = &getController('document');
             for($i=0;$i<$document_count;$i++) {
                 $document_srl = trim($document_srl_list[$i]);
@@ -36,8 +35,8 @@
             $this->setMessage( sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
         }
 
-        /** 
-         * @brief 특정 게시물들의 소속 모듈 변경 (게시글 이동시에 사용)
+        /**
+         * @brief change the module to move a specific article
          **/
         function moveDocumentModule($document_srl_list, $module_srl, $category_srl) {
             if(!count($document_srl_list)) return;
@@ -51,8 +50,7 @@
             $triggerObj->document_srls = implode(',',$document_srl_list);
             $triggerObj->module_srl = $module_srl;
             $triggerObj->category_srl = $category_srl;
-
-            // Call trigger (before)
+            // Call a trigger (before)
             $output = ModuleHandler::triggerCall('document.moveDocumentModule', 'before', $triggerObj);
             if(!$output->toBool()) {
                 $oDB->rollback();
@@ -68,8 +66,7 @@
 
                 unset($obj);
                 $obj = $oDocument->getObjectVars();
-
-                // 대상 모듈이 다를 경우 첨부파일 이동
+                // Move the attached file if the target module is different
                 if($module_srl != $obj->module_srl && $oDocument->hasUploadedFiles()) {
                     $oFileController = &getController('file');
 
@@ -80,24 +77,21 @@
                         $file_info['name'] = $val->source_filename;
                         $inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, $val->download_count, true);
                         if($inserted_file && $inserted_file->toBool()) {
-                            // 이미지/동영상등일 경우
+                            // for image/video files
                             if($val->direct_download == 'Y') {
                                 $source_filename = substr($val->uploaded_filename,2);
                                 $target_filename = substr($inserted_file->get('uploaded_filename'),2);
                                 $obj->content = str_replace($source_filename, $target_filename, $obj->content);
-
-                            // binary 파일일 경우
+                            // For binary files
                             } else {
                                 $obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
                                 $obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
                             }
                         }
-
-                        // 기존 파일 삭제
+                        // Delete an existing file
                         $oFileController->deleteFile($val->file_srl);
                     }
-
-                    // 등록된 모든 파일을 유효로 변경
+                    // Set the all files to be valid
                     $oFileController->setFilesValid($obj->document_srl);
                 }
 
@@ -105,8 +99,7 @@
                 {
                     $oDocumentController->deleteDocumentAliasByDocument($obj->document_srl);
                 }
-
-                // 게시물의 모듈 이동
+                // Move a module of the article
                 $obj->module_srl = $module_srl;
                 $obj->category_srl = $category_srl;
                 $output = executeQuery('document.updateDocumentModule', $obj);
@@ -114,8 +107,7 @@
                     $oDB->rollback();
                     return $output;
                 }
-
-                // 카테고리가 변경되었으면 검사후 없는 카테고리면 0으로 세팅
+                // Set 0 if a new category doesn't exist after catergory change
                 if($source_category_srl != $category_srl) {
                     if($source_category_srl) $oDocumentController->updateCategoryCount($oDocument->get('module_srl'), $source_category_srl);
                     if($category_srl) $oDocumentController->updateCategoryCount($module_srl, $category_srl);
@@ -125,8 +117,7 @@
 
             $args->document_srls = implode(',',$document_srl_list);
             $args->module_srl = $module_srl;
-
-            // 댓글의 이동
+            // move the comment
             $output = executeQuery('comment.updateCommentModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
@@ -138,34 +129,44 @@
                 $oDB->rollback();
                 return $output;
             }
-
-            // 엮인글의 이동
+            // move the trackback
             $output = executeQuery('trackback.updateTrackbackModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
-
-            // 태그
+            // Tags
             $output = executeQuery('tag.updateTagModule', $args);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
-
-            // Call trigger (before)
+            // Call a trigger (before)
             $output = ModuleHandler::triggerCall('document.moveDocumentModule', 'after', $triggerObj);
             if(!$output->toBool()) {
                 $oDB->rollback();
                 return $output;
             }
-            
+
             $oDB->commit();
+			//remove from cache
+	        $oCacheHandler = &CacheHandler::getInstance('object');
+	        if($oCacheHandler->isSupport())
+	        {
+	        	foreach($document_srl_list as $document_srl)
+	        	{
+	        		$cache_key = 'object:'.$document_srl;
+                            $oCacheHandler->delete($cache_key);
+                            $cache_key_item = 'object_document_item:'.$document_srl;
+                            $oCacheHandler->delete($cache_key_item);
+	        	}
+                        $oCacheHandler->invalidateGroupKey('documentList');
+	        }
             return new Object();
         }
 
-        /** 
-         * @brief 게시글의 복사
+        /**
+         * @brief Copy the post
          **/
         function copyDocumentModule($document_srl_list, $module_srl, $category_srl) {
             if(!count($document_srl_list)) return;
@@ -191,8 +192,7 @@
                 $obj->password_is_hashed = true;
                 $obj->comment_count = 0;
                 $obj->trackback_count = 0;
-
-                // 첨부파일 미리 등록
+                // Pre-register the attachment
                 if($oDocument->hasUploadedFiles()) {
                     $files = $oDocument->getUploadedFiles();
                     foreach($files as $key => $val) {
@@ -201,29 +201,26 @@
                         $file_info['name'] = $val->source_filename;
                         $oFileController = &getController('file');
                         $inserted_file = $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, 0, true);
-
-                        // 이미지/동영상등일 경우
+                        // if image/video files
                         if($val->direct_download == 'Y') {
                             $source_filename = substr($val->uploaded_filename,2);
                             $target_filename = substr($inserted_file->get('uploaded_filename'),2);
                             $obj->content = str_replace($source_filename, $target_filename, $obj->content);
-
-                        // binary 파일일 경우
+                        // If binary file
                         } else {
                             $obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $obj->content);
                             $obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $obj->content);
                         }
                     }
                 }
-                
-                // 글의 등록
+
+                // Write a post
                 $output = $oDocumentController->insertDocument($obj, true);
                 if(!$output->toBool()) {
                     $oDB->rollback();
                     return $output;
                 }
-
-                // 댓글 이전
+                // Move the comments
                 if($oDocument->getCommentCount()) {
                     $oCommentModel = &getModel('comment');
                     $comment_output = $oCommentModel->getCommentList($document_srl, 0, true, 99999999);
@@ -236,6 +233,28 @@
                             $comment_srl = getNextSequence();
                             $p_comment_srl[$comment_obj->comment_srl] = $comment_srl;
 
+							// Pre-register the attachment
+							if($comment_obj->uploaded_count) {
+								$files = $oFileModel->getFiles($comment_obj->comment_srl, true);
+								foreach($files as $key => $val) {
+									$file_info = array();
+									$file_info['tmp_name'] = $val->uploaded_filename;
+									$file_info['name'] = $val->source_filename;
+									$oFileController = &getController('file');
+									$inserted_file = $oFileController->insertFile($file_info, $module_srl, $comment_srl, 0, true);
+									// if image/video files
+									if($val->direct_download == 'Y') {
+										$source_filename = substr($val->uploaded_filename,2);
+										$target_filename = substr($inserted_file->get('uploaded_filename'),2);
+										$comment_obj->content = str_replace($source_filename, $target_filename, $comment_obj->content);
+									// If binary file
+									} else {
+										$comment_obj->content = str_replace('file_srl='.$val->file_srl, 'file_srl='.$inserted_file->get('file_srl'), $comment_obj->content);
+										$comment_obj->content = str_replace('sid='.$val->sid, 'sid='.$inserted_file->get('sid'), $comment_obj->content);
+									}
+								}
+							}
+
                             $comment_obj->module_srl = $obj->module_srl;
                             $comment_obj->document_srl = $obj->document_srl;
                             $comment_obj->comment_srl = $comment_srl;
@@ -250,8 +269,7 @@
                     }
 
                 }
-
-                // 엮인글 이전
+                // Move the trackbacks
                 if($oDocument->getTrackbackCount()) {
                     $oTrackbackModel = &getModel('trackback');
                     $trackbacks = $oTrackbackModel->getTrackbackList($oDocument->document_srl);
@@ -264,8 +282,7 @@
                             $output = executeQuery('trackback.insertTrackback', $trackback_obj);
                             if($output->toBool()) $success_count++;
                         }
-
-                        // 엮인글 수 업데이트
+                        // Update the number of trackbacks
                         $oDocumentController->updateTrackbackCount($obj->document_srl, $success_count);
                     }
                 }
@@ -280,29 +297,57 @@
         }
 
         /**
-         * @brief 특정 모듈의 전체 문서 삭제
+         * @brief Delete all documents of the module
          **/
         function deleteModuleDocument($module_srl) {
             $args->module_srl = $module_srl;
+			$oDocumentModel = &getModel('document');
+            $args->module_srl = $module_srl;
+            $document_list = $oDocumentModel->getDocumentList($args);
+            $documents = $document_list->data;
             $output = executeQuery('document.deleteModuleDocument', $args);
+			if (is_array($documents)){
+				foreach ($documents as $oDocument){
+					$document_srl_list[] = $oDocument->document_srl;
+				}
+			}
+			//remove from cache
+	        $oCacheHandler = &CacheHandler::getInstance('object');
+	        if($oCacheHandler->isSupport())
+	        {
+	        	foreach($document_srl_list as $document_srl)
+	        	{
+	        		$cache_key = 'object:'.$document_srl;
+	            	$oCacheHandler->delete($cache_key);
+                            $cache_key_item = 'object_document_item:'.$document_srl;
+                            $oCacheHandler->delete($cache_key_item);
+                            $oCacheHandler->invalidateGroupKey('commentList_' . $document_srl);
+	        	}
+                        $oCacheHandler->invalidateGroupKey('documentList');
+	        }
             return $output;
         }
 
         /**
-         * @brief 문서 모듈의 기본설정 저장
+         * @brief Save the default settings of the document module
          **/
         function procDocumentAdminInsertConfig() {
-            // 기본 정보를 받음
+            // Get the basic information
             $config = Context::gets('thumbnail_type');
-
-            // module Controller 객체 생성하여 입력
+            // Insert by creating the module Controller object
             $oModuleController = &getController('module');
             $output = $oModuleController->insertModuleConfig('document',$config);
+
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
             return $output;
         }
 
         /**
-         * @brief 선택된 글들에 대해 신고 취소
+         * @brief Revoke declaration of the blacklisted posts
          **/
         function procDocumentAdminCancelDeclare() {
             $document_srl = trim(Context::get('document_srl'));
@@ -315,14 +360,12 @@
         }
 
         /**
-         * @brief 모든 생성된 섬네일 삭제
+         * @brief Delete all thumbnails
          **/
         function procDocumentAdminDeleteAllThumbnail() {
-
-            // files/attaches/images/ 디렉토리를 순환하면서 thumbnail_*.jpg 파일을 모두 삭제 (1.0.4 이전까지)
+            // delete all of thumbnail_ *. jpg files from files/attaches/images/ directory (prior versions to 1.0.4)
             $this->deleteThumbnailFile('./files/attach/images');
-
-            // files/cache/thumbnails 디렉토리 자체를 삭제 (1.0.5 이후 변경된 섬네일 정책)
+            // delete a directory itself, files/cache/thumbnails (thumbnail policies have changed since version 1.0.5)
             FileHandler::removeFilesInDir('./files/cache/thumbnails');
 
             $this->setMessage('success_deleted');
@@ -344,7 +387,7 @@
         }
 
         /**
-         * @brief 모듈의 확장 변수 추가 또는 수정
+         * @brief Add or modify extra variables of the module
          **/
         function procDocumentAdminInsertExtraVar() {
             $module_srl = Context::get('module_srl');
@@ -358,15 +401,14 @@
 			$eid = Context::get('eid');
 
             if(!$module_srl || !$name || !$eid) return new Object(-1,'msg_invalid_request');
-
-            // idx가 지정되어 있지 않으면 최고 값을 지정
+            // set the max value if idx is not specified
             if(!$var_idx) {
                 $obj->module_srl = $module_srl;
                 $output = executeQuery('document.getDocumentMaxExtraKeyIdx', $obj);
                 $var_idx = $output->data->var_idx+1;
             }
 
-			// 이미 존재하는 모듈 이름인지 체크
+			// Check if the module name already exists
 			$obj->module_srl = $module_srl;
 			$obj->var_idx = $var_idx;
 			$obj->eid = $eid;
@@ -381,10 +423,15 @@
             if(!$output->toBool()) return $output;
 
             $this->setMessage('success_registed');
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
         }
 
         /**
-         * @brief 모듈의 확장 변수 삭제
+         * @brief delete extra variables of the module
          **/
         function procDocumentAdminDeleteExtraVar() {
             $module_srl = Context::get('module_srl');
@@ -397,9 +444,9 @@
 
             $this->setMessage('success_deleted');
         }
- 
+
         /**
-         * @brief 확장변수 순서 조절
+         * @brief control the order of extra variables
          **/
         function procDocumentAdminMoveExtraVar() {
             $type = Context::get('type');
@@ -420,7 +467,14 @@
             else $new_idx = $var_idx+1;
             if($new_idx<1) return new Object(-1,'msg_invalid_request');
 
-            // 바꿀 idx가 없으면 바로 업데이트
+			$args->module_srl = $module_srl;
+			$args->var_idx = $new_idx;
+			$output = executeQuery('document.getDocumentExtraKeys', $args);
+			if (!$output->toBool()) return $output;
+			if (!$output->data) return new Object(-1, 'msg_invalid_request');
+			unset($args);
+
+            // update immediately if there is no idx to change
             if(!$extra_keys[$new_idx]) {
                 $args->module_srl = $module_srl;
                 $args->var_idx = $var_idx;
@@ -429,7 +483,7 @@
                 if(!$output->toBool()) return $output;
                 $output = executeQuery('document.updateDocumentExtraVarIdx', $args);
                 if(!$output->toBool()) return $output;
-            // 있으면 기존의 꺼랑 교체
+            // replace if exists
             } else {
                 $args->module_srl = $module_srl;
                 $args->var_idx = $new_idx;
@@ -458,31 +512,38 @@
         function procDocumentAdminInsertAlias() {
             $args = Context::gets('module_srl','document_srl', 'alias_title');
             $alias_srl = Context::get('alias_srl');
-            if(!$alias_srl) 
+            if(!$alias_srl)
             {
                 $args->alias_srl = getNextSequence();
                 $query = "document.insertAlias";
             }
-            else 
+            else
             {
                 $args->alias_srl = $alias_srl;
                 $query = "document.updateAlias";
             }
             $output = executeQuery($query, $args);
-            if(!$output->toBool())
-            {
-                return $output;
-            }
+
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $args->document_srl);
+				header('location:'.$returnUrl);
+				return;
+			}
+			return $output;
         }
 
         function procDocumentAdminDeleteAlias() {
-            $alias_srl = Context::get('alias_srl');
+			$document_srl = Context::get('document_srl');
+            $alias_srl = Context::get('target_srl');
             $args->alias_srl = $alias_srl;
             $output = executeQuery("document.deleteAlias", $args);
-            if (!$output->toBool())
-            {
-                return $output;
-            }
+
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminAlias', 'document_srl', $document_srl);
+				header('location:'.$returnUrl);
+				return;
+			}
+			return $output;
         }
 
         function procDocumentAdminRestoreTrash() {
@@ -490,7 +551,7 @@
 			$this->restoreTrash($trash_srl);
         }
 
-		function restoreTrash($trash_srl){
+		/*function restoreTrash($trash_srl){
             $oDB = &DB::getInstance();
             $oDocumentModel = &getModel('document');
 
@@ -523,15 +584,13 @@
                 $oDB->rollback();
                 return $output;
             }
-
-            // 임시 저장되었던 글이 아닌 경우, 등록된 첨부파일의 상태를 유효로 지정
+            // If the post was not temorarily saved, set the attachment's status to be valid
             if($oDocument->hasUploadedFiles() && $document_args->member_srl != $document_args->module_srl) {
                 $args->upload_target_srl = $oDocument->document_srl;
                 $args->isvalid = 'Y';
                 executeQuery('file.updateFileValid', $args);
             }
-
-            // trigger 호출 (after)
+            // call a trigger (after)
             if($output->toBool()) {
                 $trigger_output = ModuleHandler::triggerCall('document.restoreTrash', 'after', $document_args);
                 if(!$trigger_output->toBool()) {
@@ -543,7 +602,64 @@
             // commit
             $oDB->commit();
 			return $output;
+		}*/
+
+        /**
+         * @brief restore document from trash module, called by trash module
+		 * this method is passived
+         **/
+		function restoreTrash($originObject)
+		{
+			if(is_array($originObject)) $originObject = (object)$originObject;
+
+			$oDocumentController = &getController('document');
+            $oDocumentModel = &getModel('document');
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+			//DB restore
+			$output = $oDocumentController->insertDocument($originObject, false, true);
+			if(!$output->toBool()) return new Object(-1, $output->getMessage());
+
+			//FILE restore
+            $oDocument = $oDocumentModel->getDocument($originObject->document_srl);
+            // If the post was not temorarily saved, set the attachment's status to be valid
+            if($oDocument->hasUploadedFiles() && $originObject->member_srl != $originObject->module_srl) {
+                $args->upload_target_srl = $oDocument->document_srl;
+                $args->isvalid = 'Y';
+                $output = executeQuery('file.updateFileValid', $args);
+            }
+
+            // call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('document.restoreTrash', 'after', $originObject);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            // commit
+            $oDB->commit();
+			return new Object(0, 'success');
 		}
 
+        /**
+         * @brief empty document in trash, called by trash module
+		 * this method is passived
+         **/
+		function emptyTrash($originObject)
+		{
+			$originObject = unserialize($originObject);
+			if(is_array($originObject)) $originObject = (object) $originObject;
+
+			$oDocument = new documentItem();
+			$oDocument->setAttribute($originObject);
+
+			$oDocumentController = &getController('document');
+			$output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true, true, $oDocument);
+			return $output;
+		}
     }
 ?>
diff --git a/modules/document/document.admin.model.php b/modules/document/document.admin.model.php
index 9a86e5799..819f9cb00 100644
--- a/modules/document/document.admin.model.php
+++ b/modules/document/document.admin.model.php
@@ -1,87 +1,94 @@
-<?php
-    /**
-     * @class  documentAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief  document 모듈의 admin model class
-     **/
-
-    class documentAdminModel extends document {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-          * @brief 휴지통에 존재하는 문서 목록을 가져옴
-          **/
-        function getDocumentTrashList($obj) {
-            // 정렬 대상과 순서 체크
-            if (!in_array($obj->sort_index, array('list_order','delete_date','title'))) $obj->sort_index = 'list_order';
-            if (!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
-
-            // module_srl 대신 mid가 넘어왔을 경우는 직접 module_srl을 구해줌
-            if ($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
-            if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-
-            // 변수 체크
-            $args->sort_index = $obj->sort_index;
-            $args->order_type = $obj->order_type;
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-            $args->member_srl = $obj->member_srl;
-
-            // query_id 지정
-            $query_id = 'document.getTrashList';
-
-            // query 실행
-            $output = executeQueryArray($query_id, $args);
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if (!$output->toBool() || !count($output->data)) return $output;
-
-            $idx = 0;
-            $data = $output->data;
-            unset($output->data);
-
-            $keys = array_keys($data);
-            $virtual_number = $keys[0];
-
-            foreach($data as $key => $attribute) {
-                $oDocument = null;
-                $oDocument = new documentItem();
-                $oDocument->setAttribute($attribute, false);
-                if ($is_admin) $oDocument->setGrant();
-
-                $output->data[$virtual_number] = $oDocument;
-                $virtual_number--;
-            }
-
-            return $output;
-        }
-
-        /**
-          * @brief trash_srl값을 가지는 휴지통 문서를 가져옴
-          **/
-        function getDocumentTrash($trash_srl) {
-            $args->trash_srl = $trash_srl;
-            $output = executeQuery('document.getTrash', $args);
-
-            $node = $output->data;
-            if (!$node) return;
-
-            return $node;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  documentAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief document the module's admin model class
+     **/
+
+    class documentAdminModel extends document {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+          * @brief get a document list from the trash
+          **/
+        function getDocumentTrashList($obj) {
+            // check a list and its order
+            if (!in_array($obj->sort_index, array('list_order','delete_date','title'))) $obj->sort_index = 'list_order';
+            if (!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
+            // get a module_srl if mid is returned instead of modul_srl
+            if ($obj->mid) {
+                $oModuleModel = &getModel('module');
+                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+                unset($obj->mid);
+            }
+            // check if the module_srl is an array
+            if (is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+            // Variable check
+            $args->sort_index = $obj->sort_index;
+            $args->order_type = $obj->order_type;
+            $args->page = $obj->page?$obj->page:1;
+            $args->list_count = $obj->list_count?$obj->list_count:20;
+            $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->member_srl = $obj->member_srl;
+            // Specify query_id
+            $query_id = 'document.getTrashList';
+            // Execute a query
+            $output = executeQueryArray($query_id, $args);
+            // Return if no result or an error occurs
+            if (!$output->toBool() || !count($output->data)) return $output;
+
+            $idx = 0;
+            $data = $output->data;
+            unset($output->data);
+
+            $keys = array_keys($data);
+            $virtual_number = $keys[0];
+
+            foreach($data as $key => $attribute) {
+                $oDocument = null;
+                $oDocument = new documentItem();
+                $oDocument->setAttribute($attribute, false);
+                if ($is_admin) $oDocument->setGrant();
+
+                $output->data[$virtual_number] = $oDocument;
+                $virtual_number--;
+            }
+
+            return $output;
+        }
+
+        /**
+          * @brief get the doc which has trash_srl from the trash can
+          **/
+        function getDocumentTrash($trash_srl) {
+            $args->trash_srl = $trash_srl;
+            $output = executeQuery('document.getTrash', $args);
+
+            $node = $output->data;
+            if (!$node) return;
+
+            return $node;
+        }
+
+        /**
+         * @brief Return document count with date
+         **/
+        function getDocumentCountByDate($date = '', $moduleSrlList = array(), $statusList = array()) {
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+			if(count($moduleSrlList)>0) $args->moduleSrlList = $moduleSrlList;
+			if(count($statusList)>0) $args->statusList = $statusList;
+
+			$output = executeQuery('document.getDocumentCountByDate', $args);
+			if(!$output->toBool()) return 0;
+
+			return $output->data->count;
+        }
+    }
+?>
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index e543b232b..21ad01a60 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -1,158 +1,174 @@
-<?php
-    /**
-     * @class  documentAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  document 모듈의 admin view 클래스
-     **/
-
-    class documentAdminView extends document {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 목록 출력 (관리자용)
-         **/
-        function dispDocumentAdminList() {
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->search_target = Context::get('search_target'); ///< 검색 대상 (title, contents...)
-            $args->search_keyword = Context::get('search_keyword'); ///< 검색어
-
-            $args->sort_index = 'list_order'; ///< 소팅 값
-
-            $args->module_srl = Context::get('module_srl');
-
-            // 목록 구함, document->getDocumentList 에서 걍 알아서 다 해버리는 구조이다... (아.. 이거 나쁜 버릇인데.. ㅡ.ㅜ 어쩔수 없다)
-            $oDocumentModel = &getModel('document');
-            $output = $oDocumentModel->getDocumentList($args);
-
-            // 템플릿에 쓰기 위해서 document_model::getDocumentList() 의 return object에 있는 값들을 세팅
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('document_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            // 템플릿에서 사용할 검색옵션 세팅
-            $count_search_option = count($this->search_option);
-            for($i=0;$i<$count_search_option;$i++) {
-                $search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
-            }
-            Context::set('search_option', $search_option);
-
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('document_list');
-        }
-
-        /**
-         * @brief 문서 모듈 설정 
-         **/
-        function dispDocumentAdminConfig() {
-            $oDocumentModel = &getModel('document');
-            $config = $oDocumentModel->getDocumentConfig();
-            Context::set('config',$config);
-
-            // 템플릿 파일 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('document_config');
-        }
-
-        /**
-         * @brief 관리자 페이지의 신고 목록 보기
-         **/
-        function dispDocumentAdminDeclared() {
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'document_declared.declared_count'; ///< 소팅 값
-            $args->order_type = 'desc'; ///< 소팅 정렬 값
-
-            // 목록을 구함
-            $declared_output = executeQuery('document.getDeclaredList', $args);
-
-            if($declared_output->data && count($declared_output->data)) {
-                $document_list = array();
-
-                $oDocumentModel = &getModel('document');
-                foreach($declared_output->data as $key => $document) {
-                    $document_list[$key] = new documentItem();
-                    $document_list[$key]->setAttribute($document);
-                }
-                $declared_output->data = $document_list;
-            }
-        
-            // 템플릿에 쓰기 위해서 document_model::getDocumentList() 의 return object에 있는 값들을 세팅
-            Context::set('total_count', $declared_output->total_count);
-            Context::set('total_page', $declared_output->total_page);
-            Context::set('page', $declared_output->page);
-            Context::set('document_list', $declared_output->data);
-            Context::set('page_navigation', $declared_output->page_navigation);
-
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('declared_list');
-        }
-
-        function dispDocumentAdminAlias() {
-            $args->document_srl = Context::get('document_srl');
-            if(!$args->document_srl) return $this->dispDocumentAdminList();
-
-            $oModel = &getModel('document');
-            $oDocument = $oModel->getDocument($args->document_srl);
-            if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
-            Context::set('oDocument', $oDocument);
-
-            $output = executeQueryArray('document.getAliases', $args);
-            if(!$output->data)
-            {
-                $aliases = array();
-            }
-            else
-            {
-                $aliases = $output->data; 
-            }
-
-            Context::set('aliases', $aliases);
-	
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('document_alias');
-        }
-
-        function dispDocumentAdminTrashList() {
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'list_order'; ///< 소팅 값
-            $args->order_type = 'desc'; ///< 소팅 정렬 값
-
-            $args->module_srl = Context::get('module_srl');
-
-            // 목록을 구함
-            $oDocumentAdminModel = &getAdminModel('document');
-            $output = $oDocumentAdminModel->getDocumentTrashList($args);
-
-            // 템플릿에 쓰기 위해서 document_admin_model::getDocumentTrashList() 의 return object에 있는 값들을 세팅
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('document_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('document_trash_list');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  documentAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief document admin view of the module class
+     **/
+
+    class documentAdminView extends document {
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+			// check current location in admin menu
+			$oModuleModel = &getModel('module');
+			$info = $oModuleModel->getModuleActionXml('document');
+			foreach($info->menu AS $key => $menu)
+			{
+				if(in_array($this->act, $menu->acts))
+				{
+					Context::set('currentMenu', $key);
+					break;
+				}
+			}
+        }
+
+        /**
+         * @brief Display a list(administrative)
+         **/
+        function dispDocumentAdminList() {
+            // option to get a list
+            $args->page = Context::get('page'); // /< Page
+            $args->list_count = 30; // /< the number of posts to display on a single page
+            $args->page_count = 5; // /< the number of pages that appear in the page navigation
+
+            $args->search_target = Context::get('search_target'); // /< search (title, contents ...)
+            $args->search_keyword = Context::get('search_keyword'); // /< keyword to search
+
+            $args->sort_index = 'list_order'; // /< sorting value
+
+            $args->module_srl = Context::get('module_srl');
+
+            // get a list
+            $oDocumentModel = &getModel('document');
+			$columnList = array('document_srl', 'title', 'member_srl', 'nick_name', 'readed_count', 'voted_count', 'blamed_count', 'regdate', 'ipaddress', 'status');
+            $output = $oDocumentModel->getDocumentList($args, false, true, $columnList);
+
+			// get Status name list
+			$statusNameList = $oDocumentModel->getStatusNameList();
+
+            // Set values of document_model::getDocumentList() objects for a template
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('document_list', $output->data);
+            Context::set('status_name_list', $statusNameList);
+            Context::set('page_navigation', $output->page_navigation);
+
+            // set a search option used in the template
+            $count_search_option = count($this->search_option);
+            for($i=0;$i<$count_search_option;$i++) {
+                $search_option[$this->search_option[$i]] = Context::getLang($this->search_option[$i]);
+            }
+            Context::set('search_option', $search_option);
+
+            // Specify a template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('document_list');
+        }
+
+        /**
+         * @brief Set a document module
+         **/
+        function dispDocumentAdminConfig() {
+            $oDocumentModel = &getModel('document');
+            $config = $oDocumentModel->getDocumentConfig();
+            Context::set('config',$config);
+
+            // Set the template file
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('document_config');
+        }
+
+        /**
+         * @brief display a report list on the admin page
+         **/
+        function dispDocumentAdminDeclared() {
+			// option for a list
+			$args->page = Context::get('page'); // /< Page
+			$args->list_count = 30; // /< the number of posts to display on a single page
+			$args->page_count = 10; // /< the number of pages that appear in the page navigation
+
+			$args->sort_index = 'document_declared.declared_count'; // /< sorting values
+			$args->order_type = 'desc'; // /< sorting values by order
+
+			// get Status name list
+			$oDocumentModel = &getModel('document');
+			$statusNameList = $oDocumentModel->getStatusNameList();
+
+			// get a list
+			$declared_output = executeQuery('document.getDeclaredList', $args);
+			if($declared_output->data && count($declared_output->data)) {
+				$document_list = array();
+
+				foreach($declared_output->data as $key => $document) {
+					$document_list[$key] = new documentItem();
+					$document_list[$key]->setAttribute($document);
+				}
+				$declared_output->data = $document_list;
+			}
+
+			// Set values of document_model::getDocumentList() objects for a template
+			Context::set('total_count', $declared_output->total_count);
+			Context::set('total_page', $declared_output->total_page);
+			Context::set('page', $declared_output->page);
+			Context::set('document_list', $declared_output->data);
+			Context::set('page_navigation', $declared_output->page_navigation);
+            Context::set('status_name_list', $statusNameList);
+			// Set the template
+			$this->setTemplatePath($this->module_path.'tpl');
+			$this->setTemplateFile('declared_list');
+        }
+
+        function dispDocumentAdminAlias() {
+            $args->document_srl = Context::get('document_srl');
+            if(!$args->document_srl) return $this->dispDocumentAdminList();
+
+            $oModel = &getModel('document');
+            $oDocument = $oModel->getDocument($args->document_srl);
+            if(!$oDocument->isExists()) return $this->dispDocumentAdminList();
+            Context::set('oDocument', $oDocument);
+
+            $output = executeQueryArray('document.getAliases', $args);
+            if(!$output->data)
+            {
+                $aliases = array();
+            }
+            else
+            {
+                $aliases = $output->data; 
+            }
+
+            Context::set('aliases', $aliases);
+	
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('document_alias');
+        }
+
+        function dispDocumentAdminTrashList() {
+            // options for a list
+            $args->page = Context::get('page'); // /< Page
+            $args->list_count = 30; // /< the number of posts to display on a single page
+            $args->page_count = 10; // /< the number of pages that appear in the page navigation
+
+            $args->sort_index = 'list_order'; // /< sorting values
+            $args->order_type = 'desc'; // /< sorting values by order
+
+            $args->module_srl = Context::get('module_srl');
+
+            // get a list
+            $oDocumentAdminModel = &getAdminModel('document');
+            $output = $oDocumentAdminModel->getDocumentTrashList($args);
+
+            // Set values of document_admin_model::getDocumentTrashList() objects for a template
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('document_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+            // set the template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('document_trash_list');
+        }
+    }
+?>
diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index c3797d5ad..4274eed3d 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -1,262 +1,324 @@
-<?php
-    /**
-     * @class  document
-     * @author NHN (developers@xpressengine.com)
-     * @brief  document 모듈의 high 클래스
-     **/
-
-    require_once(_XE_PATH_.'modules/document/document.item.php');
-
-    class document extends ModuleObject {
-
-        // 관리자페이지에서 사용할 검색 옵션
-        var $search_option = array('title','content','title_content','user_name',); ///< 검색 옵션
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            $oDB = &DB::getInstance();
-            $oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
-            $oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
-            $oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
-            $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
-            $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
-            $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
-            $oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
-            $oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
-            $oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
-            $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
-
-            // 2009. 01. 29 Added a trigger for additional setup
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-
-            /**
-             * 2007. 7. 25 : 알림 필드(notify_message) 추가
-             **/
-            if(!$oDB->isColumnExists("documents","notify_message")) return true;
-
-            /**
-             * 2007. 8. 23 : document테이블에 결합 인덱스 적용
-             **/
-            if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
-            if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
-            if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
-            if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
-
-            // 2007. 10. 25 문서 분류에 parent_srl, expand를 추가
-            if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
-            if(!$oDB->isColumnExists("document_categories","expand")) return true;
-            if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
-
-            // 2007. 11. 20 게시글에 module_srl + is_notice 복합인덱스 만들기
-            if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
-
-            // 2008. 02. 18 게시글에 module_srl + document_srl 복합인덱스 만들기 (manian님 확인)
-            if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
-
-            /**
-             * 2007. 12. 03 : 확장변수(extra_vars) 컬럼이 없을 경우 추가
-             **/
-            if(!$oDB->isColumnExists("documents","extra_vars")) return true;
-
-            // 2008. 04. 23 blamed count 컬럼 추가
-            if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
-            if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
-            if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
-
-            // 2008-12-15 문서 분류에 color를 추가
-            if(!$oDB->isColumnExists("document_categories", "color")) return true;
-
-            /**
-             * 2009. 01. 29 : 확장변수 값 테이블에 lang_code가 없을 경우 추가
-             **/
-            if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
-
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
-
-            // 2009. 03. 09 documents에 lang_code 컬럼 추가
-            if(!$oDB->isColumnExists("documents","lang_code")) return true;
-
-            // 2009. 03. 11 확장변수 값 테이블의 인덱스 점검
-            if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
-
-            /**
-             * 2009. 03. 19 : 확장변수 값 테이블에 eid가 없을 경우 추가
-             **/
-            if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
-            if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
-
-            // 2011. 03. 30 Cubrid index 추가 요청
-            if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            /**
-             * 2007. 7. 25 : 알림 필드(notify_message) 추가
-             **/
-            if(!$oDB->isColumnExists("documents","notify_message")) {
-                $oDB->addColumn('documents',"notify_message","char",1);
-            }
-
-            /**
-             * 2007. 8. 23 : document테이블에 결합 인덱스 적용
-             **/
-            if(!$oDB->isIndexExists("documents","idx_module_list_order")) {
-                $oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
-            }
-
-            if(!$oDB->isIndexExists("documents","idx_module_update_order")) {
-                $oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
-            }
-
-            if(!$oDB->isIndexExists("documents","idx_module_readed_count")) {
-                $oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
-            }
-
-            if(!$oDB->isIndexExists("documents","idx_module_voted_count")) {
-                $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
-            }
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 글도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
-                $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
-
-            // 2007. 10. 25 문서 분류에 parent_srl, expand를 추가
-            if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
-            if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
-            if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
-
-            // 2007. 11. 20 게시글에 module_srl + is_notice 복합인덱스 만들기
-            if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
-
-            /**
-             * 2007. 12. 03 : 확장변수(extra_vars) 컬럼이 없을 경우 추가
-             **/
-            if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
-
-            /**
-             * 2008. 02. 18 게시글에 module_srl + document_srl 복합인덱스 만들기 (manian님 확인)
-             **/
-            if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
-
-            // 2008. 04. 23 blamed count 컬럼 추가
-            if(!$oDB->isColumnExists("documents", "blamed_count")) {
-                $oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true);
-                $oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
-            }
-
-            if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) {
-                $oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
-            }
-
-            if(!$oDB->isColumnExists("document_voted_log", "point"))
-            $oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
-
-
-            if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
-
-            /**
-             * 2009. 01. 29 : 확장변수 값 테이블에 lang_code가 없을 경우 추가
-             **/
-            if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
-
-            // 2009. 01. 29 Added a trigger for additional setup
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
-
-            // 2009. 03. 09 documents에 lang_code 컬럼 추가
-            if(!$oDB->isColumnExists("documents","lang_code")) {
-                $db_info = Context::getDBInfo();
-                $oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
-                $obj->lang_code = $db_info->lang_type;
-                executeQuery('document.updateDocumentsLangCode', $obj);
-            }
-
-            // 2009. 03. 11 확장변수 값 테이블의 인덱스 점검
-            if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) {
-                $oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
-            }
-
-            if($oDB->isIndexExists("document_extra_vars", "unique_module_vars")) {
-                $oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
-            }
-
-            /**
-             * 2009. 03. 19 : 확장변수 값 테이블에 eid 없을 경우 추가
-             * 2009. 04. 12 : eid를 등록할 때 다른 필드 값이 변경되는 문제 수정 #17922959
-             **/
-            if(!$oDB->isColumnExists("document_extra_keys","eid")) {
-                $oDB->addColumn("document_extra_keys","eid","varchar",40);
-
-                $output = executeQuery('document.getGroupsExtraKeys', $obj);
-                if($output->toBool() && $output->data && count($output->data)) {
-                    foreach($output->data as $extra_keys) {
-                        $args->module_srl = $extra_keys->module_srl;
-                        $args->var_idx = $extra_keys->idx;
-                        $args->new_eid = "extra_vars".$extra_keys->idx;
-                        $output = executeQuery('document.updateDocumentExtraKeyEid', $args);
-                    }
-                }
-            }
-
-            if(!$oDB->isColumnExists("document_extra_vars","eid")) {
-                $oDB->addColumn("document_extra_vars","eid","varchar",40);
-                $obj->var_idx = '-1,-2';
-                $output = executeQuery('document.getGroupsExtraVars', $obj);
-                if($output->toBool() && $output->data && count($output->data)) {
-                    foreach($output->data as $extra_vars) {
-                        $args->module_srl = $extra_vars->module_srl;
-                        $args->var_idx = $extra_vars->idx;
-                        $args->new_eid = "extra_vars".$extra_vars->idx;
-                        $output = executeQuery('document.updateDocumentExtraVarEid', $args);
-                    }
-                }
-            }
-
-            // 2011. 03. 30 Cubrid index 추가 요청
-            if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) {
-                $oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl","module_srl","var_idx"), false);
-            }
-
-            return new Object(0,'success_updated');
-
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 게시글 분류 캐시 파일 삭제
-            FileHandler::removeFilesInDir(_XE_PATH_."files/cache/document_category");
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  document
+     * @author NHN (developers@xpressengine.com)
+     * @brief document the module's high class
+     **/
+
+    require_once(_XE_PATH_.'modules/document/document.item.php');
+
+    class document extends ModuleObject {
+
+        // search option to use in admin page
+        var $search_option = array('title','content','title_content','user_name',); // /< Search options
+		var $statusList = array('private'=>'PRIVATE', 'public'=>'PUBLIC', 'secret'=>'SECRET', 'temp'=>'TEMP');
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+
+            $oDB = &DB::getInstance();
+            $oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
+            $oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
+            $oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
+            $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
+            $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+            $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+            $oDB->addIndex("documents","idx_module_blamed_count", array("module_srl","blamed_count"));
+            $oDB->addIndex("document_aliases", "idx_module_title", array("module_srl","alias_title"), true);
+            $oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+            // 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
+            $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
+
+            // 2009. 01. 29 Added a trigger for additional setup
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+
+            /**
+             * 2007. 7. 25: Add a column(notify_message) for notification
+             **/
+            if(!$oDB->isColumnExists("documents","notify_message")) return true;
+
+            /**
+             * 2007. 8. 23: create a clustered index in the document table
+             **/
+            if(!$oDB->isIndexExists("documents","idx_module_list_order")) return true;
+            if(!$oDB->isIndexExists("documents","idx_module_update_order")) return true;
+            if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
+            if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
+            // 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after')) return true;
+            // 2007. 10. 25 add parent_srl, expand to the document category
+            if(!$oDB->isColumnExists("document_categories","parent_srl")) return true;
+            if(!$oDB->isColumnExists("document_categories","expand")) return true;
+            if(!$oDB->isColumnExists("document_categories","group_srls")) return true;
+            // 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
+            if(!$oDB->isIndexExists("documents","idx_module_notice")) return true;
+            // 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
+            if(!$oDB->isIndexExists("documents","idx_module_document_srl")) return true;
+
+            /**
+             * 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
+             **/
+            if(!$oDB->isColumnExists("documents","extra_vars")) return true;
+            // 2008. 04. 23 Add a column(blamed_count)
+            if(!$oDB->isColumnExists("documents", "blamed_count")) return true;
+            if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) return true;
+            if(!$oDB->isColumnExists("document_voted_log", "point")) return true;
+            // 2008-12-15 Add a column(color)
+            if(!$oDB->isColumnExists("document_categories", "color")) return true;
+
+            /**
+             * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
+             **/
+            if(!$oDB->isColumnExists("document_extra_vars","lang_code")) return true;
+
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before')) return true;
+            // 2009. 03. 09 Add a column(lang_code) to the documnets table
+            if(!$oDB->isColumnExists("documents","lang_code")) return true;
+            // 2009. 03. 11 check the index in the document_extra_vars table
+            if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) return true;
+
+            /**
+             * 2009. 03. 19: Add a column(eid) if not exist in the table
+             **/
+            if(!$oDB->isColumnExists("document_extra_keys","eid")) return true;
+            if(!$oDB->isColumnExists("document_extra_vars","eid")) return true;
+
+            // 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
+            if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) return true;
+			
+			//2011. 04. 07 adding description column to document categories
+			if(!$oDB->isColumnExists("document_categories","description")) return true;
+
+			//2011. 05. 23 adding status column to document
+			if(!$oDB->isColumnExists('documents', 'status')) return true;
+
+			//2011. 06. 07 check comment status update
+			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment')) return true;
+
+            // 2011. 10. 25 status index check
+            if(!$oDB->isIndexExists("documents", "idx_module_status")) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+
+            /**
+             * 2007. 7. 25: Add a column(notify_message) for notification
+             **/
+            if(!$oDB->isColumnExists("documents","notify_message")) {
+                $oDB->addColumn('documents',"notify_message","char",1);
+            }
+
+            /**
+             * 2007. 8. 23: create a clustered index in the document table
+             **/
+            if(!$oDB->isIndexExists("documents","idx_module_list_order")) {
+                $oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
+            }
+
+            if(!$oDB->isIndexExists("documents","idx_module_update_order")) {
+                $oDB->addIndex("documents","idx_module_update_order", array("module_srl","update_order"));
+            }
+
+            if(!$oDB->isIndexExists("documents","idx_module_readed_count")) {
+                $oDB->addIndex("documents","idx_module_readed_count", array("module_srl","readed_count"));
+            }
+
+            if(!$oDB->isIndexExists("documents","idx_module_voted_count")) {
+                $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
+            }
+            // 2007. 10. 17 Add a trigger to delete all posts together when the module is deleted
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after'))
+                $oModuleController->insertTrigger('module.deleteModule', 'document', 'controller', 'triggerDeleteModuleDocuments', 'after');
+            // 2007. 10. 25 add columns(parent_srl, expand) 
+            if(!$oDB->isColumnExists("document_categories","parent_srl")) $oDB->addColumn('document_categories',"parent_srl","number",12,0);
+            if(!$oDB->isColumnExists("document_categories","expand")) $oDB->addColumn('document_categories',"expand","char",1,"N");
+            if(!$oDB->isColumnExists("document_categories","group_srls")) $oDB->addColumn('document_categories',"group_srls","text");
+            // 2007. 11. 20 create a composite index on the columns(module_srl + is_notice)
+            if(!$oDB->isIndexExists("documents","idx_module_notice")) $oDB->addIndex("documents","idx_module_notice", array("module_srl","is_notice"));
+
+            /**
+             * 2007. 12. 03: Add if the colume(extra_vars) doesn't exist
+             **/
+            if(!$oDB->isColumnExists("documents","extra_vars")) $oDB->addColumn('documents','extra_vars','text');
+
+            /**
+             * 2008. 02. 18 create a composite index on the columns(module_srl + document_srl) (checked by Manian))
+             **/
+            if(!$oDB->isIndexExists("documents","idx_module_document_srl")) $oDB->addIndex("documents","idx_module_document_srl", array("module_srl","document_srl"));
+            // 2008. 04. 23 Add a column(blamed count)
+            if(!$oDB->isColumnExists("documents", "blamed_count")) {
+                $oDB->addColumn('documents', 'blamed_count', 'number', 11, 0, true);
+                $oDB->addIndex('documents', 'idx_blamed_count', array('blamed_count'));
+            }
+
+            if(!$oDB->isIndexExists("documents","idx_module_blamed_count")) {
+                $oDB->addIndex('documents', 'idx_module_blamed_count', array('module_srl', 'blamed_count'));
+            }
+
+            if(!$oDB->isColumnExists("document_voted_log", "point"))
+            $oDB->addColumn('document_voted_log', 'point', 'number', 11, 0, true);
+
+
+            if(!$oDB->isColumnExists("document_categories","color")) $oDB->addColumn('document_categories',"color","char",7);
+
+            /**
+             * 2009. 01. 29: Add a column(lang_code) if not exist in the document_extra_vars table
+             **/
+            if(!$oDB->isColumnExists("document_extra_vars","lang_code")) $oDB->addColumn('document_extra_vars',"lang_code","varchar",10);
+
+            // 2009. 01. 29 Added a trigger for additional setup
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before'))
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'document', 'view', 'triggerDispDocumentAdditionSetup', 'before');
+            // 2009. 03. 09 Add a column(lang_code) to the documnets table
+            if(!$oDB->isColumnExists("documents","lang_code")) {
+                $db_info = Context::getDBInfo();
+                $oDB->addColumn('documents',"lang_code","varchar",10, $db_info->lang_code);
+                $obj->lang_code = $db_info->lang_type;
+                executeQuery('document.updateDocumentsLangCode', $obj);
+            }
+            // 2009. 03. 11 Check the index in the document_extra_vars table
+            if(!$oDB->isIndexExists("document_extra_vars", "unique_extra_vars")) {
+                $oDB->addIndex("document_extra_vars", "unique_extra_vars", array("module_srl","document_srl","var_idx","lang_code"), true);
+            }
+
+            if($oDB->isIndexExists("document_extra_vars", "unique_module_vars")) {
+                $oDB->dropIndex("document_extra_vars", "unique_module_vars", true);
+            }
+
+            /**
+             * 2009. 03. 19: Add a column(eid)
+             * 2009. 04. 12: Fixed the issue(#17922959) that changes another column values when adding eid column
+             **/
+            if(!$oDB->isColumnExists("document_extra_keys","eid")) {
+                $oDB->addColumn("document_extra_keys","eid","varchar",40);
+
+                $output = executeQuery('document.getGroupsExtraKeys', $obj);
+                if($output->toBool() && $output->data && count($output->data)) {
+                    foreach($output->data as $extra_keys) {
+                        $args->module_srl = $extra_keys->module_srl;
+                        $args->var_idx = $extra_keys->idx;
+                        $args->new_eid = "extra_vars".$extra_keys->idx;
+                        $output = executeQuery('document.updateDocumentExtraKeyEid', $args);
+                    }
+                }
+            }
+
+            if(!$oDB->isColumnExists("document_extra_vars","eid")) {
+                $oDB->addColumn("document_extra_vars","eid","varchar",40);
+                $obj->var_idx = '-1,-2';
+                $output = executeQuery('document.getGroupsExtraVars', $obj);
+                if($output->toBool() && $output->data && count($output->data)) {
+                    foreach($output->data as $extra_vars) {
+                        $args->module_srl = $extra_vars->module_srl;
+                        $args->var_idx = $extra_vars->idx;
+                        $args->new_eid = "extra_vars".$extra_vars->idx;
+                        $output = executeQuery('document.updateDocumentExtraVarEid', $args);
+                    }
+                }
+            }
+
+            // 2011. 03. 30 Cubrid index Check the index in the document_extra_vars table
+            if(!$oDB->isIndexExists("document_extra_vars", "idx_document_list_order")) {
+                $oDB->addIndex("document_extra_vars", "idx_document_list_order", array("document_srl","module_srl","var_idx"), false);
+            }
+			
+			//2011. 04. 07 adding description column to document categories
+			if(!$oDB->isColumnExists("document_categories","description")) $oDB->addColumn('document_categories',"description","varchar",200,0);
+
+			//2011. 05. 23 adding status column to document
+			if(!$oDB->isColumnExists('documents', 'status'))
+			{
+				$oDB->addColumn('documents', 'status', 'varchar', 20, 'PUBLIC');
+				$args->is_secret = 'Y';
+				$output = executeQuery('document.updateDocumentStatus', $args);
+			}
+
+			// 2011. 09. 08 drop column document is_secret
+			if($oDB->isColumnExists('documents', 'status') && $oDB->isColumnExists('documents', 'is_secret'))
+				$oDB->dropColumn('documents', 'is_secret');
+
+			//2011. 06. 07 merge column, allow_comment and lock_comment
+			if($oDB->isColumnExists('documents', 'allow_comment') || $oDB->isColumnExists('documents', 'lock_comment'))
+			{
+				$oDB->addColumn('documents', 'comment_status', 'varchar', 20, 'ALLOW');
+				$columnList = array('module_srl');
+				$moduleSrlList = $oModuleModel->getModuleSrlList(null, $columnList);
+
+				$args->commentStatus = 'DENY';
+
+				// allow_comment='Y', lock_comment='Y'
+				$args->allowComment = 'Y';
+				$args->lockComment = 'Y';
+                $output = executeQuery('document.updateDocumentCommentStatus', $args);
+
+				// allow_comment='N', lock_comment='Y'
+				$args->allowComment = 'N';
+				$args->lockComment = 'Y';
+                $output = executeQuery('document.updateDocumentCommentStatus', $args);
+
+				// allow_comment='N', lock_comment='N'
+				$args->allowComment = 'N';
+				$args->lockComment = 'N';
+                $output = executeQuery('document.updateDocumentCommentStatus', $args);
+			}
+
+			if($oDB->isColumnExists('documents', 'allow_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+				$oDB->dropColumn('documents', 'allow_comment');
+
+			if($oDB->isColumnExists('documents', 'lock_comment') && $oDB->isColumnExists('documents', 'comment_status'))
+				$oDB->dropColumn('documents', 'lock_comment');
+
+            if(!$oDB->isIndexExists("documents", "idx_module_status"))
+                $oDB->addIndex("documents", "idx_module_status", array("module_srl","status"));
+
+            return new Object(0,'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+
+		/**
+		 * @brief Document Status List
+		 **/
+		function getStatusList()
+		{
+			return $this->statusList;
+		}
+
+		function getDefaultStatus()
+		{
+			return $this->statusList['public'];
+		}
+
+		function getConfigStatus($key)
+		{
+			if(array_key_exists(strtolower($key), $this->statusList)) return $this->statusList[$key];
+			else $this->getDefaultStatus();
+		}
+    }
+?>
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 4e42bc4a4..ccf15730f 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -2,18 +2,18 @@
 /**
  * @class  documentController
  * @author NHN (developers@xpressengine.com)
- * @brief  document 모듈의 controller 클래스
+ * @brief document the module's controller class
  **/
 class documentController extends document {
 
 	/**
-	 * @brief 초기화
+	 * @brief Initialization
 	 **/
 	function init() {
 	}
 
 	/**
-	 * @breif 게시글의 추천을 처리하는 action (Up)
+	 * @breif action to handle vote-up of the post (Up)
 	 **/
 	function procDocumentVoteUp() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
@@ -45,7 +45,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @breif 게시글의 추천을 처리하는 action (Down)
+	 * @breif action to handle vote-up of the post (Down)
 	 **/
 	function procDocumentVoteDown() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
@@ -67,7 +67,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 게시글이 신고될 경우 호출되는 action
+	 * @brief Action called when the post is reported by other member
 	 **/
 	function procDocumentDeclare() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_invalid_request');
@@ -100,23 +100,20 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 모듈이 삭제될때 등록된 모든 글을 삭제하는 trigger
+	 * @brief A trigger to delete all posts together when the module is deleted
 	 **/
 	function triggerDeleteModuleDocuments(&$obj) {
 		$module_srl = $obj->module_srl;
 		if(!$module_srl) return new Object();
-
-		// document 삭제
+		// Delete the document
 		$oDocumentAdminController = &getAdminController('document');
 		$output = $oDocumentAdminController->deleteModuleDocument($module_srl);
 		if(!$output->toBool()) return $output;
-
-		// category 삭제
+		// Delete the category
 		$oDocumentController = &getController('document');
 		$output = $oDocumentController->deleteModuleCategory($module_srl);
 		if(!$output->toBool()) return $output;
-
-		// 확장변수 삭제
+		// Delete extra variable
 		$this->deleteDocumentExtraVars($module_srl);
 
 		// remove aliases
@@ -129,64 +126,57 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 문서의 권한 부여
-	 * 세션값으로 현 접속상태에서만 사용 가능
+	 * @brief Grant a permisstion of the document
+	 * Available in the current connection with session value
 	 **/
 	function addGrant($document_srl) {
 		$_SESSION['own_document'][$document_srl] = true;
 	}
 
 	/**
-	 * @brief 문서 입력
+	 * @brief Insert the document
 	 **/
-	function insertDocument($obj, $manual_inserted = false) {
+	function insertDocument($obj, $manual_inserted = false, $isRestore = false) {
 		// begin transaction
 		$oDB = &DB::getInstance();
 		$oDB->begin();
-
-		// 기본 변수들 정리
-		if($obj->is_secret!='Y') $obj->is_secret = 'N';
-		if($obj->allow_comment!='Y') $obj->allow_comment = 'N';
-		if($obj->lock_comment!='Y') $obj->lock_comment = 'N';
+		// List variables
+		if($obj->comment_status) $obj->commentStatus = $obj->comment_status;
+		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
 		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
 		if($obj->homepage &&  !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
 		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-		$obj->ipaddress = $_SERVER['REMOTE_ADDR'];	//board에서 form key값으로 ipaddress를 사용하면 엄한 ip가 등록됨. 필터와는 상관없슴
+		if(!$isRestore) $obj->ipaddress = $_SERVER['REMOTE_ADDR'];	//board에서 form key값으로 ipaddress를 사용하면 엄한 ip가 등록됨. 필터와는 상관없슴
 
-		// $extra_vars를 serialize
-		$obj->extra_vars = serialize($obj->extra_vars);
-
-		// 자동저장용 필드 제거
+		// Serialize the $extra_vars, check the extra_vars type, because duplicate serialized avoid
+		if(!is_string($obj->extra_vars)) $obj->extra_vars = serialize($obj->extra_vars);
+		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
 		unset($obj->_saved_doc_content);
 		unset($obj->_saved_doc_message);
-
-		// trigger 호출 (before)
+		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.insertDocument', 'before', $obj);
 		if(!$output->toBool()) return $output;
-
-		// 주어진 문서 번호가 없으면 문서 번호 등록
+		// Register it if no given document_srl exists
 		if(!$obj->document_srl) $obj->document_srl = getNextSequence();
 
 		$oDocumentModel = &getModel('document');
-
-		// 카테고리가 있나 검사하여 없는 카테고리면 0으로 세팅
+		// Set to 0 if the category_srl doesn't exist
 		if($obj->category_srl) {
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
 			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
-
-		// 조회수, 등록순서 설정
+		// Set the read counts and update order.
 		if(!$obj->readed_count) $obj->readed_count = 0;
-		$obj->update_order = $obj->list_order = getNextSequence() * -1;
-
-		// 수동입력을 대비해서 비밀번호의 hash상태를 점검, 수동입력이 아니면 무조건 md5 hash
+		if(!$isRestore) $obj->update_order = $obj->list_order = getNextSequence() * -1;
+		else $obj->update_order = $obj->list_order;
+		// Check the status of password hash for manually inserting. Apply md5 hashing for otherwise.
 		if($obj->password && !$obj->password_is_hashed) $obj->password = md5($obj->password);
-
-		// 수동 등록이 아니고 로그인 된 회원일 경우 회원의 정보를 입력
-		if(Context::get('is_logged')&&!$manual_inserted) {
-			$logged_info = Context::get('logged_info');
+		// Insert member's information only if the member is logged-in and not manually registered.
+		$logged_info = Context::get('logged_info');
+		if(Context::get('is_logged') && !$manual_inserted && !$isRestore) {
 			$obj->member_srl = $logged_info->member_srl;
 			$obj->user_id = $logged_info->user_id;
 			$obj->user_name = $logged_info->user_name;
@@ -194,36 +184,31 @@ class documentController extends document {
 			$obj->email_address = $logged_info->email_address;
 			$obj->homepage = $logged_info->homepage;
 		}
-
-		// 제목이 없으면 내용에서 추출
+		// If the tile is empty, extract string from the contents.
 		settype($obj->title, "string");
 		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
-		//그래도 없으면 Untitled
+		// If no tile extracted from the contents, leave it untitled.
 		if($obj->title == '') $obj->title = 'Untitled';
-
-		// 내용에서 XE만의 태그를 삭제
+		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 		if(Mobile::isFromMobilePhone())
 		{
 			$obj->content = nl2br(htmlspecialchars($obj->content));
 		}
-
-		// 세션에서 최고 관리자가 아니면 iframe, script 제거
+		// Remove iframe and script if not a top adminisrator in the session.
 		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
-
-		// 로그인정보가 없고 사용자 이름이 없으면 오류 표시
+		// An error appears if both log-in info and user name don't exist.
 		if(!$logged_info->member_srl && !$obj->nick_name) return new Object(-1,'msg_invalid_request');
 
 		$obj->lang_code = Context::getLangType();
-
-		// DB에 입력
+		// Insert data into the DB
+		if(!$obj->status) $this->_checkDocumentStatusForOldVersion($obj);
 		$output = executeQuery('document.insertDocument', $obj);
 		if(!$output->toBool()) {
 			$oDB->rollback();
 			return $output;
 		}
-
-		// 등록 성공시 확장 변수 등록
+		// Insert extra variables if the document successfully inserted.
 		$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
 		if(count($extra_keys)) {
 			foreach($extra_keys as $idx => $extra_item) {
@@ -234,11 +219,9 @@ class documentController extends document {
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
-
-		// 성공하였을 경우 category_srl이 있으면 카테고리 update
+		// Update the category if the category_srl exists.
 		if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
-
-		// trigger 호출 (after)
+		// Call a trigger (after)
 		if($output->toBool()) {
 			$trigger_output = ModuleHandler::triggerCall('document.insertDocument', 'after', $obj);
 			if(!$trigger_output->toBool()) {
@@ -254,16 +237,27 @@ class documentController extends document {
 		$this->addGrant($obj->document_srl);
 		$output->add('document_srl',$obj->document_srl);
 		$output->add('category_srl',$obj->category_srl);
+		//remove from cache
+        $oCacheHandler = &CacheHandler::getInstance('object');
+        if($oCacheHandler->isSupport())
+        {
+            $cache_key = 'object:'.$obj->document_srl;
+            $oCacheHandler->delete($cache_key);
+            $oCacheHandler->invalidateGroupKey('documentList');
+        }
+
 		return $output;
 	}
 
 	/**
-	 * @brief 문서 수정
+	 * @brief Update the document
 	 **/
 	function updateDocument($source_obj, $obj) {
 		if(!$source_obj->document_srl || !$obj->document_srl) return new Object(-1,'msg_invalied_request');
+		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = 'SECRET';
+		if(!$obj->status) $obj->status = 'PUBLIC';
 
-		// trigger 호출 (before)
+		// Call a trigger (before)
 		$output = ModuleHandler::triggerCall('document.updateDocument', 'before', $obj);
 		if(!$output->toBool()) return $output;
 
@@ -293,39 +287,31 @@ class documentController extends document {
 		{
 			$obj->ipaddress = $source_obj->get('ipaddress');
 		}
-
-		// 기본 변수들 정리
-		if($obj->is_secret!='Y') $obj->is_secret = 'N';
-		if($obj->allow_comment!='Y') $obj->allow_comment = 'N';
-		if($obj->lock_comment!='Y') $obj->lock_comment = 'N';
+		// List variables
+		if(!$obj->commentStatus) $obj->commentStatus = 'DENY';
+		if($obj->commentStatus == 'DENY') $this->_checkCommentStatusForOldVersion($obj);
 		if($obj->allow_trackback!='Y') $obj->allow_trackback = 'N';
 		if($obj->homepage &&  !preg_match('/^[a-z]+:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
 		if($obj->notify_message != 'Y') $obj->notify_message = 'N';
-
-		// $extra_vars를 serialize
+		// Serialize the $extra_vars
 		$obj->extra_vars = serialize($obj->extra_vars);
-
-		// 자동저장용 필드 제거
+		// Remove the columns for automatic saving
 		unset($obj->_saved_doc_srl);
 		unset($obj->_saved_doc_title);
 		unset($obj->_saved_doc_content);
 		unset($obj->_saved_doc_message);
 
 		$oDocumentModel = &getModel('document');
-
-		// 카테고리가 변경되었으면 검사후 없는 카테고리면 0으로 세팅
+		// Set the category_srl to 0 if the changed category is not exsiting.
 		if($source_obj->get('category_srl')!=$obj->category_srl) {
 			$category_list = $oDocumentModel->getCategoryList($obj->module_srl);
 			if(!$category_list[$obj->category_srl]) $obj->category_srl = 0;
 		}
-
-		// 수정 순서를 조절
+		// Change the update order
 		$obj->update_order = getNextSequence() * -1;
-
-		// 비밀번호가 있으면 md5 hash
+		// Hash by md5 if the password exists
 		if($obj->password) $obj->password = md5($obj->password);
-
-		// 원본 작성인과 수정하려는 수정인이 동일할 시에 또는 History를 사용하면 로그인된 사용자 정보를 입력
+		// If an author is identical to the modifier or history is used, use the logged-in user's information.
 		if(Context::get('is_logged')) {
 			$logged_info = Context::get('logged_info');
 			if($source_obj->get('member_srl')==$logged_info->member_srl || $bUseHistory) {
@@ -336,8 +322,7 @@ class documentController extends document {
 				$obj->homepage = $logged_info->homepage;
 			}
 		}
-
-		// 로그인한 유저가 작성한 글인데 nick_name이 없을 경우
+		// For the document written by logged-in user however no nick_name exists
 		if($source_obj->get('member_srl')&& !$obj->nick_name) {
 			$obj->member_srl = $source_obj->get('member_srl');
 			$obj->user_name = $source_obj->get('user_name');
@@ -345,19 +330,16 @@ class documentController extends document {
 			$obj->email_address = $source_obj->get('email_address');
 			$obj->homepage = $source_obj->get('homepage');
 		}
-
-		// 제목이 없으면 내용에서 추출
+		// If the tile is empty, extract string from the contents.
 		settype($obj->title, "string");
 		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
-		//그래도 없으면 Untitled
+		// If no tile extracted from the contents, leave it untitled.
 		if($obj->title == '') $obj->title = 'Untitled';
-
-		// 내용에서 XE만의 태그를 삭제
+		// Remove XE's own tags from the contents.
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
-
-		// 글쓴이의 언어변수와 원문의 언어변수가 다르면 확장변수로 처리
+		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
 		if($source_obj->get('lang_code') != Context::getLangType()) {
-			// 원문의 언어변수가 없을경우 확장변수가 아닌 원문의 언어변수를 변경
+			// Change not extra vars but language code of the original document if document's lang_code doesn't exist.
 			if(!$source_obj->get('lang_code')) {
 				$lang_code_args->document_srl = $source_obj->get('document_srl');
 				$lang_code_args->lang_code = Context::getLangType();
@@ -372,21 +354,20 @@ class documentController extends document {
 				$obj->content = $document_output->data->content;
 			}
 		}
-
-		// 세션에서 최고 관리자가 아니면 iframe, script 제거
+		// Remove iframe and script if not a top adminisrator in the session.
 		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
+		// if temporary document, regdate is now setting
+		if($source_obj->get('status') == $this->getConfigStatus('temp')) $obj->regdate = date('YmdHis');
 
-		// DB에 입력
+		// Insert data into the DB
 		$output = executeQuery('document.updateDocument', $obj);
 		if(!$output->toBool()) {
 			$oDB->rollback();
 			return $output;
 		}
-
-		// 모든 확장 변수 삭제
+		// Remove all extra variables
 		$this->deleteDocumentExtraVars($source_obj->get('module_srl'), $obj->document_srl, null, Context::getLangType());
-
-		// 등록 성공시 확장 변수 등록
+		// Insert extra variables if the document successfully inserted.
 		$extra_keys = $oDocumentModel->getExtraKeys($obj->module_srl);
 		if(count($extra_keys)) {
 			foreach($extra_keys as $idx => $extra_item) {
@@ -397,18 +378,15 @@ class documentController extends document {
 				$this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, $idx, $value, $extra_item->eid);
 			}
 		}
-
-		// 제목/내용의 다국어 확장변수 등록
+		// Inert extra vars for multi-language support of title and contents.
 		if($extra_content->title) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -1, $extra_content->title, 'title_'.Context::getLangType());
 		if($extra_content->content) $this->insertDocumentExtraVar($obj->module_srl, $obj->document_srl, -2, $extra_content->content, 'content_'.Context::getLangType());
-
-		// 성공하였을 경우 category_srl이 있으면 카테고리 update
+		// Update the category if the category_srl exists.
 		if($source_obj->get('category_srl') != $obj->category_srl || $source_obj->get('module_srl') == $logged_info->member_srl) {
 			if($source_obj->get('category_srl') != $obj->category_srl) $this->updateCategoryCount($obj->module_srl, $source_obj->get('category_srl'));
 			if($obj->category_srl) $this->updateCategoryCount($obj->module_srl, $obj->category_srl);
 		}
-
-		// trigger 호출 (after)
+		// Call a trigger (after)
 		if($output->toBool()) {
 			$trigger_output = ModuleHandler::triggerCall('document.updateDocument', 'after', $obj);
 			if(!$trigger_output->toBool()) {
@@ -419,19 +397,30 @@ class documentController extends document {
 
 		// commit
 		$oDB->commit();
-
-		// 섬네일 파일 제거
+		// Remove the thumbnail file
 		FileHandler::removeDir(sprintf('files/cache/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
 
 		$output->add('document_srl',$obj->document_srl);
+		//remove from cache
+        $oCacheHandler = &CacheHandler::getInstance('object');
+        if($oCacheHandler->isSupport())
+        {
+            $cache_key = 'object:'.$obj->document_srl;
+            $oCacheHandler->delete($cache_key);
+            $oCacheHandler->invalidateGroupKey('documentList');
+            //remove document item from cache
+            $cache_key = 'object_document_item:'.$obj->document_srl;
+            $oCacheHandler->delete($cache_key);
+        }
+
 		return $output;
 	}
 
 	/**
-	 * @brief 문서 삭제
+	 * @brief Deleting Documents
 	 **/
-	function deleteDocument($document_srl, $is_admin = false) {
-		// trigger 호출 (before)
+	function deleteDocument($document_srl, $is_admin = false, $isEmptyTrash = false, $oDocument = null) {
+		// Call a trigger (before)
 		$trigger_obj->document_srl = $document_srl;
 		$output = ModuleHandler::triggerCall('document.deleteDocument', 'before', $trigger_obj);
 		if(!$output->toBool()) return $output;
@@ -440,38 +429,43 @@ class documentController extends document {
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
-		// document의 model 객체 생성
-		$oDocumentModel = &getModel('document');
+		if(!$isEmptyTrash)
+		{
+			// get model object of the document
+			$oDocumentModel = &getModel('document');
+			// Check if the documnet exists
+			$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
+		}
+		else if($isEmptyTrash && $oDocument == null) return new Object(-1, 'document is not exists');
 
-		// 기존 문서가 있는지 확인
-		$oDocument = $oDocumentModel->getDocument($document_srl, $is_admin);
 		if(!$oDocument->isExists() || $oDocument->document_srl != $document_srl) return new Object(-1, 'msg_invalid_document');
-
-		// 권한이 있는지 확인
+		// Check if a permossion is granted
 		if(!$oDocument->isGranted()) return new Object(-1, 'msg_not_permitted');
 
-		// 글 삭제
+		//if empty trash, document already deleted, therefore document not delete
 		$args->document_srl = $document_srl;
-		$output = executeQuery('document.deleteDocument', $args);
-		if(!$output->toBool()) {
-			$oDB->rollback();
-			return $output;
+		if(!$isEmptyTrash)
+		{
+			// Delete the document
+			$output = executeQuery('document.deleteDocument', $args);
+			if(!$output->toBool()) {
+				$oDB->rollback();
+				return $output;
+			}
 		}
 
 		$this->deleteDocumentAliasByDocument($document_srl);
 
 		$this->deleteDocumentHistory(null, $document_srl, null);
-
-		// 카테고리가 있으면 카테고리 정보 변경
+		// Update category information if the category_srl exists.
 		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
-
-		// 신고 삭제
+		// Delete a declared list
 		executeQuery('document.deleteDeclared', $args);
-
-		// 확장 변수 삭제
+		// Delete extra variable
 		$this->deleteDocumentExtraVars($oDocument->get('module_srl'), $oDocument->document_srl);
 
-		// trigger 호출 (after)
+		//this
+		// Call a trigger (after)
 		if($output->toBool()) {
 			$trigger_obj = $oDocument->getObjectVars();
 			$trigger_output = ModuleHandler::triggerCall('document.deleteDocument', 'after', $trigger_obj);
@@ -480,39 +474,81 @@ class documentController extends document {
 				return $trigger_output;
 			}
 		}
+		// declared document, log delete
+		$this->_deleteDeclaredDocuments($args);
+		$this->_deleteDocumentReadedLog($args);
+		$this->_deleteDocumentVotedLog($args);
 
-		// 섬네일 파일 제거
+		// Remove the thumbnail file
 		FileHandler::removeDir(sprintf('files/cache/thumbnails/%s',getNumberingPath($document_srl, 3)));
 
 		// commit
 		$oDB->commit();
 
+		//remove from cache
+		$oCacheHandler = &CacheHandler::getInstance('object');
+		if($oCacheHandler->isSupport())
+		{
+			$cache_key = 'object:'.$document_srl;
+			$oCacheHandler->delete($cache_key);
+                        $oCacheHandler->invalidateGroupKey('documentList');
+                        $cache_key = 'object_document_item:'.$document_srl;
+                        $oCacheHandler->delete($cache_key);
+               }
+
 		return $output;
 	}
 
 	/**
-	 * @brief 문서를 휴지통으로 옮김
+	 * @brief delete declared document, log
+	 * @param $documentSrls : srls string (ex: 1, 2,56, 88)
+	 * @return void
+	 **/
+	function _deleteDeclaredDocuments($documentSrls)
+	{
+		executeQuery('document.deleteDeclaredDocuments', $documentSrls);
+		executeQuery('document.deleteDocumentDeclaredLog', $documentSrls);
+	}
+
+	/**
+	 * @brief delete readed log
+	 * @param $documentSrls : srls string (ex: 1, 2,56, 88)
+	 * @return void
+	 **/
+	function _deleteDocumentReadedLog($documentSrls)
+	{
+		executeQuery('document.deleteDocumentReadedLog', $documentSrls);
+	}
+
+	/**
+	 * @brief delete voted log
+	 * @param $documentSrls : srls string (ex: 1, 2,56, 88)
+	 * @return void
+	 **/
+	function _deleteDocumentVotedLog($documentSrls)
+	{
+		executeQuery('document.deleteDocumentVotedLog', $documentSrls);
+	}
+
+	/**
+	 * @brief Move the doc into the trash
 	 **/
 	function moveDocumentToTrash($obj) {
-		// 주어진 trash_srl이 없으면 trash_srl 등록
+		// Get trash_srl if a given trash_srl doesn't exist
 		if(!$obj->trash_srl) $trash_args->trash_srl = getNextSequence();
 		else $trash_args->trash_srl = $obj->trash_srl;
-
-		// 해당 document가 속해 있는 module_srl을 구한다
+		// Get its module_srl which the document belongs to
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($obj->document_srl);
 
 		$trash_args->module_srl = $oDocument->get('module_srl');
 		$obj->module_srl = $oDocument->get('module_srl');
-
-		// 휴지통 문서를 두번 휴지통에 버릴 수 없음.
+		// Cannot throw data from the trash to the trash
 		if($trash_args->module_srl == 0) return false;
-
-		// 데이터 설정
+		// Data setting
 		$trash_args->document_srl = $obj->document_srl;
 		$trash_args->description = $obj->description;
-
-		// 수동 등록이 아니고 로그인 된 회원일 경우 회원의 정보를 입력
+		// Insert member's information only if the member is logged-in and not manually registered.
 		if(Context::get('is_logged')&&!$manual_inserted) {
 			$logged_info = Context::get('logged_info');
 			$trash_args->member_srl = $logged_info->member_srl;
@@ -520,8 +556,7 @@ class documentController extends document {
 			$trash_args->user_name = $logged_info->user_name;
 			$trash_args->nick_name = $logged_info->nick_name;
 		}
-
-		// documents update를 위한 데이터 설정
+		// Date setting for updating documents
 		$document_args->module_srl = 0;
 		$document_args->document_srl = $obj->document_srl;
 
@@ -529,32 +564,52 @@ class documentController extends document {
 		$oDB = &DB::getInstance();
 		$oDB->begin();
 
-		$output = executeQuery('document.insertTrash', $trash_args);
+		/*$output = executeQuery('document.insertTrash', $trash_args);
+		if (!$output->toBool()) {
+			$oDB->rollback();
+			return $output;
+		}*/
+
+		// new trash module
+		require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
+		$oTrashVO = new TrashVO();
+		$oTrashVO->setTrashSrl(getNextSequence());
+		$oTrashVO->setTitle($oDocument->variables['title']);
+		$oTrashVO->setOriginModule('document');
+		$oTrashVO->setSerializedObject(serialize($oDocument->variables));
+		$oTrashVO->setDescription($obj->description);
+
+		$oTrashAdminController = &getAdminController('trash');
+		$output = $oTrashAdminController->insertTrash($oTrashVO);
 		if (!$output->toBool()) {
 			$oDB->rollback();
 			return $output;
 		}
 
-		$output = executeQuery('document.updateDocument', $document_args);
-		if (!$output->toBool()) {
+		$output = executeQuery('document.deleteDocument', $trash_args);
+		if(!$output->toBool()) {
 			$oDB->rollback();
 			return $output;
 		}
 
+		/*$output = executeQuery('document.updateDocument', $document_args);
+		if (!$output->toBool()) {
+			$oDB->rollback();
+			return $output;
+		}*/
+
 		// update category
 		if($oDocument->get('category_srl')) $this->updateCategoryCount($oDocument->get('module_srl'),$oDocument->get('category_srl'));
 
 		// remove thumbnails
 		FileHandler::removeDir(sprintf('files/cache/thumbnails/%s',getNumberingPath($obj->document_srl, 3)));
-
-		// 등록된 첨부파일의 상태를 무효로 지정
+		// Set the attachment to be invalid state
 		if($oDocument->hasUploadedFiles()) {
 			$args->upload_target_srl = $oDocument->document_srl;
 			$args->isvalid = 'N';
 			executeQuery('file.updateFileValid', $args);
 		}
-
-		// trigger 호출 (after)
+		// Call a trigger (after)
 		if($output->toBool()) {
 			$trigger_output = ModuleHandler::triggerCall('document.moveDocumentToTrash', 'after', $obj);
 			if(!$trigger_output->toBool()) {
@@ -563,48 +618,44 @@ class documentController extends document {
 			}
 		}
 
-	   // commit
+		// commit
 		$oDB->commit();
 
 		return $output;
 	}
 
 	/**
-	 * @brief 해당 document의 조회수 증가
+	 * @brief Update read counts of the document
 	 **/
 	function updateReadedCount(&$oDocument) {
 		$document_srl = $oDocument->document_srl;
 		$member_srl = $oDocument->get('member_srl');
 		$logged_info = Context::get('logged_info');
-
-		// 조회수 업데이트가 되면 trigger 호출 (after)
+		// Call a trigger when the read count is updated (after)
 		$output = ModuleHandler::triggerCall('document.updateReadedCount', 'after', $oDocument);
 		if(!$output->toBool()) return $output;
-		// session에 정보로 조회수를 증가하였다고 생각하면 패스
+		// Pass if read count is increaded on the session information
 		if($_SESSION['readed_document'][$document_srl]) return false;
 
-		// 글의 작성 ip와 현재 접속자의 ip가 동일하면 패스
+		// Pass if the author's IP address is as same as visitor's.
 		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
 		}
-
-		// document의 작성자가 회원일때 글쓴이와 현재 로그인 사용자의 정보가 일치하면 읽었다고 판단후 세션 등록하고 패스
+		// Pass ater registering sesscion if the author is a member and has same information as the currently logged-in user.
 		if($member_srl && $logged_info->member_srl == $member_srl) {
 			$_SESSION['readed_document'][$document_srl] = true;
 			return false;
 		}
-
-		// 조회수 업데이트
+		// Update read counts
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.updateReadedCount', $args);
-
-		// 세션 등록
+		// Register session
 		$_SESSION['readed_document'][$document_srl] = true;
 	}
 
 	/**
-	 * @breif documents 테이블의 확장 변수 등록
+	 * @breif Insert extra variables into the document table
 	 **/
 	function insertDocumentExtraKey($module_srl, $var_idx, $var_name, $var_type, $var_is_required = 'N', $var_search = 'N', $var_default = '', $var_desc = '', $eid) {
 		if(!$module_srl || !$var_idx || !$var_name || !$var_type || !$eid) return new Object(-1,'msg_invalid_request');
@@ -622,15 +673,14 @@ class documentController extends document {
 		$output = executeQuery('document.getDocumentExtraKeys', $obj);
 		if(!$output->data) return executeQuery('document.insertDocumentExtraKey', $obj);
 		$output = executeQuery('document.updateDocumentExtraKey', $obj);
-
-		// extra_vars에서 확장 변수 eid를 일괄 업데이트
+		// Update the extra var(eid)
 		$output = executeQuery('document.updateDocumentExtraVar', $obj);
 
 		return $output;
 	}
 
 	/**
-	 * @brief documents 확장변수 제거
+	 * @brief Remove the extra variables of the documents
 	 **/
 	function deleteDocumentExtraKeys($module_srl, $var_idx = null) {
 		if(!$module_srl) return new Object(-1,'msg_invalid_request');
@@ -643,7 +693,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @breif documents 테이블의 확장 변수 값 등록
+	 * @breif Insert extra vaiable to the documents table
 	 **/
 	function insertDocumentExtraVar($module_srl, $document_srl, $var_idx, $value, $eid = null, $lang_code = '') {
 		if(!$module_srl || !$document_srl || !$var_idx || !isset($value)) return new Object(-1,'msg_invalid_request');
@@ -660,7 +710,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief documents 확장변수 값 제거
+	 * @brief Remove values of extra variable from the document
 	 **/
 	function deleteDocumentExtraVars($module_srl, $document_srl = null, $var_idx = null, $lang_code = null, $eid = null) {
 		$obj->module_srl = $module_srl;
@@ -674,39 +724,33 @@ class documentController extends document {
 
 
 	/**
-	 * @brief 해당 document의 추천수 증가
+	 * @brief Increase the number of vote-up of the document
 	 **/
 	function updateVotedCount($document_srl, $point = 1) {
 		if($point > 0) $failed_voted = 'failed_voted';
 		else $failed_voted = 'failed_blamed';
-
-		// 세션 정보에 추천 정보가 있으면 중단
+		// Return fail if session already has information about votes
 		if($_SESSION['voted_document'][$document_srl]) return new Object(-1, $failed_voted);
-
-		// 문서 원본을 가져옴
+		// Get the original document
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-
-		// 글의 작성 ip와 현재 접속자의 ip가 동일하면 패스
+		// Pass if the author's IP address is as same as visitor's.
 		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new Object(-1, $failed_voted);
 		}
-
-		// document의 작성자가 회원일때 조사
+		// Check if document's author is a member.
 		if($oDocument->get('member_srl')) {
-			// member model 객체 생성
+			// Create a member model object
 			$oMemberModel = &getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
-
-			// 글쓴이와 현재 로그인 사용자의 정보가 일치하면 읽었다고 생각하고 세션 등록후 패스
+			// Pass after registering a session if author's information is same as the currently logged-in user's.
 			if($member_srl && $member_srl == $oDocument->get('member_srl')) {
 				$_SESSION['voted_document'][$document_srl] = true;
 				return new Object(-1, $failed_voted);
 			}
 		}
-
-		// 로그인 사용자이면 member_srl, 비회원이면 ipaddress로 판단
+		// Use member_srl for logged-in members and IP address for non-members.
 		if($member_srl) {
 			$args->member_srl = $member_srl;
 		} else {
@@ -714,14 +758,12 @@ class documentController extends document {
 		}
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDocumentVotedLogInfo', $args);
-
-		// 로그 정보에 추천 로그가 있으면 세션 등록후 패스
+		// Pass after registering a session if log information has vote-up logs
 		if($output->data->count) {
 			$_SESSION['voted_document'][$document_srl] = true;
 			return new Object(-1, $failed_voted);
 		}
-
-		// 추천수 업데이트
+		// Update the voted count
 		if($point < 0)
 		{
 			$args->blamed_count = $oDocument->get('blamed_count') + $point;
@@ -733,13 +775,11 @@ class documentController extends document {
 			$output = executeQuery('document.updateVotedCount', $args);
 		}
 		if(!$output->toBool()) return $output;
-
-		// 로그 남기기
+		// Leave logs
 		$args->point = $point;
 		$output = executeQuery('document.insertDocumentVotedLog', $args);
 		if(!$output->toBool()) return $output;
-
-		// 세션 정보에 남김
+		// Leave in the session information
 		$_SESSION['voted_document'][$document_srl] = true;
 
 		$obj->member_srl = $oDocument->get('member_srl');
@@ -751,8 +791,7 @@ class documentController extends document {
 		$obj->after_point = ($point < 0) ? $args->blamed_count : $args->voted_count;
 		$output = ModuleHandler::triggerCall('document.updateVotedCount', 'after', $obj);
 		if(!$output->toBool()) return $output;
-
-		// 결과 리턴
+		// Return result
 		if($point > 0)
 		{
 			return new Object(0, 'success_voted');
@@ -764,42 +803,36 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 게시글 신고
+	 * @brief Report posts
 	 **/
 	function declaredDocument($document_srl) {
-		// 세션 정보에 신고 정보가 있으면 중단
+		// Fail if session information already has a reported document
 		if($_SESSION['declared_document'][$document_srl]) return new Object(-1, 'failed_declared');
-
-		// 이미 신고되었는지 검사
+		// Check if previously reported
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDeclaredDocument', $args);
 		if(!$output->toBool()) return $output;
 		$declared_count = $output->data->declared_count;
-
-		// 문서 원본을 가져옴
+		// Get the original document
 		$oDocumentModel = &getModel('document');
 		$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-
-		// 글의 작성 ip와 현재 접속자의 ip가 동일하면 패스
-		if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
+		// Pass if the author's IP address is as same as visitor's.
+		/*if($oDocument->get('ipaddress') == $_SERVER['REMOTE_ADDR']) {
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new Object(-1, 'failed_declared');
-		}
-
-		// document의 작성자가 회원일때 조사
+		}*/
+		// Check if document's author is a member.
 		if($oDocument->get('member_srl')) {
-			// member model 객체 생성
+			// Create a member model object
 			$oMemberModel = &getModel('member');
 			$member_srl = $oMemberModel->getLoggedMemberSrl();
-
-			// 글쓴이와 현재 로그인 사용자의 정보가 일치하면 읽었다고 생각하고 세션 등록후 패스
+			// Pass after registering a session if author's information is same as the currently logged-in user's.
 			if($member_srl && $member_srl == $oDocument->get('member_srl')) {
 				$_SESSION['declared_document'][$document_srl] = true;
 				return new Object(-1, 'failed_declared');
 			}
 		}
-
-		// 로그인 사용자이면 member_srl, 비회원이면 ipaddress로 판단
+		// Use member_srl for logged-in members and IP address for non-members.
 		if($member_srl) {
 			$args->member_srl = $member_srl;
 		} else {
@@ -807,30 +840,26 @@ class documentController extends document {
 		}
 		$args->document_srl = $document_srl;
 		$output = executeQuery('document.getDocumentDeclaredLogInfo', $args);
-
-		// 로그 정보에 신고 로그가 있으면 세션 등록후 패스
+		// Pass after registering a sesson if reported/declared documents are in the logs.
 		if($output->data->count) {
 			$_SESSION['declared_document'][$document_srl] = true;
 			return new Object(-1, 'failed_declared');
 		}
-
-		// 신고글 추가
+		// Add the declared document
 		if($declared_count > 0) $output = executeQuery('document.updateDeclaredDocument', $args);
 		else $output = executeQuery('document.insertDeclaredDocument', $args);
 		if(!$output->toBool()) return $output;
-
-		// 로그 남기기
+		// Leave logs
 		$output = executeQuery('document.insertDocumentDeclaredLog', $args);
-
-		// 세션 정보에 남김
+		// Leave in the session information
 		$_SESSION['declared_document'][$document_srl] = true;
 
 		$this->setMessage('success_declared');
 	}
 
 	/**
-	 * @brief 해당 document의 댓글 수 증가
-	 * 댓글수를 증가시키면서 수정 순서와 수정일, 수정자를 등록
+	 * @brief Increase the number of comments in the document
+	 * Update modified date, modifier, and order with increasing comment count
 	 **/
 	function updateCommentCount($document_srl, $comment_count, $last_updater, $comment_inserted = false) {
 		$args->document_srl = $document_srl;
@@ -841,11 +870,23 @@ class documentController extends document {
 			$args->last_updater = $last_updater;
 		}
 
+		//remove from cache
+                $oCacheHandler = &CacheHandler::getInstance('object');
+                if($oCacheHandler->isSupport())
+                {
+                    $cache_key = 'object:'.$document_srl;
+                    $oCacheHandler->delete($cache_key);
+                    $oCacheHandler->invalidateGroupKey('documentList');
+                    //remove document item from cache
+                    $cache_key = 'object_document_item:'.$document_srl;
+                    $oCacheHandler->delete($cache_key);
+                }
+
 		return executeQuery('document.updateCommentCount', $args);
 	}
 
 	/**
-	 * @brief 해당 document의 엮인글 수증가
+	 * @brief Increase trackback count of the document
 	 **/
 	function updateTrackbackCount($document_srl, $trackback_count) {
 		$args->document_srl = $document_srl;
@@ -855,12 +896,12 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 카테고리 추가
+	 * @brief Add a category
 	 **/
 	function insertCategory($obj) {
-		// 특정 카테고리의 하단으로 추가시 정렬순서 재정렬
+		// Sort the order to display if a child category is added
 		if($obj->parent_srl) {
-			// 부모 카테고리 구함
+			// Get its parent category
 			$oDocumentModel = &getModel('document');
 			$parent_category = $oDocumentModel->getCategory($obj->parent_srl);
 			$obj->list_order = $parent_category->list_order;
@@ -880,7 +921,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 특정 카테고리 부터 list_count 증가
+	 * @brief Increase list_count from a specific category
 	 **/
 	function updateCategoryListOrder($module_srl, $list_order) {
 		$args->module_srl = $module_srl;
@@ -889,10 +930,10 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 카테고리에 문서의 숫자를 변경
+	 * @brief Update document_count in the category.
 	 **/
 	function updateCategoryCount($module_srl, $category_srl, $document_count = 0) {
-		// document model 객체 생성
+		// Create a document model object
 		$oDocumentModel = &getModel('document');
 		if(!$document_count) $document_count = $oDocumentModel->getCategoryDocumentCount($module_srl,$category_srl);
 
@@ -905,7 +946,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 카테고리의 정보를 수정
+	 * @brief Update category information
 	 **/
 	function updateCategory($obj) {
 		$output = executeQuery('document.updateCategory', $obj);
@@ -915,25 +956,22 @@ class documentController extends document {
 
 	/**
 	/**
-	 * @brief 카테고리 삭제
+	 * @brief Delete a category
 	 **/
 	function deleteCategory($category_srl) {
 		$args->category_srl = $category_srl;
 		$oDocumentModel = &getModel('document');
 		$category_info = $oDocumentModel->getCategory($category_srl);
-
-		// 자식 카테고리가 있는지 체크하여 있으면 삭제 못한다는 에러 출력
+		// Display an error that the category cannot be deleted if it has a child
 		$output = executeQuery('document.getChildCategoryCount', $args);
 		if(!$output->toBool()) return $output;
 		if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child');
-
-		// 카테고리 정보를 삭제
+		// Delete a category information
 		$output = executeQuery('document.deleteCategory', $args);
 		if(!$output->toBool()) return $output;
 
 		$this->makeCategoryFile($category_info->module_srl);
-
-		// 현 카테고리 값을 가지는 문서들의 category_srl을 0 으로 세팅
+		// Update category_srl of the documents in the same category to 0
 		unset($args);
 
 		$args->target_category_srl = 0;
@@ -944,7 +982,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 특정 모듈의 카테고리를 모두 삭제
+	 * @brief Delete all categories in a module
 	 **/
 	function deleteModuleCategory($module_srl) {
 		$args->module_srl = $module_srl;
@@ -953,20 +991,18 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 카테고리를 상단으로 이동
+	 * @brief Move the category level to higher
 	 **/
 	function moveCategoryUp($category_srl) {
 		$oDocumentModel = &getModel('document');
-
-		// 선택된 카테고리의 정보를 구한다
+		// Get information of the selected category
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategory', $args);
 
 		$category = $output->data;
 		$list_order = $category->list_order;
 		$module_srl = $category->module_srl;
-
-		// 전체 카테고리 목록을 구한다
+		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
 		if(count($category_srl_list)<2) return new Object();
@@ -976,20 +1012,16 @@ class documentController extends document {
 			if($key==$category_srl) break;
 			$prev_category = $val;
 		}
-
-		// 이전 카테고리가 없으면 그냥 return
+		// Return if the previous category doesn't exist
 		if(!$prev_category) return new Object(-1,Context::getLang('msg_category_not_moved'));
-
-		// 선택한 카테고리가 가장 위의 카테고리이면 그냥 return
+		// Return if the selected category is the top level
 		if($category_srl_list[0]==$category_srl) return new Object(-1,Context::getLang('msg_category_not_moved'));
-
-		// 선택한 카테고리의 정보
+		// Information of the selected category
 		$cur_args->category_srl = $category_srl;
 		$cur_args->list_order = $prev_category->list_order;
 		$cur_args->title = $category->title;
 		$this->updateCategory($cur_args);
-
-		// 대상 카테고리의 정보
+		// Category information
 		$prev_args->category_srl = $prev_category->category_srl;
 		$prev_args->list_order = $list_order;
 		$prev_args->title = $prev_category->title;
@@ -999,20 +1031,18 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 카테고리를 아래로 이동
+	 * @brief Move the category down
 	 **/
 	function moveCategoryDown($category_srl) {
 		$oDocumentModel = &getModel('document');
-
-		// 선택된 카테고리의 정보를 구한다
+		// Get information of the selected category
 		$args->category_srl = $category_srl;
 		$output = executeQuery('document.getCategory', $args);
 
 		$category = $output->data;
 		$list_order = $category->list_order;
 		$module_srl = $category->module_srl;
-
-		// 전체 카테고리 목록을 구한다
+		// Seek a full list of categories
 		$category_list = $oDocumentModel->getCategoryList($module_srl);
 		$category_srl_list = array_keys($category_list);
 		if(count($category_srl_list)<2) return new Object();
@@ -1024,14 +1054,12 @@ class documentController extends document {
 		$next_category_srl = $category_srl_list[$i+1];
 		if(!$category_list[$next_category_srl]) return new Object(-1,Context::getLang('msg_category_not_moved'));
 		$next_category = $category_list[$next_category_srl];
-
-		// 선택한 카테고리의 정보
+		// Information of the selected category
 		$cur_args->category_srl = $category_srl;
 		$cur_args->list_order = $next_category->list_order;
 		$cur_args->title = $category->title;
 		$this->updateCategory($cur_args);
-
-		// 대상 카테고리의 정보
+		// Category information
 		$next_args->category_srl = $next_category->category_srl;
 		$next_args->list_order = $list_order;
 		$next_args->title = $next_category->title;
@@ -1041,7 +1069,7 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 특정 module_srl에 해당하는 document_extra_keys type, required등의 값을 체크하여 header에 javascript 코드 추가
+	 * @brief Add javascript codes into the header by checking values of document_extra_keys type, required and others
 	 **/
 	function addXmlJsFilter($module_srl) {
 		$oDocumentModel = &getModel('document');
@@ -1051,17 +1079,17 @@ class documentController extends document {
 		$js_code = array();
 		$js_code[] = '<script type="text/javascript">//<![CDATA[';
 		$js_code[] = '(function($){';
-		$js_code[] = 'var validator = xe.getApp("validator")[0];';
-		$js_code[] = 'if(!validator) return false;';
+				$js_code[] = 'var validator = xe.getApp("validator")[0];';
+				$js_code[] = 'if(!validator) return false;';
 
-		$logged_info = Context::get('logged_info');
+				$logged_info = Context::get('logged_info');
 
-		foreach($extra_keys as $idx => $val) {
-			$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $val->idx, $val->name);
-			if($val->is_required == 'Y' && $logged_info->is_admin != 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $val->idx);
-		}
+				foreach($extra_keys as $idx => $val) {
+				$js_code[] = sprintf('validator.cast("ADD_MESSAGE", ["extra_vars%s","%s"]);', $val->idx, $val->name);
+				if($val->is_required == 'Y' && $logged_info->is_admin != 'Y') $js_code[] = sprintf('validator.cast("ADD_EXTRA_FIELD", ["extra_vars%s", { required:true }]);', $val->idx);
+				}
 
-		$js_code[] = '})(jQuery);';
+				$js_code[] = '})(jQuery);';
 		$js_code[] = '//]]></script>';
 		$js_code   = implode("\n", $js_code);
 
@@ -1069,48 +1097,49 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 카테고리 추가
+	 * @brief Add a category
 	 **/
 	function procDocumentInsertCategory($args = null) {
-		// 입력할 변수 정리
-		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','title','expand','group_srls','color','mid');
+		// List variables
+		if(!$args) $args = Context::gets('module_srl','category_srl','parent_srl','category_title','category_description','expand','group_srls','category_color','mid');
+		$args->title = $args->category_title;
+		$args->description = $args->category_description;
+		$args->color = $args->category_color;
 
 		if(!$args->module_srl && $args->mid){
 			$mid = $args->mid;
 			unset($args->mid);
 			$args->module_srl = $this->module_srl;
 		}
-
-		// 권한 체크
+		// Check permissions
 		$oModuleModel = &getModel('module');
-		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
+		$columnList = array('module_srl', 'module');
+		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
 		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
 
 		if($args->expand !="Y") $args->expand = "N";
-		$args->group_srls = str_replace('|@|',',',$args->group_srls);
+		if(!is_array($args->group_srls)) $args->group_srls = str_replace('|@|',',',$args->group_srls);
+		else $args->group_srls = implode(',', $args->group_srls);
 		$args->parent_srl = (int)$args->parent_srl;
 
 		$oDocumentModel = &getModel('document');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
-
-		// 이미 존재하는지를 확인
+		// Check if already exists
 		if($args->category_srl) {
 			$category_info = $oDocumentModel->getCategory($args->category_srl);
 			if($category_info->category_srl != $args->category_srl) $args->category_srl = null;
 		}
-
-		// 존재하게 되면 update를 해준다
+		// Update if exists
 		if($args->category_srl) {
 			$output = $this->updateCategory($args);
 			if(!$output->toBool()) {
 				$oDB->rollback();
 				return $output;
 			}
-
-		// 존재하지 않으면 insert를 해준다
+			// Insert if not exist
 		} else {
 			$output = $this->insertCategory($args);
 			if(!$output->toBool()) {
@@ -1118,8 +1147,7 @@ class documentController extends document {
 				return $output;
 			}
 		}
-
-		// XML 파일을 갱신하고 위치을 넘겨 받음
+		// Update the xml file and get its location
 		$xml_file = $this->makeCategoryFile($args->module_srl);
 
 		$oDB->commit();
@@ -1128,28 +1156,31 @@ class documentController extends document {
 		$this->add('module_srl', $args->module_srl);
 		$this->add('category_srl', $args->category_srl);
 		$this->add('parent_srl', $args->parent_srl);
+
+		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : Context::get('error_return_url');
+			header('location:'.$returnUrl);
+			return;
+		}
 	}
 
 
 	function procDocumentMoveCategory() {
 		$source_category_srl = Context::get('source_srl');
-
-		// parent_srl 이 있으면 첫 자식으로 들어간다
+		// If parent_srl exists, be the first child
 		$parent_category_srl = Context::get('parent_srl');
-
-		// target_srl 이 있으면 target_srl 아래로 형제로 들어간다
+		// If target_srl exists, be a sibling
 		$target_category_srl = Context::get('target_srl');
 
 		$oDocumentModel = &getModel('document');
 		$source_category = $oDocumentModel->getCategory($source_category_srl);
-
-		// 권한 체크
+		// Check permissions
 		$oModuleModel = &getModel('module');
-		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl);
+		$columnList = array('module_srl', 'module');
+		$module_info = $oModuleModel->getModuleInfoByModuleSrl($source_category->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
 		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
-
-		//parent_category_srl 의 첫 자식으로 넣자
+		// First child of the parent_category_srl
 		if($parent_category_srl > 0 || ($parent_category_srl == 0 && $target_category_srl == 0)){
 			$parent_category = $oDocumentModel->getCategory($parent_category_srl);
 
@@ -1168,13 +1199,10 @@ class documentController extends document {
 			$source_args->list_order = $args->list_order;
 			$output = $this->updateCategory($source_args);
 			if(!$output->toBool()) return $output;
-
-
-		// $target_category_srl의 아래동생으로
+			// Sibling of the $target_category_srl
 		}else if($target_category_srl > 0){
 			$target_category = $oDocumentModel->getCategory($target_category_srl);
-
-			//$target_category의 아래 동생을 모두 내린다
+			// Move all siblings of the $target_category down
 			$output = $this->updateCategoryListOrder($target_category->module_srl, $target_category->list_order+1);
 			if(!$output->toBool()) return $output;
 
@@ -1185,49 +1213,43 @@ class documentController extends document {
 			$output = $this->updateCategory($source_args);
 			if(!$output->toBool()) return $output;
 		}
-
-		// xml파일 재생성
+		// Re-generate the xml file
 		$xml_file = $this->makeCategoryFile($source_category->module_srl);
-
-		// return 변수 설정
+		// Variable settings
 		$this->add('xml_file', $xml_file);
 		$this->add('source_category_srl', $source_category_srl);
 
 	}
 
 	/**
-	 * @brief 카테고리 삭제
+	 * @brief Delete a category
 	 **/
 	function procDocumentDeleteCategory() {
-		// 변수 정리
+		// List variables
 		$args = Context::gets('module_srl','category_srl');
 
 		$oDB = &DB::getInstance();
 		$oDB->begin();
-
-		// 권한 체크
+		// Check permissions
 		$oModuleModel = &getModel('module');
-		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
+		$columnList = array('module_srl', 'module');
+		$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
 		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
 
 		$oDocumentModel = &getModel('document');
-
-		// 원정보를 가져옴
+		// Get original information
 		$category_info = $oDocumentModel->getCategory($args->category_srl);
 		if($category_info->parent_srl) $parent_srl = $category_info->parent_srl;
-
-		// 자식 노드가 있는지 체크하여 있으면 삭제 못한다는 에러 출력
+		// Display an error that the category cannot be deleted if it has a child node
 		if($oDocumentModel->getCategoryChlidCount($args->category_srl)) return new Object(-1, 'msg_cannot_delete_for_child');
-
-		// DB에서 삭제
+		// Remove from the DB
 		$output = $this->deleteCategory($args->category_srl);
 		if(!$output->toBool()) {
 			$oDB->rollback();
 			return $output;
 		}
-
-		// XML 파일을 갱신하고 위치을 넘겨 받음
+		// Update the xml file and get its location
 		$xml_file = $this->makeCategoryFile($args->module_srl);
 
 		$oDB->commit();
@@ -1238,46 +1260,43 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief xml 파일을 갱신
-	 * 관리자페이지에서 메뉴 구성 후 간혹 xml파일이 재생성 안되는 경우가 있는데\n
-	 * 이럴 경우 관리자의 수동 갱신 기능을 구현해줌\n
-	 * 개발 중간의 문제인 것 같고 현재는 문제가 생기지 않으나 굳이 없앨 필요 없는 기능
+	 * @brief xml files updated
+	 * Occasionally the xml file is not generated after menu is configued on the admin page \n
+	 * The administrator can manually update the file in this case \n
+	 * Although the issue is not currently reproduced, it is unnecessay to remove.
 	 **/
 	function procDocumentMakeXmlFile() {
-		// 입력값을 체크
+		// Check input values
 		$module_srl = Context::get('module_srl');
-
-		// 권한 체크
+		// Check permissions
 		$oModuleModel = &getModel('module');
-		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+		$columnList = array('module_srl', 'module');
+		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
 		if(!$grant->manager) return new Object(-1,'msg_not_permitted');
 
 		$xml_file = $this->makeCategoryFile($module_srl);
-
-		// return 값 설정
+		// Set return value
 		$this->add('xml_file',$xml_file);
 	}
 
 	/**
-	 * @brief 카테고리를 캐시 파일로 저장
+	 * @brief Save the category in a cache file
 	 **/
 	function makeCategoryFile($module_srl) {
-		// 캐시 파일 생성시 필요한 정보가 없으면 그냥 return
+		// Return if there is no information you need for creating a cache file
 		if(!$module_srl) return false;
-
-		// 모듈 정보를 가져옴 (mid를 구하기 위해)
+		// Get module information (to obtain mid)
 		$oModuleModel = &getModel('module');
-		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+		$columnList = array('module_srl', 'mid', 'site_srl');
+		$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
 		$mid = $module_info->mid;
 
 		if(!is_dir('./files/cache/document_category')) FileHandler::makeDir('./files/cache/document_category');
-
-		// 캐시 파일의 이름을 지정
+		// Cache file's name
 		$xml_file = sprintf("./files/cache/document_category/%s.xml.php", $module_srl);
 		$php_file = sprintf("./files/cache/document_category/%s.php", $module_srl);
-
-		// 카테고리 목록을 구함
+		// Get a category list
 		$args->module_srl = $module_srl;
 		$args->sort_index = 'list_order';
 		$output = executeQuery('document.getCategoryList', $args);
@@ -1297,106 +1316,99 @@ class documentController extends document {
 			if(!preg_match('/^[0-9,]+$/', $category_list[$i]->group_srls)) $category_list[$i]->group_srls = '';
 			$list[$category_srl] = $category_list[$i];
 		}
-
-		// 구해온 데이터가 없다면 노드데이터가 없는 xml 파일만 생성
+		// Create the xml file without node data if no data is obtained
 		if(!$list) {
 			$xml_buff = "<root />";
 			FileHandler::writeFile($xml_file, $xml_buff);
 			FileHandler::writeFile($php_file, '<?php if(!defined("__ZBXE__")) exit(); ?>');
 			return $xml_file;
 		}
-
-		// 구해온 데이터가 하나라면 array로 바꾸어줌
+		// Change to an array if only a single data is obtained
 		if(!is_array($list)) $list = array($list);
-
-		// 루프를 돌면서 tree 구성
+		// Create a tree for loop
 		foreach($list as $category_srl => $node) {
 			$node->mid = $mid;
 			$parent_srl = (int)$node->parent_srl;
 			$tree[$parent_srl][$category_srl] = $node;
 		}
-
-		// 캐시 파일의 권한과 그룹 설정을 위한 공통 헤더
+		// A common header to set permissions and groups of the cache file
 		$header_script =
 			'$lang_type = Context::getLangType(); '.
 			'$is_logged = Context::get(\'is_logged\'); '.
 			'$logged_info = Context::get(\'logged_info\'); '.
 			'if($is_logged) {'.
 				'if($logged_info->is_admin=="Y") $is_admin = true; '.
-				'else $is_admin = false; '.
-				'$group_srls = array_keys($logged_info->group_list); '.
-			'} else { '.
-				'$is_admin = false; '.
-				'$group_srsl = array(); '.
-			'} '."\n";
+					'else $is_admin = false; '.
+					'$group_srls = array_keys($logged_info->group_list); '.
+					'} else { '.
+						'$is_admin = false; '.
+							'$group_srsl = array(); '.
+							'} '."\n";
 
-		// xml 캐시 파일 생성 (xml캐시는 따로 동작하기에 session 지정을 해주어야 함)
+		// Create the xml cache file (a separate session is needed for xml cache)
 		$xml_header_buff = '';
 		$xml_body_buff = $this->getXmlTree($tree[0], $tree, $module_info->site_srl, $xml_header_buff);
 		$xml_buff = sprintf(
-			'<?php '.
-			'define(\'__ZBXE__\', true); '.
-			'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
-			'$oContext = &Context::getInstance(); '.
-			'$oContext->init(); '.
-			'header("Content-Type: text/xml; charset=UTF-8"); '.
-			'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
-			'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
-			'header("Cache-Control: no-store, no-cache, must-revalidate"); '.
-			'header("Cache-Control: post-check=0, pre-check=0", false); '.
-			'header("Pragma: no-cache"); '.
-			'%s'.
-			'%s '.
-			'$oContext->close();'.
-			'?>'.
-			'<root>%s</root>',
-			$header_script,
-			$xml_header_buff,
-			$xml_body_buff
-		);
-
-		// php 캐시 파일 생성
+				'<?php '.
+				'define(\'__ZBXE__\', true); '.
+				'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
+				'$oContext = &Context::getInstance(); '.
+				'$oContext->init(); '.
+				'header("Content-Type: text/xml; charset=UTF-8"); '.
+				'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
+				'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
+				'header("Cache-Control: no-store, no-cache, must-revalidate"); '.
+				'header("Cache-Control: post-check=0, pre-check=0", false); '.
+				'header("Pragma: no-cache"); '.
+				'%s'.
+				'%s '.
+				'$oContext->close();'.
+				'?>'.
+				'<root>%s</root>',
+				$header_script,
+				$xml_header_buff,
+				$xml_body_buff
+				);
+		// Create php cache file
 		$php_output = $this->getPhpCacheCode($tree[0], $tree, $module_info->site_srl, $php_header_buff);
 		$php_buff = sprintf(
-			'<?php '.
-			'if(!defined("__ZBXE__")) exit(); '.
-			'%s; '.
-			'%s; '.
-			'$menu->list = array(%s); '.
-			'?>',
-			$header_script,
-			$php_header_buff,
-			$php_output['buff']
-		);
-
-		// 파일 저장
+				'<?php '.
+				'if(!defined("__ZBXE__")) exit(); '.
+				'%s; '.
+				'%s; '.
+				'$menu->list = array(%s); '.
+				'?>',
+				$header_script,
+				$php_header_buff,
+				$php_output['buff']
+				);
+		// Save File
 		FileHandler::writeFile($xml_file, $xml_buff);
 		FileHandler::writeFile($php_file, $php_buff);
 		return $xml_file;
 	}
 
 	/**
-	 * @brief array로 정렬된 노드들을 parent_srl을 참조하면서 recursive하게 돌면서 xml 데이터 생성
-	 * 메뉴 xml파일은 node라는 tag가 중첩으로 사용되며 이 xml doc으로 관리자 페이지에서 메뉴를 구성해줌\n
-	 * (tree_menu.js 에서 xml파일을 바로 읽고 tree menu를 구현)
+	 * @brief Create the xml data recursively referring to parent_srl
+	 * In the menu xml file, node tag is nested and xml doc enables the admin page to have a menu\n
+	 * (tree menu is implemented by reading xml file from the tree_menu.js)
 	 **/
 	function getXmlTree($source_node, $tree, $site_srl, &$xml_header_buff) {
 		if(!$source_node) return;
 
 		foreach($source_node as $category_srl => $node) {
 			$child_buff = "";
-
-			// 자식 노드의 데이터 가져옴
+			// Get data of the child nodes
 			if($category_srl && $tree[$category_srl]) $child_buff = $this->getXmlTree($tree[$category_srl], $tree, $site_srl, $xml_header_buff);
-
-			// 변수 정리
+			// List variables
 			$expand = $node->expand;
 			$group_srls = $node->group_srls;
 			$mid = $node->mid;
 			$module_srl = $node->module_srl;
 			$parent_srl = $node->parent_srl;
 			$color = $node->color;
-			// node->group_srls값이 있으면
+			$description = $node->description;
+			// If node->group_srls value exists
 			if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
 			else $group_check_code = "true";
 
@@ -1405,8 +1417,11 @@ class documentController extends document {
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
 			if(count($langs)) foreach($langs as $key => $val) $xml_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val)));
 
+			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
+			if(count($langx)) foreach($langx as $key => $val) $xml_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val)));
+
 			$attribute = sprintf(
-					'mid="%s" module_srl="%d" node_srl="%d" parent_srl="%d" category_srl="%d" text="<?php echo (%s?($_titles[%d][$lang_type]):"")?>" url="%s" expand="%s" color="%s" document_count="%d" ',
+					'mid="%s" module_srl="%d" node_srl="%d" parent_srl="%d" category_srl="%d" text="<?php echo (%s?($_titles[%d][$lang_type]):"")?>" url="%s" expand="%s" color="%s" description="<?php echo (%s?($_descriptions[%d][$lang_type]):"")?>" document_count="%d" ',
 					$mid,
 					$module_srl,
 					$category_srl,
@@ -1417,8 +1432,10 @@ class documentController extends document {
 					getUrl('','mid',$node->mid,'category',$category_srl),
 					$expand,
 					$color,
+					$group_check_code,
+					$category_srl,
 					$node->document_count
-			);
+					);
 
 			if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
 			else $buff .=  sprintf('<node %s />', $attribute);
@@ -1427,65 +1444,63 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief array로 정렬된 노드들을 php code로 변경하여 return
-	 * 메뉴에서 메뉴를 tpl에 사용시 xml데이터를 사용할 수도 있지만 별도의 javascript 사용이 필요하기에
-	 * php로 된 캐시파일을 만들어서 db이용없이 바로 메뉴 정보를 구할 수 있도록 한다
-	 * 이 캐시는 ModuleHandler::displayContent() 에서 include하여 Context::set() 한다
+	 * @brief change sorted nodes in an array to the php code and then return
+	 * when using menu on tpl, you can directly xml data. howver you may need javascrips additionally.
+	 * therefore, you can configure the menu info directly from php cache file, not through DB.
+	 * You may include the cache in the ModuleHandler::displayContent()
 	 **/
 	function getPhpCacheCode($source_node, $tree, $site_srl, &$php_header_buff) {
 		$output = array("buff"=>"", "category_srl_list"=>array());
 		if(!$source_node) return $output;
-
-		// 루프를 돌면서 1차 배열로 정리하고 include할 수 있는 php script 코드를 생성
+		// Set to an arraty for looping and then generate php script codes to be included
 		foreach($source_node as $category_srl => $node) {
-
-			// 자식 노드가 있으면 자식 노드의 데이터를 먼저 얻어옴
+			// Get data from child nodes first if exist.
 			if($category_srl&&$tree[$category_srl]) $child_output = $this->getPhpCacheCode($tree[$category_srl], $tree, $site_srl, $php_header_buff);
 			else $child_output = array("buff"=>"", "category_srl_list"=>array());
-
-			// 현재 노드의 url값이 공란이 아니라면 category_srl_list 배열값에 입력
+			// Set values into category_srl_list arrary if url of the current node is not empty
 			$child_output['category_srl_list'][] = $node->category_srl;
 			$output['category_srl_list'] = array_merge($output['category_srl_list'], $child_output['category_srl_list']);
-
-			// node->group_srls값이 있으면
+			// If node->group_srls value exists
 			if($node->group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
 			else $group_check_code = "true";
-
-			// 변수 정리
+			// List variables
 			$selected = '"'.implode('","',$child_output['category_srl_list']).'"';
 			$child_buff = $child_output['buff'];
 			$expand = $node->expand;
 
 			$title = $node->title;
+			$description= $node->description;
 			$oModuleAdminModel = &getAdminModel('module');
 			$langs = $oModuleAdminModel->getLangCode($site_srl, $title);
 			if(count($langs)) foreach($langs as $key => $val) $php_header_buff .= sprintf('$_titles[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val)));
-
-			// 속성을 생성한다 ( category_srl_list를 이용해서 선택된 메뉴의 노드에 속하는지를 검사한다. 꽁수지만 빠르고 강력하다고 생각;;)
+			$langx = $oModuleAdminModel->getLangCode($site_srl, $description);
+			if(count($langx)) foreach($langx as $key => $val) $php_header_buff .= sprintf('$_descriptions[%d]["%s"] = "%s"; ', $category_srl, $key, str_replace('"','\\"',htmlspecialchars($val)));
+			// Create attributes(Use the category_srl_list to check whether to belong to the menu's node. It seems to be tricky but fast fast and powerful;)
 			$attribute = sprintf(
-				'"mid" => "%s", "module_srl" => "%d","node_srl"=>"%s","category_srl"=>"%s","parent_srl"=>"%s","text"=>$_titles[%d][$lang_type],"selected"=>(in_array(Context::get("category"),array(%s))?1:0),"expand"=>"%s","color"=>"%s", "list"=>array(%s),"document_count"=>"%d","grant"=>%s?true:false',
-				$node->mid,
-				$node->module_srl,
-				$node->category_srl,
-				$node->category_srl,
-				$node->parent_srl,
-				$node->category_srl,
-				$selected,
-				$expand,
-				$node->color,
-				$child_buff,
-				$node->document_count,
-				$group_check_code
-			);
+					'"mid" => "%s", "module_srl" => "%d","node_srl"=>"%s","category_srl"=>"%s","parent_srl"=>"%s","text"=>$_titles[%d][$lang_type],"selected"=>(in_array(Context::get("category"),array(%s))?1:0),"expand"=>"%s","color"=>"%s","description"=>$_descriptions[%d][$lang_type],"list"=>array(%s),"document_count"=>"%d","grant"=>%s?true:false',
+					$node->mid,
+					$node->module_srl,
+					$node->category_srl,
+					$node->category_srl,
+					$node->parent_srl,
+					$node->category_srl,
+					$selected,
+					$expand,
+					$node->color,
+					$node->category_srl,
+					$child_buff,
+					$node->document_count,
+					$group_check_code
+					);
 
-			// buff 데이터를 생성한다
+			// Generate buff data
 			$output['buff'] .=  sprintf('%s=>array(%s),', $node->category_srl, $attribute);
 		}
 		return $output;
 	}
 
 	/**
-	 * @brief 게시물의 이 게시물을.. 클릭시 나타나는 팝업 메뉴를 추가하는 method
+	 * @brief A method to add a pop-up menu which appears when clicking
 	 **/
 	function addDocumentPopupMenu($url, $str, $icon = '', $target = 'self') {
 		$document_popup_menu_list = Context::get('document_popup_menu_list');
@@ -1501,12 +1516,11 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 관리자가 글 선택시 세션에 담음
+	 * @brief Saved in the session when an administrator selects a post
 	 **/
 	function procDocumentAddCart() {
 		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
-
-		// 게시글 번호 구함
+		// Get document_srl
 		$srls = explode(',',Context::get('srls'));
 		for($i=0;$i<count($srls);$i++) {
 			$srl = trim($srls[$i]);
@@ -1514,8 +1528,7 @@ class documentController extends document {
 			$document_srls[] = $srl;
 		}
 		if(!count($document_srls)) return;
-
-		// 게시글들의 모듈 번호를 구함
+		// Get module_srl of the documents
 		$args->list_count = count($document_srls);
 		$args->document_srls = implode(',',$document_srls);
 		$args->order_type = 'asc';
@@ -1527,8 +1540,7 @@ class documentController extends document {
 			$document_srls[$val->module_srl][] = $val->document_srl;
 		}
 		if(!$document_srls || !count($document_srls)) return new Object();
-
-		// 각 문서들의 모듈 관리자 여부 확인, 최고 관리자는 모든 모듈의 문서에 수정 권한 가짐. (임시저장이나 휴지통 문서 포함.)
+		// Check if each of module administrators exists. Top-level administator will have a permission to modify every document of all modules.(Even to modify temporarily saved or trashed documents)
 		$oModuleModel = &getModel('module');
 		$module_srls = array_keys($document_srls);
 		for($i=0;$i<count($module_srls);$i++) {
@@ -1562,20 +1574,23 @@ class documentController extends document {
 	}
 
 	/**
-	 * @brief 세션에 담긴 선택글의 이동/ 삭제
+	 * @brief Move/ Delete the document in the seession
 	 **/
 	function procDocumentManageCheckedDocument() {
+		set_time_limit(50);
 		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
 
 		$type = Context::get('type');
-		$module_srl = Context::get('target_module');
+		$target_module = Context::get('target_module');
+		$module_srl = Context::get('module_srl');
+		if($target_module && !$module_srl) $module_srl = $target_module;
 		$category_srl = Context::get('target_category');
 		$message_content = Context::get('message_content');
 		if($message_content) $message_content = nl2br($message_content);
 
 		$cart = Context::get('cart');
-		if($cart) $document_srl_list = explode('|@|', $cart);
-		else $document_srl_list = array();
+		if(!is_array($cart)) $document_srl_list = explode('|@|', $cart);
+		else $document_srl_list = $cart;
 
 		$document_srl_count = count($document_srl_list);
 
@@ -1587,7 +1602,7 @@ class documentController extends document {
 			if (!$oDocument->isGranted()) return $this->stop('msg_not_permitted');
 		}
 
-		// 쪽지 발송
+		// Send a message
 		if($message_content) {
 
 			$oCommunicationController = &getController('communication');
@@ -1607,12 +1622,11 @@ class documentController extends document {
 				$oCommunicationController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
 			}
 		}
-
-		// 스팸 처리가 되지 않도록 스팸필터 설정
+		// Set a spam-filer not to be filtered to spams
 		$oSpamController = &getController('spamfilter');
 		$oSpamController->setAvoidLog();
-		$oDocumentAdminController = &getAdminController('document');
 
+		$oDocumentAdminController = &getAdminController('document');
 		if($type == 'move') {
 			if(!$module_srl) return new Object(-1, 'fail_to_move');
 
@@ -1621,15 +1635,17 @@ class documentController extends document {
 
 			$msg_code = 'success_moved';
 
-		} elseif($type == 'copy') {
+		}
+		elseif($type == 'copy') {
 			if(!$module_srl) return new Object(-1, 'fail_to_move');
 
 			$output = $oDocumentAdminController->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
 			if(!$output->toBool()) return new Object(-1, 'fail_to_move');
 
-			$msg_code = 'success_registed';
+			$msg_code = 'success_copy';
 
-		} elseif($type =='delete') {
+		}
+		elseif($type =='delete') {
 			$oDB = &DB::getInstance();
 			$oDB->begin();
 			for($i=0;$i<$document_srl_count;$i++) {
@@ -1639,7 +1655,8 @@ class documentController extends document {
 			}
 			$oDB->commit();
 			$msg_code = 'success_deleted';
-		} elseif($type == 'trash') {
+		}
+		elseif($type == 'trash') {
 			$args->description = $message_content;
 
 			$oDB = &DB::getInstance();
@@ -1652,10 +1669,19 @@ class documentController extends document {
 			$oDB->commit();
 			$msg_code = 'success_trashed';
 		}
+		elseif($type == 'cancelDeclare') {
+			$args->document_srl = $document_srl_list;
+			$output = executeQuery('document.deleteDeclaredDocuments', $args);
+		}
 
 		$_SESSION['document_management'] = array();
 
 		$this->setMessage($msg_code);
+		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList');
+			$this->setRedirectUrl($returnUrl);
+			return;
+		}
 	}
 
 	function procDocumentInsertModuleConfig()
@@ -1674,6 +1700,8 @@ class documentController extends document {
 		$document_config->use_vote_down = Context::get('use_vote_down');
 		if(!$document_config->use_vote_down) $document_config->use_vote_down = 'Y';
 
+		$document_config->use_status = Context::get('use_status');
+
 		$oModuleController = &getController('module');
 		for($i=0;$i<count($module_srl);$i++) {
 			$srl = trim($module_srl[$i]);
@@ -1681,7 +1709,106 @@ class documentController extends document {
 			$output = $oModuleController->insertModulePartConfig('document',$srl,$document_config);
 		}
 		$this->setError(-1);
-		$this->setMessage('success_updated');
+		$this->setMessage('success_updated', 'info');
+		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+			$this->setRedirectUrl($returnUrl);
+			return;
+		}
+	}
+
+	/**
+	 * @brief
+	 **/
+	function procDocumentTempSave()
+	{
+		// Check login information
+		if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+
+		$module_info = Context::get('module_info');
+		$logged_info = Context::get('logged_info');
+		// Get form information
+		$obj = Context::getRequestVars();
+		// Change the target module to log-in information
+		$obj->module_srl = $module_info->module_srl;
+		$obj->status = $this->getConfigStatus('temp');
+		unset($obj->is_notice);
+
+		// Extract from beginning part of contents in the guestbook
+		if(!$obj->title) {
+			$obj->title = cut_str(strip_tags($obj->content), 20, '...');
+		}
+
+		$oDocumentModel = &getModel('document');
+		$oDocumentController = &getController('document');
+		// Check if already exist geulinji
+		$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
+		// Update if already exists
+		if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
+			//if exist document status is already public, use temp status can point problem
+			$obj->status = $oDocument->get('status');
+			$output = $oDocumentController->updateDocument($oDocument, $obj);
+			$msg_code = 'success_updated';
+		// Otherwise, get a new
+		} else {
+			$output = $oDocumentController->insertDocument($obj);
+			$msg_code = 'success_registed';
+			$obj->document_srl = $output->get('document_srl');
+			$oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
+		}
+		// Set the attachment to be invalid state
+		if($oDocument->hasUploadedFiles()) {
+			$args->upload_target_srl = $oDocument->document_srl;
+			$args->isvalid = 'N';
+			executeQuery('file.updateFileValid', $args);
+		}
+
+		$this->setMessage('success_saved');
+		$this->add('document_srl', $obj->document_srl);
+	}
+
+	/**
+	 * @brief return Document List for exec_xml
+	 **/
+	function procDocumentGetList()
+	{
+		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		$documentSrls = Context::get('document_srls');
+		if($documentSrls) $documentSrlList = explode(',', $documentSrls);
+
+		if(count($documentSrlList) > 0) {
+			$oDocumentModel = &getModel('document');
+			$columnList = array('document_srl', 'title', 'nick_name', 'status');
+			$documentList = $oDocumentModel->getDocuments($documentSrlList, $this->grant->is_admin, false, $columnList);
+		}
+		else
+		{
+			global $lang;
+			$documentList = array();
+			$this->setMessage($lang->no_documents);
+		}
+		$this->add('document_list', $documentList);
+	}
+
+	/**
+	 * @brief for old version, comment allow status check.
+	 **/
+	function _checkCommentStatusForOldVersion(&$obj)
+	{
+		if(!isset($obj->allow_comment)) $obj->allow_comment = 'N';
+		if(!isset($obj->lock_comment)) $obj->lock_comment = 'N';
+
+		if($obj->allow_comment == 'Y' && $obj->lock_comment == 'N') $obj->commentStatus = 'ALLOW';
+		else $obj->commentStatus = 'DENY';
+	}
+
+	/**
+	 * @brief for old version, document status check.
+	 **/
+	function _checkDocumentStatusForOldVersion(&$obj)
+	{
+		if(!$obj->status && $obj->is_secret == 'Y') $obj->status = $this->getConfigStatus('secret');
+		if(!$obj->status && $obj->is_secret != 'Y') $obj->status = $this->getConfigStatus('public');
 	}
 }
 ?>
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index ebffa8550..2abef10b5 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -2,7 +2,7 @@
     /**
      * @class  documentItem
      * @author NHN (developers@xpressengine.com)
-     * @brief  document 객체
+     * @brief document object
      **/
 
     class documentItem extends Object {
@@ -11,9 +11,11 @@
         var $lang_code = null;
 
         var $allow_trackback_status = null;
+		var $columnList = array();
 
-        function documentItem($document_srl = 0, $load_extra_vars = true) {
+        function documentItem($document_srl = 0, $load_extra_vars = true, $columnList = array()) {
             $this->document_srl = $document_srl;
+			$this->columnList = $columnList;
 
             $this->_loadFromDB($load_extra_vars);
         }
@@ -23,12 +25,22 @@
             $this->_loadFromDB($load_extra_vars);
         }
 
-        function _loadFromDB($load_extra_vars=true) {
+        function _loadFromDB($load_extra_vars = true) {
             if(!$this->document_srl) return;
 
-            $args->document_srl = $this->document_srl;
-            $output = executeQuery('document.getDocument', $args);
-
+            // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object_document_item:'.$this->document_srl;
+                    $output = $oCacheHandler->get($cache_key);
+            }
+            if(!$output) {
+                $args->document_srl = $this->document_srl;
+                $output = executeQuery('document.getDocument', $args, $this->columnList);
+                //insert in cache
+                if($output->data->document_srl && $oCacheHandler->isSupport())
+                   $oCacheHandler->put($cache_key,$output);
+            }
             $this->setAttribute($output->data,$load_extra_vars);
         }
 
@@ -40,8 +52,7 @@
             $this->document_srl = $attribute->document_srl;
             $this->lang_code = $attribute->lang_code;
             $this->adds($attribute);
-
-            // 태그 정리
+            // Tags
             if($this->get('tags')) {
                 $tags = explode(',',$this->get('tags'));
                 $tag_count = count($tags);
@@ -59,7 +70,7 @@
         }
 
         function isExists() {
-            return $this->document_srl ? true : false;
+			return $this->document_srl ? true : false;
         }
 
         function isGranted() {
@@ -90,21 +101,20 @@
         function allowComment() {
             if(!$this->isExists()) return true;
 
-            return $this->get('allow_comment') == 'Y' ? true : false;
+            return $this->get('comment_status') == 'ALLOW' ? true : false;
         }
 
         function allowTrackback() {
             static $allow_trackback_status = null;
             if(is_null($allow_trackback_status)) {
-                // 엮인글 관리 모듈의 사용금지 설정 상태이면 무조건 금지, 그렇지 않으면 개별 체크
+                // If the trackback module is configured to be disabled, do not allow. Otherwise, check the setting of each module.
                 $oModuleModel = &getModel('module');
                 $trackback_config = $oModuleModel->getModuleConfig('trackback');
                 if(!isset($trackback_config->enable_trackback)) $trackback_config->enable_trackback = 'Y';
                 if($trackback_config->enable_trackback != 'Y') $allow_trackback_status = false;
                 else {
                     $module_srl = $this->get('module_srl');
-
-                    // 모듈별 설정을 체크
+                    // Check settings of each module
                     $module_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
                     if($module_config->enable_trackback == 'N') $allow_trackback_status = false;
                     else if($this->get('allow_trackback')=='Y' || !$this->isExists()) $allow_trackback_status = true;
@@ -114,7 +124,9 @@
         }
 
         function isLocked() {
-            return $this->get('lock_comment') == 'Y'  ? true : false;
+			if(!$this->isExists()) return false;
+
+            return $this->get('comment_status') == 'ALLOW' ? false : true;
         }
 
         function isEditable() {
@@ -123,7 +135,8 @@
         }
 
         function isSecret() {
-            return $this->get('is_secret') == 'Y' ? true : false;
+			$oDocumentModel = &getModel('document');
+            return $this->get('status') == $oDocumentModel->getConfigStatus('secret') ? true : false;
         }
 
         function isNotice() {
@@ -154,25 +167,20 @@
 
         function notify($type, $content) {
             if(!$this->document_srl) return;
-
-            // useNotify가 아니면 return
+            // return if it is not useNotify
             if(!$this->useNotify()) return;
-
-            // 글쓴이가 로그인 유저가 아니면 패스~
+            // Pass if an author is not a logged-in user
             if(!$this->get('member_srl')) return;
-
-            // 현재 로그인한 사용자와 글을 쓴 사용자를 비교하여 동일하면 return
+            // Return if the currently logged-in user is an author
             $logged_info = Context::get('logged_info');
             if($logged_info->member_srl == $this->get('member_srl')) return;
-
-            // 변수 정리
+            // List variables
             if($type) $title = "[".$type."] ";
             $title .= cut_str(strip_tags($content), 10, '...');
             $content = sprintf('%s<br /><br />from : <a href="%s" target="_blank">%s</a>',$content, getFullUrl('','document_srl',$this->document_srl), getFullUrl('','document_srl',$this->document_srl));
             $receiver_srl = $this->get('member_srl');
             $sender_member_srl = $logged_info->member_srl;
-
-            // 쪽지 발송
+            // Send a message
             $oCommunicationController = &getController('communication');
             $oCommunicationController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false);
         }
@@ -181,7 +189,7 @@
             return $this->get('lang_code');
         }
 
-        function getIpaddress() {
+        function getIpAddress() {
             if($this->isGranted()) return $this->get('ipaddress');
             return preg_replace('/([0-9]+)\.([0-9]+)\.([0-9]+)\.([0-9]+)/','*.$2.$3.$4', $this->get('ipaddress'));
 
@@ -245,7 +253,8 @@
 
             if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
-            $_SESSION['accessible'][$this->document_srl] = true;
+			$result = $this->_checkAccessibleFromStatus();
+			if($result) $_SESSION['accessible'][$this->document_srl] = true;
 
             $content = $this->get('content');
 
@@ -259,18 +268,18 @@
 
             if($this->isSecret() && !$this->isGranted() && !$this->isAccessible()) return Context::getLang('msg_is_secret');
 
-            $_SESSION['accessible'][$this->document_srl] = true;
+			$result = $this->_checkAccessibleFromStatus();
+            if($result) $_SESSION['accessible'][$this->document_srl] = true;
 
             $content = $this->get('content');
             if(!$stripEmbedTagException) stripEmbedTagForAdmin($content, $this->get('member_srl'));
 
-            // rewrite모듈을 사용하면 링크 재정의
+            // Define a link if using a rewrite module
             $oContext = &Context::getInstance();
             if($oContext->allow_rewrite) {
                 $content = preg_replace('/<a([ \t]+)href=("|\')\.\/\?/i',"<a href=\\2". Context::getRequestUri() ."?", $content);
             }
-
-            // 이 게시글을... 팝업메뉴를 출력할 경우
+            // To display a pop-up menu
             if($add_popup_menu) {
                 $content = sprintf(
                         '%s<div class="document_popup_menu"><a href="#popup_menu_area" class="document_%d" onclick="return false">%s</a></div>',
@@ -278,8 +287,7 @@
                         $this->document_srl, Context::getLang('cmd_document_do')
                 );
             }
-
-            // 컨텐츠에 대한 조작이 가능한 추가 정보를 설정하였을 경우
+            // If additional content information is set
             if($add_content_info) {
                 $content = sprintf(
                         '<!--BeforeDocument(%d,%d)--><div class="document_%d_%d xe_content">%s</div><!--AfterDocument(%d,%d)-->',
@@ -289,12 +297,11 @@
                         $this->document_srl, $this->get('member_srl'),
                         $this->document_srl, $this->get('member_srl')
                 );
-            // 컨텐츠에 대한 조작이 필요하지 않더라도 xe_content라는 클래스명을 꼭 부여
+            // Add xe_content class although accessing content is not required
             } else {
                 if($add_xe_content_class) $content = sprintf('<div class="xe_content">%s</div>', $content);
             }
-
-            // resource_realpath가 true이면 내용내 이미지의 경로를 절대 경로로 변경
+            // Change the image path to a valid absolute path if resource_realpath is true
             if($resource_realpath) {
                 $content = preg_replace_callback('/<img([^>]+)>/i',array($this,'replaceResourceRealPath'), $content);
             }
@@ -303,7 +310,7 @@
         }
 
         /**
-         * 에디터 코드가 변환된 내용 반환
+         * Return transformed content by Editor codes
          **/
         function getTransContent($add_popup_menu = true, $add_content_info = true, $resource_realpath = false, $add_xe_content_class = true) {
             $oEditorController = &getController('editor');
@@ -317,25 +324,25 @@
         function getSummary($str_size = 50, $tail = '...') {
             $content = $this->getContent(false,false);
 
-            // 줄바꿈이 있을 때, 공백문자 삽입
+            // For a newlink, inert a whitespace
             $content = preg_replace('!(<br[\s]*/{0,1}>[\s]*)+!is', ' ', $content);
 
-            // </p>, </div>, </li> 등의 태그를 공백 문자로 치환
+            // Replace tags such as </p> , </div> , </li> and others to a whitespace
             $content = str_replace(array('</p>', '</div>', '</li>'), ' ', $content);
 
-            // 태그 제거
+            // Remove Tags
             $content = preg_replace('!<([^>]*?)>!is','', $content);
 
-            // < , > , " 를 치환
+            // Replace < , >, "
             $content = str_replace(array('&lt;','&gt;','&quot;','&nbsp;'), array('<','>','"',' '), $content);
 
-            // 연속된 공백문자 삭제
+            // Delete  a series of whitespaces
             $content = preg_replace('/ ( +)/is', ' ', $content);
 
-            // 문자열을 자름
+            // Truncate string
             $content = trim(cut_str($content, $str_size, $tail));
 
-            // >, <, "를 다시 복구
+            // Replace back < , <, "
             $content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
 
             return $content;
@@ -384,8 +391,7 @@
 
         function getTrackbackUrl() {
             if(!$this->document_srl) return;
-
-            // 스팸을 막기 위한 key 생성
+            // Generate a key to prevent spams
             $oTrackbackModel = &getModel('trackback');
             return $oTrackbackModel->getTrackbackUrl($this->document_srl);
         }
@@ -429,10 +435,10 @@
 
         function getExtraEidValue($eid) {
             $extra_vars = $this->getExtraVars();
-			
+
 			if($extra_vars)
 			{
-				// eid 명칭으로 확장변수 처리
+				// Handle extra variable(eid)
 				foreach($extra_vars as $idx => $key) {
 					$extra_eid[$key->eid] = $key;
 				}
@@ -442,7 +448,7 @@
 
         function getExtraEidValueHTML($eid) {
             $extra_vars = $this->getExtraVars();
-            // eid 명칭으로 확장변수 처리
+            // Handle extra variable(eid)
             foreach($extra_vars as $idx => $key) {
                 $extra_eid[$key->eid] = $key;
             }
@@ -460,35 +466,29 @@
         }
 
         function getComments() {
-            if(!$this->allowComment() || !$this->getCommentCount()) return;
+            if(!$this->getCommentCount()) return;
             if(!$this->isGranted() && $this->isSecret()) return;
-
-            // cpage는 댓글페이지의 번호
+            // cpage is a number of comment pages
             $cpage = Context::get('cpage');
-
-            // 댓글 목록을 구해옴
+            // Get a list of comments
             $oCommentModel = &getModel('comment');
             $output = $oCommentModel->getCommentList($this->document_srl, $cpage, $is_admin);
             if(!$output->toBool() || !count($output->data)) return;
-
-            // 구해온 목록을 commentItem 객체로 만듬
-            // 계층구조에 따라 부모글에 관리권한이 있으면 자식글에는 보기 권한을 줌
+            // Create commentItem object from a comment list
+            // If admin priviledge is granted on parent posts, you can read its child posts.
             $accessible = array();
             foreach($output->data as $key => $val) {
                 $oCommentItem = new commentItem();
                 $oCommentItem->setAttribute($val);
-
-                // 권한이 있는 글에 대해 임시로 권한이 있음을 설정
+                // If permission is granted to the post, you can access it temporarily
                 if($oCommentItem->isGranted()) $accessible[$val->comment_srl] = true;
-
-                // 현재 댓글이 비밀글이고 부모글이 있는 답글이고 부모글에 대해 관리 권한이 있으면 보기 가능하도록 수정
+                // If the comment is set to private and it belongs child post, it is allowable to read the comment for who has a admin privilege on its parent post
                 if($val->parent_srl>0 && $val->is_secret == 'Y' && !$oCommentItem->isAccessible() && $accessible[$val->parent_srl]===true) {
                     $oCommentItem->setAccessible();
                 }
                 $comment_list[$val->comment_srl] = $oCommentItem;
             }
-
-            // 스킨에서 출력하기 위한 변수 설정
+            // Variable setting to be displayed on the skin
             Context::set('cpage', $output->page_navigation->cur_page);
             if($output->total_page>1) $this->comment_page_navigation = $output->page_navigation;
 
@@ -515,16 +515,13 @@
         }
 
         function getThumbnail($width = 80, $height = 0, $thumbnail_type = '') {
-            // 존재하지 않는 문서일 경우 return false
+            // Return false if the document doesn't exist
             if(!$this->document_srl) return;
-
-            // 높이 지정이 별도로 없으면 정사각형으로 생성
+            // If not specify its height, create a square
             if(!$height) $height = $width;
-
-            // 첨부파일이 없거나 내용중 이미지가 없으면 return false;
+            // Return false if neither attachement nor image files in the document
             if(!$this->get('uploaded_count') && !preg_match("!<img!is", $this->get('content'))) return;
-
-            // 문서 모듈의 기본 설정에서 Thumbnail의 생성 방법을 구함
+            // Get thumbnai_type information from document module's configuration
             if(!in_array($thumbnail_type, array('crop','ratio'))) {
                 $config = $GLOBALS['__document_config__'];
                 if(!$config) {
@@ -534,23 +531,19 @@
                 }
                 $thumbnail_type = $config->thumbnail_type;
             }
-
-            // 섬네일 정보 정의
+            // Define thumbnail information
             $thumbnail_path = sprintf('files/cache/thumbnails/%s',getNumberingPath($this->document_srl, 3));
             $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, $width, $height, $thumbnail_type);
             $thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-
-            // 섬네일 파일이 있을 경우 파일의 크기가 0 이면 return false 아니면 경로 return
+            // Return false if thumbnail file exists and its size is 0. Otherwise, return its path
             if(file_exists($thumbnail_file)) {
                 if(filesize($thumbnail_file)<1) return false;
                 else return $thumbnail_url;
             }
-
-            // 대상 파일
+            // Target File
             $source_file = null;
             $is_tmp_file = false;
-
-            // 첨부된 파일중 이미지 파일이 있으면 찾음
+            // Find an iamge file among attached files if exists
             if($this->get('uploaded_count')) {
                 $oFileModel = &getModel('file');
                 $file_list = $oFileModel->getFiles($this->document_srl);
@@ -565,8 +558,7 @@
                     }
                 }
             }
-
-            // 첨부된 파일이 없으면 내용중 이미지 파일을 구함
+            // If not exists, file an image file from the content
             if(!$source_file) {
                 $content = $this->get('content');
                 $target_src = null;
@@ -598,42 +590,39 @@
                 $output = FileHandler::createImageFile($source_file, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
             }
             if($is_tmp_file) FileHandler::removeFile($source_file);
-
-            // 섬네일 생성 성공시 경로 return
+            // Return its path if a thumbnail is successfully genetated
             if($output) return $thumbnail_url;
-
-            // 차후 다시 섬네일 생성을 시도하지 않기 위해 빈 파일을 생성
+            // Create an empty file not to re-generate the thumbnail
             else FileHandler::writeFile($thumbnail_file, '','w');
 
             return;
         }
 
         /**
-         * @brief 새글, 최신 업데이트글, 비밀글, 이미지/동영상/첨부파일등의 아이콘 출력용 함수
-         * $time_interval 에 지정된 시간(초)로 새글/최신 업데이트글의 판별
+         * @brief Functions to display icons for new post, latest update, secret(private) post, image/video/attachment
+         * Determine new post and latest update by $time_interval
          **/
         function getExtraImages($time_interval = 43200) {
             if(!$this->document_srl) return;
-
-            // 아이콘 목록을 담을 변수 미리 설정
+            // variables for icon list
             $buffs = array();
 
             $check_files = false;
 
-            // 비밀글 체크
+            // Check if secret post is
             if($this->isSecret()) $buffs[] = "secret";
 
-            // 최신 시간 설정
+            // Set the latest time
             $time_check = date("YmdHis", time()-$time_interval);
 
-            // 새글 체크
+            // Check new post
             if($this->get('regdate')>$time_check) $buffs[] = "new";
             else if($this->get('last_update')>$time_check) $buffs[] = "update";
 
             /*
             $content = $this->get('content');
 
-            // 사진 이미지 체크
+            // Check image files
             preg_match_all('!<img([^>]*?)>!is', $content, $matches);
             $cnt = count($matches[0]);
             for($i=0;$i<$cnt;$i++) {
@@ -643,26 +632,31 @@
                 break;
             }
 
-            // 동영상 체크
+            // Check video files
             if(preg_match('!<embed([^>]*?)>!is', $content) || preg_match('/editor_component=("|\')*multimedia_link/i', $content) ) {
                 $buffs[] = "movie";
                 $check_files = true;
             }
             */
 
-            // 첨부파일 체크
+            // Check the attachment
             if($this->hasUploadedFiles()) $buffs[] = "file";
 
             return $buffs;
         }
 
+		function getStatus()
+		{
+			if(!$this->get('status')) return $this->getDefaultStatus();
+			return $this->get('status');
+		}
+
         /**
-         * @brief getExtraImages로 구한 값을 이미지 태그를 씌워서 리턴
+         * @brief Return the value obtained from getExtraImages with image tag
          **/
         function printExtraImages($time_check = 43200) {
             if(!$this->document_srl) return;
-
-            // 아이콘 디렉토리 구함
+            // Get the icon directory
             $path = sprintf('%s%s',getUrl(), 'modules/document/tpl/icons/');
 
             $buffs = $this->getExtraImages($time_check);
@@ -694,7 +688,7 @@
         }
 
         /**
-         * @brief 에디터 html을 구해서 return
+         * @brief Return Editor html
          **/
         function getEditor() {
             $module_srl = $this->get('module_srl');
@@ -705,18 +699,19 @@
         }
 
         /**
-         * @brief 댓글을 달 수 있는지에 대한 권한 체크
-         * 게시글의 댓글 권한과 또 다른 부분
+         * @brief Check whether to have a permission to write comment
+         * Authority to write a comment and to write a document is separated
          **/
         function isEnableComment() {
-            // 권한이 없고 비밀글 or 댓글금지 or 댓글허용금지이면 return false
-            if(!$this->isGranted() && ( $this->isSecret() || $this->isLocked() || !$this->allowComment() ) ) return false;
+            // Return false if not authorized, if a secret document, if the document is set not to allow any comment
+			if (!$this->allowComment()) return false;
+			if(!$this->isGranted() && $this->isSecret()) return false;
 
-            return true;
+			return true;
         }
 
         /**
-         * @brief 댓글 에디터 html을 구해서 return
+         * @brief Return comment editor's html
          **/
         function getCommentEditor() {
             if(!$this->isEnableComment()) return;
@@ -726,7 +721,7 @@
         }
 
         /**
-         * @brief 작성자의 프로필 이미지를 return
+         * @brief Return author's profile image
          **/
         function getProfileImage() {
             if(!$this->isExists() || !$this->get('member_srl')) return;
@@ -738,17 +733,15 @@
         }
 
         /**
-         * @brief 작성자의 서명을 return
+         * @brief Return author's signiture
          **/
         function getSignature() {
-            // 존재하지 않는 글이면 패스~
+            // Pass if a document doesn't exist
             if(!$this->isExists() || !$this->get('member_srl')) return;
-
-            // 서명정보를 구함
+            // Get signature information
             $oMemberModel = &getModel('member');
             $signature = $oMemberModel->getSignature($this->get('member_srl'));
-
-            // 회원모듈에서 서명 최고 높이 지정되었는지 검사
+            // Check if a maximum height of signiture is set in the member module
             if(!isset($GLOBALS['__member_signature_max_height'])) {
                $oModuleModel = &getModel('module');
                $member_config = $oModuleModel->getModuleConfig('member');
@@ -763,10 +756,31 @@
         }
 
         /**
-         * @brief 내용내의 이미지 경로를 절대 경로로 변경
+         * @brief Change an image path in the content to absolute path
          **/
         function replaceResourceRealPath($matches) {
             return preg_replace('/src=(["\']?)files/i','src=$1'.Context::getRequestUri().'files', $matches[0]);
         }
+
+		function _checkAccessibleFromStatus()
+		{
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin == 'Y') return true;
+
+			$status = $this->get('status');
+			if(empty($status)) return false;
+
+			$oDocumentModel = &getModel('document');
+			$configStatusList = $oDocumentModel->getStatusList();
+
+			if($status == $configStatusList['public'] || $status == $configStatusList['publish'])
+				return true;
+			else if($status == $configStatusList['private'] || $status == $configStatusList['secret'])
+			{
+				if($this->get('member_srl') == $logged_info->member_srl)
+					return true;
+			}
+			return false;
+		}
     }
 ?>
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 6fa4cab29..f638192c7 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -1,1107 +1,1164 @@
-<?php
-    /**
-     * @class  documentModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  document 모듈의 model 클래스
-     **/
-
-    class documentModel extends document {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief document에 대한 권한을 세션값으로 체크
-         **/
-        function isGranted($document_srl) {
-            return $_SESSION['own_document'][$document_srl];
-        }
-
-        /**
-         * @brief 확장변수를 매 문서마다 처리하지 않기 위해 매크로성으로 일괄 select 및 적용
-         **/
-        function setToAllDocumentExtraVars() {
-            static $checked_documents = array();
-
-            // XE에서 모든 문서 객체는 XE_DOCUMENT_LIST라는 전역 변수에 세팅을 함
-            if(!count($GLOBALS['XE_DOCUMENT_LIST'])) return;
-
-            // 모든 호출된 문서 객체를 찾아서 확장변수가 설정되었는지를 확인
-            $document_srls = array();
-            foreach($GLOBALS['XE_DOCUMENT_LIST'] as $key => $val) {
-                if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
-                $checked_documents[$val->document_srl] = true;
-                $document_srls[] = $val->document_srl;
-            }
-
-            // 검출된 문서 번호가 없으면 return
-            if(!count($document_srls)) return;
-
-            // 확장변수 미지정된 문서에 대해서 일단 현재 접속자의 언어코드로 확장변수를 검색
-            $obj->document_srl = implode(',',$document_srls);
-            $output = executeQueryArray('document.getDocumentExtraVars', $obj);
-            if($output->toBool() && $output->data) {
-                foreach($output->data as $key => $val) {
-                    if(!isset($val->value)) continue;
-                    if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value); 
-                    $extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value); 
-                }
-            }
-
-            $user_lang_code = Context::getLangType();
-            for($i=0,$c=count($document_srls);$i<$c;$i++) {
-                $document_srl = $document_srls[$i];
-                unset($vars);
-
-                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] || !is_object($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) || !$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->isExists()) continue;
-
-                $module_srl = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('module_srl');
-                $extra_keys = $this->getExtraKeys($module_srl);
-                $vars = $extra_vars[$document_srl];
-                $document_lang_code = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('lang_code');
-
-                // 확장변수 처리
-                if(count($extra_keys)) {
-                foreach($extra_keys as $idx => $key) {
-                        $val = $vars[$idx];
-                        if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
-                        else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
-                        else if(isset($val[0])) $v = $val[0];
-                        else $v = null;
-                        $extra_keys[$idx]->value = $v;
-                    }
-                }
-
-                unset($evars);
-                $evars = new ExtraVar($module_srl);
-                $evars->setExtraVarKeys($extra_keys);
-
-                // 제목 처리
-                if($vars[-1][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('title',$vars[-1][$user_lang_code]);
-
-                // 내용 처리
-                if($vars[-2][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('content',$vars[-2][$user_lang_code]);
-			
-                if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code]){ 
-					unset($checked_documents[$document_srl]);
-				}
-
-                $GLOBALS['XE_EXTRA_VARS'][$document_srl] = $evars->getExtraVars();
-            }
-        }
-
-        /**
-         * @brief 문서 가져오기
-         **/
-        function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true) {
-            if(!$document_srl) return new documentItem();
-
-            if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl])) {
-                $oDocument = new documentItem($document_srl, $load_extra_vars);
-                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-                if($load_extra_vars) $this->setToAllDocumentExtraVars();
-            }
-            if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
-
-            return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
-        }
-
-        /**
-         * @brief 여러개의 문서들을 가져옴 (페이징 아님)
-         **/
-        function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true) {
-            if(is_array($document_srls)) {
-                $list_count = count($document_srls);
-                $document_srls = implode(',',$document_srls);
-            } else {
-                $list_count = 1;
-            }
-            $args->document_srls = $document_srls;
-            $args->list_count = $list_count;
-            $args->order_type = 'asc';
-
-            $output = executeQuery('document.getDocuments', $args);
-            $document_list = $output->data;
-            if(!$document_list) return;
-            if(!is_array($document_list)) $document_list = array($document_list);
-
-            $document_count = count($document_list);
-            foreach($document_list as $key => $attribute) {
-                $document_srl = $attribute->document_srl;
-                if(!$document_srl) continue;
-
-                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) {
-                    $oDocument = null;
-                    $oDocument = new documentItem();
-                    $oDocument->setAttribute($attribute, false);
-                    if($is_admin) $oDocument->setGrant();
-                    $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-                }
-
-                $result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
-            }
-
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
-
-            $output = null;
-            if(count($result)) {
-                foreach($result as $document_srl => $val) {
-                    $output[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
-                }
-            }
-
-            return $output;
-        }
-
-        /**
-         * @brief module_srl값을 가지는 문서의 목록을 가져옴
-         **/
-        function getDocumentList($obj, $except_notice = false, $load_extra_vars=true) {
-            // 정렬 대상과 순서 체크
-            if(!in_array($obj->sort_index, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count','title','category_srl'))) $obj->sort_index = 'list_order';
-            if(!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
-
-            // module_srl 대신 mid가 넘어왔을 경우는 직접 module_srl을 구해줌
-            if($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
-            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-
-            // 제외 module_srl에 대한 검사
-            if(is_array($obj->exclude_module_srl)) $args->exclude_module_srl = implode(',', $obj->exclude_module_srl);
-            else $args->exclude_module_srl = $obj->exclude_module_srl;
-
-            // 변수 체크
-            $args->category_srl = $obj->category_srl?$obj->category_srl:null;
-            $args->sort_index = $obj->sort_index;
-            $args->order_type = $obj->order_type;
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-            $args->start_date = $obj->start_date?$obj->start_date:null;
-            $args->end_date = $obj->end_date?$obj->end_date:null;
-            $args->member_srl = $obj->member_srl;
-
-            // 카테고리가 선택되어 있으면 하부 카테고리까지 모두 조건에 추가
-            if($args->category_srl) {
-                $category_list = $this->getCategoryList($args->module_srl);
-                $category_info = $category_list[$args->category_srl];
-                $category_info->childs[] = $args->category_srl;
-                $args->category_srl = implode(',',$category_info->childs);
-            }
-
-            // 기본으로 사용할 query id 지정 (몇가지 검색 옵션에 따라 query id가 변경됨)
-            $query_id = 'document.getDocumentList';
-
-            // 내용검색일 경우 document division을 지정하여 검색하기 위한 처리
-            $use_division = false;
-
-            // 검색 옵션 정리
-            $searchOpt->search_target = $obj->search_target;
-            $searchOpt->search_keyword = $obj->search_keyword;
-			$this->_setSearchOption($searchOpt, &$args, &$query_id, &$use_division);
-
-            /**
-             * division은 list_order의 asc 정렬일때만 사용할 수 있음
-             **/
-            if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
-
-            /**
-             * 만약 use_division이 true일 경우 document division을 이용하도록 변경
-             **/
-            if($use_division) {
-                // 시작 division
-                $division = (int)Context::get('division');
-
-                // division값이 없다면 제일 상위
-                if(!$division) {
-                    $division_args->module_srl = $args->module_srl;
-                    $division_args->exclude_module_srl = $args->exclude_module_srl;
-                    $division_args->list_count = 1;
-                    $division_args->sort_index = $args->sort_index;
-                    $division_args->order_type = $args->order_type;
-                    $output = executeQuery("document.getDocumentList", $division_args);
-                    if($output->data) {
-                        $item = array_pop($output->data);
-                        $division = $item->list_order;
-                    }
-                    $division_args = null;
-                }
-
-                // 마지막 division
-                $last_division = (int)Context::get('last_division');
-
-                // 지정된 division에서부터 5000개 후의 division값을 구함
-                if(!$last_division) {
-                    $last_division_args->module_srl = $args->module_srl;
-                    $last_division_args->exclude_module_srl = $args->exclude_module_srl;
-                    $last_division_args->list_count = 1;
-                    $last_division_args->sort_index = $args->sort_index;
-                    $last_division_args->order_type = $args->order_type;
-                    $last_division_args->list_order = $division;
-                    $last_division_args->page = 5001;
-                    $output = executeQuery("document.getDocumentDivision", $last_division_args);
-                    if($output->data) {
-                        $item = array_pop($output->data);
-                        $last_division = $item->list_order;
-                    }
-
-                }
-
-                // last_division 이후로 글이 있는지 확인
-                if($last_division) {
-                    $last_division_args = null;
-                    $last_division_args->module_srl = $args->module_srl;
-                    $last_division_args->exclude_module_srl = $args->exclude_module_srl;
-                    $last_division_args->list_order = $last_division;
-                    $output = executeQuery("document.getDocumentDivisionCount", $last_division_args);
-                    if($output->data->count<1) $last_division = null;
-                }
-
-                $args->division = $division;
-                $args->last_division = $last_division;
-                Context::set('division', $division);
-                Context::set('last_division', $last_division);
-            }
-
-            // document.getDocumentList 쿼리 실행
-            // 만약 query_id가 getDocumentListWithinComment 또는 getDocumentListWithinTag일 경우 group by 절 사용 때문에 쿼리를 한번더 수행
-            if(in_array($query_id, array('document.getDocumentListWithinComment', 'document.getDocumentListWithinTag'))) {
-                $group_args = clone($args);
-                $group_args->sort_index = 'documents.'.$args->sort_index;
-                $output = executeQueryArray($query_id, $group_args);
-                if(!$output->toBool()||!count($output->data)) return $output;
-
-                foreach($output->data as $key => $val) {
-                    if($val->document_srl) $target_srls[] = $val->document_srl;
-                }
-
-                $page_navigation = $output->page_navigation;
-                $keys = array_keys($output->data);
-                $virtual_number = $keys[0];
-
-                $target_args->document_srls = implode(',',$target_srls);
-                $target_args->list_order = $args->sort_index;
-                $target_args->order_type = $args->order_type;
-                $target_args->list_count = $args->list_count;
-                $target_args->page = 1;
-                $output = executeQueryArray('document.getDocuments', $target_args);
-                $output->page_navigation = $page_navigation;
-                $output->total_count = $page_navigation->total_count;
-                $output->total_page = $page_navigation->total_page;
-                $output->page = $page_navigation->cur_page;
-            } else {
-                $output = executeQueryArray($query_id, $args);
-            }
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if(!$output->toBool()||!count($output->data)) return $output;
-
-            $idx = 0;
-            $data = $output->data;
-            unset($output->data);
-
-            if(!isset($virtual_number))
-            {
-                $keys = array_keys($data);
-                $virtual_number = $keys[0];
-            }
-
-            if($except_notice) {
-                foreach($data as $key => $attribute) {
-                    if($attribute->is_notice == 'Y') $virtual_number --;
-                }
-            }
-
-            foreach($data as $key => $attribute) {
-                if($except_notice && $attribute->is_notice == 'Y') continue;
-                $document_srl = $attribute->document_srl;
-                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) {
-                    $oDocument = null;
-                    $oDocument = new documentItem();
-                    $oDocument->setAttribute($attribute, false);
-                    if($is_admin) $oDocument->setGrant();
-                    $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-                }
-
-                $output->data[$virtual_number] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
-                $virtual_number --;
-
-            }
-            
-			if($load_extra_vars) $this->setToAllDocumentExtraVars();
-
-            if(count($output->data)) {
-                foreach($output->data as $number => $document) {
-                    $output->data[$number] = $GLOBALS['XE_DOCUMENT_LIST'][$document->document_srl];
-                }
-            }
-
-            return $output;
-        }
-
-        /**
-         * @brief module_srl값을 가지는 문서의 공지사항만 가져옴
-         **/
-        function getNoticeList($obj) {
-            $args->module_srl = $obj->module_srl;
-            $output = executeQueryArray('document.getNoticeList', $args);
-            if(!$output->toBool()||!$output->data) return;
-
-            foreach($output->data as $key => $val) {
-                $document_srl = $val->document_srl;
-                if(!$document_srl) continue;
-
-                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) {
-                    $oDocument = null;
-                    $oDocument = new documentItem();
-                    $oDocument->setAttribute($val, false);
-                    $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-                }
-                $result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
-            }
-            $this->setToAllDocumentExtraVars();
-
-            foreach($result->data as $document_srl => $val) {
-                $result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
-            }
-
-            return $result;
-        }
-
-        /**
-         * @brief document의 확장 변수 키값을 가져오는 함수
-         * $form_include : 글 작성시에 필요한 확장변수의 input form 추가 여부
-         **/
-        function getExtraKeys($module_srl) {
-            if(is_null($GLOBALS['XE_EXTRA_KEYS'][$module_srl])) {
-                $oExtraVar = &ExtraVar::getInstance($module_srl);
-                $obj->module_srl = $module_srl;
-                $obj->sort_index = 'var_idx';
-                $obj->order = 'asc';
-                $output = executeQueryArray('document.getDocumentExtraKeys', $obj);
-                $oExtraVar->setExtraVarKeys($output->data);
-                $keys = $oExtraVar->getExtraVars();
-                if(!$keys) $keys = array();
-                $GLOBALS['XE_EXTRA_KEYS'][$module_srl] = $keys;
-            }
-
-            return $GLOBALS['XE_EXTRA_KEYS'][$module_srl];
-        }
-
-        /**
-         * @brief 특정 document의 확장 변수 값을 가져오는 함수
-         **/
-        function getExtraVars($module_srl, $document_srl) {
-            if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
-                // 확장변수 값을 추출하여 세팅
-                $oDocument = $this->getDocument($document_srl, false);
-                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
-                $this->setToAllDocumentExtraVars();
-            }
-            if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
-            return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
-        }
-
-        /**
-         * @brief 선택된 게시물의 팝업메뉴 표시
-         *
-         * 인쇄, 스크랩, 추천, 비추천, 신고 기능 추가
-         **/
-        function getDocumentMenu() {
-
-            // 요청된 게시물 번호와 현재 로그인 정보 구함
-            $document_srl = Context::get('target_srl');
-            $mid = Context::get('cur_mid');
-            $logged_info = Context::get('logged_info');
-            $act = Context::get('cur_act');
-
-            // menu_list 에 "표시할글,target,url" 을 배열로 넣는다
-            $menu_list = array();
-
-            // trigger 호출
-            ModuleHandler::triggerCall('document.getDocumentMenu', 'before', $menu_list);
-
-            $oDocumentController = &getController('document');
-
-            // 회원이어야만 가능한 기능
-            if($logged_info->member_srl) {
-
-				$oDocumentModel = &getModel('document');
-				$oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-				$module_srl = $oDocument->get('module_srl');
-				$member_srl = $oDocument->get('member_srl');
-				if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-				$oModuleModel = &getModel('module');
-				$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-				if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl){
-					// 추천 버튼 추가
-					$url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
-					$oDocumentController->addDocumentPopupMenu($url,'cmd_vote','./modules/document/tpl/icons/vote_up.gif','javascript');
-				}
-
-				if($document_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl){
-					// 비추천 버튼 추가
-					$url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
-					$oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','./modules/document/tpl/icons/vote_down.gif','javascript');
-				}
-
-                // 신고 기능 추가
-                $url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
-                $oDocumentController->addDocumentPopupMenu($url,'cmd_declare','./modules/document/tpl/icons/declare.gif','javascript');
-
-                // 스크랩 버튼 추가
-                $url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
-                $oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','./modules/document/tpl/icons/scrap.gif','javascript');
-            }
-
-            // 인쇄 버튼 추가
-            $url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
-            $oDocumentController->addDocumentPopupMenu($url,'cmd_print','./modules/document/tpl/icons/print.gif','printDocument');
-
-            // trigger 호출 (after)
-            ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
-
-            // 관리자일 경우 ip로 글 찾기
-            if($logged_info->is_admin == 'Y') {
-                $oDocumentModel = &getModel('document');
-                $oDocument = $oDocumentModel->getDocument($document_srl);
-
-                if($oDocument->isExists()) {
-                    // ip주소에 해당하는 글 찾기
-                    $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'));
-                    $icon_path = './modules/member/tpl/images/icon_management.gif';
-                    $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
-
-                    $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument-> getIpAddress());
-                    $oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','./modules/document/tpl/icons/declare.gif','javascript');
-                }
-            }
-
-            // 팝업메뉴의 언어 변경
-            $menus = Context::get('document_popup_menu_list');
-            $menus_count = count($menus);
-            for($i=0;$i<$menus_count;$i++) {
-                $menus[$i]->str = Context::getLang($menus[$i]->str);
-            }
-
-            // 최종적으로 정리된 팝업메뉴 목록을 구함
-            $this->add('menus', $menus);
-        }
-
-        /**
-         * @brief module_srl에 해당하는 문서의 전체 갯수를 가져옴
-         **/
-        function getDocumentCount($module_srl, $search_obj = NULL) {
-            // 검색 옵션 추가
-            $args->module_srl = $module_srl;
-            $args->s_title = $search_obj->s_title;
-            $args->s_content = $search_obj->s_content;
-            $args->s_user_name = $search_obj->s_user_name;
-            $args->s_member_srl = $search_obj->s_member_srl;
-            $args->s_ipaddress = $search_obj->s_ipaddress;
-            $args->s_regdate = $search_obj->s_regdate;
-            $args->category_srl = $search_obj->category_srl;
-
-            $output = executeQuery('document.getDocumentCount', $args);
-
-            // 전체 갯수를 return
-            $total_count = $output->data->count;
-            return (int)$total_count;
-        }
-        /**
-         * @brief 해당 document의 page 가져오기, module_srl이 없으면 전체에서..
-         **/
-        function getDocumentPage($oDocument, $opt) {
-            // 정렬 형식에 따라서 query args 변경
-            switch($opt->sort_index) {
-                case 'update_order' :
-                        if($opt->order_type == 'desc') $args->rev_update_order = $oDocument->get('update_order');
-                        else $args->update_order = $oDocument->get('update_order');
-                    break;
-                case 'regdate' :
-                        if($opt->order_type == 'asc') $args->rev_regdate = $oDocument->get('regdate');
-                        else $args->regdate = $oDocument->get('regdate');
-                    break;
-                case 'voted_count' :
-                case 'readed_count' :
-                case 'comment_count' :
-                case 'title' :
-                        return 1;
-                    break;
-                default :
-                        if($opt->order_type == 'desc') $args->rev_list_order = $oDocument->get('list_order');
-                        else $args->list_order = $oDocument->get('list_order');
-                    break;
-            }
-            $args->module_srl = $oDocument->get('module_srl');
-            $args->sort_index = $opt->sort_index;
-            $args->order_type = $opt->order_type;
-
-            // 검색 옵션 정리
-            $searchOpt->search_target = $opt->search_target;
-            $searchOpt->search_keyword = $opt->search_keyword;
-			$this->_setSearchOption($searchOpt, &$args, &$query_id, &$use_division);
-
-            // 전체 갯수를 구한후 해당 글의 페이지를 검색
-            $output = executeQuery('document.getDocumentPage', $args);
-            $count = $output->data->count;
-            $page = (int)(($count-1)/$opt->list_count)+1;
-            return $page;
-        }
-
-        /**
-         * @brief 카테고리의 정보를 가져옴
-         **/
-        function getCategory($category_srl) {
-            $args->category_srl = $category_srl;
-            $output = executeQuery('document.getCategory', $args);
-
-            $node = $output->data;
-            if(!$node) return;
-
-            if($node->group_srls) {
-                $group_srls = explode(',',$node->group_srls);
-                unset($node->group_srls);
-                $node->group_srls = $group_srls;
-            } else {
-                unset($node->group_srls);
-                $node->group_srls = array();
-            }
-            return $node;
-        }
-
-        /**
-         * @brief 특정 카테고리에 child가 있는지 체크
-         **/
-        function getCategoryChlidCount($category_srl) {
-            $args->category_srl = $category_srl;
-            $output = executeQuery('document.getChildCategoryCount',$args);
-            if($output->data->count > 0) return true;
-            return false;
-        }
-
-        /**
-         * @brief 특정 모듈의 카테고리 목록을 가져옴
-         * 속도나 여러가지 상황을 고려해서 카테고리 목록은 php로 생성된 script를 include하여 사용하는 것을 원칙으로 함
-         **/
-        function getCategoryList($module_srl) {
-            // 대상 모듈의 카테고리 파일을 불러옴
-            $filename = sprintf("./files/cache/document_category/%s.php", $module_srl);
-
-            // 대상 파일이 없으면 카테고리 캐시 파일을 재생성
-            if(!file_exists($filename)) {
-                $oDocumentController = &getController('document');
-                if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
-            }
-
-            @include($filename);
-
-            // 카테고리의 정리
-            $document_category = array();
-            $this->_arrangeCategory($document_category, $menu->list, 0);
-            return $document_category;
-        }
-
-        /**
-         * @brief 카테고리를 1차 배열 형식으로 변경하는 내부 method
-         **/
-        function _arrangeCategory(&$document_category, $list, $depth) {
-            if(!count($list)) return;
-            $idx = 0;
-            $list_order = array();
-            foreach($list as $key => $val) {
-                $obj = null;
-                $obj->mid = $val['mid'];
-                $obj->module_srl = $val['module_srl'];
-                $obj->category_srl = $val['category_srl'];
-                $obj->parent_srl = $val['parent_srl'];
-                $obj->title = $obj->text = $val['text'];
-                $obj->expand = $val['expand']=='Y'?true:false;
-                $obj->color = $val['color'];
-                $obj->document_count = $val['document_count'];
-                $obj->depth = $depth;
-                $obj->child_count = 0;
-                $obj->childs = array();
-                $obj->grant = $val['grant'];
-
-                if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
-                else $selected = false;
-
-                $obj->selected = $selected;
-
-                $list_order[$idx++] = $obj->category_srl;
-
-                // 부모 카테고리가 있으면 자식노드들의 데이터를 적용
-                if($obj->parent_srl) {
-
-                    $parent_srl = $obj->parent_srl;
-                    $document_count = $obj->document_count;
-                    $expand = $obj->expand;
-                    if($selected) $expand = true;
-
-                    while($parent_srl) {
-                        $document_category[$parent_srl]->document_count += $document_count;
-                        $document_category[$parent_srl]->childs[] = $obj->category_srl;
-                        $document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
-                        if($expand) $document_category[$parent_srl]->expand = $expand;
-
-                        $parent_srl = $document_category[$parent_srl]->parent_srl;
-                    }
-                }
-
-                $document_category[$key] = $obj;
-
-                if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
-            }
-            $document_category[$list_order[0]]->first = true;
-            $document_category[$list_order[count($list_order)-1]]->last = true;
-        }
-
-        /**
-         * @brief 카테고리에 속한 문서의 갯수를 구함
-         **/
-        function getCategoryDocumentCount($module_srl, $category_srl) {
-            $args->module_srl = $module_srl;
-            $args->category_srl = $category_srl;
-            $output = executeQuery('document.getCategoryDocumentCount', $args);
-            return (int)$output->data->count;
-        }
-
-        /**
-         * @brief 문서 category정보의 xml 캐시 파일을 return
-         **/
-        function getCategoryXmlFile($module_srl) {
-            $xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
-            if(!file_exists($xml_file)) {
-                $oDocumentController = &getController('document');
-                $oDocumentController->makeCategoryFile($module_srl);
-            }
-            return $xml_file;
-        }
-
-        /**
-         * @brief 문서 category정보의 php 캐시 파일을 return
-         **/
-        function getCategoryPhpFile($module_srl) {
-            $php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
-            if(!file_exists($php_file)) {
-                $oDocumentController = &getController('document');
-                $oDocumentController->makeCategoryFile($module_srl);
-            }
-            return $php_file;
-        }
-
-        /**
-         * @brief 월별 글 보관현황을 가져옴
-         **/
-        function getMonthlyArchivedList($obj) {
-            if($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
-            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-
-            $output = executeQuery('document.getMonthlyArchivedList', $args);
-            if(!$output->toBool()||!$output->data) return $output;
-
-            if(!is_array($output->data)) $output->data = array($output->data);
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정달의 일별 글 현황을 가져옴
-         **/
-        function getDailyArchivedList($obj) {
-            if($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크
-            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-            $args->regdate = $obj->regdate;
-
-            $output = executeQuery('document.getDailyArchivedList', $args);
-            if(!$output->toBool()) return $output;
-
-            if(!is_array($output->data)) $output->data = array($output->data);
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정 모듈의 분류를 구함
-         **/
-        function getDocumentCategories() {
-            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
-            $module_srl = Context::get('module_srl');
-            $categories= $this->getCategoryList($module_srl);
-            $lang = Context::get('lang');
-
-            // 분류 없음 추가
-            $output = "0,0,{$lang->none_category}\n";
-            if($categories){
-                foreach($categories as $category_srl => $category) {
-                    $output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
-                }
-            }
-            $this->add('categories', $output);
-        }
-
-        /**
-         * @brief 문서 설정 정보를 구함
-         **/
-        function getDocumentConfig() {
-            if(!$GLOBALS['__document_config__']) {
-                $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('document');
-                if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
-                $GLOBALS['__document_config__'] = $config;
-            }
-            return $GLOBALS['__document_config__'];
-        }
-
-        /**
-         * @brief 공통 :: 모듈의 확장 변수 관리
-         * 모듈의 확장변수 관리는  모든 모듈에서 document module instance를 이용할때 사용할 수 있음
-         **/
-        function getExtraVarsHTML($module_srl) {
-            // 기존의 extra_keys 가져옴
-            $extra_keys = $this->getExtraKeys($module_srl);
-            Context::set('extra_keys', $extra_keys);
-			
-			$security = new Security();				
-			$security->encodeHTML('extra_keys..name','extra_keys..eid');
-			
-            // grant 정보를 추출
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($this->module_path.'tpl', 'extra_keys');
-        }
-
-        /**
-         * @brief 공통 :: 모듈의 카테고리 변수 관리
-         **/
-        function getCategoryHTML($module_srl) {
-            $category_xml_file = $this->getCategoryXmlFile($module_srl);
-
-            Context::set('category_xml_file', $category_xml_file);
-
-			Context::loadJavascriptPlugin('ui.tree');
-            // grant 정보를 추출
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($this->module_path.'tpl', 'category_list');
-        }
-
-        /**
-         * @brief 특정 카테고리의 정보를 이용하여 템플릿을 구한후 return
-         * 관리자 페이지에서 특정 메뉴의 정보를 추가하기 위해 서버에서 tpl을 컴파일 한후 컴파일 된 html을 직접 return
-         **/
-        function getDocumentCategoryTplInfo() {
-            $oModuleModel = &getModel('module');
-            $oMemberModel = &getModel('member');
-
-            // 해당 메뉴의 정보를 가져오기 위한 변수 설정
-            $module_srl = Context::get('module_srl');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-
-            // 권한 체크 
-            $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
-            if(!$grant->manager) return new Object(-1,'msg_not_permitted');
-
-            $category_srl = Context::get('category_srl');
-            $parent_srl = Context::get('parent_srl');
-
-            // 회원 그룹의 목록을 가져옴
-            $group_list = $oMemberModel->getGroups($module_info->site_srl);
-            Context::set('group_list', $group_list);
-			
-			// parent_srl이 있고 category_srl 이 없으면 하부 메뉴 추가임
-            if(!$category_srl && $parent_srl) {
-                // 상위 메뉴의 정보를 가져옴
-                $parent_info = $this->getCategory($parent_srl);
-
-                // 추가하려는 메뉴의 기본 변수 설정 
-                $category_info->category_srl = getNextSequence();
-                $category_info->parent_srl = $parent_srl;
-                $category_info->parent_category_title = $parent_info->title;
-
-            // root에 메뉴 추가하거나 기존 메뉴의 수정일 경우
-            } else {
-                // category_srl 이 있으면 해당 메뉴의 정보를 가져온다
-                if($category_srl) $category_info = $this->getCategory($category_srl);
-
-                // 찾아진 값이 없다면 신규 메뉴 추가로 보고 category_srl값만 구해줌
-                if(!$category_info->category_srl) {
-                    $category_info->category_srl = getNextSequence();
-                }
-            }
-
-
-            $category_info->title = htmlspecialchars($category_info->title);
-            Context::set('category_info', $category_info);
-			
-			$security = new Security();				
-			$security->encodeHTML('group_list..title');
-
-            // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile('./modules/document/tpl', 'category_info');
-            $tpl = str_replace("\n",'',$tpl);
-
-            // 사용자 정의 언어 변경
-            $oModuleController = &getController('module');
-            $oModuleController->replaceDefinedLangCode($tpl);
-
-            // return 할 변수 설정
-            $this->add('tpl', $tpl);
-        }
-
-
-        function getDocumentSrlByAlias($mid, $alias)
-        {
-            if(!$mid || !$alias) return null;
-            $site_module_info = Context::get('site_module_info');
-            $args->mid = $mid;
-            $args->alias_title = $alias;
-            $args->site_srl = $site_module_info->site_srl;
-            $output = executeQuery('document.getDocumentSrlByAlias', $args);
-            if(!$output->data) return null;
-            else return $output->data->document_srl;
-        }
-
-		function getAlias($document_srl){
-			if(!$document_srl) return null;
-			$args->document_srl = $document_srl;
-			$output = executeQueryArray('document.getAliases', $args);
-
-            if(!$output->data) return null;
-			else return $output->data[0]->alias_title;
-		}
-
-        function getHistories($document_srl, $list_count, $page)
-        {
-            $args->list_count = $list_count;
-            $args->page = $page;
-            $args->document_srl = $document_srl;
-            $output = executeQueryArray('document.getHistories', $args);
-            return $output;
-        }
-
-        function getHistory($history_srl)
-        {
-            $args->history_srl = $history_srl;
-            $output = executeQuery('document.getHistory', $args);
-            return $output->data;
-        }
-
-        /**
-         * @brief module_srl값을 가지는 문서의 목록을 가져옴
-         **/
-        function getTrashList($obj) {
-
-            // 변수 체크
-            $args->category_srl = $obj->category_srl?$obj->category_srl:null;
-            $args->sort_index = $obj->sort_index;
-            $args->order_type = $obj->order_type?$obj->order_type:'desc';
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-
-
-            // 검색 옵션 정리
-            $search_target = $obj->search_target;
-            $search_keyword = $obj->search_keyword;
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'title' :
-                    case 'content' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->{"s_".$search_target} = $search_keyword;
-                            $use_division = true;
-                        break;
-                    case 'title_content' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_title = $search_keyword;
-                            $args->s_content = $search_keyword;
-                        break;
-                    case 'user_id' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_id = $search_keyword;
-                            $args->sort_index = 'documents.'.$args->sort_index;
-                        break;
-                    case 'user_name' :
-                    case 'nick_name' :
-                    case 'email_address' :
-                    case 'homepage' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->{"s_".$search_target} = $search_keyword;
-                        break;
-                    case 'is_notice' :
-                    case 'is_secret' :
-                            if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-                            elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
-                            else $args->{"s_".$search_target} = '';
-                        break;
-                    case 'member_srl' :
-                    case 'readed_count' :
-                    case 'voted_count' :
-                    case 'comment_count' :
-                    case 'trackback_count' :
-                    case 'uploaded_count' :
-                            $args->{"s_".$search_target} = (int)$search_keyword;
-                        break;
-                    case 'regdate' :
-                    case 'last_update' :
-                    case 'ipaddress' :
-                    case 'tag' :
-                            $args->{"s_".$search_target} = $search_keyword;
-                        break;
-                }
-            }
-
-
-			$output = executeQueryArray('document.getTrashList', $args);
-			if($output->data){
-            foreach($output->data as $key => $attribute) {
-				$oDocument = null;
-				$oDocument = new documentItem();
-				$oDocument->setAttribute($attribute, false);
-				$attribute = $oDocument;
-			}
-			}
-            return $output;
-        }
-
-		function getDocumentVotedMemberList()
-		{
-			$document_srl = Context::get('document_srl');
-			if(!$document_srl) return new Object(-1,'msg_invalid_request');
-
-			$point = Context::get('point');
-			if($point != -1) $point = 1;
-
-			$oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl, false, false);
-			$module_srl = $oDocument->get('module_srl');
-			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-			$oModuleModel = &getModel('module');
-            $document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
-			if($point == -1){
-				if($document_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request');
-				$args->below_point = 0;
-			}else{
-				if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
-				$args->more_point = 0;
-			}
-
-			$args->document_srl = $document_srl;
-
-			$output = executeQueryArray('document.getVotedMemberList',$args);
-			if(!$output->toBool()) return $output;
-
-			$oMemberModel = &getModel('member');
-			if($output->data){
-				foreach($output->data as $k => $d){
-					$profile_image = $oMemberModel->getProfileImage($d->member_srl);
-					$output->data[$k]->src = $profile_image->src;
-				}
-			}
-
-			$this->add('voted_member_list',$output->data);
-		}
-
-        /**
-         * @brief 게시물 목록의 검색 옵션을 Setting함(2011.03.08 - cherryfilter)
-		 * page변수가 없는 상태에서 page 값을 알아오는 method(getDocumentPage)는 검색하지 않은 값을 return해서 검색한 값을 가져오도록 검색옵션이 추가 됨.
-		 * 검색옵션의 중복으로 인해 private method로 별도 분리
-         **/
-		function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division)
-		{
-			$search_target = $searchOpt->search_target;
-			$search_keyword = $searchOpt->search_keyword;
-
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'title' :
-                    case 'content' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->{"s_".$search_target} = $search_keyword;
-                            $use_division = true;
-                        break;
-                    case 'title_content' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_title = $search_keyword;
-                            $args->s_content = $search_keyword;
-                            $use_division = true;
-                        break;
-                    case 'user_id' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_id = $search_keyword;
-                            $args->sort_index = 'documents.'.$args->sort_index;
-                        break;
-                    case 'user_name' :
-                    case 'nick_name' :
-                    case 'email_address' :
-                    case 'homepage' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->{"s_".$search_target} = $search_keyword;
-                        break;
-                    case 'is_notice' :
-                    case 'is_secret' :
-                            if($search_keyword=='N') $args->{"s_".$search_target} = 'N';
-                            elseif($search_keyword=='Y') $args->{"s_".$search_target} = 'Y';
-                            else $args->{"s_".$search_target} = '';
-                        break;
-                    case 'member_srl' :
-                    case 'readed_count' :
-                    case 'voted_count' :
-                    case 'comment_count' :
-                    case 'trackback_count' :
-                    case 'uploaded_count' :
-                            $args->{"s_".$search_target} = (int)$search_keyword;
-                        break;
-                    case 'regdate' :
-                    case 'last_update' :
-                    case 'ipaddress' :
-                            $args->{"s_".$search_target} = $search_keyword;
-                        break;
-                    case 'comment' :
-                            $args->s_comment = $search_keyword;
-                            $query_id = 'document.getDocumentListWithinComment';
-                            $use_division = true;
-                        break;
-                    case 'tag' :
-                            $args->s_tags = str_replace(' ','%',$search_keyword);
-                            $query_id = 'document.getDocumentListWithinTag';
-                        break;
-                    default :
-                            if(strpos($search_target,'extra_vars')!==false) {
-                                $args->var_idx = substr($search_target, strlen('extra_vars'));
-                                $args->var_value = str_replace(' ','%',$search_keyword);
-                                $args->sort_index = 'documents.'.$args->sort_index;
-                                $query_id = 'document.getDocumentListWithExtraVars';
-                            }
-                        break;
-                }
-            }
-		}
-    }
-?>
+<?php
+    /**
+     * @class  documentModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief model class of the module document
+     **/
+
+    class documentModel extends document {
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief document checked the permissions on the session values
+         **/
+        function isGranted($document_srl) {
+            return $_SESSION['own_document'][$document_srl];
+        }
+
+        /**
+         * @brief extra variables for each article will not be processed bulk select and apply the macro city
+         **/
+        function setToAllDocumentExtraVars() {
+            static $checked_documents = array();
+            // XE XE_DOCUMENT_LIST all documents that the object referred to the global variable settings
+            if(!count($GLOBALS['XE_DOCUMENT_LIST'])) return;
+            // Find all called the document object variable has been set extension
+            $document_srls = array();
+            foreach($GLOBALS['XE_DOCUMENT_LIST'] as $key => $val) {
+                if(!$val->document_srl || $checked_documents[$val->document_srl]) continue;
+                $checked_documents[$val->document_srl] = true;
+                $document_srls[] = $val->document_srl;
+            }
+            // If the document number, return detected
+            if(!count($document_srls)) return;
+            // Expand variables mijijeongdoen article about a current visitor to the extension of the language code, the search variable
+            $obj->document_srl = implode(',',$document_srls);
+            $output = executeQueryArray('document.getDocumentExtraVars', $obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    if(!isset($val->value)) continue;
+                    if(!$extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0]) $extra_vars[$val->module_srl][$val->document_srl][$val->var_idx][0] = trim($val->value);
+                    $extra_vars[$val->document_srl][$val->var_idx][$val->lang_code] = trim($val->value);
+                }
+            }
+
+            $user_lang_code = Context::getLangType();
+            for($i=0,$c=count($document_srls);$i<$c;$i++) {
+                $document_srl = $document_srls[$i];
+                unset($vars);
+
+                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] || !is_object($GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) || !$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->isExists()) continue;
+
+                $module_srl = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('module_srl');
+                $extra_keys = $this->getExtraKeys($module_srl);
+                $vars = $extra_vars[$document_srl];
+                $document_lang_code = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->get('lang_code');
+                // Expand the variable processing
+                if(count($extra_keys)) {
+                foreach($extra_keys as $idx => $key) {
+                        $val = $vars[$idx];
+                        if(isset($val[$user_lang_code])) $v = $val[$user_lang_code];
+                        else if(isset($val[$document_lang_code])) $v = $val[$document_lang_code];
+                        else if(isset($val[0])) $v = $val[0];
+                        else $v = null;
+                        $extra_keys[$idx]->value = $v;
+                    }
+                }
+
+                unset($evars);
+                $evars = new ExtraVar($module_srl);
+                $evars->setExtraVarKeys($extra_keys);
+                // Title Processing
+                if($vars[-1][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('title',$vars[-1][$user_lang_code]);
+                // Information processing
+                if($vars[-2][$user_lang_code]) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->add('content',$vars[-2][$user_lang_code]);
+
+                if($vars[-1][$user_lang_code] || $vars[-2][$user_lang_code]){
+					unset($checked_documents[$document_srl]);
+				}
+
+                $GLOBALS['XE_EXTRA_VARS'][$document_srl] = $evars->getExtraVars();
+            }
+        }
+
+        /**
+         * @brief Import Document
+         **/
+        function getDocument($document_srl=0, $is_admin = false, $load_extra_vars=true, $columnList = array()) {
+            if(!$document_srl) return new documentItem();
+
+            if(!isset($GLOBALS['XE_DOCUMENT_LIST'][$document_srl])) {
+                $oDocument = new documentItem($document_srl, $load_extra_vars, $columnList);
+                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+                if($load_extra_vars) $this->setToAllDocumentExtraVars();
+            }
+            if($is_admin) $GLOBALS['XE_DOCUMENT_LIST'][$document_srl]->setGrant();
+
+            return $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
+        }
+
+        /**
+         * @brief Bringing multiple documents (or paging)
+         **/
+        function getDocuments($document_srls, $is_admin = false, $load_extra_vars=true, $columnList = array()) {
+            if(is_array($document_srls)) {
+                $list_count = count($document_srls);
+                $document_srls = implode(',',$document_srls);
+            } else {
+                $list_count = 1;
+            }
+            $args->document_srls = $document_srls;
+            $args->list_count = $list_count;
+            $args->order_type = 'asc';
+
+            $output = executeQuery('document.getDocuments', $args, $columnList);
+            $document_list = $output->data;
+            if(!$document_list) return;
+            if(!is_array($document_list)) $document_list = array($document_list);
+
+            $document_count = count($document_list);
+            foreach($document_list as $key => $attribute) {
+                $document_srl = $attribute->document_srl;
+                if(!$document_srl) continue;
+
+                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) {
+                    $oDocument = null;
+                    $oDocument = new documentItem();
+                    $oDocument->setAttribute($attribute, false);
+                    if($is_admin) $oDocument->setGrant();
+                    $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+                }
+
+                $result[$attribute->document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
+            }
+
+			if($load_extra_vars) $this->setToAllDocumentExtraVars();
+
+            $output = null;
+            if(count($result)) {
+                foreach($result as $document_srl => $val) {
+                    $output[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
+                }
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief module_srl value, bringing the list of documents
+         **/
+        function getDocumentList($obj, $except_notice = false, $load_extra_vars=true, $columnList = array()) {
+            $sort_check = $this->_setSortIndex($obj, $load_extra_vars);
+            $obj->sort_index = $sort_check->sort_index; 
+        	// cache controll
+			$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+				$object_key = 'object:'.$obj->module_srl.'_category_srl:'.$obj->category_srl.'_list_count:'.$obj->list_count.'_search_target:'.$obj->search_target.'_search_keyword:'.$obj->search_keyword.'_page'.$obj->page.'_sort_index:'.$obj->sort_index;
+				$cache_key = $oCacheHandler->getGroupKey('documentList', $object_key);
+                                $output = $oCacheHandler->get($cache_key);
+			}
+        	if(!$output){
+
+				$logged_info = Context::get('logged_info');
+				$sort_check = $this->_setSortIndex($obj, $load_extra_vars);
+
+				$obj->sort_index = $sort_check->sort_index;
+				// Check the target and sequence alignment
+				if(!in_array($obj->order_type, array('desc','asc'))) $obj->order_type = 'asc';
+				// If that came across mid module_srl instead of a direct module_srl guhaejum
+				if($obj->mid) {
+					$oModuleModel = &getModel('module');
+					$obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+					unset($obj->mid);
+				}
+				// Module_srl passed the array may be a check whether the array
+				if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+				else $args->module_srl = $obj->module_srl;
+				// Except for the test module_srl
+				if(is_array($obj->exclude_module_srl)) $args->exclude_module_srl = implode(',', $obj->exclude_module_srl);
+				else $args->exclude_module_srl = $obj->exclude_module_srl;
+				// Variable check
+				$args->category_srl = $obj->category_srl?$obj->category_srl:null;
+				$args->sort_index = $obj->sort_index;
+				$args->order_type = $obj->order_type;
+				$args->page = $obj->page?$obj->page:1;
+				$args->list_count = $obj->list_count?$obj->list_count:20;
+				$args->page_count = $obj->page_count?$obj->page_count:10;
+				$args->start_date = $obj->start_date?$obj->start_date:null;
+				$args->end_date = $obj->end_date?$obj->end_date:null;
+				$args->member_srl = $obj->member_srl;
+
+				// only admin document list, temp document showing
+				if($obj->statusList) $args->statusList = $obj->statusList;
+				else
+				{
+					if($logged_info->is_admin == 'Y' && !$obj->module_srl)
+						$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'), $this->getConfigStatus('temp'));
+					else
+						$args->statusList = array($this->getConfigStatus('secret'), $this->getConfigStatus('public'));
+				}
+
+				// Category is selected, further sub-categories until all conditions
+				if($args->category_srl) {
+					$category_list = $this->getCategoryList($args->module_srl);
+					$category_info = $category_list[$args->category_srl];
+					$category_info->childs[] = $args->category_srl;
+					$args->category_srl = implode(',',$category_info->childs);
+				}
+				// Used to specify the default query id (based on several search options to query id modified)
+				$query_id = 'document.getDocumentList';
+				// If the search by specifying the document division naeyonggeomsaekil processed for
+				$use_division = false;
+
+				// Search options
+				$searchOpt->search_target = $obj->search_target;
+				$searchOpt->search_keyword = $obj->search_keyword;
+				$this->_setSearchOption($searchOpt, $args, $query_id, $use_division);
+
+				if ($sort_check->isExtraVars)
+				{
+					$query_id = 'document.getDocumentListExtraSort';
+					$output = executeQueryArray($query_id, $args);
+				}
+				else
+				{
+					/**
+					 * list_order asc sort of division that can be used only when
+					 **/
+					if($args->sort_index != 'list_order' || $args->order_type != 'asc') $use_division = false;
+
+					/**
+					 * If it is true, use_division changed to use the document division
+					 **/
+					if($use_division) {
+						// Division begins
+						$division = (int)Context::get('division');
+
+						// order by list_order and (module_srl===0 or module_srl many count), therefore case table full scan
+						if($args->sort_index == 'list_order' && ((int)$args->exclude_module_srl === 0 || count($args->module_srl) > 10))
+						{
+							$listSqlID = 'document.getDocumentListUseIndex';
+							$divisionSqlID = 'document.getDocumentDivisionUseIndex';
+						}
+						else
+						{
+							$listSqlID = 'document.getDocumentList';
+							$divisionSqlID = 'document.getDocumentDivision';
+						}
+
+						// If you do not value the best division top
+						if(!$division) {
+							$division_args->module_srl = $args->module_srl;
+							$division_args->exclude_module_srl = $args->exclude_module_srl;
+							$division_args->list_count = 1;
+							$division_args->sort_index = $args->sort_index;
+							$division_args->order_type = $args->order_type;
+							$division_args->statusList = $args->statusList;
+							$output = executeQuery($listSqlID, $division_args, $columnList);
+							if($output->data) {
+								$item = array_pop($output->data);
+								$division = $item->list_order;
+							}
+							$division_args = null;
+						}
+						// The last division
+						$last_division = (int)Context::get('last_division');
+						// Division after division from the 5000 value of the specified Wanted
+						if(!$last_division) {
+							$last_division_args->module_srl = $args->module_srl;
+							$last_division_args->exclude_module_srl = $args->exclude_module_srl;
+							$last_division_args->list_count = 1;
+							$last_division_args->sort_index = $args->sort_index;
+							$last_division_args->order_type = $args->order_type;
+							$last_division_args->list_order = $division;
+							$last_division_args->page = 5001;
+							$output = executeQuery($divisionSqlID, $last_division_args, $columnList);
+							if($output->data) {
+								$item = array_pop($output->data);
+								$last_division = $item->list_order;
+							}
+						}
+						// Make sure that after last_division article
+						if($last_division) {
+							$last_division_args = null;
+							$last_division_args->module_srl = $args->module_srl;
+							$last_division_args->exclude_module_srl = $args->exclude_module_srl;
+							$last_division_args->list_order = $last_division;
+							$output = executeQuery("document.getDocumentDivisionCount", $last_division_args);
+							if($output->data->count<1) $last_division = null;
+						}
+
+						$args->division = $division;
+						$args->last_division = $last_division;
+						Context::set('division', $division);
+						Context::set('last_division', $last_division);
+					}
+					// document.getDocumentList query execution
+					// Query_id if you have a group by clause getDocumentListWithinTag getDocumentListWithinComment or used again to perform the query because
+					if(in_array($query_id, array('document.getDocumentListWithinComment', 'document.getDocumentListWithinTag'))) {
+						$group_args = clone($args);
+						$group_args->sort_index = 'documents.'.$args->sort_index;
+						$output = executeQueryArray($query_id, $group_args);
+						if(!$output->toBool()||!count($output->data)) return $output;
+
+						foreach($output->data as $key => $val) {
+							if($val->document_srl) $target_srls[] = $val->document_srl;
+						}
+
+						$page_navigation = $output->page_navigation;
+						$keys = array_keys($output->data);
+						$virtual_number = $keys[0];
+
+						$target_args->document_srls = implode(',',$target_srls);
+						$target_args->list_order = $args->sort_index;
+						$target_args->order_type = $args->order_type;
+						$target_args->list_count = $args->list_count;
+						$target_args->page = 1;
+						$output = executeQueryArray('document.getDocuments', $target_args);
+						$output->page_navigation = $page_navigation;
+						$output->total_count = $page_navigation->total_count;
+						$output->total_page = $page_navigation->total_page;
+						$output->page = $page_navigation->cur_page;
+					} else {
+						$output = executeQueryArray($query_id, $args, $columnList);
+					}
+				}
+				// Return if no result or an error occurs
+				if(!$output->toBool()||!count($output->data)) return $output;
+
+				$idx = 0;
+				$data = $output->data;
+				unset($output->data);
+
+				if(!isset($virtual_number))
+				{
+					$keys = array_keys($data);
+					$virtual_number = $keys[0];
+				}
+
+				if($except_notice) {
+					foreach($data as $key => $attribute) {
+						if($attribute->is_notice == 'Y') $virtual_number --;
+					}
+				}
+
+				foreach($data as $key => $attribute) {
+					if($except_notice && $attribute->is_notice == 'Y') continue;
+					$document_srl = $attribute->document_srl;
+					if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) {
+						$oDocument = null;
+						$oDocument = new documentItem();
+						$oDocument->setAttribute($attribute, false);
+						if($is_admin) $oDocument->setGrant();
+						$GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+					}
+
+					$output->data[$virtual_number] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
+					$virtual_number --;
+
+				}
+
+				if($load_extra_vars) $this->setToAllDocumentExtraVars();
+
+				if(count($output->data)) {
+					foreach($output->data as $number => $document) {
+						$output->data[$number] = $GLOBALS['XE_DOCUMENT_LIST'][$document->document_srl];
+					}
+				}
+				//insert in cache
+				if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+			}
+
+            return $output;
+        }
+
+        /**
+         * @brief module_srl value, bringing the document's gongjisa Port
+         **/
+        function getNoticeList($obj, $columnList = array()) {
+            $args->module_srl = $obj->module_srl;
+            $args->category_srl= $obj->category_srl;
+            $output = executeQueryArray('document.getNoticeList', $args, $columnList);
+            if(!$output->toBool()||!$output->data) return;
+
+            foreach($output->data as $key => $val) {
+                $document_srl = $val->document_srl;
+                if(!$document_srl) continue;
+
+                if(!$GLOBALS['XE_DOCUMENT_LIST'][$document_srl]) {
+                    $oDocument = null;
+                    $oDocument = new documentItem();
+                    $oDocument->setAttribute($val, false);
+                    $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+                }
+                $result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
+            }
+            $this->setToAllDocumentExtraVars();
+
+            foreach($result->data as $document_srl => $val) {
+                $result->data[$document_srl] = $GLOBALS['XE_DOCUMENT_LIST'][$document_srl];
+            }
+
+            return $result;
+        }
+
+        /**
+         * @brief function to retrieve the key values of the extended variable document
+         * $Form_include: writing articles whether to add the necessary extensions of the variable input form
+         **/
+        function getExtraKeys($module_srl) {
+            if(is_null($GLOBALS['XE_EXTRA_KEYS'][$module_srl])) {
+                $oExtraVar = &ExtraVar::getInstance($module_srl);
+                $obj->module_srl = $module_srl;
+                $obj->sort_index = 'var_idx';
+                $obj->order = 'asc';
+                $output = executeQueryArray('document.getDocumentExtraKeys', $obj);
+                $oExtraVar->setExtraVarKeys($output->data);
+                $keys = $oExtraVar->getExtraVars();
+                if(!$keys) $keys = array();
+                $GLOBALS['XE_EXTRA_KEYS'][$module_srl] = $keys;
+            }
+
+            return $GLOBALS['XE_EXTRA_KEYS'][$module_srl];
+        }
+
+        /**
+         * @brief A particular document to get the value of the extra variable function
+         **/
+        function getExtraVars($module_srl, $document_srl) {
+            if(!isset($GLOBALS['XE_EXTRA_VARS'][$document_srl])) {
+                // Extended to extract the values of variables set
+                $oDocument = $this->getDocument($document_srl, false);
+                $GLOBALS['XE_DOCUMENT_LIST'][$document_srl] = $oDocument;
+                $this->setToAllDocumentExtraVars();
+            }
+            if(is_array($GLOBALS['XE_EXTRA_VARS'][$document_srl])) ksort($GLOBALS['XE_EXTRA_VARS'][$document_srl]);
+            return $GLOBALS['XE_EXTRA_VARS'][$document_srl];
+        }
+
+        /**
+         * @brief Show pop-up menu of the selected posts
+         *
+         * Printing, scrap, recommendations and negative, reported the Add Features
+         **/
+        function getDocumentMenu() {
+            // Post number and the current login information requested Wanted
+            $document_srl = Context::get('target_srl');
+            $mid = Context::get('cur_mid');
+            $logged_info = Context::get('logged_info');
+            $act = Context::get('cur_act');
+            // to menu_list "pyosihalgeul, target, url" put into an array
+            $menu_list = array();
+            // call trigger
+            ModuleHandler::triggerCall('document.getDocumentMenu', 'before', $menu_list);
+
+            $oDocumentController = &getController('document');
+            // Members must be a possible feature
+            if($logged_info->member_srl) {
+
+				$oDocumentModel = &getModel('document');
+				$columnList = array('document_srl', 'module_srl', 'member_srl', 'ipaddress');
+				$oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
+				$module_srl = $oDocument->get('module_srl');
+				$member_srl = $oDocument->get('member_srl');
+				if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+
+				$oModuleModel = &getModel('module');
+				$document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
+				if($document_config->use_vote_up!='N' && $member_srl!=$logged_info->member_srl){
+					// Add a Referral Button
+					$url = sprintf("doCallModuleAction('document','procDocumentVoteUp','%s')", $document_srl);
+					$oDocumentController->addDocumentPopupMenu($url,'cmd_vote','','javascript');
+				}
+
+				if($document_config->use_vote_down!='N' && $member_srl!=$logged_info->member_srl){
+					// Add button to negative
+					$url= sprintf("doCallModuleAction('document','procDocumentVoteDown','%s')", $document_srl);
+					$oDocumentController->addDocumentPopupMenu($url,'cmd_vote_down','','javascript');
+				}
+
+                // Adding Report
+                $url = sprintf("doCallModuleAction('document','procDocumentDeclare','%s')", $document_srl);
+                $oDocumentController->addDocumentPopupMenu($url,'cmd_declare','','javascript');
+
+                // Add Bookmark button
+                $url = sprintf("doCallModuleAction('member','procMemberScrapDocument','%s')", $document_srl);
+                $oDocumentController->addDocumentPopupMenu($url,'cmd_scrap','','javascript');
+            }
+            // Add print button
+            $url = getUrl('','module','document','act','dispDocumentPrint','document_srl',$document_srl);
+            $oDocumentController->addDocumentPopupMenu($url,'cmd_print','','printDocument');
+            // Call a trigger (after)
+            ModuleHandler::triggerCall('document.getDocumentMenu', 'after', $menu_list);
+            // If you are managing to find posts by ip
+            if($logged_info->is_admin == 'Y') {
+                $oDocumentModel = &getModel('document');
+                $oDocument = $oDocumentModel->getDocument($document_srl);	//before setting document recycle
+
+                if($oDocument->isExists()) {
+                    // Find a post equivalent to ip address
+                    $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','ipaddress','search_keyword',$oDocument->getIpAddress());
+                    $oDocumentController->addDocumentPopupMenu($url,'cmd_search_by_ipaddress',$icon_path,'TraceByIpaddress');
+
+                    $url = sprintf("var params = new Array(); params['ipaddress']='%s'; exec_xml('spamfilter', 'procSpamfilterAdminInsertDeniedIP', params, completeCallModuleAction)", $oDocument->getIpAddress());
+                    $oDocumentController->addDocumentPopupMenu($url,'cmd_add_ip_to_spamfilter','','javascript');
+                }
+            }
+            // Changing the language of pop-up menu
+            $menus = Context::get('document_popup_menu_list');
+            $menus_count = count($menus);
+            for($i=0;$i<$menus_count;$i++) {
+                $menus[$i]->str = Context::getLang($menus[$i]->str);
+            }
+            // Wanted to finally clean pop-up menu list
+            $this->add('menus', $menus);
+        }
+
+        /**
+         * @brief module_srl the total number of documents that are bringing
+         **/
+        function getDocumentCount($module_srl, $search_obj = NULL) {
+            // Additional search options
+            $args->module_srl = $module_srl;
+            $args->s_title = $search_obj->s_title;
+            $args->s_content = $search_obj->s_content;
+            $args->s_user_name = $search_obj->s_user_name;
+            $args->s_member_srl = $search_obj->s_member_srl;
+            $args->s_ipaddress = $search_obj->s_ipaddress;
+            $args->s_regdate = $search_obj->s_regdate;
+            $args->category_srl = $search_obj->category_srl;
+
+            $output = executeQuery('document.getDocumentCount', $args);
+            // Return total number of
+            $total_count = $output->data->count;
+            return (int)$total_count;
+        }
+
+        /**
+         * @brief module_srl the total number of documents that are bringing
+         **/
+        function getDocumentCountByGroupStatus($search_obj = NULL) {
+            // Additional search options
+            $args->module_srl = $search_obj->module_srl;
+            $args->s_title = $search_obj->s_title;
+            $args->s_content = $search_obj->s_content;
+            $args->s_user_name = $search_obj->s_user_name;
+            $args->s_member_srl = $search_obj->s_member_srl;
+            $args->s_ipaddress = $search_obj->s_ipaddress;
+            $args->s_regdate = $search_obj->s_regdate;
+            $args->category_srl = $search_obj->category_srl;
+
+            $output = executeQuery('document.getDocumentCountByGroupStatus', $args);
+			if(!$output->toBool()) return array();
+
+			return $output->data;
+        }
+        /**
+         * @brief Import page of the document, module_srl Without throughout ..
+         **/
+        function getDocumentPage($oDocument, $opt) {
+            // Sort type changes depending on the query args
+            switch($opt->sort_index) {
+                case 'update_order' :
+                        if($opt->order_type == 'desc') $args->rev_update_order = $oDocument->get('update_order');
+                        else $args->update_order = $oDocument->get('update_order');
+                    break;
+                case 'regdate' :
+                        if($opt->order_type == 'asc') $args->rev_regdate = $oDocument->get('regdate');
+                        else $args->regdate = $oDocument->get('regdate');
+                    break;
+                case 'voted_count' :
+                case 'readed_count' :
+                case 'comment_count' :
+                case 'title' :
+                        return 1;
+                    break;
+                default :
+                        if($opt->order_type == 'desc') $args->rev_list_order = $oDocument->get('list_order');
+                        else $args->list_order = $oDocument->get('list_order');
+                    break;
+            }
+            $args->module_srl = $oDocument->get('module_srl');
+            $args->sort_index = $opt->sort_index;
+            $args->order_type = $opt->order_type;
+
+            // Guhanhu total number of the article search page
+            $output = executeQuery('document.getDocumentPage', $args);
+            $count = $output->data->count;
+            $page = (int)(($count-1)/$opt->list_count)+1;
+            return $page;
+        }
+
+        /**
+         * @brief Imported Category of information
+         **/
+        function getCategory($category_srl, $columnList = array()) {
+            $args->category_srl = $category_srl;
+            $output = executeQuery('document.getCategory', $args, $columnList);
+
+            $node = $output->data;
+            if(!$node) return;
+
+            if($node->group_srls) {
+                $group_srls = explode(',',$node->group_srls);
+                unset($node->group_srls);
+                $node->group_srls = $group_srls;
+            } else {
+                unset($node->group_srls);
+                $node->group_srls = array();
+            }
+            return $node;
+        }
+
+        /**
+         * @brief Check whether the child has a specific category
+         **/
+        function getCategoryChlidCount($category_srl) {
+            $args->category_srl = $category_srl;
+            $output = executeQuery('document.getChildCategoryCount',$args);
+            if($output->data->count > 0) return true;
+            return false;
+        }
+
+        /**
+         * @brief Bringing the Categories list the specific module
+         * Speed and variety of categories, considering the situation created by the php script to include a list of the must, in principle, to use
+         **/
+        function getCategoryList($module_srl, $columnList = array()) {
+            // Category of the target module file swollen
+            $filename = sprintf("./files/cache/document_category/%s.php", $module_srl);
+            // If the target file to the cache file regeneration category
+            if(!file_exists($filename)) {
+                $oDocumentController = &getController('document');
+                if(!$oDocumentController->makeCategoryFile($module_srl)) return array();
+            }
+
+            @include($filename);
+            // Cleanup of category
+            $document_category = array();
+            $this->_arrangeCategory($document_category, $menu->list, 0);
+            return $document_category;
+        }
+
+        /**
+         * @brief Category within a primary method to change the array type
+         **/
+        function _arrangeCategory(&$document_category, $list, $depth) {
+            if(!count($list)) return;
+            $idx = 0;
+            $list_order = array();
+            foreach($list as $key => $val) {
+                $obj = null;
+                $obj->mid = $val['mid'];
+                $obj->module_srl = $val['module_srl'];
+                $obj->category_srl = $val['category_srl'];
+                $obj->parent_srl = $val['parent_srl'];
+                $obj->title = $obj->text = $val['text'];
+                $obj->description = $val['description'];
+                $obj->expand = $val['expand']=='Y'?true:false;
+                $obj->color = $val['color'];
+                $obj->document_count = $val['document_count'];
+                $obj->depth = $depth;
+                $obj->child_count = 0;
+                $obj->childs = array();
+                $obj->grant = $val['grant'];
+
+                if(Context::get('mid') == $obj->mid && Context::get('category') == $obj->category_srl) $selected = true;
+                else $selected = false;
+
+                $obj->selected = $selected;
+
+                $list_order[$idx++] = $obj->category_srl;
+                // If you have a parent category of child nodes apply data
+                if($obj->parent_srl) {
+
+                    $parent_srl = $obj->parent_srl;
+                    $document_count = $obj->document_count;
+                    $expand = $obj->expand;
+                    if($selected) $expand = true;
+
+                    while($parent_srl) {
+                        $document_category[$parent_srl]->document_count += $document_count;
+                        $document_category[$parent_srl]->childs[] = $obj->category_srl;
+                        $document_category[$parent_srl]->child_count = count($document_category[$parent_srl]->childs);
+                        if($expand) $document_category[$parent_srl]->expand = $expand;
+
+                        $parent_srl = $document_category[$parent_srl]->parent_srl;
+                    }
+                }
+
+                $document_category[$key] = $obj;
+
+                if(count($val['list'])) $this->_arrangeCategory($document_category, $val['list'], $depth+1);
+            }
+            $document_category[$list_order[0]]->first = true;
+            $document_category[$list_order[count($list_order)-1]]->last = true;
+        }
+
+        /**
+         * @brief Wanted number of documents belonging to category
+         **/
+        function getCategoryDocumentCount($module_srl, $category_srl) {
+            $args->module_srl = $module_srl;
+            $args->category_srl = $category_srl;
+            $output = executeQuery('document.getCategoryDocumentCount', $args);
+            return (int)$output->data->count;
+        }
+
+        /**
+         * @brief Xml cache file of the document category return information
+         **/
+        function getCategoryXmlFile($module_srl) {
+            $xml_file = sprintf('files/cache/document_category/%s.xml.php',$module_srl);
+            if(!file_exists($xml_file)) {
+                $oDocumentController = &getController('document');
+                $oDocumentController->makeCategoryFile($module_srl);
+            }
+            return $xml_file;
+        }
+
+        /**
+         * @brief Php cache files in the document category return information
+         **/
+        function getCategoryPhpFile($module_srl) {
+            $php_file = sprintf('files/cache/document_category/%s.php',$module_srl);
+            if(!file_exists($php_file)) {
+                $oDocumentController = &getController('document');
+                $oDocumentController->makeCategoryFile($module_srl);
+            }
+            return $php_file;
+        }
+
+        /**
+         * @brief Imported post monthly archive status
+         **/
+        function getMonthlyArchivedList($obj) {
+            if($obj->mid) {
+                $oModuleModel = &getModel('module');
+                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+                unset($obj->mid);
+            }
+            // Module_srl passed the array may be a check whether the array
+            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+
+            $output = executeQuery('document.getMonthlyArchivedList', $args);
+            if(!$output->toBool()||!$output->data) return $output;
+
+            if(!is_array($output->data)) $output->data = array($output->data);
+
+            return $output;
+        }
+
+        /**
+         * @brief Bringing a month on the status of the daily posts
+         **/
+        function getDailyArchivedList($obj) {
+            if($obj->mid) {
+                $oModuleModel = &getModel('module');
+                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+                unset($obj->mid);
+            }
+            // Module_srl passed the array may be a check whether the array
+            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+            $args->regdate = $obj->regdate;
+
+            $output = executeQuery('document.getDailyArchivedList', $args);
+            if(!$output->toBool()) return $output;
+
+            if(!is_array($output->data)) $output->data = array($output->data);
+
+            return $output;
+        }
+
+        /**
+         * @brief Get a list for a particular module
+         **/
+        function getDocumentCategories() {
+            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+            $module_srl = Context::get('module_srl');
+            $categories= $this->getCategoryList($module_srl);
+            $lang = Context::get('lang');
+            // No additional category
+            $output = "0,0,{$lang->none_category}\n";
+            if($categories){
+                foreach($categories as $category_srl => $category) {
+                    $output .= sprintf("%d,%d,%s\n",$category_srl, $category->depth,$category->title);
+                }
+            }
+            $this->add('categories', $output);
+        }
+
+        /**
+         * @brief Wanted to set document information
+         **/
+        function getDocumentConfig() {
+            if(!$GLOBALS['__document_config__']) {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('document');
+                if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
+                $GLOBALS['__document_config__'] = $config;
+            }
+            return $GLOBALS['__document_config__'];
+        }
+
+        /**
+         * @brief Common:: Module extensions of variable management
+         * Expansion parameter management module in the document module instance, when using all the modules available
+         **/
+        function getExtraVarsHTML($module_srl) {
+            // Bringing existing extra_keys
+            $extra_keys = $this->getExtraKeys($module_srl);
+            Context::set('extra_keys', $extra_keys);
+			$security = new Security();
+			$security->encodeHTML('extra_keys..name','extra_keys..eid');
+
+			// Get information of module_grants
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'extra_keys');
+        }
+
+        /**
+         * @brief Common:: Category parameter management module
+         **/
+        function getCategoryHTML($module_srl) {
+            $category_xml_file = $this->getCategoryXmlFile($module_srl);
+
+            Context::set('category_xml_file', $category_xml_file);
+
+			Context::loadJavascriptPlugin('ui.tree');
+            // Get information of module_grants
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'category_list');
+        }
+
+        /**
+         * @brief Certain categories of information, return the template guhanhu
+         * Manager on the page to add information about a particular menu from the server after compiling tpl compiled a direct return html
+         **/
+        function getDocumentCategoryTplInfo() {
+            $oModuleModel = &getModel('module');
+            $oMemberModel = &getModel('member');
+            // Get information on the menu for the parameter settings
+            $module_srl = Context::get('module_srl');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            // Check permissions
+            $grant = $oModuleModel->getGrant($module_info, Context::get('logged_info'));
+            if(!$grant->manager) return new Object(-1,'msg_not_permitted');
+
+            $category_srl = Context::get('category_srl');
+            $parent_srl = Context::get('parent_srl');
+            // Get a list of member groups
+            $group_list = $oMemberModel->getGroups($module_info->site_srl);
+            Context::set('group_list', $group_list);
+            // Without the sub-menu has parent_srl category_srl chugaim
+            if(!$category_srl && $parent_srl) {
+                // Get information of the parent menu
+                $parent_info = $this->getCategory($parent_srl);
+                // Default parameter settings for a new menu
+                $category_info->category_srl = getNextSequence();
+                $category_info->parent_srl = $parent_srl;
+                $category_info->parent_category_title = $parent_info->title;
+            // Add to the root menu, or if an existing menu Modified
+            } else {
+                // If category_srl the menu brings the information
+                if($category_srl) $category_info = $this->getCategory($category_srl);
+            }
+
+
+            $category_info->title = htmlspecialchars($category_info->title);
+            Context::set('category_info', $category_info);
+
+			$security = new Security();
+			$security->encodeHTML('group_list..title');
+
+            // tpl template file directly compile and will return a variable and puts it on.
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile('./modules/document/tpl', 'category_info');
+            $tpl = str_replace("\n",'',$tpl);
+            // Changing user-defined language
+            $oModuleController = &getController('module');
+            $oModuleController->replaceDefinedLangCode($tpl);
+            // set of variables to return
+            $this->add('tpl', $tpl);
+        }
+
+
+        function getDocumentSrlByAlias($mid, $alias)
+        {
+            if(!$mid || !$alias) return null;
+            $site_module_info = Context::get('site_module_info');
+            $args->mid = $mid;
+            $args->alias_title = $alias;
+            $args->site_srl = $site_module_info->site_srl;
+            $output = executeQuery('document.getDocumentSrlByAlias', $args);
+            if(!$output->data) return null;
+            else return $output->data->document_srl;
+        }
+
+		function getAlias($document_srl){
+			if(!$document_srl) return null;
+			$args->document_srl = $document_srl;
+			$output = executeQueryArray('document.getAliases', $args);
+
+            if(!$output->data) return null;
+			else return $output->data[0]->alias_title;
+		}
+
+        function getHistories($document_srl, $list_count, $page)
+        {
+            $args->list_count = $list_count;
+            $args->page = $page;
+            $args->document_srl = $document_srl;
+            $output = executeQueryArray('document.getHistories', $args);
+            return $output;
+        }
+
+        function getHistory($history_srl)
+        {
+            $args->history_srl = $history_srl;
+            $output = executeQuery('document.getHistory', $args);
+            return $output->data;
+        }
+
+        /**
+         * @brief module_srl value, bringing the list of documents
+         **/
+        function getTrashList($obj) {
+            // Variable check
+            $args->category_srl = $obj->category_srl?$obj->category_srl:null;
+            $args->sort_index = $obj->sort_index;
+            $args->order_type = $obj->order_type?$obj->order_type:'desc';
+            $args->page = $obj->page?$obj->page:1;
+            $args->list_count = $obj->list_count?$obj->list_count:20;
+            $args->page_count = $obj->page_count?$obj->page_count:10;
+            // Search options
+            $search_target = $obj->search_target;
+            $search_keyword = $obj->search_keyword;
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'title' :
+                    case 'content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->{"s_".$search_target} = $search_keyword;
+                            $use_division = true;
+                        break;
+                    case 'title_content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_title = $search_keyword;
+                            $args->s_content = $search_keyword;
+                        break;
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                            $args->sort_index = 'documents.'.$args->sort_index;
+                        break;
+                    case 'user_name' :
+                    case 'nick_name' :
+                    case 'email_address' :
+                    case 'homepage' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->{"s_".$search_target} = $search_keyword;
+                        break;
+                    case 'is_notice' :
+                    case 'is_secret' :
+                            if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
+                            elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+                        break;
+                    case 'member_srl' :
+                    case 'readed_count' :
+                    case 'voted_count' :
+                    case 'comment_count' :
+                    case 'trackback_count' :
+                    case 'uploaded_count' :
+                            $args->{"s_".$search_target} = (int)$search_keyword;
+                        break;
+                    case 'regdate' :
+                    case 'last_update' :
+                    case 'ipaddress' :
+                    case 'tag' :
+                            $args->{"s_".$search_target} = $search_keyword;
+                        break;
+                }
+            }
+
+
+			$output = executeQueryArray('document.getTrashList', $args);
+			if($output->data){
+            foreach($output->data as $key => $attribute) {
+				$oDocument = null;
+				$oDocument = new documentItem();
+				$oDocument->setAttribute($attribute, false);
+				$attribute = $oDocument;
+			}
+			}
+            return $output;
+        }
+
+        /**
+         * @brief vote up, vote down member list in Document View page
+         **/
+		function getDocumentVotedMemberList()
+		{
+			$document_srl = Context::get('document_srl');
+			if(!$document_srl) return new Object(-1,'msg_invalid_request');
+
+			$point = Context::get('point');
+			if($point != -1) $point = 1;
+
+			$oDocumentModel = &getModel('document');
+			$columnList = array('document_srl', 'module_srl');
+            $oDocument = $oDocumentModel->getDocument($document_srl, false, false, $columnList);
+			$module_srl = $oDocument->get('module_srl');
+			if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+
+			$oModuleModel = &getModel('module');
+            $document_config = $oModuleModel->getModulePartConfig('document',$module_srl);
+			if($point == -1){
+				if($document_config->use_vote_down!='S') return new Object(-1, 'msg_invalid_request');
+				$args->below_point = 0;
+			}else{
+				if($document_config->use_vote_up!='S') return new Object(-1, 'msg_invalid_request');
+				$args->more_point = 0;
+			}
+
+			$args->document_srl = $document_srl;
+
+			$output = executeQueryArray('document.getVotedMemberList',$args);
+			if(!$output->toBool()) return $output;
+
+			$oMemberModel = &getModel('member');
+			if($output->data){
+				foreach($output->data as $k => $d){
+					$profile_image = $oMemberModel->getProfileImage($d->member_srl);
+					$output->data[$k]->src = $profile_image->src;
+				}
+			}
+
+			$this->add('voted_member_list',$output->data);
+		}
+
+		function getStatusNameList()
+		{
+			global $lang;
+			if(!isset($lang->status_name_list))
+				return array_flip($this->getStatusList());
+			else return $lang->status_name_list;
+		}
+
+		function _setSortIndex($obj, $load_extra_vars)
+		{
+			$sortIndex = $obj->sort_index;
+			$isExtraVars = false;
+            if(!in_array($sortIndex, array('list_order','regdate','last_update','update_order','readed_count','voted_count','comment_count','trackback_count','uploaded_count','title','category_srl')))
+			{
+				// get module_srl extra_vars list
+				if ($load_extra_vars)
+				{
+					$extra_args->module_srl = $obj->module_srl;
+					$extra_output = executeQueryArray('document.getGroupsExtraVars', $extra_args);
+					if (!$extra_output->data || !$extra_output->toBool())
+					{
+						$sortIndex = 'list_order';
+					}
+					else
+					{
+						$check_array = array();
+						foreach($extra_output->data as $val){
+							$check_array[] = $val->eid;
+						}
+						if(!in_array($sortIndex, $check_array)) $sortIndex = 'list_order';
+						else $isExtraVars = true;
+					}
+				}
+				else
+					$sortIndex = 'list_order';
+			}
+			$returnObj->sort_index = $sortIndex;
+			$returnObj->isExtraVars = $isExtraVars;
+
+			return $returnObj;
+		}
+
+        /**
+         * @brief 게시물 목록의 검색 옵션을 Setting함(2011.03.08 - cherryfilter)
+		 * page변수가 없는 상태에서 page 값을 알아오는 method(getDocumentPage)는 검색하지 않은 값을 return해서 검색한 값을 가져오도록 검색옵션이 추가 됨.
+		 * 검색옵션의 중복으로 인해 private method로 별도 분리
+         **/
+		function _setSearchOption($searchOpt, &$args, &$query_id, &$use_division)
+		{
+			$search_target = $searchOpt->search_target;
+			$search_keyword = $searchOpt->search_keyword;
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'title' :
+                    case 'content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->{"s_".$search_target} = $search_keyword;
+                            $use_division = true;
+                        break;
+                    case 'title_content' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_title = $search_keyword;
+                            $args->s_content = $search_keyword;
+                            $use_division = true;
+                        break;
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                            $args->sort_index = 'documents.'.$args->sort_index;
+                        break;
+                    case 'user_name' :
+                    case 'nick_name' :
+                    case 'email_address' :
+                    case 'homepage' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->{"s_".$search_target} = $search_keyword;
+                        break;
+                    case 'is_notice' :
+                    case 'is_secret' :
+                            if($search_keyword=='N') $args->statusList = array($this->getConfigStatus('public'));
+                            elseif($search_keyword=='Y') $args->statusList = array($this->getConfigStatus('secret'));
+                            elseif($search_keyword=='temp') $args->statusList = array($this->getConfigStatus('temp'));
+                        break;
+                    case 'member_srl' :
+                    case 'readed_count' :
+                    case 'voted_count' :
+                    case 'comment_count' :
+                    case 'trackback_count' :
+                    case 'uploaded_count' :
+                            $args->{"s_".$search_target} = (int)$search_keyword;
+                        break;
+                    case 'regdate' :
+                    case 'last_update' :
+                    case 'ipaddress' :
+                            $args->{"s_".$search_target} = $search_keyword;
+                        break;
+                    case 'comment' :
+                            $args->s_comment = $search_keyword;
+                            $query_id = 'document.getDocumentListWithinComment';
+                            $use_division = true;
+                        break;
+                    case 'tag' :
+                            $args->s_tags = str_replace(' ','%',$search_keyword);
+                            $query_id = 'document.getDocumentListWithinTag';
+                        break;
+                    default :
+                            if(strpos($search_target,'extra_vars')!==false) {
+                                $args->var_idx = substr($search_target, strlen('extra_vars'));
+                                $args->var_value = str_replace(' ','%',$search_keyword);
+                                $args->sort_index = 'documents.'.$args->sort_index;
+                                $query_id = 'document.getDocumentListWithExtraVars';
+                            }
+                        break;
+                }
+            }
+		}
+    }
+?>
diff --git a/modules/document/document.view.php b/modules/document/document.view.php
index 4e2e3fb81..f0f99eea6 100644
--- a/modules/document/document.view.php
+++ b/modules/document/document.view.php
@@ -1,121 +1,148 @@
-<?php
-    /**
-     * @class  documentView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  document 모듈의 View class
-     **/
-
-    class documentView extends document {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 문서 인쇄 기능
-         * 해당 글만 찾아서 그냥 출력해버린다;;
-         **/
-        function dispDocumentPrint() {
-            // 목록 구현에 필요한 변수들을 가져온다
-            $document_srl = Context::get('document_srl');
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
-
-            // document 객체를 생성. 기본 데이터 구조의 경우 document모듈만 쓰면 만사 해결.. -_-;
-            $oDocumentModel = &getModel('document');
-
-            // 선택된 문서 표시를 위한 객체 생성 
-            $oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
-            if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
-
-            // 권한 체크
-            if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
-
-            // 모듈 정보 세팅
-            Context::set('module_info', $module_info);
-
-            // 브라우저 타이틀 설정
-            Context::setBrowserTitle($oDocument->getTitleText());
-            Context::set('oDocument', $oDocument);
-
-            Context::set('layout','none');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('print_page');
-        }
-
-        /**
-         * @brief 미리 보기
-         **/
-        function dispDocumentPreview() {
-            Context::set('layout','none');
-
-            $content = Context::get('content');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('preview_page');
-        }
-
-        /**
-         * @brief 관리자가 선택한 문서에 대한 관리
-         **/
-        function dispDocumentManageDocument() {
-            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
-
-            // 선택한 목록을 세션에서 가져옴
-            $flag_list = $_SESSION['document_management'];
-            if(count($flag_list)) {
-                foreach($flag_list as $key => $val) {
-                    if(!is_bool($val)) continue;
-                    $document_srl_list[] = $key;
-                }
-            }
-
-            if(count($document_srl_list)) {
-                $oDocumentModel = &getModel('document');
-                $document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
-                Context::set('document_list', $document_list);
-            }
-
-            $oModuleModel = &getModel('module');
-
-            // 모듈 카테고리 목록과 모듈 목록의 조합
-            if(count($module_list)>1) Context::set('module_list', $module_categories);
-
-            // 팝업 레이아웃 선택
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('popup_layout');
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('checked_list');
-        }
-
-        function triggerDispDocumentAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                // 선택된 모듈의 정보를 가져옴
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            $oModuleModel = &getModel('module');
-            if($current_module_srl)
-            {
-                $document_config = $oModuleModel->getModulePartConfig('document', $current_module_srl);
-            }
-            if(!isset($document_config->use_history)) $document_config->use_history = 'N';
-            Context::set('document_config', $document_config);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'document_module_config');
-            $obj .= $tpl;
-            
-            return new Object();
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  documentView
+     * @author NHN (developers@xpressengine.com)
+     * @brief View class of the module document
+     **/
+
+    class documentView extends document {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Document printing
+         * I make it out to find the geulman;;
+         **/
+        function dispDocumentPrint() {
+            // Bring a list of variables needed to implement
+            $document_srl = Context::get('document_srl');
+
+			// module_info not use in UI
+            //$oModuleModel = &getModel('module');
+            //$module_info = $oModuleModel->getModuleInfoByDocumentSrl($document_srl);
+
+            // Create the document object. If the document module of basic data structures, write it all works .. -_-;
+            $oDocumentModel = &getModel('document');
+            // Creates an object for displaying the selected document
+            $oDocument = $oDocumentModel->getDocument($document_srl, $this->grant->manager);
+            if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+            // Check permissions
+            if(!$oDocument->isAccessible()) return new Object(-1,'msg_not_permitted');
+            // Information setting module
+            //Context::set('module_info', $module_info);	//module_info not use in UI
+            // Browser title settings
+            Context::setBrowserTitle($oDocument->getTitleText());
+            Context::set('oDocument', $oDocument);
+
+            Context::set('layout','none');
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('print_page');
+        }
+
+        /**
+         * @brief Preview
+         **/
+        function dispDocumentPreview() {
+            Context::set('layout','none');
+
+            $content = Context::get('content');
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('preview_page');
+        }
+
+        /**
+         * @brief Selected by the administrator for the document management
+         **/
+        function dispDocumentManageDocument() {
+            if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+            // Taken from a list of selected sessions
+            $flag_list = $_SESSION['document_management'];
+            if(count($flag_list)) {
+                foreach($flag_list as $key => $val) {
+                    if(!is_bool($val)) continue;
+                    $document_srl_list[] = $key;
+                }
+            }
+
+            if(count($document_srl_list)) {
+                $oDocumentModel = &getModel('document');
+                $document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
+                Context::set('document_list', $document_list);
+            }
+
+            $oModuleModel = &getModel('module');
+            // The combination of module categories list and the list of modules
+            if(count($module_list)>1) Context::set('module_list', $module_categories);
+            
+            $module_srl=Context::get('module_srl');
+            Context::set('module_srl',$module_srl);
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            Context::set('mid',$module_info->mid);
+            Context::set('browser_title',$module_info->browser_title);
+            
+            
+            // Select Pop-up layout
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('checked_list');
+        }
+
+        function triggerDispDocumentAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // Get information of the current module
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+
+            $oModuleModel = &getModel('module');
+            if($current_module_srl)
+            {
+                $document_config = $oModuleModel->getModulePartConfig('document', $current_module_srl);
+            }
+            if(!isset($document_config->use_history)) $document_config->use_history = 'N';
+            Context::set('document_config', $document_config);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'document_module_config');
+            $obj .= $tpl;
+            
+            return new Object();
+        }
+
+		function dispTempSavedList()
+		{
+            $this->setLayoutFile('popup_layout');
+
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+            // Get the saved document (module_srl is set to member_srl instead)
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+			$args->statusList = array($this->getConfigStatus('temp'));
+            $args->page = (int)Context::get('page');
+            $args->list_count = 10;
+
+            $oDocumentModel = &getModel('document');
+            $output = $oDocumentModel->getDocumentList($args, true);
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('document_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('saved_list_popup');
+		}
+    }
+?>
diff --git a/modules/document/lang/en.lang.php b/modules/document/lang/en.lang.php
deleted file mode 100644
index 4bc6b61de..000000000
--- a/modules/document/lang/en.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Document module's basic language pack
-     **/
-
-    $lang->document_list = 'Documents List';
-    $lang->thumbnail_type = 'Thumbnail Type';
-    $lang->thumbnail_crop = 'Crop';
-    $lang->thumbnail_ratio = 'Ratio';
-    $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
-    $lang->move_target_module = "Target module ";
-    $lang->title_bold = 'Bold';
-    $lang->title_color = 'Color';
-    $lang->new_document_count = 'New documents';
-
-    $lang->parent_category_title = 'Parent Category';
-    $lang->category_title = 'Category';
-    $lang->category_color = 'Category Font Color';
-    $lang->expand = 'Expand';
-    $lang->category_group_srls = 'Accessable Group';
-
-    $lang->cmd_make_child = 'Add Child Category';
-    $lang->cmd_enable_move_category = "Change Category Position (Drag the top menu after selection)";
-
-    $lang->about_category_title = 'Please input category name';
-    $lang->about_expand = 'By selecting this option, it will be always expanded';
-    $lang->about_category_group_srls = 'Only selected group will be able to use current category';
-    $lang->about_category_color = 'You can set font color of category.';
-
-    $lang->cmd_search_next = 'Search Next';
-
-    $lang->cmd_temp_save = 'Temporary Save';
-
-	$lang->cmd_toggle_checked_document = 'Reverse selected items';
-    $lang->cmd_delete_checked_document = 'Delete selected';
-    $lang->cmd_document_do = 'I want to';
-
-    $lang->msg_cart_is_null = 'Please select the articles to delete';
-    $lang->msg_category_not_moved = 'Could not be moved';
-    $lang->msg_is_secret = 'This is a secret article';
-    $lang->msg_checked_document_is_deleted = '%d article(s) was(were) deleted';
-
-    // Search targets in admin page
-        $lang->search_target_list = array(
-        'title' => 'Subject',
-        'content' => 'Content',
-        'user_id' => 'User ID',
-        'member_srl' => 'Member Serial Number',
-        'user_name' => 'User Name',
-        'nick_name' => 'Nickname',
-        'email_address' => 'Email',
-        'homepage' => 'Homepage',
-        'is_notice' => 'Notice',
-        'is_secret' => 'Secret',
-        'tags' => 'Tag',
-        'readed_count' => 'Number of Views (over)',
-        'voted_count' => 'Number of Votes (over)',
-        'comment_count ' => 'Number of Comments (over)',
-        'trackback_count ' => 'Number of Trackbacks (over)',
-        'uploaded_count ' => 'Number of Attachments (over)',
-        'regdate' => 'Date',
-        'last_update' => 'Last Modified Date',
-        'ipaddress' => 'IP Address',
-    );
-
-    $lang->alias = "Alias";
-    $lang->history = "History";
-    $lang->about_use_history = "History can restore documents to previous revisions";
-    $lang->trace_only = "Trace only";
-
-    $lang->cmd_trash = 'Trashcan';
-    $lang->cmd_restore = 'Restore';
-    $lang->cmd_restore_all = 'Restore All';
-
-    $lang->in_trash = 'Trashcan';
-    $lang->trash_nick_name = 'Deleter';
-    $lang->trash_date = 'Deleted date';
-    $lang->trash_description = 'Description';
-
-	$lang->search_target_trash_list = array(
-        'title' => 'Title',
-        'content' => 'Content',
-        'user_id' => 'User ID',
-        'member_srl' => 'Member srl',
-        'user_name' => 'User name',
-        'nick_name' => 'Nickname',
-        'trash_member_srl' => 'Deleter srl',
-        'trash_user_name' => 'Deleter name',
-        'trash_nick_name' => 'Deleter nickname',
-        'trash_date' => 'Deleted date',
-        'trash_ipaddress' => 'Deleter IP address',
-    );
-
-    $lang->success_trashed = "Successfully moved to trashcan";
-    $lang->msg_not_selected_document = 'There is no selected article.';
-	$lang->show_voted_member = 'Show Voters';
-?>
diff --git a/modules/document/lang/es.lang.php b/modules/document/lang/es.lang.php
deleted file mode 100644
index 70c9eeeb4..000000000
--- a/modules/document/lang/es.lang.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/document/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para el módulo de documentos.
-     **/
-
-    $lang->document_list = 'Document list';
-    $lang->thumbnail_type = 'Thumbnail Type';
-    $lang->thumbnail_crop = 'Crop';
-    $lang->thumbnail_ratio = 'Ratio';
-    $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
-    $lang->move_target_module = "Módulo para cambiar de posición";
-    $lang->title_bold = 'Bold';
-    $lang->title_color = 'Color';
-    $lang->new_document_count = '새글';
-
-    $lang->parent_category_title = 'Categoría Superior';
-    $lang->category_title = 'Nombre de la categoría';
-    $lang->category_color = '분류 폰트색깔';
-    $lang->expand = 'Expandir';
-    $lang->category_group_srls = 'Limitar el grupo';
-    $lang->cmd_make_child = 'Agregar sub categoría';
-    $lang->cmd_enable_move_category = "Cambiar la posición de la categoría. (arrastrar y soltar luego de haber selecionado)";
-    $lang->about_category_title = 'Ingresar el nombre de la categoría.';
-    $lang->about_expand = 'Si seleccionas esta opción, siempre estará expandido.';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다';
-    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
-
-    $lang->cmd_search_next = 'Buscar siguiente';
-
-    $lang->cmd_temp_save = 'Guardar Temporales';
-
-	$lang->cmd_toggle_checked_document = 'Invertir los elementos seleccionados';
-    $lang->cmd_delete_checked_document = 'Eliminar lo seleccionado';
-    $lang->cmd_document_do = 'Usted ..';
-
-    $lang->msg_cart_is_null = 'Selecciona el documento que desea eliminar';
-    $lang->msg_category_not_moved = 'No puede se movido';
-    $lang->msg_is_secret = 'Es un documento secreto';
-    $lang->msg_checked_document_is_deleted = 'Total de %d documentos han sido eliminados';
-
-    // Objetivo de búsqueda en la página del administrador
-    $lang->search_target_list = array(
-        'title' => 'Título',
-        'content' => 'Contenido',
-        'user_id' => 'ID',
-        'member_srl' => 'Número del usuario',
-        'user_name' => 'Nombre del usuario',
-        'nick_name' => 'Apodo',
-        'email_address' => 'Correo Electrónico',
-        'homepage' => 'Página web',
-        'is_notice' => 'Aviso',
-        'is_secret' => 'Secreto',
-        'tags' => 'Etiqueta',
-        'readed_count' => 'Número de leídos (sobre)',
-        'voted_count' => 'Número de recomnedados (sobre)',
-        'comment_count ' => 'Número de comentarios (sobre)',
-        'trackback_count ' => 'Número de Trackback (sobre)',
-        'uploaded_count ' => 'Número de archivos adjuntos (sobre)',
-        'regdate' => 'Día del registro',
-        'last_update' => 'Día de la última actualización',
-        'ipaddress' => 'Dirección IP',
-    );
-    $lang->alias = "Alias";
-    $lang->history = "히스토리";
-    $lang->about_use_history = "히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.";
-    $lang->trace_only = "흔적만 남김";
-
-    $lang->cmd_trash = 'Trashcan';
-    $lang->cmd_restore = 'Restore';
-    $lang->cmd_restore_all = 'Restore All';
-
-    $lang->in_trash = 'Trashcan';
-    $lang->trash_nick_name = 'Person who deleted';
-    $lang->trash_date = 'Deleted date';
-    $lang->trash_description = 'Description';
-
-    $lang->success_trashed = "Successfully moved to trashcan";
-    $lang->msg_not_selected_document = '선택된 문서가 없습니다.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/fr.lang.php b/modules/document/lang/fr.lang.php
deleted file mode 100644
index 402957433..000000000
--- a/modules/document/lang/fr.lang.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <Pierreduvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Document
-     **/
-
-    $lang->document_list = 'Liste des Documents';
-    $lang->thumbnail_type = 'Type de la Vignette';
-    $lang->thumbnail_crop = 'Rogner';
-    $lang->thumbnail_ratio = 'Proportion';
-    $lang->cmd_delete_all_thumbnail = 'Supprimer toutes les vignettes';
-    $lang->title_bold = 'Gras';
-    $lang->title_color = 'Couleur';
-    $lang->new_document_count = '새글';
-
-    $lang->parent_category_title = 'catégorie supérieure';
-    $lang->category_title = 'Catégorie';
-    $lang->category_color = '분류 폰트색깔';
-    $lang->expand = 'Etendre';
-    $lang->category_group_srls = 'Groupe Accessible';
-    $lang->cmd_make_child = 'Ajouter une catégorie inférieure';
-    $lang->cmd_enable_move_category = "Bouger la position de la catégorie (Cochez la case et puis glisser la catégorie que vous voulez déplacer)";
-    $lang->about_category_title = 'Entrez le nom de la catégorie, S.V.P.';
-    $lang->about_expand = 'Si vous cochez la case à cocher, ce sera toujours tendu';
-    $lang->about_category_group_srls = 'Le groupe choisi seulement pourra utiliser la catégorie courante';
-    $lang->about_category_color = 'You can set font color of category.';
-
-    $lang->cmd_search_next = 'Recherche Suivante';
-
-    $lang->cmd_temp_save = 'Conserver temporairement';
-
-	$lang->cmd_toggle_checked_document = 'Renverser les choisis';
-    $lang->cmd_delete_checked_document = 'Supprimer les choisis';
-    $lang->cmd_document_do = 'Vous voudriez..';
-
-    $lang->msg_cart_is_null = 'Choisissez les articles à supprimer, S.V.P.';
-    $lang->msg_category_not_moved = 'Ne peut(peuvent) pas être bougé(s)';
-    $lang->msg_is_secret = 'Cet article est secret';
-    $lang->msg_checked_document_is_deleted = '%d article(s) est(sont) supprimé(s)';
-
-    $lang->move_target_module = "Module à déménager";
-
-	// Search targets in admin page
-        $lang->search_target_list = array(
-        'title' => 'Titre',
-        'content' => 'Contenu',
-        'user_id' => 'Compte',
-        'member_srl' => 'Numéro de Série du Membre',
-        'user_name' => 'Nom',
-        'nick_name' => 'Surnom',
-        'email_address' => 'Mél',
-        'homepage' => 'Page d\'accueil',
-        'is_notice' => 'Notice',
-        'is_secret' => 'Secret',
-        'tags' => 'Balises',
-        'readed_count' => 'Vues (surplus)',
-        'voted_count' => 'Recommandés (surplus)',
-        'comment_count ' => 'Commentaires (surplus)',
-        'trackback_count ' => 'Rétroliens (surplus)',
-        'uploaded_count ' => 'Fichiers Attachés (surplus)',
-        'regdate' => 'Enrégistré',
-        'last_update' => 'La Dernière Mise à Jour',
-        'ipaddress' => 'Adresse IP',
-    );
-    $lang->alias = "Alias";
-    $lang->history = "히스토리";
-    $lang->about_use_history = "히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.";
-    $lang->trace_only = "흔적만 남김";
-
-    $lang->cmd_trash = 'Trashcan';
-    $lang->cmd_restore = 'Restore';
-    $lang->cmd_restore_all = 'Restore All';
-
-    $lang->in_trash = 'Trashcan';
-    $lang->trash_nick_name = 'Person who deleted';
-    $lang->trash_date = 'Deleted date';
-    $lang->trash_description = 'Description';
-
-    $lang->success_trashed = "Successfully moved to trashcan";
-    $lang->msg_not_selected_document = '선택된 문서가 없습니다.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php
deleted file mode 100644
index 756a54e7c..000000000
--- a/modules/document/lang/jp.lang.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ドキュメント（document）モジュールの基本言語パッケージ
-     **/
-
-    $lang->document_list = 'ドキュメントリスト';
-    $lang->thumbnail_type = 'サムネールタイプ';
-    $lang->thumbnail_crop = 'トリミングする';
-    $lang->thumbnail_ratio = '比率に合わせる';
-    $lang->cmd_delete_all_thumbnail = 'すべてのサムネール削除';
-    $lang->title_bold = 'タイトル太字';
-    $lang->title_color = 'タイトルの色';
-    $lang->new_document_count = '新規';
-
-    $lang->parent_category_title = '上位カテゴリ名';
-    $lang->category_title = 'カテゴリ名';
-    $lang->category_color = 'カテゴリフォント色';
-    $lang->expand = '拡張表示';
-    $lang->category_group_srls = 'グループ制限';
-
-    $lang->cmd_make_child = '下位カテゴリ追加';
-    $lang->cmd_enable_move_category = 'カテゴリ位置変更（選択後上のメニューをドラッグして下さい）';
-
-    $lang->about_category_title = 'カテゴリ名を入力して下さい。';
-    $lang->about_expand = 'チェックすると常に展開された状態になります。';
-    $lang->about_category_group_srls = '選択したグループのみ、現在のカテゴリの指定が出来ます。';
-    $lang->about_category_color = 'カテゴリのフォント色を設定します。';
-
-    $lang->cmd_search_next = '継続検索';
-
-    $lang->cmd_temp_save = '一時保存';
-
-	$lang->cmd_toggle_checked_document = '選択項目反転';
-    $lang->cmd_delete_checked_document = '選択項目削除';
-    $lang->cmd_document_do = 'この書き込みを..';
-
-    $lang->msg_cart_is_null = '削除する書き込みを選択して下さい。';
-    $lang->msg_category_not_moved = '移動出来ません。';
-    $lang->msg_is_secret = '非公開設定の書き込みです。';
-    $lang->msg_checked_document_is_deleted = '%d個の書き込みが削除されました。';
-
-    $lang->move_target_module = '移動対象モジュール';
-
-    // 管理者ページで検索する内容
-    $lang->search_target_list = array(
-        'title' => 'タイトル',
-        'content' => '内容',
-        'user_id' => 'ユーザーＩＤ',
-        'member_srl' => '会員番号',
-        'user_name' => 'ユーザ名',
-        'nick_name' => 'ニックネーム',
-        'email_address' => 'メールアドレス',
-        'homepage' => 'ホームページURL',
-        'is_notice' => 'お知らせ',
-        'is_secret' => '非公開書き込み',
-        'tags' => 'タグ',
-        'readed_count' => '閲覧数（以上）',
-        'voted_count' => '推薦数（以上）',
-        'comment_count ' => 'コメント数（以上）',
-        'trackback_count ' => 'トラックバック数（以上）',
-        'uploaded_count ' => '添付ファイル数（以上）',
-        'regdate' => '登録日',
-        'last_update' => '最近修正日',
-        'ipaddress' => 'IPアドレス',
-    );
-
-    $lang->alias = 'アリアス（Alias）';
-    $lang->history = '履歴';
-    $lang->about_use_history = '履歴機能を使用するかを設定します。履歴機能を使用すると文書修正のバージョンを管理し、過去のバージョンから復元することも可能です。';
-    $lang->trace_only = '記録だけ残す';
-
-    $lang->cmd_trash = "ごみ箱";
-    $lang->cmd_restore = "差し戻し";
-    $lang->cmd_restore_all = "すべて差し戻し";
-
-    $lang->in_trash = "ごみ箱";
-    $lang->trash_nick_name = "削除者のニックネーム";
-    $lang->trash_date = "削除日";
-    $lang->trash_description = "理由";
-
-    // 管理者ページでのごみ箱の検索対象
-    $lang->search_target_trash_list = array(
-        'title' => 'タイトル',
-        'content' => '内容',
-        'user_id' => 'ユーザーID',
-        'member_srl' => '会員番号',
-        'user_name' => 'ユーザー名',
-        'nick_name' => 'ニックネーム',
-        'trash_member_srl' => '削除者会員番号',
-        'trash_user_name' => '削除者ユーザー名',
-        'trash_nick_name' => '削除者ニックネーム',
-        'trash_date' => '削除日',
-        'trash_ipaddress' => '削除者のIPアドレス',
-    );
-
-    $lang->success_trashed = "ごみ箱に移動させました。";
-    $lang->msg_not_selected_document = '選択された書き込みがありません。';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/ko.lang.php b/modules/document/lang/ko.lang.php
deleted file mode 100644
index 66a15c410..000000000
--- a/modules/document/lang/ko.lang.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  문서(document) 모듈의 기본 언어팩
-     **/
-
-    $lang->document_list = '문서 목록';
-    $lang->thumbnail_type = '섬네일 생성 방법';
-    $lang->thumbnail_crop = '잘라내기 (정해진 크기에 꽉 찬 모습의 섬네일을 만듭니다.)';
-    $lang->thumbnail_ratio = '비율 맞추기 (원본 이미지의 비율에 맞춥니다. 다만 정해진 크기에 여백이 생깁니다.)';
-    $lang->cmd_delete_all_thumbnail = '섬네일 모두 삭제';
-    $lang->title_bold = '제목 굵게';
-    $lang->title_color = '제목 색깔';
-    $lang->new_document_count = '새 글';
-
-    $lang->parent_category_title = '상위 카테고리 명';
-    $lang->category_title = '분류 명';
-    $lang->category_color = '분류 폰트색깔';
-    $lang->expand = '펼침';
-    $lang->category_group_srls = '그룹 제한';
-
-    $lang->cmd_make_child = '하위 카테고리 추가';
-    $lang->cmd_enable_move_category = '카테고리 위치 변경 (선택 후 위 메뉴를 드래그하세요.)';
-
-    $lang->about_category_title = '카테고리 이름을 입력해주세요.';
-    $lang->about_expand = '선택하시면 늘 펼쳐진 상태로 있게 합니다.';
-    $lang->about_category_group_srls = '선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다.';
-    $lang->about_category_color = '분류 폰트색깔을 지정합니다. 예) red 또는 #ff0000';
-
-    $lang->cmd_search_next = '계속 검색';
-
-    $lang->cmd_temp_save = '임시 저장';
-
-	$lang->cmd_toggle_checked_document = '선택항목 반전';
-    $lang->cmd_delete_checked_document = '선택항목 삭제';
-    $lang->cmd_document_do = '이 게시물을...';
-
-    $lang->msg_cart_is_null = '삭제할 글을 선택해주세요.';
-    $lang->msg_category_not_moved = '이동할 수 없습니다.';
-    $lang->msg_is_secret = '비밀글 입니다.';
-    $lang->msg_checked_document_is_deleted = '%d개의 글이 삭제되었습니다.';
-
-    $lang->move_target_module = '대상 모듈';
-
-    // 관리자 페이지에서 검색할 대상
-    $lang->search_target_list = array(
-        'title' => '제목',
-        'content' => '내용',
-        'user_id' => '아이디',
-        'member_srl' => '회원 번호',
-        'user_name' => '사용자 이름',
-        'nick_name' => '닉네임',
-        'email_address' => '이메일',
-        'homepage' => '홈페이지',
-        'is_notice' => '공지사항',
-        'is_secret' => '비밀글',
-        'tags' => '태그',
-        'readed_count' => '조회 수 (이상)',
-        'voted_count' => '추천 수 (이상)',
-        'comment_count ' => '코멘트 수 (이상)',
-        'trackback_count ' => '트랙백 수 (이상)',
-        'uploaded_count ' => '첨부파일 수 (이상)',
-        'regdate' => '등록일',
-        'last_update' => '최근 수정일',
-        'ipaddress' => 'IP 주소',
-    );
-
-    $lang->alias = 'Alias';
-    $lang->history = '히스토리';
-    $lang->about_use_history = '히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우, 문서 수정 후 이전 수정판으로 복원할 수 있습니다.';
-    $lang->trace_only = '흔적만 남김';
-
-    $lang->cmd_trash = '휴지통';
-    $lang->cmd_restore = '복원';
-    $lang->cmd_restore_all = '모두 복원';
-
-    $lang->in_trash = '휴지통';
-    $lang->trash_nick_name = '삭제자 닉네임';
-    $lang->trash_date = '삭제 날짜';
-    $lang->trash_description = '설명';
-
-    // 관리자 페이지에서 휴지통의 검색할 대상
-    $lang->search_target_trash_list = array(
-        'title' => '제목',
-        'content' => '내용',
-        'user_id' => '아이디',
-        'member_srl' => '회원 번호',
-        'user_name' => '사용자 이름',
-        'nick_name' => '닉네임',
-        'trash_member_srl' => '삭제자 회원 번호',
-        'trash_user_name' => '삭제자 이름',
-        'trash_nick_name' => '삭제자 닉네임',
-        'trash_date' => '삭제일',
-        'trash_ipaddress' => '삭제자 IP 주소',
-    );
-
-    $lang->success_trashed = '휴지통으로 이동되었습니다.';
-    $lang->msg_not_selected_document = '선택된 문서가 없습니다.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/lang.xml b/modules/document/lang/lang.xml
new file mode 100644
index 000000000..d26b4c469
--- /dev/null
+++ b/modules/document/lang/lang.xml
@@ -0,0 +1,857 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="document_list">
+		<value xml:lang="ko"><![CDATA[문서 목록]]></value>
+		<value xml:lang="en"><![CDATA[Documents List]]></value>
+		<value xml:lang="jp"><![CDATA[ドキュメントリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[主题列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主題列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Documents]]></value>
+		<value xml:lang="ru"><![CDATA[Список документов]]></value>
+		<value xml:lang="es"><![CDATA[Document list]]></value>
+		<value xml:lang="tr"><![CDATA[Belge Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách bài viết]]></value>
+	</item>
+	<item name="thumbnail_type">
+		<value xml:lang="ko"><![CDATA[섬네일 생성 방법]]></value>
+		<value xml:lang="en"><![CDATA[Thumbnail Type]]></value>
+		<value xml:lang="jp"><![CDATA[サムネールタイプ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[缩略图生成方式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[縮圖建立方式]]></value>
+		<value xml:lang="fr"><![CDATA[Type de la Vignette]]></value>
+		<value xml:lang="ru"><![CDATA[Тип миниатюры]]></value>
+		<value xml:lang="tr"><![CDATA[Küçük Resim Türü]]></value>
+		<value xml:lang="vi"><![CDATA[Định dạng hình nhỏ]]></value>
+	</item>
+	<item name="thumbnail_crop">
+		<value xml:lang="ko"><![CDATA[잘라내기 (정해진 크기에 꽉 찬 모습의 썸네일을 만듭니다.)]]></value>
+		<value xml:lang="en"><![CDATA[Crop (to a specific size)]]></value>
+		<value xml:lang="jp"><![CDATA[トリミングする]]></value>
+		<value xml:lang="zh-CN"><![CDATA[裁减(按指定大小裁剪图片)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[裁減]]></value>
+		<value xml:lang="fr"><![CDATA[Rogner]]></value>
+		<value xml:lang="ru"><![CDATA[Обрезать]]></value>
+		<value xml:lang="tr"><![CDATA[Kırpılmış]]></value>
+		<value xml:lang="vi"><![CDATA[Hình cắt]]></value>
+	</item>
+	<item name="thumbnail_ratio">
+		<value xml:lang="ko"><![CDATA[비율 맞추기 (원본 이미지의 비율에 맞춥니다. 다만 정해진 크기에 여백이 생깁니다.)]]></value>
+		<value xml:lang="en"><![CDATA[Ratio (keeping the same aspect ratio as the original image)]]></value>
+		<value xml:lang="jp"><![CDATA[比率に合わせる]]></value>
+		<value xml:lang="zh-CN"><![CDATA[比例(按原图比例缩略处理)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[比例]]></value>
+		<value xml:lang="fr"><![CDATA[Proportion]]></value>
+		<value xml:lang="ru"><![CDATA[Соотношение]]></value>
+		<value xml:lang="tr"><![CDATA[Oran]]></value>
+		<value xml:lang="vi"><![CDATA[Tỉ lệ]]></value>
+	</item>
+	<item name="cmd_delete_all_thumbnail">
+		<value xml:lang="ko"><![CDATA[섬네일 모두 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete all thumbnails]]></value>
+		<value xml:lang="jp"><![CDATA[すべてのサムネール削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除全部缩略图]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除全部縮圖]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer toutes les vignettes]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить все миниарюры]]></value>
+		<value xml:lang="tr"><![CDATA[Tüm küçük resimleri sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa tất cả hình nhỏ]]></value>
+	</item>
+	<item name="title_bold">
+		<value xml:lang="ko"><![CDATA[제목 굵게]]></value>
+		<value xml:lang="en"><![CDATA[Bold]]></value>
+		<value xml:lang="jp"><![CDATA[タイトル太字]]></value>
+		<value xml:lang="zh-CN"><![CDATA[粗标题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[粗體]]></value>
+		<value xml:lang="fr"><![CDATA[Gras]]></value>
+		<value xml:lang="ru"><![CDATA[Жирное название]]></value>
+		<value xml:lang="tr"><![CDATA[Kalın]]></value>
+		<value xml:lang="vi"><![CDATA[Chữ đậm]]></value>
+	</item>
+	<item name="title_color">
+		<value xml:lang="ko"><![CDATA[제목 색깔]]></value>
+		<value xml:lang="en"><![CDATA[Color]]></value>
+		<value xml:lang="jp"><![CDATA[タイトルの色]]></value>
+		<value xml:lang="zh-CN"><![CDATA[标题颜色]]></value>
+		<value xml:lang="zh-TW"><![CDATA[標題顏色]]></value>
+		<value xml:lang="fr"><![CDATA[Couleur]]></value>
+		<value xml:lang="ru"><![CDATA[Цвет названия]]></value>
+		<value xml:lang="tr"><![CDATA[Renk]]></value>
+		<value xml:lang="vi"><![CDATA[Màu]]></value>
+	</item>
+	<item name="new_document_count">
+		<value xml:lang="ko"><![CDATA[새 글]]></value>
+		<value xml:lang="en"><![CDATA[New documents]]></value>
+		<value xml:lang="jp"><![CDATA[新規]]></value>
+		<value xml:lang="zh-CN"><![CDATA[新帖]]></value>
+		<value xml:lang="zh-TW"><![CDATA[N]]></value>
+		<value xml:lang="fr"><![CDATA[새글]]></value>
+		<value xml:lang="ru"><![CDATA[Новые документы]]></value>
+		<value xml:lang="es"><![CDATA[새글]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni belgeler]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết mới]]></value>
+	</item>
+	<item name="parent_category_title">
+		<value xml:lang="ko"><![CDATA[상위 카테고리 명]]></value>
+		<value xml:lang="en"><![CDATA[Parent Category]]></value>
+		<value xml:lang="jp"><![CDATA[上位カテゴリ名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上级分类名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主分類]]></value>
+		<value xml:lang="fr"><![CDATA[catégorie supérieure]]></value>
+		<value xml:lang="ru"><![CDATA[Название верхней категории]]></value>
+		<value xml:lang="es"><![CDATA[Categoría Superior]]></value>
+		<value xml:lang="tr"><![CDATA[Üst Kategori]]></value>
+		<value xml:lang="vi"><![CDATA[Tên thể loại chính]]></value>
+	</item>
+	<item name="category_title">
+		<value xml:lang="ko"><![CDATA[분류 명]]></value>
+		<value xml:lang="en"><![CDATA[Category]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Catégorie]]></value>
+		<value xml:lang="ru"><![CDATA[Категория]]></value>
+		<value xml:lang="es"><![CDATA[Nombre de la categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori]]></value>
+		<value xml:lang="vi"><![CDATA[Tên thể loại nhỏ]]></value>
+	</item>
+	<item name="category_color">
+		<value xml:lang="ko"><![CDATA[분류 폰트색깔]]></value>
+		<value xml:lang="en"><![CDATA[Category Font Color]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ文字色]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类颜色]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類顏色]]></value>
+		<value xml:lang="ru"><![CDATA[Цвет шрифта категории]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori Yazı Rengi]]></value>
+		<value xml:lang="vi"><![CDATA[Màu chữ]]></value>
+	</item>
+	<item name="expand">
+		<value xml:lang="ko"><![CDATA[펼침]]></value>
+		<value xml:lang="en"><![CDATA[Expand]]></value>
+		<value xml:lang="jp"><![CDATA[展開]]></value>
+		<value xml:lang="zh-CN"><![CDATA[展开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[展開]]></value>
+		<value xml:lang="fr"><![CDATA[Etendre]]></value>
+		<value xml:lang="ru"><![CDATA[Развернуть]]></value>
+		<value xml:lang="es"><![CDATA[Expandir]]></value>
+		<value xml:lang="tr"><![CDATA[Genişlet]]></value>
+		<value xml:lang="vi"><![CDATA[Mở rộng]]></value>
+	</item>
+	<item name="category_group_srls">
+		<value xml:lang="ko"><![CDATA[그룹 제한]]></value>
+		<value xml:lang="en"><![CDATA[Accessable Group]]></value>
+		<value xml:lang="jp"><![CDATA[グループ制限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組]]></value>
+		<value xml:lang="fr"><![CDATA[Groupe Accessible]]></value>
+		<value xml:lang="ru"><![CDATA[Доступные группы]]></value>
+		<value xml:lang="es"><![CDATA[Limitar el grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Erişilebilir Grup]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm được cho phép]]></value>
+	</item>
+	<item name="cmd_make_child">
+		<value xml:lang="ko"><![CDATA[하위 카테고리 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Child Category]]></value>
+		<value xml:lang="jp"><![CDATA[下位カテゴリ追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加下级分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增子分類]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter une catégorie inférieure]]></value>
+		<value xml:lang="es"><![CDATA[Agregar sub categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Alt Kategori Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm thể loại nhỏ]]></value>
+	</item>
+	<item name="cmd_enable_move_category">
+		<value xml:lang="ko"><![CDATA[카테고리 위치 변경 (선택 후 위 메뉴를 드래그하세요.)]]></value>
+		<value xml:lang="en"><![CDATA[Change category position (Select a category and drag it to the position you want.)]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ位置変更（選択後上のメニューをドラッグしてください）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类顺序(勾选后用鼠标拖动分类项)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類順序(勾選後用滑鼠拖曳分類項目)]]></value>
+		<value xml:lang="fr"><![CDATA[Bouger la position de la catégorie (Cochez la case et puis glisser la catégorie que vous voulez déplacer)]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить местоположение категории(после выделения перетащите верхнее меню)]]></value>
+		<value xml:lang="es"><![CDATA[Cambiar la posición de la categoría. (arrastrar y soltar luego de haber selecionado)]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori konumunu değiştir (Seçtikten sonra anamenüyü taşıyınız)]]></value>
+		<value xml:lang="vi"><![CDATA[Thay đổi vị trí thể loại (Kéo lên Menu trên sau khi lựa chọn)]]></value>
+	</item>
+	<item name="about_category_title">
+		<value xml:lang="ko"><![CDATA[카테고리 이름을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter a category name.]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ名を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入分类名。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入分類名稱。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le nom de la catégorie, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Введите название категории]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar el nombre de la categoría.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen kategori ismi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập tên thể loại]]></value>
+	</item>
+	<item name="about_expand">
+		<value xml:lang="ko"><![CDATA[선택하시면 늘 펼쳐진 상태로 있게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Select this option, and they will stay expanded.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると常に展開された状態になります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择此项将维持展开状态。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇此項將維持展開狀態。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous cochez la case à cocher, ce sera toujours tendu]]></value>
+		<value xml:lang="ru"><![CDATA[Если эта опция выбрана, расширение будут применено всегда]]></value>
+		<value xml:lang="es"><![CDATA[Si seleccionas esta opción, siempre estará expandido.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu seçimle, her zaman genişletilmiş olacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu sử dụng tùy chọn này, Thể loại sẽ luôn luôn được trải rộng.]]></value>
+	</item>
+	<item name="about_category_group_srls">
+		<value xml:lang="ko"><![CDATA[선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only the selected group will be able to use this category.]]></value>
+		<value xml:lang="jp"><![CDATA[選択したグループのみ、現在のカテゴリの指定ができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[所选用户组才可以查看此分类。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[被選擇的群組才可以檢視此分類。]]></value>
+		<value xml:lang="fr"><![CDATA[Le groupe choisi seulement pourra utiliser la catégorie courante]]></value>
+		<value xml:lang="ru"><![CDATA[Только выбранные группы можно отнести к этой категории]]></value>
+		<value xml:lang="es"><![CDATA[선택하신 그룹만 현재 카테고리를 지정할 수 있도록 합니다]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece seçilen grup geçerli kategoriyi kullanabilecektir]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ những nhóm đã chọn mới được phép sử dụng thể loại này.]]></value>
+	</item>
+	<item name="about_category_color">
+		<value xml:lang="ko"><![CDATA[분류 폰트색깔을 지정합니다. 예) red 또는 #ff0000]]></value>
+		<value xml:lang="en"><![CDATA[You can set the font color of the category. e.g.) red or #ff0000]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリの文字色を設定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请指定分类颜色（必须带#符号）。ex）#ff0000]]></value>
+		<value xml:lang="zh-TW"><![CDATA[設定分類顏色。例)紅色為 #ff0000]]></value>
+		<value xml:lang="fr"><![CDATA[You can set font color of category.]]></value>
+		<value xml:lang="ru"><![CDATA[분류 폰트색깔을 지정합니다.]]></value>
+		<value xml:lang="es"><![CDATA[분류 폰트색깔을 지정합니다.]]></value>
+		<value xml:lang="tr"><![CDATA[Kategorinin yazı rengini ayarlayabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt màu cho thể loại.]]></value>
+	</item>
+	<item name="cmd_search_next">
+		<value xml:lang="ko"><![CDATA[계속 검색]]></value>
+		<value xml:lang="en"><![CDATA[Search Next]]></value>
+		<value xml:lang="jp"><![CDATA[継続検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[继续搜索]]></value>
+		<value xml:lang="zh-TW"><![CDATA[繼續搜尋]]></value>
+		<value xml:lang="fr"><![CDATA[Recherche Suivante]]></value>
+		<value xml:lang="ru"><![CDATA[Искать дальше]]></value>
+		<value xml:lang="es"><![CDATA[Buscar siguiente]]></value>
+		<value xml:lang="tr"><![CDATA[Sonrakini Ara]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm tiếp]]></value>
+	</item>
+	<item name="cmd_temp_save">
+		<value xml:lang="ko"><![CDATA[임시 저장]]></value>
+		<value xml:lang="en"><![CDATA[Temporary Save]]></value>
+		<value xml:lang="jp"><![CDATA[一時保存]]></value>
+		<value xml:lang="zh-CN"><![CDATA[临时保存]]></value>
+		<value xml:lang="zh-TW"><![CDATA[臨時儲存]]></value>
+		<value xml:lang="fr"><![CDATA[Conserver temporairement]]></value>
+		<value xml:lang="ru"><![CDATA[Сохранить временно]]></value>
+		<value xml:lang="es"><![CDATA[Guardar Temporales]]></value>
+		<value xml:lang="tr"><![CDATA[Geçiçi olarak Kaydet]]></value>
+		<value xml:lang="vi"><![CDATA[Lưu tạm thời]]></value>
+	</item>
+	<item name="cmd_toggle_checked_document">
+		<value xml:lang="ko"><![CDATA[선택항목 반전]]></value>
+		<value xml:lang="en"><![CDATA[Invert Selection]]></value>
+		<value xml:lang="jp"><![CDATA[選択項目反転]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反選]]></value>
+		<value xml:lang="fr"><![CDATA[Renverser les choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Перевернуть выбранные объекты]]></value>
+		<value xml:lang="es"><![CDATA[Invertir los elementos seleccionados]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili ögeleri ters çevir]]></value>
+		<value xml:lang="vi"><![CDATA[Khôi phục những bài đã chọn]]></value>
+	</item>
+	<item name="cmd_delete_checked_document">
+		<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete selected]]></value>
+		<value xml:lang="jp"><![CDATA[選択項目削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer les choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить выбранные]]></value>
+		<value xml:lang="es"><![CDATA[Eliminar lo seleccionado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilenleri Sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa những bài đã chọn]]></value>
+	</item>
+	<item name="cmd_document_do">
+		<value xml:lang="ko"><![CDATA[이 게시물을...]]></value>
+		<value xml:lang="en"><![CDATA[I want to]]></value>
+		<value xml:lang="jp"><![CDATA[この書き込みを..]]></value>
+		<value xml:lang="zh-CN"><![CDATA[将把此主题..]]></value>
+		<value xml:lang="zh-TW"><![CDATA[將此主題..]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voudriez..]]></value>
+		<value xml:lang="ru"><![CDATA[Эту запись...]]></value>
+		<value xml:lang="es"><![CDATA[Usted ..]]></value>
+		<value xml:lang="tr"><![CDATA[Şunu yap]]></value>
+		<value xml:lang="vi"><![CDATA[Bình chọn / Phê bình]]></value>
+	</item>
+	<item name="msg_cart_is_null">
+		<value xml:lang="ko"><![CDATA[삭제할 글을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select the articles to delete.]]></value>
+		<value xml:lang="jp"><![CDATA[削除する書き込みを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择要删除的文章。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的文章。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez les articles à supprimer, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите записи,которые Вы хотите удалить]]></value>
+		<value xml:lang="es"><![CDATA[Selecciona el documento que desea eliminar]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen silinecek makaleleri seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy chọn bài viết để xóa.]]></value>
+	</item>
+	<item name="msg_category_not_moved">
+		<value xml:lang="ko"><![CDATA[이동할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Could not be moved]]></value>
+		<value xml:lang="jp"><![CDATA[移動できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能移动！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法移動！]]></value>
+		<value xml:lang="fr"><![CDATA[Ne peut(peuvent) pas être bougé(s)]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно переместить]]></value>
+		<value xml:lang="es"><![CDATA[No puede se movido]]></value>
+		<value xml:lang="tr"><![CDATA[Taşınamıyor]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể di chuyển]]></value>
+	</item>
+	<item name="msg_is_secret">
+		<value xml:lang="ko"><![CDATA[비밀글입니다.]]></value>
+		<value xml:lang="en"><![CDATA[This is a secret article.]]></value>
+		<value xml:lang="jp"><![CDATA[非公開設定の書き込みです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[这是密帖！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[秘密！]]></value>
+		<value xml:lang="fr"><![CDATA[Cet article est secret]]></value>
+		<value xml:lang="ru"><![CDATA[Секретная запись]]></value>
+		<value xml:lang="es"><![CDATA[Es un documento secreto]]></value>
+		<value xml:lang="tr"><![CDATA[Bu gizli bir makaledir]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết này đã đặt bí mật]]></value>
+	</item>
+	<item name="msg_checked_document_is_deleted">
+		<value xml:lang="ko"><![CDATA[%d개의 글이 삭제되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d article(s) was(were) deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[%d個の書き込みが削除されました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除了%d个文章。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除%d個文章。]]></value>
+		<value xml:lang="fr"><![CDATA[%d article(s) est(sont) supprimé(s)]]></value>
+		<value xml:lang="ru"><![CDATA[%d записей удалено]]></value>
+		<value xml:lang="es"><![CDATA[Total de %d documentos han sido eliminados]]></value>
+		<value xml:lang="tr"><![CDATA[%d makale silinmiştir]]></value>
+		<value xml:lang="vi"><![CDATA[%d bài viết đã được xóa.]]></value>
+	</item>
+	<item name="move_target_module">
+		<value xml:lang="ko"><![CDATA[대상 모듈]]></value>
+		<value xml:lang="en"><![CDATA[Target module ]]></value>
+		<value xml:lang="jp"><![CDATA[移動対象モジュール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[目标模块]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移到]]></value>
+		<value xml:lang="fr"><![CDATA[Module à déménager]]></value>
+		<value xml:lang="ru"><![CDATA[Этот модуль]]></value>
+		<value xml:lang="es"><![CDATA[Módulo para cambiar de posición]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef modül ]]></value>
+		<value xml:lang="vi"><![CDATA[Vị trí Module]]></value>
+	</item>
+	<item name="search_target_list" type="array">
+		<item name="title">
+			<value xml:lang="ko"><![CDATA[제목]]></value>
+			<value xml:lang="en"><![CDATA[Subject]]></value>
+			<value xml:lang="jp"><![CDATA[タイトル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+			<value xml:lang="fr"><![CDATA[Titre]]></value>
+			<value xml:lang="ru"><![CDATA[Тема]]></value>
+			<value xml:lang="es"><![CDATA[Título]]></value>
+			<value xml:lang="tr"><![CDATA[Konu]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		</item>
+		<item name="content">
+			<value xml:lang="ko"><![CDATA[내용]]></value>
+			<value xml:lang="en"><![CDATA[Content]]></value>
+			<value xml:lang="jp"><![CDATA[内容]]></value>
+			<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+			<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+			<value xml:lang="fr"><![CDATA[Contenu]]></value>
+			<value xml:lang="ru"><![CDATA[Содержание]]></value>
+			<value xml:lang="es"><![CDATA[Contenido]]></value>
+			<value xml:lang="tr"><![CDATA[İçerik]]></value>
+			<value xml:lang="vi"><![CDATA[Nội dung]]></value>
+		</item>
+		<item name="user_id">
+			<value xml:lang="ko"><![CDATA[아이디]]></value>
+			<value xml:lang="en"><![CDATA[User ID]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザーＩＤ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[I D]]></value>
+			<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
+			<value xml:lang="fr"><![CDATA[Compte]]></value>
+			<value xml:lang="ru"><![CDATA[ID пользователя]]></value>
+			<value xml:lang="es"><![CDATA[ID]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı Kimliği]]></value>
+			<value xml:lang="vi"><![CDATA[ID sử dụng]]></value>
+		</item>
+		<item name="member_srl">
+			<value xml:lang="ko"><![CDATA[회원 번호]]></value>
+			<value xml:lang="en"><![CDATA[Member Serial Number]]></value>
+			<value xml:lang="jp"><![CDATA[会員番号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[会员编号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[會員編號]]></value>
+			<value xml:lang="fr"><![CDATA[Numéro de Série du Membre]]></value>
+			<value xml:lang="ru"><![CDATA[No. пользователя]]></value>
+			<value xml:lang="es"><![CDATA[Número del usuario]]></value>
+			<value xml:lang="tr"><![CDATA[Üye Seri Numarası]]></value>
+			<value xml:lang="vi"><![CDATA[Mã thành viên]]></value>
+		</item>
+		<item name="user_name">
+			<value xml:lang="ko"><![CDATA[사용자 이름]]></value>
+			<value xml:lang="en"><![CDATA[User Name]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザー名]]></value>
+			<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
+			<value xml:lang="fr"><![CDATA[Nom]]></value>
+			<value xml:lang="ru"><![CDATA[Имя пользователя]]></value>
+			<value xml:lang="es"><![CDATA[Nombre del usuario]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı İsmi]]></value>
+			<value xml:lang="vi"><![CDATA[Tên]]></value>
+		</item>
+		<item name="nick_name">
+			<value xml:lang="ko"><![CDATA[닉네임]]></value>
+			<value xml:lang="en"><![CDATA[Nickname]]></value>
+			<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
+			<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
+			<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
+			<value xml:lang="fr"><![CDATA[Surnom]]></value>
+			<value xml:lang="ru"><![CDATA[Ник]]></value>
+			<value xml:lang="es"><![CDATA[Apodo]]></value>
+			<value xml:lang="tr"><![CDATA[Rumuz]]></value>
+		</item>
+		<item name="email_address">
+			<value xml:lang="ko"><![CDATA[이메일]]></value>
+			<value xml:lang="en"><![CDATA[Email]]></value>
+			<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[电子邮件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[電子郵件]]></value>
+			<value xml:lang="fr"><![CDATA[Mél]]></value>
+			<value xml:lang="es"><![CDATA[Correo Electrónico]]></value>
+		</item>
+		<item name="homepage">
+			<value xml:lang="ko"><![CDATA[홈페이지]]></value>
+			<value xml:lang="en"><![CDATA[Homepage]]></value>
+			<value xml:lang="jp"><![CDATA[ホームページURL]]></value>
+			<value xml:lang="zh-CN"><![CDATA[主页]]></value>
+			<value xml:lang="zh-TW"><![CDATA[主頁]]></value>
+			<value xml:lang="fr"><![CDATA[Page d'accueil]]></value>
+			<value xml:lang="ru"><![CDATA[Домашняя страница]]></value>
+			<value xml:lang="es"><![CDATA[Página web]]></value>
+			<value xml:lang="tr"><![CDATA[Anasayfa]]></value>
+			<value xml:lang="vi"><![CDATA[Trang chủ]]></value>
+		</item>
+		<item name="is_notice">
+			<value xml:lang="ko"><![CDATA[공지사항]]></value>
+			<value xml:lang="en"><![CDATA[Notice]]></value>
+			<value xml:lang="jp"><![CDATA[お知らせ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[公告]]></value>
+			<value xml:lang="zh-TW"><![CDATA[公告]]></value>
+			<value xml:lang="ru"><![CDATA[Объявления]]></value>
+			<value xml:lang="es"><![CDATA[Aviso]]></value>
+			<value xml:lang="tr"><![CDATA[Bildirim]]></value>
+			<value xml:lang="vi"><![CDATA[Chú ý]]></value>
+		</item>
+		<item name="is_secret">
+			<value xml:lang="ko"><![CDATA[비밀글]]></value>
+			<value xml:lang="en"><![CDATA[Secret]]></value>
+			<value xml:lang="jp"><![CDATA[非公開書き込み]]></value>
+			<value xml:lang="zh-CN"><![CDATA[密帖]]></value>
+			<value xml:lang="zh-TW"><![CDATA[秘密]]></value>
+			<value xml:lang="ru"><![CDATA[Секретная запись]]></value>
+			<value xml:lang="es"><![CDATA[Secreto]]></value>
+			<value xml:lang="tr"><![CDATA[Gizli]]></value>
+			<value xml:lang="vi"><![CDATA[Bí mật]]></value>
+		</item>
+		<item name="tags">
+			<value xml:lang="ko"><![CDATA[태그]]></value>
+			<value xml:lang="en"><![CDATA[Tag]]></value>
+			<value xml:lang="jp"><![CDATA[タグ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[标签]]></value>
+			<value xml:lang="zh-TW"><![CDATA[標籤]]></value>
+			<value xml:lang="fr"><![CDATA[Balises]]></value>
+			<value xml:lang="ru"><![CDATA[Тег]]></value>
+			<value xml:lang="es"><![CDATA[Etiqueta]]></value>
+			<value xml:lang="tr"><![CDATA[Etiket]]></value>
+		</item>
+		<item name="readed_count">
+			<value xml:lang="ko"><![CDATA[조회 수 (이상)]]></value>
+			<value xml:lang="en"><![CDATA[Number of Views (over)]]></value>
+			<value xml:lang="jp"><![CDATA[閲覧数（以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[查看数（以上）]]></value>
+			<value xml:lang="zh-TW"><![CDATA[點閱數(以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Vues (surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Количество просмотров (свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Número de leídos (sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[Gösterim Sayısı (over)]]></value>
+			<value xml:lang="vi"><![CDATA[Lượt xem]]></value>
+		</item>
+		<item name="voted_count">
+			<value xml:lang="ko"><![CDATA[추천 수 (이상)]]></value>
+			<value xml:lang="en"><![CDATA[Number of Votes (over)]]></value>
+			<value xml:lang="jp"><![CDATA[推薦数（以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[推荐数（以上）]]></value>
+			<value xml:lang="zh-TW"><![CDATA[推薦數(以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Recommandés (surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Количество голосов (свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Número de recomnedados (sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[Oylama Sayısı (over)]]></value>
+			<value xml:lang="vi"><![CDATA[Lượt bình chọn]]></value>
+		</item>
+		<item name="comment_count ">
+			<value xml:lang="ko"><![CDATA[댓글 수 (이상)]]></value>
+			<value xml:lang="en"><![CDATA[Number of Comments (over)]]></value>
+			<value xml:lang="jp"><![CDATA[コメント数（以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[评论数（以上）]]></value>
+			<value xml:lang="zh-TW"><![CDATA[評論數(以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Commentaires (surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Количество записей (свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Número de comentarios (sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[Yorum Sayısı (over)]]></value>
+			<value xml:lang="vi"><![CDATA[Số bình luận]]></value>
+		</item>
+		<item name="trackback_count ">
+			<value xml:lang="ko"><![CDATA[트랙백 수 (이상)]]></value>
+			<value xml:lang="en"><![CDATA[Number of Trackbacks (over)]]></value>
+			<value xml:lang="jp"><![CDATA[トラックバック数（以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[引用数（以上）]]></value>
+			<value xml:lang="zh-TW"><![CDATA[引用數(以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Rétroliens (surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Количество трекбеков (свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Número de Trackback (sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[Geri İzleme Sayısı (over)]]></value>
+			<value xml:lang="vi"><![CDATA[Số liên kết Web]]></value>
+		</item>
+		<item name="uploaded_count ">
+			<value xml:lang="ko"><![CDATA[첨부파일 수 (이상)]]></value>
+			<value xml:lang="en"><![CDATA[Number of Attachments (over)]]></value>
+			<value xml:lang="jp"><![CDATA[添付ファイル数（以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上传附件数（以上）]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上傳檔案數(以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Fichiers Attachés (surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Количество вложений (прикрепленных файлов) (свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Número de archivos adjuntos (sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[Eklerin Sayısı (over)]]></value>
+			<value xml:lang="vi"><![CDATA[Số đính kèm]]></value>
+		</item>
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[등록일]]></value>
+			<value xml:lang="en"><![CDATA[Date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[登录日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[登錄日期]]></value>
+			<value xml:lang="fr"><![CDATA[Enrégistré]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+			<value xml:lang="es"><![CDATA[Día del registro]]></value>
+			<value xml:lang="tr"><![CDATA[Tarih]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+		</item>
+		<item name="last_update">
+			<value xml:lang="ko"><![CDATA[최근 수정일]]></value>
+			<value xml:lang="en"><![CDATA[Last updated]]></value>
+			<value xml:lang="jp"><![CDATA[最終更新日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[最近更新日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最近更新]]></value>
+			<value xml:lang="fr"><![CDATA[La Dernière Mise à Jour]]></value>
+			<value xml:lang="ru"><![CDATA[Дата последнего обновления]]></value>
+			<value xml:lang="es"><![CDATA[Día de la última actualización]]></value>
+			<value xml:lang="tr"><![CDATA[Son Güncelleme Tarihi]]></value>
+			<value xml:lang="vi"><![CDATA[Cập nhật lần cuối]]></value>
+		</item>
+		<item name="ipaddress">
+			<value xml:lang="ko"><![CDATA[IP 주소]]></value>
+			<value xml:lang="en"><![CDATA[IP Address]]></value>
+			<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
+			<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
+			<value xml:lang="ru"><![CDATA[IP-Адрес]]></value>
+			<value xml:lang="es"><![CDATA[Dirección IP]]></value>
+			<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+			<value xml:lang="vi"><![CDATA[IP]]></value>
+		</item>
+	</item>
+	<item name="alias">
+		<value xml:lang="ko"><![CDATA[별칭(Alias)]]></value>
+		<value xml:lang="en"><![CDATA[Alias]]></value>
+		<value xml:lang="jp"><![CDATA[アリアス（Alias）]]></value>
+		<value xml:lang="tr"><![CDATA[Diğer Adıyla]]></value>
+		<value xml:lang="vi"><![CDATA[Bí danh]]></value>
+	</item>
+	<item name="history">
+		<value xml:lang="ko"><![CDATA[히스토리]]></value>
+		<value xml:lang="en"><![CDATA[History]]></value>
+		<value xml:lang="jp"><![CDATA[履歴]]></value>
+		<value xml:lang="zh-CN"><![CDATA[历史版本功能]]></value>
+		<value xml:lang="zh-TW"><![CDATA[歷史紀錄]]></value>
+		<value xml:lang="tr"><![CDATA[Geçmiş]]></value>
+		<value xml:lang="vi"><![CDATA[Lịch sử]]></value>
+	</item>
+	<item name="about_use_history">
+		<value xml:lang="ko"><![CDATA[히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우, 문서 수정 후 이전 수정판으로 복원할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can set whether to use History which allows you to restore an updated article to the previous version.]]></value>
+		<value xml:lang="jp"><![CDATA[履歴機能を使用するか設定します。履歴機能を使用すると文書修正のバージョンを管理し、過去のバージョンから復元することも可能です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[启用历史版本功能它将记录主题修改版本，并还可以复原到之前版本。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇是否使用歷史記錄功能。選擇使用，將能夠編輯歷史紀錄並還原。]]></value>
+		<value xml:lang="fr"><![CDATA[히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.]]></value>
+		<value xml:lang="ru"><![CDATA[Determine whether to enable history feature, if it is enabled, update history would be stored and possible to restore old revisions.]]></value>
+		<value xml:lang="es"><![CDATA[히스토리 기능의 사용여부를 지정합니다. 히스토리 기능을 사용할 경우 문서 수정시 이전 리비전을 기록하고 복원할 수 있습니다.]]></value>
+		<value xml:lang="tr"><![CDATA[Geçmiş, belgeleri önceki değişikliklerine dönüştürmek içindir.]]></value>
+		<value xml:lang="vi"><![CDATA[Chức năng này sẽ lưu lại những thay đổi trên bài viết. Nếu sử dụng chức năng này, bạn có thể khôi phục lại trạng thái ban đầu của bài viết.]]></value>
+	</item>
+	<item name="trace_only">
+		<value xml:lang="ko"><![CDATA[흔적만 남김]]></value>
+		<value xml:lang="en"><![CDATA[Trace only]]></value>
+		<value xml:lang="jp"><![CDATA[記録だけ残す]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只留痕迹]]></value>
+		<value xml:lang="zh-TW"><![CDATA[追蹤]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece izleme]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ theo dõi]]></value>
+	</item>
+	<item name="cmd_trash">
+		<value xml:lang="ko"><![CDATA[휴지통]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
+		<value xml:lang="zh-CN"><![CDATA[回收箱]]></value>
+		<value xml:lang="zh-TW"><![CDATA[垃圾桶]]></value>
+		<value xml:lang="ru"><![CDATA[Корзина]]></value>
+		<value xml:lang="tr"><![CDATA[Çöp Kutusu]]></value>
+		<value xml:lang="vi"><![CDATA[Thùng rác]]></value>
+	</item>
+	<item name="cmd_restore">
+		<value xml:lang="ko"><![CDATA[복원]]></value>
+		<value xml:lang="en"><![CDATA[Restore]]></value>
+		<value xml:lang="jp"><![CDATA[差し戻し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[复原]]></value>
+		<value xml:lang="zh-TW"><![CDATA[還原]]></value>
+		<value xml:lang="ru"><![CDATA[Восстановить]]></value>
+		<value xml:lang="tr"><![CDATA[Geri Yükleme]]></value>
+		<value xml:lang="vi"><![CDATA[Khôi phục]]></value>
+	</item>
+	<item name="cmd_restore_all">
+		<value xml:lang="ko"><![CDATA[모두 복원]]></value>
+		<value xml:lang="en"><![CDATA[Restore All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて差し戻し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部复原]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部還原]]></value>
+		<value xml:lang="ru"><![CDATA[Восстановить все]]></value>
+		<value xml:lang="tr"><![CDATA[Hepsini Geri Yükle]]></value>
+		<value xml:lang="vi"><![CDATA[Khôi phục tất cả]]></value>
+	</item>
+	<item name="in_trash">
+		<value xml:lang="ko"><![CDATA[휴지통]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
+		<value xml:lang="zh-CN"><![CDATA[回收箱]]></value>
+		<value xml:lang="zh-TW"><![CDATA[垃圾桶]]></value>
+		<value xml:lang="ru"><![CDATA[Корзина]]></value>
+		<value xml:lang="tr"><![CDATA[Çöp Kutusu]]></value>
+		<value xml:lang="vi"><![CDATA[Thùng rác]]></value>
+	</item>
+	<item name="trash_nick_name">
+		<value xml:lang="ko"><![CDATA[옮긴사람]]></value>
+		<value xml:lang="en"><![CDATA[Deleted by]]></value>
+		<value xml:lang="jp"><![CDATA[削除者のニックネーム]]></value>
+		<value xml:lang="zh-CN"><![CDATA[操作人昵称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
+		<value xml:lang="fr"><![CDATA[Person who deleted]]></value>
+		<value xml:lang="ru"><![CDATA[Ник удалителя]]></value>
+		<value xml:lang="es"><![CDATA[Person who deleted]]></value>
+		<value xml:lang="tr"><![CDATA[Silici]]></value>
+		<value xml:lang="vi"><![CDATA[Người xóa]]></value>
+	</item>
+	<item name="trash_date">
+		<value xml:lang="ko"><![CDATA[삭제 날짜]]></value>
+		<value xml:lang="en"><![CDATA[Deleted date]]></value>
+		<value xml:lang="jp"><![CDATA[削除日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除日期]]></value>
+		<value xml:lang="ru"><![CDATA[Дата удаления]]></value>
+		<value xml:lang="tr"><![CDATA[Silinme Tarihi]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày xóa]]></value>
+	</item>
+	<item name="trash_description">
+		<value xml:lang="ko"><![CDATA[설명]]></value>
+		<value xml:lang="en"><![CDATA[Description]]></value>
+		<value xml:lang="jp"><![CDATA[理由]]></value>
+		<value xml:lang="zh-CN"><![CDATA[说明]]></value>
+		<value xml:lang="zh-TW"><![CDATA[原因]]></value>
+		<value xml:lang="ru"><![CDATA[Описание]]></value>
+		<value xml:lang="tr"><![CDATA[Açıklama]]></value>
+		<value xml:lang="vi"><![CDATA[Mô tả]]></value>
+	</item>
+	<item name="search_target_trash_list" type="array">
+		<item name="title">
+			<value xml:lang="ko"><![CDATA[제목]]></value>
+			<value xml:lang="en"><![CDATA[Title]]></value>
+			<value xml:lang="jp"><![CDATA[タイトル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+			<value xml:lang="ru"><![CDATA[Тема]]></value>
+			<value xml:lang="tr"><![CDATA[Başlık]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		</item>
+		<item name="content">
+			<value xml:lang="ko"><![CDATA[내용]]></value>
+			<value xml:lang="en"><![CDATA[Content]]></value>
+			<value xml:lang="jp"><![CDATA[内容]]></value>
+			<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+			<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+			<value xml:lang="ru"><![CDATA[Содержание]]></value>
+			<value xml:lang="tr"><![CDATA[İçerik]]></value>
+			<value xml:lang="vi"><![CDATA[Nội dung]]></value>
+		</item>
+		<item name="user_id">
+			<value xml:lang="ko"><![CDATA[아이디]]></value>
+			<value xml:lang="en"><![CDATA[User ID]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザーID]]></value>
+			<value xml:lang="zh-CN"><![CDATA[用户名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
+			<value xml:lang="ru"><![CDATA[ID]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı Kimliği]]></value>
+			<value xml:lang="vi"><![CDATA[ID]]></value>
+		</item>
+		<item name="member_srl">
+			<value xml:lang="ko"><![CDATA[회원 번호]]></value>
+			<value xml:lang="en"><![CDATA[Member serial number]]></value>
+			<value xml:lang="jp"><![CDATA[会員番号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[会员编号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[會員編號]]></value>
+			<value xml:lang="ru"><![CDATA[No пользователя]]></value>
+			<value xml:lang="tr"><![CDATA[Üye Diziseli]]></value>
+			<value xml:lang="vi"><![CDATA[Mã số thành viên]]></value>
+		</item>
+		<item name="user_name">
+			<value xml:lang="ko"><![CDATA[사용자 이름]]></value>
+			<value xml:lang="en"><![CDATA[User name]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザー名]]></value>
+			<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
+			<value xml:lang="ru"><![CDATA[Имя пользователя]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı İsmi]]></value>
+			<value xml:lang="vi"><![CDATA[Tên thật]]></value>
+		</item>
+		<item name="nick_name">
+			<value xml:lang="ko"><![CDATA[닉네임]]></value>
+			<value xml:lang="en"><![CDATA[Nickname]]></value>
+			<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
+			<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
+			<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
+			<value xml:lang="ru"><![CDATA[Ник]]></value>
+			<value xml:lang="tr"><![CDATA[Rumuz]]></value>
+			<value xml:lang="vi"><![CDATA[NickName]]></value>
+		</item>
+		<item name="trash_member_srl">
+			<value xml:lang="ko"><![CDATA[삭제자 회원 번호]]></value>
+			<value xml:lang="en"><![CDATA[Serial number]]></value>
+			<value xml:lang="jp"><![CDATA[削除者会員番号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[操作人会员编号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[移除會員編號]]></value>
+			<value xml:lang="ru"><![CDATA[Номер удалителя]]></value>
+			<value xml:lang="tr"><![CDATA[Silici Diziseli]]></value>
+			<value xml:lang="vi"><![CDATA[Mã số người xóa]]></value>
+		</item>
+		<item name="trash_user_name">
+			<value xml:lang="ko"><![CDATA[삭제자 이름]]></value>
+			<value xml:lang="en"><![CDATA[Name]]></value>
+			<value xml:lang="jp"><![CDATA[削除者ユーザー名]]></value>
+			<value xml:lang="zh-CN"><![CDATA[操作人用户名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[移除姓名]]></value>
+			<value xml:lang="ru"><![CDATA[Имя удалителя]]></value>
+			<value xml:lang="tr"><![CDATA[Silici İsmi]]></value>
+			<value xml:lang="vi"><![CDATA[Tên người xóa]]></value>
+		</item>
+		<item name="trash_date">
+			<value xml:lang="ko"><![CDATA[삭제일]]></value>
+			<value xml:lang="en"><![CDATA[Deleted date]]></value>
+			<value xml:lang="jp"><![CDATA[削除日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[删除日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除日期]]></value>
+			<value xml:lang="ru"><![CDATA[Дата удаления]]></value>
+			<value xml:lang="tr"><![CDATA[Silinme Tarihi]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày xóa]]></value>
+		</item>
+		<item name="trash_ipaddress">
+			<value xml:lang="ko"><![CDATA[삭제자 IP 주소]]></value>
+			<value xml:lang="en"><![CDATA[IP address]]></value>
+			<value xml:lang="jp"><![CDATA[削除者のIPアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[操作人IP地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[移除 IP 位址]]></value>
+			<value xml:lang="ru"><![CDATA[IP адрес удалителя]]></value>
+			<value xml:lang="tr"><![CDATA[Silici IP adresi]]></value>
+			<value xml:lang="vi"><![CDATA[IP Người xóa]]></value>
+		</item>
+	</item>
+	<item name="success_trashed">
+		<value xml:lang="ko"><![CDATA[휴지통으로 이동되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Successfully moved to Recycle Bin.]]></value>
+		<value xml:lang="jp"><![CDATA[ごみ箱に移動しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已成功移除到回收箱。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[成功地移到垃圾桶]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla silindi]]></value>
+		<value xml:lang="vi"><![CDATA[Đã chuyển tới thùng rác thành công.]]></value>
+	</item>
+	<item name="msg_not_selected_document">
+		<value xml:lang="ko"><![CDATA[선택된 문서가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There are no selected articles.]]></value>
+		<value xml:lang="jp"><![CDATA[選択された書き込みがありません。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未選擇主題]]></value>
+		<value xml:lang="tr"><![CDATA[Hiçbir makale seçilmedi.]]></value>
+	</item>
+	<item name="status">
+		<value xml:lang="ko"><![CDATA[상태]]></value>
+		<value xml:lang="en"><![CDATA[Status]]></value>
+		<value xml:lang="jp"><![CDATA[状態]]></value>
+	</item>
+	<item name="status_name_list" type="array">
+		<item name="PRIVATE">
+			<value xml:lang="ko"><![CDATA[비공개]]></value>
+			<value xml:lang="en"><![CDATA[Private]]></value>
+			<value xml:lang="jp"><![CDATA[非公開]]></value>
+		</item>
+		<item name="PUBLIC">
+			<value xml:lang="ko"><![CDATA[공개]]></value>
+			<value xml:lang="en"><![CDATA[Public]]></value>
+			<value xml:lang="jp"><![CDATA[公開]]></value>
+		</item>
+		<item name="SECRET">
+			<value xml:lang="ko"><![CDATA[비밀]]></value>
+			<value xml:lang="en"><![CDATA[Secret]]></value>
+			<value xml:lang="jp"><![CDATA[非公開]]></value>
+		</item>
+		<item name="TEMP">
+			<value xml:lang="ko"><![CDATA[임시]]></value>
+			<value xml:lang="en"><![CDATA[Temporary]]></value>
+			<value xml:lang="jp"><![CDATA[テンポラリ]]></value>
+		</item>
+	</item>
+	<item name="document_manager">
+		<value xml:lang="ko"><![CDATA[선택한 글 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage selected articles]]></value>
+		<value xml:lang="jp"><![CDATA[選択した書き込みを管理]]></value>
+	</item>
+	<item name="selected_document">
+		<value xml:lang="ko"><![CDATA[선택한 글]]></value>
+		<value xml:lang="en"><![CDATA[Selected articles]]></value>
+		<value xml:lang="jp"><![CDATA[選択した書き込み]]></value>
+	</item>
+	<item name="selected_document_move">
+		<value xml:lang="ko"><![CDATA[선택한 글을 다음 위치로 옮기거나 복사할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can move or copy the selected articles to the following position.]]></value>
+		<value xml:lang="jp"><![CDATA[選択した書き込みを次の位置へ移動したり、コピーしたりできます。]]></value>
+	</item>
+	<item name="select_module">
+		<value xml:lang="ko"><![CDATA[모듈을 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select a module.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールを選択してください。]]></value>
+	</item>
+	<item name="select_module_id">
+		<value xml:lang="ko"><![CDATA[모듈 아이디를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select a module ID.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールIDを選択してください。]]></value>
+	</item>
+	<item name="select_category">
+		<value xml:lang="ko"><![CDATA[분류를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select a category.]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリを選択してください。]]></value>
+	</item>
+	<item name="category_description">
+		<value xml:lang="ko"><![CDATA[카테고리 설명]]></value>
+		<value xml:lang="en"><![CDATA[Category Description]]></value>
+	</item>
+	<item name="no_title_document">
+		<value xml:lang="ko"><![CDATA[제목이 없는 문서입니다.]]></value>
+		<value xml:lang="en"><![CDATA[No title in this document.]]></value>
+	</item>
+</lang>
diff --git a/modules/document/lang/ru.lang.php b/modules/document/lang/ru.lang.php
deleted file mode 100644
index c91135b9a..000000000
--- a/modules/document/lang/ru.lang.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->document_list = 'Список документов';
-    $lang->thumbnail_type = 'Тип миниатюры';
-    $lang->thumbnail_crop = 'Обрезать';
-    $lang->thumbnail_ratio = 'Соотношение';
-    $lang->cmd_delete_all_thumbnail = 'Удалить все миниарюры';
-    $lang->move_target_module = "Переместить в";
-    $lang->title_bold = 'Жирное название';
-    $lang->title_color = 'Цвет названия';
-    $lang->new_document_count = 'Новые документы';
-
-    $lang->parent_category_title = 'Название верхней категории';
-    $lang->category_title = 'Категория';
-    $lang->category_color = 'Цвет шрифта категории';
-    $lang->expand = 'Развернуть';
-    $lang->category_group_srls = 'Доступные группы';
-    
-    $lang->about_category_title = 'Добавьте дочернюю категорию';
-	$lang->cmd_enable_move_category = 'Изменить местоположение категории(после выделения перетащите верхнее меню)';
-
-    $lang->about_category_title = 'Введите название категории';
-    $lang->about_expand = 'Если эта опция выбрана, расширение будут применено всегда';
-    $lang->about_category_group_srls = 'Только выбранные группы можно отнести к этой категории';
-    $lang->about_category_color = 'Установить цвет шрифта категории. ex) red или #ff0000';
-
-    $lang->cmd_search_next = 'Искать дальше';
-
-    $lang->about_category_color = '분류 폰트색깔을 지정합니다.';
-    $lang->cmd_temp_save = 'Сохранить временно';
-
-	$lang->cmd_toggle_checked_document = 'Перевернуть выбранные объекты';
-    $lang->cmd_delete_checked_document = 'Удалить выбранные';
-    $lang->cmd_document_do = 'Эту запись...';
-
-    $lang->msg_cart_is_null = 'Выберите записи,которые Вы хотите удалить';
-    $lang->msg_category_not_moved = 'Невозможно переместить';
-    $lang->msg_is_secret = 'Секретная запись';
-    $lang->msg_checked_document_is_deleted = '%d записей удалено';
-
-    $lang->move_target_module = 'Этот модуль';
-
-        // Search targets in admin page
-        $lang->search_target_list = array(
-        'title' => 'Тема',
-        'content' => 'Содержание',
-        'user_id' => 'ID пользователя',
-        'member_srl' => 'No. пользователя',
-        'user_name' => 'Имя пользователя',
-        'nick_name' => 'Ник',
-        'email_address' => 'Email',
-        'homepage' => 'Домашняя страница',
-        'is_notice' => 'Объявления',
-        'is_secret' => 'Секретная запись',
-        'tags' => 'Тег',
-        'readed_count' => 'Количество просмотров (свыше)',
-        'voted_count' => 'Количество голосов (свыше)',
-        'comment_count ' => 'Количество записей (свыше)',
-        'trackback_count ' => 'Количество трекбеков (свыше)',
-        'uploaded_count ' => 'Количество вложений (прикрепленных файлов) (свыше)',
-        'regdate' => 'Дата регистрации',
-        'last_update' => 'Дата последнего обновления',
-        'ipaddress' => 'IP-Адрес',
-    );
-
-    $lang->alias = "Alias";
-    $lang->history = "History";
-    $lang->about_use_history = "Determine whether to enable history feature, if it is enabled, update history would be stored and possible to restore old revisions.";
-    $lang->trace_only = "Trace only";
-
-    $lang->cmd_trash = 'Корзина';
-    $lang->cmd_restore = 'Восстановить';
-    $lang->cmd_restore_all = 'Восстановить все';
-
-    $lang->in_trash = 'Корзина';
-    $lang->trash_nick_name = 'Ник удалителя';
-    $lang->trash_date = 'Дата удаления';
-    $lang->trash_description = 'Описание';
-
-	// Возможен поиск на странице админа
-    $lang->search_target_trash_list = array(
-        'title' => 'Тема',
-        'content' => 'Содержание',
-        'user_id' => 'ID',
-        'member_srl' =>'No пользователя',
-        'user_name' => 'Имя пользователя',
-        'nick_name' => 'Ник',
-        'trash_member_srl' => 'Номер удалителя',
-        'trash_user_name' => 'Имя удалителя',
-        'trash_nick_name' => 'Ник удалителя',
-        'trash_date' => 'Дата удаления',
-        'trash_ipaddress' => 'IP адрес удалителя',
-    );
-
-    $lang->success_trashed = 'Удалено в корзину';
-
-    $lang->success_trashed = "Successfully moved to trashcan";
-    $lang->msg_not_selected_document = '선택된 문서가 없습니다.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/tr.lang.php b/modules/document/lang/tr.lang.php
deleted file mode 100644
index 7aeb53892..000000000
--- a/modules/document/lang/tr.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Document module's basic language pack
-     **/
-
-    $lang->document_list = 'Belge Listesi';
-    $lang->thumbnail_type = 'Küçük Resim Türü';
-    $lang->thumbnail_crop = 'Kırpılmış';
-    $lang->thumbnail_ratio = 'Oran';
-    $lang->cmd_delete_all_thumbnail = 'Tüm küçük resimleri sil';
-    $lang->move_target_module = "Hedef modül ";
-    $lang->title_bold = 'Kalın';
-    $lang->title_color = 'Renk';
-    $lang->new_document_count = 'Yeni belgeler';
-
-    $lang->parent_category_title = 'Üst Kategori';
-    $lang->category_title = 'Kategori';
-    $lang->category_color = 'Kategori Yazı Rengi';
-    $lang->expand = 'Genişlet';
-    $lang->category_group_srls = 'Erişilebilir Grup';
-
-    $lang->cmd_make_child = 'Alt Kategori Ekle';
-    $lang->cmd_enable_move_category = "Kategori konumunu değiştir (Seçtikten sonra anamenüyü taşıyınız)";
-
-    $lang->about_category_title = 'Lütfen kategori ismi giriniz';
-    $lang->about_expand = 'Bu seçimle, her zaman genişletilmiş olacaktır';
-    $lang->about_category_group_srls = 'Sadece seçilen grup geçerli kategoriyi kullanabilecektir';
-    $lang->about_category_color = 'Kategorinin yazı rengini ayarlayabilirsiniz.';
-
-    $lang->cmd_search_next = 'Sonrakini Ara';
-
-    $lang->cmd_temp_save = 'Geçiçi olarak Kaydet';
-
-	$lang->cmd_toggle_checked_document = 'Seçili ögeleri ters çevir';
-    $lang->cmd_delete_checked_document = 'Seçilenleri Sil';
-    $lang->cmd_document_do = 'Şunu yap';
-
-    $lang->msg_cart_is_null = 'Lütfen silinecek makaleleri seçiniz';
-    $lang->msg_category_not_moved = 'Taşınamıyor';
-    $lang->msg_is_secret = 'Bu gizli bir makaledir';
-    $lang->msg_checked_document_is_deleted = '%d makale silinmiştir';
-
-    // Search targets in admin page
-        $lang->search_target_list = array(
-        'title' => 'Konu',
-        'content' => 'İçerik',
-        'user_id' => 'Kullanıcı Kimliği',
-        'member_srl' => 'Üye Seri Numarası',
-        'user_name' => 'Kullanıcı İsmi',
-        'nick_name' => 'Rumuz',
-        'email_address' => 'Email',
-        'homepage' => 'Anasayfa',
-        'is_notice' => 'Bildirim',
-        'is_secret' => 'Gizli',
-        'tags' => 'Etiket',
-        'readed_count' => 'Gösterim Sayısı (over)',
-        'voted_count' => 'Oylama Sayısı (over)',
-        'comment_count ' => 'Yorum Sayısı (over)',
-        'trackback_count ' => 'Geri İzleme Sayısı (over)',
-        'uploaded_count ' => 'Eklerin Sayısı (over)',
-        'regdate' => 'Tarih',
-        'last_update' => 'Son Güncelleme Tarihi',
-        'ipaddress' => 'IP Adresi',
-    );
-
-    $lang->alias = "Diğer Adıyla";
-    $lang->history = "Geçmiş";
-    $lang->about_use_history = "Geçmiş, belgeleri önceki değişikliklerine dönüştürmek içindir.";
-    $lang->trace_only = "Sadece izleme";
-
-    $lang->cmd_trash = 'Çöp Kutusu';
-    $lang->cmd_restore = 'Geri Yükleme';
-    $lang->cmd_restore_all = 'Hepsini Geri Yükle';
-
-    $lang->in_trash = 'Çöp Kutusu';
-    $lang->trash_nick_name = 'Silici';
-    $lang->trash_date = 'Silinme Tarihi';
-    $lang->trash_description = 'Açıklama';
-
-	$lang->search_target_trash_list = array(
-        'title' => 'Başlık',
-        'content' => 'İçerik',
-        'user_id' => 'Kullanıcı Kimliği',
-        'member_srl' => 'Üye Diziseli',
-        'user_name' => 'Kullanıcı İsmi',
-        'nick_name' => 'Rumuz',
-        'trash_member_srl' => 'Silici Diziseli',
-        'trash_user_name' => 'Silici İsmi',
-        'trash_nick_name' => 'Silici rumuzu',
-        'trash_date' => 'Silinme Tarihi',
-        'trash_ipaddress' => 'Silici IP adresi',
-    );
-
-    $lang->success_trashed = "Başarıyla silindi";
-    $lang->msg_not_selected_document = 'Hiçbir makale seçilmedi.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/vi.lang.php b/modules/document/lang/vi.lang.php
deleted file mode 100644
index 9e7fa67e4..000000000
--- a/modules/document/lang/vi.lang.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  DucDuy Dao (webmaster@xpressengine.vn)								  ░░
-			░░	* @Website:  http://xpressengine.vn												  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-*/
-
-    $lang->document_list = 'Danh sách bài viết';
-    $lang->thumbnail_type = 'Định dạng hình nhỏ';
-    $lang->thumbnail_crop = 'Hình cắt';
-    $lang->thumbnail_ratio = 'Tỉ lệ';
-    $lang->cmd_delete_all_thumbnail = 'Xóa tất cả hình nhỏ';
-    $lang->move_target_module = "Vị trí Module";
-    $lang->title_bold = 'Chữ đậm';
-    $lang->title_color = 'Màu';
-    $lang->new_document_count = 'Bài viết mới';
-
-    $lang->parent_category_title = 'Tên thể loại chính';
-    $lang->category_title = 'Tên thể loại nhỏ';
-    $lang->category_color = 'Màu chữ';
-    $lang->expand = 'Mở rộng';
-    $lang->category_group_srls = 'Nhóm được cho phép';
-
-    $lang->cmd_make_child = 'Thêm thể loại nhỏ';
-    $lang->cmd_enable_move_category = "Thay đổi vị trí thể loại (Kéo lên Menu trên sau khi lựa chọn)";
-
-    $lang->about_category_title = 'Hãy nhập tên thể loại';
-    $lang->about_expand = 'Nếu sử dụng tùy chọn này, Thể loại sẽ luôn luôn được trải rộng.';
-    $lang->about_category_group_srls = 'Chỉ những nhóm đã chọn mới được phép sử dụng thể loại này.';
-    $lang->about_category_color = 'Bạn có thể đặt màu cho thể loại.';
-
-    $lang->cmd_search_next = 'Tìm tiếp';
-
-    $lang->cmd_temp_save = 'Lưu tạm thời';
-
-	$lang->cmd_toggle_checked_document = 'Khôi phục những bài đã chọn';
-    $lang->cmd_delete_checked_document = 'Xóa những bài đã chọn';
-    $lang->cmd_document_do = 'Bình chọn / Phê bình';
-
-    $lang->msg_cart_is_null = 'Xin hãy chọn bài viết để xóa.';
-    $lang->msg_category_not_moved = 'Không thể di chuyển';
-    $lang->msg_is_secret = 'Bài viết này đã đặt bí mật';
-    $lang->msg_checked_document_is_deleted = '%d bài viết đã được xóa.';
-
-    // Search targets in admin page
-        $lang->search_target_list = array(
-        'title' => 'Tiêu đề',
-        'content' => 'Nội dung',
-        'user_id' => 'ID sử dụng',
-        'member_srl' => 'Mã thành viên',
-        'user_name' => 'Tên',
-        'nick_name' => 'Nickname',
-        'email_address' => 'Email',
-        'homepage' => 'Trang chủ',
-        'is_notice' => 'Chú ý',
-        'is_secret' => 'Bí mật',
-        'tags' => 'Tag',
-        'readed_count' => 'Lượt xem',
-        'voted_count' => 'Lượt bình chọn',
-        'comment_count ' => 'Số bình luận',
-        'trackback_count ' => 'Số liên kết Web',
-        'uploaded_count ' => 'Số đính kèm',
-        'regdate' => 'Ngày gửi',
-        'last_update' => 'Cập nhật lần cuối',
-        'ipaddress' => 'IP',
-    );
-	
-    $lang->alias = "Bí danh";
-    $lang->history = "Lịch sử";
-    $lang->about_use_history = "Chức năng này sẽ lưu lại những thay đổi trên bài viết. Nếu sử dụng chức năng này, bạn có thể khôi phục lại trạng thái ban đầu của bài viết.";
-    $lang->trace_only = "Chỉ theo dõi";
-	
-	$lang->cmd_trash = "Thùng rác";
-    $lang->cmd_restore = "Khôi phục";
-    $lang->cmd_restore_all = "Khôi phục tất cả";
-
-    $lang->in_trash = "Thùng rác";
-    $lang->trash_nick_name = "Người xóa";
-    $lang->trash_date = "Ngày xóa";
-    $lang->trash_description = "Mô tả";
-
-    // 관리자 페이지에서 휴지통의 검색할 대상
-    $lang->search_target_trash_list = array(
-        'title' => 'Tiêu đề',
-        'content' => 'Nội dung',
-        'user_id' => 'ID',
-        'member_srl' => 'Mã số thành viên',
-        'user_name' => 'Tên thật',
-        'nick_name' => 'NickName',
-        'trash_member_srl' => 'Mã số người xóa',
-        'trash_user_name' => 'Tên người xóa',
-        'trash_nick_name' => 'NickName người xóa',
-        'trash_date' => 'Ngày xóa',
-        'trash_ipaddress' => 'IP Người xóa',
-	);
-
-    $lang->success_trashed = "Đã chuyển tới thùng rác thành công.";
-    $lang->msg_not_selected_document = '선택된 문서가 없습니다.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/zh-CN.lang.php b/modules/document/lang/zh-CN.lang.php
deleted file mode 100644
index 1ebf2a1cf..000000000
--- a/modules/document/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  文章(document)模块语言包
-     **/
-
-    $lang->document_list = '主题列表';
-    $lang->thumbnail_type = '缩略图生成方式';
-    $lang->thumbnail_crop = '裁减(按指定大小裁剪图片)';
-    $lang->thumbnail_ratio = '比例(按原图比例缩略处理)';
-    $lang->cmd_delete_all_thumbnail = '删除全部缩略图';
-    $lang->title_bold = '粗标题';
-    $lang->title_color = '标题颜色';
-    $lang->new_document_count = '新帖';
-
-    $lang->parent_category_title = '上级分类名';
-    $lang->category_title = '分类名';
-    $lang->category_color = '分类颜色';
-    $lang->expand = '展开';
-    $lang->category_group_srls = '用户组';
-    
-    $lang->cmd_make_child = '添加下级分类';
-    $lang->cmd_enable_move_category = "分类顺序(勾选后用鼠标拖动分类项)";
-    
-    $lang->about_category_title = '请输入分类名。';
-    $lang->about_expand = '选择此项将维持展开状态。';
-    $lang->about_category_group_srls = '所选用户组才可以查看此分类。';
-    $lang->about_category_color = '请指定分类颜色（必须带#符号）。ex）#ff0000';
-
-    $lang->cmd_search_next = '继续搜索';
-
-    $lang->cmd_temp_save = '临时保存';
-
-    $lang->cmd_toggle_checked_document = '反选';
-    $lang->cmd_delete_checked_document = '删除所选';
-    $lang->cmd_document_do = '将把此主题..';
-
-    $lang->msg_cart_is_null = '请选择要删除的文章。';
-    $lang->msg_category_not_moved = '不能移动！';
-    $lang->msg_is_secret = '这是密帖！';
-    $lang->msg_checked_document_is_deleted = '删除了%d个文章。';
-
-    $lang->move_target_module = '目标模块';
-
-    // 管理页面查找的对象
-    $lang->search_target_list = array(
-        'title' => '标题',
-        'content' => '内容',
-        'user_id' => 'I D',
-        'member_srl' => '会员编号',
-        'user_name' => '姓名',
-        'nick_name' => '昵称',
-        'email_address' => '电子邮件',
-        'homepage' => '主页',
-        'is_notice' => '公告',
-        'is_secret' => '密帖',
-        'tags' => '标签',
-        'readed_count' => '查看数（以上）',
-        'voted_count' => '推荐数（以上）',
-        'comment_count ' => '评论数（以上）',
-        'trackback_count ' => '引用数（以上）',
-        'uploaded_count ' => '上传附件数（以上）',
-        'regdate' => '登录日期',
-        'last_update' => '最近更新日期',
-        'ipaddress' => 'IP 地址',
-    );
-
-    $lang->alias = "Alias";
-    $lang->history = "历史版本功能";
-    $lang->about_use_history = "启用历史版本功能它将记录主题修改版本，并还可以复原到之前版本。";
-    $lang->trace_only = "只留痕迹";
-
-    $lang->cmd_trash = "回收箱";
-    $lang->cmd_restore = "复原";
-    $lang->cmd_restore_all = "全部复原";
-
-    $lang->in_trash = "回收箱";
-    $lang->trash_nick_name = "操作人昵称";
-    $lang->trash_date = "删除日期";
-    $lang->trash_description = "说明";
-
-    // 管理页面回收箱搜索对象
-    $lang->search_target_trash_list = array(
-        'title' => '标题',
-        'content' => '内容',
-        'user_id' => '用户名',
-        'member_srl' => '会员编号',
-        'user_name' => '姓名',
-        'nick_name' => '昵称',
-        'trash_member_srl' => '操作人会员编号',
-        'trash_user_name' => '操作人用户名',
-        'trash_nick_name' => '操作人昵称',
-        'trash_date' => '删除日期',
-        'trash_ipaddress' => '操作人IP地址',
-    );
-
-    $lang->success_trashed = '已成功移除到回收箱。';
-    $lang->msg_not_selected_document = '선택된 문서가 없습니다.';
-	$lang->show_voted_member = '사용자 노출';
-?>
diff --git a/modules/document/lang/zh-TW.lang.php b/modules/document/lang/zh-TW.lang.php
deleted file mode 100644
index 7529bd730..000000000
--- a/modules/document/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-    /**
-     * @file   modules/document/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  主題(document)模組正體中文語言
-     **/
-
-    $lang->document_list = '主題列表';
-    $lang->thumbnail_type = '縮圖建立方式';
-    $lang->thumbnail_crop = '裁減';
-    $lang->thumbnail_ratio = '比例';
-    $lang->cmd_delete_all_thumbnail = '刪除全部縮圖';
-    $lang->title_bold = '粗體';
-    $lang->title_color = '標題顏色';
-    $lang->new_document_count = 'N';
-
-    $lang->parent_category_title = '主分類';
-    $lang->category_title = '分類名稱';
-    $lang->category_color = '分類顏色';
-    $lang->expand = '展開';
-    $lang->category_group_srls = '群組';
-
-    $lang->cmd_make_child = '新增子分類';
-    $lang->cmd_enable_move_category = '分類順序(勾選後用滑鼠拖曳分類項目)';
-
-    $lang->about_category_title = '請輸入分類名稱。';
-    $lang->about_expand = '選擇此項將維持展開狀態。';
-    $lang->about_category_group_srls = '被選擇的群組才可以檢視此分類。';
-    $lang->about_category_color = '設定分類顏色。例)紅色為 #ff0000';
-
-    $lang->cmd_search_next = '繼續搜尋';
-
-    $lang->cmd_temp_save = '臨時儲存';
-
-    $lang->cmd_toggle_checked_document = '反選';
-    $lang->cmd_delete_checked_document = '刪除所選';
-    $lang->cmd_document_do = '將此主題..';
-
-    $lang->msg_cart_is_null = '請選擇要刪除的文章。';
-    $lang->msg_category_not_moved = '無法移動！';
-    $lang->msg_is_secret = '秘密！';
-    $lang->msg_checked_document_is_deleted = '刪除%d個文章。';
-
-    $lang->move_target_module = '移到';
-
-    // 管理者頁面中搜尋的內容
-    $lang->search_target_list = array(
-        'title' => '標題',
-        'content' => '內容',
-        'user_id' => '帳號',
-        'member_srl' => '會員編號',
-        'user_name' => '姓名',
-        'nick_name' => '暱稱',
-        'email_address' => '電子郵件',
-        'homepage' => '主頁',
-        'is_notice' => '公告',
-        'is_secret' => '秘密',
-        'tags' => '標籤',
-        'readed_count' => '點閱數(以上)',
-        'voted_count' => '推薦數(以上)',
-        'comment_count ' => '評論數(以上)',
-        'trackback_count ' => '引用數(以上)',
-        'uploaded_count ' => '上傳檔案數(以上)',
-        'regdate' => '登錄日期',
-        'last_update' => '最近更新',
-        'ipaddress' => 'IP位址',
-    );
-
-    $lang->alias = "Alias";
-    $lang->history = "歷史紀錄";
-    $lang->about_use_history = "選擇是否使用歷史記錄功能。選擇使用，將能夠編輯歷史紀錄並還原。";
-    $lang->trace_only = "追蹤";
-
-    $lang->cmd_trash = "垃圾桶";
-    $lang->cmd_restore = "還原";
-    $lang->cmd_restore_all = "全部還原";
-
-    $lang->in_trash = "垃圾桶";
-    $lang->trash_nick_name = "暱稱";
-    $lang->trash_date = "刪除日期";
-    $lang->trash_description = "原因";
-
-    // 管理者頁面中垃圾桶的搜尋目標
-    $lang->search_target_trash_list = array(
-        'title' => '標題',
-        'content' => '內容',
-        'user_id' => '帳號',
-        'member_srl' => '會員編號',
-        'user_name' => '姓名',
-        'nick_name' => '暱稱',
-        'trash_member_srl' => '移除會員編號',
-        'trash_user_name' => '移除姓名',
-        'trash_nick_name' => '移除暱稱',
-        'trash_date' => '刪除日期',
-        'trash_ipaddress' => '移除 IP 位址',
-    );
-
-    $lang->success_trashed = "成功地移到垃圾桶";
-    $lang->msg_not_selected_document = '尚未選擇主題';
-	$lang->show_voted_member = '投票會員';
-?>
diff --git a/modules/document/queries/deleteDocument.xml b/modules/document/queries/deleteDocument.xml
index 9fccf5c8d..cc32e7a90 100644
--- a/modules/document/queries/deleteDocument.xml
+++ b/modules/document/queries/deleteDocument.xml
@@ -2,6 +2,7 @@
     <tables>
         <table name="documents" />
     </tables>
+	<priority type="low" />
     <conditions>
         <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
     </conditions>
diff --git a/modules/document/queries/deleteDocumentDeclaredLog.xml b/modules/document/queries/deleteDocumentDeclaredLog.xml
new file mode 100644
index 000000000..37d26457a
--- /dev/null
+++ b/modules/document/queries/deleteDocumentDeclaredLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteDocumentDeclaredLog" action="delete">
+    <tables>
+        <table name="document_declared_log" />
+    </tables>
+    <conditions>
+        <condition operation="in" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/deleteDocumentReadedLog.xml b/modules/document/queries/deleteDocumentReadedLog.xml
new file mode 100644
index 000000000..4d1138767
--- /dev/null
+++ b/modules/document/queries/deleteDocumentReadedLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteDocumentReadedLog" action="delete">
+    <tables>
+        <table name="document_readed_log" />
+    </tables>
+    <conditions>
+        <condition operation="in" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/deleteDocumentVotedLog.xml b/modules/document/queries/deleteDocumentVotedLog.xml
new file mode 100644
index 000000000..bd550122c
--- /dev/null
+++ b/modules/document/queries/deleteDocumentVotedLog.xml
@@ -0,0 +1,8 @@
+<query id="deleteDocumentVotedLog" action="delete">
+    <tables>
+        <table name="document_voted_log" />
+    </tables>
+    <conditions>
+        <condition operation="in" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getChildCategoryMinListOrder.xml b/modules/document/queries/getChildCategoryMinListOrder.xml
index 0ae643680..5a3407ff5 100644
--- a/modules/document/queries/getChildCategoryMinListOrder.xml
+++ b/modules/document/queries/getChildCategoryMinListOrder.xml
@@ -1,12 +1,12 @@
-<query id="getChildCategoryMinListOrder" action="select">
-    <tables>
-        <table name="document_categories" />
-    </tables>
-    <columns>
-        <column name="min(list_order)" alias="list_order" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="parent_srl" var="parent_srl" default="0" filter="number" notnull="notnull" />
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />
-    </conditions>
-</query>
+<query id="getChildCategoryMinListOrder" action="select">
+    <tables>
+        <table name="document_categories" />
+    </tables>
+    <columns>
+        <column name="min(list_order)" alias="list_order" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="parent_srl" var="parent_srl" default="0" filter="number" notnull="notnull" />
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getDocumentCount.xml b/modules/document/queries/getDocumentCount.xml
index bfd58f7aa..96995d139 100644
--- a/modules/document/queries/getDocumentCount.xml
+++ b/modules/document/queries/getDocumentCount.xml
@@ -7,14 +7,33 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="category_srl" var="category_srl" />
+        <condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
+        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="title" var="s_title" />
             <condition operation="like" column="content" var="s_content" pipe="and" />
             <condition operation="like" column="user_name" var="s_user_name" pipe="and" />
+            <condition operation="like" column="user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="email_address" var="s_email_addres" pipe="or" />
+            <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
+            <condition operation="like" column="tags" var="s_tags" pipe="or" />
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="and" />
-            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="and" />
+            <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
+            <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
+            <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
+            <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
             <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="and" />
+            <condition operation="like_prefix" column="last_update" var="s_last_update" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="and" />
+        </group>
+        <group pipe="and">
+            <condition operation="more" column="last_update" var="start_date" pipe="and" />
+            <condition operation="less" column="last_update" var="end_date" pipe="and" />
         </group>
     </conditions>
 </query>
diff --git a/modules/document/queries/getDocumentCountByDate.xml b/modules/document/queries/getDocumentCountByDate.xml
new file mode 100644
index 000000000..cd95b57ab
--- /dev/null
+++ b/modules/document/queries/getDocumentCountByDate.xml
@@ -0,0 +1,13 @@
+<query id="getDocumentCountByDate" action="select">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+		<condition operation="in" column="module_srl" var="moduleSrlList" />
+		<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/getDocumentCountByGroupStatus.xml b/modules/document/queries/getDocumentCountByGroupStatus.xml
new file mode 100644
index 000000000..06cbb77ff
--- /dev/null
+++ b/modules/document/queries/getDocumentCountByGroupStatus.xml
@@ -0,0 +1,43 @@
+<query id="getDocumentCountByGroupStatus" action="select">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="status" alias="status" />
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" />
+        <condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="category_srl" var="category_srl" />
+        <condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
+        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="title" var="s_title" />
+            <condition operation="like" column="content" var="s_content" pipe="and" />
+            <condition operation="like" column="user_name" var="s_user_name" pipe="and" />
+            <condition operation="like" column="user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="email_address" var="s_email_addres" pipe="or" />
+            <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
+            <condition operation="like" column="tags" var="s_tags" pipe="or" />
+            <condition operation="equal" column="member_srl" var="s_member_srl" pipe="and" />
+            <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
+            <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
+            <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
+            <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="and" />
+            <condition operation="like_prefix" column="last_update" var="s_last_update" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="and" />
+        </group>
+        <group pipe="and">
+            <condition operation="more" column="last_update" var="start_date" pipe="and" />
+            <condition operation="less" column="last_update" var="end_date" pipe="and" />
+        </group>
+    </conditions>
+	<groups>
+		<group column="status" />
+	</groups>
+</query>
diff --git a/modules/document/queries/getDocumentDivisionUseIndex.xml b/modules/document/queries/getDocumentDivisionUseIndex.xml
new file mode 100644
index 000000000..7f341f11e
--- /dev/null
+++ b/modules/document/queries/getDocumentDivisionUseIndex.xml
@@ -0,0 +1,20 @@
+<query id="getDocumentDivisionUseIndex" action="select">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+	<index_hint name="idx_list_order" type="use" />
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srl" filter="number" />
+        <condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
+        <condition operation="more" column="list_order" var="list_order" filter="number" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="list_order" order="order_type" />
+        <list_count var="list_count" default="1" />
+        <page_count var="page_count" default="1" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/getDocumentList.xml b/modules/document/queries/getDocumentList.xml
index a8726e1df..768d2c33e 100644
--- a/modules/document/queries/getDocumentList.xml
+++ b/modules/document/queries/getDocumentList.xml
@@ -11,6 +11,7 @@
         <condition operation="in" column="category_srl" var="category_srl" pipe="and" />
         <condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
         <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="more" column="list_order" var="division" pipe="and" />
             <condition operation="below" column="list_order" var="last_division" pipe="and" />
@@ -24,7 +25,6 @@
             <condition operation="like" column="email_address" var="s_email_addres" pipe="or" />
             <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
             <condition operation="like" column="tags" var="s_tags" pipe="or" />
-            <condition operation="equal" column="is_secret" var="s_is_secret" pipe="or" />
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentListExtraSort.xml b/modules/document/queries/getDocumentListExtraSort.xml
new file mode 100644
index 000000000..eba5bc7b2
--- /dev/null
+++ b/modules/document/queries/getDocumentListExtraSort.xml
@@ -0,0 +1,53 @@
+<query id="getDocumentList" action="select">
+    <tables>
+        <table name="documents" alias="d" />
+        <table name="document_extra_vars" alias="ev" />
+    </tables>
+    <columns>
+        <column name="d.*" />
+    </columns>
+	<index_hint name="idx_document_list_order" type="use" />
+    <conditions>
+        <condition operation="equal" column="ev.eid" var="sort_index" />
+        <condition operation="equal" column="ev.document_srl" default="d.document_srl" pipe="and" />
+        <condition operation="in" column="d.module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="notin" column="d.module_srl" var="exclude_module_srl" filter="number" pipe="and" />
+        <condition operation="in" column="d.category_srl" var="category_srl" pipe="and" />
+        <condition operation="equal" column="d.is_notice" var="s_is_notice" pipe="and" />
+        <condition operation="equal" column="d.member_srl" var="member_srl" filter="number" pipe="and" />
+        <group pipe="and">
+            <condition operation="more" column="d.list_order" var="division" pipe="and" />
+            <condition operation="below" column="d.list_order" var="last_division" pipe="and" />
+        </group>
+        <group pipe="and">
+            <condition operation="like" column="d.title" var="s_title" />
+            <condition operation="like" column="d.content" var="s_content" pipe="or" />
+            <condition operation="like" column="d.user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="d.user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="d.nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="d.email_address" var="s_email_addres" pipe="or" />
+            <condition operation="like" column="d.homepage" var="s_homepage" pipe="or" />
+            <condition operation="like" column="d.tags" var="s_tags" pipe="or" />
+            <condition operation="equal" column="d.is_secret" var="s_is_secret" pipe="or" />
+            <condition operation="equal" column="d.member_srl" var="s_member_srl" pipe="or" />
+            <condition operation="more" column="d.readed_count" var="s_readed_count" pipe="or" />
+            <condition operation="more" column="d.voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="more" column="d.comment_count" var="s_comment_count" pipe="or" />
+            <condition operation="more" column="d.trackback_count" var="s_trackback_count" pipe="or" />
+            <condition operation="more" column="d.uploaded_count" var="s_uploaded_count" pipe="or" />
+            <condition operation="like_prefix" column="d.regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="d.last_update" var="s_last_update" pipe="or" />
+            <condition operation="like_prefix" column="d.ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
+        <group pipe="and">
+            <condition operation="more" column="d.last_update" var="start_date" pipe="and" />
+            <condition operation="less" column="d.last_update" var="end_date" pipe="and" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="ev.value" default="ev.value" order="order_type" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/getDocumentListUseIndex.xml b/modules/document/queries/getDocumentListUseIndex.xml
new file mode 100644
index 000000000..d7338d5b7
--- /dev/null
+++ b/modules/document/queries/getDocumentListUseIndex.xml
@@ -0,0 +1,49 @@
+<query id="getDocumentList" action="select">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+	<index_hint name="idx_list_order" type="use" />
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srl" filter="number" />
+        <condition operation="notin" column="module_srl" var="exclude_module_srl" filter="number" pipe="and" />
+        <condition operation="in" column="category_srl" var="category_srl" pipe="and" />
+        <condition operation="equal" column="is_notice" var="s_is_notice" pipe="and" />
+        <condition operation="equal" column="member_srl" var="member_srl" filter="number" pipe="and" />
+        <group pipe="and">
+            <condition operation="more" column="list_order" var="division" pipe="and" />
+            <condition operation="below" column="list_order" var="last_division" pipe="and" />
+        </group>
+        <group pipe="and">
+            <condition operation="like" column="title" var="s_title" />
+            <condition operation="like" column="content" var="s_content" pipe="or" />
+            <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="nick_name" var="s_nick_name" pipe="or" />
+            <condition operation="like" column="email_address" var="s_email_addres" pipe="or" />
+            <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
+            <condition operation="like" column="tags" var="s_tags" pipe="or" />
+            <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
+            <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
+            <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
+            <condition operation="more" column="comment_count" var="s_comment_count" pipe="or" />
+            <condition operation="more" column="trackback_count" var="s_trackback_count" pipe="or" />
+            <condition operation="more" column="uploaded_count" var="s_uploaded_count" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="last_update" var="s_last_update" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
+        <group pipe="and">
+            <condition operation="more" column="last_update" var="start_date" pipe="and" />
+            <condition operation="less" column="last_update" var="end_date" pipe="and" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="list_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/getDocumentListWithinMember.xml b/modules/document/queries/getDocumentListWithinMember.xml
index 1f5f93ea7..af2f1b610 100644
--- a/modules/document/queries/getDocumentListWithinMember.xml
+++ b/modules/document/queries/getDocumentListWithinMember.xml
@@ -9,6 +9,7 @@
         <condition operation="equal" column="documents.member_srl" var="member.member_srl" notnull="notnull" pipe="and" />
         <condition operation="equal" column="documents.module_srl" var="module_srl" filter="number" pipe="and" />
         <condition operation="equal" column="documents.category_srl" var="category_srl" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="documents.title" var="s_title" />
             <condition operation="like" column="documents.content" var="s_content" pipe="or" />
@@ -18,7 +19,6 @@
             <condition operation="like" column="documents.homepage" var="s_homepage" pipe="or" />
             <condition operation="like" column="documents.tags" var="s_tags" pipe="or" />
             <condition operation="equal" column="documents.is_notice" var="s_is_notice" pipe="or" />
-            <condition operation="equal" column="documents.is_secret" var="s_is_secret" pipe="or" />
             <condition operation="equal" column="documents.member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="documents.readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="documents.voted_count" var="s_voted_count" pipe="or" />
diff --git a/modules/document/queries/getDocumentPage.xml b/modules/document/queries/getDocumentPage.xml
index b98bd3b96..3c8ec5aea 100644
--- a/modules/document/queries/getDocumentPage.xml
+++ b/modules/document/queries/getDocumentPage.xml
@@ -21,6 +21,7 @@
         <condition operation="less" column="regdate" var="rev_regdate" filter="number" pipe="and" />
         <condition operation="less" column="update_order" var="update_order" filter="number" pipe="and" />
         <condition operation="more" column="update_order" var="rev_update_order" filter="number" pipe="and" />
+        <condition operation="in" column="status" var="statusList" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="title" var="s_title" />
             <condition operation="like" column="content" var="s_content" pipe="or" />
@@ -30,7 +31,6 @@
             <condition operation="like" column="email_address" var="s_email_addres" pipe="or" />
             <condition operation="like" column="homepage" var="s_homepage" pipe="or" />
             <condition operation="like" column="tags" var="s_tags" pipe="or" />
-            <condition operation="equal" column="is_secret" var="s_is_secret" pipe="or" />
             <condition operation="equal" column="member_srl" var="s_member_srl" pipe="or" />
             <condition operation="more" column="readed_count" var="s_readed_count" pipe="or" />
             <condition operation="more" column="voted_count" var="s_voted_count" pipe="or" />
diff --git a/modules/document/queries/insertCategory.xml b/modules/document/queries/insertCategory.xml
index 5624c1618..442ac1e1b 100644
--- a/modules/document/queries/insertCategory.xml
+++ b/modules/document/queries/insertCategory.xml
@@ -6,6 +6,7 @@
         <column name="category_srl" var="category_srl" filter="number" notnull="notnull" />
         <column name="module_srl" var="module_srl" filter="number" default="0" notnull="notnull" />
         <column name="title" var="title" notnull="notnull" minlength="1" maxlength="250" />
+        <column name="description" var="description" maxlength="2000"/>
         <column name="document_count" var="document_count" default="0" />
         <column name="regdate" var="regdate" default="curdate()" />
         <column name="expand" var="expand" />
diff --git a/modules/document/queries/insertDocument.xml b/modules/document/queries/insertDocument.xml
index 6ecf8e07f..c7d537ebe 100644
--- a/modules/document/queries/insertDocument.xml
+++ b/modules/document/queries/insertDocument.xml
@@ -2,13 +2,13 @@
     <tables>
         <table name="documents" />
     </tables>
+	<priority type="low" />
     <columns>
         <column name="document_srl" var="document_srl" filter="number" notnull="notnull" />
         <column name="module_srl" var="module_srl" filter="number" default="0" />
         <column name="category_srl" var="category_srl" filter="number" default="0" />
         <column name="lang_code" var="lang_code" default="" />
         <column name="is_notice" var="is_notice" notnull="notnull" default="N" />
-        <column name="is_secret" var="is_secret" notnull="notnull" default="N" />
         <column name="title" var="title" notnull="notnull" minlength="1" maxlength="250" />
         <column name="title_bold" var="title_bold" default="N" />
         <column name="title_color" var="title_color" default="N" />
@@ -33,9 +33,9 @@
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="list_order" var="list_order" default="0" />
         <column name="update_order" var="update_order" default="0" />
-        <column name="allow_comment" var="allow_comment" default="Y" />
-        <column name="lock_comment" var="lock_comment" default="N" />
         <column name="allow_trackback" var="allow_trackback" default="Y" />
         <column name="notify_message" var="notify_message" default="N" />
+        <column name="status" var="status" default="PUBLIC" />
+        <column name="comment_status" var="commentStatus" default="ALLOW" />
     </columns>
 </query>
diff --git a/modules/document/queries/insertDocumentExtraKey.xml b/modules/document/queries/insertDocumentExtraKey.xml
index 8bf33a63f..47d9229b2 100644
--- a/modules/document/queries/insertDocumentExtraKey.xml
+++ b/modules/document/queries/insertDocumentExtraKey.xml
@@ -9,8 +9,8 @@
         <column name="var_type" var="var_type" notnull="notnull" />
         <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
         <column name="var_search" var="var_search" default="N" notnull="notnull" />
-        <column name="var_default" var="var_default" notnull="notnull" />
-        <column name="var_desc" var="var_desc" notnull="notnull" />
+        <column name="var_default" var="var_default" />
+        <column name="var_desc" var="var_desc" />
         <column name="eid" var="eid" notnull="notnull" />
     </columns>
 </query>
diff --git a/modules/document/queries/updateCategory.xml b/modules/document/queries/updateCategory.xml
index eafea4f3c..9180af6cb 100644
--- a/modules/document/queries/updateCategory.xml
+++ b/modules/document/queries/updateCategory.xml
@@ -4,6 +4,7 @@
     </tables>
     <columns>
         <column name="title" var="title" />
+        <column name="description" var="description" />
         <column name="list_order" var="list_order" />
         <column name="last_update" var="last_update" default="curdate()" />
         <column name="expand" var="expand" />
diff --git a/modules/document/queries/updateDocument.xml b/modules/document/queries/updateDocument.xml
index b19d13aed..47411ad8b 100644
--- a/modules/document/queries/updateDocument.xml
+++ b/modules/document/queries/updateDocument.xml
@@ -2,11 +2,11 @@
     <tables>
         <table name="documents" />
     </tables>
+	<priority type="low" />
     <columns>
         <column name="module_srl" var="module_srl" filter="number" default="0" />
         <column name="category_srl" var="category_srl" filter="number" default="0" />
         <column name="is_notice" var="is_notice" notnull="notnull" default="N" />
-        <column name="is_secret" var="is_secret" notnull="notnull" default="N" />
         <column name="title" var="title" notnull="notnull" minlength="1" maxlength="250" />
         <column name="title_bold" var="title_bold" default="N" />
         <column name="title_color" var="title_color" default="N" />
@@ -21,14 +21,15 @@
         <column name="homepage" var="homepage" filter="homepage" maxlength="250" />
         <column name="tags" var="tags" default="" />
         <column name="extra_vars" var="extra_vars" />
+        <column name="regdate" var="regdate" />
         <column name="last_update" var="last_update" default="curdate()" />
         <column name="ipaddress" var="ipaddress" default="ipaddress()" />
         <column name="list_order" var="list_order" />
         <column name="update_order" var="update_order" default="0" />
-        <column name="allow_comment" var="allow_comment" default="Y" />
-        <column name="lock_comment" var="lock_comment" default="N" />
         <column name="allow_trackback" var="allow_trackback" default="Y" />
         <column name="notify_message" var="notify_message" default="N" />
+        <column name="status" var="status" default="PUBLIC" />
+        <column name="comment_status" var="commentStatus" default="ALLOW" />
     </columns>
     <conditions>
         <condition operation="equal" column="document_srl" var="document_srl" filter="number" notnull="notnull" />
diff --git a/modules/document/queries/updateDocumentCommentStatus.xml b/modules/document/queries/updateDocumentCommentStatus.xml
new file mode 100644
index 000000000..e06829015
--- /dev/null
+++ b/modules/document/queries/updateDocumentCommentStatus.xml
@@ -0,0 +1,12 @@
+<query id="updateDocumentCommentStatus" action="update">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="comment_status" var="commentStatus" default="ALLOW" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="allow_comment" var="allowComment" default="Y" pipe="and" />
+        <condition operation="equal" column="lock_comment" var="lockComment" default="N" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/document/queries/updateDocumentExtraKey.xml b/modules/document/queries/updateDocumentExtraKey.xml
index 3c25dba8e..fb45dc769 100644
--- a/modules/document/queries/updateDocumentExtraKey.xml
+++ b/modules/document/queries/updateDocumentExtraKey.xml
@@ -7,8 +7,8 @@
         <column name="var_type" var="var_type" notnull="notnull" />
         <column name="var_is_required" var="var_is_required" default="N" notnull="notnull" />
         <column name="var_search" var="var_search" default="N" notnull="notnull" />
-        <column name="var_default" var="var_default" default="" />
-        <column name="var_desc" var="var_desc" default="" />
+        <column name="var_default" var="var_default" />
+        <column name="var_desc" var="var_desc" />
         <column name="eid" var="eid" notnull="notnull" />
     </columns>
     <conditions>
diff --git a/modules/document/queries/updateDocumentExtraVar.xml b/modules/document/queries/updateDocumentExtraVar.xml
index 4edc3501f..58050bbb2 100644
--- a/modules/document/queries/updateDocumentExtraVar.xml
+++ b/modules/document/queries/updateDocumentExtraVar.xml
@@ -3,7 +3,7 @@
         <table name="document_extra_vars" />
     </tables>
     <columns>
-        <column name="value" var="value" notnull="notnull" />
+        <column name="value" var="value" />
         <column name="lang_code" var="lang_code" />
         <column name="eid" var="eid" />
     </columns>
diff --git a/modules/document/queries/updateDocumentStatus.xml b/modules/document/queries/updateDocumentStatus.xml
new file mode 100644
index 000000000..391354a80
--- /dev/null
+++ b/modules/document/queries/updateDocumentStatus.xml
@@ -0,0 +1,13 @@
+<query id="updateDocumentStatus" action="update">
+    <tables>
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="status" var="status" default="SECRET" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="document_srl" var="document_srl" pipe="and" />
+        <condition operation="equal" column="is_secret" var="is_secret" pipe="and" />
+    </conditions>
+</query>
+
diff --git a/modules/document/queries/updateDocumentsAllowCommentTrackback.xml b/modules/document/queries/updateDocumentsAllowCommentTrackback.xml
index f425d8934..bf2733dab 100644
--- a/modules/document/queries/updateDocumentsAllowCommentTrackback.xml
+++ b/modules/document/queries/updateDocumentsAllowCommentTrackback.xml
@@ -3,7 +3,7 @@
         <table name="documents" />
     </tables>
     <columns>
-        <column name="allow_comment" var="allow_comment" default="Y" />
+        <column name="comment_status" var="commentStatus" default="ALLOW" />
         <column name="allow_trackback" var="allow_trackback" default="Y" />
     </columns>
     <conditions>
diff --git a/modules/document/ruleset/deleteAlias.xml b/modules/document/ruleset/deleteAlias.xml
new file mode 100644
index 000000000..8a43d41fe
--- /dev/null
+++ b/modules/document/ruleset/deleteAlias.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="target_srl" required="true" rule="number" default="0" />
+		<field name="document_srl" required="true" rule="number" default="0" />
+    </fields>
+</ruleset>
diff --git a/modules/document/ruleset/insertAlias.xml b/modules/document/ruleset/insertAlias.xml
new file mode 100644
index 000000000..220b84058
--- /dev/null
+++ b/modules/document/ruleset/insertAlias.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_srl" required="true" rule="number" default="0" />
+		<field name="document_srl" required="true" rule="number" default="0" />
+		<field name="alias_title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/document/ruleset/insertCategory.xml b/modules/document/ruleset/insertCategory.xml
new file mode 100644
index 000000000..a054915aa
--- /dev/null
+++ b/modules/document/ruleset/insertCategory.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_srl" required="true" rule="number" default="0" />
+		<field name="category_srl" rule="number" default="0" />
+		<field name="category_title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/document/ruleset/insertExtraVar.xml b/modules/document/ruleset/insertExtraVar.xml
new file mode 100644
index 000000000..ac7778403
--- /dev/null
+++ b/modules/document/ruleset/insertExtraVar.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="name" required="true" />
+		<field name="module_srl" required="true" rule="number" />
+		<field name="eid" required="true" rule="alpha_number" />
+    </fields>
+</ruleset>
diff --git a/modules/document/schemas/document_categories.xml b/modules/document/schemas/document_categories.xml
index b12f295df..def7de642 100644
--- a/modules/document/schemas/document_categories.xml
+++ b/modules/document/schemas/document_categories.xml
@@ -10,4 +10,5 @@
     <column name="list_order" type="number" size="11" notnull="notnull" />
     <column name="group_srls" type="text" />
     <column name="color" type="varchar" size="11" />
+	<column name="description" type="varchar" size="200" />
 </table>
diff --git a/modules/document/schemas/documents.xml b/modules/document/schemas/documents.xml
index aaa53a832..1f45a3a7d 100644
--- a/modules/document/schemas/documents.xml
+++ b/modules/document/schemas/documents.xml
@@ -4,7 +4,6 @@
     <column name="category_srl" type="number" size="11" default="0" notnull="notnull" index="idx_category_srl" />
     <column name="lang_code" type="varchar" size="10" default="" notnull="notnull" />
     <column name="is_notice" type="char" size="1" default="N" notnull="notnull" index="idx_is_notice" />
-    <column name="is_secret" type="char" size="1" default="N" notnull="notnull" index="idx_is_secret" />
     <column name="title" type="varchar" size="250" />
     <column name="title_bold" type="char" size="1" default="N" notnull="notnull" />
     <column name="title_color" type="varchar" size="7" />
@@ -30,8 +29,8 @@
     <column name="ipaddress" type="varchar" size="128" notnull="notnull" index="idx_ipaddress" />
     <column name="list_order" type="number" size="11" notnull="notnull" index="idx_list_order" />
     <column name="update_order" type="number" size="11" notnull="notnull" index="idx_update_order" />
-    <column name="allow_comment" type="char" size="1" default="Y" notnull="notnull" />
-    <column name="lock_comment" type="char" size="1" default="N" notnull="notnull" />
     <column name="allow_trackback" type="char" size="1" default="Y" notnull="notnull" />
     <column name="notify_message" type="char" size="1" default="N" notnull="notnull" />
+    <column name="status" type="varchar" size="20" default="PUBLIC" />
+    <column name="comment_status" type="varchar" size="20" default="ALLOW" />
 </table>
diff --git a/modules/document/tpl/category_info.html b/modules/document/tpl/category_info.html
index b90066f26..26d094672 100644
--- a/modules/document/tpl/category_info.html
+++ b/modules/document/tpl/category_info.html
@@ -1,62 +1,65 @@
 
 <input type="hidden" name="category_srl" value="{$category_info->category_srl}" />
 <input type="hidden" name="parent_srl" value="{$category_info->parent_srl}" />
-
-<div class="layer boxModelController" style="display:block">
-
-    <h4 class="xeAdmin">{$lang->category}</h4>
-    <button class="xButton" type="button" onclick="hideCategoryInfo();return false" ><span>{$lang->cmd_close}</span></button>
-
-    <div class="layerBody">
-
-        <table cellspacing="0" class="rowTable">
-        <!--@if($category_info->parent_category_title)-->
-        <tr>
-            <th scope="row"><div>{$lang->parent_category_title}</div></th>
-            <td class="wide">{$category_info->parent_category_title}</td>
-        </tr>
-        <!--@end-->
-        <tr>
-            <th scope="row"><div>{$lang->category_title}</div></th>
-            <td>
-                <input type="text" name="category_title" id="category_name" value="{$category_info->title}" class="inputTypeText" />
-                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','category_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->category_color}</div></th>
-            <td>
-                <input type="text" name="category_color" value="{htmlspecialchars($category_info->color)}" class="color-indicator inputTypeText" />
-                <p>{$lang->about_category_color}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->expand}</div></th>
-            <td>
-                <input type="checkbox" name="expand" value="Y" <!--@if($category_info->expand=="Y")-->checked="checked"<!--@end--> class="checkbox" />
-                <p>{$lang->about_expand}</p>
-            </td>
-        </tr>
-        <tr >
-            <th scope="row2"><div>{$lang->category_group_srls} <input type="checkbox" onclick="XE.checkboxToggleAll('group_srls'); return false;" /></div></th>
-            <td>
-                <!--@foreach($group_list as $key=>$val)-->
-                <div><input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($category_info->group_srls)&&in_array($key, $category_info->group_srls))-->checked="checked"<!--@end--> class="checkbox" /> <label for="group_{$key}">{$val->title}</label></div>
-                <!--@end-->
-                <p>{$lang->about_category_group_srls}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row" colspan="2" class="button">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-            </th>
-        </tr>
-        </table>
-
-    </div>
+<div class="layer">
+	<button type="button" class="layerClose" title="Close this layer." onclick="jQuery(this).closest('#category_info').hide();">X</button>
+	<h3 class="h3">{$lang->category}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<!--@if($category_info->parent_category_title)-->
+			<tr>
+				<th scope="row">{$lang->parent_category_title}</th>
+				<td >{$category_info->parent_category_title}</td>
+			</tr>
+			<!--@end-->
+			<tr>
+				<th scope="row">{$lang->category_title}</th>
+				<td>
+					<input type="text" name="category_title" id="category_name" value="{$category_info->title}"  />
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','category_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->category_color}</th>
+				<td>
+					<input type="text" name="category_color" value="{htmlspecialchars($category_info->color)}" class="color-indicator inputTypeText" />
+					<p>{$lang->about_category_color}</p>
+				</td>
+			</tr>
+			
+			<tr>
+				<th scope="row">{$lang->category_description}</th>
+				<td >
+					<textarea name="category_description" id="category_description" >{htmlspecialchars($category_info->description)}</textarea>
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','category_description')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+					<p>{$lang->about_category_description}</p>				
+				</td>
+			</tr>
+			
+			<tr>
+				<th scope="row">{$lang->expand}</th>
+				<td>
+					<input type="checkbox" name="expand" value="Y" <!--@if($category_info->expand=="Y")-->checked="checked"<!--@end--> class="checkbox" />
+					<p>{$lang->about_expand}</p>
+				</td>
+			</tr>
+			<tr >
+				<th scope="row2">{$lang->category_group_srls}</th>
+				<td>
+					<!--@foreach($group_list as $key=>$val)-->
+					<div><input type="checkbox" name="group_srls[]" value="{$key}" id="group_{$key}" <!--@if(is_array($category_info->group_srls)&&in_array($key, $category_info->group_srls))-->checked="checked"<!--@end--> class="checkbox" /> <label for="group_{$key}">{$val->title}</label></div>
+					<!--@end-->
+					<p>{$lang->about_category_group_srls}</p>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </div>
 <script type="text/javascript">
 jQuery(function(){
     jQuery('input.color-indicator').xe_colorpicker();
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/modules/document/tpl/category_list.html b/modules/document/tpl/category_list.html
index dafce23a3..e5dafaceb 100644
--- a/modules/document/tpl/category_list.html
+++ b/modules/document/tpl/category_list.html
@@ -1,33 +1,36 @@
-<!--%import("filter/insert_category.xml")-->
 <!--%import("filter/delete_category.xml")-->
 <!--%import("filter/move_category.xml")-->
 
 <!--// tree javascript plugin load -->
 <!--%load_js_plugin("ui.tree")-->
 
-<!--%import("js/document_category.js")-->
-<!--%import("css/document.css")-->
+<load target="js/document_category.js" usecdn="true" />
+<load target="css/document.css" usecdn="true" />
 <!--%load_js_plugin("ui.colorpicker")-->
 <script type="text/javascript">
     var category_title = "{$lang->category}";
 </script>
 
-<span style="float:right"><a href="#"  onclick="doReloadTreeCategory('{$module_info->module_srl}');return false;" class="button black"><span>{$lang->cmd_remake_cache}</span></a></span>
-
-    <div class="gap1">
-        <form id="fo_category" action="./" method="get" onsubmit="return procFilter(this, insert_category)">
-        <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-        <input type="hidden" name="xml_file" value="{$category_xml_file}" />
-            <div id="category_info"></div>
-        </form>
-            <div id="menu">
-                <ul class="simpleTree">
-                    <li class="root" id='tree_0'><span>{$lang->category}</span></li>
-                </ul>
-            </div>
-    </div>
-
 
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertCategory" id="fo_category" action="./" method="post">
+<input type="hidden" name="module" value="document" />
+<input type="hidden" name="act" value="procDocumentInsertCategory" />
+<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+<input type="hidden" name="xml_file" value="{$category_xml_file}" />
+<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<div id="category_info" class="x" style="position:absolute"></div>
+</form>
+<div id="menu">
+	<ul class="simpleTree">
+		<li class="root" id='tree_0'><span>{$lang->category}</span></li>
+	</ul>
+</div>
+<div class="btnArea">
+	<span class="btn"><button type="button" onclick="doReloadTreeCategory('{$module_info->module_srl}');return false;">{$lang->cmd_remake_cache}</button></span>
+</div>
 <script type="text/javascript">
     var simpleTreeCollection;
     var max_menu_depth = 999;
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
index a7225332f..db9140823 100644
--- a/modules/document/tpl/checked_list.html
+++ b/modules/document/tpl/checked_list.html
@@ -1,63 +1,59 @@
 <!--%import("filter/manage_checked_document.xml")-->
-<!--%import("js/document_admin.js")-->
-<!--%import("css/document.css")-->
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_manage_document}</h3>
-</div>
-
+<load target="js/document_admin.js" usecdn="true" />
+<load target="css/document.css" usecdn="true" />
+<h1 class="h1">{$lang->cmd_manage_document}</h1>
 <form action="./" method="get" id="fo_management">
+<input type="hidden" name="module" value="document" />
 <input type="hidden" name="type" value="" />
 
 <!--@if(count($document_list)==0)-->
-<div id="popBody">
 {$lang->msg_not_selected_document}
-</div>
 <!--@else-->
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div><label for="textfield1">{$lang->checked_count} ({count($document_list)})</label></div></th>
-        <td>
-            <input type="checkbox" onclick="XE.checkboxToggleAll()" checked="checked"/> {$lang->cmd_select}
-            <ul class="document_list_box">
-                <!--@foreach($document_list as $key => $document)-->
-                <li class="document_list"><input type="checkbox" checked="checked" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this);"/> <address>{$document->getNickName()}</address> <span class="document_title">{$document->getTitle()}</span></li>
-                <!--@end-->
-            </ul>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->move_target_module}</div></th>
-        <td>
-            <input type="hidden" name="target_module" id="target_module" value="" />
-            <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" value="" readonly="readonly" /><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->category}</div></th>
-        <td>
-          <select id="target_category" name="target_category" class="w400">
-          </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->cmd_send_message}</div></th>
-        <td>
-            <textarea name="message_content" class="inputTypeTextArea w400" cols="45" rows="5"></textarea>
-        </td>
-    </tr>
-    </table>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+	<tr>
+		<th scope="row"><label for="textfield1">{$lang->checked_count} ({count($document_list)})</label></th>
+		<td>
+			<input type="checkbox" onclick="XE.checkboxToggleAll()" checked="checked"/> {$lang->cmd_select}
+			<ul class="document_list_box">
+				<!--@foreach($document_list as $key => $document)-->
+				<li class="document_list"><input type="checkbox" checked="checked" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this);"/> <address>{$document->getNickName()}</address> <span class="document_title">{$document->getTitle()}</span></li>
+				<!--@end-->
+			</ul>
+		</td>
+	</tr>
+	<tr>
+		<th scope="row">{$lang->move_target_module}</th>
+		<td>
+			<input type="hidden" name="target_module" id="target_module" value="{$module_srl}" />
+			<input type="text" name="_target_module" id="_target_module" value="{$mid} ({$browser_title})" readonly="readonly" /><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
+		</td>
+	</tr>
+	<tr>
+		<th scope="row">{$lang->category}</th>
+		<td>
+		  <select id="target_category" name="target_category">
+		  </select>
+		</td>
+	</tr>
+	<tr>
+		<th scope="row">{$lang->cmd_send_message}</th>
+		<td>
+			<textarea name="message_content" cols="45" rows="5"></textarea>
+		</td>
+	</tr>
+	</table>
 </div>
 
-<div id="popFooter">
-    <a href="#" onclick="doManageDocument('trash');return false;" class="button red"><span>{$lang->cmd_trash}</span></a>
-    <a href="#" onclick="doManageDocument('delete');return false;" class="button black strong"><span>{$lang->cmd_delete}</span></a>
-    <a href="#" onclick="doManageDocument('move');return false;" class="button blue"><span>{$lang->cmd_move}</span></a>
-    <a href="#" onclick="doManageDocument('copy');return false;" class="button green"><span>{$lang->cmd_copy}</span></a>
+<div class="btnArea">
+    <button type="button" onclick="doManageDocument('trash');">{$lang->cmd_trash}</button>
+    <button type="button" onclick="doManageDocument('delete');">{$lang->cmd_delete}</button>
+    <button type="button" onclick="doManageDocument('move');">{$lang->cmd_move}</button>
+    <button type="button" onclick="doManageDocument('copy');">{$lang->cmd_copy}</button>
 </div>
 
 <script type="text/javascript">
-    jQuery(function() { doGetCategoryFromModule(jQuery('#target_module').get(0)); } );
+    jQuery(function() { doGetCategoryFromModule({$module_srl}); } );
 </script>
 <!--@end-->
 </form>
diff --git a/modules/document/tpl/css/document.css b/modules/document/tpl/css/document.css
deleted file mode 100644
index fb3c10560..000000000
--- a/modules/document/tpl/css/document.css
+++ /dev/null
@@ -1,20 +0,0 @@
-@charset "utf-8";
-
-ul.document_list_box { margin:0; padding:0; list-style:none; }
-.document_list_box { height:160px; overflow-y:scroll; overflow-x:hidden;}
-.document_list { margin-top:.5em; overflow:hidden; white-space:nowrap; clear:both;}
-.document_list input { float:left; margin-right:10px; }
-.document_list address { float:left; width:100px; margin-right:10px; overflow:hidden; white-space:nowrap;}
-.document_list .document_title { }
-
-div.printContent { padding:20px; }
-input.btnSubmit { background:url("../images/buttonInsert.gif") no-repeat 3px 2px; line-height:150%; height:23px; padding:2px 3px 2px 18px; border:1px solid; border-color:#d8d8d8 #a6a6a6 #a6a6a6 #d8d8d8; }
-
-#menu {margin:10px; }
-
-.menuListZone { table-layout:fixed; }
-.menuListZone td { vertical-align:top; }
-.menuListZone td.category_zone { padding-right:10px; }
-
-#category_list { padding:.5em 0 .5em 0; margin-bottom:2em; width:250px; overflow:hidden; float:left; position:absolute; left:10px;}
-#category_info { width:560px; position:absolute; margin:0 auto; left:0; right:0; z-index:9999;}
diff --git a/modules/document/tpl/declared_list.html b/modules/document/tpl/declared_list.html
index e49b4320b..3ff53c143 100644
--- a/modules/document/tpl/declared_list.html
+++ b/modules/document/tpl/declared_list.html
@@ -1,70 +1,154 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--%import("filter/manage_checked_document.xml")-->
-<!--#include("header.html")-->
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->user_name}</div></th>
-        <th scope="col"><div>{$lang->cmd_declare}</div></th>
-        <th scope="col"><div>{$lang->readed_count}</div></th>
-        <th scope="col"><div>{$lang->voted_count}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($document_list as $no => $oDocument)-->
-    <tr>
-        <td>{$no}</td>
-        <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
-        <td>
-            <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitleText()}</a>
-
-            <!--@if($oDocument->getCommentCount())-->
-                [{$oDocument->getCommentCount()}]
-            <!--@end-->
-
-            <!--@if($oDocument->getTrackbackCount())-->
-                [{$oDocument->getTrackbackCount()}]
-            <!--@end-->
-        </td>
-        <td><span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></td>
-        <td><strong>{$oDocument->get('declared_count')}</strong></td>
-        <td>{$oDocument->get('readed_count')}</td>
-        <td>{$oDocument->get('voted_count')}</td>
-        <td>{$oDocument->getRegdate("Y-m-d")}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="8" class="button">
-            <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button black strong"><span>{$lang->cmd_manage_document}</span></a>
-            <a href="#" onclick="doCancelDeclare();return false;" class="button"><span>{$lang->cmd_cancel_declare}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
-
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="clear"></div>
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<script type="text/javascript">
+xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
+xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+</script>
+<load target="js/document_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+	<form id="fo_list" action="./" method="get" class="form">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="page" value="{$page}" />
+		<h1 class="h1">{$lang->cmd_declared_list}</h1>
+		<div class="table even">
+			<div class="cnb">
+				<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}">{$lang->all}</a>
+				| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'N')}">{$status_name_list['PUBLIC']}</a>
+				| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'Y')}">{$status_name_list['SECRET']}</a>
+				| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'search_target', 'is_secret', 'search_keyword', 'temp')}">{$status_name_list['TEMP']}</a>
+				| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" class="active">{$lang->cmd_declared_list}</a>
+			</div>
+			<table width="100%" border="1" cellspacing="0" id="documentListTable">
+				<caption>
+					{$lang->all} ({number_format($total_count)})
+					<div class="side">
+						<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
+					</div>
+				</caption>
+				<thead>
+					<tr>
+						<th scope="col" class="title">{$lang->title}</th>
+						<th scope="col">{$lang->writer}</th>
+						<th scope="col">{$lang->cmd_declare}</th>
+						<th scope="col">{$lang->readed_count}</th>
+						<th scope="col">{$lang->cmd_vote}(+/-)</th>
+						<th scope="col">{$lang->date}</th>
+						<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<th scope="col" class="title">{$lang->title}</th>
+						<th scope="col">{$lang->writer}</th>
+						<th scope="col">{$lang->cmd_declare}</th>
+						<th scope="col">{$lang->readed_count}</th>
+						<th scope="col">{$lang->cmd_vote}(+/-)</th>
+						<th scope="col">{$lang->date}</th>
+						<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+					</tr>
+				</tfoot>
+				<tbody>
+    				<!--@foreach($document_list as $no => $oDocument)-->
+					<tr>
+						<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank">{$oDocument->getTitle()}</a></td>
+						<td><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
+						<td>{$oDocument->get('declared_count')}</td>
+						<td>{$oDocument->get('readed_count')}</td>
+						<td>{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
+						<td>{$oDocument->getRegdate("Y-m-d H:i")}</td>
+						<td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
+					</tr>
+					<!--@end-->
+				</tbody>
+			</table>
+			<div class="btnArea">
+				<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
+			</div>
+		</div>
+	</form>
+	<div class="modal" id="listManager">
+		<form action="./" method="post" class="fg form" id="manageForm">
+		<input type="hidden" name="module" value="document" />
+		<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
+		<input type="hidden" name="type" value="" />
+		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}" />
+			<h2 class="h2">{$lang->document_manager}</h2>
+			<div class="table even">
+				<table width="100%" border="1" cellspacing="0" id="documentManageListTable">
+					<caption>{$lang->selected_document} <strong id="selectedDocumentCount"></strong></caption>
+					<thead>
+						<tr>
+							<th scope="col" class="title">{$lang->title}</th>
+							<th scope="col">{$lang->writer}</th>
+							<th scope="col">{$lang->status}</th>
+						</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</div>
+			<p class="q"><label for="site">{$lang->selected_document_move}</label></p>
+			<div class="a">
+				<input type="text" name="site_keyword" id="site" />
+				<span class="desc"><a href="#suggestion" class="tgAnchor" onclick="getModuleList();">{$lang->find_site}</a></span>
+				<p>
+					<select name="target_module" id="module_list" style="width:290px">
+						<option>{$lang->select_module}</option>
+					</select>
+				</p>
+				<p>
+					<select name="module_srl" id="mid_list" style="width:290px">
+						<option>{$lang->select_module_id}</option>
+					</select>
+				</p>
+				<p>
+					<select id="target_category" name="target_category" style="width:290px">
+						<option>{$lang->select_category}</option>
+					</select>
+				</p>
+			</div>
+			<p class="q"><label for="message">{$lang->message_notice}</label></p>
+			<p>
+				<textarea cols="42" rows="3" name="message_content" id="message" style="width:98%"></textarea>
+			</p>
+			<div class="btnArea">
+				<span class="btn"><button type="submit" name="type" value="trash">{$lang->cmd_trash}</button></span>
+				<span class="btn"><button type="submit" name="type" value="delete">{$lang->cmd_delete}</button></span>
+				<span class="btn"><button type="submit" name="type" value="move">{$lang->cmd_move}</button></span>
+				<span class="btn"><button type="submit" name="type" value="copy">{$lang->cmd_copy}</button></span>
+				<span class="btn"><button type="submit" name="type" value="cancelDeclare">{$lang->cmd_cancel_declare}</button></span>
+			</div>
+		</form>
+	</div>
+	<div class="search">
+
+<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+</form>
+	</div>
diff --git a/modules/document/tpl/document_alias.html b/modules/document/tpl/document_alias.html
index 9a29902e5..478b30147 100644
--- a/modules/document/tpl/document_alias.html
+++ b/modules/document/tpl/document_alias.html
@@ -1,49 +1,56 @@
 <!--#include("header.html")-->
-<!--%import("css/document.css")-->
-<!--%import("filter/insert_alias.xml")-->
+<load target="css/document.css" usecdn="true" />
 <!--%import("filter/delete_alias.xml")-->
 
-<form id="deleteForm" action="./" method="POST">
-<input type="hidden" id="target_srl" name="target_srl" value="" />
+<form ruleset="deleteAlias" id="deleteForm" action="./" method="post">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="act" value="procDocumentAdminDeleteAlias" />
+	<input type="hidden" id="target_srl" name="target_srl" value="" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
 </form>
 
-<form action="{Context::getRequestUri()}" method="post" onsubmit="return procFilter(this, insert_alias)">
-<input type="hidden" name="document_srl" value="{$document_srl}" />
-<input type="hidden" name="module_srl" value="{$oDocument->get('module_srl')}" />
-
-<h4 class="xeAdmin">{$lang->alias}</h4>
-
-<table cellspacing="0" class="crossTable">
-<thead>
-<tr>
-    <th scope="col" class="half_wide"><div>{$lang->title}</div></th>
-    <th scope="col" class="half_wide"><div>{$lang->alias}</div></th>
-    <th scope="col"></th>
-</tr>
-</thead>
-<tbody>
-<tr>
-    <td rowspan="{count($aliases)+1}">{$oDocument->getTitle()}</td>
-    {@ $bFirst = true; }
-    <!--@foreach($aliases as $val)-->
-    <!--@if(!$bFirst)-->
-<tr>
-    {@ $bFirst = false; }
-    <!--@end-->
-    <td>{$val->alias_title}</td>
-    <td><a href="#" onclick="deleteByFilter('{$val->alias_srl}', delete_alias);"><img src="images/buttonDeleteX.gif" alt="" /></a>
-    </td>
-</tr>
-    <!--@end-->
-    <!--@if(!$bFirst)-->
-<tr>
-    <!--@end-->
-    <td>
-    <input type="text" class="inputTypeText fixWidth" name="alias_title" />
-    </td>
-    <td><span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s"class="btnSubmit" /></span></td>
-</tr>
-</tbody>
-</table>
-
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertAlias" action="{Context::getRequestUri()}" method="post">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="act" value="procDocumentAdminInsertAlias" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
+	<input type="hidden" name="module_srl" value="{$oDocument->get('module_srl')}" />
+	
+	<h3 class="h3">{$lang->alias}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+		<tr>
+			<th scope="col">{$lang->title}</th>
+			<th scope="col">{$lang->alias}</th>
+			<th scope="col"></th>
+		</tr>
+		</thead>
+		<tbody>
+		<tr>
+			<td rowspan="{count($aliases)+1}">{$oDocument->getTitle()}</td>
+			{@ $bFirst = true; }
+			<!--@foreach($aliases as $val)-->
+			<!--@if(!$bFirst)-->
+		<tr>
+			{@ $bFirst = false; }
+			<!--@end-->
+			<td>{$val->alias_title}</td>
+			<td><button type="button" onclick="deleteByFilter('{$val->alias_srl}', delete_alias);">Delete</button>
+			</td>
+		</tr>
+			<!--@end-->
+			<!--@if(!$bFirst)-->
+		<tr>
+			<!--@end-->
+			<td>
+			<input type="text" name="alias_title" />
+			</td>
+			<td><span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span></td>
+		</tr>
+		</tbody>
+		</table>
+	</div>
 </form>
diff --git a/modules/document/tpl/document_config.html b/modules/document/tpl/document_config.html
index 762ac444b..b102c9d73 100644
--- a/modules/document/tpl/document_config.html
+++ b/modules/document/tpl/document_config.html
@@ -1,26 +1,23 @@
 <!--#include("header.html")-->
-<!--%import("filter/insert_config.xml")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col"><div>{$lang->thumbnail_type}</div></th>
-    </tr>
-    <tr>
-        <td>
-            <input type="radio" name="thumbnail_type" value="crop" <!--@if($config->thumbnail_type != 'ratio')-->checked="checked"<!--@end-->/> {$lang->thumbnail_crop} <br />
-            <input type="radio" name="thumbnail_type" value="ratio" <!--@if($config->thumbnail_type == 'ratio')-->checked="checked"<!--@end-->/> {$lang->thumbnail_ratio}
-        </td>
-    </tr>
-    <tr>
-        <th class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></th>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th class="button"><span class="button black strong"><input type="button" value="{$lang->cmd_delete_all_thumbnail}" onclick="doDeleteAllThumbnail(); return false;"/></span></th>
-    </tr>
-    </table>
 
+<form action="./" method="post">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="act" value="procDocumentAdminInsertConfig" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+		<tr>
+			<th scope="col">{$lang->thumbnail_type}</th>
+		</tr>
+		<tr>
+			<td>
+				<input type="radio" name="thumbnail_type" value="crop" <!--@if($config->thumbnail_type != 'ratio')-->checked="checked"<!--@end-->/> {$lang->thumbnail_crop} <br />
+				<input type="radio" name="thumbnail_type" value="ratio" <!--@if($config->thumbnail_type == 'ratio')-->checked="checked"<!--@end-->/> {$lang->thumbnail_ratio}
+			</td>
+		</tr>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+		<span class="btn"><input type="button" value="{$lang->cmd_delete_all_thumbnail}" onclick="doDeleteAllThumbnail(); return false;"/></span>
+	</div>
 </form>
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 6334736eb..d6856be15 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -1,100 +1,181 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--%import("filter/manage_checked_document.xml")-->
-<!--#include("header.html")-->
-
-
-<!-- 검색 -->
-<div class="fl">
-    <form action="./" method="get" class="adminSearch">
-    <input type="hidden" name="module" value="{$module}" />
-    <input type="hidden" name="act" value="{$act}" />
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-
-        <fieldset>
-            <select name="search_target">
-                <option value="">{$lang->search_target}</option>
-                <!--@foreach($lang->search_target_list as $key => $val)-->
-                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
-        </fieldset>
-    </form>
-</div>
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 모듈 선택 -->
-<div class="fr">
-    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
-    <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button blue"><span>{$lang->cmd_manage_document}</span></a>
-</div>
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable clear">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></div></th>
-        <th scope="col" class="wide"><div>{$lang->document}</div></th>
-        <th scope="col"><div>{$lang->nick_name}</div></th>
-        <th scope="col"><div>{$lang->readed_count}</div></th>
-        <th scope="col"><div>{$lang->voted_count}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><div>{$lang->alias}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($document_list as $no => $oDocument)-->
-    <tr>
-        <td class="number center">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
-        <td class="left subject">
-            <!--@if($oDocument->get('module_srl') != 0)-->
-                <!--@if($oDocument->get('module_srl')==$oDocument->get('member_srl'))-->
-                    {$lang->cmd_save}
-                <!--@else-->
-                    <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitle()}</a>
-                <!--@end-->
-            <!--@else-->
-                [{$lang->in_trash}] {$oDocument->getTitle()}
-            <!--@end-->
-
-            <!--@if($oDocument->getCommentCount())-->
-                [{$oDocument->getCommentCount()}]
-            <!--@end-->
-
-            <!--@if($oDocument->getTrackbackCount())-->
-                [{$oDocument->getTrackbackCount()}]
-            <!--@end-->
-        </td>
-        <td class="nowrap"><span class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</span></td>
-        <td class="number center">{$oDocument->get('readed_count')}</td>
-        <td class="number center">{$oDocument->get('voted_count')} / {$oDocument->get('blamed_count')}</td>
-        <td class="date center nowrap">{$oDocument->getRegdate("Y-m-d H:i:s")}</td>
-        <td class="number center nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'))}">{$oDocument->get('ipaddress')}</a></td>
-        <td class="center"><a href="{getUrl('act','dispDocumentAdminAlias','document_srl',$oDocument->document_srl)}">{$lang->alias}</a>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl',$module_srl)}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl',$module_srl)}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<script type="text/javascript">
+xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
+xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+</script>
+<load target="js/document_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+	<form id="fo_list" action="./" method="get" class="form">
+	<input type="hidden" name="module" value="document" />
+	<input type="hidden" name="page" value="{$page}" />
+		<h1 class="h1">{$lang->document}</h1>
+		<div class="table even">
+			<div class="cnb">
+				<a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>{$lang->all}</a>
+				| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'N')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'N')-->class="active"<!--@end-->>{$status_name_list['PUBLIC']}</a>
+				| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'Y')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$status_name_list['SECRET']}</a>
+				| <a href="{getUrl('search_target', 'is_secret', 'search_keyword', 'temp')}" <!--@if($search_target == 'is_secret' && $search_keyword == 'temp')-->class="active"<!--@end-->>{$status_name_list['TEMP']}</a>
+				| <a href="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a>
+			</div>
+			<table width="100%" border="1" cellspacing="0" id="documentListTable">
+				<caption>
+					<!--@if($search_keyword == '')-->
+					{$lang->all}
+					<!--@elseif($search_target == 'is_secret' && $search_keyword == 'N')-->
+					{$status_name_list['PUBLIC']}
+					<!--@elseif($search_target == 'is_secret' && $search_keyword == 'Y')-->
+					{$status_name_list['SECRET']}
+					<!--@elseif($search_target == 'is_secret' && $search_keyword == 'temp')-->
+					{$status_name_list['TEMP']}
+					<!--@end-->
+					({number_format($total_count)})
+					<div class="side">
+						<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
+					</div>
+				</caption>
+				<thead>
+					<tr>
+						<th scope="col" class="title">{$lang->title}</th>
+						<th scope="col">{$lang->writer}</th>
+						<th scope="col">{$lang->readed_count}</th>
+						<th scope="col">{$lang->cmd_vote}(+/-)</th>
+						<th scope="col">{$lang->date}</th>
+						<th scope="col">{$lang->ipaddress}</th>
+						<th scope="col">{$lang->status}</th>
+						<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<th scope="col" class="title">{$lang->title}</th>
+						<th scope="col">{$lang->writer}</th>
+						<th scope="col">{$lang->readed_count}</th>
+						<th scope="col">{$lang->cmd_vote}(+/-)</th>
+						<th scope="col">{$lang->date}</th>
+						<th scope="col">{$lang->ipaddress}</th>
+						<th scope="col">{$lang->status}</th>
+						<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+					</tr>
+				</tfoot>
+				<tbody>
+    				<!--@foreach($document_list as $no => $oDocument)-->
+					<tr>
+						<td class="title"><a href="{getUrl('','document_srl',$oDocument->document_srl)}" target="_blank"><!--@if(trim($oDocument->getTitle()))-->{$oDocument->getTitle()}<!--@else--><em>{$lang->no_title_document}</em><!--@end--></a></td>
+						<td><a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</a></td>
+						<td>{$oDocument->get('readed_count')}</td>
+						<td>{$oDocument->get('voted_count')}/{$oDocument->get('blamed_count')}</td>
+						<td>{$oDocument->getRegdate("Y-m-d H:i")}</td>
+						<td><a href="{getUrl('search_target','ipaddress','search_keyword',$oDocument->get('ipaddress'))}">{$oDocument->get('ipaddress')}</a></td>
+						<td>{$status_name_list[$oDocument->get('status')]}</td>
+						<td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
+					</tr>
+					<!--@end-->
+				</tbody>
+			</table>
+			<div class="btnArea">
+				<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getDocumentList();">{$lang->document_manager}...</a></span>
+			</div>
+		</div>
+	</form>
+	<div class="modal" id="listManager">
+		<form action="./" method="post" class="fg form" id="manageForm">
+		<input type="hidden" name="module" value="document" />
+		<input type="hidden" name="act" value="procDocumentManageCheckedDocument" />
+		<input type="hidden" name="type" value="" />
+		<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispDocumentAdminList', 'is_secret', $is_secret, 'search_target', $search_target, 'search_keyword', $search_keyword)}" cond="!empty($search_target) && !empty($search_keyword)" />
+			<h2 class="h2">{$lang->document_manager}</h2>
+			<div class="table even">
+				<table width="100%" border="1" cellspacing="0" id="documentManageListTable">
+					<caption>{$lang->selected_document} <strong id="selectedDocumentCount"></strong></caption>
+					<thead>
+						<tr>
+							<th scope="col" class="title">{$lang->title}</th>
+							<th scope="col">{$lang->writer}</th>
+							<th scope="col">{$lang->status}</th>
+						</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</div>
+			<p class="q"><label for="site">{$lang->selected_document_move}</label></p>
+			<div class="a">
+				<input type="text" name="site_keyword" id="site" />
+				<span class="desc"><a href="#suggestion" class="tgAnchor" onclick="getModuleList();">{$lang->find_site}</a></span>
+				<p>
+					<select name="target_module" id="module_list" style="width:290px">
+						<option>{$lang->select_module}</option>
+					</select>
+				</p>
+				<p>
+					<select name="module_srl" id="mid_list" style="width:290px">
+						<option>{$lang->select_module_id}</option>
+					</select>
+				</p>
+				<p>
+					<select id="target_category" name="target_category" style="width:290px">
+						<option>{$lang->select_category}</option>
+					</select>
+				</p>
+			</div>
+			<p class="q"><label for="message">{$lang->message_notice}</label></p>
+			<p>
+				<textarea cols="42" rows="3" name="message_content" id="message" style="width:98%"></textarea>
+			</p>
+			<div class="btnArea">
+				<span class="btn"><button type="submit" name="type" value="trash">{$lang->cmd_trash}</button></span>
+				<span class="btn"><button type="submit" name="type" value="delete">{$lang->cmd_delete}</button></span>
+				<span class="btn"><button type="submit" name="type" value="move">{$lang->cmd_move}</button></span>
+				<span class="btn"><button type="submit" name="type" value="copy">{$lang->cmd_copy}</button></span>
+			</div>
+		</form>
+	</div>
+	<div class="search">
+
+<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+</form>
+
+		<form action="./" method="get" class="adminSearch" onsubmit="return checkSearch(this)">
+		<input type="hidden" name="module" value="{$module}" />
+		<input type="hidden" name="act" value="{$act}" />
+		<input type="hidden" name="module_srl" value="{$module_srl}" />
+		<input type="hidden" name="error_return_url" value="" />
+            <select name="search_target">
+                <option value="">{$lang->search_target}</option>
+                <!--@foreach($lang->search_target_list as $key => $val)-->
+                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+                <!--@end-->
+			</select>
+            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+			<input type="submit" value="{$lang->cmd_search}" />
+			<a href="#">{$lang->cmd_cancel}</a>
+		</form>
+	</div>
diff --git a/modules/document/tpl/document_module_config.html b/modules/document/tpl/document_module_config.html
index 08c77962f..ad7b15321 100644
--- a/modules/document/tpl/document_module_config.html
+++ b/modules/document/tpl/document_module_config.html
@@ -1,47 +1,46 @@
 <!--%import("filter/insert_document_module_config.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_document_module_config)">
-<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
-
-    <h4 class="xeAdmin">{$lang->document}</h4>
-    
-    <table cellspacing="0" class="rowTable">
-    <tr>    
-        <th><div>{$lang->history}</div></th>
-        <td>
-			<p>{$lang->about_use_history}</p>
-		    <select name="use_history" class="w100">
-                <option value="N" <!--@if($document_config->use_history=='N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-                <option value="Y" <!--@if($document_config->use_history=='Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="Trace" <!--@if($document_config->use_history=='Trace')-->selected="selected"<!--@end-->>{$lang->trace_only}</option>
-            </select>
-		</td>
-	</tr>
-    <tr>    
-        <th><div>{$lang->cmd_vote}</div></th>
-        <td>
-		    <select name="use_vote_up" class="w100">
-                <option value="Y" <!--@if($document_config->use_vote_up=='Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="S" <!--@if($document_config->use_vote_up=='S')-->selected="selected"<!--@end-->>{$lang->show_voted_member}</option>
-                <option value="N" <!--@if($document_config->use_vote_up=='N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-            </select>
-        </td>
-    </tr>
-    <tr>    
-        <th><div>{$lang->cmd_vote_down}</div></th>
-        <td>
-		    <select name="use_vote_down" class="w100">
-                <option value="Y" <!--@if($document_config->use_vote_down=='Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="S" <!--@if($document_config->use_vote_down=='S')-->selected="selected"<!--@end-->>{$lang->show_voted_member}</option>
-                <option value="N" <!--@if($document_config->use_vote_down=='N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span>
-        </th>
-    </tr>
-    </table>
-
+<form action="./" method="post" class="form">
+<input type="hidden" name="module" value="document" />
+<input type="hidden" name="act" value="procDocumentInsertModuleConfig" />
+<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+    <h3 class="h3">{$lang->document}</h3>
+    <div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>    
+				<th scope="row"><label for="use_history">{$lang->history}</label></th>
+				<td class="text">
+					<select name="use_history" id="use_history">
+						<option value="N" selected="selected"|cond="$document_config->use_history=='N'">{$lang->notuse}</option>
+						<option value="Y" selected="selected"|cond="$document_config->use_history=='Y'">{$lang->use}</option>
+						<option value="Trace" selected="selected"|cond="$document_config->use_history=='Trace'">{$lang->trace_only}</option>
+					</select>
+					<span class="desc">{$lang->about_use_history}</span>
+				</td>
+			</tr>
+			<tr>    
+				<th scope="row"><label for="use_vote_up">{$lang->cmd_vote}</label></th>
+				<td class="text">
+					<select name="use_vote_up" id="use_vote_up">
+						<option value="Y" selected="selected"|cond="$document_config->use_vote_up=='Y'">{$lang->use}</option>
+						<option value="S" selected="selected"|cond="$document_config->use_vote_up=='S'">{$lang->use_and_display}</option>
+						<option value="N" selected="selected"|cond="$document_config->use_vote_up=='N'">{$lang->notuse}</option>
+					</select>
+				</td>
+			</tr>
+			<tr>    
+				<th scope="row"><label for="use_vote_down">{$lang->cmd_vote_down}</label></th>
+				<td class="text">
+					<select name="use_vote_down" id="use_vote_down">
+						<option value="Y" selected="selected"|cond="$document_config->use_vote_down=='Y'">{$lang->use}</option>
+						<option value="S" selected="selected"|cond="$document_config->use_vote_down=='S'">{$lang->use_and_display}</option>
+						<option value="N" selected="selected"|cond="$document_config->use_vote_down=='N'">{$lang->notuse}</option>
+					</select>
+				</td>
+			</tr>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+	</div>
 </form>
diff --git a/modules/document/tpl/document_trash_list.html b/modules/document/tpl/document_trash_list.html
index 3e8d108b9..a05f5e444 100644
--- a/modules/document/tpl/document_trash_list.html
+++ b/modules/document/tpl/document_trash_list.html
@@ -1,73 +1,72 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--%import("filter/manage_checked_document.xml")-->
-<!--%import("filter/restore_trash.xml")-->
-<!--#include("header.html")-->
-
-<form id="restore_form" action="./" method="post">
-<input type="hidden" id="target_srl" name="target_srl" value="" />
-</form>
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 모듈 선택 -->
-<div class="fr">
-    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
-    <!-- <a href="{getUrl('','module','document','act','dispDocumentManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button blue"><span>{$lang->cmd_manage_document}</span></a> -->
-</div>
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable clear">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <!--<th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll({ doClick:true }); return false;" /></div></th>-->
-        <th scope="col" class="wide"><div>{$lang->document}</div></th>
-        <th scope="col"><div>{$lang->trash_nick_name}</div></th>
-        <th scope="col"><div>{$lang->trash_date}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><dib>{$lang->trash_description}</div></th>
-        <th scope="col"><div>{$lang->cmd_restore}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($document_list as $no => $oDocument)-->
-    <tr>
-        <td class="number center">{$no}</td>
-        <!--<td class="center"><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>-->
-        <td class="left subject">
-            {$oDocument->getTitle()}
-
-            <!--@if($oDocument->getCommentCount())-->
-                [{$oDocument->getCommentCount()}]
-            <!--@end-->
-
-            <!--@if($oDocument->getTrackbackCount())-->
-                [{$oDocument->getTrackbackCount()}]
-            <!--@end-->
-        </td>
-        <td class="nowrap"><span class="member_{$oDocument->get('trash_member_srl')}">{htmlspecialchars($oDocument->get('trash_nick_name'))}</span></td>
-        <td class="date center nowrap">{zdate($oDocument->get('trash_date'), "Y-m-d H:i:s")}</td>
-        <td class="number center nowrap">{$oDocument->get('ipaddress')}</td>
-        <td class="left">{$oDocument->get('trash_description')}</td>
-        <td class="center"><a href="#" onclick="executeFilterByTargetSrl('restore_form', {$oDocument->get('trash_srl')}, restore_trash);">{$lang->cmd_restore}</a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl',$module_srl)}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl',$module_srl)}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<!--%import("filter/delete_checked.xml")-->
+<!--%import("filter/manage_checked_document.xml")-->
+<!--%import("filter/restore_trash.xml")-->
+<!--#include("header.html")-->
+
+<form id="restore_form" action="./" method="post">
+<input type="hidden" id="target_srl" name="target_srl" value="" />
+</form>
+
+<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
+<input type="hidden" name="page" value="{$page}" />
+
+<!-- 모듈 선택 -->
+<div class="btnArea">
+    <span class="btn"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;">{$lang->cmd_find_module}</a></span>
+</div>
+
+<!-- 목록 -->
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col" >{$lang->document}</th>
+				<th scope="col">{$lang->trash_nick_name}</th>
+				<th scope="col">{$lang->trash_date}</th>
+				<th scope="col">{$lang->ipaddress}</th>
+				<th scope="col">{$lang->trash_description}</th>
+				<th scope="col">{$lang->cmd_restore}</th>
+				</tr>
+			</thead>
+		<tbody>
+			<!--@foreach($document_list as $no => $oDocument)-->
+			<tr>
+				<td>{$no}</td>
+				<td>
+					{$oDocument->getTitle()}
+					
+					<!--@if($oDocument->getCommentCount())-->
+					[{$oDocument->getCommentCount()}]
+					<!--@end-->
+					
+					<!--@if($oDocument->getTrackbackCount())-->
+					[{$oDocument->getTrackbackCount()}]
+					<!--@end-->
+					</td>
+				<td><a href="#popup_menu_area" class="member_{$oDocument->get('trash_member_srl')}">{htmlspecialchars($oDocument->get('trash_nick_name'))}</a></td>
+				<td>{zdate($oDocument->get('trash_date'), "Y-m-d H:i:s")}</td>
+				<td>{$oDocument->get('ipaddress')}</td>
+				<td >{$oDocument->get('trash_description')}</td>
+				<td><button type="button" onclick="executeFilterByTargetSrl('restore_form', {$oDocument->get('trash_srl')}, restore_trash);">{$lang->cmd_restore}</button></td>
+				</tr>
+			<!--@end-->
+			</tbody>
+	</table>
+</div>
+
+</form>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl',$module_srl)}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl',$module_srl)}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl',$module_srl)}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 65d187e83..ccbdb4686 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -1,122 +1,126 @@
-<!--%import("js/document_admin.js")-->
+<load target="js/document_admin.js" usecdn="true" />
 <!--%import("filter/insert_extra_var.xml")-->
 <!--%import("filter/delete_extra_var.xml")-->
-<!--%import("../../module/tpl/js/module_admin.js")-->
 
 <!--@if($selected_var_idx && $extra_keys[$selected_var_idx])-->
     {@ $selected_var = $extra_keys[$selected_var_idx] }
 <!--@end-->
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
 
 <!--@if($type == 'insertExtraForm' || $selected_var_idx)-->
-    <form action="./" method="post" onsubmit="return procFilter(this, insert_extra_var)">
+    <form ruleset="insertExtraVar" action="./" method="post">
+	<input type="hidden" name="module" value="document" />
+    <input type="hidden" name="act" value="procDocumentAdminInsertExtraVar" />
     <input type="hidden" name="module_srl" value="{$module_srl}" />
     <input type="hidden" name="var_idx" value="{$selected_var_idx}" />
+    <input type="hidden" name="success_return_url" value="{getUrl('type', '')}" />
 
-        <h4 class="xeAdmin">{$lang->extra_vars} {$selected_var_idx}</h4>
-        <table cellspacing="0" class="crossTable ">
-        <tr>
-            <th><div>{$lang->eid}</div></th>
-            <td class="wide">
-                <input type="text" name="eid" value="{$selected_var->eid}" class="inputTypeText w200" id="eid" /><p>{$lang->about_extra_vars_eid_value}</p>
-            </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->column_name}</div></th>
-            <td class="wide">
-                <input type="text" name="name" value="{$selected_var->name}" class="inputTypeText w200" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a> 
-            </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->column_type}</div></th>
-            <td>
-                <select name="type">
-                    <!--@foreach($lang->column_type_list as $k => $v)-->
-                        <!--@if($key != 'kr_zip')-->
-                        <option value="{$k}" <!--@if($selected_var->type==$k)-->selected="selected"<!--@end-->>{$lang->column_type_list[$k]}</option>
-                        <!--@end-->
-                    <!--@end-->
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th><div>{$lang->is_required}</div></th>
-            <td><input type="checkbox" name="is_required" value="Y" <!--@if($selected_var->is_required=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->default_value}</div></th>
-            <td><input type="text" name="default" value="{$selected_var->default}" class="inputTypeText w400" /><p>{$lang->about_extra_vars_default_value}</p></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->description}</div></th>
-            <td><input type="text" name="desc" value="{$selected_var->desc}" id="desc" class="inputTypeText w400" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','desc')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a></td>
-        </tr>
-        <tr>
-            <th><div>{$lang->cmd_search}</div></th>
-            <td><input type="checkbox" name="search" value="Y" <!--@if($selected_var->search=='Y')-->checked="checked"<!--@end--> /></td>
-        </tr>
-        <tr>
-            <th colspan="2" class="button">
-                <!--@if($selected_var)-->
-                <span class="button strong black"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
-                <!--@else-->
-                <span class="button strong black"><input type="submit" value="{$lang->cmd_insert}" accesskey="s" /></span>
-                <!--@end-->
-                <a href="{getUrl('type','','selected_var_idx','')}"  class="button"><span>{$lang->cmd_back}</span></a>
-            </th>
-        </tr>
-        </table>
-
-    </form>
+        <h3 class="h3">{$lang->extra_vars} {$selected_var_idx}</h3>
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0">
+				<tr>
+					<th>{$lang->eid}</th>
+					<td >
+						<input type="text" name="eid" value="{$selected_var->eid}" id="eid" /><p>{$lang->about_extra_vars_eid_value}</p>
+					</td>
+				</tr>
+				<tr>
+					<th>{$lang->column_name}</th>
+					<td >
+						<input type="text" name="name" value="{$selected_var->name}" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a> 
+					</td>
+				</tr>
+				<tr>
+					<th>{$lang->column_type}</th>
+					<td>
+						<select name="type">
+							<!--@foreach($lang->column_type_list as $k => $v)-->
+							<!--@if($key != 'kr_zip')-->
+							<option value="{$k}" <!--@if($selected_var->type==$k)-->selected="selected"<!--@end-->>{$lang->column_type_list[$k]}</option>
+							<!--@end-->
+							<!--@end-->
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<th>{$lang->is_required}</th>
+					<td><input type="checkbox" name="is_required" value="Y" <!--@if($selected_var->is_required=='Y')-->checked="checked"<!--@end--> /></td>
+				</tr>
+				<tr>
+					<th>{$lang->default_value}</th>
+					<td><input type="text" name="default" value="{$selected_var->default}" /><p>{$lang->about_extra_vars_default_value}</p></td>
+				</tr>
+				<tr>
+					<th>{$lang->description}</th>
+					<td><input type="text" name="desc" value="{$selected_var->desc}" id="desc" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','desc')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a></td>
+				</tr>
+				<tr>
+					<th>{$lang->cmd_search}</th>
+					<td><input type="checkbox" name="search" value="Y" <!--@if($selected_var->search=='Y')-->checked="checked"<!--@end--> /></td>
+				</tr>
+			</table>
+		</div>
+		<div class="btnArea">
+			<!--@if($selected_var)-->
+			<span class="btn"><input type="submit" value="{$lang->cmd_modify}" /></span>
+			<!--@else-->
+			<span class="btn"><input type="submit" value="{$lang->cmd_insert}" /></span>
+			<!--@end-->
+			<span class="btn"><a href="{getUrl('type','','selected_var_idx','')}">{$lang->cmd_back}</a></span>
+		</div>
+	</form>
 <!--@else-->
 
-    <h4 class="xeAdmin">{$lang->extra_vars}</h4>
-    <table cellspacing="0" class="crossTable ">
-    <thead>
-    <tr>
-        <th><div>{$lang->no}</div></th>
-        <th><div>{$lang->eid}</div></th>
-        <th><div>{$lang->column_name}</div></th>
-        <th><div>{$lang->column_type}</div></th>
-        <th><div>{$lang->is_required}</div></th>
-        <th><div>{$lang->cmd_search}</div></th>
-        <th><div>&nbsp;</div></th>
-    </tr>
-    </thead>
-    <tbody>
-    <!--@foreach($extra_keys as $key => $val)-->
-    <tr>
-        <td rowspan="3">{$val->idx}</td>
-        <td rowspan="3">{$val->eid}</td>
-        <td class="nowrap"><b>{$val->name}</b></td>
-        <td class="nowrap">{$lang->column_type_list[$val->type]}</td>
-        <td rowspan="3"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
-        <td rowspan="3"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
-        <td rowspan="3" class="nowrap">
-            <!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_modify}</span></a><!--@end-->
-            <a href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown"><span>{$lang->cmd_modify}</a></span>
-            <a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a>
-            <a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
-        </td>
-    </tr>
-    <tr>
-        <td>{$lang->default_value}</td>
-        <td class="wide">{$val->default}&nbsp;</td>
-    </tr>
-    <tr>
-        <td>{$lang->description}</td>
-        <td class="wide">{$val->desc}&nbsp;</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="9" class="button">
-            <a href="{getUrl('type','insertExtraForm','selected_var_idx','')}" class="button black strong"><span>{$lang->cmd_insert}</span></a>
-        </th>
-    </tr>
-    </tbody>
-    </table>
+    <h3 class="h3">{$lang->extra_vars}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th>{$lang->no}</th>
+					<th>{$lang->eid}</th>
+					<th>{$lang->column_name}</th>
+					<th>{$lang->column_type}</th>
+					<th>{$lang->is_required}</th>
+					<th>{$lang->cmd_search}</th>
+					<th>&nbsp;</th>
+				</tr>
+			</thead>
+			<tbody>
+				<!--@foreach($extra_keys as $key => $val)-->
+				<tr>
+					<td rowspan="3">{$val->idx}</td>
+					<td rowspan="3">{$val->eid}</td>
+					<td><b>{$val->name}</b></td>
+					<td>{$lang->column_type_list[$val->type]}</td>
+					<td rowspan="3"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
+					<td rowspan="3"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
+					<td rowspan="3">
+						<!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><!--@end-->
+						<a cond="count($extra_keys) > $val->idx" href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown">{$lang->cmd_move_down}</a>
+						<a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a>
+						<a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
+					</td>
+				</tr>
+				<tr>
+					<td>{$lang->default_value}</td>
+					<td >{$val->default}&nbsp;</td>
+				</tr>
+				<tr>
+					<td>{$lang->description}</td>
+					<td >{$val->desc}&nbsp;</td>
+				</tr>
+				<!--@end-->
+			</tbody>
+			</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><a href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a></span>
+	</div>
 <!--@end-->
 
 <form id="fo_delete" name="fo_delete" method="post" action="./">
 <input type="hidden" name="module_srl" value="" />
 <input type="hidden" name="var_idx" value="" />
-<form>
+</form>
diff --git a/modules/document/tpl/filter/insert_category.xml b/modules/document/tpl/filter/insert_category.xml
index 70f928a91..9b6ad4efb 100644
--- a/modules/document/tpl/filter/insert_category.xml
+++ b/modules/document/tpl/filter/insert_category.xml
@@ -9,6 +9,7 @@
         <param name="category_srl" target="category_srl" />
         <param name="parent_srl" target="parent_srl" />
         <param name="title" target="category_title" />
+        <param name="description" target="category_description" />
         <param name="color" target="category_color" />
         <param name="expand" target="expand" />
         <param name="group_srls" target="group_srls" />
diff --git a/modules/document/tpl/header.html b/modules/document/tpl/header.html
index d93706b4a..58d89c400 100644
--- a/modules/document/tpl/header.html
+++ b/modules/document/tpl/header.html
@@ -1,12 +1,9 @@
-<!--%import("js/document_admin.js")-->
-
-<h3 class="xeAdmin">{$lang->document} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<div class="header4 gap1">
-    <ul class="localNavigation">
-        <li <!--@if($act=='dispDocumentAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminList')}">{$lang->document_list}</a></li>
-        <li <!--@if($act=='dispDocumentAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminConfig')}">{$lang->cmd_module_config}</a></li>
-        <li <!--@if($act=='dispDocumentAdminDeclared')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
-        <li <!--@if($act=='dispDocumentAdminTrashList')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminTrashList')}">{$lang->cmd_trash}</a></li>
+<load target="js/document_admin.js" usecdn="true" />
+<h3 class="h3">{$lang->document} {$lang->cmd_management}</h3>
+<div class="cnb">
+    <ul>
+        <li <!--@if($act=='dispDocumentAdminList')-->class="active"<!--@end-->><a href="{getUrl('act','dispDocumentAdminList')}">{$lang->document_list}</a></li>
+        <li <!--@if($act=='dispDocumentAdminConfig')-->class="active"<!--@end-->><a href="{getUrl('act','dispDocumentAdminConfig')}">{$lang->cmd_module_config}</a></li>
+        <li <!--@if($act=='dispDocumentAdminDeclared')-->class="active"<!--@end-->><a href="{getUrl('act','dispDocumentAdminDeclared')}">{$lang->cmd_declared_list}</a></li>
     </ul>
 </div>
diff --git a/modules/document/tpl/icons/declare.gif b/modules/document/tpl/icons/declare.gif
deleted file mode 100755
index 5cb534fcb..000000000
Binary files a/modules/document/tpl/icons/declare.gif and /dev/null differ
diff --git a/modules/document/tpl/icons/print.gif b/modules/document/tpl/icons/print.gif
deleted file mode 100755
index e36c6b2cb..000000000
Binary files a/modules/document/tpl/icons/print.gif and /dev/null differ
diff --git a/modules/document/tpl/icons/scrap.gif b/modules/document/tpl/icons/scrap.gif
deleted file mode 100755
index a1fcb781a..000000000
Binary files a/modules/document/tpl/icons/scrap.gif and /dev/null differ
diff --git a/modules/document/tpl/icons/send_trackback.gif b/modules/document/tpl/icons/send_trackback.gif
deleted file mode 100755
index c16512895..000000000
Binary files a/modules/document/tpl/icons/send_trackback.gif and /dev/null differ
diff --git a/modules/document/tpl/icons/vote_down.gif b/modules/document/tpl/icons/vote_down.gif
deleted file mode 100755
index 626ff041a..000000000
Binary files a/modules/document/tpl/icons/vote_down.gif and /dev/null differ
diff --git a/modules/document/tpl/icons/vote_up.gif b/modules/document/tpl/icons/vote_up.gif
deleted file mode 100755
index 60d1aa9a7..000000000
Binary files a/modules/document/tpl/icons/vote_up.gif and /dev/null differ
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index e68a8d626..3da2cfc60 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -28,46 +28,6 @@ function completeManageDocument(ret_obj) {
     window.close();
 }
 
-/* 선택된 모듈의 카테고리 목록을 가져오는 함수 */
-function doGetCategoryFromModule(module_srl) {
-    var params = new Array();
-    params['module_srl'] = module_srl;
-
-    var response_tags = ['error','message','categories'];
-
-    exec_xml('document','getDocumentCategories',params, completeGetCategoryFromModules, response_tags);
-}
-
-function completeGetCategoryFromModules(ret_obj, response_tags) {
-    var obj = jQuery('#target_category').get(0);
-    var length = obj.options.length;
-    for(var i=0;i<length;i++) obj.remove(0);
-
-    var categories = ret_obj['categories'];
-    if(!categories) return;
-
-	var depth_str = '-';
-	for(var i=0; i < 5; i++) depth_str += depth_str;
-
-    var category_list = categories.split("\n");
-    for(var i=0;i<category_list.length;i++) {
-        var item = category_list[i];
-
-        var pos = item.indexOf(',');
-        var category_srl = item.substr(0,pos);
-
-        var item = item.substr(pos+1, item.length);
-        var pos = item.indexOf(',');
-        var depth = item.substr(0,pos);
-
-        var category_title = item.substr(pos+1,item.length);
-        if(!category_srl || !category_title) continue;
-
-		if (depth > 0) category_title = depth_str.substr(0, depth) + ' ' + category_title;
-        var opt = new Option(category_title, category_srl, false, false);
-        obj.options[obj.options.length] = opt;
-    }
-}
 
 function doCancelDeclare() {
     var document_srl = [];
@@ -115,8 +75,8 @@ function insertSelectedModule(id, module_srl, mid, browser_title) {
 function deleteByFilter(target_srl, filter)
 {
     jQuery('#target_srl').val(target_srl);
-    var hF = jQuery("deleteForm")[0];
-    procFilter(hF, filter);
+    var hF = jQuery("#deleteForm")[0];
+	hF.submit();
 }
 
 function executeFilterByTargetSrl(form_name, target_srl, filter)
@@ -147,3 +107,151 @@ function completeRestoreTrash(ret_obj) {
     alert(ret_obj['message']);
     location.href = current_url;
 }
+
+function getDocumentList() {
+	var documentListTable = jQuery('#documentListTable');
+	var cartList = [];
+	documentListTable.find(':checkbox[name=cart]').each(function(){
+		if(this.checked) cartList.push(this.value); 
+	});
+
+    var params = new Array();
+    var response_tags = ['error','message', 'document_list'];
+	params["document_srls"] = cartList.join(",");
+
+    exec_xml('document','procDocumentGetList',params, completeGetDocumentList, response_tags);
+}
+
+function completeGetDocumentList(ret_obj, response_tags)
+{
+	var htmlListBuffer = '';
+	var statusNameList = {"PUBLIC":"Public", "SECRET":"Secret", "PRIVATE":"Private", "TEMP":"Temp"};
+	if(ret_obj['document_list'] == null)
+	{
+		htmlListBuffer = '<tr>' +
+							'<td colspan="3" style="text-align:center;">'+ret_obj['message']+'</td>' +
+						'</tr>';
+	}
+	else
+	{
+		var document_list = ret_obj['document_list']['item'];
+		if(!jQuery.isArray(document_list)) document_list = [document_list];
+		for(var x in document_list)
+		{
+			var objDocument = document_list[x];
+			htmlListBuffer += '<tr>' +
+								'<td class="title">'+ objDocument.variables.title +'</td>' +
+								'<td>'+ objDocument.variables.nick_name +'</td>' +
+								'<td>'+ statusNameList[objDocument.variables.status] +'</td>' +
+							'</tr>'+
+							'<input type="hidden" name="cart[]" value="'+objDocument.document_srl+'" />';
+		}
+		jQuery('#selectedDocumentCount').html(document_list.length);
+	}
+	jQuery('#documentManageListTable>tbody').html(htmlListBuffer);
+}
+
+function getModuleList()
+{
+	var params = new Array();
+	var response_tags = ['error', 'message', 'module_list'];
+    var formObj = jQuery("#manageForm").get(0);
+
+    params['site_keyword'] = formObj.site_keyword.value;
+
+    exec_xml('module','procModuleAdminGetList',params, completeGetModuleList, response_tags);
+}
+
+var module_list = '';
+function completeGetModuleList(ret_obj, response_tags)
+{
+    var formObj = jQuery("#manageForm").get(0);
+	module_list = ret_obj['module_list'];
+	var htmlListBuffer = '';
+
+	for(var x in module_list)
+	{
+		if(x == 'page') continue;
+		var moduleObject = module_list[x];
+		htmlListBuffer += '<option value="'+x+'">'+moduleObject.title+'</option>';
+	}
+	jQuery('#module_list').html(htmlListBuffer);
+	makeMidList(jQuery('#module_list').val());
+}
+
+jQuery(document).ready(function($){
+	$('#module_list').bind('change', function(e){
+		makeMidList($('#module_list').val());
+	});
+	$('#mid_list').bind('change', function(e){
+		doGetCategoryFromModule($('#mid_list').val());
+	});
+});
+
+function makeMidList(moduleName)
+{
+	var mid_list = module_list[moduleName].list;
+	var htmlListBuffer = '';
+	for(var x in mid_list)
+	{
+		var moduleInstance = mid_list[x];
+		htmlListBuffer += '<option value="'+moduleInstance.module_srl+'">'+x+'</option>';
+	}
+	jQuery('#mid_list').html(htmlListBuffer);
+	doGetCategoryFromModule(jQuery('#mid_list').val());
+}
+
+/* 선택된 모듈의 카테고리 목록을 가져오는 함수 */
+function doGetCategoryFromModule(module_srl) {
+    var params = new Array();
+    params['module_srl'] = module_srl;
+
+    var response_tags = ['error','message','categories'];
+
+    exec_xml('document','getDocumentCategories',params, completeGetCategoryFromModules, response_tags);
+}
+
+function completeGetCategoryFromModules(ret_obj, response_tags) {
+    var obj = jQuery('#target_category').get(0);
+    var length = obj.options.length;
+    for(var i=0;i<length;i++) obj.remove(0);
+
+    var categories = ret_obj['categories'];
+    if(!categories) return;
+
+	var depth_str = '-';
+	for(var i=0; i < 5; i++) depth_str += depth_str;
+
+    var category_list = categories.split("\n");
+    for(var i=0;i<category_list.length;i++) {
+        var item = category_list[i];
+
+        var pos = item.indexOf(',');
+        var category_srl = item.substr(0,pos);
+
+        var item = item.substr(pos+1, item.length);
+        var pos = item.indexOf(',');
+        var depth = item.substr(0,pos);
+
+        var category_title = item.substr(pos+1,item.length);
+        if(!category_srl || !category_title) continue;
+
+		if (depth > 0) category_title = depth_str.substr(0, depth) + ' ' + category_title;
+        var opt = new Option(category_title, category_srl, false, false);
+        obj.options[obj.options.length] = opt;
+    }
+}
+
+function checkSearch(form)
+{
+	if(form.search_target.value == '')
+	{
+		alert(xe.lang.msg_empty_search_target);
+		return false;
+	}
+	if(form.search_keyword.value == '')
+	{
+		alert(xe.lang.msg_empty_search_keyword);
+		return false;
+	}
+}
diff --git a/modules/document/tpl/js/document_category.js b/modules/document/tpl/js/document_category.js
index 5ec3fc492..6743f8795 100644
--- a/modules/document/tpl/js/document_category.js
+++ b/modules/document/tpl/js/document_category.js
@@ -1,189 +1,189 @@
-/**
- * @file   modules/document/tpl/js/document_category.js
- * @author NHN (developers@xpressengine.com)
- * @brief  document 모듈의 category tree javascript
- **/
-
-function Tree(url){
-    // clear tree;
-    jQuery('#menu > ul > li > ul').remove();
-    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
-
-    //ajax get data and transeform ul il
-    jQuery.get(url,function(data){
-        jQuery(data).find("node").each(function(i){
-            var text = jQuery(this).attr("text");
-            var node_srl = jQuery(this).attr("node_srl");
-            var parent_srl = jQuery(this).attr("parent_srl");
-            var color = jQuery(this).attr("color");
-            var url = jQuery(this).attr("url");
-
-            // node
-            var node = '';
-            if(color && color !='transparent'){
-                node = jQuery('<li id="tree_'+node_srl+'"><span style="color:'+color+';">'+text+'</span></li>');
-            }else{
-                node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
-            }
-
-            // button
-            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){
-                jQuery("#tree_"+node_srl+" > span").click();
-                addNode(node_srl,e);
-                return false;
-            }).appendTo(node);
-
-            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" /></a>').bind("click",function(e){
-                jQuery("#tree_"+node_srl+" > span").click();
-                modifyNode(node_srl,e);
-                return false;
-            }).appendTo(node);
-
-            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" /></a>').bind("click",function(e){
-                deleteNode(node_srl);
-                return false;
-            }).appendTo(node);
-
-            // insert parent child
-            if(parent_srl>0){
-                if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('<ul>'));
-                jQuery('#tree_'+parent_srl+'> ul').append(node);
-            }else{
-                if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("<ul>").appendTo('#menu ul.simpleTree > li');
-                jQuery('#menu ul.simpleTree > li > ul').append(node);
-            }
-
-        });
-
-        //button show hide
-        jQuery("#menu li").each(function(){
-            if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
-            if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
-        });
-
-
-        // draw tree
-        simpleTreeCollection = jQuery('.simpleTree').simpleTree({
-            autoclose: false,
-            afterClick:function(node){
-                jQuery('#category_info').html("");
-                //alert("text-"+jQuery('span:first',node).text());
-            },
-            afterDblClick:function(node){
-                //alert("text-"+jQuery('span:first',node).text());
-            },
-            afterMove:function(destination, source, pos){
-                if(destination.size() == 0){
-                    Tree(xml_url);
-                    return;
-                }
-                var module_srl = jQuery("#fo_category input[name=module_srl]").val();
-                var parent_srl = destination.attr('id').replace(/.*_/g,'');
-                var source_srl = source.attr('id').replace(/.*_/g,'');
-
-                var target = source.prevAll("li:not([class^=line])");
-                var target_srl = 0;
-                if(target.length >0){
-                    target_srl = source.prevAll("li:not([class^=line])").get(0).id.replace(/.*_/g,'');
-                    parent_srl = 0;
-                }
-
-                jQuery.exec_json("document.procDocumentMoveCategory",{ "module_srl":module_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl},
-                function(data){
-                    jQuery('#category_info').html('');
-                   if(data.error > 0) Tree(xml_url);
-                });
-
-            },
-
-            // i want you !! made by sol
-            beforeMovedToLine : function(destination, source, pos){
-                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
-            },
-
-            // i want you !! made by sol
-            beforeMovedToFolder : function(destination, source, pos){
-                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
-            },
-            afterAjax:function()
-            {
-                //alert('Loaded');
-            },
-            animate:true
-            ,docToFolderConvert:true
-        });
-
-
-
-        // open all node
-        nodeToggleAll();
-    },"xml");
-}
-function addNode(node,e){
-    var params ={
-            "category_srl":0
-            ,"parent_srl":node
-            ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
-            };
-
-    jQuery.exec_json('document.getDocumentCategoryTplInfo', params, function(data){
-        jQuery('#category_info').html(data.tpl).css('left',e.pageX).css('top',e.pageY);
-    });
-}
-
-function modifyNode(node,e){
-    var params ={
-            "category_srl":node
-            ,"parent_srl":0
-            ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
-            };
-
-    jQuery.exec_json('document.getDocumentCategoryTplInfo', params, function(data){
-        jQuery('#category_info').html(data.tpl).css('left',e.pageX).css('top',e.pageY);
-    });
-}
-
-
-function nodeToggleAll(){
-    jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
-        simpleTreeCollection[0].nodeToggle(this);
-    });
-}
-
-function deleteNode(node){
-    if(confirm(lang_confirm_delete)){
-        jQuery('#category_info').html("");
-        var params ={
-                "category_srl":node
-                ,"parent_srl":0
-                ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
-                };
-
-        jQuery.exec_json('document.procDocumentDeleteCategory', params, function(data){
-            if(data.error==0) Tree(xml_url);
-        });
-    }
-}
-
-/* 카테고리 아이템 입력후 */
-function completeInsertCategory(ret_obj) {
-    jQuery('#category_info').html("");
-    Tree(xml_url);
-}
-
-function hideCategoryInfo() {
-    jQuery('#category_info').html("");
-}
-
-/* 카테고리 목록 갱신 */
-function doReloadTreeCategory(module_srl) {
-    var params = {'module_srl':module_srl};
-
-    // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다.
-    var response_tags = new Array('error','message', 'xml_file');
-    exec_xml('document', 'procDocumentMakeXmlFile', params, completeInsertCategory, response_tags, params);
-}
-
-function doCategoryFormMove() {
-	jQuery(function($){ $('#fo_category').appendTo(document.body); $('#category_info').css('width', '550px'); });
-}
+/**
+ * @file   modules/document/tpl/js/document_category.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  document 모듈의 category tree javascript
+ **/
+
+function Tree(url){
+    // clear tree;
+    jQuery('#menu > ul > li > ul').remove();
+    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
+
+    //ajax get data and transeform ul il
+    jQuery.get(url,function(data){
+        jQuery(data).find("node").each(function(i){
+            var text = jQuery(this).attr("text");
+            var node_srl = jQuery(this).attr("node_srl");
+            var parent_srl = jQuery(this).attr("parent_srl");
+            var color = jQuery(this).attr("color");
+            var url = jQuery(this).attr("url");
+
+            // node
+            var node = '';
+            if(color && color !='transparent'){
+                node = jQuery('<li id="tree_'+node_srl+'"><span style="color:'+color+';">'+text+'</span></li>');
+            }else{
+                node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
+            }
+
+            // button
+            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" /></a>').bind("click",function(e){
+                jQuery("#tree_"+node_srl+" > span").click();
+                addNode(node_srl,e);
+                return false;
+            }).appendTo(node);
+
+            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" /></a>').bind("click",function(e){
+                jQuery("#tree_"+node_srl+" > span").click();
+                modifyNode(node_srl,e);
+                return false;
+            }).appendTo(node);
+
+            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" /></a>').bind("click",function(e){
+                deleteNode(node_srl);
+                return false;
+            }).appendTo(node);
+
+            // insert parent child
+            if(parent_srl>0){
+                if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('<ul>'));
+                jQuery('#tree_'+parent_srl+'> ul').append(node);
+            }else{
+                if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("<ul>").appendTo('#menu ul.simpleTree > li');
+                jQuery('#menu ul.simpleTree > li > ul').append(node);
+            }
+
+        });
+
+        //button show hide
+        jQuery("#menu li").each(function(){
+            if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
+            if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
+        });
+
+
+        // draw tree
+        simpleTreeCollection = jQuery('.simpleTree').simpleTree({
+            autoclose: false,
+            afterClick:function(node){
+                jQuery('#category_info').html("");
+                //alert("text-"+jQuery('span:first',node).text());
+            },
+            afterDblClick:function(node){
+                //alert("text-"+jQuery('span:first',node).text());
+            },
+            afterMove:function(destination, source, pos){
+                if(destination.size() == 0){
+                    Tree(xml_url);
+                    return;
+                }
+                var module_srl = jQuery("#fo_category input[name=module_srl]").val();
+                var parent_srl = destination.attr('id').replace(/.*_/g,'');
+                var source_srl = source.attr('id').replace(/.*_/g,'');
+
+                var target = source.prevAll("li:not([class^=line])");
+                var target_srl = 0;
+                if(target.length >0){
+                    target_srl = source.prevAll("li:not([class^=line])").get(0).id.replace(/.*_/g,'');
+                    parent_srl = 0;
+                }
+
+                jQuery.exec_json("document.procDocumentMoveCategory",{ "module_srl":module_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl},
+                function(data){
+                    jQuery('#category_info').html('');
+                   if(data.error > 0) Tree(xml_url);
+                });
+
+            },
+
+            // i want you !! made by sol
+            beforeMovedToLine : function(destination, source, pos){
+                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
+            },
+
+            // i want you !! made by sol
+            beforeMovedToFolder : function(destination, source, pos){
+                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
+            },
+            afterAjax:function()
+            {
+                //alert('Loaded');
+            },
+            animate:true
+            ,docToFolderConvert:true
+        });
+
+
+
+        // open all node
+        nodeToggleAll();
+    },"xml");
+}
+function addNode(node,e){
+    var params ={
+            "category_srl":0
+            ,"parent_srl":node
+            ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
+            };
+
+    jQuery.exec_json('document.getDocumentCategoryTplInfo', params, function(data){
+        jQuery('#category_info').html(data.tpl).css('left',e.pageX).css('top',e.pageY);
+    });
+}
+
+function modifyNode(node,e){
+    var params ={
+            "category_srl":node
+            ,"parent_srl":0
+            ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
+            };
+
+    jQuery.exec_json('document.getDocumentCategoryTplInfo', params, function(data){
+        jQuery('#category_info').html(data.tpl).css('left',e.pageX).css('top',e.pageY);
+    });
+}
+
+
+function nodeToggleAll(){
+    jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
+        simpleTreeCollection[0].nodeToggle(this);
+    });
+}
+
+function deleteNode(node){
+    if(confirm(lang_confirm_delete)){
+        jQuery('#category_info').html("");
+        var params ={
+                "category_srl":node
+                ,"parent_srl":0
+                ,"module_srl":jQuery("#fo_category [name=module_srl]").val()
+                };
+
+        jQuery.exec_json('document.procDocumentDeleteCategory', params, function(data){
+            if(data.error==0) Tree(xml_url);
+        });
+    }
+}
+
+/* 카테고리 아이템 입력후 */
+function completeInsertCategory(ret_obj) {
+    jQuery('#category_info').html("");
+    Tree(xml_url);
+}
+
+function hideCategoryInfo() {
+    jQuery('#category_info').html("");
+}
+
+/* 카테고리 목록 갱신 */
+function doReloadTreeCategory(module_srl) {
+    var params = {'module_srl':module_srl};
+
+    // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다.
+    var response_tags = new Array('error','message', 'xml_file');
+    exec_xml('document', 'procDocumentMakeXmlFile', params, completeInsertCategory, response_tags, params);
+}
+
+function doCategoryFormMove() {
+	jQuery(function($){ $('#fo_category').appendTo(document.body); $('#category_info').css('width', '550px'); });
+}
diff --git a/modules/document/tpl/preview_page.html b/modules/document/tpl/preview_page.html
index fb7dc0034..e572be847 100644
--- a/modules/document/tpl/preview_page.html
+++ b/modules/document/tpl/preview_page.html
@@ -1,5 +1,6 @@
-<!--%import("./js/document_admin.js")-->
-<!--%import("./css/document.css")-->
-
-<div class="fr"><a href="#" onclick="window.close();return false;" class="button"><span>{$lang->cmd_close}</span></a></div>
+<load target="./js/document_admin.js" usecdn="true" />
+<load target="./css/document.css" usecdn="true" />
 {$content}
+<div class="btnArea">
+	<span class="btn"><button type="button" onclick="window.close();return false;">{$lang->cmd_close}</button></span>
+</div>
diff --git a/modules/document/tpl/print_page.html b/modules/document/tpl/print_page.html
index f79687f9a..19e3dc111 100644
--- a/modules/document/tpl/print_page.html
+++ b/modules/document/tpl/print_page.html
@@ -1,25 +1,16 @@
-<!--%import("./js/document_admin.js")-->
-<!--%import("./css/document.css")-->
-
-<div class="printContent">
-
-    <div><h1 class="xeAdmin">{$oDocument->getTitleText()}</h1></div>
-
-    <div class="member_{$oDocument->get('member_srl')} gap1 fl">{$oDocument->get('nick_name')}</div>
-    <div class="gap1 fr">{$oDocument->getRegdate()}</div>
-    <div class="clear"></div>
-
-
-    <!--@if($oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted()) )-->
-    <!--@foreach($oDocument->getExtraVars() as $key => $val)-->
-    <div class="gap1">{$val->name} : {$val->getValueHtml()}</div>
-    <div class="clear"></div>
-    <!--@end-->
-    <!--@end-->
-    <div class="gap1">{$oDocument->getContent(false, false)}</div>
-
-</div>
-
-<script type="text/javascript">//<![CDATA[
+<load target="./js/document_admin.js" usecdn="true" />
+<load target="./css/document.css" usecdn="true" />
+<h1 class="h1">{$oDocument->getTitleText()}</h1>
+<a href="#popup_menu_area" class="member_{$oDocument->get('member_srl')}">{$oDocument->get('nick_name')}</a>
+{$oDocument->getRegdate()}
+<!--@if($oDocument->isExtraVarsExists() && (!$oDocument->isSecret() || $oDocument->isGranted()) )-->
+<!--@foreach($oDocument->getExtraVars() as $key => $val)-->    
+{$val->name}: {$val->getValueHtml()}
+<!--@end-->
+<!--@end-->    
+{$oDocument->getContent(false, false)} 
+<script type="text/javascript">
+//<![CDATA[
     jQuery(window).load(function() { window.print(); } );
-//]]></script>
+//]]>
+</script>
diff --git a/modules/document/tpl/saved_list_popup.html b/modules/document/tpl/saved_list_popup.html
new file mode 100644
index 000000000..a67bf7e02
--- /dev/null
+++ b/modules/document/tpl/saved_list_popup.html
@@ -0,0 +1,38 @@
+<load target="css/default.css" usecdn="true" />
+<h1 class="h1">{$lang->cmd_view_saved_document}</h1>
+<!-- 목록 -->
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+	<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+<thead>
+	<tr>
+		<th class="title">{$lang->date}</th>
+		<th class="title">{$lang->title}</th>
+		<th class="title">{$lang->cmd_select}</th>
+	</tr>
+</thead>
+<tbody>
+	<!--@foreach($document_list as $no => $val)-->
+	<tr>
+		<td>{$val->getRegdate("Y-m-d H:i:s")}</td>
+		<td > <a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); setFixedPopupSize(); return false;">{$val->getTitle()}</a>
+			<div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;">{$val->getContent(false)}</div>
+		</td>
+		<td><a href="#" onclick="doDocumentSelect('{$val->document_srl}'); return false;" class="buttonSet buttonActive"><span>{$lang->cmd_select}</span></a></td>
+	</tr>
+	<!--@end-->
+</tbody>
+</table>
+</div>
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+	<a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		<!--@if($page == $page_no)-->
+			<strong>{$page_no}</strong>
+		<!--@else-->
+			<a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+		<!--@end-->
+	<!--@end-->
+	<a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
diff --git a/modules/editor/components/emoticon/emoticon.class.php b/modules/editor/components/emoticon/emoticon.class.php
index 0909ee578..9fc8d1b23 100644
--- a/modules/editor/components/emoticon/emoticon.class.php
+++ b/modules/editor/components/emoticon/emoticon.class.php
@@ -1,107 +1,104 @@
-<?php
-    /**
-     * @class  emoticon
-     * @author NHN (developers@xpressengine.com)
-     * @brief  이모티콘 이미지 연결 컴포넌트
-     **/
-
-    class emoticon extends EditorHandler {
-
-        // editor_sequence 는 에디터에서 필수로 달고 다녀야 함....
-        var $editor_sequence = 0;
-        var $component_path = '';
-        var $emoticon_path = '';
-
-        /**
-         * @brief editor_sequence과 컴포넌트의 경로를 받음
-         **/
-        function emoticon($editor_sequence, $component_path) {
-            $this->editor_sequence = $editor_sequence;
-            $this->component_path = $component_path;
-            $this->emoticon_path = sprintf('%s%s/images',preg_replace('/^\.\//i','',$this->component_path),'tpl','images');
-        }
-
-        /**
-         * @brief 이모티콘 파일 목록을 리턴
-         **/
-        function getEmoticonList() {
-            $emoticon = Context::get('emoticon');
-            if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new Object(-1,'msg_invalid_request');
-
-            $list = $this->getEmoticons($emoticon);
-
-            $this->add('emoticons', implode("\n",$list));
-        }
-
-        /**
-        * @brief 재귀적으로 이모티콘이 될 법한 파일들을 하위 디렉토리까지 전부 검색한다. 8,000개까지는 테스트 해봤는데 스택오버프로우를 일으킬지 어떨지는 잘 모르겠음.(2007.9.6, 베니)
-        **/
-        function getEmoticons($path) {
-            $emoticon_path = sprintf("%s/%s", $this->emoticon_path, $path);
-            $output = array();
-
-            $oDir = dir($emoticon_path);
-            while($file = $oDir->read()) {
-                if(substr($file,0,1)=='.') continue;
-                if(preg_match('/\.(jpg|jpeg|gif|png)$/i',$file)) $output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path,'',$file));
-            }
-            $oDir->close();
-            if(count($output)) asort($output);
-            return $output;
-        }
-
-        /**
-         * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
-         **/
-        function getPopupContent() {
-            // 이모티콘 디렉토리 목록을 가져옴
-            $emoticon_dirs = FileHandler::readDir($this->emoticon_path);
-            $emoticon_list = array();
-            if($emoticon_dirs) {
-                foreach($emoticon_dirs as $emoticon) {
-                    if(preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) $emoticon_list[] = $emoticon;
-                }
-            }
-            Context::set('emoticon_list', $emoticon_list);
-
-            // 첫번째 이모티콘 디렉토리의 이미지 파일을 구함
-            $emoticons = $this->getEmoticons($emoticon_list[0]);
-            Context::set('emoticons', $emoticons);
-
-            // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
-            $tpl_path = $this->component_path.'tpl';
-            $tpl_file = 'popup.html';
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-        * @brief 이모티콘의 경로 문제 해결을 하기 위해 추가하였다. (2007.9.6 베니)
-        **/
-        function transHTML($xml_obj) {
-            $src = $xml_obj->attrs->src;
-            $alt = $xml_obj->attrs->alt;
-
-            if(!$alt) {
-                $tmp_arr = explode('/',$src);
-                $alt = array_pop($tmp_arr);
-            }
-
-            $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
-            if(!$alt) $alt = $src;
-
-            $attr_output = array();
-            $attr_output = array("src=\"".$src."\"");
-
-            if($alt) {
-                $attr_output[] = "alt=\"".$alt."\"";
-            }
-            if(preg_match("/\.png$/i",$src)) $attr_output[] = "class=\"iePngFix\"";
-
-            $code = sprintf("<img %s style=\"border:0px\" />", implode(" ",$attr_output));
-
-            return $code;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  emoticon
+     * @author NHN (developers@xpressengine.com)
+     * @brief Emoticons image connected components
+     **/
+
+    class emoticon extends EditorHandler {
+        // editor_sequence from the editor must attend mandatory wearing ....
+        var $editor_sequence = 0;
+        var $component_path = '';
+        var $emoticon_path = '';
+
+        /**
+         * @brief editor_sequence and components out of the path
+         **/
+        function emoticon($editor_sequence, $component_path) {
+            $this->editor_sequence = $editor_sequence;
+            $this->component_path = $component_path;
+            $this->emoticon_path = sprintf('%s%s/images',preg_replace('/^\.\//i','',$this->component_path),'tpl','images');
+        }
+
+        /**
+         * @brief Returns a list of emoticons file
+         **/
+        function getEmoticonList() {
+            $emoticon = Context::get('emoticon');
+            if(!$emoticon || !preg_match("/^([a-z0-9\_]+)$/i",$emoticon)) return new Object(-1,'msg_invalid_request');
+
+            $list = $this->getEmoticons($emoticon);
+
+            $this->add('emoticons', implode("\n",$list));
+        }
+
+        /**
+        * @brief Likely to be recursively emoticons will search all the files to a subdirectory. 8000 gaekkajineun ran tests whether the stack and raise beef pro-overs and Unsure. (06/09/2007, Benny)
+        **/
+        function getEmoticons($path) {
+            $emoticon_path = sprintf("%s/%s", $this->emoticon_path, $path);
+            $output = array();
+
+            $oDir = dir($emoticon_path);
+            while($file = $oDir->read()) {
+                if(substr($file,0,1)=='.') continue;
+                if(preg_match('/\.(jpg|jpeg|gif|png)$/i',$file)) $output[] = sprintf("%s/%s", $path, str_replace($this->emoticon_path,'',$file));
+            }
+            $oDir->close();
+            if(count($output)) asort($output);
+            return $output;
+        }
+
+        /**
+         * @brief popup window to display in popup window request is to add content
+         **/
+        function getPopupContent() {
+            // Bringing a list of emoticons directory
+            $emoticon_dirs = FileHandler::readDir($this->emoticon_path);
+            $emoticon_list = array();
+            if($emoticon_dirs) {
+                foreach($emoticon_dirs as $emoticon) {
+                    if(preg_match("/^([a-z0-9\_]+)$/i", $emoticon)) $emoticon_list[] = $emoticon;
+                }
+            }
+            Context::set('emoticon_list', $emoticon_list);
+            // The first emoticon image files in the directory Wanted
+            $emoticons = $this->getEmoticons($emoticon_list[0]);
+            Context::set('emoticons', $emoticons);
+            // Pre-compiled source code to compile template return to
+            $tpl_path = $this->component_path.'tpl';
+            $tpl_file = 'popup.html';
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+        * @brief Emoticon of the path were added to solve the problem. (06/09/2007 Benny)
+        **/
+        function transHTML($xml_obj) {
+            $src = $xml_obj->attrs->src;
+            $alt = $xml_obj->attrs->alt;
+
+            if(!$alt) {
+                $tmp_arr = explode('/',$src);
+                $alt = array_pop($tmp_arr);
+            }
+
+            $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
+            if(!$alt) $alt = $src;
+
+            $attr_output = array();
+            $attr_output = array("src=\"".$src."\"");
+
+            if($alt) {
+                $attr_output[] = "alt=\"".$alt."\"";
+            }
+            if(preg_match("/\.png$/i",$src)) $attr_output[] = "class=\"iePngFix\"";
+
+            $code = sprintf("<img %s style=\"border:0px\" />", implode(" ",$attr_output));
+
+            return $code;
+        }
+    }
+?>
diff --git a/modules/editor/components/emoticon/info.xml b/modules/editor/components/emoticon/info.xml
index a4c526549..7f89742e5 100644
--- a/modules/editor/components/emoticon/info.xml
+++ b/modules/editor/components/emoticon/info.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component version="0.2">
-    <title xml:lang="ko">이모티콘 출력</title>
-    <title xml:lang="jp">顔文字（イモティコン）</title>
-    <title xml:lang="zh-CN">表情图标</title>
-    <title xml:lang="en">Display Emoticons</title>
-    <title xml:lang="vi">Diễn tả cảm xúc</title>
-    <title xml:lang="es">Mostrar iconos gestuales</title>
-    <title xml:lang="ru">Отображение смайлов</title>
-    <title xml:lang="zh-TW">表情符號</title>
-    <title xml:lang="tr">His Simgeleri Gösterimi</title>
-    <description xml:lang="ko">이모티콘을 에디터에 삽입할 수 있습니다.</description>
-    <description xml:lang="jp">顔文字（イモティコン）をエディターに追加することが出来ます。</description>
-    <description xml:lang="zh-CN">可以插入表情图标到编辑器。</description>
-    <description xml:lang="en">You may insert emoticons to editor.</description>
-    <description xml:lang="vi">Bạn có thể chèn biểu tượng cảm xúc vào bài viết.</description>
-    <description xml:lang="es">Usted puede insertar emoticonos para el editor.</description>
-    <description xml:lang="ru">Вы можете вставить смыйлы в редактор.</description>
-    <description xml:lang="zh-TW">可插入表情符號到編輯器。</description>
-    <description xml:lang="tr">Editöre his simgeleri ekleyebilirsiniz.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="ko">이모티콘 출력</title>
+    <title xml:lang="jp">顔文字（イモティコン）</title>
+    <title xml:lang="zh-CN">表情图标</title>
+    <title xml:lang="en">Display Emoticons</title>
+    <title xml:lang="vi">Diễn tả cảm xúc</title>
+    <title xml:lang="es">Mostrar iconos gestuales</title>
+    <title xml:lang="ru">Отображение смайлов</title>
+    <title xml:lang="zh-TW">表情符號</title>
+    <title xml:lang="tr">His Simgeleri Gösterimi</title>
+    <description xml:lang="ko">이모티콘을 에디터에 삽입할 수 있습니다.</description>
+    <description xml:lang="jp">顔文字（イモティコン）をエディターに追加することが出来ます。</description>
+    <description xml:lang="zh-CN">可以插入表情图标到编辑器。</description>
+    <description xml:lang="en">You may insert emoticons to editor.</description>
+    <description xml:lang="vi">Bạn có thể chèn biểu tượng cảm xúc vào bài viết.</description>
+    <description xml:lang="es">Usted puede insertar emoticonos para el editor.</description>
+    <description xml:lang="ru">Вы можете вставить смыйлы в редактор.</description>
+    <description xml:lang="zh-TW">可插入表情符號到編輯器。</description>
+    <description xml:lang="tr">Editöre his simgeleri ekleyebilirsiniz.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</component>
diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index f54a7aa04..4c0d9d757 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -1,12 +1,6 @@
 <!--%import("popup.js")-->
 <!--%import("popup.css")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">
-        {$component_info->title} ver. {$component_info->version}
-    </h3>
-</div>
-
+<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
 <div class="emoticonList">
     <select name="list" id="selectEmoticonList">
     <!--@foreach($emoticon_list as $key => $val)-->
@@ -14,6 +8,4 @@
     <!--@end-->
     </select>
 </div>
-
-<div id="popBody">
-</div>
+<div id="emoticons"></div>
diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js
index fa8d8cc79..31417ff57 100644
--- a/modules/editor/components/emoticon/tpl/popup.js
+++ b/modules/editor/components/emoticon/tpl/popup.js
@@ -19,16 +19,10 @@ function getEmoticons(emoName) {
 function completeGetEmoticons(ret_obj) {
     var emoticons = ret_obj['emoticons'].split("\n");
     var html = [];
-
     for(var i=0;i<emoticons.length;i++) {
 		html[html.length] = '<img src="./modules/editor/components/emoticon/tpl/images/'+emoticons[i]+'" class="emoticon" />';
     }
-	jQuery('#popBody').html(html.join('')).find('img.emoticon').click(insertEmoticon);
-
-	if (_isPoped) {
-		setFixedPopupSize();
-		setTimeout(setFixedPopupSize,1000);
-	}
+	jQuery('#emoticons').html(html.join('')).find('img.emoticon').click(insertEmoticon);
 }
 
 /**
diff --git a/modules/editor/components/image_gallery/image_gallery.class.php b/modules/editor/components/image_gallery/image_gallery.class.php
index 05ecd286e..8c4426ac2 100644
--- a/modules/editor/components/image_gallery/image_gallery.class.php
+++ b/modules/editor/components/image_gallery/image_gallery.class.php
@@ -1,81 +1,78 @@
-<?php
-    /**
-     * @class  image_gallery
-     * @author NHN (developers@xpressengine.com)
-     * @brief  업로드된 이미지로 이미지갤러리를 만듬
-     **/
-
-    class image_gallery extends EditorHandler { 
-
-        // editor_sequence 는 에디터에서 필수로 달고 다녀야 함....
-        var $editor_sequence = 0;
-        var $component_path = '';
-
-        /**
-         * @brief editor_sequence과 컴포넌트의 경로를 받음
-         **/
-        function image_gallery($editor_sequence, $component_path) {
-            $this->editor_sequence = $editor_sequence;
-            $this->component_path = $component_path;
-        }
-
-        /**
-         * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
-         **/
-        function getPopupContent() {
-            // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
-            $tpl_path = $this->component_path.'tpl';
-            $tpl_file = 'popup.html';
-
-            Context::set("tpl_path", $tpl_path);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 에디터 컴포넌트가 별도의 고유 코드를 이용한다면 그 코드를 html로 변경하여 주는 method
-         *
-         * 이미지나 멀티미디어, 설문등 고유 코드가 필요한 에디터 컴포넌트는 고유코드를 내용에 추가하고 나서
-         * DocumentModule::transContent() 에서 해당 컴포넌트의 transHtml() method를 호출하여 고유코드를 html로 변경
-         **/
-        function transHTML($xml_obj) {
-            $gallery_info->srl = rand(111111,999999);
-            $gallery_info->border_thickness = $xml_obj->attrs->border_thickness;
-            $gallery_info->gallery_style = $xml_obj->attrs->gallery_style;
-            $gallery_info->border_color = $xml_obj->attrs->border_color;
-            $gallery_info->bg_color = $xml_obj->attrs->bg_color;
-            $gallery_info->gallery_align = $xml_obj->attrs->gallery_align;
-
-            $images_list = $xml_obj->attrs->images_list;
-            $images_list = preg_replace('/\.(gif|jpg|jpeg|png) /i',".\\1\n",$images_list);
-            $gallery_info->images_list = explode("\n",trim($images_list));
-
-            // 만약 출력설정이 XML일 경우 이미지 목록만 출력하도록 코드 생성
-            if(Context::getResponseMethod() == 'XMLRPC') {
-                $output = '';
-                for($i=0;$i<count($gallery_info->images_list);$i++) {
-                    $output .= sprintf('<img src="%s" alt="" /><br />', $gallery_info->images_list[$i]);
-                }
-                return $output;
-            }
-
-            // HTML 출력일 경우 템플릿 변환을 거쳐서 갤러리 출력 설정에 맞는 html코드를 생성하도록 함
-            preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
-            $gallery_info->width = trim($matches[3][0]);
-            if(!$gallery_info->width) $gallery_info->width = 400;
-
-            Context::set('gallery_info', $gallery_info);
-
-            $tpl_path = $this->component_path.'tpl';
-            Context::set("tpl_path", $tpl_path);
-
-            if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
-            else $tpl_file = 'slide_gallery.html';
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  image_gallery
+     * @author NHN (developers@xpressengine.com)
+     * @brief Making images uploaded to the image gallery
+     **/
+
+    class image_gallery extends EditorHandler { 
+        // editor_sequence from the editor must attend mandatory wearing ....
+        var $editor_sequence = 0;
+        var $component_path = '';
+
+        /**
+         * @brief editor_sequence and components out of the path
+         **/
+        function image_gallery($editor_sequence, $component_path) {
+            $this->editor_sequence = $editor_sequence;
+            $this->component_path = $component_path;
+        }
+
+        /**
+         * @brief popup window to display in popup window request is to add content
+         **/
+        function getPopupContent() {
+            // Pre-compiled source code to compile template return to
+            $tpl_path = $this->component_path.'tpl';
+            $tpl_file = 'popup.html';
+
+            Context::set("tpl_path", $tpl_path);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief Editor of the components separately if you use a unique code to the html code for a method to change
+         *
+         * Images and multimedia, seolmundeung unique code is required for the editor component added to its own code, and then
+         * DocumentModule:: transContent() of its components transHtml() method call to change the html code for your own
+         **/
+        function transHTML($xml_obj) {
+            $gallery_info->srl = rand(111111,999999);
+            $gallery_info->border_thickness = $xml_obj->attrs->border_thickness;
+            $gallery_info->gallery_style = $xml_obj->attrs->gallery_style;
+            $gallery_info->border_color = $xml_obj->attrs->border_color;
+            $gallery_info->bg_color = $xml_obj->attrs->bg_color;
+            $gallery_info->gallery_align = $xml_obj->attrs->gallery_align;
+
+            $images_list = $xml_obj->attrs->images_list;
+            $images_list = preg_replace('/\.(gif|jpg|jpeg|png) /i',".\\1\n",$images_list);
+            $gallery_info->images_list = explode("\n",trim($images_list));
+            // If you set the output to output the XML code generated a list of the image
+            if(Context::getResponseMethod() == 'XMLRPC') {
+                $output = '';
+                for($i=0;$i<count($gallery_info->images_list);$i++) {
+                    $output .= sprintf('<img src="%s" alt="" /><br />', $gallery_info->images_list[$i]);
+                }
+                return $output;
+            }
+            // HTML gallery output, the output settings via the template for the conversion to generate the html code should
+            preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+            $gallery_info->width = trim($matches[3][0]);
+            if(!$gallery_info->width) $gallery_info->width = 400;
+
+            Context::set('gallery_info', $gallery_info);
+
+            $tpl_path = $this->component_path.'tpl';
+            Context::set("tpl_path", $tpl_path);
+
+            if($gallery_info->gallery_style == "list") $tpl_file = 'list_gallery.html';
+            else $tpl_file = 'slide_gallery.html';
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+    }
+?>
diff --git a/modules/editor/components/image_gallery/info.xml b/modules/editor/components/image_gallery/info.xml
index dd2c477e5..fac9f0ecf 100644
--- a/modules/editor/components/image_gallery/info.xml
+++ b/modules/editor/components/image_gallery/info.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component version="0.2">
-    <title xml:lang="vi">Slide Show</title>
-    <title xml:lang="ko">기본 이미지 갤러리</title>
-    <title xml:lang="jp">デフォルトイメージギャラリー</title>
-    <title xml:lang="zh-CN">图片相册</title>
-    <title xml:lang="en">Basic Image Gallery</title>
-    <title xml:lang="es">Galería de imágenes básicos</title>
-    <title xml:lang="ru">Базовая галлерея изображений</title>
-    <title xml:lang="zh-TW">預設圖片相簿</title>
-    <title xml:lang="tr">Temel Resim Galerisi</title>
-    <description xml:lang="vi">Bạn có thể tạo ra một Slide Show theo dạng danh sách hoặc Slide từ những hình ảnh đính kèm của mình.</description>
-    <description xml:lang="ko">첨부된 이미지파일을 이용하여 슬라이드/목록형 이미지 갤러리를 만들 수 있습니다.</description>
-    <description xml:lang="jp">添付されたイメージファイルを利用して、スライド型・リスト型のイメージギャラリーが作成できます。</description>
-    <description xml:lang="zh-CN">利用上传的图片文件实现幻灯片式或目录型相册图片。</description>
-    <description xml:lang="en">It can create image gallery of slide/list style by using attached image file.</description>
-    <description xml:lang="es">It can create image gallery of slide/list style by using attached image file.</description>
-    <description xml:lang="ru">Это может создать гллерею изображений в стиле слайдов/списка, используя вложенный файл изображения.</description>
-    <description xml:lang="zh-TW">將上傳的圖片以投影片或列表的形式實現。</description>
-    <description xml:lang="tr">Ekteki resim dosyasını kullanarak, slayt/liste tarzı resim galerisi oluşturabilir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="vi">Slide Show</title>
+    <title xml:lang="ko">이미지 갤러리</title>
+    <title xml:lang="jp">デフォルトイメージギャラリー</title>
+    <title xml:lang="zh-CN">图片相册</title>
+    <title xml:lang="en">Image Gallery</title>
+    <title xml:lang="es">Galería de imágenes básicos</title>
+    <title xml:lang="ru">Базовая галлерея изображений</title>
+    <title xml:lang="zh-TW">預設圖片相簿</title>
+    <title xml:lang="tr">Temel Resim Galerisi</title>
+    <description xml:lang="vi">Bạn có thể tạo ra một Slide Show theo dạng danh sách hoặc Slide từ những hình ảnh đính kèm của mình.</description>
+    <description xml:lang="ko">첨부된 이미지파일을 이용하여 슬라이드/목록형 이미지 갤러리를 만들 수 있습니다.</description>
+    <description xml:lang="jp">添付されたイメージファイルを利用して、スライド型・リスト型のイメージギャラリーが作成できます。</description>
+    <description xml:lang="zh-CN">利用上传的图片文件实现幻灯片式或目录型相册图片。</description>
+    <description xml:lang="en">It can create an image gallery of slide/list style by using the attached image file.</description>
+    <description xml:lang="es">It can create image gallery of slide/list style by using attached image file.</description>
+    <description xml:lang="ru">Это может создать гллерею изображений в стиле слайдов/списка, используя вложенный файл изображения.</description>
+    <description xml:lang="zh-TW">將上傳的圖片以投影片或列表的形式實現。</description>
+    <description xml:lang="tr">Ekteki resim dosyasını kullanarak, slayt/liste tarzı resim galerisi oluşturabilir.</description>
+    <version>0.2</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</component>
diff --git a/modules/editor/components/image_gallery/lang/en.lang.php b/modules/editor/components/image_gallery/lang/en.lang.php
deleted file mode 100644
index 23c267c36..000000000
--- a/modules/editor/components/image_gallery/lang/en.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_gallery/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of image_gallery component.
-     **/
-
-    $lang->image_gallery = "Make Image Gallery"; 
-    $lang->width = "Width"; 
-    $lang->height = "Height"; 
-    $lang->image_list = "Image List"; 
-    $lang->gallery_style = "Gallery Style"; 
-    $lang->gallery_slide_style = "Slide Style"; 
-    $lang->gallery_slide_align = "Align Style"; 
-    $lang->gallery_slide_center = "Center";
-    $lang->gallery_slide_left = "Left";
-    $lang->gallery_slide_right = "Right";
-    $lang->gallery_list_style = "Expand All"; 
-    $lang->gallery_border_color = "Border Color"; 
-    $lang->gallery_border_thickness = "Border Thickness"; 
-    $lang->gallery_bg_color = "Background Color"; 
-    $lang->about_image_list = "Select file to add to the image gallery. You can drag it after selecting or shift+click(for selecting widely), ctrl+click(for selecting individually)";
-
-    $lang->cmd_gallery_prev = "Previous Picture";
-    $lang->cmd_gallery_next = "Next Picture";
-    $lang->cmd_gallery_thumbnail = "Thumbnail";
-?>
diff --git a/modules/editor/components/image_gallery/lang/es.lang.php b/modules/editor/components/image_gallery/lang/es.lang.php
deleted file mode 100644
index b9355d4d7..000000000
--- a/modules/editor/components/image_gallery/lang/es.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_gallery/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of image_gallery component.
-     **/
-
-     $lang->image_gallery = "Haga Galeria de Imagenes";
-     $lang->width = "Ancho";
-     $lang->altura = "Altura";
-     $lang->image_list = "Lista de imagenes";
-     $lang->gallery_style = "Galeria de Estilo";
-     $lang->gallery_slide_style = "Estilo de diapositivas";
-     $lang->gallery_slide_align = "Alinear Estilo";
-     $lang->gallery_slide_center = "Centro";
-     $lang->gallery_slide_left = "Izquierda";
-     $lang->gallery_slide_right = "Derecho";
-     $lang->gallery_list_style = "Mostrar todos";
-     $lang->gallery_border_color = "Color del borde";
-     $lang->gallery_border_thickness = "Grosor de Fronteras";
-     $lang->gallery_bg_color = "Color de fondo";
-     $lang->about_image_list = "Seleccione archivo para anadir a la galeria de imagenes. Puede arrastrar despues de la seleccion o cambio + clic (para seleccionar ampliamente), ctrl + clic (para seleccionar individualmente)";
-
-     $lang->cmd_gallery_prev = "Imagen anterior";
-     $lang->cmd_gallery_next = "Imagen siguiente";
-     $lang->cmd_gallery_thumbnail = "Miniatura";
-?>
diff --git a/modules/editor/components/image_gallery/lang/jp.lang.php b/modules/editor/components/image_gallery/lang/jp.lang.php
deleted file mode 100644
index 8e2b37c0d..000000000
--- a/modules/editor/components/image_gallery/lang/jp.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/image_gallery/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ウィジウィグエディター（editor）モジュール > イメージギャラリー（image_gallery）コンポネント言語パッケージ
-     **/
-
-    $lang->image_gallery = "イメージギャラリー作成"; 
-    $lang->width = "横幅サイズ"; 
-    $lang->height = "縦幅サイズ"; 
-    $lang->image_list = "イメージリスト"; 
-    $lang->gallery_style = "ギャラリースタイル"; 
-    $lang->gallery_slide_style = "スライドスタイル"; 
-    $lang->gallery_slide_align = "アライン位置"; 
-    $lang->gallery_slide_center = "中央揃え";
-    $lang->gallery_slide_left = "左揃え";
-    $lang->gallery_slide_right = "右揃え";
-    $lang->gallery_list_style = "展開表示（リスト）"; 
-    $lang->gallery_border_color = "ボーダーカラー"; 
-    $lang->gallery_border_thickness = "ボーダー"; 
-    $lang->gallery_bg_color = "背景色"; 
-    $lang->about_image_list = "イメージギャラリーに追加するファイルを選択して下さい。選択した後、ドラッグまたは「Shift+クリック（範囲選択）、Ctrl+クリック（個別選択）」が出来ます。";
-
-    $lang->cmd_gallery_prev = "前のイメージ表示";
-    $lang->cmd_gallery_next = "次のイメージ表示";
-    $lang->cmd_gallery_thumbnail = "サムネール表示";
-?>
diff --git a/modules/editor/components/image_gallery/lang/ko.lang.php b/modules/editor/components/image_gallery/lang/ko.lang.php
deleted file mode 100644
index 1f0b7bbad..000000000
--- a/modules/editor/components/image_gallery/lang/ko.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/image_gallery/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  위지윅에디터(editor) 모듈 > 이미지갤러리(image_gallery) 컴포넌트의 언어팩
-     **/
-
-    $lang->image_gallery = '이미지 갤러리 제작';
-    $lang->width = '가로';
-    $lang->height = '세로';
-    $lang->image_list = '이미지 목록';
-    $lang->gallery_style = '갤러리 형식 ';
-    $lang->gallery_slide_style = '슬라이드 형식';
-    $lang->gallery_slide_align = '정렬방식';
-    $lang->gallery_slide_center = '가운데';
-    $lang->gallery_slide_left = '왼쪽';
-    $lang->gallery_slide_right = '오른쪽';
-    $lang->gallery_list_style = '모두 펼침';
-    $lang->gallery_border_color = '테두리 색';
-    $lang->gallery_border_thickness = '테두리 두께';
-    $lang->gallery_bg_color = '배경색';
-    $lang->about_image_list = '이미지 갤러리에  추가할 파일을 선택하세요. 선택 후 드래그 또는 shift+클릭(범위선택), ctrl+클릭(개별선택) 가능합니다.';
-
-    $lang->cmd_gallery_prev = '이전 그림 보기';
-    $lang->cmd_gallery_next = '다음 그림 보기';
-    $lang->cmd_gallery_thumbnail = '섬네일 보기';
-?>
diff --git a/modules/editor/components/image_gallery/lang/lang.xml b/modules/editor/components/image_gallery/lang/lang.xml
new file mode 100644
index 000000000..d18b34729
--- /dev/null
+++ b/modules/editor/components/image_gallery/lang/lang.xml
@@ -0,0 +1,200 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="image_gallery">
+		<value xml:lang="ko"><![CDATA[이미지 갤러리 제작]]></value>
+		<value xml:lang="en"><![CDATA[Make Image Gallery]]></value>
+		<value xml:lang="jp"><![CDATA[イメージギャラリー作成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图像编辑]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片編輯]]></value>
+		<value xml:lang="ru"><![CDATA[Создать галлерею изображений]]></value>
+		<value xml:lang="es"><![CDATA[Haga Galeria de Imagenes]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Galerisi Oluştur]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo Slide Show]]></value>
+	</item>
+	<item name="width">
+		<value xml:lang="ko"><![CDATA[가로]]></value>
+		<value xml:lang="en"><![CDATA[Width]]></value>
+		<value xml:lang="jp"><![CDATA[横幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度]]></value>
+		<value xml:lang="ru"><![CDATA[Ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho]]></value>
+		<value xml:lang="tr"><![CDATA[Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều rộng]]></value>
+	</item>
+	<item name="height">
+		<value xml:lang="ko"><![CDATA[세로]]></value>
+		<value xml:lang="en"><![CDATA[Height]]></value>
+		<value xml:lang="jp"><![CDATA[縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度]]></value>
+		<value xml:lang="ru"><![CDATA[Высота]]></value>
+		<value xml:lang="tr"><![CDATA[Yükseklik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao]]></value>
+	</item>
+	<item name="image_list">
+		<value xml:lang="ko"><![CDATA[이미지 목록]]></value>
+		<value xml:lang="en"><![CDATA[Image List]]></value>
+		<value xml:lang="jp"><![CDATA[イメージリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图像目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片列表]]></value>
+		<value xml:lang="ru"><![CDATA[Список изображений]]></value>
+		<value xml:lang="es"><![CDATA[Lista de imagenes]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách hình ảnh]]></value>
+	</item>
+	<item name="gallery_style">
+		<value xml:lang="ko"><![CDATA[갤러리 형식 ]]></value>
+		<value xml:lang="en"><![CDATA[Gallery Style]]></value>
+		<value xml:lang="jp"><![CDATA[ギャラリースタイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[风格]]></value>
+		<value xml:lang="zh-TW"><![CDATA[風格]]></value>
+		<value xml:lang="ru"><![CDATA[Стиль галлереи]]></value>
+		<value xml:lang="es"><![CDATA[Galeria de Estilo]]></value>
+		<value xml:lang="tr"><![CDATA[Galeri Tarzı]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểu dáng Show]]></value>
+	</item>
+	<item name="gallery_slide_style">
+		<value xml:lang="ko"><![CDATA[슬라이드 형식]]></value>
+		<value xml:lang="en"><![CDATA[Slide Style]]></value>
+		<value xml:lang="jp"><![CDATA[スライドスタイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[幻灯片风格]]></value>
+		<value xml:lang="zh-TW"><![CDATA[幻燈片]]></value>
+		<value xml:lang="ru"><![CDATA[Стиль слайда]]></value>
+		<value xml:lang="es"><![CDATA[Estilo de diapositivas]]></value>
+		<value xml:lang="tr"><![CDATA[Slayt Tarzı]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểu Slide]]></value>
+	</item>
+	<item name="gallery_slide_align">
+		<value xml:lang="ko"><![CDATA[정렬방식]]></value>
+		<value xml:lang="en"><![CDATA[Align Style]]></value>
+		<value xml:lang="jp"><![CDATA[アライン位置]]></value>
+		<value xml:lang="zh-CN"><![CDATA[对齐方式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[對齊方式]]></value>
+		<value xml:lang="ru"><![CDATA[Стиль выравнивания]]></value>
+		<value xml:lang="es"><![CDATA[Alinear Estilo]]></value>
+		<value xml:lang="tr"><![CDATA[Hizalama Tarzı]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểu căn chỉnh]]></value>
+	</item>
+	<item name="gallery_slide_center">
+		<value xml:lang="ko"><![CDATA[가운데]]></value>
+		<value xml:lang="en"><![CDATA[Center]]></value>
+		<value xml:lang="jp"><![CDATA[中央揃え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[居中对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[置中]]></value>
+		<value xml:lang="ru"><![CDATA[Центр]]></value>
+		<value xml:lang="es"><![CDATA[Centro]]></value>
+		<value xml:lang="tr"><![CDATA[Ortalı]]></value>
+		<value xml:lang="vi"><![CDATA[Giữa]]></value>
+	</item>
+	<item name="gallery_slide_left">
+		<value xml:lang="ko"><![CDATA[왼쪽]]></value>
+		<value xml:lang="en"><![CDATA[Left]]></value>
+		<value xml:lang="jp"><![CDATA[左揃え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠左]]></value>
+		<value xml:lang="ru"><![CDATA[Лево]]></value>
+		<value xml:lang="es"><![CDATA[Izquierda]]></value>
+		<value xml:lang="tr"><![CDATA[Sol]]></value>
+		<value xml:lang="vi"><![CDATA[Trái]]></value>
+	</item>
+	<item name="gallery_slide_right">
+		<value xml:lang="ko"><![CDATA[오른쪽]]></value>
+		<value xml:lang="en"><![CDATA[Right]]></value>
+		<value xml:lang="jp"><![CDATA[右揃え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠右]]></value>
+		<value xml:lang="ru"><![CDATA[Право]]></value>
+		<value xml:lang="es"><![CDATA[Derecho]]></value>
+		<value xml:lang="tr"><![CDATA[Sağ]]></value>
+		<value xml:lang="vi"><![CDATA[Phải]]></value>
+	</item>
+	<item name="gallery_list_style">
+		<value xml:lang="ko"><![CDATA[모두 펼침]]></value>
+		<value xml:lang="en"><![CDATA[Expand All]]></value>
+		<value xml:lang="jp"><![CDATA[展開表示（リスト）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[全部展开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部展開]]></value>
+		<value xml:lang="ru"><![CDATA[Раскрыть все]]></value>
+		<value xml:lang="es"><![CDATA[Mostrar todos]]></value>
+		<value xml:lang="tr"><![CDATA[Hepsini Genişlet]]></value>
+		<value xml:lang="vi"><![CDATA[Mở rộng tất cả]]></value>
+	</item>
+	<item name="gallery_border_color">
+		<value xml:lang="ko"><![CDATA[테두리 색]]></value>
+		<value xml:lang="en"><![CDATA[Border Color]]></value>
+		<value xml:lang="jp"><![CDATA[ボーダーカラー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[边框颜色]]></value>
+		<value xml:lang="zh-TW"><![CDATA[邊框顏色]]></value>
+		<value xml:lang="ru"><![CDATA[Цыет рамки]]></value>
+		<value xml:lang="es"><![CDATA[Color del borde]]></value>
+		<value xml:lang="tr"><![CDATA[Kenarlık Rengi]]></value>
+		<value xml:lang="vi"><![CDATA[Màu viền]]></value>
+	</item>
+	<item name="gallery_border_thickness">
+		<value xml:lang="ko"><![CDATA[테두리 두께]]></value>
+		<value xml:lang="en"><![CDATA[Border Thickness]]></value>
+		<value xml:lang="jp"><![CDATA[ボーダー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[边框粗细]]></value>
+		<value xml:lang="zh-TW"><![CDATA[邊框粗細]]></value>
+		<value xml:lang="ru"><![CDATA[Толщина рамки]]></value>
+		<value xml:lang="es"><![CDATA[Grosor de Fronteras]]></value>
+		<value xml:lang="tr"><![CDATA[Kenarlık Kalınlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Độ dày viền]]></value>
+	</item>
+	<item name="gallery_bg_color">
+		<value xml:lang="ko"><![CDATA[배경색]]></value>
+		<value xml:lang="en"><![CDATA[Background Color]]></value>
+		<value xml:lang="jp"><![CDATA[背景色]]></value>
+		<value xml:lang="zh-CN"><![CDATA[背景颜色]]></value>
+		<value xml:lang="zh-TW"><![CDATA[背景顏色]]></value>
+		<value xml:lang="ru"><![CDATA[Цвет фона]]></value>
+		<value xml:lang="es"><![CDATA[Color de fondo]]></value>
+		<value xml:lang="tr"><![CDATA[Arkaplan Rengi]]></value>
+		<value xml:lang="vi"><![CDATA[Màu nền]]></value>
+	</item>
+	<item name="about_image_list">
+		<value xml:lang="ko"><![CDATA[이미지 갤러리에  추가할 파일을 선택하세요. 선택 후 드래그 또는 shift+클릭(범위선택), ctrl+클릭(개별선택) 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Select an image file to add to the gallery. You can drag it after selecting, Shift+click to select multiple files or Ctrl+click to select each file.]]></value>
+		<value xml:lang="jp"><![CDATA[イメージギャラリーに追加するファイルを選択してください。選択した後、ドラッグまたは「Shift+クリック（範囲選択）、Ctrl+クリック（個別選択）」ができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择要添加的图像文件。 选择后可以拖动或按 shift+点击(范围选择), ctrl+点击(个别选择)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要新增的圖片檔案。可以框選或按住 shift+左鍵(範圍選擇), ctrl+左鍵(個別選擇)選擇檔案。]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите файл для добавления в галлерею изображений. Вы можете перетащить его после выбора или нажав shift+click(для широкого выделения), ctrl+click(для индивидуального выделения)]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione archivo para anadir a la galeria de imagenes. Puede arrastrar despues de la seleccion o cambio + clic (para seleccionar ampliamente), ctrl + clic (para seleccionar individualmente)]]></value>
+		<value xml:lang="tr"><![CDATA[Resim galerisine eklenecek dosyayı seçiniz. Seçtikten sonra dosyayı sürükleyebilirsiniz ya da shift+click(geniş ölçüde seçimler için), ctrl+click(bireysel seçimler için)komutlarını kullanabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn hình ảnh để thêm vào Show. Bạn có thể di chuyển hình ảnh bằng cách bấm tổ hợp 'Shift+Click' để di chuyển nhiều hình ảnh, hoặc 'Ctrl+Click' để di chuyển từng hình ảnh.]]></value>
+	</item>
+	<item name="cmd_gallery_prev">
+		<value xml:lang="ko"><![CDATA[이전 그림 보기]]></value>
+		<value xml:lang="en"><![CDATA[Previous Picture]]></value>
+		<value xml:lang="jp"><![CDATA[前のイメージ表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上一个]]></value>
+		<value xml:lang="zh-TW"><![CDATA[上一個]]></value>
+		<value xml:lang="ru"><![CDATA[Предыдущее изображение]]></value>
+		<value xml:lang="es"><![CDATA[Imagen anterior]]></value>
+		<value xml:lang="tr"><![CDATA[Önceki Resim]]></value>
+		<value xml:lang="vi"><![CDATA[Hình trước]]></value>
+	</item>
+	<item name="cmd_gallery_next">
+		<value xml:lang="ko"><![CDATA[다음 그림 보기]]></value>
+		<value xml:lang="en"><![CDATA[Next Picture]]></value>
+		<value xml:lang="jp"><![CDATA[次のイメージ表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下一个]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下一個]]></value>
+		<value xml:lang="ru"><![CDATA[Следующее изображение]]></value>
+		<value xml:lang="es"><![CDATA[Imagen siguiente]]></value>
+		<value xml:lang="tr"><![CDATA[Sonraki Resim]]></value>
+		<value xml:lang="vi"><![CDATA[Hình sau]]></value>
+	</item>
+	<item name="cmd_gallery_thumbnail">
+		<value xml:lang="ko"><![CDATA[섬네일 보기]]></value>
+		<value xml:lang="en"><![CDATA[Thumbnail]]></value>
+		<value xml:lang="jp"><![CDATA[サムネール表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看缩略图il]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視縮圖]]></value>
+		<value xml:lang="ru"><![CDATA[Миниатюра]]></value>
+		<value xml:lang="es"><![CDATA[Miniatura]]></value>
+		<value xml:lang="tr"><![CDATA[Küçük Resim]]></value>
+		<value xml:lang="vi"><![CDATA[Hình nhỏ]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/editor/components/image_gallery/lang/ru.lang.php b/modules/editor/components/image_gallery/lang/ru.lang.php
deleted file mode 100644
index e9a585eab..000000000
--- a/modules/editor/components/image_gallery/lang/ru.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_gallery/lang/ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  editor module > language pack of image_gallery component.
-     **/
-
-    $lang->image_gallery = "Создать галлерею изображений"; 
-    $lang->width = "Ширина"; 
-    $lang->height = "Высота"; 
-    $lang->image_list = "Список изображений"; 
-    $lang->gallery_style = "Стиль галлереи"; 
-    $lang->gallery_slide_style = "Стиль слайда"; 
-    $lang->gallery_slide_align = "Стиль выравнивания"; 
-    $lang->gallery_slide_center = "Центр";
-    $lang->gallery_slide_left = "Лево";
-    $lang->gallery_slide_right = "Право";
-    $lang->gallery_list_style = "Раскрыть все"; 
-    $lang->gallery_border_color = "Цыет рамки"; 
-    $lang->gallery_border_thickness = "Толщина рамки"; 
-    $lang->gallery_bg_color = "Цвет фона"; 
-    $lang->about_image_list = "Выберите файл для добавления в галлерею изображений. Вы можете перетащить его после выбора или нажав shift+click(для широкого выделения), ctrl+click(для индивидуального выделения)";
-
-    $lang->cmd_gallery_prev = "Предыдущее изображение";
-    $lang->cmd_gallery_next = "Следующее изображение";
-    $lang->cmd_gallery_thumbnail = "Миниатюра";
-?>
diff --git a/modules/editor/components/image_gallery/lang/tr.lang.php b/modules/editor/components/image_gallery/lang/tr.lang.php
deleted file mode 100644
index 2a106e3af..000000000
--- a/modules/editor/components/image_gallery/lang/tr.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_gallery/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of image_gallery component.
-     **/
-
-    $lang->image_gallery = "Resim Galerisi Oluştur"; 
-    $lang->width = "Genişlik"; 
-    $lang->height = "Yükseklik"; 
-    $lang->image_list = "Resim Listesi"; 
-    $lang->gallery_style = "Galeri Tarzı"; 
-    $lang->gallery_slide_style = "Slayt Tarzı"; 
-    $lang->gallery_slide_align = "Hizalama Tarzı"; 
-    $lang->gallery_slide_center = "Ortalı";
-    $lang->gallery_slide_left = "Sol";
-    $lang->gallery_slide_right = "Sağ";
-    $lang->gallery_list_style = "Hepsini Genişlet"; 
-    $lang->gallery_border_color = "Kenarlık Rengi"; 
-    $lang->gallery_border_thickness = "Kenarlık Kalınlığı"; 
-    $lang->gallery_bg_color = "Arkaplan Rengi"; 
-    $lang->about_image_list = "Resim galerisine eklenecek dosyayı seçiniz. Seçtikten sonra dosyayı sürükleyebilirsiniz ya da shift+click(geniş ölçüde seçimler için), ctrl+click(bireysel seçimler için)komutlarını kullanabilirsiniz";
-
-    $lang->cmd_gallery_prev = "Önceki Resim";
-    $lang->cmd_gallery_next = "Sonraki Resim";
-    $lang->cmd_gallery_thumbnail = "Küçük Resim";
-?>
diff --git a/modules/editor/components/image_gallery/lang/vi.lang.php b/modules/editor/components/image_gallery/lang/vi.lang.php
deleted file mode 100644
index 5934406c5..000000000
--- a/modules/editor/components/image_gallery/lang/vi.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->image_gallery = "Tạo Slide Show"; 
-    $lang->width = "Chiều rộng"; 
-    $lang->height = "Chiều cao"; 
-    $lang->image_list = "Danh sách hình ảnh"; 
-    $lang->gallery_style = "Kiểu dáng Show"; 
-    $lang->gallery_slide_style = "Kiểu Slide"; 
-    $lang->gallery_slide_align = "Kiểu căn chỉnh"; 
-    $lang->gallery_slide_center = "Giữa";
-    $lang->gallery_slide_left = "Trái";
-    $lang->gallery_slide_right = "Phải";
-    $lang->gallery_list_style = "Mở rộng tất cả"; 
-    $lang->gallery_border_color = "Màu viền"; 
-    $lang->gallery_border_thickness = "Độ dày viền"; 
-    $lang->gallery_bg_color = "Màu nền"; 
-    $lang->about_image_list = "Chọn hình ảnh để thêm vào Show. Bạn có thể di chuyển hình ảnh bằng cách bấm tổ hợp 'Shift+Click' để di chuyển nhiều hình ảnh, hoặc 'Ctrl+Click' để di chuyển từng hình ảnh.";
-
-    $lang->cmd_gallery_prev = "Hình trước";
-    $lang->cmd_gallery_next = "Hình sau";
-    $lang->cmd_gallery_thumbnail = "Hình nhỏ";
-?>
diff --git a/modules/editor/components/image_gallery/lang/zh-CN.lang.php b/modules/editor/components/image_gallery/lang/zh-CN.lang.php
deleted file mode 100644
index af5e01b93..000000000
--- a/modules/editor/components/image_gallery/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_gallery/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  网页编辑器(editor) 模块 > 图像(image_gallery) 组件的语言包
-     **/
-
-    $lang->image_gallery = "图像编辑"; 
-    $lang->width = "宽度"; 
-    $lang->height = "高度"; 
-    $lang->image_list = "图像目录"; 
-    $lang->gallery_style = "风格"; 
-    $lang->gallery_slide_style = "幻灯片风格"; 
-    $lang->gallery_slide_align = "对齐方式"; 
-    $lang->gallery_slide_center = "居中对齐";
-    $lang->gallery_slide_left = "左对齐";
-    $lang->gallery_slide_right = "右对齐";
-    $lang->gallery_list_style = "全部展开"; 
-    $lang->gallery_border_color = "边框颜色"; 
-    $lang->gallery_border_thickness = "边框粗细"; 
-    $lang->gallery_bg_color = "背景颜色"; 
-    $lang->about_image_list = "请选择要添加的图像文件。 选择后可以拖动或按 shift+点击(范围选择), ctrl+点击(个别选择)";
-
-    $lang->cmd_gallery_prev = "上一个";
-    $lang->cmd_gallery_next = "下一个";
-    $lang->cmd_gallery_thumbnail = "查看缩略图il";
-?>
diff --git a/modules/editor/components/image_gallery/lang/zh-TW.lang.php b/modules/editor/components/image_gallery/lang/zh-TW.lang.php
deleted file mode 100644
index 430b4c80a..000000000
--- a/modules/editor/components/image_gallery/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_gallery/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  網頁編輯器(editor) 模組 > 圖片(image_gallery) 組件的語言
-     **/
-
-    $lang->image_gallery = "圖片編輯";
-    $lang->width = "寬度";
-    $lang->height = "高度";
-    $lang->image_list = "圖片列表";
-    $lang->gallery_style = "風格";
-    $lang->gallery_slide_style = "幻燈片";
-    $lang->gallery_slide_align = "對齊方式";
-    $lang->gallery_slide_center = "置中";
-    $lang->gallery_slide_left = "靠左";
-    $lang->gallery_slide_right = "靠右";
-    $lang->gallery_list_style = "全部展開";
-    $lang->gallery_border_color = "邊框顏色";
-    $lang->gallery_border_thickness = "邊框粗細";
-    $lang->gallery_bg_color = "背景顏色";
-    $lang->about_image_list = "請選擇要新增的圖片檔案。可以框選或按住 shift+左鍵(範圍選擇), ctrl+左鍵(個別選擇)選擇檔案。";
-
-    $lang->cmd_gallery_prev = "上一個";
-    $lang->cmd_gallery_next = "下一個";
-    $lang->cmd_gallery_thumbnail = "檢視縮圖";
-?>
diff --git a/modules/editor/components/image_gallery/tpl/gallery.js b/modules/editor/components/image_gallery/tpl/gallery.js
new file mode 100644
index 000000000..ea2338f7b
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/gallery.js
@@ -0,0 +1,64 @@
+/**
+ * Gallery App
+ */
+(function($){
+
+var g = xe.createApp('Gallery', {
+	_imgs   : {},
+	_styles : {},
+
+	init : function() {
+		this._imgs = {};
+	},
+	API_ADD_IMAGE : function(sender, params) {
+		var srl = params[0], path = params[1], key = '@'+srl;
+
+		if(/^files/.test(path)) path = request_uri + path;
+		if(!is_def(this._imgs[key])) this._imgs[key] = [];
+
+		this._imgs[key].push({path:path,loaded:false});
+	},
+	API_ONREADY : function(sender, params) {
+		var i, c, key, img, imgs = this._imgs;
+
+		// image cache
+		for(key in imgs) {
+			if(!imgs.hasOwnProperty(key)) continue;
+
+			for(i=0,c=imgs[key].length; i < c; i++) {
+				img = imgs[key][i];
+				img.$obj = $('<img />').attr('src', img.path);
+				img.$obj.load({img:img}, function(event){
+					var im = event.data.img;
+
+					im.loaded = true;
+					im.$obj.unbind('load');
+				});
+			}
+		}
+	},
+	API_GET_IMAGES : function(sender, params) {
+		var srl = params[0];
+
+		return this._imgs['@'+srl] || [];
+	},
+	API_SET_STYLE : function(sender, params) {
+		var srl = params[0], sty = params[1];
+
+		this._styles['@'+srl] = sty;
+	},
+	API_ONLOAD : function() {
+		var key, sty;
+
+		for(key in this._imgs) {
+			if(!this._imgs.hasOwnProperty(key)) continue;
+			sty = this._styles[key] || 'list';
+
+			this.cast('SHOW_'+sty.toUpperCase(), [key.substr(1)]);
+		}
+	}
+});
+
+xe.registerApp(new g);
+
+})(jQuery);
diff --git a/modules/editor/components/image_gallery/tpl/gallery.min.js b/modules/editor/components/image_gallery/tpl/gallery.min.js
new file mode 100644
index 000000000..f89fa0e5c
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/gallery.min.js
@@ -0,0 +1,5 @@
+/**
+ * Gallery App
+ */
+(function(f){var g=xe.createApp("Gallery",{_imgs:{},_styles:{},init:function(){this._imgs={}},API_ADD_IMAGE:function(b,a){var c=a[1],d="@"+a[0];/^files/.test(c)&&(c=request_uri+c);is_def(this._imgs[d])||(this._imgs[d]=[]);this._imgs[d].push({path:c,loaded:!1})},API_ONREADY:function(){var b,a,c,d,e=this._imgs;for(c in e)if(e.hasOwnProperty(c)){b=0;for(a=e[c].length;b<a;b++)d=e[c][b],d.$obj=f("<img />").attr("src",d.path),d.$obj.load({img:d},function(a){a=a.data.img;a.loaded=!0;a.$obj.unbind("load")})}},
+API_GET_IMAGES:function(b,a){return this._imgs["@"+a[0]]||[]},API_SET_STYLE:function(b,a){this._styles["@"+a[0]]=a[1]},API_ONLOAD:function(){var b,a;for(b in this._imgs)this._imgs.hasOwnProperty(b)&&(a=this._styles[b]||"list",this.cast("SHOW_"+a.toUpperCase(),[b.substr(1)]))}});xe.registerApp(new g)})(jQuery);
diff --git a/modules/editor/components/image_gallery/tpl/list_gallery.html b/modules/editor/components/image_gallery/tpl/list_gallery.html
index 8d159d4ad..941f02c2a 100644
--- a/modules/editor/components/image_gallery/tpl/list_gallery.html
+++ b/modules/editor/components/image_gallery/tpl/list_gallery.html
@@ -1,14 +1,25 @@
-<!--%import("list_gallery.js")-->
-<script type='text/javascript'>
-    // 이미지갤러리에 보여줄 이미지 등록
-    <!--@foreach($gallery_info->images_list as $image)-->
-        list_gallery_add_image({$gallery_info->srl},'{$image}');
-    <!--@end-->
+<!--@if(__DEBUG__)-->
+	<load target="gallery.js" />
+	<load target="list_gallery.js" />
+<!--@else-->
+	<load target="gallery.min.js" />
+	<load target="list_gallery.min.js" />
+<!--@end-->
+<script type="text/javascript">
+(function(){
 
-    // window.onLoad 이벤트 후에 이미지갤러리 시작 
-    xAddEventListener(window,'load',start_list_gallery);
+var gallery = xe.getApp('gallery')[0];
+
+// Add images
+<!--@foreach($gallery_info->images_list as $img)-->
+gallery.cast('ADD_IMAGE', [{$gallery_info->srl}, '{$img}']);
+<!--@end-->
+
+gallery.cast('SET_STYLE', [{$gallery_info->srl}, 'list']);
+
+})();
 </script>
 
 <div align="{$gallery_info->gallery_align}">
-    <div id='zone_list_gallery_{$gallery_info->srl}' style="width:{$gallery_info->width}px;background-color:#{$gallery_info->bg_color};border:{$gallery_info->border_thickness}px solid #{$gallery_info->border_color};text-align:left;"></div>
+    <div id="zone_list_gallery_{$gallery_info->srl}" style="width:{$gallery_info->width}px;background-color:#{$gallery_info->bg_color};border:{$gallery_info->border_thickness}px solid #{$gallery_info->border_color};text-align:left;"><p style="text-align:center">Loading images...</p></div>
 </div>
diff --git a/modules/editor/components/image_gallery/tpl/list_gallery.js b/modules/editor/components/image_gallery/tpl/list_gallery.js
index 90088eac6..669dc017e 100644
--- a/modules/editor/components/image_gallery/tpl/list_gallery.js
+++ b/modules/editor/components/image_gallery/tpl/list_gallery.js
@@ -1,82 +1,43 @@
 /**
  * @file  list_gallery.js
- * @brief 이미지 이미지갤러리 쇼 스크립트
+ * @brief List-type image gallery
  * @author NHN (developers@xpressengine.com)
  **/
 
-// 이미지갤러리쇼를 하기 위한 변수
-var list_gallery_images = new Array();
+(function($){
 
-// 이미지갤러리쇼 이미지 목록에 추가
-function list_gallery_add_image(srl, image_url) {
-    if(!image_url) return;
-    if(image_url.indexOf('files')==0) image_url = request_uri+image_url;
+var listShow = xe.createPlugin('list', {
+	API_SHOW_LIST : function(sender, params) {
+		var srl = params[0], imgs, $zone, i, c, im, scale, w1, w2, h1, h2;
 
-    // 객체 생성
-    var obj = {"srl":0, "image_url":null, "image":null}
+		imgs = this.cast('GET_IMAGES', [srl]);
 
-    // list_gallery_images에 이미지갤러리 쇼 고유번호에 해당하는 공간을 초기화
-    if(typeof(list_gallery_images[srl])=="undefined") list_gallery_images[srl] = new Array();
+		if(!imgs.length) return;
 
-    // 이미지갤러리쇼 고유번호를 세팅
-    obj.srl = srl;
-    obj.idx = list_gallery_images[srl].length;
+		$zone = $('#zone_list_gallery_'+srl).empty();
+		width = $zone.innerWidth();
 
-    // 원본 이미지를 미리 로딩
-    obj.image = new Image();
-    obj.image.src = image_url;
-    obj.image.srl = obj.srl;
-    obj.image.idx = obj.idx;
+		for(i=0,c=imgs.length; i < c; i++) {
+			im = imgs[i];
+			w1 = im.$obj.prop('width');
+			h1 = im.$obj.prop('height');
 
-    // 생성된 객체를 list_gallery_images[이미지갤러리쇼 고유번호]에 추가
-    list_gallery_images[srl][list_gallery_images[srl].length] = obj;
-}
+			if(w1 > width - 25) {
+				w2 = width - 25;
+				scale =  w2 / w1;
+				h2 = Math.floor(h1 * scale);
 
-// 이미지갤러리쇼 시작
-function start_list_gallery() {
+				w1 = w2; h1 = h2;
+				im.$obj.attr('rel', 'xe_gallery');
+			}
 
-    // 등록된 모든 이미지 목록을 돌면서 목록을 만들어줌
-    for(var srl in list_gallery_images) {
+			$zone.append(im.$obj);
+			im.$obj.css({width:w1+'px', height:h1, margin:'0 10px', display:'block'});
+		}
+	}
+});
 
-      // 등록된 이미지가 없으면 pass~
-      if(!list_gallery_images[srl].length) continue;
+var gallery = xe.getApp('Gallery')[0];
+if(gallery) gallery.registerPlugin(new listShow);
 
-      // 메인이미지가 나올 곳과 섬네일이 노출될 곳의 객체를 구함
-      var zone = xGetElementById('zone_list_gallery_'+srl);
-
-      // 갤러리 외부 박스보다 이미지가 클 경우 resizing시킴 
-      var borderTop = parseInt(zone.style.borderTopWidth.replace(/px$/,''),10);
-      var borderLeft = parseInt(zone.style.borderLeftWidth.replace(/px$/,''),10);
-      var borderRight = parseInt(zone.style.borderRightWidth.replace(/px$/,''),10);
-      var borderBottom = parseInt(zone.style.borderBottomWidth.replace(/px$/,''),10);
-
-      var zone_width = xWidth(zone)-borderLeft-borderRight;
-
-      // 이미지 출력
-      for(var i=0; i<list_gallery_images[srl].length;i++) {
-        var obj = list_gallery_images[srl][i];
-        var image_width = obj.image.width;
-        var image_height = obj.image.height;
-        var resize_scale = 1;
-
-        // 이미지갤러리 쇼 박스보다 큰 이미지는 크기를 줄여서 출력
-        if(image_width>(zone_width-25)) {
-            resize_scale = (zone_width-25)/image_width;
-            image_width = parseInt(image_width*resize_scale,10);
-            image_height = parseInt(image_height*resize_scale,10);
-        }
-
-        obj.image.style.width = image_width+"px";
-        obj.image.style.height = image_height+"px";
-        obj.image.style.marginLeft = "10px";
-        obj.image.style.marginBottom = "10px";
-        obj.image.style.display = "block";
-
-        // 리사이즈 되었다면 resize_image 애드온의 slideshow() 기능 사용
-        if(resize_scale != 1) obj.image.rel = 'xe_gallery';
-
-        zone.appendChild(obj.image);
-      }
-      zone.style.paddingTop = "10px";
-    }
-}
+})(jQuery);
diff --git a/modules/editor/components/image_gallery/tpl/list_gallery.min.js b/modules/editor/components/image_gallery/tpl/list_gallery.min.js
new file mode 100644
index 000000000..0aa23dde5
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/list_gallery.min.js
@@ -0,0 +1,6 @@
+/**
+ * @file  list_gallery.js
+ * @brief List-type image gallery
+ * @author NHN (developers@xpressengine.com)
+ **/
+(function(k){var h=xe.createPlugin("list",{API_SHOW_LIST:function(i,h){var c=h[0],d,e,j,b,a,g,f;d=this.cast("GET_IMAGES",[c]);if(d.length){c=k("#zone_list_gallery_"+c).empty();width=c.innerWidth();e=0;for(j=d.length;e<j;e++)b=d[e],a=b.$obj.prop("width"),f=b.$obj.prop("height"),a>width-25&&(g=width-25,a=g/a,f=Math.floor(f*a),a=g,b.$obj.attr("rel","xe_gallery")),c.append(b.$obj),b.$obj.css({width:a+"px",height:f,margin:"0 10px",display:"block"})}}}),i=xe.getApp("Gallery")[0];i&&i.registerPlugin(new h)})(jQuery);
diff --git a/modules/editor/components/image_gallery/tpl/minify.ini b/modules/editor/components/image_gallery/tpl/minify.ini
new file mode 100644
index 000000000..25dad2c84
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/minify.ini
@@ -0,0 +1,2 @@
+[option]
+use_closure_compiler=true
diff --git a/modules/editor/components/image_gallery/tpl/popup.html b/modules/editor/components/image_gallery/tpl/popup.html
index c5e893f2d..193ca5708 100644
--- a/modules/editor/components/image_gallery/tpl/popup.html
+++ b/modules/editor/components/image_gallery/tpl/popup.html
@@ -1,25 +1,19 @@
 <!--%import("popup.js")-->
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
-</div>
-
+<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
 <form action="./" method="get" onSubmit="return false" id="fo">
-<input type="hidden" name="editor_sequence" value="{$editor_sequence}" />
-
-    <div id="popBody">
-
-        <table cellspacing="0" class="rowTable">
+	<input type="hidden" name="editor_sequence" value="{$editor_sequence}" />
+    <div class="table">
+        <table width="100%" border="1" cellspacing="0">
         <col width="120" />
         <col />
         <tr>
-            <th scope="row"><div>{$lang->width}</div></th>
-            <td><input type="text" class="inputTypeText" size="3" id="width" value="400" />px</td>
+            <th scope="row">{$lang->width}</th>
+            <td><input type="text" size="3" id="width" value="400" />px</td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->gallery_style}</div></th>
+            <th scope="row">{$lang->gallery_style}</th>
             <td>
                 <select id="gallery_style">
                     <option value="slide">{$lang->gallery_slide_style}</option>
@@ -28,7 +22,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->gallery_slide_align}</div></th>
+            <th scope="row">{$lang->gallery_slide_align}</th>
             <td>
                 <select id="gallery_align">
                     <option value="center">{$lang->gallery_slide_center}</option>
@@ -38,11 +32,11 @@
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->gallery_border_thickness}</div></th>
-            <td><input type="text" class="inputTypeText" size="1" id="border_thickness" value="0" />px</td>
+            <th scope="row">{$lang->gallery_border_thickness}</th>
+            <td><input type="text" size="1" id="border_thickness" value="0" />px</td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->gallery_border_color}</div></th>
+            <th scope="row">{$lang->gallery_border_color}</th>
             <td>
                 <div class="editor_color_box">
                     <script type="text/javascript">
@@ -51,12 +45,12 @@
                 </div>
                 <ul class="buttonLeft">
                     <li><img src="./images/border_solid.gif" alt="blank" class="border_preview_color" id="border_preview_color" /></li>
-                    <li>#<input type="text" id="border_color_input" size="7" maxlength="6" class="inputTypeText" value="000000" onkeyup="manual_select_color('border',this)"/></li>
+                    <li>#<input type="text" id="border_color_input" size="7" maxlength="6"  value="000000" onkeyup="manual_select_color('border',this)"/></li>
                 </ul>
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->gallery_bg_color}</div></th>
+            <th scope="row">{$lang->gallery_bg_color}</th>
             <td>
                 <div class="editor_color_box">
                     <script type="text/javascript">
@@ -65,12 +59,12 @@
                 </div>
                 <ul class="buttonLeft">
                     <li><img src="./images/blank.gif" alt="blank" class="bg_preview_color" id="bg_preview_color" /></li>
-                    <li>#<input type="text" id="bg_color_input" size="7" maxlength="6" class="inputTypeText" value="FFFFFF" onkeyup="manual_select_color('bg',this)"/></li>
+                    <li>#<input type="text" id="bg_color_input" size="7" maxlength="6"  value="FFFFFF" onkeyup="manual_select_color('bg',this)"/></li>
                 </ul>
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->image_list}</div></th>
+            <th scope="row">{$lang->image_list}</th>
             <td>
                 <select id="image_list" size="6" multiple="true" class="image_list">
                 </select>
@@ -79,10 +73,8 @@
         </tr>
         </table>
     </div>
-
-    <div id="popFooter">
-        <a href="#" onclick="insertSlideShow()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+    <div class="btnArea">
+        <span class="btn"><button type="button" onclick="insertSlideShow()">{$lang->cmd_insert}</button></span>
+        <span class="btn"><a href="./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}" target="_blank" onclick="window.open('this.href','ComponentInfo','width=10,height=10');return false;">{$lang->about_component}</a></span>
     </div>
-
 </form>
diff --git a/modules/editor/components/image_gallery/tpl/popup.js b/modules/editor/components/image_gallery/tpl/popup.js
index 36759ddf1..415bef437 100644
--- a/modules/editor/components/image_gallery/tpl/popup.js
+++ b/modules/editor/components/image_gallery/tpl/popup.js
@@ -1,50 +1,45 @@
 var selected_node = null;
 function getSlideShow() {
+	var node, $node, selected_images = '', width, style, align, border_color, bg_color, thickness;
+
     // 부모창이 있는지 체크 
     if(typeof(opener)=="undefined") return;
 
     // 부모 위지윅 에디터에서 선택된 영역이 있으면 처리
-    var node = opener.editorPrevNode;
-    var selected_images = "";
-    if(node && node.nodeName == "IMG") {
+    node  = opener.editorPrevNode;
+	$node = jQuery(node);
+    if($node.is('img')) {
         selected_node = node;
 
-        var width = xWidth(selected_node)-4;
-        var gallery_style = selected_node.getAttribute("gallery_style");
-        var gallery_align = selected_node.getAttribute("gallery_align");
-        var border_color = selected_node.getAttribute("border_color");
-        var bg_color = selected_node.getAttribute("bg_color");
-        var border_thickness = selected_node.getAttribute("border_thickness");
-        if(!border_thickness) border_thickness = 1;
+        width = $(node).width() - 4;
+        style = $node.attr('gallery_style');
+        align = $node.attr('gallery_align') || 'center';
+        border_color = $node.attr('border_color');
+        bg_color  = $node.attr('bg_color');
+        thickness = $node.attr('border_thickness') || 1;
 
-        xGetElementById("width").value = width; 
+        get_by_id('width').value = width; 
+		get_by_id('gallery_style').selectedIndex = (style=='list')?1:0;
+		get_by_id('gallery_align').selectedIndex = (align=='left')?1:(align=='right')?2:0;
+        get_by_id('border_thickness').value = thickness; 
 
-        if(gallery_style=="list") xGetElementById("gallery_style").selectedIndex = 1;
-        else xGetElementById("gallery_style").selectedIndex = 0;
+        get_by_id('border_color_input').value = border_color; 
+        manual_select_color('border', get_by_id('border_color_input'));
 
-        if(!gallery_align || gallery_align=="center") xGetElementById("gallery_align").selectedIndex = 0;
-        else if(gallery_align=="left") xGetElementById("gallery_align").selectedIndex = 1;
-        else if(gallery_align=="right") xGetElementById("gallery_align").selectedIndex = 2;
+        get_by_id('bg_color_input').value = bg_color; 
+        manual_select_color("bg", get_by_id('bg_color_input'));
 
-        xGetElementById("border_thickness").value = border_thickness; 
-
-        xGetElementById("border_color_input").value = border_color; 
-        manual_select_color("border", xGetElementById("border_color_input"));
-
-        xGetElementById("bg_color_input").value = bg_color; 
-        manual_select_color("bg", xGetElementById("bg_color_input"));
-
-        selected_images = selected_node.getAttribute("images_list");
+        selected_images = $node.attr('images_list');
     }
 
     // 부모창의 업로드된 파일중 이미지 목록을 모두 가져와서 세팅 
-    var fo = xGetElementById("fo");
+    var fo = get_by_id("fo");
     var editor_sequence = fo.editor_sequence.value;
 
-    var parent_list_obj = opener.xGetElementById("uploaded_file_list_"+editor_sequence);
+    var parent_list_obj = opener.get_by_id("uploaded_file_list_"+editor_sequence);
     if(parent_list_obj) {
 
-        var list_obj = xGetElementById("image_list");
+        var list_obj = get_by_id("image_list");
 
         for(var i=0;i<parent_list_obj.length;i++) {
             var opt = parent_list_obj.options[i];
@@ -67,7 +62,7 @@ function insertSlideShow() {
     if(typeof(opener)=="undefined") return;
 
     var list = new Array();
-    var list_obj = xGetElementById("image_list");
+    var list_obj = get_by_id("image_list");
     for(var i=0;i<list_obj.length;i++) {
         var opt = list_obj.options[i];
         if(opt.selected) {
@@ -83,13 +78,13 @@ function insertSlideShow() {
         return;
     }
 
-    var width = xGetElementById("width").value;
+    var width = get_by_id("width").value;
 
-    var gallery_style = xGetElementById("gallery_style").options[xGetElementById("gallery_style").selectedIndex].value;
-    var gallery_align = xGetElementById("gallery_align").options[xGetElementById("gallery_align").selectedIndex].value;
-    var border_thickness = xGetElementById("border_thickness").value;
-    var border_color = xGetElementById("border_color_input").value;
-    var bg_color = xGetElementById("bg_color_input").value;
+    var gallery_style = get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value;
+    var gallery_align = get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value;
+    var border_thickness = get_by_id("border_thickness").value;
+    var border_color = get_by_id("border_color_input").value;
+    var bg_color = get_by_id("bg_color_input").value;
 
     var images_list = "";
     for(var i=0; i<list.length;i++) {
@@ -106,7 +101,7 @@ function insertSlideShow() {
         selected_node.setAttribute("images_list", images_list);
         selected_node.style.width = width+"px";
     } else {
-        var text = "<img src=\"../../../../common/tpl/images/blank.gif\" editor_component=\"image_gallery\" width=\""+width+"\" gallery_style=\""+gallery_style+"\" align=\""+gallery_align+"\" gallery_align=\""+gallery_align+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;\" images_list=\""+images_list+"\" />";
+        var text = "<img src=\"../../../../common/img/blank.gif\" editor_component=\"image_gallery\" width=\""+width+"\" gallery_style=\""+gallery_style+"\" align=\""+gallery_align+"\" gallery_align=\""+gallery_align+"\" border_thickness=\""+border_thickness+"\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;\" images_list=\""+images_list+"\" />";
         opener.editorFocus(opener.editorPrevSrl);
         var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
         opener.editorReplaceHTML(iframe_obj, text);
@@ -119,15 +114,15 @@ function insertSlideShow() {
 
 /* 색상 클릭시 */
 function select_color(type, code) {
-  xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code;
-  xGetElementById(type+"_color_input").value = code;
+  get_by_id(type+"_preview_color").style.backgroundColor = "#"+code;
+  get_by_id(type+"_color_input").value = code;
 }
 
 /* 수동 색상 변경시 */
 function manual_select_color(type, obj) {
   if(obj.value.length!=6) return;
   code = obj.value;
-  xGetElementById(type+"_preview_color").style.backgroundColor = "#"+code;
+  get_by_id(type+"_preview_color").style.backgroundColor = "#"+code;
 }
 
 /* 색상표를 출력 */
@@ -160,4 +155,6 @@ function printColorBlock(type, code, blank_img_src) {
   }
 }
 
-xAddEventListener(window, "load", getSlideShow);
+jQuery(function($){
+	getSlideShow();
+});
diff --git a/modules/editor/components/image_gallery/tpl/popup.min.css b/modules/editor/components/image_gallery/tpl/popup.min.css
new file mode 100644
index 000000000..7da195434
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/popup.min.css
@@ -0,0 +1,6 @@
+/**
+ * @file  slide_gallery.js
+ * @brief Slideshow type image gallery plugin
+ * @author NHN (developers@xpressengine.com)
+ **/
+@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";li{float:left;list-style:none;margin-right:5px}img.bg_preview_color{width:30px;height:16px;border:1px solid #000000;background-color:#FFFFFF}img.border_preview_color{width:30px;height:16px;border:1px solid #EEEEEE;background-color:#000000}img.color_icon{width:14px;height:14px;border:1px solid #FFFFFF}img.color_icon_over{width:14px;height:14px;border:1px solid #000000;cursor:pointer}.editor_color_box{clear:both;height:65px;width:400px;border:1px solid #DDDDDD;padding:2px}.image_list{width:100%;border:1px solid #EEEEEE;height:200px !important}
\ No newline at end of file
diff --git a/modules/editor/components/image_gallery/tpl/popup.min.js b/modules/editor/components/image_gallery/tpl/popup.min.js
new file mode 100644
index 000000000..8e112c238
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/popup.min.js
@@ -0,0 +1,10 @@
+var selected_node=null;
+function getSlideShow(){var c,b,d="",e,a,f,g;if(typeof opener!="undefined"){c=opener.editorPrevNode;b=jQuery(c);if(b.is("img"))selected_node=c,d=$(c).width()-4,c=b.attr("gallery_style"),e=b.attr("gallery_align")||"center",a=b.attr("border_color"),f=b.attr("bg_color"),g=b.attr("border_thickness")||1,get_by_id("width").value=d,get_by_id("gallery_style").selectedIndex=c=="list"?1:0,get_by_id("gallery_align").selectedIndex=e=="left"?1:e=="right"?2:0,get_by_id("border_thickness").value=g,get_by_id("border_color_input").value=
+a,manual_select_color("border",get_by_id("border_color_input")),get_by_id("bg_color_input").value=f,manual_select_color("bg",get_by_id("bg_color_input")),d=b.attr("images_list");b=get_by_id("fo").editor_sequence.value;if(b=opener.get_by_id("uploaded_file_list_"+b)){c=get_by_id("image_list");for(e=0;e<b.length;e++){a=b.options[e];f=a.value;if(!f)break;f=opener.uploadedFiles[f].download_url.replace(request_uri,"");/(jpg|jpeg|gif|png)$/i.test(f)&&(g=!1,d.indexOf(f)!=-1&&(g=!0),a=new Option(a.text,a.value,
+!1,g),c.options.add(a))}}}}
+function insertSlideShow(){if(typeof opener!="undefined"){for(var c=[],b=get_by_id("image_list"),d=0;d<b.length;d++){var e=b.options[d];e.selected&&(e=opener.uploadedFiles[e.value].download_url.replace(request_uri,""),c[c.length]=e)}if(c.length){for(var b=get_by_id("width").value,e=get_by_id("gallery_style").options[get_by_id("gallery_style").selectedIndex].value,a=get_by_id("gallery_align").options[get_by_id("gallery_align").selectedIndex].value,f=get_by_id("border_thickness").value,g=get_by_id("border_color_input").value,
+i=get_by_id("bg_color_input").value,h="",d=0;d<c.length;d++)h+=c[d].trim()+" ";selected_node?(selected_node.setAttribute("width",b),selected_node.setAttribute("gallery_style",e),selected_node.setAttribute("align",a),selected_node.setAttribute("gallery_align",a),selected_node.setAttribute("border_thickness",f),selected_node.setAttribute("border_color",g),selected_node.setAttribute("bg_color",i),selected_node.setAttribute("images_list",h),selected_node.style.width=b+"px"):(c='<img src="../../../../common/img/blank.gif" editor_component="image_gallery" width="'+
+b+'" gallery_style="'+e+'" align="'+a+'" gallery_align="'+a+'" border_thickness="'+f+'" border_color="'+g+'" bg_color="'+i+'" style="width:'+b+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/image_gallery/tpl/image_gallery_component.gif) no-repeat center;" images_list="'+h+'" />',opener.editorFocus(opener.editorPrevSrl),d=opener.editorGetIFrame(opener.editorPrevSrl),opener.editorReplaceHTML(d,c));opener.editorFocus(opener.editorPrevSrl)}window.close()}}
+function select_color(c,b){get_by_id(c+"_preview_color").style.backgroundColor="#"+b;get_by_id(c+"_color_input").value=b}function manual_select_color(c,b){if(b.value.length==6)code=b.value,get_by_id(c+"_preview_color").style.backgroundColor="#"+code}
+function printColor(c,b){for(var d=["22","44","66","88","AA","CC","EE"],e="",a=0;a<8;a+=1)e+=printColorBlock(c,a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16),b);for(a=0;a<d.length;a+=3)for(var f=0;f<d.length;f+=2)for(var g=0;g<d.length;g++)e+=printColorBlock(c,d[a]+d[f]+d[g],b);for(a=8;a<16;a+=1)e+=printColorBlock(c,a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16)+a.toString(16),b);document.write(e)}
+function printColorBlock(c,b,d){return'<div style="float:left;background-color:#'+b+'"><img src="'+d+'" class="color_icon" onmouseover="this.className=\'color_icon_over\'" onmouseout="this.className=\'color_icon\'" onclick="select_color(\''+c+"','"+b+'\')" alt="color" /></div>'}jQuery(function(){getSlideShow()});
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.html b/modules/editor/components/image_gallery/tpl/slide_gallery.html
index 06214bc48..961abf6b1 100644
--- a/modules/editor/components/image_gallery/tpl/slide_gallery.html
+++ b/modules/editor/components/image_gallery/tpl/slide_gallery.html
@@ -1,26 +1,39 @@
-<!--%import("slide_gallery.js")-->
-<!--%import("slide_gallery.css")-->
 <!--%import("../lang")-->
-<script type='text/javascript'>
-    // 이미지갤러리에 보여줄 이미지 등록
-    <!--@foreach($gallery_info->images_list as $image)-->
-    slide_gallery_add_image({$gallery_info->srl},'{$image}');
-    <!--@end-->
+<!--@if(__DEBUG__)-->
+	<load target="gallery.js" />
+	<load target="slide_gallery.js" />
+	<load target="slide_gallery.css" />
+<!--@else-->
+	<load target="gallery.min.js" />
+	<load target="slide_gallery.min.js" />
+	<load target="slide_gallery.min.css" />
+<!--@end-->
+<script type="text/javascript">
+(function(){
 
-    // window.onLoad 이벤트 후에 이미지갤러리 시작 
-    xAddEventListener(window,'load',start_slide_gallery);
+var gallery = xe.getApp('gallery')[0];
+
+// Add images 
+<!--@foreach($gallery_info->images_list as $img)-->
+gallery.cast('ADD_IMAGE', [{$gallery_info->srl}, '{$img}']);
+<!--@end-->
+
+gallery.cast('SET_STYLE', [{$gallery_info->srl}, 'slide']);
+
+})();
 </script>
 
-<div align="{$gallery_info->gallery_align}">
-    <div id='zone_image_navigator_{$gallery_info->srl}' class="slide_gallery_navigator_box">
-        <a href="#" onclick="gallery_view_prev('{$gallery_info->srl}');return false;"><img src="./images/prev.gif" alt="{$lang->cmd_gallery_prev}" title="{$lang->cmd_gallery_prev}" border="0" /></a>
-        <span class="zone_gallery_navigator_status" title="{$lang->cmd_gallery_thumbnail}" id="zone_gallery_navigator_status_{$gallery_info->srl}" onclick="gallery_view_thumbnail('{$gallery_info->srl}');return false;">1/1</span>
-        <a href="#" onclick="gallery_view_next('{$gallery_info->srl}');return false;"><img src="./images/next.gif" alt="{$lang->cmd_gallery_next}" title="{$lang->cmd_gallery_next}" border="0" /></a>
+<div id="zone_slide_gallery_{$gallery_info->srl}" align="{$gallery_info->gallery_align}">
+    <div class="slide_gallery_navigator_box">
+        <a href="#" class="__prev"><img src="./images/prev.gif" alt="{$lang->cmd_gallery_prev}" title="{$lang->cmd_gallery_prev}" border="0" /></a>
+        <span class="zone_gallery_navigator_status" title="{$lang->cmd_gallery_thumbnail}" id="zone_gallery_navigator_status_{$gallery_info->srl}">1/1</span>
+        <a href="#" class="__next"><img src="./images/next.gif" alt="{$lang->cmd_gallery_next}" title="{$lang->cmd_gallery_next}" border="0" /></a>
     </div>
-    <div id='zone_slide_gallery_{$gallery_info->srl}' style="width:{$gallery_info->width}px;background-color:#{$gallery_info->bg_color};border:{$gallery_info->border_thickness}px solid #{$gallery_info->border_color};text-align:left;">
-        <div id='zone_thumbnail_{$gallery_info->srl}' class="slide_gallery_thumbnail_image_box" style="display:none"></div>
-        <div id="slide_gallery_loading_text_{$gallery_info->srl}" class="slide_gallery_loading_text">loading images...</div>
-        <img id="slide_gallery_main_image_{$gallery_info->srl}" border="0" style="display:none" alt="slide_gallery" src="./images/blank.gif" />
+    <div style="width:{$gallery_info->width}px;background-color:#{$gallery_info->bg_color};border:{$gallery_info->border_thickness}px solid #{$gallery_info->border_color};text-align:left;">
+        <div class="slide_gallery_thumbnail_image_box" style="display:none"></div>
+        <div class="slide_gallery_loading_text">Loading images...</div>
+		<div class="slide_gallery_placeholder"></div>
+        <img border="0" style="display:none" alt="slide_gallery" src="./images/blank.gif" />
     </div>
-    <div id='zone_gallery_image_filename_{$gallery_info->srl}' class="slide_gallery_filename"></div>
+    <div class="slide_gallery_filename"></div>
 </div>
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.js b/modules/editor/components/image_gallery/tpl/slide_gallery.js
index 08fe059a7..c204d6736 100644
--- a/modules/editor/components/image_gallery/tpl/slide_gallery.js
+++ b/modules/editor/components/image_gallery/tpl/slide_gallery.js
@@ -1,196 +1,131 @@
 /**
  * @file  slide_gallery.js
- * @brief 이미지 이미지갤러리 쇼 스크립트
+ * @brief Slideshow type image gallery plugin
  * @author NHN (developers@xpressengine.com)
  **/
 
-// 이미지갤러리쇼를 하기 위한 변수
-var slide_gallery_images = new Array();
-var thumbnail_zone_height = new Array();
+(function($){
 
-// 이미지갤러리쇼 이미지 목록에 추가
-function slide_gallery_add_image(srl, image_url) {
-    if(!image_url) return;
-    if(image_url.indexOf('files')==0) image_url = request_uri+image_url;
+var slideShow = xe.createPlugin('slideShow', {
+	_holders : {},
+	_thumbs  : {},
+	_current : {},
 
-    // 객체 생성
-    var obj = {"srl":0, "thumbnail_url":null, "thumbnail":null, "image_url":null, "image":null}
+	init : function() {
+		this._holders = {};
+		this._thumbs  = {};
+		this._current = {};
+	},
 
-    // slide_gallery_images에 이미지갤러리 쇼 고유번호에 해당하는 공간을 초기화
-    if(typeof(slide_gallery_images[srl])=="undefined") slide_gallery_images[srl] = new Array();
+	API_SHOW_SLIDE : function(sender, params) {
+		var self=this, srl = params[0], key = '@'+srl, imgs, $zone, $thumb, $holder, i, c;
 
-    // 이미지갤러리쇼 고유번호를 세팅
-    obj.srl = srl;
-    obj.idx = slide_gallery_images[srl].length;
-    obj.image_url = image_url;
+		imgs = this.cast('GET_IMAGES', [srl]);
+		if(!imgs.length) return;
 
-    // 원본 이미지를 미리 로딩
-    obj.image = new Image();
-    obj.image.src = image_url;
-    //if(!obj.image.width) return;
+		$zone   = $('#zone_slide_gallery_'+srl);
+		$holder = $zone.find('.slide_gallery_placeholder').css('overflow', 'hidden');
 
-    // 섬네일 이미지를 미리 로딩
-    obj.thumbnail = new Image();
-    obj.thumbnail.src = image_url;
-    obj.thumbnail.style.cursor = "pointer";
-    obj.thumbnail.style.width = "60px";
-    obj.thumbnail.style.height = "60px";
-    obj.thumbnail.style.margin = "5px";
-    obj.thumbnail.style.opacity = 0.5;
-    obj.thumbnail.style.filter = "alpha(opacity=50)";
+		// remove loading message
+		$zone.find('.slide_gallery_loading_text').remove();
 
-    // 섬네일 클릭시 메인 이미지로 바꾸어줌
-    xAddEventListener(obj.thumbnail, "mousedown", function() { display_gallery_image(obj) });
+		// create thumbnails
+		$thumb = $zone.find('.slide_gallery_thumbnail_image_box').show();
+		for(i=0,c=imgs.length; i < c; i++) {
+			imgs[i].$obj.clone()
+				.css({
+					cursor  : 'pointer',
+					width   : '60px',
+					height  : '60px',
+					margin  : '5px',
+					opacity : 0.5
+				})
+				.click({idx:i}, function(event){
+					self.cast('SET_SLIDE', [srl, event.data.idx]);
+				})
+				.appendTo($thumb);
+		}
 
-    // 생성된 객체를 slide_gallery_images[이미지갤러리쇼 고유번호]에 추가
-    slide_gallery_images[srl][slide_gallery_images[srl].length] = obj;
-}
+		$('#zone_gallery_navigator_status_'+srl).click(function(){ $thumb.toggle() });
 
-// 이미지갤러리쇼 시작
-function start_slide_gallery() {
+		// navigation
+		$zone
+			.find('.__prev')
+				.click(function(){ self.cast('PREV_SLIDE', [srl]); return false; })
+			.end()
+			.find('.__next')
+				.click(function(){ self.cast('NEXT_SLIDE', [srl]); return false; })
 
-    // 등록된 모든 이미지 목록을 돌면서 thumbnail 목록을 만들어줌
-    for(var srl in slide_gallery_images) {
+		this._holders[key] = $holder;
+		this._thumbs[key]  = $thumb;
+		this._current[key] = 0;
 
-        // 등록된 이미지가 없으면 pass~
-        if(!slide_gallery_images[srl].length) continue;
+		this.cast('SET_SLIDE', [srl, 0]);
+	},
+	_showSideSlide : function(srl, pos) {
+		var imgs, cur, side;
 
-        // 메인이미지가 나올 곳과 섬네일이 노출될 곳의 객체를 구함
-        var zone_thumbnail = xGetElementById('zone_thumbnail_'+srl);
+		imgs = this.cast('GET_IMAGES', [srl]);
+		if(!imgs.length) return;
 
-        // 섬네일 출력
-        for(var i=0; i<slide_gallery_images[srl].length;i++) {
-            zone_thumbnail.appendChild(slide_gallery_images[srl][i].thumbnail);
-        }
-        thumbnail_zone_height[srl] = xHeight(zone_thumbnail)+20;
+		cur  = this._current['@'+srl];
+		side = cur + pos;
 
-        // 첫번째 이미지의 경우 큰 이미지 출력 시작 이미지 출력
-        display_gallery_image(slide_gallery_images[srl][0],true);
+		if(side < 0) side = imgs.length - 1;
+		else if(side >= imgs.length) side = 0;
 
-        // 로딩 텍스트 없앰
-        xGetElementById("slide_gallery_loading_text_"+srl).style.display = "none";
-        xGetElementById("slide_gallery_main_image_"+srl).style.display = "block";
-    }
-}
+		this.cast('SET_SLIDE', [srl, side]);
+	},
+	API_NEXT_SLIDE : function(sender, params) {
+		this._showSideSlide(params[0], +1);
+	},
+	API_PREV_SLIDE : function(sender, params) {
+		this._showSideSlide(params[0], -1);
+	},
+	API_SET_SLIDE : function(sender, params) {
+		var srl = params[0], idx = params[1], imgs, im, $holder, iwidth, w1, w2, h1, h2, scale;
 
-// 메인 이미지 표시
-function display_gallery_image(obj, is_first_display) {
-    // 처음으로 요청되는지에 대한 검사
-    if(typeof(is_first_display)=="undefined") is_first_display = false;
+		imgs = this.cast('GET_IMAGES', [srl]);
+		if(!imgs.length) return;
+		if(!is_def(im=imgs[idx])) return;
 
-    // 섬네일 영역
-    var zone_thumbnail = xGetElementById('zone_thumbnail_'+obj.srl);
+		// set current
+		this._current['@'+srl] = idx;
 
-    // 슬라이드 갤러리의 영역
-    var zone = xGetElementById('zone_slide_gallery_' + obj.srl );
+		// change index indicator
+		$('#zone_gallery_navigator_status_'+srl).text((idx+1)+'/'+imgs.length);
 
-    // 슬라이드 갤러리 영역의 정확한 크기를 위해서 border값 검사 (border는 조절 가능하기에)
-    var borderTop = parseInt(zone.style.borderTopWidth.replace(/px$/,''),10);
-    var borderLeft = parseInt(zone.style.borderLeftWidth.replace(/px$/,''),10);
-    var borderRight = parseInt(zone.style.borderRightWidth.replace(/px$/,''),10);
-    var borderBottom = parseInt(zone.style.borderBottomWidth.replace(/px$/,''),10);
+		// highlight next thunmbnail
+		this._thumbs['@'+srl]
+			.find('img')
+				.eq(idx)
+					.animate({opacity:1})
+				.end()
+				.not(':eq('+idx+')')
+					.animate({opacity:0.5});
 
-    // 갤러리 영역의 가로 길이 구함
-    var zone_width = xWidth(zone)-borderLeft-borderRight;
+		// show next image smoothly
+		$holder = this._holders['@'+srl];
+		iwidth = $holder.parent().innerWidth();
+		w1 = im.$obj.prop('width');
+		h1 = im.$obj.prop('height');
 
-    // 이미지 크기가 갤러리 영역보다 클 경우를 계산하기 위한 비율 변수 설정
-    var resize_scale = 1;
+		if(w1 > iwidth - 20) {
+			w2 = iwidth - 20;
+			scale = w2 / w1;
+			h2 = Math.floor(h1 * scale);
 
-    // 이미지의 크기 구함
-    var image_width = obj.image.width;
-    var image_height = obj.image.height;
+			w1 = w2; h1 = h2;
+			im.$obj.css('cursor', 'pointer');
+			im.$obj.attr('rel', 'xe_gallery');
+		}
 
-    // 이미지갤러리 쇼 박스보다 큰 이미지는 크기를 줄여서 출력 (ersize_scale 조절)
-    if(image_width>(zone_width-20)) {
-        resize_scale = (zone_width-20)/image_width;
-        image_width = parseInt(image_width*resize_scale,10);
-        image_height = parseInt(image_height*resize_scale,10);
-    }
-    var x = parseInt((zone_width - image_width)/2,10);
+		im.$obj.css({width:w1, height:h1, margin:'0 10px'});
+		$holder.empty().append(im.$obj);
+	}
+});
 
-    // 이미지 표시 
-    var target_image = xGetElementById("slide_gallery_main_image_"+obj.srl);
-
-    target_image.style.marginLeft = x+"px";
-
-    target_image.srl = obj.srl;
-    target_image.idx = obj.idx;
-    target_image.style.opacity = 1;
-    target_image.style.filter = "alpha(opacity=100)";
-    target_image.start_opacity = 0;
-    xWidth(target_image, image_width);
-    xHeight(target_image, image_height);
-    target_image.src = obj.image.src;
-
-    if(image_height<200) {
-      target_image.style.marginTop = (100-image_height/2)+"px";
-      target_image.style.marginBottom = (100-image_height/2)+"px";
-    } else {
-      target_image.style.marginTop = "10px";
-      target_image.style.marginBottom = "10px";
-    }
-
-    if(typeof(showOriginalImage)=='function') {
-        if(resize_scale!=1) { 
-            xAddEventListener(target_image, 'click', showOriginalImage); 
-            target_image.style.cursor = 'pointer';
-        } else {
-            xRemoveEventListener(target_image, 'click', showOriginalImage);
-            target_image.style.cursor = 'default';
-        }
-    }
-
-    // resize_scale이 1이 아니면, 즉 리사이즈 되었다면 해당 이미지 클릭시 원본을 새창으로 띄워줌
-    var next_idx = obj.idx+1;
-    if(slide_gallery_images[obj.srl].length<=next_idx) next_idx = 0;
-
-    // srl의 모든 섬네일의 투명도 조절
-    for(var i=0; i<slide_gallery_images[obj.srl].length;i++) {
-        if(i==obj.idx) {
-            slide_gallery_images[obj.srl][i].thumbnail.style.opacity = 1;
-            slide_gallery_images[obj.srl][i].thumbnail.style.filter = "alpha(opacity=100)";
-        } else {
-            slide_gallery_images[obj.srl][i].thumbnail.style.opacity = 0.5;
-            slide_gallery_images[obj.srl][i].thumbnail.style.filter = "alpha(opacity=50)";
-        }
-    }
-
-    // 파일 이름 추가
-    var source_filename = obj.image_url;
-    var tmp_arr = source_filename.split('/');
-    var filename = tmp_arr[tmp_arr.length-1];
-    xInnerHtml("zone_gallery_image_filename_"+obj.srl, "<a href='#' onclick=\"winopen('"+source_filename+"');return false;\">"+decodeURI(filename)+"</a>");
-
-    // 네이게이션 영역의 숫자 변경
-    var zone_navigator = xGetElementById("zone_gallery_navigator_status_"+obj.srl);
-    var html = (obj.idx+1) + " / " + slide_gallery_images[obj.srl].length;
-    xInnerHtml(zone_navigator, html);
-}
-
-// 이전 보기
-function gallery_view_prev(srl) {
-    var target_image = xGetElementById("slide_gallery_main_image_"+srl);
-    var idx = target_image.idx;
-    var max_length = slide_gallery_images[srl].length;
-    idx--;
-    if(idx<0) idx = max_length-1;
-    display_gallery_image(slide_gallery_images[srl][idx]);
-}
-
-// 다음 보기
-function gallery_view_next(srl) {
-    var target_image = xGetElementById("slide_gallery_main_image_"+srl);
-    var idx = target_image.idx;
-    var max_length = slide_gallery_images[srl].length;
-    idx++;
-    if(idx>max_length-1) idx = 0;
-    display_gallery_image(slide_gallery_images[srl][idx]);
-}
-
-// 섬네일 보기
-function gallery_view_thumbnail(srl) {
-    var thumbnail_zone = xGetElementById("zone_thumbnail_"+srl);
-    if(thumbnail_zone.style.display == "none") thumbnail_zone.style.display = "block";
-    else thumbnail_zone.style.display = "none";
-}
+var gallery = xe.getApp('Gallery')[0];
+if(gallery) gallery.registerPlugin(new slideShow);
 
+})(jQuery);
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.min.css b/modules/editor/components/image_gallery/tpl/slide_gallery.min.css
new file mode 100644
index 000000000..ccf996add
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/slide_gallery.min.css
@@ -0,0 +1,6 @@
+/**
+ * @file  slide_gallery.js
+ * @brief Slideshow type image gallery plugin
+ * @author NHN (developers@xpressengine.com)
+ **/
+@charset "utf-8";.slide_gallery_loading_text{color:#555555;font-size:8pt;font-family:tahoma;font-weight:bold;margin:20px 0px 20px 0px;text-align:center}.slide_gallery_navigator_box{font-size:9pt;text-align:center;margin:5px 0px 5px 0px}.zone_gallery_navigator_status{color:#444444;font-family:verdana;font-size:8pt;cursor:pointer}.slide_gallery_navigator_box img{vertical-align:bottom}.slide_gallery_main_image_box{border:3px solid #EEEEEE;margin:10px}.slide_gallery_thumbnail_image_box{margin:10px;text-align:center}.slide_gallery_thumbnail_image_box img{border:1px solid #555555;padding:1px;margin:4px}.slide_gallery_filename{margin:5px 0px 10px 0px}.slide_gallery_filename A{color:#000000;text-decoration:none}
\ No newline at end of file
diff --git a/modules/editor/components/image_gallery/tpl/slide_gallery.min.js b/modules/editor/components/image_gallery/tpl/slide_gallery.min.js
new file mode 100644
index 000000000..c40910581
--- /dev/null
+++ b/modules/editor/components/image_gallery/tpl/slide_gallery.min.js
@@ -0,0 +1,9 @@
+/**
+ * @file  slide_gallery.js
+ * @brief Slideshow type image gallery plugin
+ * @author NHN (developers@xpressengine.com)
+ **/
+(function(k){var m=xe.createPlugin("slideShow",{_holders:{},_thumbs:{},_current:{},init:function(){this._holders={};this._thumbs={};this._current={}},API_SHOW_SLIDE:function(g,e){var b=this,a=e[0],c="@"+a,d,f,j,i,h,l;d=this.cast("GET_IMAGES",[a]);if(d.length){f=k("#zone_slide_gallery_"+a);i=f.find(".slide_gallery_placeholder").css("overflow","hidden");f.find(".slide_gallery_loading_text").remove();j=f.find(".slide_gallery_thumbnail_image_box").show();h=0;for(l=d.length;h<l;h++)d[h].$obj.clone().css({cursor:"pointer",
+width:"60px",height:"60px",margin:"5px",opacity:0.5}).click({idx:h},function(c){b.cast("SET_SLIDE",[a,c.data.idx])}).appendTo(j);k("#zone_gallery_navigator_status_"+a).click(function(){j.toggle()});f.find(".__prev").click(function(){b.cast("PREV_SLIDE",[a]);return!1}).end().find(".__next").click(function(){b.cast("NEXT_SLIDE",[a]);return!1});this._holders[c]=i;this._thumbs[c]=j;this._current[c]=0;this.cast("SET_SLIDE",[a,0])}},_showSideSlide:function(g,e){var b,a;b=this.cast("GET_IMAGES",[g]);b.length&&
+(a=this._current["@"+g]+e,a<0?a=b.length-1:a>=b.length&&(a=0),this.cast("SET_SLIDE",[g,a]))},API_NEXT_SLIDE:function(g,e){this._showSideSlide(e[0],1)},API_PREV_SLIDE:function(g,e){this._showSideSlide(e[0],-1)},API_SET_SLIDE:function(g,e){var b=e[0],a=e[1],c,d,f;c=this.cast("GET_IMAGES",[b]);if(c.length&&is_def(d=c[a]))this._current["@"+b]=a,k("#zone_gallery_navigator_status_"+b).text(a+1+"/"+c.length),this._thumbs["@"+b].find("img").eq(a).animate({opacity:1}).end().not(":eq("+a+")").animate({opacity:0.5}),
+b=this._holders["@"+b],c=b.parent().innerWidth(),a=d.$obj.prop("width"),f=d.$obj.prop("height"),a>c-20&&(c-=20,f=Math.floor(f*(c/a)),a=c,d.$obj.css("cursor","pointer"),d.$obj.attr("rel","xe_gallery")),d.$obj.css({width:a,height:f,margin:"0 10px"}),b.empty().append(d.$obj)}}),i=xe.getApp("Gallery")[0];i&&i.registerPlugin(new m)})(jQuery);
diff --git a/modules/editor/components/image_link/image_link.class.php b/modules/editor/components/image_link/image_link.class.php
index a6bda7807..3fd9e88c2 100644
--- a/modules/editor/components/image_link/image_link.class.php
+++ b/modules/editor/components/image_link/image_link.class.php
@@ -1,108 +1,107 @@
-<?php
-    /**
-     * @class  image_link
-     * @author NHN (developers@xpressengine.com)
-     * @brief  이미지를 추가하거나 속성을 수정하는 컴포넌트
-     **/
-
-    class image_link extends EditorHandler { 
-
-        // editor_sequence 는 에디터에서 필수로 달고 다녀야 함....
-        var $editor_sequence = 0;
-        var $component_path = '';
-
-        /**
-         * @brief editor_sequence과 컴포넌트의 경로를 받음
-         **/
-        function image_link($editor_sequence, $component_path) {
-            $this->editor_sequence = $editor_sequence;
-            $this->component_path = $component_path;
-        }
-
-        /**
-         * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
-         **/
-        function getPopupContent() {
-            // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
-            $tpl_path = $this->component_path.'tpl';
-            $tpl_file = 'popup.html';
-
-            Context::set("tpl_path", $tpl_path);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 에디터 컴포넌트가 별도의 고유 코드를 이용한다면 그 코드를 html로 변경하여 주는 method
-         *
-         * 이미지나 멀티미디어, 설문등 고유 코드가 필요한 에디터 컴포넌트는 고유코드를 내용에 추가하고 나서
-         * DocumentModule::transContent() 에서 해당 컴포넌트의 transHtml() method를 호출하여 고유코드를 html로 변경
-         **/
-        function transHTML($xml_obj) {
-            $src = $xml_obj->attrs->src;
-            $width = $xml_obj->attrs->width;
-            $height = $xml_obj->attrs->height;
-            $align = $xml_obj->attrs->align;
-            $alt = $xml_obj->attrs->alt;
-            $border = (int)$xml_obj->attrs->border;
-            $link_url = $xml_obj->attrs->link_url;
-            $open_window = $xml_obj->attrs->open_window;
-            $style = $xml_obj->attrs->style;
-            $margin = (int)$xml_obj->attrs->margin;
-
-            if(!$alt) {
-                $tmp_arr = explode('/',$src);
-                $alt = array_pop($tmp_arr);
-            }
-
-            $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
-            $src = str_replace('&amp;amp;', '&amp;', $src);
-
-            if(!$alt) $alt = $src;
-            // 이미지 주소를 request uri가 포함된 주소로 변환 (rss출력, 등등을 위함)
-            $temp_src = explode('/', $src);
-            if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
-            elseif(substr($src , 0, 1)=='/') {
-                if($_SERVER['HTTPS']=='on') $http_src = 'https://';
-                else $http_src = 'http://';
-                $src = $http_src.$_SERVER['HTTP_HOST'].$src;
-            }
-            elseif(!strpos($temp_src[0],':') && $src) $src = Context::getRequestUri().$src;
-
-            $attr_output = array();
-            $attr_output = array("src=\"".$src."\"");
-            if($alt) {
-                $attr_output[] = "alt=\"".$alt."\"";
-                $attr_output[] = "title=\"".$alt."\"";
-            }
-            if($margin) {
-                $style = trim(preg_replace('/margin[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
-                $style = str_replace(';;',';',$style);
-                if($style == ';') $style = '';
-                $style .= ' margin:'.$margin.'px;';
-            }
-            if($align) $attr_output[] = "align=\"".$align."\"";
-
-            if(preg_match("/\.png$/i",$src)) $attr_output[] = "class=\"iePngFix\"";
-
-            if($width) $attr_output[] = 'width="'.$width.'"';
-            if($height) $attr_output[] = 'height="'.$height.'"';
-            if($border) {
-                $style = trim(preg_replace('/border[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
-                $style = str_replace(';;',';',$style);
-                if($style == ';') $style = '';
-                $style .= ' border-style: solid; border-width:'.$border.'px;';
-            }
-
-            $code = sprintf("<img %s style=\"%s\" />", implode(' ',$attr_output), $style);
-
-            if($link_url) {
-                if($open_window =='Y') $code = sprintf('<a href="%s" onclick="window.open(this.href);return false;">%s</a>', $link_url, $code);
-                else $code = sprintf('<a href="%s" >%s</a>', $link_url, $code);
-            }
-            return $code;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  image_link
+     * @author NHN (developers@xpressengine.com)
+     * @brief Add an image, or to modify the properties of components
+     **/
+
+    class image_link extends EditorHandler { 
+        // editor_sequence from the editor must attend mandatory wearing ....
+        var $editor_sequence = 0;
+        var $component_path = '';
+
+        /**
+         * @brief editor_sequence and components out of the path
+         **/
+        function image_link($editor_sequence, $component_path) {
+            $this->editor_sequence = $editor_sequence;
+            $this->component_path = $component_path;
+        }
+
+        /**
+         * @brief popup window to display in popup window request is to add content
+         **/
+        function getPopupContent() {
+            // Pre-compiled source code to compile template return to
+            $tpl_path = $this->component_path.'tpl';
+            $tpl_file = 'popup.html';
+
+            Context::set("tpl_path", $tpl_path);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief Editor of the components separately if you use a unique code to the html code for a method to change
+         *
+         * Images and multimedia, seolmundeung unique code is required for the editor component added to its own code, and then
+         * DocumentModule:: transContent() of its components transHtml() method call to change the html code for your own
+         **/
+        function transHTML($xml_obj) {
+            $src = $xml_obj->attrs->src;
+            $width = $xml_obj->attrs->width;
+            $height = $xml_obj->attrs->height;
+            $align = $xml_obj->attrs->align;
+            $alt = $xml_obj->attrs->alt;
+            $border = (int)$xml_obj->attrs->border;
+            $link_url = $xml_obj->attrs->link_url;
+            $open_window = $xml_obj->attrs->open_window;
+            $style = $xml_obj->attrs->style;
+            $margin = (int)$xml_obj->attrs->margin;
+
+            if(!$alt) {
+                $tmp_arr = explode('/',$src);
+                $alt = array_pop($tmp_arr);
+            }
+
+            $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
+            $src = str_replace('&amp;amp;', '&amp;', $src);
+
+            if(!$alt) $alt = $src;
+            // Image containing the address to the address conversion request uri (rss output, etc. purposes)
+            $temp_src = explode('/', $src);
+            if(substr($src, 0,2)=='./') $src = Context::getRequestUri().substr($src, 2);
+            elseif(substr($src , 0, 1)=='/') {
+                if($_SERVER['HTTPS']=='on') $http_src = 'https://';
+                else $http_src = 'http://';
+                $src = $http_src.$_SERVER['HTTP_HOST'].$src;
+            }
+            elseif(!strpos($temp_src[0],':') && $src) $src = Context::getRequestUri().$src;
+
+            $attr_output = array();
+            $attr_output = array("src=\"".$src."\"");
+            if($alt) {
+                $attr_output[] = "alt=\"".$alt."\"";
+                $attr_output[] = "title=\"".$alt."\"";
+            }
+            if($margin) {
+                $style = trim(preg_replace('/margin[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
+                $style = str_replace(';;',';',$style);
+                if($style == ';') $style = '';
+                $style .= ' margin:'.$margin.'px;';
+            }
+            if($align) $attr_output[] = "align=\"".$align."\"";
+
+            if(preg_match("/\.png$/i",$src)) $attr_output[] = "class=\"iePngFix\"";
+
+            if($width) $attr_output[] = 'width="'.$width.'"';
+            if($height) $attr_output[] = 'height="'.$height.'"';
+            if($border) {
+                $style = trim(preg_replace('/border[a-z\-]*[ ]*:[ ]*[0-9 a-z]+(;| )/i','', $style)).';';
+                $style = str_replace(';;',';',$style);
+                if($style == ';') $style = '';
+                $style .= ' border-style: solid; border-width:'.$border.'px;';
+            }
+
+            $code = sprintf("<img %s style=\"%s\" />", implode(' ',$attr_output), $style);
+
+            if($link_url) {
+                if($open_window =='Y') $code = sprintf('<a href="%s" onclick="window.open(this.href);return false;">%s</a>', $link_url, $code);
+                else $code = sprintf('<a href="%s" >%s</a>', $link_url, $code);
+            }
+            return $code;
+        }
+
+    }
+?>
diff --git a/modules/editor/components/image_link/info.xml b/modules/editor/components/image_link/info.xml
index dd9afc9b0..963f6515d 100644
--- a/modules/editor/components/image_link/info.xml
+++ b/modules/editor/components/image_link/info.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component version="0.2">
-    <title xml:lang="ko">이미지 추가</title>
-    <title xml:lang="jp">イメージ追加</title>
-    <title xml:lang="zh-CN">插入图像</title>
-    <title xml:lang="en">Add Images</title>
-    <title xml:lang="vi">Thêm hình ảnh</title>
-    <title xml:lang="es">Añadir imágenes</title>
-    <title xml:lang="ru">Добавление изображений</title>
-    <title xml:lang="zh-TW">圖片連結</title>
-    <title xml:lang="tr">Resim Ekle</title>
-    <description xml:lang="ko">에디터에 이미지를 추가하거나 속성을 변경할 수 있습니다.</description>
-    <description xml:lang="jp">エディターでイメージの追加、属性の変更が出来ます。</description>
-    <description xml:lang="zh-CN">可以插入图像或编辑其相应属性。</description>
-    <description xml:lang="en">It can add an image to editor or change the attribution of image.</description>
-    <description xml:lang="vi">Bạn có thể thêm hình ảnh để sửa hay chia sẻ.</description>
-    <description xml:lang="es">Se puede añadir una imagen a editor o cambiar la atribución de la imagen.</description>
-    <description xml:lang="ru">Это может добавить изображение в редактор или изменить параметры изображения.</description>
-    <description xml:lang="zh-TW">可以新增或編輯其相關屬性。</description>
-    <description xml:lang="tr">Editöre bir resim ekleyebilir veya resmin niteliğini değiştirebilir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="ko">이미지 추가</title>
+    <title xml:lang="jp">イメージ追加</title>
+    <title xml:lang="zh-CN">插入图像</title>
+    <title xml:lang="en">Add Images</title>
+    <title xml:lang="vi">Thêm hình ảnh</title>
+    <title xml:lang="es">Añadir imágenes</title>
+    <title xml:lang="ru">Добавление изображений</title>
+    <title xml:lang="zh-TW">圖片連結</title>
+    <title xml:lang="tr">Resim Ekle</title>
+    <description xml:lang="ko">에디터에 이미지를 추가하거나 속성을 변경할 수 있습니다.</description>
+    <description xml:lang="jp">エディターでイメージの追加、属性の変更が出来ます。</description>
+    <description xml:lang="zh-CN">可以插入图像或编辑其相应属性。</description>
+    <description xml:lang="en">It can add an image to editor or change the image attributes.</description>
+    <description xml:lang="vi">Bạn có thể thêm hình ảnh để sửa hay chia sẻ.</description>
+    <description xml:lang="es">Se puede añadir una imagen a editor o cambiar la atribución de la imagen.</description>
+    <description xml:lang="ru">Это может добавить изображение в редактор или изменить параметры изображения.</description>
+    <description xml:lang="zh-TW">可以新增或編輯其相關屬性。</description>
+    <description xml:lang="tr">Editöre bir resim ekleyebilir veya resmin niteliğini değiştirebilir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</component>
diff --git a/modules/editor/components/image_link/lang/en.lang.php b/modules/editor/components/image_link/lang/en.lang.php
deleted file mode 100644
index 0f21f84d5..000000000
--- a/modules/editor/components/image_link/lang/en.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_link/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor Module > language pack of image_link component
-     **/
-
-    $lang->image_url = "Image Path";
-    $lang->image_alt = "Input Description";
-    $lang->image_scale = "Image Size";
-    $lang->image_align = "Align Style";
-    $lang->image_align_normal = "Occupy a Paragraph";
-    $lang->image_align_left = "Left of Article";
-    $lang->image_align_middle = "Center";
-    $lang->image_align_right = "Right of Article";
-    $lang->image_border = "Border Thickness";
-    $lang->urllink_url = "URL";
-    $lang->image_margin = 'Image Margin';
-
-    $lang->about_url_link_open_window = "Make the link to open as a new window";
-    $lang->cmd_get_scale = "Get Image Size";
-?>
diff --git a/modules/editor/components/image_link/lang/es.lang.php b/modules/editor/components/image_link/lang/es.lang.php
deleted file mode 100644
index 46f63bacd..000000000
--- a/modules/editor/components/image_link/lang/es.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_link/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor Module > language pack of image_link component
-     **/
-
-     $lang->image_url = "Ruta de la imagen";
-     $lang->image_alt = "Descripcion de Entrada";
-     $lang->image_scale = "Tamano de la Imagen";
-     $lang->image_align = "Alinear Estilo";
-     $lang->image_align_normal = "Occupy un parrafo";
-     $lang->image_align_left = "Izquierda del articulo";
-     $lang->image_align_middle = "Centro";
-     $lang->image_align_right = "Derecho de articulo";
-     $lang->image_border = "Grosor de Fronteras";
-     $lang->urllink_url = "URL";
-     $lang->image_margin = 'Image Margin';
-
-     $lang->about_url_link_open_window = "Hacer el vinculo para abrir una nueva ventana";
-     $lang->cmd_get_scale = "Obtener tamano de la imagen";
-?>
diff --git a/modules/editor/components/image_link/lang/jp.lang.php b/modules/editor/components/image_link/lang/jp.lang.php
deleted file mode 100644
index d53e4cd6b..000000000
--- a/modules/editor/components/image_link/lang/jp.lang.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/image_link/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ウィジウィグエディター（editor）モジュール > イメージリンク（image_link）コンポネント言語パッケージ
-     **/
-
-    $lang->image_url = 'イメージパス';
-    $lang->image_alt = '説明（Alt）入力';
-    $lang->image_scale = 'イメージサイズ';
-    $lang->image_align = 'アライン位置';
-    $lang->image_align_normal = '一段落';
-    $lang->image_align_left = '左揃え';
-    $lang->image_align_middle = '中央揃え';
-    $lang->image_align_right = '右揃え';
-    $lang->image_border = 'ボーダー';
-    $lang->image_margin = '外側の空白(Margin)';
-
-    $lang->urllink_open_window = '新しいウィンドウで開く';
-    $lang->about_url_link_open_window = 'チェックすると、リンクをクリックする際、新しいウィンドウで開きます。';
-
-    $lang->cmd_get_scale = 'イメージサイズを計算';
-?>
diff --git a/modules/editor/components/image_link/lang/ko.lang.php b/modules/editor/components/image_link/lang/ko.lang.php
deleted file mode 100644
index 79b4bff96..000000000
--- a/modules/editor/components/image_link/lang/ko.lang.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/image_link/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  위지윅에디터(editor) 모듈 > 이미지링크(image_link) 컴포넌트의 언어팩
-     **/
-
-    $lang->image_url = '이미지 경로';
-    $lang->image_alt = '설명 입력';
-    $lang->image_scale = '이미지 크기';
-    $lang->image_align = '정렬 방법';
-    $lang->image_align_normal = '한 문단을 차지';
-    $lang->image_align_left = '글의 왼쪽으로';
-    $lang->image_align_middle = '가운데';
-    $lang->image_align_right = '글의 우측으로';
-    $lang->image_border = '경계선 두께';
-    $lang->image_margin = '바깥 여백';
-
-    $lang->urllink_open_window = '새 창 열기';
-    $lang->about_url_link_open_window = '선택하시면 링크 선택 시 새 창으로 열립니다.';
-
-    $lang->cmd_get_scale = '가로세로 구하기';
-?>
diff --git a/modules/editor/components/image_link/lang/lang.xml b/modules/editor/components/image_link/lang/lang.xml
new file mode 100644
index 000000000..a4c4adcae
--- /dev/null
+++ b/modules/editor/components/image_link/lang/lang.xml
@@ -0,0 +1,139 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="image_url">
+		<value xml:lang="ko"><![CDATA[이미지 경로]]></value>
+		<value xml:lang="en"><![CDATA[Image Path]]></value>
+		<value xml:lang="jp"><![CDATA[イメージパス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图像路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片路徑]]></value>
+		<value xml:lang="ru"><![CDATA[Путь изображения]]></value>
+		<value xml:lang="es"><![CDATA[Ruta de la imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Yolu]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn]]></value>
+	</item>
+	<item name="image_alt">
+		<value xml:lang="ko"><![CDATA[설명 입력]]></value>
+		<value xml:lang="en"><![CDATA[Enter Description]]></value>
+		<value xml:lang="jp"><![CDATA[説明（Alt）入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图像说明]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片說明]]></value>
+		<value xml:lang="ru"><![CDATA[Введите описание]]></value>
+		<value xml:lang="es"><![CDATA[Descripcion de Entrada]]></value>
+		<value xml:lang="tr"><![CDATA[Açıklama Gir]]></value>
+		<value xml:lang="vi"><![CDATA[Mô tả]]></value>
+	</item>
+	<item name="image_scale">
+		<value xml:lang="ko"><![CDATA[이미지 크기]]></value>
+		<value xml:lang="en"><![CDATA[Image Size]]></value>
+		<value xml:lang="jp"><![CDATA[イメージサイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图像大小]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片大小]]></value>
+		<value xml:lang="ru"><![CDATA[Размер изображения]]></value>
+		<value xml:lang="es"><![CDATA[Tamano de la Imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Boyutu]]></value>
+		<value xml:lang="vi"><![CDATA[Kích thước]]></value>
+	</item>
+	<item name="image_align">
+		<value xml:lang="ko"><![CDATA[정렬 방법]]></value>
+		<value xml:lang="en"><![CDATA[Alignment]]></value>
+		<value xml:lang="jp"><![CDATA[アライン位置]]></value>
+		<value xml:lang="zh-CN"><![CDATA[对齐方式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[對齊方式]]></value>
+		<value xml:lang="ru"><![CDATA[Стиль выравнивания]]></value>
+		<value xml:lang="es"><![CDATA[Alinear Estilo]]></value>
+		<value xml:lang="tr"><![CDATA[Hizalama Tarzı]]></value>
+		<value xml:lang="vi"><![CDATA[Căn chỉnh]]></value>
+	</item>
+	<item name="image_align_normal">
+		<value xml:lang="ko"><![CDATA[한 문단을 차지]]></value>
+		<value xml:lang="en"><![CDATA[Occupy a Paragraph]]></value>
+		<value xml:lang="jp"><![CDATA[一段落占め]]></value>
+		<value xml:lang="zh-CN"><![CDATA[占一个段落]]></value>
+		<value xml:lang="zh-TW"><![CDATA[段落]]></value>
+		<value xml:lang="ru"><![CDATA[Занять параграф]]></value>
+		<value xml:lang="es"><![CDATA[Occupy un parrafo]]></value>
+		<value xml:lang="tr"><![CDATA[Paragraf Atla]]></value>
+		<value xml:lang="vi"><![CDATA[Một khoảng bài viết]]></value>
+	</item>
+	<item name="image_align_left">
+		<value xml:lang="ko"><![CDATA[글의 왼쪽으로]]></value>
+		<value xml:lang="en"><![CDATA[Left of Article]]></value>
+		<value xml:lang="jp"><![CDATA[左揃え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[内容左侧]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠左]]></value>
+		<value xml:lang="ru"><![CDATA[Лево]]></value>
+		<value xml:lang="es"><![CDATA[Izquierda del articulo]]></value>
+		<value xml:lang="tr"><![CDATA[Makalenin Solunda]]></value>
+		<value xml:lang="vi"><![CDATA[Bên trái bài viết]]></value>
+	</item>
+	<item name="image_align_middle">
+		<value xml:lang="ko"><![CDATA[가운데]]></value>
+		<value xml:lang="en"><![CDATA[Center]]></value>
+		<value xml:lang="jp"><![CDATA[中央揃え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[居中]]></value>
+		<value xml:lang="zh-TW"><![CDATA[置中]]></value>
+		<value xml:lang="ru"><![CDATA[Центр]]></value>
+		<value xml:lang="es"><![CDATA[Centro]]></value>
+		<value xml:lang="tr"><![CDATA[Ortalı]]></value>
+		<value xml:lang="vi"><![CDATA[Giữa]]></value>
+	</item>
+	<item name="image_align_right">
+		<value xml:lang="ko"><![CDATA[글의 우측으로]]></value>
+		<value xml:lang="en"><![CDATA[Right of Article]]></value>
+		<value xml:lang="jp"><![CDATA[右揃え]]></value>
+		<value xml:lang="zh-CN"><![CDATA[内容右侧]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠右]]></value>
+		<value xml:lang="ru"><![CDATA[Право]]></value>
+		<value xml:lang="es"><![CDATA[Derecho de articulo]]></value>
+		<value xml:lang="tr"><![CDATA[Makalenin Sağında]]></value>
+		<value xml:lang="vi"><![CDATA[Bên phải bài viết]]></value>
+	</item>
+	<item name="image_border">
+		<value xml:lang="ko"><![CDATA[경계선 두께]]></value>
+		<value xml:lang="en"><![CDATA[Border Thickness]]></value>
+		<value xml:lang="jp"><![CDATA[ボーダー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[边框粗细]]></value>
+		<value xml:lang="zh-TW"><![CDATA[邊框粗細]]></value>
+		<value xml:lang="ru"><![CDATA[Толщина рамки]]></value>
+		<value xml:lang="es"><![CDATA[Grosor de Fronteras]]></value>
+		<value xml:lang="tr"><![CDATA[Kenarlık Kalınlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Độ dày viền]]></value>
+	</item>
+	<item name="image_margin">
+		<value xml:lang="ko"><![CDATA[바깥 여백]]></value>
+		<value xml:lang="en"><![CDATA[Image Margin]]></value>
+		<value xml:lang="jp"><![CDATA[外側の余白(Margin)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[外边距]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片邊距]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Kenar Boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề của hình ảnh]]></value>
+	</item>
+	<item name="urllink_open_window">
+		<value xml:lang="ko"><![CDATA[새 창 열기]]></value>
+		<value xml:lang="en"><![CDATA[Open in new window]]></value>
+		<value xml:lang="jp"><![CDATA[新しいウィンドウで開く]]></value>
+		<value xml:lang="zh-CN"><![CDATA[新窗口打开]]></value>
+	</item>
+	<item name="about_url_link_open_window">
+		<value xml:lang="ko"><![CDATA[선택하시면 링크 선택 시 새 창으로 열립니다.]]></value>
+		<value xml:lang="en"><![CDATA[Select this to open a link in a new window.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると、リンクをクリックする際に新しいウィンドウで開きます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[将在新窗口中打开链接。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[開啟連結於新視窗。]]></value>
+		<value xml:lang="ru"><![CDATA[Создайте ссылку для открытия в новом окне]]></value>
+		<value xml:lang="es"><![CDATA[Hacer el vinculo para abrir una nueva ventana]]></value>
+		<value xml:lang="tr"><![CDATA[Köprüyü yeni pencerede aç.]]></value>
+		<value xml:lang="vi"><![CDATA[Mở ra trang mới khi bấm vào hình]]></value>
+	</item>
+	<item name="cmd_get_scale">
+		<value xml:lang="ko"><![CDATA[가로세로 구하기]]></value>
+		<value xml:lang="en"><![CDATA[Get Image Size]]></value>
+		<value xml:lang="jp"><![CDATA[イメージサイズを計算]]></value>
+		<value xml:lang="zh-CN"><![CDATA[获得图片大小]]></value>
+		<value xml:lang="zh-TW"><![CDATA[取得圖片大小]]></value>
+		<value xml:lang="ru"><![CDATA[Получить размер изображения]]></value>
+		<value xml:lang="es"><![CDATA[Obtener tamano de la imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Boyutunu Al]]></value>
+		<value xml:lang="vi"><![CDATA[Lấy kích thước thật của hình]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/editor/components/image_link/lang/ru.lang.php b/modules/editor/components/image_link/lang/ru.lang.php
deleted file mode 100644
index 27354e5ae..000000000
--- a/modules/editor/components/image_link/lang/ru.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_link/lang/ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  editor Module > language pack of image_link component
-     **/
-
-    $lang->image_url = "Путь изображения";
-    $lang->image_alt = "Введите описание";
-    $lang->image_scale = "Размер изображения";
-    $lang->image_align = "Стиль выравнивания";
-    $lang->image_align_normal = "Занять параграф";
-    $lang->image_align_left = "Лево";
-    $lang->image_align_middle = "Центр";
-    $lang->image_align_right = "Право";
-    $lang->image_border = "Толщина рамки";
-    $lang->urllink_url = "URL";
-    $lang->image_margin = 'Image Margin';
-
-    $lang->about_url_link_open_window = "Создайте ссылку для открытия в новом окне";
-    $lang->cmd_get_scale = "Получить размер изображения";
-?>
diff --git a/modules/editor/components/image_link/lang/tr.lang.php b/modules/editor/components/image_link/lang/tr.lang.php
deleted file mode 100644
index f4fb574f7..000000000
--- a/modules/editor/components/image_link/lang/tr.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_link/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor Module > language pack of image_link component
-     **/
-
-    $lang->image_url = "Resim Yolu";
-    $lang->image_alt = "Açıklama Gir";
-    $lang->image_scale = "Resim Boyutu";
-    $lang->image_align = "Hizalama Tarzı";
-    $lang->image_align_normal = "Paragraf Atla";
-    $lang->image_align_left = "Makalenin Solunda";
-    $lang->image_align_middle = "Ortalı";
-    $lang->image_align_right = "Makalenin Sağında";
-    $lang->image_border = "Kenarlık Kalınlığı";
-    $lang->urllink_url = "URL";
-    $lang->image_margin = 'Resim Kenar Boşluğu';
-
-    $lang->about_url_link_open_window = "Köprüyü yeni pencerede aç.";
-    $lang->cmd_get_scale = "Resim Boyutunu Al";
-?>
diff --git a/modules/editor/components/image_link/lang/vi.lang.php b/modules/editor/components/image_link/lang/vi.lang.php
deleted file mode 100644
index df986db6e..000000000
--- a/modules/editor/components/image_link/lang/vi.lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->image_url = "Đường dẫn";
-    $lang->image_alt = "Mô tả";
-    $lang->image_scale = "Kích thước";
-    $lang->image_align = "Căn chỉnh";
-    $lang->image_align_normal = "Một khoảng bài viết";
-    $lang->image_align_left = "Bên trái bài viết";
-    $lang->image_align_middle = "Giữa";
-    $lang->image_align_right = "Bên phải bài viết";
-    $lang->image_border = "Độ dày viền";
-    $lang->urllink_url = "URL";
-    $lang->image_margin = 'Lề của hình ảnh';
-
-    $lang->about_url_link_open_window = "Mở ra trang mới khi bấm vào hình";
-    $lang->cmd_get_scale = "Lấy kích thước thật của hình";
-?>
\ No newline at end of file
diff --git a/modules/editor/components/image_link/lang/zh-CN.lang.php b/modules/editor/components/image_link/lang/zh-CN.lang.php
deleted file mode 100644
index 1bc6e7452..000000000
--- a/modules/editor/components/image_link/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_link/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  网页编辑器(editor) 模块 > 图像链接(image_link) 组件的语言包
-     **/
-
-    $lang->image_url = "图像路径";
-    $lang->image_alt = "图像说明";
-    $lang->image_scale = "图像大小";
-    $lang->image_align = "对齐方式";
-    $lang->image_align_normal = "占一个段落";
-    $lang->image_align_left = "内容左侧";
-    $lang->image_align_middle = "居中";
-    $lang->image_align_right = "内容右侧";
-    $lang->image_border = "边框粗细";
-    $lang->image_margin = '外边距';
-
-    $lang->urllink_open_window = '新窗口打开';
-    $lang->about_url_link_open_window = "将在新窗口中打开链接。";
-
-    $lang->cmd_get_scale = "获得图片大小";
-?>
diff --git a/modules/editor/components/image_link/lang/zh-TW.lang.php b/modules/editor/components/image_link/lang/zh-TW.lang.php
deleted file mode 100644
index 1c63b2e22..000000000
--- a/modules/editor/components/image_link/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/image_link/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  網頁編輯器(editor)模組 > 圖片連結(image_link)組件語言
-     **/
-
-    $lang->image_url = "圖片路徑";
-    $lang->image_alt = "圖片說明";
-    $lang->image_scale = "圖片大小";
-    $lang->image_align = "對齊方式";
-    $lang->image_align_normal = "段落";
-    $lang->image_align_left = "靠左";
-    $lang->image_align_middle = "置中";
-    $lang->image_align_right = "靠右";
-    $lang->image_border = "邊框粗細";
-    $lang->urllink_url = "網址";
-    $lang->image_margin = '圖片邊距';
-
-    $lang->about_url_link_open_window = "開啟連結於新視窗。";
-    $lang->cmd_get_scale = "取得圖片大小";
-?>
diff --git a/modules/editor/components/image_link/tpl/popup.html b/modules/editor/components/image_link/tpl/popup.html
index d2305ac8c..d8043458f 100644
--- a/modules/editor/components/image_link/tpl/popup.html
+++ b/modules/editor/components/image_link/tpl/popup.html
@@ -1,46 +1,41 @@
 <!--%import("popup.js")-->
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
-</div>
-
+<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
 <form action="./" method="get" onSubmit="return false" id="fo">
 
-    <div id="popBody">
-        <table cellspacing="0" class="rowTable">
+    <div class="table">
+        <table width="100%" border="1" cellspacing="0">
         <col width="100" />
         <col />
-
         <tr>
-            <th scope="row"><div>{$lang->image_url}</div></th>
-            <td><input type="text" id="image_url" value="{url_decode($manual_url)}" class="inputTypeText w400" /></td>
+            <th scope="row">{$lang->image_url}</th>
+            <td><input type="text" id="image_url" value="{url_decode($manual_url)}" /></td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->image_scale}</div></th>
+            <th scope="row">{$lang->image_scale}</th>
             <td>
                 <ul>
-                    <li><input type="text" id="width" value="0" size="4" class="inputTypeText" />px </li>
-                    <li><input type="text" id="height" value="0" size="4" class="inputTypeText" />px </li>
-                    <li><a href="#" id="get_scale" class="button"><span>{$lang->cmd_get_scale}</span></a></li>
+                    <li><input type="text" id="width" value="0" size="4" />px </li>
+                    <li><input type="text" id="height" value="0" size="4" />px </li>
+                    <li><button type="button" id="get_scale">{$lang->cmd_get_scale}</button></li>
                 </ul>
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>URL</div></th>
-            <td><input type="text" id="link_url" value="" class="inputTypeText w400"/></td>
+            <th scope="row">URL</th>
+            <td><input type="text" id="link_url" value=""/></td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->urllink_open_window}</div></th>
+            <th scope="row">{$lang->urllink_open_window}</th>
             <td><input type="checkbox" id="open_window" value="Y" /> {$lang->about_url_link_open_window}</td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->image_alt}</div></th>
-            <td><input type="text" id="image_alt" value="" class="inputTypeText w400"/></td>
+            <th scope="row">{$lang->image_alt}</th>
+            <td><input type="text" id="image_alt" value=""/></td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->image_align}</div></th>
+            <th scope="row">{$lang->image_align}</th>
             <td>
                 <div class="image_align">
                     <input type="radio" name="align" value="" id="align_normal" checked="checked"/>
@@ -76,18 +71,18 @@
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->image_border}</div></th>
-            <td><input type="text" id="image_border" value="0" size="2" class="inputTypeText" />px</td>
+            <th scope="row">{$lang->image_border}</th>
+            <td><input type="text" id="image_border" value="0" size="2" />px</td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->image_margin}</div></th>
-            <td><input type="text" id="image_margin" value="0" size="2" class="inputTypeText" />px</td>
+            <th scope="row">{$lang->image_margin}</th>
+            <td><input type="text" id="image_margin" value="0" size="2" />px</td>
         </tr>
         </table>
     </div>
-    <div id="popFooter" class="tCenter">
-        <a href="#" id="btn_insert" class="button black strong"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+    <div class="btnArea">
+        <span class="btn"><button type="button" id="btn_insert">{$lang->cmd_insert}</button></span>
+        <span class="btn"><a href="./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}" target="_blank" onclick="window.open('this.href','ComponentInfo','width=10,height=10');return false;">{$lang->about_component}</a></span>
     </div>
 
 </form>
diff --git a/modules/editor/components/multimedia_link/info.xml b/modules/editor/components/multimedia_link/info.xml
index ccc962535..3ea53ca3f 100644
--- a/modules/editor/components/multimedia_link/info.xml
+++ b/modules/editor/components/multimedia_link/info.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component version="0.2">
-    <title xml:lang="ko">멀티미디어 자료 관리</title>
-    <title xml:lang="jp">マルチメディア管理</title>
-    <title xml:lang="zh-CN">多媒体</title>
-    <title xml:lang="en">Manage Multimedia Data</title>
-    <title xml:lang="es">Administrar datos multimedia </title>
-    <title xml:lang="ru">Управление мультимедиа данными</title>
-    <title xml:lang="zh-TW">多媒體管理</title>
-    <title xml:lang="vi">Chèn Media vào bài viết</title>
-    <title xml:lang="tr">Çoklu Ortam Verisi Yönetme</title>
-    <description xml:lang="ko">에디터에 wmv,avi,flv등의 멀티미디어 자료를 추가하거나 속성을 수정할 수 있습니다.</description>
-    <description xml:lang="jp">エディターに拡張子が「wmv,avi,flv」などのマルチメディアコンテンツを追加、または属性の修正ができます。</description>
-    <description xml:lang="zh-CN">插入wmv,avi,flv等多媒体文件或修改其相应属性 。</description>
-    <description xml:lang="en">It can add multimedia data like wmv,avi,flv to editor or change the attribution of multimedia data.</description>
-    <description xml:lang="es">Se pueden agregar datos multimedia como wmv, avi, flv al editor o cambiar la atribución de datos multimedia.</description>
-    <description xml:lang="ru">Это может добавить мультимедиа данные как wmv,avi,flv в редактор или изменить параметры данных мультимедиа.</description>
-    <description xml:lang="zh-TW">可新增 wmv、avi、flv 等多媒體檔案或修改其相關屬性。</description>
-    <description xml:lang="vi">Chèn Media dạng '.wmv,.avi,.flv,.mp3,.wma' vào bài viết.</description>
-    <description xml:lang="tr">wmv, avi, flv gibi çoklu ortam dosyalarını editöre ekleyebilir veya çoklu ortam dosyasının niteliğini değiştirebilir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="ko">멀티미디어 링크</title>
+    <title xml:lang="jp">マルチメディア管理</title>
+    <title xml:lang="zh-CN">多媒体</title>
+    <title xml:lang="en">Multimedia Link</title>
+    <title xml:lang="es">Administrar datos multimedia </title>
+    <title xml:lang="ru">Управление мультимедиа данными</title>
+    <title xml:lang="zh-TW">多媒體管理</title>
+    <title xml:lang="vi">Chèn Media vào bài viết</title>
+    <title xml:lang="tr">Çoklu Ortam Verisi Yönetme</title>
+    <description xml:lang="ko">에디터에 wmv,avi,flv등의 멀티미디어 자료를 추가하거나 속성을 수정할 수 있습니다.</description>
+    <description xml:lang="jp">エディターに拡張子が「wmv,avi,flv」などのマルチメディアコンテンツを追加、または属性の修正ができます。</description>
+    <description xml:lang="zh-CN">插入wmv,avi,flv等多媒体文件或修改其相应属性 。</description>
+    <description xml:lang="en">It can add multimedia data like wmv, avi, flv to editor or change the its attributes.</description>
+    <description xml:lang="es">Se pueden agregar datos multimedia como wmv, avi, flv al editor o cambiar la atribución de datos multimedia.</description>
+    <description xml:lang="ru">Это может добавить мультимедиа данные как wmv,avi,flv в редактор или изменить параметры данных мультимедиа.</description>
+    <description xml:lang="zh-TW">可新增 wmv、avi、flv 等多媒體檔案或修改其相關屬性。</description>
+    <description xml:lang="vi">Chèn Media dạng '.wmv,.avi,.flv,.mp3,.wma' vào bài viết.</description>
+    <description xml:lang="tr">wmv, avi, flv gibi çoklu ortam dosyalarını editöre ekleyebilir veya çoklu ortam dosyasının niteliğini değiştirebilir.</description>
+    <version>0.2</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</component>
diff --git a/modules/editor/components/multimedia_link/lang/en.lang.php b/modules/editor/components/multimedia_link/lang/en.lang.php
deleted file mode 100644
index 7b33ccba7..000000000
--- a/modules/editor/components/multimedia_link/lang/en.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/multimedia_link/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of multimedia_link component
-     **/
-
-    $lang->multimedia_url = "Multimedia Path";
-    $lang->multimedia_caption = "Input Description";
-    $lang->multimedia_width = "Width";
-    $lang->multimedia_height = "Height";
-    $lang->multimedia_auto_start = "Auto Start";
-?>
diff --git a/modules/editor/components/multimedia_link/lang/es.lang.php b/modules/editor/components/multimedia_link/lang/es.lang.php
deleted file mode 100644
index bf537550c..000000000
--- a/modules/editor/components/multimedia_link/lang/es.lang.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/multimedia_link/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of multimedia_link component
-     **/
-
-     $lang->multimedia_url = "Sendero Multimedia";
-     $lang->multimedia_caption = "Descripcion de Entrada";
-     $lang->multimedia_width = "Ancho";
-     $lang->multimedia_height = "Altura";
-     $lang->multimedia_auto_start = "Auto Start";
-	 
-?>
diff --git a/modules/editor/components/multimedia_link/lang/jp.lang.php b/modules/editor/components/multimedia_link/lang/jp.lang.php
deleted file mode 100644
index 2e25f1659..000000000
--- a/modules/editor/components/multimedia_link/lang/jp.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/multimedia_link/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ウィジウィグエディター（editor）モジュール > マルチメディアリンク（(multimedia_link）コンポネント言語パッケージ
-     **/
-
-    $lang->multimedia_url = "マルチメディアのパス";
-    $lang->multimedia_caption = "説明入力";
-    $lang->multimedia_width = "横幅サイズ";
-    $lang->multimedia_height = "縦幅サイズ";
-    $lang->multimedia_auto_start = "自動再生";
-    $lang->multimedia_wmode = '位置';
-
-    $lang->multimedia_wmode_window = '常に上へ';
-    $lang->multimedia_wmode_opaque = '不透明背景';
-    $lang->multimedia_wmode_transparent = '透明背景';
-?>
diff --git a/modules/editor/components/multimedia_link/lang/ko.lang.php b/modules/editor/components/multimedia_link/lang/ko.lang.php
deleted file mode 100644
index 8a5adc012..000000000
--- a/modules/editor/components/multimedia_link/lang/ko.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/multimedia_link/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  위지윅에디터(editor) 모듈 > 멀티미디어 링크 (multimedia_link) 컴포넌트의 언어팩
-     **/
-
-    $lang->multimedia_url = '멀티미디어 경로';
-    $lang->multimedia_caption = '설명 입력';
-    $lang->multimedia_width = '가로';
-    $lang->multimedia_height = '세로';
-    $lang->multimedia_auto_start = '자동 시작';
-    $lang->multimedia_wmode = '위치';
-
-    $lang->multimedia_wmode_window = '항상 위';
-    $lang->multimedia_wmode_opaque = '배경 불투명';
-    $lang->multimedia_wmode_transparent = '배경 투명';
-?>
diff --git a/modules/editor/components/multimedia_link/lang/lang.xml b/modules/editor/components/multimedia_link/lang/lang.xml
new file mode 100644
index 000000000..9421a2afe
--- /dev/null
+++ b/modules/editor/components/multimedia_link/lang/lang.xml
@@ -0,0 +1,80 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="multimedia_url">
+		<value xml:lang="ko"><![CDATA[멀티미디어 경로]]></value>
+		<value xml:lang="en"><![CDATA[Multimedia Path]]></value>
+		<value xml:lang="jp"><![CDATA[マルチメディアのパス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[媒体路径]]></value>
+		<value xml:lang="zh-TW"><![CDATA[多媒體路徑]]></value>
+		<value xml:lang="ru"><![CDATA[Путь мультимедиа]]></value>
+		<value xml:lang="es"><![CDATA[Sendero Multimedia]]></value>
+		<value xml:lang="tr"><![CDATA[Çoklu Ortam Yolu]]></value>
+		<value xml:lang="vi"><![CDATA[Đường dẫn Media]]></value>
+	</item>
+	<item name="multimedia_caption">
+		<value xml:lang="ko"><![CDATA[설명 입력]]></value>
+		<value xml:lang="en"><![CDATA[Enter Description]]></value>
+		<value xml:lang="jp"><![CDATA[説明入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入说明]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入說明]]></value>
+		<value xml:lang="ru"><![CDATA[Введите описание]]></value>
+		<value xml:lang="es"><![CDATA[Descripcion de Entrada]]></value>
+		<value xml:lang="tr"><![CDATA[Açıklama Girin]]></value>
+		<value xml:lang="vi"><![CDATA[Mô tả Media]]></value>
+	</item>
+	<item name="multimedia_width">
+		<value xml:lang="ko"><![CDATA[가로]]></value>
+		<value xml:lang="en"><![CDATA[Width]]></value>
+		<value xml:lang="jp"><![CDATA[横幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度]]></value>
+		<value xml:lang="ru"><![CDATA[Ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho]]></value>
+		<value xml:lang="tr"><![CDATA[Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều rộng]]></value>
+	</item>
+	<item name="multimedia_height">
+		<value xml:lang="ko"><![CDATA[세로]]></value>
+		<value xml:lang="en"><![CDATA[Height]]></value>
+		<value xml:lang="jp"><![CDATA[縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度]]></value>
+		<value xml:lang="ru"><![CDATA[Высота]]></value>
+		<value xml:lang="es"><![CDATA[Altura]]></value>
+		<value xml:lang="tr"><![CDATA[Yükseklik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao]]></value>
+	</item>
+	<item name="multimedia_auto_start">
+		<value xml:lang="ko"><![CDATA[자동 시작]]></value>
+		<value xml:lang="en"><![CDATA[Auto Start]]></value>
+		<value xml:lang="jp"><![CDATA[自動再生]]></value>
+		<value xml:lang="zh-CN"><![CDATA[自动播放]]></value>
+		<value xml:lang="zh-TW"><![CDATA[自動播放]]></value>
+		<value xml:lang="ru"><![CDATA[Автозапуск]]></value>
+		<value xml:lang="tr"><![CDATA[Otomatik Başlangıç]]></value>
+		<value xml:lang="vi"><![CDATA[Tự động Play]]></value>
+	</item>
+	<item name="multimedia_wmode">
+		<value xml:lang="ko"><![CDATA[위치]]></value>
+		<value xml:lang="en"><![CDATA[Position]]></value>
+		<value xml:lang="jp"><![CDATA[位置]]></value>
+	</item>
+	<item name="multimedia_wmode_window">
+		<value xml:lang="ko"><![CDATA[항상 위]]></value>
+		<value xml:lang="en"><![CDATA[Always on Top]]></value>
+		<value xml:lang="jp"><![CDATA[常に上へ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[總是在上]]></value>
+	</item>
+	<item name="multimedia_wmode_opaque">
+		<value xml:lang="ko"><![CDATA[배경 불투명]]></value>
+		<value xml:lang="en"><![CDATA[Background opaque]]></value>
+		<value xml:lang="jp"><![CDATA[不透明背景]]></value>
+		<value xml:lang="zh-TW"><![CDATA[背景不透明]]></value>
+	</item>
+	<item name="multimedia_wmode_transparent">
+		<value xml:lang="ko"><![CDATA[배경 투명]]></value>
+		<value xml:lang="en"><![CDATA[Background transparent]]></value>
+		<value xml:lang="jp"><![CDATA[透明背景]]></value>
+		<value xml:lang="zh-TW"><![CDATA[透明背景]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/editor/components/multimedia_link/lang/ru.lang.php b/modules/editor/components/multimedia_link/lang/ru.lang.php
deleted file mode 100644
index 7672afa58..000000000
--- a/modules/editor/components/multimedia_link/lang/ru.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/multimedia_link/lang/ru.lang.php
-     * @author NHN (developers@xpressengine.com)> | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  editor module > language pack of multimedia_link component
-     **/
-
-    $lang->multimedia_url = "Путь мультимедиа";
-    $lang->multimedia_caption = "Введите описание";
-    $lang->multimedia_width = "Ширина";
-    $lang->multimedia_height = "Высота";
-    $lang->multimedia_auto_start = "Автозапуск";
-?>
diff --git a/modules/editor/components/multimedia_link/lang/tr.lang.php b/modules/editor/components/multimedia_link/lang/tr.lang.php
deleted file mode 100644
index 4a2712f96..000000000
--- a/modules/editor/components/multimedia_link/lang/tr.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/multimedia_link/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of multimedia_link component
-     **/
-
-    $lang->multimedia_url = "Çoklu Ortam Yolu";
-    $lang->multimedia_caption = "Açıklama Girin";
-    $lang->multimedia_width = "Genişlik";
-    $lang->multimedia_height = "Yükseklik";
-    $lang->multimedia_auto_start = "Otomatik Başlangıç";
-?>
diff --git a/modules/editor/components/multimedia_link/lang/vi.lang.php b/modules/editor/components/multimedia_link/lang/vi.lang.php
deleted file mode 100644
index c3afc5bce..000000000
--- a/modules/editor/components/multimedia_link/lang/vi.lang.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->multimedia_url = "Đường dẫn Media";
-    $lang->multimedia_caption = "Mô tả Media";
-    $lang->multimedia_width = "Chiều rộng";
-    $lang->multimedia_height = "Chiều cao";
-    $lang->multimedia_auto_start = "Tự động Play";
-?>
diff --git a/modules/editor/components/multimedia_link/lang/zh-CN.lang.php b/modules/editor/components/multimedia_link/lang/zh-CN.lang.php
deleted file mode 100644
index 0ce3e79ce..000000000
--- a/modules/editor/components/multimedia_link/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/multimedia_link/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  网页编辑器(editor) 模块 > 媒体链接 (multimedia_link) 组件的语言包
-     **/
-
-    $lang->multimedia_url = "媒体路径";
-    $lang->multimedia_caption = "输入说明";
-    $lang->multimedia_width = "宽度";
-    $lang->multimedia_height = "高度";
-    $lang->multimedia_auto_start = "自动播放";
-?>
diff --git a/modules/editor/components/multimedia_link/lang/zh-TW.lang.php b/modules/editor/components/multimedia_link/lang/zh-TW.lang.php
deleted file mode 100644
index ca4ed9823..000000000
--- a/modules/editor/components/multimedia_link/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/multimedia_link/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  網頁編輯器(editor) 模組 > 多媒體連結 (multimedia_link) 組件的語言
-     **/
-
-    $lang->multimedia_url = "多媒體路徑";
-    $lang->multimedia_caption = "輸入說明";
-    $lang->multimedia_width = "寬度";
-    $lang->multimedia_height = "高度";
-    $lang->multimedia_auto_start = "自動播放";
-
-    $lang->multimedia_wmode_window = '總是在上';
-    $lang->multimedia_wmode_opaque = '背景不透明';
-    $lang->multimedia_wmode_transparent = '透明背景';
-?>
diff --git a/modules/editor/components/multimedia_link/multimedia_link.class.php b/modules/editor/components/multimedia_link/multimedia_link.class.php
index efce7a308..0147db01f 100644
--- a/modules/editor/components/multimedia_link/multimedia_link.class.php
+++ b/modules/editor/components/multimedia_link/multimedia_link.class.php
@@ -1,71 +1,70 @@
-<?php
-    /**
-     * @class  multimedia_link
-     * @author NHN (developers@xpressengine.com)
-     * @brief  본문에 멀티미디어 자료를 연결하는 컴포넌트
-     **/
-
-    class multimedia_link extends EditorHandler { 
-
-        // editor_sequence 는 에디터에서 필수로 달고 다녀야 함....
-        var $editor_sequence = 0;
-        var $component_path = '';
-
-        /**
-         * @brief editor_sequence과 컴포넌트의 경로를 받음
-         **/
-        function multimedia_link($editor_sequence, $component_path) {
-            $this->editor_sequence = $editor_sequence;
-            $this->component_path = $component_path;
-        }
-
-        /**
-         * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
-         **/
-        function getPopupContent() {
-            // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
-            $tpl_path = $this->component_path.'tpl';
-            $tpl_file = 'popup.html';
-
-            Context::set("tpl_path", $tpl_path);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 에디터 컴포넌트가 별도의 고유 코드를 이용한다면 그 코드를 html로 변경하여 주는 method
-         *
-         * 이미지나 멀티미디어, 설문등 고유 코드가 필요한 에디터 컴포넌트는 고유코드를 내용에 추가하고 나서
-         * DocumentModule::transContent() 에서 해당 컴포넌트의 transHtml() method를 호출하여 고유코드를 html로 변경
-         **/
-        function transHTML($xml_obj) {
-            $src = $xml_obj->attrs->multimedia_src;
-            $style = $xml_obj->attrs->style;
-
-            preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$style,$matches);
-            $width = trim($matches[3][0]);
-            $height = trim($matches[3][1]);
-            if(!$width) $width = 400;
-            if(!$height) $height = 400;
-
-            $auto_start = $xml_obj->attrs->auto_start;
-            if($auto_start!="true") $auto_start = "false";
-            else $auto_start = "true";
-
-            $wmode = $xml_obj->attrs->wmode;
-            if($wmode == 'window') $wmode = 'window';
-            elseif($wmode == 'opaque') $wmode = 'opaque';
-            else $wmode = 'transparent';
-            
-
-            $caption = $xml_obj->body;
-
-            $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
-            $src = str_replace('&amp;amp;', '&amp;', $src);
-
-            if(Context::getResponseMethod() != "XMLRPC") return sprintf("<script type=\"text/javascript\">displayMultimedia(\"%s\", \"%s\",\"%s\", { \"autostart\" : %s, \"wmode\" : \"%s\" });</script>", $src, $width, $height, $auto_start, $wmode);
-            else return sprintf("<div style=\"width: %dpx; height: %dpx;\"><span style=\"position:relative; top:%dpx;left:%d\"><img src=\"%s\" /><br />Attached Multimedia</span></div>", $width, $height, ($height/2-16), ($width/2-31), Context::getRequestUri().'./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  multimedia_link
+     * @author NHN (developers@xpressengine.com)
+     * @brief The components connected to the body of multimedia data
+     **/
+
+    class multimedia_link extends EditorHandler { 
+        // editor_sequence from the editor must attend mandatory wearing ....
+        var $editor_sequence = 0;
+        var $component_path = '';
+
+        /**
+         * @brief editor_sequence and components out of the path
+         **/
+        function multimedia_link($editor_sequence, $component_path) {
+            $this->editor_sequence = $editor_sequence;
+            $this->component_path = $component_path;
+        }
+
+        /**
+         * @brief popup window to display in popup window request is to add content
+         **/
+        function getPopupContent() {
+            // Pre-compiled source code to compile template return to
+            $tpl_path = $this->component_path.'tpl';
+            $tpl_file = 'popup.html';
+
+            Context::set("tpl_path", $tpl_path);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief Editor of the components separately if you use a unique code to the html code for a method to change
+         *
+         * Images and multimedia, seolmundeung unique code is required for the editor component added to its own code, and then
+         * DocumentModule:: transContent() of its components transHtml() method call to change the html code for your own
+         **/
+        function transHTML($xml_obj) {
+            $src = $xml_obj->attrs->multimedia_src;
+            $style = $xml_obj->attrs->style;
+
+            preg_match_all('/(width|height)([^[:digit:]]+)([0-9]+)/i',$style,$matches);
+            $width = trim($matches[3][0]);
+            $height = trim($matches[3][1]);
+            if(!$width) $width = 400;
+            if(!$height) $height = 400;
+
+            $auto_start = $xml_obj->attrs->auto_start;
+            if($auto_start!="true") $auto_start = "false";
+            else $auto_start = "true";
+
+            $wmode = $xml_obj->attrs->wmode;
+            if($wmode == 'window') $wmode = 'window';
+            elseif($wmode == 'opaque') $wmode = 'opaque';
+            else $wmode = 'transparent';
+            
+
+            $caption = $xml_obj->body;
+
+            $src = str_replace(array('&','"'), array('&amp;','&qout;'), $src);
+            $src = str_replace('&amp;amp;', '&amp;', $src);
+
+            if(Context::getResponseMethod() != "XMLRPC") return sprintf("<script type=\"text/javascript\">displayMultimedia(\"%s\", \"%s\",\"%s\", { \"autostart\" : %s, \"wmode\" : \"%s\" });</script>", $src, $width, $height, $auto_start, $wmode);
+            else return sprintf("<div style=\"width: %dpx; height: %dpx;\"><span style=\"position:relative; top:%dpx;left:%d\"><img src=\"%s\" /><br />Attached Multimedia</span></div>", $width, $height, ($height/2-16), ($width/2-31), Context::getRequestUri().'./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif');
+        }
+    }
+?>
diff --git a/modules/editor/components/multimedia_link/tpl/popup.html b/modules/editor/components/multimedia_link/tpl/popup.html
index 88241b5d2..488f28bdc 100644
--- a/modules/editor/components/multimedia_link/tpl/popup.html
+++ b/modules/editor/components/multimedia_link/tpl/popup.html
@@ -1,31 +1,32 @@
-<!--%import("popup.js")-->
-<!--%import("popup.css")-->
 <!--%import("../lang")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
-</div>
-
-<form action="./" method="get" onSubmit="return false" id="fo">
-    <div id="popBody">
-        <table cellspacing="0" class="rowTable">
+<!--@if(__DEBUG__)-->
+	<load target="popup.css" />
+	<load target="popup.js" />
+<!--@else-->
+	<load target="popup.min.css" />
+	<load target="popup.min.js" />
+<!--@end-->
+<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
+<form action="./" method="get" onsubmit="return false" id="fo">
+    <div class="table">
+        <table width="100%" border="1" cellspacing="0">
         <col width="150" />
         <col />
         <tr>
             <th scope="row"><div>{$lang->multimedia_url}</div></th>
-            <td><input type="text" class="inputTypeText w400" id="multimedia_url" value="{$manual_url}" /></td>
+            <td><input type="text" id="multimedia_url" value="{$manual_url}" /></td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->multimedia_caption}</div></th>
-            <td><input type="text" class="inputTypeText w400" id="multimedia_caption" value="" /></td>
+            <td><input type="text" id="multimedia_caption" value="" /></td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->multimedia_width}</div></th>
-            <td><input type="text" class="inputTypeText" size="3" id="multimedia_width" value="400" />px</td>
+            <td><input type="text"  size="3" id="multimedia_width" value="400" />px</td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->multimedia_height}</div></th>
-            <td><input type="text" class="inputTypeText" size="3" id="multimedia_height" value="400" />px</td>
+            <td><input type="text"  size="3" id="multimedia_height" value="400" />px</td>
         </tr>
         <tr>
             <th scope="row"><div>{$lang->multimedia_auto_start}</div></th>
@@ -34,7 +35,7 @@
         <tr>
             <th scope="row"><div>{$lang->multimedia_wmode}</div></th>
             <td>
-                <select name="multimedia_wmode">
+                <select id="multimedia_wmode">
                     <option value="window">{$lang->multimedia_wmode_window}</option>
                     <option value="opaque">{$lang->multimedia_wmode_opaque}</option>
                     <option value="transparent" selected="selected">{$lang->multimedia_wmode_transparent}</option>
@@ -43,9 +44,9 @@
             </td>
         </table>
     </div>
-    <div id="popFooter">
-        <a href="#" onclick="insertMultimedia()" class="button black strong"><span>{$lang->cmd_insert}</span></a>
-        <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+    <div class="btnArea">
+        <span class="btn"><button type="button">{$lang->cmd_insert}</button></span>
+        <span class="btn"><a href="./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}" target="_blank">{$lang->about_component}</a></span>
     </div>
 
 </form>
diff --git a/modules/editor/components/multimedia_link/tpl/popup.js b/modules/editor/components/multimedia_link/tpl/popup.js
index f7d498b6c..789809dff 100644
--- a/modules/editor/components/multimedia_link/tpl/popup.js
+++ b/modules/editor/components/multimedia_link/tpl/popup.js
@@ -2,69 +2,60 @@
  * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
  * 있으면 가져와서 원하는 곳에 삽입
  **/
-function getMultimedia() {
-    // 부모 위지윅 에디터에서 선택된 영역이 있는지 확인
-    if(typeof(opener)=="undefined") return;
+jQuery(function($){
 
-    var node = opener.editorPrevNode;
-    if(!node || node.nodeName != "IMG") return;
+(function(){
+	if(!is_def(opener)) return;
 
-    var url = node.getAttribute("multimedia_src");
-    var caption = node.getAttribute("alt");
-    var width = xWidth(node);
-    var height = xHeight(node);
-    var auto_start = node.getAttribute("auto_start");
-    var wmode = node.getAttribute("wmode");
+	var $node = $(opener.editorPrevNode).filter('img'), attrs;
+	if(!$node.length) return;
 
-    var fo_obj = xGetElementById('fo');
+	attrs = {
+		url     : $node.attr('multimedia_src'),
+		caption : $node.attr('alt'),
+		width   : $node.width() - 4,
+		height  : $node.height() - 4,
+		wmode   : $node.attr('wmode')
+	};
 
-    xGetElementById("multimedia_url").value = url;
-    xGetElementById("multimedia_caption").value = caption;
-    xGetElementById("multimedia_width").value = width-4;
-    xGetElementById("multimedia_height").value = height-4;
-    if(auto_start=="true") xGetElementById("multimedia_auto_start").checked = true;
+	$.each(attrs, function(key, val) {
+		get_by_id('multimedia_'+key).value = val;
+	});
 
-    if(wmode == 'window') fo_obj.multimedia_wmode.selectedIndex = 0; 
-    else if(wmode == 'opaque') fo_obj.multimedia_wmode.selectedIndex = 1;
-    else fo_obj.multimedia_wmode.selectedIndex = 2;
-}
+})();
 
-function insertMultimedia(obj) {
-    if(typeof(opener)=="undefined") return;
+$('.btnArea button').click(function(){
+	if(!is_def(opener)) return;
 
-    var url = xGetElementById("multimedia_url").value;
-    url = url.replace(request_uri,'');
-//	url = encodeURI(url);
-    var fo_obj = xGetElementById('fo');
+	var el_wmode = get_by_id('fo').elements['multimedia_wmode'];
+	var attrs = {
+		alt    : get_by_id('multimedia_caption').value,
+		width  : get_by_id('multimedia_width').value || 400,
+		height : get_by_id('multimedia_height').value || 400,
+		wmode  : el_wmode.value || el_wmode.options[0].value,
+		auto_start : get_by_id('multimedia_auto_start').checked?'true':'false',
+		multimedia_src : get_by_id('multimedia_url').value.replace(request_uri, '')
+	};
 
-    var wmode = fo_obj.multimedia_wmode.options[fo_obj.multimedia_wmode.selectedIndex].value;
+	if(!attrs['multimedia_src']) {
+	  window.close();
+	  return;
+	}
 
-    var caption = xGetElementById("multimedia_caption").value;
+	var html = '<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';
 
-    var width = xGetElementById("multimedia_width").value;
-    if(!width) width = 400;
+	html = html.replace(/(\w+)=""/, function(m0,m1) {
+		return attrs[m1] ? (m1+'="'+attrs[m1]+'"') : '';
+	});
 
-    var height = xGetElementById("multimedia_height").value;
-    if(!height) height= 400;
+	opener.editorFocus(opener.editorPrevSrl);
 
-    var auto_start = "false";
-    if(xGetElementById("multimedia_auto_start").checked) auto_start = "true";
+	var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
 
-    if(!url) {
-      window.close();
-      return;
-    }
+	opener.editorReplaceHTML(iframe_obj, html);
+	opener.editorFocus(opener.editorPrevSrl);
 
-    var text = "<img src=\"../../../../common/tpl/images/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+url+"\" width=\""+width+"\" height=\""+height+"\" wmode=\""+wmode+"\" style=\"display:block;width:"+width+"px;height:"+height+"px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center;\" auto_start=\""+auto_start+"\" alt=\""+caption+"\" />";
+	window.close();
+});
 
-    opener.editorFocus(opener.editorPrevSrl);
-
-    var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
-
-    opener.editorReplaceHTML(iframe_obj, text);
-    opener.editorFocus(opener.editorPrevSrl);
-
-    window.close();
-}
-
-xAddEventListener(window, "load", getMultimedia);
+});
diff --git a/modules/editor/components/multimedia_link/tpl/popup.min.css b/modules/editor/components/multimedia_link/tpl/popup.min.css
new file mode 100644
index 000000000..43b5c9694
--- /dev/null
+++ b/modules/editor/components/multimedia_link/tpl/popup.min.css
@@ -0,0 +1,5 @@
+/**
+ * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
+ * 있으면 가져와서 원하는 곳에 삽입
+ **/
+@charset "utf-8";@import "../../../../../modules/admin/tpl/css/admin.css";
\ No newline at end of file
diff --git a/modules/editor/components/multimedia_link/tpl/popup.min.js b/modules/editor/components/multimedia_link/tpl/popup.min.js
new file mode 100644
index 000000000..20a71bc7f
--- /dev/null
+++ b/modules/editor/components/multimedia_link/tpl/popup.min.js
@@ -0,0 +1,5 @@
+/**
+ * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 멀티미디어 컴포넌트 코드를 체크하여
+ * 있으면 가져와서 원하는 곳에 삽입
+ **/
+jQuery(function($){(function(){if(!is_def(opener))return;var $node=$(opener.editorPrevNode).filter('img'),attrs;if(!$node.length)return;attrs={url:$node.attr('multimedia_src'),caption:$node.attr('alt'),width:$node.width()-4,height:$node.height()-4,wmode:$node.attr('wmode')};$.each(attrs,function(key,val){get_by_id('multimedia_'+key).value=val})})();$('.btnArea button').click(function(){if(!is_def(opener))return;var el_wmode=get_by_id('fo').elements['multimedia_wmode'],attrs={alt:get_by_id('multimedia_caption').value,width:get_by_id('multimedia_width').value||400,height:get_by_id('multimedia_height').value||400,wmode:el_wmode.value||el_wmode.options[0].value,auto_start:get_by_id('multimedia_auto_start').checked?'true':'false',multimedia_src:get_by_id('multimedia_url').value.replace(request_uri,'')};if(!attrs.multimedia_src){window.close();return};var html='<img src="../../../../common/img/blank.gif" editor_component="multimedia_link" multimedia_src="" width="" height="" wmode="" style="display:block;width:'+attrs.width+'px;height:'+attrs.height+'px;border:2px dotted #4371B9;background:url(./modules/editor/components/multimedia_link/tpl/multimedia_link_component.gif) no-repeat center" auto_start="" alt="" />';html=html.replace(/(\w+)=""/,function(m0,m1){return attrs[m1]?(m1+'="'+attrs[m1]+'"'):''});opener.editorFocus(opener.editorPrevSrl);var iframe_obj=opener.editorGetIFrame(opener.editorPrevSrl);opener.editorReplaceHTML(iframe_obj,html);opener.editorFocus(opener.editorPrevSrl);window.close()})})
\ No newline at end of file
diff --git a/modules/editor/components/poll_maker/info.xml b/modules/editor/components/poll_maker/info.xml
index b6f226866..c0b73b764 100644
--- a/modules/editor/components/poll_maker/info.xml
+++ b/modules/editor/components/poll_maker/info.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component version="0.2">
-    <title xml:lang="vi">Thăm dò ý kiến</title>
-    <title xml:lang="ko">설문조사 컴포넌트</title>
-    <title xml:lang="jp">アンケート調査</title>
-    <title xml:lang="zh-CN">投票调查</title>
-    <title xml:lang="en">Poll Component</title>
-    <title xml:lang="es">Componente Poll</title>
-    <title xml:lang="ru">Компонент опросов</title>
-    <title xml:lang="zh-TW">投票調查</title>
-    <title xml:lang="tr">Oylama Bileşenleri</title>
-    <description xml:lang="vi">Bạn có thể tạo một cuộc thăm dò cho chủ đề của mình.</description>
-    <description xml:lang="ko">글 작성시에 설문조사를 첨부하실 수 있습니다. 설문조사 컴포넌트는 설문조사 모듈의 설정에 영향을 받습니다.</description>
-    <description xml:lang="jp">書き込みの時、アンケート機能の追加ができます。アンケートモジュールの影響を受けます。</description>
-    <description xml:lang="zh-CN">发表主题时可以附加投票调查。投票调查组件受投票调查模块设置的影响。</description>
-    <description xml:lang="en">You can attach a poll on writing articles. Poll component is affected by setting of poll module.</description>
-    <description xml:lang="es">Puede adjuntar una encuesta sobre la redacción de artículos. Encuesta componente se ve afectada por la configuración de módulo de encuesta.</description>
-    <description xml:lang="ru">Вы можете присоединить опрос при написании статей. Компонент опросов зависит от настроек модуля отпросов.</description>
-    <description xml:lang="zh-TW">發表主題時可以附加投票調查。投票調查組件受投票調查模組設置的影響。</description>
-    <description xml:lang="tr">Oylamaları yazı makalelerine ekleyebilirsiniz. Oylama bileşeni, oylama modülü ayarlarından ayarlanır.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</component>
+<?xml version="1.0" encoding="UTF-8"?>
+<component version="0.2">
+    <title xml:lang="vi">Thăm dò ý kiến</title>
+    <title xml:lang="ko">설문조사</title>
+    <title xml:lang="jp">アンケート調査</title>
+    <title xml:lang="zh-CN">投票调查</title>
+    <title xml:lang="en">Poll</title>
+    <title xml:lang="es">Poll</title>
+    <title xml:lang="ru">Компонент опросов</title>
+    <title xml:lang="zh-TW">投票調查</title>
+    <title xml:lang="tr">Oylama Bileşenleri</title>
+    <description xml:lang="vi">Bạn có thể tạo một cuộc thăm dò cho chủ đề của mình.</description>
+    <description xml:lang="ko">글 작성시에 설문조사를 첨부하실 수 있습니다. 설문조사 컴포넌트는 설문조사 모듈의 설정에 영향을 받습니다.</description>
+    <description xml:lang="jp">書き込みの時、アンケート機能の追加ができます。アンケートモジュールの影響を受けます。</description>
+    <description xml:lang="zh-CN">发表主题时可以附加投票调查。投票调查组件受投票调查模块设置的影响。</description>
+    <description xml:lang="en">You can attach a poll to your articles. Poll component will be available when the poll module is enabled.</description>
+    <description xml:lang="es">Puede adjuntar una encuesta sobre la redacción de artículos. Encuesta componente se ve afectada por la configuración de módulo de encuesta.</description>
+    <description xml:lang="ru">Вы можете присоединить опрос при написании статей. Компонент опросов зависит от настроек модуля отпросов.</description>
+    <description xml:lang="zh-TW">發表主題時可以附加投票調查。投票調查組件受投票調查模組設置的影響。</description>
+    <description xml:lang="tr">Oylamaları yazı makalelerine ekleyebilirsiniz. Oylama bileşeni, oylama modülü ayarlarından ayarlanır.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</component>
diff --git a/modules/editor/components/poll_maker/lang/en.lang.php b/modules/editor/components/poll_maker/lang/en.lang.php
deleted file mode 100644
index 1ebc2bc55..000000000
--- a/modules/editor/components/poll_maker/lang/en.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/poll_maker/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of poll_maker component
-     **/
-
-    $lang->poll_title = "Title";
-    $lang->poll_item = "Items";
-    $lang->poll_stop_date = "Expiration Date";
-    $lang->poll_chk_count = "Number of Checking Item";
-
-    $lang->cmd_add_poll = "Add Poll";
-    $lang->cmd_del_poll = "Delete Poll";
-    $lang->cmd_add_item = "Add Item";
-
-    $lang->msg_poll_cannot_modify = "You cannot modify the poll. It should be deleted to create a new poll";
-?>
diff --git a/modules/editor/components/poll_maker/lang/es.lang.php b/modules/editor/components/poll_maker/lang/es.lang.php
deleted file mode 100644
index d6bd3667a..000000000
--- a/modules/editor/components/poll_maker/lang/es.lang.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/poll_maker/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of poll_maker component
-     **/
-
-     $lang->poll_title = "Titulo";
-     $lang->poll_item = "Temas";
-     $lang->poll_stop_date = "Fecha de Expiracion";
-     $lang->poll_chk_count = "Numero de Comprobacion de Partida";
-
-     $lang->cmd_add_poll = "Anadir Encuesta";
-     $lang->cmd_del_poll = "Borrar encuesta";
-     $lang->cmd_add_item = "Anadir Tema";
-
-     $lang->msg_poll_cannot_modify = "No se puede modificar la encuesta. Por lo que debe suprimirse para crear una nueva encuesta";
-	 
-?>
diff --git a/modules/editor/components/poll_maker/lang/jp.lang.php b/modules/editor/components/poll_maker/lang/jp.lang.php
deleted file mode 100644
index c8f907f7a..000000000
--- a/modules/editor/components/poll_maker/lang/jp.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/urllink/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ウィジウィグエディター（editor）モジュール > アンケート調査言語パッケージ
-     **/
-
-    $lang->poll_title = "タイトル";
-    $lang->poll_item = "項目";
-    $lang->poll_stop_date = "終了日";
-    $lang->poll_chk_count = "選択項目数";
-
-    $lang->cmd_add_poll = "アンケート追加";
-    $lang->cmd_del_poll = "アンケート削除";
-    $lang->cmd_add_item = "項目追加";
-
-    $lang->msg_poll_cannot_modify = 'アンケートは修正出来ません。削除後、改めて新しく作成して下さい。';
-?>
diff --git a/modules/editor/components/poll_maker/lang/ko.lang.php b/modules/editor/components/poll_maker/lang/ko.lang.php
deleted file mode 100644
index f320afb37..000000000
--- a/modules/editor/components/poll_maker/lang/ko.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/components/urllink/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  위지윅에디터(editor) 모듈 > 설문조사 컴포넌트의 언어팩
-     **/
-
-    $lang->poll_title = '제목';
-    $lang->poll_item = '항목';
-    $lang->poll_stop_date = '종료 일자';
-    $lang->poll_chk_count = '선택항목 수';
-
-    $lang->cmd_add_poll = '설문 추가';
-    $lang->cmd_del_poll = '설문 제거';
-    $lang->cmd_add_item = '항목 추가';
-
-    $lang->msg_poll_cannot_modify = '설문조사는 수정하실 수 없습니다. 삭제 후 다시 생성하셔야 합니다.';
-?>
diff --git a/modules/editor/components/poll_maker/lang/lang.xml b/modules/editor/components/poll_maker/lang/lang.xml
new file mode 100644
index 000000000..02d5ff1dd
--- /dev/null
+++ b/modules/editor/components/poll_maker/lang/lang.xml
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="poll_title">
+		<value xml:lang="ko"><![CDATA[제목]]></value>
+		<value xml:lang="en"><![CDATA[Title]]></value>
+		<value xml:lang="jp"><![CDATA[タイトル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+		<value xml:lang="ru"><![CDATA[Заголовок]]></value>
+		<value xml:lang="es"><![CDATA[Titulo]]></value>
+		<value xml:lang="tr"><![CDATA[Başlık]]></value>
+		<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+	</item>
+	<item name="poll_item">
+		<value xml:lang="ko"><![CDATA[항목]]></value>
+		<value xml:lang="en"><![CDATA[Items]]></value>
+		<value xml:lang="jp"><![CDATA[項目]]></value>
+		<value xml:lang="zh-CN"><![CDATA[项目]]></value>
+		<value xml:lang="zh-TW"><![CDATA[項目]]></value>
+		<value xml:lang="ru"><![CDATA[Пункты]]></value>
+		<value xml:lang="es"><![CDATA[Temas]]></value>
+		<value xml:lang="tr"><![CDATA[Parça]]></value>
+		<value xml:lang="vi"><![CDATA[Mục]]></value>
+	</item>
+	<item name="poll_stop_date">
+		<value xml:lang="ko"><![CDATA[종료 일자]]></value>
+		<value xml:lang="en"><![CDATA[Expiration Date]]></value>
+		<value xml:lang="jp"><![CDATA[終了日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[结束日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[結束日期]]></value>
+		<value xml:lang="ru"><![CDATA[Дата истечения]]></value>
+		<value xml:lang="es"><![CDATA[Fecha de Expiracion]]></value>
+		<value xml:lang="tr"><![CDATA[Sonlandırma Tarihi]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày hết hạn]]></value>
+	</item>
+	<item name="poll_chk_count">
+		<value xml:lang="ko"><![CDATA[선택항목 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of checked items]]></value>
+		<value xml:lang="jp"><![CDATA[選択項目数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择项目数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇項目數]]></value>
+		<value xml:lang="ru"><![CDATA[Число пунктов выбора]]></value>
+		<value xml:lang="es"><![CDATA[Numero de Comprobacion de Partida]]></value>
+		<value xml:lang="tr"><![CDATA[Denetlenen Parça Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số phiếu]]></value>
+	</item>
+	<item name="cmd_add_poll">
+		<value xml:lang="ko"><![CDATA[설문 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add a poll]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加投票]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增投票]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить опрос]]></value>
+		<value xml:lang="es"><![CDATA[Anadir Encuesta]]></value>
+		<value xml:lang="tr"><![CDATA[Oylama Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo thăm dò]]></value>
+	</item>
+	<item name="cmd_del_poll">
+		<value xml:lang="ko"><![CDATA[설문 제거]]></value>
+		<value xml:lang="en"><![CDATA[Delete this poll]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[解除投票]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除投票]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить опрос]]></value>
+		<value xml:lang="es"><![CDATA[Borrar encuesta]]></value>
+		<value xml:lang="tr"><![CDATA[Parçayı Sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa thăm dò]]></value>
+	</item>
+	<item name="cmd_add_item">
+		<value xml:lang="ko"><![CDATA[항목 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add an item]]></value>
+		<value xml:lang="jp"><![CDATA[項目追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加项目]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增項目]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить пункт]]></value>
+		<value xml:lang="es"><![CDATA[Anadir Tema]]></value>
+		<value xml:lang="tr"><![CDATA[Parça Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm mục]]></value>
+	</item>
+	<item name="cmd_del_item">
+		<value xml:lang="ko"><![CDATA[마지막 항목 제거]]></value>
+		<value xml:lang="en"><![CDATA[Delete last item]]></value>
+		<value xml:lang="jp"><![CDATA[最後の項目削除]]></value>
+	</item>
+	<item name="msg_poll_cannot_modify">
+		<value xml:lang="ko"><![CDATA[설문조사는 수정할 수 없습니다. 삭제 후 다시 생성하셔야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You cannot modify the poll. You need to delete it and create a new one.]]></value>
+		<value xml:lang="jp"><![CDATA[アンケートは修正できません。削除後、改めて作成してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[投票调查不提供修改功能。必须删除后再生成]]></value>
+		<value xml:lang="zh-TW"><![CDATA[投票調查不提供修改功能。必須刪除後再新增]]></value>
+		<value xml:lang="ru"><![CDATA[Вы не можете изменить этот опрос. Его следует удалить для того, чтобы создать новый.]]></value>
+		<value xml:lang="es"><![CDATA[No se puede modificar la encuesta. Por lo que debe suprimirse para crear una nueva encuesta]]></value>
+		<value xml:lang="tr"><![CDATA[Oylamayı düzenleyemezsiniz. Yeni oylama oluşturmak için, oylamanın silinmesi gerekiyor.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không thể sửa đổi được. Nó sẽ được xóa để tạo cuộc thăm dò mới.]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/editor/components/poll_maker/lang/ru.lang.php b/modules/editor/components/poll_maker/lang/ru.lang.php
deleted file mode 100644
index 4e1716d20..000000000
--- a/modules/editor/components/poll_maker/lang/ru.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/poll_maker/lang/ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  editor module > language pack of poll_maker component
-     **/
-
-    $lang->poll_title = "Заголовок";
-    $lang->poll_item = "Пункты";
-    $lang->poll_stop_date = "Дата истечения";
-    $lang->poll_chk_count = "Число пунктов выбора";
-
-    $lang->cmd_add_poll = "Добавить опрос";
-    $lang->cmd_del_poll = "Удалить опрос";
-    $lang->cmd_add_item = "Добавить пункт";
-
-    $lang->msg_poll_cannot_modify = "Вы не можете изменить этот опрос. Его следует удалить для того, чтобы создать новый.";
-?>
diff --git a/modules/editor/components/poll_maker/lang/tr.lang.php b/modules/editor/components/poll_maker/lang/tr.lang.php
deleted file mode 100644
index 72b0750ae..000000000
--- a/modules/editor/components/poll_maker/lang/tr.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/poll_maker/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor module > language pack of poll_maker component
-     **/
-
-    $lang->poll_title = "Başlık";
-    $lang->poll_item = "Parça";
-    $lang->poll_stop_date = "Sonlandırma Tarihi";
-    $lang->poll_chk_count = "Denetlenen Parça Sayısı";
-
-    $lang->cmd_add_poll = "Oylama Ekle";
-    $lang->cmd_del_poll = "Parçayı Sil";
-    $lang->cmd_add_item = "Parça Ekle";
-
-    $lang->msg_poll_cannot_modify = "Oylamayı düzenleyemezsiniz. Yeni oylama oluşturmak için, oylamanın silinmesi gerekiyor.";
-?>
diff --git a/modules/editor/components/poll_maker/lang/vi.lang.php b/modules/editor/components/poll_maker/lang/vi.lang.php
deleted file mode 100644
index 0482e6c34..000000000
--- a/modules/editor/components/poll_maker/lang/vi.lang.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->poll_title = "Tiêu đề";
-    $lang->poll_item = "Mục";
-    $lang->poll_stop_date = "Ngày hết hạn";
-    $lang->poll_chk_count = "Số phiếu";
-
-    $lang->cmd_add_poll = "Tạo thăm dò";
-    $lang->cmd_del_poll = "Xóa thăm dò";
-    $lang->cmd_add_item = "Thêm mục";
-
-    $lang->msg_poll_cannot_modify = "Bạn không thể sửa đổi được. Nó sẽ được xóa để tạo cuộc thăm dò mới.";
-?>
diff --git a/modules/editor/components/poll_maker/lang/zh-CN.lang.php b/modules/editor/components/poll_maker/lang/zh-CN.lang.php
deleted file mode 100644
index ed811772a..000000000
--- a/modules/editor/components/poll_maker/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/urllink/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  网页编辑器(editor) 模块 > 投票调查组件语言包
-     **/
-
-    $lang->poll_title = "标题";
-    $lang->poll_item = "项目";
-    $lang->poll_stop_date = "结束日期";
-    $lang->poll_chk_count = "选择项目数";
-
-    $lang->cmd_add_poll = "添加投票";
-    $lang->cmd_del_poll = "解除投票";
-    $lang->cmd_add_item = "添加项目";
-
-    $lang->msg_poll_cannot_modify = '投票调查不提供修改功能。必须删除后再生成';
-?>
diff --git a/modules/editor/components/poll_maker/lang/zh-TW.lang.php b/modules/editor/components/poll_maker/lang/zh-TW.lang.php
deleted file mode 100644
index f691de9a2..000000000
--- a/modules/editor/components/poll_maker/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   /modules/editor/components/urllink/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  網頁編輯器(editor) 模組 > 投票調查組件語言
-     **/
-
-    $lang->poll_title = "標題";
-    $lang->poll_item = "項目";
-    $lang->poll_stop_date = "結束日期";
-    $lang->poll_chk_count = "選擇項目數";
-
-    $lang->cmd_add_poll = "新增投票";
-    $lang->cmd_del_poll = "刪除投票";
-    $lang->cmd_add_item = "新增項目";
-
-    $lang->msg_poll_cannot_modify = '投票調查不提供修改功能。必須刪除後再新增';
-?>
diff --git a/modules/editor/components/poll_maker/poll_maker.class.php b/modules/editor/components/poll_maker/poll_maker.class.php
index 96eabf422..d84d89c5a 100644
--- a/modules/editor/components/poll_maker/poll_maker.class.php
+++ b/modules/editor/components/poll_maker/poll_maker.class.php
@@ -1,60 +1,57 @@
-<?php
-    /**
-     * @class  poll_maker
-     * @author NHN (developers@xpressengine.com)
-     * @brief  에디터에서 url링크하는 기능 제공. 
-     **/
-
-    class poll_maker extends EditorHandler { 
-
-        // editor_sequence 는 에디터에서 필수로 달고 다녀야 함....
-        var $editor_sequence = 0;
-        var $component_path = '';
-
-        /**
-         * @brief editor_sequence과 컴포넌트의 경로를 받음
-         **/
-        function poll_maker($editor_sequence, $component_path) {
-            $this->editor_sequence = $editor_sequence;
-            $this->component_path = $component_path;
-        }
-
-        /**
-         * @brief popup window요청시 popup window에 출력할 내용을 추가하면 된다
-         **/
-        function getPopupContent() {
-            // 설문조사 스킨을 구함
-            $oModuleModel = &getModel('module');
-            $skin_list = $oModuleModel->getSkins("./modules/poll/");
-            Context::set('skin_list', $skin_list);
-
-            // 템플릿을 미리 컴파일해서 컴파일된 소스를 return
-            $tpl_path = $this->component_path.'tpl';
-            $tpl_file = 'popup.html';
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 에디터 컴포넌트가 별도의 고유 코드를 이용한다면 그 코드를 html로 변경하여 주는 method
-         *
-         * 이미지나 멀티미디어, 설문등 고유 코드가 필요한 에디터 컴포넌트는 고유코드를 내용에 추가하고 나서
-         * DocumentModule::transContent() 에서 해당 컴포넌트의 transHtml() method를 호출하여 고유코드를 html로 변경
-         **/
-        function transHTML($xml_obj) {
-            $poll_srl = $xml_obj->attrs->poll_srl;
-            $skin = $xml_obj->attrs->skin;
-            if(!$skin) $skin = 'default';
-
-            preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
-            $width = $matches[2];
-            if(!$width) $width = 400;
-            $style = sprintf('width:%dpx', $width);
-
-            // poll model 객체 생성해서 html 얻어와서 return
-            $oPollModel = &getModel('poll');
-            return $oPollModel->getPollHtml($poll_srl, $style, $skin);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  poll_maker
+     * @author NHN (developers@xpressengine.com)
+     * @brief Editor provides the ability to link to the url.
+     **/
+
+    class poll_maker extends EditorHandler { 
+        // editor_sequence from the editor must attend mandatory wearing ....
+        var $editor_sequence = 0;
+        var $component_path = '';
+
+        /**
+         * @brief editor_sequence and components out of the path
+         **/
+        function poll_maker($editor_sequence, $component_path) {
+            $this->editor_sequence = $editor_sequence;
+            $this->component_path = $component_path;
+        }
+
+        /**
+         * @brief popup window to display in popup window request is to add content
+         **/
+        function getPopupContent() {
+            // Wanted Skins survey
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getSkins("./modules/poll/");
+            Context::set('skin_list', $skin_list);
+            // Pre-compiled source code to compile template return to
+            $tpl_path = $this->component_path.'tpl';
+            $tpl_file = 'popup.html';
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief Editor of the components separately if you use a unique code to the html code for a method to change
+         *
+         * Images and multimedia, seolmundeung unique code is required for the editor component added to its own code, and then
+         * DocumentModule:: transContent() of its components transHtml() method call to change the html code for your own
+         **/
+        function transHTML($xml_obj) {
+            $poll_srl = $xml_obj->attrs->poll_srl;
+            $skin = $xml_obj->attrs->skin;
+            if(!$skin) $skin = 'default';
+
+            preg_match('/width([^[:digit:]]+)([0-9]+)/i',$xml_obj->attrs->style,$matches);
+            $width = $matches[2];
+            if(!$width) $width = 400;
+            $style = sprintf('width:%dpx', $width);
+            // poll model object creation to come get it return html
+            $oPollModel = &getModel('poll');
+            return $oPollModel->getPollHtml($poll_srl, $style, $skin);
+        }
+    }
+?>
diff --git a/modules/editor/components/poll_maker/tpl/popup.html b/modules/editor/components/poll_maker/tpl/popup.html
index ddfc49b5f..3088ad537 100644
--- a/modules/editor/components/poll_maker/tpl/popup.html
+++ b/modules/editor/components/poll_maker/tpl/popup.html
@@ -10,23 +10,17 @@
     var msg_poll_cannot_modify = "{$lang->msg_poll_cannot_modify}";
 </script>
 
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$component_info->title} ver. {$component_info->version}</h3>
-</div>
-
+<h1 class="h1">{$component_info->title} ver. {$component_info->version}</h1>
 <form action="./" method="post" id="fo_component" onSubmit="procFilter(this, insert_poll); return false;">
-<input type="hidden" name="component" value="{$component_info->component_name}" />
-<input type="hidden" name="method" value="insertPoll" />
-<input type="hidden" name="poll_srl" value="" />
-
-
-    <div id="popBody">
-
-        <table cellspacing="0" class="rowTable">
+	<input type="hidden" name="component" value="{$component_info->component_name}" />
+	<input type="hidden" name="method" value="insertPoll" />
+	<input type="hidden" name="poll_srl" value="" />
+    <div class="table">
+        <table width="100%" border="1" cellspacing="0">
         <col width="100" />
         <col />
         <tr>
-            <th scope="row"><div>{$lang->poll_stop_date}</div></th>
+            <th scope="row">{$lang->poll_stop_date}</th>
             <td>
 
             <input type="hidden" name="stop_date" id="stop_date" value="{date('Ymd',time()+60*60*24*30)}" />
@@ -52,7 +46,7 @@
             </td>
         </tr>
         <tr>
-            <th scope="row"><div>{$lang->skin}</div></th>
+            <th scope="row">{$lang->skin}</th>
             <td>
                 <select name="skin">
                     <!--@foreach($skin_list as $skin=>$skin_info)-->
@@ -62,44 +56,39 @@
             </td>
         </tr>
         </table>
-
-        <div id="poll_source" class="clear" style="display:none">
-            <div class="clear"></div>
-
-            <table cellspacing="0" class="rowTable gap1">
-            <col width="100" />
-            <col />
-            <tr>
-            <th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
-            <td><input type="text" name="checkcount_tidx" value="1" size="1" class="inputTypeText" /></td>
-            </tr>
-            <tr>
-                <th scope="row"><div>{$lang->poll_title}</div></th>
-                <td><input type="text" name="title_tidx" class="inputTypeText w400" /></td>
-            </tr>
-
-            <tr>
-                <th scope="row"><div>{$lang->poll_item} 1</div></th>
-                <td><input type="text" name="item_tidx_1" class="inputTypeText w400" /></td>
-            </tr>
-
-            <tr>
-                <th scope="row"><div>{$lang->poll_item} 2</div></th>
-                <td><input type="text" name="item_tidx_2" class="inputTypeText w400" /></td>
-            </tr>
-            </table>
-
-            <a href="#" onclick="doPollAddItem(this); return false;" class="button black small"><span>{$lang->cmd_add_item}</span></a>
-            <a href="#" onclick="doPollDelete(this); return false;" class="button red small"><span>{$lang->cmd_del_poll}</span></a> 
+        <div id="poll_source" style="display:none">
+			<div class="table">
+				<table width="100%" border="1" cellspacing="0">
+					<col width="100" />
+					<col />
+					<tr>
+						<th scope="row"><div><label>{$lang->poll_chk_count}</label></div></th>
+						<td><input type="text" name="checkcount_tidx" value="1" size="1"  /></td>
+					</tr>
+					<tr>
+						<th scope="row"><div>{$lang->poll_title}</div></th>
+						<td><input type="text" name="title_tidx" /></td>
+					</tr>
+					
+					<tr>
+						<th scope="row"><div>{$lang->poll_item} 1</div></th>
+						<td><input type="text" name="item_tidx_1" /></td>
+					</tr>
+					
+					<tr>
+						<th scope="row"><div>{$lang->poll_item} 2</div></th>
+						<td><input type="text" name="item_tidx_2" /></td>
+					</tr>
+				</table>
+			</div>
+			<button type="button" class="_add_item">{$lang->cmd_add_item}</button>
+			<button type="button" class="_del_item">{$lang->cmd_del_item}</button>
+			<button type="button" class="_del_poll">{$lang->cmd_del_poll}</button>
         </div>
-
     </div>
-
-    <div id="popFooter">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_submit}" /></span>
-            <a href="#" onclick="doPollAdd(); return false;" class="button blue"><span>{$lang->cmd_add_poll}</span></a>
-            <a href="#" onclick="winopen('./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}','ComponentInfo','left=10,top=10,width=10,height=10,resizable=no,scrollbars=no,toolbars=no');return false;" class="button"><span>{$lang->about_component}</span></a>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_submit}" /></span>
+		<span class="btn"><button type="button" id="add_poll">{$lang->cmd_add_poll}</button></span>
+		<span class="btn"><a href="./?module=editor&amp;act=dispEditorComponentInfo&amp;component_name={$component_info->component_name}" target="_blank">{$lang->about_component}</a></span>
     </div>
-
-
 </form>
diff --git a/modules/editor/components/poll_maker/tpl/popup.js b/modules/editor/components/poll_maker/tpl/popup.js
index 273cd0a43..68b39729b 100644
--- a/modules/editor/components/poll_maker/tpl/popup.js
+++ b/modules/editor/components/poll_maker/tpl/popup.js
@@ -2,30 +2,6 @@
  * popup으로 열렸을 경우 부모창의 위지윅에디터에 select된 block이 있는지 체크하여
  * 있으면 가져와서 원하는 곳에 삽입
  **/
-var poll_index = 1;
-function setPoll() {
-    var node = opener.editorPrevNode;
-    if(node && node.getAttribute('editor_component')=='poll_maker') {
-        alert(msg_poll_cannot_modify);
-        window.close();
-        return;
-    }
-
-    var obj = xCreateElement("div");
-    var source = xGetElementById("poll_source");
-
-    var html = xInnerHtml(source);
-    html = html.replace(/tidx/g, poll_index);
-    xInnerHtml(obj, html);
-
-    obj.id = "poll_"+poll_index;
-    obj.className = "poll_box";
-    obj.style.display = "block";
-
-    source.parentNode.insertBefore(obj, source);
-
-    setFixedPopupSize();
-}
 
 /**
  * 부모창의 위지윅에디터에 데이터를 삽입
@@ -33,112 +9,114 @@ function setPoll() {
 function completeInsertPoll(ret_obj) {
     if(typeof(opener)=="undefined") return null;
 
-    var fo_obj = xGetElementById('fo_component');
+    var fo_obj = get_by_id('fo_component');
     var skin = fo_obj.skin.options[fo_obj.skin.selectedIndex].value;
 
     var poll_srl = ret_obj["poll_srl"];
     if(!poll_srl) return null;
 
-    var text = "<img src=\"../../../../common/tpl/images/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\"  />";
+    var text = "<img src=\"../../../../common/img/blank.gif\" poll_srl=\""+poll_srl+"\" editor_component=\"poll_maker\" skin=\""+skin+"\" style=\"display:block;width:400px;height:300px;border:2px dotted #4371B9;background:url(./modules/editor/components/poll_maker/tpl/poll_maker_component.gif) no-repeat center;\"  />";
 
     alert(ret_obj['message']);
 
-    var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
-    opener.editorReplaceHTML(iframe_obj, text);
+	opener.editorFocus(opener.editorPrevSrl);
 
-    opener.focus();
+	var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
+
+	opener.editorReplaceHTML(iframe_obj, text);
+	opener.editorFocus(opener.editorPrevSrl);
     window.close();
 
     return null;
 }
 
-xAddEventListener(window, "load", setPoll);
+jQuery(function($){
+	var $node, poll_last_idx = 1;
 
-/**
- * 새 설문 추가
- **/
-function doPollAdd() {
-    var obj = xCreateElement("div");
-    var source = xGetElementById("poll_source");
-    if(poll_index+1>8) return null;
-    poll_index++;
+	$node = $(opener.editorPrevNode);
+	if($node.length && $node.attr('editor_component') == 'poll_maker') {
+		alert(msg_poll_cannot_modify);
+		return window.close();
+	}
 
-    var html = xInnerHtml(source);
-    html = html.replace(/tidx/g, poll_index);
-    xInnerHtml(obj, html);
+	// Add a new poll
+	$('#add_poll').click(function(){
+		addPoll();
+		setFixedPopupSize();
+	});
 
-    obj.id = "poll_"+poll_index;
-    obj.className = "poll_box";
-    obj.style.display = "block";
+	// Add a new item
+	$('button._add_item').click(function(){
+		var $tr_src, $tr_new, $th, idx;
 
-    source.parentNode.insertBefore(obj, source);
+		$tr_src = $(this).prev().children('table').find('>tbody>tr:last');
+		$tr_new = $tr_src.clone();
 
-    setFixedPopupSize();
+		match = $tr_src.find('td>input').attr('name').match(/item_(\d+)_(\d+)$/);
+		if(!match) return;
 
-    return null;
-}
+		match[2]++;
 
-/**
- * 항목 삭제
- **/
-function doPollDelete(obj) {
-    var pobj = xPrevSib(xPrevSib(obj)).lastChild.lastChild;
-    if(!pobj || typeof(pobj.id)=='undefined') return;
-    var tmp_arr = pobj.id.split('_');
-    var index = tmp_arr[1];
-    if(index==1) return;
+		($th=$tr_new.find('th')).html( $th.html().replace(/ \d+/, ' '+match[2]) );
+		$tr_new.find('td>input').attr('name', 'item_'+match[1]+'_'+match[2]);
 
-    pobj.parentNode.removeChild(pobj);
+		$tr_src.after($tr_new);
 
-    var obj_list = xGetElementsByClassName('poll_box');
-    for(var i=0;i<obj_list.length;i++) {
-        var nobj = obj_list[i];
-        if(nobj.id == 'poll_source') continue;
-        var tmp_arr = nobj.id.split('_');
-        var index = tmp_arr[1];
-        nobj.id = 'poll_'+(i+1);
-    }
-    poll_index = i-1;
+		setFixedPopupSize();
+	});
 
-    setFixedPopupSize();
-}
+	// delete an item
+	$('button._del_item').click(function(){
+		var $tr, match;
 
-/**
- * 새 항목 추가
- **/
-function doPollAddItem(obj) {
-    var tbl = xPrevSib(obj);
-    var tbody = tbl.lastChild;
-    var tmp = tbody.firstChild;
-    var source = null;
-    while(tmp.nextSibling) {
-        tmp = tmp.nextSibling;
-        if(tmp.nodeName == "TR") source = tmp;
-    }
+		$tr = $(this).prevAll('div').children('table').find('>tbody>tr:last');
+		match = $tr.find('td>input').attr('name').match(/item_(\d+)_(\d+)/);
+		if(!match || match[2] == 2) return;
 
-    var new_obj = source.cloneNode(true);
-    new_obj.className = source.className;
-    source.parentNode.appendChild(new_obj);
+		$tr.remove();
 
-    var html = xInnerHtml(new_obj);
-    var idx_match = html.match(/ ([0-9]+)</i);
-    var idx = parseInt(idx_match[1],10);
+		setFixedPopupSize();
+	});
 
-    var tmp = new_obj.firstChild;
-    while(tmp) {
-        if(tmp.nodeName == "TH") {
-            var html = xInnerHtml(tmp);
-            html = html.replace(/ ([0-9]+)/, ' '+(idx+1));
-            xInnerHtml(tmp, html);
-        } else if(tmp.nodeName == "TD") {
-            var html = xInnerHtml(tmp);
-            html = html.replace(/item_([0-9]+)_([0-9]+)/, 'item_$1_'+(idx+1));
-            xInnerHtml(tmp, html);
-        }
-        tmp = tmp.nextSibling;
-    }
+	// delete a poll
+	$('button._del_poll').click(function(){
+		$(this).parent('.poll_box').remove();
 
-    setFixedPopupSize();
+		reindex();
+	});
 
-    return null;
-}
+	function reindex() {
+		var $polls = $('.poll_box'); $inputs = $polls.find('input'), poll_idx = 0;
+
+		$inputs.attr('name', function(idx, val) {
+			if(/^checkcount_/.test(val)) poll_idx++;
+			return val.replace(/^([a-z]+_)(?:tidx|\d+)/, '$1'+poll_idx);
+		});
+
+		// If there are two or more polls, show 'delete poll' button.
+		// Otherwise hide the button.
+		if($polls.length > 1) {
+			$polls.find('button._del_poll').show();
+		} else {
+			$polls.find('button._del_poll').hide();
+		}
+	}
+
+	function addPoll() {
+		var $src = $('#poll_source');
+
+		$src.before(
+			$src.clone(true)
+				.removeAttr('id')
+				.addClass('poll_box')
+				.css('display', 'block')
+		);
+
+		reindex();
+	}
+
+	// add a poll
+	addPoll();
+});
+
+jQuery(window).load(setFixedPopupSize);
diff --git a/modules/editor/conf/info.xml b/modules/editor/conf/info.xml
index 942689118..d16d0537c 100644
--- a/modules/editor/conf/info.xml
+++ b/modules/editor/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="vi">WYSIWYG Editor</title>
-    <title xml:lang="ko">위지윅 에디터 </title>
-    <title xml:lang="en">WYSIWYG Editor</title>
-    <title xml:lang="es">Editor WYSIWYG</title>
-    <title xml:lang="zh-CN">网页编辑器</title>
-    <title xml:lang="jp">ウイジウイグエディター</title>
-    <title xml:lang="ru">WYSIWYG-редактор</title>
-    <title xml:lang="zh-TW">網頁編輯器</title>
-    <title xml:lang="tr">Editor WYSIWYG</title>
-    <description xml:lang="vi">Module hiển thị WYSIWYG Editor để quản lý những kiểu viết bài.</description>
-    <description xml:lang="ko">위지윅 에디터를 출력하거나 에디터 컴포넌트들을 관리/중계하는 모듈입니다.</description>
-    <description xml:lang="en">Module for displaying WYSIWYG editor and managing/relaying editor components.</description>
-    <description xml:lang="es">Módulo para mostrar en la pantalla el editor de WYSIWYG y para el manejo/relato de los componentes del editor.</description>
-    <description xml:lang="zh-CN">显示网页编辑器或管理/传递编辑器组件的模块。</description>
-    <description xml:lang="jp">ウイジウイグエディター を出力したり、エディターのコンポーネントを管理・中継するモジュールです。</description>
-    <description xml:lang="ru">Модуль для отображения WYSIWYG-редактора и управления/смены записей редактора.</description>
-    <description xml:lang="zh-TW">顯示網頁編輯器或管理/傳遞編輯器組件的模組。</description>
-    <description xml:lang="tr">WYSIWYG editörünü görüntüleme ve editör bileşenlerini düzenleme/aktarma için kullanılan modüldür. </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>utility</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="vi">WYSIWYG Editor</title>
+    <title xml:lang="ko">위지윅 에디터 </title>
+    <title xml:lang="en">WYSIWYG Editor</title>
+    <title xml:lang="es">Editor WYSIWYG</title>
+    <title xml:lang="zh-CN">网页编辑器</title>
+    <title xml:lang="jp">ウイジウイグエディター</title>
+    <title xml:lang="ru">WYSIWYG-редактор</title>
+    <title xml:lang="zh-TW">網頁編輯器</title>
+    <title xml:lang="tr">Editor WYSIWYG</title>
+    <description xml:lang="vi">Module hiển thị WYSIWYG Editor để quản lý những kiểu viết bài.</description>
+    <description xml:lang="ko">위지윅 에디터를 출력하거나 에디터 컴포넌트들을 관리/중계하는 모듈입니다.</description>
+    <description xml:lang="en">Module for displaying WYSIWYG editor and managing/relaying editor components.</description>
+    <description xml:lang="es">Módulo para mostrar en la pantalla el editor de WYSIWYG y para el manejo/relato de los componentes del editor.</description>
+    <description xml:lang="zh-CN">显示网页编辑器或管理/传递编辑器组件的模块。</description>
+    <description xml:lang="jp">ウイジウイグエディター を出力したり、エディターのコンポーネントを管理・中継するモジュールです。</description>
+    <description xml:lang="ru">Модуль для отображения WYSIWYG-редактора и управления/смены записей редактора.</description>
+    <description xml:lang="zh-TW">顯示網頁編輯器或管理/傳遞編輯器組件的模組。</description>
+    <description xml:lang="tr">WYSIWYG editörünü görüntüleme ve editör bileşenlerini düzenleme/aktarma için kullanılan modüldür. </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>utility</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/editor/conf/module.xml b/modules/editor/conf/module.xml
index b2522a8d6..a616467de 100644
--- a/modules/editor/conf/module.xml
+++ b/modules/editor/conf/module.xml
@@ -1,28 +1,42 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module>
-    <grants />
-    <permissions />
-    <actions>
-        <action name="dispEditorPopup" type="view" standalone="true" />
-        <action name="dispEditorComponentInfo" type="view" standalone="true" />
-
-        <action name="dispEditorAdminIndex" type="view" standalone="true" admin_index="true" />
-        <action name="dispEditorAdminSetupComponent" type="view" standalone="true" />
-        <action name="dispEditorAdminSkinColorset" type="view" standalone="true" />
-        <action name="dispEditorPreview" type="view" />
-        <action name="dispEditorSkinColorset" type="view" />
-
-
-        <action name="procEditorSaveDoc" type="controller" standalone="true" />
-        <action name="procEditorRemoveSavedDoc" type="controller" standalone="true" />
-        <action name="procEditorCall" type="controller" standalone="true" />
-        <action name="procEditorInsertModuleConfig" type="controller" standalone="true" />
-
-        <action name="procEditorAdminEnableComponent" type="controller" standalone="true" />
-        <action name="procEditorAdminDisableComponent" type="controller" standalone="true" />
-        <action name="procEditorAdminMoveListOrder" type="controller" standalone="true" />
-        <action name="procEditorAdminSetupComponent" type="controller" standalone="true" />
-
-        <action name="procEditorLoadSavedDocument" type="controller" standalone="true" />
-    </actions>
-</module>
+<?xml version="1.0" encoding="utf-8"?>
+<module>
+    <grants />
+    <permissions />
+    <actions>
+        <action name="dispEditorPopup" type="view" standalone="true" />
+        <action name="dispEditorComponentInfo" type="view" standalone="true" />
+
+        <action name="dispEditorAdminIndex" type="view" standalone="true" menu_name="editor" menu_index="true" admin_index="true" />
+        <action name="dispEditorAdminSetupComponent" type="view" standalone="true" />
+        <action name="dispEditorAdminSkinColorset" type="view" standalone="true" />
+		<action name="dispEditorConfigPreview" type="view" />
+        <action name="dispEditorPreview" type="view" />
+        <action name="dispEditorSkinColorset" type="view" />
+
+        <action name="procEditorSaveDoc" type="controller" standalone="true" />
+        <action name="procEditorRemoveSavedDoc" type="controller" standalone="true" />
+        <action name="procEditorCall" type="controller" standalone="true" />
+        <action name="procEditorInsertModuleConfig" type="controller" standalone="true" />        
+        
+        <action name="procEditorAdminSetupComponent" type="controller" standalone="true" ruleset="setupComponent" />
+		<action name="procEditorAdminGeneralConfig" type="controller" standalone="true" ruleset="generalConfig" />
+		<action name="procEditorAdminCheckUseListOrder" type="controller" standalone="true" ruleset="componentOrderAndUse" />
+
+        <action name="procEditorLoadSavedDocument" type="controller" standalone="true" />
+    </actions>
+	<menus>
+		<menu name="editor">
+			<title xml:lang="en">WYSIWYG Editor</title>
+			<title xml:lang="ko">에디터</title>
+			<title xml:lang="zh-CN">WYSIWYG Editor</title>
+			<title xml:lang="jp">WYSIWYG Editor</title>
+			<title xml:lang="es">WYSIWYG Editor</title>
+			<title xml:lang="ru">WYSIWYG Editor</title>
+			<title xml:lang="fr">WYSIWYG Editor</title>
+			<title xml:lang="zh-TW">WYSIWYG Editor</title>
+			<title xml:lang="vi">WYSIWYG Editor</title>
+			<title xml:lang="mn">WYSIWYG Editor</title>
+			<title xml:lang="tr">WYSIWYG Editor</title>
+		</menu>
+	</menus>
+</module>
diff --git a/modules/editor/editor.admin.controller.php b/modules/editor/editor.admin.controller.php
index f6d2bb629..a792e3cc1 100644
--- a/modules/editor/editor.admin.controller.php
+++ b/modules/editor/editor.admin.controller.php
@@ -1,166 +1,181 @@
-<?php
-    /**
-     * @class  editorAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor 모듈의 admin controller class
-     **/
-
-    class editorAdminController extends editor {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 컴포넌트의 활성화
-         **/
-        function procEditorAdminEnableComponent() {
-            $site_module_info = Context::get('site_module_info');
-
-            $args->component_name = Context::get('component_name');
-            $args->enabled = 'Y';
-            $args->site_srl = (int)$site_module_info->site_srl;
-            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
-            else $output = executeQuery('editor.updateSiteComponent', $args);
-            if(!$output->toBool()) return $output;
-
-            $oEditorController = &getController('editor');
-            $oEditorController->removeCache($args->site_srl);
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 컴포넌트의 비활성화
-         **/
-        function procEditorAdminDisableComponent() {
-            $site_module_info = Context::get('site_module_info');
-
-            $args->component_name = Context::get('component_name');
-            $args->enabled = 'N';
-            $args->site_srl = (int)$site_module_info->site_srl;
-            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
-            else $output = executeQuery('editor.updateSiteComponent', $args);
-            if(!$output->toBool()) return $output;
-
-            $oEditorController = &getController('editor');
-            $oEditorController->removeCache($args->site_srl);
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 컴포넌트의 위치 변경
-         **/
-        function procEditorAdminMoveListOrder() {
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $args->component_name = Context::get('component_name');
-            $mode = Context::get('mode');
-
-            // DB에서 전체 목록 가져옴
-            if(!$args->site_srl) $output = executeQuery('editor.getComponentList', $args);
-            else $output = executeQuery('editor.getSiteComponentList', $args);
-
-            $db_list = $output->data;
-            foreach($db_list as $key => $val) {
-                if($val->component_name == $args->component_name) break;
-            }
-
-            if($mode=="up") {
-                if($key == 2) return new Object(-1,'msg_component_is_first_order');
-
-                $prev_args->component_name = $db_list[$key-1]->component_name;
-                $prev_args->list_order = $db_list[$key]->list_order;
-                $prev_args->site_srl = $args->site_srl;
-                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $prev_args);
-                else $output = executeQuery('editor.updateSiteComponent', $prev_args);
-
-                $cur_args->component_name = $db_list[$key]->component_name;
-                $cur_args->list_order = $db_list[$key-1]->list_order;
-                if($prev_args->list_order == $cur_args->list_order) $cur_args->list_order--;
-                $cur_args->site_srl = $args->site_srl;
-                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $cur_args);
-                else $output = executeQuery('editor.updateSiteComponent', $cur_args);
-            } else {
-                if($key == count($db_list)-1) return new Object(-1,'msg_component_is_last_order');
-
-                $next_args->component_name = $db_list[$key+1]->component_name;
-                $next_args->list_order = $db_list[$key]->list_order;
-                $next_args->site_srl = $args->site_srl;
-                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $next_args);
-                else $output = executeQuery('editor.updateSiteComponent', $next_args);
-
-                $cur_args->component_name = $db_list[$key]->component_name;
-                $cur_args->list_order = $db_list[$key+1]->list_order;
-                $cur_args->site_srl = $args->site_srl;
-                if($next_args->list_order == $cur_args->list_order) $cur_args->list_order++;
-                if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $cur_args);
-                else $output = executeQuery('editor.updateSiteComponent', $cur_args);
-            }
-
-            $oEditorController = &getController('editor');
-            $oEditorController->removeCache($args->site_srl);
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 컴포넌트 설정
-         **/
-        function procEditorAdminSetupComponent() {
-            $site_module_info = Context::get('site_module_info');
-
-            $component_name = Context::get('component_name');
-            $extra_vars = Context::getRequestVars();
-            unset($extra_vars->component_name);
-            unset($extra_vars->module);
-            unset($extra_vars->act);
-            unset($extra_vars->body);
-
-            if($extra_vars->target_group) $extra_vars->target_group = explode('|@|', $extra_vars->target_group);
-            if($extra_vars->mid_list) $extra_vars->mid_list = explode('|@|', $extra_vars->mid_list);
-
-            $args->component_name = $component_name;
-            $args->extra_vars = serialize($extra_vars);
-            $args->site_srl = (int)$site_module_info->site_srl;
-
-            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
-            else $output = executeQuery('editor.updateSiteComponent', $args);
-            if(!$output->toBool()) return $output;
-
-            $oEditorController = &getController('editor');
-            $oEditorController->removeCache($args->site_srl);
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 컴포넌트를 DB에 추가
-         **/
-        function insertComponent($component_name, $enabled = false, $site_srl = 0) {
-            if($enabled) $enabled = 'Y';
-            else $enabled = 'N';
-
-            $args->component_name = $component_name;
-            $args->enabled = $enabled;
-            $args->site_srl = $site_srl;
-
-            // 컴포넌트가 있는지 확인
-            if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
-            else $output = executeQuery('editor.isSiteComponentInserted', $args);
-            if($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
-
-            // 입력
-            $args->list_order = getNextSequence();
-            if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
-            else $output = executeQuery('editor.insertSiteComponent', $args);
-
-            $oEditorController = &getController('editor');
-            $oEditorController->removeCache($site_srl);
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  editorAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief editor of the module admin controller class
+     **/
+
+    class editorAdminController extends editor {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+		
+		/**
+         * @brief 컴포넌트 사용설정, 목록 순서 변경
+         **/	
+		function procEditorAdminCheckUseListOrder(){
+			$site_module_info = Context::get('site_module_info');
+			$enables = Context::get('enables');			
+			$component_names = Context::get('component_names');
+
+			if(!is_array($component_names)) $component_names = array();
+			if(!is_array($enables)) $enables = array();
+
+			$unables = array_diff($component_names, $enables);
+			$componentList = array();	
+			
+			foreach($enables as $component_name) {
+				$componentList[$component_name] = 'Y';
+			}
+			foreach($unables as $component_name) {
+				$componentList[$component_name] = 'N';
+			}
+
+			$output = $this->editorListOrder($component_names,$site_module_info->site_srl);
+			if(!$output->toBool()) return new Object();
+			
+			$output = $this->editorCheckUse($componentList,$site_module_info->site_srl);			
+			if(!$output->toBool()) return new Object();
+			
+			$oEditorController = &getController('editor');
+            $oEditorController->removeCache($site_module_info->site_srl);
+			$this->setRedirectUrl(Context::get('error_return_url'));
+		}
+		
+		/**
+         * @brief check use component
+         **/	
+		function editorCheckUse($componentList, $site_srl = 0){			
+			$args->site_srl = $site_srl;
+			
+			foreach($componentList as $componentName => $value){
+				$args->component_name = $componentName;				
+				$args->enabled = $value;
+				if($site_srl == 0) {
+					$output = executeQuery('editor.updateComponent', $args);
+				} else {
+					$output = executeQuery('editor.updateSiteComponent', $args);
+				}
+			}
+			if(!$output->toBool()) return new Object();
+			
+			unset($componentList);
+			return $output;
+		}
+		
+		/**
+         * @brief list order componet
+         **/
+		function editorListOrder($component_names, $site_srl = 0){		
+			$args->site_srl = $site_srl;
+			$list_order_num = '30';
+			if(is_array($component_names)) {			
+				foreach($component_names as $name){
+					$args->list_order = $list_order_num;
+					$args->component_name = $name;
+					if($site_srl == 0) {
+						$output = executeQuery('editor.updateComponent', $args);					
+					} else {
+						$output = executeQuery('editor.updateSiteComponent', $args);					
+					}
+
+			
+					if(!$output->toBool()) return new Object();
+					$list_order_num++;
+				}
+			}	
+			unset($component_names);
+			return $output;
+		}
+
+        /**
+         * @brief Set components
+         **/
+        function procEditorAdminSetupComponent() {
+            $site_module_info = Context::get('site_module_info');
+
+            $component_name = Context::get('component_name');
+            $extra_vars = Context::getRequestVars();
+            unset($extra_vars->component_name);
+            unset($extra_vars->module);
+            unset($extra_vars->act);
+            unset($extra_vars->body);
+
+            if($extra_vars->target_group) $extra_vars->target_group = explode('|@|', $extra_vars->target_group);
+            if($extra_vars->mid_list) $extra_vars->mid_list = explode('|@|', $extra_vars->mid_list);
+
+            $args->component_name = $component_name;
+            $args->extra_vars = serialize($extra_vars);
+            $args->site_srl = (int)$site_module_info->site_srl;
+
+            if(!$args->site_srl) $output = executeQuery('editor.updateComponent', $args);
+            else $output = executeQuery('editor.updateSiteComponent', $args);
+            if(!$output->toBool()) return $output;
+
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($args->site_srl);
+
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				global $lang;
+				htmlHeader();
+				alertScript($lang->success_updated);
+				reload(true);
+				closePopupScript();
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+        }
+		
+		/**
+         * @brief Config components
+         **/
+		 
+		function procEditorAdminGeneralConfig(){
+			$oModuleController = &getController('module');
+			$configVars = Context::getRequestVars();
+			
+			$config->editor_skin = $configVars->editor_skin;
+			$config->editor_height = $configVars->editor_height;
+			$config->comment_editor_skin = $configVars->comment_editor_skin;
+			$config->comment_editor_height = $configVars->comment_editor_height;
+			$config->content_style = $configVars->content_style;
+			$config->content_font = $configVars->content_font;
+			$config->content_font_size= $configVars->content_font_size.'px';
+			$config->sel_editor_colorset= $configVars->sel_editor_colorset;
+			$config->sel_comment_editor_colorset= $configVars->sel_comment_editor_colorset;
+			
+			$oModuleController->insertModuleConfig('editor',$config);
+			$this->setRedirectUrl(Context::get('error_return_url'));
+					
+		}
+
+        /**
+         * @brief Add a component to DB
+         **/
+        function insertComponent($component_name, $enabled = false, $site_srl = 0) {
+            if($enabled) $enabled = 'Y';
+            else $enabled = 'N';
+
+            $args->component_name = $component_name;
+            $args->enabled = $enabled;
+            $args->site_srl = $site_srl;
+            // Check if the component exists
+            if(!$site_srl) $output = executeQuery('editor.isComponentInserted', $args);
+            else $output = executeQuery('editor.isSiteComponentInserted', $args);
+            if($output->data->count) return new Object(-1, 'msg_component_is_not_founded');
+            // Inert a component
+            $args->list_order = getNextSequence();
+            if(!$site_srl) $output = executeQuery('editor.insertComponent', $args);
+            else $output = executeQuery('editor.insertSiteComponent', $args);
+
+            $oEditorController = &getController('editor');
+            $oEditorController->removeCache($site_srl);
+            return $output;
+        }
+    }
+?>
diff --git a/modules/editor/editor.admin.view.php b/modules/editor/editor.admin.view.php
index c24f73d7d..3584ae83b 100644
--- a/modules/editor/editor.admin.view.php
+++ b/modules/editor/editor.admin.view.php
@@ -1,89 +1,133 @@
-<?php
-    /**
-     * @class  editorAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor 모듈의 admin view 클래스
-     **/
-
-    class editorAdminView extends editor {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 관리자 설정 페이지
-         * 에디터 컴포넌트의 on/off 및 설정을 담당
-         **/
-        function dispEditorAdminIndex() {
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = (int)$site_module_info->site_srl;
-
-            // 컴포넌트의 종류를 구해옴
-            $oEditorModel = &getModel('editor');
-            $component_list = $oEditorModel->getComponentList(false, $site_srl, true);
-
-            Context::set('component_list', $component_list);
-			
-			$security = new Security();
-			$security->encodeHTML('component_list....');			
-			
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('admin_index');
-        }
-
-        /**
-         * @brief 컴퍼넌트 setup
-         **/
-        function dispEditorAdminSetupComponent() {
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = (int)$site_module_info->site_srl;
-
-            $component_name = Context::get('component_name');
-
-            // 에디터 컴포넌트의 정보를 구함
-            $oEditorModel = &getModel('editor');
-            $component = $oEditorModel->getComponent($component_name,$site_srl);
-            Context::set('component', $component);
-
-            // 그룹 설정을 위한 그룹 목록을 구함
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups($site_srl);
-            Context::set('group_list', $group_list);
-
-            // mid 목록을 가져옴
-            $oModuleModel = &getModel('module');
-
-            $args->site_srl = $site_srl;
-            $mid_list = $oModuleModel->getMidList($args);
-
-            // module_category와 module의 조합
-            if(!$args->site_srl) {
-                // 모듈 카테고리 목록을 구함
-                $module_categories = $oModuleModel->getModuleCategories();
-
-                if(!is_array($mid_list)) $mid_list = array($mid_list);
-                foreach($mid_list as $module_srl => $module) {
-                    if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
-                }
-            } else {
-                $module_categories[0]->list = $mid_list;
-            }			
-
-            Context::set('mid_list',$module_categories);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('group_list..title');			
-			$security->encodeHTML('component...');
-			$security->encodeHTML('mid_list..title','mid_list..list..browser_title');			
-			
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('setup_component');
-            $this->setLayoutFile("popup_layout");
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  editorAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief editor admin view of the module class
+     **/
+
+    class editorAdminView extends editor {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Administrator Setting page
+         * Settings to enable/disable editor component and other features
+         **/
+        function dispEditorAdminIndex() {	
+			$component_count = 0;
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;			
+			
+            // Get a type of component
+            $oEditorModel = &getModel('editor');
+			$oModuleModel = &getModel('module');
+			$editor_config = $oModuleModel->getModuleConfig('editor');		
+
+			//editor_config init
+			if(!$editor_config->editor_height) $editor_config->editor_height = 400;
+            if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 100;
+			if(!$editor_config->editor_skin) $editor_config->editor_skin = 'xpresseditor';
+			if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'xpresseditor';
+			if(!$editor_config->sel_editor_colorset) $editor_config->sel_editor_colorset= 'white';
+			if(!$editor_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset= 'white';
+            
+			$component_list = $oEditorModel->getComponentList(false, $site_srl, true);			
+			$editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
+			
+			$skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+			
+			$contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
+            for($i=0,$c=count($contents);$i<$c;$i++) {
+                $style = $contents[$i];
+                $info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
+                $content_style_list[$style]->title = $info->title;
+            }			
+			
+			// Get install info, update info, count
+			$oAutoinstallModel = &getModel('autoinstall');			
+            foreach($component_list as $component_name => $xml_info) {
+				$component_count++;		    								
+				$xml_info->path = './modules/editor/components/'.$xml_info->component_name;				
+				$xml_info->delete_url = $oAutoinstallModel->getRemoveUrlByPath($xml_info->path);								
+				$xml_info->package_srl = $oAutoinstallModel->getPackageSrlByPath($xml_info->path);
+				if($xml_info->package_srl) $targetpackages[$xml_info->package_srl] = 0;
+            }	
+			
+			if(is_array($targetpackages))	$packages = $oAutoinstallModel->getInstalledPackages(array_keys($targetpackages));			
+			
+			foreach($component_list as $component_name => $xml_info) {
+				if($packages[$xml_info->package_srl])	$xml_info->need_update = $packages[$xml_info->package_srl]->need_update;
+			}
+			$editor_config_default = array( "editor_height" => "400", "comment_editor_height" => "100","content_font_size"=>"12");
+			
+			Context::set('editor_config', $editor_config);
+			Context::set('editor_skin_list', $editor_skin_list);
+			Context::set('editor_colorset_list', $skin_info->colorset);
+			Context::set('content_style_list', $content_style_list);
+			Context::set('component_list', $component_list);
+			Context::set('component_count', $component_count);						
+			Context::set('editor_config_default', $editor_config_default);
+			
+			$security = new Security();
+			$security->encodeHTML('component_list....');
+			
+			$security = new Security();
+			$security->encodeHTML('component_list....');			
+			
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('admin_index');
+        }
+
+        /**
+         * @brief Component setup
+         **/
+        function dispEditorAdminSetupComponent() {
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
+            $component_name = Context::get('component_name');
+            // Get information of the editor component
+            $oEditorModel = &getModel('editor');
+            $component = $oEditorModel->getComponent($component_name,$site_srl);
+            Context::set('component', $component);
+            // Get a group list to set a group
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($site_srl);
+            Context::set('group_list', $group_list);
+            // Get a mid list
+            $oModuleModel = &getModel('module');
+
+            $args->site_srl = $site_srl;
+			$columnList = array('module_srl', 'mid', 'module_category_srl', 'browser_title');
+            $mid_list = $oModuleModel->getMidList($args, $columnList);
+            // Combination of module_category and module
+            if(!$args->site_srl) {
+                // Get a list of module category
+                $module_categories = $oModuleModel->getModuleCategories();
+
+                if(!is_array($mid_list)) $mid_list = array($mid_list);
+                foreach($mid_list as $module_srl => $module) {
+                    if($module) $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+                }
+            } else {
+                $module_categories[0]->list = $mid_list;
+            }			
+
+            Context::set('mid_list',$module_categories);
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('group_list..title');			
+			$security->encodeHTML('component...');
+			$security->encodeHTML('mid_list..title','mid_list..list..browser_title');			
+			
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('setup_component');
+            $this->setLayoutFile("popup_layout");
+        }
+    }
+?>
diff --git a/modules/editor/editor.api.php b/modules/editor/editor.api.php
index 3945c9adf..c8f48edca 100644
--- a/modules/editor/editor.api.php
+++ b/modules/editor/editor.api.php
@@ -1,13 +1,13 @@
-<?php
-    /**
-     * @class  editorAPI
-     * @author NHN (developers@xpressengine.com)
-     * @brief 
-     **/
-
-    class editorAPI extends editor {
-        function dispEditorSkinColorset(&$oModule) {
-            $oModule->add('colorset', Context::get('colorset'));
-        }
-    }
-?>
+<?php
+    /**
+     * @class  editorAPI
+     * @author NHN (developers@xpressengine.com)
+     * @brief 
+     **/
+
+    class editorAPI extends editor {
+        function dispEditorSkinColorset(&$oModule) {
+            $oModule->add('colorset', Context::get('colorset'));
+        }
+    }
+?>
diff --git a/modules/editor/editor.class.php b/modules/editor/editor.class.php
index 43c4499ed..fd063125a 100644
--- a/modules/editor/editor.class.php
+++ b/modules/editor/editor.class.php
@@ -1,120 +1,105 @@
-<?php
-    /**
-     * @class  editor
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor 모듈의 high class
-     **/
-
-    class editor extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            // 기본 에디터 컴포넌트를 추가
-            $oEditorController = &getAdminController('editor');
-            $oEditorController->insertComponent('colorpicker_text',true);
-            $oEditorController->insertComponent('colorpicker_bg',true);
-            $oEditorController->insertComponent('emoticon',true);
-            $oEditorController->insertComponent('url_link',true);
-            $oEditorController->insertComponent('image_link',true);
-            $oEditorController->insertComponent('multimedia_link',true);
-            $oEditorController->insertComponent('quotation',true);
-            $oEditorController->insertComponent('table_maker',true);
-            $oEditorController->insertComponent('poll_maker',true);
-            $oEditorController->insertComponent('image_gallery',true);
-
-            // 에디터 모듈에서 사용할 디렉토리 생성
-            FileHandler::makeDir('./files/cache/editor');
-
-            // 2007. 10. 17 글의 입력(신규 or 수정)이 일어날때마다 자동 저장된 문서를 삭제하는 trigger 추가
-            $oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-            $oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-
-            // 2007. 10. 23 모듈의 추가 설정에서 에디터 trigger 추가
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
-
-            // 2009. 04. 14 editor component 변환 코드를 trigger로 독립
-            $oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            $oDB = &DB::getInstance();
-
-            // 2009. 06. 15 자동저장시 module_srl 을 저장
-            if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
-            if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
-
-
-            // 2007. 10. 17 글의 입력(신규 or 수정)이 일어날때마다 자동 저장된 문서를 삭제하는 trigger 추가
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
-
-            // 2007. 10. 23 모듈의 추가 설정에서 에디터 trigger 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
-
-            // 2009. 04. 14 editor component 변환 코드를 trigger로 독립
-            if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
-
-            // 2009. 06. 19 사용하지 않는 트리거 제거
-            if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            $oDB = &DB::getInstance();
-
-            // 자동저장시 module_srl 을 저장 2009.6.15
-            if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
-                $oDB->addColumn("editor_autosave","module_srl","number",11);
-
-            // module_srl을 인덱스로
-            if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
-
-            // 2007. 10. 17 글의 입력(신규 or 수정)이 일어날때마다 자동 저장된 문서를 삭제하는 trigger 추가
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
-                $oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
-                $oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
-
-            // 2007. 10. 23 모듈의 추가 설정에서 에디터 trigger 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
-
-            // 2009. 04. 14 editor component 변환 코드를 trigger로 독립
-            if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
-                $oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
-
-            // 2009. 06. 19 사용하지 않는 트리거 제거
-            if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
-                $oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 에디터 컴포넌트 캐시 파일 삭제
-            FileHandler::removeFilesInDir("./files/cache/editor");
-        }
-    }
-?>
+<?php
+    /**
+     * @class  editor
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the editor odule 
+     **/
+
+    class editor extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+            // Add the default editor component
+            $oEditorController = &getAdminController('editor');
+            $oEditorController->insertComponent('colorpicker_text',true);
+            $oEditorController->insertComponent('colorpicker_bg',true);
+            $oEditorController->insertComponent('emoticon',true);
+            $oEditorController->insertComponent('url_link',true);
+            $oEditorController->insertComponent('image_link',true);
+            $oEditorController->insertComponent('multimedia_link',true);
+            $oEditorController->insertComponent('quotation',true);
+            $oEditorController->insertComponent('table_maker',true);
+            $oEditorController->insertComponent('poll_maker',true);
+            $oEditorController->insertComponent('image_gallery',true);
+            // Create a directory to use in the editor module
+            FileHandler::makeDir('./files/cache/editor');
+            // 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
+            $oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+            $oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+            // 2007. 10. 23 Add an editor trigger on the module addition setup
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
+            // 2009. 04. 14 Add a trigger from compiled codes of the editor component
+            $oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oModuleModel = &getModel('module');
+
+            $oDB = &DB::getInstance();
+            // 2009. 06. 15 Save module_srl when auto-saving
+            if(!$oDB->isColumnExists("editor_autosave","module_srl")) return true;
+            if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) return true;
+
+
+            // 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) return true;
+            // 2007. 10. 23 Add an editor trigger on the module addition setup
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) return true;
+            // 2009. 04. 14 Add a trigger from compiled codes of the editor component
+            if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) return true;
+            // 2009. 06. 19 Remove unused trigger
+            if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+
+            $oDB = &DB::getInstance();
+            // Save module_srl when auto-saving 15/06/2009
+            if(!$oDB->isColumnExists("editor_autosave","module_srl")) 
+                $oDB->addColumn("editor_autosave","module_srl","number",11);
+
+            // create an index on module_srl
+            if(!$oDB->isIndexExists("editor_autosave","idx_module_srl")) $oDB->addIndex("editor_autosave","idx_module_srl", "module_srl");
+
+            // 2007. 10. 17 Add a trigger to delete automatically saved document whenever the document(insert or update) is modified
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
+                $oModuleController->insertTrigger('document.insertDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after')) 
+                $oModuleController->insertTrigger('document.updateDocument', 'editor', 'controller', 'triggerDeleteSavedDoc', 'after');
+            // 2007. 10. Add an editor trigger on the module addition setup
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before')) 
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'editor', 'view', 'triggerDispEditorAdditionSetup', 'before');
+            // 2009. 04. 14 Add a trigger from compiled codes of the editor component
+            if(!$oModuleModel->getTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before')) 
+                $oModuleController->insertTrigger('display', 'editor', 'controller', 'triggerEditorComponentCompile', 'before');
+            // 2009. 06. 19 Remove unused trigger
+            if($oModuleModel->getTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before')) 
+                $oModuleController->deleteTrigger('file.getIsPermitted', 'editor', 'controller', 'triggerSrlSetting', 'before');
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/editor/editor.controller.php b/modules/editor/editor.controller.php
index 4ebad3731..443005077 100644
--- a/modules/editor/editor.controller.php
+++ b/modules/editor/editor.controller.php
@@ -1,457 +1,446 @@
-<?php
-    /**
-     * @class  editor
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor 모듈의 controller class
-     **/
-
-    class editorController extends editor {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 자동 저장
-         **/
-        function procEditorSaveDoc() {
-
-            $this->deleteSavedDoc(false);
-
-            $args->document_srl = Context::get('document_srl');
-            $args->content = Context::get('content');
-            $args->title = Context::get('title');
-            $output = $this->doSaveDoc($args);
-
-            $this->setMessage('msg_auto_saved');
-        }
-
-        /**
-         * @brief 자동저장된 문서 삭제
-         **/
-        function procEditorRemoveSavedDoc() {
-            $oEditorController = &getController('editor');
-            $oEditorController->deleteSavedDoc(true);
-        }
-
-        /**
-         * @brief 컴포넌트에서 ajax요청시 해당 컴포넌트의 method를 실행 
-         **/
-        function procEditorCall() {
-            $component = Context::get('component');
-            $method = Context::get('method');
-            if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
-
-            $oEditorModel = &getModel('editor');
-            $oComponent = &$oEditorModel->getComponentObject($component);
-            if(!$oComponent->toBool()) return $oComponent;
-
-            if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
-
-            //$output = call_user_method($method, $oComponent);
-            //$output = call_user_func(array($oComponent, $method));
-            if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
-            else return new Object(-1,sprintf('%s method is not exists', $method));
-
-            if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
-
-            $this->setError($oComponent->getError());
-            $this->setMessage($oComponent->getMessage());
-
-            $vars = $oComponent->getVariables();
-            if(count($vars)) {
-                foreach($vars as $key=>$val) $this->add($key, $val);
-            }
-        }
-
-        /**
-         * @brief 에디터의 모듈별 추가 확장 폼을 저장
-         **/
-        function procEditorInsertModuleConfig() {
-            $module_srl = Context::get('target_module_srl');
-
-            // 여러개의 모듈 일괄 설정일 경우
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-
-            $editor_config = null;
-
-            $editor_config->editor_skin = Context::get('editor_skin');
-            $editor_config->comment_editor_skin = Context::get('comment_editor_skin');
-            $editor_config->content_style = Context::get('content_style');
-            $editor_config->comment_content_style = Context::get('comment_content_style');
-            $editor_config->content_font = Context::get('content_font');
-            if($editor_config->content_font) {
-                $font_list = array();
-                $fonts = explode(',',$editor_config->content_font);
-                for($i=0,$c=count($fonts);$i<$c;$i++) {
-                    $font = trim(str_replace(array('"','\''),'',$fonts[$i]));
-                    if(!$font) continue;
-                    $font_list[] = $font;
-                }
-                if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
-            }
-            $editor_config->content_font_size = Context::get('content_font_size');
-            $editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
-            $editor_config->sel_comment_editor_colorset = Context::get('sel_comment_editor_colorset');
-
-            $enable_html_grant = trim(Context::get('enable_html_grant'));
-            if($enable_html_grant) $editor_config->enable_html_grant = explode('|@|', $enable_html_grant);
-            else $editor_config->enable_html_grant = array();
-
-            $enable_comment_html_grant = trim(Context::get('enable_comment_html_grant'));
-            if($enable_comment_html_grant) $editor_config->enable_comment_html_grant = explode('|@|', $enable_comment_html_grant);
-            else $editor_config->enable_comment_html_grant = array();
-
-            $upload_file_grant = trim(Context::get('upload_file_grant'));
-            if($upload_file_grant) $editor_config->upload_file_grant = explode('|@|', $upload_file_grant);
-            else $editor_config->upload_file_grant = array();
-
-            $comment_upload_file_grant = trim(Context::get('comment_upload_file_grant'));
-            if($comment_upload_file_grant) $editor_config->comment_upload_file_grant = explode('|@|', $comment_upload_file_grant);
-            else $editor_config->comment_upload_file_grant = array();
-
-            $enable_default_component_grant = trim(Context::get('enable_default_component_grant'));
-            if($enable_default_component_grant) $editor_config->enable_default_component_grant = explode('|@|', $enable_default_component_grant);
-            else $editor_config->enable_default_component_grant = array();
-
-            $enable_comment_default_component_grant = trim(Context::get('enable_comment_default_component_grant'));
-            if($enable_comment_default_component_grant) $editor_config->enable_comment_default_component_grant = explode('|@|', $enable_comment_default_component_grant);
-            else $editor_config->enable_comment_default_component_grant = array();
-
-            $enable_component_grant = trim(Context::get('enable_component_grant'));
-            if($enable_component_grant) $editor_config->enable_component_grant = explode('|@|', $enable_component_grant);
-            else $editor_config->enable_component_grant = array();
-
-            $enable_comment_component_grant = trim(Context::get('enable_comment_component_grant'));
-            if($enable_comment_component_grant) $editor_config->enable_comment_component_grant = explode('|@|', $enable_comment_component_grant);
-            else $editor_config->enable_comment_component_grant = array();
-
-            $editor_config->editor_height = (int)Context::get('editor_height');
-
-            $editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
-
-            $editor_config->enable_autosave = Context::get('enable_autosave');
-
-            if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
-
-            $oModuleController = &getController('module');
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                $oModuleController->insertModulePartConfig('editor',$srl,$editor_config);
-            }
-
-            $this->setError(-1);
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 에디터컴포넌트의 코드를 결과물로 변환 + 문서서식 style 지정
-         **/
-        function triggerEditorComponentCompile(&$content) {
-            if(Context::getResponseMethod()!='HTML') return new Object();
-			if(Mobile::isFromMobilePhone()) return new Object(); 
-
-            $module_info = Context::get('module_info');
-            $module_srl = $module_info->module_srl;
-            if($module_srl) {
-                $oEditorModel = &getModel('editor');
-                $editor_config = $oEditorModel->getEditorConfig($module_srl);
-                $content_style = $editor_config->content_style;
-                if($content_style) {
-                    $path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
-                    if(is_dir($path) && file_exists($path.'style.ini')) {
-                        $ini = file($path.'style.ini');
-                        for($i=0,$c=count($ini);$i<$c;$i++) {
-                            $file = trim($ini[$i]);
-                            if(!$file) continue;
-                            if(preg_match('/\.css$/i',$file)) Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
-                            elseif(preg_match('/\.js/i',$file)) Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
-                        }
-                    }
-                }
-                $content_font = $editor_config->content_font;
-                $content_font_size = $editor_config->content_font_size;
-                if($content_font || $content_font_size) {
-                    $buff = '<style type="text/css"> .xe_content { ';
-                    if($content_font) $buff .= 'font-family:'.$content_font.';';
-                    if($content_font_size) $buff .= 'font-size:'.$content_font_size.';';
-                    $buff .= ' }; </style>';
-                    Context::addHtmlHeader($buff);
-                }
-            }
-
-            $content = $this->transComponent($content);
-			return new Object();
-        }
-
-        /**
-         * @brief 에디터 컴포넌트코드를 결과물로 변환
-         **/
-        function transComponent($content) {
-            $content = preg_replace_callback('!<div([^\>]*)editor_component=([^\>]*)>(.*?)\<\/div\>!is', array($this,'transEditorComponent'), $content);
-            $content = preg_replace_callback('!<img([^\>]*)editor_component=([^\>]*?)\>!is', array($this,'transEditorComponent'), $content);
-            return $content;
-        }
-
-        /**
-         * @brief 내용의 에디터 컴포넌트 코드를 변환
-         **/
-        function transEditorComponent($matches) {
-            $script = sprintf(' %s editor_component=%s', $matches[1], $matches[2]);
-            $script = preg_replace_callback('/([^=^"^ ]*)=([^ ^>]*)/i', fixQuotation, $script);
-            preg_match_all('/([a-z0-9\-\_]+)\=\"([^\"]+)\"/is', $script, $m);
-            for($i=0,$c=count($m[0]);$i<$c;$i++) {
-                $xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
-            }
-            $xml_obj->body = $matches[3];
-
-            if(!$xml_obj->attrs->editor_component) return $matches[0];
-
-            // component::transHTML() 을 이용하여 변환된 코드를 받음
-            $oEditorModel = &getModel('editor');
-            $oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
-            if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $matches[0];
-
-            return $oComponent->transHTML($xml_obj);
-        }
-
-
-        /**
-         * @brief 자동 저장
-         **/
-        function doSaveDoc($args) {
-
-            if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                $args->member_srl = $logged_info->member_srl;
-            } else {
-                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            }
-            // module_srl이 없으면 현재 모듈
-            if(!$args->module_srl) {
-                $args->module_srl = Context::get('module_srl');
-            }
-            if(!$args->module_srl) {
-                $current_module_info = Context::get('current_module_info');
-                $args->module_srl = $current_module_info->module_srl;
-            }
-
-            // 저장
-            return executeQuery('editor.insertSavedDoc', $args);
-        }
-
-        /**
-          * @brief 자동 저장글 Srl 로드 - XE 이전 버전 사용자를 위함.
-         **/
-        function procEditorLoadSavedDocument() {
-            $editor_sequence = Context::get('editor_sequence');
-            $primary_key = Context::get('primary_key');
-            $oEditorModel = &getModel('editor');
-            $oFileController = &getController('file');
-
-            $saved_doc = $oEditorModel->getSavedDoc(null);
-
-            $oFileController->setUploadInfo($editor_sequence, $saved_doc->document_srl);
-            $vars = $this->getVariables();
-            $this->add("editor_sequence", $editor_sequence);
-            $this->add("key", $primary_key);
-            $this->add("title", $saved_doc->title);
-            $this->add("content", $saved_doc->content);
-            $this->add("document_srl", $saved_doc->document_srl);
-        }
-
-
-        /**
-         * @brief 게시글의 입력/수정이 일어났을 경우 자동 저장문서를 제거하는 trigger
-         **/
-        function triggerDeleteSavedDoc(&$obj) {
-            $this->deleteSavedDoc(false);
-            return new Object();
-        }
-
-        /**
-         * @brief 자동 저장된 글을 삭제
-         * 현재 접속한 사용자를 기준
-         **/
-        function deleteSavedDoc($mode = false) {
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                $args->member_srl = $logged_info->member_srl;
-            } else {
-                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            }
-            $args->module_srl = Context::get('module_srl');
-            // module_srl이 없으면 현재 모듈
-            if(!$args->module_srl) {
-                $current_module_info = Context::get('current_module_info');
-                $args->module_srl = $current_module_info->module_srl;
-            }
-
-            // 자동저장된 값이 혹시 이미 등록된 글인지 확인
-            $output = executeQuery('editor.getSavedDocument', $args);
-            $saved_doc = $output->data;
-            if(!$saved_doc) return;
-
-            $oDocumentModel = &getModel('document');
-            $oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-            if(!$oSaved->isExists()) {
-                if($mode) {
-                    $output = executeQuery('editor.getSavedDocument', $args);
-                    $output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $saved_doc);
-                }
-            }
-
-            // 일단 이전 저장본 삭제
-            return executeQuery('editor.deleteSavedDoc', $args);
-        }
-
-        /**
-         * @brief 가상 사이트에서 사용된 에디터 컴포넌트 정보를 제거
-         **/
-        function removeEditorConfig($site_srl) {
-            $args->site_srl = $site_srl;
-            executeQuery('editor.deleteSiteComponent', $args);
-        }
-
-        /**
-         * @brief 에디터 컴포넌트 목록 캐싱 (editorModel::getComponentList)
-         * 에디터 컴포넌트 목록의 경우 DB query + Xml Parsing 때문에 캐싱 파일을 이용하도록 함
-         **/
-        function makeCache($filter_enabled = true, $site_srl) {
-            $oEditorModel = &getModel('editor');
-
-            if($filter_enabled) $args->enabled = "Y";
-
-            if($site_srl) {
-                $args->site_srl = $site_srl;
-                $output = executeQuery('editor.getSiteComponentList', $args);
-            } else $output = executeQuery('editor.getComponentList', $args);
-            $db_list = $output->data;
-
-            // 파일목록을 구함
-            $downloaded_list = FileHandler::readDir(_XE_PATH_.'modules/editor/components');
-
-            // 로그인 여부 및 소속 그룹 구함
-            $is_logged = Context::get('is_logged');
-            if($is_logged) {
-                $logged_info = Context::get('logged_info');
-                if($logged_info->group_list && is_array($logged_info->group_list)) {
-                    $group_list = array_keys($logged_info->group_list);
-                } else $group_list = array();
-            }
-
-            // DB 목록을 loop돌면서 xml정보까지 구함
-            if(!is_array($db_list)) $db_list = array($db_list);
-            foreach($db_list as $component) {
-                if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
-
-                $component_name = $component->component_name;
-                if(!$component_name) continue;
-
-                if(!in_array($component_name, $downloaded_list)) continue;
-
-                unset($xml_info);
-                $xml_info = $oEditorModel->getComponentXmlInfo($component_name);
-                $xml_info->enabled = $component->enabled;
-
-                if($component->extra_vars) {
-                    $extra_vars = unserialize($component->extra_vars);
-					if($extra_vars->target_group) {
-						$xml_info->target_group = $extra_vars->target_group;	
-					}
-
-					if($extra_vars->mid_list && count($extra_vars->mid_list))
-					{
-						$xml_info->mid_list = $extra_vars->mid_list;
-					}
-					/*
-                    // 사용권한이 있으면 권한 체크
-                    if($extra_vars->target_group) {
-                        // 사용권한이 체크되어 있는데 로그인이 되어 있지 않으면 무조건 사용 중지
-                        if(!$is_logged) continue;
-
-                        // 대상 그룹을 구해서 현재 로그인 사용자의 그룹과 비교
-                        $target_group = $extra_vars->target_group;
-                        unset($extra_vars->target_group);
-
-                        $is_granted = false;
-                        foreach($group_list as $group_srl) {
-                            if(in_array($group_srl, $target_group)) {
-                                $is_granted = true;
-                                break;
-                            }
-                        }
-                        if(!$is_granted) continue;
-                    }
-
-                    // 대상 모듈이 있으면 체크
-                    if($extra_vars->mid_list && count($extra_vars->mid_list) && Context::get('mid')) {
-                        if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
-                    }*/
-
-                    // 에디터 컴포넌트의 설정 정보를 체크
-                    if($xml_info->extra_vars) {
-                        foreach($xml_info->extra_vars as $key => $val) {
-                            $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
-                        }
-                    }
-                }
-
-                $component_list->{$component_name} = $xml_info;
-
-                // 버튼, 아이콘 이미지 구함
-                $icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
-                $component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
-                if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
-                if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
-            }
-
-            // enabled만 체크하도록 하였으면 그냥 return
-            if($filter_enabled) {
-                $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
-                FileHandler::writeFile($cache_file, $buff);
-                return $component_list;
-            }
-
-            // 다운로드된 목록의 xml_info를 마저 구함
-            foreach($downloaded_list as $component_name) {
-                if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
-
-                // 설정된 것이라면 패스
-                if($component_list->{$component_name}) continue;
-
-                // DB에 입력
-                $oEditorController = &getAdminController('editor');
-                $oEditorController->insertComponent($component_name, false, $site_srl);
-
-                // component_list에 추가
-                unset($xml_info);
-                $xml_info = $oEditorModel->getComponentXmlInfo($component_name);
-                $xml_info->enabled = 'N';
-
-                $component_list->{$component_name} = $xml_info;
-            }
-
-            $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
-            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
-            FileHandler::writeFile($cache_file, $buff);
-
-            return $component_list;
-        }
-
-        /**
-         * @brief 캐시 파일 삭제
-         **/
-        function removeCache($site_srl = 0) {
-            $oEditorModel = &getModel('editor');
-            FileHandler::removeFile($oEditorModel->getCacheFile(true, $site_srl));
-            FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
-        }
-    }
-?>
+<?php
+    /**
+     * @class  editor
+     * @author NHN (developers@xpressengine.com)
+     * @brief editor module's controller class
+     **/
+
+    class editorController extends editor {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief AutoSave
+         **/
+        function procEditorSaveDoc() {
+
+            $this->deleteSavedDoc(false);
+
+            $args->document_srl = Context::get('document_srl');
+            $args->content = Context::get('content');
+            $args->title = Context::get('title');
+            $output = $this->doSaveDoc($args);
+
+            $this->setMessage('msg_auto_saved');
+        }
+
+        /**
+         * @brief Delete autosaved documents
+         **/
+        function procEditorRemoveSavedDoc() {
+            $oEditorController = &getController('editor');
+            $oEditorController->deleteSavedDoc(true);
+        }
+
+        /**
+         * @brief Execute a method of the component when the component requests ajax
+         **/
+        function procEditorCall() {
+            $component = Context::get('component');
+            $method = Context::get('method');
+            if(!$component) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+
+            $oEditorModel = &getModel('editor');
+            $oComponent = &$oEditorModel->getComponentObject($component);
+            if(!$oComponent->toBool()) return $oComponent;
+
+            if(!method_exists($oComponent, $method)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+
+            //$output = call_user_method($method, $oComponent);
+            //$output = call_user_func(array($oComponent, $method));
+            if(method_exists($oComponent, $method)) $output = $oComponent->{$method}();
+            else return new Object(-1,sprintf('%s method is not exists', $method));
+
+            if((is_a($output, 'Object') || is_subclass_of($output, 'Object')) && !$output->toBool()) return $output;
+
+            $this->setError($oComponent->getError());
+            $this->setMessage($oComponent->getMessage());
+
+            $vars = $oComponent->getVariables();
+            if(count($vars)) {
+                foreach($vars as $key=>$val) $this->add($key, $val);
+            }
+        }
+
+        /**
+         * @brief Save Editor's additional form for each module
+         **/
+        function procEditorInsertModuleConfig() {
+            $module_srl = Context::get('target_module_srl');
+            // To configure many of modules at once
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+
+            $editor_config = null;
+
+            $editor_config->editor_skin = Context::get('editor_skin');
+            $editor_config->comment_editor_skin = Context::get('comment_editor_skin');
+            $editor_config->content_style = Context::get('content_style');
+            $editor_config->comment_content_style = Context::get('comment_content_style');
+            $editor_config->content_font = Context::get('content_font');
+            if($editor_config->content_font) {
+                $font_list = array();
+                $fonts = explode(',',$editor_config->content_font);
+                for($i=0,$c=count($fonts);$i<$c;$i++) {
+                    $font = trim(str_replace(array('"','\''),'',$fonts[$i]));
+                    if(!$font) continue;
+                    $font_list[] = $font;
+                }
+                if(count($font_list)) $editor_config->content_font = '"'.implode('","',$font_list).'"';
+            }
+            $editor_config->content_font_size = Context::get('content_font_size');
+            $editor_config->sel_editor_colorset = Context::get('sel_editor_colorset');
+            $editor_config->sel_comment_editor_colorset = Context::get('sel_comment_editor_colorset');
+
+            $enable_html_grant = trim(Context::get('enable_html_grant'));
+            if($enable_html_grant) $editor_config->enable_html_grant = explode('|@|', $enable_html_grant);
+            else $editor_config->enable_html_grant = array();
+
+            $enable_comment_html_grant = trim(Context::get('enable_comment_html_grant'));
+            if($enable_comment_html_grant) $editor_config->enable_comment_html_grant = explode('|@|', $enable_comment_html_grant);
+            else $editor_config->enable_comment_html_grant = array();
+
+            $upload_file_grant = trim(Context::get('upload_file_grant'));
+            if($upload_file_grant) $editor_config->upload_file_grant = explode('|@|', $upload_file_grant);
+            else $editor_config->upload_file_grant = array();
+
+            $comment_upload_file_grant = trim(Context::get('comment_upload_file_grant'));
+            if($comment_upload_file_grant) $editor_config->comment_upload_file_grant = explode('|@|', $comment_upload_file_grant);
+            else $editor_config->comment_upload_file_grant = array();
+
+            $enable_default_component_grant = trim(Context::get('enable_default_component_grant'));
+            if($enable_default_component_grant) $editor_config->enable_default_component_grant = explode('|@|', $enable_default_component_grant);
+            else $editor_config->enable_default_component_grant = array();
+
+            $enable_comment_default_component_grant = trim(Context::get('enable_comment_default_component_grant'));
+            if($enable_comment_default_component_grant) $editor_config->enable_comment_default_component_grant = explode('|@|', $enable_comment_default_component_grant);
+            else $editor_config->enable_comment_default_component_grant = array();
+
+            $enable_component_grant = trim(Context::get('enable_component_grant'));
+            if($enable_component_grant) $editor_config->enable_component_grant = explode('|@|', $enable_component_grant);
+            else $editor_config->enable_component_grant = array();
+
+            $enable_comment_component_grant = trim(Context::get('enable_comment_component_grant'));
+            if($enable_comment_component_grant) $editor_config->enable_comment_component_grant = explode('|@|', $enable_comment_component_grant);
+            else $editor_config->enable_comment_component_grant = array();
+
+            $editor_config->editor_height = (int)Context::get('editor_height');
+
+            $editor_config->comment_editor_height = (int)Context::get('comment_editor_height');
+
+            $editor_config->enable_autosave = Context::get('enable_autosave');
+
+            if($editor_config->enable_autosave != 'Y') $editor_config->enable_autosave = 'N';
+
+            $oModuleController = &getController('module');
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                $oModuleController->insertModulePartConfig('editor',$srl,$editor_config);
+            }
+
+            $this->setError(-1);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief convert editor component codes to be returned and specify content style.
+         **/
+        function triggerEditorComponentCompile(&$content) {
+            if(Context::getResponseMethod()!='HTML') return new Object();
+			if(Mobile::isFromMobilePhone()) return new Object(); 
+
+            $module_info = Context::get('module_info');
+            $module_srl = $module_info->module_srl;
+            if($module_srl) {
+                $oEditorModel = &getModel('editor');
+                $editor_config = $oEditorModel->getEditorConfig($module_srl);
+                $content_style = $editor_config->content_style;
+                if($content_style) {
+                    $path = _XE_PATH_.'modules/editor/styles/'.$content_style.'/';
+                    if(is_dir($path) && file_exists($path.'style.ini')) {
+                        $ini = file($path.'style.ini');
+                        for($i=0,$c=count($ini);$i<$c;$i++) {
+                            $file = trim($ini[$i]);
+                            if(!$file) continue;
+                            if(preg_match('/\.css$/i',$file)) Context::addCSSFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
+                            elseif(preg_match('/\.js/i',$file)) Context::addJsFile('./modules/editor/styles/'.$content_style.'/'.$file, false);
+                        }
+                    }
+                }
+                $content_font = $editor_config->content_font;
+                $content_font_size = $editor_config->content_font_size;
+                if($content_font || $content_font_size) {
+                    $buff = '<style type="text/css"> .xe_content { ';
+                    if($content_font) $buff .= 'font-family:'.$content_font.';';
+                    if($content_font_size) $buff .= 'font-size:'.$content_font_size.';';
+                    $buff .= ' }; </style>';
+                    Context::addHtmlHeader($buff);
+                }
+            }
+
+            $content = $this->transComponent($content);
+			return new Object();
+        }
+
+        /**
+         * @brief Convert editor component codes to be returned
+         **/
+        function transComponent($content) {
+            $content = preg_replace_callback('!<(?:(div)|img)([^>]*)editor_component=([^>]*)>(?(1)(.*?)</div>)!is', array($this,'transEditorComponent'), $content);
+            return $content;
+        }
+
+        /**
+         * @brief Convert editor component code of the contents
+         **/
+        function transEditorComponent($match) {
+            $script = " {$match[2]} editor_component={$match[3]}";
+            $script = preg_replace('/([\w:-]+)\s*=(?:\s*(["\']))?((?(2).*?|[^ ]+))\2/i', '\1="\3"', $script);
+            preg_match_all('/([a-z0-9_-]+)="([^"]+)"/is', $script, $m);
+
+			$xml_obj = new stdClass;
+            for($i=0,$c=count($m[0]);$i<$c;$i++) {
+                $xml_obj->attrs->{$m[1][$i]} = $m[2][$i];
+            }
+            $xml_obj->body = $match[4];
+
+            if(!$xml_obj->attrs->editor_component) return $match[0];
+            // Get converted codes by using component::transHTML()
+            $oEditorModel = &getModel('editor');
+            $oComponent = &$oEditorModel->getComponentObject($xml_obj->attrs->editor_component, 0);
+            if(!is_object($oComponent)||!method_exists($oComponent, 'transHTML')) return $match[0];
+
+            return $oComponent->transHTML($xml_obj);
+        }
+
+
+        /**
+         * @brief AutoSave
+         **/
+        function doSaveDoc($args) {
+
+            if(!$args->document_srl) $args->document_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                $args->member_srl = $logged_info->member_srl;
+            } else {
+                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            }
+            // Get the current module if module_srl doesn't exist
+            if(!$args->module_srl) {
+                $args->module_srl = Context::get('module_srl');
+            }
+            if(!$args->module_srl) {
+                $current_module_info = Context::get('current_module_info');
+                $args->module_srl = $current_module_info->module_srl;
+            }
+            // Save
+            return executeQuery('editor.insertSavedDoc', $args);
+        }
+
+        /**
+          * @brief Load the srl of autosaved document - for those who uses XE older versions.
+         **/
+        function procEditorLoadSavedDocument() {
+            $editor_sequence = Context::get('editor_sequence');
+            $primary_key = Context::get('primary_key');
+            $oEditorModel = &getModel('editor');
+            $oFileController = &getController('file');
+
+            $saved_doc = $oEditorModel->getSavedDoc(null);
+
+            $oFileController->setUploadInfo($editor_sequence, $saved_doc->document_srl);
+            $vars = $this->getVariables();
+            $this->add("editor_sequence", $editor_sequence);
+            $this->add("key", $primary_key);
+            $this->add("title", $saved_doc->title);
+            $this->add("content", $saved_doc->content);
+            $this->add("document_srl", $saved_doc->document_srl);
+        }
+
+
+        /**
+         * @brief A trigger to remove auto-saved document when inserting/updating the document
+         **/
+        function triggerDeleteSavedDoc(&$obj) {
+            $this->deleteSavedDoc(false);
+            return new Object();
+        }
+
+        /**
+         * @brief Delete the auto-saved document
+         * Based on the current logged-in user
+         **/
+        function deleteSavedDoc($mode = false) {
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                $args->member_srl = $logged_info->member_srl;
+            } else {
+                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            }
+            $args->module_srl = Context::get('module_srl');
+            // Get the current module if module_srl doesn't exist
+            if(!$args->module_srl) {
+                $current_module_info = Context::get('current_module_info');
+                $args->module_srl = $current_module_info->module_srl;
+            }
+            // Check if the auto-saved document already exists
+            $output = executeQuery('editor.getSavedDocument', $args);
+            $saved_doc = $output->data;
+            if(!$saved_doc) return;
+
+            $oDocumentModel = &getModel('document');
+            $oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
+            if(!$oSaved->isExists()) {
+                if($mode) {
+                    $output = executeQuery('editor.getSavedDocument', $args);
+                    $output = ModuleHandler::triggerCall('editor.deleteSavedDoc', 'after', $saved_doc);
+                }
+            }
+            // Delete the saved document
+            return executeQuery('editor.deleteSavedDoc', $args);
+        }
+
+        /**
+         * @brief ERemove editor component information used on the virtual site
+         **/
+        function removeEditorConfig($site_srl) {
+            $args->site_srl = $site_srl;
+            executeQuery('editor.deleteSiteComponent', $args);
+        }
+
+        /**
+         * @brief Caching a list of editor component (editorModel::getComponentList)
+         * For the editor component list, use a caching file because of DB query and Xml parsing
+         **/
+        function makeCache($filter_enabled = true, $site_srl) {
+            $oEditorModel = &getModel('editor');
+
+            if($filter_enabled) $args->enabled = "Y";
+
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('editor.getSiteComponentList', $args);
+            } else $output = executeQuery('editor.getComponentList', $args);
+            $db_list = $output->data;
+            // Get a list of files
+            $downloaded_list = FileHandler::readDir(_XE_PATH_.'modules/editor/components');
+            // Get information about log-in status and its group
+            $is_logged = Context::get('is_logged');
+            if($is_logged) {
+                $logged_info = Context::get('logged_info');
+                if($logged_info->group_list && is_array($logged_info->group_list)) {
+                    $group_list = array_keys($logged_info->group_list);
+                } else $group_list = array();
+            }
+            // Get xml information for looping DB list
+            if(!is_array($db_list)) $db_list = array($db_list);
+            foreach($db_list as $component) {
+                if(in_array($component->component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+
+                $component_name = $component->component_name;
+                if(!$component_name) continue;
+
+                if(!in_array($component_name, $downloaded_list)) continue;
+
+                unset($xml_info);
+                $xml_info = $oEditorModel->getComponentXmlInfo($component_name);
+                $xml_info->enabled = $component->enabled;
+
+                if($component->extra_vars) {
+                    $extra_vars = unserialize($component->extra_vars);
+					if($extra_vars->target_group) {
+						$xml_info->target_group = $extra_vars->target_group;	
+					}
+
+					if($extra_vars->mid_list && count($extra_vars->mid_list))
+					{
+						$xml_info->mid_list = $extra_vars->mid_list;
+					}
+					/*
+                    // Permisshin check if you are granted
+                    if($extra_vars->target_group) {
+                        // Stop using if not logged-in
+                        if(!$is_logged) continue;
+                        // Compare a target group with the current logged-in user group
+                        $target_group = $extra_vars->target_group;
+                        unset($extra_vars->target_group);
+
+                        $is_granted = false;
+                        foreach($group_list as $group_srl) {
+                            if(in_array($group_srl, $target_group)) {
+                                $is_granted = true;
+                                break;
+                            }
+                        }
+                        if(!$is_granted) continue;
+                    }
+                    // Check if the target module exists
+                    if($extra_vars->mid_list && count($extra_vars->mid_list) && Context::get('mid')) {
+                        if(!in_array(Context::get('mid'), $extra_vars->mid_list)) continue;
+                    }*/
+                    // Check the configuration of the editor component
+                    if($xml_info->extra_vars) {
+                        foreach($xml_info->extra_vars as $key => $val) {
+                            $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
+                        }
+                    }
+                }
+
+                $component_list->{$component_name} = $xml_info;
+                // Get buttons, icons, images
+                $icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/icon.gif';
+                $component_icon_file = _XE_PATH_.'modules/editor/components/'.$component_name.'/component_icon.gif';
+                if(file_exists($icon_file)) $component_list->{$component_name}->icon = true;
+                if(file_exists($component_icon_file)) $component_list->{$component_name}->component_icon = true;
+            }
+            // Return if it checks enabled only
+            if($filter_enabled) {
+                $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
+                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+                FileHandler::writeFile($cache_file, $buff);
+                return $component_list;
+            }
+            // Get xml_info of downloaded list
+            foreach($downloaded_list as $component_name) {
+                if(in_array($component_name, array('colorpicker_text','colorpicker_bg'))) continue;
+                // Pass if configured
+                if($component_list->{$component_name}) continue;
+                // Insert data into the DB
+                $oEditorController = &getAdminController('editor');
+                $oEditorController->insertComponent($component_name, false, $site_srl);
+                // Add to component_list
+                unset($xml_info);
+                $xml_info = $oEditorModel->getComponentXmlInfo($component_name);
+                $xml_info->enabled = 'N';
+
+                $component_list->{$component_name} = $xml_info;
+            }
+
+            $cache_file = $oEditorModel->getCacheFile($filter_enabled, $site_srl);
+            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit(); $component_list = unserialize("%s"); ?>', str_replace('"','\\"',serialize($component_list)));
+            FileHandler::writeFile($cache_file, $buff);
+
+            return $component_list;
+        }
+
+        /**
+         * @brief Delete cache files
+         **/
+        function removeCache($site_srl = 0) {
+            $oEditorModel = &getModel('editor');
+            FileHandler::removeFile($oEditorModel->getCacheFile(true, $site_srl));
+            FileHandler::removeFile($oEditorModel->getCacheFile(false, $site_srl));
+        }
+    }
+?>
diff --git a/modules/editor/editor.model.php b/modules/editor/editor.model.php
index d115c5ef1..6a15b58d4 100644
--- a/modules/editor/editor.model.php
+++ b/modules/editor/editor.model.php
@@ -1,806 +1,769 @@
-<?php
-    /**
-     * @class  editorModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor 모듈의 model 클래스
-     **/
-
-    class editorModel extends editor {
-
-        var $loaded_component_list = array();
-
-        /**
-         * @brief 에디터를 return
-         *
-         * 에디터의 경우 내부적으로 1~30까지의 임시 editor_seuqnece를 생성한다.
-         * 즉 한페이지에 30개 이상의 에디터를 출력하지는 못하도록 제한되어 있다.
-         *
-         * 단, 수정하는 경우 또는 파일업로드를 한 자동저장본의 경우는 getNextSequence() 값으로 저장된 editor_seqnece가
-         * 설정된다.
-         **/
-
-        /**
-         * @brief 모듈별 에디터 설정을 return
-         **/
-        function getEditorConfig($module_srl) {
-            if(!$GLOBALS['__editor_module_config__'][$module_srl]) {
-                // 선택된 모듈의 trackback설정을 가져옴
-                $oModuleModel = &getModel('module');
-                $GLOBALS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl);
-            }
-
-            $editor_config = $GLOBALS['__editor_module_config__'][$module_srl];
-
-            if(!is_object($editor_config)) $editor_config = null;
-
-            if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
-            if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
-            if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
-            if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
-            if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
-            if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
-            if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
-            if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
-
-            if(!$editor_config->editor_height) $editor_config->editor_height = 500;
-            if(!$editor_config->comment_editor_height) $editor_config->comment_editor_height = 120;
-            if($editor_config->enable_autosave!='N') $editor_config->enable_autosave = "Y";
-
-            if(!$editor_config->editor_skin) $editor_config->editor_skin = 'xpresseditor';
-            if(!$editor_config->comment_editor_skin) $editor_config->comment_editor_skin = 'xpresseditor';
-            if(!$editor_config->content_style) $editor_config->content_style = 'default';
-
-            return $editor_config;
-        }
-
-		function loadDrComponents(){
-			$drComponentPath = './modules/editor/skins/dreditor/drcomponents/';
-            $drComponentList = FileHandler::readDir($drComponentPath);
-
-			$oTemplate = &TemplateHandler::getInstance();
-
-			$drComponentInfo = array();
-			if($drComponentList){
-				foreach($drComponentList as $i => $drComponent){
-					unset($obj);
-					$obj = $this->getDrComponentXmlInfo($drComponent);
-					Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent));					
-					$path = sprintf('%s%s/tpl/',$drComponentPath,$drComponent);
-					$obj->html = $oTemplate->compile($path,$drComponent);
-					$drComponentInfo[$drComponent] = $obj;
-				}
-			}
-			Context::set('drComponentList',$drComponentInfo);
-		}
-
-		function getDrComponentXmlInfo($drComponentName){
-			$lang_type = Context::getLangType();
-
-            // 요청된 컴포넌트의 xml파일 위치를 구함
-            $component_path = sprintf('%s/skins/dreditor/drcomponents/%s/', $this->module_path, $drComponentName);
-
-            $xml_file = sprintf('%sinfo.xml', $component_path);
-            $cache_file = sprintf('./files/cache/editor/dr_%s.%s.php', $drComponentName, $lang_type);
-
-            // 캐시된 xml파일이 있으면 include 후 정보 return
-            if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file)) {
-                include($cache_file);
-                return $xml_info;
-            }
-
-            // 캐시된 파일이 없으면 파싱후 캐싱 후 return
-            $oParser = new XmlParser();
-            $xml_doc = $oParser->loadXmlFile($xml_file);
-
-			$component_info->component_name = $drComponentName;
-			$component_info->title = $xml_doc->component->title->body;
-			$component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
-			$component_info->version = $xml_doc->component->version->body;
-			$component_info->date = $xml_doc->component->date->body;
-			$component_info->homepage = $xml_doc->component->link->body;
-			$component_info->license = $xml_doc->component->license->body;
-			$component_info->license_link = $xml_doc->component->license->attrs->link;
-
-			$buff = '<?php if(!defined("__ZBXE__")) exit(); ';
-			$buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
-			$buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
-			$buff .= sprintf('$xml_info->description = "%s";', $component_info->description);
-			$buff .= sprintf('$xml_info->version = "%s";', $component_info->version);
-			$buff .= sprintf('$xml_info->date = "%s";', $component_info->date);
-			$buff .= sprintf('$xml_info->homepage = "%s";', $component_info->homepage);
-			$buff .= sprintf('$xml_info->license = "%s";', $component_info->license);
-			$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
-
-			// 작성자 정보
-			if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
-			else $author_list = $xml_doc->component->author;
-
-			for($i=0; $i < count($author_list); $i++) {
-				$buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
-				$buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
-				$buff .= sprintf('$xml_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
-			}
-
-			// history
-			if($xml_doc->component->history) {
-				if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history;
-				else $history_list = $xml_doc->component->history;
-
-				for($i=0; $i < count($history_list); $i++) {
-					unset($obj);
-					sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-					$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-					$buff .= sprintf('$xml_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
-					$buff .= sprintf('$xml_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
-					$buff .= sprintf('$xml_info->history['.$i.']->date = "%s";', $date);
-
-					if($history_list[$i]->author) {
-						(!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
-
-						for($j=0; $j < count($obj->author_list); $j++) {
-							$buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
-							$buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
-							$buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
-						}
-					}
-
-					if($history_list[$i]->log) {
-						(!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
-
-						for($j=0; $j < count($obj->log_list); $j++) {
-							$buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
-							$buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
-						}
-					}
-				}
-			}
-
-           // 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능)
-            $extra_vars = $xml_doc->component->extra_vars->var;
-            if($extra_vars) {
-                if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-                foreach($extra_vars as $key => $val) {
-                    unset($obj);
-                    $key = $val->attrs->name;
-                    $title = $val->title->body;
-                    $description = $val->description->body;
-                    $xml_info->extra_vars->{$key}->title = $title;
-                    $xml_info->extra_vars->{$key}->description = $description;
-
-                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'title', $title);
-                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'description', $description);
-                }
-            }
-
-            $buff .= ' ?>';
-
-            FileHandler::writeFile($cache_file, $buff, "w");
-
-			unset($xml_info);
-            include($cache_file);
-            return $xml_info;
-		}
-
-        /**
-         * @brief 에디터 template을 return
-         * upload_target_srl은 글의 수정시 호출하면 됨.
-         * 이 upload_target_srl은 첨부파일의 유무를 체크하기 위한 루틴을 구현하는데 사용됨.
-         **/
-        function getEditor($upload_target_srl = 0, $option = null) {
-            /**
-             * 기본적인 에디터의 옵션을 정리
-             **/
-            // 파일 업로드 유무 옵션 설정
-            if(!$option->allow_fileupload) $allow_fileupload = false;
-            else $allow_fileupload = true;
-
-            // content_style 세팅
-            if(!$option->content_style) $option->content_style = 'default';
-            Context::set('content_style', $option->content_style);
-
-            // 기본 글꼴 지정
-            Context::set('content_font', $option->content_font);
-            Context::set('content_font_size', $option->content_font_size);
-
-            // 자동 저장 유무 옵션 설정 글 수정시는 사용 안함
-            if(!$option->enable_autosave) $enable_autosave = false;
-            elseif(Context::get($option->primary_key_name)) $enable_autosave = false;
-            else $enable_autosave = true;
-
-            // 기본 에디터 컴포넌트 사용 설정
-            if(!$option->enable_default_component) $enable_default_component = false;
-            else $enable_default_component = true;
-
-            // 확장 컴포넌트 사용 설정
-            if(!$option->enable_component) $enable_component = false;
-            else $enable_component = true;
-
-            // html 모드 조절
-            if($option->disable_html) $html_mode = false;
-            else $html_mode = true;
-
-            // 높이 설정
-            if(!$option->height) $editor_height = 400;
-            else $editor_height = $option->height;
-
-            // 스킨 설정
-            $skin = $option->skin;
-            if(!$skin) $skin = 'xpresseditor';
-
-            $colorset = $option->colorset;
-            Context::set('colorset', $colorset);
-            Context::set('skin', $skin);
-
-			if($skin=='dreditor'){
-				$this->loadDrComponents();	
-			}
-
-            /**
-             * 자동백업 기능 체크 (글 수정일 경우는 사용하지 않음)
-             **/
-            if($enable_autosave) {
-                // 자동 저장된 데이터를 추출
-                $saved_doc = $this->getSavedDoc($upload_target_srl);
-
-                // 자동 저장 데이터를 context setting
-                Context::set('saved_doc', $saved_doc);
-            }
-            Context::set('enable_autosave', $enable_autosave);
-
-            /**
-             * 에디터의 고유 번호 추출 (한 페이지에 여러개의 에디터를 출력하는 경우를 대비)
-             **/
-            if($option->editor_sequence) $editor_sequence = $option->editor_sequence;
-            else {
-                if(!$GLOBALS['_editor_sequence_']) $GLOBALS['_editor_sequence_'] = 1;
-                $editor_sequence = $GLOBALS['_editor_sequence_'] ++;
-            }
-
-            /**
-             * 업로드 활성화시 내부적으로 file 모듈의 환경설정을 이용하여 설정
-             **/
-            $files_count = 0;
-            if($allow_fileupload) {
-                $oFileModel = &getModel('file');
-
-                // SWFUploader에 세팅할 업로드 설정 구함
-                $file_config = $oFileModel->getUploadConfig();
-                $file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
-                $file_config->allowed_filesize = $file_config->allowed_filesize*1024*1024;
-
-                Context::set('file_config',$file_config);
-
-                // 업로드 가능 용량등에 대한 정보를 세팅
-                $upload_status = $oFileModel->getUploadStatus();
-                Context::set('upload_status', $upload_status);
-
-                // upload가능하다고 설정 (내부적으로 캐싱하여 처리)
-                $oFileController = &getController('file');
-                $oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
-
-                // 이미 등록된 파일이 있는지 검사
-                if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
-            }
-            Context::set('files_count', (int)$files_count);
-
-            Context::set('allow_fileupload', $allow_fileupload);
-
-            // 에디터 동작을 위한 editor_sequence값 설정
-            Context::set('editor_sequence', $editor_sequence);
-
-            // 파일 첨부 관련 행동을 하기 위해 문서 번호를 upload_target_srl로 설정
-            // 신규문서일 경우 upload_target_srl=0 이고 첨부파일 관련 동작이 요청될때 이 값이 변경됨
-            Context::set('upload_target_srl', $upload_target_srl);
-
-            // 문서 혹은 댓글의 primary key값을 세팅한다.
-            Context::set('editor_primary_key_name', $option->primary_key_name);
-
-            // 내용을 sync 맞추기 위한 content column name을 세팅한다
-            Context::set('editor_content_key_name', $option->content_key_name);
-
-
-            /**
-             * 에디터 컴포넌트 체크
-             **/
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = (int)$site_module_info->site_srl;
-            if($enable_component) {
-                if(!Context::get('component_list')) {
-                    $component_list = $this->getComponentList(true, $site_srl);
-                    Context::set('component_list', $component_list);
-                }
-            }
-            Context::set('enable_component', $enable_component);
-            Context::set('enable_default_component', $enable_default_component);
-
-            /**
-             * html_mode 가능한지 변수 설정
-             **/
-            Context::set('html_mode', $html_mode);
-
-            /**
-             * 에디터 세로 크기 설정
-             **/
-            Context::set('editor_height', $editor_height);
-
-            // 에디터의 초기화를 수동으로하는 것에 대한 값 체크
-            Context::set('editor_manual_start', $option->manual_start);
-
-            /**
-             * 템플릿을 미리 컴파일해서 컴파일된 소스를 하기 위해 스킨의 경로를 설정
-             ?**/
-            $tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
-            $tpl_file = 'editor.html';
-
-            if(!file_exists($tpl_path.$tpl_file)) {
-                $skin = 'xpresseditor';
-                $tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
-            }
-            Context::set('editor_path', $tpl_path);
-
-			// load editor skin lang
-			Context::loadLang($tpl_path.'lang');
-
-            // tpl 파일을 compile한 결과를 return
-            $oTemplate = new TemplateHandler();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 모듈별 설정이 반영된 에디터 template을 return
-         * getEditor() 와 동일한 결과물을 return하지만 getModuleEditor()는 각 모듈별 추가 설정을 통해 직접 제어되는 설정을 이용하여 에디터를 생성함
-         *
-         * document/ comment 2가지 종류를 이용함.
-         * 굳이 나눈 이유는 하나의 모듈에서 2개 종류의 에디터 사용을 위해서인데 게시판이나 블로그등 원글과 그에 연관된 글(댓글)을 위한 용도임.
-         **/
-        function getModuleEditor($type = 'document', $module_srl, $upload_target_srl, $primary_key_name, $content_key_name) {
-            // 지정된 모듈의 에디터 설정을 구해옴
-            $editor_config = $this->getEditorConfig($module_srl);
-
-            // type에 따른 설정 정리
-            if($type == 'document') {
-                $config->editor_skin = $editor_config->editor_skin;
-                $config->content_style = $editor_config->content_style;
-                $config->content_font = $editor_config->content_font;
-                $config->content_font_size = $editor_config->content_font_size;
-                $config->sel_editor_colorset = $editor_config->sel_editor_colorset;
-                $config->upload_file_grant = $editor_config->upload_file_grant;
-                $config->enable_default_component_grant = $editor_config->enable_default_component_grant;
-                $config->enable_component_grant = $editor_config->enable_component_grant;
-                $config->enable_html_grant = $editor_config->enable_html_grant;
-                $config->editor_height = $editor_config->editor_height;
-                $config->enable_autosave = $editor_config->enable_autosave;
-            } else {
-                $config->editor_skin = $editor_config->comment_editor_skin;
-                $config->content_style = $editor_config->comment_content_style;
-                $config->content_font = $editor_config->content_font;
-                $config->content_font_size = $editor_config->content_font_size;
-                $config->sel_editor_colorset = $editor_config->sel_comment_editor_colorset;
-                $config->upload_file_grant = $editor_config->comment_upload_file_grant;
-                $config->enable_default_component_grant = $editor_config->enable_comment_default_component_grant;
-                $config->enable_component_grant = $editor_config->enable_comment_component_grant;
-                $config->enable_html_grant = $editor_config->enable_comment_html_grant;
-                $config->editor_height = $editor_config->comment_editor_height;
-                $config->enable_autosave = 'N';
-            }
-
-            // 권한 체크를 위한 현재 로그인 사용자의 그룹 설정 체크
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                $group_list = $logged_info->group_list;
-            } else {
-                $group_list = array();
-            }
-
-            // 에디터 옵션 변수를 미리 설정
-            $option->skin = $config->editor_skin;
-            $option->content_style = $config->content_style;
-            $option->content_font = $config->content_font;
-            $option->content_font_size = $config->content_font_size;
-            $option->colorset = $config->sel_editor_colorset;
-
-            // 파일 업로드 권한 체크
-            $option->allow_fileupload = false;
-            if(count($config->upload_file_grant)) {
-                foreach($group_list as $group_srl => $group_info) {
-                    if(in_array($group_srl, $config->upload_file_grant)) {
-                        $option->allow_fileupload = true;
-                        break;
-                    }
-                }
-            } else $option->allow_fileupload = true;
-
-            // 기본 컴포넌트 사용 권한
-            $option->enable_default_component = false;
-            if(count($config->enable_default_component_grant)) {
-                foreach($group_list as $group_srl => $group_info) {
-                    if(in_array($group_srl, $config->enable_default_component_grant)) {
-                        $option->enable_default_component = true;
-                        break;
-                    }
-                }
-            } else $option->enable_default_component = true;
-
-            // 확장 컴포넌트 사용 권한
-            $option->enable_component = false;
-            if(count($config->enable_component_grant)) {
-                foreach($group_list as $group_srl => $group_info) {
-                    if(in_array($group_srl, $config->enable_component_grant)) {
-                        $option->enable_component = true;
-                        break;
-                    }
-                }
-            } else $option->enable_component = true;
-
-            // HTML 편집 권한
-            $enable_html = false;
-            if(count($config->enable_html_grant)) {
-                foreach($group_list as $group_srl => $group_info) {
-                    if(in_array($group_srl, $config->enable_html_grant)) {
-                        $enable_html = true;
-                        break;
-                    }
-                }
-            } else $enable_html = true;
-
-            if($enable_html) $option->disable_html = false;
-            else $option->disable_html = true;
-
-            // 높이 설정
-            $option->height = $config->editor_height;
-
-            // 자동 저장 유무 옵션 설정
-            $option->enable_autosave = $config->enable_autosave=='Y'?true:false;
-
-            // 기타 설정
-            $option->primary_key_name = $primary_key_name;
-            $option->content_key_name = $content_key_name;
-
-            return $this->getEditor($upload_target_srl, $option);
-        }
-
-        /**
-         * @brief 자동저장되어 있는 정보를 가져옴
-         **/
-        function getSavedDoc($upload_target_srl) {
-            // 로그인 회원이면 member_srl, 아니면 ipaddress로 저장되어 있는 문서를 찾음
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                $auto_save_args->member_srl = $logged_info->member_srl;
-            } else {
-                $auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            }
-            $auto_save_args->module_srl = Context::get('module_srl');
-            // module_srl이 없으면 현재 모듈
-            if(!$auto_save_args->module_srl) {
-                $current_module_info = Context::get('current_module_info');
-                $auto_save_args->module_srl = $current_module_info->module_srl;
-            }
-
-            // DB에서 자동저장 데이터 추출
-            $output = executeQuery('editor.getSavedDocument', $auto_save_args);
-            $saved_doc = $output->data;
-
-            // 자동저장한 결과가 없으면 null값 return
-            if(!$saved_doc) return;
-
-            // 자동저장된 값이 혹시 이미 등록된 글인지 확인
-            $oDocumentModel = &getModel('document');
-            $oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
-            if($oSaved->isExists()) return;
-
-            // 자동저장 데이터에 문서번호가 있고 이 번호에 파일이 있다면 파일을 모두 이동하고
-            // 해당 문서 번호를 editor_sequence로 세팅함
-            if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl')) {
-                $saved_doc->module_srl = $auto_save_args->module_srl;
-                $oFileController = &getController('file');
-                $oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
-            }
-            else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
-
-            // 자동 저장 데이터 변경
-            $oEditorController = &getController('editor');
-            $oEditorController->deleteSavedDoc(false);
-            $oEditorController->doSaveDoc($saved_doc);
-
-            return $saved_doc;
-        }
-
-        /**
-         * @brief component의 객체 생성
-         **/
-        function getComponentObject($component, $editor_sequence = 0, $site_srl = 0) {
-			if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) return;
-
-            if(!$this->loaded_component_list[$component][$editor_sequence]) {
-                // 해당 컴포넌트의 객체를 생성해서 실행
-                $class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
-                $class_file = sprintf('%s%s.class.php', $class_path, $component);
-                if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
-
-                // 클래스 파일을 읽은 후 객체 생성
-                require_once($class_file);
-                $tmp_fn = create_function('$seq,$path', "return new {$component}(\$seq,\$path);");
-				$oComponent = $tmp_fn($editor_sequence, $class_path);
-                if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
-
-                // 설정 정보를 추가
-                $component_info = $this->getComponent($component, $site_srl);
-                $oComponent->setInfo($component_info);
-                $this->loaded_component_list[$component][$editor_sequence] = $oComponent;
-            }
-
-            return $this->loaded_component_list[$component][$editor_sequence];
-        }
-
-        /**
-         * @brief editor skin 목록을 return
-         **/
-        function getEditorSkinList() {
-            return FileHandler::readDir('./modules/editor/skins');
-        }
-
-        /**
-         * @brief 에디터 컴포넌트 목록 캐시 파일 이름 return
-         **/
-        function getCacheFile($filter_enabled= true, $site_srl = 0) {
-            $lang = Context::getLangType();
-            $cache_path = _XE_PATH_.'files/cache/editor/cache/';
-            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
-            $cache_file = $cache_path.'component_list.' . $lang .'.';
-            if($filter_enabled) $cache_file .= 'filter.';
-            if($site_srl) $cache_file .= $site_srl.'.';
-            $cache_file .= 'php';
-            return $cache_file;
-        }
-
-        /**
-         * @brief component 목록을 return (DB정보 보함)
-         **/
-        function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false) {
-            $cache_file = $this->getCacheFile(false, $site_srl);
-            if($from_db || !file_exists($cache_file)) {
-                $oEditorController = &getController('editor');
-                $oEditorController->makeCache(false, $site_srl);
-            }
-
-            if(!file_exists($cache_file)) return;
-            @include($cache_file);
-			$logged_info = Context::get('logged_info');
-			if($logged_info && is_array($logged_info->group_list)) 
-			{
-				$group_list = array_keys($logged_info->group_list);
-			}
-			else
-			{
-				$group_list = array();
-			}
-
-            if(count($component_list)) {
-                foreach($component_list as $key => $val) {
-                    if(!trim($key)) continue;
-                    if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key)) {
-                        FileHandler::removeFile($cache_file);
-                        return $this->getComponentList($filter_enabled, $site_srl);
-                    }
-					if(!$filter_enabled) continue;
-					if($val->enabled == "N") {
-						unset($component_list->{$key});
-						continue;
-					}
-					if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
-					if($val->target_group)
-					{
-						if(!$logged_info) {
-							$val->enabled = "N";	
-						}
-						else {
-							$is_granted = false;
-							foreach($group_list as $group_srl)
-							{
-								if(in_array($group_srl, $val->target_group)) $is_granted = true;	
-							}
-							if(!$is_granted) $val->enabled = "N"; 
-						}
-					}
-					if($val->enabled != "N" && $val->mid_list)
-					{
-						$mid = Context::get('mid');
-						if(!in_array($mid, $val->mid_list)) $val->enabled = "N";
-					}
-					if($val->enabled == "N") {
-						unset($component_list->{$key});
-						continue;
-					}
-                }
-
-            }
-            return $component_list;
-        }
-
-        /**
-         * @brief compnent의 xml+db정보를 구함
-         **/
-        function getComponent($component_name, $site_srl = 0) {
-            $args->component_name = $component_name;
-
-            if($site_srl) {
-                $args->site_srl = $site_srl;
-                $output = executeQuery('editor.getSiteComponent', $args);
-            } else {
-                $output = executeQuery('editor.getComponent', $args);
-            }
-            $component = $output->data;
-
-            $component_name = $component->component_name;
-
-            unset($xml_info);
-            $xml_info = $this->getComponentXmlInfo($component_name);
-            $xml_info->enabled = $component->enabled;
-
-            $xml_info->target_group = array();
-
-            $xml_info->mid_list = array();
-
-            if($component->extra_vars) {
-                $extra_vars = unserialize($component->extra_vars);
-
-                if($extra_vars->target_group) {
-                    $xml_info->target_group = $extra_vars->target_group;
-                    unset($extra_vars->target_group);
-                }
-
-                if($extra_vars->mid_list) {
-                    $xml_info->mid_list = $extra_vars->mid_list;
-                    unset($extra_vars->mid_list);
-                }
-
-
-                if($xml_info->extra_vars) {
-                    foreach($xml_info->extra_vars as $key => $val) {
-                        $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
-                    }
-                }
-            }
-
-            return $xml_info;
-        }
-
-        /**
-         * @brief component의 xml정보를 읽음
-         **/
-        function getComponentXmlInfo($component) {
-            $lang_type = Context::getLangType();
-
-            // 요청된 컴포넌트의 xml파일 위치를 구함
-            $component_path = sprintf('%s/components/%s/', $this->module_path, $component);
-
-            $xml_file = sprintf('%sinfo.xml', $component_path);
-            $cache_file = sprintf('./files/cache/editor/%s.%s.php', $component, $lang_type);
-
-            // 캐시된 xml파일이 있으면 include 후 정보 return
-            if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file)) {
-                include($cache_file);
-                return $xml_info;
-            }
-
-            // 캐시된 파일이 없으면 파싱후 캐싱 후 return
-            $oParser = new XmlParser();
-            $xml_doc = $oParser->loadXmlFile($xml_file);
-
-            // 정보 정리
-            if($xml_doc->component->version && $xml_doc->component->attrs->version == '0.2') {
-                $component_info->component_name = $component;
-                $component_info->title = $xml_doc->component->title->body;
-                $component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
-                $component_info->version = $xml_doc->component->version->body;
-                $component_info->date = $xml_doc->component->date->body;
-                $component_info->homepage = $xml_doc->component->link->body;
-                $component_info->license = $xml_doc->component->license->body;
-                $component_info->license_link = $xml_doc->component->license->attrs->link;
-
-                $buff = '<?php if(!defined("__ZBXE__")) exit(); ';
-                $buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
-                $buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
-                $buff .= sprintf('$xml_info->description = "%s";', $component_info->description);
-                $buff .= sprintf('$xml_info->version = "%s";', $component_info->version);
-                $buff .= sprintf('$xml_info->date = "%s";', $component_info->date);
-                $buff .= sprintf('$xml_info->homepage = "%s";', $component_info->homepage);
-                $buff .= sprintf('$xml_info->license = "%s";', $component_info->license);
-                $buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
-
-                // 작성자 정보
-                if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
-                else $author_list = $xml_doc->component->author;
-
-                for($i=0; $i < count($author_list); $i++) {
-                    $buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
-                    $buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
-                    $buff .= sprintf('$xml_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
-                }
-
-                // history
-                if($xml_doc->component->history) {
-                    if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history;
-                    else $history_list = $xml_doc->component->history;
-
-                    for($i=0; $i < count($history_list); $i++) {
-                        unset($obj);
-                        sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                        $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                        $buff .= sprintf('$xml_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
-                        $buff .= sprintf('$xml_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
-                        $buff .= sprintf('$xml_info->history['.$i.']->date = "%s";', $date);
-
-                        if($history_list[$i]->author) {
-                            (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
-
-                            for($j=0; $j < count($obj->author_list); $j++) {
-                                $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
-                                $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
-                                $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
-                            }
-                        }
-
-                        if($history_list[$i]->log) {
-                            (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
-
-                            for($j=0; $j < count($obj->log_list); $j++) {
-                                $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
-                                $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
-                            }
-                        }
-                    }
-                }
-
-
-            } else {
-                sscanf($xml_doc->component->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $xml_info->component_name = $component;
-                $xml_info->title = $xml_doc->component->title->body;
-                $xml_info->description = str_replace('\n', "\n", $xml_doc->component->author->description->body);
-                $xml_info->version = $xml_doc->component->attrs->version;
-                $xml_info->date = $date;
-                $xml_info->author->name = $xml_doc->component->author->name->body;
-                $xml_info->author->email_address = $xml_doc->component->author->attrs->email_address;
-                $xml_info->author->homepage = $xml_doc->component->author->attrs->link;
-
-                $buff = '<?php if(!defined("__ZBXE__")) exit(); ';
-                $buff .= sprintf('$xml_info->component_name = "%s";', $xml_info->component_name);
-                $buff .= sprintf('$xml_info->title = "%s";', $xml_info->title);
-                $buff .= sprintf('$xml_info->description = "%s";', $xml_info->description);
-                $buff .= sprintf('$xml_info->version = "%s";', $xml_info->version);
-                $buff .= sprintf('$xml_info->date = "%s";', $xml_info->date);
-                $buff .= sprintf('$xml_info->author[0]->name = "%s";', $xml_info->author->name);
-                $buff .= sprintf('$xml_info->author[0]->email_address = "%s";', $xml_info->author->email_address);
-                $buff .= sprintf('$xml_info->author[0]->homepage = "%s";', $xml_info->author->homepage);
-            }
-
-            // 추가 변수 정리 (에디터 컴포넌트에서는 text형만 가능)
-            $extra_vars = $xml_doc->component->extra_vars->var;
-            if($extra_vars) {
-                if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-                foreach($extra_vars as $key => $val) {
-                    unset($obj);
-                    $key = $val->attrs->name;
-                    $title = $val->title->body;
-                    $description = $val->description->body;
-                    $xml_info->extra_vars->{$key}->title = $title;
-                    $xml_info->extra_vars->{$key}->description = $description;
-
-                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'title', $title);
-                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'description', $description);
-                }
-            }
-
-            $buff .= ' ?>';
-
-            FileHandler::writeFile($cache_file, $buff, "w");
-
-			unset($xml_info);
-            include($cache_file);
-            return $xml_info;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  editorModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief model class of the editor odule 
+     **/
+
+    class editorModel extends editor {
+
+        var $loaded_component_list = array();
+
+        /**
+         * @brief Return the editor
+         *
+         * Editor internally generates editor_sequence from 1 to 30 for temporary use.
+         * That means there is a limitation that more than 30 editors cannot be displayed on a single page.
+         *
+         * However, editor_sequence can be value from getNextSequence() in case of the modified or the auto-saved for file upload
+         * 
+         **/
+
+        /**
+         * @brief Return editor setting for each module
+         **/
+        function getEditorConfig($module_srl = null) {
+            if(!$GLOBALS['__editor_module_config__'][$module_srl] && $module_srl) {
+                // Get trackback settings of the selected module
+                $oModuleModel = &getModel('module');
+                $GLOBALS['__editor_module_config__'][$module_srl] = $oModuleModel->getModulePartConfig('editor', $module_srl);
+            }
+			$editor_config = $GLOBALS['__editor_module_config__'][$module_srl];		
+			
+			$oModuleModel = &getModel('module');
+			$editor_default_config = $oModuleModel->getModuleConfig('editor');
+
+            if(!is_object($editor_config)) $editor_config = null;
+
+            if(!is_array($editor_config->enable_html_grant)) $editor_config->enable_html_grant = array();
+            if(!is_array($editor_config->enable_comment_html_grant)) $editor_config->enable_comment_html_grant = array();
+            if(!is_array($editor_config->upload_file_grant)) $editor_config->upload_file_grant = array();
+            if(!is_array($editor_config->comment_upload_file_grant)) $editor_config->comment_upload_file_grant = array();
+            if(!is_array($editor_config->enable_default_component_grant)) $editor_config->enable_default_component_grant = array();
+            if(!is_array($editor_config->enable_comment_default_component_grant)) $editor_config->enable_comment_default_component_grant = array();
+            if(!is_array($editor_config->enable_component_grant)) $editor_config->enable_component_grant = array();
+            if(!is_array($editor_config->enable_comment_component_grant)) $editor_config->enable_comment_component_grant= array();
+
+            if($editor_config->enable_autosave!='N') $editor_config->enable_autosave = "Y";
+			
+			if(!$editor_config->editor_height) if($editor_default_config->editor_height? $editor_config->editor_height = $editor_default_config->editor_height : $editor_config->editor_height = 400);
+            if(!$editor_config->comment_editor_height) if($editor_default_config->comment_editor_height? $editor_config->comment_editor_height = $editor_default_config->comment_editor_height : $editor_config->comment_editor_height = 100);
+			if(!$editor_config->editor_skin) if($editor_default_config->editor_skin? $editor_config->editor_skin = $editor_default_config->editor_skin : $editor_config->editor_skin = 'xpresseditor');
+			if(!$editor_config->comment_editor_skin) if($editor_default_config->comment_editor_skin? $editor_config->comment_editor_skin = $editor_default_config->comment_editor_skin : $editor_config->comment_editor_skin = 'xpresseditor');
+			if(!$editor_config->content_style) if($editor_default_config->content_style? $editor_config->content_style = $editor_default_config->content_style : $editor_config->content_style = 'default');
+			
+			if(!$editor_config->content_font && $editor_default_config->content_font) $editor_config->content_font = $editor_default_config->content_font;
+			if(!$editor_config->content_font_size && $editor_default_config->content_font_size) $editor_config->content_font_size = $editor_default_config->content_font_size;
+			
+			if(!$editor_config->sel_editor_colorset && $editor_default_config->sel_editor_colorset) $editor_config->sel_editor_colorset = $editor_default_config->sel_editor_colorset;
+			if(!$editor_config->sel_comment_editor_colorset && $editor_default_config->sel_comment_editor_colorset) $editor_config->sel_comment_editor_colorset = $editor_default_config->sel_comment_editor_colorset;
+			if(!$editor_config->comment_content_style && $editor_default_config->comment_content_style) $editor_config->comment_content_style = $editor_default_config->comment_content_style;
+            return $editor_config;
+        }
+
+		function loadDrComponents(){
+			$drComponentPath = './modules/editor/skins/dreditor/drcomponents/';
+            $drComponentList = FileHandler::readDir($drComponentPath);
+
+			$oTemplate = &TemplateHandler::getInstance();
+
+			$drComponentInfo = array();
+			if($drComponentList){
+				foreach($drComponentList as $i => $drComponent){
+					unset($obj);
+					$obj = $this->getDrComponentXmlInfo($drComponent);
+					Context::loadLang(sprintf('%s%s/lang/',$drComponentPath,$drComponent));					
+					$path = sprintf('%s%s/tpl/',$drComponentPath,$drComponent);
+					$obj->html = $oTemplate->compile($path,$drComponent);
+					$drComponentInfo[$drComponent] = $obj;
+				}
+			}
+			Context::set('drComponentList',$drComponentInfo);
+		}
+
+		function getDrComponentXmlInfo($drComponentName){
+			$lang_type = Context::getLangType();
+            // Get the xml file path of requested component
+            $component_path = sprintf('%s/skins/dreditor/drcomponents/%s/', $this->module_path, $drComponentName);
+
+            $xml_file = sprintf('%sinfo.xml', $component_path);
+            $cache_file = sprintf('./files/cache/editor/dr_%s.%s.php', $drComponentName, $lang_type);
+            // Return information after including it after cached xml file exists
+            if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file)) {
+                include($cache_file);
+                return $xml_info;
+            }
+            // Return after parsing and caching if the cached file does not exist
+            $oParser = new XmlParser();
+            $xml_doc = $oParser->loadXmlFile($xml_file);
+
+			$component_info->component_name = $drComponentName;
+			$component_info->title = $xml_doc->component->title->body;
+			$component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
+			$component_info->version = $xml_doc->component->version->body;
+			$component_info->date = $xml_doc->component->date->body;
+			$component_info->homepage = $xml_doc->component->link->body;
+			$component_info->license = $xml_doc->component->license->body;
+			$component_info->license_link = $xml_doc->component->license->attrs->link;
+
+			$buff = '<?php if(!defined("__ZBXE__")) exit(); ';
+			$buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
+			$buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
+			$buff .= sprintf('$xml_info->description = "%s";', $component_info->description);
+			$buff .= sprintf('$xml_info->version = "%s";', $component_info->version);
+			$buff .= sprintf('$xml_info->date = "%s";', $component_info->date);
+			$buff .= sprintf('$xml_info->homepage = "%s";', $component_info->homepage);
+			$buff .= sprintf('$xml_info->license = "%s";', $component_info->license);
+			$buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
+
+			// Author information
+			if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+			else $author_list = $xml_doc->component->author;
+
+			for($i=0; $i < count($author_list); $i++) {
+				$buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
+				$buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
+				$buff .= sprintf('$xml_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
+			}
+
+			// history
+			if($xml_doc->component->history) {
+				if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history;
+				else $history_list = $xml_doc->component->history;
+
+				for($i=0; $i < count($history_list); $i++) {
+					unset($obj);
+					sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+					$date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+					$buff .= sprintf('$xml_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
+					$buff .= sprintf('$xml_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
+					$buff .= sprintf('$xml_info->history['.$i.']->date = "%s";', $date);
+
+					if($history_list[$i]->author) {
+						(!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
+
+						for($j=0; $j < count($obj->author_list); $j++) {
+							$buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
+							$buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
+							$buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
+						}
+					}
+
+					if($history_list[$i]->log) {
+						(!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
+
+						for($j=0; $j < count($obj->log_list); $j++) {
+							$buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
+							$buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
+						}
+					}
+				}
+			}
+           // List extra variables (text type only in the editor component)
+            $extra_vars = $xml_doc->component->extra_vars->var;
+            if($extra_vars) {
+                if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+                foreach($extra_vars as $key => $val) {
+                    unset($obj);
+                    $key = $val->attrs->name;
+                    $title = $val->title->body;
+                    $description = $val->description->body;
+                    $xml_info->extra_vars->{$key}->title = $title;
+                    $xml_info->extra_vars->{$key}->description = $description;
+
+                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'title', $title);
+                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'description', $description);
+                }
+            }
+
+            $buff .= ' ?>';
+
+            FileHandler::writeFile($cache_file, $buff, "w");
+
+			unset($xml_info);
+            include($cache_file);
+            return $xml_info;
+		}
+
+        /**
+         * @brief Return the editor template
+         * You can call upload_target_srl when modifying content
+         * The upload_target_srl is used for a routine to check if an attachment exists
+         **/
+        function getEditor($upload_target_srl = 0, $option = null) {
+            /**
+             * Editor's default options
+             **/
+            // Option setting to allow file upload
+            if(!$option->allow_fileupload) $allow_fileupload = false;
+            else $allow_fileupload = true;
+            // content_style setting
+            if(!$option->content_style) $option->content_style = 'default';
+            Context::set('content_style', $option->content_style);
+            // Default font setting
+            Context::set('content_font', $option->content_font);
+            Context::set('content_font_size', $option->content_font_size);
+			
+			// Option setting to allow auto-save
+            if(!$option->enable_autosave) $enable_autosave = false;
+            elseif(Context::get($option->primary_key_name)) $enable_autosave = false;
+            else $enable_autosave = true;
+            // Option setting to allow the default editor component
+            if(!$option->enable_default_component) $enable_default_component = false;
+            else $enable_default_component = true;
+            // Option setting to allow other extended components
+            if(!$option->enable_component) $enable_component = false;
+            else $enable_component = true;
+            // Setting for html-mode
+            if($option->disable_html) $html_mode = false;
+            else $html_mode = true;
+            // Set Height
+            if(!$option->height) $editor_height = 400;
+            else $editor_height = $option->height;
+            // Skin Setting
+            $skin = $option->skin;
+            if(!$skin) $skin = 'xpresseditor';
+
+            $colorset = $option->colorset;
+            Context::set('colorset', $colorset);
+            Context::set('skin', $skin);
+
+			if($skin=='dreditor'){
+				$this->loadDrComponents();	
+			}
+
+            /**
+             * Check the automatic backup feature (do not use if the post is edited)
+             **/
+            if($enable_autosave) {
+                // Extract auto-saved data
+                $saved_doc = $this->getSavedDoc($upload_target_srl);
+                // Context setting auto-saved data
+                Context::set('saved_doc', $saved_doc);
+            }
+            Context::set('enable_autosave', $enable_autosave);
+
+            /**
+             * Extract editor's unique number (in order to display multiple editors on a single page)
+             **/
+            if($option->editor_sequence) $editor_sequence = $option->editor_sequence;
+            else {
+                if(!$GLOBALS['_editor_sequence_']) $GLOBALS['_editor_sequence_'] = 1;
+                $editor_sequence = $GLOBALS['_editor_sequence_'] ++;
+            }
+
+            /**
+             * Upload setting by using configuration of the file module internally
+             **/
+            $files_count = 0;
+            if($allow_fileupload) {
+                $oFileModel = &getModel('file');
+                // Get upload configuration to set on SWFUploader
+                $file_config = $oFileModel->getUploadConfig();
+                $file_config->allowed_attach_size = $file_config->allowed_attach_size*1024*1024;
+                $file_config->allowed_filesize = $file_config->allowed_filesize*1024*1024;
+
+                Context::set('file_config',$file_config);
+                // Configure upload status such as file size
+                $upload_status = $oFileModel->getUploadStatus();
+                Context::set('upload_status', $upload_status);
+                // Upload enabled (internally caching)
+                $oFileController = &getController('file');
+                $oFileController->setUploadInfo($editor_sequence, $upload_target_srl);
+                // Check if the file already exists
+                if($upload_target_srl) $files_count = $oFileModel->getFilesCount($upload_target_srl);
+            }
+            Context::set('files_count', (int)$files_count);
+
+            Context::set('allow_fileupload', $allow_fileupload);
+            // Set editor_sequence value
+            Context::set('editor_sequence', $editor_sequence);
+            // Set the document number to upload_target_srl for file attachments
+            // If a new document, upload_target_srl = 0. The value becomes changed when file attachment is requested
+            Context::set('upload_target_srl', $upload_target_srl);
+            // Set the primary key valueof the document or comments
+            Context::set('editor_primary_key_name', $option->primary_key_name);
+            // Set content column name to sync contents
+            Context::set('editor_content_key_name', $option->content_key_name);
+
+
+            /**
+             * Check editor component
+             **/
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+            if($enable_component) {
+                if(!Context::get('component_list')) {
+                    $component_list = $this->getComponentList(true, $site_srl);
+                    Context::set('component_list', $component_list);
+                }
+            }
+            Context::set('enable_component', $enable_component);
+            Context::set('enable_default_component', $enable_default_component);
+
+            /**
+             * Variable setting if html_mode is available
+             **/
+            Context::set('html_mode', $html_mode);
+
+            /**
+             * Set a height of editor
+             **/
+            Context::set('editor_height', $editor_height);
+            // Check an option whether to start the editor manually
+            Context::set('editor_manual_start', $option->manual_start);
+
+            /**
+             * Set a skin path to pre-compile the template
+             ?**/
+            $tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
+            $tpl_file = 'editor.html';
+
+            if(!file_exists($tpl_path.$tpl_file)) {
+                $skin = 'xpresseditor';
+                $tpl_path = sprintf('%sskins/%s/', $this->module_path, $skin);
+            }
+            Context::set('editor_path', $tpl_path);
+
+			// load editor skin lang
+			Context::loadLang($tpl_path.'lang');
+            // Return the compiled result from tpl file
+            $oTemplate = new TemplateHandler();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief Return editor template which contains settings of each module
+         * Result of getModuleEditor() is as same as getEditor(). But getModuleEditor()uses additional settings of each module to generate an editor
+         *
+         * 2 types of editors supported; document and comment.
+         * 2 types of editors can be used on a single module. For instance each for original post and reply port.
+         **/
+        function getModuleEditor($type = 'document', $module_srl, $upload_target_srl, $primary_key_name, $content_key_name) {
+            // Get editor settings of the module
+            $editor_config = $this->getEditorConfig($module_srl);
+            // Configurations listed according to a type
+            if($type == 'document') {
+                $config->editor_skin = $editor_config->editor_skin;
+                $config->content_style = $editor_config->content_style;
+                $config->content_font = $editor_config->content_font;
+                $config->content_font_size = $editor_config->content_font_size;
+                $config->sel_editor_colorset = $editor_config->sel_editor_colorset;
+                $config->upload_file_grant = $editor_config->upload_file_grant;
+                $config->enable_default_component_grant = $editor_config->enable_default_component_grant;
+                $config->enable_component_grant = $editor_config->enable_component_grant;
+                $config->enable_html_grant = $editor_config->enable_html_grant;
+                $config->editor_height = $editor_config->editor_height;
+                $config->enable_autosave = $editor_config->enable_autosave;
+            } else {
+                $config->editor_skin = $editor_config->comment_editor_skin;
+                $config->content_style = $editor_config->comment_content_style;
+                $config->content_font = $editor_config->content_font;
+                $config->content_font_size = $editor_config->content_font_size;
+                $config->sel_editor_colorset = $editor_config->sel_comment_editor_colorset;
+                $config->upload_file_grant = $editor_config->comment_upload_file_grant;
+                $config->enable_default_component_grant = $editor_config->enable_comment_default_component_grant;
+                $config->enable_component_grant = $editor_config->enable_comment_component_grant;
+                $config->enable_html_grant = $editor_config->enable_comment_html_grant;
+                $config->editor_height = $editor_config->comment_editor_height;
+                $config->enable_autosave = 'N';
+            }
+            // Check a group_list of the currently logged-in user for permission check
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                $group_list = $logged_info->group_list;
+            } else {
+                $group_list = array();
+            }
+            // Pre-set option variables of editor
+            $option->skin = $config->editor_skin;
+            $option->content_style = $config->content_style;
+            $option->content_font = $config->content_font;
+            $option->content_font_size = $config->content_font_size;
+            $option->colorset = $config->sel_editor_colorset;
+            // Permission check for file upload
+            $option->allow_fileupload = false;
+            if(count($config->upload_file_grant)) {
+                foreach($group_list as $group_srl => $group_info) {
+                    if(in_array($group_srl, $config->upload_file_grant)) {
+                        $option->allow_fileupload = true;
+                        break;
+                    }
+                }
+            } else $option->allow_fileupload = true;
+            // Permission check for using default components
+            $option->enable_default_component = false;
+            if(count($config->enable_default_component_grant)) {
+                foreach($group_list as $group_srl => $group_info) {
+                    if(in_array($group_srl, $config->enable_default_component_grant)) {
+                        $option->enable_default_component = true;
+                        break;
+                    }
+                }
+            } else $option->enable_default_component = true;
+            // Permisshion check for using extended components
+            $option->enable_component = false;
+            if(count($config->enable_component_grant)) {
+                foreach($group_list as $group_srl => $group_info) {
+                    if(in_array($group_srl, $config->enable_component_grant)) {
+                        $option->enable_component = true;
+                        break;
+                    }
+                }
+            } else $option->enable_component = true;
+            // HTML editing privileges
+            $enable_html = false;
+            if(count($config->enable_html_grant)) {
+                foreach($group_list as $group_srl => $group_info) {
+                    if(in_array($group_srl, $config->enable_html_grant)) {
+                        $enable_html = true;
+                        break;
+                    }
+                }
+            } else $enable_html = true;
+
+            if($enable_html) $option->disable_html = false;
+            else $option->disable_html = true;
+            // Set Height
+            $option->height = $config->editor_height;
+            // Set an option for Auto-save
+            $option->enable_autosave = $config->enable_autosave=='Y'?true:false;
+            // Other settings
+            $option->primary_key_name = $primary_key_name;
+            $option->content_key_name = $content_key_name;
+
+            return $this->getEditor($upload_target_srl, $option);
+        }
+
+        /**
+         * @brief Get information which has been auto-saved
+         **/
+        function getSavedDoc($upload_target_srl) {
+            // Find a document by using member_srl for logged-in user and ipaddress for non-logged user
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                $auto_save_args->member_srl = $logged_info->member_srl;
+            } else {
+                $auto_save_args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            }
+            $auto_save_args->module_srl = Context::get('module_srl');
+            // Get the current module if module_srl doesn't exist
+            if(!$auto_save_args->module_srl) {
+                $current_module_info = Context::get('current_module_info');
+                $auto_save_args->module_srl = $current_module_info->module_srl;
+            }
+            // Extract auto-saved data from the DB
+            $output = executeQuery('editor.getSavedDocument', $auto_save_args);
+            $saved_doc = $output->data;
+            // Return null if no result is auto-saved
+            if(!$saved_doc) return;
+            // Check if the auto-saved document already exists
+            $oDocumentModel = &getModel('document');
+            $oSaved = $oDocumentModel->getDocument($saved_doc->document_srl);
+            if($oSaved->isExists()) return;
+            // Move all the files if the auto-saved data contains document_srl and file
+            // Then set document_srl to editor_sequence
+            if($saved_doc->document_srl && $upload_target_srl && !Context::get('document_srl')) {
+                $saved_doc->module_srl = $auto_save_args->module_srl;
+                $oFileController = &getController('file');
+                $oFileController->moveFile($saved_doc->document_srl, $saved_doc->module_srl, $upload_target_srl);
+            }
+            else if($upload_target_srl) $saved_doc->document_srl = $upload_target_srl;
+            // Change auto-saved data
+            $oEditorController = &getController('editor');
+            $oEditorController->deleteSavedDoc(false);
+            $oEditorController->doSaveDoc($saved_doc);
+
+            return $saved_doc;
+        }
+
+        /**
+         * @brief create objects of the component
+         **/
+        function getComponentObject($component, $editor_sequence = 0, $site_srl = 0) {
+			if(!preg_match('/^[a-zA-Z0-9_-]+$/',$component) || !preg_match('/^[0-9]+$/', $editor_sequence . $site_srl)) return;
+
+            if(!$this->loaded_component_list[$component][$editor_sequence]) {
+                // Create an object of the component and execute
+                $class_path = sprintf('%scomponents/%s/', $this->module_path, $component);
+                $class_file = sprintf('%s%s.class.php', $class_path, $component);
+                if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+                // Create an object after loading the class file
+                require_once($class_file);
+                $tmp_fn = create_function('$seq,$path', "return new {$component}(\$seq,\$path);");
+				$oComponent = $tmp_fn($editor_sequence, $class_path);
+                if(!$oComponent) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+                // Add configuration information
+                $component_info = $this->getComponent($component, $site_srl);
+                $oComponent->setInfo($component_info);
+                $this->loaded_component_list[$component][$editor_sequence] = $oComponent;
+            }
+
+            return $this->loaded_component_list[$component][$editor_sequence];
+        }
+
+        /**
+         * @brief Return a list of the editor skin
+         **/
+        function getEditorSkinList() {
+            return FileHandler::readDir('./modules/editor/skins');
+        }
+
+        /**
+         * @brief Return the cache file name of editor component list
+         **/
+        function getCacheFile($filter_enabled= true, $site_srl = 0) {
+            $lang = Context::getLangType();
+            $cache_path = _XE_PATH_.'files/cache/editor/cache/';
+            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
+            $cache_file = $cache_path.'component_list.' . $lang .'.';
+            if($filter_enabled) $cache_file .= 'filter.';
+            if($site_srl) $cache_file .= $site_srl.'.';
+            $cache_file .= 'php';
+            return $cache_file;
+        }
+
+        /**
+         * @brief Return a component list (DB Information included)
+         **/
+        function getComponentList($filter_enabled = true, $site_srl=0, $from_db=false) {
+            $cache_file = $this->getCacheFile(false, $site_srl);
+            if($from_db || !file_exists($cache_file)) {
+                $oEditorController = &getController('editor');
+                $oEditorController->makeCache(false, $site_srl);
+            }
+
+            if(!file_exists($cache_file)) return;
+            @include($cache_file);
+			$logged_info = Context::get('logged_info');
+			if($logged_info && is_array($logged_info->group_list)) 
+			{
+				$group_list = array_keys($logged_info->group_list);
+			}
+			else
+			{
+				$group_list = array();
+			}
+
+            if(count($component_list)) {
+                foreach($component_list as $key => $val) {
+                    if(!trim($key)) continue;
+                    if(!is_dir(_XE_PATH_.'modules/editor/components/'.$key)) {
+                        FileHandler::removeFile($cache_file);
+                        return $this->getComponentList($filter_enabled, $site_srl);
+                    }
+					if(!$filter_enabled) continue;
+					if($val->enabled == "N") {
+						unset($component_list->{$key});
+						continue;
+					}
+					if($logged_info->is_admin == "Y" || $logged_info->is_site_admin == "Y") continue;
+					if($val->target_group)
+					{
+						if(!$logged_info) {
+							$val->enabled = "N";	
+						}
+						else {
+							$is_granted = false;
+							foreach($group_list as $group_srl)
+							{
+								if(in_array($group_srl, $val->target_group)) $is_granted = true;	
+							}
+							if(!$is_granted) $val->enabled = "N"; 
+						}
+					}
+					if($val->enabled != "N" && $val->mid_list)
+					{
+						$mid = Context::get('mid');
+						if(!in_array($mid, $val->mid_list)) $val->enabled = "N";
+					}
+					if($val->enabled == "N") {
+						unset($component_list->{$key});
+						continue;
+					}
+                }
+
+            }
+            return $component_list;
+        }
+
+        /**
+         * @brief Get xml and db information of the component
+         **/
+        function getComponent($component_name, $site_srl = 0) {
+            $args->component_name = $component_name;
+
+            if($site_srl) {
+                $args->site_srl = $site_srl;
+                $output = executeQuery('editor.getSiteComponent', $args);
+            } else {
+                $output = executeQuery('editor.getComponent', $args);
+            }
+            $component = $output->data;
+
+            $component_name = $component->component_name;
+
+            unset($xml_info);
+            $xml_info = $this->getComponentXmlInfo($component_name);
+            $xml_info->enabled = $component->enabled;
+
+            $xml_info->target_group = array();
+
+            $xml_info->mid_list = array();
+
+            if($component->extra_vars) {
+                $extra_vars = unserialize($component->extra_vars);
+
+                if($extra_vars->target_group) {
+                    $xml_info->target_group = $extra_vars->target_group;
+                    unset($extra_vars->target_group);
+                }
+
+                if($extra_vars->mid_list) {
+                    $xml_info->mid_list = $extra_vars->mid_list;
+                    unset($extra_vars->mid_list);
+                }
+
+
+                if($xml_info->extra_vars) {
+                    foreach($xml_info->extra_vars as $key => $val) {
+                        $xml_info->extra_vars->{$key}->value = $extra_vars->{$key};
+                    }
+                }
+            }
+
+            return $xml_info;
+        }
+
+        /**
+         * @brief Read xml information of the component
+         **/
+        function getComponentXmlInfo($component) {
+            $lang_type = Context::getLangType();
+            // Get xml file path of the requested components
+            $component_path = sprintf('%s/components/%s/', $this->module_path, $component);
+
+            $xml_file = sprintf('%sinfo.xml', $component_path);
+            $cache_file = sprintf('./files/cache/editor/%s.%s.php', $component, $lang_type);
+            // Include and return xml file information if cached file exists
+            if(file_exists($cache_file) && file_exists($xml_file) && filemtime($cache_file) > filemtime($xml_file)) {
+                include($cache_file);
+                return $xml_info;
+            }
+            // Parse, cache and then return if the cached file doesn't exist
+            $oParser = new XmlParser();
+            $xml_doc = $oParser->loadXmlFile($xml_file);
+            // Component information listed
+            if($xml_doc->component->version && $xml_doc->component->attrs->version == '0.2') {
+                $component_info->component_name = $component;
+                $component_info->title = $xml_doc->component->title->body;
+                $component_info->description = str_replace('\n', "\n", $xml_doc->component->description->body);
+                $component_info->version = $xml_doc->component->version->body;
+                $component_info->date = $xml_doc->component->date->body;
+                $component_info->homepage = $xml_doc->component->link->body;
+                $component_info->license = $xml_doc->component->license->body;
+                $component_info->license_link = $xml_doc->component->license->attrs->link;
+
+                $buff = '<?php if(!defined("__ZBXE__")) exit(); ';
+                $buff .= sprintf('$xml_info->component_name = "%s";', $component_info->component_name);
+                $buff .= sprintf('$xml_info->title = "%s";', $component_info->title);
+                $buff .= sprintf('$xml_info->description = "%s";', $component_info->description);
+                $buff .= sprintf('$xml_info->version = "%s";', $component_info->version);
+                $buff .= sprintf('$xml_info->date = "%s";', $component_info->date);
+                $buff .= sprintf('$xml_info->homepage = "%s";', $component_info->homepage);
+                $buff .= sprintf('$xml_info->license = "%s";', $component_info->license);
+                $buff .= sprintf('$xml_info->license_link = "%s";', $component_info->license_link);
+                // Author information
+                if(!is_array($xml_doc->component->author)) $author_list[] = $xml_doc->component->author;
+                else $author_list = $xml_doc->component->author;
+
+                for($i=0; $i < count($author_list); $i++) {
+                    $buff .= sprintf('$xml_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
+                    $buff .= sprintf('$xml_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
+                    $buff .= sprintf('$xml_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
+                }
+
+                // history
+                if($xml_doc->component->history) {
+                    if(!is_array($xml_doc->component->history)) $history_list[] = $xml_doc->component->history;
+                    else $history_list = $xml_doc->component->history;
+
+                    for($i=0; $i < count($history_list); $i++) {
+                        unset($obj);
+                        sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                        $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                        $buff .= sprintf('$xml_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
+                        $buff .= sprintf('$xml_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
+                        $buff .= sprintf('$xml_info->history['.$i.']->date = "%s";', $date);
+
+                        if($history_list[$i]->author) {
+                            (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
+
+                            for($j=0; $j < count($obj->author_list); $j++) {
+                                $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
+                                $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
+                                $buff .= sprintf('$xml_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
+                            }
+                        }
+
+                        if($history_list[$i]->log) {
+                            (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
+
+                            for($j=0; $j < count($obj->log_list); $j++) {
+                                $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
+                                $buff .= sprintf('$xml_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
+                            }
+                        }
+                    }
+                }
+
+
+            } else {
+                sscanf($xml_doc->component->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $xml_info->component_name = $component;
+                $xml_info->title = $xml_doc->component->title->body;
+                $xml_info->description = str_replace('\n', "\n", $xml_doc->component->author->description->body);
+                $xml_info->version = $xml_doc->component->attrs->version;
+                $xml_info->date = $date;
+                $xml_info->author->name = $xml_doc->component->author->name->body;
+                $xml_info->author->email_address = $xml_doc->component->author->attrs->email_address;
+                $xml_info->author->homepage = $xml_doc->component->author->attrs->link;
+
+                $buff = '<?php if(!defined("__ZBXE__")) exit(); ';
+                $buff .= sprintf('$xml_info->component_name = "%s";', $xml_info->component_name);
+                $buff .= sprintf('$xml_info->title = "%s";', $xml_info->title);
+                $buff .= sprintf('$xml_info->description = "%s";', $xml_info->description);
+                $buff .= sprintf('$xml_info->version = "%s";', $xml_info->version);
+                $buff .= sprintf('$xml_info->date = "%s";', $xml_info->date);
+                $buff .= sprintf('$xml_info->author[0]->name = "%s";', $xml_info->author->name);
+                $buff .= sprintf('$xml_info->author[0]->email_address = "%s";', $xml_info->author->email_address);
+                $buff .= sprintf('$xml_info->author[0]->homepage = "%s";', $xml_info->author->homepage);
+            }
+            // List extra variables (text type only for editor component)
+            $extra_vars = $xml_doc->component->extra_vars->var;
+            if($extra_vars) {
+                if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+                foreach($extra_vars as $key => $val) {
+                    unset($obj);
+                    $key = $val->attrs->name;
+                    $title = $val->title->body;
+                    $description = $val->description->body;
+                    $xml_info->extra_vars->{$key}->title = $title;
+                    $xml_info->extra_vars->{$key}->description = $description;
+
+                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'title', $title);
+                    $buff .= sprintf('$xml_info->extra_vars->%s->%s = "%s";', $key, 'description', $description);
+                }
+            }
+
+            $buff .= ' ?>';
+
+            FileHandler::writeFile($cache_file, $buff, "w");
+
+			unset($xml_info);
+            include($cache_file);
+            return $xml_info;
+        }
+    }
+?>
diff --git a/modules/editor/editor.view.php b/modules/editor/editor.view.php
index 5bf96e137..6d3b6daa8 100644
--- a/modules/editor/editor.view.php
+++ b/modules/editor/editor.view.php
@@ -1,144 +1,183 @@
-<?php
-    /**
-     * @class  editorView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  editor 모듈의 view 클래스
-     **/
-
-    class editorView extends editor {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 컴포넌트의 팝업 출력을 요청을 받는 action
-         **/
-        function dispEditorPopup() {
-            // css 파일 추가
-            Context::addCssFile($this->module_path."tpl/css/editor.css");
-
-            // 변수 정리
-            $editor_sequence = Context::get('editor_sequence');
-            $component = Context::get('component');
-
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = (int)$site_module_info->site_srl;
-
-            // component 객체를 받음
-            $oEditorModel = &getModel('editor');
-            $oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
-            if(!$oComponent->toBool()) {
-                Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
-                $this->setTemplatePath($this->module_path.'tpl');
-                $this->setTemplateFile('component_not_founded');
-            } else {
-
-                // 컴포넌트의 popup url을 출력하는 method실행후 결과를 받음
-                $popup_content = $oComponent->getPopupContent();
-                Context::set('popup_content', $popup_content);
-
-                // 레이아웃을 popup_layout으로 설정
-                $this->setLayoutFile('popup_layout');
-
-                // 템플릿 지정
-                $this->setTemplatePath($this->module_path.'tpl');
-                $this->setTemplateFile('popup');
-            }
-        }
-
-        /**
-         * @brief 컴퍼넌트 정보 보기 
-         **/
-        function dispEditorComponentInfo() {
-            $component_name = Context::get('component_name');
-
-            $site_module_info = Context::get('site_module_info');
-            $site_srl = (int)$site_module_info->site_srl;
-
-            $oEditorModel = &getModel('editor');
-            $component = $oEditorModel->getComponent($component_name, $site_srl);
-            Context::set('component', $component);
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('view_component');
-            $this->setLayoutFile("popup_layout");
-        }
-
-        /**
-         * @brief 모듈의 추가 설정에서 에디터 설정을 하는 form 추가
-         **/
-        function triggerDispEditorAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                // 선택된 모듈의 정보를 가져옴
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            // 에디터 설정을 구함
-            $oEditorModel = &getModel('editor');
-            $editor_config = $oEditorModel->getEditorConfig($current_module_srl);
-
-            Context::set('editor_config', $editor_config);
-
-            $oModuleModel = &getModel('module');
-
-            // 에디터 스킨 목록을 구함
-            $editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
-            Context::set('editor_skin_list', $editor_skin_list);
-
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
-            Context::set('editor_colorset_list', $skin_info->colorset);
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->comment_editor_skin);
-            Context::set('editor_comment_colorset_list', $skin_info->colorset);
-
-            $contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
-            for($i=0,$c=count($contents);$i<$c;$i++) {
-                $style = $contents[$i];
-                $info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
-                $content_style_list[$style]->title = $info->title;
-            }			
-            Context::set('content_style_list', $content_style_list);
-
-            // 그룹 목록을 구함
-            $oMemberModel = &getModel('member');
-            $site_module_info = Context::get('site_module_info');
-            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
-            Context::set('group_list', $group_list);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('group_list..title');
-			$security->encodeHTML('group_list..description');
-			$security->encodeHTML('content_style_list..');
-			$security->encodeHTML('editor_comment_colorset_list..title');			
-			
-            // 템플릿 파일 지정
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config');
-            $obj .= $tpl;
-			
-            return new Object();
-        }
-
-
-        function dispEditorPreview(){
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('preview');
-        }
-
-        function dispEditorSkinColorset(){
-            $skin = Context::get('skin');
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path,$skin);
-            $colorset = $skin_info->colorset;
-            Context::set('colorset', $colorset);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  editorView
+     * @author NHN (developers@xpressengine.com)
+     * @brief view class of the editor module
+     **/
+
+    class editorView extends editor {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Action to get a request to display compoenet pop-up
+         **/
+        function dispEditorPopup() {
+            // add a css file
+            Context::loadFile($this->module_path."tpl/css/editor.css", true);
+            // List variables
+            $editor_sequence = Context::get('editor_sequence');
+            $component = Context::get('component');
+
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+            // Get compoenet object
+            $oEditorModel = &getModel('editor');
+            $oComponent = &$oEditorModel->getComponentObject($component, $editor_sequence, $site_srl);
+            if(!$oComponent->toBool()) {
+                Context::set('message', sprintf(Context::getLang('msg_component_is_not_founded'), $component));
+                $this->setTemplatePath($this->module_path.'tpl');
+                $this->setTemplateFile('component_not_founded');
+            } else {
+                // Get the result after executing a method to display popup url of the component
+                $popup_content = $oComponent->getPopupContent();
+                Context::set('popup_content', $popup_content);
+                // Set layout to popup_layout
+                $this->setLayoutFile('popup_layout');
+                // Set a template
+                $this->setTemplatePath($this->module_path.'tpl');
+                $this->setTemplateFile('popup');
+            }
+        }
+
+        /**
+         * @brief Get component information
+         **/
+        function dispEditorComponentInfo() {
+            $component_name = Context::get('component_name');
+
+            $site_module_info = Context::get('site_module_info');
+            $site_srl = (int)$site_module_info->site_srl;
+
+            $oEditorModel = &getModel('editor');
+            $component = $oEditorModel->getComponent($component_name, $site_srl);
+            Context::set('component', $component);
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('view_component');
+            $this->setLayoutFile("popup_layout");
+        }
+
+        /**
+         * @brief Add a form for editor addition setup
+         **/
+        function triggerDispEditorAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // Get information of the current module
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+            // Get editors settings
+            $oEditorModel = &getModel('editor');
+            $editor_config = $oEditorModel->getEditorConfig($current_module_srl);
+
+            Context::set('editor_config', $editor_config);
+
+            $oModuleModel = &getModel('module');
+            // Get a list of editor skin
+            $editor_skin_list = FileHandler::readDir(_XE_PATH_.'modules/editor/skins');
+            Context::set('editor_skin_list', $editor_skin_list);
+
+            $skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->editor_skin);
+            Context::set('editor_colorset_list', $skin_info->colorset);
+            $skin_info = $oModuleModel->loadSkinInfo($this->module_path,$editor_config->comment_editor_skin);
+            Context::set('editor_comment_colorset_list', $skin_info->colorset);
+
+            $contents = FileHandler::readDir(_XE_PATH_.'modules/editor/styles');
+            for($i=0,$c=count($contents);$i<$c;$i++) {
+                $style = $contents[$i];
+                $info = $oModuleModel->loadSkinInfo($this->module_path,$style,'styles');
+                $content_style_list[$style]->title = $info->title;
+            }			
+            Context::set('content_style_list', $content_style_list);
+            // Get a group list
+            $oMemberModel = &getModel('member');
+            $site_module_info = Context::get('site_module_info');
+            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
+            Context::set('group_list', $group_list);
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('group_list..title');
+			$security->encodeHTML('group_list..description');
+			$security->encodeHTML('content_style_list..');
+			$security->encodeHTML('editor_comment_colorset_list..title');			
+
+			// Set a template file
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'editor_module_config');
+            $obj .= $tpl;
+			
+            return new Object();
+        }
+
+
+        function dispEditorPreview(){
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('preview');
+        }
+
+        function dispEditorSkinColorset(){
+            $skin = Context::get('skin');
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($this->module_path,$skin);
+            $colorset = $skin_info->colorset;
+
+			Context::set('colorset', $colorset);
+        }
+
+		function dispEditorConfigPreview() {
+			$oEditorModel = &getModel('editor');
+			$config = $oEditorModel->getEditorConfig();
+
+			$option->allow_fileupload = false;
+			$option->content_style = $config->content_style;
+			$option->content_font = $config->content_font;
+			$option->content_font_size = $config->content_font_size;
+			$option->enable_autosave = false;
+			$option->enable_default_component = true;
+			$option->enable_component = true;
+			$option->disable_html = false;
+			$option->height = $config->editor_height;
+			$option->skin = $config->editor_skin;
+			$option->content_key_name = 'dummy_content';
+			$option->primary_key_name = 'dummy_key';
+			$option->colorset = $config->sel_editor_colorset;
+			$editor = $oEditorModel->getEditor(0, $option);
+
+			Context::set('editor', $editor);
+
+			$option_com->allow_fileupload = false;
+			$option_com->content_style = $config->content_style;
+			$option_com->content_font = $config->content_font;
+			$option_com->content_font_size = $config->content_font_size;
+			$option_com->enable_autosave = false;
+			$option_com->enable_default_component = true;
+			$option_com->enable_component = true;
+			$option_com->disable_html = false;
+			$option_com->height = $config->comment_editor_height;
+			$option_com->skin = $config->comment_editor_skin;
+			$option_com->content_key_name = 'dummy_content2';
+			$option_com->primary_key_name = 'dummy_key2';
+			$option_com->content_style = $config->comment_content_style;
+			$option_com->colorset = $config->sel_comment_editor_colorset;
+
+			$editor_comment = $oEditorModel->getEditor(0, $option_com);
+
+			Context::set('editor_comment', $editor_comment);
+
+
+			$this->setTemplatePath($this->module_path.'tpl');
+			$this->setTemplateFile('config_preview');
+
+		}
+    }
+?>
diff --git a/modules/editor/lang/en.lang.php b/modules/editor/lang/en.lang.php
deleted file mode 100644
index 9cf0930dc..000000000
--- a/modules/editor/lang/en.lang.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  WYSIWYG Editor module's basic language pack
-     **/
-
-    $lang->editor = 'WYSIWYG Editor';
-    $lang->component_name = 'Component';
-    $lang->component_version = 'Version';
-    $lang->component_author = 'Developer';
-    $lang->component_link = 'Link';
-    $lang->component_date = 'Date';
-    $lang->component_license = 'License';
-    $lang->component_history = 'Updates';
-    $lang->component_description = 'Description';
-    $lang->component_extra_vars = 'Option Variable';
-    $lang->component_grant = 'Permission Setting';
-    $lang->content_style = 'Content Style';
-    $lang->content_font = 'Content Font';
-    $lang->content_font_size = 'Content Font Size';
-
-    $lang->about_component = 'About component';
-    $lang->about_component_grant = 'Selected group(s) will be able to use expanded components of editor.<br />(Leave them blank if you want all groups to have permission)';
-    $lang->about_component_mid = 'Editor components can select targets.<br />(All targets will be selected when nothing is selected)';
-
-    $lang->msg_component_is_not_founded = 'Cannot find editor component %s';
-    $lang->msg_component_is_inserted = 'Selected component is already inserted';
-    $lang->msg_component_is_first_order = 'Selected component is located at the first position';
-    $lang->msg_component_is_last_order = 'Selected component is located at the last position';
-    $lang->msg_load_saved_doc = "There is an automatically saved article. Do you wish to recover it?\nThe auto-saved draft will be discarded after saving current article";
-    $lang->msg_auto_saved = 'Automatically Saved';
-
-    $lang->cmd_disable = 'Inactive';
-    $lang->cmd_enable = 'Active';
-
-    $lang->editor_skin = 'Editor Skin';
-    $lang->upload_file_grant = 'Permission for Uploading';
-    $lang->enable_default_component_grant = 'Permission for Default Components';
-    $lang->enable_component_grant = 'Permission for Components';
-    $lang->enable_html_grant = 'Permission for HTML';
-    $lang->enable_autosave = 'Auto-Save';
-    $lang->height_resizable = 'Height Resizable';
-    $lang->editor_height = 'Height of Editor';
-
-    $lang->about_editor_skin = 'You may select the skin of editor.';
-    $lang->about_content_style = 'You may select style for editting article or displaying content';
-    $lang->about_content_font = 'You may select font for editting article or displaying content.<br/>Default font is your own font<br/> Please use comma(,) for multiple input.';
-	$lang->about_content_font_size = 'You may select font size for editting article or displaying content.<br/>Please input units such as px or em.';
-    $lang->about_upload_file_grant = 'Selected group(s) will be able to upload files. (Leave them blank if you want all groups to have permission)';
-    $lang->about_default_component_grant = 'Selected group(s) will be able to use default components of editor. (Leave them blank if you want all groups to have permission)';
-    $lang->about_editor_height = 'You may set the height of editor.';
-    $lang->about_editor_height_resizable = 'You may decide whether height of editor can be resized.';
-    $lang->about_enable_html_grant = 'Selected group(s) will be able to use HTML';
-    $lang->about_enable_autosave = 'You may decide whether auto-save function will be used.';
-
-    $lang->edit->fontname = 'Font';
-    $lang->edit->fontsize = 'Size';
-    $lang->edit->use_paragraph = 'Paragraph Function';
-    $lang->edit->fontlist = array(
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    $lang->edit->header = 'Style';
-    $lang->edit->header_list = array(
-    'h1' => 'Subject 1',
-    'h2' => 'Subject 2',
-    'h3' => 'Subject 3',
-    'h4' => 'Subject 4',
-    'h5' => 'Subject 5',
-    'h6' => 'Subject 6',
-    );
-
-    $lang->edit->submit = 'Submit';
-
-    $lang->edit->fontcolor = 'Text Color';
-	$lang->edit->fontcolor_apply = 'Apply Text Color';
-	$lang->edit->fontcolor_more = 'More Text Color';
-    $lang->edit->fontbgcolor = 'Background Color';
-	$lang->edit->fontbgcolor_apply = 'Apply Background Color';
-	$lang->edit->fontbgcolor_more = 'More Background Color';
-    $lang->edit->bold = 'Bold';
-    $lang->edit->italic = 'Italic';
-    $lang->edit->underline = 'Underline';
-    $lang->edit->strike = 'Strike';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Re Do';
-    $lang->edit->undo = 'Un Do';
-    $lang->edit->align_left = 'Align Left';
-    $lang->edit->align_center = 'Align Center';
-    $lang->edit->align_right = 'Align Right';
-    $lang->edit->align_justify = 'Align Justify';
-    $lang->edit->add_indent = 'Indent';
-    $lang->edit->remove_indent = 'Outdent';
-    $lang->edit->list_number = 'Orderd List';
-    $lang->edit->list_bullet = 'Unordered List';
-    $lang->edit->remove_format = 'Style Remover';
-
-    $lang->edit->help_remove_format = 'Tags in selected area will be removed';
-    $lang->edit->help_strike_through = 'Strike will be on the words';
-    $lang->edit->help_align_full = 'Align left and right';
-
-    $lang->edit->help_fontcolor = 'Select font color';
-    $lang->edit->help_fontbgcolor = 'Select background color of font';
-    $lang->edit->help_bold = 'Make font bold';
-    $lang->edit->help_italic = 'Make italic font';
-    $lang->edit->help_underline = 'Underline font';
-    $lang->edit->help_strike = 'Strike font';
-    $lang->edit->help_sup = 'Superscript';
-    $lang->edit->help_sub = 'Subscript';
-    $lang->edit->help_redo = 'Redo';
-    $lang->edit->help_undo = 'Undo';
-    $lang->edit->help_align_left = 'Align left';
-    $lang->edit->help_align_center = 'Align center';
-    $lang->edit->help_align_right = 'Align right';
-	$lang->edit->help_align_justify = 'Align justity';
-    $lang->edit->help_add_indent = 'Add indent';
-    $lang->edit->help_remove_indent = 'Remove indent';
-    $lang->edit->help_list_number = 'Apply number list';
-    $lang->edit->help_list_bullet = 'Apply bullet list';
-    $lang->edit->help_use_paragraph = 'Press Ctrl+Enter to use paragraph. (Press Alt+S to submit)';
-
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blockquote';
-    $lang->edit->table = 'Table';
-    $lang->edit->image = 'Image';
-    $lang->edit->multimedia = 'Movie';
-    $lang->edit->emoticon = 'Emoticon';
-
-	$lang->edit->file = 'Files';
-    $lang->edit->upload = 'Attachment';
-    $lang->edit->upload_file = 'Attach';
-	$lang->edit->upload_list = 'Attachment List';
-    $lang->edit->link_file = 'Insert to Content';
-    $lang->edit->delete_selected = 'Delete Selected';
-
-    $lang->edit->icon_align_article = 'Occupy a paragraph';
-    $lang->edit->icon_align_left = 'Align Left';
-    $lang->edit->icon_align_middle = 'Align Center';
-    $lang->edit->icon_align_right = 'Align Right';
-
-    $lang->about_dblclick_in_editor = 'You may set detail component configures by double-clicking background, text, images, or quotations';
-
-
-    $lang->edit->rich_editor = 'Rich Text Editor';
-    $lang->edit->html_editor = 'HTML Editor';
-    $lang->edit->extension ='Extension Components';
-    $lang->edit->help = 'Help';
-    $lang->edit->help_command = 'Help Hotkeys';
-    
-    $lang->edit->lineheight = 'Line Height';
-	$lang->edit->fontbgsampletext = 'ABC';
-	
-	$lang->edit->hyperlink = 'Hyperlink';
-	$lang->edit->target_blank = 'New Window';
-	
-	$lang->edit->quotestyle1 = 'Left Solid';
-	$lang->edit->quotestyle2 = 'Quote';
-	$lang->edit->quotestyle3 = 'Solid';
-	$lang->edit->quotestyle4 = 'Solid + Background';
-	$lang->edit->quotestyle5 = 'Bold Solid';
-	$lang->edit->quotestyle6 = 'Dotted';
-	$lang->edit->quotestyle7 = 'Dotted + Background';
-	$lang->edit->quotestyle8 = 'Cancel';
-
-
-    $lang->edit->jumptoedit = 'Skip Edit Toolbox';
-    $lang->edit->set_sel = 'Set Cell Count';
-    $lang->edit->row = 'Row';
-    $lang->edit->col = 'Column';
-    $lang->edit->add_one_row = 'Add 1 Row';
-    $lang->edit->del_one_row = 'Remove 1 Row';
-    $lang->edit->add_one_col = 'Add 1 Column';
-    $lang->edit->del_one_col = 'Remove 1 Column';
-
-    $lang->edit->table_config = 'Table Config';
-    $lang->edit->border_width = 'Border Width';
-    $lang->edit->border_color = 'Border Color';
-    $lang->edit->add = 'Add';
-    $lang->edit->del = 'Sub';
-    $lang->edit->search_color = 'Search Colors';
-    $lang->edit->table_backgroundcolor = 'Table Background Color';
-    $lang->edit->special_character = 'Special Characters';
-    $lang->edit->insert_special_character = 'Insert Special Characters';
-    $lang->edit->close_special_character = 'Close Special Characters Layer';
-    $lang->edit->symbol = 'Symbols';
-    $lang->edit->number_unit = 'Numbers and Units';
-    $lang->edit->circle_bracket = 'Circles, Brackets';
-    $lang->edit->korean = 'Korean';
-    $lang->edit->greece = 'Greek';
-    $lang->edit->Latin  = 'Latin';
-    $lang->edit->japan  = 'Japanese';
-    $lang->edit->selected_symbol  = 'Selected Symbols';
-
-    $lang->edit->search_replace  = 'Find/Replace';
-    $lang->edit->close_search_replace  = 'Close Find/Replace Layer';
-    $lang->edit->replace_all  = 'Replace All';
-    $lang->edit->search_words  = 'Words to Find';
-    $lang->edit->replace_words  = 'Words to Replace';
-    $lang->edit->next_search_words  = 'Find Next';
-    $lang->edit->edit_height_control  = 'Set Edit Form Size';
-
-    $lang->edit->merge_cells = 'Merge Table Cells';
-    $lang->edit->split_row = 'Split Row';
-    $lang->edit->split_col = 'Split Column';
-    
-    $lang->edit->toggle_list   = 'Fold/Unfold';
-    $lang->edit->minimize_list = 'Minimize';
-    
-    $lang->edit->move = 'Move';
-	$lang->edit->refresh = 'Refresh';
-    $lang->edit->materials = 'Materials';
-    $lang->edit->temporary_savings = 'Temporary Saved List';
-
-	$lang->edit->paging_prev = 'Prev';
-	$lang->edit->paging_next = 'Next';
-	$lang->edit->paging_prev_help = 'Move to previous page.';
-	$lang->edit->paging_next_help = 'Move to next page.';
-
-	$lang->edit->toc = 'Table of Contents';
-	$lang->edit->close_help = 'Close Help';
-	
-	$lang->edit->confirm_submit_without_saving = 'There is paragraphs that were not saved.\\nProceed anyway?';
-
-	$lang->edit->image_align = 'Image Alignment';
-	$lang->edit->attached_files = 'Attachments';
-
-	$lang->edit->fontcolor_input = 'Custom Text Color';
-	$lang->edit->fontbgcolor_input = 'Custom Background Color';
-	$lang->edit->pangram = 'The quick brown fox jumps over the lazy dog';
-
-	$lang->edit->table_caption_position = 'Table Caption &amp; Position';
-	$lang->edit->table_caption = 'Table Caption';
-	$lang->edit->table_header = 'Table Header';
-	$lang->edit->table_header_none = 'none';
-	$lang->edit->table_header_left = 'left';
-	$lang->edit->table_header_top = 'top';
-	$lang->edit->table_header_both = 'both';
-	$lang->edit->table_size = 'Table Size';
-	$lang->edit->table_width = 'Table Width';
-
-	$lang->edit->upper_left = 'Upper Left';
-	$lang->edit->upper_center = 'Upper Center';
-	$lang->edit->upper_right = 'Upper Right';
-	$lang->edit->bottom_left = 'Bottom Left';
-	$lang->edit->bottom_center = 'Bottom Center';
-	$lang->edit->bottom_right = 'Bottom Right';
-
-	$lang->edit->no_image = 'There is no images uploaded.';
-	$lang->edit->no_multimedia = 'There is no videos uploaded.';
-	$lang->edit->no_attachment = 'There is no files uploaded.';
-	$lang->edit->insert_selected = 'Insert Selected';
-	$lang->edit->delete_selected = 'Delete Selected';
-
-	$lang->edit->fieldset = 'Fieldset';
-	$lang->edit->paragraph = 'Paragraph';
-	
-	$lang->edit->autosave_format = 'You are writing for <strong>%s</strong>. Your article was saved <strong>%s</strong> recently.';
-	$lang->edit->autosave_hour = '%d hour';
-	$lang->edit->autosave_hours = '%d hours';
-	$lang->edit->autosave_min = '%d minute';
-	$lang->edit->autosave_mins = '%d minutes';
-	$lang->edit->autosave_hour_ago = '%d hour ago';
-	$lang->edit->autosave_hours_ago = '%d hours ago';
-	$lang->edit->autosave_min_ago = '%d minute ago';
-	$lang->edit->autosave_mins_ago = '%d minutes ago';
-	
-	$lang->edit->upload_not_enough_quota   = 'You cannot attach more.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
diff --git a/modules/editor/lang/es.lang.php b/modules/editor/lang/es.lang.php
deleted file mode 100644
index 897f3d22a..000000000
--- a/modules/editor/lang/es.lang.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-    /**
-     * @archivo  modules/editor/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma español para el editor de WYSIWYG
-     **/
-
-    $lang->editor = 'Editor WYSIWYG';
-    $lang->component_name = 'Componente';
-    $lang->component_version = 'Versión';
-    $lang->component_author = 'Autor';
-    $lang->component_link = 'Enlace';
-    $lang->component_date = 'Fecha';
-    $lang->component_license = 'License';
-    $lang->component_history = 'History';
-    $lang->component_description = 'Descripción';
-    $lang->component_extra_vars = 'Varibles Extras';
-    $lang->component_grant = 'Ajuste de las atribuciones';
-    $lang->content_style = 'Content Style';
-    $lang->content_font = 'Content Font';
-	$lang->content_font_size = '문서 폰트 크기';
-
-    $lang->about_component = 'Presentación del componente';
-    $lang->about_component_grant = 'Usted puede configurar el permiso de utilizar la ampliación de los componentes de editor.<br /> (Todo el mundo tendría permiso si no comprobado)';
-    $lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제시 모든 대상에서 사용 가능합니다)';
-
-    $lang->msg_component_is_not_founded = 'No se puede encontrar el componente del editor %s';
-    $lang->msg_component_is_inserted = 'El componente seleccionado ya esta insertado';
-    $lang->msg_component_is_first_order = 'El componente seleccionado se localiza en la primera posición';
-    $lang->msg_component_is_last_order = 'El componente seleccionado se localiza en la última posición';
-    $lang->msg_load_saved_doc = "Existe un documento guardado automáticamente ¿desea recuperarlo ?\nDespués de guardar el documento escrito, el documento autoguardado sera eliminado.";
-    $lang->msg_auto_saved = 'Documento guardado automáticamente';
-
-    $lang->cmd_disable = 'Desactivado';
-    $lang->cmd_enable = 'activado';
-
-    $lang->editor_skin = 'Editor de Cuidado de la Piel';
-    $lang->upload_file_grant = 'La autorización para cargar';
-    $lang->enable_default_component_grant = 'La autorización del uso de los componentes por defecto';
-    $lang->enable_component_grant = 'La autorización de la utilización de componentes';
-    $lang->enable_html_grant = 'La autorización de uso de HTML';
-    $lang->enable_autosave = 'Utilice función de guardado automático,';
-    $lang->height_resizable = 'Altura cambiar de tamaño';
-    $lang->editor_height = 'Altura de Editor';
-
-    $lang->about_editor_skin = 'Usted puede seleccionar la piel del editor.';
-    $lang->about_content_style = '문서 편집 및 내용 출력시 원하는 서식을 지정할 수 있습니다';
-    $lang->about_content_font = '문서 편집 및 내용 출력시 원하는 폰트를 지정할 수 있습니다.<br/>지정하지 않으면 사용자 설정에 따르게 됩니다<br/> ,(콤마)로 여러 폰트를 지정할 수 있습니다.';
-	$lang->about_content_font_size = '문서 편집 및 내용 출력시 원하는 폰트의 크기를 지정할 수 있습니다.<br/>12px, 1em등 단위까지 포함해서 입력해주세요.';
-    $lang->about_upload_file_grant = 'Usted puede configurar el permiso de archivo adjunto. (Todo el mundo tendría permiso si no comprobado)';
-    $lang->about_default_component_grant = 'Usted puede configurar el permiso de uso de los componentes de editor por defecto. (Todo el mundo tendría permiso si no comprobado)';
-    $lang->about_editor_height = 'Usted puede configurar la altura del editor.';
-    $lang->about_editor_height_resizable = 'Permiso para cambiar el tamaño de la altura del editor.';
-    $lang->about_enable_html_grant = 'Usted puede dar el permiso de uso de HTML';
-    $lang->about_enable_autosave = 'Usted puede permitir que la función de guardado automático, en tanto que función de la redacción de artículos';
-
-    $lang->edit->fontname = 'Fuente';
-    $lang->edit->fontsize = 'Tamaño';
-    $lang->edit->use_paragraph = 'Párrafo';
-    $lang->edit->fontlist = array(
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    $lang->edit->header = 'Estilo';
-    $lang->edit->header_list = array(
-    'h1' => 'Título 1',
-    'h2' => 'Título 2',
-    'h3' => 'Título 3',
-    'h4' => 'Título 4',
-    'h5' => 'Título 5',
-    'h6' => 'Título 6',
-    );
-
-    $lang->edit->submit = 'Confirmar';
-
-    $lang->edit->fontcolor = 'Text Color';
-	$lang->edit->fontcolor_apply = '글자 색 적용';
-	$lang->edit->fontcolor_more = '글자 색 더보기';
-    $lang->edit->fontbgcolor = 'Background Color';
-	$lang->edit->fontbgcolor_apply = '글자 배경색 적용';
-	$lang->edit->fontbgcolor_more = '글자 배경색 더보기';
-    $lang->edit->bold = 'Bold';
-    $lang->edit->italic = 'Italic';
-    $lang->edit->underline = 'Underline';
-    $lang->edit->strike = 'Strike';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Re Do';
-    $lang->edit->undo = 'Un Do';
-    $lang->edit->align_left = 'Align Left';
-    $lang->edit->align_center = 'Align Center';
-    $lang->edit->align_right = 'Align Right';
-    $lang->edit->align_justify = 'Align Justify';
-    $lang->edit->add_indent = 'Indent';
-    $lang->edit->remove_indent = 'Outdent';
-    $lang->edit->list_number = 'Orderd List';
-    $lang->edit->list_bullet = 'Unordered List';
-    $lang->edit->remove_format = 'Style Remover';
-
-    $lang->edit->help_fontcolor = 'Selecciona el color de las letras';
-    $lang->edit->help_fontbgcolor = 'Selecciona el color del fondo de la letras';
-    $lang->edit->help_bold = 'Letra gruesa';
-    $lang->edit->help_italic = 'Letra cursiva';
-    $lang->edit->help_underline = 'Letra subrayada';
-    $lang->edit->help_strike = 'Letra con linea';
-    $lang->edit->help_sup = 'Sup';
-    $lang->edit->help_sub = 'Sub';
-    $lang->edit->help_redo = 'Rehacer';
-    $lang->edit->help_undo = 'Deshacer';
-    $lang->edit->help_align_left = 'Margen izquierdo';
-    $lang->edit->help_align_center = 'Margen central';
-    $lang->edit->help_align_right = 'Margen derecho';
-	$lang->edit->help_align_justify = 'Align justity';
-    $lang->edit->help_add_indent = 'Anadir tabulación';
-    $lang->edit->help_remove_indent = 'Quitar tabulación';
-    $lang->edit->help_list_number = 'Aplicar la lista con números';
-    $lang->edit->help_list_bullet = 'Aplicar la lista con símbolos';
-    $lang->edit->help_use_paragraph = 'Presiona Ctrl+Enter para usar el párrafo (Presiona Alt+S para guardar)';
-
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blockquote';
-    $lang->edit->table = 'Table';
-    $lang->edit->image = 'Image';
-    $lang->edit->multimedia = 'Movie';
-    $lang->edit->emoticon = 'Emoticon';
-
-	$lang->edit->file = '파일';
-    $lang->edit->upload = 'Adjuntar';
-    $lang->edit->upload_file = 'Archivo adjunto';
-	$lang->edit->upload_list = '첨부 목록';
-    $lang->edit->link_file = 'Insertar en el contenido del documento';
-    $lang->edit->delete_selected = 'Eliminar lo seleccionado';
-
-    $lang->edit->icon_align_article = 'Ocupar un párrafo';
-    $lang->edit->icon_align_left = 'Margen izquierdo';
-    $lang->edit->icon_align_middle = 'Margen central';
-    $lang->edit->icon_align_right = 'Margen derecho';
-
-    $lang->about_dblclick_in_editor = 'Para la configuracion más detallada debera hacer dobleclick sobre el texto, imagen, fondo, etc.';
-
-
-    $lang->edit->rich_editor = '스타일 편집기';
-    $lang->edit->html_editor = 'HTML 편집기';
-    $lang->edit->extension ='확장 컴포넌트';
-    $lang->edit->help = '도움말';
-    $lang->edit->help_command = '단축키 안내';
-    
-    $lang->edit->lineheight = '줄간격';
-	$lang->edit->fontbgsampletext = '가나다';
-	
-	$lang->edit->hyperlink = '하이퍼링크';
-	$lang->edit->target_blank = '새창으로';
-	
-	$lang->edit->quotestyle1 = '왼쪽 실선';
-	$lang->edit->quotestyle2 = '인용 부호';
-	$lang->edit->quotestyle3 = '실선';
-	$lang->edit->quotestyle4 = '실선 + 배경';
-	$lang->edit->quotestyle5 = '굵은 실선';
-	$lang->edit->quotestyle6 = '점선';
-	$lang->edit->quotestyle7 = '점선 + 배경';
-	$lang->edit->quotestyle8 = '적용 취소';
-
-
-    $lang->edit->jumptoedit = '편집 도구모음 건너뛰기';
-    $lang->edit->set_sel = '칸 수 지정';
-    $lang->edit->row = '행';
-    $lang->edit->col = '열';
-    $lang->edit->add_one_row = '1행추가';
-    $lang->edit->del_one_row = '1행삭제';
-    $lang->edit->add_one_col = '1열추가';
-    $lang->edit->del_one_col = '1열삭제';
-
-    $lang->edit->table_config = '표 속성 지정';
-    $lang->edit->border_width = '테두리 굵기';
-    $lang->edit->border_color = '테두리 색';
-    $lang->edit->add = '더하기';
-    $lang->edit->del = '빼기';
-    $lang->edit->search_color = '색상찾기';
-    $lang->edit->table_backgroundcolor = '표 배경색';
-    $lang->edit->special_character = '특수문자';
-    $lang->edit->insert_special_character = '특수문자 삽입';
-    $lang->edit->close_special_character = '특수문자 레이어 닫기';
-    $lang->edit->symbol = '일반기호';
-    $lang->edit->number_unit = '숫자와 단위';
-    $lang->edit->circle_bracket = '원,괄호';
-    $lang->edit->korean = '한글';
-    $lang->edit->greece = '그리스';
-    $lang->edit->Latin  = '라틴어';
-    $lang->edit->japan  = '일본어';
-    $lang->edit->selected_symbol  = '선택한 기호';
-
-    $lang->edit->search_replace  = '찾기/바꾸기';
-    $lang->edit->close_search_replace  = '찾기/바꾸기 레이어 닫기';
-    $lang->edit->replace_all  = '모두바꾸기';
-    $lang->edit->search_words  = '찾을단어';
-    $lang->edit->replace_words  = '바꿀단어';
-    $lang->edit->next_search_words  = '다음찾기';
-    $lang->edit->edit_height_control  = '입력창 크기 조절';
-
-	$lang->edit->merge_cells = '셀 병합';
-    $lang->edit->split_row = '행 분할';
-    $lang->edit->split_col = '열 분할';
-    
-    $lang->edit->toggle_list   = '목록 접기/펼치기';
-    $lang->edit->minimize_list = '최소화';
-    
-    $lang->edit->move = '이동';
-	$lang->edit->refresh = 'Refresh';
-    $lang->edit->materials = '글감보관함';
-    $lang->edit->temporary_savings = '임시저장목록';
-
-	$lang->edit->paging_prev = '이전';
-	$lang->edit->paging_next = '다음';
-	$lang->edit->paging_prev_help = '이전 페이지로 이동합니다.';
-	$lang->edit->paging_next_help = '다음 페이지로 이동합니다.';
-
-	$lang->edit->toc = '목차';
-	$lang->edit->close_help = '도움말 닫기';
-
-	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
-
-	$lang->edit->image_align = '이미지 정렬';
-	$lang->edit->attached_files = '첨부 파일';
-
-	$lang->edit->fontcolor_input = '폰트색 직접입력';
-	$lang->edit->fontbgcolor_input = '배경색 직접입력';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다';
-
-	$lang->edit->table_caption_position = '표 제목(caption) 및 배치';
-	$lang->edit->table_caption = '표 제목(caption)';
-	$lang->edit->table_header = '머리글 셀(th)';
-	$lang->edit->table_header_none = '없음';
-	$lang->edit->table_header_left = '왼쪽';
-	$lang->edit->table_header_top = '위쪽';
-	$lang->edit->table_header_both = '모두';
-	$lang->edit->table_size = '표 크기';
-	$lang->edit->table_width = '표 폭';
-
-	$lang->edit->upper_left = '상단좌측';
-	$lang->edit->upper_center = '상단중앙';
-	$lang->edit->upper_right = '상단우측';
-	$lang->edit->bottom_left = '하단좌측';
-	$lang->edit->bottom_center = '하단중앙';
-	$lang->edit->bottom_right = '하단우측';
-
-	$lang->edit->no_image = '첨부된 이미지가 없습니다.';
-	$lang->edit->no_multimedia = '첨부된 동영상이 없습니다.';
-	$lang->edit->no_attachment = '첨부된 파일이 없습니다.';
-	$lang->edit->insert_selected = '선택 넣기';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->fieldset = '글상자';
-	$lang->edit->paragraph = '문단';
-	
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
\ No newline at end of file
diff --git a/modules/editor/lang/fr.lang.php b/modules/editor/lang/fr.lang.php
deleted file mode 100644
index bd56a59bc..000000000
--- a/modules/editor/lang/fr.lang.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Tel-tel Editeur
-     **/
-
-    $lang->editor = 'Tel-tel Editeur';
-    $lang->component_name = 'Composant';
-    $lang->component_version = 'Version';
-    $lang->component_author = 'Développeur';
-    $lang->component_link = 'Lien';
-    $lang->component_date = 'Jour de Création';
-    $lang->component_license = 'Licence';
-    $lang->component_history = 'Histoire';
-    $lang->component_description = 'Description';
-    $lang->component_extra_vars = 'Variables d\'Option';
-    $lang->component_grant = 'Configuration de la Permission';
-    $lang->content_style = 'Content Style';
-    $lang->content_font = 'Content Font';
-	$lang->content_font_size = '문서 폰트 크기';
-
-    $lang->about_component = 'Sur le Composant';
-    $lang->about_component_grant = 'Vous pouvez configurer la Permission d\'utiliser des composants additionnels de l\'Editeur.<br /> (Tout le monde aura la Permission si vous ne cochez rien)';
-    $lang->about_component_mid = 'Vous pouvez désigner les objectifs auquels les composants s\'appliquent<br />(Tous les objectifs auront la Permission quand rien n\'est choisi.)';
-
-    $lang->msg_component_is_not_founded = 'Ne peut pas trouver Composant %s';
-    $lang->msg_component_is_inserted = 'Composant choisi est déjà entré';
-    $lang->msg_component_is_first_order = 'Composant choisi est localisé à la première position';
-    $lang->msg_component_is_last_order = 'Composant choisi est localisé à la position dernière';
-    $lang->msg_load_saved_doc = "Il y a un article conservé automatiquement. Voulez-vous le réstaurer?\nL'esquisse conservé automatiquement va être débarrasser après conserver l'article courant.";
-    $lang->msg_auto_saved = 'Conservé automatiquement';
-
-    $lang->cmd_disable = 'Invalider';
-    $lang->cmd_enable = 'Valider';
-
-    $lang->editor_skin = 'Habillage de l\'Editeur';
-    $lang->upload_file_grant = 'Permission de télécharger(téléverser) ';
-    $lang->enable_default_component_grant = 'Permission d\'utiliser les Composants Par Défaut';
-    $lang->enable_component_grant = 'Permission d\'utiliser des composants';
-    $lang->enable_html_grant = 'Permission d\'utiliser HTML';
-    $lang->enable_autosave = 'Valider à conserver automatiquement';
-    $lang->height_resizable = 'Permettre de remettre l\'hauteur';
-    $lang->editor_height = 'Hauteur de l\'Editeur';
-
-    $lang->about_editor_skin = 'Vous pouvez choisir l\'habillage de l\'Editeur.';
-    $lang->about_content_style = '문서 편집 및 내용 출력시 원하는 서식을 지정할 수 있습니다';
-    $lang->about_content_font = '문서 편집 및 내용 출력시 원하는 폰트를 지정할 수 있습니다.<br/>지정하지 않으면 사용자 설정에 따르게 됩니다<br/> ,(콤마)로 여러 폰트를 지정할 수 있습니다.';
-	$lang->about_content_font_size = '문서 편집 및 내용 출력시 원하는 폰트의 크기를 지정할 수 있습니다.<br/>12px, 1em등 단위까지 포함해서 입력해주세요.';
-    $lang->about_upload_file_grant = 'Vous pouvez configurer la permission d\'attacher les fichiers. (Tout le monde aura la permission si vous ne cochez rien)';
-    $lang->about_default_component_grant = 'Vous pouvez configurer la permission d\'utiliser les Composants Par Défaut de l\'Editeur. (Tout le monde aura la permission si vous ne cochez rien)';
-    $lang->about_editor_height = 'Vous pouvez configurer l\'hauteur de l\'Editeur.';
-    $lang->about_editor_height_resizable = 'Permettre de remettre l\'hauteur de l\'Editeur.';
-    $lang->about_enable_html_grant = 'Vous pouvez permettre d\'utiliser HTML';
-    $lang->about_enable_autosave = 'Vous pouvez valider la fonction à Conserver Automatiquement pendant écrire des articles.';
-
-    $lang->edit->fontname = 'Police de caractères';
-    $lang->edit->fontsize = 'Mesure';
-    $lang->edit->use_paragraph = 'Fonctions sur Paragraphe';
-    $lang->edit->fontlist = array(
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    $lang->edit->header = 'Style';
-    $lang->edit->header_list = array(
-    'h1' => 'Titre 1',
-    'h2' => 'Titre 2',
-    'h3' => 'Titre 3',
-    'h4' => 'Titre 4',
-    'h5' => 'Titre 5',
-    'h6' => 'Titre 6',
-    );
-
-    $lang->edit->submit = 'Soumettre';
-
-    $lang->edit->fontcolor = 'Text Color';
-	$lang->edit->fontcolor_apply = '글자 색 적용';
-	$lang->edit->fontcolor_more = '글자 색 더보기';
-    $lang->edit->fontbgcolor = 'Background Color';
-	$lang->edit->fontbgcolor_apply = '글자 배경색 적용';
-	$lang->edit->fontbgcolor_more = '글자 배경색 더보기';
-    $lang->edit->bold = 'Bold';
-    $lang->edit->italic = 'Italic';
-    $lang->edit->underline = 'Underline';
-    $lang->edit->strike = 'Strike';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Re Do';
-    $lang->edit->undo = 'Un Do';
-    $lang->edit->align_left = 'Align Left';
-    $lang->edit->align_center = 'Align Center';
-    $lang->edit->align_right = 'Align Right';
-    $lang->edit->align_justify = 'Align Justify';
-    $lang->edit->add_indent = 'Indent';
-    $lang->edit->remove_indent = 'Outdent';
-    $lang->edit->list_number = 'Orderd List';
-    $lang->edit->list_bullet = 'Unordered List';
-    $lang->edit->remove_format = 'Style Remover';
-
-    $lang->edit->help_remove_format = 'Supprimer les balises dans l\'endroit sélectionné';
-    $lang->edit->help_strike_through = 'Représenter la ligne d\'annulation sur les lettres.';
-    $lang->edit->help_align_full = 'Aligner pleinement selon largeur';
-
-    $lang->edit->help_fontcolor = 'Désigner la couleur de la Police de caractères';
-    $lang->edit->help_fontbgcolor = 'Désigner la couleur de l\'arrière-plan de la Police de caractères.';
-    $lang->edit->help_bold = 'Caractère gras';
-    $lang->edit->help_italic = 'Caractère italique';
-    $lang->edit->help_underline = 'Caractère souligné';
-    $lang->edit->help_strike = 'Caractère biffé';
-    $lang->edit->help_sup = 'Sup';
-    $lang->edit->help_sub = 'Sub';
-    $lang->edit->help_redo = 'Réfaire';
-    $lang->edit->help_undo = 'Annuler';
-    $lang->edit->help_align_left = 'Aligner à gauche';
-    $lang->edit->help_align_center = 'Aligner centr';
-    $lang->edit->help_align_right = 'Aligner  droite';
-	$lang->edit->help_align_justify = 'Align justity';
-    $lang->edit->help_add_indent = 'Ajouter un Rentré';
-    $lang->edit->help_remove_indent = 'Enlever un Rentré';
-    $lang->edit->help_list_number = 'Appliquer la liste numroté';
-    $lang->edit->help_list_bullet = 'Appliquer la liste à puces';
-    $lang->edit->help_use_paragraph = 'Appuyez Ctrl+Enter pour séparer les paragraphe. (Appuyez Alt+S pour conserver)';
-
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blockquote';
-    $lang->edit->table = 'Table';
-    $lang->edit->image = 'Image';
-    $lang->edit->multimedia = 'Movie';
-    $lang->edit->emoticon = 'Emoticon';
-
-	$lang->edit->file = '파일';
-    $lang->edit->upload = 'Attacher';
-    $lang->edit->upload_file = 'Attacher un(des) Fichier(s)';
-	$lang->edit->upload_list = '첨부 목록';
-    $lang->edit->link_file = 'Insérer dans le Texte';
-    $lang->edit->delete_selected = 'Supprimer le Sélectionné';
-
-    $lang->edit->icon_align_article = 'Occuper un paragraphe';
-    $lang->edit->icon_align_left = 'Placer à gauche du texte';
-    $lang->edit->icon_align_middle = 'Placer au centre';
-    $lang->edit->icon_align_right = 'Placer à droite du texte';
-
-    $lang->about_dblclick_in_editor = 'Vous pouvez configurer en détail des composants par double-clic sur un arrière-plan, un texte, une image ou une citation';
-
-
-    $lang->edit->rich_editor = '스타일 편집기';
-    $lang->edit->html_editor = 'HTML 편집기';
-    $lang->edit->extension ='확장 컴포넌트';
-    $lang->edit->help = '도움말';
-    $lang->edit->help_command = '단축키 안내';
-    
-    $lang->edit->lineheight = '줄간격';
-	$lang->edit->fontbgsampletext = '가나다';
-	
-	$lang->edit->hyperlink = '하이퍼링크';
-	$lang->edit->target_blank = '새창으로';
-	
-	$lang->edit->quotestyle1 = '왼쪽 실선';
-	$lang->edit->quotestyle2 = '인용 부호';
-	$lang->edit->quotestyle3 = '실선';
-	$lang->edit->quotestyle4 = '실선 + 배경';
-	$lang->edit->quotestyle5 = '굵은 실선';
-	$lang->edit->quotestyle6 = '점선';
-	$lang->edit->quotestyle7 = '점선 + 배경';
-	$lang->edit->quotestyle8 = '적용 취소';
-
-
-    $lang->edit->jumptoedit = '편집 도구모음 건너뛰기';
-    $lang->edit->set_sel = '칸 수 지정';
-    $lang->edit->row = '행';
-    $lang->edit->col = '열';
-    $lang->edit->add_one_row = '1행추가';
-    $lang->edit->del_one_row = '1행삭제';
-    $lang->edit->add_one_col = '1열추가';
-    $lang->edit->del_one_col = '1열삭제';
-
-    $lang->edit->table_config = '표 속성 지정';
-    $lang->edit->border_width = '테두리 굵기';
-    $lang->edit->border_color = '테두리 색';
-    $lang->edit->add = '더하기';
-    $lang->edit->del = '빼기';
-    $lang->edit->search_color = '색상찾기';
-    $lang->edit->table_backgroundcolor = '표 배경색';
-    $lang->edit->special_character = '특수문자';
-    $lang->edit->insert_special_character = '특수문자 삽입';
-    $lang->edit->close_special_character = '특수문자 레이어 닫기';
-    $lang->edit->symbol = '일반기호';
-    $lang->edit->number_unit = '숫자와 단위';
-    $lang->edit->circle_bracket = '원,괄호';
-    $lang->edit->korean = '한글';
-    $lang->edit->greece = '그리스';
-    $lang->edit->Latin  = '라틴어';
-    $lang->edit->japan  = '일본어';
-    $lang->edit->selected_symbol  = '선택한 기호';
-
-    $lang->edit->search_replace  = '찾기/바꾸기';
-    $lang->edit->close_search_replace  = '찾기/바꾸기 레이어 닫기';
-    $lang->edit->replace_all  = '모두바꾸기';
-    $lang->edit->search_words  = '찾을단어';
-    $lang->edit->replace_words  = '바꿀단어';
-    $lang->edit->next_search_words  = '다음찾기';
-    $lang->edit->edit_height_control  = '입력창 크기 조절';
-
-	$lang->edit->merge_cells = '셀 병합';
-    $lang->edit->split_row = '행 분할';
-    $lang->edit->split_col = '열 분할';
-    
-    $lang->edit->toggle_list   = '목록 접기/펼치기';
-    $lang->edit->minimize_list = '최소화';
-    
-    $lang->edit->move = '이동';
-	$lang->edit->refresh = 'Refresh';
-    $lang->edit->materials = '글감보관함';
-    $lang->edit->temporary_savings = '임시저장목록';
-
-	$lang->edit->paging_prev = '이전';
-	$lang->edit->paging_next = '다음';
-	$lang->edit->paging_prev_help = '이전 페이지로 이동합니다.';
-	$lang->edit->paging_next_help = '다음 페이지로 이동합니다.';
-
-	$lang->edit->toc = '목차';
-	$lang->edit->close_help = '도움말 닫기';
-
-	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
-
-	$lang->edit->image_align = '이미지 정렬';
-	$lang->edit->attached_files = '첨부 파일';
-
-	$lang->edit->fontcolor_input = '폰트색 직접입력';
-	$lang->edit->fontbgcolor_input = '배경색 직접입력';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다';
-
-	$lang->edit->table_caption_position = '표 제목(caption) 및 배치';
-	$lang->edit->table_caption = '표 제목(caption)';
-	$lang->edit->table_header = '머리글 셀(th)';
-	$lang->edit->table_header_none = '없음';
-	$lang->edit->table_header_left = '왼쪽';
-	$lang->edit->table_header_top = '위쪽';
-	$lang->edit->table_header_both = '모두';
-	$lang->edit->table_size = '표 크기';
-	$lang->edit->table_width = '표 폭';
-
-	$lang->edit->upper_left = '상단좌측';
-	$lang->edit->upper_center = '상단중앙';
-	$lang->edit->upper_right = '상단우측';
-	$lang->edit->bottom_left = '하단좌측';
-	$lang->edit->bottom_center = '하단중앙';
-	$lang->edit->bottom_right = '하단우측';
-
-	$lang->edit->no_image = '첨부된 이미지가 없습니다.';
-	$lang->edit->no_multimedia = '첨부된 동영상이 없습니다.';
-	$lang->edit->no_attachment = '첨부된 파일이 없습니다.';
-	$lang->edit->insert_selected = '선택 넣기';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->fieldset = '글상자';
-	$lang->edit->paragraph = '문단';
-	
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
\ No newline at end of file
diff --git a/modules/editor/lang/jp.lang.php b/modules/editor/lang/jp.lang.php
deleted file mode 100644
index 5f7f2e080..000000000
--- a/modules/editor/lang/jp.lang.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ウィジウィグエディター（editor）モジュールの基本言語パッケージ
-     **/
-
-	$lang->editor = 'ウイジウイグエディター';
-	$lang->component_name = 'コンポーネント';
-	$lang->component_version = 'バージョン';
-	$lang->component_author = '作者';
-	$lang->component_link = 'リンク';
-	$lang->component_date = '作成日';
-	$lang->component_license = 'ライセンス';
-	$lang->component_history = '変更履歴';
-	$lang->component_description = '説明';
-	$lang->component_extra_vars = '設定変数';
-	$lang->component_grant = '権限設定';
-	$lang->content_style = 'コンテンツスタイル';
-	$lang->content_font = 'コンテンツフォント';
-	$lang->content_font_size = 'コンテンツフォントサイズ';
-
-	$lang->about_component = 'コンポーネント情報';
-	$lang->about_component_grant = '基本コンポーネント以外の拡張コンポーネント機能が利用可能な権限の設定が出来ます。<br />(選択なしの場合、誰でも利用可能)';
-	$lang->about_component_mid = 'エディターコンポーネントが使われる対象を指定します。<br />(選択なしの場合、全ての対象で利用可能)';
-
-	$lang->msg_component_is_not_founded = '%s エディターのコンポーネントが見つかりません。';
-	$lang->msg_component_is_inserted = '選択されたコンポーネントは既に入力されています。';
-	$lang->msg_component_is_first_order = '選択されたコンポーネントは最初に位置しています。';
-	$lang->msg_component_is_last_order = '選択されたコンポーネントは最後に位置しています。';
-	$lang->msg_load_saved_doc = "自動保存された書き込みがあります。復旧しますか？\n書き終わってから登録すると前の自動保存データは削除されます。";
-	$lang->msg_auto_saved = '自動保存されました。';
-
-	$lang->cmd_disable = '未使用';
-	$lang->cmd_enable = '使用';
-
-	$lang->editor_skin = 'エディタースキン';
-	$lang->upload_file_grant = 'ファイル添付権限';
-	$lang->enable_default_component_grant = '基本コンポーネント使用権限';
-	$lang->enable_component_grant = 'コンポーネント使用権限';
-	$lang->enable_html_grant = 'HTML編集権限';
-	$lang->enable_autosave = '自動保存使用';
-	$lang->height_resizable = '高さの調整';
-	$lang->editor_height = 'エディターの高さ';
-
-	$lang->about_editor_skin = 'エディターのスキンの選択が出来ます。';
-	$lang->about_content_style = 'コンテンツの編集、および内容表示の際のスタイルを指定します。';
-	$lang->about_content_font = 'コンテンツの編集、および内容表示の際のフォントを指定します。<br/>指定してない場合、ユーザーの設定を従います。<br/> 半角コンマ（,）区切りで複数フォントの登録が出来ます。';
-	$lang->about_content_font_size = 'コンテンツの編集、および内容表示の際のフォントサイズを指定します。<br/>12px、1emなどサイズ単位まで入力して下さい。';
-	$lang->about_upload_file_grant = 'ファイル添付可能な権限の設定が出来ます。(選択なしの場合、誰でも添付が可能)';
-	$lang->about_default_component_grant = 'エディターでの基本コンポーネントを使用可能な権限の設定が出来ます。(選択なしの場合、誰でも利用可能)';
-	$lang->about_editor_height = 'エディターの基本高さを設定します。';
-	$lang->about_editor_height_resizable = 'エディターの高さを変更出来るようにします。';
-	$lang->about_enable_html_grant = 'HTML編集権限を設定します。';
-	$lang->about_enable_autosave = '書き込みのとき、自動保存機能をオンにします。';
-
-	$lang->edit->fontname = 'フォント';
-	$lang->edit->fontsize = 'フォントサイズ';
-	$lang->edit->use_paragraph = '段落機能';
-	$lang->edit->fontlist = array(
-	'MS PGothic' => 'ＭＳ Ｐゴシック',
-	'MS PMincho' => 'ＭＳ Ｐ明朝',
-	'MS UI Gothic' => 'MS UI Gothic',
-	'Arial' => 'Arial',
-	'Arial Black' => 'Arial Black',
-	'Tahoma' => 'Tahoma',
-	'Verdana' => 'Verdana',
-	'Sans-serif' => 'Sans-serif',
-	'Serif' => 'Serif',
-	'Monospace' => 'Monospace',
-	'Cursive' => 'Cursive',
-	'Fantasy' => 'Fantasy',
-	);
-
-	$lang->edit->header = '見出し';
-	$lang->edit->header_list = array(
-	'h1' => '見出し１',
-	'h2' => '見出し２',
-	'h3' => '見出し３',
-	'h4' => '見出し４',
-	'h5' => '見出し５',
-	'h6' => '見出し６',
-	);
-
-	$lang->edit->submit = '送信';
-
-	$lang->edit->fontcolor = 'テキストの色';
-	$lang->edit->fontcolor_apply = 'テキスト色適用';
-	$lang->edit->fontcolor_more = '他のテキスト色';
-	$lang->edit->fontbgcolor = 'テキストの背景色';
-	$lang->edit->fontbgcolor_apply = 'テキスト背景色適用';
-	$lang->edit->fontbgcolor_more = '他のテキスト背景色';
-	$lang->edit->bold = '太字';
-	$lang->edit->italic = '斜体';
-	$lang->edit->underline = '下線';
-	$lang->edit->strike = '取り消し線';
-	$lang->edit->sup = '上付き文字';
-	$lang->edit->sub = '下付き文字';
-	$lang->edit->redo = '繰り返し';
-	$lang->edit->undo = '元に戻す';
-	$lang->edit->align_left = '左揃え';
-	$lang->edit->align_center = '中央揃え';
-	$lang->edit->align_right = '右揃え';
-	$lang->edit->align_justify = '均等割付';
-	$lang->edit->add_indent = 'インデント増';
-	$lang->edit->remove_indent = 'インデント減';
-	$lang->edit->list_number = '番号付リスト';
-	$lang->edit->list_bullet = '箇条書き';
-	$lang->edit->remove_format = '書式をクリア';
-
-	$lang->edit->help_remove_format = '選択領域の中のタグを消します。';
-	$lang->edit->help_strike_through = 'テキストに取り消し線を表示します。';
-	$lang->edit->help_align_full = '左右の余白に合わせて文字列を配置します。';
-
-	$lang->edit->help_fontcolor = 'テキストの色を指定します。';
-	$lang->edit->help_fontbgcolor = 'テキストの背景色を指定します。';
-	$lang->edit->help_bold = 'テキストを太字に指定します。';
-	$lang->edit->help_italic = 'テキストを斜体にします。';
-	$lang->edit->help_underline = 'テキストに下線（アンダーライン）を引きます。';
-	$lang->edit->help_strike = '取り消し線を引きます。';
-	$lang->edit->help_sup = '上付き文字';
-	$lang->edit->help_sub = '下付き文字';
-	$lang->edit->help_redo = '繰り返し';
-	$lang->edit->help_undo = '元に戻す';
-	$lang->edit->help_align_left = 'テキストを左揃えで表示します。';
-	$lang->edit->help_align_center = 'テキストを中央揃えで表示します。';
-	$lang->edit->help_align_right = 'テキストを右揃えで表示します。';
-	$lang->edit->help_align_justify = 'テキストを両端揃えで表示します。';
-	$lang->edit->help_add_indent = 'インデントを増やします。';
-	$lang->edit->help_remove_indent = 'インデントを減らします。';
-	$lang->edit->help_list_number = '番号付リスト';
-	$lang->edit->help_list_bullet = '箇条書き';
-	$lang->edit->help_use_paragraph = '段落機能を使用する場合は、「Ctrl+Enter」を押します（書き終わった後、「Alt+S」を押すと保存されます）。';
-
-	$lang->edit->url = 'リンク';
-	$lang->edit->blockquote = '引用文';
-	$lang->edit->table = '表';
-	$lang->edit->image = 'イメージ';
-	$lang->edit->multimedia = '動画';
-	$lang->edit->emoticon = '絵文字';
-
-	$lang->edit->file = 'ファイル';
-	$lang->edit->upload = '添付';
-	$lang->edit->upload_file = 'ファイル添付';
-	$lang->edit->upload_list = '添付リスト';
-	$lang->edit->link_file = 'テキスト挿入';
-	$lang->edit->delete_selected = '選択リスト削除';
-
-	$lang->edit->icon_align_article = '一段落';
-	$lang->edit->icon_align_left = '左揃え';
-	$lang->edit->icon_align_middle = '中央揃え';
-	$lang->edit->icon_align_right = '右揃え';
-
-	$lang->about_dblclick_in_editor = '背景、文字、イメージ、引用文の上にカーソルを合わせ、ダブルクリックすると詳細設定出来るコンポーネントを表示します。';
-
-	$lang->edit->rich_editor = 'ウイジウイグ編集';
-	$lang->edit->html_editor = 'HTMLタグ編集';
-	$lang->edit->extension ='拡張コンポーネント';
-	$lang->edit->help = 'ヘルプ';
-	$lang->edit->help_command = 'ショートカット‐キーの説明';
-
-	$lang->edit->lineheight = '行間';
-	$lang->edit->fontbgsampletext = 'あいうえお';
-
-	$lang->edit->hyperlink = 'ハイパーリンク';
-	$lang->edit->target_blank = '別のウィンドウズで';
-
-	$lang->edit->quotestyle1 = '左側実線';
-	$lang->edit->quotestyle2 = '引用記号';
-	$lang->edit->quotestyle3 = '実線';
-	$lang->edit->quotestyle4 = '実線 + 背景';
-	$lang->edit->quotestyle5 = '太い実線';
-	$lang->edit->quotestyle6 = '点線';
-	$lang->edit->quotestyle7 = '点線 + 背景';
-	$lang->edit->quotestyle8 = '適用取り消し';
-
-
-	$lang->edit->jumptoedit = '編集ツール省略';
-	$lang->edit->set_sel = 'マス数の指定';
-	$lang->edit->row = '行';
-	$lang->edit->col = '列';
-	$lang->edit->add_one_row = '1行追加';
-	$lang->edit->del_one_row = '1行削除';
-	$lang->edit->add_one_col = '1列追加';
-	$lang->edit->del_one_col = '1列削除';
-
-	$lang->edit->table_config = 'テーブル属性の設定';
-	$lang->edit->border_width = '外枠太さ';
-	$lang->edit->border_color = '外枠色';
-	$lang->edit->add = '挿入';
-	$lang->edit->del = '削除';
-	$lang->edit->search_color = 'その他の色';
-	$lang->edit->table_backgroundcolor = '表の背景色';
-	$lang->edit->special_character = '特殊文字';
-	$lang->edit->insert_special_character = '特殊文字挿入';
-	$lang->edit->close_special_character = '特殊文字レイヤーを閉じる';
-	$lang->edit->symbol = '一般記号';
-	$lang->edit->number_unit = '数字と単位';
-	$lang->edit->circle_bracket = '円、括弧';
-	$lang->edit->korean = '韓国語';
-	$lang->edit->greece = 'ギリシャ語';
-	$lang->edit->Latin  = 'ラテン語';
-	$lang->edit->japan  = '日本語';
-	$lang->edit->selected_symbol  = '選択した記号';
-
-	$lang->edit->search_replace  = '検索/置換';
-	$lang->edit->close_search_replace  = '検索/置換レイヤーを閉じる';
-	$lang->edit->replace_all  = 'すべて置換';
-	$lang->edit->search_words  = '検索テキスト';
-	$lang->edit->replace_words  = '置換テキスト';
-	$lang->edit->next_search_words  = '次を検索';
-	$lang->edit->edit_height_control  = '入力サイズ調整';
-	
-	$lang->edit->merge_cells = 'セルの結合';
-	$lang->edit->split_row = '行の挿入';
-	$lang->edit->split_col = '列の挿入';
-	
-	$lang->edit->toggle_list   = 'リストを折りたたむ/展開する';
-	$lang->edit->minimize_list = '最小化';
-	
-	$lang->edit->move = '移動';
-	$lang->edit->refresh = '再読み込み';
-	$lang->edit->materials = '資料箱';
-	$lang->edit->temporary_savings = '下書きリスト';
-
-	$lang->edit->paging_prev = '前へ';
-	$lang->edit->paging_next = '次へ';
-	$lang->edit->paging_prev_help = '前のページへ移動します。';
-	$lang->edit->paging_next_help = '次のページへ移動します。';
-
-	$lang->edit->toc = 'リスト';
-	$lang->edit->close_help = 'ヘルプを閉じる';
-
-	$lang->edit->confirm_submit_without_saving = 'まだ保存してない内容があります。\\nそのまま転送して宜しいでしょうか？';
-
-	$lang->edit->image_align = 'イメージの配置';
-	$lang->edit->attached_files = '添付ファイル';
-
-	$lang->edit->fontcolor_input = 'テキスト色直接入力';
-	$lang->edit->fontbgcolor_input = 'テキスト背景色直接入力';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다';
-
-	$lang->edit->table_caption_position = 'キャプションの配置';
-	$lang->edit->table_caption = '表のキャプション';
-	$lang->edit->table_header = '머리글 셀(th)';
-	$lang->edit->table_header_none = 'なし';
-	$lang->edit->table_header_left = '左';
-	$lang->edit->table_header_top = '上';
-	$lang->edit->table_header_both = '両方';
-	$lang->edit->table_size = '表の大きさ';
-	$lang->edit->table_width = '表幅';
-
-	$lang->edit->upper_left = '上端左';
-	$lang->edit->upper_center = '上端中央';
-	$lang->edit->upper_right = '上端右';
-	$lang->edit->bottom_left = '下端左';
-	$lang->edit->bottom_center = '下端中央';
-	$lang->edit->bottom_right = '下端右';
-
-	$lang->edit->no_image = '添付されたイメージがありません。';
-	$lang->edit->no_multimedia = '添付された動画がありません。';
-	$lang->edit->no_attachment = '添付されたファイルがありません。';
-	$lang->edit->insert_selected = '選択挿入';
-	$lang->edit->delete_selected = '選択削除';
-
-	$lang->edit->fieldset = 'テキストボックス';
-	$lang->edit->paragraph = '段落';
-	
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
diff --git a/modules/editor/lang/ko.lang.php b/modules/editor/lang/ko.lang.php
deleted file mode 100644
index 0147af5a6..000000000
--- a/modules/editor/lang/ko.lang.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/lang/ko.lang.php
-	 * @author NHN (developers@xpressengine.com)
-	 * @brief  위지윅에디터(editor) 모듈의 기본 언어팩
-	 **/
-
-	$lang->editor = '위지윅 에디터';
-	$lang->component_name = '컴포넌트';
-	$lang->component_version = '버전';
-	$lang->component_author = '제작자 ';
-	$lang->component_link = '링크';
-	$lang->component_date = '제작일';
-	$lang->component_license = '라이선스';
-	$lang->component_history = '변경 이력';
-	$lang->component_description = '설명';
-	$lang->component_extra_vars = '설정 변수';
-	$lang->component_grant = '권한설정';
-	$lang->content_style = '문서 서식';
-	$lang->content_font = '문서 폰트';
-	$lang->content_font_size = '문서 폰트 크기';
-
-	$lang->about_component = '컴포넌트 소개';
-	$lang->about_component_grant = '기본 컴포넌트외의 확장 컴포넌트 기능을 사용할 수 있는 권한을 지정할 수 있습니다.<br /> (모두 해제 시 아무나 사용 가능합니다)';
-	$lang->about_component_mid = '에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.<br />(모두 해제 시 모든 대상에서 사용 가능합니다)';
-
-	$lang->msg_component_is_not_founded = '%s 에디터 컴포넌트를 찾을 수 없습니다.';
-	$lang->msg_component_is_inserted = '선택하신 컴포넌트는 이미 입력되어 있습니다.';
-	$lang->msg_component_is_first_order = '선택하신 컴포넌트는 첫 번째에 위치하고 있습니다.';
-	$lang->msg_component_is_last_order = '선택하신 컴포넌트는 마지막에 위치하고 있습니다.';
-	$lang->msg_load_saved_doc = "자동 저장된 글이 있습니다. 복구하시겠습니까?\n글을 다 쓰신 후 저장하시면 자동 저장 본은 사라집니다.";
-	$lang->msg_auto_saved = '자동 저장되었습니다.';
-
-	$lang->cmd_disable = '비활성';
-	$lang->cmd_enable = '활성';
-
-	$lang->editor_skin = '에디터 스킨';
-	$lang->upload_file_grant = '파일 첨부 권한';
-	$lang->enable_default_component_grant = '기본 컴포넌트 사용 권한';
-	$lang->enable_component_grant = '컴포넌트 사용 권한';
-	$lang->enable_html_grant = 'HTML편집 권한';
-	$lang->enable_autosave = '자동저장 사용';
-	$lang->height_resizable = '높이 조절 가능';
-	$lang->editor_height = '에디터 높이';
-
-	$lang->about_editor_skin = '에디터 스킨을 선택하실 수 있습니다';
-	$lang->about_content_style = '문서 편집 및 내용 출력 시 원하는 서식을 지정할 수 있습니다';
-	$lang->about_content_font = '문서 편집 및 내용 출력 시 원하는 폰트를 지정할 수 있습니다.<br/>지정하지 않으면 사용자 설정에 따르게 됩니다<br/> ,(콤마)로 여러 폰트를 지정할 수 있습니다.';
-	$lang->about_content_font_size = '문서 편집 및 내용 출력 시 원하는 폰트의 크기를 지정할 수 있습니다.<br/>12px, 1em등 단위까지 포함해서 입력해주세요.';
-	$lang->about_upload_file_grant = '파일을 첨부할 수 있는 권한을 지정하실 수 있습니다. (모두 해제 시 아무나 첨부 가능합니다)';
-	$lang->about_default_component_grant = '에디터에서 사용되는 기본 컴포넌트를 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제 시 아무나 사용 가능합니다)';
-	$lang->about_editor_height = '에디터의 기본 높이를 지정하실 수 있습니다.';
-	$lang->about_editor_height_resizable = '에디터의 높이를 직접 변경할 수 있도록 허용합니다.';
-	$lang->about_enable_html_grant = 'HTML편집 권한을 부여할 수 있습니다.';
-	$lang->about_enable_autosave = '글 작성 시 자동 저장 기능을 활성화 시킬 수 있습니다.';
-
-	$lang->edit->fontname = '글꼴';
-	$lang->edit->fontsize = '크기';
-	$lang->edit->use_paragraph = '문단기능';
-	$lang->edit->fontlist = array(
-	'Dotum' => '돋움',
-	'Gulim' => '굴림',
-	'Batang' => '바탕',
-	'Arial' => 'Arial',
-	'Arial Black' => 'Arial Black',
-	'Tahoma' => 'Tahoma',
-	'Verdana' => 'Verdana',
-	'Sans-serif' => 'Sans-serif',
-	'Serif' => 'Serif',
-	'Monospace' => 'Monospace',
-	'Cursive' => 'Cursive',
-	'Fantasy' => 'Fantasy',
-	);
-
-	$lang->edit->header = '형식';
-	$lang->edit->header_list = array(
-	'h1' => '제목 1',
-	'h2' => '제목 2',
-	'h3' => '제목 3',
-	'h4' => '제목 4',
-	'h5' => '제목 5',
-	'h6' => '제목 6',
-	);
-
-	$lang->edit->submit = '확인';
-
-	$lang->edit->fontcolor = '글자 색';
-	$lang->edit->fontcolor_apply = '글자 색 적용';
-	$lang->edit->fontcolor_more = '글자 색 더보기';
-	$lang->edit->fontbgcolor = '글자 배경색';
-	$lang->edit->fontbgcolor_apply = '글자 배경색 적용';
-	$lang->edit->fontbgcolor_more = '글자 배경색 더보기';
-	$lang->edit->bold = '진하게';
-	$lang->edit->italic = '기울임';
-	$lang->edit->underline = '밑줄';
-	$lang->edit->strike = '취소선';
-	$lang->edit->sup = '위 첨자';
-	$lang->edit->sub = '아래 첨자';
-	$lang->edit->redo = '다시 실행';
-	$lang->edit->undo = '되돌리기';
-	$lang->edit->align_left = '왼쪽 정렬';
-	$lang->edit->align_center = '가운데 정렬';
-	$lang->edit->align_right = '오른쪽 정렬';
-	$lang->edit->align_justify = '양쪽 정렬';
-	$lang->edit->add_indent = '들여쓰기';
-	$lang->edit->remove_indent = '내어쓰기';
-	$lang->edit->list_number = '번호 매기기';
-	$lang->edit->list_bullet = '목록';
-	$lang->edit->remove_format = '글맵시 지우기';
-
-	$lang->edit->help_remove_format = '선택된 영역 내의 태그를 지웁니다.';
-	$lang->edit->help_strike_through = '글자에 취소선을 표시합니다.';
-	$lang->edit->help_align_full = '좌우 폭에 맞게 정렬을 합니다.';
-
-	$lang->edit->help_fontcolor = '글자의 색상을 지정합니다.';
-	$lang->edit->help_fontbgcolor = '글자의 배경색상을 지정합니다.';
-	$lang->edit->help_bold = '글자를 진하게 합니다.';
-	$lang->edit->help_italic = '글자를 기울이게 합니다.';
-	$lang->edit->help_underline = '밑줄을 긋습니다.';
-	$lang->edit->help_strike = '취소선을 긋습니다.';
-	$lang->edit->help_sup = '위 첨자를 입력합니다.';
-	$lang->edit->help_sub = '아래 첨자를 입력합니다.';
-	$lang->edit->help_redo = '다음 동작으로 돌아갑니다.';
-	$lang->edit->help_undo = '이전 동작으로 돌아갑니다.';
-	$lang->edit->help_align_left = '왼쪽 정렬을 합니다.';
-	$lang->edit->help_align_center = '가운데 정렬을 합니다.';
-	$lang->edit->help_align_right = '오른쪽 정렬을 합니다.';
-	$lang->edit->help_align_justify = '양쪽 정렬을 합니다.';
-	$lang->edit->help_add_indent = '단락의 들여쓰기 수준을 높입니다.';
-	$lang->edit->help_remove_indent = '단락의 들여쓰기 수준을 낮춥니다.';
-	$lang->edit->help_list_number = '숫자로된 목록을 적용합니다.';
-	$lang->edit->help_list_bullet = '기호로된 목록을 적용합니다.';
-	$lang->edit->help_use_paragraph = '문단 나누기를 하시려면 Ctrl+Enter를 누르시면 됩니다. (글 작성완료 후 Alt+S를 누르면 저장이 됩니다.)';
-
-	$lang->edit->url = '링크';
-	$lang->edit->blockquote = '인용문';
-	$lang->edit->table = '표';
-	$lang->edit->image = '그림';
-	$lang->edit->multimedia = '동영상';
-	$lang->edit->emoticon = '이모티콘';
-
-	$lang->edit->file = '파일';
-	$lang->edit->upload = '첨부';
-	$lang->edit->upload_file = '파일 첨부';
-	$lang->edit->upload_list = '첨부 목록';
-	$lang->edit->link_file = '본문 삽입';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->icon_align_article = '한 문단을 차지';
-	$lang->edit->icon_align_left = '글의 왼쪽으로';
-	$lang->edit->icon_align_middle = '가운데 정렬';
-	$lang->edit->icon_align_right = '글의 우측으로';
-
-	$lang->about_dblclick_in_editor = '배경, 글자, 이미지, 인용문등에서 더블클릭을 하시면 상세한 컴포넌트 설정이 가능합니다.';
-
-	$lang->edit->rich_editor = '스타일 편집기';
-	$lang->edit->html_editor = 'HTML 편집기';
-	$lang->edit->extension ='확장 컴포넌트';
-	$lang->edit->help = '도움말';
-	$lang->edit->help_command = '단축키 안내';
-
-	$lang->edit->lineheight = '줄 간격';
-	$lang->edit->fontbgsampletext = '가나다';
-
-	$lang->edit->hyperlink = '하이퍼링크';
-	$lang->edit->target_blank = '새 창으로';
-
-	$lang->edit->quotestyle1 = '왼쪽 실선';
-	$lang->edit->quotestyle2 = '인용 부호';
-	$lang->edit->quotestyle3 = '실선';
-	$lang->edit->quotestyle4 = '실선 + 배경';
-	$lang->edit->quotestyle5 = '굵은 실선';
-	$lang->edit->quotestyle6 = '점선';
-	$lang->edit->quotestyle7 = '점선 + 배경';
-	$lang->edit->quotestyle8 = '적용 취소';
-
-
-	$lang->edit->jumptoedit = '편집 도구모음 건너뛰기';
-	$lang->edit->set_sel = '칸 수 지정';
-	$lang->edit->row = '행';
-	$lang->edit->col = '열';
-	$lang->edit->add_one_row = '1행 추가';
-	$lang->edit->del_one_row = '1행 삭제';
-	$lang->edit->add_one_col = '1열 추가';
-	$lang->edit->del_one_col = '1열 삭제';
-
-	$lang->edit->table_config = '표 속성 지정';
-	$lang->edit->border_width = '테두리 굵기';
-	$lang->edit->border_color = '테두리 색';
-	$lang->edit->add = '더하기';
-	$lang->edit->del = '빼기';
-	$lang->edit->search_color = '색상 찾기';
-	$lang->edit->table_backgroundcolor = '표 배경색';
-	$lang->edit->special_character = '특수문자';
-	$lang->edit->insert_special_character = '특수문자 삽입';
-	$lang->edit->close_special_character = '특수문자 레이어 닫기';
-	$lang->edit->symbol = '일반기호';
-	$lang->edit->number_unit = '숫자와 단위';
-	$lang->edit->circle_bracket = '원, 괄호';
-	$lang->edit->korean = '한글';
-	$lang->edit->greece = '그리스';
-	$lang->edit->Latin  = '라틴어';
-	$lang->edit->japan  = '일본어';
-	$lang->edit->selected_symbol  = '선택한 기호';
-
-	$lang->edit->search_replace  = '찾기/바꾸기';
-	$lang->edit->close_search_replace  = '찾기/바꾸기 레이어 닫기';
-	$lang->edit->replace_all  = '모두 바꾸기';
-	$lang->edit->search_words  = '찾을 단어';
-	$lang->edit->replace_words  = '바꿀 단어';
-	$lang->edit->next_search_words  = '다음 찾기';
-	$lang->edit->edit_height_control  = '입력창 크기 조절';
-	
-	$lang->edit->merge_cells = '셀 병합';
-	$lang->edit->split_row = '행 분할';
-	$lang->edit->split_col = '열 분할';
-	
-	$lang->edit->toggle_list   = '목록 접기/펼치기';
-	$lang->edit->minimize_list = '최소화';
-	
-	$lang->edit->move = '이동';
-	$lang->edit->refresh = '새로 고침';
-	$lang->edit->materials = '글감 보관함';
-	$lang->edit->temporary_savings = '임시 저장 목록';
-
-	$lang->edit->paging_prev = '이전';
-	$lang->edit->paging_next = '다음';
-	$lang->edit->paging_prev_help = '이전 페이지로 이동합니다.';
-	$lang->edit->paging_next_help = '다음 페이지로 이동합니다.';
-
-	$lang->edit->toc = '목차';
-	$lang->edit->close_help = '도움말 닫기';
-
-	$lang->edit->confirm_submit_without_saving = '저장하지 않은 단락이 있습니다.\\n그냥 전송하시겠습니까?';
-
-	$lang->edit->image_align = '이미지 정렬';
-	$lang->edit->attached_files = '첨부 파일';
-
-	$lang->edit->fontcolor_input = '글자 색 직접입력';
-	$lang->edit->fontbgcolor_input = '글자 배경색 직접입력';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다.';
-
-	$lang->edit->table_caption_position = '표 제목(caption) 및 배치';
-	$lang->edit->table_caption = '표 제목(caption)';
-	$lang->edit->table_header = '머릿글 칸(th)';
-	$lang->edit->table_header_none = '없음';
-	$lang->edit->table_header_left = '왼쪽';
-	$lang->edit->table_header_top = '위쪽';
-	$lang->edit->table_header_both = '모두';
-	$lang->edit->table_size = '표 크기';
-	$lang->edit->table_width = '표 너비';
-
-	$lang->edit->upper_left = '상단좌측';
-	$lang->edit->upper_center = '상단중앙';
-	$lang->edit->upper_right = '상단우측';
-	$lang->edit->bottom_left = '하단좌측';
-	$lang->edit->bottom_center = '하단중앙';
-	$lang->edit->bottom_right = '하단우측';
-
-	$lang->edit->no_image = '첨부된 이미지가 없습니다.';
-	$lang->edit->no_multimedia = '첨부된 동영상이 없습니다.';
-	$lang->edit->no_attachment = '첨부된 파일이 없습니다.';
-	$lang->edit->insert_selected = '선택 넣기';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->fieldset = '글상자';
-	$lang->edit->paragraph = '문단';
-
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
\ No newline at end of file
diff --git a/modules/editor/lang/lang.xml b/modules/editor/lang/lang.xml
new file mode 100644
index 000000000..1e87fb71f
--- /dev/null
+++ b/modules/editor/lang/lang.xml
@@ -0,0 +1,2109 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="editor_preview">
+		<value xml:lang="ko"><![CDATA[에디터 미리보기]]></value>
+		<value xml:lang="en"><![CDATA[Editor Preview]]></value>
+		<value xml:lang="jp"><![CDATA[エディタープレビュー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Editor Preview]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Editor Preview]]></value>
+		<value xml:lang="ru"><![CDATA[Editor Preview]]></value>
+		<value xml:lang="tr"><![CDATA[Editor Preview]]></value>
+		<value xml:lang="vi"><![CDATA[Editor Preview]]></value>
+	</item>
+	<item name="editor_component">
+		<value xml:lang="ko"><![CDATA[에디터 컴포넌트]]></value>
+		<value xml:lang="en"><![CDATA[Editor Component]]></value>
+		<value xml:lang="jp"><![CDATA[エディターコンポーネント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Editor Component]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Editor Component]]></value>
+		<value xml:lang="ru"><![CDATA[Editor Component]]></value>
+		<value xml:lang="tr"><![CDATA[Editor Component]]></value>
+		<value xml:lang="vi"><![CDATA[Editor Component]]></value>
+	</item>
+	<item name="main_editor">
+		<value xml:lang="ko"><![CDATA[본문 에디터]]></value>
+		<value xml:lang="en"><![CDATA[Main editor]]></value>
+		<value xml:lang="jp"><![CDATA[本文 エディター]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Main editor]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Main editor]]></value>
+		<value xml:lang="ru"><![CDATA[Main editor]]></value>
+		<value xml:lang="tr"><![CDATA[Main editor]]></value>
+		<value xml:lang="vi"><![CDATA[Main editor]]></value>
+	</item>
+	<item name="comment_editor">
+		<value xml:lang="ko"><![CDATA[댓글 에디터]]></value>
+		<value xml:lang="en"><![CDATA[Comment editor]]></value>
+		<value xml:lang="jp"><![CDATA[コメントエディター]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Comment editor]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Comment editor]]></value>
+		<value xml:lang="ru"><![CDATA[Comment editor]]></value>
+		<value xml:lang="tr"><![CDATA[Comment editor]]></value>
+		<value xml:lang="vi"><![CDATA[Comment editor]]></value>
+	</item>
+	<item name="editor_option">
+		<value xml:lang="ko"><![CDATA[에디터 옵션]]></value>
+		<value xml:lang="en"><![CDATA[Editor Option]]></value>
+		<value xml:lang="jp"><![CDATA[エディターオプション]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Editor Option]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Editor Option]]></value>
+		<value xml:lang="ru"><![CDATA[Editor Option]]></value>
+		<value xml:lang="tr"><![CDATA[Editor Option]]></value>
+		<value xml:lang="vi"><![CDATA[Editor Option]]></value>
+	</item>
+	<item name="guide_choose_main_editor">
+		<value xml:lang="ko"><![CDATA[본문 에디터를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Choose the main editor.]]></value>
+		<value xml:lang="jp"><![CDATA[本文エディターを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Choose the main editor.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Choose the main editor.]]></value>
+		<value xml:lang="ru"><![CDATA[Choose the main editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Choose the main editor.]]></value>
+		<value xml:lang="vi"><![CDATA[Choose the main editor.]]></value>
+	</item>
+	<item name="guide_set_height_main_editor">
+		<value xml:lang="ko"><![CDATA[본문 에디터의 높이를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Set height of the main editor.]]></value>
+		<value xml:lang="jp"><![CDATA[本文エディターの高さを設定してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Set height of the main editor.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Set height of the main editor.]]></value>
+		<value xml:lang="ru"><![CDATA[Set height of the main editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Set height of the main editor.]]></value>
+		<value xml:lang="vi"><![CDATA[Set height of the main editor.]]></value>
+	</item>
+	<item name="guide_choose_comment_editor">
+		<value xml:lang="ko"><![CDATA[댓글 에디터를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Choose the comment editor.]]></value>
+		<value xml:lang="jp"><![CDATA[コメントエディターを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Choose the comment editor.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Choose the comment editor.]]></value>
+		<value xml:lang="ru"><![CDATA[Choose the comment editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Choose the comment editor.]]></value>
+		<value xml:lang="vi"><![CDATA[Choose the comment editor.]]></value>
+	</item>
+	<item name="guide_set_height_comment_editor">
+		<value xml:lang="ko"><![CDATA[댓글 에디터의 높이를 설정하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Set height of the comment editor.]]></value>
+		<value xml:lang="jp"><![CDATA[コメントエディターの高さを設定してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Set height of the comment editor.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Set height of the comment editor.]]></value>
+		<value xml:lang="ru"><![CDATA[Set height of the comment editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Set height of the comment editor.]]></value>
+		<value xml:lang="vi"><![CDATA[Set height of the comment editor.]]></value>
+	</item>
+	<item name="guide_choose_text_formatting">
+		<value xml:lang="ko"><![CDATA[본문 서식을 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Choose the body format.]]></value>
+		<value xml:lang="jp"><![CDATA[本文のスタイルを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Choose the text formatting.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Choose the text formatting.]]></value>
+		<value xml:lang="ru"><![CDATA[Choose the text formatting.]]></value>
+		<value xml:lang="tr"><![CDATA[Choose the text formatting.]]></value>
+		<value xml:lang="vi"><![CDATA[Choose the text formatting.]]></value>
+	</item>
+	<item name="guide_choose_font_body">
+		<value xml:lang="ko"><![CDATA[본문 글꼴을 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Choose the body font.]]></value>
+		<value xml:lang="jp"><![CDATA[本文のフォントを選択してください。]]></value>		
+		<value xml:lang="zh-CN"><![CDATA[Choose the font body.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Choose the font body.]]></value>
+		<value xml:lang="ru"><![CDATA[Choose the font body.]]></value>
+		<value xml:lang="tr"><![CDATA[Choose the font body.]]></value>
+		<value xml:lang="vi"><![CDATA[Choose the font body.]]></value>
+	</item>
+	<item name="guide_choose_font_size_body">
+		<value xml:lang="ko"><![CDATA[본문 글꼴크기를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Choose the font size of body.]]></value>
+		<value xml:lang="jp"><![CDATA[本文の文字サイズを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Choose the font size body.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Choose the font size body.]]></value>
+		<value xml:lang="ru"><![CDATA[Choose the font size body.]]></value>
+		<value xml:lang="tr"><![CDATA[Choose the font size body.]]></value>
+		<value xml:lang="vi"><![CDATA[Choose the font size body.]]></value>
+	</item>
+	
+	<item name="font_preview">
+		<value xml:lang="ko"><![CDATA[The quick brown fox jumps over the lazy dog.
+いろはにほへと / ちりぬるを / わかよたれそ / つねならむ / うゐのおくやま / けふこえて / あさきゆめみし / ゑひもせす
+키스의 고유 조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다.]]></value>
+		<value xml:lang="en"><![CDATA[The quick brown fox jumps over the lazy dog.
+いろはにほへと / ちりぬるを / わかよたれそ / つねならむ / うゐのおくやま / けふこえて / あさきゆめみし / ゑひもせす
+키스의 고유 조건은 입술끼리 만나야 하고 특별한 기술은 필요치 않다.]]></value>
+	</item>
+
+	<item name="msg_avail_easy_update">
+		<value xml:lang="ko"><![CDATA[이 항목의 새로운 버전이 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is new version for this item.]]></value>
+		<value xml:lang="jp"><![CDATA[この項目の新しいバージョンがあります。]]></value>
+	</item>
+	<item name="msg_do_you_like_update">
+		<value xml:lang="ko"><![CDATA[업데이트하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would you like to update?]]></value>
+		<value xml:lang="jp"><![CDATA[アップデートしますか？]]></value>
+	</item>
+	<item name="msg_font_too_big">
+		<value xml:lang="ko"><![CDATA[글꼴이 너무 큽니다.]]></value>
+		<value xml:lang="en"><![CDATA[The font is too big.]]></value>
+		<value xml:lang="jp"><![CDATA[文字サイズが大きすぎます。]]></value>
+	</item>
+	<item name="editor">
+		<value xml:lang="ko"><![CDATA[위지윅 에디터]]></value>
+		<value xml:lang="en"><![CDATA[WYSIWYG Editor]]></value>
+		<value xml:lang="jp"><![CDATA[ウイジウイグエディター]]></value>
+		<value xml:lang="zh-CN"><![CDATA[网页编辑器]]></value>
+		<value xml:lang="zh-TW"><![CDATA[網頁編輯器]]></value>
+		<value xml:lang="fr"><![CDATA[Tel-tel Editeur]]></value>
+		<value xml:lang="ru"><![CDATA[WYSIWYG-Редактор]]></value>
+		<value xml:lang="es"><![CDATA[Editor WYSIWYG]]></value>
+		<value xml:lang="vi"><![CDATA[WYSIWYG toàn diện]]></value>
+	</item>
+	<item name="component_name">
+		<value xml:lang="ko"><![CDATA[컴포넌트]]></value>
+		<value xml:lang="en"><![CDATA[Component]]></value>
+		<value xml:lang="jp"><![CDATA[コンポーネント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[组件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[組件]]></value>
+		<value xml:lang="fr"><![CDATA[Composant]]></value>
+		<value xml:lang="ru"><![CDATA[Компонент]]></value>
+		<value xml:lang="es"><![CDATA[Componente]]></value>
+		<value xml:lang="tr"><![CDATA[Bileşen]]></value>
+		<value xml:lang="vi"><![CDATA[Thành phần]]></value>
+	</item>
+	<item name="component_version">
+		<value xml:lang="ko"><![CDATA[버전]]></value>
+		<value xml:lang="en"><![CDATA[Version]]></value>
+		<value xml:lang="jp"><![CDATA[バージョン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版本]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版本]]></value>
+		<value xml:lang="ru"><![CDATA[Версия]]></value>
+		<value xml:lang="es"><![CDATA[Versión]]></value>
+		<value xml:lang="tr"><![CDATA[Sürüm]]></value>
+		<value xml:lang="vi"><![CDATA[Phiên bản]]></value>
+	</item>
+	<item name="component_author">
+		<value xml:lang="ko"><![CDATA[제작자]]></value>
+		<value xml:lang="en"><![CDATA[Developer]]></value>
+		<value xml:lang="jp"><![CDATA[作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[作者]]></value>
+		<value xml:lang="fr"><![CDATA[Développeur]]></value>
+		<value xml:lang="ru"><![CDATA[Разработчик]]></value>
+		<value xml:lang="es"><![CDATA[Autor]]></value>
+		<value xml:lang="tr"><![CDATA[Geliştirici]]></value>
+		<value xml:lang="vi"><![CDATA[Người phát triển]]></value>
+	</item>
+	<item name="component_link">
+		<value xml:lang="ko"><![CDATA[링크]]></value>
+		<value xml:lang="en"><![CDATA[Link]]></value>
+		<value xml:lang="jp"><![CDATA[リンク]]></value>
+		<value xml:lang="zh-CN"><![CDATA[链接]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連結]]></value>
+		<value xml:lang="fr"><![CDATA[Lien]]></value>
+		<value xml:lang="ru"><![CDATA[Ссылка]]></value>
+		<value xml:lang="es"><![CDATA[Enlace]]></value>
+	</item>
+	<item name="component_date">
+		<value xml:lang="ko"><![CDATA[제작일]]></value>
+		<value xml:lang="en"><![CDATA[Date]]></value>
+		<value xml:lang="jp"><![CDATA[作成日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编写日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[編寫日期]]></value>
+		<value xml:lang="fr"><![CDATA[Jour de Création]]></value>
+		<value xml:lang="ru"><![CDATA[Дата]]></value>
+		<value xml:lang="es"><![CDATA[Fecha]]></value>
+		<value xml:lang="tr"><![CDATA[Tarih]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày]]></value>
+	</item>
+	<item name="component_license">
+		<value xml:lang="ko"><![CDATA[라이선스]]></value>
+		<value xml:lang="en"><![CDATA[License]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="fr"><![CDATA[Licence]]></value>
+		<value xml:lang="tr"><![CDATA[Lisans]]></value>
+		<value xml:lang="vi"><![CDATA[Cấp phép]]></value>
+	</item>
+	<item name="component_history">
+		<value xml:lang="ko"><![CDATA[변경 이력]]></value>
+		<value xml:lang="en"><![CDATA[Updates]]></value>
+		<value xml:lang="jp"><![CDATA[変更履歴]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新日志]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新紀錄]]></value>
+		<value xml:lang="fr"><![CDATA[Histoire]]></value>
+		<value xml:lang="ru"><![CDATA[History]]></value>
+		<value xml:lang="es"><![CDATA[History]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleştirmeler]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật]]></value>
+	</item>
+	<item name="component_description">
+		<value xml:lang="ko"><![CDATA[설명]]></value>
+		<value xml:lang="en"><![CDATA[Description]]></value>
+		<value xml:lang="jp"><![CDATA[説明]]></value>
+		<value xml:lang="zh-CN"><![CDATA[说明]]></value>
+		<value xml:lang="zh-TW"><![CDATA[說明]]></value>
+		<value xml:lang="ru"><![CDATA[Описание]]></value>
+		<value xml:lang="es"><![CDATA[Descripción]]></value>
+		<value xml:lang="tr"><![CDATA[Açıklama]]></value>
+		<value xml:lang="vi"><![CDATA[Mô tả]]></value>
+	</item>
+	<item name="component_extra_vars">
+		<value xml:lang="ko"><![CDATA[설정 변수]]></value>
+		<value xml:lang="en"><![CDATA[Option Variable]]></value>
+		<value xml:lang="jp"><![CDATA[設定変数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[变数设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[變數設置]]></value>
+		<value xml:lang="fr"><![CDATA[Variables d'Option]]></value>
+		<value xml:lang="ru"><![CDATA[Экстра перем.]]></value>
+		<value xml:lang="es"><![CDATA[Varibles Extras]]></value>
+		<value xml:lang="tr"><![CDATA[Değişken Seçenek]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin bổ xung]]></value>
+	</item>
+	<item name="component_grant">
+		<value xml:lang="ko"><![CDATA[권한설정]]></value>
+		<value xml:lang="en"><![CDATA[Permission Setting]]></value>
+		<value xml:lang="jp"><![CDATA[権限設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[权限设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[權限設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration de la Permission]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки прав доступа]]></value>
+		<value xml:lang="es"><![CDATA[Ajuste de las atribuciones]]></value>
+		<value xml:lang="tr"><![CDATA[Yetki Ayarı]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập quyền]]></value>
+	</item>
+	<item name="content_style">
+		<value xml:lang="ko"><![CDATA[문서 서식]]></value>
+		<value xml:lang="en"><![CDATA[Content Style]]></value>
+		<value xml:lang="jp"><![CDATA[コンテンツスタイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文档样式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[內容樣式]]></value>
+		<value xml:lang="tr"><![CDATA[İçerik Tarzı]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểu dáng của nội dung]]></value>
+	</item>
+	<item name="content_font">
+		<value xml:lang="ko"><![CDATA[문서 폰트]]></value>
+		<value xml:lang="en"><![CDATA[Content Font]]></value>
+		<value xml:lang="jp"><![CDATA[コンテンツフォント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文档字体]]></value>
+		<value xml:lang="zh-TW"><![CDATA[內容字體]]></value>
+		<value xml:lang="tr"><![CDATA[İçerik Yazı Tipi]]></value>
+		<value xml:lang="vi"><![CDATA[Font chữ của nội dung]]></value>
+	</item>
+	<item name="content_font_size">
+		<value xml:lang="ko"><![CDATA[문서 폰트 크기]]></value>
+		<value xml:lang="en"><![CDATA[Content Font Size]]></value>
+		<value xml:lang="jp"><![CDATA[コンテンツフォントサイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[字体大小]]></value>
+		<value xml:lang="zh-TW"><![CDATA[字體大小]]></value>
+		<value xml:lang="ru"><![CDATA[Размер шрифта]]></value>
+		<value xml:lang="tr"><![CDATA[İçerik Yazı Boyutu]]></value>
+		<value xml:lang="vi"><![CDATA[Cỡ chữ của nội dung]]></value>
+	</item>					
+	<item name="about_component">
+		<value xml:lang="ko"><![CDATA[컴포넌트 소개]]></value>
+		<value xml:lang="en"><![CDATA[About component]]></value>
+		<value xml:lang="jp"><![CDATA[コンポーネント情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[组件简介]]></value>
+		<value xml:lang="zh-TW"><![CDATA[組件簡介]]></value>
+		<value xml:lang="fr"><![CDATA[Sur le Composant]]></value>
+		<value xml:lang="ru"><![CDATA[О компоненте]]></value>
+		<value xml:lang="es"><![CDATA[Presentación del componente]]></value>
+		<value xml:lang="tr"><![CDATA[Bileşen hakkında]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin Thành phần]]></value>
+	</item>
+	<item name="about_component_grant">
+		<value xml:lang="ko"><![CDATA[기본 컴포넌트외의 확장 컴포넌트 기능을 사용할 수 있는 권한을 지정할 수 있습니다.(모두 해제 시 아무나 사용 가능합니다)]]></value>
+		<value xml:lang="en"><![CDATA[Selected group(s) will be able to use expanded components of editor.(Leave them blank if you want all groups to have permissions.)]]></value>
+		<value xml:lang="jp"><![CDATA[基本コンポーネント以外の拡張コンポーネント機能が利用可能な権限の設定ができます。(選択なしの場合、誰でも利用可能)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置除默认组件外的扩展组件使用权限(全部解除时任何用户都可以使用)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[除預設組件外，可設置延伸組件的使用權限(全部解除時，任何用戶都可使用)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer la Permission d'utiliser des composants additionnels de l'Editeur. (Tout le monde aura la Permission si vous ne cochez rien)]]></value>
+		<value xml:lang="ru"><![CDATA[Возможен выбор дополнительных компонентов. (Каждый может использовать его, если режим выключен)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede configurar el permiso de utilizar la ampliación de los componentes de editor. (Todo el mundo tendría permiso si no comprobado)]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen grup(lar), editörün genişletilmiş bileşenlerini kullanabilirler.(Eğer tüm grupların bu yetkiye sahip olmasını istiyorsanız, boş bırakınız)]]></value>
+		<value xml:lang="vi"><![CDATA[Những nhóm đã chọn sẽ được phép sử dụng Thành phần mở rộng cho biên tập.(Để trống nếu bạn muốn tất cả các nhóm đều được phép sử dụng.)]]></value>
+	</item>
+	<item name="about_component_mid">
+		<value xml:lang="ko"><![CDATA[에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.(모두 해제 시 모든 대상에서 사용 가능합니다)]]></value>
+		<value xml:lang="en"><![CDATA[Editor components can select targets.(All targets will be selected when nothing is selected.)]]></value>
+		<value xml:lang="jp"><![CDATA[エディターコンポーネントが使われる対象を指定します。(選択なしの場合、全ての対象で利用可能)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定使用编辑器组件的对象。(全部解除时任何用户都可以使用)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定使用編輯器組件的對象。(全部解除時，任何用戶都可使用)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez désigner les objectifs auquels les composants s'appliquent(Tous les objectifs auront la Permission quand rien n'est choisi.)]]></value>
+		<value xml:lang="ru"><![CDATA[Можно установить пользователя Редактора.(Каждый может использовать его, если режим выключен)]]></value>
+		<value xml:lang="es"><![CDATA[에디터 컴포넌트가 사용될 대상을 지정할 수 있습니다.(모두 해제시 모든 대상에서 사용 가능합니다)]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef editör bileşenlerini seçebilirsiniz.(Hiçbir şey seçilmediğinde, tüm hedefler seçilecektir)]]></value>
+		<value xml:lang="vi"><![CDATA[Có thể lựa chọn khu vực sử dụng Thành phần.(Nếu để trống là tất cả các khu vực đều có thể sử dụng.)]]></value>
+	</item>
+	<item name="msg_component_is_not_founded">
+		<value xml:lang="ko"><![CDATA[%s 에디터 컴포넌트를 찾을 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot find editor component %s.]]></value>
+		<value xml:lang="jp"><![CDATA[%s エディターのコンポーネントが見つかりません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[找不到%s 组件说明！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到%s 組件說明！]]></value>
+		<value xml:lang="fr"><![CDATA[Ne peut pas trouver Composant %s]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно найти компонент редактора %s]]></value>
+		<value xml:lang="es"><![CDATA[No se puede encontrar el componente del editor %s]]></value>
+		<value xml:lang="tr"><![CDATA[Editör bileşeni %s bulunamıyor]]></value>
+		<value xml:lang="vi"><![CDATA[Không tìm thấy biên tập Thành phần %s]]></value>
+	</item>
+	<item name="msg_component_is_inserted">
+		<value xml:lang="ko"><![CDATA[선택하신 컴포넌트는 이미 입력되어 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Selected component is already inserted.]]></value>
+		<value xml:lang="jp"><![CDATA[選択されたコンポーネントは既に入力されています。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您选择的组件已插入！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您選擇的組件已插入！]]></value>
+		<value xml:lang="fr"><![CDATA[Composant choisi est déjà entré]]></value>
+		<value xml:lang="ru"><![CDATA[Выбранный компонент уже присутствует]]></value>
+		<value xml:lang="es"><![CDATA[El componente seleccionado ya esta insertado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen bileşen zaten eklenmiş durumda]]></value>
+		<value xml:lang="vi"><![CDATA[Đã chèn Thành phần được chọn.]]></value>
+	</item>
+	<item name="msg_component_is_first_order">
+		<value xml:lang="ko"><![CDATA[선택하신 컴포넌트는 첫 번째에 위치하고 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Selected component is located at the first position.]]></value>
+		<value xml:lang="jp"><![CDATA[選択されたコンポーネントは最上位にあります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您选择的组件已到最上端位置！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您選擇的組件已達最頂端位置！]]></value>
+		<value xml:lang="fr"><![CDATA[Composant choisi est localisé à la première position]]></value>
+		<value xml:lang="ru"><![CDATA[Выбранный компонент находится на первой позиции]]></value>
+		<value xml:lang="es"><![CDATA[El componente seleccionado se localiza en la primera posición]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen bileşen ilk pozisyona yerleştirilmiştir]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn Thành phần trước một khu vực.]]></value>
+	</item>
+	<item name="msg_component_is_last_order">
+		<value xml:lang="ko"><![CDATA[선택하신 컴포넌트는 마지막에 위치하고 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Selected component is located at the last position.]]></value>
+		<value xml:lang="jp"><![CDATA[選択されたコンポーネントは最下位にあります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您选择的组件已到最下端位置！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您選擇的組件已達最底端位置！]]></value>
+		<value xml:lang="fr"><![CDATA[Composant choisi est localisé à la position dernière]]></value>
+		<value xml:lang="ru"><![CDATA[Выбранный компонент находится на последней позиции]]></value>
+		<value xml:lang="es"><![CDATA[El componente seleccionado se localiza en la última posición]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen bileşen son pozisyonda yerleşmiştir]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn Thành phần sau một khu vực.]]></value>
+	</item>
+	<item name="msg_load_saved_doc">
+		<value xml:lang="ko"><![CDATA[자동 저장된 글이 있습니다. 복구하시겠습니까?
+글을 다 쓰신 후 저장하시면 자동 저장 본은 사라집니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is a draft automatically saved. Do you want to restore it? The auto-saved draft will be discarded when you write and save it.]]></value>
+		<value xml:lang="jp"><![CDATA[自動保存された書き込みがあります。復旧しますか？
+書き終わってから登録すると前の自動保存データは削除されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[有自动保存的内容， 确定要恢复吗？
+发布主题后，自动保存的文本将会被删除。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[有自動儲存的內容，確定要恢復嗎?
+儲存內容後，自動儲存的內容將會被刪除。]]></value>
+		<value xml:lang="fr"><![CDATA[Il y a un article conservé automatiquement. Voulez-vous le réstaurer?
+L'esquisse conservé automatiquement va être débarrasser après conserver l'article courant.]]></value>
+		<value xml:lang="ru"><![CDATA[Существует автоматически сохраненная статья. Хотите ли Вы ее восстановить?
+Автоматически сохраненный черновик будет отменен после сохранения текущей статьи]]></value>
+		<value xml:lang="es"><![CDATA[Existe un documento guardado automáticamente ¿desea recuperarlo ?
+Después de guardar el documento escrito, el documento autoguardado sera eliminado.]]></value>
+		<value xml:lang="tr"><![CDATA[Kendiliğinden kaydolan bir makale mevcut. Bunu kurtarmak ister misiniz?
+Otomatik kaydolan taslak, geçerli makaleyi kaydedince, çıkartılacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Đã có bài viết tự động lưu. Bạn có muốn khôi phục nó không?
+Bài viết tự động lưu sẽ tự động hủy sau khi bạn hoàn thành bài viết này và bấm 'Gửi']]></value>
+	</item>
+	<item name="msg_auto_saved">
+		<value xml:lang="ko"><![CDATA[자동 저장되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Automatically Saved.]]></value>
+		<value xml:lang="jp"><![CDATA[自動保存されました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已自动保存！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已自動儲存！]]></value>
+		<value xml:lang="fr"><![CDATA[Conservé automatiquement]]></value>
+		<value xml:lang="ru"><![CDATA[Автоматически сохранено]]></value>
+		<value xml:lang="es"><![CDATA[Documento guardado automáticamente]]></value>
+		<value xml:lang="tr"><![CDATA[Kendiliğinden Kaydedildi]]></value>
+		<value xml:lang="vi"><![CDATA[Đã tự động lưu]]></value>
+	</item>
+	<item name="cmd_disable">
+		<value xml:lang="ko"><![CDATA[비활성]]></value>
+		<value xml:lang="en"><![CDATA[Inactive]]></value>
+		<value xml:lang="jp"><![CDATA[未使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[非激活]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暫停]]></value>
+		<value xml:lang="fr"><![CDATA[Invalider]]></value>
+		<value xml:lang="ru"><![CDATA[Неактивно]]></value>
+		<value xml:lang="es"><![CDATA[Desactivado]]></value>
+		<value xml:lang="tr"><![CDATA[Devre Dışı]]></value>
+		<value xml:lang="vi"><![CDATA[Không hoạt động]]></value>
+	</item>
+	<item name="cmd_enable">
+		<value xml:lang="ko"><![CDATA[활성]]></value>
+		<value xml:lang="en"><![CDATA[Active]]></value>
+		<value xml:lang="jp"><![CDATA[使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[激活]]></value>
+		<value xml:lang="zh-TW"><![CDATA[啟動]]></value>
+		<value xml:lang="fr"><![CDATA[Valider]]></value>
+		<value xml:lang="ru"><![CDATA[Активно]]></value>
+		<value xml:lang="es"><![CDATA[activado]]></value>
+		<value xml:lang="tr"><![CDATA[Etkin]]></value>
+		<value xml:lang="vi"><![CDATA[Hoạt động]]></value>
+	</item>
+	<item name="editor_skin">
+		<value xml:lang="ko"><![CDATA[에디터 스킨]]></value>
+		<value xml:lang="en"><![CDATA[Editor Skin]]></value>
+		<value xml:lang="jp"><![CDATA[エディタースキン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编辑器皮肤]]></value>
+		<value xml:lang="zh-TW"><![CDATA[編輯器面板]]></value>
+		<value xml:lang="fr"><![CDATA[Habillage de l'Editeur]]></value>
+		<value xml:lang="ru"><![CDATA[Скин Редактора]]></value>
+		<value xml:lang="es"><![CDATA[Editor de Cuidado de la Piel]]></value>
+		<value xml:lang="tr"><![CDATA[Editor Dış Görünümü]]></value>
+		<value xml:lang="vi"><![CDATA[Giao diện gửi bài]]></value>
+	</item>
+	<item name="upload_file_grant">
+		<value xml:lang="ko"><![CDATA[파일 첨부 권한]]></value>
+		<value xml:lang="en"><![CDATA[Permission to upload files]]></value>
+		<value xml:lang="jp"><![CDATA[ファイル添付権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件上传权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案上傳權限]]></value>
+		<value xml:lang="fr"><![CDATA[Permission de télécharger(téléverser) ]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешить прикреплять файлы]]></value>
+		<value xml:lang="es"><![CDATA[La autorización para cargar]]></value>
+		<value xml:lang="tr"><![CDATA[Karşıya Yükleme Yetkisi]]></value>
+		<value xml:lang="vi"><![CDATA[Quyền Upload]]></value>
+	</item>
+	<item name="enable_default_component_grant">
+		<value xml:lang="ko"><![CDATA[기본 컴포넌트 사용 권한]]></value>
+		<value xml:lang="en"><![CDATA[Permission to use default components]]></value>
+		<value xml:lang="jp"><![CDATA[基本コンポーネント使用権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[默认组件使用权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預設組件使用權限]]></value>
+		<value xml:lang="fr"><![CDATA[Permission d'utiliser les Composants Par Défaut]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешить использование основного компонента]]></value>
+		<value xml:lang="es"><![CDATA[La autorización del uso de los componentes por defecto]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan Bileşenler için Yetki]]></value>
+		<value xml:lang="vi"><![CDATA[Quyền sử dụng Thành phần cơ bản]]></value>
+	</item>
+	<item name="enable_component_grant">
+		<value xml:lang="ko"><![CDATA[컴포넌트 사용 권한]]></value>
+		<value xml:lang="en"><![CDATA[Permission to use components]]></value>
+		<value xml:lang="jp"><![CDATA[コンポーネント使用権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[组件使用权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[組件使用權限]]></value>
+		<value xml:lang="fr"><![CDATA[Permission d'utiliser des composants]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешить ипользование компонента]]></value>
+		<value xml:lang="es"><![CDATA[La autorización de la utilización de componentes]]></value>
+		<value xml:lang="tr"><![CDATA[Bileşenler için Yetki]]></value>
+		<value xml:lang="vi"><![CDATA[Quyền sử dụng Thành phần]]></value>
+	</item>
+	<item name="enable_html_grant">
+		<value xml:lang="ko"><![CDATA[HTML 편집 권한]]></value>
+		<value xml:lang="en"><![CDATA[Permission to edit HTML]]></value>
+		<value xml:lang="jp"><![CDATA[HTML編集権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[HTML编辑权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[HTML編輯權限]]></value>
+		<value xml:lang="fr"><![CDATA[Permission d'utiliser HTML]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешить коррекцию HTML]]></value>
+		<value xml:lang="es"><![CDATA[La autorización de uso de HTML]]></value>
+		<value xml:lang="tr"><![CDATA[HTML için Yetki]]></value>
+		<value xml:lang="vi"><![CDATA[Quyền sử dụng HTML]]></value>
+	</item>
+	<item name="enable_autosave">
+		<value xml:lang="ko"><![CDATA[자동저장 사용]]></value>
+		<value xml:lang="en"><![CDATA[Enable Auto-Save]]></value>
+		<value xml:lang="jp"><![CDATA[自動保存使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[内容自动保存]]></value>
+		<value xml:lang="zh-TW"><![CDATA[內容自動儲存]]></value>
+		<value xml:lang="fr"><![CDATA[Valider à conserver automatiquement]]></value>
+		<value xml:lang="ru"><![CDATA[Автосохранение]]></value>
+		<value xml:lang="es"><![CDATA[Utilice función de guardado automático,]]></value>
+		<value xml:lang="tr"><![CDATA[Oto-Kayıt]]></value>
+		<value xml:lang="vi"><![CDATA[Tự động lưu]]></value>
+	</item>
+	<item name="height_resizable">
+		<value xml:lang="ko"><![CDATA[높이 조절 가능]]></value>
+		<value xml:lang="en"><![CDATA[Height Resizable]]></value>
+		<value xml:lang="jp"><![CDATA[高さの調整]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度调整]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度調整]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre de remettre l'hauteur]]></value>
+		<value xml:lang="ru"><![CDATA[Возможна коррекция высоты]]></value>
+		<value xml:lang="es"><![CDATA[Altura cambiar de tamaño]]></value>
+		<value xml:lang="tr"><![CDATA[Yükseklik Yeniden Boyutlandırılabilir]]></value>
+		<value xml:lang="vi"><![CDATA[Mở rộng chiều cao]]></value>
+	</item>
+	<item name="editor_height">
+		<value xml:lang="ko"><![CDATA[에디터 높이]]></value>
+		<value xml:lang="en"><![CDATA[Height of Editor]]></value>
+		<value xml:lang="jp"><![CDATA[エディターの高さ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[编辑器高度]]></value>
+		<value xml:lang="zh-TW"><![CDATA[編輯器高度]]></value>
+		<value xml:lang="fr"><![CDATA[Hauteur de l'Editeur]]></value>
+		<value xml:lang="ru"><![CDATA[Высота Редактора]]></value>
+		<value xml:lang="es"><![CDATA[Altura de Editor]]></value>
+		<value xml:lang="tr"><![CDATA[Editör Yüksekliği]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao khung viết bài]]></value>
+	</item>
+	<item name="about_editor_skin">
+		<value xml:lang="ko"><![CDATA[에디터 스킨을 선택하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may select the skin for the editor.]]></value>
+		<value xml:lang="jp"><![CDATA[エディターのスキンの選択ができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以选择编辑器皮肤。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇編輯器面板。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez choisir l'habillage de l'Editeur.]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите скин редактора]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede seleccionar la piel del editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Editör dış görünümünü seçebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chọn kiểu gửi bài.]]></value>
+	</item>
+	<item name="about_content_style">
+		<value xml:lang="ko"><![CDATA[문서 편집 및 내용 출력 시 원하는 서식을 지정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may select a style for editting an article or displaying a content]]></value>
+		<value xml:lang="jp"><![CDATA[コンテンツの編集、および内容表示の際のスタイルを指定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定编辑或打印文档时的文档样式。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改內容時，可指定要顯示的內容樣式]]></value>
+		<value xml:lang="fr"><![CDATA[문서 편집 및 내용 출력시 원하는 서식을 지정할 수 있습니다]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете выбрать стиль для редактирования и просмотра записи ]]></value>
+		<value xml:lang="es"><![CDATA[문서 편집 및 내용 출력시 원하는 서식을 지정할 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Makale düzenleme veya içerik gösterme için tarz seçebilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chọn kiểu viết bài hay kiểu hiển thị.]]></value>
+	</item>
+	<item name="about_content_font">
+		<value xml:lang="ko"><![CDATA[문서 편집 및 내용 출력 시 원하는 폰트를 지정할 수 있습니다. 지정하지 않으면 사용자 설정에 따르게 됩니다. 콤마(,)로 여러 폰트를 지정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may select a font for editting an article or displaying a content. The default font is your own font. Please use comma for multiple input.]]></value>
+		<value xml:lang="jp"><![CDATA[コンテンツの編集、および内容表示の際のフォントを指定します。 指定してない場合、ユーザーの設定を従います。  半角コンマ（,）区切りで複数フォントの登録が出来ます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定编辑或打印文档时的文档字体，不指定随用户设置。 多个字体可以用逗号(，)区分输入。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改內容時，可指定要顯示的內容字體。 如果沒有指定的話，以系統預設為主。  以逗號(，)區分多個字體。]]></value>
+		<value xml:lang="fr"><![CDATA[문서 편집 및 내용 출력시 원하는 폰트를 지정할 수 있습니다. 지정하지 않으면 사용자 설정에 따르게 됩니다. 콤마(,)로 여러 폰트를 지정할 수 있습니다.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете выбрать шрифт для редактирования и просмотра записи.  Используйте запятую(,) если выбрали несколько шрифтов.]]></value>
+		<value xml:lang="es"><![CDATA[문서 편집 및 내용 출력시 원하는 폰트를 지정할 수 있습니다. 지정하지 않으면 사용자 설정에 따르게 됩니다. 콤마(,)로 여러 폰트를 지정할 수 있습니다.]]></value>
+		<value xml:lang="tr"><![CDATA[Makale düzenleme veya içerik gösterme için yazı tipi seçebilirsiniz. Varsayılan yazı tipi sizin kendi yazı tipinizdir  Lütfen çoklu giriş için virgül(,) kullanınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chọn Font chữ để viết và hiển thị trong bài viết. Để đặt mặc định chỉ Font chữ bạn hay sử dụng, hãy đặt dấu (,) vào giữa các Font.]]></value>
+	</item>
+	<item name="about_content_font_size">
+		<value xml:lang="ko"><![CDATA[문서 편집 및 내용 출력 시 원하는 폰트의 크기를 지정할 수 있습니다. 12px, 1em등 단위까지 포함해서 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[You may select the font size for editting an article or displaying a content. Please input units such as px or em.]]></value>
+		<value xml:lang="jp"><![CDATA[コンテンツの編集、および内容表示の際のフォントサイズを指定します。 12px、1emなどサイズ単位まで入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定编辑或打印文档时的文档字体大小。 指定时请包含字体单位(如12px, 1em)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改內容時，可指定要顯示的內容字體大小。 請輸入單位，像是12px, 1em等。]]></value>
+		<value xml:lang="fr"><![CDATA[문서 편집 및 내용 출력시 원하는 폰트의 크기를 지정할 수 있습니다. 12px, 1em등 단위까지 포함해서 입력해주세요.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете выбрать размер шрифта для редактирования и просмотра записи.  Пожалуйста, выберите единицы такие как px или em.]]></value>
+		<value xml:lang="es"><![CDATA[문서 편집 및 내용 출력시 원하는 폰트의 크기를 지정할 수 있습니다. 12px, 1em등 단위까지 포함해서 입력해주세요.]]></value>
+		<value xml:lang="tr"><![CDATA[Makale düzenleme veya içerik görüntüleme için yazı boyutu seçebilirsiniz. Lütfen px veya em gibi birimler kullanınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chọn cỡ chữ để viết bài và hiển thị theo định dạng "px" hoặc "em".]]></value>
+	</item>
+	<item name="about_upload_file_grant">
+		<value xml:lang="ko"><![CDATA[파일을 첨부할 수 있는 권한을 지정하실 수 있습니다. (모두 해제 시 아무나 첨부 가능합니다)]]></value>
+		<value xml:lang="en"><![CDATA[Selected group(s) will be able to upload files. (Leave them blank if you want all groups to have this permission.)]]></value>
+		<value xml:lang="jp"><![CDATA[ファイル添付権限の設定ができます。(選択なしの場合、誰でも添付が可能)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置上传文件的权限(全部解除为无限制)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[設置上傳檔案的權限(全部解除為無限制)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer la permission d'attacher les fichiers. (Tout le monde aura la permission si vous ne cochez rien)]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете разрешить прикреплять файлы выбранным группам. (Если оставить поле пустым то право прикреплять файлы будут иметь все)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede configurar el permiso de archivo adjunto. (Todo el mundo tendría permiso si no comprobado)]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen (gruplar) dosyaları karşıya yükleme yetkisine sahip olacaklardır. (Eğer tüm grupların bu yetkiye sahip olmasını istiyorsanız lütfen boş bırakınız)]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn nhóm được phép Upload File. (Để trống nếu bạn muốn tất cả các nhóm đều có thể Upload.)]]></value>
+	</item>
+	<item name="about_default_component_grant">
+		<value xml:lang="ko"><![CDATA[에디터에서 사용되는 기본 컴포넌트를 사용할 수 있는 권한을 지정할 수 있습니다. (모두 해제 시 아무나 사용 가능합니다)]]></value>
+		<value xml:lang="en"><![CDATA[Selected group(s) will be able to use default components of editor. (Leave them blank if you want all groups to have this permission.)]]></value>
+		<value xml:lang="jp"><![CDATA[エディターの基本コンポーネントの使用権限の設定ができます。(選択なしの場合、誰でも利用可能)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置编辑器默认组件的使用权限(全部解除为无限制)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[設置編輯器預設組件的使用權限(全部解除為無限制)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer la permission d'utiliser les Composants Par Défaut de l'Editeur. (Tout le monde aura la permission si vous ne cochez rien)]]></value>
+		<value xml:lang="ru"><![CDATA[Selected group(s) will be able to use default components of editor. (Leave them blank if you want all groups to have permission)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede configurar el permiso de uso de los componentes de editor por defecto. (Todo el mundo tendría permiso si no comprobado)]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen grup(lar) editörün varsayılan bileşenlerini kullanabileceklerdir. (Eğer tüm grupların bu yetkiye sahip olmasını istiyorsanız lütfen boş bırakınız)]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn nhóm được phép sử dụng Thành phần mặc định. (Để trống nếu bạn muốn tất cả đều có thể sử dụng.)]]></value>
+	</item>
+	<item name="about_editor_height">
+		<value xml:lang="ko"><![CDATA[에디터의 기본 높이를 지정하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may set the height of the editor.]]></value>
+		<value xml:lang="jp"><![CDATA[エディターの基本高さを設定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定编辑器的默认高度。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[指定編輯器的預設高度。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer l'hauteur de l'Editeur.]]></value>
+		<value xml:lang="ru"><![CDATA[You may set the height of editor.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede configurar la altura del editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Editör yüksekliğini ayarlayabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt chiều cao của khung viết bài.]]></value>
+	</item>
+	<item name="about_editor_height_resizable">
+		<value xml:lang="ko"><![CDATA[에디터의 높이를 직접 변경할 수 있도록 허용합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may decide whether the height of the editor can be resized.]]></value>
+		<value xml:lang="jp"><![CDATA[エディターの高さを変更できるようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[允许用户拖动编辑器高度。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許用戶拖曳編輯器高度。]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre de remettre l'hauteur de l'Editeur.]]></value>
+		<value xml:lang="ru"><![CDATA[You may decide whether height of editor can be resized.]]></value>
+		<value xml:lang="es"><![CDATA[Permiso para cambiar el tamaño de la altura del editor.]]></value>
+		<value xml:lang="tr"><![CDATA[Editörün yüksekliğinin yeniden boyutlandırıp-boyutlandırılamayacağı kararını verebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Đặt chiều cao có thể thay đổi.]]></value>
+	</item>
+	<item name="about_enable_html_grant">
+		<value xml:lang="ko"><![CDATA[HTML 편집 권한을 부여할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Selected group(s) will be able to use HTML.]]></value>
+		<value xml:lang="jp"><![CDATA[HTML編集権限を設定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[HTML代码编辑权限设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[HTML原始碼編輯權限設置。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez permettre d'utiliser HTML]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede dar el permiso de uso de HTML]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen grup(lar) HTML kullanabileceklerdir]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn nhóm được phép sử dụng HTML]]></value>
+	</item>
+	<item name="about_enable_autosave">
+		<value xml:lang="ko"><![CDATA[글 작성 시 자동 저장 기능을 활성화 시킬 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may decide whether the auto-save function will be used.]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みの際に自動保存機能をオンにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发表主题时激活内容自动保存功能。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發表主題時，開啟內容自動儲存功能。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez valider la fonction à Conserver Automatiquement pendant écrire des articles.]]></value>
+		<value xml:lang="ru"><![CDATA[You may decide whether auto-save function will be used.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede permitir que la función de guardado automático, en tanto que función de la redacción de artículos]]></value>
+		<value xml:lang="tr"><![CDATA[Oto-Kayıt özelliğinin kullanılabilmesi kararını verebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt chức năng Tự động lưu.]]></value>
+	</item>
+	<item name="edit">
+		<item name="fontname">
+			<value xml:lang="ko"><![CDATA[글꼴]]></value>
+			<value xml:lang="en"><![CDATA[Font]]></value>
+			<value xml:lang="jp"><![CDATA[フォント]]></value>
+			<value xml:lang="zh-CN"><![CDATA[字体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[字體]]></value>
+			<value xml:lang="fr"><![CDATA[Police de caractères]]></value>
+			<value xml:lang="ru"><![CDATA[Шрифт]]></value>
+			<value xml:lang="es"><![CDATA[Fuente]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı Tipi]]></value>
+			<value xml:lang="vi"><![CDATA[Kiểu chữ]]></value>
+		</item>
+		<item name="fontsize">
+			<value xml:lang="ko"><![CDATA[크기]]></value>
+			<value xml:lang="en"><![CDATA[Size]]></value>
+			<value xml:lang="jp"><![CDATA[フォントサイズ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[大小]]></value>
+			<value xml:lang="zh-TW"><![CDATA[大小]]></value>
+			<value xml:lang="fr"><![CDATA[Mesure]]></value>
+			<value xml:lang="ru"><![CDATA[Размер]]></value>
+			<value xml:lang="es"><![CDATA[Tamaño]]></value>
+			<value xml:lang="tr"><![CDATA[Boyut]]></value>
+			<value xml:lang="vi"><![CDATA[Cỡ chữ]]></value>
+		</item>
+		<item name="use_paragraph">
+			<value xml:lang="ko"><![CDATA[문단기능]]></value>
+			<value xml:lang="en"><![CDATA[Paragraph Function]]></value>
+			<value xml:lang="jp"><![CDATA[段落機能]]></value>
+			<value xml:lang="zh-CN"><![CDATA[段落功能]]></value>
+			<value xml:lang="zh-TW"><![CDATA[段落功能]]></value>
+			<value xml:lang="fr"><![CDATA[Fonctions sur Paragraphe]]></value>
+			<value xml:lang="ru"><![CDATA[Функции параграфа]]></value>
+			<value xml:lang="es"><![CDATA[Párrafo]]></value>
+			<value xml:lang="tr"><![CDATA[Paragraf Özelliği]]></value>
+			<value xml:lang="vi"><![CDATA[Chức năng Paragraph]]></value>
+		</item>
+		<item name="fontlist" type="array">	
+			<item name="arial">
+				<value xml:lang="ko"><![CDATA[Arial, Helvetica, sans-serif]]></value>
+				<value xml:lang="en"><![CDATA[Arial, Helvetica, sans-serif]]></value>
+			</item>
+			<item name="tahoma">
+				<value xml:lang="ko"><![CDATA[Tahoma, Geneva, sans-serif]]></value>
+				<value xml:lang="en"><![CDATA[Tahoma, Geneva, sans-serif]]></value>
+			</item>
+			<item name="verdana">
+				<value xml:lang="ko"><![CDATA[Verdana, Geneva, sans-serif]]></value>
+				<value xml:lang="en"><![CDATA[Verdana, Geneva, sans-serif]]></value>
+			</item>
+			<item name="sans-serif">
+				<value xml:lang="ko"><![CDATA[Sans-serif]]></value>
+				<value xml:lang="en"><![CDATA[Sans-serif]]></value>
+			</item>
+			<item name="georgia">
+				<value xml:lang="ko"><![CDATA[Georgia, 'Times New Roman', Times, serif]]></value>
+				<value xml:lang="en"><![CDATA[Georgia, 'Times New Roman', Times, serif]]></value>
+			</item>
+			<item name="palatinoLinotype">
+				<value xml:lang="ko"><![CDATA['Palatino Linotype', 'Book Antiqua', Palatino, serif]]></value>
+				<value xml:lang="en"><![CDATA['Palatino Linotype', 'Book Antiqua', Palatino, serif]]></value>
+			</item>
+			<item name="timesNewRoman">
+				<value xml:lang="ko"><![CDATA['Times New Roman', Times, serif]]></value>
+				<value xml:lang="en"><![CDATA['Times New Roman', Times, serif]]></value>
+			</item>		
+			<item name="serif">
+				<value xml:lang="ko"><![CDATA[Serif]]></value>
+				<value xml:lang="en"><![CDATA[Serif]]></value>
+			</item>		
+			<item name="courierNew">
+				<value xml:lang="ko"><![CDATA['Courier New', Courier, monospace]]></value>
+				<value xml:lang="en"><![CDATA['Courier New', Courier, monospace]]></value>
+			</item>		
+			<item name="lucidaConsole">
+				<value xml:lang="ko"><![CDATA['Lucida Console', Monaco, monospace]]></value>
+			</item>		
+		</item>					
+		<item name="header">
+			<value xml:lang="ko"><![CDATA[형식]]></value>
+			<value xml:lang="en"><![CDATA[Style]]></value>
+			<value xml:lang="jp"><![CDATA[スタイル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[样式]]></value>
+			<value xml:lang="zh-TW"><![CDATA[樣式]]></value>
+			<value xml:lang="ru"><![CDATA[Стиль]]></value>
+			<value xml:lang="es"><![CDATA[Estilo]]></value>
+			<value xml:lang="tr"><![CDATA[Tarz]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề lớn]]></value>
+		</item>
+		<item name="header_list" type="array">
+			<item name="h1">
+				<value xml:lang="ko"><![CDATA[제목 1]]></value>
+				<value xml:lang="en"><![CDATA[Header 1]]></value>
+				<value xml:lang="jp"><![CDATA[見出し１]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题 1]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題 1]]></value>
+				<value xml:lang="fr"><![CDATA[Titre 1]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок 1]]></value>
+				<value xml:lang="es"><![CDATA[Título 1]]></value>
+				<value xml:lang="tr"><![CDATA[Konu 1]]></value>
+				<value xml:lang="vi"><![CDATA[Cỡ 1]]></value>
+			</item>
+			<item name="h2">
+				<value xml:lang="ko"><![CDATA[제목 2]]></value>
+				<value xml:lang="en"><![CDATA[Header 2]]></value>
+				<value xml:lang="jp"><![CDATA[見出し２]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题 2]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題 2]]></value>
+				<value xml:lang="fr"><![CDATA[Titre 2]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок 2]]></value>
+				<value xml:lang="es"><![CDATA[Título 2]]></value>
+				<value xml:lang="tr"><![CDATA[Konu 2]]></value>
+				<value xml:lang="vi"><![CDATA[Cỡ 2]]></value>
+			</item>
+			<item name="h3">
+				<value xml:lang="ko"><![CDATA[제목 3]]></value>
+				<value xml:lang="en"><![CDATA[Header 3]]></value>
+				<value xml:lang="jp"><![CDATA[見出し３]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题 3]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題 3]]></value>
+				<value xml:lang="fr"><![CDATA[Titre 3]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок 3]]></value>
+				<value xml:lang="es"><![CDATA[Título 3]]></value>
+				<value xml:lang="tr"><![CDATA[Konu 3]]></value>
+				<value xml:lang="vi"><![CDATA[Cỡ 3]]></value>
+			</item>
+			<item name="h4">
+				<value xml:lang="ko"><![CDATA[제목 4]]></value>
+				<value xml:lang="en"><![CDATA[Header 4]]></value>
+				<value xml:lang="jp"><![CDATA[見出し４]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题 4]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題 4]]></value>
+				<value xml:lang="fr"><![CDATA[Titre 4]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок 4]]></value>
+				<value xml:lang="es"><![CDATA[Título 4]]></value>
+				<value xml:lang="tr"><![CDATA[Konu 4]]></value>
+				<value xml:lang="vi"><![CDATA[Cỡ 4]]></value>
+			</item>
+			<item name="h5">
+				<value xml:lang="ko"><![CDATA[제목 5]]></value>
+				<value xml:lang="en"><![CDATA[Header 5]]></value>
+				<value xml:lang="jp"><![CDATA[見出し５]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题 5]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題 5]]></value>
+				<value xml:lang="fr"><![CDATA[Titre 5]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок 5]]></value>
+				<value xml:lang="es"><![CDATA[Título 5]]></value>
+				<value xml:lang="tr"><![CDATA[Konu 5]]></value>
+				<value xml:lang="vi"><![CDATA[Cỡ 5]]></value>
+			</item>
+			<item name="h6">
+				<value xml:lang="ko"><![CDATA[제목 6]]></value>
+				<value xml:lang="en"><![CDATA[Header 6]]></value>
+				<value xml:lang="jp"><![CDATA[見出し６]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题 6]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題 6]]></value>
+				<value xml:lang="fr"><![CDATA[Titre 6]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок 6]]></value>
+				<value xml:lang="es"><![CDATA[Título 6]]></value>
+				<value xml:lang="tr"><![CDATA[Konu 6]]></value>
+				<value xml:lang="vi"><![CDATA[Cỡ 6]]></value>
+			</item>
+		</item>
+		<item name="submit">
+			<value xml:lang="ko"><![CDATA[확인]]></value>
+			<value xml:lang="en"><![CDATA[Submit]]></value>
+			<value xml:lang="jp"><![CDATA[送信]]></value>
+			<value xml:lang="zh-CN"><![CDATA[确认]]></value>
+			<value xml:lang="zh-TW"><![CDATA[確認]]></value>
+			<value xml:lang="fr"><![CDATA[Soumettre]]></value>
+			<value xml:lang="ru"><![CDATA[Принять]]></value>
+			<value xml:lang="es"><![CDATA[Confirmar]]></value>
+			<value xml:lang="tr"><![CDATA[Gönder]]></value>
+			<value xml:lang="vi"><![CDATA[Gửi bài]]></value>
+		</item>
+		<item name="fontcolor">
+			<value xml:lang="ko"><![CDATA[글자 색]]></value>
+			<value xml:lang="en"><![CDATA[Text Color]]></value>
+			<value xml:lang="jp"><![CDATA[テキストの色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文本颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文字顏色]]></value>
+			<value xml:lang="ru"><![CDATA[Цвет текста]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı Rengi]]></value>
+			<value xml:lang="vi"><![CDATA[Màu chữ]]></value>
+		</item>
+		<item name="fontbgcolor">
+			<value xml:lang="ko"><![CDATA[글자 배경색]]></value>
+			<value xml:lang="en"><![CDATA[Background Color]]></value>
+			<value xml:lang="jp"><![CDATA[テキストの背景色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[背景颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[背景顏色]]></value>
+			<value xml:lang="ru"><![CDATA[Цвет Фона]]></value>
+			<value xml:lang="tr"><![CDATA[Arkaplan Rengi]]></value>
+			<value xml:lang="vi"><![CDATA[Màu nền]]></value>
+		</item>
+		<item name="bold">
+			<value xml:lang="ko"><![CDATA[진하게]]></value>
+			<value xml:lang="en"><![CDATA[Bold]]></value>
+			<value xml:lang="jp"><![CDATA[太字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[粗体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[粗體]]></value>
+			<value xml:lang="tr"><![CDATA[Kalın]]></value>
+			<value xml:lang="vi"><![CDATA[Chữ đậm]]></value>
+		</item>
+		<item name="italic">
+			<value xml:lang="ko"><![CDATA[기울임]]></value>
+			<value xml:lang="en"><![CDATA[Italic]]></value>
+			<value xml:lang="jp"><![CDATA[斜体]]></value>
+			<value xml:lang="zh-CN"><![CDATA[斜体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[斜體]]></value>
+			<value xml:lang="tr"><![CDATA[Italik]]></value>
+			<value xml:lang="vi"><![CDATA[Chữ nghiêng]]></value>
+		</item>
+		<item name="underline">
+			<value xml:lang="ko"><![CDATA[밑줄]]></value>
+			<value xml:lang="en"><![CDATA[Underline]]></value>
+			<value xml:lang="jp"><![CDATA[下線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下划线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[底線]]></value>
+			<value xml:lang="tr"><![CDATA[Altıçizili]]></value>
+			<value xml:lang="vi"><![CDATA[Chứ gạch chân]]></value>
+		</item>
+		<item name="strike">
+			<value xml:lang="ko"><![CDATA[취소선]]></value>
+			<value xml:lang="en"><![CDATA[Strikethrough]]></value>
+			<value xml:lang="jp"><![CDATA[取り消し線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[取消线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[虛線]]></value>
+			<value xml:lang="tr"><![CDATA[Göze Çarpan]]></value>
+			<value xml:lang="vi"><![CDATA[Chữ gạch giữa]]></value>
+		</item>
+		<item name="sup">
+			<value xml:lang="ko"><![CDATA[위 첨자]]></value>
+			<value xml:lang="en"><![CDATA[Super]]></value>
+			<value xml:lang="jp"><![CDATA[上付き文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上标]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上標]]></value>
+			<value xml:lang="vi"><![CDATA[Chỉ số trên]]></value>
+		</item>
+		<item name="sub">
+			<value xml:lang="ko"><![CDATA[아래 첨자]]></value>
+			<value xml:lang="en"><![CDATA[Sub]]></value>
+			<value xml:lang="jp"><![CDATA[下付き文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下标]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下標]]></value>
+			<value xml:lang="vi"><![CDATA[Chỉ số dưới]]></value>
+		</item>
+		<item name="redo">
+			<value xml:lang="ko"><![CDATA[다시 실행]]></value>
+			<value xml:lang="en"><![CDATA[Redo]]></value>
+			<value xml:lang="jp"><![CDATA[繰り返し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[恢复]]></value>
+			<value xml:lang="zh-TW"><![CDATA[重新操作]]></value>
+			<value xml:lang="tr"><![CDATA[Yinele]]></value>
+			<value xml:lang="vi"><![CDATA[Phía sau]]></value>
+		</item>
+		<item name="undo">
+			<value xml:lang="ko"><![CDATA[되돌리기]]></value>
+			<value xml:lang="en"><![CDATA[Undo]]></value>
+			<value xml:lang="jp"><![CDATA[元に戻す]]></value>
+			<value xml:lang="zh-CN"><![CDATA[撤销]]></value>
+			<value xml:lang="zh-TW"><![CDATA[返回操作]]></value>
+			<value xml:lang="tr"><![CDATA[Geri Al]]></value>
+			<value xml:lang="vi"><![CDATA[Trở lại]]></value>
+		</item>
+		<item name="align_left">
+			<value xml:lang="ko"><![CDATA[왼쪽 정렬]]></value>
+			<value xml:lang="en"><![CDATA[Align Left]]></value>
+			<value xml:lang="jp"><![CDATA[左揃え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠左對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Sola Hizalama]]></value>
+			<value xml:lang="vi"><![CDATA[Căn trái]]></value>
+		</item>
+		<item name="align_center">
+			<value xml:lang="ko"><![CDATA[가운데 정렬]]></value>
+			<value xml:lang="en"><![CDATA[Align Center]]></value>
+			<value xml:lang="jp"><![CDATA[中央揃え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[居中对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[置中對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Ortalı Hizalama]]></value>
+			<value xml:lang="vi"><![CDATA[Căn giữa]]></value>
+		</item>
+		<item name="align_right">
+			<value xml:lang="ko"><![CDATA[오른쪽 정렬]]></value>
+			<value xml:lang="en"><![CDATA[Align Right]]></value>
+			<value xml:lang="jp"><![CDATA[右揃え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠右對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Sağa Hizalama]]></value>
+			<value xml:lang="vi"><![CDATA[Căn phải]]></value>
+		</item>
+		<item name="align_justify">
+			<value xml:lang="ko"><![CDATA[양쪽 정렬]]></value>
+			<value xml:lang="en"><![CDATA[Align Justify]]></value>
+			<value xml:lang="jp"><![CDATA[均等割付]]></value>
+			<value xml:lang="zh-CN"><![CDATA[两端对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[左右對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Kenara Yaslı Hizalama]]></value>
+			<value xml:lang="vi"><![CDATA[Căn đều]]></value>
+		</item>
+		<item name="add_indent">
+			<value xml:lang="ko"><![CDATA[들여쓰기]]></value>
+			<value xml:lang="en"><![CDATA[Indent]]></value>
+			<value xml:lang="jp"><![CDATA[インデント増]]></value>
+			<value xml:lang="zh-CN"><![CDATA[增加缩进]]></value>
+			<value xml:lang="zh-TW"><![CDATA[縮排]]></value>
+			<value xml:lang="tr"><![CDATA[Girinti]]></value>
+			<value xml:lang="vi"><![CDATA[Thụt lề]]></value>
+		</item>
+		<item name="remove_indent">
+			<value xml:lang="ko"><![CDATA[내어쓰기]]></value>
+			<value xml:lang="en"><![CDATA[Outdent]]></value>
+			<value xml:lang="jp"><![CDATA[インデント減]]></value>
+			<value xml:lang="zh-CN"><![CDATA[减少缩进]]></value>
+			<value xml:lang="zh-TW"><![CDATA[凸排]]></value>
+			<value xml:lang="tr"><![CDATA[Çıkıntı]]></value>
+			<value xml:lang="vi"><![CDATA[Dàn đều]]></value>
+		</item>
+		<item name="list_number">
+			<value xml:lang="ko"><![CDATA[번호 매기기]]></value>
+			<value xml:lang="en"><![CDATA[Orderd List]]></value>
+			<value xml:lang="jp"><![CDATA[番号付リスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[有序列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[編號]]></value>
+			<value xml:lang="tr"><![CDATA[Sıralanan Listesi]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ tự số]]></value>
+		</item>
+		<item name="list_bullet">
+			<value xml:lang="ko"><![CDATA[목록]]></value>
+			<value xml:lang="en"><![CDATA[Unordered List]]></value>
+			<value xml:lang="jp"><![CDATA[箇条書き]]></value>
+			<value xml:lang="zh-CN"><![CDATA[无序列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[清單符號]]></value>
+			<value xml:lang="tr"><![CDATA[Sırasız Listesi]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ tự chấm]]></value>
+		</item>
+		<item name="remove_format">
+			<value xml:lang="ko"><![CDATA[글맵시 지우기]]></value>
+			<value xml:lang="en"><![CDATA[Style Remover]]></value>
+			<value xml:lang="jp"><![CDATA[書式をクリア]]></value>
+			<value xml:lang="zh-CN"><![CDATA[删除文字格式]]></value>
+			<value xml:lang="zh-TW"><![CDATA[移除格式]]></value>
+			<value xml:lang="ru"><![CDATA[Удалить стиль]]></value>
+			<value xml:lang="tr"><![CDATA[Tarz Silicisi]]></value>
+			<value xml:lang="vi"><![CDATA[Xóa định dạng]]></value>
+		</item>
+		<item name="help_remove_format">
+			<value xml:lang="ko"><![CDATA[선택된 영역 내의 태그를 지웁니다.]]></value>
+			<value xml:lang="en"><![CDATA[Tags in selected area will be removed.]]></value>
+			<value xml:lang="jp"><![CDATA[選択領域の中のタグを消します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[清除格式。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[移除格式]]></value>
+			<value xml:lang="fr"><![CDATA[Supprimer les balises dans l'endroit sélectionné]]></value>
+			<value xml:lang="ru"><![CDATA[Выделенный объект будет удален]]></value>
+			<value xml:lang="tr"><![CDATA[Seçili alandaki etiketler silinecektir]]></value>
+			<value xml:lang="vi"><![CDATA[Những Tag đã chọn sẽ bị xóa]]></value>
+		</item>
+		<item name="help_strike_through">
+			<value xml:lang="ko"><![CDATA[글자에 취소선을 표시합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Mark the text with strikethrough.]]></value>
+			<value xml:lang="jp"><![CDATA[テキストに取り消し線を表示します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[取消线。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文字刪除線]]></value>
+			<value xml:lang="fr"><![CDATA[Représenter la ligne d'annulation sur les lettres.]]></value>
+			<value xml:lang="tr"><![CDATA[Strike ]]></value>
+			<value xml:lang="vi"><![CDATA[Đường kẻ sẽ nằm lên chữ]]></value>
+		</item>
+		<item name="help_align_full">
+			<value xml:lang="ko"><![CDATA[좌우 폭에 맞게 정렬을 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Align left and right]]></value>
+			<value xml:lang="jp"><![CDATA[左右の余白に合わせて文字列を配置します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[两端对齐。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[左右對齊]]></value>
+			<value xml:lang="fr"><![CDATA[Aligner pleinement selon largeur]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять (вправо/влево)]]></value>
+			<value xml:lang="tr"><![CDATA[Sol ve sağ hizalama]]></value>
+			<value xml:lang="vi"><![CDATA[Căn trái và phải]]></value>
+		</item>
+		<item name="help_fontcolor">
+			<value xml:lang="ko"><![CDATA[글자의 색상을 지정합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Select the text color.]]></value>
+			<value xml:lang="jp"><![CDATA[テキストの色を指定します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文本颜色。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文字顏色]]></value>
+			<value xml:lang="fr"><![CDATA[Désigner la couleur de la Police de caractères]]></value>
+			<value xml:lang="ru"><![CDATA[Выбрать цвет шрифта]]></value>
+			<value xml:lang="es"><![CDATA[Selecciona el color de las letras]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı rengi seç]]></value>
+			<value xml:lang="vi"><![CDATA[Màu chữ]]></value>
+		</item>
+		<item name="help_fontbgcolor">
+			<value xml:lang="ko"><![CDATA[글자의 배경색상을 지정합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Select the background color of the text.]]></value>
+			<value xml:lang="jp"><![CDATA[テキストの背景色を指定します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[背景颜色。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[背景顏色]]></value>
+			<value xml:lang="fr"><![CDATA[Désigner la couleur de l'arrière-plan de la Police de caractères.]]></value>
+			<value xml:lang="ru"><![CDATA[Выбрать цвет фона шрифта]]></value>
+			<value xml:lang="es"><![CDATA[Selecciona el color del fondo de la letras]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı tipinin arkaplan rengini seç]]></value>
+			<value xml:lang="vi"><![CDATA[Màu nền]]></value>
+		</item>
+		<item name="help_bold">
+			<value xml:lang="ko"><![CDATA[글자를 진하게 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Make the text bold.]]></value>
+			<value xml:lang="jp"><![CDATA[テキストを太字に指定します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[粗体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[粗體]]></value>
+			<value xml:lang="fr"><![CDATA[Caractère gras]]></value>
+			<value xml:lang="ru"><![CDATA[Сделать шрифт жирным]]></value>
+			<value xml:lang="es"><![CDATA[Letra gruesa]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı tipini kalın yap]]></value>
+			<value xml:lang="vi"><![CDATA[ Chữ đậm]]></value>
+		</item>
+		<item name="help_italic">
+			<value xml:lang="ko"><![CDATA[글자를 기울이게 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Make the text italic.]]></value>
+			<value xml:lang="jp"><![CDATA[テキストを斜体にします。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[斜体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[斜體]]></value>
+			<value xml:lang="fr"><![CDATA[Caractère italique]]></value>
+			<value xml:lang="ru"><![CDATA[Сделать шрифт наклонным]]></value>
+			<value xml:lang="es"><![CDATA[Letra cursiva]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı tipini italik yap]]></value>
+			<value xml:lang="vi"><![CDATA[ Chữ nghiêng]]></value>
+		</item>
+		<item name="help_underline">
+			<value xml:lang="ko"><![CDATA[밑줄을 긋습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Underline the text.]]></value>
+			<value xml:lang="jp"><![CDATA[テキストに下線を引きます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下划线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[底線]]></value>
+			<value xml:lang="fr"><![CDATA[Caractère souligné]]></value>
+			<value xml:lang="ru"><![CDATA[Сделать шрифт подчеркнутым]]></value>
+			<value xml:lang="es"><![CDATA[Letra subrayada]]></value>
+			<value xml:lang="tr"><![CDATA[Altıçizili yazı tipi]]></value>
+			<value xml:lang="vi"><![CDATA[ Chữ gạch chân]]></value>
+		</item>
+		<item name="help_strike">
+			<value xml:lang="ko"><![CDATA[취소선을 긋습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Mark the text with strikethrough.]]></value>
+			<value xml:lang="jp"><![CDATA[取り消し線を引きます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[取消线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[虛線]]></value>
+			<value xml:lang="fr"><![CDATA[Caractère biffé]]></value>
+			<value xml:lang="ru"><![CDATA[Сделать шрифт зачеркнутым]]></value>
+			<value xml:lang="es"><![CDATA[Letra con linea]]></value>
+			<value xml:lang="vi"><![CDATA[ Chữ gạch giữa]]></value>
+		</item>
+		<item name="help_sup">
+			<value xml:lang="ko"><![CDATA[위 첨자를 입력합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Make the text superscript.]]></value>
+			<value xml:lang="jp"><![CDATA[上付き文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上标]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上標]]></value>
+			<value xml:lang="fr"><![CDATA[Sup]]></value>
+			<value xml:lang="ru"><![CDATA[Sup]]></value>
+			<value xml:lang="es"><![CDATA[Sup]]></value>
+			<value xml:lang="vi"><![CDATA[Chỉ số trên]]></value>
+		</item>
+		<item name="help_sub">
+			<value xml:lang="ko"><![CDATA[아래 첨자를 입력합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Make the text subscript.]]></value>
+			<value xml:lang="jp"><![CDATA[下付き文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下标]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下標]]></value>
+			<value xml:lang="fr"><![CDATA[Sub]]></value>
+			<value xml:lang="ru"><![CDATA[Sub]]></value>
+			<value xml:lang="es"><![CDATA[Sub]]></value>
+			<value xml:lang="vi"><![CDATA[Chỉ số dưới]]></value>
+		</item>
+		<item name="help_redo">
+			<value xml:lang="ko"><![CDATA[다음 동작으로 돌아갑니다.]]></value>
+			<value xml:lang="en"><![CDATA[Redo]]></value>
+			<value xml:lang="jp"><![CDATA[繰り返し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[恢复]]></value>
+			<value xml:lang="zh-TW"><![CDATA[重新操作]]></value>
+			<value xml:lang="fr"><![CDATA[Réfaire]]></value>
+			<value xml:lang="ru"><![CDATA[Восстановить отмененное]]></value>
+			<value xml:lang="es"><![CDATA[Rehacer]]></value>
+			<value xml:lang="tr"><![CDATA[Yine]]></value>
+			<value xml:lang="vi"><![CDATA[Tiếp tục]]></value>
+		</item>
+		<item name="help_undo">
+			<value xml:lang="ko"><![CDATA[이전 동작으로 돌아갑니다.]]></value>
+			<value xml:lang="en"><![CDATA[Undo]]></value>
+			<value xml:lang="jp"><![CDATA[元に戻す]]></value>
+			<value xml:lang="zh-CN"><![CDATA[撤销]]></value>
+			<value xml:lang="zh-TW"><![CDATA[返回操作]]></value>
+			<value xml:lang="fr"><![CDATA[Annuler]]></value>
+			<value xml:lang="ru"><![CDATA[Отмена]]></value>
+			<value xml:lang="es"><![CDATA[Deshacer]]></value>
+			<value xml:lang="tr"><![CDATA[Geri al]]></value>
+			<value xml:lang="vi"><![CDATA[Trở lại]]></value>
+		</item>
+		<item name="help_align_left">
+			<value xml:lang="ko"><![CDATA[왼쪽 정렬을 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Align left]]></value>
+			<value xml:lang="jp"><![CDATA[テキストを左揃えで表示します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠左對齊]]></value>
+			<value xml:lang="fr"><![CDATA[Aligner à gauche]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять по левому краю]]></value>
+			<value xml:lang="es"><![CDATA[Margen izquierdo]]></value>
+			<value xml:lang="tr"><![CDATA[Sola Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Căn trái]]></value>
+		</item>
+		<item name="help_align_center">
+			<value xml:lang="ko"><![CDATA[가운데 정렬을 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Align center]]></value>
+			<value xml:lang="jp"><![CDATA[テキストを中央揃えで表示します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[居中对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[置中對齊]]></value>
+			<value xml:lang="fr"><![CDATA[Aligner centr]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять по центру]]></value>
+			<value xml:lang="es"><![CDATA[Margen central]]></value>
+			<value xml:lang="tr"><![CDATA[Ortalı Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Căn giữa]]></value>
+		</item>
+		<item name="help_align_right">
+			<value xml:lang="ko"><![CDATA[오른쪽 정렬을 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Align right]]></value>
+			<value xml:lang="jp"><![CDATA[テキストを右揃えで表示します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠右對齊]]></value>
+			<value xml:lang="fr"><![CDATA[Aligner  droite]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять по правому краю]]></value>
+			<value xml:lang="es"><![CDATA[Margen derecho]]></value>
+			<value xml:lang="tr"><![CDATA[Sağa Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Căn phải]]></value>
+		</item>
+		<item name="help_align_justify">
+			<value xml:lang="ko"><![CDATA[양쪽 정렬을 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Align justity]]></value>
+			<value xml:lang="jp"><![CDATA[テキストを両端揃えで表示します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[两端对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[左右對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Kenara Yaslı Hizalama]]></value>
+			<value xml:lang="vi"><![CDATA[Đều hai bên]]></value>
+		</item>
+		<item name="help_add_indent">
+			<value xml:lang="ko"><![CDATA[단락의 들여쓰기 수준을 높입니다.]]></value>
+			<value xml:lang="en"><![CDATA[Add indent]]></value>
+			<value xml:lang="jp"><![CDATA[インデントを増やします。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[增加缩进]]></value>
+			<value xml:lang="zh-TW"><![CDATA[縮排]]></value>
+			<value xml:lang="fr"><![CDATA[Ajouter un Rentré]]></value>
+			<value xml:lang="ru"><![CDATA[Добавить отступ]]></value>
+			<value xml:lang="es"><![CDATA[Anadir tabulación]]></value>
+			<value xml:lang="tr"><![CDATA[Girinti Ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Thụt vào]]></value>
+		</item>
+		<item name="help_remove_indent">
+			<value xml:lang="ko"><![CDATA[단락의 들여쓰기 수준을 낮춥니다.]]></value>
+			<value xml:lang="en"><![CDATA[Remove indent]]></value>
+			<value xml:lang="jp"><![CDATA[インデントを減らします。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[减少缩进]]></value>
+			<value xml:lang="zh-TW"><![CDATA[凸排]]></value>
+			<value xml:lang="fr"><![CDATA[Enlever un Rentré]]></value>
+			<value xml:lang="ru"><![CDATA[Удалить отступ]]></value>
+			<value xml:lang="es"><![CDATA[Quitar tabulación]]></value>
+			<value xml:lang="tr"><![CDATA[Girinti sil]]></value>
+			<value xml:lang="vi"><![CDATA[Giãn ra]]></value>
+		</item>
+		<item name="help_list_number">
+			<value xml:lang="ko"><![CDATA[숫자로된 목록을 적용합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Apply ordered list.]]></value>
+			<value xml:lang="jp"><![CDATA[番号付リスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[有序列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[編號]]></value>
+			<value xml:lang="fr"><![CDATA[Appliquer la liste numroté]]></value>
+			<value xml:lang="ru"><![CDATA[Применить числовой список]]></value>
+			<value xml:lang="es"><![CDATA[Aplicar la lista con números]]></value>
+			<value xml:lang="tr"><![CDATA[Sayı listesini uygula]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ tự số]]></value>
+		</item>
+		<item name="help_list_bullet">
+			<value xml:lang="ko"><![CDATA[기호로된 목록을 적용합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Apply bullet list.]]></value>
+			<value xml:lang="jp"><![CDATA[箇条書き]]></value>
+			<value xml:lang="zh-CN"><![CDATA[无序列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[清單符號]]></value>
+			<value xml:lang="fr"><![CDATA[Appliquer la liste à puces]]></value>
+			<value xml:lang="ru"><![CDATA[Применить маркированный список]]></value>
+			<value xml:lang="es"><![CDATA[Aplicar la lista con símbolos]]></value>
+			<value xml:lang="tr"><![CDATA[Bullet listesi uygula]]></value>
+			<value xml:lang="vi"><![CDATA[Thứ tự chấm]]></value>
+		</item>
+		<item name="help_use_paragraph">
+			<value xml:lang="ko"><![CDATA[문단 나누기를 하시려면 Ctrl+Enter를 누르시면 됩니다. (글 작성완료 후 Alt+S를 누르면 저장이 됩니다.)]]></value>
+			<value xml:lang="en"><![CDATA[Press Ctrl+Enter to use paragraph break. (Press Alt+S to save it.)]]></value>
+			<value xml:lang="jp"><![CDATA[段落機能を使用する場合は、「Ctrl+Enter」を押します（書き終わった後、「Alt+S」を押すと保存されます）。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[分段请按 Ctrl＋回车． (发表主题快捷键：Alt＋S)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[換行請按 Ctrl+Backspace (快速發表主題：Alt+S)]]></value>
+			<value xml:lang="fr"><![CDATA[Appuyez Ctrl+Enter pour séparer les paragraphe. (Appuyez Alt+S pour conserver)]]></value>
+			<value xml:lang="ru"><![CDATA[Нажмите Ctrl+Enter, чтобы отметить параграф. (Нажмите Alt+S , чтобы сохранить)]]></value>
+			<value xml:lang="es"><![CDATA[Presiona Ctrl+Enter para usar el párrafo (Presiona Alt+S para guardar)]]></value>
+			<value xml:lang="tr"><![CDATA[Paragraf yapmak için Ctrl+Enter tuşlarına basınız. (Göndermek için Alt+S e basınız)]]></value>
+			<value xml:lang="vi"><![CDATA[Bấm "Ctrl+Enter" để sử dụng Paragraph. Bấm phím "Alt+S" để gửi.]]></value>
+		</item>
+		<item name="url">
+			<value xml:lang="ko"><![CDATA[링크]]></value>
+			<value xml:lang="en"><![CDATA[URL]]></value>
+			<value xml:lang="jp"><![CDATA[リンク]]></value>
+			<value xml:lang="zh-CN"><![CDATA[链接]]></value>
+			<value xml:lang="zh-TW"><![CDATA[連結]]></value>
+		</item>
+		<item name="blockquote">
+			<value xml:lang="ko"><![CDATA[인용문]]></value>
+			<value xml:lang="en"><![CDATA[Blockquote]]></value>
+			<value xml:lang="jp"><![CDATA[引用文]]></value>
+			<value xml:lang="zh-CN"><![CDATA[注释框]]></value>
+			<value xml:lang="zh-TW"><![CDATA[引用]]></value>
+			<value xml:lang="tr"><![CDATA[Blokalıntı]]></value>
+			<value xml:lang="vi"><![CDATA[Trích dẫn]]></value>
+		</item>
+		<item name="table">
+			<value xml:lang="ko"><![CDATA[표]]></value>
+			<value xml:lang="en"><![CDATA[Table]]></value>
+			<value xml:lang="jp"><![CDATA[表]]></value>
+			<value xml:lang="zh-CN"><![CDATA[表格]]></value>
+			<value xml:lang="zh-TW"><![CDATA[表格]]></value>
+			<value xml:lang="tr"><![CDATA[Tablo]]></value>
+			<value xml:lang="vi"><![CDATA[Bảng]]></value>
+		</item>
+		<item name="image">
+			<value xml:lang="ko"><![CDATA[그림]]></value>
+			<value xml:lang="en"><![CDATA[Image]]></value>
+			<value xml:lang="jp"><![CDATA[イメージ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[图片]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圖片]]></value>
+			<value xml:lang="tr"><![CDATA[Resim]]></value>
+			<value xml:lang="vi"><![CDATA[Hình ảnh]]></value>
+		</item>
+		<item name="multimedia">
+			<value xml:lang="ko"><![CDATA[동영상]]></value>
+			<value xml:lang="en"><![CDATA[Video]]></value>
+			<value xml:lang="jp"><![CDATA[動画]]></value>
+			<value xml:lang="zh-CN"><![CDATA[视频]]></value>
+			<value xml:lang="zh-TW"><![CDATA[影片]]></value>
+			<value xml:lang="tr"><![CDATA[Film]]></value>
+			<value xml:lang="vi"><![CDATA[Chèn Media]]></value>
+		</item>
+		<item name="emoticon">
+			<value xml:lang="ko"><![CDATA[이모티콘]]></value>
+			<value xml:lang="en"><![CDATA[Emoticon]]></value>
+			<value xml:lang="jp"><![CDATA[絵文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[表情图标]]></value>
+			<value xml:lang="zh-TW"><![CDATA[表情符號]]></value>
+			<value xml:lang="tr"><![CDATA[His Simgesi]]></value>
+			<value xml:lang="vi"><![CDATA[Diễn tả cảm xúc]]></value>
+		</item>
+		<item name="upload">
+			<value xml:lang="ko"><![CDATA[첨부]]></value>
+			<value xml:lang="en"><![CDATA[Attachment]]></value>
+			<value xml:lang="jp"><![CDATA[添付]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上传]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上傳]]></value>
+			<value xml:lang="fr"><![CDATA[Attacher]]></value>
+			<value xml:lang="ru"><![CDATA[Вложение]]></value>
+			<value xml:lang="es"><![CDATA[Adjuntar]]></value>
+			<value xml:lang="tr"><![CDATA[Ekler]]></value>
+			<value xml:lang="vi"><![CDATA[Đính kèm]]></value>
+		</item>
+		<item name="upload_file">
+			<value xml:lang="ko"><![CDATA[파일 첨부]]></value>
+			<value xml:lang="en"><![CDATA[Attach]]></value>
+			<value xml:lang="jp"><![CDATA[ファイル添付]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上传附件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上傳附檔]]></value>
+			<value xml:lang="fr"><![CDATA[Attacher un(des) Fichier(s)]]></value>
+			<value xml:lang="ru"><![CDATA[Прикрепить файл]]></value>
+			<value xml:lang="es"><![CDATA[Archivo adjunto]]></value>
+			<value xml:lang="tr"><![CDATA[İliştir]]></value>
+			<value xml:lang="vi"><![CDATA[Đính kèm]]></value>
+		</item>
+		<item name="link_file">
+			<value xml:lang="ko"><![CDATA[본문 삽입]]></value>
+			<value xml:lang="en"><![CDATA[Insert to Content]]></value>
+			<value xml:lang="jp"><![CDATA[テキスト挿入]]></value>
+			<value xml:lang="zh-CN"><![CDATA[插入附件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[插入檔案]]></value>
+			<value xml:lang="fr"><![CDATA[Insérer dans le Texte]]></value>
+			<value xml:lang="ru"><![CDATA[Вставить в содержание]]></value>
+			<value xml:lang="es"><![CDATA[Insertar en el contenido del documento]]></value>
+			<value xml:lang="tr"><![CDATA[İçeriğe Ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Chèn vào bài viết]]></value>
+		</item>
+		<item name="delete_selected">
+			<value xml:lang="ko"><![CDATA[선택 삭제]]></value>
+			<value xml:lang="en"><![CDATA[Delete Selected]]></value>
+			<value xml:lang="jp"><![CDATA[選択削除]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
+			<value xml:lang="tr"><![CDATA[Seçileni Sil]]></value>
+		</item>
+		<item name="icon_align_article">
+			<value xml:lang="ko"><![CDATA[한 문단을 차지]]></value>
+			<value xml:lang="en"><![CDATA[Occupy a paragraph]]></value>
+			<value xml:lang="jp"><![CDATA[一段落占め]]></value>
+			<value xml:lang="zh-CN"><![CDATA[占一个段落]]></value>
+			<value xml:lang="zh-TW"><![CDATA[段落]]></value>
+			<value xml:lang="fr"><![CDATA[Occuper un paragraphe]]></value>
+			<value xml:lang="ru"><![CDATA[Занять весь параграф]]></value>
+			<value xml:lang="es"><![CDATA[Ocupar un párrafo]]></value>
+			<value xml:lang="tr"><![CDATA[Paragraf Yap]]></value>
+			<value xml:lang="vi"><![CDATA[Vị trí trong bài viết]]></value>
+		</item>
+		<item name="icon_align_left">
+			<value xml:lang="ko"><![CDATA[글의 왼쪽으로]]></value>
+			<value xml:lang="en"><![CDATA[Left of Article]]></value>
+			<value xml:lang="jp"><![CDATA[左揃え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文本左侧]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠左]]></value>
+			<value xml:lang="fr"><![CDATA[Placer à gauche du texte]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять по левому краю]]></value>
+			<value xml:lang="es"><![CDATA[Margen izquierdo]]></value>
+			<value xml:lang="tr"><![CDATA[Sola Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Trái]]></value>
+		</item>
+		<item name="icon_align_middle">
+			<value xml:lang="ko"><![CDATA[가운데 정렬]]></value>
+			<value xml:lang="en"><![CDATA[Align Center]]></value>
+			<value xml:lang="jp"><![CDATA[中央揃え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[居中对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[置中]]></value>
+			<value xml:lang="fr"><![CDATA[Placer au centre]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять по центру]]></value>
+			<value xml:lang="es"><![CDATA[Margen central]]></value>
+			<value xml:lang="tr"><![CDATA[Ortaya Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Giữa]]></value>
+		</item>
+		<item name="icon_align_right">
+			<value xml:lang="ko"><![CDATA[글의 우측으로]]></value>
+			<value xml:lang="en"><![CDATA[Right of Article]]></value>
+			<value xml:lang="jp"><![CDATA[右揃え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文本右侧]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠右]]></value>
+			<value xml:lang="fr"><![CDATA[Placer à droite du texte]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять по правому краю]]></value>
+			<value xml:lang="es"><![CDATA[Margen derecho]]></value>
+			<value xml:lang="tr"><![CDATA[Sağa Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Phải]]></value>
+		</item>
+		<item name="rich_editor">
+			<value xml:lang="ko"><![CDATA[스타일 편집기]]></value>
+			<value xml:lang="en"><![CDATA[Rich Text Editor]]></value>
+			<value xml:lang="jp"><![CDATA[ウイジウイグ編集]]></value>
+			<value xml:lang="zh-CN"><![CDATA[常规]]></value>
+			<value xml:lang="zh-TW"><![CDATA[所見即得]]></value>
+			<value xml:lang="ru"><![CDATA[редактировать стиль]]></value>
+			<value xml:lang="tr"><![CDATA[Zengin Metin Editörü]]></value>
+			<value xml:lang="vi"><![CDATA[Kiểu trù phú]]></value>
+		</item>
+		<item name="html_editor">
+			<value xml:lang="ko"><![CDATA[HTML 편집기]]></value>
+			<value xml:lang="en"><![CDATA[HTML Editor]]></value>
+			<value xml:lang="jp"><![CDATA[HTMLタグ編集]]></value>
+			<value xml:lang="zh-CN"><![CDATA[HTML]]></value>
+			<value xml:lang="zh-TW"><![CDATA[HTML]]></value>
+			<value xml:lang="ru"><![CDATA[редактировать HTML]]></value>
+			<value xml:lang="tr"><![CDATA[HTML Editörü]]></value>
+			<value xml:lang="vi"><![CDATA[Kiểu HTML]]></value>
+		</item>
+		<item name="extension">
+			<value xml:lang="ko"><![CDATA[확장 컴포넌트]]></value>
+			<value xml:lang="en"><![CDATA[Extension Components]]></value>
+			<value xml:lang="jp"><![CDATA[拡張コンポーネント]]></value>
+			<value xml:lang="zh-CN"><![CDATA[扩展组件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[延伸組件]]></value>
+			<value xml:lang="ru"><![CDATA[Расширенный компонент]]></value>
+			<value xml:lang="tr"><![CDATA[Uzantı Bileşenleri]]></value>
+			<value xml:lang="vi"><![CDATA[Thành phần mở rộng]]></value>
+		</item>
+		<item name="help">
+			<value xml:lang="ko"><![CDATA[도움말]]></value>
+			<value xml:lang="en"><![CDATA[Help]]></value>
+			<value xml:lang="jp"><![CDATA[ヘルプ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[帮助]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用說明]]></value>
+			<value xml:lang="ru"><![CDATA[Помощь]]></value>
+			<value xml:lang="tr"><![CDATA[Yardım]]></value>
+			<value xml:lang="vi"><![CDATA[Trợ giúp]]></value>
+		</item>
+		<item name="help_command">
+			<value xml:lang="ko"><![CDATA[단축키 안내]]></value>
+			<value xml:lang="en"><![CDATA[Help Hotkeys]]></value>
+			<value xml:lang="jp"><![CDATA[ショートカット‐キーの説明]]></value>
+			<value xml:lang="zh-CN"><![CDATA[快捷键说明]]></value>
+			<value xml:lang="zh-TW"><![CDATA[熱鍵指引]]></value>
+			<value xml:lang="ru"><![CDATA[Горячие клавиши]]></value>
+			<value xml:lang="tr"><![CDATA[Kısayol Yardım Tuşları]]></value>
+			<value xml:lang="vi"><![CDATA[Phím nóng]]></value>
+		</item>
+		<item name="lineheight">
+			<value xml:lang="ko"><![CDATA[줄 간격]]></value>
+			<value xml:lang="en"><![CDATA[Line Height]]></value>
+			<value xml:lang="jp"><![CDATA[行間]]></value>
+			<value xml:lang="zh-CN"><![CDATA[行间距]]></value>
+			<value xml:lang="zh-TW"><![CDATA[行距]]></value>
+			<value xml:lang="fr"><![CDATA[줄간격]]></value>
+			<value xml:lang="ru"><![CDATA[Высота строки]]></value>
+			<value xml:lang="es"><![CDATA[줄간격]]></value>
+			<value xml:lang="tr"><![CDATA[Satır Yüksekliği]]></value>
+			<value xml:lang="vi"><![CDATA[Chiều cao dòng]]></value>
+		</item>
+		<item name="fontbgsampletext">
+			<value xml:lang="ko"><![CDATA[가나다]]></value>
+			<value xml:lang="en"><![CDATA[ABC]]></value>
+			<value xml:lang="jp"><![CDATA[あいうえお]]></value>
+			<value xml:lang="zh-CN"><![CDATA[我爱中华！]]></value>
+			<value xml:lang="zh-TW"><![CDATA[ㄅㄆㄇ]]></value>
+			<value xml:lang="ru"><![CDATA[АВС]]></value>
+		</item>
+		<item name="hyperlink">
+			<value xml:lang="ko"><![CDATA[하이퍼링크]]></value>
+			<value xml:lang="en"><![CDATA[Hyperlink]]></value>
+			<value xml:lang="jp"><![CDATA[ハイパーリンク]]></value>
+			<value xml:lang="zh-CN"><![CDATA[链接]]></value>
+			<value xml:lang="zh-TW"><![CDATA[超連結]]></value>
+			<value xml:lang="ru"><![CDATA[гиперссылка]]></value>
+			<value xml:lang="tr"><![CDATA[Köprü]]></value>
+			<value xml:lang="vi"><![CDATA[Link liên kết]]></value>
+		</item>
+		<item name="target_blank">
+			<value xml:lang="ko"><![CDATA[새 창으로]]></value>
+			<value xml:lang="en"><![CDATA[New Window]]></value>
+			<value xml:lang="jp"><![CDATA[新しいウィンドウで]]></value>
+			<value xml:lang="zh-CN"><![CDATA[新窗口]]></value>
+			<value xml:lang="zh-TW"><![CDATA[新視窗]]></value>
+			<value xml:lang="fr"><![CDATA[새창으로]]></value>
+			<value xml:lang="ru"><![CDATA[Новое окно]]></value>
+			<value xml:lang="es"><![CDATA[새창으로]]></value>
+			<value xml:lang="tr"><![CDATA[Yeni Pencere]]></value>
+			<value xml:lang="vi"><![CDATA[Mở trang mới]]></value>
+		</item>
+		<item name="quotestyle1">
+			<value xml:lang="ko"><![CDATA[왼쪽 실선]]></value>
+			<value xml:lang="en"><![CDATA[Left Solid]]></value>
+			<value xml:lang="jp"><![CDATA[左側実線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[左侧实线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[左側實線]]></value>
+			<value xml:lang="tr"><![CDATA[Sol Düzçizgi]]></value>
+			<value xml:lang="vi"><![CDATA[Liền viền trái]]></value>
+		</item>
+		<item name="quotestyle2">
+			<value xml:lang="ko"><![CDATA[인용 부호]]></value>
+			<value xml:lang="en"><![CDATA[Quote]]></value>
+			<value xml:lang="jp"><![CDATA[引用記号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[引用符号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[引用符號]]></value>
+			<value xml:lang="tr"><![CDATA[Alıntı]]></value>
+			<value xml:lang="vi"><![CDATA[Trích]]></value>
+		</item>
+		<item name="quotestyle3">
+			<value xml:lang="ko"><![CDATA[실선]]></value>
+			<value xml:lang="en"><![CDATA[Solid]]></value>
+			<value xml:lang="jp"><![CDATA[実線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[实线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[實線]]></value>
+			<value xml:lang="tr"><![CDATA[Düzçizgi]]></value>
+			<value xml:lang="vi"><![CDATA[Viền liền]]></value>
+		</item>
+		<item name="quotestyle4">
+			<value xml:lang="ko"><![CDATA[실선 + 배경]]></value>
+			<value xml:lang="en"><![CDATA[Solid + Background]]></value>
+			<value xml:lang="jp"><![CDATA[実線 + 背景]]></value>
+			<value xml:lang="zh-CN"><![CDATA[实线 + 背景]]></value>
+			<value xml:lang="zh-TW"><![CDATA[實線 + 背景]]></value>
+			<value xml:lang="tr"><![CDATA[Düzçizgi + Arkaplan]]></value>
+			<value xml:lang="vi"><![CDATA[Viền liền+Nền]]></value>
+		</item>
+		<item name="quotestyle5">
+			<value xml:lang="ko"><![CDATA[굵은 실선]]></value>
+			<value xml:lang="en"><![CDATA[Bold Solid]]></value>
+			<value xml:lang="jp"><![CDATA[太い実線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[粗实线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[粗框]]></value>
+			<value xml:lang="tr"><![CDATA[Kalın Düzçizgi]]></value>
+			<value xml:lang="vi"><![CDATA[Liền đậm]]></value>
+		</item>
+		<item name="quotestyle6">
+			<value xml:lang="ko"><![CDATA[점선]]></value>
+			<value xml:lang="en"><![CDATA[Dotted]]></value>
+			<value xml:lang="jp"><![CDATA[点線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[虚线]]></value>
+			<value xml:lang="zh-TW"><![CDATA[虛線]]></value>
+			<value xml:lang="tr"><![CDATA[Noktalı]]></value>
+			<value xml:lang="vi"><![CDATA[Viền chấm]]></value>
+		</item>
+		<item name="quotestyle7">
+			<value xml:lang="ko"><![CDATA[점선 + 배경]]></value>
+			<value xml:lang="en"><![CDATA[Dotted + Background]]></value>
+			<value xml:lang="jp"><![CDATA[点線 + 背景]]></value>
+			<value xml:lang="zh-CN"><![CDATA[虚线 + 背景]]></value>
+			<value xml:lang="zh-TW"><![CDATA[虛線 + 背景]]></value>
+			<value xml:lang="tr"><![CDATA[Noktalı + Arkaplan]]></value>
+			<value xml:lang="vi"><![CDATA[Chấm+Nền]]></value>
+		</item>
+		<item name="quotestyle8">
+			<value xml:lang="ko"><![CDATA[적용 취소]]></value>
+			<value xml:lang="en"><![CDATA[Cancel]]></value>
+			<value xml:lang="jp"><![CDATA[適用取り消し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[取消应用]]></value>
+			<value xml:lang="zh-TW"><![CDATA[取消]]></value>
+			<value xml:lang="ru"><![CDATA[Отменить]]></value>
+			<value xml:lang="tr"><![CDATA[İptal]]></value>
+			<value xml:lang="vi"><![CDATA[Loại bỏ]]></value>
+		</item>
+		<item name="jumptoedit">
+			<value xml:lang="ko"><![CDATA[편집 도구모음 건너뛰기]]></value>
+			<value xml:lang="en"><![CDATA[Skip Edit Toolbox]]></value>
+			<value xml:lang="jp"><![CDATA[編集ツール省略]]></value>
+			<value xml:lang="zh-CN"><![CDATA[跳转]]></value>
+			<value xml:lang="zh-TW"><![CDATA[跳過編輯工具列]]></value>
+			<value xml:lang="ru"><![CDATA[Пропустить Инструменты редактирования]]></value>
+			<value xml:lang="tr"><![CDATA[Araç Çubuğu Düzenini Geç]]></value>
+			<value xml:lang="vi"><![CDATA[Bỏ qua công cụ chỉnh sửa]]></value>
+		</item>
+		<item name="set_sel">
+			<value xml:lang="ko"><![CDATA[칸 수 지정]]></value>
+			<value xml:lang="en"><![CDATA[Set Cell Count]]></value>
+			<value xml:lang="jp"><![CDATA[セル数の指定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[表格大小]]></value>
+			<value xml:lang="zh-TW"><![CDATA[表格]]></value>
+			<value xml:lang="ru"><![CDATA[Установить количество ячеек]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre sayımını ayarla]]></value>
+			<value xml:lang="vi"><![CDATA[Số hàng cột]]></value>
+		</item>
+		<item name="row">
+			<value xml:lang="ko"><![CDATA[행]]></value>
+			<value xml:lang="en"><![CDATA[Row]]></value>
+			<value xml:lang="jp"><![CDATA[行]]></value>
+			<value xml:lang="zh-CN"><![CDATA[行]]></value>
+			<value xml:lang="zh-TW"><![CDATA[行]]></value>
+			<value xml:lang="ru"><![CDATA[Строка]]></value>
+			<value xml:lang="tr"><![CDATA[Satır]]></value>
+			<value xml:lang="vi"><![CDATA[Hàng]]></value>
+		</item>
+		<item name="col">
+			<value xml:lang="ko"><![CDATA[열]]></value>
+			<value xml:lang="en"><![CDATA[Column]]></value>
+			<value xml:lang="jp"><![CDATA[列]]></value>
+			<value xml:lang="zh-CN"><![CDATA[列]]></value>
+			<value xml:lang="zh-TW"><![CDATA[列]]></value>
+			<value xml:lang="ru"><![CDATA[Колонка]]></value>
+			<value xml:lang="tr"><![CDATA[Sütun]]></value>
+			<value xml:lang="vi"><![CDATA[Cột]]></value>
+		</item>
+		<item name="add_one_row">
+			<value xml:lang="ko"><![CDATA[1행 추가]]></value>
+			<value xml:lang="en"><![CDATA[Add 1 Row]]></value>
+			<value xml:lang="jp"><![CDATA[1行追加]]></value>
+			<value xml:lang="zh-CN"><![CDATA[添加1行]]></value>
+			<value xml:lang="zh-TW"><![CDATA[新增一行]]></value>
+			<value xml:lang="fr"><![CDATA[1행추가]]></value>
+			<value xml:lang="ru"><![CDATA[Добавить 1 строку]]></value>
+			<value xml:lang="es"><![CDATA[1행추가]]></value>
+			<value xml:lang="tr"><![CDATA[1 Satır Ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Thêm 1 hàng]]></value>
+		</item>
+		<item name="del_one_row">
+			<value xml:lang="ko"><![CDATA[1행 삭제]]></value>
+			<value xml:lang="en"><![CDATA[Remove 1 Row]]></value>
+			<value xml:lang="jp"><![CDATA[1行削除]]></value>
+			<value xml:lang="zh-CN"><![CDATA[删除1行]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除一行]]></value>
+			<value xml:lang="fr"><![CDATA[1행삭제]]></value>
+			<value xml:lang="ru"><![CDATA[Удалить 1 строку]]></value>
+			<value xml:lang="es"><![CDATA[1행삭제]]></value>
+			<value xml:lang="tr"><![CDATA[1 Satır Sil]]></value>
+			<value xml:lang="vi"><![CDATA[Xóa 1 hàng]]></value>
+		</item>
+		<item name="add_one_col">
+			<value xml:lang="ko"><![CDATA[1열 추가]]></value>
+			<value xml:lang="en"><![CDATA[Add 1 Column]]></value>
+			<value xml:lang="jp"><![CDATA[1列追加]]></value>
+			<value xml:lang="zh-CN"><![CDATA[添加1列]]></value>
+			<value xml:lang="zh-TW"><![CDATA[新增一列]]></value>
+			<value xml:lang="fr"><![CDATA[1열추가]]></value>
+			<value xml:lang="ru"><![CDATA[Добавить 1 колонку]]></value>
+			<value xml:lang="es"><![CDATA[1열추가]]></value>
+			<value xml:lang="tr"><![CDATA[1 Sütun Ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Thêm một cột]]></value>
+		</item>
+		<item name="del_one_col">
+			<value xml:lang="ko"><![CDATA[1열 삭제]]></value>
+			<value xml:lang="en"><![CDATA[Remove 1 Column]]></value>
+			<value xml:lang="jp"><![CDATA[1列削除]]></value>
+			<value xml:lang="zh-CN"><![CDATA[删除1列]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除一列]]></value>
+			<value xml:lang="fr"><![CDATA[1열삭제]]></value>
+			<value xml:lang="ru"><![CDATA[Удалить 1 колонку]]></value>
+			<value xml:lang="es"><![CDATA[1열삭제]]></value>
+			<value xml:lang="tr"><![CDATA[1 Sütun Sil]]></value>
+			<value xml:lang="vi"><![CDATA[Xóa một cột]]></value>
+		</item>
+		<item name="table_config">
+			<value xml:lang="ko"><![CDATA[표 속성 지정]]></value>
+			<value xml:lang="en"><![CDATA[Table Properties]]></value>
+			<value xml:lang="jp"><![CDATA[テーブル属性の設定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[表格属性]]></value>
+			<value xml:lang="zh-TW"><![CDATA[設置]]></value>
+			<value xml:lang="ru"><![CDATA[Конфигурация таблицы]]></value>
+			<value xml:lang="tr"><![CDATA[Tablo Yapılandırması]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập viền]]></value>
+		</item>
+		<item name="border_width">
+			<value xml:lang="ko"><![CDATA[테두리 굵기]]></value>
+			<value xml:lang="en"><![CDATA[Border Width]]></value>
+			<value xml:lang="jp"><![CDATA[外枠太さ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[表格边框]]></value>
+			<value xml:lang="zh-TW"><![CDATA[邊框寬度]]></value>
+			<value xml:lang="ru"><![CDATA[Ширина рамки]]></value>
+			<value xml:lang="tr"><![CDATA[Kenarlık Genişliği]]></value>
+			<value xml:lang="vi"><![CDATA[Độ rộng]]></value>
+		</item>
+		<item name="border_color">
+			<value xml:lang="ko"><![CDATA[테두리 색]]></value>
+			<value xml:lang="en"><![CDATA[Border Color]]></value>
+			<value xml:lang="jp"><![CDATA[外枠色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[边框颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[邊框顏色]]></value>
+			<value xml:lang="ru"><![CDATA[Цвет рамки]]></value>
+			<value xml:lang="tr"><![CDATA[Kenarlık Rengi]]></value>
+			<value xml:lang="vi"><![CDATA[Màu viền]]></value>
+		</item>
+		<item name="add">
+			<value xml:lang="ko"><![CDATA[더하기]]></value>
+			<value xml:lang="en"><![CDATA[Add]]></value>
+			<value xml:lang="jp"><![CDATA[挿入]]></value>
+			<value xml:lang="zh-CN"><![CDATA[加]]></value>
+			<value xml:lang="zh-TW"><![CDATA[新增]]></value>
+			<value xml:lang="ru"><![CDATA[Добавить]]></value>
+			<value xml:lang="tr"><![CDATA[Ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Thêm]]></value>
+		</item>
+		<item name="del">
+			<value xml:lang="ko"><![CDATA[빼기]]></value>
+			<value xml:lang="en"><![CDATA[Sub]]></value>
+			<value xml:lang="jp"><![CDATA[削除]]></value>
+			<value xml:lang="zh-CN"><![CDATA[减]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除]]></value>
+			<value xml:lang="ru"><![CDATA[Удалить]]></value>
+			<value xml:lang="vi"><![CDATA[Xóa]]></value>
+		</item>
+		<item name="search_color">
+			<value xml:lang="ko"><![CDATA[색상 찾기]]></value>
+			<value xml:lang="en"><![CDATA[Search Colors]]></value>
+			<value xml:lang="jp"><![CDATA[その他の色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[修改颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[其他顏色]]></value>
+			<value xml:lang="fr"><![CDATA[색상찾기]]></value>
+			<value xml:lang="ru"><![CDATA[Подобрать цвет]]></value>
+			<value xml:lang="es"><![CDATA[색상찾기]]></value>
+			<value xml:lang="tr"><![CDATA[Renk Ara]]></value>
+			<value xml:lang="vi"><![CDATA[Tìm màu]]></value>
+		</item>
+		<item name="table_backgroundcolor">
+			<value xml:lang="ko"><![CDATA[표 배경색]]></value>
+			<value xml:lang="en"><![CDATA[Table Background Color]]></value>
+			<value xml:lang="jp"><![CDATA[表の背景色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[背景颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[背景顏色]]></value>
+			<value xml:lang="ru"><![CDATA[Цвет фона таблицы]]></value>
+			<value xml:lang="tr"><![CDATA[Tablo Arkaplan Rengi]]></value>
+			<value xml:lang="vi"><![CDATA[Màu nền]]></value>
+		</item>
+		<item name="special_character">
+			<value xml:lang="ko"><![CDATA[특수문자]]></value>
+			<value xml:lang="en"><![CDATA[Special Characters]]></value>
+			<value xml:lang="jp"><![CDATA[特殊文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[特殊字符]]></value>
+			<value xml:lang="zh-TW"><![CDATA[特殊符號]]></value>
+			<value xml:lang="ru"><![CDATA[Специальные символы]]></value>
+			<value xml:lang="tr"><![CDATA[Özek Karekterler]]></value>
+			<value xml:lang="vi"><![CDATA[Kí tự đặc biệt]]></value>
+		</item>
+		<item name="insert_special_character">
+			<value xml:lang="ko"><![CDATA[특수문자 삽입]]></value>
+			<value xml:lang="en"><![CDATA[Insert Special Characters]]></value>
+			<value xml:lang="jp"><![CDATA[特殊文字挿入]]></value>
+			<value xml:lang="zh-CN"><![CDATA[插入特殊字符]]></value>
+			<value xml:lang="zh-TW"><![CDATA[插入特殊符號]]></value>
+			<value xml:lang="ru"><![CDATA[Добавить специальные символы]]></value>
+			<value xml:lang="tr"><![CDATA[Özel Karakterler Ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Chèn kí tự đặc biệt.]]></value>
+		</item>
+		<item name="close_special_character">
+			<value xml:lang="ko"><![CDATA[특수문자 레이어 닫기]]></value>
+			<value xml:lang="en"><![CDATA[Close Special Characters Layer]]></value>
+			<value xml:lang="jp"><![CDATA[特殊文字レイヤーを閉じる]]></value>
+			<value xml:lang="zh-CN"><![CDATA[关闭]]></value>
+			<value xml:lang="zh-TW"><![CDATA[關閉]]></value>
+			<value xml:lang="ru"><![CDATA[Закрыть слой специальных символов]]></value>
+			<value xml:lang="tr"><![CDATA[Özel Karakter Katmanını Kapat]]></value>
+			<value xml:lang="vi"><![CDATA[Tắt bản kí tự đặc biệt.]]></value>
+		</item>
+		<item name="symbol">
+			<value xml:lang="ko"><![CDATA[일반기호]]></value>
+			<value xml:lang="en"><![CDATA[Symbols]]></value>
+			<value xml:lang="jp"><![CDATA[一般記号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[基本符号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[一般符號]]></value>
+			<value xml:lang="ru"><![CDATA[Символы]]></value>
+			<value xml:lang="tr"><![CDATA[Semboller]]></value>
+			<value xml:lang="vi"><![CDATA[Biểu tượng]]></value>
+		</item>
+		<item name="number_unit">
+			<value xml:lang="ko"><![CDATA[숫자와 단위]]></value>
+			<value xml:lang="en"><![CDATA[Numbers and Units]]></value>
+			<value xml:lang="jp"><![CDATA[数字と単位]]></value>
+			<value xml:lang="zh-CN"><![CDATA[数字/单位]]></value>
+			<value xml:lang="zh-TW"><![CDATA[數字、單位]]></value>
+			<value xml:lang="ru"><![CDATA[Числа и единицы измерения]]></value>
+			<value xml:lang="tr"><![CDATA[Sayılar ve Birimler]]></value>
+			<value xml:lang="vi"><![CDATA[Số và đơn vị]]></value>
+		</item>
+		<item name="circle_bracket">
+			<value xml:lang="ko"><![CDATA[원, 괄호]]></value>
+			<value xml:lang="en"><![CDATA[Circles, Brackets]]></value>
+			<value xml:lang="jp"><![CDATA[円、括弧]]></value>
+			<value xml:lang="zh-CN"><![CDATA[数字序号]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圓、括弧]]></value>
+			<value xml:lang="fr"><![CDATA[원,괄호]]></value>
+			<value xml:lang="ru"><![CDATA[Круг, скобки]]></value>
+			<value xml:lang="es"><![CDATA[원,괄호]]></value>
+			<value xml:lang="tr"><![CDATA[Çemberler, Köşeli Ayraçlar]]></value>
+			<value xml:lang="vi"><![CDATA[Vòng tròn, Ngoặc]]></value>
+		</item>
+		<item name="korean">
+			<value xml:lang="ko"><![CDATA[한글]]></value>
+			<value xml:lang="en"><![CDATA[Korean]]></value>
+			<value xml:lang="jp"><![CDATA[韓国語]]></value>
+			<value xml:lang="zh-CN"><![CDATA[韩文]]></value>
+			<value xml:lang="zh-TW"><![CDATA[韓國語]]></value>
+			<value xml:lang="ru"><![CDATA[Корейский]]></value>
+			<value xml:lang="tr"><![CDATA[Korece]]></value>
+		</item>
+		<item name="greece">
+			<value xml:lang="ko"><![CDATA[그리스]]></value>
+			<value xml:lang="en"><![CDATA[Greek]]></value>
+			<value xml:lang="jp"><![CDATA[ギリシャ語]]></value>
+			<value xml:lang="zh-CN"><![CDATA[希腊]]></value>
+			<value xml:lang="zh-TW"><![CDATA[希臘語]]></value>
+			<value xml:lang="ru"><![CDATA[Греческий]]></value>
+			<value xml:lang="tr"><![CDATA[Yunanca]]></value>
+		</item>
+		<item name="Latin">
+			<value xml:lang="ko"><![CDATA[라틴어]]></value>
+			<value xml:lang="en"><![CDATA[Latin]]></value>
+			<value xml:lang="jp"><![CDATA[ラテン語]]></value>
+			<value xml:lang="zh-CN"><![CDATA[拉丁]]></value>
+			<value xml:lang="zh-TW"><![CDATA[拉丁語]]></value>
+			<value xml:lang="ru"><![CDATA[Латинский]]></value>
+			<value xml:lang="tr"><![CDATA[Latince]]></value>
+		</item>
+		<item name="japan">
+			<value xml:lang="ko"><![CDATA[일본어]]></value>
+			<value xml:lang="en"><![CDATA[Japanese]]></value>
+			<value xml:lang="jp"><![CDATA[日本語]]></value>
+			<value xml:lang="zh-CN"><![CDATA[日文]]></value>
+			<value xml:lang="zh-TW"><![CDATA[日本語]]></value>
+			<value xml:lang="ru"><![CDATA[Японский]]></value>
+			<value xml:lang="tr"><![CDATA[Japonca]]></value>
+		</item>
+		<item name="selected_symbol">
+			<value xml:lang="ko"><![CDATA[선택한 기호]]></value>
+			<value xml:lang="en"><![CDATA[Selected Symbols]]></value>
+			<value xml:lang="jp"><![CDATA[選択した記号]]></value>
+			<value xml:lang="zh-CN"><![CDATA[被选字符]]></value>
+			<value xml:lang="zh-TW"><![CDATA[選擇符號]]></value>
+			<value xml:lang="ru"><![CDATA[Выбранные символы]]></value>
+			<value xml:lang="tr"><![CDATA[Seçili Semboller]]></value>
+			<value xml:lang="vi"><![CDATA[Kí tự đã chọn:]]></value>
+		</item>
+		<item name="search_replace">
+			<value xml:lang="ko"><![CDATA[찾기/바꾸기]]></value>
+			<value xml:lang="en"><![CDATA[Find/Replace]]></value>
+			<value xml:lang="jp"><![CDATA[検索/置換え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[查找/替换]]></value>
+			<value xml:lang="zh-TW"><![CDATA[搜尋/置換]]></value>
+			<value xml:lang="ru"><![CDATA[Найти/Переместить]]></value>
+			<value xml:lang="tr"><![CDATA[Bul/Değiştir]]></value>
+			<value xml:lang="vi"><![CDATA[Tìm/Ghi đè]]></value>
+		</item>
+		<item name="close_search_replace">
+			<value xml:lang="ko"><![CDATA[찾기/바꾸기 레이어 닫기]]></value>
+			<value xml:lang="en"><![CDATA[Close Find/Replace Layer]]></value>
+			<value xml:lang="jp"><![CDATA[検索/置換えレイヤーを閉じる]]></value>
+			<value xml:lang="zh-CN"><![CDATA[关闭]]></value>
+			<value xml:lang="zh-TW"><![CDATA[關閉搜尋/置換圖層]]></value>
+			<value xml:lang="ru"><![CDATA[Закрыть слой "Найти/Переместить"]]></value>
+			<value xml:lang="tr"><![CDATA[Bul'u Kapat/Katmanı Değiştir]]></value>
+			<value xml:lang="vi"><![CDATA[Tắt bảng Tìm/Ghi đè]]></value>
+		</item>
+		<item name="replace_all">
+			<value xml:lang="ko"><![CDATA[모두 바꾸기]]></value>
+			<value xml:lang="en"><![CDATA[Replace All]]></value>
+			<value xml:lang="jp"><![CDATA[すべて置換え]]></value>
+			<value xml:lang="zh-CN"><![CDATA[全部替换]]></value>
+			<value xml:lang="zh-TW"><![CDATA[全部置換]]></value>
+			<value xml:lang="fr"><![CDATA[모두바꾸기]]></value>
+			<value xml:lang="ru"><![CDATA[Переместить все]]></value>
+			<value xml:lang="es"><![CDATA[모두바꾸기]]></value>
+			<value xml:lang="tr"><![CDATA[Tümünü Değiştir]]></value>
+			<value xml:lang="vi"><![CDATA[Ghi đè tất cả]]></value>
+		</item>
+		<item name="search_words">
+			<value xml:lang="ko"><![CDATA[찾을 단어]]></value>
+			<value xml:lang="en"><![CDATA[Words to Find]]></value>
+			<value xml:lang="jp"><![CDATA[検索テキスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[查找内容]]></value>
+			<value xml:lang="zh-TW"><![CDATA[搜尋文字]]></value>
+			<value xml:lang="fr"><![CDATA[찾을단어]]></value>
+			<value xml:lang="ru"><![CDATA[Искомое слово]]></value>
+			<value xml:lang="es"><![CDATA[찾을단어]]></value>
+			<value xml:lang="tr"><![CDATA[Bulunacak Sözcükler]]></value>
+			<value xml:lang="vi"><![CDATA[Tìm từ]]></value>
+		</item>
+		<item name="replace_words">
+			<value xml:lang="ko"><![CDATA[바꿀 단어]]></value>
+			<value xml:lang="en"><![CDATA[Words to Replace]]></value>
+			<value xml:lang="jp"><![CDATA[置換えテキスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[替换为]]></value>
+			<value xml:lang="zh-TW"><![CDATA[置換文字]]></value>
+			<value xml:lang="fr"><![CDATA[바꿀단어]]></value>
+			<value xml:lang="ru"><![CDATA[Слово для замены]]></value>
+			<value xml:lang="es"><![CDATA[바꿀단어]]></value>
+			<value xml:lang="tr"><![CDATA[Değiştirilecek Sözcükler]]></value>
+			<value xml:lang="vi"><![CDATA[Từ ghi đè]]></value>
+		</item>
+		<item name="next_search_words">
+			<value xml:lang="ko"><![CDATA[다음 찾기]]></value>
+			<value xml:lang="en"><![CDATA[Find Next]]></value>
+			<value xml:lang="jp"><![CDATA[次を検索]]></value>
+			<value xml:lang="zh-CN"><![CDATA[查找下一个]]></value>
+			<value xml:lang="zh-TW"><![CDATA[搜尋下一個]]></value>
+			<value xml:lang="fr"><![CDATA[다음찾기]]></value>
+			<value xml:lang="ru"><![CDATA[Искать дальше]]></value>
+			<value xml:lang="es"><![CDATA[다음찾기]]></value>
+			<value xml:lang="tr"><![CDATA[Sonrakini Bul]]></value>
+			<value xml:lang="vi"><![CDATA[Tìm tiếp]]></value>
+		</item>
+		<item name="edit_height_control">
+			<value xml:lang="ko"><![CDATA[입력창 크기 조절]]></value>
+			<value xml:lang="en"><![CDATA[Set Edit Form Size]]></value>
+			<value xml:lang="jp"><![CDATA[入力サイズ調整]]></value>
+			<value xml:lang="zh-CN"><![CDATA[调整输入框大小]]></value>
+			<value xml:lang="zh-TW"><![CDATA[設定大小]]></value>
+			<value xml:lang="ru"><![CDATA[Изменить размеры окна ввода]]></value>
+			<value xml:lang="tr"><![CDATA[Düzen Formunun Boyutunu Ayarla]]></value>
+			<value xml:lang="vi"><![CDATA[Đặt kích thước mẫu]]></value>
+		</item>
+		<item name="merge_cells">
+			<value xml:lang="ko"><![CDATA[셀 병합]]></value>
+			<value xml:lang="en"><![CDATA[Merge Table Cells]]></value>
+			<value xml:lang="jp"><![CDATA[セルの結合]]></value>
+			<value xml:lang="zh-CN"><![CDATA[合并单元格]]></value>
+			<value xml:lang="zh-TW"><![CDATA[合併儲存格]]></value>
+			<value xml:lang="ru"><![CDATA[Объединить ячейки]]></value>
+			<value xml:lang="tr"><![CDATA[Tablo Hücrelerini Birleştir]]></value>
+			<value xml:lang="vi"><![CDATA[Nối bảng]]></value>
+		</item>
+		<item name="split_row">
+			<value xml:lang="ko"><![CDATA[행 분할]]></value>
+			<value xml:lang="en"><![CDATA[Split Row]]></value>
+			<value xml:lang="jp"><![CDATA[行の挿入]]></value>
+			<value xml:lang="zh-CN"><![CDATA[跨行]]></value>
+			<value xml:lang="zh-TW"><![CDATA[分割行]]></value>
+			<value xml:lang="ru"><![CDATA[Разбить строки]]></value>
+			<value xml:lang="tr"><![CDATA[Satır Ayır]]></value>
+			<value xml:lang="vi"><![CDATA[Chia hàng]]></value>
+		</item>
+		<item name="split_col">
+			<value xml:lang="ko"><![CDATA[열 분할]]></value>
+			<value xml:lang="en"><![CDATA[Split Column]]></value>
+			<value xml:lang="jp"><![CDATA[列の挿入]]></value>
+			<value xml:lang="zh-CN"><![CDATA[跨列]]></value>
+			<value xml:lang="zh-TW"><![CDATA[分割列]]></value>
+			<value xml:lang="ru"><![CDATA[Разбить колонки]]></value>
+			<value xml:lang="tr"><![CDATA[Sütun Ayır]]></value>
+			<value xml:lang="vi"><![CDATA[Chia cột]]></value>
+		</item>
+		<item name="toggle_list">
+			<value xml:lang="ko"><![CDATA[목록 접기/펼치기]]></value>
+			<value xml:lang="en"><![CDATA[Fold/Unfold]]></value>
+			<value xml:lang="jp"><![CDATA[リストを折りたたむ/展開する]]></value>
+			<value xml:lang="zh-CN"><![CDATA[展开/折叠列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[摺疊/展開]]></value>
+			<value xml:lang="ru"><![CDATA[Свернуть/Развернуть список]]></value>
+			<value xml:lang="tr"><![CDATA[Kıvır/Geriaç]]></value>
+			<value xml:lang="vi"><![CDATA[Hiện/Ẩn]]></value>
+		</item>
+		<item name="minimize_list">
+			<value xml:lang="ko"><![CDATA[최소화]]></value>
+			<value xml:lang="en"><![CDATA[Minimize]]></value>
+			<value xml:lang="jp"><![CDATA[最小化]]></value>
+			<value xml:lang="zh-CN"><![CDATA[最小化]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最小化]]></value>
+			<value xml:lang="ru"><![CDATA[Уменьшить]]></value>
+			<value xml:lang="tr"><![CDATA[Simge Durumuna Küçült]]></value>
+			<value xml:lang="vi"><![CDATA[Thu nhỏ]]></value>
+		</item>
+		<item name="move">
+			<value xml:lang="ko"><![CDATA[이동]]></value>
+			<value xml:lang="en"><![CDATA[Move]]></value>
+			<value xml:lang="jp"><![CDATA[移動]]></value>
+			<value xml:lang="zh-CN"><![CDATA[移动]]></value>
+			<value xml:lang="zh-TW"><![CDATA[搬移]]></value>
+			<value xml:lang="ru"><![CDATA[Перейти]]></value>
+			<value xml:lang="tr"><![CDATA[Taşı]]></value>
+			<value xml:lang="vi"><![CDATA[Di chuyển]]></value>
+		</item>
+		<item name="refresh">
+			<value xml:lang="ko"><![CDATA[새로 고침]]></value>
+			<value xml:lang="en"><![CDATA[Refresh]]></value>
+			<value xml:lang="jp"><![CDATA[再読み込み]]></value>
+			<value xml:lang="zh-CN"><![CDATA[刷新]]></value>
+			<value xml:lang="zh-TW"><![CDATA[重整]]></value>
+			<value xml:lang="ru"><![CDATA[Обновить]]></value>
+			<value xml:lang="tr"><![CDATA[Yenile]]></value>
+			<value xml:lang="vi"><![CDATA[Làm mới]]></value>
+		</item>
+		<item name="materials">
+			<value xml:lang="ko"><![CDATA[글감 보관함]]></value>
+			<value xml:lang="en"><![CDATA[Materials]]></value>
+			<value xml:lang="jp"><![CDATA[資料箱]]></value>
+			<value xml:lang="zh-CN"><![CDATA[素材库]]></value>
+			<value xml:lang="zh-TW"><![CDATA[素材]]></value>
+			<value xml:lang="fr"><![CDATA[글감보관함]]></value>
+			<value xml:lang="ru"><![CDATA[Материалы]]></value>
+			<value xml:lang="es"><![CDATA[글감보관함]]></value>
+			<value xml:lang="tr"><![CDATA[Malzemeler]]></value>
+			<value xml:lang="vi"><![CDATA[Vật liệu]]></value>
+		</item>
+		<item name="temporary_savings">
+			<value xml:lang="ko"><![CDATA[임시 저장 목록]]></value>
+			<value xml:lang="en"><![CDATA[Temporary Saved List]]></value>
+			<value xml:lang="jp"><![CDATA[下書きリスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[临时保存列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[暫存檔列表]]></value>
+			<value xml:lang="fr"><![CDATA[임시저장목록]]></value>
+			<value xml:lang="ru"><![CDATA[Список временных сохранений]]></value>
+			<value xml:lang="es"><![CDATA[임시저장목록]]></value>
+			<value xml:lang="tr"><![CDATA[Geçici Kayıtlı Listesi]]></value>
+			<value xml:lang="vi"><![CDATA[Danh sách lưu tạm thời]]></value>
+		</item>
+		<item name="paging_prev">
+			<value xml:lang="ko"><![CDATA[이전]]></value>
+			<value xml:lang="en"><![CDATA[Prev]]></value>
+			<value xml:lang="jp"><![CDATA[前へ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上一个]]></value>
+			<value xml:lang="zh-TW"><![CDATA[前頁]]></value>
+			<value xml:lang="ru"><![CDATA[Предыдущий]]></value>
+			<value xml:lang="tr"><![CDATA[Önceki]]></value>
+			<value xml:lang="vi"><![CDATA[Trước]]></value>
+		</item>
+		<item name="paging_next">
+			<value xml:lang="ko"><![CDATA[다음]]></value>
+			<value xml:lang="en"><![CDATA[Next]]></value>
+			<value xml:lang="jp"><![CDATA[次へ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下一个]]></value>
+			<value xml:lang="zh-TW"><![CDATA[次頁]]></value>
+			<value xml:lang="ru"><![CDATA[Следующий]]></value>
+			<value xml:lang="tr"><![CDATA[Sonraki]]></value>
+			<value xml:lang="vi"><![CDATA[Tiếp]]></value>
+		</item>
+		<item name="paging_prev_help">
+			<value xml:lang="ko"><![CDATA[이전 페이지로 이동합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Move to previous page.]]></value>
+			<value xml:lang="jp"><![CDATA[前のページへ移動します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上一页。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[往上一頁]]></value>
+			<value xml:lang="ru"><![CDATA[Перейти к предыдущей странице]]></value>
+			<value xml:lang="tr"><![CDATA[Önceki sayfaya git.]]></value>
+			<value xml:lang="vi"><![CDATA[Chuyển về trang trước.]]></value>
+		</item>
+		<item name="paging_next_help">
+			<value xml:lang="ko"><![CDATA[다음 페이지로 이동합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Move to next page.]]></value>
+			<value xml:lang="jp"><![CDATA[次のページへ移動します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下一页。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[往下一頁]]></value>
+			<value xml:lang="ru"><![CDATA[Перейти кследующей странице]]></value>
+			<value xml:lang="tr"><![CDATA[Sonraki sayfaya git.]]></value>
+			<value xml:lang="vi"><![CDATA[Chuyển tới trang tiếp.]]></value>
+		</item>
+		<item name="toc">
+			<value xml:lang="ko"><![CDATA[목차]]></value>
+			<value xml:lang="en"><![CDATA[Table of Contents]]></value>
+			<value xml:lang="jp"><![CDATA[リスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[目錄]]></value>
+			<value xml:lang="ru"><![CDATA[Оглавление]]></value>
+			<value xml:lang="tr"><![CDATA[İçerik Tablosu]]></value>
+			<value xml:lang="vi"><![CDATA[Board của nội dung]]></value>
+		</item>
+		<item name="close_help">
+			<value xml:lang="ko"><![CDATA[도움말 닫기]]></value>
+			<value xml:lang="en"><![CDATA[Close Help]]></value>
+			<value xml:lang="jp"><![CDATA[ヘルプを閉じる]]></value>
+			<value xml:lang="zh-CN"><![CDATA[关闭帮助]]></value>
+			<value xml:lang="zh-TW"><![CDATA[關閉]]></value>
+			<value xml:lang="ru"><![CDATA[Закрыть помощь]]></value>
+			<value xml:lang="tr"><![CDATA[Yardımı Kapat]]></value>
+			<value xml:lang="vi"><![CDATA[Đóng hướng dẫn]]></value>
+		</item>
+		<item name="confirm_submit_without_saving">
+			<value xml:lang="ko"><![CDATA[저장하지 않은 단락이 있습니다.\n그냥 전송하시겠습니까?]]></value>
+			<value xml:lang="en"><![CDATA[There are paragraphs which were not saved.\nProceed anyway?]]></value>
+			<value xml:lang="jp"><![CDATA[まだ保存してない内容があります。\nそのまま転送してよろしいでしょうか？]]></value>
+			<value xml:lang="zh-CN"><![CDATA[尚有未保存的段落。\n确定要提交吗？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[有內容尚未儲存。\n是否要繼續進行?]]></value>
+			<value xml:lang="ru"><![CDATA[Есть несохраненные параграфы\nПродолжить?]]></value>
+			<value xml:lang="tr"><![CDATA[Kaydedilmemiş paragraflar var.\nYine de devam etmek ister misiniz?]]></value>
+			<value xml:lang="vi"><![CDATA[Nội dung chưa được lưu.\nBạn có chắc chắn muốn gửi không?]]></value>
+		</item>
+		<item name="image_align">
+			<value xml:lang="ko"><![CDATA[이미지 정렬]]></value>
+			<value xml:lang="en"><![CDATA[Image Alignment]]></value>
+			<value xml:lang="jp"><![CDATA[イメージの配置]]></value>
+			<value xml:lang="zh-CN"><![CDATA[图片对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圖片對齊]]></value>
+			<value xml:lang="ru"><![CDATA[Выровнять изображения]]></value>
+			<value xml:lang="tr"><![CDATA[Resim Hizalaması]]></value>
+			<value xml:lang="vi"><![CDATA[Sắp xếp hình ảnh]]></value>
+		</item>
+		<item name="attached_files">
+			<value xml:lang="ko"><![CDATA[첨부 파일]]></value>
+			<value xml:lang="en"><![CDATA[Attachments]]></value>
+			<value xml:lang="jp"><![CDATA[添付ファイル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[附件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[附加檔案]]></value>
+			<value xml:lang="ru"><![CDATA[Прикрепленный файл]]></value>
+			<value xml:lang="tr"><![CDATA[Ekler]]></value>
+			<value xml:lang="vi"><![CDATA[File đính kèm]]></value>
+		</item>
+	</item>
+	<item name="about_dblclick_in_editor">
+		<value xml:lang="ko"><![CDATA[배경, 글자, 이미지, 인용문등에서 더블클릭을 하시면 상세한 컴포넌트 설정이 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may set the component's detailed configurations by double-clicking background, text, images, or quotations.]]></value>
+		<value xml:lang="jp"><![CDATA[背景、文字、イメージ、引用文の上にカーソルを合わせ、ダブルクリックすると詳細設定できるコンポーネントを表示します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[双击背景, 文本, 图片, 引用即可对其相关组件进行详细设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[對背景，文字，圖片，引用等組件按兩下，即可對其相關組件進行詳細設置。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer en détail des composants par double-clic sur un arrière-plan, un texte, une image ou une citation]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить детальную конфигурацию компонента двойным щелчком по фону, тексту, рисункам или цитатам]]></value>
+		<value xml:lang="es"><![CDATA[Para la configuracion más detallada debera hacer dobleclick sobre el texto, imagen, fondo, etc.]]></value>
+		<value xml:lang="tr"><![CDATA[Detaylı bileşen yapılandırmasını; arkaplana, metne, resme ya da alıntılara çift tıklayarak ayarlayabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập khi bấm 2 lần vào nền, Chữ, Hình ảnh hoặc Trích dẫn]]></value>
+	</item>
+
+</lang>
diff --git a/modules/editor/lang/ru.lang.php b/modules/editor/lang/ru.lang.php
deleted file mode 100644
index f10cff7ca..000000000
--- a/modules/editor/lang/ru.lang.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->editor = 'WYSIWYG-Редактор';
-    $lang->component_name = 'Компонент';
-    $lang->component_version = 'Версия';
-    $lang->component_author = 'Разработчик';
-    $lang->component_link = 'Ссылка';
-    $lang->component_date = 'Дата';
-    $lang->component_license = 'License';
-    $lang->component_history = 'History';
-    $lang->component_description = 'Описание';
-    $lang->component_extra_vars = 'Экстра перем.';
-    $lang->component_grant = 'Настройки прав доступа';
-    $lang->content_style = 'Content Style';
-    $lang->content_font = 'Content Font';
-	$lang->content_font_size = 'Размер шрифта';
-
-  	$lang->about_component = 'О компоненте';
-    $lang->about_component_grant = 'Возможен выбор дополнительных компонентов.<br /> (Каждый может использовать его, если режим выключен)';
-    $lang->about_component_mid = 'Можно установить пользователя Редактора.<br />(Каждый может использовать его, если режим выключен)';
-
-    $lang->msg_component_is_not_founded = 'Невозможно найти компонент редактора %s';
-    $lang->msg_component_is_inserted = 'Выбранный компонент уже присутствует';
-    $lang->msg_component_is_first_order = 'Выбранный компонент находится на первой позиции';
-    $lang->msg_component_is_last_order = 'Выбранный компонент находится на последней позиции';
-    $lang->msg_load_saved_doc = "Существует автоматически сохраненная статья. Хотите ли Вы ее восстановить?\nАвтоматически сохраненный черновик будет отменен после сохранения текущей статьи";
-    $lang->msg_auto_saved = 'Автоматически сохранено';
-
-    $lang->cmd_disable = 'Неактивно';
-    $lang->cmd_enable = 'Активно';
-
-    $lang->editor_skin = 'Скин Редактора';
-    $lang->upload_file_grant = 'Разрешить прикреплять файлы';
-    $lang->enable_default_component_grant = 'Разрешить использование основного компонента';
-    $lang->enable_component_grant = 'Разрешить ипользование компонента';
-    $lang->enable_html_grant = 'Разрешить коррекцию HTML';
-    $lang->enable_autosave = 'Автосохранение';
-    $lang->height_resizable = 'Возможна коррекция высоты';
-    $lang->editor_height = 'Высота Редактора';
-
-    $lang->about_editor_skin = 'Выберите скин редактора';
-    $lang->about_content_style = 'Вы можете выбрать стиль для редактирования и просмотра записи ';
-    $lang->about_content_font = 'Вы можете выбрать шрифт для редактирования и просмотра записи.<br/> Используйте запятую(,) если выбрали несколько шрифтов.';
-	$lang->about_content_font_size = 'Вы можете выбрать размер шрифта для редактирования и просмотра записи.<br/> Пожалуйста, выберите единицы такие как px или em.';
-    $lang->about_upload_file_grant = 'Вы можете разрешить прикреплять файлы выбранным группам. (Если оставить поле пустым то право прикреплять файлы будут иметь все)';
-    $lang->about_default_component_grant = 'Selected group(s) will be able to use default components of editor. (Leave them blank if you want all groups to have permission)';
-    $lang->about_editor_height = 'You may set the height of editor.';
-    $lang->about_editor_height_resizable = 'You may decide whether height of editor can be resized.';
-    $lang->about_enable_html_grant = 'Selected group(s) will be able to use HTML';
-    $lang->about_enable_autosave = 'You may decide whether auto-save function will be used.';
-
-    $lang->edit->fontname = 'Шрифт';
-    $lang->edit->fontsize = 'Размер';
-    $lang->edit->use_paragraph = 'Функции параграфа';
-    $lang->edit->fontlist = array(
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    
-	
-	
-	$lang->edit->header = 'Стиль';
-    $lang->edit->header_list = array(
-    'h1' => 'Заголовок 1',
-    'h2' => 'Заголовок 2',
-    'h3' => 'Заголовок 3',
-    'h4' => 'Заголовок 4',
-    'h5' => 'Заголовок 5',
-    'h6' => 'Заголовок 6',
-    );
-
-    $lang->edit->submit = 'Принять';
-
-    $lang->edit->fontcolor = 'Цвет текста';
-	$lang->edit->fontcolor_apply = '글자 색 적용';
-	$lang->edit->fontcolor_more = '글자 색 더보기';
-    $lang->edit->fontbgcolor = 'Цвет Фона';
-	$lang->edit->fontbgcolor_apply = '글자 배경색 적용';
-	$lang->edit->fontbgcolor_more = '글자 배경색 더보기';
-    $lang->edit->bold = 'Bold';
-    $lang->edit->italic = 'Italic';
-    $lang->edit->underline = 'Underline';
-    $lang->edit->strike = 'Strike';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Re Do';
-    $lang->edit->undo = 'Un Do';
-    $lang->edit->align_left = 'Align Left';
-    $lang->edit->align_center = 'Align Center';
-    $lang->edit->align_right = 'Align Right';
-    $lang->edit->align_justify = 'Align Justify';
-    $lang->edit->add_indent = 'Indent';
-    $lang->edit->remove_indent = 'Outdent';
-    $lang->edit->list_number = 'Orderd List';
-    $lang->edit->list_bullet = 'Unordered List';
-    $lang->edit->remove_format = 'Удалить стиль';
-
-    $lang->edit->help_remove_format = 'Выделенный объект будет удален';
-	$lang->edit->help_strike_through = 'Strike will be on the words';
-	$lang->edit->help_align_full = 'Выровнять (вправо/влево)';
-	
-	$lang->edit->help_fontcolor = 'Выбрать цвет шрифта';
-    $lang->edit->help_fontbgcolor = 'Выбрать цвет фона шрифта';
-    $lang->edit->help_bold = 'Сделать шрифт жирным';
-    $lang->edit->help_italic = 'Сделать шрифт наклонным';
-    $lang->edit->help_underline = 'Сделать шрифт подчеркнутым';
-    $lang->edit->help_strike = 'Сделать шрифт зачеркнутым';
-    $lang->edit->help_sup = 'Sup';
-    $lang->edit->help_sub = 'Sub';
-    $lang->edit->help_redo = 'Восстановить отмененное';
-    $lang->edit->help_undo = 'Отмена';
-    $lang->edit->help_align_left = 'Выровнять по левому краю';
-    $lang->edit->help_align_center = 'Выровнять по центру';
-    $lang->edit->help_align_right = 'Выровнять по правому краю';
-	$lang->edit->help_align_justify = 'Align justity';
-    $lang->edit->help_add_indent = 'Добавить отступ';
-    $lang->edit->help_remove_indent = 'Удалить отступ';
-    $lang->edit->help_list_number = 'Применить числовой список';
-    $lang->edit->help_list_bullet = 'Применить маркированный список';
-    $lang->edit->help_use_paragraph = 'Нажмите Ctrl+Enter, чтобы отметить параграф. (Нажмите Alt+S , чтобы сохранить)';
-
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blockquote';
-    $lang->edit->table = 'Table';
-    $lang->edit->image = 'Image';
-    $lang->edit->multimedia = 'Movie';
-    $lang->edit->emoticon = 'Emoticon';
-
-	$lang->edit->file = '파일';
-    $lang->edit->upload = 'Вложение';
-    $lang->edit->upload_file = 'Прикрепить файл';
-	$lang->edit->upload_list = '첨부 목록';
-    $lang->edit->link_file = 'Вставить в содержание';
-    $lang->edit->delete_selected = 'Удалить выбранное';
-
-    $lang->edit->icon_align_article = 'Занять весь параграф';
-    $lang->edit->icon_align_left = 'Выровнять по левому краю';
-    $lang->edit->icon_align_middle = 'Выровнять по центру';
-    $lang->edit->icon_align_right = 'Выровнять по правому краю';
-
-    $lang->about_dblclick_in_editor = 'Вы можете установить детальную конфигурацию компонента двойным щелчком по фону, тексту, рисункам или цитатам';
-
-    $lang->edit->rich_editor = 'редактировать стиль';
-    $lang->edit->html_editor = 'редактировать HTML';
-    $lang->edit->extension ='Расширенный компонент';
-    $lang->edit->help = 'Помощь';
-    $lang->edit->help_command = 'Горячие клавиши';
-    
-    $lang->edit->lineheight = 'Высота строки';
-	$lang->edit->fontbgsampletext = 'АВС';
-	
-	$lang->edit->hyperlink = 'гиперссылка';
-	$lang->edit->target_blank = 'Новое окно';
-	
-	$lang->edit->quotestyle1 = 'Left Solid';
-	$lang->edit->quotestyle2 = 'Quote';
-	$lang->edit->quotestyle3 = 'Solid';
-	$lang->edit->quotestyle4 = 'Solid + Background';
-	$lang->edit->quotestyle5 = 'Bold Solid';
-	$lang->edit->quotestyle6 = 'Dotted';
-	$lang->edit->quotestyle7 = 'Dotted + Background';
-	$lang->edit->quotestyle8 = 'Отменить';
-
-	
-    $lang->edit->jumptoedit = 'Пропустить Инструменты редактирования';
-    $lang->edit->set_sel = 'Установить количество ячеек';
-    $lang->edit->row = 'Строка';
-    $lang->edit->col = 'Колонка';
-    $lang->edit->add_one_row = 'Добавить 1 строку';
-    $lang->edit->del_one_row = 'Удалить 1 строку';
-    $lang->edit->add_one_col = 'Добавить 1 колонку';
-    $lang->edit->del_one_col = 'Удалить 1 колонку';
-
-    $lang->edit->table_config = 'Конфигурация таблицы';
-    $lang->edit->border_width = 'Ширина рамки';
-    $lang->edit->border_color = 'Цвет рамки';
-    $lang->edit->add = 'Добавить';
-    $lang->edit->del = 'Удалить';
-    $lang->edit->search_color = 'Подобрать цвет';
-    $lang->edit->table_backgroundcolor = 'Цвет фона таблицы';
-    $lang->edit->special_character = 'Специальные символы';
-    $lang->edit->insert_special_character = 'Добавить специальные символы';
-    $lang->edit->close_special_character = 'Закрыть слой специальных символов';
-    $lang->edit->symbol = 'Символы';
-    $lang->edit->number_unit = 'Числа и единицы измерения';
-    $lang->edit->circle_bracket = 'Круг, скобки';
-    $lang->edit->korean = 'Корейский';
-    $lang->edit->greece = 'Греческий';
-    $lang->edit->Latin  = 'Латинский';
-    $lang->edit->japan  = 'Японский';
-    $lang->edit->selected_symbol  = 'Выбранные символы';
-	
-	$lang->edit->search_replace  = 'Найти/Переместить';
-    $lang->edit->close_search_replace  = 'Закрыть слой "Найти/Переместить"';
-    $lang->edit->replace_all  = 'Переместить все';
-    $lang->edit->search_words  = 'Искомое слово';
-    $lang->edit->replace_words  = 'Слово для замены';
-    $lang->edit->next_search_words  = 'Искать дальше';
-    $lang->edit->edit_height_control  = 'Изменить размеры окна ввода';
-
-    $lang->edit->merge_cells = 'Объединить ячейки';
-    $lang->edit->split_row = 'Разбить строки';
-    $lang->edit->split_col = 'Разбить колонки';
-    
-    $lang->edit->toggle_list   = 'Свернуть/Развернуть список';
-    $lang->edit->minimize_list = 'Уменьшить';
-    
-    $lang->edit->move = 'Перейти';
-	$lang->edit->refresh = 'Обновить';
-    $lang->edit->materials = 'Материалы';
-    $lang->edit->temporary_savings = 'Список временных сохранений';
-
-	$lang->edit->paging_prev = 'Предыдущий';
-	$lang->edit->paging_next = 'Следующий';
-	$lang->edit->paging_prev_help = 'Перейти к предыдущей странице';
-	$lang->edit->paging_next_help = 'Перейти кследующей странице';
-
-	$lang->edit->toc = 'Оглавление';
-	$lang->edit->close_help = 'Закрыть помощь';
-	
-	$lang->edit->confirm_submit_without_saving = 'Есть несохраненные параграфы\\nПродолжить?';
-	
-  	$lang->edit->image_align = 'Выровнять изображения';
-	$lang->edit->attached_files = 'Прикрепленный файл';
-
-	$lang->edit->fontcolor_input = '폰트색 직접입력';
-	$lang->edit->fontbgcolor_input = '배경색 직접입력';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다';
-
-	$lang->edit->table_caption_position = '표 제목(caption) 및 배치';
-	$lang->edit->table_caption = '표 제목(caption)';
-	$lang->edit->table_header = '머리글 셀(th)';
-	$lang->edit->table_header_none = '없음';
-	$lang->edit->table_header_left = '왼쪽';
-	$lang->edit->table_header_top = '위쪽';
-	$lang->edit->table_header_both = '모두';
-	$lang->edit->table_size = '표 크기';
-	$lang->edit->table_width = '표 폭';
-
-	$lang->edit->upper_left = '상단좌측';
-	$lang->edit->upper_center = '상단중앙';
-	$lang->edit->upper_right = '상단우측';
-	$lang->edit->bottom_left = '하단좌측';
-	$lang->edit->bottom_center = '하단중앙';
-	$lang->edit->bottom_right = '하단우측';
-
-	$lang->edit->no_image = '첨부된 이미지가 없습니다.';
-	$lang->edit->no_multimedia = '첨부된 동영상이 없습니다.';
-	$lang->edit->no_attachment = '첨부된 파일이 없습니다.';
-	$lang->edit->insert_selected = '선택 넣기';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->fieldset = '글상자';
-	$lang->edit->paragraph = '문단';
-	
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
\ No newline at end of file
diff --git a/modules/editor/lang/tr.lang.php b/modules/editor/lang/tr.lang.php
deleted file mode 100644
index 7843715ce..000000000
--- a/modules/editor/lang/tr.lang.php
+++ /dev/null
@@ -1,279 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  WYSIWYG Editor module's basic language pack
-     **/
-
-    $lang->editor = 'WYSIWYG Editor';
-    $lang->component_name = 'Bileşen';
-    $lang->component_version = 'Sürüm';
-    $lang->component_author = 'Geliştirici';
-    $lang->component_link = 'Link';
-    $lang->component_date = 'Tarih';
-    $lang->component_license = 'Lisans';
-    $lang->component_history = 'Güncelleştirmeler';
-    $lang->component_description = 'Açıklama';
-    $lang->component_extra_vars = 'Değişken Seçenek';
-    $lang->component_grant = 'Yetki Ayarı';
-    $lang->content_style = 'İçerik Tarzı';
-    $lang->content_font = 'İçerik Yazı Tipi';
-    $lang->content_font_size = 'İçerik Yazı Boyutu';
-
-    $lang->about_component = 'Bileşen hakkında';
-    $lang->about_component_grant = 'Seçilen grup(lar), editörün genişletilmiş bileşenlerini kullanabilirler.<br />(Eğer tüm grupların bu yetkiye sahip olmasını istiyorsanız, boş bırakınız)';
-    $lang->about_component_mid = 'Hedef editör bileşenlerini seçebilirsiniz.<br />(Hiçbir şey seçilmediğinde, tüm hedefler seçilecektir)';
-
-    $lang->msg_component_is_not_founded = 'Editör bileşeni %s bulunamıyor';
-    $lang->msg_component_is_inserted = 'Seçilen bileşen zaten eklenmiş durumda';
-    $lang->msg_component_is_first_order = 'Seçilen bileşen ilk pozisyona yerleştirilmiştir';
-    $lang->msg_component_is_last_order = 'Seçilen bileşen son pozisyonda yerleşmiştir';
-    $lang->msg_load_saved_doc = "Kendiliğinden kaydolan bir makale mevcut. Bunu kurtarmak ister misiniz?\nOtomatik kaydolan taslak, geçerli makaleyi kaydedince, çıkartılacaktır";
-    $lang->msg_auto_saved = 'Kendiliğinden Kaydedildi';
-
-    $lang->cmd_disable = 'Devre Dışı';
-    $lang->cmd_enable = 'Etkin';
-
-    $lang->editor_skin = 'Editor Dış Görünümü';
-    $lang->upload_file_grant = 'Karşıya Yükleme Yetkisi';
-    $lang->enable_default_component_grant = 'Varsayılan Bileşenler için Yetki';
-    $lang->enable_component_grant = 'Bileşenler için Yetki';
-    $lang->enable_html_grant = 'HTML için Yetki';
-    $lang->enable_autosave = 'Oto-Kayıt';
-    $lang->height_resizable = 'Yükseklik Yeniden Boyutlandırılabilir';
-    $lang->editor_height = 'Editör Yüksekliği';
-
-    $lang->about_editor_skin = 'Editör dış görünümünü seçebilirsiniz.';
-    $lang->about_content_style = 'Makale düzenleme veya içerik gösterme için tarz seçebilirsiniz';
-    $lang->about_content_font = 'Makale düzenleme veya içerik gösterme için yazı tipi seçebilirsiniz.<br/>Varsayılan yazı tipi sizin kendi yazı tipinizdir<br/> Lütfen çoklu giriş için virgül(,) kullanınız.';
-	$lang->about_content_font_size = 'Makale düzenleme veya içerik görüntüleme için yazı boyutu seçebilirsiniz.<br/>Lütfen px veya em gibi birimler kullanınız.';
-    $lang->about_upload_file_grant = 'Seçilen (gruplar) dosyaları karşıya yükleme yetkisine sahip olacaklardır. (Eğer tüm grupların bu yetkiye sahip olmasını istiyorsanız lütfen boş bırakınız)';
-    $lang->about_default_component_grant = 'Seçilen grup(lar) editörün varsayılan bileşenlerini kullanabileceklerdir. (Eğer tüm grupların bu yetkiye sahip olmasını istiyorsanız lütfen boş bırakınız)';
-    $lang->about_editor_height = 'Editör yüksekliğini ayarlayabilirsiniz.';
-    $lang->about_editor_height_resizable = 'Editörün yüksekliğinin yeniden boyutlandırıp-boyutlandırılamayacağı kararını verebilirsiniz.';
-    $lang->about_enable_html_grant = 'Seçilen grup(lar) HTML kullanabileceklerdir';
-    $lang->about_enable_autosave = 'Oto-Kayıt özelliğinin kullanılabilmesi kararını verebilirsiniz.';
-
-    $lang->edit->fontname = 'Yazı Tipi';
-    $lang->edit->fontsize = 'Boyut';
-    $lang->edit->use_paragraph = 'Paragraf Özelliği';
-    $lang->edit->fontlist = array(
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    $lang->edit->header = 'Tarz';
-    $lang->edit->header_list = array(
-    'h1' => 'Konu 1',
-    'h2' => 'Konu 2',
-    'h3' => 'Konu 3',
-    'h4' => 'Konu 4',
-    'h5' => 'Konu 5',
-    'h6' => 'Konu 6',
-    );
-
-    $lang->edit->submit = 'Gönder';
-
-    $lang->edit->fontcolor = 'Yazı Rengi';
-	$lang->edit->fontcolor_apply = 'Yazı Rengini Uygula';
-	$lang->edit->fontcolor_more = 'Daha Fazla Yazı Rengi';
-    $lang->edit->fontbgcolor = 'Arkaplan Rengi';
-	$lang->edit->fontbgcolor_apply = 'Arkaplan Rengini Uygula';
-	$lang->edit->fontbgcolor_more = 'Daha Fazla Arkaplan Rengi';
-    $lang->edit->bold = 'Kalın';
-    $lang->edit->italic = 'Italik';
-    $lang->edit->underline = 'Altıçizili';
-    $lang->edit->strike = 'Göze Çarpan';
-    $lang->edit->sup = 'Sup';
-    $lang->edit->sub = 'Sub';
-    $lang->edit->redo = 'Yinele';
-    $lang->edit->undo = 'Geri Al';
-    $lang->edit->align_left = 'Sola Hizalama';
-    $lang->edit->align_center = 'Ortalı Hizalama';
-    $lang->edit->align_right = 'Sağa Hizalama';
-    $lang->edit->align_justify = 'Kenara Yaslı Hizalama';
-    $lang->edit->add_indent = 'Girinti';
-    $lang->edit->remove_indent = 'Çıkıntı';
-    $lang->edit->list_number = 'Sıralanan Listesi';
-    $lang->edit->list_bullet = 'Sırasız Listesi';
-    $lang->edit->remove_format = 'Tarz Silicisi';
-
-    $lang->edit->help_remove_format = 'Seçili alandaki etiketler silinecektir';
-    $lang->edit->help_strike_through = 'Strike ';
-    $lang->edit->help_align_full = 'Sol ve sağ hizalama';
-
-    $lang->edit->help_fontcolor = 'Yazı rengi seç';
-    $lang->edit->help_fontbgcolor = 'Yazı tipinin arkaplan rengini seç';
-    $lang->edit->help_bold = 'Yazı tipini kalın yap';
-    $lang->edit->help_italic = 'Yazı tipini italik yap';
-    $lang->edit->help_underline = 'Altıçizili yazı tipi';
-    $lang->edit->help_strike = 'Strike font';
-    $lang->edit->help_sup = 'Superscript';
-    $lang->edit->help_sub = 'Subscript';
-    $lang->edit->help_redo = 'Yine';
-    $lang->edit->help_undo = 'Geri al';
-    $lang->edit->help_align_left = 'Sola Hizala';
-    $lang->edit->help_align_center = 'Ortalı Hizala';
-    $lang->edit->help_align_right = 'Sağa Hizala';
-	$lang->edit->help_align_justify = 'Kenara Yaslı Hizalama';
-    $lang->edit->help_add_indent = 'Girinti Ekle';
-    $lang->edit->help_remove_indent = 'Girinti sil';
-    $lang->edit->help_list_number = 'Sayı listesini uygula';
-    $lang->edit->help_list_bullet = 'Bullet listesi uygula';
-    $lang->edit->help_use_paragraph = 'Paragraf yapmak için Ctrl+Enter tuşlarına basınız. (Göndermek için Alt+S e basınız)';
-
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Blokalıntı';
-    $lang->edit->table = 'Tablo';
-    $lang->edit->image = 'Resim';
-    $lang->edit->multimedia = 'Film';
-    $lang->edit->emoticon = 'His Simgesi';
-
-	$lang->edit->file = 'Dosyalar';
-    $lang->edit->upload = 'Ekler';
-    $lang->edit->upload_file = 'İliştir';
-	$lang->edit->upload_list = 'Ekler Listesi';
-    $lang->edit->link_file = 'İçeriğe Ekle';
-    $lang->edit->delete_selected = 'Seçiliyi Sil';
-
-    $lang->edit->icon_align_article = 'Paragraf Yap';
-    $lang->edit->icon_align_left = 'Sola Hizala';
-    $lang->edit->icon_align_middle = 'Ortaya Hizala';
-    $lang->edit->icon_align_right = 'Sağa Hizala';
-
-    $lang->about_dblclick_in_editor = 'Detaylı bileşen yapılandırmasını; arkaplana, metne, resme ya da alıntılara çift tıklayarak ayarlayabilirsiniz';
-
-
-    $lang->edit->rich_editor = 'Zengin Metin Editörü';
-    $lang->edit->html_editor = 'HTML Editörü';
-    $lang->edit->extension ='Uzantı Bileşenleri';
-    $lang->edit->help = 'Yardım';
-    $lang->edit->help_command = 'Kısayol Yardım Tuşları';
-    
-    $lang->edit->lineheight = 'Satır Yüksekliği';
-	$lang->edit->fontbgsampletext = 'ABC';
-	
-	$lang->edit->hyperlink = 'Köprü';
-	$lang->edit->target_blank = 'Yeni Pencere';
-	
-	$lang->edit->quotestyle1 = 'Sol Düzçizgi';
-	$lang->edit->quotestyle2 = 'Alıntı';
-	$lang->edit->quotestyle3 = 'Düzçizgi';
-	$lang->edit->quotestyle4 = 'Düzçizgi + Arkaplan';
-	$lang->edit->quotestyle5 = 'Kalın Düzçizgi';
-	$lang->edit->quotestyle6 = 'Noktalı';
-	$lang->edit->quotestyle7 = 'Noktalı + Arkaplan';
-	$lang->edit->quotestyle8 = 'İptal';
-
-
-    $lang->edit->jumptoedit = 'Araç Çubuğu Düzenini Geç';
-    $lang->edit->set_sel = 'Hücre sayımını ayarla';
-    $lang->edit->row = 'Satır';
-    $lang->edit->col = 'Sütun';
-    $lang->edit->add_one_row = '1 Satır Ekle';
-    $lang->edit->del_one_row = '1 Satır Sil';
-    $lang->edit->add_one_col = '1 Sütun Ekle';
-    $lang->edit->del_one_col = '1 Sütun Sil';
-
-    $lang->edit->table_config = 'Tablo Yapılandırması';
-    $lang->edit->border_width = 'Kenarlık Genişliği';
-    $lang->edit->border_color = 'Kenarlık Rengi';
-    $lang->edit->add = 'Ekle';
-    $lang->edit->del = 'Sub';
-    $lang->edit->search_color = 'Renk Ara';
-    $lang->edit->table_backgroundcolor = 'Tablo Arkaplan Rengi';
-    $lang->edit->special_character = 'Özek Karekterler';
-    $lang->edit->insert_special_character = 'Özel Karakterler Ekle';
-    $lang->edit->close_special_character = 'Özel Karakter Katmanını Kapat';
-    $lang->edit->symbol = 'Semboller';
-    $lang->edit->number_unit = 'Sayılar ve Birimler';
-    $lang->edit->circle_bracket = 'Çemberler, Köşeli Ayraçlar';
-    $lang->edit->korean = 'Korece';
-    $lang->edit->greece = 'Yunanca';
-    $lang->edit->Latin  = 'Latince';
-    $lang->edit->japan  = 'Japonca';
-    $lang->edit->selected_symbol  = 'Seçili Semboller';
-
-    $lang->edit->search_replace  = 'Bul/Değiştir';
-    $lang->edit->close_search_replace  = 'Bul\'u Kapat/Katmanı Değiştir';
-    $lang->edit->replace_all  = 'Tümünü Değiştir';
-    $lang->edit->search_words  = 'Bulunacak Sözcükler';
-    $lang->edit->replace_words  = 'Değiştirilecek Sözcükler';
-    $lang->edit->next_search_words  = 'Sonrakini Bul';
-    $lang->edit->edit_height_control  = 'Düzen Formunun Boyutunu Ayarla';
-
-    $lang->edit->merge_cells = 'Tablo Hücrelerini Birleştir';
-    $lang->edit->split_row = 'Satır Ayır';
-    $lang->edit->split_col = 'Sütun Ayır';
-    
-    $lang->edit->toggle_list   = 'Kıvır/Geriaç';
-    $lang->edit->minimize_list = 'Simge Durumuna Küçült';
-    
-    $lang->edit->move = 'Taşı';
-	$lang->edit->refresh = 'Yenile';
-    $lang->edit->materials = 'Malzemeler';
-    $lang->edit->temporary_savings = 'Geçici Kayıtlı Listesi';
-
-	$lang->edit->paging_prev = 'Önceki';
-	$lang->edit->paging_next = 'Sonraki';
-	$lang->edit->paging_prev_help = 'Önceki sayfaya git.';
-	$lang->edit->paging_next_help = 'Sonraki sayfaya git.';
-
-	$lang->edit->toc = 'İçerik Tablosu';
-	$lang->edit->close_help = 'Yardımı Kapat';
-	
-	$lang->edit->confirm_submit_without_saving = 'Kaydedilmemiş paragraflar var.\\nYine de devam etmek ister misiniz?';
-
-	$lang->edit->image_align = 'Resim Hizalaması';
-	$lang->edit->attached_files = 'Ekler';
-
-	$lang->edit->fontcolor_input = 'Özel Metin Rengi';
-	$lang->edit->fontbgcolor_input = 'Özel Arkaplan Rengi';
-	$lang->edit->pangram = 'Kahverengi hızlı tilki, tembel köpeğin üzerinden atlıyor';
-
-	$lang->edit->table_caption_position = 'Tablo Yazısı &amp; Konumu';
-	$lang->edit->table_caption = 'Tablo Yazısı';
-	$lang->edit->table_header = 'Tablo Başlığı';
-	$lang->edit->table_header_none = 'hiçbiri';
-	$lang->edit->table_header_left = 'sol';
-	$lang->edit->table_header_top = 'üst';
-	$lang->edit->table_header_both = 'hepsi';
-	$lang->edit->table_size = 'Tablo Boyutu';
-	$lang->edit->table_width = 'Tablo Genişliği';
-
-	$lang->edit->upper_left = 'Üst Sol';
-	$lang->edit->upper_center = 'Üst Merkez';
-	$lang->edit->upper_right = 'Üst Sağ';
-	$lang->edit->bottom_left = 'Alt Sol';
-	$lang->edit->bottom_center = 'Alt Merkez';
-	$lang->edit->bottom_right = 'Alt Sağ';
-
-	$lang->edit->no_image = 'Yüklenmiş hiçbir resim yok.';
-	$lang->edit->no_multimedia = 'Yüklenmiş hiçbir görüntü yok.';
-	$lang->edit->no_attachment = 'Yüklenmiş hiçbir dosya yok.';
-	$lang->edit->insert_selected = 'Seçileni Ekle';
-	$lang->edit->delete_selected = 'Seçileni Sil';
-
-	$lang->edit->fieldset = 'Alanayarı';
-	$lang->edit->paragraph = 'Paragraf';
-	
-	$lang->edit->autosave_format = 'Makaleyi yazmak için <strong>%s</strong> kadar bir süre kullandınız. Makalenizi son kaydettiğiniz zaman : <strong>%s</strong>.';
-	$lang->edit->autosave_hour = '%dSaat';
-	$lang->edit->autosave_hours = '%dSaat';
-	$lang->edit->autosave_min = '%dDakika';
-	$lang->edit->autosave_mins = '%dDakika';
-	$lang->edit->autosave_hour_ago = '%dsaat önce';
-	$lang->edit->autosave_hours_ago = '%d saat önce';
-	$lang->edit->autosave_min_ago = '%ddakika önce';
-	$lang->edit->autosave_mins_ago = '%ddakika önce';
-	
-	$lang->edit->upload_not_enough_quota   = 'Yeteri boş alan bulunmadığından, karşıya yükleme yapılamıyor.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
diff --git a/modules/editor/lang/vi.lang.php b/modules/editor/lang/vi.lang.php
deleted file mode 100644
index 64099cb45..000000000
--- a/modules/editor/lang/vi.lang.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  DucDuy Dao (webmaster@xpressengine.vn)								  ░░
-			░░	* @Website:  http://xpressengine.vn												  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-*/
-
-    $lang->editor = 'WYSIWYG toàn diện';
-    $lang->component_name = 'Thành phần';
-    $lang->component_version = 'Phiên bản';
-    $lang->component_author = 'Người phát triển';
-    $lang->component_link = 'Link';
-    $lang->component_date = 'Ngày';
-    $lang->component_license = 'Cấp phép';
-    $lang->component_history = 'Cập nhật';
-    $lang->component_description = 'Mô tả';
-    $lang->component_extra_vars = 'Thông tin bổ xung';
-    $lang->component_grant = 'Thiết lập quyền';
-    $lang->content_style = 'Kiểu dáng của nội dung';
-    $lang->content_font = 'Font chữ của nội dung';
-    $lang->content_font_size = 'Cỡ chữ của nội dung';
-
-    $lang->about_component = 'Thông tin Thành phần';
-    $lang->about_component_grant = 'Những nhóm đã chọn sẽ được phép sử dụng Thành phần mở rộng cho biên tập.<br />(Để trống nếu bạn muốn tất cả các nhóm đều được phép sử dụng.)';
-    $lang->about_component_mid = 'Có thể lựa chọn khu vực sử dụng Thành phần.<br />(Nếu để trống là tất cả các khu vực đều có thể sử dụng.)';
-
-    $lang->msg_component_is_not_founded = 'Không tìm thấy biên tập Thành phần %s';
-    $lang->msg_component_is_inserted = 'Đã chèn Thành phần được chọn.';
-    $lang->msg_component_is_first_order = 'Lựa chọn Thành phần trước một khu vực.';
-    $lang->msg_component_is_last_order = 'Lựa chọn Thành phần sau một khu vực.';
-    $lang->msg_load_saved_doc = "Đã có bài viết tự động lưu. Bạn có muốn khôi phục nó không?\nBài viết tự động lưu sẽ tự động hủy sau khi bạn hoàn thành bài viết này và bấm 'Gửi'";
-    $lang->msg_auto_saved = 'Đã tự động lưu';
-
-    $lang->cmd_disable = 'Không hoạt động';
-    $lang->cmd_enable = 'Hoạt động';
-
-    $lang->editor_skin = 'Giao diện gửi bài';
-    $lang->upload_file_grant = 'Quyền Upload';
-    $lang->enable_default_component_grant = 'Quyền sử dụng Thành phần cơ bản';
-    $lang->enable_component_grant = 'Quyền sử dụng Thành phần';
-    $lang->enable_html_grant = 'Quyền sử dụng HTML';
-    $lang->enable_autosave = 'Tự động lưu';
-    $lang->height_resizable = 'Mở rộng chiều cao';
-    $lang->editor_height = 'Chiều cao khung viết bài';
-
-    $lang->about_editor_skin = 'Bạn có thể chọn kiểu gửi bài.';
-    $lang->about_content_style = 'Bạn có thể chọn kiểu viết bài hay kiểu hiển thị.';
-    $lang->about_content_font = 'Bạn có thể chọn Font chữ để viết và hiển thị trong bài viết.<br/>Để đặt mặc định chỉ Font chữ bạn hay sử dụng, hãy đặt dấu (,) vào giữa các Font.';
-	$lang->about_content_font_size = 'Bạn có thể chọn cỡ chữ để viết bài và hiển thị theo định dạng "px" hoặc "em".';
-    $lang->about_upload_file_grant = 'Chọn nhóm được phép Upload File. (Để trống nếu bạn muốn tất cả các nhóm đều có thể Upload.)';
-    $lang->about_default_component_grant = 'Chọn nhóm được phép sử dụng Thành phần mặc định. (Để trống nếu bạn muốn tất cả đều có thể sử dụng.)';
-    $lang->about_editor_height = 'Bạn có thể đặt chiều cao của khung viết bài.';
-    $lang->about_editor_height_resizable = 'Đặt chiều cao có thể thay đổi.';
-    $lang->about_enable_html_grant = 'Chọn nhóm được phép sử dụng HTML';
-    $lang->about_enable_autosave = 'Bạn có thể đặt chức năng Tự động lưu.';
-
-    $lang->edit->fontname = 'Kiểu chữ';
-    $lang->edit->fontsize = 'Cỡ chữ';
-    $lang->edit->use_paragraph = 'Chức năng Paragraph';
-    $lang->edit->fontlist = array(
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    $lang->edit->header = 'Tiêu đề lớn';
-    $lang->edit->header_list = array(
-    'h1' => 'Cỡ 1',
-    'h2' => 'Cỡ 2',
-    'h3' => 'Cỡ 3',
-    'h4' => 'Cỡ 4',
-    'h5' => 'Cỡ 5',
-    'h6' => 'Cỡ 6',
-    );
-
-    $lang->edit->submit = 'Gửi bài';
-
-    $lang->edit->fontcolor = 'Màu chữ';
-	$lang->edit->fontcolor_apply = '글자 색 적용';
-	$lang->edit->fontcolor_more = '글자 색 더보기';
-    $lang->edit->fontbgcolor = 'Màu nền';
-	$lang->edit->fontbgcolor_apply = '글자 배경색 적용';
-	$lang->edit->fontbgcolor_more = '글자 배경색 더보기';
-    $lang->edit->bold = 'Chữ đậm';
-    $lang->edit->italic = 'Chữ nghiêng';
-    $lang->edit->underline = 'Chứ gạch chân';
-    $lang->edit->strike = 'Chữ gạch giữa';
-    $lang->edit->sup = 'Chỉ số trên';
-    $lang->edit->sub = 'Chỉ số dưới';
-    $lang->edit->redo = 'Phía sau';
-    $lang->edit->undo = 'Trở lại';
-    $lang->edit->align_left = 'Căn trái';
-    $lang->edit->align_center = 'Căn giữa';
-    $lang->edit->align_right = 'Căn phải';
-    $lang->edit->align_justify = 'Căn đều';
-    $lang->edit->add_indent = 'Thụt lề';
-    $lang->edit->remove_indent = 'Dàn đều';
-    $lang->edit->list_number = 'Thứ tự số';
-    $lang->edit->list_bullet = 'Thứ tự chấm';
-    $lang->edit->remove_format = 'Xóa định dạng';
-
-    $lang->edit->help_remove_format = 'Những Tag đã chọn sẽ bị xóa';
-    $lang->edit->help_strike_through = 'Đường kẻ sẽ nằm lên chữ';
-    $lang->edit->help_align_full = 'Căn trái và phải';
-
-    $lang->edit->help_fontcolor = 'Màu chữ';
-    $lang->edit->help_fontbgcolor = 'Màu nền';
-    $lang->edit->help_bold = ' Chữ đậm';
-    $lang->edit->help_italic = ' Chữ nghiêng';
-    $lang->edit->help_underline = ' Chữ gạch chân';
-    $lang->edit->help_strike = ' Chữ gạch giữa';
-    $lang->edit->help_sup = 'Chỉ số trên';
-    $lang->edit->help_sub = 'Chỉ số dưới';
-    $lang->edit->help_redo = 'Tiếp tục';
-    $lang->edit->help_undo = 'Trở lại';
-    $lang->edit->help_align_left = 'Căn trái';
-    $lang->edit->help_align_center = 'Căn giữa';
-    $lang->edit->help_align_right = 'Căn phải';
-	$lang->edit->help_align_justify = 'Đều hai bên';
-    $lang->edit->help_add_indent = 'Thụt vào';
-    $lang->edit->help_remove_indent = 'Giãn ra';
-    $lang->edit->help_list_number = 'Thứ tự số';
-    $lang->edit->help_list_bullet = 'Thứ tự chấm';
-    $lang->edit->help_use_paragraph = 'Bấm "Ctrl+Enter" để sử dụng Paragraph. Bấm phím "Alt+S" để gửi.';
-
-    $lang->edit->url = 'URL';
-    $lang->edit->blockquote = 'Trích dẫn';
-    $lang->edit->table = 'Bảng';
-    $lang->edit->image = 'Hình ảnh';
-    $lang->edit->multimedia = 'Chèn Media';
-    $lang->edit->emoticon = 'Diễn tả cảm xúc';
-
-	$lang->edit->file = '파일';
-    $lang->edit->upload = 'Đính kèm';
-    $lang->edit->upload_file = 'Đính kèm';
-	$lang->edit->upload_list = '첨부 목록';
-    $lang->edit->link_file = 'Chèn vào bài viết';
-    $lang->edit->delete_selected = 'Xóa lựa chọn';
-
-    $lang->edit->icon_align_article = 'Vị trí trong bài viết';
-    $lang->edit->icon_align_left = 'Trái';
-    $lang->edit->icon_align_middle = 'Giữa';
-    $lang->edit->icon_align_right = 'Phải';
-
-    $lang->about_dblclick_in_editor = 'Thiết lập khi bấm 2 lần vào nền, Chữ, Hình ảnh hoặc Trích dẫn';
-
-
-    $lang->edit->rich_editor = 'Kiểu trù phú';
-    $lang->edit->html_editor = 'Kiểu HTML';
-    $lang->edit->extension ='Thành phần mở rộng';
-    $lang->edit->help = 'Trợ giúp';
-    $lang->edit->help_command = 'Phím nóng';
-    
-    $lang->edit->lineheight = 'Chiều cao dòng';
-	$lang->edit->fontbgsampletext = 'ABC';
-	
-	$lang->edit->hyperlink = 'Link liên kết';
-	$lang->edit->target_blank = 'Mở trang mới';
-	
-	$lang->edit->quotestyle1 = 'Liền viền trái';
-	$lang->edit->quotestyle2 = 'Trích';
-	$lang->edit->quotestyle3 = 'Viền liền';
-	$lang->edit->quotestyle4 = 'Viền liền+Nền';
-	$lang->edit->quotestyle5 = 'Liền đậm';
-	$lang->edit->quotestyle6 = 'Viền chấm';
-	$lang->edit->quotestyle7 = 'Chấm+Nền';
-	$lang->edit->quotestyle8 = 'Loại bỏ';
-
-
-    $lang->edit->jumptoedit = 'Bỏ qua công cụ chỉnh sửa';
-    $lang->edit->set_sel = 'Số hàng cột';
-    $lang->edit->row = 'Hàng';
-    $lang->edit->col = 'Cột';
-    $lang->edit->add_one_row = 'Thêm 1 hàng';
-    $lang->edit->del_one_row = 'Xóa 1 hàng';
-    $lang->edit->add_one_col = 'Thêm một cột';
-    $lang->edit->del_one_col = 'Xóa một cột';
-
-    $lang->edit->table_config = 'Thiết lập viền';
-    $lang->edit->border_width = 'Độ rộng';
-    $lang->edit->border_color = 'Màu viền';
-    $lang->edit->add = 'Thêm';
-    $lang->edit->del = 'Xóa';
-    $lang->edit->search_color = 'Tìm màu';
-    $lang->edit->table_backgroundcolor = 'Màu nền';
-    $lang->edit->special_character = 'Kí tự đặc biệt';
-    $lang->edit->insert_special_character = 'Chèn kí tự đặc biệt.';
-    $lang->edit->close_special_character = 'Tắt bản kí tự đặc biệt.';
-    $lang->edit->symbol = 'Biểu tượng';
-    $lang->edit->number_unit = 'Số và đơn vị';
-    $lang->edit->circle_bracket = 'Vòng tròn, Ngoặc';
-    $lang->edit->korean = 'Korean';
-    $lang->edit->greece = 'Greek';
-    $lang->edit->Latin  = 'Latin';
-    $lang->edit->japan  = 'Japanese';
-    $lang->edit->selected_symbol  = 'Kí tự đã chọn:';
-
-    $lang->edit->search_replace  = 'Tìm/Ghi đè';
-    $lang->edit->close_search_replace  = 'Tắt bảng Tìm/Ghi đè';
-    $lang->edit->replace_all  = 'Ghi đè tất cả';
-    $lang->edit->search_words  = 'Tìm từ';
-    $lang->edit->replace_words  = 'Từ ghi đè';
-    $lang->edit->next_search_words  = 'Tìm tiếp';
-    $lang->edit->edit_height_control  = 'Đặt kích thước mẫu';
-
-    $lang->edit->merge_cells = 'Nối bảng';
-    $lang->edit->split_row = 'Chia hàng';
-    $lang->edit->split_col = 'Chia cột';
-    
-    $lang->edit->toggle_list   = 'Hiện/Ẩn';
-    $lang->edit->minimize_list = 'Thu nhỏ';
-    
-    $lang->edit->move = 'Di chuyển';
-	$lang->edit->refresh = 'Làm mới';
-    $lang->edit->materials = 'Vật liệu';
-    $lang->edit->temporary_savings = 'Danh sách lưu tạm thời';
-
-	$lang->edit->paging_prev = 'Trước';
-	$lang->edit->paging_next = 'Tiếp';
-	$lang->edit->paging_prev_help = 'Chuyển về trang trước.';
-	$lang->edit->paging_next_help = 'Chuyển tới trang tiếp.';
-
-	$lang->edit->toc = 'Board của nội dung';
-	$lang->edit->close_help = 'Đóng hướng dẫn';
-
-	$lang->edit->confirm_submit_without_saving = 'Nội dung chưa được lưu.\\nBạn có chắc chắn muốn gửi không?';
-
-	$lang->edit->image_align = 'Sắp xếp hình ảnh';
-	$lang->edit->attached_files = 'File đính kèm';
-
-	$lang->edit->fontcolor_input = '폰트색 직접입력';
-	$lang->edit->fontbgcolor_input = '배경색 직접입력';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다';
-
-	$lang->edit->table_caption_position = '표 제목(caption) 및 배치';
-	$lang->edit->table_caption = '표 제목(caption)';
-	$lang->edit->table_header = '머리글 셀(th)';
-	$lang->edit->table_header_none = '없음';
-	$lang->edit->table_header_left = '왼쪽';
-	$lang->edit->table_header_top = '위쪽';
-	$lang->edit->table_header_both = '모두';
-	$lang->edit->table_size = '표 크기';
-	$lang->edit->table_width = '표 폭';
-
-	$lang->edit->upper_left = '상단좌측';
-	$lang->edit->upper_center = '상단중앙';
-	$lang->edit->upper_right = '상단우측';
-	$lang->edit->bottom_left = '하단좌측';
-	$lang->edit->bottom_center = '하단중앙';
-	$lang->edit->bottom_right = '하단우측';
-
-	$lang->edit->no_image = '첨부된 이미지가 없습니다.';
-	$lang->edit->no_multimedia = '첨부된 동영상이 없습니다.';
-	$lang->edit->no_attachment = '첨부된 파일이 없습니다.';
-	$lang->edit->insert_selected = '선택 넣기';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->fieldset = '글상자';
-	$lang->edit->paragraph = '문단';
-	
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
\ No newline at end of file
diff --git a/modules/editor/lang/zh-CN.lang.php b/modules/editor/lang/zh-CN.lang.php
deleted file mode 100644
index 1e967b1e8..000000000
--- a/modules/editor/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,281 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  网页编辑器(editor) 模块语言包
-     **/
-
-    $lang->editor = '网页编辑器';
-    $lang->component_name = '组件';
-    $lang->component_version = '版本';
-    $lang->component_author = '作者';
-    $lang->component_link = '链接';
-    $lang->component_date = '编写日期';
-    $lang->component_license = '版权';
-    $lang->component_history = '更新日志';
-    $lang->component_description = '说明';
-    $lang->component_extra_vars = '变数设置';
-    $lang->component_grant = '权限设置';
-    $lang->content_style = '文档样式';
-    $lang->content_font = '文档字体';
-    $lang->content_font_size = '字体大小';
-
-    $lang->about_component = '组件简介';
-    $lang->about_component_grant = '可以设置除默认组件外的扩展组件使用权限<br />(全部解除时任何用户都可以使用)。';
-    $lang->about_component_mid = '可以指定使用编辑器组件的对象。<br />(全部解除时任何用户都可以使用)。';
-
-    $lang->msg_component_is_not_founded = '找不到%s 组件说明！';
-    $lang->msg_component_is_inserted = '您选择的组件已插入！';
-    $lang->msg_component_is_first_order = '您选择的组件已到最上端位置！';
-    $lang->msg_component_is_last_order = '您选择的组件已到最下端位置！';
-    $lang->msg_load_saved_doc = "有自动保存的内容， 确定要恢复吗？\n发布主题后，自动保存的文本将会被删除。";
-    $lang->msg_auto_saved = '已自动保存！';
-
-    $lang->cmd_disable = '非激活';
-    $lang->cmd_enable = '激活';
-
-    $lang->editor_skin = '编辑器皮肤';
-    $lang->upload_file_grant = '文件上传权限';
-    $lang->enable_default_component_grant = '默认组件使用权限';
-    $lang->enable_component_grant = '组件使用权限';
-    $lang->enable_html_grant = 'HTML编辑权限';
-    $lang->enable_autosave = '内容自动保存';
-    $lang->height_resizable = '高度调整';
-    $lang->editor_height = '编辑器高度';
-
-    $lang->about_editor_skin = '可以选择编辑器皮肤。';
-    $lang->about_content_style = '可以指定编辑或打印文档时的文档样式。';
-    $lang->about_content_font = '可以指定编辑或打印文档时的文档字体，不指定随用户设置。<br/>多个字体可以用逗号(，)区分输入。';
-    $lang->about_content_font_size = '可以指定编辑或打印文档时的文档字体大小。<br/>指定时请包含字体单位(如12px, 1em)。';
-    $lang->about_upload_file_grant = '可以设置上传文件的权限(全部解除为无限制)。';
-    $lang->about_default_component_grant = '可以设置编辑器默认组件的使用权限(全部解除为无限制)。';
-    $lang->about_editor_height = '可以指定编辑器的默认高度。';
-    $lang->about_editor_height_resizable = '允许用户拖动编辑器高度。';
-    $lang->about_enable_html_grant = 'HTML代码编辑权限设置。';
-    $lang->about_enable_autosave = '发表主题时激活内容自动保存功能。';
-
-    $lang->edit->fontname = '字体';
-    $lang->edit->fontsize = '大小';
-    $lang->edit->use_paragraph = '段落功能';
-    $lang->edit->fontlist = array(
-    '宋体'=>'宋体',
-    '黑体'=>'黑体',
-    '楷体_GB2312'=>'楷体',
-    'Arial'=>'Arial',
-    'Arial Black'=>'Arial Black',
-    'Tahoma'=>'Tahoma',
-    'Verdana'=>'Verdana',
-    'Sans-serif'=>'Sans-serif',
-    'Serif'=>'Serif',
-    'Monospace'=>'Monospace',
-    'Cursive'=>'Cursive',
-    'Fantasy'=>'Fantasy',
-    );
-
-    $lang->edit->header = '样式';
-    $lang->edit->header_list = array(
-    'h1' => '标题 1',
-    'h2' => '标题 2',
-    'h3' => '标题 3',
-    'h4' => '标题 4',
-    'h5' => '标题 5',
-    'h6' => '标题 6',
-    );
-
-    $lang->edit->submit = '确认';
-
-    $lang->edit->fontcolor = '文本颜色';
-	$lang->edit->fontcolor_apply = '글자 색 적용';
-	$lang->edit->fontcolor_more = '글자 색 더보기';
-    $lang->edit->fontbgcolor = '背景颜色';
-	$lang->edit->fontbgcolor_apply = '글자 배경색 적용';
-	$lang->edit->fontbgcolor_more = '글자 배경색 더보기';
-    $lang->edit->bold = '粗体';
-    $lang->edit->italic = '斜体';
-    $lang->edit->underline = '下划线';
-    $lang->edit->strike = '取消线';
-    $lang->edit->sup = '上标';
-    $lang->edit->sub = '下标';
-    $lang->edit->redo = '恢复';
-    $lang->edit->undo = '撤销';
-    $lang->edit->align_left = '左对齐';
-    $lang->edit->align_center = '居中对齐';
-    $lang->edit->align_right = '右对齐';
-    $lang->edit->align_justify = '两端对齐';
-    $lang->edit->add_indent = '增加缩进';
-    $lang->edit->remove_indent = '减少缩进';
-    $lang->edit->list_number = '有序列表';
-    $lang->edit->list_bullet = '无序列表';
-    $lang->edit->remove_format = '删除文字格式';
-
-    $lang->edit->help_remove_format = '清除格式。';
-    $lang->edit->help_strike_through = '取消线。';
-    $lang->edit->help_align_full = '两端对齐。';
-
-    $lang->edit->help_fontcolor = '文本颜色。';
-    $lang->edit->help_fontbgcolor = '背景颜色。';
-    $lang->edit->help_bold = '粗体';
-    $lang->edit->help_italic = '斜体';
-    $lang->edit->help_underline = '下划线';
-    $lang->edit->help_strike = '取消线';
-    $lang->edit->help_sup = '上标';
-    $lang->edit->help_sub = '下标';
-    $lang->edit->help_redo = '恢复';
-    $lang->edit->help_undo = '撤销';
-    $lang->edit->help_align_left = '左对齐';
-    $lang->edit->help_align_center = '居中对齐';
-    $lang->edit->help_align_right = '右对齐';
-    $lang->edit->help_align_justify = '两端对齐';
-    $lang->edit->help_add_indent = '增加缩进';
-    $lang->edit->help_remove_indent = '减少缩进';
-    $lang->edit->help_list_number = '有序列表';
-    $lang->edit->help_list_bullet = '无序列表';
-    $lang->edit->help_use_paragraph = '分段请按 Ctrl＋回车． (发表主题快捷键：Alt＋S)';
-
-    $lang->edit->url = '链接';
-    $lang->edit->blockquote = '注释框';
-    $lang->edit->table = '表格';
-    $lang->edit->image = '图片';
-    $lang->edit->multimedia = '视频';
-    $lang->edit->emoticon = '表情图标';
-
-	$lang->edit->file = '파일';
-    $lang->edit->upload = '上传';
-    $lang->edit->upload_file = '上传附件';
-	$lang->edit->upload_list = '첨부 목록';
-    $lang->edit->link_file = '插入附件';
-    $lang->edit->delete_selected = '删除所选';
-
-    $lang->edit->icon_align_article = '占一个段落';
-    $lang->edit->icon_align_left = '文本左侧';
-    $lang->edit->icon_align_middle = '居中对齐';
-    $lang->edit->icon_align_right = '文本右侧';
-
-    $lang->about_dblclick_in_editor = '双击背景, 文本, 图片, 引用即可对其相关组件进行详细设置。';
-
-    $lang->edit->rich_editor = '常规';
-    $lang->edit->html_editor = 'HTML';
-    $lang->edit->extension ='扩展组件';
-    $lang->edit->help = '帮助';
-    $lang->edit->help_command = '快捷键说明';
-    
-    $lang->edit->lineheight = '行间距';
-    $lang->edit->fontbgsampletext = '我爱中华！';
-	
-    $lang->edit->hyperlink = '链接';
-    $lang->edit->target_blank = '新窗口';
-	
-    $lang->edit->quotestyle1 = '左侧实线';
-    $lang->edit->quotestyle2 = '引用符号';
-    $lang->edit->quotestyle3 = '实线';
-    $lang->edit->quotestyle4 = '实线 + 背景';
-    $lang->edit->quotestyle5 = '粗实线';
-    $lang->edit->quotestyle6 = '虚线';
-    $lang->edit->quotestyle7 = '虚线 + 背景';
-    $lang->edit->quotestyle8 = '取消应用';
-
-
-    $lang->edit->jumptoedit = '跳转';
-    $lang->edit->set_sel = '表格大小';
-    $lang->edit->row = '行';
-    $lang->edit->col = '列';
-    $lang->edit->add_one_row = '添加1行';
-    $lang->edit->del_one_row = '删除1行';
-    $lang->edit->add_one_col = '添加1列';
-    $lang->edit->del_one_col = '删除1列';
-
-    $lang->edit->table_config = '表格属性';
-    $lang->edit->border_width = '表格边框';
-    $lang->edit->border_color = '边框颜色';
-    $lang->edit->add = '加';
-    $lang->edit->del = '减';
-    $lang->edit->search_color = '修改颜色';
-    $lang->edit->table_backgroundcolor = '背景颜色';
-    $lang->edit->special_character = '特殊字符';
-    $lang->edit->insert_special_character = '插入特殊字符';
-    $lang->edit->close_special_character = '关闭';
-    $lang->edit->symbol = '基本符号';
-    $lang->edit->number_unit = '数字/单位';
-    $lang->edit->circle_bracket = '数字序号';
-    $lang->edit->korean = '韩文';
-    $lang->edit->greece = '希腊';
-    $lang->edit->Latin  = '拉丁';
-    $lang->edit->japan  = '日文';
-    $lang->edit->selected_symbol  = '被选字符';
-
-    $lang->edit->search_replace  = '查找/替换';
-    $lang->edit->close_search_replace  = '关闭';
-    $lang->edit->replace_all  = '全部替换';
-    $lang->edit->search_words  = '查找内容';
-    $lang->edit->replace_words  = '替换为';
-    $lang->edit->next_search_words  = '查找下一个';
-    $lang->edit->edit_height_control  = '调整输入框大小';
-
-    $lang->edit->merge_cells = '合并单元格';
-    $lang->edit->split_row = '跨行';
-    $lang->edit->split_col = '跨列';
-    
-    $lang->edit->toggle_list   = '展开/折叠列表';
-    $lang->edit->minimize_list = '最小化';
-    
-    $lang->edit->move = '移动';
-    $lang->edit->refresh = '刷新';
-    $lang->edit->materials = '素材库';
-    $lang->edit->temporary_savings = '临时保存列表';
-
-    $lang->edit->paging_prev = '上一个';
-    $lang->edit->paging_next = '下一个';
-    $lang->edit->paging_prev_help = '上一页。';
-    $lang->edit->paging_next_help = '下一页。';
-
-    $lang->edit->toc = '列表';
-    $lang->edit->close_help = '关闭帮助';
-
-    $lang->edit->confirm_submit_without_saving = '尚有未保存的段落。\\n确定要提交吗？';
-
-    $lang->edit->image_align = '图片对齐';
-    $lang->edit->attached_files = '附件';
-
-	$lang->edit->fontcolor_input = '폰트색 직접입력';
-	$lang->edit->fontbgcolor_input = '배경색 직접입력';
-	$lang->edit->pangram = '무궁화 꽃이 피었습니다';
-
-	$lang->edit->table_caption_position = '표 제목(caption) 및 배치';
-	$lang->edit->table_caption = '표 제목(caption)';
-	$lang->edit->table_header = '머리글 셀(th)';
-	$lang->edit->table_header_none = '없음';
-	$lang->edit->table_header_left = '왼쪽';
-	$lang->edit->table_header_top = '위쪽';
-	$lang->edit->table_header_both = '모두';
-	$lang->edit->table_size = '표 크기';
-	$lang->edit->table_width = '표 폭';
-
-	$lang->edit->upper_left = '상단좌측';
-	$lang->edit->upper_center = '상단중앙';
-	$lang->edit->upper_right = '상단우측';
-	$lang->edit->bottom_left = '하단좌측';
-	$lang->edit->bottom_center = '하단중앙';
-	$lang->edit->bottom_right = '하단우측';
-
-	$lang->edit->no_image = '첨부된 이미지가 없습니다.';
-	$lang->edit->no_multimedia = '첨부된 동영상이 없습니다.';
-	$lang->edit->no_attachment = '첨부된 파일이 없습니다.';
-	$lang->edit->insert_selected = '선택 넣기';
-	$lang->edit->delete_selected = '선택 삭제';
-
-	$lang->edit->fieldset = '글상자';
-	$lang->edit->paragraph = '문단';
-	
-	$lang->edit->autosave_format = '글을 쓰기 시작한지 <strong>%s</strong>이 지났습니다. 마지막 저장 시간은 <strong>%s</strong> 입니다.';
-	$lang->edit->autosave_hour = '%d시간';
-	$lang->edit->autosave_hours = '%d시간';
-	$lang->edit->autosave_min = '%d분';
-	$lang->edit->autosave_mins = '%d분';
-	$lang->edit->autosave_hour_ago = '%d시간 전';
-	$lang->edit->autosave_hours_ago = '%d시간 전';
-	$lang->edit->autosave_min_ago = '%d분 전';
-	$lang->edit->autosave_mins_ago = '%d분 전';
-	
-	$lang->edit->upload_not_enough_quota   = '허용된 용량이 부족하여 파일을 첨부할 수 없습니다.';
-	$lang->edit->break_or_paragraph = 'Enter는 줄바꿈, Shift+Enter는 문단바꿈입니다.';
-?>
diff --git a/modules/editor/lang/zh-TW.lang.php b/modules/editor/lang/zh-TW.lang.php
deleted file mode 100644
index 2c6bca0c6..000000000
--- a/modules/editor/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,282 +0,0 @@
-<?php
-    /**
-     * @file   modules/editor/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  網頁編輯器(editor)模組正體中文語言
-     **/
-
-    $lang->editor = '網頁編輯器';
-    $lang->component_name = '組件';
-    $lang->component_version = '版本';
-    $lang->component_author = '作者';
-    $lang->component_link = '連結';
-    $lang->component_date = '編寫日期';
-    $lang->component_license = '版權';
-    $lang->component_history = '更新紀錄';
-    $lang->component_description = '說明';
-    $lang->component_extra_vars = '變數設置';
-    $lang->component_grant = '權限設置'; 
-    $lang->content_style = '內容樣式';
-    $lang->content_font = '內容字體';
-	$lang->content_font_size = '字體大小';
-
-    $lang->about_component = '組件簡介';
-    $lang->about_component_grant = '除預設組件外，可設置延伸組件的使用權限<br />(全部解除時，任何用戶都可使用)。';
-    $lang->about_component_mid = '可以指定使用編輯器組件的對象。<br />(全部解除時，任何用戶都可使用)。';
-
-    $lang->msg_component_is_not_founded = '找不到%s 組件說明！';
-    $lang->msg_component_is_inserted = '您選擇的組件已插入！';
-    $lang->msg_component_is_first_order = '您選擇的組件已達最頂端位置！';
-    $lang->msg_component_is_last_order = '您選擇的組件已達最底端位置！';
-    $lang->msg_load_saved_doc = "有自動儲存的內容，確定要恢復嗎?\n儲存內容後，自動儲存的內容將會被刪除。";
-    $lang->msg_auto_saved = '已自動儲存！';
-
-    $lang->cmd_disable = '暫停';
-    $lang->cmd_enable = '啟動';
-
-    $lang->editor_skin = '編輯器面板';
-    $lang->upload_file_grant = '檔案上傳權限'; 
-    $lang->enable_default_component_grant = '預設組件使用權限';
-    $lang->enable_component_grant = '組件使用權限';
-    $lang->enable_html_grant = 'HTML編輯權限';
-    $lang->enable_autosave = '內容自動儲存';
-    $lang->height_resizable = '高度調整';
-    $lang->editor_height = '編輯器高度';
-
-    $lang->about_editor_skin = '選擇編輯器面板。';
-    $lang->about_content_style = '修改內容時，可指定要顯示的內容樣式';
-    $lang->about_content_font = '修改內容時，可指定要顯示的內容字體。<br/>如果沒有指定的話，以系統預設為主。<br/> 以逗號(，)區分多個字體。';
-	$lang->about_content_font_size = '修改內容時，可指定要顯示的內容字體大小。<br/>請輸入單位，像是12px, 1em等。';
-    $lang->about_upload_file_grant = '設置上傳檔案的權限(全部解除為無限制)。';
-    $lang->about_default_component_grant = '設置編輯器預設組件的使用權限(全部解除為無限制)。';
-    $lang->about_editor_height = '指定編輯器的預設高度。';
-    $lang->about_editor_height_resizable = '允許用戶拖曳編輯器高度。';
-    $lang->about_enable_html_grant = 'HTML原始碼編輯權限設置。';
-    $lang->about_enable_autosave = '發表主題時，開啟內容自動儲存功能。';
-
-    $lang->edit->fontname = '字體';
-    $lang->edit->fontsize = '大小';
-    $lang->edit->use_paragraph = '段落功能';
-    $lang->edit->fontlist = array(
-    '新細明體' => '新細明體',
-    '標楷體' => '標楷體',
-    '細明體' => '細明體',
-    'Arial' => 'Arial',
-    'Arial Black' => 'Arial Black',
-    'Tahoma' => 'Tahoma',
-    'Verdana' => 'Verdana',
-    'Sans-serif' => 'Sans-serif',
-    'Serif' => 'Serif',
-    'Monospace' => 'Monospace',
-    'Cursive' => 'Cursive',
-    'Fantasy' => 'Fantasy',
-    );
-
-    $lang->edit->header = '樣式';
-    $lang->edit->header_list = array(
-    'h1' => '標題 1',
-    'h2' => '標題 2',
-    'h3' => '標題 3',
-    'h4' => '標題 4',
-    'h5' => '標題 5',
-    'h6' => '標題 6',
-    );
-
-    $lang->edit->submit = '確認';
-
-    $lang->edit->fontcolor = '文字顏色';
-	$lang->edit->fontcolor_apply = '套用文字顏色';
-	$lang->edit->fontcolor_more = '更多文字顏色';
-    $lang->edit->fontbgcolor = '背景顏色';
-	$lang->edit->fontbgcolor_apply = '套用背景顏色';
-	$lang->edit->fontbgcolor_more = '更多背景顏色';
-    $lang->edit->bold = '粗體';
-    $lang->edit->italic = '斜體';
-    $lang->edit->underline = '底線';
-    $lang->edit->strike = '虛線';
-    $lang->edit->sup = '上標';
-    $lang->edit->sub = '下標';
-    $lang->edit->redo = '重新操作';
-    $lang->edit->undo = '返回操作';
-    $lang->edit->align_left = '靠左對齊';
-    $lang->edit->align_center = '置中對齊';
-    $lang->edit->align_right = '靠右對齊';
-    $lang->edit->align_justify = '左右對齊';
-    $lang->edit->add_indent = '縮排';
-    $lang->edit->remove_indent = '凸排';
-    $lang->edit->list_number = '編號';
-    $lang->edit->list_bullet = '清單符號';
-    $lang->edit->remove_format = '移除格式';
-
-    $lang->edit->help_remove_format = '移除格式';
-    $lang->edit->help_strike_through = '文字刪除線';
-    $lang->edit->help_align_full = '左右對齊';
-
-    $lang->edit->help_fontcolor = '文字顏色';
-    $lang->edit->help_fontbgcolor = '背景顏色';
-    $lang->edit->help_bold = '粗體';
-    $lang->edit->help_italic = '斜體';
-    $lang->edit->help_underline = '底線';
-    $lang->edit->help_strike = '虛線';
-    $lang->edit->help_sup = '上標';
-    $lang->edit->help_sub = '下標';
-    $lang->edit->help_redo = '重新操作';
-    $lang->edit->help_undo = '返回操作';
-    $lang->edit->help_align_left = '靠左對齊';
-    $lang->edit->help_align_center = '置中對齊';
-    $lang->edit->help_align_right = '靠右對齊';
-	$lang->edit->help_align_justify = '左右對齊';
-    $lang->edit->help_add_indent = '縮排';
-    $lang->edit->help_remove_indent = '凸排';
-    $lang->edit->help_list_number = '編號';
-    $lang->edit->help_list_bullet = '清單符號';
-    $lang->edit->help_use_paragraph = '換行請按 Ctrl+Backspace (快速發表主題：Alt+S)';
-
-    $lang->edit->url = '連結';
-    $lang->edit->blockquote = '引用';
-    $lang->edit->table = '表格';
-    $lang->edit->image = '圖片';
-    $lang->edit->multimedia = '影片';
-    $lang->edit->emoticon = '表情符號';
-
-	$lang->edit->file = '檔案';
-    $lang->edit->upload = '上傳';
-    $lang->edit->upload_file = '上傳附檔';
-	$lang->edit->upload_list = '檔案列表';
-    $lang->edit->link_file = '插入檔案';
-    $lang->edit->delete_selected = '刪除所選';
-
-    $lang->edit->icon_align_article = '段落';
-    $lang->edit->icon_align_left = '靠左';
-    $lang->edit->icon_align_middle = '置中';
-    $lang->edit->icon_align_right = '靠右';
-
-    $lang->about_dblclick_in_editor = '對背景，文字，圖片，引用等組件按兩下，即可對其相關組件進行詳細設置。';
-
-
-    $lang->edit->rich_editor = '所見即得';
-    $lang->edit->html_editor = 'HTML';
-    $lang->edit->extension ='延伸組件';
-    $lang->edit->help = '使用說明';
-    $lang->edit->help_command = '熱鍵指引';
-    
-    $lang->edit->lineheight = '行距';
-	$lang->edit->fontbgsampletext = 'ㄅㄆㄇ';
-	
-	$lang->edit->hyperlink = '超連結';
-	$lang->edit->target_blank = '新視窗';
-	
-	$lang->edit->quotestyle1 = '左側實線';
-	$lang->edit->quotestyle2 = '引用符號';
-	$lang->edit->quotestyle3 = '實線';
-	$lang->edit->quotestyle4 = '實線 + 背景';
-	$lang->edit->quotestyle5 = '粗框';
-	$lang->edit->quotestyle6 = '虛線';
-	$lang->edit->quotestyle7 = '虛線 + 背景';
-	$lang->edit->quotestyle8 = '取消';
-
-
-    $lang->edit->jumptoedit = '跳過編輯工具列';
-    $lang->edit->set_sel = '表格';
-    $lang->edit->row = '行';
-    $lang->edit->col = '列';
-    $lang->edit->add_one_row = '新增一行';
-    $lang->edit->del_one_row = '刪除一行';
-    $lang->edit->add_one_col = '新增一列';
-    $lang->edit->del_one_col = '刪除一列';
-
-    $lang->edit->table_config = '設置';
-    $lang->edit->border_width = '邊框寬度';
-    $lang->edit->border_color = '邊框顏色';
-    $lang->edit->add = '新增';
-    $lang->edit->del = '刪除';
-    $lang->edit->search_color = '其他顏色';
-    $lang->edit->table_backgroundcolor = '背景顏色';
-    $lang->edit->special_character = '特殊符號';
-    $lang->edit->insert_special_character = '插入特殊符號';
-    $lang->edit->close_special_character = '關閉';
-    $lang->edit->symbol = '一般符號';
-    $lang->edit->number_unit = '數字、單位';
-    $lang->edit->circle_bracket = '圓、括弧';
-    $lang->edit->korean = '韓國語';
-    $lang->edit->greece = '希臘語';
-    $lang->edit->Latin  = '拉丁語';
-    $lang->edit->japan  = '日本語';
-    $lang->edit->selected_symbol  = '選擇符號';
-
-    $lang->edit->search_replace  = '搜尋/置換';
-    $lang->edit->close_search_replace  = '關閉搜尋/置換圖層';
-    $lang->edit->replace_all  = '全部置換';
-    $lang->edit->search_words  = '搜尋文字';
-    $lang->edit->replace_words  = '置換文字';
-    $lang->edit->next_search_words  = '搜尋下一個';
-    $lang->edit->edit_height_control  = '設定大小';
-
-	$lang->edit->merge_cells = '合併儲存格';
-    $lang->edit->split_row = '分割行';
-    $lang->edit->split_col = '分割列';
-    
-    $lang->edit->toggle_list   = '摺疊/展開';
-    $lang->edit->minimize_list = '最小化';
-    
-    $lang->edit->move = '搬移';
-	$lang->edit->refresh = '重整';
-    $lang->edit->materials = '素材';
-    $lang->edit->temporary_savings = '暫存檔列表';
-
-	$lang->edit->paging_prev = '前頁';
-	$lang->edit->paging_next = '次頁';
-	$lang->edit->paging_prev_help = '往上一頁';
-	$lang->edit->paging_next_help = '往下一頁';
-
-	$lang->edit->toc = '目錄';
-	$lang->edit->close_help = '關閉';
-
-	$lang->edit->confirm_submit_without_saving = '有內容尚未儲存。\\n是否要繼續進行?';
-
-	$lang->edit->image_align = '圖片對齊';
-	$lang->edit->attached_files = '附加檔案';
-
-	$lang->edit->fontcolor_input = '自訂文字顏色';
-	$lang->edit->fontbgcolor_input = '自訂背景顏色';
-	$lang->edit->pangram = '實際範例';
-
-	$lang->edit->table_caption_position = '標籤位置';
-	$lang->edit->table_caption = '表格標籤(caption)';
-	$lang->edit->table_header = '標頭';
-	$lang->edit->table_header_none = '無';
-	$lang->edit->table_header_left = '左側';
-	$lang->edit->table_header_top = '頂端';
-	$lang->edit->table_header_both = '兩者';
-	$lang->edit->table_size = '大小';
-	$lang->edit->table_width = '寬度';
-
-	$lang->edit->upper_left = '左上方';
-	$lang->edit->upper_center = '正上方';
-	$lang->edit->upper_right = '右上方';
-	$lang->edit->bottom_left = '左下方';
-	$lang->edit->bottom_center = '正下方';
-	$lang->edit->bottom_right = '右下方';
-
-	$lang->edit->no_image = '目前沒有圖片';
-	$lang->edit->no_multimedia = '目前沒有影片';
-	$lang->edit->no_attachment = '目前沒有附檔';
-	$lang->edit->insert_selected = '插入所選';
-	$lang->edit->delete_selected = '刪除所選';
-
-	$lang->edit->fieldset = '區域';
-	$lang->edit->paragraph = '段落';
-	
-	$lang->edit->autosave_format = '正在編寫 <strong>%s</strong> 最後儲存時間 <strong>%s</strong> ';
-	$lang->edit->autosave_hour = '%d小時';
-	$lang->edit->autosave_hours = '%d小時';
-	$lang->edit->autosave_min = '%d分';
-	$lang->edit->autosave_mins = '%d分';
-	$lang->edit->autosave_hour_ago = '%d小時前';
-	$lang->edit->autosave_hours_ago = '%d小時前';
-	$lang->edit->autosave_min_ago = '%d分前';
-	$lang->edit->autosave_mins_ago = '%d分前';
-	
-	$lang->edit->upload_not_enough_quota   = '已超過上傳大小限制無法上傳附檔。';
-	$lang->edit->break_or_paragraph = '按 Enter鍵換行，按 Shift+Enter分隔段落。';
-?>
diff --git a/modules/editor/ruleset/componentOrderAndUse.xml b/modules/editor/ruleset/componentOrderAndUse.xml
new file mode 100644
index 000000000..27e72cf1e
--- /dev/null
+++ b/modules/editor/ruleset/componentOrderAndUse.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+    </fields>
+</ruleset>
diff --git a/modules/editor/ruleset/generalConfig.xml b/modules/editor/ruleset/generalConfig.xml
new file mode 100644
index 000000000..372263f01
--- /dev/null
+++ b/modules/editor/ruleset/generalConfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="editor_height" required="true" rule="number" />
+		<field name="comment_editor_height" required="true" rule="number" />		
+    </fields>
+</ruleset>
diff --git a/modules/editor/ruleset/setupComponent.xml b/modules/editor/ruleset/setupComponent.xml
new file mode 100644
index 000000000..27e72cf1e
--- /dev/null
+++ b/modules/editor/ruleset/setupComponent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+    </fields>
+</ruleset>
diff --git a/modules/editor/skins/dreditor/css/button.css b/modules/editor/skins/dreditor/css/button.css
index 50315c21c..76d674d3d 100644
--- a/modules/editor/skins/dreditor/css/button.css
+++ b/modules/editor/skins/dreditor/css/button.css
@@ -1,81 +1,81 @@
-@charset "utf-8"; 
-/* NHN (developers@xpressengine.com) */
-
-/* -- Button Gray Style -- */
-.buttonGray,
-.buttonGray button{ position:relative; border:0; margin:0; display:inline-block; color:#000; font-family:Tahoma, Sans-serif; cursor:pointer; text-decoration:none !important; white-space:nowrap; vertical-align:middle; background-color:transparent; background-image:url(../img/buttonGray.gif) !important; background-repeat:no-repeat;}
-.buttonGray{ margin-right:2px;}
-.buttonGray button{ left:2px; overflow:visible;}
-
-/* Medium Size */
-.buttonGray.medium { background-position:left -30px;}
-.buttonGray.medium button{ height:24px; padding:0 10px 0 8px; *padding:0 5px 0 3px; font:12px/25px Sans-serif; background-position:right -30px; _top:-1px;}
-
-/* Strong Button */
-.buttonGray.strong * { font-weight:bold !important;}
-
-/* Icon Add */
-.buttonGray .icon { position:relative; margin-right:5px; vertical-align:middle;}
-
-/* Button Reset */
-.buttonDrEditor,
-.buttonDrEditor a,
-.buttonDrEditor button,
-.buttonDrEditor input { position:relative; margin:0; display:inline-block; text-decoration:none !important; border:0; font-size:12px; font-family:Tahoma, Sans-serif; white-space:nowrap; background:url(../img/buttonWhite.gif) no-repeat; vertical-align:middle; overflow:visible; color:#333;}
-.buttonDrEditor { height:23px; padding:0; margin-right:2px; background-position:left top;}
-.buttonDrEditor a,
-.buttonDrEditor button,
-.buttonDrEditor input{ left:2px; *vertical-align:top; cursor:pointer;}
-
-/* Button Size */
-.buttonDrEditor.large { height:29px; background-position:left -30px; }
-.buttonDrEditor.xLarge { height:35px; background-position:left -65px; }
-.buttonDrEditor.small { height:18px; background-position:left -107px; }
-.buttonDrEditor a,
-.buttonDrEditor button,
-.buttonDrEditor input { height:23px; padding:0 10px 0 8px; font-size:12px; line-height:23px; background-position:right top;}
-.buttonDrEditor.large a,
-.buttonDrEditor.large button,
-.buttonDrEditor.large input { height:30px; padding:0 10px 0 8px; font-size:16px; line-height:29px; background-position:right -30px;}
-.buttonDrEditor.xLarge a,
-.buttonDrEditor.xLarge button,
-.buttonDrEditor.xLarge input { height:35px; padding:0 10px 0 8px; font-size:20px; line-height:35px; background-position:right -65px;}
-.buttonDrEditor.small a,
-.buttonDrEditor.small button,
-.buttonDrEditor.small input { height:18px; padding:0 6px 0 4px; font-size:11px; line-height:18px; background-position:right -107px;}
-
-/* Button Text Color */
-.buttonDrEditor *:hover,
-.buttonDrEditor *:active,
-.buttonDrEditor *:focus{ color:#690;}
-.buttonDrEditor.green,
-.buttonDrEditor.green a,
-.buttonDrEditor.green button,
-.buttonDrEditor.green input { background-image:url(../img/buttonGreen.gif); color:#fff;}
-.buttonDrEditor.green *:hover,
-.buttonDrEditor.green *:active,
-.buttonDrEditor.green *:focus{ color:#ff0;}
-.buttonDrEditor.black,
-.buttonDrEditor.black a,
-.buttonDrEditor.black button,
-.buttonDrEditor.black input { background-image:url(../img/buttonBlack.gif); color:#fff;}
-.buttonDrEditor.black *:hover,
-.buttonDrEditor.black *:active,
-.buttonDrEditor.black *:focus{ color:#ff0;}
-.buttonDrEditor.red,
-.buttonDrEditor.red a,
-.buttonDrEditor.red button,
-.buttonDrEditor.red input { background-image:url(../img/buttonRed.gif); color:#fff;}
-.buttonDrEditor.red *:hover,
-.buttonDrEditor.red *:active,
-.buttonDrEditor.red *:focus{ color:#ff0;}
-.buttonDrEditor.blue,
-.buttonDrEditor.blue a,
-.buttonDrEditor.blue button,
-.buttonDrEditor.blue input { background-image:url(../img/buttonBlue.gif); color:#fff;}
-.buttonDrEditor.blue *:hover,
-.buttonDrEditor.blue *:active,
-.buttonDrEditor.blue *:focus{ color:#ff0;}
-
-/* Button Text Strong */
-.buttonDrEditor.strong * { font-weight:bold !important;}
+@charset "utf-8"; 
+/* NHN (developers@xpressengine.com) */
+
+/* -- Button Gray Style -- */
+.buttonGray,
+.buttonGray button{ position:relative; border:0; margin:0; display:inline-block; color:#000; font-family:Tahoma, Sans-serif; cursor:pointer; text-decoration:none !important; white-space:nowrap; vertical-align:middle; background-color:transparent; background-image:url(../img/buttonGray.gif) !important; background-repeat:no-repeat;}
+.buttonGray{ margin-right:2px;}
+.buttonGray button{ left:2px; overflow:visible;}
+
+/* Medium Size */
+.buttonGray.medium { background-position:left -30px;}
+.buttonGray.medium button{ height:24px; padding:0 10px 0 8px; *padding:0 5px 0 3px; font:12px/25px Sans-serif; background-position:right -30px; _top:-1px;}
+
+/* Strong Button */
+.buttonGray.strong * { font-weight:bold !important;}
+
+/* Icon Add */
+.buttonGray .icon { position:relative; margin-right:5px; vertical-align:middle;}
+
+/* Button Reset */
+.buttonDrEditor,
+.buttonDrEditor a,
+.buttonDrEditor button,
+.buttonDrEditor input { position:relative; margin:0; display:inline-block; text-decoration:none !important; border:0; font-size:12px; font-family:Tahoma, Sans-serif; white-space:nowrap; background:url(../img/buttonWhite.gif) no-repeat; vertical-align:middle; overflow:visible; color:#333;}
+.buttonDrEditor { height:23px; padding:0; margin-right:2px; background-position:left top;}
+.buttonDrEditor a,
+.buttonDrEditor button,
+.buttonDrEditor input{ left:2px; *vertical-align:top; cursor:pointer;}
+
+/* Button Size */
+.buttonDrEditor.large { height:29px; background-position:left -30px; }
+.buttonDrEditor.xLarge { height:35px; background-position:left -65px; }
+.buttonDrEditor.small { height:18px; background-position:left -107px; }
+.buttonDrEditor a,
+.buttonDrEditor button,
+.buttonDrEditor input { height:23px; padding:0 10px 0 8px; font-size:12px; line-height:23px; background-position:right top;}
+.buttonDrEditor.large a,
+.buttonDrEditor.large button,
+.buttonDrEditor.large input { height:30px; padding:0 10px 0 8px; font-size:16px; line-height:29px; background-position:right -30px;}
+.buttonDrEditor.xLarge a,
+.buttonDrEditor.xLarge button,
+.buttonDrEditor.xLarge input { height:35px; padding:0 10px 0 8px; font-size:20px; line-height:35px; background-position:right -65px;}
+.buttonDrEditor.small a,
+.buttonDrEditor.small button,
+.buttonDrEditor.small input { height:18px; padding:0 6px 0 4px; font-size:11px; line-height:18px; background-position:right -107px;}
+
+/* Button Text Color */
+.buttonDrEditor *:hover,
+.buttonDrEditor *:active,
+.buttonDrEditor *:focus{ color:#690;}
+.buttonDrEditor.green,
+.buttonDrEditor.green a,
+.buttonDrEditor.green button,
+.buttonDrEditor.green input { background-image:url(../img/buttonGreen.gif); color:#fff;}
+.buttonDrEditor.green *:hover,
+.buttonDrEditor.green *:active,
+.buttonDrEditor.green *:focus{ color:#ff0;}
+.buttonDrEditor.black,
+.buttonDrEditor.black a,
+.buttonDrEditor.black button,
+.buttonDrEditor.black input { background-image:url(../img/buttonBlack.gif); color:#fff;}
+.buttonDrEditor.black *:hover,
+.buttonDrEditor.black *:active,
+.buttonDrEditor.black *:focus{ color:#ff0;}
+.buttonDrEditor.red,
+.buttonDrEditor.red a,
+.buttonDrEditor.red button,
+.buttonDrEditor.red input { background-image:url(../img/buttonRed.gif); color:#fff;}
+.buttonDrEditor.red *:hover,
+.buttonDrEditor.red *:active,
+.buttonDrEditor.red *:focus{ color:#ff0;}
+.buttonDrEditor.blue,
+.buttonDrEditor.blue a,
+.buttonDrEditor.blue button,
+.buttonDrEditor.blue input { background-image:url(../img/buttonBlue.gif); color:#fff;}
+.buttonDrEditor.blue *:hover,
+.buttonDrEditor.blue *:active,
+.buttonDrEditor.blue *:focus{ color:#ff0;}
+
+/* Button Text Strong */
+.buttonDrEditor.strong * { font-weight:bold !important;}
diff --git a/modules/editor/skins/dreditor/css/dreditor.css b/modules/editor/skins/dreditor/css/dreditor.css
index 07aceca58..c600d0b30 100644
--- a/modules/editor/skins/dreditor/css/dreditor.css
+++ b/modules/editor/skins/dreditor/css/dreditor.css
@@ -1,348 +1,348 @@
-@charset "utf-8"; 
-/* NHN (developers@xpressengine.com) */
-
-/* Textyle Editor */
-.textyleEditor{ position:relative; *zoom:1; margin:0 0 1em 0;}
-.textyleEditor:after{ content:""; display:block; clear:both;} 
-.textyleEditor .editorContainer{ position:relative; width:100%; display:table; table-layout:fixed;}
-.textyleEditor .editorContainer .editorArea{ opacity:1; filter:alpha(opacity=100);}
-.textyleEditor .editorContainer .writeArea{ position:relative; *zoom:1;}
-
-/* Writing Toolbar */
-.wToolbarContainer{ position:relative; margin:20px 0 40px 0; height:62px; overflow:hidden; z-index:1000; _zoom:1;}
-.wToolbarContainer.more{ height:auto;}
-.wToolbar{ position:relative; height:62px; margin:0 10px; *zoom:1; background-image:url(../img/bgWritingToolbarCenter.gif); background-repeat:repeat-x; }
-.wToolbarContainer.more .wToolbar{ height:auto; padding:0 0 5px 0; background-position:0 bottom; border-top:1px solid #bec2ca;}
-.wToolbar .cap{ position:absolute; top:0; height:62px; background-repeat:no-repeat; font-size:0; line-height:0; background:url(../img/bgWritingToolbar.gif) no-repeat; z-index:1;}
-.wToolbar .top{ display:none; position:absolute; top:-1px; width:10px; height:7px; background:url(../img/bgWritingToolbarMore.gif) no-repeat; z-index:2;}
-.wToolbarContainer.more .cap{ height:100%; _top:auto; _bottom:0; _height:300px; background:url(../img/bgWritingToolbarMore.gif) no-repeat;}
-.wToolbarContainer.more .top{ display:block;}
-.wToolbar .capLeft{ width:10px; left:-10px; background-position:left top;}
-.wToolbar .topLeft{ left:-10px; background-position:left top;}
-.wToolbarContainer.more .cap.capLeft{ background-position:left bottom;}
-.wToolbar .capRight{ width:10px; right:-10px; background-position:right top;}
-.wToolbar .topRight{ right:-10px; background-position:right top;}
-.wToolbarContainer.more .capRight{ background-position:right bottom;}
-
-.wToolbar ul{ position:relative; margin:0 70px 0 0; padding:0; *zoom:1; height:58px; z-index:2;}
-.wToolbarContainer.more ul{ height:auto; _height:58px; background:url(../img/hrToolbarMore.gif);}
-.wToolbar ul:after{ content:""; display:block; clear:both;}
-.wToolbar li{ position:relative; float:left; list-style:none; margin-bottom:4px; width:11.1%; *width:11%; _margin-top:0; _margin-right:-1px;}
-.wToolbar li button{ position:relative; padding:0; width:100%; height:57px; *height:59px; border:0; background:transparent; cursor:pointer; font-size:11px; color:#44506a; background-image:url(../img/iconWritingToolbar.gif); background-repeat:no-repeat;}
-.wToolbar li button .tx{ display:inline-block; padding-top:37px; height:20px;}
-.wToolbar li.more{ float:none; position:absolute; top:1px; right:-70px; width:60px; background:url(../img/vrToolbarMore.gif) repeat-y; _zoom:1;}
-.wToolbar li.more button{ width:60px;}
-.wToolbarContainer.more li{ margin-bottom:0;}
-.wToolbarContainer.more li.more{ height:100%;}
-.wToolbarContainer.more li.more button{ height:100%; _height:114px; background:url(../img/iconWritingToolbarFolder.gif) no-repeat center !important;}
-.wToolbarContainer.more li.more button .nx{ top:0;}
-.wToolbar li.hover button{ background-color:#bfc3cb;}
-
-.wToolbar li.hx button{ background-position:center top;}
-.wToolbar li.txt button{ background-position:center -100px;}
-.wToolbar li.link button{ background-position:center -200px;}
-.wToolbar li.list button{ background-position:center -300px;}
-.wToolbar li.quote button{ background-position:center -400px;}
-.wToolbar li.img button{ background-position:center -500px;}
-.wToolbar li.movie button{ background-position:center -600px;}
-.wToolbar li.file button{ background-position:center -700px;}
-.wToolbar li.hr button{ background-position:center -800px;}
-.wToolbar li.index button{ background-position:center -900px;}
-.wToolbar li.material button{ background-position:center -1000px;}
-.wToolbar li.help button{ background-position:center -1100px;}
-.wToolbar li.more button{ background-position:center -1187px;}
-
-.wToolbar li .dragable{ position:absolute; display:none; bottom:38px; right:0; padding:0; border:0; width:20px; height:20px; overflow:hidden; background:url(../img/iconMovable.gif) no-repeat center center !important; cursor:move; font-size:0; line-height:0; text-indent:-200%;}
-.wToolbarContainer.more li.hover .dragable{ _display:block;}
-.wToolbarContainer.more li:hover .dragable{ display:block;}
-.wToolbar li .nx{ position:absolute; text-align:center; top:8px; left:50%; font:bold 10px Tahoma, Geneva, sans-serif; color:#fff; width:18px; height:18px; line-height:16px; opacity:.7; background:url(../img/bgShortcut.png) no-repeat center top; _background:none; _filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='./modules/editor/skins/dreditor/img/bgShortcut.png', sizingMethod='crop');}
-
-/* Writing Area + Material Area */
-.wArea,
-.mArea{ display:none; position:relative; *zoom:1; padding:20px; margin:0;}
-.wArea{ background:#f5f5f5; border:1px solid #e9e9e9;}
-.mArea{ background:url(../img/bgChess76.gif); border:1px solid #666;}
-.mArea{ margin:20px 0;}
-.wArea.open,
-.mArea.open{ display:block;}
-.wArea .cap,
-.mArea .cap{ position:absolute; width:10px; height:10px; background-repeat:no-repeat; font-size:0; line-height:0; overflow:hidden;}
-.wArea .cap{ background-image:url(../img/bgRouningF5.gif);}
-.mArea .cap{ background-image:url(../img/bgRouning76.gif);}
-.wArea .cap.capTL,
-.mArea .cap.capTL{ top:-1px; left:-1px; background-position:left top;}
-.wArea .cap.capTR,
-.mArea .cap.capTR{ top:-1px; right:-1px; background-position:right top;}
-.wArea .cap.capBL,
-.mArea .cap.capBL{ bottom:-1px; left:-1px; background-position:left bottom;}
-.wArea .cap.capBR,
-.mArea .cap.capBR{ bottom:-1px; right:-1px; background-position:right bottom;}
-.wArea .h4,
-.mArea .h4{ font-size:16px; margin:0 0 10px 0;}
-.wArea .h4{ color:#555;}
-.mArea .h4{ color:#fff;}
-.mArea .controls{ position:absolute; top:20px; right:20px;}
-
-/* Writing Area */
-.wArea .buttonArea{ position:relative; text-align:left; *zoom:1;}
-.wArea .buttonArea .buttonGray button{ _top:0;}
-.wArea .buttonArea .info{ display:inline; padding:0 0 0 15px; color:#777;}
-.wArea .inputTitle{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:14px; margin-bottom:10px;}
-.wArea .inputLink{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:11px; margin-bottom:10px;}
-.wArea .inputText{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:12px; margin-bottom:10px;}
-.wArea .inputFile{ width:100%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:29px; font-size:12px; margin-bottom:10px;}
-.wArea .inputTextarea{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:10px 0 0 10px; height:150px; font-size:12px; line-height:1.5; margin-bottom:10px;}
-.wArea .inputRadio{ width:13px; height:13px; vertical-align:middle;}
-.wArea .hr{ border-top:1px solid #e6e6e6; border-bottom:1px solid #fff; font-size:0; line-height:0; overflow:hidden; height:0; margin:15px -20px;}
-
-/* Material Area */
-.mArea .reload{ position:absolute; top:24px; right:40px; width:15px; height:16px; padding:0; cursor:pointer; border:0; *margin:0 5px 0 0; background:transparent url(../img/buttonRefresh.gif) no-repeat; vertical-align:middle;}
-.mArea .reload span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
-.mArea .close{ position:absolute; top:24px; right:20px; width:15px; height:16px; padding:0; cursor:pointer; border:0; *margin:0 5px 0 0; background:transparent url(../img/buttonClose.gif) no-repeat; vertical-align:middle;}
-.mArea .close span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
-.mArea .noData{ position:relative; border-top:1px solid #ddd; border-bottom:1px solid #ddd; background:#fff; padding:10px 20px;}
-.mArea dl{ position:relative; background:#fff;}
-.mArea dt{ position:relative; padding:7px 15px; font-weight:bold; color:#fff; background:#555; border-top:1px solid #444;}
-.mArea dd{ margin:0 15px; padding:5px 0;}
-.mArea dd .buttonDrEditor{ position:absolute; top:8px; right:10px;}
-.mArea .eArea{ border:0; padding:0;}
-
-.mArea .paginate{ position:relative; width:100px; margin:0 auto; text-align:center; padding:0; font-size:12px; color:#fff; *zoom:1;}
-.mArea .paginate:after{ content:""; display:block; clear:both;}
-.mArea .paginate button{ width:17px; height:17px; padding:0; background:transparent url(../img/buttonPaginate.gif) no-repeat 0 0; cursor:pointer; border:0; vertical-align:middle;}
-.mArea .paginate button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden; z-index:-1;}
-.mArea .paginate .prev{ float:left; background-position:left top;}
-.mArea .paginate .next{ float:right; background-position:right top;}
-
-/* Writing Area Blank */
-.editorArea .wArea { display:block;}
-.wArea.blank{ padding:15px 30px; margin:0;}
-.wArea.blank dt{ font-size:12px; font-weight:bold; color:#333;}
-.wArea.blank dd{ margin:0 0 5px 0; color:#767676;}
-.wArea.blank .drEditorBugReport{ position:absolute; margin:0 !important; top:20px; right:30px;}
-
-/* Writing Area Hx */
-.wArea.hx ul{ margin:0 0 5px 0; padding:0; list-style:none;}
-.wArea.hx li{ display:inline !important; font-weight:bold !important; color:#333 !important;}
-.wArea.hx li label{ margin-right:30px;}
-.wArea.hx .inputTitle{ font-weight:bold !important;}
-.wArea.hx li.h3,
-.wArea.hx .inputTitle.h3{ font-size:18px !important; height:28px;}
-.wArea.hx li.h4,
-.wArea.hx .inputTitle.h4{ font-size:16px !important; height:26px;}
-.wArea.hx li.h5,
-.wArea.hx .inputTitle.h5{ font-size:13px !important; height:23px;}
-
-/* Writing Area List */
-.wArea.list .toolbar{ border:1px solid #ddd; list-style:none; margin:0 0 -1px 0; padding:0; background:#fafafa; padding:6px 20px;}
-.wArea.list .toolbar li{ display:inline; margin-right:5px;}
-.wArea.list .toolbar li button{ position:relative; width:23px; height:22px; padding:0; border:0; cursor:pointer; background-image:url(../img/buttonListToolbar.gif); background-repeat:no-repeat;}
-.wArea.list .toolbar li button:hover,
-.wArea.list .toolbar li button:active,
-.wArea.list .toolbar li button:focus{ border:1px solid #ddd;}
-.wArea.list .toolbar li button.type_disc{ background-position:center 0;}
-.wArea.list .toolbar li button.type_circle{ background-position:center -30px;}
-.wArea.list .toolbar li button.type_square{ background-position:center -60px;}
-.wArea.list .toolbar li button.type_decimal{ background-position:center -90px;}
-.wArea.list .toolbar li button.type_lower-alpha{ background-position:center -120px;}
-.wArea.list .toolbar li button.type_upper-alpha{ background-position:center -150px;}
-.wArea.list .toolbar li button.type_lower-roman{ background-position:center -180px;}
-.wArea.list .toolbar li button.type_upper-roman{ background-position:center -210px;}
-.wArea.list .toolbar li button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden;}
-
-.wArea.list .listArea{ padding:1em 0; margin-bottom:1em; background:#fff url(../img/bgInputText.gif) no-repeat; border:1px solid #ddd;}
-.wArea.list .listArea ul{ border:0;}
-.wArea.list .listArea input{ border:0; border-bottom:1px solid #ddd; background:transparent; width:96%; padding:3px 4px;}
-
-/* Writing Area Image */
-.wArea.img .image{ position:relative; margin-bottom:10px; background:#fff; padding:0; _width:100%; overflow:hidden;}
-.wArea.img .image img{ max-width:100%;}
-.wArea.img .uploading{ display:none; padding:0 0 0 20px; background:url(../img/iconLoading.gif) no-repeat left center;}
-.wArea.img .uploading button{ border:2px solid #ccc; background:#eee; cursor:pointer; font-size:11px; font-weight:bold; padding:0; overflow:visible; vertical-align:middle; margin:0 10px;}
-.wArea.img .info{ font-size:11px; color:#737fa1; margin:0;}
-.wArea.img .resize{ display:none;}
-.wArea.img .resize.open{ display:block;}
-.wArea.img .resize dl *{ vertical-align:middle;}
-.wArea.img .resize dt{ display:inline; font-weight:bold;}
-.wArea.img .resize dd{ display:inline; margin:0;}
-.wArea.img .resize .width{ width:60px; text-align:right; padding:1px 4px; height:16px;}
-.wArea.img .resize .width.original{ background:#d4d0c8;}
-.wArea.img .resize .resizeInfo{ margin:0 0 0 1em;}
-.wArea.img .resize .resizeError{ display:none; padding:.5em 3.5em; margin:1em 6px 1em 0; color:#ff6633; background:#fff url(../img/iconCheckSmall.gif) no-repeat 2em center;; border:1px solid #ddd;}
-.wArea.img .resize .resizeError.open{ display:block;}
-.wArea.img .align{ display:none;}
-.wArea.img .align dt{ display:inline; font-weight:bold;}
-.wArea.img .align dd{ display:inline; margin:0;}
-
-/* Writing Area File */
-.wArea.file .buttonFileUpload,
-.wArea.file .buttonFileUpload button{ position:relative; display:inline-block; height:39px; background-color:transparent; background-image:url(../img/buttonUpload.gif); background-repeat:no-repeat; cursor:pointer;}
-.wArea.file .buttonFileUpload{ background-position:left top;}
-.wArea.file .buttonFileUpload button{ left:7px; border:0; padding:0 15px 0 25px; background-position:right top; font-size:12px; font-weight:bold; color:#fff; line-height:39px; overflow:visible;}
-.wArea.file .buttonFileUpload .swfupload{ margin:0 !important; cursor:pointer;}
-.wArea.file .info{ font-size:11px; color:#737fa1;}
-.wArea.file .info .help{ position:relative; font-size:11px; border:0; background:none; padding:0; cursor:pointer; *zoom:1; color:#f66; overflow:visible;}
-.wArea.file .inputFile{ display:none;}
-.wArea.file .inputFile.open{ display:block;}
-.wArea.file dl{ margin:0; padding:0;}
-.wArea.file dd{ font-size:11px; margin-bottom:3px; margin:0;}
-.wArea.file dd strong{ margin-right:15px; color:#555; font-weight:normal;}
-.wArea.file dd em{ color:#767676; font-style:normal; margin-right:15px;}
-.wArea.file dd .buttonDelete{ border:0; padding:0; width:17px; height:17px; vertical-align:middle; cursor:pointer; background:url(../img/buttonTableDataX.gif) no-repeat center center;}
-.wArea.file dd .buttonDelete span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
-.wArea.file .summary{ text-align:right; font-size:11px;}
-.wArea.file .summary{ color:#555;}
-.wArea.file .summary em{ color:#767676; font-style:normal; margin-left:10px;}
-
-/* Writing Area Hr */
-.wArea.hr ul{ margin:0 0 20px 0; padding:0; list-style:none; font-size:12px; color:#555; *zoom:1;}
-.wArea.hr li{ position:relative; margin-bottom:10px; *zoom:1;}
-.wArea.hr li label{ position:relative; background:#f5f5f5; padding:0 15px 0 30px; margin-left:-30px; z-index:1; display:none;}
-.wArea.hr li .inputRadio{ position:relative; z-index:10; display:none;}
-.wArea.hr .inputToggle,
-.wArea.hr .inputContinue{ position:absolute; top:0; border:1px solid #ddd; font-size:12px; color:#767676; width:150px; padding:3px 4px; height:14px; text-align:right; background-image:url(../img/bgInputText.gif); background-repeat:no-repeat;}
-.wArea.hr .inputShow{ right:170px;}
-.wArea.hr .inputHide,
-.wArea.hr .inputContinue{ right:0;}
-.wArea.hr .hRule{ position:absolute; width:100%; top:50%; left:0; display:block; border-top:1px solid #e6e6e6; border-bottom:1px solid #fff; font-size:0; line-height:0; overflow:hidden; height:0;}
-
-/* Edit Area */
-.eArea{ position:relative; padding:0 20px; margin:0; font-size:12px; border:1px solid #fff; overflow:visible !important; _zoom:1;}
-.eArea.xe_dr_hr{ padding-top:1em; padding-bottom:1em;}
-.eArea a{ color:#648AB9;}
-.eArea button.holder{ position:absolute; left:-2000px; top:0px; }
-.eArea .eTool{ display:none;}
-.eArea .eFocusTrigger{ position:absolute; top:0; left:0; font-size:0; line-height:0; border:0; background:transparent; width:1px; height:1px; overflow:hidden; opacity:0; filter:alpha(opacity=0);}
-.eArea .eFocusTrigger:focus{ border:1px solid;}
-.eArea .del{ display:none; position:absolute; top:0; right:20px; border:0; padding:0; width:20px; height:20px; cursor:pointer; background:transparent url(../img/buttonTableDataX.gif) no-repeat center;}
-.eArea .del span{position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
-
-.eArea.xe_dr_img p{ overflow:hidden; width:100%;}
-.eArea.xe_dr_img p img{ *padding:1em 0;}
-
-.eFocus{ border:1px solid #d8d8de; z-index:999; background:#f9f9f9;}
-.eArea .cap{ display:none;}
-.eFocus .cap{ display:none; *display:block; position:absolute; width:10px; height:10px; background-repeat:no-repeat; font-size:0; line-height:0; overflow:hidden;}
-.eFocus .cap.capTL{ top:-1px; left:-1px; background-position:left top;}
-.eFocus .cap.capTR{ top:-1px; right:-1px; background-position:right top;}
-.eFocus .cap.capBL{ bottom:-1px; left:-1px; background-position:left bottom;}
-.eFocus .cap.capBR{ bottom:-1px; right:-1px; background-position:right bottom;}
-
-.eFocus .eTool{ display:block; height:24px; position:absolute !important; z-index:99; top:-24px !important; left:-1px !important; white-space:nowrap; margin:0 0 0 2px !important; padding:0 5px 0 0 !important; border:0 !important; background:url(../img/bgEtool.gif) no-repeat right top !important;}
-.eFocus .eTool li{ position:relative; left:-2px; display:block; float:left; height:22px; padding:2px 3px 0 5px; background:url(../img/vrContentNavigation.gif) no-repeat left center;}
-.eFocus .eTool li.edit{ background:url(../img/bgEtool.gif) no-repeat left top;}
-.eFocus .eTool li button{ border:0; padding:0; overflow:visible; cursor:pointer; background-color:transparent; font-size:11px; vertical-align:middle;}
-.eFocus .eTool li.move button,
-.eFocus .eTool li.delete button{ overflow:hidden; width:17px; height:17px; background-position:center center; background-repeat:no-repeat;}
-.eFocus .eTool li.move button{ background-image:url(../img/iconMovable.gif); cursor:move;}
-.eFocus .eTool li.delete button{ background-image:url(../img/buttonWasteBox.gif);}
-.eFocus .eTool li.move button span,
-.eFocus .eTool li.delete button span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
-.eFocus .del{ display:block;}
-
-/* txEditor */
-.txEditor{ position:relative; width:98%; padding-right:10px; margin-bottom:10px; border:1px solid #ddd; *zoom:1; background:#fff;}
-.txEditor .toolbar{ position:relative; z-index:10; margin:0 -10px 0 0; padding:6px 10px; list-style:none; *zoom:1; background:#fafafa; border-bottom:1px solid #ddd;}
-.txEditor .toolbar:after{ content:""; display:block; clear:both;}
-.txEditor .toolbar li{ position:relative; float:left; margin-right:5px;}
-.txEditor .toolbar li button{ border:0; padding:0; height:22px; background-color:transparent; background-image:url(../img/buttonEditorToolbar.gif); background-repeat:no-repeat; cursor:pointer; vertical-align:middle;}
-.txEditor .toolbar li button:hover,
-.txEditor .toolbar li button:active,
-.txEditor .toolbar li button:focus,
-.txEditor .toolbar li button.active{ border:1px solid #ddd;}
-.txEditor .toolbar li button span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
-.txEditor .toolbar li select{ font-size:12px; vertical-align:middle; height:21px;}
-.txEditor .toolbar li.undo button{ width:23px; background-position:center -210px;}
-.txEditor .toolbar li.redo button{ width:23px; background-position:center -240px;}
-.txEditor .toolbar li.strong button{ width:23px; background-position:center 0;}
-.txEditor .toolbar li.em button{ width:23px; background-position:center -30px;}
-.txEditor .toolbar li.underline button{ width:23px; background-position:center -60px;}
-.txEditor .toolbar li.del button{ width:23px; background-position:center -90px;}
-.txEditor .toolbar li.vRule{ padding-left:10px; margin:0 5px; background:url(../img/vrEditorToolbar.gif) no-repeat left center;}
-.txEditor .toolbar li.aHref button{ width:23px; background-position:center -120px;}
-.txEditor .toolbar li.fSize{ margin-right:5px;}
-.txEditor .toolbar li.fColor{ margin-right:5px; z-index:2;}
-.txEditor .toolbar li.fColor button{ width:28px; background-position:center -150px;}
-.txEditor .toolbar li.bgColor{ margin-right:5px; z-index:1;}
-.txEditor .toolbar li.bgColor button{ width:28px; background-position:center -180px;}
-.txEditor .toolbar li.left button{ width:23px; background-position:center -270px;}
-.txEditor .toolbar li.center button{ width:23px; background-position:center -300px;}
-.txEditor .toolbar li.right button{ width:23px; background-position:center -330px;}
-.txEditor .toolbar li.justify button{ width:23px; background-position:center -360px;}
-.txEditor .toolbar li.character button{ width:23px; background-position:center -390px;}
-.txEditor .toolbar li.list button{ width:23px; background-image:url(../img/buttonListToolbar.gif); background-repeat:no-repeat;}
-.txEditor .toolbar li.disc button{ background-position:center 0;}
-.txEditor .toolbar li.circle button{ background-position:center -30px;}
-.txEditor .toolbar li.square button{ background-position:center -60px;}
-.txEditor .toolbar li.decimal button{ background-position:center -90px;}
-.txEditor .toolbar li.alphaLower button{ background-position:center -120px;}
-.txEditor .toolbar li.alphaUpper button{ background-position:center -150px;}
-.txEditor .toolbar li.romanLower button{ background-position:center -180px;}
-.txEditor .toolbar li.romanUpper button{ background-position:center -210px;}
-.txEditor .toolbar li .uri{ display:none; position:absolute; left:10px; top:25px; padding:15px 20px; border:1px solid #ddd; background:#fff; *zoom:1; *white-space:nowrap;}
-.txEditor .toolbar li .uri h3{ font-size:12px; margin:0 0 .5em 0;}
-.txEditor .toolbar li .uri .link{ border:1px solid #ccc; padding:3px 4px; height:14px; font-size:12px; width:200px; font-size:11px; color:#666;}
-.txEditor .toolbar li .uri p{ margin:.5em 0;}
-.txEditor .toolbar li .uri p input{ width:13px; height:13px; margin:0 3px 0 0; vertical-align:middle;}
-.txEditor .toolbar li .uri .btn_area{ text-align:center;}
-.txEditor .toolbar li .uri .btn_area .buttonGray,
-.txEditor .toolbar li .uri .btn_area .buttonGray button{ background-image:url(../img/buttonGray.gif);}
-.txEditor .toolbar li .uri .btn_area .buttonGray{ background-position:left top;}
-.txEditor .toolbar li .uri .btn_area .buttonGray button{ background-position:right top; line-height:18px; border:0 !important; width:auto; padding:0 6px 0 4px;}
-.txEditor .toolbar li .palette{ display:none; width:211px; position:absolute; left:0; top:25px; padding:8px 0 7px 8px; margin:0; list-style:none; border:1px solid #ddd; background:#fff; *zoom:1;}
-.txEditor .toolbar li .palette:after{ content:""; display:block; clear:both;}
-.txEditor .toolbar li .palette.open{ display:block;}
-.txEditor .toolbar li .palette li{ float:left; margin:0 1px 1px 0; font-size:0; line-height:0;}
-.txEditor .toolbar li .palette button{ position:relative; overflow:hidden; width:11px; height:11px;}
-.txEditor .toolbar li .palette button span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
-.txEditor .inputRichText{ position:relative; margin-right:-10px; position:relative; *zoom:1; z-index:1; padding:3px 0 3px 3px; background-image:url(../img/bgInputText.gif); background-repeat:no-repeat; background-position:0 0;}
-.txEditor .inputRichText iframe{ width:100%; height:136px; border:0; overflow-x:hidden;}
-.txEditor .resizeVertical{ position:relative; margin-right:-10px; border-top:1px solid #ddd; height:10px; background:url(../img/buttonResizeVertical.gif) no-repeat center center; *zoom:1; font-size:0; line-height:0;}
-.txEditor .resizeVertical button{ width:100%; height:10px; border:0; margin:0; padding:0; background:transparent; cursor:n-resize; vertical-align:middle;}
-.txEditor .resizeVertical button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden; z-index:-1;}
-
-.txEditor .toolbar li.character .layer{ width:433px; height:242px; overflow:hidden; padding:0;}
-.txEditor .toolbar li.character .layer .close{ position:absolute; background:url(../img/buttonLayerClose.gif) no-repeat center; width:20px; height:21px; top:4px; right:3px; border:0 !important;}
-.txEditor .toolbar li.character .layer ul{ margin:0; padding:0; list-style:none;}
-.txEditor .toolbar li.character .layer h3{position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-.txEditor .toolbar li.character .layer .nav{ position:absolute; top:8px; left:-1px; overflow:hidden; white-space:nowrap; line-height:normal;}
-.txEditor .toolbar li.character .layer .nav li{ display:inline; margin:0 -4px 0 0; padding:0 8px; background:url(../img/vr_layer_character.gif) no-repeat 0 center;}
-.txEditor .toolbar li.character .layer .nav li a{ color:#444; text-decoration:none; letter-spacing:-1px;}
-.txEditor .toolbar li.character .layer .nav li a:hover,
-.txEditor .toolbar li.character .layer .nav li a:active,
-.txEditor .toolbar li.character .layer .nav li a:focus{ text-decoration:underline;}
-.txEditor .toolbar li.character .layer .nav li a.on{ font-weight:bold; color:#004790; display:inline;}
-.txEditor .toolbar li.character .layer .list{ position:absolute; left:7px; top:30px; width:421px; height:172px; background:url(../img/bx_character.gif) no-repeat;}
-.txEditor .toolbar li.character .layer .list li{ position:relative; top:1px; left:1px; float:left; width:20px; height:18px; margin:0 1px 1px 0;}
-.txEditor .toolbar li.character .layer .list li button{ width:20px; height:18px; background:none; padding:0; vertical-align:top;}
-.txEditor .toolbar li.character .layer .list li button:hover,
-.txEditor .toolbar li.character .layer .list li button:active,
-.txEditor .toolbar li.character .layer .list li button:focus{ border:2px solid #27c11a;}
-.txEditor .toolbar li.character .layer .list li button span{ overflow:visible; font-size:12px; width:auto; height:auto; position:relative; visibility:visible; line-height:normal; z-index:1;}
-.txEditor .toolbar li.character .layer p{ position:absolute; top:212px; left:7px; margin:0 !important;}
-.txEditor .toolbar li.character .layer p *{ vertical-align:top;}
-.txEditor .toolbar li.character .layer p label{ position:relative; top:4px; margin:0 7px 0 0; color:#333; letter-spacing:-1px; line-height:normal;}
-.txEditor .toolbar li.character .layer p input{ padding:3px 0 0 4px; margin:0 4px 0 0; width:300px; height:16px; border:1px solid #acacac; border-right:1px solid #dadada; border-bottom:1px solid #dadada; font-size:12px;}
-.txEditor .toolbar li.character .layer p button{ position:relative; *top:1px; width:38px; height:21px; background:url(../img/buttonLayerConfirm.gif) no-repeat; border:0 !important;}
-
-.txEditor .toolbar .font9px { font-size:9px }
-.txEditor .toolbar .font10px { font-size:10px }
-.txEditor .toolbar .font11px { font-size:11px }
-.txEditor .toolbar .font12px { font-size:12px }
-.txEditor .toolbar .font14px { font-size:14px }
-.txEditor .toolbar .font16px { font-size:16px }
-.txEditor .toolbar .font18px { font-size:18px }
-.txEditor .toolbar .font20px { font-size:20px }
-.txEditor .toolbar .font24px { font-size:24px }
-.txEditor .toolbar .font28px { font-size:28px }
-.txEditor .toolbar .font32px { font-size:32px }
-.txEditor .toolbar .font36px { font-size:36px }
-
-/* Drag and Drop */
-.xe_dr_placeholder { background-color:#F8F4CE; margin:5px 0; height:20px; padding:10px 0; z-index:0; -moz-border-radius:5px; -webkit-border-radius:5px; z-index:1; }
-.drag_handle { position:absolute; height:100%; width:10px; top:0; opacity:.5; filter:alpha(opacity=50); background:#ddd url(../img/iconDragHandler.gif) no-repeat center; cursor:n-resize; margin:0 2px !important; padding:0 !important; border:0 !important; _zoom:1;}
-.drag_handle.left { left:0; }
-.drag_handle.right { right:0; }
-.eArea .drag_handle {display:none}
-.eFocus .drag_handle {display:block}
+@charset "utf-8"; 
+/* NHN (developers@xpressengine.com) */
+
+/* Textyle Editor */
+.textyleEditor{ position:relative; *zoom:1; margin:0 0 1em 0;}
+.textyleEditor:after{ content:""; display:block; clear:both;} 
+.textyleEditor .editorContainer{ position:relative; width:100%; display:table; table-layout:fixed;}
+.textyleEditor .editorContainer .editorArea{ opacity:1; filter:alpha(opacity=100);}
+.textyleEditor .editorContainer .writeArea{ position:relative; *zoom:1;}
+
+/* Writing Toolbar */
+.wToolbarContainer{ position:relative; margin:20px 0 40px 0; height:62px; overflow:hidden; z-index:1000; _zoom:1;}
+.wToolbarContainer.more{ height:auto;}
+.wToolbar{ position:relative; height:62px; margin:0 10px; *zoom:1; background-image:url(../img/bgWritingToolbarCenter.gif); background-repeat:repeat-x; }
+.wToolbarContainer.more .wToolbar{ height:auto; padding:0 0 5px 0; background-position:0 bottom; border-top:1px solid #bec2ca;}
+.wToolbar .cap{ position:absolute; top:0; height:62px; background-repeat:no-repeat; font-size:0; line-height:0; background:url(../img/bgWritingToolbar.gif) no-repeat; z-index:1;}
+.wToolbar .top{ display:none; position:absolute; top:-1px; width:10px; height:7px; background:url(../img/bgWritingToolbarMore.gif) no-repeat; z-index:2;}
+.wToolbarContainer.more .cap{ height:100%; _top:auto; _bottom:0; _height:300px; background:url(../img/bgWritingToolbarMore.gif) no-repeat;}
+.wToolbarContainer.more .top{ display:block;}
+.wToolbar .capLeft{ width:10px; left:-10px; background-position:left top;}
+.wToolbar .topLeft{ left:-10px; background-position:left top;}
+.wToolbarContainer.more .cap.capLeft{ background-position:left bottom;}
+.wToolbar .capRight{ width:10px; right:-10px; background-position:right top;}
+.wToolbar .topRight{ right:-10px; background-position:right top;}
+.wToolbarContainer.more .capRight{ background-position:right bottom;}
+
+.wToolbar ul{ position:relative; margin:0 70px 0 0; padding:0; *zoom:1; height:58px; z-index:2;}
+.wToolbarContainer.more ul{ height:auto; _height:58px; background:url(../img/hrToolbarMore.gif);}
+.wToolbar ul:after{ content:""; display:block; clear:both;}
+.wToolbar li{ position:relative; float:left; list-style:none; margin-bottom:4px; width:11.1%; *width:11%; _margin-top:0; _margin-right:-1px;}
+.wToolbar li button{ position:relative; padding:0; width:100%; height:57px; *height:59px; border:0; background:transparent; cursor:pointer; font-size:11px; color:#44506a; background-image:url(../img/iconWritingToolbar.gif); background-repeat:no-repeat;}
+.wToolbar li button .tx{ display:inline-block; padding-top:37px; height:20px;}
+.wToolbar li.more{ float:none; position:absolute; top:1px; right:-70px; width:60px; background:url(../img/vrToolbarMore.gif) repeat-y; _zoom:1;}
+.wToolbar li.more button{ width:60px;}
+.wToolbarContainer.more li{ margin-bottom:0;}
+.wToolbarContainer.more li.more{ height:100%;}
+.wToolbarContainer.more li.more button{ height:100%; _height:114px; background:url(../img/iconWritingToolbarFolder.gif) no-repeat center !important;}
+.wToolbarContainer.more li.more button .nx{ top:0;}
+.wToolbar li.hover button{ background-color:#bfc3cb;}
+
+.wToolbar li.hx button{ background-position:center top;}
+.wToolbar li.txt button{ background-position:center -100px;}
+.wToolbar li.link button{ background-position:center -200px;}
+.wToolbar li.list button{ background-position:center -300px;}
+.wToolbar li.quote button{ background-position:center -400px;}
+.wToolbar li.img button{ background-position:center -500px;}
+.wToolbar li.movie button{ background-position:center -600px;}
+.wToolbar li.file button{ background-position:center -700px;}
+.wToolbar li.hr button{ background-position:center -800px;}
+.wToolbar li.index button{ background-position:center -900px;}
+.wToolbar li.material button{ background-position:center -1000px;}
+.wToolbar li.help button{ background-position:center -1100px;}
+.wToolbar li.more button{ background-position:center -1187px;}
+
+.wToolbar li .dragable{ position:absolute; display:none; bottom:38px; right:0; padding:0; border:0; width:20px; height:20px; overflow:hidden; background:url(../img/iconMovable.gif) no-repeat center center !important; cursor:move; font-size:0; line-height:0; text-indent:-200%;}
+.wToolbarContainer.more li.hover .dragable{ _display:block;}
+.wToolbarContainer.more li:hover .dragable{ display:block;}
+.wToolbar li .nx{ position:absolute; text-align:center; top:8px; left:50%; font:bold 10px Tahoma, Geneva, sans-serif; color:#fff; width:18px; height:18px; line-height:16px; opacity:.7; background:url(../img/bgShortcut.png) no-repeat center top; _background:none; _filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='./modules/editor/skins/dreditor/img/bgShortcut.png', sizingMethod='crop');}
+
+/* Writing Area + Material Area */
+.wArea,
+.mArea{ display:none; position:relative; *zoom:1; padding:20px; margin:0;}
+.wArea{ background:#f5f5f5; border:1px solid #e9e9e9;}
+.mArea{ background:url(../img/bgChess76.gif); border:1px solid #666;}
+.mArea{ margin:20px 0;}
+.wArea.open,
+.mArea.open{ display:block;}
+.wArea .cap,
+.mArea .cap{ position:absolute; width:10px; height:10px; background-repeat:no-repeat; font-size:0; line-height:0; overflow:hidden;}
+.wArea .cap{ background-image:url(../img/bgRouningF5.gif);}
+.mArea .cap{ background-image:url(../img/bgRouning76.gif);}
+.wArea .cap.capTL,
+.mArea .cap.capTL{ top:-1px; left:-1px; background-position:left top;}
+.wArea .cap.capTR,
+.mArea .cap.capTR{ top:-1px; right:-1px; background-position:right top;}
+.wArea .cap.capBL,
+.mArea .cap.capBL{ bottom:-1px; left:-1px; background-position:left bottom;}
+.wArea .cap.capBR,
+.mArea .cap.capBR{ bottom:-1px; right:-1px; background-position:right bottom;}
+.wArea .h4,
+.mArea .h4{ font-size:16px; margin:0 0 10px 0;}
+.wArea .h4{ color:#555;}
+.mArea .h4{ color:#fff;}
+.mArea .controls{ position:absolute; top:20px; right:20px;}
+
+/* Writing Area */
+.wArea .buttonArea{ position:relative; text-align:left; *zoom:1;}
+.wArea .buttonArea .buttonGray button{ _top:0;}
+.wArea .buttonArea .info{ display:inline; padding:0 0 0 15px; color:#777;}
+.wArea .inputTitle{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:14px; margin-bottom:10px;}
+.wArea .inputLink{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:11px; margin-bottom:10px;}
+.wArea .inputText{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:21px; font-size:12px; margin-bottom:10px;}
+.wArea .inputFile{ width:100%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:6px 0 0 10px; height:29px; font-size:12px; margin-bottom:10px;}
+.wArea .inputTextarea{ width:98%; border:1px solid #ddd; background:#fff url(../img/bgInputText.gif) no-repeat; color:#767676; padding:10px 0 0 10px; height:150px; font-size:12px; line-height:1.5; margin-bottom:10px;}
+.wArea .inputRadio{ width:13px; height:13px; vertical-align:middle;}
+.wArea .hr{ border-top:1px solid #e6e6e6; border-bottom:1px solid #fff; font-size:0; line-height:0; overflow:hidden; height:0; margin:15px -20px;}
+
+/* Material Area */
+.mArea .reload{ position:absolute; top:24px; right:40px; width:15px; height:16px; padding:0; cursor:pointer; border:0; *margin:0 5px 0 0; background:transparent url(../img/buttonRefresh.gif) no-repeat; vertical-align:middle;}
+.mArea .reload span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
+.mArea .close{ position:absolute; top:24px; right:20px; width:15px; height:16px; padding:0; cursor:pointer; border:0; *margin:0 5px 0 0; background:transparent url(../img/buttonClose.gif) no-repeat; vertical-align:middle;}
+.mArea .close span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; z-index:-1; visibility:hidden;}
+.mArea .noData{ position:relative; border-top:1px solid #ddd; border-bottom:1px solid #ddd; background:#fff; padding:10px 20px;}
+.mArea dl{ position:relative; background:#fff;}
+.mArea dt{ position:relative; padding:7px 15px; font-weight:bold; color:#fff; background:#555; border-top:1px solid #444;}
+.mArea dd{ margin:0 15px; padding:5px 0;}
+.mArea dd .buttonDrEditor{ position:absolute; top:8px; right:10px;}
+.mArea .eArea{ border:0; padding:0;}
+
+.mArea .paginate{ position:relative; width:100px; margin:0 auto; text-align:center; padding:0; font-size:12px; color:#fff; *zoom:1;}
+.mArea .paginate:after{ content:""; display:block; clear:both;}
+.mArea .paginate button{ width:17px; height:17px; padding:0; background:transparent url(../img/buttonPaginate.gif) no-repeat 0 0; cursor:pointer; border:0; vertical-align:middle;}
+.mArea .paginate button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden; z-index:-1;}
+.mArea .paginate .prev{ float:left; background-position:left top;}
+.mArea .paginate .next{ float:right; background-position:right top;}
+
+/* Writing Area Blank */
+.editorArea .wArea { display:block;}
+.wArea.blank{ padding:15px 30px; margin:0;}
+.wArea.blank dt{ font-size:12px; font-weight:bold; color:#333;}
+.wArea.blank dd{ margin:0 0 5px 0; color:#767676;}
+.wArea.blank .drEditorBugReport{ position:absolute; margin:0 !important; top:20px; right:30px;}
+
+/* Writing Area Hx */
+.wArea.hx ul{ margin:0 0 5px 0; padding:0; list-style:none;}
+.wArea.hx li{ display:inline !important; font-weight:bold !important; color:#333 !important;}
+.wArea.hx li label{ margin-right:30px;}
+.wArea.hx .inputTitle{ font-weight:bold !important;}
+.wArea.hx li.h3,
+.wArea.hx .inputTitle.h3{ font-size:18px !important; height:28px;}
+.wArea.hx li.h4,
+.wArea.hx .inputTitle.h4{ font-size:16px !important; height:26px;}
+.wArea.hx li.h5,
+.wArea.hx .inputTitle.h5{ font-size:13px !important; height:23px;}
+
+/* Writing Area List */
+.wArea.list .toolbar{ border:1px solid #ddd; list-style:none; margin:0 0 -1px 0; padding:0; background:#fafafa; padding:6px 20px;}
+.wArea.list .toolbar li{ display:inline; margin-right:5px;}
+.wArea.list .toolbar li button{ position:relative; width:23px; height:22px; padding:0; border:0; cursor:pointer; background-image:url(../img/buttonListToolbar.gif); background-repeat:no-repeat;}
+.wArea.list .toolbar li button:hover,
+.wArea.list .toolbar li button:active,
+.wArea.list .toolbar li button:focus{ border:1px solid #ddd;}
+.wArea.list .toolbar li button.type_disc{ background-position:center 0;}
+.wArea.list .toolbar li button.type_circle{ background-position:center -30px;}
+.wArea.list .toolbar li button.type_square{ background-position:center -60px;}
+.wArea.list .toolbar li button.type_decimal{ background-position:center -90px;}
+.wArea.list .toolbar li button.type_lower-alpha{ background-position:center -120px;}
+.wArea.list .toolbar li button.type_upper-alpha{ background-position:center -150px;}
+.wArea.list .toolbar li button.type_lower-roman{ background-position:center -180px;}
+.wArea.list .toolbar li button.type_upper-roman{ background-position:center -210px;}
+.wArea.list .toolbar li button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden;}
+
+.wArea.list .listArea{ padding:1em 0; margin-bottom:1em; background:#fff url(../img/bgInputText.gif) no-repeat; border:1px solid #ddd;}
+.wArea.list .listArea ul{ border:0;}
+.wArea.list .listArea input{ border:0; border-bottom:1px solid #ddd; background:transparent; width:96%; padding:3px 4px;}
+
+/* Writing Area Image */
+.wArea.img .image{ position:relative; margin-bottom:10px; background:#fff; padding:0; _width:100%; overflow:hidden;}
+.wArea.img .image img{ max-width:100%;}
+.wArea.img .uploading{ display:none; padding:0 0 0 20px; background:url(../img/iconLoading.gif) no-repeat left center;}
+.wArea.img .uploading button{ border:2px solid #ccc; background:#eee; cursor:pointer; font-size:11px; font-weight:bold; padding:0; overflow:visible; vertical-align:middle; margin:0 10px;}
+.wArea.img .info{ font-size:11px; color:#737fa1; margin:0;}
+.wArea.img .resize{ display:none;}
+.wArea.img .resize.open{ display:block;}
+.wArea.img .resize dl *{ vertical-align:middle;}
+.wArea.img .resize dt{ display:inline; font-weight:bold;}
+.wArea.img .resize dd{ display:inline; margin:0;}
+.wArea.img .resize .width{ width:60px; text-align:right; padding:1px 4px; height:16px;}
+.wArea.img .resize .width.original{ background:#d4d0c8;}
+.wArea.img .resize .resizeInfo{ margin:0 0 0 1em;}
+.wArea.img .resize .resizeError{ display:none; padding:.5em 3.5em; margin:1em 6px 1em 0; color:#ff6633; background:#fff url(../img/iconCheckSmall.gif) no-repeat 2em center;; border:1px solid #ddd;}
+.wArea.img .resize .resizeError.open{ display:block;}
+.wArea.img .align{ display:none;}
+.wArea.img .align dt{ display:inline; font-weight:bold;}
+.wArea.img .align dd{ display:inline; margin:0;}
+
+/* Writing Area File */
+.wArea.file .buttonFileUpload,
+.wArea.file .buttonFileUpload button{ position:relative; display:inline-block; height:39px; background-color:transparent; background-image:url(../img/buttonUpload.gif); background-repeat:no-repeat; cursor:pointer;}
+.wArea.file .buttonFileUpload{ background-position:left top;}
+.wArea.file .buttonFileUpload button{ left:7px; border:0; padding:0 15px 0 25px; background-position:right top; font-size:12px; font-weight:bold; color:#fff; line-height:39px; overflow:visible;}
+.wArea.file .buttonFileUpload .swfupload{ margin:0 !important; cursor:pointer;}
+.wArea.file .info{ font-size:11px; color:#737fa1;}
+.wArea.file .info .help{ position:relative; font-size:11px; border:0; background:none; padding:0; cursor:pointer; *zoom:1; color:#f66; overflow:visible;}
+.wArea.file .inputFile{ display:none;}
+.wArea.file .inputFile.open{ display:block;}
+.wArea.file dl{ margin:0; padding:0;}
+.wArea.file dd{ font-size:11px; margin-bottom:3px; margin:0;}
+.wArea.file dd strong{ margin-right:15px; color:#555; font-weight:normal;}
+.wArea.file dd em{ color:#767676; font-style:normal; margin-right:15px;}
+.wArea.file dd .buttonDelete{ border:0; padding:0; width:17px; height:17px; vertical-align:middle; cursor:pointer; background:url(../img/buttonTableDataX.gif) no-repeat center center;}
+.wArea.file dd .buttonDelete span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+.wArea.file .summary{ text-align:right; font-size:11px;}
+.wArea.file .summary{ color:#555;}
+.wArea.file .summary em{ color:#767676; font-style:normal; margin-left:10px;}
+
+/* Writing Area Hr */
+.wArea.hr ul{ margin:0 0 20px 0; padding:0; list-style:none; font-size:12px; color:#555; *zoom:1;}
+.wArea.hr li{ position:relative; margin-bottom:10px; *zoom:1;}
+.wArea.hr li label{ position:relative; background:#f5f5f5; padding:0 15px 0 30px; margin-left:-30px; z-index:1; display:none;}
+.wArea.hr li .inputRadio{ position:relative; z-index:10; display:none;}
+.wArea.hr .inputToggle,
+.wArea.hr .inputContinue{ position:absolute; top:0; border:1px solid #ddd; font-size:12px; color:#767676; width:150px; padding:3px 4px; height:14px; text-align:right; background-image:url(../img/bgInputText.gif); background-repeat:no-repeat;}
+.wArea.hr .inputShow{ right:170px;}
+.wArea.hr .inputHide,
+.wArea.hr .inputContinue{ right:0;}
+.wArea.hr .hRule{ position:absolute; width:100%; top:50%; left:0; display:block; border-top:1px solid #e6e6e6; border-bottom:1px solid #fff; font-size:0; line-height:0; overflow:hidden; height:0;}
+
+/* Edit Area */
+.eArea{ position:relative; padding:0 20px; margin:0; font-size:12px; border:1px solid #fff; overflow:visible !important; _zoom:1;}
+.eArea.xe_dr_hr{ padding-top:1em; padding-bottom:1em;}
+.eArea a{ color:#648AB9;}
+.eArea button.holder{ position:absolute; left:-2000px; top:0px; }
+.eArea .eTool{ display:none;}
+.eArea .eFocusTrigger{ position:absolute; top:0; left:0; font-size:0; line-height:0; border:0; background:transparent; width:1px; height:1px; overflow:hidden; opacity:0; filter:alpha(opacity=0);}
+.eArea .eFocusTrigger:focus{ border:1px solid;}
+.eArea .del{ display:none; position:absolute; top:0; right:20px; border:0; padding:0; width:20px; height:20px; cursor:pointer; background:transparent url(../img/buttonTableDataX.gif) no-repeat center;}
+.eArea .del span{position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+
+.eArea.xe_dr_img p{ overflow:hidden; width:100%;}
+.eArea.xe_dr_img p img{ *padding:1em 0;}
+
+.eFocus{ border:1px solid #d8d8de; z-index:999; background:#f9f9f9;}
+.eArea .cap{ display:none;}
+.eFocus .cap{ display:none; *display:block; position:absolute; width:10px; height:10px; background-repeat:no-repeat; font-size:0; line-height:0; overflow:hidden;}
+.eFocus .cap.capTL{ top:-1px; left:-1px; background-position:left top;}
+.eFocus .cap.capTR{ top:-1px; right:-1px; background-position:right top;}
+.eFocus .cap.capBL{ bottom:-1px; left:-1px; background-position:left bottom;}
+.eFocus .cap.capBR{ bottom:-1px; right:-1px; background-position:right bottom;}
+
+.eFocus .eTool{ display:block; height:24px; position:absolute !important; z-index:99; top:-24px !important; left:-1px !important; white-space:nowrap; margin:0 0 0 2px !important; padding:0 5px 0 0 !important; border:0 !important; background:url(../img/bgEtool.gif) no-repeat right top !important;}
+.eFocus .eTool li{ position:relative; left:-2px; display:block; float:left; height:22px; padding:2px 3px 0 5px; background:url(../img/vrContentNavigation.gif) no-repeat left center;}
+.eFocus .eTool li.edit{ background:url(../img/bgEtool.gif) no-repeat left top;}
+.eFocus .eTool li button{ border:0; padding:0; overflow:visible; cursor:pointer; background-color:transparent; font-size:11px; vertical-align:middle;}
+.eFocus .eTool li.move button,
+.eFocus .eTool li.delete button{ overflow:hidden; width:17px; height:17px; background-position:center center; background-repeat:no-repeat;}
+.eFocus .eTool li.move button{ background-image:url(../img/iconMovable.gif); cursor:move;}
+.eFocus .eTool li.delete button{ background-image:url(../img/buttonWasteBox.gif);}
+.eFocus .eTool li.move button span,
+.eFocus .eTool li.delete button span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+.eFocus .del{ display:block;}
+
+/* txEditor */
+.txEditor{ position:relative; width:98%; padding-right:10px; margin-bottom:10px; border:1px solid #ddd; *zoom:1; background:#fff;}
+.txEditor .toolbar{ position:relative; z-index:10; margin:0 -10px 0 0; padding:6px 10px; list-style:none; *zoom:1; background:#fafafa; border-bottom:1px solid #ddd;}
+.txEditor .toolbar:after{ content:""; display:block; clear:both;}
+.txEditor .toolbar li{ position:relative; float:left; margin-right:5px;}
+.txEditor .toolbar li button{ border:0; padding:0; height:22px; background-color:transparent; background-image:url(../img/buttonEditorToolbar.gif); background-repeat:no-repeat; cursor:pointer; vertical-align:middle;}
+.txEditor .toolbar li button:hover,
+.txEditor .toolbar li button:active,
+.txEditor .toolbar li button:focus,
+.txEditor .toolbar li button.active{ border:1px solid #ddd;}
+.txEditor .toolbar li button span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+.txEditor .toolbar li select{ font-size:12px; vertical-align:middle; height:21px;}
+.txEditor .toolbar li.undo button{ width:23px; background-position:center -210px;}
+.txEditor .toolbar li.redo button{ width:23px; background-position:center -240px;}
+.txEditor .toolbar li.strong button{ width:23px; background-position:center 0;}
+.txEditor .toolbar li.em button{ width:23px; background-position:center -30px;}
+.txEditor .toolbar li.underline button{ width:23px; background-position:center -60px;}
+.txEditor .toolbar li.del button{ width:23px; background-position:center -90px;}
+.txEditor .toolbar li.vRule{ padding-left:10px; margin:0 5px; background:url(../img/vrEditorToolbar.gif) no-repeat left center;}
+.txEditor .toolbar li.aHref button{ width:23px; background-position:center -120px;}
+.txEditor .toolbar li.fSize{ margin-right:5px;}
+.txEditor .toolbar li.fColor{ margin-right:5px; z-index:2;}
+.txEditor .toolbar li.fColor button{ width:28px; background-position:center -150px;}
+.txEditor .toolbar li.bgColor{ margin-right:5px; z-index:1;}
+.txEditor .toolbar li.bgColor button{ width:28px; background-position:center -180px;}
+.txEditor .toolbar li.left button{ width:23px; background-position:center -270px;}
+.txEditor .toolbar li.center button{ width:23px; background-position:center -300px;}
+.txEditor .toolbar li.right button{ width:23px; background-position:center -330px;}
+.txEditor .toolbar li.justify button{ width:23px; background-position:center -360px;}
+.txEditor .toolbar li.character button{ width:23px; background-position:center -390px;}
+.txEditor .toolbar li.list button{ width:23px; background-image:url(../img/buttonListToolbar.gif); background-repeat:no-repeat;}
+.txEditor .toolbar li.disc button{ background-position:center 0;}
+.txEditor .toolbar li.circle button{ background-position:center -30px;}
+.txEditor .toolbar li.square button{ background-position:center -60px;}
+.txEditor .toolbar li.decimal button{ background-position:center -90px;}
+.txEditor .toolbar li.alphaLower button{ background-position:center -120px;}
+.txEditor .toolbar li.alphaUpper button{ background-position:center -150px;}
+.txEditor .toolbar li.romanLower button{ background-position:center -180px;}
+.txEditor .toolbar li.romanUpper button{ background-position:center -210px;}
+.txEditor .toolbar li .uri{ display:none; position:absolute; left:10px; top:25px; padding:15px 20px; border:1px solid #ddd; background:#fff; *zoom:1; *white-space:nowrap;}
+.txEditor .toolbar li .uri h3{ font-size:12px; margin:0 0 .5em 0;}
+.txEditor .toolbar li .uri .link{ border:1px solid #ccc; padding:3px 4px; height:14px; font-size:12px; width:200px; font-size:11px; color:#666;}
+.txEditor .toolbar li .uri p{ margin:.5em 0;}
+.txEditor .toolbar li .uri p input{ width:13px; height:13px; margin:0 3px 0 0; vertical-align:middle;}
+.txEditor .toolbar li .uri .btn_area{ text-align:center;}
+.txEditor .toolbar li .uri .btn_area .buttonGray,
+.txEditor .toolbar li .uri .btn_area .buttonGray button{ background-image:url(../img/buttonGray.gif);}
+.txEditor .toolbar li .uri .btn_area .buttonGray{ background-position:left top;}
+.txEditor .toolbar li .uri .btn_area .buttonGray button{ background-position:right top; line-height:18px; border:0 !important; width:auto; padding:0 6px 0 4px;}
+.txEditor .toolbar li .palette{ display:none; width:211px; position:absolute; left:0; top:25px; padding:8px 0 7px 8px; margin:0; list-style:none; border:1px solid #ddd; background:#fff; *zoom:1;}
+.txEditor .toolbar li .palette:after{ content:""; display:block; clear:both;}
+.txEditor .toolbar li .palette.open{ display:block;}
+.txEditor .toolbar li .palette li{ float:left; margin:0 1px 1px 0; font-size:0; line-height:0;}
+.txEditor .toolbar li .palette button{ position:relative; overflow:hidden; width:11px; height:11px;}
+.txEditor .toolbar li .palette button span{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0; z-index:-1; visibility:hidden;}
+.txEditor .inputRichText{ position:relative; margin-right:-10px; position:relative; *zoom:1; z-index:1; padding:3px 0 3px 3px; background-image:url(../img/bgInputText.gif); background-repeat:no-repeat; background-position:0 0;}
+.txEditor .inputRichText iframe{ width:100%; height:136px; border:0; overflow-x:hidden;}
+.txEditor .resizeVertical{ position:relative; margin-right:-10px; border-top:1px solid #ddd; height:10px; background:url(../img/buttonResizeVertical.gif) no-repeat center center; *zoom:1; font-size:0; line-height:0;}
+.txEditor .resizeVertical button{ width:100%; height:10px; border:0; margin:0; padding:0; background:transparent; cursor:n-resize; vertical-align:middle;}
+.txEditor .resizeVertical button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden; z-index:-1;}
+
+.txEditor .toolbar li.character .layer{ width:433px; height:242px; overflow:hidden; padding:0;}
+.txEditor .toolbar li.character .layer .close{ position:absolute; background:url(../img/buttonLayerClose.gif) no-repeat center; width:20px; height:21px; top:4px; right:3px; border:0 !important;}
+.txEditor .toolbar li.character .layer ul{ margin:0; padding:0; list-style:none;}
+.txEditor .toolbar li.character .layer h3{position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
+.txEditor .toolbar li.character .layer .nav{ position:absolute; top:8px; left:-1px; overflow:hidden; white-space:nowrap; line-height:normal;}
+.txEditor .toolbar li.character .layer .nav li{ display:inline; margin:0 -4px 0 0; padding:0 8px; background:url(../img/vr_layer_character.gif) no-repeat 0 center;}
+.txEditor .toolbar li.character .layer .nav li a{ color:#444; text-decoration:none; letter-spacing:-1px;}
+.txEditor .toolbar li.character .layer .nav li a:hover,
+.txEditor .toolbar li.character .layer .nav li a:active,
+.txEditor .toolbar li.character .layer .nav li a:focus{ text-decoration:underline;}
+.txEditor .toolbar li.character .layer .nav li a.on{ font-weight:bold; color:#004790; display:inline;}
+.txEditor .toolbar li.character .layer .list{ position:absolute; left:7px; top:30px; width:421px; height:172px; background:url(../img/bx_character.gif) no-repeat;}
+.txEditor .toolbar li.character .layer .list li{ position:relative; top:1px; left:1px; float:left; width:20px; height:18px; margin:0 1px 1px 0;}
+.txEditor .toolbar li.character .layer .list li button{ width:20px; height:18px; background:none; padding:0; vertical-align:top;}
+.txEditor .toolbar li.character .layer .list li button:hover,
+.txEditor .toolbar li.character .layer .list li button:active,
+.txEditor .toolbar li.character .layer .list li button:focus{ border:2px solid #27c11a;}
+.txEditor .toolbar li.character .layer .list li button span{ overflow:visible; font-size:12px; width:auto; height:auto; position:relative; visibility:visible; line-height:normal; z-index:1;}
+.txEditor .toolbar li.character .layer p{ position:absolute; top:212px; left:7px; margin:0 !important;}
+.txEditor .toolbar li.character .layer p *{ vertical-align:top;}
+.txEditor .toolbar li.character .layer p label{ position:relative; top:4px; margin:0 7px 0 0; color:#333; letter-spacing:-1px; line-height:normal;}
+.txEditor .toolbar li.character .layer p input{ padding:3px 0 0 4px; margin:0 4px 0 0; width:300px; height:16px; border:1px solid #acacac; border-right:1px solid #dadada; border-bottom:1px solid #dadada; font-size:12px;}
+.txEditor .toolbar li.character .layer p button{ position:relative; *top:1px; width:38px; height:21px; background:url(../img/buttonLayerConfirm.gif) no-repeat; border:0 !important;}
+
+.txEditor .toolbar .font9px { font-size:9px }
+.txEditor .toolbar .font10px { font-size:10px }
+.txEditor .toolbar .font11px { font-size:11px }
+.txEditor .toolbar .font12px { font-size:12px }
+.txEditor .toolbar .font14px { font-size:14px }
+.txEditor .toolbar .font16px { font-size:16px }
+.txEditor .toolbar .font18px { font-size:18px }
+.txEditor .toolbar .font20px { font-size:20px }
+.txEditor .toolbar .font24px { font-size:24px }
+.txEditor .toolbar .font28px { font-size:28px }
+.txEditor .toolbar .font32px { font-size:32px }
+.txEditor .toolbar .font36px { font-size:36px }
+
+/* Drag and Drop */
+.xe_dr_placeholder { background-color:#F8F4CE; margin:5px 0; height:20px; padding:10px 0; z-index:0; -moz-border-radius:5px; -webkit-border-radius:5px; z-index:1; }
+.drag_handle { position:absolute; height:100%; width:10px; top:0; opacity:.5; filter:alpha(opacity=50); background:#ddd url(../img/iconDragHandler.gif) no-repeat center; cursor:n-resize; margin:0 2px !important; padding:0 !important; border:0 !important; _zoom:1;}
+.drag_handle.left { left:0; }
+.drag_handle.right { right:0; }
+.eArea .drag_handle {display:none}
+.eFocus .drag_handle {display:block}
 .editorContainer .ui-draggable{ margin:0 0 3em 0 !important;}
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/css/editor.css b/modules/editor/skins/dreditor/css/editor.css
index c02b4ad4b..a44bc1bfe 100644
--- a/modules/editor/skins/dreditor/css/editor.css
+++ b/modules/editor/skins/dreditor/css/editor.css
@@ -1,6 +1,6 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-html, body { height:100%; background-color:transparent; padding:0; margin:0;}
-body{ margin:1em;}
-.xe_content{ color:#000; font-size:12px; line-height:1.5;}
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+
+html, body { height:100%; background-color:transparent; padding:0; margin:0;}
+body{ margin:1em;}
+.xe_content{ color:#000; font-size:12px; line-height:1.5;}
diff --git a/modules/editor/skins/dreditor/css/style@content.css b/modules/editor/skins/dreditor/css/style@content.css
index 16a486ed2..01c649ce1 100644
--- a/modules/editor/skins/dreditor/css/style@content.css
+++ b/modules/editor/skins/dreditor/css/style@content.css
@@ -1,52 +1,52 @@
-@charset "utf-8"; 
-/* NHN (developers@xpressengine.com) */
-
-/* textyleContent */
-.textyleContent{ font-size:12px; line-height:1.6; clear:both;}
-.textyleContent h1{ font-size:24px;}
-.textyleContent h2{ font-size:20px;}
-.textyleContent h3{ font-size:18px;}
-.textyleContent h4{ font-size:16px;}
-.textyleContent h5{ font-size:14px;}
-.textyleContent h6{ font-size:12px;}
-
-/* Attached File */
-.textyleContent dl.attachedFile { margin:1em 0; padding:1em 0; background:#f9f9f9; border:1px solid #eee; }
-.textyleContent dl.attachedFile dt { padding:0 2em .5em 2em; margin:0 0 1em 0; font-weight:bold; text-indent:1em; border-bottom:1px solid #eee; background:#f9f9f9 url(../img/iconClip.gif) no-repeat 2em .3em; font-size:12px;}
-.textyleContent dl.attachedFile em{ font-size:11px; font-weight:normal; font-style:normal; margin:0 5px;}
-.textyleContent dl.attachedFile dd{ margin:0; padding:0 2em; color:#8b8b8b; font-size:11px;}
-.textyleContent dl.attachedFile dd a{ text-decoration:none; color:#0092cf; margin-right:10px;}
-.textyleContent dl.attachedFile dd a:hover,
-.textyleContent dl.attachedFile dd a:active,
-.textyleContent dl.attachedFile dd a:focus{ text-decoration:underline;}
-
-/* Table Of Content */
-.textyleContent .toc{ background:#fff; border:1px solid #ddd; font-size:14px; line-height:1.6; margin:1em 0; padding:15px;}
-.textyleContent .toc li{ font-weight:bold; color:#555; margin-left:35px;}
-.textyleContent .toc li.toc3{}
-.textyleContent .toc li.toc4{ margin-left:55px;}
-.textyleContent .toc li.toc5{ margin-left:75px;}
-.textyleContent .toc li a{ color:#648ab9; text-decoration:none; font-weight:normal;}
-.textyleContent .toc li a:hover,
-.textyleContent .toc li a:active,
-.textyleContent .toc li a:focus{ text-decoration:underline;}
-
-/* Object */
-.textyleContent object,
-.textyleContent embed{ margin:1em 0;}
-
-/* Horizontal Rule */
-.textyleContent hr{ display:block; position:static; border-bottom:0; height:1px; overflow:hidden; color:#e2e2e2; clear:both;}
-
-/* Blockquote */
-.textyleContent blockquote{ margin-left:0; margin-right:0; padding:1em 40px; background:#f6f6f6 url(../img/bgBlockquote.gif) no-repeat 20px 1.5em; -moz-border-radius:5px; -webkit-border-radius:5px; }
-
-/* Cite */
-.textyleContent cite{ display:block; margin:1em 0;}
-
-/* Link */
-.textyleContent .xe_dr_link p strong{ display:block;}
-
-/* P */
-.xe_content p,
-.textyleContent p{ margin:1em 0 !important;}
+@charset "utf-8"; 
+/* NHN (developers@xpressengine.com) */
+
+/* textyleContent */
+.textyleContent{ font-size:12px; line-height:1.6; clear:both;}
+.textyleContent h1{ font-size:24px;}
+.textyleContent h2{ font-size:20px;}
+.textyleContent h3{ font-size:18px;}
+.textyleContent h4{ font-size:16px;}
+.textyleContent h5{ font-size:14px;}
+.textyleContent h6{ font-size:12px;}
+
+/* Attached File */
+.textyleContent dl.attachedFile { margin:1em 0; padding:1em 0; background:#f9f9f9; border:1px solid #eee; }
+.textyleContent dl.attachedFile dt { padding:0 2em .5em 2em; margin:0 0 1em 0; font-weight:bold; text-indent:1em; border-bottom:1px solid #eee; background:#f9f9f9 url(../img/iconClip.gif) no-repeat 2em .3em; font-size:12px;}
+.textyleContent dl.attachedFile em{ font-size:11px; font-weight:normal; font-style:normal; margin:0 5px;}
+.textyleContent dl.attachedFile dd{ margin:0; padding:0 2em; color:#8b8b8b; font-size:11px;}
+.textyleContent dl.attachedFile dd a{ text-decoration:none; color:#0092cf; margin-right:10px;}
+.textyleContent dl.attachedFile dd a:hover,
+.textyleContent dl.attachedFile dd a:active,
+.textyleContent dl.attachedFile dd a:focus{ text-decoration:underline;}
+
+/* Table Of Content */
+.textyleContent .toc{ background:#fff; border:1px solid #ddd; font-size:14px; line-height:1.6; margin:1em 0; padding:15px;}
+.textyleContent .toc li{ font-weight:bold; color:#555; margin-left:35px;}
+.textyleContent .toc li.toc3{}
+.textyleContent .toc li.toc4{ margin-left:55px;}
+.textyleContent .toc li.toc5{ margin-left:75px;}
+.textyleContent .toc li a{ color:#648ab9; text-decoration:none; font-weight:normal;}
+.textyleContent .toc li a:hover,
+.textyleContent .toc li a:active,
+.textyleContent .toc li a:focus{ text-decoration:underline;}
+
+/* Object */
+.textyleContent object,
+.textyleContent embed{ margin:1em 0;}
+
+/* Horizontal Rule */
+.textyleContent hr{ display:block; position:static; border-bottom:0; height:1px; overflow:hidden; color:#e2e2e2; clear:both;}
+
+/* Blockquote */
+.textyleContent blockquote{ margin-left:0; margin-right:0; padding:1em 40px; background:#f6f6f6 url(../img/bgBlockquote.gif) no-repeat 20px 1.5em; -moz-border-radius:5px; -webkit-border-radius:5px; }
+
+/* Cite */
+.textyleContent cite{ display:block; margin:1em 0;}
+
+/* Link */
+.textyleContent .xe_dr_link p strong{ display:block;}
+
+/* P */
+.xe_content p,
+.textyleContent p{ margin:1em 0 !important;}
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/info.xml b/modules/editor/skins/dreditor/drcomponents/fold/info.xml
index 452ce7f3a..792d44413 100644
--- a/modules/editor/skins/dreditor/drcomponents/fold/info.xml
+++ b/modules/editor/skins/dreditor/drcomponents/fold/info.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component name="fold">
-    <title xml:lang="ko">접기</title>
-    <title xml:lang="en">Fold</title>
-	<title xml:lang="vi">Co giãn</title>
-    <title xml:lang="zh-TW">摺疊</title>
-    <title xml:lang="tr">Katla</title>
-    <description xml:lang="ko">접고 펼치는 블럭을 추가할 수 있습니다.</description>
-    <description xml:lang="en">create a new foldable paragraph</description>
-	<description xml:lang="vi">Chức năng này sẽ giúp bạn tạo một đoạn văn bản tự động co giãn khi đưa chuột tới.</description>
-    <description xml:lang="zh-TW">新增一個可展開與摺疊的段落。</description>
-    <description xml:lang="tr">Yeni bir katlanabilir paragraf oluştur</description>
-    <date>2010-01-22</date>
-    <version>0.2</version>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-		<name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</component>
+<?xml version="1.0" encoding="utf-8"?>
+<component name="fold">
+    <title xml:lang="ko">접기</title>
+    <title xml:lang="en">Fold</title>
+	<title xml:lang="vi">Co giãn</title>
+    <title xml:lang="zh-TW">摺疊</title>
+    <title xml:lang="tr">Katla</title>
+    <description xml:lang="ko">접고 펼치는 블럭을 추가할 수 있습니다.</description>
+    <description xml:lang="en">Create a new foldable paragraph</description>
+	<description xml:lang="vi">Chức năng này sẽ giúp bạn tạo một đoạn văn bản tự động co giãn khi đưa chuột tới.</description>
+    <description xml:lang="zh-TW">新增一個可展開與摺疊的段落。</description>
+    <description xml:lang="tr">Yeni bir katlanabilir paragraf oluştur</description>
+    <date>2010-01-22</date>
+    <version>0.2</version>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+		<name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</component>
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/lang/en.lang.php b/modules/editor/skins/dreditor/drcomponents/fold/lang/en.lang.php
deleted file mode 100644
index df7f97cb5..000000000
--- a/modules/editor/skins/dreditor/drcomponents/fold/lang/en.lang.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?PHP
-	$lang->edit->fold = 'Fold';
-	$lang->edit->fold_default = 'More..|Less..';
-	$lang->edit->fold_description = '\'More|Less\'와 같이 입력해주세요.';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/lang/ko.lang.php b/modules/editor/skins/dreditor/drcomponents/fold/lang/ko.lang.php
deleted file mode 100644
index 340ee660b..000000000
--- a/modules/editor/skins/dreditor/drcomponents/fold/lang/ko.lang.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?PHP
-	$lang->edit->fold = '접기';
-	$lang->edit->fold_default = '펼치기..|접기..';
-	$lang->edit->fold_description = '\'펼치기|접기\'와 같이 입력해주세요.';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/lang/lang.xml b/modules/editor/skins/dreditor/drcomponents/fold/lang/lang.xml
new file mode 100644
index 000000000..6533265d3
--- /dev/null
+++ b/modules/editor/skins/dreditor/drcomponents/fold/lang/lang.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="edit">
+		<item name="fold">
+			<value xml:lang="ko"><![CDATA[접기]]></value>
+			<value xml:lang="en"><![CDATA[Fold]]></value>
+			<value xml:lang="jp"><![CDATA[畳む]]></value>
+			<value xml:lang="zh-TW"><![CDATA[摺疊]]></value>
+			<value xml:lang="tr"><![CDATA[Katla]]></value>
+			<value xml:lang="vi"><![CDATA[Co giãn]]></value>
+		</item>
+		<item name="fold_default">
+			<value xml:lang="ko"><![CDATA[펼치기..|접기..]]></value>
+			<value xml:lang="en"><![CDATA[More..|Less..]]></value>
+			<value xml:lang="jp"><![CDATA[展開|畳む]]></value>
+			<value xml:lang="zh-TW"><![CDATA[展開..|收合..]]></value>
+			<value xml:lang="tr"><![CDATA[Aç..|Kapat..]]></value>
+			<value xml:lang="vi"><![CDATA[Giãn ra.. | Co lại..]]></value>
+		</item>
+		<item name="fold_description">
+			<value xml:lang="ko"><![CDATA['펼치기|접기'와 같이 입력해주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Enter together with 'More|Less'.]]></value>
+			<value xml:lang="jp"><![CDATA[「展開|畳む」のように入力してください。]]></value>
+			<value xml:lang="zh-TW"><![CDATA['展開|收合'와 같이 입력해주세요.]]></value>
+			<value xml:lang="tr"><![CDATA['Aç|Kapat'Yukarıdaki örnekteki gibi gir]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy nhập từ thay cho từ mặc định là 'Giãn ra|Co lại'.]]></value>
+		</item>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/lang/tr.lang.php b/modules/editor/skins/dreditor/drcomponents/fold/lang/tr.lang.php
deleted file mode 100644
index 503bce9e9..000000000
--- a/modules/editor/skins/dreditor/drcomponents/fold/lang/tr.lang.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?PHP
-	$lang->edit->fold = 'Katla';
-	$lang->edit->fold_default = 'Aç..|Kapat..';
-	$lang->edit->fold_description = '\'Aç|Kapat\'Yukarıdaki örnekteki gibi gir';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/lang/vi.lang.php b/modules/editor/skins/dreditor/drcomponents/fold/lang/vi.lang.php
deleted file mode 100644
index 6977ae956..000000000
--- a/modules/editor/skins/dreditor/drcomponents/fold/lang/vi.lang.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?PHP
-	$lang->edit->fold = 'Co giãn';
-	$lang->edit->fold_default = 'Giãn ra.. | Co lại..';
-	$lang->edit->fold_description = 'Hãy nhập từ thay cho từ mặc định là \'Giãn ra|Co lại\'.';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/lang/zh-TW.lang.php b/modules/editor/skins/dreditor/drcomponents/fold/lang/zh-TW.lang.php
deleted file mode 100644
index 73f64d55c..000000000
--- a/modules/editor/skins/dreditor/drcomponents/fold/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?PHP
-	$lang->edit->fold = '摺疊';
-	$lang->edit->fold_default = '展開..|收合..';
-	$lang->edit->fold_description = '\'展開|收合\'와 같이 입력해주세요.';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.css b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.css
index 920642409..d55883339 100644
--- a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.css
+++ b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.css
@@ -1,12 +1,12 @@
-.wToolbar li.fold button{ background:url(fold.gif) no-repeat center 12px; }
-
-.editorArea ._fold{ padding:0;}
-.editorArea ._fold ._fold_cap{ border:3px solid #f90; padding:5px 20px; margin:2px;}
-.editorArea ._fold_first ._fold_cap{ border-bottom:0;}
-.editorArea ._fold_last ._fold_cap{ border-top:0;}
-.editorArea ._fold span { cursor:pointer; font-weight:bold; }
-.editorArea ._fold_last span { display:none; }
-.editorArea ._fold span.more { display:none; }
-.editorArea ._fold_more span.less { display:none; }
-.editorArea ._fold_more span.more { display:inline; }
+.wToolbar li.fold button{ background:url(fold.gif) no-repeat center 12px; }
+
+.editorArea ._fold{ padding:0;}
+.editorArea ._fold ._fold_cap{ border:3px solid #f90; padding:5px 20px; margin:2px;}
+.editorArea ._fold_first ._fold_cap{ border-bottom:0;}
+.editorArea ._fold_last ._fold_cap{ border-top:0;}
+.editorArea ._fold span { cursor:pointer; font-weight:bold; }
+.editorArea ._fold_last span { display:none; }
+.editorArea ._fold span.more { display:none; }
+.editorArea ._fold_more span.less { display:none; }
+.editorArea ._fold_more span.more { display:inline; }
 .editorArea ._fold_hide { display:none; }
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.html b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.html
index c729c12d4..a6739ecf8 100644
--- a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.html
+++ b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.html
@@ -1,17 +1,17 @@
-<!--%import("fold.js")-->
-<!--%import("fold.css")-->
-<div class="wArea fold">
-	<fieldset>
-		<legend>{$lang->edit->fold}</legend>
-		<input name="" type="text" class="inputText" value="" title="{$lang->edit->fold_default}" />
-		<div class="buttonArea">
-			<span class="buttonGray medium strong"><button type="button"><img src="iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-			<span class="buttonGray medium"><button type="button"><img src="buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-			<p class="info">{$lang->edit->fold_description}</p>
-		</div>
-		<span class="cap capTL"></span>
-		<span class="cap capTR"></span>
-		<span class="cap capBL"></span>
-		<span class="cap capBR"></span>
-	</fieldset>
+<!--%import("fold.js")-->
+<!--%import("fold.css")-->
+<div class="wArea fold">
+	<fieldset>
+		<legend>{$lang->edit->fold}</legend>
+		<input name="" type="text" class="inputText" value="" title="{$lang->edit->fold_default}" />
+		<div class="buttonArea">
+			<span class="buttonGray medium strong"><button type="button"><img src="iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+			<span class="buttonGray medium"><button type="button"><img src="buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+			<p class="info">{$lang->edit->fold_description}</p>
+		</div>
+		<span class="cap capTL"></span>
+		<span class="cap capTR"></span>
+		<span class="cap capBL"></span>
+		<span class="cap capBR"></span>
+	</fieldset>
 </div>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js
index 6877d155b..cd1182e21 100644
--- a/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js
+++ b/modules/editor/skins/dreditor/drcomponents/fold/tpl/fold.js
@@ -1,205 +1,205 @@
-/**
- * Fold component
- * @author NHN (developers@xpressengine.com)
- */
-jQuery(function($){
-
-var editor = xe.getApp('DrEditor')[0];
-var Fold = xe.createPlugin('Fold', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var config  = editor.getConfig(seq);
-		var _editor = config.writeArea.find('>div.fold');
-		var _text   = _editor.find('input[type=text]');
-		var next = _text.next();
-
-		_text.remove();
-		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'FOLD']);
-		next.before(_text);
-
-		_text
-			.blur(function(){ if(!$.trim(this.value)) this.value = this.title })
-			.val(_text.attr('title'));
-
-		this.configs[seq] = {
-			editor : _editor,
-			text   : _text,
-			marker : [],
-			before : null
-		};
-
-		return this.configs[seq];
-	},
-	assign_class : function(seq) {
-		if (this.configs[seq].marker.length) {
-			this.configs[seq].marker.eq(0).removeClass('_fold_last').addClass('_fold_first');
-			this.configs[seq].marker.eq(1).removeClass('_fold_first').addClass('_fold_last');
-		}
-	},
-	toggle : function(seq, button) {
-		var parent = button.parent().parent();
-		var target = parent.nextAll('div.eArea');
-		var n_fold = target.index(target.filter('div._fold'));
-
-		if (button.is('.more')) {
-			target.slice(0, n_fold).removeClass('_fold_hide');
-			parent.removeClass('_fold_more');
-		} else {
-			target.slice(0, n_fold).addClass('_fold_hide');
-			parent.addClass('_fold_more');
-		}
-	},
-	API_BEFORE_SETTING_CONTENT : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var obj  = params[1];
-		var button    = obj.children('div.fold_button:first');
-		var container = obj.children('div.fold_container');
-
-		if (button.length && container.length) {
-			var more = button.find('button.more').text(); // copy only text
-			var less = button.find('button.less').text();
-			var fold = $('<div class="eArea _fold"><div class="_fold_cap">&raquo; <span class="more"></span><span class="less"></span></div></div>').attr('type', 'fold');
-			
-			fold.find('span.more').click(function(){ self.toggle(seq,$(this)) }).text(more);
-			fold.find('span.less').click(function(){ self.toggle(seq,$(this)) }).text(less);
-
-			container.before(fold).before(container.children()).before(fold.clone(true)).remove();
-
-			if (!this.configs[seq]) this.create(seq);
-			this.configs[seq].marker = obj.children('div._fold');
-			this.assign_class(seq);
-		} else {
-			container.before(container.children()).remove();
-		}
-		button.remove();
-	},
-	API_AFTER_GETTING_CONTENT : function(sender, params) {
-		var seq  = params[0];
-		var obj  = params[1];
-		var chd  = obj.children();
-		var fold = chd.filter('div._fold');
-
-		if (!fold.length) return true;
-
-		var n_start = chd.index(fold.eq(0));
-		var n_end   = chd.index(fold.eq(1));
-
-		if (n_start+1 >= n_end) return true;
-
-		var div = $('<div class="fold_container" style="display:none" />');
-		chd.slice(n_start+1, n_end).appendTo(div);
-		fold.eq(0).before(div);
-		fold.remove();
-
-		var more = fold.find('span.more').html();
-		var less = fold.find('span.less').html();
-
-		var button = $('<div class="fold_button"><button type="button" class="more">'+more+'</button><button type="button" class="less" style="display:none">'+less+'</button></div>');
-		div.before(button);
-	},
-	API_OPEN_FOLD_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-		var cfg = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-		if (!box && cfg.marker.length) {
-			alert('접기 영역은 하나만 사용할 수 있습니다.');
-			return false;
-		}
-
-		this.cast('RESET_EDITOR', [seq, cfg.editor, 'FOLD']);
-		cfg.before = null;
-
-		if (box) {
-			var more = box.find('span.more').text();
-			var less = box.find('span.less').text();
-
-			cfg.text.val(more+'|'+less);
-			box.hide().after(cfg.editor);
-		} else if (bef) {
-			cfg.before = bef;
-			$(bef).after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(editor.getConfig(seq).editArea);
-		}
-		cfg.editor.show().find('input[type=text]:first').focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_FOLD_EDITOR : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var txt  = $.trim(cfg.text.val());
-		var box  = editor.getConfig(seq).editArea.children('div._fold:hidden');
-		var fold = null, fold2 = null;
-
-		if (txt == '') txt = cfg.text.attr('title');
-
-		if (save) {
-			txt = txt.split('|');
-			if (box.length) {
-				fold = editor.getConfig(seq).editArea.children('div._fold');
-
-				fold.find('span.more').text( txt[0] );
-				fold.find('span.less').text( txt[1] || '' );
-			} else {
-				fold = $('<div class="eArea _fold"><div class="_fold_cap">&raquo; <span class="more"></span><span class="less"></span></div></div>').attr('type', 'fold');
-			
-				fold.find('span.more').click(function(){ self.toggle(seq,$(this)) }).text( txt[0] );
-				fold.find('span.less').click(function(){ self.toggle(seq,$(this)) }).text( txt[1] || '' );
-
-				fold2 = (box=fold).clone(true);
-
-				if (cfg.before) {
-					cfg.before.before(fold).after(fold2);
-				} else {
-					cfg.editor.before(fold).before(fold2);
-				}
-
-				fold = editor.getConfig(seq).editArea.children('div._fold');
-			}
-			cfg.marker = fold;
-			this.assign_class(seq);
-			this.cast('SAVE_PARAGRAPH', [seq]);
-		}
-
-		box.show();
-
-		cfg.editor.hide().appendTo(editor.getConfig(seq).writeArea);
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-	},
-	API_AFTER_ONMOVE_PARAGRPH : function(sender, params) {
-		var seq = params[0];
-		var chd = editor.getConfig(seq).editArea.children();
-		if(typeof(this.configs[seq]) == 'undefined') return;
-
-		chd.filter('div._fold_hide').removeClass('_fold_hide');
-		this.configs[seq].marker = chd.filter('div._fold');
-		this.assign_class(seq);
-
-		if (this.configs[seq].marker.length) this.configs[seq].marker.removeClass('_fold_more');
-		
-	},
-	API_AFTER_DELETE_PARAGRAPH : function(sender, params) {
-		var self   = this;
-		var seq    = params[0];
-		var target = params[1];
-
-		if (target.filter('div._fold').length) {
-			this.configs[seq].marker.remove()
-			this.configs[seq].marker = [];
-		}
-	}
-});
-editor.registerPlugin(new Fold);
-
-});
+/**
+ * Fold component
+ * @author NHN (developers@xpressengine.com)
+ */
+jQuery(function($){
+
+var editor = xe.getApp('DrEditor')[0];
+var Fold = xe.createPlugin('Fold', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var config  = editor.getConfig(seq);
+		var _editor = config.writeArea.find('>div.fold');
+		var _text   = _editor.find('input[type=text]');
+		var next = _text.next();
+
+		_text.remove();
+		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'FOLD']);
+		next.before(_text);
+
+		_text
+			.blur(function(){ if(!$.trim(this.value)) this.value = this.title })
+			.val(_text.attr('title'));
+
+		this.configs[seq] = {
+			editor : _editor,
+			text   : _text,
+			marker : [],
+			before : null
+		};
+
+		return this.configs[seq];
+	},
+	assign_class : function(seq) {
+		if (this.configs[seq].marker.length) {
+			this.configs[seq].marker.eq(0).removeClass('_fold_last').addClass('_fold_first');
+			this.configs[seq].marker.eq(1).removeClass('_fold_first').addClass('_fold_last');
+		}
+	},
+	toggle : function(seq, button) {
+		var parent = button.parent().parent();
+		var target = parent.nextAll('div.eArea');
+		var n_fold = target.index(target.filter('div._fold'));
+
+		if (button.is('.more')) {
+			target.slice(0, n_fold).removeClass('_fold_hide');
+			parent.removeClass('_fold_more');
+		} else {
+			target.slice(0, n_fold).addClass('_fold_hide');
+			parent.addClass('_fold_more');
+		}
+	},
+	API_BEFORE_SETTING_CONTENT : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var obj  = params[1];
+		var button    = obj.children('div.fold_button:first');
+		var container = obj.children('div.fold_container');
+
+		if (button.length && container.length) {
+			var more = button.find('button.more').text(); // copy only text
+			var less = button.find('button.less').text();
+			var fold = $('<div class="eArea _fold"><div class="_fold_cap">&raquo; <span class="more"></span><span class="less"></span></div></div>').attr('type', 'fold');
+			
+			fold.find('span.more').click(function(){ self.toggle(seq,$(this)) }).text(more);
+			fold.find('span.less').click(function(){ self.toggle(seq,$(this)) }).text(less);
+
+			container.before(fold).before(container.children()).before(fold.clone(true)).remove();
+
+			if (!this.configs[seq]) this.create(seq);
+			this.configs[seq].marker = obj.children('div._fold');
+			this.assign_class(seq);
+		} else {
+			container.before(container.children()).remove();
+		}
+		button.remove();
+	},
+	API_AFTER_GETTING_CONTENT : function(sender, params) {
+		var seq  = params[0];
+		var obj  = params[1];
+		var chd  = obj.children();
+		var fold = chd.filter('div._fold');
+
+		if (!fold.length) return true;
+
+		var n_start = chd.index(fold.eq(0));
+		var n_end   = chd.index(fold.eq(1));
+
+		if (n_start+1 >= n_end) return true;
+
+		var div = $('<div class="fold_container" style="display:none" />');
+		chd.slice(n_start+1, n_end).appendTo(div);
+		fold.eq(0).before(div);
+		fold.remove();
+
+		var more = fold.find('span.more').html();
+		var less = fold.find('span.less').html();
+
+		var button = $('<div class="fold_button"><button type="button" class="more">'+more+'</button><button type="button" class="less" style="display:none">'+less+'</button></div>');
+		div.before(button);
+	},
+	API_OPEN_FOLD_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+		var cfg = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+		if (!box && cfg.marker.length) {
+			alert('접기 영역은 하나만 사용할 수 있습니다.');
+			return false;
+		}
+
+		this.cast('RESET_EDITOR', [seq, cfg.editor, 'FOLD']);
+		cfg.before = null;
+
+		if (box) {
+			var more = box.find('span.more').text();
+			var less = box.find('span.less').text();
+
+			cfg.text.val(more+'|'+less);
+			box.hide().after(cfg.editor);
+		} else if (bef) {
+			cfg.before = bef;
+			$(bef).after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(editor.getConfig(seq).editArea);
+		}
+		cfg.editor.show().find('input[type=text]:first').focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_FOLD_EDITOR : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var txt  = $.trim(cfg.text.val());
+		var box  = editor.getConfig(seq).editArea.children('div._fold:hidden');
+		var fold = null, fold2 = null;
+
+		if (txt == '') txt = cfg.text.attr('title');
+
+		if (save) {
+			txt = txt.split('|');
+			if (box.length) {
+				fold = editor.getConfig(seq).editArea.children('div._fold');
+
+				fold.find('span.more').text( txt[0] );
+				fold.find('span.less').text( txt[1] || '' );
+			} else {
+				fold = $('<div class="eArea _fold"><div class="_fold_cap">&raquo; <span class="more"></span><span class="less"></span></div></div>').attr('type', 'fold');
+			
+				fold.find('span.more').click(function(){ self.toggle(seq,$(this)) }).text( txt[0] );
+				fold.find('span.less').click(function(){ self.toggle(seq,$(this)) }).text( txt[1] || '' );
+
+				fold2 = (box=fold).clone(true);
+
+				if (cfg.before) {
+					cfg.before.before(fold).after(fold2);
+				} else {
+					cfg.editor.before(fold).before(fold2);
+				}
+
+				fold = editor.getConfig(seq).editArea.children('div._fold');
+			}
+			cfg.marker = fold;
+			this.assign_class(seq);
+			this.cast('SAVE_PARAGRAPH', [seq]);
+		}
+
+		box.show();
+
+		cfg.editor.hide().appendTo(editor.getConfig(seq).writeArea);
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+	},
+	API_AFTER_ONMOVE_PARAGRPH : function(sender, params) {
+		var seq = params[0];
+		var chd = editor.getConfig(seq).editArea.children();
+		if(typeof(this.configs[seq]) == 'undefined') return;
+
+		chd.filter('div._fold_hide').removeClass('_fold_hide');
+		this.configs[seq].marker = chd.filter('div._fold');
+		this.assign_class(seq);
+
+		if (this.configs[seq].marker.length) this.configs[seq].marker.removeClass('_fold_more');
+		
+	},
+	API_AFTER_DELETE_PARAGRAPH : function(sender, params) {
+		var self   = this;
+		var seq    = params[0];
+		var target = params[1];
+
+		if (target.filter('div._fold').length) {
+			this.configs[seq].marker.remove()
+			this.configs[seq].marker = [];
+		}
+	}
+});
+editor.registerPlugin(new Fold);
+
+});
diff --git a/modules/editor/skins/dreditor/editor.html b/modules/editor/skins/dreditor/editor.html
index 01d16e569..bd7860fe1 100644
--- a/modules/editor/skins/dreditor/editor.html
+++ b/modules/editor/skins/dreditor/editor.html
@@ -1,687 +1,687 @@
-<!--// 스킨 css 로드 -->
-<!--%import("css/dreditor.css")-->
-<!--%import("css/style@content.css")-->
-<!--%import("css/button.css")-->
-
-<!--// 기본 JS 로드 -->
-<!--%import("../../tpl/js/editor_common.js")-->
-<!--%load_js_plugin("ui")-->
-
-<!--// 에디터 JS 로드 -->
-<!--%import("js/Xpress_Editor.js")-->
-<!--%import("js/DrEditor.js",optimized=false)-->
-<!--%import("js/xe_interface.js",optimized=false)-->
-
-<!--// 글감 모듈 유무 판단 -->
-<!--@if(file_exists(_XE_PATH_.'modules/material/material.class.php'))-->
-    {@$material_exists = true}
-<!--@else-->
-    {@$material_exists = false}
-<!--@end-->
-
-{@$cookie_tool=explode(',', $_COOKIE['DrEditorToolbar'])}
-{@$default_tool=explode(',', 'hx,txt,material,link,list,quote,img,movie,file,hr,index')}
-{@$external_components=array_keys($drComponentList)}
-{@$enable_tool=array_unique(array_merge($cookie_tool, $default_tool, (array)$external_components))}
-
-<!-- 자동저장용 폼 -->
-<!--@if($enable_autosave)-->
-<input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title)}" />
-<input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
-<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
-<div style="display:none"><p class="editor_autosaved_message" id="editor_autosaved_message_{$editor_sequence}" style="display:none"></p></div>
-<!--@end-->
-<!-- 폼을 알아내기 위한 더미 -->
-<input type="hidden" name="editor_sequence" id="dreditor_dummy_{$editor_sequence}" value="{$editor_sequence}" />
-<!-- 에디터 -->
-<div id="DrEditor{$editor_sequence}" class="textyleEditor">
-<!-- class="textyleEditor" | class="textyleEditor keepClose" -->
-	<div class="editorContainer">
-		<!-- Editor Area -->
-		<div class="editorArea textyleContent"></div>
-		
-		<!-- Writer Area -->
-		<div class="writeArea textyleContent">
-
-			<div class="wArea hx">
-			<!-- class="wArea hx" | class="wArea hx open" -->
-				<fieldset>
-					<legend>{$lang->edit->title}</legend>
-					<ul>
-						<li class="h3"><input name="hx" type="radio" value="h3" id="h3" class="inputRadio" checked="checked" /><label for="h3">{$lang->edit->title1}</label></li>
-						<li class="h4"><input name="hx" type="radio" value="h4" id="h4" class="inputRadio" /><label for="h4">{$lang->edit->title2}</label></li>
-						<li class="h5"><input name="hx" type="radio" value="h5" id="h5" class="inputRadio" /><label for="h5">{$lang->edit->title3}</label></li>
-					</ul>
-					<input name="" type="text" class="inputTitle h3" value="{$lang->edit->insert_dr_title}" title="{$lang->edit->insert_dr_title}" />
-					<!-- class="inputTitle h3" | class="inputTitle h4" | class="inputTitle h5" -->
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<ul class="eTool">
-						<li class="edit"><button type="button">{$lang->cmd_edit}</button></li>
-						<li class="move"><button type="button"><span>{$lang->cmd_move}</span></button></li>
-						<li class="delete"><button type="button"><span>{$lang->cmd_delete}</span></button></li>
-					</ul>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea txt">
-			<!-- class="wArea txt" | class="wArea txt open" -->
-				<fieldset>
-					<legend>Text</legend>
-					<input type="hidden" />
-					<div class="txEditor">
-						<ul class="toolbar tool">
-							<li class="xpress_xeditor_ui_undo undo"><button type="button" title="Ctrl+Z:{$lang->edit->undo}"><span>{$lang->edit->undo}</span></button></li>
-							<li class="xpress_xeditor_ui_redo redo"><button type="button" title="Ctrl+Y:{$lang->edit->redo}"><span>{$lang->edit->redo}</span></button></li>
-							<li class="vRule xpress_xeditor_ui_fontName">
-								<select class="xpress_xeditor_ui_fontName_select">
-									<option value="">{$lang->edit->fontname}</option>
-									<!--@foreach($lang->edit->fontlist as $key=>$obj)-->
-									<option value="{$key}" style="font-family:{$key}">{$obj}</option>
-									<!--@end-->
-								</select>
-							</li>
-							<li class="fSize xpress_xeditor_ui_fontSize">
-								<select class="xpress_xeditor_ui_fontSize_select">
-									<option>{$lang->edit->fontsize}</option>
-									<option value="9px" class="font9px">9px</option>
-									<option value="10px" class="font10px">10px</option>
-									<option value="11px" class="font11px">11px</option>
-									<option value="12px" class="font12px">12px</option>
-									<option value="14px" class="font14px">14px</option>
-									<option value="16px" class="font16px">16px</option>
-									<option value="18px" class="font18px">18px</option>
-									<option value="20px" class="font20px">20px</option>
-									<option value="24px" class="font24px">24px</option>
-									<option value="28px" class="font28px">28px</option>
-									<option value="32px" class="font32px">32px</option>
-									<option value="36px" class="font36px">36px</option>
-								</select>
-							</li>
-							<li class="xpress_xeditor_ui_lineHeight">
-								<select class="xpress_xeditor_ui_lineHeight_select">
-									<option value="">{$lang->edit->lineheight}</option>
-									<option value="1">100%</option>
-									<option value="1.2">120%</option>
-									<option value="1.4">140%</option>
-									<option value="1.6">160%</option>
-									<option value="1.8">180%</option>
-									<option value="2">200%</option>
-								</select>
-							</li>
-
-							<li class="strong vRule xpress_xeditor_ui_bold"><button type="button"><span>{$lang->edit->bold}</span></button></li>
-							<li class="em xpress_xeditor_ui_italic"><button type="button"><span>{$lang->edit->italic}</span></button></li>
-							<li class="underline xpress_xeditor_ui_underline"><button type="button"><span>{$lang->edit->underline}</span></button></li>
-							<li class="del xpress_xeditor_ui_lineThrough"><button type="button"><span>{$lang->edit->strike}</span></button></li>
-							<li class="aHref vRule xpress_xeditor_ui_hyperlink">
-								<button type="button" title="{$lang->edit->url}"><span>{$lang->edit->url}</span></button>
-								<!-- URL 레이어 -->
-								<div class="uri xpress_xeditor_hyperlink_layer" style="display:none;">
-									<fieldset>
-										<h3>{$lang->edit->hyperlink}</h3>
-										<input name="" class="link" type="text" value="http://" title="URL" />
-										<p><input name="" id="target" type="checkbox" value="" /><label for="target">{$lang->edit->target_blank}</label></p>
-										<div class="btn_area">
-											<span class="buttonGray small"><button type="button" class="confirm" title="{$lang->cmd_confirm}">{$lang->cmd_confirm}</button></span>
-											<span class="buttonGray small"><button type="button" class="cancel" title="{$lang->cmd_cancel}">{$lang->cmd_cancel}</button></span>
-										</div>
-									</fieldset>
-
-								</div>
-								<!-- /URL 레이어 -->
-							</li>
-							<li class="fColor xpress_xeditor_ui_fontColor">
-								<button type="button" title="{$lang->edit->help_fontcolor}"><span>{$lang->edit->fontcolor}</span></button>
-								<!-- 팔레트 레이어 -->
-								<div class="xpress_xeditor_fontcolor_layer" style="display:none;">
-									<ul class="palette xpress_xeditor_color_palette">
-										<li><button type="button" title="#ff0000" style="background:#ff0000"><span>#ff0000</span></button></li>
-										<li><button type="button" title="#ff6c00" style="background:#ff6c00"><span>#ff6c00</span></button></li>
-										<li><button type="button" title="#ffaa00" style="background:#ffaa00"><span>#ffaa00</span></button></li>
-										<li><button type="button" title="#ffef00" style="background:#ffef00"><span>#ffef00</span></button></li>
-										<li><button type="button" title="#a6cf00" style="background:#a6cf00"><span>#a6cf00</span></button></li>
-										<li><button type="button" title="#009e25" style="background:#009e25"><span>#009e25</span></button></li>
-										<li><button type="button" title="#00b0a2" style="background:#00b0a2"><span>#00b0a2</span></button></li>
-										<li><button type="button" title="#0075c8" style="background:#0075c8"><span>#0075c8</span></button></li>
-										<li><button type="button" title="#3a32c3" style="background:#3a32c3"><span>#3a32c3</span></button></li>
-										<li><button type="button" title="#7820b9" style="background:#7820b9"><span>#7820b9</span></button></li>
-										<li><button type="button" title="#ef007c" style="background:#ef007c"><span>#ef007c</span></button></li>
-										<li><button type="button" title="#000000" style="background:#000000"><span>#000000</span></button></li>
-										<li><button type="button" title="#252525" style="background:#252525"><span>#252525</span></button></li>
-										<li><button type="button" title="#464646" style="background:#464646"><span>#464646</span></button></li>
-										<li><button type="button" title="#636363" style="background:#636363"><span>#636363</span></button></li>
-										<li><button type="button" title="#7d7d7d" style="background:#7d7d7d"><span>#7d7d7d</span></button></li>
-										<li><button type="button" title="#9a9a9a" style="background:#9a9a9a"><span>#9a9a9a</span></button></li>
-										<li><button type="button" title="#ffe8e8" style="background:#ffe8e8"><span>#ffe8e8</span></button></li>
-										<li><button type="button" title="#f7e2d2" style="background:#f7e2d2"><span>#f7e2d2</span></button></li>
-										<li><button type="button" title="#f5eddc" style="background:#f5eddc"><span>#f5eddc</span></button></li>
-										<li><button type="button" title="#f5f4e0" style="background:#f5f4e0"><span>#f5f4e0</span></button></li>
-										<li><button type="button" title="#edf2c2" style="background:#edf2c2"><span>#edf2c2</span></button></li>
-										<li><button type="button" title="#def7e5" style="background:#def7e5"><span>#def7e5</span></button></li>
-										<li><button type="button" title="#d9eeec" style="background:#d9eeec"><span>#d9eeec</span></button></li>
-										<li><button type="button" title="#c9e0f0" style="background:#c9e0f0"><span>#c9e0f0</span></button></li>
-										<li><button type="button" title="#d6d4eb" style="background:#d6d4eb"><span>#d6d4eb</span></button></li>
-										<li><button type="button" title="#e7dbed" style="background:#e7dbed"><span>#e7dbed</span></button></li>
-										<li><button type="button" title="#f1e2ea" style="background:#f1e2ea"><span>#f1e2ea</span></button></li>
-										<li><button type="button" title="#acacac" style="background:#acacac"><span>#acacac</span></button></li>
-										<li><button type="button" title="#c2c2c2" style="background:#c2c2c2"><span>#c2c2c2</span></button></li>
-										<li><button type="button" title="#cccccc" style="background:#cccccc"><span>#cccccc</span></button></li>
-										<li><button type="button" title="#e1e1e1" style="background:#e1e1e1"><span>#e1e1e1</span></button></li>
-										<li><button type="button" title="#ebebeb" style="background:#ebebeb"><span>#ebebeb</span></button></li>
-										<li><button type="button" title="#ffffff" style="background:#ffffff"><span>#ffffff</span></button></li>
-										<li><button type="button" title="#e97d81" style="background:#e97d81"><span>#e97d81</span></button></li>
-										<li><button type="button" title="#e19b73" style="background:#e19b73"><span>#e19b73</span></button></li>
-										<li><button type="button" title="#d1b274" style="background:#d1b274"><span>#d1b274</span></button></li>
-										<li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
-										<li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
-										<li><button type="button" title="#61b977" style="background:#61b977"><span>#61b977</span></button></li>
-										<li><button type="button" title="#53aea8" style="background:#53aea8"><span>#53aea8</span></button></li>
-										<li><button type="button" title="#518fbb" style="background:#518fbb"><span>#518fbb</span></button></li>
-										<li><button type="button" title="#6a65bb" style="background:#6a65bb"><span>#6a65bb</span></button></li>
-										<li><button type="button" title="#9a54ce" style="background:#9a54ce"><span>#9a54ce</span></button></li>
-										<li><button type="button" title="#e573ae" style="background:#e573ae"><span>#e573ae</span></button></li>
-										<li><button type="button" title="#5a504b" style="background:#5a504b"><span>#5a504b</span></button></li>
-										<li><button type="button" title="#767b86" style="background:#767b86"><span>#767b86</span></button></li>
-										<li><button type="button" title="#00ffff" style="background:#00ffff"><span>#00ffff</span></button></li>
-										<li><button type="button" title="#00ff00" style="background:#00ff00"><span>#00ff00</span></button></li>
-										<li><button type="button" title="#a0f000" style="background:#a0f000"><span>#a0f000</span></button></li>
-										<li><button type="button" title="#ffff00" style="background:#ffff00"><span>#ffff00</span></button></li>
-										<li><button type="button" title="#951015" style="background:#951015"><span>#951015</span></button></li>
-										<li><button type="button" title="#6e391a" style="background:#6e391a"><span>#6e391a</span></button></li>
-										<li><button type="button" title="#785c25" style="background:#785c25"><span>#785c25</span></button></li>
-										<li><button type="button" title="#5f5b25" style="background:#5f5b25"><span>#5f5b25</span></button></li>
-										<li><button type="button" title="#4c511f" style="background:#4c511f"><span>#4c511f</span></button></li>
-										<li><button type="button" title="#1c4827" style="background:#1c4827"><span>#1c4827</span></button></li>
-										<li><button type="button" title="#0d514c" style="background:#0d514c"><span>#0d514c</span></button></li>
-										<li><button type="button" title="#1b496a" style="background:#1b496a"><span>#1b496a</span></button></li>
-										<li><button type="button" title="#2b285f" style="background:#2b285f"><span>#2b285f</span></button></li>
-										<li><button type="button" title="#45245b" style="background:#45245b"><span>#45245b</span></button></li>
-										<li><button type="button" title="#721947" style="background:#721947"><span>#721947</span></button></li>
-										<li><button type="button" title="#352e2c" style="background:#352e2c"><span>#352e2c</span></button></li>
-										<li><button type="button" title="#3c3f45" style="background:#3c3f45"><span>#3c3f45</span></button></li>
-										<li><button type="button" title="#00aaff" style="background:#00aaff"><span>#00aaff</span></button></li>
-										<li><button type="button" title="#0000ff" style="background:#0000ff"><span>#0000ff</span></button></li>
-										<li><button type="button" title="#a800ff" style="background:#a800ff"><span>#a800ff</span></button></li>
-										<li><button type="button" title="#ff00ff" style="background:#ff00ff"><span>#ff00ff</span></button></li>
-									</ul>
-								</div>
-								<!-- /팔레트 레이어 -->
-							</li>
-							<li class="bgColor xpress_xeditor_ui_bgColor">
-								<button type="button" title="{$lang->edit->help_fontbgcolor}"><span>{$lang->edit->fontbgcolor}</span></button>
-								<div class="xpress_xeditor_bgcolor_layer" style="display:none;"></div>
-							</li>
-							<li class="left vRule xpress_xeditor_ui_justifyleft">
-								<button type="button" title="{$lang->edit->help_align_left}"><span>{$lang->edit->align_left}</span></button>
-							</li>
-							<li class="center xpress_xeditor_ui_justifycenter">
-								<button type="button" title="{$lang->edit->help_align_center}"><span>{$lang->edit->align_center}</span></button>
-							</li>
-							<li class="right xpress_xeditor_ui_justifyright">
-								<button type="button" title="{$lang->edit->help_align_right}"><span>{$lang->edit->align_right}</span></button>
-							</li>
-							<li class="justify xpress_xeditor_ui_justifyfull">
-								<button type="button" title="{$lang->edit->help_align_justify}"><span>{$lang->edit->align_justify}</span></button>
-							</li>
-							<li class="character vRule xpress_xeditor_ui_sCharacter">
-								<button type="button" title="{$lang->edit->special_character}"><span>{$lang->edit->special_character}</span></button>
-								<!-- 특수문자 레이어 -->
-								<div class="layer xpress_xeditor_sCharacter_layer" style="display:none">
-									<h3>{$lang->edit->insert_special_character}</h3>
-									<button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
-									<ul class="nav">
-										<li><a href="#character1" class="on">{$lang->edit->symbol}</a></li>
-										<li><a href="#character2">{$lang->edit->number_unit}</a></li>
-										<li><a href="#character3">{$lang->edit->circle_bracket}</a></li>
-										<li><a href="#character4">{$lang->edit->korean}</a></li>
-										<li><a href="#character5">{$lang->edit->greece},{$lang->edit->Latin}</a></li>
-										<li><a href="#character6">{$lang->edit->japan}</a></li>
-									</ul>
-									<ul style="display: block;" id="character1" class="list"></ul>
-									<ul style="display: none;" id="character2" class="list"></ul>
-									<ul style="display: none;" id="character3" class="list"></ul>
-									<ul style="display: none;" id="character4" class="list"></ul>
-									<ul style="display: none;" id="character5" class="list"></ul>
-									<ul style="display: none;" id="character6" class="list"></ul>
-									<p>
-										<label for="preview">{$lang->edit->selected_symbol}</label>
-										<input id="preview" name="" type="text" />
-										<button type="button" title="{$lang->confirm}"><span>{$lang->confirm}</span></button>
-									</p>
-									<button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
-								</div>
-								<!-- /특수문자 레이어 -->
-							</li>
-						</ul>
-						<div class="inputRichText xpress_xeditor_editing_area_container">
-							<iframe src="{$editor_path}blank.html" frameborder="0" scrolling="yes" title="{$lang->edit->richtext_area}"></iframe>
-						</div>
-						<div class="resizeVertical xpress_xeditor_editingArea_verticalResizer">
-							<button type="button"><span>{$lang->edit->edit_height_control}</span></button>
-						</div>
-					</div>
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea link">
-			<!-- class="wArea link" | class="wArea link open" -->
-				<fieldset>
-					<legend>{$lang->edit->link}</legend>
-					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_site_name}" />
-					<input name="" type="text" class="inputLink" value="" title="http://" />
-					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_explain}" />
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea list">
-			<!-- class="wArea list" | class="wArea list open" -->
-				<fieldset>
-					<legend>{$lang->cmd_list}</legend>
-					<ul class="toolbar">
-						<li><button type="button" class="type_disc"><span>disc</span></button></li>
-						<li><button type="button" class="type_circle"><span>circle</span></button></li>
-						<li><button type="button" class="type_square"><span>square</span></button></li>
-						<li><button type="button" class="type_decimal"><span>decimal</span></button></li>
-						<li><button type="button" class="type_lower-alpha"><span>lower alpha</span></button></li>
-						<li><button type="button" class="type_upper-alpha"><span>upper alpha</span></button></li>
-						<li><button type="button" class="type_lower-roman"><span>lower roman</span></button></li>
-						<li><button type="button" class="type_upper-roman"><span>upper roman</span></button></li>
-					</ul>
-					<div class="listArea"></div>
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-						<p class="info">{$lang->edit->list_explain}</p>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea quote">
-			<!-- class="wArea blockquote" | class="wArea blockquote open" -->
-				<fieldset>
-					<legend>{$lang->edit->blockquote}</legend>
-					<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_blockquote}"></textarea>
-					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea img">
-			<!-- class="wArea img" | class="wArea img open" -->
-				<fieldset>
-					<legend>{$lang->edit->image}</legend>
-					<input name="Filedata" type="file" class="inputFile" title="{$lang->edit->find_image}" />
-					<p class="uploading">{$lang->edit->uploading} <button type="button">{$lang->cmd_cancel}</button> <span></span></p>
-					<p class="info">{sprintf($lang->edit->uploading_info,($file_config->allowed_filesize/(1024*1024)))}</p>
-					<div class="hr"></div>
-					<div class="image">
-						<img src="" alt="{$lang->edit->uploaded_image}" />
-					</div>
-					<div class="align">
-						<dl>
-							<dt>{$lang->edit->image_align} :</dt>
-							<dd>
-								<input type="radio" name="align" id="img_align_left" value="left" /><label for="img_align_left">{$lang->edit->align_left}</label>
-								<input type="radio" name="align" id="img_align_center" value="center" /><label for="img_align_center">{$lang->edit->align_center}</label>
-								<input type="radio" name="align" id="img_align_right" value="right" /><label for="img_align_right">{$lang->edit->align_right}</label>
-							</dd>
-						</dl>
-					</div>
-					<div class="resize">
-						<dl>
-							<dt>{$lang->edit->image_width} :</dt>
-							<dd><em></em> px → <input name="" type="text" class="width copy" value="" title="" /> px <span class="buttonGray medium"><button type="button" class="btn_resize">{$lang->edit->resize}</button></span> <span class="resizeInfo">{$lang->edit->resize_info}</span></dd>
-						</dl>
-						<p class="resizeError">{$lang->edit->resize_error}</p>
-					</div>
-					<input name="" type="text" class="inputText desc" value="" title="{$lang->edit->insert_image_explain}" />
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea movie">
-			<!-- class="wArea mov" | class="wArea mov open" -->
-				<fieldset>
-					<legend>{$lang->edit->mov}</legend>
-					<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_mov}"></textarea>
-					<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_mov_explain}"></textarea>
-					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<!--@if($allow_fileupload)-->
-			<!--%import("js/uploader.js",optimized=false)-->
-			<!--%import("../../tpl/js/swfupload.js",optimized=false)-->
-			<script type="text/javascript">//<![CDATA[
-                uploaderSettings=
-                    {
-					"editorSequence" : {$editor_sequence},
-					"sessionName" : "{session_name()}",
-					"allowedFileSize" : "{$file_config->allowed_filesize}",
-					"allowedFileTypes" : "{$file_config->allowed_filetypes}",
-					"allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
-					"insertedFiles" : {(int)$files_count},
-					"replaceButtonID" : "swfUploadButton{$editor_sequence}",
-					"fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
-					"previewAreaID" : "preview_uploaded_{$editor_sequence}",
-					"uploaderStatusID" : "uploader_status_{$editor_sequence}"
-				};
-				//reloadFileList(editorUploadSettings);
-			//]]></script>
-			<div class="wArea file">
-			<!-- class="wArea file" | class="wArea file open" -->
-				<fieldset>
-				<legend>{$lang->edit->file}</legend>
-                 <span id="swfUploadButton{$editor_sequence}" class="buttonFileUpload"><button type="button">{$lang->edit->file_select}</button></span>
-					<p class="info">{sprintf($lang->edit->file_uploadinfo,($file_config->allowed_filesize/(1024*1024)),($file_config->allowed_attach_size/(1024*1024)))} <!--button type="button" class="help">파일 업로드에 문제가 발생하는 경우 클릭.</button--></p>
-					<!--input name="" type="file" class="inputFile" title="파일 찾기" /-->
-					<!-- class="inputFile" | class="inputFile open" -->
-					<div class="hr"></div>
-					<dl class="attachedFile">
-						<dd style="display:none"><strong>{filename}</strong> <em>{filesize}</em> <button type="button" class="buttonDelete"><span>{$lang->cmd_delete}</span></button></dd>
-					</dl>
-					<p class="summary">{$lang->edit->file_total} <em class="filesize">{total_filesize}</em></p>
-					<div class="hr"></div>
-					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_file_explain}" />
-					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
-					<div class="buttonArea">
-				<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-			<!--@end-->
-
-			<div class="wArea hr">
-			<!-- class="wArea hr" | class="wArea hr open" -->
-				<fieldset>
-					<legend>{$lang->edit->hr}</legend>
-					<ul>
-						<li><span class="hRule"></span><input name="hr" type="radio" value="hline" id="hr1" class="inputRadio" checked="checked" /> <label for="hr1">{$lang->edit->hr_simple}</label></li>
-					</ul>
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea index">
-			<!-- class="wArea index" | class="wArea index open" -->
-				<fieldset>
-					<legend>{$lang->edit->toc}</legend>
-					<div class="buttonArea">
-						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
-						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
-						<p class="info">{$lang->edit->toc_explain}</p>
-					</div>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea mArea material">
-			<!-- class="mArea" | class="mArea open" -->
-				<fieldset>
-					<legend>{$lang->edit->materials}</legend>
-					<h4 class="h4">{$lang->edit->materials}</h4>
-					<div class="controls">
-						<span class="buttonDrEditor black"><button type="button" class="_reload">{$lang->edit->refresh}</button></span>
-						<span class="buttonDrEditor black"><button type="button" class="_close">{$lang->edit->close_materials}</button></span>
-					</div>
-					<p class="noData">{$lang->edit->no_materials}</p>
-					<div class="_container">
-						<dl>
-							<dt>{regdate}</dt>
-							<dd>
-								<div class="eArea">{content}</div>
-								<span class="buttonDrEditor green small"><button type="button">{$lang->edit->insert}</button></span>
-							</dd>
-						</dl>
-					</div>
-					<!-- pagenate -->
-					<div class="paginate">
-						<button type="button" class="prev" title="{$lang->edit->paging_prev_help}"><span>{$lang->edit->paging_prev}</span></button>
-						<button type="button" class="next" title="{$lang->edit->paging_next_help}"><span>{$lang->edit->paging_next}</span></button>
-						<span>{current}/{total}</span>
-					</div>
-					<!-- pagenate -->
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<div class="wArea mArea help">
-			<!-- class="mArea" | class="mArea open" -->
-				<fieldset>
-					<legend>{$lang->edit->help}</legend>
-					<h4 class="h4">{$lang->edit->help}</h4>
-					<div class="controls">
-						<span class="buttonDrEditor black"><button type="button">{$lang->edit->close_help}</button></span>
-					</div>
-					<dl>
-						<dt>{$lang->edit->help_first_dt_1}</dt>
-						<dd>{$lang->edit->help_first_dd_1}</dd>
-						<dt>{$lang->edit->help_first_dt_2}</dt>
-						<dd>{$lang->edit->help_first_dd_2}</dd>
-						<dt>{$lang->edit->help_first_dt_3}</dt>
-						<dd>{$lang->edit->help_first_dd_3}</dd>
-						<dt>{$lang->edit->help_first_dt_4}</dt>
-						<dd>{$lang->edit->help_first_dd_4}</dd>
-						<dt>{$lang->edit->help_first_dt_5}</dt>
-						<dd>{$lang->edit->help_first_dd_5}</dd>
-					</dl>
-					<span class="cap capTL"></span>
-					<span class="cap capTR"></span>
-					<span class="cap capBL"></span>
-					<span class="cap capBR"></span>
-				</fieldset>
-			</div>
-
-			<!-- wArea blank-->
-			<div class="wArea blank">
-			<!-- class="wArea blank" | class="wArea blank open" -->
-				<h4 class="h4">{$lang->edit->help_first_title}</h4>
-				<dl>
-					<dt>{$lang->edit->help_first_dt_1}</dt>
-					<dd>{$lang->edit->help_first_dd_1}</dd>
-					<dt>{$lang->edit->help_first_dt_2}</dt>
-					<dd>{$lang->edit->help_first_dd_2}</dd>
-					<dt>{$lang->edit->help_first_dt_3}</dt>
-					<dd>{$lang->edit->help_first_dd_3}</dd>
-					<dt>{$lang->edit->help_first_dt_4}</dt>
-					<dd>{$lang->edit->help_first_dd_4}</dd>
-					<dt>{$lang->edit->help_first_dt_5}</dt>
-					<dd>{$lang->edit->help_first_dd_5}</dd>
-				</dl>
-				<p class="drEditorBugReport"><a href="http://xe.xpressengine.net/?mid=issuetracker&amp;act=dispIssuetrackerViewIssue" target="_blank" title="{$lang->edit->cmd_new_window}">{$lang->edit->help_bug_report}</a></p>
-				<span class="cap capTL"></span>
-				<span class="cap capTR"></span>
-				<span class="cap capBL"></span>
-				<span class="cap capBR"></span>
-			</div>
-			<!-- /wArea blank-->
-
-			<!-- External Components -->
-			<!--@foreach($drComponentList as $k=>$v)-->
-			{$v->html}
-			<!--@endforeach-->
-			<!-- /External Components -->
-
-			<!-- wToolbar -->
-			<div class="wToolbarContainer">
-			<!-- class="wToolbarContainer" | class="wToolbarContainer more" -->
-				<div class="wToolbar">
-				<!-- class="wToolbar" | class="wToolbar hx | txt | link | list | quote | img | movie | file | hr | index | material | help" -->
-					<ul>
-						<!--<li class="close"><button type="button" title="{$lang->edit->close_toolbar}(~)"></button></li>-->
-						<!--@foreach($enable_tool as $k => $v)-->
-							<!--@if($k<9)-->
-								{@$_title = $lang->edit->help_shortcut.'('.($k+1).')'}
-							<!--@else-->
-								{@$_title = ''}
-							<!--@endif-->
-							<!--@if($v=='hx')-->
-							<li class="hx"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->title_title}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='txt')-->
-							<li class="txt"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->text}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='link')-->
-							<li class="link"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->link}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='list')-->
-							<li class="list"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->list}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='quote')-->
-							<li class="quote"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->blockquote}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='img')-->
-							<li class="img"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->image}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='movie')-->
-							<li class="movie"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->mov}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='file' && $allow_fileupload)-->
-							<li class="file"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->file}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='hr')-->
-							<li class="hr"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->hr}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='index')-->
-							<li class="index"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->toc}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($v=='material')-->
-							<li class="material"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->material}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@elseif($drComponentList[$v])-->
-							<li class="{$v}"><button type="button" title="{$_title}"><span class="tx">{$drComponentList[$v]->title}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
-							<!--@end-->
-						<!--@end-->
-						<li class="help"><button type="button"><span class="tx">{$lang->edit->help}</span></button></li>
-						<li class="more"><button type="button" title="(0)"><span class="tx">{$lang->edit->more}</span><span class="nx">0</span></button></li>
-					</ul>
-					
-					<!-- JS for Prototype -->
-					<script type="text/javascript">
-					//<![CDATA[
-						jQuery(function($){
-							$('.wToolbar button').slice(0,9).append('<span class="nx"></span>');
-							$('.wToolbar li').slice(0,9).each(function(i){
-								$(this).find('.nx').append(i+1);
-							});
-						});
-					//]]>
-					</script>
-					<!-- /JS for Prototype -->
-					
-					<!--
-					<div class="shortcut">
-						<ul>
-							<li><span>1</span></li>
-							<li><span>2</span></li>
-							<li><span>3</span></li>
-							<li><span>4</span></li>
-							<li><span>5</span></li>
-							<li><span>6</span></li>
-							<li><span>7</span></li>
-							<li><span>8</span></li>
-							<li><span>9</span></li>
-							<li class="more"><span>0</span></li>
-						</ul>
-					</div>
-					-->
-					
-					<span class="cap capLeft"></span>
-					<span class="cap capRight"></span>
-					<span class="top topLeft"></span>
-					<span class="top topRight"></span>
-					<span class="arrow"></span>
-				</div>
-			</div>
-			<!-- /wToolbar -->
-
-		</div>
-		<!-- /Editor Area -->
-	</div>
-</div>
-<!-- /에디터 -->
-
-<!-- 에디터 활성화 -->
-<script type="text/javascript">//<![CDATA[
-var editor_path = "{$editor_path}";
-
-var auto_saved_msg = "{$lang->msg_auto_saved}";
-var delete_dr_confirm_msg = "{$lang->edit->msg_dr_delete_confirm}";
-var no_selected_object_msg = "{$lang->edit->msg_no_selected_object}";
-var insert_value_msg = "{$lang->edit->msg_insert_value}";
-var submit_without_saving_msg = "{$lang->edit->confirm_submit_without_saving}";
-var msg_close_before_write = "{$lang->msg_close_before_write}";
-
-if (typeof(xe.lang) == 'undefined') xe.lang = {};
-xe.lang.attached_files = '{$lang->edit->attached_files}';
-xe.lang.shortcut = '{$lang->edit->help_shortcut}';
-xe.lang.drag_this = '{$lang->edit->drag_this}';
-xe.lang.cmd_del = '{$lang->edit->cmd_del}';
-
-editorStart_xe(
-	'{$editor_sequence}',
-	'{$editor_primary_key_name}',
-	'{$editor_content_key_name}',
-	'{$editor_height}',
-	'{$colorset}',
-	'{$content_style}',
-	'{$content_font}',
-	'{$content_font_size}'
-);
-//]]></script>
+<!--// 스킨 css 로드 -->
+<!--%import("css/dreditor.css")-->
+<!--%import("css/style@content.css")-->
+<!--%import("css/button.css")-->
+
+<!--// 기본 JS 로드 -->
+<!--%import("../../tpl/js/editor_common.js")-->
+<!--%load_js_plugin("ui")-->
+
+<!--// 에디터 JS 로드 -->
+<!--%import("js/Xpress_Editor.js")-->
+<!--%import("js/DrEditor.js",optimized=false)-->
+<!--%import("js/xe_interface.js",optimized=false)-->
+
+<!--// 글감 모듈 유무 판단 -->
+<!--@if(file_exists(_XE_PATH_.'modules/material/material.class.php'))-->
+    {@$material_exists = true}
+<!--@else-->
+    {@$material_exists = false}
+<!--@end-->
+
+{@$cookie_tool=explode(',', $_COOKIE['DrEditorToolbar'])}
+{@$default_tool=explode(',', 'hx,txt,material,link,list,quote,img,movie,file,hr,index')}
+{@$external_components=array_keys($drComponentList)}
+{@$enable_tool=array_unique(array_merge($cookie_tool, $default_tool, (array)$external_components))}
+
+<!-- 자동저장용 폼 -->
+<!--@if($enable_autosave)-->
+<input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title)}" />
+<input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
+<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
+<div style="display:none"><p class="editor_autosaved_message" id="editor_autosaved_message_{$editor_sequence}" style="display:none"></p></div>
+<!--@end-->
+<!-- 폼을 알아내기 위한 더미 -->
+<input type="hidden" name="editor_sequence" id="dreditor_dummy_{$editor_sequence}" value="{$editor_sequence}" />
+<!-- 에디터 -->
+<div id="DrEditor{$editor_sequence}" class="textyleEditor">
+<!-- class="textyleEditor" | class="textyleEditor keepClose" -->
+	<div class="editorContainer">
+		<!-- Editor Area -->
+		<div class="editorArea textyleContent"></div>
+		
+		<!-- Writer Area -->
+		<div class="writeArea textyleContent">
+
+			<div class="wArea hx">
+			<!-- class="wArea hx" | class="wArea hx open" -->
+				<fieldset>
+					<legend>{$lang->edit->title}</legend>
+					<ul>
+						<li class="h3"><input name="hx" type="radio" value="h3" id="h3" class="inputRadio" checked="checked" /><label for="h3">{$lang->edit->title1}</label></li>
+						<li class="h4"><input name="hx" type="radio" value="h4" id="h4" class="inputRadio" /><label for="h4">{$lang->edit->title2}</label></li>
+						<li class="h5"><input name="hx" type="radio" value="h5" id="h5" class="inputRadio" /><label for="h5">{$lang->edit->title3}</label></li>
+					</ul>
+					<input name="" type="text" class="inputTitle h3" value="{$lang->edit->insert_dr_title}" title="{$lang->edit->insert_dr_title}" />
+					<!-- class="inputTitle h3" | class="inputTitle h4" | class="inputTitle h5" -->
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<ul class="eTool">
+						<li class="edit"><button type="button">{$lang->cmd_edit}</button></li>
+						<li class="move"><button type="button"><span>{$lang->cmd_move}</span></button></li>
+						<li class="delete"><button type="button"><span>{$lang->cmd_delete}</span></button></li>
+					</ul>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea txt">
+			<!-- class="wArea txt" | class="wArea txt open" -->
+				<fieldset>
+					<legend>Text</legend>
+					<input type="hidden" />
+					<div class="txEditor">
+						<ul class="toolbar tool">
+							<li class="xpress_xeditor_ui_undo undo"><button type="button" title="Ctrl+Z:{$lang->edit->undo}"><span>{$lang->edit->undo}</span></button></li>
+							<li class="xpress_xeditor_ui_redo redo"><button type="button" title="Ctrl+Y:{$lang->edit->redo}"><span>{$lang->edit->redo}</span></button></li>
+							<li class="vRule xpress_xeditor_ui_fontName">
+								<select class="xpress_xeditor_ui_fontName_select">
+									<option value="">{$lang->edit->fontname}</option>
+									<!--@foreach($lang->edit->fontlist as $key=>$obj)-->
+									<option value="{$key}" style="font-family:{$obj}">{$obj}</option>
+									<!--@end-->
+								</select>
+							</li>
+							<li class="fSize xpress_xeditor_ui_fontSize">
+								<select class="xpress_xeditor_ui_fontSize_select">
+									<option>{$lang->edit->fontsize}</option>
+									<option value="9px" class="font9px">9px</option>
+									<option value="10px" class="font10px">10px</option>
+									<option value="11px" class="font11px">11px</option>
+									<option value="12px" class="font12px">12px</option>
+									<option value="14px" class="font14px">14px</option>
+									<option value="16px" class="font16px">16px</option>
+									<option value="18px" class="font18px">18px</option>
+									<option value="20px" class="font20px">20px</option>
+									<option value="24px" class="font24px">24px</option>
+									<option value="28px" class="font28px">28px</option>
+									<option value="32px" class="font32px">32px</option>
+									<option value="36px" class="font36px">36px</option>
+								</select>
+							</li>
+							<li class="xpress_xeditor_ui_lineHeight">
+								<select class="xpress_xeditor_ui_lineHeight_select">
+									<option value="">{$lang->edit->lineheight}</option>
+									<option value="1">100%</option>
+									<option value="1.2">120%</option>
+									<option value="1.4">140%</option>
+									<option value="1.6">160%</option>
+									<option value="1.8">180%</option>
+									<option value="2">200%</option>
+								</select>
+							</li>
+
+							<li class="strong vRule xpress_xeditor_ui_bold"><button type="button"><span>{$lang->edit->bold}</span></button></li>
+							<li class="em xpress_xeditor_ui_italic"><button type="button"><span>{$lang->edit->italic}</span></button></li>
+							<li class="underline xpress_xeditor_ui_underline"><button type="button"><span>{$lang->edit->underline}</span></button></li>
+							<li class="del xpress_xeditor_ui_lineThrough"><button type="button"><span>{$lang->edit->strike}</span></button></li>
+							<li class="aHref vRule xpress_xeditor_ui_hyperlink">
+								<button type="button" title="{$lang->edit->url}"><span>{$lang->edit->url}</span></button>
+								<!-- URL 레이어 -->
+								<div class="uri xpress_xeditor_hyperlink_layer" style="display:none;">
+									<fieldset>
+										<h3>{$lang->edit->hyperlink}</h3>
+										<input name="" class="link" type="text" value="http://" title="URL" />
+										<p><input name="" id="target" type="checkbox" value="" /><label for="target">{$lang->edit->target_blank}</label></p>
+										<div class="btn_area">
+											<span class="buttonGray small"><button type="button" class="confirm" title="{$lang->cmd_confirm}">{$lang->cmd_confirm}</button></span>
+											<span class="buttonGray small"><button type="button" class="cancel" title="{$lang->cmd_cancel}">{$lang->cmd_cancel}</button></span>
+										</div>
+									</fieldset>
+
+								</div>
+								<!-- /URL 레이어 -->
+							</li>
+							<li class="fColor xpress_xeditor_ui_fontColor">
+								<button type="button" title="{$lang->edit->help_fontcolor}"><span>{$lang->edit->fontcolor}</span></button>
+								<!-- 팔레트 레이어 -->
+								<div class="xpress_xeditor_fontcolor_layer" style="display:none;">
+									<ul class="palette xpress_xeditor_color_palette">
+										<li><button type="button" title="#ff0000" style="background:#ff0000"><span>#ff0000</span></button></li>
+										<li><button type="button" title="#ff6c00" style="background:#ff6c00"><span>#ff6c00</span></button></li>
+										<li><button type="button" title="#ffaa00" style="background:#ffaa00"><span>#ffaa00</span></button></li>
+										<li><button type="button" title="#ffef00" style="background:#ffef00"><span>#ffef00</span></button></li>
+										<li><button type="button" title="#a6cf00" style="background:#a6cf00"><span>#a6cf00</span></button></li>
+										<li><button type="button" title="#009e25" style="background:#009e25"><span>#009e25</span></button></li>
+										<li><button type="button" title="#00b0a2" style="background:#00b0a2"><span>#00b0a2</span></button></li>
+										<li><button type="button" title="#0075c8" style="background:#0075c8"><span>#0075c8</span></button></li>
+										<li><button type="button" title="#3a32c3" style="background:#3a32c3"><span>#3a32c3</span></button></li>
+										<li><button type="button" title="#7820b9" style="background:#7820b9"><span>#7820b9</span></button></li>
+										<li><button type="button" title="#ef007c" style="background:#ef007c"><span>#ef007c</span></button></li>
+										<li><button type="button" title="#000000" style="background:#000000"><span>#000000</span></button></li>
+										<li><button type="button" title="#252525" style="background:#252525"><span>#252525</span></button></li>
+										<li><button type="button" title="#464646" style="background:#464646"><span>#464646</span></button></li>
+										<li><button type="button" title="#636363" style="background:#636363"><span>#636363</span></button></li>
+										<li><button type="button" title="#7d7d7d" style="background:#7d7d7d"><span>#7d7d7d</span></button></li>
+										<li><button type="button" title="#9a9a9a" style="background:#9a9a9a"><span>#9a9a9a</span></button></li>
+										<li><button type="button" title="#ffe8e8" style="background:#ffe8e8"><span>#ffe8e8</span></button></li>
+										<li><button type="button" title="#f7e2d2" style="background:#f7e2d2"><span>#f7e2d2</span></button></li>
+										<li><button type="button" title="#f5eddc" style="background:#f5eddc"><span>#f5eddc</span></button></li>
+										<li><button type="button" title="#f5f4e0" style="background:#f5f4e0"><span>#f5f4e0</span></button></li>
+										<li><button type="button" title="#edf2c2" style="background:#edf2c2"><span>#edf2c2</span></button></li>
+										<li><button type="button" title="#def7e5" style="background:#def7e5"><span>#def7e5</span></button></li>
+										<li><button type="button" title="#d9eeec" style="background:#d9eeec"><span>#d9eeec</span></button></li>
+										<li><button type="button" title="#c9e0f0" style="background:#c9e0f0"><span>#c9e0f0</span></button></li>
+										<li><button type="button" title="#d6d4eb" style="background:#d6d4eb"><span>#d6d4eb</span></button></li>
+										<li><button type="button" title="#e7dbed" style="background:#e7dbed"><span>#e7dbed</span></button></li>
+										<li><button type="button" title="#f1e2ea" style="background:#f1e2ea"><span>#f1e2ea</span></button></li>
+										<li><button type="button" title="#acacac" style="background:#acacac"><span>#acacac</span></button></li>
+										<li><button type="button" title="#c2c2c2" style="background:#c2c2c2"><span>#c2c2c2</span></button></li>
+										<li><button type="button" title="#cccccc" style="background:#cccccc"><span>#cccccc</span></button></li>
+										<li><button type="button" title="#e1e1e1" style="background:#e1e1e1"><span>#e1e1e1</span></button></li>
+										<li><button type="button" title="#ebebeb" style="background:#ebebeb"><span>#ebebeb</span></button></li>
+										<li><button type="button" title="#ffffff" style="background:#ffffff"><span>#ffffff</span></button></li>
+										<li><button type="button" title="#e97d81" style="background:#e97d81"><span>#e97d81</span></button></li>
+										<li><button type="button" title="#e19b73" style="background:#e19b73"><span>#e19b73</span></button></li>
+										<li><button type="button" title="#d1b274" style="background:#d1b274"><span>#d1b274</span></button></li>
+										<li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
+										<li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
+										<li><button type="button" title="#61b977" style="background:#61b977"><span>#61b977</span></button></li>
+										<li><button type="button" title="#53aea8" style="background:#53aea8"><span>#53aea8</span></button></li>
+										<li><button type="button" title="#518fbb" style="background:#518fbb"><span>#518fbb</span></button></li>
+										<li><button type="button" title="#6a65bb" style="background:#6a65bb"><span>#6a65bb</span></button></li>
+										<li><button type="button" title="#9a54ce" style="background:#9a54ce"><span>#9a54ce</span></button></li>
+										<li><button type="button" title="#e573ae" style="background:#e573ae"><span>#e573ae</span></button></li>
+										<li><button type="button" title="#5a504b" style="background:#5a504b"><span>#5a504b</span></button></li>
+										<li><button type="button" title="#767b86" style="background:#767b86"><span>#767b86</span></button></li>
+										<li><button type="button" title="#00ffff" style="background:#00ffff"><span>#00ffff</span></button></li>
+										<li><button type="button" title="#00ff00" style="background:#00ff00"><span>#00ff00</span></button></li>
+										<li><button type="button" title="#a0f000" style="background:#a0f000"><span>#a0f000</span></button></li>
+										<li><button type="button" title="#ffff00" style="background:#ffff00"><span>#ffff00</span></button></li>
+										<li><button type="button" title="#951015" style="background:#951015"><span>#951015</span></button></li>
+										<li><button type="button" title="#6e391a" style="background:#6e391a"><span>#6e391a</span></button></li>
+										<li><button type="button" title="#785c25" style="background:#785c25"><span>#785c25</span></button></li>
+										<li><button type="button" title="#5f5b25" style="background:#5f5b25"><span>#5f5b25</span></button></li>
+										<li><button type="button" title="#4c511f" style="background:#4c511f"><span>#4c511f</span></button></li>
+										<li><button type="button" title="#1c4827" style="background:#1c4827"><span>#1c4827</span></button></li>
+										<li><button type="button" title="#0d514c" style="background:#0d514c"><span>#0d514c</span></button></li>
+										<li><button type="button" title="#1b496a" style="background:#1b496a"><span>#1b496a</span></button></li>
+										<li><button type="button" title="#2b285f" style="background:#2b285f"><span>#2b285f</span></button></li>
+										<li><button type="button" title="#45245b" style="background:#45245b"><span>#45245b</span></button></li>
+										<li><button type="button" title="#721947" style="background:#721947"><span>#721947</span></button></li>
+										<li><button type="button" title="#352e2c" style="background:#352e2c"><span>#352e2c</span></button></li>
+										<li><button type="button" title="#3c3f45" style="background:#3c3f45"><span>#3c3f45</span></button></li>
+										<li><button type="button" title="#00aaff" style="background:#00aaff"><span>#00aaff</span></button></li>
+										<li><button type="button" title="#0000ff" style="background:#0000ff"><span>#0000ff</span></button></li>
+										<li><button type="button" title="#a800ff" style="background:#a800ff"><span>#a800ff</span></button></li>
+										<li><button type="button" title="#ff00ff" style="background:#ff00ff"><span>#ff00ff</span></button></li>
+									</ul>
+								</div>
+								<!-- /팔레트 레이어 -->
+							</li>
+							<li class="bgColor xpress_xeditor_ui_bgColor">
+								<button type="button" title="{$lang->edit->help_fontbgcolor}"><span>{$lang->edit->fontbgcolor}</span></button>
+								<div class="xpress_xeditor_bgcolor_layer" style="display:none;"></div>
+							</li>
+							<li class="left vRule xpress_xeditor_ui_justifyleft">
+								<button type="button" title="{$lang->edit->help_align_left}"><span>{$lang->edit->align_left}</span></button>
+							</li>
+							<li class="center xpress_xeditor_ui_justifycenter">
+								<button type="button" title="{$lang->edit->help_align_center}"><span>{$lang->edit->align_center}</span></button>
+							</li>
+							<li class="right xpress_xeditor_ui_justifyright">
+								<button type="button" title="{$lang->edit->help_align_right}"><span>{$lang->edit->align_right}</span></button>
+							</li>
+							<li class="justify xpress_xeditor_ui_justifyfull">
+								<button type="button" title="{$lang->edit->help_align_justify}"><span>{$lang->edit->align_justify}</span></button>
+							</li>
+							<li class="character vRule xpress_xeditor_ui_sCharacter">
+								<button type="button" title="{$lang->edit->special_character}"><span>{$lang->edit->special_character}</span></button>
+								<!-- 특수문자 레이어 -->
+								<div class="layer xpress_xeditor_sCharacter_layer" style="display:none">
+									<h3>{$lang->edit->insert_special_character}</h3>
+									<button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
+									<ul class="nav">
+										<li><a href="#character1" class="on">{$lang->edit->symbol}</a></li>
+										<li><a href="#character2">{$lang->edit->number_unit}</a></li>
+										<li><a href="#character3">{$lang->edit->circle_bracket}</a></li>
+										<li><a href="#character4">{$lang->edit->korean}</a></li>
+										<li><a href="#character5">{$lang->edit->greece},{$lang->edit->Latin}</a></li>
+										<li><a href="#character6">{$lang->edit->japan}</a></li>
+									</ul>
+									<ul style="display: block;" id="character1" class="list"></ul>
+									<ul style="display: none;" id="character2" class="list"></ul>
+									<ul style="display: none;" id="character3" class="list"></ul>
+									<ul style="display: none;" id="character4" class="list"></ul>
+									<ul style="display: none;" id="character5" class="list"></ul>
+									<ul style="display: none;" id="character6" class="list"></ul>
+									<p>
+										<label for="preview">{$lang->edit->selected_symbol}</label>
+										<input id="preview" name="" type="text" />
+										<button type="button" title="{$lang->confirm}"><span>{$lang->confirm}</span></button>
+									</p>
+									<button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
+								</div>
+								<!-- /특수문자 레이어 -->
+							</li>
+						</ul>
+						<div class="inputRichText xpress_xeditor_editing_area_container">
+							<iframe src="{$editor_path}blank.html" frameborder="0" scrolling="yes" title="{$lang->edit->richtext_area}"></iframe>
+						</div>
+						<div class="resizeVertical xpress_xeditor_editingArea_verticalResizer">
+							<button type="button"><span>{$lang->edit->edit_height_control}</span></button>
+						</div>
+					</div>
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea link">
+			<!-- class="wArea link" | class="wArea link open" -->
+				<fieldset>
+					<legend>{$lang->edit->link}</legend>
+					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_site_name}" />
+					<input name="" type="text" class="inputLink" value="" title="http://" />
+					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_explain}" />
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea list">
+			<!-- class="wArea list" | class="wArea list open" -->
+				<fieldset>
+					<legend>{$lang->cmd_list}</legend>
+					<ul class="toolbar">
+						<li><button type="button" class="type_disc"><span>disc</span></button></li>
+						<li><button type="button" class="type_circle"><span>circle</span></button></li>
+						<li><button type="button" class="type_square"><span>square</span></button></li>
+						<li><button type="button" class="type_decimal"><span>decimal</span></button></li>
+						<li><button type="button" class="type_lower-alpha"><span>lower alpha</span></button></li>
+						<li><button type="button" class="type_upper-alpha"><span>upper alpha</span></button></li>
+						<li><button type="button" class="type_lower-roman"><span>lower roman</span></button></li>
+						<li><button type="button" class="type_upper-roman"><span>upper roman</span></button></li>
+					</ul>
+					<div class="listArea"></div>
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+						<p class="info">{$lang->edit->list_explain}</p>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea quote">
+			<!-- class="wArea blockquote" | class="wArea blockquote open" -->
+				<fieldset>
+					<legend>{$lang->edit->blockquote}</legend>
+					<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_blockquote}"></textarea>
+					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea img">
+			<!-- class="wArea img" | class="wArea img open" -->
+				<fieldset>
+					<legend>{$lang->edit->image}</legend>
+					<input name="Filedata" type="file" class="inputFile" title="{$lang->edit->find_image}" />
+					<p class="uploading">{$lang->edit->uploading} <button type="button">{$lang->cmd_cancel}</button> <span></span></p>
+					<p class="info">{sprintf($lang->edit->uploading_info,($file_config->allowed_filesize/(1024*1024)))}</p>
+					<div class="hr"></div>
+					<div class="image">
+						<img src="" alt="{$lang->edit->uploaded_image}" />
+					</div>
+					<div class="align">
+						<dl>
+							<dt>{$lang->edit->image_align} :</dt>
+							<dd>
+								<input type="radio" name="align" id="img_align_left" value="left" /><label for="img_align_left">{$lang->edit->align_left}</label>
+								<input type="radio" name="align" id="img_align_center" value="center" /><label for="img_align_center">{$lang->edit->align_center}</label>
+								<input type="radio" name="align" id="img_align_right" value="right" /><label for="img_align_right">{$lang->edit->align_right}</label>
+							</dd>
+						</dl>
+					</div>
+					<div class="resize">
+						<dl>
+							<dt>{$lang->edit->image_width} :</dt>
+							<dd><em></em> px → <input name="" type="text" class="width copy" value="" title="" /> px <span class="buttonGray medium"><button type="button" class="btn_resize">{$lang->edit->resize}</button></span> <span class="resizeInfo">{$lang->edit->resize_info}</span></dd>
+						</dl>
+						<p class="resizeError">{$lang->edit->resize_error}</p>
+					</div>
+					<input name="" type="text" class="inputText desc" value="" title="{$lang->edit->insert_image_explain}" />
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea movie">
+			<!-- class="wArea mov" | class="wArea mov open" -->
+				<fieldset>
+					<legend>{$lang->edit->mov}</legend>
+					<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_mov}"></textarea>
+					<textarea name="" cols="50" rows="5" class="inputTextarea" title="{$lang->edit->insert_mov_explain}"></textarea>
+					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<!--@if($allow_fileupload)-->
+			<!--%import("js/uploader.js",optimized=false)-->
+			<!--%import("../../tpl/js/swfupload.js",optimized=false)-->
+			<script type="text/javascript">//<![CDATA[
+                uploaderSettings=
+                    {
+					"editorSequence" : {$editor_sequence},
+					"sessionName" : "{session_name()}",
+					"allowedFileSize" : "{$file_config->allowed_filesize}",
+					"allowedFileTypes" : "{$file_config->allowed_filetypes}",
+					"allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
+					"insertedFiles" : {(int)$files_count},
+					"replaceButtonID" : "swfUploadButton{$editor_sequence}",
+					"fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
+					"previewAreaID" : "preview_uploaded_{$editor_sequence}",
+					"uploaderStatusID" : "uploader_status_{$editor_sequence}"
+				};
+				//reloadFileList(editorUploadSettings);
+			//]]></script>
+			<div class="wArea file">
+			<!-- class="wArea file" | class="wArea file open" -->
+				<fieldset>
+				<legend>{$lang->edit->file}</legend>
+                 <span id="swfUploadButton{$editor_sequence}" class="buttonFileUpload"><button type="button">{$lang->edit->file_select}</button></span>
+					<p class="info">{sprintf($lang->edit->file_uploadinfo,($file_config->allowed_filesize/(1024*1024)),($file_config->allowed_attach_size/(1024*1024)))} <!--button type="button" class="help">파일 업로드에 문제가 발생하는 경우 클릭.</button--></p>
+					<!--input name="" type="file" class="inputFile" title="파일 찾기" /-->
+					<!-- class="inputFile" | class="inputFile open" -->
+					<div class="hr"></div>
+					<dl class="attachedFile">
+						<dd style="display:none"><strong>{filename}</strong> <em>{filesize}</em> <button type="button" class="buttonDelete"><span>{$lang->cmd_delete}</span></button></dd>
+					</dl>
+					<p class="summary">{$lang->edit->file_total} <em class="filesize">{total_filesize}</em></p>
+					<div class="hr"></div>
+					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_file_explain}" />
+					<input name="" type="text" class="inputText" value="" title="{$lang->edit->insert_cite}" />
+					<div class="buttonArea">
+				<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+			<!--@end-->
+
+			<div class="wArea hr">
+			<!-- class="wArea hr" | class="wArea hr open" -->
+				<fieldset>
+					<legend>{$lang->edit->hr}</legend>
+					<ul>
+						<li><span class="hRule"></span><input name="hr" type="radio" value="hline" id="hr1" class="inputRadio" checked="checked" /> <label for="hr1">{$lang->edit->hr_simple}</label></li>
+					</ul>
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea index">
+			<!-- class="wArea index" | class="wArea index open" -->
+				<fieldset>
+					<legend>{$lang->edit->toc}</legend>
+					<div class="buttonArea">
+						<span class="buttonGray medium strong"><button type="button" title="Ctrl+Enter"><img src="img/iconCheckSmall.gif" width="12" height="8" alt="" class="icon" />{$lang->cmd_confirm}</button></span>
+						<span class="buttonGray medium"><button type="button" title="ESC"><img src="img/buttonCloseLayerX.gif" width="7" height="7" alt="" class="icon" />{$lang->cmd_cancel}</button></span>
+						<p class="info">{$lang->edit->toc_explain}</p>
+					</div>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea mArea material">
+			<!-- class="mArea" | class="mArea open" -->
+				<fieldset>
+					<legend>{$lang->edit->materials}</legend>
+					<h4 class="h4">{$lang->edit->materials}</h4>
+					<div class="controls">
+						<span class="buttonDrEditor black"><button type="button" class="_reload">{$lang->edit->refresh}</button></span>
+						<span class="buttonDrEditor black"><button type="button" class="_close">{$lang->edit->close_materials}</button></span>
+					</div>
+					<p class="noData">{$lang->edit->no_materials}</p>
+					<div class="_container">
+						<dl>
+							<dt>{regdate}</dt>
+							<dd>
+								<div class="eArea">{content}</div>
+								<span class="buttonDrEditor green small"><button type="button">{$lang->edit->insert}</button></span>
+							</dd>
+						</dl>
+					</div>
+					<!-- pagenate -->
+					<div class="paginate">
+						<button type="button" class="prev" title="{$lang->edit->paging_prev_help}"><span>{$lang->edit->paging_prev}</span></button>
+						<button type="button" class="next" title="{$lang->edit->paging_next_help}"><span>{$lang->edit->paging_next}</span></button>
+						<span>{current}/{total}</span>
+					</div>
+					<!-- pagenate -->
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<div class="wArea mArea help">
+			<!-- class="mArea" | class="mArea open" -->
+				<fieldset>
+					<legend>{$lang->edit->help}</legend>
+					<h4 class="h4">{$lang->edit->help}</h4>
+					<div class="controls">
+						<span class="buttonDrEditor black"><button type="button">{$lang->edit->close_help}</button></span>
+					</div>
+					<dl>
+						<dt>{$lang->edit->help_first_dt_1}</dt>
+						<dd>{$lang->edit->help_first_dd_1}</dd>
+						<dt>{$lang->edit->help_first_dt_2}</dt>
+						<dd>{$lang->edit->help_first_dd_2}</dd>
+						<dt>{$lang->edit->help_first_dt_3}</dt>
+						<dd>{$lang->edit->help_first_dd_3}</dd>
+						<dt>{$lang->edit->help_first_dt_4}</dt>
+						<dd>{$lang->edit->help_first_dd_4}</dd>
+						<dt>{$lang->edit->help_first_dt_5}</dt>
+						<dd>{$lang->edit->help_first_dd_5}</dd>
+					</dl>
+					<span class="cap capTL"></span>
+					<span class="cap capTR"></span>
+					<span class="cap capBL"></span>
+					<span class="cap capBR"></span>
+				</fieldset>
+			</div>
+
+			<!-- wArea blank-->
+			<div class="wArea blank">
+			<!-- class="wArea blank" | class="wArea blank open" -->
+				<h4 class="h4">{$lang->edit->help_first_title}</h4>
+				<dl>
+					<dt>{$lang->edit->help_first_dt_1}</dt>
+					<dd>{$lang->edit->help_first_dd_1}</dd>
+					<dt>{$lang->edit->help_first_dt_2}</dt>
+					<dd>{$lang->edit->help_first_dd_2}</dd>
+					<dt>{$lang->edit->help_first_dt_3}</dt>
+					<dd>{$lang->edit->help_first_dd_3}</dd>
+					<dt>{$lang->edit->help_first_dt_4}</dt>
+					<dd>{$lang->edit->help_first_dd_4}</dd>
+					<dt>{$lang->edit->help_first_dt_5}</dt>
+					<dd>{$lang->edit->help_first_dd_5}</dd>
+				</dl>
+				<p class="drEditorBugReport"><a href="http://xe.xpressengine.net/?mid=issuetracker&amp;act=dispIssuetrackerViewIssue" target="_blank" title="{$lang->edit->cmd_new_window}">{$lang->edit->help_bug_report}</a></p>
+				<span class="cap capTL"></span>
+				<span class="cap capTR"></span>
+				<span class="cap capBL"></span>
+				<span class="cap capBR"></span>
+			</div>
+			<!-- /wArea blank-->
+
+			<!-- External Components -->
+			<!--@foreach($drComponentList as $k=>$v)-->
+			{$v->html}
+			<!--@endforeach-->
+			<!-- /External Components -->
+
+			<!-- wToolbar -->
+			<div class="wToolbarContainer">
+			<!-- class="wToolbarContainer" | class="wToolbarContainer more" -->
+				<div class="wToolbar">
+				<!-- class="wToolbar" | class="wToolbar hx | txt | link | list | quote | img | movie | file | hr | index | material | help" -->
+					<ul>
+						<!--<li class="close"><button type="button" title="{$lang->edit->close_toolbar}(~)"></button></li>-->
+						<!--@foreach($enable_tool as $k => $v)-->
+							<!--@if($k<9)-->
+								{@$_title = $lang->edit->help_shortcut.'('.($k+1).')'}
+							<!--@else-->
+								{@$_title = ''}
+							<!--@endif-->
+							<!--@if($v=='hx')-->
+							<li class="hx"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->title_title}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='txt')-->
+							<li class="txt"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->text}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='link')-->
+							<li class="link"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->link}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='list')-->
+							<li class="list"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->list}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='quote')-->
+							<li class="quote"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->blockquote}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='img')-->
+							<li class="img"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->image}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='movie')-->
+							<li class="movie"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->mov}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='file' && $allow_fileupload)-->
+							<li class="file"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->file}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='hr')-->
+							<li class="hr"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->hr}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='index')-->
+							<li class="index"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->toc}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($v=='material')-->
+							<li class="material"><button type="button" title="{$_title}"><span class="tx">{$lang->edit->material}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@elseif($drComponentList[$v])-->
+							<li class="{$v}"><button type="button" title="{$_title}"><span class="tx">{$drComponentList[$v]->title}</span></button><span class="dragable">{$lang->edit->move_button}</span></li>
+							<!--@end-->
+						<!--@end-->
+						<li class="help"><button type="button"><span class="tx">{$lang->edit->help}</span></button></li>
+						<li class="more"><button type="button" title="(0)"><span class="tx">{$lang->edit->more}</span><span class="nx">0</span></button></li>
+					</ul>
+					
+					<!-- JS for Prototype -->
+					<script type="text/javascript">
+					//<![CDATA[
+						jQuery(function($){
+							$('.wToolbar button').slice(0,9).append('<span class="nx"></span>');
+							$('.wToolbar li').slice(0,9).each(function(i){
+								$(this).find('.nx').append(i+1);
+							});
+						});
+					//]]>
+					</script>
+					<!-- /JS for Prototype -->
+					
+					<!--
+					<div class="shortcut">
+						<ul>
+							<li><span>1</span></li>
+							<li><span>2</span></li>
+							<li><span>3</span></li>
+							<li><span>4</span></li>
+							<li><span>5</span></li>
+							<li><span>6</span></li>
+							<li><span>7</span></li>
+							<li><span>8</span></li>
+							<li><span>9</span></li>
+							<li class="more"><span>0</span></li>
+						</ul>
+					</div>
+					-->
+					
+					<span class="cap capLeft"></span>
+					<span class="cap capRight"></span>
+					<span class="top topLeft"></span>
+					<span class="top topRight"></span>
+					<span class="arrow"></span>
+				</div>
+			</div>
+			<!-- /wToolbar -->
+
+		</div>
+		<!-- /Editor Area -->
+	</div>
+</div>
+<!-- /에디터 -->
+
+<!-- 에디터 활성화 -->
+<script type="text/javascript">//<![CDATA[
+var editor_path = "{$editor_path}";
+
+var auto_saved_msg = "{$lang->msg_auto_saved}";
+var delete_dr_confirm_msg = "{$lang->edit->msg_dr_delete_confirm}";
+var no_selected_object_msg = "{$lang->edit->msg_no_selected_object}";
+var insert_value_msg = "{$lang->edit->msg_insert_value}";
+var submit_without_saving_msg = "{$lang->edit->confirm_submit_without_saving}";
+var msg_close_before_write = "{$lang->msg_close_before_write}";
+
+if (typeof(xe.lang) == 'undefined') xe.lang = {};
+xe.lang.attached_files = '{$lang->edit->attached_files}';
+xe.lang.shortcut = '{$lang->edit->help_shortcut}';
+xe.lang.drag_this = '{$lang->edit->drag_this}';
+xe.lang.cmd_del = '{$lang->edit->cmd_del}';
+
+editorStart_xe(
+	'{$editor_sequence}',
+	'{$editor_primary_key_name}',
+	'{$editor_content_key_name}',
+	'{$editor_height}',
+	'{$colorset}',
+	'{$content_style}',
+	'{$content_font}',
+	'{$content_font_size}'
+);
+//]]></script>
diff --git a/modules/editor/skins/dreditor/js/DrEditor.js b/modules/editor/skins/dreditor/js/DrEditor.js
index 99054ea74..8f4709429 100644
--- a/modules/editor/skins/dreditor/js/DrEditor.js
+++ b/modules/editor/skins/dreditor/js/DrEditor.js
@@ -1,2599 +1,2599 @@
-/**
- * 단락에디터 Paragraph Editor
- * @author NHN (developers@xpressengine.com)
- */
-(function($){
-
-var configs = {};
-
-var TOOLSET_LENGTH = 9;
-
-var DrEditor = xe.createApp('DrEditor', {
-	loaded   : false,
-	last_seq : 0,
-	toolset_offset : 0,
-	init : function() {
-	},
-	getConfig : function(seq) {
-		return configs[seq] || {};
-	},
-	API_ONREADY : function(sender, params) {
-		var self = this;
-
-		$.each(configs, function(seq, val){
-			var _container = $('div#DrEditor'+seq);
-			var _writeArea = _container.find('>div>div.writeArea:first');
-			var _editArea  = _container.find('>div>div.editorArea:first');
-			var _dummyArea = $('<div class="dummy" style="display:none">').appendTo(_writeArea);
-			var _blankBox  = _writeArea.find('>div.blank:first').prependTo(_writeArea);
-			var _toolbar   = _writeArea.find('>.wToolbarContainer>div.wToolbar');
-			var _editTool  = _writeArea.find('ul.eTool').remove();
-			var _hookerBtn = $('<button type="button" class="_hookerBtn">').attr('seq', seq).css({position:'absolute',width:'1px',height:'1px',left:'-2000px',top:0}).prependTo(_container);
-			var $numbers;
-
-			//  toolbar buttons
-			_toolbar
-				.find('button')
-				.hover(
-					function(){ $(this).parent().addClass('hover'); },
-					function(){ $(this).parent().removeClass('hover'); }
-				)
-				.click(
-					function(event){					
-						var type = $(this).parent().attr('class').toUpperCase().split(' ')[0];
-						self.cast('CLICK_TOOLBUTTON', [seq, this, type]);
-						
-						return false;
-					}
-				);
-
-			// _blankBox
-			//_blankBox.dblclick(function(){ self.cast('OPEN_EDITOR', [seq, null, null, 'HX']); });
-
-			// toolbar button sortable
-			_toolbar.children('ul:first')
-				.sortable({items  : '>li'})
-				.bind('sortstop', function(){
-					var tools = [];
-
-					if (!$numbers) {
-						($numbers = _toolbar.find('button .nx')).sort(function(a, b){				
-							return (parseInt(a.firstChild.nodeValue,10) > parseInt(b.firstChild.nodeValue,10))?1:-1;
-						});
-					}
-
-					_toolbar.find('li').each(function(i){
-						var t = $(this), $btn = t.find('>button'), title = '';
-						tools.push(t.attr('class'));
-
-						if (i < 9) {
-							title = xe.lang.shortcut + '('+(i+1)+')';
-							$btn.append($numbers.eq(i+1));
-						}
-						$btn.attr('title', title);
-					});
-
-					tools = tools.join(',');
-					if (tools) {
-						var expires = (new Date()).getTime() + 7 * 24 * 3600 * 1000; // one week
-						document.cookie = 'DrEditorToolbar='+tools+'; expires='+(new Date(expires)).toGMTString()+'; path=/;';
-					}
-				});
-
-			// container
-			_editArea
-				.sortable({
-					axis   : 'y',
-					items  : '>div.eArea',
-					handle : '>div.drag_handle',
-					placeholder : 'xe_dr_placeholder'
-				});
-
-			// focus hook event
-			_hookerBtn
-				.focus (function(){
-					if(!_editArea.children('div.eFocus,div.wArea:visible').length) self.cast('SELECT_PARAGRAPH', [seq, _editArea.find('>div:first')]);
-					self.last_seq = seq;
-				});
-
-			configs[seq] = $.extend(configs[seq], {
-				sequence  : seq,
-				container : _container,
-				editArea  : _editArea,
-				writeArea : _writeArea,
-				blankBox  : _blankBox,
-				toolbar   : _toolbar,
-				editTool  : _editTool,
-				hookerBtn : _hookerBtn,
-				selFirst  : null,
-				selLast   : null,
-				last_type : ''
-			});
-
-			if (!self.last_seq) self.last_seq = seq;
-		});
-
-		function getPara(event) {
-			var target = $(event.target);
-			if(target.is('a,button,:input')) return null;
-
-			var para = target.parents('div').andSelf().filter('div.eArea:first');
-
-			return para.length?para:null;
-		};
-
-		function falseFunc(){ return false; };
-
-		$(document).mousedown(function(event) {
-			var target = $(event.target);
-
-			if(!is_left_click(event)) return true;
-			if(target.is('a,button,:input')) return true;
-			if(target.parents('div.wToolbar:first').length) return true;
-
-			var para = target.parents('div').andSelf().filter('div.eArea:first');
-			if(!para.length) {
-				self.cast('CLEAR_SELECTION', [seq]);
-				return true;
-			}
-			if(para.parents('div.material:first').length) return true;
-
-			var seq = para.parents('form:first')[0].elements['editor_sequence'].value;
-			
-			if (configs[seq].editArea.children('div.wArea:visible').length) {
-				// save
-				if (configs[seq].last_type) self.cast('CLOSE_EDITOR', [seq, true, configs[seq].last_type]);
-			}
-
-			// multiple selection
-			if (event.shiftKey) {
-				if (configs[seq].selFirst) {
-					var children  = configs[seq].editArea.children('div');
-					var nSelFirst = children.index(configs[seq].selFirst);
-					var nPara     = children.index(para);
-					var nStart    = Math.min(nSelFirst, nPara);
-					var nEnd      = Math.max(nSelFirst, nPara);
-
-					self.cast('CLEAR_SELECTION');
-					self.cast('SELECT_PARAGRAPH', [seq, children.slice(nStart,nEnd+1), children.eq(nSelFirst), para]);
-				} else {
-					self.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
-				}
-			} else if (event.ctrlKey) {
-				if (para.hasClass('eFocus')) {
-					self.cast('UNSELECT_PARAGRAPH', [seq, para, para, para]);
-				} else {
-					self.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
-				}
-			} else {
-				self.cast('CLEAR_SELECTION');
-				self.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
-			}
-
-			return false;
-		});
-
-		// global doubleclick
-		$(document).dblclick(function(event){
-			var target = $(event.target);
-			if(target.is('a,button,:input')) return true;
-			if(event.shiftKey || event.ctrlKey) return true;
-
-			var para = target.parents('div').andSelf().filter('div.eArea:first');
-			if(!para.length) return true;
-
-			var seq  = para.parents('form:first')[0].elements['editor_sequence'].value;
-			var type = para.attr('type');
-
-			if (type) {
-				self.cast('CLEAR_SELECTION');
-				self.cast('OPEN_EDITOR', [seq, para, null, type]);
-			}
-		});
-
-		$(document).keydown(function(event){
-			var target = $(event.target);
-			if(!event.altKey && !event.ctrlKey && !event.metaKey && target.is(':input:not(button._hookerBtn)')) return true;
-			if(event.keyCode == 16 && event.shiftKey) return true; // only shift key
-			if(event.keyCode == 17 && event.ctrlKey)  return true; // only ctrl key
-			if(event.keyCode == 18 && event.altKey)   return true; // only alt key
-			if(event.keyCode == 9) return true;
-
-			var ret = self.cast('ONKEYDOWN', [self.last_seq, event]);
-			if (ret == true || ($.isArray(ret) && $.inArray(ret, true))) return false;
-		});
-
-		// scroll event
-		var _scrollTimer = null;
-		$(window).scroll(function(event){
-			if (_scrollTimer) clearTimeout(_scrollTimer);
-			_scrollTimer = setTimeout(function(){
-				_scrollTimer = null;
-				self.cast('ONSCROLL');
-			}, 10);
-		});
-	},
-	API_ONLOAD : function(sender, params) {
-		var self = this;
-
-		this.loaded = true;
-		$.each(configs, function(seq,val){ self.cast('TOOLBAR_REPOSITION', [seq]) });
-	},
-	API_CREATE_EDITOR : function(sender, params) {
-		configs[params[0]] = {form:params[1]};
-	},
-	API_GET_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var box = configs[seq].editArea.contents().clone();
-		var dum = $('<div>').append(box);
-		var htm = '';
-
-		// remove no-content area
-		dum.find('>div.wArea,>div.eArea>div.drag_handle,>div.eArea>button.del').remove();
-
-		// getting content
-		this.cast('GETTING_CONTENT', [seq, dum]);
-
-		htm = dum
-				.html()
-				.replace(
-					/<(img|br)([^>]*)\/?>/gi,
-					function(m0,m1,m2){
-						var ret = ['<'+m1];
-						(m2 = $.trim(m2))?ret.push(m2):0;
-						ret.push('/>');
-
-						return ret.join(' ');
-					}
-				);
-
-		return htm;
-	},
-	API_SET_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var txt = params[1];
-
-		// clear all document
-		this.cast('CLEAR', [seq]);
-
-		// process text
-		var dum = $('<div>').html( txt );
-		this.cast('SETTING_CONTENT', [seq, dum]);
-
-		// set content
-		if(configs[seq] && configs[seq].editArea) {
-			configs[seq].editArea.append(dum.children('div.eArea'));
-		}
-	},
-	API_AFTER_SET_CONTENT : function(sender, params) {
-		var seq = params[0];
-
-		// show or hide blankbox
-		if(configs[seq].editArea.find('>div.eArea').length) {
-			configs[seq].blankBox.hide();
-		} else {
-			configs[seq].blankBox.show();
-		}
-	},
-	API_CLEAR : function(sender, params) {
-		var seq = params[0];
-		if(configs[seq] && configs[seq].editArea) configs[seq].editArea.empty();
-	},
-	API_GET_SELECTED_PARAGRAPH : function(sender, params) {
-		var seq = params[0];
-		return configs[seq].editArea.children('div.eFocus');
-	},
-	API_SELECT_PARAGRAPH : function(sender, params) {
-		var seq = params[0];
-		var par = params[1]; // clicked paragraph
-		var fir = params[2]; // selection first
-		var las = params[3]; // selection last
-		var self = this;
-
-		configs[seq].selFirst = fir || null;
-		configs[seq].selLast  = las || null;
-
-		var box = (las || fir || par).eq(0), top;
-
-		if (box && box.length) {
-			top = box.position().top + Math.floor(box.height()/2);
-			configs[seq].hookerBtn.css('top', top+'px');
-		}
-
-		par.addClass('eFocus');
-
-		if (par.length) {
-			configs[seq].hookerBtn.focus();
-			par.each(function(){
-				var t = $(this);
-				if (!t.find('>div.drag_handle:first').length) {
-					t.prepend('<div class="drag_handle left" title="'+xe.lang.drag_this+'" />');
-					t.prepend('<div class="drag_handle right" title="'+xe.lang.drag_this+'" />');
-				}
-			});
-
-			par = par.parent().find('>.eFocus');
-			par.find('>button.del').remove();
-			$('<button type="button" class="del"><span>'+xe.lang.cmd_del+'</span></button>')
-				.click(function(){ self.cast('DELETE_PARAGRAPH', [seq, par]); return false; })
-				.appendTo(par.eq(0));
-		}
-
-		if ($.browser.msie) {
-			try { document.selection.createRange().collapse(true) } catch(e) {};
-		}
-	},
-	API_UNSELECT_PARAGRAPH : function(sender, params) {
-		var seq = params[0];
-		var par = params[1]; // clicked paragraph
-
-		par.removeClass('eFocus').find('>button.del').remove();
-	},
-	API_CLEAR_SELECTION : function(sender, params) {
-		var skip_seq = params[0];
-
-		$.each(configs, function(seq){
-			if(skip_seq && skip_seq == seq) return true;
-
-			$(this.editArea.children('div.eFocus')).removeClass('eFocus');
-			this.selFirst  = null;
-			this.selLast   = null;
-		});
-	},
-	API_SAVE_PARAGRAPH : function(sender, params) {
-		var seq = params[0];
-		var _editor = params[1];
-		var _box    = params[2];
-		var _type   = (params[3]||'').toLowerCase();
-
-		if (_type) _box.addClass('eArea _'+_type).attr('type', _type);
-		if (_editor && _box) _editor.before(_box);
-	},
-	API_DELETE_PARAGRAPH : function(sender, params) {
-		var self   = this;
-		var seq    = params[0];
-		var target = params[1];
-
-		if (target && target.length) {
-			var prev = target.eq(0).prev('div.eArea');
-			var next = target.eq(target.length-1).next('div.eArea');
-
-			target
-				.removeClass('eFocus')
-				.hide('fast', function(){
-					$(this).remove();
-					self.cast('TOOLBAR_REPOSITION', [seq]);
-					if (!configs[seq].editArea.children('div.eArea:first').length) configs[seq].blankBox.show();
-				});
-
-			if (next.length) this.cast('SELECT_PARAGRAPH', [seq, next, next, next]);
-			else if (prev.length) this.cast('SELECT_PARAGRAPH', [seq, prev, prev, prev]);
-		}
-	},
-	API_CLICK_TOOLBUTTON : function(sender, params) {
-		var seq    = params[0];
-		var button = $(params[1]);
-		var type   = params[2];
-		var selbox = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
-
-		if(selbox.length) selbox = selbox.eq(0);
-		else selbox = null;
-
-		var editor = configs[seq].editArea.children('div.wArea:visible');
-		if (editor.length) {
-			if (editor.is(type)) this.cast('CLOSE_EDITOR', [seq, false, type]);
-		} else {
-			this.cast('CLEAR_SELECTION');
-			this.cast('OPEN_EDITOR', [seq, null, selbox, type]);
-		}
-	},
-	API_ONSCROLL : function(sender, params) {
-		var self = this;
-		if (this.loaded) {
-			$.each(configs, function(seq,val){ self.cast('TOOLBAR_REPOSITION', [seq]) });
-		}
-	},
-	API_ONKEYDOWN : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var event = params[1];
-		var key = event.keyCode, ctrl = event.ctrlKey, meta = event.metaKey, alt = event.altKey, shift = event.shiftKey;
-		var ENTER = 13, UP = 38, DOWN = 40, DEL = 46;
-		var selection, para, prev, next;
-
-		if ($(event.target).is(':text')) return false;
-
-		// hit enter to edit a selected paragraph
-		if(key == ENTER) {
-			configs[seq].editArea.children('div.eFocus:first').dblclick();
-			return true;
-		}
-
-		if (key == UP || key == DOWN) {
-			if (ctrl) { // hit ctrl + up, down to move paragraphs
-				selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
-
-				if (key == UP) {
-					prev = selection.eq(0).prev('div.eArea');
-
-					if (prev.length) prev.before(selection);
-					else configs[seq].editArea.prepend(selection);
-				} else {
-					next = selection.eq(selection.length-1).next('div.eArea');
-
-					if (next.length) next.after(selection);
-					else configs[seq].editArea.append(selection);
-				}
-
-				setTimeout(function(){ self.cast('ONMOVE_PARAGRPH', [seq]) }, 0);
-			} else if (shift) { // hit shift + up, down to select multiple paragraphs
-				var children  = configs[seq].editArea.children('div.eArea');
-				var current   = configs[seq].selLast || configs[seq].selFirst;
-				
-				if (key == UP) {
-					if ((prev=current.prev('div.eArea')).length) current = prev;
-				} else {
-					if ((next=current.next('div.eArea')).length) current = next;
-				}
-
-				var nSelFirst = children.index(configs[seq].selFirst);
-				var nCurrent  = children.index(current);
-				var nStart    = Math.min(nSelFirst, nCurrent);
-				var nEnd      = Math.max(nSelFirst, nCurrent);
-
-				this.cast('CLEAR_SELECTION');
-				this.cast('SELECT_PARAGRAPH', [seq, children.slice(nStart,nEnd+1), children.eq(nSelFirst), current]);
-			} else { // hit up or down arrow to move selection
-				selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
-
-				if (key == UP) {
-					prev = selection.eq(0).prev('div.eArea');
-
-					if (prev.length) para = prev;
-					else para = selection.eq(0);
-				} else {
-					next = selection.eq(selection.length-1).next('div.eArea');
-
-					if (next.length) para = next;
-					else para = selection.eq(selection.length-1);
-				}
-
-				this.cast('CLEAR_SELECTION');
-				this.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
-			}
-
-			selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
-			this.cast('SCROLL_INTO_VIEW', [seq, selection, (key==UP)?'top':'bottom']);
-
-			return true;
-		}
-
-		// delete key
-		if (key == DEL) {
-			selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
-			this.cast('DELETE_PARAGRAPH', [seq, selection]);
-
-			return true;
-		}
-
-		// number key
-		if (48 <= key && key <= 58) {
-			var buttons = configs[seq].toolbar.find('button');
-			if (key == 48) key = buttons.length+48;
-			buttons.eq(key-49).click();
-
-			return true;
-		}
-
-		// change toolset
-		if (key == 192) {
-			var ul   = configs[seq].toolbar.find('ul:first');
-			var lis  = ul.find('>li');
-			var more = lis.eq(lis.length-1);
-
-			if ((lis.length-1) % TOOLSET_LENGTH) {
-				var empty_len = TOOLSET_LENGTH - ((lis.length-1) % TOOLSET_LENGTH);
-				for(;empty_len--;) more.before('<li class="blank" style="height:57px;" />');
-				lis = ul.find('>li');
-			}
-
-			var toolset_count = (lis.length-1) / 9
-
-			this.toolset_offset++;
-			if (this.toolset_offset >= toolset_count) this.toolset_offset = 0;
-
-			more.before( lis.slice(0,TOOLSET_LENGTH) );
-		}
-	},
-	API_ADD_DEFAULT_EDITOR_ACTION : function(sender, params) {
-		var self   = this;
-		var seq    = params[0];
-		var editor = params[1];
-		var type   = (params[2]||'').toUpperCase();
-
-		// save and cancel button
-		var _buttons = editor.find('div.buttonArea button');
-		_buttons.eq(0).click(function(){ self.cast('CLOSE_EDITOR', [seq, true, type]); }); // save button
-		_buttons.eq(1).click(function(){ self.cast('CLOSE_EDITOR', [seq, false, type]); }); // cancel button
-
-		// textbox default value
-		editor.find('input[type=text],textarea')
-			.focus(function(){ if($.trim(this.value) == this.title) this.value = ''; })
-			.blur(function(){ var val=$.trim(this.value); if (val==this.title || val == '') this.value = this.title; })
-			.filter('input').keydown(function(event){ if(event.keyCode == 13) return false; });
-
-		// set default checkbox and radio button
-		editor.find('input[type=checkbox],input[type=radio]').filter(':checked').addClass('_default_check');
-
-		editor.find('input,textarea').keydown(function(event){
-			var ESC = 27, ENTER = 13;
-
-			if (!configs[seq].last_type) return true;
-
-			if (event.keyCode == 27) {
-				self.cast('CLOSE_EDITOR', [seq, false, configs[seq].last_type]);
-				return false;
-			}
-
-			if (event.ctrlKey && event.keyCode == ENTER) {
-				self.cast('CLOSE_EDITOR', [seq, true, configs[seq].last_type]);
-				return false;
-			}
-		});
-	},
-	API_RESET_EDITOR : function(sender, params) {
-		var seq    = params[0];
-		var editor = params[1];
-		var type   = (params[2]||'').toUpperCase();
-
-		// reset textbox
-		editor.find('input[type=text],textarea').each(function(){ this.value = this.title; });
-
-		// reset checkbox and radio buttons
-		editor.find('input[type=checkbox],input[type=radio]').filter('._default_check').attr('checked', 'checked');
-	},
-	API_TOOLBAR_REPOSITION : function(sender, params) {
-		var seq         = params[0];
-		var toolbar     = configs[seq].toolbar.parent();
-		var view_bottom = $(window).scrollTop() + document.documentElement.clientHeight; //scroll_top + doc_height
-		var old_top     = toolbar.css('top');
-		var offset_top  = toolbar.css('top', 0).offset().top;
-		var new_top     = Math.min( ((view_bottom - toolbar.height()) - offset_top - 5), 0);
-
-		if (old_top != new_top) toolbar.css('top', new_top+'px');
-	},
-	API_OPEN_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var box  = params[1]; // selection to edit
-		var bef  = params[2]; // selection to be before this editor
-		var type = params[3];
-
-		this.cast('OPEN_'+type.toUpperCase()+'_EDITOR', [seq, box, bef]);
-		configs[seq].last_type = type;
-		configs[seq].blankBox.hide();
-
-		this.cast('TOOLBAR_REPOSITION', [seq]);
-	},
-	API_CLOSE_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = !!params[1];
-		var type = params[2];
-
-		this.cast('CLOSE_'+type.toUpperCase()+'_EDITOR', [seq, save]);
-
-		if (configs[seq].editArea.children('div.eArea').length) {
-			configs[seq].blankBox.hide();
-		} else {
-			configs[seq].blankBox.show();
-		}
-
-		this.cast('TOOLBAR_REPOSITION', [seq]);
-	},
-	API_SCROLL_INTO_VIEW : function(sender, params) {
-		var seq  = params[0];
-		var sel  = params[1];
-		var edge = params[2];
-
-		if (!sel || !sel.length) return;
-		if (!edge) {
-			this.cast('SCROLL_INTO_VIEW', [seq, sel, 'bottom']);
-			this.cast('SCROLL_INTO_VIEW', [seq, sel, 'top']);
-			return;
-		}
-		if (edge != 'top' && edge != 'bottom') edge = 'top';
-
-		var pos, view_height = $(window).height(), scroll_top = $(window).scrollTop();
-
-		if (edge == 'top') {
-			pos = sel.eq(0).offset();
-			if (pos.top-5 < scroll_top) $(window).scrollTop(pos.top-5);
-		} else {
-			sel = sel.eq(sel.length - 1);
-			pos = sel.offset();
-			pos.height  = sel.outerHeight();
-			pos.toolbar = 0;
-
-			if (configs[seq].toolbar.parent().is(':visible')) pos.toolbar = configs[seq].toolbar.parent().outerHeight()+10;
-			if (pos.top+pos.height > scroll_top+view_height-pos.toolbar-5) {
-				$(window).scrollTop( pos.top+pos.height-view_height+pos.toolbar+5);
-			}
-		}
-	}
-});
-var editor = new DrEditor;
-xe.registerApp(editor);
-
-// Header Writer
-var header_tag = 'h1,h2,h3,h4,h5,h6';
-var HeaderWriter = xe.createPlugin('HeaderWriter', {
-	configs : null,
-	init    : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor = configs[seq].writeArea.find('>div.hx');
-		var _inputHead  = _editor.find('input[type=text]:first');
-		var _inputLevel = _editor.find(':radio').click(function(){ self.cast('CHANGE_HEADER_FORMAT', [seq, this.value]) });
-
-		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'HX']);
-
-		this.configs[seq] = {
-			editor : _editor,
-			inputHead  : _inputHead,
-			inputLevel : _inputLevel
-		};
-
-		return this.configs[seq];
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div.xe_dr_hx,'+header_tag)
-			.each(function(){
-				var t = $(this);
-				if (!t.is('.xe_dr_hx')) t = t.wrap('<div>').parent();
-
-				t.attr('class', 'eArea _hx').attr('type', 'hx');
-
-				var header = t.children(header_tag);
-				if(!header.attr('id')) header.attr('id', 'h'+(new Date).getTime());
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		var header = obj.children('div._hx').children(header_tag).each(function(){ var t=$(this); t.parent().after(t).remove() });
-	},
-	API_CHANGE_HEADER_FORMAT : function(sender, params) {
-		var seq = params[0];
-		var val = params[1];
-
-		this.configs[seq].inputHead.attr('class', 'inputTitle '+val);
-	},
-	API_OPEN_HX_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1]; // selection to edit
-		var bef = params[2]; // selection to be before this editor
-		var cfg = this.configs[seq];
-
-		// Create this editor if it doesn't exists
-		if(!cfg) cfg = this.create(seq);
-
-		this.cast('RESET_EDITOR', [seq, cfg.editor, 'HX']);
-
-		if(box) {
-			var tagName = box.children(header_tag)[0].tagName.toLowerCase();
-
-			box.hide().after(cfg.editor);
-
-			cfg.inputHead.val( box.find(header_tag).eq(0).text() );
-			cfg.inputLevel.filter('[value='+tagName+']').click();
-		} else if (bef) {
-			$(bef).after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-		cfg.editor.show().find('input[type=text]:first').focus();
-
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_HX_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._hx:hidden');
-
-		if(save) {
-			var newBox  = $('<div>');
-			var id      = box.children(header_tag).attr('id');
-			var tagName = cfg.inputLevel.filter(':checked').val();
-
-			if (!id) id = 'h'+(new Date).getTime();
-
-			newBox.html('<'+tagName+' id="'+id+'"></'+tagName+'>').children(':first').text(cfg.inputHead.val());
-
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'HX']);
-		} else {
-			box.show();
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	}
-});
-editor.registerPlugin(new HeaderWriter);
-
-var IndexWriter = xe.createPlugin('IndexWriter', {
-	init    : function() {
-		this.configs = {};
-	},
-	createIndex : function(seq) {
-		var toc  = $('<ul class="toc"></ul>');
-		var rand = Math.ceil(Math.random()*1000);
-
-		configs[seq].editArea.children('div._hx').children('h1,h2,h3,h4,h5,h6')
-			.each(function(){
-				var t = $(this), id = t.attr('id'), n = this.nodeName.replace(/[^0-9]/,'');
-
-				if (!id) t.attr('id', id = 'h'+rand+Math.ceil(Math.random()*1000));
-				toc.append('<li class="toc'+n+'"><a href="#'+id+'">'+t.html()+'</a></li>');
-			});
-
-		return $('<div class="eArea _index">').append(toc);
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div.xe_dr_index,ul.toc')
-			.each(function(){
-				var t = $(this);
-				if (t.is('ul')) t = t.wrap('<div>').parent();
-				t.attr('class', 'eArea _index').attr('type', 'index');
-			});
-	},
-	refreshIndex : function(seq) {
-		configs[seq].editArea.children('div._index').replaceWith(this.createIndex(seq));
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-		var toc = obj.children('div._index').children('ul.toc');
-
-		toc.parent().before(toc).remove();
-	},
-	API_OPEN_INDEX_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1]; // selection to edit
-		var bef = params[2]; // selection to be before this editor
-
-		if (box) {
-			box.fadein('fast');
-		} else if (bef) {
-			bef.after(box = this.createIndex(seq));
-		} else {
-			configs[seq].editArea.append(box = this.createIndex(seq));
-		}
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-		this.cast('SCROLL_INTO_VIEW', [seq, box]);
-	},
-	API_AFTER_CLOSE_HX_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-
-		if (save) {
-			// auto refresh if a header was saved or updated.
-			this.refreshIndex(seq);
-		}
-	},
-	ONMOVE_PARAGRPH : function(sender, params) {
-		var seq = params[0];
-		var selbox = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
-
-		if (selbox.filter('div._index').length) {
-			// auto refresh if a header was moved.
-			this.refreshIndex(seq);
-		}
-	}
-});
-editor.registerPlugin(new IndexWriter);
-
-// Text Editor
-var TextWriter = xe.createPlugin('TextWriter', {
-	configs : null,
-	init    : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor   = configs[seq].writeArea.find('>div.txt:first');
-		var _textarea = $('<textarea>').hide();
-		var _iframe   = _editor.find('iframe').css('height','100%').after(_textarea);
-
-		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'TXT']);
-
-		this.configs[seq] = {
-			editor   : _editor,
-			iframe   : _iframe,
-			textarea : _textarea,
-			xpress   : null
-		};
-
-		return this.configs[seq];
-	},
-	createXpressEditor : function(seq) {
-		var self = this;
-		var ed = new xe.XpressCore();
-		var elAppContainer = this.configs[seq].editor[0];
-		var oWYSIWYGIFrame = this.configs[seq].iframe[0];
-		var oIRTextarea    = this.configs[seq].textarea[0];
-		var pHotkey;
-
-		ed.registerPlugin(new xe.CorePlugin(function(){ this.oApp.exec('FOCUS',[]) }));
-		ed.registerPlugin(new xe.StringConverterManager());
-		ed.registerPlugin(new xe.XE_EditingAreaVerticalResizer(elAppContainer));
-		ed.registerPlugin(new xe.ActiveLayerManager());
-		ed.registerPlugin(pHotkey=new xe.Hotkey());
-		ed.registerPlugin(new xe.XE_WYSIWYGStyler());
-		ed.registerPlugin(new xe.XE_WYSIWYGStyleGetter());
-		ed.registerPlugin(new xe.MessageManager(oMessageMap));
-		ed.registerPlugin(new xe.XE_Toolbar(elAppContainer));
-		ed.registerPlugin(new xe.XE_UndoRedo());
-		ed.registerPlugin(new xe.XE_Hyperlink(elAppContainer));
-		ed.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG", oIRTextarea, {nHeight:200, nMinHeight:100}, null, elAppContainer));
-		ed.registerPlugin(new xe.XE_EditingArea_HTMLSrc(oIRTextarea));
-		ed.registerPlugin(new xe.XE_EditingArea_WYSIWYG(oWYSIWYGIFrame));
-		ed.registerPlugin(new xe.XpressRangeManager(oWYSIWYGIFrame));
-		ed.registerPlugin(new xe.XE_ExecCommand(oWYSIWYGIFrame));
-		ed.registerPlugin(new xe.XE_FontNameWithSelectUI(elAppContainer));
-		ed.registerPlugin(new xe.XE_FontSizeWithSelectUI(elAppContainer));
-		ed.registerPlugin(new xe.XE_LineHeightWithSelectUI(elAppContainer));
-		ed.registerPlugin(new xe.XE_ColorPalette(elAppContainer));
-		ed.registerPlugin(new xe.XE_FontColor(elAppContainer));
-		ed.registerPlugin(new xe.XE_BGColor(elAppContainer));
-		ed.registerPlugin(new xe.XE_SCharacter(elAppContainer));
-		ed.registerPlugin(new xe.XE_WYSIWYGEnterKey("BR"));
-		//ed.registerPlugin(new xe.XE_FontSetter(this.getFontFamily(), this.getFontSize()));
-
-		// Ctrl+Enter를 입력하면 현재 문단 저장 후 새 텍스트 문단을 보여준다.
-        pHotkey.add(pHotkey.normalize('ctrl+enter'), function(){ 
-			setTimeout(function() { self.cast('CLOSE_EDITOR', [seq, true, 'TXT']) }, 1);
-		});
-		pHotkey.add(pHotkey.normalize('esc'), function(){ 
-			setTimeout(function() { self.cast('CLOSE_EDITOR', [seq, false, 'TXT']) }, 1);
-		});
-
-		// 에디터 시작
-		ed.run();
-
-		return ed;
-	},
-	API_AFTER_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.contents()
-			.each(function(){
-				var t = $(this);
-
-				if (t.is('div.eArea')) return true;
-
-				// clean contentless paragraph {{{
-				if (
-					( this.nodeType == 3 && !$.trim(this.nodeValue) ) ||
-					( t.is('p') && /^\s*(<br ?\/?>)?\s*$/i.test(t.html()) ) ||
-					( t.is('br') )
-				) {
-					t.remove();
-					return true;
-				}
-				// }}} clean contentless paragraph
-
-				if(this.nodeType == 3) t = t.wrap('<p />').parent();
-				if(!t.is('div.xe_dr_txt')) t = t.wrap('<div />').parent();
-
-				t.attr('class', 'eArea _txt').attr('type', 'txt');
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var self = this;
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div._txt').each(function(){
-			var div = $(this), node = null;
-
-			div.contents().each(function(){
-				var t = $(this);
-
-				if(this.nodeType == 3 || t.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) {
-					if( t.is('br,img') || $.trim(t.text()) ) {
-						if(!node) div.before(node = $('<p>'));
-						node.append(this);
-					} else {
-						t.remove();
-					}
-					return true;
-				}
-
-				div.before(t);
-				node = null;
-			});
-
-			div.remove();
-		});
-	},
-	API_OPEN_TXT_EDITOR : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var box  = params[1];
-		var bef  = params[2]; // selection to be before this editor
-		var cfg  = this.configs[seq];
-		var meanless;
-
-		// Create this editor if it doesn't exists
-		if (!cfg) cfg = this.create(seq);
-
-		// 이벤트 제거를 위해 DOM에서 제거한다.
-		var tx = cfg.editor.find('div.txEditor:first');
-		tx.prev().after(tx.remove());
-
-		if(box) {
-			box.hide().after(cfg.editor).find('button.del,div.drag_handle').remove();
-			cfg.textarea.val( box.html() );
-		} else if (bef) {
-			bef.after(cfg.editor);
-			cfg.textarea.val( '<p><br /></p>' );
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-			cfg.textarea.val( '<p><br /></p>' );
-		}
-
-		cfg.editor.show();
-		(function(){
-			try {
-				meanless = cfg.iframe[0].contentWindow.document.body.firstChild;
-				cfg.xpress = self.createXpressEditor(seq);
-
-				self.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-			} catch(e) {
-				setTimeout(arguments.callee, 10);
-			}
-		})();
-	},
-	API_CLOSE_TXT_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._txt:hidden');
-
-		if(save) {
-			var newBox  = $('<div>').html( cfg.xpress.getIR() );
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'TXT']);
-		} else {
-			box.show();
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	}
-});
-editor.registerPlugin(new TextWriter);
-
-var QuoteWriter = xe.createPlugin('QuoteWriter', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self      = this;
-		var _editor   = configs[seq].writeArea.find('>div.quote:first');
-		var _textarea = _editor.find('textarea:first');
-		var _source   = _editor.find('input[type=text]:first');
-
-		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'QUOTE']);
-
-		this.configs[seq] = {
-			editor   : _editor,
-			textarea : _textarea,
-			source   : _source
-		};
-
-		return this.configs[seq];
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var obj  = params[1];
-
-		obj.children('div.xe_dr_blockquote,blockquote.citation')
-			.each(function(){
-				var t = $(this);
-				if (t.is('div.xe_dr_blockquote')) {
-					t.find('>blockquote').attr('class', 'citation');
-				} else if (t.is('blockquote')) {
-					t = t.wrap('<div>').parent();
-				}
-				t.attr('class', 'eArea _quote').attr('type', 'quote');
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var obj  = params[1];
-
-		obj.children('div._quote').each(function(){
-			var quote = $(this).children('blockquote.citation');
-			quote.parent().before(quote).remove();
-		});
-	},
-	API_OPEN_QUOTE_EDITOR : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var box  = params[1];
-		var bef  = params[2]; // selection to be before this editor
-		var cfg  = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-
-		if (box) {
-			box.hide().after(cfg.editor);
-			cfg.textarea.val( untranslate(box.find('p').html().replace(/<br ?\/?>/ig, '\n')) );
-			cfg.source.val(box.find('cite').html());
-		} else {
-			self.cast('RESET_EDITOR', [seq, cfg.editor, 'QUOTE']);
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-		cfg.editor.show().find('textarea').focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_QUOTE_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._quote:hidden');
-		var txt  = $.trim(cfg.textarea.val());
-
-		if (save && txt) {
-			var newBox = $('<div>');
-			var quote  = $('<blockquote class="citation" />').append( $('<p>').html( translate(txt).replace(/\r?\n/g, '<br />') ) ).appendTo(newBox);
-			var src = $.trim(cfg.source.val());
-
-			if(src == cfg.source.attr('title')) src = '';
-			if(src) $('<cite>').html(translate_cite(src)).appendTo(quote);
-
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'QUOTE']);
-		} else {
-			box.show();
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	}
-});
-editor.registerPlugin(new QuoteWriter);
-
-var MovieWriter = xe.createPlugin('MovieWriter', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor   = configs[seq].writeArea.find('>div.movie');
-		var _textarea = _editor.find('textarea');
-
-		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'MOVIE']);
-
-		this.configs[seq] = {
-			editor : _editor,
-			embed  : _textarea.eq(0),
-			desc   : _textarea.eq(1),
-			source : _editor.find('input[type=text]')
-		};
-
-		return this.configs[seq];
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var obj  = params[1];
-
-		obj.children('object,embed,div.xe_dr_mov,div:has(div.embed)')
-			.each(function(){
-				var t = $(this);
-				if (!t.is('div')) t = t.wrap('<div>').parent();
-				t.attr('class', 'eArea _movie').attr('type', 'movie');
-				t.find('>embed,>object').wrap('<div class="embed">');
-				t.find('>p.cite>cite').unwrap();
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var obj  = params[1];
-		var mov  = obj.children('div._movie').children('embed,object');
-
-		// TODO : 플래시 태그면 embed, object를 모두 사용하도록 변환
-
-		obj.parent().before(mov).remove();
-	},
-	API_OPEN_MOVIE_EDITOR : function(sender, params) {
-		var self = this;
-		var seq  = params[0];
-		var box  = params[1];
-		var bef  = params[2]; // selection to be before this editor
-		var cfg  = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-
-		self.cast('RESET_EDITOR', [seq, cfg.editor, 'MOVIE']);
-
-		if (box) {
-			var embed  = $.trim( box.find('>div.embed').html() );
-			var desc   = $.trim( box.find('>p.desc').html() );
-			var source = $.trim( box.find('>cite').html() );
-
-			cfg.embed.val( embed );
-			cfg.desc.val( desc );
-			cfg.source.val( source );
-
-			box.hide().after(cfg.editor);
-		} else if (bef) {
-			bef.after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-
-		cfg.editor.show().find('textarea:first').focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_MOVIE_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._movie:hidden');
-		var val  = $.trim(cfg.embed.val());
-
-		if (save && val) {
-			var newBox = $('<div>').append( $('<div class="embed">').html(val) );
-			var desc   = $.trim(cfg.desc.val());
-			var source = $.trim(cfg.source.val());
-
-			if (desc == cfg.desc.attr('title')) desc = '';
-			if (source == cfg.source.attr('title')) source = '';
-
-			if (desc) newBox.append( $('<p class="desc">').text(desc) );
-			if (source) newBox.append( $('<cite>').html(translate_cite(source)) );
-
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'MOVIE']);
-		} else {
-			box.show();
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	}
-});
-editor.registerPlugin(new MovieWriter);
-
-// Image Writer
-var ImageWriter = xe.createPlugin('ImageWriter', {
-	configs : null,
-	_iframe : null,
-	_form   : null,
-	init : function() {
-		var target = 'xe_dr_imgframe_'+(new Date).getTime();
-
-		this.configs = {};
-		this._iframe = $('<iframe name="'+target+'" src="about:blank" style="position:absolute;width:1px;height:1px;left:-2000px;top:0">');
-		this._form   = $('<form target="'+target+'" method="POST" enctype="multipart/form-data" style="position:absolute;width:1px;height:1px;left:-2000px;"></form>')
-			.append('<input type="hidden" name="editor_sequence" value="" />')
-			.append('<input type="hidden" name="callback" />')
-			.append('<input type="hidden" name="file_srl" />')
-			.append('<input type="hidden" name="mid" value="" />')
-			.append('<input type="hidden" name="module" value="file" />')
-			.append('<input type="hidden" name="act" value="procFileIframeUpload" />')
-			.append('<input type="hidden" name="uploadTargetSrl" value="" />');
-
-		if (typeof(xeVid) != 'undefined') this._form.append('<input type="hidden" name="vid" value="'+xeVid+'" />');
-
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor  = configs[seq].writeArea.find('>div.img');
-		var _file    = _editor.find('input[type=file]');
-		var _desc    = _editor.find('input[type=text].desc');
-		var _image   = _editor.find('div.image > img');
-		var _resize  = _editor.find('div.resize');
-		var _align   = _editor.find('div.align');
-		var _message = _editor.find('p.uploading');
-
-		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'IMG']);
-
-		_file.change(function(){
-			var t = $(this);
-			var prev = t.prev();
-			
-			if ( !/\.(jpe?g|png|gif)$/i.test(t.val()) ) {
-				t.val('');
-				return false;
-			}
-
-			var callback_id = ''+(new Date).getTime()+Math.ceil(Math.random()*1000);
-			window[callback_id] = function(fileObj){ self.onfileuploaded(seq, callback_id, fileObj); }
-			
-			var filesrl = _image.attr('class').match(/(?:^|\s)xe_filesrl_(\d+)(?:\s|$)/);
-			filesrl = (filesrl && filesrl[1])? filesrl[1] : '';
-
-			// upload file
-			self._form.find('input[name=editor_sequence]').val(seq);
-			self._form.find('input[name=callback]').val(callback_id);
-			self._form.find('input[name=file_srl]').val(filesrl);
-			self._form.find('input[name=uploadTargetSrl]').val(editorRelKeys[seq]["primary"].value);
-			self._form.append(t).submit();
-			setTimeout(function(){ self.reset_fileform(t); prev.after(t) }, 0);
-
-			// hide image and show uploading
-			_image.parent().hide();
-			_file.hide();
-			_resize.hide();
-			_align.hide();
-			_message.show();
-		});
-
-		_message.find('button').click(function(){
-			self._iframe.attr('src', 'about:blank');
-			_file.show();
-			_message.hide();
-
-			if (_image.attr('src')) _image.parent().show();
-		});
-
-		_align.find('input[type=radio]').click(function(){ _image.parent().css('text-align', this.value); });
-
-		_resize.find('button.btn_resize').click(function(){
-			var w = parseInt(_resize.find('input[type=text].width').val());
-			var n = parseInt(_resize.find('dd>em').text());
-
-			if (isNaN(w) || isNaN(n) || w > n) {
-				_resize.find('p.resizeError').show();
-				return false;
-			}
-
-			_resize.find('p.resizeError').hide();
-			var _src = _image.attr('rawsrc') || _image.attr('src');
-
-			$.exec_json('file.procFileImageResize',{width:w, source_src:decodeURI(_src)},function(data){
-				if(data.error != 0) return;
-
-				_image.attr({
-					src    : encodeURI(data.resized_info.src),
-					width  : data.resized_info.info[0],
-					height : data.resized_info.info[1]
-				});
-
-				if(!_image.attr('rawsrc')) _image.attr('rawsrc', _src);
-			});
-		})
-
-		this.configs[seq] = {
-			editor  : _editor,
-			file    : _file,
-			desc    : _desc,
-			image   : _image,
-			resize  : _resize,
-			align   : _align,
-			message : _message
-		};
-
-		return this.configs[seq];
-	},
-	show_resize : function(seq, src) {
-		var cfg = this.configs[seq];
-
-		cfg.resize.find('p.resizeError').hide();
-
-		cfg.image
-			.load(function(){ var w=this.width, h=this.height, t=$(this); if(w>600){ cfg.resize.show().find('dd>em').text(w);cfg.resize.find('dd>input:text').val(600); } })
-			.attr('src', src)
-			.parent().show();
-	},
-	reset_fileform : function(obj) {
-		var next = obj.next();
-		var form = $('<form>').append(obj)[0].reset();
-		next.before(obj);
-	},
-	onfileuploaded : function(seq, callback_id, fileObj) {
-		// remove callback function
-		try {
-			delete window[callback_id];
-		} catch(e) {
-			window[callback_id] = null;
-		}
-
-		if(fileObj.error==-1){
-			alert(fileObj.message);
-			return;
-		}
-		
-		var self = this;
-		var cfg  = this.configs[seq];
-
-		if(fileObj.upload_target_srl && fileObj.upload_target_srl != 0) {
-			editorRelKeys[seq]['primary'].value = fileObj.upload_target_srl;
-		}
-
-		// show resize
-		cfg.image
-			.removeAttr('width')
-			.removeAttr('height')
-			.removeAttr('rawsrc')
-			.attr('filesrl', fileObj.file_srl);
-
-		cfg.file.show();
-		cfg.align.show();
-		cfg.message.hide();
-		this.show_resize(seq, encodeURI(fileObj.uploaded_filename));
-
-		// 이미지 파일도 서버측에서는 파일로 카운트 되므로,
-		// reloadFileList를 호출해서 orderedFiles와 uploadedFiles 배열을 갱신해주도록 한다.
-		// 관련 이슈 : http://textyle.xpressengine.net/18256095
-		var settings = {
-			fileListAreaID : '',
-			editorSequence : seq,
-			uploadTargetSrl : ''
-		};
-		reloadCallback[seq] = function(){};
-		reloadFileList(settings);
-	},
-	API_ONREADY : function() {
-		this._form.attr('action', request_uri)
-		this._form.find('input[name=mid]').val(current_mid);
-
-		this._iframe.appendTo(document.body).after(this._form);
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('img,p.img,div._img,div.xe_dr_img')
-			.each(function(){
-				var t = $(this);
-				if(t.is('img')) t = t.wrap('<p class="img"></p>');
-				if(t.is('p.img')) t = t.wrap('<div></div>').parent();
-				if(t.is('div.xe_dr_img')) {
-					var img    = t.children('p:has(img)').attr('class', 'img');
-					var desc   = t.children('p.desc').remove();
-					var cite   = t.children('p.cite').remove();
-					var s_desc = $.trim(desc.html() || '');
-					var s_cite = $.trim(cite.html() || '');
-					var s_text = [];
-
-					if (s_desc) s_text.push(s_desc);
-					if (s_cite) s_text.push(s_cite);
-					if (s_text.length) img.append('<br>').append($('<div>').html(s_text.join(' - ')).contents());
-				}
-
-				t.attr('class', 'eArea _img').attr('type', 'img');
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div._img')
-			.each(function(){
-				var t = $(this);
-				var p = t.children('p').attr('class', 'img');
-				t.before(p).remove();
-			});
-	},
-	API_OPEN_IMG_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-		var cfg = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-
-		// reset
-		this.cast('RESET_EDITOR', [seq, cfg.editor, 'IMG']);
-
-		if(box) {
-			var p   = box.children('p.img:first');
-			var img = p.find('img');
-
-			box.hide().after(cfg.editor);
-			cfg.align.show();
-
-			if (img.attr('rawsrc')) cfg.image.attr('rawsrc', img.attr('rawsrc'));
-			this.show_resize(seq, img.attr('src'));
-
-			var align = p.css('text-align');
-			if (align) {
-				cfg.align.find('input[value='+align.toLowerCase()+']').attr('checked', 'checked');
-				cfg.image.parent().css('text-align', align);
-			}
-
-			var _class = img.attr('class').match(/(?:^|\s)xe_filesrl_(\d+)(?:\s|$)/);
-			if (_class && _class[1]) cfg.image.attr('filesrl', _class[1]);
-
-			var desc  = $.trim(p.text());
-			if (desc) cfg.desc.val(desc);
-		} else if (bef) {
-			bef.after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-
-		cfg.editor.show();
-		(($.browser.msie||$.browser.opera)?cfg.desc:cfg.file).focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_IMG_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._img:hidden');
-
-		if (save && cfg.image.attr('src')) {
-			var align = cfg.align.find('input[type=radio]:checked').val();
-			var newBox = $('<div>');
-			var img    = $('<img>').attr('src', cfg.image.attr('src'));
-			var rawsrc = cfg.image.attr('rawsrc');
-
-			$('<p class="img">').css('text-align', align).append(img).appendTo(newBox);
-			img.attr({ 'width':cfg.image.attr('width'), 'height':cfg.image.attr('height') });
-			if (rawsrc) img.attr('rawsrc', rawsrc);
-
-			var desc = $.trim(cfg.desc.val());
-			if (desc && desc != cfg.desc.attr('title')) img.after(translate_cite(desc)).after('<br />');
-
-			var filesrl = cfg.image.attr('filesrl');
-			if (filesrl) img.addClass('xe_filesrl_'+filesrl);
-			
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'IMG']);
-		} else {
-			box.show();
-		}
-		
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	},
-	API_BEFORE_RESET_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var type = params[2];
-		var cfg  = this.configs[seq];
-
-		if (type == 'IMG') {
-			cfg.image
-				.removeAttr('filesrl')
-				.removeAttr('width')
-				.removeAttr('height')
-				.removeAttr('src')
-				.removeAttr('rawsrc')
-				.parent().css('text-align', '').hide();
-			cfg.resize.hide().find('input[type=text]').val('');
-			cfg.align.hide().find('input[type=radio]:first').attr('checked', 'checked');
-			cfg.file.show();
-			cfg.desc.val('');
-
-			this.reset_fileform(cfg.file);
-		}
-	},
-	API_AFTER_DELETE_PARAGRAPH : function(sender, params) {
-		var self   = this;
-		var seq    = params[0];
-		var target = params[1];
-
-		if (target && target.length) {
-			var srl = [];
-			target.filter('div._img').each(function(){
-				var s = $(this).find('img[class^=xe_filesrl]').attr('class').replace('xe_filesrl_','');
-				if(s) srl.push(s);
-			});
-
-			if(srl.length) exec_xml('file','procFileDelete',{file_srls:srl.join(','),editor_sequence:seq});
-		}
-	}
-});
-editor.registerPlugin(new ImageWriter);
-
-// Material Writer
-var MaterialWriter = xe.createPlugin('MaterialWriter', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor  = configs[seq].writeArea.find('>div.material:first');
-		var _buttons = _editor.find('div.controls button');
-		_buttons.eq(0).click(function(){ self.load_material(seq, 1); });
-		_buttons.eq(1).click(function(){ self.cast('CLOSE_EDITOR', [seq, false, 'MATERIAL']); });
-	
-		this.configs[seq] = {
-			editor     : _editor,
-			template   : _editor.find('div._container > dl').remove(),
-			to_save    : null,
-			loaded     : false,
-			prev_page  : 0,
-			next_page  : 0,
-			total_page : 0
-		};
-
-		this.load_material(seq, 1);
-
-		return this.configs[seq];
-	},
-	load_material_next : function(seq){
-		var cfg = this.configs[seq];
-
-		if(++cfg.next_page>=cfg.total_page) cfg.next_page=cfg.total_page;
-		cfg.next_page = cfg.next_page>0?cfg.next_page:1;
-		this.load_material(seq, cfg.next_page);
-	},
-	load_material_prev : function(seq){
-		var cfg = this.configs[seq];
-
-		cfg.prev_page = --cfg.prev_page>0?cfg.prev_page:1;
-		this.load_material(seq, cfg.prev_page);
-	},
-	load_material : function(seq, page) {
-		var self = this;
-		var cfg  = this.configs[seq];
-		var area = cfg.editor.find('div._container');
-		var paginate = cfg.editor.find('div.paginate');
-
-		if (!page) page = 1;
-
-		function callback(data){
-			if(data.page_navigation.total_count) cfg.editor.find('p.noData').css('display','none');
-
-			// 글감 목록 전부 삭제
-			area.children().remove();
-
-			// 페이징
-			paginate.find('> span').text(data.page_navigation.cur_page+'/'+data.page_navigation.total_page);
-
-			cfg.prev_page  = data.page_navigation.cur_page;
-			cfg.next_page  = data.page_navigation.cur_page;
-			cfg.total_page = data.page_navigation.total_page;
-			
-			if(!cfg.loaded){
-				paginate.find('> button.prev').click(function(){ self.load_material_prev(seq) });
-				paginate.find('> button.next').click(function(){ self.load_material_next(seq) });
-			}
-
-			// 컨텐트 추가
-			$.each(data.material_list, function(){
-				var tpl = cfg.template.clone();
-
-				tpl.addClass('xe_dr_'+this.type);
-				tpl.find('dt').text(this.regdate.substring(0,4)+'.'+this.regdate.substring(4,6)+'.'+this.regdate.substring(6,8)+' '+this.regdate.substring(8,10)+':'+this.regdate.substring(10,12));
-				tpl.find('dd > div.eArea').html(this.content);
-				tpl.find('dd > span.buttonDrEditor > button').click(function(event){
-					var t = $(event.target);
-					var o = t.parent().prev('div.eArea').eq(0).clone();
-
-					self.cast('SETTING_CONTENT', [seq, o]);
-
-					cfg.to_save = o;
-					self.cast('CLOSE_MATERIAL_EDITOR', [seq, true]);
-				});
-
-				area.append(tpl);
-			});
-
-			cfg.loaded =true;
-		}
-
-		if(area.length) $.exec_json('material.dispMaterialList',{page:page, list_count:4}, callback);
-	},
-	API_OPEN_MATERIAL_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-		var cfg = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-
-		if (bef) {
-			bef.after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-
-		cfg.editor.show();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_MATERIAL_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box;
-
-		if (save && cfg.to_save) {
-			var newBox = cfg.to_save.children('div.eArea');
-
-			cfg.to_save = null;
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, '']);
-		} else {
-			box = cfg.editor.prev('div.eArea');
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	}
-});
-editor.registerPlugin(new MaterialWriter);
-
-// File Writer
-var regex_srl  = /filesrl_([0-9-]+)/;
-var FileWriter = xe.createPlugin('FileWriter', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor   = configs[seq].writeArea.find('>div.file');
-		var _files    = _editor.find('dl.attachedFile');
-		var _summary  = _editor.find('p.summary').next('div.hr').andSelf();
-		var _template = _files.find('> dd:first').show().remove();
-		var _count    = _summary.find('strong.filecount');
-		var _size     = _summary.find('em.filesize');
-		var _inputs   = _editor.find('input[type=text]');
-
-		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'FILE']);
-
-		this.configs[seq] = {
-			editor    : _editor,
-			template  : _template,
-			summary   : _summary,
-			files     : _files,
-			count     : _count,
-			size      : _size,
-			desc      : _inputs.eq(0),
-			cite      : _inputs.eq(1),
-			n_count   : 0,
-			n_size    : 0,
-			queue_idx : 0
-		};
-
-		return this.configs[seq];
-	},
-	onstartupload : function(seq) {
-		this.configs[seq].queue_idx = 0;
-	},
-	onfileuploaded : function(seq, fileObj, serverData, obj) {
-		var self = this;
-		var cfg  = this.configs[seq];
-		var tpl  = cfg.template.clone();
-
-		tpl.find('>strong').text(fileObj.name);
-		tpl.find('>em').text(this.formatsize(fileObj.size));
-		tpl.addClass('filesrl_-'+(orderedFiles.length+cfg.queue_idx));
-		tpl.find('button.buttonDelete').click(function(){ self.ondelete(seq, $(this)) }).hide();
-		tpl.appendTo(cfg.files);
-
-		cfg.files.show().append(tpl);
-		cfg.queue_idx++;
-
-		// summary
-		cfg.summary.show();
-		cfg.count.text(++cfg.n_count);
-		cfg.size.text(this.formatsize(cfg.n_size += fileObj.size));
-
-		// process next queue
-		if (obj.getStats().files_queued > 0) obj.startUpload();
-	},
-	onreloadlist : function(seq, upload_target_srl) {
-		var cfg  = this.configs[seq];
-
-		if(upload_target_srl) editorRelKeys[seq].primary.value = upload_target_srl;
-		cfg.files.children('dd').each(function(){
-			var dd  = $(this);
-			var srl = dd.attr('class').match(regex_srl);
-			var cls;
-
-			if (!srl || !srl[1]) return;
-
-			cls = srl[0]; srl = parseInt(srl[1]);
-
-			if (srl <= 0) {
-				var fileObj = orderedFiles[Math.abs(srl)];
-
-				if (!fileObj) return;
-
-				// 기존 파일 시퀀스를 지우고 새 시퀀스 추가
-				dd.removeClass(cls).addClass('filesrl_'+fileObj.file_srl);
-
-				// 삭제버튼 보여주기
-				dd.find('button.buttonDelete').show();
-			}
-		});
-	},
-	ondelete : function(seq, btn) {
-		var cfg = this.configs[seq];
-		var srl = btn.parent().attr('class').match(regex_srl);
-
-		if (!srl || !srl[1] || (srl=parseInt(srl[1])) < 0) return;
-
-		// remove this file
-		btn.parent().remove();
-		if (!cfg.files.children('dd').length) {
-			cfg.files.hide();
-			cfg.summary.hide();
-		}
-
-		// TODO : delete this file from the server
-
-		var fileObj = uploadedFiles[srl];
-		if (fileObj) {
-			cfg.count.text(--cfg.n_count);
-			cfg.size.text(this.formatsize(cfg.n_size -= fileObj.file_size));
-		}
-	},
-	formatsize : function(size) {
-		size = parseFloat(size);
-		if (isNaN(size)) return 'NaN';
-
-		var units = ['B','KB','MB','GB','TB'];
-		var i = 0;
-
-		while((i < units.length-1) && size > 1024) {
-			size /= 1024;
-			i++;
-		}
-
-		size = (size+'').replace(/(\.\d{2})\d+$/, '$1') + ' ' + units[i];
-
-		return size;
-	},
-	API_ONREADY : function() {
-		reloadFileList({fileListAreaID:'',editorSequence:1,uploadTargetSrl:''});
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div.xe_dr_file,dl.attachedFile')
-			.each(function(){
-				var t = $(this);
-
-				if (t.is('dl')) {
-					var div = t.wrap('<div>').parent();
-
-					if ((t=t.next('p.desc,p.cite')).length) div.appned(t);
-					if ((t=t.next('p.desc,p.cite')).length) div.appned(t);
-
-					t = div;
-				}
-
-				t.attr('class', 'eArea _file').attr('type', 'file');
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div._file')
-			.each(function(){
-				var t = $(this);
-				t.before(t.children('dl,p')).remove();
-			});
-	},
-	API_OPEN_FILE_EDITOR : function(sender, params) {
-		var self = this;
-		var init = false;
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-		var cfg = this.configs[seq];
-		
-
-		if (!cfg) {
-			cfg  = this.create(seq);
-			init = true;
-		}
-
-		this.cast('RESET_EDITOR', [seq, cfg.editor, 'FILE']);
-
-		if(box) {
-			box.find('dl.attachedFile > dd').each(function(){
-				var dd  = $(this);
-				var tpl = cfg.template.clone();
-				var srl = dd.attr('class').match(regex_srl);
-
-				if (!srl || !(srl=srl[1])) return;
-				srl = parseInt(srl);
-
-				tpl.addClass('filesrl_'+srl);
-				tpl.find('>strong').text(dd.find('>a').text());
-				tpl.find('>em').text(dd.find('>span').text());
-				tpl.find('button.buttonDelete').click(function(){ self.ondelete(seq, $(this)) });
-
-				cfg.n_count++;
-				cfg.n_size += parseInt(uploadedFiles[srl].file_size) || 0
-
-				cfg.files.append(tpl);
-			});
-
-			cfg.count.text(cfg.n_count);
-			cfg.size.text(this.formatsize(cfg.n_size));
-			
-			cfg.files.show();
-			cfg.summary.show();
-
-			box.hide().after(cfg.editor);
-		} else if (bef) {
-			bef.after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-
-		cfg.editor.show();
-		cfg.desc.focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-
-		if (init) {
-			// if you use firebug, this code will crash your firefox browser.
-			reloadCallback[seq] = function(upload_target_srl){ self.onreloadlist(seq, upload_target_srl) };
-
-			uploaderSettings['editorSequence'] = seq;
-			uploaderSettings['upload_start_handler']   = function(){ self.onstartupload(seq) };
-			uploaderSettings['upload_success_handler'] = function(file,serverData){self.onfileuploaded(seq,file,serverData,this)};
-			editorUploadInit(uploaderSettings);
-
-			init = true;
-		}
-	},
-	API_CLOSE_FILE_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._file:hidden');
-		var file = cfg.files.children('dd');
-		var desc = $.trim(cfg.desc.val());
-		var cite = $.trim(cfg.cite.val());
-
-		if (save && file.length) {
-			var newBox = $('<div>');
-			var dl     = $('<dl class="attachedFile"><dt>'+xe.lang.attached_files+'</dt></dl>').appendTo(newBox);
-
-			$.each(file, function(){
-				var dd  = $(this);
-				var srl = dd.attr('class').match(regex_srl);
-
-				if (!srl || !(srl=srl[1])) return;
-				srl = parseInt(srl);
-
-				var fileObj = uploadedFiles[srl];
-				var a  = $('<a>').attr('href', request_uri + fileObj.download_url.replace(/\&amp;/g, '&')).text(fileObj.source_filename);
-				var sz = $('<span>').text(fileObj.disp_file_size);
-				
-				
-				$('<dd>').attr('class', 'filesrl_'+srl).append(a).append(sz).appendTo(dl);
-			});
-
-			if (desc && desc != cfg.desc.attr('title')) newBox.append($('<p class="desc">').html(translate(desc)));
-			if (cite && cite != cfg.cite.attr('title')) newBox.append($('<p class="cite">').html(translate(cite)));
-
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'FILE']);
-		} else {
-			box.show();
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	},
-	API_BEFORE_RESET_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var type = params[2];
-
-		if (type == 'FILE') {
-			var cfg = this.configs[seq];
-			cfg.n_count = 0;
-			cfg.n_size  = 0;
-			cfg.count.text(0);
-			cfg.size.text(0);
-			cfg.summary.hide();
-			cfg.files.empty().hide();
-		}
-	},
-	API_AFTER_DELETE_PARAGRAPH : function(sender, params) {
-		var self   = this;
-		var seq    = params[0];
-		var target = params[1];
-
-		if (target && target.length) {
-			var srl = [];
-			target.filter('div._file').each(function(){
-				$(this).find('dd[class^=filesrl_]').each(function(){
-					var s = $(this).attr('class').replace('filesrl_','');
-					if(s) srl.push(s);
-				});
-			});
-
-			if(srl.length) exec_xml('file','procFileDelete',{file_srls:srl.join(','),editor_sequence:seq});
-		}
-	}
-
-});
-editor.registerPlugin(new FileWriter);
-
-// List Writer
-var ListWriter = xe.createPlugin('ListWriter', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor  = configs[seq].writeArea.find('>div.list');
-		var _toolbar = _editor.find('ul.toolbar');
-		var _list    = _editor.find('div.listArea');
-		
-		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'LIST']);
-
-		_toolbar.find('button').click(function(){
-			var type = $(this).attr('class').match(/type_([a-z\-]+)/);
-			if (!type || !type[1]) return false;
-
-			self.ontoolbutton(seq, type[1]);
-
-			return false;
-		});
-
-		this.configs[seq] = {
-			editor  : _editor,
-			toolbar : _toolbar,
-			list    : _list,
-			focused : null
-		};
-
-		return this.configs[seq];
-	},
-	ontoolbutton : function(seq, type) {
-		var cfg = this.configs[seq];
-
-		if (!cfg.focused) return alert(no_selected_object_msg);
-
-		var par = cfg.focused.parent('li').parent('ul,ol');
-		if (par.length && type) par.eq(0).css('list-style-type', type);
-
-		cfg.focused.focus();
-	},
-	add_event : function(seq) {
-		var self = this;
-
-		this.configs[seq].list.find('li > input:not(.hasHandler)')
-			.addClass('hasHandler xe_content')
-			.keydown(function(event){ return self.onkeydown(seq, event) })
-			.focus(function(event){ return self.onfocus(seq, event) });
-	},
-	new_item : function(returnObj) {
-		var html = '<li><input type="name" /></li>';
-
-		return returnObj?$(html):html;
-	},
-	onkeydown : function(seq, event) {
-		var self = this;
-		var meta = event.metaKey;
-		var ctrl = event.ctrlKey;
-		var cfg  = this.configs[seq];
-		var obj  = $(event.target);
-		var li   = obj.parent('li');
-		var item, ul, prev, next, val='', start, end, stop = false;
-
-		switch(event.keyCode) {
-			case 13: // enter
-				stop = true;
-
-				if (ctrl) {
-					setTimeout(function(){ self.cast('CLOSE_EDITOR', [seq, true, 'LIST']) }, 1);
-				} else {
-					if (!$.trim(obj.val())) return obj.focus() && false;
-
-					var start = this.get_pos(obj, 'start');
-					var end   = this.get_pos(obj, 'end');
-					var val   = obj.val().substr(end);
-
-					obj.val( obj.val().substr(0, start) );
-
-					li.after(item = this.new_item(true));
-					this.add_event(seq);
-					this.set_pos( item.find('>input').focus().val(val), 0 );
-				}
-				break;
-			case 27: // ESC
-				stop = true;
-				setTimeout(function(){ self.cast('CLOSE_EDITOR', [seq, false, 'LIST']) }, 1);
-				break;
-			case 37: // left
-				if (!ctrl) break;
-				stop = true;
-				this.move_left(obj, li);
-				setTimeout(function(){obj.focus();}, 1);
-				break;
-			case 39: // right
-				if (!ctrl) break;
-				stop = true;
-				this.move_right(obj, li);
-				setTimeout(function(){obj.focus();},1);
-				break;
-			case 38: // up
-				if (!ctrl) {
-					if (!event.altKey && !event.shiftKey) {
-						var objs = cfg.list.find('input[type=text]');
-						var idx  = objs.index(obj);
-						if (idx > 0) objs.eq(idx-1).focus();
-					}
-					break;
-				}
-				stop = true;
-				this.move_up(obj, li);
-				setTimeout(function(){obj.focus();}, 1);
-				break;
-			case 40: // down
-				if (!ctrl) {
-					if (!event.altKey && !event.shiftKey) {
-						var objs = cfg.list.find('input[type=text]');
-						var idx  = objs.index(obj);
-						if (idx < objs.length-1) objs.eq(idx+1).focus();
-					}
-					break;
-				}
-				stop = true;
-				this.move_down(obj, li);
-				setTimeout(function(){obj.focus()}, 1);
-				break;
-			case 8: // backspace
-				start = this.get_pos(obj, 'start');
-				if (start == 0) {
-					var lis  = cfg.editor.find('li > input[type=text]');
-					var n_li = lis.index(obj);
-
-					if (n_li > 0) {
-						stop = true;
-						prev = lis.eq(n_li - 1);
-						val  = prev.val();
-
-						prev.focus().val( val + ($.browser.opera?' ':'') + obj.val() );
-						this.set_pos(prev, val.length + ($.browser.opera?1:0));
-
-						// remove current item
-						obj.parent().remove();
-					}
-				}
-				break;
-			case 46: // delete
-				start = this.get_pos(obj, 'start');
-				end   = this.get_pos(obj, 'end');
-				if ((start == end) && (end == obj.val().length)) {
-					var lis  = cfg.editor.find('li > input[type=text]');
-					var n_li = lis.index(obj);
-
-					if (n_li < lis.length-1) {
-						stop = true;
-						next = lis.eq(n_li + 1);
-						val  = obj.val();
-
-						obj.val( val + ($.browser.opera?' ':'') + next.val() );
-						this.set_pos(obj, val.length);
-						
-						// remove next item
-						next.parent().remove();
-					}
-				}
-				break;
-		}
-
-		return !stop;
-	},
-	get_pos : function(obj, type) {
-		var n_before, n_after;
-
-		if (typeof obj[0].selectionStart == 'number') {
-			n_before = obj[0].selectionStart;
-			n_after  = obj[0].selectionEnd;
-		} else if(document.selection) {
-			var before = document.selection.createRange().duplicate();
-			var after  = document.selection.createRange().duplicate();
-			var n_before, n_after;
-
-			before.moveEnd('character', obj.val().length);
-			after.moveStart('character', -obj.val().length);
-
-			n_before = (before.text=='')?obj.val().length:obj.val().lastIndexOf(before.text);
-			n_after  = after.text.length;
-		}
-
-		if (n_before == n_after || type == 'start') return n_before;
-		else if (type == 'end') return n_after;
-	},
-	set_pos : function(obj, pos) {
-		if (typeof obj[0].setSelectionRange == 'function') {
-			obj[0].setSelectionRange(pos, pos);
-		} else if(obj[0].createTextRange) {
-			var range = obj[0].createTextRange();
-	
-			range.moveStart('character', pos);
-			range.collapse(true);
-			range.select();
-		}
-	},
-	move_up : function(obj, li) {
-		if (li.prev('li').length) return li.prev('li').before(li);
-
-		var lev = this.get_level(li);
-		if (lev == 1) return;
-
-		var par = li.parent().parent('li');
-		var prv = par.prev('li');
-		if (prv.length) {
-			var oul = prv.children('ul,ol');
-			if (!oul.length) oul = $('<ul>').appendTo(prv);
-			oul.append(li);
-		} else if (li.is(':first') && par.is(':first')) {
-			par = par.parents('li');
-			par.eq(par.length-1).before(li);
-		} else {
-			par.parent('ol,ul').prepend(li);
-		}
-	},
-	move_down : function(obj, li) {
-		if (li.next('li').length) return li.next('li').after(li);
-
-		var lev = this.get_level(li);
-		if (lev == 1) return;
-
-		var par = li.parent().parent('li');
-		var nxt = par.next('li');
-
-		if (nxt.length) {
-			var oul = nxt.children('ul,ol');
-			if (!oul.length) oul = $('<ul>').appendTo(nxt);
-			oul.prepend(li);
-		} else if (li.is(':last') && par.is(':last')) {
-			par = par.parents('li');
-			par.eq(par.length-1).after(li);
-		} else {
-			par.parent('ol,ul').append(li);
-		}
-	},
-	move_left : function(obj, li) {
-		if (this.get_level(li) == 1) return;
-
-		var next = li.nextAll('li');
-		var list = li.children('ul,ol');
-
-		if (next.length) {
-			if (!list.length) li.append(list = $('<ul>'));
-			list.append(next);
-		}
-
-		li.parent().parent('li').after(li);
-	},
-	move_right : function(obj, li) {
-		var prev = li.prev('li');
-		var list = prev.children('ul,ol');
-
-		if (list.length) {
-			list.append(li);
-		} else if (prev.length) {
-			$('<ul>').append(li).appendTo(prev);
-		}
-	},
-	get_level : function(elem) {
-		var el  = $(elem).get(0);
-		var lev = 0;
-		var tag = '';
-		
-		while(el) {
-			tag = el.tagName.toLowerCase();
-			if (tag == 'div' && el.className == 'listArea') break;
-			if (tag == 'ul' || tag == 'ol') lev++;
-			el = el.parentNode;
-		}
-
-		return lev;
-	},
-	onfocus : function(seq, event) {
-		this.configs[seq].focused = $(event.target);
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('ul,ol,div.xe_dr_list').each(function(){
-			var t = $(this);
-			if (!t.is('div')) t = t.wrap('<div />').parent();
-			t.attr('class', 'eArea _list').attr('type', 'list').find('ol>br,ul>br').remove();
-		});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div._list')
-			.each(function() {
-				var list = $(this).children('ul,ol');
-				list.parent().before(list).remove();
-			});
-	},
-	API_OPEN_LIST_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-		var cfg = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-
-		this.cast('RESET_EDITOR', [seq, cfg.editor, 'LIST']);
-
-		if(box) {
-			box.hide().after(cfg.editor)
-				.children('ul,ol').clone()
-				.appendTo(cfg.list.empty())
-				.find('li')
-				.each(function(){
-					var t = $(this);
-					var c = t.children('ul,ol').remove();
-					var v = $.trim(t.text());
-					t.empty().append( $('<input type="text">').val(v) ).append(c);
-				});
-		} else if (bef) {
-			bef.after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-
-		this.add_event(seq);
-		cfg.editor.show().find('input[type=text]:first').focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_LIST_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._list:hidden');
-
-		if (save) {
-			var newBox = $('<div>');
-			var list   = cfg.list.children('ul,ol').appendTo(newBox);
-			var div    = $('<div>');
-
-			list.find('input[type=text]').each(function(){
-				var t = $(this);
-				var v = $.trim(t.val());
-
-				if (v || t.parent().children('ul,ol').length) {
-					div.text(v);
-					t.before(div[0].firstChild).remove();
-				} else {
-					t.parent().remove();
-				}
-			});
-			list.find('ul:not(:has(li)),ol:not(:has(li))').remove();
-
-			if (list.children('li').length) {
-				box.remove();
-				this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'LIST']);
-			}
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		box.show();
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-	},
-	API_AFTER_RESET_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var edit = params[1];
-		var type = params[2];
-		var cfg  = this.configs[seq];
-
-		if (type == 'LIST') {
-			cfg.list.html('<ul><li><input type="text" /></li></ul>');
-		}
-	}
-});
-editor.registerPlugin(new ListWriter);
-
-// Link Writer
-var LinkWriter = xe.createPlugin('LinkWriter', {
-	configs : {},
-	init : function() {
-		this.configs = {};
-	},
-	create : function(seq) {
-		var self = this;
-		var _editor = configs[seq].writeArea.find('>div.link');
-		var _inputs = _editor.find('input[type=text]');
-		var _text   = _inputs.eq(0);
-		var _url    = _inputs.eq(1);
-		var _desc   = _inputs.eq(2);
-
-		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'LINK']);
-
-		this.configs[seq] = {
-			editor : _editor,
-			text   : _text,
-			url    : _url,
-			desc   : _desc
-		};
-
-		return this.configs[seq];
-	},
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div.xe_dr_link,p.link')
-			.each(function(){
-				var t = $(this);
-				if (t.is('div.xe_dr_link')) {
-					var p = t.children('p');
-					if (p.length > 1) p.eq(0).append('<br />').append( $('<span class="desc"></span>').text(p.eq(1).text()) );
-					p.eq(0).children('a').before('<br />');
-					p.eq(1).remove();
-				} else {
-					t = t.wrap('<div>').parent();
-				}
-				t.attr('class', 'eArea _link').attr('type', 'link');
-			});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div._link')
-			.each(function(){
-				var p = $(this).children('p');
-				p.parent().before(p).remove();
-			});
-	},
-	API_OPEN_LINK_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-		var cfg = this.configs[seq];
-
-		if (!cfg) cfg = this.create(seq);
-
-		this.cast('RESET_EDITOR', [seq, cfg.editor, 'LINK']);
-
-		if(box) {
-			box.hide().after(cfg.editor);
-			cfg.text.val( box.find('strong').text() );
-			cfg.url.val( box.find('a').attr('href') );
-
-			var desc = $.trim(box.find('span.desc').text());
-			if (desc) cfg.desc.val( desc );
-		} else if (bef) {
-			bef.after(cfg.editor);
-		} else {
-			cfg.editor.appendTo(configs[seq].editArea);
-		}
-
-		cfg.editor.show();
-		cfg.text.focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
-	},
-	API_CLOSE_LINK_EDITOR : function(sender, params) {
-		var seq  = params[0];
-		var save = params[1];
-		var cfg  = this.configs[seq];
-		var box  = cfg.editor.prev('div._link:hidden');
-
-		var text = $.trim(cfg.text.val());
-		var url  = $.trim(cfg.url.val());
-		var desc = $.trim(cfg.desc.val());
-
-		if (url  == cfg.url.attr('title')) url = '';
-		if (desc == cfg.desc.attr('title')) desc = '';
-
-		if (save && text && url) {
-			var newBox = $('<div>');
-			var para   = $('<p class="link">').appendTo(newBox)
-					.append( $('<strong>').text( text ) )
-					.append( $('<br />') )
-					.append( $('<a>').attr('href', url).text(url) );
-
-			if (desc) para.append('<br />').append( $('<span class="desc" />').text(desc) );
-
-			box.remove();
-			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'LINK']);
-		}
-
-		if(!box.length) box = cfg.editor.prev('div.eArea');
-		box.show();
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-
-		cfg.editor.hide().appendTo(configs[seq].writeArea);
-	}
-});
-editor.registerPlugin(new LinkWriter);
-
-// HR Writer
-var HRWriter = xe.createPlugin('HRWriter', {
-	API_SETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('hr,div.xe_dr_hr').each(function(){
-			var t = $(this);
-			if (!t.is('div')) t = t.wrap('<div>').parent();
-			t.attr('class', 'eArea _hr').attr('type', 'hr');
-		});
-	},
-	API_GETTING_CONTENT : function(sender, params) {
-		var seq = params[0];
-		var obj = params[1];
-
-		obj.children('div._hr').each(function(){
-			var hr = $(this).find('hr');
-			hr.parent().before(hr).remove();
-		});
-	},
-	API_OPEN_HR_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-
-		if (box && box.length) {
-			box.show(300);
-		} else if (bef && bef.length) {
-			bef.after(box = $('<div class="eArea _hr"><hr /></div>').attr('type', 'hr'));
-		} else {
-			var newBox = box = $('<div class="eArea _hr" />').attr('type', 'hr');
-			configs[seq].editArea.append(newBox.append('<hr />'));
-		}
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-	}
-});
-editor.registerPlugin(new HRWriter);
-
-// Help
-var HelpViewer = xe.createPlugin('Help', {
-	views : {},
-	init : function() {
-		this.views = {};
-	},
-	create : function(seq) {
-		var self = this;
-
-		this.views[seq] = configs[seq].writeArea.find('div.help');
-		this.views[seq].find('button').click(function(){ self.cast('CLOSE_EDITOR', [seq, false, 'HELP']); });
-	},
-	API_OPEN_HELP_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = params[1];
-		var bef = params[2];
-
-		if(!this.views[seq]) this.create(seq);
-
-		if(box) {
-			box.after(this.views[seq]);
-		} else if (bef) {
-			bef.after(this.views[seq]);
-		} else {
-			configs[seq].writeArea.prepend(this.views[seq]);
-		}
-		this.views[seq].show().find('button').focus();
-		this.cast('SCROLL_INTO_VIEW', [seq, this.views[seq]]);
-	},
-	API_CLOSE_HELP_EDITOR : function(sender, params) {
-		var seq = params[0];
-		var box = this.views[seq].prev('div.eArea');
-
-		this.views[seq].hide();
-		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
-		
-	}
-});
-editor.registerPlugin(new HelpViewer);
-
-// More
-var More = xe.createPlugin('More', {
-	API_BEFORE_CLICK_TOOLBUTTON : function(sender, params) {
-		var seq    = params[0];
-		var button = $(params[1]);
-
-		if(!button.parent().is('li.more')) return true;
-
-		button.parents('div.wToolbarContainer:first').toggleClass('more');
-
-		this.cast('TOOLBAR_REPOSITION', [seq]);
-
-		return false;
-	}
-});
-editor.registerPlugin(new More);
-
-// Validator plugin
-var ValidatorHook = xe.createPlugin('ValidatorHook', {
-	API_BEFORE_VALIDATE : function(sender, params) {
-		var form = $(params[0]);
-		var seq  = form[0].elements['editor_sequence'].value;
-		var wArea_e = configs[seq].editArea.children('div.wArea:visible').filter(':not(.blank)');
-		var wArea_w = configs[seq].writeArea.children('div.wArea:visible').filter(':not(.blank)');
-
-		if (wArea_e.length || wArea_w.length) {
-			return !!confirm(submit_without_saving_msg);
-		}
-
-		return true;
-	}
-});
-xe.getApp('Validator')[0].registerPlugin(new ValidatorHook);
-
-// Utility function
-var table = {'<':'&lt;','>':'&gt;','&':'&amp;','"':'&quot;'}, untable;
-function translate(str) {
-	return str.replace(/<|>|&|"/ig, function(m0) { return table[m0]||m0; });
-}
-
-function untranslate(str) {
-	if (!untable) {
-		untable = {};
-		$.each(table, function(key,val){ untable[val] = key; });
-	}
-
-	return str.replace(/&([lg]t|quot|amp);/g, function(m0) { return untable[m0]||m0; });
-}
-
-function translate_cite(str) {
-	var s = str.replace(/<(\/)?([abi]|em|strong|cite)(.*?)>|<|>|&|"/ig, function(m0,m1,m2,m3) {
-		m1 = m1 || '';
-		m2 = (m2 || '' ).toLowerCase();
-		m3 = m3 || '';
-
-		if (table[m0]) return table[m0];
-		if (m3 && m3.substr(0,1) != ' ') return '&lt;'+m1+m2+m3+'&gt;';
-		if (m2 == 'em' || m2 == 'strong' || m2 == 'a' || m2 =='cite') return '<'+m1+m2+m3+'>';
-		if (m2 == 'b') return '<'+m1+'strong>';
-		if (m2 == 'i') return '<'+m1+'em>';
-	});
-
-	return s;
-}
-
-function is_left_click(event) {
-	var ie = $.browser.msie; 
-	return (typeof(event.button)=='undefined' || (ie && event.button == 1) || (!ie && event.button == 0));
-}
-
-editor.translate = translate;
-editor.translate_cite = translate_cite;
-editor.is_left_click = is_left_click;
-
-})(jQuery);
+/**
+ * 단락에디터 Paragraph Editor
+ * @author NHN (developers@xpressengine.com)
+ */
+(function($){
+
+var configs = {};
+
+var TOOLSET_LENGTH = 9;
+
+var DrEditor = xe.createApp('DrEditor', {
+	loaded   : false,
+	last_seq : 0,
+	toolset_offset : 0,
+	init : function() {
+	},
+	getConfig : function(seq) {
+		return configs[seq] || {};
+	},
+	API_ONREADY : function(sender, params) {
+		var self = this;
+
+		$.each(configs, function(seq, val){
+			var _container = $('div#DrEditor'+seq);
+			var _writeArea = _container.find('>div>div.writeArea:first');
+			var _editArea  = _container.find('>div>div.editorArea:first');
+			var _dummyArea = $('<div class="dummy" style="display:none">').appendTo(_writeArea);
+			var _blankBox  = _writeArea.find('>div.blank:first').prependTo(_writeArea);
+			var _toolbar   = _writeArea.find('>.wToolbarContainer>div.wToolbar');
+			var _editTool  = _writeArea.find('ul.eTool').remove();
+			var _hookerBtn = $('<button type="button" class="_hookerBtn">').attr('seq', seq).css({position:'absolute',width:'1px',height:'1px',left:'-2000px',top:0}).prependTo(_container);
+			var $numbers;
+
+			//  toolbar buttons
+			_toolbar
+				.find('button')
+				.hover(
+					function(){ $(this).parent().addClass('hover'); },
+					function(){ $(this).parent().removeClass('hover'); }
+				)
+				.click(
+					function(event){					
+						var type = $(this).parent().attr('class').toUpperCase().split(' ')[0];
+						self.cast('CLICK_TOOLBUTTON', [seq, this, type]);
+						
+						return false;
+					}
+				);
+
+			// _blankBox
+			//_blankBox.dblclick(function(){ self.cast('OPEN_EDITOR', [seq, null, null, 'HX']); });
+
+			// toolbar button sortable
+			_toolbar.children('ul:first')
+				.sortable({items  : '>li'})
+				.bind('sortstop', function(){
+					var tools = [];
+
+					if (!$numbers) {
+						($numbers = _toolbar.find('button .nx')).sort(function(a, b){				
+							return (parseInt(a.firstChild.nodeValue,10) > parseInt(b.firstChild.nodeValue,10))?1:-1;
+						});
+					}
+
+					_toolbar.find('li').each(function(i){
+						var t = $(this), $btn = t.find('>button'), title = '';
+						tools.push(t.attr('class'));
+
+						if (i < 9) {
+							title = xe.lang.shortcut + '('+(i+1)+')';
+							$btn.append($numbers.eq(i+1));
+						}
+						$btn.attr('title', title);
+					});
+
+					tools = tools.join(',');
+					if (tools) {
+						var expires = (new Date()).getTime() + 7 * 24 * 3600 * 1000; // one week
+						document.cookie = 'DrEditorToolbar='+tools+'; expires='+(new Date(expires)).toGMTString()+'; path=/;';
+					}
+				});
+
+			// container
+			_editArea
+				.sortable({
+					axis   : 'y',
+					items  : '>div.eArea',
+					handle : '>div.drag_handle',
+					placeholder : 'xe_dr_placeholder'
+				});
+
+			// focus hook event
+			_hookerBtn
+				.focus (function(){
+					if(!_editArea.children('div.eFocus,div.wArea:visible').length) self.cast('SELECT_PARAGRAPH', [seq, _editArea.find('>div:first')]);
+					self.last_seq = seq;
+				});
+
+			configs[seq] = $.extend(configs[seq], {
+				sequence  : seq,
+				container : _container,
+				editArea  : _editArea,
+				writeArea : _writeArea,
+				blankBox  : _blankBox,
+				toolbar   : _toolbar,
+				editTool  : _editTool,
+				hookerBtn : _hookerBtn,
+				selFirst  : null,
+				selLast   : null,
+				last_type : ''
+			});
+
+			if (!self.last_seq) self.last_seq = seq;
+		});
+
+		function getPara(event) {
+			var target = $(event.target);
+			if(target.is('a,button,:input')) return null;
+
+			var para = target.parents('div').andSelf().filter('div.eArea:first');
+
+			return para.length?para:null;
+		};
+
+		function falseFunc(){ return false; };
+
+		$(document).mousedown(function(event) {
+			var target = $(event.target);
+
+			if(!is_left_click(event)) return true;
+			if(target.is('a,button,:input')) return true;
+			if(target.parents('div.wToolbar:first').length) return true;
+
+			var para = target.parents('div').andSelf().filter('div.eArea:first');
+			if(!para.length) {
+				self.cast('CLEAR_SELECTION', [seq]);
+				return true;
+			}
+			if(para.parents('div.material:first').length) return true;
+
+			var seq = para.parents('form:first')[0].elements['editor_sequence'].value;
+			
+			if (configs[seq].editArea.children('div.wArea:visible').length) {
+				// save
+				if (configs[seq].last_type) self.cast('CLOSE_EDITOR', [seq, true, configs[seq].last_type]);
+			}
+
+			// multiple selection
+			if (event.shiftKey) {
+				if (configs[seq].selFirst) {
+					var children  = configs[seq].editArea.children('div');
+					var nSelFirst = children.index(configs[seq].selFirst);
+					var nPara     = children.index(para);
+					var nStart    = Math.min(nSelFirst, nPara);
+					var nEnd      = Math.max(nSelFirst, nPara);
+
+					self.cast('CLEAR_SELECTION');
+					self.cast('SELECT_PARAGRAPH', [seq, children.slice(nStart,nEnd+1), children.eq(nSelFirst), para]);
+				} else {
+					self.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
+				}
+			} else if (event.ctrlKey) {
+				if (para.hasClass('eFocus')) {
+					self.cast('UNSELECT_PARAGRAPH', [seq, para, para, para]);
+				} else {
+					self.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
+				}
+			} else {
+				self.cast('CLEAR_SELECTION');
+				self.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
+			}
+
+			return false;
+		});
+
+		// global doubleclick
+		$(document).dblclick(function(event){
+			var target = $(event.target);
+			if(target.is('a,button,:input')) return true;
+			if(event.shiftKey || event.ctrlKey) return true;
+
+			var para = target.parents('div').andSelf().filter('div.eArea:first');
+			if(!para.length) return true;
+
+			var seq  = para.parents('form:first')[0].elements['editor_sequence'].value;
+			var type = para.attr('type');
+
+			if (type) {
+				self.cast('CLEAR_SELECTION');
+				self.cast('OPEN_EDITOR', [seq, para, null, type]);
+			}
+		});
+
+		$(document).keydown(function(event){
+			var target = $(event.target);
+			if(!event.altKey && !event.ctrlKey && !event.metaKey && target.is(':input:not(button._hookerBtn)')) return true;
+			if(event.keyCode == 16 && event.shiftKey) return true; // only shift key
+			if(event.keyCode == 17 && event.ctrlKey)  return true; // only ctrl key
+			if(event.keyCode == 18 && event.altKey)   return true; // only alt key
+			if(event.keyCode == 9) return true;
+
+			var ret = self.cast('ONKEYDOWN', [self.last_seq, event]);
+			if (ret == true || ($.isArray(ret) && $.inArray(ret, true))) return false;
+		});
+
+		// scroll event
+		var _scrollTimer = null;
+		$(window).scroll(function(event){
+			if (_scrollTimer) clearTimeout(_scrollTimer);
+			_scrollTimer = setTimeout(function(){
+				_scrollTimer = null;
+				self.cast('ONSCROLL');
+			}, 10);
+		});
+	},
+	API_ONLOAD : function(sender, params) {
+		var self = this;
+
+		this.loaded = true;
+		$.each(configs, function(seq,val){ self.cast('TOOLBAR_REPOSITION', [seq]) });
+	},
+	API_CREATE_EDITOR : function(sender, params) {
+		configs[params[0]] = {form:params[1]};
+	},
+	API_GET_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var box = configs[seq].editArea.contents().clone();
+		var dum = $('<div>').append(box);
+		var htm = '';
+
+		// remove no-content area
+		dum.find('>div.wArea,>div.eArea>div.drag_handle,>div.eArea>button.del').remove();
+
+		// getting content
+		this.cast('GETTING_CONTENT', [seq, dum]);
+
+		htm = dum
+				.html()
+				.replace(
+					/<(img|br)([^>]*)\/?>/gi,
+					function(m0,m1,m2){
+						var ret = ['<'+m1];
+						(m2 = $.trim(m2))?ret.push(m2):0;
+						ret.push('/>');
+
+						return ret.join(' ');
+					}
+				);
+
+		return htm;
+	},
+	API_SET_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var txt = params[1];
+
+		// clear all document
+		this.cast('CLEAR', [seq]);
+
+		// process text
+		var dum = $('<div>').html( txt );
+		this.cast('SETTING_CONTENT', [seq, dum]);
+
+		// set content
+		if(configs[seq] && configs[seq].editArea) {
+			configs[seq].editArea.append(dum.children('div.eArea'));
+		}
+	},
+	API_AFTER_SET_CONTENT : function(sender, params) {
+		var seq = params[0];
+
+		// show or hide blankbox
+		if(configs[seq].editArea.find('>div.eArea').length) {
+			configs[seq].blankBox.hide();
+		} else {
+			configs[seq].blankBox.show();
+		}
+	},
+	API_CLEAR : function(sender, params) {
+		var seq = params[0];
+		if(configs[seq] && configs[seq].editArea) configs[seq].editArea.empty();
+	},
+	API_GET_SELECTED_PARAGRAPH : function(sender, params) {
+		var seq = params[0];
+		return configs[seq].editArea.children('div.eFocus');
+	},
+	API_SELECT_PARAGRAPH : function(sender, params) {
+		var seq = params[0];
+		var par = params[1]; // clicked paragraph
+		var fir = params[2]; // selection first
+		var las = params[3]; // selection last
+		var self = this;
+
+		configs[seq].selFirst = fir || null;
+		configs[seq].selLast  = las || null;
+
+		var box = (las || fir || par).eq(0), top;
+
+		if (box && box.length) {
+			top = box.position().top + Math.floor(box.height()/2);
+			configs[seq].hookerBtn.css('top', top+'px');
+		}
+
+		par.addClass('eFocus');
+
+		if (par.length) {
+			configs[seq].hookerBtn.focus();
+			par.each(function(){
+				var t = $(this);
+				if (!t.find('>div.drag_handle:first').length) {
+					t.prepend('<div class="drag_handle left" title="'+xe.lang.drag_this+'" />');
+					t.prepend('<div class="drag_handle right" title="'+xe.lang.drag_this+'" />');
+				}
+			});
+
+			par = par.parent().find('>.eFocus');
+			par.find('>button.del').remove();
+			$('<button type="button" class="del"><span>'+xe.lang.cmd_del+'</span></button>')
+				.click(function(){ self.cast('DELETE_PARAGRAPH', [seq, par]); return false; })
+				.appendTo(par.eq(0));
+		}
+
+		if ($.browser.msie) {
+			try { document.selection.createRange().collapse(true) } catch(e) {};
+		}
+	},
+	API_UNSELECT_PARAGRAPH : function(sender, params) {
+		var seq = params[0];
+		var par = params[1]; // clicked paragraph
+
+		par.removeClass('eFocus').find('>button.del').remove();
+	},
+	API_CLEAR_SELECTION : function(sender, params) {
+		var skip_seq = params[0];
+
+		$.each(configs, function(seq){
+			if(skip_seq && skip_seq == seq) return true;
+
+			$(this.editArea.children('div.eFocus')).removeClass('eFocus');
+			this.selFirst  = null;
+			this.selLast   = null;
+		});
+	},
+	API_SAVE_PARAGRAPH : function(sender, params) {
+		var seq = params[0];
+		var _editor = params[1];
+		var _box    = params[2];
+		var _type   = (params[3]||'').toLowerCase();
+
+		if (_type) _box.addClass('eArea _'+_type).attr('type', _type);
+		if (_editor && _box) _editor.before(_box);
+	},
+	API_DELETE_PARAGRAPH : function(sender, params) {
+		var self   = this;
+		var seq    = params[0];
+		var target = params[1];
+
+		if (target && target.length) {
+			var prev = target.eq(0).prev('div.eArea');
+			var next = target.eq(target.length-1).next('div.eArea');
+
+			target
+				.removeClass('eFocus')
+				.hide('fast', function(){
+					$(this).remove();
+					self.cast('TOOLBAR_REPOSITION', [seq]);
+					if (!configs[seq].editArea.children('div.eArea:first').length) configs[seq].blankBox.show();
+				});
+
+			if (next.length) this.cast('SELECT_PARAGRAPH', [seq, next, next, next]);
+			else if (prev.length) this.cast('SELECT_PARAGRAPH', [seq, prev, prev, prev]);
+		}
+	},
+	API_CLICK_TOOLBUTTON : function(sender, params) {
+		var seq    = params[0];
+		var button = $(params[1]);
+		var type   = params[2];
+		var selbox = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
+
+		if(selbox.length) selbox = selbox.eq(0);
+		else selbox = null;
+
+		var editor = configs[seq].editArea.children('div.wArea:visible');
+		if (editor.length) {
+			if (editor.is(type)) this.cast('CLOSE_EDITOR', [seq, false, type]);
+		} else {
+			this.cast('CLEAR_SELECTION');
+			this.cast('OPEN_EDITOR', [seq, null, selbox, type]);
+		}
+	},
+	API_ONSCROLL : function(sender, params) {
+		var self = this;
+		if (this.loaded) {
+			$.each(configs, function(seq,val){ self.cast('TOOLBAR_REPOSITION', [seq]) });
+		}
+	},
+	API_ONKEYDOWN : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var event = params[1];
+		var key = event.keyCode, ctrl = event.ctrlKey, meta = event.metaKey, alt = event.altKey, shift = event.shiftKey;
+		var ENTER = 13, UP = 38, DOWN = 40, DEL = 46;
+		var selection, para, prev, next;
+
+		if ($(event.target).is(':text')) return false;
+
+		// hit enter to edit a selected paragraph
+		if(key == ENTER) {
+			configs[seq].editArea.children('div.eFocus:first').dblclick();
+			return true;
+		}
+
+		if (key == UP || key == DOWN) {
+			if (ctrl) { // hit ctrl + up, down to move paragraphs
+				selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
+
+				if (key == UP) {
+					prev = selection.eq(0).prev('div.eArea');
+
+					if (prev.length) prev.before(selection);
+					else configs[seq].editArea.prepend(selection);
+				} else {
+					next = selection.eq(selection.length-1).next('div.eArea');
+
+					if (next.length) next.after(selection);
+					else configs[seq].editArea.append(selection);
+				}
+
+				setTimeout(function(){ self.cast('ONMOVE_PARAGRPH', [seq]) }, 0);
+			} else if (shift) { // hit shift + up, down to select multiple paragraphs
+				var children  = configs[seq].editArea.children('div.eArea');
+				var current   = configs[seq].selLast || configs[seq].selFirst;
+				
+				if (key == UP) {
+					if ((prev=current.prev('div.eArea')).length) current = prev;
+				} else {
+					if ((next=current.next('div.eArea')).length) current = next;
+				}
+
+				var nSelFirst = children.index(configs[seq].selFirst);
+				var nCurrent  = children.index(current);
+				var nStart    = Math.min(nSelFirst, nCurrent);
+				var nEnd      = Math.max(nSelFirst, nCurrent);
+
+				this.cast('CLEAR_SELECTION');
+				this.cast('SELECT_PARAGRAPH', [seq, children.slice(nStart,nEnd+1), children.eq(nSelFirst), current]);
+			} else { // hit up or down arrow to move selection
+				selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
+
+				if (key == UP) {
+					prev = selection.eq(0).prev('div.eArea');
+
+					if (prev.length) para = prev;
+					else para = selection.eq(0);
+				} else {
+					next = selection.eq(selection.length-1).next('div.eArea');
+
+					if (next.length) para = next;
+					else para = selection.eq(selection.length-1);
+				}
+
+				this.cast('CLEAR_SELECTION');
+				this.cast('SELECT_PARAGRAPH', [seq, para, para, para]);
+			}
+
+			selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
+			this.cast('SCROLL_INTO_VIEW', [seq, selection, (key==UP)?'top':'bottom']);
+
+			return true;
+		}
+
+		// delete key
+		if (key == DEL) {
+			selection = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
+			this.cast('DELETE_PARAGRAPH', [seq, selection]);
+
+			return true;
+		}
+
+		// number key
+		if (48 <= key && key <= 58) {
+			var buttons = configs[seq].toolbar.find('button');
+			if (key == 48) key = buttons.length+48;
+			buttons.eq(key-49).click();
+
+			return true;
+		}
+
+		// change toolset
+		if (key == 192) {
+			var ul   = configs[seq].toolbar.find('ul:first');
+			var lis  = ul.find('>li');
+			var more = lis.eq(lis.length-1);
+
+			if ((lis.length-1) % TOOLSET_LENGTH) {
+				var empty_len = TOOLSET_LENGTH - ((lis.length-1) % TOOLSET_LENGTH);
+				for(;empty_len--;) more.before('<li class="blank" style="height:57px;" />');
+				lis = ul.find('>li');
+			}
+
+			var toolset_count = (lis.length-1) / 9
+
+			this.toolset_offset++;
+			if (this.toolset_offset >= toolset_count) this.toolset_offset = 0;
+
+			more.before( lis.slice(0,TOOLSET_LENGTH) );
+		}
+	},
+	API_ADD_DEFAULT_EDITOR_ACTION : function(sender, params) {
+		var self   = this;
+		var seq    = params[0];
+		var editor = params[1];
+		var type   = (params[2]||'').toUpperCase();
+
+		// save and cancel button
+		var _buttons = editor.find('div.buttonArea button');
+		_buttons.eq(0).click(function(){ self.cast('CLOSE_EDITOR', [seq, true, type]); }); // save button
+		_buttons.eq(1).click(function(){ self.cast('CLOSE_EDITOR', [seq, false, type]); }); // cancel button
+
+		// textbox default value
+		editor.find('input[type=text],textarea')
+			.focus(function(){ if($.trim(this.value) == this.title) this.value = ''; })
+			.blur(function(){ var val=$.trim(this.value); if (val==this.title || val == '') this.value = this.title; })
+			.filter('input').keydown(function(event){ if(event.keyCode == 13) return false; });
+
+		// set default checkbox and radio button
+		editor.find('input[type=checkbox],input[type=radio]').filter(':checked').addClass('_default_check');
+
+		editor.find('input,textarea').keydown(function(event){
+			var ESC = 27, ENTER = 13;
+
+			if (!configs[seq].last_type) return true;
+
+			if (event.keyCode == 27) {
+				self.cast('CLOSE_EDITOR', [seq, false, configs[seq].last_type]);
+				return false;
+			}
+
+			if (event.ctrlKey && event.keyCode == ENTER) {
+				self.cast('CLOSE_EDITOR', [seq, true, configs[seq].last_type]);
+				return false;
+			}
+		});
+	},
+	API_RESET_EDITOR : function(sender, params) {
+		var seq    = params[0];
+		var editor = params[1];
+		var type   = (params[2]||'').toUpperCase();
+
+		// reset textbox
+		editor.find('input[type=text],textarea').each(function(){ this.value = this.title; });
+
+		// reset checkbox and radio buttons
+		editor.find('input[type=checkbox],input[type=radio]').filter('._default_check').attr('checked', 'checked');
+	},
+	API_TOOLBAR_REPOSITION : function(sender, params) {
+		var seq         = params[0];
+		var toolbar     = configs[seq].toolbar.parent();
+		var view_bottom = $(window).scrollTop() + document.documentElement.clientHeight; //scroll_top + doc_height
+		var old_top     = toolbar.css('top');
+		var offset_top  = toolbar.css('top', 0).offset().top;
+		var new_top     = Math.min( ((view_bottom - toolbar.height()) - offset_top - 5), 0);
+
+		if (old_top != new_top) toolbar.css('top', new_top+'px');
+	},
+	API_OPEN_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var box  = params[1]; // selection to edit
+		var bef  = params[2]; // selection to be before this editor
+		var type = params[3];
+
+		this.cast('OPEN_'+type.toUpperCase()+'_EDITOR', [seq, box, bef]);
+		configs[seq].last_type = type;
+		configs[seq].blankBox.hide();
+
+		this.cast('TOOLBAR_REPOSITION', [seq]);
+	},
+	API_CLOSE_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = !!params[1];
+		var type = params[2];
+
+		this.cast('CLOSE_'+type.toUpperCase()+'_EDITOR', [seq, save]);
+
+		if (configs[seq].editArea.children('div.eArea').length) {
+			configs[seq].blankBox.hide();
+		} else {
+			configs[seq].blankBox.show();
+		}
+
+		this.cast('TOOLBAR_REPOSITION', [seq]);
+	},
+	API_SCROLL_INTO_VIEW : function(sender, params) {
+		var seq  = params[0];
+		var sel  = params[1];
+		var edge = params[2];
+
+		if (!sel || !sel.length) return;
+		if (!edge) {
+			this.cast('SCROLL_INTO_VIEW', [seq, sel, 'bottom']);
+			this.cast('SCROLL_INTO_VIEW', [seq, sel, 'top']);
+			return;
+		}
+		if (edge != 'top' && edge != 'bottom') edge = 'top';
+
+		var pos, view_height = $(window).height(), scroll_top = $(window).scrollTop();
+
+		if (edge == 'top') {
+			pos = sel.eq(0).offset();
+			if (pos.top-5 < scroll_top) $(window).scrollTop(pos.top-5);
+		} else {
+			sel = sel.eq(sel.length - 1);
+			pos = sel.offset();
+			pos.height  = sel.outerHeight();
+			pos.toolbar = 0;
+
+			if (configs[seq].toolbar.parent().is(':visible')) pos.toolbar = configs[seq].toolbar.parent().outerHeight()+10;
+			if (pos.top+pos.height > scroll_top+view_height-pos.toolbar-5) {
+				$(window).scrollTop( pos.top+pos.height-view_height+pos.toolbar+5);
+			}
+		}
+	}
+});
+var editor = new DrEditor;
+xe.registerApp(editor);
+
+// Header Writer
+var header_tag = 'h1,h2,h3,h4,h5,h6';
+var HeaderWriter = xe.createPlugin('HeaderWriter', {
+	configs : null,
+	init    : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor = configs[seq].writeArea.find('>div.hx');
+		var _inputHead  = _editor.find('input[type=text]:first');
+		var _inputLevel = _editor.find(':radio').click(function(){ self.cast('CHANGE_HEADER_FORMAT', [seq, this.value]) });
+
+		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'HX']);
+
+		this.configs[seq] = {
+			editor : _editor,
+			inputHead  : _inputHead,
+			inputLevel : _inputLevel
+		};
+
+		return this.configs[seq];
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div.xe_dr_hx,'+header_tag)
+			.each(function(){
+				var t = $(this);
+				if (!t.is('.xe_dr_hx')) t = t.wrap('<div>').parent();
+
+				t.attr('class', 'eArea _hx').attr('type', 'hx');
+
+				var header = t.children(header_tag);
+				if(!header.attr('id')) header.attr('id', 'h'+(new Date).getTime());
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		var header = obj.children('div._hx').children(header_tag).each(function(){ var t=$(this); t.parent().after(t).remove() });
+	},
+	API_CHANGE_HEADER_FORMAT : function(sender, params) {
+		var seq = params[0];
+		var val = params[1];
+
+		this.configs[seq].inputHead.attr('class', 'inputTitle '+val);
+	},
+	API_OPEN_HX_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1]; // selection to edit
+		var bef = params[2]; // selection to be before this editor
+		var cfg = this.configs[seq];
+
+		// Create this editor if it doesn't exists
+		if(!cfg) cfg = this.create(seq);
+
+		this.cast('RESET_EDITOR', [seq, cfg.editor, 'HX']);
+
+		if(box) {
+			var tagName = box.children(header_tag)[0].tagName.toLowerCase();
+
+			box.hide().after(cfg.editor);
+
+			cfg.inputHead.val( box.find(header_tag).eq(0).text() );
+			cfg.inputLevel.filter('[value='+tagName+']').click();
+		} else if (bef) {
+			$(bef).after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+		cfg.editor.show().find('input[type=text]:first').focus();
+
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_HX_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._hx:hidden');
+
+		if(save) {
+			var newBox  = $('<div>');
+			var id      = box.children(header_tag).attr('id');
+			var tagName = cfg.inputLevel.filter(':checked').val();
+
+			if (!id) id = 'h'+(new Date).getTime();
+
+			newBox.html('<'+tagName+' id="'+id+'"></'+tagName+'>').children(':first').text(cfg.inputHead.val());
+
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'HX']);
+		} else {
+			box.show();
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	}
+});
+editor.registerPlugin(new HeaderWriter);
+
+var IndexWriter = xe.createPlugin('IndexWriter', {
+	init    : function() {
+		this.configs = {};
+	},
+	createIndex : function(seq) {
+		var toc  = $('<ul class="toc"></ul>');
+		var rand = Math.ceil(Math.random()*1000);
+
+		configs[seq].editArea.children('div._hx').children('h1,h2,h3,h4,h5,h6')
+			.each(function(){
+				var t = $(this), id = t.attr('id'), n = this.nodeName.replace(/[^0-9]/,'');
+
+				if (!id) t.attr('id', id = 'h'+rand+Math.ceil(Math.random()*1000));
+				toc.append('<li class="toc'+n+'"><a href="#'+id+'">'+t.html()+'</a></li>');
+			});
+
+		return $('<div class="eArea _index">').append(toc);
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div.xe_dr_index,ul.toc')
+			.each(function(){
+				var t = $(this);
+				if (t.is('ul')) t = t.wrap('<div>').parent();
+				t.attr('class', 'eArea _index').attr('type', 'index');
+			});
+	},
+	refreshIndex : function(seq) {
+		configs[seq].editArea.children('div._index').replaceWith(this.createIndex(seq));
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+		var toc = obj.children('div._index').children('ul.toc');
+
+		toc.parent().before(toc).remove();
+	},
+	API_OPEN_INDEX_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1]; // selection to edit
+		var bef = params[2]; // selection to be before this editor
+
+		if (box) {
+			box.fadein('fast');
+		} else if (bef) {
+			bef.after(box = this.createIndex(seq));
+		} else {
+			configs[seq].editArea.append(box = this.createIndex(seq));
+		}
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+		this.cast('SCROLL_INTO_VIEW', [seq, box]);
+	},
+	API_AFTER_CLOSE_HX_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+
+		if (save) {
+			// auto refresh if a header was saved or updated.
+			this.refreshIndex(seq);
+		}
+	},
+	ONMOVE_PARAGRPH : function(sender, params) {
+		var seq = params[0];
+		var selbox = this.cast('GET_SELECTED_PARAGRAPH', [seq]);
+
+		if (selbox.filter('div._index').length) {
+			// auto refresh if a header was moved.
+			this.refreshIndex(seq);
+		}
+	}
+});
+editor.registerPlugin(new IndexWriter);
+
+// Text Editor
+var TextWriter = xe.createPlugin('TextWriter', {
+	configs : null,
+	init    : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor   = configs[seq].writeArea.find('>div.txt:first');
+		var _textarea = $('<textarea>').hide();
+		var _iframe   = _editor.find('iframe').css('height','100%').after(_textarea);
+
+		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'TXT']);
+
+		this.configs[seq] = {
+			editor   : _editor,
+			iframe   : _iframe,
+			textarea : _textarea,
+			xpress   : null
+		};
+
+		return this.configs[seq];
+	},
+	createXpressEditor : function(seq) {
+		var self = this;
+		var ed = new xe.XpressCore();
+		var elAppContainer = this.configs[seq].editor[0];
+		var oWYSIWYGIFrame = this.configs[seq].iframe[0];
+		var oIRTextarea    = this.configs[seq].textarea[0];
+		var pHotkey;
+
+		ed.registerPlugin(new xe.CorePlugin(function(){ this.oApp.exec('FOCUS',[]) }));
+		ed.registerPlugin(new xe.StringConverterManager());
+		ed.registerPlugin(new xe.XE_EditingAreaVerticalResizer(elAppContainer));
+		ed.registerPlugin(new xe.ActiveLayerManager());
+		ed.registerPlugin(pHotkey=new xe.Hotkey());
+		ed.registerPlugin(new xe.XE_WYSIWYGStyler());
+		ed.registerPlugin(new xe.XE_WYSIWYGStyleGetter());
+		ed.registerPlugin(new xe.MessageManager(oMessageMap));
+		ed.registerPlugin(new xe.XE_Toolbar(elAppContainer));
+		ed.registerPlugin(new xe.XE_UndoRedo());
+		ed.registerPlugin(new xe.XE_Hyperlink(elAppContainer));
+		ed.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG", oIRTextarea, {nHeight:200, nMinHeight:100}, null, elAppContainer));
+		ed.registerPlugin(new xe.XE_EditingArea_HTMLSrc(oIRTextarea));
+		ed.registerPlugin(new xe.XE_EditingArea_WYSIWYG(oWYSIWYGIFrame));
+		ed.registerPlugin(new xe.XpressRangeManager(oWYSIWYGIFrame));
+		ed.registerPlugin(new xe.XE_ExecCommand(oWYSIWYGIFrame));
+		ed.registerPlugin(new xe.XE_FontNameWithSelectUI(elAppContainer));
+		ed.registerPlugin(new xe.XE_FontSizeWithSelectUI(elAppContainer));
+		ed.registerPlugin(new xe.XE_LineHeightWithSelectUI(elAppContainer));
+		ed.registerPlugin(new xe.XE_ColorPalette(elAppContainer));
+		ed.registerPlugin(new xe.XE_FontColor(elAppContainer));
+		ed.registerPlugin(new xe.XE_BGColor(elAppContainer));
+		ed.registerPlugin(new xe.XE_SCharacter(elAppContainer));
+		ed.registerPlugin(new xe.XE_WYSIWYGEnterKey("BR"));
+		//ed.registerPlugin(new xe.XE_FontSetter(this.getFontFamily(), this.getFontSize()));
+
+		// Ctrl+Enter를 입력하면 현재 문단 저장 후 새 텍스트 문단을 보여준다.
+        pHotkey.add(pHotkey.normalize('ctrl+enter'), function(){ 
+			setTimeout(function() { self.cast('CLOSE_EDITOR', [seq, true, 'TXT']) }, 1);
+		});
+		pHotkey.add(pHotkey.normalize('esc'), function(){ 
+			setTimeout(function() { self.cast('CLOSE_EDITOR', [seq, false, 'TXT']) }, 1);
+		});
+
+		// 에디터 시작
+		ed.run();
+
+		return ed;
+	},
+	API_AFTER_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.contents()
+			.each(function(){
+				var t = $(this);
+
+				if (t.is('div.eArea')) return true;
+
+				// clean contentless paragraph {{{
+				if (
+					( this.nodeType == 3 && !$.trim(this.nodeValue) ) ||
+					( t.is('p') && /^\s*(<br ?\/?>)?\s*$/i.test(t.html()) ) ||
+					( t.is('br') )
+				) {
+					t.remove();
+					return true;
+				}
+				// }}} clean contentless paragraph
+
+				if(this.nodeType == 3) t = t.wrap('<p />').parent();
+				if(!t.is('div.xe_dr_txt')) t = t.wrap('<div />').parent();
+
+				t.attr('class', 'eArea _txt').attr('type', 'txt');
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var self = this;
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div._txt').each(function(){
+			var div = $(this), node = null;
+
+			div.contents().each(function(){
+				var t = $(this);
+
+				if(this.nodeType == 3 || t.is('br,a,b,i,s,u,sub,sup,em,strong,span,img,font')) {
+					if( t.is('br,img') || $.trim(t.text()) ) {
+						if(!node) div.before(node = $('<p>'));
+						node.append(this);
+					} else {
+						t.remove();
+					}
+					return true;
+				}
+
+				div.before(t);
+				node = null;
+			});
+
+			div.remove();
+		});
+	},
+	API_OPEN_TXT_EDITOR : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var box  = params[1];
+		var bef  = params[2]; // selection to be before this editor
+		var cfg  = this.configs[seq];
+		var meanless;
+
+		// Create this editor if it doesn't exists
+		if (!cfg) cfg = this.create(seq);
+
+		// 이벤트 제거를 위해 DOM에서 제거한다.
+		var tx = cfg.editor.find('div.txEditor:first');
+		tx.prev().after(tx.remove());
+
+		if(box) {
+			box.hide().after(cfg.editor).find('button.del,div.drag_handle').remove();
+			cfg.textarea.val( box.html() );
+		} else if (bef) {
+			bef.after(cfg.editor);
+			cfg.textarea.val( '<p><br /></p>' );
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+			cfg.textarea.val( '<p><br /></p>' );
+		}
+
+		cfg.editor.show();
+		(function(){
+			try {
+				meanless = cfg.iframe[0].contentWindow.document.body.firstChild;
+				cfg.xpress = self.createXpressEditor(seq);
+
+				self.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+			} catch(e) {
+				setTimeout(arguments.callee, 10);
+			}
+		})();
+	},
+	API_CLOSE_TXT_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._txt:hidden');
+
+		if(save) {
+			var newBox  = $('<div>').html( cfg.xpress.getIR() );
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'TXT']);
+		} else {
+			box.show();
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	}
+});
+editor.registerPlugin(new TextWriter);
+
+var QuoteWriter = xe.createPlugin('QuoteWriter', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self      = this;
+		var _editor   = configs[seq].writeArea.find('>div.quote:first');
+		var _textarea = _editor.find('textarea:first');
+		var _source   = _editor.find('input[type=text]:first');
+
+		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'QUOTE']);
+
+		this.configs[seq] = {
+			editor   : _editor,
+			textarea : _textarea,
+			source   : _source
+		};
+
+		return this.configs[seq];
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var obj  = params[1];
+
+		obj.children('div.xe_dr_blockquote,blockquote.citation')
+			.each(function(){
+				var t = $(this);
+				if (t.is('div.xe_dr_blockquote')) {
+					t.find('>blockquote').attr('class', 'citation');
+				} else if (t.is('blockquote')) {
+					t = t.wrap('<div>').parent();
+				}
+				t.attr('class', 'eArea _quote').attr('type', 'quote');
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var obj  = params[1];
+
+		obj.children('div._quote').each(function(){
+			var quote = $(this).children('blockquote.citation');
+			quote.parent().before(quote).remove();
+		});
+	},
+	API_OPEN_QUOTE_EDITOR : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var box  = params[1];
+		var bef  = params[2]; // selection to be before this editor
+		var cfg  = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+
+		if (box) {
+			box.hide().after(cfg.editor);
+			cfg.textarea.val( untranslate(box.find('p').html().replace(/<br ?\/?>/ig, '\n')) );
+			cfg.source.val(box.find('cite').html());
+		} else {
+			self.cast('RESET_EDITOR', [seq, cfg.editor, 'QUOTE']);
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+		cfg.editor.show().find('textarea').focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_QUOTE_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._quote:hidden');
+		var txt  = $.trim(cfg.textarea.val());
+
+		if (save && txt) {
+			var newBox = $('<div>');
+			var quote  = $('<blockquote class="citation" />').append( $('<p>').html( translate(txt).replace(/\r?\n/g, '<br />') ) ).appendTo(newBox);
+			var src = $.trim(cfg.source.val());
+
+			if(src == cfg.source.attr('title')) src = '';
+			if(src) $('<cite>').html(translate_cite(src)).appendTo(quote);
+
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'QUOTE']);
+		} else {
+			box.show();
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	}
+});
+editor.registerPlugin(new QuoteWriter);
+
+var MovieWriter = xe.createPlugin('MovieWriter', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor   = configs[seq].writeArea.find('>div.movie');
+		var _textarea = _editor.find('textarea');
+
+		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'MOVIE']);
+
+		this.configs[seq] = {
+			editor : _editor,
+			embed  : _textarea.eq(0),
+			desc   : _textarea.eq(1),
+			source : _editor.find('input[type=text]')
+		};
+
+		return this.configs[seq];
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var obj  = params[1];
+
+		obj.children('object,embed,div.xe_dr_mov,div:has(div.embed)')
+			.each(function(){
+				var t = $(this);
+				if (!t.is('div')) t = t.wrap('<div>').parent();
+				t.attr('class', 'eArea _movie').attr('type', 'movie');
+				t.find('>embed,>object').wrap('<div class="embed">');
+				t.find('>p.cite>cite').unwrap();
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var obj  = params[1];
+		var mov  = obj.children('div._movie').children('embed,object');
+
+		// TODO : 플래시 태그면 embed, object를 모두 사용하도록 변환
+
+		obj.parent().before(mov).remove();
+	},
+	API_OPEN_MOVIE_EDITOR : function(sender, params) {
+		var self = this;
+		var seq  = params[0];
+		var box  = params[1];
+		var bef  = params[2]; // selection to be before this editor
+		var cfg  = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+
+		self.cast('RESET_EDITOR', [seq, cfg.editor, 'MOVIE']);
+
+		if (box) {
+			var embed  = $.trim( box.find('>div.embed').html() );
+			var desc   = $.trim( box.find('>p.desc').html() );
+			var source = $.trim( box.find('>cite').html() );
+
+			cfg.embed.val( embed );
+			cfg.desc.val( desc );
+			cfg.source.val( source );
+
+			box.hide().after(cfg.editor);
+		} else if (bef) {
+			bef.after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+
+		cfg.editor.show().find('textarea:first').focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_MOVIE_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._movie:hidden');
+		var val  = $.trim(cfg.embed.val());
+
+		if (save && val) {
+			var newBox = $('<div>').append( $('<div class="embed">').html(val) );
+			var desc   = $.trim(cfg.desc.val());
+			var source = $.trim(cfg.source.val());
+
+			if (desc == cfg.desc.attr('title')) desc = '';
+			if (source == cfg.source.attr('title')) source = '';
+
+			if (desc) newBox.append( $('<p class="desc">').text(desc) );
+			if (source) newBox.append( $('<cite>').html(translate_cite(source)) );
+
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'MOVIE']);
+		} else {
+			box.show();
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	}
+});
+editor.registerPlugin(new MovieWriter);
+
+// Image Writer
+var ImageWriter = xe.createPlugin('ImageWriter', {
+	configs : null,
+	_iframe : null,
+	_form   : null,
+	init : function() {
+		var target = 'xe_dr_imgframe_'+(new Date).getTime();
+
+		this.configs = {};
+		this._iframe = $('<iframe name="'+target+'" src="about:blank" style="position:absolute;width:1px;height:1px;left:-2000px;top:0">');
+		this._form   = $('<form target="'+target+'" method="POST" enctype="multipart/form-data" style="position:absolute;width:1px;height:1px;left:-2000px;"></form>')
+			.append('<input type="hidden" name="editor_sequence" value="" />')
+			.append('<input type="hidden" name="callback" />')
+			.append('<input type="hidden" name="file_srl" />')
+			.append('<input type="hidden" name="mid" value="" />')
+			.append('<input type="hidden" name="module" value="file" />')
+			.append('<input type="hidden" name="act" value="procFileIframeUpload" />')
+			.append('<input type="hidden" name="uploadTargetSrl" value="" />');
+
+		if (typeof(xeVid) != 'undefined') this._form.append('<input type="hidden" name="vid" value="'+xeVid+'" />');
+
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor  = configs[seq].writeArea.find('>div.img');
+		var _file    = _editor.find('input[type=file]');
+		var _desc    = _editor.find('input[type=text].desc');
+		var _image   = _editor.find('div.image > img');
+		var _resize  = _editor.find('div.resize');
+		var _align   = _editor.find('div.align');
+		var _message = _editor.find('p.uploading');
+
+		self.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'IMG']);
+
+		_file.change(function(){
+			var t = $(this);
+			var prev = t.prev();
+			
+			if ( !/\.(jpe?g|png|gif)$/i.test(t.val()) ) {
+				t.val('');
+				return false;
+			}
+
+			var callback_id = ''+(new Date).getTime()+Math.ceil(Math.random()*1000);
+			window[callback_id] = function(fileObj){ self.onfileuploaded(seq, callback_id, fileObj); }
+			
+			var filesrl = _image.attr('class').match(/(?:^|\s)xe_filesrl_(\d+)(?:\s|$)/);
+			filesrl = (filesrl && filesrl[1])? filesrl[1] : '';
+
+			// upload file
+			self._form.find('input[name=editor_sequence]').val(seq);
+			self._form.find('input[name=callback]').val(callback_id);
+			self._form.find('input[name=file_srl]').val(filesrl);
+			self._form.find('input[name=uploadTargetSrl]').val(editorRelKeys[seq]["primary"].value);
+			self._form.append(t).submit();
+			setTimeout(function(){ self.reset_fileform(t); prev.after(t) }, 0);
+
+			// hide image and show uploading
+			_image.parent().hide();
+			_file.hide();
+			_resize.hide();
+			_align.hide();
+			_message.show();
+		});
+
+		_message.find('button').click(function(){
+			self._iframe.attr('src', 'about:blank');
+			_file.show();
+			_message.hide();
+
+			if (_image.attr('src')) _image.parent().show();
+		});
+
+		_align.find('input[type=radio]').click(function(){ _image.parent().css('text-align', this.value); });
+
+		_resize.find('button.btn_resize').click(function(){
+			var w = parseInt(_resize.find('input[type=text].width').val());
+			var n = parseInt(_resize.find('dd>em').text());
+
+			if (isNaN(w) || isNaN(n) || w > n) {
+				_resize.find('p.resizeError').show();
+				return false;
+			}
+
+			_resize.find('p.resizeError').hide();
+			var _src = _image.attr('rawsrc') || _image.attr('src');
+
+			$.exec_json('file.procFileImageResize',{width:w, source_src:decodeURI(_src)},function(data){
+				if(data.error != 0) return;
+
+				_image.attr({
+					src    : encodeURI(data.resized_info.src),
+					width  : data.resized_info.info[0],
+					height : data.resized_info.info[1]
+				});
+
+				if(!_image.attr('rawsrc')) _image.attr('rawsrc', _src);
+			});
+		})
+
+		this.configs[seq] = {
+			editor  : _editor,
+			file    : _file,
+			desc    : _desc,
+			image   : _image,
+			resize  : _resize,
+			align   : _align,
+			message : _message
+		};
+
+		return this.configs[seq];
+	},
+	show_resize : function(seq, src) {
+		var cfg = this.configs[seq];
+
+		cfg.resize.find('p.resizeError').hide();
+
+		cfg.image
+			.load(function(){ var w=this.width, h=this.height, t=$(this); if(w>600){ cfg.resize.show().find('dd>em').text(w);cfg.resize.find('dd>input:text').val(600); } })
+			.attr('src', src)
+			.parent().show();
+	},
+	reset_fileform : function(obj) {
+		var next = obj.next();
+		var form = $('<form>').append(obj)[0].reset();
+		next.before(obj);
+	},
+	onfileuploaded : function(seq, callback_id, fileObj) {
+		// remove callback function
+		try {
+			delete window[callback_id];
+		} catch(e) {
+			window[callback_id] = null;
+		}
+
+		if(fileObj.error==-1){
+			alert(fileObj.message);
+			return;
+		}
+		
+		var self = this;
+		var cfg  = this.configs[seq];
+
+		if(fileObj.upload_target_srl && fileObj.upload_target_srl != 0) {
+			editorRelKeys[seq]['primary'].value = fileObj.upload_target_srl;
+		}
+
+		// show resize
+		cfg.image
+			.removeAttr('width')
+			.removeAttr('height')
+			.removeAttr('rawsrc')
+			.attr('filesrl', fileObj.file_srl);
+
+		cfg.file.show();
+		cfg.align.show();
+		cfg.message.hide();
+		this.show_resize(seq, encodeURI(fileObj.uploaded_filename));
+
+		// 이미지 파일도 서버측에서는 파일로 카운트 되므로,
+		// reloadFileList를 호출해서 orderedFiles와 uploadedFiles 배열을 갱신해주도록 한다.
+		// 관련 이슈 : http://textyle.xpressengine.net/18256095
+		var settings = {
+			fileListAreaID : '',
+			editorSequence : seq,
+			uploadTargetSrl : ''
+		};
+		reloadCallback[seq] = function(){};
+		reloadFileList(settings);
+	},
+	API_ONREADY : function() {
+		this._form.attr('action', request_uri)
+		this._form.find('input[name=mid]').val(current_mid);
+
+		this._iframe.appendTo(document.body).after(this._form);
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('img,p.img,div._img,div.xe_dr_img')
+			.each(function(){
+				var t = $(this);
+				if(t.is('img')) t = t.wrap('<p class="img"></p>');
+				if(t.is('p.img')) t = t.wrap('<div></div>').parent();
+				if(t.is('div.xe_dr_img')) {
+					var img    = t.children('p:has(img)').attr('class', 'img');
+					var desc   = t.children('p.desc').remove();
+					var cite   = t.children('p.cite').remove();
+					var s_desc = $.trim(desc.html() || '');
+					var s_cite = $.trim(cite.html() || '');
+					var s_text = [];
+
+					if (s_desc) s_text.push(s_desc);
+					if (s_cite) s_text.push(s_cite);
+					if (s_text.length) img.append('<br>').append($('<div>').html(s_text.join(' - ')).contents());
+				}
+
+				t.attr('class', 'eArea _img').attr('type', 'img');
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div._img')
+			.each(function(){
+				var t = $(this);
+				var p = t.children('p').attr('class', 'img');
+				t.before(p).remove();
+			});
+	},
+	API_OPEN_IMG_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+		var cfg = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+
+		// reset
+		this.cast('RESET_EDITOR', [seq, cfg.editor, 'IMG']);
+
+		if(box) {
+			var p   = box.children('p.img:first');
+			var img = p.find('img');
+
+			box.hide().after(cfg.editor);
+			cfg.align.show();
+
+			if (img.attr('rawsrc')) cfg.image.attr('rawsrc', img.attr('rawsrc'));
+			this.show_resize(seq, img.attr('src'));
+
+			var align = p.css('text-align');
+			if (align) {
+				cfg.align.find('input[value='+align.toLowerCase()+']').attr('checked', 'checked');
+				cfg.image.parent().css('text-align', align);
+			}
+
+			var _class = img.attr('class').match(/(?:^|\s)xe_filesrl_(\d+)(?:\s|$)/);
+			if (_class && _class[1]) cfg.image.attr('filesrl', _class[1]);
+
+			var desc  = $.trim(p.text());
+			if (desc) cfg.desc.val(desc);
+		} else if (bef) {
+			bef.after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+
+		cfg.editor.show();
+		(($.browser.msie||$.browser.opera)?cfg.desc:cfg.file).focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_IMG_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._img:hidden');
+
+		if (save && cfg.image.attr('src')) {
+			var align = cfg.align.find('input[type=radio]:checked').val();
+			var newBox = $('<div>');
+			var img    = $('<img>').attr('src', cfg.image.attr('src'));
+			var rawsrc = cfg.image.attr('rawsrc');
+
+			$('<p class="img">').css('text-align', align).append(img).appendTo(newBox);
+			img.attr({ 'width':cfg.image.attr('width'), 'height':cfg.image.attr('height') });
+			if (rawsrc) img.attr('rawsrc', rawsrc);
+
+			var desc = $.trim(cfg.desc.val());
+			if (desc && desc != cfg.desc.attr('title')) img.after(translate_cite(desc)).after('<br />');
+
+			var filesrl = cfg.image.attr('filesrl');
+			if (filesrl) img.addClass('xe_filesrl_'+filesrl);
+			
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'IMG']);
+		} else {
+			box.show();
+		}
+		
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	},
+	API_BEFORE_RESET_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var type = params[2];
+		var cfg  = this.configs[seq];
+
+		if (type == 'IMG') {
+			cfg.image
+				.removeAttr('filesrl')
+				.removeAttr('width')
+				.removeAttr('height')
+				.removeAttr('src')
+				.removeAttr('rawsrc')
+				.parent().css('text-align', '').hide();
+			cfg.resize.hide().find('input[type=text]').val('');
+			cfg.align.hide().find('input[type=radio]:first').attr('checked', 'checked');
+			cfg.file.show();
+			cfg.desc.val('');
+
+			this.reset_fileform(cfg.file);
+		}
+	},
+	API_AFTER_DELETE_PARAGRAPH : function(sender, params) {
+		var self   = this;
+		var seq    = params[0];
+		var target = params[1];
+
+		if (target && target.length) {
+			var srl = [];
+			target.filter('div._img').each(function(){
+				var s = $(this).find('img[class^=xe_filesrl]').attr('class').replace('xe_filesrl_','');
+				if(s) srl.push(s);
+			});
+
+			if(srl.length) exec_xml('file','procFileDelete',{file_srls:srl.join(','),editor_sequence:seq});
+		}
+	}
+});
+editor.registerPlugin(new ImageWriter);
+
+// Material Writer
+var MaterialWriter = xe.createPlugin('MaterialWriter', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor  = configs[seq].writeArea.find('>div.material:first');
+		var _buttons = _editor.find('div.controls button');
+		_buttons.eq(0).click(function(){ self.load_material(seq, 1); });
+		_buttons.eq(1).click(function(){ self.cast('CLOSE_EDITOR', [seq, false, 'MATERIAL']); });
+	
+		this.configs[seq] = {
+			editor     : _editor,
+			template   : _editor.find('div._container > dl').remove(),
+			to_save    : null,
+			loaded     : false,
+			prev_page  : 0,
+			next_page  : 0,
+			total_page : 0
+		};
+
+		this.load_material(seq, 1);
+
+		return this.configs[seq];
+	},
+	load_material_next : function(seq){
+		var cfg = this.configs[seq];
+
+		if(++cfg.next_page>=cfg.total_page) cfg.next_page=cfg.total_page;
+		cfg.next_page = cfg.next_page>0?cfg.next_page:1;
+		this.load_material(seq, cfg.next_page);
+	},
+	load_material_prev : function(seq){
+		var cfg = this.configs[seq];
+
+		cfg.prev_page = --cfg.prev_page>0?cfg.prev_page:1;
+		this.load_material(seq, cfg.prev_page);
+	},
+	load_material : function(seq, page) {
+		var self = this;
+		var cfg  = this.configs[seq];
+		var area = cfg.editor.find('div._container');
+		var paginate = cfg.editor.find('div.paginate');
+
+		if (!page) page = 1;
+
+		function callback(data){
+			if(data.page_navigation.total_count) cfg.editor.find('p.noData').css('display','none');
+
+			// 글감 목록 전부 삭제
+			area.children().remove();
+
+			// 페이징
+			paginate.find('> span').text(data.page_navigation.cur_page+'/'+data.page_navigation.total_page);
+
+			cfg.prev_page  = data.page_navigation.cur_page;
+			cfg.next_page  = data.page_navigation.cur_page;
+			cfg.total_page = data.page_navigation.total_page;
+			
+			if(!cfg.loaded){
+				paginate.find('> button.prev').click(function(){ self.load_material_prev(seq) });
+				paginate.find('> button.next').click(function(){ self.load_material_next(seq) });
+			}
+
+			// 컨텐트 추가
+			$.each(data.material_list, function(){
+				var tpl = cfg.template.clone();
+
+				tpl.addClass('xe_dr_'+this.type);
+				tpl.find('dt').text(this.regdate.substring(0,4)+'.'+this.regdate.substring(4,6)+'.'+this.regdate.substring(6,8)+' '+this.regdate.substring(8,10)+':'+this.regdate.substring(10,12));
+				tpl.find('dd > div.eArea').html(this.content);
+				tpl.find('dd > span.buttonDrEditor > button').click(function(event){
+					var t = $(event.target);
+					var o = t.parent().prev('div.eArea').eq(0).clone();
+
+					self.cast('SETTING_CONTENT', [seq, o]);
+
+					cfg.to_save = o;
+					self.cast('CLOSE_MATERIAL_EDITOR', [seq, true]);
+				});
+
+				area.append(tpl);
+			});
+
+			cfg.loaded =true;
+		}
+
+		if(area.length) $.exec_json('material.dispMaterialList',{page:page, list_count:4}, callback);
+	},
+	API_OPEN_MATERIAL_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+		var cfg = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+
+		if (bef) {
+			bef.after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+
+		cfg.editor.show();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_MATERIAL_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box;
+
+		if (save && cfg.to_save) {
+			var newBox = cfg.to_save.children('div.eArea');
+
+			cfg.to_save = null;
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, '']);
+		} else {
+			box = cfg.editor.prev('div.eArea');
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	}
+});
+editor.registerPlugin(new MaterialWriter);
+
+// File Writer
+var regex_srl  = /filesrl_([0-9-]+)/;
+var FileWriter = xe.createPlugin('FileWriter', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor   = configs[seq].writeArea.find('>div.file');
+		var _files    = _editor.find('dl.attachedFile');
+		var _summary  = _editor.find('p.summary').next('div.hr').andSelf();
+		var _template = _files.find('> dd:first').show().remove();
+		var _count    = _summary.find('strong.filecount');
+		var _size     = _summary.find('em.filesize');
+		var _inputs   = _editor.find('input[type=text]');
+
+		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'FILE']);
+
+		this.configs[seq] = {
+			editor    : _editor,
+			template  : _template,
+			summary   : _summary,
+			files     : _files,
+			count     : _count,
+			size      : _size,
+			desc      : _inputs.eq(0),
+			cite      : _inputs.eq(1),
+			n_count   : 0,
+			n_size    : 0,
+			queue_idx : 0
+		};
+
+		return this.configs[seq];
+	},
+	onstartupload : function(seq) {
+		this.configs[seq].queue_idx = 0;
+	},
+	onfileuploaded : function(seq, fileObj, serverData, obj) {
+		var self = this;
+		var cfg  = this.configs[seq];
+		var tpl  = cfg.template.clone();
+
+		tpl.find('>strong').text(fileObj.name);
+		tpl.find('>em').text(this.formatsize(fileObj.size));
+		tpl.addClass('filesrl_-'+(orderedFiles.length+cfg.queue_idx));
+		tpl.find('button.buttonDelete').click(function(){ self.ondelete(seq, $(this)) }).hide();
+		tpl.appendTo(cfg.files);
+
+		cfg.files.show().append(tpl);
+		cfg.queue_idx++;
+
+		// summary
+		cfg.summary.show();
+		cfg.count.text(++cfg.n_count);
+		cfg.size.text(this.formatsize(cfg.n_size += fileObj.size));
+
+		// process next queue
+		if (obj.getStats().files_queued > 0) obj.startUpload();
+	},
+	onreloadlist : function(seq, upload_target_srl) {
+		var cfg  = this.configs[seq];
+
+		if(upload_target_srl) editorRelKeys[seq].primary.value = upload_target_srl;
+		cfg.files.children('dd').each(function(){
+			var dd  = $(this);
+			var srl = dd.attr('class').match(regex_srl);
+			var cls;
+
+			if (!srl || !srl[1]) return;
+
+			cls = srl[0]; srl = parseInt(srl[1]);
+
+			if (srl <= 0) {
+				var fileObj = orderedFiles[Math.abs(srl)];
+
+				if (!fileObj) return;
+
+				// 기존 파일 시퀀스를 지우고 새 시퀀스 추가
+				dd.removeClass(cls).addClass('filesrl_'+fileObj.file_srl);
+
+				// 삭제버튼 보여주기
+				dd.find('button.buttonDelete').show();
+			}
+		});
+	},
+	ondelete : function(seq, btn) {
+		var cfg = this.configs[seq];
+		var srl = btn.parent().attr('class').match(regex_srl);
+
+		if (!srl || !srl[1] || (srl=parseInt(srl[1])) < 0) return;
+
+		// remove this file
+		btn.parent().remove();
+		if (!cfg.files.children('dd').length) {
+			cfg.files.hide();
+			cfg.summary.hide();
+		}
+
+		// TODO : delete this file from the server
+
+		var fileObj = uploadedFiles[srl];
+		if (fileObj) {
+			cfg.count.text(--cfg.n_count);
+			cfg.size.text(this.formatsize(cfg.n_size -= fileObj.file_size));
+		}
+	},
+	formatsize : function(size) {
+		size = parseFloat(size);
+		if (isNaN(size)) return 'NaN';
+
+		var units = ['B','KB','MB','GB','TB'];
+		var i = 0;
+
+		while((i < units.length-1) && size > 1024) {
+			size /= 1024;
+			i++;
+		}
+
+		size = (size+'').replace(/(\.\d{2})\d+$/, '$1') + ' ' + units[i];
+
+		return size;
+	},
+	API_ONREADY : function() {
+		reloadFileList({fileListAreaID:'',editorSequence:1,uploadTargetSrl:''});
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div.xe_dr_file,dl.attachedFile')
+			.each(function(){
+				var t = $(this);
+
+				if (t.is('dl')) {
+					var div = t.wrap('<div>').parent();
+
+					if ((t=t.next('p.desc,p.cite')).length) div.appned(t);
+					if ((t=t.next('p.desc,p.cite')).length) div.appned(t);
+
+					t = div;
+				}
+
+				t.attr('class', 'eArea _file').attr('type', 'file');
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div._file')
+			.each(function(){
+				var t = $(this);
+				t.before(t.children('dl,p')).remove();
+			});
+	},
+	API_OPEN_FILE_EDITOR : function(sender, params) {
+		var self = this;
+		var init = false;
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+		var cfg = this.configs[seq];
+		
+
+		if (!cfg) {
+			cfg  = this.create(seq);
+			init = true;
+		}
+
+		this.cast('RESET_EDITOR', [seq, cfg.editor, 'FILE']);
+
+		if(box) {
+			box.find('dl.attachedFile > dd').each(function(){
+				var dd  = $(this);
+				var tpl = cfg.template.clone();
+				var srl = dd.attr('class').match(regex_srl);
+
+				if (!srl || !(srl=srl[1])) return;
+				srl = parseInt(srl);
+
+				tpl.addClass('filesrl_'+srl);
+				tpl.find('>strong').text(dd.find('>a').text());
+				tpl.find('>em').text(dd.find('>span').text());
+				tpl.find('button.buttonDelete').click(function(){ self.ondelete(seq, $(this)) });
+
+				cfg.n_count++;
+				cfg.n_size += parseInt(uploadedFiles[srl].file_size) || 0
+
+				cfg.files.append(tpl);
+			});
+
+			cfg.count.text(cfg.n_count);
+			cfg.size.text(this.formatsize(cfg.n_size));
+			
+			cfg.files.show();
+			cfg.summary.show();
+
+			box.hide().after(cfg.editor);
+		} else if (bef) {
+			bef.after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+
+		cfg.editor.show();
+		cfg.desc.focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+
+		if (init) {
+			// if you use firebug, this code will crash your firefox browser.
+			reloadCallback[seq] = function(upload_target_srl){ self.onreloadlist(seq, upload_target_srl) };
+
+			uploaderSettings['editorSequence'] = seq;
+			uploaderSettings['upload_start_handler']   = function(){ self.onstartupload(seq) };
+			uploaderSettings['upload_success_handler'] = function(file,serverData){self.onfileuploaded(seq,file,serverData,this)};
+			editorUploadInit(uploaderSettings);
+
+			init = true;
+		}
+	},
+	API_CLOSE_FILE_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._file:hidden');
+		var file = cfg.files.children('dd');
+		var desc = $.trim(cfg.desc.val());
+		var cite = $.trim(cfg.cite.val());
+
+		if (save && file.length) {
+			var newBox = $('<div>');
+			var dl     = $('<dl class="attachedFile"><dt>'+xe.lang.attached_files+'</dt></dl>').appendTo(newBox);
+
+			$.each(file, function(){
+				var dd  = $(this);
+				var srl = dd.attr('class').match(regex_srl);
+
+				if (!srl || !(srl=srl[1])) return;
+				srl = parseInt(srl);
+
+				var fileObj = uploadedFiles[srl];
+				var a  = $('<a>').attr('href', request_uri + fileObj.download_url.replace(/\&amp;/g, '&')).text(fileObj.source_filename);
+				var sz = $('<span>').text(fileObj.disp_file_size);
+				
+				
+				$('<dd>').attr('class', 'filesrl_'+srl).append(a).append(sz).appendTo(dl);
+			});
+
+			if (desc && desc != cfg.desc.attr('title')) newBox.append($('<p class="desc">').html(translate(desc)));
+			if (cite && cite != cfg.cite.attr('title')) newBox.append($('<p class="cite">').html(translate(cite)));
+
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'FILE']);
+		} else {
+			box.show();
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	},
+	API_BEFORE_RESET_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var type = params[2];
+
+		if (type == 'FILE') {
+			var cfg = this.configs[seq];
+			cfg.n_count = 0;
+			cfg.n_size  = 0;
+			cfg.count.text(0);
+			cfg.size.text(0);
+			cfg.summary.hide();
+			cfg.files.empty().hide();
+		}
+	},
+	API_AFTER_DELETE_PARAGRAPH : function(sender, params) {
+		var self   = this;
+		var seq    = params[0];
+		var target = params[1];
+
+		if (target && target.length) {
+			var srl = [];
+			target.filter('div._file').each(function(){
+				$(this).find('dd[class^=filesrl_]').each(function(){
+					var s = $(this).attr('class').replace('filesrl_','');
+					if(s) srl.push(s);
+				});
+			});
+
+			if(srl.length) exec_xml('file','procFileDelete',{file_srls:srl.join(','),editor_sequence:seq});
+		}
+	}
+
+});
+editor.registerPlugin(new FileWriter);
+
+// List Writer
+var ListWriter = xe.createPlugin('ListWriter', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor  = configs[seq].writeArea.find('>div.list');
+		var _toolbar = _editor.find('ul.toolbar');
+		var _list    = _editor.find('div.listArea');
+		
+		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'LIST']);
+
+		_toolbar.find('button').click(function(){
+			var type = $(this).attr('class').match(/type_([a-z\-]+)/);
+			if (!type || !type[1]) return false;
+
+			self.ontoolbutton(seq, type[1]);
+
+			return false;
+		});
+
+		this.configs[seq] = {
+			editor  : _editor,
+			toolbar : _toolbar,
+			list    : _list,
+			focused : null
+		};
+
+		return this.configs[seq];
+	},
+	ontoolbutton : function(seq, type) {
+		var cfg = this.configs[seq];
+
+		if (!cfg.focused) return alert(no_selected_object_msg);
+
+		var par = cfg.focused.parent('li').parent('ul,ol');
+		if (par.length && type) par.eq(0).css('list-style-type', type);
+
+		cfg.focused.focus();
+	},
+	add_event : function(seq) {
+		var self = this;
+
+		this.configs[seq].list.find('li > input:not(.hasHandler)')
+			.addClass('hasHandler xe_content')
+			.keydown(function(event){ return self.onkeydown(seq, event) })
+			.focus(function(event){ return self.onfocus(seq, event) });
+	},
+	new_item : function(returnObj) {
+		var html = '<li><input type="name" /></li>';
+
+		return returnObj?$(html):html;
+	},
+	onkeydown : function(seq, event) {
+		var self = this;
+		var meta = event.metaKey;
+		var ctrl = event.ctrlKey;
+		var cfg  = this.configs[seq];
+		var obj  = $(event.target);
+		var li   = obj.parent('li');
+		var item, ul, prev, next, val='', start, end, stop = false;
+
+		switch(event.keyCode) {
+			case 13: // enter
+				stop = true;
+
+				if (ctrl) {
+					setTimeout(function(){ self.cast('CLOSE_EDITOR', [seq, true, 'LIST']) }, 1);
+				} else {
+					if (!$.trim(obj.val())) return obj.focus() && false;
+
+					var start = this.get_pos(obj, 'start');
+					var end   = this.get_pos(obj, 'end');
+					var val   = obj.val().substr(end);
+
+					obj.val( obj.val().substr(0, start) );
+
+					li.after(item = this.new_item(true));
+					this.add_event(seq);
+					this.set_pos( item.find('>input').focus().val(val), 0 );
+				}
+				break;
+			case 27: // ESC
+				stop = true;
+				setTimeout(function(){ self.cast('CLOSE_EDITOR', [seq, false, 'LIST']) }, 1);
+				break;
+			case 37: // left
+				if (!ctrl) break;
+				stop = true;
+				this.move_left(obj, li);
+				setTimeout(function(){obj.focus();}, 1);
+				break;
+			case 39: // right
+				if (!ctrl) break;
+				stop = true;
+				this.move_right(obj, li);
+				setTimeout(function(){obj.focus();},1);
+				break;
+			case 38: // up
+				if (!ctrl) {
+					if (!event.altKey && !event.shiftKey) {
+						var objs = cfg.list.find('input[type=text]');
+						var idx  = objs.index(obj);
+						if (idx > 0) objs.eq(idx-1).focus();
+					}
+					break;
+				}
+				stop = true;
+				this.move_up(obj, li);
+				setTimeout(function(){obj.focus();}, 1);
+				break;
+			case 40: // down
+				if (!ctrl) {
+					if (!event.altKey && !event.shiftKey) {
+						var objs = cfg.list.find('input[type=text]');
+						var idx  = objs.index(obj);
+						if (idx < objs.length-1) objs.eq(idx+1).focus();
+					}
+					break;
+				}
+				stop = true;
+				this.move_down(obj, li);
+				setTimeout(function(){obj.focus()}, 1);
+				break;
+			case 8: // backspace
+				start = this.get_pos(obj, 'start');
+				if (start == 0) {
+					var lis  = cfg.editor.find('li > input[type=text]');
+					var n_li = lis.index(obj);
+
+					if (n_li > 0) {
+						stop = true;
+						prev = lis.eq(n_li - 1);
+						val  = prev.val();
+
+						prev.focus().val( val + ($.browser.opera?' ':'') + obj.val() );
+						this.set_pos(prev, val.length + ($.browser.opera?1:0));
+
+						// remove current item
+						obj.parent().remove();
+					}
+				}
+				break;
+			case 46: // delete
+				start = this.get_pos(obj, 'start');
+				end   = this.get_pos(obj, 'end');
+				if ((start == end) && (end == obj.val().length)) {
+					var lis  = cfg.editor.find('li > input[type=text]');
+					var n_li = lis.index(obj);
+
+					if (n_li < lis.length-1) {
+						stop = true;
+						next = lis.eq(n_li + 1);
+						val  = obj.val();
+
+						obj.val( val + ($.browser.opera?' ':'') + next.val() );
+						this.set_pos(obj, val.length);
+						
+						// remove next item
+						next.parent().remove();
+					}
+				}
+				break;
+		}
+
+		return !stop;
+	},
+	get_pos : function(obj, type) {
+		var n_before, n_after;
+
+		if (typeof obj[0].selectionStart == 'number') {
+			n_before = obj[0].selectionStart;
+			n_after  = obj[0].selectionEnd;
+		} else if(document.selection) {
+			var before = document.selection.createRange().duplicate();
+			var after  = document.selection.createRange().duplicate();
+			var n_before, n_after;
+
+			before.moveEnd('character', obj.val().length);
+			after.moveStart('character', -obj.val().length);
+
+			n_before = (before.text=='')?obj.val().length:obj.val().lastIndexOf(before.text);
+			n_after  = after.text.length;
+		}
+
+		if (n_before == n_after || type == 'start') return n_before;
+		else if (type == 'end') return n_after;
+	},
+	set_pos : function(obj, pos) {
+		if (typeof obj[0].setSelectionRange == 'function') {
+			obj[0].setSelectionRange(pos, pos);
+		} else if(obj[0].createTextRange) {
+			var range = obj[0].createTextRange();
+	
+			range.moveStart('character', pos);
+			range.collapse(true);
+			range.select();
+		}
+	},
+	move_up : function(obj, li) {
+		if (li.prev('li').length) return li.prev('li').before(li);
+
+		var lev = this.get_level(li);
+		if (lev == 1) return;
+
+		var par = li.parent().parent('li');
+		var prv = par.prev('li');
+		if (prv.length) {
+			var oul = prv.children('ul,ol');
+			if (!oul.length) oul = $('<ul>').appendTo(prv);
+			oul.append(li);
+		} else if (li.is(':first') && par.is(':first')) {
+			par = par.parents('li');
+			par.eq(par.length-1).before(li);
+		} else {
+			par.parent('ol,ul').prepend(li);
+		}
+	},
+	move_down : function(obj, li) {
+		if (li.next('li').length) return li.next('li').after(li);
+
+		var lev = this.get_level(li);
+		if (lev == 1) return;
+
+		var par = li.parent().parent('li');
+		var nxt = par.next('li');
+
+		if (nxt.length) {
+			var oul = nxt.children('ul,ol');
+			if (!oul.length) oul = $('<ul>').appendTo(nxt);
+			oul.prepend(li);
+		} else if (li.is(':last') && par.is(':last')) {
+			par = par.parents('li');
+			par.eq(par.length-1).after(li);
+		} else {
+			par.parent('ol,ul').append(li);
+		}
+	},
+	move_left : function(obj, li) {
+		if (this.get_level(li) == 1) return;
+
+		var next = li.nextAll('li');
+		var list = li.children('ul,ol');
+
+		if (next.length) {
+			if (!list.length) li.append(list = $('<ul>'));
+			list.append(next);
+		}
+
+		li.parent().parent('li').after(li);
+	},
+	move_right : function(obj, li) {
+		var prev = li.prev('li');
+		var list = prev.children('ul,ol');
+
+		if (list.length) {
+			list.append(li);
+		} else if (prev.length) {
+			$('<ul>').append(li).appendTo(prev);
+		}
+	},
+	get_level : function(elem) {
+		var el  = $(elem).get(0);
+		var lev = 0;
+		var tag = '';
+		
+		while(el) {
+			tag = el.tagName.toLowerCase();
+			if (tag == 'div' && el.className == 'listArea') break;
+			if (tag == 'ul' || tag == 'ol') lev++;
+			el = el.parentNode;
+		}
+
+		return lev;
+	},
+	onfocus : function(seq, event) {
+		this.configs[seq].focused = $(event.target);
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('ul,ol,div.xe_dr_list').each(function(){
+			var t = $(this);
+			if (!t.is('div')) t = t.wrap('<div />').parent();
+			t.attr('class', 'eArea _list').attr('type', 'list').find('ol>br,ul>br').remove();
+		});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div._list')
+			.each(function() {
+				var list = $(this).children('ul,ol');
+				list.parent().before(list).remove();
+			});
+	},
+	API_OPEN_LIST_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+		var cfg = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+
+		this.cast('RESET_EDITOR', [seq, cfg.editor, 'LIST']);
+
+		if(box) {
+			box.hide().after(cfg.editor)
+				.children('ul,ol').clone()
+				.appendTo(cfg.list.empty())
+				.find('li')
+				.each(function(){
+					var t = $(this);
+					var c = t.children('ul,ol').remove();
+					var v = $.trim(t.text());
+					t.empty().append( $('<input type="text">').val(v) ).append(c);
+				});
+		} else if (bef) {
+			bef.after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+
+		this.add_event(seq);
+		cfg.editor.show().find('input[type=text]:first').focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_LIST_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._list:hidden');
+
+		if (save) {
+			var newBox = $('<div>');
+			var list   = cfg.list.children('ul,ol').appendTo(newBox);
+			var div    = $('<div>');
+
+			list.find('input[type=text]').each(function(){
+				var t = $(this);
+				var v = $.trim(t.val());
+
+				if (v || t.parent().children('ul,ol').length) {
+					div.text(v);
+					t.before(div[0].firstChild).remove();
+				} else {
+					t.parent().remove();
+				}
+			});
+			list.find('ul:not(:has(li)),ol:not(:has(li))').remove();
+
+			if (list.children('li').length) {
+				box.remove();
+				this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'LIST']);
+			}
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		box.show();
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+	},
+	API_AFTER_RESET_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var edit = params[1];
+		var type = params[2];
+		var cfg  = this.configs[seq];
+
+		if (type == 'LIST') {
+			cfg.list.html('<ul><li><input type="text" /></li></ul>');
+		}
+	}
+});
+editor.registerPlugin(new ListWriter);
+
+// Link Writer
+var LinkWriter = xe.createPlugin('LinkWriter', {
+	configs : {},
+	init : function() {
+		this.configs = {};
+	},
+	create : function(seq) {
+		var self = this;
+		var _editor = configs[seq].writeArea.find('>div.link');
+		var _inputs = _editor.find('input[type=text]');
+		var _text   = _inputs.eq(0);
+		var _url    = _inputs.eq(1);
+		var _desc   = _inputs.eq(2);
+
+		this.cast('ADD_DEFAULT_EDITOR_ACTION', [seq, _editor, 'LINK']);
+
+		this.configs[seq] = {
+			editor : _editor,
+			text   : _text,
+			url    : _url,
+			desc   : _desc
+		};
+
+		return this.configs[seq];
+	},
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div.xe_dr_link,p.link')
+			.each(function(){
+				var t = $(this);
+				if (t.is('div.xe_dr_link')) {
+					var p = t.children('p');
+					if (p.length > 1) p.eq(0).append('<br />').append( $('<span class="desc"></span>').text(p.eq(1).text()) );
+					p.eq(0).children('a').before('<br />');
+					p.eq(1).remove();
+				} else {
+					t = t.wrap('<div>').parent();
+				}
+				t.attr('class', 'eArea _link').attr('type', 'link');
+			});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div._link')
+			.each(function(){
+				var p = $(this).children('p');
+				p.parent().before(p).remove();
+			});
+	},
+	API_OPEN_LINK_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+		var cfg = this.configs[seq];
+
+		if (!cfg) cfg = this.create(seq);
+
+		this.cast('RESET_EDITOR', [seq, cfg.editor, 'LINK']);
+
+		if(box) {
+			box.hide().after(cfg.editor);
+			cfg.text.val( box.find('strong').text() );
+			cfg.url.val( box.find('a').attr('href') );
+
+			var desc = $.trim(box.find('span.desc').text());
+			if (desc) cfg.desc.val( desc );
+		} else if (bef) {
+			bef.after(cfg.editor);
+		} else {
+			cfg.editor.appendTo(configs[seq].editArea);
+		}
+
+		cfg.editor.show();
+		cfg.text.focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, cfg.editor]);
+	},
+	API_CLOSE_LINK_EDITOR : function(sender, params) {
+		var seq  = params[0];
+		var save = params[1];
+		var cfg  = this.configs[seq];
+		var box  = cfg.editor.prev('div._link:hidden');
+
+		var text = $.trim(cfg.text.val());
+		var url  = $.trim(cfg.url.val());
+		var desc = $.trim(cfg.desc.val());
+
+		if (url  == cfg.url.attr('title')) url = '';
+		if (desc == cfg.desc.attr('title')) desc = '';
+
+		if (save && text && url) {
+			var newBox = $('<div>');
+			var para   = $('<p class="link">').appendTo(newBox)
+					.append( $('<strong>').text( text ) )
+					.append( $('<br />') )
+					.append( $('<a>').attr('href', url).text(url) );
+
+			if (desc) para.append('<br />').append( $('<span class="desc" />').text(desc) );
+
+			box.remove();
+			this.cast('SAVE_PARAGRAPH', [seq, cfg.editor, box=newBox, 'LINK']);
+		}
+
+		if(!box.length) box = cfg.editor.prev('div.eArea');
+		box.show();
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+
+		cfg.editor.hide().appendTo(configs[seq].writeArea);
+	}
+});
+editor.registerPlugin(new LinkWriter);
+
+// HR Writer
+var HRWriter = xe.createPlugin('HRWriter', {
+	API_SETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('hr,div.xe_dr_hr').each(function(){
+			var t = $(this);
+			if (!t.is('div')) t = t.wrap('<div>').parent();
+			t.attr('class', 'eArea _hr').attr('type', 'hr');
+		});
+	},
+	API_GETTING_CONTENT : function(sender, params) {
+		var seq = params[0];
+		var obj = params[1];
+
+		obj.children('div._hr').each(function(){
+			var hr = $(this).find('hr');
+			hr.parent().before(hr).remove();
+		});
+	},
+	API_OPEN_HR_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+
+		if (box && box.length) {
+			box.show(300);
+		} else if (bef && bef.length) {
+			bef.after(box = $('<div class="eArea _hr"><hr /></div>').attr('type', 'hr'));
+		} else {
+			var newBox = box = $('<div class="eArea _hr" />').attr('type', 'hr');
+			configs[seq].editArea.append(newBox.append('<hr />'));
+		}
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+	}
+});
+editor.registerPlugin(new HRWriter);
+
+// Help
+var HelpViewer = xe.createPlugin('Help', {
+	views : {},
+	init : function() {
+		this.views = {};
+	},
+	create : function(seq) {
+		var self = this;
+
+		this.views[seq] = configs[seq].writeArea.find('div.help');
+		this.views[seq].find('button').click(function(){ self.cast('CLOSE_EDITOR', [seq, false, 'HELP']); });
+	},
+	API_OPEN_HELP_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = params[1];
+		var bef = params[2];
+
+		if(!this.views[seq]) this.create(seq);
+
+		if(box) {
+			box.after(this.views[seq]);
+		} else if (bef) {
+			bef.after(this.views[seq]);
+		} else {
+			configs[seq].writeArea.prepend(this.views[seq]);
+		}
+		this.views[seq].show().find('button').focus();
+		this.cast('SCROLL_INTO_VIEW', [seq, this.views[seq]]);
+	},
+	API_CLOSE_HELP_EDITOR : function(sender, params) {
+		var seq = params[0];
+		var box = this.views[seq].prev('div.eArea');
+
+		this.views[seq].hide();
+		this.cast('SELECT_PARAGRAPH', [seq, box, box, box]);
+		
+	}
+});
+editor.registerPlugin(new HelpViewer);
+
+// More
+var More = xe.createPlugin('More', {
+	API_BEFORE_CLICK_TOOLBUTTON : function(sender, params) {
+		var seq    = params[0];
+		var button = $(params[1]);
+
+		if(!button.parent().is('li.more')) return true;
+
+		button.parents('div.wToolbarContainer:first').toggleClass('more');
+
+		this.cast('TOOLBAR_REPOSITION', [seq]);
+
+		return false;
+	}
+});
+editor.registerPlugin(new More);
+
+// Validator plugin
+var ValidatorHook = xe.createPlugin('ValidatorHook', {
+	API_BEFORE_VALIDATE : function(sender, params) {
+		var form = $(params[0]);
+		var seq  = form[0].elements['editor_sequence'].value;
+		var wArea_e = configs[seq].editArea.children('div.wArea:visible').filter(':not(.blank)');
+		var wArea_w = configs[seq].writeArea.children('div.wArea:visible').filter(':not(.blank)');
+
+		if (wArea_e.length || wArea_w.length) {
+			return !!confirm(submit_without_saving_msg);
+		}
+
+		return true;
+	}
+});
+xe.getApp('Validator')[0].registerPlugin(new ValidatorHook);
+
+// Utility function
+var table = {'<':'&lt;','>':'&gt;','&':'&amp;','"':'&quot;'}, untable;
+function translate(str) {
+	return str.replace(/<|>|&|"/ig, function(m0) { return table[m0]||m0; });
+}
+
+function untranslate(str) {
+	if (!untable) {
+		untable = {};
+		$.each(table, function(key,val){ untable[val] = key; });
+	}
+
+	return str.replace(/&([lg]t|quot|amp);/g, function(m0) { return untable[m0]||m0; });
+}
+
+function translate_cite(str) {
+	var s = str.replace(/<(\/)?([abi]|em|strong|cite)(.*?)>|<|>|&|"/ig, function(m0,m1,m2,m3) {
+		m1 = m1 || '';
+		m2 = (m2 || '' ).toLowerCase();
+		m3 = m3 || '';
+
+		if (table[m0]) return table[m0];
+		if (m3 && m3.substr(0,1) != ' ') return '&lt;'+m1+m2+m3+'&gt;';
+		if (m2 == 'em' || m2 == 'strong' || m2 == 'a' || m2 =='cite') return '<'+m1+m2+m3+'>';
+		if (m2 == 'b') return '<'+m1+'strong>';
+		if (m2 == 'i') return '<'+m1+'em>';
+	});
+
+	return s;
+}
+
+function is_left_click(event) {
+	var ie = $.browser.msie; 
+	return (typeof(event.button)=='undefined' || (ie && event.button == 1) || (!ie && event.button == 0));
+}
+
+editor.translate = translate;
+editor.translate_cite = translate_cite;
+editor.is_left_click = is_left_click;
+
+})(jQuery);
diff --git a/modules/editor/skins/dreditor/js/Xpress_Editor.js b/modules/editor/skins/dreditor/js/Xpress_Editor.js
index ee46772d8..f555650e8 100644
--- a/modules/editor/skins/dreditor/js/Xpress_Editor.js
+++ b/modules/editor/skins/dreditor/js/Xpress_Editor.js
@@ -1,6242 +1,6242 @@
-// extends jQuery object
-(function($){
-
-$.extend({
-	Class : function(def) {
-		function c(){
-			if (typeof this.$super != 'undefined') this.$super.$this = this;
-			if ($.isFunction(this.$init)) this.$init.apply(this, arguments);
-		}
-		c.prototype = def;
-		c.constructor = c;
-		c.extend = Class_extend;
-
-		return c;
-	},
-	$ : function(id) {
-		if(typeof id == 'string') {
-			if (id.substring(0,1) == '<') return $(id).get(0);
-			return $('#'+id).get(0);
-		} else {
-			return id;
-		}
-	},
-	fnBind : function(fn, th/* , args... */) {
-		var args = $.makeArray(arguments);
-		args.shift(); args.shift();
-
-		return function() {
-			var a = args.concat($.makeArray(arguments));
-
-			return fn.apply(th, a);
-		};
-	}
-});
-
-$.browser.nVersion = parseFloat($.browser.version);
-
-function Class_extend(superDef) {
-	var Super = superDef.prototype;
-
-	this.prototype.$super = {};
-
-	function bind(fn) {
-		return function() {
-			return fn.apply(this.$this, arguments);
-		};
-	}
-
-	for(var x in Super) {
-		if (!Super.propertyIsEnumerable(x)) continue;
-
-		if (typeof this.prototype[x] == 'undefined') this.prototype[x] = Super[x];
-		this.prototype.$super[x] = $.isFunction(Super[x])?bind(Super[x]):Super[x];
-	}
-
-	return this;
-}
-
-})(jQuery);
-
-if (typeof window.xe == 'undefined') window.xe = {};
-
-//{
- /**
- * @fileOverview This file contains Xpress framework core
- * @name XpressCore.js
- */
-xe.XpressCore = jQuery.Class({
-	name : "XpressCore",
-
-	$init : function(htOptions){
-		htOptions = !htOptions?{}:jQuery.Class({}).extend({
-			oDebugger : null
-		}).extend(htOptions);
-		if(htOptions.oDebugger){
-			this.oDebugger = htOptions.oDebugger;
-			this.oDebugger.oApp = this;
-		}
-
-		// To prevent processing a Xpress command before all the plugins are registered and ready,
-		// Queue up all the commands here until the application's status is changed to READY
-		this.commandQueue = [];
-
-		this.oCommandMap = {};
-		this.oDisabledCommand = {};
-		this.aPlugins = [];
-
-		this.appStatus = xe.APP_STATUS["NOT_READY"];
-
-		// Register the core as a plugin so it can receive messages
-		this.registerPlugin(this);
-	},
-
-	exec : function(msg, args, oEvent){
-		// If the application is not yet ready just queue the command
-		if(this.appStatus == xe.APP_STATUS["NOT_READY"]){
-			this.commandQueue[this.commandQueue.length] = {'msg':msg, 'args':args, 'event':oEvent};
-			return true;
-		}
-
-		this.exec = this._exec;
-		this.exec(msg, args, oEvent);
-	},
-
-	delayedExec : function(msg, args, nDelay, oEvent){
-		var fExec = jQuery.fnBind(this.exec, this, msg, args, oEvent);
-		setTimeout(fExec, nDelay);
-	},
-
-	_exec : function(msg, args, oEvent){return (this._exec = this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this, msg, args, oEvent);},
-	_execWithDebugger : function(msg, args, oEvent){this.oDebugger.log_MessageStart(msg, args);var bResult = this._doExec(msg, args, oEvent);this.oDebugger.log_MessageEnd(msg, args);return bResult;	},
-	_execWithoutDebugger : function(msg, args, oEvent){return this._doExec(msg, args, oEvent);},
-	_doExec : function(msg, args, oEvent){
-		var bContinue = false;
-
-		if(!this.oDisabledCommand[msg]){
-			var allArgs = [];
-			if(args && args.length){
-				var iLen = args.length;
-				for(var i=0; i<iLen; i++) allArgs[i] = args[i];
-			}
-			if(oEvent) allArgs[allArgs.length] = oEvent;
-
-			var bContinue = true;
-			bContinue = this._execMsgStep("BEFORE", msg, allArgs);
-			if(bContinue) bContinue = this._execMsgStep("ON", msg, allArgs);
-			if(bContinue) bContinue = this._execMsgStep("AFTER", msg, allArgs);
-		}
-
-		return bContinue;
-	},
-
-	registerPlugin : function(oPlugin){
-		if(!oPlugin) throw("An error occured in registerPlugin(): invalid plug-in");
-
-		oPlugin.nIdx = this.aPlugins.length;
-		oPlugin.oApp = this;
-		this.aPlugins[oPlugin.nIdx] = oPlugin;
-
-		// If the plugin does not specify that it takes time to be ready, change the stauts to READY right away
-		if(oPlugin.status != xe.PLUGIN_STATUS["NOT_READY"]) oPlugin.status = xe.PLUGIN_STATUS["READY"];
-
-		this.exec("MSG_PLUGIN_REGISTERED", [oPlugin]);
-
-		return oPlugin.nIdx;
-	},
-
-	disableCommand : function(sCommand, bDisable){this.oDisabledCommand[sCommand] = bDisable;},
-
-	registerBrowserEvent : function(obj, sEvent, sCMD, aParams, nDelay){
-		if(!obj) return;
-		aParams = aParams || [];
-		var func = (nDelay)?jQuery.fnBind(this.delayedExec, this, sCMD, aParams, nDelay):jQuery.fnBind(this.exec, this, sCMD, aParams);
-		jQuery(obj).bind(sEvent, func);
-	},
-
-	run : function(){
-		// Change the status from NOT_READY to let exec to process all the way
-		this._changeAppStatus(xe.APP_STATUS["WAITING_FOR_PLUGINS_READY"]);
-
-		// Process all the commands in the queue
-		var iQueueLength = this.commandQueue.length;
-		for(i=0; i<iQueueLength; i++){
-			var curMsgAndArgs = this.commandQueue[i];
-			this.exec(curMsgAndArgs.msg, curMsgAndArgs.args, curMsgAndArgs.event);
-		}
-
-		this._waitForPluginReady();
-	},
-
-	// Use this also to update the mapping
-	createCommandMap : function(sMsgHandler){
-		this.oCommandMap[sMsgHandler] = [];
-
-		var nLen = this.aPlugins.length;
-		for(var i=0; i<nLen; i++) this._doAddToCommandMap(sMsgHandler, this.aPlugins[i]);
-	},
-
-	addToCommandMap : function(sMsgHandler, oPlugin){
-		// cannot "ADD" unless the map is already created.
-		// the message will be added automatically to the mapping when it is first passed anyways, so do not add now
-		if(!this.oCommandMap[sMsgHandler]) return;
-
-		this._addToCommandMap(sMsgHandler, oPlugin);
-	},
-
-	_changeAppStatus : function(appStatus){
-		this.appStatus = appStatus;
-
-		// Initiate MSG_APP_READY if the application's status is being switched to READY
-		if(this.appStatus == xe.APP_STATUS["READY"]) this.exec("MSG_APP_READY");
-	},
-
-	_execMsgStep : function(sMsgStep, sMsg, args){return (this._execMsgStep = this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this, sMsgStep, sMsg, args);},
-	_execMsgStepWithDebugger : function(sMsgStep, sMsg, args){this.oDebugger.log_MessageStepStart(sMsgStep, sMsg, args);var bStatus = this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);this.oDebugger.log_MessageStepEnd(sMsgStep, sMsg, args);return bStatus;},
-	_execMsgStepWithoutDebugger : function(sMsgStep, sMsg, args){return this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);},
-	_execMsgHandler : function(sMsgHandler, args){
-		if(!this.oCommandMap[sMsgHandler]){
-			this.createCommandMap(sMsgHandler);
-		}
-
-		var aPlugins = this.oCommandMap[sMsgHandler];
-		var iNumOfPlugins = aPlugins.length;
-
-		if(iNumOfPlugins == 0) return true;
-
-		var tmpStatus, bResult = true;
-		// two similar codes were written twice due to the performace.
-		if(sMsgHandler.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){
-			for(var i=0; i<iNumOfPlugins; i++){
-				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
-				if(tmpStatus === false){
-					bResult = false;
-					break;
-				}
-			}
-		}else{
-			for(var i=0; i<iNumOfPlugins; i++){
-				if(typeof aPlugins[i]["$PRECONDITION"] == "function") if(!this._execHandler(aPlugins[i], "$PRECONDITION", [sMsgHandler, args])) continue;
-
-				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
-				if(tmpStatus === false){
-					bResult = false;
-					break;
-				}
-			}
-		}
-
-		return bResult;
-	},
-
-	_execHandler : function(oPlugin, sHandler, args){return	(this._execHandler = this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this, oPlugin, sHandler, args);},
-	_execHandlerWithDebugger : function(oPlugin, sHandler, args){this.oDebugger.log_CallHandlerStart(oPlugin, sHandler, args);var bResult = oPlugin[sHandler].apply(oPlugin, args);this.oDebugger.log_CallHandlerEnd(oPlugin, sHandler, args);return bResult;},
-	_execHandlerWithoutDebugger : function(oPlugin, sHandler, args){return oPlugin[sHandler].apply(oPlugin, args);},
-
-	_doAddToCommandMap : function(sMsgHandler, oPlugin){
-		if(typeof oPlugin[sMsgHandler] != "function") return;
-		this.oCommandMap[sMsgHandler][this.oCommandMap[sMsgHandler].length] = oPlugin;
-	},
-
-	_waitForPluginReady : function(){
-		var bAllReady = true;
-		for(var i=0; i<this.aPlugins.length; i++){
-			if(this.aPlugins[i].status == xe.PLUGIN_STATUS["NOT_READY"]){
-				bAllReady = false;
-				break;
-			}
-		}
-		if(bAllReady){
-			this._changeAppStatus(xe.APP_STATUS["READY"]);
-		}else{
-			setTimeout(jQuery.fnBind(this._waitForPluginReady, this), 100);
-		}
-	}
-});
-//}
-
-xe.APP_STATUS = {
-	'NOT_READY' : 0,
-	'WAITING_FOR_PLUGINS_READY' : 1,
-	'READY' : 2
-};
-
-xe.PLUGIN_STATUS = {
-	'NOT_READY' : 0,
-	'READY' : 1
-};
-/**
- * @fileOverview This file contains a cross-browser implementation of W3C's DOM Range
- * @name W3CDOMRange.js
- */
-xe.W3CDOMRange = jQuery.Class({
-	$init : function(doc){
-		this._document = doc || document;
-
-		this.collapsed = true;
-		this.commonAncestorContainer = this._document.body;
-		this.endContainer = this._document.body;
-		this.endOffset = 0;
-		this.startContainer = this._document.body;
-		this.startOffset = 0;
-	},
-
-	cloneContents : function(){
-		var oClonedContents = this._document.createDocumentFragment();
-		var oTmpContainer = this._document.createDocumentFragment();
-
-		var aNodes = this._getNodesInRange();
-
-		if(aNodes.length < 1) return oClonedContents;
-
-		var oClonedContainers = this._constructClonedTree(aNodes, oTmpContainer);
-
-		// oTopContainer = aNodes[aNodes.length-1].parentNode and this is not part of the initial array and only those child nodes should be cloned
-		var oTopContainer = oTmpContainer.firstChild;
-
-		if(oTopContainer){
-			var elCurNode = oTopContainer.firstChild;
-			var elNextNode;
-
-			while(elCurNode){
-				elNextNode = elCurNode.nextSibling;
-				oClonedContents.appendChild(elCurNode);
-				elCurNode = elNextNode;
-			}
-		}
-
-		oClonedContainers = this._splitTextEndNodes({oStartContainer: oClonedContainers.oStartContainer, iStartOffset: this.startOffset,
-													oEndContainer: oClonedContainers.oEndContainer, iEndOffset: this.endOffset});
-
-		if(oClonedContainers.oStartContainer && oClonedContainers.oStartContainer.previousSibling)
-			xe.DOMFix.parentNode(oClonedContainers.oStartContainer).removeChild(oClonedContainers.oStartContainer.previousSibling);
-
-		if(oClonedContainers.oEndContainer && oClonedContainers.oEndContainer.nextSibling)
-			xe.DOMFix.parentNode(oClonedContainers.oEndContainer).removeChild(oClonedContainers.oEndContainer.nextSibling);
-
-		return oClonedContents;
-	},
-
-	_constructClonedTree : function(aNodes, oClonedParentNode){
-		var oClonedStartContainer = null;
-		var oClonedEndContainer = null;
-
-		var oStartContainer = this.startContainer;
-		var oEndContainer = this.endContainer;
-
-		_recurConstructClonedTree = function(aAllNodes, iCurIdx, oParentNode, oClonedParentNode){
-
-			if(iCurIdx < 0) return iCurIdx;
-
-			var iChildIdx = iCurIdx-1;
-
-			var oCurNodeCloneWithChildren = aAllNodes[iCurIdx].cloneNode(false);
-
-			if(aAllNodes[iCurIdx] == oStartContainer) oClonedStartContainer = oCurNodeCloneWithChildren;
-			if(aAllNodes[iCurIdx] == oEndContainer) oClonedEndContainer = oCurNodeCloneWithChildren;
-
-			while(iChildIdx >= 0 && xe.DOMFix.parentNode(aAllNodes[iChildIdx]) == aAllNodes[iCurIdx]){
-				iChildIdx = this._recurConstructClonedTree(aAllNodes, iChildIdx, aAllNodes[iCurIdx], oCurNodeCloneWithChildren, oClonedStartContainer, oClonedEndContainer);
-			}
-
-			// this may trigger an error message in IE when an erroneous script is inserted
-			oClonedParentNode.insertBefore(oCurNodeCloneWithChildren, oClonedParentNode.firstChild);
-
-			return iChildIdx;
-		};
-
-		aNodes[aNodes.length] = xe.DOMFix.parentNode(aNodes[aNodes.length-1]);
-		_recurConstructClonedTree(aNodes, aNodes.length-1, aNodes[aNodes.length-1], oClonedParentNode);
-
-		return {oStartContainer: oClonedStartContainer, oEndContainer: oClonedEndContainer};
-	},
-
-	cloneRange : function(){
-		return this._copyRange(new xe.W3CDOMRange(this._document));
-	},
-
-	_copyRange : function(oClonedRange){
-		oClonedRange.collapsed = this.collapsed;
-		oClonedRange.commonAncestorContainer = this.commonAncestorContainer;
-		oClonedRange.endContainer = this.endContainer;
-		oClonedRange.endOffset = this.endOffset;
-		oClonedRange.startContainer = this.startContainer;
-		oClonedRange.startOffset = this.startOffset;
-		oClonedRange._document = this._document;
-
-		return oClonedRange;
-	},
-
-	collapse : function(toStart){
-		if(toStart){
-			this.endContainer = this.startContainer;
-			this.endOffset = this.startOffset;
-		}else{
-			this.startContainer = this.endContainer;
-			this.startOffset = this.endOffset;
-		}
-
-		this._updateRangeInfo();
-	},
-
-	compareBoundaryPoints : function(how, sourceRange){
-		switch(how){
-			case xe.W3CDOMRange.START_TO_START:
-				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.startContainer, sourceRange.startOffset);
-			case xe.W3CDOMRange.START_TO_END:
-				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.startContainer, sourceRange.startOffset);
-			case xe.W3CDOMRange.END_TO_END:
-				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.endContainer, sourceRange.endOffset);
-			case xe.W3CDOMRange.END_TO_START:
-				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.endContainer, sourceRange.endOffset);
-		}
-	},
-
-	_findBody : function(oNode){
-		if(!oNode) return null;
-		while(oNode){
-			if(oNode.tagName == "BODY") return oNode;
-			oNode = xe.DOMFix.parentNode(oNode);
-		}
-		return null;
-	},
-
-	_compareEndPoint : function(oContainerA, iOffsetA, oContainerB, iOffsetB){
-		var iIdxA, iIdxB;
-
-		if(!oContainerA || this._findBody(oContainerA) != this._document.body){
-			oContainerA = this._document.body;
-			iOffsetA = 0;
-		}
-
-		if(!oContainerB || this._findBody(oContainerB) != this._document.body){
-			oContainerB = this._document.body;
-			iOffsetB = 0;
-		}
-
-		var compareIdx = function(iIdxA, iIdxB){
-			// iIdxX == -1 when the node is the commonAncestorNode
-			// if iIdxA == -1
-			// -> [[<nodeA>...<nodeB></nodeB>]]...</nodeA>
-			// if iIdxB == -1
-			// -> <nodeB>...[[<nodeA></nodeA>...</nodeB>]]
-			if(iIdxB == -1) iIdxB = iIdxA+1;
-			if(iIdxA < iIdxB) return -1;
-			if(iIdxA == iIdxB) return 0;
-			return 1;
-		};
-
-		var oCommonAncestor = this._getCommonAncestorContainer(oContainerA, oContainerB);
-
-		// ================================================================================================================================================
-		//  Move up both containers so that both containers are direct child nodes of the common ancestor node. From there, just compare the offset
-		// Add 0.5 for each contaienrs that has "moved up" since the actual node is wrapped by 1 or more parent nodes and therefore its position is somewhere between idx & idx+1
-		// <COMMON_ANCESTOR>NODE1<P>NODE2</P>NODE3</COMMON_ANCESTOR>
-		// The position of NODE2 in COMMON_ANCESTOR is somewhere between after NODE1(idx1) and before NODE3(idx2), so we let that be 1.5
-
-		// container node A in common ancestor container
-		var oNodeA = oContainerA;
-		if(oNodeA != oCommonAncestor){
-			while((oTmpNode = xe.DOMFix.parentNode(oNodeA)) != oCommonAncestor){oNodeA = oTmpNode;}
-
-			iIdxA = this._getPosIdx(oNodeA)+0.5;
-		}else iIdxA = iOffsetA;
-
-		// container node B in common ancestor container
-		var oNodeB = oContainerB;
-		if(oNodeB != oCommonAncestor){
-			while((oTmpNode = xe.DOMFix.parentNode(oNodeB)) != oCommonAncestor){oNodeB = oTmpNode;}
-
-			iIdxB = this._getPosIdx(oNodeB)+0.5;
-		}else iIdxB = iOffsetB;
-
-		return compareIdx(iIdxA, iIdxB);
-	},
-
-	_getCommonAncestorContainer : function(oNode1, oNode2){
-		var oComparingNode = oNode2;
-
-		while(oNode1){
-			while(oComparingNode){
-				if(oNode1 == oComparingNode) return oNode1;
-				oComparingNode = xe.DOMFix.parentNode(oComparingNode);
-			}
-			oComparingNode = oNode2;
-			oNode1 = xe.DOMFix.parentNode(oNode1);
-		}
-
-		return this._document.body;
-	},
-
-	deleteContents : function(){
-		if(this.collapsed) return;
-
-		this._splitTextEndNodesOfTheRange();
-
-		var aNodes = this._getNodesInRange();
-
-		if(aNodes.length < 1) return;
-
-		var oPrevNode = aNodes[0].previousSibling;
-		while(oPrevNode && this._isBlankTextNode(oPrevNode)) oPrevNode = oPrevNode.previousSibling;
-
-		var oNewStartContainer, iNewOffset;
-		if(!oPrevNode){
-			oNewStartContainer = xe.DOMFix.parentNode(aNodes[0]);
-			iNewOffset = 0;
-		}
-
-		for(var i=0; i<aNodes.length; i++){
-			var oNode = aNodes[i];
-			if(!oNode.firstChild){
-				if(oNewStartContainer == oNode){
-					iNewOffset = this._getPosIdx(oNewStartContainer);
-					oNewStartContainer = xe.DOMFix.parentNode(oNode);
-				}
-				xe.DOMFix.parentNode(oNode).removeChild(oNode);
-			}
-		}
-
-		if(!oPrevNode){
-			this.setStart(oNewStartContainer, iNewOffset);
-		}else{
-			if(oPrevNode.tagName == "BODY")
-				this.setStartBefore(oPrevNode);
-			else
-				this.setStartAfter(oPrevNode);
-		}
-
-		this.collapse(true);
-	},
-
-	extractContents : function(){
-		var oClonedContents = this.cloneContents();
-		this.deleteContents();
-		return oClonedContents;
-	},
-
-	insertNode : function(newNode){
-		var oFirstNode = null;
-
-		var oParentContainer;
-
-		if(this.startContainer.nodeType == "3"){
-			oParentContainer = xe.DOMFix.parentNode(this.startContainer);
-			if(this.startContainer.nodeValue.length <= this.startOffset)
-				oFirstNode = this.startContainer.nextSibling;
-			else
-				oFirstNode = this.startContainer.splitText(this.startOffset);
-		}else{
-			oParentContainer = this.startContainer;
-			oFirstNode = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
-		}
-
-		if(!oFirstNode || !xe.DOMFix.parentNode(oFirstNode)) oFirstNode = null;
-
-		oParentContainer.insertBefore(newNode, oFirstNode);
-
-		this.setStartBefore(newNode);
-	},
-
-	selectNode : function(refNode){
-		this.setStartBefore(refNode);
-		this.setEndAfter(refNode);
-	},
-
-	selectNodeContents : function(refNode){
-		this.setStart(refNode, 0);
-		this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
-	},
-
-	_endsNodeValidation : function(oNode, iOffset){
-		if(!oNode || this._findBody(oNode) != this._document.body) throw new Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
-
-		if(oNode.nodeType == 3){
-			if(iOffset > oNode.nodeValue.length) iOffset = oNode.nodeValue.length;
-		}else{
-			if(iOffset > xe.DOMFix.childNodes(oNode).length) iOffset = xe.DOMFix.childNodes(oNode).length;
-		}
-
-		return iOffset;
-	},
-
-
-	setEnd : function(refNode, offset){
-		offset = this._endsNodeValidation(refNode, offset);
-
-		this.endContainer = refNode;
-		this.endOffset = offset;
-		if(!this.startContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(false);
-
-		this._updateRangeInfo();
-	},
-
-	setEndAfter : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");
-
-		if(refNode.tagName == "BODY"){
-			this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
-			return;
-		}
-		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
-	},
-
-	setEndBefore : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");
-
-		if(refNode.tagName == "BODY"){
-			this.setEnd(refNode, 0);
-			return;
-		}
-
-		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
-	},
-
-	setStart : function(refNode, offset){
-		offset = this._endsNodeValidation(refNode, offset);
-
-		this.startContainer = refNode;
-		this.startOffset = offset;
-
-		if(!this.endContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(true);
-		this._updateRangeInfo();
-	},
-
-	setStartAfter : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");
-
-		if(refNode.tagName == "BODY"){
-			this.setStart(refNode, xe.DOMFix.childNodes(refNode).length);
-			return;
-		}
-
-		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
-	},
-
-	setStartBefore : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");
-
-		if(refNode.tagName == "BODY"){
-			this.setStart(refNode, 0);
-			return;
-		}
-		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
-	},
-
-	surroundContents : function(newParent){
-		newParent.appendChild(this.extractContents());
-		this.insertNode(newParent);
-		this.selectNode(newParent);
-	},
-
-	toString : function(){
-		var oTmpContainer = this._document.createElement("DIV");
-		oTmpContainer.appendChild(this.cloneContents());
-
-		return oTmpContainer.textContent || oTmpContainer.innerText || "";
-	},
-
-	_isBlankTextNode : function(oNode){
-		if(oNode.nodeType == 3 && oNode.nodeValue == "") return true;
-		return false;
-	},
-
-	_getPosIdx : function(refNode){
-		var idx = 0;
-		for(var node = refNode.previousSibling; node; node = node.previousSibling) idx++;
-
-		return idx;
-	},
-
-	_updateRangeInfo : function(){
-		if(!this.startContainer){
-			this.init(this._document);
-			return;
-		}
-
-		this.collapsed = this._isCollapsed(this.startContainer, this.startOffset, this.endContainer, this.endOffset);
-
-		this.commonAncestorContainer = this._getCommonAncestorContainer(this.startContainer, this.endContainer);
-	},
-
-	_isCollapsed : function(oStartContainer, iStartOffset, oEndContainer, iEndOffset){
-		var bCollapsed = false;
-
-		if(oStartContainer == oEndContainer && iStartOffset == iEndOffset){
-			bCollapsed = true;
-		}else{
-			var oActualStartNode = this._getActualStartNode(oStartContainer, iStartOffset);
-			var oActualEndNode = this._getActualEndNode(oEndContainer, iEndOffset);
-
-			// Take the parent nodes on the same level for easier comparison when they're next to each other
-			// eg) From
-			//	<A>
-			//		<B>
-			//			<C>
-			//			</C>
-			//		</B>
-			//		<D>
-			//			<E>
-			//				<F>
-			//				</F>
-			//			</E>
-			//		</D>
-			//	</A>
-			//	, it's easier to compare the position of B and D rather than C and F because they are siblings
-			//
-			// If the range were collapsed, oActualEndNode will precede oActualStartNode by doing this
-			oActualStartNode = this._getNextNode(this._getPrevNode(oActualStartNode));
-			oActualEndNode = this._getPrevNode(this._getNextNode(oActualEndNode));
-
-			if(oActualStartNode && oActualEndNode && oActualEndNode.tagName != "BODY" &&
-				(this._getNextNode(oActualEndNode) == oActualStartNode || (oActualEndNode == oActualStartNode && this._isBlankTextNode(oActualEndNode)))
-			)
-				bCollapsed = true;
-		}
-
-		return bCollapsed;
-	},
-
-	_splitTextEndNodesOfTheRange : function(){
-		var oEndPoints = this._splitTextEndNodes({oStartContainer: this.startContainer, iStartOffset: this.startOffset,
-													oEndContainer: this.endContainer, iEndOffset: this.endOffset});
-
-		this.startContainer = oEndPoints.oStartContainer;
-		this.startOffset = oEndPoints.iStartOffset;
-
-		this.endContainer = oEndPoints.oEndContainer;
-		this.endOffset = oEndPoints.iEndOffset;
-	},
-
-	_splitTextEndNodes : function(oEndPoints){
-		oEndPoints = this._splitStartTextNode(oEndPoints);
-		oEndPoints = this._splitEndTextNode(oEndPoints);
-
-		return oEndPoints;
-	},
-
-	_splitStartTextNode : function(oEndPoints){
-		var oStartContainer = oEndPoints.oStartContainer;
-		var iStartOffset = oEndPoints.iStartOffset;
-
-		var oEndContainer = oEndPoints.oEndContainer;
-		var iEndOffset = oEndPoints.iEndOffset;
-
-		if(!oStartContainer) return oEndPoints;
-		if(oStartContainer.nodeType != 3) return oEndPoints;
-		if(iStartOffset == 0) return oEndPoints;
-
-		if(oStartContainer.nodeValue.length <= iStartOffset) return oEndPoints;
-
-		var oLastPart = oStartContainer.splitText(iStartOffset);
-
-		if(oStartContainer == oEndContainer){
-			iEndOffset -= iStartOffset;
-			oEndContainer = oLastPart;
-		}
-		oStartContainer = oLastPart;
-		iStartOffset = 0;
-
-		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
-	},
-
-	_splitEndTextNode : function(oEndPoints){
-		var oStartContainer = oEndPoints.oStartContainer;
-		var iStartOffset = oEndPoints.iStartOffset;
-
-		var oEndContainer = oEndPoints.oEndContainer;
-		var iEndOffset = oEndPoints.iEndOffset;
-
-		if(!oEndContainer) return oEndPoints;
-		if(oEndContainer.nodeType != 3) return oEndPoints;
-
-		if(iEndOffset >= oEndContainer.nodeValue.length) return oEndPoints;
-		if(iEndOffset == 0) return oEndPoints;
-
-		oEndContainer.splitText(iEndOffset);
-
-		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
-	},
-
-	_getNodesInRange : function(){
-		if(this.collapsed) return [];
-
-		var oStartNode = this._getActualStartNode(this.startContainer, this.startOffset);
-		var oEndNode = this._getActualEndNode(this.endContainer, this.endOffset);
-
-		return this._getNodesBetween(oStartNode, oEndNode);
-	},
-
-	_getActualStartNode : function(oStartContainer, iStartOffset){
-		var oStartNode = oStartContainer;;
-
-		if(oStartContainer.nodeType == 3){
-			if(iStartOffset >= oStartContainer.nodeValue.length){
-				oStartNode = this._getNextNode(oStartContainer);
-				if(oStartNode.tagName == "BODY") oStartNode = null;
-			}else{
-				oStartNode = oStartContainer;
-			}
-		}else{
-			if(iStartOffset < xe.DOMFix.childNodes(oStartContainer).length){
-				oStartNode = xe.DOMFix.childNodes(oStartContainer)[iStartOffset];
-			}else{
-				oStartNode = this._getNextNode(oStartContainer);
-				if(oStartNode.tagName == "BODY") oStartNode = null;
-			}
-		}
-
-		return oStartNode;
-	},
-
-	_getActualEndNode : function(oEndContainer, iEndOffset){
-		var oEndNode = oEndContainer;
-
-		if(iEndOffset == 0){
-			oEndNode = this._getPrevNode(oEndContainer);
-			if(oEndNode.tagName == "BODY") oEndNode = null;
-		}else if(oEndContainer.nodeType == 3){
-			oEndNode = oEndContainer;
-		}else{
-			oEndNode = xe.DOMFix.childNodes(oEndContainer)[iEndOffset-1];
-		}
-
-		return oEndNode;
-	},
-
-	_getNextNode : function(oNode){
-		if(!oNode || oNode.tagName == "BODY") return this._document.body;
-
-		if(oNode.nextSibling) return oNode.nextSibling;
-
-		return this._getNextNode(xe.DOMFix.parentNode(oNode));
-	},
-
-	_getPrevNode : function(oNode){
-		if(!oNode || oNode.tagName == "BODY") return this._document.body;
-
-		if(oNode.previousSibling) return oNode.previousSibling;
-
-		return this._getPrevNode(xe.DOMFix.parentNode(oNode));
-	},
-
-	// includes partially selected
-	// for <div id="a"><div id="b"></div></div><div id="c"></div>, _getNodesBetween(b, c) will yield to b, "a" and c
-	_getNodesBetween : function(oStartNode, oEndNode){
-		var aNodesBetween = [];
-
-		if(!oStartNode || !oEndNode) return aNodesBetween;
-
-		this._recurGetNextNodesUntil(oStartNode, oEndNode, aNodesBetween);
-		return aNodesBetween;
-	},
-
-	_recurGetNextNodesUntil : function(oNode, oEndNode, aNodesBetween){
-		if(!oNode) return false;
-
-		if(!this._recurGetChildNodesUntil(oNode, oEndNode, aNodesBetween)) return false;
-
-		var oNextToChk = oNode.nextSibling;
-
-		while(!oNextToChk){
-			if(!xe.DOMFix.parentNode(oNode)) return false;
-			oNode = xe.DOMFix.parentNode(oNode);
-
-			aNodesBetween[aNodesBetween.length] = oNode;
-
-			if(oNode == oEndNode) return false;
-
-			oNextToChk = oNode.nextSibling;
-		}
-
-		return this._recurGetNextNodesUntil(oNextToChk, oEndNode, aNodesBetween);
-	},
-
-	_recurGetChildNodesUntil : function(oNode, oEndNode, aNodesBetween){
-		if(!oNode) return false;
-
-		var bEndFound = false;
-		var oCurNode = oNode;
-		if(oCurNode.firstChild){
-			oCurNode = oCurNode.firstChild;
-			while(oCurNode){
-				if(!this._recurGetChildNodesUntil(oCurNode, oEndNode, aNodesBetween)){
-					bEndFound = true;
-					break;
-				}
-				oCurNode = oCurNode.nextSibling;
-			}
-		}
-
-		aNodesBetween[aNodesBetween.length] = oNode;
-
-		if(bEndFound) return false;
-		if(oNode == oEndNode) return false;
-
-		return true;
-	}
-});
-
-xe.W3CDOMRange.START_TO_START = 0;
-xe.W3CDOMRange.START_TO_END = 1;
-xe.W3CDOMRange.END_TO_END = 2;
-xe.W3CDOMRange.END_TO_START = 3;
-
-
-/**
- * @fileOverview This file contains a cross-browser function that implements all of the W3C's DOM Range specification and some more
- * @name XpressRange.js
- */
-xe.XpressRange = jQuery.Class({
-	setWindow : function(win){
-		this._window = win;
-		this._document = win.document;
-	},
-
-	$init : function(win){
-		this.HUSKY_BOOMARK_START_ID_PREFIX = "xpress_bookmark_start_";
-		this.HUSKY_BOOMARK_END_ID_PREFIX = "xpress_bookmark_end_";
-
-		this.sBlockElement = "P|DIV|LI|H[1-6]|PRE";
-		this.sBlockContainer = "BODY|TABLE|TH|TR|TD|UL|OL|BLOCKQUOTE|FORM";
-
-		this.rxBlockElement = new RegExp("^("+this.sBlockElement+")$");
-		this.rxBlockContainer = new RegExp("^("+this.sBlockContainer+")$")
-		this.rxLineBreaker = new RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$")
-
-		this.setWindow(win);
-
-		this.oSimpleSelection = new xe.SimpleSelection(this._window);
-		this.selectionLoaded = this.oSimpleSelection.selectionLoaded;
-
-		this.$super.$init(this._document);
-	},
-
-	select : function(){
-		this.oSimpleSelection.selectRange(this);
-	},
-
-	setFromSelection : function(iNum){
-		this.setRange(this.oSimpleSelection.getRangeAt(iNum));
-	},
-
-	setRange : function(oW3CRange){
-		this.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
-		this.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
-	},
-
-	setEndNodes : function(oSNode, oENode){
-		this.setEndAfter(oENode);
-		this.setStartBefore(oSNode);
-	},
-
-	splitTextAtBothEnds : function(){
-		this._splitTextEndNodesOfTheRange();
-	},
-
-	getStartNode : function(){
-		if(this.collapsed){
-			if(this.startContainer.nodeType == 3){
-				if(this.startOffset == 0) return null;
-				if(this.startContainer.nodeValue.length <= this.startOffset) return null;
-				return this.startContainer;
-			}
-			return null;
-		}
-
-		if(this.startContainer.nodeType == 3){
-			if(this.startOffset >= this.startContainer.nodeValue.length) return this._getNextNode(this.startContainer);
-			return this.startContainer;
-		}else{
-			if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length) return this._getNextNode(this.startContainer);
-			return xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
-		}
-	},
-
-	getEndNode : function(){
-		if(this.collapsed) return this.getStartNode();
-
-		if(this.endContainer.nodeType == 3){
-			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
-			return this.endContainer;
-		}else{
-			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
-			return xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
-		}
-	},
-
-	getNodeAroundRange : function(bBefore, bStrict){
-		if(this.collapsed && this.startContainer && this.startContainer.nodeType == 3) return this.startContainer;
-		if(!this.collapsed || (this.startContainer && this.startContainer.nodeType == 3)) return this.getStartNode();
-
-		var oBeforeRange, oAfterRange, oResult;
-
-		if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length)
-			oAfterRange = this._getNextNode(this.startContainer);
-		else
-			oAfterRange = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
-
-		if(this.endOffset == 0)
-			oBeforeRange = this._getPrevNode(this.endContainer);
-		else
-			oBeforeRange = xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
-
-		if(bBefore){
-			oResult = oBeforeRange;
-			if(!oResult && !bStrict) oResult = oAfterRange;
-		}else{
-			oResult = oAfterRange;
-			if(!oResult && !bStrict) oResult = oBeforeRange;
-		}
-
-		return oResult;
-	},
-
-	_getXPath : function(elNode){
-		var sXPath = "";
-
-		while(elNode && elNode.nodeType == 1){
-			sXPath = "/" + elNode.tagName+"["+this._getPosIdx4XPath(elNode)+"]" + sXPath;
-			elNode = xe.DOMFix.parentNode(elNode);
-		}
-
-		return sXPath;
-	},
-
-	_getPosIdx4XPath : function(refNode){
-		var idx = 0;
-		for(var node = refNode.previousSibling; node; node = node.previousSibling)
-			if(node.tagName == refNode.tagName) idx++;
-
-		return idx;
-	},
-
-	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
-	_evaluateXPath : function(sXPath, oDoc){
-		sXPath = sXPath.substring(1, sXPath.length-1);
-		var aXPath = sXPath.split(/\//);
-		var elNode = oDoc.body;
-
-		for(var i=2; i<aXPath.length && elNode; i++){
-			aXPath[i].match(/([^\[]+)\[(\d+)/i);
-			var sTagName = RegExp.$1;
-			var nIdx = RegExp.$2;
-
-			var aAllNodes = xe.DOMFix.childNodes(elNode);
-			var aNodes = [];
-			var nLength = aAllNodes.length;
-			var nCount = 0;
-			for(var ii=0; ii<nLength; ii++){
-				if(aAllNodes[ii].tagName == sTagName) aNodes[nCount++] = aAllNodes[ii];
-			}
-
-			if(aNodes.length < nIdx)
-				elNode = null;
-			else
-				elNode = aNodes[nIdx];
-		}
-
-		return elNode;
-	},
-
-	_evaluateXPathBookmark : function(oBookmark){
-		var sXPath = oBookmark["sXPath"];
-		var nTextNodeIdx = oBookmark["nTextNodeIdx"];
-		var nOffset = oBookmark["nOffset"];
-
-		var elContainer = this._evaluateXPath(sXPath, this._document);
-
-		if(nTextNodeIdx > -1 && elContainer){
-			var aChildNodes = xe.DOMFix.childNodes(elContainer);
-			var elNode = null;
-
-			var nIdx = nTextNodeIdx;
-			var nOffsetLeft = nOffset;
-
-			while((elNode = aChildNodes[nIdx]) && elNode.nodeType == 3 && elNode.nodeValue.length < nOffsetLeft){
-				nOffsetLeft -= elNode.nodeValue.length;
-				nIdx++;
-			}
-
-			elContainer = xe.DOMFix.childNodes(elContainer)[nIdx];
-			nOffset = nOffsetLeft;
-		}
-
-		if(!elContainer){
-			elContainer = this._document.body;
-			nOffset = 0;
-		}
-		return {elContainer: elContainer, nOffset: nOffset};
-	},
-
-	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
-	getXPathBookmark : function(){
-		var nTextNodeIdx1 = -1;
-		var htEndPt1 = {elContainer: this.startContainer, nOffset: this.startOffset};
-		var elNode1 = this.startContainer;
-		if(elNode1.nodeType == 3){
-			htEndPt1 = this._getFixedStartTextNode();
-			nTextNodeIdx1 = this._getPosIdx(htEndPt1.elContainer);
-			elNode1 = xe.DOMFix.parentNode(elNode1);
-		}
-		var sXPathNode1 = this._getXPath(elNode1);
-		var oBookmark1 = {sXPath:sXPathNode1, nTextNodeIdx:nTextNodeIdx1, nOffset: htEndPt1.nOffset};
-
-		var nTextNodeIdx2 = -1;
-		var htEndPt2 = {elContainer: this.endContainer, nOffset: this.endOffset};
-		var elNode2 = this.endContainer;
-		if(elNode2.nodeType == 3){
-			htEndPt2 = this._getFixedEndTextNode();
-			nTextNodeIdx2 = this._getPosIdx(htEndPt2.elContainer);
-			elNode2 = xe.DOMFix.parentNode(elNode2);
-		}
-		var sXPathNode2 = this._getXPath(elNode2);
-		var oBookmark2 = {sXPath:sXPathNode2, nTextNodeIdx:nTextNodeIdx2, nOffset: htEndPt2.nOffset};
-
-		return [oBookmark1, oBookmark2];
-	},
-
-	moveToXPathBookmark : function(aBookmark){
-		if(!aBookmark) return;
-
-		var oBookmarkInfo1 = this._evaluateXPathBookmark(aBookmark[0]);
-		var oBookmarkInfo2 = this._evaluateXPathBookmark(aBookmark[1]);
-
-		if(!oBookmarkInfo1["elContainer"] || !oBookmarkInfo2["elContainer"]) return;
-
-		this.startContainer = oBookmarkInfo1["elContainer"];
-		this.startOffset = oBookmarkInfo1["nOffset"];
-
-		this.endContainer = oBookmarkInfo2["elContainer"];
-		this.endOffset = oBookmarkInfo2["nOffset"];
-	},
-
-	_getFixedTextContainer : function(elNode, nOffset){
-		while(elNode && elNode.nodeType == 3 && elNode.previousSibling && elNode.previousSibling.nodeType == 3){
-			nOffset += elNode.previousSibling.nodeValue.length;
-			elNode = elNode.previousSibling;
-		}
-
-		return {elContainer:elNode, nOffset:nOffset};
-	},
-
-	_getFixedStartTextNode : function(){
-		return this._getFixedTextContainer(this.startContainer, this.startOffset);
-	},
-
-	_getFixedEndTextNode : function(){
-		return this._getFixedTextContainer(this.endContainer, this.endOffset);
-	},
-
-	placeStringBookmark : function(){
-		var sTmpId = (new Date()).getTime();
-
-		var oInsertionPoint = this.cloneRange();
-		oInsertionPoint.collapseToEnd();
-		var oEndMarker = this._document.createElement("A");
-		oEndMarker.id = this.HUSKY_BOOMARK_END_ID_PREFIX+sTmpId;
-		oInsertionPoint.insertNode(oEndMarker);
-
-		var oInsertionPoint = this.cloneRange();
-		oInsertionPoint.collapseToStart();
-		var oStartMarker = this._document.createElement("A");
-		oStartMarker.id = this.HUSKY_BOOMARK_START_ID_PREFIX+sTmpId;
-		oInsertionPoint.insertNode(oStartMarker);
-
-		this.moveToBookmark(sTmpId);
-
-		return sTmpId;
-	},
-
-	cloneRange : function(){
-		return this._copyRange(new xe.XpressRange(this._window));
-	},
-
-	moveToBookmark : function(vBookmark){
-		if(typeof(vBookmark) != "object")
-			this.moveToStringBookmark(vBookmark);
-		else
-			this.moveToXPathBookmark(vBookmark);
-	},
-
-	moveToStringBookmark : function(sBookmarkID){
-		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
-		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
-
-		if(!oStartMarker || !oEndMarker) return;
-
-		this.setEndBefore(oEndMarker);
-		this.setStartAfter(oStartMarker);
-	},
-
-	removeStringBookmark : function(sBookmarkID){
-		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
-		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
-
-		if(oStartMarker) xe.DOMFix.parentNode(oStartMarker).removeChild(oStartMarker);
-		if(oEndMarker) xe.DOMFix.parentNode(oEndMarker).removeChild(oEndMarker);
-	},
-
-	collapseToStart : function(){
-		this.collapse(true);
-	},
-
-	collapseToEnd : function(){
-		this.collapse(false);
-	},
-
-	createAndInsertNode : function(sTagName){
-		tmpNode = this._document.createElement(tagName);
-		this.insertNode(tmpNode)
-		return tmpNode
-	},
-
-	getNodes : function(bSplitTextEndNodes, fnFilter){
-		if(bSplitTextEndNodes) this._splitTextEndNodesOfTheRange();
-
-		var aAllNodes = this._getNodesInRange();
-		var aFilteredNodes = [];
-
-		if(!fnFilter) return aAllNodes;
-
-		for(var i=0; i<aAllNodes.length; i++)
-			if(fnFilter(aAllNodes[i])) aFilteredNodes[aFilteredNodes.length] = aAllNodes[i];
-
-		return aFilteredNodes;
-	},
-
-	getTextNodes : function(bSplitTextEndNodes){
-		var txtFilter = function(oNode){
-			if (oNode.nodeType == 3 && oNode.nodeValue != "\n" && oNode.nodeValue != "")
-				return true;
-			else
-				return false;
-		}
-
-		return this.getNodes(bSplitTextEndNodes, txtFilter);
-	},
-
-	surroundContentsWithNewNode : function(sTagName){
-		var oNewParent = this._document.createElement(sTagName);
-		this.surroundContents(oNewParent);
-		return oNewParent;
-	},
-
-	isRangeinRange : function(oAnoterRange, bIncludePartlySelected){
-		var startToStart = this.compareBoundaryPoints(this.START_TO_START, oAnoterRange);
-		var startToEnd = this.compareBoundaryPoints(this.START_TO_END, oAnoterRange);
-		var endToStart = this.compareBoundaryPoints(this.END_TO_START, oAnoterRange);
-		var endToEnd = this.compareBoundaryPoints(this.END_TO_END, oAnoterRange);
-
-		if(startToStart <= 0 && endToEnd >= 0) return true;
-
-		if(bIncludePartlyIncluded){
-			if(startToEnd == 1) return false;
-			if(endToStart == -1) return false;
-			return true;
-		}
-
-		return false;
-	},
-
-	isNodeInRange : function(oNode, bIncludePartlySelected, bContentOnly){
-		var oTmpRange = new xe.XpressRange(this._window);
-
-		if(bContentOnly && oNode.firstChild){
-			oTmpRange.setStartBefore(oNode.firstChild);
-			oTmpRange.setEndAfter(oNode.lastChild);
-		}else{
-			oTmpRange.selectNode(oNode);
-		}
-
-		return isRangeInRange(oTmpRange, bIncludePartlySelected);
-	},
-
-	pasteHTML : function(sHTML){
-		if(sHTML == ""){
-			this.deleteContents();
-			return;
-		}
-
-		var oTmpDiv = this._document.createElement("DIV");
-		oTmpDiv.innerHTML = sHTML;
-
-		var oFirstNode = oTmpDiv.firstChild;
-		var oLastNode = oTmpDiv.lastChild;
-
-		var clone = this.cloneRange();
-		var sBM = clone.placeStringBookmark();
-
-		while(oTmpDiv.lastChild) this.insertNode(oTmpDiv.lastChild);
-
-		this.setEndNodes(oFirstNode, oLastNode);
-
-		// delete the content later as deleting it first may mass up the insertion point
-		// eg) <p>[A]BCD</p> ---paste O---> O<p>BCD</p>
-		clone.moveToBookmark(sBM);
-		clone.deleteContents();
-		clone.removeStringBookmark(sBM);
-	},
-
-	toString : function(){
-		this.toString = xe.W3CDOMRange.prototype.toString;
-		return this.toString();
-	},
-
-	toHTMLString : function(){
-		var oTmpContainer = this._document.createElement("DIV");
-		oTmpContainer.appendChild(this.cloneContents());
-
-		return oTmpContainer.innerHTML;
-	},
-
-	findAncestorByTagName : function(sTagName){
-		var oNode = this.commonAncestorContainer;
-		while(oNode && oNode.tagName != sTagName) oNode = xe.DOMFix.parentNode(oNode);
-
-		return oNode;
-	},
-
-	selectNodeContents : function(oNode){
-		if(!oNode) return;
-
-		var oFirstNode = oNode.firstChild?oNode.firstChild:oNode;
-		var oLastNode = oNode.lastChild?oNode.lastChild:oNode;
-
-		if(oFirstNode.nodeType == 3)
-			this.setStart(oFirstNode, 0);
-		else
-			this.setStartBefore(oFirstNode);
-
-		if(oLastNode.nodeType == 3)
-			this.setEnd(oLastNode, oLastNode.nodeValue.length);
-		else
-			this.setEndAfter(oLastNode);
-	},
-
-	styleRange : function(oStyle, oAttribute, sNewSpanMarker){
-		var aStyleParents = this._getStyleParentNodes(sNewSpanMarker);
-		if(aStyleParents.length < 1) return;
-
-		var sName, sValue;
-
-		for(var i=0; i<aStyleParents.length; i++){
-			for(var x in oStyle){
-				sName = x;
-				sValue = oStyle[sName];
-
-				if(typeof sValue != "string") continue;
-
-				aStyleParents[i].style[sName] = sValue;
-			}
-
-			if(!oAttribute) continue;
-
-			for(var x in oAttribute){
-				sName = x;
-				sValue = oAttribute[sName];
-
-				if(typeof sValue != "string") continue;
-
-				if(sName == "class"){
-					jQuery(aStyleParents[i]).addClass(sValue);
-				}else{
-					aStyleParents[i].setAttribute(sName, sValue);
-				}
-			}
-		}
-
-		this.setStartBefore(aStyleParents[0]);
-		this.setEndAfter(aStyleParents[aStyleParents.length-1]);
-	},
-
-	_getStyleParentNodes : function(sNewSpanMarker){
-		this._splitTextEndNodesOfTheRange();
-
-		var oSNode = this.getStartNode();
-		var oENode = this.getEndNode();
-
-		var aAllNodes = this._getNodesInRange();
-		var aResult = [];
-
-		var oNode, iStartRelPos, iEndRelPos, oSpan, iSIdx, iEIdx;
-		var nInitialLength = aAllNodes.length;
-		for(var i=0; i<nInitialLength; i++){
-			oNode = aAllNodes[i];
-
-			if(!oNode) continue;
-			if(oNode.nodeType != 3) continue;
-			if(oNode.nodeValue == "") continue;
-
-			if(xe.DOMFix.parentNode(oNode).tagName == "SPAN"){
-				// check if the SPAN element is fully contained
-				iSIdx = jQuery.inArray(this._getVeryFirstRealChild(xe.DOMFix.parentNode(oNode.parentNode)), aAllNodes);
-				iEIdx = jQuery.inArray(this._getVeryLastRealChild(xe.DOMFix.parentNode(oNode)), aAllNodes);
-
-				if(iSIdx != -1 && iEIdx != -1){
-					aResult[aResult.length] = xe.DOMFix.parentNode(oNode);
-					continue;
-				}
-			}
-
-			oSpan = this._document.createElement("SPAN");
-			xe.DOMFix.parentNode(oNode).insertBefore(oSpan, oNode);
-			oSpan.appendChild(oNode);
-			aResult[aResult.length] = oSpan;
-			aAllNodes[aAllNodes.length] = oSpan;
-
-			if(sNewSpanMarker) oSpan.setAttribute(sNewSpanMarker, "true");
-		}
-
-		this.setStartBefore(oSNode);
-		this.setEndAfter(oENode);
-
-		return aResult;
-	},
-
-	_getVeryFirstChild : function(oNode){
-		if(oNode.firstChild) return this._getVeryFirstChild(oNode.firstChild);
-		return oNode;
-	},
-
-	_getVeryLastChild : function(oNode){
-		if(oNode.lastChild) return this._getVeryLastChild(oNode.lastChild);
-		return oNode;
-	},
-
-	_getFirstRealChild : function(oNode){
-		var oFirstNode = oNode.firstChild;
-		while(oFirstNode && oFirstNode.nodeType == 3 && oFirstNode.nodeValue == "") oFirstNode = oFirstNode.nextSibling;
-
-		return oFirstNode;
-	},
-
-	_getLastRealChild : function(oNode){
-		var oLastNode = oNode.lastChild;
-		while(oLastNode && oLastNode.nodeType == 3 && oLastNode.nodeValue == "") oLastNode = oLastNode.previousSibling;
-
-		return oLastNode;
-	},
-
-	_getVeryFirstRealChild : function(oNode){
-		var oFirstNode = this._getFirstRealChild(oNode);
-		if(oFirstNode) return this._getVeryFirstRealChild(oFirstNode);
-		return oNode;
-	},
-	_getVeryLastRealChild : function(oNode){
-		var oLastNode = this._getLastRealChild(oNode);
-		if(oLastNode) return this._getVeryLastChild(oLastNode);
-		return oNode;
-	},
-
-	_getLineStartInfo : function(node){
-		var frontEndFinal = null;
-		var frontEnd = node;
-		var lineBreaker = node;
-		var bParentBreak = true;
-
-		var rxLineBreaker = this.rxLineBreaker;
-
-		// vertical(parent) search
-		function getLineStart(node){
-			if(!node) return;
-			if(frontEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				frontEndFinal = frontEnd;
-
-				bParentBreak = true;
-
-				return;
-			}else{
-				frontEnd = node;
-			}
-
-			getFrontEnd(node.previousSibling);
-
-			if(frontEndFinal) return;
-			getLineStart(xe.DOMFix.parentNode(node));
-		}
-
-		// horizontal(sibling) search
-		function getFrontEnd(node){
-			if(!node) return;
-			if(frontEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				frontEndFinal = frontEnd;
-
-				bParentBreak = false;
-				return;
-			}
-
-			if(node.firstChild && node.tagName != "TABLE"){
-				var curNode = node.lastChild;
-				while(curNode && !frontEndFinal){
-					getFrontEnd(curNode);
-
-					curNode = curNode.previousSibling;
-				}
-			}else{
-				frontEnd = node;
-			}
-
-			if(!frontEndFinal){
-				getFrontEnd(node.previousSibling);
-			}
-		}
-
-		getLineStart(node);
-
-		return {oNode: frontEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
-	},
-
-	_getLineEndInfo : function(node){
-		var backEndFinal = null;
-		var backEnd = node;
-		var lineBreaker = node;
-		var bParentBreak = true;
-
-		var rxLineBreaker = this.rxLineBreaker;
-
-		// vertical(parent) search
-		function getLineEnd(node){
-			if(!node) return;
-			if(backEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				backEndFinal = backEnd;
-
-				bParentBreak = true;
-
-				return;
-			}else{
-				backEnd = node;
-			}
-
-			getBackEnd(node.nextSibling);
-			if(backEndFinal) return;
-
-			getLineEnd(xe.DOMFix.parentNode(node));
-		}
-
-		// horizontal(sibling) search
-		function getBackEnd(node){
-			if(!node) return;
-			if(backEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				backEndFinal = backEnd;
-
-				bParentBreak = false;
-
-				return;
-			}
-
-			if(node.firstChild && node.tagName != "TABLE"){
-				var curNode = node.firstChild;
-				while(curNode && !backEndFinal){
-					getBackEnd(curNode);
-
-					curNode = curNode.nextSibling;
-				}
-			}else{
-				backEnd = node;
-			}
-
-			if(!backEndFinal){
-				getBackEnd(node.nextSibling);
-			}
-		}
-
-		getLineEnd(node);
-
-		return {oNode: backEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
-	},
-
-	getLineInfo : function(){
-		var oSNode = this.getStartNode();
-		var oENode = this.getEndNode();
-
-		// the range is currently collapsed
-		if(!oSNode) oSNode = this.getNodeAroundRange(true, true);
-		if(!oENode) oENode = this.getNodeAroundRange(true, true);
-
-		var oStart = this._getLineStartInfo(oSNode);
-		var oStartNode = oStart.oNode;
-		var oEnd = this._getLineEndInfo(oENode);
-		var oEndNode = oEnd.oNode;
-
-		var iRelativeStartPos = this._compareEndPoint(xe.DOMFix.parentNode(oStartNode), this._getPosIdx(oStartNode), this.endContainer, this.endOffset);
-		var iRelativeEndPos = this._compareEndPoint(xe.DOMFix.parentNode(oEndNode), this._getPosIdx(oEndNode)+1, this.startContainer, this.startOffset);
-
-		if(!(iRelativeStartPos <= 0 && iRelativeEndPos >= 0)){
-			oSNode = this.getNodeAroundRange(false, true);
-			oENode = this.getNodeAroundRange(false, true);
-			oStart = this._getLineStartInfo(oSNode);
-			oEnd = this._getLineEndInfo(oENode);
-		}
-
-		return {oStart: oStart, oEnd: oEnd};
-	}
-}).extend(xe.W3CDOMRange);
-
-/**
- * @fileOverview This file contains cross-browser selection function
- * @name SimpleSelection.js
- */
-xe.SimpleSelection = function(win){
-	this.init = function(win){
-		this._window = win || window;
-		this._document = this._window.document;
-	};
-
-	this.init(win);
-
-	if(jQuery.browser.msie)
-		xe.SimpleSelectionImpl_IE.apply(this);
-	else
-		xe.SimpleSelectionImpl_FF.apply(this);
-
-	this.selectRange = function(oRng){
-		this.selectNone();
-		this.addRange(oRng);
-	};
-
-	this.selectionLoaded = true;
-	if(!this._oSelection) this.selectionLoaded = false;
-};
-
-xe.SimpleSelectionImpl_FF = function(){
-	this._oSelection = this._window.getSelection();
-
-	this.getRangeAt = function(iNum){
-		iNum = iNum || 0;
-
-		try{
-			var oFFRange = this._oSelection.getRangeAt(iNum);
-		}catch(e){return new xe.W3CDOMRange(this._document);}
-
-		return this._FFRange2W3CRange(oFFRange);
-	};
-
-	this.addRange = function(oW3CRange){
-		var oFFRange = this._W3CRange2FFRange(oW3CRange);
-		this._oSelection.addRange(oFFRange);
-	};
-
-	this.selectNone = function(){
-		this._oSelection.removeAllRanges();
-	};
-
-	this._FFRange2W3CRange = function(oFFRange){
-		var oW3CRange = new xe.W3CDOMRange(this._document);
-		oW3CRange.setStart(oFFRange.startContainer, oFFRange.startOffset);
-		oW3CRange.setEnd(oFFRange.endContainer, oFFRange.endOffset);
-		return oW3CRange;
-	};
-
-	this._W3CRange2FFRange = function(oW3CRange){
-		var oFFRange = this._document.createRange();
-		oFFRange.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
-		oFFRange.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
-
-		return oFFRange;
-	};
-};
-
-xe.SimpleSelectionImpl_IE = function(){
-	this._oSelection = this._document.selection;
-
-	this.getRangeAt = function(iNum){
-		iNum = iNum || 0;
-
-		if(this._oSelection.type == "Control"){
-			var oW3CRange = new xe.W3CDOMRange(this._document);
-
-			var oSelectedNode = this._oSelection.createRange().item(iNum);
-
-			// if the selction occurs in a different document, ignore
-			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document) return oW3CRange;
-
-			oW3CRange.selectNode(oSelectedNode);
-
-			return oW3CRange;
-		}else{
-			var oSelectedNode = this._oSelection.createRangeCollection().item(iNum).parentElement();
-
-			// if the selction occurs in a different document, ignore
-			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document){
-				var oW3CRange = new xe.W3CDOMRange(this._document);
-				return oW3CRange;
-			}
-			return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(iNum));
-		}
-	};
-
-	this.addRange = function(oW3CRange){
-		var oIERange = this._W3CRange2IERange(oW3CRange);
-		oIERange.select();
-	};
-
-	this.selectNone = function(){
-		this._oSelection.empty();
-	};
-
-	this._W3CRange2IERange = function(oW3CRange){
-		var oStartIERange = this._getIERangeAt(oW3CRange.startContainer, oW3CRange.startOffset);
-		var oEndIERange = this._getIERangeAt(oW3CRange.endContainer, oW3CRange.endOffset);
-		oStartIERange.setEndPoint("EndToEnd", oEndIERange);
-
-		return oStartIERange;
-	};
-
-	this._getIERangeAt = function(oW3CContainer, iW3COffset){
-		var oIERange = this._document.body.createTextRange();
-
-		var oEndPointInfoForIERange = this._getSelectableNodeAndOffsetForIE(oW3CContainer, iW3COffset);
-
-		var oSelectableNode = oEndPointInfoForIERange.oSelectableNodeForIE;
-		var iIEOffset = oEndPointInfoForIERange.iOffsetForIE;
-
-		oIERange.moveToElementText(oSelectableNode);
-		oIERange.collapse(oEndPointInfoForIERange.bCollapseToStart);
-		oIERange.moveStart("character", iIEOffset);
-
-		return oIERange;
-	};
-
-	this._getSelectableNodeAndOffsetForIE = function(oW3CContainer, iW3COffset){
-		var oIERange = this._document.body.createTextRange();
-
-		var oNonTextNode = null;
-		var aChildNodes =  null;
-		var iNumOfLeftNodesToCount = 0;
-
-		if(oW3CContainer.nodeType == 3){
-			oNonTextNode = xe.DOMFix.parentNode(oW3CContainer);
-			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
-			iNumOfLeftNodesToCount = aChildNodes.length;
-		}else{
-			oNonTextNode = oW3CContainer;
-			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
-			iNumOfLeftNodesToCount = iW3COffset;
-		}
-
-		var oNodeTester = null;
-
-		var iResultOffset = 0;
-
-		var bCollapseToStart = true;
-
-		for(var i=0; i<iNumOfLeftNodesToCount; i++){
-			oNodeTester = aChildNodes[i];
-
-			if(oNodeTester.nodeType == 3){
-				if(oNodeTester == oW3CContainer) break;
-
-				iResultOffset += oNodeTester.nodeValue.length;
-			}else{
-				oIERange.moveToElementText(oNodeTester);
-				oNonTextNode = oNodeTester;
-				iResultOffset = 0;
-
-				bCollapseToStart = false;
-			}
-		}
-
-		if(oW3CContainer.nodeType == 3) iResultOffset += iW3COffset;
-
-		return {oSelectableNodeForIE:oNonTextNode, iOffsetForIE: iResultOffset, bCollapseToStart: bCollapseToStart};
-	};
-
-	this._IERange2W3CRange = function(oIERange){
-		var oW3CRange = new xe.W3CDOMRange(this._document);
-
-		var oIEPointRange = null;
-		var oPosition = null;
-
-		oIEPointRange = oIERange.duplicate();
-		oIEPointRange.collapse(true);
-
-		oPosition = this._getW3CContainerAndOffset(oIEPointRange, true);
-
-		oW3CRange.setStart(oPosition.oContainer, oPosition.iOffset);
-
-		var oCollapsedChecker = oIERange.duplicate();
-		oCollapsedChecker.collapse(true);
-		if(oCollapsedChecker.isEqual(oIERange)){
-			oW3CRange.collapse(true);
-		}else{
-			oIEPointRange = oIERange.duplicate();
-			oIEPointRange.collapse(false);
-			oPosition = this._getW3CContainerAndOffset(oIEPointRange);
-			oW3CRange.setEnd(oPosition.oContainer, oPosition.iOffset);
-		}
-
-		return oW3CRange;
-	};
-
-	this._getW3CContainerAndOffset = function(oIEPointRange, bStartPt){
-		var oRgOrigPoint = oIEPointRange;
-
-		var oContainer = oRgOrigPoint.parentElement();
-		var offset = -1;
-
-		var oRgTester = this._document.body.createTextRange();
-		var aChildNodes = xe.DOMFix.childNodes(oContainer);
-		var oPrevNonTextNode = null;
-		var pointRangeIdx = 0;
-
-		for(var i=0;i<aChildNodes.length;i++){
-			if(aChildNodes[i].nodeType == 3) continue;
-
-			oRgTester.moveToElementText(aChildNodes[i]);
-
-			if(oRgTester.compareEndPoints("StartToStart", oIEPointRange)>=0) break;
-
-			oPrevNonTextNode = aChildNodes[i];
-		}
-
-		var pointRangeIdx = i;
-
-		if(pointRangeIdx != 0 && aChildNodes[pointRangeIdx-1].nodeType == 3){
-			var oRgTextStart = this._document.body.createTextRange();
-			var oCurTextNode = null;
-			if(oPrevNonTextNode){
-				oRgTextStart.moveToElementText(oPrevNonTextNode);
-				oRgTextStart.collapse(false);
-				oCurTextNode = oPrevNonTextNode.nextSibling;
-			}else{
-				oRgTextStart.moveToElementText(oContainer);
-				oRgTextStart.collapse(true);
-				oCurTextNode = oContainer.firstChild;
-			}
-
-			var oRgTextsUpToThePoint = oRgOrigPoint.duplicate();
-			oRgTextsUpToThePoint.setEndPoint("StartToStart", oRgTextStart);
-
-			var textCount = oRgTextsUpToThePoint.text.length
-
-			while(textCount > oCurTextNode.nodeValue.length && oCurTextNode.nextSibling){
-				textCount -= oCurTextNode.nodeValue.length;
-				oCurTextNode = oCurTextNode.nextSibling;
-			}
-
-			// this will enforce IE to re-reference oCurTextNode
-			var oTmp = oCurTextNode.nodeValue;
-
-			if(bStartPt && oCurTextNode.nextSibling && oCurTextNode.nextSibling.nodeType == 3 && textCount == oCurTextNode.nodeValue.length){
-				textCount -= oCurTextNode.nodeValue.length;
-				oCurTextNode = oCurTextNode.nextSibling;
-			}
-
-			oContainer = oCurTextNode;
-			offset = textCount;
-		}else{
-			oContainer = oRgOrigPoint.parentElement();
-			offset = pointRangeIdx;
-		}
-
-		return {"oContainer" : oContainer, "iOffset" : offset};
-	};
-}
-
-xe.DOMFix = new (jQuery.Class({
-	$init : function(){
-		if(jQuery.browser.msie || jQuery.browser.opera){
-			this.childNodes = this._childNodes_Fix;
-			this.parentNode = this._parentNode_Fix;
-		}else{
-			this.childNodes = this._childNodes_Native;
-			this.parentNode = this._parentNode_Native;
-		}
-	},
-
-	_parentNode_Native : function(elNode){
-		return elNode.parentNode;
-	},
-
-	_parentNode_Fix : function(elNode){
-		if(!elNode) return elNode;
-
-		while(elNode.previousSibling){elNode = elNode.previousSibling;}
-
-		return elNode.parentNode;
-	},
-
-	_childNodes_Native : function(elNode){
-		return elNode.childNodes;
-	},
-
-	_childNodes_Fix : function(elNode){
-		var aResult = null;
-		var nCount = 0;
-
-		if(elNode){
-			var aResult = [];
-			elNode = elNode.firstChild;
-			while(elNode){
-				aResult[nCount++] = elNode;
-				elNode=elNode.nextSibling;
-			}
-		}
-
-		return aResult;
-	}
-}))();
-/**
- * @fileOverview This file contains a function that takes care of various operations related to find and replace
- * @name N_FindReplace.js
- */
-xe.FindReplace = jQuery.Class({
-	sKeyword : "",
-	window : null,
-	document : null,
-	bBrowserSupported : false,
-
-	// true if End Of Contents is reached during last execution of find
-	bEOC : false,
-
-	$init : function(win){
-		this.window = win;
-		this.document = this.window.document;
-
-		if(this.document.domain != this.document.location.hostname){
-			if(jQuery.browser.mozilla && jQuery.browser.nVersion < 3){
-				this.bBrowserSupported = false;
-				this.find = function(){return 3};
-				return;
-			}
-		}
-
-		this.bBrowserSupported = true;
-	},
-
-	// 0: found
-	// 1: not found
-	// 2: keyword required
-	// 3: browser not supported
-	find : function(sKeyword, bCaseMatch, bBackwards, bWholeWord){
-		var bSearchResult, bFreshSearch;
-
-		this.window.focus();
-
-		if(!sKeyword) return 2;
-
-		// try find starting from current cursor position
-		this.bEOC = false;
-		bSearchResult = this.findNext(sKeyword, bCaseMatch, bBackwards, bWholeWord);
-		if(bSearchResult) return 0;
-
-		// end of the contents could have been reached so search again from the beginning
-		this.bEOC = true;
-		bSearchResult = this.findNew(sKeyword, bCaseMatch, bBackwards, bWholeWord);
-
-		if(bSearchResult) return 0;
-
-		return 1;
-	},
-
-	findNew : function (sKeyword, bCaseMatch, bBackwards, bWholeWord){
-		this.findReset();
-		return this.findNext(sKeyword, bCaseMatch, bBackwards, bWholeWord);
-	},
-
-	findNext : function(sKeyword, bCaseMatch, bBackwards, bWholeWord){
-		var bSearchResult;
-		bCaseMatch = bCaseMatch || false;
-		bWholeWord = bWholeWord || false;
-		bBackwards = bBackwards || false;
-
-		if(this.window.find){
-			var bWrapAround = false;
-			return this.window.find(sKeyword, bCaseMatch, bBackwards, bWrapAround, bWholeWord);
-		}
-
-		// IE solution
-		if(this.document.body.createTextRange){
-			var iOption = 0;
-			if(bBackwards) iOption += 1;
-			if(bWholeWord) iOption += 2;
-			if(bCaseMatch) iOption += 4;
-
-			this.window.focus();
-			this._range = this.document.selection.createRangeCollection().item(0);
-			this._range.collapse(false);
-			bSearchResult = this._range.findText(sKeyword, 1, iOption);
-
-			this._range.select();
-			return bSearchResult;
-		}
-
-		return false;
-	},
-
-	findReset : function() {
-		if (this.window.find){
-			this.window.getSelection().removeAllRanges();
-			return;
-		}
-
-		// IE solution
-		if(this.document.body.createTextRange){
-			this._range = this.document.body.createTextRange();
-			this._range.collapse(true);
-			this._range.select();
-		}
-	},
-
-	// 0: replaced & next word found
-	// 1: replaced & next word not found
-	// 2: not replaced & next word found
-	// 3: not replaced & next word not found
-	// 4: sOriginalWord required
-	replace : function(sOriginalWord, Replacement, bCaseMatch, bBackwards, bWholeWord){
-		if(!sOriginalWord) return 4;
-
-		var oSelection = new xe.XpressRange(this.window);
-		oSelection.setFromSelection();
-
-		bCaseMatch = bCaseMatch || false;
-		var bMatch, selectedText = oSelection.toString();
-		if(bCaseMatch)
-			bMatch = (selectedText == sOriginalWord);
-		else
-			bMatch = (selectedText.toLowerCase() == sOriginalWord.toLowerCase());
-
-		if(!bMatch)
-			return this.find(sOriginalWord, bCaseMatch, bBackwards, bWholeWord)+2;
-
-		if(typeof Replacement == "function"){
-			// the returned oSelection must contain the replacement
-			oSelection = Replacement(oSelection);
-		}else{
-			oSelection.pasteHTML(Replacement);
-		}
-
-		// force it to find the NEXT occurance of sOriginalWord
-		oSelection.select();
-
-		return this.find(sOriginalWord, bCaseMatch, bBackwards, bWholeWord);
-	},
-
-	// returns number of replaced words
-	// -1 : if original word is not given
-	replaceAll : function(sOriginalWord, Replacement, bCaseMatch, bWholeWord){
-		if(!sOriginalWord) return -1;
-
-		var bBackwards = false;
-
-		var iReplaceResult;
-		var iResult = 0;
-		var win = this.window;
-		var oSelection = new xe.XpressRange(this.window);
-		oSelection.setFromSelection();
-		var sBookmark = oSelection.placeStringBookmark();
-
-		this.bEOC = false;
-		while(!this.bEOC){
-			iReplaceResult = this.replace(sOriginalWord, Replacement, bCaseMatch, bBackwards, bWholeWord);
-			if(iReplaceResult == 0 || iReplaceResult == 1) iResult++;
-		}
-
-		var startingPointReached = function(){
-			var oCurSelection = new xe.XpressRange(win);
-			oCurSelection.setFromSelection();
-
-			oSelection.moveToBookmark(sBookmark);
-			var pos = oSelection.compareBoundaryPoints(xe.W3CDOMRange.START_TO_END, oCurSelection);
-
-			if(pos == 1) return false;
-			return true;
-		}
-
-		iReplaceResult = 0;
-		this.bEOC = false;
-		while(!startingPointReached() && iReplaceResult == 0 && !this.bEOC){
-			iReplaceResult = this.replace(sOriginalWord, Replacement, bCaseMatch, bBackwards, bWholeWord);
-			if(iReplaceResult == 0 || iReplaceResult == 1) iResult++;
-		}
-
-		oSelection.moveToBookmark(sBookmark);
-		oSelection.select();
-		oSelection.removeStringBookmark(sBookmark);
-
-		return iResult;
-	}
-});
-
-/**
- * @fileOverview This file contains a function that takes care of the draggable layers
- * @name N_DraggableLayer.js
- */
-xe.DraggableLayer = jQuery.Class({
-	$init : function(oLayer, oOptions){
-		this.oOptions = jQuery.extend({
-			bModal : "false",
-			oHandle : oLayer,
-			iMinX : -999999,
-			iMinY : -999999,
-			iMaxX : 999999,
-			iMaxY : 999999
-		}, oOptions);
-
-		this.oHandle = this.oOptions.oHandle;
-
-		oLayer.style.display = "block";
-		oLayer.style.position = "absolute";
-		oLayer.style.zIndex = "9999";
-
-		this.aBasePosition = this.getBaseOffset(oLayer);
-
-		// "number-ize" the position and set it as inline style. (the position could've been set as "auto" or set  by css, not inline style)
-		oLayer.style.top = (this.toInt(jQuery(oLayer).offset().top) - this.aBasePosition.top)+"px";
-		oLayer.style.left = (this.toInt(jQuery(oLayer).offset().left) - this.aBasePosition.left)+"px";
-
-		this.$FnMouseDown = jQuery.fnBind(this._mousedown, this, oLayer);
-		this.$FnMouseMove = jQuery.fnBind(this._mousemove, this, oLayer);
-		this.$FnMouseUp = jQuery.fnBind(this._mouseup, this, oLayer);
-
-		jQuery(this.oHandle).bind("mousedown", this.$FnMouseDown);
-	},
-
-	_mousedown : function(oLayer, oEvent){
-		if(oEvent.target.tagName == "INPUT") return;
-
-		this.MouseOffsetY = (oEvent.pageY-this.toInt(oLayer.style.top)-this.aBasePosition['top']);
-		this.MouseOffsetX = (oEvent.pageX-this.toInt(oLayer.style.left)-this.aBasePosition['left']);
-
-		jQuery(oLayer).bind("mousemove", this.$FnMouseMove);
-		jQuery(oLayer).bind("mouseup", this.$FnMouseUp);
-	},
-
-	_mousemove : function(oLayer, oEvent){
-		var iTop = (oEvent.pageY-this.MouseOffsetY-this.aBasePosition['top']);
-		var iLeft = (oEvent.pageX-this.MouseOffsetX-this.aBasePosition['left']);
-
-		if(iTop<this.oOptions.iMinY) iTop = this.oOptions.iMinY;
-		if(iTop>this.oOptions.iMaxY) iTop = this.oOptions.iMaxY;
-
-		if(iLeft<this.oOptions.iMinX) iLeft = this.oOptions.iMinX;
-		if(iLeft>this.oOptions.iMaxX) iLeft = this.oOptions.iMaxX;
-
-		oLayer.style.top = iTop + "px";
-		oLayer.style.left = iLeft + "px";
-	},
-
-	_mouseup : function(oLayer, oEvent){
-		jQuery(oLayer).unbind("mousemove", this.$FnMouseMove);
-		jQuery(oLayer).unbind("mouseup", this.$FnMouseUp);
-	},
-
-	toInt : function(num){
-		var result = parseInt(num);
-		return result || 0;
-	},
-
-	findNonStatic : function(oEl){
-		if(!oEl) return null;
-		if(oEl.tagName == "BODY") return oEl;
-
-		if(jQuery(oEl).css("position").match(/absolute|relative/i)) return oEl;
-
-		return this.findNonStatic(oEl.offsetParent);
-	},
-
-	getBaseOffset : function(oEl){
-		var oBase = this.findNonStatic(oEl.offsetParent);
-		var tmp = jQuery(oBase).offset();
-
-		return {top: tmp.top, left: tmp.left};
-	}
-});
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the messages related to core operations
- * @name hp_CorePlugin.js
- */
-xe.CorePlugin = jQuery.Class({
-	name : "CorePlugin",
-
-	$init : function(funcOnReady){
-		this.funcOnReady = funcOnReady;
-	},
-
-	$AFTER_MSG_APP_READY : function(){
-		this.oApp.exec("EXEC_ON_READY_FUNCTION", []);
-	},
-
-	$ON_ADD_APP_PROPERTY : function(sPropertyName, oProperty){
-		this.oApp[sPropertyName] = oProperty;
-	},
-
-	$ON_REGISTER_BROWSER_EVENT : function(obj, sEvent, sCMD, aParams, nDelay){
-		this.oApp.registerBrowserEvent(obj, sEvent, sCMD, aParams, nDelay);
-	},
-
-	$ON_DISABLE_COMMAND : function(sCommand){
-		this.oApp.disableCommand(sCommand, true);
-	},
-
-	$ON_ENABLE_COMMAND : function(sCommand){
-		this.oApp.disableCommand(sCommand, false);
-	},
-
-	$ON_EXEC_ON_READY_FUNCTION : function(){
-		if(typeof this.funcOnReady == "function") this.funcOnReady();
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that helps various operations.
- * @name hp_Utils.js
- */
- xe.Utils = jQuery.Class({
-	name : "Utils",
-
-	$init : function(){
-		if(jQuery.browser.msie && jQuery.browser.nVersion == 6){
-			try{
-				document.execCommand('BackgroundImageCache', false, true);
-			}catch(e){}
-		}
-	},
-
-	$ON_ATTACH_HOVER_EVENTS : function(aElms, sHoverClass){
-		sHoverClass = sHoverClass || "hover";
-
-		if(!aElms) return;
-
-		jQuery(aElms).hover(
-			function(){jQuery(this).addClass(sHoverClass)},
-			function(){jQuery(this).removeClass(sHoverClass)}
-		);
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that bridges the XpressRange function
- * @name hp_XpressRangeManager.js
- */
-xe.XpressRangeManager = jQuery.Class({
-	name : "XpressRangeManager",
-
-	oWindow : null,
-
-	$init : function(win){
-		this.oWindow = win || window;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		if(this.oWindow && this.oWindow.tagName == "IFRAME")
-			this.oWindow = this.oWindow.contentWindow;
-
-		this.oApp.exec("ADD_APP_PROPERTY", ["getSelection", jQuery.fnBind(this.getSelection, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getEmptySelection", jQuery.fnBind(this.getEmptySelection, this)]);
-	},
-
-	$ON_SET_EDITING_WINDOW : function(oWindow){
-		this.oWindow = oWindow;
-	},
-
-	getEmptySelection : function(){
-		var oXpressRange = new xe.XpressRange(this.oWindow);
-		return oXpressRange;
-	},
-
-	getSelection : function(){
-		this.oApp.exec("RESTORE_IE_SELECTION", []);
-
-		var oXpressRange = this.getEmptySelection();
-
-		// this may throw an exception if the selected is area is not yet shown
-		try{
-			oXpressRange.setFromSelection();
-		}catch(e){}
-
-		return oXpressRange;
-	}
-});
-//}
-xe.Hotkey = jQuery.Class({
-	name : "Hotkey",
-
-	target  : null,
-	handler : null,
-	storage : {},
-	keyhash : {},
-
-	$init : function(){
-		this.storage = {};
-
-		this.keyhash = {
-			backspace : 8,
-			tab		  : 9,
-			enter	  : 13,
-			shift     : 16,
-			ctrl      : 17,
-			alt       : 18,
-			meta      : 224,
-			esc		  : 27,
-			space	  : 32,
-			pageup	  : 33,
-			pagedown  : 34,
-			end		  : 35,
-			home	  : 36,
-			left	  : 37,
-			up		  : 38,
-			right	  : 39,
-			down	  : 40,
-			del	  	  : 46,
-			comma	  : 188,//(,)
-			period	  : 190,//(.)
-			slash	  : 191,//(/)
-			hyphen    : 109,
-			equal     : 61
-		};
-
-		if (jQuery.browser.msie || jQuery.browser.safari) {
-			this.keyhash.hyphen = 189; // (-)
-			this.keyhash.equal = 187;  // (=)
-			this.keyhash.meta  = 91;   // meta
-		}
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.target  = this.oApp.getWYSIWYGDocument() || document;
-		this.handler = jQuery.fnBind(this.keydown, this);
-
-		jQuery(this.target).keydown(this.handler);
-	},
-
-	$ON_MSG_APP_DESTORY : function(){
-		jQuery(this.target).unbind('keydown', this.handler);
-	},
-
-	$ON_REGISTER_HOTKEY : function(sHotkey, sCMD, sArgs){
-		if(!sArgs) sArgs = [];
-		var func = jQuery.fnBind(this.oApp.exec, this.oApp, sCMD, sArgs);
-
-		sHotkey = this.normalize(sHotkey);
-		if (!sHotkey) return false;
-
-		this.add(sHotkey, func);
-	},
-
-	add : function(sHotkey, func) {
-		if (typeof this.storage[sHotkey] == 'undefined') {
-			this.storage[sHotkey] = [func];
-		} else {
-			this.storage[sHotkey].push(func);
-		}
-	},
-
-	keydown : function(event) {
-		var key  = [], kh = this.keyhash;
-		var code = event.keyCode;
-
-		if (jQuery.inArray(event.keyCode, [kh.shift, kh.ctrl, kh.alt, kh.meta]) >= 0) return;
-
-		if (event.shiftKey) key.push('shift');
-		if (event.altKey)   key.push('alt');
-		if (event.ctrlKey)  key.push('ctrl');
-		if (event.metaKey)  key.push('meta');
-		if (!key.length && code != kh.enter && code != kh.esc) return;
-		if (key.length == 1 && event.metaKey) key = ['ctrl', 'meta'];
-
-		key.push(code);
-		key = key.join('+');
-
-		if (!this.storage[key]) return;
-
-		jQuery.each(this.storage[key], function(){ this(); });
-
-		event.preventDefault();
-		event.stopPropagation();
-		event.keyCode = 0;
-
-		return false;
-	},
-
-	normalize : function(sHotkey) {
-		var shift, ctrl, alt, meta, key, keys = (sHotkey||"").toLowerCase().split('+');
-
-		shift = ctrl = alt = meta = key = false;
-
-		jQuery.each(keys, function(){
-			var s = ""+this;
-			switch(s) {
-				case 'shift': shift = true;
-				case 'alt'  : alt   = true;
-				case 'ctrl' : ctrl  = true;
-				case 'meta' : meta  = true;
-				default:
-					key = s;
-			}
-		});
-
-		if (!key) return '';
-
-		keys = [];
-		if (shift) keys.push('shift');
-		if (alt) keys.push('alt');
-		if (ctrl) keys.push('ctrl');
-		if (meta || (ctrl && !shift && !alt)) keys.push('meta');
-
-		keys.push(this.keyhash[key] || key.toUpperCase().charCodeAt(0));
-
-		return keys.join('+');
-	}
-});
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the draggable layers
- * @name hp_DialogLayerManager.js
- */
-xe.DialogLayerManager = jQuery.Class({
-	name : "DialogLayerManager",
-	aMadeDraggable : null,
-	aOpenedLayers : null,
-
-	$init : function(){
-		this.aMadeDraggable = [];
-		this.aOpenedLayers = [];
-	},
-
-	$ON_SHOW_DIALOG_LAYER : function(oLayer, bModal){
-		oLayer = jQuery.$(oLayer);
-		bModal = jQuery.$(bModal) || false;
-		if(!oLayer) return;
-
-		if(jQuery.inArray(oLayer, this.aOpenedLayers)) return;
-
-		this.oApp.exec("POSITION_DIALOG_LAYER", [oLayer]);
-
-		this.aOpenedLayers[this.aOpenedLayers.length] = oLayer;
-
-		if(!jQuery.inArray(oLayer, this.aMadeDraggable)){
-			new xe.DraggableLayer(oLayer, {bModal: bModal, iMinY: 0});
-			this.aMadeDraggable[this.aMadeDraggable.length] = oLayer;
-		}else{
-			oLayer.style.display = "block";
-		}
-	},
-
-	$ON_HIDE_LAST_DIALOG_LAYER : function(){
-		this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[this.aOpenedLayers.length-1]]);
-	},
-
-	$ON_HIDE_ALL_DIALOG_LAYER : function(){
-		for(var i=this.aOpenedLayers.length-1; i>=0; i--)
-			this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[i]]);
-	},
-
-	$ON_HIDE_DIALOG_LAYER : function(oLayer){
-		oLayer = jQuery.$(oLayer);
-
-		if(oLayer) oLayer.style.display = "none";
-		this.aOpenedLayers = jQuery.grep(this.aOpenedLayers, function(a){return a!=oLayer});
-	},
-
-	$ON_SET_DIALOG_LAYER_POSITION : function(oLayer, iTop, iLeft){
-		oLayer.style.top = iTop;
-		oLayer.style.left = iLeft;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the layers that should disappear when the focus is lost
- * @name hp_ActiveLayerManager.js
- */
-xe.ActiveLayerManager = jQuery.Class({
-	name : "ActiveLayerManager",
-	oCurrentLayer : null,
-
-	$ON_TOGGLE_ACTIVE_LAYER : function(oLayer, sOnOpenCmd, aOnOpenParam, sOnCloseCmd, aOnCloseParam){
-		if(oLayer == this.oCurrentLayer){
-			this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-		}else{
-			this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sOnCloseCmd, aOnCloseParam]);
-			if(sOnOpenCmd) this.oApp.exec(sOnOpenCmd, aOnOpenParam);
-		}
-	},
-
-	$ON_SHOW_ACTIVE_LAYER : function(oLayer, sOnCloseCmd, aOnCloseParam){
-		oLayer = jQuery.$(oLayer);
-		this.sOnCloseCmd = sOnCloseCmd;
-		this.aOnCloseParam = aOnCloseParam;
-
-		var oPrevLayer = this.oCurrentLayer;
-
-		if(oLayer == oPrevLayer) return;
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-
-		oLayer.style.display = "block";
-		this.oCurrentLayer = oLayer;
-	},
-
-	$ON_HIDE_ACTIVE_LAYER : function(){
-		var oLayer = this.oCurrentLayer;
-		if(!oLayer) return;
-		oLayer.style.display = "none";
-		this.oCurrentLayer = null;
-
-		if(this.sOnCloseCmd)
-			this.oApp.exec(this.sOnCloseCmd, this.aOnCloseParam);
-	},
-
-	// for backward compatibility only.
-	// use HIDE_ACTIVE_LAYER instead!
-	$ON_HIDE_CURRENT_ACTIVE_LAYER : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYDOWN : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_EVENT_EDITING_AREA_MOUSEDOWN : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to string conversion. Ususally used to convert the IR value.
- * @name hp_StringConverterManager.js
- */
-xe.StringConverterManager = jQuery.Class({
-	name : "StringConverterManager",
-
-	oConverters : null,
-
-	$init : function(){
-		this.oConverters = {};
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oApp.exec("ADD_APP_PROPERTY", ["applyConverter", jQuery.fnBind(this.applyConverter, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["addConverter", jQuery.fnBind(this.addConverter, this)]);
-	},
-
-	applyConverter : function(sRuleName, sContent){
-		var aConverters = this.oConverters[sRuleName];
-		if(!aConverters) return sContent;
-
-		for(var i=0; i<aConverters.length; i++) sContent = aConverters[i](sContent);
-
-		return sContent;
-	},
-
-	addConverter : function(sRuleName, funcConverter){
-		var aConverters = this.oConverters[sRuleName];
-		if(!aConverters) this.oConverters[sRuleName] = [];
-
-		this.oConverters[sRuleName][this.oConverters[sRuleName].length] = funcConverter;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that maps a message code to the actual message
- * @name hp_MessageManager.js
- */
-xe.MessageManager = jQuery.Class({
-	name : "MessageManager",
-
-	oMessageMap : null,
-
-	$init : function(oMessageMap){
-		this.oMessageMap = oMessageMap;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oApp.exec("ADD_APP_PROPERTY", ["$MSG", jQuery.fnBind(this.getMessage, this)]);
-	},
-
-	getMessage : function(sMsg){
-		if(this.oMessageMap[sMsg]) return unescape(this.oMessageMap[sMsg]);
-
-		return sMsg;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to the tool bar UI
- * @name hp_XE_Toolbar.js
- */
-xe.XE_Toolbar = jQuery.Class({
-	name : "XE_Toolbar",
-	toolbarArea : null,
-	toolbarButton : null,
-	uiNameTag : "uiName",
-
-	sUIClassPrefix : "xpress_xeditor_ui_",
-
-	aUICmdMap : null,
-
-	$init : function(oAppContainer){
-		this.htUIList = {};
-
-		this.aUICmdMap = {};
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = jQuery.$(oAppContainer) || document;
-		this.toolbarArea = jQuery(".tool", oAppContainer).get(0);
-		this.welToolbarArea = jQuery(this.toolbarArea);
-
-		this.aAllButtons = jQuery("BUTTON", this.toolbarArea).get();
-
-		var aAllLi = this.toolbarArea.getElementsByTagName("LI");
-		var nCount = aAllLi.length;
-		var rxUI = new RegExp(this.sUIClassPrefix+"([^ ]+)");
-		for(var i=0; i<nCount; i++){
-			if(rxUI.test(aAllLi[i].className)){
-				var sUIName = RegExp.$1;
-				if(this.htUIList[sUIName] != null) continue;
-
-				this.htUIList[sUIName] = jQuery(">*:first-child", aAllLi[i]).get(0);
-			}
-		}
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseover", "EVENT_TOOLBAR_MOUSEOVER", []);
-		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseout", "EVENT_TOOLBAR_MOUSEOUT", []);
-
-		this.oApp.exec("ADD_APP_PROPERTY", ["getToolbarButtonByUIName", jQuery.fnBind(this.getToolbarButtonByUIName, this)]);
-	},
-
-	$ON_EVENT_TOOLBAR_MOUSEOVER : function(weEvent){
-		if(weEvent.target.tagName == "BUTTON") jQuery(weEvent.target).addClass("hover").parent("span").addClass("hover");
-	},
-
-	$ON_EVENT_TOOLBAR_MOUSEOUT : function(weEvent){
-		if(weEvent.target.tagName == "BUTTON") jQuery(weEvent.target).removeClass("hover").parent("span").removeClass("hover");
-	},
-
-	$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER : function(oLayer, oBtn, sOpenCmd, aOpenArgs, sCloseCmd, aCloseArgs){
-		this.oApp.exec("TOGGLE_ACTIVE_LAYER", [oLayer, "MSG_TOOLBAR_LAYER_SHOWN", [oLayer, oBtn, sOpenCmd, aOpenArgs], sCloseCmd, aCloseArgs]);
-	},
-
-	$ON_MSG_TOOLBAR_LAYER_SHOWN : function(oLayer, oBtn, aOpenCmd, aOpenArgs){
-		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
-		if(aOpenCmd) this.oApp.exec(aOpenCmd, aOpenArgs);
-	},
-
-	$ON_SHOW_TOOLBAR_ACTIVE_LAYER : function(oLayer, sCmd, aArgs, oBtn){
-		this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sCmd, aArgs]);
-		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
-	},
-
-	$ON_ENABLE_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		jQuery(elUI).removeClass("off");
-		elUI.disabled = false;
-
-		// enable related commands
-		var sCmd = "";
-		if(this.aUICmdMap[sUIName]){
-			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
-				sCmd = this.aUICmdMap[sUIName][i];
-				this.oApp.exec("ENABLE_COMMAND", [sCmd]);
-			}
-		}
-	},
-
-	$ON_DISABLE_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		jQuery(elUI).addClass("off");
-		jQuery(elUI).removeClass("hover").parent("span").removeClass("hover");
-		elUI.disabled = true;
-
-		// disable related commands
-		var sCmd = "";
-		if(this.aUICmdMap[sUIName]){
-			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
-				sCmd = this.aUICmdMap[sUIName][i];
-				this.oApp.exec("DISABLE_COMMAND", [sCmd]);
-			}
-		}
-	},
-
-	$ON_SELECT_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		jQuery(elUI).addClass("active");
-	},
-
-	$ON_DESELECT_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		jQuery(elUI).removeClass("active");
-	},
-
-	$ON_ENABLE_ALL_UI : function(){
-		var sUIName, className;
-
-		for(var sUIName in this.htUIList){
-			if(sUIName) this.oApp.exec("ENABLE_UI", [sUIName]);
-		}
-		jQuery(this.toolbarArea).removeClass("off");
-	},
-
-	$ON_DISABLE_ALL_UI : function(){
-		var sUIName;
-
-		for(var sUIName in this.htUIList){
-			if(sUIName) this.oApp.exec("DISABLE_UI", [sUIName]);
-		}
-		jQuery(this.toolbarArea).addClass("off");
-		this.oApp.exec("HIDE_ACTIVE_LAYER",[]);
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, attributeValue){
-		if(attributeValue == 1)
-			this.oApp.exec("SELECT_UI", [sAttributeName]);
-		else
-			this.oApp.exec("DESELECT_UI", [sAttributeName]);
-	},
-
-	$ON_REGISTER_UI_EVENT : function(sUIName, sEvent, sCmd, aParams){
-		// map cmd & ui
-		if(!this.aUICmdMap[sUIName]){this.aUICmdMap[sUIName] = [];}
-		this.aUICmdMap[sUIName][this.aUICmdMap[sUIName].length] = sCmd;
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		this.oApp.registerBrowserEvent(elUI, sEvent, sCmd, aParams);
-	},
-
-	$ON_POSITION_TOOLBAR_LAYER : function(oLayer, oBtn){
-		oLayer = jQuery.$(oLayer);
-		oBtn = jQuery.$(oBtn);
-
-		if(!oLayer) return;
-		if(oBtn && oBtn.tagName && oBtn.tagName == "BUTTON") oBtn.parentNode.appendChild(oLayer);
-
-		oLayer.style.left = "0";
-
-		var welLayer = jQuery(oLayer);
-		var nLayerLeft = welLayer.offset().left;
-		nLayerLeft += oLayer.offsetWidth;
-
-		var nToolbarLeft = this.welToolbarArea.offset().left;
-		nToolbarLeft += this.toolbarArea.offsetWidth;
-
-		if(nLayerLeft > nToolbarLeft) oLayer.style.left = (nToolbarLeft-nLayerLeft-5)+"px";
-	},
-
-	getToolbarButtonByUIName : function(sUIName){
-		return this.htUIList[sUIName];
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that manages multiple number editing area plugins and the IR value
- * @name hp_XE_EditingAreaManager.js
- */
-xe.XE_EditingAreaManager = jQuery.Class({
-	name : "XE_EditingAreaManager",
-
-	// Currently active plugin instance(XE_EditingArea_???)
-	oActivePlugin : null,
-
-	// Intermediate Representation of the content being edited.
-	// This should be a textarea element.
-	oIRField : null,
-
-	bIsDirty : false,
-
-	$init : function(sInitialMode, oIRField, oDimension, fOnBeforeUnload, oAppContainer){
-		this.sInitialMode = sInitialMode;
-		this.oIRField = jQuery.$(oIRField);
-		this._assignHTMLObjects(oAppContainer);
-		this.fOnBeforeUnload = fOnBeforeUnload;
-
-		this.oEditingMode = {};
-
-		this.elEditingAreaContainer.style.height = parseInt(oDimension.nHeight || this.elEditingAreaContainer.offsetHeight)+"px";
-
-		this.nMinHeight = oDimension.nMinHeight || 10;
-		this.niMinWidth = oDimension.nMinWidth || 10;
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = jQuery.$(oAppContainer) || document;
-		this.elEditingAreaContainer = jQuery("DIV.xpress_xeditor_editing_area_container", oAppContainer).get(0);
-		this.elEditingAreaSkipUI = jQuery("A.skip", oAppContainer).get(0);
-	},
-
-	$BEFORE_MSG_APP_READY : function(msg){
-		this.oApp.exec("ADD_APP_PROPERTY", ["elEditingAreaContainer", this.elEditingAreaContainer]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getIR", jQuery.fnBind(this.getIR, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["setIR", this.setIR]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getEditingMode", jQuery.fnBind(this.getEditingMode, this)]);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("CHANGE_EDITING_MODE", [this.sInitialMode, true]);
-		this.oApp.exec("LOAD_IR_FIELD", [false]);
-
-		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "focus", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
-		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "blur", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
-
-		//var fOnBeforeUnload = this.fOnBeforeUnload||function(){if(this.getIR() != this.oIRField.value || this.bIsDirty) return this.oApp.$MSG("XE_EditingAreaManager.onExit")};
-		//jQuery(window).bind("beforeunload", jQuery.fnBind(fOnBeforeUnload, this));
-	},
-
-	$AFTER_MSG_APP_READY : function(){
-		this.oApp.exec("UPDATE_IR_FIELD", []);
-	},
-
-	$ON_LOAD_IR_FIELD : function(bDontAddUndo){
-		this.oApp.setIR(this.oIRField.value, bDontAddUndo);
-	},
-
-	$ON_UPDATE_IR_FIELD : function(){
-		this.oIRField.value = this.oApp.getIR();
-	},
-
-	$BEFORE_CHANGE_EDITING_MODE : function(sMode){
-		this._oPrevActivePlugin = this.oActivePlugin;
-		this.oActivePlugin = this.oEditingMode[sMode];
-	},
-
-	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		if(this._oPrevActivePlugin){
-			var sIR = this._oPrevActivePlugin.getIR();
-			this.oApp.exec("SET_IR", [sIR]);
-
-			this.oApp.exec("ENABLE_UI", [this._oPrevActivePlugin.sMode]);
-
-			this._setEditingAreaDimension();
-		}
-		this.oApp.exec("DISABLE_UI", [this.oActivePlugin.sMode]);
-
-		if(!bNoFocus){
-			this.oApp.exec("FOCUS", []);
-		}
-	},
-
-	$ON_SET_IS_DIRTY : function(bIsDirty){
-		this.bIsDirty = bIsDirty;
-	},
-
-	$ON_FOCUS : function(){
-		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
-
-		this.oActivePlugin.focus();
-	},
-
-	$BEFORE_SET_IR : function(sIR, bDontAddUndoHistory){
-		bDontAddUndoHistory = bDontAddUndoHistory || false;
-		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
-	},
-
-	$ON_SET_IR : function(sIR){
-		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
-
-		this.oActivePlugin.setIR(sIR);
-	},
-
-	$AFTER_SET_IR : function(sIR, bDontAddUndoHistory){
-		bDontAddUndoHistory = bDontAddUndoHistory || false;
-		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
-	},
-
-	$ON_REGISTER_EDITING_AREA : function(oEditingAreaPlugin){
-		this.oEditingMode[oEditingAreaPlugin.sMode] = oEditingAreaPlugin;
-		this.attachDocumentEvents(oEditingAreaPlugin.oEditingArea);
-	},
-
-	$ON_MSG_EDITING_AREA_RESIZE_STARTED : function(){
-		this.oActivePlugin.elEditingArea.style.display = "none";
-
-		this.iStartingHeight = parseInt(this.elEditingAreaContainer.style.height);
-	},
-
-	$ON_RESIZE_EDITING_AREA: function(ipNewWidth, ipNewHeight){
-		var iNewWidth = parseInt(ipNewWidth);
-		var iNewHeight = parseInt(ipNewHeight);
-
-		if(iNewWidth < this.niMinWidth) iNewWidth = this.niMinWidth;
-		if(iNewHeight < this.nMinHeight) iNewHeight = this.nMinHeight;
-
-		if(ipNewWidth) this.elEditingAreaContainer.style.width = iNewWidth + "px";
-		if(ipNewHeight) this.elEditingAreaContainer.style.height = iNewHeight + "px";
-	},
-
-	$ON_RESIZE_EDITING_AREA_BY : function(ipWidthChange, ipHeightChange){
-		var iWidthChange = parseInt(ipWidthChange);
-		var iHeightChange = parseInt(ipHeightChange);
-
-		var iWidth = this.elEditingAreaContainer.style.width?parseInt(this.elEditingAreaContainer.style.width)+iWidthChange:null;
-		var iHeight = this.elEditingAreaContainer.style.height?this.iStartingHeight+iHeightChange:null;
-
-		this.oApp.exec("RESIZE_EDITING_AREA", [iWidth, iHeight]);
-	},
-
-	$ON_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
-		this.oActivePlugin.elEditingArea.style.display = "block";
-		this._setEditingAreaDimension();
-	},
-
-	_setEditingAreaDimension : function(){
-		this.oActivePlugin.elEditingArea.style.height = this.elEditingAreaContainer.style.height;
-		this.oActivePlugin.elEditingArea.style.width = this.elEditingAreaContainer.style.width;
-	},
-
-	attachDocumentEvents : function(doc){
-		this.oApp.registerBrowserEvent(doc, "click", "EVENT_EDITING_AREA_CLICK");
-		this.oApp.registerBrowserEvent(doc, "mousedown", "EVENT_EDITING_AREA_MOUSEDOWN");
-		this.oApp.registerBrowserEvent(doc, "mousemove", "EVENT_EDITING_AREA_MOUSEMOVE");
-		this.oApp.registerBrowserEvent(doc, "mouseup", "EVENT_EDITING_AREA_MOUSEUP");
-		this.oApp.registerBrowserEvent(doc, "keydown", "EVENT_EDITING_AREA_KEYDOWN");
-		this.oApp.registerBrowserEvent(doc, "keypress", "EVENT_EDITING_AREA_KEYPRESS");
-		this.oApp.registerBrowserEvent(doc, "keyup", "EVENT_EDITING_AREA_KEYUP");
-	},
-
-	getIR : function(){
-		return this.oActivePlugin.getIR();
-	},
-
-	setIR : function(sIR, bDontAddUndo){
-		this.oApp.exec("SET_IR", [sIR, bDontAddUndo]);
-	},
-
-	getEditingMode : function(){
-		return this.oActivePlugin.sMode;
-	}
-});
-//}
-
-//{
-/**
-  * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to editing the HTML source code using Textarea element
- * @name hp_XE_EditingArea_HTMLSrc.js
- * @required XE_EditingAreaManager
- */
-xe.XE_EditingArea_HTMLSrc = jQuery.Class({
-	name : "XE_EditingArea_HTMLSrc",
-
-	sMode : "HTMLSrc",
-	textarea : null,
-
-	$init : function(textarea){
-		this.textarea = jQuery.$(textarea);
-		this.elEditingArea = this.textarea;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oEditingArea = this.textarea;
-		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		if(sMode == this.sMode){
-			this.textarea.style.display = "block";
-		}else{
-			this.textarea.style.display = "none";
-		}
-	},
-
-	$ON_PASTE_HTML : function(sHTML, oPSelection){
-		if(this.oApp.getEditingMode() != this.sMode) return;
-
-		var o = new TextRange(this.textarea);
-		o.paste(sHTML);
-		this.textarea.focus();
-	},
-
-	getIR : function(){
-		var sIR;
-		var sContent = this.textarea.value;
-
-		if(this.oApp.applyConverter)
-			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
-		else
-			sIR = sContent;
-
-		return sIR;
-	},
-
-	setIR : function(sIR){
-		var sContent;
-
-		if(this.oApp.applyConverter)
-			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
-		else
-			sContent = sIR;
-
-		this.textarea.value = sContent;
-	},
-
-	focus : function(){
-		this.textarea.focus();
-	}
-});
-
-var TextRange = function(oEl) {
-	this._o = oEl;
-};
-
-/**
- * Selection for textfield
- *
- * @author hooriza
- */
-TextRange.prototype.getSelection = function() {
-	var obj = this._o;
-	var ret = [ -1, -1 ];
-
-	if (isNaN(this._o.selectionStart)) {
-		obj.focus();
-
-		// textarea support added by nagoon97
-		var range = document.body.createTextRange();
-		var rangeField = null;
-
-		rangeField = document.selection.createRange().duplicate();
-		range.moveToElementText(obj);
-		rangeField.collapse(true);
-		range.setEndPoint("EndToEnd", rangeField);
-		ret[0] = range.text.length;
-
-		rangeField = document.selection.createRange().duplicate();
-		range.moveToElementText(obj);
-		rangeField.collapse(false);
-		range.setEndPoint("EndToEnd", rangeField);
-		ret[1] = range.text.length;
-
-		obj.blur();
-	} else {
-		ret[0] = obj.selectionStart;
-		ret[1] = obj.selectionEnd;
-	}
-
-	return ret;
-};
-
-TextRange.prototype.setSelection = function(start, end) {
-
-	var obj = this._o;
-	if (typeof end == 'undefined') end = start;
-
-	if (obj.setSelectionRange) {
-
-		obj.setSelectionRange(start, end);
-
-	} else if (obj.createTextRange) {
-
-		var range = obj.createTextRange();
-
-		range.collapse(true);
-		range.moveStart("character", start);
-		range.moveEnd("character", end - start);
-		range.select();
-
-		obj.blur();
-	}
-
-};
-
-TextRange.prototype.copy = function() {
-
-	var r = this.getSelection();
-	return this._o.value.substring(r[0], r[1]);
-
-};
-
-TextRange.prototype.paste = function(sStr) {
-
-	var obj = this._o;
-	var sel = this.getSelection();
-
-	var value = obj.value;
-
-	var pre = value.substr(0, sel[0]);
-	var post = value.substr(sel[1]);
-
-	value = pre + sStr + post;
-	obj.value = value;
-
-	var n = 0;
-	if ( typeof document.body.style.maxHeight == "undefined" ) {
-		var a = pre.match( /\n/gi );
-		n = ( a != null ? a.length : 0 );
-	}
-	this.setSelection(sel[0] + sStr.length - n );
-
-};
-
-TextRange.prototype.cut = function() {
-	var r = this.copy();
-	this.paste('');
-
-	return r;
-};
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to WYSIWYG iframe
- * @name hp_XE_EditingArea_WYSIWYG.js
- */
-xe.XE_EditingArea_WYSIWYG = jQuery.Class({
-	name : "XE_EditingArea_WYSIWYG",
-	status : xe.PLUGIN_STATUS["NOT_READY"],
-
-	sMode : "WYSIWYG",
-	iframe : null,
-	doc : null,
-
-	iLastUndoRecorded : 0,
-	iMinUndoInterval : 3000,
-
-	_nIFrameReadyCount : 50,
-
-	$init : function(iframe){
-		this.iframe = jQuery.$(iframe);
-
-		this.initIframe();
-
-		this.elEditingArea = iframe;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oEditingArea = this.doc;
-		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGWindow", jQuery.fnBind(this.getWindow, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGDocument", jQuery.fnBind(this.getDocument, this)]);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		// uncomment this line if you wish to use the IE-style cursor in FF
-		this.getDocument().body.style.cursor = "text";
-
-		if(jQuery.browser.msie){
-			jQuery(this.doc).bind('keydown', jQuery.fnBind(
-				function(weEvent){
-					if(this.doc.selection.type.toLowerCase() == 'control' && weEvent.keyCode == 8)  {
-						this.oApp.exec("EXECCOMMAND", ['delete', false, false]);
-						weEvent.preventDefault(); weEvent.stopPropagation();
-					}
-				}
-			, this));
-			jQuery(this.doc.body).bind('mousedown', jQuery.fnBind(
-				function(weEvent){
-					this._oIERange = null;
-					this._bIERangeReset = true;
-				}
-			, this));
-			/*
-			jQuery(this.doc.body).bind('beforedeactivate', jQuery.fnBind(
-				function(weEvent){
-					// without this, cursor won't make it inside a table.
-					// mousedown(_oIERange gets reset) -> beforedeactivate(gets fired for table) -> RESTORE_IE_SELECTION
-					if(this._bIERangeReset) return;
-
-					var tmpRange = this.getDocument().selection.createRange(0);
-					// Control range does not have parentElement
-					if(tmpRange.parentElement && tmpRange.parentElement() && tmpRange.parentElement().tagName == "INPUT"){
-						this._oIERange = this._oPrevIERange;
-					}else{
-						this._oIERange = tmpRange;
-					}
-				}
-			, this));
-			*/
-			jQuery(this.doc.body).bind('mouseup', jQuery.fnBind(
-				function(weEvent){
-					this._bIERangeReset = false;
-				}
-			, this));
-		}
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		if(sMode == this.sMode){
-			this.iframe.style.display = "block";
-
-			this.oApp.exec("REFRESH_WYSIWYG", []);
-			this.oApp.exec("SET_EDITING_WINDOW", [this.getWindow()]);
-		}else{
-			this.iframe.style.display = "none";
-		}
-	},
-
-	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		this._oIERange = null;
-	},
-
-	$ON_REFRESH_WYSIWYG : function(){
-		if(!jQuery.browser.mozilla) return;
-
-		this._disableWYSIWYG();
-		this._enableWYSIWYG();
-	},
-
-	$ON_ENABLE_WYSIWYG : function(){
-		this._enableWYSIWYG();
-	},
-
-	$ON_DISABLE_WYSIWYG : function(){
-		this._disableWYSIWYG();
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
-		// 33, 34: page up/down, 35,36: end/home, 37,38,39,40: left, up, right, down
-		if(oEvent.keyCode == 229 || oEvent.keyCode == 13 || oEvent.altKey || oEvent.ctrlKey || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 16) return;
-		this._recordUndo(oEvent);
-	},
-
-	$ON_PASTE_HTML : function(sHTML, oPSelection){
-		if(this.oApp.getEditingMode() != this.sMode) return;
-
-		var oSelection = oPSelection || this.oApp.getSelection();
-		oSelection.pasteHTML(sHTML);
-
-		// every browser except for IE may modify the innerHTML when it is inserted
-		if(!jQuery.browser.msie){
-			var sTmpBookmark = oSelection.placeStringBookmark();
-			this.oApp.getWYSIWYGDocument().body.innerHTML = this.oApp.getWYSIWYGDocument().body.innerHTML;
-			oSelection.moveToBookmark(sTmpBookmark);
-			oSelection.collapseToEnd();
-			oSelection.select();
-			oSelection.removeStringBookmark(sTmpBookmark);
-		}
-
-		this.oApp.exec("RECORD_UNDO_ACTION", ["INSERT HTML"]);
-	},
-
-	$AFTER_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
-		this.oApp.exec("REFRESH_WYSIWYG", []);
-	},
-
-	$ON_RESTORE_IE_SELECTION : function(){
-		if(this._oIERange){
-			this._oIERange.select();
-			this._oPrevIERange = this._oIERange;
-			this._oIERange = null;
-		}
-	},
-
-	initIframe : function(){
-		try {
-			this.doc = this.iframe.contentWindow.document;
-			if (this.doc == null || this.doc.location.href == 'about:blank') {
-				throw new Error('Access denied');
-			}
-
-			this._enableWYSIWYG();
-
-			this.status = xe.PLUGIN_STATUS["READY"];
-		} catch(e) {
-			if(this._nIFrameReadyCount-- > 0){
-				setTimeout(jQuery.fnBind(this.initIframe, this), 100);
-			}else{
-				throw("iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ");
-			}
-		}
-	},
-
-	getIR : function(){
-		var sContent = this.doc.body.innerHTML;
-		var sIR;
-
-		if(this.oApp.applyConverter)
-			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
-		else
-			sIR = sContent;
-
-		return sIR;
-	},
-
-	setIR : function(sIR){
-		var sContent;
-		if(this.oApp.applyConverter)
-			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
-		else
-			sContent = sIR;
-
-		this.doc.body.innerHTML = sContent;
-
-		if(jQuery.browser.mozilla){
-			if(this.doc.body.innerHTML == "") this.doc.body.innerHTML = "<br>";
-		}
-	},
-
-	getWindow : function(){
-		return this.iframe.contentWindow;
-	},
-
-	getDocument : function(){
-		return this.iframe.contentWindow.document;
-	},
-
-	focus : function(){
-		this.getWindow().focus();
-		this.oApp.exec("RESTORE_IE_SELECTION", []);
-	},
-
-	_recordUndo : function(oKeyInfo){
-		var curTime = new Date();
-		if(curTime-this.iLastUndoRecorded < this.iMinUndoInterval) return;
-		this.oApp.exec("RECORD_UNDO_ACTION", ["KEYPRESS"]);
-
-		this.iLastUndoRecorded = new Date();
-
-		this.prevKeyCode = oKeyInfo.keyCode;
-	},
-
-	_enableWYSIWYG : function(){
-		if (jQuery.browser.msie){
-			var fake = jQuery('<input type="text" style="position:absolute;width:1px;height:1px;left:-9px">');
-			jQuery(document.body).prepend(fake);
-			fake.focus();
-
-			this.getDocument().body.contentEditable = true;
-
-			setTimeout(function(){fake.remove()}, 100);
-		} else {
-			this.getDocument().designMode = "on";
-		}
-	},
-
-	_disableWYSIWYG : function(){
-		if (jQuery.browser.msie){
-			this.getDocument().body.contentEditable = false;
-		} else {
-			this.getDocument().designMode = "off";
-		}
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to resizing the editing area vertically
- * @name hp_XE_EditingAreaVerticalResizer.js
- */
-xe.XE_EditingAreaVerticalResizer = jQuery.Class({
-	name : "XE_EditingAreaVerticalResizer",
-	oResizeGrip : null,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-
-		this.$FnMouseDown = jQuery.fnBind(this._mousedown, this);
-		this.$FnMouseMove = jQuery.fnBind(this._mousemove, this);
-		this.$FnMouseUp = jQuery.fnBind(this._mouseup, this);
-
-		jQuery(this.oResizeGrip).bind("mousedown", this.$FnMouseDown);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = jQuery.$(oAppContainer) || document;
-
-		this.oResizeGrip = jQuery(".xpress_xeditor_editingArea_verticalResizer", oAppContainer).get(0);
-	},
-
-	_mousedown : function(oEvent){
-		this.iStartHeight = oEvent.clientY;
-
-		jQuery(document).bind("mousemove", this.$FnMouseMove);
-		jQuery(document).bind("mouseup", this.$FnMouseUp);
-
-		this.oApp.exec("MSG_EDITING_AREA_RESIZE_STARTED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
-	},
-
-	_mousemove : function(oEvent){
-		var iHeightChange = oEvent.clientY - this.iStartHeight;
-
-		this.oApp.exec("RESIZE_EDITING_AREA_BY", [0, iHeightChange]);
-	},
-
-	_mouseup : function(oEvent){
-		jQuery(document).unbind("mousemove", this.$FnMouseMove);
-		jQuery(document).unbind("mouseup", this.$FnMouseUp);
-
-		this.oApp.exec("MSG_EDITING_AREA_RESIZE_ENDED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the basic editor commands
- * @name hp_XE_ExecCommand.js
- */
-xe.XE_ExecCommand = jQuery.Class({
-	name : "XE_ExecCommand",
-	oEditingArea : null,
-
-	$init : function(oEditingArea){
-		this.oEditingArea = oEditingArea;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		// the right document will be available only when the src is completely loaded
-		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
-			this.oEditingArea = this.oEditingArea.contentWindow.document;
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+b", "EXECCOMMAND", ["bold", false, false]]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+u", "EXECCOMMAND", ["underline", false, false]]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+i", "EXECCOMMAND", ["italic", false, false]]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+d", "EXECCOMMAND", ["strikethrough", false, false]]);
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["bold", "click", "EXECCOMMAND", ["bold", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["underline", "click", "EXECCOMMAND", ["underline", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["italic", "click", "EXECCOMMAND", ["italic", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["lineThrough", "click", "EXECCOMMAND", ["strikethrough", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["superscript", "click", "EXECCOMMAND", ["superscript", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["subscript", "click", "EXECCOMMAND", ["subscript", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifyleft", "click", "EXECCOMMAND", ["justifyleft", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifycenter", "click", "EXECCOMMAND", ["justifycenter", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifyright", "click", "EXECCOMMAND", ["justifyright", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifyfull", "click", "EXECCOMMAND", ["justifyfull", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["orderedlist", "click", "EXECCOMMAND", ["insertorderedlist", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["unorderedlist", "click", "EXECCOMMAND", ["insertunorderedlist", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["outdent", "click", "EXECCOMMAND", ["outdent", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["indent", "click", "EXECCOMMAND", ["indent", false, false]]);
-	},
-
-	$BEFORE_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
-		this._bOnlyCursorChanged = false;
-
-		this.oApp.exec("FOCUS", []);
-
-		if(sCommand.match(/^bold|underline|italic|strikethrough|superscript|subscript$/i)){
-			var oSelection = this.oApp.getSelection();
-			if(oSelection.collapsed) this._bOnlyCursorChanged = true;
-		}
-
-		if(!this._bOnlyCursorChanged){
-			this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", [sCommand]);
-		}
-	},
-
-	$ON_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
-		bUserInterface = (bUserInterface == "" || bUserInterface)?bUserInterface:false;
-		vValue = (vValue == "" || vValue)?vValue:false;
-
-		this.oEditingArea.execCommand(sCommand, bUserInterface, vValue);
-	},
-
-	$AFTER_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
-		if(!this._bOnlyCursorChanged){
-			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", [sCommand]);
-		}
-
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to styling the font
- * @name hp_XE_WYSIWYGStyler.js
- * @required XE_EditingArea_WYSIWYG, XpressRangeManager
- */
-xe.XE_WYSIWYGStyler = jQuery.Class({
-	name : "XE_WYSIWYGStyler",
-
-	$PRECONDITION : function(sFullCommand, aArgs){
-		return (this.oApp.getEditingMode() == "WYSIWYG");
-	},
-
-	$ON_SET_WYSIWYG_STYLE : function(oStyles){
-		var oSelection = this.oApp.getSelection();
-
-		// style cursor
-		if(oSelection.collapsed){
-			var oSpan = this.oApp.getWYSIWYGDocument().createElement("SPAN");
-			oSelection.insertNode(oSpan);
-			oSpan.innerHTML = unescape("%uFEFF");
-
-			var sValue;
-			for(var sName in oStyles){
-				sValue = oStyles[sName];
-
-				if(typeof sValue != "string") continue;
-
-				oSpan.style[sName] = sValue;
-			}
-
-			oSelection.selectNodeContents(oSpan);
-			oSelection.collapseToEnd();
-			oSelection._window.focus();
-			oSelection._window.document.body.focus();
-			oSelection.select();
-
-			// FF3 will actually display %uFEFF when it is followed by a number AND certain font-family is used(like Gulim), so remove the chcaracter for FF3
-			if(jQuery.browser.mozilla && jQuery.browser.nVersion == 3)
-				oSpan.innerHTML = "";
-
-			return;
-		}
-
-		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["FONT STYLE"]);
-
-		oSelection.styleRange(oStyles);
-		oSelection._window.focus();
-		oSelection.select();
-
-		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["FONT STYLE"]);
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to detecting the style change
- * @name hp_XE_WYSIWYGStyleGetter.js
- */
-xe.XE_WYSIWYGStyleGetter = jQuery.Class({
-	name : "XE_WYSIWYGStyleGetter",
-
-	hKeyUp : null,
-
-	getStyleInterval : 200,
-
-	oStyleMap : {
-		fontFamily : {
-			type : "Value",
-			css : "fontFamily"
-		},
-		fontSize : {
-			type : "Value",
-			css : "fontSize"
-		},
-		lineHeight : {
-			type : "Value",
-			css : "lineHeight",
-			converter : function(sValue, oStyle){
-				if(!sValue.match(/px$/)) return sValue;
-
-				return Math.ceil((parseInt(sValue)/parseInt(oStyle.fontSize))*10)/10;
-			}
-		},
-		bold : {
-			command : "bold"
-		},
-		underline : {
-			command : "underline"
-		},
-		italic : {
-			command : "italic"
-		},
-		lineThrough : {
-			command : "strikethrough"
-		},
-		superscript : {
-			command : "superscript"
-		},
-		subscript : {
-			command : "subscript"
-		},
-		justifyleft : {
-			command : "justifyleft"
-		},
-		justifycenter : {
-			command : "justifycenter"
-		},
-		justifyright : {
-			command : "justifyright"
-		},
-		justifyfull : {
-			command : "justifyfull"
-		},
-		orderedlist : {
-			command : "insertorderedlist"
-		},
-		unorderedlist : {
-			command : "insertunorderedlist"
-		}
-	},
-
-	$init : function(){
-		this.oStyle = this._getBlankStyle();
-	},
-
-	$PRECONDITION : function(){
-		if(this.oApp.getEditingMode() != "WYSIWYG") return false;
-
-		return true;
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oDocument = this.oApp.getWYSIWYGDocument();
-		this.oApp.exec("ADD_APP_PROPERTY", ["getCurrentStyle", jQuery.fnBind(this.getCurrentStyle, this)]);
-	},
-
-	$ON_EVENT_EDITING_AREA_MOUSEUP : function(oEvnet){
-		if(this.hKeyUp) clearTimeout(this.hKeyUp);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
-		/*
-		backspace 8
-		page up 33
-		page down 34
-		end 35
-		home 36
-		left arrow 37
-		up arrow 38
-		right arrow 39
-		down arrow 40
-		insert 45
-		delete 46
-		*/
-		if(!(oEvent.keyCode == 8 || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 45 || oEvent.keyCode == 46)) return;
-
-		if(this.hKeyUp) clearTimeout(this.hKeyUp);
-
-		this.hKeyUp = setTimeout(jQuery.fnBind(this.oApp.exec, this.oApp, "CHECK_STYLE_CHANGE", []), this.getStyleInterval);
-	},
-
-	$ON_CHECK_STYLE_CHANGE : function(){
-		this._getStyle();
-	},
-
-	$ON_RESET_STYLE_STATUS : function(){
-		var oBlankStyle = this._getBlankStyle();
-		for(var sAttributeName in oBlankStyle)
-			this.oApp.exec("SET_STYLE_STATUS", [sAttributeName, oBlankStyle[sAttributeName]]);
-	},
-
-	getCurrentStyle : function(){
-		return this.oStyle;
-	},
-
-	_check_style_change : function(){
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-	_getBlankStyle : function(){
-		var oBlankStyle = {};
-		for(var attributeName in this.oStyleMap){
-			if(this.oStyleMap[attributeName].type == "Value")
-				oBlankStyle[attributeName] = "";
-			else
-				oBlankStyle[attributeName] = 0;
-		}
-
-		return oBlankStyle;
-	},
-
-	_getStyle : function(){
-		var oSelection = this.oApp.getSelection();
-
-		var funcFilter = function(oNode){
-			if (!oNode.childNodes || oNode.childNodes.length == 0)
-				return true;
-			else
-				return false;
-		}
-
-		var aBottomNodes = oSelection.getNodes(false, funcFilter);
-
-		var oStyle, oBaseStyle, oTmpStyle, attributeName;
-		if(aBottomNodes.length == 0){
-			oStyle = this._getStyleOf(oSelection.commonAncestorContainer);
-		}else{
-			oStyle = this._getStyleOf(aBottomNodes[0]);
-		}
-
-		for(attributeName in oStyle){
-			if(this.oStyleMap[attributeName].converter){
-				oStyle[attributeName] = this.oStyleMap[attributeName].converter(oStyle[attributeName], oStyle);
-			}
-
-			if(this.oStyle[attributeName] != oStyle[attributeName])
-				this.oApp.exec("MSG_STYLE_CHANGED", [attributeName, oStyle[attributeName]]);
-		}
-
-		this.oStyle = oStyle;
-	},
-
-	_getStyleOf : function(oNode){
-		var oStyle = this._getBlankStyle();
-
-		// this must not happen
-		if(!oNode) return oStyle;
-
-		if(oNode.nodeType == 3) oNode = oNode.parentNode;
-
-		var welNode = jQuery(oNode);
-		var attribute, cssName;
-		for(var styleName in this.oStyle){
-			attribute = this.oStyleMap[styleName];
-
-			if(attribute.type && attribute.type == "Value"){
-				if(attribute.css){
-					var sValue = welNode.css(attribute.css);
-
-					if(styleName == "fontFamily"){
-						sValue = sValue.split(/,/)[0];
-					}
-
-					oStyle[styleName] = sValue;
-				}else{
-					if(attribute.command){
-						try{
-							oStyle[styleName] = this.oDocument.queryCommandState(attribute.command);
-						}catch(e){}
-					}else{
-						// todo
-					}
-				}
-			}else{
-				if(attribute.command){
-					try{
-						if(this.oDocument.queryCommandState(attribute.command)){
-							oStyle[styleName] = 1;
-						}else{
-							oStyle[styleName] = 0;
-						}
-					}catch(e){}
-				}else{
-					// todo
-				}
-			}
-		}
-		return oStyle;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font size using Select element
- * @name hp_XE_FontSizeWithSelectUI.js
- */
-xe.XE_FontSizeWithSelectUI = jQuery.Class({
-	name : "XE_FontSizeWithSelectUI",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elFontSizeSelect = jQuery("SELECT.xpress_xeditor_ui_fontSize_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elFontSizeSelect, "change", "SET_FONTSIZE_FROM_SELECT_UI");
-		this.elFontSizeSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		if(sAttributeName == "fontSize"){
-			this.elFontSizeSelect.value = sAttributeValue;
-			if(this.elFontSizeSelect.selectedIndex < 0) this.elFontSizeSelect.selectedIndex = 0;
-		}
-	},
-
-	$ON_SET_FONTSIZE_FROM_SELECT_UI : function(){
-		var sFontSize = this.elFontSizeSelect.value;
-		if(!sFontSize) return;
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontSize":sFontSize}]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font name using Select element
- * @name hp_XE_FontNameWithSelectUI.js
- */
-xe.XE_FontNameWithSelectUI = jQuery.Class({
-	name : "XE_FontNameWithSelectUI",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elFontNameSelect = jQuery("SELECT.xpress_xeditor_ui_fontName_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elFontNameSelect, "change", "SET_FONTNAME_FROM_SELECT_UI");
-		this.elFontNameSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		if(sAttributeName == "fontFamily"){
-			this.elFontNameSelect.value = sAttributeValue.toLowerCase();
-			if(this.elFontNameSelect.selectedIndex < 0) this.elFontNameSelect.selectedIndex = 0;
-		}
-	},
-
-	$ON_SET_FONTNAME_FROM_SELECT_UI : function(){
-		var sFontName = this.elFontNameSelect.value;
-		if(!sFontName) return;
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontFamily":sFontName}]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to setting/changing the lineheight
- * @name hp_XE_LineHeight.js
- */
-xe.XE_LineHeight = jQuery.Class({
-	name : "XE_LineHeight",
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-	},
-
-	$ON_SET_LINEHEIGHT : function(nLineHeight){
-		this.setLineHeight(nLineHeight);
-	},
-
-	getLineHeight : function(){
-		var nodes = this._getSelectedNodes(false);
-
-		var curWrapper, prevWrapper;
-		var iCurHeight, iHeight;
-
-		if(nodes.length == 0) return -1;
-
-		var iLength = nodes.length;
-
-		if(iLength == 0){
-			iHeight = -1;
-		}else{
-			prevWrapper = this._getLineWrapper(nodes[0]);
-			iHeight = this._getWrapperLineheight(prevWrapper);
-		}
-
-		var firstNode = this.oSelection.getStartNode();
-
-		if(iHeight > 0){
-			for(var i=1; i<iLength; i++){
-				if(this._isChildOf(nodes[i], curWrapper)) continue;
-				if(!nodes[i]) continue;
-
-				curWrapper = this._getLineWrapper(nodes[i]);
-				if(curWrapper == prevWrapper) continue;
-
-				curHeight = this._getWrapperLineheight(curWrapper);
-
-				if(curHeight != iHeight){
-					iHeight = -1;
-					break;
-				}
-
-				prevWrapper = curWrapper;
-			}
-		}
-
-		curWrapper = this._getLineWrapper(nodes[iLength-1]);
-
-		var lastNode = this.oSelection.getEndNode();
-
-		selectText = jQuery.fnBind(function(firstNode, lastNode){
-			this.oSelection.setEndNodes(firstNode, lastNode);
-			this.oSelection.select();
-		}, this, firstNode, lastNode);
-
-		setTimeout(selectText, 100);
-
-		return iHeight;
-	},
-
-	// height in percentage. For example pass 1 to set the line height to 100% and 1.5 to set it to 150%
-	setLineHeight : function(height) {
-		thisRef = this;
-
-		function _setLineheight(div, height){
-			if(!div){
-				// try to wrap with P first
-				try{
-					div = thisRef.oSelection.surroundContentsWithNewNode("P");
-				// if the range contains a block-level tag, wrap it with a DIV
-				}catch(e){
-					div = thisRef.oSelection.surroundContentsWithNewNode("DIV");
-				}
-			}
-
-			div.style.lineHeight = height;
-
-			return div;
-		}
-
-		function isInBody(node){
-			while(node && node.tagName != "BODY"){
-				node = xe.DOMFix.parentNode(node);
-			}
-			if(!node) return false;
-
-			return true;
-		}
-
-		var nodes = this._getSelectedNodes(false);
-		if(nodes.length == 0){
-			return;
-		}
-
-		var curWrapper, prevWrapper;
-		var iLength = nodes.length;
-
-		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["LINEHEIGHT"]);
-
-		prevWrapper = this._getLineWrapper(nodes[0]);
-		prevWrapper = _setLineheight(prevWrapper, height);
-
-		var startNode = prevWrapper;
-		var endNode = prevWrapper;
-
-		for(var i=1; i<iLength; i++){
-			// Skip the node if a copy of the node were wrapped and the actual node no longer exists within the document.
-			try{
-				if(!isInBody(xe.DOMFix.parentNode(nodes[i]))) continue;
-			}catch(e){continue;}
-
-			if(this._isChildOf(nodes[i], curWrapper)) continue;
-
-			curWrapper = this._getLineWrapper(nodes[i]);
-
-			if(curWrapper == prevWrapper) continue;
-
-			curWrapper = _setLineheight(curWrapper, height);
-
-			prevWrapper = curWrapper;
-		}
-
-		endNode = curWrapper || startNode;
-
-		setTimeout(jQuery.fnBind(function(startNode, endNode){
-			this.oSelection.setEndNodes(startNode, endNode);
-			this.oSelection.select();
-			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["LINEHEIGHT"]);
-		}, this, startNode, endNode), 100);
-	},
-	_getSelectedNodes : function(bDontUpdate){
-		if(!bDontUpdate)
-			this.oSelection = this.oApp.getSelection();
-
-		if(this.oSelection.collapsed) this.oSelection.selectNode(this.oSelection.commonAncestorContainer);
-
-		var nodes = this.oSelection.getTextNodes();
-
-		if(nodes.length == 0){
-			var tmp = this.oSelection.getStartNode();
-			if(tmp){
-				nodes[0] = tmp;
-			}else{
-				nodes = [];
-			}
-		}
-
-		return nodes;
-	},
-	_getWrapperLineheight : function(div){
-		var iLineHeight = '';
-		if(div && div.style.lineHeight){
-			iLineHeight = div.style.lineHeight;
-		}else{
-			div = this.oSelection.commonAncesterContainer;
-			while(div && !this.oSelection.rxLineBreaker.test(div.tagName)){
-				if(div && div.style.lineHeight){
-					iLineHeight = div.style.lineHeight;
-					break;
-				}
-				div = xe.DOMFix.parentNode(div);
-			}
-		}
-
-		return iLineHeight;
-	},
-
-	_isChildOf : function(node, container){
-		while(node && node.tagName != "BODY"){
-			if(node == container) return true;
-			node = xe.DOMFix.parentNode(node);
-		}
-
-		return false;
-	},
- 	_getLineWrapper : function(node){
-		var oTmpSelection = this.oApp.getEmptySelection();
-		oTmpSelection.selectNode(node);
-		var oLineInfo = oTmpSelection.getLineInfo();
-		var oStart = oLineInfo.oStart;
-		var oEnd = oLineInfo.oEnd;
-
-		var a, b;
-		var breakerA, breakerB;
-		var div = null;
-
-		a = oStart.oNode;
-		breakerA = oStart.oLineBreaker;
-		b = oEnd.oNode;
-		breakerB = oEnd.oLineBreaker;
-
-		this.oSelection.setEndNodes(a, b);
-
-		if(breakerA == breakerB){
-			if(breakerA.tagName == "P" || breakerA.tagName == "DIV"){
-				div = breakerA;
-			}else{
-				this.oSelection.setEndNodes(breakerA.firstChild, breakerA.lastChild);
-			}
-		}
-
-		return div;
- 	}
- });
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the lineheight using Select element
- * @name hp_XE_LineHeightWithSelectUI.js
- */
-xe.XE_LineHeightWithSelectUI = jQuery.Class({
-	name : "XE_LineHeightWithSelectUI",
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elLineHeightSelect = jQuery("SELECT.xpress_xeditor_ui_lineHeight_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elLineHeightSelect, "change", "SET_LINEHEIGHT_FROM_SELECT_UI");
-		this.elLineHeightSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		if(sAttributeName == "lineHeight"){
-			this.elLineHeightSelect.value = sAttributeValue;
-			if(this.elLineHeightSelect.selectedIndex < 0) this.elLineHeightSelect.selectedIndex = 0;
-		}
-	},
-
-	$ON_SET_LINEHEIGHT_FROM_SELECT_UI : function(){
-		var nLineHeight = this.elLineHeightSelect.value;
-		if(!nLineHeight) return;
-
-		this.elLineHeightSelect.selectedIndex = 0;
-		this.oApp.exec("SET_LINEHEIGHT", [nLineHeight]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-}).extend(xe.XE_LineHeight);
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to the color palette
- * @name hp_XE_ColorPalette.js
- */
- xe.XE_ColorPalette = jQuery.Class({
-	name : "XE_ColorPalette",
-	rxRGBColorPattern : /rgb\((\d+), ?(\d+), ?(\d+)\)/i,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		this.elColorPaletteLayer = jQuery("UL.xpress_xeditor_color_palette", oAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elColorPaletteLayer, "click", "EVENT_MOUSEUP_COLOR_PALETTE");
-	},
-
-	$ON_SHOW_COLOR_PALETTE : function(sCallbackCmd, oLayerContainer){
-		this.sCallbackCmd = sCallbackCmd;
-		this.oLayerContainer = oLayerContainer;
-
-		this.oLayerContainer.insertBefore(this.elColorPaletteLayer, null);
-
-		this.elColorPaletteLayer.style.display = "block";
-	},
-
-	$ON_HIDE_COLOR_PALETTE : function(){
-		this.elColorPaletteLayer.style.display = "none";
-	},
-
-	$ON_COLOR_PALETTE_APPLY_COLOR : function(sColorCode){
-		if(this.rxRGBColorPattern.test(sColorCode)){
-
-			function dec2Hex(sDec){
-				var sTmp = parseInt(sDec).toString(16);
-				if(sTmp.length<2) sTmp = "0"+sTmp;
-				return sTmp.toUpperCase();
-			}
-
-			var sR = dec2Hex(RegExp.$1);
-			var sG = dec2Hex(RegExp.$2);
-			var sB = dec2Hex(RegExp.$3);
-			sColorCode = "#"+sR+sG+sB;
-		}
-		this.oApp.exec(this.sCallbackCmd, [sColorCode]);
-	},
-
-	$ON_EVENT_MOUSEUP_COLOR_PALETTE : function(oEvent){
-		var elButton = oEvent.target;
-		if(! elButton.style.backgroundColor) return;
-
-		this.oApp.exec("COLOR_PALETTE_APPLY_COLOR", [elButton.style.backgroundColor]);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font color
- * @name hp_XE_FontColor.js
- */
-xe.XE_FontColor = jQuery.Class({
-	name : "XE_FontColor",
-	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_fontcolor_layer", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["fontColor", "click", "TOGGLE_FONTCOLOR_LAYER"]);
-	},
-
-	$ON_TOGGLE_FONTCOLOR_LAYER : function(){
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_FONTCOLOR", this.elDropdownLayer]]);
-	},
-
-	$ON_APPLY_FONTCOLOR : function(sFontColor){
-		if(!this.rxColorPattern.test(sFontColor)){
-			alert(this.oApp.$MSG("XE_FontColor.invalidColorCode"));
-			return;
-		}
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [{"color":sFontColor}]);
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER");
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of changing the background color
- * @name hp_XE_BGColor.js
- */
-xe.XE_BGColor = jQuery.Class({
-	name : "XE_BGColor",
-	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_bgcolor_layer", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["bgColor", "click", "TOGGLE_BGCOLOR_LAYER"]);
-
-		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_BGCOLOR", []);
-	},
-
-	$ON_TOGGLE_BGCOLOR_LAYER : function(){
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_BGCOLOR", this.elDropdownLayer]]);
-	},
-
-	$ON_EVENT_APPLY_BGCOLOR : function(weEvent){
-		var elButton = weEvent.target;
-
-		// Safari/Chrome/Opera may capture the event on Span
-		if(elButton.tagName == "SPAN") elButton = elButton.parentNode;
-		if(elButton.tagName != "BUTTON") return;
-
-		var sBGColor, sFontColor;
-
-		sBGColor = elButton.style.backgroundColor;
-		sFontColor = elButton.style.color;
-
-		this.oApp.exec("APPLY_BGCOLOR", [sBGColor, sFontColor]);
-	},
-
-	$ON_APPLY_BGCOLOR : function(sBGColor, sFontColor){
-		if(!this.rxColorPattern.test(sBGColor)){
-			alert(this.oApp.$MSG("XE_BGColor.invalidColorCode"));
-			return;
-		}
-
-		var oStyle = {"backgroundColor": sBGColor}
-		if(sFontColor) oStyle.color = sFontColor;
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [oStyle]);
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER");
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to quote
- * @name hp_XE_Quote.js
- * @required XE_EditingArea_WYSIWYG
- */
-xe.XE_Quote = jQuery.Class({
-	name : "XE_Quote",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_blockquote_layer", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY: function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["quote", "click", "TOGGLE_BLOCKQUOTE_LAYER"]);
-
-		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_SEDITOR_BLOCKQUOTE", []);
-	},
-
-	$ON_TOGGLE_BLOCKQUOTE_LAYER : function(){
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
-	},
-
-	$ON_EVENT_APPLY_SEDITOR_BLOCKQUOTE : function(weEvent){
-		var elButton = weEvent.target;
-		if(elButton.tagName != "BUTTON") return;
-
-		var sClass = elButton.parentNode.className;
-
-		if(sClass != "q8")
-			this._wrapBlock("BLOCKQUOTE", sClass);
-		else
-			this._unwrapBlock("BLOCKQUOTE");
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	_unwrapBlock : function(tag){
-		var oSelection = this.oApp.getSelection();
-		var oC = oSelection.commonAncestorContainer;
-
-		while(oC && oC.tagName != tag) oC = oC.parentNode;
-		if(!oC) return;
-
-		while(oC.firstChild) oC.parentNode.insertBefore(oC.firstChild, oC);
-
-		oC.parentNode.removeChild(oC);
-	},
-
-	_wrapBlock : function(tag, className){
-		var oSelection = this.oApp.getSelection();
-		var oLineInfo = oSelection.getLineInfo();
-		var oStart = oLineInfo.oStart;
-		var oEnd = oLineInfo.oEnd;
-
-		var rxDontUseAsWhole = /BODY|TD|LI/i;
-
-		var oStartNode, oEndNode;
-
-		if(oStart.bParentBreak && !rxDontUseAsWhole.test(oStart.oLineBreaker.tagName)) oStartNode = oStart.oNode.parentNode;
-		else oStartNode = oStart.oNode;
-
-		if(oEnd.bParentBreak && !rxDontUseAsWhole.test(oEnd.oLineBreaker.tagName)) oEndNode = oEnd.oNode.parentNode;
-		else oEndNode = oEnd.oNode;
-
-		oSelection.setStartBefore(oStartNode);
-		oSelection.setEndAfter(oEndNode);
-
-		var oNode = this._expandToTableStart(oSelection, oEndNode);
-		if(oNode){
-			oEndNode = oNode;
-			oSelection.setEndAfter(oNode);
-		}
-
-		oNode = this._expandToTableStart(oSelection, oStartNode);
-		if(oNode){
-			oStartNode = oNode;
-			oSelection.setStartBefore(oNode);
-		}
-
-		oNode = oStartNode;
-		var oC = oSelection.commonAncestorContainer;
-
-		// find the insertion position for the formatting tag right beneath the common ancestor container
-		while(oNode && oNode != oC && oNode.parentNode != oC) oNode = oNode.parentNode;
-
-		oFormattingNode = oSelection._document.createElement(tag);
-		if(className) oFormattingNode.className = className;
-
-		if(oNode == oC){
-			oC.insertBefore(oFormattingNode, oC.firstChild);
-		}else{
-			oC.insertBefore(oFormattingNode, oNode);
-		}
-
-		oSelection.setStartAfter(oFormattingNode);
-
-		oSelection.setEndAfter(oEndNode);
-		oSelection.surroundContents(oFormattingNode);
-
-		var aNodes = oFormattingNode.childNodes;
-		var oInsertionPoint;
-		for(var i=aNodes.length-1; i>=0; i--){
-			if(aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR"){
-				var oP = oSelection._document.createElement("P");
-				oInsertionPoint = aNodes[i].nextSibling;
-				while(i>=0 && aNodes[i] && (aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR")){
-					oP.insertBefore(aNodes[i--], oP.firstChild);
-				}
-				oFormattingNode.insertBefore(oP, oInsertionPoint);
-				i++;
-			}
-		}
-
-		if(oFormattingNode && oFormattingNode.parentNode){
-			var oP = oSelection._document.createElement("P");
-			oP.innerHTML = unescape("<br/>");
-			oFormattingNode.parentNode.insertBefore(oP, oFormattingNode.nextSibling);
-		}
-
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Block Quote"]);
-
-		return oFormattingNode;
-	},
-
-	_expandToTableStart : function(oSelection, oNode){
-		var oC = oSelection.commonAncestorContainer;
-		var oResultNode = null;
-
-		var bLastIteration = false;
-		while(oNode && !bLastIteration){
-			if(oNode == oC) bLastIteration = true;
-
-			if(/TBODY|TFOOT|THEAD|TR/i.test(oNode.tagName)){
-				oResultNode = this._getTableRoot(oNode);
-				break;
-			}
-			oNode = oNode.parentNode;
-		}
-
-		return oResultNode;
-	},
-
-	_getTableRoot : function(oNode){
-		while(oNode && oNode.tagName != "TABLE") oNode = oNode.parentNode;
-
-		return oNode;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to inserting special characters
- * @name hp_XE_SCharacter.js
- * @required XpressRangeManager
- */
-xe.XE_SCharacter = jQuery.Class({
-	name : "XE_SCharacter",
-
-	$init : function(oAppContainer){
-		this.bIE = jQuery.browser.msie;
-
-		this._assignHTMLObjects(oAppContainer);
-
-		this.charSet = [];
-		this.charSet[0] = unescape('FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[1] = unescape('%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[2] = unescape('3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[3] = unescape('3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[4] = unescape('0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[5] = unescape('3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = jQuery.$(oAppContainer) || document;
-
-		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_sCharacter_layer", oAppContainer).get(0);
-
-		this.oTextField = jQuery("INPUT", this.elDropdownLayer).get(0);
-		this.oInsertButton = jQuery("+ BUTTON", this.oTextField).get(0);
-		this.aCloseButton = jQuery("BUTTON.close", this.elDropdownLayer).get();
-		this.aSCharList = jQuery(".list", this.elDropdownLayer).get();
-		var oLabelUL = jQuery(">UL", this.elDropdownLayer).get(0);
-		this.aLabelA = jQuery("A", oLabelUL).get();
-	},
-
-	$ON_MSG_APP_READY : function(){
-		var funcInsert = jQuery.fnBind(this.oApp.exec, this.oApp, "INSERT_SCHARACTERS", [this.oTextField.value]);
-		jQuery(this.oInsertButton).click(funcInsert, this);
-
-		this.oApp.exec("SET_SCHARACTER_LIST", [this.charSet]);
-
-		for(var i=0; i<this.aLabelA.length; i++){
-			var func = jQuery.fnBind(this.oApp.exec, this.oApp, "CHANGE_SCHARACTER_SET", [i]);
-			jQuery(this.aLabelA[i]).mousedown(func);
-
-			this._stopBrowserEvent(this.aLabelA[i], "click");
-		}
-
-		for(var i=0; i<this.aCloseButton.length; i++){
-			this.oApp.registerBrowserEvent(this.aCloseButton[i], "click", "HIDE_ACTIVE_LAYER", []);
-		}
-
-		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_SCHARACTER_CLICKED", []);
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["sCharacter", "click", "TOGGLE_SCHARACTER_LAYER"]);
-	},
-
-	$ON_TOGGLE_SCHARACTER_LAYER : function(){
-		this.oTextField.value = "";
-		this.oSelection = this.oApp.getSelection();
-
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
-	},
-
-	$ON_EVENT_SCHARACTER_CLICKED : function(weEvent){
-		var elButton = weEvent.target;
-		if(elButton.tagName != "BUTTON") return;
-		if(elButton.parentNode.tagName != "LI") return;
-
-		var sChar = elButton.firstChild.innerHTML;
-
-		this.oApp.exec("SELECT_SCHARACTER", [sChar]);
-	},
-
-	$ON_SELECT_SCHARACTER : function(schar){
-		this.oTextField.value += schar;
-
-		if(this.oTextField.createTextRange){
-			var oTextRange = this.oTextField.createTextRange();
-			oTextRange.collapse(false);
-			oTextRange.select();
-		}else{
-			if(this.oTextField.selectionEnd){
-				this.oTextField.selectionEnd = this.oTextField.value.length;
-				this.oTextField.focus();
-			}
-		}
-	},
-
-	$ON_INSERT_SCHARACTERS : function(){
-		this.oSelection.pasteHTML(this.oTextField.value);
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_CHANGE_SCHARACTER_SET : function(nSCharSet){
-		for(var i=0; i<this.aSCharList.length; i++){
-			if(this.aSCharList[i].style.display == "block"){
-				if(i == nSCharSet) return;
-
-				jQuery(this.aLabelA[i]).removeClass("on");
-				this.aSCharList[i].style.display = "none";
-			}
-		}
-
-		this._drawSCharList(nSCharSet);
-		jQuery(this.aLabelA[nSCharSet]).addClass("on");
-		this.aSCharList[nSCharSet].style.display = "block";
-	},
-
-	$ON_SET_SCHARACTER_LIST : function(charSet){
-		this.charSet = charSet;
-		this.bSCharSetDrawn = new Array(this.charSet.length);
-		this._drawSCharList(0);
-	},
-
-	_drawSCharList : function(i){
-		if(this.bSCharSetDrawn[i]) return;
-		this.bSCharSetDrawn[i] = true;
-
-		var charList = jQuery(this.aSCharList[i]).empty();
-		var button, span;
-
-		jQuery(this.charSet[i]).each(function(idx,ch){
-			var li  = jQuery('<li>');
-			var btn = jQuery('<button type="button"><span>'+unescape(ch)+'</span></button>');
-
-			li.append(btn);
-			charList.append(li);
-		});
-
-		// enable this after Jindo framework is updated
-//		this.oApp.exec("ATTACH_HOVER_EVENTS", [jQuery(">LI>BUTTON", this.aSCharList[i])]).get();
-	},
-
-	_stopBrowserEvent : function(obj, sEvent){
-		jQuery(obj).bind(sEvent, function(e){e.stopPropagation();e.preventDefault();} )
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to Undo/Redo
- * @name hp_XE_UndoRedo.js
- * @required XE_EditingAreaManager, XpressRangeManager
- */
-xe.XE_UndoRedo = jQuery.Class({
-	name : "XE_UndoRedo",
-	actionHistory : null,
-	// this may also be called, lastAdded/lastRestored
-	oCurStateIdx : null,
-	iMinimumSizeChange : 10,
-	sBlankContentsForFF : "<br>",
-
-	$init : function(){
-		this.aUndoHistory = [];
-		this.oCurStateIdx = {nIdx: 0, nStep: 0};
-	},
-
-	$PRECONDITION : function(sCmd){
-		if(sCmd.match(/_DO_RECORD_UNDO_HISTORY_AT$/)) return true;
-
-		try{
-			if(this.oApp.getEditingMode() != "WYSIWYG") return false;
-		}catch(e){
-			return false;
-		}
-
-		return true;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [this.oCurStateIdx, "", "", null]);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.bFF = jQuery.browser.mozilla;
-
-		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoHistory", jQuery.fnBind(this.getUndoHistory, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoStateIdx", jQuery.fnBind(this.getUndoStateIdx, this)]);
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["undo", "click", "UNDO"]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["redo", "click", "REDO"]);
-
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+z", "UNDO"]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+y", "REDO"]);
-	},
-
-	$ON_UNDO : function(){
-		var oTmpStateIdx = {};
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", ["KEYPRESS", false, false, 1]);
-		if(this.oCurStateIdx.nIdx == 0) return;
-
-		if(this.oCurStateIdx.nStep > 0){
-			this.oCurStateIdx.nStep--;
-		}else{
-			var oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-
-			this.oCurStateIdx.nIdx--;
-
-			if(oTmpHistory.nTotalSteps>1){
-				this.oCurStateIdx.nStep = 0;
-			}else{
-				oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-				this.oCurStateIdx.nStep = oTmpHistory.nTotalSteps-1;
-			}
-		}
-
-		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
-
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-
-	$ON_REDO : function(){
-		if(this.oCurStateIdx.nIdx >= this.aUndoHistory.length) return;
-
-		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-		if(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1 && this.oCurStateIdx.nStep >= oCurHistory.nTotalSteps-1) return;
-
-		if(this.oCurStateIdx.nStep < oCurHistory.nTotalSteps-1){
-			this.oCurStateIdx.nStep++;
-		}else{
-			this.oCurStateIdx.nIdx++;
-			oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-			this.oCurStateIdx.nStep = oCurHistory.nTotalSteps-1;
-		}
-
-		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
-
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-	$ON_RECORD_UNDO_ACTION : function(sAction){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction]);
-	},
-
-	$ON_RECORD_UNDO_BEFORE_ACTION : function(sAction){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, true]);
-	},
-
-	$ON_RECORD_UNDO_AFTER_ACTION : function(sAction){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, false]);
-	},
-
-	$ON_RESTORE_UNDO_HISTORY : function(nUndoIdx, nUndoStateStep){
-		this.oCurStateIdx.nIdx = nUndoIdx;
-		this.oCurStateIdx.nStep = nUndoStateStep;
-
-		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-		var sContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
-		var oBookmark = oCurHistory.oBookmark[this.oCurStateIdx.nStep];
-
-		this.oApp.setIR(sContent, true);
-
-		// setting the innerHTML may change the internal DOM structure, so save the value again.
-		var sCurContent = this.oApp.getIR();
-		if(this.bFF && sCurContent == this.sBlankContentsForFF){
-			sCurContent = "";
-		}
-		oCurHistory.sContent[this.oCurStateIdx.nStep] = sCurContent;
-
-		var oSelection = this.oApp.getEmptySelection();
-		if(oSelection.selectionLoaded){
-			if(oBookmark){
-				oSelection.moveToXPathBookmark(oBookmark);
-			}else{
-				oSelection = this.oApp.getEmptySelection();
-			}
-
-			oSelection.select();
-		}
-	},
-
-	$ON_DO_RECORD_UNDO_HISTORY : function(sAction, bTwoStepAction, bBeforeAction, nForceAddUnlessEqual){
-		bTwoStepAction = bTwoStepAction || false;
-		bBeforeAction = bBeforeAction || false;
-		nForceAddUnlessEqual = nForceAddUnlessEqual || 0;
-
-		// if we're in the middle of some action history, remove everything after current idx if any "little" change is made
-		if(!(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1)) nForceAddUnlessEqual = 1;
-
-		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-
-		var sCurContent = this.oApp.getIR();
-		var sHistoryContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
-
-		if(this.bFF && sCurContent == this.sBlankContentsForFF){
-			sCurContent = "";
-		}
-
-		// every TwoStepAction needs to be recorded
-		if(!bTwoStepAction){
-			switch(nForceAddUnlessEqual){
-				case 0:
-					if(Math.abs(sHistoryContent.length - sCurContent.length)<this.iMinimumSizeChange) return;
-					break;
-
-				case 1:
-					if(sHistoryContent == sCurContent) return;
-					break;
-
-				// write at all times
-				case 2:
-					break;
-			}
-		}
-
-		var oSelection = this.oApp.getSelection();
-
-		var oBookmark=null;
-		if(oSelection.selectionLoaded){
-			oBookmark = oSelection.getXPathBookmark();
-		}
-
-		var oInsertionIdx = {nIdx:this.oCurStateIdx.nIdx, nStep:this.oCurStateIdx.nStep};
-		if(bTwoStepAction){
-			if(bBeforeAction){
-				oInsertionIdx.nStep = 0;
-			}else{
-				oInsertionIdx.nStep = 1;
-			}
-		}else{
-			oInsertionIdx.nStep = 0;
-		}
-
-		if(oInsertionIdx.nStep == 0 && this.oCurStateIdx.nStep == oCurHistory.nTotalSteps-1){
-			oInsertionIdx.nIdx = this.oCurStateIdx.nIdx+1;
-		}
-
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [oInsertionIdx, sAction, sCurContent, oBookmark]);
-	},
-
-	$ON_DO_RECORD_UNDO_HISTORY_AT : function(oInsertionIdx, sAction, sContent, oBookmark){
-		if(oInsertionIdx.nStep != 0){
-			this.aUndoHistory[oInsertionIdx.nIdx].nTotalSteps = oInsertionIdx.nStep+1;
-			this.aUndoHistory[oInsertionIdx.nIdx].sContent[oInsertionIdx.nStep] = sContent;
-			this.aUndoHistory[oInsertionIdx.nIdx].oBookmark[oInsertionIdx.nStep] = oBookmark;
-		}else{
-			var oNewHistory = {sAction:sAction, nTotalSteps: 1};
-			oNewHistory.sContent = [];
-			oNewHistory.sContent[0] = sContent;
-
-			oNewHistory.oBookmark = [];
-			oNewHistory.oBookmark[0] = oBookmark;
-			this.aUndoHistory.splice(oInsertionIdx.nIdx, this.aUndoHistory.length - oInsertionIdx.nIdx, oNewHistory);
-		}
-
-		this.oCurStateIdx.nIdx = oInsertionIdx.nIdx;
-		this.oCurStateIdx.nStep = oInsertionIdx.nStep;
-	},
-
-	_getUndoHistory : function(){
-		return this.aUndoHistory;
-	},
-
-	_getUndoStateIdx : function(){
-		return this.oCurStateIdx;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to Find/Replace
- * @name hp_XE_FindReplacePlugin.js
- */
-xe.XE_FindReplacePlugin = jQuery.Class({
-	name : "XE_FindReplacePlugin",
-	oEditingWindow : null,
-	oFindReplace :  null,
-	oUILayer : null,
-	bFindMode : true,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = jQuery.$(oAppContainer) || document;
-
-		this.oEditingWindow = jQuery("IFRAME", oAppContainer).get(0);
-		this.oUILayer = jQuery("DIV.xpress_xeditor_findAndReplace_layer", oAppContainer).get(0);
-
-		var oTmp = jQuery("LI", this.oUILayer).get();
-
-		this.oFindTab = oTmp[0];
-		this.oReplaceTab = oTmp[1];
-
-		oTmp = jQuery(".container > .bx", this.oUILayer).get();
-
-		this.oFindInputSet = oTmp[0];
-		this.oReplaceInputSet = oTmp[1];
-
-		this.oFindInput_Keyword = jQuery("INPUT", this.oFindInputSet).get(0);
-
-		oTmp = jQuery("INPUT", this.oReplaceInputSet).get();
-		this.oReplaceInput_Original = oTmp[0];
-		this.oReplaceInput_Replacement = oTmp[1];
-
-		this.oFindNextButton = jQuery("BUTTON.find_next", this.oUILayer).get(0);
-		this.oCancelButton = jQuery("BUTTON.cancel", this.oUILayer).get(0);
-
-		this.oReplaceButton = jQuery("BUTTON.replace", this.oUILayer).get(0);
-		this.oReplaceAllButton = jQuery("BUTTON.replace_all", this.oUILayer).get(0);
-
-		this.aCloseButtons = jQuery("BUTTON.close", this.oUILayer).get();
-		this.aCloseButtons[this.aCloseButtons.length] = this.oCancelButton;
-	},
-
-	$ON_MSG_APP_READY : function(){
-		// the right document will be available only when the src is completely loaded
-		if(this.oEditingWindow && this.oEditingWindow.tagName == "IFRAME")
-			this.oEditingWindow = this.oEditingWindow.contentWindow;
-
-		this.oFindReplace = new xe.FindReplace(this.oEditingWindow);
-		if(!this.oFindReplace.bBrowserSupported){
-			this.oApp.exec("DISABLE_UI", ["find_replace"]);
-			return;
-		}
-
-		for(var i=0; i<this.aCloseButtons.length; i++){
-			var func = jQuery.fnBind(this.oApp.exec, this.oApp, "HIDE_DIALOG_LAYER", [this.oUILayer]);
-			jQuery(this.aCloseButtons[i]).bind("click", func);
-		}
-
-		jQuery(this.oFindTab).bind("mousedown", jQuery.fnBind(this.oApp.exec, this.oApp, "SHOW_FIND", []));
-		jQuery(this.oReplaceTab).bind("mousedown", jQuery.fnBind(this.oApp.exec, this.oApp, "SHOW_REPLACE", []));
-
-		jQuery(this.oFindNextButton).bind("click", jQuery.fnBind(this.oApp.exec, this.oApp, "FIND", []));
-		jQuery(this.oReplaceButton).bind("click", jQuery.fnBind(this.oApp.exec, this.oApp, "REPLACE", []));
-		jQuery(this.oReplaceAllButton).bind("click", jQuery.fnBind(this.oApp.exec, this.oApp, "REPLACE_ALL", []));
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["findAndReplace", "click", "SHOW_FIND_REPLACE_LAYER"]);
-	},
-
-	$ON_SHOW_ACTIVE_LAYER : function(){
-		this.oApp.exec( "HIDE_DIALOG_LAYER", [this.oUILayer]);
-	},
-
-	$ON_SHOW_FIND_REPLACE_LAYER : function(){
-		this.oApp.exec("SHOW_DIALOG_LAYER", [this.oUILayer]);
-		this.oApp.exec("POSITION_TOOLBAR_LAYER", [this.oUILayer]);
-		this.oApp.exec("HIDE_CURRENT_ACTIVE_LAYER", []);
-	},
-
-	$ON_SHOW_FIND : function(){
-		this.bFindMode = true;
-
-		jQuery(this.oFindTab).addClass("on");
-		jQuery(this.oReplaceTab).removeClass("on");
-
-		jQuery(this.oFindNextButton).removeClass("normal");
-		jQuery(this.oFindNextButton).addClass("strong");
-
-		this.oFindInputSet.style.display = "block";
-		this.oReplaceInputSet.style.display = "none";
-
-		this.oReplaceButton.style.display = "none";
-		this.oReplaceAllButton.style.display = "none";
-
-		jQuery(this.oUILayer).removeClass("replace");
-		jQuery(this.oUILayer).addClass("find");
-
-		this.oFindInput_Keyword.value = this.oReplaceInput_Original.value;
-	},
-
-	$ON_SHOW_REPLACE : function(){
-		this.bFindMode = false;
-
-		jQuery(this.oFindTab).removeClass("on");
-		jQuery(this.oReplaceTab).addClass("on");
-
-		jQuery(this.oFindNextButton).removeClass("strong");
-		jQuery(this.oFindNextButton).addClass("normal");
-
-		this.oFindInputSet.style.display = "none";
-		this.oReplaceInputSet.style.display = "block";
-
-		this.oReplaceButton.style.display = "inline";
-		this.oReplaceAllButton.style.display = "inline";
-
-		jQuery(this.oUILayer).removeClass("find");
-		jQuery(this.oUILayer).addClass("replace");
-
-		this.oReplaceInput_Original.value = this.oFindInput_Keyword.value;
-	},
-
-	$ON_FIND : function(){
-		var sKeyword;
-		if(this.bFindMode)
-			sKeyword = this.oFindInput_Keyword.value;
-		else
-			sKeyword = this.oReplaceInput_Original.value;
-
-		switch(this.oFindReplace.find(sKeyword, false)){
-			case 1:
-				alert(this.oApp.$MSG("XE_FindReplace.keywordNotFound"));
-				break;
-			case 2:
-				alert(this.oApp.$MSG("XE_FindReplace.keywordMissing"));
-				break;
-		}
-	},
-
-	$ON_REPLACE : function(){
-		var sOriginal = this.oReplaceInput_Original.value;
-		var sReplacement = this.oReplaceInput_Replacement.value;
-
-		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["REPLACE"]);
-		var iReplaceResult = this.oFindReplace.replace(sOriginal, sReplacement, false);
-		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["REPLACE"]);
-
-		switch(iReplaceResult){
-			case 1:
-			case 3:
-				alert(this.oApp.$MSG("XE_FindReplace.keywordNotFound"));
-				break;
-			case 4:
-				alert(this.oApp.$MSG("XE_FindReplace.keywordMissing"));
-				break;
-		}
-	},
-
-	$ON_REPLACE_ALL : function(){
-		var sOriginal = this.oReplaceInput_Original.value;
-		var sReplacement = this.oReplaceInput_Replacement.value;
-
-		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["REPLACE ALL"]);
-		var iReplaceAllResult = this.oFindReplace.replaceAll(sOriginal, sReplacement, false);
-		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["REPLACE ALL"]);
-
-		if(iReplaceAllResult<0){
-			alert(this.oApp.$MSG("XE_FindReplace.keywordMissing"));
-		}else{
-			alert(this.oApp.$MSG("XE_FindReplace.replaceAllResultP1")+iReplaceAllResult+this.oApp.$MSG("XE_FindReplace.replaceAllResultP2"));
-		}
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to hyperlink
- * @name hp_XE_Hyperlink.js
- */
-xe.XE_Hyperlink = jQuery.Class({
-	name : "XE_Hyperlink",
-	sATagMarker : "HTTP://HUSKY_TMP.MARKER/",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-		this.sRXATagMarker = this.sATagMarker.replace(/\//g, "\\/").replace(/\./g, "\\.");
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.oHyperlinkLayer = jQuery("DIV.xpress_xeditor_hyperlink_layer", elAppContainer).get(0);
-		this.oLinkInput = jQuery("INPUT[type=text]", this.oHyperlinkLayer).get(0);
-
-		this.oBtnConfirm = jQuery("BUTTON.confirm", this.oHyperlinkLayer).get(0);
-		this.oBtnCancel = jQuery("BUTTON.cancel", this.oHyperlinkLayer).get(0);
-
-		this.oCbNewWin = jQuery("INPUT[type=checkbox]", this.oHyperlinkLayer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+k", "XE_TOGGLE_HYPERLINK_LAYER", []]);
-
-		this.oApp.registerBrowserEvent(this.oBtnConfirm, "mousedown", "XE_APPLY_HYPERLINK");
-		this.oApp.registerBrowserEvent(this.oBtnCancel, "mousedown", "HIDE_ACTIVE_LAYER");
-
-		this.oApp.registerBrowserEvent(this.oLinkInput, "keydown", "EVENT_XE_HYPERLINK_KEYDOWN");
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["hyperlink", "click", "XE_TOGGLE_HYPERLINK_LAYER"]);
-	},
-
-	$ON_XE_TOGGLE_HYPERLINK_LAYER : function(){
-		// hotkey may close the layer right away so delay here
-		this.oApp.delayedExec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.oHyperlinkLayer, null, "XE_RESET_HYPERLINK_LAYER", []], 0);
-	},
-
-	$ON_XE_RESET_HYPERLINK_LAYER : function(){
-		this.oApp.exec("FOCUS", []);
-		this.oSelection = this.oApp.getSelection();
-		var oAnchor = this.oSelection.findAncestorByTagName("A");
-		this.oCbNewWin.checked = false;
-		if(oAnchor){
-			this.oSelection.selectNode(oAnchor);
-			this.oSelection.select();
-
-			var sTarget = oAnchor.target;
-			if(sTarget && sTarget == "_blank") this.oCbNewWin.checked = true;
-
-			this.oLinkInput.value = oAnchor.href?oAnchor.href:"http://";
-		}else{
-			this.oLinkInput.value = "http://";
-		}
-
-		this.oLinkInput.focus();
-		this.oLinkInput.value = this.oLinkInput.value;
-	},
-
-	$ON_XE_APPLY_HYPERLINK : function(){
-		var sURL = this.oLinkInput.value;
-
-		this.oApp.exec("FOCUS", []);
-		this.oSelection = this.oApp.getSelection();
-
-		//if(this._validateURL(sURL)){
-        var sTarget = "";
-        if(this.oCbNewWin.checked)
-            sTarget = "_blank";
-        else
-            sTarget = "_self";
-
-        if(this.oSelection.collapsed){
-            var str = "<a href='" + sURL + "' target="+sTarget+">" + sURL + "</a>";
-            this.oSelection.pasteHTML(str);
-        }else{
-            var nSession = Math.ceil(Math.random()*10000);
-            var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, this.sATagMarker+nSession+sURL] );
-            this.oApp.exec("EXECCOMMAND", arg);
-
-            this.oSelection.setFromSelection();
-
-            var oDoc = this.oApp.getWYSIWYGDocument();
-            var aATags = oDoc.body.getElementsByTagName("A");
-            var nLen = aATags.length;
-            var rxMarker = new RegExp(this.sRXATagMarker+nSession, "i");
-            var elATag;
-            for(var i=0; i<nLen; i++){
-                elATag = aATags[i];
-                if(elATag.href && elATag.href.match(rxMarker)){
-                    elATag.href = elATag.href.replace(rxMarker, "");
-                    elATag.target = sTarget;
-                }
-            }
-        }
-        this.oApp.exec("HIDE_ACTIVE_LAYER");
-
-        setTimeout(jQuery.fnBind(function(){this.oSelection.select()}, this), 0);
-		//}else{
-			//alert(this.oApp.$MSG("XE_Hyperlink.invalidURL"));
-			//this.oLinkInput.focus();
-		//}
-	},
-
-	_validateURL : function(sURL){
-		return /^(http|https|ftp|mailto):(?:\/\/)?((\w|-)+(?:[\.:@](\w|-))+)(?:\/|@)?([^"\?]*?)(?:\?([^\?"]*?))?$/.test(sURL);
-	},
-
-	$ON_EVENT_XE_HYPERLINK_KEYDOWN : function(oEvent){
-		if (oEvent.keyCode == 13){
-			this.oApp.exec("XE_APPLY_HYPERLINK");
-			oEvent.preventDefault(); oEvent.stopPropagation();
-		}
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to table creation
- * @name hp_XE_Table.js
- */
-xe.XE_Table = jQuery.Class({
-	name : "XE_Table",
-	iMinRows : 1,
-	iMaxRows : 20,
-
-	iMinColumns : 1,
-	iMaxColumns : 10,
-
-	iMinBorderWidth : 1,
-	iMaxBorderWidth : 10,
-
-	oSelection : null,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		var tmp = null;
-
-		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_table_layer", oAppContainer).get(0);
-		this.welDropdownLayer = jQuery(this.elDropdownLayer);
-
-		tmp = jQuery("INPUT", this.elDropdownLayer).get();
-		this.oRowInput = tmp[0];
-		this.oColumnInput = tmp[1];
-		this.oBorderWidthInput = tmp[2];
-		this.oBorderColorInput = tmp[3];
-		this.oBGColorInput = tmp[4];
-
-		tmp = jQuery("BUTTON", this.elDropdownLayer).get();
-		this.oButton_AddRow = tmp[0];
-		this.oButton_RemoveRow = tmp[1];
-		this.oButton_AddColumn = tmp[2];
-		this.oButton_RemoveColumn = tmp[3];
-		this.oButton_IncBorderWidth = tmp[4];
-		this.oButton_DecBorderWidth = tmp[5];
-		this.oButton_BorderColorPreview = tmp[6];
-		this.oButton_BorderColor = tmp[7];
-		this.oButton_BGColorPreview = tmp[8];
-		this.oButton_BGColor = tmp[9];
-		this.oButton_Insert = tmp[10];
-		this.oButton_Cancel = tmp[11];
-
-		this.oSampleTable = jQuery("TABLE", this.elDropdownLayer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["table", "click", "ST_TOGGLE_TOOLBAR_LAYER"]);
-
-		this.oApp.registerBrowserEvent(this.oRowInput, "change", "ST_SET_ROW_NUM", [null, 0]);
-		this.oApp.registerBrowserEvent(this.oColumnInput, "change", "ST_SET_COLUMN_NUM", [null, 0]);
-		this.oApp.registerBrowserEvent(this.oBorderWidthInput, "change", "ST_SET_BORDER_WIDTH", [null, 0]);
-
-		this.oApp.registerBrowserEvent(this.oButton_AddRow, "click", "ST_ADD_ROW");
-		this.oApp.registerBrowserEvent(this.oButton_RemoveRow, "click", "ST_REMOVE_ROW");
-		this.oApp.registerBrowserEvent(this.oButton_AddColumn, "click", "ST_ADD_COLUMN");
-		this.oApp.registerBrowserEvent(this.oButton_RemoveColumn, "click", "ST_REMOVE_COLUMN");
-
-		this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth, "click", "ST_INC_BORDER_WIDTH");
-		this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth, "click", "ST_DEC_BORDER_WIDTH");
-
-		this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
-		this.oApp.registerBrowserEvent(this.oButton_BGColorPreview, "click", "ST_TOGGLE_BGCOLOR_LAYER");
-
-		this.oApp.registerBrowserEvent(this.oButton_BorderColor, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
-		this.oApp.registerBrowserEvent(this.oButton_BGColor, "click", "ST_TOGGLE_BGCOLOR_LAYER");
-
-		this.oApp.registerBrowserEvent(this.oButton_Insert, "click", "ST_INSERT_TABLE");
-		this.oApp.registerBrowserEvent(this.oButton_Cancel, "click", "ST_CLOSE");
-
-		this.oApp.exec("ST_SET_BORDER_COLOR", ["#CCCCCC"]);
-		this.oApp.exec("ST_SET_BGCOLOR", ["#FFFFFF"]);
-	},
-
-	$ON_ST_TOGGLE_TOOLBAR_LAYER : function(){
-		this.oApp.exec("RECORD_UNDO_ACTION_FORCED", ["KEYPRESS"]);
-
-		this._showNewTable();
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
-	},
-
-	$ON_ST_ADD_ROW : function(){
-		this.oApp.exec("ST_SET_ROW_NUM", [null, 1]);
-	},
-
-	$ON_ST_REMOVE_ROW : function(){
-		this.oApp.exec("ST_SET_ROW_NUM", [null, -1]);
-	},
-
-	$ON_ST_ADD_COLUMN : function(){
-		this.oApp.exec("ST_SET_COLUMN_NUM", [null, 1]);
-	},
-
-	$ON_ST_REMOVE_COLUMN : function(){
-		this.oApp.exec("ST_SET_COLUMN_NUM", [null, -1]);
-	},
-
-	$ON_ST_SET_ROW_NUM : function(iRows, iRowDiff){
-		iRows = iRows || parseInt(this.oRowInput.value);
-		iRowDiff = iRowDiff || 0;
-
-		iRows += iRowDiff;
-
-		if(iRows < this.iMinRows) iRows = this.iMinRows;
-		if(iRows > this.iMaxRows) iRows = this.iMaxRows;
-
-		this.oRowInput.value = iRows;
-		this._showNewTable();
-	},
-
-	$ON_ST_SET_COLUMN_NUM : function(iColumns, iColumnDiff){
-		iColumns = iColumns || parseInt(this.oColumnInput.value);
-		iColumnDiff = iColumnDiff || 0;
-
-		iColumns += iColumnDiff;
-
-		if(iColumns < this.iMinColumns) iColumns = this.iMinColumns;
-		if(iColumns > this.iMaxColumns) iColumns = this.iMaxColumns;
-
-		this.oColumnInput.value = iColumns;
-		this._showNewTable();
-	},
-
-	$ON_ST_INSERT_TABLE : function(){
-		var sTable = this._getTableString();
-
-		this.oApp.exec("PASTE_HTML", [sTable]);
-
-		this.oApp.exec("ST_CLOSE", []);
-	},
-
-	$ON_ST_CLOSE : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_ST_SET_BORDER_WIDTH : function(iBorderWidth, iBorderWidthDiff){
-		iBorderWidth = iBorderWidth || parseInt(this.oBorderWidthInput.value);
-		iBorderWidthDiff = iBorderWidthDiff || 0;
-
-		iBorderWidth += iBorderWidthDiff;
-
-		if(iBorderWidth < this.iMinBorderWidth) iBorderWidth = this.iMinBorderWidth;
-		if(iBorderWidth > this.iMaxBorderWidth) iBorderWidth = this.iMaxBorderWidth;
-
-		this.oBorderWidthInput.value = iBorderWidth;
-		this._showNewTable();
-	},
-
-	$ON_ST_INC_BORDER_WIDTH : function(){
-		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, 1]);
-	},
-
-	$ON_ST_DEC_BORDER_WIDTH : function(){
-		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, -1]);
-	},
-
-	$ON_ST_TOGGLE_BORDER_COLOR_LAYER : function(){
-		if(this.welDropdownLayer.hasClass("p1"))
-			this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
-		else
-			this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER", []);
-	},
-
-	$ON_ST_SHOW_BORDER_COLOR_LAYER : function(){
-		this.welDropdownLayer.addClass("p1");
-		this.welDropdownLayer.removeClass("p2");
-
-		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BORDER_COLOR_FROM_PALETTE", this.elDropdownLayer]);
-	},
-
-	$ON_ST_HIDE_BORDER_COLOR_LAYER : function(){
-		this.welDropdownLayer.removeClass("p1");
-
-		this.oApp.exec("HIDE_COLOR_PALETTE", []);
-	},
-
-	$ON_ST_TOGGLE_BGCOLOR_LAYER : function(){
-		if(this.welDropdownLayer.hasClass("p2"))
-			this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
-		else
-			this.oApp.exec("ST_SHOW_BGCOLOR_LAYER", []);
-	},
-
-	$ON_ST_SHOW_BGCOLOR_LAYER : function(){
-		this.welDropdownLayer.removeClass("p1");
-		this.welDropdownLayer.addClass("p2");
-
-		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BGCOLOR_FROM_PALETTE", this.elDropdownLayer]);
-	},
-
-	$ON_ST_HIDE_BGCOLOR_LAYER : function(){
-		this.welDropdownLayer.removeClass("p2");
-
-		this.oApp.exec("HIDE_COLOR_PALETTE", []);
-	},
-
-	$ON_ST_SET_BORDER_COLOR_FROM_PALETTE : function(sColorCode){
-		this.oApp.exec("ST_SET_BORDER_COLOR", [sColorCode]);
-		this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
-	},
-
-	$ON_ST_SET_BORDER_COLOR : function(sColorCode){
-		this.oBorderColorInput.value = sColorCode;
-		this.oButton_BorderColorPreview.style.backgroundColor = sColorCode;
-
-		this._showNewTable();
-	},
-
-	$ON_ST_SET_BGCOLOR_FROM_PALETTE : function(sColorCode){
-		this.oApp.exec("ST_SET_BGCOLOR", [sColorCode]);
-		this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
-	},
-
-	$ON_ST_SET_BGCOLOR : function(sColorCode){
-		this.oBGColorInput.value = sColorCode;
-		this.oButton_BGColorPreview.style.backgroundColor = sColorCode;
-
-		this._showNewTable();
-	},
-
-	_showNewTable : function(){
-		var oTmp = document.createElement("DIV");
-		oTmp.innerHTML = this._getTableString();
-		var oNewTable = oTmp.firstChild;
-		this.oSampleTable.parentNode.insertBefore(oNewTable, this.oSampleTable);
-		this.oSampleTable.parentNode.removeChild(this.oSampleTable);
-		this.oSampleTable = oNewTable;
-	},
-
-	// need to do something about the table width as the same HTML code is being used to the actual table and the preview table
-	_getTableString : function(){
-		var sBorderColorCode = this.oBorderColorInput.value;
-		var sBGColorCode = this.oBGColorInput.value;
-		var iBorderWidth = this.oBorderWidthInput.value;
-		var sTD = "";
-		if(jQuery.browser.msie){
-			sTD = "<td><p></p></td>";
-		}else{
-			if(jQuery.browser.firefox){
-				sTD = "<td><p><br/></p></td>";
-			}else{
-				sTD = "<td><p>&nbsp;</p></td>";
-			}
-		}
-
-		var sTable = '<table style="background:'+sBorderColorCode+'" cellspacing="'+iBorderWidth+'">';
-		var sRow = '<tr style="background:'+sBGColorCode+'">';
-		var iColumns = this.oColumnInput.value;
-		for(var i=0; i<iColumns; i++){
-			sRow += sTD;
-		}
-		sRow += "</tr>\n";
-
-		var iRows = this.oRowInput.value;
-
-		sTable += "<tbody>";
-		for(var i=0; i<iRows; i++){
-			sTable += sRow;
-		}
-		sTable += "</tbody>";
-
-		sTable += "</table>";
-
-		return sTable;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the editing mode using a Button element
- * @name hp_XE_EditingModeToggler.js
- */
-xe.XE_EditingModeToggler = jQuery.Class({
-	name : "XE_EditingModeToggler",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		elAppContainer = jQuery.$(elAppContainer) || document;
-
-		this.elModeToggleButton = jQuery("BUTTON.xpress_xeditor_mode_toggle_button", elAppContainer).get(0);
-		this.welModeToggleButton = jQuery(this.elModeToggleButton);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elModeToggleButton, "click", "EVENT_TOGGLE_EDITING_MODE", []);
-	},
-
-	$ON_EVENT_TOGGLE_EDITING_MODE : function(){
-		if(this.oApp.getEditingMode() == "WYSIWYG")
-			this.oApp.exec("CHANGE_EDITING_MODE", ["HTMLSrc"]);
-		else
-			this.oApp.exec("CHANGE_EDITING_MODE", ["WYSIWYG"]);
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(sMode){
-		if(sMode == "HTMLSrc"){
-			this.welModeToggleButton.addClass("active").parent("span").addClass("active");
-			this.oApp.exec("DISABLE_ALL_UI", []);
-		}else{
-			this.welModeToggleButton.removeClass("active").parent("span").removeClass("active");
-			this.oApp.exec("ENABLE_ALL_UI", []);
-		}
-	}
-});
-//}
-/**
- * @fileOverview This file contains a message mapping(Korean), which is used to map the message code to the actual message
- * @name xpress_XE_Lang_KR.js
- */
-var oMessageMap = {
-	'XE_EditingAreaManager.onExit' : '%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.',
-	'XE_FontColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
-	'XE_BGColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
-	'XE_Hyperlink.invalidURL' : '%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4.',
-	'XE_FindReplace.keywordMissing' : '%uCC3E%uC73C%uC2E4%20%uB2E8%uC5B4%uB97C%20%uC785%uB825%uD574%20%uC8FC%uC138%uC694.',
-	'XE_FindReplace.keywordNotFound' : '%uCC3E%uC73C%uC2E4%20%uB2E8%uC5B4%uAC00%20%uC5C6%uC2B5%uB2C8%uB2E4.',
-	'XE_FindReplace.replaceAllResultP1' : '%uC77C%uCE58%uD558%uB294%20%uB0B4%uC6A9%uC774%20%uCD1D%20',
-	'XE_FindReplace.replaceAllResultP2' : '%uAC74%20%uBC14%uB00C%uC5C8%uC2B5%uB2C8%uB2E4.',
-	'XE_FindReplace.notSupportedBrowser' : '%uD604%uC7AC%20%uC0AC%uC6A9%uD558%uACE0%20%uACC4%uC2E0%20%uBE0C%uB77C%uC6B0%uC800%uC5D0%uC11C%uB294%20%uC0AC%uC6A9%uD558%uC2E4%uC218%20%uC5C6%uB294%20%uAE30%uB2A5%uC785%uB2C8%uB2E4.%5Cn%uC774%uC6A9%uC5D0%20%uBD88%uD3B8%uC744%20%uB4DC%uB824%20%uC8C4%uC1A1%uD569%uB2C8%uB2E4.'
-};
-/**
- * XHTML Formatter
- * @author gony
- */
-(function($){
-
-var
-	regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig,
-	regex_meanless_css2 = /(?:(?:margin|padding)\s*:\s*0(?:px)?|\-(?:moz|ms|webkit|opera)\-[\w-]+\s*:\s*.*?|[\w-]+\s*:\s*\-(?:moz|ms|webkit|opera)\-[\w-]+|(?:line-height|font-variant|font-stretch|font-size-adjust|font-size)\s*:\s*[a-z_-]+)\s*;?\s*|font-(?:weight|style)\s*:\s*normal;?/ig,
-	regex_class  = /<(.*?)\s+class\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))(.*?)>/ig,
-	regex_class2 = /xe_selected_cell/g;
-	regex_handler = /<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig,
-	//regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
-	regex_script = /<script[\s\S]+?<\/script>/ig,
-	regex_font_color = /color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
-	regex_font_face  = /face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
-	regex_font_size  = /size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i,
-	regex_style = /style\s*=\s*(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
-	regex_font_weight = /font-weight\s*:\s*([a-z]+);?/i,
-	regex_font_style = /font-style\s*:\s*italic;?/i,
-	regex_font_decoration = /text-decoration\s*:\s*([a-z -]+);?/i,
-	regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/ig,
-	regex_quote_attr = /([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g; //"
-
-var
-	allow_tags  = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param'.split(','),
-	lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
-
-var
-	replace_tags = {
-		'b' : 'strong',
-		'i' : 'em',
-		's' : 'del',
-		'strike' : 'del'
-	};
-
-xe.XE_XHTMLFormatter = $.Class({
-	name : "XE_XHTMLFormatter",
-
-	$ON_MSG_APP_READY : function() {
-		this.oApp.addConverter("WYSIWYG_TO_IR", this.TO_IR);
-		this.oApp.addConverter("HTMLSrc_TO_IR", this.TO_IR);
-		this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO);
-		this.oApp.addConverter("IR_TO_WYSIWYG", this.IR_TO);
-	},
-
-	TO_IR : function(sContent) {
-		var stack = [];
-
-        // remove xeHandled attrs
-        sContent = sContent.replace(/xeHandled="YES"/ig,'');
-
-
-		// remove all useless styles
-		sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
-			m2 = m2.replace(regex_meanless_css2, '');
-
-			return '<'+m1+(m2?' style="'+m2+'"':'')+m3+'>';
-		});
-
-		// remove all useless classes
-		sContent = sContent.replace(regex_class, function(m0,m1,m2,m3,m4,m5){
-			var cls = jQuery.trim((m2 || m3 || m4 || "").replace(regex_class2, ''));
-
-			return '<'+(m1||"")+(cls?' class="'+cls+'"':'')+(m5||"")+'>';
-		});
-
-		// remove all event handler
-		sContent = sContent.replace(regex_handler, '<$1$2>');
-
-		// remove all id
-		//sContent = sContent.replace(regex_id, '<$1$2>');
-
-		// remove all scripts
-		sContent = sContent.replace(regex_script, '');
-
-		if (jQuery.browser.msie) {
-			// remove jQuery attributes
-			sContent = sContent.replace(regex_jquery, '');
-
-			// quote all attrs
-			sContent = sContent.replace(/<(\w+) ([^>]+)>/g, function(m0,m1,m2){
-				return '<'+m1+' '+
-					m2.replace(regex_quote_attr, function(s0,s1,s2,s3){
-						if (s1) return s1;
-                        if(/^"/.test(s3)||/"$/.test(s3)) return s2+'='+s3;
-						return s2+'="'+s3+'"';
-					}) + '>';
-			});
-		}
-
-		// remove all useless tag and enclose tags
-		regex = /<(\/)?([:\w\/-]+)(.*?)>/ig;
-		sContent = sContent.replace(regex, function(m0,m1,m2,m3){
-			var m3s = [];
-			var state = '';
-
-			m1 = m1 || '';
-			m2 = m2.toLowerCase();
-			m3 = $.trim(m3 || '');
-
-			if (!m1) {
-				if ($.inArray(m2,lonely_tags) >= 0) {
-					var len = m3.length;
-					if (m2 == 'br') m3 = '';
-					if (!m3 || m3.substring(len-1,len) != '/') m3 += ' /';
-
-					return '<'+m2+' '+m3+'>';
-				}
-
-				if (replace_tags[m2]) {
-					stack.push({tag:m2, state:'deleted'});
-
-					m2 = replace_tags[m2];
-					state = 'inserted';
-				} else if (m2 == 'font') {
-					stack.push({tag:m2, state:'deleted'});
-
-					m2 = 'span';
-					m3s = [];
-					if (regex_font_color.test(m3)) m3s.push('color:'+(RegExp.$1||RegExp.$2||RegExp.$3)+';');
-					if (regex_font_face.test(m3)) m3s.push('font-family:'+(RegExp.$1||RegExp.$2||RegExp.$3)+';');
-
-					m3 = m3s.length?'style="'+m3s.join('')+'"':'';
-					state = 'inserted';
-				} else if (m2 == 'center') {
-					stack.push({tag:m2, state:'deleted'});
-
-					m2 = 'div'
-					m3 = 'style="text-align:center"';
-
-					state = 'inserted';
-				} else if (m2 == 'span') {
-					var style = '';
-
-					if (!m3) {
-						stack.push({tag:m3, state:'deleted'});
-						return '';
-					}
-
-					if (regex_style.test(m3)) {
-						var tmpstack = [];
-						var tmptag   = '';
-
-						style = RegExp.$1||RegExp.$2||RegExp.$3;
-						m3 = m3.replace(regex_style, '');
-
-						if (regex_font_weight.test(style)) {
-							if (RegExp.$1 == 'bold' || RegExp.$1 == 'bolder') {
-								style = style.replace(regex_font_weight, '');
-								tmpstack.push({tag:'strong', state:'inserted'});
-								tmptag += '<strong>';
-							}
-						}
-
-						if (regex_font_style.test(style)) {
-							style = style.replace(regex_font_style, '');
-							tmpstack.push({tag:'em', state:'inserted'});
-							tmptag += '<em>';
-						}
-
-						if (regex_font_decoration.test(style)) {
-							var deco_css = ' '+RegExp.$1.toLowerCase()+' ';
-
-							if (deco_css.indexOf('underline ') > 0) {
-								deco_css = deco_css.replace('underline ', '');
-								tmpstack.push({tag:'u', state:'inserted'});
-								tmptag += '<u>';
-							}
-
-							if (deco_css.indexOf('line-through ') > 0) {
-								deco_css = deco_css.replace('line-through ', '');
-								tmpstack.push({tag:'del', state:'inserted'});
-								tmptag += '<del>';
-							}
-
-							deco_css = $.trim(deco_css);
-							style = style.replace(regex_font_decoration, (deco_css?'text-decoration:'+deco_css+';':''));
-						}
-
-						style = $.trim(style);
-
-						stack.push({tag:m2, state:(!m3&&!style?'deleted':'')});
-						stack = stack.concat(tmpstack);
-
-						return (!m3&&!style?'':'<span '+m3+' style="'+style+'">')+tmptag;
-					}
-				} else {
-					state = (jQuery.inArray(m2,allow_tags) < 0)?'deleted':'';
-					if (state == 'deleted') return '';
-				}
-
-				stack.push({tag:m2, state:state});
-			} else {
-				var tags = [], t = '';
-
-				if (!stack.length) return '';
-
-				do {
-					t = stack.pop();
-					if (t.state != 'inserted' && t.tag != m2) {
-						stack.push(t);
-						return tags.join('');
-					}
-					if (t.state != 'deleted') tags.push('</'+t.tag+'>');
-				} while(stack.length && t.tag != m2);
-
-				return tags.join('');
-			}
-
-			return '<'+m1+m2+(m3?' '+m3:'')+'>';
-		});
-		if (stack.length) {
-			var t = '';
-
-			do {
-				t = stack.pop();
-				if (t.state != 'deleted') sContent += '</'+t.tag+'>';
-			} while(stack.length);
-		}
-
-		return sContent;
-	},
-
-	IR_TO : function(sContent) {
-		return sContent;
-	}
-});
-
-// center, font, b, i, s, strike
-
-})(jQuery);
-/**
- * Support XE extensions
- * @author gony
- */
-xe.XE_Extension = jQuery.Class({
-	name  : "XE_Extension",
-	seq   : '',
-
-	$init : function(elAppContainer, editor_sequence) {
-		this.seq = editor_sequence;
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer) {
-		this.elDropdownLayer = jQuery('DIV.xpress_xeditor_extension_layer', elAppContainer).get(0);
-	},
-
-	_removeAttrs : function(sContent) {
-		return sContent;
-	},
-
-	_addEvent : function() {
-		if (this.oApp.getEditingMode() != 'WYSIWYG') return;
-
-		var doc = this.oApp.getWYSIWYGDocument();
-		var seq = this.seq;
-		var fn  = function(){
-			var obj  = jQuery(this);
-			var comp = obj.attr('editor_component');
-			if (comp && jQuery.isFunction(openComponent)) {
-				editorPrevNode = obj.get(0);
-				openComponent(comp, seq);
-			}
-		};
-
-		jQuery('img,div[editor_component]', doc).each(function(){
-			var obj = jQuery(this);
-            if(this.nodeName == 'IMG' && !obj.attr('editor_component')) obj.attr('editor_component','image_link')
-            if(!obj.attr('xeHandled')) {
-                obj.attr('xeHandled','YES');
-                obj.dblclick(fn);
-            }
-		});
-	},
-
-	$ON_MSG_APP_READY : function() {
-		this.oApp.exec('REGISTER_UI_EVENT', ['extension', 'click', 'TOGGLE_EXTENSION_LAYER']);
-	},
-
-	$ON_TOGGLE_EXTENSION_LAYER : function() {
-		this.oApp.exec('TOGGLE_TOOLBAR_ACTIVE_LAYER', [this.elDropdownLayer]);
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(mode) {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	},
-
-	$ON_PASTE_HTML : function() {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	},
-
-	$ON_LOAD_IR_FIELD : function() {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	},
-
-	$ON_SET_IR : function() {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	}
-});
-/**
- * Auto saving
- * @author gony
- */
-xe.XE_AutoSave = jQuery.Class({
-	name : "XE_AutoSave",
-	form : null,
-	textarea : null,
-
-	$init : function(oIRTextarea, elAppContainer) {
-		this.form = oIRTextarea.form;
-		this.textarea = oIRTextarea;
-
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer) {
-		this.welMessageBox = jQuery('autosave_message');
-	},
-
-	$ON_MSG_APP_READY : function() {
-		var elTitle   = jQuery(this.form._saved_doc_title);
-		var elContent = jQuery(this.form._saved_doc_content);
-		var title   = jQuery.trim(elTitle.val());
-		var content = jQuery.trim(elContent.val());
-
-		if (title || content) {
-			if (confirm(this.form._saved_doc_message.value)) {
-				jQuery(this.form.title).val(title);
-				this.oApp.setIR(content);
-			} else {
-				editorRemoveSavedDoc();
-			}
-		}
-
-		editorEnableAutoSave(this.form, jQuery(this.form).attr("editor_sequence"));
-
-		// register hotkey
-		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+shift+s','AUTO_SAVE']);
-	},
-
-	$ON_AUTO_SAVE : function() {
-		_editorAutoSave();
-	}
-});
-/**
- * Format Block plugin
- * @author gony
- */
-xe.XE_FormatWithSelectUI = jQuery.Class({
-	name : "XE_FormatWithSelectUI",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elFormatSelect = jQuery("SELECT.xpress_xeditor_ui_format_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elFormatSelect, "change", "SET_FORMAT_FROM_SELECT_UI");
-		this.elFormatSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		var blockName = this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");
-
-		if (!blockName) return (this.elFormatSelect.selectedIndex = 0);
-		if (jQuery.browser.msie && /([0-9])/.test(blockName)) blockName = 'h'+(RegExp.$1);
-
-		this.elFormatSelect.value = blockName.toLowerCase();
-		if(this.elFormatSelect.selectedIndex < 0) this.elFormatSelect.selectedIndex = 0;
-	},
-
-	$ON_SET_FORMAT_FROM_SELECT_UI : function(){
-		var sFormat = this.elFormatSelect.value;
-		if(!sFormat) return;
-		if(jQuery.browser.msie) sFormat = '<'+sFormat+'>';
-
-		this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, sFormat]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-
-(function($){
-/**
- * Enhanced Table Fetures
- * @author NHN (developers@xpressengine.com)
- */
-
-// 표 편집 확장 기능
-xe.XE_Table = jQuery.Class({
-	_startSel : null,
-	_endSel   : null,
-
-	$ON_MSG_APP_READY : function() {
-		this._doc = $(this.oApp.getWYSIWYGDocument());
-
-		this.$FnMouseDown = $.fnBind(this._mousedown, this);
-		this.$FnMouseUp   = $.fnBind(this._mouseup, this);
-		this.$FnMouseMove = $.fnBind(this._mousemove, this);
-
-		this._doc.mousedown(this.$FnMouseDown);
-
-		// initialize
-		this._startSel = null;
-		this._endSel   = null;
-
-		// register buttons
-		this.oApp.exec('REGISTER_UI_EVENT', ['merge_cells', 'click', 'MERGE_CELLS']);
-		this.oApp.exec('REGISTER_UI_EVENT', ['split_col', 'click', 'CELL_SPLIT_BY_COL']);
-		this.oApp.exec('REGISTER_UI_EVENT', ['split_row', 'click', 'CELL_SPLIT_BY_ROW']);
-
-		// register hotkeys
-		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+alt+m', 'MERGE_CELLS']);
-
-		// perform default ready action
-		this.$super.$ON_MSG_APP_READY();
-	},
-
-	$ON_MERGE_CELLS : function() {
-		var html = "";
-		var cell = jQuery('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
-		var self = this;
-
-		// 선택된 셀이 없으면 종료
-		if (!cell.length) return;
-
-		// UNDO 지점 기록
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Merge"]);
-
-		// 선택한 모든 셀의 데이터를 첫번째 셀로 복사
-		cell.each(function(){ html += jQuery(this).html() }).eq(0).html(html);
-
-		// 첫번째 셀 가로 확장
-		var colspan = 0;
-		cell.eq(0).nextAll('td,th').andSelf().filter('.xe_selected_cell').each(function(idx){
-			colspan += self._getSpan(this, 'col');
-		});
-
-		// 마지막 셀까지 줄의 갯수 계산
-		var rect = this._getRect(cell.eq(0));
-		var start_tr = cell.eq(0).parent('tr');
-		var end_tr   = cell.eq(cell.length-1).parent('tr');
-		var all_rows = cell.parents('table').eq(0).find('tr');
-		var rowspan  = all_rows.index(end_tr.get(0)) - all_rows.index(start_tr.get(0)) + this._getSpan(cell.eq(cell.length-1), 'row');
-
-		// 첫번째 셀 colspan, rowspan 속성 지정
-		cell.eq(0).attr('colSpan', colspan).attr('rowSpan', rowspan);
-
-		// 첫번째 셀을 제외한 다른 모든 셀 제거
-		cell.slice(1).remove();
-	},
-
-	$ON_CELL_SPLIT_BY_ROW : function(many) {
-		var cell  = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
-		var table = cell.parents('table').eq(0);
-		var self  = this;
-
-		// 선택된 셀이 없으면 종료
-		if (!cell.length) return;
-
-		// UNDO 지점 기록
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Row"]);
-
-		// 선택 영역의 상하 좌표 구함
-		var _top    = this._getRect(cell.eq(0)).top;
-		var _bottom = this._getRect(cell.eq(cell.length-1)).bottom;
-
-		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(상하 기준).
-		(cell = table.find('td,th').filter(function(){
-			var rect = self._getRect(jQuery(this));
-
-			return !(rect.bottom <= _top || rect.top >= _bottom);
-		})).filter('.xe_selected_cell').each(function(){
-			var t       = $(this);
-			var row     = t.parent('tr');
-			var rowspan = self._getSpan(t, 'row');
-			var rect    = self._getRect(t);
-			var queue   = [];
-			var clone   = t.clone().html('<br />');
-			var topspan = 1, botspan = 1;
-
-			// rowspan > 1이면 현재 셀의 rowspan을 절반으로 분할한다.
-			if (rowspan > 1) {
-
-				topspan = Math.ceil(rowspan/2);
-				botspan = rowspan - topspan;
-
-				queue.push(function(){
-					t.attr('rowSpan', topspan);
-				});
-
-				clone.attr('rowSpan', botspan);
-			} else {
-				// rowspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 rowspan을 추가
-				cell.filter(function(){
-					if (t.get(0) == this) return false;
-
-					var tt = jQuery(this);
-					var rc = self._getRect(tt);
-
-					// 범위를 넘은 부분은 제외
-					if (rc.bottom <= rect.top || rc.top >= rect.bottom) return false;
-
-					return true;
-				}).each(function(){
-					var tt = jQuery(this);
-					var sp = self._getSpan(tt, 'row')+1;
-
-					// rowspan 1 추가
-					queue.push(function(){
-						tt.attr('rowSpan', sp);
-					});
-				});
-
-				// 새 줄을 추가한다.
-				if (jQuery.browser.msie) {
-					// Fix bug for IE
-					row.after(row.clone().empty().get(0).outerHTML);
-				} else {
-					row.after(row.clone().empty());
-				}
-			}
-
-			var rows  = row.nextAll('tr');
-
-			// 현재 셀이 마지막 줄에 있다면 한 줄 추가 후 새로운 셀 추가
-			if (!rows.length) {
-				row.after(row.clone().empty().append(clone));
-			} else {
-				var next_sib  = rows.eq(topspan - 1).children('td,th').filter(function(){
-					return ( self._getRect(jQuery(this)).left > rect.left );
-				});
-
-				if (jQuery.browser.msie) {
-					next_sib.length?
-						next_sib.eq(0).before(clone.get(0).outerHTML):
-						rows.eq(topspan-1).append(clone.get(0).outerHTML);
-				} else {
-					next_sib.length?
-						next_sib.slice(0,1).before(clone):
-						rows.slice(topspan-1,1).append(clone);
-				}
-			}
-
-			// 함수를 바로 실행하면 좌표가 틀어지므로, 큐에 넣은 후 실행
-			jQuery.each(queue, function(){ this(); });
-
-		});
-	},
-
-	$ON_CELL_SPLIT_BY_COL : function(many) {
-		var cell   = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
-		var table  = cell.parents('table').slice(0,1);
-		var self   = this;
-		var ie_bug = [], tmpId = (new Date).getTime(), tmpStr = '';
-
-		// 선택된 셀이 없으면 종료
-		if (!cell.length) return;
-
-		// UNDO 지점 기록
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Column"]);
-
-		// 선택 영역의 좌우 좌표 구함
-		var first_row = cell.eq(0).parent('tr');
-		var _left = this._getRect(first_row.find('.xe_selected_cell:first')).left;
-		var _right = this._getRect(first_row.find('.xe_selected_cell:last')).right;
-
-		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(좌우 기준).
-		(cell = table.find('td,th').filter(function(){
-			var rect = self._getRect(jQuery(this));
-
-			return !(rect.right <= _left || rect.left >= _right);
-		})).filter('.xe_selected_cell').each(function(idx){
-			var t       = jQuery(this);
-			var colspan = self._getSpan(t, 'col');
-			var clone   = t.clone().html('<br />');
-
-			// colspan > 1 이면 colspan을 절반으로 분할한다.
-			if (colspan > 1) {
-				var leftspan  = Math.ceil(colspan/2);
-				var rightspan = colspan - leftspan;
-
-				t.attr('colSpan', leftspan);
-				clone.attr('colSpan', rightspan);
-			} else {
-				// colspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 colspan을 추가
-				var rect = self._getRect(t);
-
-				cell.filter(function(){
-					if (t.get(0) == this) return false;
-
-					var tt = jQuery(this);
-					var rc = self._getRect(tt);
-
-					// 범위를 넘은 부분은 제외
-					if (rc.right <= rect.left || rc.left >= rect.right) return false;
-
-					return true;
-				}).each(function(){
-					var tt = jQuery(this);
-
-					// colspan 1 추가
-					tt.attr('colSpan', self._getSpan(tt, 'col')+1);
-				});
-
-				clone.attr('colSpan', 1);
-			}
-
-			if (jQuery.browser.msie) {
-				// Fix for IE bug
-				t.after(clone.get(0).outerHTML);
-			} else {
-				t.after(clone);
-			}
-		});
-	},
-
-	$ON_CHECK_STYLE_CHANGE : function(){
-		var ui  = ['merge_cells', 'split_col', 'split_row'];
-		var app = this.oApp;
-		var command = (this._startSel && this._startSel.is('.xe_selected_cell'))?'ENABLE_UI':'DISABLE_UI';
-
-		jQuery.each(ui, function(){ app.exec(command, [this]); });
-	},
-
-	_mousedown : function(event) {
-		var cur = $(event.target);
-		var sel = cur.parents().andSelf().filter('td,th,table');
-		var app = this.oApp;
-		var self = this;
-
-		// 모든 선택영역 해제
-		$('td.xe_selected_cell', this.oApp.getWYSIWYGDocument()).removeClass('xe_selected_cell');
-
-		this._startSel = null;
-		this._endSel   = null;
-
-		if (!sel.length || !this._isLeftClicked(event.button)) return;
-
-		function delayed(){
-			sel = app.getSelection().cloneRange();
-			sel.collapseToStart();
-			sel = jQuery(sel.startContainer).parents().andSelf().filter('td,th').eq(0);
-
-			if (!sel.length) return self._removeAllListener()||true;
-
-			// 좌표를 구한다
-			self._getRect(self._startSel = sel);
-
-			// 이벤트 바인딩
-			self._doc.bind('mousemove', self.$FnMouseMove);
-			self._doc.bind('mouseup', self.$FnMouseUp);
-		}
-
-		// mousedown이 일어난 후에 선택 영역이 설정되므로 실행을 지연시킨다.
-		setTimeout(delayed, 0);
-	},
-
-	_mouseup : function(event) {
-		// 선택된 셀 확인
-		this._removeAllListener();
-
-		// 시작셀과 종료셀 제거
-		this._startSel = this._endSel = null;
-	},
-
-	_mousemove : function(event) {
-		var cur  = $(event.target);
-		var cell = cur.parents().andSelf().filter('td,th').eq(0);
-		var self = this;
-
-		// 마우스 왼쪽 버튼이 눌리지 않았으면 종료
-		if (!cell.length || !this._isLeftClicked(event.button)) return;
-		if (!this._endSel && cell.get(0) == this._startSel.get(0)) return;
-		if (this._endSel && cell.get(0) == this._endSel.get(0)) return;
-
-		// 종료셀 && 종료셀의 좌표
-		this._getRect(this._endSel = cell);
-
-		// 선택 범위를 구한다
-		var _top    = Math.min(this._startSel.rect.top,  this._endSel.rect.top);
-		var _left   = Math.min(this._startSel.rect.left, this._endSel.rect.left);
-		var _bottom = Math.max(this._startSel.rect.bottom, this._endSel.rect.bottom);
-		var _right  = Math.max(this._startSel.rect.right,  this._endSel.rect.right);
-
-		var table = cell.parents('table');
-		var cells = table.find('td,th').removeClass('xe_selected_cell');
-		var i = 0;
-
-		// 복잡한 모양의 테이블을 위한 반복 처리
-		var selected = $();
-		do {
-			// 선택한 셀로 최대 영역 재계산
-			selected.each(function(){
-				var rect = self._getRect(jQuery(this));
-
-				// 영역 재계산
-				if (rect.right  > _right)  _right  = rect.right;
-				if (rect.left   < _left)   _left   = rect.left;
-				if (rect.top    < _top)    _top    = rect.top;
-				if (rect.bottom > _bottom) _bottom = rect.bottom;
-			});
-
-			// 좌표 범위 안에 있는 선택할 셀을 추린다.
-			cells = cells.filter(':not(.xe_selected_cell)');
-			selected = cells.filter(function(){
-				var rect = self._getRect(jQuery(this));
-
-				if (rect.right <= _left || rect.left >= _right || rect.bottom <= _top || rect.top >= _bottom) return false;
-
-				return true;
-			}).addClass('xe_selected_cell');
-		} while(selected.length);
-
-		// 브라우저의 기본 선택영역 해제 : FF 제외 - 기본 기능이 충분히 좋아서 + 이 부분을 실행하면 오류가 발생해서
-		if (!$.browser.mozilla) {
-			function delayed() {
-				var sel = self.oApp.getSelection();
-
-				if (!self._startSel) return;
-				if (!self._startSel.get(0).firstChild) self._startSel.text(" ");
-
-				sel.selectNode(self._startSel.get(0).firstChild);
-				sel.collapseToStart();
-				sel.select();
-			}
-
-			setTimeout(delayed, 0);
-		}
-
-		return false;
-	},
-
-	_removeAllListener : function() {
-		// 이벤트 해제
-		this._doc.unbind("mousemove", this.$FnMouseMove);
-		this._doc.unbind("mouseup", this.$FnMouseUp);
-	},
-
-	_isLeftClicked : function(value) {
-		return jQuery.browser.msie?!!(value & 1):(value == 0);
-	},
-
-	_getRect : function(obj) {
-		var el = obj.get(0);
-
-		obj.rect = {};
-		obj.rect.top    = el.offsetTop;
-		obj.rect.left   = el.offsetLeft;
-		obj.rect.bottom = obj.rect.top  + el.offsetHeight;
-		obj.rect.right  = obj.rect.left + el.offsetWidth;
-
-		return obj.rect;
-	},
-
-	_getSpan : function(obj, type) {
-		var span = parseInt($(obj).attr(type+'span'));
-
-		return isNaN(span)?1:span;
-	}
-}).extend(xe.XE_Table);
-
-xe.XE_FontSetter = $.Class({
-	name : "XE_FontSetter",
-	fontFamily : '',
-	fontSize : '',
-	$init : function(fontFamily, fontSize) {
-		this.fontFamily = fontFamily || '';
-		this.fontSize = fontSize || '';
-	},
-	$ON_MSG_APP_READY : function() {
-		var doc = this.oApp.getWYSIWYGDocument();
-		if (this.fontFamily) doc.body.style.fontFamily = this.fontFamily;
-		if (this.fontSize) doc.body.style.fontSize = this.fontSize;
-	}
-});
-
-xe.XE_WYSIWYGEnterKey = $.Class({
-	name : "XE_WYSIWYGEnterKey",
-	sLineBreaker : "P",
-	$init : function(sLineBreaker){
-		if(sLineBreaker == "BR"){
-			this.sLineBreaker = "BR";
-		}else{
-			this.sLineBreaker = "P";
-		}
-
-		if(($.browser.msie || $.browser.opera) && this.sLineBreaker == "P"){
-			this.$ON_MSG_APP_READY = function(){};
-		}
-	},
-	$ON_MSG_APP_READY : function(){
-		var doc = this.oApp.getWYSIWYGDocument();
-
-		if (typeof doc._enterkey_binded == "undefined") {		
-			$(doc).keydown($.fnBind(this._onKeyDown, this));
-			doc._enterkey_binded = true;
-		}
-	},
-	_onKeyDown : function(event){	
-		if(event.shiftKey) return;
-		
-		if(event.keyCode == 13){ // enter
-			if(this.sLineBreaker == "BR"){
-				this._insertBR(event);
-			}else{
-				this._wrapBlock(event);
-			}
-			return false;
-		}
-	},
-	_wrapBlock : function(event, sWrapperTagName){
-		var oSelection = this.oApp.getSelection();
-		var sBM = oSelection.placeStringBookmark();
-		var oLineInfo = oSelection.getLineInfo();
-		var oStart = oLineInfo.oStart;
-		var oEnd = oLineInfo.oEnd;
-
-		// line broke by sibling
-		// or
-		// the parent line breaker is just a block container
-		if(!oStart.bParentBreak || oSelection.rxBlockContainer.test(oStart.oLineBreaker.tagName)){
-			event.stopPropagation();
-			event.preventDefault();
-
-			var oSWrapper = this.oApp.getWYSIWYGDocument().createElement(this.sLineBreaker);
-			oSelection.moveToBookmark(sBM);
-			oSelection.setStartBefore(oStart.oNode);
-			oSelection.surroundContents(oSWrapper);
-
-			oSelection.collapseToEnd();
-
-			var oEWrapper = this.oApp.getWYSIWYGDocument().createElement(this.sLineBreaker);
-			oSelection.setEndAfter(oEnd.oNode);
-			oSelection.surroundContents(oEWrapper);
-
-			oSelection.removeStringBookmark(sBM);
-
-			if(oSWrapper.innerHTML == "") oSWrapper.innerHTML = "<br>";
-			if(oEWrapper.innerHTML == "") oEWrapper.innerHTML = "<br>";
-			
-			if(oEWrapper.nextSibling && oEWrapper.nextSibling.tagName == "BR") oEWrapper.parentNode.removeChild(oEWrapper.nextSibling);
-
-			oSelection.selectNodeContents(oEWrapper);
-			oSelection.collapseToStart();
-			oSelection.select();
-			this.oApp.exec("CHECK_STYLE_CHANGE", []);
-		}else{
-			oSelection.removeStringBookmark(sBM);
-		}
-	},
-	
-	_insertBR : function(event){
-		event.stopPropagation();
-		event.preventDefault();
-
-		var oSelection = this.oApp.getSelection();
-
-		var elBR = this.oApp.getWYSIWYGDocument().createElement("BR");
-		oSelection.insertNode(elBR);
-		oSelection.selectNode(elBR);
-		oSelection.collapseToEnd();
-		
-		if(!$.browser.msie){
-			var oLineInfo = oSelection.getLineInfo();
-			var oStart = oLineInfo.oStart;
-			var oEnd = oLineInfo.oEnd;
-
-			if(oEnd.bParentBreak){
-				while(oEnd.oNode && oEnd.oNode.nodeType == 3 && oEnd.oNode.nodeValue == ""){
-					oEnd.oNode = oEnd.oNode.previousSibling;
-				}
-
-				var nTmp = 1;
-				if(oEnd.oNode == elBR || oEnd.oNode.nextSibling == elBR){
-					nTmp = 0;
-				}
-
-				if(nTmp == 0){
-					oSelection.pasteHTML("<br type='_moz'/>");
-					oSelection.collapseToEnd();
-				}
-			}
-		}
-
-		// the text cursor won't move to the next line without this
-		oSelection.insertNode(this.oApp.getWYSIWYGDocument().createTextNode(""));
-		oSelection.select();
-	}
-});
-
-})(jQuery);
+// extends jQuery object
+(function($){
+
+$.extend({
+	Class : function(def) {
+		function c(){
+			if (typeof this.$super != 'undefined') this.$super.$this = this;
+			if ($.isFunction(this.$init)) this.$init.apply(this, arguments);
+		}
+		c.prototype = def;
+		c.constructor = c;
+		c.extend = Class_extend;
+
+		return c;
+	},
+	$ : function(id) {
+		if(typeof id == 'string') {
+			if (id.substring(0,1) == '<') return $(id).get(0);
+			return $('#'+id).get(0);
+		} else {
+			return id;
+		}
+	},
+	fnBind : function(fn, th/* , args... */) {
+		var args = $.makeArray(arguments);
+		args.shift(); args.shift();
+
+		return function() {
+			var a = args.concat($.makeArray(arguments));
+
+			return fn.apply(th, a);
+		};
+	}
+});
+
+$.browser.nVersion = parseFloat($.browser.version);
+
+function Class_extend(superDef) {
+	var Super = superDef.prototype;
+
+	this.prototype.$super = {};
+
+	function bind(fn) {
+		return function() {
+			return fn.apply(this.$this, arguments);
+		};
+	}
+
+	for(var x in Super) {
+		if (!Super.propertyIsEnumerable(x)) continue;
+
+		if (typeof this.prototype[x] == 'undefined') this.prototype[x] = Super[x];
+		this.prototype.$super[x] = $.isFunction(Super[x])?bind(Super[x]):Super[x];
+	}
+
+	return this;
+}
+
+})(jQuery);
+
+if (typeof window.xe == 'undefined') window.xe = {};
+
+//{
+ /**
+ * @fileOverview This file contains Xpress framework core
+ * @name XpressCore.js
+ */
+xe.XpressCore = jQuery.Class({
+	name : "XpressCore",
+
+	$init : function(htOptions){
+		htOptions = !htOptions?{}:jQuery.Class({}).extend({
+			oDebugger : null
+		}).extend(htOptions);
+		if(htOptions.oDebugger){
+			this.oDebugger = htOptions.oDebugger;
+			this.oDebugger.oApp = this;
+		}
+
+		// To prevent processing a Xpress command before all the plugins are registered and ready,
+		// Queue up all the commands here until the application's status is changed to READY
+		this.commandQueue = [];
+
+		this.oCommandMap = {};
+		this.oDisabledCommand = {};
+		this.aPlugins = [];
+
+		this.appStatus = xe.APP_STATUS["NOT_READY"];
+
+		// Register the core as a plugin so it can receive messages
+		this.registerPlugin(this);
+	},
+
+	exec : function(msg, args, oEvent){
+		// If the application is not yet ready just queue the command
+		if(this.appStatus == xe.APP_STATUS["NOT_READY"]){
+			this.commandQueue[this.commandQueue.length] = {'msg':msg, 'args':args, 'event':oEvent};
+			return true;
+		}
+
+		this.exec = this._exec;
+		this.exec(msg, args, oEvent);
+	},
+
+	delayedExec : function(msg, args, nDelay, oEvent){
+		var fExec = jQuery.fnBind(this.exec, this, msg, args, oEvent);
+		setTimeout(fExec, nDelay);
+	},
+
+	_exec : function(msg, args, oEvent){return (this._exec = this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this, msg, args, oEvent);},
+	_execWithDebugger : function(msg, args, oEvent){this.oDebugger.log_MessageStart(msg, args);var bResult = this._doExec(msg, args, oEvent);this.oDebugger.log_MessageEnd(msg, args);return bResult;	},
+	_execWithoutDebugger : function(msg, args, oEvent){return this._doExec(msg, args, oEvent);},
+	_doExec : function(msg, args, oEvent){
+		var bContinue = false;
+
+		if(!this.oDisabledCommand[msg]){
+			var allArgs = [];
+			if(args && args.length){
+				var iLen = args.length;
+				for(var i=0; i<iLen; i++) allArgs[i] = args[i];
+			}
+			if(oEvent) allArgs[allArgs.length] = oEvent;
+
+			var bContinue = true;
+			bContinue = this._execMsgStep("BEFORE", msg, allArgs);
+			if(bContinue) bContinue = this._execMsgStep("ON", msg, allArgs);
+			if(bContinue) bContinue = this._execMsgStep("AFTER", msg, allArgs);
+		}
+
+		return bContinue;
+	},
+
+	registerPlugin : function(oPlugin){
+		if(!oPlugin) throw("An error occured in registerPlugin(): invalid plug-in");
+
+		oPlugin.nIdx = this.aPlugins.length;
+		oPlugin.oApp = this;
+		this.aPlugins[oPlugin.nIdx] = oPlugin;
+
+		// If the plugin does not specify that it takes time to be ready, change the stauts to READY right away
+		if(oPlugin.status != xe.PLUGIN_STATUS["NOT_READY"]) oPlugin.status = xe.PLUGIN_STATUS["READY"];
+
+		this.exec("MSG_PLUGIN_REGISTERED", [oPlugin]);
+
+		return oPlugin.nIdx;
+	},
+
+	disableCommand : function(sCommand, bDisable){this.oDisabledCommand[sCommand] = bDisable;},
+
+	registerBrowserEvent : function(obj, sEvent, sCMD, aParams, nDelay){
+		if(!obj) return;
+		aParams = aParams || [];
+		var func = (nDelay)?jQuery.fnBind(this.delayedExec, this, sCMD, aParams, nDelay):jQuery.fnBind(this.exec, this, sCMD, aParams);
+		jQuery(obj).bind(sEvent, func);
+	},
+
+	run : function(){
+		// Change the status from NOT_READY to let exec to process all the way
+		this._changeAppStatus(xe.APP_STATUS["WAITING_FOR_PLUGINS_READY"]);
+
+		// Process all the commands in the queue
+		var iQueueLength = this.commandQueue.length;
+		for(i=0; i<iQueueLength; i++){
+			var curMsgAndArgs = this.commandQueue[i];
+			this.exec(curMsgAndArgs.msg, curMsgAndArgs.args, curMsgAndArgs.event);
+		}
+
+		this._waitForPluginReady();
+	},
+
+	// Use this also to update the mapping
+	createCommandMap : function(sMsgHandler){
+		this.oCommandMap[sMsgHandler] = [];
+
+		var nLen = this.aPlugins.length;
+		for(var i=0; i<nLen; i++) this._doAddToCommandMap(sMsgHandler, this.aPlugins[i]);
+	},
+
+	addToCommandMap : function(sMsgHandler, oPlugin){
+		// cannot "ADD" unless the map is already created.
+		// the message will be added automatically to the mapping when it is first passed anyways, so do not add now
+		if(!this.oCommandMap[sMsgHandler]) return;
+
+		this._addToCommandMap(sMsgHandler, oPlugin);
+	},
+
+	_changeAppStatus : function(appStatus){
+		this.appStatus = appStatus;
+
+		// Initiate MSG_APP_READY if the application's status is being switched to READY
+		if(this.appStatus == xe.APP_STATUS["READY"]) this.exec("MSG_APP_READY");
+	},
+
+	_execMsgStep : function(sMsgStep, sMsg, args){return (this._execMsgStep = this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this, sMsgStep, sMsg, args);},
+	_execMsgStepWithDebugger : function(sMsgStep, sMsg, args){this.oDebugger.log_MessageStepStart(sMsgStep, sMsg, args);var bStatus = this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);this.oDebugger.log_MessageStepEnd(sMsgStep, sMsg, args);return bStatus;},
+	_execMsgStepWithoutDebugger : function(sMsgStep, sMsg, args){return this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);},
+	_execMsgHandler : function(sMsgHandler, args){
+		if(!this.oCommandMap[sMsgHandler]){
+			this.createCommandMap(sMsgHandler);
+		}
+
+		var aPlugins = this.oCommandMap[sMsgHandler];
+		var iNumOfPlugins = aPlugins.length;
+
+		if(iNumOfPlugins == 0) return true;
+
+		var tmpStatus, bResult = true;
+		// two similar codes were written twice due to the performace.
+		if(sMsgHandler.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){
+			for(var i=0; i<iNumOfPlugins; i++){
+				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
+				if(tmpStatus === false){
+					bResult = false;
+					break;
+				}
+			}
+		}else{
+			for(var i=0; i<iNumOfPlugins; i++){
+				if(typeof aPlugins[i]["$PRECONDITION"] == "function") if(!this._execHandler(aPlugins[i], "$PRECONDITION", [sMsgHandler, args])) continue;
+
+				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
+				if(tmpStatus === false){
+					bResult = false;
+					break;
+				}
+			}
+		}
+
+		return bResult;
+	},
+
+	_execHandler : function(oPlugin, sHandler, args){return	(this._execHandler = this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this, oPlugin, sHandler, args);},
+	_execHandlerWithDebugger : function(oPlugin, sHandler, args){this.oDebugger.log_CallHandlerStart(oPlugin, sHandler, args);var bResult = oPlugin[sHandler].apply(oPlugin, args);this.oDebugger.log_CallHandlerEnd(oPlugin, sHandler, args);return bResult;},
+	_execHandlerWithoutDebugger : function(oPlugin, sHandler, args){return oPlugin[sHandler].apply(oPlugin, args);},
+
+	_doAddToCommandMap : function(sMsgHandler, oPlugin){
+		if(typeof oPlugin[sMsgHandler] != "function") return;
+		this.oCommandMap[sMsgHandler][this.oCommandMap[sMsgHandler].length] = oPlugin;
+	},
+
+	_waitForPluginReady : function(){
+		var bAllReady = true;
+		for(var i=0; i<this.aPlugins.length; i++){
+			if(this.aPlugins[i].status == xe.PLUGIN_STATUS["NOT_READY"]){
+				bAllReady = false;
+				break;
+			}
+		}
+		if(bAllReady){
+			this._changeAppStatus(xe.APP_STATUS["READY"]);
+		}else{
+			setTimeout(jQuery.fnBind(this._waitForPluginReady, this), 100);
+		}
+	}
+});
+//}
+
+xe.APP_STATUS = {
+	'NOT_READY' : 0,
+	'WAITING_FOR_PLUGINS_READY' : 1,
+	'READY' : 2
+};
+
+xe.PLUGIN_STATUS = {
+	'NOT_READY' : 0,
+	'READY' : 1
+};
+/**
+ * @fileOverview This file contains a cross-browser implementation of W3C's DOM Range
+ * @name W3CDOMRange.js
+ */
+xe.W3CDOMRange = jQuery.Class({
+	$init : function(doc){
+		this._document = doc || document;
+
+		this.collapsed = true;
+		this.commonAncestorContainer = this._document.body;
+		this.endContainer = this._document.body;
+		this.endOffset = 0;
+		this.startContainer = this._document.body;
+		this.startOffset = 0;
+	},
+
+	cloneContents : function(){
+		var oClonedContents = this._document.createDocumentFragment();
+		var oTmpContainer = this._document.createDocumentFragment();
+
+		var aNodes = this._getNodesInRange();
+
+		if(aNodes.length < 1) return oClonedContents;
+
+		var oClonedContainers = this._constructClonedTree(aNodes, oTmpContainer);
+
+		// oTopContainer = aNodes[aNodes.length-1].parentNode and this is not part of the initial array and only those child nodes should be cloned
+		var oTopContainer = oTmpContainer.firstChild;
+
+		if(oTopContainer){
+			var elCurNode = oTopContainer.firstChild;
+			var elNextNode;
+
+			while(elCurNode){
+				elNextNode = elCurNode.nextSibling;
+				oClonedContents.appendChild(elCurNode);
+				elCurNode = elNextNode;
+			}
+		}
+
+		oClonedContainers = this._splitTextEndNodes({oStartContainer: oClonedContainers.oStartContainer, iStartOffset: this.startOffset,
+													oEndContainer: oClonedContainers.oEndContainer, iEndOffset: this.endOffset});
+
+		if(oClonedContainers.oStartContainer && oClonedContainers.oStartContainer.previousSibling)
+			xe.DOMFix.parentNode(oClonedContainers.oStartContainer).removeChild(oClonedContainers.oStartContainer.previousSibling);
+
+		if(oClonedContainers.oEndContainer && oClonedContainers.oEndContainer.nextSibling)
+			xe.DOMFix.parentNode(oClonedContainers.oEndContainer).removeChild(oClonedContainers.oEndContainer.nextSibling);
+
+		return oClonedContents;
+	},
+
+	_constructClonedTree : function(aNodes, oClonedParentNode){
+		var oClonedStartContainer = null;
+		var oClonedEndContainer = null;
+
+		var oStartContainer = this.startContainer;
+		var oEndContainer = this.endContainer;
+
+		_recurConstructClonedTree = function(aAllNodes, iCurIdx, oParentNode, oClonedParentNode){
+
+			if(iCurIdx < 0) return iCurIdx;
+
+			var iChildIdx = iCurIdx-1;
+
+			var oCurNodeCloneWithChildren = aAllNodes[iCurIdx].cloneNode(false);
+
+			if(aAllNodes[iCurIdx] == oStartContainer) oClonedStartContainer = oCurNodeCloneWithChildren;
+			if(aAllNodes[iCurIdx] == oEndContainer) oClonedEndContainer = oCurNodeCloneWithChildren;
+
+			while(iChildIdx >= 0 && xe.DOMFix.parentNode(aAllNodes[iChildIdx]) == aAllNodes[iCurIdx]){
+				iChildIdx = this._recurConstructClonedTree(aAllNodes, iChildIdx, aAllNodes[iCurIdx], oCurNodeCloneWithChildren, oClonedStartContainer, oClonedEndContainer);
+			}
+
+			// this may trigger an error message in IE when an erroneous script is inserted
+			oClonedParentNode.insertBefore(oCurNodeCloneWithChildren, oClonedParentNode.firstChild);
+
+			return iChildIdx;
+		};
+
+		aNodes[aNodes.length] = xe.DOMFix.parentNode(aNodes[aNodes.length-1]);
+		_recurConstructClonedTree(aNodes, aNodes.length-1, aNodes[aNodes.length-1], oClonedParentNode);
+
+		return {oStartContainer: oClonedStartContainer, oEndContainer: oClonedEndContainer};
+	},
+
+	cloneRange : function(){
+		return this._copyRange(new xe.W3CDOMRange(this._document));
+	},
+
+	_copyRange : function(oClonedRange){
+		oClonedRange.collapsed = this.collapsed;
+		oClonedRange.commonAncestorContainer = this.commonAncestorContainer;
+		oClonedRange.endContainer = this.endContainer;
+		oClonedRange.endOffset = this.endOffset;
+		oClonedRange.startContainer = this.startContainer;
+		oClonedRange.startOffset = this.startOffset;
+		oClonedRange._document = this._document;
+
+		return oClonedRange;
+	},
+
+	collapse : function(toStart){
+		if(toStart){
+			this.endContainer = this.startContainer;
+			this.endOffset = this.startOffset;
+		}else{
+			this.startContainer = this.endContainer;
+			this.startOffset = this.endOffset;
+		}
+
+		this._updateRangeInfo();
+	},
+
+	compareBoundaryPoints : function(how, sourceRange){
+		switch(how){
+			case xe.W3CDOMRange.START_TO_START:
+				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.startContainer, sourceRange.startOffset);
+			case xe.W3CDOMRange.START_TO_END:
+				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.startContainer, sourceRange.startOffset);
+			case xe.W3CDOMRange.END_TO_END:
+				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.endContainer, sourceRange.endOffset);
+			case xe.W3CDOMRange.END_TO_START:
+				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.endContainer, sourceRange.endOffset);
+		}
+	},
+
+	_findBody : function(oNode){
+		if(!oNode) return null;
+		while(oNode){
+			if(oNode.tagName == "BODY") return oNode;
+			oNode = xe.DOMFix.parentNode(oNode);
+		}
+		return null;
+	},
+
+	_compareEndPoint : function(oContainerA, iOffsetA, oContainerB, iOffsetB){
+		var iIdxA, iIdxB;
+
+		if(!oContainerA || this._findBody(oContainerA) != this._document.body){
+			oContainerA = this._document.body;
+			iOffsetA = 0;
+		}
+
+		if(!oContainerB || this._findBody(oContainerB) != this._document.body){
+			oContainerB = this._document.body;
+			iOffsetB = 0;
+		}
+
+		var compareIdx = function(iIdxA, iIdxB){
+			// iIdxX == -1 when the node is the commonAncestorNode
+			// if iIdxA == -1
+			// -> [[<nodeA>...<nodeB></nodeB>]]...</nodeA>
+			// if iIdxB == -1
+			// -> <nodeB>...[[<nodeA></nodeA>...</nodeB>]]
+			if(iIdxB == -1) iIdxB = iIdxA+1;
+			if(iIdxA < iIdxB) return -1;
+			if(iIdxA == iIdxB) return 0;
+			return 1;
+		};
+
+		var oCommonAncestor = this._getCommonAncestorContainer(oContainerA, oContainerB);
+
+		// ================================================================================================================================================
+		//  Move up both containers so that both containers are direct child nodes of the common ancestor node. From there, just compare the offset
+		// Add 0.5 for each contaienrs that has "moved up" since the actual node is wrapped by 1 or more parent nodes and therefore its position is somewhere between idx & idx+1
+		// <COMMON_ANCESTOR>NODE1<P>NODE2</P>NODE3</COMMON_ANCESTOR>
+		// The position of NODE2 in COMMON_ANCESTOR is somewhere between after NODE1(idx1) and before NODE3(idx2), so we let that be 1.5
+
+		// container node A in common ancestor container
+		var oNodeA = oContainerA;
+		if(oNodeA != oCommonAncestor){
+			while((oTmpNode = xe.DOMFix.parentNode(oNodeA)) != oCommonAncestor){oNodeA = oTmpNode;}
+
+			iIdxA = this._getPosIdx(oNodeA)+0.5;
+		}else iIdxA = iOffsetA;
+
+		// container node B in common ancestor container
+		var oNodeB = oContainerB;
+		if(oNodeB != oCommonAncestor){
+			while((oTmpNode = xe.DOMFix.parentNode(oNodeB)) != oCommonAncestor){oNodeB = oTmpNode;}
+
+			iIdxB = this._getPosIdx(oNodeB)+0.5;
+		}else iIdxB = iOffsetB;
+
+		return compareIdx(iIdxA, iIdxB);
+	},
+
+	_getCommonAncestorContainer : function(oNode1, oNode2){
+		var oComparingNode = oNode2;
+
+		while(oNode1){
+			while(oComparingNode){
+				if(oNode1 == oComparingNode) return oNode1;
+				oComparingNode = xe.DOMFix.parentNode(oComparingNode);
+			}
+			oComparingNode = oNode2;
+			oNode1 = xe.DOMFix.parentNode(oNode1);
+		}
+
+		return this._document.body;
+	},
+
+	deleteContents : function(){
+		if(this.collapsed) return;
+
+		this._splitTextEndNodesOfTheRange();
+
+		var aNodes = this._getNodesInRange();
+
+		if(aNodes.length < 1) return;
+
+		var oPrevNode = aNodes[0].previousSibling;
+		while(oPrevNode && this._isBlankTextNode(oPrevNode)) oPrevNode = oPrevNode.previousSibling;
+
+		var oNewStartContainer, iNewOffset;
+		if(!oPrevNode){
+			oNewStartContainer = xe.DOMFix.parentNode(aNodes[0]);
+			iNewOffset = 0;
+		}
+
+		for(var i=0; i<aNodes.length; i++){
+			var oNode = aNodes[i];
+			if(!oNode.firstChild){
+				if(oNewStartContainer == oNode){
+					iNewOffset = this._getPosIdx(oNewStartContainer);
+					oNewStartContainer = xe.DOMFix.parentNode(oNode);
+				}
+				xe.DOMFix.parentNode(oNode).removeChild(oNode);
+			}
+		}
+
+		if(!oPrevNode){
+			this.setStart(oNewStartContainer, iNewOffset);
+		}else{
+			if(oPrevNode.tagName == "BODY")
+				this.setStartBefore(oPrevNode);
+			else
+				this.setStartAfter(oPrevNode);
+		}
+
+		this.collapse(true);
+	},
+
+	extractContents : function(){
+		var oClonedContents = this.cloneContents();
+		this.deleteContents();
+		return oClonedContents;
+	},
+
+	insertNode : function(newNode){
+		var oFirstNode = null;
+
+		var oParentContainer;
+
+		if(this.startContainer.nodeType == "3"){
+			oParentContainer = xe.DOMFix.parentNode(this.startContainer);
+			if(this.startContainer.nodeValue.length <= this.startOffset)
+				oFirstNode = this.startContainer.nextSibling;
+			else
+				oFirstNode = this.startContainer.splitText(this.startOffset);
+		}else{
+			oParentContainer = this.startContainer;
+			oFirstNode = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+		}
+
+		if(!oFirstNode || !xe.DOMFix.parentNode(oFirstNode)) oFirstNode = null;
+
+		oParentContainer.insertBefore(newNode, oFirstNode);
+
+		this.setStartBefore(newNode);
+	},
+
+	selectNode : function(refNode){
+		this.setStartBefore(refNode);
+		this.setEndAfter(refNode);
+	},
+
+	selectNodeContents : function(refNode){
+		this.setStart(refNode, 0);
+		this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
+	},
+
+	_endsNodeValidation : function(oNode, iOffset){
+		if(!oNode || this._findBody(oNode) != this._document.body) throw new Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
+
+		if(oNode.nodeType == 3){
+			if(iOffset > oNode.nodeValue.length) iOffset = oNode.nodeValue.length;
+		}else{
+			if(iOffset > xe.DOMFix.childNodes(oNode).length) iOffset = xe.DOMFix.childNodes(oNode).length;
+		}
+
+		return iOffset;
+	},
+
+
+	setEnd : function(refNode, offset){
+		offset = this._endsNodeValidation(refNode, offset);
+
+		this.endContainer = refNode;
+		this.endOffset = offset;
+		if(!this.startContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(false);
+
+		this._updateRangeInfo();
+	},
+
+	setEndAfter : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");
+
+		if(refNode.tagName == "BODY"){
+			this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
+			return;
+		}
+		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
+	},
+
+	setEndBefore : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");
+
+		if(refNode.tagName == "BODY"){
+			this.setEnd(refNode, 0);
+			return;
+		}
+
+		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
+	},
+
+	setStart : function(refNode, offset){
+		offset = this._endsNodeValidation(refNode, offset);
+
+		this.startContainer = refNode;
+		this.startOffset = offset;
+
+		if(!this.endContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(true);
+		this._updateRangeInfo();
+	},
+
+	setStartAfter : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");
+
+		if(refNode.tagName == "BODY"){
+			this.setStart(refNode, xe.DOMFix.childNodes(refNode).length);
+			return;
+		}
+
+		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
+	},
+
+	setStartBefore : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");
+
+		if(refNode.tagName == "BODY"){
+			this.setStart(refNode, 0);
+			return;
+		}
+		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
+	},
+
+	surroundContents : function(newParent){
+		newParent.appendChild(this.extractContents());
+		this.insertNode(newParent);
+		this.selectNode(newParent);
+	},
+
+	toString : function(){
+		var oTmpContainer = this._document.createElement("DIV");
+		oTmpContainer.appendChild(this.cloneContents());
+
+		return oTmpContainer.textContent || oTmpContainer.innerText || "";
+	},
+
+	_isBlankTextNode : function(oNode){
+		if(oNode.nodeType == 3 && oNode.nodeValue == "") return true;
+		return false;
+	},
+
+	_getPosIdx : function(refNode){
+		var idx = 0;
+		for(var node = refNode.previousSibling; node; node = node.previousSibling) idx++;
+
+		return idx;
+	},
+
+	_updateRangeInfo : function(){
+		if(!this.startContainer){
+			this.init(this._document);
+			return;
+		}
+
+		this.collapsed = this._isCollapsed(this.startContainer, this.startOffset, this.endContainer, this.endOffset);
+
+		this.commonAncestorContainer = this._getCommonAncestorContainer(this.startContainer, this.endContainer);
+	},
+
+	_isCollapsed : function(oStartContainer, iStartOffset, oEndContainer, iEndOffset){
+		var bCollapsed = false;
+
+		if(oStartContainer == oEndContainer && iStartOffset == iEndOffset){
+			bCollapsed = true;
+		}else{
+			var oActualStartNode = this._getActualStartNode(oStartContainer, iStartOffset);
+			var oActualEndNode = this._getActualEndNode(oEndContainer, iEndOffset);
+
+			// Take the parent nodes on the same level for easier comparison when they're next to each other
+			// eg) From
+			//	<A>
+			//		<B>
+			//			<C>
+			//			</C>
+			//		</B>
+			//		<D>
+			//			<E>
+			//				<F>
+			//				</F>
+			//			</E>
+			//		</D>
+			//	</A>
+			//	, it's easier to compare the position of B and D rather than C and F because they are siblings
+			//
+			// If the range were collapsed, oActualEndNode will precede oActualStartNode by doing this
+			oActualStartNode = this._getNextNode(this._getPrevNode(oActualStartNode));
+			oActualEndNode = this._getPrevNode(this._getNextNode(oActualEndNode));
+
+			if(oActualStartNode && oActualEndNode && oActualEndNode.tagName != "BODY" &&
+				(this._getNextNode(oActualEndNode) == oActualStartNode || (oActualEndNode == oActualStartNode && this._isBlankTextNode(oActualEndNode)))
+			)
+				bCollapsed = true;
+		}
+
+		return bCollapsed;
+	},
+
+	_splitTextEndNodesOfTheRange : function(){
+		var oEndPoints = this._splitTextEndNodes({oStartContainer: this.startContainer, iStartOffset: this.startOffset,
+													oEndContainer: this.endContainer, iEndOffset: this.endOffset});
+
+		this.startContainer = oEndPoints.oStartContainer;
+		this.startOffset = oEndPoints.iStartOffset;
+
+		this.endContainer = oEndPoints.oEndContainer;
+		this.endOffset = oEndPoints.iEndOffset;
+	},
+
+	_splitTextEndNodes : function(oEndPoints){
+		oEndPoints = this._splitStartTextNode(oEndPoints);
+		oEndPoints = this._splitEndTextNode(oEndPoints);
+
+		return oEndPoints;
+	},
+
+	_splitStartTextNode : function(oEndPoints){
+		var oStartContainer = oEndPoints.oStartContainer;
+		var iStartOffset = oEndPoints.iStartOffset;
+
+		var oEndContainer = oEndPoints.oEndContainer;
+		var iEndOffset = oEndPoints.iEndOffset;
+
+		if(!oStartContainer) return oEndPoints;
+		if(oStartContainer.nodeType != 3) return oEndPoints;
+		if(iStartOffset == 0) return oEndPoints;
+
+		if(oStartContainer.nodeValue.length <= iStartOffset) return oEndPoints;
+
+		var oLastPart = oStartContainer.splitText(iStartOffset);
+
+		if(oStartContainer == oEndContainer){
+			iEndOffset -= iStartOffset;
+			oEndContainer = oLastPart;
+		}
+		oStartContainer = oLastPart;
+		iStartOffset = 0;
+
+		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
+	},
+
+	_splitEndTextNode : function(oEndPoints){
+		var oStartContainer = oEndPoints.oStartContainer;
+		var iStartOffset = oEndPoints.iStartOffset;
+
+		var oEndContainer = oEndPoints.oEndContainer;
+		var iEndOffset = oEndPoints.iEndOffset;
+
+		if(!oEndContainer) return oEndPoints;
+		if(oEndContainer.nodeType != 3) return oEndPoints;
+
+		if(iEndOffset >= oEndContainer.nodeValue.length) return oEndPoints;
+		if(iEndOffset == 0) return oEndPoints;
+
+		oEndContainer.splitText(iEndOffset);
+
+		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
+	},
+
+	_getNodesInRange : function(){
+		if(this.collapsed) return [];
+
+		var oStartNode = this._getActualStartNode(this.startContainer, this.startOffset);
+		var oEndNode = this._getActualEndNode(this.endContainer, this.endOffset);
+
+		return this._getNodesBetween(oStartNode, oEndNode);
+	},
+
+	_getActualStartNode : function(oStartContainer, iStartOffset){
+		var oStartNode = oStartContainer;;
+
+		if(oStartContainer.nodeType == 3){
+			if(iStartOffset >= oStartContainer.nodeValue.length){
+				oStartNode = this._getNextNode(oStartContainer);
+				if(oStartNode.tagName == "BODY") oStartNode = null;
+			}else{
+				oStartNode = oStartContainer;
+			}
+		}else{
+			if(iStartOffset < xe.DOMFix.childNodes(oStartContainer).length){
+				oStartNode = xe.DOMFix.childNodes(oStartContainer)[iStartOffset];
+			}else{
+				oStartNode = this._getNextNode(oStartContainer);
+				if(oStartNode.tagName == "BODY") oStartNode = null;
+			}
+		}
+
+		return oStartNode;
+	},
+
+	_getActualEndNode : function(oEndContainer, iEndOffset){
+		var oEndNode = oEndContainer;
+
+		if(iEndOffset == 0){
+			oEndNode = this._getPrevNode(oEndContainer);
+			if(oEndNode.tagName == "BODY") oEndNode = null;
+		}else if(oEndContainer.nodeType == 3){
+			oEndNode = oEndContainer;
+		}else{
+			oEndNode = xe.DOMFix.childNodes(oEndContainer)[iEndOffset-1];
+		}
+
+		return oEndNode;
+	},
+
+	_getNextNode : function(oNode){
+		if(!oNode || oNode.tagName == "BODY") return this._document.body;
+
+		if(oNode.nextSibling) return oNode.nextSibling;
+
+		return this._getNextNode(xe.DOMFix.parentNode(oNode));
+	},
+
+	_getPrevNode : function(oNode){
+		if(!oNode || oNode.tagName == "BODY") return this._document.body;
+
+		if(oNode.previousSibling) return oNode.previousSibling;
+
+		return this._getPrevNode(xe.DOMFix.parentNode(oNode));
+	},
+
+	// includes partially selected
+	// for <div id="a"><div id="b"></div></div><div id="c"></div>, _getNodesBetween(b, c) will yield to b, "a" and c
+	_getNodesBetween : function(oStartNode, oEndNode){
+		var aNodesBetween = [];
+
+		if(!oStartNode || !oEndNode) return aNodesBetween;
+
+		this._recurGetNextNodesUntil(oStartNode, oEndNode, aNodesBetween);
+		return aNodesBetween;
+	},
+
+	_recurGetNextNodesUntil : function(oNode, oEndNode, aNodesBetween){
+		if(!oNode) return false;
+
+		if(!this._recurGetChildNodesUntil(oNode, oEndNode, aNodesBetween)) return false;
+
+		var oNextToChk = oNode.nextSibling;
+
+		while(!oNextToChk){
+			if(!xe.DOMFix.parentNode(oNode)) return false;
+			oNode = xe.DOMFix.parentNode(oNode);
+
+			aNodesBetween[aNodesBetween.length] = oNode;
+
+			if(oNode == oEndNode) return false;
+
+			oNextToChk = oNode.nextSibling;
+		}
+
+		return this._recurGetNextNodesUntil(oNextToChk, oEndNode, aNodesBetween);
+	},
+
+	_recurGetChildNodesUntil : function(oNode, oEndNode, aNodesBetween){
+		if(!oNode) return false;
+
+		var bEndFound = false;
+		var oCurNode = oNode;
+		if(oCurNode.firstChild){
+			oCurNode = oCurNode.firstChild;
+			while(oCurNode){
+				if(!this._recurGetChildNodesUntil(oCurNode, oEndNode, aNodesBetween)){
+					bEndFound = true;
+					break;
+				}
+				oCurNode = oCurNode.nextSibling;
+			}
+		}
+
+		aNodesBetween[aNodesBetween.length] = oNode;
+
+		if(bEndFound) return false;
+		if(oNode == oEndNode) return false;
+
+		return true;
+	}
+});
+
+xe.W3CDOMRange.START_TO_START = 0;
+xe.W3CDOMRange.START_TO_END = 1;
+xe.W3CDOMRange.END_TO_END = 2;
+xe.W3CDOMRange.END_TO_START = 3;
+
+
+/**
+ * @fileOverview This file contains a cross-browser function that implements all of the W3C's DOM Range specification and some more
+ * @name XpressRange.js
+ */
+xe.XpressRange = jQuery.Class({
+	setWindow : function(win){
+		this._window = win;
+		this._document = win.document;
+	},
+
+	$init : function(win){
+		this.HUSKY_BOOMARK_START_ID_PREFIX = "xpress_bookmark_start_";
+		this.HUSKY_BOOMARK_END_ID_PREFIX = "xpress_bookmark_end_";
+
+		this.sBlockElement = "P|DIV|LI|H[1-6]|PRE";
+		this.sBlockContainer = "BODY|TABLE|TH|TR|TD|UL|OL|BLOCKQUOTE|FORM";
+
+		this.rxBlockElement = new RegExp("^("+this.sBlockElement+")$");
+		this.rxBlockContainer = new RegExp("^("+this.sBlockContainer+")$")
+		this.rxLineBreaker = new RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$")
+
+		this.setWindow(win);
+
+		this.oSimpleSelection = new xe.SimpleSelection(this._window);
+		this.selectionLoaded = this.oSimpleSelection.selectionLoaded;
+
+		this.$super.$init(this._document);
+	},
+
+	select : function(){
+		this.oSimpleSelection.selectRange(this);
+	},
+
+	setFromSelection : function(iNum){
+		this.setRange(this.oSimpleSelection.getRangeAt(iNum));
+	},
+
+	setRange : function(oW3CRange){
+		this.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
+		this.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
+	},
+
+	setEndNodes : function(oSNode, oENode){
+		this.setEndAfter(oENode);
+		this.setStartBefore(oSNode);
+	},
+
+	splitTextAtBothEnds : function(){
+		this._splitTextEndNodesOfTheRange();
+	},
+
+	getStartNode : function(){
+		if(this.collapsed){
+			if(this.startContainer.nodeType == 3){
+				if(this.startOffset == 0) return null;
+				if(this.startContainer.nodeValue.length <= this.startOffset) return null;
+				return this.startContainer;
+			}
+			return null;
+		}
+
+		if(this.startContainer.nodeType == 3){
+			if(this.startOffset >= this.startContainer.nodeValue.length) return this._getNextNode(this.startContainer);
+			return this.startContainer;
+		}else{
+			if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length) return this._getNextNode(this.startContainer);
+			return xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+		}
+	},
+
+	getEndNode : function(){
+		if(this.collapsed) return this.getStartNode();
+
+		if(this.endContainer.nodeType == 3){
+			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
+			return this.endContainer;
+		}else{
+			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
+			return xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
+		}
+	},
+
+	getNodeAroundRange : function(bBefore, bStrict){
+		if(this.collapsed && this.startContainer && this.startContainer.nodeType == 3) return this.startContainer;
+		if(!this.collapsed || (this.startContainer && this.startContainer.nodeType == 3)) return this.getStartNode();
+
+		var oBeforeRange, oAfterRange, oResult;
+
+		if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length)
+			oAfterRange = this._getNextNode(this.startContainer);
+		else
+			oAfterRange = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+
+		if(this.endOffset == 0)
+			oBeforeRange = this._getPrevNode(this.endContainer);
+		else
+			oBeforeRange = xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
+
+		if(bBefore){
+			oResult = oBeforeRange;
+			if(!oResult && !bStrict) oResult = oAfterRange;
+		}else{
+			oResult = oAfterRange;
+			if(!oResult && !bStrict) oResult = oBeforeRange;
+		}
+
+		return oResult;
+	},
+
+	_getXPath : function(elNode){
+		var sXPath = "";
+
+		while(elNode && elNode.nodeType == 1){
+			sXPath = "/" + elNode.tagName+"["+this._getPosIdx4XPath(elNode)+"]" + sXPath;
+			elNode = xe.DOMFix.parentNode(elNode);
+		}
+
+		return sXPath;
+	},
+
+	_getPosIdx4XPath : function(refNode){
+		var idx = 0;
+		for(var node = refNode.previousSibling; node; node = node.previousSibling)
+			if(node.tagName == refNode.tagName) idx++;
+
+		return idx;
+	},
+
+	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
+	_evaluateXPath : function(sXPath, oDoc){
+		sXPath = sXPath.substring(1, sXPath.length-1);
+		var aXPath = sXPath.split(/\//);
+		var elNode = oDoc.body;
+
+		for(var i=2; i<aXPath.length && elNode; i++){
+			aXPath[i].match(/([^\[]+)\[(\d+)/i);
+			var sTagName = RegExp.$1;
+			var nIdx = RegExp.$2;
+
+			var aAllNodes = xe.DOMFix.childNodes(elNode);
+			var aNodes = [];
+			var nLength = aAllNodes.length;
+			var nCount = 0;
+			for(var ii=0; ii<nLength; ii++){
+				if(aAllNodes[ii].tagName == sTagName) aNodes[nCount++] = aAllNodes[ii];
+			}
+
+			if(aNodes.length < nIdx)
+				elNode = null;
+			else
+				elNode = aNodes[nIdx];
+		}
+
+		return elNode;
+	},
+
+	_evaluateXPathBookmark : function(oBookmark){
+		var sXPath = oBookmark["sXPath"];
+		var nTextNodeIdx = oBookmark["nTextNodeIdx"];
+		var nOffset = oBookmark["nOffset"];
+
+		var elContainer = this._evaluateXPath(sXPath, this._document);
+
+		if(nTextNodeIdx > -1 && elContainer){
+			var aChildNodes = xe.DOMFix.childNodes(elContainer);
+			var elNode = null;
+
+			var nIdx = nTextNodeIdx;
+			var nOffsetLeft = nOffset;
+
+			while((elNode = aChildNodes[nIdx]) && elNode.nodeType == 3 && elNode.nodeValue.length < nOffsetLeft){
+				nOffsetLeft -= elNode.nodeValue.length;
+				nIdx++;
+			}
+
+			elContainer = xe.DOMFix.childNodes(elContainer)[nIdx];
+			nOffset = nOffsetLeft;
+		}
+
+		if(!elContainer){
+			elContainer = this._document.body;
+			nOffset = 0;
+		}
+		return {elContainer: elContainer, nOffset: nOffset};
+	},
+
+	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
+	getXPathBookmark : function(){
+		var nTextNodeIdx1 = -1;
+		var htEndPt1 = {elContainer: this.startContainer, nOffset: this.startOffset};
+		var elNode1 = this.startContainer;
+		if(elNode1.nodeType == 3){
+			htEndPt1 = this._getFixedStartTextNode();
+			nTextNodeIdx1 = this._getPosIdx(htEndPt1.elContainer);
+			elNode1 = xe.DOMFix.parentNode(elNode1);
+		}
+		var sXPathNode1 = this._getXPath(elNode1);
+		var oBookmark1 = {sXPath:sXPathNode1, nTextNodeIdx:nTextNodeIdx1, nOffset: htEndPt1.nOffset};
+
+		var nTextNodeIdx2 = -1;
+		var htEndPt2 = {elContainer: this.endContainer, nOffset: this.endOffset};
+		var elNode2 = this.endContainer;
+		if(elNode2.nodeType == 3){
+			htEndPt2 = this._getFixedEndTextNode();
+			nTextNodeIdx2 = this._getPosIdx(htEndPt2.elContainer);
+			elNode2 = xe.DOMFix.parentNode(elNode2);
+		}
+		var sXPathNode2 = this._getXPath(elNode2);
+		var oBookmark2 = {sXPath:sXPathNode2, nTextNodeIdx:nTextNodeIdx2, nOffset: htEndPt2.nOffset};
+
+		return [oBookmark1, oBookmark2];
+	},
+
+	moveToXPathBookmark : function(aBookmark){
+		if(!aBookmark) return;
+
+		var oBookmarkInfo1 = this._evaluateXPathBookmark(aBookmark[0]);
+		var oBookmarkInfo2 = this._evaluateXPathBookmark(aBookmark[1]);
+
+		if(!oBookmarkInfo1["elContainer"] || !oBookmarkInfo2["elContainer"]) return;
+
+		this.startContainer = oBookmarkInfo1["elContainer"];
+		this.startOffset = oBookmarkInfo1["nOffset"];
+
+		this.endContainer = oBookmarkInfo2["elContainer"];
+		this.endOffset = oBookmarkInfo2["nOffset"];
+	},
+
+	_getFixedTextContainer : function(elNode, nOffset){
+		while(elNode && elNode.nodeType == 3 && elNode.previousSibling && elNode.previousSibling.nodeType == 3){
+			nOffset += elNode.previousSibling.nodeValue.length;
+			elNode = elNode.previousSibling;
+		}
+
+		return {elContainer:elNode, nOffset:nOffset};
+	},
+
+	_getFixedStartTextNode : function(){
+		return this._getFixedTextContainer(this.startContainer, this.startOffset);
+	},
+
+	_getFixedEndTextNode : function(){
+		return this._getFixedTextContainer(this.endContainer, this.endOffset);
+	},
+
+	placeStringBookmark : function(){
+		var sTmpId = (new Date()).getTime();
+
+		var oInsertionPoint = this.cloneRange();
+		oInsertionPoint.collapseToEnd();
+		var oEndMarker = this._document.createElement("A");
+		oEndMarker.id = this.HUSKY_BOOMARK_END_ID_PREFIX+sTmpId;
+		oInsertionPoint.insertNode(oEndMarker);
+
+		var oInsertionPoint = this.cloneRange();
+		oInsertionPoint.collapseToStart();
+		var oStartMarker = this._document.createElement("A");
+		oStartMarker.id = this.HUSKY_BOOMARK_START_ID_PREFIX+sTmpId;
+		oInsertionPoint.insertNode(oStartMarker);
+
+		this.moveToBookmark(sTmpId);
+
+		return sTmpId;
+	},
+
+	cloneRange : function(){
+		return this._copyRange(new xe.XpressRange(this._window));
+	},
+
+	moveToBookmark : function(vBookmark){
+		if(typeof(vBookmark) != "object")
+			this.moveToStringBookmark(vBookmark);
+		else
+			this.moveToXPathBookmark(vBookmark);
+	},
+
+	moveToStringBookmark : function(sBookmarkID){
+		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
+		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
+
+		if(!oStartMarker || !oEndMarker) return;
+
+		this.setEndBefore(oEndMarker);
+		this.setStartAfter(oStartMarker);
+	},
+
+	removeStringBookmark : function(sBookmarkID){
+		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
+		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
+
+		if(oStartMarker) xe.DOMFix.parentNode(oStartMarker).removeChild(oStartMarker);
+		if(oEndMarker) xe.DOMFix.parentNode(oEndMarker).removeChild(oEndMarker);
+	},
+
+	collapseToStart : function(){
+		this.collapse(true);
+	},
+
+	collapseToEnd : function(){
+		this.collapse(false);
+	},
+
+	createAndInsertNode : function(sTagName){
+		tmpNode = this._document.createElement(tagName);
+		this.insertNode(tmpNode)
+		return tmpNode
+	},
+
+	getNodes : function(bSplitTextEndNodes, fnFilter){
+		if(bSplitTextEndNodes) this._splitTextEndNodesOfTheRange();
+
+		var aAllNodes = this._getNodesInRange();
+		var aFilteredNodes = [];
+
+		if(!fnFilter) return aAllNodes;
+
+		for(var i=0; i<aAllNodes.length; i++)
+			if(fnFilter(aAllNodes[i])) aFilteredNodes[aFilteredNodes.length] = aAllNodes[i];
+
+		return aFilteredNodes;
+	},
+
+	getTextNodes : function(bSplitTextEndNodes){
+		var txtFilter = function(oNode){
+			if (oNode.nodeType == 3 && oNode.nodeValue != "\n" && oNode.nodeValue != "")
+				return true;
+			else
+				return false;
+		}
+
+		return this.getNodes(bSplitTextEndNodes, txtFilter);
+	},
+
+	surroundContentsWithNewNode : function(sTagName){
+		var oNewParent = this._document.createElement(sTagName);
+		this.surroundContents(oNewParent);
+		return oNewParent;
+	},
+
+	isRangeinRange : function(oAnoterRange, bIncludePartlySelected){
+		var startToStart = this.compareBoundaryPoints(this.START_TO_START, oAnoterRange);
+		var startToEnd = this.compareBoundaryPoints(this.START_TO_END, oAnoterRange);
+		var endToStart = this.compareBoundaryPoints(this.END_TO_START, oAnoterRange);
+		var endToEnd = this.compareBoundaryPoints(this.END_TO_END, oAnoterRange);
+
+		if(startToStart <= 0 && endToEnd >= 0) return true;
+
+		if(bIncludePartlyIncluded){
+			if(startToEnd == 1) return false;
+			if(endToStart == -1) return false;
+			return true;
+		}
+
+		return false;
+	},
+
+	isNodeInRange : function(oNode, bIncludePartlySelected, bContentOnly){
+		var oTmpRange = new xe.XpressRange(this._window);
+
+		if(bContentOnly && oNode.firstChild){
+			oTmpRange.setStartBefore(oNode.firstChild);
+			oTmpRange.setEndAfter(oNode.lastChild);
+		}else{
+			oTmpRange.selectNode(oNode);
+		}
+
+		return isRangeInRange(oTmpRange, bIncludePartlySelected);
+	},
+
+	pasteHTML : function(sHTML){
+		if(sHTML == ""){
+			this.deleteContents();
+			return;
+		}
+
+		var oTmpDiv = this._document.createElement("DIV");
+		oTmpDiv.innerHTML = sHTML;
+
+		var oFirstNode = oTmpDiv.firstChild;
+		var oLastNode = oTmpDiv.lastChild;
+
+		var clone = this.cloneRange();
+		var sBM = clone.placeStringBookmark();
+
+		while(oTmpDiv.lastChild) this.insertNode(oTmpDiv.lastChild);
+
+		this.setEndNodes(oFirstNode, oLastNode);
+
+		// delete the content later as deleting it first may mass up the insertion point
+		// eg) <p>[A]BCD</p> ---paste O---> O<p>BCD</p>
+		clone.moveToBookmark(sBM);
+		clone.deleteContents();
+		clone.removeStringBookmark(sBM);
+	},
+
+	toString : function(){
+		this.toString = xe.W3CDOMRange.prototype.toString;
+		return this.toString();
+	},
+
+	toHTMLString : function(){
+		var oTmpContainer = this._document.createElement("DIV");
+		oTmpContainer.appendChild(this.cloneContents());
+
+		return oTmpContainer.innerHTML;
+	},
+
+	findAncestorByTagName : function(sTagName){
+		var oNode = this.commonAncestorContainer;
+		while(oNode && oNode.tagName != sTagName) oNode = xe.DOMFix.parentNode(oNode);
+
+		return oNode;
+	},
+
+	selectNodeContents : function(oNode){
+		if(!oNode) return;
+
+		var oFirstNode = oNode.firstChild?oNode.firstChild:oNode;
+		var oLastNode = oNode.lastChild?oNode.lastChild:oNode;
+
+		if(oFirstNode.nodeType == 3)
+			this.setStart(oFirstNode, 0);
+		else
+			this.setStartBefore(oFirstNode);
+
+		if(oLastNode.nodeType == 3)
+			this.setEnd(oLastNode, oLastNode.nodeValue.length);
+		else
+			this.setEndAfter(oLastNode);
+	},
+
+	styleRange : function(oStyle, oAttribute, sNewSpanMarker){
+		var aStyleParents = this._getStyleParentNodes(sNewSpanMarker);
+		if(aStyleParents.length < 1) return;
+
+		var sName, sValue;
+
+		for(var i=0; i<aStyleParents.length; i++){
+			for(var x in oStyle){
+				sName = x;
+				sValue = oStyle[sName];
+
+				if(typeof sValue != "string") continue;
+
+				aStyleParents[i].style[sName] = sValue;
+			}
+
+			if(!oAttribute) continue;
+
+			for(var x in oAttribute){
+				sName = x;
+				sValue = oAttribute[sName];
+
+				if(typeof sValue != "string") continue;
+
+				if(sName == "class"){
+					jQuery(aStyleParents[i]).addClass(sValue);
+				}else{
+					aStyleParents[i].setAttribute(sName, sValue);
+				}
+			}
+		}
+
+		this.setStartBefore(aStyleParents[0]);
+		this.setEndAfter(aStyleParents[aStyleParents.length-1]);
+	},
+
+	_getStyleParentNodes : function(sNewSpanMarker){
+		this._splitTextEndNodesOfTheRange();
+
+		var oSNode = this.getStartNode();
+		var oENode = this.getEndNode();
+
+		var aAllNodes = this._getNodesInRange();
+		var aResult = [];
+
+		var oNode, iStartRelPos, iEndRelPos, oSpan, iSIdx, iEIdx;
+		var nInitialLength = aAllNodes.length;
+		for(var i=0; i<nInitialLength; i++){
+			oNode = aAllNodes[i];
+
+			if(!oNode) continue;
+			if(oNode.nodeType != 3) continue;
+			if(oNode.nodeValue == "") continue;
+
+			if(xe.DOMFix.parentNode(oNode).tagName == "SPAN"){
+				// check if the SPAN element is fully contained
+				iSIdx = jQuery.inArray(this._getVeryFirstRealChild(xe.DOMFix.parentNode(oNode.parentNode)), aAllNodes);
+				iEIdx = jQuery.inArray(this._getVeryLastRealChild(xe.DOMFix.parentNode(oNode)), aAllNodes);
+
+				if(iSIdx != -1 && iEIdx != -1){
+					aResult[aResult.length] = xe.DOMFix.parentNode(oNode);
+					continue;
+				}
+			}
+
+			oSpan = this._document.createElement("SPAN");
+			xe.DOMFix.parentNode(oNode).insertBefore(oSpan, oNode);
+			oSpan.appendChild(oNode);
+			aResult[aResult.length] = oSpan;
+			aAllNodes[aAllNodes.length] = oSpan;
+
+			if(sNewSpanMarker) oSpan.setAttribute(sNewSpanMarker, "true");
+		}
+
+		this.setStartBefore(oSNode);
+		this.setEndAfter(oENode);
+
+		return aResult;
+	},
+
+	_getVeryFirstChild : function(oNode){
+		if(oNode.firstChild) return this._getVeryFirstChild(oNode.firstChild);
+		return oNode;
+	},
+
+	_getVeryLastChild : function(oNode){
+		if(oNode.lastChild) return this._getVeryLastChild(oNode.lastChild);
+		return oNode;
+	},
+
+	_getFirstRealChild : function(oNode){
+		var oFirstNode = oNode.firstChild;
+		while(oFirstNode && oFirstNode.nodeType == 3 && oFirstNode.nodeValue == "") oFirstNode = oFirstNode.nextSibling;
+
+		return oFirstNode;
+	},
+
+	_getLastRealChild : function(oNode){
+		var oLastNode = oNode.lastChild;
+		while(oLastNode && oLastNode.nodeType == 3 && oLastNode.nodeValue == "") oLastNode = oLastNode.previousSibling;
+
+		return oLastNode;
+	},
+
+	_getVeryFirstRealChild : function(oNode){
+		var oFirstNode = this._getFirstRealChild(oNode);
+		if(oFirstNode) return this._getVeryFirstRealChild(oFirstNode);
+		return oNode;
+	},
+	_getVeryLastRealChild : function(oNode){
+		var oLastNode = this._getLastRealChild(oNode);
+		if(oLastNode) return this._getVeryLastChild(oLastNode);
+		return oNode;
+	},
+
+	_getLineStartInfo : function(node){
+		var frontEndFinal = null;
+		var frontEnd = node;
+		var lineBreaker = node;
+		var bParentBreak = true;
+
+		var rxLineBreaker = this.rxLineBreaker;
+
+		// vertical(parent) search
+		function getLineStart(node){
+			if(!node) return;
+			if(frontEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				frontEndFinal = frontEnd;
+
+				bParentBreak = true;
+
+				return;
+			}else{
+				frontEnd = node;
+			}
+
+			getFrontEnd(node.previousSibling);
+
+			if(frontEndFinal) return;
+			getLineStart(xe.DOMFix.parentNode(node));
+		}
+
+		// horizontal(sibling) search
+		function getFrontEnd(node){
+			if(!node) return;
+			if(frontEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				frontEndFinal = frontEnd;
+
+				bParentBreak = false;
+				return;
+			}
+
+			if(node.firstChild && node.tagName != "TABLE"){
+				var curNode = node.lastChild;
+				while(curNode && !frontEndFinal){
+					getFrontEnd(curNode);
+
+					curNode = curNode.previousSibling;
+				}
+			}else{
+				frontEnd = node;
+			}
+
+			if(!frontEndFinal){
+				getFrontEnd(node.previousSibling);
+			}
+		}
+
+		getLineStart(node);
+
+		return {oNode: frontEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
+	},
+
+	_getLineEndInfo : function(node){
+		var backEndFinal = null;
+		var backEnd = node;
+		var lineBreaker = node;
+		var bParentBreak = true;
+
+		var rxLineBreaker = this.rxLineBreaker;
+
+		// vertical(parent) search
+		function getLineEnd(node){
+			if(!node) return;
+			if(backEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				backEndFinal = backEnd;
+
+				bParentBreak = true;
+
+				return;
+			}else{
+				backEnd = node;
+			}
+
+			getBackEnd(node.nextSibling);
+			if(backEndFinal) return;
+
+			getLineEnd(xe.DOMFix.parentNode(node));
+		}
+
+		// horizontal(sibling) search
+		function getBackEnd(node){
+			if(!node) return;
+			if(backEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				backEndFinal = backEnd;
+
+				bParentBreak = false;
+
+				return;
+			}
+
+			if(node.firstChild && node.tagName != "TABLE"){
+				var curNode = node.firstChild;
+				while(curNode && !backEndFinal){
+					getBackEnd(curNode);
+
+					curNode = curNode.nextSibling;
+				}
+			}else{
+				backEnd = node;
+			}
+
+			if(!backEndFinal){
+				getBackEnd(node.nextSibling);
+			}
+		}
+
+		getLineEnd(node);
+
+		return {oNode: backEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
+	},
+
+	getLineInfo : function(){
+		var oSNode = this.getStartNode();
+		var oENode = this.getEndNode();
+
+		// the range is currently collapsed
+		if(!oSNode) oSNode = this.getNodeAroundRange(true, true);
+		if(!oENode) oENode = this.getNodeAroundRange(true, true);
+
+		var oStart = this._getLineStartInfo(oSNode);
+		var oStartNode = oStart.oNode;
+		var oEnd = this._getLineEndInfo(oENode);
+		var oEndNode = oEnd.oNode;
+
+		var iRelativeStartPos = this._compareEndPoint(xe.DOMFix.parentNode(oStartNode), this._getPosIdx(oStartNode), this.endContainer, this.endOffset);
+		var iRelativeEndPos = this._compareEndPoint(xe.DOMFix.parentNode(oEndNode), this._getPosIdx(oEndNode)+1, this.startContainer, this.startOffset);
+
+		if(!(iRelativeStartPos <= 0 && iRelativeEndPos >= 0)){
+			oSNode = this.getNodeAroundRange(false, true);
+			oENode = this.getNodeAroundRange(false, true);
+			oStart = this._getLineStartInfo(oSNode);
+			oEnd = this._getLineEndInfo(oENode);
+		}
+
+		return {oStart: oStart, oEnd: oEnd};
+	}
+}).extend(xe.W3CDOMRange);
+
+/**
+ * @fileOverview This file contains cross-browser selection function
+ * @name SimpleSelection.js
+ */
+xe.SimpleSelection = function(win){
+	this.init = function(win){
+		this._window = win || window;
+		this._document = this._window.document;
+	};
+
+	this.init(win);
+
+	if(jQuery.browser.msie)
+		xe.SimpleSelectionImpl_IE.apply(this);
+	else
+		xe.SimpleSelectionImpl_FF.apply(this);
+
+	this.selectRange = function(oRng){
+		this.selectNone();
+		this.addRange(oRng);
+	};
+
+	this.selectionLoaded = true;
+	if(!this._oSelection) this.selectionLoaded = false;
+};
+
+xe.SimpleSelectionImpl_FF = function(){
+	this._oSelection = this._window.getSelection();
+
+	this.getRangeAt = function(iNum){
+		iNum = iNum || 0;
+
+		try{
+			var oFFRange = this._oSelection.getRangeAt(iNum);
+		}catch(e){return new xe.W3CDOMRange(this._document);}
+
+		return this._FFRange2W3CRange(oFFRange);
+	};
+
+	this.addRange = function(oW3CRange){
+		var oFFRange = this._W3CRange2FFRange(oW3CRange);
+		this._oSelection.addRange(oFFRange);
+	};
+
+	this.selectNone = function(){
+		this._oSelection.removeAllRanges();
+	};
+
+	this._FFRange2W3CRange = function(oFFRange){
+		var oW3CRange = new xe.W3CDOMRange(this._document);
+		oW3CRange.setStart(oFFRange.startContainer, oFFRange.startOffset);
+		oW3CRange.setEnd(oFFRange.endContainer, oFFRange.endOffset);
+		return oW3CRange;
+	};
+
+	this._W3CRange2FFRange = function(oW3CRange){
+		var oFFRange = this._document.createRange();
+		oFFRange.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
+		oFFRange.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
+
+		return oFFRange;
+	};
+};
+
+xe.SimpleSelectionImpl_IE = function(){
+	this._oSelection = this._document.selection;
+
+	this.getRangeAt = function(iNum){
+		iNum = iNum || 0;
+
+		if(this._oSelection.type == "Control"){
+			var oW3CRange = new xe.W3CDOMRange(this._document);
+
+			var oSelectedNode = this._oSelection.createRange().item(iNum);
+
+			// if the selction occurs in a different document, ignore
+			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document) return oW3CRange;
+
+			oW3CRange.selectNode(oSelectedNode);
+
+			return oW3CRange;
+		}else{
+			var oSelectedNode = this._oSelection.createRangeCollection().item(iNum).parentElement();
+
+			// if the selction occurs in a different document, ignore
+			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document){
+				var oW3CRange = new xe.W3CDOMRange(this._document);
+				return oW3CRange;
+			}
+			return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(iNum));
+		}
+	};
+
+	this.addRange = function(oW3CRange){
+		var oIERange = this._W3CRange2IERange(oW3CRange);
+		oIERange.select();
+	};
+
+	this.selectNone = function(){
+		this._oSelection.empty();
+	};
+
+	this._W3CRange2IERange = function(oW3CRange){
+		var oStartIERange = this._getIERangeAt(oW3CRange.startContainer, oW3CRange.startOffset);
+		var oEndIERange = this._getIERangeAt(oW3CRange.endContainer, oW3CRange.endOffset);
+		oStartIERange.setEndPoint("EndToEnd", oEndIERange);
+
+		return oStartIERange;
+	};
+
+	this._getIERangeAt = function(oW3CContainer, iW3COffset){
+		var oIERange = this._document.body.createTextRange();
+
+		var oEndPointInfoForIERange = this._getSelectableNodeAndOffsetForIE(oW3CContainer, iW3COffset);
+
+		var oSelectableNode = oEndPointInfoForIERange.oSelectableNodeForIE;
+		var iIEOffset = oEndPointInfoForIERange.iOffsetForIE;
+
+		oIERange.moveToElementText(oSelectableNode);
+		oIERange.collapse(oEndPointInfoForIERange.bCollapseToStart);
+		oIERange.moveStart("character", iIEOffset);
+
+		return oIERange;
+	};
+
+	this._getSelectableNodeAndOffsetForIE = function(oW3CContainer, iW3COffset){
+		var oIERange = this._document.body.createTextRange();
+
+		var oNonTextNode = null;
+		var aChildNodes =  null;
+		var iNumOfLeftNodesToCount = 0;
+
+		if(oW3CContainer.nodeType == 3){
+			oNonTextNode = xe.DOMFix.parentNode(oW3CContainer);
+			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
+			iNumOfLeftNodesToCount = aChildNodes.length;
+		}else{
+			oNonTextNode = oW3CContainer;
+			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
+			iNumOfLeftNodesToCount = iW3COffset;
+		}
+
+		var oNodeTester = null;
+
+		var iResultOffset = 0;
+
+		var bCollapseToStart = true;
+
+		for(var i=0; i<iNumOfLeftNodesToCount; i++){
+			oNodeTester = aChildNodes[i];
+
+			if(oNodeTester.nodeType == 3){
+				if(oNodeTester == oW3CContainer) break;
+
+				iResultOffset += oNodeTester.nodeValue.length;
+			}else{
+				oIERange.moveToElementText(oNodeTester);
+				oNonTextNode = oNodeTester;
+				iResultOffset = 0;
+
+				bCollapseToStart = false;
+			}
+		}
+
+		if(oW3CContainer.nodeType == 3) iResultOffset += iW3COffset;
+
+		return {oSelectableNodeForIE:oNonTextNode, iOffsetForIE: iResultOffset, bCollapseToStart: bCollapseToStart};
+	};
+
+	this._IERange2W3CRange = function(oIERange){
+		var oW3CRange = new xe.W3CDOMRange(this._document);
+
+		var oIEPointRange = null;
+		var oPosition = null;
+
+		oIEPointRange = oIERange.duplicate();
+		oIEPointRange.collapse(true);
+
+		oPosition = this._getW3CContainerAndOffset(oIEPointRange, true);
+
+		oW3CRange.setStart(oPosition.oContainer, oPosition.iOffset);
+
+		var oCollapsedChecker = oIERange.duplicate();
+		oCollapsedChecker.collapse(true);
+		if(oCollapsedChecker.isEqual(oIERange)){
+			oW3CRange.collapse(true);
+		}else{
+			oIEPointRange = oIERange.duplicate();
+			oIEPointRange.collapse(false);
+			oPosition = this._getW3CContainerAndOffset(oIEPointRange);
+			oW3CRange.setEnd(oPosition.oContainer, oPosition.iOffset);
+		}
+
+		return oW3CRange;
+	};
+
+	this._getW3CContainerAndOffset = function(oIEPointRange, bStartPt){
+		var oRgOrigPoint = oIEPointRange;
+
+		var oContainer = oRgOrigPoint.parentElement();
+		var offset = -1;
+
+		var oRgTester = this._document.body.createTextRange();
+		var aChildNodes = xe.DOMFix.childNodes(oContainer);
+		var oPrevNonTextNode = null;
+		var pointRangeIdx = 0;
+
+		for(var i=0;i<aChildNodes.length;i++){
+			if(aChildNodes[i].nodeType == 3) continue;
+
+			oRgTester.moveToElementText(aChildNodes[i]);
+
+			if(oRgTester.compareEndPoints("StartToStart", oIEPointRange)>=0) break;
+
+			oPrevNonTextNode = aChildNodes[i];
+		}
+
+		var pointRangeIdx = i;
+
+		if(pointRangeIdx != 0 && aChildNodes[pointRangeIdx-1].nodeType == 3){
+			var oRgTextStart = this._document.body.createTextRange();
+			var oCurTextNode = null;
+			if(oPrevNonTextNode){
+				oRgTextStart.moveToElementText(oPrevNonTextNode);
+				oRgTextStart.collapse(false);
+				oCurTextNode = oPrevNonTextNode.nextSibling;
+			}else{
+				oRgTextStart.moveToElementText(oContainer);
+				oRgTextStart.collapse(true);
+				oCurTextNode = oContainer.firstChild;
+			}
+
+			var oRgTextsUpToThePoint = oRgOrigPoint.duplicate();
+			oRgTextsUpToThePoint.setEndPoint("StartToStart", oRgTextStart);
+
+			var textCount = oRgTextsUpToThePoint.text.length
+
+			while(textCount > oCurTextNode.nodeValue.length && oCurTextNode.nextSibling){
+				textCount -= oCurTextNode.nodeValue.length;
+				oCurTextNode = oCurTextNode.nextSibling;
+			}
+
+			// this will enforce IE to re-reference oCurTextNode
+			var oTmp = oCurTextNode.nodeValue;
+
+			if(bStartPt && oCurTextNode.nextSibling && oCurTextNode.nextSibling.nodeType == 3 && textCount == oCurTextNode.nodeValue.length){
+				textCount -= oCurTextNode.nodeValue.length;
+				oCurTextNode = oCurTextNode.nextSibling;
+			}
+
+			oContainer = oCurTextNode;
+			offset = textCount;
+		}else{
+			oContainer = oRgOrigPoint.parentElement();
+			offset = pointRangeIdx;
+		}
+
+		return {"oContainer" : oContainer, "iOffset" : offset};
+	};
+}
+
+xe.DOMFix = new (jQuery.Class({
+	$init : function(){
+		if(jQuery.browser.msie || jQuery.browser.opera){
+			this.childNodes = this._childNodes_Fix;
+			this.parentNode = this._parentNode_Fix;
+		}else{
+			this.childNodes = this._childNodes_Native;
+			this.parentNode = this._parentNode_Native;
+		}
+	},
+
+	_parentNode_Native : function(elNode){
+		return elNode.parentNode;
+	},
+
+	_parentNode_Fix : function(elNode){
+		if(!elNode) return elNode;
+
+		while(elNode.previousSibling){elNode = elNode.previousSibling;}
+
+		return elNode.parentNode;
+	},
+
+	_childNodes_Native : function(elNode){
+		return elNode.childNodes;
+	},
+
+	_childNodes_Fix : function(elNode){
+		var aResult = null;
+		var nCount = 0;
+
+		if(elNode){
+			var aResult = [];
+			elNode = elNode.firstChild;
+			while(elNode){
+				aResult[nCount++] = elNode;
+				elNode=elNode.nextSibling;
+			}
+		}
+
+		return aResult;
+	}
+}))();
+/**
+ * @fileOverview This file contains a function that takes care of various operations related to find and replace
+ * @name N_FindReplace.js
+ */
+xe.FindReplace = jQuery.Class({
+	sKeyword : "",
+	window : null,
+	document : null,
+	bBrowserSupported : false,
+
+	// true if End Of Contents is reached during last execution of find
+	bEOC : false,
+
+	$init : function(win){
+		this.window = win;
+		this.document = this.window.document;
+
+		if(this.document.domain != this.document.location.hostname){
+			if(jQuery.browser.mozilla && jQuery.browser.nVersion < 3){
+				this.bBrowserSupported = false;
+				this.find = function(){return 3};
+				return;
+			}
+		}
+
+		this.bBrowserSupported = true;
+	},
+
+	// 0: found
+	// 1: not found
+	// 2: keyword required
+	// 3: browser not supported
+	find : function(sKeyword, bCaseMatch, bBackwards, bWholeWord){
+		var bSearchResult, bFreshSearch;
+
+		this.window.focus();
+
+		if(!sKeyword) return 2;
+
+		// try find starting from current cursor position
+		this.bEOC = false;
+		bSearchResult = this.findNext(sKeyword, bCaseMatch, bBackwards, bWholeWord);
+		if(bSearchResult) return 0;
+
+		// end of the contents could have been reached so search again from the beginning
+		this.bEOC = true;
+		bSearchResult = this.findNew(sKeyword, bCaseMatch, bBackwards, bWholeWord);
+
+		if(bSearchResult) return 0;
+
+		return 1;
+	},
+
+	findNew : function (sKeyword, bCaseMatch, bBackwards, bWholeWord){
+		this.findReset();
+		return this.findNext(sKeyword, bCaseMatch, bBackwards, bWholeWord);
+	},
+
+	findNext : function(sKeyword, bCaseMatch, bBackwards, bWholeWord){
+		var bSearchResult;
+		bCaseMatch = bCaseMatch || false;
+		bWholeWord = bWholeWord || false;
+		bBackwards = bBackwards || false;
+
+		if(this.window.find){
+			var bWrapAround = false;
+			return this.window.find(sKeyword, bCaseMatch, bBackwards, bWrapAround, bWholeWord);
+		}
+
+		// IE solution
+		if(this.document.body.createTextRange){
+			var iOption = 0;
+			if(bBackwards) iOption += 1;
+			if(bWholeWord) iOption += 2;
+			if(bCaseMatch) iOption += 4;
+
+			this.window.focus();
+			this._range = this.document.selection.createRangeCollection().item(0);
+			this._range.collapse(false);
+			bSearchResult = this._range.findText(sKeyword, 1, iOption);
+
+			this._range.select();
+			return bSearchResult;
+		}
+
+		return false;
+	},
+
+	findReset : function() {
+		if (this.window.find){
+			this.window.getSelection().removeAllRanges();
+			return;
+		}
+
+		// IE solution
+		if(this.document.body.createTextRange){
+			this._range = this.document.body.createTextRange();
+			this._range.collapse(true);
+			this._range.select();
+		}
+	},
+
+	// 0: replaced & next word found
+	// 1: replaced & next word not found
+	// 2: not replaced & next word found
+	// 3: not replaced & next word not found
+	// 4: sOriginalWord required
+	replace : function(sOriginalWord, Replacement, bCaseMatch, bBackwards, bWholeWord){
+		if(!sOriginalWord) return 4;
+
+		var oSelection = new xe.XpressRange(this.window);
+		oSelection.setFromSelection();
+
+		bCaseMatch = bCaseMatch || false;
+		var bMatch, selectedText = oSelection.toString();
+		if(bCaseMatch)
+			bMatch = (selectedText == sOriginalWord);
+		else
+			bMatch = (selectedText.toLowerCase() == sOriginalWord.toLowerCase());
+
+		if(!bMatch)
+			return this.find(sOriginalWord, bCaseMatch, bBackwards, bWholeWord)+2;
+
+		if(typeof Replacement == "function"){
+			// the returned oSelection must contain the replacement
+			oSelection = Replacement(oSelection);
+		}else{
+			oSelection.pasteHTML(Replacement);
+		}
+
+		// force it to find the NEXT occurance of sOriginalWord
+		oSelection.select();
+
+		return this.find(sOriginalWord, bCaseMatch, bBackwards, bWholeWord);
+	},
+
+	// returns number of replaced words
+	// -1 : if original word is not given
+	replaceAll : function(sOriginalWord, Replacement, bCaseMatch, bWholeWord){
+		if(!sOriginalWord) return -1;
+
+		var bBackwards = false;
+
+		var iReplaceResult;
+		var iResult = 0;
+		var win = this.window;
+		var oSelection = new xe.XpressRange(this.window);
+		oSelection.setFromSelection();
+		var sBookmark = oSelection.placeStringBookmark();
+
+		this.bEOC = false;
+		while(!this.bEOC){
+			iReplaceResult = this.replace(sOriginalWord, Replacement, bCaseMatch, bBackwards, bWholeWord);
+			if(iReplaceResult == 0 || iReplaceResult == 1) iResult++;
+		}
+
+		var startingPointReached = function(){
+			var oCurSelection = new xe.XpressRange(win);
+			oCurSelection.setFromSelection();
+
+			oSelection.moveToBookmark(sBookmark);
+			var pos = oSelection.compareBoundaryPoints(xe.W3CDOMRange.START_TO_END, oCurSelection);
+
+			if(pos == 1) return false;
+			return true;
+		}
+
+		iReplaceResult = 0;
+		this.bEOC = false;
+		while(!startingPointReached() && iReplaceResult == 0 && !this.bEOC){
+			iReplaceResult = this.replace(sOriginalWord, Replacement, bCaseMatch, bBackwards, bWholeWord);
+			if(iReplaceResult == 0 || iReplaceResult == 1) iResult++;
+		}
+
+		oSelection.moveToBookmark(sBookmark);
+		oSelection.select();
+		oSelection.removeStringBookmark(sBookmark);
+
+		return iResult;
+	}
+});
+
+/**
+ * @fileOverview This file contains a function that takes care of the draggable layers
+ * @name N_DraggableLayer.js
+ */
+xe.DraggableLayer = jQuery.Class({
+	$init : function(oLayer, oOptions){
+		this.oOptions = jQuery.extend({
+			bModal : "false",
+			oHandle : oLayer,
+			iMinX : -999999,
+			iMinY : -999999,
+			iMaxX : 999999,
+			iMaxY : 999999
+		}, oOptions);
+
+		this.oHandle = this.oOptions.oHandle;
+
+		oLayer.style.display = "block";
+		oLayer.style.position = "absolute";
+		oLayer.style.zIndex = "9999";
+
+		this.aBasePosition = this.getBaseOffset(oLayer);
+
+		// "number-ize" the position and set it as inline style. (the position could've been set as "auto" or set  by css, not inline style)
+		oLayer.style.top = (this.toInt(jQuery(oLayer).offset().top) - this.aBasePosition.top)+"px";
+		oLayer.style.left = (this.toInt(jQuery(oLayer).offset().left) - this.aBasePosition.left)+"px";
+
+		this.$FnMouseDown = jQuery.fnBind(this._mousedown, this, oLayer);
+		this.$FnMouseMove = jQuery.fnBind(this._mousemove, this, oLayer);
+		this.$FnMouseUp = jQuery.fnBind(this._mouseup, this, oLayer);
+
+		jQuery(this.oHandle).bind("mousedown", this.$FnMouseDown);
+	},
+
+	_mousedown : function(oLayer, oEvent){
+		if(oEvent.target.tagName == "INPUT") return;
+
+		this.MouseOffsetY = (oEvent.pageY-this.toInt(oLayer.style.top)-this.aBasePosition['top']);
+		this.MouseOffsetX = (oEvent.pageX-this.toInt(oLayer.style.left)-this.aBasePosition['left']);
+
+		jQuery(oLayer).bind("mousemove", this.$FnMouseMove);
+		jQuery(oLayer).bind("mouseup", this.$FnMouseUp);
+	},
+
+	_mousemove : function(oLayer, oEvent){
+		var iTop = (oEvent.pageY-this.MouseOffsetY-this.aBasePosition['top']);
+		var iLeft = (oEvent.pageX-this.MouseOffsetX-this.aBasePosition['left']);
+
+		if(iTop<this.oOptions.iMinY) iTop = this.oOptions.iMinY;
+		if(iTop>this.oOptions.iMaxY) iTop = this.oOptions.iMaxY;
+
+		if(iLeft<this.oOptions.iMinX) iLeft = this.oOptions.iMinX;
+		if(iLeft>this.oOptions.iMaxX) iLeft = this.oOptions.iMaxX;
+
+		oLayer.style.top = iTop + "px";
+		oLayer.style.left = iLeft + "px";
+	},
+
+	_mouseup : function(oLayer, oEvent){
+		jQuery(oLayer).unbind("mousemove", this.$FnMouseMove);
+		jQuery(oLayer).unbind("mouseup", this.$FnMouseUp);
+	},
+
+	toInt : function(num){
+		var result = parseInt(num);
+		return result || 0;
+	},
+
+	findNonStatic : function(oEl){
+		if(!oEl) return null;
+		if(oEl.tagName == "BODY") return oEl;
+
+		if(jQuery(oEl).css("position").match(/absolute|relative/i)) return oEl;
+
+		return this.findNonStatic(oEl.offsetParent);
+	},
+
+	getBaseOffset : function(oEl){
+		var oBase = this.findNonStatic(oEl.offsetParent);
+		var tmp = jQuery(oBase).offset();
+
+		return {top: tmp.top, left: tmp.left};
+	}
+});
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the messages related to core operations
+ * @name hp_CorePlugin.js
+ */
+xe.CorePlugin = jQuery.Class({
+	name : "CorePlugin",
+
+	$init : function(funcOnReady){
+		this.funcOnReady = funcOnReady;
+	},
+
+	$AFTER_MSG_APP_READY : function(){
+		this.oApp.exec("EXEC_ON_READY_FUNCTION", []);
+	},
+
+	$ON_ADD_APP_PROPERTY : function(sPropertyName, oProperty){
+		this.oApp[sPropertyName] = oProperty;
+	},
+
+	$ON_REGISTER_BROWSER_EVENT : function(obj, sEvent, sCMD, aParams, nDelay){
+		this.oApp.registerBrowserEvent(obj, sEvent, sCMD, aParams, nDelay);
+	},
+
+	$ON_DISABLE_COMMAND : function(sCommand){
+		this.oApp.disableCommand(sCommand, true);
+	},
+
+	$ON_ENABLE_COMMAND : function(sCommand){
+		this.oApp.disableCommand(sCommand, false);
+	},
+
+	$ON_EXEC_ON_READY_FUNCTION : function(){
+		if(typeof this.funcOnReady == "function") this.funcOnReady();
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that helps various operations.
+ * @name hp_Utils.js
+ */
+ xe.Utils = jQuery.Class({
+	name : "Utils",
+
+	$init : function(){
+		if(jQuery.browser.msie && jQuery.browser.nVersion == 6){
+			try{
+				document.execCommand('BackgroundImageCache', false, true);
+			}catch(e){}
+		}
+	},
+
+	$ON_ATTACH_HOVER_EVENTS : function(aElms, sHoverClass){
+		sHoverClass = sHoverClass || "hover";
+
+		if(!aElms) return;
+
+		jQuery(aElms).hover(
+			function(){jQuery(this).addClass(sHoverClass)},
+			function(){jQuery(this).removeClass(sHoverClass)}
+		);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that bridges the XpressRange function
+ * @name hp_XpressRangeManager.js
+ */
+xe.XpressRangeManager = jQuery.Class({
+	name : "XpressRangeManager",
+
+	oWindow : null,
+
+	$init : function(win){
+		this.oWindow = win || window;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		if(this.oWindow && this.oWindow.tagName == "IFRAME")
+			this.oWindow = this.oWindow.contentWindow;
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getSelection", jQuery.fnBind(this.getSelection, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getEmptySelection", jQuery.fnBind(this.getEmptySelection, this)]);
+	},
+
+	$ON_SET_EDITING_WINDOW : function(oWindow){
+		this.oWindow = oWindow;
+	},
+
+	getEmptySelection : function(){
+		var oXpressRange = new xe.XpressRange(this.oWindow);
+		return oXpressRange;
+	},
+
+	getSelection : function(){
+		this.oApp.exec("RESTORE_IE_SELECTION", []);
+
+		var oXpressRange = this.getEmptySelection();
+
+		// this may throw an exception if the selected is area is not yet shown
+		try{
+			oXpressRange.setFromSelection();
+		}catch(e){}
+
+		return oXpressRange;
+	}
+});
+//}
+xe.Hotkey = jQuery.Class({
+	name : "Hotkey",
+
+	target  : null,
+	handler : null,
+	storage : {},
+	keyhash : {},
+
+	$init : function(){
+		this.storage = {};
+
+		this.keyhash = {
+			backspace : 8,
+			tab		  : 9,
+			enter	  : 13,
+			shift     : 16,
+			ctrl      : 17,
+			alt       : 18,
+			meta      : 224,
+			esc		  : 27,
+			space	  : 32,
+			pageup	  : 33,
+			pagedown  : 34,
+			end		  : 35,
+			home	  : 36,
+			left	  : 37,
+			up		  : 38,
+			right	  : 39,
+			down	  : 40,
+			del	  	  : 46,
+			comma	  : 188,//(,)
+			period	  : 190,//(.)
+			slash	  : 191,//(/)
+			hyphen    : 109,
+			equal     : 61
+		};
+
+		if (jQuery.browser.msie || jQuery.browser.safari) {
+			this.keyhash.hyphen = 189; // (-)
+			this.keyhash.equal = 187;  // (=)
+			this.keyhash.meta  = 91;   // meta
+		}
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.target  = this.oApp.getWYSIWYGDocument() || document;
+		this.handler = jQuery.fnBind(this.keydown, this);
+
+		jQuery(this.target).keydown(this.handler);
+	},
+
+	$ON_MSG_APP_DESTORY : function(){
+		jQuery(this.target).unbind('keydown', this.handler);
+	},
+
+	$ON_REGISTER_HOTKEY : function(sHotkey, sCMD, sArgs){
+		if(!sArgs) sArgs = [];
+		var func = jQuery.fnBind(this.oApp.exec, this.oApp, sCMD, sArgs);
+
+		sHotkey = this.normalize(sHotkey);
+		if (!sHotkey) return false;
+
+		this.add(sHotkey, func);
+	},
+
+	add : function(sHotkey, func) {
+		if (typeof this.storage[sHotkey] == 'undefined') {
+			this.storage[sHotkey] = [func];
+		} else {
+			this.storage[sHotkey].push(func);
+		}
+	},
+
+	keydown : function(event) {
+		var key  = [], kh = this.keyhash;
+		var code = event.keyCode;
+
+		if (jQuery.inArray(event.keyCode, [kh.shift, kh.ctrl, kh.alt, kh.meta]) >= 0) return;
+
+		if (event.shiftKey) key.push('shift');
+		if (event.altKey)   key.push('alt');
+		if (event.ctrlKey)  key.push('ctrl');
+		if (event.metaKey)  key.push('meta');
+		if (!key.length && code != kh.enter && code != kh.esc) return;
+		if (key.length == 1 && event.metaKey) key = ['ctrl', 'meta'];
+
+		key.push(code);
+		key = key.join('+');
+
+		if (!this.storage[key]) return;
+
+		jQuery.each(this.storage[key], function(){ this(); });
+
+		event.preventDefault();
+		event.stopPropagation();
+		event.keyCode = 0;
+
+		return false;
+	},
+
+	normalize : function(sHotkey) {
+		var shift, ctrl, alt, meta, key, keys = (sHotkey||"").toLowerCase().split('+');
+
+		shift = ctrl = alt = meta = key = false;
+
+		jQuery.each(keys, function(){
+			var s = ""+this;
+			switch(s) {
+				case 'shift': shift = true;
+				case 'alt'  : alt   = true;
+				case 'ctrl' : ctrl  = true;
+				case 'meta' : meta  = true;
+				default:
+					key = s;
+			}
+		});
+
+		if (!key) return '';
+
+		keys = [];
+		if (shift) keys.push('shift');
+		if (alt) keys.push('alt');
+		if (ctrl) keys.push('ctrl');
+		if (meta || (ctrl && !shift && !alt)) keys.push('meta');
+
+		keys.push(this.keyhash[key] || key.toUpperCase().charCodeAt(0));
+
+		return keys.join('+');
+	}
+});
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the draggable layers
+ * @name hp_DialogLayerManager.js
+ */
+xe.DialogLayerManager = jQuery.Class({
+	name : "DialogLayerManager",
+	aMadeDraggable : null,
+	aOpenedLayers : null,
+
+	$init : function(){
+		this.aMadeDraggable = [];
+		this.aOpenedLayers = [];
+	},
+
+	$ON_SHOW_DIALOG_LAYER : function(oLayer, bModal){
+		oLayer = jQuery.$(oLayer);
+		bModal = jQuery.$(bModal) || false;
+		if(!oLayer) return;
+
+		if(jQuery.inArray(oLayer, this.aOpenedLayers)) return;
+
+		this.oApp.exec("POSITION_DIALOG_LAYER", [oLayer]);
+
+		this.aOpenedLayers[this.aOpenedLayers.length] = oLayer;
+
+		if(!jQuery.inArray(oLayer, this.aMadeDraggable)){
+			new xe.DraggableLayer(oLayer, {bModal: bModal, iMinY: 0});
+			this.aMadeDraggable[this.aMadeDraggable.length] = oLayer;
+		}else{
+			oLayer.style.display = "block";
+		}
+	},
+
+	$ON_HIDE_LAST_DIALOG_LAYER : function(){
+		this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[this.aOpenedLayers.length-1]]);
+	},
+
+	$ON_HIDE_ALL_DIALOG_LAYER : function(){
+		for(var i=this.aOpenedLayers.length-1; i>=0; i--)
+			this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[i]]);
+	},
+
+	$ON_HIDE_DIALOG_LAYER : function(oLayer){
+		oLayer = jQuery.$(oLayer);
+
+		if(oLayer) oLayer.style.display = "none";
+		this.aOpenedLayers = jQuery.grep(this.aOpenedLayers, function(a){return a!=oLayer});
+	},
+
+	$ON_SET_DIALOG_LAYER_POSITION : function(oLayer, iTop, iLeft){
+		oLayer.style.top = iTop;
+		oLayer.style.left = iLeft;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the layers that should disappear when the focus is lost
+ * @name hp_ActiveLayerManager.js
+ */
+xe.ActiveLayerManager = jQuery.Class({
+	name : "ActiveLayerManager",
+	oCurrentLayer : null,
+
+	$ON_TOGGLE_ACTIVE_LAYER : function(oLayer, sOnOpenCmd, aOnOpenParam, sOnCloseCmd, aOnCloseParam){
+		if(oLayer == this.oCurrentLayer){
+			this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+		}else{
+			this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sOnCloseCmd, aOnCloseParam]);
+			if(sOnOpenCmd) this.oApp.exec(sOnOpenCmd, aOnOpenParam);
+		}
+	},
+
+	$ON_SHOW_ACTIVE_LAYER : function(oLayer, sOnCloseCmd, aOnCloseParam){
+		oLayer = jQuery.$(oLayer);
+		this.sOnCloseCmd = sOnCloseCmd;
+		this.aOnCloseParam = aOnCloseParam;
+
+		var oPrevLayer = this.oCurrentLayer;
+
+		if(oLayer == oPrevLayer) return;
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+
+		oLayer.style.display = "block";
+		this.oCurrentLayer = oLayer;
+	},
+
+	$ON_HIDE_ACTIVE_LAYER : function(){
+		var oLayer = this.oCurrentLayer;
+		if(!oLayer) return;
+		oLayer.style.display = "none";
+		this.oCurrentLayer = null;
+
+		if(this.sOnCloseCmd)
+			this.oApp.exec(this.sOnCloseCmd, this.aOnCloseParam);
+	},
+
+	// for backward compatibility only.
+	// use HIDE_ACTIVE_LAYER instead!
+	$ON_HIDE_CURRENT_ACTIVE_LAYER : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_MOUSEDOWN : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to string conversion. Ususally used to convert the IR value.
+ * @name hp_StringConverterManager.js
+ */
+xe.StringConverterManager = jQuery.Class({
+	name : "StringConverterManager",
+
+	oConverters : null,
+
+	$init : function(){
+		this.oConverters = {};
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("ADD_APP_PROPERTY", ["applyConverter", jQuery.fnBind(this.applyConverter, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["addConverter", jQuery.fnBind(this.addConverter, this)]);
+	},
+
+	applyConverter : function(sRuleName, sContent){
+		var aConverters = this.oConverters[sRuleName];
+		if(!aConverters) return sContent;
+
+		for(var i=0; i<aConverters.length; i++) sContent = aConverters[i](sContent);
+
+		return sContent;
+	},
+
+	addConverter : function(sRuleName, funcConverter){
+		var aConverters = this.oConverters[sRuleName];
+		if(!aConverters) this.oConverters[sRuleName] = [];
+
+		this.oConverters[sRuleName][this.oConverters[sRuleName].length] = funcConverter;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that maps a message code to the actual message
+ * @name hp_MessageManager.js
+ */
+xe.MessageManager = jQuery.Class({
+	name : "MessageManager",
+
+	oMessageMap : null,
+
+	$init : function(oMessageMap){
+		this.oMessageMap = oMessageMap;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("ADD_APP_PROPERTY", ["$MSG", jQuery.fnBind(this.getMessage, this)]);
+	},
+
+	getMessage : function(sMsg){
+		if(this.oMessageMap[sMsg]) return unescape(this.oMessageMap[sMsg]);
+
+		return sMsg;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to the tool bar UI
+ * @name hp_XE_Toolbar.js
+ */
+xe.XE_Toolbar = jQuery.Class({
+	name : "XE_Toolbar",
+	toolbarArea : null,
+	toolbarButton : null,
+	uiNameTag : "uiName",
+
+	sUIClassPrefix : "xpress_xeditor_ui_",
+
+	aUICmdMap : null,
+
+	$init : function(oAppContainer){
+		this.htUIList = {};
+
+		this.aUICmdMap = {};
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = jQuery.$(oAppContainer) || document;
+		this.toolbarArea = jQuery(".tool", oAppContainer).get(0);
+		this.welToolbarArea = jQuery(this.toolbarArea);
+
+		this.aAllButtons = jQuery("BUTTON", this.toolbarArea).get();
+
+		var aAllLi = this.toolbarArea.getElementsByTagName("LI");
+		var nCount = aAllLi.length;
+		var rxUI = new RegExp(this.sUIClassPrefix+"([^ ]+)");
+		for(var i=0; i<nCount; i++){
+			if(rxUI.test(aAllLi[i].className)){
+				var sUIName = RegExp.$1;
+				if(this.htUIList[sUIName] != null) continue;
+
+				this.htUIList[sUIName] = jQuery(">*:first-child", aAllLi[i]).get(0);
+			}
+		}
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseover", "EVENT_TOOLBAR_MOUSEOVER", []);
+		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseout", "EVENT_TOOLBAR_MOUSEOUT", []);
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getToolbarButtonByUIName", jQuery.fnBind(this.getToolbarButtonByUIName, this)]);
+	},
+
+	$ON_EVENT_TOOLBAR_MOUSEOVER : function(weEvent){
+		if(weEvent.target.tagName == "BUTTON") jQuery(weEvent.target).addClass("hover").parent("span").addClass("hover");
+	},
+
+	$ON_EVENT_TOOLBAR_MOUSEOUT : function(weEvent){
+		if(weEvent.target.tagName == "BUTTON") jQuery(weEvent.target).removeClass("hover").parent("span").removeClass("hover");
+	},
+
+	$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER : function(oLayer, oBtn, sOpenCmd, aOpenArgs, sCloseCmd, aCloseArgs){
+		this.oApp.exec("TOGGLE_ACTIVE_LAYER", [oLayer, "MSG_TOOLBAR_LAYER_SHOWN", [oLayer, oBtn, sOpenCmd, aOpenArgs], sCloseCmd, aCloseArgs]);
+	},
+
+	$ON_MSG_TOOLBAR_LAYER_SHOWN : function(oLayer, oBtn, aOpenCmd, aOpenArgs){
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
+		if(aOpenCmd) this.oApp.exec(aOpenCmd, aOpenArgs);
+	},
+
+	$ON_SHOW_TOOLBAR_ACTIVE_LAYER : function(oLayer, sCmd, aArgs, oBtn){
+		this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sCmd, aArgs]);
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
+	},
+
+	$ON_ENABLE_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		jQuery(elUI).removeClass("off");
+		elUI.disabled = false;
+
+		// enable related commands
+		var sCmd = "";
+		if(this.aUICmdMap[sUIName]){
+			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
+				sCmd = this.aUICmdMap[sUIName][i];
+				this.oApp.exec("ENABLE_COMMAND", [sCmd]);
+			}
+		}
+	},
+
+	$ON_DISABLE_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		jQuery(elUI).addClass("off");
+		jQuery(elUI).removeClass("hover").parent("span").removeClass("hover");
+		elUI.disabled = true;
+
+		// disable related commands
+		var sCmd = "";
+		if(this.aUICmdMap[sUIName]){
+			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
+				sCmd = this.aUICmdMap[sUIName][i];
+				this.oApp.exec("DISABLE_COMMAND", [sCmd]);
+			}
+		}
+	},
+
+	$ON_SELECT_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		jQuery(elUI).addClass("active");
+	},
+
+	$ON_DESELECT_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		jQuery(elUI).removeClass("active");
+	},
+
+	$ON_ENABLE_ALL_UI : function(){
+		var sUIName, className;
+
+		for(var sUIName in this.htUIList){
+			if(sUIName) this.oApp.exec("ENABLE_UI", [sUIName]);
+		}
+		jQuery(this.toolbarArea).removeClass("off");
+	},
+
+	$ON_DISABLE_ALL_UI : function(){
+		var sUIName;
+
+		for(var sUIName in this.htUIList){
+			if(sUIName) this.oApp.exec("DISABLE_UI", [sUIName]);
+		}
+		jQuery(this.toolbarArea).addClass("off");
+		this.oApp.exec("HIDE_ACTIVE_LAYER",[]);
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, attributeValue){
+		if(attributeValue == 1)
+			this.oApp.exec("SELECT_UI", [sAttributeName]);
+		else
+			this.oApp.exec("DESELECT_UI", [sAttributeName]);
+	},
+
+	$ON_REGISTER_UI_EVENT : function(sUIName, sEvent, sCmd, aParams){
+		// map cmd & ui
+		if(!this.aUICmdMap[sUIName]){this.aUICmdMap[sUIName] = [];}
+		this.aUICmdMap[sUIName][this.aUICmdMap[sUIName].length] = sCmd;
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		this.oApp.registerBrowserEvent(elUI, sEvent, sCmd, aParams);
+	},
+
+	$ON_POSITION_TOOLBAR_LAYER : function(oLayer, oBtn){
+		oLayer = jQuery.$(oLayer);
+		oBtn = jQuery.$(oBtn);
+
+		if(!oLayer) return;
+		if(oBtn && oBtn.tagName && oBtn.tagName == "BUTTON") oBtn.parentNode.appendChild(oLayer);
+
+		oLayer.style.left = "0";
+
+		var welLayer = jQuery(oLayer);
+		var nLayerLeft = welLayer.offset().left;
+		nLayerLeft += oLayer.offsetWidth;
+
+		var nToolbarLeft = this.welToolbarArea.offset().left;
+		nToolbarLeft += this.toolbarArea.offsetWidth;
+
+		if(nLayerLeft > nToolbarLeft) oLayer.style.left = (nToolbarLeft-nLayerLeft-5)+"px";
+	},
+
+	getToolbarButtonByUIName : function(sUIName){
+		return this.htUIList[sUIName];
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that manages multiple number editing area plugins and the IR value
+ * @name hp_XE_EditingAreaManager.js
+ */
+xe.XE_EditingAreaManager = jQuery.Class({
+	name : "XE_EditingAreaManager",
+
+	// Currently active plugin instance(XE_EditingArea_???)
+	oActivePlugin : null,
+
+	// Intermediate Representation of the content being edited.
+	// This should be a textarea element.
+	oIRField : null,
+
+	bIsDirty : false,
+
+	$init : function(sInitialMode, oIRField, oDimension, fOnBeforeUnload, oAppContainer){
+		this.sInitialMode = sInitialMode;
+		this.oIRField = jQuery.$(oIRField);
+		this._assignHTMLObjects(oAppContainer);
+		this.fOnBeforeUnload = fOnBeforeUnload;
+
+		this.oEditingMode = {};
+
+		this.elEditingAreaContainer.style.height = parseInt(oDimension.nHeight || this.elEditingAreaContainer.offsetHeight)+"px";
+
+		this.nMinHeight = oDimension.nMinHeight || 10;
+		this.niMinWidth = oDimension.nMinWidth || 10;
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = jQuery.$(oAppContainer) || document;
+		this.elEditingAreaContainer = jQuery("DIV.xpress_xeditor_editing_area_container", oAppContainer).get(0);
+		this.elEditingAreaSkipUI = jQuery("A.skip", oAppContainer).get(0);
+	},
+
+	$BEFORE_MSG_APP_READY : function(msg){
+		this.oApp.exec("ADD_APP_PROPERTY", ["elEditingAreaContainer", this.elEditingAreaContainer]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getIR", jQuery.fnBind(this.getIR, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["setIR", this.setIR]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getEditingMode", jQuery.fnBind(this.getEditingMode, this)]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("CHANGE_EDITING_MODE", [this.sInitialMode, true]);
+		this.oApp.exec("LOAD_IR_FIELD", [false]);
+
+		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "focus", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
+		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "blur", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
+
+		//var fOnBeforeUnload = this.fOnBeforeUnload||function(){if(this.getIR() != this.oIRField.value || this.bIsDirty) return this.oApp.$MSG("XE_EditingAreaManager.onExit")};
+		//jQuery(window).bind("beforeunload", jQuery.fnBind(fOnBeforeUnload, this));
+	},
+
+	$AFTER_MSG_APP_READY : function(){
+		this.oApp.exec("UPDATE_IR_FIELD", []);
+	},
+
+	$ON_LOAD_IR_FIELD : function(bDontAddUndo){
+		this.oApp.setIR(this.oIRField.value, bDontAddUndo);
+	},
+
+	$ON_UPDATE_IR_FIELD : function(){
+		this.oIRField.value = this.oApp.getIR();
+	},
+
+	$BEFORE_CHANGE_EDITING_MODE : function(sMode){
+		this._oPrevActivePlugin = this.oActivePlugin;
+		this.oActivePlugin = this.oEditingMode[sMode];
+	},
+
+	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(this._oPrevActivePlugin){
+			var sIR = this._oPrevActivePlugin.getIR();
+			this.oApp.exec("SET_IR", [sIR]);
+
+			this.oApp.exec("ENABLE_UI", [this._oPrevActivePlugin.sMode]);
+
+			this._setEditingAreaDimension();
+		}
+		this.oApp.exec("DISABLE_UI", [this.oActivePlugin.sMode]);
+
+		if(!bNoFocus){
+			this.oApp.exec("FOCUS", []);
+		}
+	},
+
+	$ON_SET_IS_DIRTY : function(bIsDirty){
+		this.bIsDirty = bIsDirty;
+	},
+
+	$ON_FOCUS : function(){
+		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
+
+		this.oActivePlugin.focus();
+	},
+
+	$BEFORE_SET_IR : function(sIR, bDontAddUndoHistory){
+		bDontAddUndoHistory = bDontAddUndoHistory || false;
+		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
+	},
+
+	$ON_SET_IR : function(sIR){
+		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
+
+		this.oActivePlugin.setIR(sIR);
+	},
+
+	$AFTER_SET_IR : function(sIR, bDontAddUndoHistory){
+		bDontAddUndoHistory = bDontAddUndoHistory || false;
+		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
+	},
+
+	$ON_REGISTER_EDITING_AREA : function(oEditingAreaPlugin){
+		this.oEditingMode[oEditingAreaPlugin.sMode] = oEditingAreaPlugin;
+		this.attachDocumentEvents(oEditingAreaPlugin.oEditingArea);
+	},
+
+	$ON_MSG_EDITING_AREA_RESIZE_STARTED : function(){
+		this.oActivePlugin.elEditingArea.style.display = "none";
+
+		this.iStartingHeight = parseInt(this.elEditingAreaContainer.style.height);
+	},
+
+	$ON_RESIZE_EDITING_AREA: function(ipNewWidth, ipNewHeight){
+		var iNewWidth = parseInt(ipNewWidth);
+		var iNewHeight = parseInt(ipNewHeight);
+
+		if(iNewWidth < this.niMinWidth) iNewWidth = this.niMinWidth;
+		if(iNewHeight < this.nMinHeight) iNewHeight = this.nMinHeight;
+
+		if(ipNewWidth) this.elEditingAreaContainer.style.width = iNewWidth + "px";
+		if(ipNewHeight) this.elEditingAreaContainer.style.height = iNewHeight + "px";
+	},
+
+	$ON_RESIZE_EDITING_AREA_BY : function(ipWidthChange, ipHeightChange){
+		var iWidthChange = parseInt(ipWidthChange);
+		var iHeightChange = parseInt(ipHeightChange);
+
+		var iWidth = this.elEditingAreaContainer.style.width?parseInt(this.elEditingAreaContainer.style.width)+iWidthChange:null;
+		var iHeight = this.elEditingAreaContainer.style.height?this.iStartingHeight+iHeightChange:null;
+
+		this.oApp.exec("RESIZE_EDITING_AREA", [iWidth, iHeight]);
+	},
+
+	$ON_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
+		this.oActivePlugin.elEditingArea.style.display = "block";
+		this._setEditingAreaDimension();
+	},
+
+	_setEditingAreaDimension : function(){
+		this.oActivePlugin.elEditingArea.style.height = this.elEditingAreaContainer.style.height;
+		this.oActivePlugin.elEditingArea.style.width = this.elEditingAreaContainer.style.width;
+	},
+
+	attachDocumentEvents : function(doc){
+		this.oApp.registerBrowserEvent(doc, "click", "EVENT_EDITING_AREA_CLICK");
+		this.oApp.registerBrowserEvent(doc, "mousedown", "EVENT_EDITING_AREA_MOUSEDOWN");
+		this.oApp.registerBrowserEvent(doc, "mousemove", "EVENT_EDITING_AREA_MOUSEMOVE");
+		this.oApp.registerBrowserEvent(doc, "mouseup", "EVENT_EDITING_AREA_MOUSEUP");
+		this.oApp.registerBrowserEvent(doc, "keydown", "EVENT_EDITING_AREA_KEYDOWN");
+		this.oApp.registerBrowserEvent(doc, "keypress", "EVENT_EDITING_AREA_KEYPRESS");
+		this.oApp.registerBrowserEvent(doc, "keyup", "EVENT_EDITING_AREA_KEYUP");
+	},
+
+	getIR : function(){
+		return this.oActivePlugin.getIR();
+	},
+
+	setIR : function(sIR, bDontAddUndo){
+		this.oApp.exec("SET_IR", [sIR, bDontAddUndo]);
+	},
+
+	getEditingMode : function(){
+		return this.oActivePlugin.sMode;
+	}
+});
+//}
+
+//{
+/**
+  * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to editing the HTML source code using Textarea element
+ * @name hp_XE_EditingArea_HTMLSrc.js
+ * @required XE_EditingAreaManager
+ */
+xe.XE_EditingArea_HTMLSrc = jQuery.Class({
+	name : "XE_EditingArea_HTMLSrc",
+
+	sMode : "HTMLSrc",
+	textarea : null,
+
+	$init : function(textarea){
+		this.textarea = jQuery.$(textarea);
+		this.elEditingArea = this.textarea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oEditingArea = this.textarea;
+		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(sMode == this.sMode){
+			this.textarea.style.display = "block";
+		}else{
+			this.textarea.style.display = "none";
+		}
+	},
+
+	$ON_PASTE_HTML : function(sHTML, oPSelection){
+		if(this.oApp.getEditingMode() != this.sMode) return;
+
+		var o = new TextRange(this.textarea);
+		o.paste(sHTML);
+		this.textarea.focus();
+	},
+
+	getIR : function(){
+		var sIR;
+		var sContent = this.textarea.value;
+
+		if(this.oApp.applyConverter)
+			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
+		else
+			sIR = sContent;
+
+		return sIR;
+	},
+
+	setIR : function(sIR){
+		var sContent;
+
+		if(this.oApp.applyConverter)
+			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
+		else
+			sContent = sIR;
+
+		this.textarea.value = sContent;
+	},
+
+	focus : function(){
+		this.textarea.focus();
+	}
+});
+
+var TextRange = function(oEl) {
+	this._o = oEl;
+};
+
+/**
+ * Selection for textfield
+ *
+ * @author hooriza
+ */
+TextRange.prototype.getSelection = function() {
+	var obj = this._o;
+	var ret = [ -1, -1 ];
+
+	if (isNaN(this._o.selectionStart)) {
+		obj.focus();
+
+		// textarea support added by nagoon97
+		var range = document.body.createTextRange();
+		var rangeField = null;
+
+		rangeField = document.selection.createRange().duplicate();
+		range.moveToElementText(obj);
+		rangeField.collapse(true);
+		range.setEndPoint("EndToEnd", rangeField);
+		ret[0] = range.text.length;
+
+		rangeField = document.selection.createRange().duplicate();
+		range.moveToElementText(obj);
+		rangeField.collapse(false);
+		range.setEndPoint("EndToEnd", rangeField);
+		ret[1] = range.text.length;
+
+		obj.blur();
+	} else {
+		ret[0] = obj.selectionStart;
+		ret[1] = obj.selectionEnd;
+	}
+
+	return ret;
+};
+
+TextRange.prototype.setSelection = function(start, end) {
+
+	var obj = this._o;
+	if (typeof end == 'undefined') end = start;
+
+	if (obj.setSelectionRange) {
+
+		obj.setSelectionRange(start, end);
+
+	} else if (obj.createTextRange) {
+
+		var range = obj.createTextRange();
+
+		range.collapse(true);
+		range.moveStart("character", start);
+		range.moveEnd("character", end - start);
+		range.select();
+
+		obj.blur();
+	}
+
+};
+
+TextRange.prototype.copy = function() {
+
+	var r = this.getSelection();
+	return this._o.value.substring(r[0], r[1]);
+
+};
+
+TextRange.prototype.paste = function(sStr) {
+
+	var obj = this._o;
+	var sel = this.getSelection();
+
+	var value = obj.value;
+
+	var pre = value.substr(0, sel[0]);
+	var post = value.substr(sel[1]);
+
+	value = pre + sStr + post;
+	obj.value = value;
+
+	var n = 0;
+	if ( typeof document.body.style.maxHeight == "undefined" ) {
+		var a = pre.match( /\n/gi );
+		n = ( a != null ? a.length : 0 );
+	}
+	this.setSelection(sel[0] + sStr.length - n );
+
+};
+
+TextRange.prototype.cut = function() {
+	var r = this.copy();
+	this.paste('');
+
+	return r;
+};
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to WYSIWYG iframe
+ * @name hp_XE_EditingArea_WYSIWYG.js
+ */
+xe.XE_EditingArea_WYSIWYG = jQuery.Class({
+	name : "XE_EditingArea_WYSIWYG",
+	status : xe.PLUGIN_STATUS["NOT_READY"],
+
+	sMode : "WYSIWYG",
+	iframe : null,
+	doc : null,
+
+	iLastUndoRecorded : 0,
+	iMinUndoInterval : 3000,
+
+	_nIFrameReadyCount : 50,
+
+	$init : function(iframe){
+		this.iframe = jQuery.$(iframe);
+
+		this.initIframe();
+
+		this.elEditingArea = iframe;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oEditingArea = this.doc;
+		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGWindow", jQuery.fnBind(this.getWindow, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGDocument", jQuery.fnBind(this.getDocument, this)]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		// uncomment this line if you wish to use the IE-style cursor in FF
+		this.getDocument().body.style.cursor = "text";
+
+		if(jQuery.browser.msie){
+			jQuery(this.doc).bind('keydown', jQuery.fnBind(
+				function(weEvent){
+					if(this.doc.selection.type.toLowerCase() == 'control' && weEvent.keyCode == 8)  {
+						this.oApp.exec("EXECCOMMAND", ['delete', false, false]);
+						weEvent.preventDefault(); weEvent.stopPropagation();
+					}
+				}
+			, this));
+			jQuery(this.doc.body).bind('mousedown', jQuery.fnBind(
+				function(weEvent){
+					this._oIERange = null;
+					this._bIERangeReset = true;
+				}
+			, this));
+			/*
+			jQuery(this.doc.body).bind('beforedeactivate', jQuery.fnBind(
+				function(weEvent){
+					// without this, cursor won't make it inside a table.
+					// mousedown(_oIERange gets reset) -> beforedeactivate(gets fired for table) -> RESTORE_IE_SELECTION
+					if(this._bIERangeReset) return;
+
+					var tmpRange = this.getDocument().selection.createRange(0);
+					// Control range does not have parentElement
+					if(tmpRange.parentElement && tmpRange.parentElement() && tmpRange.parentElement().tagName == "INPUT"){
+						this._oIERange = this._oPrevIERange;
+					}else{
+						this._oIERange = tmpRange;
+					}
+				}
+			, this));
+			*/
+			jQuery(this.doc.body).bind('mouseup', jQuery.fnBind(
+				function(weEvent){
+					this._bIERangeReset = false;
+				}
+			, this));
+		}
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(sMode == this.sMode){
+			this.iframe.style.display = "block";
+
+			this.oApp.exec("REFRESH_WYSIWYG", []);
+			this.oApp.exec("SET_EDITING_WINDOW", [this.getWindow()]);
+		}else{
+			this.iframe.style.display = "none";
+		}
+	},
+
+	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		this._oIERange = null;
+	},
+
+	$ON_REFRESH_WYSIWYG : function(){
+		if(!jQuery.browser.mozilla) return;
+
+		this._disableWYSIWYG();
+		this._enableWYSIWYG();
+	},
+
+	$ON_ENABLE_WYSIWYG : function(){
+		this._enableWYSIWYG();
+	},
+
+	$ON_DISABLE_WYSIWYG : function(){
+		this._disableWYSIWYG();
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
+		// 33, 34: page up/down, 35,36: end/home, 37,38,39,40: left, up, right, down
+		if(oEvent.keyCode == 229 || oEvent.keyCode == 13 || oEvent.altKey || oEvent.ctrlKey || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 16) return;
+		this._recordUndo(oEvent);
+	},
+
+	$ON_PASTE_HTML : function(sHTML, oPSelection){
+		if(this.oApp.getEditingMode() != this.sMode) return;
+
+		var oSelection = oPSelection || this.oApp.getSelection();
+		oSelection.pasteHTML(sHTML);
+
+		// every browser except for IE may modify the innerHTML when it is inserted
+		if(!jQuery.browser.msie){
+			var sTmpBookmark = oSelection.placeStringBookmark();
+			this.oApp.getWYSIWYGDocument().body.innerHTML = this.oApp.getWYSIWYGDocument().body.innerHTML;
+			oSelection.moveToBookmark(sTmpBookmark);
+			oSelection.collapseToEnd();
+			oSelection.select();
+			oSelection.removeStringBookmark(sTmpBookmark);
+		}
+
+		this.oApp.exec("RECORD_UNDO_ACTION", ["INSERT HTML"]);
+	},
+
+	$AFTER_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
+		this.oApp.exec("REFRESH_WYSIWYG", []);
+	},
+
+	$ON_RESTORE_IE_SELECTION : function(){
+		if(this._oIERange){
+			this._oIERange.select();
+			this._oPrevIERange = this._oIERange;
+			this._oIERange = null;
+		}
+	},
+
+	initIframe : function(){
+		try {
+			this.doc = this.iframe.contentWindow.document;
+			if (this.doc == null || this.doc.location.href == 'about:blank') {
+				throw new Error('Access denied');
+			}
+
+			this._enableWYSIWYG();
+
+			this.status = xe.PLUGIN_STATUS["READY"];
+		} catch(e) {
+			if(this._nIFrameReadyCount-- > 0){
+				setTimeout(jQuery.fnBind(this.initIframe, this), 100);
+			}else{
+				throw("iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ");
+			}
+		}
+	},
+
+	getIR : function(){
+		var sContent = this.doc.body.innerHTML;
+		var sIR;
+
+		if(this.oApp.applyConverter)
+			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
+		else
+			sIR = sContent;
+
+		return sIR;
+	},
+
+	setIR : function(sIR){
+		var sContent;
+		if(this.oApp.applyConverter)
+			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
+		else
+			sContent = sIR;
+
+		this.doc.body.innerHTML = sContent;
+
+		if(jQuery.browser.mozilla){
+			if(this.doc.body.innerHTML == "") this.doc.body.innerHTML = "<br>";
+		}
+	},
+
+	getWindow : function(){
+		return this.iframe.contentWindow;
+	},
+
+	getDocument : function(){
+		return this.iframe.contentWindow.document;
+	},
+
+	focus : function(){
+		this.getWindow().focus();
+		this.oApp.exec("RESTORE_IE_SELECTION", []);
+	},
+
+	_recordUndo : function(oKeyInfo){
+		var curTime = new Date();
+		if(curTime-this.iLastUndoRecorded < this.iMinUndoInterval) return;
+		this.oApp.exec("RECORD_UNDO_ACTION", ["KEYPRESS"]);
+
+		this.iLastUndoRecorded = new Date();
+
+		this.prevKeyCode = oKeyInfo.keyCode;
+	},
+
+	_enableWYSIWYG : function(){
+		if (jQuery.browser.msie){
+			var fake = jQuery('<input type="text" style="position:absolute;width:1px;height:1px;left:-9px">');
+			jQuery(document.body).prepend(fake);
+			fake.focus();
+
+			this.getDocument().body.contentEditable = true;
+
+			setTimeout(function(){fake.remove()}, 100);
+		} else {
+			this.getDocument().designMode = "on";
+		}
+	},
+
+	_disableWYSIWYG : function(){
+		if (jQuery.browser.msie){
+			this.getDocument().body.contentEditable = false;
+		} else {
+			this.getDocument().designMode = "off";
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to resizing the editing area vertically
+ * @name hp_XE_EditingAreaVerticalResizer.js
+ */
+xe.XE_EditingAreaVerticalResizer = jQuery.Class({
+	name : "XE_EditingAreaVerticalResizer",
+	oResizeGrip : null,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+
+		this.$FnMouseDown = jQuery.fnBind(this._mousedown, this);
+		this.$FnMouseMove = jQuery.fnBind(this._mousemove, this);
+		this.$FnMouseUp = jQuery.fnBind(this._mouseup, this);
+
+		jQuery(this.oResizeGrip).bind("mousedown", this.$FnMouseDown);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = jQuery.$(oAppContainer) || document;
+
+		this.oResizeGrip = jQuery(".xpress_xeditor_editingArea_verticalResizer", oAppContainer).get(0);
+	},
+
+	_mousedown : function(oEvent){
+		this.iStartHeight = oEvent.clientY;
+
+		jQuery(document).bind("mousemove", this.$FnMouseMove);
+		jQuery(document).bind("mouseup", this.$FnMouseUp);
+
+		this.oApp.exec("MSG_EDITING_AREA_RESIZE_STARTED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
+	},
+
+	_mousemove : function(oEvent){
+		var iHeightChange = oEvent.clientY - this.iStartHeight;
+
+		this.oApp.exec("RESIZE_EDITING_AREA_BY", [0, iHeightChange]);
+	},
+
+	_mouseup : function(oEvent){
+		jQuery(document).unbind("mousemove", this.$FnMouseMove);
+		jQuery(document).unbind("mouseup", this.$FnMouseUp);
+
+		this.oApp.exec("MSG_EDITING_AREA_RESIZE_ENDED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the basic editor commands
+ * @name hp_XE_ExecCommand.js
+ */
+xe.XE_ExecCommand = jQuery.Class({
+	name : "XE_ExecCommand",
+	oEditingArea : null,
+
+	$init : function(oEditingArea){
+		this.oEditingArea = oEditingArea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		// the right document will be available only when the src is completely loaded
+		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
+			this.oEditingArea = this.oEditingArea.contentWindow.document;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+b", "EXECCOMMAND", ["bold", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+u", "EXECCOMMAND", ["underline", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+i", "EXECCOMMAND", ["italic", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+d", "EXECCOMMAND", ["strikethrough", false, false]]);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["bold", "click", "EXECCOMMAND", ["bold", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["underline", "click", "EXECCOMMAND", ["underline", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["italic", "click", "EXECCOMMAND", ["italic", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["lineThrough", "click", "EXECCOMMAND", ["strikethrough", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["superscript", "click", "EXECCOMMAND", ["superscript", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["subscript", "click", "EXECCOMMAND", ["subscript", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyleft", "click", "EXECCOMMAND", ["justifyleft", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifycenter", "click", "EXECCOMMAND", ["justifycenter", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyright", "click", "EXECCOMMAND", ["justifyright", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyfull", "click", "EXECCOMMAND", ["justifyfull", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["orderedlist", "click", "EXECCOMMAND", ["insertorderedlist", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["unorderedlist", "click", "EXECCOMMAND", ["insertunorderedlist", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["outdent", "click", "EXECCOMMAND", ["outdent", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["indent", "click", "EXECCOMMAND", ["indent", false, false]]);
+	},
+
+	$BEFORE_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		this._bOnlyCursorChanged = false;
+
+		this.oApp.exec("FOCUS", []);
+
+		if(sCommand.match(/^bold|underline|italic|strikethrough|superscript|subscript$/i)){
+			var oSelection = this.oApp.getSelection();
+			if(oSelection.collapsed) this._bOnlyCursorChanged = true;
+		}
+
+		if(!this._bOnlyCursorChanged){
+			this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", [sCommand]);
+		}
+	},
+
+	$ON_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		bUserInterface = (bUserInterface == "" || bUserInterface)?bUserInterface:false;
+		vValue = (vValue == "" || vValue)?vValue:false;
+
+		this.oEditingArea.execCommand(sCommand, bUserInterface, vValue);
+	},
+
+	$AFTER_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		if(!this._bOnlyCursorChanged){
+			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", [sCommand]);
+		}
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to styling the font
+ * @name hp_XE_WYSIWYGStyler.js
+ * @required XE_EditingArea_WYSIWYG, XpressRangeManager
+ */
+xe.XE_WYSIWYGStyler = jQuery.Class({
+	name : "XE_WYSIWYGStyler",
+
+	$PRECONDITION : function(sFullCommand, aArgs){
+		return (this.oApp.getEditingMode() == "WYSIWYG");
+	},
+
+	$ON_SET_WYSIWYG_STYLE : function(oStyles){
+		var oSelection = this.oApp.getSelection();
+
+		// style cursor
+		if(oSelection.collapsed){
+			var oSpan = this.oApp.getWYSIWYGDocument().createElement("SPAN");
+			oSelection.insertNode(oSpan);
+			oSpan.innerHTML = unescape("%uFEFF");
+
+			var sValue;
+			for(var sName in oStyles){
+				sValue = oStyles[sName];
+
+				if(typeof sValue != "string") continue;
+
+				oSpan.style[sName] = sValue;
+			}
+
+			oSelection.selectNodeContents(oSpan);
+			oSelection.collapseToEnd();
+			oSelection._window.focus();
+			oSelection._window.document.body.focus();
+			oSelection.select();
+
+			// FF3 will actually display %uFEFF when it is followed by a number AND certain font-family is used(like Gulim), so remove the chcaracter for FF3
+			if(jQuery.browser.mozilla && jQuery.browser.nVersion == 3)
+				oSpan.innerHTML = "";
+
+			return;
+		}
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["FONT STYLE"]);
+
+		oSelection.styleRange(oStyles);
+		oSelection._window.focus();
+		oSelection.select();
+
+		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["FONT STYLE"]);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to detecting the style change
+ * @name hp_XE_WYSIWYGStyleGetter.js
+ */
+xe.XE_WYSIWYGStyleGetter = jQuery.Class({
+	name : "XE_WYSIWYGStyleGetter",
+
+	hKeyUp : null,
+
+	getStyleInterval : 200,
+
+	oStyleMap : {
+		fontFamily : {
+			type : "Value",
+			css : "fontFamily"
+		},
+		fontSize : {
+			type : "Value",
+			css : "fontSize"
+		},
+		lineHeight : {
+			type : "Value",
+			css : "lineHeight",
+			converter : function(sValue, oStyle){
+				if(!sValue.match(/px$/)) return sValue;
+
+				return Math.ceil((parseInt(sValue)/parseInt(oStyle.fontSize))*10)/10;
+			}
+		},
+		bold : {
+			command : "bold"
+		},
+		underline : {
+			command : "underline"
+		},
+		italic : {
+			command : "italic"
+		},
+		lineThrough : {
+			command : "strikethrough"
+		},
+		superscript : {
+			command : "superscript"
+		},
+		subscript : {
+			command : "subscript"
+		},
+		justifyleft : {
+			command : "justifyleft"
+		},
+		justifycenter : {
+			command : "justifycenter"
+		},
+		justifyright : {
+			command : "justifyright"
+		},
+		justifyfull : {
+			command : "justifyfull"
+		},
+		orderedlist : {
+			command : "insertorderedlist"
+		},
+		unorderedlist : {
+			command : "insertunorderedlist"
+		}
+	},
+
+	$init : function(){
+		this.oStyle = this._getBlankStyle();
+	},
+
+	$PRECONDITION : function(){
+		if(this.oApp.getEditingMode() != "WYSIWYG") return false;
+
+		return true;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oDocument = this.oApp.getWYSIWYGDocument();
+		this.oApp.exec("ADD_APP_PROPERTY", ["getCurrentStyle", jQuery.fnBind(this.getCurrentStyle, this)]);
+	},
+
+	$ON_EVENT_EDITING_AREA_MOUSEUP : function(oEvnet){
+		if(this.hKeyUp) clearTimeout(this.hKeyUp);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
+		/*
+		backspace 8
+		page up 33
+		page down 34
+		end 35
+		home 36
+		left arrow 37
+		up arrow 38
+		right arrow 39
+		down arrow 40
+		insert 45
+		delete 46
+		*/
+		if(!(oEvent.keyCode == 8 || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 45 || oEvent.keyCode == 46)) return;
+
+		if(this.hKeyUp) clearTimeout(this.hKeyUp);
+
+		this.hKeyUp = setTimeout(jQuery.fnBind(this.oApp.exec, this.oApp, "CHECK_STYLE_CHANGE", []), this.getStyleInterval);
+	},
+
+	$ON_CHECK_STYLE_CHANGE : function(){
+		this._getStyle();
+	},
+
+	$ON_RESET_STYLE_STATUS : function(){
+		var oBlankStyle = this._getBlankStyle();
+		for(var sAttributeName in oBlankStyle)
+			this.oApp.exec("SET_STYLE_STATUS", [sAttributeName, oBlankStyle[sAttributeName]]);
+	},
+
+	getCurrentStyle : function(){
+		return this.oStyle;
+	},
+
+	_check_style_change : function(){
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	_getBlankStyle : function(){
+		var oBlankStyle = {};
+		for(var attributeName in this.oStyleMap){
+			if(this.oStyleMap[attributeName].type == "Value")
+				oBlankStyle[attributeName] = "";
+			else
+				oBlankStyle[attributeName] = 0;
+		}
+
+		return oBlankStyle;
+	},
+
+	_getStyle : function(){
+		var oSelection = this.oApp.getSelection();
+
+		var funcFilter = function(oNode){
+			if (!oNode.childNodes || oNode.childNodes.length == 0)
+				return true;
+			else
+				return false;
+		}
+
+		var aBottomNodes = oSelection.getNodes(false, funcFilter);
+
+		var oStyle, oBaseStyle, oTmpStyle, attributeName;
+		if(aBottomNodes.length == 0){
+			oStyle = this._getStyleOf(oSelection.commonAncestorContainer);
+		}else{
+			oStyle = this._getStyleOf(aBottomNodes[0]);
+		}
+
+		for(attributeName in oStyle){
+			if(this.oStyleMap[attributeName].converter){
+				oStyle[attributeName] = this.oStyleMap[attributeName].converter(oStyle[attributeName], oStyle);
+			}
+
+			if(this.oStyle[attributeName] != oStyle[attributeName])
+				this.oApp.exec("MSG_STYLE_CHANGED", [attributeName, oStyle[attributeName]]);
+		}
+
+		this.oStyle = oStyle;
+	},
+
+	_getStyleOf : function(oNode){
+		var oStyle = this._getBlankStyle();
+
+		// this must not happen
+		if(!oNode) return oStyle;
+
+		if(oNode.nodeType == 3) oNode = oNode.parentNode;
+
+		var welNode = jQuery(oNode);
+		var attribute, cssName;
+		for(var styleName in this.oStyle){
+			attribute = this.oStyleMap[styleName];
+
+			if(attribute.type && attribute.type == "Value"){
+				if(attribute.css){
+					var sValue = welNode.css(attribute.css);
+
+					if(styleName == "fontFamily"){
+						sValue = sValue.split(/,/)[0];
+					}
+
+					oStyle[styleName] = sValue;
+				}else{
+					if(attribute.command){
+						try{
+							oStyle[styleName] = this.oDocument.queryCommandState(attribute.command);
+						}catch(e){}
+					}else{
+						// todo
+					}
+				}
+			}else{
+				if(attribute.command){
+					try{
+						if(this.oDocument.queryCommandState(attribute.command)){
+							oStyle[styleName] = 1;
+						}else{
+							oStyle[styleName] = 0;
+						}
+					}catch(e){}
+				}else{
+					// todo
+				}
+			}
+		}
+		return oStyle;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font size using Select element
+ * @name hp_XE_FontSizeWithSelectUI.js
+ */
+xe.XE_FontSizeWithSelectUI = jQuery.Class({
+	name : "XE_FontSizeWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFontSizeSelect = jQuery("SELECT.xpress_xeditor_ui_fontSize_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFontSizeSelect, "change", "SET_FONTSIZE_FROM_SELECT_UI");
+		this.elFontSizeSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "fontSize"){
+			this.elFontSizeSelect.value = sAttributeValue;
+			if(this.elFontSizeSelect.selectedIndex < 0) this.elFontSizeSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_FONTSIZE_FROM_SELECT_UI : function(){
+		var sFontSize = this.elFontSizeSelect.value;
+		if(!sFontSize) return;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontSize":sFontSize}]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font name using Select element
+ * @name hp_XE_FontNameWithSelectUI.js
+ */
+xe.XE_FontNameWithSelectUI = jQuery.Class({
+	name : "XE_FontNameWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFontNameSelect = jQuery("SELECT.xpress_xeditor_ui_fontName_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFontNameSelect, "change", "SET_FONTNAME_FROM_SELECT_UI");
+		this.elFontNameSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "fontFamily"){
+			this.elFontNameSelect.value = sAttributeValue.toLowerCase();
+			if(this.elFontNameSelect.selectedIndex < 0) this.elFontNameSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_FONTNAME_FROM_SELECT_UI : function(){
+		var sFontName = this.elFontNameSelect.value;
+		if(!sFontName) return;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontFamily":sFontName}]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to setting/changing the lineheight
+ * @name hp_XE_LineHeight.js
+ */
+xe.XE_LineHeight = jQuery.Class({
+	name : "XE_LineHeight",
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+	},
+
+	$ON_SET_LINEHEIGHT : function(nLineHeight){
+		this.setLineHeight(nLineHeight);
+	},
+
+	getLineHeight : function(){
+		var nodes = this._getSelectedNodes(false);
+
+		var curWrapper, prevWrapper;
+		var iCurHeight, iHeight;
+
+		if(nodes.length == 0) return -1;
+
+		var iLength = nodes.length;
+
+		if(iLength == 0){
+			iHeight = -1;
+		}else{
+			prevWrapper = this._getLineWrapper(nodes[0]);
+			iHeight = this._getWrapperLineheight(prevWrapper);
+		}
+
+		var firstNode = this.oSelection.getStartNode();
+
+		if(iHeight > 0){
+			for(var i=1; i<iLength; i++){
+				if(this._isChildOf(nodes[i], curWrapper)) continue;
+				if(!nodes[i]) continue;
+
+				curWrapper = this._getLineWrapper(nodes[i]);
+				if(curWrapper == prevWrapper) continue;
+
+				curHeight = this._getWrapperLineheight(curWrapper);
+
+				if(curHeight != iHeight){
+					iHeight = -1;
+					break;
+				}
+
+				prevWrapper = curWrapper;
+			}
+		}
+
+		curWrapper = this._getLineWrapper(nodes[iLength-1]);
+
+		var lastNode = this.oSelection.getEndNode();
+
+		selectText = jQuery.fnBind(function(firstNode, lastNode){
+			this.oSelection.setEndNodes(firstNode, lastNode);
+			this.oSelection.select();
+		}, this, firstNode, lastNode);
+
+		setTimeout(selectText, 100);
+
+		return iHeight;
+	},
+
+	// height in percentage. For example pass 1 to set the line height to 100% and 1.5 to set it to 150%
+	setLineHeight : function(height) {
+		thisRef = this;
+
+		function _setLineheight(div, height){
+			if(!div){
+				// try to wrap with P first
+				try{
+					div = thisRef.oSelection.surroundContentsWithNewNode("P");
+				// if the range contains a block-level tag, wrap it with a DIV
+				}catch(e){
+					div = thisRef.oSelection.surroundContentsWithNewNode("DIV");
+				}
+			}
+
+			div.style.lineHeight = height;
+
+			return div;
+		}
+
+		function isInBody(node){
+			while(node && node.tagName != "BODY"){
+				node = xe.DOMFix.parentNode(node);
+			}
+			if(!node) return false;
+
+			return true;
+		}
+
+		var nodes = this._getSelectedNodes(false);
+		if(nodes.length == 0){
+			return;
+		}
+
+		var curWrapper, prevWrapper;
+		var iLength = nodes.length;
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["LINEHEIGHT"]);
+
+		prevWrapper = this._getLineWrapper(nodes[0]);
+		prevWrapper = _setLineheight(prevWrapper, height);
+
+		var startNode = prevWrapper;
+		var endNode = prevWrapper;
+
+		for(var i=1; i<iLength; i++){
+			// Skip the node if a copy of the node were wrapped and the actual node no longer exists within the document.
+			try{
+				if(!isInBody(xe.DOMFix.parentNode(nodes[i]))) continue;
+			}catch(e){continue;}
+
+			if(this._isChildOf(nodes[i], curWrapper)) continue;
+
+			curWrapper = this._getLineWrapper(nodes[i]);
+
+			if(curWrapper == prevWrapper) continue;
+
+			curWrapper = _setLineheight(curWrapper, height);
+
+			prevWrapper = curWrapper;
+		}
+
+		endNode = curWrapper || startNode;
+
+		setTimeout(jQuery.fnBind(function(startNode, endNode){
+			this.oSelection.setEndNodes(startNode, endNode);
+			this.oSelection.select();
+			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["LINEHEIGHT"]);
+		}, this, startNode, endNode), 100);
+	},
+	_getSelectedNodes : function(bDontUpdate){
+		if(!bDontUpdate)
+			this.oSelection = this.oApp.getSelection();
+
+		if(this.oSelection.collapsed) this.oSelection.selectNode(this.oSelection.commonAncestorContainer);
+
+		var nodes = this.oSelection.getTextNodes();
+
+		if(nodes.length == 0){
+			var tmp = this.oSelection.getStartNode();
+			if(tmp){
+				nodes[0] = tmp;
+			}else{
+				nodes = [];
+			}
+		}
+
+		return nodes;
+	},
+	_getWrapperLineheight : function(div){
+		var iLineHeight = '';
+		if(div && div.style.lineHeight){
+			iLineHeight = div.style.lineHeight;
+		}else{
+			div = this.oSelection.commonAncesterContainer;
+			while(div && !this.oSelection.rxLineBreaker.test(div.tagName)){
+				if(div && div.style.lineHeight){
+					iLineHeight = div.style.lineHeight;
+					break;
+				}
+				div = xe.DOMFix.parentNode(div);
+			}
+		}
+
+		return iLineHeight;
+	},
+
+	_isChildOf : function(node, container){
+		while(node && node.tagName != "BODY"){
+			if(node == container) return true;
+			node = xe.DOMFix.parentNode(node);
+		}
+
+		return false;
+	},
+ 	_getLineWrapper : function(node){
+		var oTmpSelection = this.oApp.getEmptySelection();
+		oTmpSelection.selectNode(node);
+		var oLineInfo = oTmpSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		var a, b;
+		var breakerA, breakerB;
+		var div = null;
+
+		a = oStart.oNode;
+		breakerA = oStart.oLineBreaker;
+		b = oEnd.oNode;
+		breakerB = oEnd.oLineBreaker;
+
+		this.oSelection.setEndNodes(a, b);
+
+		if(breakerA == breakerB){
+			if(breakerA.tagName == "P" || breakerA.tagName == "DIV"){
+				div = breakerA;
+			}else{
+				this.oSelection.setEndNodes(breakerA.firstChild, breakerA.lastChild);
+			}
+		}
+
+		return div;
+ 	}
+ });
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the lineheight using Select element
+ * @name hp_XE_LineHeightWithSelectUI.js
+ */
+xe.XE_LineHeightWithSelectUI = jQuery.Class({
+	name : "XE_LineHeightWithSelectUI",
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elLineHeightSelect = jQuery("SELECT.xpress_xeditor_ui_lineHeight_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elLineHeightSelect, "change", "SET_LINEHEIGHT_FROM_SELECT_UI");
+		this.elLineHeightSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "lineHeight"){
+			this.elLineHeightSelect.value = sAttributeValue;
+			if(this.elLineHeightSelect.selectedIndex < 0) this.elLineHeightSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_LINEHEIGHT_FROM_SELECT_UI : function(){
+		var nLineHeight = this.elLineHeightSelect.value;
+		if(!nLineHeight) return;
+
+		this.elLineHeightSelect.selectedIndex = 0;
+		this.oApp.exec("SET_LINEHEIGHT", [nLineHeight]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+}).extend(xe.XE_LineHeight);
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to the color palette
+ * @name hp_XE_ColorPalette.js
+ */
+ xe.XE_ColorPalette = jQuery.Class({
+	name : "XE_ColorPalette",
+	rxRGBColorPattern : /rgb\((\d+), ?(\d+), ?(\d+)\)/i,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		this.elColorPaletteLayer = jQuery("UL.xpress_xeditor_color_palette", oAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elColorPaletteLayer, "click", "EVENT_MOUSEUP_COLOR_PALETTE");
+	},
+
+	$ON_SHOW_COLOR_PALETTE : function(sCallbackCmd, oLayerContainer){
+		this.sCallbackCmd = sCallbackCmd;
+		this.oLayerContainer = oLayerContainer;
+
+		this.oLayerContainer.insertBefore(this.elColorPaletteLayer, null);
+
+		this.elColorPaletteLayer.style.display = "block";
+	},
+
+	$ON_HIDE_COLOR_PALETTE : function(){
+		this.elColorPaletteLayer.style.display = "none";
+	},
+
+	$ON_COLOR_PALETTE_APPLY_COLOR : function(sColorCode){
+		if(this.rxRGBColorPattern.test(sColorCode)){
+
+			function dec2Hex(sDec){
+				var sTmp = parseInt(sDec).toString(16);
+				if(sTmp.length<2) sTmp = "0"+sTmp;
+				return sTmp.toUpperCase();
+			}
+
+			var sR = dec2Hex(RegExp.$1);
+			var sG = dec2Hex(RegExp.$2);
+			var sB = dec2Hex(RegExp.$3);
+			sColorCode = "#"+sR+sG+sB;
+		}
+		this.oApp.exec(this.sCallbackCmd, [sColorCode]);
+	},
+
+	$ON_EVENT_MOUSEUP_COLOR_PALETTE : function(oEvent){
+		var elButton = oEvent.target;
+		if(! elButton.style.backgroundColor) return;
+
+		this.oApp.exec("COLOR_PALETTE_APPLY_COLOR", [elButton.style.backgroundColor]);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font color
+ * @name hp_XE_FontColor.js
+ */
+xe.XE_FontColor = jQuery.Class({
+	name : "XE_FontColor",
+	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_fontcolor_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["fontColor", "click", "TOGGLE_FONTCOLOR_LAYER"]);
+	},
+
+	$ON_TOGGLE_FONTCOLOR_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_FONTCOLOR", this.elDropdownLayer]]);
+	},
+
+	$ON_APPLY_FONTCOLOR : function(sFontColor){
+		if(!this.rxColorPattern.test(sFontColor)){
+			alert(this.oApp.$MSG("XE_FontColor.invalidColorCode"));
+			return;
+		}
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"color":sFontColor}]);
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of changing the background color
+ * @name hp_XE_BGColor.js
+ */
+xe.XE_BGColor = jQuery.Class({
+	name : "XE_BGColor",
+	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_bgcolor_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["bgColor", "click", "TOGGLE_BGCOLOR_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_BGCOLOR", []);
+	},
+
+	$ON_TOGGLE_BGCOLOR_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_BGCOLOR", this.elDropdownLayer]]);
+	},
+
+	$ON_EVENT_APPLY_BGCOLOR : function(weEvent){
+		var elButton = weEvent.target;
+
+		// Safari/Chrome/Opera may capture the event on Span
+		if(elButton.tagName == "SPAN") elButton = elButton.parentNode;
+		if(elButton.tagName != "BUTTON") return;
+
+		var sBGColor, sFontColor;
+
+		sBGColor = elButton.style.backgroundColor;
+		sFontColor = elButton.style.color;
+
+		this.oApp.exec("APPLY_BGCOLOR", [sBGColor, sFontColor]);
+	},
+
+	$ON_APPLY_BGCOLOR : function(sBGColor, sFontColor){
+		if(!this.rxColorPattern.test(sBGColor)){
+			alert(this.oApp.$MSG("XE_BGColor.invalidColorCode"));
+			return;
+		}
+
+		var oStyle = {"backgroundColor": sBGColor}
+		if(sFontColor) oStyle.color = sFontColor;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [oStyle]);
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to quote
+ * @name hp_XE_Quote.js
+ * @required XE_EditingArea_WYSIWYG
+ */
+xe.XE_Quote = jQuery.Class({
+	name : "XE_Quote",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_blockquote_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY: function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["quote", "click", "TOGGLE_BLOCKQUOTE_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_SEDITOR_BLOCKQUOTE", []);
+	},
+
+	$ON_TOGGLE_BLOCKQUOTE_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_EVENT_APPLY_SEDITOR_BLOCKQUOTE : function(weEvent){
+		var elButton = weEvent.target;
+		if(elButton.tagName != "BUTTON") return;
+
+		var sClass = elButton.parentNode.className;
+
+		if(sClass != "q8")
+			this._wrapBlock("BLOCKQUOTE", sClass);
+		else
+			this._unwrapBlock("BLOCKQUOTE");
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	_unwrapBlock : function(tag){
+		var oSelection = this.oApp.getSelection();
+		var oC = oSelection.commonAncestorContainer;
+
+		while(oC && oC.tagName != tag) oC = oC.parentNode;
+		if(!oC) return;
+
+		while(oC.firstChild) oC.parentNode.insertBefore(oC.firstChild, oC);
+
+		oC.parentNode.removeChild(oC);
+	},
+
+	_wrapBlock : function(tag, className){
+		var oSelection = this.oApp.getSelection();
+		var oLineInfo = oSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		var rxDontUseAsWhole = /BODY|TD|LI/i;
+
+		var oStartNode, oEndNode;
+
+		if(oStart.bParentBreak && !rxDontUseAsWhole.test(oStart.oLineBreaker.tagName)) oStartNode = oStart.oNode.parentNode;
+		else oStartNode = oStart.oNode;
+
+		if(oEnd.bParentBreak && !rxDontUseAsWhole.test(oEnd.oLineBreaker.tagName)) oEndNode = oEnd.oNode.parentNode;
+		else oEndNode = oEnd.oNode;
+
+		oSelection.setStartBefore(oStartNode);
+		oSelection.setEndAfter(oEndNode);
+
+		var oNode = this._expandToTableStart(oSelection, oEndNode);
+		if(oNode){
+			oEndNode = oNode;
+			oSelection.setEndAfter(oNode);
+		}
+
+		oNode = this._expandToTableStart(oSelection, oStartNode);
+		if(oNode){
+			oStartNode = oNode;
+			oSelection.setStartBefore(oNode);
+		}
+
+		oNode = oStartNode;
+		var oC = oSelection.commonAncestorContainer;
+
+		// find the insertion position for the formatting tag right beneath the common ancestor container
+		while(oNode && oNode != oC && oNode.parentNode != oC) oNode = oNode.parentNode;
+
+		oFormattingNode = oSelection._document.createElement(tag);
+		if(className) oFormattingNode.className = className;
+
+		if(oNode == oC){
+			oC.insertBefore(oFormattingNode, oC.firstChild);
+		}else{
+			oC.insertBefore(oFormattingNode, oNode);
+		}
+
+		oSelection.setStartAfter(oFormattingNode);
+
+		oSelection.setEndAfter(oEndNode);
+		oSelection.surroundContents(oFormattingNode);
+
+		var aNodes = oFormattingNode.childNodes;
+		var oInsertionPoint;
+		for(var i=aNodes.length-1; i>=0; i--){
+			if(aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR"){
+				var oP = oSelection._document.createElement("P");
+				oInsertionPoint = aNodes[i].nextSibling;
+				while(i>=0 && aNodes[i] && (aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR")){
+					oP.insertBefore(aNodes[i--], oP.firstChild);
+				}
+				oFormattingNode.insertBefore(oP, oInsertionPoint);
+				i++;
+			}
+		}
+
+		if(oFormattingNode && oFormattingNode.parentNode){
+			var oP = oSelection._document.createElement("P");
+			oP.innerHTML = unescape("<br/>");
+			oFormattingNode.parentNode.insertBefore(oP, oFormattingNode.nextSibling);
+		}
+
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Block Quote"]);
+
+		return oFormattingNode;
+	},
+
+	_expandToTableStart : function(oSelection, oNode){
+		var oC = oSelection.commonAncestorContainer;
+		var oResultNode = null;
+
+		var bLastIteration = false;
+		while(oNode && !bLastIteration){
+			if(oNode == oC) bLastIteration = true;
+
+			if(/TBODY|TFOOT|THEAD|TR/i.test(oNode.tagName)){
+				oResultNode = this._getTableRoot(oNode);
+				break;
+			}
+			oNode = oNode.parentNode;
+		}
+
+		return oResultNode;
+	},
+
+	_getTableRoot : function(oNode){
+		while(oNode && oNode.tagName != "TABLE") oNode = oNode.parentNode;
+
+		return oNode;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to inserting special characters
+ * @name hp_XE_SCharacter.js
+ * @required XpressRangeManager
+ */
+xe.XE_SCharacter = jQuery.Class({
+	name : "XE_SCharacter",
+
+	$init : function(oAppContainer){
+		this.bIE = jQuery.browser.msie;
+
+		this._assignHTMLObjects(oAppContainer);
+
+		this.charSet = [];
+		this.charSet[0] = unescape('FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[1] = unescape('%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[2] = unescape('3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[3] = unescape('3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[4] = unescape('0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[5] = unescape('3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = jQuery.$(oAppContainer) || document;
+
+		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_sCharacter_layer", oAppContainer).get(0);
+
+		this.oTextField = jQuery("INPUT", this.elDropdownLayer).get(0);
+		this.oInsertButton = jQuery("+ BUTTON", this.oTextField).get(0);
+		this.aCloseButton = jQuery("BUTTON.close", this.elDropdownLayer).get();
+		this.aSCharList = jQuery(".list", this.elDropdownLayer).get();
+		var oLabelUL = jQuery(">UL", this.elDropdownLayer).get(0);
+		this.aLabelA = jQuery("A", oLabelUL).get();
+	},
+
+	$ON_MSG_APP_READY : function(){
+		var funcInsert = jQuery.fnBind(this.oApp.exec, this.oApp, "INSERT_SCHARACTERS", [this.oTextField.value]);
+		jQuery(this.oInsertButton).click(funcInsert, this);
+
+		this.oApp.exec("SET_SCHARACTER_LIST", [this.charSet]);
+
+		for(var i=0; i<this.aLabelA.length; i++){
+			var func = jQuery.fnBind(this.oApp.exec, this.oApp, "CHANGE_SCHARACTER_SET", [i]);
+			jQuery(this.aLabelA[i]).mousedown(func);
+
+			this._stopBrowserEvent(this.aLabelA[i], "click");
+		}
+
+		for(var i=0; i<this.aCloseButton.length; i++){
+			this.oApp.registerBrowserEvent(this.aCloseButton[i], "click", "HIDE_ACTIVE_LAYER", []);
+		}
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_SCHARACTER_CLICKED", []);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["sCharacter", "click", "TOGGLE_SCHARACTER_LAYER"]);
+	},
+
+	$ON_TOGGLE_SCHARACTER_LAYER : function(){
+		this.oTextField.value = "";
+		this.oSelection = this.oApp.getSelection();
+
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_EVENT_SCHARACTER_CLICKED : function(weEvent){
+		var elButton = weEvent.target;
+		if(elButton.tagName != "BUTTON") return;
+		if(elButton.parentNode.tagName != "LI") return;
+
+		var sChar = elButton.firstChild.innerHTML;
+
+		this.oApp.exec("SELECT_SCHARACTER", [sChar]);
+	},
+
+	$ON_SELECT_SCHARACTER : function(schar){
+		this.oTextField.value += schar;
+
+		if(this.oTextField.createTextRange){
+			var oTextRange = this.oTextField.createTextRange();
+			oTextRange.collapse(false);
+			oTextRange.select();
+		}else{
+			if(this.oTextField.selectionEnd){
+				this.oTextField.selectionEnd = this.oTextField.value.length;
+				this.oTextField.focus();
+			}
+		}
+	},
+
+	$ON_INSERT_SCHARACTERS : function(){
+		this.oSelection.pasteHTML(this.oTextField.value);
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_CHANGE_SCHARACTER_SET : function(nSCharSet){
+		for(var i=0; i<this.aSCharList.length; i++){
+			if(this.aSCharList[i].style.display == "block"){
+				if(i == nSCharSet) return;
+
+				jQuery(this.aLabelA[i]).removeClass("on");
+				this.aSCharList[i].style.display = "none";
+			}
+		}
+
+		this._drawSCharList(nSCharSet);
+		jQuery(this.aLabelA[nSCharSet]).addClass("on");
+		this.aSCharList[nSCharSet].style.display = "block";
+	},
+
+	$ON_SET_SCHARACTER_LIST : function(charSet){
+		this.charSet = charSet;
+		this.bSCharSetDrawn = new Array(this.charSet.length);
+		this._drawSCharList(0);
+	},
+
+	_drawSCharList : function(i){
+		if(this.bSCharSetDrawn[i]) return;
+		this.bSCharSetDrawn[i] = true;
+
+		var charList = jQuery(this.aSCharList[i]).empty();
+		var button, span;
+
+		jQuery(this.charSet[i]).each(function(idx,ch){
+			var li  = jQuery('<li>');
+			var btn = jQuery('<button type="button"><span>'+unescape(ch)+'</span></button>');
+
+			li.append(btn);
+			charList.append(li);
+		});
+
+		// enable this after Jindo framework is updated
+//		this.oApp.exec("ATTACH_HOVER_EVENTS", [jQuery(">LI>BUTTON", this.aSCharList[i])]).get();
+	},
+
+	_stopBrowserEvent : function(obj, sEvent){
+		jQuery(obj).bind(sEvent, function(e){e.stopPropagation();e.preventDefault();} )
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to Undo/Redo
+ * @name hp_XE_UndoRedo.js
+ * @required XE_EditingAreaManager, XpressRangeManager
+ */
+xe.XE_UndoRedo = jQuery.Class({
+	name : "XE_UndoRedo",
+	actionHistory : null,
+	// this may also be called, lastAdded/lastRestored
+	oCurStateIdx : null,
+	iMinimumSizeChange : 10,
+	sBlankContentsForFF : "<br>",
+
+	$init : function(){
+		this.aUndoHistory = [];
+		this.oCurStateIdx = {nIdx: 0, nStep: 0};
+	},
+
+	$PRECONDITION : function(sCmd){
+		if(sCmd.match(/_DO_RECORD_UNDO_HISTORY_AT$/)) return true;
+
+		try{
+			if(this.oApp.getEditingMode() != "WYSIWYG") return false;
+		}catch(e){
+			return false;
+		}
+
+		return true;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [this.oCurStateIdx, "", "", null]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.bFF = jQuery.browser.mozilla;
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoHistory", jQuery.fnBind(this.getUndoHistory, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoStateIdx", jQuery.fnBind(this.getUndoStateIdx, this)]);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["undo", "click", "UNDO"]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["redo", "click", "REDO"]);
+
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+z", "UNDO"]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+y", "REDO"]);
+	},
+
+	$ON_UNDO : function(){
+		var oTmpStateIdx = {};
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", ["KEYPRESS", false, false, 1]);
+		if(this.oCurStateIdx.nIdx == 0) return;
+
+		if(this.oCurStateIdx.nStep > 0){
+			this.oCurStateIdx.nStep--;
+		}else{
+			var oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+
+			this.oCurStateIdx.nIdx--;
+
+			if(oTmpHistory.nTotalSteps>1){
+				this.oCurStateIdx.nStep = 0;
+			}else{
+				oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+				this.oCurStateIdx.nStep = oTmpHistory.nTotalSteps-1;
+			}
+		}
+
+		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+
+	$ON_REDO : function(){
+		if(this.oCurStateIdx.nIdx >= this.aUndoHistory.length) return;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+		if(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1 && this.oCurStateIdx.nStep >= oCurHistory.nTotalSteps-1) return;
+
+		if(this.oCurStateIdx.nStep < oCurHistory.nTotalSteps-1){
+			this.oCurStateIdx.nStep++;
+		}else{
+			this.oCurStateIdx.nIdx++;
+			oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+			this.oCurStateIdx.nStep = oCurHistory.nTotalSteps-1;
+		}
+
+		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	$ON_RECORD_UNDO_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction]);
+	},
+
+	$ON_RECORD_UNDO_BEFORE_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, true]);
+	},
+
+	$ON_RECORD_UNDO_AFTER_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, false]);
+	},
+
+	$ON_RESTORE_UNDO_HISTORY : function(nUndoIdx, nUndoStateStep){
+		this.oCurStateIdx.nIdx = nUndoIdx;
+		this.oCurStateIdx.nStep = nUndoStateStep;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+		var sContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
+		var oBookmark = oCurHistory.oBookmark[this.oCurStateIdx.nStep];
+
+		this.oApp.setIR(sContent, true);
+
+		// setting the innerHTML may change the internal DOM structure, so save the value again.
+		var sCurContent = this.oApp.getIR();
+		if(this.bFF && sCurContent == this.sBlankContentsForFF){
+			sCurContent = "";
+		}
+		oCurHistory.sContent[this.oCurStateIdx.nStep] = sCurContent;
+
+		var oSelection = this.oApp.getEmptySelection();
+		if(oSelection.selectionLoaded){
+			if(oBookmark){
+				oSelection.moveToXPathBookmark(oBookmark);
+			}else{
+				oSelection = this.oApp.getEmptySelection();
+			}
+
+			oSelection.select();
+		}
+	},
+
+	$ON_DO_RECORD_UNDO_HISTORY : function(sAction, bTwoStepAction, bBeforeAction, nForceAddUnlessEqual){
+		bTwoStepAction = bTwoStepAction || false;
+		bBeforeAction = bBeforeAction || false;
+		nForceAddUnlessEqual = nForceAddUnlessEqual || 0;
+
+		// if we're in the middle of some action history, remove everything after current idx if any "little" change is made
+		if(!(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1)) nForceAddUnlessEqual = 1;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+
+		var sCurContent = this.oApp.getIR();
+		var sHistoryContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
+
+		if(this.bFF && sCurContent == this.sBlankContentsForFF){
+			sCurContent = "";
+		}
+
+		// every TwoStepAction needs to be recorded
+		if(!bTwoStepAction){
+			switch(nForceAddUnlessEqual){
+				case 0:
+					if(Math.abs(sHistoryContent.length - sCurContent.length)<this.iMinimumSizeChange) return;
+					break;
+
+				case 1:
+					if(sHistoryContent == sCurContent) return;
+					break;
+
+				// write at all times
+				case 2:
+					break;
+			}
+		}
+
+		var oSelection = this.oApp.getSelection();
+
+		var oBookmark=null;
+		if(oSelection.selectionLoaded){
+			oBookmark = oSelection.getXPathBookmark();
+		}
+
+		var oInsertionIdx = {nIdx:this.oCurStateIdx.nIdx, nStep:this.oCurStateIdx.nStep};
+		if(bTwoStepAction){
+			if(bBeforeAction){
+				oInsertionIdx.nStep = 0;
+			}else{
+				oInsertionIdx.nStep = 1;
+			}
+		}else{
+			oInsertionIdx.nStep = 0;
+		}
+
+		if(oInsertionIdx.nStep == 0 && this.oCurStateIdx.nStep == oCurHistory.nTotalSteps-1){
+			oInsertionIdx.nIdx = this.oCurStateIdx.nIdx+1;
+		}
+
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [oInsertionIdx, sAction, sCurContent, oBookmark]);
+	},
+
+	$ON_DO_RECORD_UNDO_HISTORY_AT : function(oInsertionIdx, sAction, sContent, oBookmark){
+		if(oInsertionIdx.nStep != 0){
+			this.aUndoHistory[oInsertionIdx.nIdx].nTotalSteps = oInsertionIdx.nStep+1;
+			this.aUndoHistory[oInsertionIdx.nIdx].sContent[oInsertionIdx.nStep] = sContent;
+			this.aUndoHistory[oInsertionIdx.nIdx].oBookmark[oInsertionIdx.nStep] = oBookmark;
+		}else{
+			var oNewHistory = {sAction:sAction, nTotalSteps: 1};
+			oNewHistory.sContent = [];
+			oNewHistory.sContent[0] = sContent;
+
+			oNewHistory.oBookmark = [];
+			oNewHistory.oBookmark[0] = oBookmark;
+			this.aUndoHistory.splice(oInsertionIdx.nIdx, this.aUndoHistory.length - oInsertionIdx.nIdx, oNewHistory);
+		}
+
+		this.oCurStateIdx.nIdx = oInsertionIdx.nIdx;
+		this.oCurStateIdx.nStep = oInsertionIdx.nStep;
+	},
+
+	_getUndoHistory : function(){
+		return this.aUndoHistory;
+	},
+
+	_getUndoStateIdx : function(){
+		return this.oCurStateIdx;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to Find/Replace
+ * @name hp_XE_FindReplacePlugin.js
+ */
+xe.XE_FindReplacePlugin = jQuery.Class({
+	name : "XE_FindReplacePlugin",
+	oEditingWindow : null,
+	oFindReplace :  null,
+	oUILayer : null,
+	bFindMode : true,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = jQuery.$(oAppContainer) || document;
+
+		this.oEditingWindow = jQuery("IFRAME", oAppContainer).get(0);
+		this.oUILayer = jQuery("DIV.xpress_xeditor_findAndReplace_layer", oAppContainer).get(0);
+
+		var oTmp = jQuery("LI", this.oUILayer).get();
+
+		this.oFindTab = oTmp[0];
+		this.oReplaceTab = oTmp[1];
+
+		oTmp = jQuery(".container > .bx", this.oUILayer).get();
+
+		this.oFindInputSet = oTmp[0];
+		this.oReplaceInputSet = oTmp[1];
+
+		this.oFindInput_Keyword = jQuery("INPUT", this.oFindInputSet).get(0);
+
+		oTmp = jQuery("INPUT", this.oReplaceInputSet).get();
+		this.oReplaceInput_Original = oTmp[0];
+		this.oReplaceInput_Replacement = oTmp[1];
+
+		this.oFindNextButton = jQuery("BUTTON.find_next", this.oUILayer).get(0);
+		this.oCancelButton = jQuery("BUTTON.cancel", this.oUILayer).get(0);
+
+		this.oReplaceButton = jQuery("BUTTON.replace", this.oUILayer).get(0);
+		this.oReplaceAllButton = jQuery("BUTTON.replace_all", this.oUILayer).get(0);
+
+		this.aCloseButtons = jQuery("BUTTON.close", this.oUILayer).get();
+		this.aCloseButtons[this.aCloseButtons.length] = this.oCancelButton;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		// the right document will be available only when the src is completely loaded
+		if(this.oEditingWindow && this.oEditingWindow.tagName == "IFRAME")
+			this.oEditingWindow = this.oEditingWindow.contentWindow;
+
+		this.oFindReplace = new xe.FindReplace(this.oEditingWindow);
+		if(!this.oFindReplace.bBrowserSupported){
+			this.oApp.exec("DISABLE_UI", ["find_replace"]);
+			return;
+		}
+
+		for(var i=0; i<this.aCloseButtons.length; i++){
+			var func = jQuery.fnBind(this.oApp.exec, this.oApp, "HIDE_DIALOG_LAYER", [this.oUILayer]);
+			jQuery(this.aCloseButtons[i]).bind("click", func);
+		}
+
+		jQuery(this.oFindTab).bind("mousedown", jQuery.fnBind(this.oApp.exec, this.oApp, "SHOW_FIND", []));
+		jQuery(this.oReplaceTab).bind("mousedown", jQuery.fnBind(this.oApp.exec, this.oApp, "SHOW_REPLACE", []));
+
+		jQuery(this.oFindNextButton).bind("click", jQuery.fnBind(this.oApp.exec, this.oApp, "FIND", []));
+		jQuery(this.oReplaceButton).bind("click", jQuery.fnBind(this.oApp.exec, this.oApp, "REPLACE", []));
+		jQuery(this.oReplaceAllButton).bind("click", jQuery.fnBind(this.oApp.exec, this.oApp, "REPLACE_ALL", []));
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["findAndReplace", "click", "SHOW_FIND_REPLACE_LAYER"]);
+	},
+
+	$ON_SHOW_ACTIVE_LAYER : function(){
+		this.oApp.exec( "HIDE_DIALOG_LAYER", [this.oUILayer]);
+	},
+
+	$ON_SHOW_FIND_REPLACE_LAYER : function(){
+		this.oApp.exec("SHOW_DIALOG_LAYER", [this.oUILayer]);
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [this.oUILayer]);
+		this.oApp.exec("HIDE_CURRENT_ACTIVE_LAYER", []);
+	},
+
+	$ON_SHOW_FIND : function(){
+		this.bFindMode = true;
+
+		jQuery(this.oFindTab).addClass("on");
+		jQuery(this.oReplaceTab).removeClass("on");
+
+		jQuery(this.oFindNextButton).removeClass("normal");
+		jQuery(this.oFindNextButton).addClass("strong");
+
+		this.oFindInputSet.style.display = "block";
+		this.oReplaceInputSet.style.display = "none";
+
+		this.oReplaceButton.style.display = "none";
+		this.oReplaceAllButton.style.display = "none";
+
+		jQuery(this.oUILayer).removeClass("replace");
+		jQuery(this.oUILayer).addClass("find");
+
+		this.oFindInput_Keyword.value = this.oReplaceInput_Original.value;
+	},
+
+	$ON_SHOW_REPLACE : function(){
+		this.bFindMode = false;
+
+		jQuery(this.oFindTab).removeClass("on");
+		jQuery(this.oReplaceTab).addClass("on");
+
+		jQuery(this.oFindNextButton).removeClass("strong");
+		jQuery(this.oFindNextButton).addClass("normal");
+
+		this.oFindInputSet.style.display = "none";
+		this.oReplaceInputSet.style.display = "block";
+
+		this.oReplaceButton.style.display = "inline";
+		this.oReplaceAllButton.style.display = "inline";
+
+		jQuery(this.oUILayer).removeClass("find");
+		jQuery(this.oUILayer).addClass("replace");
+
+		this.oReplaceInput_Original.value = this.oFindInput_Keyword.value;
+	},
+
+	$ON_FIND : function(){
+		var sKeyword;
+		if(this.bFindMode)
+			sKeyword = this.oFindInput_Keyword.value;
+		else
+			sKeyword = this.oReplaceInput_Original.value;
+
+		switch(this.oFindReplace.find(sKeyword, false)){
+			case 1:
+				alert(this.oApp.$MSG("XE_FindReplace.keywordNotFound"));
+				break;
+			case 2:
+				alert(this.oApp.$MSG("XE_FindReplace.keywordMissing"));
+				break;
+		}
+	},
+
+	$ON_REPLACE : function(){
+		var sOriginal = this.oReplaceInput_Original.value;
+		var sReplacement = this.oReplaceInput_Replacement.value;
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["REPLACE"]);
+		var iReplaceResult = this.oFindReplace.replace(sOriginal, sReplacement, false);
+		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["REPLACE"]);
+
+		switch(iReplaceResult){
+			case 1:
+			case 3:
+				alert(this.oApp.$MSG("XE_FindReplace.keywordNotFound"));
+				break;
+			case 4:
+				alert(this.oApp.$MSG("XE_FindReplace.keywordMissing"));
+				break;
+		}
+	},
+
+	$ON_REPLACE_ALL : function(){
+		var sOriginal = this.oReplaceInput_Original.value;
+		var sReplacement = this.oReplaceInput_Replacement.value;
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["REPLACE ALL"]);
+		var iReplaceAllResult = this.oFindReplace.replaceAll(sOriginal, sReplacement, false);
+		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["REPLACE ALL"]);
+
+		if(iReplaceAllResult<0){
+			alert(this.oApp.$MSG("XE_FindReplace.keywordMissing"));
+		}else{
+			alert(this.oApp.$MSG("XE_FindReplace.replaceAllResultP1")+iReplaceAllResult+this.oApp.$MSG("XE_FindReplace.replaceAllResultP2"));
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to hyperlink
+ * @name hp_XE_Hyperlink.js
+ */
+xe.XE_Hyperlink = jQuery.Class({
+	name : "XE_Hyperlink",
+	sATagMarker : "HTTP://HUSKY_TMP.MARKER/",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+		this.sRXATagMarker = this.sATagMarker.replace(/\//g, "\\/").replace(/\./g, "\\.");
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.oHyperlinkLayer = jQuery("DIV.xpress_xeditor_hyperlink_layer", elAppContainer).get(0);
+		this.oLinkInput = jQuery("INPUT[type=text]", this.oHyperlinkLayer).get(0);
+
+		this.oBtnConfirm = jQuery("BUTTON.confirm", this.oHyperlinkLayer).get(0);
+		this.oBtnCancel = jQuery("BUTTON.cancel", this.oHyperlinkLayer).get(0);
+
+		this.oCbNewWin = jQuery("INPUT[type=checkbox]", this.oHyperlinkLayer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+k", "XE_TOGGLE_HYPERLINK_LAYER", []]);
+
+		this.oApp.registerBrowserEvent(this.oBtnConfirm, "mousedown", "XE_APPLY_HYPERLINK");
+		this.oApp.registerBrowserEvent(this.oBtnCancel, "mousedown", "HIDE_ACTIVE_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oLinkInput, "keydown", "EVENT_XE_HYPERLINK_KEYDOWN");
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["hyperlink", "click", "XE_TOGGLE_HYPERLINK_LAYER"]);
+	},
+
+	$ON_XE_TOGGLE_HYPERLINK_LAYER : function(){
+		// hotkey may close the layer right away so delay here
+		this.oApp.delayedExec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.oHyperlinkLayer, null, "XE_RESET_HYPERLINK_LAYER", []], 0);
+	},
+
+	$ON_XE_RESET_HYPERLINK_LAYER : function(){
+		this.oApp.exec("FOCUS", []);
+		this.oSelection = this.oApp.getSelection();
+		var oAnchor = this.oSelection.findAncestorByTagName("A");
+		this.oCbNewWin.checked = false;
+		if(oAnchor){
+			this.oSelection.selectNode(oAnchor);
+			this.oSelection.select();
+
+			var sTarget = oAnchor.target;
+			if(sTarget && sTarget == "_blank") this.oCbNewWin.checked = true;
+
+			this.oLinkInput.value = oAnchor.href?oAnchor.href:"http://";
+		}else{
+			this.oLinkInput.value = "http://";
+		}
+
+		this.oLinkInput.focus();
+		this.oLinkInput.value = this.oLinkInput.value;
+	},
+
+	$ON_XE_APPLY_HYPERLINK : function(){
+		var sURL = this.oLinkInput.value;
+
+		this.oApp.exec("FOCUS", []);
+		this.oSelection = this.oApp.getSelection();
+
+		//if(this._validateURL(sURL)){
+        var sTarget = "";
+        if(this.oCbNewWin.checked)
+            sTarget = "_blank";
+        else
+            sTarget = "_self";
+
+        if(this.oSelection.collapsed){
+            var str = "<a href='" + sURL + "' target="+sTarget+">" + sURL + "</a>";
+            this.oSelection.pasteHTML(str);
+        }else{
+            var nSession = Math.ceil(Math.random()*10000);
+            var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, this.sATagMarker+nSession+sURL] );
+            this.oApp.exec("EXECCOMMAND", arg);
+
+            this.oSelection.setFromSelection();
+
+            var oDoc = this.oApp.getWYSIWYGDocument();
+            var aATags = oDoc.body.getElementsByTagName("A");
+            var nLen = aATags.length;
+            var rxMarker = new RegExp(this.sRXATagMarker+nSession, "i");
+            var elATag;
+            for(var i=0; i<nLen; i++){
+                elATag = aATags[i];
+                if(elATag.href && elATag.href.match(rxMarker)){
+                    elATag.href = elATag.href.replace(rxMarker, "");
+                    elATag.target = sTarget;
+                }
+            }
+        }
+        this.oApp.exec("HIDE_ACTIVE_LAYER");
+
+        setTimeout(jQuery.fnBind(function(){this.oSelection.select()}, this), 0);
+		//}else{
+			//alert(this.oApp.$MSG("XE_Hyperlink.invalidURL"));
+			//this.oLinkInput.focus();
+		//}
+	},
+
+	_validateURL : function(sURL){
+		return /^(http|https|ftp|mailto):(?:\/\/)?((\w|-)+(?:[\.:@](\w|-))+)(?:\/|@)?([^"\?]*?)(?:\?([^\?"]*?))?$/.test(sURL);
+	},
+
+	$ON_EVENT_XE_HYPERLINK_KEYDOWN : function(oEvent){
+		if (oEvent.keyCode == 13){
+			this.oApp.exec("XE_APPLY_HYPERLINK");
+			oEvent.preventDefault(); oEvent.stopPropagation();
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to table creation
+ * @name hp_XE_Table.js
+ */
+xe.XE_Table = jQuery.Class({
+	name : "XE_Table",
+	iMinRows : 1,
+	iMaxRows : 20,
+
+	iMinColumns : 1,
+	iMaxColumns : 10,
+
+	iMinBorderWidth : 1,
+	iMaxBorderWidth : 10,
+
+	oSelection : null,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		var tmp = null;
+
+		this.elDropdownLayer = jQuery("DIV.xpress_xeditor_table_layer", oAppContainer).get(0);
+		this.welDropdownLayer = jQuery(this.elDropdownLayer);
+
+		tmp = jQuery("INPUT", this.elDropdownLayer).get();
+		this.oRowInput = tmp[0];
+		this.oColumnInput = tmp[1];
+		this.oBorderWidthInput = tmp[2];
+		this.oBorderColorInput = tmp[3];
+		this.oBGColorInput = tmp[4];
+
+		tmp = jQuery("BUTTON", this.elDropdownLayer).get();
+		this.oButton_AddRow = tmp[0];
+		this.oButton_RemoveRow = tmp[1];
+		this.oButton_AddColumn = tmp[2];
+		this.oButton_RemoveColumn = tmp[3];
+		this.oButton_IncBorderWidth = tmp[4];
+		this.oButton_DecBorderWidth = tmp[5];
+		this.oButton_BorderColorPreview = tmp[6];
+		this.oButton_BorderColor = tmp[7];
+		this.oButton_BGColorPreview = tmp[8];
+		this.oButton_BGColor = tmp[9];
+		this.oButton_Insert = tmp[10];
+		this.oButton_Cancel = tmp[11];
+
+		this.oSampleTable = jQuery("TABLE", this.elDropdownLayer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["table", "click", "ST_TOGGLE_TOOLBAR_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.oRowInput, "change", "ST_SET_ROW_NUM", [null, 0]);
+		this.oApp.registerBrowserEvent(this.oColumnInput, "change", "ST_SET_COLUMN_NUM", [null, 0]);
+		this.oApp.registerBrowserEvent(this.oBorderWidthInput, "change", "ST_SET_BORDER_WIDTH", [null, 0]);
+
+		this.oApp.registerBrowserEvent(this.oButton_AddRow, "click", "ST_ADD_ROW");
+		this.oApp.registerBrowserEvent(this.oButton_RemoveRow, "click", "ST_REMOVE_ROW");
+		this.oApp.registerBrowserEvent(this.oButton_AddColumn, "click", "ST_ADD_COLUMN");
+		this.oApp.registerBrowserEvent(this.oButton_RemoveColumn, "click", "ST_REMOVE_COLUMN");
+
+		this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth, "click", "ST_INC_BORDER_WIDTH");
+		this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth, "click", "ST_DEC_BORDER_WIDTH");
+
+		this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
+		this.oApp.registerBrowserEvent(this.oButton_BGColorPreview, "click", "ST_TOGGLE_BGCOLOR_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oButton_BorderColor, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
+		this.oApp.registerBrowserEvent(this.oButton_BGColor, "click", "ST_TOGGLE_BGCOLOR_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oButton_Insert, "click", "ST_INSERT_TABLE");
+		this.oApp.registerBrowserEvent(this.oButton_Cancel, "click", "ST_CLOSE");
+
+		this.oApp.exec("ST_SET_BORDER_COLOR", ["#CCCCCC"]);
+		this.oApp.exec("ST_SET_BGCOLOR", ["#FFFFFF"]);
+	},
+
+	$ON_ST_TOGGLE_TOOLBAR_LAYER : function(){
+		this.oApp.exec("RECORD_UNDO_ACTION_FORCED", ["KEYPRESS"]);
+
+		this._showNewTable();
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_ST_ADD_ROW : function(){
+		this.oApp.exec("ST_SET_ROW_NUM", [null, 1]);
+	},
+
+	$ON_ST_REMOVE_ROW : function(){
+		this.oApp.exec("ST_SET_ROW_NUM", [null, -1]);
+	},
+
+	$ON_ST_ADD_COLUMN : function(){
+		this.oApp.exec("ST_SET_COLUMN_NUM", [null, 1]);
+	},
+
+	$ON_ST_REMOVE_COLUMN : function(){
+		this.oApp.exec("ST_SET_COLUMN_NUM", [null, -1]);
+	},
+
+	$ON_ST_SET_ROW_NUM : function(iRows, iRowDiff){
+		iRows = iRows || parseInt(this.oRowInput.value);
+		iRowDiff = iRowDiff || 0;
+
+		iRows += iRowDiff;
+
+		if(iRows < this.iMinRows) iRows = this.iMinRows;
+		if(iRows > this.iMaxRows) iRows = this.iMaxRows;
+
+		this.oRowInput.value = iRows;
+		this._showNewTable();
+	},
+
+	$ON_ST_SET_COLUMN_NUM : function(iColumns, iColumnDiff){
+		iColumns = iColumns || parseInt(this.oColumnInput.value);
+		iColumnDiff = iColumnDiff || 0;
+
+		iColumns += iColumnDiff;
+
+		if(iColumns < this.iMinColumns) iColumns = this.iMinColumns;
+		if(iColumns > this.iMaxColumns) iColumns = this.iMaxColumns;
+
+		this.oColumnInput.value = iColumns;
+		this._showNewTable();
+	},
+
+	$ON_ST_INSERT_TABLE : function(){
+		var sTable = this._getTableString();
+
+		this.oApp.exec("PASTE_HTML", [sTable]);
+
+		this.oApp.exec("ST_CLOSE", []);
+	},
+
+	$ON_ST_CLOSE : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_ST_SET_BORDER_WIDTH : function(iBorderWidth, iBorderWidthDiff){
+		iBorderWidth = iBorderWidth || parseInt(this.oBorderWidthInput.value);
+		iBorderWidthDiff = iBorderWidthDiff || 0;
+
+		iBorderWidth += iBorderWidthDiff;
+
+		if(iBorderWidth < this.iMinBorderWidth) iBorderWidth = this.iMinBorderWidth;
+		if(iBorderWidth > this.iMaxBorderWidth) iBorderWidth = this.iMaxBorderWidth;
+
+		this.oBorderWidthInput.value = iBorderWidth;
+		this._showNewTable();
+	},
+
+	$ON_ST_INC_BORDER_WIDTH : function(){
+		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, 1]);
+	},
+
+	$ON_ST_DEC_BORDER_WIDTH : function(){
+		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, -1]);
+	},
+
+	$ON_ST_TOGGLE_BORDER_COLOR_LAYER : function(){
+		if(this.welDropdownLayer.hasClass("p1"))
+			this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
+		else
+			this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER", []);
+	},
+
+	$ON_ST_SHOW_BORDER_COLOR_LAYER : function(){
+		this.welDropdownLayer.addClass("p1");
+		this.welDropdownLayer.removeClass("p2");
+
+		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BORDER_COLOR_FROM_PALETTE", this.elDropdownLayer]);
+	},
+
+	$ON_ST_HIDE_BORDER_COLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p1");
+
+		this.oApp.exec("HIDE_COLOR_PALETTE", []);
+	},
+
+	$ON_ST_TOGGLE_BGCOLOR_LAYER : function(){
+		if(this.welDropdownLayer.hasClass("p2"))
+			this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
+		else
+			this.oApp.exec("ST_SHOW_BGCOLOR_LAYER", []);
+	},
+
+	$ON_ST_SHOW_BGCOLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p1");
+		this.welDropdownLayer.addClass("p2");
+
+		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BGCOLOR_FROM_PALETTE", this.elDropdownLayer]);
+	},
+
+	$ON_ST_HIDE_BGCOLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p2");
+
+		this.oApp.exec("HIDE_COLOR_PALETTE", []);
+	},
+
+	$ON_ST_SET_BORDER_COLOR_FROM_PALETTE : function(sColorCode){
+		this.oApp.exec("ST_SET_BORDER_COLOR", [sColorCode]);
+		this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
+	},
+
+	$ON_ST_SET_BORDER_COLOR : function(sColorCode){
+		this.oBorderColorInput.value = sColorCode;
+		this.oButton_BorderColorPreview.style.backgroundColor = sColorCode;
+
+		this._showNewTable();
+	},
+
+	$ON_ST_SET_BGCOLOR_FROM_PALETTE : function(sColorCode){
+		this.oApp.exec("ST_SET_BGCOLOR", [sColorCode]);
+		this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
+	},
+
+	$ON_ST_SET_BGCOLOR : function(sColorCode){
+		this.oBGColorInput.value = sColorCode;
+		this.oButton_BGColorPreview.style.backgroundColor = sColorCode;
+
+		this._showNewTable();
+	},
+
+	_showNewTable : function(){
+		var oTmp = document.createElement("DIV");
+		oTmp.innerHTML = this._getTableString();
+		var oNewTable = oTmp.firstChild;
+		this.oSampleTable.parentNode.insertBefore(oNewTable, this.oSampleTable);
+		this.oSampleTable.parentNode.removeChild(this.oSampleTable);
+		this.oSampleTable = oNewTable;
+	},
+
+	// need to do something about the table width as the same HTML code is being used to the actual table and the preview table
+	_getTableString : function(){
+		var sBorderColorCode = this.oBorderColorInput.value;
+		var sBGColorCode = this.oBGColorInput.value;
+		var iBorderWidth = this.oBorderWidthInput.value;
+		var sTD = "";
+		if(jQuery.browser.msie){
+			sTD = "<td><p></p></td>";
+		}else{
+			if(jQuery.browser.firefox){
+				sTD = "<td><p><br/></p></td>";
+			}else{
+				sTD = "<td><p>&nbsp;</p></td>";
+			}
+		}
+
+		var sTable = '<table style="background:'+sBorderColorCode+'" cellspacing="'+iBorderWidth+'">';
+		var sRow = '<tr style="background:'+sBGColorCode+'">';
+		var iColumns = this.oColumnInput.value;
+		for(var i=0; i<iColumns; i++){
+			sRow += sTD;
+		}
+		sRow += "</tr>\n";
+
+		var iRows = this.oRowInput.value;
+
+		sTable += "<tbody>";
+		for(var i=0; i<iRows; i++){
+			sTable += sRow;
+		}
+		sTable += "</tbody>";
+
+		sTable += "</table>";
+
+		return sTable;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the editing mode using a Button element
+ * @name hp_XE_EditingModeToggler.js
+ */
+xe.XE_EditingModeToggler = jQuery.Class({
+	name : "XE_EditingModeToggler",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		elAppContainer = jQuery.$(elAppContainer) || document;
+
+		this.elModeToggleButton = jQuery("BUTTON.xpress_xeditor_mode_toggle_button", elAppContainer).get(0);
+		this.welModeToggleButton = jQuery(this.elModeToggleButton);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elModeToggleButton, "click", "EVENT_TOGGLE_EDITING_MODE", []);
+	},
+
+	$ON_EVENT_TOGGLE_EDITING_MODE : function(){
+		if(this.oApp.getEditingMode() == "WYSIWYG")
+			this.oApp.exec("CHANGE_EDITING_MODE", ["HTMLSrc"]);
+		else
+			this.oApp.exec("CHANGE_EDITING_MODE", ["WYSIWYG"]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode){
+		if(sMode == "HTMLSrc"){
+			this.welModeToggleButton.addClass("active").parent("span").addClass("active");
+			this.oApp.exec("DISABLE_ALL_UI", []);
+		}else{
+			this.welModeToggleButton.removeClass("active").parent("span").removeClass("active");
+			this.oApp.exec("ENABLE_ALL_UI", []);
+		}
+	}
+});
+//}
+/**
+ * @fileOverview This file contains a message mapping(Korean), which is used to map the message code to the actual message
+ * @name xpress_XE_Lang_KR.js
+ */
+var oMessageMap = {
+	'XE_EditingAreaManager.onExit' : '%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.',
+	'XE_FontColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
+	'XE_BGColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
+	'XE_Hyperlink.invalidURL' : '%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4.',
+	'XE_FindReplace.keywordMissing' : '%uCC3E%uC73C%uC2E4%20%uB2E8%uC5B4%uB97C%20%uC785%uB825%uD574%20%uC8FC%uC138%uC694.',
+	'XE_FindReplace.keywordNotFound' : '%uCC3E%uC73C%uC2E4%20%uB2E8%uC5B4%uAC00%20%uC5C6%uC2B5%uB2C8%uB2E4.',
+	'XE_FindReplace.replaceAllResultP1' : '%uC77C%uCE58%uD558%uB294%20%uB0B4%uC6A9%uC774%20%uCD1D%20',
+	'XE_FindReplace.replaceAllResultP2' : '%uAC74%20%uBC14%uB00C%uC5C8%uC2B5%uB2C8%uB2E4.',
+	'XE_FindReplace.notSupportedBrowser' : '%uD604%uC7AC%20%uC0AC%uC6A9%uD558%uACE0%20%uACC4%uC2E0%20%uBE0C%uB77C%uC6B0%uC800%uC5D0%uC11C%uB294%20%uC0AC%uC6A9%uD558%uC2E4%uC218%20%uC5C6%uB294%20%uAE30%uB2A5%uC785%uB2C8%uB2E4.%5Cn%uC774%uC6A9%uC5D0%20%uBD88%uD3B8%uC744%20%uB4DC%uB824%20%uC8C4%uC1A1%uD569%uB2C8%uB2E4.'
+};
+/**
+ * XHTML Formatter
+ * @author gony
+ */
+(function($){
+
+var
+	regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig,
+	regex_meanless_css2 = /(?:(?:margin|padding)\s*:\s*0(?:px)?|\-(?:moz|ms|webkit|opera)\-[\w-]+\s*:\s*.*?|[\w-]+\s*:\s*\-(?:moz|ms|webkit|opera)\-[\w-]+|(?:line-height|font-variant|font-stretch|font-size-adjust|font-size)\s*:\s*[a-z_-]+)\s*;?\s*|font-(?:weight|style)\s*:\s*normal;?/ig,
+	regex_class  = /<(.*?)\s+class\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))(.*?)>/ig,
+	regex_class2 = /xe_selected_cell/g;
+	regex_handler = /<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig,
+	//regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
+	regex_script = /<script[\s\S]+?<\/script>/ig,
+	regex_font_color = /color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_face  = /face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_size  = /size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i,
+	regex_style = /style\s*=\s*(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_weight = /font-weight\s*:\s*([a-z]+);?/i,
+	regex_font_style = /font-style\s*:\s*italic;?/i,
+	regex_font_decoration = /text-decoration\s*:\s*([a-z -]+);?/i,
+	regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/ig,
+	regex_quote_attr = /([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g; //"
+
+var
+	allow_tags  = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param'.split(','),
+	lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
+
+var
+	replace_tags = {
+		'b' : 'strong',
+		'i' : 'em',
+		's' : 'del',
+		'strike' : 'del'
+	};
+
+xe.XE_XHTMLFormatter = $.Class({
+	name : "XE_XHTMLFormatter",
+
+	$ON_MSG_APP_READY : function() {
+		this.oApp.addConverter("WYSIWYG_TO_IR", this.TO_IR);
+		this.oApp.addConverter("HTMLSrc_TO_IR", this.TO_IR);
+		this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO);
+		this.oApp.addConverter("IR_TO_WYSIWYG", this.IR_TO);
+	},
+
+	TO_IR : function(sContent) {
+		var stack = [];
+
+        // remove xeHandled attrs
+        sContent = sContent.replace(/xeHandled="YES"/ig,'');
+
+
+		// remove all useless styles
+		sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
+			m2 = m2.replace(regex_meanless_css2, '');
+
+			return '<'+m1+(m2?' style="'+m2+'"':'')+m3+'>';
+		});
+
+		// remove all useless classes
+		sContent = sContent.replace(regex_class, function(m0,m1,m2,m3,m4,m5){
+			var cls = jQuery.trim((m2 || m3 || m4 || "").replace(regex_class2, ''));
+
+			return '<'+(m1||"")+(cls?' class="'+cls+'"':'')+(m5||"")+'>';
+		});
+
+		// remove all event handler
+		sContent = sContent.replace(regex_handler, '<$1$2>');
+
+		// remove all id
+		//sContent = sContent.replace(regex_id, '<$1$2>');
+
+		// remove all scripts
+		sContent = sContent.replace(regex_script, '');
+
+		if (jQuery.browser.msie) {
+			// remove jQuery attributes
+			sContent = sContent.replace(regex_jquery, '');
+
+			// quote all attrs
+			sContent = sContent.replace(/<(\w+) ([^>]+)>/g, function(m0,m1,m2){
+				return '<'+m1+' '+
+					m2.replace(regex_quote_attr, function(s0,s1,s2,s3){
+						if (s1) return s1;
+                        if(/^"/.test(s3)||/"$/.test(s3)) return s2+'='+s3;
+						return s2+'="'+s3+'"';
+					}) + '>';
+			});
+		}
+
+		// remove all useless tag and enclose tags
+		regex = /<(\/)?([:\w\/-]+)(.*?)>/ig;
+		sContent = sContent.replace(regex, function(m0,m1,m2,m3){
+			var m3s = [];
+			var state = '';
+
+			m1 = m1 || '';
+			m2 = m2.toLowerCase();
+			m3 = $.trim(m3 || '');
+
+			if (!m1) {
+				if ($.inArray(m2,lonely_tags) >= 0) {
+					var len = m3.length;
+					if (m2 == 'br') m3 = '';
+					if (!m3 || m3.substring(len-1,len) != '/') m3 += ' /';
+
+					return '<'+m2+' '+m3+'>';
+				}
+
+				if (replace_tags[m2]) {
+					stack.push({tag:m2, state:'deleted'});
+
+					m2 = replace_tags[m2];
+					state = 'inserted';
+				} else if (m2 == 'font') {
+					stack.push({tag:m2, state:'deleted'});
+
+					m2 = 'span';
+					m3s = [];
+					if (regex_font_color.test(m3)) m3s.push('color:'+(RegExp.$1||RegExp.$2||RegExp.$3)+';');
+					if (regex_font_face.test(m3)) m3s.push('font-family:'+(RegExp.$1||RegExp.$2||RegExp.$3)+';');
+
+					m3 = m3s.length?'style="'+m3s.join('')+'"':'';
+					state = 'inserted';
+				} else if (m2 == 'center') {
+					stack.push({tag:m2, state:'deleted'});
+
+					m2 = 'div'
+					m3 = 'style="text-align:center"';
+
+					state = 'inserted';
+				} else if (m2 == 'span') {
+					var style = '';
+
+					if (!m3) {
+						stack.push({tag:m3, state:'deleted'});
+						return '';
+					}
+
+					if (regex_style.test(m3)) {
+						var tmpstack = [];
+						var tmptag   = '';
+
+						style = RegExp.$1||RegExp.$2||RegExp.$3;
+						m3 = m3.replace(regex_style, '');
+
+						if (regex_font_weight.test(style)) {
+							if (RegExp.$1 == 'bold' || RegExp.$1 == 'bolder') {
+								style = style.replace(regex_font_weight, '');
+								tmpstack.push({tag:'strong', state:'inserted'});
+								tmptag += '<strong>';
+							}
+						}
+
+						if (regex_font_style.test(style)) {
+							style = style.replace(regex_font_style, '');
+							tmpstack.push({tag:'em', state:'inserted'});
+							tmptag += '<em>';
+						}
+
+						if (regex_font_decoration.test(style)) {
+							var deco_css = ' '+RegExp.$1.toLowerCase()+' ';
+
+							if (deco_css.indexOf('underline ') > 0) {
+								deco_css = deco_css.replace('underline ', '');
+								tmpstack.push({tag:'u', state:'inserted'});
+								tmptag += '<u>';
+							}
+
+							if (deco_css.indexOf('line-through ') > 0) {
+								deco_css = deco_css.replace('line-through ', '');
+								tmpstack.push({tag:'del', state:'inserted'});
+								tmptag += '<del>';
+							}
+
+							deco_css = $.trim(deco_css);
+							style = style.replace(regex_font_decoration, (deco_css?'text-decoration:'+deco_css+';':''));
+						}
+
+						style = $.trim(style);
+
+						stack.push({tag:m2, state:(!m3&&!style?'deleted':'')});
+						stack = stack.concat(tmpstack);
+
+						return (!m3&&!style?'':'<span '+m3+' style="'+style+'">')+tmptag;
+					}
+				} else {
+					state = (jQuery.inArray(m2,allow_tags) < 0)?'deleted':'';
+					if (state == 'deleted') return '';
+				}
+
+				stack.push({tag:m2, state:state});
+			} else {
+				var tags = [], t = '';
+
+				if (!stack.length) return '';
+
+				do {
+					t = stack.pop();
+					if (t.state != 'inserted' && t.tag != m2) {
+						stack.push(t);
+						return tags.join('');
+					}
+					if (t.state != 'deleted') tags.push('</'+t.tag+'>');
+				} while(stack.length && t.tag != m2);
+
+				return tags.join('');
+			}
+
+			return '<'+m1+m2+(m3?' '+m3:'')+'>';
+		});
+		if (stack.length) {
+			var t = '';
+
+			do {
+				t = stack.pop();
+				if (t.state != 'deleted') sContent += '</'+t.tag+'>';
+			} while(stack.length);
+		}
+
+		return sContent;
+	},
+
+	IR_TO : function(sContent) {
+		return sContent;
+	}
+});
+
+// center, font, b, i, s, strike
+
+})(jQuery);
+/**
+ * Support XE extensions
+ * @author gony
+ */
+xe.XE_Extension = jQuery.Class({
+	name  : "XE_Extension",
+	seq   : '',
+
+	$init : function(elAppContainer, editor_sequence) {
+		this.seq = editor_sequence;
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.elDropdownLayer = jQuery('DIV.xpress_xeditor_extension_layer', elAppContainer).get(0);
+	},
+
+	_removeAttrs : function(sContent) {
+		return sContent;
+	},
+
+	_addEvent : function() {
+		if (this.oApp.getEditingMode() != 'WYSIWYG') return;
+
+		var doc = this.oApp.getWYSIWYGDocument();
+		var seq = this.seq;
+		var fn  = function(){
+			var obj  = jQuery(this);
+			var comp = obj.attr('editor_component');
+			if (comp && jQuery.isFunction(openComponent)) {
+				editorPrevNode = obj.get(0);
+				openComponent(comp, seq);
+			}
+		};
+
+		jQuery('img,div[editor_component]', doc).each(function(){
+			var obj = jQuery(this);
+            if(this.nodeName == 'IMG' && !obj.attr('editor_component')) obj.attr('editor_component','image_link')
+            if(!obj.attr('xeHandled')) {
+                obj.attr('xeHandled','YES');
+                obj.dblclick(fn);
+            }
+		});
+	},
+
+	$ON_MSG_APP_READY : function() {
+		this.oApp.exec('REGISTER_UI_EVENT', ['extension', 'click', 'TOGGLE_EXTENSION_LAYER']);
+	},
+
+	$ON_TOGGLE_EXTENSION_LAYER : function() {
+		this.oApp.exec('TOGGLE_TOOLBAR_ACTIVE_LAYER', [this.elDropdownLayer]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(mode) {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_PASTE_HTML : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_LOAD_IR_FIELD : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_SET_IR : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	}
+});
+/**
+ * Auto saving
+ * @author gony
+ */
+xe.XE_AutoSave = jQuery.Class({
+	name : "XE_AutoSave",
+	form : null,
+	textarea : null,
+
+	$init : function(oIRTextarea, elAppContainer) {
+		this.form = oIRTextarea.form;
+		this.textarea = oIRTextarea;
+
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.welMessageBox = jQuery('autosave_message');
+	},
+
+	$ON_MSG_APP_READY : function() {
+		var elTitle   = jQuery(this.form._saved_doc_title);
+		var elContent = jQuery(this.form._saved_doc_content);
+		var title   = jQuery.trim(elTitle.val());
+		var content = jQuery.trim(elContent.val());
+
+		if (title || content) {
+			if (confirm(this.form._saved_doc_message.value)) {
+				jQuery(this.form.title).val(title);
+				this.oApp.setIR(content);
+			} else {
+				editorRemoveSavedDoc();
+			}
+		}
+
+		editorEnableAutoSave(this.form, jQuery(this.form).attr("editor_sequence"));
+
+		// register hotkey
+		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+shift+s','AUTO_SAVE']);
+	},
+
+	$ON_AUTO_SAVE : function() {
+		_editorAutoSave();
+	}
+});
+/**
+ * Format Block plugin
+ * @author gony
+ */
+xe.XE_FormatWithSelectUI = jQuery.Class({
+	name : "XE_FormatWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFormatSelect = jQuery("SELECT.xpress_xeditor_ui_format_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFormatSelect, "change", "SET_FORMAT_FROM_SELECT_UI");
+		this.elFormatSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		var blockName = this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");
+
+		if (!blockName) return (this.elFormatSelect.selectedIndex = 0);
+		if (jQuery.browser.msie && /([0-9])/.test(blockName)) blockName = 'h'+(RegExp.$1);
+
+		this.elFormatSelect.value = blockName.toLowerCase();
+		if(this.elFormatSelect.selectedIndex < 0) this.elFormatSelect.selectedIndex = 0;
+	},
+
+	$ON_SET_FORMAT_FROM_SELECT_UI : function(){
+		var sFormat = this.elFormatSelect.value;
+		if(!sFormat) return;
+		if(jQuery.browser.msie) sFormat = '<'+sFormat+'>';
+
+		this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, sFormat]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+
+(function($){
+/**
+ * Enhanced Table Fetures
+ * @author NHN (developers@xpressengine.com)
+ */
+
+// 표 편집 확장 기능
+xe.XE_Table = jQuery.Class({
+	_startSel : null,
+	_endSel   : null,
+
+	$ON_MSG_APP_READY : function() {
+		this._doc = $(this.oApp.getWYSIWYGDocument());
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this);
+		this.$FnMouseUp   = $.fnBind(this._mouseup, this);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this);
+
+		this._doc.mousedown(this.$FnMouseDown);
+
+		// initialize
+		this._startSel = null;
+		this._endSel   = null;
+
+		// register buttons
+		this.oApp.exec('REGISTER_UI_EVENT', ['merge_cells', 'click', 'MERGE_CELLS']);
+		this.oApp.exec('REGISTER_UI_EVENT', ['split_col', 'click', 'CELL_SPLIT_BY_COL']);
+		this.oApp.exec('REGISTER_UI_EVENT', ['split_row', 'click', 'CELL_SPLIT_BY_ROW']);
+
+		// register hotkeys
+		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+alt+m', 'MERGE_CELLS']);
+
+		// perform default ready action
+		this.$super.$ON_MSG_APP_READY();
+	},
+
+	$ON_MERGE_CELLS : function() {
+		var html = "";
+		var cell = jQuery('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var self = this;
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Merge"]);
+
+		// 선택한 모든 셀의 데이터를 첫번째 셀로 복사
+		cell.each(function(){ html += jQuery(this).html() }).eq(0).html(html);
+
+		// 첫번째 셀 가로 확장
+		var colspan = 0;
+		cell.eq(0).nextAll('td,th').andSelf().filter('.xe_selected_cell').each(function(idx){
+			colspan += self._getSpan(this, 'col');
+		});
+
+		// 마지막 셀까지 줄의 갯수 계산
+		var rect = this._getRect(cell.eq(0));
+		var start_tr = cell.eq(0).parent('tr');
+		var end_tr   = cell.eq(cell.length-1).parent('tr');
+		var all_rows = cell.parents('table').eq(0).find('tr');
+		var rowspan  = all_rows.index(end_tr.get(0)) - all_rows.index(start_tr.get(0)) + this._getSpan(cell.eq(cell.length-1), 'row');
+
+		// 첫번째 셀 colspan, rowspan 속성 지정
+		cell.eq(0).attr('colSpan', colspan).attr('rowSpan', rowspan);
+
+		// 첫번째 셀을 제외한 다른 모든 셀 제거
+		cell.slice(1).remove();
+	},
+
+	$ON_CELL_SPLIT_BY_ROW : function(many) {
+		var cell  = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var table = cell.parents('table').eq(0);
+		var self  = this;
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Row"]);
+
+		// 선택 영역의 상하 좌표 구함
+		var _top    = this._getRect(cell.eq(0)).top;
+		var _bottom = this._getRect(cell.eq(cell.length-1)).bottom;
+
+		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(상하 기준).
+		(cell = table.find('td,th').filter(function(){
+			var rect = self._getRect(jQuery(this));
+
+			return !(rect.bottom <= _top || rect.top >= _bottom);
+		})).filter('.xe_selected_cell').each(function(){
+			var t       = $(this);
+			var row     = t.parent('tr');
+			var rowspan = self._getSpan(t, 'row');
+			var rect    = self._getRect(t);
+			var queue   = [];
+			var clone   = t.clone().html('<br />');
+			var topspan = 1, botspan = 1;
+
+			// rowspan > 1이면 현재 셀의 rowspan을 절반으로 분할한다.
+			if (rowspan > 1) {
+
+				topspan = Math.ceil(rowspan/2);
+				botspan = rowspan - topspan;
+
+				queue.push(function(){
+					t.attr('rowSpan', topspan);
+				});
+
+				clone.attr('rowSpan', botspan);
+			} else {
+				// rowspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 rowspan을 추가
+				cell.filter(function(){
+					if (t.get(0) == this) return false;
+
+					var tt = jQuery(this);
+					var rc = self._getRect(tt);
+
+					// 범위를 넘은 부분은 제외
+					if (rc.bottom <= rect.top || rc.top >= rect.bottom) return false;
+
+					return true;
+				}).each(function(){
+					var tt = jQuery(this);
+					var sp = self._getSpan(tt, 'row')+1;
+
+					// rowspan 1 추가
+					queue.push(function(){
+						tt.attr('rowSpan', sp);
+					});
+				});
+
+				// 새 줄을 추가한다.
+				if (jQuery.browser.msie) {
+					// Fix bug for IE
+					row.after(row.clone().empty().get(0).outerHTML);
+				} else {
+					row.after(row.clone().empty());
+				}
+			}
+
+			var rows  = row.nextAll('tr');
+
+			// 현재 셀이 마지막 줄에 있다면 한 줄 추가 후 새로운 셀 추가
+			if (!rows.length) {
+				row.after(row.clone().empty().append(clone));
+			} else {
+				var next_sib  = rows.eq(topspan - 1).children('td,th').filter(function(){
+					return ( self._getRect(jQuery(this)).left > rect.left );
+				});
+
+				if (jQuery.browser.msie) {
+					next_sib.length?
+						next_sib.eq(0).before(clone.get(0).outerHTML):
+						rows.eq(topspan-1).append(clone.get(0).outerHTML);
+				} else {
+					next_sib.length?
+						next_sib.slice(0,1).before(clone):
+						rows.slice(topspan-1,1).append(clone);
+				}
+			}
+
+			// 함수를 바로 실행하면 좌표가 틀어지므로, 큐에 넣은 후 실행
+			jQuery.each(queue, function(){ this(); });
+
+		});
+	},
+
+	$ON_CELL_SPLIT_BY_COL : function(many) {
+		var cell   = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var table  = cell.parents('table').slice(0,1);
+		var self   = this;
+		var ie_bug = [], tmpId = (new Date).getTime(), tmpStr = '';
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Column"]);
+
+		// 선택 영역의 좌우 좌표 구함
+		var first_row = cell.eq(0).parent('tr');
+		var _left = this._getRect(first_row.find('.xe_selected_cell:first')).left;
+		var _right = this._getRect(first_row.find('.xe_selected_cell:last')).right;
+
+		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(좌우 기준).
+		(cell = table.find('td,th').filter(function(){
+			var rect = self._getRect(jQuery(this));
+
+			return !(rect.right <= _left || rect.left >= _right);
+		})).filter('.xe_selected_cell').each(function(idx){
+			var t       = jQuery(this);
+			var colspan = self._getSpan(t, 'col');
+			var clone   = t.clone().html('<br />');
+
+			// colspan > 1 이면 colspan을 절반으로 분할한다.
+			if (colspan > 1) {
+				var leftspan  = Math.ceil(colspan/2);
+				var rightspan = colspan - leftspan;
+
+				t.attr('colSpan', leftspan);
+				clone.attr('colSpan', rightspan);
+			} else {
+				// colspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 colspan을 추가
+				var rect = self._getRect(t);
+
+				cell.filter(function(){
+					if (t.get(0) == this) return false;
+
+					var tt = jQuery(this);
+					var rc = self._getRect(tt);
+
+					// 범위를 넘은 부분은 제외
+					if (rc.right <= rect.left || rc.left >= rect.right) return false;
+
+					return true;
+				}).each(function(){
+					var tt = jQuery(this);
+
+					// colspan 1 추가
+					tt.attr('colSpan', self._getSpan(tt, 'col')+1);
+				});
+
+				clone.attr('colSpan', 1);
+			}
+
+			if (jQuery.browser.msie) {
+				// Fix for IE bug
+				t.after(clone.get(0).outerHTML);
+			} else {
+				t.after(clone);
+			}
+		});
+	},
+
+	$ON_CHECK_STYLE_CHANGE : function(){
+		var ui  = ['merge_cells', 'split_col', 'split_row'];
+		var app = this.oApp;
+		var command = (this._startSel && this._startSel.is('.xe_selected_cell'))?'ENABLE_UI':'DISABLE_UI';
+
+		jQuery.each(ui, function(){ app.exec(command, [this]); });
+	},
+
+	_mousedown : function(event) {
+		var cur = $(event.target);
+		var sel = cur.parents().andSelf().filter('td,th,table');
+		var app = this.oApp;
+		var self = this;
+
+		// 모든 선택영역 해제
+		$('td.xe_selected_cell', this.oApp.getWYSIWYGDocument()).removeClass('xe_selected_cell');
+
+		this._startSel = null;
+		this._endSel   = null;
+
+		if (!sel.length || !this._isLeftClicked(event.button)) return;
+
+		function delayed(){
+			sel = app.getSelection().cloneRange();
+			sel.collapseToStart();
+			sel = jQuery(sel.startContainer).parents().andSelf().filter('td,th').eq(0);
+
+			if (!sel.length) return self._removeAllListener()||true;
+
+			// 좌표를 구한다
+			self._getRect(self._startSel = sel);
+
+			// 이벤트 바인딩
+			self._doc.bind('mousemove', self.$FnMouseMove);
+			self._doc.bind('mouseup', self.$FnMouseUp);
+		}
+
+		// mousedown이 일어난 후에 선택 영역이 설정되므로 실행을 지연시킨다.
+		setTimeout(delayed, 0);
+	},
+
+	_mouseup : function(event) {
+		// 선택된 셀 확인
+		this._removeAllListener();
+
+		// 시작셀과 종료셀 제거
+		this._startSel = this._endSel = null;
+	},
+
+	_mousemove : function(event) {
+		var cur  = $(event.target);
+		var cell = cur.parents().andSelf().filter('td,th').eq(0);
+		var self = this;
+
+		// 마우스 왼쪽 버튼이 눌리지 않았으면 종료
+		if (!cell.length || !this._isLeftClicked(event.button)) return;
+		if (!this._endSel && cell.get(0) == this._startSel.get(0)) return;
+		if (this._endSel && cell.get(0) == this._endSel.get(0)) return;
+
+		// 종료셀 && 종료셀의 좌표
+		this._getRect(this._endSel = cell);
+
+		// 선택 범위를 구한다
+		var _top    = Math.min(this._startSel.rect.top,  this._endSel.rect.top);
+		var _left   = Math.min(this._startSel.rect.left, this._endSel.rect.left);
+		var _bottom = Math.max(this._startSel.rect.bottom, this._endSel.rect.bottom);
+		var _right  = Math.max(this._startSel.rect.right,  this._endSel.rect.right);
+
+		var table = cell.parents('table');
+		var cells = table.find('td,th').removeClass('xe_selected_cell');
+		var i = 0;
+
+		// 복잡한 모양의 테이블을 위한 반복 처리
+		var selected = $();
+		do {
+			// 선택한 셀로 최대 영역 재계산
+			selected.each(function(){
+				var rect = self._getRect(jQuery(this));
+
+				// 영역 재계산
+				if (rect.right  > _right)  _right  = rect.right;
+				if (rect.left   < _left)   _left   = rect.left;
+				if (rect.top    < _top)    _top    = rect.top;
+				if (rect.bottom > _bottom) _bottom = rect.bottom;
+			});
+
+			// 좌표 범위 안에 있는 선택할 셀을 추린다.
+			cells = cells.filter(':not(.xe_selected_cell)');
+			selected = cells.filter(function(){
+				var rect = self._getRect(jQuery(this));
+
+				if (rect.right <= _left || rect.left >= _right || rect.bottom <= _top || rect.top >= _bottom) return false;
+
+				return true;
+			}).addClass('xe_selected_cell');
+		} while(selected.length);
+
+		// 브라우저의 기본 선택영역 해제 : FF 제외 - 기본 기능이 충분히 좋아서 + 이 부분을 실행하면 오류가 발생해서
+		if (!$.browser.mozilla) {
+			function delayed() {
+				var sel = self.oApp.getSelection();
+
+				if (!self._startSel) return;
+				if (!self._startSel.get(0).firstChild) self._startSel.text(" ");
+
+				sel.selectNode(self._startSel.get(0).firstChild);
+				sel.collapseToStart();
+				sel.select();
+			}
+
+			setTimeout(delayed, 0);
+		}
+
+		return false;
+	},
+
+	_removeAllListener : function() {
+		// 이벤트 해제
+		this._doc.unbind("mousemove", this.$FnMouseMove);
+		this._doc.unbind("mouseup", this.$FnMouseUp);
+	},
+
+	_isLeftClicked : function(value) {
+		return jQuery.browser.msie?!!(value & 1):(value == 0);
+	},
+
+	_getRect : function(obj) {
+		var el = obj.get(0);
+
+		obj.rect = {};
+		obj.rect.top    = el.offsetTop;
+		obj.rect.left   = el.offsetLeft;
+		obj.rect.bottom = obj.rect.top  + el.offsetHeight;
+		obj.rect.right  = obj.rect.left + el.offsetWidth;
+
+		return obj.rect;
+	},
+
+	_getSpan : function(obj, type) {
+		var span = parseInt($(obj).attr(type+'span'));
+
+		return isNaN(span)?1:span;
+	}
+}).extend(xe.XE_Table);
+
+xe.XE_FontSetter = $.Class({
+	name : "XE_FontSetter",
+	fontFamily : '',
+	fontSize : '',
+	$init : function(fontFamily, fontSize) {
+		this.fontFamily = fontFamily || '';
+		this.fontSize = fontSize || '';
+	},
+	$ON_MSG_APP_READY : function() {
+		var doc = this.oApp.getWYSIWYGDocument();
+		if (this.fontFamily) doc.body.style.fontFamily = this.fontFamily;
+		if (this.fontSize) doc.body.style.fontSize = this.fontSize;
+	}
+});
+
+xe.XE_WYSIWYGEnterKey = $.Class({
+	name : "XE_WYSIWYGEnterKey",
+	sLineBreaker : "P",
+	$init : function(sLineBreaker){
+		if(sLineBreaker == "BR"){
+			this.sLineBreaker = "BR";
+		}else{
+			this.sLineBreaker = "P";
+		}
+
+		if(($.browser.msie || $.browser.opera) && this.sLineBreaker == "P"){
+			this.$ON_MSG_APP_READY = function(){};
+		}
+	},
+	$ON_MSG_APP_READY : function(){
+		var doc = this.oApp.getWYSIWYGDocument();
+
+		if (typeof doc._enterkey_binded == "undefined") {		
+			$(doc).keydown($.fnBind(this._onKeyDown, this));
+			doc._enterkey_binded = true;
+		}
+	},
+	_onKeyDown : function(event){	
+		if(event.shiftKey) return;
+		
+		if(event.keyCode == 13){ // enter
+			if(this.sLineBreaker == "BR"){
+				this._insertBR(event);
+			}else{
+				this._wrapBlock(event);
+			}
+			return false;
+		}
+	},
+	_wrapBlock : function(event, sWrapperTagName){
+		var oSelection = this.oApp.getSelection();
+		var sBM = oSelection.placeStringBookmark();
+		var oLineInfo = oSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		// line broke by sibling
+		// or
+		// the parent line breaker is just a block container
+		if(!oStart.bParentBreak || oSelection.rxBlockContainer.test(oStart.oLineBreaker.tagName)){
+			event.stopPropagation();
+			event.preventDefault();
+
+			var oSWrapper = this.oApp.getWYSIWYGDocument().createElement(this.sLineBreaker);
+			oSelection.moveToBookmark(sBM);
+			oSelection.setStartBefore(oStart.oNode);
+			oSelection.surroundContents(oSWrapper);
+
+			oSelection.collapseToEnd();
+
+			var oEWrapper = this.oApp.getWYSIWYGDocument().createElement(this.sLineBreaker);
+			oSelection.setEndAfter(oEnd.oNode);
+			oSelection.surroundContents(oEWrapper);
+
+			oSelection.removeStringBookmark(sBM);
+
+			if(oSWrapper.innerHTML == "") oSWrapper.innerHTML = "<br>";
+			if(oEWrapper.innerHTML == "") oEWrapper.innerHTML = "<br>";
+			
+			if(oEWrapper.nextSibling && oEWrapper.nextSibling.tagName == "BR") oEWrapper.parentNode.removeChild(oEWrapper.nextSibling);
+
+			oSelection.selectNodeContents(oEWrapper);
+			oSelection.collapseToStart();
+			oSelection.select();
+			this.oApp.exec("CHECK_STYLE_CHANGE", []);
+		}else{
+			oSelection.removeStringBookmark(sBM);
+		}
+	},
+	
+	_insertBR : function(event){
+		event.stopPropagation();
+		event.preventDefault();
+
+		var oSelection = this.oApp.getSelection();
+
+		var elBR = this.oApp.getWYSIWYGDocument().createElement("BR");
+		oSelection.insertNode(elBR);
+		oSelection.selectNode(elBR);
+		oSelection.collapseToEnd();
+		
+		if(!$.browser.msie){
+			var oLineInfo = oSelection.getLineInfo();
+			var oStart = oLineInfo.oStart;
+			var oEnd = oLineInfo.oEnd;
+
+			if(oEnd.bParentBreak){
+				while(oEnd.oNode && oEnd.oNode.nodeType == 3 && oEnd.oNode.nodeValue == ""){
+					oEnd.oNode = oEnd.oNode.previousSibling;
+				}
+
+				var nTmp = 1;
+				if(oEnd.oNode == elBR || oEnd.oNode.nextSibling == elBR){
+					nTmp = 0;
+				}
+
+				if(nTmp == 0){
+					oSelection.pasteHTML("<br type='_moz'/>");
+					oSelection.collapseToEnd();
+				}
+			}
+		}
+
+		// the text cursor won't move to the next line without this
+		oSelection.insertNode(this.oApp.getWYSIWYGDocument().createTextNode(""));
+		oSelection.select();
+	}
+});
+
+})(jQuery);
diff --git a/modules/editor/skins/dreditor/js/xe_interface.js b/modules/editor/skins/dreditor/js/xe_interface.js
index 59d366595..27ed52426 100644
--- a/modules/editor/skins/dreditor/js/xe_interface.js
+++ b/modules/editor/skins/dreditor/js/xe_interface.js
@@ -1,107 +1,107 @@
-/**
- * @file xe_interface.js
- * @brief XE Editor Standard Interface
- * @author NHN (developers@xpressengine.com)
- */
-(function($){
-
-// get editor app
-var editor = xe.getApp('DrEditor');
-if ($.isArray(editor)) editor = editor[0];
-
-function _get_content(editor_sequence) {
-	var content = editor.cast('GET_CONTENT', [editor_sequence]);
-	return $.isArray(content)?content[0]:content;
-}
-
-function _set_content(editor_sequence, content) {
-	editor.cast('SET_CONTENT', [editor_sequence, content]);
-}
-
-function _create(editor_sequence, primary_key, content_key, editor_height, colorset, content_style, content_font, content_font_size) {
-	if (!colorset) colorset = 'white';
-	if (!content_style) content_style = 'xeStyle';
-	if (!content_font) content_font = '';
-	if (!content_font_size) content_font_size = '';
-
-	var seq  = editor_sequence;
-	var form = $('#dreditor_dummy_'+editor_sequence).parents('form:first').get(0);
-	var target_src = request_uri+'modules/editor/styles/'+content_style+'/editor.html';
-	var content = form[content_key].value;
-
-	try {
-		form.setAttribute('editor_sequence', seq);
-	} catch(e) {
-		form.edtior_sequence = seq;
-	}
-
-	// Set Standard API
-	if (editorRelKeys) {
-		editorRelKeys[seq] = {
-			primary : form[primary_key],
-			content : form[content_key],
-			editor  : null,
-			func      : function(){ return editor.cast('GET_CONTENT', [seq]) },
-			pasteHTML : function(content){ editor.cast('SET_CONTENT', [seq, content]); }
-		};
-	}
-
-	editor.cast('CREATE_EDITOR', [seq, form]); // create new editor
-
-	jQuery(function(){
-		editor.cast('SET_CONTENT', [seq, content]);
-		if (editorRelKeys) editorRelKeys[seq].content.value = editorRelKeys[seq].func();
-	});
-
-	// Auto save
-	if (form._disable_autosaved) {
-		editorRemoveSavedDoc();
-	} else {
-		if (form._saved_doc_title && form._saved_doc_title.value) { // Check auto-saved document
-			var saved_title = form._saved_doc_title.value;
-			var saved_content = form._saved_doc_content.value;
-
-			if (saved_title || saved_content) {
-				// 자동저장된 문서 활용여부를 물은 후 사용하지 않는다면 자동저장된 문서 삭제
-				if(confirm(form._saved_doc_message.value)) {
-					if(typeof(form.title)!='undefined') form.title.value = saved_title;
-					if(editorRelKeys){
-						$(function(){
-							editorRelKeys[seq].content.value = saved_content;
-							editorRelKeys[seq].pasteHTML(saved_content);
-						});
-					}
-				} else {
-					editorRemoveSavedDoc();
-				}
-			}
-		}
-		editorEnableAutoSave(form, editor_sequence);
-	}
-}
-
-// before unload
-window.onbeforeunload = function(e) {
-	var msg = '';
-	$.each(editorRelKeys, function(seq, obj){
-		if (!obj) return  true;
-
-		var content = obj.func();
-
-		if (content != obj.content.value) {
-			msg = msg_close_before_write;
-			return false;
-		}
-	});
-
-	if (msg) {
-		if ($.browser.msie) window.event.returnValue = msg;
-		else return msg;
-	}
-};
-
-// register as global function
-window.editorStart_xe = _create;
-window.editorGetContentTextarea_xe = _get_content;
-
-})(jQuery);
+/**
+ * @file xe_interface.js
+ * @brief XE Editor Standard Interface
+ * @author NHN (developers@xpressengine.com)
+ */
+(function($){
+
+// get editor app
+var editor = xe.getApp('DrEditor');
+if ($.isArray(editor)) editor = editor[0];
+
+function _get_content(editor_sequence) {
+	var content = editor.cast('GET_CONTENT', [editor_sequence]);
+	return $.isArray(content)?content[0]:content;
+}
+
+function _set_content(editor_sequence, content) {
+	editor.cast('SET_CONTENT', [editor_sequence, content]);
+}
+
+function _create(editor_sequence, primary_key, content_key, editor_height, colorset, content_style, content_font, content_font_size) {
+	if (!colorset) colorset = 'white';
+	if (!content_style) content_style = 'xeStyle';
+	if (!content_font) content_font = '';
+	if (!content_font_size) content_font_size = '';
+
+	var seq  = editor_sequence;
+	var form = $('#dreditor_dummy_'+editor_sequence).parents('form:first').get(0);
+	var target_src = request_uri+'modules/editor/styles/'+content_style+'/editor.html';
+	var content = form[content_key].value;
+
+	try {
+		form.setAttribute('editor_sequence', seq);
+	} catch(e) {
+		form.edtior_sequence = seq;
+	}
+
+	// Set Standard API
+	if (editorRelKeys) {
+		editorRelKeys[seq] = {
+			primary : form[primary_key],
+			content : form[content_key],
+			editor  : null,
+			func      : function(){ return editor.cast('GET_CONTENT', [seq]) },
+			pasteHTML : function(content){ editor.cast('SET_CONTENT', [seq, content]); }
+		};
+	}
+
+	editor.cast('CREATE_EDITOR', [seq, form]); // create new editor
+
+	jQuery(function(){
+		editor.cast('SET_CONTENT', [seq, content]);
+		if (editorRelKeys) editorRelKeys[seq].content.value = editorRelKeys[seq].func();
+	});
+
+	// Auto save
+	if (form._disable_autosaved) {
+		editorRemoveSavedDoc();
+	} else {
+		if (form._saved_doc_title && form._saved_doc_title.value) { // Check auto-saved document
+			var saved_title = form._saved_doc_title.value;
+			var saved_content = form._saved_doc_content.value;
+
+			if (saved_title || saved_content) {
+				// 자동저장된 문서 활용여부를 물은 후 사용하지 않는다면 자동저장된 문서 삭제
+				if(confirm(form._saved_doc_message.value)) {
+					if(typeof(form.title)!='undefined') form.title.value = saved_title;
+					if(editorRelKeys){
+						$(function(){
+							editorRelKeys[seq].content.value = saved_content;
+							editorRelKeys[seq].pasteHTML(saved_content);
+						});
+					}
+				} else {
+					editorRemoveSavedDoc();
+				}
+			}
+		}
+		editorEnableAutoSave(form, editor_sequence);
+	}
+}
+
+// before unload
+window.onbeforeunload = function(e) {
+	var msg = '';
+	$.each(editorRelKeys, function(seq, obj){
+		if (!obj) return  true;
+
+		var content = obj.func();
+
+		if (content != obj.content.value) {
+			msg = msg_close_before_write;
+			return false;
+		}
+	});
+
+	if (msg) {
+		if ($.browser.msie) window.event.returnValue = msg;
+		else return msg;
+	}
+};
+
+// register as global function
+window.editorStart_xe = _create;
+window.editorGetContentTextarea_xe = _get_content;
+
+})(jQuery);
diff --git a/modules/editor/skins/dreditor/lang/en.lang.php b/modules/editor/skins/dreditor/lang/en.lang.php
deleted file mode 100644
index 94d1e985e..000000000
--- a/modules/editor/skins/dreditor/lang/en.lang.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/en.lang.php
-	 * @author nicetwo
-	 * @brief  Dr.Editor
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = 'Do you want to remove selected paragraph?';
-	$lang->edit->insert_dr_title = 'Please input title';
-	$lang->edit->richtext_area = 'Richtext Area';
-	$lang->edit->insert_site_name = 'Please input the name of site';
-	$lang->edit->insert_explain = 'Please input description';
-
-
-	$lang->edit->text = 'Text';
-	$lang->edit->link = 'Link';
-	$lang->edit->blockquote = 'Quote';
-	$lang->edit->insert_blockquote = 'Please input quote';
-	$lang->edit->insert_cite = 'You can input the origin source. <a>, <strong>, <em> tags are available.';
-
-	$lang->edit->image = 'Image';
-	$lang->edit->find_image = 'Find Image';
-	$lang->edit->uploading = 'Uploading...';
-	$lang->edit->uploading_info = 'You can upload to maximum %sMB';
-	$lang->edit->uploaded_image = 'User Uploaded Image';
-
-	$lang->edit->image_width = 'Image Width';
-	$lang->edit->resize = 'Resize';
-	$lang->edit->resize_info = 'A new copy of image in inputted size will be created. Original image will still remain';
-	$lang->edit->resize_error = 'Please input smaller size than original image size';
-	$lang->edit->insert_image_explain = 'Please input description. <a>, <strong>, <em> tags are available.';
-
-	$lang->edit->mov ='Movie';
-	$lang->edit->insert_mov = 'Please input multimedia insertion code starts with <object> or <embed>';
-	$lang->edit->insert_mov_explain = 'Please input description. <a>, <strong>, <em> tags are available.';
-
-	$lang->edit->file = 'File';
-	$lang->edit->file_select = 'Please select a file to upload';
-	$lang->edit->file_uploadinfo = 'You can upload to maximum %sMB each, %sMB total';
-	$lang->edit->file_total ='Total <strong class="filecount">{total_filecount}</strong>file(s)';
-	$lang->edit->insert_file_explain ='Please input description';
-
-	$lang->edit->hr = 'HR';
-	$lang->edit->hr_simple= 'Simple HR';
-
-	$lang->edit->title_title = 'Strapline';
-	$lang->edit->title='Subject';
-	$lang->edit->title1='Large';
-	$lang->edit->title2='Medium';
-	$lang->edit->title3='Small';
-
-	$lang->edit->list = 'List';
-	$lang->edit->list_explain = 'You can change the position or level of items by pressing CTRL+Arrow Keys.';
-	$lang->edit->toc = 'Index';
-	$lang->edit->toc_explain ='It makes an index with created straplines, and will be renewed automatically.';
-
-	$lang->edit->more = 'More';
-	$lang->edit->move_button = 'Move Button';
-
-	$lang->edit->material = 'Ingredients';
-	$lang->edit->insert = 'Insert the ingredient to content';
-	$lang->edit->close_materials = 'Close';
-    $lang->edit->no_materials = 'There is no writting ingredient.';
-    $lang->edit->msg_no_selected_object = 'There is no selected object.';
-    $lang->edit->msg_insert_value = 'Please input the value.';
-
-	$lang->edit->help_first_title = '도움말';
-	$lang->edit->help_shortcut = '단축키';
-	$lang->edit->help_bug_report = '글쓰기 오류신고';
-	$lang->edit->help_first_dt_1 = '새 단락 쓰기(1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = '도구모음 버튼을 클릭함으로써 새 단락 쓰기를 시작할 수 있습니다. 도구모음 버튼에는 배치된 순서대로 왼쪽으로부터 1~9까지 단축키가 할당되어 있습니다. 숫자키 \'0\' 또는 ESC키 바로 아래 위치한 [`] 그레이브(grave) 키를 누르시면 숨겨진 도구모음 버튼을 보거나 토글(toggle)할 수 있습니다.';
-	$lang->edit->help_first_dt_2 = '단락 선택(Click, Ctrl+Click, Shift+Click)';
-	$lang->edit->help_first_dd_2 = '클릭 또는 클릭 후 방향키(&uarr;&darr;)를 조작함으로써 원하는 단락을 선택할 수 있습니다. 단일선택(Click)과 다중선택(Ctrl+Click, Shift+Click)이 가능합니다';
-	$lang->edit->help_first_dt_3 = '단락 편집 및 취소(Enter, Double Click, ESC)';
-	$lang->edit->help_first_dd_3 = '단락 선택 후 Enter 또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.';
-	$lang->edit->help_first_dt_4 = '단락 이동(Ctrl+&uarr;&darr;, Click-Drag-Drop)';
-	$lang->edit->help_first_dd_4 = '단락 선택 후 Ctrl+방향키(&uarr;&darr;)를 조작하거나 \'클릭-드래그-드롭\'으로 이동할 수 있습니다.';
-	$lang->edit->help_first_dt_5 = '단락 저장 및 삭제(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = '\'확인\'버튼을 누르거나 Ctrl+Enter 명령으로 저장할 수 있습니다. Del키를 이용하여 선택된 단락을 삭제할 수 있습니다.';
-
-	$lang->edit->drag_this = '단락을 드래그하여 이동하세요.';
-	$lang->edit->cmd_new_window = '새창';
-	$lang->edit->cmd_del = '삭제';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/jp.lang.php b/modules/editor/skins/dreditor/lang/jp.lang.php
deleted file mode 100644
index 30f7f8e66..000000000
--- a/modules/editor/skins/dreditor/lang/jp.lang.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/jp.lang.php
-	 * @author sol <sol@ngleader.com>　翻訳：ミニミ
-	 * @brief  段落エディター日本語言語パッケージ
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = '選択した段落を削除して宜しいですか？';
-	$lang->edit->insert_dr_title = '段落のタイトルを入力して下さい。';
-	$lang->edit->richtext_area = 'リッチテキストの入力スペース';
-	$lang->edit->insert_site_name = 'サイト名を入力します。';
-	$lang->edit->insert_explain = '説明の追加入力が出来ます。';
-
-
-	$lang->edit->text='テキスト';
-	$lang->edit->link = 'リンク';
-	$lang->edit->blockquote = '引用';
-	$lang->edit->insert_blockquote = '引用文を入力して下さい。';
-	$lang->edit->insert_cite = '出所を入力します。 <a>、<strong>、<em> タグの入力も可能です。';
-
-	$lang->edit->image = '画像';
-	$lang->edit->find_image = '画像選択';
-	$lang->edit->uploading = 'アップロード中です。';
-	$lang->edit->uploading_info = '%sMBまでアップロード出来ます。';
-	$lang->edit->uploaded_image = 'ユーザーアップロード画像';
-
-	$lang->edit->image_width = '画像幅';
-	$lang->edit->resize = '縮小する';
-	$lang->edit->resize_info = '指定したサイズのコピーを生成し、元の画像は維持されます。';
-	$lang->edit->resize_error = 'オリジナル画像より小さいサイズを入力して下さい。';
-	$lang->edit->insert_image_explain = '画像の説明を入力します。 <a>, <strong>, <em> タグの入力も可能です。';
-
-	$lang->edit->mov ='動画';
-	$lang->edit->insert_mov = '<object> または <embed>で始まるマルチメディアのコードを挿入して下さい。';
-	$lang->edit->insert_mov_explain = '動画の説明を入力します。 <a>, <strong>, <em> タグの入力も可能です。';
-
-	$lang->edit->file='ファイル';
-	$lang->edit->file_select = 'アップロードするファイルを選択して下さい。';
-	$lang->edit->file_uploadinfo = '１個当り %sMB、全体としては %sMBまでアップロードが出来ます。';
-	$lang->edit->file_total ='総<strong class="filecount">{total_filecount}</strong>個';
-	$lang->edit->insert_file_explain ='ファイルの説明を入力します。';
-
-	$lang->edit->hr = '区分線';
-	$lang->edit->hr_simple= '基本水平線';
-
-	$lang->edit->title_title='サブタイトル';
-	$lang->edit->title='タイトル';
-	$lang->edit->title1='サブタイトル（大）';
-	$lang->edit->title2='サブタイトル（中）';
-	$lang->edit->title3='サブタイトル（小）';
-
-	$lang->edit->list = 'リスト';
-	$lang->edit->list_explain = '「CTRL+矢印」を押して、項目の位置や段階を変えることが出来ます。';
-	$lang->edit->toc = '目次';
-	$lang->edit->toc_explain ='文書内のサブタイトルをまとめて、目次を自動作成します。';
-	
-	$lang->edit->more = 'もっと見る';
-	$lang->edit->move_button = 'ボタン移動';
-
-	$lang->edit->material = 'ネタ';
-	$lang->edit->insert = 'このネタを本文に挿入する';
-	$lang->edit->close_materials = 'ネタ保存箱を閉じる';
-    $lang->edit->no_materials = '保存されているネタはありません。';
-    $lang->edit->msg_no_selected_object = '選択されたものがありません。';
-    $lang->edit->msg_insert_value = '値を入力して下さい。';
-
-	$lang->edit->help_first_title = '도움말';
-	$lang->edit->help_shortcut = '단축키';
-	$lang->edit->help_bug_report = '글쓰기 오류신고';
-	$lang->edit->help_first_dt_1 = '새 단락 쓰기(1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = '도구모음 버튼을 클릭함으로써 새 단락 쓰기를 시작할 수 있습니다. 도구모음 버튼에는 배치된 순서대로 왼쪽으로부터 1~9까지 단축키가 할당되어 있습니다. 숫자키 \'0\' 또는 ESC키 바로 아래 위치한 [`] 그레이브(grave) 키를 누르시면 숨겨진 도구모음 버튼을 보거나 토글(toggle)할 수 있습니다.';
-	$lang->edit->help_first_dt_2 = '단락 선택(Click, Ctrl+Click, Shift+Click)';
-	$lang->edit->help_first_dd_2 = '클릭 또는 클릭 후 방향키(&uarr;&darr;)를 조작함으로써 원하는 단락을 선택할 수 있습니다. 단일선택(Click)과 다중선택(Ctrl+Click, Shift+Click)이 가능합니다';
-	$lang->edit->help_first_dt_3 = '단락 편집 및 취소(Enter, Double Click, ESC)';
-	$lang->edit->help_first_dd_3 = '단락 선택 후 Enter 또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.';
-	$lang->edit->help_first_dt_4 = '단락 이동(Ctrl+&uarr;&darr;, Click-Drag-Drop)';
-	$lang->edit->help_first_dd_4 = '단락 선택 후 Ctrl+방향키(&uarr;&darr;)를 조작하거나 \'클릭-드래그-드롭\'으로 이동할 수 있습니다.';
-	$lang->edit->help_first_dt_5 = '단락 저장 및 삭제(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = '\'확인\'버튼을 누르거나 Ctrl+Enter 명령으로 저장할 수 있습니다. Del키를 이용하여 선택된 단락을 삭제할 수 있습니다.';
-
-	$lang->edit->drag_this = '단락을 드래그하여 이동하세요.';
-	$lang->edit->cmd_new_window = '새창';
-	$lang->edit->cmd_del = '삭제';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/ko.lang.php b/modules/editor/skins/dreditor/lang/ko.lang.php
deleted file mode 100644
index a8ee50977..000000000
--- a/modules/editor/skins/dreditor/lang/ko.lang.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/ko.lang.php
-	 * @author sol <sol@ngleader.com>
-	 * @brief  단락에디터 언어팩
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = '선택한 단락을 삭제하시겠습니까?';
-	$lang->edit->insert_dr_title = '단락의 제목을 입력해 주세요';
-	$lang->edit->richtext_area = '리치 텍스트 쓰기 영역';
-	$lang->edit->insert_site_name = '사이트 이름을 입력할 수 있습니다';
-	$lang->edit->insert_explain = '설명을 추가로 입력할 수 있습니다';
-
-
-	$lang->edit->text='텍스트';
-	$lang->edit->link = '링크';
-	$lang->edit->blockquote = '인용';
-	$lang->edit->insert_blockquote = '인용 문구를 입력해 주세요';
-	$lang->edit->insert_cite = '출처를 입력할 수 있습니다 <a>, <strong>, <em> 태그를 쓸 수 있습니다';
-
-	$lang->edit->image = '이미지';
-	$lang->edit->find_image = '이미지 찾아보기';
-	$lang->edit->uploading = '업로드 중입니다';
-	$lang->edit->uploading_info = '%s MB 까지 업로드가 가능 합니다';
-	$lang->edit->uploaded_image = '사용자 업로드 이미지';
-
-	$lang->edit->image_width = '이미지 너비';
-	$lang->edit->resize = '줄이기';
-	$lang->edit->resize_info = '지정한 크기의 사본을 만들며 원본은 유지 됩니다';
-	$lang->edit->resize_error = '원본 이미지보다 작은 크기의 값을 입력하세요';
-	$lang->edit->insert_image_explain = '이미지의 설명을 입력할 수 있습니다. <a>, <strong>, <em> 태그를 쓸 수 있습니다.';
-
-	$lang->edit->mov ='동영상';
-	$lang->edit->insert_mov = '<object> 또는 <embed>로 시작하는 멀티미디어 삽입 코드를 넣어주세요';
-	$lang->edit->insert_mov_explain = '동영상의 설명을 입력할 수 있습니다. <a>, <strong>, <em> 태그를 쓸 수 있습니다.';
-
-	$lang->edit->file ='파일';
-	$lang->edit->file_select = '업로드할 파일을 선택해 주세요';
-	$lang->edit->file_uploadinfo = '개당 %sMB, 모두 합쳐 %sMB 까지 업로드가 가능 합니다';
-	$lang->edit->file_total ='총 <strong class="filecount">{total_filecount}</strong>개';
-	$lang->edit->insert_file_explain ='파일의 설명을 입력할 수 있습니다';
-
-	$lang->edit->hr = '분리선';
-	$lang->edit->hr_simple= '단순 가로선';
-
-	$lang->edit->title_title='소제목';
-	$lang->edit->title='제목';
-	$lang->edit->title1='큰제목';
-	$lang->edit->title2='중간제목';
-	$lang->edit->title3='작은제목';
-
-	$lang->edit->list = '목록';
-	$lang->edit->list_explain = 'CTRL+방향키를 누르면 항목의 위치나 단계를 변경할 수 있습니다.';
-	$lang->edit->toc = '목차';
-	$lang->edit->toc_explain ='문서 내의 소제목들을 모아 목차로 만들어주며, 자동으로 갱신됩니다.';
-	
-	$lang->edit->more = '더보기';
-	$lang->edit->move_button = '버튼이동';
-
-	$lang->edit->material = '글감';
-	$lang->edit->insert = '이 글감을 본문에 넣기';
-	$lang->edit->close_materials = '글감 보관함 닫기';
-    $lang->edit->no_materials = '보관된 글감이 없습니다.';
-    $lang->edit->msg_no_selected_object = '선택된 개체가 없습니다.';
-    $lang->edit->msg_insert_value = '값을 입력해 주세요.';
-	
-	$lang->edit->help_first_title = '도움말';
-	$lang->edit->help_shortcut = '단축키';
-	$lang->edit->help_bug_report = '글쓰기 오류신고';
-	$lang->edit->help_first_dt_1 = '새 단락 쓰기(1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = '도구모음 버튼을 클릭함으로써 새 단락 쓰기를 시작할 수 있습니다. 도구모음 버튼에는 배치된 순서대로 왼쪽으로부터 1~9까지 단축키가 할당되어 있습니다. 숫자키 \'0\' 또는 ESC키 바로 아래 위치한 [`] 그레이브(grave) 키를 누르시면 숨겨진 도구모음 버튼을 보거나 토글(toggle)할 수 있습니다.';
-	$lang->edit->help_first_dt_2 = '단락 선택(Click, Ctrl+Click, Shift+Click)';
-	$lang->edit->help_first_dd_2 = '클릭 또는 클릭 후 방향키(&uarr;&darr;)를 조작함으로써 원하는 단락을 선택할 수 있습니다. 단일선택(Click)과 다중선택(Ctrl+Click, Shift+Click)이 가능합니다';
-	$lang->edit->help_first_dt_3 = '단락 편집 및 취소(Enter, Double Click, ESC)';
-	$lang->edit->help_first_dd_3 = '단락 선택 후 Enter 또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.';
-	$lang->edit->help_first_dt_4 = '단락 이동(Ctrl+&uarr;&darr;, Click-Drag-Drop)';
-	$lang->edit->help_first_dd_4 = '단락 선택 후 Ctrl+방향키(&uarr;&darr;)를 조작하거나 \'클릭-드래그-드롭\'으로 이동할 수 있습니다.';
-	$lang->edit->help_first_dt_5 = '단락 저장 및 삭제(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = '\'확인\'버튼을 누르거나 Ctrl+Enter 명령으로 저장할 수 있습니다. Del키를 이용하여 선택된 단락을 삭제할 수 있습니다.';
-
-	$lang->edit->drag_this = '단락을 드래그하여 이동하세요.';
-	$lang->edit->cmd_new_window = '새창';
-	$lang->edit->cmd_del = '삭제';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/lang.xml b/modules/editor/skins/dreditor/lang/lang.xml
new file mode 100644
index 000000000..c3baa64ac
--- /dev/null
+++ b/modules/editor/skins/dreditor/lang/lang.xml
@@ -0,0 +1,533 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="edit">
+		<item name="msg_dr_delete_confirm">
+			<value xml:lang="ko"><![CDATA[선택한 단락을 삭제하시겠습니까?]]></value>
+			<value xml:lang="en"><![CDATA[Do you want to remove the selected paragraph?]]></value>
+			<value xml:lang="jp"><![CDATA[選択した段落を削除しますか？]]></value>
+			<value xml:lang="zh-CN"><![CDATA[确定要删除所选锻炼吗？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[想要移除所選擇的段落？]]></value>
+			<value xml:lang="tr"><![CDATA[Seçili paragrafı kaldırmak istiyor musunuz?]]></value>
+			<value xml:lang="vi"><![CDATA[Bạn có muốn xóa đoạn văn bản đã chọn?]]></value>
+		</item>
+		<item name="insert_dr_title">
+			<value xml:lang="ko"><![CDATA[단락의 제목을 입력해 주세요]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the title.]]></value>
+			<value xml:lang="jp"><![CDATA[段落のタイトルを入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入段落标题。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入標題]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen başlık girin]]></value>
+			<value xml:lang="vi"><![CDATA[Xin hãy nhập tiêu đề.]]></value>
+		</item>
+		<item name="richtext_area">
+			<value xml:lang="ko"><![CDATA[리치 텍스트 쓰기 영역]]></value>
+			<value xml:lang="en"><![CDATA[Richtext Area]]></value>
+			<value xml:lang="jp"><![CDATA[リッチテキストの入力スペース]]></value>
+			<value xml:lang="zh-CN"><![CDATA[富编辑器编辑区]]></value>
+			<value xml:lang="zh-TW"><![CDATA[所見及得區域]]></value>
+			<value xml:lang="tr"><![CDATA[Zengın metin alanı]]></value>
+			<value xml:lang="vi"><![CDATA[Định dạng khu vực viết văn bản]]></value>
+		</item>
+		<item name="insert_site_name">
+			<value xml:lang="ko"><![CDATA[사이트 이름을 입력할 수 있습니다]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the name of the site.]]></value>
+			<value xml:lang="jp"><![CDATA[サイト名を入力します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[在此可以输入网站名称。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入網站名稱]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen site adını girin]]></value>
+			<value xml:lang="vi"><![CDATA[Tên trang Web.]]></value>
+		</item>
+		<item name="insert_explain">
+			<value xml:lang="ko"><![CDATA[설명을 추가로 입력할 수 있습니다]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the description.]]></value>
+			<value xml:lang="jp"><![CDATA[説明の追加入力ができます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[在此可以输入简单说明。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入說明]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen tanım girin]]></value>
+			<value xml:lang="vi"><![CDATA[Mô tả cho trang Web.]]></value>
+		</item>
+		<item name="text">
+			<value xml:lang="ko"><![CDATA[텍스트]]></value>
+			<value xml:lang="en"><![CDATA[Text]]></value>
+			<value xml:lang="jp"><![CDATA[テキスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文本]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文字]]></value>
+			<value xml:lang="tr"><![CDATA[Metin]]></value>
+			<value xml:lang="vi"><![CDATA[Văn bản]]></value>
+		</item>
+		<item name="link">
+			<value xml:lang="ko"><![CDATA[링크]]></value>
+			<value xml:lang="en"><![CDATA[Link]]></value>
+			<value xml:lang="jp"><![CDATA[リンク]]></value>
+			<value xml:lang="zh-CN"><![CDATA[链接]]></value>
+			<value xml:lang="zh-TW"><![CDATA[連結]]></value>
+			<value xml:lang="tr"><![CDATA[Bağlantı]]></value>
+			<value xml:lang="vi"><![CDATA[Liên kết]]></value>
+		</item>
+		<item name="blockquote">
+			<value xml:lang="ko"><![CDATA[인용]]></value>
+			<value xml:lang="en"><![CDATA[Quote]]></value>
+			<value xml:lang="jp"><![CDATA[引用]]></value>
+			<value xml:lang="zh-CN"><![CDATA[引用]]></value>
+			<value xml:lang="zh-TW"><![CDATA[引用]]></value>
+			<value xml:lang="fr"><![CDATA[Blockquote]]></value>
+			<value xml:lang="ru"><![CDATA[Blockquote]]></value>
+			<value xml:lang="es"><![CDATA[Blockquote]]></value>
+			<value xml:lang="tr"><![CDATA[Alıntı]]></value>
+			<value xml:lang="vi"><![CDATA[Trích dẫn]]></value>
+		</item>
+		<item name="insert_blockquote">
+			<value xml:lang="ko"><![CDATA[인용 문구를 입력해 주세요]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the quote.]]></value>
+			<value xml:lang="jp"><![CDATA[引用文を入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入要引用的内容。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入引用]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen alıntıyı girin]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy nhập văn bản trích dẫn.]]></value>
+		</item>
+		<item name="insert_cite">
+			<value xml:lang="ko"><![CDATA[출처를 입력할 수 있습니다 <a>, <strong>, <em> 태그를 쓸 수 있습니다]]></value>
+			<value xml:lang="en"><![CDATA[You can enter the original source, using <a>, <strong>, and <em> tags.]]></value>
+			<value xml:lang="jp"><![CDATA[コピー元を入力します。 <a>、<strong>、<em> タグの入力も可能です。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[在此可以输入引用出处(可用HTML标签：<a>, <strong>, <em>)。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入來源，可輸入 <a>, <strong>, <em> 等標籤。]]></value>
+			<value xml:lang="tr"><![CDATA[Orijinal kaynağı girebilirsiniz. <a>, <strong>, <em> etiketler mevcuttur.]]></value>
+			<value xml:lang="vi"><![CDATA[Bạn có thể sử dụng mã <a>, <strong>, <em> cho Tag.]]></value>
+		</item>
+		<item name="image">
+			<value xml:lang="ko"><![CDATA[이미지]]></value>
+			<value xml:lang="en"><![CDATA[Image]]></value>
+			<value xml:lang="jp"><![CDATA[画像]]></value>
+			<value xml:lang="zh-CN"><![CDATA[图片]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圖片]]></value>
+			<value xml:lang="tr"><![CDATA[Resim]]></value>
+			<value xml:lang="vi"><![CDATA[Hình ảnh]]></value>
+		</item>
+		<item name="find_image">
+			<value xml:lang="ko"><![CDATA[이미지 찾아보기]]></value>
+			<value xml:lang="en"><![CDATA[Find Image]]></value>
+			<value xml:lang="jp"><![CDATA[画像選択]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上传图片]]></value>
+			<value xml:lang="zh-TW"><![CDATA[選擇圖片]]></value>
+			<value xml:lang="tr"><![CDATA[Resim bul]]></value>
+			<value xml:lang="vi"><![CDATA[Tìm hình ảnh]]></value>
+		</item>
+		<item name="uploading">
+			<value xml:lang="ko"><![CDATA[업로드 중입니다]]></value>
+			<value xml:lang="en"><![CDATA[Uploading...]]></value>
+			<value xml:lang="jp"><![CDATA[アップロードしています。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[正在上传图片…]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上傳中...]]></value>
+			<value xml:lang="tr"><![CDATA[Yükleniyor...]]></value>
+			<value xml:lang="vi"><![CDATA[Đang Upload ...]]></value>
+		</item>
+		<item name="uploading_info">
+			<value xml:lang="ko"><![CDATA[%s MB까지 업로드할 수 있습니다]]></value>
+			<value xml:lang="en"><![CDATA[You can upload maximum %s MB.]]></value>
+			<value xml:lang="jp"><![CDATA[%sMBまでアップロードできます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上传限制：%s MB]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最大可上傳 %sMB]]></value>
+			<value xml:lang="tr"><![CDATA[En fazla %sMB yükleyebilirsiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Dung lượng tối đa %s MB]]></value>
+		</item>
+		<item name="uploaded_image">
+			<value xml:lang="ko"><![CDATA[사용자 업로드 이미지]]></value>
+			<value xml:lang="en"><![CDATA[User Uploaded Image]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザーアップロード画像]]></value>
+			<value xml:lang="zh-CN"><![CDATA[用户上传的图片]]></value>
+			<value xml:lang="zh-TW"><![CDATA[已上傳的圖片]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı Tarafından Yüklenmiş Resim]]></value>
+			<value xml:lang="vi"><![CDATA[Người Upload]]></value>
+		</item>
+		<item name="image_width">
+			<value xml:lang="ko"><![CDATA[이미지 너비]]></value>
+			<value xml:lang="en"><![CDATA[Image Width]]></value>
+			<value xml:lang="jp"><![CDATA[画像幅]]></value>
+			<value xml:lang="zh-CN"><![CDATA[图片宽度]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圖片寬度]]></value>
+			<value xml:lang="tr"><![CDATA[Resim Boyutu]]></value>
+			<value xml:lang="vi"><![CDATA[Độ rộng]]></value>
+		</item>
+		<item name="resize">
+			<value xml:lang="ko"><![CDATA[줄이기]]></value>
+			<value xml:lang="en"><![CDATA[Resize]]></value>
+			<value xml:lang="jp"><![CDATA[縮小する]]></value>
+			<value xml:lang="zh-CN"><![CDATA[缩小]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圖片縮放]]></value>
+			<value xml:lang="tr"><![CDATA[Yeniden Boyutlandır]]></value>
+			<value xml:lang="vi"><![CDATA[Giảm kích thước]]></value>
+		</item>
+		<item name="resize_info">
+			<value xml:lang="ko"><![CDATA[지정한 크기의 사본을 만들며 원본은 유지됩니다]]></value>
+			<value xml:lang="en"><![CDATA[A copy of the specified size is created, and the original file still remains.]]></value>
+			<value xml:lang="jp"><![CDATA[指定したサイズのコピーを生成します。オリジナル画像は維持されます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[创建指定大小的复件并保留原图。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[輸入要建立的圖片大小，原始圖片將會保留。]]></value>
+			<value xml:lang="tr"><![CDATA[Resmin, girilen boyutlarda yeni bir kopyası oluşturulacak. Orijinal resim ise saklanmaya devam edilecek.]]></value>
+			<value xml:lang="vi"><![CDATA[Có thể giảm kích thước cho phù hợp với giao diện.]]></value>
+		</item>
+		<item name="resize_error">
+			<value xml:lang="ko"><![CDATA[원본 이미지보다 작은 크기의 값을 입력하세요]]></value>
+			<value xml:lang="en"><![CDATA[Please enter a value smaller than the original image size.]]></value>
+			<value xml:lang="jp"><![CDATA[オリジナル画像より小さいサイズを入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入比原图宽度小的值。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入比原始圖片要小的數值]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen orijinal resim boyutundan daha küçük bir boyut girin]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy nhập kích thước nhỏ hơn kích thước ban đầu.]]></value>
+		</item>
+		<item name="insert_image_explain">
+			<value xml:lang="ko"><![CDATA[이미지의 설명을 입력할 수 있습니다. <a>, <strong>, <em> 태그를 쓸 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the description of image, using <a>, <strong>, and <em> tags.]]></value>
+			<value xml:lang="jp"><![CDATA[画像の説明を入力します。 <a>, <strong>, <em> タグの入力も可能です。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[在此可以输入简单图片说明(可用HTML标签：<a>, <strong>, <em>)。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入圖片簡介。可使用 <a>, <strong>, <em> 等標籤。]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen tanım girin. <a>, <strong>, <em> etiketler mevcuttur.]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy nhập mô tả cho hình ảnh. Bạn có thể sử dụng <a>, <strong>, <em> cho mô tả này.]]></value>
+		</item>
+		<item name="mov">
+			<value xml:lang="ko"><![CDATA[동영상]]></value>
+			<value xml:lang="en"><![CDATA[Video]]></value>
+			<value xml:lang="jp"><![CDATA[動画]]></value>
+			<value xml:lang="zh-CN"><![CDATA[视频]]></value>
+			<value xml:lang="zh-TW"><![CDATA[影片]]></value>
+			<value xml:lang="tr"><![CDATA[Film]]></value>
+			<value xml:lang="vi"><![CDATA[Video]]></value>
+		</item>
+		<item name="insert_mov">
+			<value xml:lang="ko"><![CDATA[<object> 또는 <embed>로 시작하는 멀티미디어 삽입 코드를 넣어주세요]]></value>
+			<value xml:lang="en"><![CDATA[Enter the multimedia insertion code which starts with <object> or <embed>.]]></value>
+			<value xml:lang="jp"><![CDATA[<object> または <embed>で始まるマルチメディアのコードを挿入してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入<object>或<embed>标签开头的视频代码。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入 <object> 或 <embed> 開頭的影片原始碼。]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen <object> veya <embed> ile başlayan multimedya ekleme kodlarını girin.]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy nhập mã <object> và <embed> cho Media muốn thêm vào bài viết của bạn.]]></value>
+		</item>
+		<item name="insert_mov_explain">
+			<value xml:lang="ko"><![CDATA[동영상의 설명을 입력할 수 있습니다. <a>, <strong>, <em> 태그를 쓸 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the description of video, using <a>, <strong>, and <em> tags.]]></value>
+			<value xml:lang="jp"><![CDATA[動画の説明を入力します。 <a>, <strong>, <em> タグの入力も可能です。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[在此可以输入简单视频描述(可用HTML标签：<a>, <strong>, <em>)。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入影片簡介。可使用 <a>, <strong>, <em> 等標籤。]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen tanım girin. <a>, <strong>, <em> etiketler mecvuttur.]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy nhập mô tả cho Media. Bạn có thể sử dụng <a>, <strong>, <em> cho mô tả này.]]></value>
+		</item>
+		<item name="file">
+			<value xml:lang="ko"><![CDATA[파일]]></value>
+			<value xml:lang="en"><![CDATA[File]]></value>
+			<value xml:lang="jp"><![CDATA[ファイル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[附件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檔案]]></value>
+			<value xml:lang="tr"><![CDATA[Dosya]]></value>
+			<value xml:lang="vi"><![CDATA[Đính kèm]]></value>
+		</item>
+		<item name="file_select">
+			<value xml:lang="ko"><![CDATA[업로드할 파일을 선택해 주세요]]></value>
+			<value xml:lang="en"><![CDATA[Please select a file to upload.]]></value>
+			<value xml:lang="jp"><![CDATA[アップロードするファイルを選択してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[选择上传附件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請選擇要上傳的檔案]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen yüklemek için bir dosya seçin.]]></value>
+			<value xml:lang="vi"><![CDATA[Chọn File muốn Upload]]></value>
+		</item>
+		<item name="file_uploadinfo">
+			<value xml:lang="ko"><![CDATA[개당 %sMB, 모두 합쳐 %sMB까지 업로드가 가능합니다]]></value>
+			<value xml:lang="en"><![CDATA[You can upload files of up to %s MB, up to a total of %s MB.]]></value>
+			<value xml:lang="jp"><![CDATA[１個当り %sMB、全体で%sMBまでアップロードできます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[每个附件限制大小：%sMB, 每次上传限制：%sMB]]></value>
+			<value xml:lang="zh-TW"><![CDATA[每個檔案上傳的大小 %s MB，總共 %s MB]]></value>
+			<value xml:lang="tr"><![CDATA[Toplamda %sMB olmak üzere her biri için en fazla %sMB yükleyebilirsiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Dung lượng tối đa %sMB/File, Tổng dung lượng được phép Upload %sMB.]]></value>
+		</item>
+		<item name="file_total">
+			<value xml:lang="ko"><![CDATA[총 <strong class="filecount">{total_filecount}</strong>개]]></value>
+			<value xml:lang="en"><![CDATA[Total <strong class="filecount">{total_filecount}</strong>file(s)]]></value>
+			<value xml:lang="jp"><![CDATA[トータル<strong class="filecount">{total_filecount}</strong>個]]></value>
+			<value xml:lang="zh-CN"><![CDATA[总计<strong class="filecount">{total_filecount}</strong>个]]></value>
+			<value xml:lang="zh-TW"><![CDATA[總共 <strong class="filecount">{total_filecount}</strong>個檔案]]></value>
+			<value xml:lang="vi"><![CDATA[Tổng số <strong class="filecount">{total_filecount}</strong> File]]></value>
+		</item>
+		<item name="insert_file_explain">
+			<value xml:lang="ko"><![CDATA[파일의 설명을 입력할 수 있습니다]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the description of file.]]></value>
+			<value xml:lang="jp"><![CDATA[ファイルの説明を入力します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[在此可输入文件说明。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入檔案簡介。]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen tanım girin]]></value>
+			<value xml:lang="vi"><![CDATA[Nhập mô tả cho File.]]></value>
+		</item>
+		<item name="hr">
+			<value xml:lang="ko"><![CDATA[분리선]]></value>
+			<value xml:lang="en"><![CDATA[HR]]></value>
+			<value xml:lang="jp"><![CDATA[区分線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[分割线]]></value>
+			<value xml:lang="vi"><![CDATA[Tách đoạn]]></value>
+		</item>
+		<item name="hr_simple">
+			<value xml:lang="ko"><![CDATA[단순 가로선]]></value>
+			<value xml:lang="en"><![CDATA[Simple HR]]></value>
+			<value xml:lang="jp"><![CDATA[基本水平線]]></value>
+			<value xml:lang="zh-CN"><![CDATA[简单分割线]]></value>
+			<value xml:lang="tr"><![CDATA[Basit HR]]></value>
+			<value xml:lang="vi"><![CDATA[Đường kẻ đơn giản]]></value>
+		</item>
+		<item name="title_title">
+			<value xml:lang="ko"><![CDATA[소제목]]></value>
+			<value xml:lang="en"><![CDATA[Strapline]]></value>
+			<value xml:lang="jp"><![CDATA[サブタイトル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[内标题]]></value>
+			<value xml:lang="tr"><![CDATA[Konu]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		</item>
+		<item name="title">
+			<value xml:lang="ko"><![CDATA[제목]]></value>
+			<value xml:lang="en"><![CDATA[Subject]]></value>
+			<value xml:lang="jp"><![CDATA[タイトル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+			<value xml:lang="tr"><![CDATA[Konu]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		</item>
+		<item name="title1">
+			<value xml:lang="ko"><![CDATA[큰제목]]></value>
+			<value xml:lang="en"><![CDATA[Heading 1]]></value>
+			<value xml:lang="jp"><![CDATA[サブタイトル（大）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[大标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[大]]></value>
+			<value xml:lang="tr"><![CDATA[Büyük]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề lớn]]></value>
+		</item>
+		<item name="title2">
+			<value xml:lang="ko"><![CDATA[중간제목]]></value>
+			<value xml:lang="en"><![CDATA[Heading 2]]></value>
+			<value xml:lang="jp"><![CDATA[サブタイトル（中）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[中标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[中]]></value>
+			<value xml:lang="tr"><![CDATA[Orta]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề trung bình]]></value>
+		</item>
+		<item name="title3">
+			<value xml:lang="ko"><![CDATA[작은제목]]></value>
+			<value xml:lang="en"><![CDATA[Heading 3]]></value>
+			<value xml:lang="jp"><![CDATA[サブタイトル（小）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[小标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[小]]></value>
+			<value xml:lang="tr"><![CDATA[Küçük]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề nhỏ]]></value>
+		</item>
+		<item name="list">
+			<value xml:lang="ko"><![CDATA[목록]]></value>
+			<value xml:lang="en"><![CDATA[List]]></value>
+			<value xml:lang="jp"><![CDATA[リスト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[列表]]></value>
+			<value xml:lang="zh-TW"><![CDATA[列表]]></value>
+			<value xml:lang="tr"><![CDATA[Liste]]></value>
+			<value xml:lang="vi"><![CDATA[Danh sách]]></value>
+		</item>
+		<item name="list_explain">
+			<value xml:lang="ko"><![CDATA[CTRL+방향키를 누르면 항목의 위치나 단계를 변경할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[You can change the position or level of items by pressing CTRL+Arrow Keys.]]></value>
+			<value xml:lang="jp"><![CDATA[「CTRL+矢印」を押して、項目の位置や段階を変えることができます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[可利用CTRL+方向键改变项目循序及嵌套级别。]]></value>
+			<value xml:lang="tr"><![CDATA[CTRL+Arrow tuşlarına basarak öğelerin konumunu ve seviyelerini değiştirebilirsiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Nhấn tổ hợp phím Ctrl+Phím mũi tên, bạn có thể thay đổi vị trí của các mục.]]></value>
+		</item>
+		<item name="toc">
+			<value xml:lang="ko"><![CDATA[목차]]></value>
+			<value xml:lang="en"><![CDATA[Index]]></value>
+			<value xml:lang="jp"><![CDATA[目次]]></value>
+			<value xml:lang="zh-CN"><![CDATA[目录]]></value>
+			<value xml:lang="ru"><![CDATA[Оглавление]]></value>
+			<value xml:lang="tr"><![CDATA[İndeks]]></value>
+			<value xml:lang="vi"><![CDATA[Nội dung]]></value>
+		</item>
+		<item name="toc_explain">
+			<value xml:lang="ko"><![CDATA[문서 내의 소제목들을 모아 목차로 만들어주며, 자동으로 갱신됩니다.]]></value>
+			<value xml:lang="en"><![CDATA[It makes an index with created straplines, and will be renewed automatically.]]></value>
+			<value xml:lang="jp"><![CDATA[文書内のサブタイトルをまとめて、目次を生成し、自動的に更新します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[可以把日志文本内的小标题制成目录，并且每当添加一个内标题此目录就会自动更新。]]></value>
+			<value xml:lang="tr"><![CDATA[Oluşturulmuş bölüm başlıklarıyla bir indeks oluşturulur ve otomatik olarak yenilenir.]]></value>
+			<value xml:lang="vi"><![CDATA[Nếu tạo một nhóm các nội dung, tiêu đề của từng đoạn sẽ tự động được tạo.]]></value>
+		</item>
+		<item name="more">
+			<value xml:lang="ko"><![CDATA[더보기]]></value>
+			<value xml:lang="en"><![CDATA[More]]></value>
+			<value xml:lang="jp"><![CDATA[もっと見る]]></value>
+			<value xml:lang="zh-CN"><![CDATA[更多]]></value>
+			<value xml:lang="zh-TW"><![CDATA[更多]]></value>
+			<value xml:lang="tr"><![CDATA[Daha Fazla]]></value>
+			<value xml:lang="vi"><![CDATA[Xem thêm]]></value>
+		</item>
+		<item name="move_button">
+			<value xml:lang="ko"><![CDATA[버튼이동]]></value>
+			<value xml:lang="en"><![CDATA[Move Button]]></value>
+			<value xml:lang="jp"><![CDATA[ボタン移動]]></value>
+			<value xml:lang="zh-CN"><![CDATA[移动组件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[移動]]></value>
+			<value xml:lang="tr"><![CDATA[Taşı Düğmesi]]></value>
+			<value xml:lang="vi"><![CDATA[Chuyển nút bấm]]></value>
+		</item>
+		<item name="material">
+			<value xml:lang="ko"><![CDATA[글감]]></value>
+			<value xml:lang="en"><![CDATA[Ingredients]]></value>
+			<value xml:lang="jp"><![CDATA[素材]]></value>
+			<value xml:lang="zh-TW"><![CDATA[素材]]></value>
+			<value xml:lang="tr"><![CDATA[Bileşenler]]></value>
+			<value xml:lang="vi"><![CDATA[Thành phần]]></value>
+		</item>
+		<item name="insert">
+			<value xml:lang="ko"><![CDATA[이 글감을 본문에 넣기]]></value>
+			<value xml:lang="en"><![CDATA[Insert the ingredient to content]]></value>
+			<value xml:lang="jp"><![CDATA[この素材を本文に挿入する]]></value>
+			<value xml:lang="zh-TW"><![CDATA[插入素材到內容中]]></value>
+			<value xml:lang="tr"><![CDATA[Bileşenleri içeriğe ekleyin.]]></value>
+			<value xml:lang="vi"><![CDATA[Chèn thành phần vào bài viết.]]></value>
+		</item>
+		<item name="close_materials">
+			<value xml:lang="ko"><![CDATA[글감 보관함 닫기]]></value>
+			<value xml:lang="en"><![CDATA[Close]]></value>
+			<value xml:lang="jp"><![CDATA[素材保存箱を閉じる]]></value>
+			<value xml:lang="zh-TW"><![CDATA[關閉]]></value>
+			<value xml:lang="tr"><![CDATA[Kapat]]></value>
+			<value xml:lang="vi"><![CDATA[Đóng]]></value>
+		</item>
+		<item name="no_materials">
+			<value xml:lang="ko"><![CDATA[보관된 글감이 없습니다.]]></value>
+			<value xml:lang="en"><![CDATA[There are no writting ingredients.]]></value>
+			<value xml:lang="jp"><![CDATA[保存されている素材はありません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[暂无保存的素材。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[There is no writting ingredient.]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı bileşeni bulunmamaktadır.]]></value>
+			<value xml:lang="vi"><![CDATA[Không có bài viết được lưu trữ.]]></value>
+		</item>
+		<item name="msg_no_selected_object">
+			<value xml:lang="ko"><![CDATA[선택된 개체가 없습니다.]]></value>
+			<value xml:lang="en"><![CDATA[There are no selected objects.]]></value>
+			<value xml:lang="jp"><![CDATA[選択されたオブジェクトがありません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请选择对象。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[There is no selected object.]]></value>
+			<value xml:lang="tr"><![CDATA[Seçili öğe bulunmamaktadır.]]></value>
+			<value xml:lang="vi"><![CDATA[Không có mục nào được chọn.]]></value>
+		</item>
+		<item name="msg_insert_value">
+			<value xml:lang="ko"><![CDATA[값을 입력해 주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please enter the value.]]></value>
+			<value xml:lang="jp"><![CDATA[値を入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入相应的值。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入數值]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen değeri girin.]]></value>
+			<value xml:lang="vi"><![CDATA[Xin hãy nhập giá trị.]]></value>
+		</item>
+		<item name="help_first_title">
+			<value xml:lang="ko"><![CDATA[도움말]]></value>
+			<value xml:lang="en"><![CDATA[Help]]></value>
+			<value xml:lang="jp"><![CDATA[ヘルプ]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用說明]]></value>
+			<value xml:lang="vi"><![CDATA[HƯỚNG DẪN]]></value>
+		</item>
+		<item name="help_shortcut">
+			<value xml:lang="ko"><![CDATA[단축키]]></value>
+			<value xml:lang="en"><![CDATA[Shortcuts]]></value>
+			<value xml:lang="jp"><![CDATA[ショートカットキー]]></value>
+			<value xml:lang="zh-TW"><![CDATA[快速鍵]]></value>
+			<value xml:lang="vi"><![CDATA[Phím tắt]]></value>
+		</item>
+		<item name="help_bug_report">
+			<value xml:lang="ko"><![CDATA[글쓰기 오류신고]]></value>
+			<value xml:lang="en"><![CDATA[Article writing error report]]></value>
+			<value xml:lang="jp"><![CDATA[書き込みエラー報告]]></value>
+			<value xml:lang="zh-TW"><![CDATA[錯誤回報]]></value>
+			<value xml:lang="vi"><![CDATA[[BÁO LỖI]]]></value>
+		</item>
+		<item name="help_first_dt_1">
+			<value xml:lang="ko"><![CDATA[새 단락 쓰기(1~9, 0, `)]]></value>
+			<value xml:lang="en"><![CDATA[Write a new paragraph (1~9, 0, `)]]></value>
+			<value xml:lang="jp"><![CDATA[新しい段落を書く(1~9, 0, `)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[快速鍵(1~9, 0, `)]]></value>
+			<value xml:lang="vi"><![CDATA[* Tạo văn bản mới (1~9, 0, `)]]></value>
+		</item>
+		<item name="help_first_dd_1">
+			<value xml:lang="ko"><![CDATA[도구모음 버튼을 클릭함으로써 새 단락 쓰기를 시작할 수 있습니다. 도구모음 버튼에는 배치된 순서대로 왼쪽으로부터 1~9까지 단축키가 할당되어 있습니다. 숫자키 '0' 또는 ESC키 바로 아래 위치한 [`] 그레이브(grave) 키를 누르시면 숨겨진 도구모음 버튼을 보거나 토글(toggle)할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[To start writing a new paragraph click on the toolbar. The buttons on the toolbar have keyboard shortcuts starting from 1 to 9, 1 representing the first left button. To toggle the toolbar, press the numeric '0' or the grave key (`) under the Esc key.]]></value>
+			<value xml:lang="jp"><![CDATA[ツールバーボタンをクリックすることで、新しい段落を書くことができます。ツールバーボタンには、配置順にに、左から1~9までショートカットキーが割り当てられています。数字キー '0' または、Escキーの下の[`] グレーブキーを押下すると、隠れているツールバーを表示したり、トグルすることができます。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[藉由點選工具列的按鈕可以編寫新的內容。 工具列的快速鍵是鍵盤的 1~9 數字鍵。 數字鍵 '0' 或是 ESC 鍵底下的 [`] 波浪鍵(grave) 可隱藏、顯示及切換(toggle)工具列。]]></value>
+			<value xml:lang="vi"><![CDATA[Bằng cách nhấn vào một nút trên thanh công cụ tương ứng với các số trên bàn phím bạn có thể bắt đầu viết một đoạn văn mới. Các phím tắt của thanh công cụ được đặt theo thứ tự [1 ~ 9] từ trái qua phải. Phím số [0] và phím [`] sẽ mở thêm và đóng lại những phím chức năng khác ẩn trong thanh công cụ, phím [ESC] sẽ đóng lại phiên làm việc hiện tại.]]></value>
+		</item>
+		<item name="help_first_dt_2">
+			<value xml:lang="ko"><![CDATA[단락 선택(Click, Ctrl+Click, Shift+Click)]]></value>
+			<value xml:lang="en"><![CDATA[Select a paragraph (Click, Ctrl+Click, Shift+Click)]]></value>
+			<value xml:lang="jp"><![CDATA[段落選択(Click, Ctrl+Click, Shift+Click)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[段落選擇(Click, Ctrl+Click, Shift+Click)]]></value>
+			<value xml:lang="vi"><![CDATA[* Lựa chọn đoạn văn bản (Chuột trái, Ctrl+Chuột trái, Shift+Chuột trái)]]></value>
+		</item>
+		<item name="help_first_dd_2">
+			<value xml:lang="ko"><![CDATA[클릭 또는 클릭 후 방향키(&uarr;&darr;)를 조작함으로써 원하는 단락을 선택할 수 있습니다. 단일선택(Click)과 다중선택(Ctrl+Click, Shift+Click)이 가능합니다]]></value>
+			<value xml:lang="en"><![CDATA[You can press Up/Down keys (&uarr;&darr;) holding down the Ctrl key to manipulate the paragraphs. To select a single paragraph, just click on it, to select multiple paragraphs hold down the Ctrl or Shift keys, then click.]]></value>
+			<value xml:lang="jp"><![CDATA[クリック、またはクリック後の方向キー(&uarr;&darr;)を操作することで、段落を選択できます。ひとつだけ選択(Click)と複数選択(Ctrl+Click, Shift+Click)が可能です。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[利用滑鼠選取或方向鍵(&uarr;&darr;)移動的方式選取想要的段落。 可單選(Click)或複選(Ctrl+Click, Shift+Click)段落。]]></value>
+			<value xml:lang="vi"><![CDATA[Bấm hoặc sau khi bấm chuột trái kết hợp với phím mũi tên (&uarr;&darr;) sẽ là chức năng chọn đoạn văn bản. Cho phép chọn một khu vực duy nhất (Chuột trái) và chọn toàn bộ (Ctrl+Chuột trái, Shift+Chuột trái).]]></value>
+		</item>
+		<item name="help_first_dt_3">
+			<value xml:lang="ko"><![CDATA[단락 편집 및 취소(Enter, Double Click, ESC)]]></value>
+			<value xml:lang="en"><![CDATA[Edit a paragraph or Cancel editing (Enter, Double Click, ESC)]]></value>
+			<value xml:lang="jp"><![CDATA[段落編集、および取り消し(Enter, Double Click, ESC)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[段落編輯、取消(Enter, Double Click, ESC)]]></value>
+			<value xml:lang="vi"><![CDATA[* Sửa và loại bỏ (Enter, Hai lần Chuột trái, ESC)]]></value>
+		</item>
+		<item name="help_first_dd_3">
+			<value xml:lang="ko"><![CDATA[단락 선택 후 Enter 또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[To edit a paragraph, select it and press Enter or double click on it. To cancel editing, press Esc button]]></value>
+			<value xml:lang="jp"><![CDATA[段落を選択してから、Enterまたはダブルクリックで編集できます。ESCキーを利用して編集を取り消すことができます。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[按 Enter 鍵或點兩下段落就可進行編輯。按 ESC 鍵可取消編輯動作。]]></value>
+			<value xml:lang="tr"><![CDATA[단락 선택 후 Enter또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.]]></value>
+			<value xml:lang="vi"><![CDATA[Sau khi đã chọn xong đoạn văn bản, nhấn [ENTER] hoặc bấm hai lần chuột trái để sửa văn bản. Nhấn [ESC] để loại bỏ.]]></value>
+		</item>
+		<item name="help_first_dt_4">
+			<value xml:lang="ko"><![CDATA[단락 이동(Ctrl+&uarr;&darr;, Click-Drag-Drop)]]></value>
+			<value xml:lang="en"><![CDATA[Drag (Ctrl+&uarr;&darr;, Click-Drag-Drop)]]></value>
+			<value xml:lang="jp"><![CDATA[段落移動(Ctrl+&uarr;&darr;, Click-Drag-Drop)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[段落移動(Ctrl+&uarr;&darr;, Click-Drag-Drop)]]></value>
+			<value xml:lang="vi"><![CDATA[* Di chuyển (Ctrl+&uarr;&darr;, Chuột trái-Kéo-Thả)]]></value>
+		</item>
+		<item name="help_first_dd_4">
+			<value xml:lang="ko"><![CDATA[단락 선택 후 Ctrl+방향키(&uarr;&darr;)를 조작하거나 '클릭-드래그-드롭'으로 이동할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[To move a paragraph, press Ctrl key and move the paragraph around with up/down arrow keys (&uarr;&darr;) or press Ctrl key and drag the paragraph around with your mouse.]]></value>
+			<value xml:lang="jp"><![CDATA[段落を選択してからCtrl+方向キー(&uarr;&darr;）を操作したり、クリック-ドラッグ-ドロップで移動できます。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[選取段落後按 Ctrl+方向鍵(&uarr;&darr;)可進行操作，或是用滑鼠拖曳的方式進行操作。]]></value>
+			<value xml:lang="vi"><![CDATA[Sau khi chọn xong đoạn văn bản, nhấn Ctrl+Phím mũi tên(&uarr;&darr;) hoặc 'Chuột trái-Kéo-Thả' để di chuyển đoạn văn bản.]]></value>
+		</item>
+		<item name="help_first_dt_5">
+			<value xml:lang="ko"><![CDATA[단락 저장 및 삭제(Ctrl+Enter, Del)]]></value>
+			<value xml:lang="en"><![CDATA[Save or delete a paragraph (Ctrl+Enter, Del)]]></value>
+			<value xml:lang="jp"><![CDATA[段落保存、および削除(Ctrl+Enter, Del)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[段落儲存、刪除(Ctrl+Enter, Del)]]></value>
+			<value xml:lang="vi"><![CDATA[* Lưu và Xóa(Ctrl+Enter, Del)]]></value>
+		</item>
+		<item name="help_first_dd_5">
+			<value xml:lang="ko"><![CDATA['확인'버튼을 누르거나 Ctrl+Enter 명령으로 저장할 수 있습니다. Del키를 이용하여 선택된 단락을 삭제할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[To save a paragraph press the 'Confirm' button or press Ctrl+Enter. Press Del key to delete the paragraph.]]></value>
+			<value xml:lang="jp"><![CDATA[「OK」ボタンを押下したり、 Ctrl+Enter で保存できます。Delキーを利用して選択された段落を削除できます。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[按'確認'按鈕或是 Ctrl+Enter 可儲存內容。按 Del 鍵可刪除所選取的段落。]]></value>
+			<value xml:lang="vi"><![CDATA[Bấm chuột vào biểu tượng lưu [v] trên khung soạn thảo hoặc bấm tổ hợp 'Ctrl+Enter' để lưu văn bản. Bấm 'Loại bỏ' hoặc nhấn [Del] để xóa văn bản.]]></value>
+		</item>
+		<item name="drag_this">
+			<value xml:lang="ko"><![CDATA[단락을 드래그하여 이동하세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please drag the paragraph.]]></value>
+			<value xml:lang="jp"><![CDATA[段落をドラッグして移動してください。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[將段落移到]]></value>
+			<value xml:lang="vi"><![CDATA[Hãy kéo chuột để di chuyển đoạn văn bản.]]></value>
+		</item>
+		<item name="cmd_new_window">
+			<value xml:lang="ko"><![CDATA[새창]]></value>
+			<value xml:lang="en"><![CDATA[New window]]></value>
+			<value xml:lang="jp"><![CDATA[新規ウィンドウ]]></value>
+			<value xml:lang="zh-TW"><![CDATA[開新視窗]]></value>
+			<value xml:lang="vi"><![CDATA[Trang mới]]></value>
+		</item>
+		<item name="cmd_del">
+			<value xml:lang="ko"><![CDATA[삭제]]></value>
+			<value xml:lang="en"><![CDATA[Delete]]></value>
+			<value xml:lang="jp"><![CDATA[削除]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除]]></value>
+			<value xml:lang="vi"><![CDATA[Xóa]]></value>
+		</item>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/tr.lang.php b/modules/editor/skins/dreditor/lang/tr.lang.php
deleted file mode 100644
index d692b81bc..000000000
--- a/modules/editor/skins/dreditor/lang/tr.lang.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/tr.lang.php
-	 * @author nicetwo
-	 * @brief  Dr.Editor
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = 'Seçili paragrafı kaldırmak istiyor musunuz?';
-	$lang->edit->insert_dr_title = 'Lütfen başlık girin';
-	$lang->edit->richtext_area = 'Zengın metin alanı';
-	$lang->edit->insert_site_name = 'Lütfen site adını girin';
-	$lang->edit->insert_explain = 'Lütfen tanım girin';
-
-
-	$lang->edit->text = 'Metin';
-	$lang->edit->link = 'Bağlantı';
-	$lang->edit->blockquote = 'Alıntı';
-	$lang->edit->insert_blockquote = 'Lütfen alıntıyı girin';
-	$lang->edit->insert_cite = 'Orijinal kaynağı girebilirsiniz. <a>, <strong>, <em> etiketler mevcuttur.';
-
-	$lang->edit->image = 'Resim';
-	$lang->edit->find_image = 'Resim bul';
-	$lang->edit->uploading = 'Yükleniyor...';
-	$lang->edit->uploading_info = 'En fazla %sMB yükleyebilirsiniz.';
-	$lang->edit->uploaded_image = 'Kullanıcı Tarafından Yüklenmiş Resim';
-
-	$lang->edit->image_width = 'Resim Boyutu';
-	$lang->edit->resize = 'Yeniden Boyutlandır';
-	$lang->edit->resize_info = 'Resmin, girilen boyutlarda yeni bir kopyası oluşturulacak. Orijinal resim ise saklanmaya devam edilecek.';
-	$lang->edit->resize_error = 'Lütfen orijinal resim boyutundan daha küçük bir boyut girin';
-	$lang->edit->insert_image_explain = 'Lütfen tanım girin. <a>, <strong>, <em> etiketler mevcuttur.';
-
-	$lang->edit->mov ='Film';
-	$lang->edit->insert_mov = 'Lütfen <object> veya <embed> ile başlayan multimedya ekleme kodlarını girin.';
-	$lang->edit->insert_mov_explain = 'Lütfen tanım girin. <a>, <strong>, <em> etiketler mecvuttur.';
-
-	$lang->edit->file = 'Dosya';
-	$lang->edit->file_select = 'Lütfen yüklemek için bir dosya seçin.';
-	$lang->edit->file_uploadinfo = 'Toplamda %sMB olmak üzere her biri için en fazla %sMB yükleyebilirsiniz.';
-	$lang->edit->file_total ='Total <strong class="filecount">{total_filecount}</strong>file(s)';
-	$lang->edit->insert_file_explain ='Lütfen tanım girin';
-
-	$lang->edit->hr = 'HR';
-	$lang->edit->hr_simple= 'Basit HR';
-
-	$lang->edit->title_title = 'Konu';
-	$lang->edit->title='Konu';
-	$lang->edit->title1='Büyük';
-	$lang->edit->title2='Orta';
-	$lang->edit->title3='Küçük';
-
-	$lang->edit->list = 'Liste';
-	$lang->edit->list_explain = 'CTRL+Arrow tuşlarına basarak öğelerin konumunu ve seviyelerini değiştirebilirsiniz.';
-	$lang->edit->toc = 'İndeks';
-	$lang->edit->toc_explain ='Oluşturulmuş bölüm başlıklarıyla bir indeks oluşturulur ve otomatik olarak yenilenir.';
-
-	$lang->edit->more = 'Daha Fazla';
-	$lang->edit->move_button = 'Taşı Düğmesi';
-
-	$lang->edit->material = 'Bileşenler';
-	$lang->edit->insert = 'Bileşenleri içeriğe ekleyin.';
-	$lang->edit->close_materials = 'Kapat';
-    $lang->edit->no_materials = 'Yazı bileşeni bulunmamaktadır.';
-    $lang->edit->msg_no_selected_object = 'Seçili öğe bulunmamaktadır.';
-    $lang->edit->msg_insert_value = 'Lütfen değeri girin.';
-
-	$lang->edit->help_first_title = '도움말';
-	$lang->edit->help_shortcut = '단축키';
-	$lang->edit->help_bug_report = '글쓰기 오류신고';
-	$lang->edit->help_first_dt_1 = '새 단락 쓰기(1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = '도구모음 버튼을 클릭함으로써 새 단락 쓰기를 시작할 수 있습니다. 도구모음 버튼에는 배치된 순서대로 왼쪽으로부터 1~9까지 단축키가 할당되어 있습니다. 숫자키 \'0\' 또는 ESC키 바로 아래 위치한 [`] 그레이브(grave) 키를 누르시면 숨겨진 도구모음 버튼을 보거나 토글(toggle)할 수 있습니다.';
-	$lang->edit->help_first_dt_2 = '단락 선택(Click, Ctrl+Click, Shift+Click)';
-	$lang->edit->help_first_dd_2 = '클릭 또는 클릭 후 방향키(&uarr;&darr;)를 조작함으로써 원하는 단락을 선택할 수 있습니다. 단일선택(Click)과 다중선택(Ctrl+Click, Shift+Click)이 가능합니다';
-	$lang->edit->help_first_dt_3 = '단락 편집 및 취소(Enter, Double Click, ESC)';
-	$lang->edit->help_first_dd_3 = '단락 선택 후 Enter또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.';
-	$lang->edit->help_first_dt_4 = '단락 이동(Ctrl+&uarr;&darr;, Click-Drag-Drop)';
-	$lang->edit->help_first_dd_4 = '단락 선택 후 Ctrl+방향키(&uarr;&darr;)를 조작하거나 \'클릭-드래그-드롭\'으로 이동할 수 있습니다.';
-	$lang->edit->help_first_dt_5 = '단락 저장 및 삭제(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = '\'확인\'버튼을 누르거나 Ctrl+Enter 명령으로 저장할 수 있습니다. Del키를 이용하여 선택된 단락을 삭제할 수 있습니다.';
-
-	$lang->edit->drag_this = '단락을 드래그하여 이동하세요.';
-	$lang->edit->cmd_new_window = '새창';
-	$lang->edit->cmd_del = '삭제';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/vi.lang.php b/modules/editor/skins/dreditor/lang/vi.lang.php
deleted file mode 100644
index b3785aa1e..000000000
--- a/modules/editor/skins/dreditor/lang/vi.lang.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/vi.lang.php
-	 * @author sol <sol@ngleader.com>
-	 * @brief  단락에디터 언어팩
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = 'Bạn có muốn xóa đoạn văn bản đã chọn?';
-	$lang->edit->insert_dr_title = 'Xin hãy nhập tiêu đề.';
-	$lang->edit->richtext_area = 'Định dạng khu vực viết văn bản';
-	$lang->edit->insert_site_name = 'Tên trang Web.';
-	$lang->edit->insert_explain = 'Mô tả cho trang Web.';
-
-
-	$lang->edit->text='Văn bản';
-	$lang->edit->link = 'Liên kết';
-	$lang->edit->blockquote = 'Trích dẫn';
-	$lang->edit->insert_blockquote = 'Hãy nhập văn bản trích dẫn.';
-	$lang->edit->insert_cite = 'Bạn có thể sử dụng mã <a>, <strong>, <em> cho Tag.';
-
-	$lang->edit->image = 'Hình ảnh';
-	$lang->edit->find_image = 'Tìm hình ảnh';
-	$lang->edit->uploading = 'Đang Upload ...';
-	$lang->edit->uploading_info = 'Dung lượng tối đa %s MB';
-	$lang->edit->uploaded_image = 'Người Upload';
-
-	$lang->edit->image_width = 'Độ rộng';
-	$lang->edit->resize = 'Giảm kích thước';
-	$lang->edit->resize_info = 'Có thể giảm kích thước cho phù hợp với giao diện.';
-	$lang->edit->resize_error = 'Hãy nhập kích thước nhỏ hơn kích thước ban đầu.';
-	$lang->edit->insert_image_explain = 'Hãy nhập mô tả cho hình ảnh. Bạn có thể sử dụng <a>, <strong>, <em> cho mô tả này.';
-
-	$lang->edit->mov ='Video';
-	$lang->edit->insert_mov = 'Hãy nhập mã <object> và <embed> cho Media muốn thêm vào bài viết của bạn.';
-	$lang->edit->insert_mov_explain = 'Hãy nhập mô tả cho Media. Bạn có thể sử dụng <a>, <strong>, <em> cho mô tả này.';
-
-	$lang->edit->file='Đính kèm';
-	$lang->edit->file_select = 'Chọn File muốn Upload';
-	$lang->edit->file_uploadinfo = 'Dung lượng tối đa %sMB/File, Tổng dung lượng được phép Upload %sMB.';
-	$lang->edit->file_total ='Tổng số <strong class="filecount">{total_filecount}</strong> File';
-	$lang->edit->insert_file_explain ='Nhập mô tả cho File.';
-
-	$lang->edit->hr = 'Tách đoạn';
-	$lang->edit->hr_simple= 'Đường kẻ đơn giản';
-
-	$lang->edit->title_title='Tiêu đề';
-	$lang->edit->title='Tiêu đề';
-	$lang->edit->title1='Tiêu đề lớn';
-	$lang->edit->title2='Tiêu đề trung bình';
-	$lang->edit->title3='Tiêu đề nhỏ';
-
-	$lang->edit->list = 'Danh sách';
-	$lang->edit->list_explain = 'Nhấn tổ hợp phím Ctrl+Phím mũi tên, bạn có thể thay đổi vị trí của các mục.';
-	$lang->edit->toc = 'Nội dung';
-	$lang->edit->toc_explain ='Nếu tạo một nhóm các nội dung, tiêu đề của từng đoạn sẽ tự động được tạo.';
-
-	$lang->edit->material = 'Thành phần';
-	$lang->edit->insert = 'Chèn thành phần vào bài viết.';
-	$lang->edit->close_materials = 'Đóng';
-	$lang->edit->more = 'Xem thêm';
-	$lang->edit->move_button = 'Chuyển nút bấm';
-
-    $lang->edit->no_materials = 'Không có bài viết được lưu trữ.';
-    $lang->edit->msg_no_selected_object = 'Không có mục nào được chọn.';
-    $lang->edit->msg_insert_value = 'Xin hãy nhập giá trị.';
-	
-	$lang->edit->help_first_title = 'HƯỚNG DẪN';
-	$lang->edit->help_shortcut = 'Phím tắt';
-	$lang->edit->help_bug_report = '[BÁO LỖI]';
-	$lang->edit->help_first_dt_1 = '* Tạo văn bản mới (1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = 'Bằng cách nhấn vào một nút trên thanh công cụ tương ứng với các số trên bàn phím bạn có thể bắt đầu viết một đoạn văn mới. Các phím tắt của thanh công cụ được đặt theo thứ tự [1 ~ 9] từ trái qua phải. Phím số [0] và phím [`] sẽ mở thêm và đóng lại những phím chức năng khác ẩn trong thanh công cụ, phím [ESC] sẽ đóng lại phiên làm việc hiện tại.';
-	$lang->edit->help_first_dt_2 = '* Lựa chọn đoạn văn bản (Chuột trái, Ctrl+Chuột trái, Shift+Chuột trái)';
-	$lang->edit->help_first_dd_2 = 'Bấm hoặc sau khi bấm chuột trái kết hợp với phím mũi tên (&uarr;&darr;) sẽ là chức năng chọn đoạn văn bản. Cho phép chọn một khu vực duy nhất (Chuột trái) và chọn toàn bộ (Ctrl+Chuột trái, Shift+Chuột trái).';
-	$lang->edit->help_first_dt_3 = '* Sửa và loại bỏ (Enter, Hai lần Chuột trái, ESC)';
-	$lang->edit->help_first_dd_3 = 'Sau khi đã chọn xong đoạn văn bản, nhấn [ENTER] hoặc bấm hai lần chuột trái để sửa văn bản. Nhấn [ESC] để loại bỏ.';
-	$lang->edit->help_first_dt_4 = '* Di chuyển (Ctrl+&uarr;&darr;, Chuột trái-Kéo-Thả)';
-	$lang->edit->help_first_dd_4 = 'Sau khi chọn xong đoạn văn bản, nhấn Ctrl+Phím mũi tên(&uarr;&darr;) hoặc \'Chuột trái-Kéo-Thả\' để di chuyển đoạn văn bản.';
-	$lang->edit->help_first_dt_5 = '* Lưu và Xóa(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = 'Bấm chuột vào biểu tượng lưu [v] trên khung soạn thảo hoặc bấm tổ hợp \'Ctrl+Enter\' để lưu văn bản. Bấm \'Loại bỏ\' hoặc nhấn [Del] để xóa văn bản.';
-
-	$lang->edit->drag_this = 'Hãy kéo chuột để di chuyển đoạn văn bản.';
-	$lang->edit->cmd_new_window = 'Trang mới';
-	$lang->edit->cmd_del = 'Xóa';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/zh-CN.lang.php b/modules/editor/skins/dreditor/lang/zh-CN.lang.php
deleted file mode 100644
index 274186f2b..000000000
--- a/modules/editor/skins/dreditor/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/zh-CN.lang.php
-	 * @author sol <sol@ngleader.com>    翻译：guny(space.china@gmail.com)
-	 * @brief  段落编辑器简体中文语言包
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = '确定要删除所选锻炼吗？';
-	$lang->edit->insert_dr_title = '请输入段落标题。';
-	$lang->edit->richtext_area = '富编辑器编辑区';
-	$lang->edit->insert_site_name = '在此可以输入网站名称。';
-	$lang->edit->insert_explain = '在此可以输入简单说明。';
-
-
-	$lang->edit->text='文本';
-	$lang->edit->link = '链接';
-	$lang->edit->blockquote = '引用';
-	$lang->edit->insert_blockquote = '请输入要引用的内容。';
-	$lang->edit->insert_cite = '在此可以输入引用出处(可用HTML标签：<a>, <strong>, <em>)。';
-
-	$lang->edit->image = '图片';
-	$lang->edit->find_image = '上传图片';
-	$lang->edit->uploading = '正在上传图片…';
-	$lang->edit->uploading_info = '上传限制：%s MB';
-	$lang->edit->uploaded_image = '用户上传的图片';
-
-	$lang->edit->image_width = '图片宽度';
-	$lang->edit->resize = '缩小';
-	$lang->edit->resize_info = '创建指定大小的复件并保留原图。';
-	$lang->edit->resize_error = '请输入比原图宽度小的值。';
-	$lang->edit->insert_image_explain = '在此可以输入简单图片说明(可用HTML标签：<a>, <strong>, <em>)。';
-
-	$lang->edit->mov ='视频';
-	$lang->edit->insert_mov = '请输入<object>或<embed>标签开头的视频代码。';
-	$lang->edit->insert_mov_explain = '在此可以输入简单视频描述(可用HTML标签：<a>, <strong>, <em>)。';
-
-	$lang->edit->file='附件';
-	$lang->edit->file_select = '选择上传附件';
-	$lang->edit->file_uploadinfo = '每个附件限制大小：%sMB, 每次上传限制：%sMB';
-	$lang->edit->file_total ='总计<strong class="filecount">{total_filecount}</strong>个';
-	$lang->edit->insert_file_explain ='在此可输入文件说明。';
-
-	$lang->edit->hr = '分割线';
-	$lang->edit->hr_simple= '简单分割线';
-
-	$lang->edit->title_title='内标题';
-	$lang->edit->title='标题';
-	$lang->edit->title1='大标题';
-	$lang->edit->title2='中标题';
-	$lang->edit->title3='小标题';
-
-	$lang->edit->list = '列表';
-	$lang->edit->list_explain = '可利用CTRL+方向键改变项目循序及嵌套级别。';
-	$lang->edit->toc = '目录';
-	$lang->edit->toc_explain ='可以把日志文本内的小标题制成目录，并且每当添加一个内标题此目录就会自动更新。';
-
-	$lang->edit->more = '更多';
-	$lang->edit->move_button = '移动组件';
-
-    $lang->edit->no_materials = '暂无保存的素材。';
-    $lang->edit->msg_no_selected_object = '请选择对象。';
-    $lang->edit->msg_insert_value = '请输入相应的值。';
-	
-	$lang->edit->help_first_title = '도움말';
-	$lang->edit->help_shortcut = '단축키';
-	$lang->edit->help_bug_report = '글쓰기 오류신고';
-	$lang->edit->help_first_dt_1 = '새 단락 쓰기(1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = '도구모음 버튼을 클릭함으로써 새 단락 쓰기를 시작할 수 있습니다. 도구모음 버튼에는 배치된 순서대로 왼쪽으로부터 1~9까지 단축키가 할당되어 있습니다. 숫자키 \'0\' 또는 ESC키 바로 아래 위치한 [`] 그레이브(grave) 키를 누르시면 숨겨진 도구모음 버튼을 보거나 토글(toggle)할 수 있습니다.';
-	$lang->edit->help_first_dt_2 = '단락 선택(Click, Ctrl+Click, Shift+Click)';
-	$lang->edit->help_first_dd_2 = '클릭 또는 클릭 후 방향키(&uarr;&darr;)를 조작함으로써 원하는 단락을 선택할 수 있습니다. 단일선택(Click)과 다중선택(Ctrl+Click, Shift+Click)이 가능합니다';
-	$lang->edit->help_first_dt_3 = '단락 편집 및 취소(Enter, Double Click, ESC)';
-	$lang->edit->help_first_dd_3 = '단락 선택 후 Enter 또는 더블클릭으로 편집할 수 있습니다. ESC키를 이용하여 편집을 취소할 수 있습니다.';
-	$lang->edit->help_first_dt_4 = '단락 이동(Ctrl+&uarr;&darr;, Click-Drag-Drop)';
-	$lang->edit->help_first_dd_4 = '단락 선택 후 Ctrl+방향키(&uarr;&darr;)를 조작하거나 \'클릭-드래그-드롭\'으로 이동할 수 있습니다.';
-	$lang->edit->help_first_dt_5 = '단락 저장 및 삭제(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = '\'확인\'버튼을 누르거나 Ctrl+Enter 명령으로 저장할 수 있습니다. Del키를 이용하여 선택된 단락을 삭제할 수 있습니다.';
-
-	$lang->edit->drag_this = '단락을 드래그하여 이동하세요.';
-	$lang->edit->cmd_new_window = '새창';
-	$lang->edit->cmd_del = '삭제';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/lang/zh-TW.lang.php b/modules/editor/skins/dreditor/lang/zh-TW.lang.php
deleted file mode 100644
index 1ce429899..000000000
--- a/modules/editor/skins/dreditor/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-	/**
-	 * @file   modules/editor/skins/dreditor/lang/zh-TW.lang.php
-	 * @author sol <sol@ngleader.com> 翻譯：royallin
-	 * @brief  段落編輯器正體中文語言
-	 **/
-
-
-	$lang->edit->msg_dr_delete_confirm = '想要移除所選擇的段落？';
-	$lang->edit->insert_dr_title = '請輸入標題';
-	$lang->edit->richtext_area = '所見及得區域';
-	$lang->edit->insert_site_name = '請輸入網站名稱';
-	$lang->edit->insert_explain = '請輸入說明';
-
-
-	$lang->edit->text = '文字';
-	$lang->edit->link = '連結';
-	$lang->edit->blockquote = '引用';
-	$lang->edit->insert_blockquote = '請輸入引用';
-	$lang->edit->insert_cite = '請輸入來源，可輸入 <a>, <strong>, <em> 等標籤。';
-
-	$lang->edit->image = '圖片';
-	$lang->edit->find_image = '選擇圖片';
-	$lang->edit->uploading = '上傳中...';
-	$lang->edit->uploading_info = '最大可上傳 %sMB';
-	$lang->edit->uploaded_image = '已上傳的圖片';
-
-	$lang->edit->image_width = '圖片寬度';
-	$lang->edit->resize = '圖片縮放';
-	$lang->edit->resize_info = '輸入要建立的圖片大小，原始圖片將會保留。';
-	$lang->edit->resize_error = '請輸入比原始圖片要小的數值';
-	$lang->edit->insert_image_explain = '請輸入圖片簡介。可使用 <a>, <strong>, <em> 等標籤。';
-
-	$lang->edit->mov ='影片';
-	$lang->edit->insert_mov = '請輸入 <object> 或 <embed> 開頭的影片原始碼。';
-	$lang->edit->insert_mov_explain = '請輸入影片簡介。可使用 <a>, <strong>, <em> 等標籤。';
-
-	$lang->edit->file = '檔案';
-	$lang->edit->file_select = '請選擇要上傳的檔案';
-	$lang->edit->file_uploadinfo = '每個檔案上傳的大小 %s MB，總共 %s MB';
-	$lang->edit->file_total ='總共 <strong class="filecount">{total_filecount}</strong>個檔案';
-	$lang->edit->insert_file_explain ='請輸入檔案簡介。';
-
-	$lang->edit->hr = 'HR';
-	$lang->edit->hr_simple= 'Simple HR';
-
-	$lang->edit->title_title = 'Strapline';
-	$lang->edit->title='Subject';
-	$lang->edit->title1='大';
-	$lang->edit->title2='中';
-	$lang->edit->title3='小';
-
-	$lang->edit->list = '列表';
-	$lang->edit->list_explain = 'You can change the position or level of items by pressing CTRL+Arrow Keys.';
-	$lang->edit->toc = 'Index';
-	$lang->edit->toc_explain ='It makes an index with created straplines, and will be renewed automatically.';
-
-	$lang->edit->more = '更多';
-	$lang->edit->move_button = '移動';
-
-	$lang->edit->material = '素材';
-	$lang->edit->insert = '插入素材到內容中';
-	$lang->edit->close_materials = '關閉';
-    $lang->edit->no_materials = 'There is no writting ingredient.';
-    $lang->edit->msg_no_selected_object = 'There is no selected object.';
-    $lang->edit->msg_insert_value = '請輸入數值';
-
-	$lang->edit->help_first_title = '使用說明';
-	$lang->edit->help_shortcut = '快速鍵';
-	$lang->edit->help_bug_report = '錯誤回報';
-	$lang->edit->help_first_dt_1 = '快速鍵(1~9, 0, `)';
-	$lang->edit->help_first_dd_1 = '藉由點選工具列的按鈕可以編寫新的內容。 工具列的快速鍵是鍵盤的 1~9 數字鍵。 數字鍵 \'0\' 或是 ESC 鍵底下的 [`] 波浪鍵(grave) 可隱藏、顯示及切換(toggle)工具列。';
-	$lang->edit->help_first_dt_2 = '段落選擇(Click, Ctrl+Click, Shift+Click)';
-	$lang->edit->help_first_dd_2 = '利用滑鼠選取或方向鍵(&uarr;&darr;)移動的方式選取想要的段落。 可單選(Click)或複選(Ctrl+Click, Shift+Click)段落。';
-	$lang->edit->help_first_dt_3 = '段落編輯、取消(Enter, Double Click, ESC)';
-	$lang->edit->help_first_dd_3 = '按 Enter 鍵或點兩下段落就可進行編輯。按 ESC 鍵可取消編輯動作。';
-	$lang->edit->help_first_dt_4 = '段落移動(Ctrl+&uarr;&darr;, Click-Drag-Drop)';
-	$lang->edit->help_first_dd_4 = '選取段落後按 Ctrl+方向鍵(&uarr;&darr;)可進行操作，或是用滑鼠拖曳的方式進行操作。';
-	$lang->edit->help_first_dt_5 = '段落儲存、刪除(Ctrl+Enter, Del)';
-	$lang->edit->help_first_dd_5 = '按\'確認\'按鈕或是 Ctrl+Enter 可儲存內容。按 Del 鍵可刪除所選取的段落。';
-
-	$lang->edit->drag_this = '將段落移到';
-	$lang->edit->cmd_new_window = '開新視窗';
-	$lang->edit->cmd_del = '刪除';
-?>
\ No newline at end of file
diff --git a/modules/editor/skins/dreditor/skin.xml b/modules/editor/skins/dreditor/skin.xml
index 81befac43..5274367fd 100644
--- a/modules/editor/skins/dreditor/skin.xml
+++ b/modules/editor/skins/dreditor/skin.xml
@@ -1,131 +1,109 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">Dr.Editor Skin</title>
-    <title xml:lang="en">Dr.Editor Skin</title>
-	<title xml:lang="vi">Dr.Editor Skin</title>
-    <title xml:lang="zh-CN">Dr.Editor Skin</title>
-    <title xml:lang="zh-TW">Dr.Editor Skin</title>
-    <title xml:lang="jp">Dr.Editor Skin</title>
-    <title xml:lang="tr">Dr.Editor Skin</title>
-    <description xml:lang="ko">
-        Dr.Editor 
-    </description>
-    <description xml:lang="en">
-        Dr.Editor 
-    </description>
-	<description xml:lang="vi">
-        Dr.Editor 
-    </description>
-    <description xml:lang="zh-CN">
-        Dr.Editor 
-    </description>
-    <description xml:lang="zh-TW">
-        Dr.Editor 
-    </description>
-    <description xml:lang="jp">
-        Dr.Editor 
-    </description>
-    <description xml:lang="tr">
-        Dr.Editor 
-    </description>
-    <version>1.3.0</version>
-    <date>2010-04-30</date>
-    <author email_address="" link="http://dreditor.xpressengine.net">
-        <name xml:lang="ko">NHN</name>
-		<name xml:lang="en">NHN</name>
-		<name xml:lang="vi">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-		<name xml:lang="zh-TW">NHN</name>
-		<name xml:lang="jp">NHN</name>
-		<name xml:lang="tr">NHN</name>
-    </author>
-    <colorset>
-        <color name="white">
-            <title xml:lang="ko">하얀색(기본)</title>
-            <title xml:lang="jp">白（デフォルト）</title>
-            <title xml:lang="zh-CN">白色（基本）</title>
-            <title xml:lang="en">White (default)</title>
-			<title xml:lang="vi">White (Mặc định)</title>
-            <title xml:lang="es">Blanco (por defecto)</title>
-            <title xml:lang="zh-TW">白色(預設)</title>
-            <title xml:lang="tr">Beyaz (varsayılan)</title>
-        </color>
-        <color name="black">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-			<title xml:lang="vi">Black</title>
-            <title xml:lang="ru">Черного</title>
-            <title xml:lang="es">Negro</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-            <title xml:lang="tr">Siyah</title>
-        </color>
-        <color name="white_texteditor">
-            <title xml:lang="ko">하얀색 텍스트편집기(자동 줄 바꿈)</title>
-            <title xml:lang="jp">白色テキストエディター(自動に改行を入れる)</title>
-            <title xml:lang="en">White Text Editor(Auto Line Break)</title>
-			<title xml:lang="vi">White Text Editor(Tự động giãn dòng)</title>
-            <title xml:lang="ru">White Text Editor(Auto Line Break)</title>
-            <title xml:lang="es">Editor de texto en blanco (Auto de línea)</title>
-            <title xml:lang="zh-CN">白色文本编辑器(自动换行)</title>
-            <title xml:lang="zh-TW">白色文字編輯器(自動換行)</title>
-            <title xml:lang="tr">Beyaz Metin Editörü(Otomatik Satır Arası)</title>
-        </color>
-        <color name="black_texteditor">
-            <title xml:lang="ko">검은색 텍스트편집기(자동 줄 바꿈)</title>
-            <title xml:lang="jp">黒色テキストエディター(自動に改行を入れる)</title>
-            <title xml:lang="en">Black Text Editor(Auto Line Break)</title>
-			<title xml:lang="vi">Black Text Editor(Tự động giãn dòng)</title>
-            <title xml:lang="ru">Black Text Editor(Auto Line Break)</title>
-            <title xml:lang="es">Editor de texto negro (salto de línea automático)</title>
-            <title xml:lang="zh-CN">黑色文本编辑器(自动换行)</title>
-            <title xml:lang="zh-TW">黑色文字編輯器(自動換行)</title>
-            <title xml:lang="tr">Siyah Metin Alanı(Otomatik Satır Arası)</title>
-        </color>
-        <color name="white_text_usehtml">
-            <title xml:lang="ko">하얀색 텍스트편집기(HTML 사용)</title>
-            <title xml:lang="jp">白色テキストエディター(HTMLタグを使う)</title>
-            <title xml:lang="en">White Text Editor(Use HTML)</title>
-			<title xml:lang="vi">White Text Editor(Sử dụng HTML)</title>
-            <title xml:lang="ru">White Text Editor(Use HTML)</title>
-            <title xml:lang="es">Editor de texto en blanco (Uso de HTML)</title>
-            <title xml:lang="zh-CN">白色文本编辑器(使用HTML)</title>
-            <title xml:lang="zh-TW">白色文字編輯器(使用HTML)</title>
-            <title xml:lang="tr">Beyaz Metin Editörü(HTML kullan)</title>
-        </color>
-        <color name="black_text_usehtml">
-            <title xml:lang="ko">검은색 텍스트편집기(HTML 사용)</title>
-            <title xml:lang="jp">黒色テキストエディター(HTMLタグを使う)</title>
-            <title xml:lang="en">Black Text Editor(Use HTML)</title>
-			<title xml:lang="vi">Black Text Editor(Sử dụng HTML)</title>
-            <title xml:lang="ru">Black Text Editor(Use HTML)</title>
-            <title xml:lang="es">Editor de texto negro (Uso de HTML)</title>
-            <title xml:lang="zh-CN">黑色文本编辑器(使用HTML)</title>
-            <title xml:lang="zh-TW">黑色文字編輯器(使用HTML)</title>
-            <title xml:lang="tr">Siyah Metin Alanı(HTML kullan)</title>
-        </color>
-        <color name="white_text_nohtml">
-            <title xml:lang="ko">하얀색 텍스트편집기(HTML 사용 안함)</title>
-            <title xml:lang="jp">白色テキストエディター(HTMLタグを使わない)</title>
-            <title xml:lang="en">White Text Editor(No HTML)</title>
-			<title xml:lang="vi">White Text Editor(Không sử dụng HTML)</title>
-            <title xml:lang="ru">White Text Editor(No HTML)</title>
-            <title xml:lang="es">Editor de texto en blanco (no HTML)</title>
-            <title xml:lang="zh-CN">白色文本编辑器(不使用HTML)</title>
-            <title xml:lang="zh-TW">白色文字編輯器(不使用HTML)</title>
-            <title xml:lang="tr">Beyaz Metin Editörü(HTML yok)</title>
-        </color>
-        <color name="black_text_nohtml">
-            <title xml:lang="ko">검은색 텍스트편집기(HTML 사용 안함)</title>
-            <title xml:lang="jp">黒色テキストエディター(HTMLタグを使わない)</title>
-            <title xml:lang="en">Black Text Editor(No HTML)</title>
-			<title xml:lang="vi">Black Text Editor(Không sử dụng HTML)</title>
-            <title xml:lang="ru">Black Text Editor(No HTML)</title>
-            <title xml:lang="es">Editor de texto negro (no HTML)</title>
-            <title xml:lang="zh-CN">黑色文本编辑器(不使用HTML)</title>
-            <title xml:lang="zh-TW">黑色文字編輯器(不使用HTML)</title>
-            <title xml:lang="tr">Siyah Metin Alanı(HTML yok)</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">Dr.Editor Skin</title>
+    <title xml:lang="en">Dr.Editor Skin</title>
+	<title xml:lang="vi">Dr.Editor Skin</title>
+    <title xml:lang="zh-CN">Dr.Editor Skin</title>
+    <title xml:lang="zh-TW">Dr.Editor Skin</title>
+    <title xml:lang="jp">Dr.Editor Skin</title>
+    <title xml:lang="tr">Dr.Editor Skin</title>
+    <description xml:lang="ko">
+        Dr.Editor 
+    </description>
+    <description xml:lang="en">
+        Dr.Editor 
+    </description>
+	<description xml:lang="vi">
+        Dr.Editor 
+    </description>
+    <description xml:lang="zh-CN">
+        Dr.Editor 
+    </description>
+    <description xml:lang="zh-TW">
+        Dr.Editor 
+    </description>
+    <description xml:lang="jp">
+        Dr.Editor 
+    </description>
+    <description xml:lang="tr">
+        Dr.Editor 
+    </description>
+    <version>1.3.0</version>
+    <date>2010-04-30</date>
+    <author email_address="" link="http://dreditor.xpressengine.net">
+        <name xml:lang="ko">NHN</name>
+		<name xml:lang="en">NHN</name>
+		<name xml:lang="vi">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+		<name xml:lang="zh-TW">NHN</name>
+		<name xml:lang="jp">NHN</name>
+		<name xml:lang="tr">NHN</name>
+    </author>
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">하얀색 위지윅(기본)</title>
+            <title xml:lang="jp">白 WYSIWYG（デフォルト）</title>
+            <title xml:lang="zh-CN">白色 WYSIWYG（基本）</title>
+            <title xml:lang="en">White WYSIWYG(default)</title>
+			<title xml:lang="vi">White WYSIWYG (Mặc định)</title>
+            <title xml:lang="es">Blanco WYSIWYG(por defecto)</title>
+            <title xml:lang="zh-TW">白色 WYSIWYG(預設)</title>
+            <title xml:lang="tr">Beyaz WYSIWYG(varsayılan)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색 위지윅</title>
+            <title xml:lang="jp">黒 WYSIWYG</title>
+            <title xml:lang="en">Black WYSIWYG</title>
+			<title xml:lang="vi">Black WYSIWYG</title>
+            <title xml:lang="ru">Черного WYSIWYG</title>
+            <title xml:lang="es">Negro WYSIWYG</title>
+            <title xml:lang="zh-CN">黑色 WYSIWYG</title>
+            <title xml:lang="zh-TW">黑色 WYSIWYG</title>
+            <title xml:lang="tr">Siyah WYSIWYG</title>
+        </color>
+        <color name="white_text_usehtml">
+            <title xml:lang="ko">하얀색 텍스트(HTML 사용)</title>
+            <title xml:lang="jp">白色テキスト(HTMLタグを使う)</title>
+            <title xml:lang="en">White Text(Use HTML)</title>
+			<title xml:lang="vi">White Text(Sử dụng HTML)</title>
+            <title xml:lang="ru">White Text(Use HTML)</title>
+            <title xml:lang="es">Editor de texto en blanco (Uso de HTML)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(使用HTML)</title>
+            <title xml:lang="zh-TW">白色文字編輯器(使用HTML)</title>
+            <title xml:lang="tr">Beyaz Metin Editörü(HTML kullan)</title>
+        </color>
+        <color name="black_text_usehtml">
+            <title xml:lang="ko">검은색 텍스트(HTML 사용)</title>
+            <title xml:lang="jp">黒色テキスト(HTMLタグを使う)</title>
+            <title xml:lang="en">Black Text(Use HTML)</title>
+			<title xml:lang="vi">Black Text(Sử dụng HTML)</title>
+            <title xml:lang="ru">Black Text(Use HTML)</title>
+            <title xml:lang="es">Editor de texto negro (Uso de HTML)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(使用HTML)</title>
+            <title xml:lang="zh-TW">黑色文字編輯器(使用HTML)</title>
+            <title xml:lang="tr">Siyah Metin Alanı(HTML kullan)</title>
+        </color>
+        <color name="white_text_nohtml">
+            <title xml:lang="ko">하얀색 텍스트(HTML 사용 안함)</title>
+            <title xml:lang="jp">白色テキスト(HTMLタグを使わない)</title>
+            <title xml:lang="en">White Text(No HTML)</title>
+			<title xml:lang="vi">White Text(Không sử dụng HTML)</title>
+            <title xml:lang="ru">White Text(No HTML)</title>
+            <title xml:lang="es">Editor de texto en blanco (no HTML)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(不使用HTML)</title>
+            <title xml:lang="zh-TW">白色文字編輯器(不使用HTML)</title>
+            <title xml:lang="tr">Beyaz Metin Editörü(HTML yok)</title>
+        </color>
+        <color name="black_text_nohtml">
+            <title xml:lang="ko">검은색 텍스트(HTML 사용 안함)</title>
+            <title xml:lang="jp">黒色テキスト(HTMLタグを使わない)</title>
+            <title xml:lang="en">Black Text(No HTML)</title>
+			<title xml:lang="vi">Black Text(Không sử dụng HTML)</title>
+            <title xml:lang="ru">Black Text(No HTML)</title>
+            <title xml:lang="es">Editor de texto negro (no HTML)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(不使用HTML)</title>
+            <title xml:lang="zh-TW">黑色文字編輯器(不使用HTML)</title>
+            <title xml:lang="tr">Siyah Metin Alanı(HTML yok)</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/modules/editor/skins/xeed/editor.html b/modules/editor/skins/xeed/editor.html
deleted file mode 100644
index d2296f791..000000000
--- a/modules/editor/skins/xeed/editor.html
+++ /dev/null
@@ -1,367 +0,0 @@
-<!--// 스킨 css 로드 -->
-<!--%import("xd.css")-->
-
-<!--// 기본 JS 로드 -->
-<!--%import("../../tpl/js/editor_common.js")-->
-
-<!--// 기본 js/언어파일 로드 -->
-<!--%import("js/xeed.js")-->
-<!--%import("js/xe_interface.js")-->
-
-<!--@if($enable_autosave)-->
-<!-- Auto-saving fields -->
-<input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title)}" />
-<input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
-<input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
-<!--@end-->
-
-<!-- {{{ Editor HTML -->
-<!-- XEED -->
-<textarea id="xeed-{$editor_sequence}" name="{$editor_content_key_name}" cols="80" rows="10"></textarea>
-<div class="xd">
-	<!-- tool -->
-	<div class="tool">
-		<a href="#edit" class="skip">{$lang->edit->jumptoedit}</a>
-		<div class="t1" cond="$allow_fileupload || $enable_component">
-			<button type="button" class="mo"><span>{$lang->edit->toolbar_moreless}</span></button>
-			<ul class="u1" cond="$allow_fileupload">
-				<li class="ti al">
-					<a href="#xdal" class="tb">
-						<span class="all">{$lang->edit->upload_list}</span>
-						<span class="img"><span>{$lang->edit->image}</span><strong>0</strong></span>
-						<span class="media"><span>{$lang->edit->multimedia}</span><strong>0</strong></span>
-						<span class="file"><span>{$lang->edit->file}</span><strong>0</strong></span>
-					</a>
-				</li>
-			</ul>
-			<!-- editor components -->
-			<block cond="$enable_component">
-			<!--@foreach($component_list as $component_name => $component)-->
-			<ul class="u2">
-				<li class="ti"><a href="{getUrl('module','editor','act','dispEditorPopup','editor_sequence', $editor_sequence, 'component', $component_name)}" target="_blank" class="tb" id="component_{$editor_sequence}_{$component_name}" title="{$component->title}">{$component->title}</a></li>
-			</ul>
-			<!--@end-->
-			</block>
-			<!-- //editor components -->
-		</div>
-		<div class="t2">
-			<button type="button" class="mo"><span>{$lang->edit->toolbar_moreless}</span></button>
-			<ul class="u1">
-				<li class="ti ud disable"><button type="button" class="tb ud"><span>{$lang->edit->undo} Ctrl+Z</span></button></li>
-				<li class="ti rd disable"><button type="button" class="tb rd da"><span>{$lang->edit->redo} Ctrl+Y</span></button></li>
-			</ul>
-			<ul class="u2">
-				<li class="ti hx"><button type="button" class="tb">{$lang->edit->header}</button>
-					<ul class="lr">
-						<!--@foreach($lang->edit->header_list as $key=>$obj)-->
-						<li class="{$key}"><button type="button" title="Ctrl+1">{$obj}</button></li>
-						<!--@end-->
-						<li class="h7"><button type="button" title="Ctrl+7">{$lang->edit->paragraph}</button></li>
-					</ul>
-				</li>
-				<li class="ti ff"><button type="button" class="tb">{$lang->edit->fontname}</button>
-					<ul class="lr">
-						<!--@foreach($lang->edit->fontlist as $key=>$obj)-->
-						<li><button type="button" style="font-family:{$key}">{$obj}</button></li>
-						<!--@end-->
-					</ul>
-				</li>
-				<li class="ti fs"><button type="button" class="tb">{$lang->edit->fontsize}</button>
-					<ul class="lr">
-						<li><button type="button">9px;10px;11px;12px;13px;14px;16px;18px;24px;32px</button></li>
-					</ul>
-				</li>
-				<li class="ti lh"><button type="button" class="tb">{$lang->edit->lineheight}</button>
-					<ul class="lr">
-						<li><button type="button">100%;120%;140%;160%;180%;200%</button></li>
-					</ul>
-				</li>
-			</ul>
-			<ul class="u3">
-				<li class="ti bd"><button type="button" class="tb bd" title="{$lang->edit->bold} (Ctrl+B)"><span>{$lang->edit->bold} Ctrl+B</span></button></li>
-				<li class="ti ue"><button type="button" class="tb ue" title="{$lang->edit->underline} (Ctrl+U)"><span>{$lang->edit->underline} Ctrl+U</span></button></li>
-				<li class="ti ic"><button type="button" class="tb ic" title="{$lang->edit->italic} (Ctrl+I)"><span>{$lang->edit->italic} Ctrl+I</span></button></li>
-				<li class="ti se"><button type="button" class="tb se" title="{$lang->edit->strike} (Ctrl+D)"><span>{$lang->edit->strike} Ctrl+D</span></button></li>
-				<li class="ti cr fc">
-					<button type="button" class="tb cr fc" title="{$lang->edit->fontcolor_apply}" style="background-color:#74c600"><span>{$lang->edit->fontcolor_apply}</span></button><button type="button" class="tb more" title="{$lang->edit->fontcolor_more}"><span>{$lang->edit->fontcolor_more}</span></button>
-					<div class="lr">
-						<fieldset>
-							<legend>{$lang->edit->fontcolor}</legend>
-							<ul class="ct">
-								<li><button type="button"><span>ff0000;ff6c00;ffaa00;ffef00;a6cf00;009e25;00b0a2;0075c8;3a32c3;7820b9;ef007c;000000;252525;464646;636363;7d7d7d;9a9a9a;ffe8e8;f7e2d2;f5eddc;f5f4e0;edf2c2;def7e5;d9eeec;c9e0f0;d6d4eb;e7dbed;f1e2ea;acacac;c2c2c2;cccccc;e1e1e1;ebebeb;ffffff;e97d81;e19b73;d1b274;cfcca2;cfcca2;61b977;53aea8;518fbb;6a65bb;9a54ce;e573ae;5a504b;767b86;00ffff;00ff00;a0f000;ffff00;951015;6e391a;785c25;5f5b25;4c511f;1c4827;0d514c;1b496a;2b285f;45245b;721947;352e2c;3c3f45;00aaff;0000ff;a800ff;ff00ff</span></button></li>
-							</ul>
-						</fieldset>
-					</div>
-				</li>
-				<li class="ti cr bc">
-					<button type="button" class="tb cr bc" title="{$lang->edit->fontbgcolor_apply}" style="background-color:#74c600"><span>{$lang->edit->fontbgcolor_apply}</span></button><button type="button" class="tb more" title="{$lang->edit->fontbgcolor_more}"><span>{$lang->edit->fontbgcolor_more}</span></button>
-					<div class="lr">
-						<fieldset>
-							<legend>{$lang->edit->fontbgcolor}</legend>
-							<ul class="cx">
-								<li><button type="button">000000:fff;333333:fff;666666:fff;B82200:fff;FF3000:fff;FF6947:fff;457700:fff;61A500:fff;74C600:fff;006CA7:fff;0092E0:fff;33BAFF:fff;005147:fff;006F61:fff;51A59A:fff;A1005A:fff;E60081:fff;FF2DA4:fff;DDDDDD:000;EEEEEE:000;FFFFFF:000</button></li>
-							</ul>
-							<ul class="ct">
-								<li><button type="button"><span>ff0000;ff6c00;ffaa00;ffef00;a6cf00;009e25;00b0a2;0075c8;3a32c3;7820b9;ef007c;000000;252525;464646;636363;7d7d7d;9a9a9a;ffe8e8;f7e2d2;f5eddc;f5f4e0;edf2c2;def7e5;d9eeec;c9e0f0;d6d4eb;e7dbed;f1e2ea;acacac;c2c2c2;cccccc;e1e1e1;ebebeb;ffffff;e97d81;e19b73;d1b274;cfcca2;cfcca2;61b977;53aea8;518fbb;6a65bb;9a54ce;e573ae;5a504b;767b86;00ffff;00ff00;a0f000;ffff00;951015;6e391a;785c25;5f5b25;4c511f;1c4827;0d514c;1b496a;2b285f;45245b;721947;352e2c;3c3f45;00aaff;0000ff;a800ff;ff00ff</span></button></li>
-							</ul>
-						</fieldset>
-					</div>
-				</li>
-				<li class="ti sp"><button type="button" class="tb sp" title="{$lang->edit->sup}"><span>{$lang->edit->sup}</span></button></li>
-				<li class="ti sb"><button type="button" class="tb sb" title="{$lang->edit->sub}"><span>{$lang->edit->sub}</span></button></li>
-			</ul>
-			<ul class="u4">
-				<li class="ti al"><button type="button" class="tb al" title="{$lang->edit->align_left}"><span>{$lang->edit->align_left}</span></button></li>
-				<li class="ti ac"><button type="button" class="tb ac" title="{$lang->edit->align_center}"><span>{$lang->edit->align_center}</span></button></li>
-				<li class="ti ar"><button type="button" class="tb ar" title="{$lang->edit->align_right}"><span>{$lang->edit->align_right}</span></button></li>
-				<li class="ti aj"><button type="button" class="tb aj" title="{$lang->edit->align_justify}"><span>{$lang->edit->align_justify}</span></button></li>
-				<li class="ti ol"><button type="button" class="tb ol" title="{$lang->edit->list_number}"><span>{$lang->edit->list_number}</span></button></li>
-				<li class="ti ul"><button type="button" class="tb ul" title="{$lang->edit->list_bullet}"><span>{$lang->edit->list_bullet}</span></button></li>
-				<li class="ti od disable"><button type="button" class="tb od" title="{$lang->edit->remove_indent} Ctrl+(Left Arrow Key)"><span>{$lang->edit->remove_indent} Ctrl+(Left Arrow Key)</span></button></li>
-				<li class="ti id"><button type="button" class="tb id" title="{$lang->edit->add_indent} Ctrl+(Right Arrow Key)"><span>{$lang->edit->add_indent} Ctrl+(Right Arrow Key)</span></button></li>
-				<li class="ti qm"><button type="button" class="tb qm" title="{$lang->edit->blockquote}"><span>{$lang->edit->blockquote}</span></button></li>
-				<li class="ti bx"><button type="button" class="tb bx" title="{$lang->edit->fieldset}"><span>{$lang->edit->fieldset}</span></button></li>
-			</ul>
-			<ul class="u5">
-				<li class="ti er"><button type="button" class="tb er" title="{$lang->edit->remove_format}"><span>{$lang->edit->remove_format}</span></button></li>
-			</ul>
-			<ul class="u6">
-				<li class="ti ur"><button type="button" class="tb ur" title="{$lang->edit->url}"><span>{$lang->edit->url}</span></button>
-					<div class="lr">
-						<fieldset>
-							<input name="" type="text" class="itx" title="input URL" value="http://" />
-							<span class="nw">
-								<input name="" type="checkbox" value="" class="icx" id="nw" />
-								<label for="nw">{$lang->edit->target_blank}</label>
-							</span>
-							<span class="btnArea">
-								<button type="button" class="btn strong">{$lang->cmd_apply}</button>
-								<button type="button" class="btn">{$lang->cmd_cancel}</button>
-							</span>
-						</fieldset>
-					</div>
-				</li>
-				<li class="ti te"><button type="button" class="tb te" title="{$lang->edit->table}"><span>{$lang->edit->table}</span></button>
-					<div class="lr">
-						<fieldset class="pv">
-							<legend>{$lang->cmd_preview}</legend>
-							<div class="xdcs">
-								<table border="1" cellpadding="1" cellspacing="0" class="ts" style="caption-side:top; width:100%;">
-									<caption style="text-align:left">Caption</caption>
-									<tr>
-										<td>TD</td>
-										<td>TD</td>
-										<td>TD</td>
-									</tr>
-									<tr>
-										<td>TD</td>
-										<td>TD</td>
-										<td>TD</td>
-									</tr>
-									<tr>
-										<td>TD</td>
-										<td>TD</td>
-										<td>TD</td>
-									</tr>
-								</table>
-							</div>
-						</fieldset>
-						<fieldset class="cn">
-							<legend>{$lang->edit->table_caption_position}</legend>
-							<div class="liow">
-								<label for="cn">{$lang->edit->table_caption}</label>
-								<input name="" type="text" id="cn" class="itx" />
-								<ul>
-									<li class="tl selected"><button type="button" title="{$lang->edit->upper_left}"><span>{$lang->edit->upper_left}</span></button></li>
-									<li class="tc"><button type="button" title="{$lang->edit->upper_center}"><span>{$lang->edit->upper_center}</span></button></li>
-									<li class="tr"><button type="button" title="{$lang->edit->upper_right}"><span>{$lang->edit->upper_right}</span></button></li>
-									<li class="bl"><button type="button" title="{$lang->edit->bottom_left}"><span>{$lang->edit->bottom_left}</span></button></li>
-									<li class="bc"><button type="button" title="{$lang->edit->bottom_center}"><span>{$lang->edit->bottom_center}</span></button></li>
-									<li class="br"><button type="button" title="{$lang->edit->bottom_right}"><span>{$lang->edit->bottom_right}</span></button></li>
-								</ul>
-							</div>
-						</fieldset>
-						<fieldset class="th">
-							<legend>{$lang->edit->table_header}</legend>
-							<ul>
-								<li class="no selected"><button type="button" title="{$lang->edit->table_header_none}"><span>{$lang->edit->table_header_none}</span></button></li>
-								<li class="lt"><button type="button" title="{$lang->edit->table_header_left}"><span>{$lang->edit->table_header_left}</span></button></li>
-								<li class="tp"><button type="button" title="{$lang->edit->table_header_top}"><span>{$lang->edit->table_header_top}</span></button></li>
-								<li class="bh"><button type="button" title="{$lang->edit->table_header_both}"><span>{$lang->edit->table_header_both}</span></button></li>
-							</ul>
-						</fieldset>
-						<fieldset class="wh">
-							<legend>{$lang->edit->table_size}</legend>
-							<table>
-								<tr>
-									<th scope="row"><label for="xdtCol">{$lang->edit->row}</label></th>
-									<td><input name="" type="text" id="xdtCol" class="itx" value="3" /></td>
-								</tr>
-								<tr>
-									<th scope="row"><label for="xdtRow">{$lang->edit->col}</label></th>
-									<td><input name="" type="text" id="xdtRow" class="itx" value="3" /></td>
-								</tr>
-								<tr>
-									<th><label for="xdtWidth">{$lang->edit->table_width}</label></th>
-									<td><input name="" type="text" id="xdtWidth" class="itx" value="100" /> <button type="button" class="selected">%</button> <button type="button">px</button></td>
-								</tr>
-							</table>
-						</fieldset>
-						<div class="btnArea">
-							<button type="button" class="btn strong" title="{$lang->cmd_apply}">{$lang->cmd_apply}</button>
-							<button type="button" class="btn" title="{$lang->cmd_cancel}">{$lang->cmd_cancel}</button>
-						</div>
-					</div>
-				</li>
-<!--
-				<li class="ti cm disable"><button type="button" class="tb tn cm"><span>셀 합치기</span></button></li>
-				<li class="ti cs disable"><button type="button" class="tb tn cs"><span>열 나누기</span></button></li>
-				<li class="ti rs disable"><button type="button" class="tb tn rs"><span>행 나누기</span></button></li>
-				<li class="ti tc disable"><button type="button" class="tb tn tc"><span>목차 넣기</span></button></li>
-				<li class="ti fr"><button type="button" class="tb ty fr"><span>찾기/바꾸기</span></button>
-					<div class="lr">
-						<fieldset class="find">
-							<legend>찾기</legend>
-							<div class="liow">
-								<label for="find">찾을단어</label>
-								<input name="" type="text" class="itx" id="find" />
-								<button type="button" class="btn">찾기</button>
-							</div>
-						</fieldset>
-						<fieldset class="replace">
-							<legend>찾아 바꾸기</legend>
-							<div class="liow">
-								<label for="findAnd">찾을단어</label>
-								<input name="" type="text" class="itx" id="findAnd" />
-								<button type="button" class="btn">찾기</button>
-							</div>
-							<div class="liow">
-								<label for="replace">바꿀단어</label>
-								<input name="" type="text" class="itx" id="replace" />
-								<button type="button" class="btn strong">바꾸기</button>
-							</div>
-							<button type="button" class="btn strong frAll">모두 찾아 바꾸기</button>
-						</fieldset>
-					</div>
-				</li>
--->
-			</ul>
-		</div>
-	</div>
-	<!-- /tool -->
-
-	<!-- edit -->
-	<div class="edit">
-		<div class="xdcs" title="{$lang->edit->break_or_paragraph}"></div>
-	</div>
-	<!-- /edit -->
-
-	<!-- Time -->
-	<div class="time">
-		<p>글을 쓰기 시작한지 <strong>1시간</strong>이 지났습니다. 마지막 저장 시간은 <strong>10분 전</strong> 입니다.</p>
-	</div>
-	<!-- /Time -->
-
-	<!-- mode -->
-	<div class="mode">
-		<button type="button" class="resize" title="{$lang->edit->edit_height_control}"><span>{$lang->edit->edit_height_control}</span></button>
-		<div class="autoResize">
-			<input name="" type="checkbox" value="" class="icx" id="autoResize" />
-			<label for="autoResize">Auto Resize</label>
-		</div>
-		<ul>
-			<li class="wysiwyg active"><button type="button" class="wysiwyg" title="{$lang->edit->rich_editor}">{$lang->edit->rich_editor}</button></li>
-			<li class="html"><button type="button" class="html" title="{$lang->edit->html_editor}">{$lang->edit->html_editor}</button></li>
-		</ul>
-	</div>
-	<!-- /mode -->
-</div>
-<!-- /XEED -->
-
-<!-- XD Layer Window -->
-<div class="xdlw">
-	<!-- Attach List -->
-	<!--@if($allow_fileupload)-->
-	<!--%load_js_plugin("uploader")-->
-	<div class="xdal" id="xdal">
-		<div class="iHead">
-			<h2>{$lang->edit->upload_list} <em>[<strong>0</strong>]</em></h2>
-			<div class="btnArea fr">
-				<button type="button" class="btn at strong" title="{$lang->edit->upload_file}">{$lang->edit->upload_file}</button>
-				<button type="button" class="btn cs" title="{$lang->cmd_close}">{$lang->cmd_close}</button>
-			</div>
-		</div>
-		<div class="iBody">
-			<div class="sn img none">
-				<h3 class="label">{$lang->edit->image}</h3>
-				<p class="nofile">{$lang->edit->no_image}</p>
-				<ul>
-					<li>
-						<button type="button" class="ob"><img src="../../../../../../common/tpl/images/blank.gif" alt="" /></button>
-						<button type="button" class="ctr ins" title="{$lang->edit->link_file}"><span>{$lang->edit->link_file}</span></button>
-						<button type="button" class="ctr del" title="{$lang->cmd_delete}"><span>{$lang->cmd_delete}</span></button> <br />
-						<input name="" type="checkbox" value="" class="icx" id="img1" /> <label for="img1">@exThumbH.jpg</label>
-					</li>
-				</ul>
-				<p class="task">
-					<button type="button" class="all">{$lang->cmd_select_all}</button>
-					<button type="button" class="insert">{$lang->edit->insert_selected}</button>
-					<button type="button" class="delete">{$lang->edit->delete_selected}</button>
-				</p>
-			</div>
-			<div class="sn media none">
-				<h3 class="label">{$lang->edit->multimedia}</h3>
-				<p class="nofile">{$lang->edit->no_multimedia}</p>
-				<ul></ul>
-				<p class="task">
-					<button type="button" class="all" title="{$lang->cmd_select_all}">{$lang->cmd_select_all}</button>
-					<button type="button" class="insert" title="{$lang->edit->insert_selected}">{$lang->edit->insert_selected}</button>
-					<button type="button" class="delete">{$lang->edit->delete_selected}</button>
-				</p>
-			</div>
-			<div class="sn file none">
-				<h3 class="label">{$lang->edit->file}</h3>
-				<p class="nofile">{$lang->edit->no_attachment}</p>
-				<ul></ul>
-				<p class="task">
-					<button type="button" class="all" title="{$lang->cmd_select_all}">{$lang->cmd_select_all}</button>
-					<button type="button" class="insert" title="{$lang->edit->insert_selected}">{$lang->edit->insert_selected}</button>
-					<button type="button" class="delete">{$lang->edit->delete_selected}</button>
-				</p>
-			</div>
-		</div>
-		<div class="iFoot">
-			<p class="info">{$upload_status}</p>
-			<div class="btnArea fr">
-				<button type="button" class="btn at strong" title="{$lang->edit->upload_file}">{$lang->edit->upload_file}</button>
-				<button type="button" class="btn cs" title="{$lang->cmd_close}">{$lang->cmd_close}</button>
-			</div>
-		</div>
-	</div>
-	<!--@end-->
-	<!-- /Attach List -->
-</div>
-<!-- /XD Layer Window -->
-<!-- }}} Editor HTML -->
-
-<!-- Activate Editor -->
-<script type="text/javascript">//<![CDATA[
-var editor_path = '{$editor_path}';
-var xeed_path   = '{$editor_path}';
-var auto_saved_msg = '{$lang->msg_auto_saved}';
-var oEditor = editorStart_xe('{$editor_sequence}', '{$editor_primary_key_name}', '{$editor_content_key_name}', '{$editor_height}', '{$colorset}', '{$content_style}', '{$content_font}', '{$content_font_size}');
-
-// upload settings
-try {
-	oEditor.setOption('allowed_filesize', '{$file_config->allowed_filesize}');
-	oEditor.setOption('allowed_filetypes', '{$file_config->allowed_filetypes}');
-} catch(e){}
-
-window.lang = jQuery.extend(window.lang||{}, {
-	<!--@foreach($lang->edit as $key=>$val)-->
-	<!--@if(strpos($key,'autosave')===0)-->'{$key}':'{$val}',<!--@end-->
-	<!--@end-->
-	'upload_not_enough_quota':'{$lang->edit->upload_not_enough_quota}'
-});
-//]]></script>
-<!-- // Activate Editor -->
diff --git a/modules/editor/skins/xeed/js/xe_interface.js b/modules/editor/skins/xeed/js/xe_interface.js
deleted file mode 100644
index 9be2720bb..000000000
--- a/modules/editor/skins/xeed/js/xe_interface.js
+++ /dev/null
@@ -1,145 +0,0 @@
-(function($){
-
-if (!window.xe)  xe = {};
-if (!xe.Editors) xe.Editors = [];
-
-function editorStart_xe(editor_seq, primary_key, content_key, editor_height, colorset, content_style, content_font, content_font_size) {
-	var $textarea, $form, $input, saved_str, xeed, opt = {};
-
-	if(typeof(colorset)=='undefined') colorset = 'white';
-	if(typeof(content_style)=='undefined') content_style = 'xeStyle';
-	if(typeof(content_font)=='undefined') content_font= '';
-	if(typeof(content_font_size)=='undefined') content_font_size= '';
-
-	$textarea = $('#xeed-'+editor_seq);
-	$form     = $($textarea[0].form).attr('editor_sequence', editor_seq);
-	$input    = $form.find('input[name='+content_key+']');
-
-	if($input[0]) $textarea.val($input.remove().val()).attr('name', content_key);
-	$textarea.attr('name', content_key);
-	
-	// Use auto save feature?
-	opt.use_autosave = !!$form[0].elements['_saved_doc_title'];
-	
-	// min height
-	if (editor_height) opt.height = parseInt(editor_height) || 200;
-
-	// create an editor
-	xe.Editors[editor_seq] = xeed = new xe.Xeed($textarea, opt);
-	xe.registerApp(xeed);
-	
-	// filters
-	xeed.cast('REGISTER_FILTER', ['r2t', plz_standard]);
-	xeed.cast('REGISTER_FILTER', ['r2t', remove_baseurl]);
-	xeed.cast('REGISTER_FILTER', ['r2t', unwrap_single_para]);
-	xeed.cast('REGISTER_FILTER', ['in',  inline_styled['in']]);
-	xeed.cast('REGISTER_FILTER', ['out', inline_styled['out']]);
-	xeed.cast('REGISTER_FILTER', ['r2t', auto_br.br2ln]);
-	xeed.cast('REGISTER_FILTER', ['in',  auto_br.br2ln]);
-	xeed.cast('REGISTER_FILTER', ['t2r', auto_br.ln2br]);
-	xeed.cast('REGISTER_FILTER', ['out', auto_br.ln2br]);
-
-	// Set standard API
-	editorRelKeys[editor_seq] = {
-		primary   : $form[0][primary_key],
-		content   : $form[0][content_key],
-		editor    : xeed,
-		func      : function(){ return xeed.cast('GET_CONTENT'); },
-		pasteHTML : function(text){ xeed.cast('PASTE_HTML', [text]); }
-	};
-	
-	// Auto save
-	if (opt.use_autosave) xeed.registerPlugin(new xe.Xeed.AutoSave());
-
-	return xeed;
-}
-
-// standard filters
-function plz_standard(code) {
-	var single_tags = 'area br col hr img input param'.split(' '), replaces = {b:'strong',i:'em'};
-
-	code = code.replace(/<(\/)?([A-Za-z0-9:]+)(.*?)(\s*\/?)>/g, function(m0,is_close,tag,attrs,closing){
-		tag = tag.toLowerCase();
-		if (replaces[tag]) tag = replaces[tag];
-		
-		attrs = attrs.replace(/([\w:-]\s*)=(?:([^"' \t\r\n]+)|\s*("[^"]*")|\s*('[^']*'))/g, function(m0,name,m2,m3,m4){
-			var val = m2||m3||m4;
-
-			if (m3||m4) val = val.substr(1,val.length-2);
-		
-			return $.trim(name.toLowerCase())+'='+'"'+val+'"';
-		});
-
-		if (attrs=$.trim(attrs)) attrs = ' '+attrs;
-	
-		closing = $.trim(closing);
-		if (!is_close && !closing && $.inArray(tag, single_tags) != -1) closing = ' /';
-
-		return '<'+(is_close||'')+tag+attrs+closing+'>';
-	});
-
-	return code;
-}
-
-// remove base url
-function remove_baseurl(code) {
-	var reg = new RegExp(' (href|src)\s*=\s*(["\'])?'+request_uri.replace('\\', '\\\\'), 'ig');
-
-	return code.replace(reg, function(m0,m1,m2){ return ' '+m1+'='+m2; });
-}
-
-// unwrap single paragraph
-function unwrap_single_para(code) {
-	var match = $.trim(code).match(/<p[\s>]/g);
-
-	if (match && match.length == 1) {
-		code = code.replace(/<\/?p(?:\s[^>]+)?>/g, '');
-	}
-
-	return code;
-};
-
-// inline styled box
-var inline_styled = {
-	'in' : function(code) {
-		return code.replace(/<(div|blockquote)(?:[^>]*) class="(bx|bq)"(?:[^>]*)>/ig, '<$1 class="$2">');
-	},
-	'out' : function(code) {
-		return code.replace(/<(div|blockquote)(?:[^>]*) class="(bx|bq)"(?:[^>]*)>/ig, function(a,tag,cls){
-			if (tag == 'div' && cls == 'bx') {
-				return '<'+tag+' class="'+cls+'" style="background:#fafafa;border:1px dotted #999;margin:1em 0;padding:0 2em">';
-			} else if (tag == 'blockquote' && cls == 'bq') {
-				return '<'+tag+' class="'+cls+'" style="border-left:3px solid #ccc;margin:1em 0;padding-left:1em">';
-			}
-			return a;
-		});
-	}
-};
-
-// auto_br
-var auto_br = {
-	'br2ln' : function(code) {
-		return code.replace(/<br ?\/?>/ig, '\n');
-	},
-	'ln2br' : function(code) {
-		return code.replace(/(>)?[ \t]*((?:\r?\n[ \t]*)+)[ \t]*(<)?/g, function(m0,m1,m2,m3){
-			if ( !m1 || !m3 ) m2 = m2.replace(/\r?\n/g, '<br />');
-			return (m1||'')+m2+(m3||'');
-		});
-	}
-};
-
-window.editorStart_xe = editorStart_xe;
-
-})(jQuery);
-
-function editorGetAutoSavedDoc(form) {
-	var param = new Array();
-	param['mid'] = current_mid;
-	param['editor_sequence'] = form.getAttribute('editor_sequence')
-	setTimeout(function() {
-	  var response_tags = new Array("error","message","editor_sequence","title","content","document_srl");
-	  exec_xml('editor',"procEditorLoadSavedDocument", param, function(a,b,c) { editorRelKeys[param['editor_sequence']]['primary'].value = a['document_srl']; if(typeof(uploadSettingObj[param['editor_sequence']]) == 'object') editorUploadInit(uploadSettingObj[param['editor_sequence']], true); }, response_tags);
-	}, 0);
-	
-}
diff --git a/modules/editor/skins/xeed/js/xe_textarea.js b/modules/editor/skins/xeed/js/xe_textarea.js
deleted file mode 100644
index 2e188ff10..000000000
--- a/modules/editor/skins/xeed/js/xe_textarea.js
+++ /dev/null
@@ -1,41 +0,0 @@
-function editorStartTextarea(editor_sequence, content_key, primary_key) {
-    var obj = xGetElementById('editor_'+editor_sequence);
-    var use_html = xGetElementById('htm_'+editor_sequence).value;
-    obj.form.setAttribute('editor_sequence', editor_sequence);
-
-    obj.style.width = '99%';
-
-    editorRelKeys[editor_sequence] = new Array();
-    editorRelKeys[editor_sequence]["primary"] = obj.form[primary_key];
-    editorRelKeys[editor_sequence]["content"] = obj.form[content_key];
-    editorRelKeys[editor_sequence]["func"] = editorGetContentTextarea;
-
-    var content = obj.form[content_key].value;
-    if(use_html) {
-        content = content.replace(/<br([^>]*)>/ig,"\n");
-        if(use_html!='br') {
-            content = content.replace(/&lt;/g, "<");
-            content = content.replace(/&gt;/g, ">");
-            content = content.replace(/&quot;/g, '"');
-            content = content.replace(/&amp;/g, "&");
-        }
-    }
-    obj.value = content;
-}
-
-function editorGetContentTextarea(editor_sequence) {
-    var obj = xGetElementById('editor_'+editor_sequence);
-    var use_html = xGetElementById('htm_'+editor_sequence).value;
-    var content = obj.value.trim();
-    if(use_html) {
-        if(use_html!='br') {
-            content = content.replace(/&/g, "&amp;");
-            content = content.replace(/</g, "&lt;");
-            content = content.replace(/>/g, "&gt;");
-            content = content.replace(/\"/g, "&quot;");
-        }
-        content = content.replace(/(\r\n|\n)/g, "<br />");
-    }
-    return content;
-}
-
diff --git a/modules/editor/skins/xeed/js/xeed.js b/modules/editor/skins/xeed/js/xeed.js
deleted file mode 100644
index a728a7d7f..000000000
--- a/modules/editor/skins/xeed/js/xeed.js
+++ /dev/null
@@ -1,5006 +0,0 @@
-/*
- * XEED - XpressEngine WYSIWYG Editor
- * @author nhn (developers@xpressengine.com)
- */
-(function($){
-
-var d = document, fn, dp, dc,
-    rx_command = /(?:^| )@(\w+)(?: |$)/,
-	rx_block   = /^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/i,
-    invisibleCh = '\uFEFF',
-	_nt_ = 'nodeType',
-	_nn_ = 'nodeName',
-    _ps_ = 'previousSibling',
-	_ns_ = 'nextSibling',
-	_pn_ = 'parentNode',
-	_cn_ = 'childNodes',
-	_ca_ = 'commonAncestorContainer',
-	_sc_ = 'startContainer',
-	_so_ = 'startOffset',
-	_ec_ = 'endContainer',
-	_eo_ = 'endOffset',
-	_osc_ = 'oStartContainer',
-	_iso_ = 'iStartOffset',
-	_oec_ = 'oEndContainer',
-	_ieo_ = 'iEndOffset',
-	_ol_  = 'offsetLeft',
-	_xr_  = '_xeed_root',
-	rx_root = new RegExp('(?:^|\\s)'+_xr_+'(?:\\s|$)'),
-    Xeed, XHTMLT, Simple, Block, Font, Filter, EditMode, LineBreak, Resize, UndoRedo, Table, URL, AutoSave, FindReplace, Clear, DOMFix;
-
-Xeed = xe.createApp('Xeed', {
-	$textarea : null,
-	$richedit : null,
-	$toolbar  : null,
-	$root     : null,
-	_options  : null,
-	last_node : null,
-
-	/**
-	 * @brief constructor
-	 */
-	init : function(obj, options) {
-		var self=this, $obj=$(obj), $text, $edit, opts, content, plugins, i, c, tmpId;
-
-		// Options
-		opts = $.extend({
-			height : 200,
-			minHeight : 400
-		}, options);
-		this._options = opts;
-
-		// min height
-		if (opts.minHeight > opts.height) opts.minHeight = opts.height;
-
-		//
-		if ($obj.is('textarea')) {
-			$text = $obj;
-		} else {
-			$text = $obj.before('<textarea>').hide().prev().val($obj.html());
-		}
-
-		// Convert to wysiwyg editor
-		this.$textarea = $text;
-		this.$root     = $text.parent();
-		this.$richedit = this.$root.find('div.edit>div.xdcs:first');
-		this.$richedit
-			.attr('contentEditable', true)
-			.attr('id', tmpId = this.getOnetimeId())
-			.addClass(_xr_)
-			.after(this.$textarea)
-			.focus(function(event){ self.cast('ON_FOCUS', [event]) })
-			.mousedown(function(event){ self.cast('ON_MOUSEDOWN', [event]) })
-			.keydown(function(event){ self.cast('ON_KEYDOWN', [event]) });
-		this.$root.find('>div.xd').show();
-		this.$toolbar  = this.$root.find('>div.xd>div.tool');
-		this.$toolbar
-			.find('>a:first').attr('href', '#'+tmpId).end();
-
-		// legacy mode for firefox
-		try { d.execCommand('styleWithCSS', false, false); } catch(e){};
-
-		// hide all layer
-		$(document).mousedown(function(event) {
-			var $target = $(event.target);
-
-			if ($target.is('input,button')) return;
-
-			self.cast('HIDE_ALL_LAYER');
-
-			if ($target.is('div.edit')) {
-				self.cast('SET_FOCUS');
-				return false;
-			}
-		});
-
-		// focusing workaround
-		if ($.browser.opera || $.browser.msie) {
-			this.$richedit.parent()
-				.mouseover(function(){
-					var $box = $(this), $rich = self.$richedit;
-
-					if ($rich.outerHeight() < $box.height()) {
-						$rich
-							.height($box.height()-parseInt($rich.css('padding-top'))-parseInt($rich.css('padding-bottom')))
-							.mouseout(function(){ $rich.css('height', '') })
-							.focus(function(){ $rich.css('height', '') });
-					}
-				});
-		}
-
-		// button hover event
-		this.$toolbar
-		    .delegate('li.ti>button', 'mouseover', function(){ $(this[_pn_]).addClass('hover') })
-		    .delegate('li.ti>button', 'mouseout', function(){ $(this[_pn_]).removeClass('hover') });
-			
-		// window resize
-		$(window).resize(bind(this,this._onresize)).load(bind(this,this._onresize));
-		this.$toolbar.find('button.mo').click(function(){ $(this).toggleClass('mopen').nextAll('ul._overflow').toggle(); });
-
-		// register plugins
-		this.registerPlugin(new Hotkey); // Hotkey must be the first
-		this.registerPlugin(new EditMode);
-		this.registerPlugin(new Simple);
-		this.registerPlugin(new Block);
-		this.registerPlugin(new Font);
-		this.registerPlugin(new Filter);
-		this.registerPlugin(new LineBreak);
-		this.registerPlugin(new Resize);
-		this.registerPlugin(new UndoRedo);
-		this.registerPlugin(new Table);
-		this.registerPlugin(new URL);
-		this.registerPlugin(new FileUpload);
-		this.registerPlugin(new Clear);
-
-		// set content
-		if (!$.browser.msie && !$text.val()) $text.val('<br />');
-		setTimeout(function(){ self.cast('SET_CONTENT', [$text.val()]) }, 0);
-	},
-
-	/**
-	 * @brief Get option
-	 * @param key String option key
-	 * @syntax opt = oApp.getOption('keyName')
-	 * @return Variant
-	 */
-	getOption : function(key) {
-		var v = this._options[key];
-		if (is_def(v)) return v;
-	},
-
-	/**
-	 * @brief Set option
-	 * @param key String option key
-	 * @param key Variant option value
-	 * @syntax oApp.setOption('keyName', 'value')
-	 */
-	setOption : function(key, val) {
-		try { this._options[key] = val; }catch(e){};
-	},
-
-	/**
-	 * @brief Set default option
-	 * @param key String option key
-	 * @param val Default value
-	 * @syntax oApp.setDefault('key', 'defaultValue');
-	 *         oApp.setDefault({'key1':'defaultValue1', 'key2':'defaultValue2', ...});
-	 */
-	setDefault : function(key, val) {
-		var self = this;
-
-		if ($.isPlainObject(key)) {
-			$.each(key, function(k,v){ self.setDefault(k,v) });
-		} else if (is_str(key)) {
-			if (!is_def(this._options[key])) this._options[key] = val;
-		}
-	},
-
-	/**
-	 * @brief  Get current selection
-	 * @syntax oSelection = oApp.getSelection()
-	 * @return HuskyRange
-	 * @see    getEmptySelection
-	 */
-	getSelection : function() {
-		var range = this.getEmptySelection(), xr = '.'+_xr_, $p;
-
-		// this may throw an exception if the selected is area is not yet shown
-		try{ range.setFromSelection(); }catch(e){ return null; };
-		//range.setFromSelection();
-
-		$p = $(range[_ca_]);
-		if ( $p.is(xr) || $p.parents(xr+':first').length ) return range;
-	},
-
-	/**
-	 * @brief  Get empty selection
-	 * @syntax oSelection = oApp.getEmptySelection()
-	 * @return HuskyRange
-	 * @see    getSelection
-	 */
-	getEmptySelection : function() {
-		return new HuskyRange();
-	},
-
-	checkCurrentNode : function(sel) {
-		var _sel = sel || this.getSelection(), sc;
-
-		if (!_sel) {
-			this.last_node = null;
-			return false;
-		}
-
-		sc = _sel[_sc_];
-		if (sc !== this.last_node) {
-			this.last_node = sc;
-			this.cast('ON_CHANGE_NODE', [sc]);
-		}
-	},
-
-	getOnetimeId : function() {
-		return 'xeed' + Math.ceil(Math.random() * 1000) + (''+(new Date).getTime()).substr(8);
-	},
-
-	/**
-	 * @brief Fake interface for editor_common.js
-	 */
-	getFrame : function(seq) {
-		var self = this;
-
-		return {
-			editor_sequence : seq,
-			getSelectedHTML : function(){},
-			setFocus    : function(){ self.cast('SET_FOCUS');  },
-			replaceHTML : function(html){ self.cast('PASTE_HTML', [html]) }
-		};
-	},
-	
-	_onresize : function() {
-		var $tb = this.$toolbar, $t1 = $tb.find('>.t1'), $t2 = $tb.find('>.t2'), $t1_mo, $t2_mo, $t1_ul, base_top;
-
-		if ($t1.length && ($t1_ul=$t1.find('>ul')).length) {
-			base_top = $t1_ul.removeClass('_overflow').show().get(0).offsetTop;
-			$t1_mo   = $t1.find('>button.mo').hide();
-			$.each($t1.find('>ul').get().reverse(), function(){
-				if (this.offsetTop > base_top) {
-					$(this).addClass('_overflow').hide();
-					$t1_mo.show();
-				}
-			});
-		}
-
-		base_top = $t2.find('>ul').removeClass('_overflow').show().get(0).offsetTop;
-		$t2_mo = $t2.find('>button.mo').hide();
-		$.each($t2.find('>ul').get().reverse(), function(){
-			if (this.offsetTop > base_top) {
-				$(this).addClass('_overflow').hide();
-				$t2_mo.show();
-			}
-		});
-	},
-
-	/**
-	 * @brief Get an HTML code of the content
-	 * @param Reserved slot for html code
-	 * @param Force getting content from rich editor
-	 * @return html string
-	 */
-	API_GET_CONTENT : function(sender, params) {
-		return params[0];
-	},
-
-	API_BEFORE_GET_CONTENT : function(sender, params) {
-		var force = params[1];
-
-		if (force || this.$richedit.is(':visible')) {
-			params[0] = this.$richedit.html();
-		} else {
-			params[0] = this.$textarea.val();
-		}
-	},
-
-	/**
-	 * @brief Set rich content from  HTML code
-	 * @param html The HTML code string
-	 *
-	 * Since WebKit has a bug related to content-editable attribute,
-	 * toggle action doesn't work for some inline style such as bold, itailc and so on.
-	 * As a workaround, I used manually appending DOM objects instead of setting html.
-	 */
-	API_SET_CONTENT : function(sender, params) {
-		// If the rich editor is hidden, put the content into the textarea too.
-		if (this.$richedit.is(':hidden')) {
-			this.$textarea.val(params[0]);
-		} else {
-			this.$richedit.html(params[0]);
-		}
-	},
-
-	/**
-	 * @brief Paste html code
-	 *
-	 */
-	API_PASTE_HTML : function(sender, params) {
-		var html = params[0], sel = this.getSelection();
-
-		if (sel) sel.pasteHTML(html);
-	},
-
-	/**
-	 * @brief Execute a command
-	 * @param command String that specifies the command to execute.
-	 * @param ui      When this value is true, display a user interface if the command supports one. (Default : false)
-	 * @param value   Optional. Variant that specifies the string, number, or other value to assign.
-	 */
-	API_EXEC_COMMAND : function(sender, params) {
-		var command = params[0], ui = params[1], value = params[2], sel = this.getSelection();
-
-		if (sel) {
-			d.execCommand(command, ui, value);
-			this.cast('SAVE_UNDO_POINT');
-			this.checkCurrentNode(sel);
-		}
-	},
-
-	/**
-	 * @brief Register a command
-	 * @param selector A selector to find the component or a DOM object
-	 * @param hotkey   Hotkey string
-	 * @param command  Command string
-	 * @param arg      Array for arguments
-	 */
-	API_REGISTER_COMMAND : function(sender, params) {
-		var self = this, $btn, selector = params[0], hotkey = params[1], cmd = params[2], args = params[3], _sel;
-
-		function fn(){
-			if (_sel) {
-				try { _sel.select(); } catch(e){ };
-			}
-
-			self.cast('HIDE_ALL_LAYER');
-			self.cast(cmd, args);
-			return false;
-		}
-
-		// register hotkey
-		if (hotkey) this.cast('REGISTER_HOTKEY', [hotkey, fn]);
-
-		// ui event
-		if (selector) {
-			($btn = is_str(selector)?this.$toolbar.find(selector):$(selector)).click(fn);
-
-			if ($btn[0] && $.browser.msie) {
-				$btn.mousedown(function(){ _sel = self.getSelection(); return false; });
-			}
-		}
-	},
-
-	/**
-	 * @brief Unregister a command
-	 * @param selector A selector to find the component or a DOM object
-	 * @param hotkey   Hotkey string
-	 */
-	API_UNREGISTER_COMMAND : function(sender, params) {
-		var selector = params[0], hotkey = params[1];
-
-		// unregister hotkey
-		if (hotkey) this.cast('UNREGISTER_HOTKEY', [hotkey]);
-
-		// unregister ui event
-		if (selector) {
-			($btn = is_str(selector)?this.$toolbar.find(selector):$(selector)).unbind('click');
-		}
-	},
-
-	/**
-	 * @brief Set state of a command button
-	 * @param selector A selector to find the component or a DOM object
-	 * @param state    State string such as 'disable', 'active' or 'normal'
-	 */
-	API_SET_COMMAND_STATE : function(sender, params) {
-		var $btn, $li, selector = params[0], state = params[1];
-
-		$btn = is_str(selector)?this.$toolbar.find(selector):$(selector);
-
-		if (!$btn[0]) return;
-		if ($.inArray(state, ['disable', 'active']) == -1) state = 'normal';
-
-		$li = $btn.parent('li').removeClass('disable active');
-
-		if (state != 'normal') $li.addClass(state);
-	},
-
-	/**
-	 * @brief Set focus
-	 */
-	API_SET_FOCUS : function(sender, params) {
-		var self = this, sel = this.getSelection();
-
-		if (sel) return;
-		if (!$.browser.msie && !this.$richedit.html()) this.cast('SET_CONTENT', ['<br />']);
-
-		this.$richedit.focus();
-	},
-
-	/**
-	 * @brief Fire event on keydown
-	 * @param event object
-	 */
-	API_ON_KEYDOWN : function(sender, params) {
-		var timer = arguments.callee.timer;
-
-		if (timer) clearTimeout(timer);
-		arguments.callee.timer  = setTimeout(bind(this, this.checkCurrentNode), 100);
-	},
-
-	/**
-	 * @brief Fire event on mousedown
-	 * @param event object
-	 */
-	API_ON_MOUSEDOWN : function(sender, params) {
-		setTimeout(bind(this, this.checkCurrentNode), 0);
-	},
-
-	/**
-	 * @brief Fire event on focus
-	 * @param event object
-	 */
-	API_ON_FOCUS : function(sender, params) {
-		setTimeout(bind(this, this.checkCurrentNode), 0);
-	},
-
-	/**
-	 * @brief Hide all layer
-	 * @param Layer to skip hiding
-	 */
-	// API_HIDE_ALL_LAYER : function(sender, params) { },
-
-	/**
-	 * @brief Fire event on change current node
-	 * @oaram Current selection
-	 */
-	// API_ON_CHANGE_NODE : function(sender, params) { },
-
-	end : 0 // just mark end point of the definition
-});
-
-/**
- * {{{ Simple Command plugin
- * This plugin handle simple commands such as bold, italic and underline
- */
-Simple = xe.createPlugin('SimpleCommand', {
-	$btns : {},
-	cmd   : {
-		bold      : ['bd', 'ctrl+b'],
-		underline : ['ue', 'ctrl+u'],
-		italic    : ['ic', 'ctrl+i'],
-		strikethrough : ['se'],
-		superscript   : ['sp'],
-		subscript     : ['sb'],
-		justifyleft   : ['al'],
-		justifycenter : ['ac'],
-		justifyright  : ['ar'],
-		justifyfull   : ['aj'],
-		insertorderedlist : ['ol'],
-		insertunorderedlist : ['ul']
-	},
-
-	// constructor
-	init : function() {
-		this.$btns = {};
-	},
-
-	// on activate
-	activate : function() {
-		var self = this, app, $tb, classes = [];
-
-		// skip this code if there is no toolbar
-		if (!(app=this.oApp) || !($tb=app.$toolbar) || !$tb.length) return;
-
-		// register commands
-		$.each(this.cmd, function(cmd) {
-			var $btn = $tb.find('button.'+this[0]);
-
-			if ($btn[0]) {
-				self.$btns[cmd] = $btn;
-				self.cast('REGISTER_COMMAND', [$btn[0], this[1], 'EXEC_COMMAND', [cmd, false, false]]);
-			}
-		});
-	},
-
-	// on deactivate
-	deactivate : function() {
-		var self = this;
-
-		$.each(this.cmd, function(cmd) {
-			if (!self.$btns[cmd]) return;
-			self.cast('UNREGISTER_COMMAND', [self.$btns[this[0]], this[1]]);
-		});
-
-		// empty button list
-		self.$btns = {};
-	},
-
-	API_ON_CHANGE_NODE : function(sender, params) {
-		var self = this, node = params[0];
-
-		if (!node) {
-			$.each(this.$btns, function(cmd, $btn){
-				self.cast('SET_COMMAND_STATE', [$btn[0], 'disable']);
-			});
-			return;
-		}
-
-		$.each(this.$btns, function(cmd, $btn){
-			var state = 'disable';
-
-			if (node && d.queryCommandEnabled(cmd)) {
-				state = d.queryCommandState(cmd)?'active':'normal';
-			}
-
-			self.cast('SET_COMMAND_STATE', [$btn[0], state]);
-		});
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Block Command Plugin
- * @brief This plugin handles some block commands such as Heading, Quote, Indent, Outdent, Box and LineHeight.
- */
-Block = xe.createPlugin('BlockCommand', {
-	$head_btn : null,
-	$line_btn : null,
-	$head_layer : null,
-	$line_layer : null,
-	$btns       : {},
-	cmd  : {indent:'id',outdent:'od',quote:'qm',box:'bx'},
-	init : function() {
-		this.$btns = {};
-	},
-	activate : function() {
-		var self = this, app = this.oApp, $tb = app.$toolbar, $li, np = navigator.platform, i, c, lines;
-
-		if (!$tb) return;
-
-		// heading
-		this.$head_btn   = $tb.find('li.hx:first>button').mousedown(function(){ self.cast('TOGGLE_HEADING_LAYER'); return false; })
-		this.$head_layer = this.$head_btn.next('ul.lr')
-			.find('>li>button')
-				.hover(
-					function(){ $(this[_pn_]).addClass('hover') },
-					function(){ $(this[_pn_]).removeClass('hover') }
-				)
-				.each(function(){
-					var $this = $(this), num;
-					if (!/(?:^|\s)h([1-7])(?:\s|$)/i.test($this.parent().attr('class'))) return true;
-
-					num = RegExp.$1;
-					if (np && !np.indexOf('Mac')) $this.attr('title', 'Ctrl+Command+'+num);
-					else $this.attr('title', 'Ctrl+'+num);
-
-					self.cast('REGISTER_COMMAND', [this, 'ctrl+'+num, 'EXEC_HEADING', [num]]);
-				})
-				.end();
-
-		// line-height
-		this.$line_btn   = $tb.find('li.lh:first>button').mousedown(function(){ self.cast('TOGGLE_LINEHEIGHT_LAYER'); return false; });
-		this.$line_layer = this.$line_btn.next('ul.lr');
-		lines = ($li=this.$line_layer.find('>li').remove()).text().split(';');
-		for(i=0, c=lines.length; i < c; i++) {
-			this.$line_layer.append( $li.clone(true).find('>button').text(lines[i]).end() );
-		}
-		this.$line_layer
-			.find('>li>button')
-				.hover(
-					function(){ $(this[_pn_]).addClass('hover') },
-					function(){ $(this[_pn_]).removeClass('hover') }
-				)
-				.click(function(){
-					self.cast('EXEC_LINEHEIGHT', [$(this).text()]);
-					self.cast('HIDE_LINEHEIGHT_LAYER');
-					return false;
-				})
-				.end();
-
-		// quote, box, indent, outdent
-		$.each(this.cmd, function(key,val){
-			var $btn = $tb.find('button.'+val);
-
-			if (!$btn[0]) return;
-
-			self.$btns[val] = $btn;
-			self.cast('REGISTER_COMMAND', [$btn[0], '', 'EXEC_'+key.toUpperCase()]);
-		});
-	},
-	deactivate : function() {
-		var self = this, $tb = this.oApp.$toolbar, $layer = this.$head_layer, sels = [];
-
-		if (!$tb) return;
-
-		// headings
-		$tb.find('li.hx:first>button:first').unbind('mousedown');
-		if ($layer && $layer.length) {
-			$layer.find('>li').unbind();
-			this.$head_layer = null;
-		}
-
-		// quote, box, indent, outdent
-		$.each(this.$btns, function(key){
-			self.cast('UNREGISTER_COMMAND', [this[0]]);
-		});
-	},
-	getBlockParents : function() {
-		var sel = this.oApp.getSelection(), re = this.oApp.$richedit[0], ret = [], sc, ec, sp, ep, ca, ls, le;
-
-		if (!sel) return;
-		
-		function lineStopper(node){
-			return (is_block(node) || node[_nn_].toLowerCase() == 'br');
-		};
-		
-		function splitFrom(node, prev) {
-			var s = prev?_ps_:_ns_, nds, $pn, $cn, del=1;
-
-			if (rx_root.test(node[_pn_].className) && !is_block(node)) {
-				nds = siblings(node, 1);
-				nds.push(node);
-				nds = nds.concat(siblings(node, 0));
-
-				$(nds[0]).before($cn=$('<div />'));
-				$cn.append(nds);
-				$cn = null;
-			}
-
-			while(node !== ca && !rx_root(node[_pn_].className)) {
-				if (node[s]) {
-					if (del) del = 0;
-					nds = siblings(node, prev, function(){ return 0 });
-
-					$pn = $(node[_pn_]);
-					$cn = $pn.clone().empty();
-
-					$pn[prev?'before':'after']($cn);
-					$cn.append(nds);
-				}
-
-				node = node[_pn_];
-			}
-
-			if ($cn && del) $cn.remove();
-		};
-
-		ca = get_block_parent(sel[_ca_]);
-		sc = sel[_sc_]; sp = get_block_parent(sc); sc = get_child(sc, sp);
-		ec = sel[_ec_]; ep = get_block_parent(ec); ec = get_child(ec, ep);
-
-		// find line start
-		ls = siblings(sc, 1, lineStopper).shift() || sc;
-		if (ls[_ps_] && ls[_ps_][_nn_].toLowerCase() == 'br') $(ls[_ps_]).remove();
-		splitFrom(ls, 1);
-
-		// find line end
-		le = siblings(ec, 0, lineStopper).pop() || ec;
-		if (le[_ns_] && le[_ns_][_nn_].toLowerCase() == 'br') $(le[_ns_]).remove();
-		splitFrom(le, 0);
-
-		sc = get_block_parent(get_child(ls, ca));
-		ec = get_block_parent(get_child(le, ca));
-		
-		ret = [sc];
-
-		if (sc !== ec) {
-			ret = ret.concat(siblings(sc, 0, function(nd){ return (nd !== ec) }));
-		}
-
-		return ret;
-	
-	},
-	match : function(node, selector) {
-		var $node = $(node);
-
-		if ($node.is(selector)) {
-			return $node[0];
-		} else {
-			$node = $node.parentsUntil('.'+_xr_).filter(selector);
-			if ($node.length) return $node[0];
-		}
-	},
-	unwrap : function(node) {
-		var $node = $(node), $wrapper;
-
-		$node.contents().each(function(){
-			if(rx_block.test(this[_nn_])) {
-				$wrapper = 0;
-			} else {
-				if (!$wrapper) $wrapper = $(this).wrap('<p>').parent();
-				else $wrapper.append(this);
-			}
-		});
-		$node.children().unwrap();
-	},
-	fireChangeNode : function(sel) {
-		var self = this, _sel = sel || this.oApp.getSelection();
-
-		setTimeout(function(){
-			if (_sel && _sel[_sc_]) self.cast('ON_CHANGE_NODE', [_sel[_sc_]])
-		}, 0);
-	},
-	/**
-	 * @brief Quotes selection
-	 */
-	API_EXEC_QUOTE : function(sender, params) {
-		var self = this, sel = this.oApp.getSelection(), start, end, ancestor, match, $bq, _bq_ = 'blockquote.bq';
-
-		if (!sel) return false;
-
-		start = sel.getStartNode();
-		match = this.match(start, _bq_);
-
-		if (match) {
-			this.unwrap(match);
-			sel.select();
-			this.fireChangeNode(sel);
-			return;
-		}
-
-		// get block-level common ancestor
-		ancestor = sel.commonAncestorContainer;
-		start    = get_valid_parent(get_block_parent(get_child(start, ancestor)), 'blockquote');
-		end      = sel.collapsed?start:get_child(sel.getEndNode(), start[_pn_]);
-
-		// remove quote blocks in a selection
-		$(sel.getNodes()).filter(_bq_).each(function(){ self.unwrap(this) });
-
-		// wrap nodes with new <blockquote>
-		if (start == end && /^(div|p)$/i.test(start[_nn_])) {
-			$bq = $(start).wrapInner('<blockquote class="bq" />').children().unwrap();
-		} else {
-			$bq = $(start).wrap('<blockquote class="bq" />').parent();
-			if (start != end) {
-				$bq.append($(end).prevUntil(_bq_).toArray().reverse()).append(end);
-			}
-		}
-
-		sel.select();
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-
-		this.fireChangeNode(sel);
-	},
-	/**
-	 * @brief
-	 */
-	API_EXEC_BOX : function(sender, params) {
-		var self = this, sel = this.oApp.getSelection(), start, end, ancestor, match, $bx, _bx_ = 'div.bx';
-
-		if (!sel) return false;
-
-		start = sel.getStartNode();
-		match = this.match(start, _bx_);
-
-		if (match) {
-			this.unwrap(match);
-			sel.select();
-			this.fireChangeNode(sel);
-			return;
-		}
-
-		// get block-level common ancestor
-		ancestor = sel.commonAncestorContainer;
-		start    = get_valid_parent(get_block_parent(get_child(start, ancestor)), 'div');
-		end      = sel.collapsed?start:get_child(sel.getEndNode(), start[_pn_]);
-
-		// remove box in a selection
-		$(sel.getNodes()).filter(_bx_).each(function(){ self.unwrap(this) });
-
-		// wrap nodes with new <div>
-		if (start == end && /^(div|p)$/i.test(start[_nn_])) {
-			$bq = $(start).wrapInner('<div class="bx" />').children().unwrap();
-		} else {
-			$bq = $(start).wrap('<div class="bx" />').parent();
-			if (start != end) $bq.append($(end).prevUntil(_bx_).toArray().reverse()).append(end);
-		}
-
-		sel.select();
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-
-		this.fireChangeNode(sel);
-	},
-	API_EXEC_INDENT : function(sender, params) {
-		var sel = this.oApp.getSelection(), parents = this.getBlockParents();
-
-		$(parents).each(function(){
-			var $this = $(this), left = parseInt($this.css('margin-left'), 10);
-
-			left = isNaN(left)?30:left+30;
-
-			$this.css('margin-left', left+'px');
-		});
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-
-		this.fireChangeNode();
-		try { sel.select() } catch(e){};
-	},
-	API_EXEC_OUTDENT : function(sender, params) {
-		var sel = this.oApp.getSelection(), parents = this.getBlockParents();
-
-		$(parents).each(function(){
-			var $this = $(this), left = parseInt($this.css('margin-left'), 10);
-
-			left = Math.max(isNaN(left)?0:left-30, 0);
-			left = left?left+'px':'';
-
-			$this.css('margin-left', left);
-
-			if (!$this.attr('style')) $this.removeAttr('style');
-		});
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-
-		this.fireChangeNode();
-		try { sel.select() } catch(e){};
-	},
-	/**
-	 * @brief
-	 * @param Number indicates heading level.
-	 */
-	API_EXEC_HEADING : function(sender, params) {
-		var sel = this.oApp.getSelection(), nodes, n, i, c, $node, first, end;
-
-		if (!sel) return false;
-
-		nodes = this.getBlockParents();
-		console.log(nodes);
-		n     = parseInt(params[0], 10);
-
-		for(i=0,c=nodes.length; i<c; i++) {
-			$node = $(nodes[i]).wrapInner((n&&n<7)?'<h'+n+'>':'<p>');
-
-			if (!$node.is('td,th,li')) $node = $node.children(0).unwrap();
-			if (!first) first = $node[0];
-		}
-
-		end = $node[0];
-		if (first == end) {
-			sel.selectNode(first);
-		} else {
-			sel.setStartBefore(first);
-			sel.setEndAfter(end);
-		}
-
-		sel.select();
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-
-		this.fireChangeNode(sel);
-	},
-	/**
-	 * @brief Shows the heading options layer
-	 */
-	API_SHOW_HEADING_LAYER : function(sender, params) {
-		var $layer = this.$head_layer;
-
-		if (!$layer || $layer.hasClass('open')) return;
-
-		$layer.addClass('open').parent('li').addClass('active');
-
-		this.cast('HIDE_ALL_LAYER', [$layer[0]]);
-	},
-	/**
-	 * @brief Hides the heading options layer
-	 */
-	API_HIDE_HEADING_LAYER : function(sender, params) {
-		var $layer = this.$head_layer;
-
-		if (!$layer || !$layer.hasClass('open')) return;
-
-		$layer.removeClass('open').parent('li').removeClass('active');
-	},
-	/**
-	 * @brief Toggle the haeding options layer
-	 */
-	API_TOGGLE_HEADING_LAYER : function(sender, params) {
-		if (!this.$head_layer) return;
-		if (this.$head_layer.hasClass('open')) {
-			this.cast('HIDE_HEADING_LAYER');
-		} else {
-			this.cast('SHOW_HEADING_LAYER');
-		}
-	},
-	API_EXEC_LINEHEIGHT : function(sender, params) {
-		var sel = this.oApp.getSelection(), nodes;
-
-		if (!sel) return;
-
-		nodes = this.getBlockParents();
-		$(nodes).css('line-height', params[0]);
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-
-		this.fireChangeNode(sel);
-	},
-	API_SHOW_LINEHEIGHT_LAYER : function(sender, params) {
-		var $layer = this.$line_layer;
-
-		if (!$layer || $layer.hasClass('open')) return;
-
-		$layer.addClass('open').parent('li').addClass('active');
-
-		this.cast('HIDE_ALL_LAYER', [$layer[0]]);
-	},
-	API_HIDE_LINEHEIGHT_LAYER : function(sender, params) {
-		var $layer = this.$line_layer;
-
-		if (!$layer || !$layer.hasClass('open')) return;
-
-		$layer.removeClass('open').parent('li').removeClass('active');
-	},
-	API_TOGGLE_LINEHEIGHT_LAYER : function(sender, params) {
-		if (!this.$line_layer) return;
-		if (this.$line_layer.hasClass('open')) {
-			this.cast('HIDE_LINEHEIGHT_LAYER');
-		} else {
-			this.cast('SHOW_LINEHEIGHT_LAYER');
-		}
-	},
-	/**
-	 * @brief Hides All layer
-	 */
-	API_HIDE_ALL_LAYER : function(sender, params) {
-		if (this.$head_layer && this.$head_layer[0] != params[0]) this.cast('HIDE_HEADING_LAYER');
-		if (this.$line_layer && this.$line_layer[0] != params[0]) this.cast('HIDE_LINEHEIGHT_LAYER');
-	},
-	API_ON_CHANGE_NODE : function(sender, params) {
-		var self=this, node = params[0], state = {}, $nodes, $node, i, ml;
-
-		if (!node) {
-			$.each(this.$btns, function(key){
-				self.cast('SET_COMMAND_STATE', [this[0], 'disable']);
-			});
-			return;
-		}
-
-		state.qm = state.bx = state.id = 'normal';
-		state.od = 'disable';
-
-		$nodes = $(node).parentsUntil('.'+_xr_).andSelf();
-
-		for(i = $nodes.length-1; i > -1  ; i--) {
-			if (!is_block($nodes[i])) continue;
-
-			$node = $nodes.eq(i);
-
-			if ($node.is('blockquote.bq')) state.qm = 'active';
-			else if ($node.is('div.bx')) state.bx = 'active';
-
-			if (state.od == 'disable' && (ml = $node.css('margin-left')) && !isNaN(ml=parseInt(ml)) && ml > 0) state.od = 'normal';
-		}
-
-		$.each(this.$btns, function(key) {
-			self.cast('SET_COMMAND_STATE', [this[0], state[key]]);
-		});
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Font Plugin
- * @brief Set font name, size and color
- */
-Font = xe.createPlugin('Font', {
-	_fn       : {},
-	rx_color  : /^(#([0-9a-f]{3}|[0-9a-f]{6})|rgb\( *\d{1,3} *, *\d{1,3} *, *\d{1,3} *\))$/i,
-	selection : null, // preserved selection
-	$ff_layer : null, // font famliy layer
-	$fs_layer : null, // font size layer
-	$fc_layer : null, // font color layer
-	$bc_layer : null, // background color layer
-	$ff_btn   : null,
-	$fs_btn   : null,
-	$fc_btn   : null,
-	$bc_btn   : null,
-
-	init : function() {
-		var self = this;
-
-		this._fn = {
-			ff : function(){ self.cast('TOGGLE_FONTFAMILY_LAYER'); return false; },
-			fs : function(){ self.cast('TOGGLE_FONTSIZE_LAYER'); return false; },
-			hover : function(){ $(this).parent().addClass('hover'); return false; },
-			out   : function(){ $(this).parent().removeClass('hover'); return false; }
-		};
-	},
-	activate : function() {
-		var self = this, $tb = this.oApp.$toolbar, $tmp, $clone, $pv, $col, $bgcol, col, bgcol, fs, i, c, _bc_ = 'background-color';
-
-		// buttons
-		this.$ff_btn = $tb.find('li.ff > button:first').mousedown(this._fn.ff);
-		this.$fs_btn = $tb.find('li.fs > button:first').mousedown(this._fn.fs);
-		this.$fc_btn = $tb.find('li.cr.fc > button')
-			.eq(0).mousedown(function(){ self.cast('EXEC_FONTCOLOR', [$(this).css('background-color')]); return false; }).end()
-			.eq(1).mousedown(function(){ self.cast('TOGGLE_FONTCOLOR_LAYER'); return false; }).end();
-		this.$bc_btn = $tb.find('li.cr.bc > button')
-			.eq(0).mousedown(function(){ self.cast('EXEC_FONTBGCOLOR', [$(this).css('background-color')]); return false; }).end()
-			.eq(1).mousedown(function(){ self.cast('TOGGLE_BGCOLOR_LAYER'); return false; }).end();
-
-		// layers
-		this.$ff_layer = this.$ff_btn.next('.lr');
-		this.$fs_layer = this.$fs_btn.next('.lr');
-		this.$fc_layer = this.$fc_btn.next('.lr').mousedown(function(event){ event.stopPropagation() });
-		this.$bc_layer = this.$bc_btn.next('.lr').mousedown(function(event){ event.stopPropagation() });
-
-		// font-family items
-		this.$ff_layer.find('button')
-			.hover(this._fn.hover, this._fn.out)
-			.click(function(){
-				self.cast('EXEC_FONTFAMILY', [$(this).css('font-family')]);
-				self.cast('HIDE_FONTFAMILY_LAYER');
-				return false;
-			});
-
-		// font-size items
-		$tmp = this.$fs_layer.find('>li').remove();
-		fs   = $tmp.text().split(';');
-		for(i=0, c=fs.length; i < c; i++) {
-			this.$fs_layer.append( $tmp.clone(true).find('>button').css('font-size', fs[i]).text(fs[i]).end() );
-		}
-		this.$fs_layer.find('button')
-			.hover(this._fn.hover, this._fn.out)
-			.click(function(){
-				self.cast('EXEC_FONTSIZE', [$(this).css('font-size')]);
-				self.cast('HIDE_FONTSIZE_LAYER');
-				return false;
-			});
-
-		// color items
-		$tb.find('li.cr')
-			.find('ul.ct,ul.cx')
-				.each(function(){
-
-					var $this = $(this), $li = $this.find('>li').remove(), $clone_li, $span, $btn, colors,i,c,types;
-
-					colors = $li.text().split(';');
-					for(i=0,c=colors.length; i < c; i++) {
-						types = $.trim(colors[i]).split(':');
-						$clone_li = $li.clone(true);
-						$btn  = $clone_li.find('>button');
-						$span = $btn.find('>span');
-
-						(($span.length)?$span:$btn).text('#'+types[0]);
-
-						$btn.css('backgroundColor', '#'+types[0]);
-						if (types[1]) $btn.css('color', '#'+types[1]);
-
-						$this.append($clone_li);
-					}
-				})
-				.end()
-			.filter('.fc').find('li > button')
-				.mousedown(function(){
-					self.cast('EXEC_FONTCOLOR', [$(this).css('background-color'), true]);
-					self.cast('HIDE_FONTCOLOR_LAYER');
-					return false;
-				})
-				.end().end()
-			.filter('.bc').find('li > button')
-				.mousedown(function(){
-					self.cast('EXEC_FONTBGCOLOR', [$(this).css('background-color'), true]);
-					self.cast('HIDE_BGCOLOR_LAYER');
-					return false;
-				});
-	},
-	deactivate : function() {
-		this.$ff_btn.unbind('mousedown');
-		this.$fs_btn.unbind('mousedown');
-		this.$fc_btn.unbind('mousedown');
-		this.$bc_btn.unbind('mousedown');
-
-		this.$ff_layer.find('button').unbind();
-		this.$fs_layer.find('button').unbind();
-		this.$fc_layer.find('button').unbind();
-		this.$bc_layer.find('button').unbind();
-	},
-	showLayer : function($layer) {
-		if (!$layer || $layer.hasClass('open')) return;
-
-		$layer.addClass('open').parent('li').addClass('active');
-
-		this.cast('HIDE_ALL_LAYER', [$layer[0]]);
-	},
-	hideLayer : function($layer) {
-		if (!$layer || !$layer.hasClass('open')) return;
-
-		$layer.removeClass('open').parent('li').removeClass('active');
-	},
-	toggleLayer : function($layer, api) {
-		if (!$layer) return;
-		if ($layer.hasClass('open')) {
-			this.cast('HIDE_'+api+'_LAYER');
-		} else {
-			this.cast('SHOW_'+api+'_LAYER');
-		}
-	},
-	toHex : function(col) {
-		var regNoSharp, regRGB;
-
-		regNoSharp = /^([0-9A-F]{3}|[0-9A-F]{6})$/i;
-		regRGB     = /^rgb\s*\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)$/i;
-
-		function fixed(num, count) {
-			var str = num + '';
-
-			while(str.length < count) str = '0' + str;
-
-			return str;
-		};
-
-		if (regNoSharp.test(col)) {
-			col = '#'+col;
-		} else if (regRGB.test(col)) {
-			col = '#'+fixed((+RegExp.$1).toString(16),2)+fixed((+RegExp.$2).toString(16),2)+fixed((+RegExp.$3).toString(16),2);
-		}
-
-		return col;
-	},
-	/**
-	 * @brief Set font size
-	 * @param Number indicates font size in pixel
-	 */
-	API_EXEC_FONTSIZE : function(sender, params) {
-		if(!params[0]) return;
-
-		this.cast('EXEC_FONTSTYLE', [{fontSize:params[0]}]);
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	/**
-	 * @brief Set font family
-	 * @param String indicates font family
-	 */
-	API_EXEC_FONTFAMILY : function(sender, params) {
-		if(!params[0]) return;
-
-		this.cast('EXEC_FONTSTYLE', [{fontFamily:params[0]}]);
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	/**
-	 * @brief Set font color
-	 * @param String indicates color
-	 * @param Bool
-	 */
-	API_EXEC_FONTCOLOR : function(sender, params) {
-		if(!params[0]) return;
-
-		this.cast('EXEC_FONTSTYLE', [{color:params[0]}]);
-		if(params[1]) this.$fc_btn.eq(0).css('background-color', params[0]);
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	/**
-	 * @breif Set font background color
-	 * @param String indicates background color
-	 * @param Bool
-	 */
-	API_EXEC_FONTBGCOLOR : function(sender, params) {
-		if(!params[0]) return;
-
-		this.cast('EXEC_FONTSTYLE', [{backgroundColor:params[0]}]);
-		if(params[1]) this.$bc_btn.eq(0).css('background-color', params[0]);
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	/**
-	 * @brief Set font style
-	 * @param styles Styling information
-	 */
-	API_EXEC_FONTSTYLE : function(sender, params) {
-		var sel = this.oApp.getSelection(), styles = params[0], span, val;
-		
-		if(!sel) return;
-		if(sel.collapsed) {
-		}
-
-		sel.styleRange(styles);
-		this.oApp.$richedit.focus();
-		sel.select();
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	/**
-	 * @brief Show fontfamily layer
-	 */
-	API_SHOW_FONTFAMILY_LAYER : function(sender, params) {
-		this.showLayer(this.$ff_layer);
-	},
-	/**
-	 * @brief Hide fontfamily layer
-	 */
-	API_HIDE_FONTFAMILY_LAYER : function(sender, params) {
-		this.hideLayer(this.$ff_layer);
-	},
-	/**
-	 * @brief Toggle fontfamily layer
-	 */
-	API_TOGGLE_FONTFAMILY_LAYER : function(sender, params) {
-		this.toggleLayer(this.$ff_layer, 'FONTFAMILY');
-	},
-	/**
-	 * @brief Show fontsize layer
-	 */
-	API_SHOW_FONTSIZE_LAYER : function(sender, params) {
-		this.showLayer(this.$fs_layer);
-	},
-	/**
-	 * @brief Hide fontsize layer
-	 */
-	API_HIDE_FONTSIZE_LAYER : function(sender, params) {
-		this.hideLayer(this.$fs_layer);
-	},
-	/**
-	 * @brief Toggle fontsize layer
-	 */
-	API_TOGGLE_FONTSIZE_LAYER : function(sender, params) {
-		this.toggleLayer(this.$fs_layer, 'FONTSIZE');
-	},
-	/**
-	 * @brief Show fontcolor layer
-	 */
-	API_SHOW_FONTCOLOR_LAYER : function(sender, params) {
-		this.showLayer(this.$fc_layer);
-	},
-	/**
-	 * @brief Hide fontcolor layer
-	 */
-	API_HIDE_FONTCOLOR_LAYER : function(sender, params) {
-		this.hideLayer(this.$fc_layer);
-	},
-	/**
-	 * @brief Toggle fontcolor layer
-	 */
-	API_TOGGLE_FONTCOLOR_LAYER : function(sender, params) {
-		this.toggleLayer(this.$fc_layer, 'FONTCOLOR');
-	},
-	/**
-	 * @brief Show bgcolor layer
-	 */
-	API_SHOW_BGCOLOR_LAYER : function(sender, params) {
-		this.showLayer(this.$bc_layer);
-	},
-	/**
-	 * @brief Hide bgcolor layer
-	 */
-	API_HIDE_BGCOLOR_LAYER : function(sender, params) {
-		this.hideLayer(this.$bc_layer);
-	},
-	/**
-	 * @brief Toggle bgcolor layer
-	 */
-	API_TOGGLE_BGCOLOR_LAYER : function(sender, params) {
-		this.toggleLayer(this.$bc_layer, 'BGCOLOR');
-	},
-	API_HIDE_ALL_LAYER : function(sender, params) {
-		var $ff = this.$ff_layer, $fs = this.$fs_layer, $fc = this.$fc_layer, $bc = this.$bc_layer, except = params[0];
-
-		if ($ff && $ff[0] != except) this.cast('HIDE_FONTFAMILY_LAYER');
-		if ($fs && $fs[0] != except) this.cast('HIDE_FONTSIZE_LAYER');
-		if ($fc && $fc[0] != except) this.cast('HIDE_FONTCOLOR_LAYER');
-		if ($bc && $bc[0] != except) this.cast('HIDE_BGCOLOR_LAYER');
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ LineBreak plugin
- * @brief Insert <br> or wrap the block with <p> when return key is pressed.
- */
-LineBreak = xe.createPlugin('LineBreak', {
-	_fn : null,
-	_br_timer : null,
-	_in_br    : false,
-
-	init : function(){
-		this._fn = bind(this, this.keydown);
-	},
-	activate : function() {
-		this.oApp.$richedit.keydown(this._fn);
-
-		// If you pres Enter key, <br> will be inserted by default.
-		this.oApp.setDefault('force_br', true);
-	},
-	deactivate : function() {
-		this.oApp.$richedit.unbind('keydown', this._fn);
-	},
-	keydown : function(event) {
-		var sel, sc, ec;
-
-		if (event.keyCode != 13 || event.ctrlKey || event.altKey || event.metaKey) {
-			if (this._in_br) {
-				clearTimeout(this._br_timer);
-				this._br_timer = null;
-				this._in_br = false;
-			}
-			return;
-		}
-		if (!this.oApp.getOption('force_br')) return;
-		if (!(sel = this.oApp.getSelection())) return;
-		
-		event.shiftKey ? this.wrapBlock(sel) : this.insertBR(sel);
-		event.keyCode = 0;
-		
-		this.cast('SAVE_UNDO_POINT');
-
-		return false;
-	},
-	wrapBlock : function(sel) {
-		var self = this, sc, so, eo, nodes, $node, $clone, $bookmark, last, _xb_ = '_xeed_tmp_bookmark';
-
-		// delete contents
-		sel.deleteContents();
-
-		// is this node in a list?
-		sc = sel[_sc_];
-		so = sel[_so_];
-		eo = sel[_eo_];
-
-		if (sc[_nt_] == 1 && so > -1 && (sc=sc[_cn_][so]) && sc[_nt_] == 1) {
-			$node = $(sc);
-		} else {
-			if (sc[_nt_] == 3) sc = sc[_pn_];
-			$node = $(sc=sel[_sc_]);
-		}
-
-		// find block parent
-		$node = $node.parentsUntil('.'+_xr_).filter(function(){ return rx_block.test(this[_nn_])  });
-		if ($node.length) {
-			$node = $node.eq(0);
-		} else {
-			nodes = $.merge(siblings(sc,1), [sc], siblings(sc));
-			nodes[0][_pn_].insertBefore(($node=$('<p />')).get(0), nodes[0]);
-			$node.append(nodes);
-		}
-
-		// wrap with '<p>' in a table cell
-		if ($node.is('td,th')) $node = $node.wrapInner('<p>').children(0);
-
-		// create clone
-		if (/^h[1-6]$/i.test($node[0].nodeName)) {
-			$clone = $('<p />');
-		} else {
-			$clone = $node.clone().empty();
-		}
-
-		// append clone of this node
-		$node.after($clone).append($bookmark=$('<span>').attr('id',_xb_));
-
-		sel.setEndAfter($bookmark[0]);
-		$clone.append(sel.extractContents());
-		$bookmark.remove();
-		$('#'+_xb_).remove();
-
-		if (!$.browser.msie && !$clone[0][_cn_].length) {
-			$clone.append(d.createTextNode(invisibleCh));
-		}
-
-		sel.setStart($clone[0], 0);
-		sel.collapseToStart();
-		sel.select();
-	},
-	insertBR : function(sel) {
-		var self = this, $br = $('<br>'), st, block, child, nd, top, $par, $p, $prev_br, $clone, $block, $a, $rich, $ctn;
-
-		// insert Node
-		sel.insertNode($br[0]);
-		sel.selectNode($br[0]);
-		sel.collapseToEnd();
-
-		// Opera web browser can't prevent default keydown event
-		// So, you need to workaround it with blur and focus tricks.
-		if ($.browser.opera) {
-			st = d.documentElement.scrollTop;
-			this.oApp.$richedit[0].blur();
-
-			setTimeout(function(){
-				var _sel = self.oApp.getEmptySelection();
-
-				self.oApp.$richedit[0].focus();
-
-				if (st != d.documentElement.scrollTop) d.documentElement.scrollTop = st;
-				if (!$br[0][_ns_]) $br.after(d.createTextNode(invisibleCh));
-
-				_sel.selectNode($br[0][_ns_]);
-				_sel.collapseToStart();
-				_sel.select();
-			}, 0);
-			return;
-		}
-
-		if (!$.browser.msie) {
-			if (!$br[0][_ns_]) $br.after(d.createTextNode(invisibleCh));
-			if ($.browser.safari) {
-				// TODO : remove broken character which is displayed only in Safari.
-			}
-		}
-
-		sel.select();
-
-		/**
-		 * twice enter function is currently disabled
-		 *
-		// <br> timer
-		if (!this._in_br) {
-			$br.after( $a = $('<a>|</a>') );
-			this._scrollIntoView($a[0]);
-			$a.remove();
-
-			this._in_br = true;
-			this._br_timer = setTimeout(function(){ self._in_br = false; }, 500);
-			return;
-		}
-
-		if ($br && $br.prev().is('br')) {
-			$prev_br = $br.prev();
-			block    = get_block_parent($prev_br[0]);
-
-			if (is_ancestor_of(block, $br[0])) {
-				while(block != $br[0][_pn_]) {
-					$clone = $br.parent().clone().html('');
-					$clone.append(siblings($br[0]));
-					$br.parent().after($clone).after($br);
-				}
-			}
-
-			$p = ($block=$(block)).is('li')?$block.clone().empty():$('<p />');
-			$block.after($p);
-			$p.append(siblings($br[0]));
-
-			$prev_br.remove();
-			$br.remove();
-
-			if (!$block.html()) $block.html(invisibleCh);
-			$p.prepend(d.createTextNode(invisibleCh));
-
-			sel.setStart($p[0].firstChild, 0);
-			sel.setEnd($p[0].firstChild, 1);
-			sel.collapseToEnd();
-			sel.select();
-		}
-
-		this._in_br = false;
-		clearTimeout(this._br_timer);
-		*/
-	},
-	_scrollIntoView : function(nd) {
-		var $rich, $ctn, top, sctop;
-
-		top = nd.offsetHeight;
-		while(!rx_root.test(nd.className||'')) {
-			top += nd.offsetTop;
-			nd  =  nd.offsetParent;
-		}
-
-		// rich editor and container
-		$rich = this.oApp.$richedit;
-		$ctn  = $rich.parent();
-
-		// scrolltop
-		sctop = top - $ctn.height() + parseInt($rich.css('padding-top'));
-		if ($ctn[0].scrollTop < sctop) $ctn[0].scrollTop = sctop;
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Hotkey plugin
- */
-Hotkey = xe.createPlugin('Hotkey', {
-	_fn  : null,
-	_key : {},
-	map  : {
-		'BACKSPACE BKSP':8,
-		'TAB':9,
-		'ENTER RETURN':13,
-		'ESC ESCAPE':27,
-		'SPACE':32,
-		// arrows
-		'UP':38,
-		'DOWN':40,
-		'LEFT':37,
-		'RIGHT':39,
-
-		'HOME':36,
-		'PAGEUP PGUP':33,
-		'PAGEDOWN PGDN':34,
-		'END':35,
-		'INSERT INS':45,
-		'DELETE DEL':46,
-
-		// special chars
-		'=':187, ', <':188, '- _':189, '. >':190, '/ ?':191, '` ~':192, '{ [':219, '\\ |':220, '} ]':221, '\'\"':222
-	},
-
-	// constructor
-	init : function() {
-		var self = this;
-
-		this._fn  = function(event){ return self.hotkey(event) };
-		this._key = {};
-
-		// build key map
-		if (!this.map.A) {
-			// split multiple name
-			$.each(this.map, function(k,v){
-				if(k.indexOf(' ')<0) return true;
-
-				var keys = k.split(' '), i, c;
-
-				for(i=0,c=keys.length; i < c; i++)
-					self.map[keys[i]] = v;
-
-				delete(self.map[k]);
-			});
-
-			function build(from, to) {
-				for(var c=from; c<=to; c++) self.map[String.fromCharCode(c)] = c;
-			};
-
-			// A~Z
-			build(65, 90);
-
-			// 0~9
-			build(48, 57);
-		}
-	},
-
-	// on activate
-	activate : function() {
-		this.oApp.$richedit.keydown(this._fn);
-	},
-
-	// on deactivate
-	deactivate : function() {
-		this.oApp.$richedit.unbind('keydown',this._fn);
-	},
-
-	/**
-	 * @brief hotkey event handler
-	 * @param e jQuery event object
-	 */
-	hotkey : function(e) {
-		var _k  = this._key, kc = e.keyCode, k;
-
-		// always skip - shift, alt, ctrl, windows, kor/eng
-		if ((15 < kc && kc < 19) || kc == 229) return true;
-		if (e.metaKey && e.ctrlKey) e.metaKey = false;
-
-		// make hotkey string
-		k = this.key2str(e);
-
-		if (_k[k]) {
-			_k[k](e);
-			return false;
-		}
-
-		return true;
-	},
-
-	/**
-	 * @brief return normalize hotkey string
-	 */
-	normalize : function(str) {
-		var keys = (str||'').replace(/ \t\r\n/g, '').toUpperCase().split('+'), obj={}, i, c;
-
-		for(i=0,c=keys.length; i < c; i++) {
-			switch(keys[i]) {
-				case 'ALT':   obj.altKey   = 1; break;
-				case 'CTRL':  obj.ctrlKey  = 1; break;
-				case 'META':  obj.metaKey  = 1; break;
-				case 'SHIFT': obj.shiftKey = 1; break;
-				default:
-					if (this.map[keys[i]]) obj.keyCode = this.map[keys[i]];
-			}
-		}
-
-		// if there is no valid keyCode, return undefined object.
-		if (!obj.keyCode) return;
-
-		return this.key2str(obj);
-	},
-
-	/**
-	 * @brief make hotkey string from the key event object.
-	 * @return hotkey string
-	 */
-	key2str : function(e) {
-		var ret = [];
-
-		if (e.altKey)   ret.push('ALT');
-		if (e.ctrlKey)  ret.push('CTRL');
-		if (e.metaKey)  ret.push('META');
-		if (e.shiftKey) ret.push('SHIFT');
-		ret.push(e.keyCode);
-
-		return ret.join('+');
-	},
-
-	/**
-	 * @brief register a hotkey
-	 * @param str Hotkey string
-	 * @param fn  Hotkey function
-	 */
-	API_REGISTER_HOTKEY : function(sender, params) {
-		var str = this.normalize(params[0]), fn = params[1];
-
-		if (str) this._key[str] = fn;
-	},
-
-	/**
-	 * @brief unregister a hotkey
-	 * @param str Hotkey string
-	 */
-	API_UNREGISTER_HOTKEY : function(sender, params) {
-		var str = this.normalize(params[0]);
-
-		if (str && this._key[str]) delete this._key[str];
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Content Filter plugin
- * When you call GET_CONTENT message,
- *  If you using the richedit: rich content -> r2t filter -> text content -> out filter -> output
- *  If you using the textarea: text content -> out filter -> output
- * When you call SET_CONTENT message,
- *  If you using the richedit: input -> in filter -> text content -> t2r filter -> rich content
- *  If you using the textarea: input -> in filter -> text content
- */
-Filter = xe.createPlugin('ContentFilter', {
-	_in  : [], // input filters
-	_out : [], // output filters
-	_r2t : [], // rich2text filters
-	_t2r : [], // text2rich filters
-	_types : [], // valid types
-
-	init : function() {
-		this._in  = [];
-		this._out = [];
-		this._r2t = [];
-		this._t2r = [];
-	},
-	activate : function(){ },
-	/**
-	 * @brief Register a filter
-	 * @params type Filter type string. 'in', 'out', 'r2t', 't2r'
-	 * @params func Filter function
-	 */
-	API_REGISTER_FILTER : function(sender, params) {
-		var type = params[0], func = params[1];
-
-		if (!$.isArray(this['_'+type]) || !$.isFunction(func)) return;
-		this['_'+type].push(func);
-	},
-
-	/**
-	 * @brief Unregister a filter
-	 * @params type Filter type string.
-	 * @params func Filter function
-	 */
-	API_UNREGISTER_FILTER : function(sender, params) {
-		var type = params[0], func = params[1], pool, newPool=[], i, c;
-
-		if (!$.isArray(this['_'+type])) return;
-		for(i=0,pool=this['_'+type],c=pool.length; i < c; i++) {
-			if (pool[i] !== func) newPool.push(pool[i]);
-		}
-		this['_'+type] = newPool;
-	},
-
-	/**
-	 * @brief Run input filters before SET_CONTENT
-	 */
-	API_BEFORE_SET_CONTENT : function(sender, params) {
-		var i,c,m = this.cast('GET_EDITMODE') || '';
-
-		if (sender.getName() != 'EditMode') {
-			for(i=0,c=this._in.length; i < c; i++) params[0] = this._in[i](params[0]);
-		}
-
-		for(i=0,c=this._t2r.length; i < c; i++) params[0] = this._t2r[i](params[0]);
-	},
-
-	API_BEFORE_SET_CONTENT_HTML : function(sender, params) {
-		for(i=0,c=this._r2t.length; i < c; i++) params[0] = this._r2t[i](params[0]);
-	},
-
-	/**
-	 * @brief Run output filters before GET_CONTENT
-	 */
-	API_BEFORE_GET_CONTENT : function(sender, params) {
-		var i,c,m = this.cast('GET_EDITMODE') || '';
-
-		if (m == 'wysiwyg') {
-			for(i=0,c=this._r2t.length; i < c; i++) params[0] = this._r2t[i](params[0]);
-		}
-		for(i=0,c=this._out.length; i < c; i++) params[0] = this._out[i](params[0]);
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Edit Mode plugin
- * @brief Switch edit mode
- */
-EditMode = xe.createPlugin('EditMode', {
-	// constructor
-	init : function() { },
-	activate : function() {
-		var self = this, app = this.oApp, $r = this.oApp.$root;
-
-		this.$btn_wysiwyg = $r.find('button.wysiwyg').mousedown(function(){ self.cast('MODE_WYSIWYG'); return false; });
-		this.$btn_html    = $r.find('button.html').mousedown(function(){ self.cast('MODE_HTML'); return false; });
-
-		this.$btn_wysiwyg_p = this.$btn_wysiwyg.parent();
-		this.$btn_html_p    = this.$btn_html.parent();
-
-		app.$textarea.hide();
-		app.$richedit.show();
-
-		if (/iPod|iPhone|Android|BlackBerry|SymbianOS|SCH\-M[0-9]+/.test(navigator.userAgent)) {
-			this.$btn_html.mousedown();
-		}
-	},
-	deactivate : function() {
-		this.$btn_wysiwyg.unbind('mousedown');
-		this.$btn_html.unbind('mousedown');
-	},
-	API_MODE_WYSIWYG : function(sender, params) {
-		var app = this.oApp, param;
-
-		if (app.$richedit.is(':visible')) return true;
-
-		app.$richedit.show().parent().css('overflow','');
-		app.$textarea.hide();
-
-		// set active button
-		this.$btn_wysiwyg_p.addClass('active');
-		this.$btn_html_p.removeClass('active');
-
-		// set content
-		this.cast('SET_CONTENT', [app.$textarea.val()]);
-	},
-	API_MODE_HTML : function(sender, params) {
-		var app = this.oApp, h;
-		if (app.$richedit.is(':hidden')) return true;
-
-		app.$textarea.show().css('height', '100%').css('width', '100%').css('border',0);
-		app.$richedit.hide().parent().css('overflow','hidden');
-
-		// Fix IE6 and 7 rendering bug
-		if ($.browser.msie && $.browser.version < 8) {
-			app.$textarea.css('height', app.$textarea.parent().height());
-		}
-
-		// set active button
-		this.$btn_wysiwyg_p.removeClass('active');
-		this.$btn_html_p.addClass('active');
-
-		// set html code
-		this.cast('SET_CONTENT_HTML', [app.$richedit.html()]);
-	},
-	// If html editor is activated, cancel default SET_CONTENT action
-	// and call SET_CONTENT_HTML instead.
-	API_BEFORE_SET_CONTENT : function(sender, params) { },
-	API_BEFORE_BEFORE_SET_CONTENT : function(sender, params) {
-		if (this.$btn_html_p.hasClass('active')) {
-			this.cast('SET_CONTENT_HTML', params);
-			return false;
-		}
-	},
-	/**
-	 * @brief Put html code into the textarea
-	 * @param html String html code
-	 */
-	API_SET_CONTENT_HTML : function(sender, params) {
-		this.oApp.$textarea.val( params[0]||'' );
-	},
-	/**
-	 * @brief Get editing mode
-	 */
-	API_GET_EDITMODE : function(sender, params) {
-		return this.oApp.$richedit.is(':visible')?'wysiwyg':'html';
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Resize Plugin
- */
-Resize = xe.createPlugin('Resize', {
-	_fn : null,
-	prev_height : 0,
-	$resize_bar : null,
-	$auto_check : null,
-	$container  : null,
-
-	init : function() {
-		var self = this, startY, startH, resizing;
-
-		function isLeftButton(event) {
-			return (event.which == 1);
-		}
-
-		this._fn = {
-			down : function(event) {
-				var oChk = self.$auto_check.get(0);
-
-				if (event.target != this || !isLeftButton(event)) return true;
-				if (oChk.checked || oChk.disabled) return true;
-
-				startY = event.pageY;
-				startH = parseInt(self.$container.css('height'));
-				$(document).mousemove(self._fn.move).one('mouseup', self._fn.up);
-
-				resizing = true;
-
-				self.cast('RESIZE_START');
-
-				return false;
-			},
-			up : function(event) {
-				if (!resizing) return true;
-
-				$(document).unbind({mousemove:self._fn.move, mouseup:self._fn.up});
-
-				resizing = false;
-
-				self.cast('RESIZE_END');
-
-				return false;
-			},
-			move : function(event) {
-				var diff_y, new_h;
-
-				if (!resizing || !isLeftButton(event)) return true;
-
-				diff_y = event.pageY - startY;
-				new_h  = startH + diff_y;
-
-				self.$container.css('height', new_h);
-				self.cast('RESIZE');
-
-				return false;
-			},
-			check : function(event) {
-				self.cast('SET_AUTO_RESIZE', [this.checked]);
-			}
-		};
-	},
-	activate : function() {
-		var $root = this.oApp.$root, chk;
-
-		if (!this.prev_height) this.prev_height = this.oApp.getOption('height');
-
-		this.$container  = this.oApp.$richedit.parent();
-		this.$resize_bar = $root.find('button.resize').mousedown(this._fn.down);
-		this.$auto_check = $root.find('div.autoResize > :checkbox').click(this._fn.check);
-
-		chk = this.$auto_check[0].checked;
-		this.cast('SET_AUTO_RESIZE', [chk]);
-	},
-	deactivate : function() {
-		this.$resize_bar.unbind({dragstart:this._fn.dragstart, drag:this._fn.drag});
-		this.$auto_check.unbind('click', this._fn.check);
-	},
-	/**
-	 * @brief on resizing
-	 * @param new height
-	 * @param new mouse y position
-	 */
-	// API_RESIZE : function(sender, params) { },
-	/**
-	 * @brief Start resizing
-	 * @param current height
-	 * @param current mouse y position
-	 */
-	// API_RESIZE_START : function(sender, params) { },
-	/**
-	 * @brief End resizing
-	 * @param new height
-	 * @param new mouse y position
-	 */
-	// API_RESIZE_END : function(sender, params) { },
-	/**
-	 * @brief Set auto resize
-	 * @param Boolean indicates whether or not to resize automatically.
-	 */
-	API_SET_AUTO_RESIZE : function(sender, params) {
-		var $ctn = this.$container, $rich = this.oApp.$richedit, h;
-
-		if (params[0]) {
-			h = parseInt($ctn.css('height'), 10);
-			if (!isNaN(h)) this.prev_height = h;
-
-			$ctn.css('height', 'auto');
-		} else {
-			$ctn.css('height', this.prev_height);
-		}
-	},
-	API_BEFORE_MODE_HTML : function(sender, params) {
-		var chk = this.$auto_check.get(0).checked;
-
-		if (chk) {
-			this.prev_height = this.$container.height();
-			this.cast('SET_AUTO_RESIZE', [false]);
-		}
-	},
-	API_AFTER_MODE_HTML : function(sender, params) {
-		this.$auto_check.attr('disabled', true);
-	},
-	API_BEFORE_MODE_WYSIWYG : function(sender, params) {
-		var chk = this.$auto_check.get(0).checked;
-
-		if (chk) this.cast('SET_AUTO_RESIZE', [true]);
-	},
-	API_AFTER_MODE_WYSIWYG : function(sender, params) {
-		this.$auto_check.removeAttr('disabled');
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ UndoRedo
- * @brief Manages undo and redo actions, save undo point.
- */
-UndoRedo = xe.createPlugin('UndoRedo', {
-	_history  : [],
-	_index    : -1,
-	_timer    : null,
-	_keypress : null,
-	$undo_btn : null,
-	$redo_btn : null,
-
-	init : function() {
-		this._history = [];
-	},
-	activate : function() {
-		var self = this, $tb = this.oApp.$toolbar;
-
-		if (!$tb) return;
-
-		this.$undo_btn = $tb.find('button.ud');
-		this.$redo_btn = $tb.find('button.rd');
-
-		this.cast('REGISTER_COMMAND', [this.$undo_btn[0], 'ctrl+z', 'EXEC_UNDO']);
-		this.cast('REGISTER_COMMAND', [this.$redo_btn[0], 'ctrl+shift+z', 'EXEC_REDO']);
-
-		// keypress
-		this._keypress = function( ) {
-			if (self._timer) clearTimeout(self._timer);
-			self._timer = setTimeout(function(){ self.cast('SAVE_UNDO_POINT') }, 500);
-		};
-		this.oApp.$richedit.keypress(this._keypress);
-	},
-	deactivate : function() {
-		this.oApp.$richedit.unbind('keypress', this._keypress);
-
-		this.cast('UNREGISTER_COMMAND', [this.$undo_btn[0]]);
-		this.cast('UNREGISTER_COMMAND', [this.$redo_btn[0]]);
-
-		this.$undo_btn = null;
-		this.$redo_btn = null;
-
-	},
-	// redraw buttons
-	redraw : function(index) {
-		var $undo = this.$undo_btn, $redo = this.$redo_btn, fn, index = this._index, len = this._history.length;
-
-		if ($undo && $undo[0]) {
-			fn = (index > 0 && len)?'removeClass':'addClass';
-			$undo.parent()[fn]('disable');
-		}
-
-		if ($redo && $redo[0]) {
-			fn = (index+1 < len)?'removeClass':'addClass';
-			$redo.parent()[fn]('disable');
-		}
-	},
-	API_EXEC_UNDO : function(sender, params) {
-		this.cast('RESTORE_UNDO_POINT', [this._index-1]);
-	},
-	API_EXEC_REDO : function(sender, params) {
-		this.cast('RESTORE_UNDO_POINT', [this._index+1]);
-	},
-	/**
-	 * Save undo point
-	 * @return Number indicates current undo point
-	 */
-	API_SAVE_UNDO_POINT : function(sender, params) {
-		var sel = this.oApp.getSelection(), history = this._history, index = this._index, item = {}, last_item, $rich = this.oApp.$richedit;
-
-		// if richedit is not shown, don't execute this command.
-		if ($rich.is(':hidden')) return -1;
-
-		// when undo history is saved, clear saving timer
-		if (this._timer) {
-			clearTimeout(this._timer);
-			this._timer = null;
-		}
-
-		// delete redo history
-		if (index+1 < history.length) history = history.slice(0, index+1);
-
-		item.content  = $rich.html();
-		if (sel) {
-			item.bookmark = sel.getXPathBookmark();
-		} else {
-			item.bookmark = null;
-		}
-
-		// if the content isn't changed, don't save this history.
-		if (history.length) {
-			last_item = history[history.length-1];
-			if (item.content == last_item.content) return this._index;
-		}
-
-		history.push(item);
-
-		this._history = history;
-		this._index   = history.length - 1;
-
-		this.redraw();
-
-		return this._index;
-	},
-	/**
-	 * Restore to saved undo point
-	 * @param Number indicates saved undo point
-	 * @return Number indicates current undo point
-	 */
-	API_RESTORE_UNDO_POINT : function(sender, params) {
-		var idx = params[0], item, sel, $rich = this.oApp.$richedit;
-
-		// error : invalid index
-		if (idx < 0 || !(item=this._history[idx])) return -1;
-
-		// if richedit is not shown, don't execute this command.
-		if ($rich.is(':hidden')) return -1;
-
-		// when undo history is restored, clear saving timer
-		if (this._timer) {
-			clearTimeout(this._timer);
-			this._timer = null;
-		}
-
-		// restore content
-		this.cast('SET_CONTENT', [item.content]);
-
-		// restore selection
-		sel = this.oApp.getEmptySelection();
-		if (item.bookmark) {
-			sel.moveToXPathBookmark(item.bookmark);
-			sel.select();
-		} else {
-			$rich.focus().get(0);
-			if ($rich[0][_cn_][0]) {
-				sel.selectNode($rich[0][_cn_][0]);
-				sel.collapseToStart();
-				sel.select();
-			}
-		}
-
-		// next undo point
-		this._index = idx;
-
-		this.redraw();
-
-		return idx;
-	},
-	API_AFTER_SET_CONTENT : function(sender, params) {
-		if (sender != this && this.oApp.$richedit.is(':visible')) {
-			this.cast('SAVE_UNDO_POINT');
-		}
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ FileUpload
- */
-FileUpload = xe.createPlugin('FileUpload', {
-	$btn       : null,
-	$modal_box : null,
-	$template  : null,
-	$file_list : null,
-	esc_fn     : null,
-	selection  : null,
-	_index     : 0,
-	_left_size : 0,
-	_total_size : 0,
-
-	init : function(){
-		var self = this;
-
-		this.esc_fn = function(event){ if(event.keyCode == 27) self.cast('HIDE_FILE_MODAL'); };
-	},
-	activate : function() {
-		var self = this, app = this.oApp, $tb = app.$toolbar;
-
-		this.$modal_box = app.$root.find('div.xdlw');
-
-		if (this.$modal_box.length) {
-			// #19473993 - move the file window to document's end
-			jQuery(function(){ self.$modal_box.appendTo(document.body) });
-
-			this.$attach_list = this.$modal_box.find('div.xdal');
-			this.$attach_list
-				.mousedown(function(event){ event.stopPropagation(); })
-				.find('button.btn.cs')
-					.click(function(){ self.cast('HIDE_FILE_MODAL'); return false; });
-
-			// show and hide function button on hover
-			this.$file_list = this.$attach_list.find('div.sn')
-				.delegate('button.ctr.ins', 'click',
-					function(){
-						var $this = $(this), $item = $this.parent(), file_url = $this.parent().data('url');
-
-						self.cast('INSERT_FILE_INTO', [$item.attr('_type'), file_url, $item.find('label').text()]);
-						return false;
-					}
-				)
-				.delegate('button.ctr.del', 'click',
-					function(){
-						var $this = $(this), $item = $this.parent(), file_srl = $this.parent().attr('file_srl');
-
-						self.cast('DELETE_FILE', [file_srl]);
-						return false;
-					}
-				);
-
-			this.$template = this.$file_list.eq(0).find('>ul:first>li:first').remove();
-
-			this.$attach_list.find('p.task button')
-				.filter('.all') // select all
-					.click(function(){
-						$(this).parents('div.sn:first').find('li > :checkbox:not([disabled])').attr('checked', 'checked');
-					})
-					.end()
-				.filter('.insert') // insert
-					.click(function(){
-						$(this).parents('div.sn:first').find('li > :checked:not([disabled])').prevAll('button.ins').click();
-					})
-					.end()
-				.filter('.delete') // delete
-					.click(function(){
-						var file_srls = [];
-
-						$(this).parents('div.sn:first').find('li:has(:checked:not([disabled]))').each(function(){ file_srls.push($(this).attr('file_srl')) });
-
-						self.cast('DELETE_FILE', [file_srls]);
-						return false;
-					})
-					.end();
-		}
-
-		if ($tb) {
-			this.$btn = $tb.find('>div.t1>ul.u1 a.tb')
-				.mousedown(function(){ self.selection = self.oApp.getSelection(); })
-				.click(function(){ self.cast('SHOW_FILE_MODAL'); return false; });
-		}
-
-		// make it draggable
-		this.$modal_box.find('.iHead, .iFoot').mousedown(bind(this, this._dragStart));
-
-		// update filelist
-		$(function(){ self.updateFileList() });
-	},
-	deactivate : function() {
-		this.$attach_list.unbind()
-			.find('div.sn').undelegate()
-			.end()
-			.find('button,input').unbind();
-
-		// buttons
-		$.each(this.$btns, function(key){ this.unbind('click'); });
-		this.$btns = [];
-
-		// modal box
-		this.$modal_box.unbind();
-	},
-	_dragStart : function(event) {
-		var $realwin = this.$modal_box.find('>.xdal'), m_left, m_top, fn;
-
-		if ($(event.target).is('a,button,input')) return;
-
-		fn = {
-			move : bind(this, this._dragMove),
-			up   : bind(this, this._dragEnd)
-		};
-
-		this.$modal_box.data('draggable', true).data('drag_fn', fn);
-
-		$(document).mousemove(fn.move).mouseup(fn.up);
-
-		m_left = parseInt($realwin.css('margin-left'), 10);
-		m_top  = parseInt($realwin.css('margin-top'), 10);
-
-		if (isNaN(m_left)) m_left = $realwin[0][_ol_];
-
-		this.$modal_box
-			.data('dragstart_pos', [event.pageX, event.pageY])
-			.data('dragstart_margin', [m_left, m_top]);
-
-		return false;
-	},
-	_dragMove : function(event) {
-		var $real_win, start_pos, start_margin, new_margin;
-
-		if (!this.$modal_box.data('draggable')) return;
-
-		$realwin = this.$modal_box.find('>.xdal');
-
-		start_pos = this.$modal_box.data('dragstart_pos');
-		start_margin = this.$modal_box.data('dragstart_margin');
-
-		$realwin.css({
-			'margin-left' : (start_margin[0]+event.pageX-start_pos[0])+'px',
-			'margin-top'  : (start_margin[1]+event.pageY-start_pos[1])+'px'
-		});
-
-		return false;
-	},
-	_dragEnd : function(event) {
-		var fn = this.$modal_box.data('drag_fn');
-
-		$(document).unbind('mousemove', fn.move).unbind('mouseup', fn.up);
-		this.$modal_box.data('draggable', false);
-	},
-	createItem : function(file) {
-		var $item, ext, match, id = 'xeed-id-'+(this._index++), type, file_types;
-
-		ext = (match = file.name.match(/\.([a-z0-9]+)$/i))?match[1]||'':'';
-		ext = ext.toLowerCase();
-
-		file_types = 'pdf doc docx hwp ppt pps pptx txt rtf xls xlsx csv bmp tif raw avi wmv mov mpg flv divx mp3 wma wav aac flac psd ai svg xml html css js iso zip rar alz gz tar'.split(' ');
-
-		// get file type
-		if ($.inArray(ext, 'gif jpg jpeg png'.split(' ')) > -1) type = 'img';
-		else if ($.inArray(ext, 'avi mov mpg wmv flv mp3 wma wav'.split(' ')) > -1) type = 'media';
-		else type = 'file';
-
-		$item = this.$template.clone()
-			.find('button.ob > img').attr('alt', file.name).end()
-			.find('label').text(file.name).attr('for', id).end()
-			.find('input:checkbox').attr('id', id).end()
-			.attr('ext', ext).attr('_type', type);
-
-		if (type == 'file' || type == 'media') {
-			if ($.inArray(ext, file_types) < 0) ext = 'etc';
-			$item.find('>button:first').addClass(ext).empty().text(file.name);
-		}
-
-		return $item;
-	},
-	getKey : function(file) {
-		return file.name.toLowerCase()+'-'+file.size;
-	},
-	updateCount : function() {
-		var $items = this.$file_list.find('li[_type]'), $tb = this.oApp.$toolbar, $area, types = ['img','media','file'], i, c;
-
-		this.$modal_box.find('h2 strong').text($items.length);
-
-		for(i=0,c=types.length; i<c; i++) {
-			$area  = this.$file_list.filter('.'+types[i]);
-			$items = $area.find('li[_type]');
-			$items.length?$area.removeClass('none'):$area.addClass('none');
-
-			$tb.find('a.tb span.'+types[i]+' strong').text($items.length);
-		}
-	},
-	updateFileSize : function(total_size) {
-		var $info = this.$modal_box.find('p.info'), html = $info.html(), units = 'B KB MB GB TB'.split(' ');
-
-		if (!is_def(total_size)) {
-			total_size = 0;
-			this.$file_list.find('li[_key]').each(function(){
-				if (/\-([0-9]+)$/.test($(this).attr('_key'))) total_size += parseInt(RegExp.$1,10);
-			});
-		}
-
-		// size
-		while((units.length > 1) && total_size > 1024) {
-			units.shift();
-			total_size /= 1024;
-		}
-
-		$info.html( html.replace(/([0-9.]+)([a-zA-Z]+)\s*\//, total_size.toFixed(2)+units[0]+'/') );
-	},
-	updateFileList : function() {
-		var self = this, params = {}, $form, seq, primary, target_srl;
-
-		// get form
-		$form = this.oApp.$textarea.parents('form:first');
-		seq   = $form.attr('editor_sequence');
-
-		// document serial number
-		primary = editorRelKeys[seq].primary;
-
-		params = {
-			editor_sequence   : $form.attr('editor_sequence'),
-			upload_target_srl : primary.value,
-			mid : current_mid
-		};
-
-		$.exec_xml('file', 'getFileList', params, bind(this, this._callbackFileList), ['error', 'message', 'files', 'left_size', 'editor_sequence', 'upload_target_srl', 'upload_status']);
-	},
-	_callbackFileList : function(ret) {
-		var i, c, f, k, primary, $item, $list, seq = ret.editor_sequence;
-
-		this._left_size = parseInt(ret.left_size) || 0;
-
-		if (!ret.files || !ret.files.item) return;
-		if (!seq || !editorRelKeys[seq] || !(primary = editorRelKeys[seq].primary)) return;
-		if (!$.isArray(ret.files.item)) ret.files.item = [ret.files.item];
-		if (!primary.value && ret.upload_target_srl) primary.value = ret.upload_target_srl;
-
-		for(i=0,c=ret.files.item.length; i < c; i++) {
-			f = ret.files.item[i];
-			k = f.source_filename.toLowerCase()+'-'+f.file_size;
-
-			f.name = f.source_filename;
-			f.size = f.file_size;
-
-			$item = this.$file_list.find('li[_key='+k+']');
-
-			if (!$item.length) {
-				$item = this.createItem(f).attr('_key', this.getKey(f));
-				$list = this.$file_list.filter('.'+$item.attr('_type')).find('ul').append($item).end();
-			}
-
-			if ($item.attr('_type') == 'img') {
-				$item.find('button.ob > img')
-					.load(function(){ $(this).css((this.width>this.height)?'width':'height', '54px'); })
-					.attr('src', f.download_url);
-			}
-
-			$item.attr('file_srl', f.file_srl).data('url', f.download_url);
-		}
-
-		this.updateCount();
-		this.updateFileSize();
-	},
-	API_SHOW_FILE_MODAL : function() {
-		var self = this, uploader, file_group = [], $form, params, seq, offset_top;
-		
-		offset_top = this.$btn.offset().top;
-
-		this.$modal_box.css('top', offset_top+13).show();
-		this.$attach_list.show();
-
-		// register ESC hotkey
-		$(document).keydown(this.esc_fn);
-
-		this.selection = this.oApp.getSelection();
-
-		// get form
-		$form = this.oApp.$textarea.parents('form:first');
-		seq   = $form.attr('editor_sequence');
-
-		// create an uploader
-		if (!this.$modal_box.data('uploader')) {
-			// additional parameter
-			params = {
-				mid : current_mid,
-				act : 'procFileUpload',
-				editor_sequence : seq,
-				upload_target_srl : $form.find('input[name=document_srl]').val()
-			};
-
-			// file onselect event
-			function file_onselect(files, old_len) {
-				var html, $ob, i, c, $list, $item, type, limit_size = self.oApp.getOption('allowed_filesize'), total_size = 0, over = false;
-
-				// size check
-				for(i=old_len,c=files.length; i < c; i++) {
-					if (files[i].size > limit_size) {
-						over = true;
-						break;
-					}
-					total_size += files[i].size;
-				}
-
-				if (total_size > self._left_size) over = true;
-				if (over) {
-					alert(lang.upload_not_enough_quota);
-					while(old_len != files.length) files.pop();
-					return;
-				}
-
-				for(i=old_len,c=files.length; i < c; i++) {
-					$item = self.createItem(files[i]).addClass('uploading').attr('_key', self.getKey(files[i]));
-					type  = $item.attr('_type');
-					$list = self.$file_list.filter('.'+type).find('ul').append($item).end();
-
-					($ob = $item.find('>button.ob'))
-						.data('html', $ob.html())
-						.html('<span class="progress"><span class="bar" style="width:0%"></span></span>');
-				}
-
-				self.updateCount();
-
-				setTimeout(function(){ uploader.cast('START'); }, 10);
-			}
-
-			function upload_onprogress(file) {
-				var $item = self.$file_list.find('li[_key='+self.getKey(file)+']');
-
-				$item.find('>button.ob span.bar').css('width', parseInt(file.loaded*100/file.size)+'%');
-			}
-
-			function upload_onfinishone(file) {
-				var $item = self.$file_list.find('li[_key='+self.getKey(file)+']'),
-					$ob   = $item.find('>button.ob');
-
-				if ($item.attr('_type') == 'img') {
-				}
-
-				self._total_size += file.size;
-				self.updateFileSize(self._total_size);
-
-				$ob.html($ob.data('html')).parent().removeClass('uploading');
-			}
-
-			function upload_onfinish() {
-				var params = {}, primary, target_srl;
-
-				// document serial number
-				primary = editorRelKeys[seq].primary;
-
-				params = {
-					editor_sequence   : $form.attr('editor_sequence'),
-					upload_target_srl : primary.value,
-					mid    : current_mid
-				};
-
-				$.exec_xml('file', 'getFileList', params, bind(self, self._callbackFileList), ['error', 'message', 'files', 'left_size', 'editor_sequence', 'upload_target_srl', 'upload_status']);
-			}
-
-			uploader = xe.createUploader(
-				this.$modal_box.find('button.at'),
-				{
-					url : request_uri+'index.php',
-					dropzone : this.$modal_box.find('div.iBody'),
-					params   : params,
-					onselect : file_onselect,
-					onprogress  : upload_onprogress,
-					onfinishone : upload_onfinishone,
-					onfinish    : upload_onfinish
-				}
-			);
-
-			this.$modal_box.data('uploader',  uploader);
-		}
-	},
-	API_HIDE_FILE_MODAL : function() {
-		this.$modal_box.hide();
-		this.$attach_list.hide();
-
-		// unregister ESC hotkey
-		$(document).unbind('keydown', this.esc_fn);
-
-		if (this.selection) {
-			try { this.selection.select(); } catch(e){};
-		}
-	},
-	/**
-	 * @brief Insert a file into the rich editor
-	 */
-	API_INSERT_FILE_INTO : function(sender, params) {
-		var type = params[0], url = params[1], name = params[2], ext, sel, code;
-
-		if (type == 'img') {
-			code = '<img src="'+url+'" alt="'+name+'" />\n';
-		} else if (type == 'media') {
-			code = '<img src="./common/tpl/images/blank.gif" editor_component="multimedia_link" multimedia_src="'+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="" class="_resizable" />';
-		}
-
-		if (!code) {
-			code = '<a href="'+url+'">'+name+'</a>';
-		}
-
-		sel = this.selection || this.oApp.getSelection();
-
-		if (sel) {
-			sel.pasteHTML(code);
-		} else if(this.oApp.$richedit.is(':visible')){
-			this.oApp.$richedit.append(code);
-
-			sel = this.oApp.getEmptySelection();
-			sel.selectNode(this.oApp.$richedit[0].lastChild);
-		}
-		sel.collapseToEnd();
-		sel.select();
-	},
-	/**
-	 * @brief Delete a file
-	 */
-	API_DELETE_FILE : function(sender, params) {
-		var self = this, file_srl = params[0], callback = params[1], $item, i, c;
-
-		function _callback(ret){
-			var i, c, selector=[];
-
-			if (ret && ret.error && ret.error == 0) {
-				if (!$.isArray(file_srl)) file_srl = [file_srl];
-
-				for(i=0,c=file_srl.length; i < c; i++) {
-					selector.push('li[file_srl='+file_srl[i]+']');
-				}
-
-				self.$file_list.find(selector.join(',')).remove();
-
-				if ($.isFunction(callback)) callback();
-
-				self.updateCount();
-				self.updateFileSize();
-			}
-		}
-
-		$.exec_xml('file', 'procFileDelete', {file_srls:file_srl, editor_sequence:1}, _callback);
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ URL
- */
-URL = xe.createPlugin('URL', {
-	sel    : null,
-	$btn   : null,
-	$layer : null,
-	$text  : null,
-	$btns  : null,
-	$chk   : null,
-
-	init : function(){},
-	activate : function() {
-		var self = this, app = this.oApp, $tb = app.$toolbar;
-
-		if (!$tb) return;
-
-		this.$btn   = $tb.find('button.ur')
-			.mousedown(function(){ self.cast('TOGGLE_URL_LAYER'); return false; });
-
-		this.$layer = this.$btn.next('.lr')
-			.mousedown(function(event){ event.stopPropagation() });
-
-		this.$text = this.$layer.find('input:text')
-			.keypress(function(event){ if(event.keyCode == 13) self.$btns.eq(0).click() })
-			.focus(function(){ this.select(); });
-
-		this.$chk  = this.$layer.find('input:checkbox');
-
-		this.$btns = this.$layer.find('button.btn')
-			.each(function(i){
-				var $this = $(this);
-
-				if (i) {
-					$this.click(function(){ self.cast('HIDE_URL_LAYER'); });
-				} else {
-					$this.click(function(){
-						var url = self.$text.val(), newWin = self.$chk[0].checked;
-
-						self.cast('EXEC_URL', [url, newWin]);
-						self.cast('HIDE_URL_LAYER');
-					});
-				}
-			});
-	},
-	deactivate : function() {
-		if (this.$btn)   this.$btn.unbind('mousedown');
-		if (this.$layer) this.$layer.unbind('mousedown').find('input,button').unbind();
-	},
-	/**
-	 * @brief Insert an url
-	 * @param url    String url
-	 * @param newWin Boolean indicates new window link
-	 */
-	API_EXEC_URL : function(sender, params) {
-		var sel = this.sel || this.oApp.getSelection(), url = params[0], newWin = params[1], newUrl;
-
-		if (!sel) return;
-
-		if (sel.collapsed && url) {
-
-		} else {
-			sel.select();
-			this.cast('EXEC_COMMAND', [url?'createlink':'unlink', false, (newWin&&url?'xeed://':'')+url]);
-
-			if (newWin && url) {
-				this.oApp.$richedit.find('a[href^=xeed://]').attr('href', url).attr('target', '_blank');
-			}
-		}
-		this.cast('HIDE_URL_LAYER');
-	},
-	API_SHOW_URL_LAYER : function() {
-		var sel, li, offset, $node;
-
-		if (!this.$layer || this.$layer.hasClass('open')) return;
-		if (!(sel = this.oApp.getSelection())) return;
-
-		this.sel = sel; // save selection
-		this.$btn.parent().addClass('active');
-		this.$layer.addClass('open');
-
-		$node = $(sel.commonAncestorContainer);
-		if (!$node.is('a')) $node = $node.parentsUntil('.'+_xr_).filter('a');
-		if ($node.length) {
-			this.$text.val( $node.attr('href') );
-			if ($node.attr('target') == '_blank') this.$chk[0].checked = true;
-		} else {
-			this.$text.val('http://');
-			this.$chk[0].checked = false;
-		}
-
-		li     = this.$btn.parents('li:first')[0];
-		offset = li[_ol_] + li[_pn_][_ol_];
-		(this.$layer.width() > offset)?this.$layer.addClass('right'):this.$layer.removeClass('right');
-
-		this.$text.focus().select();
-	},
-	API_HIDE_URL_LAYER : function() {
-		if (!this.$layer || !this.$layer.hasClass('open')) return;
-
-		this.$btn.parent().removeClass('active');
-		this.$layer.removeClass('open');
-	},
-	API_TOGGLE_URL_LAYER : function() {
-		if (!this.$layer) return;
-
-		this.cast( (this.$layer.hasClass('open')?'HIDE':'SHOW')+'_URL_LAYER' );
-	},
-	API_HIDE_ALL_LAYER : function() {
-		if (this.$layer && this.$layer.hasClass('open')) this.cast('HIDE_URL_LAYER');
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Table
- */
-Table = xe.createPlugin('Table', {
-	$btns   : null,
-	$layer : null,
-	$table : null, // preview table
-	$th_btns   : null,
-	$unit_btns : null,
-	selection  : null,
-
-	selector   : '.xeed_selected_cell',
-	cell_selector : '',
-	cmd : {
-		cm : 'MERGE_CELLS',
-		cs : 'SPLIT_CELLS',
-		rs : 'SPLIT_ROWS'
-	},
-
-	init : function(){
-		this.$btns = {};
-		this.cell_selector = 'td'+this.selector+',th'+this.selector;
-	},
-	activate : function() {
-		var self = this, $tb = this.oApp.$toolbar, $layer, $fieldset;
-
-		if (!$tb) return;
-
-		// tool buttons
-		this.$btns.te = $tb.find('button.te').mousedown(function(){ self.cast('TOGGLE_TABLE_LAYER'); return false; });
-		$.each(this.cmd, function(key) {
-			var $btn = $tb.find('button.'+key);
-
-			self.$btns[key] = $btn;
-			self.cast('REGISTER_COMMAND', [$btn[0], '', this]);
-		});
-
-		// layer, preview table
-		this.$layer = $layer = this.$btns.te.next('.lr').mousedown(function(event){ event.stopPropagation() });
-		this.$table = $layer.find('fieldset.pv table:first');
-
-		// caption setting
-		$fieldset = $layer.find('fieldset.cn');
-		this.$caption_txt = $fieldset.find('input:text')
-			.keydown(function(){ self.$table.find('>caption').text( this.value ); })
-			.focus(function(){ $(this).prev('label').hide(); })
-			.blur(function(){
-				if(!this.value) $(this).prev('label').show();
-				$(this).keydown();
-			});
-		this.$caption_pos = $fieldset.find('button')
-			.click(function(){
-				var $li = $(this[_pn_]), pos, align, $table, $caption;
-
-				$table   = self.$table;
-				$caption = $table.find('>caption');
-
-				$li.parent().children('li').removeClass('selected').end().end().addClass('selected');
-
-				pos = self.parseCaptionPos($li.attr('class'));
-
-				(pos.vert == 'top')?$table.prepend($caption):$table.append($caption);
-				$table.css('caption-side', pos.vert);
-				$caption.css('text-align', pos.align);
-
-				return false;
-			});
-
-		// header setting
-		this.$th_btns = $layer.find('fieldset.th button').click(function(){ self.setHeader(this); return false; });
-
-		// px or percent
-		this.$unit_btns = $layer.find('fieldset.wh button').click(function(){
-			self.$unit_btns.removeClass('selected');
-			$(this).addClass('selected');
-			return false;
-		});
-
-		// apply, cancel
-		$btns = $layer.find('div.btnArea button');
-		$btns.eq(0).click(function(){
-			var cfg = {rows:3, cols:3, width:'100%', caption_text:'', caption_pos:'tc', header:'no'}, $fieldset, $input;
-
-			// get table properties
-			$fieldset = $layer.find('fieldset.cn');
-			cfg.caption_pos  = $fieldset.find('li.selected').attr('class').replace(/ ?selected ?/, '');
-			cfg.caption_text = $fieldset.find('input:text').val();
-
-			cfg.header = $layer.find('fieldset.th li.selected').attr('class').replace(/ ?selected ?/, '');
-
-			$fieldset = $layer.find('fieldset.wh');
-			$input    = $fieldset.find('input:text');
-			cfg.rows  = $input.eq(0).val() - 0;
-			cfg.cols  = $input.eq(1).val() - 0;
-			cfg.width = $input.eq(2).val() - 0 + $fieldset.find('button.selected').text();
-
-			self.cast('EXEC_TABLE', [cfg]);
-			self.cast('HIDE_TABLE_LAYER');
-
-			return false;
-		});
-		$btns.eq(1).click(function(){ self.cast('HIDE_TABLE_LAYER'); return false; });
-	},
-	deactivate : function() {
-		var self = this;
-
-		// buttons
-		if(this.$btns.te) this.$btns.te.unbind('mousedown');
-		$.each(this.$btns, function(key) {
-			self.cast('UNREGISTER_COMMAND', [this]);
-		});
-		this.$btns = {};
-
-		if (this.$layer) this.$layer.unbind().find('input,button').unbind();
-
-	},
-	parseCaptionPos : function(str) {
-		var ret = {vert:'', align:''};
-
-		str = $.trim(str.replace(/selected/g, ''));
-
-		ret.vert = (str.indexOf('b') < 0)?'top':'bottom';
-
-		if (str.indexOf('c') >= 0) ret.align = 'center';
-		else if (str.indexOf('r') >= 0) ret.align = 'right';
-		else ret.align = 'left';
-
-		return ret;
-	},
-	setHeader : function(btn) {
-		var $btn = $(btn), $li = $btn.parent('li'), $table = this.$table, selector;
-
-		if (!$btn.is('button') || !$li.length) return;
-
-		switch($li.attr('class')) {
-			case 'no': selector = ''; break;
-			case 'lt': selector = 'tr > td:nth-child(1)'; break;
-			case 'tp': selector = 'tr:first td'; break;
-			case 'bh': selector = 'tr:first td, tr > td:nth-child(1)'; break;
-		}
-
-		// conver td to th
-		$table.find('th').replaceWith('<td>TD</td>');
-		if (selector) $table.find(selector).replaceWith('<th>TH</th>');
-
-		// select this button
-		this.$th_btns.parent('li').removeClass('selected');
-		$li.addClass('selected');
-	},
-	/**
-	 * @brief Insert a table with a configuration
-	 * @param Object contains table properties
-	 */
-	API_EXEC_TABLE : function(sender, params) {
-		var sel = this.selection, cfg, html, caption, $rich = this.oApp.$richedit;
-
-		if (!sel) return;
-
-		cfg = $.extend({
-			caption_pos  : 'tc',
-			caption_text : '',
-			cols : 3,
-			rows : 3,
-			header : 'no',
-			width : '100%'
-		}, params[0]);
-
-		cfg.cp_side = (cfg.caption_pos.indexOf('t') > -1)?'top':'bottom';
-
-		if (cfg.caption_pos.indexOf('c') > -1) cfg.cp_align = 'center';
-		else if (cfg.caption_pos.indexOf('r') > -1) cfg.cp_align = 'right';
-		else cfg.cp_align = 'left';
-
-		if (cfg.caption_text) {
-			caption = '<caption style="text-align:'+cfg.cp_align+'">'+cfg.caption_text+'</caption>';
-		} else {
-			caption = '';
-		}
-
-		// create table code
-		html = '<table border="1" cellpadding="1" cellspacing="0" class="ts" style="width:'+cfg.width+';caption-side:'+cfg.cp_side+';">';
-		// top caption
-		if (cfg.cp_side == 'top')  html += caption;
-
-		for(i=0; i < cfg.rows; i++) {
-
-			html += '<tr>';
-			for(j=0; j < cfg.cols; j++) {
-				if ( (cfg.header == 'bh' && !(i*j)) || (cfg.header == 'tp' && !i) || (cfg.header == 'lt' && !j)) {
-					html += '<th scope="'+(i?'row':'col')+'">TH</th>';
-				} else {
-					html += '<td>TD</td>';
-				}
-			}
-			html += '</tr>';
-		}
-
-		// bottom caption
-		if (cfg.cp_side == 'bottom') html += caption;
-
-		html += '</table>';
-
-		// insert table
-		$rich.focus();
-		sel.pasteHTML(html);
-		sel.collapseToEnd();
-	},
-	API_SHOW_TABLE_LAYER : function(sender, params) {
-		var $layer = this.$layer, li, offset;
-
-		if (!$layer || $layer.hasClass('open')) return;
-
-		this.selection = this.oApp.getSelection();
-		$layer.addClass('open').parent('li').addClass('active');
-
-		li     = this.$btns.te.parents('li:first')[0];
-		offset = li[_ol_] + li[_pn_][_ol_];
-		($layer.width() > offset)?$layer.addClass('right'):$layer.removeClass('right');
-
-		this.cast('HIDE_ALL_LAYER', [$layer[0]]);
-	},
-	API_HIDE_TABLE_LAYER : function(sender, params) {
-		var $layer = this.$layer;
-
-		if (!$layer || !$layer.hasClass('open')) return;
-		if (this.selection) this.selection.select();
-
-		this.selection = null;
-		$layer.removeClass('open').parent('li').removeClass('active');
-	},
-	API_TOGGLE_TABLE_LAYER : function(sender, params) {
-		if (!this.$layer) return;
-		this.cast( (this.$layer.hasClass('open')?'HIDE':'SHOW') + '_TABLE_LAYER' );
-	},
-	API_HIDE_ALL_LAYER : function(sender, params) {
-		if (sender != this) this.cast('HIDE_TABLE_LAYER');
-	},
-	API_MERGE_CELLS : function(sender, params) {
-		var self = this, html = '', $cell = this.oApp.$richedit.find(this.cell_selector);
-
-		// if no selected cell then quit
-		if (!cell.length) return;
-
-		// merge content of all cells
-		$cell.each(function(){ html += this.innerHTML; }).eq(0).html(html);
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	API_SPLIT_BY_COL : function(sender, params) {
-		var cell = this.oApp.$richedit.find(this.cell_selector);
-
-		if (!$cell.length) $cell = this.$current_cell;
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	},
-	API_SPLIT_BY_ROW : function(sender, params) {
-		var $cell = this.oApp.$richedit.find(this.cell_selector);
-
-		if (!$cell.length) $cell = this.$current_cell;
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-	}/*,
-	API_ON_CHANGE_NODE : function(sender, params) {
-		var self = this, node = params[0], $node, state;
-
-		state = {
-			cs : 'disable',
-			rs : 'disable',
-			cm : 'disable'
-		};
-
-		if (node) {
-			sel = this.oApp.getSelection();
-
-			if (sel.collapsed) {
-				$node = $(node).parentsUntil('.'+_xr_).filter('td,th');
-
-				if ($node.length) {
-					state.cs = state.rs = 'normal';
-					if ($node.is('.selected')) state.cm = 'normal';
-				}
-			}
-		}
-
-		$.each(this.$btns, function(key){
-			self.cast('SET_COMMAND_STATE', [this[0], state[key]]);
-		});
-	}
-	*/
-});
-/**
- * }}}
- */
-
-/**
- * {{{ AutoSave
- */
-AutoSave = xe.createPlugin('AutoSave', {
-	_enable     : false,
-	_timer      : null,
-	_start_time : null,
-	_save_time  : null,
-	$bar        : null,
-	$text       : null,
-
-	init : function(){ },
-	activate : function(){
-		var self = this, app = this.oApp, $form, title, content;
-
-		// start time
-		this._start_time = (new Date).getTime();
-
-		// set default option
-		app.setDefault('use_autosave', false);
-		this._enable = app.getOption('use_autosave');
-
-		this.$bar = this.oApp.$root.find('div.time').hide().click(function(){ $(this).slideUp(300) });
-		$form = $(app.$textarea[0].form);
-
-		if (this._enable && window.editorEnableAutoSave) {
-			editorEnableAutoSave($form[0], $form.attr('editor_sequence'), function(params){ self._save_callback(params) });
-		}
-
-		// restore saved content
-		title   = $form[0]._saved_doc_title.value;
-		content = $form[0]._saved_doc_content.value;
-
-		if (title || content) {
-			if (confirm($form[0]._saved_doc_message.value)) {
-				$form.find('input[name=title]').val(title);
-				app.$textarea.val(content);
-			} else {
-				editorRemoveSavedDoc();
-			}
-		}
-	},
-	deactivate : function() {
-		this.$bar.unbind();
-		clearTimeout(this._timer);
-	},
-	_save_callback : function(params) {
-		var self = this;
-
-		this._save_time = (new Date).getTime();
-
-		this.$bar.slideDown(300);
-		this._update_message();
-
-		this._timer = setInterval(function(){self._update_message()}, 5000);
-	},
-	_update_message : function() {
-		var msg = lang.autosave_format, now = (new Date).getTime(), write_interval, save_interval, write_msg, save_msg;
-
-		write_interval = Math.floor( (now - this._start_time)/1000/60 );
-		save_interval  = Math.floor( (now - this._save_time)/1000/60 );
-
-		if (write_interval < 60) {
-			write_msg = ((write_interval>1)?lang.autosave_mins:lang.autosave_min).replace('%d', write_interval);
-		} else {
-			write_interval = Math.floor(write_interval/60);
-			write_msg = ((write_interval>1)?lang.autosave_hours:lang.autosave_hour).replace('%d', write_interval);
-		}
-
-		if (save_interval < 60) {
-			save_msg = ((save_interval>1)?lang.autosave_mins_ago:lang.autosave_min_ago).replace('%d', save_interval);
-		} else {
-			save_interval = Math.floor(write_interval/60);
-			save_msg = ((save_interval>1)?lang.autosave_hours_ago:lang.autosave_hour_ago).replace('%d', save_interval);
-		}
-
-		msg = msg.replace('%s', write_msg).replace('%s', save_msg);
-
-		this.$bar.find('>p').html(msg);
-	},
-	API_EXEC_AUTOSAVE : function() {
-		_editorAutoSave(true, this._save_callback);
-	},
-	API_ENABLE_AUTOSAVE : function(sender, params) {
-		var b = this._enable = !!params[0];
-
-		app.setOption('use_autosave', b);
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Clear
- */
-Clear = xe.createPlugin('Clear', {
-	$btn : null,
-	_keypress  : null,
-	_mousemove : null,
-	init : function(){ },
-	activate : function() {
-		var self = this, app = this.oApp;
-
-		this.$btn = this.oApp.$toolbar.find('button.er');
-		if (this.$btn.length) {
-			this.cast('REGISTER_COMMAND', [this.$btn[0], '', 'EXEC_CLEAR']);
-		}
-	},
-	deactivate : function() {
-		if (this.$btn.length) {
-			this.cast('UNREGISTER_COMMAND', [this.$btn[0], '']);
-		}
-	},
-	API_EXEC_CLEAR : function() {
-		var self = this, sel = this.oApp.getSelection(), sc, ec, so, eo, bl, nd, nodes, i, c, next, $pn;
-
-		if (!sel || sel.collapsed) return;
-
-		// split text nodes
-		nodes = sel.getTextNodes(true);
-		
-		// get current position
-		sc = sel[_sc_]; so = sel[_so_];
-		ec = sel[_ec_]; eo = sel[_eo_];
-		
-		// start
-		for(i=0,c=nodes.length;i<c;i++) {
-			nd = nodes[i];
-			bl = get_block_parent(nd);
-
-			while(nd[_pn_] != bl) {
-				next = siblings(nd);
-
-				$pn = $(nd[_pn_]);
-				if (next.length) $pn.after($pn.clone().empty().append(next));
-				$pn.after(nd);
-			}
-		}
-
-		sel.setStart(sc, so);
-		sel.setEnd(ec, eo);
-		sel.select();
-
-		// save undo point
-		this.cast('SAVE_UNDO_POINT');
-		setTimeout(function(){ if (sel && sel[_sc_]) self.cast('ON_CHANGE_NODE', [sel[_sc_]]) }, 0);
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ Find
- */
-FindReplace = xe.createPlugin('FindReplace', {
-	init : function() {
-	},
-	activate : function() {
-	},
-	deactivate : function() {
-	},
-	API_EXEC_FIND : function() {
-	},
-	API_SHOW_FINDREPLACE_LAYER : function() {
-	},
-	API_SHOW_FINDREPLACE_LAYER : function() {
-	},
-	API_SHOW_FINDREPLACE_LAYER : function() {
-	},
-	API_HIDE_ALL_LAYER : function() {
-	}
-});
-/**
- * }}}
- */
-
-/**
- * {{{ XHTML Transitional scheme
- * This code is from the tinyMCE project.
- */
-var XHTMLT = {};
-(function(){
-	function unpack(lookup, data) {
-		function replace(value) {
-			return value.replace(/[A-Z]+/g, function(key) {
-				return replace(lookup[key]);
-			});
-		};
-
-		// Unpack lookup
-		$.each(lookup, function(key){ lookup[key] = replace(this) });
-
-		// Unpack and parse data into object map
-		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]/g, function(str, name, children) {
-			var i, map = {};
-
-			children = children.split(/\|/);
-
-			for (i = children.length - 1; i >= 0; i--)
-				map[children[i]] = 1;
-
-			XHTMLT[name] = map;
-		});
-	};
-
-	// This is the XHTML 1.0 transitional elements with it's children packed to reduce it's size
-	// we will later include the attributes here and use it as a default for valid elements but it
-	// requires us to rewrite the serializer engine
-	unpack({
-		Z : '#|H|K|N|O|P',
-		Y : '#|X|form|R|Q',
-		X : 'p|T|div|U|W|isindex|fieldset|table',
-		W : 'pre|hr|blockquote|address|center|noframes',
-		U : 'ul|ol|dl|menu|dir',
-		ZC : '#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',
-		T : 'h1|h2|h3|h4|h5|h6',
-		ZB : '#|X|S|Q',
-		S : 'R|P',
-		ZA : '#|a|G|J|M|O|P',
-		R : '#|a|H|K|N|O',
-		Q : 'noscript|P',
-		P : 'ins|del|script',
-		O : 'input|select|textarea|label|button',
-		N : 'M|L',
-		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',
-		L : 'sub|sup',
-		K : 'J|I',
-		J : 'tt|i|b|u|s|strike',
-		I : 'big|small|font|basefont',
-		H : 'G|F',
-		G : 'br|span|bdo',
-		F : 'object|applet|img|map|iframe'
-	}, 'script[]' +
-		'style[]' +
-		'object[#|param|X|form|a|H|K|N|O|Q]' +
-		'param[]' +
-		'p[S]' +
-		'a[Z]' +
-		'br[]' +
-		'span[S]' +
-		'bdo[S]' +
-		'applet[#|param|X|form|a|H|K|N|O|Q]' +
-		'h1[S]' +
-		'img[]' +
-		'map[X|form|Q|area]' +
-		'h2[S]' +
-		'iframe[#|X|form|a|H|K|N|O|Q]' +
-		'h3[S]' +
-		'tt[S]' +
-		'i[S]' +
-		'b[S]' +
-		'u[S]' +
-		's[S]' +
-		'strike[S]' +
-		'big[S]' +
-		'small[S]' +
-		'font[S]' +
-		'basefont[]' +
-		'em[S]' +
-		'strong[S]' +
-		'dfn[S]' +
-		'code[S]' +
-		'q[S]' +
-		'samp[S]' +
-		'kbd[S]' +
-		'var[S]' +
-		'cite[S]' +
-		'abbr[S]' +
-		'acronym[S]' +
-		'sub[S]' +
-		'sup[S]' +
-		'input[]' +
-		'select[optgroup|option]' +
-		'optgroup[option]' +
-		'option[]' +
-		'textarea[]' +
-		'label[S]' +
-		'button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' +
-		'h4[S]' +
-		'ins[#|X|form|a|H|K|N|O|Q]' +
-		'h5[S]' +
-		'del[#|X|form|a|H|K|N|O|Q]' +
-		'h6[S]' +
-		'div[#|X|form|a|H|K|N|O|Q]' +
-		'ul[li]' +
-		'li[#|X|form|a|H|K|N|O|Q]' +
-		'ol[li]' +
-		'dl[dt|dd]' +
-		'dt[S]' +
-		'dd[#|X|form|a|H|K|N|O|Q]' +
-		'menu[li]' +
-		'dir[li]' +
-		'pre[ZA]' +
-		'hr[]' +
-		'blockquote[#|X|form|a|H|K|N|O|Q]' +
-		'address[S|p]' +
-		'center[#|X|form|a|H|K|N|O|Q]' +
-		'noframes[#|X|form|a|H|K|N|O|Q]' +
-		'isindex[]' +
-		'fieldset[#|legend|X|form|a|H|K|N|O|Q]' +
-		'legend[S]' +
-		'table[caption|col|colgroup|thead|tfoot|tbody|tr]' +
-		'caption[S]' +
-		'col[]' +
-		'colgroup[col]' +
-		'thead[tr]' +
-		'tr[th|td]' +
-		'th[#|X|form|a|H|K|N|O|Q]' +
-		'form[#|X|a|H|K|N|O|Q]' +
-		'noscript[#|X|form|a|H|K|N|O|Q]' +
-		'td[#|X|form|a|H|K|N|O|Q]' +
-		'tfoot[tr]' +
-		'tbody[tr]' +
-		'area[]' +
-		'base[]' +
-		'body[#|X|form|a|H|K|N|O|Q]'
-	);
-})();
-/**
- * }}}
- */
-
-/**
- * {{{ Selection and Range Control class
- * This code is a modified version of HuskyRange, the SmartEditor project.
- */
-
-/**
- * {{{ @class W3CDOMRange
- * @brief A cross-browser implementation of W3C's DOM Range
- */
-function W3CDOMRange(){ this.init(); };
-$.extend(W3CDOMRange.prototype, {
-	init : function() {
-		this.collapsed = true;
-		this[_ca_] = d.body;
-		this[_ec_] = d.body;
-		this[_eo_] = 0;
-		this[_sc_] = d.body;
-		this[_so_] = 0;
-	},
-	cloneContents : function(){
-		var oClonedContents = d.createDocumentFragment();
-		var oTmpContainer   = d.createDocumentFragment();
-
-		var aNodes = this._getNodesInRange();
-
-		if(aNodes.length < 1) return oClonedContents;
-
-		var oClonedContainers = this._constructClonedTree(aNodes, oTmpContainer);
-
-		// oTopContainer = aNodes[aNodes.length-1].parentNode and this is not part of the initial array and only those child nodes should be cloned
-		var oTopContainer = oTmpContainer.firstChild;
-
-		if(oTopContainer){
-			var elCurNode = oTopContainer.firstChild, elNextNode;
-
-			while(elCurNode){
-				elNextNode = elCurNode[_ns_];
-				oClonedContents.appendChild(elCurNode);
-				elCurNode = elNextNode;
-			}
-		}
-
-		oClonedContainers = this._splitTextEndNodes({oStartContainer: oClonedContainers[_osc_], iStartOffset: this[_so_],
-													oEndContainer: oClonedContainers[_oec_], iEndOffset: this[_eo_]});
-
-		if(oClonedContainers[_osc_] && oClonedContainers[_osc_][_ps_])
-			dp(oClonedContainers[_osc_]).removeChild(oClonedContainers[_osc_][_ps_]);
-
-		if(oClonedContainers[_oec_] && oClonedContainers[_oec_][_ns_])
-			dp(oClonedContainers[_oec_]).removeChild(oClonedContainers[_oec_][_ns_]);
-
-		return oClonedContents;
-	},
-
-	_constructClonedTree : function(aNodes, oClonedParentNode){
-		var oClonedStartContainer = null;
-		var oClonedEndContainer   = null;
-
-		var oStartContainer = this[_sc_];
-		var oEndContainer   = this[_ec_];
-
-		_recurConstructClonedTree = function(aAllNodes, iCurIdx, oParentNode, oClonedParentNode){
-
-			if(iCurIdx < 0) return iCurIdx;
-
-			var iChildIdx = iCurIdx-1;
-
-			var oCurNodeCloneWithChildren = aAllNodes[iCurIdx].cloneNode(false);
-
-			if(aAllNodes[iCurIdx] == oStartContainer) oClonedStartContainer = oCurNodeCloneWithChildren;
-			if(aAllNodes[iCurIdx] == oEndContainer) oClonedEndContainer = oCurNodeCloneWithChildren;
-
-			while(iChildIdx >= 0 && dp(aAllNodes[iChildIdx]) == aAllNodes[iCurIdx]){
-				iChildIdx = this._recurConstructClonedTree(aAllNodes, iChildIdx, aAllNodes[iCurIdx], oCurNodeCloneWithChildren, oClonedStartContainer, oClonedEndContainer);
-			}
-
-			// this may trigger an error message in IE when an erroneous script is inserted
-			oClonedParentNode.insertBefore(oCurNodeCloneWithChildren, oClonedParentNode.firstChild);
-
-			return iChildIdx;
-		};
-
-		aNodes[aNodes.length] = dp(aNodes[aNodes.length-1]);
-		_recurConstructClonedTree(aNodes, aNodes.length-1, aNodes[aNodes.length-1], oClonedParentNode);
-
-		return {oStartContainer: oClonedStartContainer, oEndContainer: oClonedEndContainer};
-	},
-
-	cloneRange : function(){
-		return this._copyRange(new W3CDOMRange(d));
-	},
-
-	_copyRange : function(oClonedRange){
-		oClonedRange.collapsed = this.collapsed;
-		oClonedRange[_ca_] = this[_ca_];
-		oClonedRange[_ec_] = this[_ec_];
-		oClonedRange[_eo_] = this[_eo_];
-		oClonedRange[_sc_] = this[_sc_];
-		oClonedRange[_so_] = this[_so_];
-		oClonedRange._document = d;
-
-		return oClonedRange;
-	},
-
-	collapse : function(toStart){
-		if(toStart){
-			this[_ec_] = this[_sc_];
-			this[_eo_] = this[_so_];
-		}else{
-			this[_sc_] = this[_ec_];
-			this[_so_] = this[_eo_];
-		}
-
-		this._updateRangeInfo();
-	},
-
-	compareBoundaryPoints : function(how, sourceRange){
-		switch(how){
-			case W3CDOMRange.START_TO_START:
-				return this._compareEndPoint(this[_sc_], this[_so_], sourceRange[_sc_], sourceRange[_so_]);
-			case W3CDOMRange.START_TO_END:
-				return this._compareEndPoint(this[_ec_], this[_eo_], sourceRange[_sc_], sourceRange[_so_]);
-			case W3CDOMRange.END_TO_END:
-				return this._compareEndPoint(this[_ec_], this[_eo_], sourceRange[_ec_], sourceRange[_eo_]);
-			case W3CDOMRange.END_TO_START:
-				return this._compareEndPoint(this[_sc_], this[_so_], sourceRange[_ec_], sourceRange[_eo_]);
-		}
-	},
-
-	_findBody : function(oNode){
-		if(!oNode) return null;
-		while(oNode){
-			if(oNode[_nn_].toUpperCase() == "BODY") return oNode;
-			oNode = dp(oNode);
-		}
-		return null;
-	},
-
-	_compareEndPoint : function(oContainerA, iOffsetA, oContainerB, iOffsetB){
-		var iIdxA, iIdxB;
-
-		if(!oContainerA || this._findBody(oContainerA) != d.body){
-			oContainerA = d.body;
-			iOffsetA = 0;
-		}
-
-		if(!oContainerB || this._findBody(oContainerB) != d.body){
-			oContainerB = d.body;
-			iOffsetB = 0;
-		}
-
-		var compareIdx = function(iIdxA, iIdxB){
-			// iIdxX == -1 when the node is the commonAncestorNode
-			// if iIdxA == -1
-			// -> [[<nodeA>...<nodeB></nodeB>]]...</nodeA>
-			// if iIdxB == -1
-			// -> <nodeB>...[[<nodeA></nodeA>...</nodeB>]]
-			if(iIdxB == -1) iIdxB = iIdxA+1;
-			if(iIdxA < iIdxB) return -1;
-			if(iIdxA == iIdxB) return 0;
-			return 1;
-		};
-
-		var oCommonAncestor = this._getCommonAncestorContainer(oContainerA, oContainerB);
-
-		// ================================================================================================================================================
-		//  Move up both containers so that both containers are direct child nodes of the common ancestor node. From there, just compare the offset
-		// Add 0.5 for each contaienrs that has "moved up" since the actual node is wrapped by 1 or more parent nodes and therefore its position is somewhere between idx & idx+1
-		// <COMMON_ANCESTOR>NODE1<P>NODE2</P>NODE3</COMMON_ANCESTOR>
-		// The position of NODE2 in COMMON_ANCESTOR is somewhere between after NODE1(idx1) and before NODE3(idx2), so we let that be 1.5
-
-		// container node A in common ancestor container
-		var oNodeA = oContainerA;
-		if(oNodeA != oCommonAncestor){
-			while((oTmpNode = dp(oNodeA)) != oCommonAncestor){oNodeA = oTmpNode;}
-
-			iIdxA = this._getPosIdx(oNodeA)+0.5;
-		}else iIdxA = iOffsetA;
-
-		// container node B in common ancestor container
-		var oNodeB = oContainerB;
-		if(oNodeB != oCommonAncestor){
-			while((oTmpNode = dp(oNodeB)) != oCommonAncestor){oNodeB = oTmpNode;}
-
-			iIdxB = this._getPosIdx(oNodeB)+0.5;
-		}else iIdxB = iOffsetB;
-
-		return compareIdx(iIdxA, iIdxB);
-	},
-
-	_getCommonAncestorContainer : function(oNode1, oNode2){
-		var oComparingNode = oNode2;
-
-		while(oNode1){
-			while(oComparingNode){
-				if(oNode1 == oComparingNode) return oNode1;
-				oComparingNode = dp(oComparingNode);
-			}
-			oComparingNode = oNode2;
-			oNode1 = dp(oNode1);
-		}
-
-		return d.body;
-	},
-
-	deleteContents : function(){
-		if(this.collapsed) return;
-
-		this._splitTextEndNodesOfTheRange();
-
-		var aNodes = this._getNodesInRange();
-
-		if(aNodes.length < 1) return;
-
-		var oPrevNode = aNodes[0][_ps_];
-		while(oPrevNode && this._isBlankTextNode(oPrevNode)) oPrevNode = oPrevNode[_ps_];
-
-		var oNewStartContainer, iNewOffset;
-		if(!oPrevNode){
-			oNewStartContainer = dp(aNodes[0]);
-			iNewOffset = 0;
-		}
-
-		for(var i=0; i<aNodes.length; i++){
-			var oNode = aNodes[i];
-			if(!oNode.firstChild){
-				if(oNewStartContainer == oNode){
-					iNewOffset = this._getPosIdx(oNewStartContainer);
-					oNewStartContainer = dp(oNode);
-				}
-				dp(oNode).removeChild(oNode);
-			}
-		}
-
-		if(!oPrevNode){
-			this.setStart(oNewStartContainer, iNewOffset);
-		}else{
-			if(oPrevNode.tagName == "BODY")
-				this.setStartBefore(oPrevNode);
-			else
-				this.setStartAfter(oPrevNode);
-		}
-
-		this.collapse(true);
-	},
-
-	extractContents : function(){
-		var oClonedContents = this.cloneContents();
-		this.deleteContents();
-		return oClonedContents;
-	},
-
-	insertNode : function(newNode){
-		var oFirstNode = null, oParentContainer;
-
-		if(this[_sc_][_nt_] == 3) {
-			oParentContainer = dp(this[_sc_]);
-
-			// Fix Opera bug : How can a text node is a child node of the other text node?
-			while(oParentContainer[_nt_] == 3) oParentContainer = oParentContainer[_pn_];
-
-			if(this[_sc_].nodeValue.length <= this[_so_])
-				oFirstNode = this[_sc_][_ns_];
-			else
-				oFirstNode = this[_sc_].splitText(this[_so_]);
-		}else{
-			oParentContainer = this[_sc_];
-			oFirstNode = dc(this[_sc_])[this[_so_]];
-		}
-
-		if(!oFirstNode || !dp(oFirstNode)) oFirstNode = null;
-
-		oParentContainer.insertBefore(newNode, oFirstNode);
-
-		this.setStartBefore(newNode);
-	},
-
-	selectNode : function(refNode){
-		this.setStartBefore(refNode);
-		this.setEndAfter(refNode);
-	},
-
-	selectNodeContents : function(refNode){
-		this.setStart(refNode, 0);
-		this.setEnd(refNode, dc(refNode).length);
-	},
-
-	_endsNodeValidation : function(oNode, iOffset){
-		if(!oNode || this._findBody(oNode) != d.body) {
-			throw new Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
-		}
-
-		if(oNode[_nt_] == 3){
-			if(iOffset > oNode.nodeValue.length) iOffset = oNode.nodeValue.length;
-		}else{
-			if(iOffset > dc(oNode).length) iOffset = dc(oNode).length;
-		}
-
-		return iOffset;
-	},
-
-
-	setEnd : function(refNode, offset){
-		offset = this._endsNodeValidation(refNode, offset);
-
-		this[_ec_] = refNode;
-		this[_eo_] = offset;
-		if(!this[_sc_] || this._compareEndPoint(this[_sc_], this[_so_], this[_ec_], this[_eo_]) != -1) this.collapse(false);
-
-		this._updateRangeInfo();
-	},
-
-	setEndAfter : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");
-
-		if(refNode.tagName == "BODY"){
-			this.setEnd(refNode, dc(refNode).length);
-			return;
-		}
-		this.setEnd(dp(refNode), this._getPosIdx(refNode)+1);
-	},
-
-	setEndBefore : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");
-
-		if(refNode.tagName == "BODY"){
-			this.setEnd(refNode, 0);
-			return;
-		}
-
-		this.setEnd(dp(refNode), this._getPosIdx(refNode));
-	},
-
-	setStart : function(refNode, offset){
-		offset = this._endsNodeValidation(refNode, offset);
-
-		this[_sc_] = refNode;
-		this[_so_] = offset;
-
-		if(!this[_ec_] || this._compareEndPoint(this[_sc_], this[_so_], this[_ec_], this[_eo_]) != -1) this.collapse(true);
-		this._updateRangeInfo();
-	},
-
-	setStartAfter : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");
-
-		if(refNode.tagName == "BODY"){
-			this.setStart(refNode, dc(refNode).length);
-			return;
-		}
-
-		this.setStart(dp(refNode), this._getPosIdx(refNode)+1);
-	},
-
-	setStartBefore : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");
-
-		if(refNode.tagName == "BODY"){
-			this.setStart(refNode, 0);
-			return;
-		}
-		this.setStart(dp(refNode), this._getPosIdx(refNode));
-	},
-
-	surroundContents : function(newParent){
-		newParent.appendChild(this.extractContents());
-		this.insertNode(newParent);
-		this.selectNode(newParent);
-	},
-
-	toString : function(){
-		return $('<div />').append(this.cloneContents()).text();
-	},
-
-	_isBlankTextNode : function(oNode){
-		if(oNode[_nt_] == 3 && oNode.nodeValue == "") return true;
-		return false;
-	},
-
-	_getPosIdx : function(refNode){
-		var idx = 0;
-		for(var node = refNode[_ps_]; node; node = node[_ps_]) idx++;
-
-		return idx;
-	},
-
-	_updateRangeInfo : function(){
-		if(!this[_sc_]){
-			this.init();
-			return;
-		}
-
-		this.collapsed = this._isCollapsed(this[_sc_], this[_so_], this[_ec_], this[_eo_]);
-
-		this[_ca_] = this._getCommonAncestorContainer(this[_sc_], this[_ec_]);
-	},
-
-	_isCollapsed : function(oStartContainer, iStartOffset, oEndContainer, iEndOffset){
-		var bCollapsed = false;
-
-		if(oStartContainer == oEndContainer && iStartOffset == iEndOffset){
-			bCollapsed = true;
-		}else{
-			var oActualStartNode = this._getActualStartNode(oStartContainer, iStartOffset);
-			var oActualEndNode = this._getActualEndNode(oEndContainer, iEndOffset);
-
-			// Take the parent nodes on the same level for easier comparison when they're next to each other
-			// eg) From
-			//	<A>
-			//		<B>
-			//			<C>
-			//			</C>
-			//		</B>
-			//		<D>
-			//			<E>
-			//				<F>
-			//				</F>
-			//			</E>
-			//		</D>
-			//	</A>
-			//	, it's easier to compare the position of B and D rather than C and F because they are siblings
-			//
-			// If the range were collapsed, oActualEndNode will precede oActualStartNode by doing this
-			oActualStartNode = this._getNextNode(this._getPrevNode(oActualStartNode));
-			oActualEndNode = this._getPrevNode(this._getNextNode(oActualEndNode));
-
-			if(oActualStartNode && oActualEndNode && oActualEndNode.tagName != "BODY" &&
-				(this._getNextNode(oActualEndNode) == oActualStartNode || (oActualEndNode == oActualStartNode && this._isBlankTextNode(oActualEndNode)))
-			)
-				bCollapsed = true;
-		}
-
-		return bCollapsed;
-	},
-
-	_splitTextEndNodesOfTheRange : function(){
-		var oEndPoints = this._splitTextEndNodes({oStartContainer: this[_sc_], iStartOffset: this[_so_],
-													oEndContainer: this[_ec_], iEndOffset: this[_eo_]});
-
-		this[_sc_] = oEndPoints[_osc_];
-		this[_so_] = oEndPoints[_iso_];
-
-		this[_ec_] = oEndPoints[_oec_];
-		this[_eo_] = oEndPoints[_ieo_];
-	},
-
-	_splitTextEndNodes : function(oEndPoints){
-		oEndPoints = this._splitStartTextNode(oEndPoints);
-		oEndPoints = this._splitEndTextNode(oEndPoints);
-
-		return oEndPoints;
-	},
-
-	_splitStartTextNode : function(oEndPoints){
-		var oStartContainer = oEndPoints[_osc_];
-		var iStartOffset = oEndPoints[_iso_];
-
-		var oEndContainer = oEndPoints[_oec_];
-		var iEndOffset = oEndPoints[_ieo_];
-
-		if(!oStartContainer) return oEndPoints;
-		if(oStartContainer[_nt_] != 3) return oEndPoints;
-		if(iStartOffset == 0) return oEndPoints;
-
-		if(oStartContainer.nodeValue.length <= iStartOffset) return oEndPoints;
-
-		var oLastPart = oStartContainer.splitText(iStartOffset);
-
-		if(oStartContainer == oEndContainer){
-			iEndOffset -= iStartOffset;
-			oEndContainer = oLastPart;
-		}
-		oStartContainer = oLastPart;
-		iStartOffset = 0;
-
-		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
-	},
-
-	_splitEndTextNode : function(oEndPoints){
-		var oStartContainer = oEndPoints[_osc_];
-		var iStartOffset = oEndPoints[_iso_];
-
-		var oEndContainer = oEndPoints[_oec_];
-		var iEndOffset = oEndPoints[_ieo_];
-
-		if(!oEndContainer) return oEndPoints;
-		if(oEndContainer[_nt_] != 3) return oEndPoints;
-
-		if(iEndOffset >= oEndContainer.nodeValue.length) return oEndPoints;
-		if(iEndOffset == 0) return oEndPoints;
-
-		oEndContainer.splitText(iEndOffset);
-
-		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
-	},
-
-	_getNodesInRange : function(){
-		if(this.collapsed) return [];
-
-		var oStartNode = this._getActualStartNode(this[_sc_], this[_so_]);
-		var oEndNode = this._getActualEndNode(this[_ec_], this[_eo_]);
-
-		return this._getNodesBetween(oStartNode, oEndNode);
-	},
-
-	_getActualStartNode : function(oStartContainer, iStartOffset){
-		var oStartNode = oStartContainer;;
-
-		if(oStartContainer[_nt_] == 3){
-			if(iStartOffset >= oStartContainer.nodeValue.length){
-				oStartNode = this._getNextNode(oStartContainer);
-				if(oStartNode.tagName == "BODY") oStartNode = null;
-			}else{
-				oStartNode = oStartContainer;
-			}
-		}else{
-			if(iStartOffset < dc(oStartContainer).length){
-				oStartNode = dc(oStartContainer)[iStartOffset];
-			}else{
-				oStartNode = this._getNextNode(oStartContainer);
-				if(oStartNode.tagName == "BODY") oStartNode = null;
-			}
-		}
-
-		return oStartNode;
-	},
-
-	_getActualEndNode : function(oEndContainer, iEndOffset){
-		var oEndNode = oEndContainer;
-
-		if(iEndOffset == 0){
-			oEndNode = this._getPrevNode(oEndContainer);
-			if(oEndNode.tagName == "BODY") oEndNode = null;
-		}else if(oEndContainer[_nt_] == 3){
-			oEndNode = oEndContainer;
-		}else{
-			oEndNode = dc(oEndContainer)[iEndOffset-1];
-		}
-
-		return oEndNode;
-	},
-
-	_getNextNode : function(oNode){
-		if(!oNode || oNode.tagName == "BODY") return d.body;
-
-		if(oNode[_ns_]) return oNode[_ns_];
-
-		return this._getNextNode(dp(oNode));
-	},
-
-	_getPrevNode : function(oNode){
-		if(!oNode || oNode.tagName == "BODY") return d.body;
-
-		if(oNode[_ps_]) return oNode[_ps_];
-
-		return this._getPrevNode(dp(oNode));
-	},
-
-	// includes partially selected
-	// for <div id="a"><div id="b"></div></div><div id="c"></div>, _getNodesBetween(b, c) will yield to b, "a" and c
-	_getNodesBetween : function(oStartNode, oEndNode){
-		var aNodesBetween = [];
-		this._nNodesBetweenLen = 0;
-
-		if(!oStartNode || !oEndNode) return aNodesBetween;
-
-		this._recurGetNextNodesUntil(oStartNode, oEndNode, aNodesBetween);
-		return aNodesBetween;
-	},
-
-	_recurGetNextNodesUntil : function(oNode, oEndNode, aNodesBetween){
-		if(!oNode) return false;
-
-		if(!this._recurGetChildNodesUntil(oNode, oEndNode, aNodesBetween)) return false;
-
-		var oNextToChk = oNode[_ns_];
-
-		while(!oNextToChk){
-			if(!(oNode = dp(oNode))) return false;
-
-			aNodesBetween[this._nNodesBetweenLen++] = oNode;
-
-			if(oNode == oEndNode) return false;
-
-			oNextToChk = oNode[_ns_];
-		}
-
-		return this._recurGetNextNodesUntil(oNextToChk, oEndNode, aNodesBetween);
-	},
-
-	_recurGetChildNodesUntil : function(oNode, oEndNode, aNodesBetween){
-		if(!oNode) return false;
-
-		var bEndFound = false;
-		var oCurNode = oNode;
-		if(oCurNode.firstChild){
-			oCurNode = oCurNode.firstChild;
-			while(oCurNode){
-				if(!this._recurGetChildNodesUntil(oCurNode, oEndNode, aNodesBetween)){
-					bEndFound = true;
-					break;
-				}
-				oCurNode = oCurNode[_ns_];
-			}
-		}
-
-		aNodesBetween[this._nNodesBetweenLen++] = oNode;
-
-		if(bEndFound) return false;
-		if(oNode == oEndNode) return false;
-
-		return true;
-	}
-});
-
-W3CDOMRange.START_TO_START = 0;
-W3CDOMRange.START_TO_END = 1;
-W3CDOMRange.END_TO_END = 2;
-W3CDOMRange.END_TO_START = 3;
-/**
- * }}} W3CDOMRange
- */
-
-/**
- * {{{ @class HuskyRange
- * @brief A cross-browser function that implements all of the W3C's DOM Range specification and some more
- */
-var
-	HUSKY_BOOKMARK_START_ID_PREFIX = "husky_bookmark_start_",
-	HUSKY_BOOKMARK_END_ID_PREFIX = "husky_bookmark_end_",
-	rxLineBreaker = new RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$");
-
-function HuskyRange(){ this.init(); }
-$.extend(HuskyRange.prototype, W3CDOMRange.prototype, {
-	init : function(){
-		this.oSimpleSelection = new SimpleSelection();
-		this.selectionLoaded = this.oSimpleSelection.selectionLoaded;
-
-		W3CDOMRange.prototype.init.apply(this);
-	},
-
-	select : function(){
-		this.oSimpleSelection.selectRange(this);
-	},
-
-	setFromSelection : function(iNum){
-		this.setRange(this.oSimpleSelection.getRangeAt(iNum));
-	},
-
-	setRange : function(oW3CRange){
-		this.setStart(oW3CRange[_sc_], oW3CRange[_so_]);
-		this.setEnd(oW3CRange[_ec_], oW3CRange[_eo_]);
-	},
-
-	setEndNodes : function(oSNode, oENode){
-		this.setEndAfter(oENode);
-		this.setStartBefore(oSNode);
-	},
-
-	splitTextAtBothEnds : function(){
-		this._splitTextEndNodesOfTheRange();
-	},
-
-	getStartNode : function(){
-		if(this.collapsed){
-			if(this[_sc_][_nt_] == 3){
-				if(this[_so_] == 0) return this[_sc_];
-				if(this[_sc_].nodeValue.length <= this[_so_]) return null;
-				return this[_sc_];
-			}
-			return null;
-		}
-
-		if(this[_sc_][_nt_] == 3){
-			if(this[_so_] >= this[_sc_].nodeValue.length) return this._getNextNode(this[_sc_]);
-			return this[_sc_];
-		}else{
-			if(this[_so_] >= dc(this[_sc_]).length) return this._getNextNode(this[_sc_]);
-			return dc(this[_sc_])[this[_so_]];
-		}
-	},
-
-	getEndNode : function(){
-		if(this.collapsed) return this.getStartNode();
-
-		if(this[_ec_][_nt_] == 3){
-			if(this[_eo_] == 0) return this._getPrevNode(this[_ec_]);
-			return this[_ec_];
-		}else{
-			if(this[_eo_] == 0) return this._getPrevNode(this[_ec_]);
-			return dc(this[_ec_])[this[_eo_]-1];
-		}
-	},
-
-	getNodeAroundRange : function(bBefore, bStrict){
-		if(this.collapsed && this[_sc_] && this[_sc_][_nt_] == 3) return this[_sc_];
-		if(!this.collapsed || (this[_sc_] && this[_sc_][_nt_] == 3)) return this.getStartNode();
-
-		var oBeforeRange, oAfterRange, oResult;
-
-		if(this[_so_] >= dc(this[_sc_]).length)
-			oAfterRange = this._getNextNode(this[_sc_]);
-		else
-			oAfterRange = dc(this[_sc_])[this[_so_]];
-
-		if(this[_eo_] == 0)
-			oBeforeRange = this._getPrevNode(this[_ec_]);
-		else
-			oBeforeRange = dc(this[_ec_])[this[_eo_]-1];
-
-		if(bBefore){
-			oResult = oBeforeRange;
-			if(!oResult && !bStrict) oResult = oAfterRange;
-		}else{
-			oResult = oAfterRange;
-			if(!oResult && !bStrict) oResult = oBeforeRange;
-		}
-
-		return oResult;
-	},
-
-	_getXPath : function(elNode){
-		var sXPath = "";
-
-		while(elNode && elNode[_nt_] == 1){
-			sXPath = "/" + elNode.tagName+"["+this._getPosIdx4XPath(elNode)+"]" + sXPath;
-			elNode = dp(elNode);
-		}
-
-		return sXPath;
-	},
-
-	_getPosIdx4XPath : function(refNode){
-		var idx = 0;
-		for(var node = refNode[_ps_]; node; node = node[_ps_])
-			if(node.tagName == refNode.tagName) idx++;
-
-		return idx;
-	},
-
-	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
-	_evaluateXPath : function(sXPath, oDoc){
-		sXPath = sXPath.substring(1, sXPath.length-1);
-		var aXPath = sXPath.split(/\//);
-		var elNode = oDoc.body;
-
-		for(var i=2; i<aXPath.length && elNode; i++){
-			aXPath[i].match(/([^\[]+)\[(\d+)/i);
-			var sTagName = RegExp.$1;
-			var nIdx = RegExp.$2;
-
-			var aAllNodes = dc(elNode);
-			var aNodes = [];
-			var nLength = aAllNodes.length;
-			var nCount = 0;
-			for(var ii=0; ii<nLength; ii++){
-				if(aAllNodes[ii].tagName == sTagName) aNodes[nCount++] = aAllNodes[ii];
-			}
-
-			if(aNodes.length < nIdx)
-				elNode = null;
-			else
-				elNode = aNodes[nIdx];
-		}
-
-		return elNode;
-	},
-
-	_evaluateXPathBookmark : function(oBookmark){
-		var sXPath = oBookmark["sXPath"];
-		var nTextNodeIdx = oBookmark["nTextNodeIdx"];
-		var nOffset = oBookmark["nOffset"];
-
-		var elContainer = this._evaluateXPath(sXPath, d);
-
-		if(nTextNodeIdx > -1 && elContainer){
-			var aChildNodes = dc(elContainer);
-			var elNode = null;
-
-			var nIdx = nTextNodeIdx;
-			var nOffsetLeft = nOffset;
-
-			while((elNode = aChildNodes[nIdx]) && elNode[_nt_] == 3 && elNode.nodeValue.length < nOffsetLeft){
-				nOffsetLeft -= elNode.nodeValue.length;
-				nIdx++;
-			}
-
-			elContainer = dc(elContainer)[nIdx];
-			nOffset = nOffsetLeft;
-		}
-
-		if(!elContainer){
-			elContainer = d.body;
-			nOffset = 0;
-		}
-		return {elContainer: elContainer, nOffset: nOffset};
-	},
-
-	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
-	getXPathBookmark : function(){
-		var nTextNodeIdx1 = -1;
-		var htEndPt1 = {elContainer: this[_sc_], nOffset: this[_so_]};
-		var elNode1 = this[_sc_];
-		if(elNode1[_nt_] == 3){
-			htEndPt1 = this._getFixedStartTextNode();
-			nTextNodeIdx1 = this._getPosIdx(htEndPt1.elContainer);
-			elNode1 = dp(elNode1);
-		}
-		var sXPathNode1 = this._getXPath(elNode1);
-		var oBookmark1 = {sXPath:sXPathNode1, nTextNodeIdx:nTextNodeIdx1, nOffset: htEndPt1.nOffset};
-
-		var nTextNodeIdx2 = -1;
-		var htEndPt2 = {elContainer: this[_ec_], nOffset: this[_eo_]};
-		var elNode2 = this[_ec_];
-		if(elNode2[_nt_] == 3){
-			htEndPt2 = this._getFixedEndTextNode();
-			nTextNodeIdx2 = this._getPosIdx(htEndPt2.elContainer);
-			elNode2 = dp(elNode2);
-		}
-		var sXPathNode2 = this._getXPath(elNode2);
-		var oBookmark2 = {sXPath:sXPathNode2, nTextNodeIdx:nTextNodeIdx2, nOffset: htEndPt2.nOffset};
-
-		return [oBookmark1, oBookmark2];
-	},
-
-	moveToXPathBookmark : function(aBookmark){
-		if(!aBookmark) return;
-
-		var oBookmarkInfo1 = this._evaluateXPathBookmark(aBookmark[0]);
-		var oBookmarkInfo2 = this._evaluateXPathBookmark(aBookmark[1]);
-
-		if(!oBookmarkInfo1["elContainer"] || !oBookmarkInfo2["elContainer"]) return;
-
-		this[_sc_] = oBookmarkInfo1["elContainer"];
-		this[_so_] = oBookmarkInfo1["nOffset"];
-
-		this[_ec_] = oBookmarkInfo2["elContainer"];
-		this[_eo_] = oBookmarkInfo2["nOffset"];
-	},
-
-	_getFixedTextContainer : function(elNode, nOffset){
-		while(elNode && elNode[_nt_] == 3 && elNode[_ps_] && elNode[_ps_][_nt_] == 3){
-			nOffset += elNode[_ps_].nodeValue.length;
-			elNode = elNode[_ps_];
-		}
-
-		return {elContainer:elNode, nOffset:nOffset};
-	},
-
-	_getFixedStartTextNode : function(){
-		return this._getFixedTextContainer(this[_sc_], this[_so_]);
-	},
-
-	_getFixedEndTextNode : function(){
-		return this._getFixedTextContainer(this[_ec_], this[_eo_]);
-	},
-
-	placeStringBookmark : function(){
-		var sTmpId = (new Date()).getTime(), oInsertionPoint, oEndMarker, oStartMarker;
-
-		(oInsertionPoint = this.cloneRange()).collapseToEnd();
-		oInsertionPoint.insertNode( $('<a>').attr('id', HUSKY_BOOKMARK_END_ID_PREFIX+sTmpId)[0] );
-
-		(oInsertionPoint = this.cloneRange()).collapseToStart();
-		oInsertionPoint.insertNode( $('<a>').attr('id', HUSKY_BOOKMARK_START_ID_PREFIX+sTmpId)[0] );
-
-		this.moveToBookmark(sTmpId);
-
-		return sTmpId;
-	},
-
-	cloneRange : function(){
-		return this._copyRange(new HuskyRange());
-	},
-
-	moveToBookmark : function(vBookmark){
-		if(typeof(vBookmark) != "object")
-			this.moveToStringBookmark(vBookmark);
-		else
-			this.moveToXPathBookmark(vBookmark);
-	},
-
-	moveToStringBookmark : function(sBookmarkID){
-		var oStartMarker = $('#'+HUSKY_BOOKMARK_START_ID_PREFIX+sBookmarkID)[0];
-		var oEndMarker = $('#'+HUSKY_BOOKMARK_END_ID_PREFIX+sBookmarkID)[0];
-
-		if(!oStartMarker || !oEndMarker) return;
-
-		this.setEndBefore(oEndMarker);
-		this.setStartAfter(oStartMarker);
-	},
-
-	removeStringBookmark : function(sBookmarkID){
-		$(
-			'#' + HUSKY_BOOKMARK_START_ID_PREFIX + sBookmarkID + ',' +
-			'#' + HUSKY_BOOKMARK_END_ID_PREFIX   + sBookmarkID
-		).remove();
-	},
-
-	collapseToStart : function(){
-		this.collapse(true);
-	},
-
-	collapseToEnd : function(){
-		this.collapse(false);
-	},
-
-	createAndInsertNode : function(sTagName){
-		tmpNode = d.createElement(tagName);
-		this.insertNode(tmpNode);
-		return tmpNode;
-	},
-
-	getNodes : function(bSplitTextEndNodes, fnFilter){
-		if(bSplitTextEndNodes) this._splitTextEndNodesOfTheRange();
-
-		var aAllNodes = this._getNodesInRange();
-		var aFilteredNodes = [];
-
-		if(!fnFilter) return aAllNodes;
-
-		for(var i=0; i<aAllNodes.length; i++)
-			if(fnFilter(aAllNodes[i])) aFilteredNodes[aFilteredNodes.length] = aAllNodes[i];
-
-		return aFilteredNodes;
-	},
-
-	getTextNodes : function(bSplitTextEndNodes){
-		var txtFilter = function(oNode){
-			if (oNode[_nt_] == 3 && oNode.nodeValue != "\n" && oNode.nodeValue != "")
-				return true;
-			else
-				return false;
-		}
-
-		return this.getNodes(bSplitTextEndNodes, txtFilter);
-	},
-
-	surroundContentsWithNewNode : function(sTagName){
-		var oNewParent = d.createElement(sTagName);
-		this.surroundContents(oNewParent);
-		return oNewParent;
-	},
-
-	isRangeInRange : function(oAnotherRange, bIncludePartlySelected){
-		var startToStart = this.compareBoundaryPoints(this.START_TO_START, oAnotherRange);
-		var startToEnd = this.compareBoundaryPoints(this.START_TO_END, oAnotherRange);
-		var endToStart = this.compareBoundaryPoints(this.END_TO_START, oAnotherRange);
-		var endToEnd = this.compareBoundaryPoints(this.END_TO_END, oAnotherRange);
-
-		if(startToStart <= 0 && endToEnd >= 0) return true;
-		return bIncludePartlySelected && (startToEnd != 1 && endToStart != -1);
-	},
-
-	isNodeInRange : function(oNode, bIncludePartlySelected, bContentOnly){
-		var oTmpRange = new HuskyRange();
-
-		if(bContentOnly && oNode.firstChild){
-			oTmpRange.setStartBefore(oNode.firstChild);
-			oTmpRange.setEndAfter(oNode.lastChild);
-		}else{
-			oTmpRange.selectNode(oNode);
-		}
-
-		return this.isRangeInRange(oTmpRange, !!bIncludePartlySelected);
-	},
-
-	pasteHTML : function(sHTML){
-		if(sHTML == ""){
-			this.deleteContents();
-			return;
-		}
-
-		var oTmpDiv = $('<div>').html(sHTML)[0];
-		var oFirstNode = oTmpDiv.firstChild;
-		var oLastNode = oTmpDiv.lastChild;
-
-		var clone = this.cloneRange();
-		var sBM = clone.placeStringBookmark();
-
-		while(oTmpDiv.lastChild) this.insertNode(oTmpDiv.lastChild);
-
-		this.setEndNodes(oFirstNode, oLastNode);
-
-		// delete the content later as deleting it first may mass up the insertion point
-		// eg) <p>[A]BCD</p> ---paste O---> O<p>BCD</p>
-		clone.moveToBookmark(sBM);
-		clone.deleteContents();
-		clone.removeStringBookmark(sBM);
-	},
-
-	toString : function(){
-		this.toString = W3CDOMRange.prototype.toString;
-		return this.toString();
-	},
-
-	toHTMLString : function(){
-		return $('<div>').append(this.cloneContents()).html();
-	},
-
-	findAncestorByTagName : function(sTagName){
-		var oNode = this[_ca_];
-		while(oNode && oNode.tagName != sTagName) oNode = dp(oNode);
-
-		return oNode;
-	},
-
-	selectNodeContents : function(oNode){
-		if(!oNode) return;
-
-		var oFirstNode = oNode.firstChild?oNode.firstChild:oNode;
-		var oLastNode = oNode.lastChild?oNode.lastChild:oNode;
-
-		if(oFirstNode[_nt_] == 3)
-			this.setStart(oFirstNode, 0);
-		else
-			this.setStartBefore(oFirstNode);
-
-		if(oLastNode[_nt_] == 3)
-			this.setEnd(oLastNode, oLastNode.nodeValue.length);
-		else
-			this.setEndAfter(oLastNode);
-	},
-
-	styleRange : function(oStyle, oAttribute, sNewSpanMarker){
-		var aStyleParents = this._getStyleParentNodes(sNewSpanMarker), c = aStyleParents.length, i;
-		if(c < 1) return;
-
-		for(i=0; i < c; i++) {
-			if (oStyle) $(aStyleParents[i]).css(oStyle);
-			if (oAttribute) $(aStyleParents[i]).attr(oAttribute);
-		}
-
-		this.setStartBefore(aStyleParents[0]);
-		this.setEndAfter(aStyleParents[aStyleParents.length-1]);
-	},
-
-	_getStyleParentNodes : function(sNewSpanMarker){
-		this._splitTextEndNodesOfTheRange();
-
-		var oSNode = this.getStartNode();
-		var oENode = this.getEndNode();
-
-		var aAllNodes = this._getNodesInRange();
-		var aResult = [];
-		var nResult = 0;
-
-		var oNode, oTmpNode, iStartRelPos, iEndRelPos, $span, iSIdx, iEIdx;
-		var nInitialLength = aAllNodes.length;
-		var arAllBottmNodes = array_filter(aAllNodes, function(v){return (!v.firstChild);});
-
-		for(var i=0; i<nInitialLength; i++){
-			oNode = aAllNodes[i];
-
-			if(!oNode) continue;
-			if(oNode[_nt_] != 3) continue;
-			if(oNode.nodeValue == "") continue;
-
-			var oParentNode = dp(oNode);
-
-			if(oParentNode.tagName == "SPAN"){
-				// check if the SPAN element is fully contained
-				// do quick checks before trying indexOf() because indexOf() function is very slow
-				oTmpNode = this._getVeryFirstRealChild(oParentNode);
-				if(oTmpNode == oNode) iSIdx = 1;
-				else iSIdx = arAllBottmNodes.indexOf(oTmpNode);
-
-				if(iSIdx != -1){
-					oTmpNode = this._getVeryLastRealChild(oParentNode);
-					if(oTmpNode == oNode) iEIdx = 1;
-					else iEIdx = arAllBottmNodes.indexOf(oTmpNode);
-				}
-
-				if(iSIdx != -1 && iEIdx != -1){
-					aResult[nResult++] = oParentNode;
-					continue;
-				}
-			}
-
-			aResult[nResult++] = $span = $(oNode).wrap('<span />').parent()[0];
-
-			if(sNewSpanMarker) $span.attr(sNewSpanMarker, "true");
-		}
-
-		this.setStartBefore(oSNode);
-		this.setEndAfter(oENode);
-
-		return aResult;
-	},
-
-	_getVeryFirstChild : function(oNode){
-		if(oNode.firstChild) return this._getVeryFirstChild(oNode.firstChild);
-		return oNode;
-	},
-
-	_getVeryLastChild : function(oNode){
-		if(oNode.lastChild) return this._getVeryLastChild(oNode.lastChild);
-		return oNode;
-	},
-
-	_getFirstRealChild : function(oNode){
-		var oFirstNode = oNode.firstChild;
-		while(oFirstNode && oFirstNode[_nt_] == 3 && oFirstNode.nodeValue == "") oFirstNode = oFirstNode[_ns_];
-
-		return oFirstNode;
-	},
-
-	_getLastRealChild : function(oNode){
-		var oLastNode = oNode.lastChild;
-		while(oLastNode && oLastNode[_nt_] == 3 && oLastNode.nodeValue == "") oLastNode = oLastNode[_ps_];
-
-		return oLastNode;
-	},
-
-	_getVeryFirstRealChild : function(oNode){
-		var oFirstNode = this._getFirstRealChild(oNode);
-		if(oFirstNode) return this._getVeryFirstRealChild(oFirstNode);
-		return oNode;
-	},
-	_getVeryLastRealChild : function(oNode){
-		var oLastNode = this._getLastRealChild(oNode);
-		if(oLastNode) return this._getVeryLastChild(oLastNode);
-		return oNode;
-	},
-
-	_getLineStartInfo : function(node){
-		var frontEndFinal = null;
-		var frontEnd = node;
-		var lineBreaker = node;
-		var bParentBreak = true;
-
-		// vertical(parent) search
-		function getLineStart(node){
-			if(!node) return;
-			if(frontEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				frontEndFinal = frontEnd;
-
-				bParentBreak = true;
-
-				return;
-			}else{
-				frontEnd = node;
-			}
-
-			getFrontEnd(node[_ps_]);
-
-			if(frontEndFinal) return;
-			getLineStart(dp(node));
-		}
-
-		// horizontal(sibling) search
-		function getFrontEnd(node){
-			if(!node) return;
-			if(frontEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				frontEndFinal = frontEnd;
-
-				bParentBreak = false;
-				return;
-			}
-
-			if(node.firstChild && node.tagName != "TABLE"){
-				var curNode = node.lastChild;
-				while(curNode && !frontEndFinal){
-					getFrontEnd(curNode);
-
-					curNode = curNode[_ps_];
-				}
-			}else{
-				frontEnd = node;
-			}
-
-			if(!frontEndFinal){
-				getFrontEnd(node[_ps_]);
-			}
-		}
-
-		getLineStart(node);
-
-		return {oNode: frontEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
-	},
-
-	_getLineEndInfo : function(node){
-		var backEndFinal = null;
-		var backEnd = node;
-		var lineBreaker = node;
-		var bParentBreak = true;
-
-		// vertical(parent) search
-		function getLineEnd(node){
-			if(!node) return;
-			if(backEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				backEndFinal = backEnd;
-
-				bParentBreak = true;
-
-				return;
-			}else{
-				backEnd = node;
-			}
-
-			getBackEnd(node[_ns_]);
-			if(backEndFinal) return;
-
-			getLineEnd(dp(node));
-		}
-
-		// horizontal(sibling) search
-		function getBackEnd(node){
-			if(!node) return;
-			if(backEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				backEndFinal = backEnd;
-
-				bParentBreak = false;
-
-				return;
-			}
-
-			if(node.firstChild && node.tagName != "TABLE"){
-				var curNode = node.firstChild;
-				while(curNode && !backEndFinal){
-					getBackEnd(curNode);
-
-					curNode = curNode[_ns_];
-				}
-			}else{
-				backEnd = node;
-			}
-
-			if(!backEndFinal){
-				getBackEnd(node[_ns_]);
-			}
-		}
-
-		getLineEnd(node);
-
-		return {oNode: backEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
-	},
-
-	getLineInfo : function(){
-		var oSNode = this.getStartNode();
-		var oENode = this.getEndNode();
-
-		// the range is currently collapsed
-		if(!oSNode) oSNode = this.getNodeAroundRange(true, true);
-		if(!oENode) oENode = this.getNodeAroundRange(true, true);
-
-		var oStart = this._getLineStartInfo(oSNode);
-		var oStartNode = oStart.oNode;
-		var oEnd = this._getLineEndInfo(oENode);
-		var oEndNode = oEnd.oNode;
-
-		var iRelativeStartPos = this._compareEndPoint(dp(oStartNode), this._getPosIdx(oStartNode), this[_ec_], this[_eo_]);
-		var iRelativeEndPos = this._compareEndPoint(dp(oEndNode), this._getPosIdx(oEndNode)+1, this[_sc_], this[_so_]);
-
-		if(!(iRelativeStartPos <= 0 && iRelativeEndPos >= 0)){
-			oSNode = this.getNodeAroundRange(false, true);
-			oENode = this.getNodeAroundRange(false, true);
-			oStart = this._getLineStartInfo(oSNode);
-			oEnd = this._getLineEndInfo(oENode);
-		}
-
-		return {oStart: oStart, oEnd: oEnd};
-	}
-});
-/**
- * }}} HuskyRange
- */
-
-/**
- * {{{ @class SimpleSelection
- * @brief Cross-browser selection function
- */
-function SimpleSelection(win){
-	this.init();
-
-	if(!this._oSelection) this.selectionLoaded = false;
-};
-$.extend(SimpleSelection.prototype, {
-	selectionLoaded : true,
-	selectRange : function(oRng) {
-		this.selectNone();
-		this.addRange(oRng);
-	}
-});
-
-function SimpleSelectionImpl_FF() { };
-$.extend(SimpleSelectionImpl_FF.prototype, {
-	init : function() {
-		this._oSelection = window.getSelection();
-	},
-	getRangeAt : function(iNum) {
-		iNum = iNum || 0;
-
-		try{
-			var oFFRange = this._oSelection.getRangeAt(iNum);
-		}catch(e){return new W3CDOMRange();}
-
-		return this._FFRange2W3CRange(oFFRange);
-	},
-	addRange : function(oW3CRange){
-		var oFFRange = this._W3CRange2FFRange(oW3CRange);
-		this._oSelection.addRange(oFFRange);
-	},
-	selectNone : function() {
-		this._oSelection.removeAllRanges();
-	},
-	_FFRange2W3CRange : function(oFFRange){
-		var oW3CRange = new W3CDOMRange();
-		oW3CRange.setStart(oFFRange[_sc_], oFFRange[_so_]);
-		oW3CRange.setEnd(oFFRange[_ec_], oFFRange[_eo_]);
-		return oW3CRange;
-	},
-	_W3CRange2FFRange : function(oW3CRange){
-		var oFFRange = d.createRange();
-		oFFRange.setStart(oW3CRange[_sc_], oW3CRange[_so_]);
-		oFFRange.setEnd(oW3CRange[_ec_], oW3CRange[_eo_]);
-
-		return oFFRange;
-	}
-});
-
-function SimpleSelectionImpl_IE(){ };
-$.extend(SimpleSelectionImpl_IE.prototype, {
-	init : function() {
-		this._oSelection = d.selection;
-	},
-	getRangeAt : function(iNum) {
-		iNum = iNum || 0;
-
-		if(this._oSelection.type == "Control"){
-			var oW3CRange = new W3CDOMRange();
-			var oSelectedNode = this._oSelection.createRange().item(iNum);
-
-			// if the selction occurs in a different document, ignore
-			if(!oSelectedNode || oSelectedNode.ownerDocument != d) return oW3CRange;
-
-			oW3CRange.selectNode(oSelectedNode);
-
-			return oW3CRange;
-		}else{
-			var oSelectedNode = this._oSelection.createRangeCollection().item(iNum).parentElement();
-
-			// if the selction occurs in a different document, ignore
-			if(!oSelectedNode || oSelectedNode.ownerDocument != d){
-				var oW3CRange = new W3CDOMRange();
-				return oW3CRange;
-			}
-			return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(iNum));
-		}
-	},
-	addRange : function(oW3CRange){
-		var oIERange = this._W3CRange2IERange(oW3CRange);
-		oIERange.select();
-	},
-	selectNone : function(){
-		this._oSelection.empty();
-	},
-	_W3CRange2IERange : function(oW3CRange){
-		var oStartIERange = this._getIERangeAt(oW3CRange[_sc_], oW3CRange[_so_]);
-		var oEndIERange = this._getIERangeAt(oW3CRange[_ec_], oW3CRange[_eo_]);
-		oStartIERange.setEndPoint("EndToEnd", oEndIERange);
-
-		return oStartIERange;
-	},
-	_getIERangeAt : function(oW3CContainer, iW3COffset){
-		var oIERange = d.body.createTextRange();
-
-		var oEndPointInfoForIERange = this._getSelectableNodeAndOffsetForIE(oW3CContainer, iW3COffset);
-
-		var oSelectableNode = oEndPointInfoForIERange.oSelectableNodeForIE;
-		var iIEOffset = oEndPointInfoForIERange.iOffsetForIE;
-
-		oIERange.moveToElementText(oSelectableNode);
-		oIERange.collapse(oEndPointInfoForIERange.bCollapseToStart);
-		oIERange.moveStart("character", iIEOffset);
-
-		return oIERange;
-	},
-	_getSelectableNodeAndOffsetForIE : function(oW3CContainer, iW3COffset){
-		var oIERange = d.body.createTextRange();
-
-		var oNonTextNode = null;
-		var aChildNodes =  null;
-		var iNumOfLeftNodesToCount = 0;
-
-		if(oW3CContainer[_nt_] == 3){
-			oNonTextNode = dp(oW3CContainer);
-			aChildNodes = dc(oNonTextNode);
-			iNumOfLeftNodesToCount = aChildNodes.length;
-		}else{
-			oNonTextNode = oW3CContainer;
-			aChildNodes = dc(oNonTextNode);
-			iNumOfLeftNodesToCount = iW3COffset;
-		}
-
-		var oNodeTester = null;
-
-		var iResultOffset = 0;
-
-		var bCollapseToStart = true;
-
-		for(var i=0; i<iNumOfLeftNodesToCount; i++){
-			oNodeTester = aChildNodes[i];
-
-			if(oNodeTester[_nt_] == 3){
-				if(oNodeTester == oW3CContainer) break;
-
-				iResultOffset += oNodeTester.nodeValue.length;
-			}else{
-				oIERange.moveToElementText(oNodeTester);
-				oNonTextNode = oNodeTester;
-				iResultOffset = 0;
-
-				bCollapseToStart = false;
-			}
-		}
-
-		if(oW3CContainer[_nt_] == 3) iResultOffset += iW3COffset;
-
-		return {oSelectableNodeForIE:oNonTextNode, iOffsetForIE: iResultOffset, bCollapseToStart: bCollapseToStart};
-	},
-	_IERange2W3CRange : function(oIERange){
-		var oW3CRange = new W3CDOMRange();
-
-		var oIEPointRange = null;
-		var oPosition = null;
-
-		oIEPointRange = oIERange.duplicate();
-		oIEPointRange.collapse(true);
-
-		oPosition = this._getW3CContainerAndOffset(oIEPointRange, true);
-
-		oW3CRange.setStart(oPosition.oContainer, oPosition.iOffset);
-
-		var oCollapsedChecker = oIERange.duplicate();
-		oCollapsedChecker.collapse(true);
-		if(oCollapsedChecker.isEqual(oIERange)){
-			oW3CRange.collapse(true);
-		}else{
-			oIEPointRange = oIERange.duplicate();
-			oIEPointRange.collapse(false);
-			oPosition = this._getW3CContainerAndOffset(oIEPointRange);
-			oW3CRange.setEnd(oPosition.oContainer, oPosition.iOffset);
-		}
-
-		return oW3CRange;
-	},
-	_getW3CContainerAndOffset : function(oIEPointRange, bStartPt){
-		var oRgOrigPoint = oIEPointRange;
-
-		var oContainer = oRgOrigPoint.parentElement();
-		var offset = -1;
-
-		var oRgTester = d.body.createTextRange();
-		var aChildNodes = dc(oContainer);
-		var oPrevNonTextNode = null;
-		var pointRangeIdx = 0;
-
-		for(var i=0;i<aChildNodes.length;i++){
-			if(aChildNodes[i][_nt_] == 3) continue;
-
-			oRgTester.moveToElementText(aChildNodes[i]);
-
-			if(oRgTester.compareEndPoints("StartToStart", oIEPointRange)>=0) break;
-
-			oPrevNonTextNode = aChildNodes[i];
-		}
-
-		var pointRangeIdx = i;
-
-		if(pointRangeIdx != 0 && aChildNodes[pointRangeIdx-1][_nt_] == 3){
-			var oRgTextStart = d.body.createTextRange();
-			var oCurTextNode = null;
-			if(oPrevNonTextNode){
-				oRgTextStart.moveToElementText(oPrevNonTextNode);
-				oRgTextStart.collapse(false);
-				oCurTextNode = oPrevNonTextNode.nextSibling;
-			}else{
-				oRgTextStart.moveToElementText(oContainer);
-				oRgTextStart.collapse(true);
-				oCurTextNode = oContainer.firstChild;
-			}
-
-			var oRgTextsUpToThePoint = oRgOrigPoint.duplicate();
-			oRgTextsUpToThePoint.setEndPoint("StartToStart", oRgTextStart);
-
-			var textCount = oRgTextsUpToThePoint.text.length
-
-			while(textCount > oCurTextNode.nodeValue.length && oCurTextNode.nextSibling){
-				textCount -= oCurTextNode.nodeValue.length;
-				oCurTextNode = oCurTextNode.nextSibling;
-			}
-
-			// this will enforce IE to re-reference oCurTextNode
-			var oTmp = oCurTextNode.nodeValue;
-
-			if(bStartPt && oCurTextNode.nextSibling && oCurTextNode.nextSibling[_nt_] == 3 && textCount == oCurTextNode.nodeValue.length){
-				textCount -= oCurTextNode.nodeValue.length;
-				oCurTextNode = oCurTextNode.nextSibling;
-			}
-
-			oContainer = oCurTextNode;
-			offset = textCount;
-		}else{
-			oContainer = oRgOrigPoint.parentElement();
-			offset = pointRangeIdx;
-		}
-
-		return {"oContainer" : oContainer, "iOffset" : offset};
-	}
-});
-$.extend(SimpleSelection.prototype, ($.browser.msie?SimpleSelectionImpl_IE:SimpleSelectionImpl_FF).prototype);
-/**
- * }}} SimpleSelection
- */
-
-// {{{ DOMFix
-DOMFix = {
-	init : function(){
-		if ($.browser.msie || $.browser.opera) {
-			this[_cn_] = this._childNodes_Fix;
-			this[_pn_] = this._parentNode_Fix;
-		} else {
-			this[_cn_] = this._childNodes_Native;
-			this[_pn_] = this._parentNode_Native;
-		}
-	},
-
-	_parentNode_Native : function(elNode){
-		return elNode[_pn_];
-	},
-
-	_parentNode_Fix : function(elNode){
-		if(!elNode) return elNode;
-
-		while(elNode[_ps_]){ elNode = elNode[_ps_]; }
-
-		return elNode[_pn_];
-	},
-
-	_childNodes_Native : function(elNode){
-		return elNode[_cn_];
-	},
-
-	_childNodes_Fix : function(elNode){
-		var aResult = null;
-		var nCount = 0;
-
-		if(elNode){
-			var aResult = [];
-			elNode = elNode.firstChild;
-			while(elNode){
-				aResult[nCount++] = elNode;
-				elNode=elNode[_ns_];
-			}
-		}
-
-		return aResult;
-	}
-};
-DOMFix.init();
-dp = DOMFix[_pn_];
-dc = DOMFix[_cn_];
-// }}}
-
-/**
- * }}} Selection
- */
-
-/**
- * {{{ Utility functions
- */
-// bind a function to the host object
-function bind(obj, func) {
-	return function(){ return func.apply(obj, arguments); };
-};
-
-// check block element
-function is_block(el) {
-	return (el && el[_nt_] == 1 && rx_block.test(el[_nn_]));
-};
-
-// is defined?
-function is_def(v){ return typeof(v)!='undefined'; };
-
-// is string?
-function is_str(v){ return typeof(v)=='string'; };
-
-// filter
-function array_filter(arr, fn) {
-	var ret=[], i, c;
-
-	for(i=0,c=arr.length; i < c; i++) {
-		if (fn(arr[i])) ret.push(arr[i]);
-	}
-
-	return ret;
-};
-
-// node index
-function node_index(node) {
-	var cs = node[_pn_][_cn_], c, i;
-
-	for(i=0,c=cs.length; i < c; i++) {
-		if (cs[i] === node) return i;
-	}
-
-	return -1;
-};
-
-// block parent
-function get_block_parent(nd) {
-	while(!is_block(nd)) {
-		if (rx_root.test(nd[_pn_].className)) break;
-		nd = nd[_pn_];
-	}
-
-	if (!is_block(nd)) {
-		var ss = $.merge(siblings(nd,1),nd,siblings(nd)), $p = $('<p />');
-
-		nd[_pn_].insertBefore($p[0], nd);
-		nd = $p.append(ss)[0];
-	}
-
-	return nd;
-};
-
-function get_child(node, container) {
-	if (node == container) return node;
-
-	while(node) {
-		if (node[_pn_] == container) return node;
-		node = node[_pn_];
-	}
-};
-
-/**
- * @brief Get a valid parent (evaluate with XHTML)
- * @param par Element initial parent node
- * @param childName String child node name
- */
-function get_valid_parent(par, childName) {
-	while(!XHTMLT[par[_pn_][_nn_].toLowerCase()][childName]) {
-		par = par[_pn_];
-	}
-	return par;
-};
-
-// collect all inline sibling
-function siblings(node, prev, stopper) {
-	var s, ret = [];
-	
-	if (!stopper) stopper = is_block;
-
-	while(s=node[prev?_ps_:_ns_]) {
-		if (stopper(s)) break;
-		if (s[_nt_] == 3 || s[_nt_] == 1) ret.push(s);
-		node = s;
-	}
-
-	if (prev) ret = ret.reverse();
-
-	return ret;
-};
-
-function is_ancestor_of(anc, desc) {
-	while(desc && !rx_root.test(desc.className||'')) {
-		if ((desc=desc[_pn_]) == anc) return true;
-	}
-	return false;
-};
-
-/**
- * }}}
- */
-
-// global context
-if (xe.Xeed) xe.Xeed = $.extend(Xeed, xe.Xeed);
-else xe.Xeed = Xeed;
-
-xe.W3CDOMRange = W3CDOMRange;
-xe.HuskyRange  = HuskyRange;
-xe.Xeed.AutoSave = AutoSave;
-
-// run callback functions
-if ($.isArray(xe.Xeed.callbacks) && xe.Xeed.callbacks.length) {
-	while(fn = xe.Xeed.callbacks.shift()) fn();
-}
-
-})(jQuery);
diff --git a/modules/editor/skins/xeed/js/xeed.stub.js b/modules/editor/skins/xeed/js/xeed.stub.js
deleted file mode 100644
index 24012e219..000000000
--- a/modules/editor/skins/xeed/js/xeed.stub.js
+++ /dev/null
@@ -1,85 +0,0 @@
-(function($){
-
-var ver = '0.9.0';
-
-$.fn.xeed = function(options) {
-	var $this = this.eq(0), $head = $('head'), templates = {}, DEFAULT = 'default', isCSSLoaded, isScriptLoaded;
-	var opts = $.extend({
-		ui : DEFAULT
-	}, options);
-
-	// Load Editor UI
-	function loadUI(ui, fnError){
-		if (templates[ui]) {
-			// load CSS
-			if (!isCSSLoaded) {
-				$head
-					.append('<link rel="stylesheet" type="text/css" href="'+xeed_path+'tpl/xd.css" />')
-					.append('<link rel="stylesheet" type="text/css" href="'+xeed_path+'tpl/xdcs.css" />');
-
-				loadCSS = true;
-			}
-
-			// insert HTML
-			$this.before(templates[ui]).hide();
-
-			// load script
-			setTimeout(loadScript, 0);
-
-			return;	
-		}
-
-		$.ajax({
-			url : xeed_path + 'template.php?ui=' + ui,
-			dataType : 'text',
-			cache    : false,
-			success  : function(data){
-				var html = processTemplate(data);
-				templates[ui] = html;
-				loadUI(ui);
-			}
-		});
-	};
-
-	// Load Xeed core script
-	function loadScript(){
-		function callback() {
-			var xeed = new xe.Xeed($this, opts);
-
-			$this.data('xeed', xeed);
-			xe.registerApp(xeed);
-
-			isScriptLoaded = true;
-		}
-
-		if (!xe.Xeed) xe.Xeed = {};
-		if (!xe.Xeed.callbacks) xe.Xeed.callbacks = [];
-
-		xe.Xeed.version = ver;
-
-		if (isScriptLoaded) callback();
-		else xe.Xeed.callbacks.push(callback);
-
-		setTimeout(function(){
-			var scr = document.createElement('script');
-			scr.src  = xeed_path+'xeed.js?ver='+ver+'&_cache='+Math.round(Math.random()*1000); // XXX : cache_code
-			scr.type = 'text/javascript';
-
-			$head[0].appendChild(scr);
-		}, 0);
-	};
-
-	// TODO : Process a template
-	function processTemplate(data) {
-		return data;
-	};
-
-	if (!this.data('xeed')) {
-		this.data('xeed', 1);
-		loadUI(opts.ui);
-	}
-
-	return this;
-};
-
-})(jQuery);
diff --git a/modules/editor/skins/xeed/skin.xml b/modules/editor/skins/xeed/skin.xml
deleted file mode 100644
index 6383bd33d..000000000
--- a/modules/editor/skins/xeed/skin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">XEED Skin</title>
-	<title xml:lang="en">XEED Skin</title>
-    <title xml:lang="zh-TW">XEED 面板</title>
-    <title xml:lang="tr">XEED Dış Görünümü</title>
-    <description xml:lang="ko">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="tr">
-        XpressEditor, NHN tarafından, SmartEditor Basic'ten temel alınarak yapılmıştır
-    </description>
-	<description xml:lang="en">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="zh-TW">
-        XpressEditor 是 NHN 基於 SmartEditor 開發而成。
-    </description>
-    <version>0.5.0</version>
-    <date>2010-11-05</date>
-    <author email_address="developers@xpressengine.com" link="http://www.xpressengine.com">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="tr">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</skin>
diff --git a/modules/editor/skins/xeed/xd.css b/modules/editor/skins/xeed/xd.css
deleted file mode 100644
index 012498b98..000000000
--- a/modules/editor/skins/xeed/xd.css
+++ /dev/null
@@ -1,416 +0,0 @@
-@charset "utf-8";
-/* XEED - NHN (developers@xpressengine.com) */
-/* Reset */
-
-.xd{display:none;position:relative;margin:1em 0;border:1px solid #e0dedf;z-index:1;*zoom:1;color:#000}
-.xd legend{visibility:visible}
-.xd fieldset{*zoom:1}
-.xd .tool ul,
-.xd .mode ul{margin:0;padding:0;list-style:none}
-.xd .tool button,
-.xd .mode button,
-.xdlw button{position:relative;border:0;margin:0;padding:0;background-color:transparent;overflow:visible;cursor:pointer}
-.xd .tool em{font-style:normal}
-.xd .tool img{border:0}
-.xd .tool .itx{border:1px solid #c7c7c7;background:transparent;padding:2px 4px;_margin:-1px 0;height:15px;font-size:12px;vertical-align:top}
-.xd .tool .itx.hover,
-.xd .tool .itx.focus{border-color:#999;box-shadow:0 0 2px #bbb;-moz-box-shadow:0 0 2px #bbb;-webkit-box-shadow:0 0 2px #bbb}
-.xd .tool .icx,
-.xd .mode .icx,
-.xdlw .icx{width:13px;height:13px;vertical-align:middle;margin:0 2px 0 0;padding:0}
-.xd .tool .btn,
-.xdlw .btn{border:1px solid #b5b5b5;font-size:12px;padding:0 4px;height:21px;_height:20px;vertical-align:top;cursor:pointer}
-.xd .tool fieldset{border:0;margin:0;padding:0}
-.xd .tool label,
-.xd .mode label,
-.xdlw label{cursor:pointer}
-.xd .tool .strong,
-.xdlw .strong{font-weight:bold}
-/* Background */
-.xd .tool,
-.xd .mo,
-.xd .mode,
-.xd .resize,
-.xd .t1 .u1,
-.xd .t1 .u1 .tb .img,
-.xd .t1 .u1 .tb .media,
-.xd .t1 .u1 .tb .file,
-.xd .t1 .u2,
-.xd .t2 .tb,
-.xd .t2 .btn,
-.xd .t2 .u3 .lr li.active button,
-.xd .t2 .u3 .lr li.hover button,
-.xd .t2 .u6 .sc .lr .li ul,
-.xd .t2 .u6 .te .lr .cn li button,
-.xd .t2 .u6 .te .lr .th li button,
-.xdlw .iHead,
-.xdlw .iFoot,
-.xdlw .iHead h2,
-.xdlw .btn,
-.xdal .label,
-.xdal .media .ob,
-.xdal .file .ob,
-.xdal .sn .task .all,
-.xdal .sn .ctr{background-image:url(xd.gif);background-repeat:no-repeat}
-/* Font Family */
-.xd .tool .t1 .tb,
-.xd .tool .t2 .hx .lr button,
-.xd .tool .t2 .u6 .sc .lr .tab,
-.xd .edit,
-.xdal .sn .ctr,
-.xdal .sn .task button,
-.xdal .iFoot .info{font-family:돋움, Dotum, Tahoma, Geneva, sans-serif}
-.xd .tool .itx,
-.xd .tool .t2 .u3 .cr .lr .cx li button,
-.xd .tool .t2 .u6 .te .lr .cn li button,
-.xd .tool .t2 .u6 .te .lr .wh td button,
-.xd .mode ul button,
-.xd .mode .autoResize label,
-.xdlw .iHead h2 em,
-.xdlw label{font-family:Tahoma, Geneva, sans-serif}
-/* Hidden Text */
-.xd .tool .mo span,
-.xd .t1 .tb .img span,
-.xd .t1 .tb .media span,
-.xd .t1 .tb .file span,
-.xd .t2 .tb span,
-.xd .t2 .u3 .cr .lr li button span,
-.xd .t2 .u6 .te .lr .cn button span,
-.xd .mode .resize span,
-.xdal .sn .ctr span{position:absolute;top:0;left:0;width:1px;height:1px;overflow:hidden;font-size:0;line-height:0;z-index:-1}
-/* Label Input OverWrap */
-.xd .tool legend{_color:#000 !important}
-.xd .tool .liow{position:relative;background:#fff;margin:0 0 8px 0}
-.xd .tool .liow label{position:absolute;top:4px;left:6px;white-space:nowrap}
-.xd .tool .liow .itx{position:relative;z-index:2;background:transparent}
-/* Time */
-.xd .time{font-size:12px;background:#fcfcfc;border-top:1px solid #ddd;display:none}
-.xd .time p{margin:0;padding:6px 10px;color:#666;text-align:center}
-/* Mode */
-.xd .mode{position:relative;z-index:1;background-position:0 -1140px;background-repeat:repeat-x;border-top:1px solid #b5b5b5;*zoom:1}
-.xd .mode .resize{width:100%;height:20px;cursor:n-resize;background-position:center -1105px;font-size:0;line-height:0}
-.xd .mode .autoResize{position:absolute;top:0;left:8px;font-size:11px;line-height:20px}
-.xd .mode .autoResize label{display:inline-block;height:20px}
-.xd .mode ul{position:absolute;top:-1px;right:10px;line-height:15px}
-.xd .mode li{position:relative;float:left;margin:0 -1px 0 0;border:1px solid #b5b5b5;background:#f4f4f4;vertical-align:top}
-.xd .mode li.active{border-top-color:#fcfcfc;background:#fcfcfc;z-index:2}
-.xd .mode ul button{padding:0 10px;font-size:11px}
-/* Tool - Common */
-.xd .tool{background-position:0 -1140px;background-repeat:repeat-x;background-color:#f4f4f4;position:relative;z-index:3}
-.xd .tool .mo{display:none;position:absolute;top:0;right:0;height:25px;width:16px;background-position:-450px -250px}
-.xd .tool .mo.mopen{background-position:-466px -250px}
-.xd .skip{position:absolute;display:block;top:0;left:0;width:1px;height:1px;overflow:hidden;color:#333;text-indent:1em;text-decoration:none;font-size:12px}
-.xd .skip:hover,
-.xd .skip:active,
-.xd .skip:focus{position:relative;width:100%;height:auto;padding:5px 0}
-/* Tool - 1 */
-.xd .t1{position:relative;z-index:2;padding:0 15px 0 0;border-bottom:1px solid #e0dedf;*zoom:1}
-.xd .t1:after{content:"";display:block;clear:both}
-.xd .t1 .mo{top:0}
-.xd .t1 .u1,
-.xd .t1 .u2{margin:0 0 -1px 0;_margin-top:-1px;background-repeat:repeat-x;background-position:0 -1140px;float:left;_float:none;display:inline;*zoom:1}
-.xd .t1 .ti{float:left;display:inline;border:1px solid #e0dedf;margin:-1px 0 0 -1px;_margin-top:0;_margin-bottom:-1px;*zoom:1}
-.xd .t1 .ti.active{background-color:#e8e8e8;border:1px solid #e0dedf;border-top:0;border-bottom:0;margin:0 -1px}
-.xd .t1 .tb{display:inline-block;white-space:nowrap;padding:0 8px;height:26px;line-height:26px;font-size:11px;text-decoration:none;vertical-align:top;color:#000;letter-spacing:-1px}
-.xd .t1 .tb span{display:block;float:left;cursor:pointer}
-.xd .t1 .u1 .tb strong{color:#f60}
-.xd .t1 .u1 .al .tb span{padding:0 0 0 22px}
-.xd .t1 .u1 .al .tb .all{padding:0}
-.xd .t1 .u1 .al .img{background-position:5px -282px}
-.xd .t1 .u1 .al .media{background-position:6px -312px}
-.xd .t1 .u1 .al .file{background-position:6px -342px}
-/* Tool - 2 */
-.xd .t2{position:relative;z-index:2;border-top:1px solid #e0dedf;border-bottom:1px solid #b5b5b5;padding:5px 10px 0 5px;margin:-1px 0 0 0;*zoom:1}
-.xd .t2:after{content:"";display:block;clear:both}
-.xd .t2 .mo{top:3px}
-.xd .t2 .u1,
-.xd .t2 .u2,
-.xd .t2 .u3,
-.xd .t2 .u4,
-.xd .t2 .u5,
-.xd .t2 .u6{float:left;_float:none;display:inline;position:relative;margin:0 5px 0 0;padding:0 0 5px 0;*zoom:1}
-.xd .t2 .ti{float:left;border:1px solid #b5b5b5;margin:0 -1px 0 0;font-size:0;position:relative}
-.xd .t2 .ti.hover{border-color:#666;z-index:100;box-shadow:0 0 2px #bbb;-moz-box-shadow:0 0 2px #bbb;-webkit-box-shadow:0 0 2px #bbb}
-.xd .t2 .ti.active{border-color:#333;z-index:100}
-.xd .t2 .tb{width:20px;height:19px;line-height:19px;overflow:visible;_overflow-y:hidden;vertical-align:top;background-position:0 -60px;letter-spacing:-1px}
-.xd .t2 .tb.more{width:10px;background-position:-140px -40px !important;border-left:1px solid #ddd}
-.xd .t2 .u2 .tb{width:auto;height:19px;line-height:19px;font-size:12px;padding:0 12px 0 4px;background-position:right 0;text-shadow:1px 1px 0 #eee}
-.xd .t2 .u2 .active .tb{background-position:right -20px}
-.xd .t2 .disable{opacity:.3;filter:alpha(opacity=30);-ms-filter:"alpha(opacity=30)";border-color:#b5b5b5 !important;box-shadow:none !important;-moz-box-shadow:none !important;-webkit-box-shadow:none !important}
-.xd .t2 .disable .tb{cursor:default;-ms-filter:inherit}
-.xd .t2 .ud .tb{background-position:0 -40px}
-.xd .t2 .rd .tb{background-position:-20px -40px}
-.xd .t2 .bd .tb{background-position:-40px -40px}
-.xd .t2 .ue .tb{background-position:-60px -40px}
-.xd .t2 .ic .tb{background-position:-80px -40px}
-.xd .t2 .se .tb{background-position:-100px -40px}
-.xd .t2 .cr.fc .tb{background-position:-120px -40px}
-.xd .t2 .cr.bc .tb{background-position:-150px -40px}
-.xd .t2 .sp .tb{background-position:-180px -40px}
-.xd .t2 .sb .tb{background-position:-200px -40px}
-.xd .t2 .al .tb{background-position:-220px -40px}
-.xd .t2 .ac .tb{background-position:-240px -40px}
-.xd .t2 .ar .tb{background-position:-260px -40px}
-.xd .t2 .aj .tb{background-position:-280px -40px}
-.xd .t2 .ol .tb{background-position:-300px -40px}
-.xd .t2 .ul .tb{background-position:-320px -40px}
-.xd .t2 .od .tb{background-position:-340px -40px}
-.xd .t2 .id .tb{background-position:-360px -40px}
-.xd .t2 .qm .tb{background-position:-380px -40px}
-.xd .t2 .bx .tb{background-position:-400px -40px}
-.xd .t2 .er .tb{background-position:-420px -40px}
-.xd .t2 .ur .tb{background-position:-440px -40px}
-.xd .t2 .sc .tb{background-position:-460px -40px}
-.xd .t2 .te .tb{background-position:-480px -40px}
-.xd .t2 .cm .tb{background-position:-500px -40px}
-.xd .t2 .cs .tb{background-position:-520px -40px}
-.xd .t2 .rs .tb{background-position:-540px -40px}
-.xd .t2 .tc .tb{background-position:-560px -40px}
-.xd .t2 .fr .tb{background-position:-580px -40px}
-.xd .t2 .active .tb.ud{background-position:0 -60px}
-.xd .t2 .active .tb.rd{background-position:-20px -60px}
-.xd .t2 .active .tb.bd{background-position:-40px -60px}
-.xd .t2 .active .tb.ue{background-position:-60px -60px}
-.xd .t2 .active .tb.ic{background-position:-80px -60px}
-.xd .t2 .active .tb.se{background-position:-100px -60px}
-.xd .t2 .active .tb.more{background-position:-140px -60px !important}
-.xd .t2 .active .tb.sp{background-position:-180px -60px}
-.xd .t2 .active .tb.sb{background-position:-200px -60px}
-.xd .t2 .active .tb.al{background-position:-220px -60px}
-.xd .t2 .active .tb.ac{background-position:-240px -60px}
-.xd .t2 .active .tb.ar{background-position:-260px -60px}
-.xd .t2 .active .tb.aj{background-position:-280px -60px}
-.xd .t2 .active .tb.ol{background-position:-300px -60px}
-.xd .t2 .active .tb.ul{background-position:-320px -60px}
-.xd .t2 .active .tb.od{background-position:-340px -60px}
-.xd .t2 .active .tb.id{background-position:-360px -60px}
-.xd .t2 .active .tb.qm{background-position:-380px -60px}
-.xd .t2 .active .tb.bx{background-position:-400px -60px}
-.xd .t2 .active .tb.er{background-position:-420px -60px}
-.xd .t2 .active .tb.ur{background-position:-440px -60px}
-.xd .t2 .active .tb.sc{background-position:-460px -60px}
-.xd .t2 .active .tb.te{background-position:-480px -60px}
-.xd .t2 .active .tb.cm{background-position:-500px -60px}
-.xd .t2 .active .tb.cs{background-position:-520px -60px}
-.xd .t2 .active .tb.rs{background-position:-540px -60px}
-.xd .t2 .active .tb.tc{background-position:-560px -60px}
-.xd .t2 .active .tb.fr{background-position:-580px -60px}
-/* Layer */
-.xd .t2 .lr{display:none;position:absolute;left:-1px;top:19px;padding:10px;font-size:12px;border:1px solid #bbb;background-color:#fafafa;*zoom:1;box-shadow:0 0 2px #bbb;-moz-box-shadow:0 0 2px #bbb;-webkit-box-shadow:0 0 2px #bbb}
-.xd .t2 .lr:after{content:"";display:block;clear:both}
-.xd .t2 .lr.open{display:block}
-/* Layer - u2 (hx, ff, fs, lh) */
-.xd .t2 .u2 .lr{padding:2px}
-.xd .t2 .u2 .lr li{margin:0 !important;padding:0 !important;border:0 !important}
-.xd .t2 .u2 .lr li.hover{background:#ebebeb}
-.xd .t2 .u2 .lr button{display:block;white-space:nowrap;text-align:left;font-size:12px;padding:2px 10px}
-.xd .t2 .u2 .hx .lr button{font-weight:bold}
-.xd .t2 .u2 .lr .h1 button{font-size:24px}
-.xd .t2 .u2 .lr .h2 button{font-size:20px}
-.xd .t2 .u2 .lr .h3 button{font-size:18px}
-.xd .t2 .u2 .lr .h4 button{font-size:16px}
-.xd .t2 .u2 .lr .h5 button{font-size:14px}
-.xd .t2 .u2 .lr .h6 button{font-size:12px}
-/* Layer - u3 (cr) */
-.xd .t2 .u3 .cr .lr fieldset{position:relative;_float:left}
-.xd .t2 .u3 .cr .lr legend{font-size:12px;font-weight:bold;margin:0;padding:0;display:inline;line-height:normal;width:auto;height:auto;position:static}
-.xd .t2 .u3 .cr .lr .ct,
-.xd .t2 .u3 .cr .lr .cx{width:204px;position:relative;*zoom:1;overflow:hidden}
-.xd .t2 .u3 .cr .lr .ct:after,
-.xd .t2 .u3 .cr .lr .cx:after{content:"";display:block;clear:both}
-.xd .t2 .u3 .cr .lr .ct li,
-.xd .t2 .u3 .cr .lr .cx li{position:relative;float:left;margin:0 1px 1px 0;font-size:0;line-height:0}
-.xd .t2 .u3 .cr .lr .ct li button{display:block;position:relative;overflow:hidden;width:11px;height:11px;vertical-align:top}
-.xd .t2 .u3 .cr .lr .ct li.active button,
-.xd .t2 .u3 .cr .lr .ct li.hover button{background-position:-330px -260px}
-.xd .t2 .u3 .cr .lr .cx li button{display:block;position:relative;overflow:hidden;width:67px;height:18px;font-size:11px;line-height:18px;text-align:left;*padding:0 4px}
-/* Layers - u6 */
-.xd .t2 .u6 .lr{left:auto;right:-1px;}
-.xd .t2 .u6 .lr.right{left:-1px;right:auto;}
-/* Layer - u6 (ur) */
-.xd .t2 .u6 .ur .lr{width:260px}
-.xd .t2 .u6 .ur .lr fieldset:after{content:"";display:block;clear:both}
-.xd .t2 .u6 .ur .lr .itx{display:block;width:250px;margin:0 0 4px 0;background:#fff}
-.xd .t2 .u6 .ur .lr .nw{float:left;line-height:21px;white-space:nowrap}
-.xd .t2 .u6 .ur .lr .btnArea{float:right;white-space:nowrap}
-.xd .t2 .u6 .ur .lr .btn{*margin:0 0 0 4px}
-/* Layer - u6 (sc) */
-.xd .t2 .u6 .sc .lr{width:402px;height:222px}
-.xd .t2 .u6 .sc .lr .li{float:left;margin:0 -1px 0 0}
-.xd .t2 .u6 .sc .lr .tab{position:relative;font-size:11px;height:23px;_line-height:18px;padding:0 4px;border:1px solid #d0d0d0;background:#f5f5f5;z-index:10}
-.xd .t2 .u6 .sc .lr .active .tab{border-bottom-color:#fff;background:#fff}
-.xd .t2 .u6 .sc .lr .li ul{display:none;position:absolute;left:10px;top:32px;width:400px;height:171px;border:1px solid #d0d0d0;background-position:0 -80px;z-index:1;*zoom:1}
-.xd .t2 .u6 .sc .lr .li ul:after{content:"";display:block;clear:both}
-.xd .t2 .u6 .sc .lr .active ul{display:block}
-.xd .t2 .u6 .sc .lr .li li{position:relative;top:-1px;float:left;margin:0 -1px -1px 0}
-.xd .t2 .u6 .sc .lr .li li button{width:21px;height:20px;overflow:hidden}
-.xd .t2 .u6 .sc .lr .li li:hover button{border:1px solid #666}
-.xd .t2 .u6 .sc .lr fieldset{position:absolute;top:212px;left:10px}
-.xd .t2 .u6 .sc .lr .itx{width:296px;padding-right:100px;background:#fff;_margin:-1px 0}
-.xd .t2 .u6 .sc .lr .btnArea{position:absolute;top:0;right:0}
-.xd .t2 .u6 .sc .lr .btn{float:left;margin:0 0 0 -1px;display:inline}
-/* Layer - u6 (te) */
-.xd .t2 .u6 .te .lr{width:280px}
-.xd .t2 .u6 .te .lr fieldset{position:relative;padding:0 0 10px 0}
-.xd .t2 .u6 .te .lr legend{font-size:12px;font-weight:bold;margin:0;padding:10px 0 0 0;display:inline;line-height:normal;width:auto;height:auto;position:static}
-.xd .t2 .u6 .te .lr .pv{border-bottom:1px solid #ddd}
-.xd .t2 .u6 .te .lr .pv legend{padding:0}
-.xd .t2 .u6 .te .lr .pv .xdcs{background:#fff;line-height:1.5;margin:0 -10px;padding:1px 10px;box-shadow:inset 0 0 3px #999;-moz-box-shadow:inset 0 0 3px #999;-webkit-box-shadow:inset 0 0 3px #999}
-.xd .t2 .u6 .te .lr .cn{border-bottom:1px solid #ddd}
-.xd .t2 .u6 .te .lr .cn .liow label{top:7px}
-.xd .t2 .u6 .te .lr .cn .itx{width:215px;padding:5px 60px 5px 4px}
-.xd .t2 .u6 .te .lr .cn ul{position:absolute;z-index:2;width:51px;top:2px;right:2px;*right:1px;font-size:0;*zoom:1}
-.xd .t2 .u6 .te .lr .cn ul:after{content:"";display:block;clear:both}
-.xd .t2 .u6 .te .lr .cn li{float:left;margin:0 0 1px 1px;display:inline}
-.xd .t2 .u6 .te .lr .cn li button{width:16px;height:11px;overflow:hidden;text-align:center;background-color:#eee}
-.xd .t2 .u6 .te .lr .cn li.selected button{background-color:#ccc}
-.xd .t2 .u6 .te .lr .cn li.tl button{background-position:-360px -255px}
-.xd .t2 .u6 .te .lr .cn li.tc button{background-position:-382px -255px}
-.xd .t2 .u6 .te .lr .cn li.tr button{background-position:-404px -255px}
-.xd .t2 .u6 .te .lr .cn li.bl button{background-position:-360px -264px}
-.xd .t2 .u6 .te .lr .cn li.bc button{background-position:-382px -264px}
-.xd .t2 .u6 .te .lr .cn li.br button{background-position:-404px -264px}
-.xd .t2 .u6 .te .lr .th{border-bottom:1px solid #ddd}
-.xd .t2 .u6 .te .lr .th ul{*zoom:1}
-.xd .t2 .u6 .te .lr .th ul:after{content:"";display:block;clear:both}
-.xd .t2 .u6 .te .lr .th li{float:left}
-.xd .t2 .u6 .te .lr .th li button{font-size:12px;width:70px;height:55px}
-.xd .t2 .u6 .te .lr .th li.selected{background-color:#ddd}
-.xd .t2 .u6 .te .lr .th li.no button{background-position:-283px -275px}
-.xd .t2 .u6 .te .lr .th li.lt button{background-position:-433px -275px}
-.xd .t2 .u6 .te .lr .th li.tp button{background-position:-283px -335px}
-.xd .t2 .u6 .te .lr .th li.bh button{background-position:-433px -335px}
-.xd .t2 .u6 .te .lr .th li span{display:inline-block;padding-top:26px}
-.xd .t2 .u6 .te .lr .wh{border-bottom:1px solid #ddd}
-.xd .t2 .u6 .te .lr .wh table{border:0;width:100%}
-.xd .t2 .u6 .te .lr .wh th{border:0;text-align:right;padding:0;white-space:nowrap;font-weight:normal}
-.xd .t2 .u6 .te .lr .wh td{border:0;padding:0 0 0 10px;border-spacing:0}
-.xd .t2 .u6 .te .lr .wh td button{font-size:12px;width:23px;height:21px;color:#666}
-.xd .t2 .u6 .te .lr .wh td button.selected{border:1px solid #ccc;background-color:#767676;color:#fff;font-weight:bold}
-.xd .t2 .u6 .te .lr .wh .itx{width:60px;*margin-right:4px;background-color:#fff}
-.xd .t2 .u6 .te .lr .btnArea{position:relative;text-align:right;white-space:nowrap;padding:10px 0 0 0}
-.xd .t2 .u6 .te .lr .btnArea .btn{*margin-left:4px}
-/* Layer - u6 (fr) */
-.xd .t2 .u6 .fr .lr fieldset{position:relative}
-.xd .t2 .u6 .fr .lr legend{font-size:12px;font-weight:bold;margin:0;display:inline;line-height:normal;width:auto;height:auto;position:static}
-.xd .t2 .u6 .fr .lr .itx{width:120px;padding-right:70px}
-.xd .t2 .u6 .fr .lr .find{border-bottom:1px solid #ddd;padding:0 0 10px 0}
-.xd .t2 .u6 .fr .lr .find .btn{position:absolute;top:0;right:0;z-index:3}
-.xd .t2 .u6 .fr .lr .replace legend{padding:10px 0 0 0}
-.xd .t2 .u6 .fr .lr .replace .liow{margin:0 0 2px 0}
-.xd .t2 .u6 .fr .lr .replace .liow .btn{position:absolute;top:0;right:0;z-index:3}
-.xd .t2 .u6 .fr .lr .frAll{width:196px;margin:5px 0 0 0}
-/* Edit */
-.xd .edit{height:400px;overflow:auto;position:relative;z-index:2;*zoom:1;background:#fff;box-shadow:inset 0 0 3px #999;-moz-box-shadow:inset 0 0 3px #999;-webkit-box-shadow:inset 0 0 3px #999}
-.xd .edit .xdcs{position:relative;overflow:hidden !important;padding:10px;cursor:text;outline:none}
-.xd .edit .xdsc{border:0;padding:20px 25px;overflow:auto;background:transparent;font:12px "Courier New", Courier, monospace}
-/* XD Layer Window */
-.xdlw{display:none;position:absolute;top:0;left:0;z-index:1000;color:#000;overflow:visible;width:100%;height:1px}
-.xdlw img{border:0}
-.xdlw .iHead{background-position:0 -1140px;background-repeat:repeat-x;border-bottom:1px solid #ccc;font-size:12px;padding:10px 0;*zoom:1;cursor:move;overflow:hidden}
-.xdlw .iHead:after{content:"";display:block;clear:both}
-.xdlw .iHead h2{float:left;_display:inline;margin:0 0 0 20px;padding:0 0 0 20px;background-position:0 -257px;font-size:12px;height:16px;line-height:16px}
-.xdlw .iHead h2 em{font-weight:normal;font-style:normal;color:#ccc}
-.xdlw .iHead h2 strong{color:#f60}
-.xdlw .iHead .btnArea{margin:0 20px;*zoom:1}
-.xdlw .iHead .btnArea.fr{float:right}
-.xdlw .iBody{position:relative;*zoom:1}
-.xdlw .iBody:after{content:"";display:block;clear:both}
-.xdlw .iFoot{padding:10px 0;border-top:1px solid #ccc;background-position:0 -1140px;background-repeat:repeat-x;cursor:move}
-.xdlw .iFoot:after{content:"";display:block;clear:both}
-.xdlw .iFoot .btnArea{margin:0 20px;*zoom:1}
-.xdlw .iFoot .btnArea:after{content:"";display:block;clear:both}
-.xdlw .iFoot .btnArea.fl{float:left}
-.xdlw .iFoot .btnArea.fr{float:right}
-/* XD Layer Window - AL(Attached List) */
-.xdal{display:none;width:780px;margin:0 auto;background:#fff;border:3px solid #666;box-shadow:0 0 10px #999;-moz-box-shadow:0 0 10px #999;-webkit-box-shadow:0 0 10px #999}
-.xdal .iFoot .info{margin:0;float:left;font-size:11px;line-height:normal;padding:0 0 0 20px;color:#666}
-.xdal .label{line-height:30px;font-weight:bold;margin:0;padding:0 0 0 24px;font-size:12px}
-.xdal .img .label{background-position:0 -280px}
-.xdal .media .label{background-position:0 -310px}
-.xdal .file .label{background-position:0 -340px}
-.xdal .sn{position:relative;padding:10px 20px 15px 20px;width:219px;float:left;border-left:1px solid #ddd}
-.xdal .sn .nofile{display:none;padding:1em 0;margin:0;color:#767676;border-top:1px dotted #ccc}
-.xdal .sn ul{height:290px;margin:0;padding:0;*zoom:1;overflow:auto;overflow-x:hidden;border-top:1px dotted #ccc}
-.xdal .sn ul:after{content:"";display:block;clear:both}
-.xdal .sn li{position:relative;top:-1px;list-style:none;vertical-align:top;margin:0;padding:8px 0;border-top:1px dotted #ccc;color:#666}
-.xdal .sn .ob{position:relative;text-decoration:none;white-space:nowrap;font-size:0;width:60px;height:60px;overflow:hidden;margin:0 0 5px 0;border:1px solid #ddd;text-align:center;vertical-align:top;line-height:58px;background-color:#fff}
-.xdal .sn .ob img{vertical-align:middle}
-.xdal .sn .ctr{position:absolute;top:8px;width:30px;height:30px;font-size:11px;white-space:nowrap;color:#666}
-.xdal .sn .ins{right:35px;background-position:-510px -250px}
-.xdal .sn .del{right:5px;background-position:-540px -250px}
-.xdal .sn .task{margin:0 10px 0 0;padding:8px 0 0 0;border-top:1px dotted #ccc}
-.xdal .sn .task button{padding:0 3px;margin:0 0 2px 0;height:21px;font-size:11px;border:1px solid #b5b5b5}
-.xdal .sn .task .all{padding-left:15px;background-position:-583px -257px}
-.xdal .sn .progress{display:none;width:40px;background:#ddd}
-.xdal .sn .progress .bar{display:block;background:#23cb24;height:6px}
-.xdal .sn .uploading .progress{display:inline-block}
-.xdal .none .task{display:none}
-.xdal .none .nofile{display:block}
-.xdal .file .ob,
-.xdal .media .ob{text-indent:-900px}
-.xdal .file .uploading .ob{text-indent:0;background-image:none}
-.xdal .file .pdf{background-position:-20px -420px}
-.xdal .file .doc,
-.xdal .file .docx{background-position:-120px -420px}
-.xdal .file .hwp{background-position:-220px -420px}
-.xdal .file .ppt,
-.xdal .file .pptx{background-position:-320px -420px}
-.xdal .file .pps{background-position:-420px -420px}
-.xdal .file .txt{background-position:-520px -420px}
-.xdal .file .rtf{background-position:-20px -520px}
-.xdal .file .xls,
-.xdal .file .csv,
-.xdal .file .xlsx{background-position:-120px -520px}
-.xdal .file .png{background-position:-220px -520px}
-.xdal .file .jpg{background-position:-320px -520px}
-.xdal .file .gif{background-position:-420px -520px}
-.xdal .file .bmp{background-position:-520px -520px}
-.xdal .file .tif{background-position:-20px -620px}
-.xdal .file .raw{background-position:-120px -620px}
-.xdal .media .avi{background-position:-220px -620px}
-.xdal .media .wmv{background-position:-320px -620px}
-.xdal .media .mov{background-position:-420px -620px}
-.xdal .media .mpg{background-position:-520px -620px}
-.xdal .media .flv{background-position:-20px -720px}
-.xdal .media .divx{background-position:-120px -720px}
-.xdal .file .mp3{background-position:-220px -720px}
-.xdal .file .wma{background-position:-320px -720px}
-.xdal .file .wav{background-position:-420px -720px}
-.xdal .file .aac{background-position:-520px -720px}
-.xdal .file .flac{background-position:-20px -820px}
-.xdal .file .psd{background-position:-120px -820px}
-.xdal .file .ai{background-position:-220px -820px}
-.xdal .file .svg{background-position:-320px -820px}
-.xdal .file .xml{background-position:-420px -820px}
-.xdal .file .html{background-position:-520px -820px}
-.xdal .file .css{background-position:-20px -920px}
-.xdal .file .js{background-position:-120px -920px}
-.xdal .file .iso{background-position:-220px -920px}
-.xdal .file .zip,
-.xdal .file .tar,
-.xdal .file .gz,
-.xdal .file .alz,
-.xdal .file .rar{background-position:-320px -920px}
-.xdal .file .etc{background-position:-420px -920px}
-/* XDCS = Xpress eDitor Content Style */
-.xdcs{font-size:12px;line-height:1.5;overflow:hidden !important;*zoom:1}
-.xdcs .h1{font-size:24px;margin:1em 0}
-.xdcs .h2{font-size:20px;margin:1em 0}
-.xdcs .h3{font-size:18px;margin:1em 0}
-.xdcs .h4{font-size:16px;margin:1em 0}
-.xdcs .h5{font-size:14px;margin:1em 0}
-.xdcs .h6{font-size:12px;margin:1em 0}
-.xdcs .bq{border-left:3px solid #ccc;padding-left:1em;margin:1em 0}
-.xdcs .bx{border:1px dotted #999;margin:1em 0;padding:0 2em;background:#fafafa}
-.xdcs .ts,
-.xdcs .ts th,
-.xdcs .ts td{border:1px solid #bbb}
-.xdcs .ts caption{font-weight:bold}
-.xdcs .ts th,
-.xdcs .ts td{padding:2px 5px}
-.xdcs .ts{border-collapse:collapse;margin:1em 0}
-.xdcs .ts th{text-align:left;background-color:#fafafa}
-.xdcs .ts td{text-align:left}
-.xdcs .toc{margin:1em 0;border:1px solid #ddd;background:#fafafa}
-.xdcs .toc ul ul{padding-left:1em;margin:0}
\ No newline at end of file
diff --git a/modules/editor/skins/xeed/xd.gif b/modules/editor/skins/xeed/xd.gif
deleted file mode 100644
index e95e4f023..000000000
Binary files a/modules/editor/skins/xeed/xd.gif and /dev/null differ
diff --git a/modules/editor/skins/xpresseditor/css/default.css b/modules/editor/skins/xpresseditor/css/default.css
index ab5c7c8d2..2d44f4e37 100644
--- a/modules/editor/skins/xpresseditor/css/default.css
+++ b/modules/editor/skins/xpresseditor/css/default.css
@@ -1,411 +1,344 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-/* TextEditor */
-.xeTextEditor {overflow:hidden;}
-.xeTextEditor textarea { display:block; margin:0; padding:5px; }
-.xeTextEditor.black textarea { color:#fff; background-color:#000;}
-
-/* Type Selector */
-.xpress-editor *{margin:0; padding:0; font-style:normal; font-size:12px; }
-.xpress-editor img,
-.xpress-editor fieldset,
-.xpress-editor button{ border:0;}
-.xpress-editor button{ background:none; background-repeat:no-repeat; cursor:pointer; _cursor /**/:hand;}
-.xpress-editor button *{ visibility:hidden;}
-.xpress-editor legend{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden;}
-.xpress-editor label{ cursor:pointer; _cursor /**/:hand;}
-.xpress-editor hr{ display:none;}
-.xpress-editor li{list-style:none;}
-
-/* Layout Selector */
-.xpress-editor{ position:relative; background:transparent;}
-.xpress-editor #smart_content{ position:relative; clear:both; margin:0 0 10px 0; border:1px solid #c2c2c2; *zoom:1; z-index:5; background:#fff;}
-.xpress-editor.black #smart_content {background:transparent;}
-.xpress-editor #smart_footer{ position:relative; text-align:center; padding:10px 0;}
-
-/* Footer */
-.xpress-editor #smart_footer *{ vertical-align:top;}
-.xpress-editor #smart_footer button{ position:relative; width:67px; height:25px; margin:0 5px 0 0;}
-.xpress-editor #smart_footer button.save_temp{ background:url(../img/btn_save_temp.gif) no-repeat;}
-.xpress-editor #smart_footer button.preview{ background:url(../img/btn_preview.gif) no-repeat;}
-.xpress-editor #smart_footer input{ margin:0;}
-.xpress-editor #smart_footer input.reset{ width:67px; height:25px; border:0; background:url(../img/btn_cancel.gif) no-repeat; cursor:pointer; margin-left:5px;}
-
-/* Content > Input Area */
-.xpress-editor a.skip{ position:relative; display:block; top:0; right:0; width:0; height:0; overflow:hidden; clear:both; zoom:1}
-.xpress-editor a.skip:hover,
-.xpress-editor a.skip:active,
-.xpress-editor a.skip:focus{ position:relative; display:block; padding:5px; right:0; z-index:60; width:auto; height:auto; text-align:right; white-space:nowrap; color:#000; text-decoration:none; letter-spacing:-1px; _zoom:1;}
-
-.xpress-editor .input_area{ position:relative; margin:10px; z-index:30; *zoom:1; height:400px;}
-.xpress-editor .input_area iframe,
-.xpress-editor .input_area textarea{ display:block; width:100%; position:relative; height:100%; border:0; overflow:auto;}
-.xpress-editor .input_area iframe{}
-.xpress-editor .input_area textarea{ *margin:0 -10px; _margin-bottom:-2px;}
-.xpress-editor .input_area textarea.blind{ display:none;}
-.xpress-editor .input_control{ position:relative; display:block; width:100%; clear:both; text-align:center; background:#fbfbfb url(../img/btn_expand.gif) no-repeat center center; cursor:n-resize;}
-.xpress-editor .input_control span{ display:block; height:10px; visibility:hidden; overflow:visible; font-size:0; line-height:200%; white-space:nowrap; color:#fff;}
-.xpress-editor.black .input_control { background:#111 url(../img/btn_expand.black.gif) no-repeat center center;}
-.xpress-editor.black .input_control span{ border-top:1px solid #333;  color:#000;}
-
-.xpress-editor .tool{ position:relative; overflow:visible; padding:5px 10px 6px 10px; *padding:5px 10px 8px 10px; z-index:40; clear:both; background:#f8f8f8 url(../img/bg_tool.gif) repeat-x left bottom; border:0; *zoom:1;}
-.xpress-editor .tool.disable { display:none; }
-.xpress-editor.black .tool{ background:#111 url(../img/bg_tool.black.gif) repeat-x left bottom; }
-
-.xpress-editor .tool:after{ content:""; display:block; clear:both;}
-.xpress-editor .tool ul{ position:relative; overflow:visible; float:left; margin:0 5px 2px 0; z-index:2;}
-.xpress-editor .tool ul.action{ width:43px;}
-.xpress-editor .tool ul.type{ width:auto; white-space:nowrap;}
-.xpress-editor .tool ul.style{ width:169px; z-index:6;}
-.xpress-editor .tool ul.paragraph{ width:169px; z-index:5;}
-.xpress-editor .tool ul.extra1{ width:90px; z-index:4;}
-.xpress-editor .tool ul.table{ width:85px; z-index:3;}
-.xpress-editor .tool ul.extra2{ width:auto; z-index:2;}
-.xpress-editor .tool ul.extra3{ float:right; width:auto; z-index:1; margin-right:1px;}
-.xpress-editor .tool ul.extra3 li{ margin-right:4px;}
-.xpress-editor .tool li{ position:relative; float:left;}
-.xpress-editor .tool li button{ width:21px; height:21px; background:url(../img/btn_set.gif) no-repeat 0 0; vertical-align:top;}
-.xpress-editor.black .tool li button{ width:21px; height:21px; background:url(../img/btn_set.black.gif) no-repeat 0 0; vertical-align:top;}
-.xpress-editor .tool li button span{ position:absolute; top:0; left:0; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-.xpress-editor .tool li.extensions span.exButton,
-.xpress-editor .tool li.extensions span.exButton button{ float:left; position:relative; display:inline-block; width:auto; background:url(../img/btn_extension.gif) no-repeat left top;}
-.xpress-editor .tool li.extensions span.exButton{ margin-right:18px;}
-.xpress-editor .tool li.extensions span.exButton button{ left:18px; height:21px; background-position:right top; padding:0 4px 0 0; font:11px/21px Tahoma, Sans-serif; text-align:left; *overflow:visible; *line-height:20px;}
-.xpress-editor.black .tool li.extensions span.exButton,
-.xpress-editor.black .tool li.extensions span.exButton button{ color:#fff; background-image:url(../img/btn_extension.black.gif); }
-
-.xpress-editor .tool li.html span,
-.xpress-editor .tool li.html span button,
-.xpress-editor .tool li.preview span,
-.xpress-editor .tool li.preview span button{ float:left; position:relative; display:inline-block; width:auto; height:auto; visibility:visible; background:url(../img/btn_set_blank.gif) no-repeat 0 0; white-space:nowrap;}
-.xpress-editor.black .tool li.html span,
-.xpress-editor.black .tool li.html span button,
-.xpress-editor.black .tool li.preview span,
-.xpress-editor.black .tool li.preview span button{ color:#fff;background-image:url(../img/btn_set_blank.black.gif); }
-
-.xpress-editor .tool li.html span,
-.xpress-editor .tool li.preview span{ margin-right:2px; background-position:left top;}
-.xpress-editor .tool li.html span button,
-.xpress-editor .tool li.preview span button{ left:2px; height:21px; background-position:right top; font:11px/21px Tahoma, Sans-serif; padding:0 4px; *overflow:visible; *line-height:20px;}
-
-.xpress-editor .tool ul.type li{ float:none; display:inline; *top:1px;}
-.xpress-editor .tool ul.type li select{ height:21px; width:62px;}
-.xpress-editor.black .tool ul.type li select{ color:#fff; background-color:#000; }
-
-/* Content > Tool > Button Default */
-.xpress-editor .tool li.undo button{ width:22px; background-position:0 0;}
-.xpress-editor .tool li.redo button{ background-position:-22px 0;}
-.xpress-editor .tool li.bold button{ width:22px; background-position:-43px 0;}
-.xpress-editor .tool li.underline button{ background-position:-65px 0;}
-.xpress-editor .tool li.italic button{ background-position:-86px 0;}
-.xpress-editor .tool li.del button{ background-position:-107px 0;}
-.xpress-editor .tool li.fcolor button{ background-position:-128px 0;}
-.xpress-editor .tool li.bcolor button{ background-position:-149px 0;}
-.xpress-editor .tool li.sup button{ background-position:-170px 0;}
-.xpress-editor .tool li.sub button{ background-position:-191px 0;}
-.xpress-editor .tool li.left button{ width:22px; background-position:-212px 0;}
-.xpress-editor .tool li.center button{ background-position:-234px 0;}
-.xpress-editor .tool li.right button{ background-position:-255px 0;}
-.xpress-editor .tool li.justify button{ background-position:-276px 0;}
-.xpress-editor .tool li.ol button{ background-position:-297px 0;}
-.xpress-editor .tool li.ul button{ background-position:-318px 0;}
-.xpress-editor .tool li.outdent button{ background-position:-339px 0;}
-.xpress-editor .tool li.indent button{ background-position:-360px 0;}
-.xpress-editor .tool li.blockquote button{ width:22px; background-position:-381px 0;}
-.xpress-editor .tool li.url button{ width:26px; background-position:-403px 0;}
-.xpress-editor .tool li.character button{ background-position:-429px 0;}
-.xpress-editor .tool li.find button{ background-position:-450px 0;}
-.xpress-editor .tool li.table button{ width:22px; background-position:-471px 0;}
-.xpress-editor .tool li.merge button{ background-position:-493px 0;}
-.xpress-editor .tool li.splitCol button{ background-position:-514px 0;}
-.xpress-editor .tool li.splitRow button{ background-position:-535px 0;}
-.xpress-editor .tool li.extensions span{ background-position:0 0;}
-.xpress-editor .tool li.extensions span button{ background-position:right 0;}
-.xpress-editor .tool li.html span{ background-position:0 0;}
-.xpress-editor .tool li.html span button{ background-position:right 0;}
-.xpress-editor .tool li.preview span{ background-position:0 0;}
-.xpress-editor .tool li.preview span button{ background-position:right 0;}
-
-/* Content > Tool > Button Hover */
-.xpress-editor .tool li.undo button.hover{ width:22px; background-position:0 -21px;}
-.xpress-editor .tool li.redo button.hover{ background-position:-22px -21px;}
-.xpress-editor .tool li.bold button.hover{ width:22px; background-position:-43px -21px;}
-.xpress-editor .tool li.underline button.hover{ background-position:-65px -21px;}
-.xpress-editor .tool li.italic button.hover{ background-position:-86px -21px;}
-.xpress-editor .tool li.del button.hover{ background-position:-107px -21px;}
-.xpress-editor .tool li.fcolor button.hover{ background-position:-128px -21px;}
-.xpress-editor .tool li.bcolor button.hover{ background-position:-149px -21px;}
-.xpress-editor .tool li.sup button.hover{ background-position:-170px -21px;}
-.xpress-editor .tool li.sub button.hover{ background-position:-191px -21px;}
-.xpress-editor .tool li.left button.hover{ width:22px; background-position:-212px -21px;}
-.xpress-editor .tool li.center button.hover{ background-position:-234px -21px;}
-.xpress-editor .tool li.right button.hover{ background-position:-255px -21px;}
-.xpress-editor .tool li.justify button.hover{ background-position:-276px -21px;}
-.xpress-editor .tool li.ol button.hover{ background-position:-297px -21px;}
-.xpress-editor .tool li.ul button.hover{ background-position:-318px -21px;}
-.xpress-editor .tool li.outdent button.hover{ background-position:-339px -21px;}
-.xpress-editor .tool li.indent button.hover{ background-position:-360px -21px;}
-.xpress-editor .tool li.blockquote button.hover{ width:22px; background-position:-381px -21px;}
-.xpress-editor .tool li.url button.hover{ width:26px; background-position:-403px -21px;}
-.xpress-editor .tool li.character button.hover{ background-position:-429px -21px;}
-.xpress-editor .tool li.find button.hover{ background-position:-450px -21px;}
-.xpress-editor .tool li.table button.hover{ width:22px; background-position:-471px -21px;}
-.xpress-editor .tool li.merge button.hover{ background-position:-493px -21px;}
-.xpress-editor .tool li.splitCol button.hover{ background-position:-514px -21px;}
-.xpress-editor .tool li.splitRow button.hover{ background-position:-535px -21px;}
-.xpress-editor .tool li.extensions span.hover{ background-position:0 -21px;}
-.xpress-editor .tool li.extensions span.hover button{ background-position:right -21px;}
-.xpress-editor .tool li.html span.hover{ background-position:0 -21px;}
-.xpress-editor .tool li.html span.hover button{ background-position:right -21px;}
-.xpress-editor .tool li.preview span.hover{ background-position:0 -21px;}
-.xpress-editor .tool li.preview span.hover button{ background-position:right -21px;}
-
-/* Content > Tool > Button Active */
-.xpress-editor .tool li.undo button.active{ width:22px; background-position:0 -42px;}
-.xpress-editor .tool li.redo button.active{ background-position:-22px -42px;}
-.xpress-editor .tool li.bold button.active{ width:22px; background-position:-43px -42px;}
-.xpress-editor .tool li.underline button.active{ background-position:-65px -42px;}
-.xpress-editor .tool li.italic button.active{ background-position:-86px -42px;}
-.xpress-editor .tool li.del button.active{ background-position:-107px -42px;}
-.xpress-editor .tool li.fcolor button.active{ background-position:-128px -42px;}
-.xpress-editor .tool li.bcolor button.active{ background-position:-149px -42px;}
-.xpress-editor .tool li.sup button.active{ background-position:-170px -42px;}
-.xpress-editor .tool li.sub button.active{ background-position:-191px -42px;}
-.xpress-editor .tool li.left button.active{ width:22px; background-position:-212px -42px;}
-.xpress-editor .tool li.center button.active{ background-position:-234px -42px;}
-.xpress-editor .tool li.right button.active{ background-position:-255px -42px;}
-.xpress-editor .tool li.justify button.active{ background-position:-276px -42px;}
-.xpress-editor .tool li.ol button.active{ background-position:-297px -42px;}
-.xpress-editor .tool li.ul button.active{ background-position:-318px -42px;}
-.xpress-editor .tool li.outdent button.active{ background-position:-339px -42px;}
-.xpress-editor .tool li.indent button.active{ background-position:-360px -42px;}
-.xpress-editor .tool li.blockquote button.active{ width:22px; background-position:-381px -42px;}
-.xpress-editor .tool li.url button.active{ width:26px; background-position:-403px -42px;}
-.xpress-editor .tool li.character button.active{ background-position:-429px -42px;}
-.xpress-editor .tool li.find button.active{ background-position:-450px -42px;}
-.xpress-editor .tool li.table button.active{ width:22px; background-position:-471px -42px;}
-.xpress-editor .tool li.merge button.active{ background-position:-493px -42px;}
-.xpress-editor .tool li.splitCol button.active{ background-position:-514px -42px;}
-.xpress-editor .tool li.splitRow button.active{ background-position:-535px -42px;}
-.xpress-editor .tool li.extensions span.active{ background-position:0 -42px;}
-.xpress-editor .tool li.extensions span.active button{ background-position:right -42px;}
-.xpress-editor .tool li.html span.active{ background-position:0 -42px;}
-.xpress-editor .tool li.html span.active button{ background-position:right -42px;}
-.xpress-editor .tool li.preview span.active{ background-position:0 -42px;}
-.xpress-editor .tool li.preview span.active button{ background-position:right -42px;}
-
-/* Content > Tool > Button Off */
-.xpress-editor .tool.off li.undo button,
-.xpress-editor .tool li.undo button.off{ width:22px; background-position:0 -63px;}
-.xpress-editor .tool.off li.redo button,
-.xpress-editor .tool li.redo button.off{ background-position:-22px -63px;}
-.xpress-editor .tool.off li.bold button{ width:22px; background-position:-43px -63px;}
-.xpress-editor .tool.off li.underline button{ background-position:-65px -63px;}
-.xpress-editor .tool.off li.italic button{ background-position:-86px -63px;}
-.xpress-editor .tool.off li.del button{ background-position:-107px -63px;}
-.xpress-editor .tool.off li.fcolor button{ background-position:-128px -63px;}
-.xpress-editor .tool.off li.bcolor button{ background-position:-149px -63px;}
-.xpress-editor .tool.off li.sup button{ background-position:-170px -63px;}
-.xpress-editor .tool.off li.sub button{ background-position:-191px -63px;}
-.xpress-editor .tool.off li.left button{ width:22px; background-position:-212px -63px;}
-.xpress-editor .tool.off li.center button{ background-position:-234px -63px;}
-.xpress-editor .tool.off li.right button{ background-position:-255px -63px;}
-.xpress-editor .tool.off li.justify button{ background-position:-276px -63px;}
-.xpress-editor .tool.off li.ol button{ background-position:-297px -63px;}
-.xpress-editor .tool.off li.ul button{ background-position:-318px -63px;}
-.xpress-editor .tool.off li.outdent button{ background-position:-339px -63px;}
-.xpress-editor .tool.off li.indent button{ background-position:-360px -63px;}
-.xpress-editor .tool.off li.blockquote button{ width:22px; background-position:-381px -63px;}
-.xpress-editor .tool.off li.url button{ width:26px; background-position:-403px -63px;}
-.xpress-editor .tool.off li.character button{ background-position:-429px -63px;}
-.xpress-editor .tool.off li.find button{ background-position:-450px -63px;}
-.xpress-editor .tool.off li.table button{ width:22px; background-position:-471px -63px;}
-.xpress-editor .tool.off li.merge button,
-.xpress-editor .tool li.merge button.off{ background-position:-493px -63px;}
-.xpress-editor .tool.off li.splitCol button,
-.xpress-editor .tool li.splitCol button.off{ background-position:-514px -63px;}
-.xpress-editor .tool.off li.splitRow button,
-.xpress-editor .tool li.splitRow button.off{ background-position:-535px -63px;}
-.xpress-editor .tool.off li.extensions span{ background-position:0 -63px;}
-.xpress-editor .tool.off li.extensions span button{ background-position:right -63px; color:#bcbcbc;}
-.xpress-editor .tool.off li button{ cursor:default;}
-.xpress-editor .tool.off ul.extra3 li button{ cursor:pointer;}
-
-/* Content > Tool > Layer */
-.xpress-editor .tool .layer{ display:none; position:absolute; left:0; top:20px; background-color:#fbfbfb; border:1px solid #c5c5c5; border-right:1px solid #9f9f9f; border-bottom:1px solid #9f9f9f;}
-.xpress-editor .tool .layer li{ float:none; left:0;}
-.xpress-editor .tool .layer button,
-.xpress-editor.black .tool .layer button{ margin:0 !important; width:auto; height:auto; background:none;}
-.xpress-editor .tool .layer button span{ position:absolute; width:0; height:0; font-size:0; line-height:0; overflow:hidden; visibility:hidden;}
-.xpress-editor .tool .btn_area{ position:relative; clear:both; text-align:center !important; padding:7px 0 12px 0; width:100%; white-space:nowrap; *zoom:1;}
-.xpress-editor .tool .btn_area *{ vertical-align:top;}
-.xpress-editor .tool button.close{ position:absolute; top:4px; right:3px; width:21px; height:20px; background:url(../img/btn_layer_close.gif) no-repeat center center !important;}
-.xpress-editor .tool button.close span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-.xpress-editor .tool .layer .btn_area button{ *margin:0 2px !important;}
-.xpress-editor .tool .layer .btn_area button.confirm{ width:38px; height:21px; background:url(../img/btn_layer_confirm.gif) no-repeat;}
-.xpress-editor .tool .layer .btn_area button.cancel{ width:38px; height:21px; background:url(../img/btn_layer_cancel.gif) no-repeat;}
-
-.xpress-editor .tool li.fcolor .layer{ width:218px !important; height:auto !important; background-image:none !important; overflow:hidden;}
-.xpress-editor .tool .layer .palette{ width:210px; position:relative; left:7px; padding:8px 0 7px 0; margin:0;}
-.xpress-editor .tool .layer .palette li{ float:left; margin:0 1px 1px 0; font-size:0; line-height:0;}
-.xpress-editor .tool .layer .palette button{ position:relative; overflow:hidden; width:11px !important; height:11px !important;}
-
-.xpress-editor .tool li.bcolor .layer { width:218px; overflow:hidden;}
-.xpress-editor .tool .layer .background{ width:210px; position:relative; left:7px; margin:0 0 -2px 0; padding:8px 0 0 0; *padding-bottom:8px; _padding-bottom:4px;}
-.xpress-editor .tool .layer .background li{ float:left; margin:0 5px 2px 0;}
-.xpress-editor .tool .layer .background button{ position:relative; overflow:hidden; width:65px; height:19px; text-align:left; padding:4px;}
-.xpress-editor .tool .layer .background button span{ position:relative; visibility:visible; font-size:12px; line-height:normal; width:auto; height:auto;}
-
-.xpress-editor .tool li.style .layer{ padding:4px 2px; _overflow:hidden; filter:progid:DXImageTransform.Microsoft.Shadow(color=#dddddd,direction=135,strength=2);}
-.xpress-editor .tool li.style .layer li{ position:relative; background:#fbfbfb;}
-.xpress-editor .tool li.style .layer li button{ display:block; width:134px; position:relative;}
-.xpress-editor .tool li.style .layer li button span{ display:block; width:130px; text-align:left; letter-spacing:normal;}
-.xpress-editor .tool li.style .layer li.h3 button span{ padding:3px 0 1px 4px; height:15px; _height /**/:19px; font-size:16px; font-weight:bold;}
-.xpress-editor .tool li.style .layer li.h4 button span{ padding:3px 0 2px 4px; height:13px; _height /**/:18px; font-size:14px; font-weight:bold;}
-.xpress-editor .tool li.style .layer li.h5 button span{ padding:3px 0 1px 4px; height:11px; _height /**/:15px; font-size:12px; font-weight:bold;}
-.xpress-editor .tool li.style .layer li.h6 button span{ padding:3px 0 1px 4px; height:11px; _height /**/:15px; font-size:12px;}
-.xpress-editor .tool li.style .layer li.p button span{ padding:3px 0 1px 4px; height:11px; _height /**/:15px; font-size:12px; color:#5d5d5d;}
-.xpress-editor .tool li.style .layer li button.hover{ background:#c1f471; *height:1%;}
-
-.xpress-editor .tool li.blockquote .layer{ padding:6px 5px 6px 7px; left:0; width:288px;}
-.xpress-editor .tool li.blockquote .layer ul{ *zoom:1; margin:0;}
-.xpress-editor .tool li.blockquote .layer ul:after{ content:""; display:block; clear:both;}
-.xpress-editor .tool li.blockquote .layer li{ position:relative; float:left; overflow:hidden; width:32px; height:34px; margin:0 2px 0 0; border:1px solid #cdcecc; background-image:url(../img/btn_qmark.gif); background-repeat:no-repeat;}
-.xpress-editor .tool li.blockquote .layer li.q1{ background-position:0 0;}
-.xpress-editor .tool li.blockquote .layer li.q2{ background-position:-32px 0;}
-.xpress-editor .tool li.blockquote .layer li.q3{ background-position:-64px 0;}
-.xpress-editor .tool li.blockquote .layer li.q4{ background-position:-96px 0;}
-.xpress-editor .tool li.blockquote .layer li.q5{ background-position:-128px 0;}
-.xpress-editor .tool li.blockquote .layer li.q6{ background-position:-160px 0;}
-.xpress-editor .tool li.blockquote .layer li.q7{ background-position:-192px 0;}
-.xpress-editor .tool li.blockquote .layer li.q8{ background-position:-224px 0;}
-.xpress-editor .tool li.blockquote .layer li button{ width:32px; height:34px;}
-
-.xpress-editor .tool li.url .layer{ width:231px; height:125px; background-image:url(../img/bx_url.gif); background-repeat:no-repeat; background-position:10px 14px;}
-.xpress-editor .tool li.url .layer fieldset{ position:absolute; width:212px; left:10px; top:14px;}
-.xpress-editor .tool li.url .layer fieldset h3{ position:absolute; top:-4px; left:15px; color:#404040; visibility:visible; font-size:12px; line-height:normal; width:auto; height:auto; background:none; margin:0; padding:0; font-weight:normal;}
-.xpress-editor .tool li.url .layer fieldset input.link{ position:absolute; left:12px; top:19px; width:179px; padding:2px 0 1px 6px; *margin:-1px 0; font-size:11px; height:13px; border:1px solid #818181; border-right:1px solid #dadada; border-bottom:1px solid #dadada;}
-.xpress-editor .tool li.url .layer fieldset p{ position:absolute; left:12px; top:44px;}
-.xpress-editor .tool li.url .layer fieldset p input{ width:13px; height:13px; vertical-align:middle; margin-right:3px;}
-.xpress-editor .tool li.url .layer .btn_area{ position:absolute; bottom:12px; padding:0;}
-
-.xpress-editor .tool li.table .layer{ width:242px; height:239px; background-image:url(../img/bx_table.gif); background-repeat:no-repeat; background-position:10px 14px;}
-.xpress-editor .tool li.table .layer fieldset{ position:absolute; width:222px; left:10px;}
-.xpress-editor .tool li.table .layer fieldset h3{ position:absolute; top:-4px; left:15px; color:#404040; visibility:visible; font-size:12px; line-height:normal; width:auto; height:auto; background:none; margin:0; padding:0; font-weight:normal;}
-
-.xpress-editor .tool li.table .layer fieldset dl{ position:absolute; left:10px;}
-.xpress-editor .tool li.table .layer fieldset dt{ float:left; padding:3px 0 0 0; height:20px; white-space:nowrap; letter-spacing:-1px;}
-.xpress-editor .tool li.table .layer fieldset dd{ float:right; position:relative;}
-.xpress-editor .tool li.table .layer fieldset dd button.add,
-.xpress-editor .tool li.table .layer fieldset dd button.del{ position:absolute; left:27px; width:15px; height:8px; background:url(../img/btn_layer_cell_adjust.gif) no-repeat;}
-.xpress-editor .tool li.table .layer fieldset dd button.add{ top:1px;}
-.xpress-editor .tool li.table .layer fieldset dd button.del{ top:9px; background-position:0 -8px;}
-.xpress-editor .tool li.table .layer fieldset dd .preview_palette{ display:block; float:left; margin:0 3px 0 0; padding:2px; position:relative; border:1px solid #c8c9c6; width:14px; height:14px; overflow:hidden;}
-.xpress-editor .tool li.table .layer fieldset dd .preview_palette button{ width:14px; height:14px; font-size:500px; line-height:0;}
-.xpress-editor .tool li.table .layer fieldset dd .find_palette{ width:33px; height:20px; background:url(../img/btn_search.gif) no-repeat;}
-
-.xpress-editor .tool li.table .layer fieldset.num{ top:14px;}
-.xpress-editor .tool li.table .layer fieldset.num dl{ top:18px; width:60px;}
-.xpress-editor .tool li.table .layer fieldset.num dt{ height:20px;}
-.xpress-editor .tool li.table .layer fieldset.num dd{ height:23px;}
-.xpress-editor .tool li.table .layer fieldset.num dt label{ font-size:11px; color:#333;}
-.xpress-editor .tool li.table .layer fieldset.num dd input{ padding:3px 0 0 6px; *margin:-1px 0; width:35px; height:13px; font-size:11px; border:1px solid #818181; border-right:1px solid #dadada; border-bottom:1px solid #dadada;}
-
-.xpress-editor .tool li.table .layer fieldset.color{ top:96px;}
-.xpress-editor .tool li.table .layer fieldset.color dl{ top:18px; width:210px;}
-.xpress-editor .tool li.table .layer fieldset.color dt{ height:23px;}
-.xpress-editor .tool li.table .layer fieldset.color dd{ height:26px; width:146px;}
-.xpress-editor .tool li.table .layer fieldset.color dt label{ font-size:11px; color:#333;}
-.xpress-editor .tool li.table .layer fieldset.color dd input{ padding:3px 0 0 6px; *margin:-1px 0; font-size:11px; border:1px solid #818181; border-right:1px solid #dadada; border-bottom:1px solid #dadada;}
-.xpress-editor .tool li.table .layer fieldset.color dd input#table_border_width{ width:35px; height:13px;}
-.xpress-editor .tool li.table .layer fieldset.color dd input#table_border_color,
-.xpress-editor .tool li.table .layer fieldset.color dd input#table_bg_color{ width:70px; height:15px; *margin-right:3px;}
-
-.xpress-editor .tool li.table .layer table{ position:absolute; top:18px; left:75px; width:137px; height:40px; table-layout:fixed;}
-.xpress-editor .tool li.table .layer table *{ font-size:0; line-height:0;}
-.xpress-editor .tool li.table .layer table th,
-.xpress-editor .tool li.table .layer table td{ text-align:center;}
-.xpress-editor .tool li.table .layer .btn_area{ position:absolute; bottom:12px; padding:0; z-index:1;}
-
-.xpress-editor .tool li.table .layer .palette{ display:none; position:absolute; z-index:2; left:11px; width:204px; padding:8px 7px 7px 7px; _padding-right:6px; background-color:#fbfbfb; border:1px solid #c5c5c5; border-right:1px solid #9f9f9f; border-bottom:1px solid #9f9f9f;}
-.xpress-editor .tool li.table .layer.p1 .palette{ display:block; top:163px;}
-.xpress-editor .tool li.table .layer.p2 .palette{ display:block; top:189px;}
-
-.xpress-editor .tool li.character .layer{ width:433px; height:242px; overflow:hidden;}
-.xpress-editor .tool li.character .layer ul{ margin:0;}
-.xpress-editor .tool li.character .layer h3{position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-.xpress-editor .tool li.character .layer .nav{ position:absolute; top:11px; left:-1px; overflow:hidden; white-space:nowrap;}
-.xpress-editor .tool li.character .layer .nav li{ display:inline; margin:0 -4px 0 0; padding:0 8px; background:url(../img/vr_layer_character.gif) no-repeat 0 0;}
-.xpress-editor .tool li.character .layer .nav li a{ color:#444; text-decoration:none; letter-spacing:-1px;}
-.xpress-editor .tool li.character .layer .nav li a:hover,
-.xpress-editor .tool li.character .layer .nav li a:active,
-.xpress-editor .tool li.character .layer .nav li a:focus{ text-decoration:underline;}
-.xpress-editor .tool li.character .layer .nav li a.on{ font-weight:bold; color:#004790; display:inline;}
-.xpress-editor .tool li.character .layer .list{ position:absolute; left:7px; top:30px; width:421px; height:172px; background:url(../img/bx_character.gif) no-repeat;}
-.xpress-editor .tool li.character .layer .list li{ position:relative; top:1px; left:1px; float:left; width:20px; height:18px; margin:0 1px 1px 0;}
-.xpress-editor .tool li.character .layer .list li button{ width:20px; height:18px;}
-.xpress-editor .tool li.character .layer .list li button.hover{ border:2px solid #27c11a;}
-.xpress-editor .tool li.character .layer .list li button span{ overflow:visible; font-size:12px; width:auto; height:auto; position:relative; visibility:visible; line-height:normal;}
-.xpress-editor .tool li.character .layer p{ position:absolute; top:212px; left:7px;}
-.xpress-editor .tool li.character .layer p *{ vertical-align:top;}
-.xpress-editor .tool li.character .layer p label{ position:relative; top:4px; margin:0 7px 0 0; color:#333; letter-spacing:-1px;}
-.xpress-editor .tool li.character .layer p input{ padding:3px 0 0 4px; margin:0 4px 0 0; width:300px; _width /**/:306px; height:16px; _height /**/:20px; border:1px solid #acacac; border-right:1px solid #dadada; border-bottom:1px solid #dadada;}
-.xpress-editor .tool li.character .layer p button{ position:relative; *top:1px; width:38px; height:21px; background:url(../img/btn_layer_confirm.gif) no-repeat;}
-.xpress-editor .tool li.character .layer p button span{ position:absolute; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-.xpress-editor .tool li.find .layer{ width:242px;}
-.xpress-editor .tool li.find .layer h3{ background:#f2f2f2; color:#333; height:21px; margin:0 0 11px 0; padding:7px 0 0 5px;}
-.xpress-editor .tool li.find .layer .menu_tab{ position:relative; z-index:20; width:100%; *zoom:1;}
-.xpress-editor .tool li.find .layer .menu_tab:after{ content:""; display:block; clear:both;}
-.xpress-editor .tool li.find .layer .layer_tab{ position:relative; left:10px; padding:0; margin:0; clear:both;}
-.xpress-editor .tool li.find .layer .layer_tab li{ position:relative; z-index:1; float:left; margin-right:1px; background:url(../img/btn_layer_tab.gif) no-repeat 0 0;}
-.xpress-editor .tool li.find .layer .layer_tab li a{ position:relative; display:block; float:left; left:2px; height:15px; padding:4px 9px 0 5px; color:#404040; text-decoration:none; background:url(../img/btn_layer_tab.gif) no-repeat right 0;}
-.xpress-editor .tool li.find .layer.find .layer_tab li.tab1,
-.xpress-editor .tool li.find .layer.replace .layer_tab li.tab2{ top:-1px; margin-bottom:-1px;}
-.xpress-editor .tool li.find .layer.find .layer_tab li.tab1 a,
-.xpress-editor .tool li.find .layer.replace .layer_tab li.tab2 a{ height:18px;}
-.xpress-editor .tool li.find .layer .container{ position:relative; z-index:1; clear:both; top:-2px;}
-.xpress-editor .tool li.find .layer .container .bx{ display:none; position:relative; width:222px; left:10px; clear:both; z-index:1; background:url(../img/bx_find.gif) no-repeat;}
-.xpress-editor .tool li.find .layer.find .container #find,
-.xpress-editor .tool li.find .layer.replace .container #replace{ display:block;}
-
-.xpress-editor .tool li.find .layer .bx fieldset{ position:relative; padding:13px 0 17px 11px;}
-.xpress-editor .tool li.find .layer .bx fieldset *{ vertical-align:top;}
-.xpress-editor .tool li.find .layer .bx label{ position:relative; top:4px; margin:0 7px 0 0; font-size:11px; letter-spacing:-1px; color:#333;}
-.xpress-editor .tool li.find .layer .bx input{ padding:3px 0 0 4px; width:144px; _width /**/:150px; height:14px; _height /**/:19px; border:1px solid #acacac; border-right:1px solid #dadada; border-bottom:1px solid #dadada;}
-.xpress-editor .tool li.find .layer .bx .cap{ position:absolute; left:0; bottom:0; display:block; width:222px; height:2px; _margin:0 0 -1px 0; overflow:hidden; background:#fff url(../img/bx_find.gif) no-repeat left bottom; font-size:0; line-height:0;}
-.xpress-editor .tool li.find .layer .bx#replace fieldset{ height:45px; _height /**/:75px;}
-.xpress-editor .tool li.find .layer .bx#replace fieldset #keyword2{ margin-bottom:6px;}
-.xpress-editor .tool li.find .layer .btn_area button{ display:none; *margin:0 2px !important;}
-.xpress-editor .tool li.find .layer.find .btn_area .find_next{ display:inline; width:62px; height:21px; background:url(../img/btn_layer_find_next_strong.gif) no-repeat;}
-.xpress-editor .tool li.find .layer.replace .btn_area .find_next{ display:inline; width:55px; height:21px; background:url(../img/btn_layer_find_next.gif) no-repeat;}
-.xpress-editor .tool li.find .layer.replace .btn_area .replace{ display:inline; width:48px; height:21px; background:url(../img/btn_layer_replace.gif) no-repeat;}
-.xpress-editor .tool li.find .layer.replace .btn_area .replace_all{ display:inline; width:69px; height:21px; background:url(../img/btn_layer_replace_all.gif) no-repeat;}
-.xpress-editor .tool li.find .layer .btn_area .cancel{ display:inline;}
-
-.xpress-editor .tool li.extensions .layer{ width:auto; white-space:nowrap; padding:5px 10px;}
-.xpress-editor .tool li.extensions .layer li{ margin:2px 0;}
-.xpress-editor .tool li.extensions .layer li a { color:#000; text-decoration:none; }
-.xpress-editor .tool li.extensions .layer li a:hover { text-decoration:underline; }
-
-/* File Uploader */
-.xpress-editor .fileUploader{ clear:both; padding-top:5px; margin-bottom:10px;}
-.xpress-editor .fileUploader:after{ content:""; display:block; clear:both;}
-.xpress-editor .fileUploader .preview{ float:left; width:64px; height:64px; border:1px solid #ccc;; padding:2px; margin:0 10px 5px 0;}
-.xpress-editor .fileUploader .preview.black { background-color:#000; border:1px solid #666;}
-.xpress-editor .fileUploader .preview img{ display:block; width:64px; height:64px;}
-.xpress-editor .fileUploader .fileListArea{ float:left; width:260px; margin:0 10px 5px 0;}
-.xpress-editor .fileUploader .fileListArea select{ width:100%; height:70px; overflow:auto;}
-.xpress-editor .fileUploader .fileListArea select option{ font-size:11px;}
-.xpress-editor .fileUploader .fileListArea.black select { background-color:#000; border:1px solid #666;}
-.xpress-editor .fileUploader .fileListArea.black select option { color:#aaa; }
-.xpress-editor .fileUploader .fileUploadControl{ clear:right;}
-.xpress-editor .fileUploader .fileUploadControl .button{ margin-bottom:5px;}
-.xpress-editor .fileUploader .file_attach_info{ clear:right; margin:5px 0;}
-
-/* Auto Save */
-.xpress-editor .autosave_message { display:none; background: #f6ffdb; padding:6px 10px; margin:0; line-height:1;}
-.xpress-editor.black .autosave_message { display:none; background:#222; padding:6px 10px; margin:0; line-height:1; color:#fff; }
-.xpress-editor .input_syntax.black { background:transparent; color:#fff; }
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+/* TextEditor */
+.xeTextEditor {overflow:hidden}
+.xeTextEditor textarea {display:block;margin:0;padding:5px}
+.xeTextEditor.black textarea {color:#fff;background-color:#000}
+/* Type Selector */
+.xpress-editor *{margin:0;padding:0;font-style:normal;font-size:12px}
+.xpress-editor img,
+.xpress-editor fieldset,
+.xpress-editor button{border:0}
+.xpress-editor button{background:none;background-repeat:no-repeat;cursor:pointer}
+.xpress-editor button *{visibility:hidden}
+.xpress-editor legend{position:absolute;width:0;height:0;font-size:0;line-height:0;overflow:hidden;visibility:hidden}
+.xpress-editor label{cursor:pointer}
+.xpress-editor hr{display:none}
+.xpress-editor li{list-style:none}
+/* Layout Selector */
+.xpress-editor{position:relative;background:transparent}
+.xpress-editor #smart_content{position:relative;clear:both;margin:0 0 10px 0;border:1px solid #c2c2c2;*zoom:1;z-index:5;background:#fff}
+.xpress-editor.black #smart_content {background:transparent}
+.xpress-editor #smart_footer{position:relative;text-align:center;padding:10px 0}
+/* Footer */
+.xpress-editor #smart_footer *{vertical-align:top}
+.xpress-editor #smart_footer button{position:relative;width:67px;height:25px;margin:0 5px 0 0}
+.xpress-editor #smart_footer button.save_temp{background:url(../img/btn_save_temp.gif) no-repeat}
+.xpress-editor #smart_footer button.preview{background:url(../img/btn_preview.gif) no-repeat}
+.xpress-editor #smart_footer input{margin:0}
+.xpress-editor #smart_footer input.reset{width:67px;height:25px;border:0;background:url(../img/btn_cancel.gif) no-repeat;cursor:pointer;margin-left:5px}
+/* Content > Input Area */
+.xpress-editor a.skip{position:relative;display:block;top:0;right:0;width:0;height:0;overflow:hidden;clear:both;zoom:1}
+.xpress-editor a.skip:hover,
+.xpress-editor a.skip:active,
+.xpress-editor a.skip:focus{position:relative;display:block;padding:5px;right:0;z-index:60;width:auto;height:auto;text-align:right;white-space:nowrap;color:#000;text-decoration:none;letter-spacing:-1px;_zoom:1}
+.xpress-editor .input_area{position:relative;margin:10px;z-index:30;*zoom:1;height:400px}
+.xpress-editor .input_area iframe,
+.xpress-editor .input_area textarea{display:block;width:100%;position:relative;height:100%;border:0;overflow:auto}
+.xpress-editor .input_area iframe{}
+.xpress-editor .input_area textarea{*margin:0 -10px;_margin-bottom:-2px}
+.xpress-editor .input_area textarea.blind{display:none}
+.xpress-editor .input_control{position:relative;display:block;width:100%;clear:both;text-align:center;background:#fbfbfb url(../img/btn_expand.gif) no-repeat center center;cursor:n-resize}
+.xpress-editor .input_control span{display:block;height:10px;visibility:hidden;overflow:visible;font-size:0;line-height:200%;white-space:nowrap;color:#fff}
+.xpress-editor.black .input_control {background:#111 url(../img/btn_expand.black.gif) no-repeat center center}
+.xpress-editor.black .input_control span{border-top:1px solid #333; color:#000}
+.xpress-editor .tool{position:relative;overflow:visible;padding:5px 10px 6px 10px;*padding:5px 10px 8px 10px;z-index:40;clear:both;background:#f8f8f8 url(../img/bg_tool.gif) repeat-x left bottom;border:0;*zoom:1}
+.xpress-editor .tool.disable {display:none}
+.xpress-editor.black .tool{background:#111 url(../img/bg_tool.black.gif) repeat-x left bottom}
+.xpress-editor .tool:after{content:"";display:block;clear:both}
+.xpress-editor .tool ul{position:relative;overflow:visible;float:left;margin:0 5px 2px 0 !important;z-index:2;border:0 !important}
+.xpress-editor .tool ul.action{width:43px}
+.xpress-editor .tool ul.type{width:auto;white-space:nowrap}
+.xpress-editor .tool ul.style{width:169px;z-index:6}
+.xpress-editor .tool ul.paragraph{width:169px;z-index:5}
+.xpress-editor .tool ul.extra1{width:69px;z-index:4}
+.xpress-editor .tool ul.table{width:85px;z-index:3}
+.xpress-editor .tool ul.extra2{width:auto;z-index:2}
+.xpress-editor .tool ul.extra3{float:left;width:auto;z-index:1;margin-right:1px}
+.xpress-editor .tool ul.extra3 li{margin-right:4px}
+.xpress-editor .tool li{position:relative;float:left;margin:0 !important;padding:0 !important;border:0 !important}
+.xpress-editor .tool li button{width:21px;height:21px;background:url(../img/btn_set.gif) no-repeat 0 0;vertical-align:top}
+.xpress-editor.black .tool li button{width:21px;height:21px;background:url(../img/btn_set.black.gif) no-repeat 0 0;vertical-align:top}
+.xpress-editor .tool li button span{position:absolute;top:0;left:0;width:0;height:0;overflow:hidden;visibility:hidden}
+.xpress-editor .tool li.extensions span.exButton,
+.xpress-editor .tool li.extensions span.exButton button{float:left;position:relative;display:inline-block;width:auto;background:url(../img/btn_set_blank.gif) no-repeat left top}
+.xpress-editor .tool li.extensions span.exButton button{left:2px;height:21px;background-position:right top;padding:0 4px;font:11px/21px Tahoma, Sans-serif;text-align:left;*overflow:visible;*line-height:20px}
+.xpress-editor.black .tool li.extensions span.exButton,
+.xpress-editor.black .tool li.extensions span.exButton button{color:#fff;background-image:url(../img/btn_set_blank.black.gif)}
+.xpress-editor .tool li.html span,
+.xpress-editor .tool li.html span button,
+.xpress-editor .tool li.preview span,
+.xpress-editor .tool li.preview span button{float:left;position:relative;display:inline-block;width:auto;height:auto;visibility:visible;background:url(../img/btn_set_blank.gif) no-repeat 0 0;white-space:nowrap}
+.xpress-editor.black .tool li.html span,
+.xpress-editor.black .tool li.html span button,
+.xpress-editor.black .tool li.preview span,
+.xpress-editor.black .tool li.preview span button{color:#fff;background-image:url(../img/btn_set_blank.black.gif)}
+.xpress-editor .tool li.html span,
+.xpress-editor .tool li.preview span{margin-right:2px;background-position:left top}
+.xpress-editor .tool li.html span button,
+.xpress-editor .tool li.preview span button{left:2px;height:21px;background-position:right top;font:11px/21px Tahoma, Sans-serif;padding:0 4px;*overflow:visible;*line-height:20px}
+.xpress-editor .tool ul.type li{float:none;display:inline;*top:1px}
+.xpress-editor .tool ul.type li select{height:21px;width:62px}
+.xpress-editor.black .tool ul.type li select{color:#fff;background-color:#000}
+/* Content > Tool > Button Default */
+.xpress-editor .tool li.undo button{width:22px;background-position:0 0}
+.xpress-editor .tool li.redo button{background-position:-22px 0}
+.xpress-editor .tool li.bold button{width:22px;background-position:-43px 0}
+.xpress-editor .tool li.underline button{background-position:-65px 0}
+.xpress-editor .tool li.italic button{background-position:-86px 0}
+.xpress-editor .tool li.del button{background-position:-107px 0}
+.xpress-editor .tool li.fcolor button{background-position:-128px 0}
+.xpress-editor .tool li.bcolor button{background-position:-149px 0}
+.xpress-editor .tool li.sup button{background-position:-170px 0}
+.xpress-editor .tool li.sub button{background-position:-191px 0}
+.xpress-editor .tool li.left button{width:22px;background-position:-212px 0}
+.xpress-editor .tool li.center button{background-position:-234px 0}
+.xpress-editor .tool li.right button{background-position:-255px 0}
+.xpress-editor .tool li.justify button{background-position:-276px 0}
+.xpress-editor .tool li.ol button{background-position:-297px 0}
+.xpress-editor .tool li.ul button{background-position:-318px 0}
+.xpress-editor .tool li.outdent button{background-position:-339px 0}
+.xpress-editor .tool li.indent button{background-position:-360px 0}
+.xpress-editor .tool li.blockquote button{width:22px;background-position:-381px 0}
+.xpress-editor .tool li.url button{width:26px;background-position:-403px 0}
+.xpress-editor .tool li.character button{background-position:-429px 0}
+.xpress-editor .tool li.table button{width:22px;background-position:-450px 0}
+.xpress-editor .tool li.merge button{background-position:-472px 0}
+.xpress-editor .tool li.splitCol button{background-position:-493px 0}
+.xpress-editor .tool li.splitRow button{background-position:-514px 0}
+.xpress-editor .tool li.extensions span{background-position:0 0}
+.xpress-editor .tool li.extensions span button{background-position:right 0}
+.xpress-editor .tool li.html span{background-position:0 0}
+.xpress-editor .tool li.html span button{background-position:right 0}
+.xpress-editor .tool li.preview span{background-position:0 0}
+.xpress-editor .tool li.preview span button{background-position:right 0}
+/* Content > Tool > Button Hover */
+.xpress-editor .tool li.undo button.hover{width:22px;background-position:0 -21px}
+.xpress-editor .tool li.redo button.hover{background-position:-22px -21px}
+.xpress-editor .tool li.bold button.hover{width:22px;background-position:-43px -21px}
+.xpress-editor .tool li.underline button.hover{background-position:-65px -21px}
+.xpress-editor .tool li.italic button.hover{background-position:-86px -21px}
+.xpress-editor .tool li.del button.hover{background-position:-107px -21px}
+.xpress-editor .tool li.fcolor button.hover{background-position:-128px -21px}
+.xpress-editor .tool li.bcolor button.hover{background-position:-149px -21px}
+.xpress-editor .tool li.sup button.hover{background-position:-170px -21px}
+.xpress-editor .tool li.sub button.hover{background-position:-191px -21px}
+.xpress-editor .tool li.left button.hover{width:22px;background-position:-212px -21px}
+.xpress-editor .tool li.center button.hover{background-position:-234px -21px}
+.xpress-editor .tool li.right button.hover{background-position:-255px -21px}
+.xpress-editor .tool li.justify button.hover{background-position:-276px -21px}
+.xpress-editor .tool li.ol button.hover{background-position:-297px -21px}
+.xpress-editor .tool li.ul button.hover{background-position:-318px -21px}
+.xpress-editor .tool li.outdent button.hover{background-position:-339px -21px}
+.xpress-editor .tool li.indent button.hover{background-position:-360px -21px}
+.xpress-editor .tool li.blockquote button.hover{width:22px;background-position:-381px -21px}
+.xpress-editor .tool li.url button.hover{width:26px;background-position:-403px -21px}
+.xpress-editor .tool li.character button.hover{background-position:-429px -21px}
+.xpress-editor .tool li.table button.hover{width:22px;background-position:-450px -21px}
+.xpress-editor .tool li.merge button.hover{background-position:-472px -21px}
+.xpress-editor .tool li.splitCol button.hover{background-position:-493px -21px}
+.xpress-editor .tool li.splitRow button.hover{background-position:-514px -21px}
+.xpress-editor .tool li.extensions span.hover{background-position:0 -21px}
+.xpress-editor .tool li.extensions span.hover button{background-position:right -21px}
+.xpress-editor .tool li.html span.hover{background-position:0 -21px}
+.xpress-editor .tool li.html span.hover button{background-position:right -21px}
+.xpress-editor .tool li.preview span.hover{background-position:0 -21px}
+.xpress-editor .tool li.preview span.hover button{background-position:right -21px}
+/* Content > Tool > Button Active */
+.xpress-editor .tool li.undo button.active{width:22px;background-position:0 -42px}
+.xpress-editor .tool li.redo button.active{background-position:-22px -42px}
+.xpress-editor .tool li.bold button.active{width:22px;background-position:-43px -42px}
+.xpress-editor .tool li.underline button.active{background-position:-65px -42px}
+.xpress-editor .tool li.italic button.active{background-position:-86px -42px}
+.xpress-editor .tool li.del button.active{background-position:-107px -42px}
+.xpress-editor .tool li.fcolor button.active{background-position:-128px -42px}
+.xpress-editor .tool li.bcolor button.active{background-position:-149px -42px}
+.xpress-editor .tool li.sup button.active{background-position:-170px -42px}
+.xpress-editor .tool li.sub button.active{background-position:-191px -42px}
+.xpress-editor .tool li.left button.active{width:22px;background-position:-212px -42px}
+.xpress-editor .tool li.center button.active{background-position:-234px -42px}
+.xpress-editor .tool li.right button.active{background-position:-255px -42px}
+.xpress-editor .tool li.justify button.active{background-position:-276px -42px}
+.xpress-editor .tool li.ol button.active{background-position:-297px -42px}
+.xpress-editor .tool li.ul button.active{background-position:-318px -42px}
+.xpress-editor .tool li.outdent button.active{background-position:-339px -42px}
+.xpress-editor .tool li.indent button.active{background-position:-360px -42px}
+.xpress-editor .tool li.blockquote button.active{width:22px;background-position:-381px -42px}
+.xpress-editor .tool li.url button.active{width:26px;background-position:-403px -42px}
+.xpress-editor .tool li.character button.active{background-position:-429px -42px}
+.xpress-editor .tool li.table button.active{width:22px;background-position:-450px -42px}
+.xpress-editor .tool li.merge button.active{background-position:-472px -42px}
+.xpress-editor .tool li.splitCol button.active{background-position:-493px -42px}
+.xpress-editor .tool li.splitRow button.active{background-position:-514px -42px}
+.xpress-editor .tool li.extensions span.active{background-position:0 -42px}
+.xpress-editor .tool li.extensions span.active button{background-position:right -42px}
+.xpress-editor .tool li.html span.active{background-position:0 -42px}
+.xpress-editor .tool li.html span.active button{background-position:right -42px}
+.xpress-editor .tool li.preview span.active{background-position:0 -42px}
+.xpress-editor .tool li.preview span.active button{background-position:right -42px}
+/* Content > Tool > Button Off */
+.xpress-editor .tool.off li.undo button,
+.xpress-editor .tool li.undo button.off{width:22px;background-position:0 -63px}
+.xpress-editor .tool.off li.redo button,
+.xpress-editor .tool li.redo button.off{background-position:-22px -63px}
+.xpress-editor .tool.off li.bold button{width:22px;background-position:-43px -63px}
+.xpress-editor .tool.off li.underline button{background-position:-65px -63px}
+.xpress-editor .tool.off li.italic button{background-position:-86px -63px}
+.xpress-editor .tool.off li.del button{background-position:-107px -63px}
+.xpress-editor .tool.off li.fcolor button{background-position:-128px -63px}
+.xpress-editor .tool.off li.bcolor button{background-position:-149px -63px}
+.xpress-editor .tool.off li.sup button{background-position:-170px -63px}
+.xpress-editor .tool.off li.sub button{background-position:-191px -63px}
+.xpress-editor .tool.off li.left button{width:22px;background-position:-212px -63px}
+.xpress-editor .tool.off li.center button{background-position:-234px -63px}
+.xpress-editor .tool.off li.right button{background-position:-255px -63px}
+.xpress-editor .tool.off li.justify button{background-position:-276px -63px}
+.xpress-editor .tool.off li.ol button{background-position:-297px -63px}
+.xpress-editor .tool.off li.ul button{background-position:-318px -63px}
+.xpress-editor .tool.off li.outdent button{background-position:-339px -63px}
+.xpress-editor .tool.off li.indent button{background-position:-360px -63px}
+.xpress-editor .tool.off li.blockquote button{width:22px;background-position:-381px -63px}
+.xpress-editor .tool.off li.url button{width:26px;background-position:-403px -63px}
+.xpress-editor .tool.off li.character button{background-position:-429px -63px}
+.xpress-editor .tool.off li.table button{width:22px;background-position:-450px -63px}
+.xpress-editor .tool.off li.merge button,
+.xpress-editor .tool li.merge button.off{background-position:-472px -63px}
+.xpress-editor .tool.off li.splitCol button,
+.xpress-editor .tool li.splitCol button.off{background-position:-493px -63px}
+.xpress-editor .tool.off li.splitRow button,
+.xpress-editor .tool li.splitRow button.off{background-position:-514px -63px}
+.xpress-editor .tool.off li.extensions span{background-position:0 -63px}
+.xpress-editor .tool.off li.extensions span button{background-position:right -63px;color:#bcbcbc}
+.xpress-editor .tool.off li button{cursor:default}
+.xpress-editor .tool.off ul.extra3 li button{cursor:pointer}
+/* Content > Tool > Layer */
+.xpress-editor .tool .layer{display:none;position:absolute;left:0;top:20px;background-color:#fbfbfb;border:1px solid #c5c5c5;border-right:1px solid #9f9f9f;border-bottom:1px solid #9f9f9f}
+.xpress-editor .tool .layer li{float:none;left:0}
+.xpress-editor .tool .layer button,
+.xpress-editor.black .tool .layer button{margin:0 !important;width:auto;height:auto;background:none}
+.xpress-editor .tool .layer button span{position:absolute;width:0;height:0;font-size:0;line-height:0;overflow:hidden;visibility:hidden}
+.xpress-editor .tool .btn_area{position:relative;clear:both;text-align:center !important;padding:7px 0 12px 0;width:100%;white-space:nowrap;*zoom:1}
+.xpress-editor .tool .btn_area *{vertical-align:top}
+.xpress-editor .tool button.close{position:absolute;top:4px;right:3px;width:21px;height:20px;background:url(../img/btn_layer_close.gif) no-repeat center center !important}
+.xpress-editor .tool button.close span{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden}
+.xpress-editor .tool .layer .btn_area button{*margin:0 2px !important}
+.xpress-editor .tool .layer .btn_area button.confirm{width:38px;height:21px;background:url(../img/btn_layer_confirm.gif) no-repeat}
+.xpress-editor .tool .layer .btn_area button.cancel{width:38px;height:21px;background:url(../img/btn_layer_cancel.gif) no-repeat}
+.xpress-editor .tool li.fcolor .layer{width:218px !important;height:auto !important;background-image:none !important;overflow:hidden}
+.xpress-editor .tool .layer .palette{width:210px;position:relative;left:7px;padding:8px 0 7px 0;margin:0}
+.xpress-editor .tool .layer .palette li{float:left;margin:0 1px 1px 0;font-size:0;line-height:0}
+.xpress-editor .tool .layer .palette button{position:relative;overflow:hidden;width:11px !important;height:11px !important}
+.xpress-editor .tool li.bcolor .layer {width:218px;overflow:hidden}
+.xpress-editor .tool .layer .background{width:210px;position:relative;left:7px;margin:0 0 -2px 0;padding:8px 0 0 0;*padding-bottom:8px;_padding-bottom:4px}
+.xpress-editor .tool .layer .background li{float:left;margin:0 5px 2px 0}
+.xpress-editor .tool .layer .background button{position:relative;overflow:hidden;width:65px;height:19px;text-align:left;padding:4px}
+.xpress-editor .tool .layer .background button span{position:relative;visibility:visible;font-size:12px;line-height:normal;width:auto;height:auto}
+.xpress-editor .tool li.style .layer{padding:4px 2px;_overflow:hidden;filter:progid:DXImageTransform.Microsoft.Shadow(color=#dddddd,direction=135,strength=2)}
+.xpress-editor .tool li.style .layer li{position:relative;background:#fbfbfb}
+.xpress-editor .tool li.style .layer li button{display:block;width:134px;position:relative}
+.xpress-editor .tool li.style .layer li button span{display:block;width:130px;text-align:left;letter-spacing:normal}
+.xpress-editor .tool li.style .layer li.h3 button span{padding:3px 0 1px 4px;height:15px;_height /**/:19px;font-size:16px;font-weight:bold}
+.xpress-editor .tool li.style .layer li.h4 button span{padding:3px 0 2px 4px;height:13px;_height /**/:18px;font-size:14px;font-weight:bold}
+.xpress-editor .tool li.style .layer li.h5 button span{padding:3px 0 1px 4px;height:11px;_height /**/:15px;font-size:12px;font-weight:bold}
+.xpress-editor .tool li.style .layer li.h6 button span{padding:3px 0 1px 4px;height:11px;_height /**/:15px;font-size:12px}
+.xpress-editor .tool li.style .layer li.p button span{padding:3px 0 1px 4px;height:11px;_height /**/:15px;font-size:12px;color:#5d5d5d}
+.xpress-editor .tool li.style .layer li button.hover{background:#c1f471;*height:1%}
+.xpress-editor .tool li.blockquote .layer{padding:6px 5px 6px 7px;left:0;width:288px}
+.xpress-editor .tool li.blockquote .layer ul{*zoom:1;margin:0}
+.xpress-editor .tool li.blockquote .layer ul:after{content:"";display:block;clear:both}
+.xpress-editor .tool li.blockquote .layer li{position:relative;float:left;overflow:hidden;width:32px;height:34px;margin:0 2px 0 0;border:1px solid #cdcecc;background-image:url(../img/btn_qmark.gif);background-repeat:no-repeat}
+.xpress-editor .tool li.blockquote .layer li.q1{background-position:0 0}
+.xpress-editor .tool li.blockquote .layer li.q2{background-position:-32px 0}
+.xpress-editor .tool li.blockquote .layer li.q3{background-position:-64px 0}
+.xpress-editor .tool li.blockquote .layer li.q4{background-position:-96px 0}
+.xpress-editor .tool li.blockquote .layer li.q5{background-position:-128px 0}
+.xpress-editor .tool li.blockquote .layer li.q6{background-position:-160px 0}
+.xpress-editor .tool li.blockquote .layer li.q7{background-position:-192px 0}
+.xpress-editor .tool li.blockquote .layer li.q8{background-position:-224px 0}
+.xpress-editor .tool li.blockquote .layer li button{width:32px;height:34px}
+.xpress-editor .tool li.url .layer{width:231px;height:125px;background-image:url(../img/bx_url.gif);background-repeat:no-repeat;background-position:10px 14px}
+.xpress-editor .tool li.url .layer fieldset{position:absolute;width:212px;left:10px;top:14px}
+.xpress-editor .tool li.url .layer fieldset h3{position:absolute;top:-4px;left:15px;color:#404040;visibility:visible;font-size:12px;line-height:normal;width:auto;height:auto;background:none;margin:0;padding:0;font-weight:normal}
+.xpress-editor .tool li.url .layer fieldset input.link{position:absolute;left:12px;top:19px;width:179px;padding:2px 0 1px 6px;*margin:-1px 0;font-size:11px;height:13px;border:1px solid #818181;border-right:1px solid #dadada;border-bottom:1px solid #dadada}
+.xpress-editor .tool li.url .layer fieldset p{position:absolute;left:12px;top:44px}
+.xpress-editor .tool li.url .layer fieldset p input{width:13px;height:13px;vertical-align:middle;margin-right:3px}
+.xpress-editor .tool li.url .layer .btn_area{position:absolute;bottom:12px;padding:0}
+.xpress-editor .tool li.table .layer{width:242px;height:239px;background-image:url(../img/bx_table.gif);background-repeat:no-repeat;background-position:10px 14px}
+.xpress-editor .tool li.table .layer fieldset{position:absolute;width:222px;left:10px}
+.xpress-editor .tool li.table .layer fieldset h3{position:absolute;top:-4px;left:15px;color:#404040;visibility:visible;font-size:12px;line-height:normal;width:auto;height:auto;background:none;margin:0;padding:0;font-weight:normal}
+.xpress-editor .tool li.table .layer fieldset dl{position:absolute;left:10px}
+.xpress-editor .tool li.table .layer fieldset dt{float:left;padding:3px 0 0 0;height:20px;white-space:nowrap;letter-spacing:-1px}
+.xpress-editor .tool li.table .layer fieldset dd{float:right;position:relative}
+.xpress-editor .tool li.table .layer fieldset dd button.add,
+.xpress-editor .tool li.table .layer fieldset dd button.del{position:absolute;left:27px;width:15px;height:8px;background:url(../img/btn_layer_cell_adjust.gif) no-repeat}
+.xpress-editor .tool li.table .layer fieldset dd button.add{top:1px}
+.xpress-editor .tool li.table .layer fieldset dd button.del{top:9px;background-position:0 -8px}
+.xpress-editor .tool li.table .layer fieldset dd .preview_palette{display:block;float:left;margin:0 3px 0 0;padding:2px;position:relative;border:1px solid #c8c9c6;width:14px;height:14px;overflow:hidden}
+.xpress-editor .tool li.table .layer fieldset dd .preview_palette button{width:14px;height:14px;font-size:500px;line-height:0}
+.xpress-editor .tool li.table .layer fieldset dd .find_palette{width:33px;height:20px;background:url(../img/btn_search.gif) no-repeat}
+.xpress-editor .tool li.table .layer fieldset.num{top:14px}
+.xpress-editor .tool li.table .layer fieldset.num dl{top:18px;width:60px}
+.xpress-editor .tool li.table .layer fieldset.num dt{height:20px}
+.xpress-editor .tool li.table .layer fieldset.num dd{height:23px}
+.xpress-editor .tool li.table .layer fieldset.num dt label{font-size:11px;color:#333}
+.xpress-editor .tool li.table .layer fieldset.num dd input{padding:3px 0 0 6px;*margin:-1px 0;width:35px;height:13px;font-size:11px;border:1px solid #818181;border-right:1px solid #dadada;border-bottom:1px solid #dadada}
+.xpress-editor .tool li.table .layer fieldset.color{top:96px}
+.xpress-editor .tool li.table .layer fieldset.color dl{top:18px;width:210px}
+.xpress-editor .tool li.table .layer fieldset.color dt{height:23px}
+.xpress-editor .tool li.table .layer fieldset.color dd{height:26px;width:146px}
+.xpress-editor .tool li.table .layer fieldset.color dt label{font-size:11px;color:#333}
+.xpress-editor .tool li.table .layer fieldset.color dd input{padding:3px 0 0 6px;*margin:-1px 0;font-size:11px;border:1px solid #818181;border-right:1px solid #dadada;border-bottom:1px solid #dadada}
+.xpress-editor .tool li.table .layer fieldset.color dd input#table_border_width{width:35px;height:13px}
+.xpress-editor .tool li.table .layer fieldset.color dd input#table_border_color,
+.xpress-editor .tool li.table .layer fieldset.color dd input#table_bg_color{width:70px;height:15px;*margin-right:3px}
+.xpress-editor .tool li.table .layer table{position:absolute;top:18px;left:75px;width:137px;height:40px;table-layout:fixed}
+.xpress-editor .tool li.table .layer table *{font-size:0;line-height:0}
+.xpress-editor .tool li.table .layer table th,
+.xpress-editor .tool li.table .layer table td{text-align:center}
+.xpress-editor .tool li.table .layer .btn_area{position:absolute;bottom:12px;padding:0;z-index:1}
+.xpress-editor .tool li.table .layer .palette{display:none;position:absolute;z-index:2;left:11px;width:204px;padding:8px 7px 7px 7px;_padding-right:6px;background-color:#fbfbfb;border:1px solid #c5c5c5;border-right:1px solid #9f9f9f;border-bottom:1px solid #9f9f9f}
+.xpress-editor .tool li.table .layer.p1 .palette{display:block;top:163px}
+.xpress-editor .tool li.table .layer.p2 .palette{display:block;top:189px}
+.xpress-editor .tool li.character .layer{width:433px;height:242px;overflow:hidden}
+.xpress-editor .tool li.character .layer ul{margin:0}
+.xpress-editor .tool li.character .layer h3{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden}
+.xpress-editor .tool li.character .layer .nav{position:absolute;top:11px;left:-1px;overflow:hidden;white-space:nowrap}
+.xpress-editor .tool li.character .layer .nav li{display:inline;margin:0 -4px 0 0;padding:0 8px;background:url(../img/vr_layer_character.gif) no-repeat 0 0}
+.xpress-editor .tool li.character .layer .nav li a{color:#444;text-decoration:none;letter-spacing:-1px}
+.xpress-editor .tool li.character .layer .nav li a:hover,
+.xpress-editor .tool li.character .layer .nav li a:active,
+.xpress-editor .tool li.character .layer .nav li a:focus{text-decoration:underline}
+.xpress-editor .tool li.character .layer .nav li a.on{font-weight:bold;color:#004790;display:inline}
+.xpress-editor .tool li.character .layer .list{position:absolute;left:7px;top:30px;width:421px;height:172px;background:url(../img/bx_character.gif) no-repeat}
+.xpress-editor .tool li.character .layer .list li{position:relative;top:1px;left:1px;float:left;width:20px;height:18px;margin:0 1px 1px 0}
+.xpress-editor .tool li.character .layer .list li button{width:20px;height:18px}
+.xpress-editor .tool li.character .layer .list li button.hover{border:2px solid #27c11a}
+.xpress-editor .tool li.character .layer .list li button span{overflow:visible;font-size:12px;width:auto;height:auto;position:relative;visibility:visible;line-height:normal}
+.xpress-editor .tool li.character .layer p{position:absolute;top:212px;left:7px}
+.xpress-editor .tool li.character .layer p *{vertical-align:top}
+.xpress-editor .tool li.character .layer p label{position:relative;top:4px;margin:0 7px 0 0;color:#333;letter-spacing:-1px}
+.xpress-editor .tool li.character .layer p input{padding:3px 0 0 4px;margin:0 4px 0 0;width:300px;_width /**/:306px;height:16px;_height /**/:20px;border:1px solid #acacac;border-right:1px solid #dadada;border-bottom:1px solid #dadada}
+.xpress-editor .tool li.character .layer p button{position:relative;*top:1px;width:38px;height:21px;background:url(../img/btn_layer_confirm.gif) no-repeat}
+.xpress-editor .tool li.character .layer p button span{position:absolute;width:0;height:0;overflow:hidden;visibility:hidden}
+.xpress-editor .tool li.extensions .layer{width:auto;white-space:nowrap;padding:5px 10px}
+.xpress-editor .tool li.extensions .layer li{margin:2px 0}
+.xpress-editor .tool li.extensions .layer li a {color:#000;text-decoration:none}
+.xpress-editor .tool li.extensions .layer li a:hover {text-decoration:underline}
+/* File Uploader */
+.xpress-editor .fileUploader{clear:both;padding-top:5px;margin-bottom:10px}
+.xpress-editor .fileUploader:after{content:"";display:block;clear:both}
+.xpress-editor .fileUploader .preview{float:left;width:64px;height:64px;border:1px solid #ccc;;padding:2px;margin:0 10px 5px 0}
+.xpress-editor .fileUploader .preview.black {background-color:#000;border:1px solid #666}
+.xpress-editor .fileUploader .preview img{display:block;width:64px;height:64px}
+.xpress-editor .fileUploader .fileListArea{float:left;width:260px;margin:0 10px 5px 0}
+.xpress-editor .fileUploader .fileListArea select{width:100%;height:70px;overflow:auto;margin:0;padding:0;float:none}
+.xpress-editor .fileUploader .fileListArea select option{font-size:11px}
+.xpress-editor .fileUploader .fileListArea.black select {background-color:#000;border:1px solid #666}
+.xpress-editor .fileUploader .fileListArea.black select option {color:#aaa}
+.xpress-editor .fileUploader .fileUploadControl{clear:right}
+.xpress-editor .fileUploader .fileUploadControl .button{margin-bottom:5px}
+.xpress-editor .fileUploader .file_attach_info{clear:right;margin:5px 0;font-size:11px;color:#333}
+/* Auto Save */
+.xpress-editor .autosave_message {display:none;background: #f6ffdb;padding:6px 10px;margin:0;line-height:1}
+.xpress-editor.black .autosave_message {display:none;background:#222;padding:6px 10px;margin:0;line-height:1;color:#fff}
+.xpress-editor .input_syntax.black {background:transparent;color:#fff}
\ No newline at end of file
diff --git a/modules/editor/skins/xpresseditor/editor.html b/modules/editor/skins/xpresseditor/editor.html
index 202c94ca2..e5394df1f 100644
--- a/modules/editor/skins/xpresseditor/editor.html
+++ b/modules/editor/skins/xpresseditor/editor.html
@@ -1,484 +1,487 @@
-<!--// 스킨 css 로드 -->
-<!--%import("css/default.css")-->
-
-<!--// 기본 JS 로드 -->
-<!--%import("../../tpl/js/editor_common.js")-->
-
-<!--@if($colorset == "black" || $colorset == "black_texteditor" || $colorset == "black_text_nohtml" || $colorset == "black_text_usehtml")-->
-    <!--%import("css/black.css")-->
-    {@ $editor_class = "black" }
-<!--@end-->
-
-<!--@if($colorset == "white_texteditor" || $colorset == "black_texteditor" || $colorset == "white_text_nohtml" || $colorset == "black_text_nohtml" || $colorset == "white_text_usehtml" || $colorset == "black_text_usehtml")-->
-    <!--%import("js/xe_textarea.js")-->
-
-    <div class="xeTextEditor {$editor_class}">
-        <input type="hidden" id="htm_{$editor_sequence}" value="<!--@if($colorset == "white_text_nohtml" || $colorset == "black_text_nohtml")-->n<!--@end--><!--@if($colorset == "white_texteditor" || $colorset == "white_texteditor")-->br<!--@end-->" />
-        <textarea id="editor_{$editor_sequence}" style="height:{$editor_height}px;" cols="50" rows="5" class="inputTextarea"></textarea>
-    </div>
-    <script type="text/javascript">//<![CDATA[
-        editorStartTextarea({$editor_sequence}, "{$editor_content_key_name}", "{$editor_primary_key_name}");
-    //]]></script>
-
-<!--@else-->
-
-    <!--// 기본 js/언어파일 로드 -->
-    <!--%import("js/Xpress_Editor.js")-->
-    <!--%import("js/xe_interface.js")-->
-
-    <!-- 자동저장용 폼 -->
-
-    <!--@if($enable_autosave)-->
-    <input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title)}" />
-    <input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
-    <input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
-    <!--@end-->
-    <!-- 에디터 -->
-    <div class="xpress-editor {$editor_class}">
-        <div id="smart_content"> <a href="#xe-editor-container-{$editor_sequence}" class="skip">&raquo; {$lang->edit->jumptoedit}</a>
-
-        <!--@if($enable_default_component||$enable_component||$html_mode)-->
-        <!-- 편집 컴포넌트 -->
-        <div class="tool off">
-            <!--@if($enable_default_component)-->
-            <!-- 기본 컴포넌트 출력 -->
-            <ul class="do item">
-                <li class="xpress_xeditor_ui_undo undo"><button type="button" title="Ctrl+Z:{$lang->edit->undo}"><span>{$lang->edit->undo}</span></button></li>
-                <li class="xpress_xeditor_ui_redo redo"><button type="button" title="Ctrl+Y:{$lang->edit->redo}"><span>{$lang->edit->redo}</span></button></li>
-            </ul>
-            <ul class="type">
-                <li class="xpress_xeditor_ui_format">
-                    <select class="xpress_xeditor_ui_format_select" disabled="disabled">
-                        <option value="">{$lang->edit->header}</option>
-                        <!--@foreach($lang->edit->header_list as $key=>$obj)-->
-                        <option value="{$key}">{$obj}</option>
-                        <!--@end-->
-                    </select>
-                </li>
-                <li class="xpress_xeditor_ui_fontName">
-                    <select class="xpress_xeditor_ui_fontName_select" disabled="disabled">
-                        <option value="">{$lang->edit->fontname}</option>
-                        <!--@foreach($lang->edit->fontlist as $key=>$obj)-->
-                        <option value="{$key}" style="font-family:{$key}">{$obj}</option>
-                        <!--@end-->
-                    </select>
-                </li>
-                <li class="xpress_xeditor_ui_fontSize">
-                    <select class="xpress_xeditor_ui_fontSize_select" disabled="disabled">
-                        <option value="">{$lang->edit->fontsize}</option>
-                        <option value="9px" style="font-size:9px">9px</option>
-                        <option value="10px" style="font-size:10px">10px</option>
-                        <option value="11px" style="font-size:11px">11px</option>
-                        <option value="12px" style="font-size:12px">12px</option>
-                        <option value="13px" style="font-size:13px">13px</option>
-                        <option value="14px" style="font-size:14px">14px</option>
-                        <option value="16px" style="font-size:16px">16px</option>
-                        <option value="18px" style="font-size:18px">18px</option>
-                        <option value="24px" style="font-size:24px">24px</option>
-                        <option value="32px" style="font-size:32px">32px</option>
-                    </select>
-                </li>
-                <li class="xpress_xeditor_ui_lineHeight">
-                    <select class="xpress_xeditor_ui_lineHeight_select" disabled="disabled">
-                        <option value="">{$lang->edit->lineheight}</option>
-                        <option value="1">100%</option>
-                        <option value="1.2">120%</option>
-                        <option value="1.4">140%</option>
-                        <option value="1.6">160%</option>
-                        <option value="1.8">180%</option>
-                        <option value="2">200%</option>
-                    </select>
-                </li>
-            </ul>
-            <ul class="style">
-                <li class="bold xpress_xeditor_ui_bold">
-                    <button type="button" title="Ctrl+B:{$lang->edit->help_bold}"><span>{$lang->edit->bold}</span></button>
-                </li>
-                <li class="underline xpress_xeditor_ui_underline">
-                    <button type="button" title="Ctrl+U:{$lang->edit->help_underline}"><span>{$lang->edit->underline}</span></button>
-                </li>
-                <li class="italic xpress_xeditor_ui_italic">
-                    <button type="button" title="Ctrl+I:{$lang->edit->help_italic}"><span>{$lang->edit->italic}</span></button>
-                </li>
-                <li class="del xpress_xeditor_ui_lineThrough">
-                    <button type="button" title="Ctrl+D:{$lang->edit->help_strike}"><span>{$lang->edit->strike}</span></button>
-                </li>
-                <li class="fcolor xpress_xeditor_ui_fontColor">
-                    <button type="button" title="{$lang->edit->help_fontcolor}"><span>{$lang->edit->fontcolor}</span></button>
-                    <!-- 팔레트 레이어 -->
-                    <div class="layer xpress_xeditor_fontcolor_layer" style="display:none;">
-                        <ul class="palette xpress_xeditor_color_palette">
-                            <li><button type="button" title="#ff0000" style="background:#ff0000"><span>#ff0000</span></button></li>
-                            <li><button type="button" title="#ff6c00" style="background:#ff6c00"><span>#ff6c00</span></button></li>
-                            <li><button type="button" title="#ffaa00" style="background:#ffaa00"><span>#ffaa00</span></button></li>
-                            <li><button type="button" title="#ffef00" style="background:#ffef00"><span>#ffef00</span></button></li>
-                            <li><button type="button" title="#a6cf00" style="background:#a6cf00"><span>#a6cf00</span></button></li>
-                            <li><button type="button" title="#009e25" style="background:#009e25"><span>#009e25</span></button></li>
-                            <li><button type="button" title="#00b0a2" style="background:#00b0a2"><span>#00b0a2</span></button></li>
-                            <li><button type="button" title="#0075c8" style="background:#0075c8"><span>#0075c8</span></button></li>
-                            <li><button type="button" title="#3a32c3" style="background:#3a32c3"><span>#3a32c3</span></button></li>
-                            <li><button type="button" title="#7820b9" style="background:#7820b9"><span>#7820b9</span></button></li>
-                            <li><button type="button" title="#ef007c" style="background:#ef007c"><span>#ef007c</span></button></li>
-                            <li><button type="button" title="#000000" style="background:#000000"><span>#000000</span></button></li>
-                            <li><button type="button" title="#252525" style="background:#252525"><span>#252525</span></button></li>
-                            <li><button type="button" title="#464646" style="background:#464646"><span>#464646</span></button></li>
-                            <li><button type="button" title="#636363" style="background:#636363"><span>#636363</span></button></li>
-                            <li><button type="button" title="#7d7d7d" style="background:#7d7d7d"><span>#7d7d7d</span></button></li>
-                            <li><button type="button" title="#9a9a9a" style="background:#9a9a9a"><span>#9a9a9a</span></button></li>
-                            <li><button type="button" title="#ffe8e8" style="background:#ffe8e8"><span>#ffe8e8</span></button></li>
-                            <li><button type="button" title="#f7e2d2" style="background:#f7e2d2"><span>#f7e2d2</span></button></li>
-                            <li><button type="button" title="#f5eddc" style="background:#f5eddc"><span>#f5eddc</span></button></li>
-                            <li><button type="button" title="#f5f4e0" style="background:#f5f4e0"><span>#f5f4e0</span></button></li>
-                            <li><button type="button" title="#edf2c2" style="background:#edf2c2"><span>#edf2c2</span></button></li>
-                            <li><button type="button" title="#def7e5" style="background:#def7e5"><span>#def7e5</span></button></li>
-                            <li><button type="button" title="#d9eeec" style="background:#d9eeec"><span>#d9eeec</span></button></li>
-                            <li><button type="button" title="#c9e0f0" style="background:#c9e0f0"><span>#c9e0f0</span></button></li>
-                            <li><button type="button" title="#d6d4eb" style="background:#d6d4eb"><span>#d6d4eb</span></button></li>
-                            <li><button type="button" title="#e7dbed" style="background:#e7dbed"><span>#e7dbed</span></button></li>
-                            <li><button type="button" title="#f1e2ea" style="background:#f1e2ea"><span>#f1e2ea</span></button></li>
-                            <li><button type="button" title="#acacac" style="background:#acacac"><span>#acacac</span></button></li>
-                            <li><button type="button" title="#c2c2c2" style="background:#c2c2c2"><span>#c2c2c2</span></button></li>
-                            <li><button type="button" title="#cccccc" style="background:#cccccc"><span>#cccccc</span></button></li>
-                            <li><button type="button" title="#e1e1e1" style="background:#e1e1e1"><span>#e1e1e1</span></button></li>
-                            <li><button type="button" title="#ebebeb" style="background:#ebebeb"><span>#ebebeb</span></button></li>
-                            <li><button type="button" title="#ffffff" style="background:#ffffff"><span>#ffffff</span></button></li>
-                            <li><button type="button" title="#e97d81" style="background:#e97d81"><span>#e97d81</span></button></li>
-                            <li><button type="button" title="#e19b73" style="background:#e19b73"><span>#e19b73</span></button></li>
-                            <li><button type="button" title="#d1b274" style="background:#d1b274"><span>#d1b274</span></button></li>
-                            <li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
-                            <li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
-                            <li><button type="button" title="#61b977" style="background:#61b977"><span>#61b977</span></button></li>
-                            <li><button type="button" title="#53aea8" style="background:#53aea8"><span>#53aea8</span></button></li>
-                            <li><button type="button" title="#518fbb" style="background:#518fbb"><span>#518fbb</span></button></li>
-                            <li><button type="button" title="#6a65bb" style="background:#6a65bb"><span>#6a65bb</span></button></li>
-                            <li><button type="button" title="#9a54ce" style="background:#9a54ce"><span>#9a54ce</span></button></li>
-                            <li><button type="button" title="#e573ae" style="background:#e573ae"><span>#e573ae</span></button></li>
-                            <li><button type="button" title="#5a504b" style="background:#5a504b"><span>#5a504b</span></button></li>
-                            <li><button type="button" title="#767b86" style="background:#767b86"><span>#767b86</span></button></li>
-                            <li><button type="button" title="#00ffff" style="background:#00ffff"><span>#00ffff</span></button></li>
-                            <li><button type="button" title="#00ff00" style="background:#00ff00"><span>#00ff00</span></button></li>
-                            <li><button type="button" title="#a0f000" style="background:#a0f000"><span>#a0f000</span></button></li>
-                            <li><button type="button" title="#ffff00" style="background:#ffff00"><span>#ffff00</span></button></li>
-                            <li><button type="button" title="#951015" style="background:#951015"><span>#951015</span></button></li>
-                            <li><button type="button" title="#6e391a" style="background:#6e391a"><span>#6e391a</span></button></li>
-                            <li><button type="button" title="#785c25" style="background:#785c25"><span>#785c25</span></button></li>
-                            <li><button type="button" title="#5f5b25" style="background:#5f5b25"><span>#5f5b25</span></button></li>
-                            <li><button type="button" title="#4c511f" style="background:#4c511f"><span>#4c511f</span></button></li>
-                            <li><button type="button" title="#1c4827" style="background:#1c4827"><span>#1c4827</span></button></li>
-                            <li><button type="button" title="#0d514c" style="background:#0d514c"><span>#0d514c</span></button></li>
-                            <li><button type="button" title="#1b496a" style="background:#1b496a"><span>#1b496a</span></button></li>
-                            <li><button type="button" title="#2b285f" style="background:#2b285f"><span>#2b285f</span></button></li>
-                            <li><button type="button" title="#45245b" style="background:#45245b"><span>#45245b</span></button></li>
-                            <li><button type="button" title="#721947" style="background:#721947"><span>#721947</span></button></li>
-                            <li><button type="button" title="#352e2c" style="background:#352e2c"><span>#352e2c</span></button></li>
-                            <li><button type="button" title="#3c3f45" style="background:#3c3f45"><span>#3c3f45</span></button></li>
-                            <li><button type="button" title="#00aaff" style="background:#00aaff"><span>#00aaff</span></button></li>
-                            <li><button type="button" title="#0000ff" style="background:#0000ff"><span>#0000ff</span></button></li>
-                            <li><button type="button" title="#a800ff" style="background:#a800ff"><span>#a800ff</span></button></li>
-                            <li><button type="button" title="#ff00ff" style="background:#ff00ff"><span>#ff00ff</span></button></li>
-                        </ul>
-                    </div>
-                    <!-- /팔레트 레이어 -->
-                </li>
-                <li class="bcolor xpress_xeditor_ui_bgColor">
-                    <button type="button" title="{$lang->edit->help_fontbgcolor}"><span>{$lang->edit->fontbgcolor}</span></button>
-                    <!-- 배경색 + 팔레트 레이어 -->
-                    <div class="layer xpress_xeditor_bgcolor_layer" style="display:none;">
-                        <ul class="background">
-                            <li><button type="button" title="#000000" style="background:#000000; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#9334d8" style="background:#9334d8; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#ff0000" style="background:#ff0000; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#333333" style="background:#333333; color:#ffff00"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#0000ff" style="background:#0000ff; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#ff6600" style="background:#ff6600; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#8e8e8e" style="background:#8e8e8e; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#009999" style="background:#009999; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#ffa700" style="background:#ffa700; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#ffdaed" style="background:#ffdaed; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#e4ff75" style="background:#e4ff75; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#cc9900" style="background:#cc9900; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#99dcff" style="background:#99dcff; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#a6ff4d" style="background:#a6ff4d; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                            <li><button type="button" title="#ffffff" style="background:#ffffff; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
-                        </ul>
-                    </div>
-                    <!-- /배경색 + 팔레트 레이어 -->
-                </li>
-                <li class="sup xpress_xeditor_ui_superscript">
-                    <button type="button" title="{$lang->edit->help_sup}"><span>{$lang->edit->sup}</span></button>
-                </li>
-                <li class="sub xpress_xeditor_ui_subscript">
-                    <button type="button" title="{$lang->edit->help_sub}"><span>{$lang->edit->sub}</span></button>
-                </li>
-            </ul>
-            <ul class="paragraph">
-                <li class="left xpress_xeditor_ui_justifyleft">
-                    <button type="button" title="{$lang->edit->help_align_left}"><span>{$lang->edit->align_left}</span></button>
-                </li>
-                <li class="center xpress_xeditor_ui_justifycenter">
-                    <button type="button" title="{$lang->edit->help_align_center}"><span>{$lang->edit->align_center}</span></button>
-                </li>
-                <li class="right xpress_xeditor_ui_justifyright">
-                    <button type="button" title="{$lang->edit->help_align_right}"><span>{$lang->edit->align_right}</span></button>
-                </li>
-                <li class="justify xpress_xeditor_ui_justifyfull">
-                    <button type="button" title="{$lang->edit->help_align_justify}"><span>{$lang->edit->align_justify}</span></button>
-                </li>
-                <li class="ol xpress_xeditor_ui_orderedlist">
-                    <button type="button" title="{$lang->edit->help_list_number}"><span>{$lang->edit->list_number}</span></button>
-                </li>
-                <li class="ul xpress_xeditor_ui_unorderedlist">
-                    <button type="button" title="{$lang->edit->help_list_bullet}"><span>{$lang->edit->list_bullet}</span></button>
-                </li>
-                <li class="outdent xpress_xeditor_ui_outdent">
-                    <button type="button" title="Shift+Tab:{$lang->edit->help_remove_indent}"><span>{$lang->edit->help_remove_indent}</span></button>
-                </li>
-                <li class="indent xpress_xeditor_ui_indent">
-                    <button type="button" title="Tab:{$lang->edit->help_add_indent}"><span>{$lang->edit->add_indent}</span></button>
-                </li>
-            </ul>
-            <ul class="extra1">
-                <li class="blockquote xpress_xeditor_ui_quote">
-                    <button type="button" title="{$lang->edit->blockquote}"><span>{$lang->edit->blockquote}</span></button>
-                    <!-- 인용 레이어 -->
-                    <div class="layer xpress_xeditor_blockquote_layer" style="display:none">
-                        <ul>
-                            <li class="q1"><button type="button"><span>{$lang->edit->quotestyle1}</span></button></li>
-                            <li class="q2"><button type="button"><span>{$lang->edit->quotestyle2}</span></button></li>
-                            <li class="q3"><button type="button"><span>{$lang->edit->quotestyle3}</span></button></li>
-                            <li class="q4"><button type="button"><span>{$lang->edit->quotestyle4}</span></button></li>
-                            <li class="q5"><button type="button"><span>{$lang->edit->quotestyle5}</span></button></li>
-                            <li class="q6"><button type="button"><span>{$lang->edit->quotestyle6}</span></button></li>
-                            <li class="q7"><button type="button"><span>{$lang->edit->quotestyle7}</span></button></li>
-                            <li class="q8"><button type="button"><span>{$lang->edit->quotestyle8}</span></button></li>
-                        </ul>
-                    </div>
-                    <!-- /인용 레이어 -->
-                </li>
-                <li class="url xpress_xeditor_ui_hyperlink">
-                    <button type="button" title="{$lang->edit->url}"><span>{$lang->edit->url}</span></button>
-                    <!-- URL 레이어 -->
-                    <div class="layer xpress_xeditor_hyperlink_layer" style="display:none;">
-                        <fieldset>
-                            <h3>{$lang->edit->hyperlink}</h3>
-                            <input name="" class="link" type="text" value="http://" title="URL" />
-                            <p><input name="" id="target" type="checkbox" value="" /><label for="target">{$lang->edit->target_blank}</label></p>
-                        </fieldset>
-                        <div class="btn_area">
-                            <button type="button" class="confirm" title="{$lang->cmd_confirm}"><span>{$lang->cmd_confirm}</span></button>
-                            <button type="button" class="cancel" title="{$lang->cmd_cancel}"><span>{$lang->cmd_cancel}</span></button>
-
-                        </div>
-
-                    </div>
-                    <!-- /URL 레이어 -->
-                </li>
-                <li class="character xpress_xeditor_ui_sCharacter">
-                    <button type="button" title="{$lang->edit->special_character}"><span>{$lang->edit->special_character}</span></button>
-                    <!-- 특수문자 레이어 -->
-                    <div class="layer xpress_xeditor_sCharacter_layer" style="display:none">
-                        <h3>{$lang->edit->insert_special_character}</h3>
-                        <button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
-                        <ul class="nav">
-                            <li><a href="#character1" class="on">{$lang->edit->symbol}</a></li>
-                            <li><a href="#character2">{$lang->edit->number_unit}</a></li>
-                            <li><a href="#character3">{$lang->edit->circle_bracket}</a></li>
-                            <li><a href="#character4">{$lang->edit->korean}</a></li>
-                            <li><a href="#character5">{$lang->edit->greece},{$lang->edit->Latin}</a></li>
-                            <li><a href="#character6">{$lang->edit->japan}</a></li>
-                        </ul>
-                        <ul style="display: block;" id="character1" class="list"></ul>
-                        <ul style="display: none;" id="character2" class="list"></ul>
-                        <ul style="display: none;" id="character3" class="list"></ul>
-                        <ul style="display: none;" id="character4" class="list"></ul>
-                        <ul style="display: none;" id="character5" class="list"></ul>
-                        <ul style="display: none;" id="character6" class="list"></ul>
-                        <p>
-                            <label for="preview">{$lang->edit->selected_symbol}</label>
-                            <input id="preview" name="" type="text" />
-                            <button type="button" title="{$lang->confirm}"><span>{$lang->confirm}</span></button>
-                        </p>
-                        <button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
-                    </div>
-                    <!-- /특수문자 레이어 -->
-                </li>
-            </ul>
-
-            <ul class="table">
-                <li class="table xpress_xeditor_ui_table">
-                    <button type="button" title="{$lang->edit->table}"><span>{$lang->edit->table}</span></button>
-                    <!-- 표 레이어 -->
-                    <div class="layer xpress_xeditor_table_layer" style="display:none;">
-                        <fieldset class="num">
-                            <h3>{$lang->edit->set_sel}</h3>
-                            <dl>
-                                <dt>
-                                    <label for="row">{$lang->edit->row}</label>
-                                </dt>
-                                <dd>
-                                    <input id="row" name="" type="text" maxlength="2" value="4" />
-                                    <button type="button" class="add"><span>{$lang->edit->add_one_row}</span></button>
-                                    <button type="button" class="del"><span>{$lang->edit->del_one_row}</span></button>
-                                </dd>
-                                <dt>
-                                    <label for="col">{$lang->edit->col}</label>
-                                </dt>
-                                <dd>
-                                    <input id="col" name="" type="text" maxlength="2" value="4" />
-                                    <button type="button" class="add"><span>{$lang->edit->add_one_col}</span></button>
-                                    <button type="button" class="del"><span>{$lang->edit->del_one_col}</span></button>
-                                </dd>
-                            </dl>
-                            <table border="1">
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                </tr>
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                </tr>
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                </tr>
-                                <tr>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                    <td>&nbsp;</td>
-                                </tr>
-                            </table>
-                        </fieldset>
-                        <fieldset class="color">
-                            <h3>{$lang->edit->table_config}</h3>
-                            <dl>
-                                <dt>
-                                    <label for="table_border_width">{$lang->edit->border_width}</label>
-                                </dt>
-                                <dd>
-                                    <input id="table_border_width" name="" type="text" maxlength="2" value="1" />
-                                    <button type="button" class="add"><span>1px {$lang->edit->add}</span></button>
-                                    <button type="button" class="del"><span>1px {$lang->edit->del}</span></button>
-                                </dd>
-                                <dt>
-                                    <label for="table_border_color">{$lang->edit->border_color}</label>
-                                </dt>
-                                <dd>
-                                    <span class="preview_palette"><button type="button" style="background:#cccccc;">{$lang->edit->search_color}</button></span>
-                                    <input id="table_border_color" name="" type="text" maxlength="7" value="#CCCCCC" />
-                                    <button type="button" class="find_palette"><span>{$lang->edit->search_color}</span></button>
-                                </dd>
-                                <dt>
-                                    <label for="table_bg_color">{$lang->edit->table_backgroundcolor}</label>
-                                </dt>
-                                <dd>
-                                    <span class="preview_palette"><button type="button" style="background:#000000;">{$lang->edit->search_color}</button></span>
-                                    <input id="table_bg_color" name="" type="text" maxlength="7" value="#000000" />
-                                    <button type="button" class="find_palette"><span>{$lang->edit->search_color}</span></button>
-                                </dd>
-                            </dl>
-                        </fieldset>
-                        <div class="btn_area">
-                            <button type="button" class="confirm" title="{$lang->confirm}"><span>{$lang->confirm}</span></button>
-                            <button type="button" class="cancel" title="{$lang->cancel}"><span>{$lang->cancel}</span></button>
-                        </div>
-                    </div>
-                    <!-- /표 레이어 -->
-                </li>
-                <li class="merge xpress_xeditor_ui_merge_cells"><button type="button" title="{$lang->edit->merge_cells}"><span>{$lang->edit->merge_cells}</span></button></li>
-                <li class="splitCol xpress_xeditor_ui_split_col"><button type="button" title="{$lang->edit->split_col}"><span>{$lang->edit->split_col}</span></button></li>
-                <li class="splitRow xpress_xeditor_ui_split_row"><button type="button" title="{$lang->edit->split_row}"><span>{$lang->edit->split_row}</span></button></li>
-            </ul>
-            <!--@end-->
-
-            <!--@if($enable_component)-->
-            <ul class="extra2">
-                <!-- 확장 컴포넌트 출력 -->
-                <li class="extensions xpress_xeditor_ui_extension">
-                    <span class="exButton"><button type="button" title="{$lang->edit->extension}">{$lang->edit->extension}</button></span>
-                    <div class="layer extension2 xpress_xeditor_extension_layer" id="editorExtension_{$editor_sequence}">
-                        <ul id="editor_component_{$editor_sequence}" class="editorComponent">
-                            <!--@foreach($component_list as $component_name => $component)-->
-                                <li><!--@if($component->component_icon)--><img src="../../components/{$component_name}/component_icon.gif" alt="" width="13" height="12"/> <!--@end--><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}">{$component->title}</a></li>
-                            <!--@end-->
-                        </ul>
-                    </div>
-                </li>
-            </ul>
-            <!--@end-->
-
-            <ul class="extra3"<!--@if(!$html_mode)--> style="display:none"<!--@end-->>
-                <!--// HTML 모드 사용 -->
-                <li class="html"><span><button class="xpress_xeditor_mode_toggle_button" type="button" title="{$lang->edit->html_editor}">{$lang->edit->html_editor}</button></span></li>
-                <!--// li class="preview"><span><button type="button" class="xpress_xeditor_preview_button" title="{$lang->cmd_preview}">{$lang->cmd_preview}</button></span></li-->
-            </ul>
-            
-
-        </div>
-        <!--@else-->
-            <div class="tool off disable"></div>
-        <!--@end-->
-
-        <!-- 에디터 출력 -->
-        <div id="xe-editor-container-{$editor_sequence}" class="input_area xpress_xeditor_editing_area_container">
-            <textarea id="xpress-editor-{$editor_sequence}" cols="10" rows="10"></textarea>
-        </div>
-
-        <!--@if($enable_autosave)-->
-        <p class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
-        <!--@end-->
-
-        <!-- /입력 -->
-        <button type="button" class="input_control xpress_xeditor_editingArea_verticalResizer" title="{$lang->edit->edit_height_control}"><span>{$lang->edit->edit_height_control}</span></button>
-
-        </div>
-
-        <!--@if($allow_fileupload)-->
-            <!--%import("../../tpl/js/uploader.js")-->
-            <!--%import("../../tpl/js/swfupload.js")-->
-            <script type="text/javascript">//<![CDATA[
-            editorUploadInit(
-                {
-                    "editorSequence" : {$editor_sequence},
-                    "sessionName" : "{session_name()}",
-                    "allowedFileSize" : "{$file_config->allowed_filesize}",
-                    "allowedFileTypes" : "{$file_config->allowed_filetypes}",
-                    "allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
-                    "insertedFiles" : {(int)$files_count},
-                    "replaceButtonID" : "swfUploadButton{$editor_sequence}",
-                    "fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
-                    "previewAreaID" : "preview_uploaded_{$editor_sequence}",
-                    "uploaderStatusID" : "uploader_status_{$editor_sequence}"
-                }
-            );
-        //]]></script>
-        <!-- 파일 업로드 영역 -->
-        <div id="fileUploader_{$editor_sequence}" class="fileUploader">
-            <div class="preview {$btn_class}" id="preview_uploaded_{$editor_sequence}"></div>
-            <div class="fileListArea {$btn_class}">
-                <select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="fileList" title="Attached File List"><option></option></select>
-            </div>
-            <div class="fileUploadControl">
-                <span class="button {$btn_class}" id="swfUploadButton{$editor_sequence}"><button type="button">{$lang->edit->upload_file}</button></span>
-                <span class="button {$btn_class}"><button type="button" onclick="removeUploadedFile('{$editor_sequence}');return false;">{$lang->edit->delete_selected}</button></span>
-                <span class="button {$btn_class}"><button type="button" onclick="insertUploadedFile('{$editor_sequence}');return false;">{$lang->edit->link_file}</button></span>
-            </div>
-            <div class="file_attach_info" id="uploader_status_{$editor_sequence}">{$upload_status}</div>
-        </div>
-        <!--@end-->
-    </div>
-    <!-- 에디터 활성화 -->
-    <script type="text/javascript">//<![CDATA[
-        var editor_path = "{$editor_path}";
-        var auto_saved_msg = "{$lang->msg_auto_saved}";
-        var oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}", "{$colorset}", "{$content_style}",'{$content_font}','{$content_font_size}');
-    //]]></script>
-
-<!--@end-->
+<!--// 스킨 css 로드 -->
+<load target="css/default.css" />
+
+<!--// 기본 JS 로드 -->
+<load target="../../tpl/js/editor_common.js" cond="__DEBUG__" />
+<load target="../../tpl/js/editor_common.min.js" cond="!__DEBUG__" />
+
+<!--@if($colorset == "black" || $colorset == "black_texteditor" || $colorset == "black_text_nohtml" || $colorset == "black_text_usehtml")-->
+    <!--%import("css/black.css")-->
+    {@ $editor_class = "black" }
+<!--@end-->
+
+<!--@if($colorset == "white_texteditor" || $colorset == "black_texteditor" || $colorset == "white_text_nohtml" || $colorset == "black_text_nohtml" || $colorset == "white_text_usehtml" || $colorset == "black_text_usehtml")-->
+	<load target="js/xe_textarea.js" cond="__DEBUG__" />
+	<load target="js/xe_textarea.min.js" cond="!__DEBUG__" />
+
+    <div class="xeTextEditor {$editor_class}">
+        <input type="hidden" id="htm_{$editor_sequence}" value="<!--@if($colorset == "white_text_nohtml" || $colorset == "black_text_nohtml")-->n<!--@end--><!--@if($colorset == "white_texteditor" || $colorset == "white_texteditor")-->br<!--@end-->" />
+        <textarea id="editor_{$editor_sequence}" style="height:{$editor_height}px;" cols="50" rows="5" class="inputTextarea"></textarea>
+    </div>
+    <script type="text/javascript">//<![CDATA[
+        editorStartTextarea({$editor_sequence}, "{$editor_content_key_name}", "{$editor_primary_key_name}");
+    //]]></script>
+
+<!--@else-->
+
+    <!--// 기본 js/언어파일 로드 -->
+	<load target="js/Xpress_Editor.js" cond="__DEBUG__" />
+	<load target="js/xe_interface.js" cond="__DEBUG__" />
+	<load target="js/xpresseditor.min.js" cond="!__DEBUG__" />
+
+    <!-- 자동저장용 폼 -->
+
+    <!--@if($enable_autosave)-->
+    <input type="hidden" name="_saved_doc_title" value="{htmlspecialchars($saved_doc->title)}" />
+    <input type="hidden" name="_saved_doc_content" value="{htmlspecialchars($saved_doc->content)}" />
+    <input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
+    <!--@end-->
+    <!-- 에디터 -->
+    <div class="xpress-editor {$editor_class}">
+        <div id="smart_content"> <a href="#xe-editor-container-{$editor_sequence}" class="skip">&raquo; {$lang->edit->jumptoedit}</a>
+
+        <!--@if($enable_default_component||$enable_component||$html_mode)-->
+        <!-- 편집 컴포넌트 -->
+        <div class="tool off">
+            <!--@if($enable_default_component)-->
+            <!-- 기본 컴포넌트 출력 -->
+            <ul class="do item">
+                <li class="xpress_xeditor_ui_undo undo"><button type="button" title="Ctrl+Z:{$lang->edit->undo}"><span>{$lang->edit->undo}</span></button></li>
+                <li class="xpress_xeditor_ui_redo redo"><button type="button" title="Ctrl+Y:{$lang->edit->redo}"><span>{$lang->edit->redo}</span></button></li>
+            </ul>
+            <ul class="type">
+                <li class="xpress_xeditor_ui_format">
+                    <select class="xpress_xeditor_ui_format_select" disabled="disabled">
+                        <option value="">{$lang->edit->header}</option>
+                        <!--@foreach($lang->edit->header_list as $key=>$obj)-->
+                        <option value="{$key}">{$obj}</option>
+                        <!--@end-->
+                    </select>
+                </li>
+                <li class="xpress_xeditor_ui_fontName">
+                    <select class="xpress_xeditor_ui_fontName_select" disabled="disabled">
+                        <option value="">{$lang->edit->fontname}</option>
+                        <!--@foreach($lang->edit->fontlist as $key=>$obj)-->
+                        <option value="{$key}" style="font-family:{$obj}">{$obj}</option>
+                        <!--@end-->
+                    </select>
+                </li>
+                <li class="xpress_xeditor_ui_fontSize">
+                    <select class="xpress_xeditor_ui_fontSize_select" disabled="disabled">
+                        <option value="">{$lang->edit->fontsize}</option>
+                        <option value="9px" style="font-size:9px">9px</option>
+                        <option value="10px" style="font-size:10px">10px</option>
+                        <option value="11px" style="font-size:11px">11px</option>
+                        <option value="12px" style="font-size:12px">12px</option>
+                        <option value="13px" style="font-size:13px">13px</option>
+                        <option value="14px" style="font-size:14px">14px</option>
+                        <option value="16px" style="font-size:16px">16px</option>
+                        <option value="18px" style="font-size:18px">18px</option>
+                        <option value="24px" style="font-size:24px">24px</option>
+                        <option value="32px" style="font-size:32px">32px</option>
+                    </select>
+                </li>
+                <li class="xpress_xeditor_ui_lineHeight">
+                    <select class="xpress_xeditor_ui_lineHeight_select" disabled="disabled">
+                        <option value="">{$lang->edit->lineheight}</option>
+                        <option value="1">100%</option>
+                        <option value="1.2">120%</option>
+                        <option value="1.4">140%</option>
+                        <option value="1.6">160%</option>
+                        <option value="1.8">180%</option>
+                        <option value="2">200%</option>
+                    </select>
+                </li>
+            </ul>
+            <ul class="style">
+                <li class="bold xpress_xeditor_ui_bold">
+                    <button type="button" title="Ctrl+B:{$lang->edit->help_bold}"><span>{$lang->edit->bold}</span></button>
+                </li>
+                <li class="underline xpress_xeditor_ui_underline">
+                    <button type="button" title="Ctrl+U:{$lang->edit->help_underline}"><span>{$lang->edit->underline}</span></button>
+                </li>
+                <li class="italic xpress_xeditor_ui_italic">
+                    <button type="button" title="Ctrl+I:{$lang->edit->help_italic}"><span>{$lang->edit->italic}</span></button>
+                </li>
+                <li class="del xpress_xeditor_ui_lineThrough">
+                    <button type="button" title="Ctrl+D:{$lang->edit->help_strike}"><span>{$lang->edit->strike}</span></button>
+                </li>
+                <li class="fcolor xpress_xeditor_ui_fontColor">
+                    <button type="button" title="{$lang->edit->help_fontcolor}"><span>{$lang->edit->fontcolor}</span></button>
+                    <!-- 팔레트 레이어 -->
+                    <div class="layer xpress_xeditor_fontcolor_layer" style="display:none;">
+                        <ul class="palette xpress_xeditor_color_palette">
+                            <li><button type="button" title="#ff0000" style="background:#ff0000"><span>#ff0000</span></button></li>
+                            <li><button type="button" title="#ff6c00" style="background:#ff6c00"><span>#ff6c00</span></button></li>
+                            <li><button type="button" title="#ffaa00" style="background:#ffaa00"><span>#ffaa00</span></button></li>
+                            <li><button type="button" title="#ffef00" style="background:#ffef00"><span>#ffef00</span></button></li>
+                            <li><button type="button" title="#a6cf00" style="background:#a6cf00"><span>#a6cf00</span></button></li>
+                            <li><button type="button" title="#009e25" style="background:#009e25"><span>#009e25</span></button></li>
+                            <li><button type="button" title="#00b0a2" style="background:#00b0a2"><span>#00b0a2</span></button></li>
+                            <li><button type="button" title="#0075c8" style="background:#0075c8"><span>#0075c8</span></button></li>
+                            <li><button type="button" title="#3a32c3" style="background:#3a32c3"><span>#3a32c3</span></button></li>
+                            <li><button type="button" title="#7820b9" style="background:#7820b9"><span>#7820b9</span></button></li>
+                            <li><button type="button" title="#ef007c" style="background:#ef007c"><span>#ef007c</span></button></li>
+                            <li><button type="button" title="#000000" style="background:#000000"><span>#000000</span></button></li>
+                            <li><button type="button" title="#252525" style="background:#252525"><span>#252525</span></button></li>
+                            <li><button type="button" title="#464646" style="background:#464646"><span>#464646</span></button></li>
+                            <li><button type="button" title="#636363" style="background:#636363"><span>#636363</span></button></li>
+                            <li><button type="button" title="#7d7d7d" style="background:#7d7d7d"><span>#7d7d7d</span></button></li>
+                            <li><button type="button" title="#9a9a9a" style="background:#9a9a9a"><span>#9a9a9a</span></button></li>
+                            <li><button type="button" title="#ffe8e8" style="background:#ffe8e8"><span>#ffe8e8</span></button></li>
+                            <li><button type="button" title="#f7e2d2" style="background:#f7e2d2"><span>#f7e2d2</span></button></li>
+                            <li><button type="button" title="#f5eddc" style="background:#f5eddc"><span>#f5eddc</span></button></li>
+                            <li><button type="button" title="#f5f4e0" style="background:#f5f4e0"><span>#f5f4e0</span></button></li>
+                            <li><button type="button" title="#edf2c2" style="background:#edf2c2"><span>#edf2c2</span></button></li>
+                            <li><button type="button" title="#def7e5" style="background:#def7e5"><span>#def7e5</span></button></li>
+                            <li><button type="button" title="#d9eeec" style="background:#d9eeec"><span>#d9eeec</span></button></li>
+                            <li><button type="button" title="#c9e0f0" style="background:#c9e0f0"><span>#c9e0f0</span></button></li>
+                            <li><button type="button" title="#d6d4eb" style="background:#d6d4eb"><span>#d6d4eb</span></button></li>
+                            <li><button type="button" title="#e7dbed" style="background:#e7dbed"><span>#e7dbed</span></button></li>
+                            <li><button type="button" title="#f1e2ea" style="background:#f1e2ea"><span>#f1e2ea</span></button></li>
+                            <li><button type="button" title="#acacac" style="background:#acacac"><span>#acacac</span></button></li>
+                            <li><button type="button" title="#c2c2c2" style="background:#c2c2c2"><span>#c2c2c2</span></button></li>
+                            <li><button type="button" title="#cccccc" style="background:#cccccc"><span>#cccccc</span></button></li>
+                            <li><button type="button" title="#e1e1e1" style="background:#e1e1e1"><span>#e1e1e1</span></button></li>
+                            <li><button type="button" title="#ebebeb" style="background:#ebebeb"><span>#ebebeb</span></button></li>
+                            <li><button type="button" title="#ffffff" style="background:#ffffff"><span>#ffffff</span></button></li>
+                            <li><button type="button" title="#e97d81" style="background:#e97d81"><span>#e97d81</span></button></li>
+                            <li><button type="button" title="#e19b73" style="background:#e19b73"><span>#e19b73</span></button></li>
+                            <li><button type="button" title="#d1b274" style="background:#d1b274"><span>#d1b274</span></button></li>
+                            <li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
+                            <li><button type="button" title="#cfcca2" style="background:#cfcca2"><span>#cfcca2</span></button></li>
+                            <li><button type="button" title="#61b977" style="background:#61b977"><span>#61b977</span></button></li>
+                            <li><button type="button" title="#53aea8" style="background:#53aea8"><span>#53aea8</span></button></li>
+                            <li><button type="button" title="#518fbb" style="background:#518fbb"><span>#518fbb</span></button></li>
+                            <li><button type="button" title="#6a65bb" style="background:#6a65bb"><span>#6a65bb</span></button></li>
+                            <li><button type="button" title="#9a54ce" style="background:#9a54ce"><span>#9a54ce</span></button></li>
+                            <li><button type="button" title="#e573ae" style="background:#e573ae"><span>#e573ae</span></button></li>
+                            <li><button type="button" title="#5a504b" style="background:#5a504b"><span>#5a504b</span></button></li>
+                            <li><button type="button" title="#767b86" style="background:#767b86"><span>#767b86</span></button></li>
+                            <li><button type="button" title="#00ffff" style="background:#00ffff"><span>#00ffff</span></button></li>
+                            <li><button type="button" title="#00ff00" style="background:#00ff00"><span>#00ff00</span></button></li>
+                            <li><button type="button" title="#a0f000" style="background:#a0f000"><span>#a0f000</span></button></li>
+                            <li><button type="button" title="#ffff00" style="background:#ffff00"><span>#ffff00</span></button></li>
+                            <li><button type="button" title="#951015" style="background:#951015"><span>#951015</span></button></li>
+                            <li><button type="button" title="#6e391a" style="background:#6e391a"><span>#6e391a</span></button></li>
+                            <li><button type="button" title="#785c25" style="background:#785c25"><span>#785c25</span></button></li>
+                            <li><button type="button" title="#5f5b25" style="background:#5f5b25"><span>#5f5b25</span></button></li>
+                            <li><button type="button" title="#4c511f" style="background:#4c511f"><span>#4c511f</span></button></li>
+                            <li><button type="button" title="#1c4827" style="background:#1c4827"><span>#1c4827</span></button></li>
+                            <li><button type="button" title="#0d514c" style="background:#0d514c"><span>#0d514c</span></button></li>
+                            <li><button type="button" title="#1b496a" style="background:#1b496a"><span>#1b496a</span></button></li>
+                            <li><button type="button" title="#2b285f" style="background:#2b285f"><span>#2b285f</span></button></li>
+                            <li><button type="button" title="#45245b" style="background:#45245b"><span>#45245b</span></button></li>
+                            <li><button type="button" title="#721947" style="background:#721947"><span>#721947</span></button></li>
+                            <li><button type="button" title="#352e2c" style="background:#352e2c"><span>#352e2c</span></button></li>
+                            <li><button type="button" title="#3c3f45" style="background:#3c3f45"><span>#3c3f45</span></button></li>
+                            <li><button type="button" title="#00aaff" style="background:#00aaff"><span>#00aaff</span></button></li>
+                            <li><button type="button" title="#0000ff" style="background:#0000ff"><span>#0000ff</span></button></li>
+                            <li><button type="button" title="#a800ff" style="background:#a800ff"><span>#a800ff</span></button></li>
+                            <li><button type="button" title="#ff00ff" style="background:#ff00ff"><span>#ff00ff</span></button></li>
+                        </ul>
+                    </div>
+                    <!-- /팔레트 레이어 -->
+                </li>
+                <li class="bcolor xpress_xeditor_ui_bgColor">
+                    <button type="button" title="{$lang->edit->help_fontbgcolor}"><span>{$lang->edit->fontbgcolor}</span></button>
+                    <!-- 배경색 + 팔레트 레이어 -->
+                    <div class="layer xpress_xeditor_bgcolor_layer" style="display:none;">
+                        <ul class="background">
+                            <li><button type="button" title="#000000" style="background:#000000; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#9334d8" style="background:#9334d8; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#ff0000" style="background:#ff0000; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#333333" style="background:#333333; color:#ffff00"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#0000ff" style="background:#0000ff; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#ff6600" style="background:#ff6600; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#8e8e8e" style="background:#8e8e8e; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#009999" style="background:#009999; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#ffa700" style="background:#ffa700; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#ffdaed" style="background:#ffdaed; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#e4ff75" style="background:#e4ff75; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#cc9900" style="background:#cc9900; color:#ffffff"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#99dcff" style="background:#99dcff; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#a6ff4d" style="background:#a6ff4d; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                            <li><button type="button" title="#ffffff" style="background:#ffffff; color:#000000"><span>{$lang->edit->fontbgsampletext}</span></button></li>
+                        </ul>
+                    </div>
+                    <!-- /배경색 + 팔레트 레이어 -->
+                </li>
+                <li class="sup xpress_xeditor_ui_superscript">
+                    <button type="button" title="{$lang->edit->help_sup}"><span>{$lang->edit->sup}</span></button>
+                </li>
+                <li class="sub xpress_xeditor_ui_subscript">
+                    <button type="button" title="{$lang->edit->help_sub}"><span>{$lang->edit->sub}</span></button>
+                </li>
+            </ul>
+            <ul class="paragraph">
+                <li class="left xpress_xeditor_ui_justifyleft">
+                    <button type="button" title="{$lang->edit->help_align_left}"><span>{$lang->edit->align_left}</span></button>
+                </li>
+                <li class="center xpress_xeditor_ui_justifycenter">
+                    <button type="button" title="{$lang->edit->help_align_center}"><span>{$lang->edit->align_center}</span></button>
+                </li>
+                <li class="right xpress_xeditor_ui_justifyright">
+                    <button type="button" title="{$lang->edit->help_align_right}"><span>{$lang->edit->align_right}</span></button>
+                </li>
+                <li class="justify xpress_xeditor_ui_justifyfull">
+                    <button type="button" title="{$lang->edit->help_align_justify}"><span>{$lang->edit->align_justify}</span></button>
+                </li>
+                <li class="ol xpress_xeditor_ui_orderedlist">
+                    <button type="button" title="{$lang->edit->help_list_number}"><span>{$lang->edit->list_number}</span></button>
+                </li>
+                <li class="ul xpress_xeditor_ui_unorderedlist">
+                    <button type="button" title="{$lang->edit->help_list_bullet}"><span>{$lang->edit->list_bullet}</span></button>
+                </li>
+                <li class="outdent xpress_xeditor_ui_outdent">
+                    <button type="button" title="Shift+Tab:{$lang->edit->help_remove_indent}"><span>{$lang->edit->help_remove_indent}</span></button>
+                </li>
+                <li class="indent xpress_xeditor_ui_indent">
+                    <button type="button" title="Tab:{$lang->edit->help_add_indent}"><span>{$lang->edit->add_indent}</span></button>
+                </li>
+            </ul>
+            <ul class="extra1">
+                <li class="blockquote xpress_xeditor_ui_quote">
+                    <button type="button" title="{$lang->edit->blockquote}"><span>{$lang->edit->blockquote}</span></button>
+                    <!-- 인용 레이어 -->
+                    <div class="layer xpress_xeditor_blockquote_layer" style="display:none">
+                        <ul>
+                            <li class="q1"><button type="button"><span>{$lang->edit->quotestyle1}</span></button></li>
+                            <li class="q2"><button type="button"><span>{$lang->edit->quotestyle2}</span></button></li>
+                            <li class="q3"><button type="button"><span>{$lang->edit->quotestyle3}</span></button></li>
+                            <li class="q4"><button type="button"><span>{$lang->edit->quotestyle4}</span></button></li>
+                            <li class="q5"><button type="button"><span>{$lang->edit->quotestyle5}</span></button></li>
+                            <li class="q6"><button type="button"><span>{$lang->edit->quotestyle6}</span></button></li>
+                            <li class="q7"><button type="button"><span>{$lang->edit->quotestyle7}</span></button></li>
+                            <li class="q8"><button type="button"><span>{$lang->edit->quotestyle8}</span></button></li>
+                        </ul>
+                    </div>
+                    <!-- /인용 레이어 -->
+                </li>
+                <li class="url xpress_xeditor_ui_hyperlink">
+                    <button type="button" title="{$lang->edit->url}"><span>{$lang->edit->url}</span></button>
+                    <!-- URL 레이어 -->
+                    <div class="layer xpress_xeditor_hyperlink_layer" style="display:none;">
+                        <fieldset>
+                            <h3>{$lang->edit->hyperlink}</h3>
+                            <input name="" class="link" type="text" value="http://" title="URL" />
+                            <p><input name="" id="target" type="checkbox" value="" /><label for="target">{$lang->edit->target_blank}</label></p>
+                        </fieldset>
+                        <div class="btn_area">
+                            <button type="button" class="confirm" title="{$lang->cmd_confirm}"><span>{$lang->cmd_confirm}</span></button>
+                            <button type="button" class="cancel" title="{$lang->cmd_cancel}"><span>{$lang->cmd_cancel}</span></button>
+
+                        </div>
+
+                    </div>
+                    <!-- /URL 레이어 -->
+                </li>
+                <li class="character xpress_xeditor_ui_sCharacter">
+                    <button type="button" title="{$lang->edit->special_character}"><span>{$lang->edit->special_character}</span></button>
+                    <!-- 특수문자 레이어 -->
+                    <div class="layer xpress_xeditor_sCharacter_layer" style="display:none">
+                        <h3>{$lang->edit->insert_special_character}</h3>
+                        <button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
+                        <ul class="nav">
+                            <li><a href="#character1" class="on">{$lang->edit->symbol}</a></li>
+                            <li><a href="#character2">{$lang->edit->number_unit}</a></li>
+                            <li><a href="#character3">{$lang->edit->circle_bracket}</a></li>
+                            <li><a href="#character4">{$lang->edit->korean}</a></li>
+                            <li><a href="#character5">{$lang->edit->greece},{$lang->edit->Latin}</a></li>
+                            <li><a href="#character6">{$lang->edit->japan}</a></li>
+                        </ul>
+                        <ul style="display: block;" id="character1" class="list"></ul>
+                        <ul style="display: none;" id="character2" class="list"></ul>
+                        <ul style="display: none;" id="character3" class="list"></ul>
+                        <ul style="display: none;" id="character4" class="list"></ul>
+                        <ul style="display: none;" id="character5" class="list"></ul>
+                        <ul style="display: none;" id="character6" class="list"></ul>
+                        <p>
+                            <label for="preview">{$lang->edit->selected_symbol}</label>
+                            <input id="preview" name="" type="text" />
+                            <button type="button" title="{$lang->confirm}"><span>{$lang->confirm}</span></button>
+                        </p>
+                        <button type="button" class="close" title="{$lang->edit->close_special_character}"><span>{$lang->edit->close_special_character}</span></button>
+                    </div>
+                    <!-- /특수문자 레이어 -->
+                </li>
+            </ul>
+
+            <ul class="table">
+                <li class="table xpress_xeditor_ui_table">
+                    <button type="button" title="{$lang->edit->table}"><span>{$lang->edit->table}</span></button>
+                    <!-- 표 레이어 -->
+                    <div class="layer xpress_xeditor_table_layer" style="display:none;">
+                        <fieldset class="num">
+                            <h3>{$lang->edit->set_sel}</h3>
+                            <dl>
+                                <dt>
+                                    <label for="row">{$lang->edit->row}</label>
+                                </dt>
+                                <dd>
+                                    <input id="row" name="" type="text" maxlength="2" value="4" />
+                                    <button type="button" class="add"><span>{$lang->edit->add_one_row}</span></button>
+                                    <button type="button" class="del"><span>{$lang->edit->del_one_row}</span></button>
+                                </dd>
+                                <dt>
+                                    <label for="col">{$lang->edit->col}</label>
+                                </dt>
+                                <dd>
+                                    <input id="col" name="" type="text" maxlength="2" value="4" />
+                                    <button type="button" class="add"><span>{$lang->edit->add_one_col}</span></button>
+                                    <button type="button" class="del"><span>{$lang->edit->del_one_col}</span></button>
+                                </dd>
+                            </dl>
+                            <table border="1">
+                                <tr>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                                <tr>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                    <td>&nbsp;</td>
+                                </tr>
+                            </table>
+                        </fieldset>
+                        <fieldset class="color">
+                            <h3>{$lang->edit->table_config}</h3>
+                            <dl>
+                                <dt>
+                                    <label for="table_border_width">{$lang->edit->border_width}</label>
+                                </dt>
+                                <dd>
+                                    <input id="table_border_width" name="" type="text" maxlength="2" value="1" />
+                                    <button type="button" class="add"><span>1px {$lang->edit->add}</span></button>
+                                    <button type="button" class="del"><span>1px {$lang->edit->del}</span></button>
+                                </dd>
+                                <dt>
+                                    <label for="table_border_color">{$lang->edit->border_color}</label>
+                                </dt>
+                                <dd>
+                                    <span class="preview_palette"><button type="button" style="background:#cccccc;">{$lang->edit->search_color}</button></span>
+                                    <input id="table_border_color" name="" type="text" maxlength="7" value="#CCCCCC" />
+                                    <button type="button" class="find_palette"><span>{$lang->edit->search_color}</span></button>
+                                </dd>
+                                <dt>
+                                    <label for="table_bg_color">{$lang->edit->table_backgroundcolor}</label>
+                                </dt>
+                                <dd>
+                                    <span class="preview_palette"><button type="button" style="background:#000000;">{$lang->edit->search_color}</button></span>
+                                    <input id="table_bg_color" name="" type="text" maxlength="7" value="#000000" />
+                                    <button type="button" class="find_palette"><span>{$lang->edit->search_color}</span></button>
+                                </dd>
+                            </dl>
+                        </fieldset>
+                        <div class="btn_area">
+                            <button type="button" class="confirm" title="{$lang->confirm}"><span>{$lang->confirm}</span></button>
+                            <button type="button" class="cancel" title="{$lang->cancel}"><span>{$lang->cancel}</span></button>
+                        </div>
+                    </div>
+                    <!-- /표 레이어 -->
+                </li>
+                <li class="merge xpress_xeditor_ui_merge_cells"><button type="button" title="{$lang->edit->merge_cells}"><span>{$lang->edit->merge_cells}</span></button></li>
+                <li class="splitCol xpress_xeditor_ui_split_col"><button type="button" title="{$lang->edit->split_col}"><span>{$lang->edit->split_col}</span></button></li>
+                <li class="splitRow xpress_xeditor_ui_split_row"><button type="button" title="{$lang->edit->split_row}"><span>{$lang->edit->split_row}</span></button></li>
+            </ul>
+            <!--@end-->
+
+            <!--@if($enable_component)-->
+            <ul class="extra2">
+                <!-- 확장 컴포넌트 출력 -->
+                <li class="extensions xpress_xeditor_ui_extension">
+                    <span class="exButton"><button type="button" title="{$lang->edit->extension}">{$lang->edit->extension}</button></span>
+                    <div class="layer extension2 xpress_xeditor_extension_layer" id="editorExtension_{$editor_sequence}">
+                        <ul id="editor_component_{$editor_sequence}" class="editorComponent">
+                            <!--@foreach($component_list as $component_name => $component)-->
+                                <li><a href="#" onclick="return false;" id="component_{$editor_sequence}_{$component_name}">{$component->title}</a></li>
+                            <!--@end-->
+                        </ul>
+                    </div>
+                </li>
+            </ul>
+            <!--@end-->
+
+            <ul class="extra3"<!--@if(!$html_mode)--> style="display:none"<!--@end-->>
+                <!--// HTML 모드 사용 -->
+                <li class="html"><span><button class="xpress_xeditor_mode_toggle_button" type="button" title="{$lang->edit->html_editor}">{$lang->edit->html_editor}</button></span></li>
+                <!--// li class="preview"><span><button type="button" class="xpress_xeditor_preview_button" title="{$lang->cmd_preview}">{$lang->cmd_preview}</button></span></li-->
+            </ul>
+            
+
+        </div>
+        <!--@else-->
+            <div class="tool off disable"></div>
+        <!--@end-->
+
+        <!-- 에디터 출력 -->
+        <div id="xe-editor-container-{$editor_sequence}" class="input_area xpress_xeditor_editing_area_container">
+            <textarea id="xpress-editor-{$editor_sequence}" cols="10" rows="10"></textarea>
+        </div>
+
+        <!--@if($enable_autosave)-->
+        <p class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
+        <!--@end-->
+
+        <!-- /입력 -->
+        <button type="button" class="input_control xpress_xeditor_editingArea_verticalResizer" title="{$lang->edit->edit_height_control}"><span>{$lang->edit->edit_height_control}</span></button>
+
+        </div>
+
+        <!--@if($allow_fileupload)-->
+            <!--%import("../../tpl/js/uploader.js")-->
+            <!--%import("../../tpl/js/swfupload.js")-->
+            <script type="text/javascript">//<![CDATA[
+            editorUploadInit(
+                {
+                    "editorSequence" : {$editor_sequence},
+                    "sessionName" : "{session_name()}",
+                    "allowedFileSize" : "{$file_config->allowed_filesize}",
+                    "allowedFileTypes" : "{$file_config->allowed_filetypes}",
+                    "allowedFileTypesDescription" : "{$file_config->allowed_filetypes}",
+                    "insertedFiles" : {(int)$files_count},
+                    "replaceButtonID" : "swfUploadButton{$editor_sequence}",
+                    "fileListAreaID" : "uploaded_file_list_{$editor_sequence}",
+                    "previewAreaID" : "preview_uploaded_{$editor_sequence}",
+                    "uploaderStatusID" : "uploader_status_{$editor_sequence}"
+                }
+            );
+        //]]></script>
+        <!-- 파일 업로드 영역 -->
+        <div id="fileUploader_{$editor_sequence}" class="fileUploader">
+            <div class="preview {$btn_class}" id="preview_uploaded_{$editor_sequence}"></div>
+            <div class="fileListArea {$btn_class}">
+                <select id="uploaded_file_list_{$editor_sequence}" multiple="multiple" class="fileList" title="Attached File List"><option></option></select>
+            </div>
+            <div class="fileUploadControl">
+				<button type="button" id="swfUploadButton{$editor_sequence}" class="text">{$lang->edit->upload_file}</button>
+				<button type="button" onclick="removeUploadedFile('{$editor_sequence}');" class="text">{$lang->edit->delete_selected}</button>
+				<button type="button" onclick="insertUploadedFile('{$editor_sequence}');" class="text">{$lang->edit->link_file}</button>
+            </div>
+            <div class="file_attach_info" id="uploader_status_{$editor_sequence}">{$upload_status}</div>
+        </div>
+        <!--@end-->
+    </div>
+    <!-- 에디터 활성화 -->
+    <script type="text/javascript">//<![CDATA[
+        var editor_path = "{$editor_path}";
+        var auto_saved_msg = "{$lang->msg_auto_saved}";
+        var oEditor = editorStart_xe("{$editor_sequence}", "{$editor_primary_key_name}", "{$editor_content_key_name}", "{$editor_height}", "{$colorset}", "{$content_style}",'{$content_font}','{$content_font_size}');
+    //]]></script>
+
+<!--@end-->
diff --git a/modules/editor/skins/xpresseditor/img/btn_extension.black.gif b/modules/editor/skins/xpresseditor/img/btn_extension.black.gif
deleted file mode 100755
index 06e028d09..000000000
Binary files a/modules/editor/skins/xpresseditor/img/btn_extension.black.gif and /dev/null differ
diff --git a/modules/editor/skins/xpresseditor/img/btn_extension.gif b/modules/editor/skins/xpresseditor/img/btn_extension.gif
deleted file mode 100644
index 0083bc1b8..000000000
Binary files a/modules/editor/skins/xpresseditor/img/btn_extension.gif and /dev/null differ
diff --git a/modules/editor/skins/xpresseditor/img/btn_set.black.gif b/modules/editor/skins/xpresseditor/img/btn_set.black.gif
index 0940eca96..74e3b1d30 100755
Binary files a/modules/editor/skins/xpresseditor/img/btn_set.black.gif and b/modules/editor/skins/xpresseditor/img/btn_set.black.gif differ
diff --git a/modules/editor/skins/xpresseditor/img/btn_set.gif b/modules/editor/skins/xpresseditor/img/btn_set.gif
index 1a0391905..f8cc3e3ce 100644
Binary files a/modules/editor/skins/xpresseditor/img/btn_set.gif and b/modules/editor/skins/xpresseditor/img/btn_set.gif differ
diff --git a/modules/editor/skins/xpresseditor/img/btn_set_blank.black.gif b/modules/editor/skins/xpresseditor/img/btn_set_blank.black.gif
index 4ee61a458..2f079c9a5 100755
Binary files a/modules/editor/skins/xpresseditor/img/btn_set_blank.black.gif and b/modules/editor/skins/xpresseditor/img/btn_set_blank.black.gif differ
diff --git a/modules/editor/skins/xpresseditor/img/btn_set_blank.gif b/modules/editor/skins/xpresseditor/img/btn_set_blank.gif
index 5da1aab28..046cd9f72 100644
Binary files a/modules/editor/skins/xpresseditor/img/btn_set_blank.gif and b/modules/editor/skins/xpresseditor/img/btn_set_blank.gif differ
diff --git a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
index f0e0897c1..76bb67716 100644
--- a/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
+++ b/modules/editor/skins/xpresseditor/js/Xpress_Editor.js
@@ -1,5763 +1,5764 @@
-(function($){
-
-// extends jQuery object
-$.extend({
-	Class : function(def) {
-		function c(){
-			if (typeof this.$super != 'undefined') this.$super.$this = this;
-			if ($.isFunction(this.$init)) this.$init.apply(this, arguments);
-		}
-		c.prototype = def;
-		c.constructor = c;
-		c.extend = Class_extend;
-
-		return c;
-	},
-	$ : function(id) {
-		if(typeof id == 'string') {
-			if (id.substring(0,1) == '<') return $(id).get(0);
-			return $('#'+id).get(0);
-		} else {
-			return id;
-		}
-	},
-	fnBind : function(fn, th/* , args... */) {
-		var args = $.makeArray(arguments);
-		args.shift(); args.shift();
-
-		return function() {
-			var a = args.concat($.makeArray(arguments));
-
-			return fn.apply(th, a);
-		};
-	}
-});
-
-$.browser.nVersion = parseFloat($.browser.version);
-
-function Class_extend(superDef) {
-	var Super = superDef.prototype;
-
-	this.prototype.$super = {};
-
-	function bind(fn) {
-		return function() {
-			return fn.apply(this.$this, arguments);
-		};
-	}
-
-	for(var x in Super) {
-		if (!Super.propertyIsEnumerable(x)) continue;
-
-		if (typeof this.prototype[x] == 'undefined') this.prototype[x] = Super[x];
-		this.prototype.$super[x] = $.isFunction(Super[x])?bind(Super[x]):Super[x];
-	}
-
-	return this;
-}
-
-if (typeof window.xe == 'undefined') window.xe = {};
-
-//{
- /**
- * @fileOverview This file contains Xpress framework core
- * @name XpressCore.js
- */
-xe.XpressCore = $.Class({
-	name : "XpressCore",
-
-	$init : function(htOptions){
-		htOptions = !htOptions?{}:$.Class({}).extend({
-			oDebugger : null
-		}).extend(htOptions);
-		if(htOptions.oDebugger){
-			this.oDebugger = htOptions.oDebugger;
-			this.oDebugger.oApp = this;
-		}
-
-		// To prevent processing a Xpress command before all the plugins are registered and ready,
-		// Queue up all the commands here until the application's status is changed to READY
-		this.commandQueue = [];
-
-		this.oCommandMap = {};
-		this.oDisabledCommand = {};
-		this.aPlugins = [];
-
-		this.appStatus = xe.APP_STATUS["NOT_READY"];
-
-		// Register the core as a plugin so it can receive messages
-		this.registerPlugin(this);
-	},
-
-	exec : function(msg, args, oEvent){
-		// If the application is not yet ready just queue the command
-		if(this.appStatus == xe.APP_STATUS["NOT_READY"]){
-			this.commandQueue[this.commandQueue.length] = {'msg':msg, 'args':args, 'event':oEvent};
-			return true;
-		}
-
-		this.exec = this._exec;
-		this.exec(msg, args, oEvent);
-	},
-
-	delayedExec : function(msg, args, nDelay, oEvent){
-		var fExec = $.fnBind(this.exec, this, msg, args, oEvent);
-		setTimeout(fExec, nDelay);
-	},
-
-	_exec : function(msg, args, oEvent){return (this._exec = this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this, msg, args, oEvent);},
-	_execWithDebugger : function(msg, args, oEvent){this.oDebugger.log_MessageStart(msg, args);var bResult = this._doExec(msg, args, oEvent);this.oDebugger.log_MessageEnd(msg, args);return bResult;	},
-	_execWithoutDebugger : function(msg, args, oEvent){return this._doExec(msg, args, oEvent);},
-	_doExec : function(msg, args, oEvent){
-		var bContinue = false;
-
-		if(!this.oDisabledCommand[msg]){
-			var allArgs = [];
-			if(args && args.length){
-				var iLen = args.length;
-				for(var i=0; i<iLen; i++) allArgs[i] = args[i];
-			}
-			if(oEvent) allArgs[allArgs.length] = oEvent;
-
-			var bContinue = true;
-			bContinue = this._execMsgStep("BEFORE", msg, allArgs);
-			if(bContinue) bContinue = this._execMsgStep("ON", msg, allArgs);
-			if(bContinue) bContinue = this._execMsgStep("AFTER", msg, allArgs);
-		}
-
-		return bContinue;
-	},
-
-	registerPlugin : function(oPlugin){
-		if(!oPlugin) throw("An error occured in registerPlugin(): invalid plug-in");
-
-		oPlugin.nIdx = this.aPlugins.length;
-		oPlugin.oApp = this;
-		this.aPlugins[oPlugin.nIdx] = oPlugin;
-
-		// If the plugin does not specify that it takes time to be ready, change the stauts to READY right away
-		if(oPlugin.status != xe.PLUGIN_STATUS["NOT_READY"]) oPlugin.status = xe.PLUGIN_STATUS["READY"];
-
-		this.exec("MSG_PLUGIN_REGISTERED", [oPlugin]);
-
-		return oPlugin.nIdx;
-	},
-
-	disableCommand : function(sCommand, bDisable){this.oDisabledCommand[sCommand] = bDisable;},
-
-	registerBrowserEvent : function(obj, sEvent, sCMD, aParams, nDelay){
-		if(!obj) return;
-		aParams = aParams || [];
-		var func = (nDelay)?$.fnBind(this.delayedExec, this, sCMD, aParams, nDelay):$.fnBind(this.exec, this, sCMD, aParams);
-		$(obj).bind(sEvent, func);
-	},
-
-	run : function(){
-		// Change the status from NOT_READY to let exec to process all the way
-		this._changeAppStatus(xe.APP_STATUS["WAITING_FOR_PLUGINS_READY"]);
-
-		// Process all the commands in the queue
-		var iQueueLength = this.commandQueue.length;
-		for(i=0; i<iQueueLength; i++){
-			var curMsgAndArgs = this.commandQueue[i];
-			this.exec(curMsgAndArgs.msg, curMsgAndArgs.args, curMsgAndArgs.event);
-		}
-
-		this._waitForPluginReady();
-	},
-
-	// Use this also to update the mapping
-	createCommandMap : function(sMsgHandler){
-		this.oCommandMap[sMsgHandler] = [];
-
-		var nLen = this.aPlugins.length;
-		for(var i=0; i<nLen; i++) this._doAddToCommandMap(sMsgHandler, this.aPlugins[i]);
-	},
-
-	addToCommandMap : function(sMsgHandler, oPlugin){
-		// cannot "ADD" unless the map is already created.
-		// the message will be added automatically to the mapping when it is first passed anyways, so do not add now
-		if(!this.oCommandMap[sMsgHandler]) return;
-
-		this._addToCommandMap(sMsgHandler, oPlugin);
-	},
-
-	_changeAppStatus : function(appStatus){
-		this.appStatus = appStatus;
-
-		// Initiate MSG_APP_READY if the application's status is being switched to READY
-		if(this.appStatus == xe.APP_STATUS["READY"]) this.exec("MSG_APP_READY");
-	},
-
-	_execMsgStep : function(sMsgStep, sMsg, args){return (this._execMsgStep = this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this, sMsgStep, sMsg, args);},
-	_execMsgStepWithDebugger : function(sMsgStep, sMsg, args){this.oDebugger.log_MessageStepStart(sMsgStep, sMsg, args);var bStatus = this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);this.oDebugger.log_MessageStepEnd(sMsgStep, sMsg, args);return bStatus;},
-	_execMsgStepWithoutDebugger : function(sMsgStep, sMsg, args){return this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);},
-	_execMsgHandler : function(sMsgHandler, args){
-		if(!this.oCommandMap[sMsgHandler]){
-			this.createCommandMap(sMsgHandler);
-		}
-
-		var aPlugins = this.oCommandMap[sMsgHandler];
-		var iNumOfPlugins = aPlugins.length;
-
-		if(iNumOfPlugins == 0) return true;
-
-		var tmpStatus, bResult = true;
-		// two similar codes were written twice due to the performace.
-		if(sMsgHandler.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){
-			for(var i=0; i<iNumOfPlugins; i++){
-				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
-				if(tmpStatus === false){
-					bResult = false;
-					break;
-				}
-			}
-		}else{
-			for(var i=0; i<iNumOfPlugins; i++){
-				if(typeof aPlugins[i]["$PRECONDITION"] == "function") if(!this._execHandler(aPlugins[i], "$PRECONDITION", [sMsgHandler, args])) continue;
-
-				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
-				if(tmpStatus === false){
-					bResult = false;
-					break;
-				}
-			}
-		}
-
-		return bResult;
-	},
-
-	_execHandler : function(oPlugin, sHandler, args){return	(this._execHandler = this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this, oPlugin, sHandler, args);},
-	_execHandlerWithDebugger : function(oPlugin, sHandler, args){this.oDebugger.log_CallHandlerStart(oPlugin, sHandler, args);var bResult = oPlugin[sHandler].apply(oPlugin, args);this.oDebugger.log_CallHandlerEnd(oPlugin, sHandler, args);return bResult;},
-	_execHandlerWithoutDebugger : function(oPlugin, sHandler, args){return oPlugin[sHandler].apply(oPlugin, args);},
-
-	_doAddToCommandMap : function(sMsgHandler, oPlugin){
-		if(typeof oPlugin[sMsgHandler] != "function") return;
-		this.oCommandMap[sMsgHandler][this.oCommandMap[sMsgHandler].length] = oPlugin;
-	},
-
-	_waitForPluginReady : function(){
-		var bAllReady = true;
-		for(var i=0; i<this.aPlugins.length; i++){
-			if(this.aPlugins[i].status == xe.PLUGIN_STATUS["NOT_READY"]){
-				bAllReady = false;
-				break;
-			}
-		}
-		if(bAllReady){
-			this._changeAppStatus(xe.APP_STATUS["READY"]);
-		}else{
-			setTimeout($.fnBind(this._waitForPluginReady, this), 100);
-		}
-	}
-});
-//}
-
-xe.APP_STATUS = {
-	'NOT_READY' : 0,
-	'WAITING_FOR_PLUGINS_READY' : 1,
-	'READY' : 2
-};
-
-xe.PLUGIN_STATUS = {
-	'NOT_READY' : 0,
-	'READY' : 1
-};
-/**
- * @fileOverview This file contains a cross-browser implementation of W3C's DOM Range
- * @name W3CDOMRange.js
- */
-xe.W3CDOMRange = $.Class({
-	$init : function(doc){
-		this._document = doc || document;
-
-		this.collapsed = true;
-		this.commonAncestorContainer = this._document.body;
-		this.endContainer = this._document.body;
-		this.endOffset = 0;
-		this.startContainer = this._document.body;
-		this.startOffset = 0;
-	},
-
-	cloneContents : function(){
-		var oClonedContents = this._document.createDocumentFragment();
-		var oTmpContainer = this._document.createDocumentFragment();
-
-		var aNodes = this._getNodesInRange();
-
-		if(aNodes.length < 1) return oClonedContents;
-
-		var oClonedContainers = this._constructClonedTree(aNodes, oTmpContainer);
-
-		// oTopContainer = aNodes[aNodes.length-1].parentNode and this is not part of the initial array and only those child nodes should be cloned
-		var oTopContainer = oTmpContainer.firstChild;
-
-		if(oTopContainer){
-			var elCurNode = oTopContainer.firstChild;
-			var elNextNode;
-
-			while(elCurNode){
-				elNextNode = elCurNode.nextSibling;
-				oClonedContents.appendChild(elCurNode);
-				elCurNode = elNextNode;
-			}
-		}
-
-		oClonedContainers = this._splitTextEndNodes({oStartContainer: oClonedContainers.oStartContainer, iStartOffset: this.startOffset,
-													oEndContainer: oClonedContainers.oEndContainer, iEndOffset: this.endOffset});
-
-		if(oClonedContainers.oStartContainer && oClonedContainers.oStartContainer.previousSibling)
-			xe.DOMFix.parentNode(oClonedContainers.oStartContainer).removeChild(oClonedContainers.oStartContainer.previousSibling);
-
-		if(oClonedContainers.oEndContainer && oClonedContainers.oEndContainer.nextSibling)
-			xe.DOMFix.parentNode(oClonedContainers.oEndContainer).removeChild(oClonedContainers.oEndContainer.nextSibling);
-
-		return oClonedContents;
-	},
-
-	_constructClonedTree : function(aNodes, oClonedParentNode){
-		var oClonedStartContainer = null;
-		var oClonedEndContainer = null;
-
-		var oStartContainer = this.startContainer;
-		var oEndContainer = this.endContainer;
-
-		_recurConstructClonedTree = function(aAllNodes, iCurIdx, oParentNode, oClonedParentNode){
-
-			if(iCurIdx < 0) return iCurIdx;
-
-			var iChildIdx = iCurIdx-1;
-
-			var oCurNodeCloneWithChildren = aAllNodes[iCurIdx].cloneNode(false);
-
-			if(aAllNodes[iCurIdx] == oStartContainer) oClonedStartContainer = oCurNodeCloneWithChildren;
-			if(aAllNodes[iCurIdx] == oEndContainer) oClonedEndContainer = oCurNodeCloneWithChildren;
-
-			while(iChildIdx >= 0 && xe.DOMFix.parentNode(aAllNodes[iChildIdx]) == aAllNodes[iCurIdx]){
-				iChildIdx = this._recurConstructClonedTree(aAllNodes, iChildIdx, aAllNodes[iCurIdx], oCurNodeCloneWithChildren, oClonedStartContainer, oClonedEndContainer);
-			}
-
-			// this may trigger an error message in IE when an erroneous script is inserted
-			oClonedParentNode.insertBefore(oCurNodeCloneWithChildren, oClonedParentNode.firstChild);
-
-			return iChildIdx;
-		};
-
-		aNodes[aNodes.length] = xe.DOMFix.parentNode(aNodes[aNodes.length-1]);
-		_recurConstructClonedTree(aNodes, aNodes.length-1, aNodes[aNodes.length-1], oClonedParentNode);
-
-		return {oStartContainer: oClonedStartContainer, oEndContainer: oClonedEndContainer};
-	},
-
-	cloneRange : function(){
-		return this._copyRange(new xe.W3CDOMRange(this._document));
-	},
-
-	_copyRange : function(oClonedRange){
-		oClonedRange.collapsed = this.collapsed;
-		oClonedRange.commonAncestorContainer = this.commonAncestorContainer;
-		oClonedRange.endContainer = this.endContainer;
-		oClonedRange.endOffset = this.endOffset;
-		oClonedRange.startContainer = this.startContainer;
-		oClonedRange.startOffset = this.startOffset;
-		oClonedRange._document = this._document;
-
-		return oClonedRange;
-	},
-
-	collapse : function(toStart){
-		if(toStart){
-			this.endContainer = this.startContainer;
-			this.endOffset = this.startOffset;
-		}else{
-			this.startContainer = this.endContainer;
-			this.startOffset = this.endOffset;
-		}
-
-		this._updateRangeInfo();
-	},
-
-	compareBoundaryPoints : function(how, sourceRange){
-		switch(how){
-			case xe.W3CDOMRange.START_TO_START:
-				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.startContainer, sourceRange.startOffset);
-			case xe.W3CDOMRange.START_TO_END:
-				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.startContainer, sourceRange.startOffset);
-			case xe.W3CDOMRange.END_TO_END:
-				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.endContainer, sourceRange.endOffset);
-			case xe.W3CDOMRange.END_TO_START:
-				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.endContainer, sourceRange.endOffset);
-		}
-	},
-
-	_findBody : function(oNode){
-		if(!oNode) return null;
-		while(oNode){
-			if(oNode.tagName == "BODY") return oNode;
-			oNode = xe.DOMFix.parentNode(oNode);
-		}
-		return null;
-	},
-
-	_compareEndPoint : function(oContainerA, iOffsetA, oContainerB, iOffsetB){
-		var iIdxA, iIdxB;
-
-		if(!oContainerA || this._findBody(oContainerA) != this._document.body){
-			oContainerA = this._document.body;
-			iOffsetA = 0;
-		}
-
-		if(!oContainerB || this._findBody(oContainerB) != this._document.body){
-			oContainerB = this._document.body;
-			iOffsetB = 0;
-		}
-
-		var compareIdx = function(iIdxA, iIdxB){
-			// iIdxX == -1 when the node is the commonAncestorNode
-			// if iIdxA == -1
-			// -> [[<nodeA>...<nodeB></nodeB>]]...</nodeA>
-			// if iIdxB == -1
-			// -> <nodeB>...[[<nodeA></nodeA>...</nodeB>]]
-			if(iIdxB == -1) iIdxB = iIdxA+1;
-			if(iIdxA < iIdxB) return -1;
-			if(iIdxA == iIdxB) return 0;
-			return 1;
-		};
-
-		var oCommonAncestor = this._getCommonAncestorContainer(oContainerA, oContainerB);
-
-		// ================================================================================================================================================
-		//  Move up both containers so that both containers are direct child nodes of the common ancestor node. From there, just compare the offset
-		// Add 0.5 for each contaienrs that has "moved up" since the actual node is wrapped by 1 or more parent nodes and therefore its position is somewhere between idx & idx+1
-		// <COMMON_ANCESTOR>NODE1<P>NODE2</P>NODE3</COMMON_ANCESTOR>
-		// The position of NODE2 in COMMON_ANCESTOR is somewhere between after NODE1(idx1) and before NODE3(idx2), so we let that be 1.5
-
-		// container node A in common ancestor container
-		var oNodeA = oContainerA;
-		if(oNodeA != oCommonAncestor){
-			while((oTmpNode = xe.DOMFix.parentNode(oNodeA)) != oCommonAncestor){oNodeA = oTmpNode;}
-
-			iIdxA = this._getPosIdx(oNodeA)+0.5;
-		}else iIdxA = iOffsetA;
-
-		// container node B in common ancestor container
-		var oNodeB = oContainerB;
-		if(oNodeB != oCommonAncestor){
-			while((oTmpNode = xe.DOMFix.parentNode(oNodeB)) != oCommonAncestor){oNodeB = oTmpNode;}
-
-			iIdxB = this._getPosIdx(oNodeB)+0.5;
-		}else iIdxB = iOffsetB;
-
-		return compareIdx(iIdxA, iIdxB);
-	},
-
-	_getCommonAncestorContainer : function(oNode1, oNode2){
-		var oComparingNode = oNode2;
-
-		while(oNode1){
-			while(oComparingNode){
-				if(oNode1 == oComparingNode) return oNode1;
-				oComparingNode = xe.DOMFix.parentNode(oComparingNode);
-			}
-			oComparingNode = oNode2;
-			oNode1 = xe.DOMFix.parentNode(oNode1);
-		}
-
-		return this._document.body;
-	},
-
-	deleteContents : function(){
-		if(this.collapsed) return;
-
-		this._splitTextEndNodesOfTheRange();
-
-		var aNodes = this._getNodesInRange();
-
-		if(aNodes.length < 1) return;
-
-		var oPrevNode = aNodes[0].previousSibling;
-		while(oPrevNode && this._isBlankTextNode(oPrevNode)) oPrevNode = oPrevNode.previousSibling;
-
-		var oNewStartContainer, iNewOffset;
-		if(!oPrevNode){
-			oNewStartContainer = xe.DOMFix.parentNode(aNodes[0]);
-			iNewOffset = 0;
-		}
-
-		for(var i=0; i<aNodes.length; i++){
-			var oNode = aNodes[i];
-			if(!oNode.firstChild){
-				if(oNewStartContainer == oNode){
-					iNewOffset = this._getPosIdx(oNewStartContainer);
-					oNewStartContainer = xe.DOMFix.parentNode(oNode);
-				}
-				xe.DOMFix.parentNode(oNode).removeChild(oNode);
-			}
-		}
-
-		if(!oPrevNode){
-			this.setStart(oNewStartContainer, iNewOffset);
-		}else{
-			if(oPrevNode.tagName == "BODY")
-				this.setStartBefore(oPrevNode);
-			else
-				this.setStartAfter(oPrevNode);
-		}
-
-		this.collapse(true);
-	},
-
-	extractContents : function(){
-		var oClonedContents = this.cloneContents();
-		this.deleteContents();
-		return oClonedContents;
-	},
-
-	insertNode : function(newNode){
-		var oFirstNode = null;
-
-		var oParentContainer;
-
-		if(this.startContainer.nodeType == "3"){
-			oParentContainer = xe.DOMFix.parentNode(this.startContainer);
-			if(this.startContainer.nodeValue.length <= this.startOffset)
-				oFirstNode = this.startContainer.nextSibling;
-			else
-				oFirstNode = this.startContainer.splitText(this.startOffset);
-		}else{
-			oParentContainer = this.startContainer;
-			oFirstNode = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
-		}
-
-		if(!oFirstNode || !xe.DOMFix.parentNode(oFirstNode)) oFirstNode = null;
-
-		oParentContainer.insertBefore(newNode, oFirstNode);
-
-		this.setStartBefore(newNode);
-	},
-
-	selectNode : function(refNode){
-		this.setStartBefore(refNode);
-		this.setEndAfter(refNode);
-	},
-
-	selectNodeContents : function(refNode){
-		this.setStart(refNode, 0);
-		this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
-	},
-
-	_endsNodeValidation : function(oNode, iOffset){
-		if(!oNode || this._findBody(oNode) != this._document.body) throw new Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
-
-		if(oNode.nodeType == 3){
-			if(iOffset > oNode.nodeValue.length) iOffset = oNode.nodeValue.length;
-		}else{
-			if(iOffset > xe.DOMFix.childNodes(oNode).length) iOffset = xe.DOMFix.childNodes(oNode).length;
-		}
-
-		return iOffset;
-	},
-
-
-	setEnd : function(refNode, offset){
-		offset = this._endsNodeValidation(refNode, offset);
-
-		this.endContainer = refNode;
-		this.endOffset = offset;
-		if(!this.startContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(false);
-
-		this._updateRangeInfo();
-	},
-
-	setEndAfter : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");
-
-		if(refNode.tagName == "BODY"){
-			this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
-			return;
-		}
-		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
-	},
-
-	setEndBefore : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");
-
-		if(refNode.tagName == "BODY"){
-			this.setEnd(refNode, 0);
-			return;
-		}
-
-		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
-	},
-
-	setStart : function(refNode, offset){
-		offset = this._endsNodeValidation(refNode, offset);
-
-		this.startContainer = refNode;
-		this.startOffset = offset;
-
-		if(!this.endContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(true);
-		this._updateRangeInfo();
-	},
-
-	setStartAfter : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");
-
-		if(refNode.tagName == "BODY"){
-			this.setStart(refNode, xe.DOMFix.childNodes(refNode).length);
-			return;
-		}
-
-		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
-	},
-
-	setStartBefore : function(refNode){
-		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");
-
-		if(refNode.tagName == "BODY"){
-			this.setStart(refNode, 0);
-			return;
-		}
-		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
-	},
-
-	surroundContents : function(newParent){
-		newParent.appendChild(this.extractContents());
-		this.insertNode(newParent);
-		this.selectNode(newParent);
-	},
-
-	toString : function(){
-		var oTmpContainer = this._document.createElement("DIV");
-		oTmpContainer.appendChild(this.cloneContents());
-
-		return oTmpContainer.textContent || oTmpContainer.innerText || "";
-	},
-
-	_isBlankTextNode : function(oNode){
-		if(oNode.nodeType == 3 && oNode.nodeValue == "") return true;
-		return false;
-	},
-
-	_getPosIdx : function(refNode){
-		var idx = 0;
-		for(var node = refNode.previousSibling; node; node = node.previousSibling) idx++;
-
-		return idx;
-	},
-
-	_updateRangeInfo : function(){
-		if(!this.startContainer){
-			this.init(this._document);
-			return;
-		}
-
-		this.collapsed = this._isCollapsed(this.startContainer, this.startOffset, this.endContainer, this.endOffset);
-
-		this.commonAncestorContainer = this._getCommonAncestorContainer(this.startContainer, this.endContainer);
-	},
-
-	_isCollapsed : function(oStartContainer, iStartOffset, oEndContainer, iEndOffset){
-		var bCollapsed = false;
-
-		if(oStartContainer == oEndContainer && iStartOffset == iEndOffset){
-			bCollapsed = true;
-		}else{
-			var oActualStartNode = this._getActualStartNode(oStartContainer, iStartOffset);
-			var oActualEndNode = this._getActualEndNode(oEndContainer, iEndOffset);
-
-			// Take the parent nodes on the same level for easier comparison when they're next to each other
-			// eg) From
-			//	<A>
-			//		<B>
-			//			<C>
-			//			</C>
-			//		</B>
-			//		<D>
-			//			<E>
-			//				<F>
-			//				</F>
-			//			</E>
-			//		</D>
-			//	</A>
-			//	, it's easier to compare the position of B and D rather than C and F because they are siblings
-			//
-			// If the range were collapsed, oActualEndNode will precede oActualStartNode by doing this
-			oActualStartNode = this._getNextNode(this._getPrevNode(oActualStartNode));
-			oActualEndNode = this._getPrevNode(this._getNextNode(oActualEndNode));
-
-			if(oActualStartNode && oActualEndNode && oActualEndNode.tagName != "BODY" &&
-				(this._getNextNode(oActualEndNode) == oActualStartNode || (oActualEndNode == oActualStartNode && this._isBlankTextNode(oActualEndNode)))
-			)
-				bCollapsed = true;
-		}
-
-		return bCollapsed;
-	},
-
-	_splitTextEndNodesOfTheRange : function(){
-		var oEndPoints = this._splitTextEndNodes({oStartContainer: this.startContainer, iStartOffset: this.startOffset,
-													oEndContainer: this.endContainer, iEndOffset: this.endOffset});
-
-		this.startContainer = oEndPoints.oStartContainer;
-		this.startOffset = oEndPoints.iStartOffset;
-
-		this.endContainer = oEndPoints.oEndContainer;
-		this.endOffset = oEndPoints.iEndOffset;
-	},
-
-	_splitTextEndNodes : function(oEndPoints){
-		oEndPoints = this._splitStartTextNode(oEndPoints);
-		oEndPoints = this._splitEndTextNode(oEndPoints);
-
-		return oEndPoints;
-	},
-
-	_splitStartTextNode : function(oEndPoints){
-		var oStartContainer = oEndPoints.oStartContainer;
-		var iStartOffset = oEndPoints.iStartOffset;
-
-		var oEndContainer = oEndPoints.oEndContainer;
-		var iEndOffset = oEndPoints.iEndOffset;
-
-		if(!oStartContainer) return oEndPoints;
-		if(oStartContainer.nodeType != 3) return oEndPoints;
-		if(iStartOffset == 0) return oEndPoints;
-
-		if(oStartContainer.nodeValue.length <= iStartOffset) return oEndPoints;
-
-		var oLastPart = oStartContainer.splitText(iStartOffset);
-
-		if(oStartContainer == oEndContainer){
-			iEndOffset -= iStartOffset;
-			oEndContainer = oLastPart;
-		}
-		oStartContainer = oLastPart;
-		iStartOffset = 0;
-
-		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
-	},
-
-	_splitEndTextNode : function(oEndPoints){
-		var oStartContainer = oEndPoints.oStartContainer;
-		var iStartOffset = oEndPoints.iStartOffset;
-
-		var oEndContainer = oEndPoints.oEndContainer;
-		var iEndOffset = oEndPoints.iEndOffset;
-
-		if(!oEndContainer) return oEndPoints;
-		if(oEndContainer.nodeType != 3) return oEndPoints;
-
-		if(iEndOffset >= oEndContainer.nodeValue.length) return oEndPoints;
-		if(iEndOffset == 0) return oEndPoints;
-
-		oEndContainer.splitText(iEndOffset);
-
-		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
-	},
-
-	_getNodesInRange : function(){
-		if(this.collapsed) return [];
-
-		var oStartNode = this._getActualStartNode(this.startContainer, this.startOffset);
-		var oEndNode = this._getActualEndNode(this.endContainer, this.endOffset);
-
-		return this._getNodesBetween(oStartNode, oEndNode);
-	},
-
-	_getActualStartNode : function(oStartContainer, iStartOffset){
-		var oStartNode = oStartContainer;;
-
-		if(oStartContainer.nodeType == 3){
-			if(iStartOffset >= oStartContainer.nodeValue.length){
-				oStartNode = this._getNextNode(oStartContainer);
-				if(oStartNode.tagName == "BODY") oStartNode = null;
-			}else{
-				oStartNode = oStartContainer;
-			}
-		}else{
-			if(iStartOffset < xe.DOMFix.childNodes(oStartContainer).length){
-				oStartNode = xe.DOMFix.childNodes(oStartContainer)[iStartOffset];
-			}else{
-				oStartNode = this._getNextNode(oStartContainer);
-				if(oStartNode.tagName == "BODY") oStartNode = null;
-			}
-		}
-
-		return oStartNode;
-	},
-
-	_getActualEndNode : function(oEndContainer, iEndOffset){
-		var oEndNode = oEndContainer;
-
-		if(iEndOffset == 0){
-			oEndNode = this._getPrevNode(oEndContainer);
-			if(oEndNode.tagName == "BODY") oEndNode = null;
-		}else if(oEndContainer.nodeType == 3){
-			oEndNode = oEndContainer;
-		}else{
-			oEndNode = xe.DOMFix.childNodes(oEndContainer)[iEndOffset-1];
-		}
-
-		return oEndNode;
-	},
-
-	_getNextNode : function(oNode){
-		if(!oNode || oNode.tagName == "BODY") return this._document.body;
-
-		if(oNode.nextSibling) return oNode.nextSibling;
-
-		return this._getNextNode(xe.DOMFix.parentNode(oNode));
-	},
-
-	_getPrevNode : function(oNode){
-		if(!oNode || oNode.tagName == "BODY") return this._document.body;
-
-		if(oNode.previousSibling) return oNode.previousSibling;
-
-		return this._getPrevNode(xe.DOMFix.parentNode(oNode));
-	},
-
-	// includes partially selected
-	// for <div id="a"><div id="b"></div></div><div id="c"></div>, _getNodesBetween(b, c) will yield to b, "a" and c
-	_getNodesBetween : function(oStartNode, oEndNode){
-		var aNodesBetween = [];
-		this._nNodesBetweenLen = 0;
-
-		if(!oStartNode || !oEndNode) return aNodesBetween;
-
-		this._recurGetNextNodesUntil(oStartNode, oEndNode, aNodesBetween);
-		return aNodesBetween;
-	},
-
-	_recurGetNextNodesUntil : function(oNode, oEndNode, aNodesBetween){
-		if(!oNode) return false;
-
-		if(!this._recurGetChildNodesUntil(oNode, oEndNode, aNodesBetween)) return false;
-
-		var oNextToChk = oNode.nextSibling;
-
-		while(!oNextToChk){
-			if(!(oNode = xe.DOMFix.parentNode(oNode))) return false;
-
-			aNodesBetween[this._nNodesBetweenLen++] = oNode;
-
-			if(oNode == oEndNode) return false;
-
-			oNextToChk = oNode.nextSibling;
-		}
-
-		return this._recurGetNextNodesUntil(oNextToChk, oEndNode, aNodesBetween);
-	},
-
-	_recurGetChildNodesUntil : function(oNode, oEndNode, aNodesBetween){
-		if(!oNode) return false;
-
-		var bEndFound = false;
-		var oCurNode = oNode;
-		if(oCurNode.firstChild){
-			oCurNode = oCurNode.firstChild;
-			while(oCurNode){
-				if(!this._recurGetChildNodesUntil(oCurNode, oEndNode, aNodesBetween)){
-					bEndFound = true;
-					break;
-				}
-				oCurNode = oCurNode.nextSibling;
-			}
-		}
-
-		aNodesBetween[this._nNodesBetweenLen++] = oNode;
-
-		if(bEndFound) return false;
-		if(oNode == oEndNode) return false;
-
-		return true;
-	}
-});
-
-xe.W3CDOMRange.START_TO_START = 0;
-xe.W3CDOMRange.START_TO_END = 1;
-xe.W3CDOMRange.END_TO_END = 2;
-xe.W3CDOMRange.END_TO_START = 3;
-
-
-/**
- * @fileOverview This file contains a cross-browser function that implements all of the W3C's DOM Range specification and some more
- * @name XpressRange.js
- */
-xe.XpressRange = $.Class({
-	setWindow : function(win){
-		this._window = win;
-		this._document = win.document;
-	},
-
-	$init : function(win){
-		this.HUSKY_BOOMARK_START_ID_PREFIX = "xpress_bookmark_start_";
-		this.HUSKY_BOOMARK_END_ID_PREFIX = "xpress_bookmark_end_";
-
-		this.sBlockElement = "P|DIV|LI|H[1-6]|PRE";
-		this.sBlockContainer = "BODY|TABLE|TH|TR|TD|UL|OL|BLOCKQUOTE|FORM";
-
-		this.rxBlockElement = new RegExp("^("+this.sBlockElement+")$");
-		this.rxBlockContainer = new RegExp("^("+this.sBlockContainer+")$")
-		this.rxLineBreaker = new RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$")
-
-		this.setWindow(win);
-
-		this.oSimpleSelection = new xe.SimpleSelection(this._window);
-		this.selectionLoaded = this.oSimpleSelection.selectionLoaded;
-
-		this.$super.$init(this._document);
-	},
-
-	select : function(){
-		this.oSimpleSelection.selectRange(this);
-	},
-
-	setFromSelection : function(iNum){
-		this.setRange(this.oSimpleSelection.getRangeAt(iNum));
-	},
-
-	setRange : function(oW3CRange){
-		this.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
-		this.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
-	},
-
-	setEndNodes : function(oSNode, oENode){
-		this.setEndAfter(oENode);
-		this.setStartBefore(oSNode);
-	},
-
-	splitTextAtBothEnds : function(){
-		this._splitTextEndNodesOfTheRange();
-	},
-
-	getStartNode : function(){
-		if(this.collapsed){
-			if(this.startContainer.nodeType == 3){
-				if(this.startOffset == 0) return null;
-				if(this.startContainer.nodeValue.length <= this.startOffset) return null;
-				return this.startContainer;
-			}
-			return null;
-		}
-
-		if(this.startContainer.nodeType == 3){
-			if(this.startOffset >= this.startContainer.nodeValue.length) return this._getNextNode(this.startContainer);
-			return this.startContainer;
-		}else{
-			if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length) return this._getNextNode(this.startContainer);
-			return xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
-		}
-	},
-
-	getEndNode : function(){
-		if(this.collapsed) return this.getStartNode();
-
-		if(this.endContainer.nodeType == 3){
-			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
-			return this.endContainer;
-		}else{
-			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
-			return xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
-		}
-	},
-
-	getNodeAroundRange : function(bBefore, bStrict){
-		if(this.collapsed && this.startContainer && this.startContainer.nodeType == 3) return this.startContainer;
-		if(!this.collapsed || (this.startContainer && this.startContainer.nodeType == 3)) return this.getStartNode();
-
-		var oBeforeRange, oAfterRange, oResult;
-
-		if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length)
-			oAfterRange = this._getNextNode(this.startContainer);
-		else
-			oAfterRange = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
-
-		if(this.endOffset == 0)
-			oBeforeRange = this._getPrevNode(this.endContainer);
-		else
-			oBeforeRange = xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
-
-		if(bBefore){
-			oResult = oBeforeRange;
-			if(!oResult && !bStrict) oResult = oAfterRange;
-		}else{
-			oResult = oAfterRange;
-			if(!oResult && !bStrict) oResult = oBeforeRange;
-		}
-
-		return oResult;
-	},
-
-	_getXPath : function(elNode){
-		var sXPath = "";
-
-		while(elNode && elNode.nodeType == 1){
-			sXPath = "/" + elNode.tagName+"["+this._getPosIdx4XPath(elNode)+"]" + sXPath;
-			elNode = xe.DOMFix.parentNode(elNode);
-		}
-
-		return sXPath;
-	},
-
-	_getPosIdx4XPath : function(refNode){
-		var idx = 0;
-		for(var node = refNode.previousSibling; node; node = node.previousSibling)
-			if(node.tagName == refNode.tagName) idx++;
-
-		return idx;
-	},
-
-	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
-	_evaluateXPath : function(sXPath, oDoc){
-		sXPath = sXPath.substring(1, sXPath.length-1);
-		var aXPath = sXPath.split(/\//);
-		var elNode = oDoc.body;
-
-		for(var i=2; i<aXPath.length && elNode; i++){
-			aXPath[i].match(/([^\[]+)\[(\d+)/i);
-			var sTagName = RegExp.$1;
-			var nIdx = RegExp.$2;
-
-			var aAllNodes = xe.DOMFix.childNodes(elNode);
-			var aNodes = [];
-			var nLength = aAllNodes.length;
-			var nCount = 0;
-			for(var ii=0; ii<nLength; ii++){
-				if(aAllNodes[ii].tagName == sTagName) aNodes[nCount++] = aAllNodes[ii];
-			}
-
-			if(aNodes.length < nIdx)
-				elNode = null;
-			else
-				elNode = aNodes[nIdx];
-		}
-
-		return elNode;
-	},
-
-	_evaluateXPathBookmark : function(oBookmark){
-		var sXPath = oBookmark["sXPath"];
-		var nTextNodeIdx = oBookmark["nTextNodeIdx"];
-		var nOffset = oBookmark["nOffset"];
-
-		var elContainer = this._evaluateXPath(sXPath, this._document);
-
-		if(nTextNodeIdx > -1 && elContainer){
-			var aChildNodes = xe.DOMFix.childNodes(elContainer);
-			var elNode = null;
-
-			var nIdx = nTextNodeIdx;
-			var nOffsetLeft = nOffset;
-
-			while((elNode = aChildNodes[nIdx]) && elNode.nodeType == 3 && elNode.nodeValue.length < nOffsetLeft){
-				nOffsetLeft -= elNode.nodeValue.length;
-				nIdx++;
-			}
-
-			elContainer = xe.DOMFix.childNodes(elContainer)[nIdx];
-			nOffset = nOffsetLeft;
-		}
-
-		if(!elContainer){
-			elContainer = this._document.body;
-			nOffset = 0;
-		}
-		return {elContainer: elContainer, nOffset: nOffset};
-	},
-
-	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
-	getXPathBookmark : function(){
-		var nTextNodeIdx1 = -1;
-		var htEndPt1 = {elContainer: this.startContainer, nOffset: this.startOffset};
-		var elNode1 = this.startContainer;
-		if(elNode1.nodeType == 3){
-			htEndPt1 = this._getFixedStartTextNode();
-			nTextNodeIdx1 = this._getPosIdx(htEndPt1.elContainer);
-			elNode1 = xe.DOMFix.parentNode(elNode1);
-		}
-		var sXPathNode1 = this._getXPath(elNode1);
-		var oBookmark1 = {sXPath:sXPathNode1, nTextNodeIdx:nTextNodeIdx1, nOffset: htEndPt1.nOffset};
-
-		var nTextNodeIdx2 = -1;
-		var htEndPt2 = {elContainer: this.endContainer, nOffset: this.endOffset};
-		var elNode2 = this.endContainer;
-		if(elNode2.nodeType == 3){
-			htEndPt2 = this._getFixedEndTextNode();
-			nTextNodeIdx2 = this._getPosIdx(htEndPt2.elContainer);
-			elNode2 = xe.DOMFix.parentNode(elNode2);
-		}
-		var sXPathNode2 = this._getXPath(elNode2);
-		var oBookmark2 = {sXPath:sXPathNode2, nTextNodeIdx:nTextNodeIdx2, nOffset: htEndPt2.nOffset};
-
-		return [oBookmark1, oBookmark2];
-	},
-
-	moveToXPathBookmark : function(aBookmark){
-		if(!aBookmark) return;
-
-		var oBookmarkInfo1 = this._evaluateXPathBookmark(aBookmark[0]);
-		var oBookmarkInfo2 = this._evaluateXPathBookmark(aBookmark[1]);
-
-		if(!oBookmarkInfo1["elContainer"] || !oBookmarkInfo2["elContainer"]) return;
-
-		this.startContainer = oBookmarkInfo1["elContainer"];
-		this.startOffset = oBookmarkInfo1["nOffset"];
-
-		this.endContainer = oBookmarkInfo2["elContainer"];
-		this.endOffset = oBookmarkInfo2["nOffset"];
-	},
-
-	_getFixedTextContainer : function(elNode, nOffset){
-		while(elNode && elNode.nodeType == 3 && elNode.previousSibling && elNode.previousSibling.nodeType == 3){
-			nOffset += elNode.previousSibling.nodeValue.length;
-			elNode = elNode.previousSibling;
-		}
-
-		return {elContainer:elNode, nOffset:nOffset};
-	},
-
-	_getFixedStartTextNode : function(){
-		return this._getFixedTextContainer(this.startContainer, this.startOffset);
-	},
-
-	_getFixedEndTextNode : function(){
-		return this._getFixedTextContainer(this.endContainer, this.endOffset);
-	},
-
-	placeStringBookmark : function(){
-		var sTmpId = (new Date()).getTime();
-
-		var oInsertionPoint = this.cloneRange();
-		oInsertionPoint.collapseToEnd();
-		var oEndMarker = this._document.createElement("A");
-		oEndMarker.id = this.HUSKY_BOOMARK_END_ID_PREFIX+sTmpId;
-		oInsertionPoint.insertNode(oEndMarker);
-
-		var oInsertionPoint = this.cloneRange();
-		oInsertionPoint.collapseToStart();
-		var oStartMarker = this._document.createElement("A");
-		oStartMarker.id = this.HUSKY_BOOMARK_START_ID_PREFIX+sTmpId;
-		oInsertionPoint.insertNode(oStartMarker);
-
-		this.moveToBookmark(sTmpId);
-
-		return sTmpId;
-	},
-
-	cloneRange : function(){
-		return this._copyRange(new xe.XpressRange(this._window));
-	},
-
-	moveToBookmark : function(vBookmark){
-		if(typeof(vBookmark) != "object")
-			this.moveToStringBookmark(vBookmark);
-		else
-			this.moveToXPathBookmark(vBookmark);
-	},
-
-	moveToStringBookmark : function(sBookmarkID){
-		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
-		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
-
-		if(!oStartMarker || !oEndMarker) return;
-
-		this.setEndBefore(oEndMarker);
-		this.setStartAfter(oStartMarker);
-	},
-
-	removeStringBookmark : function(sBookmarkID){
-		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
-		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
-
-		if(oStartMarker) xe.DOMFix.parentNode(oStartMarker).removeChild(oStartMarker);
-		if(oEndMarker) xe.DOMFix.parentNode(oEndMarker).removeChild(oEndMarker);
-	},
-
-	collapseToStart : function(){
-		this.collapse(true);
-	},
-
-	collapseToEnd : function(){
-		this.collapse(false);
-	},
-
-	createAndInsertNode : function(sTagName){
-		tmpNode = this._document.createElement(tagName);
-		this.insertNode(tmpNode)
-		return tmpNode
-	},
-
-	getNodes : function(bSplitTextEndNodes, fnFilter){
-		if(bSplitTextEndNodes) this._splitTextEndNodesOfTheRange();
-
-		var aAllNodes = this._getNodesInRange();
-		var aFilteredNodes = [];
-
-		if(!fnFilter) return aAllNodes;
-
-		for(var i=0; i<aAllNodes.length; i++)
-			if(fnFilter(aAllNodes[i])) aFilteredNodes[aFilteredNodes.length] = aAllNodes[i];
-
-		return aFilteredNodes;
-	},
-
-	getTextNodes : function(bSplitTextEndNodes){
-		var txtFilter = function(oNode){
-			if (oNode.nodeType == 3 && oNode.nodeValue != "\n" && oNode.nodeValue != "")
-				return true;
-			else
-				return false;
-		}
-
-		return this.getNodes(bSplitTextEndNodes, txtFilter);
-	},
-
-	surroundContentsWithNewNode : function(sTagName){
-		var oNewParent = this._document.createElement(sTagName);
-		this.surroundContents(oNewParent);
-		return oNewParent;
-	},
-
-	isRangeinRange : function(oAnoterRange, bIncludePartlySelected){
-		var startToStart = this.compareBoundaryPoints(this.START_TO_START, oAnoterRange);
-		var startToEnd = this.compareBoundaryPoints(this.START_TO_END, oAnoterRange);
-		var endToStart = this.compareBoundaryPoints(this.END_TO_START, oAnoterRange);
-		var endToEnd = this.compareBoundaryPoints(this.END_TO_END, oAnoterRange);
-
-		if(startToStart <= 0 && endToEnd >= 0) return true;
-
-		if(bIncludePartlyIncluded){
-			if(startToEnd == 1) return false;
-			if(endToStart == -1) return false;
-			return true;
-		}
-
-		return false;
-	},
-
-	isNodeInRange : function(oNode, bIncludePartlySelected, bContentOnly){
-		var oTmpRange = new xe.XpressRange(this._window);
-
-		if(bContentOnly && oNode.firstChild){
-			oTmpRange.setStartBefore(oNode.firstChild);
-			oTmpRange.setEndAfter(oNode.lastChild);
-		}else{
-			oTmpRange.selectNode(oNode);
-		}
-
-		return isRangeInRange(oTmpRange, bIncludePartlySelected);
-	},
-
-	pasteHTML : function(sHTML){
-		if(sHTML == ""){
-			this.deleteContents();
-			return;
-		}
-
-		var oTmpDiv = this._document.createElement("DIV");
-		oTmpDiv.innerHTML = sHTML;
-
-		var oFirstNode = oTmpDiv.firstChild;
-		var oLastNode = oTmpDiv.lastChild;
-
-		var clone = this.cloneRange();
-		var sBM = clone.placeStringBookmark();
-
-		while(oTmpDiv.lastChild) this.insertNode(oTmpDiv.lastChild);
-
-		this.setEndNodes(oFirstNode, oLastNode);
-
-		// delete the content later as deleting it first may mass up the insertion point
-		// eg) <p>[A]BCD</p> ---paste O---> O<p>BCD</p>
-		clone.moveToBookmark(sBM);
-		clone.deleteContents();
-		clone.removeStringBookmark(sBM);
-	},
-
-	toString : function(){
-		this.toString = xe.W3CDOMRange.prototype.toString;
-		return this.toString();
-	},
-
-	toHTMLString : function(){
-		var oTmpContainer = this._document.createElement("DIV");
-		oTmpContainer.appendChild(this.cloneContents());
-
-		return oTmpContainer.innerHTML;
-	},
-
-	findAncestorByTagName : function(sTagName){
-		var oNode = this.commonAncestorContainer;
-		while(oNode && oNode.tagName != sTagName) oNode = xe.DOMFix.parentNode(oNode);
-
-		return oNode;
-	},
-
-	selectNodeContents : function(oNode){
-		if(!oNode) return;
-
-		var oFirstNode = oNode.firstChild?oNode.firstChild:oNode;
-		var oLastNode = oNode.lastChild?oNode.lastChild:oNode;
-
-		if(oFirstNode.nodeType == 3)
-			this.setStart(oFirstNode, 0);
-		else
-			this.setStartBefore(oFirstNode);
-
-		if(oLastNode.nodeType == 3)
-			this.setEnd(oLastNode, oLastNode.nodeValue.length);
-		else
-			this.setEndAfter(oLastNode);
-	},
-
-	styleRange : function(oStyle, oAttribute, sNewSpanMarker){
-		var aStyleParents = this._getStyleParentNodes(sNewSpanMarker);
-		if(aStyleParents.length < 1) return;
-
-		var sName, sValue;
-
-		for(var i=0; i<aStyleParents.length; i++){
-			for(var x in oStyle){
-				sName = x;
-				sValue = oStyle[sName];
-
-				if(typeof sValue != "string") continue;
-
-				aStyleParents[i].style[sName] = sValue;
-			}
-
-			if(!oAttribute) continue;
-
-			for(var x in oAttribute){
-				sName = x;
-				sValue = oAttribute[sName];
-
-				if(typeof sValue != "string") continue;
-
-				if(sName == "class"){
-					$(aStyleParents[i]).addClass(sValue);
-				}else{
-					aStyleParents[i].setAttribute(sName, sValue);
-				}
-			}
-		}
-
-		this.setStartBefore(aStyleParents[0]);
-		this.setEndAfter(aStyleParents[aStyleParents.length-1]);
-	},
-
-	_getStyleParentNodes : function(sNewSpanMarker){
-		this._splitTextEndNodesOfTheRange();
-
-		var oSNode = this.getStartNode();
-		var oENode = this.getEndNode();
-
-		var aAllNodes = this._getNodesInRange();
-		var aResult = [];
-		var nResult = 0;
-
-		var oNode, oTmpNode, iStartRelPos, iEndRelPos, oSpan, iSIdx, iEIdx, oParentNode;
-		var nInitialLength  = aAllNodes.length;
-		var arAllBottmNodes = $(aAllNodes).filter(function(){ return !!this.childNodes.length });
-
-		for(var i=0; i<nInitialLength; i++){
-			oNode = aAllNodes[i];
-
-			if(!oNode || oNode.nodeType != 3 || oNode.nodeValue == '') continue;
-			
-			oParentNode = xe.DOMFix.parentNode(oNode);
-
-			if(oParentNode.tagName == "SPAN"){
-				// check if the SPAN element is fully contained
-				// do quick checks before trying indexOf() because indexOf() function is very slow
-				oTmpNode = this._getVeryFirstRealChild(oParentNode);
-				if(oTmpNode == oNode) iSIdx = 1;
-				else iSIdx = arAllBottmNodes.indexOf(oTmpNode);
-
-				if(iSIdx != -1){
-					oTmpNode = this._getVeryLastRealChild(oParentNode);
-					if(oTmpNode == oNode) iEIdx = 1;
-					else iEIdx = arAllBottmNodes.indexOf(oTmpNode);
-				}
-
-				if(iSIdx != -1 && iEIdx != -1){
-					aResult[nResult++] = oParentNode;
-					continue;
-				}
-			}
-
-			oSpan = this._document.createElement("SPAN");
-			oParentNode.insertBefore(oSpan, oNode);
-			oSpan.appendChild(oNode);
-			aResult[nResult++] = oSpan;
-
-			if(sNewSpanMarker) oSpan.setAttribute(sNewSpanMarker, "true");
-		}
-
-		this.setStartBefore(oSNode);
-		this.setEndAfter(oENode);
-
-		return aResult;
-	},
-
-	_getVeryFirstChild : function(oNode){
-		if(oNode.firstChild) return this._getVeryFirstChild(oNode.firstChild);
-		return oNode;
-	},
-
-	_getVeryLastChild : function(oNode){
-		if(oNode.lastChild) return this._getVeryLastChild(oNode.lastChild);
-		return oNode;
-	},
-
-	_getFirstRealChild : function(oNode){
-		var oFirstNode = oNode.firstChild;
-		while(oFirstNode && oFirstNode.nodeType == 3 && oFirstNode.nodeValue == "") oFirstNode = oFirstNode.nextSibling;
-
-		return oFirstNode;
-	},
-
-	_getLastRealChild : function(oNode){
-		var oLastNode = oNode.lastChild;
-		while(oLastNode && oLastNode.nodeType == 3 && oLastNode.nodeValue == "") oLastNode = oLastNode.previousSibling;
-
-		return oLastNode;
-	},
-
-	_getVeryFirstRealChild : function(oNode){
-		var oFirstNode = this._getFirstRealChild(oNode);
-		if(oFirstNode) return this._getVeryFirstRealChild(oFirstNode);
-		return oNode;
-	},
-	_getVeryLastRealChild : function(oNode){
-		var oLastNode = this._getLastRealChild(oNode);
-		if(oLastNode) return this._getVeryLastChild(oLastNode);
-		return oNode;
-	},
-
-	_getLineStartInfo : function(node){
-		var frontEndFinal = null;
-		var frontEnd = node;
-		var lineBreaker = node;
-		var bParentBreak = true;
-
-		var rxLineBreaker = this.rxLineBreaker;
-
-		// vertical(parent) search
-		function getLineStart(node){
-			if(!node) return;
-			if(frontEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				frontEndFinal = frontEnd;
-
-				bParentBreak = true;
-
-				return;
-			}else{
-				frontEnd = node;
-			}
-
-			getFrontEnd(node.previousSibling);
-
-			if(frontEndFinal) return;
-			getLineStart(xe.DOMFix.parentNode(node));
-		}
-
-		// horizontal(sibling) search
-		function getFrontEnd(node){
-			if(!node) return;
-			if(frontEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				frontEndFinal = frontEnd;
-
-				bParentBreak = false;
-				return;
-			}
-
-			if(node.firstChild && node.tagName != "TABLE"){
-				var curNode = node.lastChild;
-				while(curNode && !frontEndFinal){
-					getFrontEnd(curNode);
-
-					curNode = curNode.previousSibling;
-				}
-			}else{
-				frontEnd = node;
-			}
-
-			if(!frontEndFinal){
-				getFrontEnd(node.previousSibling);
-			}
-		}
-
-		getLineStart(node);
-
-		return {oNode: frontEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
-	},
-
-	_getLineEndInfo : function(node){
-		var backEndFinal = null;
-		var backEnd = node;
-		var lineBreaker = node;
-		var bParentBreak = true;
-
-		var rxLineBreaker = this.rxLineBreaker;
-
-		// vertical(parent) search
-		function getLineEnd(node){
-			if(!node) return;
-			if(backEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				backEndFinal = backEnd;
-
-				bParentBreak = true;
-
-				return;
-			}else{
-				backEnd = node;
-			}
-
-			getBackEnd(node.nextSibling);
-			if(backEndFinal) return;
-
-			getLineEnd(xe.DOMFix.parentNode(node));
-		}
-
-		// horizontal(sibling) search
-		function getBackEnd(node){
-			if(!node) return;
-			if(backEndFinal) return;
-
-			if(rxLineBreaker.test(node.tagName)){
-				lineBreaker = node;
-				backEndFinal = backEnd;
-
-				bParentBreak = false;
-
-				return;
-			}
-
-			if(node.firstChild && node.tagName != "TABLE"){
-				var curNode = node.firstChild;
-				while(curNode && !backEndFinal){
-					getBackEnd(curNode);
-
-					curNode = curNode.nextSibling;
-				}
-			}else{
-				backEnd = node;
-			}
-
-			if(!backEndFinal){
-				getBackEnd(node.nextSibling);
-			}
-		}
-
-		getLineEnd(node);
-
-		return {oNode: backEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
-	},
-
-	getLineInfo : function(){
-		var oSNode = this.getStartNode();
-		var oENode = this.getEndNode();
-
-		// the range is currently collapsed
-		if(!oSNode) oSNode = this.getNodeAroundRange(true, true);
-		if(!oENode) oENode = this.getNodeAroundRange(true, true);
-
-		var oStart = this._getLineStartInfo(oSNode);
-		var oStartNode = oStart.oNode;
-		var oEnd = this._getLineEndInfo(oENode);
-		var oEndNode = oEnd.oNode;
-
-		var iRelativeStartPos = this._compareEndPoint(xe.DOMFix.parentNode(oStartNode), this._getPosIdx(oStartNode), this.endContainer, this.endOffset);
-		var iRelativeEndPos = this._compareEndPoint(xe.DOMFix.parentNode(oEndNode), this._getPosIdx(oEndNode)+1, this.startContainer, this.startOffset);
-
-		if(!(iRelativeStartPos <= 0 && iRelativeEndPos >= 0)){
-			oSNode = this.getNodeAroundRange(false, true);
-			oENode = this.getNodeAroundRange(false, true);
-			oStart = this._getLineStartInfo(oSNode);
-			oEnd = this._getLineEndInfo(oENode);
-		}
-
-		return {oStart: oStart, oEnd: oEnd};
-	}
-}).extend(xe.W3CDOMRange);
-
-/**
- * @fileOverview This file contains cross-browser selection function
- * @name SimpleSelection.js
- */
-xe.SimpleSelection = function(win){
-	this.init = function(win){
-		this._window = win || window;
-		this._document = this._window.document;
-	};
-
-	this.init(win);
-
-	if($.browser.msie)
-		xe.SimpleSelectionImpl_IE.apply(this);
-	else
-		xe.SimpleSelectionImpl_FF.apply(this);
-
-	this.selectRange = function(oRng){
-		this.selectNone();
-		this.addRange(oRng);
-	};
-
-	this.selectionLoaded = true;
-	if(!this._oSelection) this.selectionLoaded = false;
-};
-
-xe.SimpleSelectionImpl_FF = function(){
-	this._oSelection = this._window.getSelection();
-
-	this.getRangeAt = function(iNum){
-		iNum = iNum || 0;
-
-		try{
-			var oFFRange = this._oSelection.getRangeAt(iNum);
-		}catch(e){return new xe.W3CDOMRange(this._document);}
-
-		return this._FFRange2W3CRange(oFFRange);
-	};
-
-	this.addRange = function(oW3CRange){
-		var oFFRange = this._W3CRange2FFRange(oW3CRange);
-		this._oSelection.addRange(oFFRange);
-	};
-
-	this.selectNone = function(){
-		this._oSelection.removeAllRanges();
-	};
-
-	this._FFRange2W3CRange = function(oFFRange){
-		var oW3CRange = new xe.W3CDOMRange(this._document);
-		oW3CRange.setStart(oFFRange.startContainer, oFFRange.startOffset);
-		oW3CRange.setEnd(oFFRange.endContainer, oFFRange.endOffset);
-		return oW3CRange;
-	};
-
-	this._W3CRange2FFRange = function(oW3CRange){
-		var oFFRange = this._document.createRange();
-		oFFRange.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
-		oFFRange.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
-
-		return oFFRange;
-	};
-};
-
-xe.SimpleSelectionImpl_IE = function(){
-	this._oSelection = this._document.selection;
-
-	this.getRangeAt = function(iNum){
-		iNum = iNum || 0;
-
-		if(this._oSelection.type == "Control"){
-			var oW3CRange = new xe.W3CDOMRange(this._document);
-
-			var oSelectedNode = this._oSelection.createRange().item(iNum);
-
-			// if the selction occurs in a different document, ignore
-			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document) return oW3CRange;
-
-			oW3CRange.selectNode(oSelectedNode);
-
-			return oW3CRange;
-		}else{
-			var oSelectedNode = this._oSelection.createRangeCollection().item(iNum).parentElement();
-
-			// if the selction occurs in a different document, ignore
-			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document){
-				var oW3CRange = new xe.W3CDOMRange(this._document);
-				return oW3CRange;
-			}
-			return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(iNum));
-		}
-	};
-
-	this.addRange = function(oW3CRange){
-		var oIERange = this._W3CRange2IERange(oW3CRange);
-		oIERange.select();
-	};
-
-	this.selectNone = function(){
-		this._oSelection.empty();
-	};
-
-	this._W3CRange2IERange = function(oW3CRange){
-		var oStartIERange = this._getIERangeAt(oW3CRange.startContainer, oW3CRange.startOffset);
-		var oEndIERange = this._getIERangeAt(oW3CRange.endContainer, oW3CRange.endOffset);
-		oStartIERange.setEndPoint("EndToEnd", oEndIERange);
-
-		return oStartIERange;
-	};
-
-	this._getIERangeAt = function(oW3CContainer, iW3COffset){
-		var oIERange = this._document.body.createTextRange();
-
-		var oEndPointInfoForIERange = this._getSelectableNodeAndOffsetForIE(oW3CContainer, iW3COffset);
-
-		var oSelectableNode = oEndPointInfoForIERange.oSelectableNodeForIE;
-		var iIEOffset = oEndPointInfoForIERange.iOffsetForIE;
-
-		oIERange.moveToElementText(oSelectableNode);
-		oIERange.collapse(oEndPointInfoForIERange.bCollapseToStart);
-		oIERange.moveStart("character", iIEOffset);
-
-		return oIERange;
-	};
-
-	this._getSelectableNodeAndOffsetForIE = function(oW3CContainer, iW3COffset){
-		var oIERange = this._document.body.createTextRange();
-
-		var oNonTextNode = null;
-		var aChildNodes =  null;
-		var iNumOfLeftNodesToCount = 0;
-
-		if(oW3CContainer.nodeType == 3){
-			oNonTextNode = xe.DOMFix.parentNode(oW3CContainer);
-			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
-			iNumOfLeftNodesToCount = aChildNodes.length;
-		}else{
-			oNonTextNode = oW3CContainer;
-			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
-			iNumOfLeftNodesToCount = iW3COffset;
-		}
-
-		var oNodeTester = null;
-
-		var iResultOffset = 0;
-
-		var bCollapseToStart = true;
-
-		for(var i=0; i<iNumOfLeftNodesToCount; i++){
-			oNodeTester = aChildNodes[i];
-
-			if(oNodeTester.nodeType == 3){
-				if(oNodeTester == oW3CContainer) break;
-
-				iResultOffset += oNodeTester.nodeValue.length;
-			}else{
-				oIERange.moveToElementText(oNodeTester);
-				oNonTextNode = oNodeTester;
-				iResultOffset = 0;
-
-				bCollapseToStart = false;
-			}
-		}
-
-		if(oW3CContainer.nodeType == 3) iResultOffset += iW3COffset;
-
-		return {oSelectableNodeForIE:oNonTextNode, iOffsetForIE: iResultOffset, bCollapseToStart: bCollapseToStart};
-	};
-
-	this._IERange2W3CRange = function(oIERange){
-		var oW3CRange = new xe.W3CDOMRange(this._document);
-
-		var oIEPointRange = null;
-		var oPosition = null;
-
-		oIEPointRange = oIERange.duplicate();
-		oIEPointRange.collapse(true);
-
-		oPosition = this._getW3CContainerAndOffset(oIEPointRange, true);
-
-		oW3CRange.setStart(oPosition.oContainer, oPosition.iOffset);
-
-		var oCollapsedChecker = oIERange.duplicate();
-		oCollapsedChecker.collapse(true);
-		if(oCollapsedChecker.isEqual(oIERange)){
-			oW3CRange.collapse(true);
-		}else{
-			oIEPointRange = oIERange.duplicate();
-			oIEPointRange.collapse(false);
-			oPosition = this._getW3CContainerAndOffset(oIEPointRange);
-			oW3CRange.setEnd(oPosition.oContainer, oPosition.iOffset);
-		}
-
-		return oW3CRange;
-	};
-
-	this._getW3CContainerAndOffset = function(oIEPointRange, bStartPt){
-		var oRgOrigPoint = oIEPointRange;
-
-		var oContainer = oRgOrigPoint.parentElement();
-		var offset = -1;
-
-		var oRgTester = this._document.body.createTextRange();
-		var aChildNodes = xe.DOMFix.childNodes(oContainer);
-		var oPrevNonTextNode = null;
-		var pointRangeIdx = 0;
-
-		for(var i=0;i<aChildNodes.length;i++){
-			if(aChildNodes[i].nodeType == 3) continue;
-
-			oRgTester.moveToElementText(aChildNodes[i]);
-
-			if(oRgTester.compareEndPoints("StartToStart", oIEPointRange)>=0) break;
-
-			oPrevNonTextNode = aChildNodes[i];
-		}
-
-		var pointRangeIdx = i;
-
-		if(pointRangeIdx != 0 && aChildNodes[pointRangeIdx-1].nodeType == 3){
-			var oRgTextStart = this._document.body.createTextRange();
-			var oCurTextNode = null;
-			if(oPrevNonTextNode){
-				oRgTextStart.moveToElementText(oPrevNonTextNode);
-				oRgTextStart.collapse(false);
-				oCurTextNode = oPrevNonTextNode.nextSibling;
-			}else{
-				oRgTextStart.moveToElementText(oContainer);
-				oRgTextStart.collapse(true);
-				oCurTextNode = oContainer.firstChild;
-			}
-
-			var oRgTextsUpToThePoint = oRgOrigPoint.duplicate();
-			oRgTextsUpToThePoint.setEndPoint("StartToStart", oRgTextStart);
-
-			var textCount = oRgTextsUpToThePoint.text.length
-
-			while(textCount > oCurTextNode.nodeValue.length && oCurTextNode.nextSibling){
-				textCount -= oCurTextNode.nodeValue.length;
-				oCurTextNode = oCurTextNode.nextSibling;
-			}
-
-			// this will enforce IE to re-reference oCurTextNode
-			var oTmp = oCurTextNode.nodeValue;
-
-			if(bStartPt && oCurTextNode.nextSibling && oCurTextNode.nextSibling.nodeType == 3 && textCount == oCurTextNode.nodeValue.length){
-				textCount -= oCurTextNode.nodeValue.length;
-				oCurTextNode = oCurTextNode.nextSibling;
-			}
-
-			oContainer = oCurTextNode;
-			offset = textCount;
-		}else{
-			oContainer = oRgOrigPoint.parentElement();
-			offset = pointRangeIdx;
-		}
-
-		return {"oContainer" : oContainer, "iOffset" : offset};
-	};
-}
-
-xe.DOMFix = new ($.Class({
-	$init : function(){
-		if($.browser.msie || $.browser.opera){
-			this.childNodes = this._childNodes_Fix;
-			this.parentNode = this._parentNode_Fix;
-		}else{
-			this.childNodes = this._childNodes_Native;
-			this.parentNode = this._parentNode_Native;
-		}
-	},
-
-	_parentNode_Native : function(elNode){
-		return elNode.parentNode;
-	},
-
-	_parentNode_Fix : function(elNode){
-		if(!elNode) return elNode;
-
-		while(elNode.previousSibling){elNode = elNode.previousSibling;}
-
-		return elNode.parentNode;
-	},
-
-	_childNodes_Native : function(elNode){
-		return elNode.childNodes;
-	},
-
-	_childNodes_Fix : function(elNode){
-		var aResult = null;
-		var nCount = 0;
-
-		if(elNode){
-			var aResult = [];
-			elNode = elNode.firstChild;
-			while(elNode){
-				aResult[nCount++] = elNode;
-				elNode=elNode.nextSibling;
-			}
-		}
-
-		return aResult;
-	}
-}))();
-
-/**
- * @fileOverview This file contains a function that takes care of the draggable layers
- * @name N_DraggableLayer.js
- */
-xe.DraggableLayer = $.Class({
-	$init : function(oLayer, oOptions){
-		this.oOptions = $.extend({
-			bModal : "false",
-			oHandle : oLayer,
-			iMinX : -999999,
-			iMinY : -999999,
-			iMaxX : 999999,
-			iMaxY : 999999
-		}, oOptions);
-
-		this.oHandle = this.oOptions.oHandle;
-
-		oLayer.style.display = "block";
-		oLayer.style.position = "absolute";
-		oLayer.style.zIndex = "9999";
-
-		this.aBasePosition = this.getBaseOffset(oLayer);
-
-		// "number-ize" the position and set it as inline style. (the position could've been set as "auto" or set  by css, not inline style)
-		oLayer.style.top = (this.toInt($(oLayer).offset().top) - this.aBasePosition.top)+"px";
-		oLayer.style.left = (this.toInt($(oLayer).offset().left) - this.aBasePosition.left)+"px";
-
-		this.$FnMouseDown = $.fnBind(this._mousedown, this, oLayer);
-		this.$FnMouseMove = $.fnBind(this._mousemove, this, oLayer);
-		this.$FnMouseUp = $.fnBind(this._mouseup, this, oLayer);
-
-		$(this.oHandle).bind("mousedown", this.$FnMouseDown);
-	},
-
-	_mousedown : function(oLayer, oEvent){
-		if(oEvent.target.tagName == "INPUT") return;
-
-		this.MouseOffsetY = (oEvent.pageY-this.toInt(oLayer.style.top)-this.aBasePosition['top']);
-		this.MouseOffsetX = (oEvent.pageX-this.toInt(oLayer.style.left)-this.aBasePosition['left']);
-
-		$(oLayer).bind("mousemove", this.$FnMouseMove);
-		$(oLayer).bind("mouseup", this.$FnMouseUp);
-	},
-
-	_mousemove : function(oLayer, oEvent){
-		var iTop = (oEvent.pageY-this.MouseOffsetY-this.aBasePosition['top']);
-		var iLeft = (oEvent.pageX-this.MouseOffsetX-this.aBasePosition['left']);
-
-		if(iTop<this.oOptions.iMinY) iTop = this.oOptions.iMinY;
-		if(iTop>this.oOptions.iMaxY) iTop = this.oOptions.iMaxY;
-
-		if(iLeft<this.oOptions.iMinX) iLeft = this.oOptions.iMinX;
-		if(iLeft>this.oOptions.iMaxX) iLeft = this.oOptions.iMaxX;
-
-		oLayer.style.top = iTop + "px";
-		oLayer.style.left = iLeft + "px";
-	},
-
-	_mouseup : function(oLayer, oEvent){
-		$(oLayer).unbind("mousemove", this.$FnMouseMove);
-		$(oLayer).unbind("mouseup", this.$FnMouseUp);
-	},
-
-	toInt : function(num){
-		var result = parseInt(num);
-		return result || 0;
-	},
-
-	findNonStatic : function(oEl){
-		if(!oEl) return null;
-		if(oEl.tagName == "BODY") return oEl;
-
-		if($(oEl).css("position").match(/absolute|relative/i)) return oEl;
-
-		return this.findNonStatic(oEl.offsetParent);
-	},
-
-	getBaseOffset : function(oEl){
-		var oBase = this.findNonStatic(oEl.offsetParent);
-		var tmp = $(oBase).offset();
-
-		return {top: tmp.top, left: tmp.left};
-	}
-});
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the messages related to core operations
- * @name hp_CorePlugin.js
- */
-xe.CorePlugin = $.Class({
-	name : "CorePlugin",
-
-	$init : function(funcOnReady){
-		this.funcOnReady = funcOnReady;
-	},
-
-	$AFTER_MSG_APP_READY : function(){
-		this.oApp.exec("EXEC_ON_READY_FUNCTION", []);
-	},
-
-	$ON_ADD_APP_PROPERTY : function(sPropertyName, oProperty){
-		this.oApp[sPropertyName] = oProperty;
-	},
-
-	$ON_REGISTER_BROWSER_EVENT : function(obj, sEvent, sCMD, aParams, nDelay){
-		this.oApp.registerBrowserEvent(obj, sEvent, sCMD, aParams, nDelay);
-	},
-
-	$ON_DISABLE_COMMAND : function(sCommand){
-		this.oApp.disableCommand(sCommand, true);
-	},
-
-	$ON_ENABLE_COMMAND : function(sCommand){
-		this.oApp.disableCommand(sCommand, false);
-	},
-
-	$ON_EXEC_ON_READY_FUNCTION : function(){
-		if(typeof this.funcOnReady == "function") this.funcOnReady();
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that helps various operations.
- * @name hp_Utils.js
- */
- xe.Utils = $.Class({
-	name : "Utils",
-
-	$init : function(){
-		if($.browser.msie && $.browser.nVersion == 6){
-			try{
-				document.execCommand('BackgroundImageCache', false, true);
-			}catch(e){}
-		}
-	},
-
-	$ON_ATTACH_HOVER_EVENTS : function(aElms, sHoverClass){
-		sHoverClass = sHoverClass || "hover";
-
-		if(!aElms) return;
-
-		$(aElms).hover(
-			function(){$(this).addClass(sHoverClass)},
-			function(){$(this).removeClass(sHoverClass)}
-		);
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that bridges the XpressRange function
- * @name hp_XpressRangeManager.js
- */
-xe.XpressRangeManager = $.Class({
-	name : "XpressRangeManager",
-
-	oWindow : null,
-
-	$init : function(win){
-		this.oWindow = win || window;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		if(this.oWindow && this.oWindow.tagName == "IFRAME")
-			this.oWindow = this.oWindow.contentWindow;
-
-		this.oApp.exec("ADD_APP_PROPERTY", ["getSelection", $.fnBind(this.getSelection, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getEmptySelection", $.fnBind(this.getEmptySelection, this)]);
-	},
-
-	$ON_SET_EDITING_WINDOW : function(oWindow){
-		this.oWindow = oWindow;
-	},
-
-	getEmptySelection : function(){
-		var oXpressRange = new xe.XpressRange(this.oWindow);
-		return oXpressRange;
-	},
-
-	getSelection : function(){
-		this.oApp.exec("RESTORE_IE_SELECTION", []);
-
-		var oXpressRange = this.getEmptySelection();
-
-		// this may throw an exception if the selected is area is not yet shown
-		try{
-			oXpressRange.setFromSelection();
-		}catch(e){}
-
-		return oXpressRange;
-	}
-});
-//}
-xe.Hotkey = $.Class({
-	name : "Hotkey",
-
-	storage : {},
-	keyhash : {},
-
-	$init : function(){
-		this.storage = {};
-
-		this.keyhash = {
-			backspace : 8,
-			tab		  : 9,
-			enter	  : 13,
-			shift	 : 16,
-			ctrl	  : 17,
-			alt	   : 18,
-			meta	  : 224,
-			esc		  : 27,
-			space	  : 32,
-			pageup	  : 33,
-			pagedown  : 34,
-			end		  : 35,
-			home	  : 36,
-			left	  : 37,
-			up		  : 38,
-			right	  : 39,
-			down	  : 40,
-			del	  	  : 46,
-			comma	  : 188,//(,)
-			period	  : 190,//(.)
-			slash	  : 191,//(/)
-			hyphen	: 109,
-			equal	 : 61
-		};
-
-		if ($.browser.msie || $.browser.safari) {
-			this.keyhash.hyphen = 189; // (-)
-			this.keyhash.equal = 187;  // (=)
-			this.keyhash.meta  = 91;   // meta
-		}
-
-
-	},
-
-	$ON_MSG_APP_READY : function(){
-		$(this.oApp.getWYSIWYGDocument() || document).keydown($.fnBind(this.keydown, this));
-	},
-
-	$ON_REGISTER_HOTKEY : function(sHotkey, sCMD, sArgs){
-		if(!sArgs) sArgs = [];
-		var func = $.fnBind(this.oApp.exec, this.oApp, sCMD, sArgs);
-
-		sHotkey = this.normalize(sHotkey);
-		if (!sHotkey) return false;
-
-		this.add(sHotkey, func);
-	},
-
-	add : function(sHotkey, func) {
-		if (typeof this.storage[sHotkey] == 'undefined') {
-			this.storage[sHotkey] = [func];
-		} else {
-			this.storage[sHotkey].push(func);
-		}
-	},
-
-	keydown : function(event) {
-		var key  = [], kh = this.keyhash;
-
-		if ($.inArray(event.keyCode, [kh.shift, kh.ctrl, kh.alt, kh.meta]) >= 0) return;
-
-		if (event.shiftKey) key.push('shift');
-		if (event.altKey)   key.push('alt');
-		if (event.ctrlKey)  key.push('ctrl');
-		if (event.metaKey)  key.push('meta');
-		if (!key.length) return;
-		if (key.length == 1 && event.metaKey) key = ['ctrl', 'meta'];
-
-		key.push(event.keyCode);
-
-		key = key.join('+');
-
-		if (!this.storage[key]) return;
-
-		$.each(this.storage[key], function(){ this(); });
-
-		return false;
-	},
-
-	normalize : function(sHotkey) {
-		var shift, ctrl, alt, meta, key, keys = (sHotkey||"").toLowerCase().split('+');
-
-		shift = ctrl = alt = meta = key = false;
-
-		$.each(keys, function(){
-			var s = ""+this;
-			switch(s) {
-				case 'shift': shift = true;
-				case 'alt'  : alt   = true;
-				case 'ctrl' : ctrl  = true;
-				case 'meta' : meta  = true;
-				default:
-					key = s;
-			}
-		});
-
-		if (!key) return '';
-
-		keys = [];
-		if (shift) keys.push('shift');
-		if (alt) keys.push('alt');
-		if (ctrl) keys.push('ctrl');
-		if (meta || (ctrl && !shift && !alt)) keys.push('meta');
-
-		keys.push(this.keyhash[key] || key.toUpperCase().charCodeAt(0));
-
-		return keys.join('+');
-	}
-});
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the draggable layers
- * @name hp_DialogLayerManager.js
- */
-xe.DialogLayerManager = $.Class({
-	name : "DialogLayerManager",
-	aMadeDraggable : null,
-	aOpenedLayers : null,
-
-	$init : function(){
-		this.aMadeDraggable = [];
-		this.aOpenedLayers = [];
-	},
-
-	$ON_SHOW_DIALOG_LAYER : function(oLayer, bModal){
-		oLayer = $.$(oLayer);
-		bModal = $.$(bModal) || false;
-		if(!oLayer) return;
-
-		if($.inArray(oLayer, this.aOpenedLayers) != -1) return;
-
-		this.oApp.exec("POSITION_DIALOG_LAYER", [oLayer]);
-
-		this.aOpenedLayers[this.aOpenedLayers.length] = oLayer;
-
-		if($.inArray(oLayer, this.aMadeDraggable) == -1){
-			new xe.DraggableLayer(oLayer, {bModal: bModal, iMinY: 0});
-			this.aMadeDraggable[this.aMadeDraggable.length] = oLayer;
-		}else{
-			oLayer.style.display = "block";
-		}
-	},
-
-	$ON_HIDE_LAST_DIALOG_LAYER : function(){
-		this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[this.aOpenedLayers.length-1]]);
-	},
-
-	$ON_HIDE_ALL_DIALOG_LAYER : function(){
-		for(var i=this.aOpenedLayers.length-1; i>=0; i--)
-			this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[i]]);
-	},
-
-	$ON_HIDE_DIALOG_LAYER : function(oLayer){
-		oLayer = $.$(oLayer);
-
-		if(oLayer) oLayer.style.display = "none";
-		this.aOpenedLayers = $.grep(this.aOpenedLayers, function(a){return a!=oLayer});
-	},
-
-	$ON_SET_DIALOG_LAYER_POSITION : function(oLayer, iTop, iLeft){
-		oLayer.style.top = iTop;
-		oLayer.style.left = iLeft;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the layers that should disappear when the focus is lost
- * @name hp_ActiveLayerManager.js
- */
-xe.ActiveLayerManager = $.Class({
-	name : "ActiveLayerManager",
-	oCurrentLayer : null,
-
-	$ON_TOGGLE_ACTIVE_LAYER : function(oLayer, sOnOpenCmd, aOnOpenParam, sOnCloseCmd, aOnCloseParam){
-		if(oLayer == this.oCurrentLayer){
-			this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-		}else{
-			this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sOnCloseCmd, aOnCloseParam]);
-			if(sOnOpenCmd) this.oApp.exec(sOnOpenCmd, aOnOpenParam);
-		}
-	},
-
-	$ON_SHOW_ACTIVE_LAYER : function(oLayer, sOnCloseCmd, aOnCloseParam){
-		oLayer = $.$(oLayer);
-		this.sOnCloseCmd = sOnCloseCmd;
-		this.aOnCloseParam = aOnCloseParam;
-
-		var oPrevLayer = this.oCurrentLayer;
-
-		if(oLayer == oPrevLayer) return;
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-
-		oLayer.style.display = "block";
-		this.oCurrentLayer = oLayer;
-	},
-
-	$ON_HIDE_ACTIVE_LAYER : function(){
-		var oLayer = this.oCurrentLayer;
-		if(!oLayer) return;
-		oLayer.style.display = "none";
-		this.oCurrentLayer = null;
-
-		if(this.sOnCloseCmd)
-			this.oApp.exec(this.sOnCloseCmd, this.aOnCloseParam);
-	},
-
-	// for backward compatibility only.
-	// use HIDE_ACTIVE_LAYER instead!
-	$ON_HIDE_CURRENT_ACTIVE_LAYER : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYDOWN : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_EVENT_EDITING_AREA_MOUSEDOWN : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to string conversion. Ususally used to convert the IR value.
- * @name hp_StringConverterManager.js
- */
-xe.StringConverterManager = $.Class({
-	name : "StringConverterManager",
-
-	oConverters : null,
-
-	$init : function(){
-		this.oConverters = {};
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oApp.exec("ADD_APP_PROPERTY", ["applyConverter", $.fnBind(this.applyConverter, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["addConverter", $.fnBind(this.addConverter, this)]);
-	},
-
-	applyConverter : function(sRuleName, sContent){
-		var aConverters = this.oConverters[sRuleName];
-		if(!aConverters) return sContent;
-
-		for(var i=0; i<aConverters.length; i++) sContent = aConverters[i](sContent);
-
-		return sContent;
-	},
-
-	addConverter : function(sRuleName, funcConverter){
-		var aConverters = this.oConverters[sRuleName];
-		if(!aConverters) this.oConverters[sRuleName] = [];
-
-		this.oConverters[sRuleName][this.oConverters[sRuleName].length] = funcConverter;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that maps a message code to the actual message
- * @name hp_MessageManager.js
- */
-xe.MessageManager = $.Class({
-	name : "MessageManager",
-
-	oMessageMap : null,
-
-	$init : function(oMessageMap){
-		this.oMessageMap = oMessageMap;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oApp.exec("ADD_APP_PROPERTY", ["$MSG", $.fnBind(this.getMessage, this)]);
-	},
-
-	getMessage : function(sMsg){
-		if(this.oMessageMap[sMsg]) return unescape(this.oMessageMap[sMsg]);
-
-		return sMsg;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to the tool bar UI
- * @name hp_XE_Toolbar.js
- */
-xe.XE_Toolbar = $.Class({
-	name : "XE_Toolbar",
-	toolbarArea : null,
-	toolbarButton : null,
-	uiNameTag : "uiName",
-
-	sUIClassPrefix : "xpress_xeditor_ui_",
-
-	aUICmdMap : null,
-
-	$init : function(oAppContainer){
-		this.htUIList = {};
-
-		this.aUICmdMap = {};
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = $.$(oAppContainer) || document;
-		this.toolbarArea = $(".tool", oAppContainer).get(0);
-		this.welToolbarArea = $(this.toolbarArea);
-
-		this.aAllButtons = $("BUTTON", this.toolbarArea).get();
-
-		var aAllLi = this.toolbarArea.getElementsByTagName("LI");
-		var nCount = aAllLi.length;
-		var rxUI = new RegExp(this.sUIClassPrefix+"([^ ]+)");
-		for(var i=0; i<nCount; i++){
-			if(rxUI.test(aAllLi[i].className)){
-				var sUIName = RegExp.$1;
-				if(this.htUIList[sUIName] != null) continue;
-
-				this.htUIList[sUIName] = $(">*:first-child", aAllLi[i]).get(0);
-			}
-		}
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseover", "EVENT_TOOLBAR_MOUSEOVER", []);
-		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseout", "EVENT_TOOLBAR_MOUSEOUT", []);
-
-		this.oApp.exec("ADD_APP_PROPERTY", ["getToolbarButtonByUIName", $.fnBind(this.getToolbarButtonByUIName, this)]);
-	},
-
-	$ON_EVENT_TOOLBAR_MOUSEOVER : function(weEvent){
-		if(weEvent.target.tagName == "BUTTON") $(weEvent.target).addClass("hover").parent("span").addClass("hover");
-	},
-
-	$ON_EVENT_TOOLBAR_MOUSEOUT : function(weEvent){
-		if(weEvent.target.tagName == "BUTTON") $(weEvent.target).removeClass("hover").parent("span").removeClass("hover");
-	},
-
-	$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER : function(oLayer, oBtn, sOpenCmd, aOpenArgs, sCloseCmd, aCloseArgs){
-		this.oApp.exec("TOGGLE_ACTIVE_LAYER", [oLayer, "MSG_TOOLBAR_LAYER_SHOWN", [oLayer, oBtn, sOpenCmd, aOpenArgs], sCloseCmd, aCloseArgs]);
-	},
-
-	$ON_MSG_TOOLBAR_LAYER_SHOWN : function(oLayer, oBtn, aOpenCmd, aOpenArgs){
-		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
-		if(aOpenCmd) this.oApp.exec(aOpenCmd, aOpenArgs);
-	},
-
-	$ON_SHOW_TOOLBAR_ACTIVE_LAYER : function(oLayer, sCmd, aArgs, oBtn){
-		this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sCmd, aArgs]);
-		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
-	},
-
-	$ON_ENABLE_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		$(elUI).removeClass("off");
-		elUI.disabled = false;
-
-		// enable related commands
-		var sCmd = "";
-		if(this.aUICmdMap[sUIName]){
-			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
-				sCmd = this.aUICmdMap[sUIName][i];
-				this.oApp.exec("ENABLE_COMMAND", [sCmd]);
-			}
-		}
-	},
-
-	$ON_DISABLE_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		$(elUI).addClass("off");
-		$(elUI).removeClass("hover").parent("span").removeClass("hover");
-		elUI.disabled = true;
-
-		// disable related commands
-		var sCmd = "";
-		if(this.aUICmdMap[sUIName]){
-			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
-				sCmd = this.aUICmdMap[sUIName][i];
-				this.oApp.exec("DISABLE_COMMAND", [sCmd]);
-			}
-		}
-	},
-
-	$ON_SELECT_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		$(elUI).addClass("active");
-	},
-
-	$ON_DESELECT_UI : function(sUIName){
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		$(elUI).removeClass("active");
-	},
-
-	$ON_ENABLE_ALL_UI : function(){
-		var sUIName, className;
-
-		for(var sUIName in this.htUIList){
-			if(sUIName) this.oApp.exec("ENABLE_UI", [sUIName]);
-		}
-		$(this.toolbarArea).removeClass("off");
-	},
-
-	$ON_DISABLE_ALL_UI : function(){
-		var sUIName;
-
-		for(var sUIName in this.htUIList){
-			if(sUIName) this.oApp.exec("DISABLE_UI", [sUIName]);
-		}
-		$(this.toolbarArea).addClass("off");
-		this.oApp.exec("HIDE_ACTIVE_LAYER",[]);
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, attributeValue){
-		if(attributeValue == 1)
-			this.oApp.exec("SELECT_UI", [sAttributeName]);
-		else
-			this.oApp.exec("DESELECT_UI", [sAttributeName]);
-	},
-
-	$ON_REGISTER_UI_EVENT : function(sUIName, sEvent, sCmd, aParams){
-		// map cmd & ui
-		if(!this.aUICmdMap[sUIName]){this.aUICmdMap[sUIName] = [];}
-		this.aUICmdMap[sUIName][this.aUICmdMap[sUIName].length] = sCmd;
-		var elUI = this.htUIList[sUIName];
-		if(!elUI) return;
-		this.oApp.registerBrowserEvent(elUI, sEvent, sCmd, aParams);
-	},
-
-	$ON_POSITION_TOOLBAR_LAYER : function(oLayer, oBtn){
-		oLayer = $.$(oLayer);
-		oBtn = $.$(oBtn);
-
-		if(!oLayer) return;
-		if(oBtn && oBtn.tagName && oBtn.tagName == "BUTTON") oBtn.parentNode.appendChild(oLayer);
-
-		oLayer.style.left = "0";
-
-		var welLayer = $(oLayer);
-		var nLayerLeft = welLayer.offset().left;
-		nLayerLeft += oLayer.offsetWidth;
-
-		var nToolbarLeft = this.welToolbarArea.offset().left;
-		nToolbarLeft += this.toolbarArea.offsetWidth;
-
-		if(nLayerLeft > nToolbarLeft) oLayer.style.left = (nToolbarLeft-nLayerLeft-5)+"px";
-	},
-
-	getToolbarButtonByUIName : function(sUIName){
-		return this.htUIList[sUIName];
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that manages multiple number editing area plugins and the IR value
- * @name hp_XE_EditingAreaManager.js
- */
-xe.XE_EditingAreaManager = $.Class({
-	name : "XE_EditingAreaManager",
-
-	// Currently active plugin instance(XE_EditingArea_???)
-	oActivePlugin : null,
-
-	// Intermediate Representation of the content being edited.
-	// This should be a textarea element.
-	oIRField : null,
-
-	bIsDirty : false,
-
-	$init : function(sInitialMode, oIRField, oDimension, fOnBeforeUnload, oAppContainer){
-		this.sInitialMode = sInitialMode;
-		this.oIRField = $.$(oIRField);
-		this._assignHTMLObjects(oAppContainer);
-		this.fOnBeforeUnload = fOnBeforeUnload;
-
-		this.oEditingMode = {};
-
-		this.elEditingAreaContainer.style.height = parseInt(oDimension.nHeight || this.elEditingAreaContainer.offsetHeight)+"px";
-
-		this.nMinHeight = oDimension.nMinHeight || 10;
-		this.niMinWidth = oDimension.nMinWidth || 10;
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = $.$(oAppContainer) || document;
-		this.elEditingAreaContainer = $("DIV.xpress_xeditor_editing_area_container", oAppContainer).get(0);
-		this.elEditingAreaSkipUI = $("A.skip", oAppContainer).get(0);
-	},
-
-	$BEFORE_MSG_APP_READY : function(msg){
-		this.oApp.exec("ADD_APP_PROPERTY", ["elEditingAreaContainer", this.elEditingAreaContainer]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getIR", $.fnBind(this.getIR, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["setIR", this.setIR]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getEditingMode", $.fnBind(this.getEditingMode, this)]);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("CHANGE_EDITING_MODE", [this.sInitialMode, true]);
-		this.oApp.exec("LOAD_IR_FIELD", [false]);
-
-		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "focus", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
-		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "blur", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
-
-//		var fOnBeforeUnload = this.fOnBeforeUnload||function(){if(this.getIR() != this.oIRField.value || this.bIsDirty) return this.oApp.$MSG("XE_EditingAreaManager.onExit")};
-//		$(window).bind("beforeunload", $.fnBind(fOnBeforeUnload, this));
-	},
-
-	$AFTER_MSG_APP_READY : function(){
-		this.oApp.exec("UPDATE_IR_FIELD", []);
-	},
-
-	$ON_LOAD_IR_FIELD : function(bDontAddUndo){
-		this.oApp.setIR(this.oIRField.value, bDontAddUndo);
-	},
-
-	$ON_UPDATE_IR_FIELD : function(){
-		this.oIRField.value = this.oApp.getIR();
-	},
-
-	$BEFORE_CHANGE_EDITING_MODE : function(sMode){
-		this._oPrevActivePlugin = this.oActivePlugin;
-		this.oActivePlugin = this.oEditingMode[sMode];
-	},
-
-	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		if(this._oPrevActivePlugin){
-			var sIR = this._oPrevActivePlugin.getIR();
-			this.oApp.exec("SET_IR", [sIR]);
-
-			this.oApp.exec("ENABLE_UI", [this._oPrevActivePlugin.sMode]);
-
-			this._setEditingAreaDimension();
-		}
-		this.oApp.exec("DISABLE_UI", [this.oActivePlugin.sMode]);
-
-		if(!bNoFocus){
-			this.oApp.exec("FOCUS", []);
-		}
-	},
-
-	$ON_SET_IS_DIRTY : function(bIsDirty){
-		this.bIsDirty = bIsDirty;
-	},
-
-	$ON_FOCUS : function(){
-		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
-
-		this.oActivePlugin.focus();
-	},
-
-	$BEFORE_SET_IR : function(sIR, bDontAddUndoHistory){
-		bDontAddUndoHistory = bDontAddUndoHistory || false;
-		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
-	},
-
-	$ON_SET_IR : function(sIR){
-		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
-
-		this.oActivePlugin.setIR(sIR);
-	},
-
-	$AFTER_SET_IR : function(sIR, bDontAddUndoHistory){
-		bDontAddUndoHistory = bDontAddUndoHistory || false;
-		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
-	},
-
-	$ON_REGISTER_EDITING_AREA : function(oEditingAreaPlugin){
-		this.oEditingMode[oEditingAreaPlugin.sMode] = oEditingAreaPlugin;
-		this.attachDocumentEvents(oEditingAreaPlugin.oEditingArea);
-	},
-
-	$ON_MSG_EDITING_AREA_RESIZE_STARTED : function(){
-		this.oActivePlugin.elEditingArea.style.display = "none";
-
-		this.iStartingHeight = parseInt(this.elEditingAreaContainer.style.height);
-	},
-
-	$ON_RESIZE_EDITING_AREA: function(ipNewWidth, ipNewHeight){
-		var iNewWidth = parseInt(ipNewWidth);
-		var iNewHeight = parseInt(ipNewHeight);
-
-		if(iNewWidth < this.niMinWidth) iNewWidth = this.niMinWidth;
-		if(iNewHeight < this.nMinHeight) iNewHeight = this.nMinHeight;
-
-		if(ipNewWidth) this.elEditingAreaContainer.style.width = iNewWidth + "px";
-		if(ipNewHeight) this.elEditingAreaContainer.style.height = iNewHeight + "px";
-	},
-
-	$ON_RESIZE_EDITING_AREA_BY : function(ipWidthChange, ipHeightChange){
-		var iWidthChange = parseInt(ipWidthChange);
-		var iHeightChange = parseInt(ipHeightChange);
-
-		var iWidth = this.elEditingAreaContainer.style.width?parseInt(this.elEditingAreaContainer.style.width)+iWidthChange:null;
-		var iHeight = this.elEditingAreaContainer.style.height?this.iStartingHeight+iHeightChange:null;
-
-		this.oApp.exec("RESIZE_EDITING_AREA", [iWidth, iHeight]);
-	},
-
-	$ON_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
-		this.oActivePlugin.elEditingArea.style.display = "block";
-		this._setEditingAreaDimension();
-	},
-
-	_setEditingAreaDimension : function(){
-		this.oActivePlugin.elEditingArea.style.height = this.elEditingAreaContainer.style.height;
-		this.oActivePlugin.elEditingArea.style.width = this.elEditingAreaContainer.style.width;
-	},
-
-	attachDocumentEvents : function(doc){
-		this.oApp.registerBrowserEvent(doc, "click", "EVENT_EDITING_AREA_CLICK");
-		this.oApp.registerBrowserEvent(doc, "mousedown", "EVENT_EDITING_AREA_MOUSEDOWN");
-		this.oApp.registerBrowserEvent(doc, "mousemove", "EVENT_EDITING_AREA_MOUSEMOVE");
-		this.oApp.registerBrowserEvent(doc, "mouseup", "EVENT_EDITING_AREA_MOUSEUP");
-		this.oApp.registerBrowserEvent(doc, "keydown", "EVENT_EDITING_AREA_KEYDOWN");
-		this.oApp.registerBrowserEvent(doc, "keypress", "EVENT_EDITING_AREA_KEYPRESS");
-		this.oApp.registerBrowserEvent(doc, "keyup", "EVENT_EDITING_AREA_KEYUP");
-	},
-
-	getIR : function(){
-		return this.oActivePlugin.getIR();
-	},
-
-	setIR : function(sIR, bDontAddUndo){
-		this.oApp.exec("SET_IR", [sIR, bDontAddUndo]);
-	},
-
-	getEditingMode : function(){
-		return this.oActivePlugin.sMode;
-	}
-});
-//}
-
-//{
-/**
-  * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to editing the HTML source code using Textarea element
- * @name hp_XE_EditingArea_HTMLSrc.js
- * @required XE_EditingAreaManager
- */
-xe.XE_EditingArea_HTMLSrc = $.Class({
-	name : "XE_EditingArea_HTMLSrc",
-
-	sMode : "HTMLSrc",
-	textarea : null,
-
-	$init : function(textarea){
-		this.textarea = $.$(textarea);
-		this.elEditingArea = this.textarea;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oEditingArea = this.textarea;
-		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		if(sMode == this.sMode){
-			this.textarea.style.display = "block";
-		}else{
-			this.textarea.style.display = "none";
-		}
-	},
-
-	$ON_PASTE_HTML : function(sHTML, oPSelection){
-		if(this.oApp.getEditingMode() != this.sMode) return;
-
-		var o = new TextRange(this.textarea);
-		o.paste(sHTML);
-		this.textarea.focus();
-	},
-
-	getIR : function(){
-		var sIR;
-		var sContent = this.textarea.value;
-
-		if(this.oApp.applyConverter)
-			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
-		else
-			sIR = sContent;
-
-		return sIR;
-	},
-
-	setIR : function(sIR){
-		var sContent;
-
-		if(this.oApp.applyConverter)
-			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
-		else
-			sContent = sIR;
-
-		this.textarea.value = sContent;
-	},
-
-	focus : function(){
-		this.textarea.focus();
-	}
-});
-
-var TextRange = function(oEl) {
-	this._o = oEl;
-};
-
-/**
- * Selection for textfield
- * @author NHN (developer@xpressengine.com)
- */
-TextRange.prototype.getSelection = function() {
-	var obj = this._o;
-	var ret = [ -1, -1 ];
-
-	if (isNaN(this._o.selectionStart)) {
-		obj.focus();
-
-		// textarea support added by nagoon97
-		var range = document.body.createTextRange();
-		var rangeField = null;
-
-		rangeField = document.selection.createRange().duplicate();
-		range.moveToElementText(obj);
-		rangeField.collapse(true);
-		range.setEndPoint("EndToEnd", rangeField);
-		ret[0] = range.text.length;
-
-		rangeField = document.selection.createRange().duplicate();
-		range.moveToElementText(obj);
-		rangeField.collapse(false);
-		range.setEndPoint("EndToEnd", rangeField);
-		ret[1] = range.text.length;
-
-		obj.blur();
-	} else {
-		ret[0] = obj.selectionStart;
-		ret[1] = obj.selectionEnd;
-	}
-
-	return ret;
-};
-
-TextRange.prototype.setSelection = function(start, end) {
-
-	var obj = this._o;
-	if (typeof end == 'undefined') end = start;
-
-	if (obj.setSelectionRange) {
-
-		obj.setSelectionRange(start, end);
-
-	} else if (obj.createTextRange) {
-
-		var range = obj.createTextRange();
-
-		range.collapse(true);
-		range.moveStart("character", start);
-		range.moveEnd("character", end - start);
-		range.select();
-
-		obj.blur();
-	}
-
-};
-
-TextRange.prototype.copy = function() {
-
-	var r = this.getSelection();
-	return this._o.value.substring(r[0], r[1]);
-
-};
-
-TextRange.prototype.paste = function(sStr) {
-
-	var obj = this._o;
-	var sel = this.getSelection();
-
-	var value = obj.value;
-
-	var pre = value.substr(0, sel[0]);
-	var post = value.substr(sel[1]);
-
-	value = pre + sStr + post;
-	obj.value = value;
-
-	var n = 0;
-	if ( typeof document.body.style.maxHeight == "undefined" ) {
-		var a = pre.match( /\n/gi );
-		n = ( a != null ? a.length : 0 );
-	}
-	this.setSelection(sel[0] + sStr.length - n );
-
-};
-
-TextRange.prototype.cut = function() {
-	var r = this.copy();
-	this.paste('');
-
-	return r;
-};
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to WYSIWYG iframe
- * @name hp_XE_EditingArea_WYSIWYG.js
- */
-xe.XE_EditingArea_WYSIWYG = $.Class({
-	name : "XE_EditingArea_WYSIWYG",
-	status : xe.PLUGIN_STATUS["NOT_READY"],
-
-	sMode : "WYSIWYG",
-	iframe : null,
-	doc : null,
-
-	iLastUndoRecorded : 0,
-	iMinUndoInterval : 3000,
-
-	_nIFrameReadyCount : 50,
-
-	$init : function(iframe){
-		this.iframe = $.$(iframe);
-
-		this.initIframe();
-
-		this.elEditingArea = iframe;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oEditingArea = this.doc;
-		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGWindow", $.fnBind(this.getWindow, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGDocument", $.fnBind(this.getDocument, this)]);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		// uncomment this line if you wish to use the IE-style cursor in FF
-		// this.getDocument().body.style.cursor = "text";
-
-		if($.browser.msie){
-			$(this.doc).bind('keydown', $.fnBind(
-				function(weEvent){
-					if(this.doc.selection.type.toLowerCase() == 'control' && weEvent.keyCode == 8)  {
-						this.oApp.exec("EXECCOMMAND", ['delete', false, false]);
-						weEvent.preventDefault(); weEvent.stopPropagation();
-					}
-				}
-			, this));
-			$(this.doc.body).bind('mousedown', $.fnBind(
-				function(weEvent){
-					this._oIERange = null;
-					this._bIERangeReset = true;
-				}
-			, this));
-			$(this.doc.body).bind('beforedeactivate', $.fnBind(
-				function(weEvent){
-					// without this, cursor won't make it inside a table.
-					// mousedown(_oIERange gets reset) -> beforedeactivate(gets fired for table) -> RESTORE_IE_SELECTION
-					if(this._bIERangeReset) return;
-
-					var tmpRange = this.getDocument().selection.createRange(0);
-					// Control range does not have parentElement
-					if(tmpRange.parentElement && tmpRange.parentElement() && tmpRange.parentElement().tagName == "INPUT"){
-						this._oIERange = this._oPrevIERange;
-					}else{
-						this._oIERange = tmpRange;
-					}
-				}
-			, this));
-			$(this.doc.body).bind('mouseup', $.fnBind(
-				function(weEvent){
-					this._bIERangeReset = false;
-				}
-			, this));
-		}
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		if(sMode == this.sMode){
-			this.iframe.style.display = "block";
-
-			this.oApp.exec("REFRESH_WYSIWYG", []);
-			this.oApp.exec("SET_EDITING_WINDOW", [this.getWindow()]);
-		}else{
-			this.iframe.style.display = "none";
-		}
-	},
-
-	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
-		this._oIERange = null;
-	},
-
-	$ON_REFRESH_WYSIWYG : function(){
-		if(!$.browser.mozilla) return;
-
-		this._disableWYSIWYG();
-		this._enableWYSIWYG();
-	},
-
-	$ON_ENABLE_WYSIWYG : function(){
-		this._enableWYSIWYG();
-	},
-
-	$ON_DISABLE_WYSIWYG : function(){
-		this._disableWYSIWYG();
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYDOWN : function(oEvent) {
-		// ctrl-left/right add/remove indent
-		if(!oEvent.ctrlKey) return;
-
-		switch(oEvent.keyCode) {
-			// outdent
-			case 37 :
-					this.oApp.exec("EXECCOMMAND",  ["outdent", false, false]);
-				break;
-			// indent
-			case 39 :
-					this.oApp.exec("EXECCOMMAND",  ["indent", false, false]);
-				break;
-			// h1 ~ h6, normal
-			case 49 :
-			case 50 :
-			case 51 :
-			case 52 :
-			case 53 :
-			case 54 :
-					this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, '<h'+(oEvent.keyCode-48)+'>']);
-				break;
-			default :
-				return;
-		}
-		oEvent.preventDefault(); oEvent.stopPropagation();
-
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
-		// 33, 34: page up/down, 35,36: end/home, 37,38,39,40: left, up, right, down
-		if(oEvent.keyCode == 229 || oEvent.keyCode == 13 || oEvent.altKey || oEvent.ctrlKey || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 16) return;
-		this._recordUndo(oEvent);
-	},
-
-	$ON_PASTE_HTML : function(sHTML, oPSelection){
-		if(this.oApp.getEditingMode() != this.sMode) return;
-
-		var oSelection = oPSelection || this.oApp.getSelection();
-		oSelection.pasteHTML(sHTML);
-
-		// every browser except for IE may modify the innerHTML when it is inserted
-		if(!$.browser.msie){
-			var sTmpBookmark = oSelection.placeStringBookmark();
-			this.oApp.getWYSIWYGDocument().body.innerHTML = this.oApp.getWYSIWYGDocument().body.innerHTML;
-			oSelection.moveToBookmark(sTmpBookmark);
-			oSelection.collapseToEnd();
-			oSelection.select();
-			oSelection.removeStringBookmark(sTmpBookmark);
-		}
-
-		this.oApp.exec("RECORD_UNDO_ACTION", ["INSERT HTML"]);
-	},
-
-	$AFTER_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
-		this.oApp.exec("REFRESH_WYSIWYG", []);
-	},
-
-	$ON_RESTORE_IE_SELECTION : function(){
-		if(this._oIERange){
-			this._oIERange.select();
-			this._oPrevIERange = this._oIERange;
-			this._oIERange = null;
-		}
-	},
-
-	initIframe : function(){
-		try {
-			this.doc = this.iframe.contentWindow.document;
-			if (this.doc == null || this.doc.location.href == 'about:blank') {
-				throw new Error('Access denied');
-			}
-
-			this._enableWYSIWYG();
-
-			this.status = xe.PLUGIN_STATUS["READY"];
-		} catch(e) {
-			if(this._nIFrameReadyCount-- > 0){
-				setTimeout($.fnBind(this.initIframe, this), 100);
-			}else{
-				throw("iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ");
-			}
-		}
-	},
-
-	getIR : function(){
-		var sContent = this.doc.body.innerHTML;
-		var sIR;
-
-		if(this.oApp.applyConverter)
-			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
-		else
-			sIR = sContent;
-
-		return sIR;
-	},
-
-	setIR : function(sIR){
-		var sContent;
-		if(this.oApp.applyConverter)
-			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
-		else
-			sContent = sIR;
-
-		this.doc.body.innerHTML = sContent;
-
-		if($.browser.mozilla){
-			if(this.doc.body.innerHTML == "") this.doc.body.innerHTML = "<br>";
-		}
-	},
-
-	getWindow : function(){
-		return this.iframe.contentWindow;
-	},
-
-	getDocument : function(){
-		return this.iframe.contentWindow.document;
-	},
-
-	focus : function(){
-		//this.getWindow().focus();
-		//this.oApp.exec("RESTORE_IE_SELECTION", []);
-	},
-
-	_recordUndo : function(oKeyInfo){
-		var curTime = new Date();
-		if(curTime-this.iLastUndoRecorded < this.iMinUndoInterval) return;
-		this.oApp.exec("RECORD_UNDO_ACTION", ["KEYPRESS"]);
-
-		this.iLastUndoRecorded = new Date();
-
-		this.prevKeyCode = oKeyInfo.keyCode;
-	},
-
-	_enableWYSIWYG : function(){
-		if ($.browser.msie){
-			this.doc.body.disabled = true;
-			this.doc.body.contentEditable = true;
-			this.doc.body.removeAttribute('disabled');
-		} else {
-			this.doc.designMode = "on";
-		}
-	},
-
-	_disableWYSIWYG : function(){
-		if ($.browser.msie){
-			this.doc.body.contentEditable = false;
-		} else {
-			this.doc.designMode = "off";
-		}
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to resizing the editing area vertically
- * @name hp_XE_EditingAreaVerticalResizer.js
- */
-xe.XE_EditingAreaVerticalResizer = $.Class({
-	name : "XE_EditingAreaVerticalResizer",
-	oResizeGrip : null,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-
-		this.$FnMouseDown = $.fnBind(this._mousedown, this);
-		this.$FnMouseMove = $.fnBind(this._mousemove, this);
-		this.$FnMouseUp = $.fnBind(this._mouseup, this);
-
-		$(this.oResizeGrip).bind("mousedown", this.$FnMouseDown);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = $.$(oAppContainer) || document;
-
-		this.oResizeGrip = $(".xpress_xeditor_editingArea_verticalResizer", oAppContainer).get(0);
-	},
-
-	_mousedown : function(oEvent){
-		this.iStartHeight = oEvent.clientY;
-
-		$(document).bind("mousemove", this.$FnMouseMove);
-		$(document).bind("mouseup", this.$FnMouseUp);
-
-		this.oApp.exec("MSG_EDITING_AREA_RESIZE_STARTED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
-	},
-
-	_mousemove : function(oEvent){
-		var iHeightChange = oEvent.clientY - this.iStartHeight;
-
-		this.oApp.exec("RESIZE_EDITING_AREA_BY", [0, iHeightChange]);
-	},
-
-	_mouseup : function(oEvent){
-		$(document).unbind("mousemove", this.$FnMouseMove);
-		$(document).unbind("mouseup", this.$FnMouseUp);
-
-		this.oApp.exec("MSG_EDITING_AREA_RESIZE_ENDED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the basic editor commands
- * @name hp_XE_ExecCommand.js
- */
-xe.XE_ExecCommand = $.Class({
-	name : "XE_ExecCommand",
-	oEditingArea : null,
-
-	$init : function(oEditingArea){
-		this.oEditingArea = oEditingArea;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		// the right document will be available only when the src is completely loaded
-		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
-			this.oEditingArea = this.oEditingArea.contentWindow.document;
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+b", "EXECCOMMAND", ["bold", false, false]]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+u", "EXECCOMMAND", ["underline", false, false]]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+i", "EXECCOMMAND", ["italic", false, false]]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+d", "EXECCOMMAND", ["strikethrough", false, false]]);
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["bold", "click", "EXECCOMMAND", ["bold", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["underline", "click", "EXECCOMMAND", ["underline", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["italic", "click", "EXECCOMMAND", ["italic", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["lineThrough", "click", "EXECCOMMAND", ["strikethrough", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["superscript", "click", "EXECCOMMAND", ["superscript", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["subscript", "click", "EXECCOMMAND", ["subscript", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifyleft", "click", "EXECCOMMAND", ["justifyleft", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifycenter", "click", "EXECCOMMAND", ["justifycenter", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifyright", "click", "EXECCOMMAND", ["justifyright", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["justifyfull", "click", "EXECCOMMAND", ["justifyfull", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["orderedlist", "click", "EXECCOMMAND", ["insertorderedlist", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["unorderedlist", "click", "EXECCOMMAND", ["insertunorderedlist", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["outdent", "click", "EXECCOMMAND", ["outdent", false, false]]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["indent", "click", "EXECCOMMAND", ["indent", false, false]]);
-	},
-
-	$BEFORE_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
-		this._bOnlyCursorChanged = false;
-
-		this.oApp.exec("FOCUS", []);
-
-		if(sCommand.match(/^bold|underline|italic|strikethrough|superscript|subscript$/i)){
-			var oSelection = this.oApp.getSelection();
-			if(oSelection.collapsed) this._bOnlyCursorChanged = true;
-		}
-
-		if(!this._bOnlyCursorChanged){
-			this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", [sCommand]);
-		}
-	},
-
-	$ON_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
-		bUserInterface = (bUserInterface == "" || bUserInterface)?bUserInterface:false;
-		vValue = (vValue == "" || vValue)?vValue:false;
-
-		this.oEditingArea.execCommand(sCommand, bUserInterface, vValue);
-	},
-
-	$AFTER_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
-		if(!this._bOnlyCursorChanged){
-			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", [sCommand]);
-		}
-
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to wrapping the sentence around with a <P> tag when enter key is pressed
- * @name hp_XE_WYSIWYGEnterKey.js
- */
-xe.XE_WYSIWYGEnterKey = $.Class({
-	name : "XE_WYSIWYGEnterKey",
-	// IE/Opera do not need this
-	unsupportedBrowser : ['ie', 'opera'],
-	oEditingArea : null,
-
-	$init : function(oEditingArea){
-		this.oEditingArea = oEditingArea;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		// the right document will be available only when the src is completely loaded
-		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
-			this.oEditingArea = this.oEditingArea.contentWindow.document;
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYDOWN : function(oEvent){
-		if(this.oApp.getEditingMode() != "WYSIWYG") return;
-
-		if(oEvent.shiftKey) return;
-
-		if(oEvent.keyCode == 13){
-			var oSelection = this.oApp.getSelection();
-			var sBM = oSelection.placeStringBookmark();
-			var oLineInfo = oSelection.getLineInfo();
-			var oStart = oLineInfo.oStart;
-			var oEnd = oLineInfo.oEnd;
-
-			//top.document.title = oStart.oNode.tagName+":"+oStart.oNode.nodeValue+", "+oEnd.oNode.tagName+":"+oEnd.oNode.nodeValue+"::"+oStart.bParentBreak+", "+oStart.oLineBreaker.tagName;
-
-			// line broke by sibling
-			// or
-			// the parent line breaker is just a block container
-			if(!oStart.bParentBreak || oSelection.rxBlockContainer.test(oStart.oLineBreaker.tagName)){
-				oEvent.stopPropagation();
-				oEvent.preventDefault();
-
-				var oSWrapper = this.oEditingArea.createElement("P");
-				oSelection.moveToBookmark(sBM);
-				oSelection.setStartBefore(oStart.oNode);
-				oSelection.surroundContents(oSWrapper);
-
-				oSelection.collapseToEnd();
-
-				var oEWrapper = this.oEditingArea.createElement("P");
-				oSelection.setEndAfter(oEnd.oNode);
-				oSelection.surroundContents(oEWrapper);
-
-				oSelection.removeStringBookmark(sBM);
-
-				if(oSWrapper.innerHTML == "") oSWrapper.innerHTML = "<br>";
-				if(oEWrapper.innerHTML == "") oEWrapper.innerHTML = "<br>";
-
-				if(oEWrapper.nextSibling && oEWrapper.nextSibling.tagName == "BR") oEWrapper.parentNode.removeChild(oEWrapper.nextSibling);
-
-				oSelection.selectNodeContents(oEWrapper);
-				oSelection.collapseToStart();
-				oSelection.select();
-				this.oApp.exec("CHECK_STYLE_CHANGE", []);
-			}else{
-				oSelection.removeStringBookmark(sBM);
-			}
-		}
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to styling the font
- * @name hp_XE_WYSIWYGStyler.js
- * @required XE_EditingArea_WYSIWYG, XpressRangeManager
- */
-xe.XE_WYSIWYGStyler = $.Class({
-	name : "XE_WYSIWYGStyler",
-
-	$PRECONDITION : function(sFullCommand, aArgs){
-		return (this.oApp.getEditingMode() == "WYSIWYG");
-	},
-
-	$ON_SET_WYSIWYG_STYLE : function(oStyles){
-		var oSelection = this.oApp.getSelection();
-
-		// style cursor
-		if(oSelection.collapsed){
-			var oSpan = this.oApp.getWYSIWYGDocument().createElement("SPAN");
-			oSelection.insertNode(oSpan);
-			oSpan.innerHTML = unescape("%uFEFF");
-
-			var sValue;
-			for(var sName in oStyles){
-				sValue = oStyles[sName];
-
-				if(typeof sValue != "string") continue;
-
-				oSpan.style[sName] = sValue;
-			}
-
-			oSelection.selectNodeContents(oSpan);
-			oSelection.collapseToEnd();
-			oSelection._window.focus();
-			oSelection._window.document.body.focus();
-			oSelection.select();
-
-			// FF3 will actually display %uFEFF when it is followed by a number AND certain font-family is used(like Gulim), so remove the chcaracter for FF3
-			if($.browser.mozilla && $.browser.nVersion == 3)
-				oSpan.innerHTML = "";
-
-			return;
-		}
-
-		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["FONT STYLE"]);
-
-		oSelection.styleRange(oStyles);
-		oSelection._window.focus();
-		oSelection.select();
-
-		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["FONT STYLE"]);
-	}
-});
-//}
-
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to detecting the style change
- * @name hp_XE_WYSIWYGStyleGetter.js
- */
-xe.XE_WYSIWYGStyleGetter = $.Class({
-	name : "XE_WYSIWYGStyleGetter",
-
-	hKeyUp : null,
-
-	getStyleInterval : 200,
-
-	oStyleMap : {
-		fontFamily : {
-			type : "Value",
-			css : "fontFamily"
-		},
-		fontSize : {
-			type : "Value",
-			css : "fontSize"
-		},
-		lineHeight : {
-			type : "Value",
-			css : "lineHeight",
-			converter : function(sValue, oStyle){
-				if(!sValue.match(/px$/)) return sValue;
-
-				return Math.ceil((parseInt(sValue)/parseInt(oStyle.fontSize))*10)/10;
-			}
-		},
-		bold : {
-			command : "bold"
-		},
-		underline : {
-			command : "underline"
-		},
-		italic : {
-			command : "italic"
-		},
-		lineThrough : {
-			command : "strikethrough"
-		},
-		superscript : {
-			command : "superscript"
-		},
-		subscript : {
-			command : "subscript"
-		},
-		justifyleft : {
-			command : "justifyleft"
-		},
-		justifycenter : {
-			command : "justifycenter"
-		},
-		justifyright : {
-			command : "justifyright"
-		},
-		justifyfull : {
-			command : "justifyfull"
-		},
-		orderedlist : {
-			command : "insertorderedlist"
-		},
-		unorderedlist : {
-			command : "insertunorderedlist"
-		}
-	},
-
-	$init : function(){
-		this.oStyle = this._getBlankStyle();
-	},
-
-	$PRECONDITION : function(){
-		if(this.oApp.getEditingMode() != "WYSIWYG") return false;
-
-		return true;
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oDocument = this.oApp.getWYSIWYGDocument();
-		this.oApp.exec("ADD_APP_PROPERTY", ["getCurrentStyle", $.fnBind(this.getCurrentStyle, this)]);
-	},
-
-	$ON_EVENT_EDITING_AREA_MOUSEUP : function(oEvnet){
-		if(this.hKeyUp) clearTimeout(this.hKeyUp);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
-		/*
-		backspace 8
-		page up 33
-		page down 34
-		end 35
-		home 36
-		left arrow 37
-		up arrow 38
-		right arrow 39
-		down arrow 40
-		insert 45
-		delete 46
-		*/
-		if(!(oEvent.keyCode == 8 || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 45 || oEvent.keyCode == 46)) return;
-
-		if(this.hKeyUp) clearTimeout(this.hKeyUp);
-
-		this.hKeyUp = setTimeout($.fnBind(this.oApp.exec, this.oApp, "CHECK_STYLE_CHANGE", []), this.getStyleInterval);
-	},
-
-	$ON_CHECK_STYLE_CHANGE : function(){
-		this._getStyle();
-	},
-
-	$ON_RESET_STYLE_STATUS : function(){
-		var oBlankStyle = this._getBlankStyle();
-		for(var sAttributeName in oBlankStyle)
-			this.oApp.exec("SET_STYLE_STATUS", [sAttributeName, oBlankStyle[sAttributeName]]);
-	},
-
-	getCurrentStyle : function(){
-		return this.oStyle;
-	},
-
-	_check_style_change : function(){
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-	_getBlankStyle : function(){
-		var oBlankStyle = {};
-		for(var attributeName in this.oStyleMap){
-			if(this.oStyleMap[attributeName].type == "Value")
-				oBlankStyle[attributeName] = "";
-			else
-				oBlankStyle[attributeName] = 0;
-		}
-
-		return oBlankStyle;
-	},
-
-	_getStyle : function(){
-		var oSelection = this.oApp.getSelection();
-
-		var funcFilter = function(oNode){
-			if (!oNode.childNodes || oNode.childNodes.length == 0)
-				return true;
-			else
-				return false;
-		}
-
-		var aBottomNodes = oSelection.getNodes(false, funcFilter);
-
-		var oStyle, oBaseStyle, oTmpStyle, attributeName;
-		if(aBottomNodes.length == 0){
-			oStyle = this._getStyleOf(oSelection.commonAncestorContainer);
-		}else{
-			oStyle = this._getStyleOf(aBottomNodes[0]);
-		}
-
-		for(attributeName in oStyle){
-			if(this.oStyleMap[attributeName].converter){
-				oStyle[attributeName] = this.oStyleMap[attributeName].converter(oStyle[attributeName], oStyle);
-			}
-
-			if(this.oStyle[attributeName] != oStyle[attributeName])
-				this.oApp.exec("MSG_STYLE_CHANGED", [attributeName, oStyle[attributeName]]);
-		}
-
-		this.oStyle = oStyle;
-	},
-
-	_getStyleOf : function(oNode){
-		var oStyle = this._getBlankStyle();
-
-		// this must not happen
-		if(!oNode) return oStyle;
-
-		if(oNode.nodeType == 3) oNode = oNode.parentNode;
-
-		var welNode = $(oNode);
-		var attribute, cssName;
-		for(var styleName in this.oStyle){
-			attribute = this.oStyleMap[styleName];
-
-			if(attribute.type && attribute.type == "Value"){
-				if(attribute.css){
-					var sValue = welNode.css(attribute.css);
-
-					if(styleName == "fontFamily"){
-						sValue = sValue.split(/,/)[0];
-					}
-
-					oStyle[styleName] = sValue;
-				}else{
-					if(attribute.command){
-						try{
-							oStyle[styleName] = this.oDocument.queryCommandState(attribute.command);
-						}catch(e){}
-					}else{
-						// todo
-					}
-				}
-			}else{
-				if(attribute.command){
-					try{
-						if(this.oDocument.queryCommandState(attribute.command)){
-							oStyle[styleName] = 1;
-						}else{
-							oStyle[styleName] = 0;
-						}
-					}catch(e){}
-				}else{
-					// todo
-				}
-			}
-		}
-		return oStyle;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font size using Select element
- * @name hp_XE_FontSizeWithSelectUI.js
- */
-xe.XE_FontSizeWithSelectUI = $.Class({
-	name : "XE_FontSizeWithSelectUI",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elFontSizeSelect = $("SELECT.xpress_xeditor_ui_fontSize_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elFontSizeSelect, "change", "SET_FONTSIZE_FROM_SELECT_UI");
-		this.elFontSizeSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		if(sAttributeName == "fontSize"){
-			this.elFontSizeSelect.value = sAttributeValue;
-			if(this.elFontSizeSelect.selectedIndex < 0) this.elFontSizeSelect.selectedIndex = 0;
-		}
-	},
-
-	$ON_SET_FONTSIZE_FROM_SELECT_UI : function(){
-		var sFontSize = this.elFontSizeSelect.value;
-		if(!sFontSize) return;
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontSize":sFontSize}]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font name using Select element
- * @name hp_XE_FontNameWithSelectUI.js
- */
-xe.XE_FontNameWithSelectUI = $.Class({
-	name : "XE_FontNameWithSelectUI",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elFontNameSelect = $("SELECT.xpress_xeditor_ui_fontName_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elFontNameSelect, "change", "SET_FONTNAME_FROM_SELECT_UI");
-		this.elFontNameSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		if(sAttributeName == "fontFamily"){
-			this.elFontNameSelect.value = sAttributeValue.toLowerCase();
-			if(this.elFontNameSelect.selectedIndex < 0) this.elFontNameSelect.selectedIndex = 0;
-		}
-	},
-
-	$ON_SET_FONTNAME_FROM_SELECT_UI : function(){
-		var sFontName = this.elFontNameSelect.value;
-		if(!sFontName) return;
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontFamily":sFontName}]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to setting/changing the lineheight
- * @name hp_XE_LineHeight.js
- */
-xe.XE_LineHeight = $.Class({
-	name : "XE_LineHeight",
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-	},
-
-	$ON_SET_LINEHEIGHT : function(nLineHeight){
-		this.setLineHeight(nLineHeight);
-	},
-
-	getLineHeight : function(){
-		var nodes = this._getSelectedNodes(false);
-
-		var curWrapper, prevWrapper;
-		var iCurHeight, iHeight;
-
-		if(nodes.length == 0) return -1;
-
-		var iLength = nodes.length;
-
-		if(iLength == 0){
-			iHeight = -1;
-		}else{
-			prevWrapper = this._getLineWrapper(nodes[0]);
-			iHeight = this._getWrapperLineheight(prevWrapper);
-		}
-
-		var firstNode = this.oSelection.getStartNode();
-
-		if(iHeight > 0){
-			for(var i=1; i<iLength; i++){
-				if(this._isChildOf(nodes[i], curWrapper)) continue;
-				if(!nodes[i]) continue;
-
-				curWrapper = this._getLineWrapper(nodes[i]);
-				if(curWrapper == prevWrapper) continue;
-
-				curHeight = this._getWrapperLineheight(curWrapper);
-
-				if(curHeight != iHeight){
-					iHeight = -1;
-					break;
-				}
-
-				prevWrapper = curWrapper;
-			}
-		}
-
-		curWrapper = this._getLineWrapper(nodes[iLength-1]);
-
-		var lastNode = this.oSelection.getEndNode();
-
-		selectText = $.fnBind(function(firstNode, lastNode){
-			this.oSelection.setEndNodes(firstNode, lastNode);
-			this.oSelection.select();
-		}, this, firstNode, lastNode);
-
-		setTimeout(selectText, 100);
-
-		return iHeight;
-	},
-
-	// height in percentage. For example pass 1 to set the line height to 100% and 1.5 to set it to 150%
-	setLineHeight : function(height) {
-		thisRef = this;
-
-		function _setLineheight(div, height){
-			if(!div){
-				// try to wrap with P first
-				try{
-					div = thisRef.oSelection.surroundContentsWithNewNode("P");
-				// if the range contains a block-level tag, wrap it with a DIV
-				}catch(e){
-					div = thisRef.oSelection.surroundContentsWithNewNode("DIV");
-				}
-			}
-
-			div.style.lineHeight = height;
-
-			return div;
-		}
-
-		function isInBody(node){
-			while(node && node.tagName != "BODY"){
-				node = xe.DOMFix.parentNode(node);
-			}
-			if(!node) return false;
-
-			return true;
-		}
-
-		var nodes = this._getSelectedNodes(false);
-		if(nodes.length == 0){
-			return;
-		}
-
-		var curWrapper, prevWrapper;
-		var iLength = nodes.length;
-
-		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["LINEHEIGHT"]);
-
-		prevWrapper = this._getLineWrapper(nodes[0]);
-		prevWrapper = _setLineheight(prevWrapper, height);
-
-		var startNode = prevWrapper;
-		var endNode = prevWrapper;
-
-		for(var i=1; i<iLength; i++){
-			// Skip the node if a copy of the node were wrapped and the actual node no longer exists within the document.
-			try{
-				if(!isInBody(xe.DOMFix.parentNode(nodes[i]))) continue;
-			}catch(e){continue;}
-
-			if(this._isChildOf(nodes[i], curWrapper)) continue;
-
-			curWrapper = this._getLineWrapper(nodes[i]);
-
-			if(curWrapper == prevWrapper) continue;
-
-			curWrapper = _setLineheight(curWrapper, height);
-
-			prevWrapper = curWrapper;
-		}
-
-		endNode = curWrapper || startNode;
-
-		setTimeout($.fnBind(function(startNode, endNode){
-			this.oSelection.setEndNodes(startNode, endNode);
-			this.oSelection.select();
-			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["LINEHEIGHT"]);
-		}, this, startNode, endNode), 100);
-	},
-	_getSelectedNodes : function(bDontUpdate){
-		if(!bDontUpdate)
-			this.oSelection = this.oApp.getSelection();
-
-		if(this.oSelection.collapsed) this.oSelection.selectNode(this.oSelection.commonAncestorContainer);
-
-		var nodes = this.oSelection.getTextNodes();
-
-		if(nodes.length == 0){
-			var tmp = this.oSelection.getStartNode();
-			if(tmp){
-				nodes[0] = tmp;
-			}else{
-				nodes = [];
-			}
-		}
-
-		return nodes;
-	},
-	_getWrapperLineheight : function(div){
-		var iLineHeight = '';
-		if(div && div.style.lineHeight){
-			iLineHeight = div.style.lineHeight;
-		}else{
-			div = this.oSelection.commonAncesterContainer;
-			while(div && !this.oSelection.rxLineBreaker.test(div.tagName)){
-				if(div && div.style.lineHeight){
-					iLineHeight = div.style.lineHeight;
-					break;
-				}
-				div = xe.DOMFix.parentNode(div);
-			}
-		}
-
-		return iLineHeight;
-	},
-
-	_isChildOf : function(node, container){
-		while(node && node.tagName != "BODY"){
-			if(node == container) return true;
-			node = xe.DOMFix.parentNode(node);
-		}
-
-		return false;
-	},
- 	_getLineWrapper : function(node){
-		var oTmpSelection = this.oApp.getEmptySelection();
-		oTmpSelection.selectNode(node);
-		var oLineInfo = oTmpSelection.getLineInfo();
-		var oStart = oLineInfo.oStart;
-		var oEnd = oLineInfo.oEnd;
-
-		var a, b;
-		var breakerA, breakerB;
-		var div = null;
-
-		a = oStart.oNode;
-		breakerA = oStart.oLineBreaker;
-		b = oEnd.oNode;
-		breakerB = oEnd.oLineBreaker;
-
-		this.oSelection.setEndNodes(a, b);
-
-		if(breakerA == breakerB){
-			if(breakerA.tagName == "P" || breakerA.tagName == "DIV"){
-				div = breakerA;
-			}else{
-				this.oSelection.setEndNodes(breakerA.firstChild, breakerA.lastChild);
-			}
-		}
-
-		return div;
- 	}
- });
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the lineheight using Select element
- * @name hp_XE_LineHeightWithSelectUI.js
- */
-xe.XE_LineHeightWithSelectUI = $.Class({
-	name : "XE_LineHeightWithSelectUI",
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elLineHeightSelect = $("SELECT.xpress_xeditor_ui_lineHeight_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elLineHeightSelect, "change", "SET_LINEHEIGHT_FROM_SELECT_UI");
-		this.elLineHeightSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		if(sAttributeName == "lineHeight"){
-			this.elLineHeightSelect.value = sAttributeValue;
-			if(this.elLineHeightSelect.selectedIndex < 0) this.elLineHeightSelect.selectedIndex = 0;
-		}
-	},
-
-	$ON_SET_LINEHEIGHT_FROM_SELECT_UI : function(){
-		var nLineHeight = this.elLineHeightSelect.value;
-		if(!nLineHeight) return;
-
-		this.elLineHeightSelect.selectedIndex = 0;
-		this.oApp.exec("SET_LINEHEIGHT", [nLineHeight]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-}).extend(xe.XE_LineHeight);
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to the color palette
- * @name hp_XE_ColorPalette.js
- */
- xe.XE_ColorPalette = $.Class({
-	name : "XE_ColorPalette",
-	rxRGBColorPattern : /rgb\((\d+), ?(\d+), ?(\d+)\)/i,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		this.elColorPaletteLayer = $("UL.xpress_xeditor_color_palette", oAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elColorPaletteLayer, "click", "EVENT_MOUSEUP_COLOR_PALETTE");
-	},
-
-	$ON_SHOW_COLOR_PALETTE : function(sCallbackCmd, oLayerContainer){
-		this.sCallbackCmd = sCallbackCmd;
-		this.oLayerContainer = oLayerContainer;
-
-		this.oLayerContainer.insertBefore(this.elColorPaletteLayer, null);
-
-		this.elColorPaletteLayer.style.display = "block";
-	},
-
-	$ON_HIDE_COLOR_PALETTE : function(){
-		this.elColorPaletteLayer.style.display = "none";
-	},
-
-	$ON_COLOR_PALETTE_APPLY_COLOR : function(sColorCode){
-		if(this.rxRGBColorPattern.test(sColorCode)){
-
-			function dec2Hex(sDec){
-				var sTmp = parseInt(sDec).toString(16);
-				if(sTmp.length<2) sTmp = "0"+sTmp;
-				return sTmp.toUpperCase();
-			}
-
-			var sR = dec2Hex(RegExp.$1);
-			var sG = dec2Hex(RegExp.$2);
-			var sB = dec2Hex(RegExp.$3);
-			sColorCode = "#"+sR+sG+sB;
-		}
-		this.oApp.exec(this.sCallbackCmd, [sColorCode]);
-	},
-
-	$ON_EVENT_MOUSEUP_COLOR_PALETTE : function(oEvent){
-		var elButton = oEvent.target;
-		if(! elButton.style.backgroundColor) return;
-
-		this.oApp.exec("COLOR_PALETTE_APPLY_COLOR", [elButton.style.backgroundColor]);
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font color
- * @name hp_XE_FontColor.js
- */
-xe.XE_FontColor = $.Class({
-	name : "XE_FontColor",
-	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elDropdownLayer = $("DIV.xpress_xeditor_fontcolor_layer", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["fontColor", "click", "TOGGLE_FONTCOLOR_LAYER"]);
-	},
-
-	$ON_TOGGLE_FONTCOLOR_LAYER : function(){
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_FONTCOLOR", this.elDropdownLayer]]);
-	},
-
-	$ON_APPLY_FONTCOLOR : function(sFontColor){
-		if(!this.rxColorPattern.test(sFontColor)){
-			alert(this.oApp.$MSG("XE_FontColor.invalidColorCode"));
-			return;
-		}
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [{"color":sFontColor}]);
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER");
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of changing the background color
- * @name hp_XE_BGColor.js
- */
-xe.XE_BGColor = $.Class({
-	name : "XE_BGColor",
-	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elDropdownLayer = $("DIV.xpress_xeditor_bgcolor_layer", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["bgColor", "click", "TOGGLE_BGCOLOR_LAYER"]);
-
-		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_BGCOLOR", []);
-	},
-
-	$ON_TOGGLE_BGCOLOR_LAYER : function(){
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_BGCOLOR", this.elDropdownLayer]]);
-	},
-
-	$ON_EVENT_APPLY_BGCOLOR : function(weEvent){
-		var elButton = weEvent.target;
-
-		// Safari/Chrome/Opera may capture the event on Span
-		if(elButton.tagName == "SPAN") elButton = elButton.parentNode;
-		if(elButton.tagName != "BUTTON") return;
-
-		var sBGColor, sFontColor;
-
-		sBGColor = elButton.style.backgroundColor;
-		sFontColor = elButton.style.color;
-
-		this.oApp.exec("APPLY_BGCOLOR", [sBGColor, sFontColor]);
-	},
-
-	$ON_APPLY_BGCOLOR : function(sBGColor, sFontColor){
-		if(!this.rxColorPattern.test(sBGColor)){
-			alert(this.oApp.$MSG("XE_BGColor.invalidColorCode"));
-			return;
-		}
-
-		var oStyle = {"backgroundColor": sBGColor}
-		if(sFontColor) oStyle.color = sFontColor;
-
-		this.oApp.exec("SET_WYSIWYG_STYLE", [oStyle]);
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER");
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to quote
- * @name hp_XE_Quote.js
- * @required XE_EditingArea_WYSIWYG
- */
-xe.XE_Quote = $.Class({
-	name : "XE_Quote",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elDropdownLayer = $("DIV.xpress_xeditor_blockquote_layer", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY: function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["quote", "click", "TOGGLE_BLOCKQUOTE_LAYER"]);
-
-		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_SEDITOR_BLOCKQUOTE", []);
-	},
-
-	$ON_TOGGLE_BLOCKQUOTE_LAYER : function(){
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
-	},
-
-	$ON_EVENT_APPLY_SEDITOR_BLOCKQUOTE : function(weEvent){
-		var elButton = weEvent.target;
-		if(elButton.tagName != "BUTTON") return;
-
-		var sClass = elButton.parentNode.className;
-
-		if(sClass != "q8")
-			this._wrapBlock("BLOCKQUOTE", sClass);
-		else
-			this._unwrapBlock("BLOCKQUOTE");
-
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	_unwrapBlock : function(tag){
-		var oSelection = this.oApp.getSelection();
-		var oC = oSelection.commonAncestorContainer;
-
-		while(oC && oC.tagName != tag) oC = oC.parentNode;
-		if(!oC) return;
-
-		while(oC.firstChild) oC.parentNode.insertBefore(oC.firstChild, oC);
-
-		oC.parentNode.removeChild(oC);
-	},
-
-	_wrapBlock : function(tag, className){
-		var oSelection = this.oApp.getSelection();
-		var oLineInfo = oSelection.getLineInfo();
-		var oStart = oLineInfo.oStart;
-		var oEnd = oLineInfo.oEnd;
-
-		var rxDontUseAsWhole = /BODY|TD|LI/i;
-
-		var oStartNode, oEndNode;
-
-		if(oStart.bParentBreak && !rxDontUseAsWhole.test(oStart.oLineBreaker.tagName)) oStartNode = oStart.oNode.parentNode;
-		else oStartNode = oStart.oNode;
-
-		if(oEnd.bParentBreak && !rxDontUseAsWhole.test(oEnd.oLineBreaker.tagName)) oEndNode = oEnd.oNode.parentNode;
-		else oEndNode = oEnd.oNode;
-
-		oSelection.setStartBefore(oStartNode);
-		oSelection.setEndAfter(oEndNode);
-
-		var oNode = this._expandToTableStart(oSelection, oEndNode);
-		if(oNode){
-			oEndNode = oNode;
-			oSelection.setEndAfter(oNode);
-		}
-
-		oNode = this._expandToTableStart(oSelection, oStartNode);
-		if(oNode){
-			oStartNode = oNode;
-			oSelection.setStartBefore(oNode);
-		}
-
-		oNode = oStartNode;
-		var oC = oSelection.commonAncestorContainer;
-
-		// find the insertion position for the formatting tag right beneath the common ancestor container
-		while(oNode && oNode != oC && oNode.parentNode != oC) oNode = oNode.parentNode;
-
-		oFormattingNode = oSelection._document.createElement(tag);
-		if(className) oFormattingNode.className = className;
-
-		if(oNode == oC){
-			oC.insertBefore(oFormattingNode, oC.firstChild);
-		}else{
-			oC.insertBefore(oFormattingNode, oNode);
-		}
-
-		oSelection.setStartAfter(oFormattingNode);
-
-		oSelection.setEndAfter(oEndNode);
-		oSelection.surroundContents(oFormattingNode);
-
-		var aNodes = oFormattingNode.childNodes;
-		var oInsertionPoint;
-		for(var i=aNodes.length-1; i>=0; i--){
-			if(aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR"){
-				var oP = oSelection._document.createElement("P");
-				oInsertionPoint = aNodes[i].nextSibling;
-				while(i>=0 && aNodes[i] && (aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR")){
-					oP.insertBefore(aNodes[i--], oP.firstChild);
-				}
-				oFormattingNode.insertBefore(oP, oInsertionPoint);
-				i++;
-			}
-		}
-
-		if(oFormattingNode && oFormattingNode.parentNode){
-			var oP = oSelection._document.createElement("P");
-			oP.innerHTML = unescape("<br/>");
-			oFormattingNode.parentNode.insertBefore(oP, oFormattingNode.nextSibling);
-		}
-
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Block Quote"]);
-
-		return oFormattingNode;
-	},
-
-	_expandToTableStart : function(oSelection, oNode){
-		var oC = oSelection.commonAncestorContainer;
-		var oResultNode = null;
-
-		var bLastIteration = false;
-		while(oNode && !bLastIteration){
-			if(oNode == oC) bLastIteration = true;
-
-			if(/TBODY|TFOOT|THEAD|TR/i.test(oNode.tagName)){
-				oResultNode = this._getTableRoot(oNode);
-				break;
-			}
-			oNode = oNode.parentNode;
-		}
-
-		return oResultNode;
-	},
-
-	_getTableRoot : function(oNode){
-		while(oNode && oNode.tagName != "TABLE") oNode = oNode.parentNode;
-
-		return oNode;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to inserting special characters
- * @name hp_XE_SCharacter.js
- * @required XpressRangeManager
- */
-xe.XE_SCharacter = $.Class({
-	name : "XE_SCharacter",
-
-	$init : function(oAppContainer){
-		this.bIE = $.browser.msie;
-
-		this._assignHTMLObjects(oAppContainer);
-
-		this.charSet = [];
-		this.charSet[0] = unescape('FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[1] = unescape('%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[2] = unescape('3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[3] = unescape('3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[4] = unescape('0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-		this.charSet[5] = unescape('3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		oAppContainer = $.$(oAppContainer) || document;
-
-		this.elDropdownLayer = $("DIV.xpress_xeditor_sCharacter_layer", oAppContainer).get(0);
-
-		this.oTextField = $("INPUT", this.elDropdownLayer).get(0);
-		this.oInsertButton = $("+ BUTTON", this.oTextField).get(0);
-		this.aCloseButton = $("BUTTON.close", this.elDropdownLayer).get();
-		this.aSCharList = $(".list", this.elDropdownLayer).get();
-		var oLabelUL = $(">UL", this.elDropdownLayer).get(0);
-		this.aLabelA = $("A", oLabelUL).get();
-	},
-
-	$ON_MSG_APP_READY : function(){
-		var funcInsert = $.fnBind(this.oApp.exec, this.oApp, "INSERT_SCHARACTERS", [this.oTextField.value]);
-		$(this.oInsertButton).click(funcInsert, this);
-
-		this.oApp.exec("SET_SCHARACTER_LIST", [this.charSet]);
-
-		for(var i=0; i<this.aLabelA.length; i++){
-			var func = $.fnBind(this.oApp.exec, this.oApp, "CHANGE_SCHARACTER_SET", [i]);
-			$(this.aLabelA[i]).mousedown(func);
-
-			this._stopBrowserEvent(this.aLabelA[i], "click");
-		}
-
-		for(var i=0; i<this.aCloseButton.length; i++){
-			this.oApp.registerBrowserEvent(this.aCloseButton[i], "click", "HIDE_ACTIVE_LAYER", []);
-		}
-
-		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_SCHARACTER_CLICKED", []);
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["sCharacter", "click", "TOGGLE_SCHARACTER_LAYER"]);
-	},
-
-	$ON_TOGGLE_SCHARACTER_LAYER : function(){
-		this.oTextField.value = "";
-		this.oSelection = this.oApp.getSelection();
-
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
-	},
-
-	$ON_EVENT_SCHARACTER_CLICKED : function(weEvent){
-		var elButton = weEvent.target;
-		if(elButton.tagName != "BUTTON") return;
-		if(elButton.parentNode.tagName != "LI") return;
-
-		var sChar = elButton.firstChild.innerHTML;
-
-		this.oApp.exec("SELECT_SCHARACTER", [sChar]);
-	},
-
-	$ON_SELECT_SCHARACTER : function(schar){
-		this.oTextField.value += schar;
-
-		if(this.oTextField.createTextRange){
-			var oTextRange = this.oTextField.createTextRange();
-			oTextRange.collapse(false);
-			oTextRange.select();
-		}else{
-			if(this.oTextField.selectionEnd){
-				this.oTextField.selectionEnd = this.oTextField.value.length;
-				this.oTextField.focus();
-			}
-		}
-	},
-
-	$ON_INSERT_SCHARACTERS : function(){
-		this.oSelection.pasteHTML(this.oTextField.value);
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_CHANGE_SCHARACTER_SET : function(nSCharSet){
-		for(var i=0; i<this.aSCharList.length; i++){
-			if(this.aSCharList[i].style.display == "block"){
-				if(i == nSCharSet) return;
-
-				$(this.aLabelA[i]).removeClass("on");
-				this.aSCharList[i].style.display = "none";
-			}
-		}
-
-		this._drawSCharList(nSCharSet);
-		$(this.aLabelA[nSCharSet]).addClass("on");
-		this.aSCharList[nSCharSet].style.display = "block";
-	},
-
-	$ON_SET_SCHARACTER_LIST : function(charSet){
-		this.charSet = charSet;
-		this.bSCharSetDrawn = new Array(this.charSet.length);
-		this._drawSCharList(0);
-	},
-
-	_drawSCharList : function(i){
-		if(this.bSCharSetDrawn[i]) return;
-		this.bSCharSetDrawn[i] = true;
-
-		var len = this.charSet[i].length;
-		var aLI = new Array(len);
-
-		this.aSCharList[i].innerHTML = '';
-
-		var button, span;
-		for(var ii=0; ii<len; ii++){
-			aLI[ii] = document.createElement("LI");
-
-			aLI[ii].innerHTML = '<button type="button"><span>'+unescape(this.charSet[i][ii])+'</span></button>';
-			this.aSCharList[i].appendChild(aLI[ii]);
-		}
-
-		// enable this after Jindo framework is updated
-//		this.oApp.exec("ATTACH_HOVER_EVENTS", [$(">LI>BUTTON", this.aSCharList[i])]).get();
-	},
-
-	_stopBrowserEvent : function(obj, sEvent){
-		$(obj).bind(sEvent, function(e){e.stopPropagation();e.preventDefault();} )
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to Undo/Redo
- * @name hp_XE_UndoRedo.js
- * @required XE_EditingAreaManager, XpressRangeManager
- */
-xe.XE_UndoRedo = $.Class({
-	name : "XE_UndoRedo",
-	actionHistory : null,
-	// this may also be called, lastAdded/lastRestored
-	oCurStateIdx : null,
-	iMinimumSizeChange : 10,
-	sBlankContentsForFF : "<br>",
-
-	$init : function(){
-		this.aUndoHistory = [];
-		this.oCurStateIdx = {nIdx: 0, nStep: 0};
-	},
-
-	$PRECONDITION : function(sCmd){
-		if(sCmd.match(/_DO_RECORD_UNDO_HISTORY_AT$/)) return true;
-
-		try{
-			if(this.oApp.getEditingMode() != "WYSIWYG") return false;
-		}catch(e){
-			return false;
-		}
-
-		return true;
-	},
-
-	$BEFORE_MSG_APP_READY : function(){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [this.oCurStateIdx, "", "", null]);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.bFF = $.browser.mozilla;
-
-		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoHistory", $.fnBind(this.getUndoHistory, this)]);
-		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoStateIdx", $.fnBind(this.getUndoStateIdx, this)]);
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["undo", "click", "UNDO"]);
-		this.oApp.exec("REGISTER_UI_EVENT", ["redo", "click", "REDO"]);
-
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+z", "UNDO"]);
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+y", "REDO"]);
-	},
-
-	$ON_UNDO : function(){
-		var oTmpStateIdx = {};
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", ["KEYPRESS", false, false, 1]);
-		if(this.oCurStateIdx.nIdx == 0) return;
-
-		if(this.oCurStateIdx.nStep > 0){
-			this.oCurStateIdx.nStep--;
-		}else{
-			var oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-
-			this.oCurStateIdx.nIdx--;
-
-			if(oTmpHistory.nTotalSteps>1){
-				this.oCurStateIdx.nStep = 0;
-			}else{
-				oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-				this.oCurStateIdx.nStep = oTmpHistory.nTotalSteps-1;
-			}
-		}
-
-		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
-
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-
-	$ON_REDO : function(){
-		if(this.oCurStateIdx.nIdx >= this.aUndoHistory.length) return;
-
-		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-		if(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1 && this.oCurStateIdx.nStep >= oCurHistory.nTotalSteps-1) return;
-
-		if(this.oCurStateIdx.nStep < oCurHistory.nTotalSteps-1){
-			this.oCurStateIdx.nStep++;
-		}else{
-			this.oCurStateIdx.nIdx++;
-			oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-			this.oCurStateIdx.nStep = oCurHistory.nTotalSteps-1;
-		}
-
-		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
-
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	},
-
-	$ON_RECORD_UNDO_ACTION : function(sAction){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction]);
-	},
-
-	$ON_RECORD_UNDO_BEFORE_ACTION : function(sAction){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, true]);
-	},
-
-	$ON_RECORD_UNDO_AFTER_ACTION : function(sAction){
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, false]);
-	},
-
-	$ON_RESTORE_UNDO_HISTORY : function(nUndoIdx, nUndoStateStep){
-		this.oCurStateIdx.nIdx = nUndoIdx;
-		this.oCurStateIdx.nStep = nUndoStateStep;
-
-		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-		var sContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
-		var oBookmark = oCurHistory.oBookmark[this.oCurStateIdx.nStep];
-
-		this.oApp.setIR(sContent, true);
-
-		// setting the innerHTML may change the internal DOM structure, so save the value again.
-		var sCurContent = this.oApp.getIR();
-		if(this.bFF && sCurContent == this.sBlankContentsForFF){
-			sCurContent = "";
-		}
-		oCurHistory.sContent[this.oCurStateIdx.nStep] = sCurContent;
-
-		var oSelection = this.oApp.getEmptySelection();
-		if(oSelection.selectionLoaded){
-			if(oBookmark){
-				oSelection.moveToXPathBookmark(oBookmark);
-			}else{
-				oSelection = this.oApp.getEmptySelection();
-			}
-
-			oSelection.select();
-		}
-	},
-
-	$ON_DO_RECORD_UNDO_HISTORY : function(sAction, bTwoStepAction, bBeforeAction, nForceAddUnlessEqual){
-		bTwoStepAction = bTwoStepAction || false;
-		bBeforeAction = bBeforeAction || false;
-		nForceAddUnlessEqual = nForceAddUnlessEqual || 0;
-
-		// if we're in the middle of some action history, remove everything after current idx if any "little" change is made
-		if(!(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1)) nForceAddUnlessEqual = 1;
-
-		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
-
-		var sCurContent = this.oApp.getIR();
-		var sHistoryContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
-
-		if(this.bFF && sCurContent == this.sBlankContentsForFF){
-			sCurContent = "";
-		}
-
-		// every TwoStepAction needs to be recorded
-		if(!bTwoStepAction){
-			switch(nForceAddUnlessEqual){
-				case 0:
-					if(Math.abs(sHistoryContent.length - sCurContent.length)<this.iMinimumSizeChange) return;
-					break;
-
-				case 1:
-					if(sHistoryContent == sCurContent) return;
-					break;
-
-				// write at all times
-				case 2:
-					break;
-			}
-		}
-
-		var oSelection = this.oApp.getSelection();
-
-		var oBookmark=null;
-		if(oSelection.selectionLoaded){
-			oBookmark = oSelection.getXPathBookmark();
-		}
-
-		var oInsertionIdx = {nIdx:this.oCurStateIdx.nIdx, nStep:this.oCurStateIdx.nStep};
-		if(bTwoStepAction){
-			if(bBeforeAction){
-				oInsertionIdx.nStep = 0;
-			}else{
-				oInsertionIdx.nStep = 1;
-			}
-		}else{
-			oInsertionIdx.nStep = 0;
-		}
-
-		if(oInsertionIdx.nStep == 0 && this.oCurStateIdx.nStep == oCurHistory.nTotalSteps-1){
-			oInsertionIdx.nIdx = this.oCurStateIdx.nIdx+1;
-		}
-
-		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [oInsertionIdx, sAction, sCurContent, oBookmark]);
-	},
-
-	$ON_DO_RECORD_UNDO_HISTORY_AT : function(oInsertionIdx, sAction, sContent, oBookmark){
-		if(oInsertionIdx.nStep != 0){
-			this.aUndoHistory[oInsertionIdx.nIdx].nTotalSteps = oInsertionIdx.nStep+1;
-			this.aUndoHistory[oInsertionIdx.nIdx].sContent[oInsertionIdx.nStep] = sContent;
-			this.aUndoHistory[oInsertionIdx.nIdx].oBookmark[oInsertionIdx.nStep] = oBookmark;
-		}else{
-			var oNewHistory = {sAction:sAction, nTotalSteps: 1};
-			oNewHistory.sContent = [];
-			oNewHistory.sContent[0] = sContent;
-
-			oNewHistory.oBookmark = [];
-			oNewHistory.oBookmark[0] = oBookmark;
-			this.aUndoHistory.splice(oInsertionIdx.nIdx, this.aUndoHistory.length - oInsertionIdx.nIdx, oNewHistory);
-		}
-
-		this.oCurStateIdx.nIdx = oInsertionIdx.nIdx;
-		this.oCurStateIdx.nStep = oInsertionIdx.nStep;
-	},
-
-	_getUndoHistory : function(){
-		return this.aUndoHistory;
-	},
-
-	_getUndoStateIdx : function(){
-		return this.oCurStateIdx;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to hyperlink
- * @name hp_XE_Hyperlink.js
- */
-xe.XE_Hyperlink = $.Class({
-	name : "XE_Hyperlink",
-	sATagMarker : "HTTP://HUSKY_TMP.MARKER/",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-		this.sRXATagMarker = this.sATagMarker.replace(/\//g, "\\/").replace(/\./g, "\\.");
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.oHyperlinkLayer = $("DIV.xpress_xeditor_hyperlink_layer", elAppContainer).get(0);
-		this.oLinkInput  = $("INPUT[type=text]", this.oHyperlinkLayer).get(0);
-		this.oBtnConfirm = $("BUTTON.confirm", this.oHyperlinkLayer).get(0);
-		this.oBtnCancel  = $("BUTTON.cancel", this.oHyperlinkLayer).get(0);
-		this.oCbNewWin   = $("INPUT[type=checkbox]", this.oHyperlinkLayer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+k", "XE_TOGGLE_HYPERLINK_LAYER", []]);
-
-		this.oApp.registerBrowserEvent(this.oBtnConfirm, "mousedown", "XE_APPLY_HYPERLINK");
-		this.oApp.registerBrowserEvent(this.oBtnCancel, "mousedown", "HIDE_ACTIVE_LAYER");
-		this.oApp.registerBrowserEvent(this.oLinkInput, "keydown", "EVENT_XE_HYPERLINK_KEYDOWN");
-
-		this.oApp.exec("REGISTER_UI_EVENT", ["hyperlink", "click", "XE_TOGGLE_HYPERLINK_LAYER"]);
-	},
-
-	$ON_XE_TOGGLE_HYPERLINK_LAYER : function(){
-		// hotkey may close the layer right away so delay here
-		this.oApp.delayedExec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.oHyperlinkLayer, null, "XE_RESET_HYPERLINK_LAYER", []], 0);
-	},
-
-	$ON_XE_RESET_HYPERLINK_LAYER : function(){
-		this.oApp.exec("FOCUS", []);
-		this.oSelection = this.oApp.getSelection();
-		var oAnchor = this.oSelection.findAncestorByTagName("A");
-		this.oCbNewWin.checked = false;
-		if(oAnchor){
-			this.oSelection.selectNode(oAnchor);
-			this.oSelection.select();
-
-			var sTarget = oAnchor.target;
-			if(sTarget && sTarget == "_blank") this.oCbNewWin.checked = true;
-
-			this.oLinkInput.value = oAnchor.href?oAnchor.href:"http://";
-		}else{
-			this.oLinkInput.value = "http://";
-		}
-
-		this.oLinkInput.focus();
-		this.oLinkInput.value = this.oLinkInput.value;
-	},
-
-	$ON_XE_APPLY_HYPERLINK : function(){
-		var sURL = this.oLinkInput.value, newWin = this.oCbNewWin.checked, sTarget = newWin?'_blank':'';
-
-		this.oApp.exec("FOCUS", []);
-		this.oSelection = this.oApp.getSelection();
-
-		if(this.oSelection.collapsed){
-			var str = "<a href='" + sURL + "' target="+sTarget+">" + sURL + "</a>";
-			this.oSelection.pasteHTML(str);
-		}else{
-			var nSession = Math.ceil(Math.random()*10000);
-			var sMarker  = this.sATagMarker+nSession;
-			var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, sMarker+sURL] );
-			this.oApp.exec("EXECCOMMAND", arg);
-
-			try { this.oSelection.setFromSelection() }catch(e){};
-			var oDoc = this.oApp.getWYSIWYGDocument();
-			$(oDoc.body.getElementsByTagName("A"))
-				.filter('[href^="'+sMarker+'"]')
-					.attr('href', function(){
-							var rx = new RegExp('^'+sMarker.replace(/([\.\\])/g, '\\$1'), 'i');
-
-							if (sTarget) $(this).attr('target', sTarget);
-							else $(this).removeAttr('target');
-
-							return this.href.replace(rx, '');
-						});
-		}
-		this.oApp.exec("HIDE_ACTIVE_LAYER");
-
-		setTimeout($.fnBind(function(){try{this.oSelection.select()}catch(e){}}, this), 0);
-	},
-
-	_validateURL : function(sURL){
-		return /^(http|https|ftp|mailto):(?:\/\/)?((\w|-)+(?:[\.:@](\w|-))+)(?:\/|@)?([^"\?]*?)(?:\?([^\?"]*?))?$/.test(sURL);
-	},
-
-	$ON_EVENT_XE_HYPERLINK_KEYDOWN : function(oEvent){
-		if (oEvent.keyCode == 13){
-			this.oApp.exec("XE_APPLY_HYPERLINK");
-			oEvent.preventDefault(); oEvent.stopPropagation();
-		}
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to table creation
- * @name hp_XE_Table.js
- */
-xe.XE_Table = $.Class({
-	name : "XE_Table",
-	iMinRows : 1,
-	iMaxRows : 20,
-
-	iMinColumns : 1,
-	iMaxColumns : 10,
-
-	iMinBorderWidth : 1,
-	iMaxBorderWidth : 10,
-
-	oSelection : null,
-
-	$init : function(oAppContainer){
-		this._assignHTMLObjects(oAppContainer);
-	},
-
-	_assignHTMLObjects : function(oAppContainer){
-		var tmp = null;
-
-		this.elDropdownLayer = $("DIV.xpress_xeditor_table_layer", oAppContainer).get(0);
-		this.welDropdownLayer = $(this.elDropdownLayer);
-
-		tmp = $("INPUT", this.elDropdownLayer).get();
-		this.oRowInput = tmp[0];
-		this.oColumnInput = tmp[1];
-		this.oBorderWidthInput = tmp[2];
-		this.oBorderColorInput = tmp[3];
-		this.oBGColorInput = tmp[4];
-
-		tmp = $("BUTTON", this.elDropdownLayer).get();
-		this.oButton_AddRow = tmp[0];
-		this.oButton_RemoveRow = tmp[1];
-		this.oButton_AddColumn = tmp[2];
-		this.oButton_RemoveColumn = tmp[3];
-		this.oButton_IncBorderWidth = tmp[4];
-		this.oButton_DecBorderWidth = tmp[5];
-		this.oButton_BorderColorPreview = tmp[6];
-		this.oButton_BorderColor = tmp[7];
-		this.oButton_BGColorPreview = tmp[8];
-		this.oButton_BGColor = tmp[9];
-		this.oButton_Insert = tmp[10];
-		this.oButton_Cancel = tmp[11];
-
-		this.oSampleTable = $("TABLE", this.elDropdownLayer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.exec("REGISTER_UI_EVENT", ["table", "click", "ST_TOGGLE_TOOLBAR_LAYER"]);
-
-		this.oApp.registerBrowserEvent(this.oRowInput, "change", "ST_SET_ROW_NUM", [null, 0]);
-		this.oApp.registerBrowserEvent(this.oColumnInput, "change", "ST_SET_COLUMN_NUM", [null, 0]);
-		this.oApp.registerBrowserEvent(this.oBorderWidthInput, "change", "ST_SET_BORDER_WIDTH", [null, 0]);
-
-		this.oApp.registerBrowserEvent(this.oButton_AddRow, "click", "ST_ADD_ROW");
-		this.oApp.registerBrowserEvent(this.oButton_RemoveRow, "click", "ST_REMOVE_ROW");
-		this.oApp.registerBrowserEvent(this.oButton_AddColumn, "click", "ST_ADD_COLUMN");
-		this.oApp.registerBrowserEvent(this.oButton_RemoveColumn, "click", "ST_REMOVE_COLUMN");
-
-		this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth, "click", "ST_INC_BORDER_WIDTH");
-		this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth, "click", "ST_DEC_BORDER_WIDTH");
-
-		this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
-		this.oApp.registerBrowserEvent(this.oButton_BGColorPreview, "click", "ST_TOGGLE_BGCOLOR_LAYER");
-
-		this.oApp.registerBrowserEvent(this.oButton_BorderColor, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
-		this.oApp.registerBrowserEvent(this.oButton_BGColor, "click", "ST_TOGGLE_BGCOLOR_LAYER");
-
-		this.oApp.registerBrowserEvent(this.oButton_Insert, "click", "ST_INSERT_TABLE");
-		this.oApp.registerBrowserEvent(this.oButton_Cancel, "click", "ST_CLOSE");
-
-		this.oApp.exec("ST_SET_BORDER_COLOR", ["#CCCCCC"]);
-		this.oApp.exec("ST_SET_BGCOLOR", ["#FFFFFF"]);
-	},
-
-	$ON_ST_TOGGLE_TOOLBAR_LAYER : function(){
-		this.oApp.exec("RECORD_UNDO_ACTION_FORCED", ["KEYPRESS"]);
-
-		this._showNewTable();
-		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
-	},
-
-	$ON_ST_ADD_ROW : function(){
-		this.oApp.exec("ST_SET_ROW_NUM", [null, 1]);
-	},
-
-	$ON_ST_REMOVE_ROW : function(){
-		this.oApp.exec("ST_SET_ROW_NUM", [null, -1]);
-	},
-
-	$ON_ST_ADD_COLUMN : function(){
-		this.oApp.exec("ST_SET_COLUMN_NUM", [null, 1]);
-	},
-
-	$ON_ST_REMOVE_COLUMN : function(){
-		this.oApp.exec("ST_SET_COLUMN_NUM", [null, -1]);
-	},
-
-	$ON_ST_SET_ROW_NUM : function(iRows, iRowDiff){
-		iRows = iRows || parseInt(this.oRowInput.value);
-		iRowDiff = iRowDiff || 0;
-
-		iRows += iRowDiff;
-
-		if(iRows < this.iMinRows) iRows = this.iMinRows;
-		if(iRows > this.iMaxRows) iRows = this.iMaxRows;
-
-		this.oRowInput.value = iRows;
-		this._showNewTable();
-	},
-
-	$ON_ST_SET_COLUMN_NUM : function(iColumns, iColumnDiff){
-		iColumns = iColumns || parseInt(this.oColumnInput.value);
-		iColumnDiff = iColumnDiff || 0;
-
-		iColumns += iColumnDiff;
-
-		if(iColumns < this.iMinColumns) iColumns = this.iMinColumns;
-		if(iColumns > this.iMaxColumns) iColumns = this.iMaxColumns;
-
-		this.oColumnInput.value = iColumns;
-		this._showNewTable();
-	},
-
-	$ON_ST_INSERT_TABLE : function(){
-		var sTable = this._getTableString();
-
-		this.oApp.exec("PASTE_HTML", [sTable]);
-
-		this.oApp.exec("ST_CLOSE", []);
-	},
-
-	$ON_ST_CLOSE : function(){
-		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
-	},
-
-	$ON_ST_SET_BORDER_WIDTH : function(iBorderWidth, iBorderWidthDiff){
-		iBorderWidth = iBorderWidth || parseInt(this.oBorderWidthInput.value);
-		iBorderWidthDiff = iBorderWidthDiff || 0;
-
-		iBorderWidth += iBorderWidthDiff;
-
-		if(iBorderWidth < this.iMinBorderWidth) iBorderWidth = this.iMinBorderWidth;
-		if(iBorderWidth > this.iMaxBorderWidth) iBorderWidth = this.iMaxBorderWidth;
-
-		this.oBorderWidthInput.value = iBorderWidth;
-		this._showNewTable();
-	},
-
-	$ON_ST_INC_BORDER_WIDTH : function(){
-		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, 1]);
-	},
-
-	$ON_ST_DEC_BORDER_WIDTH : function(){
-		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, -1]);
-	},
-
-	$ON_ST_TOGGLE_BORDER_COLOR_LAYER : function(){
-		if(this.welDropdownLayer.hasClass("p1"))
-			this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
-		else
-			this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER", []);
-	},
-
-	$ON_ST_SHOW_BORDER_COLOR_LAYER : function(){
-		this.welDropdownLayer.addClass("p1");
-		this.welDropdownLayer.removeClass("p2");
-
-		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BORDER_COLOR_FROM_PALETTE", this.elDropdownLayer]);
-	},
-
-	$ON_ST_HIDE_BORDER_COLOR_LAYER : function(){
-		this.welDropdownLayer.removeClass("p1");
-
-		this.oApp.exec("HIDE_COLOR_PALETTE", []);
-	},
-
-	$ON_ST_TOGGLE_BGCOLOR_LAYER : function(){
-		if(this.welDropdownLayer.hasClass("p2"))
-			this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
-		else
-			this.oApp.exec("ST_SHOW_BGCOLOR_LAYER", []);
-	},
-
-	$ON_ST_SHOW_BGCOLOR_LAYER : function(){
-		this.welDropdownLayer.removeClass("p1");
-		this.welDropdownLayer.addClass("p2");
-
-		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BGCOLOR_FROM_PALETTE", this.elDropdownLayer]);
-	},
-
-	$ON_ST_HIDE_BGCOLOR_LAYER : function(){
-		this.welDropdownLayer.removeClass("p2");
-
-		this.oApp.exec("HIDE_COLOR_PALETTE", []);
-	},
-
-	$ON_ST_SET_BORDER_COLOR_FROM_PALETTE : function(sColorCode){
-		this.oApp.exec("ST_SET_BORDER_COLOR", [sColorCode]);
-		this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
-	},
-
-	$ON_ST_SET_BORDER_COLOR : function(sColorCode){
-		this.oBorderColorInput.value = sColorCode;
-		this.oButton_BorderColorPreview.style.backgroundColor = sColorCode;
-
-		this._showNewTable();
-	},
-
-	$ON_ST_SET_BGCOLOR_FROM_PALETTE : function(sColorCode){
-		this.oApp.exec("ST_SET_BGCOLOR", [sColorCode]);
-		this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
-	},
-
-	$ON_ST_SET_BGCOLOR : function(sColorCode){
-		this.oBGColorInput.value = sColorCode;
-		this.oButton_BGColorPreview.style.backgroundColor = sColorCode;
-
-		this._showNewTable();
-	},
-
-	_showNewTable : function(){
-		var oTmp = document.createElement("DIV");
-		oTmp.innerHTML = this._getTableString();
-		var oNewTable = oTmp.firstChild;
-		this.oSampleTable.parentNode.insertBefore(oNewTable, this.oSampleTable);
-		this.oSampleTable.parentNode.removeChild(this.oSampleTable);
-		this.oSampleTable = oNewTable;
-	},
-
-	// need to do something about the table width as the same HTML code is being used to the actual table and the preview table
-	_getTableString : function(){
-		var sBorderColorCode = this.oBorderColorInput.value;
-		var sBGColorCode = this.oBGColorInput.value;
-		var iBorderWidth = this.oBorderWidthInput.value;
-		var sTD = "";
-		if($.browser.msie){
-			sTD = "<td><p></p></td>";
-		}else{
-			if($.browser.firefox){
-				sTD = "<td><p><br/></p></td>";
-			}else{
-				sTD = "<td><p>&nbsp;</p></td>";
-			}
-		}
-
-		var sTable = '<table style="background:'+sBorderColorCode+'" cellspacing="'+iBorderWidth+'">';
-		var sRow = '<tr style="background:'+sBGColorCode+'">';
-		var iColumns = this.oColumnInput.value;
-		for(var i=0; i<iColumns; i++){
-			sRow += sTD;
-		}
-		sRow += "</tr>\n";
-
-		var iRows = this.oRowInput.value;
-
-		sTable += "<tbody>";
-		for(var i=0; i<iRows; i++){
-			sTable += sRow;
-		}
-		sTable += "</tbody>";
-
-		sTable += "</table>";
-
-		return sTable;
-	}
-});
-//}
-//{
-/**
- * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the editing mode using a Button element
- * @name hp_XE_EditingModeToggler.js
- */
-xe.XE_EditingModeToggler = $.Class({
-	name : "XE_EditingModeToggler",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		elAppContainer = $.$(elAppContainer) || document;
-
-		this.elModeToggleButton = $("BUTTON.xpress_xeditor_mode_toggle_button", elAppContainer).get(0);
-		this.welModeToggleButton = $(this.elModeToggleButton);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elModeToggleButton, "click", "EVENT_TOGGLE_EDITING_MODE", []);
-	},
-
-	$ON_EVENT_TOGGLE_EDITING_MODE : function(){
-		if(this.oApp.getEditingMode() == "WYSIWYG")
-			this.oApp.exec("CHANGE_EDITING_MODE", ["HTMLSrc"]);
-		else
-			this.oApp.exec("CHANGE_EDITING_MODE", ["WYSIWYG"]);
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(sMode){
-		if(sMode == "HTMLSrc"){
-			this.welModeToggleButton.addClass("active").parent("span").addClass("active");
-			this.oApp.exec("DISABLE_ALL_UI", []);
-		}else{
-			this.welModeToggleButton.removeClass("active").parent("span").removeClass("active");
-			this.oApp.exec("ENABLE_ALL_UI", []);
-		}
-	}
-});
-//}
-/**
- * @fileOverview This file contains a message mapping(Korean), which is used to map the message code to the actual message
- * @name xpress_XE_Lang_KR.js
- */
-var oMessageMap = {
-	'XE_EditingAreaManager.onExit' : '%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.',
-	'XE_FontColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
-	'XE_BGColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
-	'XE_Hyperlink.invalidURL' : '%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4.'
-};
-xe.XpressCore.oMessageMap = oMessageMap;
-/**
- * XHTML Formatter
- * @author NHN (developer@xpressengine.com)
- */
-var
-	regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig,
-	regex_meanless_css2 = /(?:(?:margin|padding)\s*:\s*0(?:px)?|\-(?:moz|ms|webkit|opera)\-[\w-]+\s*:\s*.*?|[\w-]+\s*:\s*\-(?:moz|ms|webkit|opera)\-[\w-]+|(?:line-height|font-variant|font-stretch|font-size-adjust|font-size)\s*:\s*[a-z_-]+)\s*;?\s*|font-(?:weight|style)\s*:\s*normal;?/ig,
-	regex_class  = /<(.*?)\s+class\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))(.*?)>/ig,
-	regex_class2 = /xe_selected_cell/g;
-	regex_handler = /<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig,
-	//regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
-	//regex_script = /<script[\s\S]+?<\/script>/ig,
-	regex_font_color = /color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
-	regex_font_face  = /face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
-	regex_font_size  = /size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i,
-	regex_style = /style\s*=\s*(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
-	regex_font_weight = /font-weight\s*:\s*([a-z]+);?/i,
-	regex_font_style = /font-style\s*:\s*italic;?/i,
-	regex_font_decoration = /text-decoration\s*:\s*([a-z -]+);?/i,
-	regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/ig,
-	regex_quote_attr = /([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g; //"
-
-var
-	allow_tags  = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style'.split(','),
-	lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
-
-var
-	replace_tags = {
-		'b' : 'strong',
-		'i' : 'em',
-		's' : 'del',
-		'strike' : 'del'
-	};
-
-xe.XE_XHTMLFormatter = $.Class({
-	name : "XE_XHTMLFormatter",
-
-	$ON_MSG_APP_READY : function() {
-		this.oApp.addConverter("WYSIWYG_TO_IR", this.TO_IR);
-		this.oApp.addConverter("HTMLSrc_TO_IR", this.TO_IR);
-		this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO);
-		this.oApp.addConverter("IR_TO_WYSIWYG", this.IR_TO);
-	},
-
-	TO_IR : function(sContent) {
-		var stack = [];
-
-		// remove xeHandled attrs
-		/*
-		sContent = sContent.replace(/xeHandled="YES"/ig,'');
-		*/
-
-
-		// remove all useless styles
-		/*
-		sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
-			m2 = m2.replace(regex_meanless_css2, '');
-
-			return '<'+m1+(m2?' style="'+m2+'"':'')+m3+'>';
-		});
-		*/
-
-		// remove all useless classes
-		/*
-		sContent = sContent.replace(regex_class, function(m0,m1,m2,m3,m4,m5){
-			var cls = $.trim((m2 || m3 || m4 || "").replace(regex_class2, ''));
-
-			return '<'+(m1||"")+(cls?' class="'+cls+'"':'')+(m5||"")+'>';
-		});
-		*/
-
-		// remove all event handler
-		//sContent = sContent.replace(regex_handler, '<$1$2>');
-
-		// remove all id
-		//sContent = sContent.replace(regex_id, '<$1$2>');
-
-		// remove all scripts
-		//sContent = sContent.replace(regex_script, '');
-
-		if ($.browser.msie) {
-			// remove $ attributes
-			sContent = sContent.replace(regex_jquery, '');
-
-			// quote all attrs
-			sContent = sContent.replace(/<(\w+) ([^>]+)>/g, function(m0,m1,m2){
-				return '<'+m1+' '+
-					m2.replace(regex_quote_attr, function(s0,s1,s2,s3){
-						if (s1) return s1;
-						if(/^"/.test(s3)||/"$/.test(s3)) return s2+'='+s3;
-						return s2+'="'+s3+'"';
-					}) + '>';
-			});
-		}
-
-		// remove all useless tag and enclose tags
-		regex = /<(\/)?([:\w\/-]+)(.*?)>/ig;
-		sContent = sContent.replace(regex, function(m0,closing,tag,attrs){
-			var m3s = [];
-			var state = '';
-
-			closing = closing || '';
-			tag     = tag.toLowerCase();
-			attrs   = $.trim(attrs || '');
-
-			if (!closing) {
-				if ($.inArray(tag,lonely_tags) >= 0) {
-					var len = attrs.length;
-					if (tag == 'br') attrs = '';
-					if (!attrs || attrs.substring(len-1,len) != '/') attrs += '/';
-
-					return '<'+tag+' '+$.trim(attrs)+'>';
-				} else {
-					stack[stack.length] = {tag:tag, state:state};
-				}
-			} else {
-				var tags = [], t = '';
-
-				// remove unnecessary closing tag
-				if (!stack.length) return '';
-
-				do {
-					t = stack.pop();
-					if (t.tag != tag) continue;
-					if (t.state != 'deleted') tags.push('</'+t.tag+'>');
-				} while(stack.length && t.tag != tag);
-
-				return tags.join('');
-			}
-
-			return '<'+closing+tag+(attrs?' '+attrs:'')+'>';
-		});
-		/*
-		if (stack.length) {
-			var t = '';
-
-			do {
-				t = stack.pop();
-				if (t.state != 'deleted') sContent += '</'+t.tag+'>';
-			} while(stack.length);
-		}
-		*/
-
-		return sContent;
-	},
-
-	IR_TO : function(sContent) {
-		return sContent;
-	}
-});
-// center, font, b, i, s, strike
-
-/**
- * Support XE extensions
- * @author NHN (developer@xpressengine.com)
- */
-xe.XE_Extension = $.Class({
-	name  : "XE_Extension",
-	seq   : '',
-	last_doc : '',
-
-	$init : function(elAppContainer, editor_sequence) {
-		this.seq = editor_sequence;
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer) {
-		this.elDropdownLayer = $('DIV.xpress_xeditor_extension_layer', elAppContainer).get(0);
-	},
-
-	_removeAttrs : function(sContent) {
-		return sContent;
-	},
-
-	_addEvent : function() {
-		if (this.oApp.getEditingMode() != 'WYSIWYG') return;
-
-		var doc = this.oApp.getWYSIWYGDocument();
-		var seq = this.seq;
-		var fn  = function(){
-			var obj  = $(this);
-			var comp = obj.attr('editor_component');
-			if (comp && $.isFunction(openComponent)) {
-				editorPrevNode = obj.get(0);
-				openComponent(comp, seq);
-			}
-		};
-
-		$('img,div[editor_component]', doc).each(function(){
-			var obj = $(this);
-			if(this.nodeName == 'IMG' && !obj.attr('editor_component')) {
-				obj.attr('editor_component','image_link');
-			}
-			if(this.last_doc != doc) {
-				obj.dblclick(fn);
-				this.last_doc = doc;
-			}
-		});
-	},
-
-	$ON_MSG_APP_READY : function() {
-		var oApp = this.oApp;
-		oApp.exec('REGISTER_UI_EVENT', ['extension', 'click', 'TOGGLE_EXTENSION_LAYER']);
-		var functn  = function(){
-			oApp.exec("HIDE_ACTIVE_LAYER", []);
-		};
-		$('a', this.elDropdownLayer).each(function(){
-			var obj = $(this);
-			if(!obj.attr('component_onclick_event_added')) {
-				obj.click(functn);
-				obj.attr('component_onclick_event_added','Y');
-			}
-		});
-	},
-
-	$ON_TOGGLE_EXTENSION_LAYER : function() {
-		this.oApp.exec('TOGGLE_TOOLBAR_ACTIVE_LAYER', [this.elDropdownLayer]);
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(mode) {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	},
-
-	$ON_PASTE_HTML : function() {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	},
-
-	$ON_LOAD_IR_FIELD : function() {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	},
-
-	$ON_SET_IR : function() {
-		var self = this;
-		setTimeout(function(){ self._addEvent(); }, 100);
-	}
-});
-/**
- * Auto saving
- * @author NHN (developer@xpressengine.com)
- */
-xe.XE_AutoSave = $.Class({
-	name : "XE_AutoSave",
-	form : null,
-	textarea : null,
-
-	$init : function(oIRTextarea, elAppContainer) {
-		this.form = oIRTextarea.form;
-		this.textarea = oIRTextarea;
-
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer) {
-		this.welMessageBox = $('autosave_message');
-	},
-
-	$ON_MSG_APP_READY : function() {
-		var elTitle   = $(this.form._saved_doc_title);
-		var elContent = $(this.form._saved_doc_content);
-
-		var title   = $.trim(elTitle.val());
-		var content = $.trim(elContent.val());
-
-		if (title || content) {
-			if (confirm(this.form._saved_doc_message.value)) {
-				$(this.form.title).val(title);
-				this.oApp.setIR(content);
-				if(typeof(editorGetAutoSavedDoc) == 'function') editorGetAutoSavedDoc(this.form);
-			} else {
-				editorRemoveSavedDoc();
-			}
-		}
-
-		editorEnableAutoSave(this.form, $(this.form).attr("editor_sequence"));
-
-		// register hotkey
-		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+shift+s','AUTO_SAVE']);
-	},
-
-	$ON_AUTO_SAVE : function() {
-		_editorAutoSave();
-	}
-});
-/**
- * Format Block plugin
- * @author NHN (developer@xpressengine.com)
- */
-xe.XE_FormatWithSelectUI = $.Class({
-	name : "XE_FormatWithSelectUI",
-
-	$init : function(elAppContainer){
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer){
-		this.elFormatSelect = $("SELECT.xpress_xeditor_ui_format_select", elAppContainer).get(0);
-	},
-
-	$ON_MSG_APP_READY : function(){
-		this.oApp.registerBrowserEvent(this.elFormatSelect, "change", "SET_FORMAT_FROM_SELECT_UI");
-		this.elFormatSelect.selectedIndex = 0;
-	},
-
-	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
-		var blockName = this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");
-
-		if (!blockName) return (this.elFormatSelect.selectedIndex = 0);
-		if ($.browser.msie && /([0-9])/.test(blockName)) blockName = 'h'+(RegExp.$1);
-
-		this.elFormatSelect.value = blockName.toLowerCase();
-		if(this.elFormatSelect.selectedIndex < 0) this.elFormatSelect.selectedIndex = 0;
-		if(this.elFormatSelect.value != blockName.toLowerCase()) this.elFormatSelect.selectedIndex = 0;
-	},
-
-	$ON_SET_FORMAT_FROM_SELECT_UI : function(){
-		var sFormat = this.elFormatSelect.value;
-		if(!sFormat) return;
-		if($.browser.msie) sFormat = '<'+sFormat+'>';
-
-		this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, sFormat]);
-		this.oApp.exec("CHECK_STYLE_CHANGE", []);
-	}
-});
-/**
- * Enhanced Table Fetures
- * @author NHN (developer@xpressengine.com)
- */
-
-// 표 편집 확장 기능
-xe.XE_Table = $.Class({
-	_startSel : null,
-	_endSel   : null,
-
-	$ON_MSG_APP_READY : function() {
-		this._doc = $(this.oApp.getWYSIWYGDocument());
-
-		this.$FnMouseDown = $.fnBind(this._mousedown, this);
-		this.$FnMouseUp   = $.fnBind(this._mouseup, this);
-		this.$FnMouseMove = $.fnBind(this._mousemove, this);
-
-		this._doc.mousedown(this.$FnMouseDown);
-
-		// initialize
-		this._startSel = null;
-		this._endSel   = null;
-
-		// register buttons
-		this.oApp.exec('REGISTER_UI_EVENT', ['merge_cells', 'click', 'MERGE_CELLS']);
-		this.oApp.exec('REGISTER_UI_EVENT', ['split_col', 'click', 'CELL_SPLIT_BY_COL']);
-		this.oApp.exec('REGISTER_UI_EVENT', ['split_row', 'click', 'CELL_SPLIT_BY_ROW']);
-
-		// register hotkeys
-		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+alt+m', 'MERGE_CELLS']);
-
-		// perform default ready action
-		this.$super.$ON_MSG_APP_READY();
-	},
-
-	$ON_MERGE_CELLS : function() {
-		var html = "";
-		var cell = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
-		var self = this;
-
-		// 선택된 셀이 없으면 종료
-		if (!cell.length) return;
-
-		// UNDO 지점 기록
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Merge"]);
-
-		// 선택한 모든 셀의 데이터를 첫번째 셀로 복사
-		cell.each(function(){ html += $(this).html() }).eq(0).html(html);
-
-		// 첫번째 셀 가로 확장
-		var colspan = 0;
-		cell.eq(0).nextAll('td,th').andSelf().filter('.xe_selected_cell').each(function(idx){
-			colspan += self._getSpan(this, 'col');
-		});
-
-		// 마지막 셀까지 줄의 갯수 계산
-		var rect = this._getRect(cell.eq(0));
-		var start_tr = cell.eq(0).parent('tr');
-		var end_tr   = cell.eq(cell.length-1).parent('tr');
-		var all_rows = cell.parents('table').eq(0).find('tr');
-		var rowspan  = all_rows.index(end_tr.get(0)) - all_rows.index(start_tr.get(0)) + this._getSpan(cell.eq(cell.length-1), 'row');
-
-		// 첫번째 셀 colspan, rowspan 속성 지정
-		cell.eq(0).attr('colSpan', colspan).attr('rowSpan', rowspan);
-
-		// 첫번째 셀을 제외한 다른 모든 셀 제거
-		cell.slice(1).remove();
-	},
-
-	$ON_CELL_SPLIT_BY_ROW : function(many) {
-		var cell  = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
-		var table = cell.parents('table').eq(0);
-		var self  = this;
-
-		// 선택된 셀이 없으면 종료
-		if (!cell.length) return;
-
-		// UNDO 지점 기록
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Row"]);
-
-		// 선택 영역의 상하 좌표 구함
-		var _top	= this._getRect(cell.eq(0)).top;
-		var _bottom = this._getRect(cell.eq(cell.length-1)).bottom;
-
-		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(상하 기준).
-		(cell = table.find('td,th').filter(function(){
-			var rect = self._getRect($(this));
-
-			return !(rect.bottom <= _top || rect.top >= _bottom);
-		})).filter('.xe_selected_cell').each(function(){
-			var t	   = $(this);
-			var row	 = t.parent('tr');
-			var rowspan = self._getSpan(t, 'row');
-			var rect	= self._getRect(t);
-			var queue   = [];
-			var clone   = t.clone().html('<br />');
-			var topspan = 1, botspan = 1;
-
-			// rowspan > 1이면 현재 셀의 rowspan을 절반으로 분할한다.
-			if (rowspan > 1) {
-
-				topspan = Math.ceil(rowspan/2);
-				botspan = rowspan - topspan;
-
-				queue.push(function(){
-					t.attr('rowSpan', topspan);
-				});
-
-				clone.attr('rowSpan', botspan);
-			} else {
-				// rowspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 rowspan을 추가
-				cell.filter(function(){
-					if (t.get(0) == this) return false;
-
-					var tt = $(this);
-					var rc = self._getRect(tt);
-
-					// 범위를 넘은 부분은 제외
-					if (rc.bottom <= rect.top || rc.top >= rect.bottom) return false;
-
-					return true;
-				}).each(function(){
-					var tt = $(this);
-					var sp = self._getSpan(tt, 'row')+1;
-
-					// rowspan 1 추가
-					queue.push(function(){
-						tt.attr('rowSpan', sp);
-					});
-				});
-
-				// 새 줄을 추가한다.
-				if ($.browser.msie) {
-					// Fix bug for IE
-					row.after(row.clone().empty().get(0).outerHTML);
-				} else {
-					row.after(row.clone().empty());
-				}
-			}
-
-			var rows  = row.nextAll('tr');
-
-			// 현재 셀이 마지막 줄에 있다면 한 줄 추가 후 새로운 셀 추가
-			if (!rows.length) {
-				row.after(row.clone().empty().append(clone));
-			} else {
-				var next_sib  = rows.eq(topspan - 1).children('td,th').filter(function(){
-					return ( self._getRect($(this)).left > rect.left );
-				});
-
-				if ($.browser.msie) {
-					next_sib.length?
-						next_sib.eq(0).before(clone.get(0).outerHTML):
-						rows.eq(topspan-1).append(clone.get(0).outerHTML);
-				} else {
-					next_sib.length?
-						next_sib.slice(0,1).before(clone):
-						rows.slice(topspan-1,1).append(clone);
-				}
-			}
-
-			// 함수를 바로 실행하면 좌표가 틀어지므로, 큐에 넣은 후 실행
-			$.each(queue, function(){ this(); });
-
-		});
-	},
-
-	$ON_CELL_SPLIT_BY_COL : function(many) {
-		var cell   = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
-		var table  = cell.parents('table').slice(0,1);
-		var self   = this;
-		var ie_bug = [], tmpId = (new Date).getTime(), tmpStr = '';
-
-		// 선택된 셀이 없으면 종료
-		if (!cell.length) return;
-
-		// UNDO 지점 기록
-		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Column"]);
-
-		// 선택 영역의 좌우 좌표 구함
-		var first_row = cell.eq(0).parent('tr');
-		var _left = this._getRect(first_row.find('.xe_selected_cell:first')).left;
-		var _right = this._getRect(first_row.find('.xe_selected_cell:last')).right;
-
-		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(좌우 기준).
-		(cell = table.find('td,th').filter(function(){
-			var rect = self._getRect($(this));
-
-			return !(rect.right <= _left || rect.left >= _right);
-		})).filter('.xe_selected_cell').each(function(idx){
-			var t	   = $(this);
-			var colspan = self._getSpan(t, 'col');
-			var clone   = t.clone().html('<br />');
-
-			// colspan > 1 이면 colspan을 절반으로 분할한다.
-			if (colspan > 1) {
-				var leftspan  = Math.ceil(colspan/2);
-				var rightspan = colspan - leftspan;
-
-				t.attr('colSpan', leftspan);
-				clone.attr('colSpan', rightspan);
-			} else {
-				// colspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 colspan을 추가
-				var rect = self._getRect(t);
-
-				cell.filter(function(){
-					if (t.get(0) == this) return false;
-
-					var tt = $(this);
-					var rc = self._getRect(tt);
-
-					// 범위를 넘은 부분은 제외
-					if (rc.right <= rect.left || rc.left >= rect.right) return false;
-
-					return true;
-				}).each(function(){
-					var tt = $(this);
-
-					// colspan 1 추가
-					tt.attr('colSpan', self._getSpan(tt, 'col')+1);
-				});
-
-				clone.attr('colSpan', 1);
-			}
-
-			if ($.browser.msie) {
-				// Fix for IE bug
-				t.after(clone.get(0).outerHTML);
-			} else {
-				t.after(clone);
-			}
-		});
-	},
-
-	$ON_CHECK_STYLE_CHANGE : function(){
-		var ui  = ['merge_cells', 'split_col', 'split_row'];
-		var app = this.oApp;
-		var command = (this._startSel && this._startSel.is('.xe_selected_cell'))?'ENABLE_UI':'DISABLE_UI';
-
-		$.each(ui, function(){ app.exec(command, [this]); });
-	},
-
-	_mousedown : function(event) {
-		var cur = $(event.target);
-		var sel = cur.parents().andSelf().filter('td,th,table');
-		var app = this.oApp;
-		var self = this;
-
-		// 모든 선택영역 해제
-		$('td.xe_selected_cell', this.oApp.getWYSIWYGDocument()).removeClass('xe_selected_cell');
-
-		this._startSel = null;
-		this._endSel   = null;
-
-		if (!sel.length || !this._isLeftClicked(event.button)) return;
-
-		function delayed(){
-			sel = app.getSelection().cloneRange();
-			sel.collapseToStart();
-			sel = $(sel.startContainer).parents().andSelf().filter('td,th').eq(0);
-
-			if (!sel.length) return self._removeAllListener()||true;
-
-			// 좌표를 구한다
-			self._getRect(self._startSel = sel);
-
-			// 이벤트 바인딩
-			self._doc.bind('mousemove', self.$FnMouseMove);
-			self._doc.bind('mouseup', self.$FnMouseUp);
-		}
-
-		// mousedown이 일어난 후에 선택 영역이 설정되므로 실행을 지연시킨다.
-		setTimeout(delayed, 0);
-	},
-
-	_mouseup : function(event) {
-		// 선택된 셀 확인
-		this._removeAllListener();
-
-		// 시작셀과 종료셀 제거
-		this._startSel = this._endSel = null;
-	},
-
-	_mousemove : function(event) {
-		var cur  = $(event.target);
-		var cell = cur.parents().andSelf().filter('td,th').eq(0);
-		var self = this;
-
-		// 마우스 왼쪽 버튼이 눌리지 않았으면 종료
-		if (!cell.length || !this._isLeftClicked(event.button)) return;
-		if (!this._endSel && cell.get(0) == this._startSel.get(0)) return;
-		if (this._endSel && cell.get(0) == this._endSel.get(0)) return;
-
-		// 종료셀 && 종료셀의 좌표
-		this._getRect(this._endSel = cell);
-
-		// 선택 범위를 구한다
-		var _top	= Math.min(this._startSel.rect.top,  this._endSel.rect.top);
-		var _left   = Math.min(this._startSel.rect.left, this._endSel.rect.left);
-		var _bottom = Math.max(this._startSel.rect.bottom, this._endSel.rect.bottom);
-		var _right  = Math.max(this._startSel.rect.right,  this._endSel.rect.right);
-
-		var table = cell.parents('table');
-		var cells = table.find('td,th').removeClass('xe_selected_cell');
-		var i = 0;
-
-		// 복잡한 모양의 테이블을 위한 반복 처리
-		var selected = $();
-		do {
-			// 선택한 셀로 최대 영역 재계산
-			selected.each(function(){
-				var rect = self._getRect($(this));
-
-				// 영역 재계산
-				if (rect.right  > _right)  _right  = rect.right;
-				if (rect.left   < _left)   _left   = rect.left;
-				if (rect.top	< _top)	_top	= rect.top;
-				if (rect.bottom > _bottom) _bottom = rect.bottom;
-			});
-
-			// 좌표 범위 안에 있는 선택할 셀을 추린다.
-			cells = cells.filter(':not(.xe_selected_cell)');
-			selected = cells.filter(function(){
-				var rect = self._getRect($(this));
-
-				if (rect.right <= _left || rect.left >= _right || rect.bottom <= _top || rect.top >= _bottom) return false;
-
-				return true;
-			}).addClass('xe_selected_cell');
-		} while(selected.length);
-
-		// 브라우저의 기본 선택영역 해제 : FF 제외 - 기본 기능이 충분히 좋아서 + 이 부분을 실행하면 오류가 발생해서
-		if (!$.browser.mozilla) {
-			function delayed() {
-				var sel = self.oApp.getSelection();
-
-				if (!self._startSel) return;
-				if (!self._startSel.get(0).firstChild) self._startSel.text(" ");
-
-				sel.selectNode(self._startSel.get(0).firstChild);
-				sel.collapseToStart();
-				sel.select();
-			}
-
-			setTimeout(delayed, 0);
-		}
-
-		return false;
-	},
-
-	_removeAllListener : function() {
-		// 이벤트 해제
-		this._doc.unbind("mousemove", this.$FnMouseMove);
-		this._doc.unbind("mouseup", this.$FnMouseUp);
-	},
-
-	_isLeftClicked : function(value) {
-		return $.browser.msie?!!(value & 1):(value == 0);
-	},
-
-	_getRect : function(obj) {
-		var el = obj.get(0);
-
-		obj.rect = {};
-		obj.rect.top	= el.offsetTop;
-		obj.rect.left   = el.offsetLeft;
-		obj.rect.bottom = obj.rect.top  + el.offsetHeight;
-		obj.rect.right  = obj.rect.left + el.offsetWidth;
-
-		return obj.rect;
-	},
-
-	_getSpan : function(obj, type) {
-		var span = parseInt($(obj).attr(type+'span'));
-
-		return isNaN(span)?1:span;
-	}
-}).extend(xe.XE_Table);
-
-})(jQuery);
+(function($){
+
+// extends jQuery object
+$.extend({
+	Class : function(def) {
+		function c(){
+			if (typeof this.$super != 'undefined') this.$super.$this = this;
+			if ($.isFunction(this.$init)) this.$init.apply(this, arguments);
+		}
+		c.prototype = def;
+		c.constructor = c;
+		c.extend = Class_extend;
+
+		return c;
+	},
+	$ : function(id) {
+		if(typeof id == 'string') {
+			if (id.substring(0,1) == '<') return $(id).get(0);
+			return $('#'+id).get(0);
+		} else {
+			return id;
+		}
+	},
+	fnBind : function(fn, th/* , args... */) {
+		var args = $.makeArray(arguments);
+		args.shift(); args.shift();
+
+		return function() {
+			var a = args.concat($.makeArray(arguments));
+
+			return fn.apply(th, a);
+		};
+	}
+});
+
+$.browser.nVersion = parseFloat($.browser.version);
+
+function Class_extend(superDef) {
+	var Super = superDef.prototype;
+
+	this.prototype.$super = {};
+
+	function bind(fn) {
+		return function() {
+			return fn.apply(this.$this, arguments);
+		};
+	}
+
+	for(var x in Super) {
+		if (!Super.propertyIsEnumerable(x)) continue;
+
+		if (typeof this.prototype[x] == 'undefined') this.prototype[x] = Super[x];
+		this.prototype.$super[x] = $.isFunction(Super[x])?bind(Super[x]):Super[x];
+	}
+
+	return this;
+}
+
+if (typeof window.xe == 'undefined') window.xe = {};
+
+//{
+ /**
+ * @fileOverview This file contains Xpress framework core
+ * @name XpressCore.js
+ */
+xe.XpressCore = $.Class({
+	name : "XpressCore",
+
+	$init : function(htOptions){
+		htOptions = !htOptions?{}:$.Class({}).extend({
+			oDebugger : null
+		}).extend(htOptions);
+		if(htOptions.oDebugger){
+			this.oDebugger = htOptions.oDebugger;
+			this.oDebugger.oApp = this;
+		}
+
+		// To prevent processing a Xpress command before all the plugins are registered and ready,
+		// Queue up all the commands here until the application's status is changed to READY
+		this.commandQueue = [];
+
+		this.oCommandMap = {};
+		this.oDisabledCommand = {};
+		this.aPlugins = [];
+
+		this.appStatus = xe.APP_STATUS["NOT_READY"];
+
+		// Register the core as a plugin so it can receive messages
+		this.registerPlugin(this);
+	},
+
+	exec : function(msg, args, oEvent){
+		// If the application is not yet ready just queue the command
+		if(this.appStatus == xe.APP_STATUS["NOT_READY"]){
+			this.commandQueue[this.commandQueue.length] = {'msg':msg, 'args':args, 'event':oEvent};
+			return true;
+		}
+
+		this.exec = this._exec;
+		this.exec(msg, args, oEvent);
+	},
+
+	delayedExec : function(msg, args, nDelay, oEvent){
+		var fExec = $.fnBind(this.exec, this, msg, args, oEvent);
+		setTimeout(fExec, nDelay);
+	},
+
+	_exec : function(msg, args, oEvent){return (this._exec = this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this, msg, args, oEvent);},
+	_execWithDebugger : function(msg, args, oEvent){this.oDebugger.log_MessageStart(msg, args);var bResult = this._doExec(msg, args, oEvent);this.oDebugger.log_MessageEnd(msg, args);return bResult;	},
+	_execWithoutDebugger : function(msg, args, oEvent){return this._doExec(msg, args, oEvent);},
+	_doExec : function(msg, args, oEvent){
+		var bContinue = false;
+
+		if(!this.oDisabledCommand[msg]){
+			var allArgs = [];
+			if(args && args.length){
+				var iLen = args.length;
+				for(var i=0; i<iLen; i++) allArgs[i] = args[i];
+			}
+			if(oEvent) allArgs[allArgs.length] = oEvent;
+
+			var bContinue = true;
+			bContinue = this._execMsgStep("BEFORE", msg, allArgs);
+			if(bContinue) bContinue = this._execMsgStep("ON", msg, allArgs);
+			if(bContinue) bContinue = this._execMsgStep("AFTER", msg, allArgs);
+		}
+
+		return bContinue;
+	},
+
+	registerPlugin : function(oPlugin){
+		if(!oPlugin) throw("An error occured in registerPlugin(): invalid plug-in");
+
+		oPlugin.nIdx = this.aPlugins.length;
+		oPlugin.oApp = this;
+		this.aPlugins[oPlugin.nIdx] = oPlugin;
+
+		// If the plugin does not specify that it takes time to be ready, change the stauts to READY right away
+		if(oPlugin.status != xe.PLUGIN_STATUS["NOT_READY"]) oPlugin.status = xe.PLUGIN_STATUS["READY"];
+
+		this.exec("MSG_PLUGIN_REGISTERED", [oPlugin]);
+
+		return oPlugin.nIdx;
+	},
+
+	disableCommand : function(sCommand, bDisable){this.oDisabledCommand[sCommand] = bDisable;},
+
+	registerBrowserEvent : function(obj, sEvent, sCMD, aParams, nDelay){
+		if(!obj) return;
+		aParams = aParams || [];
+		var func = (nDelay)?$.fnBind(this.delayedExec, this, sCMD, aParams, nDelay):$.fnBind(this.exec, this, sCMD, aParams);
+		$(obj).bind(sEvent, func);
+	},
+
+	run : function(){
+		// Change the status from NOT_READY to let exec to process all the way
+		this._changeAppStatus(xe.APP_STATUS["WAITING_FOR_PLUGINS_READY"]);
+
+		// Process all the commands in the queue
+		var iQueueLength = this.commandQueue.length;
+		for(i=0; i<iQueueLength; i++){
+			var curMsgAndArgs = this.commandQueue[i];
+			this.exec(curMsgAndArgs.msg, curMsgAndArgs.args, curMsgAndArgs.event);
+		}
+
+		this._waitForPluginReady();
+	},
+
+	// Use this also to update the mapping
+	createCommandMap : function(sMsgHandler){
+		this.oCommandMap[sMsgHandler] = [];
+
+		var nLen = this.aPlugins.length;
+		for(var i=0; i<nLen; i++) this._doAddToCommandMap(sMsgHandler, this.aPlugins[i]);
+	},
+
+	addToCommandMap : function(sMsgHandler, oPlugin){
+		// cannot "ADD" unless the map is already created.
+		// the message will be added automatically to the mapping when it is first passed anyways, so do not add now
+		if(!this.oCommandMap[sMsgHandler]) return;
+
+		this._addToCommandMap(sMsgHandler, oPlugin);
+	},
+
+	_changeAppStatus : function(appStatus){
+		this.appStatus = appStatus;
+
+		// Initiate MSG_APP_READY if the application's status is being switched to READY
+		if(this.appStatus == xe.APP_STATUS["READY"]) this.exec("MSG_APP_READY");
+	},
+
+	_execMsgStep : function(sMsgStep, sMsg, args){return (this._execMsgStep = this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this, sMsgStep, sMsg, args);},
+	_execMsgStepWithDebugger : function(sMsgStep, sMsg, args){this.oDebugger.log_MessageStepStart(sMsgStep, sMsg, args);var bStatus = this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);this.oDebugger.log_MessageStepEnd(sMsgStep, sMsg, args);return bStatus;},
+	_execMsgStepWithoutDebugger : function(sMsgStep, sMsg, args){return this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);},
+	_execMsgHandler : function(sMsgHandler, args){
+		if(!this.oCommandMap[sMsgHandler]){
+			this.createCommandMap(sMsgHandler);
+		}
+
+		var aPlugins = this.oCommandMap[sMsgHandler];
+		var iNumOfPlugins = aPlugins.length;
+
+		if(iNumOfPlugins == 0) return true;
+
+		var tmpStatus, bResult = true;
+		// two similar codes were written twice due to the performace.
+		if(sMsgHandler.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){
+			for(var i=0; i<iNumOfPlugins; i++){
+				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
+				if(tmpStatus === false){
+					bResult = false;
+					break;
+				}
+			}
+		}else{
+			for(var i=0; i<iNumOfPlugins; i++){
+				if(typeof aPlugins[i]["$PRECONDITION"] == "function") if(!this._execHandler(aPlugins[i], "$PRECONDITION", [sMsgHandler, args])) continue;
+
+				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
+				if(tmpStatus === false){
+					bResult = false;
+					break;
+				}
+			}
+		}
+
+		return bResult;
+	},
+
+	_execHandler : function(oPlugin, sHandler, args){return	(this._execHandler = this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this, oPlugin, sHandler, args);},
+	_execHandlerWithDebugger : function(oPlugin, sHandler, args){this.oDebugger.log_CallHandlerStart(oPlugin, sHandler, args);var bResult = oPlugin[sHandler].apply(oPlugin, args);this.oDebugger.log_CallHandlerEnd(oPlugin, sHandler, args);return bResult;},
+	_execHandlerWithoutDebugger : function(oPlugin, sHandler, args){return oPlugin[sHandler].apply(oPlugin, args);},
+
+	_doAddToCommandMap : function(sMsgHandler, oPlugin){
+		if(typeof oPlugin[sMsgHandler] != "function") return;
+		this.oCommandMap[sMsgHandler][this.oCommandMap[sMsgHandler].length] = oPlugin;
+	},
+
+	_waitForPluginReady : function(){
+		var bAllReady = true;
+		for(var i=0; i<this.aPlugins.length; i++){
+			if(this.aPlugins[i].status == xe.PLUGIN_STATUS["NOT_READY"]){
+				bAllReady = false;
+				break;
+			}
+		}
+		if(bAllReady){
+			this._changeAppStatus(xe.APP_STATUS["READY"]);
+		}else{
+			setTimeout($.fnBind(this._waitForPluginReady, this), 100);
+		}
+	}
+});
+//}
+
+xe.APP_STATUS = {
+	'NOT_READY' : 0,
+	'WAITING_FOR_PLUGINS_READY' : 1,
+	'READY' : 2
+};
+
+xe.PLUGIN_STATUS = {
+	'NOT_READY' : 0,
+	'READY' : 1
+};
+/**
+ * @fileOverview This file contains a cross-browser implementation of W3C's DOM Range
+ * @name W3CDOMRange.js
+ */
+xe.W3CDOMRange = $.Class({
+	$init : function(doc){
+		this._document = doc || document;
+
+		this.collapsed = true;
+		this.commonAncestorContainer = this._document.body;
+		this.endContainer = this._document.body;
+		this.endOffset = 0;
+		this.startContainer = this._document.body;
+		this.startOffset = 0;
+	},
+
+	cloneContents : function(){
+		var oClonedContents = this._document.createDocumentFragment();
+		var oTmpContainer = this._document.createDocumentFragment();
+
+		var aNodes = this._getNodesInRange();
+
+		if(aNodes.length < 1) return oClonedContents;
+
+		var oClonedContainers = this._constructClonedTree(aNodes, oTmpContainer);
+
+		// oTopContainer = aNodes[aNodes.length-1].parentNode and this is not part of the initial array and only those child nodes should be cloned
+		var oTopContainer = oTmpContainer.firstChild;
+
+		if(oTopContainer){
+			var elCurNode = oTopContainer.firstChild;
+			var elNextNode;
+
+			while(elCurNode){
+				elNextNode = elCurNode.nextSibling;
+				oClonedContents.appendChild(elCurNode);
+				elCurNode = elNextNode;
+			}
+		}
+
+		oClonedContainers = this._splitTextEndNodes({oStartContainer: oClonedContainers.oStartContainer, iStartOffset: this.startOffset,
+													oEndContainer: oClonedContainers.oEndContainer, iEndOffset: this.endOffset});
+
+		if(oClonedContainers.oStartContainer && oClonedContainers.oStartContainer.previousSibling)
+			xe.DOMFix.parentNode(oClonedContainers.oStartContainer).removeChild(oClonedContainers.oStartContainer.previousSibling);
+
+		if(oClonedContainers.oEndContainer && oClonedContainers.oEndContainer.nextSibling)
+			xe.DOMFix.parentNode(oClonedContainers.oEndContainer).removeChild(oClonedContainers.oEndContainer.nextSibling);
+
+		return oClonedContents;
+	},
+
+	_constructClonedTree : function(aNodes, oClonedParentNode){
+		var oClonedStartContainer = null;
+		var oClonedEndContainer = null;
+
+		var oStartContainer = this.startContainer;
+		var oEndContainer = this.endContainer;
+
+		_recurConstructClonedTree = function(aAllNodes, iCurIdx, oParentNode, oClonedParentNode){
+
+			if(iCurIdx < 0) return iCurIdx;
+
+			var iChildIdx = iCurIdx-1;
+
+			var oCurNodeCloneWithChildren = aAllNodes[iCurIdx].cloneNode(false);
+
+			if(aAllNodes[iCurIdx] == oStartContainer) oClonedStartContainer = oCurNodeCloneWithChildren;
+			if(aAllNodes[iCurIdx] == oEndContainer) oClonedEndContainer = oCurNodeCloneWithChildren;
+
+			while(iChildIdx >= 0 && xe.DOMFix.parentNode(aAllNodes[iChildIdx]) == aAllNodes[iCurIdx]){
+				iChildIdx = this._recurConstructClonedTree(aAllNodes, iChildIdx, aAllNodes[iCurIdx], oCurNodeCloneWithChildren, oClonedStartContainer, oClonedEndContainer);
+			}
+
+			// this may trigger an error message in IE when an erroneous script is inserted
+			oClonedParentNode.insertBefore(oCurNodeCloneWithChildren, oClonedParentNode.firstChild);
+
+			return iChildIdx;
+		};
+
+		aNodes[aNodes.length] = xe.DOMFix.parentNode(aNodes[aNodes.length-1]);
+		_recurConstructClonedTree(aNodes, aNodes.length-1, aNodes[aNodes.length-1], oClonedParentNode);
+
+		return {oStartContainer: oClonedStartContainer, oEndContainer: oClonedEndContainer};
+	},
+
+	cloneRange : function(){
+		return this._copyRange(new xe.W3CDOMRange(this._document));
+	},
+
+	_copyRange : function(oClonedRange){
+		oClonedRange.collapsed = this.collapsed;
+		oClonedRange.commonAncestorContainer = this.commonAncestorContainer;
+		oClonedRange.endContainer = this.endContainer;
+		oClonedRange.endOffset = this.endOffset;
+		oClonedRange.startContainer = this.startContainer;
+		oClonedRange.startOffset = this.startOffset;
+		oClonedRange._document = this._document;
+
+		return oClonedRange;
+	},
+
+	collapse : function(toStart){
+		if(toStart){
+			this.endContainer = this.startContainer;
+			this.endOffset = this.startOffset;
+		}else{
+			this.startContainer = this.endContainer;
+			this.startOffset = this.endOffset;
+		}
+
+		this._updateRangeInfo();
+	},
+
+	compareBoundaryPoints : function(how, sourceRange){
+		switch(how){
+			case xe.W3CDOMRange.START_TO_START:
+				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.startContainer, sourceRange.startOffset);
+			case xe.W3CDOMRange.START_TO_END:
+				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.startContainer, sourceRange.startOffset);
+			case xe.W3CDOMRange.END_TO_END:
+				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.endContainer, sourceRange.endOffset);
+			case xe.W3CDOMRange.END_TO_START:
+				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.endContainer, sourceRange.endOffset);
+		}
+	},
+
+	_findBody : function(oNode){
+		if(!oNode) return null;
+		while(oNode){
+			if(oNode.tagName == "BODY") return oNode;
+			oNode = xe.DOMFix.parentNode(oNode);
+		}
+		return null;
+	},
+
+	_compareEndPoint : function(oContainerA, iOffsetA, oContainerB, iOffsetB){
+		var iIdxA, iIdxB;
+
+		if(!oContainerA || this._findBody(oContainerA) != this._document.body){
+			oContainerA = this._document.body;
+			iOffsetA = 0;
+		}
+
+		if(!oContainerB || this._findBody(oContainerB) != this._document.body){
+			oContainerB = this._document.body;
+			iOffsetB = 0;
+		}
+
+		var compareIdx = function(iIdxA, iIdxB){
+			// iIdxX == -1 when the node is the commonAncestorNode
+			// if iIdxA == -1
+			// -> [[<nodeA>...<nodeB></nodeB>]]...</nodeA>
+			// if iIdxB == -1
+			// -> <nodeB>...[[<nodeA></nodeA>...</nodeB>]]
+			if(iIdxB == -1) iIdxB = iIdxA+1;
+			if(iIdxA < iIdxB) return -1;
+			if(iIdxA == iIdxB) return 0;
+			return 1;
+		};
+
+		var oCommonAncestor = this._getCommonAncestorContainer(oContainerA, oContainerB);
+
+		// ================================================================================================================================================
+		//  Move up both containers so that both containers are direct child nodes of the common ancestor node. From there, just compare the offset
+		// Add 0.5 for each contaienrs that has "moved up" since the actual node is wrapped by 1 or more parent nodes and therefore its position is somewhere between idx & idx+1
+		// <COMMON_ANCESTOR>NODE1<P>NODE2</P>NODE3</COMMON_ANCESTOR>
+		// The position of NODE2 in COMMON_ANCESTOR is somewhere between after NODE1(idx1) and before NODE3(idx2), so we let that be 1.5
+
+		// container node A in common ancestor container
+		var oNodeA = oContainerA;
+		if(oNodeA != oCommonAncestor){
+			while((oTmpNode = xe.DOMFix.parentNode(oNodeA)) != oCommonAncestor){oNodeA = oTmpNode;}
+
+			iIdxA = this._getPosIdx(oNodeA)+0.5;
+		}else iIdxA = iOffsetA;
+
+		// container node B in common ancestor container
+		var oNodeB = oContainerB;
+		if(oNodeB != oCommonAncestor){
+			while((oTmpNode = xe.DOMFix.parentNode(oNodeB)) != oCommonAncestor){oNodeB = oTmpNode;}
+
+			iIdxB = this._getPosIdx(oNodeB)+0.5;
+		}else iIdxB = iOffsetB;
+
+		return compareIdx(iIdxA, iIdxB);
+	},
+
+	_getCommonAncestorContainer : function(oNode1, oNode2){
+		var oComparingNode = oNode2;
+
+		while(oNode1){
+			while(oComparingNode){
+				if(oNode1 == oComparingNode) return oNode1;
+				oComparingNode = xe.DOMFix.parentNode(oComparingNode);
+			}
+			oComparingNode = oNode2;
+			oNode1 = xe.DOMFix.parentNode(oNode1);
+		}
+
+		return this._document.body;
+	},
+
+	deleteContents : function(){
+		if(this.collapsed) return;
+
+		this._splitTextEndNodesOfTheRange();
+
+		var aNodes = this._getNodesInRange();
+
+		if(aNodes.length < 1) return;
+
+		var oPrevNode = aNodes[0].previousSibling;
+		while(oPrevNode && this._isBlankTextNode(oPrevNode)) oPrevNode = oPrevNode.previousSibling;
+
+		var oNewStartContainer, iNewOffset;
+		if(!oPrevNode){
+			oNewStartContainer = xe.DOMFix.parentNode(aNodes[0]);
+			iNewOffset = 0;
+		}
+
+		for(var i=0; i<aNodes.length; i++){
+			var oNode = aNodes[i];
+			if(!oNode.firstChild){
+				if(oNewStartContainer == oNode){
+					iNewOffset = this._getPosIdx(oNewStartContainer);
+					oNewStartContainer = xe.DOMFix.parentNode(oNode);
+				}
+				xe.DOMFix.parentNode(oNode).removeChild(oNode);
+			}
+		}
+
+		if(!oPrevNode){
+			this.setStart(oNewStartContainer, iNewOffset);
+		}else{
+			if(oPrevNode.tagName == "BODY")
+				this.setStartBefore(oPrevNode);
+			else
+				this.setStartAfter(oPrevNode);
+		}
+
+		this.collapse(true);
+	},
+
+	extractContents : function(){
+		var oClonedContents = this.cloneContents();
+		this.deleteContents();
+		return oClonedContents;
+	},
+
+	insertNode : function(newNode){
+		var oFirstNode = null;
+
+		var oParentContainer;
+
+		if(this.startContainer.nodeType == "3"){
+			oParentContainer = xe.DOMFix.parentNode(this.startContainer);
+			if(this.startContainer.nodeValue.length <= this.startOffset)
+				oFirstNode = this.startContainer.nextSibling;
+			else
+				oFirstNode = this.startContainer.splitText(this.startOffset);
+		}else{
+			oParentContainer = this.startContainer;
+			oFirstNode = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+		}
+
+		if(!oFirstNode || !xe.DOMFix.parentNode(oFirstNode)) oFirstNode = null;
+
+		oParentContainer.insertBefore(newNode, oFirstNode);
+
+		this.setStartBefore(newNode);
+	},
+
+	selectNode : function(refNode){
+		this.setStartBefore(refNode);
+		this.setEndAfter(refNode);
+	},
+
+	selectNodeContents : function(refNode){
+		this.setStart(refNode, 0);
+		this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
+	},
+
+	_endsNodeValidation : function(oNode, iOffset){
+		if(!oNode || this._findBody(oNode) != this._document.body) throw new Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
+
+		if(oNode.nodeType == 3){
+			if(iOffset > oNode.nodeValue.length) iOffset = oNode.nodeValue.length;
+		}else{
+			if(iOffset > xe.DOMFix.childNodes(oNode).length) iOffset = xe.DOMFix.childNodes(oNode).length;
+		}
+
+		return iOffset;
+	},
+
+
+	setEnd : function(refNode, offset){
+		offset = this._endsNodeValidation(refNode, offset);
+
+		this.endContainer = refNode;
+		this.endOffset = offset;
+		if(!this.startContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(false);
+
+		this._updateRangeInfo();
+	},
+
+	setEndAfter : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");
+
+		if(refNode.tagName == "BODY"){
+			this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
+			return;
+		}
+		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
+	},
+
+	setEndBefore : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");
+
+		if(refNode.tagName == "BODY"){
+			this.setEnd(refNode, 0);
+			return;
+		}
+
+		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
+	},
+
+	setStart : function(refNode, offset){
+		offset = this._endsNodeValidation(refNode, offset);
+
+		this.startContainer = refNode;
+		this.startOffset = offset;
+
+		if(!this.endContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(true);
+		this._updateRangeInfo();
+	},
+
+	setStartAfter : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");
+
+		if(refNode.tagName == "BODY"){
+			this.setStart(refNode, xe.DOMFix.childNodes(refNode).length);
+			return;
+		}
+
+		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
+	},
+
+	setStartBefore : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");
+
+		if(refNode.tagName == "BODY"){
+			this.setStart(refNode, 0);
+			return;
+		}
+		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
+	},
+
+	surroundContents : function(newParent){
+		newParent.appendChild(this.extractContents());
+		this.insertNode(newParent);
+		this.selectNode(newParent);
+	},
+
+	toString : function(){
+		var oTmpContainer = this._document.createElement("DIV");
+		oTmpContainer.appendChild(this.cloneContents());
+
+		return oTmpContainer.textContent || oTmpContainer.innerText || "";
+	},
+
+	_isBlankTextNode : function(oNode){
+		if(oNode.nodeType == 3 && oNode.nodeValue == "") return true;
+		return false;
+	},
+
+	_getPosIdx : function(refNode){
+		var idx = 0;
+		for(var node = refNode.previousSibling; node; node = node.previousSibling) idx++;
+
+		return idx;
+	},
+
+	_updateRangeInfo : function(){
+		if(!this.startContainer){
+			this.init(this._document);
+			return;
+		}
+
+		this.collapsed = this._isCollapsed(this.startContainer, this.startOffset, this.endContainer, this.endOffset);
+
+		this.commonAncestorContainer = this._getCommonAncestorContainer(this.startContainer, this.endContainer);
+	},
+
+	_isCollapsed : function(oStartContainer, iStartOffset, oEndContainer, iEndOffset){
+		var bCollapsed = false;
+
+		if(oStartContainer == oEndContainer && iStartOffset == iEndOffset){
+			bCollapsed = true;
+		}else{
+			var oActualStartNode = this._getActualStartNode(oStartContainer, iStartOffset);
+			var oActualEndNode = this._getActualEndNode(oEndContainer, iEndOffset);
+
+			// Take the parent nodes on the same level for easier comparison when they're next to each other
+			// eg) From
+			//	<A>
+			//		<B>
+			//			<C>
+			//			</C>
+			//		</B>
+			//		<D>
+			//			<E>
+			//				<F>
+			//				</F>
+			//			</E>
+			//		</D>
+			//	</A>
+			//	, it's easier to compare the position of B and D rather than C and F because they are siblings
+			//
+			// If the range were collapsed, oActualEndNode will precede oActualStartNode by doing this
+			oActualStartNode = this._getNextNode(this._getPrevNode(oActualStartNode));
+			oActualEndNode = this._getPrevNode(this._getNextNode(oActualEndNode));
+
+			if(oActualStartNode && oActualEndNode && oActualEndNode.tagName != "BODY" &&
+				(this._getNextNode(oActualEndNode) == oActualStartNode || (oActualEndNode == oActualStartNode && this._isBlankTextNode(oActualEndNode)))
+			)
+				bCollapsed = true;
+		}
+
+		return bCollapsed;
+	},
+
+	_splitTextEndNodesOfTheRange : function(){
+		var oEndPoints = this._splitTextEndNodes({oStartContainer: this.startContainer, iStartOffset: this.startOffset,
+													oEndContainer: this.endContainer, iEndOffset: this.endOffset});
+
+		this.startContainer = oEndPoints.oStartContainer;
+		this.startOffset = oEndPoints.iStartOffset;
+
+		this.endContainer = oEndPoints.oEndContainer;
+		this.endOffset = oEndPoints.iEndOffset;
+	},
+
+	_splitTextEndNodes : function(oEndPoints){
+		oEndPoints = this._splitStartTextNode(oEndPoints);
+		oEndPoints = this._splitEndTextNode(oEndPoints);
+
+		return oEndPoints;
+	},
+
+	_splitStartTextNode : function(oEndPoints){
+		var oStartContainer = oEndPoints.oStartContainer;
+		var iStartOffset = oEndPoints.iStartOffset;
+
+		var oEndContainer = oEndPoints.oEndContainer;
+		var iEndOffset = oEndPoints.iEndOffset;
+
+		if(!oStartContainer) return oEndPoints;
+		if(oStartContainer.nodeType != 3) return oEndPoints;
+		if(iStartOffset == 0) return oEndPoints;
+
+		if(oStartContainer.nodeValue.length <= iStartOffset) return oEndPoints;
+
+		var oLastPart = oStartContainer.splitText(iStartOffset);
+
+		if(oStartContainer == oEndContainer){
+			iEndOffset -= iStartOffset;
+			oEndContainer = oLastPart;
+		}
+		oStartContainer = oLastPart;
+		iStartOffset = 0;
+
+		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
+	},
+
+	_splitEndTextNode : function(oEndPoints){
+		var oStartContainer = oEndPoints.oStartContainer;
+		var iStartOffset = oEndPoints.iStartOffset;
+
+		var oEndContainer = oEndPoints.oEndContainer;
+		var iEndOffset = oEndPoints.iEndOffset;
+
+		if(!oEndContainer) return oEndPoints;
+		if(oEndContainer.nodeType != 3) return oEndPoints;
+
+		if(iEndOffset >= oEndContainer.nodeValue.length) return oEndPoints;
+		if(iEndOffset == 0) return oEndPoints;
+
+		oEndContainer.splitText(iEndOffset);
+
+		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
+	},
+
+	_getNodesInRange : function(){
+		if(this.collapsed) return [];
+
+		var oStartNode = this._getActualStartNode(this.startContainer, this.startOffset);
+		var oEndNode = this._getActualEndNode(this.endContainer, this.endOffset);
+
+		return this._getNodesBetween(oStartNode, oEndNode);
+	},
+
+	_getActualStartNode : function(oStartContainer, iStartOffset){
+		var oStartNode = oStartContainer;;
+
+		if(oStartContainer.nodeType == 3){
+			if(iStartOffset >= oStartContainer.nodeValue.length){
+				oStartNode = this._getNextNode(oStartContainer);
+				if(oStartNode.tagName == "BODY") oStartNode = null;
+			}else{
+				oStartNode = oStartContainer;
+			}
+		}else{
+			if(iStartOffset < xe.DOMFix.childNodes(oStartContainer).length){
+				oStartNode = xe.DOMFix.childNodes(oStartContainer)[iStartOffset];
+			}else{
+				oStartNode = this._getNextNode(oStartContainer);
+				if(oStartNode.tagName == "BODY") oStartNode = null;
+			}
+		}
+
+		return oStartNode;
+	},
+
+	_getActualEndNode : function(oEndContainer, iEndOffset){
+		var oEndNode = oEndContainer;
+
+		if(iEndOffset == 0){
+			oEndNode = this._getPrevNode(oEndContainer);
+			if(oEndNode.tagName == "BODY") oEndNode = null;
+		}else if(oEndContainer.nodeType == 3){
+			oEndNode = oEndContainer;
+		}else{
+			oEndNode = xe.DOMFix.childNodes(oEndContainer)[iEndOffset-1];
+		}
+
+		return oEndNode;
+	},
+
+	_getNextNode : function(oNode){
+		if(!oNode || oNode.tagName == "BODY") return this._document.body;
+
+		if(oNode.nextSibling) return oNode.nextSibling;
+
+		return this._getNextNode(xe.DOMFix.parentNode(oNode));
+	},
+
+	_getPrevNode : function(oNode){
+		if(!oNode || oNode.tagName == "BODY") return this._document.body;
+
+		if(oNode.previousSibling) return oNode.previousSibling;
+
+		return this._getPrevNode(xe.DOMFix.parentNode(oNode));
+	},
+
+	// includes partially selected
+	// for <div id="a"><div id="b"></div></div><div id="c"></div>, _getNodesBetween(b, c) will yield to b, "a" and c
+	_getNodesBetween : function(oStartNode, oEndNode){
+		var aNodesBetween = [];
+		this._nNodesBetweenLen = 0;
+
+		if(!oStartNode || !oEndNode) return aNodesBetween;
+
+		this._recurGetNextNodesUntil(oStartNode, oEndNode, aNodesBetween);
+		return aNodesBetween;
+	},
+
+	_recurGetNextNodesUntil : function(oNode, oEndNode, aNodesBetween){
+		if(!oNode) return false;
+
+		if(!this._recurGetChildNodesUntil(oNode, oEndNode, aNodesBetween)) return false;
+
+		var oNextToChk = oNode.nextSibling;
+
+		while(!oNextToChk){
+			if(!(oNode = xe.DOMFix.parentNode(oNode))) return false;
+
+			aNodesBetween[this._nNodesBetweenLen++] = oNode;
+
+			if(oNode == oEndNode) return false;
+
+			oNextToChk = oNode.nextSibling;
+		}
+
+		return this._recurGetNextNodesUntil(oNextToChk, oEndNode, aNodesBetween);
+	},
+
+	_recurGetChildNodesUntil : function(oNode, oEndNode, aNodesBetween){
+		if(!oNode) return false;
+
+		var bEndFound = false;
+		var oCurNode = oNode;
+		if(oCurNode.firstChild){
+			oCurNode = oCurNode.firstChild;
+			while(oCurNode){
+				if(!this._recurGetChildNodesUntil(oCurNode, oEndNode, aNodesBetween)){
+					bEndFound = true;
+					break;
+				}
+				oCurNode = oCurNode.nextSibling;
+			}
+		}
+
+		aNodesBetween[this._nNodesBetweenLen++] = oNode;
+
+		if(bEndFound) return false;
+		if(oNode == oEndNode) return false;
+
+		return true;
+	}
+});
+
+xe.W3CDOMRange.START_TO_START = 0;
+xe.W3CDOMRange.START_TO_END = 1;
+xe.W3CDOMRange.END_TO_END = 2;
+xe.W3CDOMRange.END_TO_START = 3;
+
+
+/**
+ * @fileOverview This file contains a cross-browser function that implements all of the W3C's DOM Range specification and some more
+ * @name XpressRange.js
+ */
+xe.XpressRange = $.Class({
+	setWindow : function(win){
+		this._window = win;
+		this._document = win.document;
+	},
+
+	$init : function(win){
+		this.HUSKY_BOOMARK_START_ID_PREFIX = "xpress_bookmark_start_";
+		this.HUSKY_BOOMARK_END_ID_PREFIX = "xpress_bookmark_end_";
+
+		this.sBlockElement = "P|DIV|LI|H[1-6]|PRE";
+		this.sBlockContainer = "BODY|TABLE|TH|TR|TD|UL|OL|BLOCKQUOTE|FORM";
+
+		this.rxBlockElement = new RegExp("^("+this.sBlockElement+")$");
+		this.rxBlockContainer = new RegExp("^("+this.sBlockContainer+")$")
+		this.rxLineBreaker = new RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$")
+
+		this.setWindow(win);
+
+		this.oSimpleSelection = new xe.SimpleSelection(this._window);
+		this.selectionLoaded = this.oSimpleSelection.selectionLoaded;
+
+		this.$super.$init(this._document);
+	},
+
+	select : function(){
+		this.oSimpleSelection.selectRange(this);
+	},
+
+	setFromSelection : function(iNum){
+		this.setRange(this.oSimpleSelection.getRangeAt(iNum));
+	},
+
+	setRange : function(oW3CRange){
+		this.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
+		this.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
+	},
+
+	setEndNodes : function(oSNode, oENode){
+		this.setEndAfter(oENode);
+		this.setStartBefore(oSNode);
+	},
+
+	splitTextAtBothEnds : function(){
+		this._splitTextEndNodesOfTheRange();
+	},
+
+	getStartNode : function(){
+		if(this.collapsed){
+			if(this.startContainer.nodeType == 3){
+				if(this.startOffset == 0) return null;
+				if(this.startContainer.nodeValue.length <= this.startOffset) return null;
+				return this.startContainer;
+			}
+			return null;
+		}
+
+		if(this.startContainer.nodeType == 3){
+			if(this.startOffset >= this.startContainer.nodeValue.length) return this._getNextNode(this.startContainer);
+			return this.startContainer;
+		}else{
+			if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length) return this._getNextNode(this.startContainer);
+			return xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+		}
+	},
+
+	getEndNode : function(){
+		if(this.collapsed) return this.getStartNode();
+
+		if(this.endContainer.nodeType == 3){
+			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
+			return this.endContainer;
+		}else{
+			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
+			return xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
+		}
+	},
+
+	getNodeAroundRange : function(bBefore, bStrict){
+		if(this.collapsed && this.startContainer && this.startContainer.nodeType == 3) return this.startContainer;
+		if(!this.collapsed || (this.startContainer && this.startContainer.nodeType == 3)) return this.getStartNode();
+
+		var oBeforeRange, oAfterRange, oResult;
+
+		if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length)
+			oAfterRange = this._getNextNode(this.startContainer);
+		else
+			oAfterRange = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+
+		if(this.endOffset == 0)
+			oBeforeRange = this._getPrevNode(this.endContainer);
+		else
+			oBeforeRange = xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
+
+		if(bBefore){
+			oResult = oBeforeRange;
+			if(!oResult && !bStrict) oResult = oAfterRange;
+		}else{
+			oResult = oAfterRange;
+			if(!oResult && !bStrict) oResult = oBeforeRange;
+		}
+
+		return oResult;
+	},
+
+	_getXPath : function(elNode){
+		var sXPath = "";
+
+		while(elNode && elNode.nodeType == 1){
+			sXPath = "/" + elNode.tagName+"["+this._getPosIdx4XPath(elNode)+"]" + sXPath;
+			elNode = xe.DOMFix.parentNode(elNode);
+		}
+
+		return sXPath;
+	},
+
+	_getPosIdx4XPath : function(refNode){
+		var idx = 0;
+		for(var node = refNode.previousSibling; node; node = node.previousSibling)
+			if(node.tagName == refNode.tagName) idx++;
+
+		return idx;
+	},
+
+	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
+	_evaluateXPath : function(sXPath, oDoc){
+		sXPath = sXPath.substring(1, sXPath.length-1);
+		var aXPath = sXPath.split(/\//);
+		var elNode = oDoc.body;
+
+		for(var i=2; i<aXPath.length && elNode; i++){
+			aXPath[i].match(/([^\[]+)\[(\d+)/i);
+			var sTagName = RegExp.$1;
+			var nIdx = RegExp.$2;
+
+			var aAllNodes = xe.DOMFix.childNodes(elNode);
+			var aNodes = [];
+			var nLength = aAllNodes.length;
+			var nCount = 0;
+			for(var ii=0; ii<nLength; ii++){
+				if(aAllNodes[ii].tagName == sTagName) aNodes[nCount++] = aAllNodes[ii];
+			}
+
+			if(aNodes.length < nIdx)
+				elNode = null;
+			else
+				elNode = aNodes[nIdx];
+		}
+
+		return elNode;
+	},
+
+	_evaluateXPathBookmark : function(oBookmark){
+		var sXPath = oBookmark["sXPath"];
+		var nTextNodeIdx = oBookmark["nTextNodeIdx"];
+		var nOffset = oBookmark["nOffset"];
+
+		var elContainer = this._evaluateXPath(sXPath, this._document);
+
+		if(nTextNodeIdx > -1 && elContainer){
+			var aChildNodes = xe.DOMFix.childNodes(elContainer);
+			var elNode = null;
+
+			var nIdx = nTextNodeIdx;
+			var nOffsetLeft = nOffset;
+
+			while((elNode = aChildNodes[nIdx]) && elNode.nodeType == 3 && elNode.nodeValue.length < nOffsetLeft){
+				nOffsetLeft -= elNode.nodeValue.length;
+				nIdx++;
+			}
+
+			elContainer = xe.DOMFix.childNodes(elContainer)[nIdx];
+			nOffset = nOffsetLeft;
+		}
+
+		if(!elContainer){
+			elContainer = this._document.body;
+			nOffset = 0;
+		}
+		return {elContainer: elContainer, nOffset: nOffset};
+	},
+
+	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
+	getXPathBookmark : function(){
+		var nTextNodeIdx1 = -1;
+		var htEndPt1 = {elContainer: this.startContainer, nOffset: this.startOffset};
+		var elNode1 = this.startContainer;
+		if(elNode1.nodeType == 3){
+			htEndPt1 = this._getFixedStartTextNode();
+			nTextNodeIdx1 = this._getPosIdx(htEndPt1.elContainer);
+			elNode1 = xe.DOMFix.parentNode(elNode1);
+		}
+		var sXPathNode1 = this._getXPath(elNode1);
+		var oBookmark1 = {sXPath:sXPathNode1, nTextNodeIdx:nTextNodeIdx1, nOffset: htEndPt1.nOffset};
+
+		var nTextNodeIdx2 = -1;
+		var htEndPt2 = {elContainer: this.endContainer, nOffset: this.endOffset};
+		var elNode2 = this.endContainer;
+		if(elNode2.nodeType == 3){
+			htEndPt2 = this._getFixedEndTextNode();
+			nTextNodeIdx2 = this._getPosIdx(htEndPt2.elContainer);
+			elNode2 = xe.DOMFix.parentNode(elNode2);
+		}
+		var sXPathNode2 = this._getXPath(elNode2);
+		var oBookmark2 = {sXPath:sXPathNode2, nTextNodeIdx:nTextNodeIdx2, nOffset: htEndPt2.nOffset};
+
+		return [oBookmark1, oBookmark2];
+	},
+
+	moveToXPathBookmark : function(aBookmark){
+		if(!aBookmark) return;
+
+		var oBookmarkInfo1 = this._evaluateXPathBookmark(aBookmark[0]);
+		var oBookmarkInfo2 = this._evaluateXPathBookmark(aBookmark[1]);
+
+		if(!oBookmarkInfo1["elContainer"] || !oBookmarkInfo2["elContainer"]) return;
+
+		this.startContainer = oBookmarkInfo1["elContainer"];
+		this.startOffset = oBookmarkInfo1["nOffset"];
+
+		this.endContainer = oBookmarkInfo2["elContainer"];
+		this.endOffset = oBookmarkInfo2["nOffset"];
+	},
+
+	_getFixedTextContainer : function(elNode, nOffset){
+		while(elNode && elNode.nodeType == 3 && elNode.previousSibling && elNode.previousSibling.nodeType == 3){
+			nOffset += elNode.previousSibling.nodeValue.length;
+			elNode = elNode.previousSibling;
+		}
+
+		return {elContainer:elNode, nOffset:nOffset};
+	},
+
+	_getFixedStartTextNode : function(){
+		return this._getFixedTextContainer(this.startContainer, this.startOffset);
+	},
+
+	_getFixedEndTextNode : function(){
+		return this._getFixedTextContainer(this.endContainer, this.endOffset);
+	},
+
+	placeStringBookmark : function(){
+		var sTmpId = (new Date()).getTime();
+
+		var oInsertionPoint = this.cloneRange();
+		oInsertionPoint.collapseToEnd();
+		var oEndMarker = this._document.createElement("A");
+		oEndMarker.id = this.HUSKY_BOOMARK_END_ID_PREFIX+sTmpId;
+		oInsertionPoint.insertNode(oEndMarker);
+
+		var oInsertionPoint = this.cloneRange();
+		oInsertionPoint.collapseToStart();
+		var oStartMarker = this._document.createElement("A");
+		oStartMarker.id = this.HUSKY_BOOMARK_START_ID_PREFIX+sTmpId;
+		oInsertionPoint.insertNode(oStartMarker);
+
+		this.moveToBookmark(sTmpId);
+
+		return sTmpId;
+	},
+
+	cloneRange : function(){
+		return this._copyRange(new xe.XpressRange(this._window));
+	},
+
+	moveToBookmark : function(vBookmark){
+		if(typeof(vBookmark) != "object")
+			this.moveToStringBookmark(vBookmark);
+		else
+			this.moveToXPathBookmark(vBookmark);
+	},
+
+	moveToStringBookmark : function(sBookmarkID){
+		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
+		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
+
+		if(!oStartMarker || !oEndMarker) return;
+
+		this.setEndBefore(oEndMarker);
+		this.setStartAfter(oStartMarker);
+	},
+
+	removeStringBookmark : function(sBookmarkID){
+		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
+		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
+
+		if(oStartMarker) xe.DOMFix.parentNode(oStartMarker).removeChild(oStartMarker);
+		if(oEndMarker) xe.DOMFix.parentNode(oEndMarker).removeChild(oEndMarker);
+	},
+
+	collapseToStart : function(){
+		this.collapse(true);
+	},
+
+	collapseToEnd : function(){
+		this.collapse(false);
+	},
+
+	createAndInsertNode : function(sTagName){
+		tmpNode = this._document.createElement(tagName);
+		this.insertNode(tmpNode)
+		return tmpNode
+	},
+
+	getNodes : function(bSplitTextEndNodes, fnFilter){
+		if(bSplitTextEndNodes) this._splitTextEndNodesOfTheRange();
+
+		var aAllNodes = this._getNodesInRange();
+		var aFilteredNodes = [];
+
+		if(!fnFilter) return aAllNodes;
+
+		for(var i=0; i<aAllNodes.length; i++)
+			if(fnFilter(aAllNodes[i])) aFilteredNodes[aFilteredNodes.length] = aAllNodes[i];
+
+		return aFilteredNodes;
+	},
+
+	getTextNodes : function(bSplitTextEndNodes){
+		var txtFilter = function(oNode){
+			if (oNode.nodeType == 3 && oNode.nodeValue != "\n" && oNode.nodeValue != "")
+				return true;
+			else
+				return false;
+		}
+
+		return this.getNodes(bSplitTextEndNodes, txtFilter);
+	},
+
+	surroundContentsWithNewNode : function(sTagName){
+		var oNewParent = this._document.createElement(sTagName);
+		this.surroundContents(oNewParent);
+		return oNewParent;
+	},
+
+	isRangeinRange : function(oAnoterRange, bIncludePartlySelected){
+		var startToStart = this.compareBoundaryPoints(this.START_TO_START, oAnoterRange);
+		var startToEnd = this.compareBoundaryPoints(this.START_TO_END, oAnoterRange);
+		var endToStart = this.compareBoundaryPoints(this.END_TO_START, oAnoterRange);
+		var endToEnd = this.compareBoundaryPoints(this.END_TO_END, oAnoterRange);
+
+		if(startToStart <= 0 && endToEnd >= 0) return true;
+
+		if(bIncludePartlyIncluded){
+			if(startToEnd == 1) return false;
+			if(endToStart == -1) return false;
+			return true;
+		}
+
+		return false;
+	},
+
+	isNodeInRange : function(oNode, bIncludePartlySelected, bContentOnly){
+		var oTmpRange = new xe.XpressRange(this._window);
+
+		if(bContentOnly && oNode.firstChild){
+			oTmpRange.setStartBefore(oNode.firstChild);
+			oTmpRange.setEndAfter(oNode.lastChild);
+		}else{
+			oTmpRange.selectNode(oNode);
+		}
+
+		return isRangeInRange(oTmpRange, bIncludePartlySelected);
+	},
+
+	pasteHTML : function(sHTML){
+		if(sHTML == ""){
+			this.deleteContents();
+			return;
+		}
+
+		var oTmpDiv = this._document.createElement("DIV");
+		oTmpDiv.innerHTML = sHTML;
+
+		var oFirstNode = oTmpDiv.firstChild;
+		var oLastNode = oTmpDiv.lastChild;
+
+		var clone = this.cloneRange();
+		var sBM = clone.placeStringBookmark();
+
+		while(oTmpDiv.lastChild) this.insertNode(oTmpDiv.lastChild);
+
+		this.setEndNodes(oFirstNode, oLastNode);
+
+		// delete the content later as deleting it first may mass up the insertion point
+		// eg) <p>[A]BCD</p> ---paste O---> O<p>BCD</p>
+		clone.moveToBookmark(sBM);
+		clone.deleteContents();
+		clone.removeStringBookmark(sBM);
+	},
+
+	toString : function(){
+		this.toString = xe.W3CDOMRange.prototype.toString;
+		return this.toString();
+	},
+
+	toHTMLString : function(){
+		var oTmpContainer = this._document.createElement("DIV");
+		oTmpContainer.appendChild(this.cloneContents());
+
+		return oTmpContainer.innerHTML;
+	},
+
+	findAncestorByTagName : function(sTagName){
+		var oNode = this.commonAncestorContainer;
+		while(oNode && oNode.tagName != sTagName) oNode = xe.DOMFix.parentNode(oNode);
+
+		return oNode;
+	},
+
+	selectNodeContents : function(oNode){
+		if(!oNode) return;
+
+		var oFirstNode = oNode.firstChild?oNode.firstChild:oNode;
+		var oLastNode = oNode.lastChild?oNode.lastChild:oNode;
+
+		if(oFirstNode.nodeType == 3)
+			this.setStart(oFirstNode, 0);
+		else
+			this.setStartBefore(oFirstNode);
+
+		if(oLastNode.nodeType == 3)
+			this.setEnd(oLastNode, oLastNode.nodeValue.length);
+		else
+			this.setEndAfter(oLastNode);
+	},
+
+	styleRange : function(oStyle, oAttribute, sNewSpanMarker){
+		var aStyleParents = this._getStyleParentNodes(sNewSpanMarker);
+		if(aStyleParents.length < 1) return;
+
+		var sName, sValue;
+
+		for(var i=0; i<aStyleParents.length; i++){
+			for(var x in oStyle){
+				sName = x;
+				sValue = oStyle[sName];
+
+				if(typeof sValue != "string") continue;
+
+				aStyleParents[i].style[sName] = sValue;
+			}
+
+			if(!oAttribute) continue;
+
+			for(var x in oAttribute){
+				sName = x;
+				sValue = oAttribute[sName];
+
+				if(typeof sValue != "string") continue;
+
+				if(sName == "class"){
+					$(aStyleParents[i]).addClass(sValue);
+				}else{
+					aStyleParents[i].setAttribute(sName, sValue);
+				}
+			}
+		}
+
+		this.setStartBefore(aStyleParents[0]);
+		this.setEndAfter(aStyleParents[aStyleParents.length-1]);
+	},
+
+	_getStyleParentNodes : function(sNewSpanMarker){
+		this._splitTextEndNodesOfTheRange();
+
+		var oSNode = this.getStartNode();
+		var oENode = this.getEndNode();
+
+		var aAllNodes = this._getNodesInRange();
+		var aResult = [];
+		var nResult = 0;
+
+		var oNode, oTmpNode, iStartRelPos, iEndRelPos, oSpan, iSIdx, iEIdx, oParentNode;
+		var nInitialLength  = aAllNodes.length;
+		var arAllBottmNodes = $(aAllNodes).filter(function(){ return !!this.childNodes.length });
+
+		for(var i=0; i<nInitialLength; i++){
+			oNode = aAllNodes[i];
+
+			if(!oNode || oNode.nodeType != 3 || oNode.nodeValue == '') continue;
+			
+			oParentNode = xe.DOMFix.parentNode(oNode);
+
+			if(oParentNode.tagName == "SPAN"){
+				// check if the SPAN element is fully contained
+				// do quick checks before trying indexOf() because indexOf() function is very slow
+				oTmpNode = this._getVeryFirstRealChild(oParentNode);
+				if(oTmpNode == oNode) iSIdx = 1;
+				else iSIdx = arAllBottmNodes.indexOf(oTmpNode);
+
+				if(iSIdx != -1){
+					oTmpNode = this._getVeryLastRealChild(oParentNode);
+					if(oTmpNode == oNode) iEIdx = 1;
+					else iEIdx = arAllBottmNodes.indexOf(oTmpNode);
+				}
+
+				if(iSIdx != -1 && iEIdx != -1){
+					aResult[nResult++] = oParentNode;
+					continue;
+				}
+			}
+
+			oSpan = this._document.createElement("SPAN");
+			oParentNode.insertBefore(oSpan, oNode);
+			oSpan.appendChild(oNode);
+			aResult[nResult++] = oSpan;
+
+			if(sNewSpanMarker) oSpan.setAttribute(sNewSpanMarker, "true");
+		}
+
+		this.setStartBefore(oSNode);
+		this.setEndAfter(oENode);
+
+		return aResult;
+	},
+
+	_getVeryFirstChild : function(oNode){
+		if(oNode.firstChild) return this._getVeryFirstChild(oNode.firstChild);
+		return oNode;
+	},
+
+	_getVeryLastChild : function(oNode){
+		if(oNode.lastChild) return this._getVeryLastChild(oNode.lastChild);
+		return oNode;
+	},
+
+	_getFirstRealChild : function(oNode){
+		var oFirstNode = oNode.firstChild;
+		while(oFirstNode && oFirstNode.nodeType == 3 && oFirstNode.nodeValue == "") oFirstNode = oFirstNode.nextSibling;
+
+		return oFirstNode;
+	},
+
+	_getLastRealChild : function(oNode){
+		var oLastNode = oNode.lastChild;
+		while(oLastNode && oLastNode.nodeType == 3 && oLastNode.nodeValue == "") oLastNode = oLastNode.previousSibling;
+
+		return oLastNode;
+	},
+
+	_getVeryFirstRealChild : function(oNode){
+		var oFirstNode = this._getFirstRealChild(oNode);
+		if(oFirstNode) return this._getVeryFirstRealChild(oFirstNode);
+		return oNode;
+	},
+	_getVeryLastRealChild : function(oNode){
+		var oLastNode = this._getLastRealChild(oNode);
+		if(oLastNode) return this._getVeryLastChild(oLastNode);
+		return oNode;
+	},
+
+	_getLineStartInfo : function(node){
+		var frontEndFinal = null;
+		var frontEnd = node;
+		var lineBreaker = node;
+		var bParentBreak = true;
+
+		var rxLineBreaker = this.rxLineBreaker;
+
+		// vertical(parent) search
+		function getLineStart(node){
+			if(!node) return;
+			if(frontEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				frontEndFinal = frontEnd;
+
+				bParentBreak = true;
+
+				return;
+			}else{
+				frontEnd = node;
+			}
+
+			getFrontEnd(node.previousSibling);
+
+			if(frontEndFinal) return;
+			getLineStart(xe.DOMFix.parentNode(node));
+		}
+
+		// horizontal(sibling) search
+		function getFrontEnd(node){
+			if(!node) return;
+			if(frontEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				frontEndFinal = frontEnd;
+
+				bParentBreak = false;
+				return;
+			}
+
+			if(node.firstChild && node.tagName != "TABLE"){
+				var curNode = node.lastChild;
+				while(curNode && !frontEndFinal){
+					getFrontEnd(curNode);
+
+					curNode = curNode.previousSibling;
+				}
+			}else{
+				frontEnd = node;
+			}
+
+			if(!frontEndFinal){
+				getFrontEnd(node.previousSibling);
+			}
+		}
+
+		getLineStart(node);
+
+		return {oNode: frontEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
+	},
+
+	_getLineEndInfo : function(node){
+		var backEndFinal = null;
+		var backEnd = node;
+		var lineBreaker = node;
+		var bParentBreak = true;
+
+		var rxLineBreaker = this.rxLineBreaker;
+
+		// vertical(parent) search
+		function getLineEnd(node){
+			if(!node) return;
+			if(backEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				backEndFinal = backEnd;
+
+				bParentBreak = true;
+
+				return;
+			}else{
+				backEnd = node;
+			}
+
+			getBackEnd(node.nextSibling);
+			if(backEndFinal) return;
+
+			getLineEnd(xe.DOMFix.parentNode(node));
+		}
+
+		// horizontal(sibling) search
+		function getBackEnd(node){
+			if(!node) return;
+			if(backEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				backEndFinal = backEnd;
+
+				bParentBreak = false;
+
+				return;
+			}
+
+			if(node.firstChild && node.tagName != "TABLE"){
+				var curNode = node.firstChild;
+				while(curNode && !backEndFinal){
+					getBackEnd(curNode);
+
+					curNode = curNode.nextSibling;
+				}
+			}else{
+				backEnd = node;
+			}
+
+			if(!backEndFinal){
+				getBackEnd(node.nextSibling);
+			}
+		}
+
+		getLineEnd(node);
+
+		return {oNode: backEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
+	},
+
+	getLineInfo : function(){
+		var oSNode = this.getStartNode();
+		var oENode = this.getEndNode();
+
+		// the range is currently collapsed
+		if(!oSNode) oSNode = this.getNodeAroundRange(true, true);
+		if(!oENode) oENode = this.getNodeAroundRange(true, true);
+
+		var oStart = this._getLineStartInfo(oSNode);
+		var oStartNode = oStart.oNode;
+		var oEnd = this._getLineEndInfo(oENode);
+		var oEndNode = oEnd.oNode;
+
+		var iRelativeStartPos = this._compareEndPoint(xe.DOMFix.parentNode(oStartNode), this._getPosIdx(oStartNode), this.endContainer, this.endOffset);
+		var iRelativeEndPos = this._compareEndPoint(xe.DOMFix.parentNode(oEndNode), this._getPosIdx(oEndNode)+1, this.startContainer, this.startOffset);
+
+		if(!(iRelativeStartPos <= 0 && iRelativeEndPos >= 0)){
+			oSNode = this.getNodeAroundRange(false, true);
+			oENode = this.getNodeAroundRange(false, true);
+			oStart = this._getLineStartInfo(oSNode);
+			oEnd = this._getLineEndInfo(oENode);
+		}
+
+		return {oStart: oStart, oEnd: oEnd};
+	}
+}).extend(xe.W3CDOMRange);
+
+/**
+ * @fileOverview This file contains cross-browser selection function
+ * @name SimpleSelection.js
+ */
+xe.SimpleSelection = function(win){
+	this.init = function(win){
+		this._window = win || window;
+		this._document = this._window.document;
+	};
+
+	this.init(win);
+
+	if($.browser.msie)
+		xe.SimpleSelectionImpl_IE.apply(this);
+	else
+		xe.SimpleSelectionImpl_FF.apply(this);
+
+	this.selectRange = function(oRng){
+		this.selectNone();
+		this.addRange(oRng);
+	};
+
+	this.selectionLoaded = true;
+	if(!this._oSelection) this.selectionLoaded = false;
+};
+
+xe.SimpleSelectionImpl_FF = function(){
+	this._oSelection = this._window.getSelection();
+
+	this.getRangeAt = function(iNum){
+		iNum = iNum || 0;
+
+		try{
+			var oFFRange = this._oSelection.getRangeAt(iNum);
+		}catch(e){return new xe.W3CDOMRange(this._document);}
+
+		return this._FFRange2W3CRange(oFFRange);
+	};
+
+	this.addRange = function(oW3CRange){
+		var oFFRange = this._W3CRange2FFRange(oW3CRange);
+		this._oSelection.addRange(oFFRange);
+	};
+
+	this.selectNone = function(){
+		this._oSelection.removeAllRanges();
+	};
+
+	this._FFRange2W3CRange = function(oFFRange){
+		var oW3CRange = new xe.W3CDOMRange(this._document);
+		oW3CRange.setStart(oFFRange.startContainer, oFFRange.startOffset);
+		oW3CRange.setEnd(oFFRange.endContainer, oFFRange.endOffset);
+		return oW3CRange;
+	};
+
+	this._W3CRange2FFRange = function(oW3CRange){
+		var oFFRange = this._document.createRange();
+		oFFRange.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
+		oFFRange.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
+
+		return oFFRange;
+	};
+};
+
+xe.SimpleSelectionImpl_IE = function(){
+	this._oSelection = this._document.selection;
+
+	this.getRangeAt = function(iNum){
+		iNum = iNum || 0;
+
+		if(this._oSelection.type == "Control"){
+			var oW3CRange = new xe.W3CDOMRange(this._document);
+
+			var oSelectedNode = this._oSelection.createRange().item(iNum);
+
+			// if the selction occurs in a different document, ignore
+			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document) return oW3CRange;
+
+			oW3CRange.selectNode(oSelectedNode);
+
+			return oW3CRange;
+		}else{
+			var oSelectedNode = this._oSelection.createRangeCollection().item(iNum).parentElement();
+
+			// if the selction occurs in a different document, ignore
+			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document){
+				var oW3CRange = new xe.W3CDOMRange(this._document);
+				return oW3CRange;
+			}
+			return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(iNum));
+		}
+	};
+
+	this.addRange = function(oW3CRange){
+		var oIERange = this._W3CRange2IERange(oW3CRange);
+		oIERange.select();
+	};
+
+	this.selectNone = function(){
+		this._oSelection.empty();
+	};
+
+	this._W3CRange2IERange = function(oW3CRange){
+		var oStartIERange = this._getIERangeAt(oW3CRange.startContainer, oW3CRange.startOffset);
+		var oEndIERange = this._getIERangeAt(oW3CRange.endContainer, oW3CRange.endOffset);
+		oStartIERange.setEndPoint("EndToEnd", oEndIERange);
+
+		return oStartIERange;
+	};
+
+	this._getIERangeAt = function(oW3CContainer, iW3COffset){
+		var oIERange = this._document.body.createTextRange();
+
+		var oEndPointInfoForIERange = this._getSelectableNodeAndOffsetForIE(oW3CContainer, iW3COffset);
+
+		var oSelectableNode = oEndPointInfoForIERange.oSelectableNodeForIE;
+		var iIEOffset = oEndPointInfoForIERange.iOffsetForIE;
+
+		oIERange.moveToElementText(oSelectableNode);
+		oIERange.collapse(oEndPointInfoForIERange.bCollapseToStart);
+		oIERange.moveStart("character", iIEOffset);
+
+		return oIERange;
+	};
+
+	this._getSelectableNodeAndOffsetForIE = function(oW3CContainer, iW3COffset){
+		var oIERange = this._document.body.createTextRange();
+
+		var oNonTextNode = null;
+		var aChildNodes =  null;
+		var iNumOfLeftNodesToCount = 0;
+
+		if(oW3CContainer.nodeType == 3){
+			oNonTextNode = xe.DOMFix.parentNode(oW3CContainer);
+			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
+			iNumOfLeftNodesToCount = aChildNodes.length;
+		}else{
+			oNonTextNode = oW3CContainer;
+			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
+			iNumOfLeftNodesToCount = iW3COffset;
+		}
+
+		var oNodeTester = null;
+
+		var iResultOffset = 0;
+
+		var bCollapseToStart = true;
+
+		for(var i=0; i<iNumOfLeftNodesToCount; i++){
+			oNodeTester = aChildNodes[i];
+
+			if(oNodeTester.nodeType == 3){
+				if(oNodeTester == oW3CContainer) break;
+
+				iResultOffset += oNodeTester.nodeValue.length;
+			}else{
+				oIERange.moveToElementText(oNodeTester);
+				oNonTextNode = oNodeTester;
+				iResultOffset = 0;
+
+				bCollapseToStart = false;
+			}
+		}
+
+		if(oW3CContainer.nodeType == 3) iResultOffset += iW3COffset;
+
+		return {oSelectableNodeForIE:oNonTextNode, iOffsetForIE: iResultOffset, bCollapseToStart: bCollapseToStart};
+	};
+
+	this._IERange2W3CRange = function(oIERange){
+		var oW3CRange = new xe.W3CDOMRange(this._document);
+
+		var oIEPointRange = null;
+		var oPosition = null;
+
+		oIEPointRange = oIERange.duplicate();
+		oIEPointRange.collapse(true);
+
+		oPosition = this._getW3CContainerAndOffset(oIEPointRange, true);
+
+		oW3CRange.setStart(oPosition.oContainer, oPosition.iOffset);
+
+		var oCollapsedChecker = oIERange.duplicate();
+		oCollapsedChecker.collapse(true);
+		if(oCollapsedChecker.isEqual(oIERange)){
+			oW3CRange.collapse(true);
+		}else{
+			oIEPointRange = oIERange.duplicate();
+			oIEPointRange.collapse(false);
+			oPosition = this._getW3CContainerAndOffset(oIEPointRange);
+			oW3CRange.setEnd(oPosition.oContainer, oPosition.iOffset);
+		}
+
+		return oW3CRange;
+	};
+
+	this._getW3CContainerAndOffset = function(oIEPointRange, bStartPt){
+		var oRgOrigPoint = oIEPointRange;
+
+		var oContainer = oRgOrigPoint.parentElement();
+		var offset = -1;
+
+		var oRgTester = this._document.body.createTextRange();
+		var aChildNodes = xe.DOMFix.childNodes(oContainer);
+		var oPrevNonTextNode = null;
+		var pointRangeIdx = 0;
+
+		for(var i=0;i<aChildNodes.length;i++){
+			if(aChildNodes[i].nodeType == 3) continue;
+
+			oRgTester.moveToElementText(aChildNodes[i]);
+
+			if(oRgTester.compareEndPoints("StartToStart", oIEPointRange)>=0) break;
+
+			oPrevNonTextNode = aChildNodes[i];
+		}
+
+		var pointRangeIdx = i;
+
+		if(pointRangeIdx != 0 && aChildNodes[pointRangeIdx-1].nodeType == 3){
+			var oRgTextStart = this._document.body.createTextRange();
+			var oCurTextNode = null;
+			if(oPrevNonTextNode){
+				oRgTextStart.moveToElementText(oPrevNonTextNode);
+				oRgTextStart.collapse(false);
+				oCurTextNode = oPrevNonTextNode.nextSibling;
+			}else{
+				oRgTextStart.moveToElementText(oContainer);
+				oRgTextStart.collapse(true);
+				oCurTextNode = oContainer.firstChild;
+			}
+
+			var oRgTextsUpToThePoint = oRgOrigPoint.duplicate();
+			oRgTextsUpToThePoint.setEndPoint("StartToStart", oRgTextStart);
+
+			var textCount = oRgTextsUpToThePoint.text.length
+
+			while(textCount > oCurTextNode.nodeValue.length && oCurTextNode.nextSibling){
+				textCount -= oCurTextNode.nodeValue.length;
+				oCurTextNode = oCurTextNode.nextSibling;
+			}
+
+			// this will enforce IE to re-reference oCurTextNode
+			var oTmp = oCurTextNode.nodeValue;
+
+			if(bStartPt && oCurTextNode.nextSibling && oCurTextNode.nextSibling.nodeType == 3 && textCount == oCurTextNode.nodeValue.length){
+				textCount -= oCurTextNode.nodeValue.length;
+				oCurTextNode = oCurTextNode.nextSibling;
+			}
+
+			oContainer = oCurTextNode;
+			offset = textCount;
+		}else{
+			oContainer = oRgOrigPoint.parentElement();
+			offset = pointRangeIdx;
+		}
+
+		return {"oContainer" : oContainer, "iOffset" : offset};
+	};
+}
+
+xe.DOMFix = new ($.Class({
+	$init : function(){
+		if($.browser.msie || $.browser.opera){
+			this.childNodes = this._childNodes_Fix;
+			this.parentNode = this._parentNode_Fix;
+		}else{
+			this.childNodes = this._childNodes_Native;
+			this.parentNode = this._parentNode_Native;
+		}
+	},
+
+	_parentNode_Native : function(elNode){
+		return elNode.parentNode;
+	},
+
+	_parentNode_Fix : function(elNode){
+		if(!elNode) return elNode;
+
+		while(elNode.previousSibling){elNode = elNode.previousSibling;}
+
+		return elNode.parentNode;
+	},
+
+	_childNodes_Native : function(elNode){
+		return elNode.childNodes;
+	},
+
+	_childNodes_Fix : function(elNode){
+		var aResult = null;
+		var nCount = 0;
+
+		if(elNode){
+			var aResult = [];
+			elNode = elNode.firstChild;
+			while(elNode){
+				aResult[nCount++] = elNode;
+				elNode=elNode.nextSibling;
+			}
+		}
+
+		return aResult;
+	}
+}))();
+
+/**
+ * @fileOverview This file contains a function that takes care of the draggable layers
+ * @name N_DraggableLayer.js
+ */
+xe.DraggableLayer = $.Class({
+	$init : function(oLayer, oOptions){
+		this.oOptions = $.extend({
+			bModal : "false",
+			oHandle : oLayer,
+			iMinX : -999999,
+			iMinY : -999999,
+			iMaxX : 999999,
+			iMaxY : 999999
+		}, oOptions);
+
+		this.oHandle = this.oOptions.oHandle;
+
+		oLayer.style.display = "block";
+		oLayer.style.position = "absolute";
+		oLayer.style.zIndex = "9999";
+
+		this.aBasePosition = this.getBaseOffset(oLayer);
+
+		// "number-ize" the position and set it as inline style. (the position could've been set as "auto" or set  by css, not inline style)
+		oLayer.style.top = (this.toInt($(oLayer).offset().top) - this.aBasePosition.top)+"px";
+		oLayer.style.left = (this.toInt($(oLayer).offset().left) - this.aBasePosition.left)+"px";
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this, oLayer);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this, oLayer);
+		this.$FnMouseUp = $.fnBind(this._mouseup, this, oLayer);
+
+		$(this.oHandle).bind("mousedown", this.$FnMouseDown);
+	},
+
+	_mousedown : function(oLayer, oEvent){
+		if(oEvent.target.tagName == "INPUT") return;
+
+		this.MouseOffsetY = (oEvent.pageY-this.toInt(oLayer.style.top)-this.aBasePosition['top']);
+		this.MouseOffsetX = (oEvent.pageX-this.toInt(oLayer.style.left)-this.aBasePosition['left']);
+
+		$(oLayer).bind("mousemove", this.$FnMouseMove);
+		$(oLayer).bind("mouseup", this.$FnMouseUp);
+	},
+
+	_mousemove : function(oLayer, oEvent){
+		var iTop = (oEvent.pageY-this.MouseOffsetY-this.aBasePosition['top']);
+		var iLeft = (oEvent.pageX-this.MouseOffsetX-this.aBasePosition['left']);
+
+		if(iTop<this.oOptions.iMinY) iTop = this.oOptions.iMinY;
+		if(iTop>this.oOptions.iMaxY) iTop = this.oOptions.iMaxY;
+
+		if(iLeft<this.oOptions.iMinX) iLeft = this.oOptions.iMinX;
+		if(iLeft>this.oOptions.iMaxX) iLeft = this.oOptions.iMaxX;
+
+		oLayer.style.top = iTop + "px";
+		oLayer.style.left = iLeft + "px";
+	},
+
+	_mouseup : function(oLayer, oEvent){
+		$(oLayer).unbind("mousemove", this.$FnMouseMove);
+		$(oLayer).unbind("mouseup", this.$FnMouseUp);
+	},
+
+	toInt : function(num){
+		var result = parseInt(num);
+		return result || 0;
+	},
+
+	findNonStatic : function(oEl){
+		if(!oEl) return null;
+		if(oEl.tagName == "BODY") return oEl;
+
+		if($(oEl).css("position").match(/absolute|relative/i)) return oEl;
+
+		return this.findNonStatic(oEl.offsetParent);
+	},
+
+	getBaseOffset : function(oEl){
+		var oBase = this.findNonStatic(oEl.offsetParent);
+		var tmp = $(oBase).offset();
+
+		return {top: tmp.top, left: tmp.left};
+	}
+});
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the messages related to core operations
+ * @name hp_CorePlugin.js
+ */
+xe.CorePlugin = $.Class({
+	name : "CorePlugin",
+
+	$init : function(funcOnReady){
+		this.funcOnReady = funcOnReady;
+	},
+
+	$AFTER_MSG_APP_READY : function(){
+		this.oApp.exec("EXEC_ON_READY_FUNCTION", []);
+	},
+
+	$ON_ADD_APP_PROPERTY : function(sPropertyName, oProperty){
+		this.oApp[sPropertyName] = oProperty;
+	},
+
+	$ON_REGISTER_BROWSER_EVENT : function(obj, sEvent, sCMD, aParams, nDelay){
+		this.oApp.registerBrowserEvent(obj, sEvent, sCMD, aParams, nDelay);
+	},
+
+	$ON_DISABLE_COMMAND : function(sCommand){
+		this.oApp.disableCommand(sCommand, true);
+	},
+
+	$ON_ENABLE_COMMAND : function(sCommand){
+		this.oApp.disableCommand(sCommand, false);
+	},
+
+	$ON_EXEC_ON_READY_FUNCTION : function(){
+		if(typeof this.funcOnReady == "function") this.funcOnReady();
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that helps various operations.
+ * @name hp_Utils.js
+ */
+ xe.Utils = $.Class({
+	name : "Utils",
+
+	$init : function(){
+		if($.browser.msie && $.browser.nVersion == 6){
+			try{
+				document.execCommand('BackgroundImageCache', false, true);
+			}catch(e){}
+		}
+	},
+
+	$ON_ATTACH_HOVER_EVENTS : function(aElms, sHoverClass){
+		sHoverClass = sHoverClass || "hover";
+
+		if(!aElms) return;
+
+		$(aElms).hover(
+			function(){$(this).addClass(sHoverClass)},
+			function(){$(this).removeClass(sHoverClass)}
+		);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that bridges the XpressRange function
+ * @name hp_XpressRangeManager.js
+ */
+xe.XpressRangeManager = $.Class({
+	name : "XpressRangeManager",
+
+	oWindow : null,
+
+	$init : function(win){
+		this.oWindow = win || window;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		if(this.oWindow && this.oWindow.tagName == "IFRAME")
+			this.oWindow = this.oWindow.contentWindow;
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getSelection", $.fnBind(this.getSelection, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getEmptySelection", $.fnBind(this.getEmptySelection, this)]);
+	},
+
+	$ON_SET_EDITING_WINDOW : function(oWindow){
+		this.oWindow = oWindow;
+	},
+
+	getEmptySelection : function(){
+		var oXpressRange = new xe.XpressRange(this.oWindow);
+		return oXpressRange;
+	},
+
+	getSelection : function(){
+		this.oApp.exec("RESTORE_IE_SELECTION", []);
+
+		var oXpressRange = this.getEmptySelection();
+
+		// this may throw an exception if the selected is area is not yet shown
+		try{
+			oXpressRange.setFromSelection();
+		}catch(e){}
+
+		return oXpressRange;
+	}
+});
+//}
+xe.Hotkey = $.Class({
+	name : "Hotkey",
+
+	storage : {},
+	keyhash : {},
+
+	$init : function(){
+		this.storage = {};
+
+		this.keyhash = {
+			backspace : 8,
+			tab		  : 9,
+			enter	  : 13,
+			shift	 : 16,
+			ctrl	  : 17,
+			alt	   : 18,
+			meta	  : 224,
+			esc		  : 27,
+			space	  : 32,
+			pageup	  : 33,
+			pagedown  : 34,
+			end		  : 35,
+			home	  : 36,
+			left	  : 37,
+			up		  : 38,
+			right	  : 39,
+			down	  : 40,
+			del	  	  : 46,
+			comma	  : 188,//(,)
+			period	  : 190,//(.)
+			slash	  : 191,//(/)
+			hyphen	: 109,
+			equal	 : 61
+		};
+
+		if ($.browser.msie || $.browser.safari) {
+			this.keyhash.hyphen = 189; // (-)
+			this.keyhash.equal = 187;  // (=)
+			this.keyhash.meta  = 91;   // meta
+		}
+
+
+	},
+
+	$ON_MSG_APP_READY : function(){
+		$(this.oApp.getWYSIWYGDocument() || document).keydown($.fnBind(this.keydown, this));
+	},
+
+	$ON_REGISTER_HOTKEY : function(sHotkey, sCMD, sArgs){
+		if(!sArgs) sArgs = [];
+		var func = $.fnBind(this.oApp.exec, this.oApp, sCMD, sArgs);
+
+		sHotkey = this.normalize(sHotkey);
+		if (!sHotkey) return false;
+
+		this.add(sHotkey, func);
+	},
+
+	add : function(sHotkey, func) {
+		if (typeof this.storage[sHotkey] == 'undefined') {
+			this.storage[sHotkey] = [func];
+		} else {
+			this.storage[sHotkey].push(func);
+		}
+	},
+
+	keydown : function(event) {
+		var key  = [], kh = this.keyhash;
+
+		if ($.inArray(event.keyCode, [kh.shift, kh.ctrl, kh.alt, kh.meta]) >= 0) return;
+
+		if (event.shiftKey) key.push('shift');
+		if (event.altKey)   key.push('alt');
+		if (event.ctrlKey)  key.push('ctrl');
+		if (event.metaKey)  key.push('meta');
+		if (!key.length) return;
+		if (key.length == 1 && event.metaKey) key = ['ctrl', 'meta'];
+
+		key.push(event.keyCode);
+
+		key = key.join('+');
+
+		if (!this.storage[key]) return;
+
+		$.each(this.storage[key], function(){ this(); });
+
+		return false;
+	},
+
+	normalize : function(sHotkey) {
+		var shift, ctrl, alt, meta, key, keys = (sHotkey||"").toLowerCase().split('+');
+
+		shift = ctrl = alt = meta = key = false;
+
+		$.each(keys, function(){
+			var s = ""+this;
+			switch(s) {
+				case 'shift': shift = true;
+				case 'alt'  : alt   = true;
+				case 'ctrl' : ctrl  = true;
+				case 'meta' : meta  = true;
+				default:
+					key = s;
+			}
+		});
+
+		if (!key) return '';
+
+		keys = [];
+		if (shift) keys.push('shift');
+		if (alt) keys.push('alt');
+		if (ctrl) keys.push('ctrl');
+		if (meta || (ctrl && !shift && !alt)) keys.push('meta');
+
+		keys.push(this.keyhash[key] || key.toUpperCase().charCodeAt(0));
+
+		return keys.join('+');
+	}
+});
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the draggable layers
+ * @name hp_DialogLayerManager.js
+ */
+xe.DialogLayerManager = $.Class({
+	name : "DialogLayerManager",
+	aMadeDraggable : null,
+	aOpenedLayers : null,
+
+	$init : function(){
+		this.aMadeDraggable = [];
+		this.aOpenedLayers = [];
+	},
+
+	$ON_SHOW_DIALOG_LAYER : function(oLayer, bModal){
+		oLayer = $.$(oLayer);
+		bModal = $.$(bModal) || false;
+		if(!oLayer) return;
+
+		if($.inArray(oLayer, this.aOpenedLayers) != -1) return;
+
+		this.oApp.exec("POSITION_DIALOG_LAYER", [oLayer]);
+
+		this.aOpenedLayers[this.aOpenedLayers.length] = oLayer;
+
+		if($.inArray(oLayer, this.aMadeDraggable) == -1){
+			new xe.DraggableLayer(oLayer, {bModal: bModal, iMinY: 0});
+			this.aMadeDraggable[this.aMadeDraggable.length] = oLayer;
+		}else{
+			oLayer.style.display = "block";
+		}
+	},
+
+	$ON_HIDE_LAST_DIALOG_LAYER : function(){
+		this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[this.aOpenedLayers.length-1]]);
+	},
+
+	$ON_HIDE_ALL_DIALOG_LAYER : function(){
+		for(var i=this.aOpenedLayers.length-1; i>=0; i--)
+			this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[i]]);
+	},
+
+	$ON_HIDE_DIALOG_LAYER : function(oLayer){
+		oLayer = $.$(oLayer);
+
+		if(oLayer) oLayer.style.display = "none";
+		this.aOpenedLayers = $.grep(this.aOpenedLayers, function(a){return a!=oLayer});
+	},
+
+	$ON_SET_DIALOG_LAYER_POSITION : function(oLayer, iTop, iLeft){
+		oLayer.style.top = iTop;
+		oLayer.style.left = iLeft;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the layers that should disappear when the focus is lost
+ * @name hp_ActiveLayerManager.js
+ */
+xe.ActiveLayerManager = $.Class({
+	name : "ActiveLayerManager",
+	oCurrentLayer : null,
+
+	$ON_TOGGLE_ACTIVE_LAYER : function(oLayer, sOnOpenCmd, aOnOpenParam, sOnCloseCmd, aOnCloseParam){
+		if(oLayer == this.oCurrentLayer){
+			this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+		}else{
+			this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sOnCloseCmd, aOnCloseParam]);
+			if(sOnOpenCmd) this.oApp.exec(sOnOpenCmd, aOnOpenParam);
+		}
+	},
+
+	$ON_SHOW_ACTIVE_LAYER : function(oLayer, sOnCloseCmd, aOnCloseParam){
+		oLayer = $.$(oLayer);
+		this.sOnCloseCmd = sOnCloseCmd;
+		this.aOnCloseParam = aOnCloseParam;
+
+		var oPrevLayer = this.oCurrentLayer;
+
+		if(oLayer == oPrevLayer) return;
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+
+		oLayer.style.display = "block";
+		this.oCurrentLayer = oLayer;
+	},
+
+	$ON_HIDE_ACTIVE_LAYER : function(){
+		var oLayer = this.oCurrentLayer;
+		if(!oLayer) return;
+		oLayer.style.display = "none";
+		this.oCurrentLayer = null;
+
+		if(this.sOnCloseCmd)
+			this.oApp.exec(this.sOnCloseCmd, this.aOnCloseParam);
+	},
+
+	// for backward compatibility only.
+	// use HIDE_ACTIVE_LAYER instead!
+	$ON_HIDE_CURRENT_ACTIVE_LAYER : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_MOUSEDOWN : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to string conversion. Ususally used to convert the IR value.
+ * @name hp_StringConverterManager.js
+ */
+xe.StringConverterManager = $.Class({
+	name : "StringConverterManager",
+
+	oConverters : null,
+
+	$init : function(){
+		this.oConverters = {};
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("ADD_APP_PROPERTY", ["applyConverter", $.fnBind(this.applyConverter, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["addConverter", $.fnBind(this.addConverter, this)]);
+	},
+
+	applyConverter : function(sRuleName, sContent){
+		var aConverters = this.oConverters[sRuleName];
+		if(!aConverters) return sContent;
+
+		for(var i=0; i<aConverters.length; i++) sContent = aConverters[i](sContent);
+
+		return sContent;
+	},
+
+	addConverter : function(sRuleName, funcConverter){
+		var aConverters = this.oConverters[sRuleName];
+		if(!aConverters) this.oConverters[sRuleName] = [];
+
+		this.oConverters[sRuleName][this.oConverters[sRuleName].length] = funcConverter;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that maps a message code to the actual message
+ * @name hp_MessageManager.js
+ */
+xe.MessageManager = $.Class({
+	name : "MessageManager",
+
+	oMessageMap : null,
+
+	$init : function(oMessageMap){
+		this.oMessageMap = oMessageMap;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("ADD_APP_PROPERTY", ["$MSG", $.fnBind(this.getMessage, this)]);
+	},
+
+	getMessage : function(sMsg){
+		if(this.oMessageMap[sMsg]) return unescape(this.oMessageMap[sMsg]);
+
+		return sMsg;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to the tool bar UI
+ * @name hp_XE_Toolbar.js
+ */
+xe.XE_Toolbar = $.Class({
+	name : "XE_Toolbar",
+	toolbarArea : null,
+	toolbarButton : null,
+	uiNameTag : "uiName",
+
+	sUIClassPrefix : "xpress_xeditor_ui_",
+
+	aUICmdMap : null,
+
+	$init : function(oAppContainer){
+		this.htUIList = {};
+
+		this.aUICmdMap = {};
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+		this.toolbarArea = $(".tool", oAppContainer).get(0);
+		this.welToolbarArea = $(this.toolbarArea);
+
+		this.aAllButtons = $("BUTTON", this.toolbarArea).get();
+
+		var aAllLi = this.toolbarArea.getElementsByTagName("LI");
+		var nCount = aAllLi.length;
+		var rxUI = new RegExp(this.sUIClassPrefix+"([^ ]+)");
+		for(var i=0; i<nCount; i++){
+			if(rxUI.test(aAllLi[i].className)){
+				var sUIName = RegExp.$1;
+				if(this.htUIList[sUIName] != null) continue;
+
+				this.htUIList[sUIName] = $(">*:first-child", aAllLi[i]).get(0);
+			}
+		}
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseover", "EVENT_TOOLBAR_MOUSEOVER", []);
+		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseout", "EVENT_TOOLBAR_MOUSEOUT", []);
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getToolbarButtonByUIName", $.fnBind(this.getToolbarButtonByUIName, this)]);
+	},
+
+	$ON_EVENT_TOOLBAR_MOUSEOVER : function(weEvent){
+		if(weEvent.target.tagName == "BUTTON") $(weEvent.target).addClass("hover").parent("span").addClass("hover");
+	},
+
+	$ON_EVENT_TOOLBAR_MOUSEOUT : function(weEvent){
+		if(weEvent.target.tagName == "BUTTON") $(weEvent.target).removeClass("hover").parent("span").removeClass("hover");
+	},
+
+	$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER : function(oLayer, oBtn, sOpenCmd, aOpenArgs, sCloseCmd, aCloseArgs){
+		this.oApp.exec("TOGGLE_ACTIVE_LAYER", [oLayer, "MSG_TOOLBAR_LAYER_SHOWN", [oLayer, oBtn, sOpenCmd, aOpenArgs], sCloseCmd, aCloseArgs]);
+	},
+
+	$ON_MSG_TOOLBAR_LAYER_SHOWN : function(oLayer, oBtn, aOpenCmd, aOpenArgs){
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
+		if(aOpenCmd) this.oApp.exec(aOpenCmd, aOpenArgs);
+	},
+
+	$ON_SHOW_TOOLBAR_ACTIVE_LAYER : function(oLayer, sCmd, aArgs, oBtn){
+		this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sCmd, aArgs]);
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
+	},
+
+	$ON_ENABLE_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).removeClass("off");
+		elUI.disabled = false;
+
+		// enable related commands
+		var sCmd = "";
+		if(this.aUICmdMap[sUIName]){
+			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
+				sCmd = this.aUICmdMap[sUIName][i];
+				this.oApp.exec("ENABLE_COMMAND", [sCmd]);
+			}
+		}
+	},
+
+	$ON_DISABLE_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).addClass("off");
+		$(elUI).removeClass("hover").parent("span").removeClass("hover");
+		elUI.disabled = true;
+
+		// disable related commands
+		var sCmd = "";
+		if(this.aUICmdMap[sUIName]){
+			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
+				sCmd = this.aUICmdMap[sUIName][i];
+				this.oApp.exec("DISABLE_COMMAND", [sCmd]);
+			}
+		}
+	},
+
+	$ON_SELECT_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).addClass("active");
+	},
+
+	$ON_DESELECT_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).removeClass("active");
+	},
+
+	$ON_ENABLE_ALL_UI : function(){
+		var sUIName, className;
+
+		for(var sUIName in this.htUIList){
+			if(sUIName) this.oApp.exec("ENABLE_UI", [sUIName]);
+		}
+		$(this.toolbarArea).removeClass("off");
+	},
+
+	$ON_DISABLE_ALL_UI : function(){
+		var sUIName;
+
+		for(var sUIName in this.htUIList){
+			if(sUIName) this.oApp.exec("DISABLE_UI", [sUIName]);
+		}
+		$(this.toolbarArea).addClass("off");
+		this.oApp.exec("HIDE_ACTIVE_LAYER",[]);
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, attributeValue){
+		if(attributeValue == 1)
+			this.oApp.exec("SELECT_UI", [sAttributeName]);
+		else
+			this.oApp.exec("DESELECT_UI", [sAttributeName]);
+	},
+
+	$ON_REGISTER_UI_EVENT : function(sUIName, sEvent, sCmd, aParams){
+		// map cmd & ui
+		if(!this.aUICmdMap[sUIName]){this.aUICmdMap[sUIName] = [];}
+		this.aUICmdMap[sUIName][this.aUICmdMap[sUIName].length] = sCmd;
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		this.oApp.registerBrowserEvent(elUI, sEvent, sCmd, aParams);
+	},
+
+	$ON_POSITION_TOOLBAR_LAYER : function(oLayer, oBtn){
+		oLayer = $.$(oLayer);
+		oBtn = $.$(oBtn);
+
+		if(!oLayer) return;
+		if(oBtn && oBtn.tagName && oBtn.tagName == "BUTTON") oBtn.parentNode.appendChild(oLayer);
+
+		oLayer.style.left = "0";
+
+		var welLayer = $(oLayer);
+		var nLayerLeft = welLayer.offset().left;
+		nLayerLeft += oLayer.offsetWidth;
+
+		var nToolbarLeft = this.welToolbarArea.offset().left;
+		nToolbarLeft += this.toolbarArea.offsetWidth;
+
+		if(nLayerLeft > nToolbarLeft) oLayer.style.left = (nToolbarLeft-nLayerLeft-5)+"px";
+	},
+
+	getToolbarButtonByUIName : function(sUIName){
+		return this.htUIList[sUIName];
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that manages multiple number editing area plugins and the IR value
+ * @name hp_XE_EditingAreaManager.js
+ */
+xe.XE_EditingAreaManager = $.Class({
+	name : "XE_EditingAreaManager",
+
+	// Currently active plugin instance(XE_EditingArea_???)
+	oActivePlugin : null,
+
+	// Intermediate Representation of the content being edited.
+	// This should be a textarea element.
+	oIRField : null,
+
+	bIsDirty : false,
+
+	$init : function(sInitialMode, oIRField, oDimension, fOnBeforeUnload, oAppContainer){
+		this.sInitialMode = sInitialMode;
+		this.oIRField = $.$(oIRField);
+		this._assignHTMLObjects(oAppContainer);
+		this.fOnBeforeUnload = fOnBeforeUnload;
+
+		this.oEditingMode = {};
+
+		this.elEditingAreaContainer.style.height = parseInt(oDimension.nHeight || this.elEditingAreaContainer.offsetHeight)+"px";
+
+		this.nMinHeight = oDimension.nMinHeight || 10;
+		this.niMinWidth = oDimension.nMinWidth || 10;
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+		this.elEditingAreaContainer = $("DIV.xpress_xeditor_editing_area_container", oAppContainer).get(0);
+		this.elEditingAreaSkipUI = $("A.skip", oAppContainer).get(0);
+	},
+
+	$BEFORE_MSG_APP_READY : function(msg){
+		this.oApp.exec("ADD_APP_PROPERTY", ["elEditingAreaContainer", this.elEditingAreaContainer]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getIR", $.fnBind(this.getIR, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["setIR", this.setIR]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getEditingMode", $.fnBind(this.getEditingMode, this)]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("CHANGE_EDITING_MODE", [this.sInitialMode, true]);
+		this.oApp.exec("LOAD_IR_FIELD", [false]);
+
+		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "focus", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
+		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "blur", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
+
+//		var fOnBeforeUnload = this.fOnBeforeUnload||function(){if(this.getIR() != this.oIRField.value || this.bIsDirty) return this.oApp.$MSG("XE_EditingAreaManager.onExit")};
+//		$(window).bind("beforeunload", $.fnBind(fOnBeforeUnload, this));
+	},
+
+	$AFTER_MSG_APP_READY : function(){
+		this.oApp.exec("UPDATE_IR_FIELD", []);
+	},
+
+	$ON_LOAD_IR_FIELD : function(bDontAddUndo){
+		this.oApp.setIR(this.oIRField.value, bDontAddUndo);
+	},
+
+	$ON_UPDATE_IR_FIELD : function(){
+		this.oIRField.value = this.oApp.getIR();
+	},
+
+	$BEFORE_CHANGE_EDITING_MODE : function(sMode){
+		this._oPrevActivePlugin = this.oActivePlugin;
+		this.oActivePlugin = this.oEditingMode[sMode];
+	},
+
+	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(this._oPrevActivePlugin){
+			var sIR = this._oPrevActivePlugin.getIR();
+			this.oApp.exec("SET_IR", [sIR]);
+
+			this.oApp.exec("ENABLE_UI", [this._oPrevActivePlugin.sMode]);
+
+			this._setEditingAreaDimension();
+		}
+		this.oApp.exec("DISABLE_UI", [this.oActivePlugin.sMode]);
+
+		if(!bNoFocus){
+			this.oApp.exec("FOCUS", []);
+		}
+	},
+
+	$ON_SET_IS_DIRTY : function(bIsDirty){
+		this.bIsDirty = bIsDirty;
+	},
+
+	$ON_FOCUS : function(){
+		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
+
+		this.oActivePlugin.focus();
+	},
+
+	$BEFORE_SET_IR : function(sIR, bDontAddUndoHistory){
+		bDontAddUndoHistory = bDontAddUndoHistory || false;
+		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
+	},
+
+	$ON_SET_IR : function(sIR){
+		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
+
+		this.oActivePlugin.setIR(sIR);
+	},
+
+	$AFTER_SET_IR : function(sIR, bDontAddUndoHistory){
+		bDontAddUndoHistory = bDontAddUndoHistory || false;
+		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
+	},
+
+	$ON_REGISTER_EDITING_AREA : function(oEditingAreaPlugin){
+		this.oEditingMode[oEditingAreaPlugin.sMode] = oEditingAreaPlugin;
+		this.attachDocumentEvents(oEditingAreaPlugin.oEditingArea);
+	},
+
+	$ON_MSG_EDITING_AREA_RESIZE_STARTED : function(){
+		this.oActivePlugin.elEditingArea.style.display = "none";
+
+		this.iStartingHeight = parseInt(this.elEditingAreaContainer.style.height);
+	},
+
+	$ON_RESIZE_EDITING_AREA: function(ipNewWidth, ipNewHeight){
+		var iNewWidth = parseInt(ipNewWidth);
+		var iNewHeight = parseInt(ipNewHeight);
+
+		if(iNewWidth < this.niMinWidth) iNewWidth = this.niMinWidth;
+		if(iNewHeight < this.nMinHeight) iNewHeight = this.nMinHeight;
+
+		if(ipNewWidth) this.elEditingAreaContainer.style.width = iNewWidth + "px";
+		if(ipNewHeight) this.elEditingAreaContainer.style.height = iNewHeight + "px";
+	},
+
+	$ON_RESIZE_EDITING_AREA_BY : function(ipWidthChange, ipHeightChange){
+		var iWidthChange = parseInt(ipWidthChange);
+		var iHeightChange = parseInt(ipHeightChange);
+
+		var iWidth = this.elEditingAreaContainer.style.width?parseInt(this.elEditingAreaContainer.style.width)+iWidthChange:null;
+		var iHeight = this.elEditingAreaContainer.style.height?this.iStartingHeight+iHeightChange:null;
+
+		this.oApp.exec("RESIZE_EDITING_AREA", [iWidth, iHeight]);
+	},
+
+	$ON_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
+		this.oActivePlugin.elEditingArea.style.display = "block";
+		this._setEditingAreaDimension();
+	},
+
+	_setEditingAreaDimension : function(){
+		this.oActivePlugin.elEditingArea.style.height = this.elEditingAreaContainer.style.height;
+		this.oActivePlugin.elEditingArea.style.width = this.elEditingAreaContainer.style.width;
+	},
+
+	attachDocumentEvents : function(doc){
+		this.oApp.registerBrowserEvent(doc, "click", "EVENT_EDITING_AREA_CLICK");
+		this.oApp.registerBrowserEvent(doc, "mousedown", "EVENT_EDITING_AREA_MOUSEDOWN");
+		this.oApp.registerBrowserEvent(doc, "mousemove", "EVENT_EDITING_AREA_MOUSEMOVE");
+		this.oApp.registerBrowserEvent(doc, "mouseup", "EVENT_EDITING_AREA_MOUSEUP");
+		this.oApp.registerBrowserEvent(doc, "keydown", "EVENT_EDITING_AREA_KEYDOWN");
+		this.oApp.registerBrowserEvent(doc, "keypress", "EVENT_EDITING_AREA_KEYPRESS");
+		this.oApp.registerBrowserEvent(doc, "keyup", "EVENT_EDITING_AREA_KEYUP");
+	},
+
+	getIR : function(){
+		return this.oActivePlugin.getIR();
+	},
+
+	setIR : function(sIR, bDontAddUndo){
+		this.oApp.exec("SET_IR", [sIR, bDontAddUndo]);
+	},
+
+	getEditingMode : function(){
+		return this.oActivePlugin.sMode;
+	}
+});
+//}
+
+//{
+/**
+  * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to editing the HTML source code using Textarea element
+ * @name hp_XE_EditingArea_HTMLSrc.js
+ * @required XE_EditingAreaManager
+ */
+xe.XE_EditingArea_HTMLSrc = $.Class({
+	name : "XE_EditingArea_HTMLSrc",
+
+	sMode : "HTMLSrc",
+	textarea : null,
+
+	$init : function(textarea){
+		this.textarea = $.$(textarea);
+		this.elEditingArea = this.textarea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oEditingArea = this.textarea;
+		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(sMode == this.sMode){
+			this.textarea.style.display = "block";
+		}else{
+			this.textarea.style.display = "none";
+		}
+	},
+
+	$ON_PASTE_HTML : function(sHTML, oPSelection){
+		if(this.oApp.getEditingMode() != this.sMode) return;
+
+		var o = new TextRange(this.textarea);
+		o.paste(sHTML);
+		this.textarea.focus();
+	},
+
+	getIR : function(){
+		var sIR;
+		var sContent = this.textarea.value;
+
+		if(this.oApp.applyConverter)
+			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
+		else
+			sIR = sContent;
+
+		return sIR;
+	},
+
+	setIR : function(sIR){
+		var sContent;
+
+		if(this.oApp.applyConverter)
+			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
+		else
+			sContent = sIR;
+
+		this.textarea.value = sContent;
+	},
+
+	focus : function(){
+		this.textarea.focus();
+	}
+});
+
+var TextRange = function(oEl) {
+	this._o = oEl;
+};
+
+/**
+ * Selection for textfield
+ * @author NHN (developer@xpressengine.com)
+ */
+TextRange.prototype.getSelection = function() {
+	var obj = this._o;
+	var ret = [ -1, -1 ];
+
+	if (isNaN(this._o.selectionStart)) {
+		obj.focus();
+
+		// textarea support added by nagoon97
+		var range = document.body.createTextRange();
+		var rangeField = null;
+
+		rangeField = document.selection.createRange().duplicate();
+		range.moveToElementText(obj);
+		rangeField.collapse(true);
+		range.setEndPoint("EndToEnd", rangeField);
+		ret[0] = range.text.length;
+
+		rangeField = document.selection.createRange().duplicate();
+		range.moveToElementText(obj);
+		rangeField.collapse(false);
+		range.setEndPoint("EndToEnd", rangeField);
+		ret[1] = range.text.length;
+
+		obj.blur();
+	} else {
+		ret[0] = obj.selectionStart;
+		ret[1] = obj.selectionEnd;
+	}
+
+	return ret;
+};
+
+TextRange.prototype.setSelection = function(start, end) {
+
+	var obj = this._o;
+	if (typeof end == 'undefined') end = start;
+
+	if (obj.setSelectionRange) {
+
+		obj.setSelectionRange(start, end);
+
+	} else if (obj.createTextRange) {
+
+		var range = obj.createTextRange();
+
+		range.collapse(true);
+		range.moveStart("character", start);
+		range.moveEnd("character", end - start);
+		range.select();
+
+		obj.blur();
+	}
+
+};
+
+TextRange.prototype.copy = function() {
+
+	var r = this.getSelection();
+	return this._o.value.substring(r[0], r[1]);
+
+};
+
+TextRange.prototype.paste = function(sStr) {
+
+	var obj = this._o;
+	var sel = this.getSelection();
+
+	var value = obj.value;
+
+	var pre = value.substr(0, sel[0]);
+	var post = value.substr(sel[1]);
+
+	value = pre + sStr + post;
+	obj.value = value;
+
+	var n = 0;
+	if ( typeof document.body.style.maxHeight == "undefined" ) {
+		var a = pre.match( /\n/gi );
+		n = ( a != null ? a.length : 0 );
+	}
+	this.setSelection(sel[0] + sStr.length - n );
+
+};
+
+TextRange.prototype.cut = function() {
+	var r = this.copy();
+	this.paste('');
+
+	return r;
+};
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to WYSIWYG iframe
+ * @name hp_XE_EditingArea_WYSIWYG.js
+ */
+xe.XE_EditingArea_WYSIWYG = $.Class({
+	name : "XE_EditingArea_WYSIWYG",
+	status : xe.PLUGIN_STATUS["NOT_READY"],
+
+	sMode : "WYSIWYG",
+	iframe : null,
+	doc : null,
+
+	iLastUndoRecorded : 0,
+	iMinUndoInterval : 3000,
+
+	_nIFrameReadyCount : 50,
+
+	$init : function(iframe){
+		this.iframe = $.$(iframe);
+
+		this.initIframe();
+
+		this.elEditingArea = iframe;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oEditingArea = this.doc;
+		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGWindow", $.fnBind(this.getWindow, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGDocument", $.fnBind(this.getDocument, this)]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		// uncomment this line if you wish to use the IE-style cursor in FF
+		// this.getDocument().body.style.cursor = "text";
+
+		if($.browser.msie){
+			$(this.doc).bind('keydown', $.fnBind(
+				function(weEvent){
+					if(this.doc.selection.type.toLowerCase() == 'control' && weEvent.keyCode == 8)  {
+						this.oApp.exec("EXECCOMMAND", ['delete', false, false]);
+						weEvent.preventDefault(); weEvent.stopPropagation();
+					}
+				}
+			, this));
+			$(this.doc.body).bind('mousedown', $.fnBind(
+				function(weEvent){
+					this._oIERange = null;
+					this._bIERangeReset = true;
+				}
+			, this));
+			$(this.doc.body).bind('beforedeactivate', $.fnBind(
+				function(weEvent){
+					// without this, cursor won't make it inside a table.
+					// mousedown(_oIERange gets reset) -> beforedeactivate(gets fired for table) -> RESTORE_IE_SELECTION
+					if(this._bIERangeReset) return;
+
+					var tmpRange = this.getDocument().selection.createRange(0);
+					// Control range does not have parentElement
+					if(tmpRange.parentElement && tmpRange.parentElement() && tmpRange.parentElement().tagName == "INPUT"){
+						this._oIERange = this._oPrevIERange;
+					}else{
+						this._oIERange = tmpRange;
+					}
+				}
+			, this));
+			$(this.doc.body).bind('mouseup', $.fnBind(
+				function(weEvent){
+					this._bIERangeReset = false;
+				}
+			, this));
+		}
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(sMode == this.sMode){
+			this.iframe.style.display = "block";
+
+			this.oApp.exec("REFRESH_WYSIWYG", []);
+			this.oApp.exec("SET_EDITING_WINDOW", [this.getWindow()]);
+		}else{
+			this.iframe.style.display = "none";
+		}
+	},
+
+	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		this._oIERange = null;
+	},
+
+	$ON_REFRESH_WYSIWYG : function(){
+		if(!$.browser.mozilla) return;
+
+		this._disableWYSIWYG();
+		this._enableWYSIWYG();
+	},
+
+	$ON_ENABLE_WYSIWYG : function(){
+		this._enableWYSIWYG();
+	},
+
+	$ON_DISABLE_WYSIWYG : function(){
+		this._disableWYSIWYG();
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(oEvent) {
+		// ctrl-left/right add/remove indent
+		if(!oEvent.ctrlKey) return;
+
+		switch(oEvent.keyCode) {
+			// outdent
+			case 37 :
+					this.oApp.exec("EXECCOMMAND",  ["outdent", false, false]);
+				break;
+			// indent
+			case 39 :
+					this.oApp.exec("EXECCOMMAND",  ["indent", false, false]);
+				break;
+			// h1 ~ h6, normal
+			case 49 :
+			case 50 :
+			case 51 :
+			case 52 :
+			case 53 :
+			case 54 :
+					this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, '<h'+(oEvent.keyCode-48)+'>']);
+				break;
+			default :
+				return;
+		}
+		oEvent.preventDefault(); oEvent.stopPropagation();
+
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
+		// 33, 34: page up/down, 35,36: end/home, 37,38,39,40: left, up, right, down
+		if(oEvent.keyCode == 229 || oEvent.keyCode == 13 || oEvent.altKey || oEvent.ctrlKey || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 16) return;
+		this._recordUndo(oEvent);
+	},
+
+	$ON_PASTE_HTML : function(sHTML, oPSelection){
+		if(this.oApp.getEditingMode() != this.sMode) return;
+
+		var oSelection = oPSelection || this.oApp.getSelection();
+		oSelection.pasteHTML(sHTML);
+
+		// every browser except for IE may modify the innerHTML when it is inserted
+		if(!$.browser.msie){
+			var sTmpBookmark = oSelection.placeStringBookmark();
+			this.oApp.getWYSIWYGDocument().body.innerHTML = this.oApp.getWYSIWYGDocument().body.innerHTML;
+			oSelection.moveToBookmark(sTmpBookmark);
+			oSelection.collapseToEnd();
+			oSelection.select();
+			oSelection.removeStringBookmark(sTmpBookmark);
+		}
+
+		this.oApp.exec("RECORD_UNDO_ACTION", ["INSERT HTML"]);
+	},
+
+	$AFTER_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
+		this.oApp.exec("REFRESH_WYSIWYG", []);
+	},
+
+	$ON_RESTORE_IE_SELECTION : function(){
+		if(this._oIERange){
+			this._oIERange.select();
+			this._oPrevIERange = this._oIERange;
+			this._oIERange = null;
+		}
+	},
+
+	initIframe : function(){
+		try {
+			this.doc = this.iframe.contentWindow.document;
+			if (this.doc == null || this.doc.location.href == 'about:blank') {
+				throw new Error('Access denied');
+			}
+
+			this._enableWYSIWYG();
+
+			this.status = xe.PLUGIN_STATUS["READY"];
+		} catch(e) {
+			if(this._nIFrameReadyCount-- > 0){
+				setTimeout($.fnBind(this.initIframe, this), 100);
+			}else{
+				throw("iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ");
+			}
+		}
+	},
+
+	getIR : function(){
+		var sContent = this.doc.body.innerHTML;
+		var sIR;
+
+
+		if(this.oApp.applyConverter)
+			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
+		else
+			sIR = sContent;
+
+		return sIR;
+	},
+
+	setIR : function(sIR){
+		var sContent;
+		if(this.oApp.applyConverter)
+			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
+		else
+			sContent = sIR;
+
+		this.doc.body.innerHTML = sContent;
+
+		if($.browser.mozilla){
+			if(this.doc.body.innerHTML == "") this.doc.body.innerHTML = "<br>";
+		}
+	},
+
+	getWindow : function(){
+		return this.iframe.contentWindow;
+	},
+
+	getDocument : function(){
+		return this.iframe.contentWindow.document;
+	},
+
+	focus : function(){
+		//this.getWindow().focus();
+		//this.oApp.exec("RESTORE_IE_SELECTION", []);
+	},
+
+	_recordUndo : function(oKeyInfo){
+		var curTime = new Date();
+		if(curTime-this.iLastUndoRecorded < this.iMinUndoInterval) return;
+		this.oApp.exec("RECORD_UNDO_ACTION", ["KEYPRESS"]);
+
+		this.iLastUndoRecorded = new Date();
+
+		this.prevKeyCode = oKeyInfo.keyCode;
+	},
+
+	_enableWYSIWYG : function(){
+		if ($.browser.msie){
+			this.doc.body.disabled = true;
+			this.doc.body.contentEditable = true;
+			this.doc.body.removeAttribute('disabled');
+		} else {
+			this.doc.designMode = "on";
+		}
+	},
+
+	_disableWYSIWYG : function(){
+		if ($.browser.msie){
+			this.doc.body.contentEditable = false;
+		} else {
+			this.doc.designMode = "off";
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to resizing the editing area vertically
+ * @name hp_XE_EditingAreaVerticalResizer.js
+ */
+xe.XE_EditingAreaVerticalResizer = $.Class({
+	name : "XE_EditingAreaVerticalResizer",
+	oResizeGrip : null,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this);
+		this.$FnMouseUp = $.fnBind(this._mouseup, this);
+
+		$(this.oResizeGrip).bind("mousedown", this.$FnMouseDown);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+
+		this.oResizeGrip = $(".xpress_xeditor_editingArea_verticalResizer", oAppContainer).get(0);
+	},
+
+	_mousedown : function(oEvent){
+		this.iStartHeight = oEvent.clientY;
+
+		$(document).bind("mousemove", this.$FnMouseMove);
+		$(document).bind("mouseup", this.$FnMouseUp);
+
+		this.oApp.exec("MSG_EDITING_AREA_RESIZE_STARTED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
+	},
+
+	_mousemove : function(oEvent){
+		var iHeightChange = oEvent.clientY - this.iStartHeight;
+
+		this.oApp.exec("RESIZE_EDITING_AREA_BY", [0, iHeightChange]);
+	},
+
+	_mouseup : function(oEvent){
+		$(document).unbind("mousemove", this.$FnMouseMove);
+		$(document).unbind("mouseup", this.$FnMouseUp);
+
+		this.oApp.exec("MSG_EDITING_AREA_RESIZE_ENDED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the basic editor commands
+ * @name hp_XE_ExecCommand.js
+ */
+xe.XE_ExecCommand = $.Class({
+	name : "XE_ExecCommand",
+	oEditingArea : null,
+
+	$init : function(oEditingArea){
+		this.oEditingArea = oEditingArea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		// the right document will be available only when the src is completely loaded
+		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
+			this.oEditingArea = this.oEditingArea.contentWindow.document;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+b", "EXECCOMMAND", ["bold", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+u", "EXECCOMMAND", ["underline", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+i", "EXECCOMMAND", ["italic", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+d", "EXECCOMMAND", ["strikethrough", false, false]]);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["bold", "click", "EXECCOMMAND", ["bold", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["underline", "click", "EXECCOMMAND", ["underline", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["italic", "click", "EXECCOMMAND", ["italic", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["lineThrough", "click", "EXECCOMMAND", ["strikethrough", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["superscript", "click", "EXECCOMMAND", ["superscript", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["subscript", "click", "EXECCOMMAND", ["subscript", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyleft", "click", "EXECCOMMAND", ["justifyleft", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifycenter", "click", "EXECCOMMAND", ["justifycenter", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyright", "click", "EXECCOMMAND", ["justifyright", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyfull", "click", "EXECCOMMAND", ["justifyfull", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["orderedlist", "click", "EXECCOMMAND", ["insertorderedlist", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["unorderedlist", "click", "EXECCOMMAND", ["insertunorderedlist", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["outdent", "click", "EXECCOMMAND", ["outdent", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["indent", "click", "EXECCOMMAND", ["indent", false, false]]);
+	},
+
+	$BEFORE_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		this._bOnlyCursorChanged = false;
+
+		this.oApp.exec("FOCUS", []);
+
+		if(sCommand.match(/^bold|underline|italic|strikethrough|superscript|subscript$/i)){
+			var oSelection = this.oApp.getSelection();
+			if(oSelection.collapsed) this._bOnlyCursorChanged = true;
+		}
+
+		if(!this._bOnlyCursorChanged){
+			this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", [sCommand]);
+		}
+	},
+
+	$ON_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		bUserInterface = (bUserInterface == "" || bUserInterface)?bUserInterface:false;
+		vValue = (vValue == "" || vValue)?vValue:false;
+
+		this.oEditingArea.execCommand(sCommand, bUserInterface, vValue);
+	},
+
+	$AFTER_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		if(!this._bOnlyCursorChanged){
+			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", [sCommand]);
+		}
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to wrapping the sentence around with a <P> tag when enter key is pressed
+ * @name hp_XE_WYSIWYGEnterKey.js
+ */
+xe.XE_WYSIWYGEnterKey = $.Class({
+	name : "XE_WYSIWYGEnterKey",
+	// IE/Opera do not need this
+	unsupportedBrowser : ['ie', 'opera'],
+	oEditingArea : null,
+
+	$init : function(oEditingArea){
+		this.oEditingArea = oEditingArea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		// the right document will be available only when the src is completely loaded
+		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
+			this.oEditingArea = this.oEditingArea.contentWindow.document;
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(oEvent){
+		if(this.oApp.getEditingMode() != "WYSIWYG") return;
+
+		if(oEvent.shiftKey) return;
+
+		if(oEvent.keyCode == 13){
+			var oSelection = this.oApp.getSelection();
+			var sBM = oSelection.placeStringBookmark();
+			var oLineInfo = oSelection.getLineInfo();
+			var oStart = oLineInfo.oStart;
+			var oEnd = oLineInfo.oEnd;
+
+			//top.document.title = oStart.oNode.tagName+":"+oStart.oNode.nodeValue+", "+oEnd.oNode.tagName+":"+oEnd.oNode.nodeValue+"::"+oStart.bParentBreak+", "+oStart.oLineBreaker.tagName;
+
+			// line broke by sibling
+			// or
+			// the parent line breaker is just a block container
+			if(!oStart.bParentBreak || oSelection.rxBlockContainer.test(oStart.oLineBreaker.tagName)){
+				oEvent.stopPropagation();
+				oEvent.preventDefault();
+
+				var oSWrapper = this.oEditingArea.createElement("P");
+				oSelection.moveToBookmark(sBM);
+				oSelection.setStartBefore(oStart.oNode);
+				oSelection.surroundContents(oSWrapper);
+
+				oSelection.collapseToEnd();
+
+				var oEWrapper = this.oEditingArea.createElement("P");
+				oSelection.setEndAfter(oEnd.oNode);
+				oSelection.surroundContents(oEWrapper);
+
+				oSelection.removeStringBookmark(sBM);
+
+				if(oSWrapper.innerHTML == "") oSWrapper.innerHTML = "<br>";
+				if(oEWrapper.innerHTML == "") oEWrapper.innerHTML = "<br>";
+
+				if(oEWrapper.nextSibling && oEWrapper.nextSibling.tagName == "BR") oEWrapper.parentNode.removeChild(oEWrapper.nextSibling);
+
+				oSelection.selectNodeContents(oEWrapper);
+				oSelection.collapseToStart();
+				oSelection.select();
+				this.oApp.exec("CHECK_STYLE_CHANGE", []);
+			}else{
+				oSelection.removeStringBookmark(sBM);
+			}
+		}
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to styling the font
+ * @name hp_XE_WYSIWYGStyler.js
+ * @required XE_EditingArea_WYSIWYG, XpressRangeManager
+ */
+xe.XE_WYSIWYGStyler = $.Class({
+	name : "XE_WYSIWYGStyler",
+
+	$PRECONDITION : function(sFullCommand, aArgs){
+		return (this.oApp.getEditingMode() == "WYSIWYG");
+	},
+
+	$ON_SET_WYSIWYG_STYLE : function(oStyles){
+		var oSelection = this.oApp.getSelection();
+
+		// style cursor
+		if(oSelection.collapsed){
+			var oSpan = this.oApp.getWYSIWYGDocument().createElement("SPAN");
+			oSelection.insertNode(oSpan);
+			oSpan.innerHTML = unescape("%uFEFF");
+
+			var sValue;
+			for(var sName in oStyles){
+				sValue = oStyles[sName];
+
+				if(typeof sValue != "string") continue;
+
+				oSpan.style[sName] = sValue;
+			}
+
+			oSelection.selectNodeContents(oSpan);
+			oSelection.collapseToEnd();
+			oSelection._window.focus();
+			oSelection._window.document.body.focus();
+			oSelection.select();
+
+			// FF3 will actually display %uFEFF when it is followed by a number AND certain font-family is used(like Gulim), so remove the chcaracter for FF3
+			if($.browser.mozilla && $.browser.nVersion == 3)
+				oSpan.innerHTML = "";
+
+			return;
+		}
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["FONT STYLE"]);
+
+		oSelection.styleRange(oStyles);
+		oSelection._window.focus();
+		oSelection.select();
+
+		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["FONT STYLE"]);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to detecting the style change
+ * @name hp_XE_WYSIWYGStyleGetter.js
+ */
+xe.XE_WYSIWYGStyleGetter = $.Class({
+	name : "XE_WYSIWYGStyleGetter",
+
+	hKeyUp : null,
+
+	getStyleInterval : 200,
+
+	oStyleMap : {
+		fontFamily : {
+			type : "Value",
+			css : "fontFamily"
+		},
+		fontSize : {
+			type : "Value",
+			css : "fontSize"
+		},
+		lineHeight : {
+			type : "Value",
+			css : "lineHeight",
+			converter : function(sValue, oStyle){
+				if(!sValue.match(/px$/)) return sValue;
+
+				return Math.ceil((parseInt(sValue)/parseInt(oStyle.fontSize))*10)/10;
+			}
+		},
+		bold : {
+			command : "bold"
+		},
+		underline : {
+			command : "underline"
+		},
+		italic : {
+			command : "italic"
+		},
+		lineThrough : {
+			command : "strikethrough"
+		},
+		superscript : {
+			command : "superscript"
+		},
+		subscript : {
+			command : "subscript"
+		},
+		justifyleft : {
+			command : "justifyleft"
+		},
+		justifycenter : {
+			command : "justifycenter"
+		},
+		justifyright : {
+			command : "justifyright"
+		},
+		justifyfull : {
+			command : "justifyfull"
+		},
+		orderedlist : {
+			command : "insertorderedlist"
+		},
+		unorderedlist : {
+			command : "insertunorderedlist"
+		}
+	},
+
+	$init : function(){
+		this.oStyle = this._getBlankStyle();
+	},
+
+	$PRECONDITION : function(){
+		if(this.oApp.getEditingMode() != "WYSIWYG") return false;
+
+		return true;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oDocument = this.oApp.getWYSIWYGDocument();
+		this.oApp.exec("ADD_APP_PROPERTY", ["getCurrentStyle", $.fnBind(this.getCurrentStyle, this)]);
+	},
+
+	$ON_EVENT_EDITING_AREA_MOUSEUP : function(oEvnet){
+		if(this.hKeyUp) clearTimeout(this.hKeyUp);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
+		/*
+		backspace 8
+		page up 33
+		page down 34
+		end 35
+		home 36
+		left arrow 37
+		up arrow 38
+		right arrow 39
+		down arrow 40
+		insert 45
+		delete 46
+		*/
+		if(!(oEvent.keyCode == 8 || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 45 || oEvent.keyCode == 46)) return;
+
+		if(this.hKeyUp) clearTimeout(this.hKeyUp);
+
+		this.hKeyUp = setTimeout($.fnBind(this.oApp.exec, this.oApp, "CHECK_STYLE_CHANGE", []), this.getStyleInterval);
+	},
+
+	$ON_CHECK_STYLE_CHANGE : function(){
+		this._getStyle();
+	},
+
+	$ON_RESET_STYLE_STATUS : function(){
+		var oBlankStyle = this._getBlankStyle();
+		for(var sAttributeName in oBlankStyle)
+			this.oApp.exec("SET_STYLE_STATUS", [sAttributeName, oBlankStyle[sAttributeName]]);
+	},
+
+	getCurrentStyle : function(){
+		return this.oStyle;
+	},
+
+	_check_style_change : function(){
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	_getBlankStyle : function(){
+		var oBlankStyle = {};
+		for(var attributeName in this.oStyleMap){
+			if(this.oStyleMap[attributeName].type == "Value")
+				oBlankStyle[attributeName] = "";
+			else
+				oBlankStyle[attributeName] = 0;
+		}
+
+		return oBlankStyle;
+	},
+
+	_getStyle : function(){
+		var oSelection = this.oApp.getSelection();
+
+		var funcFilter = function(oNode){
+			if (!oNode.childNodes || oNode.childNodes.length == 0)
+				return true;
+			else
+				return false;
+		}
+
+		var aBottomNodes = oSelection.getNodes(false, funcFilter);
+
+		var oStyle, oBaseStyle, oTmpStyle, attributeName;
+		if(aBottomNodes.length == 0){
+			oStyle = this._getStyleOf(oSelection.commonAncestorContainer);
+		}else{
+			oStyle = this._getStyleOf(aBottomNodes[0]);
+		}
+
+		for(attributeName in oStyle){
+			if(this.oStyleMap[attributeName].converter){
+				oStyle[attributeName] = this.oStyleMap[attributeName].converter(oStyle[attributeName], oStyle);
+			}
+
+			if(this.oStyle[attributeName] != oStyle[attributeName])
+				this.oApp.exec("MSG_STYLE_CHANGED", [attributeName, oStyle[attributeName]]);
+		}
+
+		this.oStyle = oStyle;
+	},
+
+	_getStyleOf : function(oNode){
+		var oStyle = this._getBlankStyle();
+
+		// this must not happen
+		if(!oNode) return oStyle;
+
+		if(oNode.nodeType == 3) oNode = oNode.parentNode;
+
+		var welNode = $(oNode);
+		var attribute, cssName;
+		for(var styleName in this.oStyle){
+			attribute = this.oStyleMap[styleName];
+
+			if(attribute.type && attribute.type == "Value"){
+				if(attribute.css){
+					var sValue = welNode.css(attribute.css);
+
+					if(styleName == "fontFamily"){
+						sValue = sValue.split(/,/)[0];
+					}
+
+					oStyle[styleName] = sValue;
+				}else{
+					if(attribute.command){
+						try{
+							oStyle[styleName] = this.oDocument.queryCommandState(attribute.command);
+						}catch(e){}
+					}else{
+						// todo
+					}
+				}
+			}else{
+				if(attribute.command){
+					try{
+						if(this.oDocument.queryCommandState(attribute.command)){
+							oStyle[styleName] = 1;
+						}else{
+							oStyle[styleName] = 0;
+						}
+					}catch(e){}
+				}else{
+					// todo
+				}
+			}
+		}
+		return oStyle;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font size using Select element
+ * @name hp_XE_FontSizeWithSelectUI.js
+ */
+xe.XE_FontSizeWithSelectUI = $.Class({
+	name : "XE_FontSizeWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFontSizeSelect = $("SELECT.xpress_xeditor_ui_fontSize_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFontSizeSelect, "change", "SET_FONTSIZE_FROM_SELECT_UI");
+		this.elFontSizeSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "fontSize"){
+			this.elFontSizeSelect.value = sAttributeValue;
+			if(this.elFontSizeSelect.selectedIndex < 0) this.elFontSizeSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_FONTSIZE_FROM_SELECT_UI : function(){
+		var sFontSize = this.elFontSizeSelect.value;
+		if(!sFontSize) return;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontSize":sFontSize}]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font name using Select element
+ * @name hp_XE_FontNameWithSelectUI.js
+ */
+xe.XE_FontNameWithSelectUI = $.Class({
+	name : "XE_FontNameWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFontNameSelect = $("SELECT.xpress_xeditor_ui_fontName_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFontNameSelect, "change", "SET_FONTNAME_FROM_SELECT_UI");
+		this.elFontNameSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "fontFamily"){
+			this.elFontNameSelect.value = sAttributeValue.toLowerCase();
+			if(this.elFontNameSelect.selectedIndex < 0) this.elFontNameSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_FONTNAME_FROM_SELECT_UI : function(){
+		var sFontName = this.elFontNameSelect.value;
+		if(!sFontName) return;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontFamily":sFontName}]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to setting/changing the lineheight
+ * @name hp_XE_LineHeight.js
+ */
+xe.XE_LineHeight = $.Class({
+	name : "XE_LineHeight",
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+	},
+
+	$ON_SET_LINEHEIGHT : function(nLineHeight){
+		this.setLineHeight(nLineHeight);
+	},
+
+	getLineHeight : function(){
+		var nodes = this._getSelectedNodes(false);
+
+		var curWrapper, prevWrapper;
+		var iCurHeight, iHeight;
+
+		if(nodes.length == 0) return -1;
+
+		var iLength = nodes.length;
+
+		if(iLength == 0){
+			iHeight = -1;
+		}else{
+			prevWrapper = this._getLineWrapper(nodes[0]);
+			iHeight = this._getWrapperLineheight(prevWrapper);
+		}
+
+		var firstNode = this.oSelection.getStartNode();
+
+		if(iHeight > 0){
+			for(var i=1; i<iLength; i++){
+				if(this._isChildOf(nodes[i], curWrapper)) continue;
+				if(!nodes[i]) continue;
+
+				curWrapper = this._getLineWrapper(nodes[i]);
+				if(curWrapper == prevWrapper) continue;
+
+				curHeight = this._getWrapperLineheight(curWrapper);
+
+				if(curHeight != iHeight){
+					iHeight = -1;
+					break;
+				}
+
+				prevWrapper = curWrapper;
+			}
+		}
+
+		curWrapper = this._getLineWrapper(nodes[iLength-1]);
+
+		var lastNode = this.oSelection.getEndNode();
+
+		selectText = $.fnBind(function(firstNode, lastNode){
+			this.oSelection.setEndNodes(firstNode, lastNode);
+			this.oSelection.select();
+		}, this, firstNode, lastNode);
+
+		setTimeout(selectText, 100);
+
+		return iHeight;
+	},
+
+	// height in percentage. For example pass 1 to set the line height to 100% and 1.5 to set it to 150%
+	setLineHeight : function(height) {
+		thisRef = this;
+
+		function _setLineheight(div, height){
+			if(!div){
+				// try to wrap with P first
+				try{
+					div = thisRef.oSelection.surroundContentsWithNewNode("P");
+				// if the range contains a block-level tag, wrap it with a DIV
+				}catch(e){
+					div = thisRef.oSelection.surroundContentsWithNewNode("DIV");
+				}
+			}
+
+			div.style.lineHeight = height;
+
+			return div;
+		}
+
+		function isInBody(node){
+			while(node && node.tagName != "BODY"){
+				node = xe.DOMFix.parentNode(node);
+			}
+			if(!node) return false;
+
+			return true;
+		}
+
+		var nodes = this._getSelectedNodes(false);
+		if(nodes.length == 0){
+			return;
+		}
+
+		var curWrapper, prevWrapper;
+		var iLength = nodes.length;
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["LINEHEIGHT"]);
+
+		prevWrapper = this._getLineWrapper(nodes[0]);
+		prevWrapper = _setLineheight(prevWrapper, height);
+
+		var startNode = prevWrapper;
+		var endNode = prevWrapper;
+
+		for(var i=1; i<iLength; i++){
+			// Skip the node if a copy of the node were wrapped and the actual node no longer exists within the document.
+			try{
+				if(!isInBody(xe.DOMFix.parentNode(nodes[i]))) continue;
+			}catch(e){continue;}
+
+			if(this._isChildOf(nodes[i], curWrapper)) continue;
+
+			curWrapper = this._getLineWrapper(nodes[i]);
+
+			if(curWrapper == prevWrapper) continue;
+
+			curWrapper = _setLineheight(curWrapper, height);
+
+			prevWrapper = curWrapper;
+		}
+
+		endNode = curWrapper || startNode;
+
+		setTimeout($.fnBind(function(startNode, endNode){
+			this.oSelection.setEndNodes(startNode, endNode);
+			this.oSelection.select();
+			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["LINEHEIGHT"]);
+		}, this, startNode, endNode), 100);
+	},
+	_getSelectedNodes : function(bDontUpdate){
+		if(!bDontUpdate)
+			this.oSelection = this.oApp.getSelection();
+
+		if(this.oSelection.collapsed) this.oSelection.selectNode(this.oSelection.commonAncestorContainer);
+
+		var nodes = this.oSelection.getTextNodes();
+
+		if(nodes.length == 0){
+			var tmp = this.oSelection.getStartNode();
+			if(tmp){
+				nodes[0] = tmp;
+			}else{
+				nodes = [];
+			}
+		}
+
+		return nodes;
+	},
+	_getWrapperLineheight : function(div){
+		var iLineHeight = '';
+		if(div && div.style.lineHeight){
+			iLineHeight = div.style.lineHeight;
+		}else{
+			div = this.oSelection.commonAncesterContainer;
+			while(div && !this.oSelection.rxLineBreaker.test(div.tagName)){
+				if(div && div.style.lineHeight){
+					iLineHeight = div.style.lineHeight;
+					break;
+				}
+				div = xe.DOMFix.parentNode(div);
+			}
+		}
+
+		return iLineHeight;
+	},
+
+	_isChildOf : function(node, container){
+		while(node && node.tagName != "BODY"){
+			if(node == container) return true;
+			node = xe.DOMFix.parentNode(node);
+		}
+
+		return false;
+	},
+ 	_getLineWrapper : function(node){
+		var oTmpSelection = this.oApp.getEmptySelection();
+		oTmpSelection.selectNode(node);
+		var oLineInfo = oTmpSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		var a, b;
+		var breakerA, breakerB;
+		var div = null;
+
+		a = oStart.oNode;
+		breakerA = oStart.oLineBreaker;
+		b = oEnd.oNode;
+		breakerB = oEnd.oLineBreaker;
+
+		this.oSelection.setEndNodes(a, b);
+
+		if(breakerA == breakerB){
+			if(breakerA.tagName == "P" || breakerA.tagName == "DIV"){
+				div = breakerA;
+			}else{
+				this.oSelection.setEndNodes(breakerA.firstChild, breakerA.lastChild);
+			}
+		}
+
+		return div;
+ 	}
+ });
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the lineheight using Select element
+ * @name hp_XE_LineHeightWithSelectUI.js
+ */
+xe.XE_LineHeightWithSelectUI = $.Class({
+	name : "XE_LineHeightWithSelectUI",
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elLineHeightSelect = $("SELECT.xpress_xeditor_ui_lineHeight_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elLineHeightSelect, "change", "SET_LINEHEIGHT_FROM_SELECT_UI");
+		this.elLineHeightSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "lineHeight"){
+			this.elLineHeightSelect.value = sAttributeValue;
+			if(this.elLineHeightSelect.selectedIndex < 0) this.elLineHeightSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_LINEHEIGHT_FROM_SELECT_UI : function(){
+		var nLineHeight = this.elLineHeightSelect.value;
+		if(!nLineHeight) return;
+
+		this.elLineHeightSelect.selectedIndex = 0;
+		this.oApp.exec("SET_LINEHEIGHT", [nLineHeight]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+}).extend(xe.XE_LineHeight);
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to the color palette
+ * @name hp_XE_ColorPalette.js
+ */
+ xe.XE_ColorPalette = $.Class({
+	name : "XE_ColorPalette",
+	rxRGBColorPattern : /rgb\((\d+), ?(\d+), ?(\d+)\)/i,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		this.elColorPaletteLayer = $("UL.xpress_xeditor_color_palette", oAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elColorPaletteLayer, "click", "EVENT_MOUSEUP_COLOR_PALETTE");
+	},
+
+	$ON_SHOW_COLOR_PALETTE : function(sCallbackCmd, oLayerContainer){
+		this.sCallbackCmd = sCallbackCmd;
+		this.oLayerContainer = oLayerContainer;
+
+		this.oLayerContainer.insertBefore(this.elColorPaletteLayer, null);
+
+		this.elColorPaletteLayer.style.display = "block";
+	},
+
+	$ON_HIDE_COLOR_PALETTE : function(){
+		this.elColorPaletteLayer.style.display = "none";
+	},
+
+	$ON_COLOR_PALETTE_APPLY_COLOR : function(sColorCode){
+		if(this.rxRGBColorPattern.test(sColorCode)){
+
+			function dec2Hex(sDec){
+				var sTmp = parseInt(sDec).toString(16);
+				if(sTmp.length<2) sTmp = "0"+sTmp;
+				return sTmp.toUpperCase();
+			}
+
+			var sR = dec2Hex(RegExp.$1);
+			var sG = dec2Hex(RegExp.$2);
+			var sB = dec2Hex(RegExp.$3);
+			sColorCode = "#"+sR+sG+sB;
+		}
+		this.oApp.exec(this.sCallbackCmd, [sColorCode]);
+	},
+
+	$ON_EVENT_MOUSEUP_COLOR_PALETTE : function(oEvent){
+		var elButton = oEvent.target;
+		if(! elButton.style.backgroundColor) return;
+
+		this.oApp.exec("COLOR_PALETTE_APPLY_COLOR", [elButton.style.backgroundColor]);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font color
+ * @name hp_XE_FontColor.js
+ */
+xe.XE_FontColor = $.Class({
+	name : "XE_FontColor",
+	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = $("DIV.xpress_xeditor_fontcolor_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["fontColor", "click", "TOGGLE_FONTCOLOR_LAYER"]);
+	},
+
+	$ON_TOGGLE_FONTCOLOR_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_FONTCOLOR", this.elDropdownLayer]]);
+	},
+
+	$ON_APPLY_FONTCOLOR : function(sFontColor){
+		if(!this.rxColorPattern.test(sFontColor)){
+			alert(this.oApp.$MSG("XE_FontColor.invalidColorCode"));
+			return;
+		}
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"color":sFontColor}]);
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of changing the background color
+ * @name hp_XE_BGColor.js
+ */
+xe.XE_BGColor = $.Class({
+	name : "XE_BGColor",
+	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = $("DIV.xpress_xeditor_bgcolor_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["bgColor", "click", "TOGGLE_BGCOLOR_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_BGCOLOR", []);
+	},
+
+	$ON_TOGGLE_BGCOLOR_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_BGCOLOR", this.elDropdownLayer]]);
+	},
+
+	$ON_EVENT_APPLY_BGCOLOR : function(weEvent){
+		var elButton = weEvent.target;
+
+		// Safari/Chrome/Opera may capture the event on Span
+		if(elButton.tagName == "SPAN") elButton = elButton.parentNode;
+		if(elButton.tagName != "BUTTON") return;
+
+		var sBGColor, sFontColor;
+
+		sBGColor = elButton.style.backgroundColor;
+		sFontColor = elButton.style.color;
+
+		this.oApp.exec("APPLY_BGCOLOR", [sBGColor, sFontColor]);
+	},
+
+	$ON_APPLY_BGCOLOR : function(sBGColor, sFontColor){
+		if(!this.rxColorPattern.test(sBGColor)){
+			alert(this.oApp.$MSG("XE_BGColor.invalidColorCode"));
+			return;
+		}
+
+		var oStyle = {"backgroundColor": sBGColor}
+		if(sFontColor) oStyle.color = sFontColor;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [oStyle]);
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to quote
+ * @name hp_XE_Quote.js
+ * @required XE_EditingArea_WYSIWYG
+ */
+xe.XE_Quote = $.Class({
+	name : "XE_Quote",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = $("DIV.xpress_xeditor_blockquote_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY: function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["quote", "click", "TOGGLE_BLOCKQUOTE_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_SEDITOR_BLOCKQUOTE", []);
+	},
+
+	$ON_TOGGLE_BLOCKQUOTE_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_EVENT_APPLY_SEDITOR_BLOCKQUOTE : function(weEvent){
+		var elButton = weEvent.target;
+		if(elButton.tagName != "BUTTON") return;
+
+		var sClass = elButton.parentNode.className;
+
+		if(sClass != "q8")
+			this._wrapBlock("BLOCKQUOTE", sClass);
+		else
+			this._unwrapBlock("BLOCKQUOTE");
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	_unwrapBlock : function(tag){
+		var oSelection = this.oApp.getSelection();
+		var oC = oSelection.commonAncestorContainer;
+
+		while(oC && oC.tagName != tag) oC = oC.parentNode;
+		if(!oC) return;
+
+		while(oC.firstChild) oC.parentNode.insertBefore(oC.firstChild, oC);
+
+		oC.parentNode.removeChild(oC);
+	},
+
+	_wrapBlock : function(tag, className){
+		var oSelection = this.oApp.getSelection();
+		var oLineInfo = oSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		var rxDontUseAsWhole = /BODY|TD|LI/i;
+
+		var oStartNode, oEndNode;
+
+		if(oStart.bParentBreak && !rxDontUseAsWhole.test(oStart.oLineBreaker.tagName)) oStartNode = oStart.oNode.parentNode;
+		else oStartNode = oStart.oNode;
+
+		if(oEnd.bParentBreak && !rxDontUseAsWhole.test(oEnd.oLineBreaker.tagName)) oEndNode = oEnd.oNode.parentNode;
+		else oEndNode = oEnd.oNode;
+
+		oSelection.setStartBefore(oStartNode);
+		oSelection.setEndAfter(oEndNode);
+
+		var oNode = this._expandToTableStart(oSelection, oEndNode);
+		if(oNode){
+			oEndNode = oNode;
+			oSelection.setEndAfter(oNode);
+		}
+
+		oNode = this._expandToTableStart(oSelection, oStartNode);
+		if(oNode){
+			oStartNode = oNode;
+			oSelection.setStartBefore(oNode);
+		}
+
+		oNode = oStartNode;
+		var oC = oSelection.commonAncestorContainer;
+
+		// find the insertion position for the formatting tag right beneath the common ancestor container
+		while(oNode && oNode != oC && oNode.parentNode != oC) oNode = oNode.parentNode;
+
+		oFormattingNode = oSelection._document.createElement(tag);
+		if(className) oFormattingNode.className = className;
+
+		if(oNode == oC){
+			oC.insertBefore(oFormattingNode, oC.firstChild);
+		}else{
+			oC.insertBefore(oFormattingNode, oNode);
+		}
+
+		oSelection.setStartAfter(oFormattingNode);
+
+		oSelection.setEndAfter(oEndNode);
+		oSelection.surroundContents(oFormattingNode);
+
+		var aNodes = oFormattingNode.childNodes;
+		var oInsertionPoint;
+		for(var i=aNodes.length-1; i>=0; i--){
+			if(aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR"){
+				var oP = oSelection._document.createElement("P");
+				oInsertionPoint = aNodes[i].nextSibling;
+				while(i>=0 && aNodes[i] && (aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR")){
+					oP.insertBefore(aNodes[i--], oP.firstChild);
+				}
+				oFormattingNode.insertBefore(oP, oInsertionPoint);
+				i++;
+			}
+		}
+
+		if(oFormattingNode && oFormattingNode.parentNode){
+			var oP = oSelection._document.createElement("P");
+			oP.innerHTML = unescape("<br/>");
+			oFormattingNode.parentNode.insertBefore(oP, oFormattingNode.nextSibling);
+		}
+
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Block Quote"]);
+
+		return oFormattingNode;
+	},
+
+	_expandToTableStart : function(oSelection, oNode){
+		var oC = oSelection.commonAncestorContainer;
+		var oResultNode = null;
+
+		var bLastIteration = false;
+		while(oNode && !bLastIteration){
+			if(oNode == oC) bLastIteration = true;
+
+			if(/TBODY|TFOOT|THEAD|TR/i.test(oNode.tagName)){
+				oResultNode = this._getTableRoot(oNode);
+				break;
+			}
+			oNode = oNode.parentNode;
+		}
+
+		return oResultNode;
+	},
+
+	_getTableRoot : function(oNode){
+		while(oNode && oNode.tagName != "TABLE") oNode = oNode.parentNode;
+
+		return oNode;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to inserting special characters
+ * @name hp_XE_SCharacter.js
+ * @required XpressRangeManager
+ */
+xe.XE_SCharacter = $.Class({
+	name : "XE_SCharacter",
+
+	$init : function(oAppContainer){
+		this.bIE = $.browser.msie;
+
+		this._assignHTMLObjects(oAppContainer);
+
+		this.charSet = [];
+		this.charSet[0] = unescape('FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[1] = unescape('%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[2] = unescape('3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[3] = unescape('3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[4] = unescape('0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[5] = unescape('3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+
+		this.elDropdownLayer = $("DIV.xpress_xeditor_sCharacter_layer", oAppContainer).get(0);
+
+		this.oTextField = $("INPUT", this.elDropdownLayer).get(0);
+		this.oInsertButton = $("+ BUTTON", this.oTextField).get(0);
+		this.aCloseButton = $("BUTTON.close", this.elDropdownLayer).get();
+		this.aSCharList = $(".list", this.elDropdownLayer).get();
+		var oLabelUL = $(">UL", this.elDropdownLayer).get(0);
+		this.aLabelA = $("A", oLabelUL).get();
+	},
+
+	$ON_MSG_APP_READY : function(){
+		var funcInsert = $.fnBind(this.oApp.exec, this.oApp, "INSERT_SCHARACTERS", [this.oTextField.value]);
+		$(this.oInsertButton).click(funcInsert, this);
+
+		this.oApp.exec("SET_SCHARACTER_LIST", [this.charSet]);
+
+		for(var i=0; i<this.aLabelA.length; i++){
+			var func = $.fnBind(this.oApp.exec, this.oApp, "CHANGE_SCHARACTER_SET", [i]);
+			$(this.aLabelA[i]).mousedown(func);
+
+			this._stopBrowserEvent(this.aLabelA[i], "click");
+		}
+
+		for(var i=0; i<this.aCloseButton.length; i++){
+			this.oApp.registerBrowserEvent(this.aCloseButton[i], "click", "HIDE_ACTIVE_LAYER", []);
+		}
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_SCHARACTER_CLICKED", []);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["sCharacter", "click", "TOGGLE_SCHARACTER_LAYER"]);
+	},
+
+	$ON_TOGGLE_SCHARACTER_LAYER : function(){
+		this.oTextField.value = "";
+		this.oSelection = this.oApp.getSelection();
+
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_EVENT_SCHARACTER_CLICKED : function(weEvent){
+		var elButton = weEvent.target;
+		if(elButton.tagName != "BUTTON") return;
+		if(elButton.parentNode.tagName != "LI") return;
+
+		var sChar = elButton.firstChild.innerHTML;
+
+		this.oApp.exec("SELECT_SCHARACTER", [sChar]);
+	},
+
+	$ON_SELECT_SCHARACTER : function(schar){
+		this.oTextField.value += schar;
+
+		if(this.oTextField.createTextRange){
+			var oTextRange = this.oTextField.createTextRange();
+			oTextRange.collapse(false);
+			oTextRange.select();
+		}else{
+			if(this.oTextField.selectionEnd){
+				this.oTextField.selectionEnd = this.oTextField.value.length;
+				this.oTextField.focus();
+			}
+		}
+	},
+
+	$ON_INSERT_SCHARACTERS : function(){
+		this.oSelection.pasteHTML(this.oTextField.value);
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_CHANGE_SCHARACTER_SET : function(nSCharSet){
+		for(var i=0; i<this.aSCharList.length; i++){
+			if(this.aSCharList[i].style.display == "block"){
+				if(i == nSCharSet) return;
+
+				$(this.aLabelA[i]).removeClass("on");
+				this.aSCharList[i].style.display = "none";
+			}
+		}
+
+		this._drawSCharList(nSCharSet);
+		$(this.aLabelA[nSCharSet]).addClass("on");
+		this.aSCharList[nSCharSet].style.display = "block";
+	},
+
+	$ON_SET_SCHARACTER_LIST : function(charSet){
+		this.charSet = charSet;
+		this.bSCharSetDrawn = new Array(this.charSet.length);
+		this._drawSCharList(0);
+	},
+
+	_drawSCharList : function(i){
+		if(this.bSCharSetDrawn[i]) return;
+		this.bSCharSetDrawn[i] = true;
+
+		var len = this.charSet[i].length;
+		var aLI = new Array(len);
+
+		this.aSCharList[i].innerHTML = '';
+
+		var button, span;
+		for(var ii=0; ii<len; ii++){
+			aLI[ii] = document.createElement("LI");
+
+			aLI[ii].innerHTML = '<button type="button"><span>'+unescape(this.charSet[i][ii])+'</span></button>';
+			this.aSCharList[i].appendChild(aLI[ii]);
+		}
+
+		// enable this after Jindo framework is updated
+//		this.oApp.exec("ATTACH_HOVER_EVENTS", [$(">LI>BUTTON", this.aSCharList[i])]).get();
+	},
+
+	_stopBrowserEvent : function(obj, sEvent){
+		$(obj).bind(sEvent, function(e){e.stopPropagation();e.preventDefault();} )
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to Undo/Redo
+ * @name hp_XE_UndoRedo.js
+ * @required XE_EditingAreaManager, XpressRangeManager
+ */
+xe.XE_UndoRedo = $.Class({
+	name : "XE_UndoRedo",
+	actionHistory : null,
+	// this may also be called, lastAdded/lastRestored
+	oCurStateIdx : null,
+	iMinimumSizeChange : 10,
+	sBlankContentsForFF : "<br>",
+
+	$init : function(){
+		this.aUndoHistory = [];
+		this.oCurStateIdx = {nIdx: 0, nStep: 0};
+	},
+
+	$PRECONDITION : function(sCmd){
+		if(sCmd.match(/_DO_RECORD_UNDO_HISTORY_AT$/)) return true;
+
+		try{
+			if(this.oApp.getEditingMode() != "WYSIWYG") return false;
+		}catch(e){
+			return false;
+		}
+
+		return true;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [this.oCurStateIdx, "", "", null]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.bFF = $.browser.mozilla;
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoHistory", $.fnBind(this.getUndoHistory, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoStateIdx", $.fnBind(this.getUndoStateIdx, this)]);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["undo", "click", "UNDO"]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["redo", "click", "REDO"]);
+
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+z", "UNDO"]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+y", "REDO"]);
+	},
+
+	$ON_UNDO : function(){
+		var oTmpStateIdx = {};
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", ["KEYPRESS", false, false, 1]);
+		if(this.oCurStateIdx.nIdx == 0) return;
+
+		if(this.oCurStateIdx.nStep > 0){
+			this.oCurStateIdx.nStep--;
+		}else{
+			var oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+
+			this.oCurStateIdx.nIdx--;
+
+			if(oTmpHistory.nTotalSteps>1){
+				this.oCurStateIdx.nStep = 0;
+			}else{
+				oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+				this.oCurStateIdx.nStep = oTmpHistory.nTotalSteps-1;
+			}
+		}
+
+		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+
+	$ON_REDO : function(){
+		if(this.oCurStateIdx.nIdx >= this.aUndoHistory.length) return;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+		if(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1 && this.oCurStateIdx.nStep >= oCurHistory.nTotalSteps-1) return;
+
+		if(this.oCurStateIdx.nStep < oCurHistory.nTotalSteps-1){
+			this.oCurStateIdx.nStep++;
+		}else{
+			this.oCurStateIdx.nIdx++;
+			oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+			this.oCurStateIdx.nStep = oCurHistory.nTotalSteps-1;
+		}
+
+		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	$ON_RECORD_UNDO_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction]);
+	},
+
+	$ON_RECORD_UNDO_BEFORE_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, true]);
+	},
+
+	$ON_RECORD_UNDO_AFTER_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, false]);
+	},
+
+	$ON_RESTORE_UNDO_HISTORY : function(nUndoIdx, nUndoStateStep){
+		this.oCurStateIdx.nIdx = nUndoIdx;
+		this.oCurStateIdx.nStep = nUndoStateStep;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+		var sContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
+		var oBookmark = oCurHistory.oBookmark[this.oCurStateIdx.nStep];
+
+		this.oApp.setIR(sContent, true);
+
+		// setting the innerHTML may change the internal DOM structure, so save the value again.
+		var sCurContent = this.oApp.getIR();
+		if(this.bFF && sCurContent == this.sBlankContentsForFF){
+			sCurContent = "";
+		}
+		oCurHistory.sContent[this.oCurStateIdx.nStep] = sCurContent;
+
+		var oSelection = this.oApp.getEmptySelection();
+		if(oSelection.selectionLoaded){
+			if(oBookmark){
+				oSelection.moveToXPathBookmark(oBookmark);
+			}else{
+				oSelection = this.oApp.getEmptySelection();
+			}
+
+			oSelection.select();
+		}
+	},
+
+	$ON_DO_RECORD_UNDO_HISTORY : function(sAction, bTwoStepAction, bBeforeAction, nForceAddUnlessEqual){
+		bTwoStepAction = bTwoStepAction || false;
+		bBeforeAction = bBeforeAction || false;
+		nForceAddUnlessEqual = nForceAddUnlessEqual || 0;
+
+		// if we're in the middle of some action history, remove everything after current idx if any "little" change is made
+		if(!(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1)) nForceAddUnlessEqual = 1;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+
+		var sCurContent = this.oApp.getIR();
+		var sHistoryContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
+
+		if(this.bFF && sCurContent == this.sBlankContentsForFF){
+			sCurContent = "";
+		}
+
+		// every TwoStepAction needs to be recorded
+		if(!bTwoStepAction){
+			switch(nForceAddUnlessEqual){
+				case 0:
+					if(Math.abs(sHistoryContent.length - sCurContent.length)<this.iMinimumSizeChange) return;
+					break;
+
+				case 1:
+					if(sHistoryContent == sCurContent) return;
+					break;
+
+				// write at all times
+				case 2:
+					break;
+			}
+		}
+
+		var oSelection = this.oApp.getSelection();
+
+		var oBookmark=null;
+		if(oSelection.selectionLoaded){
+			oBookmark = oSelection.getXPathBookmark();
+		}
+
+		var oInsertionIdx = {nIdx:this.oCurStateIdx.nIdx, nStep:this.oCurStateIdx.nStep};
+		if(bTwoStepAction){
+			if(bBeforeAction){
+				oInsertionIdx.nStep = 0;
+			}else{
+				oInsertionIdx.nStep = 1;
+			}
+		}else{
+			oInsertionIdx.nStep = 0;
+		}
+
+		if(oInsertionIdx.nStep == 0 && this.oCurStateIdx.nStep == oCurHistory.nTotalSteps-1){
+			oInsertionIdx.nIdx = this.oCurStateIdx.nIdx+1;
+		}
+
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [oInsertionIdx, sAction, sCurContent, oBookmark]);
+	},
+
+	$ON_DO_RECORD_UNDO_HISTORY_AT : function(oInsertionIdx, sAction, sContent, oBookmark){
+		if(oInsertionIdx.nStep != 0){
+			this.aUndoHistory[oInsertionIdx.nIdx].nTotalSteps = oInsertionIdx.nStep+1;
+			this.aUndoHistory[oInsertionIdx.nIdx].sContent[oInsertionIdx.nStep] = sContent;
+			this.aUndoHistory[oInsertionIdx.nIdx].oBookmark[oInsertionIdx.nStep] = oBookmark;
+		}else{
+			var oNewHistory = {sAction:sAction, nTotalSteps: 1};
+			oNewHistory.sContent = [];
+			oNewHistory.sContent[0] = sContent;
+
+			oNewHistory.oBookmark = [];
+			oNewHistory.oBookmark[0] = oBookmark;
+			this.aUndoHistory.splice(oInsertionIdx.nIdx, this.aUndoHistory.length - oInsertionIdx.nIdx, oNewHistory);
+		}
+
+		this.oCurStateIdx.nIdx = oInsertionIdx.nIdx;
+		this.oCurStateIdx.nStep = oInsertionIdx.nStep;
+	},
+
+	_getUndoHistory : function(){
+		return this.aUndoHistory;
+	},
+
+	_getUndoStateIdx : function(){
+		return this.oCurStateIdx;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to hyperlink
+ * @name hp_XE_Hyperlink.js
+ */
+xe.XE_Hyperlink = $.Class({
+	name : "XE_Hyperlink",
+	sATagMarker : "HTTP://HUSKY_TMP.MARKER/",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+		this.sRXATagMarker = this.sATagMarker.replace(/\//g, "\\/").replace(/\./g, "\\.");
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.oHyperlinkLayer = $("DIV.xpress_xeditor_hyperlink_layer", elAppContainer).get(0);
+		this.oLinkInput  = $("INPUT[type=text]", this.oHyperlinkLayer).get(0);
+		this.oBtnConfirm = $("BUTTON.confirm", this.oHyperlinkLayer).get(0);
+		this.oBtnCancel  = $("BUTTON.cancel", this.oHyperlinkLayer).get(0);
+		this.oCbNewWin   = $("INPUT[type=checkbox]", this.oHyperlinkLayer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+k", "XE_TOGGLE_HYPERLINK_LAYER", []]);
+
+		this.oApp.registerBrowserEvent(this.oBtnConfirm, "mousedown", "XE_APPLY_HYPERLINK");
+		this.oApp.registerBrowserEvent(this.oBtnCancel, "mousedown", "HIDE_ACTIVE_LAYER");
+		this.oApp.registerBrowserEvent(this.oLinkInput, "keydown", "EVENT_XE_HYPERLINK_KEYDOWN");
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["hyperlink", "click", "XE_TOGGLE_HYPERLINK_LAYER"]);
+	},
+
+	$ON_XE_TOGGLE_HYPERLINK_LAYER : function(){
+		// hotkey may close the layer right away so delay here
+		this.oApp.delayedExec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.oHyperlinkLayer, null, "XE_RESET_HYPERLINK_LAYER", []], 0);
+	},
+
+	$ON_XE_RESET_HYPERLINK_LAYER : function(){
+		this.oApp.exec("FOCUS", []);
+		this.oSelection = this.oApp.getSelection();
+		var oAnchor = this.oSelection.findAncestorByTagName("A");
+		this.oCbNewWin.checked = false;
+		if(oAnchor){
+			this.oSelection.selectNode(oAnchor);
+			this.oSelection.select();
+
+			var sTarget = oAnchor.target;
+			if(sTarget && sTarget == "_blank") this.oCbNewWin.checked = true;
+
+			this.oLinkInput.value = oAnchor.href?oAnchor.href:"http://";
+		}else{
+			this.oLinkInput.value = "http://";
+		}
+
+		this.oLinkInput.focus();
+		this.oLinkInput.value = this.oLinkInput.value;
+	},
+
+	$ON_XE_APPLY_HYPERLINK : function(){
+		var sURL = this.oLinkInput.value, newWin = this.oCbNewWin.checked, sTarget = newWin?'_blank':'';
+
+		this.oApp.exec("FOCUS", []);
+		this.oSelection = this.oApp.getSelection();
+
+		if(this.oSelection.collapsed){
+			var str = "<a href='" + sURL + "' target="+sTarget+">" + sURL + "</a>";
+			this.oSelection.pasteHTML(str);
+		}else{
+			var nSession = Math.ceil(Math.random()*10000);
+			var sMarker  = this.sATagMarker+nSession;
+			var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, sMarker+sURL] );
+			this.oApp.exec("EXECCOMMAND", arg);
+
+			try { this.oSelection.setFromSelection() }catch(e){};
+			var oDoc = this.oApp.getWYSIWYGDocument();
+			$(oDoc.body.getElementsByTagName("A"))
+				.filter('[href^="'+sMarker+'"]')
+					.attr('href', function(){
+							var rx = new RegExp('^'+sMarker.replace(/([\.\\])/g, '\\$1'), 'i');
+
+							if (sTarget) $(this).attr('target', sTarget);
+							else $(this).removeAttr('target');
+
+							return this.href.replace(rx, '');
+						});
+		}
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+
+		setTimeout($.fnBind(function(){try{this.oSelection.select()}catch(e){}}, this), 0);
+	},
+
+	_validateURL : function(sURL){
+		return /^(http|https|ftp|mailto):(?:\/\/)?((\w|-)+(?:[\.:@](\w|-))+)(?:\/|@)?([^"\?]*?)(?:\?([^\?"]*?))?$/.test(sURL);
+	},
+
+	$ON_EVENT_XE_HYPERLINK_KEYDOWN : function(oEvent){
+		if (oEvent.keyCode == 13){
+			this.oApp.exec("XE_APPLY_HYPERLINK");
+			oEvent.preventDefault(); oEvent.stopPropagation();
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to table creation
+ * @name hp_XE_Table.js
+ */
+xe.XE_Table = $.Class({
+	name : "XE_Table",
+	iMinRows : 1,
+	iMaxRows : 20,
+
+	iMinColumns : 1,
+	iMaxColumns : 10,
+
+	iMinBorderWidth : 1,
+	iMaxBorderWidth : 10,
+
+	oSelection : null,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		var tmp = null;
+
+		this.elDropdownLayer = $("DIV.xpress_xeditor_table_layer", oAppContainer).get(0);
+		this.welDropdownLayer = $(this.elDropdownLayer);
+
+		tmp = $("INPUT", this.elDropdownLayer).get();
+		this.oRowInput = tmp[0];
+		this.oColumnInput = tmp[1];
+		this.oBorderWidthInput = tmp[2];
+		this.oBorderColorInput = tmp[3];
+		this.oBGColorInput = tmp[4];
+
+		tmp = $("BUTTON", this.elDropdownLayer).get();
+		this.oButton_AddRow = tmp[0];
+		this.oButton_RemoveRow = tmp[1];
+		this.oButton_AddColumn = tmp[2];
+		this.oButton_RemoveColumn = tmp[3];
+		this.oButton_IncBorderWidth = tmp[4];
+		this.oButton_DecBorderWidth = tmp[5];
+		this.oButton_BorderColorPreview = tmp[6];
+		this.oButton_BorderColor = tmp[7];
+		this.oButton_BGColorPreview = tmp[8];
+		this.oButton_BGColor = tmp[9];
+		this.oButton_Insert = tmp[10];
+		this.oButton_Cancel = tmp[11];
+
+		this.oSampleTable = $("TABLE", this.elDropdownLayer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["table", "click", "ST_TOGGLE_TOOLBAR_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.oRowInput, "change", "ST_SET_ROW_NUM", [null, 0]);
+		this.oApp.registerBrowserEvent(this.oColumnInput, "change", "ST_SET_COLUMN_NUM", [null, 0]);
+		this.oApp.registerBrowserEvent(this.oBorderWidthInput, "change", "ST_SET_BORDER_WIDTH", [null, 0]);
+
+		this.oApp.registerBrowserEvent(this.oButton_AddRow, "click", "ST_ADD_ROW");
+		this.oApp.registerBrowserEvent(this.oButton_RemoveRow, "click", "ST_REMOVE_ROW");
+		this.oApp.registerBrowserEvent(this.oButton_AddColumn, "click", "ST_ADD_COLUMN");
+		this.oApp.registerBrowserEvent(this.oButton_RemoveColumn, "click", "ST_REMOVE_COLUMN");
+
+		this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth, "click", "ST_INC_BORDER_WIDTH");
+		this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth, "click", "ST_DEC_BORDER_WIDTH");
+
+		this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
+		this.oApp.registerBrowserEvent(this.oButton_BGColorPreview, "click", "ST_TOGGLE_BGCOLOR_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oButton_BorderColor, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
+		this.oApp.registerBrowserEvent(this.oButton_BGColor, "click", "ST_TOGGLE_BGCOLOR_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oButton_Insert, "click", "ST_INSERT_TABLE");
+		this.oApp.registerBrowserEvent(this.oButton_Cancel, "click", "ST_CLOSE");
+
+		this.oApp.exec("ST_SET_BORDER_COLOR", ["#CCCCCC"]);
+		this.oApp.exec("ST_SET_BGCOLOR", ["#FFFFFF"]);
+	},
+
+	$ON_ST_TOGGLE_TOOLBAR_LAYER : function(){
+		this.oApp.exec("RECORD_UNDO_ACTION_FORCED", ["KEYPRESS"]);
+
+		this._showNewTable();
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_ST_ADD_ROW : function(){
+		this.oApp.exec("ST_SET_ROW_NUM", [null, 1]);
+	},
+
+	$ON_ST_REMOVE_ROW : function(){
+		this.oApp.exec("ST_SET_ROW_NUM", [null, -1]);
+	},
+
+	$ON_ST_ADD_COLUMN : function(){
+		this.oApp.exec("ST_SET_COLUMN_NUM", [null, 1]);
+	},
+
+	$ON_ST_REMOVE_COLUMN : function(){
+		this.oApp.exec("ST_SET_COLUMN_NUM", [null, -1]);
+	},
+
+	$ON_ST_SET_ROW_NUM : function(iRows, iRowDiff){
+		iRows = iRows || parseInt(this.oRowInput.value);
+		iRowDiff = iRowDiff || 0;
+
+		iRows += iRowDiff;
+
+		if(iRows < this.iMinRows) iRows = this.iMinRows;
+		if(iRows > this.iMaxRows) iRows = this.iMaxRows;
+
+		this.oRowInput.value = iRows;
+		this._showNewTable();
+	},
+
+	$ON_ST_SET_COLUMN_NUM : function(iColumns, iColumnDiff){
+		iColumns = iColumns || parseInt(this.oColumnInput.value);
+		iColumnDiff = iColumnDiff || 0;
+
+		iColumns += iColumnDiff;
+
+		if(iColumns < this.iMinColumns) iColumns = this.iMinColumns;
+		if(iColumns > this.iMaxColumns) iColumns = this.iMaxColumns;
+
+		this.oColumnInput.value = iColumns;
+		this._showNewTable();
+	},
+
+	$ON_ST_INSERT_TABLE : function(){
+		var sTable = this._getTableString();
+
+		this.oApp.exec("PASTE_HTML", [sTable]);
+
+		this.oApp.exec("ST_CLOSE", []);
+	},
+
+	$ON_ST_CLOSE : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_ST_SET_BORDER_WIDTH : function(iBorderWidth, iBorderWidthDiff){
+		iBorderWidth = iBorderWidth || parseInt(this.oBorderWidthInput.value);
+		iBorderWidthDiff = iBorderWidthDiff || 0;
+
+		iBorderWidth += iBorderWidthDiff;
+
+		if(iBorderWidth < this.iMinBorderWidth) iBorderWidth = this.iMinBorderWidth;
+		if(iBorderWidth > this.iMaxBorderWidth) iBorderWidth = this.iMaxBorderWidth;
+
+		this.oBorderWidthInput.value = iBorderWidth;
+		this._showNewTable();
+	},
+
+	$ON_ST_INC_BORDER_WIDTH : function(){
+		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, 1]);
+	},
+
+	$ON_ST_DEC_BORDER_WIDTH : function(){
+		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, -1]);
+	},
+
+	$ON_ST_TOGGLE_BORDER_COLOR_LAYER : function(){
+		if(this.welDropdownLayer.hasClass("p1"))
+			this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
+		else
+			this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER", []);
+	},
+
+	$ON_ST_SHOW_BORDER_COLOR_LAYER : function(){
+		this.welDropdownLayer.addClass("p1");
+		this.welDropdownLayer.removeClass("p2");
+
+		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BORDER_COLOR_FROM_PALETTE", this.elDropdownLayer]);
+	},
+
+	$ON_ST_HIDE_BORDER_COLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p1");
+
+		this.oApp.exec("HIDE_COLOR_PALETTE", []);
+	},
+
+	$ON_ST_TOGGLE_BGCOLOR_LAYER : function(){
+		if(this.welDropdownLayer.hasClass("p2"))
+			this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
+		else
+			this.oApp.exec("ST_SHOW_BGCOLOR_LAYER", []);
+	},
+
+	$ON_ST_SHOW_BGCOLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p1");
+		this.welDropdownLayer.addClass("p2");
+
+		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BGCOLOR_FROM_PALETTE", this.elDropdownLayer]);
+	},
+
+	$ON_ST_HIDE_BGCOLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p2");
+
+		this.oApp.exec("HIDE_COLOR_PALETTE", []);
+	},
+
+	$ON_ST_SET_BORDER_COLOR_FROM_PALETTE : function(sColorCode){
+		this.oApp.exec("ST_SET_BORDER_COLOR", [sColorCode]);
+		this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
+	},
+
+	$ON_ST_SET_BORDER_COLOR : function(sColorCode){
+		this.oBorderColorInput.value = sColorCode;
+		this.oButton_BorderColorPreview.style.backgroundColor = sColorCode;
+
+		this._showNewTable();
+	},
+
+	$ON_ST_SET_BGCOLOR_FROM_PALETTE : function(sColorCode){
+		this.oApp.exec("ST_SET_BGCOLOR", [sColorCode]);
+		this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
+	},
+
+	$ON_ST_SET_BGCOLOR : function(sColorCode){
+		this.oBGColorInput.value = sColorCode;
+		this.oButton_BGColorPreview.style.backgroundColor = sColorCode;
+
+		this._showNewTable();
+	},
+
+	_showNewTable : function(){
+		var oTmp = document.createElement("DIV");
+		oTmp.innerHTML = this._getTableString();
+		var oNewTable = oTmp.firstChild;
+		this.oSampleTable.parentNode.insertBefore(oNewTable, this.oSampleTable);
+		this.oSampleTable.parentNode.removeChild(this.oSampleTable);
+		this.oSampleTable = oNewTable;
+	},
+
+	// need to do something about the table width as the same HTML code is being used to the actual table and the preview table
+	_getTableString : function(){
+		var sBorderColorCode = this.oBorderColorInput.value;
+		var sBGColorCode = this.oBGColorInput.value;
+		var iBorderWidth = this.oBorderWidthInput.value;
+		var sTD = "";
+		if($.browser.msie){
+			sTD = "<td><p></p></td>";
+		}else{
+			if($.browser.firefox){
+				sTD = "<td><p><br/></p></td>";
+			}else{
+				sTD = "<td><p>&nbsp;</p></td>";
+			}
+		}
+
+		var sTable = '<table style="background:'+sBorderColorCode+'" cellspacing="'+iBorderWidth+'">';
+		var sRow = '<tr style="background:'+sBGColorCode+'">';
+		var iColumns = this.oColumnInput.value;
+		for(var i=0; i<iColumns; i++){
+			sRow += sTD;
+		}
+		sRow += "</tr>\n";
+
+		var iRows = this.oRowInput.value;
+
+		sTable += "<tbody>";
+		for(var i=0; i<iRows; i++){
+			sTable += sRow;
+		}
+		sTable += "</tbody>";
+
+		sTable += "</table>";
+
+		return sTable;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the editing mode using a Button element
+ * @name hp_XE_EditingModeToggler.js
+ */
+xe.XE_EditingModeToggler = $.Class({
+	name : "XE_EditingModeToggler",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		elAppContainer = $.$(elAppContainer) || document;
+
+		this.elModeToggleButton = $("BUTTON.xpress_xeditor_mode_toggle_button", elAppContainer).get(0);
+		this.welModeToggleButton = $(this.elModeToggleButton);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elModeToggleButton, "click", "EVENT_TOGGLE_EDITING_MODE", []);
+	},
+
+	$ON_EVENT_TOGGLE_EDITING_MODE : function(){
+		if(this.oApp.getEditingMode() == "WYSIWYG")
+			this.oApp.exec("CHANGE_EDITING_MODE", ["HTMLSrc"]);
+		else
+			this.oApp.exec("CHANGE_EDITING_MODE", ["WYSIWYG"]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode){
+		if(sMode == "HTMLSrc"){
+			this.welModeToggleButton.addClass("active").parent("span").addClass("active");
+			this.oApp.exec("DISABLE_ALL_UI", []);
+		}else{
+			this.welModeToggleButton.removeClass("active").parent("span").removeClass("active");
+			this.oApp.exec("ENABLE_ALL_UI", []);
+		}
+	}
+});
+//}
+/**
+ * @fileOverview This file contains a message mapping(Korean), which is used to map the message code to the actual message
+ * @name xpress_XE_Lang_KR.js
+ */
+var oMessageMap = {
+	'XE_EditingAreaManager.onExit' : '%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.',
+	'XE_FontColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
+	'XE_BGColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
+	'XE_Hyperlink.invalidURL' : '%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4.'
+};
+xe.XpressCore.oMessageMap = oMessageMap;
+/**
+ * XHTML Formatter
+ * @author NHN (developer@xpressengine.com)
+ */
+var
+	regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig,
+	regex_meanless_css2 = /(?:(?:margin|padding)\s*:\s*0(?:px)?|\-(?:moz|ms|webkit|opera)\-[\w-]+\s*:\s*.*?|[\w-]+\s*:\s*\-(?:moz|ms|webkit|opera)\-[\w-]+|(?:line-height|font-variant|font-stretch|font-size-adjust|font-size)\s*:\s*[a-z_-]+)\s*;?\s*|font-(?:weight|style)\s*:\s*normal;?/ig,
+	regex_class  = /<(.*?)\s+class\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))(.*?)>/ig,
+	regex_class2 = /xe_selected_cell/g;
+	regex_handler = /<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig,
+	//regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
+	//regex_script = /<script[\s\S]+?<\/script>/ig,
+	regex_font_color = /color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_face  = /face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_size  = /size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i,
+	regex_style = /style\s*=\s*(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_weight = /font-weight\s*:\s*([a-z]+);?/i,
+	regex_font_style = /font-style\s*:\s*italic;?/i,
+	regex_font_decoration = /text-decoration\s*:\s*([a-z -]+);?/i,
+	regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/ig,
+	regex_quote_attr = /([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g; //"
+
+var
+	allow_tags  = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style'.split(','),
+	lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
+
+var
+	replace_tags = {
+		'b' : 'strong',
+		'i' : 'em',
+		's' : 'del',
+		'strike' : 'del'
+	};
+
+xe.XE_XHTMLFormatter = $.Class({
+	name : "XE_XHTMLFormatter",
+
+	$ON_MSG_APP_READY : function() {
+		this.oApp.addConverter("WYSIWYG_TO_IR", this.TO_IR);
+		this.oApp.addConverter("HTMLSrc_TO_IR", this.TO_IR);
+		this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO);
+		this.oApp.addConverter("IR_TO_WYSIWYG", this.IR_TO);
+	},
+
+	TO_IR : function(sContent) {
+		var stack = [];
+
+		// remove xeHandled attrs
+		/*
+		sContent = sContent.replace(/xeHandled="YES"/ig,'');
+		*/
+
+
+		// remove all useless styles
+		/*
+		sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
+			m2 = m2.replace(regex_meanless_css2, '');
+
+			return '<'+m1+(m2?' style="'+m2+'"':'')+m3+'>';
+		});
+		*/
+
+		// remove all useless classes
+		/*
+		sContent = sContent.replace(regex_class, function(m0,m1,m2,m3,m4,m5){
+			var cls = $.trim((m2 || m3 || m4 || "").replace(regex_class2, ''));
+
+			return '<'+(m1||"")+(cls?' class="'+cls+'"':'')+(m5||"")+'>';
+		});
+		*/
+
+		// remove all event handler
+		//sContent = sContent.replace(regex_handler, '<$1$2>');
+
+		// remove all id
+		//sContent = sContent.replace(regex_id, '<$1$2>');
+
+		// remove all scripts
+		//sContent = sContent.replace(regex_script, '');
+
+		if ($.browser.msie) {
+			// remove $ attributes
+			sContent = sContent.replace(regex_jquery, '');
+
+			// quote all attrs
+			sContent = sContent.replace(/<(\w+) ([^>]+)>/g, function(m0,m1,m2){
+				return '<'+m1+' '+
+					m2.replace(regex_quote_attr, function(s0,s1,s2,s3){
+						if(s1) return s1;
+						if(/^"/.test(s3)||/"$/.test(s3)) return s2+'='+s3;
+						return s2+'="'+(s3||s2)+'"';
+					}) + '>';
+			});
+		}
+
+		// remove all useless tag and enclose tags
+		regex = /<(\/)?([:\w\/-]+)(.*?)>/ig;
+		sContent = sContent.replace(regex, function(m0,closing,tag,attrs){
+			var m3s = [];
+			var state = '';
+
+			closing = closing || '';
+			tag     = tag.toLowerCase();
+			attrs   = $.trim(attrs || '');
+
+			if (!closing) {
+				if ($.inArray(tag,lonely_tags) >= 0) {
+					var len = attrs.length;
+					if (tag == 'br') attrs = '';
+					if (!attrs || attrs.substring(len-1,len) != '/') attrs += '/';
+
+					return '<'+tag+' '+$.trim(attrs)+'>';
+				} else {
+					stack[stack.length] = {tag:tag, state:state};
+				}
+			} else {
+				var tags = [], t = '';
+
+				// remove unnecessary closing tag
+				if (!stack.length) return '';
+
+				do {
+					t = stack.pop();
+					if (t.tag != tag) continue;
+					if (t.state != 'deleted') tags.push('</'+t.tag+'>');
+				} while(stack.length && t.tag != tag);
+
+				return tags.join('');
+			}
+
+			return '<'+closing+tag+(attrs?' '+attrs:'')+'>';
+		});
+		/*
+		if (stack.length) {
+			var t = '';
+
+			do {
+				t = stack.pop();
+				if (t.state != 'deleted') sContent += '</'+t.tag+'>';
+			} while(stack.length);
+		}
+		*/
+
+		return sContent;
+	},
+
+	IR_TO : function(sContent) {
+		return sContent;
+	}
+});
+// center, font, b, i, s, strike
+
+/**
+ * Support XE extensions
+ * @author NHN (developer@xpressengine.com)
+ */
+xe.XE_Extension = $.Class({
+	name  : "XE_Extension",
+	seq   : '',
+	last_doc : '',
+
+	$init : function(elAppContainer, editor_sequence) {
+		this.seq = editor_sequence;
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.elDropdownLayer = $('DIV.xpress_xeditor_extension_layer', elAppContainer).get(0);
+	},
+
+	_removeAttrs : function(sContent) {
+		return sContent;
+	},
+
+	_addEvent : function() {
+		if (this.oApp.getEditingMode() != 'WYSIWYG') return;
+
+		var doc = this.oApp.getWYSIWYGDocument();
+		var seq = this.seq;
+		var fn  = function(){
+			var obj  = $(this);
+			var comp = obj.attr('editor_component');
+			if (comp && $.isFunction(openComponent)) {
+				editorPrevNode = obj.get(0);
+				openComponent(comp, seq);
+			}
+		};
+
+		$(doc).find('img,div[editor_component]').each(function(){
+			var obj = $(this);
+			if(this.nodeName == 'IMG' && !obj.attr('editor_component')) {
+				obj.attr('editor_component','image_link');
+			}
+			if(this.last_doc != doc) {
+				obj.dblclick(fn);
+				this.last_doc = doc;
+			}
+		});
+	},
+
+	$ON_MSG_APP_READY : function() {
+		var oApp = this.oApp;
+		oApp.exec('REGISTER_UI_EVENT', ['extension', 'click', 'TOGGLE_EXTENSION_LAYER']);
+		var functn  = function(){
+			oApp.exec("HIDE_ACTIVE_LAYER", []);
+		};
+		$('a', this.elDropdownLayer).each(function(){
+			var obj = $(this);
+			if(!obj.attr('component_onclick_event_added')) {
+				obj.click(functn);
+				obj.attr('component_onclick_event_added','Y');
+			}
+		});
+	},
+
+	$ON_TOGGLE_EXTENSION_LAYER : function() {
+		this.oApp.exec('TOGGLE_TOOLBAR_ACTIVE_LAYER', [this.elDropdownLayer]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(mode) {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_PASTE_HTML : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_LOAD_IR_FIELD : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_SET_IR : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	}
+});
+/**
+ * Auto saving
+ * @author NHN (developer@xpressengine.com)
+ */
+xe.XE_AutoSave = $.Class({
+	name : "XE_AutoSave",
+	form : null,
+	textarea : null,
+
+	$init : function(oIRTextarea, elAppContainer) {
+		this.form = oIRTextarea.form;
+		this.textarea = oIRTextarea;
+
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.welMessageBox = $('autosave_message');
+	},
+
+	$ON_MSG_APP_READY : function() {
+		var elTitle   = $(this.form._saved_doc_title);
+		var elContent = $(this.form._saved_doc_content);
+
+		var title   = $.trim(elTitle.val());
+		var content = $.trim(elContent.val());
+
+		if (title || content) {
+			if (confirm(this.form._saved_doc_message.value)) {
+				$(this.form.title).val(title);
+				this.oApp.setIR(content);
+				if(typeof(editorGetAutoSavedDoc) == 'function') editorGetAutoSavedDoc(this.form);
+			} else {
+				editorRemoveSavedDoc();
+			}
+		}
+
+		editorEnableAutoSave(this.form, $(this.form).attr("editor_sequence"));
+
+		// register hotkey
+		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+shift+s','AUTO_SAVE']);
+	},
+
+	$ON_AUTO_SAVE : function() {
+		_editorAutoSave();
+	}
+});
+/**
+ * Format Block plugin
+ * @author NHN (developer@xpressengine.com)
+ */
+xe.XE_FormatWithSelectUI = $.Class({
+	name : "XE_FormatWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFormatSelect = $("SELECT.xpress_xeditor_ui_format_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFormatSelect, "change", "SET_FORMAT_FROM_SELECT_UI");
+		this.elFormatSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		var blockName = this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");
+
+		if (!blockName) return (this.elFormatSelect.selectedIndex = 0);
+		if ($.browser.msie && /([0-9])/.test(blockName)) blockName = 'h'+(RegExp.$1);
+
+		this.elFormatSelect.value = blockName.toLowerCase();
+		if(this.elFormatSelect.selectedIndex < 0) this.elFormatSelect.selectedIndex = 0;
+		if(this.elFormatSelect.value != blockName.toLowerCase()) this.elFormatSelect.selectedIndex = 0;
+	},
+
+	$ON_SET_FORMAT_FROM_SELECT_UI : function(){
+		var sFormat = this.elFormatSelect.value;
+		if(!sFormat) return;
+		if($.browser.msie) sFormat = '<'+sFormat+'>';
+
+		this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, sFormat]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+/**
+ * Enhanced Table Fetures
+ * @author NHN (developer@xpressengine.com)
+ */
+
+// 표 편집 확장 기능
+xe.XE_Table = $.Class({
+	_startSel : null,
+	_endSel   : null,
+
+	$ON_MSG_APP_READY : function() {
+		this._doc = $(this.oApp.getWYSIWYGDocument());
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this);
+		this.$FnMouseUp   = $.fnBind(this._mouseup, this);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this);
+
+		this._doc.mousedown(this.$FnMouseDown);
+
+		// initialize
+		this._startSel = null;
+		this._endSel   = null;
+
+		// register buttons
+		this.oApp.exec('REGISTER_UI_EVENT', ['merge_cells', 'click', 'MERGE_CELLS']);
+		this.oApp.exec('REGISTER_UI_EVENT', ['split_col', 'click', 'CELL_SPLIT_BY_COL']);
+		this.oApp.exec('REGISTER_UI_EVENT', ['split_row', 'click', 'CELL_SPLIT_BY_ROW']);
+
+		// register hotkeys
+		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+alt+m', 'MERGE_CELLS']);
+
+		// perform default ready action
+		this.$super.$ON_MSG_APP_READY();
+	},
+
+	$ON_MERGE_CELLS : function() {
+		var html = "";
+		var cell = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var self = this;
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Merge"]);
+
+		// 선택한 모든 셀의 데이터를 첫번째 셀로 복사
+		cell.each(function(){ html += $(this).html() }).eq(0).html(html);
+
+		// 첫번째 셀 가로 확장
+		var colspan = 0;
+		cell.eq(0).nextAll('td,th').andSelf().filter('.xe_selected_cell').each(function(idx){
+			colspan += self._getSpan(this, 'col');
+		});
+
+		// 마지막 셀까지 줄의 갯수 계산
+		var rect = this._getRect(cell.eq(0));
+		var start_tr = cell.eq(0).parent('tr');
+		var end_tr   = cell.eq(cell.length-1).parent('tr');
+		var all_rows = cell.parents('table').eq(0).find('tr');
+		var rowspan  = all_rows.index(end_tr.get(0)) - all_rows.index(start_tr.get(0)) + this._getSpan(cell.eq(cell.length-1), 'row');
+
+		// 첫번째 셀 colspan, rowspan 속성 지정
+		cell.eq(0).attr('colSpan', colspan).attr('rowSpan', rowspan);
+
+		// 첫번째 셀을 제외한 다른 모든 셀 제거
+		cell.slice(1).remove();
+	},
+
+	$ON_CELL_SPLIT_BY_ROW : function(many) {
+		var cell  = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var table = cell.parents('table').eq(0);
+		var self  = this;
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Row"]);
+
+		// 선택 영역의 상하 좌표 구함
+		var _top	= this._getRect(cell.eq(0)).top;
+		var _bottom = this._getRect(cell.eq(cell.length-1)).bottom;
+
+		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(상하 기준).
+		(cell = table.find('td,th').filter(function(){
+			var rect = self._getRect($(this));
+
+			return !(rect.bottom <= _top || rect.top >= _bottom);
+		})).filter('.xe_selected_cell').each(function(){
+			var t	   = $(this);
+			var row	 = t.parent('tr');
+			var rowspan = self._getSpan(t, 'row');
+			var rect	= self._getRect(t);
+			var queue   = [];
+			var clone   = t.clone().html('<br />');
+			var topspan = 1, botspan = 1;
+
+			// rowspan > 1이면 현재 셀의 rowspan을 절반으로 분할한다.
+			if (rowspan > 1) {
+
+				topspan = Math.ceil(rowspan/2);
+				botspan = rowspan - topspan;
+
+				queue.push(function(){
+					t.attr('rowSpan', topspan);
+				});
+
+				clone.attr('rowSpan', botspan);
+			} else {
+				// rowspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 rowspan을 추가
+				cell.filter(function(){
+					if (t.get(0) == this) return false;
+
+					var tt = $(this);
+					var rc = self._getRect(tt);
+
+					// 범위를 넘은 부분은 제외
+					if (rc.bottom <= rect.top || rc.top >= rect.bottom) return false;
+
+					return true;
+				}).each(function(){
+					var tt = $(this);
+					var sp = self._getSpan(tt, 'row')+1;
+
+					// rowspan 1 추가
+					queue.push(function(){
+						tt.attr('rowSpan', sp);
+					});
+				});
+
+				// 새 줄을 추가한다.
+				if ($.browser.msie) {
+					// Fix bug for IE
+					row.after(row.clone().empty().get(0).outerHTML);
+				} else {
+					row.after(row.clone().empty());
+				}
+			}
+
+			var rows  = row.nextAll('tr');
+
+			// 현재 셀이 마지막 줄에 있다면 한 줄 추가 후 새로운 셀 추가
+			if (!rows.length) {
+				row.after(row.clone().empty().append(clone));
+			} else {
+				var next_sib  = rows.eq(topspan - 1).children('td,th').filter(function(){
+					return ( self._getRect($(this)).left > rect.left );
+				});
+
+				if ($.browser.msie) {
+					next_sib.length?
+						next_sib.eq(0).before(clone.get(0).outerHTML):
+						rows.eq(topspan-1).append(clone.get(0).outerHTML);
+				} else {
+					next_sib.length?
+						next_sib.slice(0,1).before(clone):
+						rows.slice(topspan-1,1).append(clone);
+				}
+			}
+
+			// 함수를 바로 실행하면 좌표가 틀어지므로, 큐에 넣은 후 실행
+			$.each(queue, function(){ this(); });
+
+		});
+	},
+
+	$ON_CELL_SPLIT_BY_COL : function(many) {
+		var cell   = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var table  = cell.parents('table').slice(0,1);
+		var self   = this;
+		var ie_bug = [], tmpId = (new Date).getTime(), tmpStr = '';
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Column"]);
+
+		// 선택 영역의 좌우 좌표 구함
+		var first_row = cell.eq(0).parent('tr');
+		var _left = this._getRect(first_row.find('.xe_selected_cell:first')).left;
+		var _right = this._getRect(first_row.find('.xe_selected_cell:last')).right;
+
+		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(좌우 기준).
+		(cell = table.find('td,th').filter(function(){
+			var rect = self._getRect($(this));
+
+			return !(rect.right <= _left || rect.left >= _right);
+		})).filter('.xe_selected_cell').each(function(idx){
+			var t	   = $(this);
+			var colspan = self._getSpan(t, 'col');
+			var clone   = t.clone().html('<br />');
+
+			// colspan > 1 이면 colspan을 절반으로 분할한다.
+			if (colspan > 1) {
+				var leftspan  = Math.ceil(colspan/2);
+				var rightspan = colspan - leftspan;
+
+				t.attr('colSpan', leftspan);
+				clone.attr('colSpan', rightspan);
+			} else {
+				// colspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 colspan을 추가
+				var rect = self._getRect(t);
+
+				cell.filter(function(){
+					if (t.get(0) == this) return false;
+
+					var tt = $(this);
+					var rc = self._getRect(tt);
+
+					// 범위를 넘은 부분은 제외
+					if (rc.right <= rect.left || rc.left >= rect.right) return false;
+
+					return true;
+				}).each(function(){
+					var tt = $(this);
+
+					// colspan 1 추가
+					tt.attr('colSpan', self._getSpan(tt, 'col')+1);
+				});
+
+				clone.attr('colSpan', 1);
+			}
+
+			if ($.browser.msie) {
+				// Fix for IE bug
+				t.after(clone.get(0).outerHTML);
+			} else {
+				t.after(clone);
+			}
+		});
+	},
+
+	$ON_CHECK_STYLE_CHANGE : function(){
+		var ui  = ['merge_cells', 'split_col', 'split_row'];
+		var app = this.oApp;
+		var command = (this._startSel && this._startSel.is('.xe_selected_cell'))?'ENABLE_UI':'DISABLE_UI';
+
+		$.each(ui, function(){ app.exec(command, [this]); });
+	},
+
+	_mousedown : function(event) {
+		var cur = $(event.target);
+		var sel = cur.parents().andSelf().filter('td,th,table');
+		var app = this.oApp;
+		var self = this;
+
+		// 모든 선택영역 해제
+		$('td.xe_selected_cell', this.oApp.getWYSIWYGDocument()).removeClass('xe_selected_cell');
+
+		this._startSel = null;
+		this._endSel   = null;
+
+		if (!sel.length || !this._isLeftClicked(event.button)) return;
+
+		function delayed(){
+			sel = app.getSelection().cloneRange();
+			sel.collapseToStart();
+			sel = $(sel.startContainer).parents().andSelf().filter('td,th').eq(0);
+
+			if (!sel.length) return self._removeAllListener()||true;
+
+			// 좌표를 구한다
+			self._getRect(self._startSel = sel);
+
+			// 이벤트 바인딩
+			self._doc.bind('mousemove', self.$FnMouseMove);
+			self._doc.bind('mouseup', self.$FnMouseUp);
+		}
+
+		// mousedown이 일어난 후에 선택 영역이 설정되므로 실행을 지연시킨다.
+		setTimeout(delayed, 0);
+	},
+
+	_mouseup : function(event) {
+		// 선택된 셀 확인
+		this._removeAllListener();
+
+		// 시작셀과 종료셀 제거
+		this._startSel = this._endSel = null;
+	},
+
+	_mousemove : function(event) {
+		var cur  = $(event.target);
+		var cell = cur.parents().andSelf().filter('td,th').eq(0);
+		var self = this;
+
+		// 마우스 왼쪽 버튼이 눌리지 않았으면 종료
+		if (!cell.length || !this._isLeftClicked(event.button)) return;
+		if (!this._endSel && cell.get(0) == this._startSel.get(0)) return;
+		if (this._endSel && cell.get(0) == this._endSel.get(0)) return;
+
+		// 종료셀 && 종료셀의 좌표
+		this._getRect(this._endSel = cell);
+
+		// 선택 범위를 구한다
+		var _top	= Math.min(this._startSel.rect.top,  this._endSel.rect.top);
+		var _left   = Math.min(this._startSel.rect.left, this._endSel.rect.left);
+		var _bottom = Math.max(this._startSel.rect.bottom, this._endSel.rect.bottom);
+		var _right  = Math.max(this._startSel.rect.right,  this._endSel.rect.right);
+
+		var table = cell.parents('table');
+		var cells = table.find('td,th').removeClass('xe_selected_cell');
+		var i = 0;
+
+		// 복잡한 모양의 테이블을 위한 반복 처리
+		var selected = $();
+		do {
+			// 선택한 셀로 최대 영역 재계산
+			selected.each(function(){
+				var rect = self._getRect($(this));
+
+				// 영역 재계산
+				if (rect.right  > _right)  _right  = rect.right;
+				if (rect.left   < _left)   _left   = rect.left;
+				if (rect.top	< _top)	_top	= rect.top;
+				if (rect.bottom > _bottom) _bottom = rect.bottom;
+			});
+
+			// 좌표 범위 안에 있는 선택할 셀을 추린다.
+			cells = cells.filter(':not(.xe_selected_cell)');
+			selected = cells.filter(function(){
+				var rect = self._getRect($(this));
+
+				if (rect.right <= _left || rect.left >= _right || rect.bottom <= _top || rect.top >= _bottom) return false;
+
+				return true;
+			}).addClass('xe_selected_cell');
+		} while(selected.length);
+
+		// 브라우저의 기본 선택영역 해제 : FF 제외 - 기본 기능이 충분히 좋아서 + 이 부분을 실행하면 오류가 발생해서
+		if (!$.browser.mozilla) {
+			function delayed() {
+				var sel = self.oApp.getSelection();
+
+				if (!self._startSel) return;
+				if (!self._startSel.get(0).firstChild) self._startSel.text(" ");
+
+				sel.selectNode(self._startSel.get(0).firstChild);
+				sel.collapseToStart();
+				sel.select();
+			}
+
+			setTimeout(delayed, 0);
+		}
+
+		return false;
+	},
+
+	_removeAllListener : function() {
+		// 이벤트 해제
+		this._doc.unbind("mousemove", this.$FnMouseMove);
+		this._doc.unbind("mouseup", this.$FnMouseUp);
+	},
+
+	_isLeftClicked : function(value) {
+		return $.browser.msie?!!(value & 1):(value == 0);
+	},
+
+	_getRect : function(obj) {
+		var el = obj.get(0);
+
+		obj.rect = {};
+		obj.rect.top	= el.offsetTop;
+		obj.rect.left   = el.offsetLeft;
+		obj.rect.bottom = obj.rect.top  + el.offsetHeight;
+		obj.rect.right  = obj.rect.left + el.offsetWidth;
+
+		return obj.rect;
+	},
+
+	_getSpan : function(obj, type) {
+		var span = parseInt($(obj).attr(type+'span'));
+
+		return isNaN(span)?1:span;
+	}
+}).extend(xe.XE_Table);
+
+})(jQuery);
diff --git a/modules/editor/skins/xpresseditor/js/minify.ini b/modules/editor/skins/xpresseditor/js/minify.ini
new file mode 100644
index 000000000..0ee2cce69
--- /dev/null
+++ b/modules/editor/skins/xpresseditor/js/minify.ini
@@ -0,0 +1,12 @@
+[option]
+use_closure_compiler=true
+
+[skip]
+Xpress_Editor.js
+xe_interface.js
+xe_textarea.js
+
+[merge >> xpresseditor.js]
+Xpress_Editor.js
+xe_interface.js
+xe_textarea.js
diff --git a/modules/editor/skins/xpresseditor/js/xe_interface.js b/modules/editor/skins/xpresseditor/js/xe_interface.js
index 269a02c8d..4f2ea3299 100644
--- a/modules/editor/skins/xpresseditor/js/xe_interface.js
+++ b/modules/editor/skins/xpresseditor/js/xe_interface.js
@@ -1,308 +1,278 @@
-if (!window.xe) xe = {};
-
-xe.Editors = [];
-
-function editorStart_xe(editor_sequence, primary_key, content_key, editor_height, colorset, content_style, content_font, content_font_size) {
-	if(typeof(colorset)=='undefined') colorset = 'white';
-	if(typeof(content_style)=='undefined') content_style = 'xeStyle';
-	if(typeof(content_font)=='undefined') content_font= '';
-	if(typeof(content_font_size)=='undefined') content_font_size= '';
-
-	var target_src = request_uri+'modules/editor/styles/'+content_style+'/editor.html';
-
-	var textarea = jQuery("#xpress-editor-"+editor_sequence);
-	var iframe   = jQuery('<iframe id="editor_iframe_'+editor_sequence+'" allowTransparency="true" frameborder="0" src="'+target_src+'" scrolling="yes" style="width:100%;height:'+editor_height+'px">');
-	var htmlsrc  = jQuery('<textarea rows="10" cols="20" class="input_syntax '+colorset+'" style="display:none"></textarea>');
-	var form	 = textarea.get(0).form;
-	form.setAttribute('editor_sequence', editor_sequence);
-	textarea.css("display","none");
-
-	var saved_content = '';
-	if(jQuery("input[name=content]",form).size()>0){
-		saved_content=jQuery("input[name=content]",form).val().replace(/src=\"files\/attach/g,'src="'+request_uri+'files/attach'); //'
-		jQuery("#xpress-editor-"+editor_sequence).val(saved_content);
-	}
-
-	// hide textarea
-	textarea.hide().css('width', '99%').before(iframe).after(htmlsrc);
-
-	// create an editor
-	var oEditor		     = new xe.XpressCore();
-	var oWYSIWYGIFrame   = iframe.get(0);
-	var oIRTextarea	     = textarea.get(0);
-	var oHTMLSrcTextarea = htmlsrc.get(0);
-	var elAppContainer   = jQuery('.xpress-editor', form).get(0);
-
-	oEditor.getFrame = function(){ return oWYSIWYGIFrame;}
-	oEditor.getContent = function(){
-		editorGetContentTextarea_xe(editor_sequence);
-	}
-	
-	var content = form[content_key].value;
-	if(xFF && !content) content = '<br />';
-
-	// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
-	content = editorReplacePath(content);
-
-	form[content_key].value = content;
-	jQuery("#xpress-editor-"+editor_sequence).val(content);
-
-	// Set standard API
-	editorRelKeys[editor_sequence] = new Array();
-	editorRelKeys[editor_sequence]["primary"]   = form[primary_key];
-	editorRelKeys[editor_sequence]["content"]   = form[content_key];
-	editorRelKeys[editor_sequence]["func"]	  = editorGetContentTextarea_xe;
-	editorRelKeys[editor_sequence]["editor"]	= oEditor;
-	editorRelKeys[editor_sequence]["pasteHTML"] = function(text){
-		oEditor.exec('PASTE_HTML',[text]);
-	}
-	xe.Editors[editor_sequence] = oEditor;
-
-	// register plugins
-	oEditor.registerPlugin(new xe.CorePlugin(null));
-
-	oEditor.registerPlugin(new xe.XE_PreservTemplate(jQuery("#xpress-editor-"+editor_sequence).val()));
-	oEditor.registerPlugin(new xe.StringConverterManager());
-	oEditor.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG", oIRTextarea, {nHeight:parseInt(editor_height), nMinHeight:205}, null, elAppContainer));
-	oEditor.registerPlugin(new xe.XE_EditingArea_HTMLSrc(oHTMLSrcTextarea));
-	oEditor.registerPlugin(new xe.XE_EditingAreaVerticalResizer(elAppContainer));
-	oEditor.registerPlugin(new xe.Utils());
-	oEditor.registerPlugin(new xe.DialogLayerManager());
-	oEditor.registerPlugin(new xe.ActiveLayerManager());
-	oEditor.registerPlugin(new xe.Hotkey());
-	oEditor.registerPlugin(new xe.XE_WYSIWYGStyler());
-	oEditor.registerPlugin(new xe.XE_WYSIWYGStyleGetter());
-	oEditor.registerPlugin(new xe.MessageManager(xe.XpressCore.oMessageMap));
-	oEditor.registerPlugin(new xe.XE_Toolbar(elAppContainer));
-
-	oEditor.registerPlugin(new xe.XE_XHTMLFormatter);
-	oEditor.registerPlugin(new xe.XE_GET_WYSYWYG_MODE(editor_sequence));
-	oEditor.registerPlugin(new xe.XE_GET_WYSYWYG_CONTENT());
-
-	if(jQuery("ul.extra1").length) {
-		oEditor.registerPlugin(new xe.XE_ColorPalette(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_FontColor(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_BGColor(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_Quote(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_FontNameWithSelectUI(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_FontSizeWithSelectUI(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_LineHeightWithSelectUI(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_UndoRedo());
-		oEditor.registerPlugin(new xe.XE_Table(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_Hyperlink(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_FormatWithSelectUI(elAppContainer));
-		oEditor.registerPlugin(new xe.XE_SCharacter(elAppContainer));
-	}
-
-	if(jQuery("ul.extra2").length) {
-		oEditor.registerPlugin(new xe.XE_Extension(elAppContainer, editor_sequence));
-	}
-
-	if(jQuery("ul.extra3").length) {
-		oEditor.registerPlugin(new xe.XE_EditingModeToggler(elAppContainer));
-	}
-
-
-	//oEditor.registerPlugin(new xe.XE_Preview(elAppContainer));
-
-	if (!jQuery.browser.msie && !jQuery.browser.opera) {
-		oEditor.registerPlugin(new xe.XE_WYSIWYGEnterKey(oWYSIWYGIFrame));
-	}
-
-	// 자동 저장 사용
-	if (s=form._saved_doc_title) {
-		oEditor.registerPlugin(new xe.XE_AutoSave(oIRTextarea, elAppContainer));
-	}
-
-	function load_proc() {
-		try {
-			var doc = oWYSIWYGIFrame.contentWindow.document, str;
-			if (doc.location == 'about:blank') throw 'blank';
-
-			// get innerHTML
-			str = doc.body.innerHTML;
-
-			// register plugin
-			oEditor.registerPlugin(new xe.XE_EditingArea_WYSIWYG(oWYSIWYGIFrame));
-			oEditor.registerPlugin(new xe.XpressRangeManager(oWYSIWYGIFrame));
-			oEditor.registerPlugin(new xe.XE_ExecCommand(oWYSIWYGIFrame));
-
-			if(content_font && !doc.body.style.fontFamily) {
-				doc.body.style.fontFamily = content_font;
-			}
-			if(content_font_size && !doc.body.style.fontSize) {
-				doc.body.style.fontSize = content_font_size;
-			}
-
-			// run
-			oEditor.run();
-		} catch(e) {
-			setTimeout(load_proc, 0);
-		}
-	}
-
-	load_proc();
-
-	return oEditor;
-}
-
-function editorGetContentTextarea_xe(editor_sequence) {
-	var oEditor = xe.Editors[editor_sequence] || null;
-
-	if (!oEditor) return '';
-
-	var str = oEditor.getIR();
-
-	if(!jQuery.trim(str.replace(/(&nbsp;|<\/?(p|br|span|div)([^>]+)?>)/ig, ''))) return '';
-
-	// 파이어폭스의 경우 의미없는 <br>이 컨텐트 마지막에 추가될 수 있다.
-	str = str.replace(/<br ?\/?>$/i, '');
-
-	// 속도 문제가 있으므로 1024 문자 미만일 때만 첫 노드가 텍스트 노드인지 테스트
-	// 그 이상이면 P 노드가 정상적으로 생성되었다고 가정한다.
-	if (str.length < 1024) {
-		var inline_elements = Array('#text','A','BR','IMG','EM','STRONG','SPAN','BIG','CITE','CODE','DD','DFN','HR','INS','KBD','LINK','Q','SAMP','SMALL','SUB','SUP','TT');
-		var is_inline_contents = true;
-		var div   = jQuery('<div>'+str+'</div>').eq(0);
-		var nodes = div.contents();
-		jQuery.each(nodes, function() {
-			if (this.nodeType != 3) {
-				if(jQuery.inArray(this.nodeName, inline_elements ) == -1) {
-					is_inline_contents = false;
-				}
-			}
-		});
-		if(is_inline_contents) str = '<p>'+str+'</p>';
-	}
-
-	// 이미지 경로를 수정한다. - 20091125
-	str = str.replace(/src\s?=\s?(["']?)(?:\.\.\/)+(files\/attach\/)/ig, function(m0,m1,m2){
-		return 'src='+(m1||'')+m2;
-	});
-
-	str = str.replace(/\<(\/)?([A-Z]+)([^>]*)\>/ig, function(m0,m1,m2,m3) {
-		if(m3) {
-			m3 = m3.replace(/ ([A-Z]+?)\=/ig, function(n0,n1) {
-				n1 = n1.toLowerCase();
-				return ' '+n1+'=';
-			});
-		} else { m3 = ''; }
-		m2 = m2.toLowerCase();
-		if(!m1) m1='';
-		return '<'+m1+m2+m3+'>';
-	});
-	str = str.replace('<br>','<br />');
-
-	return str;
-}
-
-function editorGetIframe(srl) {
-	return jQuery('iframe#editor_iframe_'+srl).get(0);
-}
-
-function editorReplaceHTML(iframe_obj, content) {
-	// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
-	content = editorReplacePath(content);
-
-	var srl = parseInt(iframe_obj.id.replace(/^.*_/,''),10);
-	editorRelKeys[srl]["pasteHTML"](content);
-}
-
-function editorReplacePath(content) {
-	// 태그 내 src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
-	content = content.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5,m6) {
-		if(m2=="url(") { m3=''; m5=')'; } else { if(typeof(m3)=='undefined') m3 = '"'; if(typeof(m5)=='undefined') m5 = '"'; if(typeof(m6)=='undefined') m6 = ''; }
-		var val = jQuery.trim(m4).replace(/^\.\//,'');
-		if(/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(val)) return m0;
-		return '<'+m1+m2+m3+request_uri+val+m5+m6;
-	});
-	return content;
-}
-
-function editorGetAutoSavedDoc(form) {
-	var param = new Array();
-	param['mid'] = current_mid;
-	param['editor_sequence'] = form.getAttribute('editor_sequence')
-	setTimeout(function() {
-	  var response_tags = new Array("error","message","editor_sequence","title","content","document_srl");
-	  exec_xml('editor',"procEditorLoadSavedDocument", param, function(a,b,c) { editorRelKeys[param['editor_sequence']]['primary'].value = a['document_srl']; if(typeof(uploadSettingObj[param['editor_sequence']]) == 'object') editorUploadInit(uploadSettingObj[param['editor_sequence']], true); }, response_tags);
-	}, 0);
-	
-}
-
-// WYSIWYG 모드를 저장하는 확장기능
-xe.XE_GET_WYSYWYG_MODE = jQuery.Class({
-	name : "XE_GET_WYSYWYG_MODE",
-
-	$init : function(editor_sequence) {
-		this.editor_sequence = editor_sequence;
-	},
-
-	$ON_CHANGE_EDITING_MODE : function(mode) {
-		editorMode[this.editor_sequence] = (mode =='HTMLSrc') ? 'html' : 'wysiwyg';
-	}
-});
-
-// 이미지등의 상대경로를 절대경로로 바꾸는 플러그인
-xe.XE_GET_WYSYWYG_CONTENT = jQuery.Class({
-	name : "XE_GET_WYSYWYG_CONTENT",
-
-	$ON_MSG_APP_READY : function() {
-		this.oApp.addConverter("IR_TO_WYSIWYG", this.replaceXE2HTTP);
-		this.oApp.addConverter("WYSIWYG_TO_IR", this.replaceHTTP2XE);
-	},
-
-	replaceXE2HTTP : function(content) {
-		// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
-		content = editorReplacePath(content);
-
-		return content;
-	},
-
-	replaceHTTP2XE : function(content) {
-		// src, href, url에서 http로 시작하는 full path를 XE 상대경로로 변경
-		content = content.replace(/(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>|\))*/ig, function(m0,m1,m2,m3,m4,m5) {
-			var uriReg = new RegExp('^'+request_uri.replace('\/','\\/'),'ig'), val;
-			if(m1=="url(") { m2=''; m4=')'; } else { m2 = m2 || '"'; m4 = m4 || '"'; }
-			val = uriReg.test(val=jQuery.trim(m3))?val.replace(uriReg,''):m3;
-
-			return m1+m2+val+m4+(m5||'');
-		});
-		return content;
-	}
-});
-
-// 서식 기본 내용을 보존
-xe.XE_PreservTemplate = jQuery.Class({
-	name : "XE_PreservTemplate",
-	isRun : false,
-
-	$BEFORE_SET_IR : function(content) {
-		if(!this.isRun && !content) {
-			this.isRun = true;
-			return false;
-		}
-	}
-});
-
-// 미리보기 확장기능
-xe.XE_Preview = jQuery.Class({
-	name  : "XE_Preview",
-	elPreviewButton : null,
-
-	$init : function(elAppContainer) {
-		this._assignHTMLObjects(elAppContainer);
-	},
-
-	_assignHTMLObjects : function(elAppContainer) {
-		this.elPreviewButton = jQuery("BUTTON.xpress_xeditor_preview_button", elAppContainer);
-	},
-
-	$ON_MSG_APP_READY : function() {
-		this.oApp.registerBrowserEvent(this.elPreviewButton.get(0), "click", "EVENT_PREVIEW", []);
-	},
-
-	$ON_EVENT_PREVIEW : function() {
-		// TODO : 버튼이 눌렸을 때의 동작 정의
-	}
-});
+if (!window.xe) xe = {};
+
+xe.Editors = [];
+
+function editorStart_xe(editor_sequence, primary_key, content_key, editor_height, colorset, content_style, content_font, content_font_size) {
+	if(typeof(colorset)=='undefined') colorset = 'white';
+	if(typeof(content_style)=='undefined') content_style = 'xeStyle';
+	if(typeof(content_font)=='undefined') content_font= '';
+	if(typeof(content_font_size)=='undefined') content_font_size= '';
+
+	var target_src = request_uri+'modules/editor/styles/'+content_style+'/editor.html';
+
+	var textarea = jQuery("#xpress-editor-"+editor_sequence);
+	var iframe   = jQuery('<iframe id="editor_iframe_'+editor_sequence+'" allowTransparency="true" frameborder="0" src="'+target_src+'" scrolling="yes" style="width:100%;height:'+editor_height+'px">');
+	var htmlsrc  = jQuery('<textarea rows="10" cols="20" class="input_syntax '+colorset+'" style="display:none"></textarea>');
+	var form	 = textarea.get(0).form;
+	form.setAttribute('editor_sequence', editor_sequence);
+	textarea.css("display","none");
+
+	var saved_content = '';
+	if(jQuery("input[name=content]",form).size()>0){
+		saved_content=jQuery("input[name=content]",form).val().replace(/src=\"files\/attach/g,'src="'+request_uri+'files/attach'); //'
+		jQuery("#xpress-editor-"+editor_sequence).val(saved_content);
+	}
+
+	// hide textarea
+	textarea.hide().css('width', '99%').before(iframe).after(htmlsrc);
+
+	// create an editor
+	var oEditor		     = new xe.XpressCore();
+	var oWYSIWYGIFrame   = iframe.get(0);
+	var oIRTextarea	     = textarea.get(0);
+	var oHTMLSrcTextarea = htmlsrc.get(0);
+	var elAppContainer   = jQuery('.xpress-editor', form).get(0);
+
+	oEditor.getFrame = function(){ return oWYSIWYGIFrame;}
+	oEditor.getContent = function(){
+		editorGetContentTextarea_xe(editor_sequence);
+	}
+	
+	var content = form[content_key].value;
+	if(xFF && !content) content = '<br />';
+
+	// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+	content = editorReplacePath(content);
+
+	form[content_key].value = content;
+	jQuery("#xpress-editor-"+editor_sequence).val(content);
+
+	// Set standard API
+	editorRelKeys[editor_sequence] = new Array();
+	editorRelKeys[editor_sequence]["primary"]   = form[primary_key];
+	editorRelKeys[editor_sequence]["content"]   = form[content_key];
+	editorRelKeys[editor_sequence]["func"]	  = editorGetContentTextarea_xe;
+	editorRelKeys[editor_sequence]["editor"]	= oEditor;
+	editorRelKeys[editor_sequence]["pasteHTML"] = function(text){
+		oEditor.exec('PASTE_HTML',[text]);
+	}
+	xe.Editors[editor_sequence] = oEditor;
+
+	// register plugins
+	oEditor.registerPlugin(new xe.CorePlugin(null));
+
+	oEditor.registerPlugin(new xe.XE_PreservTemplate(jQuery("#xpress-editor-"+editor_sequence).val()));
+	oEditor.registerPlugin(new xe.StringConverterManager());
+	oEditor.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG", oIRTextarea, {nHeight:parseInt(editor_height), nMinHeight:205}, null, elAppContainer));
+	oEditor.registerPlugin(new xe.XE_EditingArea_HTMLSrc(oHTMLSrcTextarea));
+	oEditor.registerPlugin(new xe.XE_EditingAreaVerticalResizer(elAppContainer));
+	oEditor.registerPlugin(new xe.Utils());
+	oEditor.registerPlugin(new xe.DialogLayerManager());
+	oEditor.registerPlugin(new xe.ActiveLayerManager());
+	oEditor.registerPlugin(new xe.Hotkey());
+	oEditor.registerPlugin(new xe.XE_WYSIWYGStyler());
+	oEditor.registerPlugin(new xe.XE_WYSIWYGStyleGetter());
+	oEditor.registerPlugin(new xe.MessageManager(xe.XpressCore.oMessageMap));
+	oEditor.registerPlugin(new xe.XE_Toolbar(elAppContainer));
+
+	oEditor.registerPlugin(new xe.XE_XHTMLFormatter);
+	oEditor.registerPlugin(new xe.XE_GET_WYSYWYG_MODE(editor_sequence));
+
+	if(jQuery("ul.extra1").length) {
+		oEditor.registerPlugin(new xe.XE_ColorPalette(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FontColor(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_BGColor(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_Quote(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FontNameWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FontSizeWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_LineHeightWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_UndoRedo());
+		oEditor.registerPlugin(new xe.XE_Table(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_Hyperlink(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FormatWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_SCharacter(elAppContainer));
+	}
+
+	if(jQuery("ul.extra2").length) {
+		oEditor.registerPlugin(new xe.XE_Extension(elAppContainer, editor_sequence));
+	}
+
+	if(jQuery("ul.extra3").length) {
+		oEditor.registerPlugin(new xe.XE_EditingModeToggler(elAppContainer));
+	}
+
+
+	//oEditor.registerPlugin(new xe.XE_Preview(elAppContainer));
+
+	if (!jQuery.browser.msie && !jQuery.browser.opera) {
+		oEditor.registerPlugin(new xe.XE_WYSIWYGEnterKey(oWYSIWYGIFrame));
+	}
+
+	// 자동 저장 사용
+	if (s=form._saved_doc_title) {
+		oEditor.registerPlugin(new xe.XE_AutoSave(oIRTextarea, elAppContainer));
+	}
+
+	function load_proc() {
+		try {
+			var doc = oWYSIWYGIFrame.contentWindow.document, str;
+			if (doc.location == 'about:blank') throw 'blank';
+
+			// get innerHTML
+			str = doc.body.innerHTML;
+
+			// register plugin
+			oEditor.registerPlugin(new xe.XE_EditingArea_WYSIWYG(oWYSIWYGIFrame));
+			oEditor.registerPlugin(new xe.XpressRangeManager(oWYSIWYGIFrame));
+			oEditor.registerPlugin(new xe.XE_ExecCommand(oWYSIWYGIFrame));
+
+			if(content_font && !doc.body.style.fontFamily) {
+				doc.body.style.fontFamily = content_font;
+			}
+			if(content_font_size && !doc.body.style.fontSize) {
+				doc.body.style.fontSize = content_font_size;
+			}
+
+			// run
+			oEditor.run();
+		} catch(e) {
+			setTimeout(load_proc, 0);
+		}
+	}
+
+	load_proc();
+
+	return oEditor;
+}
+
+function editorGetContentTextarea_xe(editor_sequence) {
+	var oEditor = xe.Editors[editor_sequence] || null;
+
+	if (!oEditor) return '';
+
+	var str = oEditor.getIR();
+
+	if(!jQuery.trim(str.replace(/(&nbsp;|<\/?(p|br|span|div)([^>]+)?>)/ig, ''))) return '';
+
+	// 파이어폭스의 경우 의미없는 <br>이 컨텐트 마지막에 추가될 수 있다.
+	str = str.replace(/<br ?\/?>$/i, '');
+
+	// 속도 문제가 있으므로 1024 문자 미만일 때만 첫 노드가 텍스트 노드인지 테스트
+	// 그 이상이면 P 노드가 정상적으로 생성되었다고 가정한다.
+	if (str.length < 1024) {
+		var inline_elements = Array('#text','A','BR','IMG','EM','STRONG','SPAN','BIG','CITE','CODE','DD','DFN','HR','INS','KBD','LINK','Q','SAMP','SMALL','SUB','SUP','TT');
+		var is_inline_contents = true;
+		var div   = jQuery('<div>'+str+'</div>').eq(0);
+		var nodes = div.contents();
+		jQuery.each(nodes, function() {
+			if (this.nodeType != 3) {
+				if(jQuery.inArray(this.nodeName, inline_elements ) == -1) {
+					is_inline_contents = false;
+				}
+			}
+		});
+		if(is_inline_contents) str = '<p>'+str+'</p>';
+	}
+
+	// 이미지 경로를 수정한다. - 20091125
+	str = str.replace(/src\s?=\s?(["']?)(?:\.\.\/)+(files\/attach\/)/ig, function(m0,m1,m2){
+		return 'src='+(m1||'')+m2;
+	});
+
+	str = str.replace(/\<(\/)?([A-Z]+)([^>]*)\>/ig, function(m0,m1,m2,m3) {
+		if(m3) {
+			m3 = m3.replace(/ ([A-Z]+?)\=/ig, function(n0,n1) {
+				n1 = n1.toLowerCase();
+				return ' '+n1+'=';
+			});
+		} else { m3 = ''; }
+		m2 = m2.toLowerCase();
+		if(!m1) m1='';
+		return '<'+m1+m2+m3+'>';
+	});
+	str = str.replace('<br>','<br />');
+
+	return str;
+}
+
+function editorGetIframe(srl) {
+	return jQuery('iframe#editor_iframe_'+srl).get(0);
+}
+
+function editorReplaceHTML(iframe_obj, content) {
+	// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+	content = editorReplacePath(content);
+
+	var srl = parseInt(iframe_obj.id.replace(/^.*_/,''),10);
+	editorRelKeys[srl]["pasteHTML"](content);
+}
+
+function editorReplacePath(content) {
+	// 태그 내 src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+	content = content.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5,m6) {
+		if(m2=="url(") { m3=''; m5=')'; } else { if(typeof(m3)=='undefined') m3 = '"'; if(typeof(m5)=='undefined') m5 = '"'; if(typeof(m6)=='undefined') m6 = ''; }
+		var val = jQuery.trim(m4).replace(/^\.\//,'');
+		if(/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(val)) return m0;
+		return '<'+m1+m2+m3+request_uri+val+m5+m6;
+	});
+	return content;
+}
+
+function editorGetAutoSavedDoc(form) {
+	var param = new Array();
+	param['mid'] = current_mid;
+	param['editor_sequence'] = form.getAttribute('editor_sequence')
+	setTimeout(function() {
+	  var response_tags = new Array("error","message","editor_sequence","title","content","document_srl");
+	  exec_xml('editor',"procEditorLoadSavedDocument", param, function(a,b,c) { editorRelKeys[param['editor_sequence']]['primary'].value = a['document_srl']; if(typeof(uploadSettingObj[param['editor_sequence']]) == 'object') editorUploadInit(uploadSettingObj[param['editor_sequence']], true); }, response_tags);
+	}, 0);
+	
+}
+
+// WYSIWYG 모드를 저장하는 확장기능
+xe.XE_GET_WYSYWYG_MODE = jQuery.Class({
+	name : "XE_GET_WYSYWYG_MODE",
+
+	$init : function(editor_sequence) {
+		this.editor_sequence = editor_sequence;
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(mode) {
+		editorMode[this.editor_sequence] = (mode =='HTMLSrc') ? 'html' : 'wysiwyg';
+	}
+});
+
+// 서식 기본 내용을 보존
+xe.XE_PreservTemplate = jQuery.Class({
+	name : "XE_PreservTemplate",
+	isRun : false,
+
+	$BEFORE_SET_IR : function(content) {
+		if(!this.isRun && !content) {
+			this.isRun = true;
+			return false;
+		}
+	}
+});
+
+// 미리보기 확장기능
+xe.XE_Preview = jQuery.Class({
+	name  : "XE_Preview",
+	elPreviewButton : null,
+
+	$init : function(elAppContainer) {
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.elPreviewButton = jQuery("BUTTON.xpress_xeditor_preview_button", elAppContainer);
+	},
+
+	$ON_MSG_APP_READY : function() {
+		this.oApp.registerBrowserEvent(this.elPreviewButton.get(0), "click", "EVENT_PREVIEW", []);
+	},
+
+	$ON_EVENT_PREVIEW : function() {
+		// TODO : 버튼이 눌렸을 때의 동작 정의
+	}
+});
diff --git a/modules/editor/skins/xpresseditor/js/xe_textarea.js b/modules/editor/skins/xpresseditor/js/xe_textarea.js
index 2e188ff10..a488ce88e 100644
--- a/modules/editor/skins/xpresseditor/js/xe_textarea.js
+++ b/modules/editor/skins/xpresseditor/js/xe_textarea.js
@@ -1,41 +1,41 @@
-function editorStartTextarea(editor_sequence, content_key, primary_key) {
-    var obj = xGetElementById('editor_'+editor_sequence);
-    var use_html = xGetElementById('htm_'+editor_sequence).value;
-    obj.form.setAttribute('editor_sequence', editor_sequence);
-
-    obj.style.width = '99%';
-
-    editorRelKeys[editor_sequence] = new Array();
-    editorRelKeys[editor_sequence]["primary"] = obj.form[primary_key];
-    editorRelKeys[editor_sequence]["content"] = obj.form[content_key];
-    editorRelKeys[editor_sequence]["func"] = editorGetContentTextarea;
-
-    var content = obj.form[content_key].value;
-    if(use_html) {
-        content = content.replace(/<br([^>]*)>/ig,"\n");
-        if(use_html!='br') {
-            content = content.replace(/&lt;/g, "<");
-            content = content.replace(/&gt;/g, ">");
-            content = content.replace(/&quot;/g, '"');
-            content = content.replace(/&amp;/g, "&");
-        }
-    }
-    obj.value = content;
-}
-
-function editorGetContentTextarea(editor_sequence) {
-    var obj = xGetElementById('editor_'+editor_sequence);
-    var use_html = xGetElementById('htm_'+editor_sequence).value;
-    var content = obj.value.trim();
-    if(use_html) {
-        if(use_html!='br') {
-            content = content.replace(/&/g, "&amp;");
-            content = content.replace(/</g, "&lt;");
-            content = content.replace(/>/g, "&gt;");
-            content = content.replace(/\"/g, "&quot;");
-        }
-        content = content.replace(/(\r\n|\n)/g, "<br />");
-    }
-    return content;
-}
-
+function editorStartTextarea(editor_sequence, content_key, primary_key) {
+    var obj = xGetElementById('editor_'+editor_sequence);
+    var use_html = xGetElementById('htm_'+editor_sequence).value;
+    obj.form.setAttribute('editor_sequence', editor_sequence);
+
+    obj.style.width = '99%';
+
+    editorRelKeys[editor_sequence] = new Array();
+    editorRelKeys[editor_sequence]["primary"] = obj.form[primary_key];
+    editorRelKeys[editor_sequence]["content"] = obj.form[content_key];
+    editorRelKeys[editor_sequence]["func"] = editorGetContentTextarea;
+
+    var content = obj.form[content_key].value;
+    if(use_html) {
+        content = content.replace(/<br([^>]*)>/ig,"\n");
+        if(use_html!='br') {
+            content = content.replace(/&lt;/g, "<");
+            content = content.replace(/&gt;/g, ">");
+            content = content.replace(/&quot;/g, '"');
+            content = content.replace(/&amp;/g, "&");
+        }
+    }
+    obj.value = content;
+}
+
+function editorGetContentTextarea(editor_sequence) {
+    var obj = xGetElementById('editor_'+editor_sequence);
+    var use_html = xGetElementById('htm_'+editor_sequence).value;
+    var content = obj.value.trim();
+    if(use_html) {
+        if(use_html!='br') {
+            content = content.replace(/&/g, "&amp;");
+            content = content.replace(/</g, "&lt;");
+            content = content.replace(/>/g, "&gt;");
+            content = content.replace(/\"/g, "&quot;");
+        }
+        content = content.replace(/(\r\n|\n)/g, "<br />");
+    }
+    return content;
+}
+
diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.js b/modules/editor/skins/xpresseditor/js/xpresseditor.js
new file mode 100644
index 000000000..50e5b36e7
--- /dev/null
+++ b/modules/editor/skins/xpresseditor/js/xpresseditor.js
@@ -0,0 +1,6082 @@
+(function($){
+
+// extends jQuery object
+$.extend({
+	Class : function(def) {
+		function c(){
+			if (typeof this.$super != 'undefined') this.$super.$this = this;
+			if ($.isFunction(this.$init)) this.$init.apply(this, arguments);
+		}
+		c.prototype = def;
+		c.constructor = c;
+		c.extend = Class_extend;
+
+		return c;
+	},
+	$ : function(id) {
+		if(typeof id == 'string') {
+			if (id.substring(0,1) == '<') return $(id).get(0);
+			return $('#'+id).get(0);
+		} else {
+			return id;
+		}
+	},
+	fnBind : function(fn, th/* , args... */) {
+		var args = $.makeArray(arguments);
+		args.shift(); args.shift();
+
+		return function() {
+			var a = args.concat($.makeArray(arguments));
+
+			return fn.apply(th, a);
+		};
+	}
+});
+
+$.browser.nVersion = parseFloat($.browser.version);
+
+function Class_extend(superDef) {
+	var Super = superDef.prototype;
+
+	this.prototype.$super = {};
+
+	function bind(fn) {
+		return function() {
+			return fn.apply(this.$this, arguments);
+		};
+	}
+
+	for(var x in Super) {
+		if (!Super.propertyIsEnumerable(x)) continue;
+
+		if (typeof this.prototype[x] == 'undefined') this.prototype[x] = Super[x];
+		this.prototype.$super[x] = $.isFunction(Super[x])?bind(Super[x]):Super[x];
+	}
+
+	return this;
+}
+
+if (typeof window.xe == 'undefined') window.xe = {};
+
+//{
+ /**
+ * @fileOverview This file contains Xpress framework core
+ * @name XpressCore.js
+ */
+xe.XpressCore = $.Class({
+	name : "XpressCore",
+
+	$init : function(htOptions){
+		htOptions = !htOptions?{}:$.Class({}).extend({
+			oDebugger : null
+		}).extend(htOptions);
+		if(htOptions.oDebugger){
+			this.oDebugger = htOptions.oDebugger;
+			this.oDebugger.oApp = this;
+		}
+
+		// To prevent processing a Xpress command before all the plugins are registered and ready,
+		// Queue up all the commands here until the application's status is changed to READY
+		this.commandQueue = [];
+
+		this.oCommandMap = {};
+		this.oDisabledCommand = {};
+		this.aPlugins = [];
+
+		this.appStatus = xe.APP_STATUS["NOT_READY"];
+
+		// Register the core as a plugin so it can receive messages
+		this.registerPlugin(this);
+	},
+
+	exec : function(msg, args, oEvent){
+		// If the application is not yet ready just queue the command
+		if(this.appStatus == xe.APP_STATUS["NOT_READY"]){
+			this.commandQueue[this.commandQueue.length] = {'msg':msg, 'args':args, 'event':oEvent};
+			return true;
+		}
+
+		this.exec = this._exec;
+		this.exec(msg, args, oEvent);
+	},
+
+	delayedExec : function(msg, args, nDelay, oEvent){
+		var fExec = $.fnBind(this.exec, this, msg, args, oEvent);
+		setTimeout(fExec, nDelay);
+	},
+
+	_exec : function(msg, args, oEvent){return (this._exec = this.oDebugger?this._execWithDebugger:this._execWithoutDebugger).call(this, msg, args, oEvent);},
+	_execWithDebugger : function(msg, args, oEvent){this.oDebugger.log_MessageStart(msg, args);var bResult = this._doExec(msg, args, oEvent);this.oDebugger.log_MessageEnd(msg, args);return bResult;	},
+	_execWithoutDebugger : function(msg, args, oEvent){return this._doExec(msg, args, oEvent);},
+	_doExec : function(msg, args, oEvent){
+		var bContinue = false;
+
+		if(!this.oDisabledCommand[msg]){
+			var allArgs = [];
+			if(args && args.length){
+				var iLen = args.length;
+				for(var i=0; i<iLen; i++) allArgs[i] = args[i];
+			}
+			if(oEvent) allArgs[allArgs.length] = oEvent;
+
+			var bContinue = true;
+			bContinue = this._execMsgStep("BEFORE", msg, allArgs);
+			if(bContinue) bContinue = this._execMsgStep("ON", msg, allArgs);
+			if(bContinue) bContinue = this._execMsgStep("AFTER", msg, allArgs);
+		}
+
+		return bContinue;
+	},
+
+	registerPlugin : function(oPlugin){
+		if(!oPlugin) throw("An error occured in registerPlugin(): invalid plug-in");
+
+		oPlugin.nIdx = this.aPlugins.length;
+		oPlugin.oApp = this;
+		this.aPlugins[oPlugin.nIdx] = oPlugin;
+
+		// If the plugin does not specify that it takes time to be ready, change the stauts to READY right away
+		if(oPlugin.status != xe.PLUGIN_STATUS["NOT_READY"]) oPlugin.status = xe.PLUGIN_STATUS["READY"];
+
+		this.exec("MSG_PLUGIN_REGISTERED", [oPlugin]);
+
+		return oPlugin.nIdx;
+	},
+
+	disableCommand : function(sCommand, bDisable){this.oDisabledCommand[sCommand] = bDisable;},
+
+	registerBrowserEvent : function(obj, sEvent, sCMD, aParams, nDelay){
+		if(!obj) return;
+		aParams = aParams || [];
+		var func = (nDelay)?$.fnBind(this.delayedExec, this, sCMD, aParams, nDelay):$.fnBind(this.exec, this, sCMD, aParams);
+		$(obj).bind(sEvent, func);
+	},
+
+	run : function(){
+		// Change the status from NOT_READY to let exec to process all the way
+		this._changeAppStatus(xe.APP_STATUS["WAITING_FOR_PLUGINS_READY"]);
+
+		// Process all the commands in the queue
+		var iQueueLength = this.commandQueue.length;
+		for(i=0; i<iQueueLength; i++){
+			var curMsgAndArgs = this.commandQueue[i];
+			this.exec(curMsgAndArgs.msg, curMsgAndArgs.args, curMsgAndArgs.event);
+		}
+
+		this._waitForPluginReady();
+	},
+
+	// Use this also to update the mapping
+	createCommandMap : function(sMsgHandler){
+		this.oCommandMap[sMsgHandler] = [];
+
+		var nLen = this.aPlugins.length;
+		for(var i=0; i<nLen; i++) this._doAddToCommandMap(sMsgHandler, this.aPlugins[i]);
+	},
+
+	addToCommandMap : function(sMsgHandler, oPlugin){
+		// cannot "ADD" unless the map is already created.
+		// the message will be added automatically to the mapping when it is first passed anyways, so do not add now
+		if(!this.oCommandMap[sMsgHandler]) return;
+
+		this._addToCommandMap(sMsgHandler, oPlugin);
+	},
+
+	_changeAppStatus : function(appStatus){
+		this.appStatus = appStatus;
+
+		// Initiate MSG_APP_READY if the application's status is being switched to READY
+		if(this.appStatus == xe.APP_STATUS["READY"]) this.exec("MSG_APP_READY");
+	},
+
+	_execMsgStep : function(sMsgStep, sMsg, args){return (this._execMsgStep = this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this, sMsgStep, sMsg, args);},
+	_execMsgStepWithDebugger : function(sMsgStep, sMsg, args){this.oDebugger.log_MessageStepStart(sMsgStep, sMsg, args);var bStatus = this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);this.oDebugger.log_MessageStepEnd(sMsgStep, sMsg, args);return bStatus;},
+	_execMsgStepWithoutDebugger : function(sMsgStep, sMsg, args){return this._execMsgHandler ("$"+sMsgStep+"_"+sMsg, args);},
+	_execMsgHandler : function(sMsgHandler, args){
+		if(!this.oCommandMap[sMsgHandler]){
+			this.createCommandMap(sMsgHandler);
+		}
+
+		var aPlugins = this.oCommandMap[sMsgHandler];
+		var iNumOfPlugins = aPlugins.length;
+
+		if(iNumOfPlugins == 0) return true;
+
+		var tmpStatus, bResult = true;
+		// two similar codes were written twice due to the performace.
+		if(sMsgHandler.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/)){
+			for(var i=0; i<iNumOfPlugins; i++){
+				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
+				if(tmpStatus === false){
+					bResult = false;
+					break;
+				}
+			}
+		}else{
+			for(var i=0; i<iNumOfPlugins; i++){
+				if(typeof aPlugins[i]["$PRECONDITION"] == "function") if(!this._execHandler(aPlugins[i], "$PRECONDITION", [sMsgHandler, args])) continue;
+
+				tmpStatus = this._execHandler(aPlugins[i], sMsgHandler, args);
+				if(tmpStatus === false){
+					bResult = false;
+					break;
+				}
+			}
+		}
+
+		return bResult;
+	},
+
+	_execHandler : function(oPlugin, sHandler, args){return	(this._execHandler = this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this, oPlugin, sHandler, args);},
+	_execHandlerWithDebugger : function(oPlugin, sHandler, args){this.oDebugger.log_CallHandlerStart(oPlugin, sHandler, args);var bResult = oPlugin[sHandler].apply(oPlugin, args);this.oDebugger.log_CallHandlerEnd(oPlugin, sHandler, args);return bResult;},
+	_execHandlerWithoutDebugger : function(oPlugin, sHandler, args){return oPlugin[sHandler].apply(oPlugin, args);},
+
+	_doAddToCommandMap : function(sMsgHandler, oPlugin){
+		if(typeof oPlugin[sMsgHandler] != "function") return;
+		this.oCommandMap[sMsgHandler][this.oCommandMap[sMsgHandler].length] = oPlugin;
+	},
+
+	_waitForPluginReady : function(){
+		var bAllReady = true;
+		for(var i=0; i<this.aPlugins.length; i++){
+			if(this.aPlugins[i].status == xe.PLUGIN_STATUS["NOT_READY"]){
+				bAllReady = false;
+				break;
+			}
+		}
+		if(bAllReady){
+			this._changeAppStatus(xe.APP_STATUS["READY"]);
+		}else{
+			setTimeout($.fnBind(this._waitForPluginReady, this), 100);
+		}
+	}
+});
+//}
+
+xe.APP_STATUS = {
+	'NOT_READY' : 0,
+	'WAITING_FOR_PLUGINS_READY' : 1,
+	'READY' : 2
+};
+
+xe.PLUGIN_STATUS = {
+	'NOT_READY' : 0,
+	'READY' : 1
+};
+/**
+ * @fileOverview This file contains a cross-browser implementation of W3C's DOM Range
+ * @name W3CDOMRange.js
+ */
+xe.W3CDOMRange = $.Class({
+	$init : function(doc){
+		this._document = doc || document;
+
+		this.collapsed = true;
+		this.commonAncestorContainer = this._document.body;
+		this.endContainer = this._document.body;
+		this.endOffset = 0;
+		this.startContainer = this._document.body;
+		this.startOffset = 0;
+	},
+
+	cloneContents : function(){
+		var oClonedContents = this._document.createDocumentFragment();
+		var oTmpContainer = this._document.createDocumentFragment();
+
+		var aNodes = this._getNodesInRange();
+
+		if(aNodes.length < 1) return oClonedContents;
+
+		var oClonedContainers = this._constructClonedTree(aNodes, oTmpContainer);
+
+		// oTopContainer = aNodes[aNodes.length-1].parentNode and this is not part of the initial array and only those child nodes should be cloned
+		var oTopContainer = oTmpContainer.firstChild;
+
+		if(oTopContainer){
+			var elCurNode = oTopContainer.firstChild;
+			var elNextNode;
+
+			while(elCurNode){
+				elNextNode = elCurNode.nextSibling;
+				oClonedContents.appendChild(elCurNode);
+				elCurNode = elNextNode;
+			}
+		}
+
+		oClonedContainers = this._splitTextEndNodes({oStartContainer: oClonedContainers.oStartContainer, iStartOffset: this.startOffset,
+													oEndContainer: oClonedContainers.oEndContainer, iEndOffset: this.endOffset});
+
+		if(oClonedContainers.oStartContainer && oClonedContainers.oStartContainer.previousSibling)
+			xe.DOMFix.parentNode(oClonedContainers.oStartContainer).removeChild(oClonedContainers.oStartContainer.previousSibling);
+
+		if(oClonedContainers.oEndContainer && oClonedContainers.oEndContainer.nextSibling)
+			xe.DOMFix.parentNode(oClonedContainers.oEndContainer).removeChild(oClonedContainers.oEndContainer.nextSibling);
+
+		return oClonedContents;
+	},
+
+	_constructClonedTree : function(aNodes, oClonedParentNode){
+		var oClonedStartContainer = null;
+		var oClonedEndContainer = null;
+
+		var oStartContainer = this.startContainer;
+		var oEndContainer = this.endContainer;
+
+		_recurConstructClonedTree = function(aAllNodes, iCurIdx, oParentNode, oClonedParentNode){
+
+			if(iCurIdx < 0) return iCurIdx;
+
+			var iChildIdx = iCurIdx-1;
+
+			var oCurNodeCloneWithChildren = aAllNodes[iCurIdx].cloneNode(false);
+
+			if(aAllNodes[iCurIdx] == oStartContainer) oClonedStartContainer = oCurNodeCloneWithChildren;
+			if(aAllNodes[iCurIdx] == oEndContainer) oClonedEndContainer = oCurNodeCloneWithChildren;
+
+			while(iChildIdx >= 0 && xe.DOMFix.parentNode(aAllNodes[iChildIdx]) == aAllNodes[iCurIdx]){
+				iChildIdx = this._recurConstructClonedTree(aAllNodes, iChildIdx, aAllNodes[iCurIdx], oCurNodeCloneWithChildren, oClonedStartContainer, oClonedEndContainer);
+			}
+
+			// this may trigger an error message in IE when an erroneous script is inserted
+			oClonedParentNode.insertBefore(oCurNodeCloneWithChildren, oClonedParentNode.firstChild);
+
+			return iChildIdx;
+		};
+
+		aNodes[aNodes.length] = xe.DOMFix.parentNode(aNodes[aNodes.length-1]);
+		_recurConstructClonedTree(aNodes, aNodes.length-1, aNodes[aNodes.length-1], oClonedParentNode);
+
+		return {oStartContainer: oClonedStartContainer, oEndContainer: oClonedEndContainer};
+	},
+
+	cloneRange : function(){
+		return this._copyRange(new xe.W3CDOMRange(this._document));
+	},
+
+	_copyRange : function(oClonedRange){
+		oClonedRange.collapsed = this.collapsed;
+		oClonedRange.commonAncestorContainer = this.commonAncestorContainer;
+		oClonedRange.endContainer = this.endContainer;
+		oClonedRange.endOffset = this.endOffset;
+		oClonedRange.startContainer = this.startContainer;
+		oClonedRange.startOffset = this.startOffset;
+		oClonedRange._document = this._document;
+
+		return oClonedRange;
+	},
+
+	collapse : function(toStart){
+		if(toStart){
+			this.endContainer = this.startContainer;
+			this.endOffset = this.startOffset;
+		}else{
+			this.startContainer = this.endContainer;
+			this.startOffset = this.endOffset;
+		}
+
+		this._updateRangeInfo();
+	},
+
+	compareBoundaryPoints : function(how, sourceRange){
+		switch(how){
+			case xe.W3CDOMRange.START_TO_START:
+				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.startContainer, sourceRange.startOffset);
+			case xe.W3CDOMRange.START_TO_END:
+				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.startContainer, sourceRange.startOffset);
+			case xe.W3CDOMRange.END_TO_END:
+				return this._compareEndPoint(this.endContainer, this.endOffset, sourceRange.endContainer, sourceRange.endOffset);
+			case xe.W3CDOMRange.END_TO_START:
+				return this._compareEndPoint(this.startContainer, this.startOffset, sourceRange.endContainer, sourceRange.endOffset);
+		}
+	},
+
+	_findBody : function(oNode){
+		if(!oNode) return null;
+		while(oNode){
+			if(oNode.tagName == "BODY") return oNode;
+			oNode = xe.DOMFix.parentNode(oNode);
+		}
+		return null;
+	},
+
+	_compareEndPoint : function(oContainerA, iOffsetA, oContainerB, iOffsetB){
+		var iIdxA, iIdxB;
+
+		if(!oContainerA || this._findBody(oContainerA) != this._document.body){
+			oContainerA = this._document.body;
+			iOffsetA = 0;
+		}
+
+		if(!oContainerB || this._findBody(oContainerB) != this._document.body){
+			oContainerB = this._document.body;
+			iOffsetB = 0;
+		}
+
+		var compareIdx = function(iIdxA, iIdxB){
+			// iIdxX == -1 when the node is the commonAncestorNode
+			// if iIdxA == -1
+			// -> [[<nodeA>...<nodeB></nodeB>]]...</nodeA>
+			// if iIdxB == -1
+			// -> <nodeB>...[[<nodeA></nodeA>...</nodeB>]]
+			if(iIdxB == -1) iIdxB = iIdxA+1;
+			if(iIdxA < iIdxB) return -1;
+			if(iIdxA == iIdxB) return 0;
+			return 1;
+		};
+
+		var oCommonAncestor = this._getCommonAncestorContainer(oContainerA, oContainerB);
+
+		// ================================================================================================================================================
+		//  Move up both containers so that both containers are direct child nodes of the common ancestor node. From there, just compare the offset
+		// Add 0.5 for each contaienrs that has "moved up" since the actual node is wrapped by 1 or more parent nodes and therefore its position is somewhere between idx & idx+1
+		// <COMMON_ANCESTOR>NODE1<P>NODE2</P>NODE3</COMMON_ANCESTOR>
+		// The position of NODE2 in COMMON_ANCESTOR is somewhere between after NODE1(idx1) and before NODE3(idx2), so we let that be 1.5
+
+		// container node A in common ancestor container
+		var oNodeA = oContainerA;
+		if(oNodeA != oCommonAncestor){
+			while((oTmpNode = xe.DOMFix.parentNode(oNodeA)) != oCommonAncestor){oNodeA = oTmpNode;}
+
+			iIdxA = this._getPosIdx(oNodeA)+0.5;
+		}else iIdxA = iOffsetA;
+
+		// container node B in common ancestor container
+		var oNodeB = oContainerB;
+		if(oNodeB != oCommonAncestor){
+			while((oTmpNode = xe.DOMFix.parentNode(oNodeB)) != oCommonAncestor){oNodeB = oTmpNode;}
+
+			iIdxB = this._getPosIdx(oNodeB)+0.5;
+		}else iIdxB = iOffsetB;
+
+		return compareIdx(iIdxA, iIdxB);
+	},
+
+	_getCommonAncestorContainer : function(oNode1, oNode2){
+		var oComparingNode = oNode2;
+
+		while(oNode1){
+			while(oComparingNode){
+				if(oNode1 == oComparingNode) return oNode1;
+				oComparingNode = xe.DOMFix.parentNode(oComparingNode);
+			}
+			oComparingNode = oNode2;
+			oNode1 = xe.DOMFix.parentNode(oNode1);
+		}
+
+		return this._document.body;
+	},
+
+	deleteContents : function(){
+		if(this.collapsed) return;
+
+		this._splitTextEndNodesOfTheRange();
+
+		var aNodes = this._getNodesInRange();
+
+		if(aNodes.length < 1) return;
+
+		var oPrevNode = aNodes[0].previousSibling;
+		while(oPrevNode && this._isBlankTextNode(oPrevNode)) oPrevNode = oPrevNode.previousSibling;
+
+		var oNewStartContainer, iNewOffset;
+		if(!oPrevNode){
+			oNewStartContainer = xe.DOMFix.parentNode(aNodes[0]);
+			iNewOffset = 0;
+		}
+
+		for(var i=0; i<aNodes.length; i++){
+			var oNode = aNodes[i];
+			if(!oNode.firstChild){
+				if(oNewStartContainer == oNode){
+					iNewOffset = this._getPosIdx(oNewStartContainer);
+					oNewStartContainer = xe.DOMFix.parentNode(oNode);
+				}
+				xe.DOMFix.parentNode(oNode).removeChild(oNode);
+			}
+		}
+
+		if(!oPrevNode){
+			this.setStart(oNewStartContainer, iNewOffset);
+		}else{
+			if(oPrevNode.tagName == "BODY")
+				this.setStartBefore(oPrevNode);
+			else
+				this.setStartAfter(oPrevNode);
+		}
+
+		this.collapse(true);
+	},
+
+	extractContents : function(){
+		var oClonedContents = this.cloneContents();
+		this.deleteContents();
+		return oClonedContents;
+	},
+
+	insertNode : function(newNode){
+		var oFirstNode = null;
+
+		var oParentContainer;
+
+		if(this.startContainer.nodeType == "3"){
+			oParentContainer = xe.DOMFix.parentNode(this.startContainer);
+			if(this.startContainer.nodeValue.length <= this.startOffset)
+				oFirstNode = this.startContainer.nextSibling;
+			else
+				oFirstNode = this.startContainer.splitText(this.startOffset);
+		}else{
+			oParentContainer = this.startContainer;
+			oFirstNode = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+		}
+
+		if(!oFirstNode || !xe.DOMFix.parentNode(oFirstNode)) oFirstNode = null;
+
+		oParentContainer.insertBefore(newNode, oFirstNode);
+
+		this.setStartBefore(newNode);
+	},
+
+	selectNode : function(refNode){
+		this.setStartBefore(refNode);
+		this.setEndAfter(refNode);
+	},
+
+	selectNodeContents : function(refNode){
+		this.setStart(refNode, 0);
+		this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
+	},
+
+	_endsNodeValidation : function(oNode, iOffset){
+		if(!oNode || this._findBody(oNode) != this._document.body) throw new Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
+
+		if(oNode.nodeType == 3){
+			if(iOffset > oNode.nodeValue.length) iOffset = oNode.nodeValue.length;
+		}else{
+			if(iOffset > xe.DOMFix.childNodes(oNode).length) iOffset = xe.DOMFix.childNodes(oNode).length;
+		}
+
+		return iOffset;
+	},
+
+
+	setEnd : function(refNode, offset){
+		offset = this._endsNodeValidation(refNode, offset);
+
+		this.endContainer = refNode;
+		this.endOffset = offset;
+		if(!this.startContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(false);
+
+		this._updateRangeInfo();
+	},
+
+	setEndAfter : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndAfter");
+
+		if(refNode.tagName == "BODY"){
+			this.setEnd(refNode, xe.DOMFix.childNodes(refNode).length);
+			return;
+		}
+		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
+	},
+
+	setEndBefore : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setEndBefore");
+
+		if(refNode.tagName == "BODY"){
+			this.setEnd(refNode, 0);
+			return;
+		}
+
+		this.setEnd(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
+	},
+
+	setStart : function(refNode, offset){
+		offset = this._endsNodeValidation(refNode, offset);
+
+		this.startContainer = refNode;
+		this.startOffset = offset;
+
+		if(!this.endContainer || this._compareEndPoint(this.startContainer, this.startOffset, this.endContainer, this.endOffset) != -1) this.collapse(true);
+		this._updateRangeInfo();
+	},
+
+	setStartAfter : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartAfter");
+
+		if(refNode.tagName == "BODY"){
+			this.setStart(refNode, xe.DOMFix.childNodes(refNode).length);
+			return;
+		}
+
+		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode)+1);
+	},
+
+	setStartBefore : function(refNode){
+		if(!refNode) throw new Error("INVALID_NODE_TYPE_ERR in setStartBefore");
+
+		if(refNode.tagName == "BODY"){
+			this.setStart(refNode, 0);
+			return;
+		}
+		this.setStart(xe.DOMFix.parentNode(refNode), this._getPosIdx(refNode));
+	},
+
+	surroundContents : function(newParent){
+		newParent.appendChild(this.extractContents());
+		this.insertNode(newParent);
+		this.selectNode(newParent);
+	},
+
+	toString : function(){
+		var oTmpContainer = this._document.createElement("DIV");
+		oTmpContainer.appendChild(this.cloneContents());
+
+		return oTmpContainer.textContent || oTmpContainer.innerText || "";
+	},
+
+	_isBlankTextNode : function(oNode){
+		if(oNode.nodeType == 3 && oNode.nodeValue == "") return true;
+		return false;
+	},
+
+	_getPosIdx : function(refNode){
+		var idx = 0;
+		for(var node = refNode.previousSibling; node; node = node.previousSibling) idx++;
+
+		return idx;
+	},
+
+	_updateRangeInfo : function(){
+		if(!this.startContainer){
+			this.init(this._document);
+			return;
+		}
+
+		this.collapsed = this._isCollapsed(this.startContainer, this.startOffset, this.endContainer, this.endOffset);
+
+		this.commonAncestorContainer = this._getCommonAncestorContainer(this.startContainer, this.endContainer);
+	},
+
+	_isCollapsed : function(oStartContainer, iStartOffset, oEndContainer, iEndOffset){
+		var bCollapsed = false;
+
+		if(oStartContainer == oEndContainer && iStartOffset == iEndOffset){
+			bCollapsed = true;
+		}else{
+			var oActualStartNode = this._getActualStartNode(oStartContainer, iStartOffset);
+			var oActualEndNode = this._getActualEndNode(oEndContainer, iEndOffset);
+
+			// Take the parent nodes on the same level for easier comparison when they're next to each other
+			// eg) From
+			//	<A>
+			//		<B>
+			//			<C>
+			//			</C>
+			//		</B>
+			//		<D>
+			//			<E>
+			//				<F>
+			//				</F>
+			//			</E>
+			//		</D>
+			//	</A>
+			//	, it's easier to compare the position of B and D rather than C and F because they are siblings
+			//
+			// If the range were collapsed, oActualEndNode will precede oActualStartNode by doing this
+			oActualStartNode = this._getNextNode(this._getPrevNode(oActualStartNode));
+			oActualEndNode = this._getPrevNode(this._getNextNode(oActualEndNode));
+
+			if(oActualStartNode && oActualEndNode && oActualEndNode.tagName != "BODY" &&
+				(this._getNextNode(oActualEndNode) == oActualStartNode || (oActualEndNode == oActualStartNode && this._isBlankTextNode(oActualEndNode)))
+			)
+				bCollapsed = true;
+		}
+
+		return bCollapsed;
+	},
+
+	_splitTextEndNodesOfTheRange : function(){
+		var oEndPoints = this._splitTextEndNodes({oStartContainer: this.startContainer, iStartOffset: this.startOffset,
+													oEndContainer: this.endContainer, iEndOffset: this.endOffset});
+
+		this.startContainer = oEndPoints.oStartContainer;
+		this.startOffset = oEndPoints.iStartOffset;
+
+		this.endContainer = oEndPoints.oEndContainer;
+		this.endOffset = oEndPoints.iEndOffset;
+	},
+
+	_splitTextEndNodes : function(oEndPoints){
+		oEndPoints = this._splitStartTextNode(oEndPoints);
+		oEndPoints = this._splitEndTextNode(oEndPoints);
+
+		return oEndPoints;
+	},
+
+	_splitStartTextNode : function(oEndPoints){
+		var oStartContainer = oEndPoints.oStartContainer;
+		var iStartOffset = oEndPoints.iStartOffset;
+
+		var oEndContainer = oEndPoints.oEndContainer;
+		var iEndOffset = oEndPoints.iEndOffset;
+
+		if(!oStartContainer) return oEndPoints;
+		if(oStartContainer.nodeType != 3) return oEndPoints;
+		if(iStartOffset == 0) return oEndPoints;
+
+		if(oStartContainer.nodeValue.length <= iStartOffset) return oEndPoints;
+
+		var oLastPart = oStartContainer.splitText(iStartOffset);
+
+		if(oStartContainer == oEndContainer){
+			iEndOffset -= iStartOffset;
+			oEndContainer = oLastPart;
+		}
+		oStartContainer = oLastPart;
+		iStartOffset = 0;
+
+		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
+	},
+
+	_splitEndTextNode : function(oEndPoints){
+		var oStartContainer = oEndPoints.oStartContainer;
+		var iStartOffset = oEndPoints.iStartOffset;
+
+		var oEndContainer = oEndPoints.oEndContainer;
+		var iEndOffset = oEndPoints.iEndOffset;
+
+		if(!oEndContainer) return oEndPoints;
+		if(oEndContainer.nodeType != 3) return oEndPoints;
+
+		if(iEndOffset >= oEndContainer.nodeValue.length) return oEndPoints;
+		if(iEndOffset == 0) return oEndPoints;
+
+		oEndContainer.splitText(iEndOffset);
+
+		return {oStartContainer: oStartContainer, iStartOffset: iStartOffset, oEndContainer: oEndContainer, iEndOffset: iEndOffset};
+	},
+
+	_getNodesInRange : function(){
+		if(this.collapsed) return [];
+
+		var oStartNode = this._getActualStartNode(this.startContainer, this.startOffset);
+		var oEndNode = this._getActualEndNode(this.endContainer, this.endOffset);
+
+		return this._getNodesBetween(oStartNode, oEndNode);
+	},
+
+	_getActualStartNode : function(oStartContainer, iStartOffset){
+		var oStartNode = oStartContainer;;
+
+		if(oStartContainer.nodeType == 3){
+			if(iStartOffset >= oStartContainer.nodeValue.length){
+				oStartNode = this._getNextNode(oStartContainer);
+				if(oStartNode.tagName == "BODY") oStartNode = null;
+			}else{
+				oStartNode = oStartContainer;
+			}
+		}else{
+			if(iStartOffset < xe.DOMFix.childNodes(oStartContainer).length){
+				oStartNode = xe.DOMFix.childNodes(oStartContainer)[iStartOffset];
+			}else{
+				oStartNode = this._getNextNode(oStartContainer);
+				if(oStartNode.tagName == "BODY") oStartNode = null;
+			}
+		}
+
+		return oStartNode;
+	},
+
+	_getActualEndNode : function(oEndContainer, iEndOffset){
+		var oEndNode = oEndContainer;
+
+		if(iEndOffset == 0){
+			oEndNode = this._getPrevNode(oEndContainer);
+			if(oEndNode.tagName == "BODY") oEndNode = null;
+		}else if(oEndContainer.nodeType == 3){
+			oEndNode = oEndContainer;
+		}else{
+			oEndNode = xe.DOMFix.childNodes(oEndContainer)[iEndOffset-1];
+		}
+
+		return oEndNode;
+	},
+
+	_getNextNode : function(oNode){
+		if(!oNode || oNode.tagName == "BODY") return this._document.body;
+
+		if(oNode.nextSibling) return oNode.nextSibling;
+
+		return this._getNextNode(xe.DOMFix.parentNode(oNode));
+	},
+
+	_getPrevNode : function(oNode){
+		if(!oNode || oNode.tagName == "BODY") return this._document.body;
+
+		if(oNode.previousSibling) return oNode.previousSibling;
+
+		return this._getPrevNode(xe.DOMFix.parentNode(oNode));
+	},
+
+	// includes partially selected
+	// for <div id="a"><div id="b"></div></div><div id="c"></div>, _getNodesBetween(b, c) will yield to b, "a" and c
+	_getNodesBetween : function(oStartNode, oEndNode){
+		var aNodesBetween = [];
+		this._nNodesBetweenLen = 0;
+
+		if(!oStartNode || !oEndNode) return aNodesBetween;
+
+		this._recurGetNextNodesUntil(oStartNode, oEndNode, aNodesBetween);
+		return aNodesBetween;
+	},
+
+	_recurGetNextNodesUntil : function(oNode, oEndNode, aNodesBetween){
+		if(!oNode) return false;
+
+		if(!this._recurGetChildNodesUntil(oNode, oEndNode, aNodesBetween)) return false;
+
+		var oNextToChk = oNode.nextSibling;
+
+		while(!oNextToChk){
+			if(!(oNode = xe.DOMFix.parentNode(oNode))) return false;
+
+			aNodesBetween[this._nNodesBetweenLen++] = oNode;
+
+			if(oNode == oEndNode) return false;
+
+			oNextToChk = oNode.nextSibling;
+		}
+
+		return this._recurGetNextNodesUntil(oNextToChk, oEndNode, aNodesBetween);
+	},
+
+	_recurGetChildNodesUntil : function(oNode, oEndNode, aNodesBetween){
+		if(!oNode) return false;
+
+		var bEndFound = false;
+		var oCurNode = oNode;
+		if(oCurNode.firstChild){
+			oCurNode = oCurNode.firstChild;
+			while(oCurNode){
+				if(!this._recurGetChildNodesUntil(oCurNode, oEndNode, aNodesBetween)){
+					bEndFound = true;
+					break;
+				}
+				oCurNode = oCurNode.nextSibling;
+			}
+		}
+
+		aNodesBetween[this._nNodesBetweenLen++] = oNode;
+
+		if(bEndFound) return false;
+		if(oNode == oEndNode) return false;
+
+		return true;
+	}
+});
+
+xe.W3CDOMRange.START_TO_START = 0;
+xe.W3CDOMRange.START_TO_END = 1;
+xe.W3CDOMRange.END_TO_END = 2;
+xe.W3CDOMRange.END_TO_START = 3;
+
+
+/**
+ * @fileOverview This file contains a cross-browser function that implements all of the W3C's DOM Range specification and some more
+ * @name XpressRange.js
+ */
+xe.XpressRange = $.Class({
+	setWindow : function(win){
+		this._window = win;
+		this._document = win.document;
+	},
+
+	$init : function(win){
+		this.HUSKY_BOOMARK_START_ID_PREFIX = "xpress_bookmark_start_";
+		this.HUSKY_BOOMARK_END_ID_PREFIX = "xpress_bookmark_end_";
+
+		this.sBlockElement = "P|DIV|LI|H[1-6]|PRE";
+		this.sBlockContainer = "BODY|TABLE|TH|TR|TD|UL|OL|BLOCKQUOTE|FORM";
+
+		this.rxBlockElement = new RegExp("^("+this.sBlockElement+")$");
+		this.rxBlockContainer = new RegExp("^("+this.sBlockContainer+")$")
+		this.rxLineBreaker = new RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$")
+
+		this.setWindow(win);
+
+		this.oSimpleSelection = new xe.SimpleSelection(this._window);
+		this.selectionLoaded = this.oSimpleSelection.selectionLoaded;
+
+		this.$super.$init(this._document);
+	},
+
+	select : function(){
+		this.oSimpleSelection.selectRange(this);
+	},
+
+	setFromSelection : function(iNum){
+		this.setRange(this.oSimpleSelection.getRangeAt(iNum));
+	},
+
+	setRange : function(oW3CRange){
+		this.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
+		this.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
+	},
+
+	setEndNodes : function(oSNode, oENode){
+		this.setEndAfter(oENode);
+		this.setStartBefore(oSNode);
+	},
+
+	splitTextAtBothEnds : function(){
+		this._splitTextEndNodesOfTheRange();
+	},
+
+	getStartNode : function(){
+		if(this.collapsed){
+			if(this.startContainer.nodeType == 3){
+				if(this.startOffset == 0) return null;
+				if(this.startContainer.nodeValue.length <= this.startOffset) return null;
+				return this.startContainer;
+			}
+			return null;
+		}
+
+		if(this.startContainer.nodeType == 3){
+			if(this.startOffset >= this.startContainer.nodeValue.length) return this._getNextNode(this.startContainer);
+			return this.startContainer;
+		}else{
+			if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length) return this._getNextNode(this.startContainer);
+			return xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+		}
+	},
+
+	getEndNode : function(){
+		if(this.collapsed) return this.getStartNode();
+
+		if(this.endContainer.nodeType == 3){
+			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
+			return this.endContainer;
+		}else{
+			if(this.endOffset == 0) return this._getPrevNode(this.endContainer);
+			return xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
+		}
+	},
+
+	getNodeAroundRange : function(bBefore, bStrict){
+		if(this.collapsed && this.startContainer && this.startContainer.nodeType == 3) return this.startContainer;
+		if(!this.collapsed || (this.startContainer && this.startContainer.nodeType == 3)) return this.getStartNode();
+
+		var oBeforeRange, oAfterRange, oResult;
+
+		if(this.startOffset >= xe.DOMFix.childNodes(this.startContainer).length)
+			oAfterRange = this._getNextNode(this.startContainer);
+		else
+			oAfterRange = xe.DOMFix.childNodes(this.startContainer)[this.startOffset];
+
+		if(this.endOffset == 0)
+			oBeforeRange = this._getPrevNode(this.endContainer);
+		else
+			oBeforeRange = xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];
+
+		if(bBefore){
+			oResult = oBeforeRange;
+			if(!oResult && !bStrict) oResult = oAfterRange;
+		}else{
+			oResult = oAfterRange;
+			if(!oResult && !bStrict) oResult = oBeforeRange;
+		}
+
+		return oResult;
+	},
+
+	_getXPath : function(elNode){
+		var sXPath = "";
+
+		while(elNode && elNode.nodeType == 1){
+			sXPath = "/" + elNode.tagName+"["+this._getPosIdx4XPath(elNode)+"]" + sXPath;
+			elNode = xe.DOMFix.parentNode(elNode);
+		}
+
+		return sXPath;
+	},
+
+	_getPosIdx4XPath : function(refNode){
+		var idx = 0;
+		for(var node = refNode.previousSibling; node; node = node.previousSibling)
+			if(node.tagName == refNode.tagName) idx++;
+
+		return idx;
+	},
+
+	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
+	_evaluateXPath : function(sXPath, oDoc){
+		sXPath = sXPath.substring(1, sXPath.length-1);
+		var aXPath = sXPath.split(/\//);
+		var elNode = oDoc.body;
+
+		for(var i=2; i<aXPath.length && elNode; i++){
+			aXPath[i].match(/([^\[]+)\[(\d+)/i);
+			var sTagName = RegExp.$1;
+			var nIdx = RegExp.$2;
+
+			var aAllNodes = xe.DOMFix.childNodes(elNode);
+			var aNodes = [];
+			var nLength = aAllNodes.length;
+			var nCount = 0;
+			for(var ii=0; ii<nLength; ii++){
+				if(aAllNodes[ii].tagName == sTagName) aNodes[nCount++] = aAllNodes[ii];
+			}
+
+			if(aNodes.length < nIdx)
+				elNode = null;
+			else
+				elNode = aNodes[nIdx];
+		}
+
+		return elNode;
+	},
+
+	_evaluateXPathBookmark : function(oBookmark){
+		var sXPath = oBookmark["sXPath"];
+		var nTextNodeIdx = oBookmark["nTextNodeIdx"];
+		var nOffset = oBookmark["nOffset"];
+
+		var elContainer = this._evaluateXPath(sXPath, this._document);
+
+		if(nTextNodeIdx > -1 && elContainer){
+			var aChildNodes = xe.DOMFix.childNodes(elContainer);
+			var elNode = null;
+
+			var nIdx = nTextNodeIdx;
+			var nOffsetLeft = nOffset;
+
+			while((elNode = aChildNodes[nIdx]) && elNode.nodeType == 3 && elNode.nodeValue.length < nOffsetLeft){
+				nOffsetLeft -= elNode.nodeValue.length;
+				nIdx++;
+			}
+
+			elContainer = xe.DOMFix.childNodes(elContainer)[nIdx];
+			nOffset = nOffsetLeft;
+		}
+
+		if(!elContainer){
+			elContainer = this._document.body;
+			nOffset = 0;
+		}
+		return {elContainer: elContainer, nOffset: nOffset};
+	},
+
+	// this was written specifically for XPath Bookmark and it may not perform correctly for general purposes
+	getXPathBookmark : function(){
+		var nTextNodeIdx1 = -1;
+		var htEndPt1 = {elContainer: this.startContainer, nOffset: this.startOffset};
+		var elNode1 = this.startContainer;
+		if(elNode1.nodeType == 3){
+			htEndPt1 = this._getFixedStartTextNode();
+			nTextNodeIdx1 = this._getPosIdx(htEndPt1.elContainer);
+			elNode1 = xe.DOMFix.parentNode(elNode1);
+		}
+		var sXPathNode1 = this._getXPath(elNode1);
+		var oBookmark1 = {sXPath:sXPathNode1, nTextNodeIdx:nTextNodeIdx1, nOffset: htEndPt1.nOffset};
+
+		var nTextNodeIdx2 = -1;
+		var htEndPt2 = {elContainer: this.endContainer, nOffset: this.endOffset};
+		var elNode2 = this.endContainer;
+		if(elNode2.nodeType == 3){
+			htEndPt2 = this._getFixedEndTextNode();
+			nTextNodeIdx2 = this._getPosIdx(htEndPt2.elContainer);
+			elNode2 = xe.DOMFix.parentNode(elNode2);
+		}
+		var sXPathNode2 = this._getXPath(elNode2);
+		var oBookmark2 = {sXPath:sXPathNode2, nTextNodeIdx:nTextNodeIdx2, nOffset: htEndPt2.nOffset};
+
+		return [oBookmark1, oBookmark2];
+	},
+
+	moveToXPathBookmark : function(aBookmark){
+		if(!aBookmark) return;
+
+		var oBookmarkInfo1 = this._evaluateXPathBookmark(aBookmark[0]);
+		var oBookmarkInfo2 = this._evaluateXPathBookmark(aBookmark[1]);
+
+		if(!oBookmarkInfo1["elContainer"] || !oBookmarkInfo2["elContainer"]) return;
+
+		this.startContainer = oBookmarkInfo1["elContainer"];
+		this.startOffset = oBookmarkInfo1["nOffset"];
+
+		this.endContainer = oBookmarkInfo2["elContainer"];
+		this.endOffset = oBookmarkInfo2["nOffset"];
+	},
+
+	_getFixedTextContainer : function(elNode, nOffset){
+		while(elNode && elNode.nodeType == 3 && elNode.previousSibling && elNode.previousSibling.nodeType == 3){
+			nOffset += elNode.previousSibling.nodeValue.length;
+			elNode = elNode.previousSibling;
+		}
+
+		return {elContainer:elNode, nOffset:nOffset};
+	},
+
+	_getFixedStartTextNode : function(){
+		return this._getFixedTextContainer(this.startContainer, this.startOffset);
+	},
+
+	_getFixedEndTextNode : function(){
+		return this._getFixedTextContainer(this.endContainer, this.endOffset);
+	},
+
+	placeStringBookmark : function(){
+		var sTmpId = (new Date()).getTime();
+
+		var oInsertionPoint = this.cloneRange();
+		oInsertionPoint.collapseToEnd();
+		var oEndMarker = this._document.createElement("A");
+		oEndMarker.id = this.HUSKY_BOOMARK_END_ID_PREFIX+sTmpId;
+		oInsertionPoint.insertNode(oEndMarker);
+
+		var oInsertionPoint = this.cloneRange();
+		oInsertionPoint.collapseToStart();
+		var oStartMarker = this._document.createElement("A");
+		oStartMarker.id = this.HUSKY_BOOMARK_START_ID_PREFIX+sTmpId;
+		oInsertionPoint.insertNode(oStartMarker);
+
+		this.moveToBookmark(sTmpId);
+
+		return sTmpId;
+	},
+
+	cloneRange : function(){
+		return this._copyRange(new xe.XpressRange(this._window));
+	},
+
+	moveToBookmark : function(vBookmark){
+		if(typeof(vBookmark) != "object")
+			this.moveToStringBookmark(vBookmark);
+		else
+			this.moveToXPathBookmark(vBookmark);
+	},
+
+	moveToStringBookmark : function(sBookmarkID){
+		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
+		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
+
+		if(!oStartMarker || !oEndMarker) return;
+
+		this.setEndBefore(oEndMarker);
+		this.setStartAfter(oStartMarker);
+	},
+
+	removeStringBookmark : function(sBookmarkID){
+		var oStartMarker = this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+sBookmarkID);
+		var oEndMarker = this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+sBookmarkID);
+
+		if(oStartMarker) xe.DOMFix.parentNode(oStartMarker).removeChild(oStartMarker);
+		if(oEndMarker) xe.DOMFix.parentNode(oEndMarker).removeChild(oEndMarker);
+	},
+
+	collapseToStart : function(){
+		this.collapse(true);
+	},
+
+	collapseToEnd : function(){
+		this.collapse(false);
+	},
+
+	createAndInsertNode : function(sTagName){
+		tmpNode = this._document.createElement(tagName);
+		this.insertNode(tmpNode)
+		return tmpNode
+	},
+
+	getNodes : function(bSplitTextEndNodes, fnFilter){
+		if(bSplitTextEndNodes) this._splitTextEndNodesOfTheRange();
+
+		var aAllNodes = this._getNodesInRange();
+		var aFilteredNodes = [];
+
+		if(!fnFilter) return aAllNodes;
+
+		for(var i=0; i<aAllNodes.length; i++)
+			if(fnFilter(aAllNodes[i])) aFilteredNodes[aFilteredNodes.length] = aAllNodes[i];
+
+		return aFilteredNodes;
+	},
+
+	getTextNodes : function(bSplitTextEndNodes){
+		var txtFilter = function(oNode){
+			if (oNode.nodeType == 3 && oNode.nodeValue != "\n" && oNode.nodeValue != "")
+				return true;
+			else
+				return false;
+		}
+
+		return this.getNodes(bSplitTextEndNodes, txtFilter);
+	},
+
+	surroundContentsWithNewNode : function(sTagName){
+		var oNewParent = this._document.createElement(sTagName);
+		this.surroundContents(oNewParent);
+		return oNewParent;
+	},
+
+	isRangeinRange : function(oAnoterRange, bIncludePartlySelected){
+		var startToStart = this.compareBoundaryPoints(this.START_TO_START, oAnoterRange);
+		var startToEnd = this.compareBoundaryPoints(this.START_TO_END, oAnoterRange);
+		var endToStart = this.compareBoundaryPoints(this.END_TO_START, oAnoterRange);
+		var endToEnd = this.compareBoundaryPoints(this.END_TO_END, oAnoterRange);
+
+		if(startToStart <= 0 && endToEnd >= 0) return true;
+
+		if(bIncludePartlyIncluded){
+			if(startToEnd == 1) return false;
+			if(endToStart == -1) return false;
+			return true;
+		}
+
+		return false;
+	},
+
+	isNodeInRange : function(oNode, bIncludePartlySelected, bContentOnly){
+		var oTmpRange = new xe.XpressRange(this._window);
+
+		if(bContentOnly && oNode.firstChild){
+			oTmpRange.setStartBefore(oNode.firstChild);
+			oTmpRange.setEndAfter(oNode.lastChild);
+		}else{
+			oTmpRange.selectNode(oNode);
+		}
+
+		return isRangeInRange(oTmpRange, bIncludePartlySelected);
+	},
+
+	pasteHTML : function(sHTML){
+		if(sHTML == ""){
+			this.deleteContents();
+			return;
+		}
+
+		var oTmpDiv = this._document.createElement("DIV");
+		oTmpDiv.innerHTML = sHTML;
+
+		var oFirstNode = oTmpDiv.firstChild;
+		var oLastNode = oTmpDiv.lastChild;
+
+		var clone = this.cloneRange();
+		var sBM = clone.placeStringBookmark();
+
+		while(oTmpDiv.lastChild) this.insertNode(oTmpDiv.lastChild);
+
+		this.setEndNodes(oFirstNode, oLastNode);
+
+		// delete the content later as deleting it first may mass up the insertion point
+		// eg) <p>[A]BCD</p> ---paste O---> O<p>BCD</p>
+		clone.moveToBookmark(sBM);
+		clone.deleteContents();
+		clone.removeStringBookmark(sBM);
+	},
+
+	toString : function(){
+		this.toString = xe.W3CDOMRange.prototype.toString;
+		return this.toString();
+	},
+
+	toHTMLString : function(){
+		var oTmpContainer = this._document.createElement("DIV");
+		oTmpContainer.appendChild(this.cloneContents());
+
+		return oTmpContainer.innerHTML;
+	},
+
+	findAncestorByTagName : function(sTagName){
+		var oNode = this.commonAncestorContainer;
+		while(oNode && oNode.tagName != sTagName) oNode = xe.DOMFix.parentNode(oNode);
+
+		return oNode;
+	},
+
+	selectNodeContents : function(oNode){
+		if(!oNode) return;
+
+		var oFirstNode = oNode.firstChild?oNode.firstChild:oNode;
+		var oLastNode = oNode.lastChild?oNode.lastChild:oNode;
+
+		if(oFirstNode.nodeType == 3)
+			this.setStart(oFirstNode, 0);
+		else
+			this.setStartBefore(oFirstNode);
+
+		if(oLastNode.nodeType == 3)
+			this.setEnd(oLastNode, oLastNode.nodeValue.length);
+		else
+			this.setEndAfter(oLastNode);
+	},
+
+	styleRange : function(oStyle, oAttribute, sNewSpanMarker){
+		var aStyleParents = this._getStyleParentNodes(sNewSpanMarker);
+		if(aStyleParents.length < 1) return;
+
+		var sName, sValue;
+
+		for(var i=0; i<aStyleParents.length; i++){
+			for(var x in oStyle){
+				sName = x;
+				sValue = oStyle[sName];
+
+				if(typeof sValue != "string") continue;
+
+				aStyleParents[i].style[sName] = sValue;
+			}
+
+			if(!oAttribute) continue;
+
+			for(var x in oAttribute){
+				sName = x;
+				sValue = oAttribute[sName];
+
+				if(typeof sValue != "string") continue;
+
+				if(sName == "class"){
+					$(aStyleParents[i]).addClass(sValue);
+				}else{
+					aStyleParents[i].setAttribute(sName, sValue);
+				}
+			}
+		}
+
+		this.setStartBefore(aStyleParents[0]);
+		this.setEndAfter(aStyleParents[aStyleParents.length-1]);
+	},
+
+	_getStyleParentNodes : function(sNewSpanMarker){
+		this._splitTextEndNodesOfTheRange();
+
+		var oSNode = this.getStartNode();
+		var oENode = this.getEndNode();
+
+		var aAllNodes = this._getNodesInRange();
+		var aResult = [];
+		var nResult = 0;
+
+		var oNode, oTmpNode, iStartRelPos, iEndRelPos, oSpan, iSIdx, iEIdx, oParentNode;
+		var nInitialLength  = aAllNodes.length;
+		var arAllBottmNodes = $(aAllNodes).filter(function(){ return !!this.childNodes.length });
+
+		for(var i=0; i<nInitialLength; i++){
+			oNode = aAllNodes[i];
+
+			if(!oNode || oNode.nodeType != 3 || oNode.nodeValue == '') continue;
+			
+			oParentNode = xe.DOMFix.parentNode(oNode);
+
+			if(oParentNode.tagName == "SPAN"){
+				// check if the SPAN element is fully contained
+				// do quick checks before trying indexOf() because indexOf() function is very slow
+				oTmpNode = this._getVeryFirstRealChild(oParentNode);
+				if(oTmpNode == oNode) iSIdx = 1;
+				else iSIdx = arAllBottmNodes.indexOf(oTmpNode);
+
+				if(iSIdx != -1){
+					oTmpNode = this._getVeryLastRealChild(oParentNode);
+					if(oTmpNode == oNode) iEIdx = 1;
+					else iEIdx = arAllBottmNodes.indexOf(oTmpNode);
+				}
+
+				if(iSIdx != -1 && iEIdx != -1){
+					aResult[nResult++] = oParentNode;
+					continue;
+				}
+			}
+
+			oSpan = this._document.createElement("SPAN");
+			oParentNode.insertBefore(oSpan, oNode);
+			oSpan.appendChild(oNode);
+			aResult[nResult++] = oSpan;
+
+			if(sNewSpanMarker) oSpan.setAttribute(sNewSpanMarker, "true");
+		}
+
+		this.setStartBefore(oSNode);
+		this.setEndAfter(oENode);
+
+		return aResult;
+	},
+
+	_getVeryFirstChild : function(oNode){
+		if(oNode.firstChild) return this._getVeryFirstChild(oNode.firstChild);
+		return oNode;
+	},
+
+	_getVeryLastChild : function(oNode){
+		if(oNode.lastChild) return this._getVeryLastChild(oNode.lastChild);
+		return oNode;
+	},
+
+	_getFirstRealChild : function(oNode){
+		var oFirstNode = oNode.firstChild;
+		while(oFirstNode && oFirstNode.nodeType == 3 && oFirstNode.nodeValue == "") oFirstNode = oFirstNode.nextSibling;
+
+		return oFirstNode;
+	},
+
+	_getLastRealChild : function(oNode){
+		var oLastNode = oNode.lastChild;
+		while(oLastNode && oLastNode.nodeType == 3 && oLastNode.nodeValue == "") oLastNode = oLastNode.previousSibling;
+
+		return oLastNode;
+	},
+
+	_getVeryFirstRealChild : function(oNode){
+		var oFirstNode = this._getFirstRealChild(oNode);
+		if(oFirstNode) return this._getVeryFirstRealChild(oFirstNode);
+		return oNode;
+	},
+	_getVeryLastRealChild : function(oNode){
+		var oLastNode = this._getLastRealChild(oNode);
+		if(oLastNode) return this._getVeryLastChild(oLastNode);
+		return oNode;
+	},
+
+	_getLineStartInfo : function(node){
+		var frontEndFinal = null;
+		var frontEnd = node;
+		var lineBreaker = node;
+		var bParentBreak = true;
+
+		var rxLineBreaker = this.rxLineBreaker;
+
+		// vertical(parent) search
+		function getLineStart(node){
+			if(!node) return;
+			if(frontEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				frontEndFinal = frontEnd;
+
+				bParentBreak = true;
+
+				return;
+			}else{
+				frontEnd = node;
+			}
+
+			getFrontEnd(node.previousSibling);
+
+			if(frontEndFinal) return;
+			getLineStart(xe.DOMFix.parentNode(node));
+		}
+
+		// horizontal(sibling) search
+		function getFrontEnd(node){
+			if(!node) return;
+			if(frontEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				frontEndFinal = frontEnd;
+
+				bParentBreak = false;
+				return;
+			}
+
+			if(node.firstChild && node.tagName != "TABLE"){
+				var curNode = node.lastChild;
+				while(curNode && !frontEndFinal){
+					getFrontEnd(curNode);
+
+					curNode = curNode.previousSibling;
+				}
+			}else{
+				frontEnd = node;
+			}
+
+			if(!frontEndFinal){
+				getFrontEnd(node.previousSibling);
+			}
+		}
+
+		getLineStart(node);
+
+		return {oNode: frontEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
+	},
+
+	_getLineEndInfo : function(node){
+		var backEndFinal = null;
+		var backEnd = node;
+		var lineBreaker = node;
+		var bParentBreak = true;
+
+		var rxLineBreaker = this.rxLineBreaker;
+
+		// vertical(parent) search
+		function getLineEnd(node){
+			if(!node) return;
+			if(backEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				backEndFinal = backEnd;
+
+				bParentBreak = true;
+
+				return;
+			}else{
+				backEnd = node;
+			}
+
+			getBackEnd(node.nextSibling);
+			if(backEndFinal) return;
+
+			getLineEnd(xe.DOMFix.parentNode(node));
+		}
+
+		// horizontal(sibling) search
+		function getBackEnd(node){
+			if(!node) return;
+			if(backEndFinal) return;
+
+			if(rxLineBreaker.test(node.tagName)){
+				lineBreaker = node;
+				backEndFinal = backEnd;
+
+				bParentBreak = false;
+
+				return;
+			}
+
+			if(node.firstChild && node.tagName != "TABLE"){
+				var curNode = node.firstChild;
+				while(curNode && !backEndFinal){
+					getBackEnd(curNode);
+
+					curNode = curNode.nextSibling;
+				}
+			}else{
+				backEnd = node;
+			}
+
+			if(!backEndFinal){
+				getBackEnd(node.nextSibling);
+			}
+		}
+
+		getLineEnd(node);
+
+		return {oNode: backEndFinal, oLineBreaker: lineBreaker, bParentBreak: bParentBreak};
+	},
+
+	getLineInfo : function(){
+		var oSNode = this.getStartNode();
+		var oENode = this.getEndNode();
+
+		// the range is currently collapsed
+		if(!oSNode) oSNode = this.getNodeAroundRange(true, true);
+		if(!oENode) oENode = this.getNodeAroundRange(true, true);
+
+		var oStart = this._getLineStartInfo(oSNode);
+		var oStartNode = oStart.oNode;
+		var oEnd = this._getLineEndInfo(oENode);
+		var oEndNode = oEnd.oNode;
+
+		var iRelativeStartPos = this._compareEndPoint(xe.DOMFix.parentNode(oStartNode), this._getPosIdx(oStartNode), this.endContainer, this.endOffset);
+		var iRelativeEndPos = this._compareEndPoint(xe.DOMFix.parentNode(oEndNode), this._getPosIdx(oEndNode)+1, this.startContainer, this.startOffset);
+
+		if(!(iRelativeStartPos <= 0 && iRelativeEndPos >= 0)){
+			oSNode = this.getNodeAroundRange(false, true);
+			oENode = this.getNodeAroundRange(false, true);
+			oStart = this._getLineStartInfo(oSNode);
+			oEnd = this._getLineEndInfo(oENode);
+		}
+
+		return {oStart: oStart, oEnd: oEnd};
+	}
+}).extend(xe.W3CDOMRange);
+
+/**
+ * @fileOverview This file contains cross-browser selection function
+ * @name SimpleSelection.js
+ */
+xe.SimpleSelection = function(win){
+	this.init = function(win){
+		this._window = win || window;
+		this._document = this._window.document;
+	};
+
+	this.init(win);
+
+	if($.browser.msie)
+		xe.SimpleSelectionImpl_IE.apply(this);
+	else
+		xe.SimpleSelectionImpl_FF.apply(this);
+
+	this.selectRange = function(oRng){
+		this.selectNone();
+		this.addRange(oRng);
+	};
+
+	this.selectionLoaded = true;
+	if(!this._oSelection) this.selectionLoaded = false;
+};
+
+xe.SimpleSelectionImpl_FF = function(){
+	this._oSelection = this._window.getSelection();
+
+	this.getRangeAt = function(iNum){
+		iNum = iNum || 0;
+
+		try{
+			var oFFRange = this._oSelection.getRangeAt(iNum);
+		}catch(e){return new xe.W3CDOMRange(this._document);}
+
+		return this._FFRange2W3CRange(oFFRange);
+	};
+
+	this.addRange = function(oW3CRange){
+		var oFFRange = this._W3CRange2FFRange(oW3CRange);
+		this._oSelection.addRange(oFFRange);
+	};
+
+	this.selectNone = function(){
+		this._oSelection.removeAllRanges();
+	};
+
+	this._FFRange2W3CRange = function(oFFRange){
+		var oW3CRange = new xe.W3CDOMRange(this._document);
+		oW3CRange.setStart(oFFRange.startContainer, oFFRange.startOffset);
+		oW3CRange.setEnd(oFFRange.endContainer, oFFRange.endOffset);
+		return oW3CRange;
+	};
+
+	this._W3CRange2FFRange = function(oW3CRange){
+		var oFFRange = this._document.createRange();
+		oFFRange.setStart(oW3CRange.startContainer, oW3CRange.startOffset);
+		oFFRange.setEnd(oW3CRange.endContainer, oW3CRange.endOffset);
+
+		return oFFRange;
+	};
+};
+
+xe.SimpleSelectionImpl_IE = function(){
+	this._oSelection = this._document.selection;
+
+	this.getRangeAt = function(iNum){
+		iNum = iNum || 0;
+
+		if(this._oSelection.type == "Control"){
+			var oW3CRange = new xe.W3CDOMRange(this._document);
+
+			var oSelectedNode = this._oSelection.createRange().item(iNum);
+
+			// if the selction occurs in a different document, ignore
+			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document) return oW3CRange;
+
+			oW3CRange.selectNode(oSelectedNode);
+
+			return oW3CRange;
+		}else{
+			var oSelectedNode = this._oSelection.createRangeCollection().item(iNum).parentElement();
+
+			// if the selction occurs in a different document, ignore
+			if(!oSelectedNode || oSelectedNode.ownerDocument != this._document){
+				var oW3CRange = new xe.W3CDOMRange(this._document);
+				return oW3CRange;
+			}
+			return this._IERange2W3CRange(this._oSelection.createRangeCollection().item(iNum));
+		}
+	};
+
+	this.addRange = function(oW3CRange){
+		var oIERange = this._W3CRange2IERange(oW3CRange);
+		oIERange.select();
+	};
+
+	this.selectNone = function(){
+		this._oSelection.empty();
+	};
+
+	this._W3CRange2IERange = function(oW3CRange){
+		var oStartIERange = this._getIERangeAt(oW3CRange.startContainer, oW3CRange.startOffset);
+		var oEndIERange = this._getIERangeAt(oW3CRange.endContainer, oW3CRange.endOffset);
+		oStartIERange.setEndPoint("EndToEnd", oEndIERange);
+
+		return oStartIERange;
+	};
+
+	this._getIERangeAt = function(oW3CContainer, iW3COffset){
+		var oIERange = this._document.body.createTextRange();
+
+		var oEndPointInfoForIERange = this._getSelectableNodeAndOffsetForIE(oW3CContainer, iW3COffset);
+
+		var oSelectableNode = oEndPointInfoForIERange.oSelectableNodeForIE;
+		var iIEOffset = oEndPointInfoForIERange.iOffsetForIE;
+
+		oIERange.moveToElementText(oSelectableNode);
+		oIERange.collapse(oEndPointInfoForIERange.bCollapseToStart);
+		oIERange.moveStart("character", iIEOffset);
+
+		return oIERange;
+	};
+
+	this._getSelectableNodeAndOffsetForIE = function(oW3CContainer, iW3COffset){
+		var oIERange = this._document.body.createTextRange();
+
+		var oNonTextNode = null;
+		var aChildNodes =  null;
+		var iNumOfLeftNodesToCount = 0;
+
+		if(oW3CContainer.nodeType == 3){
+			oNonTextNode = xe.DOMFix.parentNode(oW3CContainer);
+			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
+			iNumOfLeftNodesToCount = aChildNodes.length;
+		}else{
+			oNonTextNode = oW3CContainer;
+			aChildNodes = xe.DOMFix.childNodes(oNonTextNode);
+			iNumOfLeftNodesToCount = iW3COffset;
+		}
+
+		var oNodeTester = null;
+
+		var iResultOffset = 0;
+
+		var bCollapseToStart = true;
+
+		for(var i=0; i<iNumOfLeftNodesToCount; i++){
+			oNodeTester = aChildNodes[i];
+
+			if(oNodeTester.nodeType == 3){
+				if(oNodeTester == oW3CContainer) break;
+
+				iResultOffset += oNodeTester.nodeValue.length;
+			}else{
+				oIERange.moveToElementText(oNodeTester);
+				oNonTextNode = oNodeTester;
+				iResultOffset = 0;
+
+				bCollapseToStart = false;
+			}
+		}
+
+		if(oW3CContainer.nodeType == 3) iResultOffset += iW3COffset;
+
+		return {oSelectableNodeForIE:oNonTextNode, iOffsetForIE: iResultOffset, bCollapseToStart: bCollapseToStart};
+	};
+
+	this._IERange2W3CRange = function(oIERange){
+		var oW3CRange = new xe.W3CDOMRange(this._document);
+
+		var oIEPointRange = null;
+		var oPosition = null;
+
+		oIEPointRange = oIERange.duplicate();
+		oIEPointRange.collapse(true);
+
+		oPosition = this._getW3CContainerAndOffset(oIEPointRange, true);
+
+		oW3CRange.setStart(oPosition.oContainer, oPosition.iOffset);
+
+		var oCollapsedChecker = oIERange.duplicate();
+		oCollapsedChecker.collapse(true);
+		if(oCollapsedChecker.isEqual(oIERange)){
+			oW3CRange.collapse(true);
+		}else{
+			oIEPointRange = oIERange.duplicate();
+			oIEPointRange.collapse(false);
+			oPosition = this._getW3CContainerAndOffset(oIEPointRange);
+			oW3CRange.setEnd(oPosition.oContainer, oPosition.iOffset);
+		}
+
+		return oW3CRange;
+	};
+
+	this._getW3CContainerAndOffset = function(oIEPointRange, bStartPt){
+		var oRgOrigPoint = oIEPointRange;
+
+		var oContainer = oRgOrigPoint.parentElement();
+		var offset = -1;
+
+		var oRgTester = this._document.body.createTextRange();
+		var aChildNodes = xe.DOMFix.childNodes(oContainer);
+		var oPrevNonTextNode = null;
+		var pointRangeIdx = 0;
+
+		for(var i=0;i<aChildNodes.length;i++){
+			if(aChildNodes[i].nodeType == 3) continue;
+
+			oRgTester.moveToElementText(aChildNodes[i]);
+
+			if(oRgTester.compareEndPoints("StartToStart", oIEPointRange)>=0) break;
+
+			oPrevNonTextNode = aChildNodes[i];
+		}
+
+		var pointRangeIdx = i;
+
+		if(pointRangeIdx != 0 && aChildNodes[pointRangeIdx-1].nodeType == 3){
+			var oRgTextStart = this._document.body.createTextRange();
+			var oCurTextNode = null;
+			if(oPrevNonTextNode){
+				oRgTextStart.moveToElementText(oPrevNonTextNode);
+				oRgTextStart.collapse(false);
+				oCurTextNode = oPrevNonTextNode.nextSibling;
+			}else{
+				oRgTextStart.moveToElementText(oContainer);
+				oRgTextStart.collapse(true);
+				oCurTextNode = oContainer.firstChild;
+			}
+
+			var oRgTextsUpToThePoint = oRgOrigPoint.duplicate();
+			oRgTextsUpToThePoint.setEndPoint("StartToStart", oRgTextStart);
+
+			var textCount = oRgTextsUpToThePoint.text.length
+
+			while(textCount > oCurTextNode.nodeValue.length && oCurTextNode.nextSibling){
+				textCount -= oCurTextNode.nodeValue.length;
+				oCurTextNode = oCurTextNode.nextSibling;
+			}
+
+			// this will enforce IE to re-reference oCurTextNode
+			var oTmp = oCurTextNode.nodeValue;
+
+			if(bStartPt && oCurTextNode.nextSibling && oCurTextNode.nextSibling.nodeType == 3 && textCount == oCurTextNode.nodeValue.length){
+				textCount -= oCurTextNode.nodeValue.length;
+				oCurTextNode = oCurTextNode.nextSibling;
+			}
+
+			oContainer = oCurTextNode;
+			offset = textCount;
+		}else{
+			oContainer = oRgOrigPoint.parentElement();
+			offset = pointRangeIdx;
+		}
+
+		return {"oContainer" : oContainer, "iOffset" : offset};
+	};
+}
+
+xe.DOMFix = new ($.Class({
+	$init : function(){
+		if($.browser.msie || $.browser.opera){
+			this.childNodes = this._childNodes_Fix;
+			this.parentNode = this._parentNode_Fix;
+		}else{
+			this.childNodes = this._childNodes_Native;
+			this.parentNode = this._parentNode_Native;
+		}
+	},
+
+	_parentNode_Native : function(elNode){
+		return elNode.parentNode;
+	},
+
+	_parentNode_Fix : function(elNode){
+		if(!elNode) return elNode;
+
+		while(elNode.previousSibling){elNode = elNode.previousSibling;}
+
+		return elNode.parentNode;
+	},
+
+	_childNodes_Native : function(elNode){
+		return elNode.childNodes;
+	},
+
+	_childNodes_Fix : function(elNode){
+		var aResult = null;
+		var nCount = 0;
+
+		if(elNode){
+			var aResult = [];
+			elNode = elNode.firstChild;
+			while(elNode){
+				aResult[nCount++] = elNode;
+				elNode=elNode.nextSibling;
+			}
+		}
+
+		return aResult;
+	}
+}))();
+
+/**
+ * @fileOverview This file contains a function that takes care of the draggable layers
+ * @name N_DraggableLayer.js
+ */
+xe.DraggableLayer = $.Class({
+	$init : function(oLayer, oOptions){
+		this.oOptions = $.extend({
+			bModal : "false",
+			oHandle : oLayer,
+			iMinX : -999999,
+			iMinY : -999999,
+			iMaxX : 999999,
+			iMaxY : 999999
+		}, oOptions);
+
+		this.oHandle = this.oOptions.oHandle;
+
+		oLayer.style.display = "block";
+		oLayer.style.position = "absolute";
+		oLayer.style.zIndex = "9999";
+
+		this.aBasePosition = this.getBaseOffset(oLayer);
+
+		// "number-ize" the position and set it as inline style. (the position could've been set as "auto" or set  by css, not inline style)
+		oLayer.style.top = (this.toInt($(oLayer).offset().top) - this.aBasePosition.top)+"px";
+		oLayer.style.left = (this.toInt($(oLayer).offset().left) - this.aBasePosition.left)+"px";
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this, oLayer);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this, oLayer);
+		this.$FnMouseUp = $.fnBind(this._mouseup, this, oLayer);
+
+		$(this.oHandle).bind("mousedown", this.$FnMouseDown);
+	},
+
+	_mousedown : function(oLayer, oEvent){
+		if(oEvent.target.tagName == "INPUT") return;
+
+		this.MouseOffsetY = (oEvent.pageY-this.toInt(oLayer.style.top)-this.aBasePosition['top']);
+		this.MouseOffsetX = (oEvent.pageX-this.toInt(oLayer.style.left)-this.aBasePosition['left']);
+
+		$(oLayer).bind("mousemove", this.$FnMouseMove);
+		$(oLayer).bind("mouseup", this.$FnMouseUp);
+	},
+
+	_mousemove : function(oLayer, oEvent){
+		var iTop = (oEvent.pageY-this.MouseOffsetY-this.aBasePosition['top']);
+		var iLeft = (oEvent.pageX-this.MouseOffsetX-this.aBasePosition['left']);
+
+		if(iTop<this.oOptions.iMinY) iTop = this.oOptions.iMinY;
+		if(iTop>this.oOptions.iMaxY) iTop = this.oOptions.iMaxY;
+
+		if(iLeft<this.oOptions.iMinX) iLeft = this.oOptions.iMinX;
+		if(iLeft>this.oOptions.iMaxX) iLeft = this.oOptions.iMaxX;
+
+		oLayer.style.top = iTop + "px";
+		oLayer.style.left = iLeft + "px";
+	},
+
+	_mouseup : function(oLayer, oEvent){
+		$(oLayer).unbind("mousemove", this.$FnMouseMove);
+		$(oLayer).unbind("mouseup", this.$FnMouseUp);
+	},
+
+	toInt : function(num){
+		var result = parseInt(num);
+		return result || 0;
+	},
+
+	findNonStatic : function(oEl){
+		if(!oEl) return null;
+		if(oEl.tagName == "BODY") return oEl;
+
+		if($(oEl).css("position").match(/absolute|relative/i)) return oEl;
+
+		return this.findNonStatic(oEl.offsetParent);
+	},
+
+	getBaseOffset : function(oEl){
+		var oBase = this.findNonStatic(oEl.offsetParent);
+		var tmp = $(oBase).offset();
+
+		return {top: tmp.top, left: tmp.left};
+	}
+});
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the messages related to core operations
+ * @name hp_CorePlugin.js
+ */
+xe.CorePlugin = $.Class({
+	name : "CorePlugin",
+
+	$init : function(funcOnReady){
+		this.funcOnReady = funcOnReady;
+	},
+
+	$AFTER_MSG_APP_READY : function(){
+		this.oApp.exec("EXEC_ON_READY_FUNCTION", []);
+	},
+
+	$ON_ADD_APP_PROPERTY : function(sPropertyName, oProperty){
+		this.oApp[sPropertyName] = oProperty;
+	},
+
+	$ON_REGISTER_BROWSER_EVENT : function(obj, sEvent, sCMD, aParams, nDelay){
+		this.oApp.registerBrowserEvent(obj, sEvent, sCMD, aParams, nDelay);
+	},
+
+	$ON_DISABLE_COMMAND : function(sCommand){
+		this.oApp.disableCommand(sCommand, true);
+	},
+
+	$ON_ENABLE_COMMAND : function(sCommand){
+		this.oApp.disableCommand(sCommand, false);
+	},
+
+	$ON_EXEC_ON_READY_FUNCTION : function(){
+		if(typeof this.funcOnReady == "function") this.funcOnReady();
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that helps various operations.
+ * @name hp_Utils.js
+ */
+ xe.Utils = $.Class({
+	name : "Utils",
+
+	$init : function(){
+		if($.browser.msie && $.browser.nVersion == 6){
+			try{
+				document.execCommand('BackgroundImageCache', false, true);
+			}catch(e){}
+		}
+	},
+
+	$ON_ATTACH_HOVER_EVENTS : function(aElms, sHoverClass){
+		sHoverClass = sHoverClass || "hover";
+
+		if(!aElms) return;
+
+		$(aElms).hover(
+			function(){$(this).addClass(sHoverClass)},
+			function(){$(this).removeClass(sHoverClass)}
+		);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that bridges the XpressRange function
+ * @name hp_XpressRangeManager.js
+ */
+xe.XpressRangeManager = $.Class({
+	name : "XpressRangeManager",
+
+	oWindow : null,
+
+	$init : function(win){
+		this.oWindow = win || window;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		if(this.oWindow && this.oWindow.tagName == "IFRAME")
+			this.oWindow = this.oWindow.contentWindow;
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getSelection", $.fnBind(this.getSelection, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getEmptySelection", $.fnBind(this.getEmptySelection, this)]);
+	},
+
+	$ON_SET_EDITING_WINDOW : function(oWindow){
+		this.oWindow = oWindow;
+	},
+
+	getEmptySelection : function(){
+		var oXpressRange = new xe.XpressRange(this.oWindow);
+		return oXpressRange;
+	},
+
+	getSelection : function(){
+		this.oApp.exec("RESTORE_IE_SELECTION", []);
+
+		var oXpressRange = this.getEmptySelection();
+
+		// this may throw an exception if the selected is area is not yet shown
+		try{
+			oXpressRange.setFromSelection();
+		}catch(e){}
+
+		return oXpressRange;
+	}
+});
+//}
+xe.Hotkey = $.Class({
+	name : "Hotkey",
+
+	storage : {},
+	keyhash : {},
+
+	$init : function(){
+		this.storage = {};
+
+		this.keyhash = {
+			backspace : 8,
+			tab		  : 9,
+			enter	  : 13,
+			shift	 : 16,
+			ctrl	  : 17,
+			alt	   : 18,
+			meta	  : 224,
+			esc		  : 27,
+			space	  : 32,
+			pageup	  : 33,
+			pagedown  : 34,
+			end		  : 35,
+			home	  : 36,
+			left	  : 37,
+			up		  : 38,
+			right	  : 39,
+			down	  : 40,
+			del	  	  : 46,
+			comma	  : 188,//(,)
+			period	  : 190,//(.)
+			slash	  : 191,//(/)
+			hyphen	: 109,
+			equal	 : 61
+		};
+
+		if ($.browser.msie || $.browser.safari) {
+			this.keyhash.hyphen = 189; // (-)
+			this.keyhash.equal = 187;  // (=)
+			this.keyhash.meta  = 91;   // meta
+		}
+
+
+	},
+
+	$ON_MSG_APP_READY : function(){
+		$(this.oApp.getWYSIWYGDocument() || document).keydown($.fnBind(this.keydown, this));
+	},
+
+	$ON_REGISTER_HOTKEY : function(sHotkey, sCMD, sArgs){
+		if(!sArgs) sArgs = [];
+		var func = $.fnBind(this.oApp.exec, this.oApp, sCMD, sArgs);
+
+		sHotkey = this.normalize(sHotkey);
+		if (!sHotkey) return false;
+
+		this.add(sHotkey, func);
+	},
+
+	add : function(sHotkey, func) {
+		if (typeof this.storage[sHotkey] == 'undefined') {
+			this.storage[sHotkey] = [func];
+		} else {
+			this.storage[sHotkey].push(func);
+		}
+	},
+
+	keydown : function(event) {
+		var key  = [], kh = this.keyhash;
+
+		if ($.inArray(event.keyCode, [kh.shift, kh.ctrl, kh.alt, kh.meta]) >= 0) return;
+
+		if (event.shiftKey) key.push('shift');
+		if (event.altKey)   key.push('alt');
+		if (event.ctrlKey)  key.push('ctrl');
+		if (event.metaKey)  key.push('meta');
+		if (!key.length) return;
+		if (key.length == 1 && event.metaKey) key = ['ctrl', 'meta'];
+
+		key.push(event.keyCode);
+
+		key = key.join('+');
+
+		if (!this.storage[key]) return;
+
+		$.each(this.storage[key], function(){ this(); });
+
+		return false;
+	},
+
+	normalize : function(sHotkey) {
+		var shift, ctrl, alt, meta, key, keys = (sHotkey||"").toLowerCase().split('+');
+
+		shift = ctrl = alt = meta = key = false;
+
+		$.each(keys, function(){
+			var s = ""+this;
+			switch(s) {
+				case 'shift': shift = true;
+				case 'alt'  : alt   = true;
+				case 'ctrl' : ctrl  = true;
+				case 'meta' : meta  = true;
+				default:
+					key = s;
+			}
+		});
+
+		if (!key) return '';
+
+		keys = [];
+		if (shift) keys.push('shift');
+		if (alt) keys.push('alt');
+		if (ctrl) keys.push('ctrl');
+		if (meta || (ctrl && !shift && !alt)) keys.push('meta');
+
+		keys.push(this.keyhash[key] || key.toUpperCase().charCodeAt(0));
+
+		return keys.join('+');
+	}
+});
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the draggable layers
+ * @name hp_DialogLayerManager.js
+ */
+xe.DialogLayerManager = $.Class({
+	name : "DialogLayerManager",
+	aMadeDraggable : null,
+	aOpenedLayers : null,
+
+	$init : function(){
+		this.aMadeDraggable = [];
+		this.aOpenedLayers = [];
+	},
+
+	$ON_SHOW_DIALOG_LAYER : function(oLayer, bModal){
+		oLayer = $.$(oLayer);
+		bModal = $.$(bModal) || false;
+		if(!oLayer) return;
+
+		if($.inArray(oLayer, this.aOpenedLayers) != -1) return;
+
+		this.oApp.exec("POSITION_DIALOG_LAYER", [oLayer]);
+
+		this.aOpenedLayers[this.aOpenedLayers.length] = oLayer;
+
+		if($.inArray(oLayer, this.aMadeDraggable) == -1){
+			new xe.DraggableLayer(oLayer, {bModal: bModal, iMinY: 0});
+			this.aMadeDraggable[this.aMadeDraggable.length] = oLayer;
+		}else{
+			oLayer.style.display = "block";
+		}
+	},
+
+	$ON_HIDE_LAST_DIALOG_LAYER : function(){
+		this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[this.aOpenedLayers.length-1]]);
+	},
+
+	$ON_HIDE_ALL_DIALOG_LAYER : function(){
+		for(var i=this.aOpenedLayers.length-1; i>=0; i--)
+			this.oApp.exec("HIDE_DIALOG_LAYER", [this.aOpenedLayers[i]]);
+	},
+
+	$ON_HIDE_DIALOG_LAYER : function(oLayer){
+		oLayer = $.$(oLayer);
+
+		if(oLayer) oLayer.style.display = "none";
+		this.aOpenedLayers = $.grep(this.aOpenedLayers, function(a){return a!=oLayer});
+	},
+
+	$ON_SET_DIALOG_LAYER_POSITION : function(oLayer, iTop, iLeft){
+		oLayer.style.top = iTop;
+		oLayer.style.left = iLeft;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the layers that should disappear when the focus is lost
+ * @name hp_ActiveLayerManager.js
+ */
+xe.ActiveLayerManager = $.Class({
+	name : "ActiveLayerManager",
+	oCurrentLayer : null,
+
+	$ON_TOGGLE_ACTIVE_LAYER : function(oLayer, sOnOpenCmd, aOnOpenParam, sOnCloseCmd, aOnCloseParam){
+		if(oLayer == this.oCurrentLayer){
+			this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+		}else{
+			this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sOnCloseCmd, aOnCloseParam]);
+			if(sOnOpenCmd) this.oApp.exec(sOnOpenCmd, aOnOpenParam);
+		}
+	},
+
+	$ON_SHOW_ACTIVE_LAYER : function(oLayer, sOnCloseCmd, aOnCloseParam){
+		oLayer = $.$(oLayer);
+		this.sOnCloseCmd = sOnCloseCmd;
+		this.aOnCloseParam = aOnCloseParam;
+
+		var oPrevLayer = this.oCurrentLayer;
+
+		if(oLayer == oPrevLayer) return;
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+
+		oLayer.style.display = "block";
+		this.oCurrentLayer = oLayer;
+	},
+
+	$ON_HIDE_ACTIVE_LAYER : function(){
+		var oLayer = this.oCurrentLayer;
+		if(!oLayer) return;
+		oLayer.style.display = "none";
+		this.oCurrentLayer = null;
+
+		if(this.sOnCloseCmd)
+			this.oApp.exec(this.sOnCloseCmd, this.aOnCloseParam);
+	},
+
+	// for backward compatibility only.
+	// use HIDE_ACTIVE_LAYER instead!
+	$ON_HIDE_CURRENT_ACTIVE_LAYER : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_MOUSEDOWN : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to string conversion. Ususally used to convert the IR value.
+ * @name hp_StringConverterManager.js
+ */
+xe.StringConverterManager = $.Class({
+	name : "StringConverterManager",
+
+	oConverters : null,
+
+	$init : function(){
+		this.oConverters = {};
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("ADD_APP_PROPERTY", ["applyConverter", $.fnBind(this.applyConverter, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["addConverter", $.fnBind(this.addConverter, this)]);
+	},
+
+	applyConverter : function(sRuleName, sContent){
+		var aConverters = this.oConverters[sRuleName];
+		if(!aConverters) return sContent;
+
+		for(var i=0; i<aConverters.length; i++) sContent = aConverters[i](sContent);
+
+		return sContent;
+	},
+
+	addConverter : function(sRuleName, funcConverter){
+		var aConverters = this.oConverters[sRuleName];
+		if(!aConverters) this.oConverters[sRuleName] = [];
+
+		this.oConverters[sRuleName][this.oConverters[sRuleName].length] = funcConverter;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that maps a message code to the actual message
+ * @name hp_MessageManager.js
+ */
+xe.MessageManager = $.Class({
+	name : "MessageManager",
+
+	oMessageMap : null,
+
+	$init : function(oMessageMap){
+		this.oMessageMap = oMessageMap;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("ADD_APP_PROPERTY", ["$MSG", $.fnBind(this.getMessage, this)]);
+	},
+
+	getMessage : function(sMsg){
+		if(this.oMessageMap[sMsg]) return unescape(this.oMessageMap[sMsg]);
+
+		return sMsg;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to the tool bar UI
+ * @name hp_XE_Toolbar.js
+ */
+xe.XE_Toolbar = $.Class({
+	name : "XE_Toolbar",
+	toolbarArea : null,
+	toolbarButton : null,
+	uiNameTag : "uiName",
+
+	sUIClassPrefix : "xpress_xeditor_ui_",
+
+	aUICmdMap : null,
+
+	$init : function(oAppContainer){
+		this.htUIList = {};
+
+		this.aUICmdMap = {};
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+		this.toolbarArea = $(".tool", oAppContainer).get(0);
+		this.welToolbarArea = $(this.toolbarArea);
+
+		this.aAllButtons = $("BUTTON", this.toolbarArea).get();
+
+		var aAllLi = this.toolbarArea.getElementsByTagName("LI");
+		var nCount = aAllLi.length;
+		var rxUI = new RegExp(this.sUIClassPrefix+"([^ ]+)");
+		for(var i=0; i<nCount; i++){
+			if(rxUI.test(aAllLi[i].className)){
+				var sUIName = RegExp.$1;
+				if(this.htUIList[sUIName] != null) continue;
+
+				this.htUIList[sUIName] = $(">*:first-child", aAllLi[i]).get(0);
+			}
+		}
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseover", "EVENT_TOOLBAR_MOUSEOVER", []);
+		this.oApp.registerBrowserEvent(this.toolbarArea, "mouseout", "EVENT_TOOLBAR_MOUSEOUT", []);
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getToolbarButtonByUIName", $.fnBind(this.getToolbarButtonByUIName, this)]);
+	},
+
+	$ON_EVENT_TOOLBAR_MOUSEOVER : function(weEvent){
+		if(weEvent.target.tagName == "BUTTON") $(weEvent.target).addClass("hover").parent("span").addClass("hover");
+	},
+
+	$ON_EVENT_TOOLBAR_MOUSEOUT : function(weEvent){
+		if(weEvent.target.tagName == "BUTTON") $(weEvent.target).removeClass("hover").parent("span").removeClass("hover");
+	},
+
+	$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER : function(oLayer, oBtn, sOpenCmd, aOpenArgs, sCloseCmd, aCloseArgs){
+		this.oApp.exec("TOGGLE_ACTIVE_LAYER", [oLayer, "MSG_TOOLBAR_LAYER_SHOWN", [oLayer, oBtn, sOpenCmd, aOpenArgs], sCloseCmd, aCloseArgs]);
+	},
+
+	$ON_MSG_TOOLBAR_LAYER_SHOWN : function(oLayer, oBtn, aOpenCmd, aOpenArgs){
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
+		if(aOpenCmd) this.oApp.exec(aOpenCmd, aOpenArgs);
+	},
+
+	$ON_SHOW_TOOLBAR_ACTIVE_LAYER : function(oLayer, sCmd, aArgs, oBtn){
+		this.oApp.exec("SHOW_ACTIVE_LAYER", [oLayer, sCmd, aArgs]);
+		this.oApp.exec("POSITION_TOOLBAR_LAYER", [oLayer, oBtn]);
+	},
+
+	$ON_ENABLE_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).removeClass("off");
+		elUI.disabled = false;
+
+		// enable related commands
+		var sCmd = "";
+		if(this.aUICmdMap[sUIName]){
+			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
+				sCmd = this.aUICmdMap[sUIName][i];
+				this.oApp.exec("ENABLE_COMMAND", [sCmd]);
+			}
+		}
+	},
+
+	$ON_DISABLE_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).addClass("off");
+		$(elUI).removeClass("hover").parent("span").removeClass("hover");
+		elUI.disabled = true;
+
+		// disable related commands
+		var sCmd = "";
+		if(this.aUICmdMap[sUIName]){
+			for(var i=0; i<this.aUICmdMap[sUIName].length;i++){
+				sCmd = this.aUICmdMap[sUIName][i];
+				this.oApp.exec("DISABLE_COMMAND", [sCmd]);
+			}
+		}
+	},
+
+	$ON_SELECT_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).addClass("active");
+	},
+
+	$ON_DESELECT_UI : function(sUIName){
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		$(elUI).removeClass("active");
+	},
+
+	$ON_ENABLE_ALL_UI : function(){
+		var sUIName, className;
+
+		for(var sUIName in this.htUIList){
+			if(sUIName) this.oApp.exec("ENABLE_UI", [sUIName]);
+		}
+		$(this.toolbarArea).removeClass("off");
+	},
+
+	$ON_DISABLE_ALL_UI : function(){
+		var sUIName;
+
+		for(var sUIName in this.htUIList){
+			if(sUIName) this.oApp.exec("DISABLE_UI", [sUIName]);
+		}
+		$(this.toolbarArea).addClass("off");
+		this.oApp.exec("HIDE_ACTIVE_LAYER",[]);
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, attributeValue){
+		if(attributeValue == 1)
+			this.oApp.exec("SELECT_UI", [sAttributeName]);
+		else
+			this.oApp.exec("DESELECT_UI", [sAttributeName]);
+	},
+
+	$ON_REGISTER_UI_EVENT : function(sUIName, sEvent, sCmd, aParams){
+		// map cmd & ui
+		if(!this.aUICmdMap[sUIName]){this.aUICmdMap[sUIName] = [];}
+		this.aUICmdMap[sUIName][this.aUICmdMap[sUIName].length] = sCmd;
+		var elUI = this.htUIList[sUIName];
+		if(!elUI) return;
+		this.oApp.registerBrowserEvent(elUI, sEvent, sCmd, aParams);
+	},
+
+	$ON_POSITION_TOOLBAR_LAYER : function(oLayer, oBtn){
+		oLayer = $.$(oLayer);
+		oBtn = $.$(oBtn);
+
+		if(!oLayer) return;
+		if(oBtn && oBtn.tagName && oBtn.tagName == "BUTTON") oBtn.parentNode.appendChild(oLayer);
+
+		oLayer.style.left = "0";
+
+		var welLayer = $(oLayer);
+		var nLayerLeft = welLayer.offset().left;
+		nLayerLeft += oLayer.offsetWidth;
+
+		var nToolbarLeft = this.welToolbarArea.offset().left;
+		nToolbarLeft += this.toolbarArea.offsetWidth;
+
+		if(nLayerLeft > nToolbarLeft) oLayer.style.left = (nToolbarLeft-nLayerLeft-5)+"px";
+	},
+
+	getToolbarButtonByUIName : function(sUIName){
+		return this.htUIList[sUIName];
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that manages multiple number editing area plugins and the IR value
+ * @name hp_XE_EditingAreaManager.js
+ */
+xe.XE_EditingAreaManager = $.Class({
+	name : "XE_EditingAreaManager",
+
+	// Currently active plugin instance(XE_EditingArea_???)
+	oActivePlugin : null,
+
+	// Intermediate Representation of the content being edited.
+	// This should be a textarea element.
+	oIRField : null,
+
+	bIsDirty : false,
+
+	$init : function(sInitialMode, oIRField, oDimension, fOnBeforeUnload, oAppContainer){
+		this.sInitialMode = sInitialMode;
+		this.oIRField = $.$(oIRField);
+		this._assignHTMLObjects(oAppContainer);
+		this.fOnBeforeUnload = fOnBeforeUnload;
+
+		this.oEditingMode = {};
+
+		this.elEditingAreaContainer.style.height = parseInt(oDimension.nHeight || this.elEditingAreaContainer.offsetHeight)+"px";
+
+		this.nMinHeight = oDimension.nMinHeight || 10;
+		this.niMinWidth = oDimension.nMinWidth || 10;
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+		this.elEditingAreaContainer = $("DIV.xpress_xeditor_editing_area_container", oAppContainer).get(0);
+		this.elEditingAreaSkipUI = $("A.skip", oAppContainer).get(0);
+	},
+
+	$BEFORE_MSG_APP_READY : function(msg){
+		this.oApp.exec("ADD_APP_PROPERTY", ["elEditingAreaContainer", this.elEditingAreaContainer]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getIR", $.fnBind(this.getIR, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["setIR", this.setIR]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getEditingMode", $.fnBind(this.getEditingMode, this)]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("CHANGE_EDITING_MODE", [this.sInitialMode, true]);
+		this.oApp.exec("LOAD_IR_FIELD", [false]);
+
+		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "focus", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
+		this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI, "blur", "MSG_EDITING_AREA_SIZE_CHANGED", [], 50);
+
+//		var fOnBeforeUnload = this.fOnBeforeUnload||function(){if(this.getIR() != this.oIRField.value || this.bIsDirty) return this.oApp.$MSG("XE_EditingAreaManager.onExit")};
+//		$(window).bind("beforeunload", $.fnBind(fOnBeforeUnload, this));
+	},
+
+	$AFTER_MSG_APP_READY : function(){
+		this.oApp.exec("UPDATE_IR_FIELD", []);
+	},
+
+	$ON_LOAD_IR_FIELD : function(bDontAddUndo){
+		this.oApp.setIR(this.oIRField.value, bDontAddUndo);
+	},
+
+	$ON_UPDATE_IR_FIELD : function(){
+		this.oIRField.value = this.oApp.getIR();
+	},
+
+	$BEFORE_CHANGE_EDITING_MODE : function(sMode){
+		this._oPrevActivePlugin = this.oActivePlugin;
+		this.oActivePlugin = this.oEditingMode[sMode];
+	},
+
+	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(this._oPrevActivePlugin){
+			var sIR = this._oPrevActivePlugin.getIR();
+			this.oApp.exec("SET_IR", [sIR]);
+
+			this.oApp.exec("ENABLE_UI", [this._oPrevActivePlugin.sMode]);
+
+			this._setEditingAreaDimension();
+		}
+		this.oApp.exec("DISABLE_UI", [this.oActivePlugin.sMode]);
+
+		if(!bNoFocus){
+			this.oApp.exec("FOCUS", []);
+		}
+	},
+
+	$ON_SET_IS_DIRTY : function(bIsDirty){
+		this.bIsDirty = bIsDirty;
+	},
+
+	$ON_FOCUS : function(){
+		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
+
+		this.oActivePlugin.focus();
+	},
+
+	$BEFORE_SET_IR : function(sIR, bDontAddUndoHistory){
+		bDontAddUndoHistory = bDontAddUndoHistory || false;
+		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
+	},
+
+	$ON_SET_IR : function(sIR){
+		if(!this.oActivePlugin || typeof this.oActivePlugin.setIR != "function") return
+
+		this.oActivePlugin.setIR(sIR);
+	},
+
+	$AFTER_SET_IR : function(sIR, bDontAddUndoHistory){
+		bDontAddUndoHistory = bDontAddUndoHistory || false;
+		if(!bDontAddUndoHistory) this.oApp.exec("RECORD_UNDO_ACTION", ["SET CONTENTS"]);
+	},
+
+	$ON_REGISTER_EDITING_AREA : function(oEditingAreaPlugin){
+		this.oEditingMode[oEditingAreaPlugin.sMode] = oEditingAreaPlugin;
+		this.attachDocumentEvents(oEditingAreaPlugin.oEditingArea);
+	},
+
+	$ON_MSG_EDITING_AREA_RESIZE_STARTED : function(){
+		this.oActivePlugin.elEditingArea.style.display = "none";
+
+		this.iStartingHeight = parseInt(this.elEditingAreaContainer.style.height);
+	},
+
+	$ON_RESIZE_EDITING_AREA: function(ipNewWidth, ipNewHeight){
+		var iNewWidth = parseInt(ipNewWidth);
+		var iNewHeight = parseInt(ipNewHeight);
+
+		if(iNewWidth < this.niMinWidth) iNewWidth = this.niMinWidth;
+		if(iNewHeight < this.nMinHeight) iNewHeight = this.nMinHeight;
+
+		if(ipNewWidth) this.elEditingAreaContainer.style.width = iNewWidth + "px";
+		if(ipNewHeight) this.elEditingAreaContainer.style.height = iNewHeight + "px";
+	},
+
+	$ON_RESIZE_EDITING_AREA_BY : function(ipWidthChange, ipHeightChange){
+		var iWidthChange = parseInt(ipWidthChange);
+		var iHeightChange = parseInt(ipHeightChange);
+
+		var iWidth = this.elEditingAreaContainer.style.width?parseInt(this.elEditingAreaContainer.style.width)+iWidthChange:null;
+		var iHeight = this.elEditingAreaContainer.style.height?this.iStartingHeight+iHeightChange:null;
+
+		this.oApp.exec("RESIZE_EDITING_AREA", [iWidth, iHeight]);
+	},
+
+	$ON_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
+		this.oActivePlugin.elEditingArea.style.display = "block";
+		this._setEditingAreaDimension();
+	},
+
+	_setEditingAreaDimension : function(){
+		this.oActivePlugin.elEditingArea.style.height = this.elEditingAreaContainer.style.height;
+		this.oActivePlugin.elEditingArea.style.width = this.elEditingAreaContainer.style.width;
+	},
+
+	attachDocumentEvents : function(doc){
+		this.oApp.registerBrowserEvent(doc, "click", "EVENT_EDITING_AREA_CLICK");
+		this.oApp.registerBrowserEvent(doc, "mousedown", "EVENT_EDITING_AREA_MOUSEDOWN");
+		this.oApp.registerBrowserEvent(doc, "mousemove", "EVENT_EDITING_AREA_MOUSEMOVE");
+		this.oApp.registerBrowserEvent(doc, "mouseup", "EVENT_EDITING_AREA_MOUSEUP");
+		this.oApp.registerBrowserEvent(doc, "keydown", "EVENT_EDITING_AREA_KEYDOWN");
+		this.oApp.registerBrowserEvent(doc, "keypress", "EVENT_EDITING_AREA_KEYPRESS");
+		this.oApp.registerBrowserEvent(doc, "keyup", "EVENT_EDITING_AREA_KEYUP");
+	},
+
+	getIR : function(){
+		return this.oActivePlugin.getIR();
+	},
+
+	setIR : function(sIR, bDontAddUndo){
+		this.oApp.exec("SET_IR", [sIR, bDontAddUndo]);
+	},
+
+	getEditingMode : function(){
+		return this.oActivePlugin.sMode;
+	}
+});
+//}
+
+//{
+/**
+  * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to editing the HTML source code using Textarea element
+ * @name hp_XE_EditingArea_HTMLSrc.js
+ * @required XE_EditingAreaManager
+ */
+xe.XE_EditingArea_HTMLSrc = $.Class({
+	name : "XE_EditingArea_HTMLSrc",
+
+	sMode : "HTMLSrc",
+	textarea : null,
+
+	$init : function(textarea){
+		this.textarea = $.$(textarea);
+		this.elEditingArea = this.textarea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oEditingArea = this.textarea;
+		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(sMode == this.sMode){
+			this.textarea.style.display = "block";
+		}else{
+			this.textarea.style.display = "none";
+		}
+	},
+
+	$ON_PASTE_HTML : function(sHTML, oPSelection){
+		if(this.oApp.getEditingMode() != this.sMode) return;
+
+		var o = new TextRange(this.textarea);
+		o.paste(sHTML);
+		this.textarea.focus();
+	},
+
+	getIR : function(){
+		var sIR;
+		var sContent = this.textarea.value;
+
+		if(this.oApp.applyConverter)
+			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
+		else
+			sIR = sContent;
+
+		return sIR;
+	},
+
+	setIR : function(sIR){
+		var sContent;
+
+		if(this.oApp.applyConverter)
+			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
+		else
+			sContent = sIR;
+
+		this.textarea.value = sContent;
+	},
+
+	focus : function(){
+		this.textarea.focus();
+	}
+});
+
+var TextRange = function(oEl) {
+	this._o = oEl;
+};
+
+/**
+ * Selection for textfield
+ * @author NHN (developer@xpressengine.com)
+ */
+TextRange.prototype.getSelection = function() {
+	var obj = this._o;
+	var ret = [ -1, -1 ];
+
+	if (isNaN(this._o.selectionStart)) {
+		obj.focus();
+
+		// textarea support added by nagoon97
+		var range = document.body.createTextRange();
+		var rangeField = null;
+
+		rangeField = document.selection.createRange().duplicate();
+		range.moveToElementText(obj);
+		rangeField.collapse(true);
+		range.setEndPoint("EndToEnd", rangeField);
+		ret[0] = range.text.length;
+
+		rangeField = document.selection.createRange().duplicate();
+		range.moveToElementText(obj);
+		rangeField.collapse(false);
+		range.setEndPoint("EndToEnd", rangeField);
+		ret[1] = range.text.length;
+
+		obj.blur();
+	} else {
+		ret[0] = obj.selectionStart;
+		ret[1] = obj.selectionEnd;
+	}
+
+	return ret;
+};
+
+TextRange.prototype.setSelection = function(start, end) {
+
+	var obj = this._o;
+	if (typeof end == 'undefined') end = start;
+
+	if (obj.setSelectionRange) {
+
+		obj.setSelectionRange(start, end);
+
+	} else if (obj.createTextRange) {
+
+		var range = obj.createTextRange();
+
+		range.collapse(true);
+		range.moveStart("character", start);
+		range.moveEnd("character", end - start);
+		range.select();
+
+		obj.blur();
+	}
+
+};
+
+TextRange.prototype.copy = function() {
+
+	var r = this.getSelection();
+	return this._o.value.substring(r[0], r[1]);
+
+};
+
+TextRange.prototype.paste = function(sStr) {
+
+	var obj = this._o;
+	var sel = this.getSelection();
+
+	var value = obj.value;
+
+	var pre = value.substr(0, sel[0]);
+	var post = value.substr(sel[1]);
+
+	value = pre + sStr + post;
+	obj.value = value;
+
+	var n = 0;
+	if ( typeof document.body.style.maxHeight == "undefined" ) {
+		var a = pre.match( /\n/gi );
+		n = ( a != null ? a.length : 0 );
+	}
+	this.setSelection(sel[0] + sStr.length - n );
+
+};
+
+TextRange.prototype.cut = function() {
+	var r = this.copy();
+	this.paste('');
+
+	return r;
+};
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to WYSIWYG iframe
+ * @name hp_XE_EditingArea_WYSIWYG.js
+ */
+xe.XE_EditingArea_WYSIWYG = $.Class({
+	name : "XE_EditingArea_WYSIWYG",
+	status : xe.PLUGIN_STATUS["NOT_READY"],
+
+	sMode : "WYSIWYG",
+	iframe : null,
+	doc : null,
+
+	iLastUndoRecorded : 0,
+	iMinUndoInterval : 3000,
+
+	_nIFrameReadyCount : 50,
+
+	$init : function(iframe){
+		this.iframe = $.$(iframe);
+
+		this.initIframe();
+
+		this.elEditingArea = iframe;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oEditingArea = this.doc;
+		this.oApp.exec("REGISTER_EDITING_AREA", [this]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGWindow", $.fnBind(this.getWindow, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getWYSIWYGDocument", $.fnBind(this.getDocument, this)]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		// uncomment this line if you wish to use the IE-style cursor in FF
+		// this.getDocument().body.style.cursor = "text";
+
+		if($.browser.msie){
+			$(this.doc).bind('keydown', $.fnBind(
+				function(weEvent){
+					if(this.doc.selection.type.toLowerCase() == 'control' && weEvent.keyCode == 8)  {
+						this.oApp.exec("EXECCOMMAND", ['delete', false, false]);
+						weEvent.preventDefault(); weEvent.stopPropagation();
+					}
+				}
+			, this));
+			$(this.doc.body).bind('mousedown', $.fnBind(
+				function(weEvent){
+					this._oIERange = null;
+					this._bIERangeReset = true;
+				}
+			, this));
+			$(this.doc.body).bind('beforedeactivate', $.fnBind(
+				function(weEvent){
+					// without this, cursor won't make it inside a table.
+					// mousedown(_oIERange gets reset) -> beforedeactivate(gets fired for table) -> RESTORE_IE_SELECTION
+					if(this._bIERangeReset) return;
+
+					var tmpRange = this.getDocument().selection.createRange(0);
+					// Control range does not have parentElement
+					if(tmpRange.parentElement && tmpRange.parentElement() && tmpRange.parentElement().tagName == "INPUT"){
+						this._oIERange = this._oPrevIERange;
+					}else{
+						this._oIERange = tmpRange;
+					}
+				}
+			, this));
+			$(this.doc.body).bind('mouseup', $.fnBind(
+				function(weEvent){
+					this._bIERangeReset = false;
+				}
+			, this));
+		}
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		if(sMode == this.sMode){
+			this.iframe.style.display = "block";
+
+			this.oApp.exec("REFRESH_WYSIWYG", []);
+			this.oApp.exec("SET_EDITING_WINDOW", [this.getWindow()]);
+		}else{
+			this.iframe.style.display = "none";
+		}
+	},
+
+	$AFTER_CHANGE_EDITING_MODE : function(sMode, bNoFocus){
+		this._oIERange = null;
+	},
+
+	$ON_REFRESH_WYSIWYG : function(){
+		if(!$.browser.mozilla) return;
+
+		this._disableWYSIWYG();
+		this._enableWYSIWYG();
+	},
+
+	$ON_ENABLE_WYSIWYG : function(){
+		this._enableWYSIWYG();
+	},
+
+	$ON_DISABLE_WYSIWYG : function(){
+		this._disableWYSIWYG();
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(oEvent) {
+		// ctrl-left/right add/remove indent
+		if(!oEvent.ctrlKey) return;
+
+		switch(oEvent.keyCode) {
+			// outdent
+			case 37 :
+					this.oApp.exec("EXECCOMMAND",  ["outdent", false, false]);
+				break;
+			// indent
+			case 39 :
+					this.oApp.exec("EXECCOMMAND",  ["indent", false, false]);
+				break;
+			// h1 ~ h6, normal
+			case 49 :
+			case 50 :
+			case 51 :
+			case 52 :
+			case 53 :
+			case 54 :
+					this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, '<h'+(oEvent.keyCode-48)+'>']);
+				break;
+			default :
+				return;
+		}
+		oEvent.preventDefault(); oEvent.stopPropagation();
+
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
+		// 33, 34: page up/down, 35,36: end/home, 37,38,39,40: left, up, right, down
+		if(oEvent.keyCode == 229 || oEvent.keyCode == 13 || oEvent.altKey || oEvent.ctrlKey || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 16) return;
+		this._recordUndo(oEvent);
+	},
+
+	$ON_PASTE_HTML : function(sHTML, oPSelection){
+		if(this.oApp.getEditingMode() != this.sMode) return;
+
+		var oSelection = oPSelection || this.oApp.getSelection();
+		oSelection.pasteHTML(sHTML);
+
+		// every browser except for IE may modify the innerHTML when it is inserted
+		if(!$.browser.msie){
+			var sTmpBookmark = oSelection.placeStringBookmark();
+			this.oApp.getWYSIWYGDocument().body.innerHTML = this.oApp.getWYSIWYGDocument().body.innerHTML;
+			oSelection.moveToBookmark(sTmpBookmark);
+			oSelection.collapseToEnd();
+			oSelection.select();
+			oSelection.removeStringBookmark(sTmpBookmark);
+		}
+
+		this.oApp.exec("RECORD_UNDO_ACTION", ["INSERT HTML"]);
+	},
+
+	$AFTER_MSG_EDITING_AREA_RESIZE_ENDED : function(FnMouseDown, FnMouseMove, FnMouseUp){
+		this.oApp.exec("REFRESH_WYSIWYG", []);
+	},
+
+	$ON_RESTORE_IE_SELECTION : function(){
+		if(this._oIERange){
+			this._oIERange.select();
+			this._oPrevIERange = this._oIERange;
+			this._oIERange = null;
+		}
+	},
+
+	initIframe : function(){
+		try {
+			this.doc = this.iframe.contentWindow.document;
+			if (this.doc == null || this.doc.location.href == 'about:blank') {
+				throw new Error('Access denied');
+			}
+
+			this._enableWYSIWYG();
+
+			this.status = xe.PLUGIN_STATUS["READY"];
+		} catch(e) {
+			if(this._nIFrameReadyCount-- > 0){
+				setTimeout($.fnBind(this.initIframe, this), 100);
+			}else{
+				throw("iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ");
+			}
+		}
+	},
+
+	getIR : function(){
+		var sContent = this.doc.body.innerHTML;
+		var sIR;
+
+
+		if(this.oApp.applyConverter)
+			sIR = this.oApp.applyConverter(this.sMode+"_TO_IR", sContent);
+		else
+			sIR = sContent;
+
+		return sIR;
+	},
+
+	setIR : function(sIR){
+		var sContent;
+		if(this.oApp.applyConverter)
+			sContent = this.oApp.applyConverter("IR_TO_"+this.sMode, sIR);
+		else
+			sContent = sIR;
+
+		this.doc.body.innerHTML = sContent;
+
+		if($.browser.mozilla){
+			if(this.doc.body.innerHTML == "") this.doc.body.innerHTML = "<br>";
+		}
+	},
+
+	getWindow : function(){
+		return this.iframe.contentWindow;
+	},
+
+	getDocument : function(){
+		return this.iframe.contentWindow.document;
+	},
+
+	focus : function(){
+		//this.getWindow().focus();
+		//this.oApp.exec("RESTORE_IE_SELECTION", []);
+	},
+
+	_recordUndo : function(oKeyInfo){
+		var curTime = new Date();
+		if(curTime-this.iLastUndoRecorded < this.iMinUndoInterval) return;
+		this.oApp.exec("RECORD_UNDO_ACTION", ["KEYPRESS"]);
+
+		this.iLastUndoRecorded = new Date();
+
+		this.prevKeyCode = oKeyInfo.keyCode;
+	},
+
+	_enableWYSIWYG : function(){
+		if ($.browser.msie){
+			this.doc.body.disabled = true;
+			this.doc.body.contentEditable = true;
+			this.doc.body.removeAttribute('disabled');
+		} else {
+			this.doc.designMode = "on";
+		}
+	},
+
+	_disableWYSIWYG : function(){
+		if ($.browser.msie){
+			this.doc.body.contentEditable = false;
+		} else {
+			this.doc.designMode = "off";
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to resizing the editing area vertically
+ * @name hp_XE_EditingAreaVerticalResizer.js
+ */
+xe.XE_EditingAreaVerticalResizer = $.Class({
+	name : "XE_EditingAreaVerticalResizer",
+	oResizeGrip : null,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this);
+		this.$FnMouseUp = $.fnBind(this._mouseup, this);
+
+		$(this.oResizeGrip).bind("mousedown", this.$FnMouseDown);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+
+		this.oResizeGrip = $(".xpress_xeditor_editingArea_verticalResizer", oAppContainer).get(0);
+	},
+
+	_mousedown : function(oEvent){
+		this.iStartHeight = oEvent.clientY;
+
+		$(document).bind("mousemove", this.$FnMouseMove);
+		$(document).bind("mouseup", this.$FnMouseUp);
+
+		this.oApp.exec("MSG_EDITING_AREA_RESIZE_STARTED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
+	},
+
+	_mousemove : function(oEvent){
+		var iHeightChange = oEvent.clientY - this.iStartHeight;
+
+		this.oApp.exec("RESIZE_EDITING_AREA_BY", [0, iHeightChange]);
+	},
+
+	_mouseup : function(oEvent){
+		$(document).unbind("mousemove", this.$FnMouseMove);
+		$(document).unbind("mouseup", this.$FnMouseUp);
+
+		this.oApp.exec("MSG_EDITING_AREA_RESIZE_ENDED", [this.$FnMouseDown, this.$FnMouseMove, this.$FnMouseUp]);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the basic editor commands
+ * @name hp_XE_ExecCommand.js
+ */
+xe.XE_ExecCommand = $.Class({
+	name : "XE_ExecCommand",
+	oEditingArea : null,
+
+	$init : function(oEditingArea){
+		this.oEditingArea = oEditingArea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		// the right document will be available only when the src is completely loaded
+		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
+			this.oEditingArea = this.oEditingArea.contentWindow.document;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+b", "EXECCOMMAND", ["bold", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+u", "EXECCOMMAND", ["underline", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+i", "EXECCOMMAND", ["italic", false, false]]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+d", "EXECCOMMAND", ["strikethrough", false, false]]);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["bold", "click", "EXECCOMMAND", ["bold", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["underline", "click", "EXECCOMMAND", ["underline", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["italic", "click", "EXECCOMMAND", ["italic", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["lineThrough", "click", "EXECCOMMAND", ["strikethrough", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["superscript", "click", "EXECCOMMAND", ["superscript", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["subscript", "click", "EXECCOMMAND", ["subscript", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyleft", "click", "EXECCOMMAND", ["justifyleft", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifycenter", "click", "EXECCOMMAND", ["justifycenter", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyright", "click", "EXECCOMMAND", ["justifyright", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["justifyfull", "click", "EXECCOMMAND", ["justifyfull", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["orderedlist", "click", "EXECCOMMAND", ["insertorderedlist", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["unorderedlist", "click", "EXECCOMMAND", ["insertunorderedlist", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["outdent", "click", "EXECCOMMAND", ["outdent", false, false]]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["indent", "click", "EXECCOMMAND", ["indent", false, false]]);
+	},
+
+	$BEFORE_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		this._bOnlyCursorChanged = false;
+
+		this.oApp.exec("FOCUS", []);
+
+		if(sCommand.match(/^bold|underline|italic|strikethrough|superscript|subscript$/i)){
+			var oSelection = this.oApp.getSelection();
+			if(oSelection.collapsed) this._bOnlyCursorChanged = true;
+		}
+
+		if(!this._bOnlyCursorChanged){
+			this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", [sCommand]);
+		}
+	},
+
+	$ON_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		bUserInterface = (bUserInterface == "" || bUserInterface)?bUserInterface:false;
+		vValue = (vValue == "" || vValue)?vValue:false;
+
+		this.oEditingArea.execCommand(sCommand, bUserInterface, vValue);
+	},
+
+	$AFTER_EXECCOMMAND : function(sCommand, bUserInterface, vValue){
+		if(!this._bOnlyCursorChanged){
+			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", [sCommand]);
+		}
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to wrapping the sentence around with a <P> tag when enter key is pressed
+ * @name hp_XE_WYSIWYGEnterKey.js
+ */
+xe.XE_WYSIWYGEnterKey = $.Class({
+	name : "XE_WYSIWYGEnterKey",
+	// IE/Opera do not need this
+	unsupportedBrowser : ['ie', 'opera'],
+	oEditingArea : null,
+
+	$init : function(oEditingArea){
+		this.oEditingArea = oEditingArea;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		// the right document will be available only when the src is completely loaded
+		if(this.oEditingArea && this.oEditingArea.tagName == "IFRAME")
+			this.oEditingArea = this.oEditingArea.contentWindow.document;
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYDOWN : function(oEvent){
+		if(this.oApp.getEditingMode() != "WYSIWYG") return;
+
+		if(oEvent.shiftKey) return;
+
+		if(oEvent.keyCode == 13){
+			var oSelection = this.oApp.getSelection();
+			var sBM = oSelection.placeStringBookmark();
+			var oLineInfo = oSelection.getLineInfo();
+			var oStart = oLineInfo.oStart;
+			var oEnd = oLineInfo.oEnd;
+
+			//top.document.title = oStart.oNode.tagName+":"+oStart.oNode.nodeValue+", "+oEnd.oNode.tagName+":"+oEnd.oNode.nodeValue+"::"+oStart.bParentBreak+", "+oStart.oLineBreaker.tagName;
+
+			// line broke by sibling
+			// or
+			// the parent line breaker is just a block container
+			if(!oStart.bParentBreak || oSelection.rxBlockContainer.test(oStart.oLineBreaker.tagName)){
+				oEvent.stopPropagation();
+				oEvent.preventDefault();
+
+				var oSWrapper = this.oEditingArea.createElement("P");
+				oSelection.moveToBookmark(sBM);
+				oSelection.setStartBefore(oStart.oNode);
+				oSelection.surroundContents(oSWrapper);
+
+				oSelection.collapseToEnd();
+
+				var oEWrapper = this.oEditingArea.createElement("P");
+				oSelection.setEndAfter(oEnd.oNode);
+				oSelection.surroundContents(oEWrapper);
+
+				oSelection.removeStringBookmark(sBM);
+
+				if(oSWrapper.innerHTML == "") oSWrapper.innerHTML = "<br>";
+				if(oEWrapper.innerHTML == "") oEWrapper.innerHTML = "<br>";
+
+				if(oEWrapper.nextSibling && oEWrapper.nextSibling.tagName == "BR") oEWrapper.parentNode.removeChild(oEWrapper.nextSibling);
+
+				oSelection.selectNodeContents(oEWrapper);
+				oSelection.collapseToStart();
+				oSelection.select();
+				this.oApp.exec("CHECK_STYLE_CHANGE", []);
+			}else{
+				oSelection.removeStringBookmark(sBM);
+			}
+		}
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to styling the font
+ * @name hp_XE_WYSIWYGStyler.js
+ * @required XE_EditingArea_WYSIWYG, XpressRangeManager
+ */
+xe.XE_WYSIWYGStyler = $.Class({
+	name : "XE_WYSIWYGStyler",
+
+	$PRECONDITION : function(sFullCommand, aArgs){
+		return (this.oApp.getEditingMode() == "WYSIWYG");
+	},
+
+	$ON_SET_WYSIWYG_STYLE : function(oStyles){
+		var oSelection = this.oApp.getSelection();
+
+		// style cursor
+		if(oSelection.collapsed){
+			var oSpan = this.oApp.getWYSIWYGDocument().createElement("SPAN");
+			oSelection.insertNode(oSpan);
+			oSpan.innerHTML = unescape("%uFEFF");
+
+			var sValue;
+			for(var sName in oStyles){
+				sValue = oStyles[sName];
+
+				if(typeof sValue != "string") continue;
+
+				oSpan.style[sName] = sValue;
+			}
+
+			oSelection.selectNodeContents(oSpan);
+			oSelection.collapseToEnd();
+			oSelection._window.focus();
+			oSelection._window.document.body.focus();
+			oSelection.select();
+
+			// FF3 will actually display %uFEFF when it is followed by a number AND certain font-family is used(like Gulim), so remove the chcaracter for FF3
+			if($.browser.mozilla && $.browser.nVersion == 3)
+				oSpan.innerHTML = "";
+
+			return;
+		}
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["FONT STYLE"]);
+
+		oSelection.styleRange(oStyles);
+		oSelection._window.focus();
+		oSelection.select();
+
+		this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["FONT STYLE"]);
+	}
+});
+//}
+
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to detecting the style change
+ * @name hp_XE_WYSIWYGStyleGetter.js
+ */
+xe.XE_WYSIWYGStyleGetter = $.Class({
+	name : "XE_WYSIWYGStyleGetter",
+
+	hKeyUp : null,
+
+	getStyleInterval : 200,
+
+	oStyleMap : {
+		fontFamily : {
+			type : "Value",
+			css : "fontFamily"
+		},
+		fontSize : {
+			type : "Value",
+			css : "fontSize"
+		},
+		lineHeight : {
+			type : "Value",
+			css : "lineHeight",
+			converter : function(sValue, oStyle){
+				if(!sValue.match(/px$/)) return sValue;
+
+				return Math.ceil((parseInt(sValue)/parseInt(oStyle.fontSize))*10)/10;
+			}
+		},
+		bold : {
+			command : "bold"
+		},
+		underline : {
+			command : "underline"
+		},
+		italic : {
+			command : "italic"
+		},
+		lineThrough : {
+			command : "strikethrough"
+		},
+		superscript : {
+			command : "superscript"
+		},
+		subscript : {
+			command : "subscript"
+		},
+		justifyleft : {
+			command : "justifyleft"
+		},
+		justifycenter : {
+			command : "justifycenter"
+		},
+		justifyright : {
+			command : "justifyright"
+		},
+		justifyfull : {
+			command : "justifyfull"
+		},
+		orderedlist : {
+			command : "insertorderedlist"
+		},
+		unorderedlist : {
+			command : "insertunorderedlist"
+		}
+	},
+
+	$init : function(){
+		this.oStyle = this._getBlankStyle();
+	},
+
+	$PRECONDITION : function(){
+		if(this.oApp.getEditingMode() != "WYSIWYG") return false;
+
+		return true;
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oDocument = this.oApp.getWYSIWYGDocument();
+		this.oApp.exec("ADD_APP_PROPERTY", ["getCurrentStyle", $.fnBind(this.getCurrentStyle, this)]);
+	},
+
+	$ON_EVENT_EDITING_AREA_MOUSEUP : function(oEvnet){
+		if(this.hKeyUp) clearTimeout(this.hKeyUp);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	$ON_EVENT_EDITING_AREA_KEYUP : function(oEvent){
+		/*
+		backspace 8
+		page up 33
+		page down 34
+		end 35
+		home 36
+		left arrow 37
+		up arrow 38
+		right arrow 39
+		down arrow 40
+		insert 45
+		delete 46
+		*/
+		if(!(oEvent.keyCode == 8 || (oEvent.keyCode >= 33 && oEvent.keyCode <= 40) || oEvent.keyCode == 45 || oEvent.keyCode == 46)) return;
+
+		if(this.hKeyUp) clearTimeout(this.hKeyUp);
+
+		this.hKeyUp = setTimeout($.fnBind(this.oApp.exec, this.oApp, "CHECK_STYLE_CHANGE", []), this.getStyleInterval);
+	},
+
+	$ON_CHECK_STYLE_CHANGE : function(){
+		this._getStyle();
+	},
+
+	$ON_RESET_STYLE_STATUS : function(){
+		var oBlankStyle = this._getBlankStyle();
+		for(var sAttributeName in oBlankStyle)
+			this.oApp.exec("SET_STYLE_STATUS", [sAttributeName, oBlankStyle[sAttributeName]]);
+	},
+
+	getCurrentStyle : function(){
+		return this.oStyle;
+	},
+
+	_check_style_change : function(){
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	_getBlankStyle : function(){
+		var oBlankStyle = {};
+		for(var attributeName in this.oStyleMap){
+			if(this.oStyleMap[attributeName].type == "Value")
+				oBlankStyle[attributeName] = "";
+			else
+				oBlankStyle[attributeName] = 0;
+		}
+
+		return oBlankStyle;
+	},
+
+	_getStyle : function(){
+		var oSelection = this.oApp.getSelection();
+
+		var funcFilter = function(oNode){
+			if (!oNode.childNodes || oNode.childNodes.length == 0)
+				return true;
+			else
+				return false;
+		}
+
+		var aBottomNodes = oSelection.getNodes(false, funcFilter);
+
+		var oStyle, oBaseStyle, oTmpStyle, attributeName;
+		if(aBottomNodes.length == 0){
+			oStyle = this._getStyleOf(oSelection.commonAncestorContainer);
+		}else{
+			oStyle = this._getStyleOf(aBottomNodes[0]);
+		}
+
+		for(attributeName in oStyle){
+			if(this.oStyleMap[attributeName].converter){
+				oStyle[attributeName] = this.oStyleMap[attributeName].converter(oStyle[attributeName], oStyle);
+			}
+
+			if(this.oStyle[attributeName] != oStyle[attributeName])
+				this.oApp.exec("MSG_STYLE_CHANGED", [attributeName, oStyle[attributeName]]);
+		}
+
+		this.oStyle = oStyle;
+	},
+
+	_getStyleOf : function(oNode){
+		var oStyle = this._getBlankStyle();
+
+		// this must not happen
+		if(!oNode) return oStyle;
+
+		if(oNode.nodeType == 3) oNode = oNode.parentNode;
+
+		var welNode = $(oNode);
+		var attribute, cssName;
+		for(var styleName in this.oStyle){
+			attribute = this.oStyleMap[styleName];
+
+			if(attribute.type && attribute.type == "Value"){
+				if(attribute.css){
+					var sValue = welNode.css(attribute.css);
+
+					if(styleName == "fontFamily"){
+						sValue = sValue.split(/,/)[0];
+					}
+
+					oStyle[styleName] = sValue;
+				}else{
+					if(attribute.command){
+						try{
+							oStyle[styleName] = this.oDocument.queryCommandState(attribute.command);
+						}catch(e){}
+					}else{
+						// todo
+					}
+				}
+			}else{
+				if(attribute.command){
+					try{
+						if(this.oDocument.queryCommandState(attribute.command)){
+							oStyle[styleName] = 1;
+						}else{
+							oStyle[styleName] = 0;
+						}
+					}catch(e){}
+				}else{
+					// todo
+				}
+			}
+		}
+		return oStyle;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font size using Select element
+ * @name hp_XE_FontSizeWithSelectUI.js
+ */
+xe.XE_FontSizeWithSelectUI = $.Class({
+	name : "XE_FontSizeWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFontSizeSelect = $("SELECT.xpress_xeditor_ui_fontSize_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFontSizeSelect, "change", "SET_FONTSIZE_FROM_SELECT_UI");
+		this.elFontSizeSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "fontSize"){
+			this.elFontSizeSelect.value = sAttributeValue;
+			if(this.elFontSizeSelect.selectedIndex < 0) this.elFontSizeSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_FONTSIZE_FROM_SELECT_UI : function(){
+		var sFontSize = this.elFontSizeSelect.value;
+		if(!sFontSize) return;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontSize":sFontSize}]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font name using Select element
+ * @name hp_XE_FontNameWithSelectUI.js
+ */
+xe.XE_FontNameWithSelectUI = $.Class({
+	name : "XE_FontNameWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFontNameSelect = $("SELECT.xpress_xeditor_ui_fontName_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFontNameSelect, "change", "SET_FONTNAME_FROM_SELECT_UI");
+		this.elFontNameSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "fontFamily"){
+			this.elFontNameSelect.value = sAttributeValue.toLowerCase();
+			if(this.elFontNameSelect.selectedIndex < 0) this.elFontNameSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_FONTNAME_FROM_SELECT_UI : function(){
+		var sFontName = this.elFontNameSelect.value;
+		if(!sFontName) return;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"fontFamily":sFontName}]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to setting/changing the lineheight
+ * @name hp_XE_LineHeight.js
+ */
+xe.XE_LineHeight = $.Class({
+	name : "XE_LineHeight",
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+	},
+
+	$ON_SET_LINEHEIGHT : function(nLineHeight){
+		this.setLineHeight(nLineHeight);
+	},
+
+	getLineHeight : function(){
+		var nodes = this._getSelectedNodes(false);
+
+		var curWrapper, prevWrapper;
+		var iCurHeight, iHeight;
+
+		if(nodes.length == 0) return -1;
+
+		var iLength = nodes.length;
+
+		if(iLength == 0){
+			iHeight = -1;
+		}else{
+			prevWrapper = this._getLineWrapper(nodes[0]);
+			iHeight = this._getWrapperLineheight(prevWrapper);
+		}
+
+		var firstNode = this.oSelection.getStartNode();
+
+		if(iHeight > 0){
+			for(var i=1; i<iLength; i++){
+				if(this._isChildOf(nodes[i], curWrapper)) continue;
+				if(!nodes[i]) continue;
+
+				curWrapper = this._getLineWrapper(nodes[i]);
+				if(curWrapper == prevWrapper) continue;
+
+				curHeight = this._getWrapperLineheight(curWrapper);
+
+				if(curHeight != iHeight){
+					iHeight = -1;
+					break;
+				}
+
+				prevWrapper = curWrapper;
+			}
+		}
+
+		curWrapper = this._getLineWrapper(nodes[iLength-1]);
+
+		var lastNode = this.oSelection.getEndNode();
+
+		selectText = $.fnBind(function(firstNode, lastNode){
+			this.oSelection.setEndNodes(firstNode, lastNode);
+			this.oSelection.select();
+		}, this, firstNode, lastNode);
+
+		setTimeout(selectText, 100);
+
+		return iHeight;
+	},
+
+	// height in percentage. For example pass 1 to set the line height to 100% and 1.5 to set it to 150%
+	setLineHeight : function(height) {
+		thisRef = this;
+
+		function _setLineheight(div, height){
+			if(!div){
+				// try to wrap with P first
+				try{
+					div = thisRef.oSelection.surroundContentsWithNewNode("P");
+				// if the range contains a block-level tag, wrap it with a DIV
+				}catch(e){
+					div = thisRef.oSelection.surroundContentsWithNewNode("DIV");
+				}
+			}
+
+			div.style.lineHeight = height;
+
+			return div;
+		}
+
+		function isInBody(node){
+			while(node && node.tagName != "BODY"){
+				node = xe.DOMFix.parentNode(node);
+			}
+			if(!node) return false;
+
+			return true;
+		}
+
+		var nodes = this._getSelectedNodes(false);
+		if(nodes.length == 0){
+			return;
+		}
+
+		var curWrapper, prevWrapper;
+		var iLength = nodes.length;
+
+		this.oApp.exec("RECORD_UNDO_BEFORE_ACTION", ["LINEHEIGHT"]);
+
+		prevWrapper = this._getLineWrapper(nodes[0]);
+		prevWrapper = _setLineheight(prevWrapper, height);
+
+		var startNode = prevWrapper;
+		var endNode = prevWrapper;
+
+		for(var i=1; i<iLength; i++){
+			// Skip the node if a copy of the node were wrapped and the actual node no longer exists within the document.
+			try{
+				if(!isInBody(xe.DOMFix.parentNode(nodes[i]))) continue;
+			}catch(e){continue;}
+
+			if(this._isChildOf(nodes[i], curWrapper)) continue;
+
+			curWrapper = this._getLineWrapper(nodes[i]);
+
+			if(curWrapper == prevWrapper) continue;
+
+			curWrapper = _setLineheight(curWrapper, height);
+
+			prevWrapper = curWrapper;
+		}
+
+		endNode = curWrapper || startNode;
+
+		setTimeout($.fnBind(function(startNode, endNode){
+			this.oSelection.setEndNodes(startNode, endNode);
+			this.oSelection.select();
+			this.oApp.exec("RECORD_UNDO_AFTER_ACTION", ["LINEHEIGHT"]);
+		}, this, startNode, endNode), 100);
+	},
+	_getSelectedNodes : function(bDontUpdate){
+		if(!bDontUpdate)
+			this.oSelection = this.oApp.getSelection();
+
+		if(this.oSelection.collapsed) this.oSelection.selectNode(this.oSelection.commonAncestorContainer);
+
+		var nodes = this.oSelection.getTextNodes();
+
+		if(nodes.length == 0){
+			var tmp = this.oSelection.getStartNode();
+			if(tmp){
+				nodes[0] = tmp;
+			}else{
+				nodes = [];
+			}
+		}
+
+		return nodes;
+	},
+	_getWrapperLineheight : function(div){
+		var iLineHeight = '';
+		if(div && div.style.lineHeight){
+			iLineHeight = div.style.lineHeight;
+		}else{
+			div = this.oSelection.commonAncesterContainer;
+			while(div && !this.oSelection.rxLineBreaker.test(div.tagName)){
+				if(div && div.style.lineHeight){
+					iLineHeight = div.style.lineHeight;
+					break;
+				}
+				div = xe.DOMFix.parentNode(div);
+			}
+		}
+
+		return iLineHeight;
+	},
+
+	_isChildOf : function(node, container){
+		while(node && node.tagName != "BODY"){
+			if(node == container) return true;
+			node = xe.DOMFix.parentNode(node);
+		}
+
+		return false;
+	},
+ 	_getLineWrapper : function(node){
+		var oTmpSelection = this.oApp.getEmptySelection();
+		oTmpSelection.selectNode(node);
+		var oLineInfo = oTmpSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		var a, b;
+		var breakerA, breakerB;
+		var div = null;
+
+		a = oStart.oNode;
+		breakerA = oStart.oLineBreaker;
+		b = oEnd.oNode;
+		breakerB = oEnd.oLineBreaker;
+
+		this.oSelection.setEndNodes(a, b);
+
+		if(breakerA == breakerB){
+			if(breakerA.tagName == "P" || breakerA.tagName == "DIV"){
+				div = breakerA;
+			}else{
+				this.oSelection.setEndNodes(breakerA.firstChild, breakerA.lastChild);
+			}
+		}
+
+		return div;
+ 	}
+ });
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the lineheight using Select element
+ * @name hp_XE_LineHeightWithSelectUI.js
+ */
+xe.XE_LineHeightWithSelectUI = $.Class({
+	name : "XE_LineHeightWithSelectUI",
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elLineHeightSelect = $("SELECT.xpress_xeditor_ui_lineHeight_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elLineHeightSelect, "change", "SET_LINEHEIGHT_FROM_SELECT_UI");
+		this.elLineHeightSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		if(sAttributeName == "lineHeight"){
+			this.elLineHeightSelect.value = sAttributeValue;
+			if(this.elLineHeightSelect.selectedIndex < 0) this.elLineHeightSelect.selectedIndex = 0;
+		}
+	},
+
+	$ON_SET_LINEHEIGHT_FROM_SELECT_UI : function(){
+		var nLineHeight = this.elLineHeightSelect.value;
+		if(!nLineHeight) return;
+
+		this.elLineHeightSelect.selectedIndex = 0;
+		this.oApp.exec("SET_LINEHEIGHT", [nLineHeight]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+}).extend(xe.XE_LineHeight);
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations directly related to the color palette
+ * @name hp_XE_ColorPalette.js
+ */
+ xe.XE_ColorPalette = $.Class({
+	name : "XE_ColorPalette",
+	rxRGBColorPattern : /rgb\((\d+), ?(\d+), ?(\d+)\)/i,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		this.elColorPaletteLayer = $("UL.xpress_xeditor_color_palette", oAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elColorPaletteLayer, "click", "EVENT_MOUSEUP_COLOR_PALETTE");
+	},
+
+	$ON_SHOW_COLOR_PALETTE : function(sCallbackCmd, oLayerContainer){
+		this.sCallbackCmd = sCallbackCmd;
+		this.oLayerContainer = oLayerContainer;
+
+		this.oLayerContainer.insertBefore(this.elColorPaletteLayer, null);
+
+		this.elColorPaletteLayer.style.display = "block";
+	},
+
+	$ON_HIDE_COLOR_PALETTE : function(){
+		this.elColorPaletteLayer.style.display = "none";
+	},
+
+	$ON_COLOR_PALETTE_APPLY_COLOR : function(sColorCode){
+		if(this.rxRGBColorPattern.test(sColorCode)){
+
+			function dec2Hex(sDec){
+				var sTmp = parseInt(sDec).toString(16);
+				if(sTmp.length<2) sTmp = "0"+sTmp;
+				return sTmp.toUpperCase();
+			}
+
+			var sR = dec2Hex(RegExp.$1);
+			var sG = dec2Hex(RegExp.$2);
+			var sB = dec2Hex(RegExp.$3);
+			sColorCode = "#"+sR+sG+sB;
+		}
+		this.oApp.exec(this.sCallbackCmd, [sColorCode]);
+	},
+
+	$ON_EVENT_MOUSEUP_COLOR_PALETTE : function(oEvent){
+		var elButton = oEvent.target;
+		if(! elButton.style.backgroundColor) return;
+
+		this.oApp.exec("COLOR_PALETTE_APPLY_COLOR", [elButton.style.backgroundColor]);
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the font color
+ * @name hp_XE_FontColor.js
+ */
+xe.XE_FontColor = $.Class({
+	name : "XE_FontColor",
+	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = $("DIV.xpress_xeditor_fontcolor_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["fontColor", "click", "TOGGLE_FONTCOLOR_LAYER"]);
+	},
+
+	$ON_TOGGLE_FONTCOLOR_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_FONTCOLOR", this.elDropdownLayer]]);
+	},
+
+	$ON_APPLY_FONTCOLOR : function(sFontColor){
+		if(!this.rxColorPattern.test(sFontColor)){
+			alert(this.oApp.$MSG("XE_FontColor.invalidColorCode"));
+			return;
+		}
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [{"color":sFontColor}]);
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of changing the background color
+ * @name hp_XE_BGColor.js
+ */
+xe.XE_BGColor = $.Class({
+	name : "XE_BGColor",
+	rxColorPattern : /^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = $("DIV.xpress_xeditor_bgcolor_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["bgColor", "click", "TOGGLE_BGCOLOR_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_BGCOLOR", []);
+	},
+
+	$ON_TOGGLE_BGCOLOR_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer, null, "SHOW_COLOR_PALETTE", ["APPLY_BGCOLOR", this.elDropdownLayer]]);
+	},
+
+	$ON_EVENT_APPLY_BGCOLOR : function(weEvent){
+		var elButton = weEvent.target;
+
+		// Safari/Chrome/Opera may capture the event on Span
+		if(elButton.tagName == "SPAN") elButton = elButton.parentNode;
+		if(elButton.tagName != "BUTTON") return;
+
+		var sBGColor, sFontColor;
+
+		sBGColor = elButton.style.backgroundColor;
+		sFontColor = elButton.style.color;
+
+		this.oApp.exec("APPLY_BGCOLOR", [sBGColor, sFontColor]);
+	},
+
+	$ON_APPLY_BGCOLOR : function(sBGColor, sFontColor){
+		if(!this.rxColorPattern.test(sBGColor)){
+			alert(this.oApp.$MSG("XE_BGColor.invalidColorCode"));
+			return;
+		}
+
+		var oStyle = {"backgroundColor": sBGColor}
+		if(sFontColor) oStyle.color = sFontColor;
+
+		this.oApp.exec("SET_WYSIWYG_STYLE", [oStyle]);
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to quote
+ * @name hp_XE_Quote.js
+ * @required XE_EditingArea_WYSIWYG
+ */
+xe.XE_Quote = $.Class({
+	name : "XE_Quote",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elDropdownLayer = $("DIV.xpress_xeditor_blockquote_layer", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY: function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["quote", "click", "TOGGLE_BLOCKQUOTE_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_APPLY_SEDITOR_BLOCKQUOTE", []);
+	},
+
+	$ON_TOGGLE_BLOCKQUOTE_LAYER : function(){
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_EVENT_APPLY_SEDITOR_BLOCKQUOTE : function(weEvent){
+		var elButton = weEvent.target;
+		if(elButton.tagName != "BUTTON") return;
+
+		var sClass = elButton.parentNode.className;
+
+		if(sClass != "q8")
+			this._wrapBlock("BLOCKQUOTE", sClass);
+		else
+			this._unwrapBlock("BLOCKQUOTE");
+
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	_unwrapBlock : function(tag){
+		var oSelection = this.oApp.getSelection();
+		var oC = oSelection.commonAncestorContainer;
+
+		while(oC && oC.tagName != tag) oC = oC.parentNode;
+		if(!oC) return;
+
+		while(oC.firstChild) oC.parentNode.insertBefore(oC.firstChild, oC);
+
+		oC.parentNode.removeChild(oC);
+	},
+
+	_wrapBlock : function(tag, className){
+		var oSelection = this.oApp.getSelection();
+		var oLineInfo = oSelection.getLineInfo();
+		var oStart = oLineInfo.oStart;
+		var oEnd = oLineInfo.oEnd;
+
+		var rxDontUseAsWhole = /BODY|TD|LI/i;
+
+		var oStartNode, oEndNode;
+
+		if(oStart.bParentBreak && !rxDontUseAsWhole.test(oStart.oLineBreaker.tagName)) oStartNode = oStart.oNode.parentNode;
+		else oStartNode = oStart.oNode;
+
+		if(oEnd.bParentBreak && !rxDontUseAsWhole.test(oEnd.oLineBreaker.tagName)) oEndNode = oEnd.oNode.parentNode;
+		else oEndNode = oEnd.oNode;
+
+		oSelection.setStartBefore(oStartNode);
+		oSelection.setEndAfter(oEndNode);
+
+		var oNode = this._expandToTableStart(oSelection, oEndNode);
+		if(oNode){
+			oEndNode = oNode;
+			oSelection.setEndAfter(oNode);
+		}
+
+		oNode = this._expandToTableStart(oSelection, oStartNode);
+		if(oNode){
+			oStartNode = oNode;
+			oSelection.setStartBefore(oNode);
+		}
+
+		oNode = oStartNode;
+		var oC = oSelection.commonAncestorContainer;
+
+		// find the insertion position for the formatting tag right beneath the common ancestor container
+		while(oNode && oNode != oC && oNode.parentNode != oC) oNode = oNode.parentNode;
+
+		oFormattingNode = oSelection._document.createElement(tag);
+		if(className) oFormattingNode.className = className;
+
+		if(oNode == oC){
+			oC.insertBefore(oFormattingNode, oC.firstChild);
+		}else{
+			oC.insertBefore(oFormattingNode, oNode);
+		}
+
+		oSelection.setStartAfter(oFormattingNode);
+
+		oSelection.setEndAfter(oEndNode);
+		oSelection.surroundContents(oFormattingNode);
+
+		var aNodes = oFormattingNode.childNodes;
+		var oInsertionPoint;
+		for(var i=aNodes.length-1; i>=0; i--){
+			if(aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR"){
+				var oP = oSelection._document.createElement("P");
+				oInsertionPoint = aNodes[i].nextSibling;
+				while(i>=0 && aNodes[i] && (aNodes[i].nodeType == 3 || aNodes[i].tagName == "BR")){
+					oP.insertBefore(aNodes[i--], oP.firstChild);
+				}
+				oFormattingNode.insertBefore(oP, oInsertionPoint);
+				i++;
+			}
+		}
+
+		if(oFormattingNode && oFormattingNode.parentNode){
+			var oP = oSelection._document.createElement("P");
+			oP.innerHTML = unescape("<br/>");
+			oFormattingNode.parentNode.insertBefore(oP, oFormattingNode.nextSibling);
+		}
+
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Block Quote"]);
+
+		return oFormattingNode;
+	},
+
+	_expandToTableStart : function(oSelection, oNode){
+		var oC = oSelection.commonAncestorContainer;
+		var oResultNode = null;
+
+		var bLastIteration = false;
+		while(oNode && !bLastIteration){
+			if(oNode == oC) bLastIteration = true;
+
+			if(/TBODY|TFOOT|THEAD|TR/i.test(oNode.tagName)){
+				oResultNode = this._getTableRoot(oNode);
+				break;
+			}
+			oNode = oNode.parentNode;
+		}
+
+		return oResultNode;
+	},
+
+	_getTableRoot : function(oNode){
+		while(oNode && oNode.tagName != "TABLE") oNode = oNode.parentNode;
+
+		return oNode;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to inserting special characters
+ * @name hp_XE_SCharacter.js
+ * @required XpressRangeManager
+ */
+xe.XE_SCharacter = $.Class({
+	name : "XE_SCharacter",
+
+	$init : function(oAppContainer){
+		this.bIE = $.browser.msie;
+
+		this._assignHTMLObjects(oAppContainer);
+
+		this.charSet = [];
+		this.charSet[0] = unescape('FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[1] = unescape('%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[2] = unescape('3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[3] = unescape('3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[4] = unescape('0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+		this.charSet[5] = unescape('3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6').replace(/(\S{4})/g, function(a){return "%u"+a}).split(' ');
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		oAppContainer = $.$(oAppContainer) || document;
+
+		this.elDropdownLayer = $("DIV.xpress_xeditor_sCharacter_layer", oAppContainer).get(0);
+
+		this.oTextField = $("INPUT", this.elDropdownLayer).get(0);
+		this.oInsertButton = $("+ BUTTON", this.oTextField).get(0);
+		this.aCloseButton = $("BUTTON.close", this.elDropdownLayer).get();
+		this.aSCharList = $(".list", this.elDropdownLayer).get();
+		var oLabelUL = $(">UL", this.elDropdownLayer).get(0);
+		this.aLabelA = $("A", oLabelUL).get();
+	},
+
+	$ON_MSG_APP_READY : function(){
+		var funcInsert = $.fnBind(this.oApp.exec, this.oApp, "INSERT_SCHARACTERS", [this.oTextField.value]);
+		$(this.oInsertButton).click(funcInsert, this);
+
+		this.oApp.exec("SET_SCHARACTER_LIST", [this.charSet]);
+
+		for(var i=0; i<this.aLabelA.length; i++){
+			var func = $.fnBind(this.oApp.exec, this.oApp, "CHANGE_SCHARACTER_SET", [i]);
+			$(this.aLabelA[i]).mousedown(func);
+
+			this._stopBrowserEvent(this.aLabelA[i], "click");
+		}
+
+		for(var i=0; i<this.aCloseButton.length; i++){
+			this.oApp.registerBrowserEvent(this.aCloseButton[i], "click", "HIDE_ACTIVE_LAYER", []);
+		}
+
+		this.oApp.registerBrowserEvent(this.elDropdownLayer, "click", "EVENT_SCHARACTER_CLICKED", []);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["sCharacter", "click", "TOGGLE_SCHARACTER_LAYER"]);
+	},
+
+	$ON_TOGGLE_SCHARACTER_LAYER : function(){
+		this.oTextField.value = "";
+		this.oSelection = this.oApp.getSelection();
+
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_EVENT_SCHARACTER_CLICKED : function(weEvent){
+		var elButton = weEvent.target;
+		if(elButton.tagName != "BUTTON") return;
+		if(elButton.parentNode.tagName != "LI") return;
+
+		var sChar = elButton.firstChild.innerHTML;
+
+		this.oApp.exec("SELECT_SCHARACTER", [sChar]);
+	},
+
+	$ON_SELECT_SCHARACTER : function(schar){
+		this.oTextField.value += schar;
+
+		if(this.oTextField.createTextRange){
+			var oTextRange = this.oTextField.createTextRange();
+			oTextRange.collapse(false);
+			oTextRange.select();
+		}else{
+			if(this.oTextField.selectionEnd){
+				this.oTextField.selectionEnd = this.oTextField.value.length;
+				this.oTextField.focus();
+			}
+		}
+	},
+
+	$ON_INSERT_SCHARACTERS : function(){
+		this.oSelection.pasteHTML(this.oTextField.value);
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_CHANGE_SCHARACTER_SET : function(nSCharSet){
+		for(var i=0; i<this.aSCharList.length; i++){
+			if(this.aSCharList[i].style.display == "block"){
+				if(i == nSCharSet) return;
+
+				$(this.aLabelA[i]).removeClass("on");
+				this.aSCharList[i].style.display = "none";
+			}
+		}
+
+		this._drawSCharList(nSCharSet);
+		$(this.aLabelA[nSCharSet]).addClass("on");
+		this.aSCharList[nSCharSet].style.display = "block";
+	},
+
+	$ON_SET_SCHARACTER_LIST : function(charSet){
+		this.charSet = charSet;
+		this.bSCharSetDrawn = new Array(this.charSet.length);
+		this._drawSCharList(0);
+	},
+
+	_drawSCharList : function(i){
+		if(this.bSCharSetDrawn[i]) return;
+		this.bSCharSetDrawn[i] = true;
+
+		var len = this.charSet[i].length;
+		var aLI = new Array(len);
+
+		this.aSCharList[i].innerHTML = '';
+
+		var button, span;
+		for(var ii=0; ii<len; ii++){
+			aLI[ii] = document.createElement("LI");
+
+			aLI[ii].innerHTML = '<button type="button"><span>'+unescape(this.charSet[i][ii])+'</span></button>';
+			this.aSCharList[i].appendChild(aLI[ii]);
+		}
+
+		// enable this after Jindo framework is updated
+//		this.oApp.exec("ATTACH_HOVER_EVENTS", [$(">LI>BUTTON", this.aSCharList[i])]).get();
+	},
+
+	_stopBrowserEvent : function(obj, sEvent){
+		$(obj).bind(sEvent, function(e){e.stopPropagation();e.preventDefault();} )
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to Undo/Redo
+ * @name hp_XE_UndoRedo.js
+ * @required XE_EditingAreaManager, XpressRangeManager
+ */
+xe.XE_UndoRedo = $.Class({
+	name : "XE_UndoRedo",
+	actionHistory : null,
+	// this may also be called, lastAdded/lastRestored
+	oCurStateIdx : null,
+	iMinimumSizeChange : 10,
+	sBlankContentsForFF : "<br>",
+
+	$init : function(){
+		this.aUndoHistory = [];
+		this.oCurStateIdx = {nIdx: 0, nStep: 0};
+	},
+
+	$PRECONDITION : function(sCmd){
+		if(sCmd.match(/_DO_RECORD_UNDO_HISTORY_AT$/)) return true;
+
+		try{
+			if(this.oApp.getEditingMode() != "WYSIWYG") return false;
+		}catch(e){
+			return false;
+		}
+
+		return true;
+	},
+
+	$BEFORE_MSG_APP_READY : function(){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [this.oCurStateIdx, "", "", null]);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.bFF = $.browser.mozilla;
+
+		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoHistory", $.fnBind(this.getUndoHistory, this)]);
+		this.oApp.exec("ADD_APP_PROPERTY", ["getUndoStateIdx", $.fnBind(this.getUndoStateIdx, this)]);
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["undo", "click", "UNDO"]);
+		this.oApp.exec("REGISTER_UI_EVENT", ["redo", "click", "REDO"]);
+
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+z", "UNDO"]);
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+y", "REDO"]);
+	},
+
+	$ON_UNDO : function(){
+		var oTmpStateIdx = {};
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", ["KEYPRESS", false, false, 1]);
+		if(this.oCurStateIdx.nIdx == 0) return;
+
+		if(this.oCurStateIdx.nStep > 0){
+			this.oCurStateIdx.nStep--;
+		}else{
+			var oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+
+			this.oCurStateIdx.nIdx--;
+
+			if(oTmpHistory.nTotalSteps>1){
+				this.oCurStateIdx.nStep = 0;
+			}else{
+				oTmpHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+				this.oCurStateIdx.nStep = oTmpHistory.nTotalSteps-1;
+			}
+		}
+
+		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+
+	$ON_REDO : function(){
+		if(this.oCurStateIdx.nIdx >= this.aUndoHistory.length) return;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+		if(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1 && this.oCurStateIdx.nStep >= oCurHistory.nTotalSteps-1) return;
+
+		if(this.oCurStateIdx.nStep < oCurHistory.nTotalSteps-1){
+			this.oCurStateIdx.nStep++;
+		}else{
+			this.oCurStateIdx.nIdx++;
+			oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+			this.oCurStateIdx.nStep = oCurHistory.nTotalSteps-1;
+		}
+
+		this.oApp.exec("RESTORE_UNDO_HISTORY", [this.oCurStateIdx.nIdx, this.oCurStateIdx.nStep]);
+
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	},
+
+	$ON_RECORD_UNDO_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction]);
+	},
+
+	$ON_RECORD_UNDO_BEFORE_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, true]);
+	},
+
+	$ON_RECORD_UNDO_AFTER_ACTION : function(sAction){
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY", [sAction, true, false]);
+	},
+
+	$ON_RESTORE_UNDO_HISTORY : function(nUndoIdx, nUndoStateStep){
+		this.oCurStateIdx.nIdx = nUndoIdx;
+		this.oCurStateIdx.nStep = nUndoStateStep;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+		var sContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
+		var oBookmark = oCurHistory.oBookmark[this.oCurStateIdx.nStep];
+
+		this.oApp.setIR(sContent, true);
+
+		// setting the innerHTML may change the internal DOM structure, so save the value again.
+		var sCurContent = this.oApp.getIR();
+		if(this.bFF && sCurContent == this.sBlankContentsForFF){
+			sCurContent = "";
+		}
+		oCurHistory.sContent[this.oCurStateIdx.nStep] = sCurContent;
+
+		var oSelection = this.oApp.getEmptySelection();
+		if(oSelection.selectionLoaded){
+			if(oBookmark){
+				oSelection.moveToXPathBookmark(oBookmark);
+			}else{
+				oSelection = this.oApp.getEmptySelection();
+			}
+
+			oSelection.select();
+		}
+	},
+
+	$ON_DO_RECORD_UNDO_HISTORY : function(sAction, bTwoStepAction, bBeforeAction, nForceAddUnlessEqual){
+		bTwoStepAction = bTwoStepAction || false;
+		bBeforeAction = bBeforeAction || false;
+		nForceAddUnlessEqual = nForceAddUnlessEqual || 0;
+
+		// if we're in the middle of some action history, remove everything after current idx if any "little" change is made
+		if(!(this.oCurStateIdx.nIdx == this.aUndoHistory.length-1)) nForceAddUnlessEqual = 1;
+
+		var oCurHistory = this.aUndoHistory[this.oCurStateIdx.nIdx];
+
+		var sCurContent = this.oApp.getIR();
+		var sHistoryContent = oCurHistory.sContent[this.oCurStateIdx.nStep];
+
+		if(this.bFF && sCurContent == this.sBlankContentsForFF){
+			sCurContent = "";
+		}
+
+		// every TwoStepAction needs to be recorded
+		if(!bTwoStepAction){
+			switch(nForceAddUnlessEqual){
+				case 0:
+					if(Math.abs(sHistoryContent.length - sCurContent.length)<this.iMinimumSizeChange) return;
+					break;
+
+				case 1:
+					if(sHistoryContent == sCurContent) return;
+					break;
+
+				// write at all times
+				case 2:
+					break;
+			}
+		}
+
+		var oSelection = this.oApp.getSelection();
+
+		var oBookmark=null;
+		if(oSelection.selectionLoaded){
+			oBookmark = oSelection.getXPathBookmark();
+		}
+
+		var oInsertionIdx = {nIdx:this.oCurStateIdx.nIdx, nStep:this.oCurStateIdx.nStep};
+		if(bTwoStepAction){
+			if(bBeforeAction){
+				oInsertionIdx.nStep = 0;
+			}else{
+				oInsertionIdx.nStep = 1;
+			}
+		}else{
+			oInsertionIdx.nStep = 0;
+		}
+
+		if(oInsertionIdx.nStep == 0 && this.oCurStateIdx.nStep == oCurHistory.nTotalSteps-1){
+			oInsertionIdx.nIdx = this.oCurStateIdx.nIdx+1;
+		}
+
+		this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT", [oInsertionIdx, sAction, sCurContent, oBookmark]);
+	},
+
+	$ON_DO_RECORD_UNDO_HISTORY_AT : function(oInsertionIdx, sAction, sContent, oBookmark){
+		if(oInsertionIdx.nStep != 0){
+			this.aUndoHistory[oInsertionIdx.nIdx].nTotalSteps = oInsertionIdx.nStep+1;
+			this.aUndoHistory[oInsertionIdx.nIdx].sContent[oInsertionIdx.nStep] = sContent;
+			this.aUndoHistory[oInsertionIdx.nIdx].oBookmark[oInsertionIdx.nStep] = oBookmark;
+		}else{
+			var oNewHistory = {sAction:sAction, nTotalSteps: 1};
+			oNewHistory.sContent = [];
+			oNewHistory.sContent[0] = sContent;
+
+			oNewHistory.oBookmark = [];
+			oNewHistory.oBookmark[0] = oBookmark;
+			this.aUndoHistory.splice(oInsertionIdx.nIdx, this.aUndoHistory.length - oInsertionIdx.nIdx, oNewHistory);
+		}
+
+		this.oCurStateIdx.nIdx = oInsertionIdx.nIdx;
+		this.oCurStateIdx.nStep = oInsertionIdx.nStep;
+	},
+
+	_getUndoHistory : function(){
+		return this.aUndoHistory;
+	},
+
+	_getUndoStateIdx : function(){
+		return this.oCurStateIdx;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to hyperlink
+ * @name hp_XE_Hyperlink.js
+ */
+xe.XE_Hyperlink = $.Class({
+	name : "XE_Hyperlink",
+	sATagMarker : "HTTP://HUSKY_TMP.MARKER/",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+		this.sRXATagMarker = this.sATagMarker.replace(/\//g, "\\/").replace(/\./g, "\\.");
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.oHyperlinkLayer = $("DIV.xpress_xeditor_hyperlink_layer", elAppContainer).get(0);
+		this.oLinkInput  = $("INPUT[type=text]", this.oHyperlinkLayer).get(0);
+		this.oBtnConfirm = $("BUTTON.confirm", this.oHyperlinkLayer).get(0);
+		this.oBtnCancel  = $("BUTTON.cancel", this.oHyperlinkLayer).get(0);
+		this.oCbNewWin   = $("INPUT[type=checkbox]", this.oHyperlinkLayer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_HOTKEY", ["ctrl+k", "XE_TOGGLE_HYPERLINK_LAYER", []]);
+
+		this.oApp.registerBrowserEvent(this.oBtnConfirm, "mousedown", "XE_APPLY_HYPERLINK");
+		this.oApp.registerBrowserEvent(this.oBtnCancel, "mousedown", "HIDE_ACTIVE_LAYER");
+		this.oApp.registerBrowserEvent(this.oLinkInput, "keydown", "EVENT_XE_HYPERLINK_KEYDOWN");
+
+		this.oApp.exec("REGISTER_UI_EVENT", ["hyperlink", "click", "XE_TOGGLE_HYPERLINK_LAYER"]);
+	},
+
+	$ON_XE_TOGGLE_HYPERLINK_LAYER : function(){
+		// hotkey may close the layer right away so delay here
+		this.oApp.delayedExec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.oHyperlinkLayer, null, "XE_RESET_HYPERLINK_LAYER", []], 0);
+	},
+
+	$ON_XE_RESET_HYPERLINK_LAYER : function(){
+		this.oApp.exec("FOCUS", []);
+		this.oSelection = this.oApp.getSelection();
+		var oAnchor = this.oSelection.findAncestorByTagName("A");
+		this.oCbNewWin.checked = false;
+		if(oAnchor){
+			this.oSelection.selectNode(oAnchor);
+			this.oSelection.select();
+
+			var sTarget = oAnchor.target;
+			if(sTarget && sTarget == "_blank") this.oCbNewWin.checked = true;
+
+			this.oLinkInput.value = oAnchor.href?oAnchor.href:"http://";
+		}else{
+			this.oLinkInput.value = "http://";
+		}
+
+		this.oLinkInput.focus();
+		this.oLinkInput.value = this.oLinkInput.value;
+	},
+
+	$ON_XE_APPLY_HYPERLINK : function(){
+		var sURL = this.oLinkInput.value, newWin = this.oCbNewWin.checked, sTarget = newWin?'_blank':'';
+
+		this.oApp.exec("FOCUS", []);
+		this.oSelection = this.oApp.getSelection();
+
+		if(this.oSelection.collapsed){
+			var str = "<a href='" + sURL + "' target="+sTarget+">" + sURL + "</a>";
+			this.oSelection.pasteHTML(str);
+		}else{
+			var nSession = Math.ceil(Math.random()*10000);
+			var sMarker  = this.sATagMarker+nSession;
+			var arg = ( sURL == "" ? ["unlink"] : ["createLink", false, sMarker+sURL] );
+			this.oApp.exec("EXECCOMMAND", arg);
+
+			try { this.oSelection.setFromSelection() }catch(e){};
+			var oDoc = this.oApp.getWYSIWYGDocument();
+			$(oDoc.body.getElementsByTagName("A"))
+				.filter('[href^="'+sMarker+'"]')
+					.attr('href', function(){
+							var rx = new RegExp('^'+sMarker.replace(/([\.\\])/g, '\\$1'), 'i');
+
+							if (sTarget) $(this).attr('target', sTarget);
+							else $(this).removeAttr('target');
+
+							return this.href.replace(rx, '');
+						});
+		}
+		this.oApp.exec("HIDE_ACTIVE_LAYER");
+
+		setTimeout($.fnBind(function(){try{this.oSelection.select()}catch(e){}}, this), 0);
+	},
+
+	_validateURL : function(sURL){
+		return /^(http|https|ftp|mailto):(?:\/\/)?((\w|-)+(?:[\.:@](\w|-))+)(?:\/|@)?([^"\?]*?)(?:\?([^\?"]*?))?$/.test(sURL);
+	},
+
+	$ON_EVENT_XE_HYPERLINK_KEYDOWN : function(oEvent){
+		if (oEvent.keyCode == 13){
+			this.oApp.exec("XE_APPLY_HYPERLINK");
+			oEvent.preventDefault(); oEvent.stopPropagation();
+		}
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to table creation
+ * @name hp_XE_Table.js
+ */
+xe.XE_Table = $.Class({
+	name : "XE_Table",
+	iMinRows : 1,
+	iMaxRows : 20,
+
+	iMinColumns : 1,
+	iMaxColumns : 10,
+
+	iMinBorderWidth : 1,
+	iMaxBorderWidth : 10,
+
+	oSelection : null,
+
+	$init : function(oAppContainer){
+		this._assignHTMLObjects(oAppContainer);
+	},
+
+	_assignHTMLObjects : function(oAppContainer){
+		var tmp = null;
+
+		this.elDropdownLayer = $("DIV.xpress_xeditor_table_layer", oAppContainer).get(0);
+		this.welDropdownLayer = $(this.elDropdownLayer);
+
+		tmp = $("INPUT", this.elDropdownLayer).get();
+		this.oRowInput = tmp[0];
+		this.oColumnInput = tmp[1];
+		this.oBorderWidthInput = tmp[2];
+		this.oBorderColorInput = tmp[3];
+		this.oBGColorInput = tmp[4];
+
+		tmp = $("BUTTON", this.elDropdownLayer).get();
+		this.oButton_AddRow = tmp[0];
+		this.oButton_RemoveRow = tmp[1];
+		this.oButton_AddColumn = tmp[2];
+		this.oButton_RemoveColumn = tmp[3];
+		this.oButton_IncBorderWidth = tmp[4];
+		this.oButton_DecBorderWidth = tmp[5];
+		this.oButton_BorderColorPreview = tmp[6];
+		this.oButton_BorderColor = tmp[7];
+		this.oButton_BGColorPreview = tmp[8];
+		this.oButton_BGColor = tmp[9];
+		this.oButton_Insert = tmp[10];
+		this.oButton_Cancel = tmp[11];
+
+		this.oSampleTable = $("TABLE", this.elDropdownLayer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.exec("REGISTER_UI_EVENT", ["table", "click", "ST_TOGGLE_TOOLBAR_LAYER"]);
+
+		this.oApp.registerBrowserEvent(this.oRowInput, "change", "ST_SET_ROW_NUM", [null, 0]);
+		this.oApp.registerBrowserEvent(this.oColumnInput, "change", "ST_SET_COLUMN_NUM", [null, 0]);
+		this.oApp.registerBrowserEvent(this.oBorderWidthInput, "change", "ST_SET_BORDER_WIDTH", [null, 0]);
+
+		this.oApp.registerBrowserEvent(this.oButton_AddRow, "click", "ST_ADD_ROW");
+		this.oApp.registerBrowserEvent(this.oButton_RemoveRow, "click", "ST_REMOVE_ROW");
+		this.oApp.registerBrowserEvent(this.oButton_AddColumn, "click", "ST_ADD_COLUMN");
+		this.oApp.registerBrowserEvent(this.oButton_RemoveColumn, "click", "ST_REMOVE_COLUMN");
+
+		this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth, "click", "ST_INC_BORDER_WIDTH");
+		this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth, "click", "ST_DEC_BORDER_WIDTH");
+
+		this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
+		this.oApp.registerBrowserEvent(this.oButton_BGColorPreview, "click", "ST_TOGGLE_BGCOLOR_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oButton_BorderColor, "click", "ST_TOGGLE_BORDER_COLOR_LAYER");
+		this.oApp.registerBrowserEvent(this.oButton_BGColor, "click", "ST_TOGGLE_BGCOLOR_LAYER");
+
+		this.oApp.registerBrowserEvent(this.oButton_Insert, "click", "ST_INSERT_TABLE");
+		this.oApp.registerBrowserEvent(this.oButton_Cancel, "click", "ST_CLOSE");
+
+		this.oApp.exec("ST_SET_BORDER_COLOR", ["#CCCCCC"]);
+		this.oApp.exec("ST_SET_BGCOLOR", ["#FFFFFF"]);
+	},
+
+	$ON_ST_TOGGLE_TOOLBAR_LAYER : function(){
+		this.oApp.exec("RECORD_UNDO_ACTION_FORCED", ["KEYPRESS"]);
+
+		this._showNewTable();
+		this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER", [this.elDropdownLayer]);
+	},
+
+	$ON_ST_ADD_ROW : function(){
+		this.oApp.exec("ST_SET_ROW_NUM", [null, 1]);
+	},
+
+	$ON_ST_REMOVE_ROW : function(){
+		this.oApp.exec("ST_SET_ROW_NUM", [null, -1]);
+	},
+
+	$ON_ST_ADD_COLUMN : function(){
+		this.oApp.exec("ST_SET_COLUMN_NUM", [null, 1]);
+	},
+
+	$ON_ST_REMOVE_COLUMN : function(){
+		this.oApp.exec("ST_SET_COLUMN_NUM", [null, -1]);
+	},
+
+	$ON_ST_SET_ROW_NUM : function(iRows, iRowDiff){
+		iRows = iRows || parseInt(this.oRowInput.value);
+		iRowDiff = iRowDiff || 0;
+
+		iRows += iRowDiff;
+
+		if(iRows < this.iMinRows) iRows = this.iMinRows;
+		if(iRows > this.iMaxRows) iRows = this.iMaxRows;
+
+		this.oRowInput.value = iRows;
+		this._showNewTable();
+	},
+
+	$ON_ST_SET_COLUMN_NUM : function(iColumns, iColumnDiff){
+		iColumns = iColumns || parseInt(this.oColumnInput.value);
+		iColumnDiff = iColumnDiff || 0;
+
+		iColumns += iColumnDiff;
+
+		if(iColumns < this.iMinColumns) iColumns = this.iMinColumns;
+		if(iColumns > this.iMaxColumns) iColumns = this.iMaxColumns;
+
+		this.oColumnInput.value = iColumns;
+		this._showNewTable();
+	},
+
+	$ON_ST_INSERT_TABLE : function(){
+		var sTable = this._getTableString();
+
+		this.oApp.exec("PASTE_HTML", [sTable]);
+
+		this.oApp.exec("ST_CLOSE", []);
+	},
+
+	$ON_ST_CLOSE : function(){
+		this.oApp.exec("HIDE_ACTIVE_LAYER", []);
+	},
+
+	$ON_ST_SET_BORDER_WIDTH : function(iBorderWidth, iBorderWidthDiff){
+		iBorderWidth = iBorderWidth || parseInt(this.oBorderWidthInput.value);
+		iBorderWidthDiff = iBorderWidthDiff || 0;
+
+		iBorderWidth += iBorderWidthDiff;
+
+		if(iBorderWidth < this.iMinBorderWidth) iBorderWidth = this.iMinBorderWidth;
+		if(iBorderWidth > this.iMaxBorderWidth) iBorderWidth = this.iMaxBorderWidth;
+
+		this.oBorderWidthInput.value = iBorderWidth;
+		this._showNewTable();
+	},
+
+	$ON_ST_INC_BORDER_WIDTH : function(){
+		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, 1]);
+	},
+
+	$ON_ST_DEC_BORDER_WIDTH : function(){
+		this.oApp.exec("ST_SET_BORDER_WIDTH", [null, -1]);
+	},
+
+	$ON_ST_TOGGLE_BORDER_COLOR_LAYER : function(){
+		if(this.welDropdownLayer.hasClass("p1"))
+			this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
+		else
+			this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER", []);
+	},
+
+	$ON_ST_SHOW_BORDER_COLOR_LAYER : function(){
+		this.welDropdownLayer.addClass("p1");
+		this.welDropdownLayer.removeClass("p2");
+
+		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BORDER_COLOR_FROM_PALETTE", this.elDropdownLayer]);
+	},
+
+	$ON_ST_HIDE_BORDER_COLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p1");
+
+		this.oApp.exec("HIDE_COLOR_PALETTE", []);
+	},
+
+	$ON_ST_TOGGLE_BGCOLOR_LAYER : function(){
+		if(this.welDropdownLayer.hasClass("p2"))
+			this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
+		else
+			this.oApp.exec("ST_SHOW_BGCOLOR_LAYER", []);
+	},
+
+	$ON_ST_SHOW_BGCOLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p1");
+		this.welDropdownLayer.addClass("p2");
+
+		this.oApp.exec("SHOW_COLOR_PALETTE", ["ST_SET_BGCOLOR_FROM_PALETTE", this.elDropdownLayer]);
+	},
+
+	$ON_ST_HIDE_BGCOLOR_LAYER : function(){
+		this.welDropdownLayer.removeClass("p2");
+
+		this.oApp.exec("HIDE_COLOR_PALETTE", []);
+	},
+
+	$ON_ST_SET_BORDER_COLOR_FROM_PALETTE : function(sColorCode){
+		this.oApp.exec("ST_SET_BORDER_COLOR", [sColorCode]);
+		this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER", []);
+	},
+
+	$ON_ST_SET_BORDER_COLOR : function(sColorCode){
+		this.oBorderColorInput.value = sColorCode;
+		this.oButton_BorderColorPreview.style.backgroundColor = sColorCode;
+
+		this._showNewTable();
+	},
+
+	$ON_ST_SET_BGCOLOR_FROM_PALETTE : function(sColorCode){
+		this.oApp.exec("ST_SET_BGCOLOR", [sColorCode]);
+		this.oApp.exec("ST_HIDE_BGCOLOR_LAYER", []);
+	},
+
+	$ON_ST_SET_BGCOLOR : function(sColorCode){
+		this.oBGColorInput.value = sColorCode;
+		this.oButton_BGColorPreview.style.backgroundColor = sColorCode;
+
+		this._showNewTable();
+	},
+
+	_showNewTable : function(){
+		var oTmp = document.createElement("DIV");
+		oTmp.innerHTML = this._getTableString();
+		var oNewTable = oTmp.firstChild;
+		this.oSampleTable.parentNode.insertBefore(oNewTable, this.oSampleTable);
+		this.oSampleTable.parentNode.removeChild(this.oSampleTable);
+		this.oSampleTable = oNewTable;
+	},
+
+	// need to do something about the table width as the same HTML code is being used to the actual table and the preview table
+	_getTableString : function(){
+		var sBorderColorCode = this.oBorderColorInput.value;
+		var sBGColorCode = this.oBGColorInput.value;
+		var iBorderWidth = this.oBorderWidthInput.value;
+		var sTD = "";
+		if($.browser.msie){
+			sTD = "<td><p></p></td>";
+		}else{
+			if($.browser.firefox){
+				sTD = "<td><p><br/></p></td>";
+			}else{
+				sTD = "<td><p>&nbsp;</p></td>";
+			}
+		}
+
+		var sTable = '<table style="background:'+sBorderColorCode+'" cellspacing="'+iBorderWidth+'">';
+		var sRow = '<tr style="background:'+sBGColorCode+'">';
+		var iColumns = this.oColumnInput.value;
+		for(var i=0; i<iColumns; i++){
+			sRow += sTD;
+		}
+		sRow += "</tr>\n";
+
+		var iRows = this.oRowInput.value;
+
+		sTable += "<tbody>";
+		for(var i=0; i<iRows; i++){
+			sTable += sRow;
+		}
+		sTable += "</tbody>";
+
+		sTable += "</table>";
+
+		return sTable;
+	}
+});
+//}
+//{
+/**
+ * @fileOverview This file contains Xpress plugin that takes care of the operations related to changing the editing mode using a Button element
+ * @name hp_XE_EditingModeToggler.js
+ */
+xe.XE_EditingModeToggler = $.Class({
+	name : "XE_EditingModeToggler",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		elAppContainer = $.$(elAppContainer) || document;
+
+		this.elModeToggleButton = $("BUTTON.xpress_xeditor_mode_toggle_button", elAppContainer).get(0);
+		this.welModeToggleButton = $(this.elModeToggleButton);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elModeToggleButton, "click", "EVENT_TOGGLE_EDITING_MODE", []);
+	},
+
+	$ON_EVENT_TOGGLE_EDITING_MODE : function(){
+		if(this.oApp.getEditingMode() == "WYSIWYG")
+			this.oApp.exec("CHANGE_EDITING_MODE", ["HTMLSrc"]);
+		else
+			this.oApp.exec("CHANGE_EDITING_MODE", ["WYSIWYG"]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(sMode){
+		if(sMode == "HTMLSrc"){
+			this.welModeToggleButton.addClass("active").parent("span").addClass("active");
+			this.oApp.exec("DISABLE_ALL_UI", []);
+		}else{
+			this.welModeToggleButton.removeClass("active").parent("span").removeClass("active");
+			this.oApp.exec("ENABLE_ALL_UI", []);
+		}
+	}
+});
+//}
+/**
+ * @fileOverview This file contains a message mapping(Korean), which is used to map the message code to the actual message
+ * @name xpress_XE_Lang_KR.js
+ */
+var oMessageMap = {
+	'XE_EditingAreaManager.onExit' : '%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.',
+	'XE_FontColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
+	'XE_BGColor.invalidColorCode' : '%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff',
+	'XE_Hyperlink.invalidURL' : '%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4.'
+};
+xe.XpressCore.oMessageMap = oMessageMap;
+/**
+ * XHTML Formatter
+ * @author NHN (developer@xpressengine.com)
+ */
+var
+	regex_meanless_css1 = /<(.*?)\s+style\s*=\s*"(.*?(?:margin|padding)\s*:\s*0(?:px)?.*?|.*?\-(?:moz|ms|webkit|opera).*?)"(.*?)>/ig,
+	regex_meanless_css2 = /(?:(?:margin|padding)\s*:\s*0(?:px)?|\-(?:moz|ms|webkit|opera)\-[\w-]+\s*:\s*.*?|[\w-]+\s*:\s*\-(?:moz|ms|webkit|opera)\-[\w-]+|(?:line-height|font-variant|font-stretch|font-size-adjust|font-size)\s*:\s*[a-z_-]+)\s*;?\s*|font-(?:weight|style)\s*:\s*normal;?/ig,
+	regex_class  = /<(.*?)\s+class\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))(.*?)>/ig,
+	regex_class2 = /xe_selected_cell/g;
+	regex_handler = /<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig,
+	//regex_id = /<(.*?)\s+id\s*=(?:[^\s>]+|\s*".*?"|\s*'.*?')(.*?)>/ig,
+	//regex_script = /<script[\s\S]+?<\/script>/ig,
+	regex_font_color = /color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_face  = /face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_size  = /size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i,
+	regex_style = /style\s*=\s*(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i,
+	regex_font_weight = /font-weight\s*:\s*([a-z]+);?/i,
+	regex_font_style = /font-style\s*:\s*italic;?/i,
+	regex_font_decoration = /text-decoration\s*:\s*([a-z -]+);?/i,
+	regex_jquery = /jQuery\d+\s*=(\s*"\d+"|\d+)/ig,
+	regex_quote_attr = /([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g; //"
+
+var
+	allow_tags  = 'a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style'.split(','),
+	lonely_tags = 'area,br,col,embed,hr,img,input,param'.split(',');
+
+var
+	replace_tags = {
+		'b' : 'strong',
+		'i' : 'em',
+		's' : 'del',
+		'strike' : 'del'
+	};
+
+xe.XE_XHTMLFormatter = $.Class({
+	name : "XE_XHTMLFormatter",
+
+	$ON_MSG_APP_READY : function() {
+		this.oApp.addConverter("WYSIWYG_TO_IR", this.TO_IR);
+		this.oApp.addConverter("HTMLSrc_TO_IR", this.TO_IR);
+		this.oApp.addConverter("IR_TO_HTMLSrc", this.IR_TO);
+		this.oApp.addConverter("IR_TO_WYSIWYG", this.IR_TO);
+	},
+
+	TO_IR : function(sContent) {
+		var stack = [];
+
+		// remove xeHandled attrs
+		/*
+		sContent = sContent.replace(/xeHandled="YES"/ig,'');
+		*/
+
+
+		// remove all useless styles
+		/*
+		sContent = sContent.replace(regex_meanless_css1, function(m0,m1,m2,m3){
+			m2 = m2.replace(regex_meanless_css2, '');
+
+			return '<'+m1+(m2?' style="'+m2+'"':'')+m3+'>';
+		});
+		*/
+
+		// remove all useless classes
+		/*
+		sContent = sContent.replace(regex_class, function(m0,m1,m2,m3,m4,m5){
+			var cls = $.trim((m2 || m3 || m4 || "").replace(regex_class2, ''));
+
+			return '<'+(m1||"")+(cls?' class="'+cls+'"':'')+(m5||"")+'>';
+		});
+		*/
+
+		// remove all event handler
+		//sContent = sContent.replace(regex_handler, '<$1$2>');
+
+		// remove all id
+		//sContent = sContent.replace(regex_id, '<$1$2>');
+
+		// remove all scripts
+		//sContent = sContent.replace(regex_script, '');
+
+		if ($.browser.msie) {
+			// remove $ attributes
+			sContent = sContent.replace(regex_jquery, '');
+
+			// quote all attrs
+			sContent = sContent.replace(/<(\w+) ([^>]+)>/g, function(m0,m1,m2){
+				return '<'+m1+' '+
+					m2.replace(regex_quote_attr, function(s0,s1,s2,s3){
+						if(s1) return s1;
+						if(/^"/.test(s3)||/"$/.test(s3)) return s2+'='+s3;
+						return s2+'="'+(s3||s2)+'"';
+					}) + '>';
+			});
+		}
+
+		// remove all useless tag and enclose tags
+		regex = /<(\/)?([:\w\/-]+)(.*?)>/ig;
+		sContent = sContent.replace(regex, function(m0,closing,tag,attrs){
+			var m3s = [];
+			var state = '';
+
+			closing = closing || '';
+			tag     = tag.toLowerCase();
+			attrs   = $.trim(attrs || '');
+
+			if (!closing) {
+				if ($.inArray(tag,lonely_tags) >= 0) {
+					var len = attrs.length;
+					if (tag == 'br') attrs = '';
+					if (!attrs || attrs.substring(len-1,len) != '/') attrs += '/';
+
+					return '<'+tag+' '+$.trim(attrs)+'>';
+				} else {
+					stack[stack.length] = {tag:tag, state:state};
+				}
+			} else {
+				var tags = [], t = '';
+
+				// remove unnecessary closing tag
+				if (!stack.length) return '';
+
+				do {
+					t = stack.pop();
+					if (t.tag != tag) continue;
+					if (t.state != 'deleted') tags.push('</'+t.tag+'>');
+				} while(stack.length && t.tag != tag);
+
+				return tags.join('');
+			}
+
+			return '<'+closing+tag+(attrs?' '+attrs:'')+'>';
+		});
+		/*
+		if (stack.length) {
+			var t = '';
+
+			do {
+				t = stack.pop();
+				if (t.state != 'deleted') sContent += '</'+t.tag+'>';
+			} while(stack.length);
+		}
+		*/
+
+		return sContent;
+	},
+
+	IR_TO : function(sContent) {
+		return sContent;
+	}
+});
+// center, font, b, i, s, strike
+
+/**
+ * Support XE extensions
+ * @author NHN (developer@xpressengine.com)
+ */
+xe.XE_Extension = $.Class({
+	name  : "XE_Extension",
+	seq   : '',
+	last_doc : '',
+
+	$init : function(elAppContainer, editor_sequence) {
+		this.seq = editor_sequence;
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.elDropdownLayer = $('DIV.xpress_xeditor_extension_layer', elAppContainer).get(0);
+	},
+
+	_removeAttrs : function(sContent) {
+		return sContent;
+	},
+
+	_addEvent : function() {
+		if (this.oApp.getEditingMode() != 'WYSIWYG') return;
+
+		var doc = this.oApp.getWYSIWYGDocument();
+		var seq = this.seq;
+		var fn  = function(){
+			var obj  = $(this);
+			var comp = obj.attr('editor_component');
+			if (comp && $.isFunction(openComponent)) {
+				editorPrevNode = obj.get(0);
+				openComponent(comp, seq);
+			}
+		};
+
+		$(doc).find('img,div[editor_component]').each(function(){
+			var obj = $(this);
+			if(this.nodeName == 'IMG' && !obj.attr('editor_component')) {
+				obj.attr('editor_component','image_link');
+			}
+			if(this.last_doc != doc) {
+				obj.dblclick(fn);
+				this.last_doc = doc;
+			}
+		});
+	},
+
+	$ON_MSG_APP_READY : function() {
+		var oApp = this.oApp;
+		oApp.exec('REGISTER_UI_EVENT', ['extension', 'click', 'TOGGLE_EXTENSION_LAYER']);
+		var functn  = function(){
+			oApp.exec("HIDE_ACTIVE_LAYER", []);
+		};
+		$('a', this.elDropdownLayer).each(function(){
+			var obj = $(this);
+			if(!obj.attr('component_onclick_event_added')) {
+				obj.click(functn);
+				obj.attr('component_onclick_event_added','Y');
+			}
+		});
+	},
+
+	$ON_TOGGLE_EXTENSION_LAYER : function() {
+		this.oApp.exec('TOGGLE_TOOLBAR_ACTIVE_LAYER', [this.elDropdownLayer]);
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(mode) {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_PASTE_HTML : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_LOAD_IR_FIELD : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	},
+
+	$ON_SET_IR : function() {
+		var self = this;
+		setTimeout(function(){ self._addEvent(); }, 100);
+	}
+});
+/**
+ * Auto saving
+ * @author NHN (developer@xpressengine.com)
+ */
+xe.XE_AutoSave = $.Class({
+	name : "XE_AutoSave",
+	form : null,
+	textarea : null,
+
+	$init : function(oIRTextarea, elAppContainer) {
+		this.form = oIRTextarea.form;
+		this.textarea = oIRTextarea;
+
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.welMessageBox = $('autosave_message');
+	},
+
+	$ON_MSG_APP_READY : function() {
+		var elTitle   = $(this.form._saved_doc_title);
+		var elContent = $(this.form._saved_doc_content);
+
+		var title   = $.trim(elTitle.val());
+		var content = $.trim(elContent.val());
+
+		if (title || content) {
+			if (confirm(this.form._saved_doc_message.value)) {
+				$(this.form.title).val(title);
+				this.oApp.setIR(content);
+				if(typeof(editorGetAutoSavedDoc) == 'function') editorGetAutoSavedDoc(this.form);
+			} else {
+				editorRemoveSavedDoc();
+			}
+		}
+
+		editorEnableAutoSave(this.form, $(this.form).attr("editor_sequence"));
+
+		// register hotkey
+		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+shift+s','AUTO_SAVE']);
+	},
+
+	$ON_AUTO_SAVE : function() {
+		_editorAutoSave();
+	}
+});
+/**
+ * Format Block plugin
+ * @author NHN (developer@xpressengine.com)
+ */
+xe.XE_FormatWithSelectUI = $.Class({
+	name : "XE_FormatWithSelectUI",
+
+	$init : function(elAppContainer){
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer){
+		this.elFormatSelect = $("SELECT.xpress_xeditor_ui_format_select", elAppContainer).get(0);
+	},
+
+	$ON_MSG_APP_READY : function(){
+		this.oApp.registerBrowserEvent(this.elFormatSelect, "change", "SET_FORMAT_FROM_SELECT_UI");
+		this.elFormatSelect.selectedIndex = 0;
+	},
+
+	$ON_MSG_STYLE_CHANGED : function(sAttributeName, sAttributeValue){
+		var blockName = this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");
+
+		if (!blockName) return (this.elFormatSelect.selectedIndex = 0);
+		if ($.browser.msie && /([0-9])/.test(blockName)) blockName = 'h'+(RegExp.$1);
+
+		this.elFormatSelect.value = blockName.toLowerCase();
+		if(this.elFormatSelect.selectedIndex < 0) this.elFormatSelect.selectedIndex = 0;
+		if(this.elFormatSelect.value != blockName.toLowerCase()) this.elFormatSelect.selectedIndex = 0;
+	},
+
+	$ON_SET_FORMAT_FROM_SELECT_UI : function(){
+		var sFormat = this.elFormatSelect.value;
+		if(!sFormat) return;
+		if($.browser.msie) sFormat = '<'+sFormat+'>';
+
+		this.oApp.exec("EXECCOMMAND", ["FormatBlock", false, sFormat]);
+		this.oApp.exec("CHECK_STYLE_CHANGE", []);
+	}
+});
+/**
+ * Enhanced Table Fetures
+ * @author NHN (developer@xpressengine.com)
+ */
+
+// 표 편집 확장 기능
+xe.XE_Table = $.Class({
+	_startSel : null,
+	_endSel   : null,
+
+	$ON_MSG_APP_READY : function() {
+		this._doc = $(this.oApp.getWYSIWYGDocument());
+
+		this.$FnMouseDown = $.fnBind(this._mousedown, this);
+		this.$FnMouseUp   = $.fnBind(this._mouseup, this);
+		this.$FnMouseMove = $.fnBind(this._mousemove, this);
+
+		this._doc.mousedown(this.$FnMouseDown);
+
+		// initialize
+		this._startSel = null;
+		this._endSel   = null;
+
+		// register buttons
+		this.oApp.exec('REGISTER_UI_EVENT', ['merge_cells', 'click', 'MERGE_CELLS']);
+		this.oApp.exec('REGISTER_UI_EVENT', ['split_col', 'click', 'CELL_SPLIT_BY_COL']);
+		this.oApp.exec('REGISTER_UI_EVENT', ['split_row', 'click', 'CELL_SPLIT_BY_ROW']);
+
+		// register hotkeys
+		this.oApp.exec('REGISTER_HOTKEY', ['ctrl+alt+m', 'MERGE_CELLS']);
+
+		// perform default ready action
+		this.$super.$ON_MSG_APP_READY();
+	},
+
+	$ON_MERGE_CELLS : function() {
+		var html = "";
+		var cell = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var self = this;
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Merge"]);
+
+		// 선택한 모든 셀의 데이터를 첫번째 셀로 복사
+		cell.each(function(){ html += $(this).html() }).eq(0).html(html);
+
+		// 첫번째 셀 가로 확장
+		var colspan = 0;
+		cell.eq(0).nextAll('td,th').andSelf().filter('.xe_selected_cell').each(function(idx){
+			colspan += self._getSpan(this, 'col');
+		});
+
+		// 마지막 셀까지 줄의 갯수 계산
+		var rect = this._getRect(cell.eq(0));
+		var start_tr = cell.eq(0).parent('tr');
+		var end_tr   = cell.eq(cell.length-1).parent('tr');
+		var all_rows = cell.parents('table').eq(0).find('tr');
+		var rowspan  = all_rows.index(end_tr.get(0)) - all_rows.index(start_tr.get(0)) + this._getSpan(cell.eq(cell.length-1), 'row');
+
+		// 첫번째 셀 colspan, rowspan 속성 지정
+		cell.eq(0).attr('colSpan', colspan).attr('rowSpan', rowspan);
+
+		// 첫번째 셀을 제외한 다른 모든 셀 제거
+		cell.slice(1).remove();
+	},
+
+	$ON_CELL_SPLIT_BY_ROW : function(many) {
+		var cell  = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var table = cell.parents('table').eq(0);
+		var self  = this;
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Row"]);
+
+		// 선택 영역의 상하 좌표 구함
+		var _top	= this._getRect(cell.eq(0)).top;
+		var _bottom = this._getRect(cell.eq(cell.length-1)).bottom;
+
+		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(상하 기준).
+		(cell = table.find('td,th').filter(function(){
+			var rect = self._getRect($(this));
+
+			return !(rect.bottom <= _top || rect.top >= _bottom);
+		})).filter('.xe_selected_cell').each(function(){
+			var t	   = $(this);
+			var row	 = t.parent('tr');
+			var rowspan = self._getSpan(t, 'row');
+			var rect	= self._getRect(t);
+			var queue   = [];
+			var clone   = t.clone().html('<br />');
+			var topspan = 1, botspan = 1;
+
+			// rowspan > 1이면 현재 셀의 rowspan을 절반으로 분할한다.
+			if (rowspan > 1) {
+
+				topspan = Math.ceil(rowspan/2);
+				botspan = rowspan - topspan;
+
+				queue.push(function(){
+					t.attr('rowSpan', topspan);
+				});
+
+				clone.attr('rowSpan', botspan);
+			} else {
+				// rowspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 rowspan을 추가
+				cell.filter(function(){
+					if (t.get(0) == this) return false;
+
+					var tt = $(this);
+					var rc = self._getRect(tt);
+
+					// 범위를 넘은 부분은 제외
+					if (rc.bottom <= rect.top || rc.top >= rect.bottom) return false;
+
+					return true;
+				}).each(function(){
+					var tt = $(this);
+					var sp = self._getSpan(tt, 'row')+1;
+
+					// rowspan 1 추가
+					queue.push(function(){
+						tt.attr('rowSpan', sp);
+					});
+				});
+
+				// 새 줄을 추가한다.
+				if ($.browser.msie) {
+					// Fix bug for IE
+					row.after(row.clone().empty().get(0).outerHTML);
+				} else {
+					row.after(row.clone().empty());
+				}
+			}
+
+			var rows  = row.nextAll('tr');
+
+			// 현재 셀이 마지막 줄에 있다면 한 줄 추가 후 새로운 셀 추가
+			if (!rows.length) {
+				row.after(row.clone().empty().append(clone));
+			} else {
+				var next_sib  = rows.eq(topspan - 1).children('td,th').filter(function(){
+					return ( self._getRect($(this)).left > rect.left );
+				});
+
+				if ($.browser.msie) {
+					next_sib.length?
+						next_sib.eq(0).before(clone.get(0).outerHTML):
+						rows.eq(topspan-1).append(clone.get(0).outerHTML);
+				} else {
+					next_sib.length?
+						next_sib.slice(0,1).before(clone):
+						rows.slice(topspan-1,1).append(clone);
+				}
+			}
+
+			// 함수를 바로 실행하면 좌표가 틀어지므로, 큐에 넣은 후 실행
+			$.each(queue, function(){ this(); });
+
+		});
+	},
+
+	$ON_CELL_SPLIT_BY_COL : function(many) {
+		var cell   = $('.xe_selected_cell', this.oApp.getWYSIWYGDocument()).filter('td,th');
+		var table  = cell.parents('table').slice(0,1);
+		var self   = this;
+		var ie_bug = [], tmpId = (new Date).getTime(), tmpStr = '';
+
+		// 선택된 셀이 없으면 종료
+		if (!cell.length) return;
+
+		// UNDO 지점 기록
+		this.oApp.exec("RECORD_UNDO_ACTION", ["Cell:Split By Column"]);
+
+		// 선택 영역의 좌우 좌표 구함
+		var first_row = cell.eq(0).parent('tr');
+		var _left = this._getRect(first_row.find('.xe_selected_cell:first')).left;
+		var _right = this._getRect(first_row.find('.xe_selected_cell:last')).right;
+
+		// 테이블의 모든 셀에서 선택영역에 해당하는 셀을 구한다(좌우 기준).
+		(cell = table.find('td,th').filter(function(){
+			var rect = self._getRect($(this));
+
+			return !(rect.right <= _left || rect.left >= _right);
+		})).filter('.xe_selected_cell').each(function(idx){
+			var t	   = $(this);
+			var colspan = self._getSpan(t, 'col');
+			var clone   = t.clone().html('<br />');
+
+			// colspan > 1 이면 colspan을 절반으로 분할한다.
+			if (colspan > 1) {
+				var leftspan  = Math.ceil(colspan/2);
+				var rightspan = colspan - leftspan;
+
+				t.attr('colSpan', leftspan);
+				clone.attr('colSpan', rightspan);
+			} else {
+				// colspan이 없으면 현재 셀과 영역이 겹치는 모든 셀에 colspan을 추가
+				var rect = self._getRect(t);
+
+				cell.filter(function(){
+					if (t.get(0) == this) return false;
+
+					var tt = $(this);
+					var rc = self._getRect(tt);
+
+					// 범위를 넘은 부분은 제외
+					if (rc.right <= rect.left || rc.left >= rect.right) return false;
+
+					return true;
+				}).each(function(){
+					var tt = $(this);
+
+					// colspan 1 추가
+					tt.attr('colSpan', self._getSpan(tt, 'col')+1);
+				});
+
+				clone.attr('colSpan', 1);
+			}
+
+			if ($.browser.msie) {
+				// Fix for IE bug
+				t.after(clone.get(0).outerHTML);
+			} else {
+				t.after(clone);
+			}
+		});
+	},
+
+	$ON_CHECK_STYLE_CHANGE : function(){
+		var ui  = ['merge_cells', 'split_col', 'split_row'];
+		var app = this.oApp;
+		var command = (this._startSel && this._startSel.is('.xe_selected_cell'))?'ENABLE_UI':'DISABLE_UI';
+
+		$.each(ui, function(){ app.exec(command, [this]); });
+	},
+
+	_mousedown : function(event) {
+		var cur = $(event.target);
+		var sel = cur.parents().andSelf().filter('td,th,table');
+		var app = this.oApp;
+		var self = this;
+
+		// 모든 선택영역 해제
+		$('td.xe_selected_cell', this.oApp.getWYSIWYGDocument()).removeClass('xe_selected_cell');
+
+		this._startSel = null;
+		this._endSel   = null;
+
+		if (!sel.length || !this._isLeftClicked(event.button)) return;
+
+		function delayed(){
+			sel = app.getSelection().cloneRange();
+			sel.collapseToStart();
+			sel = $(sel.startContainer).parents().andSelf().filter('td,th').eq(0);
+
+			if (!sel.length) return self._removeAllListener()||true;
+
+			// 좌표를 구한다
+			self._getRect(self._startSel = sel);
+
+			// 이벤트 바인딩
+			self._doc.bind('mousemove', self.$FnMouseMove);
+			self._doc.bind('mouseup', self.$FnMouseUp);
+		}
+
+		// mousedown이 일어난 후에 선택 영역이 설정되므로 실행을 지연시킨다.
+		setTimeout(delayed, 0);
+	},
+
+	_mouseup : function(event) {
+		// 선택된 셀 확인
+		this._removeAllListener();
+
+		// 시작셀과 종료셀 제거
+		this._startSel = this._endSel = null;
+	},
+
+	_mousemove : function(event) {
+		var cur  = $(event.target);
+		var cell = cur.parents().andSelf().filter('td,th').eq(0);
+		var self = this;
+
+		// 마우스 왼쪽 버튼이 눌리지 않았으면 종료
+		if (!cell.length || !this._isLeftClicked(event.button)) return;
+		if (!this._endSel && cell.get(0) == this._startSel.get(0)) return;
+		if (this._endSel && cell.get(0) == this._endSel.get(0)) return;
+
+		// 종료셀 && 종료셀의 좌표
+		this._getRect(this._endSel = cell);
+
+		// 선택 범위를 구한다
+		var _top	= Math.min(this._startSel.rect.top,  this._endSel.rect.top);
+		var _left   = Math.min(this._startSel.rect.left, this._endSel.rect.left);
+		var _bottom = Math.max(this._startSel.rect.bottom, this._endSel.rect.bottom);
+		var _right  = Math.max(this._startSel.rect.right,  this._endSel.rect.right);
+
+		var table = cell.parents('table');
+		var cells = table.find('td,th').removeClass('xe_selected_cell');
+		var i = 0;
+
+		// 복잡한 모양의 테이블을 위한 반복 처리
+		var selected = $();
+		do {
+			// 선택한 셀로 최대 영역 재계산
+			selected.each(function(){
+				var rect = self._getRect($(this));
+
+				// 영역 재계산
+				if (rect.right  > _right)  _right  = rect.right;
+				if (rect.left   < _left)   _left   = rect.left;
+				if (rect.top	< _top)	_top	= rect.top;
+				if (rect.bottom > _bottom) _bottom = rect.bottom;
+			});
+
+			// 좌표 범위 안에 있는 선택할 셀을 추린다.
+			cells = cells.filter(':not(.xe_selected_cell)');
+			selected = cells.filter(function(){
+				var rect = self._getRect($(this));
+
+				if (rect.right <= _left || rect.left >= _right || rect.bottom <= _top || rect.top >= _bottom) return false;
+
+				return true;
+			}).addClass('xe_selected_cell');
+		} while(selected.length);
+
+		// 브라우저의 기본 선택영역 해제 : FF 제외 - 기본 기능이 충분히 좋아서 + 이 부분을 실행하면 오류가 발생해서
+		if (!$.browser.mozilla) {
+			function delayed() {
+				var sel = self.oApp.getSelection();
+
+				if (!self._startSel) return;
+				if (!self._startSel.get(0).firstChild) self._startSel.text(" ");
+
+				sel.selectNode(self._startSel.get(0).firstChild);
+				sel.collapseToStart();
+				sel.select();
+			}
+
+			setTimeout(delayed, 0);
+		}
+
+		return false;
+	},
+
+	_removeAllListener : function() {
+		// 이벤트 해제
+		this._doc.unbind("mousemove", this.$FnMouseMove);
+		this._doc.unbind("mouseup", this.$FnMouseUp);
+	},
+
+	_isLeftClicked : function(value) {
+		return $.browser.msie?!!(value & 1):(value == 0);
+	},
+
+	_getRect : function(obj) {
+		var el = obj.get(0);
+
+		obj.rect = {};
+		obj.rect.top	= el.offsetTop;
+		obj.rect.left   = el.offsetLeft;
+		obj.rect.bottom = obj.rect.top  + el.offsetHeight;
+		obj.rect.right  = obj.rect.left + el.offsetWidth;
+
+		return obj.rect;
+	},
+
+	_getSpan : function(obj, type) {
+		var span = parseInt($(obj).attr(type+'span'));
+
+		return isNaN(span)?1:span;
+	}
+}).extend(xe.XE_Table);
+
+})(jQuery);
+if (!window.xe) xe = {};
+
+xe.Editors = [];
+
+function editorStart_xe(editor_sequence, primary_key, content_key, editor_height, colorset, content_style, content_font, content_font_size) {
+	if(typeof(colorset)=='undefined') colorset = 'white';
+	if(typeof(content_style)=='undefined') content_style = 'xeStyle';
+	if(typeof(content_font)=='undefined') content_font= '';
+	if(typeof(content_font_size)=='undefined') content_font_size= '';
+
+	var target_src = request_uri+'modules/editor/styles/'+content_style+'/editor.html';
+
+	var textarea = jQuery("#xpress-editor-"+editor_sequence);
+	var iframe   = jQuery('<iframe id="editor_iframe_'+editor_sequence+'" allowTransparency="true" frameborder="0" src="'+target_src+'" scrolling="yes" style="width:100%;height:'+editor_height+'px">');
+	var htmlsrc  = jQuery('<textarea rows="10" cols="20" class="input_syntax '+colorset+'" style="display:none"></textarea>');
+	var form	 = textarea.get(0).form;
+	form.setAttribute('editor_sequence', editor_sequence);
+	textarea.css("display","none");
+
+	var saved_content = '';
+	if(jQuery("input[name=content]",form).size()>0){
+		saved_content=jQuery("input[name=content]",form).val().replace(/src=\"files\/attach/g,'src="'+request_uri+'files/attach'); //'
+		jQuery("#xpress-editor-"+editor_sequence).val(saved_content);
+	}
+
+	// hide textarea
+	textarea.hide().css('width', '99%').before(iframe).after(htmlsrc);
+
+	// create an editor
+	var oEditor		     = new xe.XpressCore();
+	var oWYSIWYGIFrame   = iframe.get(0);
+	var oIRTextarea	     = textarea.get(0);
+	var oHTMLSrcTextarea = htmlsrc.get(0);
+	var elAppContainer   = jQuery('.xpress-editor', form).get(0);
+
+	oEditor.getFrame = function(){ return oWYSIWYGIFrame;}
+	oEditor.getContent = function(){
+		editorGetContentTextarea_xe(editor_sequence);
+	}
+	
+	var content = form[content_key].value;
+	if(xFF && !content) content = '<br />';
+
+	// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+	content = editorReplacePath(content);
+
+	form[content_key].value = content;
+	jQuery("#xpress-editor-"+editor_sequence).val(content);
+
+	// Set standard API
+	editorRelKeys[editor_sequence] = new Array();
+	editorRelKeys[editor_sequence]["primary"]   = form[primary_key];
+	editorRelKeys[editor_sequence]["content"]   = form[content_key];
+	editorRelKeys[editor_sequence]["func"]	  = editorGetContentTextarea_xe;
+	editorRelKeys[editor_sequence]["editor"]	= oEditor;
+	editorRelKeys[editor_sequence]["pasteHTML"] = function(text){
+		oEditor.exec('PASTE_HTML',[text]);
+	}
+	xe.Editors[editor_sequence] = oEditor;
+
+	// register plugins
+	oEditor.registerPlugin(new xe.CorePlugin(null));
+
+	oEditor.registerPlugin(new xe.XE_PreservTemplate(jQuery("#xpress-editor-"+editor_sequence).val()));
+	oEditor.registerPlugin(new xe.StringConverterManager());
+	oEditor.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG", oIRTextarea, {nHeight:parseInt(editor_height), nMinHeight:205}, null, elAppContainer));
+	oEditor.registerPlugin(new xe.XE_EditingArea_HTMLSrc(oHTMLSrcTextarea));
+	oEditor.registerPlugin(new xe.XE_EditingAreaVerticalResizer(elAppContainer));
+	oEditor.registerPlugin(new xe.Utils());
+	oEditor.registerPlugin(new xe.DialogLayerManager());
+	oEditor.registerPlugin(new xe.ActiveLayerManager());
+	oEditor.registerPlugin(new xe.Hotkey());
+	oEditor.registerPlugin(new xe.XE_WYSIWYGStyler());
+	oEditor.registerPlugin(new xe.XE_WYSIWYGStyleGetter());
+	oEditor.registerPlugin(new xe.MessageManager(xe.XpressCore.oMessageMap));
+	oEditor.registerPlugin(new xe.XE_Toolbar(elAppContainer));
+
+	oEditor.registerPlugin(new xe.XE_XHTMLFormatter);
+	oEditor.registerPlugin(new xe.XE_GET_WYSYWYG_MODE(editor_sequence));
+
+	if(jQuery("ul.extra1").length) {
+		oEditor.registerPlugin(new xe.XE_ColorPalette(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FontColor(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_BGColor(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_Quote(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FontNameWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FontSizeWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_LineHeightWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_UndoRedo());
+		oEditor.registerPlugin(new xe.XE_Table(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_Hyperlink(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_FormatWithSelectUI(elAppContainer));
+		oEditor.registerPlugin(new xe.XE_SCharacter(elAppContainer));
+	}
+
+	if(jQuery("ul.extra2").length) {
+		oEditor.registerPlugin(new xe.XE_Extension(elAppContainer, editor_sequence));
+	}
+
+	if(jQuery("ul.extra3").length) {
+		oEditor.registerPlugin(new xe.XE_EditingModeToggler(elAppContainer));
+	}
+
+
+	//oEditor.registerPlugin(new xe.XE_Preview(elAppContainer));
+
+	if (!jQuery.browser.msie && !jQuery.browser.opera) {
+		oEditor.registerPlugin(new xe.XE_WYSIWYGEnterKey(oWYSIWYGIFrame));
+	}
+
+	// 자동 저장 사용
+	if (s=form._saved_doc_title) {
+		oEditor.registerPlugin(new xe.XE_AutoSave(oIRTextarea, elAppContainer));
+	}
+
+	function load_proc() {
+		try {
+			var doc = oWYSIWYGIFrame.contentWindow.document, str;
+			if (doc.location == 'about:blank') throw 'blank';
+
+			// get innerHTML
+			str = doc.body.innerHTML;
+
+			// register plugin
+			oEditor.registerPlugin(new xe.XE_EditingArea_WYSIWYG(oWYSIWYGIFrame));
+			oEditor.registerPlugin(new xe.XpressRangeManager(oWYSIWYGIFrame));
+			oEditor.registerPlugin(new xe.XE_ExecCommand(oWYSIWYGIFrame));
+
+			if(content_font && !doc.body.style.fontFamily) {
+				doc.body.style.fontFamily = content_font;
+			}
+			if(content_font_size && !doc.body.style.fontSize) {
+				doc.body.style.fontSize = content_font_size;
+			}
+
+			// run
+			oEditor.run();
+		} catch(e) {
+			setTimeout(load_proc, 0);
+		}
+	}
+
+	load_proc();
+
+	return oEditor;
+}
+
+function editorGetContentTextarea_xe(editor_sequence) {
+	var oEditor = xe.Editors[editor_sequence] || null;
+
+	if (!oEditor) return '';
+
+	var str = oEditor.getIR();
+
+	if(!jQuery.trim(str.replace(/(&nbsp;|<\/?(p|br|span|div)([^>]+)?>)/ig, ''))) return '';
+
+	// 파이어폭스의 경우 의미없는 <br>이 컨텐트 마지막에 추가될 수 있다.
+	str = str.replace(/<br ?\/?>$/i, '');
+
+	// 속도 문제가 있으므로 1024 문자 미만일 때만 첫 노드가 텍스트 노드인지 테스트
+	// 그 이상이면 P 노드가 정상적으로 생성되었다고 가정한다.
+	if (str.length < 1024) {
+		var inline_elements = Array('#text','A','BR','IMG','EM','STRONG','SPAN','BIG','CITE','CODE','DD','DFN','HR','INS','KBD','LINK','Q','SAMP','SMALL','SUB','SUP','TT');
+		var is_inline_contents = true;
+		var div   = jQuery('<div>'+str+'</div>').eq(0);
+		var nodes = div.contents();
+		jQuery.each(nodes, function() {
+			if (this.nodeType != 3) {
+				if(jQuery.inArray(this.nodeName, inline_elements ) == -1) {
+					is_inline_contents = false;
+				}
+			}
+		});
+		if(is_inline_contents) str = '<p>'+str+'</p>';
+	}
+
+	// 이미지 경로를 수정한다. - 20091125
+	str = str.replace(/src\s?=\s?(["']?)(?:\.\.\/)+(files\/attach\/)/ig, function(m0,m1,m2){
+		return 'src='+(m1||'')+m2;
+	});
+
+	str = str.replace(/\<(\/)?([A-Z]+)([^>]*)\>/ig, function(m0,m1,m2,m3) {
+		if(m3) {
+			m3 = m3.replace(/ ([A-Z]+?)\=/ig, function(n0,n1) {
+				n1 = n1.toLowerCase();
+				return ' '+n1+'=';
+			});
+		} else { m3 = ''; }
+		m2 = m2.toLowerCase();
+		if(!m1) m1='';
+		return '<'+m1+m2+m3+'>';
+	});
+	str = str.replace('<br>','<br />');
+
+	return str;
+}
+
+function editorGetIframe(srl) {
+	return jQuery('iframe#editor_iframe_'+srl).get(0);
+}
+
+function editorReplaceHTML(iframe_obj, content) {
+	// src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+	content = editorReplacePath(content);
+
+	var srl = parseInt(iframe_obj.id.replace(/^.*_/,''),10);
+	editorRelKeys[srl]["pasteHTML"](content);
+}
+
+function editorReplacePath(content) {
+	// 태그 내 src, href, url의 XE 상대경로를 http로 시작하는 full path로 변경
+	content = content.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig, function(m0,m1,m2,m3,m4,m5,m6) {
+		if(m2=="url(") { m3=''; m5=')'; } else { if(typeof(m3)=='undefined') m3 = '"'; if(typeof(m5)=='undefined') m5 = '"'; if(typeof(m6)=='undefined') m6 = ''; }
+		var val = jQuery.trim(m4).replace(/^\.\//,'');
+		if(/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(val)) return m0;
+		return '<'+m1+m2+m3+request_uri+val+m5+m6;
+	});
+	return content;
+}
+
+function editorGetAutoSavedDoc(form) {
+	var param = new Array();
+	param['mid'] = current_mid;
+	param['editor_sequence'] = form.getAttribute('editor_sequence')
+	setTimeout(function() {
+	  var response_tags = new Array("error","message","editor_sequence","title","content","document_srl");
+	  exec_xml('editor',"procEditorLoadSavedDocument", param, function(a,b,c) { editorRelKeys[param['editor_sequence']]['primary'].value = a['document_srl']; if(typeof(uploadSettingObj[param['editor_sequence']]) == 'object') editorUploadInit(uploadSettingObj[param['editor_sequence']], true); }, response_tags);
+	}, 0);
+	
+}
+
+// WYSIWYG 모드를 저장하는 확장기능
+xe.XE_GET_WYSYWYG_MODE = jQuery.Class({
+	name : "XE_GET_WYSYWYG_MODE",
+
+	$init : function(editor_sequence) {
+		this.editor_sequence = editor_sequence;
+	},
+
+	$ON_CHANGE_EDITING_MODE : function(mode) {
+		editorMode[this.editor_sequence] = (mode =='HTMLSrc') ? 'html' : 'wysiwyg';
+	}
+});
+
+// 서식 기본 내용을 보존
+xe.XE_PreservTemplate = jQuery.Class({
+	name : "XE_PreservTemplate",
+	isRun : false,
+
+	$BEFORE_SET_IR : function(content) {
+		if(!this.isRun && !content) {
+			this.isRun = true;
+			return false;
+		}
+	}
+});
+
+// 미리보기 확장기능
+xe.XE_Preview = jQuery.Class({
+	name  : "XE_Preview",
+	elPreviewButton : null,
+
+	$init : function(elAppContainer) {
+		this._assignHTMLObjects(elAppContainer);
+	},
+
+	_assignHTMLObjects : function(elAppContainer) {
+		this.elPreviewButton = jQuery("BUTTON.xpress_xeditor_preview_button", elAppContainer);
+	},
+
+	$ON_MSG_APP_READY : function() {
+		this.oApp.registerBrowserEvent(this.elPreviewButton.get(0), "click", "EVENT_PREVIEW", []);
+	},
+
+	$ON_EVENT_PREVIEW : function() {
+		// TODO : 버튼이 눌렸을 때의 동작 정의
+	}
+});
+function editorStartTextarea(editor_sequence, content_key, primary_key) {
+    var obj = xGetElementById('editor_'+editor_sequence);
+    var use_html = xGetElementById('htm_'+editor_sequence).value;
+    obj.form.setAttribute('editor_sequence', editor_sequence);
+
+    obj.style.width = '99%';
+
+    editorRelKeys[editor_sequence] = new Array();
+    editorRelKeys[editor_sequence]["primary"] = obj.form[primary_key];
+    editorRelKeys[editor_sequence]["content"] = obj.form[content_key];
+    editorRelKeys[editor_sequence]["func"] = editorGetContentTextarea;
+
+    var content = obj.form[content_key].value;
+    if(use_html) {
+        content = content.replace(/<br([^>]*)>/ig,"\n");
+        if(use_html!='br') {
+            content = content.replace(/&lt;/g, "<");
+            content = content.replace(/&gt;/g, ">");
+            content = content.replace(/&quot;/g, '"');
+            content = content.replace(/&amp;/g, "&");
+        }
+    }
+    obj.value = content;
+}
+
+function editorGetContentTextarea(editor_sequence) {
+    var obj = xGetElementById('editor_'+editor_sequence);
+    var use_html = xGetElementById('htm_'+editor_sequence).value;
+    var content = obj.value.trim();
+    if(use_html) {
+        if(use_html!='br') {
+            content = content.replace(/&/g, "&amp;");
+            content = content.replace(/</g, "&lt;");
+            content = content.replace(/>/g, "&gt;");
+            content = content.replace(/\"/g, "&quot;");
+        }
+        content = content.replace(/(\r\n|\n)/g, "<br />");
+    }
+    return content;
+}
diff --git a/modules/editor/skins/xpresseditor/js/xpresseditor.min.js b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
new file mode 100644
index 000000000..a226c9643
--- /dev/null
+++ b/modules/editor/skins/xpresseditor/js/xpresseditor.min.js
@@ -0,0 +1,211 @@
+(function(c){function k(a){function b(a){return function(){return a.apply(this.$this,arguments)}}a=a.prototype;this.prototype.$super={};for(var d in a)a.propertyIsEnumerable(d)&&(typeof this.prototype[d]=="undefined"&&(this.prototype[d]=a[d]),this.prototype.$super[d]=c.isFunction(a[d])?b(a[d]):a[d]);return this}c.extend({Class:function(a){function b(){if(typeof this.$super!="undefined")this.$super.$this=this;c.isFunction(this.$init)&&this.$init.apply(this,arguments)}b.prototype=a;b.constructor=b;
+b.extend=k;return b},$:function(a){return typeof a=="string"?a.substring(0,1)=="<"?c(a).get(0):c("#"+a).get(0):a},fnBind:function(a,b){var d=c.makeArray(arguments);d.shift();d.shift();return function(){var f=d.concat(c.makeArray(arguments));return a.apply(b,f)}}});c.browser.nVersion=parseFloat(c.browser.version);if(typeof window.xe=="undefined")window.xe={};xe.XpressCore=c.Class({name:"XpressCore",$init:function(a){a=!a?{}:c.Class({}).extend({oDebugger:null}).extend(a);if(a.oDebugger)this.oDebugger=
+a.oDebugger,this.oDebugger.oApp=this;this.commandQueue=[];this.oCommandMap={};this.oDisabledCommand={};this.aPlugins=[];this.appStatus=xe.APP_STATUS.NOT_READY;this.registerPlugin(this)},exec:function(a,b,d){if(this.appStatus==xe.APP_STATUS.NOT_READY)return this.commandQueue[this.commandQueue.length]={msg:a,args:b,event:d},true;this.exec=this._exec;this.exec(a,b,d)},delayedExec:function(a,b,d,f){a=c.fnBind(this.exec,this,a,b,f);setTimeout(a,d)},_exec:function(a,b,d){return(this._exec=this.oDebugger?
+this._execWithDebugger:this._execWithoutDebugger).call(this,a,b,d)},_execWithDebugger:function(a,b,d){this.oDebugger.log_MessageStart(a,b);d=this._doExec(a,b,d);this.oDebugger.log_MessageEnd(a,b);return d},_execWithoutDebugger:function(a,b,d){return this._doExec(a,b,d)},_doExec:function(a,b,d){var f=false;if(!this.oDisabledCommand[a]){var c=[];if(b&&b.length)for(var f=b.length,g=0;g<f;g++)c[g]=b[g];d&&(c[c.length]=d);(f=this._execMsgStep("BEFORE",a,c))&&(f=this._execMsgStep("ON",a,c));f&&(f=this._execMsgStep("AFTER",
+a,c))}return f},registerPlugin:function(a){if(!a)throw"An error occured in registerPlugin(): invalid plug-in";a.nIdx=this.aPlugins.length;a.oApp=this;this.aPlugins[a.nIdx]=a;if(a.status!=xe.PLUGIN_STATUS.NOT_READY)a.status=xe.PLUGIN_STATUS.READY;this.exec("MSG_PLUGIN_REGISTERED",[a]);return a.nIdx},disableCommand:function(a,b){this.oDisabledCommand[a]=b},registerBrowserEvent:function(a,b,d,f,e){a&&(f=f||[],d=e?c.fnBind(this.delayedExec,this,d,f,e):c.fnBind(this.exec,this,d,f),c(a).bind(b,d))},run:function(){this._changeAppStatus(xe.APP_STATUS.WAITING_FOR_PLUGINS_READY);
+var a=this.commandQueue.length;for(i=0;i<a;i++){var b=this.commandQueue[i];this.exec(b.msg,b.args,b.event)}this._waitForPluginReady()},createCommandMap:function(a){this.oCommandMap[a]=[];for(var b=this.aPlugins.length,d=0;d<b;d++)this._doAddToCommandMap(a,this.aPlugins[d])},addToCommandMap:function(a,b){this.oCommandMap[a]&&this._addToCommandMap(a,b)},_changeAppStatus:function(a){this.appStatus=a;this.appStatus==xe.APP_STATUS.READY&&this.exec("MSG_APP_READY")},_execMsgStep:function(a,b,d){return(this._execMsgStep=
+this.oDebugger?this._execMsgStepWithDebugger:this._execMsgStepWithoutDebugger).call(this,a,b,d)},_execMsgStepWithDebugger:function(a,b,d){this.oDebugger.log_MessageStepStart(a,b,d);var f=this._execMsgHandler("$"+a+"_"+b,d);this.oDebugger.log_MessageStepEnd(a,b,d);return f},_execMsgStepWithoutDebugger:function(a,b,d){return this._execMsgHandler("$"+a+"_"+b,d)},_execMsgHandler:function(a,b){this.oCommandMap[a]||this.createCommandMap(a);var d=this.oCommandMap[a],f=d.length;if(f==0)return true;var c,
+g=true;if(a.match(/^\$(BEFORE|ON|AFTER)_MSG_APP_READY$/))for(var h=0;h<f;h++){if(c=this._execHandler(d[h],a,b),c===false){g=false;break}}else for(h=0;h<f;h++)if(typeof d[h].$PRECONDITION!="function"||this._execHandler(d[h],"$PRECONDITION",[a,b]))if(c=this._execHandler(d[h],a,b),c===false){g=false;break}return g},_execHandler:function(a,b,d){return(this._execHandler=this.oDebugger?this._execHandlerWithDebugger:this._execHandlerWithoutDebugger).call(this,a,b,d)},_execHandlerWithDebugger:function(a,
+b,d){this.oDebugger.log_CallHandlerStart(a,b,d);var f=a[b].apply(a,d);this.oDebugger.log_CallHandlerEnd(a,b,d);return f},_execHandlerWithoutDebugger:function(a,b,d){return a[b].apply(a,d)},_doAddToCommandMap:function(a,b){typeof b[a]=="function"&&(this.oCommandMap[a][this.oCommandMap[a].length]=b)},_waitForPluginReady:function(){for(var a=true,b=0;b<this.aPlugins.length;b++)if(this.aPlugins[b].status==xe.PLUGIN_STATUS.NOT_READY){a=false;break}a?this._changeAppStatus(xe.APP_STATUS.READY):setTimeout(c.fnBind(this._waitForPluginReady,
+this),100)}});xe.APP_STATUS={NOT_READY:0,WAITING_FOR_PLUGINS_READY:1,READY:2};xe.PLUGIN_STATUS={NOT_READY:0,READY:1};xe.W3CDOMRange=c.Class({$init:function(a){this._document=a||document;this.collapsed=true;this.endContainer=this.commonAncestorContainer=this._document.body;this.endOffset=0;this.startContainer=this._document.body;this.startOffset=0},cloneContents:function(){var a=this._document.createDocumentFragment(),b=this._document.createDocumentFragment(),d=this._getNodesInRange();if(d.length<
+1)return a;d=this._constructClonedTree(d,b);if(b=b.firstChild)for(var b=b.firstChild,f;b;)f=b.nextSibling,a.appendChild(b),b=f;d=this._splitTextEndNodes({oStartContainer:d.oStartContainer,iStartOffset:this.startOffset,oEndContainer:d.oEndContainer,iEndOffset:this.endOffset});d.oStartContainer&&d.oStartContainer.previousSibling&&xe.DOMFix.parentNode(d.oStartContainer).removeChild(d.oStartContainer.previousSibling);d.oEndContainer&&d.oEndContainer.nextSibling&&xe.DOMFix.parentNode(d.oEndContainer).removeChild(d.oEndContainer.nextSibling);
+return a},_constructClonedTree:function(a,b){var d=null,f=null,c=this.startContainer,g=this.endContainer;_recurConstructClonedTree=function(a,b,j,p){if(b<0)return b;var j=b-1,n=a[b].cloneNode(false);a[b]==c&&(d=n);for(a[b]==g&&(f=n);j>=0&&xe.DOMFix.parentNode(a[j])==a[b];)j=this._recurConstructClonedTree(a,j,a[b],n,d,f);p.insertBefore(n,p.firstChild);return j};a[a.length]=xe.DOMFix.parentNode(a[a.length-1]);_recurConstructClonedTree(a,a.length-1,a[a.length-1],b);return{oStartContainer:d,oEndContainer:f}},
+cloneRange:function(){return this._copyRange(new xe.W3CDOMRange(this._document))},_copyRange:function(a){a.collapsed=this.collapsed;a.commonAncestorContainer=this.commonAncestorContainer;a.endContainer=this.endContainer;a.endOffset=this.endOffset;a.startContainer=this.startContainer;a.startOffset=this.startOffset;a._document=this._document;return a},collapse:function(a){a?(this.endContainer=this.startContainer,this.endOffset=this.startOffset):(this.startContainer=this.endContainer,this.startOffset=
+this.endOffset);this._updateRangeInfo()},compareBoundaryPoints:function(a,b){switch(a){case xe.W3CDOMRange.START_TO_START:return this._compareEndPoint(this.startContainer,this.startOffset,b.startContainer,b.startOffset);case xe.W3CDOMRange.START_TO_END:return this._compareEndPoint(this.endContainer,this.endOffset,b.startContainer,b.startOffset);case xe.W3CDOMRange.END_TO_END:return this._compareEndPoint(this.endContainer,this.endOffset,b.endContainer,b.endOffset);case xe.W3CDOMRange.END_TO_START:return this._compareEndPoint(this.startContainer,
+this.startOffset,b.endContainer,b.endOffset)}},_findBody:function(a){if(!a)return null;for(;a;){if(a.tagName=="BODY")return a;a=xe.DOMFix.parentNode(a)}return null},_compareEndPoint:function(a,b,d,f){if(!a||this._findBody(a)!=this._document.body)a=this._document.body,b=0;if(!d||this._findBody(d)!=this._document.body)d=this._document.body,f=0;var c=this._getCommonAncestorContainer(a,d);if(a!=c){for(;(oTmpNode=xe.DOMFix.parentNode(a))!=c;)a=oTmpNode;b=this._getPosIdx(a)+0.5}if(d!=c){for(;(oTmpNode=
+xe.DOMFix.parentNode(d))!=c;)d=oTmpNode;f=this._getPosIdx(d)+0.5}f==-1&&(f=b+1);return b<f?-1:b==f?0:1},_getCommonAncestorContainer:function(a,b){for(var d=b;a;){for(;d;){if(a==d)return a;d=xe.DOMFix.parentNode(d)}d=b;a=xe.DOMFix.parentNode(a)}return this._document.body},deleteContents:function(){if(!this.collapsed){this._splitTextEndNodesOfTheRange();var a=this._getNodesInRange();if(!(a.length<1)){for(var b=a[0].previousSibling;b&&this._isBlankTextNode(b);)b=b.previousSibling;var d,f;b||(d=xe.DOMFix.parentNode(a[0]),
+f=0);for(var c=0;c<a.length;c++){var g=a[c];g.firstChild||(d==g&&(f=this._getPosIdx(d),d=xe.DOMFix.parentNode(g)),xe.DOMFix.parentNode(g).removeChild(g))}b?b.tagName=="BODY"?this.setStartBefore(b):this.setStartAfter(b):this.setStart(d,f);this.collapse(true)}}},extractContents:function(){var a=this.cloneContents();this.deleteContents();return a},insertNode:function(a){var b=null,d;this.startContainer.nodeType=="3"?(d=xe.DOMFix.parentNode(this.startContainer),b=this.startContainer.nodeValue.length<=
+this.startOffset?this.startContainer.nextSibling:this.startContainer.splitText(this.startOffset)):(d=this.startContainer,b=xe.DOMFix.childNodes(this.startContainer)[this.startOffset]);if(!b||!xe.DOMFix.parentNode(b))b=null;d.insertBefore(a,b);this.setStartBefore(a)},selectNode:function(a){this.setStartBefore(a);this.setEndAfter(a)},selectNodeContents:function(a){this.setStart(a,0);this.setEnd(a,xe.DOMFix.childNodes(a).length)},_endsNodeValidation:function(a,b){if(!a||this._findBody(a)!=this._document.body)throw Error("INVALID_NODE_TYPE_ERR oNode is not part of current document");
+if(a.nodeType==3){if(b>a.nodeValue.length)b=a.nodeValue.length}else if(b>xe.DOMFix.childNodes(a).length)b=xe.DOMFix.childNodes(a).length;return b},setEnd:function(a,b){b=this._endsNodeValidation(a,b);this.endContainer=a;this.endOffset=b;(!this.startContainer||this._compareEndPoint(this.startContainer,this.startOffset,this.endContainer,this.endOffset)!=-1)&&this.collapse(false);this._updateRangeInfo()},setEndAfter:function(a){if(!a)throw Error("INVALID_NODE_TYPE_ERR in setEndAfter");a.tagName=="BODY"?
+this.setEnd(a,xe.DOMFix.childNodes(a).length):this.setEnd(xe.DOMFix.parentNode(a),this._getPosIdx(a)+1)},setEndBefore:function(a){if(!a)throw Error("INVALID_NODE_TYPE_ERR in setEndBefore");a.tagName=="BODY"?this.setEnd(a,0):this.setEnd(xe.DOMFix.parentNode(a),this._getPosIdx(a))},setStart:function(a,b){b=this._endsNodeValidation(a,b);this.startContainer=a;this.startOffset=b;(!this.endContainer||this._compareEndPoint(this.startContainer,this.startOffset,this.endContainer,this.endOffset)!=-1)&&this.collapse(true);
+this._updateRangeInfo()},setStartAfter:function(a){if(!a)throw Error("INVALID_NODE_TYPE_ERR in setStartAfter");a.tagName=="BODY"?this.setStart(a,xe.DOMFix.childNodes(a).length):this.setStart(xe.DOMFix.parentNode(a),this._getPosIdx(a)+1)},setStartBefore:function(a){if(!a)throw Error("INVALID_NODE_TYPE_ERR in setStartBefore");a.tagName=="BODY"?this.setStart(a,0):this.setStart(xe.DOMFix.parentNode(a),this._getPosIdx(a))},surroundContents:function(a){a.appendChild(this.extractContents());this.insertNode(a);
+this.selectNode(a)},toString:function(){var a=this._document.createElement("DIV");a.appendChild(this.cloneContents());return a.textContent||a.innerText||""},_isBlankTextNode:function(a){return a.nodeType==3&&a.nodeValue==""?true:false},_getPosIdx:function(a){for(var b=0,a=a.previousSibling;a;a=a.previousSibling)b++;return b},_updateRangeInfo:function(){this.startContainer?(this.collapsed=this._isCollapsed(this.startContainer,this.startOffset,this.endContainer,this.endOffset),this.commonAncestorContainer=
+this._getCommonAncestorContainer(this.startContainer,this.endContainer)):this.init(this._document)},_isCollapsed:function(a,b,d,c){var e=false;if(a==d&&b==c)e=true;else if(a=this._getActualStartNode(a,b),d=this._getActualEndNode(d,c),a=this._getNextNode(this._getPrevNode(a)),d=this._getPrevNode(this._getNextNode(d)),a&&d&&d.tagName!="BODY"&&(this._getNextNode(d)==a||d==a&&this._isBlankTextNode(d)))e=true;return e},_splitTextEndNodesOfTheRange:function(){var a=this._splitTextEndNodes({oStartContainer:this.startContainer,
+iStartOffset:this.startOffset,oEndContainer:this.endContainer,iEndOffset:this.endOffset});this.startContainer=a.oStartContainer;this.startOffset=a.iStartOffset;this.endContainer=a.oEndContainer;this.endOffset=a.iEndOffset},_splitTextEndNodes:function(a){a=this._splitStartTextNode(a);return a=this._splitEndTextNode(a)},_splitStartTextNode:function(a){var b=a.oStartContainer,d=a.iStartOffset,c=a.oEndContainer,e=a.iEndOffset;if(!b)return a;if(b.nodeType!=3)return a;if(d==0)return a;if(b.nodeValue.length<=
+d)return a;a=b.splitText(d);b==c&&(e-=d,c=a);return{oStartContainer:a,iStartOffset:0,oEndContainer:c,iEndOffset:e}},_splitEndTextNode:function(a){var b=a.oStartContainer,d=a.iStartOffset,c=a.oEndContainer,e=a.iEndOffset;if(!c)return a;if(c.nodeType!=3)return a;if(e>=c.nodeValue.length)return a;if(e==0)return a;c.splitText(e);return{oStartContainer:b,iStartOffset:d,oEndContainer:c,iEndOffset:e}},_getNodesInRange:function(){if(this.collapsed)return[];var a=this._getActualStartNode(this.startContainer,
+this.startOffset),b=this._getActualEndNode(this.endContainer,this.endOffset);return this._getNodesBetween(a,b)},_getActualStartNode:function(a,b){var d=a;a.nodeType==3?b>=a.nodeValue.length?(d=this._getNextNode(a),d.tagName=="BODY"&&(d=null)):d=a:b<xe.DOMFix.childNodes(a).length?d=xe.DOMFix.childNodes(a)[b]:(d=this._getNextNode(a),d.tagName=="BODY"&&(d=null));return d},_getActualEndNode:function(a,b){var d=a;b==0?(d=this._getPrevNode(a),d.tagName=="BODY"&&(d=null)):d=a.nodeType==3?a:xe.DOMFix.childNodes(a)[b-
+1];return d},_getNextNode:function(a){return!a||a.tagName=="BODY"?this._document.body:a.nextSibling?a.nextSibling:this._getNextNode(xe.DOMFix.parentNode(a))},_getPrevNode:function(a){return!a||a.tagName=="BODY"?this._document.body:a.previousSibling?a.previousSibling:this._getPrevNode(xe.DOMFix.parentNode(a))},_getNodesBetween:function(a,b){var d=[];this._nNodesBetweenLen=0;if(!a||!b)return d;this._recurGetNextNodesUntil(a,b,d);return d},_recurGetNextNodesUntil:function(a,b,d){if(!a)return false;if(!this._recurGetChildNodesUntil(a,
+b,d))return false;for(var c=a.nextSibling;!c;){if(!(a=xe.DOMFix.parentNode(a)))return false;d[this._nNodesBetweenLen++]=a;if(a==b)return false;c=a.nextSibling}return this._recurGetNextNodesUntil(c,b,d)},_recurGetChildNodesUntil:function(a,b,d){if(!a)return false;var c=false,e=a;if(e.firstChild)for(e=e.firstChild;e;){if(!this._recurGetChildNodesUntil(e,b,d)){c=true;break}e=e.nextSibling}d[this._nNodesBetweenLen++]=a;return c?false:a==b?false:true}});xe.W3CDOMRange.START_TO_START=0;xe.W3CDOMRange.START_TO_END=
+1;xe.W3CDOMRange.END_TO_END=2;xe.W3CDOMRange.END_TO_START=3;xe.XpressRange=c.Class({setWindow:function(a){this._window=a;this._document=a.document},$init:function(a){this.HUSKY_BOOMARK_START_ID_PREFIX="xpress_bookmark_start_";this.HUSKY_BOOMARK_END_ID_PREFIX="xpress_bookmark_end_";this.sBlockElement="P|DIV|LI|H[1-6]|PRE";this.sBlockContainer="BODY|TABLE|TH|TR|TD|UL|OL|BLOCKQUOTE|FORM";this.rxBlockElement=RegExp("^("+this.sBlockElement+")$");this.rxBlockContainer=RegExp("^("+this.sBlockContainer+")$");
+this.rxLineBreaker=RegExp("^("+this.sBlockElement+"|"+this.sBlockContainer+")$");this.setWindow(a);this.oSimpleSelection=new xe.SimpleSelection(this._window);this.selectionLoaded=this.oSimpleSelection.selectionLoaded;this.$super.$init(this._document)},select:function(){this.oSimpleSelection.selectRange(this)},setFromSelection:function(a){this.setRange(this.oSimpleSelection.getRangeAt(a))},setRange:function(a){this.setStart(a.startContainer,a.startOffset);this.setEnd(a.endContainer,a.endOffset)},setEndNodes:function(a,
+b){this.setEndAfter(b);this.setStartBefore(a)},splitTextAtBothEnds:function(){this._splitTextEndNodesOfTheRange()},getStartNode:function(){return this.collapsed?this.startContainer.nodeType==3?this.startOffset==0?null:this.startContainer.nodeValue.length<=this.startOffset?null:this.startContainer:null:this.startContainer.nodeType==3?this.startOffset>=this.startContainer.nodeValue.length?this._getNextNode(this.startContainer):this.startContainer:this.startOffset>=xe.DOMFix.childNodes(this.startContainer).length?
+this._getNextNode(this.startContainer):xe.DOMFix.childNodes(this.startContainer)[this.startOffset]},getEndNode:function(){return this.collapsed?this.getStartNode():this.endContainer.nodeType==3?this.endOffset==0?this._getPrevNode(this.endContainer):this.endContainer:this.endOffset==0?this._getPrevNode(this.endContainer):xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1]},getNodeAroundRange:function(a,b){if(this.collapsed&&this.startContainer&&this.startContainer.nodeType==3)return this.startContainer;
+if(!this.collapsed||this.startContainer&&this.startContainer.nodeType==3)return this.getStartNode();var d,c,e;c=this.startOffset>=xe.DOMFix.childNodes(this.startContainer).length?this._getNextNode(this.startContainer):xe.DOMFix.childNodes(this.startContainer)[this.startOffset];d=this.endOffset==0?this._getPrevNode(this.endContainer):xe.DOMFix.childNodes(this.endContainer)[this.endOffset-1];a?(e=d,!e&&!b&&(e=c)):(e=c,!e&&!b&&(e=d));return e},_getXPath:function(a){for(var b="";a&&a.nodeType==1;)b="/"+
+a.tagName+"["+this._getPosIdx4XPath(a)+"]"+b,a=xe.DOMFix.parentNode(a);return b},_getPosIdx4XPath:function(a){for(var b=0,d=a.previousSibling;d;d=d.previousSibling)d.tagName==a.tagName&&b++;return b},_evaluateXPath:function(a,b){for(var a=a.substring(1,a.length-1),d=a.split(/\//),c=b.body,e=2;e<d.length&&c;e++){d[e].match(/([^\[]+)\[(\d+)/i);for(var g=RegExp.$1,h=RegExp.$2,c=xe.DOMFix.childNodes(c),l=[],j=c.length,p=0,n=0;n<j;n++)c[n].tagName==g&&(l[p++]=c[n]);c=l.length<h?null:l[h]}return c},_evaluateXPathBookmark:function(a){var b=
+a.nTextNodeIdx,d=a.nOffset,a=this._evaluateXPath(a.sXPath,this._document);if(b>-1&&a){for(var c=xe.DOMFix.childNodes(a),e=null;(e=c[b])&&e.nodeType==3&&e.nodeValue.length<d;)d-=e.nodeValue.length,b++;a=xe.DOMFix.childNodes(a)[b]}if(!a)a=this._document.body,d=0;return{elContainer:a,nOffset:d}},getXPathBookmark:function(){var a=-1,b={elContainer:this.startContainer,nOffset:this.startOffset},d=this.startContainer;d.nodeType==3&&(b=this._getFixedStartTextNode(),a=this._getPosIdx(b.elContainer),d=xe.DOMFix.parentNode(d));
+var a={sXPath:this._getXPath(d),nTextNodeIdx:a,nOffset:b.nOffset},b=-1,d={elContainer:this.endContainer,nOffset:this.endOffset},c=this.endContainer;c.nodeType==3&&(d=this._getFixedEndTextNode(),b=this._getPosIdx(d.elContainer),c=xe.DOMFix.parentNode(c));b={sXPath:this._getXPath(c),nTextNodeIdx:b,nOffset:d.nOffset};return[a,b]},moveToXPathBookmark:function(a){if(a){var b=this._evaluateXPathBookmark(a[0]),a=this._evaluateXPathBookmark(a[1]);if(b.elContainer&&a.elContainer)this.startContainer=b.elContainer,
+this.startOffset=b.nOffset,this.endContainer=a.elContainer,this.endOffset=a.nOffset}},_getFixedTextContainer:function(a,b){for(;a&&a.nodeType==3&&a.previousSibling&&a.previousSibling.nodeType==3;)b+=a.previousSibling.nodeValue.length,a=a.previousSibling;return{elContainer:a,nOffset:b}},_getFixedStartTextNode:function(){return this._getFixedTextContainer(this.startContainer,this.startOffset)},_getFixedEndTextNode:function(){return this._getFixedTextContainer(this.endContainer,this.endOffset)},placeStringBookmark:function(){var a=
+(new Date).getTime(),b=this.cloneRange();b.collapseToEnd();var d=this._document.createElement("A");d.id=this.HUSKY_BOOMARK_END_ID_PREFIX+a;b.insertNode(d);b=this.cloneRange();b.collapseToStart();d=this._document.createElement("A");d.id=this.HUSKY_BOOMARK_START_ID_PREFIX+a;b.insertNode(d);this.moveToBookmark(a);return a},cloneRange:function(){return this._copyRange(new xe.XpressRange(this._window))},moveToBookmark:function(a){typeof a!="object"?this.moveToStringBookmark(a):this.moveToXPathBookmark(a)},
+moveToStringBookmark:function(a){var b=this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+a),a=this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+a);b&&a&&(this.setEndBefore(a),this.setStartAfter(b))},removeStringBookmark:function(a){var b=this._document.getElementById(this.HUSKY_BOOMARK_START_ID_PREFIX+a),a=this._document.getElementById(this.HUSKY_BOOMARK_END_ID_PREFIX+a);b&&xe.DOMFix.parentNode(b).removeChild(b);a&&xe.DOMFix.parentNode(a).removeChild(a)},collapseToStart:function(){this.collapse(true)},
+collapseToEnd:function(){this.collapse(false)},createAndInsertNode:function(){tmpNode=this._document.createElement(tagName);this.insertNode(tmpNode);return tmpNode},getNodes:function(a,b){a&&this._splitTextEndNodesOfTheRange();var d=this._getNodesInRange(),c=[];if(!b)return d;for(var e=0;e<d.length;e++)b(d[e])&&(c[c.length]=d[e]);return c},getTextNodes:function(a){return this.getNodes(a,function(a){return a.nodeType==3&&a.nodeValue!="\n"&&a.nodeValue!=""?true:false})},surroundContentsWithNewNode:function(a){a=
+this._document.createElement(a);this.surroundContents(a);return a},isRangeinRange:function(a){var b=this.compareBoundaryPoints(this.START_TO_START,a),d=this.compareBoundaryPoints(this.START_TO_END,a),c=this.compareBoundaryPoints(this.END_TO_START,a),a=this.compareBoundaryPoints(this.END_TO_END,a);return b<=0&&a>=0?true:bIncludePartlyIncluded?d==1?false:c==-1?false:true:false},isNodeInRange:function(a,b,d){var c=new xe.XpressRange(this._window);d&&a.firstChild?(c.setStartBefore(a.firstChild),c.setEndAfter(a.lastChild)):
+c.selectNode(a);return isRangeInRange(c,b)},pasteHTML:function(a){if(a=="")this.deleteContents();else{var b=this._document.createElement("DIV");b.innerHTML=a;for(var a=b.firstChild,d=b.lastChild,c=this.cloneRange(),e=c.placeStringBookmark();b.lastChild;)this.insertNode(b.lastChild);this.setEndNodes(a,d);c.moveToBookmark(e);c.deleteContents();c.removeStringBookmark(e)}},toString:function(){this.toString=xe.W3CDOMRange.prototype.toString;return this.toString()},toHTMLString:function(){var a=this._document.createElement("DIV");
+a.appendChild(this.cloneContents());return a.innerHTML},findAncestorByTagName:function(a){for(var b=this.commonAncestorContainer;b&&b.tagName!=a;)b=xe.DOMFix.parentNode(b);return b},selectNodeContents:function(a){if(a){var b=a.firstChild?a.firstChild:a,a=a.lastChild?a.lastChild:a;b.nodeType==3?this.setStart(b,0):this.setStartBefore(b);a.nodeType==3?this.setEnd(a,a.nodeValue.length):this.setEndAfter(a)}},styleRange:function(a,b,d){d=this._getStyleParentNodes(d);if(!(d.length<1)){for(var f,e,g=0;g<
+d.length;g++){for(var h in a)f=h,e=a[f],typeof e=="string"&&(d[g].style[f]=e);if(b)for(h in b)f=h,e=b[f],typeof e=="string"&&(f=="class"?c(d[g]).addClass(e):d[g].setAttribute(f,e))}this.setStartBefore(d[0]);this.setEndAfter(d[d.length-1])}},_getStyleParentNodes:function(a){this._splitTextEndNodesOfTheRange();for(var b=this.getStartNode(),d=this.getEndNode(),f=this._getNodesInRange(),e=[],g=0,h,l,j,p,n,k=f.length,m=c(f).filter(function(){return!!this.childNodes.length}),o=0;o<k;o++)if((h=f[o])&&!(h.nodeType!=
+3||h.nodeValue=="")){n=xe.DOMFix.parentNode(h);if(n.tagName=="SPAN"&&(l=this._getVeryFirstRealChild(n),j=l==h?1:m.indexOf(l),j!=-1&&(l=this._getVeryLastRealChild(n),p=l==h?1:m.indexOf(l)),j!=-1&&p!=-1)){e[g++]=n;continue}l=this._document.createElement("SPAN");n.insertBefore(l,h);l.appendChild(h);e[g++]=l;a&&l.setAttribute(a,"true")}this.setStartBefore(b);this.setEndAfter(d);return e},_getVeryFirstChild:function(a){return a.firstChild?this._getVeryFirstChild(a.firstChild):a},_getVeryLastChild:function(a){return a.lastChild?
+this._getVeryLastChild(a.lastChild):a},_getFirstRealChild:function(a){for(a=a.firstChild;a&&a.nodeType==3&&a.nodeValue=="";)a=a.nextSibling;return a},_getLastRealChild:function(a){for(a=a.lastChild;a&&a.nodeType==3&&a.nodeValue=="";)a=a.previousSibling;return a},_getVeryFirstRealChild:function(a){var b=this._getFirstRealChild(a);return b?this._getVeryFirstRealChild(b):a},_getVeryLastRealChild:function(a){var b=this._getLastRealChild(a);return b?this._getVeryLastChild(b):a},_getLineStartInfo:function(a){function b(a){a&&
+!c&&(l.test(a.tagName)?(g=a,c=e,h=true):(e=a,d(a.previousSibling),c||b(xe.DOMFix.parentNode(a))))}function d(a){if(a&&!c)if(l.test(a.tagName))g=a,c=e,h=false;else{if(a.firstChild&&a.tagName!="TABLE")for(var b=a.lastChild;b&&!c;)d(b),b=b.previousSibling;else e=a;c||d(a.previousSibling)}}var c=null,e=a,g=a,h=true,l=this.rxLineBreaker;b(a);return{oNode:c,oLineBreaker:g,bParentBreak:h}},_getLineEndInfo:function(a){function b(a){a&&!c&&(l.test(a.tagName)?(g=a,c=e,h=true):(e=a,d(a.nextSibling),c||b(xe.DOMFix.parentNode(a))))}
+function d(a){if(a&&!c)if(l.test(a.tagName))g=a,c=e,h=false;else{if(a.firstChild&&a.tagName!="TABLE")for(var b=a.firstChild;b&&!c;)d(b),b=b.nextSibling;else e=a;c||d(a.nextSibling)}}var c=null,e=a,g=a,h=true,l=this.rxLineBreaker;b(a);return{oNode:c,oLineBreaker:g,bParentBreak:h}},getLineInfo:function(){var a=this.getStartNode(),b=this.getEndNode();a||(a=this.getNodeAroundRange(true,true));b||(b=this.getNodeAroundRange(true,true));var a=this._getLineStartInfo(a),d=a.oNode,b=this._getLineEndInfo(b),
+c=b.oNode,d=this._compareEndPoint(xe.DOMFix.parentNode(d),this._getPosIdx(d),this.endContainer,this.endOffset),c=this._compareEndPoint(xe.DOMFix.parentNode(c),this._getPosIdx(c)+1,this.startContainer,this.startOffset);d<=0&&c>=0||(a=this.getNodeAroundRange(false,true),b=this.getNodeAroundRange(false,true),a=this._getLineStartInfo(a),b=this._getLineEndInfo(b));return{oStart:a,oEnd:b}}}).extend(xe.W3CDOMRange);xe.SimpleSelection=function(a){this.init=function(a){this._window=a||window;this._document=
+this._window.document};this.init(a);c.browser.msie?xe.SimpleSelectionImpl_IE.apply(this):xe.SimpleSelectionImpl_FF.apply(this);this.selectRange=function(a){this.selectNone();this.addRange(a)};this.selectionLoaded=true;if(!this._oSelection)this.selectionLoaded=false};xe.SimpleSelectionImpl_FF=function(){this._oSelection=this._window.getSelection();this.getRangeAt=function(a){try{var b=this._oSelection.getRangeAt(a||0)}catch(d){return new xe.W3CDOMRange(this._document)}return this._FFRange2W3CRange(b)};
+this.addRange=function(a){this._oSelection.addRange(this._W3CRange2FFRange(a))};this.selectNone=function(){this._oSelection.removeAllRanges()};this._FFRange2W3CRange=function(a){var b=new xe.W3CDOMRange(this._document);b.setStart(a.startContainer,a.startOffset);b.setEnd(a.endContainer,a.endOffset);return b};this._W3CRange2FFRange=function(a){var b=this._document.createRange();b.setStart(a.startContainer,a.startOffset);b.setEnd(a.endContainer,a.endOffset);return b}};xe.SimpleSelectionImpl_IE=function(){this._oSelection=
+this._document.selection;this.getRangeAt=function(a){a=a||0;if(this._oSelection.type=="Control"){var b=new xe.W3CDOMRange(this._document),d=this._oSelection.createRange().item(a);if(!d||d.ownerDocument!=this._document)return b;b.selectNode(d);return b}else{d=this._oSelection.createRangeCollection().item(a).parentElement();return!d||d.ownerDocument!=this._document?b=new xe.W3CDOMRange(this._document):this._IERange2W3CRange(this._oSelection.createRangeCollection().item(a))}};this.addRange=function(a){this._W3CRange2IERange(a).select()};
+this.selectNone=function(){this._oSelection.empty()};this._W3CRange2IERange=function(a){var b=this._getIERangeAt(a.startContainer,a.startOffset),a=this._getIERangeAt(a.endContainer,a.endOffset);b.setEndPoint("EndToEnd",a);return b};this._getIERangeAt=function(a,b){var d=this._document.body.createTextRange(),c=this._getSelectableNodeAndOffsetForIE(a,b),e=c.iOffsetForIE;d.moveToElementText(c.oSelectableNodeForIE);d.collapse(c.bCollapseToStart);d.moveStart("character",e);return d};this._getSelectableNodeAndOffsetForIE=
+function(a,b){var d=this._document.body.createTextRange(),c=null,e=null,g=0;a.nodeType==3?(c=xe.DOMFix.parentNode(a),e=xe.DOMFix.childNodes(c),g=e.length):(c=a,e=xe.DOMFix.childNodes(c),g=b);for(var h=null,l=0,j=true,k=0;k<g;k++)if(h=e[k],h.nodeType==3){if(h==a)break;l+=h.nodeValue.length}else d.moveToElementText(h),c=h,l=0,j=false;a.nodeType==3&&(l+=b);return{oSelectableNodeForIE:c,iOffsetForIE:l,bCollapseToStart:j}};this._IERange2W3CRange=function(a){var b=new xe.W3CDOMRange(this._document),d=null,
+d=null,d=a.duplicate();d.collapse(true);d=this._getW3CContainerAndOffset(d,true);b.setStart(d.oContainer,d.iOffset);d=a.duplicate();d.collapse(true);d.isEqual(a)?b.collapse(true):(d=a.duplicate(),d.collapse(false),d=this._getW3CContainerAndOffset(d),b.setEnd(d.oContainer,d.iOffset));return b};this._getW3CContainerAndOffset=function(a,b){for(var d=a.parentElement(),c=-1,e=this._document.body.createTextRange(),g=xe.DOMFix.childNodes(d),c=null,h=0,h=0;h<g.length;h++)if(g[h].nodeType!=3){e.moveToElementText(g[h]);
+if(e.compareEndPoints("StartToStart",a)>=0)break;c=g[h]}if(h!=0&&g[h-1].nodeType==3){g=this._document.body.createTextRange();e=null;c?(g.moveToElementText(c),g.collapse(false),e=c.nextSibling):(g.moveToElementText(d),g.collapse(true),e=d.firstChild);d=a.duplicate();d.setEndPoint("StartToStart",g);for(c=d.text.length;c>e.nodeValue.length&&e.nextSibling;)c-=e.nodeValue.length,e=e.nextSibling;if(b&&e.nextSibling&&e.nextSibling.nodeType==3&&c==e.nodeValue.length)c-=e.nodeValue.length,e=e.nextSibling;
+d=e}else d=a.parentElement(),c=h;return{oContainer:d,iOffset:c}}};xe.DOMFix=new (c.Class({$init:function(){c.browser.msie||c.browser.opera?(this.childNodes=this._childNodes_Fix,this.parentNode=this._parentNode_Fix):(this.childNodes=this._childNodes_Native,this.parentNode=this._parentNode_Native)},_parentNode_Native:function(a){return a.parentNode},_parentNode_Fix:function(a){if(!a)return a;for(;a.previousSibling;)a=a.previousSibling;return a.parentNode},_childNodes_Native:function(a){return a.childNodes},
+_childNodes_Fix:function(a){var b=null,d=0;if(a){b=[];for(a=a.firstChild;a;)b[d++]=a,a=a.nextSibling}return b}}));xe.DraggableLayer=c.Class({$init:function(a,b){this.oOptions=c.extend({bModal:"false",oHandle:a,iMinX:-999999,iMinY:-999999,iMaxX:999999,iMaxY:999999},b);this.oHandle=this.oOptions.oHandle;a.style.display="block";a.style.position="absolute";a.style.zIndex="9999";this.aBasePosition=this.getBaseOffset(a);a.style.top=this.toInt(c(a).offset().top)-this.aBasePosition.top+"px";a.style.left=
+this.toInt(c(a).offset().left)-this.aBasePosition.left+"px";this.$FnMouseDown=c.fnBind(this._mousedown,this,a);this.$FnMouseMove=c.fnBind(this._mousemove,this,a);this.$FnMouseUp=c.fnBind(this._mouseup,this,a);c(this.oHandle).bind("mousedown",this.$FnMouseDown)},_mousedown:function(a,b){if(b.target.tagName!="INPUT")this.MouseOffsetY=b.pageY-this.toInt(a.style.top)-this.aBasePosition.top,this.MouseOffsetX=b.pageX-this.toInt(a.style.left)-this.aBasePosition.left,c(a).bind("mousemove",this.$FnMouseMove),
+c(a).bind("mouseup",this.$FnMouseUp)},_mousemove:function(a,b){var d=b.pageY-this.MouseOffsetY-this.aBasePosition.top,c=b.pageX-this.MouseOffsetX-this.aBasePosition.left;if(d<this.oOptions.iMinY)d=this.oOptions.iMinY;if(d>this.oOptions.iMaxY)d=this.oOptions.iMaxY;if(c<this.oOptions.iMinX)c=this.oOptions.iMinX;if(c>this.oOptions.iMaxX)c=this.oOptions.iMaxX;a.style.top=d+"px";a.style.left=c+"px"},_mouseup:function(a){c(a).unbind("mousemove",this.$FnMouseMove);c(a).unbind("mouseup",this.$FnMouseUp)},
+toInt:function(a){return parseInt(a)||0},findNonStatic:function(a){return!a?null:a.tagName=="BODY"?a:c(a).css("position").match(/absolute|relative/i)?a:this.findNonStatic(a.offsetParent)},getBaseOffset:function(a){a=this.findNonStatic(a.offsetParent);a=c(a).offset();return{top:a.top,left:a.left}}});xe.CorePlugin=c.Class({name:"CorePlugin",$init:function(a){this.funcOnReady=a},$AFTER_MSG_APP_READY:function(){this.oApp.exec("EXEC_ON_READY_FUNCTION",[])},$ON_ADD_APP_PROPERTY:function(a,b){this.oApp[a]=
+b},$ON_REGISTER_BROWSER_EVENT:function(a,b,d,c,e){this.oApp.registerBrowserEvent(a,b,d,c,e)},$ON_DISABLE_COMMAND:function(a){this.oApp.disableCommand(a,true)},$ON_ENABLE_COMMAND:function(a){this.oApp.disableCommand(a,false)},$ON_EXEC_ON_READY_FUNCTION:function(){typeof this.funcOnReady=="function"&&this.funcOnReady()}});xe.Utils=c.Class({name:"Utils",$init:function(){if(c.browser.msie&&c.browser.nVersion==6)try{document.execCommand("BackgroundImageCache",false,true)}catch(a){}},$ON_ATTACH_HOVER_EVENTS:function(a,
+b){b=b||"hover";a&&c(a).hover(function(){c(this).addClass(b)},function(){c(this).removeClass(b)})}});xe.XpressRangeManager=c.Class({name:"XpressRangeManager",oWindow:null,$init:function(a){this.oWindow=a||window},$BEFORE_MSG_APP_READY:function(){if(this.oWindow&&this.oWindow.tagName=="IFRAME")this.oWindow=this.oWindow.contentWindow;this.oApp.exec("ADD_APP_PROPERTY",["getSelection",c.fnBind(this.getSelection,this)]);this.oApp.exec("ADD_APP_PROPERTY",["getEmptySelection",c.fnBind(this.getEmptySelection,
+this)])},$ON_SET_EDITING_WINDOW:function(a){this.oWindow=a},getEmptySelection:function(){return new xe.XpressRange(this.oWindow)},getSelection:function(){this.oApp.exec("RESTORE_IE_SELECTION",[]);var a=this.getEmptySelection();try{a.setFromSelection()}catch(b){}return a}});xe.Hotkey=c.Class({name:"Hotkey",storage:{},keyhash:{},$init:function(){this.storage={};this.keyhash={backspace:8,tab:9,enter:13,shift:16,ctrl:17,alt:18,meta:224,esc:27,space:32,pageup:33,pagedown:34,end:35,home:36,left:37,up:38,
+right:39,down:40,del:46,comma:188,period:190,slash:191,hyphen:109,equal:61};if(c.browser.msie||c.browser.safari)this.keyhash.hyphen=189,this.keyhash.equal=187,this.keyhash.meta=91},$ON_MSG_APP_READY:function(){c(this.oApp.getWYSIWYGDocument()||document).keydown(c.fnBind(this.keydown,this))},$ON_REGISTER_HOTKEY:function(a,b,d){d||(d=[]);b=c.fnBind(this.oApp.exec,this.oApp,b,d);a=this.normalize(a);if(!a)return false;this.add(a,b)},add:function(a,b){typeof this.storage[a]=="undefined"?this.storage[a]=
+[b]:this.storage[a].push(b)},keydown:function(a){var b=[],d=this.keyhash;if(!(c.inArray(a.keyCode,[d.shift,d.ctrl,d.alt,d.meta])>=0)&&(a.shiftKey&&b.push("shift"),a.altKey&&b.push("alt"),a.ctrlKey&&b.push("ctrl"),a.metaKey&&b.push("meta"),b.length&&(b.length==1&&a.metaKey&&(b=["ctrl","meta"]),b.push(a.keyCode),b=b.join("+"),this.storage[b])))return c.each(this.storage[b],function(){this()}),false},normalize:function(a){var b,d,f,e,g,a=(a||"").toLowerCase().split("+");b=d=f=e=g=false;c.each(a,function(){var a=
+""+this;switch(a){case "shift":b=true;case "alt":f=true;case "ctrl":d=true;case "meta":e=true;default:g=a}});if(!g)return"";a=[];b&&a.push("shift");f&&a.push("alt");d&&a.push("ctrl");(e||d&&!b&&!f)&&a.push("meta");a.push(this.keyhash[g]||g.toUpperCase().charCodeAt(0));return a.join("+")}});xe.DialogLayerManager=c.Class({name:"DialogLayerManager",aMadeDraggable:null,aOpenedLayers:null,$init:function(){this.aMadeDraggable=[];this.aOpenedLayers=[]},$ON_SHOW_DIALOG_LAYER:function(a,b){a=c.$(a);b=c.$(b)||
+false;if(a&&c.inArray(a,this.aOpenedLayers)==-1)this.oApp.exec("POSITION_DIALOG_LAYER",[a]),this.aOpenedLayers[this.aOpenedLayers.length]=a,c.inArray(a,this.aMadeDraggable)==-1?(new xe.DraggableLayer(a,{bModal:b,iMinY:0}),this.aMadeDraggable[this.aMadeDraggable.length]=a):a.style.display="block"},$ON_HIDE_LAST_DIALOG_LAYER:function(){this.oApp.exec("HIDE_DIALOG_LAYER",[this.aOpenedLayers[this.aOpenedLayers.length-1]])},$ON_HIDE_ALL_DIALOG_LAYER:function(){for(var a=this.aOpenedLayers.length-1;a>=
+0;a--)this.oApp.exec("HIDE_DIALOG_LAYER",[this.aOpenedLayers[a]])},$ON_HIDE_DIALOG_LAYER:function(a){if(a=c.$(a))a.style.display="none";this.aOpenedLayers=c.grep(this.aOpenedLayers,function(b){return b!=a})},$ON_SET_DIALOG_LAYER_POSITION:function(a,b,d){a.style.top=b;a.style.left=d}});xe.ActiveLayerManager=c.Class({name:"ActiveLayerManager",oCurrentLayer:null,$ON_TOGGLE_ACTIVE_LAYER:function(a,b,d,c,e){a==this.oCurrentLayer?this.oApp.exec("HIDE_ACTIVE_LAYER",[]):(this.oApp.exec("SHOW_ACTIVE_LAYER",
+[a,c,e]),b&&this.oApp.exec(b,d))},$ON_SHOW_ACTIVE_LAYER:function(a,b,d){a=c.$(a);this.sOnCloseCmd=b;this.aOnCloseParam=d;if(a!=this.oCurrentLayer)this.oApp.exec("HIDE_ACTIVE_LAYER",[]),a.style.display="block",this.oCurrentLayer=a},$ON_HIDE_ACTIVE_LAYER:function(){var a=this.oCurrentLayer;if(a)a.style.display="none",this.oCurrentLayer=null,this.sOnCloseCmd&&this.oApp.exec(this.sOnCloseCmd,this.aOnCloseParam)},$ON_HIDE_CURRENT_ACTIVE_LAYER:function(){this.oApp.exec("HIDE_ACTIVE_LAYER",[])},$ON_EVENT_EDITING_AREA_KEYDOWN:function(){this.oApp.exec("HIDE_ACTIVE_LAYER",
+[])},$ON_EVENT_EDITING_AREA_MOUSEDOWN:function(){this.oApp.exec("HIDE_ACTIVE_LAYER",[])}});xe.StringConverterManager=c.Class({name:"StringConverterManager",oConverters:null,$init:function(){this.oConverters={}},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["applyConverter",c.fnBind(this.applyConverter,this)]);this.oApp.exec("ADD_APP_PROPERTY",["addConverter",c.fnBind(this.addConverter,this)])},applyConverter:function(a,b){var d=this.oConverters[a];if(!d)return b;for(var c=0;c<
+d.length;c++)b=d[c](b);return b},addConverter:function(a,b){this.oConverters[a]||(this.oConverters[a]=[]);this.oConverters[a][this.oConverters[a].length]=b}});xe.MessageManager=c.Class({name:"MessageManager",oMessageMap:null,$init:function(a){this.oMessageMap=a},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["$MSG",c.fnBind(this.getMessage,this)])},getMessage:function(a){return this.oMessageMap[a]?unescape(this.oMessageMap[a]):a}});xe.XE_Toolbar=c.Class({name:"XE_Toolbar",toolbarArea:null,
+toolbarButton:null,uiNameTag:"uiName",sUIClassPrefix:"xpress_xeditor_ui_",aUICmdMap:null,$init:function(a){this.htUIList={};this.aUICmdMap={};this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){a=c.$(a)||document;this.toolbarArea=c(".tool",a).get(0);this.welToolbarArea=c(this.toolbarArea);this.aAllButtons=c("BUTTON",this.toolbarArea).get();for(var a=this.toolbarArea.getElementsByTagName("LI"),b=a.length,d=RegExp(this.sUIClassPrefix+"([^ ]+)"),f=0;f<b;f++)if(d.test(a[f].className)){var e=RegExp.$1;
+this.htUIList[e]==null&&(this.htUIList[e]=c(">*:first-child",a[f]).get(0))}},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.toolbarArea,"mouseover","EVENT_TOOLBAR_MOUSEOVER",[]);this.oApp.registerBrowserEvent(this.toolbarArea,"mouseout","EVENT_TOOLBAR_MOUSEOUT",[]);this.oApp.exec("ADD_APP_PROPERTY",["getToolbarButtonByUIName",c.fnBind(this.getToolbarButtonByUIName,this)])},$ON_EVENT_TOOLBAR_MOUSEOVER:function(a){a.target.tagName=="BUTTON"&&c(a.target).addClass("hover").parent("span").addClass("hover")},
+$ON_EVENT_TOOLBAR_MOUSEOUT:function(a){a.target.tagName=="BUTTON"&&c(a.target).removeClass("hover").parent("span").removeClass("hover")},$ON_TOGGLE_TOOLBAR_ACTIVE_LAYER:function(a,b,d,c,e,g){this.oApp.exec("TOGGLE_ACTIVE_LAYER",[a,"MSG_TOOLBAR_LAYER_SHOWN",[a,b,d,c],e,g])},$ON_MSG_TOOLBAR_LAYER_SHOWN:function(a,b,d,c){this.oApp.exec("POSITION_TOOLBAR_LAYER",[a,b]);d&&this.oApp.exec(d,c)},$ON_SHOW_TOOLBAR_ACTIVE_LAYER:function(a,b,d,c){this.oApp.exec("SHOW_ACTIVE_LAYER",[a,b,d]);this.oApp.exec("POSITION_TOOLBAR_LAYER",
+[a,c])},$ON_ENABLE_UI:function(a){var b=this.htUIList[a];if(b&&(c(b).removeClass("off"),b.disabled=false,b="",this.aUICmdMap[a]))for(var d=0;d<this.aUICmdMap[a].length;d++)b=this.aUICmdMap[a][d],this.oApp.exec("ENABLE_COMMAND",[b])},$ON_DISABLE_UI:function(a){var b=this.htUIList[a];if(b&&(c(b).addClass("off"),c(b).removeClass("hover").parent("span").removeClass("hover"),b.disabled=true,b="",this.aUICmdMap[a]))for(var d=0;d<this.aUICmdMap[a].length;d++)b=this.aUICmdMap[a][d],this.oApp.exec("DISABLE_COMMAND",
+[b])},$ON_SELECT_UI:function(a){(a=this.htUIList[a])&&c(a).addClass("active")},$ON_DESELECT_UI:function(a){(a=this.htUIList[a])&&c(a).removeClass("active")},$ON_ENABLE_ALL_UI:function(){for(var a in this.htUIList)a&&this.oApp.exec("ENABLE_UI",[a]);c(this.toolbarArea).removeClass("off")},$ON_DISABLE_ALL_UI:function(){for(var a in this.htUIList)a&&this.oApp.exec("DISABLE_UI",[a]);c(this.toolbarArea).addClass("off");this.oApp.exec("HIDE_ACTIVE_LAYER",[])},$ON_MSG_STYLE_CHANGED:function(a,b){b==1?this.oApp.exec("SELECT_UI",
+[a]):this.oApp.exec("DESELECT_UI",[a])},$ON_REGISTER_UI_EVENT:function(a,b,d,c){this.aUICmdMap[a]||(this.aUICmdMap[a]=[]);this.aUICmdMap[a][this.aUICmdMap[a].length]=d;(a=this.htUIList[a])&&this.oApp.registerBrowserEvent(a,b,d,c)},$ON_POSITION_TOOLBAR_LAYER:function(a,b){a=c.$(a);b=c.$(b);if(a){b&&b.tagName&&b.tagName=="BUTTON"&&b.parentNode.appendChild(a);a.style.left="0";var d=c(a).offset().left;d+=a.offsetWidth;var f=this.welToolbarArea.offset().left;f+=this.toolbarArea.offsetWidth;if(d>f)a.style.left=
+f-d-5+"px"}},getToolbarButtonByUIName:function(a){return this.htUIList[a]}});xe.XE_EditingAreaManager=c.Class({name:"XE_EditingAreaManager",oActivePlugin:null,oIRField:null,bIsDirty:false,$init:function(a,b,d,f,e){this.sInitialMode=a;this.oIRField=c.$(b);this._assignHTMLObjects(e);this.fOnBeforeUnload=f;this.oEditingMode={};this.elEditingAreaContainer.style.height=parseInt(d.nHeight||this.elEditingAreaContainer.offsetHeight)+"px";this.nMinHeight=d.nMinHeight||10;this.niMinWidth=d.nMinWidth||10},_assignHTMLObjects:function(a){a=
+c.$(a)||document;this.elEditingAreaContainer=c("DIV.xpress_xeditor_editing_area_container",a).get(0);this.elEditingAreaSkipUI=c("A.skip",a).get(0)},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("ADD_APP_PROPERTY",["elEditingAreaContainer",this.elEditingAreaContainer]);this.oApp.exec("ADD_APP_PROPERTY",["getIR",c.fnBind(this.getIR,this)]);this.oApp.exec("ADD_APP_PROPERTY",["setIR",this.setIR]);this.oApp.exec("ADD_APP_PROPERTY",["getEditingMode",c.fnBind(this.getEditingMode,this)])},$ON_MSG_APP_READY:function(){this.oApp.exec("CHANGE_EDITING_MODE",
+[this.sInitialMode,true]);this.oApp.exec("LOAD_IR_FIELD",[false]);this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI,"focus","MSG_EDITING_AREA_SIZE_CHANGED",[],50);this.oApp.registerBrowserEvent(this.elEditingAreaSkipUI,"blur","MSG_EDITING_AREA_SIZE_CHANGED",[],50)},$AFTER_MSG_APP_READY:function(){this.oApp.exec("UPDATE_IR_FIELD",[])},$ON_LOAD_IR_FIELD:function(a){this.oApp.setIR(this.oIRField.value,a)},$ON_UPDATE_IR_FIELD:function(){this.oIRField.value=this.oApp.getIR()},$BEFORE_CHANGE_EDITING_MODE:function(a){this._oPrevActivePlugin=
+this.oActivePlugin;this.oActivePlugin=this.oEditingMode[a]},$AFTER_CHANGE_EDITING_MODE:function(a,b){this._oPrevActivePlugin&&(this.oApp.exec("SET_IR",[this._oPrevActivePlugin.getIR()]),this.oApp.exec("ENABLE_UI",[this._oPrevActivePlugin.sMode]),this._setEditingAreaDimension());this.oApp.exec("DISABLE_UI",[this.oActivePlugin.sMode]);b||this.oApp.exec("FOCUS",[])},$ON_SET_IS_DIRTY:function(a){this.bIsDirty=a},$ON_FOCUS:function(){this.oActivePlugin&&typeof this.oActivePlugin.setIR=="function"&&this.oActivePlugin.focus()},
+$BEFORE_SET_IR:function(a,b){b||this.oApp.exec("RECORD_UNDO_ACTION",["SET CONTENTS"])},$ON_SET_IR:function(a){this.oActivePlugin&&typeof this.oActivePlugin.setIR=="function"&&this.oActivePlugin.setIR(a)},$AFTER_SET_IR:function(a,b){b||this.oApp.exec("RECORD_UNDO_ACTION",["SET CONTENTS"])},$ON_REGISTER_EDITING_AREA:function(a){this.oEditingMode[a.sMode]=a;this.attachDocumentEvents(a.oEditingArea)},$ON_MSG_EDITING_AREA_RESIZE_STARTED:function(){this.oActivePlugin.elEditingArea.style.display="none";
+this.iStartingHeight=parseInt(this.elEditingAreaContainer.style.height)},$ON_RESIZE_EDITING_AREA:function(a,b){var d=parseInt(a),c=parseInt(b);if(d<this.niMinWidth)d=this.niMinWidth;if(c<this.nMinHeight)c=this.nMinHeight;if(a)this.elEditingAreaContainer.style.width=d+"px";if(b)this.elEditingAreaContainer.style.height=c+"px"},$ON_RESIZE_EDITING_AREA_BY:function(a,b){var d=parseInt(a),c=parseInt(b);this.oApp.exec("RESIZE_EDITING_AREA",[this.elEditingAreaContainer.style.width?parseInt(this.elEditingAreaContainer.style.width)+
+d:null,this.elEditingAreaContainer.style.height?this.iStartingHeight+c:null])},$ON_MSG_EDITING_AREA_RESIZE_ENDED:function(){this.oActivePlugin.elEditingArea.style.display="block";this._setEditingAreaDimension()},_setEditingAreaDimension:function(){this.oActivePlugin.elEditingArea.style.height=this.elEditingAreaContainer.style.height;this.oActivePlugin.elEditingArea.style.width=this.elEditingAreaContainer.style.width},attachDocumentEvents:function(a){this.oApp.registerBrowserEvent(a,"click","EVENT_EDITING_AREA_CLICK");
+this.oApp.registerBrowserEvent(a,"mousedown","EVENT_EDITING_AREA_MOUSEDOWN");this.oApp.registerBrowserEvent(a,"mousemove","EVENT_EDITING_AREA_MOUSEMOVE");this.oApp.registerBrowserEvent(a,"mouseup","EVENT_EDITING_AREA_MOUSEUP");this.oApp.registerBrowserEvent(a,"keydown","EVENT_EDITING_AREA_KEYDOWN");this.oApp.registerBrowserEvent(a,"keypress","EVENT_EDITING_AREA_KEYPRESS");this.oApp.registerBrowserEvent(a,"keyup","EVENT_EDITING_AREA_KEYUP")},getIR:function(){return this.oActivePlugin.getIR()},setIR:function(a,
+b){this.oApp.exec("SET_IR",[a,b])},getEditingMode:function(){return this.oActivePlugin.sMode}});xe.XE_EditingArea_HTMLSrc=c.Class({name:"XE_EditingArea_HTMLSrc",sMode:"HTMLSrc",textarea:null,$init:function(a){this.elEditingArea=this.textarea=c.$(a)},$BEFORE_MSG_APP_READY:function(){this.oEditingArea=this.textarea;this.oApp.exec("REGISTER_EDITING_AREA",[this])},$ON_CHANGE_EDITING_MODE:function(a){this.textarea.style.display=a==this.sMode?"block":"none"},$ON_PASTE_HTML:function(a){this.oApp.getEditingMode()==
+this.sMode&&((new m(this.textarea)).paste(a),this.textarea.focus())},getIR:function(){var a=this.textarea.value;return this.oApp.applyConverter?this.oApp.applyConverter(this.sMode+"_TO_IR",a):a},setIR:function(a){this.textarea.value=this.oApp.applyConverter?this.oApp.applyConverter("IR_TO_"+this.sMode,a):a},focus:function(){this.textarea.focus()}});var m=function(a){this._o=a};m.prototype.getSelection=function(){var a=this._o,b=[-1,-1];if(isNaN(this._o.selectionStart)){a.focus();var d=document.body.createTextRange(),
+c=null,c=document.selection.createRange().duplicate();d.moveToElementText(a);c.collapse(true);d.setEndPoint("EndToEnd",c);b[0]=d.text.length;c=document.selection.createRange().duplicate();d.moveToElementText(a);c.collapse(false);d.setEndPoint("EndToEnd",c);b[1]=d.text.length;a.blur()}else b[0]=a.selectionStart,b[1]=a.selectionEnd;return b};m.prototype.setSelection=function(a,b){var d=this._o;typeof b=="undefined"&&(b=a);if(d.setSelectionRange)d.setSelectionRange(a,b);else if(d.createTextRange){var c=
+d.createTextRange();c.collapse(true);c.moveStart("character",a);c.moveEnd("character",b-a);c.select();d.blur()}};m.prototype.copy=function(){var a=this.getSelection();return this._o.value.substring(a[0],a[1])};m.prototype.paste=function(a){var b=this._o,d=this.getSelection(),c=b.value,e=c.substr(0,d[0]),c=c.substr(d[1]);b.value=e+a+c;b=0;typeof document.body.style.maxHeight=="undefined"&&(e=e.match(/\n/gi),b=e!=null?e.length:0);this.setSelection(d[0]+a.length-b)};m.prototype.cut=function(){var a=
+this.copy();this.paste("");return a};xe.XE_EditingArea_WYSIWYG=c.Class({name:"XE_EditingArea_WYSIWYG",status:xe.PLUGIN_STATUS.NOT_READY,sMode:"WYSIWYG",iframe:null,doc:null,iLastUndoRecorded:0,iMinUndoInterval:3E3,_nIFrameReadyCount:50,$init:function(a){this.iframe=c.$(a);this.initIframe();this.elEditingArea=a},$BEFORE_MSG_APP_READY:function(){this.oEditingArea=this.doc;this.oApp.exec("REGISTER_EDITING_AREA",[this]);this.oApp.exec("ADD_APP_PROPERTY",["getWYSIWYGWindow",c.fnBind(this.getWindow,this)]);
+this.oApp.exec("ADD_APP_PROPERTY",["getWYSIWYGDocument",c.fnBind(this.getDocument,this)])},$ON_MSG_APP_READY:function(){c.browser.msie&&(c(this.doc).bind("keydown",c.fnBind(function(a){this.doc.selection.type.toLowerCase()=="control"&&a.keyCode==8&&(this.oApp.exec("EXECCOMMAND",["delete",false,false]),a.preventDefault(),a.stopPropagation())},this)),c(this.doc.body).bind("mousedown",c.fnBind(function(){this._oIERange=null;this._bIERangeReset=true},this)),c(this.doc.body).bind("beforedeactivate",c.fnBind(function(){if(!this._bIERangeReset){var a=
+this.getDocument().selection.createRange(0);this._oIERange=a.parentElement&&a.parentElement()&&a.parentElement().tagName=="INPUT"?this._oPrevIERange:a}},this)),c(this.doc.body).bind("mouseup",c.fnBind(function(){this._bIERangeReset=false},this)))},$ON_CHANGE_EDITING_MODE:function(a){a==this.sMode?(this.iframe.style.display="block",this.oApp.exec("REFRESH_WYSIWYG",[]),this.oApp.exec("SET_EDITING_WINDOW",[this.getWindow()])):this.iframe.style.display="none"},$AFTER_CHANGE_EDITING_MODE:function(){this._oIERange=
+null},$ON_REFRESH_WYSIWYG:function(){c.browser.mozilla&&(this._disableWYSIWYG(),this._enableWYSIWYG())},$ON_ENABLE_WYSIWYG:function(){this._enableWYSIWYG()},$ON_DISABLE_WYSIWYG:function(){this._disableWYSIWYG()},$ON_EVENT_EDITING_AREA_KEYDOWN:function(a){if(a.ctrlKey){switch(a.keyCode){case 37:this.oApp.exec("EXECCOMMAND",["outdent",false,false]);break;case 39:this.oApp.exec("EXECCOMMAND",["indent",false,false]);break;case 49:case 50:case 51:case 52:case 53:case 54:this.oApp.exec("EXECCOMMAND",["FormatBlock",
+false,"<h"+(a.keyCode-48)+">"]);break;default:return}a.preventDefault();a.stopPropagation()}},$ON_EVENT_EDITING_AREA_KEYUP:function(a){a.keyCode==229||a.keyCode==13||a.altKey||a.ctrlKey||a.keyCode>=33&&a.keyCode<=40||a.keyCode==16||this._recordUndo(a)},$ON_PASTE_HTML:function(a,b){if(this.oApp.getEditingMode()==this.sMode){var d=b||this.oApp.getSelection();d.pasteHTML(a);if(!c.browser.msie){var f=d.placeStringBookmark();this.oApp.getWYSIWYGDocument().body.innerHTML=this.oApp.getWYSIWYGDocument().body.innerHTML;
+d.moveToBookmark(f);d.collapseToEnd();d.select();d.removeStringBookmark(f)}this.oApp.exec("RECORD_UNDO_ACTION",["INSERT HTML"])}},$AFTER_MSG_EDITING_AREA_RESIZE_ENDED:function(){this.oApp.exec("REFRESH_WYSIWYG",[])},$ON_RESTORE_IE_SELECTION:function(){if(this._oIERange)this._oIERange.select(),this._oPrevIERange=this._oIERange,this._oIERange=null},initIframe:function(){try{this.doc=this.iframe.contentWindow.document;if(this.doc==null||this.doc.location.href=="about:blank")throw Error("Access denied");
+this._enableWYSIWYG();this.status=xe.PLUGIN_STATUS.READY}catch(a){if(this._nIFrameReadyCount-- >0)setTimeout(c.fnBind(this.initIframe,this),100);else throw"iframe for WYSIWYG editing mode can't be initialized. Please check if the iframe document exists and is also accessable(cross-domain issues). ";}},getIR:function(){var a=this.doc.body.innerHTML;return this.oApp.applyConverter?this.oApp.applyConverter(this.sMode+"_TO_IR",a):a},setIR:function(a){this.doc.body.innerHTML=this.oApp.applyConverter?this.oApp.applyConverter("IR_TO_"+
+this.sMode,a):a;if(c.browser.mozilla&&this.doc.body.innerHTML=="")this.doc.body.innerHTML="<br>"},getWindow:function(){return this.iframe.contentWindow},getDocument:function(){return this.iframe.contentWindow.document},focus:function(){},_recordUndo:function(a){if(!(new Date-this.iLastUndoRecorded<this.iMinUndoInterval))this.oApp.exec("RECORD_UNDO_ACTION",["KEYPRESS"]),this.iLastUndoRecorded=new Date,this.prevKeyCode=a.keyCode},_enableWYSIWYG:function(){c.browser.msie?(this.doc.body.disabled=true,
+this.doc.body.contentEditable=true,this.doc.body.removeAttribute("disabled")):this.doc.designMode="on"},_disableWYSIWYG:function(){c.browser.msie?this.doc.body.contentEditable=false:this.doc.designMode="off"}});xe.XE_EditingAreaVerticalResizer=c.Class({name:"XE_EditingAreaVerticalResizer",oResizeGrip:null,$init:function(a){this._assignHTMLObjects(a);this.$FnMouseDown=c.fnBind(this._mousedown,this);this.$FnMouseMove=c.fnBind(this._mousemove,this);this.$FnMouseUp=c.fnBind(this._mouseup,this);c(this.oResizeGrip).bind("mousedown",
+this.$FnMouseDown)},_assignHTMLObjects:function(a){a=c.$(a)||document;this.oResizeGrip=c(".xpress_xeditor_editingArea_verticalResizer",a).get(0)},_mousedown:function(a){this.iStartHeight=a.clientY;c(document).bind("mousemove",this.$FnMouseMove);c(document).bind("mouseup",this.$FnMouseUp);this.oApp.exec("MSG_EDITING_AREA_RESIZE_STARTED",[this.$FnMouseDown,this.$FnMouseMove,this.$FnMouseUp])},_mousemove:function(a){this.oApp.exec("RESIZE_EDITING_AREA_BY",[0,a.clientY-this.iStartHeight])},_mouseup:function(){c(document).unbind("mousemove",
+this.$FnMouseMove);c(document).unbind("mouseup",this.$FnMouseUp);this.oApp.exec("MSG_EDITING_AREA_RESIZE_ENDED",[this.$FnMouseDown,this.$FnMouseMove,this.$FnMouseUp])}});xe.XE_ExecCommand=c.Class({name:"XE_ExecCommand",oEditingArea:null,$init:function(a){this.oEditingArea=a},$BEFORE_MSG_APP_READY:function(){if(this.oEditingArea&&this.oEditingArea.tagName=="IFRAME")this.oEditingArea=this.oEditingArea.contentWindow.document},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_HOTKEY",["ctrl+b","EXECCOMMAND",
+["bold",false,false]]);this.oApp.exec("REGISTER_HOTKEY",["ctrl+u","EXECCOMMAND",["underline",false,false]]);this.oApp.exec("REGISTER_HOTKEY",["ctrl+i","EXECCOMMAND",["italic",false,false]]);this.oApp.exec("REGISTER_HOTKEY",["ctrl+d","EXECCOMMAND",["strikethrough",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["bold","click","EXECCOMMAND",["bold",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["underline","click","EXECCOMMAND",["underline",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["italic",
+"click","EXECCOMMAND",["italic",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["lineThrough","click","EXECCOMMAND",["strikethrough",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["superscript","click","EXECCOMMAND",["superscript",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["subscript","click","EXECCOMMAND",["subscript",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["justifyleft","click","EXECCOMMAND",["justifyleft",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["justifycenter",
+"click","EXECCOMMAND",["justifycenter",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["justifyright","click","EXECCOMMAND",["justifyright",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["justifyfull","click","EXECCOMMAND",["justifyfull",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["orderedlist","click","EXECCOMMAND",["insertorderedlist",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["unorderedlist","click","EXECCOMMAND",["insertunorderedlist",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",
+["outdent","click","EXECCOMMAND",["outdent",false,false]]);this.oApp.exec("REGISTER_UI_EVENT",["indent","click","EXECCOMMAND",["indent",false,false]])},$BEFORE_EXECCOMMAND:function(a){this._bOnlyCursorChanged=false;this.oApp.exec("FOCUS",[]);if(a.match(/^bold|underline|italic|strikethrough|superscript|subscript$/i)&&this.oApp.getSelection().collapsed)this._bOnlyCursorChanged=true;this._bOnlyCursorChanged||this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",[a])},$ON_EXECCOMMAND:function(a,b,d){this.oEditingArea.execCommand(a,
+b==""||b?b:false,d==""||d?d:false)},$AFTER_EXECCOMMAND:function(a){this._bOnlyCursorChanged||this.oApp.exec("RECORD_UNDO_AFTER_ACTION",[a]);this.oApp.exec("CHECK_STYLE_CHANGE",[])}});xe.XE_WYSIWYGEnterKey=c.Class({name:"XE_WYSIWYGEnterKey",unsupportedBrowser:["ie","opera"],oEditingArea:null,$init:function(a){this.oEditingArea=a},$BEFORE_MSG_APP_READY:function(){if(this.oEditingArea&&this.oEditingArea.tagName=="IFRAME")this.oEditingArea=this.oEditingArea.contentWindow.document},$ON_EVENT_EDITING_AREA_KEYDOWN:function(a){if(this.oApp.getEditingMode()==
+"WYSIWYG"&&!a.shiftKey&&a.keyCode==13){var b=this.oApp.getSelection(),d=b.placeStringBookmark(),c=b.getLineInfo(),e=c.oStart,c=c.oEnd;if(!e.bParentBreak||b.rxBlockContainer.test(e.oLineBreaker.tagName)){a.stopPropagation();a.preventDefault();a=this.oEditingArea.createElement("P");b.moveToBookmark(d);b.setStartBefore(e.oNode);b.surroundContents(a);b.collapseToEnd();e=this.oEditingArea.createElement("P");b.setEndAfter(c.oNode);b.surroundContents(e);b.removeStringBookmark(d);if(a.innerHTML=="")a.innerHTML=
+"<br>";if(e.innerHTML=="")e.innerHTML="<br>";e.nextSibling&&e.nextSibling.tagName=="BR"&&e.parentNode.removeChild(e.nextSibling);b.selectNodeContents(e);b.collapseToStart();b.select();this.oApp.exec("CHECK_STYLE_CHANGE",[])}else b.removeStringBookmark(d)}}});xe.XE_WYSIWYGStyler=c.Class({name:"XE_WYSIWYGStyler",$PRECONDITION:function(){return this.oApp.getEditingMode()=="WYSIWYG"},$ON_SET_WYSIWYG_STYLE:function(a){var b=this.oApp.getSelection();if(b.collapsed){var d=this.oApp.getWYSIWYGDocument().createElement("SPAN");
+b.insertNode(d);d.innerHTML=unescape("%uFEFF");var f,e;for(e in a)f=a[e],typeof f=="string"&&(d.style[e]=f);b.selectNodeContents(d);b.collapseToEnd();b._window.focus();b._window.document.body.focus();b.select();if(c.browser.mozilla&&c.browser.nVersion==3)d.innerHTML=""}else this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["FONT STYLE"]),b.styleRange(a),b._window.focus(),b.select(),this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["FONT STYLE"])}});xe.XE_WYSIWYGStyleGetter=c.Class({name:"XE_WYSIWYGStyleGetter",
+hKeyUp:null,getStyleInterval:200,oStyleMap:{fontFamily:{type:"Value",css:"fontFamily"},fontSize:{type:"Value",css:"fontSize"},lineHeight:{type:"Value",css:"lineHeight",converter:function(a,b){return!a.match(/px$/)?a:Math.ceil(parseInt(a)/parseInt(b.fontSize)*10)/10}},bold:{command:"bold"},underline:{command:"underline"},italic:{command:"italic"},lineThrough:{command:"strikethrough"},superscript:{command:"superscript"},subscript:{command:"subscript"},justifyleft:{command:"justifyleft"},justifycenter:{command:"justifycenter"},
+justifyright:{command:"justifyright"},justifyfull:{command:"justifyfull"},orderedlist:{command:"insertorderedlist"},unorderedlist:{command:"insertunorderedlist"}},$init:function(){this.oStyle=this._getBlankStyle()},$PRECONDITION:function(){return this.oApp.getEditingMode()!="WYSIWYG"?false:true},$ON_MSG_APP_READY:function(){this.oDocument=this.oApp.getWYSIWYGDocument();this.oApp.exec("ADD_APP_PROPERTY",["getCurrentStyle",c.fnBind(this.getCurrentStyle,this)])},$ON_EVENT_EDITING_AREA_MOUSEUP:function(){this.hKeyUp&&
+clearTimeout(this.hKeyUp);this.oApp.exec("CHECK_STYLE_CHANGE",[])},$ON_EVENT_EDITING_AREA_KEYUP:function(a){if(a.keyCode==8||a.keyCode>=33&&a.keyCode<=40||a.keyCode==45||a.keyCode==46)this.hKeyUp&&clearTimeout(this.hKeyUp),this.hKeyUp=setTimeout(c.fnBind(this.oApp.exec,this.oApp,"CHECK_STYLE_CHANGE",[]),this.getStyleInterval)},$ON_CHECK_STYLE_CHANGE:function(){this._getStyle()},$ON_RESET_STYLE_STATUS:function(){var a=this._getBlankStyle(),b;for(b in a)this.oApp.exec("SET_STYLE_STATUS",[b,a[b]])},
+getCurrentStyle:function(){return this.oStyle},_check_style_change:function(){this.oApp.exec("CHECK_STYLE_CHANGE",[])},_getBlankStyle:function(){var a={},b;for(b in this.oStyleMap)a[b]=this.oStyleMap[b].type=="Value"?"":0;return a},_getStyle:function(){var a=this.oApp.getSelection(),b=a.getNodes(false,function(a){return!a.childNodes||a.childNodes.length==0?true:false}),d,a=b.length==0?this._getStyleOf(a.commonAncestorContainer):this._getStyleOf(b[0]);for(d in a)this.oStyleMap[d].converter&&(a[d]=
+this.oStyleMap[d].converter(a[d],a)),this.oStyle[d]!=a[d]&&this.oApp.exec("MSG_STYLE_CHANGED",[d,a[d]]);this.oStyle=a},_getStyleOf:function(a){var b=this._getBlankStyle();if(!a)return b;if(a.nodeType==3)a=a.parentNode;var a=c(a),d,f;for(f in this.oStyle)if(d=this.oStyleMap[f],d.type&&d.type=="Value")if(d.css)d=a.css(d.css),f=="fontFamily"&&(d=d.split(/,/)[0]),b[f]=d;else{if(d.command)try{b[f]=this.oDocument.queryCommandState(d.command)}catch(e){}}else if(d.command)try{b[f]=this.oDocument.queryCommandState(d.command)?
+1:0}catch(g){}return b}});xe.XE_FontSizeWithSelectUI=c.Class({name:"XE_FontSizeWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elFontSizeSelect=c("SELECT.xpress_xeditor_ui_fontSize_select",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elFontSizeSelect,"change","SET_FONTSIZE_FROM_SELECT_UI");this.elFontSizeSelect.selectedIndex=0},$ON_MSG_STYLE_CHANGED:function(a,b){if(a=="fontSize"&&(this.elFontSizeSelect.value=b,this.elFontSizeSelect.selectedIndex<
+0))this.elFontSizeSelect.selectedIndex=0},$ON_SET_FONTSIZE_FROM_SELECT_UI:function(){var a=this.elFontSizeSelect.value;a&&(this.oApp.exec("SET_WYSIWYG_STYLE",[{fontSize:a}]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}});xe.XE_FontNameWithSelectUI=c.Class({name:"XE_FontNameWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elFontNameSelect=c("SELECT.xpress_xeditor_ui_fontName_select",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elFontNameSelect,
+"change","SET_FONTNAME_FROM_SELECT_UI");this.elFontNameSelect.selectedIndex=0},$ON_MSG_STYLE_CHANGED:function(a,b){if(a=="fontFamily"&&(this.elFontNameSelect.value=b.toLowerCase(),this.elFontNameSelect.selectedIndex<0))this.elFontNameSelect.selectedIndex=0},$ON_SET_FONTNAME_FROM_SELECT_UI:function(){var a=this.elFontNameSelect.value;a&&(this.oApp.exec("SET_WYSIWYG_STYLE",[{fontFamily:a}]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}});xe.XE_LineHeight=c.Class({name:"XE_LineHeight",$init:function(a){this._assignHTMLObjects(a)},
+_assignHTMLObjects:function(){},$ON_SET_LINEHEIGHT:function(a){this.setLineHeight(a)},getLineHeight:function(){var a=this._getSelectedNodes(false),b,d,f;if(a.length==0)return-1;var e=a.length;e==0?f=-1:(d=this._getLineWrapper(a[0]),f=this._getWrapperLineheight(d));var g=this.oSelection.getStartNode();if(f>0)for(var h=1;h<e;h++)if(!this._isChildOf(a[h],b)&&a[h]&&(b=this._getLineWrapper(a[h]),b!=d)){curHeight=this._getWrapperLineheight(b);if(curHeight!=f){f=-1;break}d=b}b=this._getLineWrapper(a[e-1]);
+a=this.oSelection.getEndNode();selectText=c.fnBind(function(a,b){this.oSelection.setEndNodes(a,b);this.oSelection.select()},this,g,a);setTimeout(selectText,100);return f},setLineHeight:function(a){function b(a,b){if(!a)try{a=thisRef.oSelection.surroundContentsWithNewNode("P")}catch(d){a=thisRef.oSelection.surroundContentsWithNewNode("DIV")}a.style.lineHeight=b;return a}function d(a){for(;a&&a.tagName!="BODY";)a=xe.DOMFix.parentNode(a);return!a?false:true}thisRef=this;var f=this._getSelectedNodes(false);
+if(f.length!=0){var e,g,h=f.length;this.oApp.exec("RECORD_UNDO_BEFORE_ACTION",["LINEHEIGHT"]);g=this._getLineWrapper(f[0]);for(var l=g=b(g,a),j=g,j=1;j<h;j++){try{if(!d(xe.DOMFix.parentNode(f[j])))continue}catch(k){continue}this._isChildOf(f[j],e)||(e=this._getLineWrapper(f[j]),e!=g&&(g=e=b(e,a)))}setTimeout(c.fnBind(function(a,b){this.oSelection.setEndNodes(a,b);this.oSelection.select();this.oApp.exec("RECORD_UNDO_AFTER_ACTION",["LINEHEIGHT"])},this,l,e||l),100)}},_getSelectedNodes:function(a){if(!a)this.oSelection=
+this.oApp.getSelection();this.oSelection.collapsed&&this.oSelection.selectNode(this.oSelection.commonAncestorContainer);a=this.oSelection.getTextNodes();if(a.length==0){var b=this.oSelection.getStartNode();b?a[0]=b:a=[]}return a},_getWrapperLineheight:function(a){var b="";if(a&&a.style.lineHeight)b=a.style.lineHeight;else for(a=this.oSelection.commonAncesterContainer;a&&!this.oSelection.rxLineBreaker.test(a.tagName);){if(a&&a.style.lineHeight){b=a.style.lineHeight;break}a=xe.DOMFix.parentNode(a)}return b},
+_isChildOf:function(a,b){for(;a&&a.tagName!="BODY";){if(a==b)return true;a=xe.DOMFix.parentNode(a)}return false},_getLineWrapper:function(a){var b=this.oApp.getEmptySelection();b.selectNode(a);var a=b.getLineInfo(),d=a.oStart,c=a.oEnd,e,b=null,a=d.oNode;e=d.oLineBreaker;d=c.oNode;c=c.oLineBreaker;this.oSelection.setEndNodes(a,d);e==c&&(e.tagName=="P"||e.tagName=="DIV"?b=e:this.oSelection.setEndNodes(e.firstChild,e.lastChild));return b}});xe.XE_LineHeightWithSelectUI=c.Class({name:"XE_LineHeightWithSelectUI",
+_assignHTMLObjects:function(a){this.elLineHeightSelect=c("SELECT.xpress_xeditor_ui_lineHeight_select",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elLineHeightSelect,"change","SET_LINEHEIGHT_FROM_SELECT_UI");this.elLineHeightSelect.selectedIndex=0},$ON_MSG_STYLE_CHANGED:function(a,b){if(a=="lineHeight"&&(this.elLineHeightSelect.value=b,this.elLineHeightSelect.selectedIndex<0))this.elLineHeightSelect.selectedIndex=0},$ON_SET_LINEHEIGHT_FROM_SELECT_UI:function(){var a=
+this.elLineHeightSelect.value;if(a)this.elLineHeightSelect.selectedIndex=0,this.oApp.exec("SET_LINEHEIGHT",[a]),this.oApp.exec("CHECK_STYLE_CHANGE",[])}}).extend(xe.XE_LineHeight);xe.XE_ColorPalette=c.Class({name:"XE_ColorPalette",rxRGBColorPattern:/rgb\((\d+), ?(\d+), ?(\d+)\)/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elColorPaletteLayer=c("UL.xpress_xeditor_color_palette",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elColorPaletteLayer,
+"click","EVENT_MOUSEUP_COLOR_PALETTE")},$ON_SHOW_COLOR_PALETTE:function(a,b){this.sCallbackCmd=a;this.oLayerContainer=b;this.oLayerContainer.insertBefore(this.elColorPaletteLayer,null);this.elColorPaletteLayer.style.display="block"},$ON_HIDE_COLOR_PALETTE:function(){this.elColorPaletteLayer.style.display="none"},$ON_COLOR_PALETTE_APPLY_COLOR:function(a){if(this.rxRGBColorPattern.test(a))var b=function(a){a=parseInt(a).toString(16);a.length<2&&(a="0"+a);return a.toUpperCase()},a=b(RegExp.$1),d=b(RegExp.$2),
+b=b(RegExp.$3),a="#"+a+d+b;this.oApp.exec(this.sCallbackCmd,[a])},$ON_EVENT_MOUSEUP_COLOR_PALETTE:function(a){a=a.target;a.style.backgroundColor&&this.oApp.exec("COLOR_PALETTE_APPLY_COLOR",[a.style.backgroundColor])}});xe.XE_FontColor=c.Class({name:"XE_FontColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elDropdownLayer=c("DIV.xpress_xeditor_fontcolor_layer",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",
+["fontColor","click","TOGGLE_FONTCOLOR_LAYER"])},$ON_TOGGLE_FONTCOLOR_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer,null,"SHOW_COLOR_PALETTE",["APPLY_FONTCOLOR",this.elDropdownLayer]])},$ON_APPLY_FONTCOLOR:function(a){this.rxColorPattern.test(a)?(this.oApp.exec("SET_WYSIWYG_STYLE",[{color:a}]),this.oApp.exec("HIDE_ACTIVE_LAYER")):alert(this.oApp.$MSG("XE_FontColor.invalidColorCode"))}});xe.XE_BGColor=c.Class({name:"XE_BGColor",rxColorPattern:/^#?[0-9a-fA-F]{6}$|^rgb\(\d+, ?\d+, ?\d+\)$/i,
+$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elDropdownLayer=c("DIV.xpress_xeditor_bgcolor_layer",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["bgColor","click","TOGGLE_BGCOLOR_LAYER"]);this.oApp.registerBrowserEvent(this.elDropdownLayer,"click","EVENT_APPLY_BGCOLOR",[])},$ON_TOGGLE_BGCOLOR_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer,null,"SHOW_COLOR_PALETTE",["APPLY_BGCOLOR",this.elDropdownLayer]])},
+$ON_EVENT_APPLY_BGCOLOR:function(a){a=a.target;if(a.tagName=="SPAN")a=a.parentNode;a.tagName=="BUTTON"&&this.oApp.exec("APPLY_BGCOLOR",[a.style.backgroundColor,a.style.color])},$ON_APPLY_BGCOLOR:function(a,b){if(this.rxColorPattern.test(a)){var d={backgroundColor:a};if(b)d.color=b;this.oApp.exec("SET_WYSIWYG_STYLE",[d]);this.oApp.exec("HIDE_ACTIVE_LAYER")}else alert(this.oApp.$MSG("XE_BGColor.invalidColorCode"))}});xe.XE_Quote=c.Class({name:"XE_Quote",$init:function(a){this._assignHTMLObjects(a)},
+_assignHTMLObjects:function(a){this.elDropdownLayer=c("DIV.xpress_xeditor_blockquote_layer",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["quote","click","TOGGLE_BLOCKQUOTE_LAYER"]);this.oApp.registerBrowserEvent(this.elDropdownLayer,"click","EVENT_APPLY_SEDITOR_BLOCKQUOTE",[])},$ON_TOGGLE_BLOCKQUOTE_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer])},$ON_EVENT_APPLY_SEDITOR_BLOCKQUOTE:function(a){a=a.target;if(a.tagName=="BUTTON")a=
+a.parentNode.className,a!="q8"?this._wrapBlock("BLOCKQUOTE",a):this._unwrapBlock("BLOCKQUOTE"),this.oApp.exec("HIDE_ACTIVE_LAYER",[])},_unwrapBlock:function(a){for(var b=this.oApp.getSelection().commonAncestorContainer;b&&b.tagName!=a;)b=b.parentNode;if(b){for(;b.firstChild;)b.parentNode.insertBefore(b.firstChild,b);b.parentNode.removeChild(b)}},_wrapBlock:function(a,b){var d=this.oApp.getSelection(),c=d.getLineInfo(),e=c.oStart,c=c.oEnd,g=/BODY|TD|LI/i,e=e.bParentBreak&&!g.test(e.oLineBreaker.tagName)?
+e.oNode.parentNode:e.oNode,c=c.bParentBreak&&!g.test(c.oLineBreaker.tagName)?c.oNode.parentNode:c.oNode;d.setStartBefore(e);d.setEndAfter(c);if(g=this._expandToTableStart(d,c))c=g,d.setEndAfter(g);if(g=this._expandToTableStart(d,e))e=g,d.setStartBefore(g);g=e;for(e=d.commonAncestorContainer;g&&g!=e&&g.parentNode!=e;)g=g.parentNode;oFormattingNode=d._document.createElement(a);if(b)oFormattingNode.className=b;g==e?e.insertBefore(oFormattingNode,e.firstChild):e.insertBefore(oFormattingNode,g);d.setStartAfter(oFormattingNode);
+d.setEndAfter(c);d.surroundContents(oFormattingNode);e=oFormattingNode.childNodes;for(g=e.length-1;g>=0;g--)if(e[g].nodeType==3||e[g].tagName=="BR"){for(var h=d._document.createElement("P"),c=e[g].nextSibling;g>=0&&e[g]&&(e[g].nodeType==3||e[g].tagName=="BR");)h.insertBefore(e[g--],h.firstChild);oFormattingNode.insertBefore(h,c);g++}if(oFormattingNode&&oFormattingNode.parentNode)h=d._document.createElement("P"),h.innerHTML=unescape("<br/>"),oFormattingNode.parentNode.insertBefore(h,oFormattingNode.nextSibling);
+this.oApp.exec("RECORD_UNDO_ACTION",["Block Quote"]);return oFormattingNode},_expandToTableStart:function(a,b){for(var c=a.commonAncestorContainer,f=null,e=false;b&&!e;){b==c&&(e=true);if(/TBODY|TFOOT|THEAD|TR/i.test(b.tagName)){f=this._getTableRoot(b);break}b=b.parentNode}return f},_getTableRoot:function(a){for(;a&&a.tagName!="TABLE";)a=a.parentNode;return a}});xe.XE_SCharacter=c.Class({name:"XE_SCharacter",$init:function(a){this.bIE=c.browser.msie;this._assignHTMLObjects(a);this.charSet=[];this.charSet[0]=
+unescape("FF5B FF5D 3014 3015 3008 3009 300A 300B 300C 300D 300E 300F 3010 3011 2018 2019 201C 201D 3001 3002 %B7 2025 2026 %A7 203B 2606 2605 25CB 25CF 25CE 25C7 25C6 25A1 25A0 25B3 25B2 25BD 25BC 25C1 25C0 25B7 25B6 2664 2660 2661 2665 2667 2663 2299 25C8 25A3 25D0 25D1 2592 25A4 25A5 25A8 25A7 25A6 25A9 %B1 %D7 %F7 2260 2264 2265 221E 2234 %B0 2032 2033 2220 22A5 2312 2202 2261 2252 226A 226B 221A 223D 221D 2235 222B 222C 2208 220B 2286 2287 2282 2283 222A 2229 2227 2228 FFE2 21D2 21D4 2200 2203 %B4 FF5E 02C7 02D8 02DD 02DA 02D9 %B8 02DB %A1 %BF 02D0 222E 2211 220F 266D 2669 266A 266C 327F 2192 2190 2191 2193 2194 2195 2197 2199 2196 2198 321C 2116 33C7 2122 33C2 33D8 2121 2668 260F 260E 261C 261E %B6 2020 2021 %AE %AA %BA 2642 2640").replace(/(\S{4})/g,
+function(a){return"%u"+a}).split(" ");this.charSet[1]=unescape("%BD 2153 2154 %BC %BE 215B 215C 215D 215E %B9 %B2 %B3 2074 207F 2081 2082 2083 2084 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 FFE6 %24 FFE5 FFE1 20AC 2103 212B 2109 FFE0 %A4 2030 3395 3396 3397 2113 3398 33C4 33A3 33A4 33A5 33A6 3399 339A 339B 339C 339D 339E 339F 33A0 33A1 33A2 33CA 338D 338E 338F 33CF 3388 3389 33C8 33A7 33A8 33B0 33B1 33B2 33B3 33B4 33B5 33B6 33B7 33B8 33B9 3380 3381 3382 3383 3384 33BA 33BB 33BC 33BD 33BE 33BF 3390 3391 3392 3393 3394 2126 33C0 33C1 338A 338B 338C 33D6 33C5 33AD 33AE 33AF 33DB 33A9 33AA 33AB 33AC 33DD 33D0 33D3 33C3 33C9 33DC 33C6").replace(/(\S{4})/g,
+function(a){return"%u"+a}).split(" ");this.charSet[2]=unescape("3260 3261 3262 3263 3264 3265 3266 3267 3268 3269 326A 326B 326C 326D 326E 326F 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 327A 327B 24D0 24D1 24D2 24D3 24D4 24D5 24D6 24D7 24D8 24D9 24DA 24DB 24DC 24DD 24DE 24DF 24E0 24E1 24E2 24E3 24E4 24E5 24E6 24E7 24E8 24E9 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 246A 246B 246C 246D 246E 3200 3201 3202 3203 3204 3205 3206 3207 3208 3209 320A 320B 320C 320D 320E 320F 3210 3211 3212 3213 3214 3215 3216 3217 3218 3219 321A 321B 249C 249D 249E 249F 24A0 24A1 24A2 24A3 24A4 24A5 24A6 24A7 24A8 24A9 24AA 24AB 24AC 24AD 24AE 24AF 24B0 24B1 24B2 24B3 24B4 24B5 2474 2475 2476 2477 2478 2479 247A 247B 247C 247D 247E 247F 2480 2481 2482").replace(/(\S{4})/g,
+function(a){return"%u"+a}).split(" ");this.charSet[3]=unescape("3131 3132 3133 3134 3135 3136 3137 3138 3139 313A 313B 313C 313D 313E 313F 3140 3141 3142 3143 3144 3145 3146 3147 3148 3149 314A 314B 314C 314D 314E 314F 3150 3151 3152 3153 3154 3155 3156 3157 3158 3159 315A 315B 315C 315D 315E 315F 3160 3161 3162 3163 3165 3166 3167 3168 3169 316A 316B 316C 316D 316E 316F 3170 3171 3172 3173 3174 3175 3176 3177 3178 3179 317A 317B 317C 317D 317E 317F 3180 3181 3182 3183 3184 3185 3186 3187 3188 3189 318A 318B 318C 318D 318E").replace(/(\S{4})/g,
+function(a){return"%u"+a}).split(" ");this.charSet[4]=unescape("0391 0392 0393 0394 0395 0396 0397 0398 0399 039A 039B 039C 039D 039E 039F 03A0 03A1 03A3 03A4 03A5 03A6 03A7 03A8 03A9 03B1 03B2 03B3 03B4 03B5 03B6 03B7 03B8 03B9 03BA 03BB 03BC 03BD 03BE 03BF 03C0 03C1 03C3 03C4 03C5 03C6 03C7 03C8 03C9 %C6 %D0 0126 0132 013F 0141 %D8 0152 %DE 0166 014A %E6 0111 %F0 0127 I 0133 0138 0140 0142 0142 0153 %DF %FE 0167 014B 0149 0411 0413 0414 0401 0416 0417 0418 0419 041B 041F 0426 0427 0428 0429 042A 042B 042C 042D 042E 042F 0431 0432 0433 0434 0451 0436 0437 0438 0439 043B 043F 0444 0446 0447 0448 0449 044A 044B 044C 044D 044E 044F").replace(/(\S{4})/g,
+function(a){return"%u"+a}).split(" ");this.charSet[5]=unescape("3041 3042 3043 3044 3045 3046 3047 3048 3049 304A 304B 304C 304D 304E 304F 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 305A 305B 305C 305D 305E 305F 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 306A 306B 306C 306D 306E 306F 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 307A 307B 307C 307D 307E 307F 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 308A 308B 308C 308D 308E 308F 3090 3091 3092 3093 30A1 30A2 30A3 30A4 30A5 30A6 30A7 30A8 30A9 30AA 30AB 30AC 30AD 30AE 30AF 30B0 30B1 30B2 30B3 30B4 30B5 30B6 30B7 30B8 30B9 30BA 30BB 30BC 30BD 30BE 30BF 30C0 30C1 30C2 30C3 30C4 30C5 30C6 30C7 30C8 30C9 30CA 30CB 30CC 30CD 30CE 30CF 30D0 30D1 30D2 30D3 30D4 30D5 30D6 30D7 30D8 30D9 30DA 30DB 30DC 30DD 30DE 30DF 30E0 30E1 30E2 30E3 30E4 30E5 30E6 30E7 30E8 30E9 30EA 30EB 30EC 30ED 30EE 30EF 30F0 30F1 30F2 30F3 30F4 30F5 30F6").replace(/(\S{4})/g,
+function(a){return"%u"+a}).split(" ")},_assignHTMLObjects:function(a){a=c.$(a)||document;this.elDropdownLayer=c("DIV.xpress_xeditor_sCharacter_layer",a).get(0);this.oTextField=c("INPUT",this.elDropdownLayer).get(0);this.oInsertButton=c("+ BUTTON",this.oTextField).get(0);this.aCloseButton=c("BUTTON.close",this.elDropdownLayer).get();this.aSCharList=c(".list",this.elDropdownLayer).get();a=c(">UL",this.elDropdownLayer).get(0);this.aLabelA=c("A",a).get()},$ON_MSG_APP_READY:function(){var a=c.fnBind(this.oApp.exec,
+this.oApp,"INSERT_SCHARACTERS",[this.oTextField.value]);c(this.oInsertButton).click(a,this);this.oApp.exec("SET_SCHARACTER_LIST",[this.charSet]);for(a=0;a<this.aLabelA.length;a++){var b=c.fnBind(this.oApp.exec,this.oApp,"CHANGE_SCHARACTER_SET",[a]);c(this.aLabelA[a]).mousedown(b);this._stopBrowserEvent(this.aLabelA[a],"click")}for(a=0;a<this.aCloseButton.length;a++)this.oApp.registerBrowserEvent(this.aCloseButton[a],"click","HIDE_ACTIVE_LAYER",[]);this.oApp.registerBrowserEvent(this.elDropdownLayer,
+"click","EVENT_SCHARACTER_CLICKED",[]);this.oApp.exec("REGISTER_UI_EVENT",["sCharacter","click","TOGGLE_SCHARACTER_LAYER"])},$ON_TOGGLE_SCHARACTER_LAYER:function(){this.oTextField.value="";this.oSelection=this.oApp.getSelection();this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer])},$ON_EVENT_SCHARACTER_CLICKED:function(a){a=a.target;a.tagName=="BUTTON"&&a.parentNode.tagName=="LI"&&this.oApp.exec("SELECT_SCHARACTER",[a.firstChild.innerHTML])},$ON_SELECT_SCHARACTER:function(a){this.oTextField.value+=
+a;if(this.oTextField.createTextRange)a=this.oTextField.createTextRange(),a.collapse(false),a.select();else if(this.oTextField.selectionEnd)this.oTextField.selectionEnd=this.oTextField.value.length,this.oTextField.focus()},$ON_INSERT_SCHARACTERS:function(){this.oSelection.pasteHTML(this.oTextField.value);this.oApp.exec("HIDE_ACTIVE_LAYER",[])},$ON_CHANGE_SCHARACTER_SET:function(a){for(var b=0;b<this.aSCharList.length;b++)if(this.aSCharList[b].style.display=="block"){if(b==a)return;c(this.aLabelA[b]).removeClass("on");
+this.aSCharList[b].style.display="none"}this._drawSCharList(a);c(this.aLabelA[a]).addClass("on");this.aSCharList[a].style.display="block"},$ON_SET_SCHARACTER_LIST:function(a){this.charSet=a;this.bSCharSetDrawn=Array(this.charSet.length);this._drawSCharList(0)},_drawSCharList:function(a){if(!this.bSCharSetDrawn[a]){this.bSCharSetDrawn[a]=true;var b=this.charSet[a].length,c=Array(b);this.aSCharList[a].innerHTML="";for(var f=0;f<b;f++)c[f]=document.createElement("LI"),c[f].innerHTML='<button type="button"><span>'+
+unescape(this.charSet[a][f])+"</span></button>",this.aSCharList[a].appendChild(c[f])}},_stopBrowserEvent:function(a,b){c(a).bind(b,function(a){a.stopPropagation();a.preventDefault()})}});xe.XE_UndoRedo=c.Class({name:"XE_UndoRedo",actionHistory:null,oCurStateIdx:null,iMinimumSizeChange:10,sBlankContentsForFF:"<br>",$init:function(){this.aUndoHistory=[];this.oCurStateIdx={nIdx:0,nStep:0}},$PRECONDITION:function(a){if(a.match(/_DO_RECORD_UNDO_HISTORY_AT$/))return true;try{if(this.oApp.getEditingMode()!=
+"WYSIWYG")return false}catch(b){return false}return true},$BEFORE_MSG_APP_READY:function(){this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT",[this.oCurStateIdx,"","",null])},$ON_MSG_APP_READY:function(){this.bFF=c.browser.mozilla;this.oApp.exec("ADD_APP_PROPERTY",["getUndoHistory",c.fnBind(this.getUndoHistory,this)]);this.oApp.exec("ADD_APP_PROPERTY",["getUndoStateIdx",c.fnBind(this.getUndoStateIdx,this)]);this.oApp.exec("REGISTER_UI_EVENT",["undo","click","UNDO"]);this.oApp.exec("REGISTER_UI_EVENT",["redo",
+"click","REDO"]);this.oApp.exec("REGISTER_HOTKEY",["ctrl+z","UNDO"]);this.oApp.exec("REGISTER_HOTKEY",["ctrl+y","REDO"])},$ON_UNDO:function(){this.oApp.exec("DO_RECORD_UNDO_HISTORY",["KEYPRESS",false,false,1]);if(this.oCurStateIdx.nIdx!=0){if(this.oCurStateIdx.nStep>0)this.oCurStateIdx.nStep--;else{var a=this.aUndoHistory[this.oCurStateIdx.nIdx];this.oCurStateIdx.nIdx--;a.nTotalSteps>1?this.oCurStateIdx.nStep=0:(a=this.aUndoHistory[this.oCurStateIdx.nIdx],this.oCurStateIdx.nStep=a.nTotalSteps-1)}this.oApp.exec("RESTORE_UNDO_HISTORY",
+[this.oCurStateIdx.nIdx,this.oCurStateIdx.nStep]);this.oApp.exec("CHECK_STYLE_CHANGE",[])}},$ON_REDO:function(){if(!(this.oCurStateIdx.nIdx>=this.aUndoHistory.length)){var a=this.aUndoHistory[this.oCurStateIdx.nIdx];if(!(this.oCurStateIdx.nIdx==this.aUndoHistory.length-1&&this.oCurStateIdx.nStep>=a.nTotalSteps-1))this.oCurStateIdx.nStep<a.nTotalSteps-1?this.oCurStateIdx.nStep++:(this.oCurStateIdx.nIdx++,a=this.aUndoHistory[this.oCurStateIdx.nIdx],this.oCurStateIdx.nStep=a.nTotalSteps-1),this.oApp.exec("RESTORE_UNDO_HISTORY",
+[this.oCurStateIdx.nIdx,this.oCurStateIdx.nStep]),this.oApp.exec("CHECK_STYLE_CHANGE",[])}},$ON_RECORD_UNDO_ACTION:function(a){this.oApp.exec("DO_RECORD_UNDO_HISTORY",[a])},$ON_RECORD_UNDO_BEFORE_ACTION:function(a){this.oApp.exec("DO_RECORD_UNDO_HISTORY",[a,true,true])},$ON_RECORD_UNDO_AFTER_ACTION:function(a){this.oApp.exec("DO_RECORD_UNDO_HISTORY",[a,true,false])},$ON_RESTORE_UNDO_HISTORY:function(a,b){this.oCurStateIdx.nIdx=a;this.oCurStateIdx.nStep=b;var c=this.aUndoHistory[this.oCurStateIdx.nIdx],
+f=c.oBookmark[this.oCurStateIdx.nStep];this.oApp.setIR(c.sContent[this.oCurStateIdx.nStep],true);var e=this.oApp.getIR();this.bFF&&e==this.sBlankContentsForFF&&(e="");c.sContent[this.oCurStateIdx.nStep]=e;c=this.oApp.getEmptySelection();c.selectionLoaded&&(f?c.moveToXPathBookmark(f):c=this.oApp.getEmptySelection(),c.select())},$ON_DO_RECORD_UNDO_HISTORY:function(a,b,c,f){b=b||false;c=c||false;f=f||0;this.oCurStateIdx.nIdx!=this.aUndoHistory.length-1&&(f=1);var e=this.aUndoHistory[this.oCurStateIdx.nIdx],
+g=this.oApp.getIR(),h=e.sContent[this.oCurStateIdx.nStep];this.bFF&&g==this.sBlankContentsForFF&&(g="");if(!b)switch(f){case 0:if(Math.abs(h.length-g.length)<this.iMinimumSizeChange)return;break;case 1:if(h==g)return}h=this.oApp.getSelection();f=null;h.selectionLoaded&&(f=h.getXPathBookmark());h={nIdx:this.oCurStateIdx.nIdx,nStep:this.oCurStateIdx.nStep};h.nStep=b?c?0:1:0;if(h.nStep==0&&this.oCurStateIdx.nStep==e.nTotalSteps-1)h.nIdx=this.oCurStateIdx.nIdx+1;this.oApp.exec("DO_RECORD_UNDO_HISTORY_AT",
+[h,a,g,f])},$ON_DO_RECORD_UNDO_HISTORY_AT:function(a,b,c,f){a.nStep!=0?(this.aUndoHistory[a.nIdx].nTotalSteps=a.nStep+1,this.aUndoHistory[a.nIdx].sContent[a.nStep]=c,this.aUndoHistory[a.nIdx].oBookmark[a.nStep]=f):(b={sAction:b,nTotalSteps:1,sContent:[]},b.sContent[0]=c,b.oBookmark=[],b.oBookmark[0]=f,this.aUndoHistory.splice(a.nIdx,this.aUndoHistory.length-a.nIdx,b));this.oCurStateIdx.nIdx=a.nIdx;this.oCurStateIdx.nStep=a.nStep},_getUndoHistory:function(){return this.aUndoHistory},_getUndoStateIdx:function(){return this.oCurStateIdx}});
+xe.XE_Hyperlink=c.Class({name:"XE_Hyperlink",sATagMarker:"HTTP://HUSKY_TMP.MARKER/",$init:function(a){this._assignHTMLObjects(a);this.sRXATagMarker=this.sATagMarker.replace(/\//g,"\\/").replace(/\./g,"\\.")},_assignHTMLObjects:function(a){this.oHyperlinkLayer=c("DIV.xpress_xeditor_hyperlink_layer",a).get(0);this.oLinkInput=c("INPUT[type=text]",this.oHyperlinkLayer).get(0);this.oBtnConfirm=c("BUTTON.confirm",this.oHyperlinkLayer).get(0);this.oBtnCancel=c("BUTTON.cancel",this.oHyperlinkLayer).get(0);
+this.oCbNewWin=c("INPUT[type=checkbox]",this.oHyperlinkLayer).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_HOTKEY",["ctrl+k","XE_TOGGLE_HYPERLINK_LAYER",[]]);this.oApp.registerBrowserEvent(this.oBtnConfirm,"mousedown","XE_APPLY_HYPERLINK");this.oApp.registerBrowserEvent(this.oBtnCancel,"mousedown","HIDE_ACTIVE_LAYER");this.oApp.registerBrowserEvent(this.oLinkInput,"keydown","EVENT_XE_HYPERLINK_KEYDOWN");this.oApp.exec("REGISTER_UI_EVENT",["hyperlink","click","XE_TOGGLE_HYPERLINK_LAYER"])},
+$ON_XE_TOGGLE_HYPERLINK_LAYER:function(){this.oApp.delayedExec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.oHyperlinkLayer,null,"XE_RESET_HYPERLINK_LAYER",[]],0)},$ON_XE_RESET_HYPERLINK_LAYER:function(){this.oApp.exec("FOCUS",[]);this.oSelection=this.oApp.getSelection();var a=this.oSelection.findAncestorByTagName("A");this.oCbNewWin.checked=false;if(a){this.oSelection.selectNode(a);this.oSelection.select();var b=a.target;if(b&&b=="_blank")this.oCbNewWin.checked=true;this.oLinkInput.value=a.href?a.href:"http://"}else this.oLinkInput.value=
+"http://";this.oLinkInput.focus();this.oLinkInput.value=this.oLinkInput.value},$ON_XE_APPLY_HYPERLINK:function(){var a=this.oLinkInput.value,b=this.oCbNewWin.checked?"_blank":"";this.oApp.exec("FOCUS",[]);this.oSelection=this.oApp.getSelection();if(this.oSelection.collapsed)this.oSelection.pasteHTML("<a href='"+a+"' target="+b+">"+a+"</a>");else{var d=this.sATagMarker+Math.ceil(Math.random()*1E4);this.oApp.exec("EXECCOMMAND",a==""?["unlink"]:["createLink",false,d+a]);try{this.oSelection.setFromSelection()}catch(f){}a=
+this.oApp.getWYSIWYGDocument();c(a.body.getElementsByTagName("A")).filter('[href^="'+d+'"]').attr("href",function(){var a=RegExp("^"+d.replace(/([\.\\])/g,"\\$1"),"i");b?c(this).attr("target",b):c(this).removeAttr("target");return this.href.replace(a,"")})}this.oApp.exec("HIDE_ACTIVE_LAYER");setTimeout(c.fnBind(function(){try{this.oSelection.select()}catch(a){}},this),0)},_validateURL:function(a){return/^(http|https|ftp|mailto):(?:\/\/)?((\w|-)+(?:[\.:@](\w|-))+)(?:\/|@)?([^"\?]*?)(?:\?([^\?"]*?))?$/.test(a)},
+$ON_EVENT_XE_HYPERLINK_KEYDOWN:function(a){a.keyCode==13&&(this.oApp.exec("XE_APPLY_HYPERLINK"),a.preventDefault(),a.stopPropagation())}});xe.XE_Table=c.Class({name:"XE_Table",iMinRows:1,iMaxRows:20,iMinColumns:1,iMaxColumns:10,iMinBorderWidth:1,iMaxBorderWidth:10,oSelection:null,$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){var b=null;this.elDropdownLayer=c("DIV.xpress_xeditor_table_layer",a).get(0);this.welDropdownLayer=c(this.elDropdownLayer);b=c("INPUT",this.elDropdownLayer).get();
+this.oRowInput=b[0];this.oColumnInput=b[1];this.oBorderWidthInput=b[2];this.oBorderColorInput=b[3];this.oBGColorInput=b[4];b=c("BUTTON",this.elDropdownLayer).get();this.oButton_AddRow=b[0];this.oButton_RemoveRow=b[1];this.oButton_AddColumn=b[2];this.oButton_RemoveColumn=b[3];this.oButton_IncBorderWidth=b[4];this.oButton_DecBorderWidth=b[5];this.oButton_BorderColorPreview=b[6];this.oButton_BorderColor=b[7];this.oButton_BGColorPreview=b[8];this.oButton_BGColor=b[9];this.oButton_Insert=b[10];this.oButton_Cancel=
+b[11];this.oSampleTable=c("TABLE",this.elDropdownLayer).get(0)},$ON_MSG_APP_READY:function(){this.oApp.exec("REGISTER_UI_EVENT",["table","click","ST_TOGGLE_TOOLBAR_LAYER"]);this.oApp.registerBrowserEvent(this.oRowInput,"change","ST_SET_ROW_NUM",[null,0]);this.oApp.registerBrowserEvent(this.oColumnInput,"change","ST_SET_COLUMN_NUM",[null,0]);this.oApp.registerBrowserEvent(this.oBorderWidthInput,"change","ST_SET_BORDER_WIDTH",[null,0]);this.oApp.registerBrowserEvent(this.oButton_AddRow,"click","ST_ADD_ROW");
+this.oApp.registerBrowserEvent(this.oButton_RemoveRow,"click","ST_REMOVE_ROW");this.oApp.registerBrowserEvent(this.oButton_AddColumn,"click","ST_ADD_COLUMN");this.oApp.registerBrowserEvent(this.oButton_RemoveColumn,"click","ST_REMOVE_COLUMN");this.oApp.registerBrowserEvent(this.oButton_IncBorderWidth,"click","ST_INC_BORDER_WIDTH");this.oApp.registerBrowserEvent(this.oButton_DecBorderWidth,"click","ST_DEC_BORDER_WIDTH");this.oApp.registerBrowserEvent(this.oButton_BorderColorPreview,"click","ST_TOGGLE_BORDER_COLOR_LAYER");
+this.oApp.registerBrowserEvent(this.oButton_BGColorPreview,"click","ST_TOGGLE_BGCOLOR_LAYER");this.oApp.registerBrowserEvent(this.oButton_BorderColor,"click","ST_TOGGLE_BORDER_COLOR_LAYER");this.oApp.registerBrowserEvent(this.oButton_BGColor,"click","ST_TOGGLE_BGCOLOR_LAYER");this.oApp.registerBrowserEvent(this.oButton_Insert,"click","ST_INSERT_TABLE");this.oApp.registerBrowserEvent(this.oButton_Cancel,"click","ST_CLOSE");this.oApp.exec("ST_SET_BORDER_COLOR",["#CCCCCC"]);this.oApp.exec("ST_SET_BGCOLOR",
+["#FFFFFF"])},$ON_ST_TOGGLE_TOOLBAR_LAYER:function(){this.oApp.exec("RECORD_UNDO_ACTION_FORCED",["KEYPRESS"]);this._showNewTable();this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer])},$ON_ST_ADD_ROW:function(){this.oApp.exec("ST_SET_ROW_NUM",[null,1])},$ON_ST_REMOVE_ROW:function(){this.oApp.exec("ST_SET_ROW_NUM",[null,-1])},$ON_ST_ADD_COLUMN:function(){this.oApp.exec("ST_SET_COLUMN_NUM",[null,1])},$ON_ST_REMOVE_COLUMN:function(){this.oApp.exec("ST_SET_COLUMN_NUM",[null,-1])},$ON_ST_SET_ROW_NUM:function(a,
+b){a=a||parseInt(this.oRowInput.value);a+=b||0;if(a<this.iMinRows)a=this.iMinRows;if(a>this.iMaxRows)a=this.iMaxRows;this.oRowInput.value=a;this._showNewTable()},$ON_ST_SET_COLUMN_NUM:function(a,b){a=a||parseInt(this.oColumnInput.value);a+=b||0;if(a<this.iMinColumns)a=this.iMinColumns;if(a>this.iMaxColumns)a=this.iMaxColumns;this.oColumnInput.value=a;this._showNewTable()},$ON_ST_INSERT_TABLE:function(){this.oApp.exec("PASTE_HTML",[this._getTableString()]);this.oApp.exec("ST_CLOSE",[])},$ON_ST_CLOSE:function(){this.oApp.exec("HIDE_ACTIVE_LAYER",
+[])},$ON_ST_SET_BORDER_WIDTH:function(a,b){a=a||parseInt(this.oBorderWidthInput.value);a+=b||0;if(a<this.iMinBorderWidth)a=this.iMinBorderWidth;if(a>this.iMaxBorderWidth)a=this.iMaxBorderWidth;this.oBorderWidthInput.value=a;this._showNewTable()},$ON_ST_INC_BORDER_WIDTH:function(){this.oApp.exec("ST_SET_BORDER_WIDTH",[null,1])},$ON_ST_DEC_BORDER_WIDTH:function(){this.oApp.exec("ST_SET_BORDER_WIDTH",[null,-1])},$ON_ST_TOGGLE_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.hasClass("p1")?this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER",
+[]):this.oApp.exec("ST_SHOW_BORDER_COLOR_LAYER",[])},$ON_ST_SHOW_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.addClass("p1");this.welDropdownLayer.removeClass("p2");this.oApp.exec("SHOW_COLOR_PALETTE",["ST_SET_BORDER_COLOR_FROM_PALETTE",this.elDropdownLayer])},$ON_ST_HIDE_BORDER_COLOR_LAYER:function(){this.welDropdownLayer.removeClass("p1");this.oApp.exec("HIDE_COLOR_PALETTE",[])},$ON_ST_TOGGLE_BGCOLOR_LAYER:function(){this.welDropdownLayer.hasClass("p2")?this.oApp.exec("ST_HIDE_BGCOLOR_LAYER",
+[]):this.oApp.exec("ST_SHOW_BGCOLOR_LAYER",[])},$ON_ST_SHOW_BGCOLOR_LAYER:function(){this.welDropdownLayer.removeClass("p1");this.welDropdownLayer.addClass("p2");this.oApp.exec("SHOW_COLOR_PALETTE",["ST_SET_BGCOLOR_FROM_PALETTE",this.elDropdownLayer])},$ON_ST_HIDE_BGCOLOR_LAYER:function(){this.welDropdownLayer.removeClass("p2");this.oApp.exec("HIDE_COLOR_PALETTE",[])},$ON_ST_SET_BORDER_COLOR_FROM_PALETTE:function(a){this.oApp.exec("ST_SET_BORDER_COLOR",[a]);this.oApp.exec("ST_HIDE_BORDER_COLOR_LAYER",
+[])},$ON_ST_SET_BORDER_COLOR:function(a){this.oBorderColorInput.value=a;this.oButton_BorderColorPreview.style.backgroundColor=a;this._showNewTable()},$ON_ST_SET_BGCOLOR_FROM_PALETTE:function(a){this.oApp.exec("ST_SET_BGCOLOR",[a]);this.oApp.exec("ST_HIDE_BGCOLOR_LAYER",[])},$ON_ST_SET_BGCOLOR:function(a){this.oBGColorInput.value=a;this.oButton_BGColorPreview.style.backgroundColor=a;this._showNewTable()},_showNewTable:function(){var a=document.createElement("DIV");a.innerHTML=this._getTableString();
+a=a.firstChild;this.oSampleTable.parentNode.insertBefore(a,this.oSampleTable);this.oSampleTable.parentNode.removeChild(this.oSampleTable);this.oSampleTable=a},_getTableString:function(){for(var a=this.oBorderColorInput.value,b=this.oBGColorInput.value,d=this.oBorderWidthInput.value,f="",f=c.browser.msie?"<td><p></p></td>":c.browser.firefox?"<td><p><br/></p></td>":"<td><p>&nbsp;</p></td>",a='<table style="background:'+a+'" cellspacing="'+d+'">',b='<tr style="background:'+b+'">',e=this.oColumnInput.value,
+d=0;d<e;d++)b+=f;b+="</tr>\n";f=this.oRowInput.value;a+="<tbody>";for(d=0;d<f;d++)a+=b;a+="</tbody>";a+="</table>";return a}});xe.XE_EditingModeToggler=c.Class({name:"XE_EditingModeToggler",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){a=c.$(a)||document;this.elModeToggleButton=c("BUTTON.xpress_xeditor_mode_toggle_button",a).get(0);this.welModeToggleButton=c(this.elModeToggleButton)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elModeToggleButton,
+"click","EVENT_TOGGLE_EDITING_MODE",[])},$ON_EVENT_TOGGLE_EDITING_MODE:function(){this.oApp.getEditingMode()=="WYSIWYG"?this.oApp.exec("CHANGE_EDITING_MODE",["HTMLSrc"]):this.oApp.exec("CHANGE_EDITING_MODE",["WYSIWYG"])},$ON_CHANGE_EDITING_MODE:function(a){a=="HTMLSrc"?(this.welModeToggleButton.addClass("active").parent("span").addClass("active"),this.oApp.exec("DISABLE_ALL_UI",[])):(this.welModeToggleButton.removeClass("active").parent("span").removeClass("active"),this.oApp.exec("ENABLE_ALL_UI",
+[]))}});xe.XpressCore.oMessageMap={"XE_EditingAreaManager.onExit":"%uB0B4%uC6A9%uC774%20%uBCC0%uACBD%uB418%uC5C8%uC2B5%uB2C8%uB2E4.","XE_FontColor.invalidColorCode":"%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff","XE_BGColor.invalidColorCode":"%uC0C9%uC0C1%20%uCF54%uB4DC%uB97C%20%uC62C%uBC14%uB974%uAC8C%20%uC785%uB825%uD558%uC5EC%20%uC8FC%uC2DC%uAE30%20%uBC14%uB78D%uB2C8%uB2E4.\n\n%uC608%29%20%23000000%2C%20%23FF0000%2C%20%23FFFFFF%2C%20%23ffffff%2C%20ffffff",
+"XE_Hyperlink.invalidURL":"%uC785%uB825%uD558%uC2E0%20URL%uC774%20%uC62C%uBC14%uB974%uC9C0%20%uC54A%uC2B5%uB2C8%uB2E4."};regex_handler=/<(.*?)\s+on[a-z]+\s*=(?:\s*".*?"|\s*'.*?'|[^\s>]+)(.*?)>/ig;regex_font_color=/color\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i;regex_font_face=/face\s*=(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i;regex_font_size=/size\s*=(?:\s*"(\d+)"|\s*'(\d+)'|(\d+))/i;regex_style=/style\s*=\s*(?:\s*"(.*?)"|\s*'(.*?)'|([^\s>]+))/i;regex_font_weight=/font-weight\s*:\s*([a-z]+);?/i;regex_font_style=
+/font-style\s*:\s*italic;?/i;regex_font_decoration=/text-decoration\s*:\s*([a-z -]+);?/i;regex_jquery=/jQuery\d+\s*=(\s*"\d+"|\d+)/ig;regex_quote_attr=/([\w-]+\s*=(?:\s*"[^"]+"|\s*'[^']+'))|([\w-]+)=([^\s]+)/g;"a,abbr,acronym,address,area,blockquote,br,caption,center,cite,code,col,colgroup,dd,del,dfn,div,dl,dt,em,embed,h1,h2,h3,h4,h5,h6,hr,img,ins,kbd,li,map,object,ol,p,param,pre,q,samp,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,tt,u,ul,var,iframe,object,param,style".split(",");var o="area,br,col,embed,hr,img,input,param".split(",");
+xe.XE_XHTMLFormatter=c.Class({name:"XE_XHTMLFormatter",$ON_MSG_APP_READY:function(){this.oApp.addConverter("WYSIWYG_TO_IR",this.TO_IR);this.oApp.addConverter("HTMLSrc_TO_IR",this.TO_IR);this.oApp.addConverter("IR_TO_HTMLSrc",this.IR_TO);this.oApp.addConverter("IR_TO_WYSIWYG",this.IR_TO)},TO_IR:function(a){var b=[];c.browser.msie&&(a=a.replace(regex_jquery,""),a=a.replace(/<(\w+) ([^>]+)>/g,function(a,b,c){return"<"+b+" "+c.replace(regex_quote_attr,function(a,b,c,d){return b?b:/^"/.test(d)||/"$/.test(d)?
+c+"="+d:c+'="'+(d||c)+'"'})+">"}));regex=/<(\/)?([:\w\/-]+)(.*?)>/ig;return a=a.replace(regex,function(a,f,e,g){f=f||"";e=e.toLowerCase();g=c.trim(g||"");if(f){g=[];a="";if(!b.length)return"";do a=b.pop(),a.tag==e&&a.state!="deleted"&&g.push("</"+a.tag+">");while(b.length&&a.tag!=e);return g.join("")}else if(c.inArray(e,o)>=0){a=g.length;e=="br"&&(g="");if(!g||g.substring(a-1,a)!="/")g+="/";return"<"+e+" "+c.trim(g)+">"}else b[b.length]={tag:e,state:""};return"<"+f+e+(g?" "+g:"")+">"})},IR_TO:function(a){return a}});
+xe.XE_Extension=c.Class({name:"XE_Extension",seq:"",last_doc:"",$init:function(a,b){this.seq=b;this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elDropdownLayer=c("DIV.xpress_xeditor_extension_layer",a).get(0)},_removeAttrs:function(a){return a},_addEvent:function(){if(this.oApp.getEditingMode()=="WYSIWYG"){var a=this.oApp.getWYSIWYGDocument(),b=this.seq,d=function(){var a=c(this),d=a.attr("editor_component");d&&c.isFunction(openComponent)&&(editorPrevNode=a.get(0),openComponent(d,b))};
+c(a).find("img,div[editor_component]").each(function(){var b=c(this);this.nodeName=="IMG"&&!b.attr("editor_component")&&b.attr("editor_component","image_link");if(this.last_doc!=a)b.dblclick(d),this.last_doc=a})}},$ON_MSG_APP_READY:function(){var a=this.oApp;a.exec("REGISTER_UI_EVENT",["extension","click","TOGGLE_EXTENSION_LAYER"]);var b=function(){a.exec("HIDE_ACTIVE_LAYER",[])};c("a",this.elDropdownLayer).each(function(){var a=c(this);a.attr("component_onclick_event_added")||(a.click(b),a.attr("component_onclick_event_added",
+"Y"))})},$ON_TOGGLE_EXTENSION_LAYER:function(){this.oApp.exec("TOGGLE_TOOLBAR_ACTIVE_LAYER",[this.elDropdownLayer])},$ON_CHANGE_EDITING_MODE:function(){var a=this;setTimeout(function(){a._addEvent()},100)},$ON_PASTE_HTML:function(){var a=this;setTimeout(function(){a._addEvent()},100)},$ON_LOAD_IR_FIELD:function(){var a=this;setTimeout(function(){a._addEvent()},100)},$ON_SET_IR:function(){var a=this;setTimeout(function(){a._addEvent()},100)}});xe.XE_AutoSave=c.Class({name:"XE_AutoSave",form:null,textarea:null,
+$init:function(a,b){this.form=a.form;this.textarea=a;this._assignHTMLObjects(b)},_assignHTMLObjects:function(){this.welMessageBox=c("autosave_message")},$ON_MSG_APP_READY:function(){var a=c(this.form._saved_doc_title),b=c(this.form._saved_doc_content),a=c.trim(a.val()),b=c.trim(b.val());if(a||b)confirm(this.form._saved_doc_message.value)?(c(this.form.title).val(a),this.oApp.setIR(b),typeof editorGetAutoSavedDoc=="function"&&editorGetAutoSavedDoc(this.form)):editorRemoveSavedDoc();editorEnableAutoSave(this.form,
+c(this.form).attr("editor_sequence"));this.oApp.exec("REGISTER_HOTKEY",["ctrl+shift+s","AUTO_SAVE"])},$ON_AUTO_SAVE:function(){_editorAutoSave()}});xe.XE_FormatWithSelectUI=c.Class({name:"XE_FormatWithSelectUI",$init:function(a){this._assignHTMLObjects(a)},_assignHTMLObjects:function(a){this.elFormatSelect=c("SELECT.xpress_xeditor_ui_format_select",a).get(0)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elFormatSelect,"change","SET_FORMAT_FROM_SELECT_UI");this.elFormatSelect.selectedIndex=
+0},$ON_MSG_STYLE_CHANGED:function(){var a=this.oApp.getWYSIWYGDocument().queryCommandValue("FormatBlock");if(!a)return this.elFormatSelect.selectedIndex=0;c.browser.msie&&/([0-9])/.test(a)&&(a="h"+RegExp.$1);this.elFormatSelect.value=a.toLowerCase();if(this.elFormatSelect.selectedIndex<0)this.elFormatSelect.selectedIndex=0;if(this.elFormatSelect.value!=a.toLowerCase())this.elFormatSelect.selectedIndex=0},$ON_SET_FORMAT_FROM_SELECT_UI:function(){var a=this.elFormatSelect.value;a&&(c.browser.msie&&
+(a="<"+a+">"),this.oApp.exec("EXECCOMMAND",["FormatBlock",false,a]),this.oApp.exec("CHECK_STYLE_CHANGE",[]))}});xe.XE_Table=c.Class({_startSel:null,_endSel:null,$ON_MSG_APP_READY:function(){this._doc=c(this.oApp.getWYSIWYGDocument());this.$FnMouseDown=c.fnBind(this._mousedown,this);this.$FnMouseUp=c.fnBind(this._mouseup,this);this.$FnMouseMove=c.fnBind(this._mousemove,this);this._doc.mousedown(this.$FnMouseDown);this._endSel=this._startSel=null;this.oApp.exec("REGISTER_UI_EVENT",["merge_cells","click",
+"MERGE_CELLS"]);this.oApp.exec("REGISTER_UI_EVENT",["split_col","click","CELL_SPLIT_BY_COL"]);this.oApp.exec("REGISTER_UI_EVENT",["split_row","click","CELL_SPLIT_BY_ROW"]);this.oApp.exec("REGISTER_HOTKEY",["ctrl+alt+m","MERGE_CELLS"]);this.$super.$ON_MSG_APP_READY()},$ON_MERGE_CELLS:function(){var a="",b=c(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),d=this;if(b.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Merge"]);b.each(function(){a+=c(this).html()}).eq(0).html(a);var f=
+0;b.eq(0).nextAll("td,th").andSelf().filter(".xe_selected_cell").each(function(){f+=d._getSpan(this,"col")});this._getRect(b.eq(0));var e=b.eq(0).parent("tr"),g=b.eq(b.length-1).parent("tr"),h=b.parents("table").eq(0).find("tr"),e=h.index(g.get(0))-h.index(e.get(0))+this._getSpan(b.eq(b.length-1),"row");b.eq(0).attr("colSpan",f).attr("rowSpan",e);b.slice(1).remove()}},$ON_CELL_SPLIT_BY_ROW:function(){var a=c(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),b=a.parents("table").eq(0),
+d=this;if(a.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Split By Row"]);var f=this._getRect(a.eq(0)).top,e=this._getRect(a.eq(a.length-1)).bottom;(a=b.find("td,th").filter(function(){var a=d._getRect(c(this));return!(a.bottom<=f||a.top>=e)})).filter(".xe_selected_cell").each(function(){var b=c(this),e=b.parent("tr"),f=d._getSpan(b,"row"),j=d._getRect(b),k=[],n=b.clone().html("<br />"),m=1,o=1;f>1?(m=Math.ceil(f/2),o=f-m,k.push(function(){b.attr("rowSpan",m)}),n.attr("rowSpan",o)):(a.filter(function(){if(b.get(0)==
+this)return false;var a=c(this),a=d._getRect(a);return a.bottom<=j.top||a.top>=j.bottom?false:true}).each(function(){var a=c(this),b=d._getSpan(a,"row")+1;k.push(function(){a.attr("rowSpan",b)})}),c.browser.msie?e.after(e.clone().empty().get(0).outerHTML):e.after(e.clone().empty()));f=e.nextAll("tr");f.length?(e=f.eq(m-1).children("td,th").filter(function(){return d._getRect(c(this)).left>j.left}),c.browser.msie?e.length?e.eq(0).before(n.get(0).outerHTML):f.eq(m-1).append(n.get(0).outerHTML):e.length?
+e.slice(0,1).before(n):f.slice(m-1,1).append(n)):e.after(e.clone().empty().append(n));c.each(k,function(){this()})})}},$ON_CELL_SPLIT_BY_COL:function(){var a=c(".xe_selected_cell",this.oApp.getWYSIWYGDocument()).filter("td,th"),b=a.parents("table").slice(0,1),d=this;(new Date).getTime();if(a.length){this.oApp.exec("RECORD_UNDO_ACTION",["Cell:Split By Column"]);var f=a.eq(0).parent("tr"),e=this._getRect(f.find(".xe_selected_cell:first")).left,g=this._getRect(f.find(".xe_selected_cell:last")).right;
+(a=b.find("td,th").filter(function(){var a=d._getRect(c(this));return!(a.right<=e||a.left>=g)})).filter(".xe_selected_cell").each(function(){var b=c(this),e=d._getSpan(b,"col"),f=b.clone().html("<br />");if(e>1){var g=Math.ceil(e/2);e-=g;b.attr("colSpan",g);f.attr("colSpan",e)}else{var k=d._getRect(b);a.filter(function(){if(b.get(0)==this)return false;var a=c(this),a=d._getRect(a);return a.right<=k.left||a.left>=k.right?false:true}).each(function(){var a=c(this);a.attr("colSpan",d._getSpan(a,"col")+
+1)});f.attr("colSpan",1)}c.browser.msie?b.after(f.get(0).outerHTML):b.after(f)})}},$ON_CHECK_STYLE_CHANGE:function(){var a=this.oApp,b=this._startSel&&this._startSel.is(".xe_selected_cell")?"ENABLE_UI":"DISABLE_UI";c.each(["merge_cells","split_col","split_row"],function(){a.exec(b,[this])})},_mousedown:function(a){var b=c(a.target).parents().andSelf().filter("td,th,table"),d=this.oApp,f=this;c("td.xe_selected_cell",this.oApp.getWYSIWYGDocument()).removeClass("xe_selected_cell");this._endSel=this._startSel=
+null;b.length&&this._isLeftClicked(a.button)&&setTimeout(function(){b=d.getSelection().cloneRange();b.collapseToStart();b=c(b.startContainer).parents().andSelf().filter("td,th").eq(0);if(!b.length)return f._removeAllListener()||true;f._getRect(f._startSel=b);f._doc.bind("mousemove",f.$FnMouseMove);f._doc.bind("mouseup",f.$FnMouseUp)},0)},_mouseup:function(){this._removeAllListener();this._startSel=this._endSel=null},_mousemove:function(a){var b=c(a.target).parents().andSelf().filter("td,th").eq(0),
+d=this;if(b.length&&this._isLeftClicked(a.button)&&(this._endSel||b.get(0)!=this._startSel.get(0))&&!(this._endSel&&b.get(0)==this._endSel.get(0))){this._getRect(this._endSel=b);var f=Math.min(this._startSel.rect.top,this._endSel.rect.top),e=Math.min(this._startSel.rect.left,this._endSel.rect.left),g=Math.max(this._startSel.rect.bottom,this._endSel.rect.bottom),h=Math.max(this._startSel.rect.right,this._endSel.rect.right),a=b.parents("table").find("td,th").removeClass("xe_selected_cell"),b=c();do b.each(function(){var a=
+d._getRect(c(this));if(a.right>h)h=a.right;if(a.left<e)e=a.left;if(a.top<f)f=a.top;if(a.bottom>g)g=a.bottom}),a=a.filter(":not(.xe_selected_cell)"),b=a.filter(function(){var a=d._getRect(c(this));return a.right<=e||a.left>=h||a.bottom<=f||a.top>=g?false:true}).addClass("xe_selected_cell");while(b.length);c.browser.mozilla||setTimeout(function(){var a=d.oApp.getSelection();d._startSel&&(d._startSel.get(0).firstChild||d._startSel.text(" "),a.selectNode(d._startSel.get(0).firstChild),a.collapseToStart(),
+a.select())},0);return false}},_removeAllListener:function(){this._doc.unbind("mousemove",this.$FnMouseMove);this._doc.unbind("mouseup",this.$FnMouseUp)},_isLeftClicked:function(a){return c.browser.msie?!!(a&1):a==0},_getRect:function(a){var b=a.get(0);a.rect={};a.rect.top=b.offsetTop;a.rect.left=b.offsetLeft;a.rect.bottom=a.rect.top+b.offsetHeight;a.rect.right=a.rect.left+b.offsetWidth;return a.rect},_getSpan:function(a,b){var d=parseInt(c(a).attr(b+"span"));return isNaN(d)?1:d}}).extend(xe.XE_Table)})(jQuery);
+window.xe||(xe={});xe.Editors=[];
+function editorStart_xe(c,k,m,o,a,b,d,f){function e(){try{var a=p.contentWindow.document;if(a.location=="about:blank")throw"blank";j.registerPlugin(new xe.XE_EditingArea_WYSIWYG(p));j.registerPlugin(new xe.XpressRangeManager(p));j.registerPlugin(new xe.XE_ExecCommand(p));if(d&&!a.body.style.fontFamily)a.body.style.fontFamily=d;if(f&&!a.body.style.fontSize)a.body.style.fontSize=f;j.run()}catch(b){setTimeout(e,0)}}typeof a=="undefined"&&(a="white");typeof b=="undefined"&&(b="xeStyle");typeof d=="undefined"&&
+(d="");typeof f=="undefined"&&(f="");var g=request_uri+"modules/editor/styles/"+b+"/editor.html",b=jQuery("#xpress-editor-"+c),g=jQuery('<iframe id="editor_iframe_'+c+'" allowTransparency="true" frameborder="0" src="'+g+'" scrolling="yes" style="width:100%;height:'+o+'px">'),h=jQuery('<textarea rows="10" cols="20" class="input_syntax '+a+'" style="display:none"></textarea>'),a=b.get(0).form;a.setAttribute("editor_sequence",c);b.css("display","none");var l="";jQuery("input[name=content]",a).size()>
+0&&(l=jQuery("input[name=content]",a).val().replace(/src=\"files\/attach/g,'src="'+request_uri+"files/attach"),jQuery("#xpress-editor-"+c).val(l));b.hide().css("width","99%").before(g).after(h);var j=new xe.XpressCore,p=g.get(0),b=b.get(0),g=h.get(0),h=jQuery(".xpress-editor",a).get(0);j.getFrame=function(){return p};j.getContent=function(){editorGetContentTextarea_xe(c)};l=a[m].value;xFF&&!l&&(l="<br />");l=editorReplacePath(l);a[m].value=l;jQuery("#xpress-editor-"+c).val(l);editorRelKeys[c]=[];
+editorRelKeys[c].primary=a[k];editorRelKeys[c].content=a[m];editorRelKeys[c].func=editorGetContentTextarea_xe;editorRelKeys[c].editor=j;editorRelKeys[c].pasteHTML=function(a){j.exec("PASTE_HTML",[a])};xe.Editors[c]=j;j.registerPlugin(new xe.CorePlugin(null));j.registerPlugin(new xe.XE_PreservTemplate(jQuery("#xpress-editor-"+c).val()));j.registerPlugin(new xe.StringConverterManager);j.registerPlugin(new xe.XE_EditingAreaManager("WYSIWYG",b,{nHeight:parseInt(o),nMinHeight:205},null,h));j.registerPlugin(new xe.XE_EditingArea_HTMLSrc(g));
+j.registerPlugin(new xe.XE_EditingAreaVerticalResizer(h));j.registerPlugin(new xe.Utils);j.registerPlugin(new xe.DialogLayerManager);j.registerPlugin(new xe.ActiveLayerManager);j.registerPlugin(new xe.Hotkey);j.registerPlugin(new xe.XE_WYSIWYGStyler);j.registerPlugin(new xe.XE_WYSIWYGStyleGetter);j.registerPlugin(new xe.MessageManager(xe.XpressCore.oMessageMap));j.registerPlugin(new xe.XE_Toolbar(h));j.registerPlugin(new xe.XE_XHTMLFormatter);j.registerPlugin(new xe.XE_GET_WYSYWYG_MODE(c));jQuery("ul.extra1").length&&
+(j.registerPlugin(new xe.XE_ColorPalette(h)),j.registerPlugin(new xe.XE_FontColor(h)),j.registerPlugin(new xe.XE_BGColor(h)),j.registerPlugin(new xe.XE_Quote(h)),j.registerPlugin(new xe.XE_FontNameWithSelectUI(h)),j.registerPlugin(new xe.XE_FontSizeWithSelectUI(h)),j.registerPlugin(new xe.XE_LineHeightWithSelectUI(h)),j.registerPlugin(new xe.XE_UndoRedo),j.registerPlugin(new xe.XE_Table(h)),j.registerPlugin(new xe.XE_Hyperlink(h)),j.registerPlugin(new xe.XE_FormatWithSelectUI(h)),j.registerPlugin(new xe.XE_SCharacter(h)));
+jQuery("ul.extra2").length&&j.registerPlugin(new xe.XE_Extension(h,c));jQuery("ul.extra3").length&&j.registerPlugin(new xe.XE_EditingModeToggler(h));!jQuery.browser.msie&&!jQuery.browser.opera&&j.registerPlugin(new xe.XE_WYSIWYGEnterKey(p));(s=a._saved_doc_title)&&j.registerPlugin(new xe.XE_AutoSave(b,h));e();return j}
+function editorGetContentTextarea_xe(c){c=xe.Editors[c]||null;if(!c)return"";c=c.getIR();if(!jQuery.trim(c.replace(/(&nbsp;|<\/?(p|br|span|div)([^>]+)?>)/ig,"")))return"";c=c.replace(/<br ?\/?>$/i,"");if(c.length<1024){var k="#text,A,BR,IMG,EM,STRONG,SPAN,BIG,CITE,CODE,DD,DFN,HR,INS,KBD,LINK,Q,SAMP,SMALL,SUB,SUP,TT".split(","),m=true,o=jQuery("<div>"+c+"</div>").eq(0).contents();jQuery.each(o,function(){this.nodeType!=3&&jQuery.inArray(this.nodeName,k)==-1&&(m=false)});m&&(c="<p>"+c+"</p>")}c=c.replace(/src\s?=\s?(["']?)(?:\.\.\/)+(files\/attach\/)/ig,
+function(a,b,c){return"src="+(b||"")+c});c=c.replace(/\<(\/)?([A-Z]+)([^>]*)\>/ig,function(a,b,c,f){f=f?f.replace(/ ([A-Z]+?)\=/ig,function(a,b){b=b.toLowerCase();return" "+b+"="}):"";c=c.toLowerCase();b||(b="");return"<"+b+c+f+">"});return c=c.replace("<br>","<br />")}function editorGetIframe(c){return jQuery("iframe#editor_iframe_"+c).get(0)}function editorReplaceHTML(c,k){var k=editorReplacePath(k),m=parseInt(c.id.replace(/^.*_/,""),10);editorRelKeys[m].pasteHTML(k)}
+function editorReplacePath(c){return c=c.replace(/\<([^\>\<]*)(src=|href=|url\()("|\')*([^"\'\)]+)("|\'|\))*(\s|>)*/ig,function(c,m,o,a,b,d,f){o=="url("?(a="",d=")"):(typeof a=="undefined"&&(a='"'),typeof d=="undefined"&&(d='"'),typeof f=="undefined"&&(f=""));b=jQuery.trim(b).replace(/^\.\//,"");return/^(http\:|https\:|ftp\:|telnet\:|mms\:|mailto\:|\/|\.\.|\#)/i.test(b)?c:"<"+m+o+a+request_uri+b+d+f})}
+function editorGetAutoSavedDoc(c){var k=[];k.mid=current_mid;k.editor_sequence=c.getAttribute("editor_sequence");setTimeout(function(){exec_xml("editor","procEditorLoadSavedDocument",k,function(c){editorRelKeys[k.editor_sequence].primary.value=c.document_srl;typeof uploadSettingObj[k.editor_sequence]=="object"&&editorUploadInit(uploadSettingObj[k.editor_sequence],true)},"error,message,editor_sequence,title,content,document_srl".split(","))},0)}
+xe.XE_GET_WYSYWYG_MODE=jQuery.Class({name:"XE_GET_WYSYWYG_MODE",$init:function(c){this.editor_sequence=c},$ON_CHANGE_EDITING_MODE:function(c){editorMode[this.editor_sequence]=c=="HTMLSrc"?"html":"wysiwyg"}});xe.XE_PreservTemplate=jQuery.Class({name:"XE_PreservTemplate",isRun:false,$BEFORE_SET_IR:function(c){if(!this.isRun&&!c)return this.isRun=true,false}});
+xe.XE_Preview=jQuery.Class({name:"XE_Preview",elPreviewButton:null,$init:function(c){this._assignHTMLObjects(c)},_assignHTMLObjects:function(c){this.elPreviewButton=jQuery("BUTTON.xpress_xeditor_preview_button",c)},$ON_MSG_APP_READY:function(){this.oApp.registerBrowserEvent(this.elPreviewButton.get(0),"click","EVENT_PREVIEW",[])},$ON_EVENT_PREVIEW:function(){}});
+function editorStartTextarea(c,k,m){var o=xGetElementById("editor_"+c),a=xGetElementById("htm_"+c).value;o.form.setAttribute("editor_sequence",c);o.style.width="99%";editorRelKeys[c]=[];editorRelKeys[c].primary=o.form[m];editorRelKeys[c].content=o.form[k];editorRelKeys[c].func=editorGetContentTextarea;c=o.form[k].value;a&&(c=c.replace(/<br([^>]*)>/ig,"\n"),a!="br"&&(c=c.replace(/&lt;/g,"<"),c=c.replace(/&gt;/g,">"),c=c.replace(/&quot;/g,'"'),c=c.replace(/&amp;/g,"&")));o.value=c}
+function editorGetContentTextarea(c){var k=xGetElementById("editor_"+c),c=xGetElementById("htm_"+c).value,k=k.value.trim();c&&(c!="br"&&(k=k.replace(/&/g,"&amp;"),k=k.replace(/</g,"&lt;"),k=k.replace(/>/g,"&gt;"),k=k.replace(/\"/g,"&quot;")),k=k.replace(/(\r\n|\n)/g,"<br />"));return k};
diff --git a/modules/editor/skins/xpresseditor/skin.xml b/modules/editor/skins/xpresseditor/skin.xml
index c7373b084..30a4017ed 100644
--- a/modules/editor/skins/xpresseditor/skin.xml
+++ b/modules/editor/skins/xpresseditor/skin.xml
@@ -1,136 +1,114 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">XpressEditor Skin</title>
-    <title xml:lang="es">XpressEditor Skin</title>
-    <title xml:lang="en">XpressEditor Skin</title>
-    <title xml:lang="vi">XpressEditor Skin</title>
-    <title xml:lang="jp">XpressEditorスキン</title>
-    <title xml:lang="zh-CN">XpressEditor皮肤</title>
-    <title xml:lang="zh-TW">XpressEditor面板</title>
-    <title xml:lang="tr">XpressEditor Dış Görünümü</title>
-    <description xml:lang="ko">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-	<description xml:lang="en">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="vi">
-        XpressEditor dựa trên SmartEditor cơ bản, được tạo bởi NHN
-    </description>
-	<description xml:lang="es">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="jp">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="zh-CN">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="zh-TW">
-        XpressEditor based on SmartEditor Basic by NHN
-    </description>
-    <description xml:lang="tr">
-        XpressEditor, SmartEditor 'e dayanmaktadır.
-    </description>
-    <version>0.3.16</version>
-    <date>2009-03-22</date>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-		<name xml:lang="es">NHN</name>
-		<name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-    <colorset>
-        <color name="white">
-            <title xml:lang="ko">하얀색(기본)</title>
-            <title xml:lang="jp">白（デフォルト）</title>
-            <title xml:lang="zh-CN">白色（默认）</title>
-            <title xml:lang="en">White (default)</title>
-            <title xml:lang="vi">White (Mặc định)</title>
-            <title xml:lang="es">Blanco (por defecto)</title>
-            <title xml:lang="zh-TW">白色(預設)</title>
-            <title xml:lang="tr">Beyaz (varsayılan)</title>
-        </color>
-        <color name="black">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="vi">Black</title>
-            <title xml:lang="ru">Черного</title>
-            <title xml:lang="es">Negro</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-            <title xml:lang="tr">Siyah</title>
-        </color>
-        <color name="white_texteditor">
-            <title xml:lang="ko">하얀색 텍스트편집기(HTML 사용, 자동 줄 바꿈)</title>
-            <title xml:lang="jp">白色テキストエディター(自動に改行を入れる)</title>
-            <title xml:lang="en">White Text Editor(Auto Line Break)</title>
-            <title xml:lang="vi">White Text Editor(Dòng tự động mở)</title>
-            <title xml:lang="ru">White Text Editor(Auto Line Break)</title>
-            <title xml:lang="es">Editor de texto en blanco (Auto de línea)</title>
-            <title xml:lang="zh-CN">白色文本编辑器(使用HTML，自动换行)</title>
-            <title xml:lang="zh-TW">白色文字編輯器(使用HTML，自動換行)</title>
-            <title xml:lang="tr">Beyaz Metin Editörü(Auto Line Break)</title>
-        </color>
-        <color name="black_texteditor">
-            <title xml:lang="ko">검은색 텍스트편집기(HTML 사용, 자동 줄 바꿈)</title>
-            <title xml:lang="jp">黒色テキストエディター(自動に改行を入れる)</title>
-            <title xml:lang="en">Black Text Editor(Auto Line Break)</title>
-            <title xml:lang="vi">Black Text Editor(Dòng tự động mở)</title>
-            <title xml:lang="ru">Black Text Editor(Auto Line Break)</title>
-            <title xml:lang="es">Editor de texto negro (salto de línea automático)</title>
-            <title xml:lang="zh-CN">黑色文本编辑器(使用HTML，自动换行)</title>
-            <title xml:lang="zh-TW">黑色文字編輯器(使用HTML，自動換行)</title>
-            <title xml:lang="tr">Siyah Metin Editörü(Auto Line Break)</title>
-        </color>
-        <color name="white_text_usehtml">
-            <title xml:lang="ko">하얀색 텍스트편집기(HTML 사용, 자동 줄 바꿈 안함)</title>
-            <title xml:lang="jp">白色テキストエディター(HTMLタグを使う)</title>
-            <title xml:lang="en">White Text Editor(Use HTML)</title>
-            <title xml:lang="vi">White Text Editor(Sử dụng HTML)</title>
-            <title xml:lang="ru">White Text Editor(Use HTML)</title>
-            <title xml:lang="es">Editor de texto en blanco (Uso de HTML)</title>
-            <title xml:lang="zh-CN">白色文本编辑器(使用HTML，不自动换行)</title>
-            <title xml:lang="zh-TW">白色文字編輯器(使用HTML，不自動換行)</title>
-            <title xml:lang="tr">Beyaz Metin Editörü(HTML Kullan)</title>
-        </color>
-        <color name="black_text_usehtml">
-            <title xml:lang="ko">검은색 텍스트편집기(HTML 사용, 자동 줄 바꿈 안함)</title>
-            <title xml:lang="jp">黒色テキストエディター(HTMLタグを使う)</title>
-            <title xml:lang="en">Black Text Editor(Use HTML)</title>
-            <title xml:lang="vi">Black Text Editor(Sử dụng HTML)</title>
-            <title xml:lang="ru">Black Text Editor(Use HTML)</title>
-            <title xml:lang="es">Editor de texto negro (Uso de HTML)</title>
-            <title xml:lang="zh-CN">黑色文本编辑器(使用HTML，不自动换行)</title>
-            <title xml:lang="zh-TW">黑色文字編輯器(使用HTML，不自動換行)</title>
-            <title xml:lang="tr">Siyah Metin Editörü(HTML kullan)</title>
-        </color>
-        <color name="white_text_nohtml">
-            <title xml:lang="ko">하얀색 텍스트편집기(HTML 사용 안함, 자동 줄 바꿈)</title>
-            <title xml:lang="jp">白色テキストエディター(HTMLタグを使わない)</title>
-            <title xml:lang="en">White Text Editor(No HTML)</title>
-            <title xml:lang="vi">White Text Editor(Không có HTML)</title>
-            <title xml:lang="ru">White Text Editor(No HTML)</title>
-            <title xml:lang="es">Editor de texto en blanco (no HTML)</title>
-            <title xml:lang="zh-CN">白色文本编辑器(不使用HTML，自动换行)</title>
-            <title xml:lang="zh-TW">白色文字編輯器(不使用HTML，自動換行)</title>
-            <title xml:lang="tr">Beyaz Metin Editörü(HTML yok)</title>
-        </color>
-        <color name="black_text_nohtml">
-            <title xml:lang="ko">검은색 텍스트편집기(HTML 사용 안함, 자동 줄 바꿈)</title>
-            <title xml:lang="jp">黒色テキストエディター(HTMLタグを使わない)</title>
-            <title xml:lang="en">Black Text Editor(No HTML)</title>
-            <title xml:lang="vi">Black Text Editor(Không có HTML)</title>
-            <title xml:lang="ru">Black Text Editor(No HTML)</title>
-            <title xml:lang="es">Editor de texto negro (no HTML)</title>
-            <title xml:lang="zh-CN">黑色文本编辑器(不使用HTML，自动换行)</title>
-            <title xml:lang="zh-TW">黑色文字編輯器(不使用HTML，自動換行)</title>
-            <title xml:lang="tr">Siyah Metin Editörü(HTML yok)</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XpressEditor Skin</title>
+    <title xml:lang="es">XpressEditor Skin</title>
+    <title xml:lang="en">XpressEditor Skin</title>
+    <title xml:lang="vi">XpressEditor Skin</title>
+    <title xml:lang="jp">XpressEditorスキン</title>
+    <title xml:lang="zh-CN">XpressEditor皮肤</title>
+    <title xml:lang="zh-TW">XpressEditor面板</title>
+    <title xml:lang="tr">XpressEditor Dış Görünümü</title>
+    <description xml:lang="ko">
+        XpressEditor based on SmartEditor Basic by NHN
+    </description>
+	<description xml:lang="en">
+        XpressEditor based on SmartEditor Basic by NHN
+    </description>
+    <description xml:lang="vi">
+        XpressEditor dựa trên SmartEditor cơ bản, được tạo bởi NHN
+    </description>
+	<description xml:lang="es">
+        XpressEditor based on SmartEditor Basic by NHN
+    </description>
+    <description xml:lang="jp">
+        XpressEditor based on SmartEditor Basic by NHN
+    </description>
+    <description xml:lang="zh-CN">
+        XpressEditor based on SmartEditor Basic by NHN
+    </description>
+    <description xml:lang="zh-TW">
+        XpressEditor based on SmartEditor Basic by NHN
+    </description>
+    <description xml:lang="tr">
+        XpressEditor, SmartEditor 'e dayanmaktadır.
+    </description>
+    <version>0.3.16</version>
+    <date>2009-03-22</date>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+		<name xml:lang="es">NHN</name>
+		<name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">하얀색 위지윅(기본)</title>
+            <title xml:lang="jp">白 WYSIWYG（デフォルト）</title>
+            <title xml:lang="zh-CN">白色 WYSIWYG（默认）</title>
+            <title xml:lang="en">White WYSIWYG(default)</title>
+            <title xml:lang="vi">White WYSIWYG(Mặc định)</title>
+            <title xml:lang="es">Blanco WYSIWYG(por defecto)</title>
+            <title xml:lang="zh-TW">白色 WYSIWYG(預設)</title>
+            <title xml:lang="tr">Beyaz WYSIWYG(varsayılan)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색 위지윅</title>
+            <title xml:lang="jp">黒 WYSIWYG</title>
+            <title xml:lang="en">Black WYSIWYG</title>
+            <title xml:lang="vi">Black WYSIWYG</title>
+            <title xml:lang="ru">Черного WYSIWYG</title>
+            <title xml:lang="es">Negro WYSIWYG</title>
+            <title xml:lang="zh-CN">黑色 WYSIWYG</title>
+            <title xml:lang="zh-TW">黑色 WYSIWYG</title>
+            <title xml:lang="tr">Siyah WYSIWYG</title>
+        </color>
+        <color name="white_text_usehtml">
+            <title xml:lang="ko">하얀색 텍스트(HTML 사용)</title>
+            <title xml:lang="jp">白色テキスト(HTMLタグを使う)</title>
+            <title xml:lang="en">White Text(Use HTML)</title>
+            <title xml:lang="vi">White Text(Sử dụng HTML)</title>
+            <title xml:lang="ru">White Text(Use HTML)</title>
+            <title xml:lang="es">Editor de texto en blanco (Uso de HTML)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(使用HTML，不自动换行)</title>
+            <title xml:lang="zh-TW">白色文字編輯器(使用HTML，不自動換行)</title>
+            <title xml:lang="tr">Beyaz Metin Editörü(HTML Kullan)</title>
+        </color>
+        <color name="black_text_usehtml">
+            <title xml:lang="ko">검은색 텍스트(HTML 사용)</title>
+            <title xml:lang="jp">黒色テキスト(HTMLタグを使う)</title>
+            <title xml:lang="en">Black Text(Use HTML)</title>
+            <title xml:lang="vi">Black Text(Sử dụng HTML)</title>
+            <title xml:lang="ru">Black Text(Use HTML)</title>
+            <title xml:lang="es">Editor de texto negro (Uso de HTML)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(使用HTML，不自动换行)</title>
+            <title xml:lang="zh-TW">黑色文字編輯器(使用HTML，不自動換行)</title>
+            <title xml:lang="tr">Siyah Metin Editörü(HTML kullan)</title>
+        </color>
+        <color name="white_text_nohtml">
+            <title xml:lang="ko">하얀색 텍스트(HTML 사용 안함)</title>
+            <title xml:lang="jp">白色テキスト(HTMLタグを使わない)</title>
+            <title xml:lang="en">White Text(No HTML)</title>
+            <title xml:lang="vi">White Text(Không có HTML)</title>
+            <title xml:lang="ru">White Text(No HTML)</title>
+            <title xml:lang="es">Editor de texto en blanco (no HTML)</title>
+            <title xml:lang="zh-CN">白色文本编辑器(不使用HTML，自动换行)</title>
+            <title xml:lang="zh-TW">白色文字編輯器(不使用HTML，自動換行)</title>
+            <title xml:lang="tr">Beyaz Metin Editörü(HTML yok)</title>
+        </color>
+        <color name="black_text_nohtml">
+            <title xml:lang="ko">검은색 텍스트(HTML 사용 안함)</title>
+            <title xml:lang="jp">黒色テキスト(HTMLタグを使わない)</title>
+            <title xml:lang="en">Black Text(No HTML)</title>
+            <title xml:lang="vi">Black Text(Không có HTML)</title>
+            <title xml:lang="ru">Black Text(No HTML)</title>
+            <title xml:lang="es">Editor de texto negro (no HTML)</title>
+            <title xml:lang="zh-CN">黑色文本编辑器(不使用HTML，自动换行)</title>
+            <title xml:lang="zh-TW">黑色文字編輯器(不使用HTML，自動換行)</title>
+            <title xml:lang="tr">Siyah Metin Editörü(HTML yok)</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/modules/editor/styles/default/editor.css b/modules/editor/styles/default/editor.css
index 8dc9ee37d..981f2280f 100644
--- a/modules/editor/styles/default/editor.css
+++ b/modules/editor/styles/default/editor.css
@@ -1,23 +1,21 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-html, body { height:100%; background-color:transparent; padding:0; margin:0;}
-.xe_content{ color:#000; font-size:12px; line-height:1.5;}
-
-.xe_content blockquote.q1,
-.xe_content blockquote.q2,
-.xe_content blockquote.q3,
-.xe_content blockquote.q4,
-.xe_content blockquote.q5,
-.xe_content blockquote.q6,
-.xe_content blockquote.q7{ padding:10px; margin:0 15px; }
-
-.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
-.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
-.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
-.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
-.xe_content blockquote.q5{ border:2px solid #707070;}
-.xe_content blockquote.q6{ border:1px dashed #707070;}
-.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
-
-.xe_content p { margin:0; padding:0; }
+@charset "utf-8";
+html,body{height:100%}
+body{margin:0;padding:0}
+/* NHN (developers@xpressengine.com) */
+.xe_content{color:#000;font-size:12px;line-height:1.5}
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{padding:10px;margin:0 15px}
+.xe_content blockquote.q1{padding:0 10px;border-left:2px solid #ccc}
+.xe_content blockquote.q2{padding:0 10px;background:url(./img/bg_qmark.gif) no-repeat left top}
+.xe_content blockquote.q3{border:1px solid #d9d9d9}
+.xe_content blockquote.q4{border:1px solid #d9d9d9;background:#fbfbfb}
+.xe_content blockquote.q5{border:2px solid #707070}
+.xe_content blockquote.q6{border:1px dashed #707070}
+.xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
+.xe_content table .xe_selected_cell{background-color: #d6e9ff}
+.xe_content p{margin:0}
diff --git a/modules/editor/styles/default/editor.html b/modules/editor/styles/default/editor.html
index f90b184c7..d8fd93679 100755
--- a/modules/editor/styles/default/editor.html
+++ b/modules/editor/styles/default/editor.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
-<title>XpressEngine</title>
-</head>
-<body class="xe_content editable">
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="editor.css" />
+<title>XpressEngine</title>
+</head>
+<body class="xe_content editable">
+</body>
+</html>
diff --git a/modules/editor/styles/default/skin.xml b/modules/editor/styles/default/skin.xml
index 7852cf14e..7b79a9e34 100644
--- a/modules/editor/styles/default/skin.xml
+++ b/modules/editor/styles/default/skin.xml
@@ -1,49 +1,49 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">XE 기본 서식</title>
-    <title xml:lang="en">XE Default Form</title>
-    <title xml:lang="zh-CN">XE默认样式</title>
-    <title xml:lang="vi">XE Mặc định</title>
-    <title xml:lang="jp">XEデフォルトスタイル</title>
-    <title xml:lang="zh-TW">XE預設樣式</title>
-    <title xml:lang="tr">XE Varsayılan Form</title>
-    <description xml:lang="ko">
-        XE 기본 문서 서식입니다.
-        있는 그대로 표시가 될 뿐 편집/ 출력시 아무런 영향을 끼치지 않습니다.
-    </description>
-    <description xml:lang="en">
-        XE default document style.
-        It displays as it is, and affect nothing to editing / printing.
-    </description>
-    <description xml:lang="zh-CN">
-        XE默认样式。
-        主题显示及编辑不会受到任何影响，即原样输出。
-    </description>
-    <description xml:lang="zh-TW">
-        XE預設樣式。
-        主題顯示和編輯不會受到影響。
-    </description>
-    <description xml:lang="jp">
-        XEの基本ドキュメント書式です。
-        そのまま表示されるだけで、編集・出力には影響しません。
-    </description>
-    <description xml:lang="tr">
-        XE varsayılan belge tarzı.
-       Olduğu gibi gösterir, düzenlemeye / yazdırmaya etki etmez.
-    </description>
-    <description xml:lang="vi">
-        Trang mẫu mặc định của XE.
-        Nó sẽ hiển thị trong phần sửa đổi bài viết và không ảnh hưởng đến bất cứ chức năng nào cả.
-    </description>
-    <version>0.0.1</version>
-    <date>2009-05-23</date>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-		<name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기본 서식</title>
+    <title xml:lang="en">XE Default Form</title>
+    <title xml:lang="zh-CN">XE默认样式</title>
+    <title xml:lang="vi">XE Mặc định</title>
+    <title xml:lang="jp">XEデフォルトスタイル</title>
+    <title xml:lang="zh-TW">XE預設樣式</title>
+    <title xml:lang="tr">XE Varsayılan Form</title>
+    <description xml:lang="ko">
+        XE 기본 문서 서식입니다.
+        있는 그대로 표시가 될 뿐 편집/ 출력시 아무런 영향을 끼치지 않습니다.
+    </description>
+    <description xml:lang="en">
+        XE's default document style.
+        It displays as it is, and does not affect during editing/printing.
+    </description>
+    <description xml:lang="zh-CN">
+        XE默认样式。
+        主题显示及编辑不会受到任何影响，即原样输出。
+    </description>
+    <description xml:lang="zh-TW">
+        XE預設樣式。
+        主題顯示和編輯不會受到影響。
+    </description>
+    <description xml:lang="jp">
+        XEの基本ドキュメント書式です。
+        そのまま表示されるだけで、編集・出力には影響しません。
+    </description>
+    <description xml:lang="tr">
+        XE varsayılan belge tarzı.
+       Olduğu gibi gösterir, düzenlemeye / yazdırmaya etki etmez.
+    </description>
+    <description xml:lang="vi">
+        Trang mẫu mặc định của XE.
+        Nó sẽ hiển thị trong phần sửa đổi bài viết và không ảnh hưởng đến bất cứ chức năng nào cả.
+    </description>
+    <version>0.0.1</version>
+    <date>2009-05-23</date>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+		<name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</skin>
diff --git a/modules/editor/styles/default/style.css b/modules/editor/styles/default/style.css
index c6c20d93d..6072cfa93 100755
--- a/modules/editor/styles/default/style.css
+++ b/modules/editor/styles/default/style.css
@@ -1,7 +1,13 @@
 @charset "utf-8";
 /* NHN (developers@xpressengine.com) */
-.xe_content{color:#000;font-size:12px}
-.xe_content blockquote.q1,.xe_content blockquote.q2,.xe_content blockquote.q3,.xe_content blockquote.q4,.xe_content blockquote.q5,.xe_content blockquote.q6,.xe_content blockquote.q7{padding:10px;margin:0 15px}
+.xe_content{color:#000;font-size:12px;line-height:1.5}
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{padding:10px;margin:0 15px}
 .xe_content blockquote.q1{padding:0 10px;border-left:2px solid #ccc}
 .xe_content blockquote.q2{padding:0 10px;background:url(./img/bg_qmark.gif) no-repeat left top}
 .xe_content blockquote.q3{border:1px solid #d9d9d9}
@@ -9,4 +15,4 @@
 .xe_content blockquote.q5{border:2px solid #707070}
 .xe_content blockquote.q6{border:1px dashed #707070}
 .xe_content blockquote.q7{border:1px dashed #707070;background:#fbfbfb}
-.xe_content p { margin:0;}
+.xe_content p{margin:0}
diff --git a/modules/editor/styles/dreditor/editor.html b/modules/editor/styles/dreditor/editor.html
index f90b184c7..d8fd93679 100644
--- a/modules/editor/styles/dreditor/editor.html
+++ b/modules/editor/styles/dreditor/editor.html
@@ -1,10 +1,10 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
-<title>XpressEngine</title>
-</head>
-<body class="xe_content editable">
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="editor.css" />
+<title>XpressEngine</title>
+</head>
+<body class="xe_content editable">
+</body>
+</html>
diff --git a/modules/editor/styles/dreditor/style.css b/modules/editor/styles/dreditor/style.css
index 2953c11c1..e24d22c74 100644
--- a/modules/editor/styles/dreditor/style.css
+++ b/modules/editor/styles/dreditor/style.css
@@ -1,51 +1,51 @@
-@charset "utf-8"; 
-/* NHN > UIT Center > Open UI Platform Team > Jeong Chan Myeong(dece24@nhncorp.com) */
-
-/* xe_content */
-.xe_content{ font-size:12px; line-height:1.6; clear:both;}
-.xe_content h1{ font-size:24px;}
-.xe_content h2{ font-size:20px;}
-.xe_content h3{ font-size:18px;}
-.xe_content h4{ font-size:16px;}
-.xe_content h5{ font-size:14px;}
-.xe_content h6{ font-size:12px;}
-
-/* Attached File */
-.xe_content dl.attachedFile { margin:1em 0; padding:1em 0; background:#f9f9f9; border:1px solid #eee; }
-.xe_content dl.attachedFile dt { padding:0 2em .5em 2em; margin:0 0 1em 0; font-weight:bold; text-indent:1em; border-bottom:1px solid #eee; background:#f9f9f9 url(img/iconClip.gif) no-repeat 2em .3em; font-size:12px;}
-.xe_content dl.attachedFile em{ font-size:11px; font-weight:normal; font-style:normal; margin:0 5px;}
-.xe_content dl.attachedFile dd{ margin:0; padding:0 2em; color:#8b8b8b; font-size:11px;}
-.xe_content dl.attachedFile dd a{ text-decoration:none; color:#0092cf; margin-right:10px;}
-.xe_content dl.attachedFile dd a:hover,
-.xe_content dl.attachedFile dd a:active,
-.xe_content dl.attachedFile dd a:focus{ text-decoration:underline;}
-
-/* Table Of Content */
-.xe_content .toc{ background:#fff; border:1px solid #ddd; font-size:14px; line-height:1.6; margin:1em 0; padding:15px;}
-.xe_content .toc li{ font-weight:bold; color:#555; margin-left:35px;}
-.xe_content .toc li.toc3{}
-.xe_content .toc li.toc4{ margin-left:55px;}
-.xe_content .toc li.toc5{ margin-left:75px;}
-.xe_content .toc li a{ color:#648ab9; text-decoration:none; font-weight:normal;}
-.xe_content .toc li a:hover,
-.xe_content .toc li a:active,
-.xe_content .toc li a:focus{ text-decoration:underline;}
-
-/* Object */
-.xe_content object,
-.xe_content embed{ margin:1em 0;}
-
-/* Horizontal Rule */
-.xe_content hr{ display:block; position:static; border-bottom:0; height:1px; overflow:hidden; color:#e2e2e2; clear:both;}
-
-/* Blockquote */
-.xe_content blockquote{ margin-left:0; margin-right:0; padding:1em 40px; background:#f6f6f6 url(img/bgBlockquote.gif) no-repeat 20px 1.5em; -moz-border-radius:5px; -webkit-border-radius:5px; }
-
-/* Cite */
-.xe_content cite{ display:block; margin:1em 0;}
-
-/* Link */
-.xe_content .xe_dr_link p strong{ display:block;}
-
-/* P */
-.xe_content p{ margin:1em 0 !important;}
+@charset "utf-8"; 
+/* NHN > UIT Center > Open UI Platform Team > Jeong Chan Myeong(dece24@nhncorp.com) */
+
+/* xe_content */
+.xe_content{ font-size:12px; line-height:1.6; clear:both;}
+.xe_content h1{ font-size:24px;}
+.xe_content h2{ font-size:20px;}
+.xe_content h3{ font-size:18px;}
+.xe_content h4{ font-size:16px;}
+.xe_content h5{ font-size:14px;}
+.xe_content h6{ font-size:12px;}
+
+/* Attached File */
+.xe_content dl.attachedFile { margin:1em 0; padding:1em 0; background:#f9f9f9; border:1px solid #eee; }
+.xe_content dl.attachedFile dt { padding:0 2em .5em 2em; margin:0 0 1em 0; font-weight:bold; text-indent:1em; border-bottom:1px solid #eee; background:#f9f9f9 url(img/iconClip.gif) no-repeat 2em .3em; font-size:12px;}
+.xe_content dl.attachedFile em{ font-size:11px; font-weight:normal; font-style:normal; margin:0 5px;}
+.xe_content dl.attachedFile dd{ margin:0; padding:0 2em; color:#8b8b8b; font-size:11px;}
+.xe_content dl.attachedFile dd a{ text-decoration:none; color:#0092cf; margin-right:10px;}
+.xe_content dl.attachedFile dd a:hover,
+.xe_content dl.attachedFile dd a:active,
+.xe_content dl.attachedFile dd a:focus{ text-decoration:underline;}
+
+/* Table Of Content */
+.xe_content .toc{ background:#fff; border:1px solid #ddd; font-size:14px; line-height:1.6; margin:1em 0; padding:15px;}
+.xe_content .toc li{ font-weight:bold; color:#555; margin-left:35px;}
+.xe_content .toc li.toc3{}
+.xe_content .toc li.toc4{ margin-left:55px;}
+.xe_content .toc li.toc5{ margin-left:75px;}
+.xe_content .toc li a{ color:#648ab9; text-decoration:none; font-weight:normal;}
+.xe_content .toc li a:hover,
+.xe_content .toc li a:active,
+.xe_content .toc li a:focus{ text-decoration:underline;}
+
+/* Object */
+.xe_content object,
+.xe_content embed{ margin:1em 0;}
+
+/* Horizontal Rule */
+.xe_content hr{ display:block; position:static; border-bottom:0; height:1px; overflow:hidden; color:#e2e2e2; clear:both;}
+
+/* Blockquote */
+.xe_content blockquote{ margin-left:0; margin-right:0; padding:1em 40px; background:#f6f6f6 url(img/bgBlockquote.gif) no-repeat 20px 1.5em; -moz-border-radius:5px; -webkit-border-radius:5px; }
+
+/* Cite */
+.xe_content cite{ display:block; margin:1em 0;}
+
+/* Link */
+.xe_content .xe_dr_link p strong{ display:block;}
+
+/* P */
+.xe_content p{ margin:1em 0 !important;}
diff --git a/modules/editor/styles/xeStyle/editor.css b/modules/editor/styles/xeStyle/editor.css
index d1ac2cce6..580dd2d8e 100755
--- a/modules/editor/styles/xeStyle/editor.css
+++ b/modules/editor/styles/xeStyle/editor.css
@@ -1,31 +1,31 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-html, body { height:100%; background-color:transparent; padding:0; margin:0;}
-
-/* Editable */
-.xe_content.editable { margin-right:8px; }
-.xe_content.editable h1,
-.xe_content.editable h2,
-.xe_content.editable h3,
-.xe_content.editable h4,
-.xe_content.editable h5,
-.xe_content.editable h6,
-.xe_content.editable p,
-.xe_content.editable ul,
-.xe_content.editable ol,
-.xe_content.editable dl,
-.xe_content.editable div,
-.xe_content.editable code.block{ border:1px dotted #ccc;}
-.xe_content.editable h1:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable h2:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -100px;}
-.xe_content.editable h3:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -200px;}
-.xe_content.editable h4:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -300px;}
-.xe_content.editable h5:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -400px;}
-.xe_content.editable h6:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -500px;}
-.xe_content.editable p{ background-image:url(./img/elementP.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable ul{ background-image:url(./img/elementUl.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable ol{ background-image:url(./img/elementOl.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable dl{ background-image:url(./img/elementDl.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable div{ background-image:url(./img/elementDiv.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable code.block{ background-image:url(./img/elementCode.gif); background-repeat:no-repeat; background-position:right top;}
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+
+html, body { height:100%; background-color:transparent; padding:0; margin:0;}
+
+/* Editable */
+.xe_content.editable { margin-right:8px; }
+.xe_content.editable h1,
+.xe_content.editable h2,
+.xe_content.editable h3,
+.xe_content.editable h4,
+.xe_content.editable h5,
+.xe_content.editable h6,
+.xe_content.editable p,
+.xe_content.editable ul,
+.xe_content.editable ol,
+.xe_content.editable dl,
+.xe_content.editable div,
+.xe_content.editable code.block{ border:1px dotted #ccc;}
+.xe_content.editable h1:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable h2:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -100px;}
+.xe_content.editable h3:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -200px;}
+.xe_content.editable h4:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -300px;}
+.xe_content.editable h5:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -400px;}
+.xe_content.editable h6:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -500px;}
+.xe_content.editable p{ background-image:url(./img/elementP.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable ul{ background-image:url(./img/elementUl.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable ol{ background-image:url(./img/elementOl.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable dl{ background-image:url(./img/elementDl.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable div{ background-image:url(./img/elementDiv.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable code.block{ background-image:url(./img/elementCode.gif); background-repeat:no-repeat; background-position:right top;}
diff --git a/modules/editor/styles/xeStyle/editor.html b/modules/editor/styles/xeStyle/editor.html
index 78d656f32..93123b153 100755
--- a/modules/editor/styles/xeStyle/editor.html
+++ b/modules/editor/styles/xeStyle/editor.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
-<link rel="stylesheet" type="text/css" href="style.css" />
-<title>XpressEngine</title>
-</head>
-<body class="xe_content editable">
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="editor.css" />
+<link rel="stylesheet" type="text/css" href="style.css" />
+<title>XpressEngine</title>
+</head>
+<body class="xe_content editable">
+</body>
+</html>
diff --git a/modules/editor/styles/xeStyle/skin.xml b/modules/editor/styles/xeStyle/skin.xml
index e2e52b20f..e1e4498e9 100644
--- a/modules/editor/styles/xeStyle/skin.xml
+++ b/modules/editor/styles/xeStyle/skin.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">XE 기본 서식 (하얀 배경)</title>
-    <title xml:lang="en">XE Default Form(white color background)</title>
-    <title xml:lang="zh-CN">XE默认样式(白色背景)</title>
-    <title xml:lang="zh-TW">XE預設樣式(白色背景)</title>
-    <title xml:lang="vi">XE Mặc định (Nền sáng)</title>
-    <title xml:lang="jp">XEデフォルトスタイル(白色背景)</title>
-    <title xml:lang="tr">XE Varsayılan Form(beyaz renk arkaplan)</title>
-    <description xml:lang="ko">
-        XE 기본 문서 서식입니다.
-        문서 수정중에는 각 요소들이 구분되어 보입니다.
-    </description>
-    <description xml:lang="en">
-		XE Default Form(white color background)
-    </description>
-    <description xml:lang="zh-CN">
-        XE默认样式。
-        在编辑文档时，可清晰地区分各标签区域。
-    </description>
-    <description xml:lang="zh-TW">
-        XE編輯器預設樣式。
-        編輯檔案時，可以清楚地區分各標籤。
-    </description>
-    <description xml:lang="vi">
-        Trang mẫu mặc định của XE.
-        Nó sẽ hiển thị trong phần sửa đổi bài viết.
-    </description>
-    <description xml:lang="jp">
-        XEのデフォルトドキュメントのスタイルです。
-        ドキュメント編集中には、各要素が区分されて見えます。
-    </description>
-    <description xml:lang="tr">
-		XE Varsayılan Form(beyaz renk arkaplan)
-    </description>
-    <version>0.0.1</version>
-    <date>2009-04-17</date>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-		<name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기본 서식 (하얀 배경)</title>
+    <title xml:lang="en">XE Default Form (white color background)</title>
+    <title xml:lang="zh-CN">XE默认样式(白色背景)</title>
+    <title xml:lang="zh-TW">XE預設樣式(白色背景)</title>
+    <title xml:lang="vi">XE Mặc định (Nền sáng)</title>
+    <title xml:lang="jp">XEデフォルトスタイル(白色背景)</title>
+    <title xml:lang="tr">XE Varsayılan Form(beyaz renk arkaplan)</title>
+    <description xml:lang="ko">
+        XE 기본 문서 서식입니다.
+        문서 수정중에는 각 요소들이 구분되어 보입니다.
+    </description>
+    <description xml:lang="en">
+		XE Default Form (white color background)
+    </description>
+    <description xml:lang="zh-CN">
+        XE默认样式。
+        在编辑文档时，可清晰地区分各标签区域。
+    </description>
+    <description xml:lang="zh-TW">
+        XE編輯器預設樣式。
+        編輯檔案時，可以清楚地區分各標籤。
+    </description>
+    <description xml:lang="vi">
+        Trang mẫu mặc định của XE.
+        Nó sẽ hiển thị trong phần sửa đổi bài viết.
+    </description>
+    <description xml:lang="jp">
+        XEのデフォルトドキュメントのスタイルです。
+        ドキュメント編集中には、各要素が区分されて見えます。
+    </description>
+    <description xml:lang="tr">
+		XE Varsayılan Form(beyaz renk arkaplan)
+    </description>
+    <version>0.0.1</version>
+    <date>2009-04-17</date>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</skin>
diff --git a/modules/editor/styles/xeStyle/style.css b/modules/editor/styles/xeStyle/style.css
index 0346feea7..3723c2c2b 100755
--- a/modules/editor/styles/xeStyle/style.css
+++ b/modules/editor/styles/xeStyle/style.css
@@ -1,57 +1,57 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-/* xe_content */
-.xe_content{ color:#000; font-size:12px;}
-
-.xe_content blockquote.q1,
-.xe_content blockquote.q2,
-.xe_content blockquote.q3,
-.xe_content blockquote.q4,
-.xe_content blockquote.q5,
-.xe_content blockquote.q6,
-.xe_content blockquote.q7{ padding:10px; margin:0 15px; }
-
-.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
-.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
-.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
-.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
-.xe_content blockquote.q5{ border:2px solid #707070;}
-.xe_content blockquote.q6{ border:1px dashed #707070;}
-.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
-
-/* Heading */
-.xe_content h1,
-.xe_content h2,
-.xe_content h3,
-.xe_content h4,
-.xe_content h5,
-.xe_content h6{ line-height:1.2; clear:both;}
-.xe_content h1{ font-size:22px; border-bottom:4px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='4', Color='#f4f4f4', positive='true');}
-.xe_content h1:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
-.xe_content h2{ font-size:20px; border-bottom:3px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='3', Color='#f4f4f4', positive='true');}
-.xe_content h2:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
-.xe_content h3{ font-size:18px; border-bottom:2px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='2', Color='#f4f4f4', positive='true');}
-.xe_content h3:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
-.xe_content h4{ font-size:16px; border-bottom:1px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='1', Color='#f4f4f4', positive='true');}
-.xe_content h4:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
-.xe_content h5{ font-size:14px; border-bottom:1px solid #ccc;}
-.xe_content h6{ font-size:12px; border-bottom:1px dotted #ccc;}
-
-/* Blockquote */
-.xe_content q{ background-color:#eee;}
-
-/* Cite */
-.xe_content cite{ font-style:normal; color:#8b8b8b;}
-
-/* Code */
-.xe_content code{ font-family:"Courier New", Monospace; background-color:#fff5d9;}
-.xe_content code.block{ position:relative; font-family:"Courier New", Monospace; line-height:1; display:block; padding:12px 15px 12px 15px; background-color:#fff5d9; -moz-border-radius:5px; -webkit-border-radius:5px;}
-
-/* Anchor */
-.xe_content a.none {color:#8b8b8b; padding-right:13px; margin-right:2px; background:url(./img/iconNone.gif); background-repeat:no-repeat; background-position:right center;}
-.xe_content a.external{ padding-right:13px; margin-right:2px; background-image:url(./img/iconExternal.gif); background-repeat:no-repeat; background-position:right center;}
-.xe_content a.blank{ padding-right:13px; margin-right:2px; background-image:url(./img/iconBlank.gif); background-repeat:no-repeat; background-position:right center;}
-
-/* Division */
-.xe_content .mpDivision{ border:1px dotted #ccc; padding-left:15px; padding-right:15px; -moz-border-radius:5px; -webkit-border-radius:5px; background:#f4f4f4;}
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+
+/* xe_content */
+.xe_content{ color:#000; font-size:12px;}
+
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{ padding:10px; margin:0 15px; }
+
+.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
+.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
+.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
+.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
+.xe_content blockquote.q5{ border:2px solid #707070;}
+.xe_content blockquote.q6{ border:1px dashed #707070;}
+.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
+
+/* Heading */
+.xe_content h1,
+.xe_content h2,
+.xe_content h3,
+.xe_content h4,
+.xe_content h5,
+.xe_content h6{ line-height:1.2; clear:both;}
+.xe_content h1{ font-size:22px; border-bottom:4px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='4', Color='#f4f4f4', positive='true');}
+.xe_content h1:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
+.xe_content h2{ font-size:20px; border-bottom:3px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='3', Color='#f4f4f4', positive='true');}
+.xe_content h2:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
+.xe_content h3{ font-size:18px; border-bottom:2px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='2', Color='#f4f4f4', positive='true');}
+.xe_content h3:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
+.xe_content h4{ font-size:16px; border-bottom:1px solid #f4f4f4; background-color:#fff; *border-bottom:1px solid #ccc; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='1', Color='#f4f4f4', positive='true');}
+.xe_content h4:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#ccc;}
+.xe_content h5{ font-size:14px; border-bottom:1px solid #ccc;}
+.xe_content h6{ font-size:12px; border-bottom:1px dotted #ccc;}
+
+/* Blockquote */
+.xe_content q{ background-color:#eee;}
+
+/* Cite */
+.xe_content cite{ font-style:normal; color:#8b8b8b;}
+
+/* Code */
+.xe_content code{ font-family:"Courier New", Monospace; background-color:#fff5d9;}
+.xe_content code.block{ position:relative; font-family:"Courier New", Monospace; line-height:1; display:block; padding:12px 15px 12px 15px; background-color:#fff5d9; -moz-border-radius:5px; -webkit-border-radius:5px;}
+
+/* Anchor */
+.xe_content a.none {color:#8b8b8b; padding-right:13px; margin-right:2px; background:url(./img/iconNone.gif); background-repeat:no-repeat; background-position:right center;}
+.xe_content a.external{ padding-right:13px; margin-right:2px; background-image:url(./img/iconExternal.gif); background-repeat:no-repeat; background-position:right center;}
+.xe_content a.blank{ padding-right:13px; margin-right:2px; background-image:url(./img/iconBlank.gif); background-repeat:no-repeat; background-position:right center;}
+
+/* Division */
+.xe_content .mpDivision{ border:1px dotted #ccc; padding-left:15px; padding-right:15px; -moz-border-radius:5px; -webkit-border-radius:5px; background:#f4f4f4;}
diff --git a/modules/editor/styles/xeStyleBlack/editor.css b/modules/editor/styles/xeStyleBlack/editor.css
index 8ef0e7cc5..ea5fef5b8 100644
--- a/modules/editor/styles/xeStyleBlack/editor.css
+++ b/modules/editor/styles/xeStyleBlack/editor.css
@@ -1,33 +1,33 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-html, body { height:100%; background-color:transparent; padding:0; margin:0;}
-
-/* Editable */
-.xe_content.editable { margin-right:8px; }
-.xe_content.editable h1,
-.xe_content.editable h2,
-.xe_content.editable h3,
-.xe_content.editable h4,
-.xe_content.editable h5,
-.xe_content.editable h6,
-.xe_content.editable p,
-.xe_content.editable ul,
-.xe_content.editable ol,
-.xe_content.editable dl,
-.xe_content.editable div,
-.xe_content.editable code.block{ border:1px dotted #444;}
-.xe_content.editable h1:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable h2:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -100px;}
-.xe_content.editable h3:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -200px;}
-.xe_content.editable h4:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -300px;}
-.xe_content.editable h5:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -400px;}
-.xe_content.editable h6:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -500px;}
-.xe_content.editable p{ background-image:url(./img/elementP.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable ul{ background-image:url(./img/elementUl.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable ol{ background-image:url(./img/elementOl.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable dl{ background-image:url(./img/elementDl.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable div{ background-image:url(./img/elementDiv.gif); background-repeat:no-repeat; background-position:right top;}
-.xe_content.editable code.block{ background-image:url(./img/elementCode.gif); background-repeat:no-repeat; background-position:right top;}
-
-
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+
+html, body { height:100%; background-color:transparent; padding:0; margin:0;}
+
+/* Editable */
+.xe_content.editable { margin-right:8px; }
+.xe_content.editable h1,
+.xe_content.editable h2,
+.xe_content.editable h3,
+.xe_content.editable h4,
+.xe_content.editable h5,
+.xe_content.editable h6,
+.xe_content.editable p,
+.xe_content.editable ul,
+.xe_content.editable ol,
+.xe_content.editable dl,
+.xe_content.editable div,
+.xe_content.editable code.block{ border:1px dotted #444;}
+.xe_content.editable h1:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable h2:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -100px;}
+.xe_content.editable h3:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -200px;}
+.xe_content.editable h4:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -300px;}
+.xe_content.editable h5:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -400px;}
+.xe_content.editable h6:before{ content:""; display:block; width:100%; height:9px; margin-bottom:-9px; background-image:url(./img/elementH.gif); background-repeat:no-repeat; background-position:right -500px;}
+.xe_content.editable p{ background-image:url(./img/elementP.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable ul{ background-image:url(./img/elementUl.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable ol{ background-image:url(./img/elementOl.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable dl{ background-image:url(./img/elementDl.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable div{ background-image:url(./img/elementDiv.gif); background-repeat:no-repeat; background-position:right top;}
+.xe_content.editable code.block{ background-image:url(./img/elementCode.gif); background-repeat:no-repeat; background-position:right top;}
+
+
diff --git a/modules/editor/styles/xeStyleBlack/editor.html b/modules/editor/styles/xeStyleBlack/editor.html
index 78d656f32..93123b153 100755
--- a/modules/editor/styles/xeStyleBlack/editor.html
+++ b/modules/editor/styles/xeStyleBlack/editor.html
@@ -1,11 +1,11 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link rel="stylesheet" type="text/css" href="editor.css" />
-<link rel="stylesheet" type="text/css" href="style.css" />
-<title>XpressEngine</title>
-</head>
-<body class="xe_content editable">
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<link rel="stylesheet" type="text/css" href="editor.css" />
+<link rel="stylesheet" type="text/css" href="style.css" />
+<title>XpressEngine</title>
+</head>
+<body class="xe_content editable">
+</body>
+</html>
diff --git a/modules/editor/styles/xeStyleBlack/skin.xml b/modules/editor/styles/xeStyleBlack/skin.xml
index 38c784ba4..26238c13a 100644
--- a/modules/editor/styles/xeStyleBlack/skin.xml
+++ b/modules/editor/styles/xeStyleBlack/skin.xml
@@ -1,46 +1,46 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">XE 기본 서식 (검은 배경)</title>
-    <title xml:lang="en">XE Default Form(black color background)</title>
-    <title xml:lang="zh-CN">XE默认格式(黑色背景)</title>
-    <title xml:lang="zh-TW">XE預設樣式(黑色背景)</title>
-    <title xml:lang="vi">XE Mặc định (Nền tối)</title>
-    <title xml:lang="jp">XEデフォルトスタイル(黒色背景)</title>
-    <title xml:lang="tr">XE Varsayılan Form(siyah renk arkaplan)</title>
-    <description xml:lang="ko">
-        XE 기본 문서 서식입니다.
-        문서 수정중에는 각 요소들이 구분되어 보입니다.
-    </description>
-    <description xml:lang="en">
-		XE Default Form(black color background)
-    </description>
-    <description xml:lang="zh-CN">
-        XE默认格式。
-        在编辑文档时，可清晰地区分各标签区域。
-    </description>
-    <description xml:lang="zh-TW">
-        XE編輯器預設樣式。
-        編輯檔案時，可清楚地區分各標籤。
-    </description>
-    <description xml:lang="vi">
-        Mẫu mặc định của XE.
-        Nó sẽ hiển thị trong phần sửa đổi bài viết.
-    </description>
-    <description xml:lang="jp">
-        XEのデフォルトドキュメントのスタイルです。
-        ドキュメント編集中には、各要素が区分されて見えます。
-    </description>
-    <description xml:lang="tr">
-		XE Varsayılan Form(siyah renk arkaplan)
-    </description>
-    <version>0.0.1</version>
-    <date>2009-04-17</date>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기본 서식 (검은 배경)</title>
+    <title xml:lang="en">XE Default Form (black color background)</title>
+    <title xml:lang="zh-CN">XE默认格式(黑色背景)</title>
+    <title xml:lang="zh-TW">XE預設樣式(黑色背景)</title>
+    <title xml:lang="vi">XE Mặc định (Nền tối)</title>
+    <title xml:lang="jp">XEデフォルトスタイル(黒色背景)</title>
+    <title xml:lang="tr">XE Varsayılan Form(siyah renk arkaplan)</title>
+    <description xml:lang="ko">
+        XE 기본 문서 서식입니다.
+        문서 수정중에는 각 요소들이 구분되어 보입니다.
+    </description>
+    <description xml:lang="en">
+		XE Default Form (black color background)
+    </description>
+    <description xml:lang="zh-CN">
+        XE默认格式。
+        在编辑文档时，可清晰地区分各标签区域。
+    </description>
+    <description xml:lang="zh-TW">
+        XE編輯器預設樣式。
+        編輯檔案時，可清楚地區分各標籤。
+    </description>
+    <description xml:lang="vi">
+        Mẫu mặc định của XE.
+        Nó sẽ hiển thị trong phần sửa đổi bài viết.
+    </description>
+    <description xml:lang="jp">
+        XEのデフォルトドキュメントのスタイルです。
+        ドキュメント編集中には、各要素が区分されて見えます。
+    </description>
+    <description xml:lang="tr">
+		XE Varsayılan Form(siyah renk arkaplan)
+    </description>
+    <version>0.0.1</version>
+    <date>2009-04-17</date>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</skin>
diff --git a/modules/editor/styles/xeStyleBlack/style.css b/modules/editor/styles/xeStyleBlack/style.css
index c890460f2..443d1c067 100755
--- a/modules/editor/styles/xeStyleBlack/style.css
+++ b/modules/editor/styles/xeStyleBlack/style.css
@@ -1,54 +1,54 @@
-/* xe_content */
-.xe_content{ color:#fff; font-size:12px;}
-
-.xe_content blockquote.q1,
-.xe_content blockquote.q2,
-.xe_content blockquote.q3,
-.xe_content blockquote.q4,
-.xe_content blockquote.q5,
-.xe_content blockquote.q6,
-.xe_content blockquote.q7{ padding:10px; margin-left:15px; margin-right:15px;}
-
-.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
-.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
-.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
-.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
-.xe_content blockquote.q5{ border:2px solid #707070;}
-.xe_content blockquote.q6{ border:1px dashed #707070;}
-.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
-
-/* Heading */
-.xe_content h1,
-.xe_content h2,
-.xe_content h3,
-.xe_content h4,
-.xe_content h5,
-.xe_content h6{ line-height:1.2; clear:both;}
-.xe_content h1{ font-size:22px; border-bottom:4px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='4', Color='#666666', positive='true');}
-.xe_content h1:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
-.xe_content h2{ font-size:20px; border-bottom:3px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='3', Color='#666666', positive='true');}
-.xe_content h2:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
-.xe_content h3{ font-size:18px; border-bottom:2px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='2', Color='#666666', positive='true');}
-.xe_content h3:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
-.xe_content h4{ font-size:16px; border-bottom:1px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='1', Color='#666666', positive='true');}
-.xe_content h4:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
-.xe_content h5{ font-size:14px; border-bottom:1px solid #666;}
-.xe_content h6{ font-size:12px; border-bottom:1px dotted #666;}
-
-/* Blockquote */
-.xe_content q { background-color:#666;}
-
-/* Cite */
-.xe_content cite { font-style:normal; color:#8b8b8b;}
-
-/* Code */
-.xe_content code { font-family:"Courier New", Monospace; background-color:#998F73;}
-.xe_content code.block { position:relative; font-family:"Courier New", Monospace; line-height:1; display:block; padding:12px 15px 12px 15px; background-color:#998F73; -moz-border-radius:5px; -webkit-border-radius:5px;}
-
-/* Anchor */
-.xe_content a.none { color:#8b8b8b; padding-right:13px; margin-right:2px; background:url(./img/iconNone.gif); background-repeat:no-repeat; background-position:right center;}
-.xe_content a.external { padding-right:13px; margin-right:2px; background-image:url(./img/iconExternal.gif); background-repeat:no-repeat; background-position:right center;}
-.xe_content a.blank { padding-right:13px; margin-right:2px; background-image:url(./img/iconBlank.gif); background-repeat:no-repeat; background-position:right center;}
-
-/* Division */
-.xe_content .mpDivision{ border:1px dotted #999; padding-left:15px; padding-right:15px; -moz-border-radius:5px; -webkit-border-radius:5px; background:#666;}
+/* xe_content */
+.xe_content{ color:#fff; font-size:12px;}
+
+.xe_content blockquote.q1,
+.xe_content blockquote.q2,
+.xe_content blockquote.q3,
+.xe_content blockquote.q4,
+.xe_content blockquote.q5,
+.xe_content blockquote.q6,
+.xe_content blockquote.q7{ padding:10px; margin-left:15px; margin-right:15px;}
+
+.xe_content blockquote.q1{ padding:0 10px; border-left:2px solid #ccc;}
+.xe_content blockquote.q2{ padding:0 10px; background:url(./img/bg_qmark.gif) no-repeat left top;}
+.xe_content blockquote.q3{ border:1px solid #d9d9d9;}
+.xe_content blockquote.q4{ border:1px solid #d9d9d9; background:#fbfbfb;}
+.xe_content blockquote.q5{ border:2px solid #707070;}
+.xe_content blockquote.q6{ border:1px dashed #707070;}
+.xe_content blockquote.q7{ border:1px dashed #707070; background:#fbfbfb;}
+
+/* Heading */
+.xe_content h1,
+.xe_content h2,
+.xe_content h3,
+.xe_content h4,
+.xe_content h5,
+.xe_content h6{ line-height:1.2; clear:both;}
+.xe_content h1{ font-size:22px; border-bottom:4px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='4', Color='#666666', positive='true');}
+.xe_content h1:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
+.xe_content h2{ font-size:20px; border-bottom:3px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='3', Color='#666666', positive='true');}
+.xe_content h2:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
+.xe_content h3{ font-size:18px; border-bottom:2px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='2', Color='#666666', positive='true');}
+.xe_content h3:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
+.xe_content h4{ font-size:16px; border-bottom:1px solid #666; background-color:#000; *border-bottom:1px solid #999; *zoom:1; *filter:progid:DXImageTransform.Microsoft.dropshadow(OffX='0', OffY='1', Color='#666666', positive='true');}
+.xe_content h4:after{ content:""; display:block; font-size:0; line-height:0; overflow:hidden; height:1px; background:#999;}
+.xe_content h5{ font-size:14px; border-bottom:1px solid #666;}
+.xe_content h6{ font-size:12px; border-bottom:1px dotted #666;}
+
+/* Blockquote */
+.xe_content q { background-color:#666;}
+
+/* Cite */
+.xe_content cite { font-style:normal; color:#8b8b8b;}
+
+/* Code */
+.xe_content code { font-family:"Courier New", Monospace; background-color:#998F73;}
+.xe_content code.block { position:relative; font-family:"Courier New", Monospace; line-height:1; display:block; padding:12px 15px 12px 15px; background-color:#998F73; -moz-border-radius:5px; -webkit-border-radius:5px;}
+
+/* Anchor */
+.xe_content a.none { color:#8b8b8b; padding-right:13px; margin-right:2px; background:url(./img/iconNone.gif); background-repeat:no-repeat; background-position:right center;}
+.xe_content a.external { padding-right:13px; margin-right:2px; background-image:url(./img/iconExternal.gif); background-repeat:no-repeat; background-position:right center;}
+.xe_content a.blank { padding-right:13px; margin-right:2px; background-image:url(./img/iconBlank.gif); background-repeat:no-repeat; background-position:right center;}
+
+/* Division */
+.xe_content .mpDivision{ border:1px dotted #999; padding-left:15px; padding-right:15px; -moz-border-radius:5px; -webkit-border-radius:5px; background:#666;}
diff --git a/modules/editor/tpl/admin_index.html b/modules/editor/tpl/admin_index.html
index 1d42c1c66..5c3d8adb4 100644
--- a/modules/editor/tpl/admin_index.html
+++ b/modules/editor/tpl/admin_index.html
@@ -1,40 +1,163 @@
-<!--%import("js/editor_admin.js")-->
+<load target="js/editor_module_config.js" usecdn="true" />
+<script type="text/javascript">
+	jQuery(function($){
+		var fontPreview = $('.fontPreview');
+		var fontRadio = $('.fontSelector>:radio');
+		var checkedFont = fontRadio.filter(':checked').next('label').css('fontFamily');
+		fontPreview.css('fontFamily',checkedFont);
+		fontRadio.change(function(){
+			var myFont = $(this).next('label').css('fontFamily');
+			fontPreview.css('fontFamily',myFont);
+		});
+		var changedSize = $('#fontSize').val();
+		fontPreview.css('fontSize',changedSize+'px');
+		$('#fontSize').keyup(function(){
+			var mySize = $(this).val();
+			fontPreview.css('fontSize',mySize+'px');
+			if(mySize.length==0){ fontPreview.css('fontSize','') };
+			if(mySize>28){
+				alert('{$lang->msg_font_too_big}');
+				$(this).val('28');
+				fontPreview.css('fontSize','28px');
+			};
+		});
+	});
+</script>
+<h1 class="h1">{$lang->editor}</h1>
+<h2 class="h2">{$lang->editor_preview}</h2>
 
-<h3 class="xeAdmin">{$lang->editor} <span class="gray">{$lang->cmd_management}</span></h3>
+<!-- Editor Preview -->
+<a href="{getUrl('module', 'admin', 'act', 'dispEditorConfigPreview')}" target="_blank">{$lang->cmd_preview}</a>
+<!-- /Editor Preview -->
+<form action="./" method="post" class="form" ruleset="generalConfig">
+	<input type="hidden" name="module" value="editor" />
+	<input type="hidden" name="act" value="procEditorAdminGeneralConfig	" />
 
-<table cellspacing="0" class="crossTable">
-<thead>
-    <tr>
-        <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->component_author}</div></th>
-        <th scope="col" colspan="2"><div>{$lang->component_version}</div></th>
-        <th scope="col"><div>{$lang->component_date}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($component_list as $component_name => $xml_info)-->
-    <tr class="row2">
-        <th colspan="2" scope="row"><div><a href="{getUrl('module','editor','act','dispEditorComponentInfo','component_name',$component_name)}" onclick="popopen(this.href);return false;"><strong>{$xml_info->title}</strong></a> ({$component_name})</div></th>
-        <th><a href="#" onclick="doSetupComponent('{$component_name}'); return false;" title="{htmlspecialchars($lang->cmd_setup)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></th>
-        <th>
-            <!--@if($xml_info->enabled=='Y')-->
-                <a href="#" onclick="doDisableComponent('{$component_name}');return false;" title="{htmlspecialchars($lang->cmd_enable)}" class="buttonSet buttonActive"><span>{$lang->cmd_enable}</span></a>
-            <!--@else-->
-                <a href="#" onclick="doEnableComponent('{$component_name}');return false;" title="{htmlspecialchars($lang->cmd_disable)}" class="buttonSet buttonDisable"><span>{$lang->cmd_disable}</span></a>
-            <!--@end-->
-        </th>
-        <th><a href="#" onclick="doMoveListOrder('{$component_name}','up');return false;" title="{htmlspecialchars($lang->cmd_move_up)}" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><a href="#" onclick="doMoveListOrder('{$component_name}','down');return false;" title="{htmlspecialchars($lang->cmd_move_down)}" class="buttonSet buttonDown"><span>{$lang->cmd_move_down}</span></a></th>
-    </tr>
-    <tr>
-        <td>{nl2br($xml_info->description)}</td>
-        <td class="nowrap">
-            <!--@foreach($xml_info->author as $author)-->
-            <a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->name}</a>
-            <!--@endforeach-->
-        </td>
-        <td colspan="2">{$xml_info->version}</td>
-        <td>{$xml_info->date}</td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
+	<fieldset class="section">
+		<h2 class="h2">{$lang->editor_option}</h2>
+		<ul>
+			<li>
+				<p class="q">{$lang->guide_choose_main_editor}</p>
+				<p class="a">
+					<!--@foreach($editor_skin_list as $editor)-->
+					<input type="radio" name="editor_skin" value="{$editor}" id="doc_{$editor}" onClick="getEditorSkinColorList(this.value, null, 'document','doc_{$editor}')" <!--@if($editor==$editor_config->editor_skin)-->checked="checked" <!--@end-->/>
+					<label for="doc_{$editor}" value='sdf'>{$editor}</label>
+					<select name="sel_editor_colorset"  <!--@if($editor==$editor_config->editor_skin)--> >
+						<!--@foreach($editor_colorset_list as $key => $val)-->
+						<option value="{$val->name}" <!--@if($editor_config->sel_editor_colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+						<!--@else-->style="display:none"> <!--@end-->
+					</select>
+					<br />
+					<!--@end-->
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="editor_height">{$lang->guide_set_height_main_editor}</label></p>
+				<p class="a"><input type="text" name="editor_height" id="editor_height" value="<!--@if($editor_config->editor_height)-->{$editor_config->editor_height}<!--@else-->{$editor_config_default['editor_height']}<!--@end-->" style="width:30px" /> px</p>
+			</li>
+			<li>
+				<p class="q">{$lang->guide_choose_comment_editor}</p>
+				<p class="a">
+					<!--@foreach($editor_skin_list as $editor)-->
+					<input type="radio" name="comment_editor_skin" value="{$editor}" id="com_{$editor}"  onclick="getEditorSkinColorList(this.value, null, 'reply','com_{$editor}')" <!--@if($editor == $editor_config->comment_editor_skin)-->checked="checked" <!--@end-->/>
+					<label for="com_{$editor}">{$editor}</label>
+					<select name="sel_comment_editor_colorset" <!--@if($editor==$editor_config->comment_editor_skin)-->	 >
+						<!--@foreach($editor_colorset_list as $key => $val)-->
+						<option value="{$val->name}" <!--@if($editor_config->sel_comment_editor_colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+						<!--@else-->style="display:none"> <!--@end-->
+					</select>
+					<br />
+					<!--@end-->
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="comment_editor_height">{$lang->guide_set_height_comment_editor}</label></p>
+				<p class="a"><input type="text" name="comment_editor_height"id="comment_editor_height" value="<!--@if($editor_config->comment_editor_height)-->{$editor_config->comment_editor_height}<!--@else-->{$editor_config_default['comment_editor_height']}<!--@end-->" style="width:30px" /> px</p>
+			</li>
+			<li>
+				<p class="q">{$lang->guide_choose_text_formatting}</p>
+				<p class="a">
+					<!--@foreach($content_style_list as $key => $val)-->
+					<input type="radio" name="content_style" value="{$key}" id="style_{$key}" <!--@if($key==$editor_config->content_style||!$editor_config->content_style&&$key=='default')-->checked="checked"<!--@end-->><label for="style_{$key}">{$key}</label>
+					<!--@end-->
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->guide_choose_font_body}</p>
+				<textarea rows="3" cols="42" class="fontPreview" title="Font Preview">{$lang->font_preview}</textarea>
+				<p class="answer fontSelector">
+					<input type="radio" name="content_font" id="font_noFont" value="" <!--@if(!$editor_config->content_font)-->checked="checked" <!--@end-->/> <label for="font_noFont" style="font-family:''">none(inherit)</label><br />
+					<!--@foreach($lang->edit->fontlist as $name => $detail)-->
+					<input type="radio" name="content_font" id="font_{$name}" value="{$name}" <!--@if($editor_config->content_font==$name)-->checked="checked" <!--@end-->/> <label for="font_{$name}" style="font-family:{$detail}">{$detail}</label><br />
+					<!--@end-->
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="fontSize">{$lang->guide_choose_font_size_body}</label></p>
+				<textarea rows="3" cols="42" class="fontPreview" title="Font Preview">{$lang->font_preview}</textarea>
+				<p class="a"><input type="text" id="fontSize" name="content_font_size" value="<!--@if($editor_config->content_font_size)-->{str_replace('px','',$editor_config->content_font_size)}<!--@else-->{str_replace('px','',$editor_config_default['content_font_size'])}<!--@end-->" style="width:30px" /> px</p>
+			</li>
+		</ul>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</fieldset>
+</form>
+<form action="./" method="post" class="form" ruleset="componentOrderAndUse">
+	<input type="hidden" name="module" value="editor" />
+	<input type="hidden" name="act" value="procEditorAdminCheckUseListOrder" />
+	<fieldset class="section">
+		<h2 class="h2">Editor Component</h2>
+		<div class="table even easyList">
+			<table id="sortable_table" class="sortable"width="100%" border="1" cellspacing="0">
+				<caption>
+				All({$component_count})
+				</caption>
+				<thead>
+					<tr>
+						<th scope="col">{$lang->cmd_move}</th>
+						<th scope="col" class="title">{$lang->component_name} {$lang->user_name}</th>
+						<th scope="col">{$lang->version}</th>
+						<th scope="col">{$lang->author}</th>
+						<th scope="col">{$lang->path}</th>
+						<th scope="col">{$lang->use}</th>
+						<th scope="col">{$lang->cmd_delete}</th>
+					</tr>
+				</thead>
+				<tbody class="uDrag">
+					<!--@foreach($component_list as $component_name => $xml_info)-->
+					<tr>
+						<td><div class="wrap" style="height:80px"><button type="button" class="dragBtn">Move to</button></div></td>
+						<td class="title">
+							<input type="hidden" name="component_names[]" value="{$xml_info->component_name}" />
+							<p><b>{$xml_info->title}</b></p>
+							<p>{nl2br($xml_info->description)}</p>
+							<!--@if($xml_info->version && $xml_info->need_update == 'Y')-->
+							<p class="update">{$lang->msg_avail_easy_update}<a href="{getUrl('act','dispAutoinstallAdminInstall','package_srl',$xml_info->package_srl)}">{$lang->msg_do_you_like_update}</a></p>
+							<!--@end-->
+						</td>
+						<td>{$xml_info->version}</td>
+						<td>
+						   <!--@foreach($xml_info->author as $author)-->
+							<a href="{$author->homepage}" target="_blank">{$author->name}</a>
+							<!--@endforeach-->
+						</td>
+						<td>{$xml_info->path}</td>
+						<td><input type="checkbox" name="enables[]" id="enable" value="{$xml_info->component_name}" title="Use this component " <!--@if($xml_info->enabled=='Y')--> checked="checked"<!--@end--> /></td>
+						<td>
+							<!--@if($xml_info->version && $xml_info->delete_url)-->
+							<a href="{$xml_info->delete_url}">Delete</a>
+							<!--@end-->
+						</td>
+					</tr>
+					<!--@end-->
+				</tbody>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</fieldset>
+</form>
diff --git a/modules/editor/tpl/config_preview.html b/modules/editor/tpl/config_preview.html
new file mode 100644
index 000000000..49fb0e094
--- /dev/null
+++ b/modules/editor/tpl/config_preview.html
@@ -0,0 +1,17 @@
+<load target="../../admin/tpl/css/admin.css" usecdn="true" />
+<div class="x" style="padding: 10px;">
+	<h2 class="h2">{$lang->editor_preview}</h2>
+	<h2 class="h3">{$lang->main_editor}</h2>
+	<form onSubmit="return false">	
+		<input type="hidden" name="dummy_content" />
+		<input type="hidden" name="dummy_key" value="1" />
+
+		<p>{$editor}</p>
+	</form><br />
+	<h2 class="h3">{$lang->comment_editor}</h2>
+	<form onSubmit="return false">
+		<input type="hidden" name="dummy_content2" />
+		<input type="hidden" name="dummy_key2" value="1" />
+		<p>{$editor_comment}</p>
+	</form>
+</div>
diff --git a/modules/editor/tpl/editor_module_config.html b/modules/editor/tpl/editor_module_config.html
index e2de82170..a7330af14 100644
--- a/modules/editor/tpl/editor_module_config.html
+++ b/modules/editor/tpl/editor_module_config.html
@@ -1,211 +1,178 @@
 <!--%import("filter/insert_editor_module_config.xml")-->
-<!--%import("js/editor_module_config.js")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_editor_module_config)">
-<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
-    <h4 class="xeAdmin">{$lang->editor}</h4>
-    <table cellspacing="0" class="crossTable">
-    <thead>
-    <tr>
-        <th scope="col"><div>&nbsp;</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->document}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->comment}</div></th>
-    </tr>
-    </thead>
-    <tbody>
-    <tr>
-        <th rowspan="2"><div>{$lang->editor_skin}</div></th>
-        <td colspan="2"><p>{$lang->about_editor_skin}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <select name="editor_skin" onchange="getEditorSkinColorList(this.value, null, 'document')">
-            <!--@foreach($editor_skin_list as $editor)-->
-            <option value="{$editor}" <!--@if($editor==$editor_config->editor_skin)-->selected="selected"<!--@end-->>{$editor}</option>
-            <!--@end-->
-            </select>
-            <br/>
-            <select name="sel_editor_colorset" id="sel_editor_colorset"<!--@if(!count($editor_colorset_list))--> style="display:none"<!--@end-->>
-                <!--@foreach($editor_colorset_list as $key => $val)-->
-                    <option value="{$val->name}" <!--@if($editor_config->sel_editor_colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-        </td>
-        <td>
-            <select name="comment_editor_skin" onchange="getEditorSkinColorList(this.value, null, 'comment')">
-            <!--@foreach($editor_skin_list as $editor)-->
-            <option value="{$editor}" <!--@if($editor==$editor_config->comment_editor_skin)-->selected="selected"<!--@end-->>{$editor}</option>
-            <!--@end-->
-            </select>
-            <br/>
-            <select name="sel_comment_editor_colorset" id="sel_comment_editor_colorset"<!--@if(!count($editor_comment_colorset_list))--> style="display:none"<!--@end-->>
-                <!--@foreach($editor_comment_colorset_list as $key => $val)-->
-                    <option value="{$val->name}" <!--@if($editor_config->sel_comment_editor_colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->content_style}</div></th>
-        <td colspan="2"><p>{$lang->about_content_style}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <select name="content_style">
-            <!--@foreach($content_style_list as $key => $val)-->
-            <option value="{$key}" <!--@if($key==$editor_config->content_style||!$editor_config->content_style&&$key=='default')-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-            </select>
-        </td>
-        <td>
-            <select name="comment_content_style">
-            <!--@foreach($content_style_list as $key => $val)-->
-            <option value="{$key}" <!--@if($key==$editor_config->comment_content_style||!$editor_config->comment_content_style&&$key=='default')-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->content_font}</div></th>
-        <td colspan="2"><p>{$lang->about_content_font}</p></td>
-    </tr>
-    <tr>
-        <td colspan="2">
-            <input type="text" name="content_font" value="{str_replace(array('"','\''),'',$editor_config->content_font)}" class="inputTypeText w400" />
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->content_font_size}</div></th>
-        <td colspan="2"><p>{$lang->about_content_font_size}</p></td>
-    </tr>
-    <tr>
-        <td colspan="2">
-            <input type="text" name="content_font_size" value="{$editor_config->content_font_size}" class="inputTypeText w80" />
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->editor_height}</div></th>
-        <td colspan="2"><p>{$lang->about_editor_height}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <input type="text" name="editor_height" value="{$editor_config->editor_height}" class="inputTypeText w80" />px
-        </td>
-        <td>
-            <input type="text" name="comment_editor_height" value="{$editor_config->comment_editor_height}" class="inputTypeText w80" />px
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->enable_autosave}</div></th>
-        <td colspan="2"><p>{$lang->about_enable_autosave}</p></td>
-    </tr>
-    <tr>
-        <td colspan="2"><input type="checkbox" value="Y" name="enable_autosave" <!--@if($editor_config->enable_autosave=='Y')-->checked="checked"<!--@end-->/></td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->enable_html_grant}</div></th>
-        <td colspan="2"><p>{$lang->about_enable_html_grant}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_html_grant" value="{$k}" id="enable_html_{$k}" <!--@if(in_array($k, $editor_config->enable_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_html_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-        </td>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_comment_html_grant" value="{$k}" id="enable_comment_html_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_comment_html_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_html_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_html_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->upload_file_grant}</div></th>
-        <td colspan="2"><p>{$lang->about_upload_file_grant}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="upload_file_grant" value="{$k}" id="fileupload_{$k}" <!--@if(in_array($k, $editor_config->upload_file_grant))-->checked="checked"<!--@end-->/> <label for="fileupload_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('upload_file_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('upload_file_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
-        </td>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="comment_upload_file_grant" value="{$k}" id="comment_fileupload_{$k}" <!--@if(in_array($k, $editor_config->comment_upload_file_grant))-->checked="checked"<!--@end-->/> <label for="comment_fileupload_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('comment_upload_file_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('comment_upload_file_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->enable_default_component_grant}</div></th>
-        <td colspan="2"><p>{$lang->about_default_component_grant}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_default_component_grant" value="{$k}" id="default_componen_{$k}" <!--@if(in_array($k, $editor_config->enable_default_component_grant))-->checked="checked"<!--@end-->/> <label for="default_componen_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_default_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_default_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-        </td>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_comment_default_component_grant" value="{$k}" id="comment_default_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_default_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_default_component_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_default_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_default_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
-        </td>
-    </tr>
-    <tr>
-        <th rowspan="2"><div>{$lang->enable_component_grant}</div></th>
-        <td colspan="2"><p>{$lang->about_component_grant}</p></td>
-    </tr>
-    <tr>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_component_grant" value="{$k}" id="componen_{$k}" <!--@if(in_array($k, $editor_config->enable_component_grant))-->checked="checked"<!--@end-->/> <label for="componen_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
-        </td>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" name="enable_comment_component_grant" value="{$k}" id="comment_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_component_{$k}">{$v->title}</label>
-            <!--@end-->
-            <br/>
-
-            <span class="button small green"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_component_grant',{ checked:true});return false" value="{$lang->cmd_select_all}" /></span>
-            <span class="button small red"><input type="button" onclick="XE.checkboxToggleAll('enable_comment_component_grant',{ checked:false});return false" value="{$lang->cmd_unselect_all}" /></span>
-
-        </td>
-    </tr>
-    <tr>
-        <th class="button" colspan="3">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"/></span>
-        </th>
-    </tr>
-    </tbody>
-    </table>
-
+<load target="js/editor_module_config.js" usecdn="true" />
+<form action="./" method="post" class="form">
+	<input type="hidden" name="act" value="procEditorInsertModuleConfig" />
+	<input type="hidden" name="module" value="editor" />
+	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+    <h3 class="h3">{$lang->editor}</h3>
+    <div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+			<tr>
+				<th scope="col">&nbsp;</th>
+				<th scope="col">{$lang->document}</th>
+				<th scope="col">{$lang->comment}</th>
+			</tr>
+			</thead>
+			<tbody>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->editor_skin}</th>
+				<td colspan="2">{$lang->about_editor_skin}</td>
+			</tr>
+			<tr>
+				<td>
+					<select name="editor_skin" onchange="getEditorSkinColorList(this.value, null, 'document')">
+					<!--@foreach($editor_skin_list as $editor)-->
+					<option value="{$editor}" <!--@if($editor==$editor_config->editor_skin)-->selected="selected"<!--@end-->>{$editor}</option>
+					<!--@end-->
+					</select>
+					<br/>
+					<select name="sel_editor_colorset" id="sel_editor_colorset"<!--@if(!count($editor_colorset_list))--> style="display:none"<!--@end-->>
+						<!--@foreach($editor_colorset_list as $key => $val)-->
+							<option value="{$val->name}" <!--@if($editor_config->sel_editor_colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+				</td>
+				<td>
+					<select name="comment_editor_skin" onchange="getEditorSkinColorList(this.value, null, 'comment')">
+					<!--@foreach($editor_skin_list as $editor)-->
+					<option value="{$editor}" <!--@if($editor==$editor_config->comment_editor_skin)-->selected="selected"<!--@end-->>{$editor}</option>
+					<!--@end-->
+					</select>
+					<br/>
+					<select name="sel_comment_editor_colorset" id="sel_comment_editor_colorset"<!--@if(!count($editor_comment_colorset_list))--> style="display:none"<!--@end-->>
+						<!--@foreach($editor_comment_colorset_list as $key => $val)-->
+							<option value="{$val->name}" <!--@if($editor_config->sel_comment_editor_colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->content_style}</th>
+				<td colspan="2"><p>{$lang->about_content_style}</p></td>
+			</tr>
+			<tr>
+				<td>
+					<select name="content_style">
+					<!--@foreach($content_style_list as $key => $val)-->
+					<option value="{$key}" <!--@if($key==$editor_config->content_style||!$editor_config->content_style&&$key=='default')-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+					</select>
+				</td>
+				<td>
+					<select name="comment_content_style">
+					<!--@foreach($content_style_list as $key => $val)-->
+					<option value="{$key}" <!--@if($key==$editor_config->comment_content_style||!$editor_config->comment_content_style&&$key=='default')-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row"><label for="content_font">{$lang->content_font}</label></th>
+				<td colspan="2">{$lang->about_content_font}</td>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<input type="text" name="content_font" id="content_font" value="{str_replace(array('"','\''),'',$editor_config->content_font)}" />
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row"><label for="content_font_size">{$lang->content_font_size}</label></th>
+				<td colspan="2">{$lang->about_content_font_size}</td>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<input type="text" name="content_font_size" id="content_font_size" value="{$editor_config->content_font_size}" style="width:50px" />
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->editor_height}</th>
+				<td colspan="2">{$lang->about_editor_height}</td>
+			</tr>
+			<tr>
+				<td>
+					<input type="text" name="editor_height" value="{$editor_config->editor_height}" style="width:30px" /> px
+				</td>
+				<td>
+					<input type="text" name="comment_editor_height" value="{$editor_config->comment_editor_height}" style="width:30px" /> px
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->enable_autosave}</th>
+				<td colspan="2">{$lang->about_enable_autosave}</td>
+			</tr>
+			<tr>
+				<td colspan="2"><input type="checkbox" value="Y" name="enable_autosave" <!--@if($editor_config->enable_autosave=='Y')-->checked="checked"<!--@end-->/></td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->enable_html_grant}</th>
+				<td colspan="2">{$lang->about_enable_html_grant}</td>
+			</tr>
+			<tr>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="enable_html_grant" value="{$k}" id="enable_html_{$k}" <!--@if(in_array($k, $editor_config->enable_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_html_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="enable_comment_html_grant" value="{$k}" id="enable_comment_html_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_html_grant))-->checked="checked"<!--@end-->/> <label for="enable_comment_html_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->upload_file_grant}</th>
+				<td colspan="2">{$lang->about_upload_file_grant}</td>
+			</tr>
+			<tr>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="upload_file_grant" value="{$k}" id="fileupload_{$k}" <!--@if(in_array($k, $editor_config->upload_file_grant))-->checked="checked"<!--@end-->/> <label for="fileupload_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="comment_upload_file_grant" value="{$k}" id="comment_fileupload_{$k}" <!--@if(in_array($k, $editor_config->comment_upload_file_grant))-->checked="checked"<!--@end-->/> <label for="comment_fileupload_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->enable_default_component_grant}</th>
+				<td colspan="2">{$lang->about_default_component_grant}</td>
+			</tr>
+			<tr>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="enable_default_component_grant" value="{$k}" id="default_componen_{$k}" <!--@if(in_array($k, $editor_config->enable_default_component_grant))-->checked="checked"<!--@end-->/> <label for="default_componen_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="enable_comment_default_component_grant" value="{$k}" id="comment_default_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_default_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_default_component_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+			</tr>
+			<tr>
+				<th rowspan="2" scope="row">{$lang->enable_component_grant}</th>
+				<td colspan="2">{$lang->about_component_grant}</td>
+			</tr>
+			<tr>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="enable_component_grant" value="{$k}" id="componen_{$k}" <!--@if(in_array($k, $editor_config->enable_component_grant))-->checked="checked"<!--@end-->/> <label for="componen_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+				<td>
+					<!--@foreach($group_list as $k => $v)-->
+					<input type="checkbox" name="enable_comment_component_grant" value="{$k}" id="comment_component_{$k}" <!--@if(in_array($k, $editor_config->enable_comment_component_grant))-->checked="checked"<!--@end-->/> <label for="comment_component_{$k}">{$v->title}</label>
+					<!--@end-->
+				</td>
+			</tr>
+			</tbody>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+	</div>
 </form>
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index a1c8c7b20..4d4ac6dc3 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -1,564 +1,564 @@
-/**
- * @author NHN (developers@xpressengine.com)
- * @version 0.1
- * @brief 에디터 관련 스크립트
- */
-
-/**
- * 에디터 사용시 사용되는 이벤트 연결 함수 호출
- **/
-
-/**
- * 에디터의 상태나 객체를 구하기 위한 함수
- **/
-
-// editor_sequence값에 해당하는 textarea object를 return
-function editorGetTextArea(editor_sequence) {
-    return jQuery('#editor_textarea_' + editor_sequence)[0];
-}
-
-function editorGetPreviewArea(editor_sequence) {
-    return jQuery( '#editor_preview_' + editor_sequence )[0];
-}
-
-// editor_sequence에 해당하는 form문 구함
-function editorGetForm(editor_sequence) {
-    var iframe_obj = editorGetIFrame(editor_sequence);
-    if(!iframe_obj) return;
-
-    var fo_obj = iframe_obj.parentNode;
-    while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; }
-    if(fo_obj.nodeName == 'FORM') return fo_obj;
-    return;
-}
-
-// 에디터의 전체 내용 return
-function editorGetContent_xe(editor_sequence) {
-    var html = "";
-    if(editorMode[editor_sequence]=='html') {
-        var textarea_obj = editorGetTextArea(editor_sequence);
-        if(!textarea_obj) return "";
-        html = textarea_obj.value;
-    } else {
-        var iframe_obj = editorGetIFrame(editor_sequence);
-        if(!iframe_obj) return "";
-        html = jQuery(iframe_obj.contentWindow.document.body).html().replace(/^<br([^>]*)>$/i,'');
-    }
-    return html;
-}
-
-// 에디터 내의 선택된 부분의 NODE를 return
-function editorGetSelectedNode(editor_sequence) {
-    var iframe_obj = editorGetIFrame(editor_sequence), w, range;
-
-	w = iframe_obj.contentWindow;
-
-    if(w.document.selection) {
-        range = w.document.selection.createRange();
-        return jQuery('<div />').html(range.htmlText)[0].firstChild;
-    } else {
-        range = w.getSelection().getRangeAt(0);
-        return jQuery('<div />').append(range.cloneContents())[0].firstChild;
-    }
-}
-
-/**
- * editor 시작 (editor_sequence로 iframe객체를 얻어서 쓰기 모드로 전환)
- **/
-var _editorFontColor = new Array();
-function editorStart(editor_sequence, primary_key, content_key, editor_height, font_color) {
-
-    if(typeof(font_color)=='undefined') font_color = '#000';
-    _editorFontColor[editor_sequence] = font_color;
-
-    // iframe obj를 찾음
-    var iframe_obj = editorGetIFrame(editor_sequence);
-    if(!iframe_obj) return;
-	jQuery(iframe_obj).css('width', '100%').parent().css('width', '100%');
-
-    // 현 에디터를 감싸고 있는 form문을 찾음
-    var fo_obj = editorGetForm(editor_sequence);
-    if(!fo_obj) return;
-
-    // fo_obj에 editor_sequence 값 지정
-    fo_obj.setAttribute('editor_sequence', editor_sequence);
-
-    // 모듈 연관 키 값을 세팅
-    editorRelKeys[editor_sequence] = new Array();
-    editorRelKeys[editor_sequence]["primary"] = fo_obj[primary_key];
-    editorRelKeys[editor_sequence]["content"] = fo_obj[content_key];
-    editorRelKeys[editor_sequence]["func"] = editorGetContent_xe;
-
-    // saved document(자동저장 문서)에 대한 확인
-    if(typeof(fo_obj._saved_doc_title)!="undefined" ) { ///<< _saved_doc_title field가 없으면 자동저장 하지 않음
-
-        var saved_title = fo_obj._saved_doc_title.value;
-        var saved_content = fo_obj._saved_doc_content.value;
-
-        if(saved_title || saved_content) {
-            // 자동저장된 문서 활용여부를 물은 후 사용하지 않는다면 자동저장된 문서 삭제
-            if(confirm(fo_obj._saved_doc_message.value)) {
-                if(typeof(fo_obj.title)!='undefined') fo_obj.title.value = saved_title;
-                editorRelKeys[editor_sequence]['content'].value = saved_content;
-
-                var param = new Array();
-                param['editor_sequence'] = editor_sequence;
-                param['primary_key'] = primary_key;
-                param['mid'] = current_mid;
-                var response_tags = new Array("error","message","editor_sequence","key","title","content","document_srl");
-                exec_xml('editor',"procEditorLoadSavedDocument", param, getAutoSavedSrl, response_tags);
-            } else {
-                editorRemoveSavedDoc();
-            }
-        }
-    }
-
-    // 대상 form의 content element에서 데이터를 구함
-    var content = editorRelKeys[editor_sequence]['content'].value;
-
-    // IE가 아니고 내용이 없으면 <br /> 추가 (FF등에서 iframe 선택시 focus를 주기 위한 꽁수)
-    if(!content && !xIE4Up) content = "<br />";
-
-    // IE일 경우 ctrl-Enter 안내 문구를 노출
-    var ieHelpObj = xGetElementById("for_ie_help_"+editor_sequence);
-    if(xIE4Up && ieHelpObj) {
-        ieHelpObj.style.display = "block";
-    }
-
-    // content 생성
-    editor_path = editor_path.replace(/^\.\//ig, '');
-    var contentHtml = ''+
-        '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'+
-        '<html xmlns="http://www.w3.org/1999/xhtml><head><meta http-equiv="content-type" content="text/html; charset=utf-8"/>'+
-        '<style type="text/css">'+
-        'body {font-size:.75em; line-height:1.6; font-family:Sans-serif; height:'+editor_height+'px; padding:0; margin:0; background-color:transparent; color:'+font_color+';}'+
-        '</style>'+
-        '</head><body editor_sequence="'+editor_sequence+'">'+
-        content+
-        '</body></html>'+
-        '';
-    iframe_obj.contentWindow.document.open("text/html","replace");
-    iframe_obj.contentWindow.document.write(contentHtml);
-    iframe_obj.contentWindow.document.close();
-
-    // editorMode를 기본으로 설정
-    editorMode[editor_sequence] = null;
-
-    // 에디터를 시작 시킴
-    try {
-        iframe_obj.contentWindow.document.designMode = 'On';
-    } catch(e) {
-    }
-
-    try {
-        iframe_obj.contentWindow.document.execCommand("undo", false, null);
-        iframe_obj.contentWindow.document.execCommand("useCSS", false, true);
-    }  catch (e) {
-    }
-
-    /**
-     * 더블클릭이나 키눌림등의 각종 이벤트에 대해 listener 추가
-     * 작성시 필요한 이벤트 체크
-     * 이 이벤트의 경우 윈도우 sp1 (NT or xp sp1) 에서 iframe_obj.contentWindow.document에 대한 권한이 없기에 try 문으로 감싸서
-     * 에러를 무시하도록 해야 함.
-     **/
-
-    // 위젯 감시를 위한 더블클릭 이벤트 걸기
-    try {
-        xAddEventListener(iframe_obj.contentWindow.document,'dblclick',editorSearchComponent);
-    } catch(e) {
-    }
-
-    // 에디터에서 키가 눌러질때마다 이벤트를 체크함 (enter키의 처리나 FF에서 alt-s등을 처리)
-    try {
-        if(xIE4Up) xAddEventListener(iframe_obj.contentWindow.document, 'keydown',editorKeyPress);
-        else xAddEventListener(iframe_obj.contentWindow.document, 'keypress',editorKeyPress);
-    } catch(e) {
-    }
-
-    // 자동저장 필드가 있다면 자동 저장 기능 활성화
-    if(typeof(fo_obj._saved_doc_title)!="undefined" ) editorEnableAutoSave(fo_obj, editor_sequence);
-
-
-    // 좋지는 않으나;; 스타일 변형을 막기 위해 start 할때 html이면 바꿔주자
-    if (xGetCookie('editor_mode') == 'html'){
-        var iframe_obj = editorGetIFrame(editor_sequence);
-        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
-        textarea_obj = editorGetTextArea(editor_sequence);
-        textarea_obj.value = content;
-        xWidth(textarea_obj, xWidth(iframe_obj.parentNode));
-        xHeight(textarea_obj, xHeight(iframe_obj.parentNode));
-        editorMode[editor_sequence] = 'html';
-        if(xGetElementById('xeEditor_'+editor_sequence)) {
-            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor html';
-            xGetElementById('use_rich_'+editor_sequence).className = '';
-            xGetElementById('preview_html_'+editor_sequence).className = '';
-            xGetElementById('use_html_'+editor_sequence).className = 'active';
-        }
-    }
-}
-
-
-/**
- * 에디터의 세부 설정과 데이터 핸들링을 정의한 함수들
- **/
-
-
-
-/**
- * 키 또는 마우스 이벤트 핸들링 정의 함수
- **/
-
-// 입력 키에 대한 이벤트 체크
-function editorKeyPress(evt) {
-    var e = new xEvent(evt);
-
-    // 대상을 구함
-    var obj = e.target;
-    var body_obj = null;
-    if(obj.nodeName == "BODY") body_obj = obj;
-    else body_obj = obj.firstChild.nextSibling;
-    if(!body_obj) return;
-
-    // editor_sequence는 에디터의 body에 attribute로 정의되어 있음
-    var editor_sequence = body_obj.getAttribute("editor_sequence");
-    if(!editor_sequence) return;
-
-    // IE에서 enter키를 눌렀을때 P 태그 대신 BR 태그 입력
-    if (xIE4Up && !e.ctrlKey && !e.shiftKey && e.keyCode == 13 && !editorMode[editor_sequence]) {
-        var iframe_obj = editorGetIFrame(editor_sequence);
-        if(!iframe_obj) return;
-
-        var contentDocument = iframe_obj.contentWindow.document;
-
-        var obj = contentDocument.selection.createRange();
-
-        var pTag = obj.parentElement().tagName.toLowerCase();
-
-        switch(pTag) {
-            case 'li' :
-                    return;
-                break;
-            default :
-                    obj.pasteHTML("<br />");
-                break;
-        }
-        obj.select();
-        evt.cancelBubble = true;
-        evt.returnValue = false;
-        return;
-    }
-
-    // ctrl-S, alt-S 클릭시 submit하기
-    if( e.keyCode == 115 && (e.altKey || e.ctrlKey) ) {
-        // iframe 에디터를 찾음
-        var iframe_obj = editorGetIFrame(editor_sequence);
-        if(!iframe_obj) return;
-
-        // 대상 form을 찾음
-        var fo_obj = editorGetForm(editor_sequence);
-        if(!fo_obj) return;
-
-        // 데이터 동기화
-        editorRelKeys[editor_sequence]['content'].value = editorGetContent(editor_sequence);
-
-        // form문 전송
-        if(fo_obj.onsubmit) fo_obj.onsubmit();
-
-        // 이벤트 중단
-        evt.cancelBubble = true;
-        evt.returnValue = false;
-        xPreventDefault(evt);
-        xStopPropagation(evt);
-        return;
-    }
-
-    // ctrl-b, i, u, s 키에 대한 처리 (파이어폭스에서도 에디터 상태에서 단축키 쓰도록)
-    if (e.ctrlKey) {
-        // iframe 에디터를 찾음
-        var iframe_obj = editorGetIFrame(editor_sequence);
-        if(!iframe_obj) return;
-
-        // html 에디터 모드일 경우 이벤트 취소 시킴
-        if(editorMode[editor_sequence]) {
-            evt.cancelBubble = true;
-            evt.returnValue = false;
-            xPreventDefault(evt);
-            xStopPropagation(evt);
-            return;
-        }
-
-        switch(e.keyCode) {
-            // ctrl+1~6
-            case 49 :
-            case 50 :
-            case 51 :
-            case 52 :
-            case 53 :
-            case 54 :
-                    editorDo('formatblock',"<H"+(e.keyCode-48)+">",e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-            // ctrl+7
-            case 55 :
-                    editorDo('formatblock',"<P>",e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-            // ie에서 ctrlKey + enter일 경우 P 태그 입력
-            case 13 :
-                    if(xIE4Up) {
-                        if(e.target.parentElement.document.designMode!="On") return;
-                        var obj = e.target.parentElement.document.selection.createRange();
-                        obj.pasteHTML('<P>');
-                        obj.select();
-                        evt.cancelBubble = true;
-                        evt.returnValue = false;
-                        return;
-                    }
-            // bold
-            case 98 :
-                    editorDo('Bold',null,e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-            // italic
-            case 105 :
-                    editorDo('Italic',null,e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-            // underline
-            case 117 :
-                    editorDo('Underline',null,e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-            //RemoveFormat
-            case 100 :
-                    editorDo('RemoveFormat',null,e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-
-
-            // strike
-            /*
-            case 83 :
-            case 115 :
-                    editorDo('StrikeThrough',null,e.target);
-                    xPreventDefault(evt);
-                    xStopPropagation(evt);
-                break;
-            */
-        }
-    }
-}
-
-// 편집 기능 실행
-function editorDo(command, value, target) {
-
-    var doc = null;
-
-    // target이 object인지 editor_sequence인지에 따라 document를 구함
-    if(typeof(target)=="object") {
-        if(xIE4Up) doc = target.parentElement.document;
-        else doc = target.parentNode;
-    } else {
-        var iframe_obj = editorGetIFrame(target);
-        doc = iframe_obj.contentWindow.document;
-    }
-
-    var editor_sequence = doc.body.getAttribute('editor_sequence');
-    if(editorMode[editor_sequence]) return;
-
-    // 포커스
-    if(typeof(target)=="object") target.focus();
-    else editorFocus(target);
-
-    // 실행
-    doc.execCommand(command, false, value);
-
-    // 포커스
-    if(typeof(target)=="object") target.focus();
-    else editorFocus(target);
-}
-
-// 폰트를 변경
-function editorChangeFontName(obj,srl) {
-    var value = obj.options[obj.selectedIndex].value;
-    if(!value) return;
-    editorDo('FontName',value,srl);
-    obj.selectedIndex = 0;
-}
-
-function editorChangeFontSize(obj,srl) {
-    var value = obj.options[obj.selectedIndex].value;
-    if(!value) return;
-    editorDo('FontSize',value,srl);
-    obj.selectedIndex = 0;
-}
-
-function editorUnDo(obj,srl) {
-    editorDo('undo','',srl);
-    obj.selectedIndex = 0;
-}
-
-function editorReDo(obj,srl) {
-    editorDo('redo','',srl);
-    obj.selectedIndex = 0;
-}
-
-function editorChangeHeader(obj,srl) {
-    var value = obj.options[obj.selectedIndex].value;
-    if(!value) return;
-    value = "<"+value+">";
-    editorDo('formatblock',value,srl);
-    obj.selectedIndex = 0;
-}
-
-/**
- * HTML 편집 기능 활성/비활성
- **/
-
-function editorChangeMode(mode, editor_sequence) {
-
-    if(mode == 'html' || mode ==''){
-        var expire = new Date();
-        expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-        xSetCookie('editor_mode', mode, expire);
-    }
-
-    var iframe_obj = editorGetIFrame(editor_sequence);
-    if(!iframe_obj) return;
-
-    var textarea_obj = editorGetTextArea(editor_sequence);
-    var preview_obj = editorGetPreviewArea(editor_sequence);
-    var contentDocument = iframe_obj.contentWindow.document;
-
-    var html = null;
-    if(editorMode[editor_sequence]=='html') {
-        html = textarea_obj.value;
-        contentDocument.body.innerHTML = textarea_obj.value;
-    } else if (editorMode[editor_sequence]=='preview') {
-//        html = xInnerHtml(preview_obj);
-        html = textarea_obj.value;
-        preview_obj.contentWindow.document.body.innerHTML = '';
-//        xAddEventListener(xGetElementById('editor_preview_'+editor_sequence), 'load', function(){setPreviewHeight(editor_sequence)});
-    } else {
-        html = contentDocument.body.innerHTML;
-        textarea_obj.value = html
-        html = html.replace(/<br>/ig,"<br />\n");
-        html = html.replace(/<br \/>\n\n/ig,"<br />\n");
-    }
-
-    // html 편집 사용시
-    if(mode == 'html' && textarea_obj) {
-        preview_obj.style.display='none';
-        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
-        textarea_obj.value = html;
-        xWidth(textarea_obj, xWidth(iframe_obj.parentNode));
-        xHeight(textarea_obj, xHeight(iframe_obj.parentNode));
-        editorMode[editor_sequence] = 'html';
-
-        if(xGetElementById('xeEditor_'+editor_sequence)) {
-            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor html';
-            xGetElementById('use_rich_'+editor_sequence).className = '';
-            xGetElementById('preview_html_'+editor_sequence).className = '';
-            xGetElementById('use_html_'+editor_sequence).className = 'active';
-        }
-    // 미리보기
-    } else if(mode == 'preview' && preview_obj) {
-        preview_obj.style.display='';
-        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='none';
-
-        var fo_obj = xGetElementById("preview_form");
-        if(!fo_obj) {
-            fo_obj = xCreateElement('form');
-            fo_obj.id = "preview_form";
-            fo_obj.method = "post";
-            fo_obj.action = request_uri;
-            fo_obj.target = "editor_preview_"+editor_sequence;
-            xInnerHtml(fo_obj,'<input type="hidden" name="module" value="editor" /><input type="hidden" name="editor_sequence" value="'+editor_sequence+'" /><input type="hidden" name="act" value="dispEditorPreview" /><input type="hidden" name="content" />');
-            document.body.appendChild(fo_obj);
-        }
-        fo_obj.content.value = html;
-        fo_obj.submit();
-
-        xWidth(preview_obj, xWidth(iframe_obj.parentNode));
-        editorMode[editor_sequence] = 'preview';
-
-        if(xGetElementById('xeEditor_'+editor_sequence)) {
-            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor preview';
-            xGetElementById('use_rich_'+editor_sequence).className = '';
-            xGetElementById('preview_html_'+editor_sequence).className = 'active';
-            if(xGetElementById('use_html_'+editor_sequence)) xGetElementById('use_html_'+editor_sequence).className = '';
-        }
-    // 위지윅 모드 사용시
-    } else {
-        preview_obj.style.display='none';
-        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
-        contentDocument.body.innerHTML = html;
-        editorMode[editor_sequence] = null;
-
-        if(xGetElementById('xeEditor_'+editor_sequence)) {
-            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor rich';
-            xGetElementById('use_rich_'+editor_sequence).className = 'active';
-            xGetElementById('preview_html_'+editor_sequence).className = '';
-            if(xGetElementById('use_html_'+editor_sequence)) xGetElementById('use_html_'+editor_sequence).className = '';
-        }
-    }
-
-}
-
-// Editor Info Close
-function closeEditorInfo(editor_sequence) {
-    xGetElementById('editorInfo_'+editor_sequence).style.display='none';
-    var expire = new Date();
-    expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-    xSetCookie('EditorInfo', '1', expire);
-}
-
-
-function showEditorHelp(e,editor_sequence){
-	jQuery('#helpList_'+editor_sequence).toggleClass('open');
-}
-
-function showEditorExtension(evt,editor_sequence){
-    var oid = '#editorExtension_'+editor_sequence;
-    var e = new xEvent(evt);
-    if(jQuery(oid).hasClass('extension2')){
-		jQuery(oid).addClass('open');
-
-        if(e.pageX <= xWidth('editor_component_'+editor_sequence)){
-			jQuery('#editor_component_'+editor_sequence).css('right','auto').css('left', 0);
-        }else{
-			jQuery('#editor_component_'+editor_sequence).css('right', 0).css('left', 'auto');
-        }
-    }else{
-		jQuery(oid).attr('class', 'extension2');
-    }
-}
-
-function showPreviewContent(editor_sequence) {
-    if(typeof(editor_sequence)=='undefined') return;
-    if(typeof(_editorFontColor[editor_sequence])=='undefined') return;
-    var preview_obj = editorGetPreviewArea(editor_sequence);
-    preview_obj.contentWindow.document.body.style.color = _editorFontColor[editor_sequence];
-}
-
-function setPreviewHeight(editor_sequence){
-    var h = xGetElementById('editor_preview_'+editor_sequence).contentWindow.document.body.scrollHeight;
-    if(h < 400) h=400;
-    xHeight('editor_preview_'+editor_sequence,h+20);
-}
-
-function getAutoSavedSrl(ret_obj, response_tags, c) {
-    var editor_sequence = ret_obj['editor_sequence'];
-    var primary_key = ret_obj['key'];
-    var fo_obj = editorGetForm(editor_sequence);
-
-    fo_obj[primary_key].value = ret_obj['document_srl'];
-    if(uploadSettingObj[editor_sequence]) editorUploadInit(uploadSettingObj[editor_sequence], true);
-}
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @version 0.1
+ * @brief 에디터 관련 스크립트
+ */
+
+/**
+ * 에디터 사용시 사용되는 이벤트 연결 함수 호출
+ **/
+
+/**
+ * 에디터의 상태나 객체를 구하기 위한 함수
+ **/
+
+// editor_sequence값에 해당하는 textarea object를 return
+function editorGetTextArea(editor_sequence) {
+    return jQuery('#editor_textarea_' + editor_sequence)[0];
+}
+
+function editorGetPreviewArea(editor_sequence) {
+    return jQuery( '#editor_preview_' + editor_sequence )[0];
+}
+
+// editor_sequence에 해당하는 form문 구함
+function editorGetForm(editor_sequence) {
+    var iframe_obj = editorGetIFrame(editor_sequence);
+    if(!iframe_obj) return;
+
+    var fo_obj = iframe_obj.parentNode;
+    while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; }
+    if(fo_obj.nodeName == 'FORM') return fo_obj;
+    return;
+}
+
+// 에디터의 전체 내용 return
+function editorGetContent_xe(editor_sequence) {
+    var html = "";
+    if(editorMode[editor_sequence]=='html') {
+        var textarea_obj = editorGetTextArea(editor_sequence);
+        if(!textarea_obj) return "";
+        html = textarea_obj.value;
+    } else {
+        var iframe_obj = editorGetIFrame(editor_sequence);
+        if(!iframe_obj) return "";
+        html = jQuery(iframe_obj.contentWindow.document.body).html().replace(/^<br([^>]*)>$/i,'');
+    }
+    return html;
+}
+
+// 에디터 내의 선택된 부분의 NODE를 return
+function editorGetSelectedNode(editor_sequence) {
+    var iframe_obj = editorGetIFrame(editor_sequence), w, range;
+
+	w = iframe_obj.contentWindow;
+
+    if(w.document.selection) {
+        range = w.document.selection.createRange();
+        return jQuery('<div />').html(range.htmlText)[0].firstChild;
+    } else {
+        range = w.getSelection().getRangeAt(0);
+        return jQuery('<div />').append(range.cloneContents())[0].firstChild;
+    }
+}
+
+/**
+ * editor 시작 (editor_sequence로 iframe객체를 얻어서 쓰기 모드로 전환)
+ **/
+var _editorFontColor = new Array();
+function editorStart(editor_sequence, primary_key, content_key, editor_height, font_color) {
+
+    if(typeof(font_color)=='undefined') font_color = '#000';
+    _editorFontColor[editor_sequence] = font_color;
+
+    // iframe obj를 찾음
+    var iframe_obj = editorGetIFrame(editor_sequence);
+    if(!iframe_obj) return;
+	jQuery(iframe_obj).css('width', '100%').parent().css('width', '100%');
+
+    // 현 에디터를 감싸고 있는 form문을 찾음
+    var fo_obj = editorGetForm(editor_sequence);
+    if(!fo_obj) return;
+
+    // fo_obj에 editor_sequence 값 지정
+    fo_obj.setAttribute('editor_sequence', editor_sequence);
+
+    // 모듈 연관 키 값을 세팅
+    editorRelKeys[editor_sequence] = new Array();
+    editorRelKeys[editor_sequence]["primary"] = fo_obj[primary_key];
+    editorRelKeys[editor_sequence]["content"] = fo_obj[content_key];
+    editorRelKeys[editor_sequence]["func"] = editorGetContent_xe;
+
+    // saved document(자동저장 문서)에 대한 확인
+    if(typeof(fo_obj._saved_doc_title)!="undefined" ) { ///<< _saved_doc_title field가 없으면 자동저장 하지 않음
+
+        var saved_title = fo_obj._saved_doc_title.value;
+        var saved_content = fo_obj._saved_doc_content.value;
+
+        if(saved_title || saved_content) {
+            // 자동저장된 문서 활용여부를 물은 후 사용하지 않는다면 자동저장된 문서 삭제
+            if(confirm(fo_obj._saved_doc_message.value)) {
+                if(typeof(fo_obj.title)!='undefined') fo_obj.title.value = saved_title;
+                editorRelKeys[editor_sequence]['content'].value = saved_content;
+
+                var param = new Array();
+                param['editor_sequence'] = editor_sequence;
+                param['primary_key'] = primary_key;
+                param['mid'] = current_mid;
+                var response_tags = new Array("error","message","editor_sequence","key","title","content","document_srl");
+                exec_xml('editor',"procEditorLoadSavedDocument", param, getAutoSavedSrl, response_tags);
+            } else {
+                editorRemoveSavedDoc();
+            }
+        }
+    }
+
+    // 대상 form의 content element에서 데이터를 구함
+    var content = editorRelKeys[editor_sequence]['content'].value;
+
+    // IE가 아니고 내용이 없으면 <br /> 추가 (FF등에서 iframe 선택시 focus를 주기 위한 꽁수)
+    if(!content && !xIE4Up) content = "<br />";
+
+    // IE일 경우 ctrl-Enter 안내 문구를 노출
+    var ieHelpObj = xGetElementById("for_ie_help_"+editor_sequence);
+    if(xIE4Up && ieHelpObj) {
+        ieHelpObj.style.display = "block";
+    }
+
+    // content 생성
+    editor_path = editor_path.replace(/^\.\//ig, '');
+    var contentHtml = ''+
+        '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'+
+        '<html xmlns="http://www.w3.org/1999/xhtml><head><meta http-equiv="content-type" content="text/html; charset=utf-8"/>'+
+        '<style type="text/css">'+
+        'body {font-size:.75em; line-height:1.6; font-family:Sans-serif; height:'+editor_height+'px; padding:0; margin:0; background-color:transparent; color:'+font_color+';}'+
+        '</style>'+
+        '</head><body editor_sequence="'+editor_sequence+'">'+
+        content+
+        '</body></html>'+
+        '';
+    iframe_obj.contentWindow.document.open("text/html","replace");
+    iframe_obj.contentWindow.document.write(contentHtml);
+    iframe_obj.contentWindow.document.close();
+
+    // editorMode를 기본으로 설정
+    editorMode[editor_sequence] = null;
+
+    // 에디터를 시작 시킴
+    try {
+        iframe_obj.contentWindow.document.designMode = 'On';
+    } catch(e) {
+    }
+
+    try {
+        iframe_obj.contentWindow.document.execCommand("undo", false, null);
+        iframe_obj.contentWindow.document.execCommand("useCSS", false, true);
+    }  catch (e) {
+    }
+
+    /**
+     * 더블클릭이나 키눌림등의 각종 이벤트에 대해 listener 추가
+     * 작성시 필요한 이벤트 체크
+     * 이 이벤트의 경우 윈도우 sp1 (NT or xp sp1) 에서 iframe_obj.contentWindow.document에 대한 권한이 없기에 try 문으로 감싸서
+     * 에러를 무시하도록 해야 함.
+     **/
+
+    // 위젯 감시를 위한 더블클릭 이벤트 걸기
+    try {
+        xAddEventListener(iframe_obj.contentWindow.document,'dblclick',editorSearchComponent);
+    } catch(e) {
+    }
+
+    // 에디터에서 키가 눌러질때마다 이벤트를 체크함 (enter키의 처리나 FF에서 alt-s등을 처리)
+    try {
+        if(xIE4Up) xAddEventListener(iframe_obj.contentWindow.document, 'keydown',editorKeyPress);
+        else xAddEventListener(iframe_obj.contentWindow.document, 'keypress',editorKeyPress);
+    } catch(e) {
+    }
+
+    // 자동저장 필드가 있다면 자동 저장 기능 활성화
+    if(typeof(fo_obj._saved_doc_title)!="undefined" ) editorEnableAutoSave(fo_obj, editor_sequence);
+
+
+    // 좋지는 않으나;; 스타일 변형을 막기 위해 start 할때 html이면 바꿔주자
+    if (xGetCookie('editor_mode') == 'html'){
+        var iframe_obj = editorGetIFrame(editor_sequence);
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
+        textarea_obj = editorGetTextArea(editor_sequence);
+        textarea_obj.value = content;
+        xWidth(textarea_obj, xWidth(iframe_obj.parentNode));
+        xHeight(textarea_obj, xHeight(iframe_obj.parentNode));
+        editorMode[editor_sequence] = 'html';
+        if(xGetElementById('xeEditor_'+editor_sequence)) {
+            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor html';
+            xGetElementById('use_rich_'+editor_sequence).className = '';
+            xGetElementById('preview_html_'+editor_sequence).className = '';
+            xGetElementById('use_html_'+editor_sequence).className = 'active';
+        }
+    }
+}
+
+
+/**
+ * 에디터의 세부 설정과 데이터 핸들링을 정의한 함수들
+ **/
+
+
+
+/**
+ * 키 또는 마우스 이벤트 핸들링 정의 함수
+ **/
+
+// 입력 키에 대한 이벤트 체크
+function editorKeyPress(evt) {
+    var e = new xEvent(evt);
+
+    // 대상을 구함
+    var obj = e.target;
+    var body_obj = null;
+    if(obj.nodeName == "BODY") body_obj = obj;
+    else body_obj = obj.firstChild.nextSibling;
+    if(!body_obj) return;
+
+    // editor_sequence는 에디터의 body에 attribute로 정의되어 있음
+    var editor_sequence = body_obj.getAttribute("editor_sequence");
+    if(!editor_sequence) return;
+
+    // IE에서 enter키를 눌렀을때 P 태그 대신 BR 태그 입력
+    if (xIE4Up && !e.ctrlKey && !e.shiftKey && e.keyCode == 13 && !editorMode[editor_sequence]) {
+        var iframe_obj = editorGetIFrame(editor_sequence);
+        if(!iframe_obj) return;
+
+        var contentDocument = iframe_obj.contentWindow.document;
+
+        var obj = contentDocument.selection.createRange();
+
+        var pTag = obj.parentElement().tagName.toLowerCase();
+
+        switch(pTag) {
+            case 'li' :
+                    return;
+                break;
+            default :
+                    obj.pasteHTML("<br />");
+                break;
+        }
+        obj.select();
+        evt.cancelBubble = true;
+        evt.returnValue = false;
+        return;
+    }
+
+    // ctrl-S, alt-S 클릭시 submit하기
+    if( e.keyCode == 115 && (e.altKey || e.ctrlKey) ) {
+        // iframe 에디터를 찾음
+        var iframe_obj = editorGetIFrame(editor_sequence);
+        if(!iframe_obj) return;
+
+        // 대상 form을 찾음
+        var fo_obj = editorGetForm(editor_sequence);
+        if(!fo_obj) return;
+
+        // 데이터 동기화
+        editorRelKeys[editor_sequence]['content'].value = editorGetContent(editor_sequence);
+
+        // form문 전송
+        if(fo_obj.onsubmit) fo_obj.onsubmit();
+
+        // 이벤트 중단
+        evt.cancelBubble = true;
+        evt.returnValue = false;
+        xPreventDefault(evt);
+        xStopPropagation(evt);
+        return;
+    }
+
+    // ctrl-b, i, u, s 키에 대한 처리 (파이어폭스에서도 에디터 상태에서 단축키 쓰도록)
+    if (e.ctrlKey) {
+        // iframe 에디터를 찾음
+        var iframe_obj = editorGetIFrame(editor_sequence);
+        if(!iframe_obj) return;
+
+        // html 에디터 모드일 경우 이벤트 취소 시킴
+        if(editorMode[editor_sequence]) {
+            evt.cancelBubble = true;
+            evt.returnValue = false;
+            xPreventDefault(evt);
+            xStopPropagation(evt);
+            return;
+        }
+
+        switch(e.keyCode) {
+            // ctrl+1~6
+            case 49 :
+            case 50 :
+            case 51 :
+            case 52 :
+            case 53 :
+            case 54 :
+                    editorDo('formatblock',"<H"+(e.keyCode-48)+">",e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+            // ctrl+7
+            case 55 :
+                    editorDo('formatblock',"<P>",e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+            // ie에서 ctrlKey + enter일 경우 P 태그 입력
+            case 13 :
+                    if(xIE4Up) {
+                        if(e.target.parentElement.document.designMode!="On") return;
+                        var obj = e.target.parentElement.document.selection.createRange();
+                        obj.pasteHTML('<P>');
+                        obj.select();
+                        evt.cancelBubble = true;
+                        evt.returnValue = false;
+                        return;
+                    }
+            // bold
+            case 98 :
+                    editorDo('Bold',null,e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+            // italic
+            case 105 :
+                    editorDo('Italic',null,e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+            // underline
+            case 117 :
+                    editorDo('Underline',null,e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+            //RemoveFormat
+            case 100 :
+                    editorDo('RemoveFormat',null,e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+
+
+            // strike
+            /*
+            case 83 :
+            case 115 :
+                    editorDo('StrikeThrough',null,e.target);
+                    xPreventDefault(evt);
+                    xStopPropagation(evt);
+                break;
+            */
+        }
+    }
+}
+
+// 편집 기능 실행
+function editorDo(command, value, target) {
+
+    var doc = null;
+
+    // target이 object인지 editor_sequence인지에 따라 document를 구함
+    if(typeof(target)=="object") {
+        if(xIE4Up) doc = target.parentElement.document;
+        else doc = target.parentNode;
+    } else {
+        var iframe_obj = editorGetIFrame(target);
+        doc = iframe_obj.contentWindow.document;
+    }
+
+    var editor_sequence = doc.body.getAttribute('editor_sequence');
+    if(editorMode[editor_sequence]) return;
+
+    // 포커스
+    if(typeof(target)=="object") target.focus();
+    else editorFocus(target);
+
+    // 실행
+    doc.execCommand(command, false, value);
+
+    // 포커스
+    if(typeof(target)=="object") target.focus();
+    else editorFocus(target);
+}
+
+// 폰트를 변경
+function editorChangeFontName(obj,srl) {
+    var value = obj.options[obj.selectedIndex].value;
+    if(!value) return;
+    editorDo('FontName',value,srl);
+    obj.selectedIndex = 0;
+}
+
+function editorChangeFontSize(obj,srl) {
+    var value = obj.options[obj.selectedIndex].value;
+    if(!value) return;
+    editorDo('FontSize',value,srl);
+    obj.selectedIndex = 0;
+}
+
+function editorUnDo(obj,srl) {
+    editorDo('undo','',srl);
+    obj.selectedIndex = 0;
+}
+
+function editorReDo(obj,srl) {
+    editorDo('redo','',srl);
+    obj.selectedIndex = 0;
+}
+
+function editorChangeHeader(obj,srl) {
+    var value = obj.options[obj.selectedIndex].value;
+    if(!value) return;
+    value = "<"+value+">";
+    editorDo('formatblock',value,srl);
+    obj.selectedIndex = 0;
+}
+
+/**
+ * HTML 편집 기능 활성/비활성
+ **/
+
+function editorChangeMode(mode, editor_sequence) {
+
+    if(mode == 'html' || mode ==''){
+        var expire = new Date();
+        expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
+        xSetCookie('editor_mode', mode, expire);
+    }
+
+    var iframe_obj = editorGetIFrame(editor_sequence);
+    if(!iframe_obj) return;
+
+    var textarea_obj = editorGetTextArea(editor_sequence);
+    var preview_obj = editorGetPreviewArea(editor_sequence);
+    var contentDocument = iframe_obj.contentWindow.document;
+
+    var html = null;
+    if(editorMode[editor_sequence]=='html') {
+        html = textarea_obj.value;
+        contentDocument.body.innerHTML = textarea_obj.value;
+    } else if (editorMode[editor_sequence]=='preview') {
+//        html = xInnerHtml(preview_obj);
+        html = textarea_obj.value;
+        preview_obj.contentWindow.document.body.innerHTML = '';
+//        xAddEventListener(xGetElementById('editor_preview_'+editor_sequence), 'load', function(){setPreviewHeight(editor_sequence)});
+    } else {
+        html = contentDocument.body.innerHTML;
+        textarea_obj.value = html
+        html = html.replace(/<br>/ig,"<br />\n");
+        html = html.replace(/<br \/>\n\n/ig,"<br />\n");
+    }
+
+    // html 편집 사용시
+    if(mode == 'html' && textarea_obj) {
+        preview_obj.style.display='none';
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
+        textarea_obj.value = html;
+        xWidth(textarea_obj, xWidth(iframe_obj.parentNode));
+        xHeight(textarea_obj, xHeight(iframe_obj.parentNode));
+        editorMode[editor_sequence] = 'html';
+
+        if(xGetElementById('xeEditor_'+editor_sequence)) {
+            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor html';
+            xGetElementById('use_rich_'+editor_sequence).className = '';
+            xGetElementById('preview_html_'+editor_sequence).className = '';
+            xGetElementById('use_html_'+editor_sequence).className = 'active';
+        }
+    // 미리보기
+    } else if(mode == 'preview' && preview_obj) {
+        preview_obj.style.display='';
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='none';
+
+        var fo_obj = xGetElementById("preview_form");
+        if(!fo_obj) {
+            fo_obj = xCreateElement('form');
+            fo_obj.id = "preview_form";
+            fo_obj.method = "post";
+            fo_obj.action = request_uri;
+            fo_obj.target = "editor_preview_"+editor_sequence;
+            xInnerHtml(fo_obj,'<input type="hidden" name="module" value="editor" /><input type="hidden" name="editor_sequence" value="'+editor_sequence+'" /><input type="hidden" name="act" value="dispEditorPreview" /><input type="hidden" name="content" />');
+            document.body.appendChild(fo_obj);
+        }
+        fo_obj.content.value = html;
+        fo_obj.submit();
+
+        xWidth(preview_obj, xWidth(iframe_obj.parentNode));
+        editorMode[editor_sequence] = 'preview';
+
+        if(xGetElementById('xeEditor_'+editor_sequence)) {
+            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor preview';
+            xGetElementById('use_rich_'+editor_sequence).className = '';
+            xGetElementById('preview_html_'+editor_sequence).className = 'active';
+            if(xGetElementById('use_html_'+editor_sequence)) xGetElementById('use_html_'+editor_sequence).className = '';
+        }
+    // 위지윅 모드 사용시
+    } else {
+        preview_obj.style.display='none';
+        if(xGetElementById('fileUploader_'+editor_sequence)) xGetElementById('fileUploader_'+editor_sequence).style.display='block';
+        contentDocument.body.innerHTML = html;
+        editorMode[editor_sequence] = null;
+
+        if(xGetElementById('xeEditor_'+editor_sequence)) {
+            xGetElementById('xeEditor_'+editor_sequence).className = 'xeEditor rich';
+            xGetElementById('use_rich_'+editor_sequence).className = 'active';
+            xGetElementById('preview_html_'+editor_sequence).className = '';
+            if(xGetElementById('use_html_'+editor_sequence)) xGetElementById('use_html_'+editor_sequence).className = '';
+        }
+    }
+
+}
+
+// Editor Info Close
+function closeEditorInfo(editor_sequence) {
+    xGetElementById('editorInfo_'+editor_sequence).style.display='none';
+    var expire = new Date();
+    expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
+    xSetCookie('EditorInfo', '1', expire);
+}
+
+
+function showEditorHelp(e,editor_sequence){
+	jQuery('#helpList_'+editor_sequence).toggleClass('open');
+}
+
+function showEditorExtension(evt,editor_sequence){
+    var oid = '#editorExtension_'+editor_sequence;
+    var e = new xEvent(evt);
+    if(jQuery(oid).hasClass('extension2')){
+		jQuery(oid).addClass('open');
+
+        if(e.pageX <= xWidth('editor_component_'+editor_sequence)){
+			jQuery('#editor_component_'+editor_sequence).css('right','auto').css('left', 0);
+        }else{
+			jQuery('#editor_component_'+editor_sequence).css('right', 0).css('left', 'auto');
+        }
+    }else{
+		jQuery(oid).attr('class', 'extension2');
+    }
+}
+
+function showPreviewContent(editor_sequence) {
+    if(typeof(editor_sequence)=='undefined') return;
+    if(typeof(_editorFontColor[editor_sequence])=='undefined') return;
+    var preview_obj = editorGetPreviewArea(editor_sequence);
+    preview_obj.contentWindow.document.body.style.color = _editorFontColor[editor_sequence];
+}
+
+function setPreviewHeight(editor_sequence){
+    var h = xGetElementById('editor_preview_'+editor_sequence).contentWindow.document.body.scrollHeight;
+    if(h < 400) h=400;
+    xHeight('editor_preview_'+editor_sequence,h+20);
+}
+
+function getAutoSavedSrl(ret_obj, response_tags, c) {
+    var editor_sequence = ret_obj['editor_sequence'];
+    var primary_key = ret_obj['key'];
+    var fo_obj = editorGetForm(editor_sequence);
+
+    fo_obj[primary_key].value = ret_obj['document_srl'];
+    if(uploadSettingObj[editor_sequence]) editorUploadInit(uploadSettingObj[editor_sequence], true);
+}
diff --git a/modules/editor/tpl/js/editor_admin.js b/modules/editor/tpl/js/editor_admin.js
index 50ee127c8..1c8966f7a 100644
--- a/modules/editor/tpl/js/editor_admin.js
+++ b/modules/editor/tpl/js/editor_admin.js
@@ -1,43 +1,17 @@
-/**
- * @author NHN (developers@xpressengine.com)
- * @version 0.1
- * @brief 에디터 관리자 페이지용 스크립트 
- **/
-
-function doEnableComponent(component_name) {
-    var params = new Array();
-    params['component_name'] = component_name;
-
-    exec_xml('editor', 'procEditorAdminEnableComponent', params, completeUpdate);
-}
-
-function doDisableComponent(component_name) {
-    var params = new Array();
-    params['component_name'] = component_name;
-
-    exec_xml('editor', 'procEditorAdminDisableComponent', params, completeUpdate);
-}
-
-function doMoveListOrder(component_name, mode) {
-    var params = new Array();
-    params['component_name'] = component_name;
-    params['mode'] = mode;
-
-    exec_xml('editor', 'procEditorAdminMoveListOrder', params, completeUpdate);
-}
-
-function completeUpdate(ret_obj) {
-    location.reload();
-}
-
-function doSetupComponent(component_name) {
-    popopen(request_uri.setQuery('module','editor').setQuery('act','dispEditorAdminSetupComponent').setQuery('component_name',component_name), 'SetupComponent');
-}
-
-function toggleSectionCheckBox(obj, id) {
-    var box_list = xGetElementsByTagName('input', xGetElementById(id));
-    if(typeof(box_list.length)=='undefined') return;
-    for(var i in box_list) {
-        box_list[i].checked = obj.checked;
-    }
-}
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @version 0.1
+ * @brief 에디터 관리자 페이지용 스크립트 
+ **/ 
+ 
+function doSetupComponent(component_name) {
+    popopen(request_uri.setQuery('module','editor').setQuery('act','dispEditorAdminSetupComponent').setQuery('component_name',component_name), 'SetupComponent');
+}
+
+function toggleSectionCheckBox(obj, id) {
+    var box_list = xGetElementsByTagName('input', xGetElementById(id));
+    if(typeof(box_list.length)=='undefined') return;
+    for(var i in box_list) {
+        box_list[i].checked = obj.checked;
+    }
+}
diff --git a/modules/editor/tpl/js/editor_common.min.js b/modules/editor/tpl/js/editor_common.min.js
new file mode 100644
index 000000000..bb3329b00
--- /dev/null
+++ b/modules/editor/tpl/js/editor_common.min.js
@@ -0,0 +1 @@
+function editorGetSelectedHtml(a){var b=editorGetIFrame(a);if(jQuery.isFunction(b.getSelectedHTML)){return b.getSelectedHTML()}else if(xIE4Up){var c=b.contentWindow.document.selection.createRange();var d=c.htmlText;return d}else{var c=b.contentWindow.getSelection().getRangeAt(0);var e=xCreateElement("div");e.appendChild(c.cloneContents());var d=xInnerHtml(e);return d}}function editorReplaceHTML(a,b){var c=/src=("|\'){1}(\.\/)?(files\/attach|files\/cache|files\/faceOff|files\/member_extra_info|modules|common|widgets|widgetstyle|layouts|addons)\/([^"\']+)\.(jpg|jpeg|png|gif)("|\'){1}/g;b=b.replace(c,'src="'+request_uri+'$3/$4.$5"');var d=/href=("|\'){1}(\.\/)?\?([^"\']+)("|\'){1}/g;b=b.replace(d,'href="'+request_uri+'?$3"');var e=a.editor_sequence||a.contentWindow.document.body.getAttribute("editor_sequence");try{a.contentWindow.focus()}catch(f){}if(jQuery.isFunction(a.replaceHTML)){a.replaceHTML(b)}else if(xIE4Up){var g=a.contentWindow.document.selection.createRange();if(g.pasteHTML){g.pasteHTML(b)}else if(editorPrevNode){editorPrevNode.outerHTML=b}}else{try{if(a.contentWindow.getSelection().focusNode.tagName=="HTML"){var g=a.contentDocument.createRange();g.setStart(a.contentDocument.body,0);g.setEnd(a.contentDocument.body,0);g.insertNode(g.createContextualFragment(b))}else{var g=a.contentWindow.getSelection().getRangeAt(0);g.deleteContents();g.insertNode(g.createContextualFragment(b))}}catch(f){xInnerHtml(a.contentWindow.document.body,b+xInnerHtml(a.contentWindow.document.body))}}}function editorSearchComponent(a){var b=new xEvent(a);editorPrevNode=null;var c=b.target;if(c.getAttribute("widget")){var d=c;while(d&&d.nodeName!="BODY"){d=xParent(d)}if(!d||d.nodeName!="BODY"||!d.getAttribute("editor_sequence")){editorPrevNode=null;return}var e=d.getAttribute("editor_sequence");var f=c.getAttribute("widget");editorPrevNode=c;if(editorMode[e]=="html")return;popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+f+"&module_srl="+e,"GenerateCodeInPage");return}if(!c.getAttribute("editor_component")){while(c&&!c.getAttribute("editor_component")){if(c.parentElement)c=c.parentElement;else c=xParent(c)}}if(!c)c=b.target;var g=c.getAttribute("editor_component");if(!g){if(c.nodeName=="IMG"){g="image_link";editorPrevNode=c}}else{editorPrevNode=c}if(!g){editorPrevNode=null;return}var d=c;while(d&&d.nodeName!="BODY"){d=xParent(d)}if(!d||d.nodeName!="BODY"||!d.getAttribute("editor_sequence")){editorPrevNode=null;return}var e=d.getAttribute("editor_sequence");openComponent(g,e)}function openComponent(a,b,c){editorPrevSrl=b;if(editorMode[b]=="html")return;var d=request_uri+"?module=editor&act=dispEditorPopup&editor_sequence="+b+"&component="+a;if(typeof c!="undefined"&&c)d+="&manual_url="+escape(c);popopen(d,"editorComponent")}function editorEventCheck(a){editorPrevNode=null;var b=a.target.id;if(!b)return;var c=b.split("_");if(c[0]!="component")return;var d=c[1];var e=b.replace(/^component_[0-9]+_/,"");if(!d||!e)return;if(editorMode[d]=="html")return;switch(e){case"Bold":case"Italic":case"Underline":case"StrikeThrough":case"undo":case"redo":case"JustifyLeft":case"JustifyCenter":case"JustifyRight":case"JustifyFull":case"Indent":case"Outdent":case"InsertOrderedList":case"InsertUnorderedList":case"SaveAs":case"Print":case"Copy":case"Cut":case"Paste":case"RemoveFormat":case"Subscript":case"Superscript":editorDo(e,"",d);break;default:openComponent(e,d);return false}return}function eOptionClick(a){a.style.marginTop="-42px";a.style.zIndex="99"}function eOptionOut(a){a.style.marginTop="0";a.style.zIndex="1"}function eOptionOver(a){a.style.marginTop="-21px";a.style.zIndex="99"}function editorGetTextarea(a){return document.getElementById("editor_textarea_"+a)}function editorGetIFrame(a){if(editorRelKeys!=undefined&&editorRelKeys[a]!=undefined&&editorRelKeys[a]["editor"]!=undefined)return editorRelKeys[a]["editor"].getFrame(a);return document.getElementById("editor_iframe_"+a)}function editorRemoveSavedDoc(){var a=new Array;a["mid"]=current_mid;exec_xml("editor","procEditorRemoveSavedDoc",a)}function _editorAutoSave(a,b){var c=editorAutoSaveObj.fo_obj;var d=editorAutoSaveObj.editor_sequence;if(!a){clearTimeout(editorEnableAutoSave.timer);editorEnableAutoSave.timer=setTimeout(function(){_editorAutoSave(a,b)},5e4)}if(editorAutoSaveObj.locked==true)return;if(!c||typeof c.title=="undefined"||!d)return;var e=c.title.value;var f="";try{f=editorGetContent(d)}catch(g){}if(e!=editorAutoSaveObj.title||f!=editorAutoSaveObj.content||a){var h,i=new Date;h={title:e,content:f,mid:current_mid,document_srl:editorRelKeys[d]["primary"].value};editorAutoSaveObj.title=e;editorAutoSaveObj.content=f;jQuery("#editor_autosaved_message_"+d).text(i.getHours()+":"+i.getMinutes()+" "+auto_saved_msg).show(300);editorAutoSaveObj.locked=true;show_waiting_message=false;exec_xml("editor","procEditorSaveDoc",h,function(){var a=jQuery.extend({},h,{auto_saved_msg:auto_saved_msg});editorAutoSaveObj.locked=false;if(jQuery.isFunction(b))b(a)});show_waiting_message=true}}function editorEnableAutoSave(a,b,c){var d=a.title.value;var e=editorRelKeys[b]["content"].value;editorAutoSaveObj={fo_obj:a,editor_sequence:b,title:d,content:e,locked:false};clearTimeout(editorEnableAutoSave.timer);editorEnableAutoSave.timer=setTimeout(function(){_editorAutoSave(false,c)},5e4)}function editorFocus(a){try{var b=editorGetIFrame(a);if(jQuery.isFunction(b.setFocus)){b.setFocus()}else{b.contentWindow.focus()}}catch(c){}}function editorGetContent(a){var b=editorRelKeys[a]["func"](a);var c=new RegExp(request_uri.replace(/\//g,"\\/")+"(files|common|modules|layouts|widgets)","ig");return b.replace(c,"$1")}var editorMode=new Array;var editorAutoSaveObj={fo_obj:null,editor_sequence:0,title:"",content:"",locked:false};var editorRelKeys=new Array;var editorDragObj={isDrag:false,y:0,obj:null,id:"",det:0,source_height:0};editorEnableAutoSave.timer=null;var editorPrevSrl=null;jQuery(document).click(editorEventCheck);var editorPrevNode=null;(function(a){function j(h){a("#xeEditorMask_"+e).hide();if(!b)return;a(document).unbind("mousemove",i);if(a.isFunction(window.fixAdminLayoutFooter)){var j=parseInt(g.eq(0).css("height"))-d;fixAdminLayoutFooter(j)}b=false;c=0;f=null;g=null;e="";return false}function i(f){if(!b){a("#xeEditorMask_"+e).hide();return}var h=f.pageY-c;g.css("height",d+h+"px");return false}function h(h){var j=a(h.target);var k=j.attr("id");if(!k||!/^editor_drag_bar_(.+)$/.test(k))return;b=true;c=h.pageY;f=j;e=RegExp.$1;var l=a(editorGetIFrame(e));var m=a(editorGetTextarea(e));var n=a("#editor_preview_"+e);var o=l.is(":visible")?l:m;d=parseInt(o.css("height"));g=a([l[0],m[0]]);if(n.length)g.add(n[0]);if(!isNaN(d)||!d){var p=o[0].offsetHeight;o.css("height",p+"px");var q=o[0].offsetHeight;d=p*2-q;g.css("height",d+"px")}a("#xeEditorMask_"+e).show();a(document).mousemove(i);return false}var b=false;var c=0;var d=0;var e="";var f=null;var g=null})(jQuery)
\ No newline at end of file
diff --git a/modules/editor/tpl/js/editor_module_config.js b/modules/editor/tpl/js/editor_module_config.js
index 6e90b2a14..b3b440b18 100644
--- a/modules/editor/tpl/js/editor_module_config.js
+++ b/modules/editor/tpl/js/editor_module_config.js
@@ -1,37 +1,44 @@
-function getEditorSkinColorList(skin_name,selected_colorset,type){
-    if(skin_name.length>0){
-        type = type || 'document';
-        var response_tags = new Array('error','message','colorset');
-        exec_xml('editor','dispEditorSkinColorset',{skin:skin_name},resultGetEditorSkinColorList,response_tags,{'selected_colorset':selected_colorset,'type':type});
-    }
-}
-
-function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
-
-    var selectbox = null;
-    if(params.type == 'document'){
-        selectbox = xGetElementById("sel_editor_colorset");
-    }else{
-        selectbox = xGetElementById("sel_comment_editor_colorset");
-    }
-
-    if(ret_obj['error'] == 0 && ret_obj.colorset){
-        var it = new Array();
-        var items = ret_obj['colorset']['item'];
-        if(typeof(items[0]) == 'undefined'){
-            it[0] = items;
-        }else{
-            it = items;
-        }
-        var sel = 0;
-        for(var i=0,c=it.length;i<c;i++){
-            selectbox.options[i]=new Option(it[i].title,it[i].name);
-            if(params.selected_colorset && params.selected_colorset == it[i].name) sel = i;
-        }
-        selectbox.options[sel].selected = true;
-        selectbox.style.display="";
-    }else{
-        selectbox.style.display="none";
-        selectbox.innerHTML="";
-    }
-}
+function getEditorSkinColorList(skin_name,selected_colorset,type,testid){
+    if(skin_name.length>0){
+        type = type || 'document';
+        var response_tags = new Array('error','message','colorset');
+        exec_xml('editor','dispEditorSkinColorset',{skin:skin_name},resultGetEditorSkinColorList,response_tags,{'selected_colorset':selected_colorset,'type':type,'testid':testid});
+    }
+}
+
+function resultGetEditorSkinColorList(ret_obj,response_tags, params) {
+    var selectbox = null;
+	jQuery(function($){
+		selectbox = jQuery("#"+params.testid).next('label').next('select');
+		selectbox.html('');
+		
+		if(params.type == 'document'){
+			$("select[name=sel_editor_colorset]").css('display','none');				
+			$("select[name=sel_editor_colorset]").removeAttr('name');			
+			selectbox.attr('name','sel_editor_colorset');			
+		}else{
+			$("select[name=sel_comment_editor_colorset]").css('display','none');				
+			$("select[name=sel_comment_editor_colorset]").removeAttr('name');			
+			selectbox.attr('name','sel_comment_editor_colorset');			
+		}	
+
+		if(ret_obj['error'] == 0 && ret_obj.colorset){	
+			var it = new Array();
+			
+			var items = ret_obj['colorset']['item'];	
+			if(typeof(items[0]) == 'undefined'){
+				it[0] = items;
+			}else{
+				it = items;
+			}			
+			var selectAttr = "";
+			for(var i=0;i<it.length;i++){
+				selectbox.append($('<option value="'+it[i].name+'" >'+it[i].title+'</option>'));				
+			}
+			selectbox.css('display','');
+		}else{
+			selectbox.css('display','none');
+			selectbox.innerHTML="";
+		}
+	});
+}
diff --git a/modules/editor/tpl/js/swfupload.js b/modules/editor/tpl/js/swfupload.js
index 969e2008f..e65b19cb2 100644
--- a/modules/editor/tpl/js/swfupload.js
+++ b/modules/editor/tpl/js/swfupload.js
@@ -1,980 +1,980 @@
-/**
- * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
- *
- * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
- *
- * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
- * http://www.opensource.org/licenses/mit-license.php
- *
- */
-
-
-/* ******************* */
-/* Constructor & Init  */
-/* ******************* */
-var SWFUpload;
-
-if (SWFUpload == undefined) {
-	SWFUpload = function (settings) {
-		this.initSWFUpload(settings);
-	};
-}
-
-SWFUpload.prototype.initSWFUpload = function (settings) {
-	try {
-		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
-		this.settings = settings;
-		this.eventQueue = [];
-		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
-		this.movieElement = null;
-
-
-		// Setup global control tracking
-		SWFUpload.instances[this.movieName] = this;
-
-		// Load the settings.  Load the Flash movie.
-		this.initSettings();
-		this.loadFlash();
-		this.displayDebugInfo();
-	} catch (ex) {
-		delete SWFUpload.instances[this.movieName];
-		throw ex;
-	}
-};
-
-/* *************** */
-/* Static Members  */
-/* *************** */
-SWFUpload.instances = {};
-SWFUpload.movieCount = 0;
-SWFUpload.version = "2.2.0 2009-03-25";
-SWFUpload.QUEUE_ERROR = {
-	QUEUE_LIMIT_EXCEEDED	  		: -100,
-	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
-	ZERO_BYTE_FILE			  		: -120,
-	INVALID_FILETYPE		  		: -130
-};
-SWFUpload.UPLOAD_ERROR = {
-	HTTP_ERROR				  		: -200,
-	MISSING_UPLOAD_URL	      		: -210,
-	IO_ERROR				  		: -220,
-	SECURITY_ERROR			  		: -230,
-	UPLOAD_LIMIT_EXCEEDED	  		: -240,
-	UPLOAD_FAILED			  		: -250,
-	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
-	FILE_VALIDATION_FAILED	  		: -270,
-	FILE_CANCELLED			  		: -280,
-	UPLOAD_STOPPED					: -290
-};
-SWFUpload.FILE_STATUS = {
-	QUEUED		 : -1,
-	IN_PROGRESS	 : -2,
-	ERROR		 : -3,
-	COMPLETE	 : -4,
-	CANCELLED	 : -5
-};
-SWFUpload.BUTTON_ACTION = {
-	SELECT_FILE  : -100,
-	SELECT_FILES : -110,
-	START_UPLOAD : -120
-};
-SWFUpload.CURSOR = {
-	ARROW : -1,
-	HAND : -2
-};
-SWFUpload.WINDOW_MODE = {
-	WINDOW : "window",
-	TRANSPARENT : "transparent",
-	OPAQUE : "opaque"
-};
-
-// Private: takes a URL, determines if it is relative and converts to an absolute URL
-// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
-SWFUpload.completeURL = function(url) {
-	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
-		return url;
-	}
-	
-	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
-	
-	var indexSlash = window.location.pathname.lastIndexOf("/");
-	if (indexSlash <= 0) {
-		path = "/";
-	} else {
-		path = window.location.pathname.substr(0, indexSlash) + "/";
-	}
-	
-	return /*currentURL +*/ path + url;
-	
-};
-
-
-/* ******************** */
-/* Instance Members  */
-/* ******************** */
-
-// Private: initSettings ensures that all the
-// settings are set, getting a default value if one was not assigned.
-SWFUpload.prototype.initSettings = function () {
-	this.ensureDefault = function (settingName, defaultValue) {
-		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
-	};
-	
-	// Upload backend settings
-	this.ensureDefault("upload_url", "");
-	this.ensureDefault("preserve_relative_urls", false);
-	this.ensureDefault("file_post_name", "Filedata");
-	this.ensureDefault("post_params", {});
-	this.ensureDefault("use_query_string", false);
-	this.ensureDefault("requeue_on_error", false);
-	this.ensureDefault("http_success", []);
-	this.ensureDefault("assume_success_timeout", 0);
-	
-	// File Settings
-	this.ensureDefault("file_types", "*.*");
-	this.ensureDefault("file_types_description", "All Files");
-	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
-	this.ensureDefault("file_upload_limit", 0);
-	this.ensureDefault("file_queue_limit", 0);
-
-	// Flash Settings
-	this.ensureDefault("flash_url", "swfupload.swf");
-	this.ensureDefault("prevent_swf_caching", true);
-	
-	// Button Settings
-	this.ensureDefault("button_image_url", "");
-	this.ensureDefault("button_width", 1);
-	this.ensureDefault("button_height", 1);
-	this.ensureDefault("button_text", "");
-	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
-	this.ensureDefault("button_text_top_padding", 0);
-	this.ensureDefault("button_text_left_padding", 0);
-	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
-	this.ensureDefault("button_disabled", false);
-	this.ensureDefault("button_placeholder_id", "");
-	this.ensureDefault("button_placeholder", null);
-	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
-	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
-	
-	// Debug Settings
-	this.ensureDefault("debug", false);
-	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
-	
-	// Event Handlers
-	this.settings.return_upload_start_handler = this.returnUploadStart;
-	this.ensureDefault("swfupload_loaded_handler", null);
-	this.ensureDefault("file_dialog_start_handler", null);
-	this.ensureDefault("file_queued_handler", null);
-	this.ensureDefault("file_queue_error_handler", null);
-	this.ensureDefault("file_dialog_complete_handler", null);
-	
-	this.ensureDefault("upload_start_handler", null);
-	this.ensureDefault("upload_progress_handler", null);
-	this.ensureDefault("upload_error_handler", null);
-	this.ensureDefault("upload_success_handler", null);
-	this.ensureDefault("upload_complete_handler", null);
-	
-	this.ensureDefault("debug_handler", this.debugMessage);
-
-	this.ensureDefault("custom_settings", {});
-
-	// Other settings
-	this.customSettings = this.settings.custom_settings;
-	
-	// Update the flash url if needed
-	if (!!this.settings.prevent_swf_caching) {
-		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
-	}
-	
-	if (!this.settings.preserve_relative_urls) {
-		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
-		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
-		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
-	}
-	
-	delete this.ensureDefault;
-};
-
-// Private: loadFlash replaces the button_placeholder element with the flash movie.
-SWFUpload.prototype.loadFlash = function () {
-	var targetElement, tempParent;
-
-	// Make sure an element with the ID we are going to use doesn't already exist
-	if (document.getElementById(this.movieName) !== null) {
-		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
-	}
-
-	// Get the element where we will be placing the flash movie
-	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
-
-	if (targetElement == undefined) {
-		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
-	}
-
-	// Append the container and load the flash
-	tempParent = document.createElement("div");
-	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
-	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
-
-	// Fix IE Flash/Form bug
-	if (window[this.movieName] == undefined) {
-		window[this.movieName] = this.getMovieElement();
-	}
-	
-};
-
-// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
-SWFUpload.prototype.getFlashHTML = function () {
-	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
-	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
-				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
-				'<param name="movie" value="', this.settings.flash_url, '" />',
-				'<param name="quality" value="high" />',
-				'<param name="menu" value="false" />',
-				'<param name="allowScriptAccess" value="always" />',
-				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
-				'</object>'].join("");
-};
-
-// Private: getFlashVars builds the parameter string that will be passed
-// to flash in the flashvars param.
-SWFUpload.prototype.getFlashVars = function () {
-	// Build a string from the post param object
-	var paramString = this.buildParamString();
-	var httpSuccessString = this.settings.http_success.join(",");
-	
-	// Build the parameter string
-	return ["movieName=", encodeURIComponent(this.movieName),
-			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
-			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
-			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
-			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
-			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
-			"&amp;params=", encodeURIComponent(paramString),
-			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
-			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
-			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
-			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
-			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
-			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
-			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
-			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
-			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
-			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
-			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
-			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
-			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
-			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
-			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
-			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
-			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
-		].join("");
-};
-
-// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
-// The element is cached after the first lookup
-SWFUpload.prototype.getMovieElement = function () {
-	if (this.movieElement == undefined) {
-		this.movieElement = document.getElementById(this.movieName);
-	}
-
-	if (this.movieElement === null) {
-		throw "Could not find Flash element";
-	}
-	
-	return this.movieElement;
-};
-
-// Private: buildParamString takes the name/value pairs in the post_params setting object
-// and joins them up in to a string formatted "name=value&amp;name=value"
-SWFUpload.prototype.buildParamString = function () {
-	var postParams = this.settings.post_params; 
-	var paramStringPairs = [];
-
-	if (typeof(postParams) === "object") {
-		for (var name in postParams) {
-			if (postParams.hasOwnProperty(name)) {
-				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
-			}
-		}
-	}
-
-	return paramStringPairs.join("&amp;");
-};
-
-// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
-// all references to the SWF, and other objects so memory is properly freed.
-// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
-// Credits: Major improvements provided by steffen
-SWFUpload.prototype.destroy = function () {
-	try {
-		// Make sure Flash is done before we try to remove it
-		this.cancelUpload(null, false);
-		
-
-		// Remove the SWFUpload DOM nodes
-		var movieElement = null;
-		movieElement = this.getMovieElement();
-		
-		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
-			for (var i in movieElement) {
-				try {
-					if (typeof(movieElement[i]) === "function") {
-						movieElement[i] = null;
-					}
-				} catch (ex1) {}
-			}
-
-			// Remove the Movie Element from the page
-			try {
-				movieElement.parentNode.removeChild(movieElement);
-			} catch (ex) {}
-		}
-		
-		// Remove IE form fix reference
-		window[this.movieName] = null;
-
-		// Destroy other references
-		SWFUpload.instances[this.movieName] = null;
-		delete SWFUpload.instances[this.movieName];
-
-		this.movieElement = null;
-		this.settings = null;
-		this.customSettings = null;
-		this.eventQueue = null;
-		this.movieName = null;
-		
-		
-		return true;
-	} catch (ex2) {
-		return false;
-	}
-};
-
-
-// Public: displayDebugInfo prints out settings and configuration
-// information about this SWFUpload instance.
-// This function (and any references to it) can be deleted when placing
-// SWFUpload in production.
-SWFUpload.prototype.displayDebugInfo = function () {
-	this.debug(
-		[
-			"---SWFUpload Instance Info---\n",
-			"Version: ", SWFUpload.version, "\n",
-			"Movie Name: ", this.movieName, "\n",
-			"Settings:\n",
-			"\t", "upload_url:               ", this.settings.upload_url, "\n",
-			"\t", "flash_url:                ", this.settings.flash_url, "\n",
-			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
-			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
-			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
-			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
-			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
-			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
-			"\t", "file_types:               ", this.settings.file_types, "\n",
-			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
-			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
-			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
-			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
-			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
-
-			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
-
-			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
-			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
-			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
-			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
-			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
-			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
-			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
-			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
-			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
-			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
-			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
-
-			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
-			"Event Handlers:\n",
-			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
-			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
-			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
-			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
-			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
-			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
-			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
-			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
-			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
-			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
-		].join("")
-	);
-};
-
-/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
-	the maintain v2 API compatibility
-*/
-// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
-SWFUpload.prototype.addSetting = function (name, value, default_value) {
-    if (value == undefined) {
-        return (this.settings[name] = default_value);
-    } else {
-        return (this.settings[name] = value);
-	}
-};
-
-// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
-SWFUpload.prototype.getSetting = function (name) {
-    if (this.settings[name] != undefined) {
-        return this.settings[name];
-	}
-
-    return "";
-};
-
-
-
-// Private: callFlash handles function calls made to the Flash element.
-// Calls are made with a setTimeout for some functions to work around
-// bugs in the ExternalInterface library.
-SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
-	argumentArray = argumentArray || [];
-	
-	var movieElement = this.getMovieElement();
-	var returnValue, returnString;
-
-	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
-	try {
-		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
-		returnValue = eval(returnString);
-	} catch (ex) {
-		throw "Call to " + functionName + " failed";
-	}
-	
-	// Unescape file post param values
-	if (returnValue != undefined && typeof returnValue.post === "object") {
-		returnValue = this.unescapeFilePostParams(returnValue);
-	}
-
-	return returnValue;
-};
-
-/* *****************************
-	-- Flash control methods --
-	Your UI should use these
-	to operate SWFUpload
-   ***************************** */
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFile causes a File Selection Dialog window to appear.  This
-// dialog only allows 1 file to be selected.
-SWFUpload.prototype.selectFile = function () {
-	this.callFlash("SelectFile");
-};
-
-// WARNING: this function does not work in Flash Player 10
-// Public: selectFiles causes a File Selection Dialog window to appear/ This
-// dialog allows the user to select any number of files
-// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
-// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
-// for this bug.
-SWFUpload.prototype.selectFiles = function () {
-	this.callFlash("SelectFiles");
-};
-
-
-// Public: startUpload starts uploading the first file in the queue unless
-// the optional parameter 'fileID' specifies the ID 
-SWFUpload.prototype.startUpload = function (fileID) {
-	this.callFlash("StartUpload", [fileID]);
-};
-
-// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
-// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
-// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
-SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
-	if (triggerErrorEvent !== false) {
-		triggerErrorEvent = true;
-	}
-	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
-};
-
-// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
-// If nothing is currently uploading then nothing happens.
-SWFUpload.prototype.stopUpload = function () {
-	this.callFlash("StopUpload");
-};
-
-/* ************************
- * Settings methods
- *   These methods change the SWFUpload settings.
- *   SWFUpload settings should not be changed directly on the settings object
- *   since many of the settings need to be passed to Flash in order to take
- *   effect.
- * *********************** */
-
-// Public: getStats gets the file statistics object.
-SWFUpload.prototype.getStats = function () {
-	return this.callFlash("GetStats");
-};
-
-// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
-// change the statistics but you can.  Changing the statistics does not
-// affect SWFUpload accept for the successful_uploads count which is used
-// by the upload_limit setting to determine how many files the user may upload.
-SWFUpload.prototype.setStats = function (statsObject) {
-	this.callFlash("SetStats", [statsObject]);
-};
-
-// Public: getFile retrieves a File object by ID or Index.  If the file is
-// not found then 'null' is returned.
-SWFUpload.prototype.getFile = function (fileID) {
-	if (typeof(fileID) === "number") {
-		return this.callFlash("GetFileByIndex", [fileID]);
-	} else {
-		return this.callFlash("GetFile", [fileID]);
-	}
-};
-
-// Public: addFileParam sets a name/value pair that will be posted with the
-// file specified by the Files ID.  If the name already exists then the
-// exiting value will be overwritten.
-SWFUpload.prototype.addFileParam = function (fileID, name, value) {
-	return this.callFlash("AddFileParam", [fileID, name, value]);
-};
-
-// Public: removeFileParam removes a previously set (by addFileParam) name/value
-// pair from the specified file.
-SWFUpload.prototype.removeFileParam = function (fileID, name) {
-	this.callFlash("RemoveFileParam", [fileID, name]);
-};
-
-// Public: setUploadUrl changes the upload_url setting.
-SWFUpload.prototype.setUploadURL = function (url) {
-	this.settings.upload_url = url.toString();
-	this.callFlash("SetUploadURL", [url]);
-};
-
-// Public: setPostParams changes the post_params setting
-SWFUpload.prototype.setPostParams = function (paramsObject) {
-	this.settings.post_params = paramsObject;
-	this.callFlash("SetPostParams", [paramsObject]);
-};
-
-// Public: addPostParam adds post name/value pair.  Each name can have only one value.
-SWFUpload.prototype.addPostParam = function (name, value) {
-	this.settings.post_params[name] = value;
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: removePostParam deletes post name/value pair.
-SWFUpload.prototype.removePostParam = function (name) {
-	delete this.settings.post_params[name];
-	this.callFlash("SetPostParams", [this.settings.post_params]);
-};
-
-// Public: setFileTypes changes the file_types setting and the file_types_description setting
-SWFUpload.prototype.setFileTypes = function (types, description) {
-	this.settings.file_types = types;
-	this.settings.file_types_description = description;
-	this.callFlash("SetFileTypes", [types, description]);
-};
-
-// Public: setFileSizeLimit changes the file_size_limit setting
-SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
-	this.settings.file_size_limit = fileSizeLimit;
-	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
-};
-
-// Public: setFileUploadLimit changes the file_upload_limit setting
-SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
-	this.settings.file_upload_limit = fileUploadLimit;
-	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
-};
-
-// Public: setFileQueueLimit changes the file_queue_limit setting
-SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
-	this.settings.file_queue_limit = fileQueueLimit;
-	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
-};
-
-// Public: setFilePostName changes the file_post_name setting
-SWFUpload.prototype.setFilePostName = function (filePostName) {
-	this.settings.file_post_name = filePostName;
-	this.callFlash("SetFilePostName", [filePostName]);
-};
-
-// Public: setUseQueryString changes the use_query_string setting
-SWFUpload.prototype.setUseQueryString = function (useQueryString) {
-	this.settings.use_query_string = useQueryString;
-	this.callFlash("SetUseQueryString", [useQueryString]);
-};
-
-// Public: setRequeueOnError changes the requeue_on_error setting
-SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
-	this.settings.requeue_on_error = requeueOnError;
-	this.callFlash("SetRequeueOnError", [requeueOnError]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
-	if (typeof http_status_codes === "string") {
-		http_status_codes = http_status_codes.replace(" ", "").split(",");
-	}
-	
-	this.settings.http_success = http_status_codes;
-	this.callFlash("SetHTTPSuccess", [http_status_codes]);
-};
-
-// Public: setHTTPSuccess changes the http_success setting
-SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
-	this.settings.assume_success_timeout = timeout_seconds;
-	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
-};
-
-// Public: setDebugEnabled changes the debug_enabled setting
-SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
-	this.settings.debug_enabled = debugEnabled;
-	this.callFlash("SetDebugEnabled", [debugEnabled]);
-};
-
-// Public: setButtonImageURL loads a button image sprite
-SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
-	if (buttonImageURL == undefined) {
-		buttonImageURL = "";
-	}
-	
-	this.settings.button_image_url = buttonImageURL;
-	this.callFlash("SetButtonImageURL", [buttonImageURL]);
-};
-
-// Public: setButtonDimensions resizes the Flash Movie and button
-SWFUpload.prototype.setButtonDimensions = function (width, height) {
-	this.settings.button_width = width;
-	this.settings.button_height = height;
-	
-	var movie = this.getMovieElement();
-	if (movie != undefined) {
-		movie.style.width = width + "px";
-		movie.style.height = height + "px";
-	}
-	
-	this.callFlash("SetButtonDimensions", [width, height]);
-};
-// Public: setButtonText Changes the text overlaid on the button
-SWFUpload.prototype.setButtonText = function (html) {
-	this.settings.button_text = html;
-	this.callFlash("SetButtonText", [html]);
-};
-// Public: setButtonTextPadding changes the top and left padding of the text overlay
-SWFUpload.prototype.setButtonTextPadding = function (left, top) {
-	this.settings.button_text_top_padding = top;
-	this.settings.button_text_left_padding = left;
-	this.callFlash("SetButtonTextPadding", [left, top]);
-};
-
-// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
-SWFUpload.prototype.setButtonTextStyle = function (css) {
-	this.settings.button_text_style = css;
-	this.callFlash("SetButtonTextStyle", [css]);
-};
-// Public: setButtonDisabled disables/enables the button
-SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
-	this.settings.button_disabled = isDisabled;
-	this.callFlash("SetButtonDisabled", [isDisabled]);
-};
-// Public: setButtonAction sets the action that occurs when the button is clicked
-SWFUpload.prototype.setButtonAction = function (buttonAction) {
-	this.settings.button_action = buttonAction;
-	this.callFlash("SetButtonAction", [buttonAction]);
-};
-
-// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
-SWFUpload.prototype.setButtonCursor = function (cursor) {
-	this.settings.button_cursor = cursor;
-	this.callFlash("SetButtonCursor", [cursor]);
-};
-
-/* *******************************
-	Flash Event Interfaces
-	These functions are used by Flash to trigger the various
-	events.
-	
-	All these functions a Private.
-	
-	Because the ExternalInterface library is buggy the event calls
-	are added to a queue and the queue then executed by a setTimeout.
-	This ensures that events are executed in a determinate order and that
-	the ExternalInterface bugs are avoided.
-******************************* */
-
-SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-	
-	if (argumentArray == undefined) {
-		argumentArray = [];
-	} else if (!(argumentArray instanceof Array)) {
-		argumentArray = [argumentArray];
-	}
-	
-	var self = this;
-	if (typeof this.settings[handlerName] === "function") {
-		// Queue the event
-		this.eventQueue.push(function () {
-			this.settings[handlerName].apply(this, argumentArray);
-		});
-		
-		// Execute the next queued event
-		setTimeout(function () {
-			self.executeNextEvent();
-		}, 0);
-		
-	} else if (this.settings[handlerName] !== null) {
-		throw "Event handler " + handlerName + " is unknown or is not a function";
-	}
-};
-
-// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
-// we must queue them in order to garentee that they are executed in order.
-SWFUpload.prototype.executeNextEvent = function () {
-	// Warning: Don't call this.debug inside here or you'll create an infinite loop
-
-	var  f = this.eventQueue ? this.eventQueue.shift() : null;
-	if (typeof(f) === "function") {
-		f.apply(this);
-	}
-};
-
-// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
-// properties that contain characters that are not valid for JavaScript identifiers. To work around this
-// the Flash Component escapes the parameter names and we must unescape again before passing them along.
-SWFUpload.prototype.unescapeFilePostParams = function (file) {
-	var reg = /[$]([0-9a-f]{4})/i;
-	var unescapedPost = {};
-	var uk;
-
-	if (file != undefined) {
-		for (var k in file.post) {
-			if (file.post.hasOwnProperty(k)) {
-				uk = k;
-				var match;
-				while ((match = reg.exec(uk)) !== null) {
-					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
-				}
-				unescapedPost[uk] = file.post[k];
-			}
-		}
-
-		file.post = unescapedPost;
-	}
-
-	return file;
-};
-
-// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
-SWFUpload.prototype.testExternalInterface = function () {
-	try {
-		return this.callFlash("TestExternalInterface");
-	} catch (ex) {
-		return false;
-	}
-};
-
-// Private: This event is called by Flash when it has finished loading. Don't modify this.
-// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
-SWFUpload.prototype.flashReady = function () {
-	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
-	var movieElement = this.getMovieElement();
-
-	if (!movieElement) {
-		this.debug("Flash called back ready but the flash movie can't be found.");
-		return;
-	}
-
-	this.cleanUp(movieElement);
-	
-	this.queueEvent("swfupload_loaded_handler");
-};
-
-// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
-// This function is called by Flash each time the ExternalInterface functions are created.
-SWFUpload.prototype.cleanUp = function (movieElement) {
-	// Pro-actively unhook all the Flash functions
-	try {
-		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
-			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
-			for (var key in movieElement) {
-				try {
-					if (typeof(movieElement[key]) === "function") {
-						movieElement[key] = null;
-					}
-				} catch (ex) {
-				}
-			}
-		}
-	} catch (ex1) {
-	
-	}
-
-	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
-	// it doesn't display errors.
-	window["__flash__removeCallback"] = function (instance, name) {
-		try {
-			if (instance) {
-				instance[name] = null;
-			}
-		} catch (flashEx) {
-		
-		}
-	};
-
-};
-
-
-/* This is a chance to do something before the browse window opens */
-SWFUpload.prototype.fileDialogStart = function () {
-	this.queueEvent("file_dialog_start_handler");
-};
-
-
-/* Called when a file is successfully added to the queue. */
-SWFUpload.prototype.fileQueued = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queued_handler", file);
-};
-
-
-/* Handle errors that occur when an attempt to queue a file fails. */
-SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
-};
-
-/* Called after the file dialog has closed and the selected files have been queued.
-	You could call startUpload here if you want the queued files to begin uploading immediately. */
-SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
-	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
-};
-
-SWFUpload.prototype.uploadStart = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("return_upload_start_handler", file);
-};
-
-SWFUpload.prototype.returnUploadStart = function (file) {
-	var returnValue;
-	if (typeof this.settings.upload_start_handler === "function") {
-		file = this.unescapeFilePostParams(file);
-		returnValue = this.settings.upload_start_handler.call(this, file);
-	} else if (this.settings.upload_start_handler != undefined) {
-		throw "upload_start_handler must be a function";
-	}
-
-	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
-	// interpretted as 'true'.
-	if (returnValue === undefined) {
-		returnValue = true;
-	}
-	
-	returnValue = !!returnValue;
-	
-	this.callFlash("ReturnUploadStart", [returnValue]);
-};
-
-
-
-SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
-};
-
-SWFUpload.prototype.uploadError = function (file, errorCode, message) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_error_handler", [file, errorCode, message]);
-};
-
-SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
-};
-
-SWFUpload.prototype.uploadComplete = function (file) {
-	file = this.unescapeFilePostParams(file);
-	this.queueEvent("upload_complete_handler", file);
-};
-
-/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
-   internal debug console.  You can override this event and have messages written where you want. */
-SWFUpload.prototype.debug = function (message) {
-	this.queueEvent("debug_handler", message);
-};
-
-
-/* **********************************
-	Debug Console
-	The debug console is a self contained, in page location
-	for debug message to be sent.  The Debug Console adds
-	itself to the body if necessary.
-
-	The console is automatically scrolled as messages appear.
-	
-	If you are using your own debug handler or when you deploy to production and
-	have debug disabled you can remove these functions to reduce the file size
-	and complexity.
-********************************** */
-   
-// Private: debugMessage is the default debug_handler.  If you want to print debug messages
-// call the debug() function.  When overriding the function your own function should
-// check to see if the debug setting is true before outputting debug information.
-SWFUpload.prototype.debugMessage = function (message) {
-	if (this.settings.debug) {
-		var exceptionMessage, exceptionValues = [];
-
-		// Check for an exception object and print it nicely
-		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
-			for (var key in message) {
-				if (message.hasOwnProperty(key)) {
-					exceptionValues.push(key + ": " + message[key]);
-				}
-			}
-			exceptionMessage = exceptionValues.join("\n") || "";
-			exceptionValues = exceptionMessage.split("\n");
-			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
-			SWFUpload.Console.writeLine(exceptionMessage);
-		} else {
-			SWFUpload.Console.writeLine(message);
-		}
-	}
-};
-
-SWFUpload.Console = {};
-SWFUpload.Console.writeLine = function (message) {
-	var console, documentForm;
-
-	try {
-		console = document.getElementById("SWFUpload_Console");
-
-		if (!console) {
-			documentForm = document.createElement("form");
-			document.getElementsByTagName("body")[0].appendChild(documentForm);
-
-			console = document.createElement("textarea");
-			console.id = "SWFUpload_Console";
-			console.style.fontFamily = "monospace";
-			console.setAttribute("wrap", "off");
-			console.wrap = "off";
-			console.style.overflow = "auto";
-			console.style.width = "700px";
-			console.style.height = "350px";
-			console.style.margin = "5px";
-			documentForm.appendChild(console);
-		}
-
-		console.value += message + "\n";
-
-		console.scrollTop = console.scrollHeight - console.clientHeight;
-	} catch (ex) {
-		alert("Exception: " + ex.name + " Message: " + ex.message);
-	}
-};
+/**
+ * SWFUpload: http://www.swfupload.org, http://swfupload.googlecode.com
+ *
+ * mmSWFUpload 1.0: Flash upload dialog - http://profandesign.se/swfupload/,  http://www.vinterwebb.se/
+ *
+ * SWFUpload is (c) 2006-2007 Lars Huring, Olov Nilz�n and Mammon Media and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ * SWFUpload 2 is (c) 2007-2008 Jake Roberts and is released under the MIT License:
+ * http://www.opensource.org/licenses/mit-license.php
+ *
+ */
+
+
+/* ******************* */
+/* Constructor & Init  */
+/* ******************* */
+var SWFUpload;
+
+if (SWFUpload == undefined) {
+	SWFUpload = function (settings) {
+		this.initSWFUpload(settings);
+	};
+}
+
+SWFUpload.prototype.initSWFUpload = function (settings) {
+	try {
+		this.customSettings = {};	// A container where developers can place their own settings associated with this instance.
+		this.settings = settings;
+		this.eventQueue = [];
+		this.movieName = "SWFUpload_" + SWFUpload.movieCount++;
+		this.movieElement = null;
+
+
+		// Setup global control tracking
+		SWFUpload.instances[this.movieName] = this;
+
+		// Load the settings.  Load the Flash movie.
+		this.initSettings();
+		this.loadFlash();
+		this.displayDebugInfo();
+	} catch (ex) {
+		delete SWFUpload.instances[this.movieName];
+		throw ex;
+	}
+};
+
+/* *************** */
+/* Static Members  */
+/* *************** */
+SWFUpload.instances = {};
+SWFUpload.movieCount = 0;
+SWFUpload.version = "2.2.0 2009-03-25";
+SWFUpload.QUEUE_ERROR = {
+	QUEUE_LIMIT_EXCEEDED	  		: -100,
+	FILE_EXCEEDS_SIZE_LIMIT  		: -110,
+	ZERO_BYTE_FILE			  		: -120,
+	INVALID_FILETYPE		  		: -130
+};
+SWFUpload.UPLOAD_ERROR = {
+	HTTP_ERROR				  		: -200,
+	MISSING_UPLOAD_URL	      		: -210,
+	IO_ERROR				  		: -220,
+	SECURITY_ERROR			  		: -230,
+	UPLOAD_LIMIT_EXCEEDED	  		: -240,
+	UPLOAD_FAILED			  		: -250,
+	SPECIFIED_FILE_ID_NOT_FOUND		: -260,
+	FILE_VALIDATION_FAILED	  		: -270,
+	FILE_CANCELLED			  		: -280,
+	UPLOAD_STOPPED					: -290
+};
+SWFUpload.FILE_STATUS = {
+	QUEUED		 : -1,
+	IN_PROGRESS	 : -2,
+	ERROR		 : -3,
+	COMPLETE	 : -4,
+	CANCELLED	 : -5
+};
+SWFUpload.BUTTON_ACTION = {
+	SELECT_FILE  : -100,
+	SELECT_FILES : -110,
+	START_UPLOAD : -120
+};
+SWFUpload.CURSOR = {
+	ARROW : -1,
+	HAND : -2
+};
+SWFUpload.WINDOW_MODE = {
+	WINDOW : "window",
+	TRANSPARENT : "transparent",
+	OPAQUE : "opaque"
+};
+
+// Private: takes a URL, determines if it is relative and converts to an absolute URL
+// using the current site. Only processes the URL if it can, otherwise returns the URL untouched
+SWFUpload.completeURL = function(url) {
+	if (typeof(url) !== "string" || url.match(/^https?:\/\//i) || url.match(/^\//)) {
+		return url;
+	}
+	
+	var currentURL = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ":" + window.location.port : "");
+	
+	var indexSlash = window.location.pathname.lastIndexOf("/");
+	if (indexSlash <= 0) {
+		path = "/";
+	} else {
+		path = window.location.pathname.substr(0, indexSlash) + "/";
+	}
+	
+	return /*currentURL +*/ path + url;
+	
+};
+
+
+/* ******************** */
+/* Instance Members  */
+/* ******************** */
+
+// Private: initSettings ensures that all the
+// settings are set, getting a default value if one was not assigned.
+SWFUpload.prototype.initSettings = function () {
+	this.ensureDefault = function (settingName, defaultValue) {
+		this.settings[settingName] = (this.settings[settingName] == undefined) ? defaultValue : this.settings[settingName];
+	};
+	
+	// Upload backend settings
+	this.ensureDefault("upload_url", "");
+	this.ensureDefault("preserve_relative_urls", false);
+	this.ensureDefault("file_post_name", "Filedata");
+	this.ensureDefault("post_params", {});
+	this.ensureDefault("use_query_string", false);
+	this.ensureDefault("requeue_on_error", false);
+	this.ensureDefault("http_success", []);
+	this.ensureDefault("assume_success_timeout", 0);
+	
+	// File Settings
+	this.ensureDefault("file_types", "*.*");
+	this.ensureDefault("file_types_description", "All Files");
+	this.ensureDefault("file_size_limit", 0);	// Default zero means "unlimited"
+	this.ensureDefault("file_upload_limit", 0);
+	this.ensureDefault("file_queue_limit", 0);
+
+	// Flash Settings
+	this.ensureDefault("flash_url", "swfupload.swf");
+	this.ensureDefault("prevent_swf_caching", true);
+	
+	// Button Settings
+	this.ensureDefault("button_image_url", "");
+	this.ensureDefault("button_width", 1);
+	this.ensureDefault("button_height", 1);
+	this.ensureDefault("button_text", "");
+	this.ensureDefault("button_text_style", "color: #000000; font-size: 16pt;");
+	this.ensureDefault("button_text_top_padding", 0);
+	this.ensureDefault("button_text_left_padding", 0);
+	this.ensureDefault("button_action", SWFUpload.BUTTON_ACTION.SELECT_FILES);
+	this.ensureDefault("button_disabled", false);
+	this.ensureDefault("button_placeholder_id", "");
+	this.ensureDefault("button_placeholder", null);
+	this.ensureDefault("button_cursor", SWFUpload.CURSOR.ARROW);
+	this.ensureDefault("button_window_mode", SWFUpload.WINDOW_MODE.WINDOW);
+	
+	// Debug Settings
+	this.ensureDefault("debug", false);
+	this.settings.debug_enabled = this.settings.debug;	// Here to maintain v2 API
+	
+	// Event Handlers
+	this.settings.return_upload_start_handler = this.returnUploadStart;
+	this.ensureDefault("swfupload_loaded_handler", null);
+	this.ensureDefault("file_dialog_start_handler", null);
+	this.ensureDefault("file_queued_handler", null);
+	this.ensureDefault("file_queue_error_handler", null);
+	this.ensureDefault("file_dialog_complete_handler", null);
+	
+	this.ensureDefault("upload_start_handler", null);
+	this.ensureDefault("upload_progress_handler", null);
+	this.ensureDefault("upload_error_handler", null);
+	this.ensureDefault("upload_success_handler", null);
+	this.ensureDefault("upload_complete_handler", null);
+	
+	this.ensureDefault("debug_handler", this.debugMessage);
+
+	this.ensureDefault("custom_settings", {});
+
+	// Other settings
+	this.customSettings = this.settings.custom_settings;
+	
+	// Update the flash url if needed
+	if (!!this.settings.prevent_swf_caching) {
+		this.settings.flash_url = this.settings.flash_url + (this.settings.flash_url.indexOf("?") < 0 ? "?" : "&") + "preventswfcaching=" + new Date().getTime();
+	}
+	
+	if (!this.settings.preserve_relative_urls) {
+		//this.settings.flash_url = SWFUpload.completeURL(this.settings.flash_url);	// Don't need to do this one since flash doesn't look at it
+		this.settings.upload_url = SWFUpload.completeURL(this.settings.upload_url);
+		this.settings.button_image_url = SWFUpload.completeURL(this.settings.button_image_url);
+	}
+	
+	delete this.ensureDefault;
+};
+
+// Private: loadFlash replaces the button_placeholder element with the flash movie.
+SWFUpload.prototype.loadFlash = function () {
+	var targetElement, tempParent;
+
+	// Make sure an element with the ID we are going to use doesn't already exist
+	if (document.getElementById(this.movieName) !== null) {
+		throw "ID " + this.movieName + " is already in use. The Flash Object could not be added";
+	}
+
+	// Get the element where we will be placing the flash movie
+	targetElement = document.getElementById(this.settings.button_placeholder_id) || this.settings.button_placeholder;
+
+	if (targetElement == undefined) {
+		throw "Could not find the placeholder element: " + this.settings.button_placeholder_id;
+	}
+
+	// Append the container and load the flash
+	tempParent = document.createElement("div");
+	tempParent.innerHTML = this.getFlashHTML();	// Using innerHTML is non-standard but the only sensible way to dynamically add Flash in IE (and maybe other browsers)
+	targetElement.parentNode.replaceChild(tempParent.firstChild, targetElement);
+
+	// Fix IE Flash/Form bug
+	if (window[this.movieName] == undefined) {
+		window[this.movieName] = this.getMovieElement();
+	}
+	
+};
+
+// Private: getFlashHTML generates the object tag needed to embed the flash in to the document
+SWFUpload.prototype.getFlashHTML = function () {
+	// Flash Satay object syntax: http://www.alistapart.com/articles/flashsatay
+	return ['<object id="', this.movieName, '" type="application/x-shockwave-flash" data="', this.settings.flash_url, '" width="', this.settings.button_width, '" height="', this.settings.button_height, '" class="swfupload">',
+				'<param name="wmode" value="', this.settings.button_window_mode, '" />',
+				'<param name="movie" value="', this.settings.flash_url, '" />',
+				'<param name="quality" value="high" />',
+				'<param name="menu" value="false" />',
+				'<param name="allowScriptAccess" value="always" />',
+				'<param name="flashvars" value="' + this.getFlashVars() + '" />',
+				'</object>'].join("");
+};
+
+// Private: getFlashVars builds the parameter string that will be passed
+// to flash in the flashvars param.
+SWFUpload.prototype.getFlashVars = function () {
+	// Build a string from the post param object
+	var paramString = this.buildParamString();
+	var httpSuccessString = this.settings.http_success.join(",");
+	
+	// Build the parameter string
+	return ["movieName=", encodeURIComponent(this.movieName),
+			"&amp;uploadURL=", encodeURIComponent(this.settings.upload_url),
+			"&amp;useQueryString=", encodeURIComponent(this.settings.use_query_string),
+			"&amp;requeueOnError=", encodeURIComponent(this.settings.requeue_on_error),
+			"&amp;httpSuccess=", encodeURIComponent(httpSuccessString),
+			"&amp;assumeSuccessTimeout=", encodeURIComponent(this.settings.assume_success_timeout),
+			"&amp;params=", encodeURIComponent(paramString),
+			"&amp;filePostName=", encodeURIComponent(this.settings.file_post_name),
+			"&amp;fileTypes=", encodeURIComponent(this.settings.file_types),
+			"&amp;fileTypesDescription=", encodeURIComponent(this.settings.file_types_description),
+			"&amp;fileSizeLimit=", encodeURIComponent(this.settings.file_size_limit),
+			"&amp;fileUploadLimit=", encodeURIComponent(this.settings.file_upload_limit),
+			"&amp;fileQueueLimit=", encodeURIComponent(this.settings.file_queue_limit),
+			"&amp;debugEnabled=", encodeURIComponent(this.settings.debug_enabled),
+			"&amp;buttonImageURL=", encodeURIComponent(this.settings.button_image_url),
+			"&amp;buttonWidth=", encodeURIComponent(this.settings.button_width),
+			"&amp;buttonHeight=", encodeURIComponent(this.settings.button_height),
+			"&amp;buttonText=", encodeURIComponent(this.settings.button_text),
+			"&amp;buttonTextTopPadding=", encodeURIComponent(this.settings.button_text_top_padding),
+			"&amp;buttonTextLeftPadding=", encodeURIComponent(this.settings.button_text_left_padding),
+			"&amp;buttonTextStyle=", encodeURIComponent(this.settings.button_text_style),
+			"&amp;buttonAction=", encodeURIComponent(this.settings.button_action),
+			"&amp;buttonDisabled=", encodeURIComponent(this.settings.button_disabled),
+			"&amp;buttonCursor=", encodeURIComponent(this.settings.button_cursor)
+		].join("");
+};
+
+// Public: getMovieElement retrieves the DOM reference to the Flash element added by SWFUpload
+// The element is cached after the first lookup
+SWFUpload.prototype.getMovieElement = function () {
+	if (this.movieElement == undefined) {
+		this.movieElement = document.getElementById(this.movieName);
+	}
+
+	if (this.movieElement === null) {
+		throw "Could not find Flash element";
+	}
+	
+	return this.movieElement;
+};
+
+// Private: buildParamString takes the name/value pairs in the post_params setting object
+// and joins them up in to a string formatted "name=value&amp;name=value"
+SWFUpload.prototype.buildParamString = function () {
+	var postParams = this.settings.post_params; 
+	var paramStringPairs = [];
+
+	if (typeof(postParams) === "object") {
+		for (var name in postParams) {
+			if (postParams.hasOwnProperty(name)) {
+				paramStringPairs.push(encodeURIComponent(name.toString()) + "=" + encodeURIComponent(postParams[name].toString()));
+			}
+		}
+	}
+
+	return paramStringPairs.join("&amp;");
+};
+
+// Public: Used to remove a SWFUpload instance from the page. This method strives to remove
+// all references to the SWF, and other objects so memory is properly freed.
+// Returns true if everything was destroyed. Returns a false if a failure occurs leaving SWFUpload in an inconsistant state.
+// Credits: Major improvements provided by steffen
+SWFUpload.prototype.destroy = function () {
+	try {
+		// Make sure Flash is done before we try to remove it
+		this.cancelUpload(null, false);
+		
+
+		// Remove the SWFUpload DOM nodes
+		var movieElement = null;
+		movieElement = this.getMovieElement();
+		
+		if (movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			// Loop through all the movie's properties and remove all function references (DOM/JS IE 6/7 memory leak workaround)
+			for (var i in movieElement) {
+				try {
+					if (typeof(movieElement[i]) === "function") {
+						movieElement[i] = null;
+					}
+				} catch (ex1) {}
+			}
+
+			// Remove the Movie Element from the page
+			try {
+				movieElement.parentNode.removeChild(movieElement);
+			} catch (ex) {}
+		}
+		
+		// Remove IE form fix reference
+		window[this.movieName] = null;
+
+		// Destroy other references
+		SWFUpload.instances[this.movieName] = null;
+		delete SWFUpload.instances[this.movieName];
+
+		this.movieElement = null;
+		this.settings = null;
+		this.customSettings = null;
+		this.eventQueue = null;
+		this.movieName = null;
+		
+		
+		return true;
+	} catch (ex2) {
+		return false;
+	}
+};
+
+
+// Public: displayDebugInfo prints out settings and configuration
+// information about this SWFUpload instance.
+// This function (and any references to it) can be deleted when placing
+// SWFUpload in production.
+SWFUpload.prototype.displayDebugInfo = function () {
+	this.debug(
+		[
+			"---SWFUpload Instance Info---\n",
+			"Version: ", SWFUpload.version, "\n",
+			"Movie Name: ", this.movieName, "\n",
+			"Settings:\n",
+			"\t", "upload_url:               ", this.settings.upload_url, "\n",
+			"\t", "flash_url:                ", this.settings.flash_url, "\n",
+			"\t", "use_query_string:         ", this.settings.use_query_string.toString(), "\n",
+			"\t", "requeue_on_error:         ", this.settings.requeue_on_error.toString(), "\n",
+			"\t", "http_success:             ", this.settings.http_success.join(", "), "\n",
+			"\t", "assume_success_timeout:   ", this.settings.assume_success_timeout, "\n",
+			"\t", "file_post_name:           ", this.settings.file_post_name, "\n",
+			"\t", "post_params:              ", this.settings.post_params.toString(), "\n",
+			"\t", "file_types:               ", this.settings.file_types, "\n",
+			"\t", "file_types_description:   ", this.settings.file_types_description, "\n",
+			"\t", "file_size_limit:          ", this.settings.file_size_limit, "\n",
+			"\t", "file_upload_limit:        ", this.settings.file_upload_limit, "\n",
+			"\t", "file_queue_limit:         ", this.settings.file_queue_limit, "\n",
+			"\t", "debug:                    ", this.settings.debug.toString(), "\n",
+
+			"\t", "prevent_swf_caching:      ", this.settings.prevent_swf_caching.toString(), "\n",
+
+			"\t", "button_placeholder_id:    ", this.settings.button_placeholder_id.toString(), "\n",
+			"\t", "button_placeholder:       ", (this.settings.button_placeholder ? "Set" : "Not Set"), "\n",
+			"\t", "button_image_url:         ", this.settings.button_image_url.toString(), "\n",
+			"\t", "button_width:             ", this.settings.button_width.toString(), "\n",
+			"\t", "button_height:            ", this.settings.button_height.toString(), "\n",
+			"\t", "button_text:              ", this.settings.button_text.toString(), "\n",
+			"\t", "button_text_style:        ", this.settings.button_text_style.toString(), "\n",
+			"\t", "button_text_top_padding:  ", this.settings.button_text_top_padding.toString(), "\n",
+			"\t", "button_text_left_padding: ", this.settings.button_text_left_padding.toString(), "\n",
+			"\t", "button_action:            ", this.settings.button_action.toString(), "\n",
+			"\t", "button_disabled:          ", this.settings.button_disabled.toString(), "\n",
+
+			"\t", "custom_settings:          ", this.settings.custom_settings.toString(), "\n",
+			"Event Handlers:\n",
+			"\t", "swfupload_loaded_handler assigned:  ", (typeof this.settings.swfupload_loaded_handler === "function").toString(), "\n",
+			"\t", "file_dialog_start_handler assigned: ", (typeof this.settings.file_dialog_start_handler === "function").toString(), "\n",
+			"\t", "file_queued_handler assigned:       ", (typeof this.settings.file_queued_handler === "function").toString(), "\n",
+			"\t", "file_queue_error_handler assigned:  ", (typeof this.settings.file_queue_error_handler === "function").toString(), "\n",
+			"\t", "upload_start_handler assigned:      ", (typeof this.settings.upload_start_handler === "function").toString(), "\n",
+			"\t", "upload_progress_handler assigned:   ", (typeof this.settings.upload_progress_handler === "function").toString(), "\n",
+			"\t", "upload_error_handler assigned:      ", (typeof this.settings.upload_error_handler === "function").toString(), "\n",
+			"\t", "upload_success_handler assigned:    ", (typeof this.settings.upload_success_handler === "function").toString(), "\n",
+			"\t", "upload_complete_handler assigned:   ", (typeof this.settings.upload_complete_handler === "function").toString(), "\n",
+			"\t", "debug_handler assigned:             ", (typeof this.settings.debug_handler === "function").toString(), "\n"
+		].join("")
+	);
+};
+
+/* Note: addSetting and getSetting are no longer used by SWFUpload but are included
+	the maintain v2 API compatibility
+*/
+// Public: (Deprecated) addSetting adds a setting value. If the value given is undefined or null then the default_value is used.
+SWFUpload.prototype.addSetting = function (name, value, default_value) {
+    if (value == undefined) {
+        return (this.settings[name] = default_value);
+    } else {
+        return (this.settings[name] = value);
+	}
+};
+
+// Public: (Deprecated) getSetting gets a setting. Returns an empty string if the setting was not found.
+SWFUpload.prototype.getSetting = function (name) {
+    if (this.settings[name] != undefined) {
+        return this.settings[name];
+	}
+
+    return "";
+};
+
+
+
+// Private: callFlash handles function calls made to the Flash element.
+// Calls are made with a setTimeout for some functions to work around
+// bugs in the ExternalInterface library.
+SWFUpload.prototype.callFlash = function (functionName, argumentArray) {
+	argumentArray = argumentArray || [];
+	
+	var movieElement = this.getMovieElement();
+	var returnValue, returnString;
+
+	// Flash's method if calling ExternalInterface methods (code adapted from MooTools).
+	try {
+		returnString = movieElement.CallFunction('<invoke name="' + functionName + '" returntype="javascript">' + __flash__argumentsToXML(argumentArray, 0) + '</invoke>');
+		returnValue = eval(returnString);
+	} catch (ex) {
+		throw "Call to " + functionName + " failed";
+	}
+	
+	// Unescape file post param values
+	if (returnValue != undefined && typeof returnValue.post === "object") {
+		returnValue = this.unescapeFilePostParams(returnValue);
+	}
+
+	return returnValue;
+};
+
+/* *****************************
+	-- Flash control methods --
+	Your UI should use these
+	to operate SWFUpload
+   ***************************** */
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFile causes a File Selection Dialog window to appear.  This
+// dialog only allows 1 file to be selected.
+SWFUpload.prototype.selectFile = function () {
+	this.callFlash("SelectFile");
+};
+
+// WARNING: this function does not work in Flash Player 10
+// Public: selectFiles causes a File Selection Dialog window to appear/ This
+// dialog allows the user to select any number of files
+// Flash Bug Warning: Flash limits the number of selectable files based on the combined length of the file names.
+// If the selection name length is too long the dialog will fail in an unpredictable manner.  There is no work-around
+// for this bug.
+SWFUpload.prototype.selectFiles = function () {
+	this.callFlash("SelectFiles");
+};
+
+
+// Public: startUpload starts uploading the first file in the queue unless
+// the optional parameter 'fileID' specifies the ID 
+SWFUpload.prototype.startUpload = function (fileID) {
+	this.callFlash("StartUpload", [fileID]);
+};
+
+// Public: cancelUpload cancels any queued file.  The fileID parameter may be the file ID or index.
+// If you do not specify a fileID the current uploading file or first file in the queue is cancelled.
+// If you do not want the uploadError event to trigger you can specify false for the triggerErrorEvent parameter.
+SWFUpload.prototype.cancelUpload = function (fileID, triggerErrorEvent) {
+	if (triggerErrorEvent !== false) {
+		triggerErrorEvent = true;
+	}
+	this.callFlash("CancelUpload", [fileID, triggerErrorEvent]);
+};
+
+// Public: stopUpload stops the current upload and requeues the file at the beginning of the queue.
+// If nothing is currently uploading then nothing happens.
+SWFUpload.prototype.stopUpload = function () {
+	this.callFlash("StopUpload");
+};
+
+/* ************************
+ * Settings methods
+ *   These methods change the SWFUpload settings.
+ *   SWFUpload settings should not be changed directly on the settings object
+ *   since many of the settings need to be passed to Flash in order to take
+ *   effect.
+ * *********************** */
+
+// Public: getStats gets the file statistics object.
+SWFUpload.prototype.getStats = function () {
+	return this.callFlash("GetStats");
+};
+
+// Public: setStats changes the SWFUpload statistics.  You shouldn't need to 
+// change the statistics but you can.  Changing the statistics does not
+// affect SWFUpload accept for the successful_uploads count which is used
+// by the upload_limit setting to determine how many files the user may upload.
+SWFUpload.prototype.setStats = function (statsObject) {
+	this.callFlash("SetStats", [statsObject]);
+};
+
+// Public: getFile retrieves a File object by ID or Index.  If the file is
+// not found then 'null' is returned.
+SWFUpload.prototype.getFile = function (fileID) {
+	if (typeof(fileID) === "number") {
+		return this.callFlash("GetFileByIndex", [fileID]);
+	} else {
+		return this.callFlash("GetFile", [fileID]);
+	}
+};
+
+// Public: addFileParam sets a name/value pair that will be posted with the
+// file specified by the Files ID.  If the name already exists then the
+// exiting value will be overwritten.
+SWFUpload.prototype.addFileParam = function (fileID, name, value) {
+	return this.callFlash("AddFileParam", [fileID, name, value]);
+};
+
+// Public: removeFileParam removes a previously set (by addFileParam) name/value
+// pair from the specified file.
+SWFUpload.prototype.removeFileParam = function (fileID, name) {
+	this.callFlash("RemoveFileParam", [fileID, name]);
+};
+
+// Public: setUploadUrl changes the upload_url setting.
+SWFUpload.prototype.setUploadURL = function (url) {
+	this.settings.upload_url = url.toString();
+	this.callFlash("SetUploadURL", [url]);
+};
+
+// Public: setPostParams changes the post_params setting
+SWFUpload.prototype.setPostParams = function (paramsObject) {
+	this.settings.post_params = paramsObject;
+	this.callFlash("SetPostParams", [paramsObject]);
+};
+
+// Public: addPostParam adds post name/value pair.  Each name can have only one value.
+SWFUpload.prototype.addPostParam = function (name, value) {
+	this.settings.post_params[name] = value;
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: removePostParam deletes post name/value pair.
+SWFUpload.prototype.removePostParam = function (name) {
+	delete this.settings.post_params[name];
+	this.callFlash("SetPostParams", [this.settings.post_params]);
+};
+
+// Public: setFileTypes changes the file_types setting and the file_types_description setting
+SWFUpload.prototype.setFileTypes = function (types, description) {
+	this.settings.file_types = types;
+	this.settings.file_types_description = description;
+	this.callFlash("SetFileTypes", [types, description]);
+};
+
+// Public: setFileSizeLimit changes the file_size_limit setting
+SWFUpload.prototype.setFileSizeLimit = function (fileSizeLimit) {
+	this.settings.file_size_limit = fileSizeLimit;
+	this.callFlash("SetFileSizeLimit", [fileSizeLimit]);
+};
+
+// Public: setFileUploadLimit changes the file_upload_limit setting
+SWFUpload.prototype.setFileUploadLimit = function (fileUploadLimit) {
+	this.settings.file_upload_limit = fileUploadLimit;
+	this.callFlash("SetFileUploadLimit", [fileUploadLimit]);
+};
+
+// Public: setFileQueueLimit changes the file_queue_limit setting
+SWFUpload.prototype.setFileQueueLimit = function (fileQueueLimit) {
+	this.settings.file_queue_limit = fileQueueLimit;
+	this.callFlash("SetFileQueueLimit", [fileQueueLimit]);
+};
+
+// Public: setFilePostName changes the file_post_name setting
+SWFUpload.prototype.setFilePostName = function (filePostName) {
+	this.settings.file_post_name = filePostName;
+	this.callFlash("SetFilePostName", [filePostName]);
+};
+
+// Public: setUseQueryString changes the use_query_string setting
+SWFUpload.prototype.setUseQueryString = function (useQueryString) {
+	this.settings.use_query_string = useQueryString;
+	this.callFlash("SetUseQueryString", [useQueryString]);
+};
+
+// Public: setRequeueOnError changes the requeue_on_error setting
+SWFUpload.prototype.setRequeueOnError = function (requeueOnError) {
+	this.settings.requeue_on_error = requeueOnError;
+	this.callFlash("SetRequeueOnError", [requeueOnError]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setHTTPSuccess = function (http_status_codes) {
+	if (typeof http_status_codes === "string") {
+		http_status_codes = http_status_codes.replace(" ", "").split(",");
+	}
+	
+	this.settings.http_success = http_status_codes;
+	this.callFlash("SetHTTPSuccess", [http_status_codes]);
+};
+
+// Public: setHTTPSuccess changes the http_success setting
+SWFUpload.prototype.setAssumeSuccessTimeout = function (timeout_seconds) {
+	this.settings.assume_success_timeout = timeout_seconds;
+	this.callFlash("SetAssumeSuccessTimeout", [timeout_seconds]);
+};
+
+// Public: setDebugEnabled changes the debug_enabled setting
+SWFUpload.prototype.setDebugEnabled = function (debugEnabled) {
+	this.settings.debug_enabled = debugEnabled;
+	this.callFlash("SetDebugEnabled", [debugEnabled]);
+};
+
+// Public: setButtonImageURL loads a button image sprite
+SWFUpload.prototype.setButtonImageURL = function (buttonImageURL) {
+	if (buttonImageURL == undefined) {
+		buttonImageURL = "";
+	}
+	
+	this.settings.button_image_url = buttonImageURL;
+	this.callFlash("SetButtonImageURL", [buttonImageURL]);
+};
+
+// Public: setButtonDimensions resizes the Flash Movie and button
+SWFUpload.prototype.setButtonDimensions = function (width, height) {
+	this.settings.button_width = width;
+	this.settings.button_height = height;
+	
+	var movie = this.getMovieElement();
+	if (movie != undefined) {
+		movie.style.width = width + "px";
+		movie.style.height = height + "px";
+	}
+	
+	this.callFlash("SetButtonDimensions", [width, height]);
+};
+// Public: setButtonText Changes the text overlaid on the button
+SWFUpload.prototype.setButtonText = function (html) {
+	this.settings.button_text = html;
+	this.callFlash("SetButtonText", [html]);
+};
+// Public: setButtonTextPadding changes the top and left padding of the text overlay
+SWFUpload.prototype.setButtonTextPadding = function (left, top) {
+	this.settings.button_text_top_padding = top;
+	this.settings.button_text_left_padding = left;
+	this.callFlash("SetButtonTextPadding", [left, top]);
+};
+
+// Public: setButtonTextStyle changes the CSS used to style the HTML/Text overlaid on the button
+SWFUpload.prototype.setButtonTextStyle = function (css) {
+	this.settings.button_text_style = css;
+	this.callFlash("SetButtonTextStyle", [css]);
+};
+// Public: setButtonDisabled disables/enables the button
+SWFUpload.prototype.setButtonDisabled = function (isDisabled) {
+	this.settings.button_disabled = isDisabled;
+	this.callFlash("SetButtonDisabled", [isDisabled]);
+};
+// Public: setButtonAction sets the action that occurs when the button is clicked
+SWFUpload.prototype.setButtonAction = function (buttonAction) {
+	this.settings.button_action = buttonAction;
+	this.callFlash("SetButtonAction", [buttonAction]);
+};
+
+// Public: setButtonCursor changes the mouse cursor displayed when hovering over the button
+SWFUpload.prototype.setButtonCursor = function (cursor) {
+	this.settings.button_cursor = cursor;
+	this.callFlash("SetButtonCursor", [cursor]);
+};
+
+/* *******************************
+	Flash Event Interfaces
+	These functions are used by Flash to trigger the various
+	events.
+	
+	All these functions a Private.
+	
+	Because the ExternalInterface library is buggy the event calls
+	are added to a queue and the queue then executed by a setTimeout.
+	This ensures that events are executed in a determinate order and that
+	the ExternalInterface bugs are avoided.
+******************************* */
+
+SWFUpload.prototype.queueEvent = function (handlerName, argumentArray) {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+	
+	if (argumentArray == undefined) {
+		argumentArray = [];
+	} else if (!(argumentArray instanceof Array)) {
+		argumentArray = [argumentArray];
+	}
+	
+	var self = this;
+	if (typeof this.settings[handlerName] === "function") {
+		// Queue the event
+		this.eventQueue.push(function () {
+			this.settings[handlerName].apply(this, argumentArray);
+		});
+		
+		// Execute the next queued event
+		setTimeout(function () {
+			self.executeNextEvent();
+		}, 0);
+		
+	} else if (this.settings[handlerName] !== null) {
+		throw "Event handler " + handlerName + " is unknown or is not a function";
+	}
+};
+
+// Private: Causes the next event in the queue to be executed.  Since events are queued using a setTimeout
+// we must queue them in order to garentee that they are executed in order.
+SWFUpload.prototype.executeNextEvent = function () {
+	// Warning: Don't call this.debug inside here or you'll create an infinite loop
+
+	var  f = this.eventQueue ? this.eventQueue.shift() : null;
+	if (typeof(f) === "function") {
+		f.apply(this);
+	}
+};
+
+// Private: unescapeFileParams is part of a workaround for a flash bug where objects passed through ExternalInterface cannot have
+// properties that contain characters that are not valid for JavaScript identifiers. To work around this
+// the Flash Component escapes the parameter names and we must unescape again before passing them along.
+SWFUpload.prototype.unescapeFilePostParams = function (file) {
+	var reg = /[$]([0-9a-f]{4})/i;
+	var unescapedPost = {};
+	var uk;
+
+	if (file != undefined) {
+		for (var k in file.post) {
+			if (file.post.hasOwnProperty(k)) {
+				uk = k;
+				var match;
+				while ((match = reg.exec(uk)) !== null) {
+					uk = uk.replace(match[0], String.fromCharCode(parseInt("0x" + match[1], 16)));
+				}
+				unescapedPost[uk] = file.post[k];
+			}
+		}
+
+		file.post = unescapedPost;
+	}
+
+	return file;
+};
+
+// Private: Called by Flash to see if JS can call in to Flash (test if External Interface is working)
+SWFUpload.prototype.testExternalInterface = function () {
+	try {
+		return this.callFlash("TestExternalInterface");
+	} catch (ex) {
+		return false;
+	}
+};
+
+// Private: This event is called by Flash when it has finished loading. Don't modify this.
+// Use the swfupload_loaded_handler event setting to execute custom code when SWFUpload has loaded.
+SWFUpload.prototype.flashReady = function () {
+	// Check that the movie element is loaded correctly with its ExternalInterface methods defined
+	var movieElement = this.getMovieElement();
+
+	if (!movieElement) {
+		this.debug("Flash called back ready but the flash movie can't be found.");
+		return;
+	}
+
+	this.cleanUp(movieElement);
+	
+	this.queueEvent("swfupload_loaded_handler");
+};
+
+// Private: removes Flash added fuctions to the DOM node to prevent memory leaks in IE.
+// This function is called by Flash each time the ExternalInterface functions are created.
+SWFUpload.prototype.cleanUp = function (movieElement) {
+	// Pro-actively unhook all the Flash functions
+	try {
+		if (this.movieElement && typeof(movieElement.CallFunction) === "unknown") { // We only want to do this in IE
+			this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");
+			for (var key in movieElement) {
+				try {
+					if (typeof(movieElement[key]) === "function") {
+						movieElement[key] = null;
+					}
+				} catch (ex) {
+				}
+			}
+		}
+	} catch (ex1) {
+	
+	}
+
+	// Fix Flashes own cleanup code so if the SWFMovie was removed from the page
+	// it doesn't display errors.
+	window["__flash__removeCallback"] = function (instance, name) {
+		try {
+			if (instance) {
+				instance[name] = null;
+			}
+		} catch (flashEx) {
+		
+		}
+	};
+
+};
+
+
+/* This is a chance to do something before the browse window opens */
+SWFUpload.prototype.fileDialogStart = function () {
+	this.queueEvent("file_dialog_start_handler");
+};
+
+
+/* Called when a file is successfully added to the queue. */
+SWFUpload.prototype.fileQueued = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queued_handler", file);
+};
+
+
+/* Handle errors that occur when an attempt to queue a file fails. */
+SWFUpload.prototype.fileQueueError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("file_queue_error_handler", [file, errorCode, message]);
+};
+
+/* Called after the file dialog has closed and the selected files have been queued.
+	You could call startUpload here if you want the queued files to begin uploading immediately. */
+SWFUpload.prototype.fileDialogComplete = function (numFilesSelected, numFilesQueued, numFilesInQueue) {
+	this.queueEvent("file_dialog_complete_handler", [numFilesSelected, numFilesQueued, numFilesInQueue]);
+};
+
+SWFUpload.prototype.uploadStart = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("return_upload_start_handler", file);
+};
+
+SWFUpload.prototype.returnUploadStart = function (file) {
+	var returnValue;
+	if (typeof this.settings.upload_start_handler === "function") {
+		file = this.unescapeFilePostParams(file);
+		returnValue = this.settings.upload_start_handler.call(this, file);
+	} else if (this.settings.upload_start_handler != undefined) {
+		throw "upload_start_handler must be a function";
+	}
+
+	// Convert undefined to true so if nothing is returned from the upload_start_handler it is
+	// interpretted as 'true'.
+	if (returnValue === undefined) {
+		returnValue = true;
+	}
+	
+	returnValue = !!returnValue;
+	
+	this.callFlash("ReturnUploadStart", [returnValue]);
+};
+
+
+
+SWFUpload.prototype.uploadProgress = function (file, bytesComplete, bytesTotal) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_progress_handler", [file, bytesComplete, bytesTotal]);
+};
+
+SWFUpload.prototype.uploadError = function (file, errorCode, message) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_error_handler", [file, errorCode, message]);
+};
+
+SWFUpload.prototype.uploadSuccess = function (file, serverData, responseReceived) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_success_handler", [file, serverData, responseReceived]);
+};
+
+SWFUpload.prototype.uploadComplete = function (file) {
+	file = this.unescapeFilePostParams(file);
+	this.queueEvent("upload_complete_handler", file);
+};
+
+/* Called by SWFUpload JavaScript and Flash functions when debug is enabled. By default it writes messages to the
+   internal debug console.  You can override this event and have messages written where you want. */
+SWFUpload.prototype.debug = function (message) {
+	this.queueEvent("debug_handler", message);
+};
+
+
+/* **********************************
+	Debug Console
+	The debug console is a self contained, in page location
+	for debug message to be sent.  The Debug Console adds
+	itself to the body if necessary.
+
+	The console is automatically scrolled as messages appear.
+	
+	If you are using your own debug handler or when you deploy to production and
+	have debug disabled you can remove these functions to reduce the file size
+	and complexity.
+********************************** */
+   
+// Private: debugMessage is the default debug_handler.  If you want to print debug messages
+// call the debug() function.  When overriding the function your own function should
+// check to see if the debug setting is true before outputting debug information.
+SWFUpload.prototype.debugMessage = function (message) {
+	if (this.settings.debug) {
+		var exceptionMessage, exceptionValues = [];
+
+		// Check for an exception object and print it nicely
+		if (typeof message === "object" && typeof message.name === "string" && typeof message.message === "string") {
+			for (var key in message) {
+				if (message.hasOwnProperty(key)) {
+					exceptionValues.push(key + ": " + message[key]);
+				}
+			}
+			exceptionMessage = exceptionValues.join("\n") || "";
+			exceptionValues = exceptionMessage.split("\n");
+			exceptionMessage = "EXCEPTION: " + exceptionValues.join("\nEXCEPTION: ");
+			SWFUpload.Console.writeLine(exceptionMessage);
+		} else {
+			SWFUpload.Console.writeLine(message);
+		}
+	}
+};
+
+SWFUpload.Console = {};
+SWFUpload.Console.writeLine = function (message) {
+	var console, documentForm;
+
+	try {
+		console = document.getElementById("SWFUpload_Console");
+
+		if (!console) {
+			documentForm = document.createElement("form");
+			document.getElementsByTagName("body")[0].appendChild(documentForm);
+
+			console = document.createElement("textarea");
+			console.id = "SWFUpload_Console";
+			console.style.fontFamily = "monospace";
+			console.setAttribute("wrap", "off");
+			console.wrap = "off";
+			console.style.overflow = "auto";
+			console.style.width = "700px";
+			console.style.height = "350px";
+			console.style.margin = "5px";
+			documentForm.appendChild(console);
+		}
+
+		console.value += message + "\n";
+
+		console.scrollTop = console.scrollHeight - console.clientHeight;
+	} catch (ex) {
+		alert("Exception: " + ex.name + " Message: " + ex.message);
+	}
+};
diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js
index de274f590..cb5babdee 100755
--- a/modules/editor/tpl/js/uploader.js
+++ b/modules/editor/tpl/js/uploader.js
@@ -1,436 +1,443 @@
-/**
- * @author NHN (developers@xpressengine.com)
- * @version 0.1.1
- * @brief 파일 업로드 관련
- **/
-var uploadedFiles = new Array();
-var uploaderSettings = new Array();
-var loaded_images = new Array();
-var swfUploadObjs = new Array();
-var uploadSettingObj = new Array();
-var uploadAutosaveChecker = false;
-
-/**
- * 업로드를 하기 위한 준비 시작
- * 이 함수는 editor.html 에서 파일 업로드 가능할 경우 호출됨
- **/
-// window.load 이벤트일 경우 && 문서 번호가 가상의 번호가 아니면 기존에 저장되어 있을지도 모르는 파일 목록을 가져옴
-function editorUploadInit(obj, exe) {
-    if(typeof(obj["editorSequence"])=="undefined") return;
-    if(typeof(obj["sessionName"])=="undefined") obj["sessionName"]= "PHPSESSID";
-    if(typeof(obj["allowedFileSize"])=="undefined") obj["allowedFileSize"]= 2*1024*1024;
-    if(typeof(obj["allowedFileTypes"])=="undefined") obj["allowedFileTypes"]= "*.*";
-    if(typeof(obj["allowedFileTypesDescription"])=="undefined") obj["allowedFileTypesDescription"]= "All Files";
-    if(typeof(obj["replaceButtonID"])=="undefined") obj["replaceButtonID"] = "swfUploadButton"+obj["editorSequence"];
-    if(typeof(obj["insertedFiles"])=="undefined") obj["insertedFiles"] = 0;
-    if(exe) XEUploaderStart(obj);
-    if(!exe) xAddEventListener(window,"load",function() { XEUploaderStart(obj) });
-    uploadSettingObj[obj["editorSequence"]] = obj;
-}
-
-// 파일 업로드를 위한 기본 준비를 함
-function XEUploaderStart(obj) {
-    try { document.execCommand('BackgroundImageCache',false,true); } catch(e) { }
-
-    var btnObj = xGetElementById(obj["replaceButtonID"]);
-    var btnWidth = xWidth(btnObj);
-    var btnHeight = xHeight(btnObj);
-    btnObj.style.position = "relative";
-
-    var dummy = xCreateElement("span");
-    dummy.id = "dummy"+obj["replaceButtonID"];
-    btnObj.appendChild(dummy);
-
-    var settings = {
-        flash_url : request_uri+"modules/editor/tpl/images/SWFUpload.swf",
-        upload_url: request_uri.replace(/^https/i,'http'),
-        post_params: {
-            "mid" : current_mid,
-            "act" : "procFileUpload",
-            "editor_sequence" : obj["editorSequence"],
-            "uploadTargetSrl" : editorRelKeys[obj["editorSequence"]]["primary"].value
-        },
-        file_size_limit : parseInt(parseInt(obj["allowedFileSize"],10)/1024,10),
-        file_queue_limit : 0,
-        file_upload_limit : 0,
-        file_types : obj["allowedFileTypes"],
-        file_types_description : obj["allowedFileTypesDescription"],
-        custom_settings : {
-            progressTarget : null,
-            cancelButtonId : null
-        },
-        debug: false,
-
-        // Button settings
-        button_window_mode: 'transparent',
-        button_placeholder_id: dummy.id,
-        button_text: null,
-        button_image_url: "",
-        button_width: btnWidth,
-        button_height: btnHeight,
-        button_text_style: null,
-        button_text_left_padding: 0,
-        button_text_top_padding: 0,
-        button_cursor:-2,
-
-        // The event handler functions are defined in handlers.js
-        file_queued_handler : fileQueued,
-        file_queue_error_handler : fileQueueError,
-        file_dialog_complete_handler : fileDialogComplete,
-        upload_start_handler : uploadStart,
-        upload_progress_handler : uploadProgress,
-        upload_error_handler : uploadError,
-        upload_success_handler : uploadSuccess,
-        upload_complete_handler : uploadComplete,
-        queue_complete_handler :queueComplete
-    };
-    if(typeof(xeVid)!='undefined') settings["post_params"]["vid"] = xeVid;
-    settings["post_params"][obj["sessionName"]] = xGetCookie(obj["sessionName"]);
-    settings["editorSequence"] = obj["editorSequence"];
-    settings["uploadTargetSrl"] = editorRelKeys[obj["editorSequence"]]["primary"].value;
-    settings["fileListAreaID"] = obj["fileListAreaID"];
-    settings["previewAreaID"] = obj["previewAreaID"];
-    settings["uploaderStatusID"] = obj["uploaderStatusID"];
-
-    uploaderSettings[obj["editorSequence"]] = settings;
-
-    var swfu = new SWFUpload(settings);
-    var swfObj = xGetElementById(swfu.movieName);
-    swfUploadObjs[obj["editorSequence"]] = swfu.movieName;
-    if(!swfObj) return;
-
-    swfObj.style.display = "block";
-    swfObj.style.cursor = "pointer";
-    swfObj.style.position = "absolute";
-    swfObj.style.left = 0;
-    swfObj.style.top = "-3px";
-    swfObj.style.width = btnWidth+"px";
-    swfObj.style.height = btnHeight+"px";
-
-    if(obj["insertedFiles"]>0 || editorRelKeys[obj["editorSequence"]]["primary"].value > 0) reloadFileList(settings);
-}
-
-function fileQueued(file) {
-}
-
-function fileQueueError(file, errorCode, message) {
-    try {
-        switch(errorCode) {
-            case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED :
-                alert("You have attempted to queue too many files.\n" + (message === 0 ? "You have reached the upload limit." : "You may select " + (message > 1 ? "up to " + message + " files." : "one file.")));
-                break;
-            case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
-                alert("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-                break;
-            case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
-                alert("Error Code: Zero byte file, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-                break;
-            case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
-                alert("Error Code: Invalid File Type, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-                break;
-            default:
-                alert("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-                break;
-        }
-    } catch(ex) {
-        this.debug(ex);
-    }
-}
-
-function fileDialogComplete(numFilesSelected, numFilesQueued) {
-    try {
-        this.startUpload();
-    } catch (ex)  {
-        this.debug(ex);
-    }
-}
-
-function uploadStart(file) {
-    return true;
-}
-
-function uploadProgress(file, bytesLoaded, bytesTotal) {
-    try {
-        var obj = xGetElementById(this.settings["fileListAreaID"]);
-
-        var percent = Math.ceil((bytesLoaded / bytesTotal) * 100);
-        var filename = file.name;
-        if(filename.length>20) filename = filename.substr(0,20)+'...';
-
-        var text = filename + ' ('+percent+'%)';
-        if(!obj.options.length || obj.options[obj.options.length-1].value != file.id) {
-            var opt_obj = new Option(text, file.id, true, true);
-            obj.options[obj.options.length] = opt_obj;
-        } else {
-            obj.options[obj.options.length-1].text = text;
-        }
-    } catch (ex)  {
-        this.debug(ex);
-    }
-}
-
-function uploadSuccess(file, serverData) {
-    try {
-        if(this.getStats().files_queued !== 0) this.startUpload();
-    } catch (ex)  {
-        this.debug(ex);
-    }
-}
-
-function uploadError(file, errorCode, message) {
-    try {
-        switch (errorCode) {
-        case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
-            alert("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
-            break;
-        case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
-            alert("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-            break;
-        case SWFUpload.UPLOAD_ERROR.IO_ERROR:
-            alert("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
-            break;
-        case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
-            alert("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
-            break;
-        case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
-            alert("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-            break;
-        case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
-            alert("Error Code: File Validation Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-            break;
-        case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
-            // If there aren't any files left (they were all cancelled) disable the cancel button
-            if (this.getStats().files_queued === 0) {
-                document.getElementById(this.customSettings.cancelButtonId).disabled = true;
-            }
-            break;
-        case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
-            break;
-        default:
-            alert("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
-            break;
-        }
-    } catch (ex) {
-        this.debug(ex);
-    }
-}
-
-function uploadComplete(file) {
-    try {
-        var fileListAreaID = this.settings["fileListAreaID"];
-        var uploadTargetSrl = this.settings["uploadTargetSrl"];
-        reloadFileList(this.settings);
-    } catch(e) {
-        this.debug(ex);
-    }
-}
-
-function queueComplete(numFilesUploaded) {
-}
-
-function reloadFileList(settings) {
-    var params = new Array();
-    params["file_list_area_id"] = settings["fileListAreaID"];
-    params["editor_sequence"] = settings["editorSequence"];
-    params["upload_target_srl"] = settings["uploadTargetSrl"];
-    params["mid"] = current_mid;
-    var response_tags = new Array("error","message","files","upload_status","upload_target_srl","editor_sequence","left_size");
-    exec_xml("file","getFileList", params, completeReloadFileList, response_tags, settings);
-}
-
-function completeReloadFileList(ret_obj, response_tags, settings) {
-    var upload_target_srl = ret_obj['upload_target_srl'];
-    var editor_sequence = ret_obj['editor_sequence'];
-    var upload_status = ret_obj['upload_status'];
-    var files = ret_obj['files'];
-    var file_list_area_id = settings["fileListAreaID"];
-    var listObj = xGetElementById(file_list_area_id);
-    var left_size = parseInt(parseInt(ret_obj["left_size"],10)/1024,10);
-    while(listObj.options.length) {
-        listObj.remove(0);
-    }
-
-    if(upload_target_srl && upload_target_srl != 0) {
-        // 자동 저장된 문서와 target_srl이 다르게 될 경우 다시 자동 저장.
-        if(editorRelKeys[editor_sequence]["primary"].value != upload_target_srl) {
-            editorRelKeys[editor_sequence]["primary"].value = upload_target_srl;
-            uploadAutosaveChecker = true;
-            _editorAutoSave(true);
-        }
-
-        editorRelKeys[editor_sequence]["primary"].value = upload_target_srl;
-        settings["uploadTargetSrl"] = upload_target_srl;
-    }
-
-    var statusObj = xGetElementById(settings["uploaderStatusID"]);
-    if(statusObj) xInnerHtml(statusObj, upload_status);
-
-    var previewObj = xGetElementById(settings["previewAreaID"]);
-    if(previewObj) xInnerHtml(previewObj,"");
-
-    if(files && typeof(files['item'])!='undefined') {
-        var item = files['item'];
-        if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
-        if(item.length) {
-            for(var i=0;i<item.length;i++) {
-                var file_srl = item[i].file_srl;
-                item[i].previewAreaID = settings["previewAreaID"];
-                uploadedFiles[file_srl] = item[i];
-                var opt = new Option(item[i].source_filename+" ("+item[i].disp_file_size+")", file_srl, true, true);
-                listObj.options[listObj.options.length] = opt;
-                item[i].download_url = encodeURI(item[i].download_url);
-                if(/\.(jpg|jpeg|png|gif)$/i.test(item[i].download_url)) {
-                    var loadingImage = new Image();
-                    loadingImage.src = item[i].download_url;
-                    loaded_images[file_srl] = loadingImage;
-                    item[i].download_url = item[i].download_url.replace(/&/g, "&amp;");
-                }
-            }
-            previewFiles('', item[item.length-1].file_srl);
-        }
-    }
-
-    // var swfu = SWFUpload.instances[swfUploadObjs[editor_sequence]].setFileSizeLimit(left_size);
-
-    // 문서 강제 자동저장 1번만 사용 ( 첨부파일 target_srl로 자동 저장문서를 저장하기 위한 용도일 뿐 )
-    if(typeof(_editorAutoSave) == 'function' && uploadAutosaveChecker == false) {
-        uploadAutosaveChecker = true;
-        _editorAutoSave(true);
-    }
-
-    xAddEventListener(listObj,'click',previewFiles);
-}
-
-function previewFiles(evt, given_file_srl) {
-    if(!given_file_srl) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-    var selObj = null;
-    if(obj.nodeName=="OPTION") selObj = obj.parentNode;
-    else selObj = obj;
-    if(selObj.nodeName != "SELECT") return;
-    if(selObj.selectedIndex<0) return;
-    obj = selObj.options[selObj.selectedIndex];
-
-    var file_srl = obj.value;
-    }
-    else {
-        var file_srl = given_file_srl;
-    }
-    if(!file_srl || typeof(uploadedFiles[file_srl])=="undefined") return;
-    var file_info = uploadedFiles[file_srl];
-    var previewAreaID = file_info.previewAreaID;
-    var previewObj = xGetElementById("previewAreaID");
-    if(!previewAreaID) return;
-    xInnerHtml(previewAreaID,"&nbsp;");
-    if(file_info.direct_download != "Y") {
-        var html = "<img src=\""+request_uri+"./modules/editor/tpl/images/files.gif\" border=\"0\" width=\"100%\" height=\"100%\" />";
-        xInnerHtml(previewAreaID, html);
-        return;
-    }
-
-    var html = "";
-    var uploaded_filename = file_info.download_url;
-
-    // 플래쉬 동영상의 경우
-    if(/\.flv$/i.test(uploaded_filename)) {
-        html = "<embed src=\"./common/tpl/images/flvplayer.swf?autoStart=false&file="+uploaded_filename+"\" width=\"100%\" height=\"100%\" type=\"application/x-shockwave-flash\"></embed>";
-
-    // 플래쉬 파일의 경우
-    } else if(/\.swf$/i.test(uploaded_filename)) {
-        html = "<embed src=\""+uploaded_filename+"\" width=\"100%\" height=\"100%\" type=\"application/x-shockwave-flash\"></embed>";
-
-    // wmv, avi, mpg, mpeg등의 동영상 파일의 경우
-    } else if(/\.(wmv|avi|mpg|mpeg|asx|asf|mp3)$/i.test(uploaded_filename)) {
-        html = "<embed src=\""+uploaded_filename+"\" width=\"100%\" height=\"100%\" autostart=\"true\" Showcontrols=\"0\"></embed>";
-
-    // 이미지 파일의 경우
-    } else if(/\.(jpg|jpeg|png|gif)$/i.test(uploaded_filename)) {
-        html = "<img src=\""+uploaded_filename+"\" border=\"0\" width=\"100%\" height=\"100%\" />";
-    } else if(uploaded_filename) {
-        html = "<img src=\""+request_uri+"/modules/editor/tpl/images/files.gif\" border=\"0\" width=\"100%\" height=\"100%\" />";
-    }
-    xInnerHtml(previewAreaID, html);
-}
-
-function removeUploadedFile(editorSequence) {
-    var settings = uploaderSettings[editorSequence];
-    var fileListAreaID = settings["fileListAreaID"];
-    var fileListObj = xGetElementById(fileListAreaID);
-    if(!fileListObj) return;
-
-    if(fileListObj.selectedIndex<0) return;
-
-    var file_srls = new Array();
-    for(var i=0;i<fileListObj.options.length;i++) {
-        if(!fileListObj.options[i].selected) continue;
-        var file_srl = fileListObj.options[i].value;
-        if(!file_srl) continue;
-        file_srls[file_srls.length] = file_srl;
-    }
-
-    if(file_srls.length<1) return;
-
-    var params = new Array();
-    params["file_srls"]  = file_srls.join(',');
-    params["editor_sequence"] = editorSequence;
-    var response_tags = new Array("error","message");
-    exec_xml("file","procFileDelete", params, function() { reloadFileList(settings); } );
-}
-
-function insertUploadedFile(editorSequence) {
-
-    var settings = uploaderSettings[editorSequence];
-    var fileListAreaID = settings["fileListAreaID"];
-    var fileListObj = xGetElementById(fileListAreaID);
-    if(!fileListObj) return;
-
-    if(editorMode[editorSequence]=='preview') return;
-
-    var text = new Array();
-    for(var i=0;i<fileListObj.options.length;i++) {
-        if(!fileListObj.options[i].selected) continue;
-        var file_srl = fileListObj.options[i].value;
-        if(!file_srl) continue;
-
-        var file = uploadedFiles[file_srl];
-        editorFocus(editorSequence);
-
-        // 바로 링크 가능한 파일의 경우 (이미지, 플래쉬, 동영상 등..)
-        if(file.direct_download == 'Y') {
-            // 이미지 파일의 경우 image_link 컴포넌트 열결
-            if(/\.(jpg|jpeg|png|gif)$/i.test(file.download_url)) {
-                if(loaded_images[file_srl]) {
-                    var obj = loaded_images[file_srl];
-                }
-                else {
-                    var obj = new Image();
-                    obj.src = file.download_url;
-                }
-                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";
-                text.push(temp_code);
-            // 이미지외의 경우는 multimedia_link 컴포넌트 연결
-            } else {
-                text.push("<img src=\"common/tpl/images/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+file.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=\"\" />");
-            }
-
-        // binary파일의 경우 url_link 컴포넌트 연결
-        } else {
-            text.push("<a href=\""+file.download_url+"\">"+file.source_filename+"</a>\n");
-        }
-    }
-
-    // html 모드
-    if(editorMode[editorSequence]=='html'){
-        if(text.length>0) xGetElementById('editor_textarea_'+editorSequence).value += text.join('');
-
-    // 위지윅 모드
-    }else{
-        var iframe_obj = editorGetIFrame(editorSequence);
-        if(!iframe_obj) return;
-        if(text.length>0) editorReplaceHTML(iframe_obj, text.join(''));
-    }
-}
+/**
+ * @author NHN (developers@xpressengine.com)
+ * @version 0.1.1
+ * @brief 파일 업로드 관련
+ **/
+var uploadedFiles    = [];
+var uploaderSettings = [];
+var loaded_images    = [];
+var swfUploadObjs    = [];
+var uploadSettingObj = [];
+var uploadAutosaveChecker = false;
+
+/**
+ * 업로드를 하기 위한 준비 시작
+ * 이 함수는 editor.html 에서 파일 업로드 가능할 경우 호출됨
+ **/
+// window.load 이벤트일 경우 && 문서 번호가 가상의 번호가 아니면 기존에 저장되어 있을지도 모르는 파일 목록을 가져옴
+(function($){
+
+var defaultHandlers;
+
+function init(cfg, exe) {
+	var seq = cfg.editorSequence;
+	
+	if(!is_def(seq)) return;
+
+	cfg = $.extend({
+		sessionName : 'PHPSESSID',
+		allowedFileSize  : 2*1024*1024,
+		allowedFileTypes : '*.*',
+		allowedFileTypesDescription : 'All Files',
+		replaceButtonID : 'swfUploadButton'+cfg.editorSequence,
+		insertedFiles   : 0
+	}, cfg);
+
+    uploadSettingObj[seq] = cfg;
+	$(function(){ start(cfg) });
+
+}
+
+function start(cfg) {
+	var $button, width, height, $span, seq, id, settings, handlers, name, fn, swfu, $swf;
+
+	seq     = cfg.editorSequence;
+	id      = cfg.replaceButtonID;
+	$button = $('#'+id).wrap('<span style="position:relative;display:inline-block" />');
+	width   = $button.width();
+	height  = $button.height();
+	$span   = $('<span id="dummy'+id+'" />').insertAfter($button);
+
+	settings = {
+		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 : seq,
+			uploadTargetSrl : editorRelKeys[seq].primary.value
+		},
+		http_success : [302],
+		file_size_limit   : Math.floor( (parseInt(cfg.allowedFileSize,10)||1024) / 1024 ),
+		file_queue_limit  : 0,
+		file_upload_limit : 0,
+		file_types : cfg.allowedFileTypes,
+		file_types_description : cfg.allowedFileTypesDescription,
+		custom_settings : {
+			progressTarget : null,
+			cancelButtonId : null
+		},
+		debug : false,
+
+		// Button settings
+		button_window_mode : 'transparent',
+		button_placeholder : $span.get(0),
+		button_text : null,
+		button_image_url : request_uri+'common/img/blank.gif',
+		button_width  : width,
+		button_height : height,
+		button_text_style : null,
+		button_text_left_padding : 0,
+		button_text_top_padding  : 0,
+		button_cursor : -2,
+
+		editorSequence   : seq,
+		uploadTargetSrl  : editorRelKeys[seq].primary.value,
+		fileListAreaID   : cfg.fileListAreaID,
+		previewAreaID    : cfg.previewAreaID,
+		uploaderStatusID : cfg.uploaderStatusID
+	};
+
+	// preview
+	$('#'+cfg.fileListAreaID).click(previewFiles);
+
+	// The event handler functions are defined in handlers.js
+	handlers = {
+		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(name in handlers) {
+		if(!handlers.hasOwnProperty(name)) continue;
+		fn = 'on'+handlers[name];
+		settings[name+'_handler'] = cfg['on'+fn] || defaultHandlers[fn];
+	}
+
+	if(is_def(window.xeVid)) settings.post_params.vid = xeVid;
+	settings.post_params[cfg.sessionName] = getCookie(cfg.sessionName);
+
+	uploaderSettings[seq] = settings;
+
+	swfu = new SWFUpload(settings);
+	$swf = $('#'+swfu.movieName);
+	swfUploadObjs[seq] = swfu.movieName;
+	if(!$swf.length) return;
+
+	$swf.css({
+		display  : 'block',
+		cursor   : 'pointer',
+		position : 'absolute',
+		left     : 0,
+		top      : 0,
+		width    : width + 'px',
+		height   : height + 'px'
+	});
+
+	if(cfg.insertedFiles || editorRelKeys[seq].primary.value) reloadFileList(cfg);
+}
+
+function _true(){ return true };
+
+defaultHandlers = {
+	onFileQueued : _true,
+	onFileQueueError : function(flie, errorCode, message) {
+		try {
+			switch(errorCode) {
+				case SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED :
+					alert("You have attempted to queue too many files.\n" + (message === 0 ? "You have reached the upload limit." : "You may select " + (message > 1 ? "up to " + message + " files." : "one file.")));
+					break;
+				case SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT:
+					alert("Error Code: File too big, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+					break;
+				case SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE:
+					alert("Error Code: Zero byte file, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+					break;
+				case SWFUpload.QUEUE_ERROR.INVALID_FILETYPE:
+					alert("Error Code: Invalid File Type, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+					break;
+				default:
+					alert("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+					break;
+			}
+		} catch(e) {
+			this.debug(e);
+		}
+	},
+	onFileDialogComplete : function(numFilesSelected, numFilesQueued) {
+		try {
+			this.startUpload();
+		} catch (e)  {
+			this.debug(e);
+		}
+	},
+	onUploadStart : _true,
+	onUploadProgress : function(file, bytesLoaded, bytesTotal) {
+		try {
+			var $list, $lastopt, percent, filename;
+
+			$list    = $('#'+this.settings.fileListAreaID);
+			percent  = Math.ceil((bytesLoaded / bytesTotal) * 100);
+			filename = file.name;
+			$lastopt = $list.find('>option:last');
+
+			if(filename.length>20) filename = filename.substr(0,20)+'...';
+			if(!$lastopt.length || $lastopt.attr('value') != file.id) {
+				$lastopt = $('<option />').attr('value', file.id).appendTo($list);
+			}
+
+			$lastopt.text(filename + ' (' + percent + '%)');
+		} catch (e)  {
+			this.debug(e);
+		}
+	},
+	onUploadSuccess : function(file, serveData) {
+		try {
+			if(this.getStats().files_queued !== 0) this.startUpload();
+		} catch (e)  {
+			this.debug(e);
+		}
+	},
+	onUploadError : function(file, errorCode, message) {
+		try {
+			switch (errorCode) {
+			case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:
+				alert("Error Code: HTTP Error, File name: " + file.name + ", Message: " + message);
+				break;
+			case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:
+				alert("Error Code: Upload Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+				break;
+			case SWFUpload.UPLOAD_ERROR.IO_ERROR:
+				alert("Error Code: IO Error, File name: " + file.name + ", Message: " + message);
+				break;
+			case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:
+				alert("Error Code: Security Error, File name: " + file.name + ", Message: " + message);
+				break;
+			case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:
+				alert("Error Code: Upload Limit Exceeded, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+				break;
+			case SWFUpload.UPLOAD_ERROR.FILE_VALIDATION_FAILED:
+				alert("Error Code: File Validation Failed, File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+				break;
+			case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:
+				// If there aren't any files left (they were all cancelled) disable the cancel button
+				if (this.getStats().files_queued === 0) {
+					document.getElementById(this.customSettings.cancelButtonId).disabled = true;
+				}
+				break;
+			case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:
+				break;
+			default:
+				alert("Error Code: " + errorCode + ", File name: " + file.name + ", File size: " + file.size + ", Message: " + message);
+				break;
+			}
+		} catch (ex) {
+			this.debug(ex);
+		}
+	},
+	onUploadComplete : function(file) {
+		try {
+			var fileListAreaID = this.settings["fileListAreaID"];
+			var uploadTargetSrl = this.settings["uploadTargetSrl"];
+			reloadFileList(this.settings);
+		} catch(e) {
+			this.debug(ex);
+		}
+	}
+};
+
+function reloadFileList(cfg) {
+	var params = {
+		mid : current_mid,
+		file_list_area_id : cfg.fileListAreaID,
+		editor_sequence   : cfg.editorSequence,
+		upload_target_srl : cfg.uploadTargetSrl
+	};
+
+	function autosave() {
+		if(typeof(_editorAutoSave) != 'function') return;
+		uploadAutosaveChecker = true;
+		_editorAutoSave(true);
+	}
+
+	function on_complete(ret, response_tags) {
+		var $list, seq, files, target_srl, up_status, remain, items, i, c, itm, file_srl;
+
+		seq   = ret.editor_sequence;
+		files = ret.files;
+		up_status  = ret.upload_status;
+		target_srl = ret.upload_target_srl;
+		remain     = Math.floor((parseInt(ret.left_size,10)||0)/1024);
+
+		$list = $('#'+cfg.fileListAreaID).empty();
+
+		if(target_srl) {
+			if(editorRelKeys[seq].primary.value != target_srl) {
+				editorRelKeys[seq].primary.value = target_srl;
+				autosave();
+			}
+
+			editorRelKeys[seq].primary.value = target_srl;
+			cfg.uploadTargetSrl = target_srl;
+		}
+
+		$('#'+cfg.uploaderStatusID).html(up_status);
+		$('#'+cfg.previewAreaID).empty();
+
+		if(files && files.item) {
+			items = files.item;
+			if(!$.isArray(items)) items = [items];
+			for(i=0,c=items.length; i < c; i++) {
+				itm = items[i];
+
+				file_srl = itm.file_srl;
+				uploadedFiles[file_srl] = itm;
+
+				itm.previewAreaID = cfg.previewAreaID;
+
+				if(/\.(jpe?g|png|gif)$/i.test(itm.download_url)) {
+					loaded_images[file_srl] = $('<img />').attr('src', itm.download_url).get(0);
+				}
+
+				$('<option />')
+					.text(itm.source_filename + ' ('+itm.disp_file_size+' )')
+					.attr('value', file_srl)
+					.appendTo($list);
+			}
+
+			if(i) $list.prop('selectedIndex', i-1).click();
+		}
+
+		// 문서 강제 자동저장 1번만 사용 ( 첨부파일 target_srl로 자동 저장문서를 저장하기 위한 용도일 뿐 )
+		if(!uploadAutosaveChecker) autosave();
+	};
+
+	exec_xml(
+		'file',         // module
+		'getFileList',  // act
+		params,         // parameters
+		on_complete,    // callback
+		'error,message,files,upload_status,upload_target_srl,editor_sequence,left_size'.split(',') // response_tags
+	);
+};
+
+window.editorUploadInit = init;
+window.reloadFileList   = reloadFileList;
+
+$(function(){
+	try { document.execCommand('BackgroundImageCache',false,true); } catch(e) { }
+});
+
+})(jQuery);
+
+function previewFiles(event, file_srl) {
+	var $opt, $select, $preview, fileinfo, filename, match, html, $=jQuery;
+
+	if(!file_srl) {
+		$opt = $(event.target).parent().andSelf().filter('select').find('>option:selected');
+		if(!$opt.length) return;
+
+		file_srl = $opt.attr('value');
+	}
+
+	if(!file_srl || !is_def(fileinfo=uploadedFiles[file_srl])) return;
+
+	$preview = $('#'+fileinfo.previewAreaID).html('&nbsp;');
+	if(!$preview.length) return;
+
+	filename = fileinfo.download_url || '';
+	match    = filename.match(/\.(?:(flv)|(swf)|(wmv|avi|mpe?g|as[fx]|mp3)|(jpe?g|png|gif))$/i);
+
+	if(fileinfo.direct_download != 'Y' || !match) {
+		html = '<img src="'+request_uri+'modules/editor/tpl/images/files.gif" border="0" width="100%" height="100%" />';
+	} else if(match[1]) { // flash video file
+        html = '<embed src="'+request_uri+'common/img/flvplayer.swf?autoStart=false&file='+uploaded_filename+'" width="100%" height="100%" type="application/x-shockwave-flash" />';
+	} else if(match[2]) { // shockwave flash file
+		html = '<embed src="'+request_uri+filename+'" width="100%" height="100%" type="application/x-shockwave-flash"  />';
+	} else if(match[3]) { // movie file
+		html = '<embed src="'+request_uri+filename+'" width="100%" height="100%" autostart="true" showcontrols="0" />';
+	} else if(match[4]) { // image file
+		html = '<img src="'+request_uri+filename+'" border="0" width="100%" height="100%" />';
+	}
+
+	if(html) $preview.html(html);
+}
+
+function removeUploadedFile(editorSequence) {
+	var settings = uploaderSettings[editorSequence];
+	var fileListAreaID = settings["fileListAreaID"];
+	var fileListObj = get_by_id(fileListAreaID);
+	if(!fileListObj) return;
+
+	if(fileListObj.selectedIndex<0) return;
+
+	var file_srls = new Array();
+	for(var i=0;i<fileListObj.options.length;i++) {
+		if(!fileListObj.options[i].selected) continue;
+		var file_srl = fileListObj.options[i].value;
+		if(!file_srl) continue;
+		file_srls[file_srls.length] = file_srl;
+	}
+
+	if(file_srls.length<1) return;
+
+	var params = {
+		file_srls       : file_srls.join(','),
+		editor_sequence : editorSequence
+	};
+
+	exec_xml("file","procFileDelete", params, function() { reloadFileList(settings); } );
+}
+
+function insertUploadedFile(editorSequence) {
+
+    var settings = uploaderSettings[editorSequence];
+    var fileListAreaID = settings["fileListAreaID"];
+    var fileListObj = get_by_id(fileListAreaID);
+    if(!fileListObj) return;
+
+    if(editorMode[editorSequence]=='preview') return;
+
+    var text = new Array();
+    for(var i=0;i<fileListObj.options.length;i++) {
+        if(!fileListObj.options[i].selected) continue;
+        var file_srl = fileListObj.options[i].value;
+        if(!file_srl) continue;
+
+        var file = uploadedFiles[file_srl];
+        editorFocus(editorSequence);
+
+        // 바로 링크 가능한 파일의 경우 (이미지, 플래쉬, 동영상 등..)
+        if(file.direct_download == 'Y') {
+            // 이미지 파일의 경우 image_link 컴포넌트 열결
+            if(/\.(jpg|jpeg|png|gif)$/i.test(file.download_url)) {
+                if(loaded_images[file_srl]) {
+                    var obj = loaded_images[file_srl];
+                }
+                else {
+                    var obj = new Image();
+                    obj.src = file.download_url;
+                }
+                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";
+                text.push(temp_code);
+            // 이미지외의 경우는 multimedia_link 컴포넌트 연결
+            } else {
+                text.push("<img src=\"common/img/blank.gif\" editor_component=\"multimedia_link\" multimedia_src=\""+file.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=\"\" />");
+            }
+
+        // binary파일의 경우 url_link 컴포넌트 연결
+        } else {
+            text.push("<a href=\""+file.download_url+"\">"+file.source_filename+"</a>\n");
+        }
+    }
+
+    // html 모드
+    if(editorMode[editorSequence]=='html'){
+        if(text.length>0) get_by_id('editor_textarea_'+editorSequence).value += text.join('');
+
+    // 위지윅 모드
+    }else{
+        var iframe_obj = editorGetIFrame(editorSequence);
+        if(!iframe_obj) return;
+        if(text.length>0) editorReplaceHTML(iframe_obj, text.join(''));
+    }
+}
diff --git a/modules/editor/tpl/setup_component.html b/modules/editor/tpl/setup_component.html
index e76908bce..8984571c0 100644
--- a/modules/editor/tpl/setup_component.html
+++ b/modules/editor/tpl/setup_component.html
@@ -1,18 +1,17 @@
-<!--%import("css/editor.css")-->
-<!--%import("css/editor_admin.css")-->
-<!--%import("js/editor_admin.js")-->
-<!--%import("filter/setup_component.xml")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_setup}</h3>
+<load target="css/editor.css" usecdn="true" />
+<load target="css/editor_admin.css" usecdn="true" />
+<load target="js/editor_admin.js" usecdn="true" />
+<h1 class="h1">{$lang->cmd_setup}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="get" onsubmit="return procFilter(this, setup_component);">
-<input type="hidden" name="component_name" value="{$component_name}" />
-
-    <div id="popBody">
-        <table cellspacing="0" class="rowTable">
-        <tr class="row2">
+<form ruleset="setupComponent" action="./" method="post">
+	<input type="hidden" name="module" value="editor" />
+	<input type="hidden" name="act" value="procEditorAdminSetupComponent" />
+	<input type="hidden" name="component_name" value="{$component_name}" />
+    <div class="table">
+        <table width="100%" border="1" cellspacing="0">
+        <tr>
             <th scope="row"><div>{$lang->component_name}</div></th>
             <td>{$component->component_name} ver. {$component->version}</td>
         </tr>
@@ -25,7 +24,7 @@
             </td>
         </tr>
         <!--@if($component->link)-->
-        <tr class="row2">
+        <tr>
             <th scope="row"><div>{$lang->component_link}</div></th>
             <td><a href="#" onclick="winopen('{$component->link}');return false;">{$component->link}</a></td>
         </tr>
@@ -35,13 +34,13 @@
         <tr class="row{$cycle_idx}">
             <th scope="row"><div>{$val->title}</div></th>
             <td>
-                <input type="text" name="{$key}" value="{$val->value}" class="inputTypeText w400" />
+                <input type="text" name="{$key}" value="{$val->value}" />
                 <p>{$val->description}</p>
             </td>
         </tr>
         <!--@end-->
 
-        <tr class="row2">
+        <tr>
             <th scope="row"><div>{$lang->grant}</div></th>
             <td>
             <!--@foreach($group_list as $key => $val)-->
@@ -72,7 +71,7 @@
                         <div id="section_{$module_category_srl}">
                         <!--@foreach($modules->list as $key => $val)-->
                             <div class="module_list">
-                                <input type="checkbox" value="{$key}" name="mid_list" id="chk_mid_list_{$key}" <!--@if(in_array($key, $component->mid_list))-->checked="checked"<!--@end--> /> 
+                                <input type="checkbox" value="{$key}" name="mid_list" id="chk_mid_list_{$key}" <!--@if(in_array($key, $component->mid_list))-->checked="checked"<!--@end--> />
                                 <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
                             </div>
                         <!--@end-->
@@ -84,9 +83,7 @@
 
         </table>
     </div>
-
-    <div id="popFooter">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" /></span>
+    <div class="btnArea">
+        <span class="btn"><input type="submit" value="{$lang->cmd_apply}" /></span>
     </div>
-
 </form>
diff --git a/modules/editor/tpl/view_component.html b/modules/editor/tpl/view_component.html
index 58aba3f44..bb29a7ce4 100644
--- a/modules/editor/tpl/view_component.html
+++ b/modules/editor/tpl/view_component.html
@@ -1,13 +1,11 @@
-<!--%import("css/editor.css")-->
-<!--%import("../../../modules/admin/tpl/css/admin.css")-->
+<load target="css/editor.css" usecdn="true" />
+<load target="../../../modules/admin/tpl/css/admin.css" usecdn="true" />
 
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$component->title} ver. {$component->version}</h3>
-</div>
+<h1 class="h1">{$component->title} ver. {$component->version}</h1>
 
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
+    <tr>
         <th scope="row"><div>{$lang->component_author}</div></th>
         <td>
             <!--@foreach($component->author as $author)-->
@@ -19,7 +17,7 @@
         <th scope="row"><div>{$lang->homepage}</div></th>
         <td class="blue"><a href="{$component->homepage}" onclick="window.open(this.href);return false;">{$component->homepage}</a></td>
     </tr><!--@end-->
-    <tr class="row2">
+    <tr>
         <th scope="row"><div>{$lang->regdate}</div></th>
         <td>{zdate(str_replace('-',"",$component->date), 'Y-m-d')}</td>
     </tr>
@@ -34,7 +32,7 @@
         </td>
     </tr><!--@end-->
 <!--@if($component->description)-->
-    <tr class="row2">
+    <tr>
         <th scope="row"><div>{$lang->component_description}</div></th>
         <td>{nl2br(trim($component->description))}</td>
     </tr><!--@end-->
@@ -42,19 +40,17 @@
 </div>
 
 <!--@if($component->history)-->
-<div id="popHistoryHeadder">
-    <h3 class="xeAdmin">{$lang->component_history}</h3>
-</div>
+<h1 class="h1">{$lang->component_history}</h1>
 
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <!--@foreach($component->history as $history)-->
     <tr class="row{$cycle_idx}">
         <th scope="row"><div>
             {$history->version}<br />
             {zdate($history->date, 'Y-m-d')}
         </div></th>
-        <td class="wide">
+        <td >
             <!--@foreach($history->author as $author)-->
             <p>{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a> / <a href="mailto:{$author->email_address}">{$author->email_address}</a>)</p>
             <!--@endforeach-->
diff --git a/modules/file/conf/info.xml b/modules/file/conf/info.xml
index 921934c02..7b683dc0a 100644
--- a/modules/file/conf/info.xml
+++ b/modules/file/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">첨부파일</title>
-    <title xml:lang="zh-CN">附件管理</title>
-    <title xml:lang="en">Attachment</title>
-    <title xml:lang="vi">Đính kèm</title>
-    <title xml:lang="es">Adjuntar archivos</title>
-    <title xml:lang="jp">添付ファイル</title>
-    <title xml:lang="ru">Вложения</title>
-    <title xml:lang="zh-TW">附加檔案</title>
-    <title xml:lang="tr">Ekler</title>
-    <description xml:lang="ko">첨부 파일 관리하는 모듈입니다.</description>
-    <description xml:lang="zh-CN">管理附件的模块。</description>
-    <description xml:lang="en">Module for managing attachments.</description>
-    <description xml:lang="vi">Module quản lý File đính kèm.</description>
-    <description xml:lang="es">Módulo para manejar los archivos adjuntos.</description>
-    <description xml:lang="jp">添付ファイルを管理するモジュールです。</description>
-    <description xml:lang="ru">Модуль для управления вложениями.</description>
-    <description xml:lang="zh-TW">管理附加檔案的模組。</description>
-    <description xml:lang="tr">Ekleri yönetmek için kullanılan modüldür.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>content</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">첨부파일</title>
+    <title xml:lang="zh-CN">附件管理</title>
+    <title xml:lang="en">Attachment</title>
+    <title xml:lang="vi">Đính kèm</title>
+    <title xml:lang="es">Adjuntar archivos</title>
+    <title xml:lang="jp">添付ファイル</title>
+    <title xml:lang="ru">Вложения</title>
+    <title xml:lang="zh-TW">附加檔案</title>
+    <title xml:lang="tr">Ekler</title>
+    <description xml:lang="ko">첨부 파일 관리하는 모듈입니다.</description>
+    <description xml:lang="zh-CN">管理附件的模块。</description>
+    <description xml:lang="en">Module for managing attachments.</description>
+    <description xml:lang="vi">Module quản lý File đính kèm.</description>
+    <description xml:lang="es">Módulo para manejar los archivos adjuntos.</description>
+    <description xml:lang="jp">添付ファイルを管理するモジュールです。</description>
+    <description xml:lang="ru">Модуль для управления вложениями.</description>
+    <description xml:lang="zh-TW">管理附加檔案的模組。</description>
+    <description xml:lang="tr">Ekleri yönetmek için kullanılan modüldür.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>content</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/file/conf/module.xml b/modules/file/conf/module.xml
index 5f74ecf78..dce90e68f 100644
--- a/modules/file/conf/module.xml
+++ b/modules/file/conf/module.xml
@@ -3,16 +3,46 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispFileAdminList" type="view" admin_index="true" standalone="true" />
-        <action name="dispFileAdminConfig" type="view" standalone="true" />
+        <action name="dispFileAdminList" type="view" admin_index="true" standalone="true" menu_name="file" menu_index="true" />
+        <action name="dispFileAdminConfig" type="view" menu_name="fileUpload" menu_index="true" />
         <action name="getFileList" type="model" standalone="true" />
         <action name="procFileUpload" type="controller" standalone="true" />
         <action name="procFileIframeUpload" type="controller" standalone="true" />
         <action name="procFileImageResize" type="controller" standalone="true" />
         <action name="procFileDelete" type="controller" standalone="true" />
         <action name="procFileDownload" type="controller" standalone="true" />
-        <action name="procFileAdminDeleteChecked" type="controller" standalone="true" />
-        <action name="procFileAdminInsertConfig" type="controller" standalone="true" />
-        <action name="procFileAdminInsertModuleConfig" type="controller" standalone="true" />
+        <action name="procFileAdminDeleteChecked" type="controller" standalone="true" ruleset="deleteChecked" />
+        <action name="procFileAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
+        <action name="procFileAdminInsertModuleConfig" type="controller" standalone="true" ruleset="fileModuleConfig" />
+        <action name="procFileAdminAddCart" type="controller" standalone="true" />
+        <action name="procFileGetList" type="controller" standalone="true" />
     </actions>
+	<menus>
+		<menu name="file">
+			<title xml:lang="en">File</title>
+			<title xml:lang="ko">파일</title>
+			<title xml:lang="zh-CN">File</title>
+			<title xml:lang="jp">File</title>
+			<title xml:lang="es">File</title>
+			<title xml:lang="ru">File</title>
+			<title xml:lang="fr">File</title>
+			<title xml:lang="zh-TW">File</title>
+			<title xml:lang="vi">File</title>
+			<title xml:lang="mn">File</title>
+			<title xml:lang="tr">File</title>
+		</menu>
+		<menu name="fileUpload">
+			<title xml:lang="en">File Upload</title>
+			<title xml:lang="ko">파일 업로드</title>
+			<title xml:lang="zh-CN">File Upload</title>
+			<title xml:lang="jp">File Upload</title>
+			<title xml:lang="es">File Upload</title>
+			<title xml:lang="ru">File Upload</title>
+			<title xml:lang="fr">File Upload</title>
+			<title xml:lang="zh-TW">File Upload</title>
+			<title xml:lang="vi">File Upload</title>
+			<title xml:lang="mn">File Upload</title>
+			<title xml:lang="tr">File Upload</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/file/file.admin.controller.php b/modules/file/file.admin.controller.php
index c1bd113f6..58101b90d 100644
--- a/modules/file/file.admin.controller.php
+++ b/modules/file/file.admin.controller.php
@@ -1,151 +1,181 @@
-<?php
-    /**
-     * @class  fileAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file 모듈의 admin controller 클래스
-     **/
-
-    class fileAdminController extends file {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 특정 모듈의 첨부파일 모두 삭제
-         **/
-        function deleteModuleFiles($module_srl) {
-            // 전체 첨부파일 목록을 구함
-            $args->module_srl = $module_srl;
-            $output = executeQueryArray('file.getModuleFiles',$args);
-            if(!$output) return $output;
-            $files = $output->data;
-
-            // DB에서 삭제
-            $args->module_srl = $module_srl;
-            $output = executeQuery('file.deleteModuleFiles', $args);
-            if(!$output->toBool()) return $output;
-
-            // 실제 파일 삭제 (일단 약속에 따라서 한번에 삭제)
-            FileHandler::removeDir( sprintf("./files/attach/images/%s/", $module_srl) ) ;
-            FileHandler::removeDir( sprintf("./files/attach/binaries/%s/", $module_srl) );
-
-            // DB에서 구한 파일 목록을 삭제
-            $path = array();
-            $cnt = count($files);
-            for($i=0;$i<$cnt;$i++) {
-                $uploaded_filename = $files[$i]->uploaded_filename;
-                FileHandler::removeFile($uploaded_filename);
-
-                $path_info = pathinfo($uploaded_filename);
-                if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
-            }
-
-            // 해당 글의 첨부파일 디렉토리 삭제
-            for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
-
-            return $output;
-        }
-
-        /**
-         * @brief 관리자 페이지에서 선택된 파일들을 삭제
-         **/
-        function procFileAdminDeleteChecked() {
-            // 선택된 글이 없으면 오류 표시
-            $cart = Context::get('cart');
-            if(!$cart) return $this->stop('msg_cart_is_null');
-            $file_srl_list= explode('|@|', $cart);
-            $file_count = count($file_srl_list);
-            if(!$file_count) return $this->stop('msg_cart_is_null');
-
-            $oFileController = &getController('file');
-
-            // 글삭제
-            for($i=0;$i<$file_count;$i++) {
-                $file_srl = trim($file_srl_list[$i]);
-                if(!$file_srl) continue;
-
-                $oFileController->deleteFile($file_srl);
-            }
-
-            $this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) );
-        }
-
-        /**
-         * @brief 파일 기본 정보의 추가
-         **/
-        function procFileAdminInsertConfig() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $config->allowed_filesize = Context::get('allowed_filesize');
-            $config->allowed_attach_size = Context::get('allowed_attach_size');
-            $config->allowed_filetypes = Context::get('allowed_filetypes');
-            $config->allow_outlink = Context::get('allow_outlink');
-            $config->allow_outlink_format = Context::get('allow_outlink_format');
-            $config->allow_outlink_site = Context::get('allow_outlink_site');
-
-            // module Controller 객체 생성하여 입력
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('file',$config);
-            return $output;
-        }
-
-        /**
-         * @brief 모듈별 파일 기본 정보의 추가
-         **/
-        function procFileAdminInsertModuleConfig() {
-            // 필요한 변수를 받아옴
-            $module_srl = Context::get('target_module_srl');
-
-            // 여러개의 모듈 일괄 설정일 경우
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-
-            $download_grant = trim(Context::get('download_grant'));
-
-            $file_config->allow_outlink = Context::get('allow_outlink');
-            $file_config->allow_outlink_format = Context::get('allow_outlink_format');
-            $file_config->allow_outlink_site = Context::get('allow_outlink_site');
-            $file_config->allowed_filesize = Context::get('allowed_filesize');
-            $file_config->allowed_attach_size = Context::get('allowed_attach_size');
-            $file_config->allowed_filetypes = Context::get('allowed_filetypes');
-            if($download_grant) $file_config->download_grant = explode('|@|',$download_grant);
-            else $file_config->download_grant = array();
-
-			//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
-			$userFileAllowSize = $this->_changeBytes($file_config->allowed_filesize.'M');
-			$userAttachAllowSize = $this->_changeBytes($file_config->allowed_attach_size.'M');
-			$iniPostMaxSize = $this->_changeBytes(ini_get('post_max_size'));
-			$iniUploadMaxSize = $this->_changeBytes(ini_get('upload_max_filesize'));
-			$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
-
-			if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
-				return new Object(-1, 'input size over than config in php.ini');
-
-            $oModuleController = &getController('module');
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                $oModuleController->insertModulePartConfig('file',$srl,$file_config);
-            }
-
-            $this->setError(-1);
-            $this->setMessage('success_updated');
-        }
-
-		/**
-		 * @brief php.ini에서 가져온 값의 형식이 M과 같을경우 byte로 바꿔주기
-		 **/
-		function _changeBytes($size_str)
-		{
-			switch (substr ($size_str, -1))
-			{
-				case 'M': case 'm': return (int)$size_str * 1048576;
-				case 'K': case 'k': return (int)$size_str * 1024;
-				case 'G': case 'g': return (int)$size_str * 1073741824;
-				default: return $size_str;
-			}
-		}
-    }
-?>
+<?php
+    /**
+     * @class  fileAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of the file module
+     **/
+
+    class fileAdminController extends file {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Delete the attachment of a particular module
+         **/
+        function deleteModuleFiles($module_srl) {
+            // Get a full list of attachments
+            $args->module_srl = $module_srl;
+			$columnList = array('file_srl', 'uploaded_filename');
+            $output = executeQueryArray('file.getModuleFiles',$args, $columnList);
+            if(!$output) return $output;
+            $files = $output->data;
+            // Remove from the DB
+            $args->module_srl = $module_srl;
+            $output = executeQuery('file.deleteModuleFiles', $args);
+            if(!$output->toBool()) return $output;
+            // Remove the file
+            FileHandler::removeDir( sprintf("./files/attach/images/%s/", $module_srl) ) ;
+            FileHandler::removeDir( sprintf("./files/attach/binaries/%s/", $module_srl) );
+            // Remove the file list obtained from the DB
+            $path = array();
+            $cnt = count($files);
+            for($i=0;$i<$cnt;$i++) {
+                $uploaded_filename = $files[$i]->uploaded_filename;
+                FileHandler::removeFile($uploaded_filename);
+
+                $path_info = pathinfo($uploaded_filename);
+                if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+            }
+            // Remove a file directory of the document
+            for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
+
+            return $output;
+        }
+
+        /**
+         * @brief Delete selected files from the administrator page
+         **/
+        function procFileAdminDeleteChecked() {
+            // An error appears if no document is selected
+            $cart = Context::get('cart');
+            if(!$cart) return $this->stop('msg_cart_is_null');
+            if(!is_array($cart)) $file_srl_list= explode('|@|', $cart);
+			else $file_srl_list = $cart;
+            $file_count = count($file_srl_list);
+            if(!$file_count) return $this->stop('msg_cart_is_null');
+
+            $oFileController = &getController('file');
+            // Delete the post
+            for($i=0;$i<$file_count;$i++) {
+                $file_srl = trim($file_srl_list[$i]);
+                if(!$file_srl) continue;
+
+                $oFileController->deleteFile($file_srl);
+            }
+
+            $this->setMessage( sprintf(Context::getLang('msg_checked_file_is_deleted'), $file_count) );
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Add file information
+         **/
+        function procFileAdminInsertConfig() {
+            // Get configurations (using module model object)
+            $config->allowed_filesize = Context::get('allowed_filesize');
+            $config->allowed_attach_size = Context::get('allowed_attach_size');
+            $config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
+            $config->allow_outlink = Context::get('allow_outlink');
+            $config->allow_outlink_format = Context::get('allow_outlink_format');
+            $config->allow_outlink_site = Context::get('allow_outlink_site');
+            // Create module Controller object
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('file',$config);
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispFileAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
+            return $output;
+        }
+
+        /**
+         * @brief Add file information for each module
+         **/
+        function procFileAdminInsertModuleConfig() {
+            // Get variables
+            $module_srl = Context::get('target_module_srl');
+            // In order to configure multiple modules at once
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+
+            $download_grant = Context::get('download_grant');
+
+            $file_config->allow_outlink = Context::get('allow_outlink');
+            $file_config->allow_outlink_format = Context::get('allow_outlink_format');
+            $file_config->allow_outlink_site = Context::get('allow_outlink_site');
+            $file_config->allowed_filesize = Context::get('allowed_filesize');
+            $file_config->allowed_attach_size = Context::get('allowed_attach_size');
+            $file_config->allowed_filetypes = str_replace(' ', '', Context::get('allowed_filetypes'));
+
+			if(!is_array($download_grant)) $file_config->download_grant = explode('|@|',$download_grant);
+			else $file_config->download_grant = $download_grant;
+
+			//관리자가 허용한 첨부파일의 사이즈가 php.ini의 값보다 큰지 확인하기 - by ovclas
+			$userFileAllowSize = $this->_changeBytes($file_config->allowed_filesize.'M');
+			$userAttachAllowSize = $this->_changeBytes($file_config->allowed_attach_size.'M');
+			$iniPostMaxSize = $this->_changeBytes(ini_get('post_max_size'));
+			$iniUploadMaxSize = $this->_changeBytes(ini_get('upload_max_filesize'));
+			$iniMinSzie = min($iniPostMaxSize, $iniUploadMaxSize);
+
+			if($userFileAllowSize > $iniMinSzie || $userAttachAllowSize > $iniMinSzie)
+				return new Object(-1, 'input size over than config in php.ini');
+
+            $oModuleController = &getController('module');
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                $oModuleController->insertModulePartConfig('file',$srl,$file_config);
+            }
+
+            $this->setError(-1);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Add to SESSION file srl
+         **/
+		function procFileAdminAddCart()
+		{
+			$file_srl = (int)Context::get('file_srl');
+			//$fileSrlList = array(500, 502);
+
+			$oFileModel = &getModel('file');
+			$output = $oFileModel->getFile($file_srl);
+			//$output = $oFileModel->getFile($fileSrlList);
+
+			if($output->file_srl)
+			{
+				if($_SESSION['file_management'][$output->file_srl]) unset($_SESSION['file_management'][$output->file_srl]);
+				else $_SESSION['file_management'][$output->file_srl] = true;
+			}
+		}
+
+		/**
+		 * @brief php.ini에서 가져온 값의 형식이 M과 같을경우 byte로 바꿔주기
+		 **/
+		function _changeBytes($size_str)
+		{
+			switch (substr ($size_str, -1))
+			{
+				case 'M': case 'm': return (int)$size_str * 1048576;
+				case 'K': case 'k': return (int)$size_str * 1024;
+				case 'G': case 'g': return (int)$size_str * 1073741824;
+				default: return $size_str;
+			}
+		}
+    }
+?>
diff --git a/modules/file/file.admin.model.php b/modules/file/file.admin.model.php
index 641d618e4..7be724a21 100644
--- a/modules/file/file.admin.model.php
+++ b/modules/file/file.admin.model.php
@@ -1,96 +1,124 @@
-<?php
-    /**
-     * @class  fileAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file 모듈의 admin model 클래스
-     **/
-
-    class fileAdminModel extends file {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 모든 첨부파일을 시간 역순으로 가져옴 (관리자용)
-         **/
-        function getFileList($obj) {
-            // 검색 옵션 정리
-            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
-            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
-
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'filename' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_filename = $search_keyword;
-                        break;
-                    case 'filesize_more' :
-                            $args->s_filesize_more = (int)$search_keyword;
-                        break;
-                    case 'filesize_mega_more' :
-                            $args->s_filesize_more = (int)$search_keyword * 1024 * 1024;
-                        break;
-					case 'filesize_less' :
-                            $args->s_filesize_less = (int)$search_keyword;
-                        break;
-					case 'filesize_mega_less' :
-                            $args->s_filesize_less = (int)$search_keyword * 1024 * 1024;
-                        break;
-                    case 'download_count' :
-                            $args->s_download_count = (int)$search_keyword;
-                        break;
-                    case 'regdate' :
-                            $args->s_regdate = $search_keyword;
-                        break;
-                    case 'ipaddress' :
-                            $args->s_ipaddress = $search_keyword;
-                        break;
-                    case 'user_id' :
-                            $args->s_user_id = $search_keyword;
-                        break;
-                    case 'user_name' :
-                            $args->s_user_name = $search_keyword;
-                        break;
-                    case 'nick_name' :
-                            $args->s_nick_name = $search_keyword;
-                        break;
-                }
-            }
-
-            // 유효/대기 상태 설정
-            if($obj->isvalid == 'Y') $args->isvalid = 'Y';
-            elseif($obj->isvalid == 'N') $args->isvalid = 'N';
-
-            // 멀티미디어/ 일반 상태 설정
-            if($obj->direct_download == 'Y') $args->direct_download = 'Y';
-            elseif($obj->direct_download == 'N') $args->direct_download= 'N';
-
-            // 변수 설정
-            $args->sort_index = $obj->sort_index;
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-            $args->s_module_srl = $obj->module_srl;
-            $args->exclude_module_srl = $obj->exclude_module_srl;
-
-            // file.getFileList쿼리 실행
-            $output = executeQuery('file.getFileList', $args);
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if(!$output->toBool()||!count($output->data)) return $output;
-
-            $oFileModel = &getModel('file');
-
-            foreach($output->data as $key => $file) {
-                $file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid);
-                $output->data[$key] = $file;
-            }
-
-            return $output;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  fileAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin model class of the file module
+     **/
+
+    class fileAdminModel extends file {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Get all the attachments in order by time descending (for administrators)
+         **/
+        function getFileList($obj, $columnList = array()) {
+			$this->_makeSearchParam($obj, $args);
+
+            // Set valid/invalid state
+            if($obj->isvalid == 'Y') $args->isvalid = 'Y';
+            elseif($obj->isvalid == 'N') $args->isvalid = 'N';
+            // Set multimedia/common file
+            if($obj->direct_download == 'Y') $args->direct_download = 'Y';
+            elseif($obj->direct_download == 'N') $args->direct_download= 'N';
+            // Set variables
+            $args->sort_index = $obj->sort_index;
+            $args->page = $obj->page?$obj->page:1;
+            $args->list_count = $obj->list_count?$obj->list_count:20;
+            $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->s_module_srl = $obj->module_srl;
+            $args->exclude_module_srl = $obj->exclude_module_srl;
+            // Execute the file.getFileList query
+            $output = executeQuery('file.getFileList', $args, $columnList);
+            // Return if no result or an error occurs
+            if(!$output->toBool()||!count($output->data)) return $output;
+
+            $oFileModel = &getModel('file');
+
+            foreach($output->data as $key => $file) {
+				if($_SESSION['file_management'][$file->file_srl]) $file->isCarted = true;
+				else $file->isCarted = false;
+
+                $file->download_url = $oFileModel->getDownloadUrl($file->file_srl, $file->sid);
+                $output->data[$key] = $file;
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief Return number of attachments which belongs to a specific document
+         **/
+        function getFilesCountByGroupValid($obj = '') {
+			//$this->_makeSearchParam($obj, $args);
+
+            $output = executeQueryArray('file.getFilesCountByGroupValid', $args);
+            return $output->data;
+        }
+
+        /**
+         * @brief Return number of attachments which belongs to a specific document
+         **/
+        function getFilesCountByDate($date = '') {
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+
+            $output = executeQuery('file.getFilesCount', $args);
+			if(!$output->toBool()) return 0;
+
+			return $output->data->count;
+        }
+
+		function _makeSearchParam(&$obj, &$args)
+		{
+            // Search options
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'filename' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_filename = $search_keyword;
+                        break;
+                    case 'filesize_more' :
+                            $args->s_filesize_more = (int)$search_keyword;
+                        break;
+                    case 'filesize_mega_more' :
+                            $args->s_filesize_more = (int)$search_keyword * 1024 * 1024;
+                        break;
+					case 'filesize_less' :
+                            $args->s_filesize_less = (int)$search_keyword;
+                        break;
+					case 'filesize_mega_less' :
+                            $args->s_filesize_less = (int)$search_keyword * 1024 * 1024;
+                        break;
+                    case 'download_count' :
+                            $args->s_download_count = (int)$search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress = $search_keyword;
+                        break;
+                    case 'user_id' :
+                            $args->s_user_id = $search_keyword;
+                        break;
+                    case 'user_name' :
+                            $args->s_user_name = $search_keyword;
+                        break;
+                    case 'nick_name' :
+                            $args->s_nick_name = $search_keyword;
+                        break;
+                    case 'isvalid' :
+                            $args->isvalid = $search_keyword;
+                        break;
+                }
+            }
+		}
+    }
+?>
diff --git a/modules/file/file.admin.view.php b/modules/file/file.admin.view.php
index 7ca6d1783..894332e9d 100644
--- a/modules/file/file.admin.view.php
+++ b/modules/file/file.admin.view.php
@@ -1,192 +1,189 @@
-<?php
-    /**
-     * @class  fileAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file 모듈의 admin view 클래스
-     **/
-
-    class fileAdminView extends file {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 목록 출력 (관리자용)
-         **/
-        function dispFileAdminList() {
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'file_srl'; ///< 소팅 값
-            $args->isvalid = Context::get('isvalid');
-            $args->module_srl = Context::get('module_srl');
-
-            // 목록 구함
-            $oFileModel = &getAdminModel('file');
-            $output = $oFileModel->getFileList($args);
-
-            // 목록의 loop를 돌면서 document를 구하기
-            if($output->data) {
-                $oCommentModel = &getModel('comment');
-                $oDocumentModel = &getModel('document');
-                $oModuleModel = &getModel('module');
-
-                $file_list = array();
-                $document_list = array();
-                $comment_list = array();
-                $module_list= array();
-
-                $doc_srls = array();
-                $com_srls = array();
-                $mod_srls= array();
-
-                foreach($output->data as $file) {
-                    $file_srl = $file->file_srl;
-                    $target_srl = $file->upload_target_srl;
-                    $file_update_args = null;
-                    $file_update_args->file_srl = $file_srl;
-
-                    // upload_target_type이 없으면 찾아서 업데이트
-                    if(!$file->upload_target_type) {
-                        // 찾아둔게 있으면 패스
-                        if($document_list[$target_srl]) {
-                            $file->upload_target_type = 'doc';
-                        } else if($comment_list[$target_srl]) {
-                            $file->upload_target_type = 'com';
-                        } else if($module_list[$target_srl]) {
-                            $file->upload_target_type = 'mod';
-                        } else {
-                            // document
-                            $document = $oDocumentModel->getDocument($target_srl);
-                            if($document->isExists()) {
-                                $file->upload_target_type = 'doc';
-                                $file_update_args->upload_target_type = $file->upload_target_type;
-                                $document_list[$target_srl] = $document;
-                            }
-                            // comment
-                            if(!$file->upload_target_type) {
-                                $comment = $oCommentModel->getComment($target_srl);
-                                if($comment->isExists()) {
-                                    $file->upload_target_type = 'com';
-                                    $file->target_document_srl = $comment->document_srl;
-                                    $file_update_args->upload_target_type = $file->upload_target_type;
-                                    $comment_list[$target_srl] = $comment;
-                                    $doc_srls[] = $comment->document_srl;
-                                }
-                            }
-                            // module (페이지인 경우)
-                            if(!$file->upload_target_type) {
-                                $module = $oModuleModel->getModulesInfo($target_srl);
-                                if($module) {
-                                    $file->upload_target_type = 'mod';
-                                    $file_update_args->upload_target_type = $file->upload_target_type;
-                                    $module_list[$module->comment_srl] = $module;
-                                }
-                            }
-                            if($file_update_args->upload_target_type) {
-                                executeQuery('file.updateFileTargetType', $file_update_args);
-                            }
-                        }
-
-                        // 이미 구해진 데이터가 있는 확인
-                        for($i = 0; $i < $com_srls_count; ++$i) {
-                            if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
-                        }
-                        for($i = 0; $i < $doc_srls_count; ++$i) {
-                            if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
-                        }
-                        for($i = 0; $i < $mod_srls_count; ++$i) {
-                            if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
-                        }
-                    }
-
-                    if($file->upload_target_type) {
-                        if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'})) {
-                            ${$file->upload_target_type.'_srls'}[] = $target_srl;
-                        }
-                    }
-
-                    $file_list[$file_srl] = $file;
-                    $mod_srls[] = $file->module_srl;
-                }
-
-                // 중복 제거
-                $doc_srls = array_unique($doc_srls);
-                $com_srls = array_unique($com_srls);
-                $mod_srls = array_unique($mod_srls);
-
-                // 댓글 목록
-                $com_srls_count = count($com_srls);
-                if($com_srls_count) {
-                    $comment_output = $oCommentModel->getComments($com_srls);
-                    foreach($comment_output as $comment) {
-                        $comment_list[$comment->comment_srl] = $comment;
-                        $doc_srls[] = $comment->document_srl;
-                    }
-                }
-
-                // 문서 목록
-                $doc_srls_count = count($doc_srls);
-                if($doc_srls_count) {
-                    $document_output = $oDocumentModel->getDocuments($doc_srls);
-                    foreach($document_output as $document) {
-                        $document_list[$document->document_srl] = $document;
-                    }
-                }
-
-                // 모듈 목록
-                $mod_srls_count = count($mod_srls);
-                if($mod_srls_count) {
-                    $module_output = $oModuleModel->getModulesInfo($mod_srls);
-					if($module_output && is_array($module_output)){
-						foreach($module_output as $module) {
-							$module_list[$module->module_srl] = $module;
-						}
-					}
-                }
-
-                foreach($file_list as $srl => $file) {
-                    if($file->upload_target_type == 'com') {
-                        $file_list[$srl]->target_document_srl = $comment_list[$file->upload_target_srl]->document_srl;
-                    }
-                }
-            }
-            Context::set('file_list', $file_list);
-            Context::set('document_list', $document_list);
-            Context::set('comment_list', $comment_list);
-            Context::set('module_list', $module_list);
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('page_navigation', $output->page_navigation);			
-			
-			$security = new Security();
-			$security->encodeHTML('file_list..source_filename','file_list..ipaddress');
-			$security->encodeHTML('module_list..browser_title','module_list..mid');						
-				
-			// 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('file_list');
-
-        }
-
-        /**
-         * @brief 첨부파일 정보 설정 (관리자용)
-         **/
-        function dispFileAdminConfig() {
-            $oFileModel = &getModel('file');
-            $config = $oFileModel->getFileConfig();
-            Context::set('config',$config);
-
-            // 템플릿 파일 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('file_config');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  fileAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view of the module class file
+     **/
+
+    class fileAdminView extends file {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Display output list (for administrator)
+         **/
+        function dispFileAdminList() {
+            // Options to get a list
+            $args->page = Context::get('page'); // /< Page
+            $args->list_count = 30; // /< Number of documents that appear on a single page
+            $args->page_count = 10; // /< Number of pages that appear in the page navigation
+
+            $args->sort_index = 'file_srl'; // /< Sorting values
+            $args->isvalid = Context::get('isvalid');
+            $args->module_srl = Context::get('module_srl');
+            // Get a list
+            $oFileAdminModel = &getAdminModel('file');
+			$columnList = array('file_srl', 'upload_target_srl', 'upload_target_type', 'sid', 'module_srl'
+					, 'source_filename', 'isvalid', 'file_size', 'download_count', 'files.regdate', 'ipaddress');
+            $output = $oFileAdminModel->getFileList($args, $columnList);
+            // Get the document for looping a list
+            if($output->data) {
+                $oCommentModel = &getModel('comment');
+                $oDocumentModel = &getModel('document');
+                $oModuleModel = &getModel('module');
+
+                $file_list = array();
+                $document_list = array();
+                $comment_list = array();
+                $module_list= array();
+
+                $doc_srls = array();
+                $com_srls = array();
+                $mod_srls= array();
+
+                foreach($output->data as $file) {
+                    $file_srl = $file->file_srl;
+                    $target_srl = $file->upload_target_srl;
+                    $file_update_args = null;
+                    $file_update_args->file_srl = $file_srl;
+                    // Find and update if upload_target_type doesn't exist
+                    if(!$file->upload_target_type) {
+                        // Pass if upload_target_type is already found 
+                        if($document_list[$target_srl]) {
+                            $file->upload_target_type = 'doc';
+                        } else if($comment_list[$target_srl]) {
+                            $file->upload_target_type = 'com';
+                        } else if($module_list[$target_srl]) {
+                            $file->upload_target_type = 'mod';
+                        } else {
+                            // document
+                            $document = $oDocumentModel->getDocument($target_srl);
+                            if($document->isExists()) {
+                                $file->upload_target_type = 'doc';
+                                $file_update_args->upload_target_type = $file->upload_target_type;
+                                $document_list[$target_srl] = $document;
+                            }
+                            // comment
+                            if(!$file->upload_target_type) {
+                                $comment = $oCommentModel->getComment($target_srl);
+                                if($comment->isExists()) {
+                                    $file->upload_target_type = 'com';
+                                    $file->target_document_srl = $comment->document_srl;
+                                    $file_update_args->upload_target_type = $file->upload_target_type;
+                                    $comment_list[$target_srl] = $comment;
+                                    $doc_srls[] = $comment->document_srl;
+                                }
+                            }
+                            // module (for a page)
+                            if(!$file->upload_target_type) {
+                                $module = $oModuleModel->getModulesInfo($target_srl);
+                                if($module) {
+                                    $file->upload_target_type = 'mod';
+                                    $file_update_args->upload_target_type = $file->upload_target_type;
+                                    $module_list[$module->comment_srl] = $module;
+                                }
+                            }
+                            if($file_update_args->upload_target_type) {
+                                executeQuery('file.updateFileTargetType', $file_update_args);
+                            }
+                        }
+                        // Check if data is already obtained
+                        for($i = 0; $i < $com_srls_count; ++$i) {
+                            if($comment_list[$com_srls[$i]]) delete($com_srls[$i]);
+                        }
+                        for($i = 0; $i < $doc_srls_count; ++$i) {
+                            if($document_list[$doc_srls[$i]]) delete($doc_srls[$i]);
+                        }
+                        for($i = 0; $i < $mod_srls_count; ++$i) {
+                            if($module_list[$mod_srls[$i]]) delete($mod_srls[$i]);
+                        }
+                    }
+
+                    if($file->upload_target_type) {
+                        if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'})) {
+                            ${$file->upload_target_type.'_srls'}[] = $target_srl;
+                        }
+                    }
+
+                    $file_list[$file_srl] = $file;
+                    $mod_srls[] = $file->module_srl;
+                }
+                // Remove duplication
+                $doc_srls = array_unique($doc_srls);
+                $com_srls = array_unique($com_srls);
+                $mod_srls = array_unique($mod_srls);
+                // Comment list
+                $com_srls_count = count($com_srls);
+                if($com_srls_count) {
+                    $comment_output = $oCommentModel->getComments($com_srls);
+                    foreach($comment_output as $comment) {
+                        $comment_list[$comment->comment_srl] = $comment;
+                        $doc_srls[] = $comment->document_srl;
+                    }
+                }
+                // Document list
+                $doc_srls_count = count($doc_srls);
+                if($doc_srls_count) {
+                    $document_output = $oDocumentModel->getDocuments($doc_srls);
+					if(is_array($document_output))
+					{
+						foreach($document_output as $document) {
+							$document_list[$document->document_srl] = $document;
+						}
+					}
+                }
+                // Module List
+                $mod_srls_count = count($mod_srls);
+                if($mod_srls_count) {
+					$columnList = array('module_srl', 'mid', 'browser_title');
+                    $module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
+					if($module_output && is_array($module_output)){
+						foreach($module_output as $module) {
+							$module_list[$module->module_srl] = $module;
+						}
+					}
+                }
+
+                foreach($file_list as $srl => $file) {
+                    if($file->upload_target_type == 'com') {
+                        $file_list[$srl]->target_document_srl = $comment_list[$file->upload_target_srl]->document_srl;
+                    }
+                }
+            }
+
+            Context::set('file_list', $file_list);
+            Context::set('document_list', $document_list);
+            Context::set('comment_list', $comment_list);
+            Context::set('module_list', $module_list);
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('page_navigation', $output->page_navigation);
+            // Set a template
+			$security = new Security();
+			$security->encodeHTML('file_list..source_filename','file_list..ipaddress');
+			$security->encodeHTML('module_list..browser_title','module_list..mid');						
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('file_list');
+
+        }
+
+        /**
+         * @brief Set attachment information (for administrator)
+         **/
+        function dispFileAdminConfig() {
+            $oFileModel = &getModel('file');
+            $config = $oFileModel->getFileConfig();
+            Context::set('config',$config);
+            // Set a template file
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('adminConfig');
+        }
+
+    }
+?>
diff --git a/modules/file/file.class.php b/modules/file/file.class.php
index 2846f38f0..596f7ca78 100644
--- a/modules/file/file.class.php
+++ b/modules/file/file.class.php
@@ -1,149 +1,133 @@
-<?php
-    /**
-     * @class  file
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file 모듈의 high 클래스
-     **/
-
-    class file extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            // 첨부파일의 기본 설정 저장
-            $config->allowed_filesize = '2';
-            $config->allowed_attach_size = '2';
-            $config->allowed_filetypes = '*.*';
-            $oModuleController->insertModuleConfig('file', $config);
-
-            // file 모듈에서 사용할 디렉토리 생성
-            FileHandler::makeDir('./files/attach/images');
-            FileHandler::makeDir('./files/attach/binaries');
-
-            // 2007. 10. 17 글/댓글의 입력/수정/삭제에 대한 trigger 등록
-            $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
-            $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
-            $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
-            $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
-            $oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
-            $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
-            $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
-            $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
-            $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
-            $oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
-
-            // 2009. 6. 9 자동저장문서 삭제시 첨부 파일도 같이 삭제
-            $oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 첨부파일도 모두 삭제하는 트리거 추가
-            $oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
-
-            // 2007. 10. 19 출력하기 전에 file 권한등을 세팅하는 트리거 호출
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-
-            // 2007. 10. 17 글/댓글의 입력/수정/삭제에 대한 trigger 등록
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
-
-            // 2009. 6. 9 자동저장문서 삭제시 첨부 파일도 같이 삭제
-            if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 첨부파일도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
-
-            // 2007. 10. 19 출력하기 전에 file 권한등을 세팅하는 트리거 호출
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
-
-            // 타겟 판별용 필드
-            if(!$oDB->isColumnExists('files', 'upload_target_type')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 2007. 10. 17 글/댓글의 입력/수정/삭제에 대한 trigger 등록
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
-                $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
-
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
-                $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
-
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
-                $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
-
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
-                $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
-
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
-                $oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
-
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
-                $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
-
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
-                $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
-
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
-                $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
-
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
-                $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
-
-            if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
-                $oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
-
-            // 2009. 6. 9 자동저장문서 삭제시 첨부 파일도 같이 삭제
-            if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
-                $oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 첨부파일도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
-                $oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
-
-            // 2007. 10. 19 출력하기 전에 file 권한등을 세팅하는 트리거 호출
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
-
-            // 타겟 판별용 필드
-            if(!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  file
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the file module
+     **/
+
+    class file extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+            // Save the default settings for attachments
+            $config->allowed_filesize = '2';
+            $config->allowed_attach_size = '2';
+            $config->allowed_filetypes = '*.*';
+            $oModuleController->insertModuleConfig('file', $config);
+            // Generate a directory for the file module
+            FileHandler::makeDir('./files/attach/images');
+            FileHandler::makeDir('./files/attach/binaries');
+            // 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
+            $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+            $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+            $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+            $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+            $oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
+            $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+            $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+            $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+            $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+            $oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
+            // 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
+            $oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
+            // 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
+            $oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
+            // 2007. 10. 19 Call a trigger to set up the file permissions before displaying
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            // 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before')) return true;
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after')) return true;
+            // 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
+            if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after')) return true;
+            // 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after')) return true;
+            // 2007. 10. 19 Call a trigger to set up the file permissions before displaying
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before')) return true;
+            // A column to determine a target type
+            if(!$oDB->isColumnExists('files', 'upload_target_type')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // 2007. 10. 17 Create a trigger to insert, update, delete documents and comments
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
+                $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
+                $oModuleController->insertTrigger('document.insertDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before'))
+                $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerCheckAttached', 'before');
+
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after'))
+                $oModuleController->insertTrigger('document.updateDocument', 'file', 'controller', 'triggerAttachFiles', 'after');
+
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after'))
+                $oModuleController->insertTrigger('document.deleteDocument', 'file', 'controller', 'triggerDeleteAttached', 'after');
+
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
+                $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
+                $oModuleController->insertTrigger('comment.insertComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before'))
+                $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentCheckAttached', 'before');
+
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after'))
+                $oModuleController->insertTrigger('comment.updateComment', 'file', 'controller', 'triggerCommentAttachFiles', 'after');
+
+            if(!$oModuleModel->getTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after'))
+                $oModuleController->insertTrigger('comment.deleteComment', 'file', 'controller', 'triggerCommentDeleteAttached', 'after');
+            // 2009. 6. 9 Delete all the attachements when auto-saved document is deleted
+            if(!$oModuleModel->getTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after'))
+                $oModuleController->insertTrigger('editor.deleteSavedDoc', 'file', 'controller', 'triggerDeleteAttached', 'after');
+            // 2007. 10. 17 Create a trigger to delete all the attachements when the module is deleted
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after'))
+                $oModuleController->insertTrigger('module.deleteModule', 'file', 'controller', 'triggerDeleteModuleFiles', 'after');
+            // 2007. 10. 19 Call a trigger to set up the file permissions before displaying
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before'))
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'file', 'view', 'triggerDispFileAdditionSetup', 'before');
+            // A column to determine a target type
+            if(!$oDB->isColumnExists('files', 'upload_target_type')) $oDB->addColumn('files', 'upload_target_type', 'char', '3');
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+
+    }
+?>
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index b72807a12..874b267d7 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -1,649 +1,653 @@
-<?php
-    /**
-     * @class  fileController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file 모듈의 controller 클래스
-     **/
-
-    class fileController extends file {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-
-        /**
-         * @brief 에디터에서 첨부파일 업로드 
-         * editor_sequence, uploadTargetSrl 변수값을 받아서 이를 바탕으로 첨부 대상 srl을 결정함.
-         * 만약 uploadTargetSrl이 없다면 새로 생성하고 return 하여 UI에서 이에 대한 값을 재설정하도록 하여
-         * sync이상없도록 함
-         **/
-        function procFileUpload() {
-            $file_info = Context::get('Filedata');
-
-            // 정상적으로 업로드된 파일이 아니면 오류 출력
-            if(!is_uploaded_file($file_info['tmp_name'])) exit();
-
-            // 기본적으로 필요한 변수 설정
-            $oFileModel = &getModel('file');
-            $editor_sequence = Context::get('editor_sequence');
-            $upload_target_srl = intval(Context::get('uploadTargetSrl'));
-            if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
-            $module_srl = $this->module_srl;
-
-            // 업로드 권한이 없거나 정보가 없을시 종료
-            if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
-
-            // upload_target_srl 값이 명시되지 않았을 경우 세션정보에서 추출
-            if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-
-            // 세션정보에도 정의되지 않았다면 새로 생성
-            if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
-
-
-            return $this->insertFile($file_info, $module_srl, $upload_target_srl);
-        }
-
-
-        /**
-         * @brief iframe 첨부파일 업로드 
-         **/
-        function procFileIframeUpload() {
-            // 기본적으로 필요한 변수 설정
-            $editor_sequence = Context::get('editor_sequence');
-            $callback = Context::get('callback');
-            $module_srl = $this->module_srl;
-            $upload_target_srl = intval(Context::get('uploadTargetSrl'));
-            if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
-
-            // 업로드 권한이 없거나 정보가 없을시 종료
-            if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
-
-            // upload_target_srl 값이 명시되지 않았을 경우 세션정보에서 추출
-            if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-
-            // 세션정보에도 정의되지 않았다면 새로 생성
-            if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
-
-            // file_srl이 요청되었을 경우 삭제 후 재업로드 시도
-            $file_srl = Context::get('file_srl');
-            if($file_srl) $this->deleteFile($file_srl);
-
-            $file_info = Context::get('Filedata');
-
-            // 정상적으로 업로드된 파일이 아니면 오류 출력
-            if(is_uploaded_file($file_info['tmp_name'])) {
-                $output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
-                Context::set('uploaded_fileinfo',$output);
-            }
-
-            Context::set('layout','none');
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('iframe');
-
-        }
-
-        /**
-         * @brief image resize
-         **/
-        function procFileImageResize() {
-            $source_src = Context::get('source_src');
-            $width = Context::get('width');
-            $height = Context::get('height');
-            $type = Context::get('type');
-            $output_src = Context::get('output_src');
-
-            if(!$source_src || !$width) return new Object(-1,'msg_invalid_request');
-            if(!$output_src){
-                $output_src = $source_src . '.resized' . strrchr($source_src,'.');
-            }
-            if(!$type) $type = 'ratio';
-            if(!$height) $height = $width-1;
-
-            if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio')){
-                $output->info = getimagesize($output_src);	
-                $output->src = $output_src;
-            }else{
-                return new Object(-1,'msg_invalid_request');
-            }
-
-            $this->add('resized_info',$output);		
-        }
-
-
-
-        /**
-         * @brief 첨부파일 다운로드
-         * 직접 요청을 받음
-         * file_srl : 파일의 sequence
-         * sid : db에 저장된 비교 값, 틀리면 다운로드 하지 않음
-         **/
-        function procFileDownload() {
-            $oFileModel = &getModel('file');
-
-            $file_srl = Context::get('file_srl');
-            $sid = Context::get('sid');
-            $logged_info = Context::get('logged_info');
-
-            // 파일의 정보를 DB에서 받아옴
-            $file_obj = $oFileModel->getFile($file_srl);
-
-            // 요청된 파일 정보가 잘못되었다면 파일을 찾을 수 없다는 오류 출력
-            if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
-
-            // 대기 상태일 경우 파일 다운로드 권한이 없음을 알림 (최고관리자는 다운 로드 허용)
-            if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
-
-            // 파일 이름
-            $filename = $file_obj->source_filename;
-            $file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
-
-            // 파일 외부링크 차단
-            if($file_module_config->allow_outlink == 'N') {
-                //외부링크 허용 확장자 처리
-                if($file_module_config->allow_outlink_format) {
-                    $allow_outlink_format_array = array();
-                    $allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
-                    if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
-
-                    foreach($allow_outlink_format_array as $val) {
-                        $val = trim($val);
-                        if(preg_match("/\.{$val}$/i", $filename)) {
-                            $file_module_config->allow_outlink = 'Y';
-                            break;
-                        }
-                    }
-                }
-                //외부링크 허용 사이트 처리
-                if($file_module_config->allow_outlink != 'Y') {
-                    $referer = parse_url($_SERVER["HTTP_REFERER"]);
-                    if($referer['host'] != $_SERVER['HTTP_HOST']) {
-                        if($file_module_config->allow_outlink_site) {
-                            $allow_outlink_site_array = array();
-                            $allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
-                            if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
-
-                            foreach($allow_outlink_site_array as $val) {
-                                $site = parse_url(trim($val));
-                                if($site['host'] == $referer['host']) {
-                                    $file_module_config->allow_outlink = 'Y';
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    else $file_module_config->allow_outlink = 'Y';
-                }
-                if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
-            }
-
-            // 파일 다운로드 권한이 있는지 확인
-            if(is_array($file_module_config->download_grant) && count($file_module_config->download_grant)>0) {
-                if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
-                $logged_info = Context::get('logged_info');
-                if($logged_info->is_admin != 'Y') {
-
-                    $oModuleModel =& getModel('module');
-                    $module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl);
-
-                    if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
-                    {
-                        $oMemberModel =& getModel('member');
-                        $member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
-
-                        $is_permitted = false;
-                        for($i=0;$i<count($file_module_config->download_grant);$i++) {
-                            $group_srl = $file_module_config->download_grant[$i];
-                            if($member_groups[$group_srl]) {
-                                $is_permitted = true;
-                                break;
-                            }
-                        }
-                        if(!$is_permitted) return $this->stop('msg_not_permitted_download');
-                    }
-                }
-            }
-
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
-            if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
-
-            // 파일 출력
-            if(strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) {
-                $filename = rawurlencode($filename);
-                $filename = preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1);
-            }
-
-            $uploaded_filename = $file_obj->uploaded_filename;
-            if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
-
-            $fp = fopen($uploaded_filename, 'rb');
-            if(!$fp) return $this->stop('msg_file_not_found');
-
-            header("Cache-Control: "); 
-            header("Pragma: "); 
-            header("Content-Type: application/octet-stream"); 
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 
-
-            header("Content-Length: " .(string)($file_obj->file_size)); 
-            header('Content-Disposition: attachment; filename="'.$filename.'"'); 
-            header("Content-Transfer-Encoding: binary\n"); 
-
-			// if file size is lager than 10MB, use fread function (#18675748)
-			if (filesize($uploaded_filename) > 1024 * 1024) {
-				while(!feof($fp)) echo fread($fp, 1024);
-				fclose($fp);
-			} else {
-				fpassthru($fp); 
-			}
-
-            // 이상이 없으면 download_count 증가
-            $args->file_srl = $file_srl;
-            executeQuery('file.updateFileDownloadCount', $args);
-
-            // trigger 호출 (after)
-            $output = ModuleHandler::triggerCall('file.downloadFile', 'after', $file_obj);
-
-            Context::close();
-
-            exit();
-        }
-
-        /**
-         * @brief 에디터에서 첨부 파일 삭제
-         **/
-        function procFileDelete() {
-            // 기본적으로 필요한 변수인 upload_target_srl, module_srl을 설정
-            $editor_sequence = Context::get('editor_sequence');
-            $file_srl = Context::get('file_srl');
-            $file_srls = Context::get('file_srls');
-            if($file_srls) $file_srl = $file_srls;
-
-            // 업로드 권한이 없거나 정보가 없을시 종료
-            if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
-
-            $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-
-			$logged_info = Context::get('logged_info');
-			$oFileModel = &getModel('file');
-
-            $srls = explode(',',$file_srl);
-            if(!count($srls)) return;
-
-            for($i=0;$i<count($srls);$i++) {
-                $srl = (int)$srls[$i];
-                if(!$srl) continue;
-
-                $args = null;
-                $args->file_srl = $srl;
-                $output = executeQuery('file.getFile', $args);
-                if(!$output->toBool()) continue;
-
-                $file_info = $output->data;
-                if(!$file_info) continue;
-
-				$file_grant = $oFileModel->getFileGrant($file_info, $logged_info); 
-
-				if(!$file_grant->is_deletable) continue;
-
-				if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
-            }
-
-        }
-
-        /**
-         * @brief 특정 upload_target_srl(document_srl)에 등록된 첨부파일의 갯수를 return하는 trigger
-         **/
-        function triggerCheckAttached(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            // 첨부 파일의 갯수를 구함
-            $oFileModel = &getModel('file');
-            $obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 upload_target_srl(document_srl)에 등록된 첨부파일을 연결하는 trigger
-         **/
-        function triggerAttachFiles(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            $output = $this->setFilesValid($document_srl);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 upload_target_srl(document_srl)에 등록된 첨부파일을 삭제하는 trigger
-         **/
-        function triggerDeleteAttached(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            $output = $this->deleteFiles($document_srl);
-            return $output;
-        }
-
-        /**
-         * @brief 특정 upload_target_srl(comment_srl)에 등록된 첨부파일의 갯수를 return하는 trigger
-         **/
-        function triggerCommentCheckAttached(&$obj) {
-            $comment_srl = $obj->comment_srl;
-            if(!$comment_srl) return new Object();
-
-            // 첨부 파일의 갯수를 구함
-            $oFileModel = &getModel('file');
-            $obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 upload_target_srl(comment_srl)에 등록된 첨부파일을 연결하는 trigger
-         **/
-        function triggerCommentAttachFiles(&$obj) {
-            $comment_srl = $obj->comment_srl;
-            $uploaded_count = $obj->uploaded_count;
-            if(!$comment_srl || !$uploaded_count) return new Object();
-
-            $output = $this->setFilesValid($comment_srl);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 upload_target_srl(comment_srl)에 등록된 첨부파일을 삭제하는 trigger
-         **/
-        function triggerCommentDeleteAttached(&$obj) {
-            $comment_srl = $obj->comment_srl;
-            if(!$comment_srl) return new Object();
-
-            $output = $this->deleteFiles($comment_srl);
-            return $output;
-        }
-
-        /**
-         * @brief module 삭제시 해당 첨부파일 모두 삭제하는 trigger
-         **/
-        function triggerDeleteModuleFiles(&$obj) {
-            $module_srl = $obj->module_srl;
-            if(!$module_srl) return new Object();
-
-            $oFileController = &getAdminController('file');
-            return $oFileController->deleteModuleFiles($module_srl);
-        }
-
-        /**
-         * @brief 업로드 가능하다고 세팅
-         **/
-        function setUploadInfo($editor_sequence, $upload_target_srl=0) {
-            $_SESSION['upload_info'][$editor_sequence]->enabled = true;
-            $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl;
-        }
-
-        /**
-         * @brief 특정 upload_target_srl의 첨부파일들의 상태를 유효로 변경
-         * 글이 등록될때 글에 첨부된 파일들의 상태를 유효상태로 변경함으로서 관리시 불필요 파일로 인식되지 않도록 함
-         **/
-        function setFilesValid($upload_target_srl) {
-            $args->upload_target_srl = $upload_target_srl;
-            return executeQuery('file.updateFileValid', $args);
-        }
-
-        /**
-         * @brief 첨부파일 추가
-         **/
-        function insertFile($file_info, $module_srl, $upload_target_srl, $download_count = 0, $manual_insert = false) {
-            // trigger 호출 (before)
-            $trigger_obj->module_srl = $module_srl;
-            $trigger_obj->upload_target_srl = $upload_target_srl;
-            $output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
-            if(!$output->toBool()) return $output;
-			
-			// A workaround for Firefox upload bug
-			if (preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match)) {
-				$file_info['name'] = base64_decode(strtr($match[1], ':', '/'));
-			}
-
-            if(!$manual_insert) {
-                // 첨부파일 설정 가져옴
-                $logged_info = Context::get('logged_info');
-                if($logged_info->is_admin != 'Y') {
-                    $oFileModel = &getModel('file');
-                    $config = $oFileModel->getFileConfig($module_srl);
-                    $allowed_filesize = $config->allowed_filesize * 1024 * 1024;
-                    $allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
-
-                    // 한 파일당 허용 용량 초과시 오류 출력
-                    if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
-
-
-                    // 해당 문서에 첨부된 모든 파일의 용량을 가져옴 (DB에서 가져옴)
-                    $size_args->upload_target_srl = $upload_target_srl;
-                    $output = executeQuery('file.getAttachedFileSize', $size_args);
-                    $attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
-                    if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
-                }
-            }
-
-            // 이미지인지 기타 파일인지 체크하여 upload path 지정
-            if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name'])) {
-                // direct 파일에 해킹을 의심할 수 있는 확장자가 포함되어 있으면 바로 삭제함
-                $file_info['name'] = preg_replace('/\.(php|phtm|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']);
-                $file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
-
-                $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
-
-				// special character to '_'
-				// change to md5 file name. because window php bug. window php is not recognize unicode character file name - by cherryfilter
-				$ext = substr(strrchr($file_info['name'],'.'),1);
-				//$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
-				$_filename = md5(crypt(rand(1000000,900000), rand(0,100))).'.'.$ext;
-                $filename  = $path.$_filename;
-                $idx = 1;
-                while(file_exists($filename)) {
-                    $filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1',$_filename);
-                    $idx++;
-                }
-                $direct_download = 'Y';
-            } else {
-                $path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
-                $filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
-                $direct_download = 'N';
-            }
-
-            // 디렉토리 생성
-            if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
-
-            // 파일 이동
-            if($manual_insert) {
-                @copy($file_info['tmp_name'], $filename);
-                if(!file_exists($filename)) {
-                    $filename = $path. md5(crypt(rand(1000000,900000).$file_info['name'])).'.'.$ext;
-                    @copy($file_info['tmp_name'], $filename);
-                }
-            } else {
-                if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
-                    $filename = $path. md5(crypt(rand(1000000,900000).$file_info['name'])).'.'.$ext;
-                    if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1,'msg_file_upload_error');
-                }
-            }
-
-            // 사용자 정보를 구함
-            $oMemberModel = &getModel('member');
-            $member_srl = $oMemberModel->getLoggedMemberSrl();
-
-            // 파일 정보를 정리
-            $args->file_srl = getNextSequence();
-            $args->upload_target_srl = $upload_target_srl;
-            $args->module_srl = $module_srl;
-            $args->direct_download = $direct_download;
-            $args->source_filename = $file_info['name'];
-            $args->uploaded_filename = $filename;
-            $args->download_count = $download_count;
-            $args->file_size = @filesize($filename);
-            $args->comment = NULL;
-            $args->member_srl = $member_srl;
-            $args->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
-
-            $output = executeQuery('file.insertFile', $args);
-            if(!$output->toBool()) return $output;
-
-            // trigger 호출 (after)
-            $trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-
-			$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
-
-            $output->add('file_srl', $args->file_srl);
-            $output->add('file_size', $args->file_size);
-            $output->add('sid', $args->sid);
-            $output->add('direct_download', $args->direct_download);
-            $output->add('source_filename', $args->source_filename);
-            $output->add('upload_target_srl', $upload_target_srl);
-            $output->add('uploaded_filename', $args->uploaded_filename);
-            return $output;
-        }
-
-        /**
-         * @brief 첨부파일 삭제
-         **/
-        function deleteFile($file_srl) {
-            if(!$file_srl) return;
-
-            $srls = explode(',',$file_srl);
-            if(!count($srls)) return;
-
-            for($i=0;$i<count($srls);$i++) {
-                $srl = (int)$srls[$i];
-                if(!$srl) continue;
-
-                $args = null;
-                $args->file_srl = $srl;
-                $output = executeQuery('file.getFile', $args);
-                if(!$output->toBool()) continue;
-
-                $file_info = $output->data;
-                if(!$file_info) continue;
-
-                $source_filename = $output->data->source_filename;
-                $uploaded_filename = $output->data->uploaded_filename;
-
-                // trigger 호출 (before)
-                $trigger_obj = $output->data;
-                $output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
-                if(!$output->toBool()) return $output;
-
-                // DB에서 삭제
-                $output = executeQuery('file.deleteFile', $args);
-                if(!$output->toBool()) return $output;
-
-                // trigger 호출 (after)
-                $trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
-                if(!$trigger_output->toBool()) return $trigger_output;
-
-                // 삭제 성공하면 파일 삭제
-                FileHandler::removeFile($uploaded_filename);
-            }
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정 문서의 첨부파일을 모두 삭제
-         **/
-        function deleteFiles($upload_target_srl) {
-            // 첨부파일 목록을 받음
-            $oFileModel = &getModel('file');
-            $file_list = $oFileModel->getFiles($upload_target_srl);
-
-            // 첨부파일이 없으면 성공 return
-            if(!is_array($file_list)||!count($file_list)) return new Object();
-
-            // DB에서 삭제 
-            $args->upload_target_srl = $upload_target_srl;
-            $output = executeQuery('file.deleteFiles', $args);
-            if(!$output->toBool()) return $output;
-
-            // 실제 파일 삭제
-            $path = array();
-            $file_count = count($file_list);
-            for($i=0;$i<$file_count;$i++) {
-                $uploaded_filename = $file_list[$i]->uploaded_filename;
-                FileHandler::removeFile($uploaded_filename);
-                $module_srl = $file_list[$i]->module_srl;
-
-                $path_info = pathinfo($uploaded_filename);
-                if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
-            }
-
-            // 해당 글의 첨부파일 디렉토리 삭제
-            for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정 글의 첨부파일을 다른 글로 이동
-         **/
-        function moveFile($source_srl, $target_module_srl, $target_srl) {
-            if($source_srl == $target_srl) return;
-
-            $oFileModel = &getModel('file');
-            $file_list = $oFileModel->getFiles($source_srl);
-            if(!$file_list) return;
-
-            $file_count = count($file_list);
-
-            for($i=0;$i<$file_count;$i++) {
-
-                unset($file_info);
-                $file_info = $file_list[$i];
-                $old_file = $file_info->uploaded_filename;
-
-                // 이미지인지 기타 파일인지 체크하여 이동할 위치 정함
-                if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info->source_filename)) {
-                    $path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
-                    $new_file = $path.$file_info->source_filename;
-                } else {
-                    $path = sprintf("./files/attach/binaries/%s/%s/", $target_module_srl, $target_srl);
-                    $new_file = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
-                }
-
-                // 이전 대상이 동일하면 그냥 패스
-                if($old_file == $new_file) continue;
-
-                // 디렉토리 생성
-                FileHandler::makeDir($path);
-
-                // 파일 이동
-                FileHandler::rename($old_file, $new_file);
-
-                // DB 정보도 수정
-                unset($args);
-                $args->file_srl = $file_info->file_srl;
-                $args->uploaded_filename = $new_file;
-                $args->module_srl = $file_info->module_srl;
-                $args->upload_target_srl = $target_srl;
-                executeQuery('file.updateFile', $args);
-            }
-        }
-
-        /**
-         * @brief upload_target_srl을 키로 하는 첨부파일을 찾아서 java script 코드로 return
-         **/
-        function printUploadedFileList($editor_sequence, $upload_target_srl) {
-            return;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  fileController
+     * @author NHN (developers@xpressengine.com)
+     * @brief controller class of the file module
+     **/
+
+    class fileController extends file {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+
+        /**
+         * @brief Upload attachments in the editor
+         * Determine the upload target srl from editor_sequence and uploadTargetSrl variables.
+         * Create and return the UploadTargetSrl if not exists so that UI can use the value
+         * for sync.
+         **/
+        function procFileUpload() {
+            $file_info = Context::get('Filedata');
+
+            // An error appears if not a normally uploaded file
+            if(!is_uploaded_file($file_info['tmp_name'])) exit();
+
+            // Basic variables setting
+            $oFileModel = &getModel('file');
+            $editor_sequence = Context::get('editor_sequence');
+            $upload_target_srl = intval(Context::get('uploadTargetSrl'));
+            if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+            $module_srl = $this->module_srl;
+            // Exit a session if there is neither upload permission nor information
+            if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+            // Extract from session information if upload_target_srl is not specified
+            if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+            // Create if upload_target_srl is not defined in the session information
+            if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+
+
+            return $this->insertFile($file_info, $module_srl, $upload_target_srl);
+        }
+
+
+        /**
+         * @brief iframe upload attachments
+         **/
+        function procFileIframeUpload() {
+            // Basic variables setting
+            $editor_sequence = Context::get('editor_sequence');
+            $callback = Context::get('callback');
+            $module_srl = $this->module_srl;
+            $upload_target_srl = intval(Context::get('uploadTargetSrl'));
+            if(!$upload_target_srl) $upload_target_srl = intval(Context::get('upload_target_srl'));
+
+            // Exit a session if there is neither upload permission nor information
+            if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+            // Extract from session information if upload_target_srl is not specified
+            if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+            // Create if upload_target_srl is not defined in the session information
+            if(!$upload_target_srl) $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl = getNextSequence();
+            // Delete and then attempt to re-upload if file_srl is requested
+            $file_srl = Context::get('file_srl');
+            if($file_srl) $this->deleteFile($file_srl);
+
+            $file_info = Context::get('Filedata');
+            // An error appears if not a normally uploaded file
+            if(is_uploaded_file($file_info['tmp_name'])) {
+                $output = $this->insertFile($file_info, $module_srl, $upload_target_srl);
+                Context::set('uploaded_fileinfo',$output);
+            }
+
+            Context::set('layout','none');
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('iframe');
+
+        }
+
+        /**
+         * @brief image resize
+         **/
+        function procFileImageResize() {
+            $source_src = Context::get('source_src');
+            $width = Context::get('width');
+            $height = Context::get('height');
+            $type = Context::get('type');
+            $output_src = Context::get('output_src');
+
+            if(!$source_src || !$width) return new Object(-1,'msg_invalid_request');
+            if(!$output_src){
+                $output_src = $source_src . '.resized' . strrchr($source_src,'.');
+            }
+            if(!$type) $type = 'ratio';
+            if(!$height) $height = $width-1;
+
+            if(FileHandler::createImageFile($source_src,$output_src,$width,$height,'','ratio')){
+                $output->info = getimagesize($output_src);	
+                $output->src = $output_src;
+            }else{
+                return new Object(-1,'msg_invalid_request');
+            }
+
+            $this->add('resized_info',$output);		
+        }
+
+
+
+        /**
+          * @brief Download Attachment
+         * Receive a request directly
+         * file_srl: File sequence
+         * sid : value in DB for comparison, No download if not matched
+         **/
+        function procFileDownload() {
+            $oFileModel = &getModel('file');
+
+            $file_srl = Context::get('file_srl');
+            $sid = Context::get('sid');
+            $logged_info = Context::get('logged_info');
+            // Get file information from the DB
+			$columnList = array('file_srl', 'sid', 'isvalid', 'source_filename', 'module_srl', 'uploaded_filename', 'file_size', 'member_srl', 'upload_target_srl');
+            $file_obj = $oFileModel->getFile($file_srl, $columnList);
+            // If the requested file information is incorrect, an error that file cannot be found appears
+            if($file_obj->file_srl!=$file_srl || $file_obj->sid!=$sid) return $this->stop('msg_file_not_found');
+            // Notify that file download is not allowed when standing-by(Only a top-administrator is permitted)
+            if($logged_info->is_admin != 'Y' && $file_obj->isvalid!='Y') return $this->stop('msg_not_permitted_download');
+            // File name
+            $filename = $file_obj->source_filename;
+            $file_module_config = $oFileModel->getFileModuleConfig($file_obj->module_srl);
+            // Not allow the file outlink
+            if($file_module_config->allow_outlink == 'N') {
+                // Handles extension to allow outlink
+                if($file_module_config->allow_outlink_format) {
+                    $allow_outlink_format_array = array();
+                    $allow_outlink_format_array = explode(',', $file_module_config->allow_outlink_format);
+                    if(!is_array($allow_outlink_format_array)) $allow_outlink_format_array[0] = $file_module_config->allow_outlink_format;
+
+                    foreach($allow_outlink_format_array as $val) {
+                        $val = trim($val);
+                        if(preg_match("/\.{$val}$/i", $filename)) {
+                            $file_module_config->allow_outlink = 'Y';
+                            break;
+                        }
+                    }
+                }
+                // Sites that outlink is allowed
+                if($file_module_config->allow_outlink != 'Y') {
+                    $referer = parse_url($_SERVER["HTTP_REFERER"]);
+                    if($referer['host'] != $_SERVER['HTTP_HOST']) {
+                        if($file_module_config->allow_outlink_site) {
+                            $allow_outlink_site_array = array();
+                            $allow_outlink_site_array = explode("\n", $file_module_config->allow_outlink_site);
+                            if(!is_array($allow_outlink_site_array)) $allow_outlink_site_array[0] = $file_module_config->allow_outlink_site;
+
+                            foreach($allow_outlink_site_array as $val) {
+                                $site = parse_url(trim($val));
+                                if($site['host'] == $referer['host']) {
+                                    $file_module_config->allow_outlink = 'Y';
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else $file_module_config->allow_outlink = 'Y';
+                }
+                if($file_module_config->allow_outlink != 'Y') return $this->stop('msg_not_allowed_outlink');
+            }
+
+            // Check if a permission for file download is granted
+			$downloadGrantCount = 0;
+			if(is_array($file_module_config->download_grant))
+			{
+				foreach($file_module_config->download_grant AS $value)
+					if($value) $downloadGrantCount++;
+			}
+
+            if(is_array($file_module_config->download_grant) && $downloadGrantCount>0) {
+                if(!Context::get('is_logged')) return $this->stop('msg_not_permitted_download');
+                $logged_info = Context::get('logged_info');
+                if($logged_info->is_admin != 'Y') {
+
+                    $oModuleModel =& getModel('module');
+					$columnList = array('module_srl', 'site_srl');
+                    $module_info = $oModuleModel->getModuleInfoByModuleSrl($file_obj->module_srl, $columnList);
+
+                    if(!$oModuleModel->isSiteAdmin($logged_info, $module_info->site_srl))
+                    {
+                        $oMemberModel =& getModel('member');
+                        $member_groups = $oMemberModel->getMemberGroups($logged_info->member_srl, $module_info->site_srl);
+
+                        $is_permitted = false;
+                        for($i=0;$i<count($file_module_config->download_grant);$i++) {
+                            $group_srl = $file_module_config->download_grant[$i];
+                            if($member_groups[$group_srl]) {
+                                $is_permitted = true;
+                                break;
+                            }
+                        }
+                        if(!$is_permitted) return $this->stop('msg_not_permitted_download');
+                    }
+                }
+            }
+            // Call a trigger (before)
+            $output = ModuleHandler::triggerCall('file.downloadFile', 'before', $file_obj);
+            if(!$output->toBool()) return $this->stop(($output->message)?$output->message:'msg_not_permitted_download');
+            // File Output
+            if(strstr($_SERVER['HTTP_USER_AGENT'], "MSIE")) {
+                $filename = rawurlencode($filename);
+                $filename = preg_replace('/\./', '%2e', $filename, substr_count($filename, '.') - 1);
+            }
+
+            $uploaded_filename = $file_obj->uploaded_filename;
+            if(!file_exists($uploaded_filename)) return $this->stop('msg_file_not_found');
+
+            $fp = fopen($uploaded_filename, 'rb');
+            if(!$fp) return $this->stop('msg_file_not_found');
+
+            header("Cache-Control: "); 
+            header("Pragma: "); 
+            header("Content-Type: application/octet-stream"); 
+            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); 
+
+            header("Content-Length: " .(string)($file_obj->file_size)); 
+            header('Content-Disposition: attachment; filename="'.$filename.'"'); 
+            header("Content-Transfer-Encoding: binary\n"); 
+
+			// if file size is lager than 10MB, use fread function (#18675748)
+			if (filesize($uploaded_filename) > 1024 * 1024) {
+				while(!feof($fp)) echo fread($fp, 1024);
+				fclose($fp);
+			} else {
+				fpassthru($fp); 
+			}
+
+            // Increase download_count
+            $args->file_srl = $file_srl;
+            executeQuery('file.updateFileDownloadCount', $args);
+            // Call a trigger (after)
+            $output = ModuleHandler::triggerCall('file.downloadFile', 'after', $file_obj);
+
+            Context::close();
+
+            exit();
+        }
+
+        /**
+         * @brief Delete an attachment from the editor
+         **/
+        function procFileDelete() {
+            // Basic variable setting(upload_target_srl and module_srl set)
+            $editor_sequence = Context::get('editor_sequence');
+            $file_srl = Context::get('file_srl');
+            $file_srls = Context::get('file_srls');
+            if($file_srls) $file_srl = $file_srls;
+            // Exit a session if there is neither upload permission nor information
+            if(!$_SESSION['upload_info'][$editor_sequence]->enabled) exit();
+
+            $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+
+			$logged_info = Context::get('logged_info');
+			$oFileModel = &getModel('file');
+
+            $srls = explode(',',$file_srl);
+            if(!count($srls)) return;
+
+            for($i=0;$i<count($srls);$i++) {
+                $srl = (int)$srls[$i];
+                if(!$srl) continue;
+
+                $args = null;
+                $args->file_srl = $srl;
+                $output = executeQuery('file.getFile', $args);
+                if(!$output->toBool()) continue;
+
+                $file_info = $output->data;
+                if(!$file_info) continue;
+
+				$file_grant = $oFileModel->getFileGrant($file_info, $logged_info); 
+
+				if(!$file_grant->is_deletable) continue;
+
+				if($upload_target_srl && $file_srl) $output = $this->deleteFile($file_srl);
+            }
+
+        }
+
+        /**
+         * @brief get file list
+         **/
+        function procFileGetList()
+		{
+			if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+			$fileSrls = Context::get('file_srls');
+			if($fileSrls) $fileSrlList = explode(',', $fileSrls);
+
+			global $lang;
+			if(count($fileSrlList) > 0) {
+				$oFileModel = &getModel('file');
+				$fileList = $oFileModel->getFile($fileSrlList);
+				if(!is_array($fileList)) $fileList = array($fileList);
+
+				if(is_array($fileList))
+				{
+					foreach($fileList AS $key=>$value)
+					{
+						$value->human_file_size = FileHandler::filesize($value->file_size);
+						if($value->isvalid=='Y') $value->validName = $lang->is_valid;
+						else $value->validName = $lang->is_stand_by;
+					}
+				}
+			}
+			else
+			{
+				$fileList = array();
+				$this->setMessage($lang->no_files);
+			}
+
+			$this->add('file_list', $fileList);
+        }
+        /**
+         * @brief A trigger to return numbers of attachments in the upload_target_srl (document_srl)
+         **/
+        function triggerCheckAttached(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+            // Get numbers of attachments
+            $oFileModel = &getModel('file');
+            $obj->uploaded_count = $oFileModel->getFilesCount($document_srl);
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to link the attachment with the upload_target_srl (document_srl)
+         **/
+        function triggerAttachFiles(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+
+            $output = $this->setFilesValid($document_srl);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to delete the attachment in the upload_target_srl (document_srl)
+         **/
+        function triggerDeleteAttached(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+
+            $output = $this->deleteFiles($document_srl);
+            return $output;
+        }
+
+        /**
+         * @brief A trigger to return numbers of attachments in the upload_target_srl (comment_srl)
+         **/
+        function triggerCommentCheckAttached(&$obj) {
+            $comment_srl = $obj->comment_srl;
+            if(!$comment_srl) return new Object();
+            // Get numbers of attachments
+            $oFileModel = &getModel('file');
+            $obj->uploaded_count = $oFileModel->getFilesCount($comment_srl);
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to link the attachment with the upload_target_srl (comment_srl)
+         **/
+        function triggerCommentAttachFiles(&$obj) {
+            $comment_srl = $obj->comment_srl;
+            $uploaded_count = $obj->uploaded_count;
+            if(!$comment_srl || !$uploaded_count) return new Object();
+
+            $output = $this->setFilesValid($comment_srl);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to delete the attachment in the upload_target_srl (comment_srl)
+         **/
+        function triggerCommentDeleteAttached(&$obj) {
+            $comment_srl = $obj->comment_srl;
+            if(!$comment_srl) return new Object();
+
+            $output = $this->deleteFiles($comment_srl);
+            return $output;
+        }
+
+        /**
+         * @brief A trigger to delete all the attachements when deleting the module
+         **/
+        function triggerDeleteModuleFiles(&$obj) {
+            $module_srl = $obj->module_srl;
+            if(!$module_srl) return new Object();
+
+            $oFileController = &getAdminController('file');
+            return $oFileController->deleteModuleFiles($module_srl);
+        }
+
+        /**
+         * @brief Upload enabled
+         **/
+        function setUploadInfo($editor_sequence, $upload_target_srl=0) {
+            $_SESSION['upload_info'][$editor_sequence]->enabled = true;
+            $_SESSION['upload_info'][$editor_sequence]->upload_target_srl = $upload_target_srl;
+        }
+
+        /**
+         * @brief Set the attachements of the upload_target_srl to be valid 
+         * By changing its state to valid when a document is inserted, it prevents from being considered as a unnecessary file
+         **/
+        function setFilesValid($upload_target_srl) {
+            $args->upload_target_srl = $upload_target_srl;
+            return executeQuery('file.updateFileValid', $args);
+        }
+
+        /**
+         * @brief Add an attachement
+         **/
+        function insertFile($file_info, $module_srl, $upload_target_srl, $download_count = 0, $manual_insert = false) {
+            // Call a trigger (before)
+            $trigger_obj->module_srl = $module_srl;
+            $trigger_obj->upload_target_srl = $upload_target_srl;
+            $output = ModuleHandler::triggerCall('file.insertFile', 'before', $trigger_obj);
+            if(!$output->toBool()) return $output;
+			
+			// A workaround for Firefox upload bug
+			if (preg_match('/^=\?UTF-8\?B\?(.+)\?=$/i', $file_info['name'], $match)) {
+				$file_info['name'] = base64_decode(strtr($match[1], ':', '/'));
+			}
+
+            if(!$manual_insert) {
+                // Get the file configurations
+                $logged_info = Context::get('logged_info');
+                if($logged_info->is_admin != 'Y') {
+                    $oFileModel = &getModel('file');
+                    $config = $oFileModel->getFileConfig($module_srl);
+                    $allowed_filesize = $config->allowed_filesize * 1024 * 1024;
+                    $allowed_attach_size = $config->allowed_attach_size * 1024 * 1024;
+                    // An error appears if file size exceeds a limit
+                    if($allowed_filesize < filesize($file_info['tmp_name'])) return new Object(-1, 'msg_exceeds_limit_size');
+                    // Get total file size of all attachements (from DB)
+                    $size_args->upload_target_srl = $upload_target_srl;
+                    $output = executeQuery('file.getAttachedFileSize', $size_args);
+                    $attached_size = (int)$output->data->attached_size + filesize($file_info['tmp_name']);
+                    if($attached_size > $allowed_attach_size) return new Object(-1, 'msg_exceeds_limit_size');
+                }
+            }
+
+            // Set upload path by checking if the attachement is an image or other kinds of file
+            if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_info['name'])) {
+                // Immediately remove the direct file if it has any kind of extensions for hacking
+                $file_info['name'] = preg_replace('/\.(php|phtm|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x',$file_info['name']);
+                $file_info['name'] = str_replace(array('<','>'),array('%3C','%3E'),$file_info['name']);
+
+                $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+
+				// special character to '_'
+				// change to md5 file name. because window php bug. window php is not recognize unicode character file name - by cherryfilter
+				$ext = substr(strrchr($file_info['name'],'.'),1);
+				//$_filename = preg_replace('/[#$&*?+%"\']/', '_', $file_info['name']);
+				$_filename = md5(crypt(rand(1000000,900000), rand(0,100))).'.'.$ext;
+                $filename  = $path.$_filename;
+                $idx = 1;
+                while(file_exists($filename)) {
+                    $filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1',$_filename);
+                    $idx++;
+                }
+                $direct_download = 'Y';
+            } else {
+                $path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+                $filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+                $direct_download = 'N';
+            }
+            // Create a directory
+            if(!FileHandler::makeDir($path)) return new Object(-1,'msg_not_permitted_create');
+            // Move the file
+            if($manual_insert) {
+                @copy($file_info['tmp_name'], $filename);
+                if(!file_exists($filename)) {
+                    $filename = $path. md5(crypt(rand(1000000,900000).$file_info['name'])).'.'.$ext;
+                    @copy($file_info['tmp_name'], $filename);
+                }
+            } else {
+                if(!@move_uploaded_file($file_info['tmp_name'], $filename)) {
+                    $filename = $path. md5(crypt(rand(1000000,900000).$file_info['name'])).'.'.$ext;
+                    if(!@move_uploaded_file($file_info['tmp_name'], $filename))  return new Object(-1,'msg_file_upload_error');
+                }
+            }
+            // Get member information
+            $oMemberModel = &getModel('member');
+            $member_srl = $oMemberModel->getLoggedMemberSrl();
+            // List file information
+            $args->file_srl = getNextSequence();
+            $args->upload_target_srl = $upload_target_srl;
+            $args->module_srl = $module_srl;
+            $args->direct_download = $direct_download;
+            $args->source_filename = $file_info['name'];
+            $args->uploaded_filename = $filename;
+            $args->download_count = $download_count;
+            $args->file_size = @filesize($filename);
+            $args->comment = NULL;
+            $args->member_srl = $member_srl;
+            $args->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
+
+            $output = executeQuery('file.insertFile', $args);
+            if(!$output->toBool()) return $output;
+            // Call a trigger (after)
+            $trigger_output = ModuleHandler::triggerCall('file.insertFile', 'after', $args);
+            if(!$trigger_output->toBool()) return $trigger_output;
+
+
+			$_SESSION['__XE_UPLOADING_FILES_INFO__'][$args->file_srl] = true;
+
+            $output->add('file_srl', $args->file_srl);
+            $output->add('file_size', $args->file_size);
+            $output->add('sid', $args->sid);
+            $output->add('direct_download', $args->direct_download);
+            $output->add('source_filename', $args->source_filename);
+            $output->add('upload_target_srl', $upload_target_srl);
+            $output->add('uploaded_filename', $args->uploaded_filename);
+            return $output;
+        }
+
+        /**
+         * @brief Delete the attachment
+         **/
+        function deleteFile($file_srl) {
+            if(!$file_srl) return;
+
+            $srls = explode(',',$file_srl);
+            if(!count($srls)) return;
+
+            for($i=0;$i<count($srls);$i++) {
+                $srl = (int)$srls[$i];
+                if(!$srl) continue;
+
+                $args = null;
+                $args->file_srl = $srl;
+                $output = executeQuery('file.getFile', $args);
+                if(!$output->toBool()) continue;
+
+                $file_info = $output->data;
+                if(!$file_info) continue;
+
+                $source_filename = $output->data->source_filename;
+                $uploaded_filename = $output->data->uploaded_filename;
+                // Call a trigger (before)
+                $trigger_obj = $output->data;
+                $output = ModuleHandler::triggerCall('file.deleteFile', 'before', $trigger_obj);
+                if(!$output->toBool()) return $output;
+                // Remove from the DB
+                $output = executeQuery('file.deleteFile', $args);
+                if(!$output->toBool()) return $output;
+                // Call a trigger (after)
+                $trigger_output = ModuleHandler::triggerCall('file.deleteFile', 'after', $trigger_obj);
+                if(!$trigger_output->toBool()) return $trigger_output;
+                // If successfully deleted, remove the file
+                FileHandler::removeFile($uploaded_filename);
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief Delete all attachments of a particular document
+         **/
+        function deleteFiles($upload_target_srl) {
+            // Get a list of attachements
+            $oFileModel = &getModel('file');
+			$columnList = array('uploaded_filename', 'module_srl');
+            $file_list = $oFileModel->getFiles($upload_target_srl, $columnList);
+            // Success returned if no attachement exists
+            if(!is_array($file_list)||!count($file_list)) return new Object();
+            // Remove from the DB
+            $args->upload_target_srl = $upload_target_srl;
+            $output = executeQuery('file.deleteFiles', $args);
+            if(!$output->toBool()) return $output;
+            // Delete the file
+            $path = array();
+            $file_count = count($file_list);
+            for($i=0;$i<$file_count;$i++) {
+                $uploaded_filename = $file_list[$i]->uploaded_filename;
+                FileHandler::removeFile($uploaded_filename);
+                $module_srl = $file_list[$i]->module_srl;
+
+                $path_info = pathinfo($uploaded_filename);
+                if(!in_array($path_info['dirname'], $path)) $path[] = $path_info['dirname'];
+            }
+            // Remove a file directory of the document
+            for($i=0;$i<count($path);$i++) FileHandler::removeBlankDir($path[$i]);
+
+            return $output;
+        }
+
+        /**
+         * @brief Move an attachement to the other document
+         **/
+        function moveFile($source_srl, $target_module_srl, $target_srl) {
+            if($source_srl == $target_srl) return;
+
+            $oFileModel = &getModel('file');
+            $file_list = $oFileModel->getFiles($source_srl);
+            if(!$file_list) return;
+
+            $file_count = count($file_list);
+
+            for($i=0;$i<$file_count;$i++) {
+
+                unset($file_info);
+                $file_info = $file_list[$i];
+                $old_file = $file_info->uploaded_filename;
+                // Determine the file path by checking if the file is an image or other kinds
+                if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_info->source_filename)) {
+                    $path = sprintf("./files/attach/images/%s/%s/", $target_module_srl,$target_srl);
+                    $new_file = $path.$file_info->source_filename;
+                } else {
+                    $path = sprintf("./files/attach/binaries/%s/%s/", $target_module_srl, $target_srl);
+                    $new_file = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+                }
+                // Pass if a target document to move is same
+                if($old_file == $new_file) continue;
+                // Create a directory
+                FileHandler::makeDir($path);
+                // Move the file
+                FileHandler::rename($old_file, $new_file);
+                // Update DB information
+                unset($args);
+                $args->file_srl = $file_info->file_srl;
+                $args->uploaded_filename = $new_file;
+                $args->module_srl = $file_info->module_srl;
+                $args->upload_target_srl = $target_srl;
+                executeQuery('file.updateFile', $args);
+            }
+        }
+
+        /**
+         * @brief Find the attachment where a key is upload_target_srl and then return java script code
+         **/
+        function printUploadedFileList($editor_sequence, $upload_target_srl) {
+            return;
+        }
+    }
+?>
diff --git a/modules/file/file.model.php b/modules/file/file.model.php
index f0f03a7ea..2dfd431e4 100644
--- a/modules/file/file.model.php
+++ b/modules/file/file.model.php
@@ -1,233 +1,243 @@
-<?php
-    /**
-     * @class  fileModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file 모듈의 model 클래스
-     **/
-
-    class fileModel extends file {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 특정 문서에 속한 첨부파일 목록을 return
-         * 문서 생성/ 수정시 ajax로 특정 upload_target_srl에 대해서 파일 목록을 요청받을 때 사용됨.
-         * upload_target_srl이 정해지지 않은 경우 서버측 session의 값으로 대체 시도
-         **/
-        function getFileList() {
-            $oModuleModel = &getModel('module');
-
-            $mid = Context::get('mid');
-            $editor_sequence = Context::get('editor_sequence');
-            $upload_target_srl = Context::get('upload_target_srl');
-            if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
-
-            if($upload_target_srl) {
-                $tmp_files = $this->getFiles($upload_target_srl);
-                $file_count = count($tmp_files);
-
-                for($i=0;$i<$file_count;$i++) {
-                    $file_info = $tmp_files[$i];
-                    if(!$file_info->file_srl) continue;
-
-                    $obj = null;
-                    $obj->file_srl = $file_info->file_srl;
-                    $obj->source_filename = $file_info->source_filename;
-                    $obj->file_size = $file_info->file_size;
-                    $obj->disp_file_size = FileHandler::filesize($file_info->file_size);
-                    if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid);
-                    else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
-                    $obj->direct_download = $file_info->direct_download;
-                    $files[] = $obj;
-                    $attached_size += $file_info->file_size;
-                }
-            } else {
-                $upload_target_srl = 0;
-                $attached_size = 0;
-                $files = array();
-            }
-
-            // 업로드 상태 표시 작성
-            $upload_status = $this->getUploadStatus($attached_size);
-
-            // 남은 용량 체크
-            $config = $oModuleModel->getModuleInfoByMid($mid);
-            $file_config = $this->getUploadConfig();
-            $left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
-
-            // 필요한 정보들 세팅
-            $this->add("files",$files);
-            $this->add("editor_sequence",$editor_sequence);
-            $this->add("upload_target_srl",$upload_target_srl);
-            $this->add("upload_status",$upload_status);
-            $this->add("left_size",$left_size);
-        }
-
-        /**
-         * @brief 특정 문서에 속한 첨부파일의 개수를 return
-         **/
-        function getFilesCount($upload_target_srl) {
-            $args->upload_target_srl = $upload_target_srl;
-            $output = executeQuery('file.getFilesCount', $args);
-            return (int)$output->data->count;
-        }
-
-        /**
-         * @brief 다운로드 경로를 구함
-         **/
-        function getDownloadUrl($file_srl, $sid) {
-            return sprintf('?module=%s&amp;act=%s&amp;file_srl=%s&amp;sid=%s', 'file', 'procFileDownload', $file_srl, $sid);
-        }
-
-        /**
-         * @brief 파일 설정 정보를 구함
-         **/
-        function getFileConfig($module_srl = null) {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-
-            $file_module_config = $oModuleModel->getModuleConfig('file');
-
-            if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
-            if(!$file_config) $file_config = $file_module_config;
-
-            if($file_config) {
-                $config->allowed_filesize = $file_config->allowed_filesize;
-                $config->allowed_attach_size = $file_config->allowed_attach_size;
-                $config->allowed_filetypes = $file_config->allowed_filetypes;
-                $config->download_grant = $file_config->download_grant;
-                $config->allow_outlink = $file_config->allow_outlink;
-                $config->allow_outlink_site = $file_config->allow_outlink_site;
-                $config->allow_outlink_format = $file_config->allow_outlink_format;
-            }
-
-            // 전체 파일첨부 속성을 먼저 따른다
-            if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
-            if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
-            if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
-            if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
-            if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
-            if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
-            if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
-
-            // 그래도 없으면 default로 
-            if(!$config->allowed_filesize) $config->allowed_filesize = '2';
-            if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
-            if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
-            if(!$config->allow_outlink) $config->allow_outlink = 'Y';
-            if(!$config->download_grant) $config->download_grant = array();
-
-            return $config;
-        }
-
-        /**
-         * @brief 파일 정보를 구함
-         **/
-        function getFile($file_srl) {
-            $args->file_srl = $file_srl;
-            $output = executeQuery('file.getFile', $args);
-            if(!$output->toBool()) return $output;
-
-            $file = $output->data;
-            $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
-
-            return $file;
-        }
-
-        /**
-         * @brief 특정 문서에 속한 파일을 모두 return
-         **/
-        function getFiles($upload_target_srl) {
-            $args->upload_target_srl = $upload_target_srl;
-            $args->sort_index = 'file_srl';
-            $output = executeQuery('file.getFiles', $args);
-            if(!$output->data) return;
-
-            $file_list = $output->data;
-
-            if($file_list && !is_array($file_list)) $file_list = array($file_list);
-
-            $file_count = count($file_list);
-            for($i=0;$i<$file_count;$i++) {
-                $file = $file_list[$i];
-                $file->source_filename = stripslashes($file->source_filename);
-                $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
-                $file_list[$i] = $file;
-            }
-
-            return $file_list;
-        }
-
-        /**
-         * @brief 첨부파일에 대한 설정을 return (관리자/비관리자 자동 구분)
-         **/
-        function getUploadConfig() {
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') {
-                $file_config->allowed_filesize = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize'));
-                $file_config->allowed_attach_size = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize'));
-                $file_config->allowed_filetypes = '*.*';
-            } else {
-                $module_srl = Context::get('module_srl');
-                // module_srl이 없으면 현재 모듈
-                if(!$module_srl) {
-                    $current_module_info = Context::get('current_module_info');
-                    $module_srl = $current_module_info->module_srl;
-                }
-                $file_config = $this->getFileConfig($module_srl);
-            }
-            return $file_config;
-        }
-
-        /**
-         * @brief 파일 업로드를 위한 관리자/비관리자에 따른 안내문구 return
-         **/
-        function getUploadStatus($attached_size = 0) {
-            $file_config = $this->getUploadConfig();
-
-            // 업로드 상태 표시 작성
-            $upload_status = sprintf(
-                    '%s : %s/ %s<br /> %s : %s (%s : %s)',
-                    Context::getLang('allowed_attach_size'),
-                    FileHandler::filesize($attached_size),
-                    FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
-                    Context::getLang('allowed_filesize'),
-                    FileHandler::filesize($file_config->allowed_filesize*1024*1024),
-                    Context::getLang('allowed_filetypes'),
-                    $file_config->allowed_filetypes
-                );
-            return $upload_status;
-        }
-
-        /**
-         * @brief 특정 모듈의 file 설정을 return
-         **/
-        function getFileModuleConfig($module_srl) {
-            return $this->getFileConfig($module_srl);
-        }
-
-		function getFileGrant($file_info, $member_info){
-			if (!$file_info) return null;
-
-			if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl]) {
-				$file_grant->is_deletable = true;
-				return $file_grant;
-			}
-
-			$oModuleModel = &getModel('module');
-			$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($file_info->module_srl), $member_info);
-
-			$oDocumentModel = &getModel('document');
-			$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
-			if ($oDocument->isExists()) $document_grant = $oDocument->isGranted(); 
-			
-			$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
-			
-			return $file_grant;
-		}
-    }
-?>
+<?php
+    /**
+     * @class  fileModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief model class of the file module
+     **/
+
+    class fileModel extends file {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Return a file list attached in the document
+         * It is used when a file list of the upload_target_srl is requested for creating/updating a document.
+         * Attempt to replace with sever-side session if upload_target_srl is not yet determined
+         **/
+        function getFileList() {
+            $oModuleModel = &getModel('module');
+
+            $mid = Context::get('mid');
+            $editor_sequence = Context::get('editor_sequence');
+            $upload_target_srl = Context::get('upload_target_srl');
+            if(!$upload_target_srl) $upload_target_srl = $_SESSION['upload_info'][$editor_sequence]->upload_target_srl;
+
+            if($upload_target_srl) {
+                $tmp_files = $this->getFiles($upload_target_srl);
+                $file_count = count($tmp_files);
+
+                for($i=0;$i<$file_count;$i++) {
+                    $file_info = $tmp_files[$i];
+                    if(!$file_info->file_srl) continue;
+
+                    $obj = null;
+                    $obj->file_srl = $file_info->file_srl;
+                    $obj->source_filename = $file_info->source_filename;
+                    $obj->file_size = $file_info->file_size;
+                    $obj->disp_file_size = FileHandler::filesize($file_info->file_size);
+                    if($file_info->direct_download=='N') $obj->download_url = $this->getDownloadUrl($file_info->file_srl, $file_info->sid);
+                    else $obj->download_url = str_replace('./', '', $file_info->uploaded_filename);
+                    $obj->direct_download = $file_info->direct_download;
+                    $files[] = $obj;
+                    $attached_size += $file_info->file_size;
+                }
+            } else {
+                $upload_target_srl = 0;
+                $attached_size = 0;
+                $files = array();
+            }
+            // Display upload status
+            $upload_status = $this->getUploadStatus($attached_size);
+            // Check remained file size until upload complete
+            //$config = $oModuleModel->getModuleInfoByMid($mid);	//perhaps config varialbles not used
+
+            $file_config = $this->getUploadConfig();
+            $left_size = $file_config->allowed_attach_size*1024*1024 - $attached_size;
+            // Settings of required information
+            $this->add("files",$files);
+            $this->add("editor_sequence",$editor_sequence);
+            $this->add("upload_target_srl",$upload_target_srl);
+            $this->add("upload_status",$upload_status);
+            $this->add("left_size",$left_size);
+        }
+
+        /**
+         * @brief Return number of attachments which belongs to a specific document
+         **/
+        function getFilesCount($upload_target_srl) {
+            $args->upload_target_srl = $upload_target_srl;
+            $output = executeQuery('file.getFilesCount', $args);
+            return (int)$output->data->count;
+        }
+
+        /**
+         * @brief Get a download path
+         **/
+        function getDownloadUrl($file_srl, $sid) {
+            return sprintf('?module=%s&amp;act=%s&amp;file_srl=%s&amp;sid=%s', 'file', 'procFileDownload', $file_srl, $sid);
+        }
+
+        /**
+         * @brief Get file cinfigurations
+         **/
+        function getFileConfig($module_srl = null) {
+            // Get configurations (using module model object)
+            $oModuleModel = &getModel('module');
+
+            $file_module_config = $oModuleModel->getModuleConfig('file');
+
+            if($module_srl) $file_config = $oModuleModel->getModulePartConfig('file',$module_srl);
+            if(!$file_config) $file_config = $file_module_config;
+
+            if($file_config) {
+                $config->allowed_filesize = $file_config->allowed_filesize;
+                $config->allowed_attach_size = $file_config->allowed_attach_size;
+                $config->allowed_filetypes = $file_config->allowed_filetypes;
+                $config->download_grant = $file_config->download_grant;
+                $config->allow_outlink = $file_config->allow_outlink;
+                $config->allow_outlink_site = $file_config->allow_outlink_site;
+                $config->allow_outlink_format = $file_config->allow_outlink_format;
+            }
+            // Property for all files comes first than each property
+            if(!$config->allowed_filesize) $config->allowed_filesize = $file_module_config->allowed_filesize;
+            if(!$config->allowed_attach_size) $config->allowed_attach_size = $file_module_config->allowed_attach_size;
+            if(!$config->allowed_filetypes) $config->allowed_filetypes = $file_module_config->allowed_filetypes;
+            if(!$config->allow_outlink) $config->allow_outlink = $file_module_config->allow_outlink;
+            if(!$config->allow_outlink_site) $config->allow_outlink_site = $file_module_config->allow_outlink_site;
+            if(!$config->allow_outlink_format) $config->allow_outlink_format = $file_module_config->allow_outlink_format;
+            if(!$config->download_grant) $config->download_grant = $file_module_config->download_grant;
+            // Default setting if not exists
+            if(!$config->allowed_filesize) $config->allowed_filesize = '2';
+            if(!$config->allowed_attach_size) $config->allowed_attach_size = '3';
+            if(!$config->allowed_filetypes) $config->allowed_filetypes = '*.*';
+            if(!$config->allow_outlink) $config->allow_outlink = 'Y';
+            if(!$config->download_grant) $config->download_grant = array();
+
+            return $config;
+        }
+
+        /**
+         * @brief Get file information
+         **/
+        function getFile($file_srl, $columnList = array()) {
+            $args->file_srl = $file_srl;
+            $output = executeQueryArray('file.getFile', $args, $columnList);
+            if(!$output->toBool()) return $output;
+
+			// old version compatibility
+			if(count($output->data) == 1)
+			{
+				$file = $output->data[0];
+				$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
+
+				return $file;
+			}
+			else
+			{
+				$fileList = array();
+				foreach($output->data AS $key=>$value)
+				{
+					$file = $value;
+					$file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
+					array_push($fileList, $file);
+				}
+				return $fileList;
+			}
+        }
+
+        /**
+         * @brief Return all files which belong to a specific document
+         **/
+        function getFiles($upload_target_srl, $columnList = array()) {
+            $args->upload_target_srl = $upload_target_srl;
+            $args->sort_index = 'file_srl';
+            $output = executeQuery('file.getFiles', $args, $columnList);
+            if(!$output->data) return;
+
+            $file_list = $output->data;
+
+            if($file_list && !is_array($file_list)) $file_list = array($file_list);
+
+            $file_count = count($file_list);
+            for($i=0;$i<$file_count;$i++) {
+                $file = $file_list[$i];
+                $file->source_filename = stripslashes($file->source_filename);
+                $file->download_url = $this->getDownloadUrl($file->file_srl, $file->sid);
+                $file_list[$i] = $file;
+            }
+
+            return $file_list;
+        }
+
+        /**
+         * @brief Return configurations of the attachement (it automatically checks if an administrator is)
+         **/
+        function getUploadConfig() {
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin == 'Y') {
+                $file_config->allowed_filesize = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize'));
+                $file_config->allowed_attach_size = preg_replace("/[a-z]/is","",ini_get('upload_max_filesize'));
+                $file_config->allowed_filetypes = '*.*';
+            } else {
+                $module_srl = Context::get('module_srl');
+                // Get the current module if module_srl doesn't exist
+                if(!$module_srl) {
+                    $current_module_info = Context::get('current_module_info');
+                    $module_srl = $current_module_info->module_srl;
+                }
+                $file_config = $this->getFileConfig($module_srl);
+            }
+            return $file_config;
+        }
+
+        /**
+         * @brief Return messages for file upload and it depends whether an admin is or not
+         **/
+        function getUploadStatus($attached_size = 0) {
+            $file_config = $this->getUploadConfig();
+            // Display upload status
+            $upload_status = sprintf(
+                    '%s : %s/ %s<br /> %s : %s (%s : %s)',
+                    Context::getLang('allowed_attach_size'),
+                    FileHandler::filesize($attached_size),
+                    FileHandler::filesize($file_config->allowed_attach_size*1024*1024),
+                    Context::getLang('allowed_filesize'),
+                    FileHandler::filesize($file_config->allowed_filesize*1024*1024),
+                    Context::getLang('allowed_filetypes'),
+                    $file_config->allowed_filetypes
+                );
+            return $upload_status;
+        }
+
+        /**
+         * @brief Return file configuration of the module
+         **/
+        function getFileModuleConfig($module_srl) {
+            return $this->getFileConfig($module_srl);
+        }
+
+		function getFileGrant($file_info, $member_info){
+			if (!$file_info) return null;
+
+			if ($_SESSION['__XE_UPLOADING_FILES_INFO__'][$file_info->file_srl]) {
+				$file_grant->is_deletable = true;
+				return $file_grant;
+			}
+
+			$oModuleModel = &getModel('module');
+			$grant = $oModuleModel->getGrant($oModuleModel->getModuleInfoByModuleSrl($file_info->module_srl), $member_info);
+
+			$oDocumentModel = &getModel('document');
+			$oDocument = $oDocumentModel->getDocument($file_info->upload_target_srl);
+			if ($oDocument->isExists()) $document_grant = $oDocument->isGranted(); 
+			
+			$file_grant->is_deletable = ($document_grant || $member_info->is_admin == 'Y' || $member_info->member_srl == $file_info->member_srl || $grant->manager);
+			
+			return $file_grant;
+		}
+    }
+?>
diff --git a/modules/file/file.view.php b/modules/file/file.view.php
index 6380a719f..823d14c1c 100644
--- a/modules/file/file.view.php
+++ b/modules/file/file.view.php
@@ -1,53 +1,50 @@
-<?php
-    /**
-     * @class  fileView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  file module의 view class
-     *
-     *
-     *
-     **/
-
-    class fileView extends file {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 서비스형 모듈의 추가 설정을 위한 부분
-         * file의 사용 형태에 대한 설정만 받음
-         **/
-        function triggerDispFileAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                // 선택된 모듈의 정보를 가져옴
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            // 선택된 모듈의 file설정을 가져옴
-            $oFileModel = &getModel('file');
-            $file_config = $oFileModel->getFileModuleConfig($current_module_srl);
-            Context::set('file_config', $file_config);
-
-            // 그룹의 설정을 위한 권한 가져오기
-            $oMemberModel = &getModel('member');
-            $site_module_info = Context::get('site_module_info');
-            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
-            Context::set('group_list', $group_list);
-
-            // 템플릿 파일 지정
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'file_module_config');
-            $obj .= $tpl;
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  fileView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The view class file module
+     *
+     *
+     *
+     **/
+
+    class fileView extends file {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief This is for additional configuration for service module
+         * It only receives file configurations
+         **/
+        function triggerDispFileAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // Get information of the current module
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+            // Get file configurations of the module
+            $oFileModel = &getModel('file');
+            $file_config = $oFileModel->getFileModuleConfig($current_module_srl);
+            Context::set('file_config', $file_config);
+            // Get a permission for group setting
+            $oMemberModel = &getModel('member');
+            $site_module_info = Context::get('site_module_info');
+            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
+            Context::set('group_list', $group_list);
+            // Set a template file
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'file_module_config');
+            $obj .= $tpl;
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/file/lang/en.lang.php b/modules/file/lang/en.lang.php
deleted file mode 100644
index 7c2fcd4e5..000000000
--- a/modules/file/lang/en.lang.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Attachment module's basic language pack
-     **/
-
-    $lang->file = 'Attachment';
-    $lang->file_name = 'File Name';
-    $lang->file_size = 'File Size';
-    $lang->download_count = 'Number of Downloads';
-    $lang->status = 'Status';
-    $lang->is_valid = 'Valid';
-    $lang->is_stand_by = 'Stand by';
-    $lang->file_list = 'Attachments List';
-    $lang->allow_outlink = 'External Link';
-    $lang->allow_outlink_site = 'Allowed Websites';
-    $lang->allow_outlink_format = 'Allowed Formats';
-    $lang->allowed_filesize = 'Maximum File Size';
-    $lang->allowed_attach_size = 'Maximum Attachments';
-    $lang->allowed_filetypes = 'Allowed Extensions';
-    $lang->enable_download_group = 'Download Allowed Groups';
-
-    $lang->about_allow_outlink = 'You can shut external links according to referers. (except media files like *.wmv, *.mp3)';
-    $lang->about_allow_outlink_format = 'These formats will always be allowed. Please use comma(,) for multiple input.<br />eg)hwp,doc,zip,pdf';
-    $lang->about_allow_outlink_site = 'These websites will alyways be allowed. Please use new line for multiple input.<br />ex)http://xpressengine.com/';
-	$lang->about_allowed_filesize = 'You can assign file size limit for each file. (Exclude administrators)';
-    $lang->about_allowed_attach_size = 'You can assign file size limit for each document. (Exclude administrators)';
-    $lang->about_allowed_filetypes = 'Only allowed extentsions can be attached. To allow an extension, use "*.[extention]". To allow multiple extensions, use ";" between each extension.<br />ex) *.* or *.jpg;*.gif;<br />(Exclude Administrators)';
-
-    $lang->cmd_delete_checked_file = 'Delete Selected Item(s)';
-    $lang->cmd_move_to_document = 'Move to Document';
-    $lang->cmd_download = 'Download';
-
-    $lang->msg_not_permitted_download = 'You do not have permission to download';
-    $lang->msg_cart_is_null = 'Please select file(s) to delete';
-    $lang->msg_checked_file_is_deleted = '%d attachment(s) was(were) deleted';
-    $lang->msg_exceeds_limit_size = 'File size of attachment is bigger than allowed size.';
-    $lang->msg_file_not_found = 'Could not find requested file.';
-
-
-    $lang->file_search_target_list = array(
-        'filename' => 'File Name',
-        'filesize_more' => 'File Size (byte, more)',
-        'filesize_mega_more' => 'File Size (mbyte, more)',
-		'filesize_less' => 'File Size (byte, less)',
-		'filesize_mega_less' => 'File Size (Mb, less)',
-        'download_count' => 'Downloads (more)',
-        'regdate' => 'Registered Date',
-        'user_id' => 'User UD',
-        'user_name' => 'User Name',
-        'nick_name' => 'Nickname',
-        'ipaddress' => 'IP Address',
-    );
-	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
-    $lang->msg_not_permitted_create = 'Failed to create a file or directory.';
-	$lang->msg_file_upload_error = 'An error has occurred during uploading.';
-
-?>
diff --git a/modules/file/lang/es.lang.php b/modules/file/lang/es.lang.php
deleted file mode 100644
index 6a6fd405d..000000000
--- a/modules/file/lang/es.lang.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/file/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma espaA±ol para los archivos adjuntos
-     **/
-
-    $lang->file = 'Adjuntar archivos';
-    $lang->file_name = 'Nombre del archivo';
-    $lang->file_size = 'Tamaño del archivo';
-    $lang->download_count = 'Cantidad Bajado';
-    $lang->status = 'Estado';
-    $lang->is_valid = 'Válido';
-    $lang->is_stand_by = 'En espera';
-    $lang->file_list = 'Lista de archivos adjuntos';
-    $lang->allow_outlink = 'Archivo Enlaces externos';
-    $lang->allow_outlink_site = 'Fuera del archivo de sitios permitidos';
-    $lang->allowed_filesize = 'Límite del tamaño del archivo adjunto';
-    $lang->allowed_attach_size = 'Límite del tamaño total de los archivos adjuntos por documento';
-    $lang->allowed_filetypes = 'Tipos de archivos permitidos';
-    $lang->enable_download_group = 'Descargar permitió grupos';
-
-    $lang->about_allow_outlink = 'Enlaces externos a Rusia Ripper puede bloquear el archivo. (*. WMV, *. mp3, etc, excepto los archivos multimedia)';
-    $lang->about_allow_outlink_site = 'Archivos, independientemente de la configuración para permitir a los enlaces externos es la dirección del sitio. Entrada múltiples gubunhaeju un cambio en la línea, por favor. <br /> Ej.) http://xpressengine.com/';
-	$lang->about_allowed_filesize = 'Puede definir el límite del tamaño del archivo adjunto. (exceptuando el administrador)';
-    $lang->about_allowed_attach_size = 'Puede definir el límite del tamaño total de los archivos adjuntos por documento. (exceptuando el administrador)';
-    $lang->about_allowed_filetypes = 'Puede definir las extensiones de los archivos permitidos. Para permitir una extensión use "*.extensión". Para permitir más de una extensión use ";".<br />ej) *.* o *.jpg;*.gif;etc.<br />(exceptuando el administrador)';
-
-    $lang->cmd_delete_checked_file = 'Eliminar el archivo seleccionado';
-    $lang->cmd_move_to_document = 'Mover hacia el doncumento';
-    $lang->cmd_download = 'Descargar';
-
-    $lang->msg_not_permitted_download = 'Usted no tiene ningún permiso para descargar';
-    $lang->msg_cart_is_null = 'Seleccione el archivo a eliminar';
-    $lang->msg_checked_file_is_deleted = 'Total de %d archivos eliminados';
-    $lang->msg_exceeds_limit_size = 'Ha excedido el límite del tamaño total de los archivos adjuntos';
-    $lang->msg_file_not_found = '요청하신 파일을 찾을 수 없습니다.';
-
-    $lang->file_search_target_list = array(
-        'filename' => 'Nombre del archivo',
-        'filesize_more' => 'Tamaño del archivo (Byte, sobre)',
-        'filesize_mega_more' => 'Tamaño del archivo (Mb, o mb)',
-		'filesize_less' => '파일크기 (byte, 이하)',
-		'filesize_mega_less' => '파일크기 (Mb, 이하)',
-        'download_count' => 'Descargados (Sobre)',
-        'user_id' => 'ID',
-        'user_name' => 'Nombre',
-        'nick_name' => 'Apodo',
-        'regdate' => 'La fecha registrada',
-        'ipaddress' => 'Dirección IP',
-    );
-	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
-    $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.';
-	$lang->msg_file_upload_error = '파일 업로드 중 에러가 발생하였습니다.';
-
-?>
diff --git a/modules/file/lang/fr.lang.php b/modules/file/lang/fr.lang.php
deleted file mode 100644
index 1bb1a9494..000000000
--- a/modules/file/lang/fr.lang.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en francais pour le module d\'Annexe
-     **/
-
-    $lang->file = 'Annexe';
-    $lang->file_name = 'Nom du Fichier';
-    $lang->file_size = 'Mesure du Fichier';
-    $lang->download_count = 'Somme du Telecharge';
-    $lang->status = 'Statut';
-    $lang->is_valid = 'Valide';
-    $lang->is_stand_by = 'Attente';
-    $lang->file_list = 'Liste des Annexes';
-    $lang->allow_outlink = '파일 외부 링크';
-    $lang->allow_outlink_site = '파일 외부 허용 사이트';
-    $lang->allowed_filesize = 'Mesure du Fichier Maximum';
-    $lang->allowed_attach_size = 'Somme des Annexes Maximum';
-    $lang->allowed_filetypes = 'Extensions consentis';
-    $lang->enable_download_group = 'Groupe permis de telecharger';
-
-    $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)';
-    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요.<br />ex)http://xpressengine.com/';
-	$lang->about_allowed_filesize = 'Vous pouvez designer la limite de mesure pour chaque fichier. (Exclure administrateurs)';
-    $lang->about_allowed_attach_size = 'Vous pouvez designer la limite de mesure pour chaque document. (Exclure administrateurs)';
-    $lang->about_allowed_filetypes = 'Extensions consentis seulement peuvent etre attaches. Pour consentir une extension, utilisez "*.[extention]". Pour consentir plusieurs extensions, utilisez ";" entre chaque extension.<br />ex) *.* ou *.jpg;*.gif;<br />(Exclure Administrateurs)';
-
-    $lang->cmd_delete_checked_file = 'Supprimer item(s) slectionne(s)';
-    $lang->cmd_move_to_document = 'Bouger au Document';
-    $lang->cmd_download = 'Telecharger';
-
-    $lang->msg_not_permitted_download = 'Vous n\'etes pas permis(e) de telecharger';
-    $lang->msg_cart_is_null = 'Choisissez un(des) fichier(s) a supprimer';
-    $lang->msg_checked_file_is_deleted = '%d Annexe(s) est(sont) supprime(s)';
-    $lang->msg_exceeds_limit_size = 'La mesure de l\'(des) Annexe(s) est plus grande que celle consentie.';
-    $lang->msg_file_not_found = '요청하신 파일을 찾을 수 없습니다.';
-
-    $lang->file_search_target_list = array(
-        'filename' => 'Nom de Fichier',
-        'filesize_more' => 'Mesure de Fichier (octet, surplus)',
-        'filesize_mega_more' => '파일크기 (Mb, 이상)',
-		'filesize_less' => '파일크기 (byte, 이하)',
-		'filesize_mega_less' => '파일크기 (Mb, 이하)',
-        'download_count' => 'Telecharges (surplus)',
-        'user_id' => '아이디',
-        'user_name' => '이름',
-        'nick_name' => '닉네임',
-        'regdate' => 'Enrgistre',
-        'ipaddress' => 'Adresse IP',
-    );
-	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
-    $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.';
-	$lang->msg_file_upload_error = '파일 업로드 중 에러가 발생하였습니다.';
-
-?>
diff --git a/modules/file/lang/jp.lang.php b/modules/file/lang/jp.lang.php
deleted file mode 100644
index 445ddfbd0..000000000
--- a/modules/file/lang/jp.lang.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  添付ファイル（file）モジュールの基本言語パッケージ
-     **/
-
-    $lang->file = '添付ファイル';
-    $lang->file_name = 'ファイル名';
-    $lang->file_size = 'ファイルサイズ';
-    $lang->download_count = 'ダウンロード数';
-    $lang->status = '状態';
-    $lang->is_valid = '有効';
-    $lang->is_stand_by = '待機';
-    $lang->file_list = '添付ファイルリスト';
-    $lang->allow_outlink = '外部からのファイルリンク';
-    $lang->allow_outlink_site = '外部からのファイルリンクを許可するサイト';
-    $lang->allow_outlink_format = '外部からのファイルリンクを許可する拡張子';
-    $lang->allowed_filesize = 'ファイルサイズ制限';
-    $lang->allowed_attach_size = '書き込みへの添付制限';
-    $lang->allowed_filetypes = '添付可能な拡張子';
-    $lang->enable_download_group = 'ダウンロード可能グループ';
-
-    $lang->about_allow_outlink = 'リファラーによって外部からのファイルリンクを制御出来ます。(*.wmv, *.mp3などのメディアファイルは除く)';
-    $lang->about_allow_outlink_format = '外部からのファイルリンク設定に構わず、常に外部からのリンクを許可する拡張子です。複数登録時には、「半角コンマ（,）」区切りで記入して下さい。<br />eg)txt,doc,zip,pdf';
-    $lang->about_allow_outlink_site = '外部からのファイルリンク設定に構わず、常に外部からのリンクを許可するURLです。複数登録時には、改行で記入して下さい。<br />ex)http://xpressengine.com/';
-    $lang->about_allowed_filesize = '一つのファイルに対して、アップロード出来るファイルの最大サイズを指定します（管理者除外）。';
-    $lang->about_allowed_attach_size = '一つの書き込みに対して、管理者以外のユーザーが添付出来る最大サイズを指定します。';
-    $lang->about_allowed_filetypes = 'ここで指定された種類のファイルのみ添付出来ます。"*.拡張子"で指定し、 ";"で区切って任意の拡張子を追加して指定出来ます。 （管理者は制限無し）<br />ex) *.* or *.jpg;*.gif;<br />';
-
-    $lang->cmd_delete_checked_file = '選択リスト削除';
-    $lang->cmd_move_to_document = '書き込みに移動する';
-    $lang->cmd_download = 'ダウンロード';
-
-    $lang->msg_not_permitted_download = 'ダウンロード権限がありません。';
-    $lang->msg_cart_is_null = '削除するファイルを選択して下さい';
-    $lang->msg_checked_file_is_deleted = '%d個の添付ファイルを削除しました';
-    $lang->msg_exceeds_limit_size = 'ファイルサイズの制限を超えたため、添付出来ません。';
-    $lang->msg_file_not_found = 'ファイルが見つかりません。';
-
-    $lang->file_search_target_list = array(
-        'filename' => 'ファイル名',
-        'filesize_more' => 'ファイルサイズ（(Byte以上）',
-        'filesize_mega_more' => 'ファイルサイズ (Mb、以上)',
-		'filesize_less' => 'ファイルサイズ (byte, 以下)',
-		'filesize_mega_less' => 'ファイルサイズ (Mb, 以下)',
-        'download_count' => 'ダウンロード数（以上）',
-        'user_id' => 'ユーザーＩＤ',
-        'user_name' => '名前',
-        'nick_name' => 'ニックネーム',
-        'regdate' => '登録日',
-        'ipaddress' => 'IPアドレス',
-    );
-	$lang->msg_not_allowed_outlink = '外部リンクからのダウンロードは許可されていません。'; 
-    $lang->msg_not_permitted_create = 'ファイルまたはディレクトリを生成できません。';
-	$lang->msg_file_upload_error = 'ファイルアップロードに失敗しました。';
-
-?>
diff --git a/modules/file/lang/ko.lang.php b/modules/file/lang/ko.lang.php
deleted file mode 100644
index 27eaaadd3..000000000
--- a/modules/file/lang/ko.lang.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  첨부 파일(file) 모듈의 기본 언어팩
-     **/
-
-    $lang->file = '첨부 파일';
-    $lang->file_name = '파일 이름';
-    $lang->file_size = '파일 크기';
-    $lang->download_count = '다운로드 받은 수';
-    $lang->status = '상태';
-    $lang->is_valid = '유효';
-    $lang->is_stand_by = '대기';
-    $lang->file_list = '첨부 파일 목록';
-    $lang->allow_outlink = '파일 외부 링크';
-    $lang->allow_outlink_site = '파일 외부 링크 허용 사이트';
-    $lang->allow_outlink_format = '파일 외부 링크 허용 확장자';
-    $lang->allowed_filesize = '파일 제한 크기';
-    $lang->allowed_attach_size = '문서 첨부 제한';
-    $lang->allowed_filetypes = '허용 확장자';
-    $lang->enable_download_group = '다운로드 가능 그룹';
-
-    $lang->about_allow_outlink = '리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다. (*.wmv, *.mp3등 미디어 파일 제외)';
-    $lang->about_allow_outlink_format = '파일 외부 링크 설정에 상관없이 허용하는 파일 확장자입니다. 여러 개 입력 시에 쉼표(,)을 이용해서 구분해주세요.<br />예)hwp,doc,zip,pdf';
-    $lang->about_allow_outlink_site = '파일 외부 링크 설정에 상관없이 허용하는 사이트 주소입니다. 여러 개 입력 시에 줄을 바꿔서 구분해주세요.<br />예)http://www.xpressengine.com';
-    $lang->about_allowed_filesize = '하나의 파일에 대해 최고 용량을 지정할 수 있습니다. (관리자는 제외)';
-    $lang->about_allowed_attach_size = '하나의 문서에 첨부할 수 있는 최고 용량을 지정할 수 있습니다. (관리자는 제외)';
-    $lang->about_allowed_filetypes = '허용한 확장자만 첨부할 수 있습니다. "*.확장자"로 지정할 수 있고 ";" 으로 여러 개 지정이 가능합니다.<br />예) *.* or *.jpg;*.gif;<br />(관리자는 제외)';
-
-    $lang->cmd_delete_checked_file = '선택항목 삭제';
-    $lang->cmd_move_to_document = '문서로 이동';
-    $lang->cmd_download = '다운로드';
-
-    $lang->msg_not_permitted_download = '다운로드 할 수 있는 권한이 없습니다.';
-    $lang->msg_cart_is_null = '삭제할 파일을 선택해주세요.';
-    $lang->msg_checked_file_is_deleted = '%d개의 첨부 파일이 삭제되었습니다.';
-    $lang->msg_exceeds_limit_size = '허용된 용량을 초과하여 첨부가 되지 않았습니다.';
-    $lang->msg_file_not_found = '요청하신 파일을 찾을 수 없습니다.';
-
-    $lang->file_search_target_list = array(
-        'filename' => '파일 이름',
-        'filesize_more' => '파일 크기 (byte, 이상)',
-        'filesize_mega_more' => '파일 크기 (MB, 이상)',
-        'filesize_less' => '파일 크기 (byte, 이하)',
-        'filesize_mega_less' => '파일 크기 (MB, 이하)',
-        'download_count' => '다운로드 횟수 (이상)',
-        'user_id' => '아이디',
-        'user_name' => '이름',
-        'nick_name' => '닉네임',
-        'regdate' => '등록일',
-        'ipaddress' => 'IP 주소',
-    );
-	$lang->msg_not_allowed_outlink = '외부링크에서 다운로드 할 수 없습니다.'; 
-    $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.';
-	$lang->msg_file_upload_error = '파일 업로드 중 에러가 발생하였습니다.';
-?>
diff --git a/modules/file/lang/lang.xml b/modules/file/lang/lang.xml
new file mode 100644
index 000000000..dc0ca3e72
--- /dev/null
+++ b/modules/file/lang/lang.xml
@@ -0,0 +1,515 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="file">
+		<value xml:lang="ko"><![CDATA[파일]]></value>
+		<value xml:lang="en"><![CDATA[File]]></value>
+		<value xml:lang="jp"><![CDATA[添付ファイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[附件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[附加檔案]]></value>
+		<value xml:lang="fr"><![CDATA[Annexe]]></value>
+		<value xml:lang="de"><![CDATA[file]]></value>
+		<value xml:lang="ru"><![CDATA[Вложение]]></value>
+		<value xml:lang="es"><![CDATA[Adjuntar archivos]]></value>
+		<value xml:lang="tr"><![CDATA[Ek]]></value>
+		<value xml:lang="vi"><![CDATA[Đính kèm]]></value>
+		<value xml:lang="mn"><![CDATA[file]]></value>
+	</item>
+	<item name="file_name">
+		<value xml:lang="ko"><![CDATA[파일 이름]]></value>
+		<value xml:lang="en"><![CDATA[File Name]]></value>
+		<value xml:lang="jp"><![CDATA[ファイル名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom du Fichier]]></value>
+		<value xml:lang="ru"><![CDATA[Имя файла]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del archivo]]></value>
+		<value xml:lang="tr"><![CDATA[Dosya Adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên File]]></value>
+	</item>
+	<item name="file_size">
+		<value xml:lang="ko"><![CDATA[파일 크기]]></value>
+		<value xml:lang="en"><![CDATA[File Size]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルサイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件大小]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案大小]]></value>
+		<value xml:lang="fr"><![CDATA[Mesure du Fichier]]></value>
+		<value xml:lang="ru"><![CDATA[Размер файла]]></value>
+		<value xml:lang="es"><![CDATA[Tamaño del archivo]]></value>
+		<value xml:lang="tr"><![CDATA[Dosya Boyutu]]></value>
+		<value xml:lang="vi"><![CDATA[Dung lượng]]></value>
+	</item>
+	<item name="download_count">
+		<value xml:lang="ko"><![CDATA[다운로드 받은 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of Downloads]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载次数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載次數]]></value>
+		<value xml:lang="fr"><![CDATA[Somme du Telecharge]]></value>
+		<value xml:lang="ru"><![CDATA[Загружено]]></value>
+		<value xml:lang="es"><![CDATA[Cantidad Bajado]]></value>
+		<value xml:lang="tr"><![CDATA[İndirme Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Lượt Download]]></value>
+	</item>
+	<item name="status">
+		<value xml:lang="ko"><![CDATA[상태]]></value>
+		<value xml:lang="en"><![CDATA[Status]]></value>
+		<value xml:lang="jp"><![CDATA[状態]]></value>
+		<value xml:lang="zh-CN"><![CDATA[状态]]></value>
+		<value xml:lang="zh-TW"><![CDATA[狀態]]></value>
+		<value xml:lang="fr"><![CDATA[Statut]]></value>
+		<value xml:lang="ru"><![CDATA[Состояние]]></value>
+		<value xml:lang="es"><![CDATA[Estado]]></value>
+		<value xml:lang="tr"><![CDATA[Durum]]></value>
+		<value xml:lang="vi"><![CDATA[Trạng thái]]></value>
+	</item>
+	<item name="is_valid">
+		<value xml:lang="ko"><![CDATA[유효]]></value>
+		<value xml:lang="en"><![CDATA[Valid]]></value>
+		<value xml:lang="jp"><![CDATA[有効]]></value>
+		<value xml:lang="zh-CN"><![CDATA[有效]]></value>
+		<value xml:lang="zh-TW"><![CDATA[有效]]></value>
+		<value xml:lang="fr"><![CDATA[Valide]]></value>
+		<value xml:lang="ru"><![CDATA[Верно]]></value>
+		<value xml:lang="es"><![CDATA[Válido]]></value>
+		<value xml:lang="tr"><![CDATA[Geçerli]]></value>
+		<value xml:lang="vi"><![CDATA[Hợp lệ]]></value>
+	</item>
+	<item name="is_stand_by">
+		<value xml:lang="ko"><![CDATA[대기]]></value>
+		<value xml:lang="en"><![CDATA[Stand by]]></value>
+		<value xml:lang="jp"><![CDATA[待機]]></value>
+		<value xml:lang="zh-CN"><![CDATA[等待]]></value>
+		<value xml:lang="zh-TW"><![CDATA[等待]]></value>
+		<value xml:lang="fr"><![CDATA[Attente]]></value>
+		<value xml:lang="ru"><![CDATA[Ожидание]]></value>
+		<value xml:lang="es"><![CDATA[En espera]]></value>
+		<value xml:lang="tr"><![CDATA[Askıya al]]></value>
+		<value xml:lang="vi"><![CDATA[Chờ duyệt]]></value>
+	</item>
+	<item name="file_list">
+		<value xml:lang="ko"><![CDATA[첨부 파일 목록]]></value>
+		<value xml:lang="en"><![CDATA[Attachments List]]></value>
+		<value xml:lang="jp"><![CDATA[添付ファイルリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[附件列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案清單]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Annexes]]></value>
+		<value xml:lang="ru"><![CDATA[Список Вложений]]></value>
+		<value xml:lang="es"><![CDATA[Lista de archivos adjuntos]]></value>
+		<value xml:lang="tr"><![CDATA[Eklentiler Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách đính kèm]]></value>
+	</item>
+	<item name="allow_outlink">
+		<value xml:lang="ko"><![CDATA[다른 사이트에서 첨부파일 링크하는 것을 허용할까요?]]></value>
+		<value xml:lang="en"><![CDATA[Allow External Link?]]></value>
+		<value xml:lang="jp"><![CDATA[外部からのファイルリンク]]></value>
+		<value xml:lang="zh-CN"><![CDATA[防盗链]]></value>
+		<value xml:lang="zh-TW"><![CDATA[外部檔案連結]]></value>
+		<value xml:lang="ru"><![CDATA[Внешняя ссылка файла]]></value>
+		<value xml:lang="es"><![CDATA[Archivo Enlaces externos]]></value>
+		<value xml:lang="tr"><![CDATA[Dış Bağlantı]]></value>
+		<value xml:lang="vi"><![CDATA[Link từ bên ngoài]]></value>
+	</item>
+	<item name="allow_outlink_site">
+		<value xml:lang="ko"><![CDATA[파일 외부 링크 허용 사이트]]></value>
+		<value xml:lang="en"><![CDATA[Allowed Websites]]></value>
+		<value xml:lang="jp"><![CDATA[外部からのファイルリンクを許可するサイト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[允许外链站点]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許外連的網站]]></value>
+		<value xml:lang="fr"><![CDATA[파일 외부 허용 사이트]]></value>
+		<value xml:lang="es"><![CDATA[Fuera del archivo de sitios permitidos]]></value>
+		<value xml:lang="tr"><![CDATA[İzin Verilmiş Siteler]]></value>
+		<value xml:lang="vi"><![CDATA[Những Website cho phép]]></value>
+	</item>
+	<item name="allow_outlink_format">
+		<value xml:lang="ko"><![CDATA[파일 외부 링크 허용 확장자]]></value>
+		<value xml:lang="en"><![CDATA[Allowed Formats]]></value>
+		<value xml:lang="jp"><![CDATA[外部からのファイルリンクを許可する拡張子]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許外連的副檔名]]></value>
+		<value xml:lang="tr"><![CDATA[İzin Verilmiş Biçimler]]></value>
+		<value xml:lang="vi"><![CDATA[Những định dạng cho phép]]></value>
+	</item>
+	<item name="allowed_filesize">
+		<value xml:lang="ko"><![CDATA[파일 제한 크기]]></value>
+		<value xml:lang="en"><![CDATA[Maximum File Size]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルサイズ制限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件大小限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案大小限制]]></value>
+		<value xml:lang="fr"><![CDATA[Mesure du Fichier Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Размера файла]]></value>
+		<value xml:lang="es"><![CDATA[Límite del tamaño del archivo adjunto]]></value>
+		<value xml:lang="tr"><![CDATA[En büyük dosya boyutu]]></value>
+		<value xml:lang="vi"><![CDATA[Dung lượng tối đa]]></value>
+	</item>
+	<item name="allowed_attach_size">
+		<value xml:lang="ko"><![CDATA[문서 첨부 제한]]></value>
+		<value xml:lang="en"><![CDATA[Maximum Attachments]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みへの添付制限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上传限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[上傳限制]]></value>
+		<value xml:lang="fr"><![CDATA[Somme des Annexes Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Размер прикрепленного документа]]></value>
+		<value xml:lang="es"><![CDATA[Límite del tamaño total de los archivos adjuntos por documento]]></value>
+		<value xml:lang="tr"><![CDATA[En büyük ek boyutu]]></value>
+		<value xml:lang="vi"><![CDATA[Dung lượng file đính kèm]]></value>
+	</item>
+	<item name="allowed_filetypes">
+		<value xml:lang="ko"><![CDATA[허용 확장자]]></value>
+		<value xml:lang="en"><![CDATA[Allowed Extensions]]></value>
+		<value xml:lang="jp"><![CDATA[添付可能な拡張子]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可用扩展名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許檔案類型]]></value>
+		<value xml:lang="fr"><![CDATA[Extensions consentis]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешенные расширения]]></value>
+		<value xml:lang="es"><![CDATA[Tipos de archivos permitidos]]></value>
+		<value xml:lang="tr"><![CDATA[İzin Verilmiş Uzantılar]]></value>
+		<value xml:lang="vi"><![CDATA[Những định dạng cho phép]]></value>
+	</item>
+	<item name="enable_download_group">
+		<value xml:lang="ko"><![CDATA[다운로드 가능 그룹]]></value>
+		<value xml:lang="en"><![CDATA[Downloadable Groups]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード可能グループ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[允许下载的用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許下載的群組]]></value>
+		<value xml:lang="fr"><![CDATA[Groupe permis de telecharger]]></value>
+		<value xml:lang="ru"><![CDATA[Группы, имеющие право на скачивание]]></value>
+		<value xml:lang="es"><![CDATA[Descargar permitió grupos]]></value>
+		<value xml:lang="tr"><![CDATA[İzin Verilen Grupları İndir]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm được phép Download]]></value>
+	</item>
+	<item name="about_allow_outlink">
+		<value xml:lang="ko"><![CDATA[리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다. (*.wmv, *.mp3등 미디어 파일 제외)]]></value>
+		<value xml:lang="en"><![CDATA[You can block external links according to referers (except media files like *.wmv and *.mp3).]]></value>
+		<value xml:lang="jp"><![CDATA[リファラーによって外部からのファイルリンクを制御できます。(*.wmv, *.mp3などのメディアファイルは除く)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[根据反向链接防止盗链。(*.wmv, *.mp3等媒体文件除外)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[是否允許連結外部檔案。(*.wmv, *.mp3等影音檔案除外)]]></value>
+		<value xml:lang="fr"><![CDATA[리퍼러에 따라 파일 외부 링크를 차단할 수 있습니다.(*.wmv, *.mp3등 미디어 파일 제외)]]></value>
+		<value xml:lang="es"><![CDATA[Enlaces externos a Rusia Ripper puede bloquear el archivo. (*. WMV, *. mp3, etc, excepto los archivos multimedia)]]></value>
+		<value xml:lang="tr"><![CDATA[Dış bağlantıları kapatabilirsiniz. (*.wmv, *.mp3 gibi ortam dosyaları hariç)]]></value>
+		<value xml:lang="vi"><![CDATA[Những định dạng Link File từ bên ngoài được phép đính kèm.(Ngoại trừ định dạng Media *.wmv, *.mp3)]]></value>
+	</item>
+	<item name="about_allow_outlink_format">
+		<value xml:lang="ko"><![CDATA[파일 외부 링크 설정에 상관없이 허용하는 파일 확장자입니다. 여러 개 입력 시에 쉼표(,)을 이용해서 구분해주세요. 예)hwp,doc,zip,pdf]]></value>
+		<value xml:lang="en"><![CDATA[These formats will always be allowed. Please use comma(,) for multiple input. eg)hwp,doc,zip,pdf]]></value>
+		<value xml:lang="jp"><![CDATA[外部からのファイルリンク設定に関係なく、常に外部からのリンクを許可する拡張子です。複数登録時には、「半角コンマ（,）」区切りで記入してください。 eg)txt,doc,zip,pdf]]></value>
+		<value xml:lang="zh-TW"><![CDATA[設定允許外部連結的檔案格式。可以用逗號(,)來區隔多個副檔名。 例) hwp, doc, zip, pdf]]></value>
+		<value xml:lang="tr"><![CDATA[Bu biçimlere her zaman izin verilecektir. Lütfen çoklu giriş için virgül(,) kullanınız. örn.)hwp,doc,zip,pdf]]></value>
+		<value xml:lang="vi"><![CDATA[Những định dạng này sẽ được phép liên kết. Hãy sử dụng dấu (,) để thêm nhiều định dạng . Ví dụ: .hwp, .doc, .zip, .pdf]]></value>
+	</item>
+	<item name="about_allow_outlink_site">
+		<value xml:lang="ko"><![CDATA[파일 외부 링크 설정에 상관없이 허용하는 사이트 주소입니다. 여러 개 입력 시에 줄을 바꿔서 구분해주세요. 예)http://www.xpressengine.com]]></value>
+		<value xml:lang="en"><![CDATA[These websites will alyways be allowed. Please use new line for multiple input. ex)http://xpressengine.com/]]></value>
+		<value xml:lang="jp"><![CDATA[外部からのファイルリンク設定に関係なく、常に外部からのリンクを許可するURLです。複数登録時には、改行で記入してください。 ex)http://xpressengine.com/]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置允许外链的站点。多个站点以换行来区分，即一行一个。 ex)http://xpressengine.com/]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可設置允許外部檔案連結的網站名單。當數量太多時，可換行輸入。 例) http://xpressengine.com/]]></value>
+		<value xml:lang="fr"><![CDATA[파일 외부 링크 설정에 관계 없이 허용하는 사이트 주소입니다. 여러개 입력시에 줄을 바꿔서 구분해주세요. ex)http://xpressengine.com/]]></value>
+		<value xml:lang="ru"><![CDATA[These websites will alyways be allowed. Please use new line for multiple input. ex)http://www.hotmail.com]]></value>
+		<value xml:lang="es"><![CDATA[Archivos, independientemente de la configuración para permitir a los enlaces externos es la dirección del sitio. Entrada múltiples gubunhaeju un cambio en la línea, por favor.   Ej.) http://xpressengine.com/]]></value>
+		<value xml:lang="tr"><![CDATA[Bu sitelere her zaman izin verilecektir. Lütfen çoklu giriş için yeni satır kullanınız. örn.)http://xpressengine.com/]]></value>
+		<value xml:lang="vi"><![CDATA[Những Website được phép liên kết. Hãy nhập địa chỉ của những Website được phép. Ví dụ: http://xpressengine.com/]]></value>
+	</item>
+	<item name="about_allowed_filesize">
+		<value xml:lang="ko"><![CDATA[하나의 파일에 대해 최고 용량을 지정할 수 있습니다. (관리자는 제외)]]></value>
+		<value xml:lang="en"><![CDATA[You can assign file size limit for each file. (Exclude administrators)]]></value>
+		<value xml:lang="jp"><![CDATA[一つのファイルに対して、アップロード可能なファイルの最大サイズを指定します（管理者は除く）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最大单个上传文件大小(管理员不受此限制)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最大單一上傳檔案大小 (管理員不受此限制)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez designer la limite de mesure pour chaque fichier. (Exclure administrateurs)]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете присвоить лимит размера для каждого файла. (Исключая администраторов)]]></value>
+		<value xml:lang="es"><![CDATA[Puede definir el límite del tamaño del archivo adjunto. (exceptuando el administrador)]]></value>
+		<value xml:lang="tr"><![CDATA[Her dosya için dosya boyut limiti atayabilirsiniz. (Yöneticiler için limitsizdir)]]></value>
+		<value xml:lang="vi"><![CDATA[Giới hạn dung lượng mỗi File đính kèm. (Ngoại trừ Administrators)]]></value>
+	</item>
+	<item name="about_allowed_attach_size">
+		<value xml:lang="ko"><![CDATA[하나의 문서에 첨부할 수 있는 최고 용량을 지정할 수 있습니다. (관리자는 제외)]]></value>
+		<value xml:lang="en"><![CDATA[You can assign file size limit for each document. (Exclude administrators)]]></value>
+		<value xml:lang="jp"><![CDATA[一つの書き込みに対して、管理者以外のユーザーが添付可能な最大サイズを指定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[每个主题最大上传文件大小(管理员不受此限制)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[每個主題最大上傳檔案大小 (管理員不受此限制)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez designer la limite de mesure pour chaque document. (Exclure administrateurs)]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете присвоить лимит размера для каждого документа. (Исключая администраторов]]></value>
+		<value xml:lang="es"><![CDATA[Puede definir el límite del tamaño total de los archivos adjuntos por documento. (exceptuando el administrador)]]></value>
+		<value xml:lang="tr"><![CDATA[Her belge için dosya boyutu limiti atayabilirsiniz. (Yöneticiler için limitsizdir)]]></value>
+		<value xml:lang="vi"><![CDATA[Giới hạn dung lượng tối đa cho tất cả các File đính kèm trong một bài viết. (Ngoại trừ Administrators)]]></value>
+	</item>
+	<item name="about_allowed_filetypes">
+		<value xml:lang="ko"><![CDATA[허용한 확장자만 첨부할 수 있습니다. "*.확장자"로 지정할 수 있고 ";" 으로 여러 개 지정이 가능합니다. 예) *.* or *.jpg;*.gif; (관리자는 제외)]]></value>
+		<value xml:lang="en"><![CDATA[Only allowed extentsions can be attached. To allow an extension, use "*.[extention]". To allow multiple extensions, use ";" between each extension. ex) *.* or *.jpg;*.gif; (Exclude Administrators)]]></value>
+		<value xml:lang="jp"><![CDATA[ここで指定された種類のファイルのみ添付できます。"*.拡張子"で指定し、 ";"で区切って任意の拡張子を追加して指定できます。 （管理者は制限無し） ex) *.* or *.jpg;*.gif; ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只允许上传指定的扩展名。 可以用"*.扩展名"来指定或用 ";"来 区分多个扩展名 例) *.* or *.jpg;*.gif; (管理员不受此限制)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[設定允許上傳的檔案類型。可以用"*.副檔名"來指定或用分號";"來區隔多個副檔名。 例) *.* or *.jpg; *.gif; (管理員不受此限制)]]></value>
+		<value xml:lang="fr"><![CDATA[Extensions consentis seulement peuvent etre attaches. Pour consentir une extension, utilisez "*.[extention]". Pour consentir plusieurs extensions, utilisez ";" entre chaque extension. ex) *.* ou *.jpg;*.gif; (Exclure Administrateurs)]]></value>
+		<value xml:lang="ru"><![CDATA[Только файлы с разрешенными расширениями могут быть вложены. Чтобы разрешить расширение, ипользуйте "*.расширение". Чтобы разрешить несколько расширений, используйте ";" между ними. например: *.* или *.jpg;*.gif; (Исключая администраторов)]]></value>
+		<value xml:lang="es"><![CDATA[Puede definir las extensiones de los archivos permitidos. Para permitir una extensión use "*.extensión". Para permitir más de una extensión use ";". ej) *.* o *.jpg;*.gif;etc. (exceptuando el administrador)]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece izin verilen uzantılar iliştirilebilir. Bir uzantıya izin vermek için, "*.[uzantı]" komutunu kullanınız. Birden fazla eklentiye izin vermek için, her uzantının arasına ";" koyunuz. örn.) *.* veya *.jpg;*.gif; (Yöneticilerin tercihleri sınırlandırılmaz)]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ được phép đính kèm những File có đuôi được liệt kê trong danh sách. Để thêm những dạng File được phép đính kèm, bạn sử dụng "*.[đuôi]". Để cho phép nhiều dạng đuôi File hãy đặt dấu ";" vào giữa các dạng đuôi. Ví dụ: *.* (Cho phép tất cả) hay *.jpg;*.gif; (Ngoại trừ Administrators)]]></value>
+	</item>
+	<item name="cmd_delete_checked_file">
+		<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete Selected Item(s)]]></value>
+		<value xml:lang="jp"><![CDATA[選択リスト削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除所选项目]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除所選項目]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer item(s) slectionne(s)]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить выделенные файлы]]></value>
+		<value xml:lang="es"><![CDATA[Eliminar el archivo seleccionado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçilen Parça(lar) Silinsin]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa File đã chọn]]></value>
+	</item>
+	<item name="cmd_move_to_document">
+		<value xml:lang="ko"><![CDATA[문서로 이동]]></value>
+		<value xml:lang="en"><![CDATA[Move to Document]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みに移動する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看源主题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視原始主題]]></value>
+		<value xml:lang="fr"><![CDATA[Bouger au Document]]></value>
+		<value xml:lang="ru"><![CDATA[Перейти в документ]]></value>
+		<value xml:lang="es"><![CDATA[Mover hacia el doncumento]]></value>
+		<value xml:lang="tr"><![CDATA[Belgeye Taşı]]></value>
+		<value xml:lang="vi"><![CDATA[Chèn vào bài viết]]></value>
+	</item>
+	<item name="cmd_download">
+		<value xml:lang="ko"><![CDATA[다운로드]]></value>
+		<value xml:lang="en"><![CDATA[Download]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載]]></value>
+		<value xml:lang="fr"><![CDATA[Telecharger]]></value>
+		<value xml:lang="ru"><![CDATA[Скачать]]></value>
+		<value xml:lang="es"><![CDATA[Descargar]]></value>
+		<value xml:lang="tr"><![CDATA[İndir]]></value>
+	</item>
+	<item name="msg_not_permitted_download">
+		<value xml:lang="ko"><![CDATA[다운로드할 수 있는 권한이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You do not have a permission to download.]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード権限がありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您不具备下载的权限。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您不具備下載的權限。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous n'etes pas permis(e) de telecharger]]></value>
+		<value xml:lang="ru"><![CDATA[У Вас нет прав доступа для скачивания файлов]]></value>
+		<value xml:lang="es"><![CDATA[Usted no tiene ningún permiso para descargar]]></value>
+		<value xml:lang="tr"><![CDATA[İndirmek için izniniz yok]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không được quyền Download.]]></value>
+	</item>
+	<item name="msg_cart_is_null">
+		<value xml:lang="ko"><![CDATA[삭제할 파일을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select a file(s) to delete.]]></value>
+		<value xml:lang="jp"><![CDATA[削除するファイルを選択してください]]></value>
+		<value xml:lang="zh-CN"><![CDATA[ 请选择要删除的文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[ 請選擇要刪除的檔案。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez un(des) fichier(s) a supprimer]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите файл, который Вы хотите удалить]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione el archivo a eliminar]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen silenecek dosya(ları) seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng chọn File để xóa.]]></value>
+	</item>
+	<item name="msg_checked_file_is_deleted">
+		<value xml:lang="ko"><![CDATA[%d개의 첨부 파일이 삭제되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d attachment(s) was(were) deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[%d個の添付ファイルを削除しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已删除%d个文件！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已刪除 %d 個檔案！]]></value>
+		<value xml:lang="fr"><![CDATA[%d Annexe(s) est(sont) supprime(s)]]></value>
+		<value xml:lang="ru"><![CDATA[Всего %d вложений было удалено]]></value>
+		<value xml:lang="es"><![CDATA[Total de %d archivos eliminados]]></value>
+		<value xml:lang="tr"><![CDATA[%d ek(ler)i silindi]]></value>
+		<value xml:lang="vi"><![CDATA[%d đính kèm đã được xóa.]]></value>
+	</item>
+	<item name="msg_exceeds_limit_size">
+		<value xml:lang="ko"><![CDATA[허용된 용량을 초과하여 첨부가 되지 않았습니다.]]></value>
+		<value xml:lang="en"><![CDATA[This file exceeds the attachment limit.]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルサイズの制限を超えたため、添付できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已超过系统指定的上传文件大小！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已超過系統指定的檔案大小！]]></value>
+		<value xml:lang="fr"><![CDATA[La mesure de l'(des) Annexe(s) est plus grande que celle consentie.]]></value>
+		<value xml:lang="ru"><![CDATA[Прикрепить файл не удалось: превышен лимит размера файлов]]></value>
+		<value xml:lang="es"><![CDATA[Ha excedido el límite del tamaño total de los archivos adjuntos]]></value>
+		<value xml:lang="tr"><![CDATA[Ek dosya boyutu, izin verilen boyuttan büyük.]]></value>
+		<value xml:lang="vi"><![CDATA[Dung lượng File quá lớn.]]></value>
+	</item>
+	<item name="msg_file_not_found">
+		<value xml:lang="ko"><![CDATA[요청하신 파일을 찾을 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Could not find requested file.]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルが見つかりません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无法找到该文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到檔案。]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно найти запрашиваемый файл.]]></value>
+		<value xml:lang="tr"><![CDATA[İstenilen dosya bulunamadı.]]></value>
+		<value xml:lang="vi"><![CDATA[Không tìm thấy File.]]></value>
+	</item>
+	<item name="file_search_target_list" type="array">
+		<item name="filename">
+			<value xml:lang="ko"><![CDATA[파일 이름]]></value>
+			<value xml:lang="en"><![CDATA[File Name]]></value>
+			<value xml:lang="jp"><![CDATA[ファイル名]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文件名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檔案名稱]]></value>
+			<value xml:lang="fr"><![CDATA[Nom de Fichier]]></value>
+			<value xml:lang="ru"><![CDATA[Имя файла]]></value>
+			<value xml:lang="es"><![CDATA[Nombre del archivo]]></value>
+			<value xml:lang="tr"><![CDATA[Dosya Adı]]></value>
+			<value xml:lang="vi"><![CDATA[Tên File]]></value>
+		</item>
+		<item name="filesize_more">
+			<value xml:lang="ko"><![CDATA[파일 크기 (byte, 이상)]]></value>
+			<value xml:lang="en"><![CDATA[File Size (byte, more)]]></value>
+			<value xml:lang="jp"><![CDATA[ファイルサイズ（(Byte以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文件大小 (byte, 以上)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檔案大小 (byte, 以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Mesure de Fichier (octet, surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Размер файла (Байт, свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Tamaño del archivo (Byte, sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[Dosya Boyutu (byte, üstü)]]></value>
+			<value xml:lang="vi"><![CDATA[Dung lượng (Tối thiểu Byte)]]></value>
+		</item>
+		<item name="filesize_mega_more">
+			<value xml:lang="ko"><![CDATA[파일 크기 (MB, 이상)]]></value>
+			<value xml:lang="en"><![CDATA[File Size (mbyte, more)]]></value>
+			<value xml:lang="jp"><![CDATA[ファイルサイズ (Mb、以上)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文件大小 (Mb, 以上)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檔案大小 (Mb, 以上)]]></value>
+			<value xml:lang="fr"><![CDATA[파일크기 (Mb, 이상)]]></value>
+			<value xml:lang="ru"><![CDATA[Размер файла (Мегабайт, свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Tamaño del archivo (Mb, o mb)]]></value>
+			<value xml:lang="tr"><![CDATA[Dosya Boyutu (mbyte, üstü)]]></value>
+			<value xml:lang="vi"><![CDATA[Dung lượng (Tối thiểu MB)]]></value>
+		</item>
+		<item name="filesize_less">
+			<value xml:lang="ko"><![CDATA[파일 크기 (byte, 이하)]]></value>
+			<value xml:lang="en"><![CDATA[File Size (byte, less)]]></value>
+			<value xml:lang="jp"><![CDATA[ファイルサイズ (byte, 以下)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文件大小 (byte, 以下)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檔案大小 (byte, 以下)]]></value>
+			<value xml:lang="fr"><![CDATA[파일크기 (byte, 이하)]]></value>
+			<value xml:lang="ru"><![CDATA[Размер файла (Байт, ниже)]]></value>
+			<value xml:lang="es"><![CDATA[파일크기 (byte, 이하)]]></value>
+			<value xml:lang="tr"><![CDATA[Dosya Boyutu (byte, düşük)]]></value>
+			<value xml:lang="vi"><![CDATA[Dung lượng (Tối đa Byte)]]></value>
+		</item>
+		<item name="filesize_mega_less">
+			<value xml:lang="ko"><![CDATA[파일 크기 (MB, 이하)]]></value>
+			<value xml:lang="en"><![CDATA[File Size (Mb, less)]]></value>
+			<value xml:lang="jp"><![CDATA[ファイルサイズ (Mb, 以下)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文件大小 (Mb, 以下)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檔案大小 (Mb, 以下)]]></value>
+			<value xml:lang="fr"><![CDATA[파일크기 (Mb, 이하)]]></value>
+			<value xml:lang="ru"><![CDATA[Размер файла (Мегабайт, ниже)]]></value>
+			<value xml:lang="es"><![CDATA[파일크기 (Mb, 이하)]]></value>
+			<value xml:lang="tr"><![CDATA[Dosya Boyutu (Mb, düşük)]]></value>
+			<value xml:lang="vi"><![CDATA[Dung lượng (Tối đa MB)]]></value>
+		</item>
+		<item name="download_count">
+			<value xml:lang="ko"><![CDATA[다운로드 횟수 (이상)]]></value>
+			<value xml:lang="en"><![CDATA[Downloads (more)]]></value>
+			<value xml:lang="jp"><![CDATA[ダウンロード数（以上）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下载次数 (以上)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下載次數 (以上)]]></value>
+			<value xml:lang="fr"><![CDATA[Telecharges (surplus)]]></value>
+			<value xml:lang="ru"><![CDATA[Скачано (свыше)]]></value>
+			<value xml:lang="es"><![CDATA[Descargados (Sobre)]]></value>
+			<value xml:lang="tr"><![CDATA[İndirmeler (daha fazla)]]></value>
+			<value xml:lang="vi"><![CDATA[Lượt Download]]></value>
+		</item>
+		<item name="user_id">
+			<value xml:lang="ko"><![CDATA[아이디]]></value>
+			<value xml:lang="en"><![CDATA[User UD]]></value>
+			<value xml:lang="jp"><![CDATA[ユーザーＩＤ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[用户名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[帳號]]></value>
+			<value xml:lang="ru"><![CDATA[ID]]></value>
+			<value xml:lang="es"><![CDATA[ID]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı Kimliği]]></value>
+			<value xml:lang="vi"><![CDATA[ID đăng nhập]]></value>
+		</item>
+		<item name="user_name">
+			<value xml:lang="ko"><![CDATA[이름]]></value>
+			<value xml:lang="en"><![CDATA[User Name]]></value>
+			<value xml:lang="jp"><![CDATA[名前]]></value>
+			<value xml:lang="zh-CN"><![CDATA[姓名]]></value>
+			<value xml:lang="zh-TW"><![CDATA[姓名]]></value>
+			<value xml:lang="ru"><![CDATA[Имя]]></value>
+			<value xml:lang="es"><![CDATA[Nombre]]></value>
+			<value xml:lang="tr"><![CDATA[Kullanıcı İsmi]]></value>
+			<value xml:lang="vi"><![CDATA[Tên Sử dụng]]></value>
+		</item>
+		<item name="nick_name">
+			<value xml:lang="ko"><![CDATA[닉네임]]></value>
+			<value xml:lang="en"><![CDATA[Nickname]]></value>
+			<value xml:lang="jp"><![CDATA[ニックネーム]]></value>
+			<value xml:lang="zh-CN"><![CDATA[昵称]]></value>
+			<value xml:lang="zh-TW"><![CDATA[暱稱]]></value>
+			<value xml:lang="ru"><![CDATA[Ник]]></value>
+			<value xml:lang="es"><![CDATA[Apodo]]></value>
+			<value xml:lang="tr"><![CDATA[Rumuz]]></value>
+		</item>
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[등록일]]></value>
+			<value xml:lang="en"><![CDATA[Registered Date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[登录日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[登錄日期]]></value>
+			<value xml:lang="fr"><![CDATA[Enrgistre]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+			<value xml:lang="es"><![CDATA[La fecha registrada]]></value>
+			<value xml:lang="tr"><![CDATA[Kayıt Zamanı]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+		</item>
+		<item name="ipaddress">
+			<value xml:lang="ko"><![CDATA[IP 주소]]></value>
+			<value xml:lang="en"><![CDATA[IP Address]]></value>
+			<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[IP地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
+			<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
+			<value xml:lang="ru"><![CDATA[IP-Адрес]]></value>
+			<value xml:lang="es"><![CDATA[Dirección IP]]></value>
+			<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+			<value xml:lang="vi"><![CDATA[IP]]></value>
+		</item>
+		<item name="isvalid">
+			<value xml:lang="ko"><![CDATA[상태]]></value>
+			<value xml:lang="en"><![CDATA[Status]]></value>
+			<value xml:lang="jp"><![CDATA[状態]]></value>
+		</item>
+	</item>
+	<item name="msg_not_allowed_outlink">
+		<value xml:lang="ko"><![CDATA[외부링크에서 다운로드할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[It is not allowed to download files from sites other than this.]]></value>
+		<value xml:lang="jp"><![CDATA[外部リンクからのダウンロードは許可されていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[此站不允许外链下载。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法從網站下載檔案。]]></value>
+		<value xml:lang="fr"><![CDATA[It is not allowed to download files not from this site.]]></value>
+		<value xml:lang="ru"><![CDATA[It is not allowed to download files not from this site.]]></value>
+		<value xml:lang="es"><![CDATA[It is not allowed to download files not from this site.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu siteden dosya indirimine izin verilmemektedir.]]></value>
+		<value xml:lang="vi"><![CDATA[Không cho phép tải file từ những trang khác ngoài trang này.]]></value>
+	</item>
+	<item name="msg_not_permitted_create">
+		<value xml:lang="ko"><![CDATA[파일 또는 디렉터리를 생성할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to create a file or directory.]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルまたはディレクトリを生成できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无法生成文件或文件夹。]]></value>
+		<value xml:lang="tr"><![CDATA[Dosya veya dizin oluşturma hatası.]]></value>
+	</item>
+	<item name="msg_file_upload_error">
+		<value xml:lang="ko"><![CDATA[파일 업로드 중 에러가 발생하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[An error has occurred during uploading.]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルのアップロードに失敗しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上传文件发生出错。]]></value>
+		<value xml:lang="tr"><![CDATA[Karşıya yükleme esnasında bir hata oluştu.]]></value>
+	</item>
+	<item name="no_files">
+		<value xml:lang="ko"><![CDATA[파일이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No Files]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルがありません。]]></value>
+	</item>
+	<item name="file_manager">
+		<value xml:lang="ko"><![CDATA[선택한 파일 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage selected files]]></value>
+		<value xml:lang="jp"><![CDATA[選択ファイル管理]]></value>
+	</item>
+	<item name="selected_file">
+		<value xml:lang="ko"><![CDATA[선택한 파일]]></value>
+		<value xml:lang="en"><![CDATA[Selected files]]></value>
+		<value xml:lang="jp"><![CDATA[選択ファイル]]></value>
+	</item>
+</lang>
diff --git a/modules/file/lang/ru.lang.php b/modules/file/lang/ru.lang.php
deleted file mode 100644
index 9ed2085bc..000000000
--- a/modules/file/lang/ru.lang.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->file = 'Вложение';
-    $lang->file_name = 'Имя файла';
-    $lang->file_size = 'Размер файла';
-    $lang->download_count = 'Загружено';
-    $lang->status = 'Состояние';
-    $lang->is_valid = 'Верно';
-    $lang->is_stand_by = 'Ожидание';
-    $lang->file_list = 'Список Вложений';
-    $lang->allow_outlink = 'Внешняя ссылка файла';
-    $lang->allow_outlink_site = 'Allowed Websites';
-    $lang->allow_outlink_format = 'Allowed Formats';
-    $lang->allowed_filesize = 'Размера файла';
-    $lang->allowed_attach_size = 'Размер прикрепленного документа';
-    $lang->allowed_filetypes = 'Разрешенные расширения';
-    $lang->enable_download_group = 'Группы, имеющие право на скачивание';
-
-   	$lang->about_allow_outlink = 'You can shut external links according to referers. (except media files like *.wmv, *.mp3)';
-    $lang->about_allow_outlink_format = 'These formats will always be allowed. Please use comma(,) for multiple input.<br />eg)hwp,doc,zip,pdf';
-    $lang->about_allow_outlink_site = 'These websites will alyways be allowed. Please use new line for multiple input.<br />ex)http://www.hotmail.com';
-	$lang->about_allowed_filesize = 'Вы можете присвоить лимит размера для каждого файла. (Исключая администраторов)';
-    $lang->about_allowed_attach_size = 'Вы можете присвоить лимит размера для каждого документа. (Исключая администраторов';
-    $lang->about_allowed_filetypes = 'Только файлы с разрешенными расширениями могут быть вложены. Чтобы разрешить расширение, ипользуйте "*.расширение". Чтобы разрешить несколько расширений, используйте ";" между ними.<br />например: *.* или *.jpg;*.gif;<br />(Исключая администраторов)';
-
-    $lang->cmd_delete_checked_file = 'Удалить выделенные файлы';
-    $lang->cmd_move_to_document = 'Перейти в документ';
-    $lang->cmd_download = 'Скачать';
-
-    $lang->msg_not_permitted_download = 'У Вас нет прав доступа для скачивания файлов';
-    $lang->msg_cart_is_null = 'Выберите файл, который Вы хотите удалить';
-    $lang->msg_checked_file_is_deleted = 'Всего %d вложений было удалено';
-    $lang->msg_exceeds_limit_size = 'Прикрепить файл не удалось: превышен лимит размера файлов';
-    $lang->msg_file_not_found = 'Невозможно найти запрашиваемый файл.';
-
-    $lang->file_search_target_list = array(
-        'filename' => 'Имя файла',
-        'filesize_more' => 'Размер файла (Байт, свыше)',
-        'filesize_mega_more' => 'Размер файла (Мегабайт, свыше)',
-		'filesize_less' => 'Размер файла (Байт, ниже)',
-		'filesize_mega_less' => 'Размер файла (Мегабайт, ниже)',
-        'download_count' => 'Скачано (свыше)',
-        'user_id' => 'ID',
-        'user_name' => 'Имя',
-        'nick_name' => 'Ник',
-        'regdate' => 'Дата регистрации',
-        'ipaddress' => 'IP-Адрес',
-    );
-	$lang->msg_not_allowed_outlink = 'It is not allowed to download files not from this site.'; 
-    $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.';
-	$lang->msg_file_upload_error = '파일 업로드 중 에러가 발생하였습니다.';
-
-?>
diff --git a/modules/file/lang/tr.lang.php b/modules/file/lang/tr.lang.php
deleted file mode 100644
index e0639efc2..000000000
--- a/modules/file/lang/tr.lang.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Attachment module's basic language pack
-     **/
-
-    $lang->file = 'Ek';
-    $lang->file_name = 'Dosya Adı';
-    $lang->file_size = 'Dosya Boyutu';
-    $lang->download_count = 'İndirme Sayısı';
-    $lang->status = 'Durum';
-    $lang->is_valid = 'Geçerli';
-    $lang->is_stand_by = 'Askıya al';
-    $lang->file_list = 'Eklentiler Listesi';
-    $lang->allow_outlink = 'Dış Bağlantı';
-    $lang->allow_outlink_site = 'İzin Verilmiş Siteler';
-    $lang->allow_outlink_format = 'İzin Verilmiş Biçimler';
-    $lang->allowed_filesize = 'En büyük dosya boyutu';
-    $lang->allowed_attach_size = 'En büyük ek boyutu';
-    $lang->allowed_filetypes = 'İzin Verilmiş Uzantılar';
-    $lang->enable_download_group = 'İzin Verilen Grupları İndir';
-
-    $lang->about_allow_outlink = 'Dış bağlantıları kapatabilirsiniz. (*.wmv, *.mp3 gibi ortam dosyaları hariç)';
-    $lang->about_allow_outlink_format = 'Bu biçimlere her zaman izin verilecektir. Lütfen çoklu giriş için virgül(,) kullanınız.<br />örn.)hwp,doc,zip,pdf';
-    $lang->about_allow_outlink_site = 'Bu sitelere her zaman izin verilecektir. Lütfen çoklu giriş için yeni satır kullanınız.<br />örn.)http://xpressengine.com/';
-	$lang->about_allowed_filesize = 'Her dosya için dosya boyut limiti atayabilirsiniz. (Yöneticiler için limitsizdir)';
-    $lang->about_allowed_attach_size = 'Her belge için dosya boyutu limiti atayabilirsiniz. (Yöneticiler için limitsizdir)';
-    $lang->about_allowed_filetypes = 'Sadece izin verilen uzantılar iliştirilebilir. Bir uzantıya izin vermek için, "*.[uzantı]" komutunu kullanınız. Birden fazla eklentiye izin vermek için, her uzantının arasına ";" koyunuz.<br />örn.) *.* veya *.jpg;*.gif;<br />(Yöneticilerin tercihleri sınırlandırılmaz)';
-
-    $lang->cmd_delete_checked_file = 'Seçilen Parça(lar) Silinsin';
-    $lang->cmd_move_to_document = 'Belgeye Taşı';
-    $lang->cmd_download = 'İndir';
-
-    $lang->msg_not_permitted_download = 'İndirmek için izniniz yok';
-    $lang->msg_cart_is_null = 'Lütfen silenecek dosya(ları) seçiniz';
-    $lang->msg_checked_file_is_deleted = '%d ek(ler)i silindi';
-    $lang->msg_exceeds_limit_size = 'Ek dosya boyutu, izin verilen boyuttan büyük.';
-    $lang->msg_file_not_found = 'İstenilen dosya bulunamadı.';
-
-
-    $lang->file_search_target_list = array(
-        'filename' => 'Dosya Adı',
-        'filesize_more' => 'Dosya Boyutu (byte, üstü)',
-        'filesize_mega_more' => 'Dosya Boyutu (mbyte, üstü)',
-		'filesize_less' => 'Dosya Boyutu (byte, düşük)',
-		'filesize_mega_less' => 'Dosya Boyutu (Mb, düşük)',
-        'download_count' => 'İndirmeler (daha fazla)',
-        'regdate' => 'Kayıt Zamanı',
-        'user_id' => 'Kullanıcı Kimliği',
-        'user_name' => 'Kullanıcı İsmi',
-        'nick_name' => 'Rumuz',
-        'ipaddress' => 'IP Adresi',
-    );
-	$lang->msg_not_allowed_outlink = 'Bu siteden dosya indirimine izin verilmemektedir.'; 
-    $lang->msg_not_permitted_create = 'Dosya veya dizin oluşturma hatası.';
-	$lang->msg_file_upload_error = 'Karşıya yükleme esnasında bir hata oluştu.';
-
-?>
diff --git a/modules/file/lang/vi.lang.php b/modules/file/lang/vi.lang.php
deleted file mode 100644
index 88130452d..000000000
--- a/modules/file/lang/vi.lang.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  DucDuy Dao (webmaster@xpressengine.vn)								  ░░
-			░░	* @Website:  http://xpressengine.vn												  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-*/
-
-    $lang->file = 'Đính kèm';
-    $lang->file_name = 'Tên File';
-    $lang->file_size = 'Dung lượng';
-    $lang->download_count = 'Lượt Download';
-    $lang->status = 'Trạng thái';
-    $lang->is_valid = 'Hợp lệ';
-    $lang->is_stand_by = 'Chờ duyệt';
-    $lang->file_list = 'Danh sách đính kèm';
-    $lang->allow_outlink = 'Link từ bên ngoài';
-	$lang->allow_outlink_format = 'Những định dạng cho phép';
-    $lang->allow_outlink_site = 'Những Website cho phép';
-    $lang->allowed_filesize = 'Dung lượng tối đa';
-    $lang->allowed_attach_size = 'Dung lượng file đính kèm';
-    $lang->allowed_filetypes = 'Những định dạng cho phép';
-    $lang->enable_download_group = 'Nhóm được phép Download';
-
-    $lang->about_allow_outlink = 'Những định dạng Link File từ bên ngoài được phép đính kèm.(Ngoại trừ định dạng Media *.wmv, *.mp3)';
-	$lang->about_allow_outlink_format = 'Những định dạng này sẽ được phép liên kết. Hãy sử dụng dấu (,) để thêm nhiều định dạng .<br />Ví dụ: .hwp, .doc, .zip, .pdf';
-    $lang->about_allow_outlink_site = 'Những Website được phép liên kết. Hãy nhập địa chỉ của những Website được phép.<br />Ví dụ: http://xpressengine.com/';
-	$lang->about_allowed_filesize = 'Giới hạn dung lượng mỗi File đính kèm. (Ngoại trừ Administrators)';
-    $lang->about_allowed_attach_size = 'Giới hạn dung lượng tối đa cho tất cả các File đính kèm trong một bài viết. (Ngoại trừ Administrators)';
-    $lang->about_allowed_filetypes = 'Chỉ được phép đính kèm những File có đuôi được liệt kê trong danh sách.<br />Để thêm những dạng File được phép đính kèm, bạn sử dụng "*.[đuôi]".<br />Để cho phép nhiều dạng đuôi File hãy đặt dấu ";" vào giữa các dạng đuôi.<br />Ví dụ: *.* (Cho phép tất cả) hay *.jpg;*.gif;<br />(Ngoại trừ Administrators)';
-
-    $lang->cmd_delete_checked_file = 'Xóa File đã chọn';
-    $lang->cmd_move_to_document = 'Chèn vào bài viết';
-    $lang->cmd_download = 'Download';
-
-    $lang->msg_not_permitted_download = 'Bạn không được quyền Download.';
-    $lang->msg_cart_is_null = 'Xin vui lòng chọn File để xóa.';
-    $lang->msg_checked_file_is_deleted = '%d đính kèm đã được xóa.';
-    $lang->msg_exceeds_limit_size = 'Dung lượng File quá lớn.';
-	$lang->msg_file_not_found = 'Không tìm thấy File.';
-
-
-    $lang->file_search_target_list = array(
-        'filename' => 'Tên File',
-        'filesize_more' => 'Dung lượng (Tối thiểu Byte)',
-        'filesize_mega_more' => 'Dung lượng (Tối thiểu MB)',
-		'filesize_less' => 'Dung lượng (Tối đa Byte)',
-		'filesize_mega_less' => 'Dung lượng (Tối đa MB)',
-        'download_count' => 'Lượt Download',
-        'regdate' => 'Ngày gửi',
-        'user_id' => 'ID đăng nhập',
-        'user_name' => 'Tên Sử dụng',
-        'nick_name' => 'Nickname',
-        'ipaddress' => 'IP',
-    );
-	$lang->msg_not_allowed_outlink = 'Không cho phép tải file từ những trang khác ngoài trang này.'; 
-    $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.';
-	$lang->msg_file_upload_error = '파일 업로드 중 에러가 발생하였습니다.';
-
-?>
diff --git a/modules/file/lang/zh-CN.lang.php b/modules/file/lang/zh-CN.lang.php
deleted file mode 100644
index 1a2ca5d3d..000000000
--- a/modules/file/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  附件(file) 模块语言包
-     **/
-
-    $lang->file = '附件';
-    $lang->file_name = '文件名';
-    $lang->file_size = '文件大小';
-    $lang->download_count = '下载次数';
-    $lang->status = '状态';
-    $lang->is_valid = '有效';
-    $lang->is_stand_by = '等待';
-    $lang->file_list = '附件列表';
-    $lang->allow_outlink = '防盗链';
-    $lang->allow_outlink_site = '允许外链站点';
-    $lang->allowed_filesize = '文件大小限制';
-    $lang->allowed_attach_size = '上传限制';
-    $lang->allowed_filetypes = '可用扩展名';
-    $lang->enable_download_group = '允许下载的用户组';
-
-    $lang->about_allow_outlink = '根据反向链接防止盗链。(*.wmv, *.mp3等媒体文件除外)';
-    $lang->about_allow_outlink_site = '可以设置允许外链的站点。多个站点以换行来区分，即一行一个。<br />ex)http://xpressengine.com/';
-    $lang->about_allowed_filesize = '最大单个上传文件大小(管理员不受此限制)。';
-    $lang->about_allowed_attach_size = '每个主题最大上传文件大小(管理员不受此限制)。';
-    $lang->about_allowed_filetypes = '只允许上传指定的扩展名。 可以用"*.扩展名"来指定或用 ";"来 区分多个扩展名<br />例) *.* or *.jpg;*.gif;<br />(管理员不受此限制)';
-
-    $lang->cmd_delete_checked_file = '删除所选项目';
-    $lang->cmd_move_to_document = '查看源主题';
-    $lang->cmd_download = '下载';
-
-    $lang->msg_not_permitted_download = '您不具备下载的权限。';
-    $lang->msg_cart_is_null = ' 请选择要删除的文件。';
-    $lang->msg_checked_file_is_deleted = '已删除%d个文件！';
-    $lang->msg_exceeds_limit_size = '已超过系统指定的上传文件大小！';
-    $lang->msg_file_not_found = '无法找到该文件。';
-
-    $lang->file_search_target_list = array(
-        'filename' => '文件名',
-        'filesize_more' => '文件大小 (byte, 以上)',
-        'filesize_mega_more' => '文件大小 (Mb, 以上)',
-	'filesize_less' => '文件大小 (byte, 以下)',
-	'filesize_mega_less' => '文件大小 (Mb, 以下)',
-        'download_count' => '下载次数 (以上)',
-        'user_id' => '用户名',
-        'user_name' => '姓名',
-        'nick_name' => '昵称',
-        'regdate' => '登录日期',
-        'ipaddress' => 'IP地址',
-    );
-    $lang->msg_not_allowed_outlink = '此站不允许外链下载。'; 
-    $lang->msg_not_permitted_create = '无法生成文件或文件夹。';
-    $lang->msg_file_upload_error = '上传文件发生出错。';
-
-?>
diff --git a/modules/file/lang/zh-TW.lang.php b/modules/file/lang/zh-TW.lang.php
deleted file mode 100644
index 0965920e6..000000000
--- a/modules/file/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-    /**
-     * @file   modules/file/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  附加檔案(file)模組正體中文語言
-     **/
-
-    $lang->file = '附加檔案';
-    $lang->file_name = '檔案名稱';
-    $lang->file_size = '檔案大小';
-    $lang->download_count = '下載次數';
-    $lang->status = '狀態';
-    $lang->is_valid = '有效';
-    $lang->is_stand_by = '等待';
-    $lang->file_list = '檔案清單';
-    $lang->allow_outlink = '外部檔案連結';
-    $lang->allow_outlink_site = '允許外連的網站';
-    $lang->allow_outlink_format = '允許外連的副檔名';
-    $lang->allowed_filesize = '檔案大小限制';
-    $lang->allowed_attach_size = '上傳限制';
-    $lang->allowed_filetypes = '允許檔案類型';
-    $lang->enable_download_group = '允許下載的群組';
-
-    $lang->about_allow_outlink = '是否允許連結外部檔案。(*.wmv, *.mp3等影音檔案除外)';
-    $lang->about_allow_outlink_format = '設定允許外部連結的檔案格式。可以用逗號(,)來區隔多個副檔名。<br />例) hwp, doc, zip, pdf';
-    $lang->about_allow_outlink_site = '可設置允許外部檔案連結的網站名單。當數量太多時，可換行輸入。<br />例) http://xpressengine.com/';
-	$lang->about_allowed_filesize = '最大單一上傳檔案大小 (管理員不受此限制)。';
-    $lang->about_allowed_attach_size = '每個主題最大上傳檔案大小 (管理員不受此限制)。';
-    $lang->about_allowed_filetypes = '設定允許上傳的檔案類型。可以用"*.副檔名"來指定或用分號";"來區隔多個副檔名。<br />例) *.* or *.jpg; *.gif;<br />(管理員不受此限制)';
-
-    $lang->cmd_delete_checked_file = '刪除所選項目';
-    $lang->cmd_move_to_document = '檢視原始主題';
-    $lang->cmd_download = '下載';
-
-    $lang->msg_not_permitted_download = '您不具備下載的權限。';
-    $lang->msg_cart_is_null = ' 請選擇要刪除的檔案。';
-    $lang->msg_checked_file_is_deleted = '已刪除 %d 個檔案！';
-    $lang->msg_exceeds_limit_size = '已超過系統指定的檔案大小！';
-    $lang->msg_file_not_found = '找不到檔案。';
-
-    $lang->file_search_target_list = array(
-        'filename' => '檔案名稱',
-        'filesize_more' => '檔案大小 (byte, 以上)',
-        'filesize_mega_more' => '檔案大小 (Mb, 以上)',
-		'filesize_less' => '檔案大小 (byte, 以下)',
-		'filesize_mega_less' => '檔案大小 (Mb, 以下)',
-        'download_count' => '下載次數 (以上)',
-        'user_id' => '帳號',
-        'user_name' => '姓名',
-        'nick_name' => '暱稱',
-        'regdate' => '登錄日期',
-        'ipaddress' => 'IP位址',
-    );
-	$lang->msg_not_allowed_outlink = '無法從網站下載檔案。'; 
-    $lang->msg_not_permitted_create = '파일 또는 디렉토리를 생성할 수 없습니다.';
-	$lang->msg_file_upload_error = '파일 업로드 중 에러가 발생하였습니다.';
-
-?>
diff --git a/modules/file/queries/getFile.xml b/modules/file/queries/getFile.xml
index b8a93ca07..7f3d60757 100644
--- a/modules/file/queries/getFile.xml
+++ b/modules/file/queries/getFile.xml
@@ -3,6 +3,6 @@
         <table name="files" />
     </tables>
     <conditions>
-        <condition operation="equal" column="file_srl" var="file_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="file_srl" var="file_srl" filter="number" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/file/queries/getFileList.xml b/modules/file/queries/getFileList.xml
index 5bd85b5f0..35094cb09 100644
--- a/modules/file/queries/getFileList.xml
+++ b/modules/file/queries/getFileList.xml
@@ -1,36 +1,36 @@
-<query id="getFileList" action="select">
-    <tables>
-        <table name="files" alias="files" />
-        <table name="member" alias="member" type="left join">
-            <conditions>
-                <condition operation="equal" column="files.member_srl" default="member.member_srl" />
-            </conditions>
-        </table>
-    </tables>
-    <columns>
-        <column name="files.*" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="files.module_srl" var="s_module_srl" />
-        <condition operation="notin" column="files.module_srl" var="exclude_module_srl" pipe="and" />
-        <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
-        <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
-        <group pipe="and">
-            <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
-            <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
-            <condition operation="less" column="files.file_size" var="s_filesize_less" pipe="or" />
-            <condition operation="more" column="files.download_count" var="s_download_count" pipe="or" />
-            <condition operation="like_prefix" column="files.regdate" var="s_regdate" pipe="or" />
-            <condition operation="like_prefix" column="files.ipaddress" var="s_ipaddress" pipe="or" />
-            <condition operation="like" column="member.user_id" var="s_user_id" pipe="or" />
-            <condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />
-            <condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
-        </group>
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="files.file_srl" order="desc" />
-        <list_count var="list_count" default="20" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
-</query>
+<query id="getFileList" action="select">
+    <tables>
+        <table name="files" alias="files" />
+        <table name="member" alias="member" type="left join">
+            <conditions>
+                <condition operation="equal" column="files.member_srl" default="member.member_srl" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="files.*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="files.module_srl" var="s_module_srl" />
+        <condition operation="notin" column="files.module_srl" var="exclude_module_srl" pipe="and" />
+        <condition operation="equal" column="files.isvalid" var="isvalid" pipe="and" />
+        <condition operation="equal" column="files.direct_download" var="direct_download" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="files.source_filename" var="s_filename" pipe="or" />
+            <condition operation="more" column="files.file_size" var="s_filesize_more" pipe="or" />
+            <condition operation="less" column="files.file_size" var="s_filesize_less" pipe="or" />
+            <condition operation="more" column="files.download_count" var="s_download_count" pipe="or" />
+            <condition operation="like_prefix" column="files.regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="files.ipaddress" var="s_ipaddress" pipe="or" />
+            <condition operation="like" column="member.user_id" var="s_user_id" pipe="or" />
+            <condition operation="like" column="member.user_name" var="s_user_name" pipe="or" />
+            <condition operation="like" column="member.nick_name" var="s_nick_name" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="files.file_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/file/queries/getFilesCount.xml b/modules/file/queries/getFilesCount.xml
index 89b9cd674..81a257cd1 100644
--- a/modules/file/queries/getFilesCount.xml
+++ b/modules/file/queries/getFilesCount.xml
@@ -6,6 +6,7 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="equal" column="upload_target_srl" var="upload_target_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="upload_target_srl" var="upload_target_srl" filter="number" />
+		<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/file/queries/getFilesCountByGroupValid.xml b/modules/file/queries/getFilesCountByGroupValid.xml
new file mode 100644
index 000000000..869d7a3fd
--- /dev/null
+++ b/modules/file/queries/getFilesCountByGroupValid.xml
@@ -0,0 +1,26 @@
+<query id="getFilesCount" action="select">
+    <tables>
+        <table name="files" />
+    </tables>
+    <columns>
+        <column name="isvalid" />
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="s_module_srl" />
+        <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
+        <condition operation="equal" column="isvalid" var="isvalid" pipe="and" />
+        <condition operation="equal" column="direct_download" var="direct_download" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="source_filename" var="s_filename" pipe="or" />
+            <condition operation="more" column="file_size" var="s_filesize_more" pipe="or" />
+            <condition operation="less" column="file_size" var="s_filesize_less" pipe="or" />
+            <condition operation="more" column="download_count" var="s_download_count" pipe="or" />
+            <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
+            <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
+        </group>
+    </conditions>
+	<groups>
+		<group column="isvalid" />
+	</groups>
+</query>
diff --git a/modules/file/ruleset/deleteChecked.xml b/modules/file/ruleset/deleteChecked.xml
new file mode 100644
index 000000000..28789da2a
--- /dev/null
+++ b/modules/file/ruleset/deleteChecked.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="cart" required="true"/>
+    </fields>
+</ruleset>
diff --git a/modules/file/ruleset/fileModuleConfig.xml b/modules/file/ruleset/fileModuleConfig.xml
new file mode 100644
index 000000000..2cf75672f
--- /dev/null
+++ b/modules/file/ruleset/fileModuleConfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="extension" type="regex" test="/^(?:\*\.\*|(\*\.\w+;\s*)*\*\.\w+;?)$/i"  />
+    </customrules>
+    <fields>
+		<field name="allowed_filesize" required="true" rule="number" default="2" />
+		<field name="allowed_attach_size" required="true" rule="number" default="2" />
+		<field name="allowed_filetypes" required="true" rule="extension" />
+    </fields>
+</ruleset>
diff --git a/modules/file/ruleset/insertConfig.xml b/modules/file/ruleset/insertConfig.xml
new file mode 100644
index 000000000..2cf75672f
--- /dev/null
+++ b/modules/file/ruleset/insertConfig.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="extension" type="regex" test="/^(?:\*\.\*|(\*\.\w+;\s*)*\*\.\w+;?)$/i"  />
+    </customrules>
+    <fields>
+		<field name="allowed_filesize" required="true" rule="number" default="2" />
+		<field name="allowed_attach_size" required="true" rule="number" default="2" />
+		<field name="allowed_filetypes" required="true" rule="extension" />
+    </fields>
+</ruleset>
diff --git a/modules/file/tpl/adminConfig.html b/modules/file/tpl/adminConfig.html
new file mode 100644
index 000000000..0a3bf5a5c
--- /dev/null
+++ b/modules/file/tpl/adminConfig.html
@@ -0,0 +1,47 @@
+<load target="js/fileConfig.js" type="body" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertConfig" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="file" />
+	<input type="hidden" name="act" value="procFileAdminInsertConfig" />
+	<h1 class="h1">File Upload</h1>
+	<ul>
+		<li>
+			<p class="q">{$lang->allow_outlink}</p>
+			<p class="a">
+				<input type="radio" name="allow_outlink" value="Y" id="allow_outlink_y" checked="checked"|cond="$config->allow_outlink == 'Y'" /> <label for="allow_outlink_y">{$lang->cmd_yes}</label>
+				<input type="radio" name="allow_outlink" value="N" id="allow_outlink_n" checked="checked"|cond="$config->allow_outlink == 'N'" /> <label for="allow_outlink_n">{$lang->cmd_no}</label>
+			</p>
+		</li>
+		<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
+			<p class="q">{$lang->allow_outlink_format}</p>
+			<p class="a">
+				<input type="text" name="allow_outlink_format" value="{$config->allow_outlink_format}" />
+				<p>{$lang->about_allow_outlink_format}</p>
+			</p>
+		</li>
+		<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
+			<p class="q">{$lang->allow_outlink_site}</p>
+			<p class="a">
+				<textarea type="text" name="allow_outlink_site">{$config->allow_outlink_site}</textarea>
+				<p>{$lang->about_allow_outlink_site}</p>
+			</p>
+		</li>
+		<li>
+			<p class="q"><label for="filesize">{$lang->about_allowed_filesize}</label></p>
+			<p class="a"><input id="filesize" type="text" name="allowed_filesize" value="{$config->allowed_filesize}" style="width:40px" /> MB</p>
+		</li>
+		<li>
+			<p class="q"><label for="attachSize">{$lang->about_allowed_attach_size}</label></p>
+			<p class="a"><input id="attachSize" type="text" name="allowed_attach_size" value="{$config->allowed_attach_size}" style="width:40px" /> MB</p>
+		</li>
+		<li>
+			<p class="q"><label for="allowedFiletypes">{$lang->about_allowed_filetypes}</label></p>
+			<p class="a"><input id="allowedFiletypes" type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
+</form>
diff --git a/modules/file/tpl/file_config.html b/modules/file/tpl/file_config.html
index 59ec81090..a47692ebc 100644
--- a/modules/file/tpl/file_config.html
+++ b/modules/file/tpl/file_config.html
@@ -1,58 +1,63 @@
 <!--#include("header.html")-->
 <!--%import("filter/insert_config.xml")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allow_outlink}</div></th>
-        <td>
-            <select name="allow_outlink">
-                <option value="Y"<!--@if($config->allow_outlink=='Y')--> selected="selected"<!--@end-->>{$lang->enable}</option>
-                <option value="N"<!--@if($config->allow_outlink=='N')--> selected="selected"<!--@end-->>{$lang->disable}</option>
-            </select>
-            <p>{$lang->about_allow_outlink}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allow_outlink_format}</div></th>
-        <td>
-            <input type="text" name="allow_outlink_format" value="{$config->allow_outlink_format}" class="inputTypeText" />
-            <p>{$lang->about_allow_outlink_format}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allow_outlink_site}</div></th>
-        <td>
-            <textarea name="allow_outlink_site" class="fullWidth">{$config->allow_outlink_site}</textarea>
-            <p>{$lang->about_allow_outlink_site}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allowed_filesize}</div></th>
-        <td>
-            <input type="text" name="allowed_filesize" value="{$config->allowed_filesize}" class="inputTypeText" size="3" />MB
-            <p>{$lang->about_allowed_filesize}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="col"><div>{$lang->allowed_attach_size}</div></th>
-        <td>
-            <input type="text" name="allowed_attach_size" value="{$config->allowed_attach_size}" class="inputTypeText" size="3" />MB
-            / {ini_get('upload_max_filesize')}
-            <p>{$lang->about_allowed_attach_size}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allowed_filetypes}</div></th>
-        <td>
-            <input type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" class="inputTypeText w100" />
-            <p>{$lang->about_allowed_filetypes}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row" colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</form>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+	<form ruleset="insertConfig" action="./" method="post" class="form">
+		<input type="hidden" name="module" value="file" />
+		<input type="hidden" name="act" value="procFileAdminInsertConfig" />
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0">
+				<tr>
+				<th scope="col">{$lang->allow_outlink}</th>
+				<td class="text">
+					<select name="allow_outlink">
+						<option value="Y"<!--@if($config->allow_outlink=='Y')--> selected="selected"<!--@end-->>{$lang->enable}</option>
+						<option value="N"<!--@if($config->allow_outlink=='N')--> selected="selected"<!--@end-->>{$lang->disable}</option>
+					</select>
+					<p>{$lang->about_allow_outlink}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="col">{$lang->allow_outlink_format}</th>
+				<td class="text">
+					<input type="text" name="allow_outlink_format" value="{$config->allow_outlink_format}"  />
+					<p>{$lang->about_allow_outlink_format}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="col">{$lang->allow_outlink_site}</th>
+				<td class="text">
+					<textarea name="allow_outlink_site" class="fullWidth">{$config->allow_outlink_site}</textarea>
+					<p>{$lang->about_allow_outlink_site}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="col">{$lang->allowed_filesize}</th>
+				<td class="text">
+					<input type="text" name="allowed_filesize" value="{$config->allowed_filesize}"  size="3" />MB
+					<p>{$lang->about_allowed_filesize}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="col">{$lang->allowed_attach_size}</th>
+				<td class="text">
+					<input type="text" name="allowed_attach_size" value="{$config->allowed_attach_size}"  size="3" />MB
+					/ {ini_get('upload_max_filesize')}
+					<p>{$lang->about_allowed_attach_size}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="col">{$lang->allowed_filetypes}</th>
+				<td class="text">
+					<input type="text" name="allowed_filetypes" value="{$config->allowed_filetypes}" />
+					<p>{$lang->about_allowed_filetypes}</p>
+				</td>
+			</tr>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+		</div>
+	</form>
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index c3eefec33..fa3be3cdc 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -1,133 +1,187 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--%import("css/file_list.css")-->
-<!--#include("header.html")-->
-
-<!-- 검색 -->
-<div class="fl">
-    <form action="./" method="get" class="adminSearch">
-    <input type="hidden" name="module" value="{$module}" />
-    <input type="hidden" name="act" value="{$act}" />
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-
-        <fieldset>
-            <select name="isvalid">
-                <option value="">{$lang->status}</option>
-                <option value="Y" <!--@if($isvalid=="Y")-->selected="selected"<!--@end-->>{$lang->is_valid}</option>
-                <option value="N" <!--@if($isvalid=="N")-->selected="selected"<!--@end-->>{$lang->is_stand_by}</option>
-            </select>
-            <select name="search_target">
-                <option value="">{$lang->search_target}</option>
-                <!--@foreach($lang->file_search_target_list as $key => $val)-->
-                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-
-            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
-        </fieldset>
-    </form>
-</div>
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 모듈 선택 -->
-<div class="fr">
-    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
-    <span class="button red"><input type="submit" value="{$lang->cmd_delete_checked_file}" /></span>
-</div>
-
-<!-- 목록 -->
-<table cellspacing="0" class="crossTable clear">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide"><div>{$lang->file}</div></th>
-        <th scope="col"><div>{$lang->file_size}</div></th>
-        <th scope="col"><div>{$lang->status}</div></th>
-        <th scope="col"><div>{$lang->cmd_download}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><div>{$lang->nick_name}</div></th>
-    </tr>
-</thead>
-
-<tbody>
-<!--@foreach($file_list as $no => $val)-->
-    <!--@if($val->upload_target_srl != $cur_upload_target_srl)-->
-        <!--@if($val->upload_target_type == 'com')-->
-            {@ $document_srl = $val->target_document_srl}
-            {@ $move_uri = getUrl('', 'document_srl', $document_srl).'#comment_'.$val->upload_target_srl}
-        <!--@elseif($val->upload_target_type == 'doc')-->
-            {@ $document_srl = $val->upload_target_srl}
-            {@ $move_uri = getUrl('', 'document_srl', $document_srl)}
-        <!--@end-->
-        {@ $cur_upload_target_srl = $val->upload_target_srl}
-    <tr class="row{$cycle_idx} bg1">
-        <th colspan="9">
-            <!--@if(!$val->upload_target_type)-->
-                <!--@if($val->isvalid=='Y')-->
-                    {$lang->is_valid}
-                <!--@else-->
-                    {$lang->is_stand_by}
-                <!--@end-->
-            <!--@else-->
-                <!--@if($val->upload_target_type == 'com')-->[{$lang->comment}] <!--@end-->
-                <!--@if($val->upload_target_type == 'mod')-->[{$lang->module}] <!--@end-->
-
-                <!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl] && $document_list[$document_srl]->get('module_srl') == $document_list[$document_srl]->get('member_srl'))-->[{$lang->cmd_temp_save}] <!--@end-->
-                <!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl] && $document_list[$document_srl]->get('module_srl') == 0)-->[{$lang->cmd_trash}] <!--@end-->
-                <a href="{getUrl('', 'mid', $module_list[$val->module_srl]->mid)}" onclick="window.open(this.href);return false;">{$module_list[$val->module_srl]->browser_title}</a>
-                <!--@if($document_list[$document_srl] && ($val->upload_target_type == 'doc' || $val->upload_target_type == 'com'))-->
-                 - <!--@if($document_list[$document_srl]->get('module_srl') != $document_list[$document_srl]->get('member_srl'))--><a href="{$move_uri}" onclick="window.open(this.href);return false;">{$document_list[$document_srl]->getTitle()}</a><!--@else-->{$document_list[$document_srl]->getTitle()}<!--@end-->
-                <!--@end-->
-            <!--@end-->
-        </th>
-    </tr>
-    <!--@endif-->
-
-    <tr>
-        <td class="tCenter number">{$no}</td>
-        <td class="tCenter"><input type="checkbox" name="cart" value="{$val->file_srl}" /></td>
-        <td class="wide"><a href="{$val->download_url}" class="red">{$val->source_filename}</a></td>
-        <td class="number tRight">{FileHandler::filesize($val->file_size)}</td>
-        <td class="tCenter">
-        <!--@if($val->isvalid=='Y')-->
-            {$lang->is_valid}
-        <!--@else-->
-            {$lang->is_stand_by}
-        <!--@end-->
-        </td>
-        <td class="number tCenter">{$val->download_count}</td>
-        <td class="date tCenter nowrap" title="{zdate($val->regdate,"Y-m-d H:i:s")}">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="number tCenter nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
-        <td class="nowrap">
-        <!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl])-->
-            <span class="member_{$document_list[$document_srl]->get('member_srl')}">{$document_list[$document_srl]->getNickName()}</span>
-        <!--@elseif($val->upload_target_type == 'com' && $comment_list[$val->upload_target_srl])-->
-            <span class="member_{$comment_list[$val->upload_target_srl]->get('member_srl')}">{$comment_list[$val->upload_target_srl]->getNickName()}</span>
-        <!--@end-->
-        </td>
-    </tr>
-<!--@endforeach-->
-</tbody>
-</table>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a>
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong>
-        <!--@else-->
-            <a href="{getUrl('page',$page_no)}">{$page_no}</a>
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page)}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
+<script type="text/javascript">
+xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
+xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+</script>
+<load target="js/file_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form id="fo_list" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="file" />
+	<h1 class="h1">{$lang->file}</h1>
+	<div class="table">
+		<div class="cnb">
+			<a href="{getUrl('', 'module', 'admin', 'act', 'dispFileAdminList')}" <!--@if($search_keyword == '')-->class="active"<!--@end-->>All</a>
+			| <a href="{getUrl('search_target','isvalid','search_keyword','Y')}" <!--@if($search_target == 'isvalid' && $search_keyword == 'Y')-->class="active"<!--@end-->>{$lang->is_valid}</a>
+			| <a href="{getUrl('search_target','isvalid','search_keyword','N')}" <!--@if($search_target == 'isvalid' && $search_keyword == 'N')-->class="active"<!--@end-->>{$lang->is_stand_by}</a>
+		</div>
+		<table width="100%" border="1" cellspacing="0" id="fileListTable">
+			<caption>
+				<!--@if($search_keyword == '')-->
+				All
+				<!--@elseif($search_target == 'isvalid' && $search_keyword == 'Y')-->
+				{$lang->is_valid}
+				<!--@elseif($search_target == 'isvalid' && $search_keyword == 'N')-->
+				{$lang->is_stand_by}
+				<!--@end-->
+				({number_format($total_count)})
+				<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getFileList();">{$lang->file_manager}...</a></span></span>
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col" class="text">{$lang->file}</th>
+					<th scope="col">{$lang->file_size}</th>
+					<th scope="col">{$lang->cmd_download}</th>
+					<th scope="col">{$lang->author}</th>
+					<th scope="col">{$lang->date}</th>
+					<th scope="col">{$lang->ipaddress}</th>
+					<th scope="col">{$lang->status}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<th scope="col" class="text">{$lang->file}</th>
+					<th scope="col">{$lang->file_size}</th>
+					<th scope="col">{$lang->cmd_download}</th>
+					<th scope="col">{$lang->author}</th>
+					<th scope="col">{$lang->date}</th>
+					<th scope="col">{$lang->ipaddress}</th>
+					<th scope="col">{$lang->status}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</tfoot>
+			<tbody>
+				<!--@foreach($file_list as $no => $val)-->
+					<!-- one document start -->
+					<!--@if($val->upload_target_srl != $cur_upload_target_srl)-->
+						<!--@if($val->upload_target_type == 'com')-->
+							{@ $document_srl = $val->target_document_srl}
+							{@ $move_uri = getUrl('', 'document_srl', $document_srl).'#comment_'.$val->upload_target_srl}
+						<!--@elseif($val->upload_target_type == 'doc')-->
+							{@ $document_srl = $val->upload_target_srl}
+							{@ $move_uri = getUrl('', 'document_srl', $document_srl)}
+						<!--@end-->
+						{@ $cur_upload_target_srl = $val->upload_target_srl}
+				<tr>
+					<th colspan="8" class="text" scope="col">
+						<!--@if(!$val->upload_target_type)-->
+							<!--@if($val->isvalid=='Y')-->
+								{$lang->is_valid}
+							<!--@else-->
+								{$lang->is_stand_by}
+							<!--@end-->
+						<!--@else-->
+							<!--@if($val->upload_target_type == 'com')-->[{$lang->comment}] <!--@end-->
+							<!--@if($val->upload_target_type == 'mod')-->[{$lang->module}] <!--@end-->
+
+							<!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl] && $document_list[$document_srl]->get('module_srl') == $document_list[$document_srl]->get('member_srl'))-->[{$lang->cmd_temp_save}] <!--@end-->
+							<!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl] && $document_list[$document_srl]->get('module_srl') == 0)-->[{$lang->cmd_trash}] <!--@end-->
+							<a href="{getUrl('', 'mid', $module_list[$val->module_srl]->mid)}" target="_blank">{$module_list[$val->module_srl]->browser_title}</a>
+							<!--@if($document_list[$document_srl] && ($val->upload_target_type == 'doc' || $val->upload_target_type == 'com'))-->
+							 - <!--@if($document_list[$document_srl]->get('module_srl') != $document_list[$document_srl]->get('member_srl'))--><a href="{$move_uri}" target="_blank">{$document_list[$document_srl]->getTitle()}</a><!--@else-->{$document_list[$document_srl]->getTitle()}<!--@end-->
+							<!--@end-->
+						<!--@end-->
+					</th>
+				</tr>
+					<!--@endif-->
+					<!-- one document end -->
+				<tr>
+					<td class="text"><a href="{$val->download_url}">{htmlspecialchars($val->source_filename)}</a></td>
+					<td>{FileHandler::filesize($val->file_size)}</td>
+					<td>{$val->download_count}</td>
+					<td>
+						<!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl])-->
+						<a href="#popup_menu_area" class="member_{$document_list[$document_srl]->get('member_srl')}">{$document_list[$document_srl]->getNickName()}</a>
+						<!--@elseif($val->upload_target_type == 'com' && $comment_list[$val->upload_target_srl])-->
+						<a href="#popup_menu_area" class="member_{$comment_list[$val->upload_target_srl]->get('member_srl')}">{$comment_list[$val->upload_target_srl]->getNickName()}</a>
+						<!--@end-->
+					</td>
+					<td>{zdate($val->regdate,"Y-m-d H:i")}</td>
+					<td><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
+					<td><!--@if($val->isvalid=='Y')-->{$lang->is_valid}<!--@else-->{$lang->is_stand_by}<!--@end--></td>
+					<td>
+						<input type="checkbox" name="cart" value="{$val->file_srl}" />
+					</td>
+				</tr>
+				<!--@endforeach-->
+			</tbody>
+		</table>
+		<div class="btnArea">
+			<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getFileList();">{$lang->file_manager}...</a></span>
+		</div>
+	</div>
+</form>
+<div class="modal" id="listManager">
+	<form ruleset="deleteChecked" action="./" method="post" class="fg form">
+	<input type="hidden" name="module" value="file" />
+	<input type="hidden" name="act" value="procFileAdminDeleteChecked" />
+	<input type="hidden" name="page" value="{$page}" />
+		<h2 class="h2">{$lang->file_manager}</h2>
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0" id="fileManageListTable">
+				<caption>{$lang->selected_file} <strong id="selectedFileCount"></strong></caption>
+				<thead>
+					<tr>
+						<th scope="col" class="text">{$lang->file}</th>
+						<th scope="col">{$lang->file_size}</th>
+						<th scope="col">{$lang->nick_name}</th>
+						<th scope="col">{$lang->status}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_delete}" class="delete" /></span>
+		</div>
+	</form>
+</div>
+<div class="search">
+<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+</form>
+
+	<form action="./" method="get" onsubmit="return checkSearch(this)">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="error_return_url" value="" />
+		<select name="search_target">
+			<option value="">{$lang->search_target}</option>
+			<!--@foreach($lang->file_search_target_list as $key => $val)-->
+			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+			<!--@end-->
+		</select>
+		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+		<input type="submit" value="{$lang->cmd_search}" />
+		<a href="{getUrl('','module',$module,'act',$act)}"><span>{$lang->cmd_cancel}</span></a>
+	</form>
+</div>
diff --git a/modules/file/tpl/file_module_config.html b/modules/file/tpl/file_module_config.html
index c8c976f39..8455c508b 100644
--- a/modules/file/tpl/file_module_config.html
+++ b/modules/file/tpl/file_module_config.html
@@ -1,46 +1,46 @@
-<!--%import("filter/insert_file_module_config.xml")-->
-<form action="./" method="get" onsubmit="return procFilter(this, insert_file_module_config)">
-<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
-
-    <h4 class="xeAdmin">{$lang->file}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allowed_filesize}</div></th>
-        <td>
-            <input type="text" name="allowed_filesize" value="{$file_config->allowed_filesize}" class="inputTypeText" size="3" />MB
-            <p>{$lang->about_allowed_filesize}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="col"><div>{$lang->allowed_attach_size}</div></th>
-        <td>
-            <input type="text" name="allowed_attach_size" value="{$file_config->allowed_attach_size}" class="inputTypeText" size="3" />MB
-            / {ini_get('upload_max_filesize')}
-            <p>{$lang->about_allowed_attach_size}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->allowed_filetypes}</div></th>
-        <td>
-            <input type="text" name="allowed_filetypes" value="{$file_config->allowed_filetypes}" class="inputTypeText w100" />
-            <p>{$lang->about_allowed_filetypes}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="col"><div>{$lang->enable_download_group}</div></th>
-        <td>
-            <!--@foreach($group_list as $k => $v)-->
-            <input type="checkbox" class="checkbox" name="download_grant" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(in_array($v->group_srl, $file_config->download_grant))-->checked="checked"<!--@end-->/> 
-            <label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
-            &nbsp;
-            <!--@end-->
-        </td>
-    </tr>
-    <tr class="row2">
-        <th class="button" colspan="2">
-            <span class="button strong black"><input type="submit" value="{$lang->cmd_save}" /></span>
-        </th>
-    </tr>
-    </table>
-
+<form ruleset="fileModuleConfig" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="file" />
+	<input type="hidden" name="act" value="procFileAdminInsertModuleConfig" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<input type="hidden" name="target_module_srl" value="{$module_info->module_srl?$module_info->module_srl:$module_srls}" />
+    <h3 class="h3">{$lang->file}</h3>
+    <div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+			<th scope="row"><label for="allowed_filesize">{$lang->allowed_filesize}</label></th>
+			<td class="text">
+				<input type="text" name="allowed_filesize" id="allowed_filesize" value="{$file_config->allowed_filesize}"  size="3" style="width:30px" /> MB
+				<p class="desc">{$lang->about_allowed_filesize}</p>
+			</td>
+		</tr>
+		<tr>
+			<th scope="row"><label for="allowed_attach_size">{$lang->allowed_attach_size}</label></th>
+			<td class="text">
+				<input type="text" name="allowed_attach_size" id="allowed_attach_size" value="{$file_config->allowed_attach_size}" size="3" style="width:30px" /> MB
+				/ {ini_get('upload_max_filesize')}
+				<p class="desc">{$lang->about_allowed_attach_size}</p>
+			</td>
+		</tr>
+		<tr>
+			<th scope="row"><label for="allowed_filetypes">{$lang->allowed_filetypes}</label></th>
+			<td class="text">
+				<input type="text" name="allowed_filetypes" id="allowed_filetypes" value="{$file_config->allowed_filetypes}" />
+				<p class="desc">{$lang->about_allowed_filetypes}</p>
+			</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->enable_download_group}</th>
+			<td class="text">
+				<!--@foreach($group_list as $k => $v)-->
+				<input type="checkbox" class="checkbox" name="download_grant[]" value="{$v->group_srl}" id="grant_{$key}_{$v->group_srl}" <!--@if(in_array($v->group_srl, $file_config->download_grant))-->checked="checked"<!--@end-->/> 
+				<label for="grant_{$key}_{$v->group_srl}">{$v->title}</label>
+				&nbsp;
+				<!--@end-->
+			</td>
+		</tr>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </form>
diff --git a/modules/file/tpl/header.html b/modules/file/tpl/header.html
index 7091732ce..b608bc5db 100644
--- a/modules/file/tpl/header.html
+++ b/modules/file/tpl/header.html
@@ -1,10 +1,8 @@
-<!--%import("js/file_admin.js")-->
-
-<h3 class="xeAdmin">{$lang->file} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<div class="header4 gap1">
-    <ul class="localNavigation">
-        <li <!--@if($act=='dispFileAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispFileAdminList')}">{$lang->file_list}</a></li>
-        <li <!--@if($act=='dispFileAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispFileAdminConfig')}">{$lang->cmd_module_config}</a></li>
+<load target="js/file_admin.js" usecdn="true" />
+<h2 class="h2">{$lang->file} {$lang->cmd_management}</h2>
+<div class="cnb">
+    <ul>
+        <li <!--@if($act=='dispFileAdminList')-->class="active"<!--@end-->><a href="{getUrl('act','dispFileAdminList')}">{$lang->file_list}</a></li>
+        <li <!--@if($act=='dispFileAdminConfig')-->class="active"<!--@end-->><a href="{getUrl('act','dispFileAdminConfig')}">{$lang->cmd_module_config}</a></li>
     </ul>
 </div>
diff --git a/modules/file/tpl/iframe.html b/modules/file/tpl/iframe.html
index 29e9bf177..dadf59bd9 100644
--- a/modules/file/tpl/iframe.html
+++ b/modules/file/tpl/iframe.html
@@ -1,27 +1,27 @@
-<script type="text/javascript">//<<![CDATA[
-
-	var uploaded_fileinfo = {};
-	<!--@if($uploaded_fileinfo->error==0)-->
-	uploaded_fileinfo.error = 0;
-	uploaded_fileinfo.file_srl = {$uploaded_fileinfo->get('file_srl')};
-	uploaded_fileinfo.file_size = {$uploaded_fileinfo->get('file_size')};
-	uploaded_fileinfo.sid = '{$uploaded_fileinfo->get('sid')}';
-	uploaded_fileinfo.direct_download = '{$uploaded_fileinfo->get('direct_download')}';
-	uploaded_fileinfo.source_filename = '{$uploaded_fileinfo->get('source_filename')}';
-	uploaded_fileinfo.upload_target_srl = '{$uploaded_fileinfo->get('upload_target_srl')}';
-	uploaded_fileinfo.uploaded_filename = '{$uploaded_fileinfo->get('uploaded_filename')}';
-	<!--@else-->
-	uploaded_fileinfo.error = -1;
-	uploaded_fileinfo.message = '{$uploaded_fileinfo->message}';
-	<!--@end-->
-
-	<!--@if($callback)-->
-		try{
-			parent[{$callback}](uploaded_fileinfo);
-		}catch(e){
-		
-		}
-	<!--@end-->
-
-//]]>>
-</script>
+<script type="text/javascript">//<<![CDATA[
+
+	var uploaded_fileinfo = {};
+	<!--@if($uploaded_fileinfo->error==0)-->
+	uploaded_fileinfo.error = 0;
+	uploaded_fileinfo.file_srl = {$uploaded_fileinfo->get('file_srl')};
+	uploaded_fileinfo.file_size = {$uploaded_fileinfo->get('file_size')};
+	uploaded_fileinfo.sid = '{$uploaded_fileinfo->get('sid')}';
+	uploaded_fileinfo.direct_download = '{$uploaded_fileinfo->get('direct_download')}';
+	uploaded_fileinfo.source_filename = '{$uploaded_fileinfo->get('source_filename')}';
+	uploaded_fileinfo.upload_target_srl = '{$uploaded_fileinfo->get('upload_target_srl')}';
+	uploaded_fileinfo.uploaded_filename = '{$uploaded_fileinfo->get('uploaded_filename')}';
+	<!--@else-->
+	uploaded_fileinfo.error = -1;
+	uploaded_fileinfo.message = '{$uploaded_fileinfo->message}';
+	<!--@end-->
+
+	<!--@if($callback)-->
+		try{
+			parent[{$callback}](uploaded_fileinfo);
+		}catch(e){
+		
+		}
+	<!--@end-->
+
+//]]>>
+</script>
diff --git a/modules/file/tpl/js/fileConfig.js b/modules/file/tpl/js/fileConfig.js
new file mode 100644
index 000000000..950c671e8
--- /dev/null
+++ b/modules/file/tpl/js/fileConfig.js
@@ -0,0 +1,9 @@
+(function($){
+	$('input[name=allow_outlink]').click(function(){
+		if($(this).val() == 'Y'){
+			$('._outLink').show();
+		}else{
+			$('._outLink').hide();
+		}
+	});
+ }(jQuery))
diff --git a/modules/file/tpl/js/file_admin.js b/modules/file/tpl/js/file_admin.js
index d9ae12920..c35ff339e 100644
--- a/modules/file/tpl/js/file_admin.js
+++ b/modules/file/tpl/js/file_admin.js
@@ -1,3 +1,60 @@
 function insertSelectedModule(id, module_srl, mid, browser_title) {
     location.href = current_url.setQuery('module_srl',module_srl);
 }
+
+function getFileList() {
+	var fileListTable = jQuery('#fileListTable');
+	var cartList = [];
+	fileListTable.find(':checkbox[name=cart]').each(function(){
+		if(this.checked) cartList.push(this.value); 
+	});
+
+    var params = new Array();
+    var response_tags = ['error','message', 'file_list'];
+	params["file_srls"] = cartList.join(",");
+
+    exec_xml('file','procFileGetList',params, completeGetFileList, response_tags);
+}
+
+function completeGetFileList(ret_obj, response_tags)
+{
+	var htmlListBuffer = '';
+	if(ret_obj['file_list'] == null)
+	{
+		htmlListBuffer = '<tr>' +
+							'<td colspan="4" style="text-align:center;">'+ret_obj['message']+'</td>' +
+						'</tr>';
+	}
+	else
+	{
+		var file_list = ret_obj['file_list']['item'];
+		if(!jQuery.isArray(file_list)) file_list = [file_list];
+		for(var x in file_list)
+		{
+			var objFile = file_list[x];
+			htmlListBuffer += '<tr>' +
+							'<td class="text">'+objFile.source_filename+'</td>' +
+							'<td>'+objFile.human_file_size+'</td>' +
+							'<td></td>' +
+							'<td>'+objFile.validName+'</td>' +
+						'</tr>' +
+						'<input type="hidden" name="cart[]" value="'+objFile.file_srl+'" />';
+		}
+		jQuery('#selectedFileCount').html(file_list.length);
+	}
+	jQuery('#fileManageListTable>tbody').html(htmlListBuffer);
+}
+
+function checkSearch(form)
+{
+	if(form.search_target.value == '')
+	{
+		alert(xe.lang.msg_empty_search_target);
+		return false;
+	}
+	if(form.search_keyword.value == '')
+	{
+		alert(xe.lang.msg_empty_search_keyword);
+		return false;
+	}
+}
diff --git a/modules/importer/conf/info.xml b/modules/importer/conf/info.xml
index ab7e47158..ed259b0a9 100644
--- a/modules/importer/conf/info.xml
+++ b/modules/importer/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">데이터 이전</title>
-    <title xml:lang="en">Data Importer</title>
-    <title xml:lang="vi">Chuyển đổi Data</title>
-    <title xml:lang="zh-CN">数据导入</title>
-    <title xml:lang="jp">データ移転</title>
-    <title xml:lang="es">Transferencia de los datos</title>
-    <title xml:lang="ru">Трансферинг</title>
-    <title xml:lang="zh-TW">資料匯入</title>
-    <title xml:lang="tr">Veri Alıcısı</title>
-    <description xml:lang="ko">XML파일을 이용하여 회원정보 또는 게시판등의 데이터를 입력합니다.</description>
-    <description xml:lang="en">This module imports data of members and articles from XML file.</description>
-    <description xml:lang="vi">Nhập thông tin thành viên hoặc Database sử dụng định dạng XML Data.</description>
-    <description xml:lang="zh-CN">利用XML文件导入会员信息或版面数据。</description>
-    <description xml:lang="jp">XMLファイルを用いて会員情報または掲示板などの情報を入力します。</description>
-    <description xml:lang="es">Ingresa la información del usuario o los datos del tablero utilizando el archivo XML.</description>
-    <description xml:lang="ru">Запись информации пользователей или форума, используя XML-файл.</description>
-    <description xml:lang="zh-TW">利用 XML 檔案匯入會員或討論板資料。</description>
-    <description xml:lang="tr">Bu modül, XML dosyasından üye ve makale verilerinin içeri aktarımı içindir.</description>
-    <version>0.2</version>
-    <date>2007-12-13</date>
-    <category>migration</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">데이터 이전</title>
+    <title xml:lang="en">Data Importer</title>
+    <title xml:lang="vi">Chuyển đổi Data</title>
+    <title xml:lang="zh-CN">数据导入</title>
+    <title xml:lang="jp">データ移転</title>
+    <title xml:lang="es">Transferencia de los datos</title>
+    <title xml:lang="ru">Трансферинг</title>
+    <title xml:lang="zh-TW">資料匯入</title>
+    <title xml:lang="tr">Veri Alıcısı</title>
+    <description xml:lang="ko">XML파일을 이용하여 회원정보 또는 게시판등의 데이터를 입력합니다.</description>
+    <description xml:lang="en">This module imports data of members and articles from XML file.</description>
+    <description xml:lang="vi">Nhập thông tin thành viên hoặc Database sử dụng định dạng XML Data.</description>
+    <description xml:lang="zh-CN">利用XML文件导入会员信息或版面数据。</description>
+    <description xml:lang="jp">XMLファイルを用いて会員情報または掲示板などの情報を入力します。</description>
+    <description xml:lang="es">Ingresa la información del usuario o los datos del tablero utilizando el archivo XML.</description>
+    <description xml:lang="ru">Запись информации пользователей или форума, используя XML-файл.</description>
+    <description xml:lang="zh-TW">利用 XML 檔案匯入會員或討論板資料。</description>
+    <description xml:lang="tr">Bu modül, XML dosyasından üye ve makale verilerinin içeri aktarımı içindir.</description>
+    <version>0.2</version>
+    <date>2007-12-13</date>
+    <category>migration</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/importer/conf/module.xml b/modules/importer/conf/module.xml
index 2dae81e89..e033d73c1 100644
--- a/modules/importer/conf/module.xml
+++ b/modules/importer/conf/module.xml
@@ -3,7 +3,7 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispImporterAdminContent" type="view" standalone="true" admin_index="true" />
+        <action name="dispImporterAdminImportForm" type="view" standalone="true" admin_index="true" menu_name="importer" menu_index="true" />
 
         <action name="procImporterAdminImport" type="controller" standalone="true" />
         <action name="procImporterAdminPreProcessing" type="controller" standalone="true" />
@@ -13,5 +13,21 @@
         <action name="procImporterAdminMessageImport" type="controller" standalone="true" />
         <action name="procImporterAdminModuleImport" type="controller" standalone="true" />
         <action name="procImporterAdminTTXMLImport" type="controller" standalone="true" />
+        <action name="procImporterAdminCheckXmlFile" type="controller" standalone="true" />
     </actions>
+	<menus>
+		<menu name="importer">
+			<title xml:lang="en">Data Migration</title>
+			<title xml:lang="ko">데이터 들여오기</title>
+			<title xml:lang="zh-CN">Data Migration</title>
+			<title xml:lang="jp">Data Migration</title>
+			<title xml:lang="es">Data Migration</title>
+			<title xml:lang="ru">Data Migration</title>
+			<title xml:lang="fr">Data Migration</title>
+			<title xml:lang="zh-TW">Data Migration</title>
+			<title xml:lang="vi">Data Migration</title>
+			<title xml:lang="mn">Data Migration</title>
+			<title xml:lang="tr">Data Migration</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/importer/extract.class.php b/modules/importer/extract.class.php
index e510da8e7..33c9ef062 100644
--- a/modules/importer/extract.class.php
+++ b/modules/importer/extract.class.php
@@ -1,208 +1,206 @@
-<?php
-    /**
-     * @class extract 
-     * @author NHN (developers@xpressengine.com)
-     * @brief  대용량의 xml파일을 특정 태그를 중심으로 개별 파일로 저장하는 클래스
-     **/
-    class extract {
-        var $key = '';
-        var $cache_path = './files/cache/importer';
-        var $cache_index_file = './files/cache/importer';
-        
-        var $filename = null;
-        var $startTag = '';
-        var $endTag = '';
-        var $itemStartTag = '';
-        var $itemEndTag = '';
-
-        var $fd = null;
-        var $index_fd = null;
-
-        var $isStarted = false;
-        var $isFinished = true;
-
-        var $buff = 0;
-
-        var $index = 0;
-
-        /**
-         * @brief 생성자, 대상 파일이름과 시작-끝 태그명, 그리고 각 개별 아이템 태그명을 인자로 받음
-         **/
-        function set($filename, $startTag, $endTag, $itemTag, $itemEndTag) {
-            $this->filename = $filename;
-
-            $this->startTag = $startTag;
-            if($endTag) $this->endTag = $endTag;
-            $this->itemStartTag = $itemTag;
-            $this->itemEndTag = $itemEndTag;
-
-            $this->key = md5($filename);
-
-            $this->cache_path = './files/cache/importer/'.$this->key;
-            $this->cache_index_file = $this->cache_path.'/index';
-
-            if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
-
-            return $this->openFile();
-        }
-
-        /**
-         * @brief 지정된 파일의 지시자를 염
-         **/
-        function openFile() {
-            FileHandler::removeFile($this->cache_index_file);
-            $this->index_fd = fopen($this->cache_index_file,"a");
-
-            // local 파일일 경우 
-            if(!preg_match('/^http:/i',$this->filename)) {
-                if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
-                $this->fd = fopen($this->filename,"r");
-
-            // remote 파일일 경우
-            } else {
-                $url_info = parse_url($this->filename);
-                if(!$url_info['port']) $url_info['port'] = 80;
-                if(!$url_info['path']) $url_info['path'] = '/';
-
-                $this->fd = @fsockopen($url_info['host'], $url_info['port']);
-                if(!$this->fd) return new Object(-1,'msg_no_xml_file');
-
-                // 한글 파일이 있으면 한글파일 부분만 urlencode하여 처리 (iconv 필수)
-                $path = $url_info['path'];
-                if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv')) {
-                    $path_list = explode('/',$path);
-                    $cnt = count($path_list);
-                    $filename = $path_list[$cnt-1];
-                    $filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
-                    $path_list[$cnt-1] = $filename;
-                    $path = implode('/',$path_list);
-                    $url_info['path'] = $path;
-                }
-
-                $header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
-                @fwrite($this->fd, $header);
-                $buff = '';
-                while(!feof($this->fd)) {
-                    $buff .= $str = fgets($this->fd, 1024);
-                    if(!trim($str)) break;
-                }
-                if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
-            }
-
-            if($this->startTag) {
-                while(!feof($this->fd)) {
-                    $str = fgets($this->fd, 1024);
-                    $pos = strpos($str, $this->startTag);
-                    if($pos !== false) {
-                        $this->buff = substr($this->buff, $pos+strlen($this->startTag));
-                        $this->isStarted = true;
-                        $this->isFinished = false;
-                        break;
-                    }
-                }
-            } else {
-                $this->isStarted = true;
-                $this->isFinished = false;
-            }
-
-            return new Object();
-        }
-        
-        function closeFile() {
-            $this->isFinished = true;
-            fclose($this->fd);
-            fclose($this->index_fd);
-        }
-
-        function isFinished() {
-            return $this->isFinished || !$this->fd || feof($this->fd);
-        }
-
-        function saveItems() {
-            $this->index = 0;
-            while(!$this->isFinished()) {
-                $this->getItem();
-            }
-        }
-
-        function mergeItems($filename) {
-            $this->saveItems();
-
-            $filename = sprintf('%s/%s', $this->cache_path, $filename);
-
-            $index_fd = fopen($this->cache_index_file,"r");
-            $fd = fopen($filename,'w');
-
-            fwrite($fd, '<items>');
-            while(!feof($index_fd)) {
-                $target_file = trim(fgets($index_fd,1024));
-                if(!file_exists($target_file)) continue;
-                $buff = FileHandler::readFile($target_file);
-                fwrite($fd, FileHandler::readFile($target_file));
-
-                FileHandler::removeFile($target_file);
-            }
-            fwrite($fd, '</items>');
-            fclose($fd);
-        }
-
-        function getItem() {
-            if($this->isFinished()) return;
-
-            while(!feof($this->fd)) {
-                $startPos = strpos($this->buff, $this->itemStartTag);
-                if($startPos !== false) {
-                    $this->buff = substr($this->buff, $startPos);
-					$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
-                    break;
-                } elseif($this->endTag) {
-                    $endPos = strpos($this->buff, $this->endTag);
-                    if($endPos !== false) {
-                        $this->closeFile();
-                        return;
-                    }
-                }
-                $this->buff .= fgets($this->fd, 1024); 
-            }
-
-            $startPos = strpos($this->buff, $this->itemStartTag);
-            if($startPos === false) {
-                $this->closeFile();
-                return;
-            }
-
-            $filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
-            fwrite($this->index_fd, $filename."\r\n");
-
-            $fd = fopen($filename,'w');
-
-            while(!feof($this->fd)) {
-                $endPos = strpos($this->buff, $this->itemEndTag);
-                if($endPos !== false) {
-                    $endPos += strlen($this->itemEndTag);
-                    $buff = substr($this->buff, 0, $endPos);
-                    fwrite($fd, $this->_addTagCRTail($buff));
-                    fclose($fd);
-                    $this->buff = substr($this->buff, $endPos);
-                    break;
-                }
-
-                fwrite($fd, $this->_addTagCRTail($this->buff));
-                $this->buff = fgets($this->fd, 1024);
-            }
-        }
-
-        function getTotalCount() {
-            return $this->index;
-        }
-
-        function getKey() {
-            return $this->key;
-        }
-
-        function _addTagCRTail($str) {
-            $str = preg_replace('/<\/([^>]*)></i', "</$1>\r\n<", $str);
-            return $str;
-        }
-    }
-?>
+<?php
+    /**
+     * @class extract 
+     * @author NHN (developers@xpressengine.com)
+     * @brief Class to save each file by using tags in the large xml
+     **/
+    class extract {
+        var $key = '';
+        var $cache_path = './files/cache/importer';
+        var $cache_index_file = './files/cache/importer';
+        
+        var $filename = null;
+        var $startTag = '';
+        var $endTag = '';
+        var $itemStartTag = '';
+        var $itemEndTag = '';
+
+        var $fd = null;
+        var $index_fd = null;
+
+        var $isStarted = false;
+        var $isFinished = true;
+
+        var $buff = 0;
+
+        var $index = 0;
+
+        /**
+         * @brief Get arguments for constructor, file name, start tag, end tag, tag name for each item
+         **/
+        function set($filename, $startTag, $endTag, $itemTag, $itemEndTag) {
+            $this->filename = $filename;
+
+            $this->startTag = $startTag;
+            if($endTag) $this->endTag = $endTag;
+            $this->itemStartTag = $itemTag;
+            $this->itemEndTag = $itemEndTag;
+
+            $this->key = md5($filename);
+
+            $this->cache_path = './files/cache/importer/'.$this->key;
+            $this->cache_index_file = $this->cache_path.'/index';
+
+            if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
+
+            return $this->openFile();
+        }
+
+        /**
+         * @brief Open an indicator of the file
+         **/
+        function openFile() {
+            FileHandler::removeFile($this->cache_index_file);
+            $this->index_fd = fopen($this->cache_index_file,"a");
+            // If local file
+            if(!preg_match('/^http:/i',$this->filename)) {
+                if(!file_exists($this->filename)) return new Object(-1,'msg_no_xml_file');
+                $this->fd = fopen($this->filename,"r");
+            // If remote file
+            } else {
+                $url_info = parse_url($this->filename);
+                if(!$url_info['port']) $url_info['port'] = 80;
+                if(!$url_info['path']) $url_info['path'] = '/';
+
+                $this->fd = @fsockopen($url_info['host'], $url_info['port']);
+                if(!$this->fd) return new Object(-1,'msg_no_xml_file');
+                // If the file name contains Korean, do urlencode(iconv required)
+                $path = $url_info['path'];
+                if(preg_match('/[\xEA-\xED][\x80-\xFF]{2}/', $path)&&function_exists('iconv')) {
+                    $path_list = explode('/',$path);
+                    $cnt = count($path_list);
+                    $filename = $path_list[$cnt-1];
+                    $filename = urlencode(iconv("UTF-8","EUC-KR",$filename));
+                    $path_list[$cnt-1] = $filename;
+                    $path = implode('/',$path_list);
+                    $url_info['path'] = $path;
+                }
+
+                $header = sprintf("GET %s?%s HTTP/1.0\r\nHost: %s\r\nReferer: %s://%s\r\nConnection: Close\r\n\r\n", $url_info['path'], $url_info['query'], $url_info['host'], $url_info['scheme'], $url_info['host']);
+                @fwrite($this->fd, $header);
+                $buff = '';
+                while(!feof($this->fd)) {
+                    $buff .= $str = fgets($this->fd, 1024);
+                    if(!trim($str)) break;
+                }
+                if(preg_match('/404 Not Found/i',$buff)) return new Object(-1,'msg_no_xml_file');
+            }
+
+            if($this->startTag) {
+                while(!feof($this->fd)) {
+                    $str = fgets($this->fd, 1024);
+                    $pos = strpos($str, $this->startTag);
+                    if($pos !== false) {
+                        $this->buff = substr($this->buff, $pos+strlen($this->startTag));
+                        $this->isStarted = true;
+                        $this->isFinished = false;
+                        break;
+                    }
+                }
+            } else {
+                $this->isStarted = true;
+                $this->isFinished = false;
+            }
+
+            return new Object();
+        }
+        
+        function closeFile() {
+            $this->isFinished = true;
+            fclose($this->fd);
+            fclose($this->index_fd);
+        }
+
+        function isFinished() {
+            return $this->isFinished || !$this->fd || feof($this->fd);
+        }
+
+        function saveItems() {
+			FileHandler::removeDir($this->cache_path.$this->key);
+			$this->index = 0;
+			while(!$this->isFinished()) {
+				$this->getItem();
+			}
+        }
+
+        function mergeItems($filename) {
+            $this->saveItems();
+
+            $filename = sprintf('%s/%s', $this->cache_path, $filename);
+
+            $index_fd = fopen($this->cache_index_file,"r");
+            $fd = fopen($filename,'w');
+
+            fwrite($fd, '<items>');
+            while(!feof($index_fd)) {
+                $target_file = trim(fgets($index_fd,1024));
+                if(!file_exists($target_file)) continue;
+                $buff = FileHandler::readFile($target_file);
+                fwrite($fd, FileHandler::readFile($target_file));
+
+                FileHandler::removeFile($target_file);
+            }
+            fwrite($fd, '</items>');
+            fclose($fd);
+        }
+
+        function getItem() {
+            if($this->isFinished()) return;
+
+            while(!feof($this->fd)) {
+                $startPos = strpos($this->buff, $this->itemStartTag);
+                if($startPos !== false) {
+                    $this->buff = substr($this->buff, $startPos);
+					$this->buff = preg_replace("/\>/",">\r\n",$this->buff,1);
+                    break;
+                } elseif($this->endTag) {
+                    $endPos = strpos($this->buff, $this->endTag);
+                    if($endPos !== false) {
+                        $this->closeFile();
+                        return;
+                    }
+                }
+                $this->buff .= fgets($this->fd, 1024); 
+            }
+
+            $startPos = strpos($this->buff, $this->itemStartTag);
+            if($startPos === false) {
+                $this->closeFile();
+                return;
+            }
+
+            $filename = sprintf('%s/%s.xml',$this->cache_path, $this->index++);
+            fwrite($this->index_fd, $filename."\r\n");
+
+            $fd = fopen($filename,'w');
+
+            while(!feof($this->fd)) {
+                $endPos = strpos($this->buff, $this->itemEndTag);
+                if($endPos !== false) {
+                    $endPos += strlen($this->itemEndTag);
+                    $buff = substr($this->buff, 0, $endPos);
+                    fwrite($fd, $this->_addTagCRTail($buff));
+                    fclose($fd);
+                    $this->buff = substr($this->buff, $endPos);
+                    break;
+                }
+
+                fwrite($fd, $this->_addTagCRTail($this->buff));
+                $this->buff = fgets($this->fd, 1024);
+            }
+        }
+
+        function getTotalCount() {
+            return $this->index;
+        }
+
+        function getKey() {
+            return $this->key;
+        }
+
+        function _addTagCRTail($str) {
+            $str = preg_replace('/<\/([^>]*)></i', "</$1>\r\n<", $str);
+            return $str;
+        }
+    }
+?>
diff --git a/modules/importer/importer.admin.controller.php b/modules/importer/importer.admin.controller.php
index a4aa61030..915911597 100644
--- a/modules/importer/importer.admin.controller.php
+++ b/modules/importer/importer.admin.controller.php
@@ -1,1018 +1,1014 @@
-<?php
-    /**
-     * @class  importerAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  importer 모듈의 admin controller class
-     **/
-
-    @set_time_limit(0);
-    @require_once('./modules/importer/extract.class.php');
-
-    class importerAdminController extends importer {
-
-        var $unit_count = 300;
-        var $oXmlParser = null;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 회원정보와 게시물 정보를 싱크
-         **/
-        function procImporterAdminSync() {
-			/* DBMS가 CUBRID인 경우 MySQL과 동일한 방법으로는 문서 및 댓글에 대한 사용자 정보를 동기화 할 수 없으므로 예외 처리 합니다.
-			  CUBRID를 사용하지 않는 경우에만 보편적인 기존 질의문을 사용합니다. */
-			$db_info = Context::getDBInfo ();
-			if ($db_info->db_type != "cubrid") {
-				$output = executeQuery('importer.updateDocumentSync');
-				$output = executeQuery('importer.updateCommentSync');
-			}
-			else {
-				$output = executeQueryArray ('importer.getDocumentMemberSrlWithUserID');
-				if (is_array ($output->data) && count ($output->data)) {
-					$success_count = 0;
-					$error_count = 0;
-					$total_count = 0;
-					foreach ($output->data as $val) {
-						$args->user_id = $val->user_id;
-						$args->member_srl = $val->member_srl;
-						$tmp = executeQuery ('importer.updateDocumentSyncForCUBRID', $args);
-						if ($tmp->toBool () === true) {
-							$success_count++;
-						}
-						else {
-							$error_count++;
-						}
-						$total_count++;
-					}
-				} // documents section
-
-				$output = executeQueryArray ('importer.getCommentMemberSrlWithUserID');
-				if (is_array ($output->data) && count ($output->data)) {
-					$success_count = 0;
-					$error_count = 0;
-					$total_count = 0;
-					foreach ($output->data as $val) {
-						$args->user_id = $val->user_id;
-						$args->member_srl = $val->member_srl;
-						$tmp = executeQuery ('importer.updateCommentSyncForCUBRID', $args);
-						if ($tmp->toBool () === true) {
-							$success_count++;
-						}
-						else {
-							$error_count++;
-						}
-						$total_count++;
-					}
-				} // comments section
-			}
-
-            $this->setMessage('msg_sync_completed');
-        }
-
-        /**
-         * @brief XML파일을 미리 분석하여 개발 단위로 캐싱
-         **/
-        function procImporterAdminPreProcessing() {
-            // 이전할 대상 xml파일을 구함
-            $xml_file = Context::get('xml_file');
-
-            // 이전할 대상의 type을 구함
-            $type = Context::get('type');
-
-            // xml파일에서 정해진 규칙으로 캐싱
-            $oExtract = new extract();
-
-            switch($type) {
-                case 'member' :
-                        $output = $oExtract->set($xml_file,'<members ', '</members>', '<member>', '</member>');
-                        if($output->toBool()) $oExtract->saveItems();
-                    break;
-                case 'message' :
-                        $output = $oExtract->set($xml_file,'<messages ', '</messages>', '<message>','</message>');
-                        if($output->toBool()) $oExtract->saveItems();
-                    break;
-                case 'ttxml' :
-                        // 카테고리 정보를 구함
-                        $output = $oExtract->set($xml_file, '', '', '', '');
-                        if ($output->toBool()) {
-                            // ttxml 카테고리는 별도로 구함
-                            $started = false;
-                            $buff = '';
-                            while (!feof($oExtract->fd)) {
-                                $str = fgets($oExtract->fd, 1024);
-                                if(strstr($str, '<category>')) {
-                                     $started = true;
-                                     $str = strstr($str, '<category>');
-                                }
-                                if(substr($str,0,strlen('<post ')) == '<post ') break;
-                                if ($started) $buff .= $str;
-                            }
-                            $buff = '<categories>'.$buff.'</categories>';
-                            $oExtract->closeFile();
-                            $category_filename = sprintf('%s/%s', $oExtract->cache_path, 'category.xml');
-                            FileHandler::writeFile($category_filename, $buff);
-
-                            
-                            // 방명록 정보를 구함
-                            $output = $oExtract->set($xml_file, '', '', '', '');
-                            if ($output->toBool()) {
-                                $started = false;
-                                $buff = '';
-                                while (!feof($oExtract->fd)) {
-                                    $str = fgets($oExtract->fd, 1024);
-                                    if(strstr($str, '<guestbook>')) {
-                                         $started = true;
-                                         $str = strstr($str, '<guestbook>');
-                                    }
-                                    if ($started) {
-                                        $pos = strpos($str, '</guestbook>');
-                                        if ($pos !== false) {
-                                            $buff .= substr($str, 0, $pos + strlen('</guestbook>'));
-                                            break;
-                                        }
-                                        $buff .= $str;
-                                    }
-                                }
-                                $oExtract->closeFile();
-                                $guestbook_filename = sprintf('%s/%s', $oExtract->cache_path, 'guestbook.xml');
-                                FileHandler::writeFile($guestbook_filename, $buff);
-
-                                // 개별 아이템 구함
-                                $output = $oExtract->set($xml_file,'<blog', '</blog>', '<post ', '</post>');
-                                if($output->toBool()) $oExtract->saveItems();
-
-                            }
-                        }
-                    break;
-                default :
-                        // 카테고리 정보를 먼저 구함
-                        $output = $oExtract->set($xml_file,'<categories>', '</categories>', '<category','</category>');
-                        if($output->toBool()) {
-                            $oExtract->mergeItems('category.xml');
-
-                            // 개별 아이템 구함
-                            $output = $oExtract->set($xml_file,'<posts ', '</posts>', '<post>', '</post>');
-                            if($output->toBool()) $oExtract->saveItems();
-                        }
-                    break;
-
-            }
-
-            if(!$output->toBool()) {
-                $this->add('error',0);
-                $this->add('status',-1);
-                $this->setMessage($output->getMessage());
-                return;
-            }
-
-            // extract가 종료됨을 알림
-            $this->add('type',$type);
-            $this->add('total',$oExtract->getTotalCount());
-            $this->add('cur',0);
-            $this->add('key', $oExtract->getKey());
-            $this->add('status',0);
-        }
-
-        /**
-         * @brief xml파일의 내용이 extract되고 난후 차례대로 마이그레이션
-         **/
-        function procImporterAdminImport() {
-
-            // 변수 설정
-            $type = Context::get('type');
-            $total = Context::get('total');
-            $cur = Context::get('cur');
-            $key = Context::get('key');
-            $user_id = Context::get('user_id');
-            $target_module = Context::get('target_module');
-            $guestbook_target_module = Context::get('guestbook_target_module');
-            $this->unit_count = Context::get('unit_count');
-
-
-            // index파일이 있는지 확인
-            $index_file = './files/cache/importer/'.$key.'/index';
-            if(!file_exists($index_file)) return new Object(-1, 'msg_invalid_xml_file');
-
-            switch($type) {
-                case 'ttxml' :
-                        if(!$target_module) return new Object(-1,'msg_invalid_request');
-
-						$oModuleModel = &getModel('module');
-						$target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module);
-
-                        require_once('./modules/importer/ttimport.class.php');
-                        $oTT = new ttimport();
-                        $cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $guestbook_target_module, $user_id, $target_module_info->module);
-                    break;
-                case 'message' :
-                        $cur = $this->importMessage($key, $cur, $index_file);
-                    break;
-                case 'member' :
-                        $cur = $this->importMember($key, $cur, $index_file);
-                    break;
-                case 'module' :
-                        // 타켓 모듈의 유무 체크
-                        if(!$target_module) return new Object(-1,'msg_invalid_request');
-                        $cur = $this->importModule($key, $cur, $index_file, $target_module);
-                    break;
-            }
-
-            // extract가 종료됨을 알림
-            $this->add('type',$type);
-            $this->add('total',$total);
-            $this->add('cur',$cur);
-            $this->add('key', $key);
-            $this->add('target_module', $target_module);
-
-            // 모두 입력시 성공 메세지 출력하고 cache 파일제거
-            if($total <= $cur) {
-                $this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
-                FileHandler::removeFilesInDir('./files/cache/importer/'.$key);
-            } else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
-        }
-
-        /**
-         * @brief 회원 정보 입력
-         **/
-        function importMember($key, $cur, $index_file) {
-            if(!$cur) $cur = 0;
-
-            // xmlParser객체 생성
-            $oXmlParser = new XmlParser();
-
-            // 회원 입력을 위한 기본 객체들 생성
-            $this->oMemberController = &getController('member');
-            $this->oMemberModel = &getModel('member');
-
-            // 기본 회원 그룹을 구함
-            $default_group = $this->oMemberModel->getDefaultGroup();
-            $default_group_srl = $default_group->group_srl;
-
-            // index파일을 염
-            $f = fopen($index_file,"r");
-
-            // 이미 읽혀진 것은 패스
-            for($i=0;$i<$cur;$i++) fgets($f, 1024);
-
-            // 라인단위로 읽어들이면서 $cur보다 커지고 $cur+$this->unit_count개보다 작으면 중지
-            for($idx=$cur;$idx<$cur+$this->unit_count;$idx++) {
-                if(feof($f)) break;
-
-                // 정해진 위치를 찾음
-                $target_file = trim(fgets($f, 1024));
-
-                // 대상 파일을 읽여서 파싱후 입력
-                $xmlObj = $oXmlParser->loadXmlFile($target_file);
-                FileHandler::removeFile($target_file);
-                if(!$xmlObj) continue;
-
-                // 객체 정리
-                $obj = null;
-                $obj->user_id = base64_decode($xmlObj->member->user_id->body);
-                $obj->password = base64_decode($xmlObj->member->password->body);
-                $obj->user_name = base64_decode($xmlObj->member->user_name->body);
-                $obj->nick_name = base64_decode($xmlObj->member->nick_name->body);
-                if(!$obj->user_name) $obj->user_name = $obj->nick_name;
-                $obj->email = base64_decode($xmlObj->member->email->body);
-                $obj->homepage = base64_decode($xmlObj->member->homepage->body);
-                $obj->blog = base64_decode($xmlObj->member->blog->body);
-                $obj->birthday = substr(base64_decode($xmlObj->member->birthday->body),0,8);
-                $obj->allow_mailing = base64_decode($xmlObj->member->allow_mailing->body);
-                $obj->point = base64_decode($xmlObj->member->point->body);
-                $obj->image_nickname = base64_decode($xmlObj->member->image_nickname->buff->body);
-                $obj->image_mark = base64_decode($xmlObj->member->image_mark->buff->body);
-                $obj->profile_image = base64_decode($xmlObj->member->profile_image->buff->body);
-                $obj->signature = base64_decode($xmlObj->member->signature->body);
-                $obj->regdate = base64_decode($xmlObj->member->regdate->body);
-                $obj->last_login = base64_decode($xmlObj->member->last_login->body);
-
-                if($xmlObj->member->extra_vars) {
-                    foreach($xmlObj->member->extra_vars as $key => $val) {
-                        if(in_array($key, array('node_name','attrs','body'))) continue;
-                        $obj->extra_vars->{$key} = base64_decode($val->body);
-                    }
-                }
-
-                // homepage, blog의 url을 정확히 만듬
-                if($obj->homepage && !preg_match("/^http:\/\//i",$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
-                if($obj->blog && !preg_match("/^http:\/\//i",$obj->blog)) $obj->blog = 'http://'.$obj->blog;
-
-                // email address 필드 정리
-                $obj->email_address = $obj->email;
-                list($obj->email_id, $obj->email_host) = explode('@', $obj->email);
-
-                // 메일링 허용 체크
-                if($obj->allow_mailing!='Y') $obj->allow_mailing = 'N';
-
-                // 쪽지 수신 체크
-                $obj->allow_message = 'Y';
-                if(!in_array($obj->allow_message, array('Y','N','F'))) $obj->allow_message= 'Y';
-
-                // 최종 로그인 시간이 없으면 가입일을 입력
-                if(!$obj->last_login) $obj->last_login = $obj->regdate;
-
-                // 회원 번호를 구함
-                $obj->member_srl = getNextSequence();
-
-                // 확장변수의 정리
-                $extra_vars = $obj->extra_vars;
-                unset($obj->extra_vars);
-                $obj->extra_vars = serialize($extra_vars);
-
-                // 중복되는 nick_name 데이터가 있는지 체크
-                $nick_args = null;
-                $nick_args->nick_name = $obj->nick_name;
-                $nick_output = executeQuery('member.getMemberSrl', $nick_args);
-                if(!$nick_output->toBool()) $obj->nick_name .= '_'.$obj->member_srl;
-
-                // 회원 추가
-                $output = executeQuery('member.insertMember', $obj);
-
-                // 입력 성공시 그룹 가입/ 이미지이름-마크-서명등을 추가
-                if($output->toBool()) {
-
-                    // 기본 그룹 가입 시킴 
-                    $obj->group_srl = $default_group_srl;
-                    executeQuery('member.addMemberToGroup',$obj);
-
-                    // 이미지네임
-                    if($obj->image_nickname) {
-                        $target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($obj->member_srl));
-                        $target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
-                        FileHandler::writeFile($target_filename, $obj->image_nickname);
-                    }
-
-                    // 이미지마크
-                    if($obj->image_mark && file_exists($obj->image_mark)) {
-                        $target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($obj->member_srl));
-                        $target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
-                        FileHandler::writeFile($target_filename, $obj->image_mark);
-                    }
-
-                    // 프로필 이미지
-                    if($obj->profile_image) {
-                        $target_path = sprintf('files/member_extra_info/profile_image/%s/', getNumberingPath($obj->member_srl));
-                        $target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
-                        FileHandler::writeFile($target_filename, $obj->profile_image);
-                    }
-
-                    // 서명
-                    if($obj->signature) {
-                        $signature = removeHackTag($obj->signature);
-                        $signature_buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature);
-
-                        $target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($obj->member_srl));
-                        if(!is_dir($target_path)) FileHandler::makeDir($target_path);
-                        $target_filename = sprintf('%s%d.signature.php', $target_path, $obj->member_srl);
-
-                        FileHandler::writeFile($target_filename, $signature_buff);
-                    }
-                }
-            }
-
-            fclose($f);
-
-            return $idx-1;
-        }
-
-        /**
-         * @brief 주어진 xml 파일을 파싱해서 쪽지 정보 입력
-         **/
-        function importMessage($key, $cur, $index_file) {
-            if(!$cur) $cur = 0;
-
-            // xmlParser객체 생성
-            $oXmlParser = new XmlParser();
-
-            // index파일을 염
-            $f = fopen($index_file,"r");
-
-            // 이미 읽혀진 것은 패스
-            for($i=0;$i<$cur;$i++) fgets($f, 1024);
-
-            // 라인단위로 읽어들이면서 $cur보다 커지고 $cur+$this->unit_count개보다 작으면 중지
-            for($idx=$cur;$idx<$cur+$this->unit_count;$idx++) {
-                if(feof($f)) break;
-
-                // 정해진 위치를 찾음
-                $target_file = trim(fgets($f, 1024));
-
-                // 대상 파일을 읽여서 파싱후 입력
-                $xmlObj = $oXmlParser->loadXmlFile($target_file);
-                FileHandler::removeFile($target_file);
-                if(!$xmlObj) continue;
-
-                // 객체 정리
-                $obj = null;
-                $obj->receiver = base64_decode($xmlObj->message->receiver->body);
-                $obj->sender = base64_decode($xmlObj->message->sender->body);
-                $obj->title = base64_decode($xmlObj->message->title->body);
-                $obj->content = base64_decode($xmlObj->message->content->body);
-                $obj->readed = base64_decode($xmlObj->message->readed->body)=='Y'?'Y':'N';
-                $obj->regdate = base64_decode($xmlObj->message->regdate->body);
-                $obj->readed_date = base64_decode($xmlObj->message->readed_date->body);
-                $obj->receiver = base64_decode($xmlObj->message->receiver->body);
-
-                // 보낸이/ 받는이의 member_srl을 구함 (존재하지 않으면 그냥 pass..)
-                if(!$obj->sender) continue;
-                $sender_args->user_id = $obj->sender;
-                $sender_output = executeQuery('member.getMemberInfo',$sender_args);
-                $sender_srl = $sender_output->data->member_srl;
-                if(!$sender_srl) continue;
-
-                $receiver_args->user_id = $obj->receiver;
-                if(!$obj->receiver) continue;
-                $receiver_output = executeQuery('member.getMemberInfo',$receiver_args);
-                $receiver_srl = $receiver_output->data->member_srl;
-                if(!$receiver_srl) continue;
-
-                // 보내는 사용자의 쪽지함에 넣을 쪽지
-                $sender_args->sender_srl = $sender_srl;
-                $sender_args->receiver_srl = $receiver_srl;
-                $sender_args->message_type = 'S';
-                $sender_args->title = $obj->title;
-                $sender_args->content = $obj->content;
-                $sender_args->readed = $obj->readed;
-                $sender_args->regdate = $obj->regdate;
-                $sender_args->readed_date = $obj->readed_date;
-                $sender_args->related_srl = getNextSequence();
-                $sender_args->message_srl = getNextSequence();
-                $sender_args->list_order = $sender_args->message_srl * -1;
-
-                $output = executeQuery('communication.sendMessage', $sender_args);
-                if($output->toBool()) {
-                    // 받는 회원의 쪽지함에 넣을 쪽지
-                    $receiver_args->message_srl = $sender_args->related_srl;
-                    $receiver_args->list_order = $sender_args->related_srl*-1;
-                    $receiver_args->sender_srl = $sender_srl;
-                    if(!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
-                    $receiver_args->receiver_srl = $receiver_srl;
-                    $receiver_args->message_type = 'R';
-                    $receiver_args->title = $obj->title;
-                    $receiver_args->content = $obj->content;
-                    $receiver_args->readed = $obj->readed;
-                    $receiver_args->regdate = $obj->regdate;
-                    $receiver_args->readed_date = $obj->readed_date;
-                    $output = executeQuery('communication.sendMessage', $receiver_args);
-                }
-            }
-
-            fclose($f);
-
-            return $idx-1;
-        }
-
-        /**
-         * @brief module.xml 형식의 데이터 import
-         **/
-        function importModule($key, $cur, $index_file, $module_srl) {
-            // 필요한 객체 미리 생성
-            $this->oXmlParser = new XmlParser();
-
-            // 타겟 모듈의 카테고리 정보 구함
-            $oDocumentController = &getController('document');
-            $oDocumentModel = &getModel('document');
-            $category_list = $category_titles = array();
-            $category_list = $oDocumentModel->getCategoryList($module_srl);
-            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
-
-            // 먼저 카테고리 정보를 입력함
-            $category_file = preg_replace('/index$/i', 'category.xml', $index_file);
-            if(file_exists($category_file)) {
-                $buff = FileHandler::readFile($category_file);
-               
-                // xmlParser객체 생성
-                $xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
-
-                $categories = $xmlDoc->items->category;
-                if($categories) {
-                    if(!is_array($categories)) $categories = array($categories);
-                    $match_sequence = array();
-                    foreach($categories as $k => $v) {
-                        $category = trim(base64_decode($v->body));
-                        if(!$category || $category_titles[$category]) continue;
-
-                        $sequence = $v->attrs->sequence;
-                        $parent = $v->attrs->parent;
-
-                        $obj = null;
-                        $obj->title = $category;
-                        $obj->module_srl = $module_srl; 
-                        if($parent) $obj->parent_srl = $match_sequence[$parent];
-
-                        $output = $oDocumentController->insertCategory($obj);
-                        if($output->toBool()) $match_sequence[$sequence] = $output->get('category_srl');
-                    }
-                    $oDocumentController = &getController('document');
-                    $oDocumentController->makeCategoryFile($module_srl);
-                }
-                FileHandler::removeFile($category_file);
-            }
-
-            $category_list = $category_titles = array();
-            $category_list = $oDocumentModel->getCategoryList($module_srl);
-            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
-
-            $ek_args->module_srl = $module_srl;
-            $output = executeQueryArray('document.getDocumentExtraKeys', $ek_args);
-            if($output->data) {
-                foreach($output->data as $key => $val) $extra_keys[$val->eid] = true;
-            }
-           
-            if(!$cur) $cur = 0;
-
-            // index파일을 염
-            $f = fopen($index_file,"r");
-
-            // 이미 읽혀진 것은 패스
-            for($i=0;$i<$cur;$i++) fgets($f, 1024);
-
-            // 라인단위로 읽어들이면서 $cur보다 커지고 $cur+$this->unit_count개보다 작으면 중지
-            for($idx=$cur;$idx<$cur+$this->unit_count;$idx++) {
-                if(feof($f)) break;
-
-                // 정해진 위치를 찾음
-                $target_file = trim(fgets($f, 1024));
-
-                if(!file_exists($target_file)) continue;
-
-                // 이제부터 데이터를 가져오면서 처리
-                $fp = fopen($target_file,"r");
-                if(!$fp) continue;
-
-                $obj = null;
-                $obj->module_srl = $module_srl;
-                $obj->document_srl = getNextSequence();
-
-                $files = array();
-                $extra_vars = array();
-
-                $started = false;
-                $buff = null;
-
-                // 본문 데이터부터 처리 시작
-                while(!feof($fp)) {
-                    $str = fgets($fp, 1024);
-
-                    // 한 아이템 준비 시작
-                    if(trim($str) == '<post>') {
-                        $started = true;
-
-                    // 엮인글 입력
-                    } else if(substr($str,0,11) == '<trackbacks') {
-                        $obj->trackback_count = $this->importTrackbacks($fp, $module_srl, $obj->document_srl);
-                        continue;
-
-                    // 댓글 입력
-                    } else if(substr($str,0,9) == '<comments') {
-                        $obj->comment_count = $this->importComments($fp, $module_srl, $obj->document_srl);
-                        continue;
-
-                    // 첨부파일 입력
-                    } else if(substr($str,0,9) == '<attaches') {
-                        $obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->document_srl, $files);
-                        continue;
-
-                    // 추가 변수 시작 일 경우 
-                    } elseif(trim($str) == '<extra_vars>') {
-                        $extra_vars = $this->importExtraVars($fp);
-                        continue;
-                    }
-
-                    if($started) $buff .= $str;
-                }
-
-                $xmlDoc = $this->oXmlParser->parse($buff);
-                
-                $category = base64_decode($xmlDoc->post->category->body);
-                if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
-
-                $obj->member_srl = 0;
-
-                $obj->is_notice = base64_decode($xmlDoc->post->is_notice->body)=='Y'?'Y':'N';
-                $obj->is_secret = base64_decode($xmlDoc->post->is_secret->body)=='Y'?'Y':'N';
-                $obj->title = base64_decode($xmlDoc->post->title->body);
-                $obj->content = base64_decode($xmlDoc->post->content->body);
-                $obj->readed_count = base64_decode($xmlDoc->post->readed_count->body);
-                $obj->voted_count = base64_decode($xmlDoc->post->voted_count->body);
-                $obj->blamed_count = base64_decode($xmlDoc->post->blamed_count->body);
-                $obj->password = base64_decode($xmlDoc->post->password->body);
-                $obj->user_name = base64_decode($xmlDoc->post->user_name->body);
-                $obj->nick_name = base64_decode($xmlDoc->post->nick_name->body);
-				if(!$obj->user_name) $obj->user_name = $obj->nick_name;
-                $obj->user_id = base64_decode($xmlDoc->post->user_id->body);
-                $obj->email_address = base64_decode($xmlDoc->post->email->body);
-                $obj->homepage = base64_decode($xmlDoc->post->homepage->body);
-                if($obj->homepage && !preg_match('/^http:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
-                $obj->tags = base64_decode($xmlDoc->post->tags->body);
-                $obj->regdate = base64_decode($xmlDoc->post->regdate->body);
-                $obj->last_update = base64_decode($xmlDoc->post->update->body);
-                if(!$obj->last_update) $obj->last_update = $obj->regdate;
-                $obj->ipaddress = base64_decode($xmlDoc->post->ipaddress->body);
-                $obj->list_order = $obj->update_order = $obj->document_srl*-1;
-                $obj->allow_comment = base64_decode($xmlDoc->post->allow_comment->body)!='N'?'Y':'N';
-                $obj->lock_comment = base64_decode($xmlDoc->post->lock_comment->body)=='Y'?'Y':'N';
-                $obj->allow_trackback = base64_decode($xmlDoc->post->allow_trackback->body)!='N'?'Y':'N';
-                $obj->notify_message = base64_decode($xmlDoc->post->is_notice->body);
-
-                // content 정보 변경 (첨부파일)
-                if(count($files)) {
-                    foreach($files as $key => $val) {
-                        $obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val.'"',$obj->content);
-                        $obj->content = preg_replace('/(["\']?).\/files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i','"'.$val.'"',$obj->content);
-                        $obj->content = preg_replace('/(["\']?)files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i','"'.$val.'"',$obj->content);
-                    }
-                }
-
-                $output = executeQuery('document.insertDocument', $obj);
-
-                if($output->toBool() && $obj->tags) {
-                    $tag_list = explode(',',$obj->tags);
-                    $tag_count = count($tag_list);
-                    for($i=0;$i<$tag_count;$i++) {
-                        $args = null;
-                        $args->tag_srl = getNextSequence();
-                        $args->module_srl = $module_srl;
-                        $args->document_srl = $obj->document_srl;
-                        $args->tag = trim($tag_list[$i]);
-                        $args->regdate = $obj->regdate;
-                        if(!$args->tag) continue;
-                        $output = executeQuery('tag.insertTag', $args);
-                    }
-                    
-                }
-
-                // 확장변수 추가
-                if(count($extra_vars)) {
-                    foreach($extra_vars as $key => $val) {
-                        if(!$val->value) continue;
-                        unset($e_args);
-                        $e_args->module_srl = $module_srl;
-                        $e_args->document_srl = $obj->document_srl;
-                        $e_args->var_idx = $val->var_idx;
-                        $e_args->value = $val->value;
-                        $e_args->lang_code = $val->lang_code;
-                        $e_args->eid = $val->eid;
-
-                        // 등록된 확장변수 키가 없으면 생성(제목/내용 언어별 변수는 제외)
-                        if(!preg_match('/^(title|content)_(.+)$/i',$e_args->eid) && !$extra_keys[$e_args->eid]) {
-                            unset($ek_args);
-                            $ek_args->module_srl = $module_srl;
-                            $ek_args->var_idx = $val->var_idx;
-                            $ek_args->var_name = $val->eid;
-                            $ek_args->var_type = 'text';
-                            $ek_args->var_is_required = 'N';
-                            $ek_args->var_default = '';
-                            $ek_args->eid = $val->eid;
-                            $output = executeQuery('document.insertDocumentExtraKey', $ek_args);
-                            $extra_keys[$ek_args->eid] = true;
-                        }
-
-                        $output = executeQuery('document.insertDocumentExtraVar', $e_args);
-                    }
-                }
-
-                fclose($fp);
-                FileHandler::removeFile($target_file);
-            }
-
-            fclose($f);
-
-            // 카테고리별 개수 동기화
-            if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
-
-            return $idx-1;
-        }
-
-        /**
-         * @brief 엮인글 정리
-         **/
-        function importTrackbacks($fp, $module_srl, $document_srl) {
-            $started = false;
-            $buff = null;
-            $cnt = 0;
-            while(!feof($fp)) {
-
-                $str = fgets($fp, 1024);
-
-                // </trackbacks>이면 중단
-                if(trim($str) == '</trackbacks>') break;
-
-                // <trackback>면 시작
-                if(trim($str) == '<trackback>') $started = true;
-
-                if($started) $buff .= $str;
-
-                // </trackback>이면 DB에 입력
-                if(trim($str) == '</trackback>') {
-                    $xmlDoc = $this->oXmlParser->parse($buff);
-
-                    $obj = null;
-                    $obj->trackback_srl = getNextSequence();
-                    $obj->module_srl = $module_srl;
-                    $obj->document_srl = $document_srl;
-                    $obj->url = base64_decode($xmlDoc->trackback->url->body);
-                    $obj->title = base64_decode($xmlDoc->trackback->title->body);
-                    $obj->blog_name = base64_decode($xmlDoc->trackback->blog_name->body);
-                    $obj->excerpt = base64_decode($xmlDoc->trackback->excerpt->body);
-                    $obj->regdate = base64_decode($xmlDoc->trackback->regdate->body);
-                    $obj->ipaddress = base64_decode($xmlDoc->trackback->ipaddress->body);
-                    $obj->list_order = -1*$obj->trackback_srl;
-                    $output = executeQuery('trackback.insertTrackback', $obj);
-                    if($output->toBool()) $cnt++;
-
-                    $buff = null;
-                    $started = false;
-                }
-            }
-            return $cnt;
-        }
-
-        /**
-         * @brief 댓글 정리
-         **/
-        function importComments($fp, $module_srl, $document_srl) {
-            $started = false;
-            $buff = null;
-            $cnt = 0;
-
-            $sequences = array();
-
-            while(!feof($fp)) {
-
-                $str = fgets($fp, 1024);
-
-                // </comments>이면 중단
-                if(trim($str) == '</comments>') break;
-
-                // <comment>면 시작
-                if(trim($str) == '<comment>') {
-                    $started = true;
-                    $obj = null;
-                    $obj->comment_srl = getNextSequence();
-                    $files = array();
-                }
-
-                // attaches로 시작하면 첨부파일 시작
-                if(substr($str,0,9) == '<attaches') {
-                    $obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->comment_srl, $files);
-                    continue;
-                }
-
-                if($started) $buff .= $str;
-
-                // </comment>이면 DB에 입력
-                if(trim($str) == '</comment>') {
-                    $xmlDoc = $this->oXmlParser->parse($buff);
-
-                    $sequence = base64_decode($xmlDoc->comment->sequence->body);
-                    $sequences[$sequence] = $obj->comment_srl;
-                    $parent = base64_decode($xmlDoc->comment->parent->body);
-
-                    $obj->module_srl = $module_srl;
-
-                    if($parent) $obj->parent_srl = $sequences[$parent];
-                    else $obj->parent_srl = 0;
-
-                    $obj->document_srl = $document_srl;
-                    $obj->is_secret = base64_decode($xmlDoc->comment->is_secret->body)=='Y'?'Y':'N';
-                    $obj->notify_message = base64_decode($xmlDoc->comment->notify_message->body)=='Y'?'Y':'N';
-                    $obj->content = base64_decode($xmlDoc->comment->content->body);
-                    $obj->voted_count = base64_decode($xmlDoc->comment->voted_count->body);
-                    $obj->blamed_count = base64_decode($xmlDoc->comment->blamed_count->body);
-                    $obj->password = base64_decode($xmlDoc->comment->password->body);
-                    $obj->user_name =base64_decode($xmlDoc->comment->user_name->body);
-                    $obj->nick_name = base64_decode($xmlDoc->comment->nick_name->body);
-                    if(!$obj->user_name) $obj->user_name = $obj->nick_name;
-                    $obj->user_id = base64_decode($xmlDoc->comment->user_id->body);
-                    $obj->member_srl = 0;
-                    $obj->email_address = base64_decode($xmlDoc->comment->email->body);
-                    $obj->homepage = base64_decode($xmlDoc->comment->homepage->body);
-                    $obj->regdate = base64_decode($xmlDoc->comment->regdate->body);
-                    $obj->last_update = base64_decode($xmlDoc->comment->update->body);
-                    if(!$obj->last_update) $obj->last_update = $obj->regdate;
-                    $obj->ipaddress = base64_decode($xmlDoc->comment->ipaddress->body);
-                    $obj->list_order = $obj->comment_srl*-1;
-
-                    // content 정보 변경 (첨부파일)
-                    if(count($files)) {
-                        foreach($files as $key => $val) {
-                            $obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val.'"',$obj->content);
-                        }
-                    }
-
-                    // 댓글 목록 부분을 먼저 입력
-                    $list_args = null;
-                    $list_args->comment_srl = $obj->comment_srl;
-                    $list_args->document_srl = $obj->document_srl;
-                    $list_args->module_srl = $obj->module_srl;
-                    $list_args->regdate = $obj->regdate;
-
-                    // 부모댓글이 없으면 바로 데이터를 설정
-                    if(!$obj->parent_srl) {
-                        $list_args->head = $list_args->arrange = $obj->comment_srl;
-                        $list_args->depth = 0;
-
-                    // 부모댓글이 있으면 부모글의 정보를 구해옴
-                    } else {
-                        // 부모댓글의 정보를 구함
-                        $parent_args->comment_srl = $obj->parent_srl;
-                        $parent_output = executeQuery('comment.getCommentListItem', $parent_args);
-
-                        // 부모댓글이 존재하지 않으면 return
-                        if(!$parent_output->toBool() || !$parent_output->data) continue;
-                        $parent = $parent_output->data;
-
-                        $list_args->head = $parent->head;
-                        $list_args->depth = $parent->depth+1;
-                        if($list_args->depth<2) $list_args->arrange = $obj->comment_srl;
-                        else {
-                            $list_args->arrange = $parent->arrange;
-                            $output = executeQuery('comment.updateCommentListArrange', $list_args);
-                            if(!$output->toBool()) return $output;
-                        }
-                    }
-
-                    $output = executeQuery('comment.insertCommentList', $list_args);
-                    if($output->toBool()) {
-                        $output = executeQuery('comment.insertComment', $obj);
-                        if($output->toBool()) $cnt++;
-                    }
-
-                    $buff = null;
-                    $started = false;
-                }
-            }
-            return $cnt;
-        }
-
-        /**
-         * @brief 첨부파일 정리
-         **/
-        function importAttaches($fp, $module_srl, $upload_target_srl, &$files) {
-            $uploaded_count = 0;
-
-            $started = false;
-            $buff = null;
-
-            while(!feof($fp)) {
-                $str = trim(fgets($fp, 1024));
-
-                // </attaches>로 끝나면 중단
-                if(trim($str) == '</attaches>') break;
-
-                // <attach>로 시작하면 첨부파일 수집
-                if(trim($str) == '<attach>') {
-                    $file_obj  = null;
-                    $file_obj->file_srl = getNextSequence();
-                    $file_obj->upload_target_srl = $upload_target_srl;
-                    $file_obj->module_srl = $module_srl;
-
-                    $started = true;
-                    $buff = null;
-                // <file>로 시작하면 xml파일내의 첨부파일로 처리
-                } else if(trim($str) == '<file>') {
-                    $file_obj->file = $this->saveTemporaryFile($fp);
-                    continue;
-                }
-
-                if($started) $buff .= $str;
-
-                // </attach>로 끝나면 첨부파일 정리
-                if(trim($str) == '</attach>') {
-                    $xmlDoc = $this->oXmlParser->parse($buff.$str);
-
-                    $file_obj->source_filename = base64_decode($xmlDoc->attach->filename->body);
-                    $file_obj->download_count = base64_decode($xmlDoc->attach->download_count->body);
-
-                    if(!$file_obj->file) {
-                        $url = base64_decode($xmlDoc->attach->url->body);
-                        $path = base64_decode($xmlDoc->attach->path->body);
-                        if($path && file_exists($path)) $file_obj->file = $path;
-                        else {
-                            $file_obj->file = $this->getTmpFilename();
-                            FileHandler::getRemoteFile($url, $file_obj->file);
-                        }
-                    }
-
-                    if(file_exists($file_obj->file)) {
-
-                        // 이미지인지 기타 파일인지 체크하여 upload path 지정
-                        if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_obj->source_filename)) {
-                            $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
-                            $filename = $path.$file_obj->source_filename;
-                            $file_obj->direct_download = 'Y';
-                        } else {
-                            $path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
-                            $filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
-                            $file_obj->direct_download = 'N';
-                        }
-
-                        // 디렉토리 생성
-                        if(!FileHandler::makeDir($path)) continue;
-
-                        if(preg_match('/^\.\/files\/cache\/importer/i',$file_obj->file)) FileHandler::rename($file_obj->file, $filename);
-                        else @copy($file_obj->file, $filename);
-
-                        // DB입력
-                        unset($file_obj->file);
-                        if(file_exists($filename)) {
-                            $file_obj->uploaded_filename = $filename;
-                            $file_obj->file_size = filesize($filename);
-                            $file_obj->comment = NULL;
-                            $file_obj->member_srl = 0;
-                            $file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
-                            $file_obj->isvalid = 'Y';
-                            $output = executeQuery('file.insertFile', $file_obj);
-                            
-                            if($output->toBool()) {
-                                $uploaded_count++;
-                                $tmp_obj = null;
-                                $tmp_obj->source_filename = $file_obj->source_filename;
-                                if($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename; 
-                                else $files[$file_obj->source_filename] = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
-                            }
-                        }
-                    }
-                }
-            }
-            return $uploaded_count;
-        }
-
-        /**
-         * @biref 임의로 사용할 파일이름을 return
-         **/
-        function getTmpFilename() {
-            $path = "./files/cache/importer";
-            if(!is_dir($path)) FileHandler::makeDir($path);
-            $filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-            if(file_exists($filename)) $filename .= rand(111,999);
-            return $filename;
-        }
-
-        /**
-         * @brief 특정 파일포인트로부터 key에 해당하는 값이 나타날때까지 buff를 읽음
-         **/
-        function saveTemporaryFile($fp) {
-            $temp_filename = $this->getTmpFilename();
-            $f = fopen($temp_filename, "w");
-
-            $buff = '';
-            while(!feof($fp)) {
-                $str = trim(fgets($fp, 1024));
-                if(trim($str) == '</file>') break;
-
-                $buff .= $str;
-
-                if(substr($buff,-7)=='</buff>') {
-                    fwrite($f, base64_decode(substr($buff, 6, -7)));
-                    $buff = '';
-                }
-            }
-            fclose($f);
-            return $temp_filename;
-        }
-
-
-        /**
-         * @brief 게시글 추가 변수 설정
-         **/
-        function importExtraVars($fp) {
-            $buff = null;
-            while(!feof($fp)) {
-                $buff .= $str = trim(fgets($fp, 1024));
-                if(trim($str) == '</extra_vars>') break;
-            }
-            if(!$buff) return array();
-
-            $buff = '<extra_vars>'.$buff;
-            $oXmlParser = new XmlParser();
-            $xmlDoc = $this->oXmlParser->parse($buff);
-            if(!count($xmlDoc->extra_vars->key)) return array();
-
-            $index = 1;
-            foreach($xmlDoc->extra_vars->key as $k => $v) {
-                unset($vobj);
-                if($v->var_idx) {
-                    $vobj->var_idx = base64_decode($v->var_idx->body);
-                    $vobj->lang_code = base64_decode($v->lang_code->body);
-                    $vobj->value = base64_decode($v->value->body);
-                    $vobj->eid = base64_decode($v->eid->body);
-
-                } else if($v->body) {
-                    $vobj->var_idx = $index;
-                    $vobj->lang_code = Context::getLangType();
-                    $vobj->value = base64_decode($v->body);
-                    $vobj->eid = 'extra_vars'.$index;
-                }
-                $extra_vars["extra_vars".$index] = $vobj;
-                $index++;
-            }
-            return $extra_vars;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  importerAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of importer module
+     **/
+
+    @set_time_limit(0);
+    @require_once('./modules/importer/extract.class.php');
+
+    class importerAdminController extends importer {
+
+        var $unit_count = 300;
+        var $oXmlParser = null;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+		/**
+		 * @brief Check whether the passing filename exists or not. Detect the file type, too.
+		 */
+		function procImporterAdminCheckXmlFile() {
+			global $lang;
+
+			$filename = Context::get('filename');
+			$isExists = 'false';
+
+			if(preg_match('/^http/i', $filename))
+			{
+				if(ini_get('allow_url_fopen'))
+				{
+					$fp = @fopen($filename, "r");
+					if($fp)
+					{
+						$str = fgets($fp, 100);
+						if(strlen($str) > 0)
+						{
+							$isExists = 'true';
+							$type = 'XML';
+							if(stristr($str, 'tattertools')) $type = 'TTXML';
+
+							$this->add('type', $type);
+						}
+						fclose($fp);
+						$resultMessage = $lang->found_xml_file;
+					}
+					else $resultMessage = $lang->cannot_url_file;
+				}
+				else $resultMessage = $lang->cannot_allow_fopen_in_phpini;
+
+				$this->add('exists', $isExists);
+			}
+			else
+			{
+				$realPath = FileHandler::getRealPath($filename);
+
+				if(file_exists($realPath) && is_file($realPath)) $isExists = 'true';
+				$this->add('exists', $isExists);
+
+				if($isExists == 'true')
+				{
+					$type = 'XML';
+
+					$fp = fopen($realPath, "r");
+					$str = fgets($fp, 100);
+					if(stristr($str, 'tattertools')) $type = 'TTXML';
+					fclose($fp);
+
+					$this->add('type', $type);
+					$resultMessage = $lang->found_xml_file;
+				}
+				else $resultMessage = $lang->not_found_xml_file;
+			}
+			$this->add('result_message', $resultMessage);
+		}
+
+        /**
+         * @brief sync member information with document information
+         **/
+        function procImporterAdminSync() {
+			/* DBMS가 CUBRID인 경우 MySQL과 동일한 방법으로는 문서 및 댓글에 대한 사용자 정보를 동기화 할 수 없으므로 예외 처리 합니다.
+			  CUBRID를 사용하지 않는 경우에만 보편적인 기존 질의문을 사용합니다. */
+			$db_info = Context::getDBInfo ();
+			if ($db_info->db_type != "cubrid") {
+				$output = executeQuery('importer.updateDocumentSync');
+				$output = executeQuery('importer.updateCommentSync');
+			}
+			else {
+				$output = executeQueryArray ('importer.getDocumentMemberSrlWithUserID');
+				if (is_array ($output->data) && count ($output->data)) {
+					$success_count = 0;
+					$error_count = 0;
+					$total_count = 0;
+					foreach ($output->data as $val) {
+						$args->user_id = $val->user_id;
+						$args->member_srl = $val->member_srl;
+						$tmp = executeQuery ('importer.updateDocumentSyncForCUBRID', $args);
+						if ($tmp->toBool () === true) {
+							$success_count++;
+						}
+						else {
+							$error_count++;
+						}
+						$total_count++;
+					}
+				} // documents section
+
+				$output = executeQueryArray ('importer.getCommentMemberSrlWithUserID');
+				if (is_array ($output->data) && count ($output->data)) {
+					$success_count = 0;
+					$error_count = 0;
+					$total_count = 0;
+					foreach ($output->data as $val) {
+						$args->user_id = $val->user_id;
+						$args->member_srl = $val->member_srl;
+						$tmp = executeQuery ('importer.updateCommentSyncForCUBRID', $args);
+						if ($tmp->toBool () === true) {
+							$success_count++;
+						}
+						else {
+							$error_count++;
+						}
+						$total_count++;
+					}
+				} // comments section
+			}
+
+            $this->setMessage('msg_sync_completed');
+        }
+
+        /**
+         * @brief Pre-analyze the xml file and cache it
+         **/
+        function procImporterAdminPreProcessing() {
+            // Get the target xml file to import
+            $xml_file = Context::get('xml_file');
+            // Get a type of the target 
+            $type = Context::get('type');
+            // Extract and cache information from the xml file
+            $oExtract = new extract();
+
+            switch($type) {
+                case 'member' :
+                        $output = $oExtract->set($xml_file,'<members ', '</members>', '<member>', '</member>');
+                        if($output->toBool()) $oExtract->saveItems();
+                    break;
+                case 'message' :
+                        $output = $oExtract->set($xml_file,'<messages ', '</messages>', '<message>','</message>');
+                        if($output->toBool()) $oExtract->saveItems();
+                    break;
+                case 'ttxml' :
+                        // Category information
+                        $output = $oExtract->set($xml_file, '', '', '', '');
+                        if ($output->toBool()) {
+                            // Get a category of ttxml separately
+                            $started = false;
+                            $buff = '';
+                            while (!feof($oExtract->fd)) {
+                                $str = fgets($oExtract->fd, 1024);
+                                if(strstr($str, '<category>')) {
+                                     $started = true;
+                                     $str = strstr($str, '<category>');
+                                }
+                                if(substr($str,0,strlen('<post ')) == '<post ') break;
+                                if ($started) $buff .= $str;
+                            }
+                            $buff = '<categories>'.$buff.'</categories>';
+                            $oExtract->closeFile();
+                            $category_filename = sprintf('%s/%s', $oExtract->cache_path, 'category.xml');
+                            FileHandler::writeFile($category_filename, $buff);
+
+                            
+                            // Guestbook information
+                            $output = $oExtract->set($xml_file, '', '', '', '');
+                            if ($output->toBool()) {
+                                $started = false;
+                                $buff = '';
+                                while (!feof($oExtract->fd)) {
+                                    $str = fgets($oExtract->fd, 1024);
+                                    if(strstr($str, '<guestbook>')) {
+                                         $started = true;
+                                         $str = strstr($str, '<guestbook>');
+                                    }
+                                    if ($started) {
+                                        $pos = strpos($str, '</guestbook>');
+                                        if ($pos !== false) {
+                                            $buff .= substr($str, 0, $pos + strlen('</guestbook>'));
+                                            break;
+                                        }
+                                        $buff .= $str;
+                                    }
+                                }
+                                $oExtract->closeFile();
+                                $guestbook_filename = sprintf('%s/%s', $oExtract->cache_path, 'guestbook.xml');
+                                FileHandler::writeFile($guestbook_filename, $buff);
+                                // Individual items
+                                $output = $oExtract->set($xml_file,'<blog', '</blog>', '<post ', '</post>');
+                                if($output->toBool()) $oExtract->saveItems();
+
+                            }
+                        }
+                    break;
+                default :
+                        // First get category information
+                        $output = $oExtract->set($xml_file,'<categories>', '</categories>', '<category','</category>');
+                        if($output->toBool()) {
+                            $oExtract->mergeItems('category.xml');
+                            // Get each item
+                            $output = $oExtract->set($xml_file,'<posts ', '</posts>', '<post>', '</post>');
+                            if($output->toBool()) $oExtract->saveItems();
+                        }
+                    break;
+
+            }
+
+            if(!$output->toBool()) {
+                $this->add('error',0);
+                $this->add('status',-1);
+                $this->setMessage($output->getMessage());
+                return;
+            }
+            // Notify that all data completely extracted
+            $this->add('type',$type);
+            $this->add('total',$oExtract->getTotalCount());
+            $this->add('cur',0);
+            $this->add('key', $oExtract->getKey());
+            $this->add('status',0);
+        }
+
+        /**
+         * @brief Migrate data after completing xml file extraction
+         **/
+        function procImporterAdminImport() {
+            // Variable setting
+            $type = Context::get('type');
+            $total = Context::get('total');
+            $cur = Context::get('cur');
+            $key = Context::get('key');
+            $user_id = Context::get('user_id');
+            $target_module = Context::get('target_module');
+            $guestbook_target_module = Context::get('guestbook_target_module');
+            $this->unit_count = Context::get('unit_count');
+            // Check if an index file exists
+            $index_file = './files/cache/importer/'.$key.'/index';
+            if(!file_exists($index_file)) return new Object(-1, 'msg_invalid_xml_file');
+
+            switch($type) {
+                case 'ttxml' :
+                        if(!$target_module) return new Object(-1,'msg_invalid_request');
+
+						$oModuleModel = &getModel('module');
+						$columnList = array('module_srl', 'module');
+						$target_module_info = $oModuleModel->getModuleInfoByModuleSrl($target_module, $columnList);
+
+                        require_once('./modules/importer/ttimport.class.php');
+                        $oTT = new ttimport();
+                        $cur = $oTT->importModule($key, $cur, $index_file, $this->unit_count, $target_module, $guestbook_target_module, $user_id, $target_module_info->module);
+                    break;
+                case 'message' :
+                        $cur = $this->importMessage($key, $cur, $index_file);
+                    break;
+                case 'member' :
+                        $cur = $this->importMember($key, $cur, $index_file);
+                    break;
+                case 'module' :
+                        // Check if the target module exists
+                        if(!$target_module) return new Object(-1,'msg_invalid_request');
+                        $cur = $this->importModule($key, $cur, $index_file, $target_module);
+                    break;
+            }
+            // Notify that all data completely extracted
+            $this->add('type',$type);
+            $this->add('total',$total);
+            $this->add('cur',$cur);
+            $this->add('key', $key);
+            $this->add('target_module', $target_module);
+            // When completing, success message appears and remove the cache files
+            if($total <= $cur) {
+                $this->setMessage( sprintf(Context::getLang('msg_import_finished'), $cur, $total) );
+                FileHandler::removeDir('./files/cache/importer/'.$key);
+            } else $this->setMessage( sprintf(Context::getLang('msg_importing'), $total, $cur) );
+        }
+
+        /**
+         * @brief Import member information
+         **/
+        function importMember($key, $cur, $index_file) {
+            if(!$cur) $cur = 0;
+            // Create the xmlParser object
+            $oXmlParser = new XmlParser();
+            // Create objects for importing member information 
+            $this->oMemberController = &getController('member');
+            $this->oMemberModel = &getModel('member');
+            // Get a default member group
+            $default_group = $this->oMemberModel->getDefaultGroup();
+            $default_group_srl = $default_group->group_srl;
+            // Open an index file
+            $f = fopen($index_file,"r");
+            // Pass if already read
+            for($i=0;$i<$cur;$i++) fgets($f, 1024);
+            // Read by each line until the condition meets
+            for($idx=$cur;$idx<$cur+$this->unit_count;$idx++) {
+                if(feof($f)) break;
+                // Find a given location
+                $target_file = trim(fgets($f, 1024));
+                // Load and parse the file
+                $xmlObj = $oXmlParser->loadXmlFile($target_file);
+                FileHandler::removeFile($target_file);
+                if(!$xmlObj) continue;
+                // List Objects
+                $obj = null;
+                $obj->user_id = base64_decode($xmlObj->member->user_id->body);
+                $obj->password = base64_decode($xmlObj->member->password->body);
+                $obj->user_name = base64_decode($xmlObj->member->user_name->body);
+                $obj->nick_name = base64_decode($xmlObj->member->nick_name->body);
+                if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+                $obj->email = base64_decode($xmlObj->member->email->body);
+                $obj->homepage = base64_decode($xmlObj->member->homepage->body);
+                $obj->blog = base64_decode($xmlObj->member->blog->body);
+                $obj->birthday = substr(base64_decode($xmlObj->member->birthday->body),0,8);
+                $obj->allow_mailing = base64_decode($xmlObj->member->allow_mailing->body);
+                $obj->point = base64_decode($xmlObj->member->point->body);
+                $obj->image_nickname = base64_decode($xmlObj->member->image_nickname->buff->body);
+                $obj->image_mark = base64_decode($xmlObj->member->image_mark->buff->body);
+                $obj->profile_image = base64_decode($xmlObj->member->profile_image->buff->body);
+                $obj->signature = base64_decode($xmlObj->member->signature->body);
+                $obj->regdate = base64_decode($xmlObj->member->regdate->body);
+                $obj->last_login = base64_decode($xmlObj->member->last_login->body);
+
+                if($xmlObj->member->extra_vars) {
+                    foreach($xmlObj->member->extra_vars as $key => $val) {
+                        if(in_array($key, array('node_name','attrs','body'))) continue;
+                        $obj->extra_vars->{$key} = base64_decode($val->body);
+                    }
+                }
+                // Create url for homepage and blog
+                if($obj->homepage && !preg_match("/^http:\/\//i",$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
+                if($obj->blog && !preg_match("/^http:\/\//i",$obj->blog)) $obj->blog = 'http://'.$obj->blog;
+                // email address column
+                $obj->email_address = $obj->email;
+                list($obj->email_id, $obj->email_host) = explode('@', $obj->email);
+                // Set the mailing option
+                if($obj->allow_mailing!='Y') $obj->allow_mailing = 'N';
+                // Set the message option
+                $obj->allow_message = 'Y';
+                if(!in_array($obj->allow_message, array('Y','N','F'))) $obj->allow_message= 'Y';
+                // Get member-join date if the last login time is not found
+                if(!$obj->last_login) $obj->last_login = $obj->regdate;
+                // Get a member_srl
+                $obj->member_srl = getNextSequence();
+                // List extra vars
+                $extra_vars = $obj->extra_vars;
+                unset($obj->extra_vars);
+                $obj->extra_vars = serialize($extra_vars);
+                // Check if the same nickname is existing
+                $nick_args = null;
+                $nick_args->nick_name = $obj->nick_name;
+                $nick_output = executeQuery('member.getMemberSrl', $nick_args);
+                if(!$nick_output->toBool()) $obj->nick_name .= '_'.$obj->member_srl;
+                // Add a member
+                $output = executeQuery('member.insertMember', $obj);
+                // add group join/image name-mark-signiture and so on if a new member successfully added
+                if($output->toBool()) {
+                    // Join to the default group
+                    $obj->group_srl = $default_group_srl;
+                    executeQuery('member.addMemberToGroup',$obj);
+                    // Image name
+                    if($obj->image_nickname) {
+                        $target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($obj->member_srl));
+                        $target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
+                        FileHandler::writeFile($target_filename, $obj->image_nickname);
+                    }
+                    // Image mark
+                    if($obj->image_mark && file_exists($obj->image_mark)) {
+                        $target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($obj->member_srl));
+                        $target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
+                        FileHandler::writeFile($target_filename, $obj->image_mark);
+                    }
+                    // Profile image
+                    if($obj->profile_image) {
+                        $target_path = sprintf('files/member_extra_info/profile_image/%s/', getNumberingPath($obj->member_srl));
+                        $target_filename = sprintf('%s%d.gif', $target_path, $obj->member_srl);
+                        FileHandler::writeFile($target_filename, $obj->profile_image);
+                    }
+                    // Signiture
+                    if($obj->signature) {
+                        $signature = removeHackTag($obj->signature);
+                        $signature_buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature);
+
+                        $target_path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($obj->member_srl));
+                        if(!is_dir($target_path)) FileHandler::makeDir($target_path);
+                        $target_filename = sprintf('%s%d.signature.php', $target_path, $obj->member_srl);
+
+                        FileHandler::writeFile($target_filename, $signature_buff);
+                    }
+                }
+            }
+
+            fclose($f);
+
+            return $idx-1;
+        }
+
+        /**
+         * @brief Import message information parsed from a given xml file
+         **/
+        function importMessage($key, $cur, $index_file) {
+            if(!$cur) $cur = 0;
+            // Create the xmlParser object
+            $oXmlParser = new XmlParser();
+            // Open an index file
+            $f = fopen($index_file,"r");
+            // Pass if already read
+            for($i=0;$i<$cur;$i++) fgets($f, 1024);
+            // Read each line until the condition meets
+            for($idx=$cur;$idx<$cur+$this->unit_count;$idx++) {
+                if(feof($f)) break;
+                // Find a location
+                $target_file = trim(fgets($f, 1024));
+                // Load and parse the file
+                $xmlObj = $oXmlParser->loadXmlFile($target_file);
+                FileHandler::removeFile($target_file);
+                if(!$xmlObj) continue;
+                // List objects
+                $obj = null;
+                $obj->receiver = base64_decode($xmlObj->message->receiver->body);
+                $obj->sender = base64_decode($xmlObj->message->sender->body);
+                $obj->title = base64_decode($xmlObj->message->title->body);
+                $obj->content = base64_decode($xmlObj->message->content->body);
+                $obj->readed = base64_decode($xmlObj->message->readed->body)=='Y'?'Y':'N';
+                $obj->regdate = base64_decode($xmlObj->message->regdate->body);
+                $obj->readed_date = base64_decode($xmlObj->message->readed_date->body);
+                // Get member_srl of sender/recipient (If not exists, pass)
+                if(!$obj->sender) continue;
+                $sender_args->user_id = $obj->sender;
+                $sender_output = executeQuery('member.getMemberInfo',$sender_args);
+                $sender_srl = $sender_output->data->member_srl;
+                if(!$sender_srl) continue;
+
+                $receiver_args->user_id = $obj->receiver;
+                if(!$obj->receiver) continue;
+                $receiver_output = executeQuery('member.getMemberInfo',$receiver_args);
+                $receiver_srl = $receiver_output->data->member_srl;
+                if(!$receiver_srl) continue;
+                // Message to save into sender's message box
+                $sender_args->sender_srl = $sender_srl;
+                $sender_args->receiver_srl = $receiver_srl;
+                $sender_args->message_type = 'S';
+                $sender_args->title = $obj->title;
+                $sender_args->content = $obj->content;
+                $sender_args->readed = $obj->readed;
+                $sender_args->regdate = $obj->regdate;
+                $sender_args->readed_date = $obj->readed_date;
+                $sender_args->related_srl = getNextSequence();
+                $sender_args->message_srl = getNextSequence();
+                $sender_args->list_order = $sender_args->message_srl * -1;
+
+                $output = executeQuery('communication.sendMessage', $sender_args);
+                if($output->toBool()) {
+                    // Message to save into recipient's massage box
+                    $receiver_args->message_srl = $sender_args->related_srl;
+                    $receiver_args->list_order = $sender_args->related_srl*-1;
+                    $receiver_args->sender_srl = $sender_srl;
+                    if(!$receiver_args->sender_srl) $receiver_args->sender_srl = $receiver_srl;
+                    $receiver_args->receiver_srl = $receiver_srl;
+                    $receiver_args->message_type = 'R';
+                    $receiver_args->title = $obj->title;
+                    $receiver_args->content = $obj->content;
+                    $receiver_args->readed = $obj->readed;
+                    $receiver_args->regdate = $obj->regdate;
+                    $receiver_args->readed_date = $obj->readed_date;
+                    $output = executeQuery('communication.sendMessage', $receiver_args);
+                }
+            }
+
+            fclose($f);
+
+            return $idx-1;
+        }
+
+        /**
+         * @brief Import data in module.xml format
+         **/
+        function importModule($key, $cur, $index_file, $module_srl) {
+            // Pre-create the objects needed
+            $this->oXmlParser = new XmlParser();
+            // Get category information of the target module
+            $oDocumentController = &getController('document');
+            $oDocumentModel = &getModel('document');
+            $category_list = $category_titles = array();
+            $category_list = $oDocumentModel->getCategoryList($module_srl);
+            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+            // Extract category information
+            $category_file = preg_replace('/index$/i', 'category.xml', $index_file);
+            if(file_exists($category_file)) {
+                $buff = FileHandler::readFile($category_file);
+               
+                // Create the xmlParser object
+                $xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
+
+                $categories = $xmlDoc->items->category;
+                if($categories) {
+                    if(!is_array($categories)) $categories = array($categories);
+                    $match_sequence = array();
+                    foreach($categories as $k => $v) {
+                        $category = trim(base64_decode($v->body));
+                        if(!$category || $category_titles[$category]) continue;
+
+                        $sequence = $v->attrs->sequence;
+                        $parent = $v->attrs->parent;
+
+                        $obj = null;
+                        $obj->title = $category;
+                        $obj->module_srl = $module_srl; 
+                        if($parent) $obj->parent_srl = $match_sequence[$parent];
+
+                        $output = $oDocumentController->insertCategory($obj);
+                        if($output->toBool()) $match_sequence[$sequence] = $output->get('category_srl');
+                    }
+                    $oDocumentController = &getController('document');
+                    $oDocumentController->makeCategoryFile($module_srl);
+                }
+                FileHandler::removeFile($category_file);
+            }
+
+            $category_list = $category_titles = array();
+            $category_list = $oDocumentModel->getCategoryList($module_srl);
+            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+
+            $ek_args->module_srl = $module_srl;
+            $output = executeQueryArray('document.getDocumentExtraKeys', $ek_args);
+            if($output->data) {
+                foreach($output->data as $key => $val) $extra_keys[$val->eid] = true;
+            }
+           
+            if(!$cur) $cur = 0;
+            // Open an index file
+            $f = fopen($index_file,"r");
+            // Pass if already read
+            for($i=0;$i<$cur;$i++) fgets($f, 1024);
+            // Read each line until the condition meets
+            for($idx=$cur;$idx<$cur+$this->unit_count;$idx++) {
+                if(feof($f)) break;
+                // Find a location
+                $target_file = trim(fgets($f, 1024));
+
+                if(!file_exists($target_file)) continue;
+                // Importing data from now on
+                $fp = fopen($target_file,"r");
+                if(!$fp) continue;
+
+                $obj = null;
+                $obj->module_srl = $module_srl;
+                $obj->document_srl = getNextSequence();
+
+                $files = array();
+                $extra_vars = array();
+
+                $started = false;
+                $buff = null;
+                // Start from the body data
+                while(!feof($fp)) {
+                    $str = fgets($fp, 1024);
+                    // Prepare an item
+                    if(trim($str) == '<post>') {
+                        $started = true;
+                    // Trackback inserted
+                    } else if(substr($str,0,11) == '<trackbacks') {
+                        $obj->trackback_count = $this->importTrackbacks($fp, $module_srl, $obj->document_srl);
+                        continue;
+                    // Comments inserted
+                    } else if(substr($str,0,9) == '<comments') {
+                        $obj->comment_count = $this->importComments($fp, $module_srl, $obj->document_srl);
+                        continue;
+                    // Attachment inserted
+                    } else if(substr($str,0,9) == '<attaches') {
+                        $obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->document_srl, $files);
+                        continue;
+                    // When starting extra variabls
+                    } elseif(trim($str) == '<extra_vars>') {
+                        $extra_vars = $this->importExtraVars($fp);
+                        continue;
+                    }
+
+                    if($started) $buff .= $str;
+                }
+
+                $xmlDoc = $this->oXmlParser->parse($buff);
+                
+                $category = base64_decode($xmlDoc->post->category->body);
+                if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+
+                $obj->member_srl = 0;
+
+                $obj->is_notice = base64_decode($xmlDoc->post->is_notice->body)=='Y'?'Y':'N';
+                $obj->status = base64_decode($xmlDoc->post->is_secret->body)=='Y'?$oDocumentModel->getConfigStatus('secret'):$oDocumentModel->getConfigStatus('public');
+                $obj->title = base64_decode($xmlDoc->post->title->body);
+                $obj->content = base64_decode($xmlDoc->post->content->body);
+                $obj->readed_count = base64_decode($xmlDoc->post->readed_count->body);
+                $obj->voted_count = base64_decode($xmlDoc->post->voted_count->body);
+                $obj->blamed_count = base64_decode($xmlDoc->post->blamed_count->body);
+                $obj->password = base64_decode($xmlDoc->post->password->body);
+                $obj->user_name = base64_decode($xmlDoc->post->user_name->body);
+                $obj->nick_name = base64_decode($xmlDoc->post->nick_name->body);
+				if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+                $obj->user_id = base64_decode($xmlDoc->post->user_id->body);
+                $obj->email_address = base64_decode($xmlDoc->post->email->body);
+                $obj->homepage = base64_decode($xmlDoc->post->homepage->body);
+                if($obj->homepage && !preg_match('/^http:\/\//i',$obj->homepage)) $obj->homepage = 'http://'.$obj->homepage;
+                $obj->tags = base64_decode($xmlDoc->post->tags->body);
+                $obj->regdate = base64_decode($xmlDoc->post->regdate->body);
+                $obj->last_update = base64_decode($xmlDoc->post->update->body);
+                if(!$obj->last_update) $obj->last_update = $obj->regdate;
+                $obj->ipaddress = base64_decode($xmlDoc->post->ipaddress->body);
+                $obj->list_order = $obj->update_order = $obj->document_srl*-1;
+                $obj->commentStatus = base64_decode($xmlDoc->post->allow_comment->body)!='N'?'ALLOW':'DENY';
+                $obj->allow_trackback = base64_decode($xmlDoc->post->allow_trackback->body)!='N'?'Y':'N';
+                $obj->notify_message = base64_decode($xmlDoc->post->is_notice->body);
+                // Change content information (attachment)
+                if(count($files)) {
+                    foreach($files as $key => $val) {
+                        $obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val.'"',$obj->content);
+                        $obj->content = preg_replace('/(["\']?).\/files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i','"'.$val.'"',$obj->content);
+                        $obj->content = preg_replace('/(["\']?)files\/(.+)\/'.preg_quote($key).'([^"\']+)(["\']?)/i','"'.$val.'"',$obj->content);
+                    }
+                }
+
+                $output = executeQuery('document.insertDocument', $obj);
+
+                if($output->toBool() && $obj->tags) {
+                    $tag_list = explode(',',$obj->tags);
+                    $tag_count = count($tag_list);
+                    for($i=0;$i<$tag_count;$i++) {
+                        $args = null;
+                        $args->tag_srl = getNextSequence();
+                        $args->module_srl = $module_srl;
+                        $args->document_srl = $obj->document_srl;
+                        $args->tag = trim($tag_list[$i]);
+                        $args->regdate = $obj->regdate;
+                        if(!$args->tag) continue;
+                        $output = executeQuery('tag.insertTag', $args);
+                    }
+                    
+                }
+                // Add extra variables
+                if(count($extra_vars)) {
+                    foreach($extra_vars as $key => $val) {
+                        if(!$val->value) continue;
+                        unset($e_args);
+                        $e_args->module_srl = $module_srl;
+                        $e_args->document_srl = $obj->document_srl;
+                        $e_args->var_idx = $val->var_idx;
+                        $e_args->value = $val->value;
+                        $e_args->lang_code = $val->lang_code;
+                        $e_args->eid = $val->eid;
+                        // Create a key for extra vars if not exists (except vars for title and content)
+                        if(!preg_match('/^(title|content)_(.+)$/i',$e_args->eid) && !$extra_keys[$e_args->eid]) {
+                            unset($ek_args);
+                            $ek_args->module_srl = $module_srl;
+                            $ek_args->var_idx = $val->var_idx;
+                            $ek_args->var_name = $val->eid;
+                            $ek_args->var_type = 'text';
+                            $ek_args->var_is_required = 'N';
+                            $ek_args->var_default = '';
+                            $ek_args->eid = $val->eid;
+                            $output = executeQuery('document.insertDocumentExtraKey', $ek_args);
+                            $extra_keys[$ek_args->eid] = true;
+                        }
+
+                        $output = executeQuery('document.insertDocumentExtraVar', $e_args);
+                    }
+                }
+
+                fclose($fp);
+                FileHandler::removeFile($target_file);
+            }
+
+            fclose($f);
+            // Sync category counts
+            if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+
+            return $idx-1;
+        }
+
+        /**
+         * @brief Trackbacks
+         **/
+        function importTrackbacks($fp, $module_srl, $document_srl) {
+            $started = false;
+            $buff = null;
+            $cnt = 0;
+            while(!feof($fp)) {
+
+                $str = fgets($fp, 1024);
+                // If </trackbacks> is, break
+                if(trim($str) == '</trackbacks>') break;
+                // If <trackback>, start importing
+                if(trim($str) == '<trackback>') $started = true;
+
+                if($started) $buff .= $str;
+                // If </trackback>, insert to the DB
+                if(trim($str) == '</trackback>') {
+                    $xmlDoc = $this->oXmlParser->parse($buff);
+
+                    $obj = null;
+                    $obj->trackback_srl = getNextSequence();
+                    $obj->module_srl = $module_srl;
+                    $obj->document_srl = $document_srl;
+                    $obj->url = base64_decode($xmlDoc->trackback->url->body);
+                    $obj->title = base64_decode($xmlDoc->trackback->title->body);
+                    $obj->blog_name = base64_decode($xmlDoc->trackback->blog_name->body);
+                    $obj->excerpt = base64_decode($xmlDoc->trackback->excerpt->body);
+                    $obj->regdate = base64_decode($xmlDoc->trackback->regdate->body);
+                    $obj->ipaddress = base64_decode($xmlDoc->trackback->ipaddress->body);
+                    $obj->list_order = -1*$obj->trackback_srl;
+                    $output = executeQuery('trackback.insertTrackback', $obj);
+                    if($output->toBool()) $cnt++;
+
+                    $buff = null;
+                    $started = false;
+                }
+            }
+            return $cnt;
+        }
+
+        /**
+         * @brief Comments
+         **/
+        function importComments($fp, $module_srl, $document_srl) {
+            $started = false;
+            $buff = null;
+            $cnt = 0;
+
+            $sequences = array();
+
+            while(!feof($fp)) {
+
+                $str = fgets($fp, 1024);
+                // If </comments> is, break
+                if(trim($str) == '</comments>') break;
+                // If <comment> is, start importing
+                if(trim($str) == '<comment>') {
+                    $started = true;
+                    $obj = null;
+                    $obj->comment_srl = getNextSequence();
+                    $files = array();
+                }
+                // If <attaches is, start importing attachments
+                if(substr($str,0,9) == '<attaches') {
+                    $obj->uploaded_count = $this->importAttaches($fp, $module_srl, $obj->comment_srl, $files);
+                    continue;
+                }
+
+                if($started) $buff .= $str;
+                // If </comment> is, insert to the DB
+                if(trim($str) == '</comment>') {
+                    $xmlDoc = $this->oXmlParser->parse($buff);
+
+                    $sequence = base64_decode($xmlDoc->comment->sequence->body);
+                    $sequences[$sequence] = $obj->comment_srl;
+                    $parent = base64_decode($xmlDoc->comment->parent->body);
+
+                    $obj->module_srl = $module_srl;
+
+                    if($parent) $obj->parent_srl = $sequences[$parent];
+                    else $obj->parent_srl = 0;
+
+                    $obj->document_srl = $document_srl;
+                    $obj->is_secret = base64_decode($xmlDoc->comment->is_secret->body)=='Y'?'Y':'N';
+                    $obj->notify_message = base64_decode($xmlDoc->comment->notify_message->body)=='Y'?'Y':'N';
+                    $obj->content = base64_decode($xmlDoc->comment->content->body);
+                    $obj->voted_count = base64_decode($xmlDoc->comment->voted_count->body);
+                    $obj->blamed_count = base64_decode($xmlDoc->comment->blamed_count->body);
+                    $obj->password = base64_decode($xmlDoc->comment->password->body);
+                    $obj->user_name =base64_decode($xmlDoc->comment->user_name->body);
+                    $obj->nick_name = base64_decode($xmlDoc->comment->nick_name->body);
+                    if(!$obj->user_name) $obj->user_name = $obj->nick_name;
+                    $obj->user_id = base64_decode($xmlDoc->comment->user_id->body);
+                    $obj->member_srl = 0;
+                    $obj->email_address = base64_decode($xmlDoc->comment->email->body);
+                    $obj->homepage = base64_decode($xmlDoc->comment->homepage->body);
+                    $obj->regdate = base64_decode($xmlDoc->comment->regdate->body);
+                    $obj->last_update = base64_decode($xmlDoc->comment->update->body);
+                    if(!$obj->last_update) $obj->last_update = $obj->regdate;
+                    $obj->ipaddress = base64_decode($xmlDoc->comment->ipaddress->body);
+                    $obj->list_order = $obj->comment_srl*-1;
+                    // Change content information (attachment)
+                    if(count($files)) {
+                        foreach($files as $key => $val) {
+                            $obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val.'"',$obj->content);
+                        }
+                    }
+                    // Comment list first
+                    $list_args = null;
+                    $list_args->comment_srl = $obj->comment_srl;
+                    $list_args->document_srl = $obj->document_srl;
+                    $list_args->module_srl = $obj->module_srl;
+                    $list_args->regdate = $obj->regdate;
+                    // Set data directly if parent comment doesn't exist
+                    if(!$obj->parent_srl) {
+                        $list_args->head = $list_args->arrange = $obj->comment_srl;
+                        $list_args->depth = 0;
+                    // Get parent_srl if parent comment exists
+                    } else {
+                        // Get parent comment infomation
+                        $parent_args->comment_srl = $obj->parent_srl;
+                        $parent_output = executeQuery('comment.getCommentListItem', $parent_args);
+                        // Return if parent comment doesn't exist
+                        if(!$parent_output->toBool() || !$parent_output->data) continue;
+                        $parent = $parent_output->data;
+
+                        $list_args->head = $parent->head;
+                        $list_args->depth = $parent->depth+1;
+                        if($list_args->depth<2) $list_args->arrange = $obj->comment_srl;
+                        else {
+                            $list_args->arrange = $parent->arrange;
+                            $output = executeQuery('comment.updateCommentListArrange', $list_args);
+                            if(!$output->toBool()) return $output;
+                        }
+                    }
+
+                    $output = executeQuery('comment.insertCommentList', $list_args);
+                    if($output->toBool()) {
+                        $output = executeQuery('comment.insertComment', $obj);
+                        if($output->toBool()) $cnt++;
+                    }
+
+                    $buff = null;
+                    $started = false;
+                }
+            }
+            return $cnt;
+        }
+
+        /**
+         * @brief Import attachment
+         **/
+        function importAttaches($fp, $module_srl, $upload_target_srl, &$files) {
+            $uploaded_count = 0;
+
+            $started = false;
+            $buff = null;
+
+            while(!feof($fp)) {
+                $str = trim(fgets($fp, 1024));
+                // If it ends with </attaches>, break
+                if(trim($str) == '</attaches>') break;
+                // If it starts with <attach>, collect attachments
+                if(trim($str) == '<attach>') {
+                    $file_obj  = null;
+                    $file_obj->file_srl = getNextSequence();
+                    $file_obj->upload_target_srl = $upload_target_srl;
+                    $file_obj->module_srl = $module_srl;
+
+                    $started = true;
+                    $buff = null;
+                // If it starts with <file>, handle the attachement in xml file
+                } else if(trim($str) == '<file>') {
+                    $file_obj->file = $this->saveTemporaryFile($fp);
+                    continue;
+                }
+
+                if($started) $buff .= $str;
+                // If it ends with </attach>, handle attachements 
+                if(trim($str) == '</attach>') {
+                    $xmlDoc = $this->oXmlParser->parse($buff.$str);
+
+                    $file_obj->source_filename = base64_decode($xmlDoc->attach->filename->body);
+                    $file_obj->download_count = base64_decode($xmlDoc->attach->download_count->body);
+
+                    if(!$file_obj->file) {
+                        $url = base64_decode($xmlDoc->attach->url->body);
+                        $path = base64_decode($xmlDoc->attach->path->body);
+                        if($path && file_exists($path)) $file_obj->file = $path;
+                        else {
+                            $file_obj->file = $this->getTmpFilename();
+                            FileHandler::getRemoteFile($url, $file_obj->file);
+                        }
+                    }
+
+                    if(file_exists($file_obj->file)) {
+                        // Set upload path by checking if the attachement is an image or other kind of file
+						if(preg_match("/\.(jpe?g|gif|png|wm[va]|mpe?g|avi|swf|flv|mp[1-4]|as[fx]|wav|midi?|moo?v|qt|r[am]{1,2}|m4v)$/i", $file_obj->source_filename))
+						{
+							// Immediately remove the direct file if it has any kind of extensions for hacking
+							$file_obj->source_filename = preg_replace('/\.(php|phtm|html?|cgi|pl|exe|jsp|asp|inc)/i', '$0-x', $file_obj->source_filename);
+							$file_obj->source_filename = str_replace(array('<', '>'), array('%3C', '%3E'), $file_obj->source_filename);
+
+							$path = sprintf("./files/attach/images/%s/%s", $module_srl, getNumberingPath($upload_target_srl, 3));
+
+							$ext = substr(strrchr($file_info['name'],'.'),1);
+							$_filename = md5(crypt(rand(1000000, 900000), rand(0, 100))).'.'.$ext;
+							$filename  = $path.$_filename;
+
+							$idx = 1;
+							while(file_exists($filename)) {
+								$filename = $path.preg_replace('/\.([a-z0-9]+)$/i','_'.$idx.'.$1', $_filename);
+								$idx++;
+							}
+
+							$file_obj->direct_download = 'Y';
+						}
+						else {
+                            $path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+                            $filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+                            $file_obj->direct_download = 'N';
+                        }
+                        // Create a directory
+                        if(!FileHandler::makeDir($path)) continue;
+
+                        if(preg_match('/^\.\/files\/cache\/importer/i',$file_obj->file)) FileHandler::rename($file_obj->file, $filename);
+                        else @copy($file_obj->file, $filename);
+                        // Insert the file to the DB
+                        unset($file_obj->file);
+                        if(file_exists($filename)) {
+                            $file_obj->uploaded_filename = $filename;
+                            $file_obj->file_size = filesize($filename);
+                            $file_obj->comment = NULL;
+                            $file_obj->member_srl = 0;
+                            $file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
+                            $file_obj->isvalid = 'Y';
+                            $output = executeQuery('file.insertFile', $file_obj);
+                            
+                            if($output->toBool()) {
+                                $uploaded_count++;
+                                $tmp_obj = null;
+                                $tmp_obj->source_filename = $file_obj->source_filename;
+                                if($file_obj->direct_download == 'Y') $files[$file_obj->source_filename] = $file_obj->uploaded_filename; 
+                                else $files[$file_obj->source_filename] = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+                            }
+                        }
+                    }
+                }
+            }
+            return $uploaded_count;
+        }
+
+        /**
+         * @biref Return a filename to temporarily use
+         **/
+        function getTmpFilename() {
+            $path = "./files/cache/importer";
+            if(!is_dir($path)) FileHandler::makeDir($path);
+            $filename = sprintf("%s/%d", $path, rand(11111111,99999999));
+            if(file_exists($filename)) $filename .= rand(111,999);
+            return $filename;
+        }
+
+        /**
+         * @brief Read buff until key value comes out from a specific file point
+         **/
+        function saveTemporaryFile($fp) {
+            $temp_filename = $this->getTmpFilename();
+            $f = fopen($temp_filename, "w");
+
+            $buff = '';
+            while(!feof($fp)) {
+                $str = trim(fgets($fp, 1024));
+                if(trim($str) == '</file>') break;
+
+                $buff .= $str;
+
+                if(substr($buff,-7)=='</buff>') {
+                    fwrite($f, base64_decode(substr($buff, 6, -7)));
+                    $buff = '';
+                }
+            }
+            fclose($f);
+            return $temp_filename;
+        }
+
+
+        /**
+         * @brief Set extra variables
+         **/
+        function importExtraVars($fp) {
+            $buff = null;
+            while(!feof($fp)) {
+                $buff .= $str = trim(fgets($fp, 1024));
+                if(trim($str) == '</extra_vars>') break;
+            }
+            if(!$buff) return array();
+
+            $buff = '<extra_vars>'.$buff;
+            $oXmlParser = new XmlParser();
+            $xmlDoc = $this->oXmlParser->parse($buff);
+            if(!count($xmlDoc->extra_vars->key)) return array();
+
+            $index = 1;
+            foreach($xmlDoc->extra_vars->key as $k => $v) {
+                unset($vobj);
+                if($v->var_idx) {
+                    $vobj->var_idx = base64_decode($v->var_idx->body);
+                    $vobj->lang_code = base64_decode($v->lang_code->body);
+                    $vobj->value = base64_decode($v->value->body);
+                    $vobj->eid = base64_decode($v->eid->body);
+
+                } else if($v->body) {
+                    $vobj->var_idx = $index;
+                    $vobj->lang_code = Context::getLangType();
+                    $vobj->value = base64_decode($v->body);
+                    $vobj->eid = 'extra_vars'.$index;
+                }
+                $extra_vars["extra_vars".$index] = $vobj;
+                $index++;
+            }
+            return $extra_vars;
+        }
+
+    }
+?>
diff --git a/modules/importer/importer.admin.view.php b/modules/importer/importer.admin.view.php
index b0e8a3056..893eb8491 100644
--- a/modules/importer/importer.admin.view.php
+++ b/modules/importer/importer.admin.view.php
@@ -1,58 +1,68 @@
-<?php
-    /**
-     * @class  importerAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  importer 모듈의 admin view class
-     **/
-
-    class importerAdminView extends importer {
-
-        /**
-         * @brief 초기화
-         *
-         * importer 모듈은 일반 사용과 관리자용으로 나누어진다.\n
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief XML 파일을 업로드하는 form 출력
-         **/
-        function dispImporterAdminContent() {
-            $this->setTemplatePath($this->module_path.'tpl');
-
-            $source_type = Context::get('source_type');
-            switch($source_type) {
-                case 'member' : 
-                        $template_filename = "member";
-                    break;
-                case 'ttxml' : 
-                        $oModuleModel = &getModel('module');
-                        $mid_list = $oModuleModel->getMidList();
-                        Context::set('mid_list', $mid_list);
-                        
-                        $template_filename = "ttxml";
-                    break;
-                case 'module' : 
-                        $oModuleModel = &getModel('module');
-                        $mid_list = $oModuleModel->getMidList();
-                        Context::set('mid_list', $mid_list);
-                        
-                        $template_filename = "module";
-                    break;
-                case 'message' : 
-                        $template_filename = "message";
-                    break;
-                case 'sync' : 
-                        $template_filename = "sync";
-                    break;
-                default : 
-                        $template_filename = "index";
-                    break;
-            }
-
-            $this->setTemplateFile($template_filename);
-        }
-        
-    }
-?>
+<?php
+    /**
+     * @class  importerAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the importer module 
+     **/
+
+    class importerAdminView extends importer {
+
+        /**
+         * @brief Initialization
+         *
+         * Importer module is divided by general use and administrative use \n
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Display a form to upload the xml file
+         **/
+        function dispImporterAdminContent() {
+            $this->setTemplatePath($this->module_path.'tpl');
+
+            $source_type = Context::get('source_type');
+            switch($source_type) {
+                case 'member' : 
+                        $template_filename = "member";
+                    break;
+                case 'ttxml' : 
+                        $oModuleModel = &getModel('module');
+                        //$mid_list = $oModuleModel->getMidList();	//perhaps mid_list variables not use
+                        //Context::set('mid_list', $mid_list);
+                        
+                        $template_filename = "ttxml";
+                    break;
+                case 'module' : 
+                        $oModuleModel = &getModel('module');
+                        //$mid_list = $oModuleModel->getMidList();	//perhaps mid_list variables not use
+                        //Context::set('mid_list', $mid_list);
+                        
+                        $template_filename = "module";
+                    break;
+                case 'message' : 
+                        $template_filename = "message";
+                    break;
+                case 'sync' : 
+                        $template_filename = "sync";
+                    break;
+                default : 
+                        $template_filename = "index";
+                    break;
+            }
+
+            $this->setTemplateFile($template_filename);
+        }
+
+        /**
+         * @brief Display a form to upload the xml file
+         **/
+        function dispImporterAdminImportForm() {
+			$oDocumentModel = &getModel('document');	//for document lang use in this page
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('index');
+        }
+        
+    }
+?>
diff --git a/modules/importer/importer.class.php b/modules/importer/importer.class.php
index bb64f019e..79c8fa834 100644
--- a/modules/importer/importer.class.php
+++ b/modules/importer/importer.class.php
@@ -1,37 +1,37 @@
-<?php
-    /**
-     * @class  importer
-     * @author NHN (developers@xpressengine.com)
-     * @brief  importer 모듈의 high class
-     **/
-
-    class importer extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object();
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  importer
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of importer module
+     **/
+
+    class importer extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            return new Object();
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/importer/lang/en.lang.php b/modules/importer/lang/en.lang.php
deleted file mode 100644
index 2096905d6..000000000
--- a/modules/importer/lang/en.lang.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author nicetwo (supershop@naver.com)
-     * @brief basic english language pack of Importer
-     **/
-
-    // words for button
-    $lang->cmd_sync_member = 'Synchronize';
-    $lang->cmd_continue = 'Continue';
-    $lang->preprocessing = 'Zeroboard is preparing for importing.';
-
-    // items
-    $lang->importer = 'Zeroboard Data Importer';
-    $lang->source_type = 'Migration Target';
-    $lang->type_member = 'Member Data';
-    $lang->type_message = 'Message Data';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = 'Article Data';
-    $lang->type_syncmember = 'Synchronize Member Data';
-    $lang->target_module = 'Target Module';
-    $lang->xml_file = 'XML File';
-
-    $lang->import_step_title = array(
-        1 => 'Step 1. Migration Target',
-        12 => 'Step 1-2. Target Module',
-        13 => 'Step 1-3. Target Category',
-        2 => 'Step 2. XML File Location',
-        3 => 'Step 2. Synchronize Member and Article Data',
-        99 => 'Importing Data',
-    );
-
-    $lang->import_step_desc = array(
-        1 => 'Please select the XML file\'s type you wish to migrate.',
-        12 => 'Please select the module you wish to import data.',
-        121 => 'Posts:',
-        122 => 'Guestbook:',
-        13 => 'Please select the category you wish to import data.',
-        2 => "Please input the XML file's location that contains data to import.\nYou may input both absolute and relative path.",
-        3 => 'Member and article data may not be correct after import. If so, please synchronize to recover them with user_id.',
-        99 => 'Importing...',
-    );
-
-    // guide/alert
-    $lang->msg_sync_member = 'Please click on Synchronize button to start data synchronization.';
-    $lang->msg_no_xml_file = 'Could not find XML file. Please check the path again';
-    $lang->msg_invalid_xml_file = 'Invalid type of XML file.';
-    $lang->msg_importing = 'Import %d items out of %d. (if process is stopped, click on Continue button)';
-    $lang->msg_import_finished = '%d/%d items were imported completely. There could be some items that were not imported properly.';
-    $lang->msg_sync_completed = 'Completed synchronzing member article and comments.';
-
-    // blah blah..
-    $lang->about_type_member = 'If you are to import member data, please select this option';
-    $lang->about_type_message = 'If you are to import message data, please select this option';
-    $lang->about_type_ttxml = 'If you are to import TTXML(textcube) data, please select this option';
-	$lang->about_ttxml_user_id = 'Please input user ID to set as author of TTXML data. (user ID must be already signed up)';
-    $lang->about_type_module = 'If you are to import article data, please select this option';
-    $lang->about_type_syncmember = 'If you are to import and synchronize member and article data, please select this option';
-    $lang->about_importer = "Data Importer will help you import Zeroboard4, Zeroboard5 Beta or other program's data into XE.\nIn order to import, you first have to use <a href=\"http://svn.xpressengine.net/migration/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a> to convert the data you want into XML File.";
-
-    $lang->about_target_path = "To get attachments from Zeroboard4, please input the path where Zeroboard4 is installed.\nIf it is located in the same server, please input Zeroboard4's path such as /home/USERID/public_html/bbs\nIf not, please input the address where Zeroboard4 is installed. ex. http://Domain/bbs";
-?>
diff --git a/modules/importer/lang/es.lang.php b/modules/importer/lang/es.lang.php
deleted file mode 100644
index 9ec4b27ad..000000000
--- a/modules/importer/lang/es.lang.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-    /**
-     * @archivo   es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para importar.
-     **/
-
-    // Palabras para los botones
-    $lang->cmd_sync_member = 'Sincronizar';
-    $lang->cmd_continue = 'Continuar';
-    $lang->preprocessing = '데이터 이전을 위한 사전 준비중입니다.';
-
-    // Especificaciones
-    $lang->importer = 'Transferir los datos de zeroboard';
-    $lang->source_type = 'Objetivo a transferir';
-    $lang->type_member = 'Información del usuario';
-    $lang->type_message = 'Mensaje de Datos';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = 'Información del documento.';
-    $lang->type_syncmember = 'Sincronizar la información del usuario';
-    $lang->target_module = 'Objetivo del módulo';
-    $lang->xml_file = 'Archivo XML';
-
-    $lang->import_step_title = array(
-        1 => 'Paso 1. Seleccione el objetivo a transferir',
-        12 => 'Paso 1-2. Seleccione el objetivo del módulo ',
-        13 => 'Paso 1-3. Seleccione la categoría del módulo',
-        2 => 'Paso 2. Subir el archivo XML',
-        3 => 'Paso 2. Sincronizar las informaciones del usuario y la del documento',
-        99 => '데이터 이전',
-    );
-
-    $lang->import_step_desc = array(
-        1 => 'Seleccione el tipo de archivo XML a transfrerir.',
-        12 => 'Seleccione el módulo para transferir los datos.',
-        121 => '글:',
-        122 => '방명록:',
-        13 => 'Seleccione la categoría para transferir los datos.',
-        2 => "Ingrese la ubicación del archivo XML para transfer los datos.\nPuede ser ruta absoluto o relativo.",
-        3 => 'La información del usuario y del documento podría ser incorrecto luego de la transferencia. Si ese es el caso, sincroniza para la corrección basado a la ID del usuario.',
-        99 => '데이터를 이전중입니다',
-    );
-
-    // Guía/ Alerta
-    $lang->msg_sync_member = 'Al presionar el botón sincronizar comenzará a sincronizar la información del usuario y la del artículo.';
-    $lang->msg_no_xml_file = 'No se puede encontrar el archivo XML. Verifique su ruta.';
-    $lang->msg_invalid_xml_file = 'Tipo de archivo XML inválido.';
-    $lang->msg_importing = 'Ingresando %d dotos de %d. (Si esto mantiene paralizado presione el botón "Continuar".)';
-    $lang->msg_import_finished = '%d/%d datos fueron completamente ingresados. Dependiendo del caso, pueden haber algunos datos no ingresados.';
-    $lang->msg_sync_completed = 'Sincronización del usuario, artículo y respuestas finalizadas.';
-
-    // bla bla...
-    $lang->about_type_member = 'Seleccione esta opción si estas transferiendo la información del usuario.';
-    $lang->about_type_message = 'Si está transfiriendo la información de mensajes, seleccione esta opción';
-    $lang->about_type_ttxml = '	Si está transfiriendo la TTXML (textcube) información, seleccione esta opción';
-    $lang->about_ttxml_user_id = 'Por favor, de entrada ID de usuario establecer como autor de la transferencia de TTXML. (Identificación de usuario debe ser firmado ya en marcha)';
-    $lang->about_type_module = 'Seleccione esta opción si estas transfeririendo información del documento de los tableros';
-    $lang->about_type_syncmember = 'Seleccione esta opción cuando tenga que sincronizar la información del usuario luego de haber transferido la información del usuario y del artículo.';
-    $lang->about_importer = "Es posible trasferir los datos de Zeroboard4, zb5beta o de otros programas a XE.\nPara la transferencia debe utilizar <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a> para transformar los datos en archivo XML, y luego subir ese archivo.";
-
-    $lang->about_target_path = "Para descargar los archivos adjuntos de ZeroBoard4, ingresa la ubicación de ZeroBoard4 instalado.\nSi esta en el mismo servidor escriba la ubicación de ZeroBoard4 como por ejemplo: /home/ID/public_html/bbs o si esta en otro servidor escriba la ubicación de ZeroBoard4 instalado como por ejemplo: http://dominio/bbs";
-?>
diff --git a/modules/importer/lang/fr.lang.php b/modules/importer/lang/fr.lang.php
deleted file mode 100644
index 7df2df838..000000000
--- a/modules/importer/lang/fr.lang.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-    /**
-     * @file   fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gamil.com>
-     * @brief  Paquet du langage en français le module d\'Importateur
-     **/
-
-    // words for button
-    $lang->cmd_sync_member = 'Synchroniser';
-    $lang->cmd_continue = 'Continuer';
-    $lang->preprocessing = 'On est en train de préparer pour transférer les données.';
-
-    // items
-    $lang->importer = 'Transférer les Données du Zeroboard';
-    $lang->source_type = 'Sorte de la Source';
-    $lang->type_member = 'Données des Membres';
-    $lang->type_message = 'Données des Messages';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = 'Données des Articles';
-    $lang->type_syncmember = 'Synchroniser les Données des Membres';
-    $lang->target_module = 'Module objectif';
-    $lang->xml_file = 'Fichier en XML';
-
-    $lang->import_step_title = array(
-        1 => 'Pas 1. Choisir l\'objet à transférer',
-        12 => 'Pas 1-2. Choisir le module à transférer',
-        13 => 'Pas 1-3. Choisir la catégorie à transférer',
-        2 => 'Pas 2. Télécharger fichier en XML',
-        3 => 'Pas 2. Synchroniser données des membres et des articles',
-		99 => 'Trensférer des données',
-    );
-
-    $lang->import_step_desc = array(
-        1 => 'Choisissez la sorte du fichier en XML que vous voulez transférer.',
-        12 => 'Choisissez le module objectif dans lequel vous voulez tranférer les données.',
-        121 => '글:',
-        122 => '방명록:',
-        13 => 'Choisissez la catégorie objective dans laquelle vous voulez transférer les données.',
-        2 => "Entrez le chemin du fichier en XML pour transférer les données.\nS'il est localisé dans le même compte, entréz le chemin absolut ou relatif. Sinon, entrez l'URL commençant avec http://..",
-        3 => 'Les données des membres et ceux des articles peuvent ne pas s\'accorder après la transfèrement. Dans ce cas, synchronisez S.V.P. Ça arrangera les données en étant basé sur le compte d\'utilisateur.',
-		99 => 'En train de transférer',
-    );
-
-    // guide/alert
-    $lang->msg_sync_member = 'On commencera à synchroniser les données des membres et des articles quand vous cliquez le bouton de synchroniser.';
-    $lang->msg_no_xml_file = 'On ne peut pas trouver le fichier de XML. Vérifiez le chemin encore une fois, S.V.P.';
-    $lang->msg_invalid_xml_file = 'Ce fichier de XML est invalide.';
-    $lang->msg_importing = 'On écrit %d données sur %d. (Si c\'est arrêté longtemps, cliquez le bouton "Continuer")';
-    $lang->msg_import_finished = '%d/%d données sont entrées complètement. En dépendant sur la situation, il y aura quelques données qui n\'ont pas été entrées.';
-    $lang->msg_sync_completed = 'On a terminé de synchroniser les données des membres, des articles et des commentaires.';
-
-    // blah blah..
-    $lang->about_type_member = 'Choisissez cette option si vous voulez transférer les informations des membres';
-    $lang->about_type_message = 'Choisissez cette option si vous voulez transférer les informations des messages';
-    $lang->about_type_ttxml = 'Choisissez cette option si vous voulez transférer les informations des TTXML(textcube)';
-	$lang->about_ttxml_user_id = 'Entrez le compte d\'utilisateur pour déclarer comme l\'auteur. (Le compte d\'utilisateur doit être déjà inscrit)';
-    $lang->about_type_module = 'Choisissez cette option si vous voulez transférer les informations des panneaux ou des articles.';
-    $lang->about_type_syncmember = 'Choisissez cette option si vous voulez synchroniser les informations des membres après le transfér des informations des membres et des articles.';
-    $lang->about_importer = "Vous pouvez transférer les données de Zeroboard4, de Zeroboard5 Beta ou d\'autres logiciels aux données de XE.\nPour transférer, vous devez utiliser <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">Exporteur de XML</a> pour convertir les données en fichier de XML, et puis téléchargez-le.";
-
-    $lang->about_target_path = "Pour obtenir les attachés de Zeroboard4, Entrez l\'adresse où Zeroboard4 est installé.\nSi elle se trouve dans le même serveur, entrez le chemin comme '/home/USERID/public_html/bbs'\nSi elle ne se trouve pas dans le même serveur, entrez l\'adresse où Zeroboard4 est installé comme 'http://Domain/bbs'";
-?>
diff --git a/modules/importer/lang/jp.lang.php b/modules/importer/lang/jp.lang.php
deleted file mode 100644
index 5fcad60d2..000000000
--- a/modules/importer/lang/jp.lang.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-    /**
-     * @file   modules/importer/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  Importer(importer) モジュールの基本言語パッケージ
-     **/
-
-    // ボタンに使用する用語
-    $lang->cmd_sync_member = '同期化';
-    $lang->cmd_continue = '続ける';
-    $lang->preprocessing = 'データ移転のため、準備中です。';
-
-    // 項目
-    $lang->importer = 'XEデータ変換';
-    $lang->source_type = 'データ変換の対象';
-    $lang->type_member = '会員情報';
-    $lang->type_message = 'メッセージ情報';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = '書き込みデータ情報';
-    $lang->type_syncmember = '会員情報同期化';
-    $lang->target_module = '対象モジュール';
-    $lang->xml_file = 'XMLファイル';
-
-    $lang->import_step_title = array(
-        1 => 'Step 1. 移転先を選択',
-        12 => 'Step 1-2. 対象モジュール選択',
-        13 => 'Step 1-3. 対象カテゴリ選択',
-        2 => 'Step 2. XMLファイルアップロード',
-        3 => 'Step 2. 会員情報と書き込みデータの同期化',
-        99 => 'データ移転',
-    );
-
-    $lang->import_step_desc = array(
-        1 => '変換するXMLファイルの種類を選択して下さい。',
-        12 => 'データ変換を行う対象モジュールを選択して下さい。',
-        121 => '書き込み:',
-        122 => 'ゲストブック:',
-        13 => 'データ変換を行う対象カテゴリを選択して下さい。',
-        2 => "データ変換を行うXMLファイルパスを入力して下さい。同じアカウントのサーバ上では、相対または絶対パスを、異なるサーバにアップロードされている場合は「http://アドレス..」を入力して下さい。",
-        3 => '会員情報と書き込みデータの情報の変換を行った後、データが合わない場合があります。この時に同期化を行うと「user_id」をもとに正しく動作するようにします。',
-        99 => 'データを移転しています。',
-    );
-
-    // 案内/警告
-    $lang->msg_sync_member = '同期化ボタンをクリックすると会員情報と書き込みデータの情報の同期化が始まります。';
-    $lang->msg_no_xml_file = 'XMLファイルが見つかりません。パスをもう一度確認して下さい。';
-    $lang->msg_invalid_xml_file = 'XMLファイルのフォーマットが正しくありません。';
-    $lang->msg_importing = '%d個のデータの内、%d個を変換中です（止まったままの場合は「続ける」ボタンをクリックして下さい）。';
-    $lang->msg_import_finished = '%d/%d個のデータ変換が完了しました。場合によって変換されていないデータがあることもあります。';
-    $lang->msg_sync_completed = '会員情報、書き込みデータ、コメントのデータの同期化（変換）が完了しました。';
-
-    // その他..
-    $lang->about_type_member = 'データ変換の対象が会員情報の場合は選択して下さい。';
-    $lang->about_type_message = 'データ移転対象がメッセージの場合選択して下さい。';
-    $lang->about_type_ttxml = 'データ移転対象が、TTXML(textcube系列)の場合選択して下さい。';
-    $lang->about_ttxml_user_id = 'TTXML移転時に投稿者として指定するユーザIDを入力して下さい（すでに加入されているIDでなければなりません）。';
-    $lang->about_type_module = 'データ変換の対象が書き込みデータである場合は選択して下さい。';
-    $lang->about_type_syncmember = '会員情報と書き込みデータなどの変換を行った後、会員情報を同期化する必要がある場合は、選択して下さい。';
-    $lang->about_importer = "ゼロボード4、zb5betaまたは他のプログラムの書き込みデータをXEのデータに変換することが出来ます。\n変換するためには、<a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>を利用して変換したい書き込みデータをXMLファイルで作成してアップロードして下さい。";
-    $lang->about_target_path = "添付ファイルをダウンロードするためには、ゼロボード4がインストールされた場所を入力して下さい。同じサーバ上にある場合は「/home/ID/public_html/bbs」のように入力し、他のサーバにある場合は、「http://ドメイン/bbs」のようにゼロボードがインストールされているURLを入力して下さい。";
-?>
diff --git a/modules/importer/lang/ko.lang.php b/modules/importer/lang/ko.lang.php
deleted file mode 100644
index 7270d084f..000000000
--- a/modules/importer/lang/ko.lang.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-    /**
-     * @file   modules/importer/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Importer(importer) 모듈의 기본 언어팩
-     **/
-
-    // 버튼에 사용되는 언어
-    $lang->cmd_sync_member = '동기화';
-    $lang->cmd_continue = '계속 진행';
-    $lang->preprocessing = '데이터 이전을 위한 사전 준비 중입니다.';
-
-    // 항목
-    $lang->importer = 'XE 데이터 이전';
-    $lang->source_type = '이전 대상';
-    $lang->type_member = '회원 정보';
-    $lang->type_message = '쪽지(메시지) 정보';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = '게시물 정보';
-    $lang->type_syncmember = '회원정보 동기화';
-    $lang->target_module = '대상 모듈';
-    $lang->xml_file = 'XML 파일';
-
-    $lang->import_step_title = array(
-        1 => 'Step 1. 이전 대상 선택',
-        12 => 'Step 1-2. 대상 모듈 선택',
-        13 => 'Step 1-3. 대상 분류 선택',
-        2 => 'Step 2. XML파일 지정',
-        3 => 'Step 2. 회원정보와 게시물의 정보 동기화',
-        99 => '데이터 이전',
-    );
-
-    $lang->import_step_desc = array(
-        1 => '이전하려는 XML파일의 종류를 선택해주세요.',
-        12 => '데이터를 이전 받을 대상 모듈을 선택해주세요.',
-        121 => '글:',
-        122 => '방명록:',
-        13 => '데이터 이전을 할 대상 분류를 선택해주세요.',
-        2 => "이전할 데이터 XML파일의 경로를 입력해주세요.\n상대 또는 절대 경로를 입력하시면 됩니다.",
-        3 => '회원정보와 게시물 정보가 이전 후에 맞지 않을 수 있습니다. 이때 동기화를 하시면 user_id를 기반으로 올바르게 동작하도록 합니다.',
-        99 => '데이터 이전중입니다.',
-    );
-
-    // 안내/경고
-    $lang->msg_sync_member = '동기화 버튼을 클릭하시면 회원정보와 게시물 정보의 동기화를 시작합니다.';
-    $lang->msg_no_xml_file = 'XML파일을 찾을 수 없습니다. 경로를 다시 확인해주세요.';
-    $lang->msg_invalid_xml_file = '잘못된 형식의 XML파일입니다.';
-    $lang->msg_importing = '%d개의 데이터 중 %d개를 입력중입니다. (계속 멈추어 있으면 "계속진행" 버튼을 클릭해주세요.)';
-    $lang->msg_import_finished = '%d/%d 개의 데이터 입력이 완료되었습니다. 상황에 따라 입력되지 못한 데이터가 있을 수 있습니다.';
-    $lang->msg_sync_completed = '회원과 게시물, 댓글의 동기화가 완료되었습니다.';
-
-    // 주절주절
-    $lang->about_type_member = '데이터 이전 대상이 회원정보일 경우 선택해주세요.';
-    $lang->about_type_message = '데이터 이전 대상이 쪽지(메시지)일 경우 선택해주세요.';
-    $lang->about_type_ttxml = '데이터 이전 대상이 TTXML(textcube계열)일 경우 선택해주세요.';
-    $lang->about_ttxml_user_id = 'TTXML 이전 시에 글쓴이로 지정할 사용자 아이디를 입력해주세요. (이미 가입된 아이디여야 합니다.)';
-    $lang->about_type_module = '데이터 이전 대상이 게시판 등의 게시물 정보일 경우 선택해주세요.';
-    $lang->about_type_syncmember = '회원정보와 게시물정보 등을 이전 후, 회원정보를 동기화해야 할 때 선택해주세요.';
-    $lang->about_importer = "제로보드4, zb5beta 또는 다른 프로그램의 데이터를 XE 데이터로 이전할 수 있습니다.\n이전을 위해서는 <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>를 이용해서 원하는 데이터를 XML파일로 생성 후 업로드해주셔야 합니다.";
-    $lang->about_target_path = "첨부 파일을 받기 위해 제로보드4가 설치된 위치를 입력해주세요.\n같은 서버에 있을 경우 /home/아이디/public_html/bbs 등과 같이 제로보드4의 위치를 입력하시고\n다른 서버일 경우 http://도메인/bbs 처럼 제로보드4가 설치된 곳의 url을 입력해주세요.";
-?>
diff --git a/modules/importer/lang/lang.xml b/modules/importer/lang/lang.xml
new file mode 100644
index 000000000..da3f32f63
--- /dev/null
+++ b/modules/importer/lang/lang.xml
@@ -0,0 +1,563 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_sync_member">
+		<value xml:lang="ko"><![CDATA[동기화]]></value>
+		<value xml:lang="en"><![CDATA[Synchronize]]></value>
+		<value xml:lang="jp"><![CDATA[同期化]]></value>
+		<value xml:lang="zh-CN"><![CDATA[同步]]></value>
+		<value xml:lang="zh-TW"><![CDATA[同步]]></value>
+		<value xml:lang="fr"><![CDATA[Synchroniser]]></value>
+		<value xml:lang="ru"><![CDATA[Синхронизировать]]></value>
+		<value xml:lang="es"><![CDATA[Sincronizar]]></value>
+		<value xml:lang="tr"><![CDATA[Senkronize]]></value>
+		<value xml:lang="vi"><![CDATA[Đồng bộ hóa]]></value>
+	</item>
+	<item name="cmd_continue">
+		<value xml:lang="ko"><![CDATA[계속 진행]]></value>
+		<value xml:lang="en"><![CDATA[Continue]]></value>
+		<value xml:lang="jp"><![CDATA[続ける]]></value>
+		<value xml:lang="zh-CN"><![CDATA[继续进行]]></value>
+		<value xml:lang="zh-TW"><![CDATA[繼續進行]]></value>
+		<value xml:lang="fr"><![CDATA[Continuer]]></value>
+		<value xml:lang="ru"><![CDATA[Продолжить]]></value>
+		<value xml:lang="es"><![CDATA[Continuar]]></value>
+		<value xml:lang="tr"><![CDATA[Devam Et]]></value>
+		<value xml:lang="vi"><![CDATA[Tiếp tục]]></value>
+	</item>
+	<item name="preprocessing">
+		<value xml:lang="ko"><![CDATA[데이터 이전을 위한 사전 준비 중입니다.]]></value>
+		<value xml:lang="en"><![CDATA[XE is preparing for importing.]]></value>
+		<value xml:lang="jp"><![CDATA[データ移転のため、準備中です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[正准备数据导入...]]></value>
+		<value xml:lang="zh-TW"><![CDATA[匯入資料中...]]></value>
+		<value xml:lang="fr"><![CDATA[On est en train de préparer pour transférer les données.]]></value>
+		<value xml:lang="ru"><![CDATA[Идет подготовка для импортирования данных...]]></value>
+		<value xml:lang="es"><![CDATA[데이터 이전을 위한 사전 준비중입니다.]]></value>
+		<value xml:lang="tr"><![CDATA[XE içe aktarım için hazırlanıyor.]]></value>
+		<value xml:lang="vi"><![CDATA[Đang chuẩn bị cho việc chuyển dữ liệu.]]></value>
+	</item>
+	<item name="importer">
+		<value xml:lang="ko"><![CDATA[데이터 들여오기]]></value>
+		<value xml:lang="en"><![CDATA[XE Data Importer]]></value>
+		<value xml:lang="jp"><![CDATA[XEデータ変換]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据导入]]></value>
+		<value xml:lang="zh-TW"><![CDATA[匯入]]></value>
+		<value xml:lang="fr"><![CDATA[Transférer les Données du XE]]></value>
+		<value xml:lang="ru"><![CDATA[Импортировать данные XE]]></value>
+		<value xml:lang="es"><![CDATA[Transferir los datos de XE]]></value>
+		<value xml:lang="tr"><![CDATA[XE Veri Alıcısı]]></value>
+		<value xml:lang="vi"><![CDATA[Chuyển XE Data]]></value>
+	</item>
+	<item name="source_type">
+		<value xml:lang="ko"><![CDATA[이전 대상]]></value>
+		<value xml:lang="en"><![CDATA[Migration Target]]></value>
+		<value xml:lang="jp"><![CDATA[データ変換の対象]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导入对象]]></value>
+		<value xml:lang="zh-TW"><![CDATA[匯入目標]]></value>
+		<value xml:lang="fr"><![CDATA[Sorte de la Source]]></value>
+		<value xml:lang="ru"><![CDATA[Предыдущее назначение]]></value>
+		<value xml:lang="es"><![CDATA[Objetivo a transferir]]></value>
+		<value xml:lang="tr"><![CDATA[Geçiş Hedefi]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn nguồn]]></value>
+	</item>
+	<item name="type_member">
+		<value xml:lang="ko"><![CDATA[회원 정보]]></value>
+		<value xml:lang="en"><![CDATA[Member Data]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員資料]]></value>
+		<value xml:lang="fr"><![CDATA[Données des Membres]]></value>
+		<value xml:lang="ru"><![CDATA[Данные пользователей]]></value>
+		<value xml:lang="es"><![CDATA[Información del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Verisi]]></value>
+		<value xml:lang="vi"><![CDATA[Data Thành viên]]></value>
+	</item>
+	<item name="type_message">
+		<value xml:lang="ko"><![CDATA[쪽지 정보]]></value>
+		<value xml:lang="en"><![CDATA[Message Data]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージ情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[短信息(MemoBox)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[短訊息]]></value>
+		<value xml:lang="fr"><![CDATA[Données des Messages]]></value>
+		<value xml:lang="ru"><![CDATA[Данные сообщения]]></value>
+		<value xml:lang="es"><![CDATA[Mensaje de Datos]]></value>
+		<value xml:lang="tr"><![CDATA[Mesaj Verisi]]></value>
+		<value xml:lang="vi"><![CDATA[Data Tin nhắn]]></value>
+	</item>
+	<item name="type_ttxml">
+		<value xml:lang="ko"><![CDATA[TTXML]]></value>
+		<value xml:lang="en"><![CDATA[TTXML]]></value>
+	</item>
+	<item name="type_module">
+		<value xml:lang="ko"><![CDATA[게시물 정보]]></value>
+		<value xml:lang="en"><![CDATA[Article Data]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みデータ情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版面信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[討論板資料]]></value>
+		<value xml:lang="fr"><![CDATA[Données des Articles]]></value>
+		<value xml:lang="ru"><![CDATA[Данные статьи]]></value>
+		<value xml:lang="es"><![CDATA[Información del documento.]]></value>
+		<value xml:lang="tr"><![CDATA[Makale Verisi]]></value>
+		<value xml:lang="vi"><![CDATA[Data Bài viết]]></value>
+	</item>
+	<item name="type_syncmember">
+		<value xml:lang="ko"><![CDATA[회원정보 동기화]]></value>
+		<value xml:lang="en"><![CDATA[Synchronize Member Data]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報同期化]]></value>
+		<value xml:lang="zh-CN"><![CDATA[同步会员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[同步會員資料]]></value>
+		<value xml:lang="fr"><![CDATA[Synchroniser les Données des Membres]]></value>
+		<value xml:lang="ru"><![CDATA[Синхронизировать данные пользователей]]></value>
+		<value xml:lang="es"><![CDATA[Sincronizar la información del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Verisini Senkronize et]]></value>
+		<value xml:lang="vi"><![CDATA[Đồng bộ hóa Data Thành viên]]></value>
+	</item>
+	<item name="target_module">
+		<value xml:lang="ko"><![CDATA[대상 모듈]]></value>
+		<value xml:lang="en"><![CDATA[Target Module]]></value>
+		<value xml:lang="jp"><![CDATA[対象モジュール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块对象]]></value>
+		<value xml:lang="zh-TW"><![CDATA[目標模組]]></value>
+		<value xml:lang="fr"><![CDATA[Module objectif]]></value>
+		<value xml:lang="ru"><![CDATA[Модуль назначения]]></value>
+		<value xml:lang="es"><![CDATA[Objetivo del módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef Modül]]></value>
+		<value xml:lang="vi"><![CDATA[Module]]></value>
+	</item>
+	<item name="xml_file">
+		<value xml:lang="ko"><![CDATA[XML 파일]]></value>
+		<value xml:lang="en"><![CDATA[XML File]]></value>
+		<value xml:lang="jp"><![CDATA[XMLファイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[XML文件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XML檔案]]></value>
+		<value xml:lang="fr"><![CDATA[Fichier en XML]]></value>
+		<value xml:lang="ru"><![CDATA[XML файл]]></value>
+		<value xml:lang="es"><![CDATA[Archivo XML]]></value>
+		<value xml:lang="tr"><![CDATA[XML Dosyası]]></value>
+		<value xml:lang="vi"><![CDATA[File XML]]></value>
+	</item>
+	<item name="import_step_title" type="array">
+		<item name="1">
+			<value xml:lang="ko"><![CDATA[Step 1. 이전 대상 선택]]></value>
+			<value xml:lang="en"><![CDATA[Step 1. Migration Target]]></value>
+			<value xml:lang="jp"><![CDATA[Step 1. 移転先を選択]]></value>
+			<value xml:lang="zh-CN"><![CDATA[Step 1. 选择导入对象]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Step 1. 選擇匯入目標]]></value>
+			<value xml:lang="fr"><![CDATA[Pas 1. Choisir l'objet à transférer]]></value>
+			<value xml:lang="ru"><![CDATA[Шаг 1. Выберите предыдущее назначение]]></value>
+			<value xml:lang="es"><![CDATA[Paso 1. Seleccione el objetivo a transferir]]></value>
+			<value xml:lang="tr"><![CDATA[1. adım Geçiş Hedefi]]></value>
+			<value xml:lang="vi"><![CDATA[Bước 1. Lựa chọn đường dẫn]]></value>
+		</item>
+		<item name="12">
+			<value xml:lang="ko"><![CDATA[Step 1-2. 대상 모듈 선택]]></value>
+			<value xml:lang="en"><![CDATA[Step 1-2. Target Module]]></value>
+			<value xml:lang="jp"><![CDATA[Step 1-2. 対象モジュール選択]]></value>
+			<value xml:lang="zh-CN"><![CDATA[Step 1-2. 选择模块对象]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Step 1-2. 選擇目標模組]]></value>
+			<value xml:lang="fr"><![CDATA[Pas 1-2. Choisir le module à transférer]]></value>
+			<value xml:lang="ru"><![CDATA[Шаг 1-2. Выберите модуль назначения]]></value>
+			<value xml:lang="es"><![CDATA[Paso 1-2. Seleccione el objetivo del módulo ]]></value>
+			<value xml:lang="tr"><![CDATA[1-2. adım Hedef Modül]]></value>
+			<value xml:lang="vi"><![CDATA[Bước 1-2. Chọn Module]]></value>
+		</item>
+		<item name="13">
+			<value xml:lang="ko"><![CDATA[Step 1-3. 대상 분류 선택]]></value>
+			<value xml:lang="en"><![CDATA[Step 1-3. Target Category]]></value>
+			<value xml:lang="jp"><![CDATA[Step 1-3. 対象カテゴリ選択]]></value>
+			<value xml:lang="zh-CN"><![CDATA[Step 1-3. 选择对象分类]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Step 1-3. 選擇目標分類]]></value>
+			<value xml:lang="fr"><![CDATA[Pas 1-3. Choisir la catégorie à transférer]]></value>
+			<value xml:lang="ru"><![CDATA[Шаг 1-3. Выберите категорию назначения]]></value>
+			<value xml:lang="es"><![CDATA[Paso 1-3. Seleccione la categoría del módulo]]></value>
+			<value xml:lang="tr"><![CDATA[1-3. adım Hedef Kategori]]></value>
+			<value xml:lang="vi"><![CDATA[Bước 1-3. Chọn chuyên đề]]></value>
+		</item>
+		<item name="2">
+			<value xml:lang="ko"><![CDATA[Step 2. XML 파일 지정]]></value>
+			<value xml:lang="en"><![CDATA[Step 2. XML File Location]]></value>
+			<value xml:lang="jp"><![CDATA[Step 2. XMLファイルアップロード]]></value>
+			<value xml:lang="zh-CN"><![CDATA[Step 2. XML文件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Step 2. XML檔案]]></value>
+			<value xml:lang="fr"><![CDATA[Pas 2. Télécharger fichier en XML]]></value>
+			<value xml:lang="ru"><![CDATA[Шаг 2. Загрузить XML файл]]></value>
+			<value xml:lang="es"><![CDATA[Paso 2. Subir el archivo XML]]></value>
+			<value xml:lang="tr"><![CDATA[2. adım XML Dosya Konumu]]></value>
+			<value xml:lang="vi"><![CDATA[Bước 2. Upload File XML]]></value>
+		</item>
+		<item name="3">
+			<value xml:lang="ko"><![CDATA[Step 2. 회원정보와 게시물의 정보 동기화]]></value>
+			<value xml:lang="en"><![CDATA[Step 2. Synchronize Member and Article Data]]></value>
+			<value xml:lang="jp"><![CDATA[Step 2. 会員情報と書き込みデータの同期化]]></value>
+			<value xml:lang="zh-CN"><![CDATA[Step 2. 同步会员信息和文章信息]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Step 2. 同步會員資料與文章]]></value>
+			<value xml:lang="fr"><![CDATA[Pas 2. Synchroniser données des membres et des articles]]></value>
+			<value xml:lang="ru"><![CDATA[Шаг 2. Синхронизировать данные пользователей и статей]]></value>
+			<value xml:lang="es"><![CDATA[Paso 2. Sincronizar las informaciones del usuario y la del documento]]></value>
+			<value xml:lang="tr"><![CDATA[2. adım Üye ve Makale Verilerini Senkronize Et]]></value>
+			<value xml:lang="vi"><![CDATA[Bước 2. Đồng bộ hóa Data thành viên và Data bài viết]]></value>
+		</item>
+		<item name="99">
+			<value xml:lang="ko"><![CDATA[데이터 이전]]></value>
+			<value xml:lang="en"><![CDATA[Importing Data]]></value>
+			<value xml:lang="jp"><![CDATA[データ移転]]></value>
+			<value xml:lang="zh-CN"><![CDATA[数据导入]]></value>
+			<value xml:lang="zh-TW"><![CDATA[匯入資料]]></value>
+			<value xml:lang="fr"><![CDATA[Trensférer des données]]></value>
+			<value xml:lang="ru"><![CDATA[Импортировать данные]]></value>
+			<value xml:lang="tr"><![CDATA[Veri İçeri Aktarılıyor]]></value>
+			<value xml:lang="vi"><![CDATA[Đang đồng bộ hóa dữ liệu.]]></value>
+		</item>
+	</item>
+	<item name="import_step_desc" type="array">
+		<item name="1">
+			<value xml:lang="ko"><![CDATA[이전하려는 XML파일의 종류를 선택해주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please select the XML file's type you wish to migrate.]]></value>
+			<value xml:lang="jp"><![CDATA[変換するXMLファイルの種類を選択してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请选择要导入的XML文件种类。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請選擇要匯入的 XML 檔案類型。]]></value>
+			<value xml:lang="fr"><![CDATA[Choisissez la sorte du fichier en XML que vous voulez transférer.]]></value>
+			<value xml:lang="ru"><![CDATA[Пожалуйста, выберите тип XML файла, который Вы хотите импортировать.]]></value>
+			<value xml:lang="es"><![CDATA[Seleccione el tipo de archivo XML a transfrerir.]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen içe aktarmak istediğiniz XML dosyalarını yazınız.]]></value>
+			<value xml:lang="vi"><![CDATA[Xin hãy chọn Data dưới dạng XML để đồng bộ hóa.]]></value>
+		</item>
+		<item name="12">
+			<value xml:lang="ko"><![CDATA[데이터를 이전 받을 대상 모듈을 선택해 주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please select the module you wish to import data.]]></value>
+			<value xml:lang="jp"><![CDATA[データ変換を行う対象モジュールを選択してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请选择要导入的对象模块。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請選擇要匯入的目標模組。]]></value>
+			<value xml:lang="fr"><![CDATA[Choisissez le module objectif dans lequel vous voulez tranférer les données.]]></value>
+			<value xml:lang="ru"><![CDATA[Пожалуйста, выберите модуль, в который Вы хотите импортировать данные.]]></value>
+			<value xml:lang="es"><![CDATA[Seleccione el módulo para transferir los datos.]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen içe aktarım yapmak istediğiniz modülü seçiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Xin hãy chọn Module bạn muốn lưu Data.]]></value>
+		</item>
+		<item name="121">
+			<value xml:lang="ko"><![CDATA[글:]]></value>
+			<value xml:lang="en"><![CDATA[Posts:]]></value>
+			<value xml:lang="jp"><![CDATA[書き込み:]]></value>
+			<value xml:lang="zh-CN"><![CDATA[主题:]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文章:]]></value>
+			<value xml:lang="ru"><![CDATA[запись:]]></value>
+			<value xml:lang="tr"><![CDATA[Gönderiler:]]></value>
+			<value xml:lang="vi"><![CDATA[Bài viết:]]></value>
+		</item>
+		<item name="122">
+			<value xml:lang="ko"><![CDATA[방명록:]]></value>
+			<value xml:lang="en"><![CDATA[Guestbook:]]></value>
+			<value xml:lang="jp"><![CDATA[ゲストブック:]]></value>
+			<value xml:lang="zh-CN"><![CDATA[留言本:]]></value>
+			<value xml:lang="zh-TW"><![CDATA[討論板:]]></value>
+			<value xml:lang="ru"><![CDATA[посетители:]]></value>
+			<value xml:lang="tr"><![CDATA[Misafir Defteri:]]></value>
+			<value xml:lang="vi"><![CDATA[Sổ lưu niệm:]]></value>
+		</item>
+		<item name="13">
+			<value xml:lang="ko"><![CDATA[데이터 이전을 할 대상 분류를 선택해주세요.]]></value>
+			<value xml:lang="en"><![CDATA[Please select the category you wish to import data.]]></value>
+			<value xml:lang="jp"><![CDATA[データ変換を行う対象カテゴリを選択してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请选择要导入的对象分类。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請選擇要匯入的目標分類。]]></value>
+			<value xml:lang="fr"><![CDATA[Choisissez la catégorie objective dans laquelle vous voulez transférer les données.]]></value>
+			<value xml:lang="ru"><![CDATA[Пожалуйста, выберите категорию назначения, в которую Вы хотите импортировать данные.]]></value>
+			<value xml:lang="es"><![CDATA[Seleccione la categoría para transferir los datos.]]></value>
+			<value xml:lang="tr"><![CDATA[Lütfen içe aktarım yapmak istediğiniz kategoriyi seçiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Xin hãy chọn chuyên mục để lưu Data.]]></value>
+		</item>
+		<item name="2">
+			<value xml:lang="ko"><![CDATA[이전할 데이터 XML파일의 경로를 입력해주세요.
+상대 또는 절대 경로를 입력하시면 됩니다.]]></value>
+			<value xml:lang="en"><![CDATA[Please input the XML file's location that contains data to import.
+You may input both the absolute and relative path.]]></value>
+			<value xml:lang="jp"><![CDATA[データ変換を行うXMLファイルパスを入力してください。同じアカウントのサーバ上では、相対または絶対パスを、異なるサーバにアップロードされている場合は「http://アドレス..」を入力してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[请输入要导入的XML文件的位置。
+可输入相对或绝对路径。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[請輸入要匯入的 XML 檔案位置。
+可輸入相對或絕對路徑。]]></value>
+			<value xml:lang="fr"><![CDATA[Entrez le chemin du fichier en XML pour transférer les données.
+S'il est localisé dans le même compte, entréz le chemin absolut ou relatif. Sinon, entrez l'URL commençant avec http://..]]></value>
+			<value xml:lang="ru"><![CDATA[Пожайлуста, введите расположение XML файла, который Вы хотите импортировать.
+Если он находится в одном аккаунте, то введите абсолютный/относительный путь. Если нет, то введите URL, начинающийся с http://...]]></value>
+			<value xml:lang="es"><![CDATA[Ingrese la ubicación del archivo XML para transfer los datos.
+Puede ser ruta absoluto o relativo.]]></value>
+			<value xml:lang="tr"><![CDATA[lütfen içe aktarılacak veriyi içeren XML dosyalarının konumunu giriniz.
+Kesin yol ve ilgili yol girebilirsiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Xin hãy nhập File Data dưới dạng XML để bắt đầu đồng bộ hóa.
+Hãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http://..]]></value>
+		</item>
+		<item name="3">
+			<value xml:lang="ko"><![CDATA[회원정보와 게시물 정보가 이전 후에 맞지 않을 수 있습니다. 이때 동기화를 하시면 user_id를 기반으로 올바르게 동작하도록 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Member and article data may not be corrected after the import. If so, please synchronize to recover them with user_id.]]></value>
+			<value xml:lang="jp"><![CDATA[会員情報と変換後の書き込みデータが一致しない場合があります。この場合は、同期化を行うと「user_id」をもとに正しく動作するようになります。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[数据导入后可能会导致会员信息和文章内容信息的误差。这时以user_id进行同步即可解决问题。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[資料匯入後，可能會導致會員資料和文章內容產生誤差。請以『user_id』進行同步即可解決。]]></value>
+			<value xml:lang="fr"><![CDATA[Les données des membres et ceux des articles peuvent ne pas s'accorder après la transfèrement. Dans ce cas, synchronisez S.V.P. Ça arrangera les données en étant basé sur le compte d'utilisateur.]]></value>
+			<value xml:lang="ru"><![CDATA[Данные пользователей и статей могут быть некорректны после импорта. В таком случае, выполните синхронизацию для восстановления, основанного на user_id.]]></value>
+			<value xml:lang="es"><![CDATA[La información del usuario y del documento podría ser incorrecto luego de la transferencia. Si ese es el caso, sincroniza para la corrección basado a la ID del usuario.]]></value>
+			<value xml:lang="tr"><![CDATA[Veri içe aktarımından sonra üye ve makale verileri doğru olmayabilir. Eğer böyleyse lütfen verileri doğru elde etmek için, kullanıcı_kimliğiyle (user_id) senkronize ediniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Đã không thể kết nối tới File Data thành viên và bài viết. Nếu đã đúng đường dẫn xin hãy kiểm tra Data với user_id.]]></value>
+		</item>
+		<item name="99">
+			<value xml:lang="ko"><![CDATA[데이터 이전중입니다.]]></value>
+			<value xml:lang="en"><![CDATA[Importing...]]></value>
+			<value xml:lang="jp"><![CDATA[データを変換しています。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[正在数据导入中...]]></value>
+			<value xml:lang="zh-TW"><![CDATA[資料匯入中...]]></value>
+			<value xml:lang="fr"><![CDATA[En train de transférer]]></value>
+			<value xml:lang="ru"><![CDATA[Идет процесс импортирования данных]]></value>
+			<value xml:lang="es"><![CDATA[데이터를 이전중입니다]]></value>
+			<value xml:lang="tr"><![CDATA[İçe Aktarılıyor...]]></value>
+			<value xml:lang="vi"><![CDATA[Đang đồng bộ hóa dữ liệu.]]></value>
+		</item>
+	</item>
+	<item name="xml_path">
+		<value xml:lang="ko"><![CDATA[XML 파일의 경로를 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the path of XML file.]]></value>
+		<value xml:lang="jp"><![CDATA[XMLファイルのパスを入力してください。]]></value>
+	</item>
+	<item name="path_info">
+		<value xml:lang="ko"><![CDATA[상대 경로와 절대 경로 모두 입력 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can enter either relative path or absolute path.]]></value>
+		<value xml:lang="jp"><![CDATA[相対パスと絶対パスを入力できます。]]></value>
+	</item>
+	<item name="data_destination">
+		<value xml:lang="ko"><![CDATA[데이터의 목적지를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select the destination of data.]]></value>
+		<value xml:lang="jp"><![CDATA[データの目的地を選択してください。]]></value>
+	</item>
+	<item name="document_destination">
+		<value xml:lang="ko"><![CDATA[글 데이터의 목적지를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select the destination of document data.]]></value>
+		<value xml:lang="en"><![CDATA[ドキュメントデータの目的地を選択してください。]]></value>
+	</item>
+	<item name="guestbook_destination">
+		<value xml:lang="ko"><![CDATA[방명록 데이터의 목적지를 선택하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select the destination of guestbook data.]]></value>
+		<value xml:lang="jp"><![CDATA[ゲストブックデータの目的地を選択してください。]]></value>
+	</item>
+	<item name="import_desc">
+		<value xml:lang="ko"><![CDATA[가상 사이트의 도메인을 입력한 후 <em>사이트 찾기</em>를 클릭하면 됩니다. 도메인을 빈 칸으로 남겨두면 모든 사이트의 목록을 보여줍니다.]]></value>
+		<value xml:lang="en"><![CDATA[Enter the domain of virtual site, and click <em>Find Site</em>. If you leave the domain field empty, list of all the sites is displayed.]]></value>
+	　　<value xml:lang="jp"><![CDATA[仮想サイトのドメインを入力し、<em>サイト検索</em>をクリックします。ドメインを空欄にしておくと、すべてのサイトのリストを表示します。]]></value>
+	</item>
+	<item name="msg_sync_member">
+		<value xml:lang="ko"><![CDATA[동기화 버튼을 클릭하시면 회원정보와 게시물 정보의 동기화를 시작합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please click on Synchronize button to start data synchronization.]]></value>
+		<value xml:lang="jp"><![CDATA[同期化ボタンをクリックすると会員情報と書き込みデータの情報の同期化が始まります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[按同步按钮即可开始对会员信息和文章信息进行同步。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[按同步按鈕，即可開始進行會員資料和文章的同步。]]></value>
+		<value xml:lang="fr"><![CDATA[On commencera à synchroniser les données des membres et des articles quand vous cliquez le bouton de synchroniser.]]></value>
+		<value xml:lang="ru"><![CDATA[Синхронизация данных пользователей и статей начнется по нажатию книпоки "Синхронизировать".]]></value>
+		<value xml:lang="es"><![CDATA[Al presionar el botón sincronizar comenzará a sincronizar la información del usuario y la del artículo.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen senkronizasyonu başlatmak için Senkronizasyon düğmesine basınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Data thành viên và bài viết sẽ được đồng bộ hóa sau khi bấm "Đồng bộ".]]></value>
+	</item>
+	<item name="found_xml_file">
+		<value xml:lang="ko"><![CDATA[XML 파일을 찾았습니다.]]></value>
+		<value xml:lang="en"><![CDATA[found XML file]]></value>
+	</item>
+	<item name="not_found_xml_file">
+		<value xml:lang="ko"><![CDATA[XML 파일을 찾을 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Can not found XML file]]></value>
+	</item>
+	<item name="cannot_allow_fopen_in_phpini">
+		<value xml:lang="ko"><![CDATA[php.ini 환경설정에서 원격지의 파일을 열지 못하도록 되어 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Can not found XML file]]></value>
+	</item>
+	<item name="cannot_url_file">
+		<value xml:lang="ko"><![CDATA[원격지의 파일을 열지 못하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Can not found XML file]]></value>
+	</item>
+	<item name="cmd_check_path">
+		<value xml:lang="ko"><![CDATA[경로 확인]]></value>
+		<value xml:lang="en"><![CDATA[Check the path]]></value>
+		<value xml:lang="jp"><![CDATA[パス確認]]></value>
+	</item>
+	<item name="msg_exist_xml_file">
+		<value xml:lang="ko"><![CDATA[XML 파일을 찾았습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Found the XML file.]]></value>
+		<value xml:lang="jp"><![CDATA[XMLファイルが見つかりました。]]></value>
+	</item>
+	<item name="msg_no_xml_file">
+		<value xml:lang="ko"><![CDATA[XML파일을 찾을 수 없습니다. 경로를 다시 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Could not find the XML file. Please check the path again]]></value>
+		<value xml:lang="jp"><![CDATA[XMLファイルが見つかりません。パスをもう一度確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[找不到XML文件，请重新确认路径。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到 XML 檔案，請重新確認路徑。]]></value>
+		<value xml:lang="fr"><![CDATA[On ne peut pas trouver le fichier de XML. Vérifiez le chemin encore une fois, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[XML файл не найден. Пожалуйста, проверьте путь еще раз]]></value>
+		<value xml:lang="es"><![CDATA[No se puede encontrar el archivo XML. Verifique su ruta.]]></value>
+		<value xml:lang="tr"><![CDATA[XML dosyası bulunamadı. Lütfen yol doğrumu diye tekrar kontrol ediniz]]></value>
+		<value xml:lang="vi"><![CDATA[Không tìm yhấy File XML. Xin hãy kiểm tra lại đường dẫn!]]></value>
+	</item>
+	<item name="msg_invalid_xml_file">
+		<value xml:lang="ko"><![CDATA[잘못된 형식의 XML 파일입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid type of XML file.]]></value>
+		<value xml:lang="jp"><![CDATA[XMLファイルのフォーマットが正しくありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[错误形式的XML文件！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XML檔案格式錯誤！]]></value>
+		<value xml:lang="fr"><![CDATA[Ce fichier de XML est invalide.]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный тип XML файла.]]></value>
+		<value xml:lang="es"><![CDATA[Tipo de archivo XML inválido.]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz tür XML dosyası.]]></value>
+		<value xml:lang="vi"><![CDATA[Định dạng File XML không hợp lệ.]]></value>
+	</item>
+	<item name="msg_importing">
+		<value xml:lang="ko"><![CDATA[%d개의 데이터 중 %d개를 입력중입니다. (계속 멈추어 있으면 "계속진행" 버튼을 클릭해주세요.)]]></value>
+		<value xml:lang="en"><![CDATA[Import %d items out of %d. (if process is stopped, click on Continue button)]]></value>
+		<value xml:lang="jp"><![CDATA[%d個のデータの内、%d個を変換しています。(止まったままの場合は「続ける」ボタンをクリックしてください）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[%d个的数据中正在输入 %d个。 （长时间没有响应时请按“继续进行”按钮）]]></value>
+		<value xml:lang="zh-TW"><![CDATA[%d個的資料中正在輸入 %d 個。(長時間沒有回應時，請按「繼續進行」按鈕)]]></value>
+		<value xml:lang="fr"><![CDATA[On écrit %d données sur %d. (Si c'est arrêté longtemps, cliquez le bouton "Continuer")]]></value>
+		<value xml:lang="ru"><![CDATA[Пишем %d данные %d. (Если процесс "завис", нажмите кнопку "Продолжить")]]></value>
+		<value xml:lang="es"><![CDATA[Ingresando %d dotos de %d. (Si esto mantiene paralizado presione el botón "Continuar".)]]></value>
+		<value xml:lang="tr"><![CDATA[%d ögelerini %d 'den alarak içeri aktar. (eğer işlem durduysa, Devam tuşuna basınız)]]></value>
+		<value xml:lang="vi"><![CDATA[Đang gửi %d Data của %d. (Nếu việc gửi Data không tiếp tục chạy, hãy bấm "Tiếp tục")]]></value>
+	</item>
+	<item name="msg_import_finished">
+		<value xml:lang="ko"><![CDATA[%d/%d 개의 데이터 입력이 완료되었습니다. 상황에 따라 입력되지 못한 데이터가 있을 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d/%d items were imported completely. There could be some items that were imported improperly.]]></value>
+		<value xml:lang="jp"><![CDATA[%d/%d個のデータ変換が完了しました。場合によって変換されていないデータがあることもあります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已完成输入%d/%d个数据。根据情况的不同可能有没有被导入的数据。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已完成輸入 %d/%d 個資料。根據情況的不同，可能會出現沒有被匯入的資料。]]></value>
+		<value xml:lang="fr"><![CDATA[%d/%d données sont entrées complètement. En dépendant sur la situation, il y aura quelques données qui n'ont pas été entrées.]]></value>
+		<value xml:lang="ru"><![CDATA[%d/%d данные были поностью импортированы. В зависимости от ситуации, некоторые данные могут не быть импортированы.]]></value>
+		<value xml:lang="es"><![CDATA[%d/%d datos fueron completamente ingresados. Dependiendo del caso, pueden haber algunos datos no ingresados.]]></value>
+		<value xml:lang="tr"><![CDATA[%d/%d ögeleri başarıyla içe aktarıldı. Bazı ögeler düzgün bir şekilde içe aktarılmamış olabilir.]]></value>
+		<value xml:lang="vi"><![CDATA[%d/%d của Data đã được đồng bộ thành công. Một số nội dung đã không thể đồng bộ.]]></value>
+	</item>
+	<item name="msg_sync_completed">
+		<value xml:lang="ko"><![CDATA[회원과 게시물, 댓글의 동기화가 완료되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Completed synchronzing member article and comments.]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報、書き込みデータ、コメントのデータの同期化（変換）が完了しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已完成会员和文章，评论的同步。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已完成會員和文章，評論的同步。]]></value>
+		<value xml:lang="fr"><![CDATA[On a terminé de synchroniser les données des membres, des articles et des commentaires.]]></value>
+		<value xml:lang="ru"><![CDATA[Выполнена синхронизация пользователей, статей и комментариев.]]></value>
+		<value xml:lang="es"><![CDATA[Sincronización del usuario, artículo y respuestas finalizadas.]]></value>
+		<value xml:lang="tr"><![CDATA[Üye, makale ve yorumların senkronizasyonu tamamlandı.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã đồng bộ Data thành công.]]></value>
+	</item>
+	<item name="about_type_member">
+		<value xml:lang="ko"><![CDATA[데이터 이전 대상이 회원정보일 경우 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[If you are to import a member data, please select this option]]></value>
+		<value xml:lang="jp"><![CDATA[データ変換の対象が会員情報の場合は選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据导入对象为会员信息时请选择此项。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料匯入目標為會員資料時，請選擇此項。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez cette option si vous voulez transférer les informations des membres]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы импортируете информацию пользователей, выберите эту опцию]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione esta opción si estas transferiendo la información del usuario.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer üye verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn này sẽ đồng bộ Data thành viên.]]></value>
+	</item>
+	<item name="about_type_message">
+		<value xml:lang="ko"><![CDATA[데이터 이전 대상이 쪽지(메시지)일 경우 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[If you are to import a message data, please select this option]]></value>
+		<value xml:lang="jp"><![CDATA[データ移転対象がメッセージの場合に選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据导入对象为短信息(MemoBox)时请选择此项。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料匯入目標為短訊息時，請選擇此項。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez cette option si vous voulez transférer les informations des messages]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите, если импортируются данные сообщения]]></value>
+		<value xml:lang="es"><![CDATA[Si está transfiriendo la información de mensajes, seleccione esta opción]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer mesaj verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn này đồng bộ Data tin nhắn.]]></value>
+	</item>
+	<item name="about_type_ttxml">
+		<value xml:lang="ko"><![CDATA[데이터 이전 대상이 TTXML(textcube계열)일 경우 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[If you are to import a TTXML (textcube) data, please select this option]]></value>
+		<value xml:lang="jp"><![CDATA[データ移転対象が、TTXML(textcube系列)の場合に選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据导入对象为TTXML(textcube系列)时请选择此项。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料匯入目標為 TTXML (textcube系列)時，請選擇此項。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez cette option si vous voulez transférer les informations des TTXML(textcube)]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите, если импортируются данные TTXML]]></value>
+		<value xml:lang="es"><![CDATA[	Si está transfiriendo la TTXML (textcube) información, seleccione esta opción]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer TTXML (textcube) verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn này sẽ đồng bộ và chuyển đổi Data của Textcube.]]></value>
+	</item>
+	<item name="about_ttxml_user_id">
+		<value xml:lang="ko"><![CDATA[글쓴이로 설정할 사용자 아이디를 입력해주세요. (가입된 아이디만 가능)]]></value>
+		<value xml:lang="en"><![CDATA[Please input a user ID to set as author of the TTXML data. (user ID must be already signed up.)]]></value>
+		<value xml:lang="jp"><![CDATA[TTXML移転時に投稿者として指定するユーザーIDを入力してください（すでに加入されているIDでなければなりません）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入导入TTXML数据时指定为主题发布者的ID(必须是已注册会员)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入匯入 TTXML 資料時，指定為主題發表者的 ID (必須是已註冊會員)。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le compte d'utilisateur pour déclarer comme l'auteur. (Le compte d'utilisateur doit être déjà inscrit)]]></value>
+		<value xml:lang="ru"><![CDATA[Введите ID указанного пользователя, сделавшего запись при импортировании данных TTXML. (Пользователь должен быть зарегистрирован)]]></value>
+		<value xml:lang="es"><![CDATA[Por favor, de entrada ID de usuario establecer como autor de la transferencia de TTXML. (Identificación de usuario debe ser firmado ya en marcha)]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen TTXML veri yazarı atamak için kullanıcı kimliği(ID) giriniz. (kullanıcı kimliği, kayıtlı kullanıcıya ait olmalıdır)]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập ID sẽ hiển thị là tác giả của những bài viết sau khi Data được chuyển đổi từ TTXML. (ID này phải là thành viên đã đăng kí.)]]></value>
+	</item>
+	<item name="about_type_module">
+		<value xml:lang="ko"><![CDATA[데이터 이전 대상이 게시판 등의 게시물 정보일 경우 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[If you are to import an article data, please select this option]]></value>
+		<value xml:lang="jp"><![CDATA[データ変換の対象が書き込みデータである場合は選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据导入对象为版面主题时请选择此项。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料匯入目標為討論板主題時，請選擇此項。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez cette option si vous voulez transférer les informations des panneaux ou des articles.]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы импортируете информацию форума или записей, выберите эту опцию]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione esta opción si estas transfeririendo información del documento de los tableros]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer makale verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn này sẽ đồng bộ và chuyển đổi các trang và bài viết.]]></value>
+	</item>
+	<item name="about_type_syncmember">
+		<value xml:lang="ko"><![CDATA[회원정보와 게시물정보 등을 이전 후, 회원정보를 동기화해야 할 때 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[If you are to import and synchronize member and article data, please select this option.]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報と書き込みデータなどの変換を行った後、会員情報を同期化する必要がある場合は、選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导入会员信息和文章信息后需要同步会员信息时请选择此项。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[匯入會員和文章資料後，需要同步會員資料時，請選擇此項。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez cette option si vous voulez synchroniser les informations des membres après le transfér des informations des membres et des articles.]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы пытаетесь синхронизировать информацию пользователей после импорта информации пользователей и записей, выберите эту опцию]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione esta opción cuando tenga que sincronizar la información del usuario luego de haber transferido la información del usuario y del artículo.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer üye ve makale verisi içe aktarıp senkronize edecekseniz, lütfen bu seçeneği seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Lựa chọn này sẽ đồng bộ thông tin thành viên trước khi đồng bộ Bài viết và thành viên.]]></value>
+	</item>
+	<item name="about_importer">
+		<value xml:lang="ko"><![CDATA[다른 프로그램의 데이터를 XE 데이터로 이전할 수 있습니다. 이전을 위해서는 <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Exporter</a>를 이용해서 원하는 데이터를 XML파일로 생성 후 업로드해주셔야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Data Importer will help you import Zeroboard4, Zeroboard5 Beta or other program's data into XE.
+In order to import, you first have to use <a href="http://svn.xpressengine.net/migration/" onclick="winopen(this.href);return false;">XML Exporter</a> to convert the data you want into XML File.]]></value>
+		<value xml:lang="jp"><![CDATA[ゼロボード4、zb5betaまたは他のプログラムの書き込みデータをXEのデータに変換することができます。
+変換するためには、<a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Exporter</a>を利用して変換したい書き込みデータをXMLファイルで作成してアップロードしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不仅可以导入Zeroboard 4，Zb5beta的数据,也可以把其他程序数据导入到XE当中。
+导入数据时请利用 <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Exporter</a>生成XML文件后再上传。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不僅可以匯入 Zeroboard 4，Zb5beta 的資料，也能夠把其他程式資料匯入到 XE 當中。
+匯入資料時，請利用 <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Exporter</a> 建立 XML 檔案後再上傳。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez transférer les données de Zeroboard4, de Zeroboard5 Beta ou d'autres logiciels aux données de XE.
+Pour transférer, vous devez utiliser <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">Exporteur de XML</a> pour convertir les données en fichier de XML, et puis téléchargez-le.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете импортировать данные Zeroboard4, Zeroboard5 Beta или других программ в XE.
+Чтобы импортировать, Вам следует использовать <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Экспортер (XML Exporter)</a>, чтобы конвертировать нужные данные в XML Файл и затем загрузить его.]]></value>
+		<value xml:lang="es"><![CDATA[Es posible trasferir los datos de Zeroboard4, zb5beta o de otros programas a XE.
+Para la transferencia debe utilizar <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Exporter</a> para transformar los datos en archivo XML, y luego subir ese archivo.]]></value>
+		<value xml:lang="tr"><![CDATA[Veri Alıcısı XE'ye, Zeroboard4, Zeroboard5 Beta veya başka programların verilerini aktarmada yardımcı olacaktır.
+İçe aktarımı gerçekleştirebilmek için öncelikle <a href="http://svn.xpressengine.net/migration/" onclick="winopen(this.href);return false;">XML DışAktarımcı</a>'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chuyển Data từ Zeroboard4, Zeroboard5 Beta hay Data của những mã nguồn khác vào Data của XE.
+Để hiểu rõ hơn công việc này, bạn có thể tham khảo cách chuyển đổi Data của bạn vào XE khi bạn đã Upload chúng tại <a href="http://svn.xpressengine.com/zeroboard_xe/migration_tools/" onclick="winopen(this.href);return false;">XML Exporter</a>.]]></value>
+	</item>
+	<item name="about_target_path">
+		<value xml:lang="ko"><![CDATA[첨부 파일을 받기 위해 제로보드4가 설치된 위치를 입력해주세요.
+같은 서버에 있을 경우 /home/아이디/public_html/bbs 등과 같이 제로보드4의 위치를 입력하시고
+다른 서버일 경우 http:도메인/bbs 처럼 제로보드4가 설치된 곳의 url을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[To get attachments from Zeroboard4, please input the path where Zeroboard4 is installed.
+If it is located in the same server, please input Zeroboard4's path such as /home/USERID/public_html/bbs
+If not, please input the address where Zeroboard4 is installed. ex. http://Domain/bbs]]></value>
+		<value xml:lang="jp"><![CDATA[添付ファイルをダウンロードするためには、ゼロボード4がインストールされた場所を入力してください。同じサーバ上にある場合は「/home/ID/public_html/bbs」のように入力し、他のサーバにある場合は、「http://ドメイン/bbs」のようにゼロボードがインストールされているURLを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[为了下载附件请输入Zeroboard 4的安装位置。
+位置在同一个服务器时，请输入如 /home/id/public_html/bbs的路径,在不同服务器时，请输入如 http://域名/bbs的url地址。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[為了下載附檔請輸入 Zeroboard 4 的安裝位置。
+位置在同一個主機時，請輸入如『/home/id/public_html/bbs』的路徑，在不同主機時，請輸入如『http://域名/bbs』的 URL 網址。]]></value>
+		<value xml:lang="fr"><![CDATA[Pour obtenir les attachés de Zeroboard4, Entrez l'adresse où Zeroboard4 est installé.
+Si elle se trouve dans le même serveur, entrez le chemin comme '/home/USERID/public_html/bbs'
+Si elle ne se trouve pas dans le même serveur, entrez l'adresse où Zeroboard4 est installé comme 'http://Domain/bbs']]></value>
+		<value xml:lang="ru"><![CDATA[Чтобы получить вложения с Zeroboard4, пожалуйста, введите адрес, где установлена  Zeroboard4.
+Если она раположена на том же сервере, введите путь к Zeroboard4 как /home/USERID/public_html/bbs
+Если нет, введите адрес, где Zeroboard4 установлена. Например: http://Domain/bbs]]></value>
+		<value xml:lang="es"><![CDATA[Para descargar los archivos adjuntos de ZeroBoard4, ingresa la ubicación de ZeroBoard4 instalado.
+Si esta en el mismo servidor escriba la ubicación de ZeroBoard4 como por ejemplo: /home/ID/public_html/bbs o si esta en otro servidor escriba la ubicación de ZeroBoard4 instalado como por ejemplo: http://dominio/bbs]]></value>
+		<value xml:lang="tr"><![CDATA[Zeroboard4'ten ekler almak için, Zeroboard4'ün kurulu olduğu yolu giriniz.
+Eğer aynı sunucuda konumlandırılmışsa, lütfen Zeroboard4'ün yolunu bu şekilde giriniz : /home/USERID/public_html/bbs
+Eğer aynı sunucuda değilse, lütfen Zeroboard4'ün kurulu olduğu adresi giriniz. örn. http://Domain/bbs]]></value>
+		<value xml:lang="vi"><![CDATA[Để lấy cả File đính kèm tại Zeroboard4, bạn hãy nhập địa chỉ mà đã cài đặt Zeroboard4.
+Nếu nó cùng nằm trên một Server, hãy nhập đầy đủ đường dẫn thư mục cài đặt của Zeroboard4. Ví dụ: <b>/home/USERID/public_html/bbs</b>
+Nếu khác Server, hãy nhập địa chỉ của Zeroboard4 đã cài đặt. Ví dụ: <b>http://Domain/bbs</b>]]></value>
+	</item>
+</lang>
diff --git a/modules/importer/lang/ru.lang.php b/modules/importer/lang/ru.lang.php
deleted file mode 100644
index 8c99c384e..000000000
--- a/modules/importer/lang/ru.lang.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    // слова для кнопок
-    $lang->cmd_sync_member = 'Синхронизировать';
-    $lang->cmd_continue = 'Продолжить';
-    $lang->preprocessing = 'Идет подготовка для импортирования данных...';
-
-    // объекты
-    $lang->importer = 'Импортировать данные zeroboard';
-    $lang->source_type = 'Предыдущее назначение';
-    $lang->type_member = 'Данные пользователей';
-    $lang->type_message = 'Данные сообщения';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = 'Данные статьи';
-    $lang->type_syncmember = 'Синхронизировать данные пользователей';
-    $lang->target_module = 'Модуль назначения';
-    $lang->xml_file = 'XML файл';
-
-    $lang->import_step_title = array(
-        1 => 'Шаг 1. Выберите предыдущее назначение',
-        12 => 'Шаг 1-2. Выберите модуль назначения',
-        13 => 'Шаг 1-3. Выберите категорию назначения',
-        2 => 'Шаг 2. Загрузить XML файл',
-        3 => 'Шаг 2. Синхронизировать данные пользователей и статей',
-        99 => 'Импортировать данные',
-    );
-
-    $lang->import_step_desc = array(
-        1 => 'Пожалуйста, выберите тип XML файла, который Вы хотите импортировать.',
-        12 => 'Пожалуйста, выберите модуль, в который Вы хотите импортировать данные.',
-        121 => 'запись:',
-        122 => 'посетители:',
-        13 => 'Пожалуйста, выберите категорию назначения, в которую Вы хотите импортировать данные.',
-        2 => "Пожайлуста, введите расположение XML файла, который Вы хотите импортировать.\nЕсли он находится в одном аккаунте, то введите абсолютный/относительный путь. Если нет, то введите URL, начинающийся с http://...",
-        3 => 'Данные пользователей и статей могут быть некорректны после импорта. В таком случае, выполните синхронизацию для восстановления, основанного на user_id.',
-        99 => 'Идет процесс импортирования данных',
-    );
-
-    // гид/алерт
-    $lang->msg_sync_member = 'Синхронизация данных пользователей и статей начнется по нажатию книпоки "Синхронизировать".';
-    $lang->msg_no_xml_file = 'XML файл не найден. Пожалуйста, проверьте путь еще раз';
-    $lang->msg_invalid_xml_file = 'Неверный тип XML файла.';
-    $lang->msg_importing = 'Пишем %d данные %d. (Если процесс "завис", нажмите кнопку "Продолжить")';
-    $lang->msg_import_finished = '%d/%d данные были поностью импортированы. В зависимости от ситуации, некоторые данные могут не быть импортированы.';
-    $lang->msg_sync_completed = 'Выполнена синхронизация пользователей, статей и комментариев.';
-
-    // blah blah.. чепуха)
-    $lang->about_type_member = 'Если Вы импортируете информацию пользователей, выберите эту опцию';
-    $lang->about_type_message = 'Выберите, если импортируются данные сообщения';
-    $lang->about_type_ttxml = 'Выберите, если импортируются данные TTXML';
-    $lang->about_ttxml_user_id = 'Введите ID указанного пользователя, сделавшего запись при импортировании данных TTXML. (Пользователь должен быть зарегистрирован)';
-    $lang->about_type_module = 'Если Вы импортируете информацию форума или записей, выберите эту опцию';
-    $lang->about_type_syncmember = 'Если Вы пытаетесь синхронизировать информацию пользователей после импорта информации пользователей и записей, выберите эту опцию';
-    $lang->about_importer = "Вы можете импортировать данные Zeroboard4, Zeroboard5 Beta или других программ в XE.\nЧтобы импортировать, Вам следует использовать <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Экспортер (XML Exporter)</a>, чтобы конвертировать нужные данные в XML Файл и затем загрузить его.";
-
-    $lang->about_target_path = "Чтобы получить вложения с Zeroboard4, пожалуйста, введите адрес, где установлена  Zeroboard4.\nЕсли она раположена на том же сервере, введите путь к Zeroboard4 как /home/USERID/public_html/bbs\nЕсли нет, введите адрес, где Zeroboard4 установлена. Например: http://Domain/bbs";
-?>
diff --git a/modules/importer/lang/tr.lang.php b/modules/importer/lang/tr.lang.php
deleted file mode 100644
index b613e2e4b..000000000
--- a/modules/importer/lang/tr.lang.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author nicetwo (supershop@naver.com)
-     * @brief basic english language pack of Importer
-     **/
-
-    // words for button
-    $lang->cmd_sync_member = 'Senkronize';
-    $lang->cmd_continue = 'Devam Et';
-    $lang->preprocessing = 'Zeroboard içe aktarım için hazırlanıyor.';
-
-    // items
-    $lang->importer = 'Zeroboard Veri Alıcısı';
-    $lang->source_type = 'Geçiş Hedefi';
-    $lang->type_member = 'Üye Verisi';
-    $lang->type_message = 'Mesaj Verisi';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = 'Makale Verisi';
-    $lang->type_syncmember = 'Üye Verisini Senkronize et';
-    $lang->target_module = 'Hedef Modül';
-    $lang->xml_file = 'XML Dosyası';
-
-    $lang->import_step_title = array(
-        1 => '1. adım Geçiş Hedefi',
-        12 => '1-2. adım Hedef Modül',
-        13 => '1-3. adım Hedef Kategori',
-        2 => '2. adım XML Dosya Konumu',
-        3 => '2. adım Üye ve Makale Verilerini Senkronize Et',
-        99 => 'Veri İçeri Aktarılıyor',
-    );
-
-    $lang->import_step_desc = array(
-        1 => 'Lütfen içe aktarmak istediğiniz XML dosyalarını yazınız.',
-        12 => 'Lütfen içe aktarım yapmak istediğiniz modülü seçiniz.',
-        121 => 'Gönderiler:',
-        122 => 'Misafir Defteri:',
-        13 => 'Lütfen içe aktarım yapmak istediğiniz kategoriyi seçiniz.',
-        2 => "lütfen içe aktarılacak veriyi içeren XML dosyalarının konumunu giriniz.\nKesin yol ve ilgili yol girebilirsiniz.",
-        3 => 'Veri içe aktarımından sonra üye ve makale verileri doğru olmayabilir. Eğer böyleyse lütfen verileri doğru elde etmek için, kullanıcı_kimliğiyle (user_id) senkronize ediniz.',
-        99 => 'İçe Aktarılıyor...',
-    );
-
-    // guide/alert
-    $lang->msg_sync_member = 'Lütfen senkronizasyonu başlatmak için Senkronizasyon düğmesine basınız.';
-    $lang->msg_no_xml_file = 'XML dosyası bulunamadı. Lütfen yol doğrumu diye tekrar kontrol ediniz';
-    $lang->msg_invalid_xml_file = 'Geçersiz tür XML dosyası.';
-    $lang->msg_importing = '%d ögelerini %d \'den alarak içeri aktar. (eğer işlem durduysa, Devam tuşuna basınız)';
-    $lang->msg_import_finished = '%d/%d ögeleri başarıyla içe aktarıldı. Bazı ögeler düzgün bir şekilde içe aktarılmamış olabilir.';
-    $lang->msg_sync_completed = 'Üye, makale ve yorumların senkronizasyonu tamamlandı.';
-
-    // blah blah..
-    $lang->about_type_member = 'Eğer üye verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz';
-    $lang->about_type_message = 'Eğer mesaj verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz';
-    $lang->about_type_ttxml = 'Eğer TTXML (textcube) verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz';
-	$lang->about_ttxml_user_id = 'Lütfen TTXML veri yazarı atamak için kullanıcı kimliği(ID) giriniz. (kullanıcı kimliği, kayıtlı kullanıcıya ait olmalıdır)';
-    $lang->about_type_module = 'Eğer makale verisi içe aktaracaksanız, lütfen bu seçeneği seçiniz';
-    $lang->about_type_syncmember = 'Eğer üye ve makale verisi içe aktarıp senkronize edecekseniz, lütfen bu seçeneği seçiniz';
-    $lang->about_importer = "Veri Alıcısı XE'ye, Zeroboard4, Zeroboard5 Beta veya başka programların verilerini aktarmada yardımcı olacaktır.\nİçe aktarımı gerçekleştirebilmek için öncelikle <a href=\"http://svn.xpressengine.net/migration/\" onclick=\"winopen(this.href);return false;\">XML DışAktarımcı</a>'yı kullanıp istediğiniz veriyi XML türüne çevirmelisiniz.";
-
-    $lang->about_target_path = "Zeroboard4\'ten ekler almak için, Zeroboard4\'ün kurulu olduğu yolu giriniz.\nEğer aynı sunucuda konumlandırılmışsa, lütfen Zeroboard4\'ün yolunu bu şekilde giriniz : /home/USERID/public_html/bbs\nEğer aynı sunucuda değilse, lütfen Zeroboard4\'ün kurulu olduğu adresi giriniz. örn. http://Domain/bbs";
-?>
diff --git a/modules/importer/lang/vi.lang.php b/modules/importer/lang/vi.lang.php
deleted file mode 100644
index edc4b8788..000000000
--- a/modules/importer/lang/vi.lang.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    // words for button
-    $lang->cmd_sync_member = 'Đồng bộ hóa';
-    $lang->cmd_continue = 'Tiếp tục';
-    $lang->preprocessing = 'Đang chuẩn bị cho việc chuyển dữ liệu.';
-
-    // items
-    $lang->importer = 'Chuyển Zeroboard Data';
-    $lang->source_type = 'Chọn nguồn';
-    $lang->type_member = 'Data Thành viên';
-    $lang->type_message = 'Data Tin nhắn';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = 'Data Bài viết';
-    $lang->type_syncmember = 'Đồng bộ hóa Data Thành viên';
-    $lang->target_module = 'Module';
-    $lang->xml_file = 'File XML';
-
-    $lang->import_step_title = array(
-        1 => 'Bước 1. Lựa chọn đường dẫn',
-        12 => 'Bước 1-2. Chọn Module',
-        13 => 'Bước 1-3. Chọn chuyên đề',
-        2 => 'Bước 2. Upload File XML',
-        3 => 'Bước 2. Đồng bộ hóa Data thành viên và Data bài viết',
-        99 => 'Đang đồng bộ hóa dữ liệu.',
-    );
-
-    $lang->import_step_desc = array(
-        1 => 'Xin hãy chọn Data dưới dạng XML để đồng bộ hóa.',
-        12 => 'Xin hãy chọn Module bạn muốn lưu Data.',
-        121 => 'Bài viết:',
-        122 => 'Sổ lưu niệm:',
-        13 => 'Xin hãy chọn chuyên mục để lưu Data.',
-        2 => "Xin hãy nhập File Data dưới dạng XML để bắt đầu đồng bộ hóa.\nHãy nhập đường dẫn cho File chứa Data trên Host dưới dạng http://..",
-        3 => 'Đã không thể kết nối tới File Data thành viên và bài viết. Nếu đã đúng đường dẫn xin hãy kiểm tra Data với user_id.',
-        99 => 'Đang đồng bộ hóa dữ liệu.',
-    );
-
-    // guide/alert
-    $lang->msg_sync_member = 'Data thành viên và bài viết sẽ được đồng bộ hóa sau khi bấm "Đồng bộ".';
-    $lang->msg_no_xml_file = 'Không tìm yhấy File XML. Xin hãy kiểm tra lại đường dẫn!';
-    $lang->msg_invalid_xml_file = 'Định dạng File XML không hợp lệ.';
-    $lang->msg_importing = 'Đang gửi %d Data của %d. (Nếu việc gửi Data không tiếp tục chạy, hãy bấm "Tiếp tục")';
-    $lang->msg_import_finished = '%d/%d của Data đã được đồng bộ thành công. Một số nội dung đã không thể đồng bộ.';
-    $lang->msg_sync_completed = 'Đã đồng bộ Data thành công.';
-
-    // blah blah..
-    $lang->about_type_member = 'Lựa chọn này sẽ đồng bộ Data thành viên.';
-    $lang->about_type_message = 'Lựa chọn này đồng bộ Data tin nhắn.';
-    $lang->about_type_ttxml = 'Lựa chọn này sẽ đồng bộ và chuyển đổi Data của Textcube.';
-	$lang->about_ttxml_user_id = 'Xin hãy nhập ID sẽ hiển thị là tác giả của những bài viết sau khi Data được chuyển đổi từ TTXML. (ID này phải là thành viên đã đăng kí.)';
-    $lang->about_type_module = 'Lựa chọn này sẽ đồng bộ và chuyển đổi các trang và bài viết.';
-    $lang->about_type_syncmember = 'Lựa chọn này sẽ đồng bộ thông tin thành viên trước khi đồng bộ Bài viết và thành viên.';
-    $lang->about_importer = "Bạn có thể chuyển Data từ Zeroboard4, Zeroboard5 Beta hay Data của những mã nguồn khác vào Data của XE.\nĐể hiểu rõ hơn công việc này, bạn có thể tham khảo cách chuyển đổi Data của bạn vào XE khi bạn đã Upload chúng tại <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>.";
-
-    $lang->about_target_path = "Để lấy cả File đính kèm tại Zeroboard4, bạn hãy nhập địa chỉ mà đã cài đặt Zeroboard4.\nNếu nó cùng nằm trên một Server, hãy nhập đầy đủ đường dẫn thư mục cài đặt của Zeroboard4. Ví dụ: <b>/home/USERID/public_html/bbs</b>\nNếu khác Server, hãy nhập địa chỉ của Zeroboard4 đã cài đặt. Ví dụ: <b>http://Domain/bbs</b>";
-?>
diff --git a/modules/importer/lang/zh-CN.lang.php b/modules/importer/lang/zh-CN.lang.php
deleted file mode 100644
index 144c85b06..000000000
--- a/modules/importer/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Importer(importer) 模块语言包
-     **/
-
-    // 按钮上使用的语言
-    $lang->cmd_sync_member = '同步';
-    $lang->cmd_continue = '继续进行';
-    $lang->preprocessing = '正准备数据导入...';
-
-    // 项目
-    $lang->importer = '数据导入';
-    $lang->source_type = '导入对象';
-    $lang->type_member = '会员信息';
-    $lang->type_message = '短信息(MemoBox)';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = '版面信息';
-    $lang->type_syncmember = '同步会员信息';
-    $lang->target_module = '模块对象';
-    $lang->xml_file = 'XML文件';
-
-    $lang->import_step_title = array(
-        1 => 'Step 1. 选择导入对象',
-        12 => 'Step 1-2. 选择模块对象',
-        13 => 'Step 1-3. 选择对象分类',
-        2 => 'Step 2. XML文件',
-        3 => 'Step 2. 同步会员信息和文章信息',
-        99 => '数据导入',
-    );
-
-    $lang->import_step_desc = array(
-        1 => '请选择要导入的XML文件种类。',
-        12 => '请选择要导入的对象模块。',
-        121 => '主题:',
-        122 => '留言本:',
-        13 => '请选择要导入的对象分类。',
-        2 => "请输入要导入的XML文件的位置。\n可输入相对或绝对路径。",
-        3 => '数据导入后可能会导致会员信息和文章内容信息的误差。这时以user_id进行同步即可解决问题。',
-        99 => '正在数据导入中...',
-    );
-
-    // 信息/提示
-    $lang->msg_sync_member = '按同步按钮即可开始对会员信息和文章信息进行同步。';
-    $lang->msg_no_xml_file = '找不到XML文件，请重新确认路径。';
-    $lang->msg_invalid_xml_file = '错误形式的XML文件！';
-    $lang->msg_importing = '%d个的数据中正在输入 %d个。 （长时间没有响应时请按“继续进行”按钮）';
-    $lang->msg_import_finished = '已完成输入%d/%d个数据。根据情况的不同可能有没有被导入的数据。';
-    $lang->msg_sync_completed = '已完成会员和文章，评论的同步。';
-
-    // 说明
-    $lang->about_type_member = '数据导入对象为会员信息时请选择此项。';
-    $lang->about_type_message = '数据导入对象为短信息(MemoBox)时请选择此项。';
-    $lang->about_type_ttxml = '数据导入对象为TTXML(textcube系列)时请选择此项。';
-    $lang->about_ttxml_user_id = '请输入导入TTXML数据时指定为主题发布者的ID(必须是已注册会员)。';
-    $lang->about_type_module = '数据导入对象为版面主题时请选择此项。';
-    $lang->about_type_syncmember = '导入会员信息和文章信息后需要同步会员信息时请选择此项。';
-    $lang->about_importer = "不仅可以导入Zeroboard 4，Zb5beta的数据,也可以把其他程序数据导入到XE当中。\n导入数据时请利用 <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a>生成XML文件后再上传。";
-    $lang->about_target_path = "为了下载附件请输入Zeroboard 4的安装位置。\n位置在同一个服务器时，请输入如 /home/id/public_html/bbs的路径,在不同服务器时，请输入如 http://域名/bbs的url地址。";
-?>
diff --git a/modules/importer/lang/zh-TW.lang.php b/modules/importer/lang/zh-TW.lang.php
deleted file mode 100644
index 17915cb74..000000000
--- a/modules/importer/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-    /**
-     * @file   modules/importer/lang/zh-TW.lang.phpzh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  匯入(importer)模組正體中文語言語言
-     **/
-
-    // 按鈕語言
-    $lang->cmd_sync_member = '同步';
-    $lang->cmd_continue = '繼續進行';
-    $lang->preprocessing = '匯入資料中...';
-
-    // 項目
-    $lang->importer = '匯入';
-    $lang->source_type = '匯入目標';
-    $lang->type_member = '會員資料';
-    $lang->type_message = '短訊息';
-    $lang->type_ttxml = 'TTXML';
-    $lang->type_module = '討論板資料';
-    $lang->type_syncmember = '同步會員資料';
-    $lang->target_module = '目標模組';
-    $lang->xml_file = 'XML檔案';
-
-    $lang->import_step_title = array(
-        1 => 'Step 1. 選擇匯入目標',
-        12 => 'Step 1-2. 選擇目標模組',
-        13 => 'Step 1-3. 選擇目標分類',
-        2 => 'Step 2. XML檔案',
-        3 => 'Step 2. 同步會員資料與文章',
-        99 => '匯入資料',
-    );
-
-    $lang->import_step_desc = array(
-        1 => '請選擇要匯入的 XML 檔案類型。',
-        12 => '請選擇要匯入的目標模組。',
-        121 => '文章:',
-        122 => '討論板:',
-        13 => '請選擇要匯入的目標分類。',
-        2 => "請輸入要匯入的 XML 檔案位置。\n可輸入相對或絕對路徑。",
-        3 => '資料匯入後，可能會導致會員資料和文章內容產生誤差。請以『user_id』進行同步即可解決。',
-        99 => '資料匯入中...',
-    );
-
-    // 訊息/提示
-    $lang->msg_sync_member = '按同步按鈕，即可開始進行會員資料和文章的同步。';
-    $lang->msg_no_xml_file = '找不到 XML 檔案，請重新確認路徑。';
-    $lang->msg_invalid_xml_file = 'XML檔案格式錯誤！';
-    $lang->msg_importing = '%d個的資料中正在輸入 %d 個。(長時間沒有回應時，請按「繼續進行」按鈕)';
-    $lang->msg_import_finished = '已完成輸入 %d/%d 個資料。根據情況的不同，可能會出現沒有被匯入的資料。';
-    $lang->msg_sync_completed = '已完成會員和文章，評論的同步。';
-
-    // 其他
-    $lang->about_type_member = '資料匯入目標為會員資料時，請選擇此項。';
-    $lang->about_type_message = '資料匯入目標為短訊息時，請選擇此項。';
-    $lang->about_type_ttxml = '資料匯入目標為 TTXML (textcube系列)時，請選擇此項。';
-    $lang->about_ttxml_user_id = '請輸入匯入 TTXML 資料時，指定為主題發表者的 ID (必須是已註冊會員)。';
-    $lang->about_type_module = '資料匯入目標為討論板主題時，請選擇此項。';
-    $lang->about_type_syncmember = '匯入會員和文章資料後，需要同步會員資料時，請選擇此項。';
-    $lang->about_importer = "不僅可以匯入 Zeroboard 4，Zb5beta 的資料，也能夠把其他程式資料匯入到 XE 當中。\n匯入資料時，請利用 <a href=\"http://svn.xpressengine.com/zeroboard_xe/migration_tools/\" onclick=\"winopen(this.href);return false;\">XML Exporter</a> 建立 XML 檔案後再上傳。";
-    $lang->about_target_path = "為了下載附檔請輸入 Zeroboard 4 的安裝位置。\n位置在同一個主機時，請輸入如『/home/id/public_html/bbs』的路徑，在不同主機時，請輸入如『http://域名/bbs』的 URL 網址。";
-?>
diff --git a/modules/importer/tpl/css/importer.css b/modules/importer/tpl/css/importer.css
deleted file mode 100644
index 6362bd0d7..000000000
--- a/modules/importer/tpl/css/importer.css
+++ /dev/null
@@ -1,9 +0,0 @@
-@charset "utf-8";
-
-#step2_position { height:150px; overflow-y:scroll; border:2px solid #DDDDDD; }
-
-div.progressBox { width:700px; margin:30px auto; border:1px solid #DDDDDD; white-space:nowrap; overflow:hidden; height:20px;}
-div.progress1 { float:left; border-right:1px solid #DDDDDD; text-align:right; overflow:hidden; background-color:#361DB5; color:#FFFFFF; font-family:tahoma; font-family:tahoma; font-size:9pt; white-space:nowrap; height:20px;}
-div.progress2 { float:left; text-align:left; overflow:hidden; white-space:nowrap; color:#444444; font-family:tahoma; font-size:9pt; height:20px;}
-
-.w700 { width:700px; }
diff --git a/modules/importer/tpl/header.html b/modules/importer/tpl/header.html
index 9650b8eda..629153a82 100644
--- a/modules/importer/tpl/header.html
+++ b/modules/importer/tpl/header.html
@@ -1,18 +1,8 @@
-<!--%import("js/importer_admin.js")-->
-<!--%import("css/importer.css")-->
-
+<!--@if(__DEBUG__)-->
+<load target="js/importer_admin.js" usecdn="true" />
+<!--@else-->
+<load target="js/importer_admin.min.js" usecdn="true" />
+<!--@end-->
 {@ $type_list = array('module'=>$lang->type_module, 'ttxml'=>$lang->type_ttxml, 'member'=>$lang->type_member, 'sync'=>$lang->type_syncmember, 'message'=>$lang->type_message) }
-
-<h3 class="xeAdmin">{$lang->importer} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<!-- 설명 -->
-<div class="infoText">{nl2br($lang->about_importer)}</div>
-
-<div class="header4">
-    <ul class="localNavigation">
-        <!--@foreach($type_list as $key => $val)-->
-        <li <!--@if($source_type==$key)-->class="on"<!--@end-->><a href="{getUrl('source_type',$key)}">{$val}</a></li>
-        <!--@end-->
-    </ul>
-</div>
-
+<h1 class="h1">{$lang->importer}</h1>
+<p>{nl2br($lang->about_importer)}</p>
diff --git a/modules/importer/tpl/index.html b/modules/importer/tpl/index.html
index 4eb61309d..336110dd0 100644
--- a/modules/importer/tpl/index.html
+++ b/modules/importer/tpl/index.html
@@ -1,45 +1,142 @@
-<!--%import("js/importer_admin.js")-->
-<!--%import("css/importer.css")-->
+<include target="./header.html" />
+<load target="js/importer_admin.js" usecdn="true" />
 
-<h3 class="xeAdmin">{$lang->importer} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<!-- 설명 -->
-<div class="infoText">{nl2br($lang->about_importer)}</div>
-
-<!--// step 1. import하려는 XML파일의 성격 및 대상 모듈을 지정 -->
-<div id="step1">
-    <form action="./" method="get">
-        <input type="hidden" name="module" value="{$module}" />
-        <input type="hidden" name="act" value="{$act}" />
-
-        <h4 class="xeAdmin">{$lang->import_step_title[1]} - {$lang->import_step_desc[1]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <th scope="col"><div><label for="source_type_module">1. {$lang->type_module}</label></div></th>
-            <td class="wide"><input type="radio" name="source_type" value="module" id="source_type_module" /> <label for="source_type_module">{$lang->about_type_module}</label></td>
-        </tr>
-        <tr>
-            <th scope="col"><div><label for="source_type_ttxml">2. {$lang->type_ttxml}</label></div></th>
-            <td><input type="radio" name="source_type" value="ttxml" id="source_type_ttxml" /> <label for="source_type_ttxml">{$lang->about_type_ttxml}</label></td>
-        </tr>
-        <tr>
-            <th scope="col"><div><label for="source_type_member">3. {$lang->type_member}</label></div></th>
-            <td><input type="radio" name="source_type" value="member" id="source_type_member" /> <label for="source_type_member">{$lang->about_type_member}</label></td>
-        </tr>
-        <tr>
-            <th scope="col"><div><label for="source_type_syncmember">4. {$lang->type_syncmember}</label></div></th>
-            <td><input type="radio" name="source_type" value="sync" id="source_type_syncmember" /> <label for="source_type_syncmember">{$lang->about_type_syncmember}</label></td>
-        </tr>
-        <tr>
-            <th scope="col"><div><label for="source_type_message">5. {$lang->type_message}</label></div></th>
-            <td><input type="radio" name="source_type" value="message" id="source_type_message" /> <label for="source_type_message">{$lang->about_type_message}</label></td>
-        </tr>
-        <tr>
-            <th colspan="2" class="button">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </th>
-        </tr>
-        </table>
-    </form>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
 
+<form action="./" class="form" method="get" onsubmit="return doPreProcessing(this, 'documentForm')" id="documentForm">
+	<input type="hidden" name="act" value="" />
+	<input type="hidden" name="type" value="module" />
+	<input type="hidden" name="unit_count" value="10" />
+	<h2 class="h2">{$lang->type_module}</h2>
+	<ul>
+		<li>
+			<p class="q">{$lang->xml_path} {$lang->path_info}</p>
+			<p class="a checkxml">
+				<input type="text" name="xml_file" value="./" />
+				<button type="button">{$lang->cmd_check_path}</button>
+				<em class="desc"></em><!--//class="error|success"-->
+			</p>
+		</li>
+		<li class="xml ttxml modulefinder">
+		<p class="q">{$lang->data_destination} <br />{$lang->import_desc}</p>
+			<div class="a">
+				<input type="text" name="site_keyword" /> <a href="#suggestion1" class="tgAnchor findsite">{$lang->find_site}</a>
+				<div id="suggestion1" class="tgContent suggestion">
+					<ul></ul>
+				</div>
+			</div>
+			<p class="a">
+				<select class="moduleList" style="width:290px">
+					<option>{$lang->select_module}</option>
+				</select>
+			</p>
+			<p class="a">
+				<select class="moduleIdList" style="width:290px" name="target_module">
+					<option>{$lang->select_module_id}</option>
+				</select>
+			</p>
+		</li>
+		<li class="ttxml modulefinder">
+			<p class="q">{$lang->guestbook_destination}</p>
+			<div class="a">
+				<input type="text" name="site_keyword" /> <a href="#suggestion3" class="tgAnchor findsite">{$lang->find_site}</a>
+				<div id="suggestion3" class="tgContent suggestion">
+					<ul></ul>
+				</div>
+			</div>
+			<p class="a">
+				<select class="moduleList" style="width:290px">
+					<option>{$lang->select_module}</option>
+				</select>
+			</p>
+			<p class="a">
+				<select class="moduleIdList" style="width:290px" name="guestbook_target_module">
+					<option>{$lang->select_module_id}</option>
+				</select>
+			</p>
+		</li>
+		<li class="ttxml">
+			<p class="q">{$lang->about_ttxml_user_id}</p>
+			<p class="a"><input type="text" name="user_id" value="{$logged_info->user_id}" /></p>
+		</li>
+		<li class="syncmember">
+			<p class="q">{$lang->import_step_desc[3]}</p>
+			<p class="a"><input type="checkbox" name="isSync" value="Y" /> {$lang->type_syncmember}</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->importer}" /></span>
+	</div>
+</form>
+<form action="./" class="form" method="get" onsubmit="return doPreProcessing(this, 'memberForm')" id="memberForm">
+	<input type="hidden" name="type" value="member" />
+	<input type="hidden" name="unit_count" value="100" />
+	<h2 class="h2">{$lang->type_member}</h2>
+	<ul>
+		<li>
+			<p class="q">{$lang->xml_path} {$lang->path_info}</p>
+			<p class="a checkxml">
+				<input type="text" name="xml_file" value="./" />
+				<button type="button">{$lang->cmd_check_path}</button>
+				<em class="desc">{$lang->msg_no_xml_file}</em>
+			</p>
+		</li>
+		<li class="syncmember">
+			<p class="q">{$lang->import_step_desc[3]}</p>
+			<p class="a"><input type="checkbox" name="isSync" value="Y" /> {$lang->type_syncmember}</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->importer}" /></span>
+	</div>
+</form>
+<form action="./" class="form" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
+	<input type="hidden" name="type" value="message" />
+	<input type="hidden" name="unit_count" value="100" />
+	<h2 class="h2">{$lang->type_message}</h2>
+	<ul>
+		<li>
+			<p class="q">{$lang->xml_path} {$lang->path_info}</p>
+			<p class="a checkxml">
+				<input type="text" name="xml_file" value="./" />
+				<button type="button">{$lang->cmd_check_path}</button>
+				<em class="desc"></em><!--//class="error|success"-->
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->importer}" /></span>
+	</div>
+</form>
+<a href="#process" class="modalAnchor"></a>
+<div class="modal" id="process" style="display:none;">
+    <form action="./" method="get" onsubmit="return doImport()" id="fo_process" class="fg">
+        <input type="hidden" name="type" value="" />
+        <input type="hidden" name="total" value="" />
+        <input type="hidden" name="cur" value="" />
+        <input type="hidden" name="key" value="" />
+        <input type="hidden" name="target_module" value="" />
+        <input type="hidden" name="guestbook_target_module" value="" />
+        <input type="hidden" name="unit_count" value="100" />
+        <input type="hidden" name="user_id" value="" />
+		<p style="text-align:center">
+			<span class="prgrs prgrsMedium">
+				<strong id="preProgressMsg">{$lang->preprocessing}</strong>
+				<strong id="progressMsg" style="display:none;">{$lang->import_step_desc[99]}</strong>
+				<span class="pBar" style="width:300px;text-align:left">
+					<span class="pAction" id="progressBar" style="width:0%"><!-- Progress status --></span>
+					<span class="pNum"><span id="completeCount">0</span>/<span id="totalCount">0</span></span>
+				</span>
+				<strong id="progressPercent">0%</strong>
+			</span>
+		</p>
+    </form>
+</div>
+<script type="text/javascript">
+jQuery('a.modalAnchor')
+.bind('before-close.mw', function(event){
+		return false;
+		});
+</script>
diff --git a/modules/importer/tpl/js/importer_admin.js b/modules/importer/tpl/js/importer_admin.js
index 7984166bd..106d20ce6 100644
--- a/modules/importer/tpl/js/importer_admin.js
+++ b/modules/importer/tpl/js/importer_admin.js
@@ -1,170 +1,249 @@
-/**
- * @file   modules/importer/js/importer_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  importer에서 사용하는 javascript
- **/
-
-/**
- * 회원정보와 게시글/댓글등의 동기화 요청 및 결과 처리 함수
- **/
-function doSync(fo_obj) {
-    exec_xml('importer','procImporterAdminSync', new Array(), completeSync);
-    return false;
-}
-
-function completeSync(ret_obj) {
-    alert(ret_obj['message']);
-    location.href=location.href;
-}
-
-
-/**
- * xml파일을 DB입력전에 extract를 통해 분할 캐싱을 요청하는 함수
- **/
-var prepared = false;
-function doPreProcessing(fo_obj) {
-    var xml_file = fo_obj.xml_file.value;
-    if(!xml_file) return false;
-
-    var type = fo_obj.type.value;
-
-    jQuery('#importForm').hide();
-    jQuery('#process').show();
-    jQuery('#status').empty();
-    prepared = false;
-    setTimeout(doPrepareDot, 50);
-
-    var params = new Array();
-    params['xml_file'] = xml_file;
-    params['type'] = type;
-
-    var response_tags = new Array('error','message','type','total','cur','key','status');
-    exec_xml('importer','procImporterAdminPreProcessing', params, completePreProcessing, response_tags);
-
-    return false;
-}
-
-/* 준비중일때 .(dot) 찍어주는.. */
-function doPrepareDot() {
-    if(prepared) return;
-
-    var str = jQuery('#status').html();
-    if(str.length < 1 || str.length - preProcessingMsg.length > 50) str = preProcessingMsg;
-    else str += ".";
-
-    jQuery('#status').html(str);
-    setTimeout(doPrepareDot, 50);
-}
-
-/* 준비가 끝났을때 호출되는 함수 */
-function completePreProcessing(ret_obj, response_tags) {
-    prepared = true;
-    jQuery('#status').empty();
-
-    var status = ret_obj['status'];
-    var message = ret_obj['message'];
-    var type = ret_obj['type'];
-    var total = parseInt(ret_obj['total'],10);
-    var cur = parseInt(ret_obj['cur'],10);
-    var key = ret_obj['key'];
-
-    if(status == -1) {
-        xDisplay('importForm','block');
-        xDisplay('process','none');
-        xDisplay('btn_reload','block');
-        xDisplay('btn_continue','none');
-        alert(message);
-        return;
-    }
-
-    jQuery('#btn_reload').hide();
-    jQuery('#btn_continue').show();
-
-    var fo_obj = jQuery('#fo_process').get(0);
-    fo_obj.type.value = type;
-    fo_obj.total.value = total;
-    fo_obj.cur.value = cur;
-    fo_obj.key.value = key;
-
-    var fo_import = jQuery('#fo_import').get(0);
-    if(fo_import && fo_import.target_module) fo_obj.target_module.value = fo_import.target_module.value;
-    if(fo_import && fo_import.guestbook_target_module) fo_obj.guestbook_target_module.value = fo_import.guestbook_target_module.value;
-    if(fo_import && fo_import.user_id) fo_obj.user_id.value = fo_import.user_id.value;
-
-    fo_obj.unit_count.value = fo_import.unit_count.options[fo_import.unit_count.selectedIndex].value;
-    
-    // extract된 파일을 이용해서 import
-    doImport();
-}
-
-/* @brief 임포트 시작 */
-function doImport() {
-    var fo_obj = jQuery('#fo_process').get(0);
-
-    var params = new Array();
-    params['type'] = fo_obj.type.value;
-    params['total'] = fo_obj.total.value;
-    params['cur'] = fo_obj.cur.value;
-    params['key'] = fo_obj.key.value;
-    params['target_module'] = fo_obj.target_module.value;
-    params['guestbook_target_module'] = fo_obj.guestbook_target_module.value;
-    params['unit_count'] = fo_obj.unit_count.value;
-    params['user_id'] = fo_obj.user_id.value;
-
-    displayProgress(params['total'], params['cur']);
-
-    var response_tags = new Array('error','message','type','total','cur','key');
-
-    show_waiting_message = false;
-    exec_xml('importer','procImporterAdminImport', params, completeImport, response_tags);
-    show_waiting_message = true;
-
-    return false;
-}
-
-
-/* import중 표시 */
-function completeImport(ret_obj, response_tags) {
-    var message = ret_obj['message'];
-    var type = ret_obj['type'];
-    var total = parseInt(ret_obj['total'], 10);
-    var cur = parseInt(ret_obj['cur'], 10);
-    var key = ret_obj['key'];
-
-    displayProgress(total, cur);
-
-    var fo_obj = jQuery('#fo_process').get(0);
-    fo_obj.type.value = type;
-    fo_obj.total.value = total;
-    fo_obj.cur.value = cur;
-    fo_obj.key.value = key;
-    
-    // extract된 파일을 이용해서 import
-    if(total > cur) doImport();
-    else {
-        alert(message);
-        fo_obj.reset();
-        jQuery('#process').hide();
-        jQuery('#importForm').show();
-        jQuery('#fo_import').get(0).reset();
-    }
-}
-
-/* 상태 표시 함수 */
-function displayProgress(total, cur) {
-    // 진행률 구함
-    var per = 0;
-    if(total > 0) per = Math.round(cur / total * 100);
-    else per = 100;
-    if(!per) per = 1;
-
-    var status = '<div class="progressBox"><div class="progress1" style="width:'+per+'%;">'+per+'%&nbsp;</div>';
-    status += '<div class="progress2">'+cur+'/'+total+'</div>';
-    status += '<div class="clear"></div></div>';
-    jQuery('#status').html(status);
-}
-
-function insertSelectedModule(id, module_srl, mid, browser_title) {
-    jQuery('#' + id).val(module_srl);
-    jQuery('#_' + id).val(browser_title+' ('+mid+')');
-}
+/**
+ * @file   modules/importer/js/importer_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  importer에서 사용하는 javascript
+ **/
+jQuery(function($){
+
+// Note : Module finder is defined modules/admin/tpl/js/admin.js
+
+// Check whether the xml file exists
+$('.checkxml')
+	.find('input:text')
+		.change(function(){
+			$(this).closest('.checkxml').find('.desr').hide();
+		})
+	.end()
+	.find('button')
+		.click(function(){
+			var $this, $container, $input, $messages, $loading, $form, $syncmember, count;
+
+			$this      = $(this).prop('disabled', true);
+			$form      = $this.closest('form');
+			$container = $this.closest('.checkxml');
+			$input     = $container.find('input').prop('disabled', true).addClass('loading');
+			$message   = $container.find('.desc').hide();
+
+			function on_complete(data) {
+				var $ul, $ttxml, $xml;
+
+				$ul    = $this.closest('ul');
+				$xml   = $ul.find('>.xml');
+				$ttxml = $ul.find('>.ttxml');
+
+				$message.text(data.result_message);
+					
+				// when the file doesn't exists or any other error occurs
+				if(data.error || data.exists != 'true') {
+					$message.attr('class', 'desc error').fadeIn(300);
+					$ttxml = $ttxml.filter(':visible');
+					$ttxml.eq(-1).slideUp(100, function(){
+						$ttxml = $ttxml.slice(0,-1).eq(-1).slideUp(100,arguments.callee);
+					});
+					$form.find(':submit').attr('disabled','disabled');
+					return restore();
+				}
+
+				restore();
+				$message.attr('class', 'desc success').fadeIn(300);
+				$form.find(':submit').removeAttr('disabled');
+
+				$syncmember = $form.find('.syncmember:hidden');
+				
+				if(data.type == 'XML') {
+					$xml.not(':visible').add($syncmember).slideDown(300);
+				} else if(data.type == 'TTXML') {
+					$ttxml.not(':visible').add($syncmember).slideDown(300);
+					$form.find('input[name=type]').val('ttxml');
+				}
+			};
+
+			function restore() {
+				$input.prop('disabled', false).removeClass('loading');
+				$this.prop('disabled', false);
+				$form.find('.syncmember:visible').slideUp(100);
+				return false;
+			};
+
+			show_waiting_message = false;
+			$.exec_json('importer.procImporterAdminCheckXmlFile', {filename:$.trim($input.val())}, on_complete);
+		})
+	.end()
+	.find('.desc').hide().end()
+	.closest('ul').find('>li.ttxml').hide().end().end()
+	.closest('form').find(':submit').attr('disabled','disabled');
+
+// hide 'sync member' block
+$('.syncmember').hide();
+
+});
+
+/**
+ * 회원정보와 게시글/댓글등의 동기화 요청 및 결과 처리 함수
+ **/
+function doSync(fo_obj) {
+    exec_xml(
+		'importer',
+		'procImporterAdminSync', 
+		[],
+		function(ret){
+			alert(ret.message);
+			location.href = location.href;
+		}
+	);
+    return false;
+}
+
+/**
+ * xml파일을 DB입력전에 extract를 통해 분할 캐싱을 요청하는 함수
+ **/
+function doPreProcessing(form, formId) {
+	var xml_file, type, resp, prepared = false, $ = jQuery, $status, $process, $form;
+
+	xml_file = form.elements['xml_file'].value;
+	type     = form.elements['type'].value;
+
+    if(!xml_file) return false;
+
+	// show modal window
+	$process = $('#process');
+	if(!$process.find('.bg').length) $process.prepend('<span class="bg" />').appendTo('body');
+	$('a[href="#process"].modalAnchor').trigger('open.mw');
+
+    exec_xml(
+		'importer', // module
+		'procImporterAdminPreProcessing', // action
+		{type:type, xml_file:xml_file}, // parameters
+		on_complete, // callback
+		resp=['error','message','type','total','cur','key','status'] // response tags
+	);
+
+	function on_complete(ret) {
+		var $reload, $cont, fo_proc, elems, i, c, key, to_copy;
+
+		prepared = true;
+
+		// when fail prepare
+		if(ret.status == -1) {
+			return alert(ret.message);
+		}
+
+		fo_proc = get_by_id('fo_process');
+		elems   = fo_proc.elements;
+
+		for(i=0,c=resp.length; i < c; i++) {
+			key = resp[i];
+			elems[key]?elems[key].value=ret[key]:0;
+		}
+
+		fo_import = get_by_id(formId);
+		if(fo_import) {
+			to_copy = ['target_module','guestbook_target_module','user_id', 'unit_count'];
+			for(i=0,c=to_copy.length; i < c; i++) {
+				key = to_copy[i];
+				if(fo_import.elements[key]) fo_proc.elements[key].value = fo_import.elements[key].value;
+			}
+		}
+
+		jQuery('#preProgressMsg').hide();
+		jQuery('#progressMsg').show();
+		doImport(formId);
+	}
+
+    return false;
+}
+
+/* @brief Start importing */
+function doImport(formId) {
+    var form = get_by_id('fo_process'), elems = form.elements, i, c, params={}, resp;
+
+	for(i=0,c=elems.length; i < c; i++) {
+		params[elems[i].name] = elems[i].value;
+	}
+
+	function on_complete(ret, response_tags) {
+		var i, c, key;
+		
+		for(i=0,c=resp.length; i < c; i++) {
+			key = resp[i];
+			//elems[key]?elems[key].value=ret_obj[key]:0;
+			elems[key]?elems[key].value=ret[key]:0;
+		}
+
+		ret.total = parseInt(ret.total, 10) || 0;
+		ret.cur   = parseInt(ret.cur, 10) || 0;
+		percent = parseInt((ret.cur/ret.total)*100);
+
+		jQuery('#totalCount').text(ret.total);
+		jQuery('#completeCount').text(ret.cur);
+		jQuery('#progressBar').width(percent+'%');
+		jQuery('#progressPercent').html(percent + "%");
+
+		if(ret.total > ret.cur) {
+			doImport(formId);
+		} else {
+			function resultAlertMessage()
+			{
+				alert(ret.message);
+				jQuery('a[href="#process"].modalAnchor')
+					.unbind('before-close.mw')
+					.trigger('close.mw')
+					.find('#progressBar').width(1).end()
+					.find('#progressPercent').html('0%').end();
+
+				try {
+					form.reset();
+					get_by_id(formId).reset();
+				} catch(e){ };
+
+				jQuery('span.btn > input[type=submit]').attr('disabled','disabled');
+			}
+
+			fo_import = get_by_id(formId);
+			if(fo_import != null && fo_import.isSync.checked)
+			{
+				exec_xml(
+					'importer', // module
+					'procImporterAdminSync', // act
+					params,
+					function(ret){if(ret && (!ret.error || ret.error == '0'))resultAlertMessage()}, // callback
+					resp = ['error','message'] // response tags
+				);
+			}
+			else resultAlertMessage();
+		}
+	}
+
+    show_waiting_message = false;
+    exec_xml(
+		'importer', // module
+		'procImporterAdminImport', // act
+		params,
+		on_complete, // callback
+		resp = ['error','message','type','total','cur','key'] // response tags
+	);
+    show_waiting_message = true;
+
+    return false;
+}
+
+/* display progress */
+function displayProgress(total, cur) {
+	var per, stat, $stat;
+
+	per = Math.max(total?Math.round(cur/total*100):100, 1);
+
+	$stat = jQuery('#status');
+	if(!$stat.find('div.progress1').length) {
+		$stat.html( '<div class="progressBox"><div class="progress1"></div><div class="progress2"></div></div>' );
+	}
+
+	$stat
+		.find('div.progress1')
+			.html(per+'&nbsp;')
+			.css('width', per+'%')
+		.end()
+		.find('div.progress2')
+			.text(cur+'/'+total);
+}
+
diff --git a/modules/importer/tpl/js/importer_admin.min.js b/modules/importer/tpl/js/importer_admin.min.js
new file mode 100644
index 000000000..9251e995f
--- /dev/null
+++ b/modules/importer/tpl/js/importer_admin.min.js
@@ -0,0 +1,14 @@
+/**
+ * @file   modules/importer/js/importer_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  importer에서 사용하는 javascript
+ **/
+jQuery(function($){$('.checkxml').find('input:text').change(function(){$(this).closest('.checkxml').find('.desr').hide()}).end().find('button').click(function(){var $this,$container,$input,$messages,$loading,$form,$syncmember,count;$this=$(this).prop('disabled',true);$form=$this.closest('form');$container=$this.closest('.checkxml');$input=$container.find('input').prop('disabled',true).addClass('loading');$message=$container.find('.desc').hide()
+function on_complete(data){var $ul,$ttxml,$xml;$ul=$this.closest('ul');$xml=$ul.find('>.xml');$ttxml=$ul.find('>.ttxml');$message.text(data.result_message);if(data.error||data.exists!='true'){$message.attr('class','desc error').fadeIn(300);$ttxml=$ttxml.filter(':visible');$ttxml.eq(-1).slideUp(100,function(){$ttxml=$ttxml.slice(0,-1).eq(-1).slideUp(100,arguments.callee)});$form.find(':submit').attr('disabled','disabled');return restore()};restore();$message.attr('class','desc success').fadeIn(300);$form.find(':submit').removeAttr('disabled');$syncmember=$form.find('.syncmember:hidden');if(data.type=='XML'){$xml.not(':visible').add($syncmember).slideDown(300)}else if(data.type=='TTXML'){$ttxml.not(':visible').add($syncmember).slideDown(300);$form.find('input[name=type]').val('ttxml')}}
+function restore(){$input.prop('disabled',false).removeClass('loading');$this.prop('disabled',false);$form.find('.syncmember:visible').slideUp(100);return false};show_waiting_message=false;$.exec_json('importer.procImporterAdminCheckXmlFile',{filename:$.trim($input.val())},on_complete)}).end().find('.desc').hide().end().closest('ul').find('>li.ttxml').hide().end().end().closest('form').find(':submit').attr('disabled','disabled');$('.syncmember').hide()})
+function doSync(fo_obj){exec_xml('importer','procImporterAdminSync',[],function(ret){alert(ret.message);location.href=location.href});return false}
+function doPreProcessing(form,formId){var xml_file,type,resp,prepared=false,$=jQuery,$status,$process,$form;xml_file=form.elements['xml_file'].value;type=form.elements['type'].value;if(!xml_file)return false;$process=$('#process');if(!$process.find('.bg').length)$process.prepend('<span class="bg" />').appendTo('body');$('a[href="#process"].modalAnchor').trigger('open.mw');exec_xml('importer','procImporterAdminPreProcessing',{type:type,xml_file:xml_file},on_complete,resp=['error','message','type','total','cur','key','status'])
+function on_complete(ret){var $reload,$cont,fo_proc,elems,i,c,key,to_copy;prepared=true;if(ret.status==-1)return alert(ret.message);fo_proc=get_by_id('fo_process');elems=fo_proc.elements;for(i=0,c=resp.length;i<c;i++){key=resp[i];elems[key]?elems[key].value=ret[key]:0};fo_import=get_by_id(formId);if(fo_import){to_copy=['target_module','guestbook_target_module','user_id','unit_count'];for(i=0,c=to_copy.length;i<c;i++){key=to_copy[i];if(fo_import.elements[key])fo_proc.elements[key].value=fo_import.elements[key].value}};jQuery('#preProgressMsg').hide();jQuery('#progressMsg').show();doImport(formId)};return false}
+function doImport(formId){var form=get_by_id('fo_process'),elems=form.elements,i,c,params={},resp;for(i=0,c=elems.length;i<c;i++)params[elems[i].name]=elems[i].value
+function on_complete(ret,response_tags){var i,c,key;for(i=0,c=resp.length;i<c;i++){key=resp[i];elems[key]?elems[key].value=ret[key]:0};ret.total=parseInt(ret.total,10)||0;ret.cur=parseInt(ret.cur,10)||0;percent=parseInt((ret.cur/ret.total)*100);jQuery('#totalCount').text(ret.total);jQuery('#completeCount').text(ret.cur);jQuery('#progressBar').width(percent+'%');jQuery('#progressPercent').html(percent+"%");if(ret.total>ret.cur){doImport(formId)}else{function resultAlertMessage(){alert(ret.message);jQuery('a[href="#process"].modalAnchor').unbind('before-close.mw').trigger('close.mw').find('#progressBar').width(1).end().find('#progressPercent').html('0%').end();try{form.reset();get_by_id(formId).reset()}catch(e){};jQuery('span.btn > input[type=submit]').attr('disabled','disabled')};fo_import=get_by_id(formId);if(fo_import!=null&&fo_import.isSync.checked){exec_xml('importer','procImporterAdminSync',params,function(ret){if(ret&&(!ret.error||ret.error=='0'))resultAlertMessage()},resp=['error','message'])}else resultAlertMessage()}};show_waiting_message=false;exec_xml('importer','procImporterAdminImport',params,on_complete,resp=['error','message','type','total','cur','key']);show_waiting_message=true;return false}
+function displayProgress(total,cur){var per,stat,$stat;per=Math.max(total?Math.round(cur/total*100):100,1);$stat=jQuery('#status');if(!$stat.find('div.progress1').length)$stat.html('<div class="progressBox"><div class="progress1"></div><div class="progress2"></div></div>');$stat.find('div.progress1').html(per+'&nbsp;').css('width',per+'%').end().find('div.progress2').text(cur+'/'+total)}
\ No newline at end of file
diff --git a/modules/importer/tpl/member.html b/modules/importer/tpl/member.html
deleted file mode 100644
index b9a6bf53a..000000000
--- a/modules/importer/tpl/member.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--#include("header.html")-->
-
-<div id="importForm">
-    <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
-        <input type="hidden" name="type" value="member" />
-
-        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText fullWidth" />
-                <p>ex1) ../member.xml</p>
-                <p>ex2) http://...../member.xml</p>
-            </td>
-        </tr>
-        <tr>    
-            <th class="button">
-                <select name="unit_count">
-                    <option value="50">50</option>
-                    <option value="100" selected="selected">100</option>
-                    <option value="200">200</option>
-                    <option value="300">300</option>
-                    <option value="400">400</option>
-                    <option value="500">500</option>
-                    <option value="1000">1000</option>
-                </select>
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </th>
-        </tr>
-        </table>
-    </form>
-</div>
-
-<!--#include("./process.html")-->
diff --git a/modules/importer/tpl/message.html b/modules/importer/tpl/message.html
deleted file mode 100644
index 4b0dc5fd2..000000000
--- a/modules/importer/tpl/message.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--#include("header.html")-->
-
-<div id="importForm">
-    <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
-        <input type="hidden" name="type" value="message" />
-
-        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText fullWidth" />
-                <p>ex1) ../message.xml</p>
-                <p>ex2) http://...../message.xml</p>
-            </td>
-        </tr>
-        <tr>    
-            <th class="button">
-                <select name="unit_count">
-                    <option value="50">50</option>
-                    <option value="100" selected="selected">100</option>
-                    <option value="200">200</option>
-                    <option value="300">300</option>
-                    <option value="400">400</option>
-                    <option value="500">500</option>
-                    <option value="1000">1000</option>
-                </select>
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </th>
-        </tr>
-        </table>
-    </form>
-</div>
-
-<!--#include("./process.html")-->
diff --git a/modules/importer/tpl/module.html b/modules/importer/tpl/module.html
deleted file mode 100644
index 5ad6f6e82..000000000
--- a/modules/importer/tpl/module.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--#include("header.html")-->
-
-<!--// step 1-2. 대상이 게시물 정보일 경우 대상 모듈 목록을 선택하도록 함 -->
-<div id="importForm">
-    <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
-        <input type="hidden" name="type" value="module" />
-        <input type="hidden" name="target_module" value="" id="target_module" />
-
-        <h4 class="xeAdmin">{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
-            </td>
-        </tr>
-        </table>
-
-        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText fullWidth" />
-                <p>ex1) ../module.xml</p>
-                <p>ex2) http://...../module.xml</p>
-            </td>
-        </tr>
-        <tr>    
-            <th>
-                <select name="unit_count" class="w100">
-                    <option value="10" selected="selected">10</option>
-                    <option value="20">20</option>
-                    <option value="30">30</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="200">200</option>
-                    <option value="300">300</option>
-                    <option value="400">400</option>
-                    <option value="500">500</option>
-                    <option value="1000">1000</option>
-                </select>
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </th>
-        </tr>
-        </table>
-
-    </form>
-</div>
-
-<!--#include("./process.html")-->
diff --git a/modules/importer/tpl/process.html b/modules/importer/tpl/process.html
index 67a77842b..5edf2872a 100644
--- a/modules/importer/tpl/process.html
+++ b/modules/importer/tpl/process.html
@@ -1,7 +1,6 @@
 <script type="text/javascript">
     var preProcessingMsg = "{$lang->preprocessing}";
 </script>
-
 <div id="process" style="display:none;">
     <form action="./" method="get" onsubmit="return doImport()" id="fo_process">
         <input type="hidden" name="type" value="" />
@@ -12,20 +11,11 @@
         <input type="hidden" name="guestbook_target_module" value="" />
         <input type="hidden" name="unit_count" value="" />
         <input type="hidden" name="user_id" value="" />
-
-        <h4 class="xeAdmin">{$lang->import_step_title[99]} - {$lang->import_step_desc[99]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                <div id="status"></div>
-            </td>
-        </tr>
-        <tr>    
-            <th class="button">
-                <div id="btn_continue" style="display:none;"><span class="button black strong"><input type="submit" value="{$lang->cmd_continue}" /></span></div>
-                <div id="btn_reload" style="display:block;"><span class="button"><input type="button" value="{$lang->cmd_reload}" onclick="location.reload(); return false;"/></span></div>
-            </th>
-        </tr>
-        </table>
-    </form>
-</div>
+        <h3 class="h3">{$lang->import_step_title[99]} - {$lang->import_step_desc[99]}</h3>
+        <div id="status"></div>
+        <div class="btnArea"> 
+			<span class="btn" id="btn_continue" style="display:none;"><input type="submit" value="{$lang->cmd_continue}" /></span>
+			<span class="btn" id="btn_reload" style="display:block;"><input type="button" value="{$lang->cmd_reload}" onclick="location.reload(); return false;"/></span>
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/modules/importer/tpl/sync.html b/modules/importer/tpl/sync.html
deleted file mode 100644
index 71f180f03..000000000
--- a/modules/importer/tpl/sync.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!--#include("header.html")-->
-
-<form action="./" method="get" onsubmit="return doSync(this)">
-    <h4 class="xeAdmin">{$lang->import_step_title[3]} - {$lang->import_step_desc[3]}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_sync_member}" /></span></th>
-    </tr>
-    </table>
-</form>
diff --git a/modules/importer/tpl/ttxml.html b/modules/importer/tpl/ttxml.html
deleted file mode 100644
index 2f944257c..000000000
--- a/modules/importer/tpl/ttxml.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--#include("header.html")-->
-
-<!--// step 1-2. 대상이 게시물 정보일 경우 대상 모듈 목록을 선택하도록 함 -->
-<div id="importForm">
-    <form action="./" method="get" onsubmit="return doPreProcessing(this)" id="fo_import">
-        <input type="hidden" name="type" value="ttxml" />
-        <input type="hidden" name="target_module" value="" id="target_module" />
-        <input type="hidden" name="guestbook_target_module" value="" id="guestbook_target_module" />
-
-        <h4 class="xeAdmin">{$lang->import_step_title[1]} - {$lang->import_step_desc[12]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>{$lang->import_step_desc[121]} </td>
-            <td>
-                <input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
-            </td>
-        </tr>
-        <tr>
-            <td>{$lang->import_step_desc[122]} </td>
-            <td>
-                <input type="text" name="_guestbook_target_module" id="_guestbook_target_module" class="inputTypeText w300" readonly="readonly"><a href="{getUrl('','module','module','act','dispModuleSelectList','id','guestbook_target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
-            </td>
-        </tr>
-        </table>
-
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                {$lang->user_id} : <input type="text" name="user_id" value="{$logged_info->user_id}" class="inputTypeText w200" />
-                <p>{$lang->about_ttxml_user_id}</p>
-            </td>
-        </tr>
-        </table>
-
-        <h4 class="xeAdmin">{$lang->import_step_title[2]} - {$lang->import_step_desc[2]}</h4>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td>
-                <input type="text" name="xml_file" value="./" class="inputTypeText w700" />
-                <p>ex1) ../module.xml</p>
-                <p>ex2) http://...../module.xml</p>
-            </td>
-        </tr>
-        <tr>    
-            <th class="button">
-                <select name="unit_count">
-                    <option value="10" selected="selected">10</option>
-                    <option value="20">20</option>
-                    <option value="30">30</option>
-                    <option value="50">50</option>
-                    <option value="100">100</option>
-                    <option value="200">200</option>
-                    <option value="300">300</option>
-                    <option value="400">400</option>
-                    <option value="500">500</option>
-                    <option value="1000">1000</option>
-                </select>
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" /></span>
-            </th>
-        </tr>
-        </table>
-    </form>
-</div>
-
-<!--#include("./process.html")-->
diff --git a/modules/importer/ttimport.class.php b/modules/importer/ttimport.class.php
index 7793dba01..adfe8d3d0 100644
--- a/modules/importer/ttimport.class.php
+++ b/modules/importer/ttimport.class.php
@@ -1,638 +1,604 @@
-<?php
-    /**
-     * @class ttimport 
-     * @author NHN (developers@xpressengine.com)
-     * @brief  ttxml import class
-     **/
-
-    @set_time_limit(0);
-    @require_once('./modules/importer/extract.class.php');
-
-    class ttimport {
-
-        var $oXmlParser = null;
-
-        /**
-         * @brief module.xml 형식의 데이터 import
-         **/
-        function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null) {
-            // 필요한 객체 미리 생성
-            $this->oXmlParser = new XmlParser();
-
-            // 타겟 모듈의 카테고리 정보 구함
-            $oDocumentController = &getController('document');
-            $oDocumentModel = &getModel('document');
-            $category_list = $category_titles = array();
-            $category_list = $oDocumentModel->getCategoryList($module_srl);
-            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
-
-            // 먼저 카테고리 정보를 입력함
-            $category_file = preg_replace('/index$/i', 'category.xml', $index_file);
-            if(file_exists($category_file)) {
-                // xmlParser객체 생성
-                $xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
-
-                // 카테고리 정보를 정리
-                if($xmlDoc->categories->category) {
-                    $categories = array();
-                    $idx = 0;
-                    $this->arrangeCategory($xmlDoc->categories, $categories, $idx, 0);
-
-                    $match_sequence = array();
-                    foreach($categories as $k => $v) {
-                        $category = $v->name;
-                        if(!$category || $category_titles[$category]) continue;
-
-                        $obj = null;
-                        $obj->title = $category;
-                        $obj->module_srl = $module_srl; 
-                        if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
-                        $output = $oDocumentController->insertCategory($obj);
-
-                        if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
-                    }
-                    $oDocumentController->makeCategoryFile($module_srl);
-                }
-                FileHandler::removeFile($category_file);
-            }
-            $category_list = $category_titles = array();
-            $category_list = $oDocumentModel->getCategoryList($module_srl);
-            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
-
-            // 관리자 정보를 구함
-            $oMemberModel = &getModel('member');
-            $member_info = $oMemberModel->getMemberInfoByUserID($user_id);
-			$author_xml_id = 0;
-          
-            if(!$cur) $cur = 0;
-
-            // index파일을 염
-            $f = fopen($index_file,"r");
-
-            // 이미 읽혀진 것은 패스
-            for($i=0;$i<$cur;$i++) fgets($f, 1024);
-
-            // 라인단위로 읽어들이면서 $cur보다 커지고 $cur+$unit_count개보다 작으면 중지
-            for($idx=$cur;$idx<$cur+$unit_count;$idx++) {
-                if(feof($f)) break;
-
-                // 정해진 위치를 찾음
-                $target_file = trim(fgets($f, 1024));
-
-                if(!file_exists($target_file)) continue;
-
-                // 이제부터 데이터를 가져오면서 처리
-                $fp = fopen($target_file,"r");
-                if(!$fp) continue;
-
-                $obj = null;
-                $obj->module_srl = $module_srl;
-                $obj->document_srl = getNextSequence();
-                $obj->uploaded_count = 0;
-
-                $files = array();
-
-                $started = false;
-                $buff = null;
-
-                // 본문 데이터부터 처리 시작
-                while(!feof($fp)) {
-                    $str = fgets($fp, 1024);
-
-                    // 한 아이템 준비 시작
-                    if(substr($str,0,5) == '<post') {
-                        $started = true;
-                        continue;
-
-                    // 첨부파일 입력
-                    } else if(substr($str,0,12) == '<attachment ') {
-                        if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
-                        continue;
-                    }
-
-                    if($started) $buff .= $str;
-                }
-
-                $xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
-               
-				$author_xml_id = $xmlDoc->post->author->body;
-
-
-                if($xmlDoc->post->category->body) {
-                    $tmp_arr = explode('/',$xmlDoc->post->category->body);
-                    $category = trim($tmp_arr[count($tmp_arr)-1]);
-                    if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
-                }
-
-                $obj->is_notice = 'N';
-                $obj->is_secret = in_array($xmlDoc->post->visibility->body, array('public','syndicated'))?'N':'Y';
-                $obj->title = $xmlDoc->post->title->body;
-                $obj->content = $xmlDoc->post->content->body;
-                $obj->password = md5($xmlDoc->post->password->body);
-                $obj->allow_comment = $xmlDoc->post->acceptcomment->body=='1'?'Y':'N';
-                $obj->allow_trackback = $xmlDoc->post->accepttrackback->body=='1'?'Y':'N';
-                //$obj->allow_comment = $xmlDoc->post->acceptComment->body=='1'?'Y':'N';
-                //$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
-                $obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
-                $obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
-                if(!$obj->last_update) $obj->last_update = $obj->regdate;
-
-                $tag = null;
-                $tmp_tags = null;
-                $tag = $xmlDoc->post->tag;
-                if($tag) {
-                    if(!is_array($tag)) $tag = array($tag);
-                    foreach($tag as $key => $val) $tmp_tags[] = $val->body;
-                    $obj->tags = implode(',',$tmp_tags);
-                }
-
-                $obj->readed_count = 0;
-                $obj->voted_count = 0;
-                $obj->nick_name = $member_info->nick_name;
-                $obj->user_name = $member_info->user_name;
-                $obj->user_id = $member_info->user_id;
-                $obj->member_srl = $member_info->member_srl;
-                $obj->email_address = $member_info->email_address;
-                $obj->homepage = $member_info->homepage;
-                $obj->ipaddress = $_REMOTE['SERVER_ADDR'];
-                $obj->list_order = $obj->update_order = $obj->document_srl*-1;
-                $obj->lock_comment = 'N';
-                $obj->notify_message = 'N';
-
-                // content 정보 변경 (첨부파일)
-                $obj->content = str_replace('[##_ATTACH_PATH_##]/','',$obj->content);
-                if(count($files)) {
-                    foreach($files as $key => $val) {
-                        $obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val->url.'"',$obj->content);
-                    }
-                }
-
-                $obj->content = preg_replace_callback('!\[##_Movie\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTMovie'), $obj->content);
-
-                if(count($files)) {
-                    $this->files = $files;
-                    $obj->content = preg_replace_callback('!\[##_([a-z0-9]+)\|([^\|]*)\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTAttach'), $obj->content);
-                }
-
-                // 역인글 입력
-                $obj->trackback_count = 0;
-                if($xmlDoc->post->trackback) {
-                    $trackbacks = $xmlDoc->post->trackback;
-                    if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
-                    if(count($trackbacks)) {
-                        foreach($trackbacks as $key => $val) {
-                            $tobj = null;
-                            $tobj->trackback_srl = getNextSequence();
-                            $tobj->module_srl = $module_srl;
-                            $tobj->document_srl = $obj->document_srl;
-                            $tobj->url = $val->url->body;
-                            $tobj->title = $val->title->body;
-                            $tobj->blog_name = $val->site->body;
-                            $tobj->excerpt = $val->excerpt->body;
-                            $tobj->regdate = date("YmdHis",$val->received->body);
-                            $tobj->ipaddress = $val->ip->body;
-                            $tobj->list_order = -1*$tobj->trackback_srl;
-                            $output = executeQuery('trackback.insertTrackback', $tobj);
-                            if($output->toBool()) $obj->trackback_count++;
-                        }
-                    }
-                }
-
-                // 댓글입력
-                $obj->comment_count = 0;
-                if($xmlDoc->post->comment) {
-                    $comment = $xmlDoc->post->comment;
-                    if(!is_array($comment)) $comment = array($comment);
-                    foreach($comment as $key => $val) {
-                        $parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
-                        if($parent_srl === false) continue;
-
-                        $obj->comment_count++;
-                        if($val->comment) {
-                            $child_comment = $val->comment;
-                            if(!is_array($child_comment)) $child_comment = array($child_comment);
-                            foreach($child_comment as $k => $v) {
-                                $result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
-                                if($result !== false) $obj->comment_count++;
-                            }
-                        }
-                    }
-                }
-
-                if($module_name == 'textyle') {
-                    $args->document_srl = $obj->document_srl;
-                    $args->module_srl = $obj->module_srl;
-                    $args->logs = serialize(null);
-                    $output = executeQuery('textyle.insertPublishLog', $args);
-
-                    // 발행 상태의 visibility 값
-                    $status_published = array('public', 'syndicated');
-                    // 발행이 아닌 것들은 저장상태로
-                    if(!in_array($xmlDoc->post->visibility->body, $status_published)) {
-                        $obj->module_srl = $member_info->member_srl; 
-                    }
-                }
-
-                // 문서 입력
-                $output = executeQuery('document.insertDocument', $obj);
-
-                if($output->toBool()) {
-                    // 태그 입력
-                    if($obj->tags) {
-                        $tag_list = explode(',',$obj->tags);
-                        $tag_count = count($tag_list);
-                        for($i=0;$i<$tag_count;$i++) {
-                            $args = null;
-                            $args->tag_srl = getNextSequence();
-                            $args->module_srl = $module_srl;
-                            $args->document_srl = $obj->document_srl;
-                            $args->tag = trim($tag_list[$i]);
-                            $args->regdate = $obj->regdate;
-                            if(!$args->tag) continue;
-                            $output = executeQuery('tag.insertTag', $args);
-                        }
-                    }
-                }
-
-                fclose($fp);
-                FileHandler::removeFile($target_file);
-            }
-
-            fclose($f);
-
-            if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
-
-
-            // 방명록 정보를 입력함
-            $guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
-            if (file_exists($guestbook_file)) {
-                // xmlParser객체 생성
-                $xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
-
-                // 방명록 정보를 처리
-                if($guestbook_module_srl && $xmlDoc->guestbook->comment) {
-                    $comment = $xmlDoc->guestbook->comment;
-                    if(!is_array($comment)) $comment = array($comment);
-					
-					if($module_name =='textyle'){
-						foreach($comment as $key => $val) {
-							$textyle_guestbook_srl  = getNextSequence();
-
-							if($val->comment) {
-								$child_comment = $val->comment;
-								if(!is_array($child_comment)) $child_comment = array($child_comment);
-								foreach($child_comment as $k => $v) {
-									$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
-								}
-							}
-
-							$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
-						}
-					}else{
-						foreach($comment as $key => $val) {
-							$obj = null;
-							$obj->module_srl = $guestbook_module_srl;
-							$obj->document_srl = getNextSequence();
-							$obj->uploaded_count = 0;
-							$obj->is_notice = 'N';
-							$obj->is_secret = $val->secret->body=='1'?'Y':'N';
-							$obj->content = nl2br($val->content->body);
-
-							// 본문에서 제목 추출
-							$obj->title = cut_str(strip_tags($obj->content),20,'...');
-							if ($obj->title == '') $obj->title = 'Untitled';
-
-							$obj->allow_comment = 'Y';
-							$obj->allow_trackback = 'N';
-							$obj->regdate = date("YmdHis",$val->written->body);
-							$obj->last_update = date("YmdHis", $val->written->body);
-							if(!$obj->last_update) $obj->last_update = $obj->regdate;
-							$obj->tags = '';
-							$obj->readed_count = 0;
-							$obj->voted_count = 0;
-							if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id) {
-								$obj->password = '';
-								$obj->nick_name = $member_info->nick_name;
-								$obj->user_name = $member_info->user_name;
-								$obj->user_id = $member_info->user_id;
-								$obj->member_srl = $member_info->member_srl;
-								$obj->email_address = $member_info->email_address;
-								$obj->homepage = $member_info->homepage;
-							}
-							else {
-								$obj->password = $val->password->body;
-								$obj->nick_name = $val->commenter->name->body;
-								$obj->member_srl = 0;
-								$homepage = $val->commenter->homepage->body;
-							}
-							$obj->ipaddress = $val->commenter->ip->body;
-							$obj->list_order = $obj->update_order = $obj->document_srl*-1;
-							$obj->lock_comment = 'N';
-							$obj->notify_message = 'N';
-							$obj->trackback_count = 0;
-
-							$obj->comment_count = 0;
-							if($val->comment) {
-								$child_comment = $val->comment;
-								if(!is_array($child_comment)) $child_comment = array($child_comment);
-								foreach($child_comment as $k => $v) {
-									$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
-									if($result !== false) $obj->comment_count++;
-								}
-							}
-
-							// 문서 입력
-							$output = executeQuery('document.insertDocument', $obj);
-						}
-					}
-                }
-                FileHandler::removeFile($guestbook_file);
-            }
- 
-            return $idx-1;
-        }
-
-
-		function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl,$parent_srl = 0, $author_xml_id=null) {
-            $tobj = null;
-            if($textyle_guestbook_srl>0){
-	            $tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
-			}else{
-	            $tobj->textyle_guestbook_srl = getNextSequence();
-			}
-            $tobj->module_srl = $module_srl;
-            $tobj->is_secret = $val->secret->body=='1'?1:-1;
-            $tobj->content = nl2br($val->content->body);
-            if($author_xml_id && $val->commenter->attrs->id == $author_xml_id) {
-                $tobj->password = '';
-                $tobj->nick_name = $member_info->nick_name;
-                $tobj->user_name = $member_info->user_name;
-                $tobj->user_id = $member_info->user_id;
-                $tobj->member_srl = $member_info->member_srl;
-                $tobj->homepage = $member_info->homepage;
-                $tobj->email_address = $member_info->email_address;
-            } else {
-                $tobj->password = $val->password->body;
-                $tobj->nick_name = $val->commenter->name->body;
-                $tobj->homepage = $val->commenter->homepage->body;
-                $tobj->member_srl = 0;
-            }
-            $tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
-            $tobj->ipaddress = $val->commenter->ip->body;
-
-            if($parent_srl>0){
-				$tobj->parent_srl = $parent_srl;
-				$tobj->list_order = $tobj->parent_srl * -1;
-			}else{
-				$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
-			}
-
-			$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
-
-			if($output->toBool()) return $tobj->textyle_guestbook_srl;
-            return false;
-		}
-
-
-        /**
-         * @brief 첨부파일 정리
-         **/
-        function importAttaches($fp, $module_srl, $upload_target_srl, &$files, $buff) {
-            $uploaded_count = 0;
-
-            $file_obj  = null;
-            $file_obj->file_srl = getNextSequence();
-            $file_obj->upload_target_srl = $upload_target_srl;
-            $file_obj->module_srl = $module_srl;
-
-            while(!feof($fp)) {
-                $str = fgets($fp, 1024);
-
-                // </attaches>로 끝나면 중단
-                if(trim($str) == '</attachment>') break;
-
-                // <file>로 시작하면 xml파일내의 첨부파일로 처리
-                if(substr($str, 0, 9)=='<content>') {
-                    $file_obj->file = $this->saveTemporaryFile($fp, $str);
-                    continue;
-                }
-
-                $buff .= $str;
-            }
-            if(!file_exists($file_obj->file)) return false;
-
-            $buff .= '</attachment>';
-
-            $xmlDoc = $this->oXmlParser->parse($buff);
-
-            $file_obj->source_filename = $xmlDoc->attachment->label->body;
-            $file_obj->download_count = $xmlDoc->attachment->downloads->body;
-            $name = $xmlDoc->attachment->name->body;
-
-            // 이미지인지 기타 파일인지 체크하여 upload path 지정
-            if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_obj->source_filename)) {
-                $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
-                $filename = $path.$file_obj->source_filename;
-                $file_obj->direct_download = 'Y';
-            } else {
-                $path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
-                $filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
-                $file_obj->direct_download = 'N';
-            }
-
-            // 디렉토리 생성
-            if(!FileHandler::makeDir($path)) return;
-
-            FileHandler::rename($file_obj->file, $filename);
-
-            // DB입력
-            unset($file_obj->file);
-            $file_obj->uploaded_filename = $filename;
-            $file_obj->file_size = filesize($filename);
-            $file_obj->comment = NULL;
-            $file_obj->member_srl = 0;
-            $file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
-            $file_obj->isvalid = 'Y';
-            $output = executeQuery('file.insertFile', $file_obj);
-                    
-            if($output->toBool()) {
-                $uploaded_count++;
-                $tmp_obj = null;
-                if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
-                else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
-                $files[$name]->direct_download = $file_obj->direct_download;
-                $files[$name]->source_filename = $file_obj->source_filename;
-                return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * @biref 임의로 사용할 파일이름을 return
-         **/
-        function getTmpFilename() {
-            $path = "./files/cache/importer";
-            if(!is_dir($path)) FileHandler::makeDir($path);
-            $filename = sprintf("%s/%d", $path, rand(11111111,99999999));
-            if(file_exists($filename)) $filename .= rand(111,999);
-            return $filename;
-        }
-
-        /**
-         * @brief 특정 파일포인트로부터 key에 해당하는 값이 나타날때까지 buff를 읽음
-         **/
-        function saveTemporaryFile($fp, $buff) {
-            $temp_filename = $this->getTmpFilename();
-            $buff = substr($buff, 9);
-
-            while(!feof($fp)) {
-                $str = trim(fgets($fp, 1024));
-                $buff .= $str;
-                if(substr($str, -10) == '</content>') break;
-            }
-
-            $buff = substr($buff, 0, -10);
-
-            $f = fopen($temp_filename, "w");
-            fwrite($f, base64_decode($buff));
-            fclose($f);
-            return $temp_filename;
-        }
-
-        /**
-         * @brief ttxml의 자체 img 태그를 치환
-         **/
-        function _replaceTTAttach($matches) {
-            $name = $matches[2];
-            if(!$name) return $matches[0];
-
-            $obj = $this->files[$name];
-
-            // 멀티미디어성 파일의 경우
-            if($obj->direct_download == 'Y') {
-                // 이미지의 경우
-                if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename)) {
-                    return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
-                // 이미지 외의 멀티미디어성 파일의 경우
-                } else {
-                   return sprintf('<img src="./common/tpl/images/blank.gif" editor_component="multimedia_link" multimedia_src="%s" 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="" />', $obj->url);
-                }
-
-            // binary파일일 경우
-            } else {
-                return sprintf('<a href="%s">%s</a>', $obj->url, $obj->source_filename);
-            }
-        }
-
-        /**
-         * @brief ttxml의 동영상 변환
-         **/
-        function _replaceTTMovie($matches) {
-            $key = $matches[1];
-            if(!$key) return $matches[0];
-
-            return 
-                    '<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
-                    '<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'"/>'.
-                    '<param name="allowScriptAccess" value="always"/>'.
-                    '<param name="allowFullScreen" value="true"/>'.
-                    '<param name="bgcolor" value="#000000"/>'.
-                    '<embed src="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'" width="100%" height="402" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" bgcolor="#000000"/>'.
-                    '</object>';
-        }
-
-        /**
-         * @brief 댓글 입력 
-         **/
-        function insertComment($val, $module_srl, $document_srl, $member_info, $parent_srl = 0, $author_xml_id) {
-            $tobj = null;
-            $tobj->comment_srl = getNextSequence();
-            $tobj->module_srl = $module_srl;
-            $tobj->document_srl = $document_srl;
-            $tobj->is_secret = $val->secret->body=='1'?'Y':'N';
-            $tobj->notify_message = 'N';
-            $tobj->content = nl2br($val->content->body);
-            $tobj->voted_count = 0;
-            if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id) {
-                $tobj->password = '';
-                $tobj->nick_name = $member_info->nick_name;
-                $tobj->user_name = $member_info->user_name;
-                $tobj->user_id = $member_info->user_id;
-                $tobj->member_srl = $member_info->member_srl;
-                $tobj->homepage = $member_info->homepage;
-                $tobj->email_address = $member_info->email_address;
-            } else {
-                $tobj->password = $val->password->body;
-                $tobj->nick_name = $val->commenter->name->body;
-                $tobj->homepage = $val->commenter->homepage->body;
-                $tobj->member_srl = 0;
-            }
-            $tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
-            $tobj->ipaddress = $val->commenter->ip->body;
-            $tobj->list_order = $tobj->comment_srl*-1;
-            $tobj->sequence = $sequence;
-            $tobj->parent_srl = $parent_srl;
-
-            // 댓글 목록 부분을 먼저 입력
-            $list_args = null;
-            $list_args->comment_srl = $tobj->comment_srl;
-            $list_args->document_srl = $tobj->document_srl;
-            $list_args->module_srl = $tobj->module_srl;
-            $list_args->regdate = $tobj->regdate;
-
-            // 부모댓글이 없으면 바로 데이터를 설정
-            if(!$tobj->parent_srl) {
-                $list_args->head = $list_args->arrange = $tobj->comment_srl;
-                $list_args->depth = 0;
-
-            // 부모댓글이 있으면 부모글의 정보를 구해옴
-            } else {
-                // 부모댓글의 정보를 구함
-                $parent_args->comment_srl = $tobj->parent_srl;
-                $parent_output = executeQuery('comment.getCommentListItem', $parent_args);
-
-                // 부모댓글이 존재하지 않으면 return
-                if(!$parent_output->toBool() || !$parent_output->data) return false;
-                $parent = $parent_output->data;
-
-                $list_args->head = $parent->head;
-                $list_args->depth = $parent->depth+1;
-                if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
-                else {
-                    $list_args->arrange = $parent->arrange;
-                    $output = executeQuery('comment.updateCommentListArrange', $list_args);
-                    if(!$output->toBool()) return $output;
-                }
-            }
-
-            $output = executeQuery('comment.insertCommentList', $list_args);
-            if($output->toBool()) {
-                $output = executeQuery('comment.insertComment', $tobj);
-                if($output->toBool()) return $tobj->comment_srl;
-            }
-            return false;
-        }
-
-        // 카테고리 정리
-        function arrangeCategory($obj, &$category, &$idx, $parent = 0) {
-            if(!$obj->category) return;
-            if(!is_array($obj->category)) $c = array($obj->category);
-            else $c = $obj->category;
-            foreach($c as $val) {
-                $idx++;
-                $priority = $val->priority->body;
-                $name = $val->name->body;
-                $obj = null;
-                $obj->priority = $priority;
-                $obj->name = $name;
-                $obj->sequence = $idx;
-                $obj->parent = $parent;
-
-                $category[$idx] = $obj;
-
-                $this->arrangeCategory($val, $category, $idx, $idx);
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class ttimport 
+     * @author NHN (developers@xpressengine.com)
+     * @brief  ttxml import class
+     **/
+
+    @set_time_limit(0);
+    @require_once('./modules/importer/extract.class.php');
+
+    class ttimport {
+
+        var $oXmlParser = null;
+
+        /**
+         * @brief import data in module.xml format
+         **/
+        function importModule($key, $cur, $index_file, $unit_count, $module_srl, $guestbook_module_srl, $user_id, $module_name=null) {
+            // Pre-create the objects needed
+            $this->oXmlParser = new XmlParser();
+            // Get category information of the target module
+            $oDocumentController = &getController('document');
+            $oDocumentModel = &getModel('document');
+            $category_list = $category_titles = array();
+            $category_list = $oDocumentModel->getCategoryList($module_srl);
+            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+            // First handle categorty information
+            $category_file = preg_replace('/index$/i', 'category.xml', $index_file);
+            if(file_exists($category_file)) {
+                // Create the xmlParser object
+                $xmlDoc = $this->oXmlParser->loadXmlFile($category_file);
+                // List category information
+                if($xmlDoc->categories->category) {
+                    $categories = array();
+                    $idx = 0;
+                    $this->arrangeCategory($xmlDoc->categories, $categories, $idx, 0);
+
+                    $match_sequence = array();
+                    foreach($categories as $k => $v) {
+                        $category = $v->name;
+                        if(!$category || $category_titles[$category]) continue;
+
+                        $obj = null;
+                        $obj->title = $category;
+                        $obj->module_srl = $module_srl; 
+                        if($v->parent) $obj->parent_srl = $match_sequence[$v->parent];
+                        $output = $oDocumentController->insertCategory($obj);
+
+                        if($output->toBool()) $match_sequence[$v->sequence] = $category_titles[$category] = $output->get('category_srl');
+                    }
+                    $oDocumentController->makeCategoryFile($module_srl);
+                }
+                FileHandler::removeFile($category_file);
+            }
+            $category_list = $category_titles = array();
+            $category_list = $oDocumentModel->getCategoryList($module_srl);
+            if(count($category_list)) foreach($category_list as $key => $val) $category_titles[$val->title] = $val->category_srl;
+            // Get administrator information
+            $oMemberModel = &getModel('member');
+            $member_info = $oMemberModel->getMemberInfoByUserID($user_id);
+			$author_xml_id = 0;
+          
+            if(!$cur) $cur = 0;
+            // Open an index file
+            $f = fopen($index_file,"r");
+            // Pass if already read
+            for($i=0;$i<$cur;$i++) fgets($f, 1024);
+            // Read each line until the codition meets
+            for($idx=$cur;$idx<$cur+$unit_count;$idx++) {
+                if(feof($f)) break;
+                // Find a location
+                $target_file = trim(fgets($f, 1024));
+
+                if(!file_exists($target_file)) continue;
+                // Start importing data
+                $fp = fopen($target_file,"r");
+                if(!$fp) continue;
+
+                $obj = null;
+                $obj->module_srl = $module_srl;
+                $obj->document_srl = getNextSequence();
+                $obj->uploaded_count = 0;
+
+                $files = array();
+
+                $started = false;
+                $buff = null;
+                // Start importing from the body data
+                while(!feof($fp)) {
+                    $str = fgets($fp, 1024);
+                    // Prepare an item
+                    if(substr($str,0,5) == '<post') {
+                        $started = true;
+                        continue;
+                    // Import the attachment
+                    } else if(substr($str,0,12) == '<attachment ') {
+                        if($this->importAttaches($fp, $module_srl, $obj->document_srl, $files, $str)) $obj->uploaded_count++;
+                        continue;
+                    }
+
+                    if($started) $buff .= $str;
+                }
+
+                $xmlDoc = $this->oXmlParser->parse('<post>'.$buff);
+               
+				$author_xml_id = $xmlDoc->post->author->body;
+
+
+                if($xmlDoc->post->category->body) {
+                    $tmp_arr = explode('/',$xmlDoc->post->category->body);
+                    $category = trim($tmp_arr[count($tmp_arr)-1]);
+                    if($category_titles[$category]) $obj->category_srl = $category_titles[$category];
+                }
+
+                $obj->is_notice = 'N';
+                $obj->status = in_array($xmlDoc->post->visibility->body, array('public','syndicated'))?$oDocumentModel->getConfigStatus('public'):$oDocumentModel->getConfigStatus('secret');
+                $obj->title = $xmlDoc->post->title->body;
+                $obj->content = $xmlDoc->post->content->body;
+                $obj->password = md5($xmlDoc->post->password->body);
+                $obj->commentStatus = $xmlDoc->post->acceptcomment->body=='1'?'ALLOW':'DENY';
+                $obj->allow_trackback = $xmlDoc->post->accepttrackback->body=='1'?'Y':'N';
+                //$obj->allow_comment = $xmlDoc->post->acceptComment->body=='1'?'Y':'N';
+                //$obj->allow_trackback = $xmlDoc->post->acceptTrackback->body=='1'?'Y':'N';
+                $obj->regdate = date("YmdHis",$xmlDoc->post->published->body);
+                $obj->last_update = date("YmdHis", $xmlDoc->post->modified->body);
+                if(!$obj->last_update) $obj->last_update = $obj->regdate;
+
+                $tag = null;
+                $tmp_tags = null;
+                $tag = $xmlDoc->post->tag;
+                if($tag) {
+                    if(!is_array($tag)) $tag = array($tag);
+                    foreach($tag as $key => $val) $tmp_tags[] = $val->body;
+                    $obj->tags = implode(',',$tmp_tags);
+                }
+
+                $obj->readed_count = 0;
+                $obj->voted_count = 0;
+                $obj->nick_name = $member_info->nick_name;
+                $obj->user_name = $member_info->user_name;
+                $obj->user_id = $member_info->user_id;
+                $obj->member_srl = $member_info->member_srl;
+                $obj->email_address = $member_info->email_address;
+                $obj->homepage = $member_info->homepage;
+                $obj->ipaddress = $_REMOTE['SERVER_ADDR'];
+                $obj->list_order = $obj->update_order = $obj->document_srl*-1;
+                $obj->notify_message = 'N';
+                // Change content information (attachment)
+                $obj->content = str_replace('[##_ATTACH_PATH_##]/','',$obj->content);
+                if(count($files)) {
+                    foreach($files as $key => $val) {
+                        $obj->content = preg_replace('/(src|href)\=(["\']?)'.preg_quote($key).'(["\']?)/i','$1="'.$val->url.'"',$obj->content);
+                    }
+                }
+
+                $obj->content = preg_replace_callback('!\[##_Movie\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTMovie'), $obj->content);
+
+                if(count($files)) {
+                    $this->files = $files;
+                    $obj->content = preg_replace_callback('!\[##_([a-z0-9]+)\|([^\|]*)\|([^\|]*)\|(.*?)_##\]!is', array($this, '_replaceTTAttach'), $obj->content);
+                }
+                // Trackback inserted
+                $obj->trackback_count = 0;
+                if($xmlDoc->post->trackback) {
+                    $trackbacks = $xmlDoc->post->trackback;
+                    if(!is_array($trackbacks)) $trackbacks = array($trackbacks);
+                    if(count($trackbacks)) {
+                        foreach($trackbacks as $key => $val) {
+                            $tobj = null;
+                            $tobj->trackback_srl = getNextSequence();
+                            $tobj->module_srl = $module_srl;
+                            $tobj->document_srl = $obj->document_srl;
+                            $tobj->url = $val->url->body;
+                            $tobj->title = $val->title->body;
+                            $tobj->blog_name = $val->site->body;
+                            $tobj->excerpt = $val->excerpt->body;
+                            $tobj->regdate = date("YmdHis",$val->received->body);
+                            $tobj->ipaddress = $val->ip->body;
+                            $tobj->list_order = -1*$tobj->trackback_srl;
+                            $output = executeQuery('trackback.insertTrackback', $tobj);
+                            if($output->toBool()) $obj->trackback_count++;
+                        }
+                    }
+                }
+                // Comment
+                $obj->comment_count = 0;
+                if($xmlDoc->post->comment) {
+                    $comment = $xmlDoc->post->comment;
+                    if(!is_array($comment)) $comment = array($comment);
+                    foreach($comment as $key => $val) {
+                        $parent_srl = $this->insertComment($val, $module_srl, $obj->document_srl, $member_info, 0, $author_xml_id);
+                        if($parent_srl === false) continue;
+
+                        $obj->comment_count++;
+                        if($val->comment) {
+                            $child_comment = $val->comment;
+                            if(!is_array($child_comment)) $child_comment = array($child_comment);
+                            foreach($child_comment as $k => $v) {
+                                $result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, $parent_srl, $author_xml_id);
+                                if($result !== false) $obj->comment_count++;
+                            }
+                        }
+                    }
+                }
+
+                if($module_name == 'textyle') {
+                    $args->document_srl = $obj->document_srl;
+                    $args->module_srl = $obj->module_srl;
+                    $args->logs = serialize(null);
+                    $output = executeQuery('textyle.insertPublishLog', $args);
+                    // Visibility value of published state
+                    $status_published = array('public', 'syndicated');
+                    // Save state if not published
+                    if(!in_array($xmlDoc->post->visibility->body, $status_published)) {
+                        $obj->module_srl = $member_info->member_srl; 
+                    }
+                }
+                // Document
+                $output = executeQuery('document.insertDocument', $obj);
+
+                if($output->toBool()) {
+                    // Tags
+                    if($obj->tags) {
+                        $tag_list = explode(',',$obj->tags);
+                        $tag_count = count($tag_list);
+                        for($i=0;$i<$tag_count;$i++) {
+                            $args = null;
+                            $args->tag_srl = getNextSequence();
+                            $args->module_srl = $module_srl;
+                            $args->document_srl = $obj->document_srl;
+                            $args->tag = trim($tag_list[$i]);
+                            $args->regdate = $obj->regdate;
+                            if(!$args->tag) continue;
+                            $output = executeQuery('tag.insertTag', $args);
+                        }
+                    }
+                }
+
+                fclose($fp);
+                FileHandler::removeFile($target_file);
+            }
+
+            fclose($f);
+
+            if(count($category_list)) foreach($category_list as $key => $val) $oDocumentController->updateCategoryCount($module_srl, $val->category_srl);
+            // Guestbook information
+            $guestbook_file = preg_replace('/index$/i', 'guestbook.xml', $index_file);
+            if (file_exists($guestbook_file)) {
+                // Create the xmlParser object
+                $xmlDoc = $this->oXmlParser->loadXmlFile($guestbook_file);
+                // Handle guest book information
+                if($guestbook_module_srl && $xmlDoc->guestbook->comment) {
+                    $comment = $xmlDoc->guestbook->comment;
+                    if(!is_array($comment)) $comment = array($comment);
+					
+					if($module_name =='textyle'){
+						foreach($comment as $key => $val) {
+							$textyle_guestbook_srl  = getNextSequence();
+
+							if($val->comment) {
+								$child_comment = $val->comment;
+								if(!is_array($child_comment)) $child_comment = array($child_comment);
+								foreach($child_comment as $k => $v) {
+									$result = $this->insertTextyleGuestbookItem($v, $module_srl, $member_info,0,$textyle_guestbook_srl,$author_xml_id);
+								}
+							}
+
+							$result = $this->insertTextyleGuestbookItem($val, $module_srl, $member_info,$textyle_guestbook_srl,0,$author_xml_id);
+						}
+					}else{
+						foreach($comment as $key => $val) {
+							$obj = null;
+							$obj->module_srl = $guestbook_module_srl;
+							$obj->document_srl = getNextSequence();
+							$obj->uploaded_count = 0;
+							$obj->is_notice = 'N';
+							$obj->status = $val->secret->body=='1'?$oDocumentModel->getConfigStatus('secret'):$oDocumentModel->getConfigStatus('public');
+							$obj->content = nl2br($val->content->body);
+
+							// Extract a title form the bocy
+							$obj->title = cut_str(strip_tags($obj->content),20,'...');
+							if ($obj->title == '') $obj->title = 'Untitled';
+
+							$obj->commentStatus = 'ALLOW';
+							$obj->allow_trackback = 'N';
+							$obj->regdate = date("YmdHis",$val->written->body);
+							$obj->last_update = date("YmdHis", $val->written->body);
+							if(!$obj->last_update) $obj->last_update = $obj->regdate;
+							$obj->tags = '';
+							$obj->readed_count = 0;
+							$obj->voted_count = 0;
+							if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id) {
+								$obj->password = '';
+								$obj->nick_name = $member_info->nick_name;
+								$obj->user_name = $member_info->user_name;
+								$obj->user_id = $member_info->user_id;
+								$obj->member_srl = $member_info->member_srl;
+								$obj->email_address = $member_info->email_address;
+								$obj->homepage = $member_info->homepage;
+							}
+							else {
+								$obj->password = $val->password->body;
+								$obj->nick_name = $val->commenter->name->body;
+								$obj->member_srl = 0;
+								$homepage = $val->commenter->homepage->body;
+							}
+							$obj->ipaddress = $val->commenter->ip->body;
+							$obj->list_order = $obj->update_order = $obj->document_srl*-1;
+							$obj->notify_message = 'N';
+							$obj->trackback_count = 0;
+
+							$obj->comment_count = 0;
+							if($val->comment) {
+								$child_comment = $val->comment;
+								if(!is_array($child_comment)) $child_comment = array($child_comment);
+								foreach($child_comment as $k => $v) {
+									$result = $this->insertComment($v, $module_srl, $obj->document_srl, $member_info, 0,$author_xml_id);
+									if($result !== false) $obj->comment_count++;
+								}
+							}
+
+							// Document
+							$output = executeQuery('document.insertDocument', $obj);
+						}
+					}
+                }
+                FileHandler::removeFile($guestbook_file);
+            }
+ 
+            return $idx-1;
+        }
+
+
+		function insertTextyleGuestbookItem($val, $module_srl, $member_info, $textyle_guestbook_srl,$parent_srl = 0, $author_xml_id=null) {
+            $tobj = null;
+            if($textyle_guestbook_srl>0){
+	            $tobj->textyle_guestbook_srl = $textyle_guestbook_srl;
+			}else{
+	            $tobj->textyle_guestbook_srl = getNextSequence();
+			}
+            $tobj->module_srl = $module_srl;
+            $tobj->is_secret = $val->secret->body=='1'?1:-1;
+            $tobj->content = nl2br($val->content->body);
+            if($author_xml_id && $val->commenter->attrs->id == $author_xml_id) {
+                $tobj->password = '';
+                $tobj->nick_name = $member_info->nick_name;
+                $tobj->user_name = $member_info->user_name;
+                $tobj->user_id = $member_info->user_id;
+                $tobj->member_srl = $member_info->member_srl;
+                $tobj->homepage = $member_info->homepage;
+                $tobj->email_address = $member_info->email_address;
+            } else {
+                $tobj->password = $val->password->body;
+                $tobj->nick_name = $val->commenter->name->body;
+                $tobj->homepage = $val->commenter->homepage->body;
+                $tobj->member_srl = 0;
+            }
+            $tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+            $tobj->ipaddress = $val->commenter->ip->body;
+
+            if($parent_srl>0){
+				$tobj->parent_srl = $parent_srl;
+				$tobj->list_order = $tobj->parent_srl * -1;
+			}else{
+				$tobj->list_order = $tobj->textyle_guestbook_srl*-1;
+			}
+
+			$output = executeQuery('textyle.insertTextyleGuestbook', $tobj);
+
+			if($output->toBool()) return $tobj->textyle_guestbook_srl;
+            return false;
+		}
+
+
+        /**
+         * @brief Attachment
+         **/
+        function importAttaches($fp, $module_srl, $upload_target_srl, &$files, $buff) {
+            $uploaded_count = 0;
+
+            $file_obj  = null;
+            $file_obj->file_srl = getNextSequence();
+            $file_obj->upload_target_srl = $upload_target_srl;
+            $file_obj->module_srl = $module_srl;
+
+            while(!feof($fp)) {
+                $str = fgets($fp, 1024);
+                // If it ends with </attaches>, break
+                if(trim($str) == '</attachment>') break;
+                // If it starts with <file>, handle the attachement in the xml file
+                if(substr($str, 0, 9)=='<content>') {
+                    $file_obj->file = $this->saveTemporaryFile($fp, $str);
+                    continue;
+                }
+
+                $buff .= $str;
+            }
+            if(!file_exists($file_obj->file)) return false;
+
+            $buff .= '</attachment>';
+
+            $xmlDoc = $this->oXmlParser->parse($buff);
+
+            $file_obj->source_filename = $xmlDoc->attachment->label->body;
+            $file_obj->download_count = $xmlDoc->attachment->downloads->body;
+            $name = $xmlDoc->attachment->name->body;
+            // Set upload path by checking if the attachement is an image or other kind of file
+            if(preg_match("/\.(jpg|jpeg|gif|png|wmv|wma|mpg|mpeg|avi|swf|flv|mp1|mp2|mp3|mp4|asf|wav|asx|mid|midi|asf|mov|moov|qt|rm|ram|ra|rmm|m4v)$/i", $file_obj->source_filename)) {
+                $path = sprintf("./files/attach/images/%s/%s", $module_srl,getNumberingPath($upload_target_srl,3));
+                $filename = $path.$file_obj->source_filename;
+                $file_obj->direct_download = 'Y';
+            } else {
+                $path = sprintf("./files/attach/binaries/%s/%s", $module_srl, getNumberingPath($upload_target_srl,3));
+                $filename = $path.md5(crypt(rand(1000000,900000), rand(0,100)));
+                $file_obj->direct_download = 'N';
+            }
+            // Create a directory
+            if(!FileHandler::makeDir($path)) return;
+
+            FileHandler::rename($file_obj->file, $filename);
+            // Insert to the DB
+            unset($file_obj->file);
+            $file_obj->uploaded_filename = $filename;
+            $file_obj->file_size = filesize($filename);
+            $file_obj->comment = NULL;
+            $file_obj->member_srl = 0;
+            $file_obj->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));
+            $file_obj->isvalid = 'Y';
+            $output = executeQuery('file.insertFile', $file_obj);
+                    
+            if($output->toBool()) {
+                $uploaded_count++;
+                $tmp_obj = null;
+                if($file_obj->direct_download == 'Y') $files[$name]->url = $file_obj->uploaded_filename; 
+                else $files[$name]->url = getUrl('','module','file','act','procFileDownload','file_srl',$file_obj->file_srl,'sid',$file_obj->sid);
+                $files[$name]->direct_download = $file_obj->direct_download;
+                $files[$name]->source_filename = $file_obj->source_filename;
+                return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * @biref Return a filename to temporarily use
+         **/
+        function getTmpFilename() {
+            $path = "./files/cache/importer";
+            if(!is_dir($path)) FileHandler::makeDir($path);
+            $filename = sprintf("%s/%d", $path, rand(11111111,99999999));
+            if(file_exists($filename)) $filename .= rand(111,999);
+            return $filename;
+        }
+
+        /**
+         * @brief Read buff until key value comes out from a specific file point
+         **/
+        function saveTemporaryFile($fp, $buff) {
+            $temp_filename = $this->getTmpFilename();
+            $buff = substr($buff, 9);
+
+            while(!feof($fp)) {
+                $str = trim(fgets($fp, 1024));
+                $buff .= $str;
+                if(substr($str, -10) == '</content>') break;
+            }
+
+            $buff = substr($buff, 0, -10);
+
+            $f = fopen($temp_filename, "w");
+            fwrite($f, base64_decode($buff));
+            fclose($f);
+            return $temp_filename;
+        }
+
+        /**
+         * @brief Replace img tag in the ttxml
+         **/
+        function _replaceTTAttach($matches) {
+            $name = $matches[2];
+            if(!$name) return $matches[0];
+
+            $obj = $this->files[$name];
+            // If multimedia file is,
+            if($obj->direct_download == 'Y') {
+                // If image file is
+                if(preg_match('/\.(jpg|gif|jpeg|png)$/i', $obj->source_filename)) {
+                    return sprintf('<img editor_component="image_link" src="%s" alt="%s" />', $obj->url, str_replace('"','\\"',$matches[4]));
+                // If other multimedia file but image is, 
+                } else {
+                   return sprintf('<img src="./common/img/blank.gif" editor_component="multimedia_link" multimedia_src="%s" 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="" />', $obj->url);
+                }
+            // If binary file is
+            } else {
+                return sprintf('<a href="%s">%s</a>', $obj->url, $obj->source_filename);
+            }
+        }
+
+        /**
+         * @brief Convert the video file
+         **/
+        function _replaceTTMovie($matches) {
+            $key = $matches[1];
+            if(!$key) return $matches[0];
+
+            return 
+                    '<object type="application/x-shockwave-flash" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://fpdownload.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="100%" height="402">'.
+                    '<param name="movie" value="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'"/>'.
+                    '<param name="allowScriptAccess" value="always"/>'.
+                    '<param name="allowFullScreen" value="true"/>'.
+                    '<param name="bgcolor" value="#000000"/>'.
+                    '<embed src="http://flvs.daum.net/flvPlayer.swf?vid='.urlencode($key).'" width="100%" height="402" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" bgcolor="#000000"/>'.
+                    '</object>';
+        }
+
+        /**
+         * @brief Comment
+         **/
+        function insertComment($val, $module_srl, $document_srl, $member_info, $parent_srl = 0, $author_xml_id) {
+            $tobj = null;
+            $tobj->comment_srl = getNextSequence();
+            $tobj->module_srl = $module_srl;
+            $tobj->document_srl = $document_srl;
+            $tobj->is_secret = $val->secret->body=='1'?'Y':'N';
+            $tobj->notify_message = 'N';
+            $tobj->content = nl2br($val->content->body);
+            $tobj->voted_count = 0;
+            if ($author_xml_id && $val->commenter->attrs->id == $author_xml_id) {
+                $tobj->password = '';
+                $tobj->nick_name = $member_info->nick_name;
+                $tobj->user_name = $member_info->user_name;
+                $tobj->user_id = $member_info->user_id;
+                $tobj->member_srl = $member_info->member_srl;
+                $tobj->homepage = $member_info->homepage;
+                $tobj->email_address = $member_info->email_address;
+            } else {
+                $tobj->password = $val->password->body;
+                $tobj->nick_name = $val->commenter->name->body;
+                $tobj->homepage = $val->commenter->homepage->body;
+                $tobj->member_srl = 0;
+            }
+            $tobj->last_update = $tobj->regdate = date("YmdHis",$val->written->body);
+            $tobj->ipaddress = $val->commenter->ip->body;
+            $tobj->list_order = $tobj->comment_srl*-1;
+            $tobj->sequence = $sequence;
+            $tobj->parent_srl = $parent_srl;
+            // Comment list first
+            $list_args = null;
+            $list_args->comment_srl = $tobj->comment_srl;
+            $list_args->document_srl = $tobj->document_srl;
+            $list_args->module_srl = $tobj->module_srl;
+            $list_args->regdate = $tobj->regdate;
+            // Set data directly if parent comment doesn't exist
+            if(!$tobj->parent_srl) {
+                $list_args->head = $list_args->arrange = $tobj->comment_srl;
+                $list_args->depth = 0;
+            // Get parent_srl if parent comment exists
+            } else {
+                // Get parent_srl
+                $parent_args->comment_srl = $tobj->parent_srl;
+                $parent_output = executeQuery('comment.getCommentListItem', $parent_args);
+                // Return if parent comment doesn't exist
+                if(!$parent_output->toBool() || !$parent_output->data) return false;
+                $parent = $parent_output->data;
+
+                $list_args->head = $parent->head;
+                $list_args->depth = $parent->depth+1;
+                if($list_args->depth<2) $list_args->arrange = $tobj->comment_srl;
+                else {
+                    $list_args->arrange = $parent->arrange;
+                    $output = executeQuery('comment.updateCommentListArrange', $list_args);
+                    if(!$output->toBool()) return $output;
+                }
+            }
+
+            $output = executeQuery('comment.insertCommentList', $list_args);
+            if($output->toBool()) {
+                $output = executeQuery('comment.insertComment', $tobj);
+                if($output->toBool()) return $tobj->comment_srl;
+            }
+            return false;
+        }
+        // List category
+        function arrangeCategory($obj, &$category, &$idx, $parent = 0) {
+            if(!$obj->category) return;
+            if(!is_array($obj->category)) $c = array($obj->category);
+            else $c = $obj->category;
+            foreach($c as $val) {
+                $idx++;
+                $priority = $val->priority->body;
+                $name = $val->name->body;
+                $obj = null;
+                $obj->priority = $priority;
+                $obj->name = $name;
+                $obj->sequence = $idx;
+                $obj->parent = $parent;
+
+                $category[$idx] = $obj;
+
+                $this->arrangeCategory($val, $category, $idx, $idx);
+            }
+        }
+    }
+?>
diff --git a/modules/install/conf/info.xml b/modules/install/conf/info.xml
index 24d00651f..dfa9eb5d9 100644
--- a/modules/install/conf/info.xml
+++ b/modules/install/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">설치관리</title>
-    <title xml:lang="en">Manage installation</title>
-    <title xml:lang="vi">Quản lý cài đặt</title>
-    <title xml:lang="zh-CN">安装管理</title>
-    <title xml:lang="jp">インストール管理</title>
-    <title xml:lang="es">Manajo de la Instalación</title>
-    <title xml:lang="ru">Управление установкой</title>
-    <title xml:lang="zh-TW">安裝管理</title>
-    <title xml:lang="tr">Kurulumu yönet</title>
-    <description xml:lang="ko">설치 관리 모듈</description>
-    <description xml:lang="en">Module for managing installation</description>
-    <description xml:lang="vi">Module quản lý cài đặt</description>
-    <description xml:lang="zh-CN">安装管理模块。</description>
-    <description xml:lang="jp">インストール管理モジュール</description>
-    <description xml:lang="es">Módulo para el manejo de la instalación</description>
-    <description xml:lang="ru">Модуль для управления установкой</description>
-    <description xml:lang="zh-TW">安裝管理模組</description>
-    <description xml:lang="tr">Kurulumu yönetmek için olan modüldür</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>system</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">설치관리</title>
+    <title xml:lang="en">Manage installation</title>
+    <title xml:lang="vi">Quản lý cài đặt</title>
+    <title xml:lang="zh-CN">安装管理</title>
+    <title xml:lang="jp">インストール管理</title>
+    <title xml:lang="es">Manajo de la Instalación</title>
+    <title xml:lang="ru">Управление установкой</title>
+    <title xml:lang="zh-TW">安裝管理</title>
+    <title xml:lang="tr">Kurulumu yönet</title>
+    <description xml:lang="ko">설치 관리 모듈</description>
+    <description xml:lang="en">Module for managing installations</description>
+    <description xml:lang="vi">Module quản lý cài đặt</description>
+    <description xml:lang="zh-CN">安装管理模块。</description>
+    <description xml:lang="jp">インストール管理モジュール</description>
+    <description xml:lang="es">Módulo para el manejo de la instalación</description>
+    <description xml:lang="ru">Модуль для управления установкой</description>
+    <description xml:lang="zh-TW">安裝管理模組</description>
+    <description xml:lang="tr">Kurulumu yönetmek için olan modüldür</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>system</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/install/conf/module.xml b/modules/install/conf/module.xml
index 39073b438..cc8ba1af0 100644
--- a/modules/install/conf/module.xml
+++ b/modules/install/conf/module.xml
@@ -6,17 +6,26 @@
         <action name="dispInstallIntroduce" type="view" standalone="true" index="true" />
         <action name="dispInstallCheckEnv" type="view" standalone="true" />
         <action name="dispInstallSelectDB" type="view" standalone="true" />
-        <action name="dispInstallForm" type="view" standalone="true" />
-
-        <action name="procInstall" type="controller" standalone="true" />
+        <action name="dispInstallDBForm" type="view" standalone="true" />
+        <action name="dispInstallConfigForm" type="view" standalone="true" />
+        <action name="dispInstallManagerForm" type="view" standalone="true" />
+        <action name="procInstallAgreement" type="controller" standalone="true" />
+        <action name="procCubridDBSetting" type="controller" standalone="true" ruleset="cubrid" />
+        <action name="procFirebirdDBSetting" type="controller" standalone="true" ruleset="firebird" />
+        <action name="procMssqlDBSetting" type="controller" standalone="true" ruleset="mssql" />
+        <action name="procMysqlDBSetting" type="controller" standalone="true" ruleset="mysql" />
+        <action name="procPostgresqlDBSetting" type="controller" standalone="true" ruleset="postgresql" />
+        <action name="procSqliteDBSetting" type="controller" standalone="true" ruleset="sqlite" />
+        <action name="procConfigSetting" type="controller" standalone="true" ruleset="config" />
+        <action name="procInstall" type="controller" standalone="true" ruleset="install" />
         <action name="procInstallFTP" type="controller" standalone="true" />
         <action name="procInstallCheckFTP" type="controller" standalone="true" />
         <action name="procInstallAdminInstall" type="controller" standalone="true" />
         <action name="procInstallAdminUpdate" type="controller" standalone="true" />
-        <action name="procInstallAdminSaveTimeZone" type="controller" standalone="true" />
-        <action name="procInstallAdminSaveLangSelected" type="controller" standalone="true" />
-        <action name="procInstallAdminSaveFTPInfo" type="controller" standalone="true" />
+        <action name="procInstallAdminSaveTimeZone" type="controller" standalone="true" />        
+        <action name="procInstallAdminSaveFTPInfo" type="controller" standalone="true" ruleset="installFtpInfo" />
         <action name="procInstallAdminRemoveFTPInfo" type="controller" standalone="true" />
+		<action name="procInstallAdminConfig" type="controller" standalone="true" />
         <action name="getInstallFTPList" type="model" standalone="true" />
     </actions>
 </module>
diff --git a/modules/install/install.admin.controller.php b/modules/install/install.admin.controller.php
index 7d11d23ca..b96c1d93a 100644
--- a/modules/install/install.admin.controller.php
+++ b/modules/install/install.admin.controller.php
@@ -1,162 +1,235 @@
-<?php
-    /**
-     * @class  installAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  install module의 admin controller class
-     **/
-
-    class installAdminController extends install {
-
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 모듈 설치
-         **/
-        function procInstallAdminInstall() {
-            $module_name = Context::get('module_name');
-            if(!$module_name) return new object(-1, 'invalid_request');
-
-            $oInstallController = &getController('install');
-            $oInstallController->installModule($module_name, './modules/'.$module_name);
-
-            $this->setMessage('success_installed');
-        }
-
-        /**
-         * @brief 모듈 업데이트
-         **/
-        function procInstallAdminUpdate() {
-            $module_name = Context::get('module_name');
-            if(!$module_name) return new object(-1, 'invalid_request');
-
-            $oModule = &getModule($module_name, 'class');
-            if($oModule) $output = $oModule->moduleUpdate();
-            else $output = new Object(-1, 'invalid_request');
-
-            return $output;
-        }
-
-        /**
-         * @brief 설정 변경
-         **/
-        function procInstallAdminSaveTimeZone() {
-            $use_rewrite = Context::get('use_rewrite');
-            if($use_rewrite!='Y') $use_rewrite = 'N';
-
-            $use_sso = Context::get('use_sso');
-            if($use_sso !='Y') $use_sso = 'N';
-
-            $time_zone = Context::get('time_zone');
-
-            $qmail_compatibility = Context::get('qmail_compatibility');
-            if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
-
-            $use_db_session = Context::get('use_db_session');
-            if($use_db_session!='Y') $use_db_session = 'N';
-
-            $use_ssl = Context::get('use_ssl');
-            if(!$use_ssl) $use_ssl = 'none';
-
-            $http_port = Context::get('http_port');
-            $https_port = Context::get('https_port');
-
-			$use_mobile_view = Context::get('use_mobile_view');
-			if($use_mobile_view!='Y') $use_mobile_view = 'N';
-
-            $db_info = Context::getDBInfo();
-            $db_info->default_url = Context::get('default_url');
-            if($db_info->default_url && !preg_match('/^(http|https):\/\//i', $db_info->default_url)) $db_info->default_url = 'http://'.$db_info->default_url;
-            $db_info->time_zone = $time_zone;
-            $db_info->qmail_compatibility = $qmail_compatibility;
-            $db_info->use_db_session = $use_db_session;
-            $db_info->use_rewrite = $use_rewrite;
-            $db_info->use_sso = $use_sso;
-            $db_info->use_ssl = $use_ssl;
-			$db_info->use_mobile_view = $use_mobile_view;
-            if($http_port) $db_info->http_port = (int) $http_port;
-            else if($db_info->http_port) unset($db_info->http_port);
-
-            if($https_port) $db_info->https_port = (int) $https_port;
-            else if($db_info->https_port) unset($db_info->https_port);
-
-            unset($db_info->lang_type);
-            Context::setDBInfo($db_info);
-
-            $oInstallController = &getController('install');
-            $oInstallController->makeConfigFile();
-
-            $site_args->site_srl = 0;
-            $site_args->index_module_srl = Context::get('index_module_srl');
-            $site_args->default_language = Context::get('change_lang_type');
-            $site_args->domain = $db_info->default_url;
-            $oModuleController = &getController('module');
-            $oModuleController->updateSite($site_args);
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 지원 언어 선택
-         **/
-        function procInstallAdminSaveLangSelected() {
-            $selected_lang = trim(Context::get('selected_lang'));
-            if(!$selected_lang) return new Object(-1,'msg_invalid_request');
-            $langs = explode('|@|', $selected_lang);
-
-            $lang_supported = Context::loadLangSupported();
-            $buff = null;
-            for($i=0;$i<count($langs);$i++) {
-                $buff .= sprintf("%s,%s\n", $langs[$i], $lang_supported[$langs[$i]]);
-
-            }
-            FileHandler::writeFile(_XE_PATH_.'files/config/lang_selected.info', trim($buff));
-
-            $this->setMessage('success_updated');
-        }
-
-        function procInstallAdminRemoveFTPInfo() {
-            $ftp_config_file = Context::getFTPConfigFile(); 
-            if(file_exists($ftp_config_file)) unlink($ftp_config_file);
-            if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
-            $this->setMessage('success_deleted');
-        }
-
-        function procInstallAdminSaveFTPInfo() {
-            $ftp_info = Context::getFTPInfo();
-            $ftp_info->ftp_user = Context::get('ftp_user');
-            $ftp_info->ftp_port = Context::get('ftp_port');
-            $ftp_info->ftp_host = Context::get('ftp_host');
-			$ftp_info->ftp_pasv = Context::get('ftp_pasv');
-			if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
-            $ftp_info->sftp = Context::get('sftp');
-
-			$ftp_root_path = Context::get('ftp_root_path');
-			if (substr($ftp_root_path, strlen($ftp_root_path)-1) == "/") {
-				$ftp_info->ftp_root_path = $ftp_root_path;
-			} else {
-				$ftp_info->ftp_root_path = $ftp_root_path.'/';
-			}
-
-            if(ini_get('safe_mode')) {
-                $ftp_info->ftp_password = Context::get('ftp_password');
-            }
-            
-            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
-            foreach($ftp_info as $key => $val) {
-                if(!$val) continue;
-                $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
-            }
-            $buff .= "?>";
-            $config_file = Context::getFTPConfigFile();
-            FileHandler::WriteFile($config_file, $buff);
-            if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
-            $this->setMessage('success_updated');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  installAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of the install module
+     **/
+
+    class installAdminController extends install {
+
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Install the module
+         **/
+        function procInstallAdminInstall() {
+            $module_name = Context::get('module_name');
+            if(!$module_name) return new object(-1, 'invalid_request');
+
+            $oInstallController = &getController('install');
+            $oInstallController->installModule($module_name, './modules/'.$module_name);
+
+            $this->setMessage('success_installed');
+        }
+
+        /**
+         * @brief Upate the module
+         **/
+        function procInstallAdminUpdate() {
+			set_time_limit(0);
+            $module_name = Context::get('module_name');
+            if(!$module_name) return new object(-1, 'invalid_request');
+
+            $oModule = &getModule($module_name, 'class');
+            if($oModule) $output = $oModule->moduleUpdate();
+            else $output = new Object(-1, 'invalid_request');
+
+            return $output;
+        }
+
+        /**
+         * @brief Change settings
+         **/
+        function procInstallAdminSaveTimeZone() {
+            $use_rewrite = Context::get('use_rewrite');
+            if($use_rewrite!='Y') $use_rewrite = 'N';
+
+            $use_sso = Context::get('use_sso');
+            if($use_sso !='Y') $use_sso = 'N';
+
+			$use_cdn = Context::get('use_cdn');
+			if($use_cdn != 'Y') $use_cdn = 'N';
+
+            $time_zone = Context::get('time_zone');
+
+            $qmail_compatibility = Context::get('qmail_compatibility');
+            if($qmail_compatibility!='Y') $qmail_compatibility = 'N';
+
+            $use_db_session = Context::get('use_db_session');
+            if($use_db_session!='Y') $use_db_session = 'N';
+
+            $use_ssl = Context::get('use_ssl');
+            if(!$use_ssl) $use_ssl = 'none';
+
+			$use_html5 = Context::get('use_html5');
+			if(!$use_html5) $use_html5 = 'N';
+
+            $http_port = Context::get('http_port');
+            $https_port = Context::get('https_port');
+
+			$use_mobile_view = Context::get('use_mobile_view');
+			if($use_mobile_view!='Y') $use_mobile_view = 'N';
+
+			$admin_ip_list = Context::get('admin_ip_list');
+
+			$admin_ip_list = preg_replace("/[\r|\n|\r\n]+/",",",$admin_ip_list);
+			$admin_ip_list = preg_replace("/\s+/","",$admin_ip_list);
+
+			$db_info = Context::getDBInfo();
+            $db_info->default_url = Context::get('default_url');
+            if($db_info->default_url && !preg_match('/^(http|https):\/\//i', $db_info->default_url)) $db_info->default_url = 'http://'.$db_info->default_url;
+            $db_info->time_zone = $time_zone;
+            $db_info->qmail_compatibility = $qmail_compatibility;
+            $db_info->use_db_session = $use_db_session;
+            $db_info->use_rewrite = $use_rewrite;
+            $db_info->use_sso = $use_sso;
+            $db_info->use_ssl = $use_ssl;
+			$db_info->use_cdn = $use_cdn;
+			$db_info->use_html5 = $use_html5;
+			$db_info->use_mobile_view = $use_mobile_view;
+			$db_info->admin_ip_list = $admin_ip_list;
+
+			if($http_port) $db_info->http_port = (int) $http_port;
+            else if($db_info->http_port) unset($db_info->http_port);
+
+            if($https_port) $db_info->https_port = (int) $https_port;
+            else if($db_info->https_port) unset($db_info->https_port);
+
+            unset($db_info->lang_type);
+            Context::setDBInfo($db_info);
+
+            $oInstallController = &getController('install');
+            $oInstallController->makeConfigFile();
+
+            $site_args->site_srl = 0;
+            $site_args->index_module_srl = Context::get('index_module_srl');
+            $site_args->default_language = Context::get('change_lang_type');
+            $site_args->domain = $db_info->default_url;
+            $oModuleController = &getController('module');
+            $oModuleController->updateSite($site_args);
+
+			$this->setMessage('success_updated');
+        }
+
+        function procInstallAdminRemoveFTPInfo() {
+            $ftp_config_file = Context::getFTPConfigFile();
+            if(file_exists($ftp_config_file)) unlink($ftp_config_file);
+            if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+            $this->setMessage('success_deleted');
+        }
+
+        function procInstallAdminSaveFTPInfo() {
+            $ftp_info = Context::getFTPInfo();
+            $ftp_info->ftp_user = Context::get('ftp_user');
+            $ftp_info->ftp_port = Context::get('ftp_port');
+            $ftp_info->ftp_host = Context::get('ftp_host');
+			$ftp_info->ftp_pasv = Context::get('ftp_pasv');
+			if(!$ftp_info->ftp_pasv) $ftp_info->ftp_pasv = "N";
+            $ftp_info->sftp = Context::get('sftp');
+
+			$ftp_root_path = Context::get('ftp_root_path');
+			if (substr($ftp_root_path, strlen($ftp_root_path)-1) == "/") {
+				$ftp_info->ftp_root_path = $ftp_root_path;
+			} else {
+				$ftp_info->ftp_root_path = $ftp_root_path.'/';
+			}
+
+            if(ini_get('safe_mode')) {
+                $ftp_info->ftp_password = Context::get('ftp_password');
+            }
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
+            foreach($ftp_info as $key => $val) {
+                if(!$val) continue;
+                $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+            }
+            $buff .= "?>";
+            $config_file = Context::getFTPConfigFile();
+            FileHandler::WriteFile($config_file, $buff);
+            if($_SESSION['ftp_password']) unset($_SESSION['ftp_password']);
+            $this->setMessage('success_updated');
+			$this->setRedirectUrl(Context::get('error_return_url'));
+		}
+
+		function procInstallAdminConfig(){
+			$this->procInstallAdminSaveTimeZone();
+
+			//언어 선택
+			$selected_lang = Context::get('selected_lang');
+			$this->saveLangSelected($selected_lang);
+
+			//모듈 설정 저장(썸네일, 풋터스크립트)
+			$config->thumbnail_type = Context::get('thumbnail_type');
+			$config->htmlFooter = Context::get('htmlFooter');
+			$this->setModulesConfig($config);
+
+			//파비콘
+			$favicon = Context::get('favicon');
+			$this->saveIcon($favicon,'favicon.ico');
+
+			//모바일아이콘
+			$mobicon = Context::get('mobicon');
+			$this->saveIcon($mobicon,'mobicon.png');
+
+			$this->setRedirectUrl(Context::get('error_return_url'));
+		}
+
+		//from procInstallAdminSaveTimeZone
+		/**
+         * @brief Supported languages (was procInstallAdminSaveLangSelected)
+         **/
+		function saveLangSelected($selected_lang){
+			$langs = $selected_lang;
+
+            $lang_supported = Context::loadLangSupported();
+            $buff = null;
+            for($i=0;$i<count($langs);$i++) {
+                $buff .= sprintf("%s,%s\n", $langs[$i], $lang_supported[$langs[$i]]);
+
+            }
+            FileHandler::writeFile(_XE_PATH_.'files/config/lang_selected.info', trim($buff));
+			//$this->setMessage('success_updated');
+		}
+
+		/* 썸내일 보여주기 방식 변경.*/
+		function setModulesConfig($config){
+
+			if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) $args->thumbnail_type = 'crop';
+			else $args->thumbnail_type = 'ratio';
+
+			$oModuleController = &getController('module');
+			$oModuleController->insertModuleConfig('document',$args);
+			
+			unset($args);
+			
+			$args->htmlFooter = $config->htmlFooter;
+			$oModuleController->insertModuleConfig('module',$args);
+
+			return $output;
+		}
+
+		function saveIcon($icon,$iconname){
+			$mobicon_size = array('57','114');
+			$target_file = $icon['tmp_name'];
+			$type = $icon['type'];
+			$target_filename = _XE_PATH_.'files/attach/xeicon/'.$iconname;
+
+			list($width, $height, $type_no, $attrs) = @getimagesize($target_file);
+			if($iconname == 'favicon.ico' && preg_match('/^.*(icon).*$/',$type)){
+				$fitHeight = $fitWidth = '16';
+			} else if($iconname == 'mobicon.png' && preg_match('/^.*(png).*$/',$type) && in_array($height,$mobicon_size) && in_array($width,$mobicon_size)) {
+				$fitHeight = $fitWidth = $height;
+			} else{
+				return false;
+			}
+			//FileHandler::createImageFile($target_file, $target_filename, $fitHeight, $fitWidth, $ext);
+			FileHandler::copyFile($target_file, $target_filename);
+		}
+
+    }
+?>
diff --git a/modules/install/install.class.php b/modules/install/install.class.php
index b71c79123..6a0d04fcf 100644
--- a/modules/install/install.class.php
+++ b/modules/install/install.class.php
@@ -1,37 +1,37 @@
-<?php
-    /**
-     * @class  install
-     * @author NHN (developers@xpressengine.com)
-     * @brief  install module의 high class
-     **/
-
-    class install extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object();
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  install
+     * @author NHN (developers@xpressengine.com)
+     * @brief install module of the high class
+     **/
+
+    class install extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            return new Object();
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/install/install.controller.php b/modules/install/install.controller.php
index 8e481c2ae..599866aff 100644
--- a/modules/install/install.controller.php
+++ b/modules/install/install.controller.php
@@ -1,363 +1,591 @@
-<?php
-    /**
-     * @class  installController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  install module의 Controller class
-     **/
-
-    class installController extends install {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 설치가 되어 있으면 오류
-            if(Context::isInstalled()) {
-                return new Object(-1, 'msg_already_installed');
-            }
-        }
-
-        /**
-         * @brief 입력받은 정보로 설치를 함
-         **/
-        function procInstall() {
-            // 설치가 되어 있는지에 대한 체크
-            if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
-
-            // 설치시 임시로 최고관리자로 지정
-            $logged_info->is_admin = 'Y';
-            $_SESSION['logged_info'] = $logged_info;
-            Context::set('logged_info', $logged_info);
-
-            // DB와 관련된 변수를 받음
-            $db_info = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix','time_zone','use_rewrite');
-            if($db_info->use_rewrite!='Y') $db_info->use_rewrite = 'N';
-            if(!$db_info->default_url) $db_info->default_url = Context::getRequestUri();
-            $db_info->lang_type = Context::getLangType();
-
-            // DB의 타입과 정보를 등록
-            Context::setDBInfo($db_info);
-
-            // DB Instance 생성
-            $oDB = &DB::getInstance();
-
-            // DB접속이 가능한지 체크
-            $output = $oDB->getError();
-            if(!$oDB->isConnected()) return $oDB->getError();
-
-            // firebird는 설치시에 트랜젝션을 사용하지 않음
-            if($db_info->db_type != "firebird") $oDB->begin();
-
-            // 모든 모듈의 설치
-            $this->installDownloadedModule();
-
-            if($db_info->db_type != "firebird") $oDB->commit();
-
-            // config 파일 생성
-            if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
-
-			// load script
-            $scripts = FileHandler::readDir('./modules/install/script','/(\.php)$/');
-			if(count($scripts)>0){
-				sort($scripts);
-				foreach($scripts as $script){
-					$output = include(FileHandler::getRealPath('./modules/install/script/'.$script));
-				}
-			}
-
-            // 설치 완료 메세지 출력
-            $this->setMessage('msg_install_completed');
-        }
-
-        /**
-         * @brief FTP 정보 등록
-         **/
-        function procInstallFTP() {
-            if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
-            $ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
-            $ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-            if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-			if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
-			if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
-
-            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
-            foreach($ftp_info as $key => $val) {
-                $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
-            }
-            $buff .= "?>";
-
-            // safe_mode 일 경우
-            if(ini_get('safe_mode')) {
-                if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
-
-                require_once(_XE_PATH_.'libs/ftp.class.php');
-                $oFtp = new ftp();
-                if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1,'msg_ftp_not_connected');
-
-                if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
-                    $oFtp->ftp_quit();
-                    return new Object(-1,'msg_ftp_invalid_auth_info');
-                }
-
-                if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files')) {
-                    $oFtp->ftp_quit();
-                    return new Object(-1,'msg_ftp_mkdir_fail');
-                }
-
-                if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files')) {
-                    $oFtp->ftp_quit();
-                    return new Object(-1,'msg_ftp_chmod_fail');
-                }
-
-                if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config')) {
-                    $oFtp->ftp_quit();
-                    return new Object(-1,'msg_ftp_mkdir_fail');
-                }
-
-                if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config')) {
-                    $oFtp->ftp_quit();
-                    return new Object(-1,'msg_ftp_chmod_fail');
-                }
-
-                $oFtp->ftp_quit();
-            } 
-
-            $config_file = Context::getFTPConfigFile();
-            FileHandler::WriteFile($config_file, $buff);
-        }
-
-        function procInstallCheckFtp() {
-            $ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
-            $ftp_info->ftp_port = (int)$ftp_info->ftp_port;
-            if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
-            if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
-
-            if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
-
-            if($ftp_info->sftp == 'Y')
-            {
-                $connection = ssh2_connect('localhost', $ftp_info->ftp_port);
-                if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
-                {
-                    return new Object(-1,'msg_ftp_invalid_auth_info');
-                }
-            }
-            else
-            {
-                require_once(_XE_PATH_.'libs/ftp.class.php');
-                $oFtp = new ftp();
-                if(!$oFtp->ftp_connect('localhost', $ftp_info->ftp_port)) return new Object(-1,'msg_ftp_not_connected');
-
-                if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
-                    $oFtp->ftp_quit();
-                    return new Object(-1,'msg_ftp_invalid_auth_info');
-                }
-
-                $oFtp->ftp_quit();
-            }
-
-            $this->setMessage('msg_ftp_connect_success');
-        }
-
-        /**
-         * @brief 인스톨 환경을 체크하여 결과 return 
-         **/
-        function checkInstallEnv() {
-            // 각 필요한 항목 체크
-            $checklist = array();
-
-            // 0. php 버전 체크 (5.2.2는 설치 불가)
-            if(phpversion()=='5.2.2') $checklist['php_version'] = false;
-            else $checklist['php_version'] = true;
-
-            // 1. permission 체크
-            if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
-            else $checklist['permission'] = false;
-
-            // 2. xml_parser_create함수 유무 체크
-            if(function_exists('xml_parser_create')) $checklist['xml'] = true;
-            else $checklist['xml'] = false;
-
-            // 3. ini_get(session.auto_start)==1 체크
-            if(ini_get(session.auto_start)!=1) $checklist['session'] = true;
-            else $checklist['session'] = false;
-
-            // 4. iconv 체크
-            if(function_exists('iconv')) $checklist['iconv'] = true;
-            else $checklist['iconv'] = false;
-
-            // 5. gd 체크 (imagecreatefromgif함수)
-            if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
-            else $checklist['gd'] = false;
-
-            if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session']) $install_enable = false;
-            else $install_enable = true;
-
-            // 체크 결과를 Context에 저장
-            Context::set('checklist', $checklist);
-            Context::set('install_enable', $install_enable);
-
-            return $install_enable;
-        }
-
-        /**
-         * @brief files 및 하위 디렉토리 생성
-         * DB 정보를 바탕으로 실제 install하기 전에 로컬 환경 설저d
-         **/
-        function makeDefaultDirectory() {
-            $directory_list = array(
-                    './files/config',
-                    './files/cache/queries',
-                    './files/cache/js_filter_compiled',
-                    './files/cache/template_compiled',
-                );
-
-            foreach($directory_list as $dir) {
-                FileHandler::makeDir($dir);
-            }
-        }
-
-        /**
-         * @brief 모든 모듈의 설치 
-         *
-         * 모든 module의 schemas 디렉토리를 확인하여 schema xml을 이용, 테이블 생성
-         **/
-        function installDownloadedModule() { 
-            $oModuleModel = &getModel('module');
-
-            // 각 모듈의 schemas/*.xml 파일을 모두 찾아서 table 생성
-            $module_list = FileHandler::readDir('./modules/', NULL, false, true);
-            foreach($module_list as $module_path) {
-                // 모듈 이름을 구함
-                $tmp_arr = explode('/',$module_path);
-                $module = $tmp_arr[count($tmp_arr)-1];
-
-                $xml_info = $oModuleModel->getModuleInfoXml($module);
-                if(!$xml_info) continue;
-                $modules[$xml_info->category][] = $module;
-            }
-
-            // module 모듈은 미리 설치
-            $this->installModule('module','./modules/module');
-            $oModule = &getClass('module');
-            if($oModule->checkUpdate()) $oModule->moduleUpdate();
-
-            // 모듈을 category에 의거 설치 순서를 정함
-            $install_step = array('system','content','member');
-            // 나머지 모든 모듈 설치
-            foreach($install_step as $category) {
-                if(count($modules[$category])) {
-                    foreach($modules[$category] as $module) {
-                        if($module == 'module') continue;
-                        $this->installModule($module, sprintf('./modules/%s', $module));
-
-                        $oModule = &getClass($module);
-                        if($oModule->checkUpdate()) $oModule->moduleUpdate();
-                    }
-                    unset($modules[$category]);
-                }
-            }
-
-            // 나머지 모든 모듈 설치
-            if(count($modules)) {
-                foreach($modules as $category => $module_list) {
-                    if(count($module_list)) {
-                        foreach($module_list as $module) {
-                            if($module == 'module') continue;
-                            $this->installModule($module, sprintf('./modules/%s', $module));
-
-                            $oModule = &getClass($module);
-							if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
-							{
-								if($oModule->checkUpdate()) $oModule->moduleUpdate();
-							}
-                        }
-                    }
-                }
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief 개별 모듈의 설치
-         **/
-        function installModule($module, $module_path) {
-            // db instance생성
-            $oDB = &DB::getInstance();
-
-            // 해당 모듈의 schemas 디렉토리를 검사하여 schema xml파일이 있으면 생성
-            $schema_dir = sprintf('%s/schemas/', $module_path);
-            $schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
-
-            $file_cnt = count($schema_files);
-            for($i=0;$i<$file_cnt;$i++) {
-                $file = trim($schema_files[$i]);
-                if(!$file || substr($file,-4)!='.xml') continue;
-                $output = $oDB->createTableByXmlFile($file);
-            }
-
-            // 테이블 설치후 module instance를 만들고 install() method를 실행
-            unset($oModule);
-            $oModule = &getClass($module);
-            if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
-
-            return new Object();
-        }
-
-        /**
-         * @brief config 파일을 생성
-         * 모든 설정이 이상없이 끝난 후에 config파일 생성
-         **/
-        function makeConfigFile() {
-            $config_file = Context::getConfigFile();
-            //if(file_exists($config_file)) return;
-
-            $db_info = Context::getDbInfo();
-            if(!$db_info) return;
-
-            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
-            foreach($db_info as $key => $val) {
-                $buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
-            }
-            $buff .= "?>";
-
-            FileHandler::writeFile($config_file, $buff);
-
-            if(@file_exists($config_file)) return true;
-            return false;
-        }
-
-		function installByConfig($install_config_file){
-			include $install_config_file;
-			if(!is_array($auto_config)) return false;
-
-			$auto_config['module'] = 'install';
-			$auto_config['act'] = 'procInstall';
-
-			$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
-			$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
-			$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
-			foreach($auto_config as $k => $v){
-				if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
-			}
-			$body .= "</params>\r\n</methodCall>";
-
-			$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
-			$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5); 
-			if($fp){
-				fputs($fp, $header);
-				while(!feof($fp)) {
-					$line = trim(fgets($fp, 4096));
-					if(preg_match("/^<error>/i",$line)){
-						fclose($fp);
-						return false;
-					}
-				}   
-				fclose($fp);
-			}
-			return true;
-
-		}
-    }
-?>
+<?php
+    /**
+     * @class  installController
+     * @author NHN (developers@xpressengine.com)
+     * @brief install module of the Controller class
+     **/
+
+    class installController extends install {
+		var $db_tmp_config_file = '';
+		var $etc_tmp_config_file = '';
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Error occurs if already installed
+            if(Context::isInstalled()) {
+                return new Object(-1, 'msg_already_installed');
+            }
+
+			$this->db_tmp_config_file = _XE_PATH_.'files/config/tmpDB.config.php';
+			$this->etc_tmp_config_file = _XE_PATH_.'files/config/tmpEtc.config.php';
+        }
+
+		/**
+		 * @brief LGPL, Enviroment gathering agreement
+		 **/
+		function procInstallAgreement()
+		{
+			global $lang;
+			$requestVars = Context::gets('lgpl_agree', 'enviroment_gather');
+			if($requestVars->lgpl_agree != 'Y') {
+				return new Object('-1', $lang->msg_license_agreement_alert);
+			}
+
+			$_SESSION['lgpl_agree'] = $requestVars->lgpl_agree;
+			if($requestVars->enviroment_gather=='Y') {
+				FileHandler::writeFile('./files/env/install','1');
+			}
+
+			$url = getNotEncodedUrl('', 'act', 'dispInstallCheckEnv');
+			header('location:'.$url);
+		}
+
+		/**
+		 * @brief cubrid db setting wrapper, becase Server Side Validator...
+		 * Server Side Validatro can use only one proc, one ruleset
+		 **/
+		function procCubridDBSetting()
+		{
+			return $this->_procDBSetting();
+		}
+
+		/**
+		 * @brief firebird db setting wrapper, becase Server Side Validator...
+		 * Server Side Validatro can use only one proc, one ruleset
+		 **/
+		function procFirebirdDBSetting()
+		{
+			return $this->_procDBSetting();
+		}
+
+		/**
+		 * @brief mssql db setting wrapper, becase Server Side Validator...
+		 * Server Side Validatro can use only one proc, one ruleset
+		 **/
+		function procMssqlDBSetting()
+		{
+			return $this->_procDBSetting();
+		}
+
+		/**
+		 * @brief mysql db setting wrapper, becase Server Side Validator...
+		 * Server Side Validatro can use only one proc, one ruleset
+		 **/
+		function procMysqlDBSetting()
+		{
+			return $this->_procDBSetting();
+		}
+
+		/**
+		 * @brief postgresql db setting wrapper, becase Server Side Validator...
+		 * Server Side Validatro can use only one proc, one ruleset
+		 **/
+		function procPostgresqlDBSetting()
+		{
+			return $this->_procDBSetting();
+		}
+
+		/**
+		 * @brief sqlite db setting wrapper, becase Server Side Validator...
+		 * Server Side Validatro can use only one proc, one ruleset
+		 **/
+		function procSqliteDBSetting()
+		{
+			return $this->_procDBSetting();
+		}
+
+		/**
+		 * @brief division install step... DB Config temp file create
+		 **/
+		function _procDBSetting() {
+            // Get DB-related variables
+            $con_string = Context::gets('db_type','db_port','db_hostname','db_userid','db_password','db_database','db_table_prefix');
+
+            $db_info->master_db = get_object_vars($con_string);
+            $db_info->slave_db[] = get_object_vars($con_string);
+
+            if(!$db_info->default_url) $db_info->default_url = Context::getRequestUri();
+            $db_info->lang_type = Context::getLangType();
+
+            // Set DB type and information
+            Context::setDBInfo($db_info);
+            // Create DB Instance
+            $oDB = &DB::getInstance();
+            // Check if available to connect to the DB
+            $output = $oDB->getError();
+			if(!$output->toBool()) return $output;
+            if(!$oDB->isConnected()) return $oDB->getError();
+            // When installing firebird DB, transaction will not be used
+            if($db_info->db_type != "firebird") $oDB->begin();
+
+            if($db_info->db_type != "firebird") $oDB->commit();
+            // Create a db temp config file
+            if(!$this->makeDBConfigFile()) return new Object(-1, 'msg_install_failed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallConfigForm');
+				header('location:'.$returnUrl);
+				return;
+			}
+		}
+
+		/**
+		 * @brief division install step... rewrite, time_zone Config temp file create
+		 **/
+		function procConfigSetting() {
+            // Get variables
+            $config_info = Context::gets('use_rewrite','time_zone');
+            if($config_info->use_rewrite!='Y') $config_info->use_rewrite = 'N';
+
+            // Create a db temp config file
+            if(!$this->makeEtcConfigFile($config_info)) return new Object(-1, 'msg_install_failed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'act', 'dispInstallManagerForm');
+				header('location:'.$returnUrl);
+				return;
+			}
+		}
+
+        /**
+         * @brief Install with received information
+         **/
+        function procInstall() {
+            // Check if it is already installed
+            if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+            // Assign a temporary administrator when installing
+            $logged_info->is_admin = 'Y';
+            Context::set('logged_info', $logged_info);
+
+			// check install config
+			if (Context::get('install_config'))
+			{
+				$db_info = $this->_makeDbInfoByInstallConfig();
+			}
+
+			// install by default XE UI
+			else{
+				include $this->db_tmp_config_file;
+				include $this->etc_tmp_config_file;
+			}
+
+            // Set DB type and information
+            Context::setDBInfo($db_info);
+            // Create DB Instance
+            $oDB = &DB::getInstance();
+            // Check if available to connect to the DB
+            if(!$oDB->isConnected()) return $oDB->getError();
+            // When installing firebire DB, transaction will not be used
+            if($db_info->db_type != "firebird") $oDB->begin();
+            // Install all the modules
+            $this->installDownloadedModule();
+
+            if($db_info->db_type != "firebird") $oDB->commit();
+            // Create a config file
+            if(!$this->makeConfigFile()) return new Object(-1, 'msg_install_failed');
+
+			// load script
+            $scripts = FileHandler::readDir('./modules/install/script','/(\.php)$/');
+			if(count($scripts)>0){
+				sort($scripts);
+				foreach($scripts as $script){
+					$output = include(FileHandler::getRealPath('./modules/install/script/'.$script));
+				}
+			}
+
+            // Display a message that installation is completed
+            $this->setMessage('msg_install_completed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+		/**
+		 * @brief Make DB Information by Install Config
+		 **/
+		function _makeDbInfoByInstallConfig()
+		{
+			$db_info->master_db['db_type'] = Context::get('db_type');
+			$db_info->master_db['db_port'] = Context::get('db_port');
+			$db_info->master_db['db_hostname'] = Context::get('db_hostname');
+			$db_info->master_db['db_userid'] = Context::get('db_userid');
+			$db_info->master_db['db_password'] = Context::get('db_password');
+			$db_info->master_db['db_database'] = Context::get('db_database');
+			$db_info->master_db['db_table_prefix'] = Context::get('db_table_prefix');
+			$db_info->slave_db = array($db_info->master_db);
+			$db_info->default_url = Context::getRequestUri();
+			$db_info->lang_type = Context::getLangType();
+			$db_info->use_rewrite = Context::get('use_rewrite');
+			$db_info->time_zone = Context::get('time_zone');
+			return $db_info;
+		}
+
+        /**
+         * @brief Set FTP Information
+         **/
+        function procInstallFTP() {
+            if(Context::isInstalled()) return new Object(-1, 'msg_already_installed');
+            $ftp_info = Context::gets('ftp_host', 'ftp_user','ftp_password','ftp_port','ftp_root_path');
+            $ftp_info->ftp_port = (int)$ftp_info->ftp_port;
+            if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+			if(!$ftp_info->ftp_host) $ftp_info->ftp_host = '127.0.0.1';
+			if(!$ftp_info->ftp_root_path) $ftp_info->ftp_root_path = '/';
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
+            foreach($ftp_info as $key => $val) {
+                $buff .= sprintf("\$ftp_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+            }
+            $buff .= "?>";
+            // If safe_mode
+            if(ini_get('safe_mode')) {
+                if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+
+                require_once(_XE_PATH_.'libs/ftp.class.php');
+                $oFtp = new ftp();
+                if(!$oFtp->ftp_connect($ftp_info->ftp_host, $ftp_info->ftp_port)) return new Object(-1,'msg_ftp_not_connected');
+
+                if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
+                    $oFtp->ftp_quit();
+                    return new Object(-1,'msg_ftp_invalid_auth_info');
+                }
+
+                if(!is_dir(_XE_PATH_.'files') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files')) {
+                    $oFtp->ftp_quit();
+                    return new Object(-1,'msg_ftp_mkdir_fail');
+                }
+
+                if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files')) {
+                    $oFtp->ftp_quit();
+                    return new Object(-1,'msg_ftp_chmod_fail');
+                }
+
+                if(!is_dir(_XE_PATH_.'files/config') && !$oFtp->ftp_mkdir($ftp_info->ftp_root_path.'files/config')) {
+                    $oFtp->ftp_quit();
+                    return new Object(-1,'msg_ftp_mkdir_fail');
+                }
+
+                if(!$oFtp->ftp_site("CHMOD 777 ".$ftp_info->ftp_root_path.'files/config')) {
+                    $oFtp->ftp_quit();
+                    return new Object(-1,'msg_ftp_chmod_fail');
+                }
+
+                $oFtp->ftp_quit();
+            }
+
+            $config_file = Context::getFTPConfigFile();
+            FileHandler::WriteFile($config_file, $buff);
+        }
+
+        function procInstallCheckFtp() {
+            $ftp_info = Context::gets('ftp_user','ftp_password','ftp_port','sftp');
+            $ftp_info->ftp_port = (int)$ftp_info->ftp_port;
+            if(!$ftp_info->ftp_port) $ftp_info->ftp_port = 21;
+            if(!$ftp_info->sftp) $ftp_info->sftp = 'N';
+
+            if(!$ftp_info->ftp_user || !$ftp_info->ftp_password) return new Object(-1,'msg_safe_mode_ftp_needed');
+
+            if($ftp_info->sftp == 'Y')
+            {
+                $connection = ssh2_connect('localhost', $ftp_info->ftp_port);
+                if(!ssh2_auth_password($connection, $ftp_info->ftp_user, $ftp_info->ftp_password))
+                {
+                    return new Object(-1,'msg_ftp_invalid_auth_info');
+                }
+            }
+            else
+            {
+                require_once(_XE_PATH_.'libs/ftp.class.php');
+                $oFtp = new ftp();
+                if(!$oFtp->ftp_connect('localhost', $ftp_info->ftp_port)) return new Object(-1,'msg_ftp_not_connected');
+
+                if(!$oFtp->ftp_login($ftp_info->ftp_user, $ftp_info->ftp_password)) {
+                    $oFtp->ftp_quit();
+                    return new Object(-1,'msg_ftp_invalid_auth_info');
+                }
+
+                $oFtp->ftp_quit();
+            }
+
+            $this->setMessage('msg_ftp_connect_success');
+        }
+
+        /**
+         * @brief Result returned after checking the installation environment
+         **/
+        function checkInstallEnv() {
+            // Check each item
+            $checklist = array();
+            // 0. check your version of php (5.2.2 is not supported)
+            if(phpversion()=='5.2.2') $checklist['php_version'] = false;
+            else $checklist['php_version'] = true;
+            // 1. Check permission
+            if(is_writable('./')||is_writable('./files')) $checklist['permission'] = true;
+            else $checklist['permission'] = false;
+            // 2. Check if xml_parser_create exists
+            if(function_exists('xml_parser_create')) $checklist['xml'] = true;
+            else $checklist['xml'] = false;
+            // 3. Check if ini_get (session.auto_start) == 1
+            if(ini_get(session.auto_start)!=1) $checklist['session'] = true;
+            else $checklist['session'] = false;
+            // 4. Check if iconv exists
+            if(function_exists('iconv')) $checklist['iconv'] = true;
+            else $checklist['iconv'] = false;
+            // 5. Check gd(imagecreatefromgif function)
+            if(function_exists('imagecreatefromgif')) $checklist['gd'] = true;
+            else $checklist['gd'] = false;
+			// 6. Check DB
+			if(DB::getEnableList()) $checklist['db'] = true;
+			else $checklist['db'] = false;
+
+            if(!$checklist['php_version'] || !$checklist['permission'] || !$checklist['xml'] || !$checklist['session'] || !$checklist['db']) $install_enable = false;
+            else $install_enable = true;
+
+            // Save the checked result to the Context
+            Context::set('checklist', $checklist);
+            Context::set('install_enable', $install_enable);
+            Context::set('phpversion', phpversion());
+
+            return $install_enable;
+        }
+
+        /**
+         * @brief Create files and subdirectories
+         * Local evironment setting before installation by using DB information
+         **/
+        function makeDefaultDirectory() {
+            $directory_list = array(
+                    './files/config',
+                    './files/cache/queries',
+                    './files/cache/js_filter_compiled',
+                    './files/cache/template_compiled',
+                );
+
+            foreach($directory_list as $dir) {
+                FileHandler::makeDir($dir);
+            }
+        }
+
+        /**
+         * @brief Install all the modules
+         *
+         * Create a table by using schema xml file in the shcema directory of each module
+         **/
+        function installDownloadedModule() {
+            $oModuleModel = &getModel('module');
+            // Create a table ny finding schemas/*.xml file in each module
+            $module_list = FileHandler::readDir('./modules/', NULL, false, true);
+            foreach($module_list as $module_path) {
+                // Get module name
+                $tmp_arr = explode('/',$module_path);
+                $module = $tmp_arr[count($tmp_arr)-1];
+
+                $xml_info = $oModuleModel->getModuleInfoXml($module);
+                if(!$xml_info) continue;
+                $modules[$xml_info->category][] = $module;
+            }
+            // Install "module" module in advance
+            $this->installModule('module','./modules/module');
+            $oModule = &getClass('module');
+            if($oModule->checkUpdate()) $oModule->moduleUpdate();
+            // Determine the order of module installation depending on category
+            $install_step = array('system','content','member');
+            // Install all the remaining modules
+            foreach($install_step as $category) {
+                if(count($modules[$category])) {
+                    foreach($modules[$category] as $module) {
+                        if($module == 'module') continue;
+                        $this->installModule($module, sprintf('./modules/%s', $module));
+
+                        $oModule = &getClass($module);
+						if(is_object($oModule) && method_exists($oModule, 'checkUpdate'))
+						{
+                        	if($oModule->checkUpdate()) $oModule->moduleUpdate();
+						}
+                    }
+                    unset($modules[$category]);
+                }
+            }
+            // Install all the remaining modules
+            if(count($modules)) {
+                foreach($modules as $category => $module_list) {
+                    if(count($module_list)) {
+                        foreach($module_list as $module) {
+                            if($module == 'module') continue;
+                            $this->installModule($module, sprintf('./modules/%s', $module));
+
+                            $oModule = &getClass($module);
+							if($oModule && method_exists($oModule, 'checkUpdate') && method_exists($oModule, 'moduleUpdate'))
+							{
+								if($oModule->checkUpdate()) $oModule->moduleUpdate();
+							}
+                        }
+                    }
+                }
+            }
+
+            return new Object();
+        }
+
+        /**
+         * @brief Install an each module
+         **/
+        function installModule($module, $module_path) {
+            // create db instance
+            $oDB = &DB::getInstance();
+            // Create a table if the schema xml exists in the "schemas" directory of the module
+            $schema_dir = sprintf('%s/schemas/', $module_path);
+            $schema_files = FileHandler::readDir($schema_dir, NULL, false, true);
+
+            $file_cnt = count($schema_files);
+            for($i=0;$i<$file_cnt;$i++) {
+                $file = trim($schema_files[$i]);
+                if(!$file || substr($file,-4)!='.xml') continue;
+                $output = $oDB->createTableByXmlFile($file);
+            }
+            // Create a table and module instance and then execute install() method
+            unset($oModule);
+            $oModule = &getClass($module);
+            if(method_exists($oModule, 'moduleInstall')) $oModule->moduleInstall();
+            return new Object();
+        }
+
+        function _getDbConnText($key, $val, $with_array = false){
+            $buff = '';
+            if($with_array)
+                $buff .= "\$db_info->$key = array(";
+            else
+                $buff .= "\$db_info->$key = ";
+            if(!$with_array) $val = array($val);
+            foreach($val as $con_string){
+                $buff .= 'array(';
+                foreach($con_string as $k => $v){
+                    if(in_array($k, array('resource', 'is_connected'))) continue;
+                    if($k == 'db_table_prefix' && !empty($v)){
+                           if(substr($v,-1)!='_') $v .= '_';
+                    }
+                    $buff .= "'$k' => '$v',";
+                }
+                $buff = substr($buff, 0, -1);
+                $buff .= '),';
+            }
+            $buff = substr($buff, 0, -1);
+            if($with_array)
+                $buff .= ');' . PHP_EOL;
+            else
+                $buff .= ';' . PHP_EOL;
+            return $buff;
+        }
+
+        function _getDBConfigFileContents($db_info){
+            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
+            foreach($db_info as $key => $val) {
+                if($key == 'master_db'){
+                    $buff .= $this->_getDbConnText($key, $val);
+                }
+                else if($key == 'slave_db'){
+                    $buff .= $this->_getDbConnText($key, $val, true);
+                }
+                else
+                    $buff .= sprintf("\$db_info->%s = '%s';" . PHP_EOL, $key, str_replace("'","\\'",$val));
+            }
+            $buff .= "?>";
+            return $buff;
+        }
+
+        /**
+         * @brief Create DB temp config file
+         * Create the config file when all settings are completed
+         **/
+        function makeDBConfigFile() {
+            $db_tmp_config_file = $this->db_tmp_config_file;
+
+            $db_info = Context::getDbInfo();
+            if(!$db_info) return;
+
+            $buff = $this->_getDBConfigFileContents($db_info);
+
+            FileHandler::writeFile($db_tmp_config_file, $buff);
+
+            if(@file_exists($db_tmp_config_file)) return true;
+            return false;
+        }
+
+        /**
+         * @brief Create etc config file
+         * Create the config file when all settings are completed
+         **/
+        function makeEtcConfigFile($config_info) {
+            $etc_tmp_config_file = $this->etc_tmp_config_file;
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit();'."\n";
+            foreach($config_info as $key => $val) {
+                $buff .= sprintf("\$db_info->%s = '%s';\n", $key, str_replace("'","\\'",$val));
+            }
+            $buff .= "?>";
+
+            FileHandler::writeFile($etc_tmp_config_file, $buff);
+
+            if(@file_exists($etc_tmp_config_file)) return true;
+            return false;
+        }
+
+        /**
+         * @brief Create config file
+         * Create the config file when all settings are completed
+         **/
+        function makeConfigFile() {
+            $config_file = Context::getConfigFile();
+            //if(file_exists($config_file)) return;
+
+            $db_info = Context::getDbInfo();
+            if(!$db_info) return;
+
+            $buff = $this->_getDBConfigFileContents($db_info);
+
+            FileHandler::writeFile($config_file, $buff);
+
+            if(@file_exists($config_file)) {
+				FileHandler::removeFile($this->db_tmp_config_file);
+				FileHandler::removeFile($this->etc_tmp_config_file);
+				return true;
+			}
+            return false;
+        }
+
+		function installByConfig($install_config_file){
+			include $install_config_file;
+			if(!is_array($auto_config)) return false;
+
+			$auto_config['module'] = 'install';
+			$auto_config['act'] = 'procInstall';
+
+			$fstr = "<%s><![CDATA[%s]]></%s>\r\n";
+			$fheader = "POST %s HTTP/1.1\r\nHost: %s\r\nContent-Type: application/xml\r\nContent-Length: %s\r\n\r\n%s\r\n";
+			$body = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\r\n<methodCall>\r\n<params>\r\n";
+			foreach($auto_config as $k => $v){
+				if(!in_array($k,array('host','port','path'))) $body .= sprintf($fstr,$k,$v,$k);
+			}
+			$body .= "</params>\r\n</methodCall>";
+
+			$header = sprintf($fheader,$auto_config['path'],$auto_config['host'],strlen($body),$body);
+			$fp = @fsockopen($auto_config['host'], $auto_config['port'], $errno, $errstr, 5);
+			if($fp){
+				fputs($fp, $header);
+				while(!feof($fp)) {
+					$line = trim(fgets($fp, 4096));
+					if(preg_match("/^<error>/i",$line)){
+						fclose($fp);
+						return false;
+					}
+				}
+				fclose($fp);
+			}
+			return true;
+
+		}
+    }
diff --git a/modules/install/install.model.php b/modules/install/install.model.php
index f03118dff..e2e72b1b3 100644
--- a/modules/install/install.model.php
+++ b/modules/install/install.model.php
@@ -1,8 +1,6 @@
 <?php
 
 class installModel extends install {
-	function init() {
-	}
 	var $pwd;
 
 	function getSFTPList()
diff --git a/modules/install/install.view.php b/modules/install/install.view.php
index 6acfd63ef..fce943937 100644
--- a/modules/install/install.view.php
+++ b/modules/install/install.view.php
@@ -1,91 +1,116 @@
-<?php
-    /**
-     * @class  installView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  install module의 View class
-     **/
-
-    class installView extends install {
-
-        var $install_enable = false;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // template 경로를 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-
-            // 설치가 되어 있으면 오류
-            if(Context::isInstalled()) return $this->stop('msg_already_installed');
-
-            // 컨트롤러 생성
-            $oInstallController = &getController('install');
-            $this->install_enable = $oInstallController->checkInstallEnv();
-
-            // 설치 가능한 환경이라면 installController::makeDefaultDirectory() 실행
-            if($this->install_enable) $oInstallController->makeDefaultDirectory();
-        }
-
-        /**
-         * @brief license 메세지 노출
-         **/
-        function dispInstallIntroduce() {
-			$install_config_file = FileHandler::getRealPath('./config/install.config.php');
-			if(file_exists($install_config_file)){
-				include $install_config_file;
-				if(is_array($install_config)){
-					foreach($install_config as $k => $v) Context::set($k,$v,true);
-					unset($GLOBALS['__DB__']);
-					$oInstallController = &getController('install');
-					$oInstallController->procInstall();
-					header("location: ./");
-					exit;
-				}
-			}
-
-			$this->setTemplateFile('introduce');
-        }
-
-        /**
-         * @brief 설치 환경에 대한 메세지 보여줌
-         **/
-        function dispInstallCheckEnv() {
-            $this->setTemplateFile('check_env');
-        }
-
-
-        /**
-         * @brief DB 선택 화면
-         **/
-        function dispInstallSelectDB() {
-            // 설치 불가능하다면 check_env를 출력
-            if(!$this->install_enable) return $this->dispInstallCheckEnv();
-
-            // ftp 정보 입력
-            if(ini_get('safe_mode') && !Context::isFTPRegisted()) {
-                $this->setTemplateFile('ftp');
-            } else {
-                $this->setTemplateFile('select_db');
-            }
-        }
-
-        /**
-         * @brief DB 정보/ 최고 관리자 정보 입력 화면을 보여줌
-         **/
-        function dispInstallForm() {
-            // 설치 불가능하다면 check_env를 출력
-            if(!$this->install_enable) return $this->dispInstallCheckEnv();
-
-            // db_type이 지정되지 않았다면 다시 초기화면 출력
-            if(!Context::get('db_type')) return $this->dispInstallSelectDB();
-
-            Context::set('time_zone', $GLOBALS['time_zone']);
-
-            // disp_db_info_form.html 파일 출력
-            $tpl_filename = sprintf('form.%s', Context::get('db_type'));
-            $this->setTemplateFile($tpl_filename);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  installView
+     * @author NHN (developers@xpressengine.com)
+     * @brief View class of install module
+     **/
+
+    class installView extends install {
+
+        var $install_enable = false;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+			// Set browser title
+			Context::setBrowserTitle(Context::getLang('introduce_title'));
+            // Specify the template path
+            $this->setTemplatePath($this->module_path.'tpl');
+            // Error occurs if already installed
+            if(Context::isInstalled()) return $this->stop('msg_already_installed');
+            // Install a controller
+            $oInstallController = &getController('install');
+            $this->install_enable = $oInstallController->checkInstallEnv();
+            // If the environment is installable, execute installController::makeDefaultDirectory()
+            if($this->install_enable) $oInstallController->makeDefaultDirectory();
+        }
+
+        /**
+         * @brief Display license messages
+         **/
+        function dispInstallIntroduce() {
+			$install_config_file = FileHandler::getRealPath('./config/install.config.php');
+			if(file_exists($install_config_file)){
+				include $install_config_file;
+				if(is_array($install_config)){
+					foreach($install_config as $k => $v) Context::set($k,$v,true);
+					unset($GLOBALS['__DB__']);
+					Context::set('install_config', true, true);
+					$oInstallController = &getController('install');
+					$output = $oInstallController->procInstall();
+					if (!$output->toBool()) return $output;
+					header("location: ./");
+					Context::close();
+					exit;
+				}
+			}
+
+			$this->setTemplateFile('introduce');
+        }
+
+        /**
+         * @brief Display messages about installation environment
+         **/
+        function dispInstallCheckEnv() {
+            $this->setTemplateFile('check_env');
+        }
+
+
+        /**
+         * @brief Choose a DB
+         **/
+        function dispInstallSelectDB() {
+            // Display check_env if it is not installable
+            if(!$this->install_enable) return $this->dispInstallCheckEnv();
+            // Enter ftp information
+            if(ini_get('safe_mode') && !Context::isFTPRegisted()) {
+				Context::set('progressMenu', '3');
+                $this->setTemplateFile('ftp');
+            } else {
+				Context::set('progressMenu', '4');
+                $this->setTemplateFile('select_db');
+            }
+        }
+
+        /**
+         * @brief Display a screen to enter DB and administrator's information
+         **/
+        function dispInstallDBForm() {
+            // Display check_env if not installable
+            if(!$this->install_enable) return $this->dispInstallCheckEnv();
+            // Return to the start-up screen if db_type is not specified
+            if(!Context::get('db_type')) return $this->dispInstallSelectDB();
+
+            // Output the file, disp_db_info_form.html
+            $tpl_filename = sprintf('form.%s', Context::get('db_type'));
+            $this->setTemplateFile($tpl_filename);
+        }
+
+        /**
+         * @brief Display a screen to enter DB and administrator's information
+         **/
+        function dispInstallConfigForm() {
+            // Display check_env if not installable
+            if(!$this->install_enable) return $this->dispInstallCheckEnv();
+
+			include _XE_PATH_.'files/config/tmpDB.config.php';
+
+            Context::set('time_zone', $GLOBALS['time_zone']);
+            Context::set('db_type', $db_info->db_type);
+            $this->setTemplateFile('config_form');
+        }
+
+        /**
+         * @brief Display a screen to enter DB and administrator's information
+         **/
+        function dispInstallManagerForm() {
+            // Display check_env if not installable
+            if(!$this->install_enable) {
+				return $this->dispInstallCheckEnv();
+			}
+
+            $this->setTemplateFile('admin_form');
+        }
+    }
+?>
diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
deleted file mode 100644
index bbbbda563..000000000
--- a/modules/install/lang/en.lang.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (Only basic contents are listed)
-     **/
-
-    $lang->introduce_title = 'XE Installation';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-EndOfLicense;
-
-    $lang->install_condition_title = "Please check the installation requirement.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'PHP Version',
-            'permission' => 'Permission',
-            'xml' => 'XML Library',
-            'iconv' => 'ICONV Library',
-            'gd' => 'GD Library',
-            'session' => 'Session.auto_start setting',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Required] If PHP version is 5.2.2, XE will not be installed because of bug',
-            'permission' => '[Required] XE installation path or ./files directory\'s permission must be 707',
-            'xml' => '[Required] XML Library is needed for XML communication',
-            'session' => '[Required] PHP setting file\'s (php.ini) \'Session.auto_start\' must equal to zero in order for XE to use the session',
-            'iconv' => 'Iconv should be installed in order to convert UTF-8 and other language set',
-            'gd' => 'GD Library should be installed in order to use image convert function',
-        );
-
-    $lang->install_checklist_xml = 'Install XML Library';
-    $lang->install_without_xml = 'XML Library is not installed';
-    $lang->install_checklist_gd = 'Install GD Library';
-    $lang->install_without_gd  = 'GD Library is not installed for image convertion';
-    $lang->install_checklist_gd = 'Intall GD Library';
-    $lang->install_without_iconv = 'Iconv Library is not installed for processing characters';
-    $lang->install_session_auto_start = 'Possible problems might occur due to the php setting. session.auto_start is equal to 1';
-    $lang->install_permission_denied = 'Installation path\'s permission doesn\'t equal to 707';
-
-    $lang->cmd_agree_license = 'I agree with the license';
-    $lang->cmd_install_fix_checklist = 'I have fixed the required conditions.';
-    $lang->cmd_install_next = 'Continue installation';
-    $lang->cmd_ignore = 'Ignore';
-
-    $lang->db_desc = array(
-        'mysql' => 'Use MySQL as database with mysql*() functions in php.<br />Transactions will not be processed since DB file is created in myisam.',
-        'mysqli' => 'Use MySQL as database with mysqli*() functions in php.<br />Transactions will not be processed since DB file is created in myisam',
-        'mysql_innodb' => 'Use MySQL as database with innodb.<br />Transactions will be processed with innodb',
-        'sqlite2' => 'Use sqlite2 as database which saves the data as files.<br />DB file <b>must not be</b> accessible from the web.<br />(Never been tested for stabilization)',
-        'sqlite3_pdo' => 'Use sqlite3 as database with supports from PDO of php.<br />DB file <b>must not be</b> accessible from the web.',
-        'cubrid' => 'Use CUBRID as database. See <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a> for more info',
-        'mssql' => 'Use MSSQL as database',
-        'postgresql' => 'Use PostgreSql as database.',
-        'firebird' => 'Use Firebird as database.<br />You can create database with (create database "/path/dbname.fdb" page_size=8192 default character set UTF-8;)',
-    );
-
-    $lang->form_title = 'Database &amp; Administrator Information';
-    $lang->db_title = 'Please input DB information';
-    $lang->db_type = 'DB Type';
-    $lang->select_db_type = 'Please select the DB you want to use.';
-    $lang->db_hostname = 'DB Hostname';
-    $lang->db_port = 'DB Port';
-    $lang->db_userid = 'DB ID';
-    $lang->db_password = 'DB Password';
-    $lang->db_database = 'DB Database';
-    $lang->db_database_file = 'DB Database File';
-    $lang->db_table_prefix = 'Table Header';
-
-    $lang->admin_title = 'Administrator Info';
-
-    $lang->env_title = 'Configuration';
-    $lang->use_optimizer = 'Enable Optimizer';
-    $lang->about_optimizer = 'If optimizer is enabled, users can quickly access to this site, since multiple CSS / JS files are put together and compressed before transmission. <br /> Nevertheless, this optimization might be problematic according to CSS or JS. If you disable it, it would work properly though it would work slower.';
-    $lang->use_rewrite = 'Rewrite Mod';
-    $lang->use_sso = 'Single Sign On';
-    $lang->about_rewrite = "If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123";
-	$lang->about_sso = 'SSO will enable users to sign in just once for both default and virtual site. You will need this only if you are using virtual sites.';
-    $lang->time_zone = 'Time Zone';
-    $lang->about_time_zone = "If the server time and the time on your location don't accord each other, you can set the time as same as your location by using time zone ";
-    $lang->qmail_compatibility = 'Enable Qmail';
-    $lang->about_qmail_compatibility = 'It will enable sending mails from MTA which cannot distinguish CRLF like Qmail.';
-
-    $lang->about_database_file = 'Sqlite saves data in the file. Location of the database file should be unreachable by web<br/><span style="color:red">Data file should be inside the permission of 707.</span>';
-
-    $lang->success_installed = 'Installation has been completed';
-
-    $lang->msg_cannot_proc = 'Installation environment is not proper to proceed.';
-    $lang->msg_already_installed = 'XE is already installed';
-    $lang->msg_dbconnect_failed = "Error has occurred while connecting DB.\nPlease check DB information again";
-    $lang->msg_table_is_exists = "Table is already created in the DB.\nConfig file is recreated";
-    $lang->msg_install_completed = "Installation has been completed.\nThank you for choosing XE";
-    $lang->msg_install_failed = "An error has occurred while creating installation file.";
-
-    $lang->ftp_get_list = "Get List";
-?>
diff --git a/modules/install/lang/es.lang.php b/modules/install/lang/es.lang.php
deleted file mode 100644
index 393cb2dfb..000000000
--- a/modules/install/lang/es.lang.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-    /**
-     * @archivo  es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma espanol para la instalación
-     **/
-
-    $lang->introduce_title = 'Instalación de XE ';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-EndOfLicense;
-
-    $lang->install_condition_title = "Por favor chequee los requerimientos de la instalación.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'Versión PHP',
-            'permission' => 'Atribución',
-            'xml' => 'Librería XML',
-            'iconv' => 'Librería ICONV',
-            'gd' => 'Librería GD',
-            'session' => 'Configuración Session.auto_start',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Requerido] Si la versión de PHP es 5.2.2, XE no sera instalado por errores',
-            'permission' => '[Requerido] La ruta de la instalación de XE o el directorio de ./archivos deberia tener la atribución 707',
-            'xml' => '[Requerido] Libreria XML es necesario para la comunicación de XML',
-            'session' => '[Requerido] Para el uso de la sesion de XE, el archivo php.ini deberia estar configurada  session.auto_start=0',
-            'iconv' => 'Para transformar UTF-8 y otra paquete del idioma deberia estar instalado el Iconv.',
-            'gd' => 'Libreria GD deberia estar instalado para utilizar la funcion de convertir la imagen',
-        );
-
-    $lang->install_checklist_xml = 'Instalar Librería XML ';
-    $lang->install_without_xml = 'Librería XML no esta instalado';
-    $lang->install_checklist_gd = 'Instalar Librería GD';
-    $lang->install_without_gd  = 'Libreria GD no esta instalado para la conversión de la imagen';
-    $lang->install_checklist_gd = 'Intalar Librería GD';
-    $lang->install_without_iconv = 'Libreria Iconv no esta instalado para procesar las fuentes';
-    $lang->install_session_auto_start = 'Puede provocar errores si en la configuración de php esta configurada "session.auto_start=1"';
-    $lang->install_permission_denied = 'La atribución de la ruta de instalacion no es igual a 707';
-
-    $lang->cmd_agree_license = 'Yo accepto la licencia';
-    $lang->cmd_install_fix_checklist = 'Yo he configurado las condiciones necesarias para la instalación.';
-    $lang->cmd_install_next = 'Continuar la instalación';
-    $lang->cmd_ignore = 'Ignore';
-
-    $lang->db_desc = array(
-        'mysql' => 'Utilizando las funciones mysql*() de PHP usar DB mysql.<br />La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.',
-        'mysqli' => 'Utilizando las funciones mysqli*() de PHP usar DB mysql.<br />La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.',
-        'mysql_innodb' => 'Utilizando innodb usar BD mysql.<br />La transacción es hablilitado para innodb',
-        'sqlite2' => 'Soporta sqlite2, el cual almacena los datos en archivos <br />En la instalacion, es necesario crear archivo de BD en un lugar inaccesible de la web.<br />(Testeo de la estabilización no realizada)',
-        'sqlite3_pdo' => 'A través de PDO de PHP soporta sqlite2 <br />En la instalación, es necesario crear archivo de BD en un lugar inaccesible de la web.',
-        'cubrid' => 'Usar BD CUBRID. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => 'Usar BD MSSQL.',
-        'postgresql' => 'Usar BD PostgreSql.',
-        'firebird' => 'Usar BD firebird. Cómo crear <br /> PP (crear base de datos "/ path / dbname.fdb" page_size = 8192 el conjunto de caracteres UTF8 por defecto;)',
-    );
-
-    $lang->form_title = 'Ingresar  BD &amp; Información del Administrador;';
-    $lang->db_title = 'Por favor escribir información de BD';
-    $lang->db_type = 'Tipo de BD';
-    $lang->select_db_type = 'Seleccione el tipo de BD que desea usar.';
-    $lang->db_hostname = 'Hostname de BD';
-    $lang->db_port = 'Port de BD';
-    $lang->db_userid = 'ID de BD';
-    $lang->db_password = 'Contraseña de BD';
-    $lang->db_database = 'Base de datos BD';
-    $lang->db_database_file = 'Archivo de base de datos BD';
-    $lang->db_table_prefix = 'Encabezado de la tabla';
-
-    $lang->admin_title = 'Información del Administrator';
-
-    $lang->env_title = 'Configuración';
-    $lang->use_optimizer = 'Habilitar el optimizador';
-    $lang->about_optimizer = 'Si optimizador está habilitado, los usuarios pueden acceder rápidamente a este sitio, ya que hay múltiples CSS / JS archivos son comprimidos juntos y antes de la transmisión. <br /> No obstante, esta optimización podría ser problemáticas de acuerdo con CSS o JS. Si inhabilitarlo, que funciona correctamente a pesar de que sería más lento el trabajo.';
-    $lang->use_rewrite = 'Usar rewrite mod';
-    $lang->use_sso = 'SSO';
-    $lang->about_rewrite = "Si el servidor de la web soporte rewrite mod, URL largas como http://bla/?documento_srl=123 puede abreviarse como  http://bla/123";
-	$lang->about_sso = '사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 되는 기능입니다. 가상 사이트를 사용할 때만 필요합니다.';
-    $lang->time_zone = 'La Hora por Zona';
-    $lang->about_time_zone = "Si la hora del servidor y la hora de su ubicación es diferente, Usted puede elegir la hora por zona para corregir";
-    $lang->qmail_compatibility = 'Compatible con Qmail';
-    $lang->about_qmail_compatibility = 'Qmail como MTA no reconoce CRLF como la línea de separación que se enviará por correo.';
-
-    $lang->about_database_file = 'Sqlite guarda el dato en el archivo. Es necesario crear archivo de BD en un lugar inaccesible de la web.<br/><span style="color:red">El archivo de dato debe estar ubicado en un lugar con la atribución 707.</span>';
-
-    $lang->success_installed = 'Instalación finalizada';
-
-    $lang->msg_cannot_proc = 'No puede ser ejecutado lo requerido por no disponer del ambiente de instalación.';
-    $lang->msg_already_installed = 'Instalación de XE ya existe.';
-    $lang->msg_dbconnect_failed = "Ha ocurrido un error en la conección de BD.\n Por favor chequee la información de BD nuevamente";
-    $lang->msg_table_is_exists = "La tabla ya ha sido creado en BD.\n Creado nuevamente el archivo de configuración.";
-    $lang->msg_install_completed = "Instalación finalizada.\n Muchas gracias.";
-    $lang->msg_install_failed = "Ha ocurrido un error al crear el archivo de instalación.";
-
-    $lang->ftp_get_list = "Get List";
-?>
diff --git a/modules/install/lang/fr.lang.php b/modules/install/lang/fr.lang.php
deleted file mode 100644
index f33a70765..000000000
--- a/modules/install/lang/fr.lang.php
+++ /dev/null
@@ -1,558 +0,0 @@
-<?php
-    /**
-     * @file   fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent (PierreDuvent@gmail.com)
-     * @brief  Paquet du langage en français pour le module d\'Installation
-     **/
-
-    $lang->introduce_title = 'Installation du XE ';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = "Vérifiez  les conditions obligatoires pour l'installation, S.V.P.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'Version de PHP',
-            'permission' => 'Autorisation',
-            'xml' => 'Bibliothèque de XML',
-            'iconv' => 'Bibliothèque de ICONV',
-            'gd' => 'Bibliothèque de GD',
-            'session' => 'Configuration de Session.auto_start',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Obligatoire] Si la version de PHP est 5.2.2, XE ne sera pas  installé à cause du bogue',
-            'permission' => '[Obligatoire] Chemin de l\'installation de XE ou la permission de  répertoire de ./files doit être 707',
-            'xml' => '[Obligatoire] La bibliothèque de XML est nécessaire pour la communication de XML',
-            'session' => '[Obligatoire] \'Session.auto_start\' dans le fichier de configuration pour PHP (php.ini) doit être égal à zéro car XE utilise la session',
-            'iconv' => 'Iconv doit être installé afin de convertir UTF-8 et des autres assortiments des  langues',
-            'gd' => 'La bibliothèque de GD doit être installé afin d\'utiliser la fonction à convertir des images',
-        );
-
-    $lang->install_checklist_xml = 'Installation la bibliothèque de XML';
-    $lang->install_without_xml = 'La bibliothèque de XML n\'est pas installée';
-    $lang->install_checklist_gd = 'Installation la bibliothèque de  GD';
-    $lang->install_without_gd  = 'La bibliothèque de GD pour convertir des images n\'est pas installée';
-    $lang->install_checklist_iconv = 'Installation la bibliothèque d\'Iconv';
-    $lang->install_without_iconv = 'La bibliothèque d\'Iconv pour traiter les caractères  n\'est pas installée';
-    $lang->install_session_auto_start = 'Des problèmes possibles peuvent avoir lieu car  session.auto_start==1 dans la configuration de PHP';
-    $lang->install_permission_denied = 'La permission du chemin d\'installation n\'est pas égale à 707';
-
-    $lang->cmd_agree_license = 'Je suis d\'accord avec la licence';
-    $lang->cmd_install_fix_checklist = 'J\'ai corrigé les conditions obligatoires.';
-    $lang->cmd_install_next = 'Continuer à  installer';
-    $lang->cmd_ignore = 'Ignore';
-
-    $lang->db_desc = array(
-        'mysql' => 'Utilisera fonction mysql*() pour utiliser la base de données de mysql.<br />La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.',
-        'mysqli' => 'Utilisera fonction mysqli*() pour utiliser la base de données de mysql.<br />La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.',
-        'mysql_innodb' => 'Utilisera innodb pour utiliser Base de Données de mysql.<br />La transaction sera validé pour innodb',
-        'sqlite2' => 'Surpporter sqlite2 qui conserve les données dans les fichiers.<br />Quand vous installez, vous devez créer le fichier de Base de Données dans une place que l\'on ne peut pas accéder par web.<br />(Jamais  testé sur  stabilization)',
-        'sqlite3_pdo' => 'Supporter sqlite3 PDO de PHP.<br />Quand vous installez, vous devez cr?r le fichier de Base de Données dans une place que l\'on ne peut pas accéder par Web.',
-        'cubrid' => 'Utiliser la Base de Données de CUBRID.  <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => 'Utiliser la Base de Données de MSSQL.',
-        'postgresql' => 'Utiliser la Base de Données de PostgreSql.',
-        'firebird' => 'Utiliser la Base de Données de firebird.',
-    );
-
-    $lang->form_title = 'Entrer des informations de Base de données et Administrateur';
-    $lang->db_title = 'Entrez l\'information de Base de Données, S.V.P.';
-    $lang->db_type = 'Sorte de Base de Données';
-    $lang->select_db_type = 'Choisissez la Base de Données que vous voulez utiliser.';
-    $lang->db_hostname = 'Hostname(Nom de l\'ordinateur central) de Base de Données (LOCALHOST généralement)';
-    $lang->db_port = 'Port de Base de Données';
-    $lang->db_userid = 'Compte(ID) pour le Base de Données';
-    $lang->db_password = 'Mot de passe pour le Base de Données';
-    $lang->db_database = 'Nom de Base de Données';
-    $lang->db_database_file = 'Fichier de Base de Données';
-    $lang->db_table_prefix = 'En-tête de la table';
-
-    $lang->admin_title = 'Informations d\'Administrateur';
-
-    $lang->env_title = 'Configuration';
-    $lang->use_optimizer = 'Valider Optimiseur';
-    $lang->about_optimizer = 'Si l\'optimiseur est validé, utilisateur peut accéder rapidement ce site parce que plusieurs fichiers de CSS / JS sont reliés ensemble et comprimés avant transmission. <br /> Néanmoins, cette optimisation peut arriver problématique selong CSS ou JS. Si vous l\'invalidez, ça marchera correctement pourtant il marchera plus lentement.';
-    $lang->use_rewrite = 'Utiliser mode de récrire(rewrite mod)';
-    $lang->use_sso = 'SSO';
-    $lang->about_rewrite = "Si le serveur de web est capable d'utiliser le mode de récrire, URL longue comme http://murmure/?document_srl=123 peut être abrégé comme http://murmure/123";
-	$lang->about_sso = '사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 되는 기능입니다. 가상 사이트를 사용할 때만 필요합니다.';
-    $lang->time_zone = 'Fuseau horaire';
-    $lang->about_time_zone = "Si l'heure de serveur et celle de votre emplacement ne s'accordent pas,  vous pouvez remettre l'heure comme le même heure de votre lieu en configurant le fuseau horaire ";
-    $lang->qmail_compatibility = 'Compatible avec Qmail';
-    $lang->about_qmail_compatibility = 'Le mél sera envoyé en MTA qui ne peut pas reconnaître le CRLF comme délimiteur des lignes comme le Qmail.';
-
-    $lang->about_database_file = 'Sqlite conserve des données dans le fichier. Vous devez placer le fichier de la base de données où l\'on ne peut pas accéder par web.<br/><span style="color:red">Le fichier des Donées doit être en dedans la permission 707.</span>';
-
-    $lang->success_installed = 'Installation s\'est complété';
-
-    $lang->msg_cannot_proc = 'Environnement d\'Installation n\'est pas équipé à procéder.';
-    $lang->msg_already_installed = 'XE est déjà installé';
-    $lang->msg_dbconnect_failed = "Erreur a lieu en essayant connecter à la Base de Données.\nVérifiez encore une fois les informations sur la Base de Données, S.V.P.";
-    $lang->msg_table_is_exists = "La Table est déjà créée dans la Base de Données.\nLe fichier de Configuration est recréé.";
-    $lang->msg_install_completed = "Installation a complété.\nMerci pour choisir XE";
-    $lang->msg_install_failed = "Une erreur a lieu en créant le fichier d\'installation.";
-
-    $lang->ftp_get_list = "Get List";
-?>
diff --git a/modules/install/lang/jp.lang.php b/modules/install/lang/jp.lang.php
deleted file mode 100644
index 9f65a591d..000000000
--- a/modules/install/lang/jp.lang.php
+++ /dev/null
@@ -1,555 +0,0 @@
-<?php
-    /**
-     * @file   modules/install/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa(risapapa@gmail.com)、ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    $lang->introduce_title = 'XEのインストール';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-EndOfLicense;
-
-    $lang->install_condition_title = "インストールするための必須条件を確認して下さい。";
-
-    $lang->install_checklist_title = array(
-            'php_version' => 'PHPバージョン',
-            'permission' => 'パーミッション',
-            'xml' => 'XMLライブラリ',
-            'iconv' => 'ICONVライブラリ',
-            'gd' => 'GDライブラリ',
-            'session' => 'Session.auto_startの設定',
-        );
-
-    $lang->install_checklist_desc = array(
-            'php_version' => '【必須】PHPバージョンが 5.2.2の場合は、PHPのセキュリティバグのため、インストール出来ません。',
-            'permission' => '【必須】XEのインストールパスまたは「./files」ディレクトリのパーミッションを「707」に設定して下さい。',
-            'xml' => '【必須】XML通信のためにXMLライブラリが必要です',
-            'session' => '【必須】XEでは、セッションを使用しているため、「php.ini」の設定を「session.auto_start=0」にして下さい。',
-            'iconv' => 'UTF-8と多言語サポート及び文字コード変換のため、「iconv」をインストールする必要があります。',
-            'gd' => 'イメージ変換機能を使用するためには、「GDライブラリ」をインストールする必要があります。',
-        );
-
-    $lang->install_checklist_xml = 'XMLライブラリのインストール';
-    $lang->install_without_xml = 'XMLライブラリがインストールされていません。';
-    $lang->install_checklist_gd = 'GDライブラリのインストール';
-    $lang->install_without_gd  = 'イメージ変換用のGDライブラリがインストールされていません。';
-    $lang->install_checklist_gd = 'GDライブラリのインストール';
-    $lang->install_without_iconv = '文字列処理のための「iconv」ライブラリがインストールされていません。';
-    $lang->install_session_auto_start = 'PHPの設定で「session.auto_start==1」 にするとセッション処理に問題が発生することがあります。';
-    $lang->install_permission_denied = 'インストールする対象ディレクトリのパーミッションが「707」になっていません。';
-
-    $lang->cmd_agree_license = 'ライセンスに同意します。';
-    $lang->cmd_install_fix_checklist = 'インストール必須条件を設定しました。';
-    $lang->cmd_install_next = 'インストールを続けます。';
-    $lang->cmd_ignore = 'FTP設定を省略する';
-
-    $lang->db_desc = array(
-        'mysql' => 'MySQL DBでPHPの「mysql*()」関数を利用してデータの入出力を行います。<br />DBは「myisam」タイプで作成されるため、トランザクション処理は出来ません。',
-        'mysqli' => 'MySQL DBでPHPの「mysqli*()」関数を利用してデータの入出力を行います。<br />DBは「myisam」タイプで作成されるため、トランザクション処理は出来ません。',
-        'mysql_innodb' => 'MySQL DBで「innodb」タイプでデータの入出力を行います。<br />「innodb」ではトランザクションの処理が行えます。',
-        'sqlite2' => 'ファイルタイプデータベースである「sqlite2」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブがらアクセス出来ない場所に作成して下さい。<br />（安定化までのテストは行われていません）',
-        'sqlite3_pdo' => 'PHPのPDOを経由うして「sqlite3」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブからアクセス出来ない場所に作成して下さい。',
-        'cubrid' => 'CUBRID DBを利用します。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => 'MSSQL DBを利用します。',
-        'postgresql' => 'PostgreSql DBを利用します。',
-        'firebird' => 'Firebird DBを利用します。<br />DB生成方法 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)',
-    );
-
-    $lang->form_title = 'データベース &amp; 管理者情報入力';
-    $lang->db_title = 'データベース情報入力';
-    $lang->db_type = 'データベースの種類';
-    $lang->select_db_type = '使用するデータベース種類を選択して下さい。';
-    $lang->db_hostname = 'ホスト名';
-    $lang->db_port = 'ポート番号';
-    $lang->db_userid = 'ユーザＩＤ';
-    $lang->db_password = 'パスワード';
-    $lang->db_database = 'データベース名';
-    $lang->db_database_file = 'データベースファイル';
-    $lang->db_table_prefix = 'テーブルプレフィックス';
-
-    $lang->admin_title = '管理者情報';
-
-    $lang->env_title = '環境設定';
-    $lang->use_optimizer = 'オプティマイザー使用';
-    $lang->about_optimizer = 'オプティマイザーを使用すると多数の「CSS/JS」ファイルを、統合・圧縮して転送するのでレスポンスが早くなります。<br />但し、CSSまたはJSファイルによっては問題が生じる場合があります。この場合は、チェックを外すと正常に動作します。';
-    $lang->use_rewrite = 'リライト・モジュールを使用';
-    $lang->use_sso = 'SSO';
-    $lang->about_rewrite = 'Webサーバで「リライト・モジュール（mod_rewrite）」をサポートしている場合は、「http://アドレス/?document_srl=123」のようなアドレスを動的だけど「http://アドレス/123」のように静的なページに見せることが出来ます。';
-	$lang->about_sso = 'ユーザが一度のログインで基本サイトと仮想サイトに同時にログインされる機能です。仮想サイトの機能を使用してない場合、設定する必要がありません。';
-    $lang->time_zone = 'タイムゾーン';
-    $lang->about_time_zone = 'サーバの設定時間とサービスしているローカル時間との差がある場合、タイムゾーンを指定して表示時間を合わせることが出来ます。';
-    $lang->qmail_compatibility = 'Qmail 互換';
-    $lang->about_qmail_compatibility = 'Qmail等、CRLFを改行コードとして認識出来ないMTA（Message Transfer Agent）で、メールの送信が出来るようにします。';
-
-    $lang->about_database_file = 'Sqliteはファイルにデータを保存します。そのため、データベースファイルにはウェブからアクセス出来ない場所にしなければなりません。<br/><span style="color:red">データファイルのパーミッションは「707」に設定して下さい。</span>';
-
-    $lang->success_installed = '正常にインストールされました。';
-
-    $lang->msg_cannot_proc = 'インストール出来る環境が整っていないため、リクエストを実行出来ませんでした。';
-    $lang->msg_already_installed = '既にインストールされています。';
-    $lang->msg_dbconnect_failed = "データベースアクセスにエラーが発生しました。\nデータベースの情報をもう一度確認して下さい。";
-    $lang->msg_table_is_exists = "既にデータベースにデーブルが作成されています。\nconfigファイルを再作成しました。";
-    $lang->msg_install_completed = "インストールが完了しました。\nありがとうございます。";
-    $lang->msg_install_failed = 'インストールファイルを作成する際にエラーが発生しました。';
-
-    $lang->ftp_get_list = "Get List";
-?>
diff --git a/modules/install/lang/ko.lang.php b/modules/install/lang/ko.lang.php
deleted file mode 100644
index a344cca21..000000000
--- a/modules/install/lang/ko.lang.php
+++ /dev/null
@@ -1,557 +0,0 @@
-<?php
-    /**
-     * @file   modules/install/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->introduce_title = 'XE 설치';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = '필수 설치조건을 확인하세요.';
-
-    $lang->install_checklist_title = array(
-            'php_version' => 'PHP Version',
-            'permission' => '퍼미션',
-            'xml' => 'XML 라이브러리',
-            'iconv' => 'ICONV 라이브러리',
-            'gd' => 'GD 라이브러리',
-            'session' => 'Session.auto_start 설정',
-        );
-
-    $lang->install_checklist_desc = array(
-            'php_version' => '[필수] PHP버전이 5.2.2일 경우 PHP의 버그로 인하여 설치되지 않습니다.',
-            'permission' => '[필수] XE의 설치 경로 또는 ./files 디렉토리의 퍼미션이 707이어야 합니다.',
-            'xml' => '[필수] XML통신을 위하여 XML 라이브러리가 필요합니다.',
-            'session' => '[필수] XE에서 세션 사용을 위해 php.ini 설정의 session.auto_start=0 이어야 합니다.',
-            'iconv' => 'UTF-8과 다른 언어셋의 변환을 위한 iconv설치가 필요합니다.',
-            'gd' => '이미지변환 기능을 사용하기 위해 GD라이브러리가 설치되어 있어야 합니다.',
-        );
-
-    $lang->install_checklist_xml = 'XML라이브러리 설치';
-    $lang->install_without_xml = 'xml 라이브러리가 설치되어 있지 않습니다.';
-    $lang->install_checklist_gd = 'GD라이브러리 설치';
-    $lang->install_without_gd  = '이미지 변환을 위한 GD 라이브러리가 설치되어 있지 않습니다.';
-    $lang->install_checklist_gd = 'GD라이브러리 설치';
-    $lang->install_without_iconv = '문자열을 처리하기 위한 iconv 라이브러리가 설치되어 있지 않습니다.';
-    $lang->install_session_auto_start = 'php설정의 session.auto_start==1 이라 세션 처리에 문제가 발생할 수 있습니다.';
-    $lang->install_permission_denied = '설치대상 디렉토리의 퍼미션이 707이 아닙니다.';
-
-    $lang->cmd_agree_license = '라이선스에 동의합니다.';
-    $lang->cmd_install_fix_checklist = '필수 설치조건을 설정하였습니다.';
-    $lang->cmd_install_next = '설치를 진행합니다.';
-    $lang->cmd_ignore = '무시';
-
-    $lang->db_desc = array(
-        'mysql' => 'MySQL DB를 php의 mysql*()함수를 이용하여 사용합니다.<br />DB 파일은 myisam으로 생성되기에 트랜잭션이 이루어지지 않습니다.',
-        'mysqli' => 'MySQL DB를 php의 mysqli*()함수를 이용하여 사용합니다.<br />DB 파일은 myisam으로 생성되기에 트랜잭션이 이루어지지 않습니다.',
-        'mysql_innodb' => 'MySQL DB를 innodb를 이용하여 사용합니다.<br />innodb는 트랜잭션을 사용할 수 있습니다.',
-        'sqlite2' => '파일로 데이터를 저장하는 sqlite2를 지원합니다.<br />설치 시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.<br />(안정화 테스트가 되지 않았습니다.)',
-        'sqlite3_pdo' => 'PHP의 PDO로 sqlite3를 지원합니다.<br />설치 시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.',
-        'cubrid' => 'CUBRID DB를 이용합니다. <a href="http://xe.xpressengine.net/18180659" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => 'MSSQL DB를 이용합니다.',
-        'postgresql' => 'PostgreSql을 이용합니다.',
-        'firebird' => 'Firebird를 이용합니다.<br />DB 생성 방법 (create database "/path/dbname.fdb" page_size=8192 default character set UTF-8;)',
-    );
-
-    $lang->form_title = 'DB &amp; 관리자 정보 입력';
-    $lang->db_title = 'DB정보 입력';
-    $lang->db_type = 'DB 종류';
-    $lang->select_db_type = '사용하시려는 DB를 선택해주세요.';
-    $lang->db_hostname = 'DB 호스트네임';
-    $lang->db_port = 'DB Port';
-    $lang->db_userid = 'DB 아이디';
-    $lang->db_password = 'DB 비밀번호';
-    $lang->db_database = 'DB 데이터베이스';
-    $lang->db_database_file = 'DB 데이터베이스 파일';
-    $lang->db_table_prefix = '테이블 머리말';
-
-    $lang->admin_title = '관리자 정보';
-
-    $lang->env_title = '환경 설정';
-    $lang->use_optimizer = 'Optimizer 사용';
-    $lang->about_optimizer = 'Optimizer를 사용하면 다수의 CSS/JS파일을 통합/압축 전송하여 매우 빠르게 사이트 접속이 가능하게 합니다.<br />다만 CSS나 JS에 따라서 문제가 생길 수 있습니다. 이때는 Optimizer 비활성화 하시면 정상적인 동작은 가능합니다.';
-    $lang->use_rewrite = '짧은 주소 사용';
-    $lang->use_sso = '통합인증 사용';
-    $lang->about_rewrite = '이 기능을 사용하면 http://주소/?document_srl=123과 같이 복잡한 주소를 http://주소/123과 같이 간단하게 줄일 수 있습니다. 이 기능을 사용하려면 웹 서버에서 rewrite_mod를 지원해야 합니다. 웹 서버에서 rewrite_mod를 지원하는지 여부는 서버 관리자에게 문의하세요.';
-	$lang->about_sso = '사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 되는 기능입니다. 가상 사이트를 사용할 때만 필요합니다.';
-    $lang->time_zone = '표준 시간대';
-    $lang->about_time_zone = '서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 표준 시간대를 지정하시면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다.';
-    $lang->qmail_compatibility = 'Qmail 호환';
-    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
-
-    $lang->about_database_file = 'Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 하셔야 합니다.<br/><span style="color:red">데이터 파일은 707퍼미션 설정된 곳으로 지정해주세요.</span>';
-
-    $lang->success_installed = '설치가 되었습니다.';
-
-    $lang->msg_cannot_proc = '설치 환경이 갖춰지지 않아 요청을 실행할 수가 없습니다.';
-    $lang->msg_already_installed = '이미 설치가 되어 있습니다.';
-    $lang->msg_dbconnect_failed = "DB접속 오류가 발생하였습니다.\nDB정보를 다시 확인해주세요.";
-    $lang->msg_table_is_exists = "이미 DB에 테이블이 생성되어 있습니다.\nconfig파일을 재생성하였습니다.";
-    $lang->msg_install_completed = "설치가 완료되었습니다.\n감사합니다.";
-    $lang->msg_install_failed = '설치 파일 생성 시에 오류가 발생하였습니다.';
-
-    $lang->ftp_get_list = '목록 가져오기';
-?>
diff --git a/modules/install/lang/lang.xml b/modules/install/lang/lang.xml
new file mode 100644
index 000000000..95ca40e6b
--- /dev/null
+++ b/modules/install/lang/lang.xml
@@ -0,0 +1,910 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="introduce_title">
+		<value xml:lang="ko"><![CDATA[XE 설치]]></value>
+		<value xml:lang="en"><![CDATA[XE Installation]]></value>
+		<value xml:lang="jp"><![CDATA[XEのインストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装XE]]></value>
+		<value xml:lang="zh-TW"><![CDATA[XE程式安裝]]></value>
+		<value xml:lang="fr"><![CDATA[Installation du XE ]]></value>
+		<value xml:lang="ru"><![CDATA[Установка XE]]></value>
+		<value xml:lang="es"><![CDATA[Instalación de XE ]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt XE]]></value>
+	</item>
+	<item name="lgpl_agree">
+		<value xml:lang="ko"><![CDATA[GNU 약소 일반 공중 사용 허가서(LGPL v2) 동의]]></value>
+		<value xml:lang="en"><![CDATA[GNU Lesser General Public License(LGPL v2) Agreement]]></value>
+		<value xml:lang="jp"><![CDATA[GNU LGPL v2への同意]]></value>
+	</item>
+	<item name="enviroment_gather">
+		<value xml:lang="ko"><![CDATA[설치 환경 수집 동의]]></value>
+		<value xml:lang="en"><![CDATA[Agreement on gathering installation environment information]]></value>
+		<value xml:lang="jp"><![CDATA[インストール環境収集に同意する]]></value>
+	</item>
+	<item name="install_progress_menu" type="array">
+		<item name="agree">
+			<value xml:lang="ko"><![CDATA[라이선스 동의]]></value>
+			<value xml:lang="en"><![CDATA[Acceptance of terms]]></value>
+			<value xml:lang="jp"><![CDATA[ライセンスに同意]]></value>
+		</item>
+		<item name="condition">
+			<value xml:lang="ko"><![CDATA[설치 조건 확인]]></value>
+			<value xml:lang="en"><![CDATA[Check the installation conditions]]></value>
+			<value xml:lang="jp"><![CDATA[インストール条件確認]]></value>
+		</item>
+		<item name="ftp">
+			<value xml:lang="ko"><![CDATA[FTP 정보 입력]]></value>
+			<value xml:lang="en"><![CDATA[Input FTP information]]></value>
+			<value xml:lang="jp"><![CDATA[FTP情報入力]]></value>
+		</item>
+		<item name="dbSelect">
+			<value xml:lang="ko"><![CDATA[DB 선택]]></value>
+			<value xml:lang="en"><![CDATA[Choose database type]]></value>
+			<value xml:lang="jp"><![CDATA[DB選択]]></value>
+		</item>
+		<item name="dbInfo">
+			<value xml:lang="ko"><![CDATA[DB 정보 입력]]></value>
+			<value xml:lang="en"><![CDATA[Input Database information]]></value>
+			<value xml:lang="jp"><![CDATA[DB情報入力]]></value>
+		</item>
+		<item name="configInfo">
+			<value xml:lang="ko"><![CDATA[환경 설정]]></value>
+			<value xml:lang="en"><![CDATA[Settings]]></value>
+			<value xml:lang="jp"><![CDATA[環境設定]]></value>
+		</item>
+		<item name="adminInfo">
+			<value xml:lang="ko"><![CDATA[관리자 정보 입력]]></value>
+			<value xml:lang="en"><![CDATA[Enter Administrator information]]></value>
+			<value xml:lang="jp"><![CDATA[管理者情報入力]]></value>
+		</item>
+	</item>
+	<item name="install_condition_title">
+		<value xml:lang="ko"><![CDATA[필수 설치조건을 확인하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please check the installation requirement.]]></value>
+		<value xml:lang="jp"><![CDATA[インストールするための必須条件を確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[检测运行环境]]></value>
+		<value xml:lang="zh-TW"><![CDATA[確認安裝時必備的條件]]></value>
+		<value xml:lang="fr"><![CDATA[Vérifiez  les conditions obligatoires pour l'installation, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, проверьте требования к установке.]]></value>
+		<value xml:lang="es"><![CDATA[Por favor chequee los requerimientos de la instalación.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen kurulum gereksinimlerini kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy kiểm tra những yêu cầu cài đặt.]]></value>
+	</item>
+	<item name="install_checklist_title" type="array">
+		<item name="php_version">
+			<value xml:lang="ko"><![CDATA[PHP Version]]></value>
+			<value xml:lang="en"><![CDATA[PHP Version]]></value>
+			<value xml:lang="jp"><![CDATA[PHPバージョン]]></value>
+			<value xml:lang="zh-CN"><![CDATA[PHP版本]]></value>
+			<value xml:lang="zh-TW"><![CDATA[PHP版本]]></value>
+			<value xml:lang="fr"><![CDATA[Version de PHP]]></value>
+			<value xml:lang="ru"><![CDATA[Версия PHP]]></value>
+			<value xml:lang="es"><![CDATA[Versión PHP]]></value>
+			<value xml:lang="tr"><![CDATA[PHP Sürümü]]></value>
+			<value xml:lang="vi"><![CDATA[Phiên bản PHP]]></value>
+		</item>
+		<item name="permission">
+			<value xml:lang="ko"><![CDATA[퍼미션]]></value>
+			<value xml:lang="en"><![CDATA[Permission]]></value>
+			<value xml:lang="jp"><![CDATA[パーミッション]]></value>
+			<value xml:lang="zh-CN"><![CDATA[权限]]></value>
+			<value xml:lang="zh-TW"><![CDATA[權限]]></value>
+			<value xml:lang="fr"><![CDATA[Autorisation]]></value>
+			<value xml:lang="ru"><![CDATA[Права доступа]]></value>
+			<value xml:lang="es"><![CDATA[Atribución]]></value>
+			<value xml:lang="tr"><![CDATA[Yetki]]></value>
+			<value xml:lang="vi"><![CDATA[Sự cho phép]]></value>
+		</item>
+		<item name="xml">
+			<value xml:lang="ko"><![CDATA[XML 라이브러리]]></value>
+			<value xml:lang="en"><![CDATA[XML Library]]></value>
+			<value xml:lang="jp"><![CDATA[XMLライブラリ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[XML库]]></value>
+			<value xml:lang="fr"><![CDATA[Bibliothèque de XML]]></value>
+			<value xml:lang="ru"><![CDATA[XML библиотека]]></value>
+			<value xml:lang="es"><![CDATA[Librería XML]]></value>
+			<value xml:lang="tr"><![CDATA[XML Kitaplığı]]></value>
+		</item>
+		<item name="iconv">
+			<value xml:lang="ko"><![CDATA[ICONV 라이브러리]]></value>
+			<value xml:lang="en"><![CDATA[ICONV Library]]></value>
+			<value xml:lang="jp"><![CDATA[ICONVライブラリ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[ICONV库]]></value>
+			<value xml:lang="fr"><![CDATA[Bibliothèque de ICONV]]></value>
+			<value xml:lang="ru"><![CDATA[ICONV библиотека]]></value>
+			<value xml:lang="es"><![CDATA[Librería ICONV]]></value>
+			<value xml:lang="tr"><![CDATA[ICONV Kitaplığı]]></value>
+		</item>
+		<item name="gd">
+			<value xml:lang="ko"><![CDATA[GD 라이브러리]]></value>
+			<value xml:lang="en"><![CDATA[GD Library]]></value>
+			<value xml:lang="jp"><![CDATA[GDライブラリ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[GD库]]></value>
+			<value xml:lang="fr"><![CDATA[Bibliothèque de GD]]></value>
+			<value xml:lang="ru"><![CDATA[GD библиотека]]></value>
+			<value xml:lang="es"><![CDATA[Librería GD]]></value>
+			<value xml:lang="tr"><![CDATA[GD Kitaplığı]]></value>
+		</item>
+		<item name="session">
+			<value xml:lang="ko"><![CDATA[Session.auto_start 설정]]></value>
+			<value xml:lang="en"><![CDATA[Session.auto_start setting]]></value>
+			<value xml:lang="jp"><![CDATA[Session.auto_startの設定]]></value>
+			<value xml:lang="zh-CN"><![CDATA[Session.auto_start 设置]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Session.auto_start設置]]></value>
+			<value xml:lang="fr"><![CDATA[Configuration de Session.auto_start]]></value>
+			<value xml:lang="ru"><![CDATA[Session.auto_start настройка]]></value>
+			<value xml:lang="es"><![CDATA[Configuración Session.auto_start]]></value>
+			<value xml:lang="tr"><![CDATA[Session.auto_start(otomatik.oturum_acma) ayarı]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập Session.auto_start]]></value>
+		</item>
+		<item name="db">
+			<value xml:lang="ko"><![CDATA[DB]]></value>
+			<value xml:lang="en"><![CDATA[DB]]></value>
+		</item>
+	</item>
+	<item name="install_license_desc" type="array">
+		<item name="lgpl">
+			<value xml:lang="ko"><![CDATA[GNU 약소 일반 공중 사용 허가서(LGPL v2)에 동의해야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[You have to agree to the GNU Lesser General Public License(LGPL v2).]]></value>
+			<value xml:lang="jp"><![CDATA[GNU LGPL v2に同意しなければなりません。]]></value>
+		</item>
+	</item>
+	<item name="install_checklist_desc" type="array">
+		<item name="php_version">
+			<value xml:lang="ko"><![CDATA[[필수] PHP버전이 5.2.2일 경우 PHP의 버그로 인하여 설치되지 않습니다.]]></value>
+			<value xml:lang="en"><![CDATA[[Required] If PHP version is 5.2.2, XE will not be installed because of a bug]]></value>
+			<value xml:lang="jp"><![CDATA[【必須】PHPバージョンが 5.2.2の場合は、PHPのセキュリティバグのため、インストールできません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[[必须] 由于 PHP 5.2.2 版本BUG，无法安装 XE。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[[必須] 由於 PHP 5.2.2 版本的問題，無法安裝 XE 程式。]]></value>
+			<value xml:lang="fr"><![CDATA[[Obligatoire] Si la version de PHP est 5.2.2, XE ne sera pas  installé à cause du bogue]]></value>
+			<value xml:lang="ru"><![CDATA[[Требуется] Если версия PHP равна 5.2.2, то XE не будет установлена из-за бага]]></value>
+			<value xml:lang="es"><![CDATA[[Requerido] Si la versión de PHP es 5.2.2, XE no sera instalado por errores]]></value>
+			<value xml:lang="tr"><![CDATA[[Gerekli] Eğer PHP sürümü 5.2.2 ise, XE yazılım hatasından dolayı kurulmayacaktır]]></value>
+			<value xml:lang="vi"><![CDATA[[Bắt buộc] Nếu phiên bản của PHP là 5.2.2, XE sẽ không thể cài đặt vì có lỗi.]]></value>
+		</item>
+		<item name="permission">
+			<value xml:lang="ko"><![CDATA[[필수] XE의 설치 경로 또는 ./files 디렉토리의 퍼미션이 707이어야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[[Required] XE installation path or ./files directory's permission must be 707]]></value>
+			<value xml:lang="jp"><![CDATA[【必須】XEのインストールパスまたは「./files」ディレクトリのパーミッションを「707」に設定してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[[必须] 的安装路径或 ./files目录属性必须是707]]></value>
+			<value xml:lang="zh-TW"><![CDATA[[必須] XE的資料夾或『./files』資料夾權限必須是『707』。]]></value>
+			<value xml:lang="fr"><![CDATA[[Obligatoire] Chemin de l'installation de XE ou la permission de  répertoire de ./files doit être 707]]></value>
+			<value xml:lang="ru"><![CDATA[[Требуется] Путь установки XE или директория ./files должна иметь права доступа 707]]></value>
+			<value xml:lang="es"><![CDATA[[Requerido] La ruta de la instalación de XE o el directorio de ./archivos deberia tener la atribución 707]]></value>
+			<value xml:lang="tr"><![CDATA[[Gerekli] XE kurulum yolu ya da ./files directory yolunun yetkisi 707 olmalıdır]]></value>
+			<value xml:lang="vi"><![CDATA[[Bắt buộc] Thư mục cài đặt của XE hay ./files directory phải CHMOD thành 707]]></value>
+		</item>
+		<item name="xml">
+			<value xml:lang="ko"><![CDATA[[필수] XML통신을 위하여 XML 라이브러리가 필요합니다.]]></value>
+			<value xml:lang="en"><![CDATA[[Required] XML Library is needed for XML communication]]></value>
+			<value xml:lang="jp"><![CDATA[【必須】XML通信のためにXMLライブラリが必要です。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[[必须]为了 XML通讯，将需要XML库]]></value>
+			<value xml:lang="zh-TW"><![CDATA[[必須] 必須要安裝『XML Library』，才能夠使用 XML 通訊。]]></value>
+			<value xml:lang="fr"><![CDATA[[Obligatoire] La bibliothèque de XML est nécessaire pour la communication de XML]]></value>
+			<value xml:lang="ru"><![CDATA[[Требуется] XML Библиотека нужна для XML коммуникации]]></value>
+			<value xml:lang="es"><![CDATA[[Requerido] Libreria XML es necesario para la comunicación de XML]]></value>
+			<value xml:lang="tr"><![CDATA[[Gerekli] XML iletişimi için XML kitaplığı gereklidir.]]></value>
+			<value xml:lang="vi"><![CDATA[[Bắt buộc] XML Library cần thiết cho việc truyền thông File XML.]]></value>
+		</item>
+		<item name="session">
+			<value xml:lang="ko"><![CDATA[[필수] XE에서 세션 사용을 위해 php.ini 설정의 session.auto_start=0 이어야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[[Required] PHP setting file's (php.ini) 'Session.auto_start' must equal to zero in order for XE to use the session]]></value>
+			<value xml:lang="jp"><![CDATA[【必須】XEでは、セッションを使用しているため、「php.ini」の設定を「session.auto_start=0」にしてください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[[必须] 为了使用缓冲功能，必须在php.ini当中设置 session.auto_start=0]]></value>
+			<value xml:lang="zh-TW"><![CDATA[[必須] 在『php.ini』中必須要設定『session.auto_start=0』，才能使用暫存功能]]></value>
+			<value xml:lang="fr"><![CDATA[[Obligatoire] 'Session.auto_start' dans le fichier de configuration pour PHP (php.ini) doit être égal à zéro car XE utilise la session]]></value>
+			<value xml:lang="ru"><![CDATA[[Требуется] Файл настроек PHP (php.ini) 'Session.auto_start' должен быть равен нулю, чтобы XE могла использовать сессии]]></value>
+			<value xml:lang="es"><![CDATA[[Requerido] Para el uso de la sesion de XE, el archivo php.ini deberia estar configurada  session.auto_start=0]]></value>
+			<value xml:lang="tr"><![CDATA[[Gerekli] PHP ayar dosyasındaki (php.ini) 'Session.auto_start' XE'nin oturumu kullanabilmesi için sıfıra eşit olmalıdır]]></value>
+			<value xml:lang="vi"><![CDATA[[Bắt buộc] File thiết lập của PHP (php.ini) 'Session.auto_start' phải là 0 theo thứ tự số cho phiên làm việc của XE hoạt động.]]></value>
+		</item>
+		<item name="iconv">
+			<value xml:lang="ko"><![CDATA[UTF-8과 다른 언어셋의 변환을 위한 iconv설치가 필요합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Iconv should be installed in order to convert between UTF-8 and other language sets]]></value>
+			<value xml:lang="jp"><![CDATA[UTF-8と多言語サポート及び文字コード変換のため、「iconv」をインストールする必要があります。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[为了UTF-8和其他语言环境之间的互相转换，必须安装iconv]]></value>
+			<value xml:lang="zh-TW"><![CDATA[安裝『iconv』，才能使 UTF-8 和其他語言文字作互相轉換。]]></value>
+			<value xml:lang="fr"><![CDATA[Iconv doit être installé afin de convertir UTF-8 et des autres assortiments des  langues]]></value>
+			<value xml:lang="ru"><![CDATA[Iconv должна быть установлена для конвертирования между UTF-8 и иными языковыми кодировками]]></value>
+			<value xml:lang="es"><![CDATA[Para transformar UTF-8 y otra paquete del idioma deberia estar instalado el Iconv.]]></value>
+			<value xml:lang="tr"><![CDATA[Iconv, UTF-8 ve diğer dil ayarlarını değiştirebilmek için kurulmuş olmalıdır]]></value>
+			<value xml:lang="vi"><![CDATA[<b>Iconv</b> cần phải được cài đặt cho việc chuyển đổi ngôn ngữ thàng UTFF-8 của những ngôn ngữ khác.]]></value>
+		</item>
+		<item name="gd">
+			<value xml:lang="ko"><![CDATA[이미지변환 기능을 사용하기 위해 GD라이브러리가 설치되어 있어야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[GD Library should be installed in order to use functions to convert images]]></value>
+			<value xml:lang="jp"><![CDATA[イメージ変換機能を使用するためには、「GDライブラリ」をインストールする必要があります。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[为了使用图片转换功能，必须先得安装GD库]]></value>
+			<value xml:lang="zh-TW"><![CDATA[安裝『GD Library』才可以使用圖片轉換功能。]]></value>
+			<value xml:lang="fr"><![CDATA[La bibliothèque de GD doit être installé afin d'utiliser la fonction à convertir des images]]></value>
+			<value xml:lang="ru"><![CDATA[GD Библиотека должна быть установлена для использования функции конвертироваия изображений]]></value>
+			<value xml:lang="es"><![CDATA[Libreria GD deberia estar instalado para utilizar la funcion de convertir la imagen]]></value>
+			<value xml:lang="tr"><![CDATA[GD Kitaplığı, resim değiştirme özelliğini kullanabilmek için kurulmuş, olmalıdır]]></value>
+			<value xml:lang="vi"><![CDATA[<b>GD Library</b> cần phải được cài đặt cho việc chuyển đổi hình ảnh.]]></value>
+		</item>
+	</item>
+	<item name="install_checklist_xml">
+		<value xml:lang="ko"><![CDATA[XML라이브러리 설치]]></value>
+		<value xml:lang="en"><![CDATA[Install XML Library]]></value>
+		<value xml:lang="jp"><![CDATA[XMLライブラリのインストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装XML库]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝 XML Library]]></value>
+		<value xml:lang="fr"><![CDATA[Installation la bibliothèque de XML]]></value>
+		<value xml:lang="ru"><![CDATA[Установить XML библиотеку]]></value>
+		<value xml:lang="es"><![CDATA[Instalar Librería XML ]]></value>
+		<value xml:lang="tr"><![CDATA[XML Kitaplığını Kur]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt XML Library]]></value>
+	</item>
+	<item name="install_without_xml">
+		<value xml:lang="ko"><![CDATA[xml 라이브러리가 설치되어 있지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[XML Library is not installed]]></value>
+		<value xml:lang="jp"><![CDATA[XMLライブラリがインストールされていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[还没有安装xml库！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未安裝 XML Library！]]></value>
+		<value xml:lang="fr"><![CDATA[La bibliothèque de XML n'est pas installée]]></value>
+		<value xml:lang="ru"><![CDATA[XML библиотека не установлена]]></value>
+		<value xml:lang="es"><![CDATA[Librería XML no esta instalado]]></value>
+		<value xml:lang="tr"><![CDATA[XML Kitaplığı kurulmamış]]></value>
+		<value xml:lang="vi"><![CDATA[XML Library đã không được cài đặt.]]></value>
+	</item>
+	<item name="install_checklist_gd">
+		<value xml:lang="ko"><![CDATA[GD라이브러리 설치]]></value>
+		<value xml:lang="en"><![CDATA[Install GD Library]]></value>
+		<value xml:lang="jp"><![CDATA[GDライブラリのインストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装GD库]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝 GD Library]]></value>
+		<value xml:lang="fr"><![CDATA[Installation la bibliothèque de  GD]]></value>
+		<value xml:lang="ru"><![CDATA[Установить GD библиотеку]]></value>
+		<value xml:lang="es"><![CDATA[Intalar Librería GD]]></value>
+		<value xml:lang="tr"><![CDATA[GD Kitaplığını Kur]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt GD Library]]></value>
+	</item>
+	<item name="install_without_gd">
+		<value xml:lang="ko"><![CDATA[이미지 변환을 위한 GD 라이브러리가 설치되어 있지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[GD Library is not installed for image convertion]]></value>
+		<value xml:lang="jp"><![CDATA[イメージ変換用のGDライブラリがインストールされていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[还没有安装负责转换图片功能的GD库！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未安裝負責轉換圖片功能的 GD Library！]]></value>
+		<value xml:lang="fr"><![CDATA[La bibliothèque de GD pour convertir des images n'est pas installée]]></value>
+		<value xml:lang="ru"><![CDATA[GD библиотека не установлена]]></value>
+		<value xml:lang="es"><![CDATA[Libreria GD no esta instalado para la conversión de la imagen]]></value>
+		<value xml:lang="tr"><![CDATA[GD Library, resim dönüştürmek için, kurulmamış]]></value>
+		<value xml:lang="vi"><![CDATA[GD Library đã không được cài đặt cho sự chuyển đổi hình ảnh.]]></value>
+	</item>
+	<item name="install_without_iconv">
+		<value xml:lang="ko"><![CDATA[문자열을 처리하기 위한 iconv 라이브러리가 설치되어 있지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Iconv Library is not installed for processing characters]]></value>
+		<value xml:lang="jp"><![CDATA[文字列処理のための「iconv」ライブラリがインストールされていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[还没有安装负责处理字串的iconv库！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未安裝負責處理字串的『iconv』！]]></value>
+		<value xml:lang="fr"><![CDATA[La bibliothèque d'Iconv pour traiter les caractères  n'est pas installée]]></value>
+		<value xml:lang="ru"><![CDATA[Iconv библиотека не установлена]]></value>
+		<value xml:lang="es"><![CDATA[Libreria Iconv no esta instalado para procesar las fuentes]]></value>
+		<value xml:lang="tr"><![CDATA[Iconv Kitaplığı, karakterleri sıralamak için, kurulmamış]]></value>
+		<value xml:lang="vi"><![CDATA[Iconv Library đã không được cài đặt cho việc xử lý những đặc tính.]]></value>
+	</item>
+	<item name="install_session_auto_start">
+		<value xml:lang="ko"><![CDATA[php설정의 session.auto_start==1 이라 세션 처리에 문제가 발생할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Possible problems might occur due to the php setting. session.auto_start is equal to 1]]></value>
+		<value xml:lang="jp"><![CDATA[PHPの設定で「session.auto_start==1」 にするとセッション処理に問題が発生することがあります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[PHP设置中设置成session.auto_start==1，可能处理session时发生错误。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[PHP設置中設置成『session.auto_start==1』，可能在處理 session 時會發生錯誤。]]></value>
+		<value xml:lang="fr"><![CDATA[Des problèmes possibles peuvent avoir lieu car  session.auto_start==1 dans la configuration de PHP]]></value>
+		<value xml:lang="ru"><![CDATA[Возможно возникнут проблемы из-за настройки PHP session.auto_start, установленной в 1]]></value>
+		<value xml:lang="es"><![CDATA[Puede provocar errores si en la configuración de php esta configurada "session.auto_start=1"]]></value>
+		<value xml:lang="tr"><![CDATA[Olası hatalar php ayarlarından dolayı oluşabilir. session.auto_start 1'e eşit olmalıdır]]></value>
+		<value xml:lang="vi"><![CDATA[Đã có lỗi xảy ra, có lẽ do sự thiết đặt PHP. session.auto_start không phải là 1]]></value>
+	</item>
+	<item name="install_permission_denied">
+		<value xml:lang="ko"><![CDATA[설치대상 디렉토리의 퍼미션이 707이 아닙니다.]]></value>
+		<value xml:lang="en"><![CDATA[Installation path's permission doesn't equal to 707]]></value>
+		<value xml:lang="jp"><![CDATA[インストールする対象ディレクトリのパーミッションが「707」になっていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装目录属性不是707！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝目錄權限不是『707』！]]></value>
+		<value xml:lang="fr"><![CDATA[La permission du chemin d'installation n'est pas égale à 707]]></value>
+		<value xml:lang="ru"><![CDATA[Права доступа пути не установлены в 707]]></value>
+		<value xml:lang="es"><![CDATA[La atribución de la ruta de instalacion no es igual a 707]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum yolu yetkisi 707'ye eşit değil]]></value>
+		<value xml:lang="vi"><![CDATA[Sự cho phép của thư mục cài đặt không phải là 707]]></value>
+	</item>
+	<item name="install_notandum">
+		<value xml:lang="ko"><![CDATA[모든 항목을 반드시 작성해야 합니다. 모든 항목을 관리자 환경에서 수정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[All form must be filled, but you can modify all of settings after finish the installation.]]></value>
+		<value xml:lang="jp"><![CDATA[すべての項目を必ず作成してください。すべての項目を管理者環境にて修正できます。]]></value>
+	</item>
+	<item name="cmd_agree_license">
+		<value xml:lang="ko"><![CDATA[라이선스에 동의합니다.]]></value>
+		<value xml:lang="en"><![CDATA[I agree with the license]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンスに同意します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[同意]]></value>
+		<value xml:lang="zh-TW"><![CDATA[同意使用條款]]></value>
+		<value xml:lang="fr"><![CDATA[Je suis d'accord avec la licence]]></value>
+		<value xml:lang="ru"><![CDATA[Я согласен с данной лицензией]]></value>
+		<value xml:lang="es"><![CDATA[Yo accepto la licencia]]></value>
+		<value xml:lang="tr"><![CDATA[Lisansı kabul ediyorum]]></value>
+		<value xml:lang="vi"><![CDATA[Tôi đã đọc và đồng ý với giấy phép này.]]></value>
+	</item>
+	<item name="cmd_install_fix_checklist">
+		<value xml:lang="ko"><![CDATA[필수 설치조건을 설정하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[I have fixed the required conditions.]]></value>
+		<value xml:lang="jp"><![CDATA[インストール必須条件を設定しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已设置了必要的安装条件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重新檢查]]></value>
+		<value xml:lang="fr"><![CDATA[J'ai corrigé les conditions obligatoires.]]></value>
+		<value xml:lang="ru"><![CDATA[Я удоволетворил требуемые условия]]></value>
+		<value xml:lang="es"><![CDATA[Yo he configurado las condiciones necesarias para la instalación.]]></value>
+		<value xml:lang="tr"><![CDATA[Gerekli koşulları tamamladım.]]></value>
+		<value xml:lang="vi"><![CDATA[Tôi đã thay đổi để phù hợp với yêu cầu cài đặt.]]></value>
+	</item>
+	<item name="cmd_install_next">
+		<value xml:lang="ko"><![CDATA[설치를 진행합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Continue installation]]></value>
+		<value xml:lang="jp"><![CDATA[インストールを続けます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[开始安装]]></value>
+		<value xml:lang="zh-TW"><![CDATA[開始進行安裝]]></value>
+		<value xml:lang="fr"><![CDATA[Continuer à  installer]]></value>
+		<value xml:lang="ru"><![CDATA[Продолжить установку]]></value>
+		<value xml:lang="es"><![CDATA[Continuar la instalación]]></value>
+		<value xml:lang="tr"><![CDATA[Kuruluma Devam Et]]></value>
+		<value xml:lang="vi"><![CDATA[Tiếp tục cài đặt]]></value>
+	</item>
+	<item name="cmd_ignore">
+		<value xml:lang="ko"><![CDATA[무시]]></value>
+		<value xml:lang="en"><![CDATA[Ignore]]></value>
+		<value xml:lang="jp"><![CDATA[FTP設定を省略する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[忽略]]></value>
+		<value xml:lang="zh-TW"><![CDATA[忽略]]></value>
+		<value xml:lang="tr"><![CDATA[Önemseme]]></value>
+		<value xml:lang="vi"><![CDATA[Bỏ qua]]></value>
+	</item>
+	<item name="db_desc" type="array">
+		<item name="mysql">
+			<value xml:lang="ko"><![CDATA[MySQL DB를 php의 mysql*()함수를 이용하여 사용합니다.<br />DB 파일은 myisam으로 생성되기에 트랜잭션이 이루어지지 않습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Use MySQL as a database with mysql*() functions in php.<br />Transactions will not be processed since DB file is created in myisam.]]></value>
+			<value xml:lang="jp"><![CDATA[MySQL DBでPHPの「mysql*()」関数を利用してデータの入出力を行います。<br />DBは「myisam」タイプで作成されるため、トランザクション処理はできません。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[利用php的 mysql*()函数使用mysql DB。<br />DB数据是以myisam生成，因此不能实现transaction。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[利用 PHP 的『mysql*()』函數使用 MySQL 資料庫。<br />利用『myisam』建立資料庫檔案，因此不能實現transaction。]]></value>
+			<value xml:lang="fr"><![CDATA[Utilisera fonction mysql*() pour utiliser la base de données de mysql.<br />La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.]]></value>
+			<value xml:lang="ru"><![CDATA[Используем mysql*() функцию, чтобы использовать базу данных mysql.<br />Транзакция отключена из-за того, что файл базы данных создан посредством myisam.]]></value>
+			<value xml:lang="es"><![CDATA[Utilizando las funciones mysql*() de PHP usar DB mysql.<br />La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.]]></value>
+			<value xml:lang="tr"><![CDATA[PHP'de mysql*() özellikleri için MySQL'ü veritabanı olarak kullanınız.<br />İşlemler, veritabanı dosyası myisam 'da oluşturulduğu zaman işlenmeyecektir.]]></value>
+			<value xml:lang="vi"><![CDATA[Dùng chức năng <b>mysql*()</b> để sử dụng MySql Database.<br />Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.]]></value>
+		</item>
+		<item name="mysqli">
+			<value xml:lang="ko"><![CDATA[MySQL DB를 php의 mysqli*()함수를 이용하여 사용합니다.<br />DB 파일은 myisam으로 생성되기에 트랜잭션이 이루어지지 않습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Use MySQL as a database with mysqli*() functions in php.<br />Transactions will not be processed since DB file is created in myisam]]></value>
+			<value xml:lang="jp"><![CDATA[MySQL DBでPHPの「mysqli*()」関数を利用してデータの入出力を行います。<br />DBは「myisam」タイプで作成されるため、トランザクション処理はできせん。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[利用php的 mysqli*()函数使用mysql DB。<br />DB数据是以myisam生成，因此不能实现transaction。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[利用 PHP 的『mysqli*()』函數使用 MySQL 資料庫。<br />利用『myisam』建立資料庫檔案，因此不能實現transaction。]]></value>
+			<value xml:lang="fr"><![CDATA[Utilisera fonction mysqli*() pour utiliser la base de données de mysql.<br />La transaction sera invalidé parce que le fichier de Base de Données est créé par myisam.]]></value>
+			<value xml:lang="ru"><![CDATA[Используем mysqli*() функцию, чтобы использовать базу данных mysql.<br />Транзакция отключена из-за того, что файл базы данных создан посредством myisam.]]></value>
+			<value xml:lang="es"><![CDATA[Utilizando las funciones mysqli*() de PHP usar DB mysql.<br />La transacción es desabilitado ya que DB(Bases de Datos) está creado por myisam.]]></value>
+			<value xml:lang="tr"><![CDATA[PHP'de mysqli*() özellikleri için MySQL'ü veritabanı olarak kullanınız.<br />İşlemler, veritabanı dosyası myisam 'da oluşturulduğu zaman işlenmeyecektir.]]></value>
+			<value xml:lang="vi"><![CDATA[Dùng chức năng <b>mysqli*()</b> để sử dụng MySql Database.<br />Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.]]></value>
+		</item>
+		<item name="mysql_innodb">
+			<value xml:lang="ko"><![CDATA[MySQL DB를 innodb를 이용하여 사용합니다.<br />innodb는 트랜잭션을 사용할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Use MySQL as a database with innodb.<br />Transactions will be processed with innodb]]></value>
+			<value xml:lang="jp"><![CDATA[MySQL DBで「innodb」タイプでデータの入出力を行います。<br />「innodb」ではトランザクションの処理が行えます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[利用innodb使用mysql DB。<br />innodb可以使用transaction。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[利用『innodb』使用 Mysql 資料庫。<br />innodb可以使用 transaction。]]></value>
+			<value xml:lang="fr"><![CDATA[Utilisera innodb pour utiliser Base de Données de mysql.<br />La transaction sera validé pour innodb]]></value>
+			<value xml:lang="ru"><![CDATA[Используем innodb  чтобы использовать базу данных mysql.<br />Транзакция включена для innodb]]></value>
+			<value xml:lang="es"><![CDATA[Utilizando innodb usar BD mysql.<br />La transacción es hablilitado para innodb]]></value>
+			<value xml:lang="tr"><![CDATA[innodb ile MySQL'ü veritabanı olrak kullanınız.<br />İşlemler, innodb ile işlenecektir]]></value>
+			<value xml:lang="vi"><![CDATA[Dùng chức năng <b>innodb</b> để sử dụng MySql Database.<br />Giao dịch được kích hoạt cho innodb]]></value>
+		</item>
+		<item name="sqlite2">
+			<value xml:lang="ko"><![CDATA[파일로 데이터를 저장하는 sqlite2를 지원합니다.<br />설치 시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.<br />(안정화 테스트가 되지 않았습니다.)]]></value>
+			<value xml:lang="en"><![CDATA[Use sqlite2 as a database which saves the data in files.<br />DB file <b>must not be</b> accessible from the web.<br />(Never been tested for stabilization)]]></value>
+			<value xml:lang="jp"><![CDATA[ファイルタイプデータベースである「sqlite2」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブがらアクセスできない場所に作成してください。<br />（安定化までのテストは行われていません）]]></value>
+			<value xml:lang="zh-CN"><![CDATA[支持用文件形式保存数据的sqlite2。<br />安装时DB文件应在web不能访问的地方生成。<br />(还没有通过安全的测试)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[支援用檔案形式保存數據的『sqlite2』。<br />安裝時，資料庫數據應建立在 web 無法訪問的地方。<br />(尚未通過安全測試)]]></value>
+			<value xml:lang="fr"><![CDATA[Surpporter sqlite2 qui conserve les données dans les fichiers.<br />Quand vous installez, vous devez créer le fichier de Base de Données dans une place que l'on ne peut pas accéder par web.<br />(Jamais  testé sur  stabilization)]]></value>
+			<value xml:lang="ru"><![CDATA[Поддерживает sqlite2, которая сохраняет данные в файл.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.<br />(Никогда не тестировалось на стабильность)]]></value>
+			<value xml:lang="es"><![CDATA[Soporta sqlite2, el cual almacena los datos en archivos <br />En la instalacion, es necesario crear archivo de BD en un lugar inaccesible de la web.<br />(Testeo de la estabilización no realizada)]]></value>
+			<value xml:lang="tr"><![CDATA['Verileri dosya olarak kaydeden sqlite2 'yi veritabanı olarak kullanınız. <br />VT dosyası tarayıcıdan erişilebilir <b>olmamalıdır</b>.<br />(Sabitleme için hiç test edilmedi)]]></value>
+			<value xml:lang="vi"><![CDATA[Hỗ trợ <b>sqlite2</b> khi lưu Database thành File.<br />Khi cài đặt, File Database phải được tạo ra tại chỗ không sử dụng được từ Web.<br />(Không khẳng định sẽ hoạt động ổn định)]]></value>
+		</item>
+		<item name="sqlite3_pdo">
+			<value xml:lang="ko"><![CDATA[PHP의 PDO로 sqlite3를 지원합니다.<br />설치 시 DB파일은 웹에서 접근할 수 없는 곳에 생성하여 주셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Use sqlite3 as a database which supports PHP PDO.<br />DB file <b>must not be</b> accessible from the web.]]></value>
+			<value xml:lang="jp"><![CDATA[PHPのPDOを経由して「sqlite3」をサポートします。<br />インストール時、セキュリティのため、DBファイルはウェブからアクセスできない場所に作成してください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[用PHP的 PDO支持 sqlite3。<br />安装时DB文件应在web不能访问的地方生成。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[用 PHP 的 PDO 支援『sqlite3』。<br />安裝時，資料庫數據應建立在網頁無法訪問的地方。]]></value>
+			<value xml:lang="fr"><![CDATA[Supporter sqlite3 PDO de PHP.<br />Quand vous installez, vous devez cr?r le fichier de Base de Données dans une place que l'on ne peut pas accéder par Web.]]></value>
+			<value xml:lang="ru"><![CDATA[Поддерживает sqlite3 посредством PHP's PDO.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.]]></value>
+			<value xml:lang="es"><![CDATA[A través de PDO de PHP soporta sqlite2 <br />En la instalación, es necesario crear archivo de BD en un lugar inaccesible de la web.]]></value>
+			<value xml:lang="tr"><![CDATA[PHP'nin PDO'sunun desteğiyle sqlite3'ü veritabanı olarak kullanınız.<br />VT dosyası tarayıcıdan erişilebilir <b>olmamalıdır</b>.]]></value>
+			<value xml:lang="vi"><![CDATA[Hỗ trợ <b>sqlite3</b> bởi PDO của PHP.<br />Khi cài đặt, File Database phải được tạo ra tại chỗ không sử dụng được từ Web.]]></value>
+		</item>
+		<item name="cubrid">
+			<value xml:lang="ko"><![CDATA[CUBRID DB를 이용합니다. <a href="http://xe.xpressengine.net/18180659" target="_blank">Manual</a>]]></value>
+			<value xml:lang="en"><![CDATA[Use CUBRID as a database. See <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a> for more info]]></value>
+			<value xml:lang="jp"><![CDATA[CUBRID DBを利用します。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a>]]></value>
+			<value xml:lang="zh-CN"><![CDATA[使用CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a>]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用 CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a>]]></value>
+			<value xml:lang="fr"><![CDATA[Utiliser la Base de Données de CUBRID.  <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a>]]></value>
+			<value xml:lang="ru"><![CDATA[Используем CUBRID DB. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a>]]></value>
+			<value xml:lang="es"><![CDATA[Usar BD CUBRID. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manual</a>]]></value>
+			<value xml:lang="tr"><![CDATA[CUBRID'ü veritabanı olarak kullanın. Daha fazla bilgi için <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" target="_blank">Manuel</a>i inceleyiniz]]></value>
+			<value xml:lang="vi"><![CDATA[Sử dụng <b>CUBRID</b> Database.  <a href="#" target="_blank">Hướng dẫn</a>]]></value>
+		</item>
+		<item name="mssql">
+			<value xml:lang="ko"><![CDATA[MSSQL DB를 이용합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Use MSSQL as a database]]></value>
+			<value xml:lang="jp"><![CDATA[MSSQL DBを利用します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[使用MSSQL DB。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用 MSSQL DB。]]></value>
+			<value xml:lang="fr"><![CDATA[Utiliser la Base de Données de MSSQL.]]></value>
+			<value xml:lang="ru"><![CDATA[Используем MSSQL DB.]]></value>
+			<value xml:lang="es"><![CDATA[Usar BD MSSQL.]]></value>
+			<value xml:lang="tr"><![CDATA[MSSQL'ü veritabanı olarak kullanın]]></value>
+		</item>
+		<item name="postgresql">
+			<value xml:lang="ko"><![CDATA[PostgreSql을 이용합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Use PostgreSql as a database.]]></value>
+			<value xml:lang="jp"><![CDATA[PostgreSql DBを利用します。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[使用PostgreSql DB。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用 PostgreSql DB。]]></value>
+			<value xml:lang="fr"><![CDATA[Utiliser la Base de Données de PostgreSql.]]></value>
+			<value xml:lang="ru"><![CDATA[Используем PostgreSql DB.]]></value>
+			<value xml:lang="es"><![CDATA[Usar BD PostgreSql.]]></value>
+			<value xml:lang="tr"><![CDATA[PostgreSql'ü veritabanı olarak kullanın.]]></value>
+			<value xml:lang="vi"><![CDATA[Sử dụng <b>PostgreSql</b> Database.]]></value>
+		</item>
+		<item name="firebird">
+			<value xml:lang="ko"><![CDATA[Firebird를 이용합니다.<br />DB 생성 방법 (create database "/path/dbname.fdb" page_size=8192 default character set UTF-8;)]]></value>
+			<value xml:lang="en"><![CDATA[Use Firebird as a database.<br />You can create a database with (create database "/path/dbname.fdb" page_size=8192 default character set UTF-8;)]]></value>
+			<value xml:lang="jp"><![CDATA[Firebird DBを利用します。<br />DB生成方法 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[使用Firebird DB。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[使用 Firebird DB。<br />DB 建立方式 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)]]></value>
+			<value xml:lang="fr"><![CDATA[Utiliser la Base de Données de firebird.]]></value>
+			<value xml:lang="ru"><![CDATA[Используем firebird DB.]]></value>
+			<value xml:lang="es"><![CDATA[Usar BD firebird. Cómo crear <br /> PP (crear base de datos "/ path / dbname.fdb" page_size = 8192 el conjunto de caracteres UTF8 por defecto;)]]></value>
+			<value xml:lang="tr"><![CDATA[Firebird'ü veritabanı olarak kullanın.<br /> (create database "/path/dbname.fdb" page_size=8192 default character set UTF-8;) ile veritabanı oluşturabilirsiniz]]></value>
+			<value xml:lang="vi"><![CDATA[Sử dụng <b>firebird</b> Database.]]></value>
+		</item>
+	</item>
+	<item name="form_title">
+		<value xml:lang="ko"><![CDATA[DB &amp; 관리자 정보 입력]]></value>
+		<value xml:lang="en"><![CDATA[Database &amp; Administrator Information]]></value>
+		<value xml:lang="jp"><![CDATA[データベース &amp; 管理者情報入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据库及管理员基本信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入資料庫及管理員資訊]]></value>
+		<value xml:lang="fr"><![CDATA[Entrer des informations de Base de données et Administrateur]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите дазу данных &amp; Административная Информация]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar  BD &amp; Información del Administrador;]]></value>
+		<value xml:lang="tr"><![CDATA[Veritabanı &amp; Yönetici Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập thông tin Database và thông tin Administrator]]></value>
+	</item>
+	<item name="db_title">
+		<value xml:lang="ko"><![CDATA[DB 정보 입력]]></value>
+		<value xml:lang="en"><![CDATA[Please input DB information]]></value>
+		<value xml:lang="jp"><![CDATA[データベース情報入力]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入数据库信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入資料庫資訊]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez l'information de Base de Données, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите информацию базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Por favor escribir información de BD]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen Veritabanı bilgisini giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập thông tin Database]]></value>
+	</item>
+	<item name="db_type">
+		<value xml:lang="ko"><![CDATA[DB 종류]]></value>
+		<value xml:lang="en"><![CDATA[DB Type]]></value>
+		<value xml:lang="jp"><![CDATA[データベースの種類]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据库类型]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料庫類型]]></value>
+		<value xml:lang="fr"><![CDATA[Sorte de Base de Données]]></value>
+		<value xml:lang="ru"><![CDATA[Тип базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Tipo de BD]]></value>
+		<value xml:lang="tr"><![CDATA[Veritabanı Tipi]]></value>
+		<value xml:lang="vi"><![CDATA[Định dạng Database]]></value>
+	</item>
+	<item name="select_db_type">
+		<value xml:lang="ko"><![CDATA[사용하시려는 DB를 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select the DB you want to use.]]></value>
+		<value xml:lang="jp"><![CDATA[使用するデータベース種類を選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择数据库]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要使用的資料庫。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez la Base de Données que vous voulez utiliser.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите базу данных, которую Вы хотите использовать.]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione el tipo de BD que desea usar.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen kullanmak istediğiniz Veritabanını seçiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy chọn Database bạn muốn sử dụng.]]></value>
+	</item>
+	<item name="db_hostname">
+		<value xml:lang="ko"><![CDATA[DB 호스트네임]]></value>
+		<value xml:lang="en"><![CDATA[DB Hostname]]></value>
+		<value xml:lang="jp"><![CDATA[ホスト名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[服务器名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主機名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Hostname(Nom de l'ordinateur central) de Base de Données (LOCALHOST généralement)]]></value>
+		<value xml:lang="ru"><![CDATA[Хост базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Hostname de BD]]></value>
+		<value xml:lang="tr"><![CDATA[Veritabanı Sunucuadı]]></value>
+		<value xml:lang="vi"><![CDATA[Hostname]]></value>
+	</item>
+	<item name="db_port">
+		<value xml:lang="ko"><![CDATA[DB Port]]></value>
+		<value xml:lang="en"><![CDATA[DB Port]]></value>
+		<value xml:lang="jp"><![CDATA[ポート番号]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据库端口]]></value>
+		<value xml:lang="zh-TW"><![CDATA[埠口]]></value>
+		<value xml:lang="fr"><![CDATA[Port de Base de Données]]></value>
+		<value xml:lang="ru"><![CDATA[Порт базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Port de BD]]></value>
+		<value xml:lang="tr"><![CDATA[Veritabanı Portu]]></value>
+		<value xml:lang="vi"><![CDATA[Port]]></value>
+	</item>
+	<item name="db_userid">
+		<value xml:lang="ko"><![CDATA[DB 아이디]]></value>
+		<value xml:lang="en"><![CDATA[DB ID]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザーID]]></value>
+		<value xml:lang="zh-CN"><![CDATA[DB用户名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用者名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Compte(ID) pour le Base de Données]]></value>
+		<value xml:lang="ru"><![CDATA[ID базы данных]]></value>
+		<value xml:lang="es"><![CDATA[ID de BD]]></value>
+		<value xml:lang="tr"><![CDATA[Veritabanı ID]]></value>
+		<value xml:lang="vi"><![CDATA[Tên truy cập]]></value>
+	</item>
+	<item name="db_password">
+		<value xml:lang="ko"><![CDATA[DB 비밀번호]]></value>
+		<value xml:lang="en"><![CDATA[DB Password]]></value>
+		<value xml:lang="jp"><![CDATA[パスワード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[DB密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Mot de passe pour le Base de Données]]></value>
+		<value xml:lang="ru"><![CDATA[Пароль базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña de BD]]></value>
+		<value xml:lang="tr"><![CDATA[Veritabanı Şifresi]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu]]></value>
+	</item>
+	<item name="db_database">
+		<value xml:lang="ko"><![CDATA[DB 데이터베이스]]></value>
+		<value xml:lang="en"><![CDATA[DB Database]]></value>
+		<value xml:lang="jp"><![CDATA[データベース名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据库名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料庫名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Base de Données]]></value>
+		<value xml:lang="ru"><![CDATA[Имя базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Base de datos BD]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Database]]></value>
+	</item>
+	<item name="db_database_file">
+		<value xml:lang="ko"><![CDATA[DB 데이터베이스 파일]]></value>
+		<value xml:lang="en"><![CDATA[DB Database File]]></value>
+		<value xml:lang="jp"><![CDATA[データベースファイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[数据库文件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[資料庫檔案]]></value>
+		<value xml:lang="fr"><![CDATA[Fichier de Base de Données]]></value>
+		<value xml:lang="ru"><![CDATA[Файл базы данных]]></value>
+		<value xml:lang="es"><![CDATA[Archivo de base de datos BD]]></value>
+		<value xml:lang="vi"><![CDATA[File Database]]></value>
+	</item>
+	<item name="db_table_prefix">
+		<value xml:lang="ko"><![CDATA[테이블 머리말]]></value>
+		<value xml:lang="en"><![CDATA[Table Header]]></value>
+		<value xml:lang="jp"><![CDATA[テーブルプレフィックス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[前缀]]></value>
+		<value xml:lang="zh-TW"><![CDATA[前置字元]]></value>
+		<value xml:lang="fr"><![CDATA[En-tête de la table]]></value>
+		<value xml:lang="ru"><![CDATA[Префикс таблиц]]></value>
+		<value xml:lang="es"><![CDATA[Encabezado de la tabla]]></value>
+		<value xml:lang="tr"><![CDATA[Tablo Başlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Table]]></value>
+	</item>
+	<item name="db_info_desc">
+		<value xml:lang="ko"><![CDATA[<p><strong>DB 호스트 네임</strong>, <strong>DB Port</strong>, <strong>DB 아이디</strong>, <strong>DB 비밀번호</strong>, <strong>DB 이름</strong> 정보는 서버 호스팅 관리자로부터 정보를 확인 하세요.</p><p><strong>DB 테이블 머리말</strong> 정보는 사용자 정의 할 수 있습니다. 영문 소문자를 권장 합니다. 숫자를 포함할 수 있습니다. 특수 문자를 사용할 수 없습니다.</p>]]></value>
+		<value xml:lang="en"><![CDATA[<p>Please check <strong>database information</strong> to server master.</p><p>You can modify database <strong>table preface</strong>, and can use small letters(small letter is recommended), and numbers, but you can not use special letters.</p>]]></value>
+	　　<value xml:lang="jp"><![CDATA[<p><strong>DBホスト名</strong>, <strong>DB Port</strong>, <strong>DB ID</strong>, <strong>DB パスワード</strong>, <strong>DB 名稱</strong> 情報は、サーバーホスティング管理者に情報を確認してください。</p><p><strong>DBテーブルプレフィックス</strong> 情報は、ユーザーが定義できます。英文小文字の使用を推奨します。数字を含めることができます。特殊文字は、使用できません。</p>]]></value>
+	</item>
+	<item name="admin_title">
+		<value xml:lang="ko"><![CDATA[관리자 정보]]></value>
+		<value xml:lang="en"><![CDATA[Administrator Info]]></value>
+		<value xml:lang="jp"><![CDATA[管理者情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員資料]]></value>
+		<value xml:lang="fr"><![CDATA[Informations d'Administrateur]]></value>
+		<value xml:lang="ru"><![CDATA[Административная информация]]></value>
+		<value xml:lang="es"><![CDATA[Información del Administrator]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetici Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin Administrator]]></value>
+	</item>
+	<item name="env_title">
+		<value xml:lang="ko"><![CDATA[환경 설정]]></value>
+		<value xml:lang="en"><![CDATA[Settings]]></value>
+		<value xml:lang="jp"><![CDATA[環境設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[环境设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[環境設置]]></value>
+		<value xml:lang="ru"><![CDATA[Конфигурация]]></value>
+		<value xml:lang="es"><![CDATA[Configuración]]></value>
+		<value xml:lang="tr"><![CDATA[Yapılandırma]]></value>
+		<value xml:lang="vi"><![CDATA[Cấu hình]]></value>
+	</item>
+	<item name="use_optimizer">
+		<value xml:lang="ko"><![CDATA[Optimizer 사용]]></value>
+		<value xml:lang="en"><![CDATA[Enable Optimizer]]></value>
+		<value xml:lang="jp"><![CDATA[オプティマイザー使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用Optimizer]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Optimizer]]></value>
+		<value xml:lang="fr"><![CDATA[Valider Optimiseur]]></value>
+		<value xml:lang="ru"><![CDATA[Включить оптимизатор]]></value>
+		<value xml:lang="es"><![CDATA[Habilitar el optimizador]]></value>
+		<value xml:lang="tr"><![CDATA[Optimizasyonu Etkinleştir]]></value>
+		<value xml:lang="vi"><![CDATA[Tối ưu hóa]]></value>
+	</item>
+	<item name="about_optimizer">
+		<value xml:lang="ko"><![CDATA[Optimizer를 사용하면 다수의 CSS/JS파일을 통합/압축 전송하여 매우 빠르게 사이트 접속이 가능하게 합니다.<br />다만 CSS나 JS에 따라서 문제가 생길 수 있습니다. 이때는 Optimizer 비활성화 하시면 정상적인 동작은 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[If optimizer is enabled, users can quickly access to this site, since multiple CSS / JS files are put together and compressed before transmission. <br /> Nevertheless, this optimization might be problematic according to CSS or JS. If you disable it, it would work properly though it would work slower.]]></value>
+		<value xml:lang="jp"><![CDATA[オプティマイザーを使用すると多数の「CSS/JS」ファイルを、統合・圧縮して転送するのでレスポンスが早くなります。<br />但し、CSSまたはJSファイルによっては問題が生じる場合があります。この場合は、チェックを外すと正常に動作します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用Optimizer可以对大部分的CSS/ JS文件进行整合/压缩传送使之加快网站访问速度。<br />只是有时会发生小小的问题。这时候请暂时不要使用Optimizer。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用 Optimizer 可對大部分的『CSS/JS』檔案進行整合/壓縮加快網站訪問速度。<br />只是有時會發生小小的問題，這時候請暫時不要使用 Optimizer 功能。]]></value>
+		<value xml:lang="fr"><![CDATA[Si l'optimiseur est validé, utilisateur peut accéder rapidement ce site parce que plusieurs fichiers de CSS / JS sont reliés ensemble et comprimés avant transmission. <br /> Néanmoins, cette optimisation peut arriver problématique selong CSS ou JS. Si vous l'invalidez, ça marchera correctement pourtant il marchera plus lentement.]]></value>
+		<value xml:lang="ru"><![CDATA[Если оптимизатор включен, пользователи могут быстро использовать этот сайт, поскольку несколько CSS / JS файлов собраны вместе и сжаты до передачи. <br /> Тем не менее, эта оптимизация может быть проблематичной согласно CSS или JS. Если Вы выключите ее, движок будет работать правильно, хотя и медленее.]]></value>
+		<value xml:lang="es"><![CDATA[Si optimizador está habilitado, los usuarios pueden acceder rápidamente a este sitio, ya que hay múltiples CSS / JS archivos son comprimidos juntos y antes de la transmisión. <br /> No obstante, esta optimización podría ser problemáticas de acuerdo con CSS o JS. Si inhabilitarlo, que funciona correctamente a pesar de que sería más lento el trabajo.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer Optimizasyon etkinleştirildiyse, çoklu CSS / JS dosyaları gönderimden önce sıkıştırılıp bir araya konulduğundan, kullanıcılar siteye hızlı bir şekilde ulaşacaktır. <br /> Ancak;  bu optimizasyon, CSS ve JS'ye göre sorunlu olabilir. Eğer bunu devre dışı bırakırsanız, düzgün bir şekilde çalışmasına karşın daha yavaş çalışacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu tối ưu hóa được kích hoạt, người sử dụng sẽ truy cập nhanh hơn vì những File CSS / JS sẽ được nén lại trước khi được tải xuống. <br /> Tuy vậy, sự tối ưu này cũng làm ảnh hưởng một chút tới File CSS và JS. Nếu bạn tắt, Website của bạn tải chậm hơn.]]></value>
+	</item>
+	<item name="use_rewrite">
+		<value xml:lang="ko"><![CDATA[짧은 주소 사용]]></value>
+		<value xml:lang="en"><![CDATA[Rewrite Mod]]></value>
+		<value xml:lang="jp"><![CDATA[リライト・モジュールを使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用rewrite模块]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Rewrite]]></value>
+		<value xml:lang="fr"><![CDATA[Utiliser mode de récrire(rewrite mod)]]></value>
+		<value xml:lang="ru"><![CDATA[Использовать<br /> модуль перезаписи<br />(rewrite mod)]]></value>
+		<value xml:lang="es"><![CDATA[Usar rewrite mod]]></value>
+		<value xml:lang="tr"><![CDATA[YenidenYazma Modu (mod_rewrite)]]></value>
+		<value xml:lang="vi"><![CDATA[Mod Rewrite]]></value>
+	</item>
+	<item name="use_sso">
+		<value xml:lang="ko"><![CDATA[SSO 사용]]></value>
+		<value xml:lang="en"><![CDATA[Single Sign On]]></value>
+		<value xml:lang="jp"><![CDATA[SSO使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[SSO]]></value>
+		<value xml:lang="zh-TW"><![CDATA[單一登入]]></value>
+		<value xml:lang="fr"><![CDATA[SSO]]></value>
+		<value xml:lang="ru"><![CDATA[SSO]]></value>
+		<value xml:lang="es"><![CDATA[SSO]]></value>
+		<value xml:lang="tr"><![CDATA[Tekli Oturum Açma]]></value>
+		<value xml:lang="vi"><![CDATA[SSO]]></value>
+	</item>
+	<item name="about_rewrite">
+		<value xml:lang="ko"><![CDATA[이 기능을 사용하면 <em>http://yourdomain/<strong>?document_srl=123</strong></em> 과 같이 복잡한 주소를 <em>http://yourdomain/<strong>123</strong></em> 과 같이 간단하게 줄일 수 있습니다. 이 기능을 사용하려면 웹 서버에서 rewrite_mod를 지원해야 합니다. 웹 서버에서 rewrite_mod를 지원하는지 여부는 서버 관리자에게 문의하세요.]]></value>
+		<value xml:lang="en"><![CDATA[If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123]]></value>
+		<value xml:lang="jp"><![CDATA[Webサーバで「リライト・モジュール（mod_rewrite）」をサポートしている場合は、「http://アドレス/?document_srl=123」のようなアドレスを、動的だけど「http://アドレス/123」のように静的なページに見せることができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[如果支援 rewrite 功能，可縮短冗長的網址。<br />例>『http://域名/?document_srl=123』縮短成『http://域名/123』。]]></value>
+		<value xml:lang="fr"><![CDATA[Si le serveur de web est capable d'utiliser le mode de récrire, URL longue comme http://murmure/?document_srl=123 peut être abrégé comme http://murmure/123]]></value>
+		<value xml:lang="ru"><![CDATA[Если сервер предлагает rewrite mod, длинные URL такие как  http://blah/?document_srl=123 могут быть сокращены до http://blah/123]]></value>
+		<value xml:lang="es"><![CDATA[Si el servidor de la web soporte rewrite mod, URL largas como http://bla/?documento_srl=123 puede abreviarse como  http://bla/123]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer websunucusu yenidenyazma(rewritemod) destekliyorsa, http://ornek/?dosya_no=123 gibi URLler http://ornek/123 olarak kısaltılabilir]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu Host của bạn hỗ trợ Mod Rewrite, khi địa chỉ có dạng <b>http://blah/?document_srl=123</b> sẽ được rút ngắn thành <b>http://blah/123</b>]]></value>
+	</item>
+	<item name="time_zone">
+		<value xml:lang="ko"><![CDATA[표준 시간대]]></value>
+		<value xml:lang="en"><![CDATA[Time Zone]]></value>
+		<value xml:lang="jp"><![CDATA[タイムゾーン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[时区]]></value>
+		<value xml:lang="zh-TW"><![CDATA[時區]]></value>
+		<value xml:lang="fr"><![CDATA[Fuseau horaire]]></value>
+		<value xml:lang="ru"><![CDATA[Часовой пояс]]></value>
+		<value xml:lang="es"><![CDATA[La Hora por Zona]]></value>
+		<value xml:lang="tr"><![CDATA[Zaman Dilimi]]></value>
+		<value xml:lang="vi"><![CDATA[Múi giờ]]></value>
+	</item>
+	<item name="about_time_zone">
+		<value xml:lang="ko"><![CDATA[서버의 설정시간과 사용하려는 장소의 시간이 차이가 날 경우 표준 시간대를 지정하면 표시되는 시간을 지정된 곳의 시간으로 사용하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[If the server time and the time on your location don't accord each other, you can set the time to be same as your location by using the time zone]]></value>
+		<value xml:lang="jp"><![CDATA[サーバの設定時間とサービスしているローカル時間との差がある場合、タイムゾーンを指定して表示時間を合わせることができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[服务器时间和您所处的时间有差异时，可以设置时区来满足你所需要的时间显示。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主機時間和您所處的時間有差異時，可以設置時區來滿足你所需要的時間顯示。]]></value>
+		<value xml:lang="fr"><![CDATA[Si l'heure de serveur et celle de votre emplacement ne s'accordent pas,  vous pouvez remettre l'heure comme le même heure de votre lieu en configurant le fuseau horaire ]]></value>
+		<value xml:lang="ru"><![CDATA[Если серверное время и Ваше локальное время не совпадают, Вы можете установить такое же время, как Ваше локальное, используя часовой пояс]]></value>
+		<value xml:lang="es"><![CDATA[Si la hora del servidor y la hora de su ubicación es diferente, Usted puede elegir la hora por zona para corregir]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer sunucu zaman dilimi ve bulunduğunuz yerin zaman dilimi uyumlu değilse; zaman dilimi özelliğini kullanarak zamanı bulunduğunuz yere göre ayarlayabilirsiniz ]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu thời gian của khu vực bạn không tự động cập nhật. Bạn có thể chọn thời gian để hiển thị cho Website.]]></value>
+	</item>
+	<item name="qmail_compatibility">
+		<value xml:lang="ko"><![CDATA[Qmail 호환]]></value>
+		<value xml:lang="en"><![CDATA[Enable Qmail]]></value>
+		<value xml:lang="jp"><![CDATA[Qmail 互換]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Qmail互换]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Qmail互換]]></value>
+		<value xml:lang="fr"><![CDATA[Compatible avec Qmail]]></value>
+		<value xml:lang="es"><![CDATA[Compatible con Qmail]]></value>
+		<value xml:lang="tr"><![CDATA[Qmail'i Etkinleştir]]></value>
+		<value xml:lang="vi"><![CDATA[Mở Qmail]]></value>
+	</item>
+	<item name="about_qmail_compatibility">
+		<value xml:lang="ko"><![CDATA[Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[It will enable sending mails from MTA which cannot distinguish CRLF like Qmail.]]></value>
+		<value xml:lang="jp"><![CDATA[Qmail等、CRLFを改行コードとして認識できないMTA（Message Transfer Agent）で、メールの送信ができるようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[支持不能识别CRLF为换行符的Qmail等MTA，也能发送电子邮件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[支援無法識別 CRLF 為換行符的 Qmail 等 MTA，也能發送電子郵件。]]></value>
+		<value xml:lang="fr"><![CDATA[Le mél sera envoyé en MTA qui ne peut pas reconnaître le CRLF comme délimiteur des lignes comme le Qmail.]]></value>
+		<value xml:lang="es"><![CDATA[Qmail como MTA no reconoce CRLF como la línea de separación que se enviará por correo.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu size QMail gibi CRLF'den ayırt edilemeyen MTA'dan mail gönderme imkanı sağlayacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Nó sẽ cho phép gửi thư từ MTA mà không phân biệt CRLF.]]></value>
+	</item>
+	<item name="about_database_file">
+		<value xml:lang="ko"><![CDATA[Sqlite는 파일에 데이터를 저장합니다. 데이터베이스 파일의 위치를 웹에서 접근할 수 없는 곳으로 하셔야 합니다.<br/><span style="color:red">데이터 파일은 707퍼미션 설정된 곳으로 지정해주세요.</span>]]></value>
+		<value xml:lang="en"><![CDATA[Sqlite saves data in a file. Location of the database file should be unreachable by web<br/><span style="color:red">Data file should be inside the permission of 707.</span>]]></value>
+		<value xml:lang="jp"><![CDATA[Sqliteはファイルにデータを保存します。そのため、データベースファイルにはウェブからアクセスできない場所にしなければなりません。<br/><span style="color:red">データファイルのパーミッションは「707」に設定してください。</span>]]></value>
+		<value xml:lang="zh-CN"><![CDATA[Sqlite是文件里保存数据。数据库的文件位置应该放在web不能访问的地方。<br/><span style="color:red">数据文件应放在具有707属性的位置。</span>]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Sqlite是保存資料於檔案中。資料庫的檔案位置應該放在 web 不能訪問的地方。<br/><span style="color:red">資料檔案應放在具有 707 權限的位置。</span>]]></value>
+		<value xml:lang="fr"><![CDATA[Sqlite conserve des données dans le fichier. Vous devez placer le fichier de la base de données où l'on ne peut pas accéder par web.<br/><span style="color:red">Le fichier des Donées doit être en dedans la permission 707.</span>]]></value>
+		<value xml:lang="ru"><![CDATA[Sqlite сохраняет данные в файл. Размещение базы данных должно быть недоступно с веб<br/><span style="color:red">Файл базы данных должен иметь права доступа 707.</span>]]></value>
+		<value xml:lang="es"><![CDATA[Sqlite guarda el dato en el archivo. Es necesario crear archivo de BD en un lugar inaccesible de la web.<br/><span style="color:red">El archivo de dato debe estar ubicado en un lugar con la atribución 707.</span>]]></value>
+		<value xml:lang="tr"><![CDATA[Sqlite veriyi dosyaya kaydeder. Veritabanı dosyası tarayıcıyla erişilebilir olmamalıdır.<br/><span style="color:red">Veri dosyası 707 yetki kapsamı içinde olmalıdır.</span>]]></value>
+		<value xml:lang="vi"><![CDATA[Sqlite lưu trữ dữ liệu trong một File, vì vậy cần tới sự truy cập đến nó trong Database. <br/><span style="color:red">Hãy CHMOD thành 707.</span>]]></value>
+	</item>
+	<item name="about_sso">
+		<value xml:lang="ko"><![CDATA[사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 됩니다.<br />가상 사이트를 사용할 때만 필요합니다.]]></value>
+		<value xml:lang="en"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザが一度のログインで基本サイトと仮想サイトに同時にログインされる機能です。<br />仮想サイトの機能を使用してない場合、設定する必要がありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[此功能可讓用戶只需登入一次即可訪問多個網站。<br />使用虛擬網站，這將會是很重要的功能。]]></value>
+		<value xml:lang="fr"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
+		<value xml:lang="ru"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
+		<value xml:lang="es"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
+		<value xml:lang="tr"><![CDATA[SSO kullanıcıları, geçreli ya da sanal siteye bir kere kayıt olmakla, ikisinden de yararlandıracaktır.<br />Bu, size sadece sanal websiteler kullandığınız durumda lazım olacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[SSO will enable users to sign in just once for both default and virtual site.<br />You will need this only if you are using virtual sites.]]></value>
+	</item>
+	<item name="success_installed">
+		<value xml:lang="ko"><![CDATA[설치가 되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Installation has been completed.]]></value>
+		<value xml:lang="jp"><![CDATA[正常にインストールされました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已完成安装。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已完成安裝。]]></value>
+		<value xml:lang="fr"><![CDATA[Installation s'est complété]]></value>
+		<value xml:lang="ru"><![CDATA[Установка завершена]]></value>
+		<value xml:lang="es"><![CDATA[Instalación finalizada]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum tamamlandı]]></value>
+		<value xml:lang="vi"><![CDATA[Chúc mừng bạn đã cài đặt XE thành công!]]></value>
+	</item>
+	<item name="msg_cannot_proc">
+		<value xml:lang="ko"><![CDATA[설치 환경이 갖춰지지 않아 요청을 실행할 수가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Installation environment is not proper to proceed.]]></value>
+		<value xml:lang="jp"><![CDATA[インストールできる環境が整っていないため、リクエストを実行できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不具备安装所需环境，不能继续进行。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不具備安裝所需環境，無法繼續安裝。]]></value>
+		<value xml:lang="fr"><![CDATA[Environnement d'Installation n'est pas équipé à procéder.]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно исполнить запрос, поскольку окружение установки не указано]]></value>
+		<value xml:lang="es"><![CDATA[No puede ser ejecutado lo requerido por no disponer del ambiente de instalación.]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum ortamı devam etmek için uygun değil.]]></value>
+		<value xml:lang="vi"><![CDATA[Môi trường cài đặt không thích hợp.]]></value>
+	</item>
+	<item name="msg_already_installed">
+		<value xml:lang="ko"><![CDATA[이미 설치가 되어 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[XE is already installed.]]></value>
+		<value xml:lang="jp"><![CDATA[既にインストールされています。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已安装]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已安裝]]></value>
+		<value xml:lang="fr"><![CDATA[XE est déjà installé]]></value>
+		<value xml:lang="ru"><![CDATA[XE уже установлена]]></value>
+		<value xml:lang="es"><![CDATA[Instalación de XE ya existe.]]></value>
+		<value xml:lang="tr"><![CDATA[XE zaten kurulmuştur]]></value>
+		<value xml:lang="vi"><![CDATA[Một phiên bản nào đó của XE đã được cài đặt từ trước.<br />Xin hãy kiểm tra lại!]]></value>
+	</item>
+	<item name="msg_dbconnect_failed">
+		<value xml:lang="ko"><![CDATA[DB접속 오류가 발생하였습니다.
+DB정보를 다시 확인해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[An error has occurred while connecting to DB.
+Please check DB information again.]]></value>
+		<value xml:lang="jp"><![CDATA[データベースアクセスにエラーが発生しました。
+データベースの情報をもう一度確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[连接DB时发生错误。
+请重新确认DB信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連接資料庫時發生錯誤。
+請重新確認資料庫資訊。]]></value>
+		<value xml:lang="fr"><![CDATA[Erreur a lieu en essayant connecter à la Base de Données.
+Vérifiez encore une fois les informations sur la Base de Données, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Произошла ошибка подключения к базе данных.
+Пожалуйста, проверьте иформацию базы данных еще раз]]></value>
+		<value xml:lang="es"><![CDATA[Ha ocurrido un error en la conección de BD.
+ Por favor chequee la información de BD nuevamente]]></value>
+		<value xml:lang="tr"><![CDATA[VT'ye ulaşırken bir hata oluştu.
+Lütfen VT bilgisini tekrar kontrol ediniz]]></value>
+		<value xml:lang="vi"><![CDATA[Đã có lỗi xảy ra khi kết nối tới Database.
+Xin vui lòng kiểm tra lại thông tin!]]></value>
+	</item>
+	<item name="msg_table_is_exists">
+		<value xml:lang="ko"><![CDATA[이미 DB에 테이블이 생성되어 있습니다.
+config 파일을 재생성하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Table is already created in the DB.
+Config file is recreated.]]></value>
+		<value xml:lang="jp"><![CDATA[既にデータベースにデーブルが作成されています。
+configファイルを再作成しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已生成数据表。
+重新生成了config文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已建立資料表。
+重新建立 config 檔案。]]></value>
+		<value xml:lang="fr"><![CDATA[La Table est déjà créée dans la Base de Données.
+Le fichier de Configuration est recréé.]]></value>
+		<value xml:lang="ru"><![CDATA[Таблица существует в базе данных.
+Файл конфигурации создан заново]]></value>
+		<value xml:lang="es"><![CDATA[La tabla ya ha sido creado en BD.
+ Creado nuevamente el archivo de configuración.]]></value>
+		<value xml:lang="tr"><![CDATA[Tablo zaten VT'da oluşturuldu.
+Yapılandırma dosyası yeniden oluşturuldu]]></value>
+		<value xml:lang="vi"><![CDATA[Table đã có sẵn trên Database.
+File Config đã đuwọc thiết lập lại.]]></value>
+	</item>
+	<item name="msg_install_completed">
+		<value xml:lang="ko"><![CDATA[설치가 완료되었습니다.
+감사합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Installation has been completed.
+Thank you for choosing XE]]></value>
+		<value xml:lang="jp"><![CDATA[インストールが完了しました。
+ありがとうございました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装完成。
+非常感谢。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝完成。
+非常感謝。]]></value>
+		<value xml:lang="fr"><![CDATA[Installation a complété.
+Merci pour choisir XE]]></value>
+		<value xml:lang="ru"><![CDATA[Установка завершена.
+Спасибо Вам за выбор XE]]></value>
+		<value xml:lang="es"><![CDATA[Instalación finalizada.
+ Muchas gracias.]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum tamamlandı.
+XE'yi seçtiğiniz için teşekkür ederiz]]></value>
+		<value xml:lang="vi"><![CDATA[Đã cài đặt XE thành công!.
+Xin cảm ơn đã sử dụng XE!]]></value>
+	</item>
+	<item name="msg_install_failed">
+		<value xml:lang="ko"><![CDATA[설치 파일 생성 시에 오류가 발생하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[An error has occurred while creating installation file.]]></value>
+		<value xml:lang="jp"><![CDATA[インストールファイルを作成する際にエラーが発生しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[生成安装文件时发生错误。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[建立安裝檔案時，發生錯誤。]]></value>
+		<value xml:lang="fr"><![CDATA[Une erreur a lieu en créant le fichier d'installation.]]></value>
+		<value xml:lang="ru"><![CDATA[Произошла ошибка при создании файла конфигурации.]]></value>
+		<value xml:lang="es"><![CDATA[Ha ocurrido un error al crear el archivo de instalación.]]></value>
+		<value xml:lang="tr"><![CDATA[Kurulum dosyası oluşturulurken bir hata oluştu.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã có lỗi xảy ra khi tạo File cài đặt.]]></value>
+	</item>
+	<item name="ftp_get_list">
+		<value xml:lang="ko"><![CDATA[목록 가져오기]]></value>
+		<value xml:lang="en"><![CDATA[Get List]]></value>
+		<value xml:lang="jp"><![CDATA[リストを取得する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[载入FTP列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[取得列表]]></value>
+		<value xml:lang="tr"><![CDATA[Liste Al]]></value>
+		<value xml:lang="vi"><![CDATA[Nhận danh sách]]></value>
+	</item>
+	<item name="read_all">
+		<value xml:lang="ko"><![CDATA[전문 읽기]]></value>
+		<value xml:lang="en"><![CDATA[Read Full Text]]></value>
+		<value xml:lang="jp"><![CDATA[フルテキスト読み込み]]></value>
+	</item>
+	<item name="license_agreement_desc">
+		<value xml:lang="ko"><![CDATA[XE를 사용하려면 <em>이 항목에 반드시 동의해야 합니다</em>.]]></value>
+		<value xml:lang="en"><![CDATA[To use XE, <em>you have to agree to this</em>.]]></value>
+		<value xml:lang="jp"><![CDATA[XEを使用するには、<em>この項目に必ず同意しなければなりません。</em>]]></value>
+	</item>
+	<item name="license_agreement_alert">
+		<value xml:lang="ko"><![CDATA[XE를 사용하려면 'GNU 약소 일반 공중 사용 허가서(LGPL v2)'에 반드시 동의해야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[To use XE, <em>you have to agree to the GNU Lesser General Public License(LGPL v2)</em>.]]></value>
+		<value xml:lang="jp"><![CDATA[XEを使用するには、LGPL v2に必ず同意しなければなりません。]]></value>
+	</item>
+	<item name="install_env_agreement">
+		<value xml:lang="ko"><![CDATA[설치 환경 수집 동의]]></value>
+		<value xml:lang="en"><![CDATA[Agreement on gathering installation environment information]]></value>
+		<value xml:lang="jp"><![CDATA[インストール環境収集に同意する]]></value>
+	</item>
+	<item name="install_env_agreement_desc">
+		<value xml:lang="ko"><![CDATA['<em>웹 서버, DBMS, PHP 버전 및 Extension, XE 모듈 및 애드온</em>' 정보가 XE 통계 수집 서버로 전송됩니다. 더 나은 SW를 제작하기 위한 목적으로 활용합니다. 익명으로 수집되며 이 정보를 외부에 공개하지 않습니다. <em>이 항목에 동의하지 않아도 됩니다.</em>]]></value>
+		<value xml:lang="en"><![CDATA[Information on '<em>web server, DBMS, PHP version and extension, XE modules and addons</em>' is sent to the XE statistics collection server. This information is collected anonymously and used to improve our software only.<em> You don't have to agree to this.</em>]]></value>
+	　　<value xml:lang="jp"><![CDATA['<em>ウェブサーバー、DBMS、PHPバージョンおよびExtension、XEモジュール、およびアドオン</em>'情報が、XE統計収集サーバーへ転送されます。より良いソフトウェアを製作するための目的で活用されます。情報は、匿名で収集され、外部へ公開することはありません。<em>この項目は、同意しなくても構いません。</em>]]></value>
+	</item>
+	<item name="lgpl_license_url">
+		<value xml:lang="ko"><![CDATA[http://korea.gnu.org/people/chsong/copyleft/lgpl.ko.html]]></value>
+		<value xml:lang="en"><![CDATA[http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html]]></value>
+		<value xml:lang="jp"><![CDATA[http://www.gnu.org/licenses/old-licenses/lgpl-2.1.ja.html]]></value>
+	</item>
+</lang>
diff --git a/modules/install/lang/ru.lang.php b/modules/install/lang/ru.lang.php
deleted file mode 100644
index 178caaee3..000000000
--- a/modules/install/lang/ru.lang.php
+++ /dev/null
@@ -1,557 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack for XE
-     **/
-
-    $lang->introduce_title = 'Установка XE';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = "Пожалуйста, проверьте требования к установке.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'Версия PHP',
-            'permission' => 'Права доступа',
-            'xml' => 'XML библиотека',
-            'iconv' => 'ICONV библиотека',
-            'gd' => 'GD библиотека',
-            'session' => 'Session.auto_start настройка',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Требуется] Если версия PHP равна 5.2.2, то XE не будет установлена из-за бага',
-            'permission' => '[Требуется] Путь установки XE или директория ./files должна иметь права доступа 707',
-            'xml' => '[Требуется] XML Библиотека нужна для XML коммуникации',
-            'session' => '[Требуется] Файл настроек PHP (php.ini) \'Session.auto_start\' должен быть равен нулю, чтобы XE могла использовать сессии',
-            'iconv' => 'Iconv должна быть установлена для конвертирования между UTF-8 и иными языковыми кодировками',
-            'gd' => 'GD Библиотека должна быть установлена для использования функции конвертироваия изображений',
-        );
-
-    $lang->install_checklist_xml = 'Установить XML библиотеку';
-    $lang->install_without_xml = 'XML библиотека не установлена';
-    $lang->install_checklist_gd = 'Установить GD библиотеку';
-    $lang->install_without_gd  = 'GD библиотека не установлена';
-    $lang->install_checklist_gd = 'Установить GD библиотеку';
-    $lang->install_without_iconv = 'Iconv библиотека не установлена';
-    $lang->install_session_auto_start = 'Возможно возникнут проблемы из-за настройки PHP session.auto_start, установленной в 1';
-    $lang->install_permission_denied = 'Права доступа пути не установлены в 707';
-
-    $lang->cmd_agree_license = 'Я согласен с данной лицензией';
-    $lang->cmd_install_fix_checklist = 'Я удоволетворил требуемые условия';
-    $lang->cmd_install_next = 'Продолжить установку';
-    $lang->cmd_ignore = 'Ignore';
-
-    $lang->db_desc = array(
-        'mysql' => 'Используем mysql*() функцию, чтобы использовать базу данных mysql.<br />Транзакция отключена из-за того, что файл базы данных создан посредством myisam.',
-        'mysqli' => 'Используем mysqli*() функцию, чтобы использовать базу данных mysql.<br />Транзакция отключена из-за того, что файл базы данных создан посредством myisam.',
-        'mysql_innodb' => 'Используем innodb  чтобы использовать базу данных mysql.<br />Транзакция включена для innodb',
-        'sqlite2' => 'Поддерживает sqlite2, которая сохраняет данные в файл.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.<br />(Никогда не тестировалось на стабильность)',
-        'sqlite3_pdo' => 'Поддерживает sqlite3 посредством PHP\'s PDO.<br />Устанавливая, следует размещать файл базы данных в недоступном с веб месте.',
-        'cubrid' => 'Используем CUBRID DB. <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => 'Используем MSSQL DB.',
-        'postgresql' => 'Используем PostgreSql DB.',
-        'firebird' => 'Используем firebird DB.',
-    );
-
-    $lang->form_title = 'Пожалуйста, введите дазу данных &amp; Административная Информация';
-    $lang->db_title = 'Пожалуйста, введите информацию базы данных';
-    $lang->db_type = 'Тип базы данных';
-    $lang->select_db_type = 'Пожалуйста, выберите базу данных, которую Вы хотите использовать.';
-    $lang->db_hostname = 'Хост базы данных';
-    $lang->db_port = 'Порт базы данных';
-    $lang->db_userid = 'ID базы данных';
-    $lang->db_password = 'Пароль базы данных';
-    $lang->db_database = 'Имя базы данных';
-    $lang->db_database_file = 'Файл базы данных';
-    $lang->db_table_prefix = 'Префикс таблиц';
-
-    $lang->admin_title = 'Административная информация';
-
-    $lang->env_title = 'Конфигурация';
-    $lang->use_optimizer = 'Включить оптимизатор';
-    $lang->about_optimizer = 'Если оптимизатор включен, пользователи могут быстро использовать этот сайт, поскольку несколько CSS / JS файлов собраны вместе и сжаты до передачи. <br /> Тем не менее, эта оптимизация может быть проблематичной согласно CSS или JS. Если Вы выключите ее, движок будет работать правильно, хотя и медленее.';
-    $lang->use_rewrite = 'Использовать<br /> модуль перезаписи<br />(rewrite mod)';
-    $lang->use_sso = 'SSO';
-    $lang->about_rewrite = "Если сервер предлагает rewrite mod, длинные URL такие как  http://blah/?document_srl=123 могут быть сокращены до http://blah/123";
-	$lang->about_sso = '사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 되는 기능입니다. 가상 사이트를 사용할 때만 필요합니다.';
-    $lang->time_zone = 'Часовой пояс';
-    $lang->about_time_zone = "Если серверное время и Ваше локальное время не совпадают, Вы можете установить такое же время, как Ваше локальное, используя часовой пояс";
-    $lang->qmail_compatibility = 'Qmail 호환';
-    $lang->about_qmail_compatibility = 'Qmail등 CRLF를 줄 구분자로 인식하지 못하는 MTA에서 메일이 발송되도록 합니다.';
-
-    $lang->about_database_file = 'Sqlite сохраняет данные в файл. Размещение базы данных должно быть недоступно с веб<br/><span style="color:red">Файл базы данных должен иметь права доступа 707.</span>';
-
-    $lang->success_installed = 'Установка завершена';
-
-    $lang->msg_cannot_proc = 'Невозможно исполнить запрос, поскольку окружение установки не указано';
-    $lang->msg_already_installed = 'XE уже установлена';
-    $lang->msg_dbconnect_failed = "Произошла ошибка подключения к базе данных.\nПожалуйста, проверьте иформацию базы данных еще раз";
-    $lang->msg_table_is_exists = "Таблица существует в базе данных.\nФайл конфигурации создан заново";
-    $lang->msg_install_completed = "Установка завершена.\nСпасибо Вам за выбор XE";
-    $lang->msg_install_failed = "Произошла ошибка при создании файла конфигурации.";
-
-    $lang->ftp_get_list = 'Get List';
-?>
diff --git a/modules/install/lang/tr.lang.php b/modules/install/lang/tr.lang.php
deleted file mode 100644
index e33806e97..000000000
--- a/modules/install/lang/tr.lang.php
+++ /dev/null
@@ -1,542 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (Only basic contents are listed)
-     **/
-
-    $lang->introduce_title = 'XE Installation';
-    $lang->license = <<<EndOfLicense
- <b>GNU KISITLI GENEL KAMU LİSANSI</b>
-		       Sürüm 2.1, Şubat 1999
-
- Telif Hakkı © 1991, 1999 Free Software Foundation.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Bu lisans dökümanının birebir kopyalarını yapma ve dağıtma 
- izni herkese verilmiştir, fakat metinde değişiklik yapma izni yoktur.
-
-[Bu döküman Kısıtlı GPL'in ilk yayınlanmış sürümüdür. Aynı zamanda 
- GNU Kitaplık Kamu Lisansı, 2. sürüm'ün devamı sayılmaktadır, bu 
- sebeple sürüm numarası 2.1 olarak verilmiştir.]
-
-			    GİRİŞ 
-
-  Yazılım lisanslarının çoğu sizin yazılımı paylaşma ve değiştirme 
-hakkınızın elinizden alınması için hazırlanmıştır. Buna karşılık, 
-GNU Genel Kamu Lisansları sizin serbest yazılımları değiştirme ve 
-paylaşma hakkınızın mahfuz tutulması ve yazılımın bütün kullanıcıları 
-için serbest olması amacı ile yazılmıştır.
-
-  Bu Kısıtlı Genel Kamu Lisansı, bazı özel amaçlı yazılım paketleri 
--genelde kitaplıklar- için hazırlanmış olup, Free Software Foundation'un 
-bazı yazılımları ve bu lisansı kullanmayı tercih eden diğer yazılımcıların
-yazılımları için kullanılmaktadır. Siz de bu lisansı kullanabilirsiniz, 
-fakat kullanmadan önce sizin özel durumunuz için bu lisansı mı, yoksa 
-GNU Genel Kamu Lisansı (GPL) kullanmanın mı daha uygun bir strateji 
-olacağını, aşağıdaki açıklamaları okuyarak düşünmeniz ve öyle karar 
-vermenizi öneriyoruz. 
-
-  Serbest yazılımdan bahsettiğimiz zaman fiyattan değil, özgürlükten 
-bahsediyoruz. Bizim Genel Kamu Lisanslarımız, sizin serbest yazılımların
-kopyalarını dağıtma özgürlüğünüzü (ve isterseniz bu hizmet için para almanızı)
-, yazılım kaynak kodlarının size dağıtım esnasında veya eğer isterseniz 
-verilmesini, yazılımı değiştirebilmenizi, yazılımın parçalarını yeni 
-yazılımlar içerisinde kullanabilmenizi ve bunları yapabileceğinizi 
-bilmenizi sağlamaktadır.
-
-  Haklarınızı koruyabilmemiz için dağıtıcıların sizin haklarınızı kısıtlama
-veya sizin bu haklarınızdan feragat etmenizi isteme yollarını yasaklayıcı
-bazı kısıtlamalar getirmemiz gerekmektedir. Bu kısıtlamalar eğer kitaplığın
-kopyalarını dağıtıyor veya değiştiriyorsanız size bazı yükümlülükler 
-getirmektedir. 
-
-  Örneğin kitaplığın kopyalarını, bedava veya ücret karşılığı dağıtıyorsanız 
-alıcılara sizin sahip olduğunuz bütün hakları sağlamalısınız. Onların da 
-kaynak kodlarına sahip olmalarını veya ulaşabilmelerini sağlamalısınız. 
-Eğer kitaplık ile başka kodlar bağlanıyorsa, alıcılara bütün nesne dosyalarını 
-vermelisiniz ki, alıcılar kitaplığın kaynak kodlarında değişiklik yapıp 
-kitaplığı yeniden derledikten sonra nesne dosyalarını tekrar kitaplık ile 
-bağlayabilsinler. Ve, onlara da haklarını bilebilmeleri için bu şartları 
-göstermelisiniz.
-
-  Haklarınızı iki koruma iki aşamada gerçekleşmektedir:
-   1. Kitaplığa telif hakkı alınmaktadır.
-   2. Yazılım lisansı olarak size, hukuki olarak, kitaplığı kopyalama, 
-   dağıtma ve/veya değiştirme hakkı tanıyan bu lisans sunulmaktadır. 
-
-  Her dağıtıcıyı korumak için bu serbest kitaplığın herhangi bir garantisi 
-olmadığını vurgulamak istiyoruz. Eğer kitaplık başkası tarafından değiştirilmiş
-ve değiştirilmiş hali ile tarafınıza ulaştırılmış ise alıcıların, ellerinde 
-olan kitaplığın orjinal olmadığını, dolayısıyla başkaları tarafından eklenen 
-problemlerin ilk yazarların şöhretlerine olumsuz etkide bulunmaması gerektiğini
- bilmelerini istiyoruz. 
-
-  Son olarak, bütün serbest yazılımlar yazılım patentleri tarafından sürekli tehdit
-altında bulunmaktadır. Herhangi bir şirketin serbest bir yazılımın kullanıcılarını, 
-bir patent sahibinden kısıtlayıcı bir lisans alarak kısıtlama/engellemesinin mümkün 
-olmamasından emin olmak istiyoruz. Dolayısıyla kitaplığın herhangi bir sürümü için 
-alınabilecek bir patent lisansının bu lisans içerisinde tanımlanan tam serbesti ile 
-uyumlu olması gerektiğini açık olarak ortaya koyuyoruz.
-
-  Kitaplıklar da dahil olmak üzere çoğu GNU yazılımı normal GNU Genel Kamu Lisansı (GPL)
-altında yayınlanmaktadır. GNU Kısıtlı Genel Kamu Lisansı (LGPL) olarak adlandırılan 
-bu lisans ise, yalnızca bazı özel kitaplıklar için uygulanmakta ve GNU Genel Kamu 
-Lisansı'ndan (GPL) bir hayli değişik koşullar içermektedir. Bizler bu lisansı (LGPL),
-bazı kitaplıkların serbest olmayan yazılımlara bağlanabilmesine imkan tanımak amacı 
-ile kullanıyoruz. 
-
-  Bir yazılım bir kitaplık ile, gerek statik, gerek paylaşımlı kitaplık yolu ile 
-bağlandığı zaman, ikisinin birleşimi, hukuki açıdan birleşik ve orjinal kitaplıktan
-iştikak eden bir eser oluşturur. Dolayısıyla normal Genel Kamu Lisansı, böyle bir 
-bağlanma işlemine ancak eğer oluşan bütün GPL'de tanımlanan serbesti kriterlerine 
-uyuyor ise izin verir. Kısıtlı Genel Kamu Lisansı (LGPL) ise, kitaplık ile başka 
-yazılımların bağlanması halinde daha gevşek kriterler uygular. 
-
-  Bu lisansa "Kısıtlı" Genel Kamu Lisansı dememizin sebebi, kullanıcının haklarını 
-korumak açısından Genel Kamu Lisansı'na göre daha kısıtlı olmasıdır. Bu lisans, 
-serbest yazılım geliştiricilerine, serbest olmayan kapalı yazılım geliştiricileri 
-ile rekabet etmeleri için daha kısıtlı imkanlar sunmaktadır. Bu dezavantajlar sebebi 
-ile, pek çok kitaplık için bu lisansı değil, Genel Kamu Lisansı'nı (GPL) 
-kullanmaktayız. Fakat Kısıtlı lisans bazı özel durumlarda bazı avantajlar 
-sağlamaktadır. 
-
-  Örneğin bazı özel ve seyrek rastlanan durumlarda, bir kitaplığın en 
-yaygın kullanımınısağlamak ve özendirmek ve bu şekilde de-fakto 
-standart haline gelmesini sağlamak istenebilir.Bunu sağlamak için, 
-serbest olmayan yazılımların da kitaplığı kullanabilmesine imkan 
-tanımak gerekir. Daha sık rastlanan bir durum ise, serbest bir 
-kitaplığın serbest olmayan ve yaygın kullanımda olan kitaplıklarla 
-aynı işlevi yapmasıdır. Böyle durumlarda serbest kitaplığı yalnız 
-serbest yazılımlarla kullanılır hale getirmenin bir anlamı yoktur,
-dolayısıyla Kısıtlı Genel Kamu Lisansı kullanılır. 
-
-  Başka durumlarda, belirli bir kitaplığı serbest olmayan yazılımlarda
-kullanma izninin verilmesi, daha çok sayıda kişinin çok sayıda serbest
-yazılımı kullanmasına imkan verebilir. Örneğin GNU C kitaplığının 
-serbest olmayan yazılımlarla birlikte kullanılabilmesi, pek çok kişinin
-bütün GNU işletim sistemini ve onun bir türevi olan GNU/Linux işletim 
-sistemini kullanmasına imkan tanımaktadır.
-
-  Kısıtlı Genel Kamu Lisansı, kullanıcının özgürlüğünü korumakta daha 
-kısıtlı ise de, Kitaplık ile bağlanan bir yazılımı kullanan kullanıcıya,
-o yazılımı Kitaplığın değiştirilmiş bir hali ile kullanabilme hakkı ve
-imkanı vermektedir. 
-
-  Kopyalama, dağıtım ve değiştirme ile ilgili kesin şart ve kayıtlar 
-aşağıda yer almaktadır. "kitaplığı baz alan eser" ile "kitaplığı 
-kullanan eser" arasındaki farka özellikle dikkat edin. Birincisi 
-kitaplığın kaynak kodlarından türeyen kod kullanmaktadır, ikincisi 
-ise çalışmak için kitaplık ile bağlanmalıdır.
-
-		  GNU KISITLI GENEL KAMU LİSANSI
-   KOPYALAMA, DAĞITIM VE DEĞİŞTİRME İLE İLGİLİ ŞART VE KAYITLAR
-
-  0. Bu Lisans, telif hakkı sahibi veya başka yetkili taraf tarafından
-içerisine bu Kısıtlı Genel Kamu Lisansı altında dağıtıldığına dair 
-ibare konmuş olan herhangi bir kitaplık veya başka yazılımı 
-kapsamaktadır. Her ruhsat sahibine "siz" olarak hitap edilmektedir.
-
-"Kitaplık", kolayca (kitaplığın içerdiği bazı işlev ve veriyi kullanan)
- uygulama yazılımları ile bağlanabilecek şekilde hazırlanmış yazılım 
- işlevleri ve/veya veri topluluğu anlamına gelmektedir.
-
-Aşağıda "Kitaplık", bu koşullar altında dağıtılmış herhangi bir
-yazılım kitaplığı veya eser manasında kullanılmaktadır. "Kitaplığı
-baz alan eser", Kitaplık veya telif hakkı kanunu altında Kitaplık'tan 
-iştikak etmiş, Kitaplığın tamamını veya bir parçasını, değiştirmeden 
-veya değişiklikler ile veya başka bir dile tercüme edilmiş hali içeren
-herhangi bir ürün manasında kullanılmaktadır. (Bundan sonra tercüme 
-"değiştirme" kapsamında sınırsız olarak içerilecektir.)
-
-Bir eserin "kaynak kodu", o esere değişiklik yapmak için en uygun 
-imkan ve yöntem manasında kullanılmaktadır. Bir kitaplık için bütün 
-kaynak kodu, kitaplığın içerdiği bütün modüllere ait bütün kaynak 
-kodları, ilgili arayüz tanım dosyaları ve kitaplığın derleme ve 
-kurulma işlemlerini kontrol etmekte kullanılan bütün betikler 
-manasında kullanılmaktadır.
-
-Kopyalama, dağıtım ve değiştirme haricinde kalan faaliyetler bu 
-Lisans'ın kapsamı dışındadırlar. Kitaplığı kullanan bir yazılımı 
-çalıştırma eylemi sınırlandırılmamıştır ve böyle bir yazılımın çıktısı 
-yalnızca çıktının içeriği (Kitaplığı yazmak için kullanılan bir araçta 
-Kitaplığın kullanılmasından bağımsız olarak) Kitaplığı baz alan ürün 
-kapsamına girer ise bu Lisans kapsamındadır. Bu koşulun sağlanıp 
-sağlanmadığı Kitaplığın ve Kitaplığı kullanan yazılımın ne yaptığı 
-ile ilgilidir.
-
-1.  Kitaplığın bütün kaynak kodlarını birebir, aldığınız şekilde, 
-herhangi bir ortamda ve vasıta ile, uygun ve görünür bir şekilde 
-telif hakkı bildirimi ve garantisiz olduğuna dair bildirim koymak, 
-bu Lisans'dan bahseden herhangi bir bildirimi aynen muhafaza etmek ve 
-bütün diğer alıcılara Kitaplık ile birlikte bu Lisans'ın bir kopyasını
-vermek şartı ile kopyalayabilir ve dağıtabilirsiniz.
-
-Kopyalamak fiili işlemi için bir ücret talep edebilir ve sizin seçiminize
-bağlı olarak ücret karşılığı garanti verebilirsiniz.
-
-2.  Kitaplığın kopyasını veya kopyalarını veya herhangi bir parçasını
-değiştirerek Kitaplığı baz alan ürün elde edebilir, bu değişiklikleri
-veya ürünün kendisini yukarıda 1. bölümdeki şartlar dahilinde ve aşağıda
-sıralanan şartların yerine getirilmesi koşulu ile kopyalayabilir ve 
-dağıtabilirsiniz.
-
-a) Değiştirilen eser de bir yazılım kitaplığı olmalıdır.
-
-b) Değiştirilen dosyaların görünür bir şekilde dosyaların sizin 
-tarafınızdan değiştirildiğine dair, tarihli bir bildirim içermesini 
-sağlamalısınız.
-
-c) Eserin bütününün bütün üçüncü şahıslara bu Lisans şartları altında
-ücretsiz olarak ruhsatlanmasını sağlamalısınız.
-
-d) Eğer değiştirilmiş Kitaplıktaki bir özellik, bu özellik çağrıldığı
-zaman verilecek bir argüman haricinde uygulama yazılımı tarafından 
-ağlanacak bir işlev ya da veri tablosuna başvuruda bulunuyor ise, 
-o zaman uygulama yazılımı böyle bir işlev ya da tablo sağlamasa dahi 
-özelliğin çalışır durumda kalacağı ve amacının anlamlı kalan parçası 
-her ne ise onu yerine getirmeye devam edeceğine dair iyi niyetli bir 
-uğraş vermelisiniz.
-
-(Örneğin bir kitaplıkta karekök hesaplayan bir özellik uygulamadan 
-tamamen bağımsız olarak tanımlanabilen bir işleve sahiptir. Dolayısıyla 
-2d bölümü bu özellik tarafından kullanılan ve uygulama yazılımı 
-tarafından sağlanan herhangi bir işlev ya da tablonun seçime bağlı 
-olmasını şart koşar: Eğer uygulama bu işlev ya da veriyi sağlamaz ise, 
-karekök özelliği karekök hesaplayabilir olmalıdır.)
-
-Bu şartlar değiştirilmiş eserin tamamını kapsamaktadır. Eğer eserin 
-tespit edilebilir kısımları Kitaplık'tan iştikak etmemiş ise ve makul 
-surette kendi başlarına bağımsız ve ayrı eserler olarak kabul edilebilir 
-ise, o zaman bu Lisans ve şartları, bu parçaları ayrı eser olarak 
-dağıttığınız zaman bağlayıcı değildir. Fakat, aynı parçaları Kitaplığı 
-baz alan bir ürün bütününün bir parçası olarak dağıttığınız zaman bütünün 
-dağıtımı, diğer ruhsat sahiplerine verilen izinlerin bütüne ait olduğu ve 
-parçalarına, yazarının kim olduğuna bakılmaksızın bütün parçalarına tek tek 
-e müşterek olarak uygulandığı bu Lisans şartlarına uygun olmalıdır.
-
-Bu bölümün hedefi tamamen sizin tarafınızdan yazılan bir eser üzerinde 
-hak iddia etmek veya sizin böyle bir eser üzerindeki haklarınıza muhalefet 
-etmek değil, Kitaplığı baz alan, Kitaplık'tan iştikak etmiş veya müşterek 
-olarak ortaya çıkarılmış eserlerin dağıtımını kontrol etme haklarını d
-üzenlemektir.
-
-Buna ek olarak, Kitaplığı baz almayan herhangi bir ürünün Kitaplık 
-ile (veya Kitaplığı baz alan bir ürün ile) bir bilgi saklama ortamında 
-veya bir dağıtım ortamında beraber tutulması diğer eseri bu Lisans 
-kapsamına sokmaz.
-
-3.  Kitaplığın herhangi bir kopyasına bu Lisans şartları yerine GNU 
-Genel Kamu Lisansı şartlarını uygulamayı tercih edebilirsiniz. Bunu 
-yapmak için bu Lisans'a yapılan her referansı GNU Genel Kamu Lisansı, 
-2. sürüm olarak değiştirmelisiniz. (Eğer GNU Genel Kamu Lisansı'nın 2. 
-sürümden daha üst numaralı bir sürümü çıkmışsa, o sürüm numarasını 
-belirtebilirsiniz. Bu bildirimlerde başka bir değişiklik yapmayınız.
-
-Bu değişiklik Kitaplığın herhangi bir kopyasına uygulandıktan sonra 
-o kopya için geri dönülemez, dolayısıyla o kopyadan yapılan bütün 
-kopyalar ve o kopyadan iştikak eden bütün eserler GNU Genel Kamu 
-Lisansı altında lisanslanır.
-
-Bu seçenek, Kitaplığın bazı kodlarını kitaplık olmayan bir yazılıma 
-kopyalamak istediğiniz zaman faydalıdır.
-
-4.  Kitaplığı ( veya 2. bölümde tanımlandığı hali ile onu baz 
-alan bir ürünü) ara derlenmiş veya uygulama hali ile 1. ve 2. Bölüm'deki
- şartlar dahilinde ve yaygın olarak yazılım dağıtımında kullanılan bir 
- ortam üzerinde, bilgisayar tarafından okunabilir ve 1. ve 2. Bölüm'deki 
- şartlar dahilinde dağıtılabilir kaynak kodlarının tamamı ile birlikte 
- kopyalayabilir ve dağıtabilirsiniz.
-
-Eğer ara derlenmiş nesne kodlarının dağıtımı belli bir yere erişim ve 
-oradan kopyalama imkanı olarak yapılıyorsa, aynı yerden, aynı koşullar 
-altında kaynak koduna erişim imkanı sağlamak, üçüncü şahısların ara 
-derlenmiş nesne kodları ile birlikte kaynak kodunu kopyalama zorunlulukları 
-olmasa bile kaynak kodunu dağıtmak olarak kabul edilmektedir.
-
-5.  Kitaplığın herhangi bir parçasından iştikak etmiş herhangi bir parça 
-bulundurmayan fakat Kitaplık ile ona bağlanarak ve derlenerek çalışmak için 
-tasarlanmış bir yazılım, "Kitaplığı kullanan eser" olarak tanımlanmaktadır. 
-Tek başına böyle bir eser Kitaplık'tan iştikak eden bir eser değildir ve bu 
-Lisans'ın kapsamı dahiline girmez.
-
-Fakat, "Kitaplığı kullanan bir eser" ile Kitaplığı bağlama işlemi, Kitaplıktan 
-iştikak eden bir uygulamayı vücuda getirir (çünkü Kitaplığın parçalarını 
-içermektedir). Dolayısıyla derleme/bağlama işlemi sonucunda elde edilen 
-uygulama bu Lisans kapsamındadır. 6. Bölüm bu kapsama giren uygulama 
-yazılımlarının dağıtım koşullarını içermektedir.
-
-"Kitaplığı kullanan bir eser", Kitaplığın parçası olan bir başlık (header) 
-dosyasından materyal kullandığı zaman, eserin kaynak kodları Kitaplıktan 
-iştikak eden bir eser olmamasına rağmen eserin nesne kodları Kitaplıktan 
-iştikak eden bir eser olabilir. Bunun doğru olup olmadığı özellikle eserin 
-kendisinin bir kitaplık olup olmadığına veya eserin Kitaplık olmaksızın 
-bağlanıp bağlanamadığına göre değişebilir. Bu koşulun ne zaman geçerli 
-olacağı kanun kapsamında açık ve seçik olarak tanımlanmamıştır.
-
-Eğer böyle bir nesne dosyası yalnızca nümerik parametreler, veri yapısı 
-şablonları ve erişim yolları ve küçük makro ve içerilmiş (inline) işlevler 
-(10 satır veya daha az uzunlukta) içeriyorsa, o zaman hukuki olarak iştikak 
-eden bir eser olup olmadığına bakılmaksızın nesne dosyasının kullanımı 
-sınırlandırılmamıştır. (Bu nesne dosyasını ve Kitaplığın parçalarını içeren 
-uygulama dosyaları 6. Bölümün kapsamına girmeye devam etmektedir).
-
-Eğer nesne dosyası, Kitaplıktan iştikak etmiş bir eser ise, eserin nesne 
-kodlarını 6. Bölümdeki koşullar uyarınca dağıtabilirsiniz. Eseri içeren 
-uygulama dosyaları da, Kitaplık ile direkt olarak bağlanıp bağlanmadıklarına 
-bakılmaksızın 6. Bölüm kapsamına girer.
-
-6.  Yukarıdaki Bölümlere bir istisna olarak, "Kitaplığı kullanan bir eser" 
-ile Kitaplığı bağlayarak Kitaplığı içeren bir eser oluşturabilir ve 
-uygulayacağınız koşullar eseri müşterinin kendi kullanımı için değiştirmesine 
-ve bu değişiklikleri test edebilmesine imkan tanımak için eserin geri 
-çözümlenebilmesine imkan tanıdığı sürece, bu eseri istediğiniz koşullar 
-altında dağıtabilirsiniz.
-
-Eserin her kopyası ile birlikte eserde Kitaplığın kullanıldığına ve kullanımıyla 
-ilgili şart ve koşulların bu Lisans ile düzenlendiğine dair görünür ve belirgin 
-bir bildirim vermelisiniz. Bu Lisans'ın bir kopyasını eserle birlikte vermelisiniz. 
-Eğer eser çalışma esnasında telif hakkı bildirimleri gösteriyor ise, Kitaplık için 
-telif hakkı bildirimini ve kullanıcıyı Lisans'ın kopyasına yönlendiren bir bildirimi 
-de bu esnada göstermelisiniz. Ayrıca aşağıdaki koşullardan birini yerine 
-getirmelisiniz:
-
-a) Eseri, Kitaplıkta eser için yapılan değişikliklerin tümünü (bu değişiklikler 
-1. ve 2. Bölüm kapsamında dağıtılmalıdır) içeren ve Kitaplığa ait ve bilgisayar 
-tarafından okunabilir kaynak kodlarının tamamı ile; ve eğer eser Kitaplık ile 
-bağlanmış bir uygulama ise, nesne kodları ve/veya kaynak kodları ile, kullanıcıların 
-Kitaplık'ta değişiklikler yaptıktan sonra yeniden bağlama işlemi ile değiştirilmiş 
-Kitaplığı kapsayan değiştirilmiş eser oluşturabilecekleri şekilde dağıtmalısınız. 
-(Kitaplıktaki tanım dosyalarını değiştiren bir kullanıcının uygulamayı değiştirilmiş 
-olan tanımları kullanabilecek şekilde yeniden derleyemeyebileceği anlaşılmakta 
-ve kabul edilmektedir.)
-
-b) Kitaplık ile bağlanmak için uygun bir paylaşımlı kitaplık mekanizması kullanılmalıdır. 
-Uygun bir mekanizma, (1) Kitaplık işlevlerini uygulamanın içerisine kopyalamak yerine 
-Kitaplığın kullanıcının bilgisayarında zaten mevcut olan bir kopyasını çalışma zamanında 
-kullanan, ve (2) eserin oluşturulmasında kullanılan Kitaplık sürümü ile arayüz bakımından 
-uyumlu olmak kaydıyla kullanıcı tarafından kurulan değiştirilmiş bir Kitaplıkla sorunsuz 
-çalışabilen bir mekanizma olarak tanımlanmıştır.
-
-c) Aynı kullanıcıya, fiziksel olarak dağıtımı gerçekleştirme masrafınızdan daha fazla 
-ücret almayarak, yukarıda 6a Bölümünde belirlenen materyalleri vereceğinize dair en az 
-üç yıl geçerli olacak yazılı bir taahhütname vermelisiniz.
-
-d)Eğer eserin dağıtımı belli bir yere erişim ve oradan kopyalama imkanı olarak yapılıyorsa,
-aynı yerden, aynı koşullar altında yukarıda belirtilen materyallere erişim imkanı 
-sağlamalısınız.
-
-e) Kullanıcının bu materyallerin bir kopyasını daha önce almış olduğunu veya bu kullanıcıya 
-daha önce bir kopya vermiş olduğunuzu tevsik etmelisiniz.
-
-Uygulamalar için, "Kitaplığı kullanan eser"in kabul edilen biçemi uygulamayı tekrar
-oluşturmak için gereken bütün veri ve yardımcı yazılımları kapsamalıdır. Özel bir 
-istisna olarak, eğer söz konusu bileşen uygulama ile birlikte dağıtılmıyor ise, 
-genelde uygulamanın çalıştırıldığı işletim sisteminin ana parçaları (derleyici, 
-çekirdek v.b.) ile birlikte dağıtılan (gerek kaynak kodu, gerek ikilik dosya biçeminde) 
-herhangi bir bileşen bu kapsamın dışında tutulmuştur.
-
-Bu koşul, işletim sistemi ile birlikte dağıtılmayan bazı serbest olmayan 
-kitaplıkların dağıtım koşulları ile çelişebilir. Böyle bir çelişki, dağıttığınız 
-bir uygulamada hem bu serbest olmayan kitaplıkları hem de Kitaplığı beraber 
-kullanamayacağınız manasına gelir.
-
-7.  Kitaplığı baz alan eser olan kitaplık özellikleri ile bu Lisans kapsamında 
-olmayan başka kitaplık özelliklerini yan yana tek bir kitaplık içerisine koyabilir 
-ve böyle elde edilen bileşik kitaplığı aşağıdaki iki koşulu yerine getirmek ve 
-Kitaplığı baz alan eserin ve diğer kitaplığa ait özelliklerin tek başına dağıtılmasına 
-izin verilmesi koşulu ile dağıtabilirsiniz.
-
-a) Bileşik kitaplığın yanısıra kitaplıkta içerilen Kitaplığı baz alan eserin diğer 
-kitaplıkla birleştirilmemiş bir kopyasını dağıtmalısınız. Bu dağıtım işlemi yukarıdaki 
-Bölümlere uygun olmalıdır.
-
-b) Bileşik kitaplık ile birlikte, bileşik kitaplığın bir parçasının Kitaplığı baz 
-alan eser olduğuna dair görünür ve belirgin bir bildirim vermeli ve yanında dağıtılan 
-eserin birleştirilmemiş halinin nasıl bulunacağını açıklamalısınız.
-
-8.  Kitaplığı bu Lisans'ta sarih olarak belirtilen şartlar haricinde kopyalayamaz, 
-değiştiremez, ruhsat hakkını veremez ve dağıtamazsınız. Buna aykırı herhangi bir kopyalama, 
-değiştirme, ruhsat hakkı verme, veya dağıtımda bulunma hükümsüzdür ve böyle bir teşebbüs 
-halinde bu Lisans altındaki bütün haklarınız iptal edilir. Sizden, bu Lisans kapsamında 
-kopya veya hak almış olan üçüncü şahıslar, Lisans şartlarına uygunluklarını devam 
-ettirdikleri sürece, ruhsat haklarını muhafaza edeceklerdir.
-
-9.  Bu Lisans sizin tarafınızdan imzalanmadığı için bu Lisans'ı kabul etmek 
-zorunda değilsiniz. Fakat, size Kitaplığı veya onu baz alan ürünleri 
-değiştirmek veya dağıtmak için izin veren başka bir belge yoktur. 
-Eğer bu Lisans'ı kabul etmiyorsanız bu eylemler kanun tarafından sizin 
-için yasaklanmıştır. Dolayısıyla, Kitaplığı (veya onu baz alan bir ürünü) 
-değiştirmeniz veya dağıtmanız bu Lisans'ı ve Lisans'ın Kitaplığı veya ondan 
-iştikak etmiş bütün eserleri kopyalamak, değiştirmek ve dağıtmak için getirdiği 
-şart ve kayıtları kabul ettiğiniz manasına gelmektedir.
-
-10.  Kitaplığı (veya onu baz alan herhangi bir ürünü) yeniden dağıttığınız 
-her defada alıcı, ilk ruhsat sahibinden otomatik olarak Kitaplığı bu şartlar 
-ve kayıtlar dahilinde kopyalamak, değiştirmek ve dağıtmak için ruhsat 
-almaktadır. Alıcının burada verilen hakları kullanmasına ek bir takım 
-kısıtlamalar getiremezsiniz. Üçüncü şahısları bu Lisans mucibince hareket 
-etmeğe mecbur etmek sizin sorumluluk ve yükümlülüğünüz altında değildir.
-
-11.  Eğer bir mahkeme kararı veya patent ihlal iddiası veya herhangi başka 
-bir (patent meseleleri ile sınırlı olmayan) sebep sonucunda size, bu Lisans'ın 
-şart ve kayıtlarına aykırı olan bir takım (mahkeme kararı, özel anlaşma veya 
-başka bir şekilde) kısıtlamalar getirilirse, bu sizi bu Lisans şart ve kayıtlarına 
-uyma mecburiyetinden serbest bırakmaz. Eğer aynı anda hem bu Lisans'ın şartlarını 
-yerine getiren hem de diğer kısıtlamalara uygun olan bir şekilde Kitaplığı 
-dağıtamıyorsanız, o zaman Kitaplığı dağıtamazsınız. Örneğin, eğer bir patent 
-lisansı direkt veya endirekt olarak sizden kopya alacak olan üçüncü şahısların 
-bedel ödemeksizin Kitaplığı dağıtmalarına hak tanımıyorsa o zaman sizin hem bu 
-koşulu hem Lisans koşullarını yerine getirmenizin tek yolu Kitaplığı dağıtmamak 
-olacaktır.
-
-Eğer bu bölümün herhangi bir parçası herhangi bir şart altında uygulanamaz 
-veya hatalı bulunur ise o şartlar dahilinde bölümün geri kalan kısmı, bütün 
-diğer şartlar altında da bölümün tamamı geçerlidir.
-
-Bu bölümün amacı sizin patent haklarını, herhangi bir mülkiyet hakkını ihlal 
-etmenize yol açmak veya bu hakların geçerliliğine muhalefet etmenizi sağlamak 
-değildir; bu bölümün bütün amacı kamu lisans uygulamaları ile oluşturulan 
-serbest yazılım dağıtım sisteminin bütünlüğünü ve işlerliğini korumaktır. 
-Bu sistemin tutarlı uygulanmasına dayanarak pek çok kişi bu sistemle dağıtılan 
-geniş yelpazedeki yazılımlara katkıda bulunmuştur; yazılımını bu veya başka bir 
-sistemle dağıtmak kararı yazara aittir, herhangi bir kullanıcı bu kararı veremez.
-
-Bu bölüm Lisans'ın geri kalanının doğurduğu sonuçların ne olduğunu açıklığa 
-kavuşturmak amacını gütmektedir.
-
-12.  Eğer Kitaplığın kullanımı ve/veya dağıtımı bazı ülkelerde telif hakkı 
-taşıyan arayüzler veya patentler yüzünden kısıtlanırsa, Kitaplığı bu Lisans 
-kapsamına ilk koyan telif hakkı sahibi, Kitaplığın yalnızca bu ülkeler haricinde 
-dağıtılabileceğine dair açık bir coğrafi dağıtım kısıtlaması koyabilir. Böyle bir 
-durumda bu Lisans bu kısıtlamayı sanki Lisans'ın içerisine yazılmış gibi kapsar.
-
-13.  Free Software Foundation zaman zaman Kısıtlı Genel Kamu Lisansı'nın yeni 
-ve/veya değiştirilmiş biçimlerini yayınlayabilir. Böyle yeni sürümler mana 
-olarak şimdiki haline benzer olacaktır, fakat doğacak yeni problemler veya 
-kaygılara cevap verecek şekilde detayda farklılık arzedebilir.
-
-Her yeni biçime ayırdedici bir sürüm numarası verilmektedir. Eğer Kitaplık 
-bir sürüm numarası belirtiyor ve "bu ve bundan sonraki sürümler" altında 
-dağıtılıyorsa, belirtilen sürüm veya Free Software Foundation tarafından 
-yayınlanan herhangi sonraki bir sürümün şart ve kayıtlarına uymakta serbestsiniz. 
-Eğer Kitaplık Lisans için bir sürüm numarası belirtmiyor ise, Free Software 
-Foundation tarafından yayınlanmış olan herhangi bir sürümün şart ve kayıtlarına 
-uymakta serbestsiniz.
-
-14.  Eğer bu Kitaplığın parçalarını dağıtım koşulları farklı olan başka 
-serbest yazılımların içerisinde kullanmak isterseniz, yazara sorarak izin isteyin. 
-Telif hakkı Free Software Foundation'a ait olan yazılımlar için Free Software 
-Foundation'a yazın, bazen istisnalar kabul edilmektedir. Kararımız, serbest 
-yazılımlarımızdan iştikak etmiş yazılımların serbest statülerini korumak ve 
-genel olarak yazılımların yeniden kullanılabilirliğini ve paylaşımını sağlamak 
-amaçları doğrultusunda şekillenecektir. 
-
-			    GARANTİ YOKTUR
-
-15.  BU KİTAPLIK ÜCRETSİZ OLARAK RUHSATLANDIĞI İÇİN, KİTAPLIK İÇİN İLGİLİ 
-KANUNLARIN İZİN VERDİĞİ ÖLÇÜDE HERHANGİ BİR GARANTİ VERİLMEMEKTEDİR. AKSİ YAZILI 
-OLARAK BELİRTİLMEDİĞİ MÜDDETÇE TELİF HAKKI SAHİPLERİ VE/VEYA BAŞKA ŞAHISLAR 
-KİTAPLIĞI "OLDUĞU GİBİ", AŞİKAR VEYA ZIMNEN, SATILABİLİRLİĞİ VEYA HERHANGİ 
-BİR AMACA UYGUNLUĞU DA DAHİL OLMAK ÜZERE HİÇBİR GARANTİ VERMEKSİZİN DAĞITMAKTADIRLAR. 
-KİTAPLIĞIN KALİTESİ VEYA PERFORMANSI İLE İLGİLİ TÜM SORUNLAR SİZE AİTTİR. KİTAPLIKTA
- HERHANGİ BİR BOZUKLUKTAN DOLAYI DOĞABİLECEK OLAN BÜTÜN SERVİS, TAMİR VEYA DÜZELTME
- MASRAFLARI SİZE AİTTİR.
-
-16.  İLGİLİ KANUNUN İCBAR ETTİĞİ DURUMLAR VEYA YAZILI ANLAŞMA HARİCİNDE HERHANGİ 
-BİR ŞEKİLDE TELİF HAKKI SAHİBİ VEYA YUKARIDA İZİN VERİLDİĞİ ŞEKİLDE KİTAPLIĞI 
-DEĞİŞTİREN VEYA YENİDEN DAĞITAN HERHANGİ BİR KİŞİ, KİTAPLIĞIN KULLANIMI VEYA 
-KULLANILAMAMASI (VEYA VERİ KAYBI OLUŞMASI, VERİNİN YANLIŞ HALE GELMESİ, SİZİN 
-VEYA ÜÇÜNCÜ ŞAHISLARIN ZARARA UĞRAMASI VEYA KİTAPLIĞIN BAŞKA YAZILIMLARLA 
-BERABER ÇALIŞAMAMASI) YÜZÜNDEN OLUŞAN GENEL, ÖZEL, DOĞRUDAN YA DA DOLAYLI 
-HERHANGİ BİR ZARARDAN, BÖYLE BİR TAZMİNAT TALEBİ TELİF HAKKI SAHİBİ VEYA İLGİLİ 
-KİŞİYE BİLDİRİLMİŞ OLSA DAHİ, SORUMLU DEĞİLDİR. 
-
-		     ŞART VE KAYITLARIN SONU 
-
-EndOfLicense;
-
-    $lang->install_condition_title = "Lütfen kurulum gereksinimlerini kontrol ediniz.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'PHP Sürümü',
-            'permission' => 'Yetki',
-            'xml' => 'XML Kitaplığı',
-            'iconv' => 'ICONV Kitaplığı',
-            'gd' => 'GD Kitaplığı',
-            'session' => 'Session.auto_start(otomatik.oturum_acma) ayarı',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Gerekli] Eğer PHP sürümü 5.2.2 ise, XE yazılım hatasından dolayı kurulmayacaktır',
-            'permission' => '[Gerekli] XE kurulum yolu ya da ./files directory yolunun yetkisi 707 olmalıdır',
-            'xml' => '[Gerekli] XML iletişimi için XML kitaplığı gereklidir.',
-            'session' => '[Gerekli] PHP ayar dosyasındaki (php.ini) \'Session.auto_start\' XE\'nin oturumu kullanabilmesi için sıfıra eşit olmalıdır',
-            'iconv' => 'Iconv, UTF-8 ve diğer dil ayarlarını değiştirebilmek için kurulmuş olmalıdır',
-            'gd' => 'GD Kitaplığı, resim değiştirme özelliğini kullanabilmek için kurulmuş, olmalıdır',
-        );
-
-    $lang->install_checklist_xml = 'XML Kitaplığını Kur';
-    $lang->install_without_xml = 'XML Kitaplığı kurulmamış';
-    $lang->install_checklist_gd = 'GD Kitaplığı Kur';
-    $lang->install_without_gd  = 'GD Library, resim dönüştürmek için, kurulmamış';
-    $lang->install_checklist_gd = 'GD Kitaplığını Kur';
-    $lang->install_without_iconv = 'Iconv Kitaplığı, karakterleri sıralamak için, kurulmamış';
-    $lang->install_session_auto_start = 'Olası hatalar php ayarlarından dolayı oluşabilir. session.auto_start 1\'e eşit olmalıdır';
-    $lang->install_permission_denied = 'Kurulum yolu yetkisi 707\'ye eşit değil';
-
-    $lang->cmd_agree_license = 'Lisansı kabul ediyorum';
-    $lang->cmd_install_fix_checklist = 'Gerekli koşulları tamamladım.';
-    $lang->cmd_install_next = 'Kuruluma Devam Et';
-    $lang->cmd_ignore = 'Önemseme';
-
-    $lang->db_desc = array(
-        'mysql' => 'PHP\'de mysql*() özellikleri için MySQL\'ü veritabanı olarak kullanınız.<br />İşlemler, veritabanı dosyası myisam \'da oluşturulduğu zaman işlenmeyecektir.',
-        'mysqli' => 'PHP\'de mysqli*() özellikleri için MySQL\'ü veritabanı olarak kullanınız.<br />İşlemler, veritabanı dosyası myisam \'da oluşturulduğu zaman işlenmeyecektir.',
-        'mysql_innodb' => 'innodb ile MySQL\'ü veritabanı olrak kullanınız.<br />İşlemler, innodb ile işlenecektir',
-        'sqlite2' => '\'Verileri dosya olarak kaydeden sqlite2 \'yi veritabanı olarak kullanınız. <br />VT dosyası tarayıcıdan erişilebilir <b>olmamalıdır</b>.<br />(Sabitleme için hiç test edilmedi)',
-        'sqlite3_pdo' => 'PHP\'nin PDO\'sunun desteğiyle sqlite3\'ü veritabanı olarak kullanınız.<br />VT dosyası tarayıcıdan erişilebilir <b>olmamalıdır</b>.',
-        'cubrid' => 'CUBRID\'ü veritabanı olarak kullanın. Daha fazla bilgi için <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manuel</a>i inceleyiniz',
-        'mssql' => 'MSSQL\'ü veritabanı olarak kullanın',
-        'postgresql' => 'PostgreSql\'ü veritabanı olarak kullanın.',
-        'firebird' => 'Firebird\'ü veritabanı olarak kullanın.<br /> (create database "/path/dbname.fdb" page_size=8192 default character set UTF-8;) ile veritabanı oluşturabilirsiniz',
-    );
-
-    $lang->form_title = 'Veritabanı &amp; Yönetici Bilgisi';
-    $lang->db_title = 'Lütfen Veritabanı bilgisini giriniz';
-    $lang->db_type = 'Veritabanı Tipi';
-    $lang->select_db_type = 'Lütfen kullanmak istediğiniz Veritabanını seçiniz.';
-    $lang->db_hostname = 'Veritabanı Sunucuadı';
-    $lang->db_port = 'Veritabanı Portu';
-    $lang->db_userid = 'Veritabanı ID';
-    $lang->db_password = 'Veritabanı Şifresi';
-    $lang->db_database = 'DB Database';
-    $lang->db_database_file = 'DB Database File';
-    $lang->db_table_prefix = 'Tablo Başlığı';
-
-    $lang->admin_title = 'Yönetici Bilgisi';
-
-    $lang->env_title = 'Yapılandırma';
-    $lang->use_optimizer = 'Optimizasyonu Etkinleştir';
-    $lang->about_optimizer = 'Eğer Optimizasyon etkinleştirildiyse, çoklu CSS / JS dosyaları gönderimden önce sıkıştırılıp bir araya konulduğundan, kullanıcılar siteye hızlı bir şekilde ulaşacaktır. <br /> Ancak;  bu optimizasyon, CSS ve JS\'ye göre sorunlu olabilir. Eğer bunu devre dışı bırakırsanız, düzgün bir şekilde çalışmasına karşın daha yavaş çalışacaktır.';
-    $lang->use_rewrite = 'YenidenYazma Modu (mod_rewrite)';
-    $lang->use_sso = 'Tekli Oturum Açma';
-    $lang->about_rewrite = "Eğer websunucusu yenidenyazma(rewritemod) destekliyorsa, http://ornek/?dosya_no=123 gibi URLler http://ornek/123 olarak kısaltılabilir";
-	$lang->about_sso = 'SSO kullanıcıları, geçreli ya da sanal siteye bir kere kayıt olmakla, ikisinden de yararlandıracaktır. Bu, size sadece sanal websiteler kullandığınız durumda lazım olacaktır.';
-    $lang->time_zone = 'Zaman Dilimi';
-    $lang->about_time_zone = "Eğer sunucu zaman dilimi ve bulunduğunuz yerin zaman dilimi uyumlu değilse; zaman dilimi özelliğini kullanarak zamanı bulunduğunuz yere göre ayarlayabilirsiniz ";
-    $lang->qmail_compatibility = 'Qmail\'i Etkinleştir';
-    $lang->about_qmail_compatibility = 'Bu size QMail gibi CRLF\'den ayırt edilemeyen MTA\'dan mail gönderme imkanı sağlayacaktır.';
-
-    $lang->about_database_file = 'Sqlite veriyi dosyaya kaydeder. Veritabanı dosyası tarayıcıyla erişilebilir olmamalıdır.<br/><span style="color:red">Veri dosyası 707 yetki kapsamı içinde olmalıdır.</span>';
-
-    $lang->success_installed = 'Kurulum tamamlandı';
-
-    $lang->msg_cannot_proc = 'Kurulum ortamı devam etmek için uygun değil.';
-    $lang->msg_already_installed = 'XE zaten kurulmuştur';
-    $lang->msg_dbconnect_failed = "VT\'ye ulaşırken bir hata oluştu.\nLütfen VT bilgisini tekrar kontrol ediniz";
-    $lang->msg_table_is_exists = "Tablo zaten VT\'da oluşturuldu.\nYapılandırma dosyası yeniden oluşturuldu";
-    $lang->msg_install_completed = "Kurulum tamamlandı.\nXE\'yi seçtiğiniz için teşekkür ederiz";
-    $lang->msg_install_failed = "Kurulum dosyası oluşturulurken bir hata oluştu.";
-
-    $lang->ftp_get_list = "Liste Al";
-?>
diff --git a/modules/install/lang/vi.lang.php b/modules/install/lang/vi.lang.php
deleted file mode 100644
index 2d4ea3e59..000000000
--- a/modules/install/lang/vi.lang.php
+++ /dev/null
@@ -1,559 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  DucDuy Dao (webmaster@xpressengine.vn)								  ░░
-			░░	* @Website:  http://xpressengine.vn												  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-*/
-
-    $lang->introduce_title = 'Cài đặt XE';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = "Xin hãy kiểm tra những yêu cầu cài đặt.";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'Phiên bản PHP',
-            'permission' => 'Sự cho phép',
-            'xml' => 'XML Library',
-            'iconv' => 'ICONV Library',
-            'gd' => 'GD Library',
-            'session' => 'Thiết lập Session.auto_start',
-        );
-
-    $lang->install_checklist_desc = array(
-			'php_version' => '[Bắt buộc] Nếu phiên bản của PHP là 5.2.2, XE sẽ không thể cài đặt vì có lỗi.',
-            'permission' => '[Bắt buộc] Thư mục cài đặt của XE hay ./files directory\ phải CHMOD thành 707',
-            'xml' => '[Bắt buộc] XML Library cần thiết cho việc truyền thông File XML.',
-            'session' => '[Bắt buộc] File thiết lập của PHP (php.ini) \'Session.auto_start\' phải là 0 theo thứ tự số cho phiên làm việc của XE hoạt động.',
-            'iconv' => '<b>Iconv</b> cần phải được cài đặt cho việc chuyển đổi ngôn ngữ thàng UTFF-8 của những ngôn ngữ khác.',
-            'gd' => '<b>GD Library</b> cần phải được cài đặt cho việc chuyển đổi hình ảnh.',
-        );
-
-    $lang->install_checklist_xml = 'Cài đặt XML Library';
-    $lang->install_without_xml = 'XML Library đã không được cài đặt.';
-    $lang->install_checklist_gd = 'Cài đặt GD Library';
-    $lang->install_without_gd  = 'GD Library đã không được cài đặt cho sự chuyển đổi hình ảnh.';
-    $lang->install_checklist_gd = 'Cài đặt GD Library';
-    $lang->install_without_iconv = 'Iconv Library đã không được cài đặt cho việc xử lý những đặc tính.';
-    $lang->install_session_auto_start = 'Đã có lỗi xảy ra, có lẽ do sự thiết đặt PHP. session.auto_start không phải là 1';
-    $lang->install_permission_denied = 'Sự cho phép của thư mục cài đặt không phải là 707';
-
-    $lang->cmd_agree_license = 'Tôi đã đọc và đồng ý với giấy phép này.';
-    $lang->cmd_install_fix_checklist = 'Tôi đã thay đổi để phù hợp với yêu cầu cài đặt.';
-    $lang->cmd_install_next = 'Tiếp tục cài đặt';
-    $lang->cmd_ignore = 'Bỏ qua';
-
-    $lang->db_desc = array(
-        'mysql' => 'Dùng chức năng <b>mysql*()</b> để sử dụng MySql Database.<br />Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.',
-        'mysqli' => 'Dùng chức năng <b>mysqli*()</b> để sử dụng MySql Database.<br />Giao dịch được vô hiệu hóa bởi File Database được tạo ra bởi myisam.',
-        'mysql_innodb' => 'Dùng chức năng <b>innodb</b> để sử dụng MySql Database.<br />Giao dịch được kích hoạt cho innodb',
-        'sqlite2' => 'Hỗ trợ <b>sqlite2</b> khi lưu Database thành File.<br />Khi cài đặt, File Database phải được tạo ra tại chỗ không sử dụng được từ Web.<br />(Không khẳng định sẽ hoạt động ổn định)',
-        'sqlite3_pdo' => 'Hỗ trợ <b>sqlite3</b> bởi PDO của PHP.<br />Khi cài đặt, File Database phải được tạo ra tại chỗ không sử dụng được từ Web.',
-        'cubrid' => 'Sử dụng <b>CUBRID</b> Database.  <a href="#" onclick="window.open(this.href);return false;" class="manual">Hướng dẫn</a>',
-        'postgresql' => 'Sử dụng <b>PostgreSql</b> Database.',
-        'firebird' => 'Sử dụng <b>firebird</b> Database.',
-    );
-
-    $lang->form_title = 'Hãy nhập thông tin Database và thông tin Administrator';
-    $lang->db_title = 'Xin hãy nhập thông tin Database';
-    $lang->db_type = 'Định dạng Database';
-    $lang->select_db_type = 'Xin hãy chọn Database bạn muốn sử dụng.';
-    $lang->db_hostname = 'Hostname';
-    $lang->db_port = 'Port';
-    $lang->db_userid = 'Tên truy cập';
-    $lang->db_password = 'Mật khẩu';
-    $lang->db_database = 'Tên Database';
-    $lang->db_database_file = 'File Database';
-    $lang->db_table_prefix = 'Tên Table';
-
-    $lang->admin_title = 'Thông tin Administrator';
-
-    $lang->env_title = 'Cấu hình';
-    $lang->use_optimizer = 'Tối ưu hóa';
-    $lang->about_optimizer = 'Nếu tối ưu hóa được kích hoạt, người sử dụng sẽ truy cập nhanh hơn vì những File CSS / JS sẽ được nén lại trước khi được tải xuống. <br /> Tuy vậy, sự tối ưu này cũng làm ảnh hưởng một chút tới File CSS và JS. Nếu bạn tắt, Website của bạn tải chậm hơn.';
-    $lang->use_rewrite = 'Mod Rewrite';
-    $lang->use_sso = 'SSO';
-    $lang->about_rewrite = "Nếu Host của bạn hỗ trợ Mod Rewrite, khi địa chỉ có dạng <b>http://blah/?document_srl=123</b> sẽ được rút ngắn thành <b>http://blah/123</b>";
-	$lang->about_sso = '사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 되는 기능입니다. 가상 사이트를 사용할 때만 필요합니다.';
-    $lang->time_zone = 'Múi giờ';
-    $lang->about_time_zone = "Nếu thời gian của khu vực bạn không tự động cập nhật. Bạn có thể chọn thời gian để hiển thị cho Website.";
-    $lang->qmail_compatibility = 'Mở Qmail';
-    $lang->about_qmail_compatibility = 'Nó sẽ cho phép gửi thư từ MTA mà không phân biệt CRLF.';
-
-    $lang->about_database_file = 'Sqlite lưu trữ dữ liệu trong một File, vì vậy cần tới sự truy cập đến nó trong Database. <br/><span style="color:red">Hãy CHMOD thành 707.</span>';
-
-    $lang->success_installed = 'Chúc mừng bạn đã cài đặt XE thành công!';
-
-    $lang->msg_cannot_proc = 'Môi trường cài đặt không thích hợp.';
-    $lang->msg_already_installed = 'Một phiên bản nào đó của XE đã được cài đặt từ trước.<br />Xin hãy kiểm tra lại!';
-    $lang->msg_dbconnect_failed = "Đã có lỗi xảy ra khi kết nối tới Database.\nXin vui lòng kiểm tra lại thông tin!";
-    $lang->msg_table_is_exists = "Table đã có sẵn trên Database.\nFile Config đã đuwọc thiết lập lại.";
-    $lang->msg_install_completed = "Đã cài đặt XE thành công!.\nXin cảm ơn đã sử dụng XE!";
-    $lang->msg_install_failed = "Đã có lỗi xảy ra khi tạo File cài đặt.";
-
-    $lang->ftp_get_list = "Nhận danh sách";
-?>
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
deleted file mode 100644
index 3356bcab7..000000000
--- a/modules/install/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,246 +0,0 @@
-<?php
-    /**
-     * @file   modules/install/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)  翻译：guny(space.china@gmail.com)
-     * @brief  安装模块简体中文语言包
-     **/
-
-    $lang->introduce_title = '安装XE';
-    $lang->license = <<<EndOfLicense
- <b>GNU 较宽松公共许可证</b>
-		       1999.2, 第 2.1 版
-
- 版权所有 (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- 允许每个人复制和发布本授权文件的完整副本，
-但不允许对它进行任何修改。
-
-[这是第一次发表的较宽松公共许可证 (Lesser GPL) 版本。它同时也可视为 GNU 函数库公共许可证 (GNU Library Public License) 第 2 版的后继者，故称为 2.1 版]
-
-			   导言
-
-  大多数软体许可证决意剥夺您共享和修改软体的自由。相反的，GNU 通用公共许可证力图保证您共享和修改自由软体的自由 —— 保证自由软体对所有使用者都是自由的。
-
-  这个许可证，较宽松公共许可证，适用于一些由自由软体基金会与其他决定使用此许可证的软体作者，所特殊设计的软体套件 —— 象是函数库。您也可以使用它，但我们建议您事先仔细考虑，基于以下的说明是否此许可证或原来的通用公共许可证在任何特殊情况下均为较好的方案。
-
-  当我们谈到自由软体时，我们所指的是自由，而不是价格。我们的 GNU 通用公共许可证是设计用以确保使您有发布自由软体备份的自由（如果您愿意，您可以对此项服务收取一定的费用）；确保您能收到程式原始码或者在您需要时能得到它；确保您能修改软体或将它的一部分用于新的自由软体；而且还确保您知道您可以做上述的这些事情。
-
-  为了保护您的权利，我们需要作出限制：禁止任何人否认您上述的权利，或者要求您放弃这些权利。如果您发布软件的副本，或者对之加以修改，这些规定就转化为您的责任。
-
-  例如，如果您发布此函数库的副本，不管是免费还是收取费用，您必须将您享有的一切权利给予接受者；您必须确保他们也能收到或得到原始程式码；如果您将此函数库与其他的程式码连结，您必须提供完整的目的对象文件和程序(object file)给接受者，则当他们修改此函数库并重新编译过后，可以重新与目的档连结。您并且要将这些条款给他们看，使他们知道他们有这样的权利。
-
-  我们采取两项措施来保护您的权利: （1）用版权来保护函数库。并且，（2）我们提供您这份许可证，赋予您复制，发布和（或）修改这些函数库的法律许可。
-
- 为了保护每个发布者，我们需要非常清楚地让每个人明白，自由函数库是没有担保责任的。如果由于某人修改了函数库，并继续加以传播，我们需要它的接受者明白：他们所得到的并不是原始的版本。故由其他人引入的任何问题，对原作者的声誉将不会有任何的影响。
-
-  最后，由于软体专利不断地威胁自由软体的存在，我们希望商业公司无法藉由自专利持有者取得一个受限的许可证，而有效地限制自由软体的使用者。因此，我们坚持一个函数库所能取得的任何专利，必须与本许可证所声明的“完全自由使用”一致。
-
-  大部分的 GNU 软体，包括一些函数库，是受到原来的 GNU 通用公共许可证的保护。本许可证， GNU 较宽松通用公共许可证，适用于特殊设计的函数库，且与原来的通用公共许可证有很大的不同。我们在特定的函数库中使用它，以准许非自由的程式可以与这些函数库连结。
-
-  当一个程式与一个函数库连结，不论是静态连结或使用共享函数库，二者的结合可以合理地说是结合的作品，一个原来的函数库的衍生品。因此，原来的通用公共许可证只有在整个结合品满足其自由的标准时，才予许连结。较宽松通用公共许可证则以更宽松的标准允许其他程式码与本函数库连结。
-
-  我们称此许可证 "较宽松" 通用公共许可证，是因为它比起原来的通用公共许可证对使用者的自由做到较少的保护。在与非自由软体竞争时，它也提供其他自由软体的写作者较少的优势。这些不利之处正是我们使用原来的通用公共许可证于许多函数库的理由。然而，较宽松的许可证可在某些特殊场合下带来好处。
-
-  例如，在少数情况下，可能会有特殊的需要而鼓励大家尽可能广泛地使用特定的函数库，因而使它成为实际上的标准。为了达到此目标，必须允许非自由的程式使用此函数库。一个较常发生的情况是一个自由的函数库与一个被广泛使用的非自由函数库做相同的工作，在此情况下，限制只有自由软体可以使用此自由函数库不会有多少好处，故我们如用了较宽松通用公共许可证。
-
-  在其他情况下，允许非自由程式使用特定的函数库，可以让更多的人们使用自由软体的大部分。例如，允许非自由程式使用 GNU C 函数库可以让更多的人们使用整个 GNU 作业系统，以及它的变形，GNU/Linux 作业系统。
-
-  尽管较宽松通用共公许可证对使用者的自由是较少的保护的，它却能确保与此函数库连结的程式的使用者拥有自由，而且具有使用修改过的函数库版本来执行该程式的必要方法。
-
-  以下是复制、发布、以及修改的精确条款与条件。请注意 "基于函数库的作品" 以及 "使用函数库的作品" 之间的差异：前者包含来自函数库修改过的原始码；而后者则必须与函数库结合才能执行。
-
-		  GNU 较宽松公共许可证
-   有关复制，发布和修改的条款和条件
-
-  0. 本许可证适用于任何软体函数库，或其他包含了由版权所有者加入的注意事项的程式，或其他有公信力的团体宣称其程式可以在较宽松通用公共许可证 (也称之为 "本许可证") 的条款下发布。每一位许可证接受者以 "您" 来称呼。
-
-  一个 "函数库" 意指一些软体函数的集合，以及或准备好的资料以方便与应用程式 (其使用了其中某些函数与资料) 连结形成可执行的程式。
-
-  以下，"函数库" 一词指的是任何在本条款下发布的这一类软体函数库或作品，一个 "基于本函数库的作品" 意指函数库或任何在版权法下的衍生作品：也就是说，一个包含了本函数库或其一部分的作品，可以是原封不动的，或经过修改的，和/或直接翻译成其他语言的。(在下文中，翻译是不受限地包含在 "修改" 的条款中。)
-
- 作品的 "原始码" 意指对作品进行修改最优先择取的形式。对函数库而言，完整的原始码意指所有模组的所有原始程式，加上有关的介面的定义，加上控制函数库的安装和编译的 script。
-
-  本许可证条款不适用于复制，发布和修改以外的活动。这些活动超出这些条款的范围。使用本函数库来执行本程式的动作不受条款的限制，而程式的输出只有在其内容所构成的作品是基于本函数库时 (与在什么样的工具中使用本函数库来输出无关) ，这一条款才适用。以上是否为真则取决于本函数库具体用来做什么。
-
-  1. 只要您在每一程式副本上明显和恰当地宣告版权声明和不承担担保的声明，并保持此许可证的声明和没有担保的声明完整无损，并和程式一起给其他每位程式接受者一份许可证的副本，您就可以用任何媒体复制和发布您收到的函数库的完整原始码。
-
-  您可以为转让副本的实际行动收取一定费用。您也可以选择提供担保以换取一定的费用。
-
-  2. 只要您同时满足下面的所有条件，您就可以按前面第一款的要求修改函数库的一个或几个副本或它的任何部分，以此形成基于此函数库的作品，并且复制和发布这一经过修改的程式或作品:
-
-    a) 被修改的作品本身必须是一个软体函数库。
-
-    b) 必须在修改过的档案中附有明确的说明：您修改了此一档案及任何修改的日期。
-
-    c) 您必须让整个作品允许第三方在此许可证条款下可以免费使用。
-
-    d)果修改过的函数库其某个设备使用到了「使用本函数库的应用程式」所提供的函数或资料表格，却不是当此设备被呼叫时以参数列传入时，则您必须确实做到，当应用程式不提供这样的函数或表格时，则此设备依旧能工作，且其执行的任何目的仍然有意义。
-
-    (例如，一个函数库的函数用来计算平方根，其目的是有完整的定义且与应用程式是无关的。因此， 2d 小节要求任何本函数会使用的，由应用程式所提供的函数或表格必须是选择性的：如果应用程式不提供的话，则计算平方根的函数必须依旧能计算平方根)
-
-这些要求适用于整个修改过的作品。如果能够确定作品的一部分并非本函数库的衍生产品，且可以合理地单独考虑并将它与原作品分开的话，则当您将它作为独立的作品发布时，它不受此许可证和其条款的约束。但是当您将这部分与基于本函数库的作品一同发布时，则整个套件将受到本许可证条款约束，其对于其他许可证持有人的使用范围扩大到整个产品，也就是套件的每个部分，不管它是谁写的。
-
-因此，本条款的意图不在于索取权利，或剥夺完全由您完成的作品的权利，而是履行权利来控制基于本函数库的集体作品或衍生作品的发布。
-
-此外，将与本函数库无关的作品和本函数库 (或基于本函数库的作品) 一起放在贮存媒体或发布媒体的同一卷上，并不导致将其他作品置于此许可证的约束范围之内。
-
-  3.于一个函数库的副本，您可以选择性地使用原来的 GNU 通用公共许可证上的条款来取代本许可证上的条款。如果您要这么做，您必须修改所有的参考到本许可证的注意事项，使它们指向原来的 GNU 通用公共许可证，第二版，以取代本许可证(如果有比第二版的原来的 GNU 通用公共许可证更新的版本出现的话，则如果您愿意的话可以特别指明使用新版)。请不要对这些注意事项做出其他的改变。
-
-  一旦在一个副本上做了这样的改变，则该副本就无法撤回这样的改变，故原来的 GNU 通用公共许可证将适用于所有后续的副本以及由此副本衍生出来的作品。
-
- 此一选择性适用于当您想要将一部分的函数库原始码复制到一个非函数库的程式使用时。
-
-  4. 您可以以目标码或可执行形式复制或发布本函数库 (或符合第 2 款，基于本函数库的作品)，只要您遵守前面的第 1、2 款，并同时提供完整的相关机器可读的原始码，而这些原始码必须在前面的第 1 与第 2 款条件下，在一般习惯上用来做软体交换的媒体上发布。
-
-  如果所发布的目标码是由指定的地点提供拷贝索取，那么由同一地点所提供等价的原始码拷贝索取可以算作原始码的发布，即使第三方不强求与目标码一起复制原始码。
-
-  5. 一个程式若包含不经任何部分修改的函数库，但却是设计经由编译或连结的方式与本函数库一同工作者，称之为 "使用函数库的作品"。这样的一个作品，严格地说，并非本函数库的衍生作品，因而不在本许可证的范围之内。
-
-  然而，将 "使用函数库的作品" 与本函数库连结而产生可执行程式，则是本函数库的衍生品 (因为它包函了本函数库的一部分)，而不是 "使用函数库的作品"，因此其可执行程式包含在本许可证的范围内。第 6 款说明了发布此可执行程式的条款。
-
- 当 "使用函数库的作品" 使用了函数库部分的标头档内容时，则此作品即使其原始码不属于本函数库的衍生品，但其目标码仍然是。这一点是否为真特别在是否本作品可以在不需要本函数库即可连结，或者是否该作品本身也是一个函数库时特别明显。
-
-  如果这样的目标档只使用数字参数、资料结构层级与附属品、以及小巨集和小内□式 (小于或等于十行) ，则此目标档的使用是不受限的，不论是否它是合法的衍生作品。 (但可执行程式若包函此目标档以及一部分的函数库，仍然将在第 6 款的规定下)
-
-  否则的话，如果本作品是本函数库的衍生品，您必须在第 6 款的规定下发布该作品的目标码。任何包含该作品的可执行程式也在第 6 款的范围内，不论它们是否直接与本函数库连结。
-
-  6. 做为上述条款的例外情况，您也可以将 "使用函数库的作品" 与本函数库结合或连结，以产生包含部分本函数库的作品，并在允许使用者自身使用时可以修改该作品，以及在对修改进行反组译除错的情况下，您可以依照您的选择发布该作品。
-
-  您必须在每个作品的副本突显出如下的注意事项：本函数库在作品中被使用，以及本函数库以及它的使用是在本许可证的规定下。您必须提供本许可证的副本。如果该作品在执行时显示版权声明，您必须在其中包含本函数库的版权声明，以及指引使用者取得本许可证的副本。同时，您必须做到以下其中一件事：
-
-    a) 必须将完整的机器可读的函数库原始码包含在该作品中，包括任何该作品使用到的改变 (这些改变必须在前述第 1 与第 2 款的要求下发布)；而且，如果该作品是一个与函数库连结的「完整的、机器可□的 "使用函数库的作品"」，则要有目标码和/或原始码，如此使用者可以修改本函数库且可以重新连结，以产生包函修改过的函数库的修改过的可执行程式。 (理所当然的若使用者修改了函数库的档案定义内容时，则该作品不必然可以重新编译以使用修改过的定义。)
-
-    b) 在与函数库连结时使用适当的分享函数库连结机制。一个适当的机制是： (1) 在执行时使用已存在于使用者的电脑中的函数库副本，而不是将函数库的函数复制到可执行程式里，以及 (2) 如果使用者安装了一份修改过的函数库，只要修改过的版本在介面上与该作品在编译连结时所用的版本是相容的，则该执行程式可以与修改过的函数库运作良好。
-
-    c) 在该作品内提供书面报价，有效期不少于三年，以提供同样的使用者上述第 6a 款中的内容，费用不得超过该程式发布的实际成本。 
-
-    d)如果所发布的作品是由指定的地点提供拷贝索取，则由同一地点提供上述内容的等价拷贝索取。
-
-    e) 确定使用者已经收到该作品的一份复制，或是您已经寄给该使用者一份复制品。
-
-  对于一个可执行程式，其所需的 "使用函数库的作品" 的形式必须包括任何要从中再产生可执行程式时所需的资料与工具程式。然而，有一个特殊例外，其所发布的内容不需要包括任何一般与「可执行本程式的作业系统」的主要部分 (如编译器、核心等) 一起发布的部分 (不论是原始码或可执行码)，除非这些组成部分和可执行作品结合在一起。
-
- 一个可能情况是，这些要求与其他通常不与作业系统在一起的私有函数库的版权限制相抵触，这样的抵触表示您不能将它们与本函数库一起用于您发布的可执行程式中。
-
-  7. 您可以将使用本函数库的函数库设备，以及其他不在本许可证范围内的函数库，对等地放入一个单独的函数库中，并在基于本函数库的作品以及其他函数库在其他状态下同意可以个别发布，以及您做到以下两点的情况下，您可以发布此结合的函数库：
-
-    a) 将基于本函数库的作品单独不与其他函数库设备结合地，与此结合的函数库一同发布。该作品必须在上述条款的规定下发布。
-
-    b) 在此结合的函数库中明显地指出其中一部分的作品是基于本函数库，并且说明那里可以找到同样不具结合形式的作品。
-
-  8. 非您明确按许可证提出的要求去做，否则您不能复制、修改、转发许可证、与本函数库连结、和发布本函数库。任何试图用其他方式复制、修改、转发许可证、与本函数库连结、和发布本函数库是无效的，而且将自动结束许可证赋予您的权利。然而，对那些从您那里按许可证条款得到副本和权利的人们，只要他们继续全面履行条款，许可证赋予他们的权利仍然有效。
-
-  9. 您没有在许可证上签字，因而您没有必要一定接受此一许可证。然而，没有任何其他东西赋予您修改和发布本函数库及其衍生作品的权利。如果您不接受许可证，这些行为是法律禁止的。因此，如果您修改或发布函数库 (或任何基于函数库的作品) ，您就表明您接受这一许可证以及它的所有有关复制、发布和修改本函数库或基于它的作品的条款和条件。
-
-  10. 每当您重新发布函数库 (或任何基于函数库的作品) 时，接受者自动从原始许可证颁发者那里接到受这些条款和条件支配的复制、发布、连结或修改本函数库的许可。您不可以强迫接受者履行除了这里赋予他们的权利之外的其他限制。您也没有强求第三方履行许可证条款的义务。
-
-  11. 如果由于法院判决或违反专利的指控或任何其他原因 (不限于专利问题) 的结果，使得强加于您的条件 (不管是法院判决，协议书或其他) 和许可证的条件有冲突时，他们也不能令您背离许可证的条款。在您不能同时满足本许可证规定的义务及其他相关的义务来发布函数库时，则结果您只能够根本不发布函数库。例如，如果某一专利许可证不允许所有直接或间接从您那里接受副本的人们，在不付专利费的情况下重新发布函数库，唯一能同时满足两方面要求的办法是停止发布函数库。
-
-如果本条款的任何部分在特定的环境下无效或无法实施，就使用条款的其余部分，并将这部分条款作为整体用于其他环境。
-
-本条款的目的不在于引诱您侵犯专利或其他财产权的要求，或争论这种要求的有效性。本条款的主要目的在于保护自由软体发布系统的完整性。它是通过公共许可证的应用来实现的。许多人已依赖同是出自此系统的应用程式，经由此系统发布大量自由软体而做出慷慨的供献。作者/捐献者有权决定他/她是否通过任何其他系统发布软体，许可证持有人不能强加这种选择。
-
-本节的目的在于明确说明许可证其余部分可能产生的结果。
-
-  12.如果由于专利或者由于有版权的介面问题使函数库在某些国家的发布和使用受到限制，则在许可证约束下的原始版权拥有者可以增加发布地区的限制条款，将这些国家明确排除在外，并在这些国家以外的地区发布函数库。在这种情况下，许可证套件含的限制条款和许可证正文一样有效。
-
-  13. 自由软体基金会可能随时出版较宽松通用公共许可证的修改版或新版。新版和当前的版本在原则上保持一致，但在提到新问题时或有关事项时，在细节上可能出现差别。
-
-每一版本都有不同的版本号。如果函数库指定可适用的许可证版本号以及 "任何更新的版本" ，您有权选择遵循指定的版本或自由软体基金会以后出版的新版本。如果函数库未指定许可证版本，您可选择自由软体基金会已经出版的任何版本。
-
-  14. 如果您愿意将函数库的一部分结合到其他自由程式中，而它们的发布条件不同，请写信给作者，要求准予使用。如果是自由软体基金会加以版权保护的软体，写信给自由软体基金会，我们有时会作为例外的情况处理。我们的决定受两个主要目标的指导，这两个主要目标是：我们的自由软体的衍生作品继续保持自由状态，以及从整体上促进软体的共享和重复利用。
-
-			    没有担保
-
-  15. 由于函数库准予免费使用，在适用法准许的范围内，对函数库没有担保。除非另有书面说明，版权所有者和/或其他提供函数库的人们 "一样" 不提供任何类型的担保，不论是明确的，还是隐含的，包括但不限于可销售和适合特定用途的隐含保证。全部的风险，如函数库的质量和性能问题都由您来承担。如果函数库出现缺陷，您应当承担所有必要的服务、修复和改正的费用。
-
-  16.非适用法或书面协议的要求，在任何情况下，任何版权所有者或任何按许可证条款修改和发布函数库的人们都不对您的损失负有任何责任。包括由于使用或不能使用函数库引起的任何一般的、特殊的、偶然发生的或重大的损失 (包括但不限于数据的损失，或者数据变得不精确，或者您或第三方的持续的损失，或者函数库不能和其他软体协调运行等) 。即使版权所有者和其他人提到这种损失的可能性也不例外。
-
-		   -条文结束-
-EndOfLicense;
-
-    $lang->install_condition_title = "检测运行环境";
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'PHP版本',
-            'permission' => '权限',
-            'xml' => 'XML库',
-            'iconv' => 'ICONV库',
-            'gd' => 'GD库',
-            'session' => 'Session.auto_start 设置',
-        );
-
-    $lang->install_checklist_desc = array(
-	    'php_version' => '[必须] 由于 PHP 5.2.2 版本BUG，无法安装 XE。',
-            'permission' => '[必须] 的安装路径或 ./files目录属性必须是707',
-            'xml' => '[必须]为了 XML通讯，将需要XML库',
-            'session' => '[必须] 为了使用缓冲功能，必须在php.ini当中设置 session.auto_start=0',
-            'iconv' => '为了UTF-8和其他语言环境之间的互相转换，必须安装iconv',
-            'gd' => '为了使用图片转换功能，必须先得安装GD库',
-        );
-
-    $lang->install_checklist_xml = '安装XML库';
-    $lang->install_without_xml = '还没有安装xml库！';
-    $lang->install_checklist_gd = '安装GD库';
-    $lang->install_without_gd  = '还没有安装负责转换图片功能的GD库！';
-    $lang->install_checklist_gd = '安装GD库';
-    $lang->install_without_iconv = '还没有安装负责处理字串的iconv库！';
-    $lang->install_session_auto_start = 'PHP设置中设置成session.auto_start==1，可能处理session时发生错误。';
-    $lang->install_permission_denied = '安装目录属性不是707！';
-
-    $lang->cmd_agree_license = '同意';
-    $lang->cmd_install_fix_checklist = '已设置了必要的安装条件。';
-    $lang->cmd_install_next = '开始安装';
-    $lang->cmd_ignore = '忽略';
-
-    $lang->db_desc = array(
-        'mysql' => '利用php的 mysql*()函数使用mysql DB。<br />DB数据是以myisam生成，因此不能实现transaction。',
-        'mysqli' => '利用php的 mysqli*()函数使用mysql DB。<br />DB数据是以myisam生成，因此不能实现transaction。',
-        'mysql_innodb' => '利用innodb使用mysql DB。<br />innodb可以使用transaction。',
-        'sqlite2' => '支持用文件形式保存数据的sqlite2。<br />安装时DB文件应在web不能访问的地方生成。<br />(还没有通过安全的测试)',
-        'sqlite3_pdo' => '用PHP的 PDO支持 sqlite3。<br />安装时DB文件应在web不能访问的地方生成。',
-        'cubrid' => '使用CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => '使用MSSQL DB。',
-        'postgresql' => '使用PostgreSql DB。',
-        'firebird' => '使用Firebird DB。',
-    );
-
-    $lang->form_title = '数据库及管理员基本信息';
-    $lang->db_title = '输入数据库信息';
-    $lang->db_type = '数据库类型';
-    $lang->select_db_type = '选择数据库';
-    $lang->db_hostname = '服务器名';
-    $lang->db_port = '数据库端口';
-    $lang->db_userid = 'DB用户名';
-    $lang->db_password = 'DB密码';
-    $lang->db_database = '数据库名';
-    $lang->db_database_file = '数据库文件';
-    $lang->db_table_prefix = '前缀';
-
-    $lang->admin_title = '管理员信息';
-
-    $lang->env_title = '环境设置';
-    $lang->use_optimizer = '使用Optimizer';
-    $lang->about_optimizer = '使用Optimizer可以对大部分的CSS/ JS文件进行整合/压缩传送使之加快网站访问速度。<br />只是有时会发生小小的问题。这时候请暂时不要使用Optimizer。';
-    $lang->use_rewrite = '使用rewrite模块';
-    $lang->use_sso = 'SSO';
-    $lang->about_rewrite = '如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。';
-	$lang->about_sso = '사용자가 한 번만 로그인하면 기본 사이트와 가상 사이트에 동시에 로그인이 되는 기능입니다. 가상 사이트를 사용할 때만 필요합니다.';
-    $lang->time_zone = '时区';
-    $lang->about_time_zone = '服务器时间和您所处的时间有差异时，可以设置时区来满足你所需要的时间显示。';
-    $lang->qmail_compatibility = 'Qmail互换';
-    $lang->about_qmail_compatibility = '支持不能识别CRLF为换行符的Qmail等MTA，也能发送电子邮件。';
-
-    $lang->about_database_file = 'Sqlite是文件里保存数据。数据库的文件位置应该放在web不能访问的地方。<br/><span style="color:red">数据文件应放在具有707属性的位置。</span>';
-
-    $lang->success_installed = '已完成安装。';
-
-    $lang->msg_cannot_proc = '不具备安装所需环境，不能继续进行。';
-    $lang->msg_already_installed = '已安装';
-    $lang->msg_dbconnect_failed = "连接DB时发生错误。\n请重新确认DB信息。";
-    $lang->msg_table_is_exists = "已生成数据表。\n重新生成了config文件。";
-    $lang->msg_install_completed = "安装完成。\n非常感谢。";
-    $lang->msg_install_failed = "生成安装文件时发生错误。";
-
-    $lang->ftp_get_list = '载入FTP列表';
-?>
diff --git a/modules/install/lang/zh-TW.lang.php b/modules/install/lang/zh-TW.lang.php
deleted file mode 100644
index ed6658e0f..000000000
--- a/modules/install/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,556 +0,0 @@
-<?php
-    /**
-     * @file   modules/install/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  安裝(install)模組正體中文語言(包含基本內容)
-     **/
-
-    $lang->introduce_title = 'XE程式安裝';
-    $lang->license = <<<EndOfLicense
- <b>GNU LESSER GENERAL PUBLIC LICENSE</b>
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-
-EndOfLicense;
-
-    $lang->install_condition_title = '確認安裝時必備的條件';
-
-    $lang->install_checklist_title = array(
-			'php_version' => 'PHP版本',
-            'permission' => '權限',
-            'xml' => 'XML Library',
-            'iconv' => 'ICONV Library',
-            'gd' => 'GD Library',
-            'session' => 'Session.auto_start設置',
-        );
-
-    $lang->install_checklist_desc = array(
-	        'php_version' => '[必須] 由於 PHP 5.2.2 版本的問題，無法安裝 XE 程式。',
-            'permission' => '[必須] XE的資料夾或『./files』資料夾權限必須是『707』。',
-            'xml' => '[必須] 必須要安裝『XML Library』，才能夠使用 XML 通訊。',
-            'session' => '[必須] 在『php.ini』中必須要設定『session.auto_start=0』，才能使用暫存功能',
-            'iconv' => '安裝『iconv』，才能使 UTF-8 和其他語言文字作互相轉換。',
-            'gd' => '安裝『GD Library』才可以使用圖片轉換功能。',
-        );
-
-    $lang->install_checklist_xml = '安裝 XML Library';
-    $lang->install_without_xml = '尚未安裝 XML Library！';
-    $lang->install_checklist_gd = '安裝 GD Library';
-    $lang->install_without_gd  = '尚未安裝負責轉換圖片功能的 GD Library！';
-    $lang->install_checklist_gd = '安裝 GD Library';
-    $lang->install_without_iconv = '尚未安裝負責處理字串的『iconv』！';
-    $lang->install_session_auto_start = 'PHP設置中設置成『session.auto_start==1』，可能在處理 session 時會發生錯誤。';
-    $lang->install_permission_denied = '安裝目錄權限不是『707』！';
-
-    $lang->cmd_agree_license = '同意使用條款';
-    $lang->cmd_install_fix_checklist = '重新檢查';
-    $lang->cmd_install_next = '開始進行安裝';
-    $lang->cmd_ignore = '忽略';
-
-    $lang->db_desc = array(
-        'mysql' => '利用 PHP 的『mysql*()』函數使用 MySQL 資料庫。<br />利用『myisam』建立資料庫檔案，因此不能實現transaction。',
-        'mysqli' => '利用 PHP 的『mysqli*()』函數使用 MySQL 資料庫。<br />利用『myisam』建立資料庫檔案，因此不能實現transaction。',
-        'mysql_innodb' => '利用『innodb』使用 Mysql 資料庫。<br />innodb可以使用 transaction。',
-        'sqlite2' => '支援用檔案形式保存數據的『sqlite2』。<br />安裝時，資料庫數據應建立在 web 無法訪問的地方。<br />(尚未通過安全測試)',
-        'sqlite3_pdo' => '用 PHP 的 PDO 支援『sqlite3』。<br />安裝時，資料庫數據應建立在網頁無法訪問的地方。',
-        'cubrid' => '使用 CUBRID DB。 <a href="http://www.xpressengine.com/?mid=manual&pageid=2880556" onclick="window.open(this.href);return false;" class="manual">manual</a>',
-        'mssql' => '使用 MSSQL DB。',
-        'postgresql' => '使用 PostgreSql DB。',
-        'firebird' => '使用 Firebird DB。<br />DB 建立方式 (create database "/path/dbname.fdb" page_size=8192 default character set UTF8;)',
-    );
-
-    $lang->form_title = '輸入資料庫及管理員資訊';
-    $lang->db_title = '輸入資料庫資訊';
-    $lang->db_type = '資料庫類型';
-    $lang->select_db_type = '請選擇要使用的資料庫。';
-    $lang->db_hostname = '主機名稱';
-    $lang->db_port = '埠口';
-    $lang->db_userid = '使用者名稱';
-    $lang->db_password = '密碼';
-    $lang->db_database = '資料庫名稱';
-    $lang->db_database_file = '資料庫檔案';
-    $lang->db_table_prefix = '前置字元';
-
-    $lang->admin_title = '管理員資料';
-
-    $lang->env_title = '環境設置';
-    $lang->use_optimizer = 'Optimizer';
-    $lang->about_optimizer = '使用 Optimizer 可對大部分的『CSS/JS』檔案進行整合/壓縮加快網站訪問速度。<br />只是有時會發生小小的問題，這時候請暫時不要使用 Optimizer 功能。';
-    $lang->use_rewrite = 'Rewrite';
-    $lang->use_sso = '單一登入';
-    $lang->about_rewrite = '如果支援 rewrite 功能，可縮短冗長的網址。<br />例>『http://域名/?document_srl=123』縮短成『http://域名/123』。';
-	$lang->about_sso = '此功能可讓用戶只需登入一次即可訪問多個網站。<br />使用虛擬網站，這將會是很重要的功能。';
-    $lang->time_zone = '時區';
-    $lang->about_time_zone = '主機時間和您所處的時間有差異時，可以設置時區來滿足你所需要的時間顯示。';
-    $lang->qmail_compatibility = 'Qmail互換';
-    $lang->about_qmail_compatibility = '支援無法識別 CRLF 為換行符的 Qmail 等 MTA，也能發送電子郵件。';
-
-    $lang->about_database_file = 'Sqlite是保存資料於檔案中。資料庫的檔案位置應該放在 web 不能訪問的地方。<br/><span style="color:red">資料檔案應放在具有 707 權限的位置。</span>';
-
-    $lang->success_installed = '已完成安裝。';
-
-    $lang->msg_cannot_proc = '不具備安裝所需環境，無法繼續安裝。';
-    $lang->msg_already_installed = '已安裝';
-    $lang->msg_dbconnect_failed = "連接資料庫時發生錯誤。\n請重新確認資料庫資訊。";
-    $lang->msg_table_is_exists = "已建立資料表。\n重新建立 config 檔案。";
-    $lang->msg_install_completed = "安裝完成。\n非常感謝。";
-    $lang->msg_install_failed = "建立安裝檔案時，發生錯誤。";
-
-    $lang->ftp_get_list = "取得列表";
-?>
diff --git a/modules/install/ruleset/config.xml b/modules/install/ruleset/config.xml
new file mode 100644
index 000000000..f1d8bed18
--- /dev/null
+++ b/modules/install/ruleset/config.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="time_zone" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/cubrid.xml b/modules/install/ruleset/cubrid.xml
new file mode 100644
index 000000000..7d06396b7
--- /dev/null
+++ b/modules/install/ruleset/cubrid.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="db_type" required="true" default="mysql" />
+		<field name="db_hostname" required="true" length="1:250" default="localhost" />
+		<field name="db_port" required="true" length="1:250" rule="number" default="3306" />
+		<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
+		<field name="db_password" required="true" length="1:250"/>
+		<field name="db_database" required="true" length="1:250" />
+		<field name="db_table_prefix" length="2:20" rule="alpha" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/firebird.xml b/modules/install/ruleset/firebird.xml
new file mode 100644
index 000000000..7d06396b7
--- /dev/null
+++ b/modules/install/ruleset/firebird.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="db_type" required="true" default="mysql" />
+		<field name="db_hostname" required="true" length="1:250" default="localhost" />
+		<field name="db_port" required="true" length="1:250" rule="number" default="3306" />
+		<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
+		<field name="db_password" required="true" length="1:250"/>
+		<field name="db_database" required="true" length="1:250" />
+		<field name="db_table_prefix" length="2:20" rule="alpha" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/install.xml b/modules/install/ruleset/install.xml
new file mode 100644
index 000000000..58ab39043
--- /dev/null
+++ b/modules/install/ruleset/install.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="email_address" required="true" length="1:200" rule="email" />
+		<field name="password" required="true" length="1:20" />
+		<field name="password2" required="true" length="1:20" equalto="password" />
+		<field name="user_id" required="true" length="2:20" rule="userid" />
+		<field name="nick_name" required="true" length="2:20" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/installFtpInfo.xml b/modules/install/ruleset/installFtpInfo.xml
new file mode 100644
index 000000000..3be8199fc
--- /dev/null
+++ b/modules/install/ruleset/installFtpInfo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="ftp_host" required="true" />
+		<field name="ftp_user" required="true" />
+		<field name="ftp_port" filter="number" />
+		<field name="ftp_root_path" required="true" />
+		<field name="sftp" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/mssql.xml b/modules/install/ruleset/mssql.xml
new file mode 100644
index 000000000..7d06396b7
--- /dev/null
+++ b/modules/install/ruleset/mssql.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="db_type" required="true" default="mysql" />
+		<field name="db_hostname" required="true" length="1:250" default="localhost" />
+		<field name="db_port" required="true" length="1:250" rule="number" default="3306" />
+		<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
+		<field name="db_password" required="true" length="1:250"/>
+		<field name="db_database" required="true" length="1:250" />
+		<field name="db_table_prefix" length="2:20" rule="alpha" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/mysql.xml b/modules/install/ruleset/mysql.xml
new file mode 100644
index 000000000..7d06396b7
--- /dev/null
+++ b/modules/install/ruleset/mysql.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="db_type" required="true" default="mysql" />
+		<field name="db_hostname" required="true" length="1:250" default="localhost" />
+		<field name="db_port" required="true" length="1:250" rule="number" default="3306" />
+		<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
+		<field name="db_password" required="true" length="1:250"/>
+		<field name="db_database" required="true" length="1:250" />
+		<field name="db_table_prefix" length="2:20" rule="alpha" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/postgresql.xml b/modules/install/ruleset/postgresql.xml
new file mode 100644
index 000000000..7d06396b7
--- /dev/null
+++ b/modules/install/ruleset/postgresql.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="db_type" required="true" default="mysql" />
+		<field name="db_hostname" required="true" length="1:250" default="localhost" />
+		<field name="db_port" required="true" length="1:250" rule="number" default="3306" />
+		<field name="db_userid" required="true" length="1:250" rule="alpha_number" />
+		<field name="db_password" required="true" length="1:250"/>
+		<field name="db_database" required="true" length="1:250" />
+		<field name="db_table_prefix" length="2:20" rule="alpha" />
+    </fields>
+</ruleset>
diff --git a/modules/install/ruleset/sqlite.xml b/modules/install/ruleset/sqlite.xml
new file mode 100644
index 000000000..7aa3a18fc
--- /dev/null
+++ b/modules/install/ruleset/sqlite.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="db_type" required="true" default="mysql" />
+		<field name="db_database" required="true" length="1:250" />
+		<field name="db_table_prefix" length="2:20" rule="alpha" />
+    </fields>
+</ruleset>
diff --git a/modules/install/script/ko.install.php b/modules/install/script/ko.install.php
index 56f228bc1..ffdc8f534 100644
--- a/modules/install/script/ko.install.php
+++ b/modules/install/script/ko.install.php
@@ -62,10 +62,13 @@
 
 	// insertPageModule
 	$page_args->layout_srl = $layout_srl;
+	$page_args->browser_title = 'welcome_page';
 	$page_args->module = 'page';
 	$page_args->mid = 'welcome_page';
 	$page_args->module_category_srl = 0;
 	$page_args->page_caching_interval = 0;
+	$page_args->page_type = 'ARTICLE';
+	$page_args->skin = 'default';
 	
 	$oModuleController = &getController('module');
 	$output = $oModuleController->insertModule($page_args);
@@ -82,7 +85,7 @@
 
 	$obj->module_srl = $module_srl;
 	Context::set('version', __ZBXE_VERSION__);
-	$obj->title = 'welcome_document';
+	$obj->title = 'Welcome XE';
 
 	$obj->content = $oTemplateHandler->compile('./modules/install/script/welcome_content', 'welcome_content_'.$lang);
 
@@ -94,8 +97,7 @@
 	// save PageWidget
 	$oModuleModel = &getModel('module');
 	$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-	$module_info->content = '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="WIDTH: 100%; FLOAT: left" body="" document_srl="'.$document_srl.'" widget_padding_left="0" widget_padding_right="0" widget_padding_top="0" widget_padding_bottom="0"  />';
-
+	$module_info->document_srl = $document_srl;
 	$output = $oModuleController->updateModule($module_info);
 	if(!$output->toBool()) return $output;
 
diff --git a/modules/install/script/welcome_content/welcome_content_en.html b/modules/install/script/welcome_content/welcome_content_en.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_en.html
+++ b/modules/install/script/welcome_content/welcome_content_en.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_es.html b/modules/install/script/welcome_content/welcome_content_es.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_es.html
+++ b/modules/install/script/welcome_content/welcome_content_es.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_fr.html b/modules/install/script/welcome_content/welcome_content_fr.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_fr.html
+++ b/modules/install/script/welcome_content/welcome_content_fr.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_jp.html b/modules/install/script/welcome_content/welcome_content_jp.html
index 26056c39c..c4ae50fe4 100644
--- a/modules/install/script/welcome_content/welcome_content_jp.html
+++ b/modules/install/script/welcome_content/welcome_content_jp.html
@@ -1,28 +1,22 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>ウェブサイトを始める前にこのページを削除してください。<br />以下のリストの格項目をチェックして設置状態を確認することができます。<br />管理ページから全てのコンポネントを確認することができます。</p>
-			<ol>
-				<li>
-					画面の構成から <strong>header</strong>, <strong>body</strong>, <strong>footer</strong>が見えたら、<strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">レイアウト</a></strong>は正常に設置されたことです。
-				</li>
-				<li>
-					<strong>画面上端と左に位置する二つのメニュー</strong>が見えたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">メニューモジュール</a></strong>は正常に設置されたことです
-				</li>
-				<li>
-					画面右上端に<strong>検索ボックス</strong>が見えたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">統合検索モジュール</a></strong>は正常に設置されたことです
-				</li>
-				<li>
-					画面左端に<strong>ログインボックス</strong>が見えたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">ログインウィジェット</a></strong>は正常に設置されたことです
-				</li>
-				<li>
-					このページが読めたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">ページモジュール</a></strong>は正常に設置されたことです
-				</li>
-			</ol>
-			<p>
-				<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">設定ページ</a></strong>で他のページを初期起動モジュールにセッティングすることができます。
-			</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>ウェブサイトを始める前にこのページを削除してください。<br />以下のリストの格項目をチェックして設置状態を確認することができます。<br />管理ページから全てのコンポネントを確認することができます。</p>
+<ol>
+	<li>
+		画面の構成から <strong>header</strong>, <strong>body</strong>, <strong>footer</strong>が見えたら、<strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">レイアウト</a></strong>は正常に設置されたことです。
+	</li>
+	<li>
+		<strong>画面上端と左に位置する二つのメニュー</strong>が見えたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">メニューモジュール</a></strong>は正常に設置されたことです
+	</li>
+	<li>
+		画面右上端に<strong>検索ボックス</strong>が見えたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">統合検索モジュール</a></strong>は正常に設置されたことです
+	</li>
+	<li>
+		画面左端に<strong>ログインボックス</strong>が見えたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">ログインウィジェット</a></strong>は正常に設置されたことです
+	</li>
+	<li>
+		このページが読めたら、<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">ページモジュール</a></strong>は正常に設置されたことです
+	</li>
+</ol>
+<p>
+	<strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">設定ページ</a></strong>で他のページを初期起動モジュールにセッティングすることができます。
+</p>
diff --git a/modules/install/script/welcome_content/welcome_content_ko.html b/modules/install/script/welcome_content/welcome_content_ko.html
index 59935e56a..8f85c2201 100644
--- a/modules/install/script/welcome_content/welcome_content_ko.html
+++ b/modules/install/script/welcome_content/welcome_content_ko.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' 설치를 환영합니다!</h1>
-			<p>XE core설치가 성공적으로 완료되었습니다.<br />이 페이지는 데모 페이지 이므로 추후 사이트 운영시 삭제 가능합니다.<br />모든 설치요소는 관리자로 로그인하셔야 확인할 수 있습니다.</p>
-			<ol>
-				<li>
-					<strong>헤더</strong>, <strong>본문</strong>, <strong>풋터</strong>로 구성된 화면이 보인다면 <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">레이아웃</a></strong>이 정상적으로 설치된 것입니다.
-				</li>
-				<li>
-					<strong>글로벌 네비게이션</strong>과 <strong>로컬 네비게이션</strong>이 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">메뉴 모듈</a></strong>이 설치된 것입니다.
-				</li>
-				<li>
-					<strong>통합 검색 인풋</strong>이 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">통합검색 모듈</a></strong>이 설치된 것입니다.
-				</li>
-				<li>
-					<strong>로그인 인풋</strong>이 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">로그인 정보 출력 위젯</a></strong>이 설치된 것입니다.
-				</li>
-				<li>
-					<strong>이 메시지</strong>가 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">페이지 모듈</a></strong>이 설치된 것입니다.
-				</li>
-			</ol>
-			<p>페이지 모듈이 시작 모듈로 지정되어 있습니다. <a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">관리자 설정화면</a>에서 변경 가능합니다.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' 설치를 환영합니다!</h2>
+<p>XE core설치가 성공적으로 완료되었습니다.<br />이 페이지는 데모 페이지 이므로 추후 사이트 운영시 삭제 가능합니다.<br />모든 설치요소는 관리자로 로그인하셔야 확인할 수 있습니다.</p>
+<ol>
+	<li>
+		<strong>헤더</strong>, <strong>본문</strong>, <strong>풋터</strong>로 구성된 화면이 보인다면 <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">레이아웃</a></strong>이 정상적으로 설치된 것입니다.
+	</li>
+	<li>
+		<strong>글로벌 네비게이션</strong>과 <strong>로컬 네비게이션</strong>이 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">메뉴 모듈</a></strong>이 설치된 것입니다.
+	</li>
+	<li>
+		<strong>통합 검색 인풋</strong>이 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">통합검색 모듈</a></strong>이 설치된 것입니다.
+	</li>
+	<li>
+		<strong>로그인 인풋</strong>이 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">로그인 정보 출력 위젯</a></strong>이 설치된 것입니다.
+	</li>
+	<li>
+		<strong>이 메시지</strong>가 보인다면 <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">페이지 모듈</a></strong>이 설치된 것입니다.
+	</li>
+</ol>
+<p>페이지 모듈이 시작 모듈로 지정되어 있습니다. <a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">관리자 설정화면</a>에서 변경 가능합니다.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_mn.html b/modules/install/script/welcome_content/welcome_content_mn.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_mn.html
+++ b/modules/install/script/welcome_content/welcome_content_mn.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_ru.html b/modules/install/script/welcome_content/welcome_content_ru.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_ru.html
+++ b/modules/install/script/welcome_content/welcome_content_ru.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_tr.html b/modules/install/script/welcome_content/welcome_content_tr.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_tr.html
+++ b/modules/install/script/welcome_content/welcome_content_tr.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_vi.html b/modules/install/script/welcome_content/welcome_content_vi.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_vi.html
+++ b/modules/install/script/welcome_content/welcome_content_vi.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_zh-CN.html b/modules/install/script/welcome_content/welcome_content_zh-CN.html
index b88945202..1c0398c4c 100644
--- a/modules/install/script/welcome_content/welcome_content_zh-CN.html
+++ b/modules/install/script/welcome_content/welcome_content_zh-CN.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' has been successfully installed!</h1>
-			<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
-			<ol>
-				<li>
-					When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
-				</li>
-				<li>
-					When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
-				</li>
-			</ol>
-			<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' has been successfully installed!</h2>
+<p>We recommend you to delete this demo page before launching the site.<br />Please check the following list to verify whether the installation has been properly completed.<br />You can see all the components on the administration page.</p>
+<ol>
+	<li>
+		When <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">the layout</a></strong> has been successfully installed, you can see the screen containing a <strong>header</strong>, a <strong>content body</strong>, and a <strong>footer</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">Menu module</a></strong> has been successfully installed, you can see both <strong>global and local navigations</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">Integrated Search module</a></strong> has been successfully installed, you can see <strong>the search form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> has been successfully installed, you can see <strong>the login form</strong>.
+	</li>
+	<li>
+		When <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">Page module</a></strong> has been successfully installed, you see this page.
+	</li>
+</ol>
+<p>You can replace it with some other module on <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">the Settings page</a></strong>.</p>
diff --git a/modules/install/script/welcome_content/welcome_content_zh-TW.html b/modules/install/script/welcome_content/welcome_content_zh-TW.html
index e00809f42..24ecb9e46 100644
--- a/modules/install/script/welcome_content/welcome_content_zh-TW.html
+++ b/modules/install/script/welcome_content/welcome_content_zh-TW.html
@@ -1,26 +1,20 @@
-<div>
-	<div style="overflow:hidden;float:left;padding:none;margin:none;width:100%;">
-		<div style="padding:0px 0px 0px 0px !important; padding:none !important;">
-			<h1>XE core '{$version}' ������������������</h1>
-			<p>������ء�����������ߢ������������<br />����?�������������������������������<br />ʦ�η�����������̸������졣</p>
-			<ol>
-				<li>
-					�� <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">������ͪ</a></strong> ��������������ʦ��̸���������� <strong>����</strong>��<strong>Ү����</strong>� <strong>��ڭ</strong>��
-				</li>
-				<li>
-					�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">��Ӥټ��</a></strong> ��������������ʦ��̸ <strong>���Ӥ������Ӥ</strong>��
-				</li>
-				<li>
-					�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">���ټ��</a></strong> ��������������ʦ��̸ <strong>���?</strong>��
-				</li>
-				<li>
-					�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> ��������������ʦ��̸ <strong>����?</strong>��
-				</li>
-				<li>
-					�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">����ټ��</a></strong> ����������������ʦ��̸�����
-				</li>
-			</ol>
-			<p>?�ʦ�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">��������</a></strong> ������������ټ�ڡ�</p>
-		</div>
-	</div>
-</div> 
+<h2>XE core '{$version}' ������������������</h2>
+<p>������ء�����������ߢ������������<br />����?�������������������������������<br />ʦ�η�����������̸������졣</p>
+<ol>
+	<li>
+		�� <strong><a href="{getUrl('', 'module','admin', 'act', 'dispLayoutAdminContent')}" target="_blank">������ͪ</a></strong> ��������������ʦ��̸���������� <strong>����</strong>��<strong>Ү����</strong>� <strong>��ڭ</strong>��
+	</li>
+	<li>
+		�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent')}" target="_blank">��Ӥټ��</a></strong> ��������������ʦ��̸ <strong>���Ӥ������Ӥ</strong>��
+	</li>
+	<li>
+		�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent')}" target="_blank">���ټ��</a></strong> ��������������ʦ��̸ <strong>���?</strong>��
+	</li>
+	<li>
+		�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" target="_blank">Login widget</a></strong> ��������������ʦ��̸ <strong>����?</strong>��
+	</li>
+	<li>
+		�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispPageAdminContent')}" target="_blank">����ټ��</a></strong> ����������������ʦ��̸�����
+	</li>
+</ol>
+<p>?�ʦ�� <strong><a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfig')}" target="_blank">��������</a></strong> ������������ټ�ڡ�</p>
diff --git a/modules/install/tpl/admin_form.html b/modules/install/tpl/admin_form.html
new file mode 100644
index 000000000..80af0610d
--- /dev/null
+++ b/modules/install/tpl/admin_form.html
@@ -0,0 +1,33 @@
+<!--%import("js/install_admin.js")-->
+<!--#include("header.html")-->
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="install" action="./" method="post">
+			<input type="hidden" name="act" value="procInstall" />
+				<ul class="form formAdmin">
+					<li><label for="aMail">{$lang->email_address}</label><input name="email_address" type="text" class="iText" id="aMail" /></li>
+					<li><label for="aPw1">{$lang->password1}</label><input name="password" type="password" class="iText" id="aPw1" /></li>
+					<li><label for="aPw2">{$lang->password2}</label><input name="password2" type="password" class="iText" id="aPw2" /></li>
+					<li><label for="aId">{$lang->user_id}</label><input name="user_id" type="text" value="admin" class="iText" id="aId" /></li>
+					<li><label for="aNick">{$lang->nick_name}</label><input name="nick_name" type="text" class="iText" id="aNick" /></li>
+				</ul>
+				<div class="desc">
+					<p>{$lang->install_notandum}</p>
+				</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallConfigForm')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+						<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_complete}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
+<!--#include("footer.html")-->
diff --git a/modules/install/tpl/check_env.html b/modules/install/tpl/check_env.html
index 4018e7b5e..ce254e366 100644
--- a/modules/install/tpl/check_env.html
+++ b/modules/install/tpl/check_env.html
@@ -1,31 +1,28 @@
 <!--#include("header.html")-->
-
-<h2 class="xeAdmin">{$lang->install_condition_title}</h2>
-
-<table cellspacing="0" class="tableType6">
-<col width="180" /><col />
-
-<!--@foreach($checklist as $key => $val)-->
-<tr>
-    <th scope="row">{$lang->install_checklist_title[$key]}</th>
-    <td>
-        <!--@if($val)-->
-            {$lang->enable}
-        <!--@else-->
-            <span class="none">{$lang->disable}</span>
-            <br />{$lang->install_checklist_desc[$key]}
-        <!--@end-->
-    </td>
-</tr>
-<!--@end-->
-</table>
-
-<div class="buttonCenter">
-    <!--@if($install_enable)-->
-        <a href="{getUrl('','act','dispInstallSelectDB')}" class="button blue"><span>{$lang->cmd_install_next}</span></a>
-    <!--@else-->
-        <a href="{getUrl('','act',$act)}" class="button red"><span>{$lang->cmd_install_fix_checklist}</span></a>
-    <!--@end-->
-</div>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+	<span class="dummy"></span>
+	<div id="content">
+		<div class="table">
+			<table border="1" cellspacing="0">
+				<tbody>
+					<!--@foreach($checklist as $key => $val)-->
+					<tr>
+						<th scope="row">{$lang->install_checklist_title[$key]}<!--@if($key == 'php_version')--> (Ver. {$phpversion})<!--@end--></th>
+						<td><!--@if($val)-->{$lang->enable}<!--@else--><strong>{$lang->disable}</strong><br />{$lang->install_checklist_desc[$key]}<!--@end--></td>
+					</tr>
+					<!--@end-->
+				</tbody>
+			</table>
+			
+		</div>
+		<div class="ibtnArea">
+			<div class="fLeft">
+				<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('')}">{$lang->cmd_back}</a></span>
+			</div>
+			<div class="fRight">
+				<span class="ibtn icon"><span class="check"></span><!--@if($install_enable)--><a href="{getUrl('','act','dispInstallSelectDB')}">{$lang->cmd_install_next}</a><!--@else--><a href="{getUrl('','act',$act)}">{$lang->cmd_install_fix_checklist}</a><!--@end--></span>
+			</div>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/config_form.html b/modules/install/tpl/config_form.html
new file mode 100644
index 000000000..ec6615f61
--- /dev/null
+++ b/modules/install/tpl/config_form.html
@@ -0,0 +1,46 @@
+<!--%import("js/install_admin.js")-->
+<!--#include("header.html")-->
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form action="./" method="post">
+			<input type="hidden" name="act" value="procConfigSetting" />
+				<ul class="form formXe">
+					<li>
+						<input name="use_rewrite" value="Y" <!--@if(function_exists('apache_get_modules')&&in_array('mod_rewrite',apache_get_modules()))-->checked="checked"<!--@end--> type="checkbox" class="iCheck" id="rewrite" /> <label for="rewrite">{$lang->use_rewrite}</label>
+						<p>{$lang->about_rewrite}</p>
+					</li>
+					<li>
+						<div class="select open" style="width:540px;">
+							<span class="ctrl"><span class="arrow"></span></span>
+							<div class="myValue"></div>
+							<ul class="iList">
+								<!--@foreach($time_zone as $key => $val)-->
+								<li><input name="time_zone" id="{$key}" class="option" type="radio" value="{$key}" <!--@if($key==date('O'))-->checked="checked"<!--@end--> /><label for="{$key}">{$val}</label></li>
+								<!--@end-->
+							</ul>
+						</div>
+						<p>{$lang->about_time_zone}</p>
+					</li>
+				</ul>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="#" onclick="document.backForm.submit();">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+						<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+			<form name="backForm" method="post" action="./">
+			<input type="hidden" name="module" value="{$module}" />
+			<input type="hidden" name="act" value="dispInstallDBForm" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+			</form>
+		</div>
+	</div>
+<!--#include("footer.html")-->
diff --git a/modules/install/tpl/css/install.css b/modules/install/tpl/css/install.css
index e9010a40f..985ff1eec 100644
--- a/modules/install/tpl/css/install.css
+++ b/modules/install/tpl/css/install.css
@@ -1,48 +1,116 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-/* default.css - Type Selector Definition */
-body { background:#4d4d4d url(../images/installBg.gif) repeat-x;}
-
-/* Content */
-#box { position:relative; left:50%; margin:120px 0 0 -380px; width:750px;}
-#box h1 { margin:0; }
-
-#content { position:relative; padding:25px 20px 20px 20px; overflow:hidden; background:#ffffff;}
-#content h2 { font-size:1em; padding-left:.5em; margin:0 0 1em 0;}
-#content blockquote { padding:10px; margin:0; border:1px solid #c9c9c9; margin-bottom:10px; color:#696969; line-height:20px;}
-#agreement { border:1px solid #c9c9c9; height:15em; padding:1.2em; overflow:auto; color:#696969; line-height:1.25em; margin-bottom:20px;}
-
-.iePngFix { display:block; }
-
-div.buttonCenter { text-align:center; }
-
-.tableType6 { border:2px solid #c1c0bd; border-left:none; border-right:none; width:100%; margin-bottom:20px;}
-#content .tableType6 th { border-top:1px solid #fbfbfb; border-bottom:1px solid #e4e4e4; background:#f5f5f5; padding:10px 10px 10px 2em; font-weight:normal; text-align:left; color:#606060;}
-#content .tableType6 td { border-bottom:1px solid #ededed; padding:10px 10px 7px 10px; color:#7b7972; line-height:1.25em;}
-#content .tableType6 input,
-#content .tableType6 textarea,
-#content .tableType6 select { vertical-align:middle;}
-#content .tableType6 td .w100 { width:100%; display:block;}
-#content .tableType6 td .checkbox { margin:-3px;}
-#content .tableType6 td p { line-height:1.4em;}
-#content .tableType6 .borderBottomNone { border-bottom:none;}
-#content .tableType6 .none { color:#c95b53;}
-
-#content .tableType7 { border:2px solid #c1c0bd; border-left:none; border-right:none; width:100%; margin-bottom:20px;}
-#content .tableType7 th { border-bottom:1px solid #e4e4e4; background:#e8e8e8; padding:10px 10px 10px 2em; font-weight:normal; text-align:left; color:#606060;}
-#content .tableType7 th.second { background:#f5f5f5;}
-#content .tableType7 td { border-bottom:1px solid #ededed; padding:10px 10px 7px 10px; color:#7b7972; line-height:1.25em; font-size:.9em;}
-#content .tableType7 .hr { border-bottom:1px solid #b8b8b8;}
-#content .tableType7 input,
-#content .tableType7 textarea,
-#content .tableType7 select { vertical-align:middle;}
-#content .tableType7 select { width:100%; }
-#content .tableType7 select option { letter-spacing:-1px; }
-#content .tableType7 td .w100 { width:100%; display:block;}
-#content .tableType7 td .checkbox { margin:-3px;}
-#content .tableType7 td p { line-height:1.4em; margin:5px 0 0 0; padding:0;}
-#content .tableType7 .borderBottomNone { border-bottom:none;}
-#content .tableType7 .none { color:#c95b53;}
-
-a.manual { background:url("../images/iconManual.gif") no-repeat left top; vertical-align:middle; display:inline-block; width:12px; height:13px; overflow:hidden; line-height:0; font-size:1px; text-decoration:none;}
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+/* Element Reset */
+html, body{margin:0}
+body, input, textarea, select, table, button {font-family:Tahoma, Geneva, sans-serif;font-size:12px}
+img, fieldset {border:0}
+form, fieldset {margin:0;padding:0}
+em, address {font-style:normal}
+button{margin:0;padding:0;overflow:visible;cursor:pointer}
+a {text-decoration:none}
+a:hover, a:active, a:focus {text-decoration:underline}
+/* Common Class */
+.iText{border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
+.iCheck, .iRadio{width:13px;height:13px;margin:0;padding:0;vertical-align:middle}
+.hide{position:absolute;left:0;top:0;width:1px;height:1px;font-size:0;line-height:0;visibility:hidden}
+/* Layout */
+html{height:100%;background:url(../img/bgHtml.gif) repeat-x 0 0}
+#xei{width:800px;margin:0 auto;padding:120px 0 0 0}
+#xei #header{position:relative;background:#444;margin:0 0 1px 0;padding:10px 20px;color:#fff}
+#xei #header h1{margin:0}
+#xei #header em{position:absolute;top:10px;right:20px;font-weight:bold;font-size:14px;color:#eee}
+#xei #header em strong{font-size:20px;color:#F60}
+#xei #body{width:580px;padding:0 0 0 220px;position:relative;overflow:hidden;*zoom:1}
+#xei #body:after{content:"";display:block;clear:both}
+#xei #body .dummy{position:absolute;left:0;top:287px;display:block;width:219px;height:1000px;background:#484848;*zoom:1}
+#xei #progress{position:absolute;left:0;top:0;width:219px}
+#xei #progress ul{list-style:none;margin:0;padding:0}
+#xei #progress li{position:relative;margin:0 0 1px 0;vertical-align:top;line-height:40px;color:#999;text-indent:30px;background-color:#555;background-image:url(../img/icoStatus.gif);background-repeat:no-repeat;background-position:10px 0;*zoom:1}
+#xei #progress li.done{background-position:10px -40px}
+#xei #progress li.active{background-color:#666;background-position:10px -80px;font-weight:bold;color:#fff;margin-right:-1px}
+#xei #content{position:relative;width:580px;min-height:328px;_height:328px;padding:20px 0 60px 0;background:#666}
+/* Button */
+.ibtn,
+.ibtn *{position:relative;margin:0;padding:0;display:inline-block;height:30px;line-height:30px;text-decoration:none !important;border:0;font-size:12px;font-family:Tahoma, Sans-serif;white-space:nowrap;background:url(../img/btnPack.gif) no-repeat;vertical-align:top;overflow:visible;color:#eee}
+.ibtn {margin-right:4px;background-position:left -30px}
+.ibtn *{left:4px;cursor:pointer;_cursor:hand;padding:0 10px 0 6px;background-position:right -30px}
+.ibtn *:hover,
+.ibtn *:active,
+.ibtn *:focus{color:#ff0}
+.ibtn.strong *{font-weight:bold !important}
+.ibtn.icon *{padding-left:20px}
+.ibtn.icon span{width:20px;margin-right:-18px;padding:0 !important}
+.ibtn .check{background-position:4px -146px}
+.ibtn .back{background-position:-14px -146px}
+.ibtn .monitor{background-position:-37px -147px}
+/* Button Area */
+.ibtnArea{position:absolute;bottom:0;right:0;width:540px;margin:0;padding:15px 20px;text-align:center;*zoom:1;color:#fff;border-top:1px solid #444;background:#555}
+.ibtnArea:after{content:"";display:block;clear:both}
+.ibtnArea .fLeft{float:left}
+.ibtnArea .fRight{float:right}
+.ibtnArea label{font-weight:bold}
+.ibtnArea select{background:#666;color:#fff}
+/* table */
+.table{margin:0 20px 20px 20px}
+.table table{width:100%;border:0;border-top:1px solid #484848}
+.table caption{padding:8px 0;font-weight:bold;text-align:left;color:#fff}
+.table th,
+.table td{border:0;padding:8px 15px;vertical-align:top;text-align:left}
+.table th{color:#eee}
+.table td{color:#eee}
+.table td strong {color:#f60}
+.table thead th{border-bottom:1px solid #484848;background:#f8f8f8}
+.table tbody th{border-bottom:1px solid #484848;background:#555;white-space:nowrap}
+.table tfoot th{border-bottom:1px solid #484848}
+.table tbody td{border-bottom:1px solid #484848}
+.table tfoot td{border-bottom:1px solid #484848;font-weight:bold;color:#333}
+/* Select */
+.select{position:relative;line-height:normal;display:inline-block;*display:inline;vertical-align:middle;background:#555;text-align:left;*zoom:1}
+.select *{margin:0;padding:0;cursor:pointer;font-size:12px;font-family:Tahoma, Sans-serif}
+.select .myValue{position:relative;z-index:2;left:0;top:0;border:1px solid #999;color:#eee;line-height:19px;_line-height:normal;text-align:left;overflow:visible;background:transparent}
+.select .myValue.selected{font-weight:bold}
+.select.open .myValue,
+.select .myValue.outLine{border:1px solid #ccc}
+.select button.myValue{height:21px;width:100%;text-indent:5px;*text-indent:0;*padding-left:5px}
+.select div.myValue{height:19px;text-indent:8px}
+.select .ctrl{position:absolute;top:0;right:0;width:18px;height:19px;border:1px solid #999;border-left:1px solid #999;background:#444}
+.select .arrow{position:absolute;width:0;height:0;top:9px;right:6px;line-height:0;font-size:0;border-top:3px solid #999;border-left:3px solid #444;border-right:3px solid #444}
+.select ul{position:absolute;top:20px;left:0;width:100%;list-style:none;border:0;border-top:1px solid #bababa;border-bottom:1px solid #bababa;background:#fff;overflow:auto;height:200px;}
+.select ul.aList{display:none}
+.select.open ul.aList{display:block}
+.select ul.iList{left:-2000%}
+.select.open ul.iList{left:0}
+.select li{position:relative;overflow:hidden;white-space:nowrap;height:18px;margin:0 !important;border-left:1px solid #bababa;border-right:1px solid #bababa}
+.select li input.option{position:absolute;width:100%;height:20px;line-height:20px}
+.select li label{position:absolute;left:0;top:0;width:100%;text-indent:8px;*text-indent:6px;height:18px;line-height:18px;color:#eee;background:#555;font-weight:normal !important}
+.select li a{display:block;text-indent:8px;*text-indent:6px;height:18px;line-height:18px;color:#eee;background:#555;text-decoration:none !important}
+.select li.hover *{background:#444;color:#fff}
+.selectGo{border:1px solid #bababa;height:21px;width:28px;padding:0;*margin:-1px 0 -1px 4px;overflow:visible;background:#eee;vertical-align:middle;cursor:pointer;font:bold 11px Tahoma;line-height:19px;_line-height:normal;color:#767676}
+/* Content */
+.h2{font-size:18px;margin:0 20px 15px 20px;color:#ff9}
+.item{position:relative}
+.iLabel{display:block;position:static;top:4px;left:5px;color:#eee}
+.iText{position:relative;padding:3px 4px;border:1px solid #444;border-right-color:#555;border-bottom-color:#555;background:transparent;color:#fff}
+.form{padding:0;margin:0 20px 20px 20px;list-style:none}
+.form li{margin:0 0 10px 0}
+.form.formFtp label,
+.form.formDbInfo label,
+.form.formAdmin label{display:block;margin:0 0 2px 0;color:#eee;font-weight:bold}
+.form.formDbSelect label,
+.form.formXe label{margin:0 0 2px 0;color:#eee;font-weight:bold}
+.form .iText{background:#555;padding:5px 10px;width:518px}
+.form select{background:#555;color:#fff}
+.form p{color:#ddd;margin:3px 0 15px 17px}
+.form strong{color:#f60}
+.form em{font-style:normal;color:#ffc}
+.form a{color:#fff;text-decoration:underline}
+.desc{padding:10px 20px;margin:0 20px 20px 20px;background:#555;color:#eee}
+.desc ul{margin:0 0 0 20px;padding:0}
+.desc strong{color:#F60}
+.agreement{color:#eee}
+.agreement label{font-weight:bold;vertical-align:middle;cursor:pointer}
+.agreement a{color:#6CF;text-decoration:underline;vertical-align:middle}
+.agreement em{color:#f60}
+.agreement p{line-height:1.5}
+/* Waiting for server response */
+.wfsr{display:none;position:absolute;position:fixed;left:0;top:0;z-index:100; border:1px solid #EAE9DC;background:#FFFDEF url(../../common/img/msg.update.png) no-repeat 1em .5em;margin:1em;padding:1em 1em 1em 55px;border-radius:5px;line-height:1.4;font-size:12px}
diff --git a/modules/install/tpl/filter/admin.xml b/modules/install/tpl/filter/admin.xml
new file mode 100644
index 000000000..077d98cba
--- /dev/null
+++ b/modules/install/tpl/filter/admin.xml
@@ -0,0 +1,22 @@
+<filter name="install" module="install" act="procInstall">
+    <form>
+        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
+        <node target="password1" required="true" minlength="1" maxlength="20" />
+        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
+        <node target="user_name" required="true" minlength="2" maxlength="20" />
+        <node target="nick_name" required="true" minlength="2" maxlength="20" />
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
+    </form>
+    <parameter>
+        <param name="user_id" target="user_id" />
+        <param name="password" target="password1" />
+        <param name="user_name" target="user_name" />
+        <param name="nick_name" target="nick_name" />
+        <param name="email_address" target="email_address" />
+    </parameter>
+    <response callback_func="completeInstalled">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="redirect_url" />
+    </response>
+</filter>
diff --git a/modules/install/tpl/filter/config.xml b/modules/install/tpl/filter/config.xml
new file mode 100644
index 000000000..54ec1139d
--- /dev/null
+++ b/modules/install/tpl/filter/config.xml
@@ -0,0 +1,13 @@
+<filter name="config" module="install" act="procConfigSetting">
+    <form>
+        <node target="time_zone" required="true" />
+    </form>
+    <parameter>
+        <param name="use_rewrite" target="use_rewrite" />
+        <param name="time_zone" target="time_zone" />
+    </parameter>
+    <response callback_func="completeConfigSetting">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/install/tpl/filter/cubrid.xml b/modules/install/tpl/filter/cubrid.xml
index 60d044457..d4d50003c 100644
--- a/modules/install/tpl/filter/cubrid.xml
+++ b/modules/install/tpl/filter/cubrid.xml
@@ -1,4 +1,4 @@
-<filter name="install" module="install" act="procInstall">
+<filter name="dbSetting" module="install" act="procDBSetting">
     <form>
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
@@ -7,12 +7,6 @@
         <node target="db_password" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
         <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
-        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
-        <node target="password1" required="true" minlength="1" maxlength="20" />
-        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
-        <node target="user_name" required="true" minlength="2" maxlength="20" />
-        <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />
@@ -22,17 +16,9 @@
         <param name="db_password" target="db_password" />
         <param name="db_database" target="db_database" />
         <param name="db_table_prefix" target="db_table_prefix" />
-        <param name="user_id" target="user_id" />
-        <param name="password" target="password1" />
-        <param name="user_name" target="user_name" />
-        <param name="nick_name" target="nick_name" />
-        <param name="email_address" target="email_address" />
-        <param name="use_rewrite" target="use_rewrite" />
-        <param name="time_zone" target="time_zone" />
     </parameter>
-    <response callback_func="completeInstalled">
+    <response callback_func="completeDBSetting">
         <tag name="error" />
         <tag name="message" />
-        <tag name="redirect_url" />
     </response>
 </filter>
diff --git a/modules/install/tpl/filter/firebird.xml b/modules/install/tpl/filter/firebird.xml
index 60d044457..d4d50003c 100644
--- a/modules/install/tpl/filter/firebird.xml
+++ b/modules/install/tpl/filter/firebird.xml
@@ -1,4 +1,4 @@
-<filter name="install" module="install" act="procInstall">
+<filter name="dbSetting" module="install" act="procDBSetting">
     <form>
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
@@ -7,12 +7,6 @@
         <node target="db_password" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
         <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
-        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
-        <node target="password1" required="true" minlength="1" maxlength="20" />
-        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
-        <node target="user_name" required="true" minlength="2" maxlength="20" />
-        <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />
@@ -22,17 +16,9 @@
         <param name="db_password" target="db_password" />
         <param name="db_database" target="db_database" />
         <param name="db_table_prefix" target="db_table_prefix" />
-        <param name="user_id" target="user_id" />
-        <param name="password" target="password1" />
-        <param name="user_name" target="user_name" />
-        <param name="nick_name" target="nick_name" />
-        <param name="email_address" target="email_address" />
-        <param name="use_rewrite" target="use_rewrite" />
-        <param name="time_zone" target="time_zone" />
     </parameter>
-    <response callback_func="completeInstalled">
+    <response callback_func="completeDBSetting">
         <tag name="error" />
         <tag name="message" />
-        <tag name="redirect_url" />
     </response>
 </filter>
diff --git a/modules/install/tpl/filter/introduce.xml b/modules/install/tpl/filter/introduce.xml
new file mode 100644
index 000000000..ee9c9843d
--- /dev/null
+++ b/modules/install/tpl/filter/introduce.xml
@@ -0,0 +1,10 @@
+<filter name="introduce" module="install" act="procInstallAgreement">
+    <form>
+        <node target="lgpl_agree" required="true" />
+        <node target="enviroment_gather" required="false" />
+    </form>
+    <response callback_func="completeAgreement">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/install/tpl/filter/mssql.xml b/modules/install/tpl/filter/mssql.xml
index b79b23c0b..082438ac2 100644
--- a/modules/install/tpl/filter/mssql.xml
+++ b/modules/install/tpl/filter/mssql.xml
@@ -1,16 +1,10 @@
-<filter name="install" module="install" act="procInstall">
+<filter name="dbSetting" module="install" act="procDBSetting">
     <form>
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
         <node target="db_port" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
         <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
-        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
-        <node target="password1" required="true" minlength="1" maxlength="20" />
-        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
-        <node target="user_name" required="true" minlength="2" maxlength="20" />
-        <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />
@@ -20,17 +14,9 @@
         <param name="db_password" target="db_password" />
         <param name="db_database" target="db_database" />
         <param name="db_table_prefix" target="db_table_prefix" />
-        <param name="user_id" target="user_id" />
-        <param name="password" target="password1" />
-        <param name="user_name" target="user_name" />
-        <param name="nick_name" target="nick_name" />
-        <param name="email_address" target="email_address" />
-        <param name="use_rewrite" target="use_rewrite" />
-        <param name="time_zone" target="time_zone" />
     </parameter>
-    <response callback_func="completeInstalled">
+    <response callback_func="completeDBSetting">
         <tag name="error" />
         <tag name="message" />
-        <tag name="redirect_url" />
     </response>
 </filter>
diff --git a/modules/install/tpl/filter/mysql.xml b/modules/install/tpl/filter/mysql.xml
index 60d044457..d4d50003c 100644
--- a/modules/install/tpl/filter/mysql.xml
+++ b/modules/install/tpl/filter/mysql.xml
@@ -1,4 +1,4 @@
-<filter name="install" module="install" act="procInstall">
+<filter name="dbSetting" module="install" act="procDBSetting">
     <form>
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
@@ -7,12 +7,6 @@
         <node target="db_password" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
         <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
-        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
-        <node target="password1" required="true" minlength="1" maxlength="20" />
-        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
-        <node target="user_name" required="true" minlength="2" maxlength="20" />
-        <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />
@@ -22,17 +16,9 @@
         <param name="db_password" target="db_password" />
         <param name="db_database" target="db_database" />
         <param name="db_table_prefix" target="db_table_prefix" />
-        <param name="user_id" target="user_id" />
-        <param name="password" target="password1" />
-        <param name="user_name" target="user_name" />
-        <param name="nick_name" target="nick_name" />
-        <param name="email_address" target="email_address" />
-        <param name="use_rewrite" target="use_rewrite" />
-        <param name="time_zone" target="time_zone" />
     </parameter>
-    <response callback_func="completeInstalled">
+    <response callback_func="completeDBSetting">
         <tag name="error" />
         <tag name="message" />
-        <tag name="redirect_url" />
     </response>
 </filter>
diff --git a/modules/install/tpl/filter/postgresql.xml b/modules/install/tpl/filter/postgresql.xml
index 402d8d30a..69e98a9fb 100644
--- a/modules/install/tpl/filter/postgresql.xml
+++ b/modules/install/tpl/filter/postgresql.xml
@@ -1,4 +1,4 @@
-<filter name="install" module="install" act="procInstall">
+<filter name="dbSetting" module="install" act="procDBSetting">
     <form>
         <node target="db_type" required="true" />
         <node target="db_hostname" required="true" minlength="1" maxlength="250" />
@@ -6,12 +6,6 @@
         <node target="db_userid" required="true" minlength="1" maxlength="250" />
         <node target="db_database" required="true" minlength="1" maxlength="250" />
         <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
-        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
-        <node target="password1" required="true" minlength="1" maxlength="20" />
-        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
-        <node target="user_name" required="true" minlength="2" maxlength="20" />
-        <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />
@@ -21,17 +15,9 @@
         <param name="db_password" target="db_password" />
         <param name="db_database" target="db_database" />
         <param name="db_table_prefix" target="db_table_prefix" />
-        <param name="user_id" target="user_id" />
-        <param name="password" target="password1" />
-        <param name="user_name" target="user_name" />
-        <param name="nick_name" target="nick_name" />
-        <param name="email_address" target="email_address" />
-        <param name="use_rewrite" target="use_rewrite" />
-        <param name="time_zone" target="time_zone" />
     </parameter>
-    <response callback_func="completeInstalled">
+    <response callback_func="completeDBSetting">
         <tag name="error" />
         <tag name="message" />
-        <tag name="redirect_url" />
     </response>
 </filter>
diff --git a/modules/install/tpl/filter/sqlite2.xml b/modules/install/tpl/filter/sqlite2.xml
index 98ed92367..fb61e6538 100644
--- a/modules/install/tpl/filter/sqlite2.xml
+++ b/modules/install/tpl/filter/sqlite2.xml
@@ -1,30 +1,16 @@
-<filter name="install" module="install" act="procInstall">
+<filter name="dbSetting" module="install" act="procDBSetting">
     <form>
         <node target="db_type" required="true" />
         <node target="db_database_file" required="true" minlength="1" maxlength="250" />
         <node target="db_table_prefix" required="true" minlength="2" maxlength="20" filter="alpha" />
-        <node target="user_id" required="true" minlength="2" maxlength="20" filter="userid" />
-        <node target="password1" required="true" minlength="1" maxlength="20" />
-        <node target="password2" required="true" equalto="password1" minlength="1" maxlegnth="20" />
-        <node target="user_name" required="true" minlength="2" maxlength="20" />
-        <node target="nick_name" required="true" minlength="2" maxlength="20" />
-        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
     </form>
     <parameter>
         <param name="db_type" target="db_type" />
         <param name="db_database" target="db_database_file" />
         <param name="db_table_prefix" target="db_table_prefix" />
-        <param name="user_id" target="user_id" />
-        <param name="password" target="password1" />
-        <param name="user_name" target="user_name" />
-        <param name="nick_name" target="nick_name" />
-        <param name="email_address" target="email_address" />
-        <param name="use_rewrite" target="use_rewrite" />
-        <param name="time_zone" target="time_zone" />
     </parameter>
-    <response callback_func="completeInstalled">
+    <response callback_func="completeDBSetting">
         <tag name="error" />
         <tag name="message" />
-        <tag name="redirect_url" />
     </response>
 </filter>
diff --git a/modules/install/tpl/footer.html b/modules/install/tpl/footer.html
index fa75930e5..07f966df1 100644
--- a/modules/install/tpl/footer.html
+++ b/modules/install/tpl/footer.html
@@ -1,3 +1,3 @@
-    </div>
-    <img src="./images/installBoxBottom.png" alt="" width="750" height="10" class="iePngFix" />
 </div>
+<script type="text/javascript" src="js/jquery-1.5.2.min.js"></script>
+<script type="text/javascript" src="js/install.js"></script>
diff --git a/modules/install/tpl/form.cubrid.html b/modules/install/tpl/form.cubrid.html
index 2743b70e1..fe763051e 100644
--- a/modules/install/tpl/form.cubrid.html
+++ b/modules/install/tpl/form.cubrid.html
@@ -1,49 +1,35 @@
-<!--%import("filter/cubrid.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-    <h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="127.0.0.1" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="33000" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="cubrid" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procCubridDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="127.0.0.1" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="33000" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.firebird.html b/modules/install/tpl/form.firebird.html
index 66889cf70..fcc532fb1 100644
--- a/modules/install/tpl/form.firebird.html
+++ b/modules/install/tpl/form.firebird.html
@@ -1,51 +1,35 @@
-<!--%import("filter/firebird.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="3050" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="firebird" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procFirebirdDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.install.html b/modules/install/tpl/form.install.html
index 3692128b6..bd86c2cbc 100644
--- a/modules/install/tpl/form.install.html
+++ b/modules/install/tpl/form.install.html
@@ -2,27 +2,27 @@
     <tr>
         <th rowspan="6" scope="row" class="hr"><label for="radio2">{$lang->admin_title}</label></th>
         <th class="second" scope="row"><label for="textfield21">{$lang->user_id}</label></th>
-        <td><input type="text" id="textfield21" name="user_id" value="admin" class="inputTypeText" /></td>
+        <td><input type="text" id="textfield21" name="user_id" value="admin"  /></td>
     </tr>
     <tr>
         <th class="second" scope="row"><label for="textfield22">{$lang->password1}</label></th>
-        <td><input id="textfield22" type="password" name="password1" class="inputTypeText" /></td>
+        <td><input id="textfield22" type="password" name="password1"  /></td>
     </tr>
     <tr>
         <th class="second" scope="row"><label for="textfield23">{$lang->password2}</label></th>
-        <td><input id="textfield23" type="password" name="password2" class="inputTypeText" /></td>
+        <td><input id="textfield23" type="password" name="password2"  /></td>
     </tr>
     <tr>
         <th class="second" scope="row"><label for="textfield24">{$lang->user_name}</label></th>
-        <td><input id="textfield24" type="text" name="user_name" class="inputTypeText" /></td>
+        <td><input id="textfield24" type="text" name="user_name"  /></td>
     </tr>
     <tr>
         <th class="second" scope="row"><label for="textfield25">{$lang->nick_name}</label></th>
-        <td><input id="textfield25" type="text" name="nick_name" class="inputTypeText" /></td>
+        <td><input id="textfield25" type="text" name="nick_name"  /></td>
     </tr>
     <tr>
         <th class="second hr" scope="row"><label for="textfield26">{$lang->email_address}</label></th>
-        <td class="hr"><input id="textfield26" type="text" name="email_address" class="inputTypeText" /></td>
+        <td class="hr"><input id="textfield26" type="text" name="email_address"  /></td>
     </tr>
 
     <!-- 기타 정보 -->
diff --git a/modules/install/tpl/form.mssql.html b/modules/install/tpl/form.mssql.html
index 089cae04f..ca3a802bf 100644
--- a/modules/install/tpl/form.mssql.html
+++ b/modules/install/tpl/form.mssql.html
@@ -1,51 +1,35 @@
-<!--%import("filter/mssql.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="mssql" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procMssqlDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.mysql.html b/modules/install/tpl/form.mysql.html
index 3a3c8187b..ea054192d 100644
--- a/modules/install/tpl/form.mysql.html
+++ b/modules/install/tpl/form.mysql.html
@@ -1,51 +1,35 @@
-<!--%import("filter/mysql.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="3306" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="mysql" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procMysqlDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.mysql_innodb.html b/modules/install/tpl/form.mysql_innodb.html
index 3a3c8187b..ea054192d 100644
--- a/modules/install/tpl/form.mysql_innodb.html
+++ b/modules/install/tpl/form.mysql_innodb.html
@@ -1,51 +1,35 @@
-<!--%import("filter/mysql.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="3306" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="mysql" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procMysqlDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.mysqli.html b/modules/install/tpl/form.mysqli.html
index 3a3c8187b..ea054192d 100644
--- a/modules/install/tpl/form.mysqli.html
+++ b/modules/install/tpl/form.mysqli.html
@@ -1,51 +1,35 @@
-<!--%import("filter/mysql.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="3306" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="mysql" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procMysqlDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.postgresql.html b/modules/install/tpl/form.postgresql.html
index c60a9606e..e439dc22e 100644
--- a/modules/install/tpl/form.postgresql.html
+++ b/modules/install/tpl/form.postgresql.html
@@ -1,51 +1,35 @@
-<!--%import("filter/postgresql.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="6" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_hostname}</label></th>
-        <td><input type="text" name="db_hostname" value="localhost" class="inputTypeText w100" id="textfield11" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield12">{$lang->db_port}</label></th>
-        <td><input type="text" name="db_port" value="5432" class="inputTypeText w100" id="textfield12" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield13">{$lang->db_userid}</label></th>
-        <td><input type="text" name="db_userid" value="" class="inputTypeText w100" id="textfield13" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield14">{$lang->db_password}</label></th>
-        <td><input type="password" name="db_password" value="" class="inputTypeText w100" id="textfield14" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield15">{$lang->db_database}</label></th>
-        <td><input type="text" name="db_database" value="" class="inputTypeText w100" id="textfield15" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield16">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="postgresql" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procPostgresqlDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbHostName">{$lang->db_hostname}</label><input name="db_hostname" value="localhost" type="text" class="iText" id="dbHostName" /></li>
+					<li><label for="dbPort">{$lang->db_port}</label><input name="db_port" value="3306" type="text" class="iText" id="dbPort" /></li>
+					<li><label for="dbId">{$lang->db_userid}</label><input name="db_userid" type="text" class="iText" id="dbId" /></li>
+					<li><label for="dbPw">{$lang->db_password}</label><input name="db_password" type="password" class="iText" id="dbPw" /></li>
+					<li><label for="dbName">{$lang->db_database}</label><input name="db_database" type="text" class="iText" id="dbName" /></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.sqlite2.html b/modules/install/tpl/form.sqlite2.html
index 7492dfc09..3bda3543b 100644
--- a/modules/install/tpl/form.sqlite2.html
+++ b/modules/install/tpl/form.sqlite2.html
@@ -1,38 +1,31 @@
-<!--%import("filter/sqlite2.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-    <h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="2" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_database_file}</label></th>
-        <td>
-            <input type="text" name="db_database_file" value="./files/xe.sqlite" class="inputTypeText w100" id="textfield11" />
-            <p>{$lang->about_database_file}</p>
-        </td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield12">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="sqlite" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procSqliteDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbDatabaseFile">{$lang->db_database_file}</label><input name="db_database" value="./files/xe.sqlite" type="text" class="iText" id="dbDatabaseFile" /><p>{$lang->about_database_file}</p></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/form.sqlite3_pdo.html b/modules/install/tpl/form.sqlite3_pdo.html
index 08f43593a..3bda3543b 100644
--- a/modules/install/tpl/form.sqlite3_pdo.html
+++ b/modules/install/tpl/form.sqlite3_pdo.html
@@ -1,38 +1,31 @@
-<!--%import("filter/sqlite2.xml")-->
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, install)">
-<input type="hidden" name="db_type" value="{$db_type}" />
-
-<h2 class="xeAdmin">{$lang->form_title}</h2>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <tr>
-        <th rowspan="2" class="hr" scope="row">{$db_type}</th>
-        <th class="second" scope="row"><label for="textfield11">{$lang->db_database_file}</label></th>
-        <td>
-            <input type="text" name="db_database_file" value="./files/xe.sqlite" class="inputTypeText w100" id="textfield11" />
-            <p>{$lang->about_database_file}</p>
-        </td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row"><label for="textfield12">{$lang->db_table_prefix}</label></th>
-        <td class="hr"><input type="text" name="db_table_prefix" value="xe" class="inputTypeText w100" id="textfield16" /></td>
-    </tr>
-
-    <!--#include("form.install.html")-->
-
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+				<p>{$XE_VALIDATOR_MESSAGE}</p>
+			</div>
+			<form rule="sqlite" action="./" method="post">
+			<input type="hidden" value="{getUrl('', 'act', $act, 'db_type', $db_type)}" name="error_return_url">
+			<input type="hidden" name="act" value="procSqliteDBSetting" />
+			<input type="hidden" name="db_type" value="{$db_type}" />
+				<h2 class="h2">{$db_type}</h2>
+				<ul class="form formDbInfo">
+					<li><label for="dbDatabaseFile">{$lang->db_database_file}</label><input name="db_database" value="./files/xe.sqlite" type="text" class="iText" id="dbDatabaseFile" /><p>{$lang->about_database_file}</p></li>
+					<li><label for="dbPrefix">{$lang->db_table_prefix}</label><input name="db_table_prefix" type="text" class="iText" id="dbPrefix" value="xe" /></li>
+				</ul>
+				<div class="desc">{$lang->db_info_desc}</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallSelectDB')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+							<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/ftp.html b/modules/install/tpl/ftp.html
index b25cb2519..cc8250791 100644
--- a/modules/install/tpl/ftp.html
+++ b/modules/install/tpl/ftp.html
@@ -1,56 +1,42 @@
 <!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
 
-<form action="./" method="post" onsubmit="return doInstallFTPInfo(this);" id="ftp_form">
-
-<h2 class="xeAdmin">{$lang->ftp_form_title}</h2>
-
-<blockquote>{$lang->msg_safe_mode_ftp_needed}</blockquote>
-
-    <table cellspacing="0" class="tableType7">
-    <col width="100" />
-    <col width="160" />
-    <col />
-
-    <!-- FTP 정보 -->
-    <tr>
-        <th rowspan="6" scope="row" class="hr"><label for="radio2">{$lang->ftp}</label></th>
-        <th class="second" scope="row"><label for="textfield20">{$lang->ftp_host}</label></th>
-        <td><input type="text" id="textfield20" name="ftp_host" value="127.0.0.1" class="inputTypeText" /></td>
-    </tr>
-	<tr>
-        <th class="second" scope="row"><label for="textfield21">{$lang->user_id}</label></th>
-        <td><input type="text" id="textfield21" name="ftp_user" value="" class="inputTypeText" /></td>
-	</tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield22">{$lang->password}</label></th>
-        <td><input id="textfield22" type="password" name="ftp_password" class="inputTypeText" /></td>
-    </tr>
-    <tr>
-        <th class="second" scope="row"><label for="textfield24">{$lang->ftp_port}</label></th>
-        <td><input id="textfield24" type="text" name="ftp_port" value="21" class="inputTypeText" /></td>
-    </tr>
-    <tr>
-        <th class="second hr" scope="row" rowspan="2"><div>{$lang->msg_ftp_installed_ftp_realpath}<br /><br/>{$lang->msg_ftp_installed_realpath}:<br/> {_XE_PATH_}</div></th>
-        <td>
-            <input type="text" name="ftp_root_path" value="{$ftp_info->ftp_root_path}" class="inputTypeText w400" /> 
-        </td>
-    </tr>
-    <tr id="ftplist">
-        <td class="hr">
-            <div>
-					<span class="button blue strong"><input type="button" onclick="getFTPList(); return false;" value="{$lang->ftp_get_list}"></span>
-            </div>
-        </td>
-    </tr>
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button green"><input type="button" value="{$lang->cmd_check_ftp_connect}" onclick="doCheckFTPInfo(); return false;"/></span>
-        <span class="button blue"><input type="submit" value="{$lang->cmd_ignore}" /></span>
-        <span class="button red"><input type="submit" value="{$lang->cmd_registration}" /></span>
-    </div>
-
-</form>
-
+		<div id="content">
+			<form action="./" method="post" onsubmit="return doInstallFTPInfo(this);" id="ftp_form">
+				<ul class="form formFtp">
+					<li><label for="ftphost">{$lang->ftp_host}</label><input name="ftp_host" value="10.25.80.77" type="text" id="ftphost" class="iText" /></li>
+					<li><label for="ftpid">{$lang->user_id}</label><input name="ftp_user" type="text" id="ftpid" class="iText" /></li>
+					<li><label for="ftppw">{$lang->password}</label><input name="ftp_password" type="password" id="ftppw" class="iText" /></li>
+					<li><label for="ftpport">{$lang->ftp_port}</label><input name="ftp_port" type="text" id="ftpport" class="iText" /></li>
+					<li><label for="ftppath">{$lang->msg_ftp_installed_ftp_realpath}</label><input name="ftp_root_path" value="{$ftp_info->ftp_root_path}" type="text" id="ftppath" class="iText" />
+					<div class="desc" style="margin:1em 0; position:relative;"><p style="margin:1em 0;">{$lang->msg_ftp_installed_realpath}:<br/> {_XE_PATH_}</p>
+					<span class="ibtn" style="position:absolute; top:1em; right:1em;"><button type="button" onclick="getFTPList(); return false;">{$lang->ftp_get_list}</button></span>
+					<ul id="ftplist">
+					</ul>
+					</div></li>
+				</ul>
+				<div class="desc">
+					<p>FTP 정보를 등록하는 이유.</p>
+					<ul>
+						<li>{$lang->msg_safe_mode_ftp_needed}</li>
+						<li>{$lang->msg_safe_mode_ftp_needed2}</li>
+					</ul>
+					<p>{$lang->msg_safe_mode_ftp_config}</p>
+				</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallCheckEnv')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+						<span class="ibtn"><input name="" type="submit" value="{$lang->cmd_pass_step}" /></span> 
+						<span class="ibtn icon"><span class="monitor"></span> <button type="button" onclick="doCheckFTPInfo(); return false;">{$lang->cmd_check_ftp_connect}</button></span> 
+						<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/header.html b/modules/install/tpl/header.html
index 6dfb5a0a9..ac09b51aa 100644
--- a/modules/install/tpl/header.html
+++ b/modules/install/tpl/header.html
@@ -1,4 +1,6 @@
 <!--%import("./css/install.css")-->
-<div id="box">
-    <h1 class="xeAdmin"><img src="./images/h1.png" alt="XE Install" width="750" height="36" class="iePngFix" /></h1>
-    <div id="content">
+<div id="xei">
+	<div id="header">
+		<h1><img src="img/xe.gif" width="163" height="26" alt="Xpress Engine" /></h1>
+		<em>Version <strong>{__ZBXE_VERSION__}</strong> {$lang->introduce_title}</em>
+	</div>
diff --git a/modules/install/tpl/img/bgHtml.gif b/modules/install/tpl/img/bgHtml.gif
new file mode 100644
index 000000000..ab428a048
Binary files /dev/null and b/modules/install/tpl/img/bgHtml.gif differ
diff --git a/modules/install/tpl/img/btnPack.gif b/modules/install/tpl/img/btnPack.gif
new file mode 100644
index 000000000..ff30e37b0
Binary files /dev/null and b/modules/install/tpl/img/btnPack.gif differ
diff --git a/modules/install/tpl/img/icoStatus.gif b/modules/install/tpl/img/icoStatus.gif
new file mode 100644
index 000000000..00cd03aa1
Binary files /dev/null and b/modules/install/tpl/img/icoStatus.gif differ
diff --git a/modules/install/tpl/img/xe.gif b/modules/install/tpl/img/xe.gif
new file mode 100644
index 000000000..860a06c77
Binary files /dev/null and b/modules/install/tpl/img/xe.gif differ
diff --git a/modules/install/tpl/introduce.html b/modules/install/tpl/introduce.html
index f89cd634b..4b3a44bab 100644
--- a/modules/install/tpl/introduce.html
+++ b/modules/install/tpl/introduce.html
@@ -1,19 +1,37 @@
+<!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<h2 class="xeAdmin">{$lang->introduce_title}</h2>
-
-<div id="agreement">{nl2br($lang->license)}</div>
-
-<div class="tCenter">
-    Select language : <select name="lang_type" onchange="doChangeLangType(this)">
-        <!--@foreach($lang_supported as $key => $val)-->
-        <option value="{$key}" <!--@if($key == $lang_type)-->selected="selected"<!--@end-->>{$val}</option>
-        <!--@end-->
-    </select>
-</div>
-
-<div class="tCenter gap1">
-    <a class="button blue" href="{getUrl('','act','dispInstallCheckEnv')}"><span>{$lang->cmd_agree_license}</span></a>
-</div>
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<form action="./" class="agreement" method="post">
+			<input type="hidden" name="module" value="install" />
+			<input type="hidden" name="act" value="procInstallAgreement" />
+			<input type="hidden" id="agree_license_text" value="{$lang->install_license_desc['lgpl']}" />
+				<div class="desc">
+					<p><input type="checkbox" name="lgpl_agree" value="Y" class="iCheck" id="lgpl" /> <label for="lgpl">{$lang->lgpl_agree}</label> - <a href="{$lang->lgpl_license_url}" target="_blank">{$lang->read_all}</a></p>
+					<p>{$lang->license_agreement_desc}</p>
+				</div>
+				<div class="desc">
+					<p><input type="checkbox" name="enviroment_gather" value="Y" class="iCheck" id="env" /> <label for="env">{$lang->install_env_agreement}</label></p>
+					<p>{$lang->install_env_agreement_desc}</p>
+				</div>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<div class="select open" style="width:160px;">
+							<span class="ctrl"><span class="arrow"></span></span>
+							<button type="button" class="myValue selected">{$lang_supported[Context::getLangType()]}</button>
+							<ul class="aList" style="bottom:20px;top:auto">
+								<li loop="$lang_supported=>$key,$val"><a href="{getUrl('l', $key)}">{$val}</a></li>
+							</ul>
+						</div>
+					</div>
+					<div class="fRight">
+						<span class="ibtn icon"><span class="check"></span> <input type="submit" value="{$lang->cmd_agree_license}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 
 <!--#include("footer.html")-->
diff --git a/modules/install/tpl/js/install.js b/modules/install/tpl/js/install.js
new file mode 100644
index 000000000..1bcd27462
--- /dev/null
+++ b/modules/install/tpl/js/install.js
@@ -0,0 +1,97 @@
+jQuery(function($){
+	// Agreement
+	var agree = $('.agreement');
+	agree.submit(function(){
+		if($('#lgpl:checked').length==0){
+			alert($('#agree_license_text').val());
+			$('#lgpl').focus();
+			return false;
+		}
+	});
+	
+	// Input Clear
+	var iText = $('.item>.iLabel').next('.iText');
+	$('.item>.iLabel').css('position','absolute');
+	iText
+		.focus(function(){
+			$(this).prev('.iLabel').css('visibility','hidden');
+		})
+		.blur(function(){
+			if($(this).val() == ''){
+				$(this).prev('.iLabel').css('visibility','visible');
+			} else {
+				$(this).prev('.iLabel').css('visibility','hidden');
+			}
+		})
+		.change(function(){
+			if($(this).val() == ''){
+				$(this).prev('.iLabel').css('visibility','visible');
+			} else {
+				$(this).prev('.iLabel').css('visibility','hidden');
+			}
+		})
+		.blur();
+	// Common
+	var select_root = $('div.select');
+	var select_value = $('.myValue');
+	var select_a = $('div.select>ul>li>a');
+	var select_input = $('div.select>ul>li>input[type=radio]');
+	var select_label = $('div.select>ul>li>label');
+	
+	// Radio Default Value
+	$('div.myValue').each(function(){
+		var default_value = $(this).next('.iList').find('input[checked]').next('label').text();
+		$(this).append(default_value);
+	});
+	
+	// Line
+	select_value.bind('focusin',function(){$(this).addClass('outLine');});
+	select_value.bind('focusout',function(){$(this).removeClass('outLine');});
+	select_input.bind('focusin',function(){$(this).parents('div.select').children('div.myValue').addClass('outLine');});
+	select_input.bind('focusout',function(){$(this).parents('div.select').children('div.myValue').removeClass('outLine');});
+	
+	// Show
+	function show_option(){
+		$(this).parents('div.select:first').toggleClass('open');
+	}
+	
+	// Hover
+	function i_hover(){
+		$(this).parents('ul:first').children('li').removeClass('hover');
+		$(this).parents('li:first').toggleClass('hover');
+	}
+	
+	// Hide
+	function hide_option(){
+		var t = $(this);
+		setTimeout(function(){
+			t.parents('div.select:first').removeClass('open');
+		}, 1);
+	}
+	
+	// Set Input
+	function set_label(){
+		var v = $(this).next('label').text();
+		$(this).parents('ul:first').prev('.myValue').text('').append(v);
+		$(this).parents('ul:first').prev('.myValue').addClass('selected');
+	}
+	
+	// Set Anchor
+	function set_anchor(){
+		var v = $(this).text();
+		$(this).parents('ul:first').prev('.myValue').text('').append(v);
+		$(this).parents('ul:first').prev('.myValue').addClass('selected');
+	}
+
+	// Anchor Focus Out
+	$('*:not("div.select a")').focus(function(){
+		$('.aList').parent('.select').removeClass('open');
+	});
+			
+	select_value.click(show_option);
+	select_root.removeClass('open');
+	select_a.click(set_anchor).click(hide_option).focus(i_hover).hover(i_hover);
+	select_input.change(set_label).focus(set_label);
+	select_label.hover(i_hover).click(hide_option);
+	
+});
diff --git a/modules/install/tpl/js/install_admin.js b/modules/install/tpl/js/install_admin.js
index cca05d1e0..a1eff2e46 100644
--- a/modules/install/tpl/js/install_admin.js
+++ b/modules/install/tpl/js/install_admin.js
@@ -1,3 +1,38 @@
+/**
+ * @brief DB정보 Setting후 실행될 함수
+ */
+function completeAgreement(ret_obj)
+{
+    if(ret_obj['error'] != 0) {
+        alert(ret_obj['message']);
+        return;
+    } else {
+		var url = current_url.setQuery('act', 'dispInstallCheckEnv');
+		location.href = url;
+	}
+}
+
+function completeDBSetting(ret_obj) {
+    if(ret_obj['error'] != 0) {
+        alert(ret_obj['message']);
+        return;
+    } else {
+    	location.href = "./index.php?act=dispInstallConfigForm";
+	}
+}
+
+/**
+ * @brief Rewrite module, Time-zone Setting 후 실행될 함수
+ */
+function completeConfigSetting(ret_obj) {
+    if(ret_obj['error'] != 0) {
+        alert(ret_obj['message']);
+        return;
+    } else {
+    	location.href = "./index.php?act=dispInstallManagerForm";
+	}
+}
+
 /**
  * @brief 설치 완료후 실행될 함수
  */
@@ -85,7 +120,7 @@ function completeGetFtpInfo(ret_obj)
         arr.pop();
         arr.push("");
         target = arr.join("/");
-        list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+target+"')\">../</a></li>";
+        list = list + "<li><a href='#ftpSetup' style='color:#fff; text-decoration:underline;' onclick=\"getFTPList('"+target+"')\">../</a></li>";
     }
     
     for(var i=0;i<ret_obj['list']['item'].length;i++)
@@ -101,10 +136,10 @@ function completeGetFtpInfo(ret_obj)
         }
         else
         {
-            list = list + "<li><a href='#ftpSetup' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</a></li>";
+            list = list + "<li><a href='#ftpSetup' style='color:#fff; text-decoration:underline;' onclick=\"getFTPList('"+pwd+v+"')\">"+v+"</a></li>";
         }
     }
 
-    list = "<td><ul>"+list+"</ul></td>";
+    //list = "<td><ul>"+list+"</ul></td>";
     e.append(jQuery(list));
 }
diff --git a/modules/install/tpl/js/jquery-1.5.2.min.js b/modules/install/tpl/js/jquery-1.5.2.min.js
new file mode 100644
index 000000000..f78f96a12
--- /dev/null
+++ b/modules/install/tpl/js/jquery-1.5.2.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.2
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Thu Mar 31 15:28:23 2011 -0400
+ */
+(function(a,b){function ci(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cf(a){if(!b_[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";b_[a]=c}return b_[a]}function ce(a,b){var c={};d.each(cd.concat.apply([],cd.slice(0,b)),function(){c[this]=a});return c}function b$(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bZ(){try{return new a.XMLHttpRequest}catch(b){}}function bY(){d(a).unload(function(){for(var a in bW)bW[a](0,1)})}function bS(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bR(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bQ(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bs.test(a)?e(a,f):bQ(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bQ(a+"["+f+"]",b[f],c,e)}function bP(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bJ,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bP(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bP(a,c,d,e,"*",g));return l}function bO(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bD),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bq(a,b,c){var e=b==="width"?bk:bl,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function bc(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function bb(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function ba(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function _(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function $(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function Q(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(L.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function P(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function H(a,b){return(a&&a!=="*"?a+".":"")+b.replace(t,"`").replace(u,"&")}function G(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,p=[],q=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(r,"")===a.type?q.push(g.selector):t.splice(i--,1);f=d(a.target).closest(q,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&p.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=p.length;j<k;j++){f=p[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function E(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function y(){return!0}function x(){return!1}function i(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function h(a,c,e){if(e===b&&a.nodeType===1){e=a.getAttribute("data-"+c);if(typeof e==="string"){try{e=e==="true"?!0:e==="false"?!1:e==="null"?null:d.isNaN(e)?g.test(e)?d.parseJSON(e):e:parseFloat(e)}catch(f){}d.data(a,c,e)}else e=b}return e}var c=a.document,d=function(){function G(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(G,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x,y,z=Object.prototype.toString,A=Object.prototype.hasOwnProperty,B=Array.prototype.push,C=Array.prototype.slice,D=String.prototype.trim,E=Array.prototype.indexOf,F={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.2",length:0,size:function(){return this.length},toArray:function(){return C.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?B.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),x.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(C.apply(this,arguments),"slice",C.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:B,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;x.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=d._Deferred();if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",y,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",y),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&G()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):F[z.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!A.call(a,"constructor")&&!A.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||A.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:D?function(a){return a==null?"":D.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?B.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){F["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),E&&(d.inArray=function(a,b){return E.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?y=function(){c.removeEventListener("DOMContentLoaded",y,!1),d.ready()}:c.attachEvent&&(y=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",y),d.ready())});return d}(),e="then done fail isResolved isRejected promise".split(" "),f=[].slice;d.extend({_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){f=f||[],c=1;try{while(a[0])a.shift().apply(d,f)}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),f;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(f)return f;f=a={}}var c=e.length;while(c--)a[e[c]]=b[e[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){function i(a){return function(c){b[a]=arguments.length>1?f.call(arguments,0):c,--g||h.resolveWith(h,f.call(b,0))}}var b=arguments,c=0,e=b.length,g=e,h=e<=1&&a&&d.isFunction(a.promise)?a:d.Deferred();if(e>1){for(;c<e;c++)b[c]&&d.isFunction(b[c].promise)?b[c].promise().then(i(c),h.reject):--g;g||h.resolveWith(h,b)}else h!==a&&h.resolveWith(h,e?[a]:[]);return h.promise()}}),function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0,reliableMarginRight:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e)}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(a.style.width="1px",a.style.marginRight="0",d.support.reliableMarginRight=(parseInt(c.defaultView.getComputedStyle(a,null).marginRight,10)||0)===0),b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function");return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}}();var g=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!i(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,g=b.nodeType,h=g?d.cache:b,j=g?b[d.expando]:d.expando;if(!h[j])return;if(c){var k=e?h[j][f]:h[j];if(k){delete k[c];if(!i(k))return}}if(e){delete h[j][f];if(!i(h[j]))return}var l=h[j][f];d.support.deleteExpando||h!=a?delete h[j]:h[j]=null,l?(h[j]={},g||(h[j].toJSON=d.noop),h[j][f]=l):g&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var f=this[0].attributes,g;for(var i=0,j=f.length;i<j;i++)g=f[i].name,g.indexOf("data-")===0&&(g=g.substr(5),h(this[0],g,e[g]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=h(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var j=/[\n\t\r]/g,k=/\s+/,l=/\r/g,m=/^(?:href|src|style)$/,n=/^(?:button|input)$/i,o=/^(?:button|input|object|select|textarea)$/i,p=/^a(?:rea)?$/i,q=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(k);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var i=0,j=b.length;i<j;i++)g.indexOf(" "+b[i]+" ")<0&&(h+=" "+b[i]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(k);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var h=(" "+g.className+" ").replace(j," ");for(var i=0,l=c.length;i<l;i++)h=h.replace(" "+c[i]+" "," ");g.className=d.trim(h)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),i=b,j=a.split(k);while(f=j[g++])i=e?i:!h.hasClass(f),h[i?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(j," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var j=i?f:0,k=i?f+1:h.length;j<k;j++){var m=h[j];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(q.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(l,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&q.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=m.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&n.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var k=a.getAttributeNode("tabIndex");return k&&k.specified?k.value:o.test(a.nodeName)||p.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var l=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return l===null?b:l}h&&(a[c]=e);return a[c]}});var r=/\.(.*)$/,s=/^(?:textarea|input|select)$/i,t=/\./g,u=/ /g,v=/[^\w\s.|`]/g,w=function(a){return a.replace(v,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=x;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(a){return typeof d!=="undefined"&&d.event.triggered!==a.type?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=x);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),w).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var u=s.handle;u&&(u.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(r,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=a.type,l[m]())}catch(p){}k&&(l["on"+m]=k),d.event.triggered=b}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,H(a.origType,a.selector),d.extend({},a,{handler:G,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,H(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?y:x):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=y;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=y;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=y,this.stopPropagation()},isDefaultPrevented:x,isPropagationStopped:x,isImmediatePropagationStopped:x};var z=function(a){var b=a.relatedTarget;try{if(b&&b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},A=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?A:z,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?A:z)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&E("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&E("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var B,C=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},D=function D(a){var c=a.target,e,f;if(s.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=C(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:D,beforedeactivate:D,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&D.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&D.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",C(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in B)d.event.add(this,c+".specialChange",B[c]);return s.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return s.test(this.nodeName)}},B=d.event.special.change.filters,B.focus=B.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function f(a){var c=d.event.fix(a);c.type=b,c.originalEvent={},d.event.trigger(c,null,c.target),c.isDefaultPrevented()&&a.preventDefault()}var e=0;d.event.special[b]={setup:function(){e++===0&&c.addEventListener(a,f,!0)},teardown:function(){--e===0&&c.removeEventListener(a,f,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var F={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=r.exec(h),k="",j&&(k=j[0],h=h.replace(r,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(F[h]+k),h=h+k):h=(F[h]||h)+k;if(c==="live")for(var p=0,q=n.length;p<q;p++)d.event.add(n[p],"live."+H(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+H(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return"text"===c&&(b===c||b===null)},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(e||!l.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return k(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var I=/Until$/,J=/^(?:parents|prevUntil|prevAll)/,K=/,/,L=/^.[^:#\[\.,]*$/,M=Array.prototype.slice,N=d.expr.match.POS,O={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(Q(this,a,!1),"not",a)},filter:function(a){return this.pushStack(Q(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=N.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(P(c[0])||P(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=M.call(arguments);I.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!O[a]?d.unique(f):f,(this.length>1||K.test(e))&&J.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var R=/ jQuery\d+="(?:\d+|null)"/g,S=/^\s+/,T=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,U=/<([\w:]+)/,V=/<tbody/i,W=/<|&#?\w+;/,X=/<(?:script|object|embed|option|style)/i,Y=/checked\s*(?:[^=]|=\s*.checked.)/i,Z={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};Z.optgroup=Z.option,Z.tbody=Z.tfoot=Z.colgroup=Z.caption=Z.thead,Z.th=Z.td,d.support.htmlSerialize||(Z._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(R,""):null;if(typeof a!=="string"||X.test(a)||!d.support.leadingWhitespace&&S.test(a)||Z[(U.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(T,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.length?this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a):this},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&Y.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?$(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,bc)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!X.test(a[0])&&(d.support.checkClone||!Y.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){ba(a,e),f=bb(a),g=bb(e);for(h=0;f[h];++h)ba(f[h],g[h])}if(b){_(a,e);if(c){f=bb(a),g=bb(e);for(h=0;f[h];++h)_(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||W.test(i)){if(typeof i==="string"){i=i.replace(T,"<$1></$2>");var j=(U.exec(i)||["",""])[1].toLowerCase(),k=Z[j]||Z._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=V.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&S.test(i)&&m.insertBefore(b.createTextNode(S.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bd=/alpha\([^)]*\)/i,be=/opacity=([^)]*)/,bf=/-([a-z])/ig,bg=/([A-Z]|^ms)/g,bh=/^-?\d+(?:px)?$/i,bi=/^-?\d/,bj={position:"absolute",visibility:"hidden",display:"block"},bk=["Left","Right"],bl=["Top","Bottom"],bm,bn,bo,bp=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bm(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bm)return bm(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bf,bp)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bq(a,b,e):d.swap(a,bj,function(){f=bq(a,b,e)});if(f<=0){f=bm(a,b,b),f==="0px"&&bo&&(f=bo(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bh.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return be.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bd.test(f)?f.replace(bd,e):c.filter+" "+e}}),d(function(){d.support.reliableMarginRight||(d.cssHooks.marginRight={get:function(a,b){var c;d.swap(a,{display:"inline-block"},function(){b?c=bm(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bn=function(a,c,e){var f,g,h;e=e.replace(bg,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bo=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bh.test(d)&&bi.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bm=bn||bo,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var br=/%20/g,bs=/\[\]$/,bt=/\r?\n/g,bu=/#.*$/,bv=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bw=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bx=/^(?:about|app|app\-storage|.+\-extension|file|widget):$/,by=/^(?:GET|HEAD)$/,bz=/^\/\//,bA=/\?/,bB=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bC=/^(?:select|textarea)/i,bD=/\s+/,bE=/([?&])_=[^&]*/,bF=/(^|\-)([a-z])/g,bG=function(a,b,c){return b+c.toUpperCase()},bH=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bI=d.fn.load,bJ={},bK={},bL,bM;try{bL=c.location.href}catch(bN){bL=c.createElement("a"),bL.href="",bL=bL.href}bM=bH.exec(bL.toLowerCase())||[],d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bI)return bI.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bB,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bC.test(this.nodeName)||bw.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(bt,"\r\n")}}):{name:b.name,value:c.replace(bt,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bL,isLocal:bx.test(bM[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bO(bJ),ajaxTransport:bO(bK),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bR(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bS(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bF,bG)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bv.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bu,"").replace(bz,bM[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bD),e.crossDomain==null&&(q=bH.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bM[1]||q[2]!=bM[2]||(q[3]||(q[1]==="http:"?80:443))!=(bM[3]||(bM[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bP(bJ,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!by.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(bA.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bE,"$1_="+w);e.url=x+(x===e.url?(bA.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bP(bK,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bQ(g,a[g],c,f);return e.join("&").replace(br,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bT=d.now(),bU=/(\=)\?(&|$)|\?\?/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bT++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bU.test(b.url)||f&&bU.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bU,l),b.url===j&&(f&&(k=k.replace(bU,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bV=d.now(),bW,bX;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bZ()||b$()}:bZ,bX=d.ajaxSettings.xhr(),d.support.ajax=!!bX,d.support.cors=bX&&"withCredentials"in bX,bX=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),!a.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bW[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bW||(bW={},bY()),h=bV++,g.onreadystatechange=bW[h]=c):c()},abort:function(){c&&c(0,1)}}}});var b_={},ca=/^(?:toggle|show|hide)$/,cb=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cc,cd=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(ce("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cf(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(ce("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(ce("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cf(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(ca.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=cb.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:ce("show",1),slideUp:ce("hide",1),slideToggle:ce("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!cc&&(cc=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(cc),cc=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var cg=/^t(?:able|d|h)$/i,ch=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=ci(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!cg.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=(e==="absolute"||e==="fixed")&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=ch.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!ch.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=ci(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=ci(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/modules/install/tpl/progress_menu.html b/modules/install/tpl/progress_menu.html
new file mode 100644
index 000000000..1a5bd5d9b
--- /dev/null
+++ b/modules/install/tpl/progress_menu.html
@@ -0,0 +1,11 @@
+		<div id="progress">
+			<ul>
+				<li <!--@if($act=='')-->class="active"<!--@end-->>{$lang->install_progress_menu['agree']}</li>
+				<li <!--@if($act=='dispInstallCheckEnv')-->class="active"<!--@end-->>{$lang->install_progress_menu['condition']}</li>
+				<li <!--@if($act=='dispInstallSelectDB' && $progressMenu == '3')-->class="active"<!--@end-->>{$lang->install_progress_menu['ftp']}</li>
+				<li <!--@if($act=='dispInstallSelectDB' && $progressMenu == '4')-->class="active"<!--@end-->>{$lang->install_progress_menu['dbSelect']}</li>
+				<li <!--@if($act=='dispInstallDBForm')-->class="active"<!--@end-->>{$lang->install_progress_menu['dbInfo']}</li>
+				<li <!--@if($act=='dispInstallConfigForm')-->class="active"<!--@end-->>{$lang->install_progress_menu['configInfo']}</li>
+				<li <!--@if($act=='dispInstallManagerForm')-->class="active"<!--@end-->>{$lang->install_progress_menu['adminInfo']}</li>
+			</ul>
+		</div>
diff --git a/modules/install/tpl/select_db.html b/modules/install/tpl/select_db.html
index 0ac474c94..2dd6ae9d3 100644
--- a/modules/install/tpl/select_db.html
+++ b/modules/install/tpl/select_db.html
@@ -1,28 +1,35 @@
+<!--%import("js/install_admin.js")-->
 <!--#include("header.html")-->
-
-<h2 class="xeAdmin">{$lang->select_db_type}</h2>
-
-    <form method="post" action="./">
-    <input type="hidden" name="module" value="{$module}" />
-    <input type="hidden" name="act" value="dispInstallForm" />
-
-    <table cellspacing="0" class="tableType6">
-    <col width="180" /><col />
-    <!--@foreach(DB::getSupportedList() as $key => $val)-->
-    <tr>
-        <th scope="row">
-            <input type="radio" name="db_type" value="{$val->db_type}" <!--@if(!$val->enable)-->disabled="disabled"<!--@end--> id="db_type_{$val->db_type}" <!--@if($val->db_type=="mysql")-->checked="checked"<!--@end-->/>
-            <label for="db_type_{$val->db_type}">{$val->db_type}</label>
-        </th>
-        <td>{$lang->db_desc[$val->db_type]}</td>
-    </tr>
-    <!--@end-->
-    </table>
-
-    <div class="buttonCenter">
-        <span class="button blue"><input type="submit" value="{$lang->cmd_install_next}" /></span>
-    </div>
-
-    </form>
-
+	<div id="body">
+<!--#include("progress_menu.html")-->
+		<span class="dummy"></span>
+		<div id="content">
+			<form method="post" action="./">
+			<input type="hidden" name="module" value="{$module}" />
+			<input type="hidden" name="act" value="dispInstallDBForm" />
+				<ul class="form formDbSelect">
+					<!--@foreach(DB::getEnableList() as $key => $val)-->
+					<li>
+						<input name="db_type" type="radio" value="{$val->db_type}" <!--@if(!$val->enable)-->disabled="disabled"<!--@end--> id="db_type_{$val->db_type}" <!--@if($val->db_type=="mysql")-->checked="checked"<!--@end--> class="iRadio" id="cubrid" /> <label for="db_type_{$val->db_type}">{$val->db_type}</label>
+						<p>{$lang->db_desc[$val->db_type]}</p>
+					</li>
+					<!--@end-->
+					<!--@foreach(DB::getDisableList() as $key => $val)-->
+					<li>
+						<input name="db_type" type="radio" value="{$val->db_type}" <!--@if(!$val->enable)-->disabled="disabled"<!--@end--> id="db_type_{$val->db_type}" <!--@if($val->db_type=="mysql")-->checked="checked"<!--@end--> class="iRadio" id="cubrid" /> <label for="db_type_{$val->db_type}">{$val->db_type}</label>
+						<p>{$lang->db_desc[$val->db_type]}</p>
+					</li>
+					<!--@end-->
+				</ul>
+				<div class="ibtnArea">
+					<div class="fLeft">
+						<span class="ibtn icon"><span class="back"></span> <a href="{getUrl('', 'act', 'dispInstallCheckEnv')}">{$lang->cmd_back}</a></span>
+					</div>
+					<div class="fRight">
+						<span class="ibtn icon"><span class="check"></span> <input name="" type="submit" value="{$lang->cmd_next}" /></span>
+					</div>
+				</div>
+			</form>
+		</div>
+	</div>
 <!--#include("footer.html")-->
diff --git a/modules/integration_search/conf/info.xml b/modules/integration_search/conf/info.xml
index fd46b2dba..a109f5e58 100644
--- a/modules/integration_search/conf/info.xml
+++ b/modules/integration_search/conf/info.xml
@@ -1,63 +1,63 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">통합검색</title>
-    <title xml:lang="zh-CN">综合搜索</title>
-    <title xml:lang="jp">統合検索</title>
-    <title xml:lang="en">Integrated Search</title>
-    <title xml:lang="vi">Tìm kiếm tích hợp</title>
-    <title xml:lang="es">Búsqueda Integrada</title>
-    <title xml:lang="ru">Интегрируемый поиск</title>
-    <title xml:lang="zh-TW">綜合搜尋</title>
-    <title xml:lang="tr">Birleşik Arama</title>
-    <description xml:lang="ko">
-        선택한 모듈들을 대상으로 통합검색을 지원합니다.
-        선택된 모듈의 글중 비밀글만 검색을 하지 않고 나머지는 모두 검색을 하기에 공개되지 않은 모듈은 대상에 포함하지 않도록 하셔야 합니다.
-    </description>
-    <description xml:lang="zh-CN">
-        把所选模块作为搜索对象。
-        所选模块当中只有密帖不会被搜索，因此请留意您不想搜索的模块。
-    </description>
-    <description xml:lang="jp">
-        選択されたモジュールを対象に統合検索を行う機能をサポートします。
-        選択されたモジュールのコンテンツ（書き込み）の中で、非公開コンテンツのみ検索から除外されますので、未公開のモジュールは対象にしないようにして下さい。
-    </description>
-    <description xml:lang="en">
-        It supports integration search for chosen modules.
-        All articles except secret articles will be searched, so you need to be careful not to include secret module to target.
-    </description>
-    <description xml:lang="vi">
-        Hỗ trợ tìm kiếm tích hợp cho những Module được chọn.
-        Mọi bài viết đều có thể được tìm kiếm (Trừ những bài đặt bí mật), vì vậy bạn hãy cẩn thận khi chọn những Module bí mật.
-    </description>
-    <description xml:lang="es">
-        Soporta la búsqueda integrada de los módulos elegidos.
-        Todo los documentos excepto los secretos serán buscados, y es necesario tener cuidado de no incluir módulo secreto como  objetivo.
-    </description>
-    <description xml:lang="ru">
-        Поддерживает интеграцию поиска в выбранные модули.
-        Все статьи, за исключением секретных, будут подлежать поиску, поэтому Вам нужно быть осторожным с тем, чтобы не включить модуль секретов в назначение.
-    </description>
-    <description xml:lang="tr">
-        Seçili modüller için toplu arama desteği sunar.
-        Gizli makaleler dışındaki tüm makaleler aranacaktır.Bu yüzden hedefin, gizli modülü içermemesine dikkat ediniz.
-    </description>
-    <description xml:lang="zh-TW">
-        將所選擇的模組當作搜尋對象進行搜尋。
-        所搜尋的模組中，如有私密文章時將不會被搜尋，因此請注意選擇。
-    </description>
-    <version>0.1</version>
-    <date>2007-07-24</date>
-    <category>service</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">통합검색</title>
+    <title xml:lang="zh-CN">综合搜索</title>
+    <title xml:lang="jp">統合検索</title>
+    <title xml:lang="en">Integrated Search</title>
+    <title xml:lang="vi">Tìm kiếm tích hợp</title>
+    <title xml:lang="es">Búsqueda Integrada</title>
+    <title xml:lang="ru">Интегрируемый поиск</title>
+    <title xml:lang="zh-TW">綜合搜尋</title>
+    <title xml:lang="tr">Birleşik Arama</title>
+    <description xml:lang="ko">
+        선택한 모듈들을 대상으로 통합검색을 지원합니다.
+        선택된 모듈의 글중 비밀글만 검색을 하지 않고 나머지는 모두 검색을 하기에 공개되지 않은 모듈은 대상에 포함하지 않도록 하셔야 합니다.
+    </description>
+    <description xml:lang="zh-CN">
+        把所选模块作为搜索对象。
+        所选模块当中只有密帖不会被搜索，因此请留意您不想搜索的模块。
+    </description>
+    <description xml:lang="jp">
+        選択されたモジュールを対象に統合検索を行う機能をサポートします。
+        選択されたモジュールのコンテンツ（書き込み）の中で、非公開コンテンツのみ検索から除外されますので、未公開のモジュールは対象にしないようにして下さい。
+    </description>
+    <description xml:lang="en">
+        It supports the integrated search for chosen modules.
+        All articles except secret articles will be searched, so you need to be careful not to include secret module to target.
+    </description>
+    <description xml:lang="vi">
+        Hỗ trợ tìm kiếm tích hợp cho những Module được chọn.
+        Mọi bài viết đều có thể được tìm kiếm (Trừ những bài đặt bí mật), vì vậy bạn hãy cẩn thận khi chọn những Module bí mật.
+    </description>
+    <description xml:lang="es">
+        Soporta la búsqueda integrada de los módulos elegidos.
+        Todo los documentos excepto los secretos serán buscados, y es necesario tener cuidado de no incluir módulo secreto como  objetivo.
+    </description>
+    <description xml:lang="ru">
+        Поддерживает интеграцию поиска в выбранные модули.
+        Все статьи, за исключением секретных, будут подлежать поиску, поэтому Вам нужно быть осторожным с тем, чтобы не включить модуль секретов в назначение.
+    </description>
+    <description xml:lang="tr">
+        Seçili modüller için toplu arama desteği sunar.
+        Gizli makaleler dışındaki tüm makaleler aranacaktır.Bu yüzden hedefin, gizli modülü içermemesine dikkat ediniz.
+    </description>
+    <description xml:lang="zh-TW">
+        將所選擇的模組當作搜尋對象進行搜尋。
+        所搜尋的模組中，如有私密文章時將不會被搜尋，因此請注意選擇。
+    </description>
+    <version>0.1</version>
+    <date>2007-07-24</date>
+    <category>service</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/integration_search/conf/module.xml b/modules/integration_search/conf/module.xml
index 39b51ae64..bb73490a5 100644
--- a/modules/integration_search/conf/module.xml
+++ b/modules/integration_search/conf/module.xml
@@ -8,7 +8,7 @@
         <action name="dispIntegration_searchAdminGrantInfo" type="view" />
         <action name="dispIntegration_searchAdminSkinInfo" type="view" />
 
-        <action name="procIntegration_searchAdminInsertConfig" type="controller" />
+        <action name="procIntegration_searchAdminInsertConfig" type="controller" ruleset="insertConfig" />
         <action name="procIntegration_searchAdminInsertSkin" type="controller" />
     </actions>
 </module>
diff --git a/modules/integration_search/integration_search.admin.controller.php b/modules/integration_search/integration_search.admin.controller.php
index 46635f2ce..d7254c030 100644
--- a/modules/integration_search/integration_search.admin.controller.php
+++ b/modules/integration_search/integration_search.admin.controller.php
@@ -1,115 +1,117 @@
-<?php
-    /**
-     * @class  integration_searchAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  integration_search module의 admin view class
-     *
-     * 통합검색 관리
-     *
-     **/
-
-    class integration_searchAdminController extends integration_search {
-        /**
-         * @brief 초기화
-         **/
-        function init() {}
-
-        /**
-         * @brief 설정 저장
-         **/
-        function procIntegration_searchAdminInsertConfig() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('integration_search');
-
-            $args->skin = Context::get('skin');
-            $args->target = Context::get('target');
-            $args->target_module_srl = Context::get('target_module_srl');
-            if(!$args->target_module_srl) $args->target_module_srl = '';
-            $args->skin_vars = $config->skin_vars;
-
-            $oModuleController = &getController('module');
-            return $oModuleController->insertModuleConfig('integration_search',$args);
-        }
-
-        /**
-         * @brief 스킨 정보 저장
-         **/
-        function procIntegration_searchAdminInsertSkin() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('integration_search');
-
-            $args->skin = $config->skin;
-            $args->target_module_srl = $config->target_module_srl;
-
-            // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서)
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $config->skin);
-
-            // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
-            $obj = Context::getRequestVars();
-            unset($obj->act);
-            unset($obj->module_srl);
-            unset($obj->page);
-
-            // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($skin_info->extra_vars) {
-                foreach($skin_info->extra_vars as $vars) {
-                    if($vars->type!='image') continue;
-
-                    $image_obj = $obj->{$vars->name};
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $obj->{"del_".$vars->name};
-                    unset($obj->{"del_".$vars->name});
-                    if($del_var == 'Y') {
-                        FileHandler::removeFile($module_info->{$vars->name});
-                        continue;
-                    }
-
-                    // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                    if(!$image_obj['tmp_name']) {
-                        $obj->{$vars->name} = $module_info->{$vars->name};
-                        continue;
-                    }
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!is_uploaded_file($image_obj['tmp_name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 이미지 파일이 아니어도 무시
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/images/%s/", $module_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) return false;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                        unset($obj->{$vars->name});
-                        continue;
-                    }
-
-                    // 변수를 바꿈
-                    unset($obj->{$vars->name});
-                    $obj->{$vars->name} = $filename;
-                }
-            }
-
-            // serialize하여 저장
-            $args->skin_vars = serialize($obj);
-
-            $oModuleController = &getController('module');
-            return $oModuleController->insertModuleConfig('integration_search',$args);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  integration_searchAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the integration_search module
+     *
+     * Search Management
+     *
+     **/
+
+    class integration_searchAdminController extends integration_search {
+        /**
+         * @brief Initialization
+         **/
+        function init() {}
+
+        /**
+         * @brief Save Settings
+         **/
+        function procIntegration_searchAdminInsertConfig() {
+            // Get configurations (using module model object)
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('integration_search');
+
+            $args->skin = Context::get('skin');
+            $args->target = Context::get('target');
+            $args->target_module_srl = Context::get('target_module_srl');
+            if(!$args->target_module_srl) $args->target_module_srl = '';
+            $args->skin_vars = $config->skin_vars;
+
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('integration_search',$args);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminContent');
+				header('location:'.$returnUrl);
+				return;
+			}
+			else return $output;
+        }
+
+        /**
+         * @brief Save the skin information
+         **/
+        function procIntegration_searchAdminInsertSkin() {
+            // Get configurations (using module model object)
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('integration_search');
+
+            $args->skin = $config->skin;
+            $args->target_module_srl = $config->target_module_srl;
+            // Get skin information (to check extra_vars)
+            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $config->skin);
+            // Check received variables (delete the basic variables such as mo, act, module_srl, page)
+            $obj = Context::getRequestVars();
+            unset($obj->act);
+            unset($obj->module_srl);
+            unset($obj->page);
+            // Separately handle if the extra_vars is an image type in the original skin_info
+            if($skin_info->extra_vars) {
+                foreach($skin_info->extra_vars as $vars) {
+                    if($vars->type!='image') continue;
+
+                    $image_obj = $obj->{$vars->name};
+                    // Get a variable on a request to delete
+                    $del_var = $obj->{"del_".$vars->name};
+                    unset($obj->{"del_".$vars->name});
+                    if($del_var == 'Y') {
+                        FileHandler::removeFile($module_info->{$vars->name});
+                        continue;
+                    }
+                    // Use the previous data if not uploaded
+                    if(!$image_obj['tmp_name']) {
+                        $obj->{$vars->name} = $module_info->{$vars->name};
+                        continue;
+                    }
+                    // Ignore if the file is not successfully uploaded
+                    if(!is_uploaded_file($image_obj['tmp_name'])) {
+                        unset($obj->{$vars->name});
+                        continue;
+                    }
+                    // Ignore if the file is not an image
+                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
+                        unset($obj->{$vars->name});
+                        continue;
+                    }
+                    // Upload the file to a path
+                    $path = sprintf("./files/attach/images/%s/", $module_srl);
+                    // Create a directory
+                    if(!FileHandler::makeDir($path)) return false;
+
+                    $filename = $path.$image_obj['name'];
+                    // Move the file
+                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
+                        unset($obj->{$vars->name});
+                        continue;
+                    }
+                    // Change a variable
+                    unset($obj->{$vars->name});
+                    $obj->{$vars->name} = $filename;
+                }
+            }
+            // Serialize and save 
+            $args->skin_vars = serialize($obj);
+
+            $oModuleController = &getController('module');
+			$output = $oModuleController->insertModuleConfig('integration_search',$args);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispIntegration_searchAdminSkinInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+			else $output;
+        }
+    }
+?>
diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php
index 5d4141b65..add02e0ce 100644
--- a/modules/integration_search/integration_search.admin.view.php
+++ b/modules/integration_search/integration_search.admin.view.php
@@ -1,89 +1,88 @@
-<?php
-    /**
-     * @class  integration_searchAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  integration_search module의 admin view class
-     *
-     * 통합검색 관리
-     *
-     **/
-
-    class integration_searchAdminView extends integration_search {
-
-        var $config = null;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $this->config = $oModuleModel->getModuleConfig('integration_search');
-            Context::set('config',$this->config);
-			
-            $this->setTemplatePath($this->module_path."/tpl/");
-        }
-
-        /**
-         * @brief 모듈 선정 및 스킨 설정
-         **/
-        function dispIntegration_searchAdminContent() {
-            // 스킨 목록을 구해옴
-            $oModuleModel = &getModel('module');
-            $skin_list = $oModuleModel->getSkins($this->module_path);
-            Context::set('skin_list',$skin_list);
-
-            // 모듈 카테고리 목록을 구함
-            $module_categories = $oModuleModel->getModuleCategories();
-
-            // 생성된 mid목록을 구함
-            $obj->site_srl = 0;
-            $mid_list = $oModuleModel->getMidList($obj);
-
-            // module_category와 module의 조합
-            if($module_categories) {
-                foreach($mid_list as $module_srl => $module) {
-                    $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
-                }
-            } else {
-                $module_categories[0]->list = $mid_list;
-            }
-
-            Context::set('mid_list',$module_categories); //maybe not used
-			$security = new Security();
-			$security->encodeHTML('skin_list..title');
-			
-            // 샘플코드
-            Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword" class="inputTypeText" value="{$is_keyword}" /><span class="button"><input type="submit" value="{$lang->cmd_search}" /></span></form>') );
-
-            $this->setTemplateFile("index");
-        }
-
-        /**
-         * @brief 스킨 설정
-         **/
-        function dispIntegration_searchAdminSkinInfo() {
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin);
-            $skin_vars = unserialize($this->config->skin_vars);
-
-            // skin_info에 extra_vars 값을 지정
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $name = $val->name;
-                    $type = $val->type;
-                    $value = $skin_vars->{$name};
-                    if($type=="checkbox"&&!$value) $value = array();
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-            Context::set('skin_info', $skin_info);
-            Context::set('skin_vars', $skin_vars); //maybe not used
-			
-			$security = new Security();
-			$security->encodeHTML('skin_info...');			
-			
-            $this->setTemplateFile("skin_info");
-        }
-    }
-?>
+<?php
+    /**
+     * @class  integration_searchAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the integration_search module
+     *
+     * Search Management
+     *
+     **/
+
+    class integration_searchAdminView extends integration_search {
+
+        var $config = null;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Get configurations (using module model object)
+            $oModuleModel = &getModel('module');
+            $this->config = $oModuleModel->getModuleConfig('integration_search');
+            Context::set('config',$this->config);
+			
+            $this->setTemplatePath($this->module_path."/tpl/");
+        }
+
+        /**
+         * @brief Module selection and skin set
+         **/
+        function dispIntegration_searchAdminContent() {
+            // Get a list of skins(themes)
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getSkins($this->module_path);
+            Context::set('skin_list',$skin_list);
+            // Get a list of module categories
+            $module_categories = $oModuleModel->getModuleCategories();
+            // Generated mid Wanted list
+            $obj->site_srl = 0;
+
+			// Shown below as obsolete comments - modify by cherryfilter
+            /*$mid_list = $oModuleModel->getMidList($obj);
+            // module_category and module combination
+            if($module_categories) {
+                foreach($mid_list as $module_srl => $module) {
+                    $module_categories[$module->module_category_srl]->list[$module_srl] = $module; 
+                }
+            } else {
+                $module_categories[0]->list = $mid_list;
+            }
+
+            Context::set('mid_list',$module_categories);*/
+
+			$security = new Security();
+			$security->encodeHTML('skin_list..title');
+
+            // Sample Code
+            Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="vid" value="{$vid}" /><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword"  value="{$is_keyword}" /><span class="btn"><input type="submit" value="{$lang->cmd_search}" /></span></form>') );
+
+            $this->setTemplateFile("index");
+        }
+
+        /**
+         * @brief Skin Settings
+         **/
+        function dispIntegration_searchAdminSkinInfo() {
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $this->config->skin);
+            $skin_vars = unserialize($this->config->skin_vars);
+            // value for skin_info extra_vars
+            if(count($skin_info->extra_vars)) {
+                foreach($skin_info->extra_vars as $key => $val) {
+                    $name = $val->name;
+                    $type = $val->type;
+                    $value = $skin_vars->{$name};
+                    if($type=="checkbox"&&!$value) $value = array();
+                    $skin_info->extra_vars[$key]->value= $value;
+                }
+            }
+            Context::set('skin_info', $skin_info);
+            Context::set('skin_vars', $skin_vars); //maybe not used
+			
+			$security = new Security();
+			$security->encodeHTML('skin_info...');			
+			
+            $this->setTemplateFile("skin_info");
+        }
+    }
+?>
diff --git a/modules/integration_search/integration_search.class.php b/modules/integration_search/integration_search.class.php
index 784d22841..f82c2aa0a 100644
--- a/modules/integration_search/integration_search.class.php
+++ b/modules/integration_search/integration_search.class.php
@@ -1,41 +1,41 @@
-<?php
-    /**
-     * @class  integration_search
-     * @author NHN (developers@xpressengine.com)
-     * @brief  integration_search module의 view class
-     **/
-
-    class integration_search extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('integration_search', 'view', 'IS');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  integration_search
+     * @author NHN (developers@xpressengine.com)
+     * @brief view class of the integration_search module
+     **/
+
+    class integration_search extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Registered in action forward
+            $oModuleController = &getController('module');
+            $oModuleController->insertActionForward('integration_search', 'view', 'IS');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/integration_search/integration_search.model.php b/modules/integration_search/integration_search.model.php
index 4df48cb4f..382e8a1d8 100644
--- a/modules/integration_search/integration_search.model.php
+++ b/modules/integration_search/integration_search.model.php
@@ -1,193 +1,192 @@
-<?php
-    /**
-     * @class  integrationModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  integration 모듈의 Model class
-     **/
-
-    class integration_searchModel extends module {
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 게시글 검색
-         **/
-        function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20) {
-            if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
-
-            if($target == 'exclude') {
-				$module_srls_list .= ',0'; // exclude 'trash'
-				if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
-            	$args->exclude_module_srl = $module_srls_list;
-            } else {
-            	$args->module_srl = $module_srls_list;
-            	$args->exclude_module_srl = '0'; // exclude 'trash'
-            }
-
-            $args->page = $page;
-            $args->list_count = $list_count;
-            $args->page_count = 10;
-            $args->search_target = $search_target;
-            $args->search_keyword = $search_keyword;
-            $args->sort_index = 'list_order'; 
-            $args->order_type = 'asc';
-            if(!$args->module_srl) unset($args->module_srl);
-
-            // 대상 문서들을 가져옴
-            $oDocumentModel = &getModel('document');
-
-            return $oDocumentModel->getDocumentList($args);
-        }
-
-        /**
-         * @brief 댓글 검색
-         **/
-        function getComments($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
-            if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-            else $module_srls = $module_srls_list;
-            if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-            else $args->module_srl = $module_srls;
-            $args->page = $page;
-            $args->list_count = $list_count;
-            $args->page_count = 10;
-            $args->search_target = 'content';
-            $args->search_keyword = $search_keyword;
-            $args->sort_index = 'list_order'; 
-            $args->order_type = 'asc';
-
-            // 대상 문서들을 가져옴
-            $oCommentModel = &getModel('comment');
-            $output = $oCommentModel->getTotalCommentList($args);
-            if(!$output->toBool()|| !$output->data) return $output;
-            return $output;
-        }
-
-        /**
-         * @brief 엮인글 검색
-         **/
-        function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20) {
-            if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-            else $module_srls = $module_srls_list;
-            if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-            else $args->module_srl = $module_srls;
-            $args->page = $page;
-            $args->list_count = $list_count;
-            $args->page_count = 10;
-            $args->search_target = $search_target;
-            $args->search_keyword = $search_keyword;
-            $args->sort_index = 'list_order'; 
-            $args->order_type = 'asc';
-
-            // 대상 문서들을 가져옴
-            $oTrackbackModel = &getAdminModel('trackback');
-            $output = $oTrackbackModel->getTotalTrackbackList($args);
-            if(!$output->toBool()|| !$output->data) return $output;
-            return $output;
-        }
-
-        /**
-         * @brief 파일 검색
-         **/
-        function _getFiles($target, $module_srls_list, $search_keyword, $page, $list_count, $direct_download = 'Y') {
-            if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
-            else $module_srls = $module_srls_list;
-            if($target == 'exclude') $args->exclude_module_srl = $module_srls;
-            else $args->module_srl = $module_srls;
-            $args->page = $page;
-            $args->list_count = $list_count;
-            $args->page_count = 10;
-            $args->search_target = 'filename';
-            $args->search_keyword = $search_keyword;
-            $args->sort_index = 'files.file_srl'; 
-            $args->order_type = 'desc';
-            $args->isvalid = 'Y';
-            $args->direct_download = $direct_download=='Y'?'Y':'N';
-
-            // 대상 문서들을 가져옴
-            $oFileAdminModel = &getAdminModel('file');
-            $output = $oFileAdminModel->getFileList($args);
-            if(!$output->toBool() || !$output->data) return $output;
-
-            $list = array();
-            foreach($output->data as $key => $val) {
-                $obj = null;
-                $obj->filename = $val->source_filename;
-                $obj->download_count = $val->download_count;
-                if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
-                $obj->download_url = Context::getRequestUri().$val->download_url;
-                $obj->target_srl = $val->upload_target_srl;
-                $obj->file_size = $val->file_size;
-
-                // 이미지 
-                if(preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename)) {
-                    $obj->type = 'image';
-
-                    $thumbnail_path = sprintf('files/cache/thumbnails/%s',getNumberingPath($val->file_srl, 3));
-                    if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
-                    $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
-                    $thumbnail_url  = Context::getRequestUri().$thumbnail_file;
-                    if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
-                    $obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename), 120, 120);
-
-                // 동영상
-                } elseif(preg_match('/\.(swf|flv|wmv|avi|mpg|mpeg|asx|asf|mp3)$/i', $val->source_filename)) {
-                    $obj->type = 'multimedia';
-                    $obj->src = sprintf('<script type="text/javascript">displayMultimedia("%s",120,120);</script>', $obj->download_url);
-
-                // 기타
-                } else {
-                    $obj->type = 'binary';
-                    $obj->src = '';
-                }
-
-                $list[] = $obj;
-                $target_list[] = $val->upload_target_srl;
-            }
-            $output->data = $list;
-
-            $oDocumentModel = &getModel('document');
-            $document_list = $oDocumentModel->getDocuments($target_list);
-            if($document_list) foreach($document_list as $key => $val) {
-                foreach($output->data as $k => $v) {
-                    if($v->target_srl== $val->document_srl) {
-                        $output->data[$k]->url = $val->getPermanentUrl();
-                        $output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
-                        $output->data[$k]->nick_name = $val->getNickName();
-                    }
-                }
-            }
-
-            $oCommentModel = &getModel('comment');
-            $comment_list = $oCommentModel->getComments($target_list);
-            if($comment_list) foreach($comment_list as $key => $val) {
-                foreach($output->data as $k => $v) {
-                    if($v->target_srl== $val->comment_srl) {
-                        $output->data[$k]->url = $val->getPermanentUrl();
-                        $output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
-                        $output->data[$k]->nick_name = $val->getNickName();
-                    }
-                }
-            }
-
-            return $output;
-        }
-
-        /**
-         * @brief 멀티미디어 검색
-         **/
-        function getImages($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
-            return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count);
-        }
-
-        /**
-         * @brief 첨부파일 검색
-         **/
-        function getFiles($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
-            return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count, 'N');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  integrationModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief Model class of integration module
+     **/
+
+    class integration_searchModel extends module {
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Search documents
+         **/
+        function getDocuments($target, $module_srls_list, $search_target, $search_keyword, $page=1, $list_count = 20) {
+            if(is_array($module_srls_list)) $module_srls_list = implode(',',$module_srls_list);
+
+            if($target == 'exclude') {
+				$module_srls_list .= ',0'; // exclude 'trash'
+				if ($module_srls_list{0} == ',') $module_srls_list = substr($module_srls_list, 1);
+            	$args->exclude_module_srl = $module_srls_list;
+            } else {
+            	$args->module_srl = $module_srls_list;
+            	$args->exclude_module_srl = '0'; // exclude 'trash'
+            }
+
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = $search_target;
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'list_order'; 
+            $args->order_type = 'asc';
+            if(!$args->module_srl) unset($args->module_srl);
+            // Get a list of documents
+            $oDocumentModel = &getModel('document');
+
+            return $oDocumentModel->getDocumentList($args);
+        }
+
+        /**
+         * @brief Comment Search
+         **/
+        function getComments($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
+            if(is_array($module_srls_list)){
+				if (count($module_srls_list) > 0) $module_srls = implode(',',$module_srls_list); 
+				else $module_srls = 0; 
+			}
+            else {
+				$module_srls = ($module_srls_list)?$module_srls_list:0;
+			}
+            if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+            else $args->module_srl = $module_srls;
+
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = 'content';
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'list_order'; 
+            $args->order_type = 'asc';
+            // Get a list of documents
+            $oCommentModel = &getModel('comment');
+            $output = $oCommentModel->getTotalCommentList($args);
+            if(!$output->toBool()|| !$output->data) return $output;
+            return $output;
+        }
+
+        /**
+         * @brief Search trackbacks
+         **/
+        function getTrackbacks($target, $module_srls_list, $search_target = "title", $search_keyword, $page=1, $list_count = 20) {
+            if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
+            else $module_srls = $module_srls_list;
+            if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+            else $args->module_srl = $module_srls;
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = $search_target;
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'list_order'; 
+            $args->order_type = 'asc';
+            // Get a list of documents
+            $oTrackbackModel = &getAdminModel('trackback');
+            $output = $oTrackbackModel->getTotalTrackbackList($args);
+            if(!$output->toBool()|| !$output->data) return $output;
+            return $output;
+        }
+
+        /**
+         * @brief File Search
+         **/
+        function _getFiles($target, $module_srls_list, $search_keyword, $page, $list_count, $direct_download = 'Y') {
+            if(is_array($module_srls_list)) $module_srls = implode(',',$module_srls_list);
+            else $module_srls = $module_srls_list;
+            if($target == 'exclude') $args->exclude_module_srl = $module_srls;
+            else $args->module_srl = $module_srls;
+            $args->page = $page;
+            $args->list_count = $list_count;
+            $args->page_count = 10;
+            $args->search_target = 'filename';
+            $args->search_keyword = $search_keyword;
+            $args->sort_index = 'files.file_srl'; 
+            $args->order_type = 'desc';
+            $args->isvalid = 'Y';
+            $args->direct_download = $direct_download=='Y'?'Y':'N';
+            // Get a list of documents
+            $oFileAdminModel = &getAdminModel('file');
+            $output = $oFileAdminModel->getFileList($args);
+            if(!$output->toBool() || !$output->data) return $output;
+
+            $list = array();
+            foreach($output->data as $key => $val) {
+                $obj = null;
+                $obj->filename = $val->source_filename;
+                $obj->download_count = $val->download_count;
+                if(substr($val->download_url,0,2)=='./') $val->download_url = substr($val->download_url,2);
+                $obj->download_url = Context::getRequestUri().$val->download_url;
+                $obj->target_srl = $val->upload_target_srl;
+                $obj->file_size = $val->file_size;
+                // Images
+                if(preg_match('/\.(jpg|jpeg|gif|png)$/i', $val->source_filename)) {
+                    $obj->type = 'image';
+
+                    $thumbnail_path = sprintf('files/cache/thumbnails/%s',getNumberingPath($val->file_srl, 3));
+                    if(!is_dir($thumbnail_path)) FileHandler::makeDir($thumbnail_path);
+                    $thumbnail_file = sprintf('%s%dx%d.%s.jpg', $thumbnail_path, 120, 120, 'crop');
+                    $thumbnail_url  = Context::getRequestUri().$thumbnail_file;
+                    if(!file_exists($thumbnail_file)) FileHandler::createImageFile($val->uploaded_filename, $thumbnail_file, 120, 120, 'jpg', 'crop');
+                    $obj->src = sprintf('<img src="%s" alt="%s" width="%d" height="%d" />', $thumbnail_url, htmlspecialchars($obj->filename), 120, 120);
+                // Videos
+                } elseif(preg_match('/\.(swf|flv|wmv|avi|mpg|mpeg|asx|asf|mp3)$/i', $val->source_filename)) {
+                    $obj->type = 'multimedia';
+                    $obj->src = sprintf('<script type="text/javascript">displayMultimedia("%s",120,120);</script>', $obj->download_url);
+                // Others
+                } else {
+                    $obj->type = 'binary';
+                    $obj->src = '';
+                }
+
+                $list[] = $obj;
+                $target_list[] = $val->upload_target_srl;
+            }
+            $output->data = $list;
+
+            $oDocumentModel = &getModel('document');
+            $document_list = $oDocumentModel->getDocuments($target_list);
+            if($document_list) foreach($document_list as $key => $val) {
+                foreach($output->data as $k => $v) {
+                    if($v->target_srl== $val->document_srl) {
+                        $output->data[$k]->url = $val->getPermanentUrl();
+                        $output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
+                        $output->data[$k]->nick_name = $val->getNickName();
+                    }
+                }
+            }
+
+            $oCommentModel = &getModel('comment');
+            $comment_list = $oCommentModel->getComments($target_list);
+            if($comment_list) foreach($comment_list as $key => $val) {
+                foreach($output->data as $k => $v) {
+                    if($v->target_srl== $val->comment_srl) {
+                        $output->data[$k]->url = $val->getPermanentUrl();
+                        $output->data[$k]->regdate = $val->getRegdate("Y-m-d H:i");
+                        $output->data[$k]->nick_name = $val->getNickName();
+                    }
+                }
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief Multimedia Search
+         **/
+        function getImages($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
+            return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count);
+        }
+
+        /**
+         * @brief Search for attachments
+         **/
+        function getFiles($target, $module_srls_list, $search_keyword, $page=1, $list_count = 20) {
+            return $this->_getFiles($target, $module_srls_list, $search_keyword, $page, $list_count, 'N');
+        }
+
+    }
+?>
diff --git a/modules/integration_search/integration_search.view.php b/modules/integration_search/integration_search.view.php
index 8358f68ab..156ec0bf5 100644
--- a/modules/integration_search/integration_search.view.php
+++ b/modules/integration_search/integration_search.view.php
@@ -1,103 +1,106 @@
-<?php
-    /**
-     * @class  integration_searchView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  integration_search module의 view class
-     *
-     * 통합검색 출력
-     *
-     **/
-
-    class integration_searchView extends integration_search {
-
-        var $target_mid = array();
-        var $skin = 'default';
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 통합 검색 출력
-         **/
-        function IS() {
-            $oFile = &getClass('file');
-            $oModuleModel = &getModel('module');
-
-            // 권한 체크
-            if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
-
-            $config = $oModuleModel->getModuleConfig('integration_search');
-            if(!$config->skin) $config->skin = 'default';
-            Context::set('module_info', unserialize($config->skin_vars));
-            $this->setTemplatePath($this->module_path."/skins/".$config->skin."/");
-
-            $target = $config->target;
-            if(!$target) $target = 'include';
-            $module_srl_list = explode(',',$config->target_module_srl);
-
-            // 검색어 변수 설정
-            $is_keyword = Context::get('is_keyword');
-
-            // 페이지 변수 설정
-            $page = (int)Context::get('page');
-            if(!$page) $page = 1;
-
-            // 검색탭에 따른 검색
-            $where = Context::get('where');
-
-            // integration search model객체 생성
-            if($is_keyword) {
-                $oIS = &getModel('integration_search');
-                switch($where) {
-                    case 'document' :
-                            $search_target = Context::get('search_target');
-                            if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
-                            Context::set('search_target', $search_target);
-
-                            $output = $oIS->getDocuments($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
-                            Context::set('output', $output);
-                            $this->setTemplateFile("document", $page);
-                        break;
-                    case 'comment' :
-                            $output = $oIS->getComments($target, $module_srl_list, $is_keyword, $page, 10);
-                            Context::set('output', $output);
-                            $this->setTemplateFile("comment", $page);
-                        break;
-                    case 'trackback' :
-                            $search_target = Context::get('search_target');
-                            if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
-                            Context::set('search_target', $search_target);
-
-                            $output = $oIS->getTrackbacks($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
-                            Context::set('output', $output);
-                            $this->setTemplateFile("trackback", $page);
-                        break;
-                    case 'multimedia' :
-                            $output = $oIS->getImages($target, $module_srl_list, $is_keyword, $page,20);
-                            Context::set('output', $output);
-                            $this->setTemplateFile("multimedia", $page);
-                        break;
-                    case 'file' :
-                            $output = $oIS->getFiles($target, $module_srl_list, $is_keyword, $page, 20);
-                            Context::set('output', $output);
-                            $this->setTemplateFile("file", $page);
-                        break;
-                    default :
-                            $output['document'] = $oIS->getDocuments($target, $module_srl_list, 'title', $is_keyword, $page, 5);
-                            $output['comment'] = $oIS->getComments($target, $module_srl_list, $is_keyword, $page, 5);
-                            $output['trackback'] = $oIS->getTrackbacks($target, $module_srl_list, 'title', $is_keyword, $page, 5);
-                            $output['multimedia'] = $oIS->getImages($target, $module_srl_list, $is_keyword, $page, 5);
-                            $output['file'] = $oIS->getFiles($target, $module_srl_list, $is_keyword, $page, 5);
-                            Context::set('search_result', $output);
-                            $this->setTemplateFile("index", $page);
-                        break;
-                }
-            } else {
-                $this->setTemplateFile("no_keywords");
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class  integration_searchView
+     * @author NHN (developers@xpressengine.com)
+     * @brief view class of the integration_search module
+     *
+     * Search Output
+     *
+     **/
+
+    class integration_searchView extends integration_search {
+
+        var $target_mid = array();
+        var $skin = 'default';
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Search Result
+         **/
+        function IS() {
+            $oFile = &getClass('file');
+            $oModuleModel = &getModel('module');
+            // Check permissions
+            if(!$this->grant->access) return new Object(-1,'msg_not_permitted');
+
+            $config = $oModuleModel->getModuleConfig('integration_search');
+            if(!$config->skin) $config->skin = 'default';
+            Context::set('module_info', unserialize($config->skin_vars));
+            $this->setTemplatePath($this->module_path."/skins/".$config->skin."/");
+
+            $target = $config->target;
+            if(!$target) $target = 'include';
+			
+			if (empty($config->target_module_srl))
+				$module_srl_list = array();
+			else
+	            $module_srl_list = explode(',',$config->target_module_srl);
+
+            // Set a variable for search keyword
+            $is_keyword = Context::get('is_keyword');
+            // Set page variables
+            $page = (int)Context::get('page');
+            if(!$page) $page = 1;
+            // Search by search tab
+            $where = Context::get('where');
+            // Create integration search model object 
+            if($is_keyword) {
+                $oIS = &getModel('integration_search');
+                switch($where) {
+                    case 'document' :
+                            $search_target = Context::get('search_target');
+                            if(!in_array($search_target, array('title','content','title_content','tag'))) $search_target = 'title';
+                            Context::set('search_target', $search_target);
+
+                            $output = $oIS->getDocuments($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("document", $page);
+                        break;
+                    case 'comment' :
+                            $output = $oIS->getComments($target, $module_srl_list, $is_keyword, $page, 10);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("comment", $page);
+                        break;
+                    case 'trackback' :
+                            $search_target = Context::get('search_target');
+                            if(!in_array($search_target, array('title','url','blog_name','excerpt'))) $search_target = 'title';
+                            Context::set('search_target', $search_target);
+
+                            $output = $oIS->getTrackbacks($target, $module_srl_list, $search_target, $is_keyword, $page, 10);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("trackback", $page);
+                        break;
+                    case 'multimedia' :
+                            $output = $oIS->getImages($target, $module_srl_list, $is_keyword, $page,20);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("multimedia", $page);
+                        break;
+                    case 'file' :
+                            $output = $oIS->getFiles($target, $module_srl_list, $is_keyword, $page, 20);
+                            Context::set('output', $output);
+                            $this->setTemplateFile("file", $page);
+                        break;
+                    default :
+                            $output['document'] = $oIS->getDocuments($target, $module_srl_list, 'title', $is_keyword, $page, 5);
+                            $output['comment'] = $oIS->getComments($target, $module_srl_list, $is_keyword, $page, 5);
+                            $output['trackback'] = $oIS->getTrackbacks($target, $module_srl_list, 'title', $is_keyword, $page, 5);
+                            $output['multimedia'] = $oIS->getImages($target, $module_srl_list, $is_keyword, $page, 5);
+                            $output['file'] = $oIS->getFiles($target, $module_srl_list, $is_keyword, $page, 5);
+                            Context::set('search_result', $output);
+                            $this->setTemplateFile("index", $page);
+                        break;
+                }
+            } else {
+                $this->setTemplateFile("no_keywords");
+            }
+
+			$security = new Security();
+			$security->encodeHTML('is_keyword', 'search_target', 'where', 'page');
+        }
+    }
+?>
diff --git a/modules/integration_search/lang/en.lang.php b/modules/integration_search/lang/en.lang.php
deleted file mode 100644
index 9a112e31b..000000000
--- a/modules/integration_search/lang/en.lang.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (For only basic things)
-     **/
-
-    $lang->integration_search = "Integrated Search";
-
-    $lang->sample_code = "Sample Code";
-    $lang->about_target_module = "Only chosen modules are the target. Please be careful on setting permissions.";
-    $lang->about_sample_code = "You can use integrated search by adding above code on layout or other things.";
-    $lang->msg_no_keyword = "Please input keyword to search";
-
-    $lang->is_result_text = "There are <strong>%d</strong> result(s) for <strong>'%s'</strong>";
-    $lang->multimedia = "Images/ Movies";
-    
-    $lang->include_search_target = 'Search for selected modules';
-    $lang->exclude_search_target = 'Exclude selected modules from search';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => 'Subject+Content',
-            'title' => 'Subject',
-            'content' => 'Content',
-            'tag' => 'Tags',
-        ),
-        'trackback' => array(
-            'url' => 'Target URL',
-            'blog_name' => 'Target Site Name',
-            'title' => 'Title',
-            'excerpt' => 'Excerpt',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => 'Registered Date',
-        'comment_count' => 'Number of Comments',
-        'readed_count' => 'Number of Hits',
-        'voted_count' => 'Number of Votes',
-    );
-?>
diff --git a/modules/integration_search/lang/es.lang.php b/modules/integration_search/lang/es.lang.php
deleted file mode 100644
index f0bdcd00e..000000000
--- a/modules/integration_search/lang/es.lang.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/integration_search/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español (sólo informaciones básicas).
-     **/
-
-    $lang->integration_search = "Búesqueda Integrada";
-
-    $lang->sample_code = "Código de ejemplo";
-    $lang->about_target_module = "Sólo los módulos elegidos son objetivos. Tenga cuidado con la configuración de las atribuciones";
-    $lang->about_sample_code = "Si usted añade el código del diseño es posible la búsqueda Integrada";
-    $lang->msg_no_keyword = "Ingrese la palabra para la búsqueda";
-
-    $lang->is_result_text = "<strong>%d</strong> Resultados con la palabra <strong>'%s'</strong> ";
-    $lang->multimedia = "Images/ Movies";
-    
-    $lang->include_search_target = 'Sólo en determinados ';
-    $lang->exclude_search_target = 'Búsqueda para el destino de';
-
-    $lang->is_search_option = array(
-        'document' => array(
-        'title_content' => 'Título+Contenido',
-        'title' => 'Título',
-        'content' => 'Contenido',
-        'tag' => 'Etiqueta',
-        ),
-        'trackback' => array(
-            'url' => 'URL objetivo',
-            'blog_name' => 'Ojetivo del nombre de sitio',
-            'title' => 'Título',
-            'excerpt' => 'Contenido',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => 'Fecha del registro',
-        'comment_count' => 'Número de commentarios',
-        'readed_count' => 'Número de query',
-        'voted_count' => 'Número de recomendaciones',
-    );
-?>
diff --git a/modules/integration_search/lang/fr.lang.php b/modules/integration_search/lang/fr.lang.php
deleted file mode 100644
index 69e3b9565..000000000
--- a/modules/integration_search/lang/fr.lang.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Recherche Unie
-     **/
-
-    $lang->integration_search = "Recherche Unie";
-
-    $lang->sample_code = "Code d\'échantillon";
-    $lang->about_target_module = "Les modules choisis seulement seront les objectifs. Faites attention quand vous mettez la permission, S.V.P.";
-    $lang->about_sample_code = "Vous pouvez utiliser la Reherche Uni si vous ajoutez le code au-dessus dans le Mise en Page etc.";
-    $lang->msg_no_keyword = "Entrez le mot de clé à rechercher, S.V.P.";
-
-    $lang->is_result_text = "Il y a <strong>%d</strong> résultat(s) pour <strong>'%s'</strong>";
-    $lang->multimedia = "Images/ Movies";
-    
-    $lang->include_search_target = 'Seulement dans certaines cibles ';
-    $lang->exclude_search_target = 'Recherche de la destination sélectionnée à partir de';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => 'Titre+Contenu',
-            'title' => 'Titre',
-            'content' => 'Contenu',
-            'tag' => 'Balise',
-        ),
-        'trackback' => array(
-            'url' => 'URL objectif',
-            'blog_name' => 'Nom du Site objectif',
-            'title' => 'Titre',
-            'excerpt' => 'Contenu',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => 'Enrégistré',
-        'comment_count' => 'Commentaires',
-        'readed_count' => 'Vues',
-        'voted_count' => 'Recommandés',
-    );
-?>
diff --git a/modules/integration_search/lang/jp.lang.php b/modules/integration_search/lang/jp.lang.php
deleted file mode 100644
index a4562656e..000000000
--- a/modules/integration_search/lang/jp.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみう）
-     **/
-
-    $lang->integration_search = '統合検索';
-
-    $lang->sample_code = 'サンプルコード';
-    $lang->about_target_module = '選択されたモジュールだけを検索対象とします。各モジュールの権限設定にも注意して下さい。';
-    $lang->about_sample_code = '上のコードをレイアウトなどに挿入すると統合検索が可能になります。';
-    $lang->msg_no_keyword = '検索語を入力して下さい。';
-    $lang->msg_document_more_search  = '継続サーチボタンを選択すると、まだ検索結果として引っかからなかった箇所を引き続き検索を行います。';
-
-    $lang->is_result_text = "<strong>'%s'</strong>に対する検索結果<strong>%d</strong>件";
-    $lang->multimedia = '画像/動画';
-    
-    $lang->include_search_target = '選択された対象のみ';
-    $lang->exclude_search_target = '選択した対象を検索から除外';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => 'タイトル+内容',
-            'title' => 'タイトル',
-            'content' => '内容',
-            'tag' => 'タグ',
-        ),
-        'trackback' => array(
-            'url' => '対象URL',
-            'blog_name' => '対象サイト（ブログ）名',
-            'title' => 'タイトル',
-            'excerpt' => '内容',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => '登録日',
-        'comment_count' => 'コメント数',
-        'readed_count' => '閲覧数',
-        'voted_count' => '推薦数',
-    );
-?>
diff --git a/modules/integration_search/lang/ko.lang.php b/modules/integration_search/lang/ko.lang.php
deleted file mode 100644
index 198db6e29..000000000
--- a/modules/integration_search/lang/ko.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->integration_search = '통합검색';
-
-    $lang->sample_code = '샘플코드';
-    $lang->about_target_module = '선택된 모듈만 검색 대상으로 정합니다. 권한설정에 대한 주의를 바랍니다.';
-    $lang->about_sample_code = '위 코드를 레이아웃, 스킨 등에 추가하시면 통합검색이 가능합니다.';
-    $lang->msg_no_keyword = '검색어를 입력해주세요.';
-    $lang->msg_document_more_search  = '\'계속 검색\' 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다.';
-
-    $lang->is_result_text = "<strong>'%s'</strong> 에 대한 검색결과 <strong>%d</strong>건";
-    $lang->multimedia = '이미지/동영상';
-    
-    $lang->include_search_target = '선택된 대상만 검색';
-    $lang->exclude_search_target = '선택된 대상을 검색에서 제외';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => '제목+내용',
-            'title' => '제목',
-            'content' => '내용',
-            'tag' => '태그',
-        ),
-        'trackback' => array(
-            'url' => '대상 URL',
-            'blog_name' => '대상 사이트 이름',
-            'title' => '제목',
-            'excerpt' => '내용',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => '등록일',
-        'comment_count' => '댓글 수',
-        'readed_count' => '조회 수',
-        'voted_count' => '추천 수',
-    );
-?>
diff --git a/modules/integration_search/lang/lang.xml b/modules/integration_search/lang/lang.xml
new file mode 100644
index 000000000..cd329ab1f
--- /dev/null
+++ b/modules/integration_search/lang/lang.xml
@@ -0,0 +1,267 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="integration_search">
+		<value xml:lang="ko"><![CDATA[통합검색]]></value>
+		<value xml:lang="en"><![CDATA[Integrated Search]]></value>
+		<value xml:lang="jp"><![CDATA[統合検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[综合搜索]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋]]></value>
+		<value xml:lang="fr"><![CDATA[Recherche Unie]]></value>
+		<value xml:lang="ru"><![CDATA[Общий поиск]]></value>
+		<value xml:lang="es"><![CDATA[Búesqueda Integrada]]></value>
+		<value xml:lang="tr"><![CDATA[Birleşik Arama]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm kiếm tổng hợp]]></value>
+	</item>
+	<item name="sample_code">
+		<value xml:lang="ko"><![CDATA[샘플코드]]></value>
+		<value xml:lang="en"><![CDATA[Sample Code]]></value>
+		<value xml:lang="jp"><![CDATA[サンプルコード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[代码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[原始碼]]></value>
+		<value xml:lang="fr"><![CDATA[Code d'échantillon]]></value>
+		<value xml:lang="ru"><![CDATA[Образец кода]]></value>
+		<value xml:lang="es"><![CDATA[Código de ejemplo]]></value>
+		<value xml:lang="tr"><![CDATA[Örnek Kod]]></value>
+		<value xml:lang="vi"><![CDATA[Code mẫu]]></value>
+	</item>
+	<item name="about_target_module">
+		<value xml:lang="ko"><![CDATA[선택된 모듈만 검색 대상으로 정합니다. 권한설정에 대한 주의를 바랍니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only chosen modules are the target. Please be careful on setting the permissions.]]></value>
+		<value xml:lang="jp"><![CDATA[選択されたモジュールだけを検索対象とします。各モジュールの権限設定にも注意してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[所选模块作为搜索对象。请注意权限设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只將所選擇的模組當作搜尋對象。請注意權限設置。]]></value>
+		<value xml:lang="fr"><![CDATA[Les modules choisis seulement seront les objectifs. Faites attention quand vous mettez la permission, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Поиск только выбранных модулей. Пожалуйста, будьте осторожны, устанавливая контроль]]></value>
+		<value xml:lang="es"><![CDATA[Sólo los módulos elegidos son objetivos. Tenga cuidado con la configuración de las atribuciones]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece seçilmiş modüller hedef olacaktır. Lütfen yetki ayarlarına dikkat ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ tìm kiếm trên những Module đã chọn. Hãy cẩn thận vì có thể có Module bạn không được phép truy cập.]]></value>
+	</item>
+	<item name="about_sample_code">
+		<value xml:lang="ko"><![CDATA[위 코드를 레이아웃, 스킨 등에 추가하시면 통합검색이 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can use integrated search by adding the above code in the layout or other things.]]></value>
+		<value xml:lang="jp"><![CDATA[上のコードをレイアウトなどに挿入すると統合検索が可能になります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可把上述代码插入到相应布局当中即可实现搜索功能。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[將上述原始碼插入到相對應版面當中，即可實現搜尋功能。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez utiliser la Reherche Uni si vous ajoutez le code au-dessus dans le Mise en Page etc.]]></value>
+		<value xml:lang="ru"><![CDATA[Для общего поиска добавьте этот код в лейаут, скин]]></value>
+		<value xml:lang="es"><![CDATA[Si usted añade el código del diseño es posible la búsqueda Integrada]]></value>
+		<value xml:lang="tr"><![CDATA[Birleşik Aramayı, yukardaki kodu yerleşim düzenine veya başla şeylere ekleyerek kullanabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể sử dụng chức năng tìm kiếm tổng hợp bằng cách thêm đoạn mã ở trên vào vị trí nào bạn muốn trong giao diện.]]></value>
+	</item>
+	<item name="msg_no_keyword">
+		<value xml:lang="ko"><![CDATA[검색어를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter keyword to search]]></value>
+		<value xml:lang="jp"><![CDATA[検索語を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入搜索关键词。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入關鍵字]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le mot de clé à rechercher, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Введите ключевое слово для поиска]]></value>
+		<value xml:lang="es"><![CDATA[Ingrese la palabra para la búsqueda]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen aranacak anahtar kelimeyi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập từ khóa để tìm kiếm!]]></value>
+	</item>
+	<item name="msg_document_more_search">
+		<value xml:lang="ko"><![CDATA['계속 검색' 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Click 'Search Next' button to keep searching.]]></value>
+		<value xml:lang="jp"><![CDATA[継続サーチボタンを選択すると、まだ検索結果として引っかからなかった箇所を引き続き検索を行います。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[利用'继续搜索'按钮可以进一步搜索。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[계속 검색 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다]]></value>
+		<value xml:lang="ru"><![CDATA['Искать дальше' Если выберете эту кнопку, то продолжится поиск]]></value>
+	</item>
+	<item name="is_result_text">
+		<value xml:lang="ko"><![CDATA[<strong>'%s'</strong>에 대한 검색결과 <strong>%d</strong>건]]></value>
+		<value xml:lang="en"><![CDATA[There are <strong>%d</strong> result(s) for <strong>'%s'</strong>]]></value>
+		<value xml:lang="jp"><![CDATA[<strong>'%s'</strong>に対する検索結果<strong>%d</strong>件]]></value>
+		<value xml:lang="zh-CN"><![CDATA[符合<strong>'%s'</strong>的搜索结果约有<strong>%d</strong>项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[符合<strong>'%s'</strong>的搜尋結果，約有<strong>%d</strong>項]]></value>
+		<value xml:lang="fr"><![CDATA[Il y a <strong>%d</strong> résultat(s) pour <strong>'%s'</strong>]]></value>
+		<value xml:lang="ru"><![CDATA[<strong>%d</strong> результатов для <strong>%s</strong>]]></value>
+		<value xml:lang="es"><![CDATA[<strong>%d</strong> Resultados con la palabra <strong>'%s'</strong> ]]></value>
+		<value xml:lang="tr"><![CDATA[<strong>'%s'</strong> için yaklaşık <strong>%d</strong> sonuç bulundu ]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm thấy <strong>%d</strong> kết quả cho <strong>'%s'</strong>]]></value>
+	</item>
+	<item name="multimedia">
+		<value xml:lang="ko"><![CDATA[이미지/동영상]]></value>
+		<value xml:lang="en"><![CDATA[Images/Video]]></value>
+		<value xml:lang="jp"><![CDATA[画像/動画]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图片/视频]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片/影片]]></value>
+		<value xml:lang="ru"><![CDATA[Картинки/Видео]]></value>
+		<value xml:lang="tr"><![CDATA[Resimler/ Görüntüler]]></value>
+		<value xml:lang="vi"><![CDATA[Hình ảnh/ Video]]></value>
+	</item>
+	<item name="include_search_target">
+		<value xml:lang="ko"><![CDATA[선택된 대상만 검색]]></value>
+		<value xml:lang="en"><![CDATA[Search for selected modules]]></value>
+		<value xml:lang="jp"><![CDATA[選択された対象のみ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只搜索所选对象]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只有在選定的目標]]></value>
+		<value xml:lang="fr"><![CDATA[Seulement dans certaines cibles ]]></value>
+		<value xml:lang="ru"><![CDATA[Поиск только для выбранных модулей]]></value>
+		<value xml:lang="es"><![CDATA[Sólo en determinados ]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili modüller içinde ara]]></value>
+	</item>
+	<item name="exclude_search_target">
+		<value xml:lang="ko"><![CDATA[선택된 대상을 검색에서 제외]]></value>
+		<value xml:lang="en"><![CDATA[Exclude selected modules from search]]></value>
+		<value xml:lang="jp"><![CDATA[選択した対象を検索から除外]]></value>
+		<value xml:lang="zh-CN"><![CDATA[所选对象从搜索中排除]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜索選定目的地從]]></value>
+		<value xml:lang="fr"><![CDATA[Recherche de la destination sélectionnée à partir de]]></value>
+		<value xml:lang="ru"><![CDATA[Исключить выбранные модули из поиска]]></value>
+		<value xml:lang="es"><![CDATA[Búsqueda para el destino de]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili modülleri arama dışında tut]]></value>
+	</item>
+	<item name="is_search_option" type="array">
+		<item name="document" type="array">
+			<item name="title_content">
+				<value xml:lang="ko"><![CDATA[제목+내용]]></value>
+				<value xml:lang="en"><![CDATA[Subject+Content]]></value>
+				<value xml:lang="jp"><![CDATA[タイトル+内容]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题+内容]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題+內容]]></value>
+				<value xml:lang="fr"><![CDATA[Titre+Contenu]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок+Содержание]]></value>
+				<value xml:lang="es"><![CDATA[Título+Contenido]]></value>
+				<value xml:lang="tr"><![CDATA[Konu+İçerik]]></value>
+				<value xml:lang="vi"><![CDATA[T.Đề+N.Dung]]></value>
+			</item>
+			<item name="title">
+				<value xml:lang="ko"><![CDATA[제목]]></value>
+				<value xml:lang="en"><![CDATA[Subject]]></value>
+				<value xml:lang="jp"><![CDATA[タイトル]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+				<value xml:lang="fr"><![CDATA[Titre]]></value>
+				<value xml:lang="ru"><![CDATA[Тема]]></value>
+				<value xml:lang="es"><![CDATA[Título]]></value>
+				<value xml:lang="tr"><![CDATA[Konu]]></value>
+				<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+			</item>
+			<item name="content">
+				<value xml:lang="ko"><![CDATA[내용]]></value>
+				<value xml:lang="en"><![CDATA[Content]]></value>
+				<value xml:lang="jp"><![CDATA[内容]]></value>
+				<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+				<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+				<value xml:lang="fr"><![CDATA[Contenu]]></value>
+				<value xml:lang="ru"><![CDATA[Содержание]]></value>
+				<value xml:lang="es"><![CDATA[Contenido]]></value>
+				<value xml:lang="tr"><![CDATA[İçerik]]></value>
+				<value xml:lang="vi"><![CDATA[Nội dung]]></value>
+			</item>
+			<item name="tag">
+				<value xml:lang="ko"><![CDATA[태그]]></value>
+				<value xml:lang="en"><![CDATA[Tags]]></value>
+				<value xml:lang="jp"><![CDATA[タグ]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标签]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標籤]]></value>
+				<value xml:lang="fr"><![CDATA[Balise]]></value>
+				<value xml:lang="ru"><![CDATA[Теги]]></value>
+				<value xml:lang="es"><![CDATA[Etiqueta]]></value>
+				<value xml:lang="tr"><![CDATA[Etiketler]]></value>
+				<value xml:lang="vi"><![CDATA[Tag]]></value>
+			</item>
+		</item>
+		<item name="trackback" type="array">
+			<item name="url">
+				<value xml:lang="ko"><![CDATA[대상 URL]]></value>
+				<value xml:lang="en"><![CDATA[Target URL]]></value>
+				<value xml:lang="jp"><![CDATA[対象URL]]></value>
+				<value xml:lang="zh-CN"><![CDATA[对象URL]]></value>
+				<value xml:lang="zh-TW"><![CDATA[目標網址]]></value>
+				<value xml:lang="fr"><![CDATA[URL objectif]]></value>
+				<value xml:lang="ru"><![CDATA[URL]]></value>
+				<value xml:lang="es"><![CDATA[URL objetivo]]></value>
+				<value xml:lang="tr"><![CDATA[Hedef URL]]></value>
+				<value xml:lang="vi"><![CDATA[URL]]></value>
+			</item>
+			<item name="blog_name">
+				<value xml:lang="ko"><![CDATA[대상 사이트 이름]]></value>
+				<value xml:lang="en"><![CDATA[Target Site Name]]></value>
+				<value xml:lang="jp"><![CDATA[対象サイト（ブログ）名]]></value>
+				<value xml:lang="zh-CN"><![CDATA[对象网站名称]]></value>
+				<value xml:lang="zh-TW"><![CDATA[目標網站名稱]]></value>
+				<value xml:lang="fr"><![CDATA[Nom du Site objectif]]></value>
+				<value xml:lang="ru"><![CDATA[Имя сайта]]></value>
+				<value xml:lang="es"><![CDATA[Ojetivo del nombre de sitio]]></value>
+				<value xml:lang="tr"><![CDATA[Hedef Site İsmi]]></value>
+				<value xml:lang="vi"><![CDATA[Tên Website]]></value>
+			</item>
+			<item name="title">
+				<value xml:lang="ko"><![CDATA[제목]]></value>
+				<value xml:lang="en"><![CDATA[Title]]></value>
+				<value xml:lang="jp"><![CDATA[タイトル]]></value>
+				<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+				<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+				<value xml:lang="fr"><![CDATA[Titre]]></value>
+				<value xml:lang="ru"><![CDATA[Заголовок]]></value>
+				<value xml:lang="es"><![CDATA[Título]]></value>
+				<value xml:lang="tr"><![CDATA[Başlık]]></value>
+				<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+			</item>
+			<item name="excerpt">
+				<value xml:lang="ko"><![CDATA[내용]]></value>
+				<value xml:lang="en"><![CDATA[Excerpt]]></value>
+				<value xml:lang="jp"><![CDATA[内容]]></value>
+				<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+				<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+				<value xml:lang="fr"><![CDATA[Contenu]]></value>
+				<value xml:lang="ru"><![CDATA[Содержание]]></value>
+				<value xml:lang="es"><![CDATA[Contenido]]></value>
+				<value xml:lang="tr"><![CDATA[Alıntı]]></value>
+				<value xml:lang="vi"><![CDATA[Trích mô tả]]></value>
+			</item>
+		</item>
+	</item>
+	<item name="is_sort_option" type="array">
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[등록일]]></value>
+			<value xml:lang="en"><![CDATA[Registered Date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[日期]]></value>
+			<value xml:lang="fr"><![CDATA[Enrégistré]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+			<value xml:lang="es"><![CDATA[Fecha del registro]]></value>
+			<value xml:lang="tr"><![CDATA[Kayıt Zamanı]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+		</item>
+		<item name="comment_count">
+			<value xml:lang="ko"><![CDATA[댓글 수]]></value>
+			<value xml:lang="en"><![CDATA[Number of Comments]]></value>
+			<value xml:lang="jp"><![CDATA[コメント数]]></value>
+			<value xml:lang="zh-CN"><![CDATA[评论]]></value>
+			<value xml:lang="zh-TW"><![CDATA[評論]]></value>
+			<value xml:lang="fr"><![CDATA[Commentaires]]></value>
+			<value xml:lang="ru"><![CDATA[Кол-во комментариев]]></value>
+			<value xml:lang="es"><![CDATA[Número de commentarios]]></value>
+			<value xml:lang="tr"><![CDATA[Yorum Sayısı]]></value>
+			<value xml:lang="vi"><![CDATA[Số bình luận]]></value>
+		</item>
+		<item name="readed_count">
+			<value xml:lang="ko"><![CDATA[조회 수]]></value>
+			<value xml:lang="en"><![CDATA[Number of Hits]]></value>
+			<value xml:lang="jp"><![CDATA[閲覧数]]></value>
+			<value xml:lang="zh-CN"><![CDATA[查看]]></value>
+			<value xml:lang="zh-TW"><![CDATA[檢視]]></value>
+			<value xml:lang="fr"><![CDATA[Vues]]></value>
+			<value xml:lang="ru"><![CDATA[Кол-во хитов]]></value>
+			<value xml:lang="es"><![CDATA[Número de query]]></value>
+			<value xml:lang="tr"><![CDATA[Tıklanma Sayısı]]></value>
+			<value xml:lang="vi"><![CDATA[Lượt xem]]></value>
+		</item>
+		<item name="voted_count">
+			<value xml:lang="ko"><![CDATA[추천 수]]></value>
+			<value xml:lang="en"><![CDATA[Number of Votes]]></value>
+			<value xml:lang="jp"><![CDATA[推薦数]]></value>
+			<value xml:lang="zh-CN"><![CDATA[推荐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[推薦]]></value>
+			<value xml:lang="fr"><![CDATA[Recommandés]]></value>
+			<value xml:lang="ru"><![CDATA[Кол-во голосов]]></value>
+			<value xml:lang="es"><![CDATA[Número de recomendaciones]]></value>
+			<value xml:lang="tr"><![CDATA[Oylanma Sayısı]]></value>
+			<value xml:lang="vi"><![CDATA[Bình chọn]]></value>
+		</item>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/integration_search/lang/ru.lang.php b/modules/integration_search/lang/ru.lang.php
deleted file mode 100644
index ed2139544..000000000
--- a/modules/integration_search/lang/ru.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->integration_search = "Общий поиск";
-
-    $lang->sample_code = 'Образец кода';
-    $lang->about_target_module = 'Поиск только выбранных модулей. Пожалуйста, будьте осторожны, устанавливая контроль';
-    $lang->about_sample_code = 'Для общего поиска добавьте этот код в лейаут, скин';
-    $lang->msg_no_keyword = 'Введите ключевое слово для поиска';
-    $lang->msg_document_more_search  = '\'Искать дальше\' Если выберете эту кнопку, то продолжится поиск';
-
-    $lang->is_result_text = '<strong>%d</strong> результатов для <strong>%s</strong>';
-    $lang->multimedia = 'Картинки/Видео';
-
-    $lang->include_search_target = 'Поиск только для выбранных модулей';
-    $lang->exclude_search_target = 'Исключить выбранные модули из поиска';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => 'Заголовок+Содержание',
-            'title' => 'Тема',
-            'content' => 'Содержание',
-            'tag' => 'Теги',
-        ),
-        'trackback' => array(
-            'url' => 'URL',
-            'blog_name' => 'Имя сайта',
-            'title' => 'Заголовок',
-            'excerpt' => 'Содержание',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => 'Дата регистрации',
-        'comment_count' => 'Кол-во комментариев',
-        'readed_count' => 'Кол-во хитов',
-        'voted_count' => 'Кол-во голосов',
-    );
-?>
diff --git a/modules/integration_search/lang/tr.lang.php b/modules/integration_search/lang/tr.lang.php
deleted file mode 100644
index 9fefb8783..000000000
--- a/modules/integration_search/lang/tr.lang.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (For only basic things)
-     **/
-
-    $lang->integration_search = "Birleşik Arama";
-
-    $lang->sample_code = "Örnek Kod";
-    $lang->about_target_module = "Sadece seçilmiş modüller hedef olacaktır. Lütfen yetki ayarlarına dikkat ediniz.";
-    $lang->about_sample_code = "Birleşik Aramayı, yukardaki kodu yerleşim düzenine veya başla şeylere ekleyerek kullanabilirsiniz.";
-    $lang->msg_no_keyword = "Lütfen aranacak anahtar kelimeyi giriniz";
-
-    $lang->is_result_text = "<strong>'%s'</strong> için yaklaşık <strong>%d</strong> sonuç bulundu ";
-    $lang->multimedia = "Resimler/ Görüntüler";
-    
-    $lang->include_search_target = 'Seçili modüller içinde ara';
-    $lang->exclude_search_target = 'Seçili modülleri arama dışında tut';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => 'Konu+İçerik',
-            'title' => 'Konu',
-            'content' => 'İçerik',
-            'tag' => 'Etiketler',
-        ),
-        'trackback' => array(
-            'url' => 'Hedef URL',
-            'blog_name' => 'Hedef Site İsmi',
-            'title' => 'Başlık',
-            'excerpt' => 'Alıntı',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => 'Kayıt Zamanı',
-        'comment_count' => 'Yorum Sayısı',
-        'readed_count' => 'Tıklanma Sayısı',
-        'voted_count' => 'Oylanma Sayısı',
-    );
-?>
diff --git a/modules/integration_search/lang/vi.lang.php b/modules/integration_search/lang/vi.lang.php
deleted file mode 100644
index 349def5b4..000000000
--- a/modules/integration_search/lang/vi.lang.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->integration_search = "Tìm kiếm tổng hợp";
-
-    $lang->sample_code = "Code mẫu";
-    $lang->about_target_module = "Chỉ tìm kiếm trên những Module đã chọn. Hãy cẩn thận vì có thể có Module bạn không được phép truy cập.";
-    $lang->about_sample_code = "Bạn có thể sử dụng chức năng tìm kiếm tổng hợp bằng cách thêm đoạn mã ở trên vào vị trí nào bạn muốn trong giao diện.";
-    $lang->msg_no_keyword = "Hãy nhập từ khóa để tìm kiếm!";
-
-    $lang->is_result_text = "Tìm thấy <strong>%d</strong> kết quả cho <strong>'%s'</strong>";
-    $lang->multimedia = "Hình ảnh/ Video";
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => 'T.Đề+N.Dung',
-            'title' => 'Tiêu đề',
-            'content' => 'Nội dung',
-            'tag' => 'Tag',
-        ),
-        'trackback' => array(
-            'url' => 'URL',
-            'blog_name' => 'Tên Website',
-            'title' => 'Tiêu đề',
-            'excerpt' => 'Trích mô tả',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => 'Ngày gửi',
-        'comment_count' => 'Số bình luận',
-        'readed_count' => 'Lượt xem',
-        'voted_count' => 'Bình chọn',
-    );
-?>
diff --git a/modules/integration_search/lang/zh-CN.lang.php b/modules/integration_search/lang/zh-CN.lang.php
deleted file mode 100644
index 00895d2fe..000000000
--- a/modules/integration_search/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com) 翻译：guny
-     * @brief  综合搜索简体中文语言包
-     **/
-
-    $lang->integration_search = "综合搜索";
-
-    $lang->sample_code = "代码";
-    $lang->about_target_module = "所选模块作为搜索对象。请注意权限设置。";
-    $lang->about_sample_code = "可把上述代码插入到相应布局当中即可实现搜索功能。";
-    $lang->msg_no_keyword = '请输入搜索关键词。';
-    $lang->msg_document_more_search  = '利用\'继续搜索\'按钮可以进一步搜索。';
-
-    $lang->is_result_text = "符合<strong>'%s'</strong>的搜索结果约有<strong>%d</strong>项";
-    $lang->multimedia = "图片/视频";
-    
-    $lang->include_search_target = '只搜索所选对象';
-    $lang->exclude_search_target = '所选对象从搜索中排除';
-
-    $lang->is_search_option = array(
-        'document' => array(
-        'title_content' => '标题+内容',
-        'title' => '标题',
-        'content' => '内容',
-        'tag' => '标签',
-        ),
-        'trackback' => array(
-            'url' => '对象URL',
-            'blog_name' => '对象网站名称',
-            'title' => '标题',
-            'excerpt' => '内容',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => '日期',
-        'comment_count' => '评论',
-        'readed_count' => '查看',
-        'voted_count' => '推荐',
-    );
-?>
diff --git a/modules/integration_search/lang/zh-TW.lang.php b/modules/integration_search/lang/zh-TW.lang.php
deleted file mode 100644
index d29807db4..000000000
--- a/modules/integration_search/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-    /**
-     * @file   modules/integration_search/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  綜合搜尋(integration_search)模組正體中文語言
-     **/
-
-    $lang->integration_search = "搜尋";
-
-    $lang->sample_code = "原始碼";
-    $lang->about_target_module = "只將所選擇的模組當作搜尋對象。請注意權限設置。";
-    $lang->about_sample_code = "將上述原始碼插入到相對應版面當中，即可實現搜尋功能。";
-    $lang->msg_no_keyword = "請輸入關鍵字";
-    $lang->msg_document_more_search  = "계속 검색 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다";
-
-    $lang->is_result_text = "符合<strong>'%s'</strong>的搜尋結果，約有<strong>%d</strong>項";
-    $lang->multimedia = "圖片/影片";
-    
-    $lang->include_search_target = '只有在選定的目標';
-    $lang->exclude_search_target = '搜索選定目的地從';
-
-    $lang->is_search_option = array(
-        'document' => array(
-            'title_content' => '標題+內容',
-            'title' => '標題',
-            'content' => '內容',
-            'tag' => '標籤',
-        ),
-        'trackback' => array(
-            'url' => '目標網址',
-            'blog_name' => '目標網站名稱',
-            'title' => '標題',
-            'excerpt' => '內容',
-        ),
-    );
-
-    $lang->is_sort_option = array(
-        'regdate' => '日期',
-        'comment_count' => '評論',
-        'readed_count' => '檢視',
-        'voted_count' => '推薦',
-    );
-?>
diff --git a/modules/integration_search/ruleset/insertConfig.xml b/modules/integration_search/ruleset/insertConfig.xml
new file mode 100644
index 000000000..27e72cf1e
--- /dev/null
+++ b/modules/integration_search/ruleset/insertConfig.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+    </fields>
+</ruleset>
diff --git a/modules/integration_search/skins/default/document.html b/modules/integration_search/skins/default/document.html
index 33bfc08ec..c1bf9d367 100644
--- a/modules/integration_search/skins/default/document.html
+++ b/modules/integration_search/skins/default/document.html
@@ -14,7 +14,7 @@
         {$lang->msg_no_result}
         <!--@if($last_division)-->
         <br />{$lang->msg_document_more_search}
-        <br /><a href="{getUrl('where','document','page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}" class="button"><span>{$lang->cmd_search_next}</span></a>
+        <br /><span class="btn"><a href="{getUrl('where','document','page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}">{$lang->cmd_search_next}</a></span>
         <!--@end-->
     </span>
 <!--@else-->
@@ -37,17 +37,17 @@
 
     <!--@if($where == 'document' && $output->page_navigation)-->
         <div class="pagination a1">
-            <a href="{getUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
+            <a href="{getAutoEncodedUrl('page','')}" class="prevEnd">{$lang->first_page}</a> 
             <!--@while($page_no = $output->page_navigation->getNextPage())-->
                 <!--@if($page == $page_no)-->
                     <strong>{$page_no}</strong> 
                 <!--@else-->
-                    <a href="{getUrl('page',$page_no)}">{$page_no}</a>
+                    <a href="{getAutoEncodedUrl('page',$page_no)}">{$page_no}</a>
                 <!--@end-->
             <!--@end-->
-            <a href="{getUrl('page',$output->page_navigation->last_page)}" <!--@if(!$last_division)-->class="nextEnd"<!--@end-->>{$lang->last_page}</a>
+            <a href="{getAutoEncodedUrl('page',$output->page_navigation->last_page)}" <!--@if(!$last_division)-->class="nextEnd"<!--@end-->>{$lang->last_page}</a>
             <!--@if($last_division)-->
-            <a href="{getUrl('page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}" class="nextEnd">{$lang->cmd_search_next}</a>
+            <a href="{getAutoEncodedUrl('page',1,'document_srl','','search_target',$search_target,'is_keyword',$is_keyword,'division',$last_division,'last_division','')}" class="nextEnd">{$lang->cmd_search_next}</a>
             <!--@end-->
         </div>
     <!--@end-->
diff --git a/modules/integration_search/skins/default/header.html b/modules/integration_search/skins/default/header.html
index 424e6121f..aa65829a3 100644
--- a/modules/integration_search/skins/default/header.html
+++ b/modules/integration_search/skins/default/header.html
@@ -19,17 +19,17 @@
             <input type="hidden" name="act" value="IS" />
             <input type="hidden" name="where" value="{$where}" />
 			<input type="hidden" name="search_target" value="title_content" />
-            <input name="is_keyword" type="text" class="inputText" value="{htmlspecialchars($is_keyword)}"/>
+            <input name="is_keyword" type="text" class="inputText" value="{$is_keyword}"/>
             <span class="button large strong black"><input type="submit" value="{$lang->cmd_search}" /></span>
         </form>
     </div>
 
     <ul class="localNavigation">
-        <li <!--@if(!$where)-->class="on"<!--@end-->><a href="{getUrl('where','','page','','division','')}">{$lang->integration_search}</a></li>
-        <li <!--@if($where=='document')-->class="on"<!--@end-->><a href="{getUrl('where','document','page',1,'division','')}">{$lang->document}</a></li>
-        <li <!--@if($where=='comment')-->class="on"<!--@end-->><a href="{getUrl('where','comment','page',1,'division','')}">{$lang->comment}</a></li>
-        <li <!--@if($where=='trackback')-->class="on"<!--@end-->><a href="{getUrl('where','trackback','page',1,'division','')}">{$lang->trackback}</a></li>
-        <li <!--@if($where=='multimedia')-->class="on"<!--@end-->><a href="{getUrl('where','multimedia','page',1,'division','')}">{$lang->multimedia}</a></li>
-        <li <!--@if($where=='file')-->class="on"<!--@end-->><a href="{getUrl('where','file','page',1,'division','')}">{$lang->file}</a></li>
+        <li <!--@if(!$where)-->class="on"<!--@end-->><a href="{getAutoEncodedUrl('where','','page','','division','')}">{$lang->integration_search}</a></li>
+        <li <!--@if($where=='document')-->class="on"<!--@end-->><a href="{getAutoEncodedUrl('where','document','page',1,'division','')}">{$lang->document}</a></li>
+        <li <!--@if($where=='comment')-->class="on"<!--@end-->><a href="{getAutoEncodedUrl('where','comment','page',1,'division','')}">{$lang->comment}</a></li>
+        <li <!--@if($where=='trackback')-->class="on"<!--@end-->><a href="{getAutoEncodedUrl('where','trackback','page',1,'division','')}">{$lang->trackback}</a></li>
+        <li <!--@if($where=='multimedia')-->class="on"<!--@end-->><a href="{getAutoEncodedUrl('where','multimedia','page',1,'division','')}">{$lang->multimedia}</a></li>
+        <li <!--@if($where=='file')-->class="on"<!--@end-->><a href="{getAutoEncodedUrl('where','file','page',1,'division','')}">{$lang->file}</a></li>
     </ul>
 <!--@end-->
diff --git a/modules/integration_search/skins/default/index.html b/modules/integration_search/skins/default/index.html
index 2e5fe2470..c701fd677 100644
--- a/modules/integration_search/skins/default/index.html
+++ b/modules/integration_search/skins/default/index.html
@@ -1,32 +1,32 @@
-<!--#include("header.html")-->
-
-{@ $output = $search_result['document'] }
-<!--#include("document.html")-->
-<!--@if(count($output->data))-->
-<div class="isMore"><a href="{getUrl('where','document','page',1)}">more</a></div>
-<!--@end-->
-
-{@ $output = $search_result['comment'] }
-<!--#include("comment.html")-->
-<!--@if(count($output->data))-->
-<div class="isMore"><a href="{getUrl('where','comment','page',1)}">more</a></div>
-<!--@end-->
-
-{@ $output = $search_result['trackback'] }
-{@ $search_target = 'title'; }
-<!--#include("trackback.html")-->
-<!--@if(count($output->data))-->
-<div class="isMore"><a href="{getUrl('where','trackback','page',1)}">more</a></div>
-<!--@end-->
-
-{@ $output = $search_result['multimedia'] }
-<!--#include("multimedia.html")-->
-<!--@if(count($output->data))-->
-<div class="isMore"><a href="{getUrl('where','multimedia','page',1)}">more</a></div>
-<!--@end-->
-
-{@ $output = $search_result['file'] }
-<!--#include("file.html")-->
-<!--@if(count($output->data))-->
-<div class="isMore"><a href="{getUrl('where','file','page',1)}">more</a></div>
-<!--@end-->
+<!--#include("header.html")-->
+
+{@ $output = $search_result['document'] }
+<!--#include("document.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getAutoEncodedUrl('where','document','page',1)}">more</a></div>
+<!--@end-->
+
+{@ $output = $search_result['comment'] }
+<!--#include("comment.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getAutoEncodedUrl('where','comment','page',1)}">more</a></div>
+<!--@end-->
+
+{@ $output = $search_result['trackback'] }
+{@ $search_target = 'title'; }
+<!--#include("trackback.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getAutoEncodedUrl('where','trackback','page',1)}">more</a></div>
+<!--@end-->
+
+{@ $output = $search_result['multimedia'] }
+<!--#include("multimedia.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getAutoEncodedUrl('where','multimedia','page',1)}">more</a></div>
+<!--@end-->
+
+{@ $output = $search_result['file'] }
+<!--#include("file.html")-->
+<!--@if(count($output->data))-->
+<div class="isMore"><a href="{getAutoEncodedUrl('where','file','page',1)}">more</a></div>
+<!--@end-->
diff --git a/modules/integration_search/skins/default/skin.xml b/modules/integration_search/skins/default/skin.xml
index 6cde3d9f0..196a009da 100644
--- a/modules/integration_search/skins/default/skin.xml
+++ b/modules/integration_search/skins/default/skin.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">통합 검색 기본 스킨</title>
-    <title xml:lang="vi">Skin trang tìm kiếm</title>
-    <title xml:lang="zh-CN">搜索默认皮肤</title>
-    <title xml:lang="jp">統合検索のデフォルトスキン</title>
-    <title xml:lang="en">Default Skin of Integration Search</title>
-    <title xml:lang="zh-TW">預設綜合搜尋面板</title>
-    <title xml:lang="tr">Birleşik Arama Varsayılan Dış Görünümü</title>
-    <description xml:lang="vi">Skin mặc định của trang tìm kiếm.</description>
-    <description xml:lang="ko">통합검색 모듈의 기본 스킨</description>
-    <description xml:lang="zh-CN">搜索模块的默认皮肤。</description>
-    <description xml:lang="jp">統合検索モジュールのデフォルトスキンです。</description>
-    <description xml:lang="en">Default skin of integration search module</description>
-    <description xml:lang="zh-TW">預設綜合搜尋面板。</description>
-    <description xml:lang="tr">Birleşik aramanın varsayılan dış görünümü</description>
-    <version>0.1</version>
-    <date>2007-07-24</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="normal" src="screenshot/normal.gif">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="en">Default</title>
-            <title xml:lang="vi">Mặc định</title>
-            <title xml:lang="zh-TW">預設</title>
-            <title xml:lang="tr">Varsayılan</title>
-        </color>
-    </colorset>
-
-    <extra_vars>
-        <var name="memo" type="textarea">
-            <title xml:lang="ko">설명</title>
-            <title xml:lang="zh-CN">说明</title>
-            <title xml:lang="jp">説明</title>
-            <title xml:lang="en">Description</title>
-            <title xml:lang="vi">Mô tả</title>
-            <title xml:lang="zh-TW">說明</title>
-            <title xml:lang="tr">Açıklama</title>
-            <description xml:lang="ko">검색결과 상단에 결과가 출력됩니다.</description>
-            <description xml:lang="zh-CN">显示在搜索结果上端。</description>
-            <description xml:lang="jp">検索結果が上段に表示されます。</description>
-            <description xml:lang="en">Result will be displayed on top of search result.</description>
-            <description xml:lang="vi">Mô tả sẽ hiển thị trên đầu trang kết quả tìm kiếm.</description>
-            <description xml:lang="zh-TW">在最頂端顯示搜尋結果。</description>
-            <description xml:lang="tr">Sonuç, arama sonuçlarının en üstünde gösterilecektir</description>
-        </var>
-    </extra_vars>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">통합 검색 기본 스킨</title>
+    <title xml:lang="vi">Skin trang tìm kiếm</title>
+    <title xml:lang="zh-CN">搜索默认皮肤</title>
+    <title xml:lang="jp">統合検索のデフォルトスキン</title>
+    <title xml:lang="en">The Default Skin of the Integrated Search Module</title>
+    <title xml:lang="zh-TW">預設綜合搜尋面板</title>
+    <title xml:lang="tr">Birleşik Arama Varsayılan Dış Görünümü</title>
+    <description xml:lang="vi">Skin mặc định của trang tìm kiếm.</description>
+    <description xml:lang="ko">통합검색 모듈의 기본 스킨</description>
+    <description xml:lang="zh-CN">搜索模块的默认皮肤。</description>
+    <description xml:lang="jp">統合検索モジュールのデフォルトスキンです。</description>
+    <description xml:lang="en">The Default Skin of the Integrated Search Module</description>
+    <description xml:lang="zh-TW">預設綜合搜尋面板。</description>
+    <description xml:lang="tr">Birleşik aramanın varsayılan dış görünümü</description>
+    <version>0.1</version>
+    <date>2007-07-24</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="normal" src="screenshot/normal.gif">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="en">Default</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">Varsayılan</title>
+        </color>
+    </colorset>
+
+    <extra_vars>
+        <var name="memo" type="textarea">
+            <title xml:lang="ko">설명</title>
+            <title xml:lang="zh-CN">说明</title>
+            <title xml:lang="jp">説明</title>
+            <title xml:lang="en">Description</title>
+            <title xml:lang="vi">Mô tả</title>
+            <title xml:lang="zh-TW">說明</title>
+            <title xml:lang="tr">Açıklama</title>
+            <description xml:lang="ko">검색결과 상단에 결과가 출력됩니다.</description>
+            <description xml:lang="zh-CN">显示在搜索结果上端。</description>
+            <description xml:lang="jp">検索結果が上段に表示されます。</description>
+            <description xml:lang="en">Result will be displayed on top of search result.</description>
+            <description xml:lang="vi">Mô tả sẽ hiển thị trên đầu trang kết quả tìm kiếm.</description>
+            <description xml:lang="zh-TW">在最頂端顯示搜尋結果。</description>
+            <description xml:lang="tr">Sonuç, arama sonuçlarının en üstünde gösterilecektir</description>
+        </var>
+    </extra_vars>
+</skin>
diff --git a/modules/integration_search/skins/default/white.css b/modules/integration_search/skins/default/white.css
index d5fc4f064..b3ad5549f 100644
--- a/modules/integration_search/skins/default/white.css
+++ b/modules/integration_search/skins/default/white.css
@@ -1,92 +1,92 @@
-@charset "utf-8";
-
-#spot { padding-left:10px; margin-bottom:20px; }
-#spot .search * { vertical-align:middle;}
-#spot .search .inputText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
-
-.localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; padding-left:10px; }
-.localNavigation:after {content:""; display:block; clear:both;}
-.localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
-.localNavigation li a { color:#666; text-decoration:none; text-decoration:none; float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(images/white/bgTab.gif) repeat-x;}
-.localNavigation li.on { margin-bottom:-1px;}
-.localNavigation li.on a{ height:19px; background:none;}
-
-.subNavigation { *zoom:1; margin:0 0 20px 10px; padding:0 0 10px 0; overflow:hidden; border-bottom:1px solid #EFEFEF; }
-.subNavigation:after {content:""; display:block; clear:both;}
-.subNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0 }
-.subNavigation li a { color:#666; text-decoration:none; text-decoration:none; float:left; padding:0 10px 0 0; margin-right:10px; border-right:1px solid #ddd; }
-.subNavigation li.last a { border-right:0; }
-.subNavigation li.on { margin-bottom:-1px;}
-.subNavigation li.on a { font-weight:bold; }
-
-strong.noKeyword { font-size:16px; display:block; margin:50px 0 0 10px; }
-
-h3.subTitle { padding:0 0 0 20px; margin:10px 0 20px 10px; background:url(images/white/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
-h3.subTitle span { font-weight:normal; font-family:verdana; font-size:11px; }
-
-.noResult { display:block; margin:0 0 30px 10px; color:#666; padding:0 0 10px 20px; border-bottom:1px solid #EFEFEF; line-height:160%;}
-
-.searchResult { margin:10px 0 0 10px; padding:0;}
-.searchResult li { width:100%; margin-bottom:15px; clear:both; overflow:hidden;list-style:none; }
-.searchResult li .thumb { display:block; float:left; margin-right:14px; padding:1px; border:1px solid #DDD;}
-.searchResult li dl { margin:5px 0 0 0; padding:0; }
-.searchResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
-.searchResult li dl dt a { color:#1a3588; text-decoration:underline;}
-.searchResult.comment li dl dt a { color:#444444; text-decoration:none;}
-.searchResult.comment li dl dt a:hover { text-decoration:underline;}
-.searchResult li dl dt .reply { color:#fe6700; font:.9em Tahoma;}
-.searchResult li dl dt .reply em { color:#fe6700; font:normal 10px Tahoma;}
-.searchResult li dl dt .category { color:#818181;}
-.searchResult li dl dt .category a { color:#818181; border:none; text-decoration:none;}
-.searchResult li dl dd { padding:0; margin:0; line-height:18px; color:#555555; margin-bottom:4px;}
-.searchResult li address { color:#d8d8d8; font-size:12px; margin-top:5px; }
-.searchResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
-.searchResult li address img { vertical-align:middle; margin-right:2px;}
-.searchResult li address .time { color:#818181; font:.8em Tahoma;}
-.searchResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
-.searchResult li address .readNum { color:#818181; font:.8em Tahoma;}
-.searchResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
-.searchResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
-
-.searchImageResult { margin:10px 0 0 10px; padding:0; overflow:hidden; *zoom:1;}
-.searchImageResult li { width:124px; height:190px; padding:0; margin:0 20px 15px 0; list-style:none; float:left; overflow:hidden; vertical-align:top;}
-.searchImageResult li img { display:block; margin-bottom:10px; padding:1px; border:1px solid #DDD;}
-.searchImageResult li dl { margin:0; padding:0; }
-.searchImageResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
-.searchImageResult li dl dt a { color:#1a3588; text-decoration:underline;}
-.searchImageResult li address { color:#d8d8d8; font-size:12px; margin-top:5px; }
-.searchImageResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
-.searchImageResult li address img { vertical-align:middle; margin-right:2px;}
-.searchImageResult li address .time { color:#818181; font:.8em Tahoma;}
-.searchImageResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
-.searchImageResult li address .readNum { color:#818181; font:.8em Tahoma;}
-.searchImageResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
-.searchImageResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
-.searchImageResult li address .time { color:#818181; font:.8em Tahoma;}
-
-div.isMore { color:#666; text-align:right; margin-bottom:20px; padding-bottom:10px; border-bottom:1px solid #EFEFEF; }
-div.isMore a { color:#666; text-decoration:underline; }
-
-/* Pagination Reset */
-.pagination{ padding:15px 0; margin:0; text-align:center;}
-.pagination *{ margin:0; padding:0;}
-.pagination img{ border:0;}
-.pagination a,
-.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-.pagination a:hover,
-.pagination a:active,
-.pagination a:focus{ background-color:#f4f4f4 !important; }
-.pagination strong{ color:#ff6600 !important;}
-.pagination a.prev,
-.pagination a.prevEnd,
-.pagination a.next,
-.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-/* Pagination A1 */
-.pagination.a1 a,
-.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-.pagination.a1 a.prev{ padding-left:10px; background:#fff url(images/white/arrowPrevA1.gif) no-repeat left center; }
-.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(images/white/arrowPrevEndA1.gif) no-repeat left center; }
-.pagination.a1 a.next{ padding-right:10px; background:#fff url(images/white/arrowNextA1.gif) no-repeat right center; }
-.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(images/white/arrowNextEndA1.gif) no-repeat right center; }
-
+@charset "utf-8";
+
+#spot { padding-left:10px; margin-bottom:20px; }
+#spot .search * { vertical-align:middle;}
+#spot .search .inputText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
+
+.localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; padding-left:10px; }
+.localNavigation:after {content:""; display:block; clear:both;}
+.localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
+.localNavigation li a { color:#666; text-decoration:none; text-decoration:none; float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(images/white/bgTab.gif) repeat-x;}
+.localNavigation li.on { margin-bottom:-1px;}
+.localNavigation li.on a{ height:19px; background:none;}
+
+.subNavigation { *zoom:1; margin:0 0 20px 10px; padding:0 0 10px 0; overflow:hidden; border-bottom:1px solid #EFEFEF; }
+.subNavigation:after {content:""; display:block; clear:both;}
+.subNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0 }
+.subNavigation li a { color:#666; text-decoration:none; text-decoration:none; float:left; padding:0 10px 0 0; margin-right:10px; border-right:1px solid #ddd; }
+.subNavigation li.last a { border-right:0; }
+.subNavigation li.on { margin-bottom:-1px;}
+.subNavigation li.on a { font-weight:bold; }
+
+strong.noKeyword { font-size:16px; display:block; margin:50px 0 0 10px; }
+
+h3.subTitle { padding:0 0 0 20px; margin:10px 0 20px 10px; background:url(images/white/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
+h3.subTitle span { font-weight:normal; font-family:verdana; font-size:11px; }
+
+.noResult { display:block; margin:0 0 30px 10px; color:#666; padding:0 0 10px 20px; border-bottom:1px solid #EFEFEF; line-height:160%;}
+
+.searchResult { margin:10px 0 0 10px; padding:0;}
+.searchResult li { width:100%; margin-bottom:15px; clear:both; overflow:hidden;list-style:none; }
+.searchResult li .thumb { display:block; float:left; margin-right:14px; padding:1px; border:1px solid #DDD;}
+.searchResult li dl { margin:5px 0 0 0; padding:0; }
+.searchResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
+.searchResult li dl dt a { color:#1a3588; text-decoration:underline;}
+.searchResult.comment li dl dt a { color:#444444; text-decoration:none;}
+.searchResult.comment li dl dt a:hover { text-decoration:underline;}
+.searchResult li dl dt .reply { color:#fe6700; font:.9em Tahoma;}
+.searchResult li dl dt .reply em { color:#fe6700; font:normal 10px Tahoma;}
+.searchResult li dl dt .category { color:#818181;}
+.searchResult li dl dt .category a { color:#818181; border:none; text-decoration:none;}
+.searchResult li dl dd { padding:0; margin:0; line-height:18px; color:#555555; margin-bottom:4px;}
+.searchResult li address { color:#d8d8d8; font-size:12px; margin-top:5px; }
+.searchResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
+.searchResult li address img { vertical-align:middle; margin-right:2px;}
+.searchResult li address .time { color:#818181; font:.8em Tahoma;}
+.searchResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchResult li address .readNum { color:#818181; font:.8em Tahoma;}
+.searchResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
+
+.searchImageResult { margin:10px 0 0 10px; padding:0; overflow:hidden; *zoom:1;}
+.searchImageResult li { width:124px; height:190px; padding:0; margin:0 20px 15px 0; list-style:none; float:left; overflow:hidden; vertical-align:top;}
+.searchImageResult li img { display:block; margin-bottom:10px; padding:1px; border:1px solid #DDD;}
+.searchImageResult li dl { margin:0; padding:0; }
+.searchImageResult li dl dt { padding:0; margin:0; color:#d8d8d8; margin-bottom:1px;}
+.searchImageResult li dl dt a { color:#1a3588; text-decoration:underline;}
+.searchImageResult li address { color:#d8d8d8; font-size:12px; margin-top:5px; }
+.searchImageResult li address strong { color:#3e3e3e; font-size:1em; font-weight:normal;}
+.searchImageResult li address img { vertical-align:middle; margin-right:2px;}
+.searchImageResult li address .time { color:#818181; font:.8em Tahoma;}
+.searchImageResult li address .read { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchImageResult li address .readNum { color:#818181; font:.8em Tahoma;}
+.searchImageResult li address .recom { font:11px "돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif; color:#818181;}
+.searchImageResult li address .recomNum { color:#fe6700; font:bold .8em Tahoma;}
+.searchImageResult li address .time { color:#818181; font:.8em Tahoma;}
+
+div.isMore { color:#666; text-align:right; margin-bottom:20px; padding-bottom:10px; border-bottom:1px solid #EFEFEF; }
+div.isMore a { color:#666; text-decoration:underline; }
+
+/* Pagination Reset */
+.pagination{ padding:15px 0; margin:0; text-align:center;}
+.pagination *{ margin:0; padding:0;}
+.pagination img{ border:0;}
+.pagination a,
+.pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+.pagination a:hover,
+.pagination a:active,
+.pagination a:focus{ background-color:#f4f4f4 !important; }
+.pagination strong{ color:#ff6600 !important;}
+.pagination a.prev,
+.pagination a.prevEnd,
+.pagination a.next,
+.pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+/* Pagination A1 */
+.pagination.a1 a,
+.pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+.pagination.a1 a.prev{ padding-left:10px; background:#fff url(images/white/arrowPrevA1.gif) no-repeat left center; }
+.pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(images/white/arrowPrevEndA1.gif) no-repeat left center; }
+.pagination.a1 a.next{ padding-right:10px; background:#fff url(images/white/arrowNextA1.gif) no-repeat right center; }
+.pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(images/white/arrowNextEndA1.gif) no-repeat right center; }
+
diff --git a/modules/integration_search/tpl/header.html b/modules/integration_search/tpl/header.html
index 8c057aead..a7b9db8a5 100644
--- a/modules/integration_search/tpl/header.html
+++ b/modules/integration_search/tpl/header.html
@@ -1,4 +1,4 @@
-<!--%import("js/integration_search_admin.js")-->
+<load target="js/integration_search_admin.js" usecdn="true" />
 
 <h3 class="xeAdmin">{$lang->integration_search} <span class="gray">{$lang->cmd_management}</span></h3>
 
diff --git a/modules/integration_search/tpl/index.html b/modules/integration_search/tpl/index.html
index 3f780d095..614171a49 100644
--- a/modules/integration_search/tpl/index.html
+++ b/modules/integration_search/tpl/index.html
@@ -1,50 +1,54 @@
 <!--#include("header.html")-->
-<!--%import("filter/insert_config.xml")-->
-<!--%import("../../widget/tpl/js/widget_admin.js")-->
+<load target="../../widget/tpl/js/widget_admin.js" usecdn="true" />
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <input type="hidden" name="target_module_srl" id="target_module_srl" value="{$config->target_module_srl}" />
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2">
-        <th scope="row"><div>{$lang->sample_code}</div></th>
-        <td class="wide">
-            <textarea class="inputTypeTextArea fullWidth" readonly="readonly">{$sample_code}</textarea>
-            <p>{$lang->about_sample_code}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td>
-            <select name="skin">
-                <!--@foreach($skin_list as $key=>$val)-->
-                <option value="{$key}" <!--@if($config->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_skin}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->target}</div></th>
-        <td>
-            <select name="target">
-                <option value="include">{$lang->include_search_target}</option>
-                <option value="exclude" <!--@if($config->target=='exclude')-->selected="selected"<!--@end-->>{$lang->exclude_search_target}</option>
-            </select>
-
-            <select name="_target_module_srl" id="_target_module_srl" size="8" class="w200" style="display:block;margin:10px 0;"></select>
-
-            <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module_srl')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a>
-            <a href="#" onclick="midRemove('target_module_srl');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
-
-            <script type="text/javascript">
-                jQuery( function() { getModuleSrlList('target_module_srl'); } );
-            </script>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th class="button" colspan="3">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertConfig" action="./" method="post">
+	<input type="hidden" name="act" value="procIntegration_searchAdminInsertConfig" />
+	<input type="hidden" name="module" value="admin" />
+	<input type="hidden" name="target_module_srl" id="target_module_srl" value="{$config->target_module_srl}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+			<th scope="row">{$lang->sample_code}</th>
+			<td >
+				<textarea readonly="readonly">{$sample_code}</textarea>
+				<p>{$lang->about_sample_code}</p>
+			</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->skin}</th>
+			<td>
+				<select name="skin">
+					<!--@foreach($skin_list as $key=>$val)-->
+					<option value="{$key}" <!--@if($config->skin==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+				</select>
+				<p>{$lang->about_skin}</p>
+			</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->target}</th>
+			<td>
+				<select name="target">
+					<option value="include">{$lang->include_search_target}</option>
+					<option value="exclude" <!--@if($config->target=='exclude')-->selected="selected"<!--@end-->>{$lang->exclude_search_target}</option>
+				</select>
+	
+				<select name="_target_module_srl" id="_target_module_srl" size="8" style="display:block;margin:10px 0;"></select>
+	
+				<a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module_srl')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a>
+				<a href="#" onclick="midRemove('target_module_srl');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+	
+				<script type="text/javascript">
+					jQuery( function() { getModuleSrlList('target_module_srl'); } );
+				</script>
+			</td>
+		</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
diff --git a/modules/integration_search/tpl/js/integration_search_admin.js b/modules/integration_search/tpl/js/integration_search_admin.js
index 0fc3ade6b..0ffa05049 100644
--- a/modules/integration_search/tpl/js/integration_search_admin.js
+++ b/modules/integration_search/tpl/js/integration_search_admin.js
@@ -1,5 +1,5 @@
-/**
- * @file   modules/board/js/board_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  integration_search 모듈의 관리자용 javascript
- **/
+/**
+ * @file   modules/board/js/board_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  integration_search 모듈의 관리자용 javascript
+ **/
diff --git a/modules/integration_search/tpl/skin_info.html b/modules/integration_search/tpl/skin_info.html
index 2f9bdf159..9f139d8ec 100644
--- a/modules/integration_search/tpl/skin_info.html
+++ b/modules/integration_search/tpl/skin_info.html
@@ -1,52 +1,57 @@
 <!--#include("./header.html")-->
 
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data">
 <input type="hidden" name="module" value="integration_search" />
 <input type="hidden" name="act" value="procIntegration_searchAdminInsertSkin" />
 
-    <h4 class="xeAdmin">{$lang->skin_default_info}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td class="wide" >{$skin_info->title}</td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a>&nbsp;</td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-        &nbsp;
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br($skin_info->description)}</td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->extra_vars}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td class="wide">
+    <h3 class="h3">{$lang->skin_default_info}</h3>
+    <div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+			<th scope="row">{$lang->skin}</th>
+			<td  >{$skin_info->title}</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->skin_author}</th>
+			<td>
+				<!--@foreach($skin_info->author as $author)-->
+				{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a>, <a href="mailto:{$author->email_address}">{$author->email_address}</a>)<br />
+				<!--@endforeach-->
+			</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->homepage}</th>
+			<td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a>&nbsp;</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->date}</th>
+			<td>{zdate($skin_info->date, 'Y-m-d')}</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->skin_license}</th>
+			<td>
+				{nl2br(trim($skin_info->license))}
+			<!--@if($skin_info->license_link)-->
+				<p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
+			<!--@end-->
+			&nbsp;
+			</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->description}</th>
+			<td>{nl2br($skin_info->description)}</td>
+		</tr>
+		</table>
+	</div>
+    <h3 class="h3">{$lang->extra_vars}</h3>
+    <div class="table">
+    	<table width="100%" border="1" cellspacing="0">
+    	<tr valign="top">
+        <th scope="row">{$lang->colorset}</th>
+        <td >
             <!--@foreach($skin_info->colorset as $key => $val)-->
                 <!--@if($val->screenshot)-->
                     {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
@@ -70,74 +75,69 @@
     <!--@if($val->group && ((!$group) || $group != $val->group))-->
     {@$group = $val->group}
     </table>
-    <table cellspacing="0" class="adminTable">
-    <caption>{$group}</caption>
+	</div>
+    <div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<caption>{$group}</caption>
+		<!--@end-->
+	
+		<tr>
+			<th scope="row">{$val->title}</th>
+			<td >
+				<!--@if($val->type=="text")-->
+					<!--@if(!$val->value)-->{@ $val->value = $val->default}<!--@endif-->
+					<input type="text" name="{$val->name}" value="{$val->value}" />
+	
+				<!--@elseif($val->type=="textarea")-->
+					<textarea name="{$val->name}">{$val->value}</textarea>
+	
+				<!--@elseif($val->type=="select")-->
+					<select name="{$val->name}">
+						<!--@foreach($val->options as $k=>$v)-->
+						<option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
+						<!--@end-->
+					</select>
+	
+				<!--@elseif($val->type=="checkbox")-->
+					<!--@foreach($val->default as $k=>$v)-->
+					<span>
+						<input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
+						<label for="ch_{$key}_{$k}">{$v}</label>
+					</span>
+					<!--@end-->
+	
+				<!--@elseif($val->type=="radio")-->
+					<!--@foreach($val->default as $k=>$v)-->
+					<span>
+						<input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
+						<label for="ch_{$key}_{$k}">{$v}</label>
+					</span>
+					<!--@end-->
+	
+				<!--@elseif($val->type=="image")-->
+					<!--@if($val->value)-->
+					<div>
+						<img src="{$val->value}" /><br />
+						<input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
+						<label for="del_{$val->name}">{$lang->cmd_delete}</label>
+					</div>
+					<!--@end-->
+	
+					<input type="file" name="{$val->name}" value="" />
+				<!--@end-->
+	
+				<!--@if($val->description)-->
+				<p>{nl2br(trim($val->description))}</p>
+				<!--@end-->
+			</td>
+		</tr>
+		<!--@end-->
+	
+		<!--@if($group)-->
+		</table>
+	</div>
     <!--@end-->
-
-    <tr class="row2">
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@if($val->type=="text")-->
-                <!--@if(!$val->value)-->{@ $val->value = $val->default}<!--@endif-->
-                <input type="text" name="{$val->name}" value="{$val->value}" class="inputTypeText w400" />
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400">{$val->value}</textarea>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v}" id="ch_{$key}_{$k}" <!--@if(in_array($v, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->default as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v}" id="ch_{$key}_{$k}" <!--@if($v==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="adminTable">
-    <!--@end-->
-
-    <tr class="row2">
-        <th colspan="2" class="right">
-            <span class="button strong black strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
diff --git a/modules/krzip/conf/info.xml b/modules/krzip/conf/info.xml
deleted file mode 100644
index ed9294762..000000000
--- a/modules/krzip/conf/info.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">한국 우편번호</title>
-    <title xml:lang="en">Korean Zip Code</title>
-    <title xml:lang="vi">Korean Zip Code</title>
-    <title xml:lang="es">Código postal de Corea</title>
-    <title xml:lang="zh-CN">韩国邮编 </title>
-    <title xml:lang="jp">韓国郵便番号</title>
-    <title xml:lang="ru">Корейский почтовый индекс</title>
-    <title xml:lang="zh-TW">韓國郵編 </title>
-    <title xml:lang="tr">Kore Posta Kodu </title>
-    <description xml:lang="ko">
-        XE 운영하는 우편번호서버를 이용하여 우편번호 검색을 합니다.
-        우편번호 검색 서버는 설정을 통해 변경하실 수 있습니다.
-    </description>
-    <description xml:lang="en">
-        Searching the zip code via zip code server operated by XE.
-        You can change the zip code server by setting.
-    </description>
-    <description xml:lang="vi">
-        Tìm kiếm địa chỉ với Zip Code Server được cung cấp bởi XE.
-        Bạn có thể thay đổi Zip Code Server bằng việc thiết lập Zip Code.
-    </description>
-    <description xml:lang="es">
-        Busca el código postal a través del servidor operado por XE.
-        Usted puede cambiar la configuración del servidor de código postal.
-    </description>
-    <description xml:lang="zh-CN">
-        利用XE运营的邮编服务器搜索邮编。
-        通过设置可以修改邮编搜索服务器。
-    </description>
-    <description xml:lang="tr">
-    XE tarafından yönetilen posta kodu sunucusuyla posta kodu araması.
-    Posta kodu sunucusunu ayarlardan değiştirebilirsiniz.    
-    </description>
-    <description xml:lang="jp">
-        XEで運用している郵便番号サーバを利用して韓国の郵便番号を検索します。
-        郵便番号検索サーバは設定によって変更することが出来ます。
-    </description>
-    <description xml:lang="ru">
-        Поиск индекса через сервер почтовый индексов, оперируемый XE.
-        Вы можете изменить сервер почтовых индексов в настройках.
-    </description>
-    <description xml:lang="zh-TW">
-        利用 XE營運的郵編主機搜尋郵編。
-        透過設置可修改編輯郵編搜尋主機。
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>accessory</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
diff --git a/modules/krzip/conf/module.xml b/modules/krzip/conf/module.xml
deleted file mode 100644
index ff844c479..000000000
--- a/modules/krzip/conf/module.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module>
-    <grants />
-    <permissions />
-    <actions>
-        <action name="dispKrzipAdminConfig" type="view" admin_index="true" standalone="true" />
-        <action name="procKrzipAdminInsertConfig" type="controller" standalone="true" />
-        <action name="getKrzipCodeList" type="model" index="true" standalone="true" />
-    </actions>
-</module>
diff --git a/modules/krzip/krzip.admin.controller.php b/modules/krzip/krzip.admin.controller.php
deleted file mode 100644
index 5a156f20c..000000000
--- a/modules/krzip/krzip.admin.controller.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-    /**
-     * @class  krzipAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  krzip 모듈의 admin controller class
-     **/
-
-    class krzipAdminController extends krzip {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정
-         **/
-        function procKrzipAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args = Context::gets('krzip_server_hostname','krzip_server_port','krzip_server_query');
-            if(!$args->krzip_server_hostname) $args->krzip_server_hostname = $this->hostname;
-            if(!$args->krzip_server_port) $args->krzip_server_port = $this->port;
-            if(!$args->krzip_server_query) $args->krzip_server_query = $this->query;
-
-            // module Controller 객체 생성하여 입력
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('krzip',$args);
-            return $output;
-        }
-        
-    }
-?>
diff --git a/modules/krzip/krzip.admin.view.php b/modules/krzip/krzip.admin.view.php
deleted file mode 100644
index fc466f38f..000000000
--- a/modules/krzip/krzip.admin.view.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-    /**
-     * @class  krzipAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  krzip 모듈의 admin view class
-     **/
-
-    class krzipAdminView extends krzip {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정
-         **/
-        function dispKrzipAdminConfig() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('krzip');
-            Context::set('config',$config);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('config..');
-			
-            // 템플릿 파일 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('index');
-        }
-
-
-    }
-?>
diff --git a/modules/krzip/krzip.class.php b/modules/krzip/krzip.class.php
deleted file mode 100644
index 71c00072f..000000000
--- a/modules/krzip/krzip.class.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-    /**
-     * @class  krzip
-     * @author NHN (developers@xpressengine.com)
-     * @brief  우편번호 검색 모듈인 krzip의 상위 클래스
-     **/
-
-    class krzip extends ModuleObject {
-
-        var $hostname = 'kr.zip.zeroboard.com';
-        var $port = 80;
-        var $query = '/server.php?addr3=';
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object();
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
diff --git a/modules/krzip/krzip.model.php b/modules/krzip/krzip.model.php
deleted file mode 100644
index 9c7cee794..000000000
--- a/modules/krzip/krzip.model.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-    /**
-     * @class  krzipModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  krzip 모듈의 model 클래스
-     **/
-
-    class krzipModel extends krzip {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 우편 번호 검색
-         * 동이름을 입력받아서 지정된 서버에 우편번호 목록을 요청한다
-         **/
-        function getKrzipCodeList() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('krzip');
-            if($config->krzip_server_hostname) $this->hostname = $config->krzip_server_hostname;
-            if($config->krzip_server_port) $this->port = $config->krzip_server_port;
-            if($config->krzip_server_query) $this->query = $config->krzip_server_query;
-
-            // 동네 이름을 받음
-            $addr = trim(Context::get('addr'));
-            if(!$addr) return new Object(-1,'msg_not_exists_addr');
-
-            // 지정된 서버에 요청을 시도한다
-            $query_string = $this->query.urlencode($addr);
-
-            $fp = @fsockopen($this->hostname, $this->port, $errno, $errstr);
-            if(!$fp) return new Object(-1, 'msg_fail_to_socket_open');
-
-            fputs($fp, "GET {$query_string} HTTP/1.0\r\n");
-            fputs($fp, "Host: {$this->hostname}\r\n\r\n");
-
-            $buff = '';
-            while(!feof($fp)) {
-                $str = fgets($fp, 1024);
-                if(trim($str)=='') $start = true;
-                if($start) $buff .= $str;
-            }
-
-            fclose($fp);
-
-            $address_list = unserialize(base64_decode($buff));
-            if(!$address_list) return new Object(-1, 'msg_no_result');
-
-            $this->add('address_list', implode("\n",$address_list)."\n");
-        }
-    }
-?>
diff --git a/modules/krzip/lang/en.lang.php b/modules/krzip/lang/en.lang.php
deleted file mode 100644
index cfde3d837..000000000
--- a/modules/krzip/lang/en.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (Only basic contents are listed)
-     **/
-
-    // normal words
-    $lang->krzip = "Korean Zip Code";
-    $lang->krzip_server_hostname = "Server name for zip code checking";
-    $lang->krzip_server_port = "Server port for zip code checking";
-    $lang->krzip_server_query = "Server path for zip code checking";
-
-    // descriptions
-    $lang->about_krzip_server_hostname = "Please input the server's domain for checking zip codes and receiving the result list";
-    $lang->about_krzip_server_port = "Please input the server's port number for checking the zip code";
-    $lang->about_krzip_server_query = "Please input the query url that will be requested for checking the zip code";
-
-    // error messages
-    $lang->msg_not_exists_addr = "Target for searching doesn't exist";
-    $lang->msg_fail_to_socket_open = "Unabled to connect to zip code checking server";
-?>
diff --git a/modules/krzip/lang/es.lang.php b/modules/krzip/lang/es.lang.php
deleted file mode 100644
index 91592eecd..000000000
--- a/modules/krzip/lang/es.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @archivo  modules/krzip/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma espanol (Solo los contenidos basicos)
-     **/
-
-    // Palabras normales
-    $lang->krzip = "Código postal de Corea";
-    $lang->krzip_server_hostname = "Nombre del servidor para el chequeo de código postal";
-    $lang->krzip_server_port = "Puero del servidor para el chequeo de código postal";
-    $lang->krzip_server_query = "Ruta del servidor para el chequeo de código postal";
-
-    // Descripciones
-    $lang->about_krzip_server_hostname = "Ingresar el dominio del servidor para chequear el código postal y recibir la lista de resultado";
-    $lang->about_krzip_server_port = "Ingresar el número del puerto del servidor para chequear el código postal";
-    $lang->about_krzip_server_query = "Ingresar el query url que será pedido para chequear el código postal";
-
-    // Mensajes de error
-    $lang->msg_not_exists_addr = "Objetivo para la busqueda no existe";
-    $lang->msg_fail_to_socket_open = "No se puede conectar al servidor de chequeo de código postal";
-?>
diff --git a/modules/krzip/lang/fr.lang.php b/modules/krzip/lang/fr.lang.php
deleted file mode 100644
index f8d726367..000000000
--- a/modules/krzip/lang/fr.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paque du langage en français pour le module de Code postal coréen
-     **/
-
-    // mots normaux
-    $lang->krzip = "Code postal coréen";
-    $lang->krzip_server_hostname = "Nom de serveur pour vérifier le code postal";
-    $lang->krzip_server_port = "Port de serveur pour vérifier le code postal";
-    $lang->krzip_server_query = "Chemin de serveur pour vérifier le code postal";
-
-    // descriptions
-    $lang->about_krzip_server_hostname = "Entrez le domaine de serveur pour vérifier le code postal et recevoir le liste des résultats, S.V.P.";
-    $lang->about_krzip_server_port = "Entrez le numéro de port de serveur pour vérifier le code postal, SVP";
-    $lang->about_krzip_server_query = "Entrez l'URL à Requérir qui sera requis pour vérifier le code postal";
-
-    // messages des erreurs
-    $lang->msg_not_exists_addr = "Objectifs à rechercher n'existe pas";
-    $lang->msg_fail_to_socket_open = "Echoué à connecter au serveur pour vérifier le code postal";
-?>
diff --git a/modules/krzip/lang/jp.lang.php b/modules/krzip/lang/jp.lang.php
deleted file mode 100644
index ca3d64ad2..000000000
--- a/modules/krzip/lang/jp.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    // 一般用語
-    $lang->krzip = '韓国郵便番号';
-    $lang->krzip_server_hostname = '郵便番号検索サーバ名';
-    $lang->krzip_server_port = '郵便番号検索サーバのポート';
-    $lang->krzip_server_query = '郵便番号検索サーバのクエリ';
-
-    // 説明
-    $lang->about_krzip_server_hostname = '郵便番号を検索して結果を取り寄せるサーバのドメインを入力して下さい。';
-    $lang->about_krzip_server_port = '郵便番号検索サーバのポート番号を入力して下さい。';
-    $lang->about_krzip_server_query = '郵便番号検索サーバに問い合わせるクエリのＵＲＬを入力して下さい。';
-
-    // エラーメッセージ
-    $lang->msg_not_exists_addr = '入力された文字列では郵便番号が見つかりませんでした';
-    $lang->msg_fail_to_socket_open = '郵便番号サーバとの接続に失敗しました';
-?>
diff --git a/modules/krzip/lang/ko.lang.php b/modules/krzip/lang/ko.lang.php
deleted file mode 100644
index 4bbe9b23d..000000000
--- a/modules/krzip/lang/ko.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    // 일반 단어들
-    $lang->krzip = '한국 우편번호';
-    $lang->krzip_server_hostname = '우편번호 검사 서버의 이름';
-    $lang->krzip_server_port = '우편번호 검사 서버 포트';
-    $lang->krzip_server_query = '우편번호 검사 서버 경로';
-
-    // 설명문
-    $lang->about_krzip_server_hostname = '우편번호를 검사하여 결과 목록을 가져올 서버의 도메인을 입력해주세요.';
-    $lang->about_krzip_server_port = '우편번호를 검사서버의 포트 번호를 입력해주세요.';
-    $lang->about_krzip_server_query = '우편번호를 검사서버에 요청할 query url을 입력해 주세요.';
-
-    // 에러 메시지들
-    $lang->msg_not_exists_addr = '검색하려는 대상이 없습니다.';
-    $lang->msg_fail_to_socket_open = '우편번호 검색 대상 서버 접속에 실패하였습니다.';
-?>
diff --git a/modules/krzip/lang/ru.lang.php b/modules/krzip/lang/ru.lang.php
deleted file mode 100644
index de7ab01ab..000000000
--- a/modules/krzip/lang/ru.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    // нормальные слова
-    $lang->krzip = "Корейский почтовый индекс";
-    $lang->krzip_server_hostname = "Имя сервера для проверки почтового индекса";
-    $lang->krzip_server_port = "Порт сервера для проверки почтового индекса";
-    $lang->krzip_server_query = "Путь на сервере для проверки почтового индекса";
-
-    // описания
-    $lang->about_krzip_server_hostname = "Пожалуйста, введите доменное имя сервера для проверки почтового идекса и получения списка результатов";
-    $lang->about_krzip_server_port = "Пожалуйста, введите порт сервера для проверки почтового идекса";
-    $lang->about_krzip_server_query = "Пожалуйста, введите URL запроса на сервер для проверки почтового идекса";
-
-    // ошибки
-    $lang->msg_not_exists_addr = "Назначение для поиска не существует";
-    $lang->msg_fail_to_socket_open = "Невозможно подключиться к серверу для проверки почтового почтового индекса";
-?>
diff --git a/modules/krzip/lang/tr.lang.php b/modules/krzip/lang/tr.lang.php
deleted file mode 100644
index 874610e58..000000000
--- a/modules/krzip/lang/tr.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (Only basic contents are listed)
-     **/
-
-    // normal words
-    $lang->krzip = "Kore Zip Kodu";
-    $lang->krzip_server_hostname = "Posta kodu kontrolü için olan sunucu ismi";
-    $lang->krzip_server_port = "Posta kodu kontrolü için olan sunucu portu";
-    $lang->krzip_server_query = "Posta kodu kontrolü için olan sorgu urlsi";
-
-    // descriptions
-    $lang->about_krzip_server_hostname = "Lütfen posta kodu kontrolü ve alınan sonuç listesi için sunucu alan adını giriniz";
-    $lang->about_krzip_server_port = "Lütfen posta kodu kontrolü için sunucu portunu giriniz";
-    $lang->about_krzip_server_query = "Lütfen posta kodu kontrolünde talep edilecek sorgu urlsini giriniz";
-
-    // error messages
-    $lang->msg_not_exists_addr = "Arama için böyle bir hedef bulunmuyor";
-    $lang->msg_fail_to_socket_open = "Posta kodu kontrol sunucusuna bağlanılamıyor";
-?>
diff --git a/modules/krzip/lang/vi.lang.php b/modules/krzip/lang/vi.lang.php
deleted file mode 100644
index 1c53f08ae..000000000
--- a/modules/krzip/lang/vi.lang.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    // normal words
-    $lang->krzip = "Zip Code (Korea)";
-    $lang->krzip_server_hostname = "Tên Server kiểm tra Zip Code";
-    $lang->krzip_server_port = "Cổng Server kiểm tra Zip Code";
-    $lang->krzip_server_query = "Đường dẫn Server kiểm tra Zip Code";
-
-    // descriptions
-    $lang->about_krzip_server_hostname = "Xin hãy nhập tên miền của Server để kiểm tra và kết nối cho danh sách kết quả";
-    $lang->about_krzip_server_port = "Xin hãy nhập số cổng kết nối của Server để kiểm tra Zip Code";
-    $lang->about_krzip_server_query = "Xin hãy nhập địa chỉ sẽ trả lời khi kiểm tra Zip Code";
-
-    // error messages
-    $lang->msg_not_exists_addr = "Khu vực tìm kiếm không tồn tại.";
-    $lang->msg_fail_to_socket_open = "Không thể kết nối tới Server.";
-?>
diff --git a/modules/krzip/lang/zh-CN.lang.php b/modules/krzip/lang/zh-CN.lang.php
deleted file mode 100644
index 69648c12f..000000000
--- a/modules/krzip/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  简体中文语言包（收录了基本内容）
-     **/
-
-    // 一般单词
-    $lang->krzip = "韩国邮编";
-    $lang->krzip_server_hostname = "邮编检测服务器名";
-    $lang->krzip_server_port = "邮编检测服务器端口";
-    $lang->krzip_server_query = "邮编检测服务器路径";
-
-    // 说明文
-    $lang->about_krzip_server_hostname = "请输入要导入的检测结果目录服务器域名。";
-    $lang->about_krzip_server_port = "请输入邮编检测服务器端口。";
-    $lang->about_krzip_server_query = "请输入向邮编检测服务器发出请求的 query url。";
-
-    // 错误提示
-    $lang->msg_not_exists_addr = "没有要搜索的对象！";
-    $lang->msg_fail_to_socket_open = "连接邮编搜索对象服务器失败！";
-?>
diff --git a/modules/krzip/lang/zh-TW.lang.php b/modules/krzip/lang/zh-TW.lang.php
deleted file mode 100644
index e8e85c09b..000000000
--- a/modules/krzip/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-    /**
-     * @file   modules/krzip/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  韓國郵編(krzip)模組正體中文語言
-     **/
-
-    // 一般詞語
-    $lang->krzip = "韓國郵編";
-    $lang->krzip_server_hostname = "郵編檢測主機名稱";
-    $lang->krzip_server_port = "郵編檢測主機端口";
-    $lang->krzip_server_query = "郵編檢測主機路徑";
-
-    // 說明
-    $lang->about_krzip_server_hostname = "請輸入要匯入的檢測結果目錄服務器域名。";
-    $lang->about_krzip_server_port = "請輸入郵編檢測主機端口。";
-    $lang->about_krzip_server_query = "請輸入向郵編檢主機器發出請求的query url。";
-
-    // 錯誤提示
-    $lang->msg_not_exists_addr = "沒有要搜尋的對象！";
-    $lang->msg_fail_to_socket_open = "連接郵編搜尋對像主機失敗！";
-?>
diff --git a/modules/krzip/tpl/filter/insert_config.xml b/modules/krzip/tpl/filter/insert_config.xml
deleted file mode 100644
index 5b8a8a547..000000000
--- a/modules/krzip/tpl/filter/insert_config.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<filter name="insert_config" module="krzip" act="procKrzipAdminInsertConfig" confirm_msg_code="confirm_submit">
-    <form>
-        <node target="krzip_server_hostname" required="true" />
-        <node target="krzip_server_port" required="true" />
-        <node target="krzip_server_query" required="true" />
-    </form>
-    <response>
-        <tag name="error" />
-        <tag name="message" />
-    </response>
-</filter>
diff --git a/modules/krzip/tpl/index.html b/modules/krzip/tpl/index.html
deleted file mode 100644
index 647cbf83c..000000000
--- a/modules/krzip/tpl/index.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!--%import("filter/insert_config.xml")-->
-
-<h3 class="xeAdmin">{$lang->krzip} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-<table cellspacing="0" class="rowTable">
-<tr>
-    <th scope="col"><div>{$lang->krzip_server_hostname}</div></th>
-    <td>
-        <input type="text" name="krzip_server_hostname" value="{$config->krzip_server_hostname?$config->krzip_server_hostname:'kr.zip.zeroboard.com'}" class="inputTypeText w400" /> 
-        <p>{$lang->about_krzip_server_hostname}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="col"><div>{$lang->krzip_server_port}</div></th>
-    <td>
-        <input type="text" name="krzip_server_port" value="{$config->krzip_server_port?$config->krzip_server_port:'80'}" class="inputTypeText w400"/> 
-        <p>{$lang->about_krzip_server_port}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="col"><div>{$lang->krzip_server_query}</div></th>
-    <td>
-        <input type="text" name="krzip_server_query" value="{$config->krzip_server_query?$config->krzip_server_query:'/server.php?addr3='}" class="inputTypeText w400"/> 
-        <p>{$lang->about_krzip_server_query}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th colspan="2" class="button">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-    </th>
-</tr>
-</table>
-</form>
diff --git a/modules/layout/conf/info.xml b/modules/layout/conf/info.xml
index f831a8c90..e586a7741 100644
--- a/modules/layout/conf/info.xml
+++ b/modules/layout/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">레이아웃</title>
-    <title xml:lang="zh-CN">布局管理</title>
-    <title xml:lang="jp">レイアウト</title>
-    <title xml:lang="en">Layout</title>
-    <title xml:lang="vi">Giao diện</title>
-    <title xml:lang="es">Diseño</title>
-    <title xml:lang="ru">Лейаут</title>
-    <title xml:lang="zh-TW">版面設計</title>
-    <title xml:lang="tr">Yerleşim Düzeni</title>
-    <description xml:lang="ko">레이아웃을 생성/관리하는 모듈입니다.</description>
-    <description xml:lang="zh-CN">生成/管理布局的模块。</description>
-    <description xml:lang="jp">レイアウトを生成・管理するモジュールです。</description>
-    <description xml:lang="en">This module is for creating/managing of layouts.</description>
-    <description xml:lang="vi">Chức năng của Module này dành cho việc tạo và quản lý giao diện.</description>
-    <description xml:lang="es">Este módulo es para crear y manejar el diseño.</description>
-    <description xml:lang="ru">Этот модуль служит для создания/управления лейаутами.</description>
-    <description xml:lang="zh-TW">建立/管理版面的模組。</description>
-    <description xml:lang="tr">Bu modül yerleşim düzenleri(layout) oluşturmak ve yönetmek içindir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>construction</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="tr">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">레이아웃</title>
+    <title xml:lang="zh-CN">布局管理</title>
+    <title xml:lang="jp">レイアウト</title>
+    <title xml:lang="en">Layout</title>
+    <title xml:lang="vi">Giao diện</title>
+    <title xml:lang="es">Diseño</title>
+    <title xml:lang="ru">Лейаут</title>
+    <title xml:lang="zh-TW">版面設計</title>
+    <title xml:lang="tr">Yerleşim Düzeni</title>
+    <description xml:lang="ko">레이아웃을 생성/관리하는 모듈입니다.</description>
+    <description xml:lang="zh-CN">生成/管理布局的模块。</description>
+    <description xml:lang="jp">レイアウトを生成・管理するモジュールです。</description>
+    <description xml:lang="en">This module is for creating/managing the layouts.</description>
+    <description xml:lang="vi">Chức năng của Module này dành cho việc tạo và quản lý giao diện.</description>
+    <description xml:lang="es">Este módulo es para crear y manejar el diseño.</description>
+    <description xml:lang="ru">Этот модуль служит для создания/управления лейаутами.</description>
+    <description xml:lang="zh-TW">建立/管理版面的模組。</description>
+    <description xml:lang="tr">Bu modül yerleşim düzenleri(layout) oluşturmak ve yönetmek içindir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>construction</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="tr">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+</module>
diff --git a/modules/layout/conf/module.xml b/modules/layout/conf/module.xml
index cb4ad7377..42bda6b44 100644
--- a/modules/layout/conf/module.xml
+++ b/modules/layout/conf/module.xml
@@ -4,30 +4,49 @@
     <permissions />
     <actions>
         <action name="dispLayoutInfo" type="view" standalone="true" />
-        <action name="dispLayoutAdminContent" type="view" admin_index="true" standalone="true" />
-        <action name="dispLayoutAdminInsert" type="view" standalone="true" />
-        <action name="dispLayoutAdminModify" type="view" standalone="true" />
-        <action name="dispLayoutAdminEdit" type="view" standalone="true" />
-        <action name="dispLayoutAdminDownloadedList" type="view" standalone="true" />
-        <action name="dispLayoutAdminPreview" type="view" standalone="true" />
+        <action name="dispLayoutAdminContent" type="view" standalone="true" />
         <action name="dispLayoutAdminInfo" type="view" standalone="true" />
         <action name="dispLayoutAdminLayoutModify" type="view" standalone="true" />
         <action name="dispLayoutAdminLayoutImageList" type="view" standalone="true" />
-
 		<action name="dispLayoutAdminMobileContent" type="view" standalone="true" />
-		<action name="dispLayoutAdminDownloadedMobileList" type="view" standalone="true" />
 
+		<action name="dispLayoutAdminInstalledList" type="view" admin_index="true" menu_name="installedLayout" menu_index="true" />
+		<action name="dispLayoutAdminInstalledMobileList" type="view" menu_name="installedLayout" />
+		<action name="dispLayoutAdminInstanceList" type="view" menu_name="installedLayout" />
+		<action name="dispLayoutAdminInsert" type="view" menu_name="installedLayout" />
+		<action name="dispLayoutAdminModify" type="view" menu_name="installedLayout" />
+		<action name="dispLayoutAdminEdit" type="view" menu_name="installedLayout" />
+
+		<action name="dispLayoutPreview" type="view" />
+
+		<action name="procLayoutAdminUpdate" type="controller" ruleset="updateLayout" />
+		<action name="procLayoutAdminCodeUpdate" type="controller" ruleset="codeUpdate" />
+		<action name="procLayoutAdminUserImageUpload" type="controller" ruleset="imageUpload" />
+		<action name="procLayoutAdminUserImageDelete" type="controller" />
+		<action name="procLayoutAdminDelete" type="controller" ruleset="deleteLayout" />
+
+        <action name="procLayoutAdminInsert" type="controller" standalone="true" ruleset="insertLayout" />
 
-        <action name="procLayoutAdminInsert" type="controller" standalone="true" />
-        <action name="procLayoutAdminUpdate" type="controller" standalone="true" />
-        <action name="procLayoutAdminDelete" type="controller" standalone="true" />
-        <action name="procLayoutAdminCodeUpdate" type="controller" standalone="true" />
         <action name="procLayoutAdminCodeReset" type="controller" standalone="true" />
-        <action name="procLayoutAdminUserImageUpload" type="controller" standalone="true" />
-        <action name="procLayoutAdminUserImageDelete" type="controller" standalone="true" />
+
         <action name="procLayoutAdminUserValueInsert" type="controller" standalone="true" />
         <action name="procLayoutAdminUserLayoutExport" type="controller" standalone="true" />
-        <action name="procLayoutAdminUserLayoutImport" type="controller" standalone="true" />
+        <action name="procLayoutAdminUserLayoutImport" type="controller" standalone="true" ruleset="userLayoutImport" />
 
     </actions>
+	<menus>
+		<menu name="installedLayout">
+			<title xml:lang="en">Installed Layout</title>
+			<title xml:lang="ko">설치된 레이아웃</title>
+			<title xml:lang="zh-CN">Installed Layout</title>
+			<title xml:lang="jp">Installed Layout</title>
+			<title xml:lang="es">Installed Layout</title>
+			<title xml:lang="ru">Installed Layout</title>
+			<title xml:lang="fr">Installed Layout</title>
+			<title xml:lang="zh-TW">Installed Layout</title>
+			<title xml:lang="vi">Installed Layout</title>
+			<title xml:lang="mn">Installed Layout</title>
+			<title xml:lang="tr">Installed Layout</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/layout/faceoff/conf/info.xml b/modules/layout/faceoff/conf/info.xml
index a78db37bd..ad7ae81ff 100644
--- a/modules/layout/faceoff/conf/info.xml
+++ b/modules/layout/faceoff/conf/info.xml
@@ -1,133 +1,133 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<layout version="0.2" type="faceoff">
-    <title xml:lang="ko">XE Face off 레이아웃</title>
-    <title xml:lang="vi">Giao diện XE FaceOff</title>
-    <title xml:lang="zh-CN">XE Face off官方布局</title>
-    <title xml:lang="zh-TW">XE Face off 版面</title>
-    <title xml:lang="jp">XE Face offレイアウト</title>
-    <title xml:lang="tr">XE Face off Yerleşim Düzeni</title>
-    <description xml:lang="ko">XE FaceOff 레이아웃입니다.</description>
-    <description xml:lang="vi">Giao diện của XE FaceOff.</description>
-    <description xml:lang="zh-CN">XE Face off官方布局。</description>
-    <description xml:lang="zh-TW">XE FaceOff版面</description>
-    <description xml:lang="jp">XE FaceOffレイアウトです。</description>
-    <description xml:lang="tr">XE FaceOff Yerleşim Düzeni</description>
-    <version>0.1</version>
-    <date>2009-01-02</date>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="ge">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-    <extra_vars>
-        <var name="index_url" type="text">
-            <title xml:lang="ko">홈 페이지 URL</title>
-            <title xml:lang="jp">ホームページURL</title>
-            <title xml:lang="zh-CN">主页地址</title>
-            <title xml:lang="zh-TW">主頁網址</title>
-            <title xml:lang="en">Homepage URL</title>
-            <title xml:lang="vi">URL trang chủ</title>
-            <title xml:lang="ge">Homepage URL</title>
-            <title xml:lang="ru">Домашняя страница URL</title>
-            <title xml:lang="es">URL de la página web</title>
-            <title xml:lang="tr">Anasayfa URLsi</title>
-            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
-            <description xml:lang="jp">ロゴをクリックした際に移動するホームページのURLを入力して下さい。</description>
-            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
-            <description xml:lang="zh-TW">請輸入當用戶按了網站Logo後，要前往的頁面網址。</description>
-            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
-            <description xml:lang="vi">Hãy nhập địa chỉ trang chủ sẽ được chuyển tới khi bấm vào Logo</description>
-            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
-            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
-            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
-            <description xml:lang="tr">Lütfen kullanıcılar logoyu tıkladıklarında yönlendirilecekleri bir URL adresi giriniz</description>
-        </var>
-        <var name="logo_image" type="image">
-            <title xml:lang="ko">로고이미지</title>
-            <title xml:lang="jp">ロゴイメージ</title>
-            <title xml:lang="zh-CN">LOGO图片</title>
-            <title xml:lang="zh-TW">Logo圖片</title>
-            <title xml:lang="en">Logo image</title>
-            <title xml:lang="vi">Hình Logo</title>
-            <title xml:lang="ge">Logobildes</title>
-            <title xml:lang="ru">Изображения логотипа</title>
-            <title xml:lang="es">Imagen del logotipo</title>
-            <title xml:lang="tr">Logo Resmi</title>
-            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
-            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージが最も合います。)</description>
-            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。)</description>
-            <description xml:lang="zh-TW">請輸入要顯示在版面上端的Logo圖片。(適當高度為23px的透明圖片。)</description>
-            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
-            <description xml:lang="vi">Hãy nhập hình ảnh của Logo, Logo này sẽ hiện thị phía trên cùng của giao diện. (Nên sử dụng hình có nền trong suốt với chiều cao bằng 23px.)</description>
-            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
-            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
-            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
-            <description xml:lang="tr">Lütfen yerleşim düzeninin üst kısmında görüntülenecek logo girdisinde bulununuz. (Saydam resim için 23px önerilen uzunluktur.)</description>
-        </var>
-        <var name="logo_text" type="text">
-            <title xml:lang="ko">로고 글자</title>
-            <title xml:lang="jp">ロゴ用テキスト</title>
-            <title xml:lang="zh-CN">网站标题</title>
-            <title xml:lang="zh-TW">Logo文字</title>
-            <title xml:lang="en">LOGO characters</title>
-            <title xml:lang="vi">Chữ Logo</title>
-            <title xml:lang="ge">LOGO Zeichen </title>
-            <title xml:lang="ru">LOGO символов </title>
-            <title xml:lang="es">LOGO caracteres </title>
-            <title xml:lang="en">LOGO Karakterleri</title>
-            <description xml:lang="ko">레이아웃의 상단에 표시될 로고 글자를 입력해주세요. 로고 이미지가 있으면 표시되지 않습니다.</description>
-            <description xml:lang="jp">レイアウトの上部に表示されるロゴの文字を入力して下さい。ロゴ画像がある場合は表示されません。</description>
-            <description xml:lang="zh-CN">请输入网站标题(如已经使用了LOGO图片，此标题将不会显示出来)。</description>
-            <description xml:lang="zh-TW">請輸入要顯示在版面上方的文字。</description>
-            <description xml:lang="en">Logo at the top of the display layout, please enter the letters. If the image does not display the logo.</description>
-            <description xml:lang="vi">Chữ Logo sẽ được hiển thị phía trên của trang Web. Nếu không có hình ảnh thì Logo này sẽ hiển thị.</description>
-            <description xml:lang="ge">Logo am oberen Rand des Displays Layout, geben Sie bitte die Buchstaben. Wenn das Bild nicht das Logo.</description>
-            <description xml:lang="ru">Логотип на верхней части дисплея формата, пожалуйста, введите буквы. Если изображение не отображается логотип.</description>
-            <description xml:lang="es">Logo en la parte superior de la pantalla de diseño, por favor, introduzca las letras. Si la imagen no se muestra el logotipo.</description>
-            <description xml:lang="tr">Lütfen logonun görüntülenemediği durumlarda, yerleşim düzeninin üstünde görüntülenecek harfleri giriniz.</description>
-        </var>
-        <var name="copyright_text" type="text"> 
-            <title xml:lang="ko">카피라이트 문구</title>
-            <title xml:lang="jp">Copyright文章</title>
-            <title xml:lang="zh-CN">网站版权文档</title>
-            <title xml:lang="zh-TW">版權所有</title>
-            <title xml:lang="en">Copyright Stationery</title>
-            <title xml:lang="vi">Nội dung Copyright</title>
-            <title xml:lang="ge">Copyright Stationery </title>
-            <title xml:lang="ru">Copyright Канцтовары</title>
-            <title xml:lang="es">Papel del derecho de autor</title>
-            <title xml:lang="tr">Telif Hakkı Belgesi</title>
-            <description xml:lang="ko">하단에 표시될 카피라이트 문구를 설정할 수 있습니다</description>
-            <description xml:lang="jp">レイアウトの下部に表示されるcopyrightフレーズを入力して下さい。</description>
-            <description xml:lang="zh-CN">请输入网站版权文档。</description>
-            <description xml:lang="zh-TW">請輸入要顯示在版面下方的版權聲明。</description>
-            <description xml:lang="en">Layout displayed in the bottom of the copyright notice please.</description>
-            <description xml:lang="vi">Nội dung này sẽ hiển thị phía dưới cùng của Website.</description>
-            <description xml:lang="ge">Layout angezeigt, im unteren Teil der Urheberrechtsschutz bitte.</description>
-            <description xml:lang="ru">Макет отображается в нижней части авторских прав, пожалуйста.</description>
-            <description xml:lang="es">Diseño de muestra en la parte inferior de la nota de copyright, por favor.</description>
-            <description xml:lang="tr">Telif hakkı bildiriminin altında görüntülenecek olan yerleşim düzeni</description>
-        </var>
-    </extra_vars>
-    <menus>
-        <menu name="main_menu" maxdepth="3" default="true">
-            <title xml:lang="ko">상단 메뉴</title>
-            <title xml:lang="jp">上段メニュー</title>
-            <title xml:lang="zh-CN">主菜单</title>
-            <title xml:lang="zh-TW">主選單</title>
-            <title xml:lang="en">Top menu</title>
-            <title xml:lang="vi">Menu trên</title>
-            <title xml:lang="ge">Top Menü</title>
-            <title xml:lang="ru">Верхнее меню</title>
-            <title xml:lang="es">Menú Principal</title>
-            <title xml:lang="tr">Ana menü</title>
-        </menu>
-    </menus>
-</layout>
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2" type="faceoff">
+    <title xml:lang="ko">XE Face off 레이아웃</title>
+    <title xml:lang="vi">Giao diện XE FaceOff</title>
+    <title xml:lang="zh-CN">XE Face off官方布局</title>
+    <title xml:lang="zh-TW">XE Face off 版面</title>
+    <title xml:lang="jp">XE Face offレイアウト</title>
+    <title xml:lang="tr">XE Face off Yerleşim Düzeni</title>
+    <description xml:lang="ko">XE FaceOff 레이아웃입니다.</description>
+    <description xml:lang="vi">Giao diện của XE FaceOff.</description>
+    <description xml:lang="zh-CN">XE Face off官方布局。</description>
+    <description xml:lang="zh-TW">XE FaceOff版面</description>
+    <description xml:lang="jp">XE FaceOffレイアウトです。</description>
+    <description xml:lang="tr">XE FaceOff Yerleşim Düzeni</description>
+    <version>0.1</version>
+    <date>2009-01-02</date>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+    <extra_vars>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="vi">URL trang chủ</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+            <title xml:lang="tr">Anasayfa URLsi</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした際に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站Logo後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when a user clicks the logo</description>
+            <description xml:lang="vi">Hãy nhập địa chỉ trang chủ sẽ được chuyển tới khi bấm vào Logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+            <description xml:lang="tr">Lütfen kullanıcılar logoyu tıkladıklarında yönlendirilecekleri bir URL adresi giriniz</description>
+        </var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="vi">Hình Logo</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+            <title xml:lang="tr">Logo Resmi</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージが最も合います。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片。(高度为23px的透明图片为适。)</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的Logo圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of the layout. (A transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="vi">Hãy nhập hình ảnh của Logo, Logo này sẽ hiện thị phía trên cùng của giao diện. (Nên sử dụng hình có nền trong suốt với chiều cao bằng 23px.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
+            <description xml:lang="tr">Lütfen yerleşim düzeninin üst kısmında görüntülenecek logo girdisinde bulununuz. (Saydam resim için 23px önerilen uzunluktur.)</description>
+        </var>
+        <var name="logo_text" type="text">
+            <title xml:lang="ko">로고 글자</title>
+            <title xml:lang="jp">ロゴ用テキスト</title>
+            <title xml:lang="zh-CN">网站标题</title>
+            <title xml:lang="zh-TW">Logo文字</title>
+            <title xml:lang="en">LOGO characters</title>
+            <title xml:lang="vi">Chữ Logo</title>
+            <title xml:lang="ge">LOGO Zeichen </title>
+            <title xml:lang="ru">LOGO символов </title>
+            <title xml:lang="es">LOGO caracteres </title>
+            <title xml:lang="en">LOGO Karakterleri</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고 글자를 입력해주세요. 로고 이미지가 있으면 표시되지 않습니다.</description>
+            <description xml:lang="jp">レイアウトの上部に表示されるロゴの文字を入力して下さい。ロゴ画像がある場合は表示されません。</description>
+            <description xml:lang="zh-CN">请输入网站标题(如已经使用了LOGO图片，此标题将不会显示出来)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上方的文字。</description>
+            <description xml:lang="en">Logo at the top of the display layout, please enter the letters. If the image does not display the logo.</description>
+            <description xml:lang="vi">Chữ Logo sẽ được hiển thị phía trên của trang Web. Nếu không có hình ảnh thì Logo này sẽ hiển thị.</description>
+            <description xml:lang="ge">Logo am oberen Rand des Displays Layout, geben Sie bitte die Buchstaben. Wenn das Bild nicht das Logo.</description>
+            <description xml:lang="ru">Логотип на верхней части дисплея формата, пожалуйста, введите буквы. Если изображение не отображается логотип.</description>
+            <description xml:lang="es">Logo en la parte superior de la pantalla de diseño, por favor, introduzca las letras. Si la imagen no se muestra el logotipo.</description>
+            <description xml:lang="tr">Lütfen logonun görüntülenemediği durumlarda, yerleşim düzeninin üstünde görüntülenecek harfleri giriniz.</description>
+        </var>
+        <var name="copyright_text" type="text"> 
+            <title xml:lang="ko">카피라이트 문구</title>
+            <title xml:lang="jp">Copyright文章</title>
+            <title xml:lang="zh-CN">网站版权文档</title>
+            <title xml:lang="zh-TW">版權所有</title>
+            <title xml:lang="en">Copyright Stationery</title>
+            <title xml:lang="vi">Nội dung Copyright</title>
+            <title xml:lang="ge">Copyright Stationery </title>
+            <title xml:lang="ru">Copyright Канцтовары</title>
+            <title xml:lang="es">Papel del derecho de autor</title>
+            <title xml:lang="tr">Telif Hakkı Belgesi</title>
+            <description xml:lang="ko">하단에 표시될 카피라이트 문구를 설정할 수 있습니다</description>
+            <description xml:lang="jp">レイアウトの下部に表示されるcopyrightフレーズを入力して下さい。</description>
+            <description xml:lang="zh-CN">请输入网站版权文档。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面下方的版權聲明。</description>
+            <description xml:lang="en">Layout displayed in the bottom of the copyright notice please.</description>
+            <description xml:lang="vi">Nội dung này sẽ hiển thị phía dưới cùng của Website.</description>
+            <description xml:lang="ge">Layout angezeigt, im unteren Teil der Urheberrechtsschutz bitte.</description>
+            <description xml:lang="ru">Макет отображается в нижней части авторских прав, пожалуйста.</description>
+            <description xml:lang="es">Diseño de muestra en la parte inferior de la nota de copyright, por favor.</description>
+            <description xml:lang="tr">Telif hakkı bildiriminin altında görüntülenecek olan yerleşim düzeni</description>
+        </var>
+    </extra_vars>
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="vi">Menu trên</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+            <title xml:lang="tr">Ana menü</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/modules/layout/faceoff/css/layout.css b/modules/layout/faceoff/css/layout.css
index cfebdd145..5585d797b 100644
--- a/modules/layout/faceoff/css/layout.css
+++ b/modules/layout/faceoff/css/layout.css
@@ -1,173 +1,173 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-/* html{ overflow:auto;} */
-
-#header h1 a { text-decoration:none; }
-#footer address { font-style:normal; }
-#footer address a { text-decoration:none; }
-
-/* Skip To Content */
-a.skipToContent{ display:block; position:relative; top:0; clear:both; overflow:hidden; height:0; text-decoration:none;}
-a.skipToContent:hover,
-a.skipToContent:active,
-a.skipToContent:focus{ height:auto; margin:0 0 10px 0; padding:5px;}
-
-/* Hr */
-hr{ display:none; position:absolute;}
-
-/* Heading 
-h1{ position:relative; float:left; margin:0;}
-h2{ position:relative; margin:0 0 10px 0; border-bottom:2px solid;}
-h3{ position:relative; margin:0;}*/
-
-/* Container + Header + Body + Footer */
-#container{ position:relative; margin:0;}
-#header{ position:relative; *zoom:1; overflow:hidden; }
-#header:after{ content:""; display:block; clear:both;}
-#body{ position:relative; *zoom:1;}
-#body:after{ content:""; display:block; clear:both;}
-#content{ position:relative; text-align:justify; padding:0;}
-#footer{ position:relative; *zoom:1; padding:10px 0 10px 0; }
-#footer address{ text-align:center;}
-
-/* Layout Width */
-.fixed #container{ width:960px; margin-left:auto; margin-right:auto;}
-.liquid #container{ width:90%; margin-left:auto; margin-right:auto;}
-.hybrid #container{ width:90%; margin-left:auto; margin-right:auto;}
-
-/* Align Layout */
-.aLeft #container{ margin-left:0;}
-.aRight #container{ margin-right:0;}
-
-/* Neck */
-#neck{ position:relative; clear:both; *zoom:1;}/* overflow:hidden;}*/
-#neck .extension{ /* margin-right:-30px;*/ *zoom:1;}
-#neck .extension:after{ content:""; display:block; clear:both;}
-
-/* Knee */
-#knee{ position:relative; clear:both; *zoom:1;}/* overflow:hidden;}*/
-#knee .extension{ /* margin-right:-30px;*/ *zoom:1;}
-#knee .extension:after{ content:""; display:block; clear:both;}
-
-/* Extension */
-#body .extension{ position:relative; display:none; }
-
-/* ----- Fixed 2 Column Layout ----- */
-.fixed .ce #body .e1,
-.fixed .ec #body .e1{ width:200px; padding:10px;}
-
-.fixed .ce #body #content{ width:730px; padding:10px 0 10px 10px;}
-.fixed .ec #body #content{ width:730px; padding:10px 10px 10px 0;}
-
-.fixed .ce #body #content{ float:left;}
-.fixed .ec #body #content{ float:right;}
-.fixed .ce #body .e1,
-.fixed .ec #body .e1{ display:block;}
-.fixed .ce #body .e1{ float:right; clear:right;}
-.fixed .ec #body .e1{ float:left; clear:left;}
-
-/* ----- Fixed 3 Column Layout ----- */
-.fixed .cee #body .e1 { display:block; width:200px; padding:10px;}
-.fixed .cee #body .e2 { display:block; width:200px; padding:10px;}
-.fixed .ece #body .e1 { display:block; width:200px; padding:10px;}
-.fixed .ece #body .e2 { display:block; width:200px; padding:10px;}
-.fixed .eec #body .e1 { display:block; width:200px; padding:10px;}
-.fixed .eec #body .e2 { display:block; width:200px; padding:10px;}
-
-.fixed .cee #body #content { width:510px; padding:10px 0 10px 10px; }
-.fixed .ece #body #content { width:520px; padding:10px 0 10px 0; }
-.fixed .eec #body #content { width:510px; padding:10px 10px 10px 0; }
-
-.fixed .cee #body #content{ float:left; }
-.fixed .ece #body #content{ float:left; margin-right:-100%; left:220px;}
-.fixed .eec #body #content{ float:right;}
-
-.fixed .ece #body .e1,
-.fixed .eec #body .e1{ float:left; }
-
-.fixed .cee #body .e1,
-.fixed .eec #body .e2{ float:left;}
-
-.fixed .cee #body .e2,
-.fixed .ece #body .e2{ float:right;}
-
-/* ----- Liquid 2 Column Layout ----- */
-.liquid .ce #body .e1,
-.liquid .ec #body .e1{ width:20%;}
-.liquid .ce #body #content,
-.liquid .ec #body #content{ width:80%;}
-.liquid .ce #body #content{ float:left;}
-.liquid .ec #body #content{ float:right;}
-.liquid .ce #body .e1,
-.liquid .ec #body .e1{ display:block;}
-.liquid .ce #body .e1{ float:right; clear:right;}
-.liquid .ec #body .e1{ float:left; clear:left;}
-
-/* ----- Liquid 3 Column Layout ----- */
-.liquid .cee #body .e1,
-.liquid .cee #body .e2,
-.liquid .ece #body .e1,
-.liquid .ece #body .e2,
-.liquid .eec #body .e1,
-.liquid .eec #body .e2{ display:block; width:21%;}
-
-.liquid .cee #body #content,
-.liquid .ece #body #content,
-.liquid .eec #body #content{ width:58%;}
-
-.liquid .cee #body #content{ float:left; }
-.liquid .ece #body #content{ float:left; margin-right:-100%; left:21%;}
-.liquid .eec #body #content{ float:right;}
-
-.liquid .ece #body .e1,
-.liquid .eec #body .e1{ float:left; }
-
-.liquid .cee #body .e1,
-.liquid .eec #body .e2{ float:left;}
-
-.liquid .cee #body .e2,
-.liquid .ece #body .e2{ float:right;}
-
-/* ----- Hybrid 2 Column Layout ----- */
-.hybrid .ce #body{ padding-right:230px;}
-.hybrid .ec #body{ padding-left:230px; }
-.hybrid .ce #body .e1,
-.hybrid .ec #body .e1{ width:200px; padding:10px;}
-.hybrid .ce #body #content{ width:100%; padding:10px 0 10px 10px; }
-.hybrid .ec #body #content{ width:100%; padding:10px 10px 10px 0; margin-left:-100%;}
-.hybrid .ce #body #content{ float:left;}
-.hybrid .ec #body #content{ float:right;}
-.hybrid .ce #body .e1,
-.hybrid .ec #body .e1{ display:block; }
-.hybrid .ce #body .e1{ float:right; clear:right; margin-left:-220px; right:-220px;}
-.hybrid .ec #body .e1{ float:left; clear:left; margin-right:-230px; left:-230px;}
-
-/* ----- Hybrid 3 Column Layout ----- */
-.hybrid .cee #body .e1,
-.hybrid .cee #body .e2,
-.hybrid .ece #body .e1,
-.hybrid .ece #body .e2,
-.hybrid .eec #body .e1,
-.hybrid .eec #body .e2{ display:block; width:200px; padding:10px; }
-
-.hybrid .cee #body{ padding-right:440px; padding-left:10px; }
-.hybrid .ece #body{ padding-left:220px; padding-right:220px;}
-.hybrid .eec #body{ padding-left:440px; padding-right:10px;}
-
-.hybrid .cee #body #content{width:100%;padding:10px 0 10px 0; }
-.hybrid .ece #body #content{width:100%;padding:10px 0 10px 0; }
-.hybrid .eec #body #content{width:100%;padding:10px 0 10px 0; }
-
-.hybrid .cee #body #content{ float:left; margin-right:-450px; }
-.hybrid .ece #body #content{ float:left; margin-right:-100%;}
-.hybrid .eec #body #content{ float:right;}
-
-.hybrid .ece #body .e1,
-.hybrid .eec #body .e2{ float:left; left:-220px; margin-right:-220px;}
-.hybrid .eec #body .e1{ float:left; left:-440px; margin-right:-220px;}
-
-.hybrid .cee #body .e1,
-.hybrid .ece #body .e2{ float:right; left:220px; margin-left:-220px;}
-.hybrid .cee #body .e2{ float:right; left:440px; margin-left:-220px;}
-
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+
+/* html{ overflow:auto;} */
+
+#header h1 a { text-decoration:none; }
+#footer address { font-style:normal; }
+#footer address a { text-decoration:none; }
+
+/* Skip To Content */
+a.skipToContent{ display:block; position:relative; top:0; clear:both; overflow:hidden; height:0; text-decoration:none;}
+a.skipToContent:hover,
+a.skipToContent:active,
+a.skipToContent:focus{ height:auto; margin:0 0 10px 0; padding:5px;}
+
+/* Hr */
+hr{ display:none; position:absolute;}
+
+/* Heading 
+h1{ position:relative; float:left; margin:0;}
+h2{ position:relative; margin:0 0 10px 0; border-bottom:2px solid;}
+h3{ position:relative; margin:0;}*/
+
+/* Container + Header + Body + Footer */
+#container{ position:relative; margin:0;}
+#header{ position:relative; *zoom:1; overflow:hidden; }
+#header:after{ content:""; display:block; clear:both;}
+#body{ position:relative; *zoom:1;}
+#body:after{ content:""; display:block; clear:both;}
+#content{ position:relative; text-align:justify; padding:0;}
+#footer{ position:relative; *zoom:1; padding:10px 0 10px 0; }
+#footer address{ text-align:center;}
+
+/* Layout Width */
+.fixed #container{ width:960px; margin-left:auto; margin-right:auto;}
+.liquid #container{ width:90%; margin-left:auto; margin-right:auto;}
+.hybrid #container{ width:90%; margin-left:auto; margin-right:auto;}
+
+/* Align Layout */
+.aLeft #container{ margin-left:0;}
+.aRight #container{ margin-right:0;}
+
+/* Neck */
+#neck{ position:relative; clear:both; *zoom:1;}/* overflow:hidden;}*/
+#neck .extension{ /* margin-right:-30px;*/ *zoom:1;}
+#neck .extension:after{ content:""; display:block; clear:both;}
+
+/* Knee */
+#knee{ position:relative; clear:both; *zoom:1;}/* overflow:hidden;}*/
+#knee .extension{ /* margin-right:-30px;*/ *zoom:1;}
+#knee .extension:after{ content:""; display:block; clear:both;}
+
+/* Extension */
+#body .extension{ position:relative; display:none; }
+
+/* ----- Fixed 2 Column Layout ----- */
+.fixed .ce #body .e1,
+.fixed .ec #body .e1{ width:200px; padding:10px;}
+
+.fixed .ce #body #content{ width:730px; padding:10px 0 10px 10px;}
+.fixed .ec #body #content{ width:730px; padding:10px 10px 10px 0;}
+
+.fixed .ce #body #content{ float:left;}
+.fixed .ec #body #content{ float:right;}
+.fixed .ce #body .e1,
+.fixed .ec #body .e1{ display:block;}
+.fixed .ce #body .e1{ float:right; clear:right;}
+.fixed .ec #body .e1{ float:left; clear:left;}
+
+/* ----- Fixed 3 Column Layout ----- */
+.fixed .cee #body .e1 { display:block; width:200px; padding:10px;}
+.fixed .cee #body .e2 { display:block; width:200px; padding:10px;}
+.fixed .ece #body .e1 { display:block; width:200px; padding:10px;}
+.fixed .ece #body .e2 { display:block; width:200px; padding:10px;}
+.fixed .eec #body .e1 { display:block; width:200px; padding:10px;}
+.fixed .eec #body .e2 { display:block; width:200px; padding:10px;}
+
+.fixed .cee #body #content { width:510px; padding:10px 0 10px 10px; }
+.fixed .ece #body #content { width:520px; padding:10px 0 10px 0; }
+.fixed .eec #body #content { width:510px; padding:10px 10px 10px 0; }
+
+.fixed .cee #body #content{ float:left; }
+.fixed .ece #body #content{ float:left; margin-right:-100%; left:220px;}
+.fixed .eec #body #content{ float:right;}
+
+.fixed .ece #body .e1,
+.fixed .eec #body .e1{ float:left; }
+
+.fixed .cee #body .e1,
+.fixed .eec #body .e2{ float:left;}
+
+.fixed .cee #body .e2,
+.fixed .ece #body .e2{ float:right;}
+
+/* ----- Liquid 2 Column Layout ----- */
+.liquid .ce #body .e1,
+.liquid .ec #body .e1{ width:20%;}
+.liquid .ce #body #content,
+.liquid .ec #body #content{ width:80%;}
+.liquid .ce #body #content{ float:left;}
+.liquid .ec #body #content{ float:right;}
+.liquid .ce #body .e1,
+.liquid .ec #body .e1{ display:block;}
+.liquid .ce #body .e1{ float:right; clear:right;}
+.liquid .ec #body .e1{ float:left; clear:left;}
+
+/* ----- Liquid 3 Column Layout ----- */
+.liquid .cee #body .e1,
+.liquid .cee #body .e2,
+.liquid .ece #body .e1,
+.liquid .ece #body .e2,
+.liquid .eec #body .e1,
+.liquid .eec #body .e2{ display:block; width:21%;}
+
+.liquid .cee #body #content,
+.liquid .ece #body #content,
+.liquid .eec #body #content{ width:58%;}
+
+.liquid .cee #body #content{ float:left; }
+.liquid .ece #body #content{ float:left; margin-right:-100%; left:21%;}
+.liquid .eec #body #content{ float:right;}
+
+.liquid .ece #body .e1,
+.liquid .eec #body .e1{ float:left; }
+
+.liquid .cee #body .e1,
+.liquid .eec #body .e2{ float:left;}
+
+.liquid .cee #body .e2,
+.liquid .ece #body .e2{ float:right;}
+
+/* ----- Hybrid 2 Column Layout ----- */
+.hybrid .ce #body{ padding-right:230px;}
+.hybrid .ec #body{ padding-left:230px; }
+.hybrid .ce #body .e1,
+.hybrid .ec #body .e1{ width:200px; padding:10px;}
+.hybrid .ce #body #content{ width:100%; padding:10px 0 10px 10px; }
+.hybrid .ec #body #content{ width:100%; padding:10px 10px 10px 0; margin-left:-100%;}
+.hybrid .ce #body #content{ float:left;}
+.hybrid .ec #body #content{ float:right;}
+.hybrid .ce #body .e1,
+.hybrid .ec #body .e1{ display:block; }
+.hybrid .ce #body .e1{ float:right; clear:right; margin-left:-220px; right:-220px;}
+.hybrid .ec #body .e1{ float:left; clear:left; margin-right:-230px; left:-230px;}
+
+/* ----- Hybrid 3 Column Layout ----- */
+.hybrid .cee #body .e1,
+.hybrid .cee #body .e2,
+.hybrid .ece #body .e1,
+.hybrid .ece #body .e2,
+.hybrid .eec #body .e1,
+.hybrid .eec #body .e2{ display:block; width:200px; padding:10px; }
+
+.hybrid .cee #body{ padding-right:440px; padding-left:10px; }
+.hybrid .ece #body{ padding-left:220px; padding-right:220px;}
+.hybrid .eec #body{ padding-left:440px; padding-right:10px;}
+
+.hybrid .cee #body #content{width:100%;padding:10px 0 10px 0; }
+.hybrid .ece #body #content{width:100%;padding:10px 0 10px 0; }
+.hybrid .eec #body #content{width:100%;padding:10px 0 10px 0; }
+
+.hybrid .cee #body #content{ float:left; margin-right:-450px; }
+.hybrid .ece #body #content{ float:left; margin-right:-100%;}
+.hybrid .eec #body #content{ float:right;}
+
+.hybrid .ece #body .e1,
+.hybrid .eec #body .e2{ float:left; left:-220px; margin-right:-220px;}
+.hybrid .eec #body .e1{ float:left; left:-440px; margin-right:-220px;}
+
+.hybrid .cee #body .e1,
+.hybrid .ece #body .e2{ float:right; left:220px; margin-left:-220px;}
+.hybrid .cee #body .e2{ float:right; left:440px; margin-left:-220px;}
+
diff --git a/modules/layout/faceoff/layout.html b/modules/layout/faceoff/layout.html
index 21507410e..0b35ced91 100644
--- a/modules/layout/faceoff/layout.html
+++ b/modules/layout/faceoff/layout.html
@@ -1,56 +1,56 @@
-<div id="xe" class="{$layout_info->faceoff_ini_config['type']} {$layout_info->faceoff_ini_config['align']}">
-    <div id="container" class="{$layout_info->faceoff_ini_config['column']}">
-        <div id="header">
-            <a href="#content" class="skipToContent">Skip to content</a>
-            <h1><a href="{$layout_info->index_url}"><!--@if($layout_info->logo_image)--><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /><!--@elseif($layout_info->logo_text)-->{$layout_info->logo_text}<!--@else-->Title<!--@end--></a></h1>
-            <hr />
-        </div>
-        <hr />
-
-        <div id="neck">
-            <div class="extension neck">
-            <!-- start-neck -->
-
-            <!-- end-neck -->
-            </div>
-        </div>
-        <hr />
-
-        <div id="body">
-            <div id="content">
-            {$content}
-            </div>
-            <hr />
-            <div class="extension e1">
-            <!-- start-e1 -->
-
-            <!-- end-e1 -->
-            </div>
-            <hr />
-            <div class="extension e2">
-            <!-- start-e2 -->
-
-            <!-- end-e2 -->
-            </div>
-        </div>
-        <hr />
-        <div id="knee">
-            <div class="extension knee">
-            <!-- start-knee -->
-
-            <!-- end-knee -->
-            </div>
-        </div>
-        <hr />
-        <div id="footer">
-            <hr />
-            <address>
-                <!--@if($layout_info->copyright_text)-->
-                    {$layout_info->copyright_text}
-                <!--@else-->
-                    Copyright &copy; <a href="http://www.xpressengine.com" onclick="window.open(this.href);return false;"><abbr title="Xpress Engine">XE</abbr>.</a> All Rights Reserved.
-                <!--@end-->
-            </address>
-        </div>
-    </div>
-</div>
+<div id="xe" class="{$layout_info->faceoff_ini_config['type']} {$layout_info->faceoff_ini_config['align']}">
+    <div id="container" class="{$layout_info->faceoff_ini_config['column']}">
+        <div id="header">
+            <a href="#content" class="skipToContent">Skip to content</a>
+            <h1><a href="{$layout_info->index_url}"><!--@if($layout_info->logo_image)--><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /><!--@elseif($layout_info->logo_text)-->{$layout_info->logo_text}<!--@else-->Title<!--@end--></a></h1>
+            <hr />
+        </div>
+        <hr />
+
+        <div id="neck">
+            <div class="extension neck">
+            <!-- start-neck -->
+
+            <!-- end-neck -->
+            </div>
+        </div>
+        <hr />
+
+        <div id="body">
+            <div id="content">
+            {$content}
+            </div>
+            <hr />
+            <div class="extension e1">
+            <!-- start-e1 -->
+
+            <!-- end-e1 -->
+            </div>
+            <hr />
+            <div class="extension e2">
+            <!-- start-e2 -->
+
+            <!-- end-e2 -->
+            </div>
+        </div>
+        <hr />
+        <div id="knee">
+            <div class="extension knee">
+            <!-- start-knee -->
+
+            <!-- end-knee -->
+            </div>
+        </div>
+        <hr />
+        <div id="footer">
+            <hr />
+            <address>
+                <!--@if($layout_info->copyright_text)-->
+                    {$layout_info->copyright_text}
+                <!--@else-->
+                    Copyright &copy; <a href="http://www.xpressengine.com" onclick="window.open(this.href);return false;"><abbr title="Xpress Engine">XE</abbr>.</a> All Rights Reserved.
+                <!--@end-->
+            </address>
+        </div>
+    </div>
+</div>
diff --git a/modules/layout/lang/en.lang.php b/modules/layout/lang/en.lang.php
deleted file mode 100644
index 644ce8e59..000000000
--- a/modules/layout/lang/en.lang.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Layout module's basic language pack
-     **/
-
-    $lang->cmd_layout_management = 'Layout Setting';
-    $lang->cmd_layout_edit = 'Edit Layout';
-
-    $lang->layout_name = 'Layout Name';
-    $lang->layout_maker = "Layout Developer";
-    $lang->layout_license = 'License';
-    $lang->layout_history = "Updates";
-    $lang->layout_info = "Layout Info";
-    $lang->layout_list = 'Layout List';
-    $lang->menu_count = 'Menus';
-    $lang->downloaded_list = 'Download List';
-    $lang->layout_preview_content = 'The content gets displayed here';
-    $lang->not_apply_menu = 'Apply Layouts En Bloc';
-	$lang->layout_management = 'Layout Management';
-
-    $lang->cmd_move_to_installed_list = "View Created Layouts";
-
-    $lang->about_downloaded_layouts = "List of downloaded layouts";
-    $lang->about_title = 'Please input the title that is easy to verify when connecting to module';
-    $lang->about_not_apply_menu = 'Layouts of all modules connected via menu will be changed en bloc by checking this option.';
-
-    $lang->about_layout = "Layout module helps you to create the site's layout easily.<br />By using layout setting and menu connection, website's completed shape will be displayed with various modules.<br />* Layouts which you cannot delete are the default layouts of blogs or other moduels, thus you have to delete them from their setting pages. ";
-    $lang->about_layout_code = 
-        "It will be applied to the service when you save the layout code after editing it.
-        Please first preview your code and then save it.
-        You can refer grammar of XE's template from <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Template</a>.";
-
-    $lang->layout_export = 'Export';
-    $lang->layout_btn_export = 'Download My Layout';
-    $lang->about_layout_export = 'Export currently edited layout.';
-    $lang->layout_import = 'Import';
-    $lang->about_layout_import = 'Previously modified layout will be deleted when you import a new one. Please export current layout for a backup before importing.';
-
-    $lang->layout_manager = array(
-        0  => 'Layout Manager',
-        1  => 'Save',
-        2  => 'Cancel',
-        3  => 'Form',
-        4  => 'Array',
-        5  => 'Arrange',
-        6  => 'Fixed Layout',
-        7  => 'Variable Layout',
-        8  => 'Fixed+Variable (Content)',
-        9  => '1 Cell',
-        10 => '2 Cells (left of content)',
-        11 => '2 Cells (right of content)',
-        12 => '3 Cells (left of content)',
-        13 => '3 Cells (center of content)',
-        14 => '3 Cells (right of content)',
-        15 => 'Left',
-        16 => 'Center',
-        17 => 'Right',
-        18 => 'All',
-        19 => 'Layout',
-        20 => 'Add Widget',
-        21 => 'Add Content Widget',
-        22 => 'Attribute',
-        23 => 'Widget Style',
-        24 => 'Modify',
-        25 => 'Delete',
-        26 => 'Align',
-        27 => 'Occupy a Line',
-        28 => 'Left',
-        29 => 'Right',
-        30 => 'Width',
-        31 => 'Height',
-        32 => 'Margin',
-        33 => 'Padding',
-        34 => 'Top',
-        35 => 'Left',
-        36 => 'Right',
-        37 => 'Bottom',
-        38 => 'Border', 
-        39 => 'None',
-        40 => 'Background',
-        41 => 'Color',
-        42 => 'Image',
-        43 => 'Select',
-        44 => 'Repeat Background',
-        45 => 'Repeat',
-        46 => 'No Repeat',
-        47 => 'Repeat Width',
-        48 => 'Repeat Height',
-        49 => 'Apply',
-        50 => 'Cancel',
-        51 => 'Reset',
-        52 => 'Text',
-        53 => 'Font',
-        54 => 'Font Color',
-    );
-
-    $lang->layout_image_repository = 'Layout Repository';
-    $lang->about_layout_image_repository = 'You can upload images/flash files for selected layout. They will be included in exports';
-    $lang->msg_layout_image_target = 'Only gif, png, jpg, swf, flv files are allowed';
-    $lang->layout_migration = 'Layout Migration';
-    $lang->about_layout_migration = 'You can export or import editted layout as tar file'."\n".'(So far only FaceOff supports exports/imports)';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff Layout Manager',
-        'description' => 'FaceOff Layout Manager willl help you design layout on the web easily.<br/>Please design your own layout with components and functions as shown below.',
-        'layout' => 'FaceOff has HTML structure as above.<br/>You can arrange/align with CSS, or use Style to design.<br/>You can add widget from Extension(e1, e2), Neck and Knee.<br/>Also Body, Layout, Header, Body, Footer can designed by Style, and Content will display content.',
-        'setting' => 'Let me explain you the upper menu on left.<br/><ul><li>Save : Save current settings.</li><li>Cancel : Discard current settings and go back.</li><li>Reset : Clear current settings</li><li>Form : Set form as Fixed/ Variable/ Fixed+Variable(Content).</li><li>Arrange : Arrange 2 Extensions and Content.</li><li>Align : Align the position of layout.</li></ul>',
-        'hotkey' => 'You can design your layout more easily with Hot Keys.<br/><ul><li>tab : Unless a widget is selected, Header, Body, Footer will be selected in order. If not, next widget will be selected.</li><li>Shift + tab : It does the opposite function to tab key.</li><li>Esc : If nothing is selected, Neck, Extension(e1,e2),Knee will be selected in order, if a widget is selected, area of the widget will be selected.</li><li>Arrow Key : If a widget is selected, arrow key will move the widget to other areas.</li></ul>',
-        'attribute' => 'You can set background color/image to every area except widget, and font color(include <a> tag).',
-
-    );
-
-	$lang->mobile_layout_list = "Mobile Layout List";
-	$lang->mobile_downloaded_list = "Downloaded Mobile Layouts";
-	$lang->apply_mobile_view = "Apply Mobile View";
-	$lang->about_apply_mobile_view = "All connected module use mobile view to display when accessing with mobile device.";
-?>
diff --git a/modules/layout/lang/es.lang.php b/modules/layout/lang/es.lang.php
deleted file mode 100644
index 30e908b1d..000000000
--- a/modules/layout/lang/es.lang.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/layout/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para el Diseño.
-     **/
-
-    $lang->cmd_layout_management = 'Configuración del Diseño';
-    $lang->cmd_layout_edit = 'Editar el Diseño';
-
-    $lang->layout_name = 'Nombre del Diseño';
-    $lang->layout_maker = "Desarrollador del Diseño";
-    $lang->layout_license = 'License';
-    $lang->layout_history = "Actualización";
-    $lang->layout_info = "Información del Diseño";
-    $lang->layout_list = 'Lista de los Diseños';
-    $lang->menu_count = 'Número del Menú';
-	$lang->downloaded_list = 'Lista de la descarga';
-    $lang->layout_preview_content = 'Los contenidos son mostrados aquí';
-    $lang->not_apply_menu = 'Aplicar Diseños';
-	$lang->layout_management = '레이아웃 관리';
-  
-    $lang->cmd_move_to_installed_list = "Ver la lista creada";
-  
-    $lang->about_downloaded_layouts = "Ver la lista de diseños descargados";
-    $lang->about_title = 'Ingresar un nombre fácil de distinguir cuando conecta al módulo';
-    $lang->about_not_apply_menu = 'Al seleccionar esta opción, cambia todos los diseños conectados.';
-
-    $lang->about_layout = "Módulo del diseño ayuda a usted para crear el diseño de la página web fácilmente.<br />Por usar la configuración del diseño y el menú de conección, completa con varios módulos la forma de la página web que a ser mostrados<br />* Esos diseños que no pueden ser modificados ni eliminados son propios de blog y de otros módulos, por lo cual para la configuración de ellos debe hacerse en los modulos correspondientes.";
-    $lang->about_layout_code = 
-        "El diseño sera aplicado al servicio cuando usted guarda el código del diseño luego de haber editado.
-		Primero visualiza previamente tus códigos y luego guardalos
-        Referente al código de planillas de XE dirijirse a<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Pamphlet(Ingles)</a> ";
-
-    $lang->layout_export = '내보내기';
-    $lang->layout_btn_export = '내 레이아웃 다운로드';
-    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
-    $lang->layout_import = '가져오기';
-    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
-    $lang->layout_manager = array(
-        0  => '레이아웃 매니저',
-        1  => '저장',
-        2  => '취소',
-        3  => '형태',
-        4  => '배열',
-        5  => '정렬',
-        6  => '고정 레이아웃',
-        7  => '가변 레이아웃',
-        8  => '고정+가변(내용)',
-        9  => '1칸',
-        10 => '2칸 (내용 왼쪽)',
-        11 => '2칸 (내용 오른쪽)',
-        12 => '3칸 (내용 왼쪽)',
-        13 => '3칸 (내용 가운데)',
-        14 => '3칸 (내용 오른쪽)',
-        15 => '왼쪽',
-        16 => '가운데',
-        17 => '오른쪽',
-        18 => '전체',
-        19 => '레이아웃',
-        20 => '위젯 추가',
-        21 => '내용 위젯 추가',
-        22 => '속성',
-        23 => '위젯 스타일',
-        24 => '수정',
-        25 => '삭제',
-        26 => '정렬',
-        27 => '한줄 차지',
-        28 => '왼쪽',
-        29 => '오른쪽',
-        30 => '가로 너비',
-        31 => '높이',
-        32 => '바깥 여백',
-        33 => '안쪽 여백',
-        34 => '위',
-        35 => '왼',
-        36 => '오른',
-        37 => '아래',
-        38 => '테두리', 
-        39 => '없음',
-        40 => '배경',
-        41 => '색상',
-        42 => '그림',
-        43 => '선택',
-        44 => '배경 그림 반복',
-        45 => '반복',
-        46 => '반복 안함',
-        47 => '가로 반복',
-        48 => '세로 반복',
-        49 => '적용',
-        50 => '취소',
-        51 => '초기화',
-        52 => '글자',
-        53 => '글자 폰트',
-        54 => '글자 색',
-    );
-
-    $lang->layout_image_repository = '레이아웃 파일 저장소';
-    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
-    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
-    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
-    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff Layout 관리자',
-        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
-        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
-        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
-        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
-        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
-
-    );
-	$lang->mobile_layout_list = "Mobile Layout List";
-	$lang->mobile_downloaded_list = "Downloaded Mobile Layouts";
-	$lang->apply_mobile_view = "Apply Mobile View";
-	$lang->about_apply_mobile_view = "All connected module use mobile view to display when accessing with mobile device.";
-?>
diff --git a/modules/layout/lang/fr.lang.php b/modules/layout/lang/fr.lang.php
deleted file mode 100644
index 2acb9b2b6..000000000
--- a/modules/layout/lang/fr.lang.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Mise en Page
-     **/
-
-    $lang->cmd_layout_management = 'Configuration du Mise en Page';
-    $lang->cmd_layout_edit = 'Editer le Mise en Page';
-
-    $lang->layout_name = 'Nom du Mise en Page';
-    $lang->layout_maker = "Développeur du Mise en Page";
-    $lang->layout_license = 'Licence';
-    $lang->layout_history = "Mise à Jour";
-    $lang->layout_info = "Informations du Mise en Page";
-    $lang->layout_list = 'Liste des Mises en Page';
-    $lang->menu_count = 'Menus';
-    $lang->downloaded_list = 'Liste disponibles';
-    $lang->layout_preview_content = 'Le contenu sera exposé ici.';
-    $lang->not_apply_menu = 'Appliquer le Mise en Page sur tous les menus';
-	$lang->layout_management = '레이아웃 관리';
-
-    $lang->cmd_move_to_installed_list = "Mises en Page créés";
-
-    $lang->about_downloaded_layouts = "Mises en Page téléchargés";
-    $lang->about_title = 'Entrez le titre pour distinguer facilement quand vous le liez à un module.';
-    $lang->about_not_apply_menu = 'Tous les Mises en Page qui sont liés sur le menu seront changés si vous cochez cette option.';
-
-    $lang->about_layout = "Le module de Mise en Page vous aide à créer facilement le Mise en Page du site. <br />Vous pouvez présentez la forme du site Web complété par les modules divers en utilisant la configuration du Mise en Page et la connexion sur le menu. <br />* Les Mises en Page qui ne sont pas possibles à supprimer ou à modifier sont propres à ceux des blogues ou d'autres Mises en Page. Essayez à modifier/supprimer en dedans elles-mêmes";
-    $lang->about_layout_code = 
-        "Vous conservez la code de Mise en Page après l'éditer, la code sera appliquée sur le service.
-        Utilisez [Avant-première] avant conserver la code S.V.P.
-        Vous pouvez référer la grammaire de modèle de XE sur <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">Modèle du XE</a>.";
-
-    $lang->layout_export = '내보내기';
-    $lang->layout_btn_export = '내 레이아웃 다운로드';
-    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
-    $lang->layout_import = '가져오기';
-    $lang->about_layout_import = '가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.';
-    $lang->layout_manager = array(
-        0  => '레이아웃 매니저',
-        1  => '저장',
-        2  => '취소',
-        3  => '형태',
-        4  => '배열',
-        5  => '정렬',
-        6  => '고정 레이아웃',
-        7  => '가변 레이아웃',
-        8  => '고정+가변(내용)',
-        9  => '1칸',
-        10 => '2칸 (내용 왼쪽)',
-        11 => '2칸 (내용 오른쪽)',
-        12 => '3칸 (내용 왼쪽)',
-        13 => '3칸 (내용 가운데)',
-        14 => '3칸 (내용 오른쪽)',
-        15 => '왼쪽',
-        16 => '가운데',
-        17 => '오른쪽',
-        18 => '전체',
-        19 => '레이아웃',
-        20 => '위젯 추가',
-        21 => '내용 위젯 추가',
-        22 => '속성',
-        23 => '위젯 스타일',
-        24 => '수정',
-        25 => '삭제',
-        26 => '정렬',
-        27 => '한줄 차지',
-        28 => '왼쪽',
-        29 => '오른쪽',
-        30 => '가로 너비',
-        31 => '높이',
-        32 => '바깥 여백',
-        33 => '안쪽 여백',
-        34 => '위',
-        35 => '왼',
-        36 => '오른',
-        37 => '아래',
-        38 => '테두리', 
-        39 => '없음',
-        40 => '배경',
-        41 => '색상',
-        42 => '그림',
-        43 => '선택',
-        44 => '배경 그림 반복',
-        45 => '반복',
-        46 => '반복 안함',
-        47 => '가로 반복',
-        48 => '세로 반복',
-        49 => '적용',
-        50 => '취소',
-        51 => '초기화',
-        52 => '글자',
-        53 => '글자 폰트',
-        54 => '글자 색',
-    );
-
-    $lang->layout_image_repository = '레이아웃 파일 저장소';
-    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다';
-    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다';
-    $lang->layout_migration = '레이아웃 내보내기/ 들이기';
-    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff Layout 관리자',
-        'description' => 'FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요',
-        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
-        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
-        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
-        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
-
-    );
-	$lang->mobile_layout_list = "Mobile Layout List";
-	$lang->mobile_downloaded_list = "Downloaded Mobile Layouts";
-	$lang->apply_mobile_view = "Apply Mobile View";
-	$lang->about_apply_mobile_view = "All connected module use mobile view to display when accessing with mobile device.";
-?>
diff --git a/modules/layout/lang/jp.lang.php b/modules/layout/lang/jp.lang.php
deleted file mode 100644
index cd654b430..000000000
--- a/modules/layout/lang/jp.lang.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  レイアウト（layout）モジュールの基本言語パッケージ
-     **/
-
-    $lang->cmd_layout_management = 'レイアウト設定';
-    $lang->cmd_layout_edit = 'レイアウト編集';
-
-    $lang->layout_name = 'レイアウト名';
-    $lang->layout_maker = 'レイアウト作者';
-    $lang->layout_license = 'ライセンス';
-    $lang->layout_history = '変更内容 ';
-    $lang->layout_info = 'レイアウト情報';
-    $lang->layout_list = 'レイアウトリスト';
-    $lang->menu_count = 'メニュー数';
-    $lang->downloaded_list = 'ダウンロードリスト';
-    $lang->layout_preview_content = '内容が出力される部分です。';
-    $lang->not_apply_menu = 'レイアウトの一括適用';
-	$lang->layout_management = 'レイアウト管理';
-
-    $lang->cmd_move_to_installed_list = '作成されたリスト表示';
-
-    $lang->about_downloaded_layouts = 'ダウンロードのレイアウトリスト';
-    $lang->about_title = 'モジュールとの連動をわかりやすく区分するためのタイトルを入力して下さい。';
-    $lang->about_not_apply_menu = 'チェックを入れると連動するすべてのメニューのモジュールのレイアウトを一括変更します。';
-
-    $lang->about_layout = 'レイアウトのモジュールはサイトのレイアウトを分かりやすく作成出来るようにします。<br />レイアウトの設定とメニューのリンクで様々なモジュールで完成されたサイト構築が出来ます。<br />※ ブログまたは他のモジュールのレイアウトなどの削除・修正が出来ないレイアウトは、該当モジュールにて設定を行って下さい。';
-    $lang->about_layout_code = 
-        "下のレイアウトコードを修正し、保存するとサービスに反映されます。
-        必ずプレビューで確認してから保存して下さい。
-        XEのテンプレート文法は<a href=\"#\" onclick=\"winopen('http://xe.xpressengine.net/18180861');return false;\">XEテンプレート</a>を参考して下さい。";
-
-    $lang->layout_export = 'エクスポート';
-    $lang->layout_btn_export = 'マイレイアウトをダウンロードする';
-    $lang->about_layout_export = 'カスタマイズした自分のレイアウトをエクスポートします。';
-    $lang->layout_import = 'インポート';
-    $lang->about_layout_import = 'インポートする場合、既存の修正されたレイアウトを上書きします。インポート前にエクスポートでバックアップすることをお勧めします。';
-
-    $lang->layout_manager = array(
-        0  => 'レイアウトマネジャー',
-        1  => '保存',
-        2  => '取り消し',
-        3  => '基本レイアウト',
-        4  => '配列',
-        5  => '整列',
-        6  => '固定型レイアウト',
-        7  => '可変型レイアウト',
-        8  => '固定+(内容部分)可変',
-        9  => '1段',
-        10 => '2段 (内容左側配置)',
-        11 => '2段 (内容右側配置)',
-        12 => '3段 (内容左側配置)',
-        13 => '3段 (内容中央配置)',
-        14 => '3段 (内容右側配置)',
-        15 => '左',
-        16 => '中央',
-        17 => '右',
-        18 => 'すべて',
-        19 => 'レイアウト',
-        20 => 'ウィジェット追加',
-        21 => '内容 ウィジェット追加',
-        22 => '属性',
-        23 => 'ウィジェットスタイル',
-        24 => '修正',
-        25 => '削除',
-        26 => '整列',
-        27 => '一行占め',
-        28 => '左',
-        29 => '右',
-        30 => '横幅サイズ',
-        31 => '高さ',
-        32 => '外側余白',
-        33 => '内側余白',
-        34 => '上',
-        35 => '左',
-        36 => '右',
-        37 => '下',
-        38 => 'ボーダー', 
-        39 => 'なし',
-        40 => '背景',
-        41 => '色',
-        42 => '画像',
-        43 => '選択',
-        44 => '背景画像リピート',
-        45 => 'リピート',
-        46 => 'リピートしない',
-        47 => '横方向リピート',
-        48 => '縦方向リピート',
-        49 => '適用',
-        50 => '取り消し',
-        51 => '初期化',
-        52 => '文字',
-        53 => '文字フォント',
-        54 => 'テキストの色',
-    );
-
-    $lang->layout_image_repository = 'レイアウトファイル保存場所';
-    $lang->about_layout_image_repository = '選択したレイアウトに使う画像・Ｆｌａｓｈファイル等のアップロード出来ます。また、エクスポートする際、一緒に含まれます。';
-    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flvファイルのみ可能です。';
-    $lang->layout_migration = 'レイアウトのエクスポート/インポート';
-    $lang->about_layout_migration = '修正したレイアウトをtar形式の圧縮ファイルにエクスポートしたり、tar形式として保存されたファイルをインポートすることが出来ます。'."\n".'(まだ、faceOffレイアウトのみエクスポート/インポートが可能です。)';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff レイアウト管理ツール',
-        'description' => 'FaceOffレイアウト管理ツールはウェブ上で、手軽なレイアウト変更を可能にします。<br />下の図を参照しながら構成要素と機能を理解し、自由にレイアウトをカスタマイズしてみて下さい。',
-        'layout' => 'FaceOffは上のようなHTML構造になっています。<br />この構造にてCSSを用いた「レイアウト／配列／整列」の調整が可能になり、さらにStyleを使った自由なカスタマイズが出来ます。<br />ウィジェットの追加はExtension(e1、e2)と Neck、 Kneeにて可能です。<br />その他にもBody、Layout、Header、Body、FooterはStyleをカスタマイズが出来、Contentではモジュールの内容が出力されます。',
-        'setting' => '左側上段のメニューの説明<br/><ul><li>保存 : 設定内容を保存します。</li><li>取り消し : 設定内容を保存せずに、差し戻します。</li><li>初期化 : 何の設定もない白紙状態（もしくはインストール時のデフォールト状態）に戻ります。</li><li>レイアウトタイプ : 固定／可変／固定+可変（内容）型のレイアウトを指定します。</li><li>配列 : Body部分に2つのExtensionとContentを配列します。</li><li>整列 : レイアウトの位置を整列します。</li></ul>',
-        'hotkey' => 'マウスを使って各スペースを選択しながら、Hot Keyを利用すると、より便利なカスタマイズ出来ます。<br/><ul><li>tabキー : ウィジェットが選択されてない場合、Header、Body、 Footer順に選択されます。ウィジェットが選択されている場合は、次のウィジェットに選択されます。</li><li>Shift + tabキー : tabキーと逆の役割をします。</li><li>Esc : 何も選択されてない場合、Escを押すとNeck、Extension(e1、e2)、Knee順に選択され、また、ウィジェットが選択されている場合は選択されたウィジェットを囲む領域が選択されます。</li><li>矢印 : ウィジェットが選択されている時、矢印キーを用いて、ウィジェットを他の領域に移せます。</li></ul>',
-        'attribute' => 'ウィジェットを除いた各領域はすべて背景の色・イメージ・文字のテキスト色(「a」タグを含む)の指定が可能です。',
-
-    );
-	$lang->mobile_layout_list = "モバイルレイアウトリスト";
-	$lang->mobile_downloaded_list = "ダウンロードしたモバイルレイアウト";
-	$lang->apply_mobile_view = "モバイルスキン使用";
-	$lang->about_apply_mobile_view = "活性化すると連結されている全てのモジュールでモバイルスキンが適用されます。";
-?>
diff --git a/modules/layout/lang/ko.lang.php b/modules/layout/lang/ko.lang.php
deleted file mode 100644
index 394cb16fa..000000000
--- a/modules/layout/lang/ko.lang.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  레이아웃(layout) 모듈의 기본 언어팩
-     **/
-
-    $lang->cmd_layout_management = '레이아웃 설정';
-    $lang->cmd_layout_edit = '레이아웃 편집';
-
-    $lang->layout_name = '레이아웃 이름';
-    $lang->layout_maker = '레이아웃 제작자';
-    $lang->layout_license = '라이선스';
-    $lang->layout_history = '변경 이력';
-    $lang->layout_info = '레이아웃 정보';
-    $lang->layout_list = '레이아웃 목록';
-    $lang->menu_count = '메뉴 수';
-    $lang->downloaded_list = '다운로드 목록';
-    $lang->layout_preview_content = '내용이 출력되는 부분입니다.';
-    $lang->not_apply_menu = '레이아웃 일괄 적용';
-	$lang->layout_management = '레이아웃 관리';
-
-    $lang->cmd_move_to_installed_list = '생성된 목록 보기';
-
-    $lang->about_downloaded_layouts = '다운로드 되어 있는 레이아웃 목록';
-    $lang->about_title = '모듈에 연결시 쉽게 구분할 수 있는 제목을 입력해주세요.';
-    $lang->about_not_apply_menu = '체크 하시면 연결된 모든 메뉴의 모듈 레이아웃을 일괄 변경합니다.';
-
-    $lang->about_layout = '레이아웃 모듈은 사이트의 레이아웃을 쉽게 만들 수 있도록 도와줍니다.<br />레이아웃 설정과 메뉴의 연결을 통해서 다양한 모듈이 완성된 사이트의 모습으로 보여줄 수 있도록 합니다.<br />* 삭제나 수정이 불가능한 레이아웃은 블로그나 기타 모듈의 자체 레이아웃이므로 해당 모듈로 가서 설정하셔야 합니다.';
-    $lang->about_layout_code = 
-        "아래 레이아웃의 코드를 직접 수정 후 저장하시면 서비스에 반영이 됩니다.
-        꼭 미리보기를 하신 후에 저장을 하세요.
-        XE의 템플릿 문법은 <a href=\"#\" onclick=\"winopen('http://xe.xpressengine.net/18180861');return false;\">XE 템플릿</a> 을 참고하시면 됩니다.";
-
-    $lang->layout_export = '내보내기';
-    $lang->layout_btn_export = '내 레이아웃 다운로드';
-    $lang->about_layout_export = '현재 수정된 레이아웃을 내보내기를 합니다.';
-    $lang->layout_import = '가져오기';
-    $lang->about_layout_import = '가져오기를 할 경우 기존에 수정된 레이아웃은 삭제됩니다. 가져오기를 하기 전에 내보내기를 통해 백업을 하시기 바랍니다.';
-
-    $lang->layout_manager = array(
-        0  => '레이아웃 매니저',
-        1  => '저장',
-        2  => '취소',
-        3  => '형태',
-        4  => '배열',
-        5  => '정렬',
-        6  => '고정 레이아웃',
-        7  => '가변 레이아웃',
-        8  => '고정+가변(내용)',
-        9  => '1칸',
-        10 => '2칸 (내용 왼쪽)',
-        11 => '2칸 (내용 오른쪽)',
-        12 => '3칸 (내용 왼쪽)',
-        13 => '3칸 (내용 가운데)',
-        14 => '3칸 (내용 오른쪽)',
-        15 => '왼쪽',
-        16 => '가운데',
-        17 => '오른쪽',
-        18 => '전체',
-        19 => '레이아웃',
-        20 => '위젯 추가',
-        21 => '내용 위젯 추가',
-        22 => '속성',
-        23 => '위젯 스타일',
-        24 => '수정',
-        25 => '삭제',
-        26 => '정렬',
-        27 => '한줄 차지',
-        28 => '왼쪽',
-        29 => '오른쪽',
-        30 => '가로',
-        31 => '세로',
-        32 => '바깥 여백',
-        33 => '안쪽 여백',
-        34 => '위',
-        35 => '왼',
-        36 => '오른',
-        37 => '아래',
-        38 => '테두리', 
-        39 => '없음',
-        40 => '배경',
-        41 => '색상',
-        42 => '그림',
-        43 => '선택',
-        44 => '배경 그림 반복',
-        45 => '반복',
-        46 => '반복 안함',
-        47 => '가로 반복',
-        48 => '세로 반복',
-        49 => '적용',
-        50 => '취소',
-        51 => '초기화',
-        52 => '글자',
-        53 => '글자 폰트',
-        54 => '글자 색',
-    );
-
-    $lang->layout_image_repository = '레이아웃 파일 저장소';
-    $lang->about_layout_image_repository = '선택된 레이아웃에 사용될 이미지/플래시파일 등을 올릴 수 있습니다. 내보내기에 같이 포함 됩니다.';
-    $lang->msg_layout_image_target = 'gif, png, jpg, swf, flv파일만 가능합니다.';
-    $lang->layout_migration = '레이아웃 내보내기/들이기';
-    $lang->about_layout_migration = '수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다'."\n".'(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다.)';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff Layout 관리자',
-        'description' => 'FaceOff Layout관리자로 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요.',
-        'layout' => 'FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)과 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.',
-        'setting' => '좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다.</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>',
-        'hotkey' => '마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을 때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을 때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>',
-        'attribute' => '위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.',
-
-    );
-
-	$lang->mobile_layout_list = "모바일 레이아웃 목록";
-	$lang->mobile_downloaded_list = "모바일 다운로드 목록";
-	$lang->apply_mobile_view = "모바일 뷰 일괄 적용";
-	$lang->about_apply_mobile_view = "체크하시면 연결된 모든 메뉴에서 모바일 뷰를 사용합니다.";
-
-?>
diff --git a/modules/layout/lang/lang.xml b/modules/layout/lang/lang.xml
new file mode 100644
index 000000000..8f571cfb6
--- /dev/null
+++ b/modules/layout/lang/lang.xml
@@ -0,0 +1,1057 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_layout_management">
+		<value xml:lang="ko"><![CDATA[레이아웃 설정]]></value>
+		<value xml:lang="en"><![CDATA[Layout Setting]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration du Mise en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки лейаута]]></value>
+		<value xml:lang="es"><![CDATA[Configuración del Diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Ayarları]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập giao diện]]></value>
+	</item>
+	<item name="cmd_layout_edit">
+		<value xml:lang="ko"><![CDATA[레이아웃 편집]]></value>
+		<value xml:lang="en"><![CDATA[Edit Layout]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト編集]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局编辑]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面編輯]]></value>
+		<value xml:lang="fr"><![CDATA[Editer le Mise en Page]]></value>
+		<value xml:lang="de"><![CDATA[Layout bearbeiten]]></value>
+		<value xml:lang="ru"><![CDATA[Редактировать лейаут]]></value>
+		<value xml:lang="es"><![CDATA[Editar el Diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa giao diện]]></value>
+
+	</item>
+	<item name="layout_name">
+		<value xml:lang="ko"><![CDATA[레이아웃 이름]]></value>
+		<value xml:lang="en"><![CDATA[Layout Name]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom du Mise en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Имя лейаута]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del Diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Tên giao diện]]></value>
+	</item>
+	<item name="layout_maker">
+		<value xml:lang="ko"><![CDATA[레이아웃 제작자]]></value>
+		<value xml:lang="en"><![CDATA[Layout Developer]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面作者]]></value>
+		<value xml:lang="fr"><![CDATA[Développeur du Mise en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Разработчик лейаута]]></value>
+		<value xml:lang="es"><![CDATA[Desarrollador del Diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Geliştiricisi]]></value>
+		<value xml:lang="vi"><![CDATA[Người tạo]]></value>
+	</item>
+	<item name="layout_license">
+		<value xml:lang="ko"><![CDATA[라이선스]]></value>
+		<value xml:lang="en"><![CDATA[License]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="fr"><![CDATA[Licence]]></value>
+		<value xml:lang="tr"><![CDATA[Lisans]]></value>
+		<value xml:lang="vi"><![CDATA[Giấy phép]]></value>
+	</item>
+	<item name="layout_history">
+		<value xml:lang="ko"><![CDATA[변경 이력]]></value>
+		<value xml:lang="en"><![CDATA[Updates]]></value>
+		<value xml:lang="jp"><![CDATA[変更内容 ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新记录 ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新記錄]]></value>
+		<value xml:lang="fr"><![CDATA[Mise à Jour]]></value>
+		<value xml:lang="ru"><![CDATA[Обновления]]></value>
+		<value xml:lang="es"><![CDATA[Actualización]]></value>
+		<value xml:lang="tr"><![CDATA[Güncellemeler]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật]]></value>
+	</item>
+	<item name="layout_info">
+		<value xml:lang="ko"><![CDATA[레이아웃 정보]]></value>
+		<value xml:lang="en"><![CDATA[Layout Info]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面資訊]]></value>
+		<value xml:lang="fr"><![CDATA[Informations du Mise en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Информация лейаута]]></value>
+		<value xml:lang="es"><![CDATA[Información del Diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin giao diện]]></value>
+	</item>
+	<item name="layout_list">
+		<value xml:lang="ko"><![CDATA[레이아웃 목록]]></value>
+		<value xml:lang="en"><![CDATA[Layout List]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Mises en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Список лейаутов]]></value>
+		<value xml:lang="es"><![CDATA[Lista de los Diseños]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách giao diện]]></value>
+	</item>
+	<item name="menu_count">
+		<value xml:lang="ko"><![CDATA[메뉴 수]]></value>
+		<value xml:lang="en"><![CDATA[Menus]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單數量]]></value>
+		<value xml:lang="ru"><![CDATA[Меню]]></value>
+		<value xml:lang="es"><![CDATA[Número del Menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menüler]]></value>
+		<value xml:lang="vi"><![CDATA[Menu]]></value>
+	</item>
+	<item name="downloaded_list">
+		<value xml:lang="ko"><![CDATA[다운로드 목록]]></value>
+		<value xml:lang="en"><![CDATA[Download List]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロードリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面選擇]]></value>
+		<value xml:lang="fr"><![CDATA[Liste disponibles]]></value>
+		<value xml:lang="ru"><![CDATA[Список закачек]]></value>
+		<value xml:lang="es"><![CDATA[Lista de la descarga]]></value>
+		<value xml:lang="tr"><![CDATA[İndirme Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Download]]></value>
+	</item>
+	<item name="layout_preview_content">
+		<value xml:lang="ko"><![CDATA[내용이 출력되는 부분입니다.]]></value>
+		<value xml:lang="en"><![CDATA[The content gets displayed here.]]></value>
+		<value xml:lang="jp"><![CDATA[内容が表示される部分です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[显示内容的部分。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顯示內容的部分。]]></value>
+		<value xml:lang="fr"><![CDATA[Le contenu sera exposé ici.]]></value>
+		<value xml:lang="ru"><![CDATA[Содержимое отображается здесь]]></value>
+		<value xml:lang="es"><![CDATA[Los contenidos son mostrados aquí]]></value>
+		<value xml:lang="tr"><![CDATA[Burada görüntülenecek içerikler]]></value>
+		<value xml:lang="vi"><![CDATA[Khu vực nội dung sẽ hiển thị.]]></value>
+	</item>
+	<item name="not_apply_menu">
+		<value xml:lang="ko"><![CDATA[레이아웃 일괄 적용]]></value>
+		<value xml:lang="en"><![CDATA[Apply Layouts En Bloc]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトの一括適用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局共享]]></value>
+		<value xml:lang="zh-TW"><![CDATA[套用版面]]></value>
+		<value xml:lang="fr"><![CDATA[Appliquer le Mise en Page sur tous les menus]]></value>
+		<value xml:lang="ru"><![CDATA[Применить лейауты]]></value>
+		<value xml:lang="es"><![CDATA[Aplicar Diseños]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzenlerini bütünüyle onayla]]></value>
+		<value xml:lang="vi"><![CDATA[Áp dụng giao diện]]></value>
+	</item>
+	<item name="cmd_move_to_installed_list">
+		<value xml:lang="ko"><![CDATA[생성된 목록 보기]]></value>
+		<value xml:lang="en"><![CDATA[View Created Layouts]]></value>
+		<value xml:lang="jp"><![CDATA[作成されたリスト表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看生成目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視建立列表]]></value>
+		<value xml:lang="fr"><![CDATA[Mises en Page créés]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть созданный список]]></value>
+		<value xml:lang="es"><![CDATA[Ver la lista creada]]></value>
+		<value xml:lang="tr"><![CDATA[Oluşturulmuş Yerleşim Düzenlerini Görüntüle]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách đã tạo]]></value>
+	</item>
+	<item name="about_downloaded_layouts">
+		<value xml:lang="ko"><![CDATA[다운로드되어 있는 레이아웃 목록]]></value>
+		<value xml:lang="en"><![CDATA[List of downloaded layouts]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロードのレイアウトリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已下载的布局目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已下載的版面列表]]></value>
+		<value xml:lang="fr"><![CDATA[Mises en Page téléchargés]]></value>
+		<value xml:lang="ru"><![CDATA[Список скаченных лейаутов]]></value>
+		<value xml:lang="es"><![CDATA[Ver la lista de diseños descargados]]></value>
+		<value xml:lang="tr"><![CDATA[İndirilmiş yerleşim düzenlerinin listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách đã Download]]></value>
+	</item>
+	<item name="about_title">
+		<value xml:lang="ko"><![CDATA[모듈에 연결 시 쉽게 구분할 수 있는 제목을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the title that is easy to verify when connecting to the module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールとの連動をわかりやすく区分するためのタイトルを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入连接模块时容易区分的标题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連結模組時，請輸入容易區分的標題。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le titre pour distinguer facilement quand vous le liez à un module.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите название, которое легко проверить при подключении к модулю]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar un nombre fácil de distinguir cuando conecta al módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Modüle bağlanılacağı zaman kolayca doğrulanacak başlığı giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập tiêu đề của giao diện cho dễ dàng lựa chọn về sau.]]></value>
+	</item>
+	<item name="about_not_apply_menu">
+		<value xml:lang="ko"><![CDATA[체크하시면 연결된 모든 메뉴의 모듈 레이아웃을 일괄 변경합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Layouts of all modules connected via menu will be changed en bloc by checking this option.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると連動するすべてのメニューのモジュールのレイアウトを一括変更します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[勾选表示连接到此布局的菜单项全部采用此布局。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新所有被連結到選單的版面模組。]]></value>
+		<value xml:lang="fr"><![CDATA[Tous les Mises en Page qui sont liés sur le menu seront changés si vous cochez cette option.]]></value>
+		<value xml:lang="ru"><![CDATA[Все подключенные лейауты модулей будут изменены при включении это опции.]]></value>
+		<value xml:lang="es"><![CDATA[Al seleccionar esta opción, cambia todos los diseños conectados.]]></value>
+		<value xml:lang="tr"><![CDATA[Menüyle bağlanmış modüllerin yerleşim düzenlerinin hepsi bu seçenekle değiştirilecketir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu chọn, tất cả các giao diện đang sử dụng sẽ được thay đổi thành giao diện này.]]></value>
+	</item>
+	<item name="about_layout">
+		<value xml:lang="ko"><![CDATA[레이아웃 모듈은 사이트의 레이아웃을 쉽게 만들 수 있도록 도와줍니다. 레이아웃 설정과 메뉴의 연결을 통해서 다양한 모듈이 완성된 사이트의 모습으로 보여줄 수 있도록 합니다. 삭제나 수정이 불가능한 레이아웃은 블로그나 기타 모듈의 자체 레이아웃이므로 해당 모듈로 가서 설정하셔야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Layout module helps you create the site's layout easily. By using layout setting and menu connection, website's completed shape will be displayed with various modules. Layouts which you cannot delete are the default layouts of blogs or other moduels, thus you have to delete them from their setting pages.]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトのモジュールはサイトのレイアウトを分かりやすく作成できるようにします。 レイアウトの設定とメニューのリンクで様々なモジュールで完成されたサイト構築ができます。 ブログまたは他のモジュールのレイアウトなどの削除・修正ができないレイアウトは、該当モジュールにて設定を行ってください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局模块使网站制作变得更简单。 通过布局设置及菜单的链接，可以轻松制作以多种模块组成的完整网站。 无法删除和修改的布局可能是博客或其他模块自带的模板，因此应到相关模块进行设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面設計模組使網站製作變得更簡單。 透過版面設置及選單的連結，利用多種模組可以輕鬆製作組合出完整的網站。 無法刪除和修改的版面，可能是部落格或其他模組的原始樣板，因此應到相關模組進行設置。]]></value>
+		<value xml:lang="fr"><![CDATA[Le module de Mise en Page vous aide à créer facilement le Mise en Page du site.  Vous pouvez présentez la forme du site Web complété par les modules divers en utilisant la configuration du Mise en Page et la connexion sur le menu. Les Mises en Page qui ne sont pas possibles à supprimer ou à modifier sont propres à ceux des blogues ou d'autres Mises en Page. Essayez à modifier/supprimer en dedans elles-mêmes]]></value>
+		<value xml:lang="de"><![CDATA[Layouts schmücken das Aussehen Ihrer Module. Sie können sie von Layout-Menü am oberen Rand ]]></value>
+		<value xml:lang="ru"><![CDATA[Модуль лейаутов помогает Вам создать лейаут сайта с легкостью. Используя настройки лейаута и подключение меню, полная форма сайта будет отображена множеством модулей. Теми лейаутами, которые невозможно удалить или изменить, являются лейауты блога и лейауты других модулей.]]></value>
+		<value xml:lang="es"><![CDATA[Módulo del diseño ayuda a usted para crear el diseño de la página web fácilmente. Por usar la configuración del diseño y el menú de conección, completa con varios módulos la forma de la página web que a ser mostrados Esos diseños que no pueden ser modificados ni eliminados son propios de blog y de otros módulos, por lo cual para la configuración de ellos debe hacerse en los modulos correspondientes.]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzeni (layout) modülü size, sitenin yerleşim düzenini kolayca oluşturma imkanı sunar. Yerleşim düzeni ayarını ve menü bağlantısını kullandığınzda, websitelerin çeşitli modüllerle tamamlanmış şekilleri gösterilecektir. Blogların veya diğer modüllerin varsayılan yerleşim düzenlerini silemezseniz; onları, kendi ayar sayfalarından silmeniz gerekmektedir. ]]></value>
+		<value xml:lang="vi"><![CDATA[Module giao diện giúp bạn tạo ra giao diện của Website một cách dễ dàng. Bằng cách sử dụng thiết lập giao diện và kết nối Menu, hình dạng hoàn thành của Website sẽ được trình bày bổ xung với nhiều Module. Giao diện nào xuất hiện. là những giao diện không thể xóa hay điều chỉnh được Module. ]]></value>
+
+	</item>
+	<item name="about_layout_code">
+		<value xml:lang="ko"><![CDATA[아래 레이아웃의 코드를 직접 수정 후 저장하시면 서비스에 반영이 됩니다.
+        꼭 미리보기를 하신 후에 저장을 하세요.
+        XE의 템플릿 문법은 <a href="#" onclick="winopen('http://xe.xpressengine.net/18180861');return false;">XE 템플릿</a> 을 참고하시면 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[It will be applied to the service when you save the layout code after editing it.
+        Please first preview your code and then save it.
+        You can refer grammar of XE's template from <a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">XE Template</a>.]]></value>
+		<value xml:lang="jp"><![CDATA[下のレイアウトコードを修正し、保存するとサービスに反映されます。
+        必ずプレビューで確認してから保存してください。
+        XEのテンプレート文法は<a href="#" onclick="winopen('http://xe.xpressengine.net/18180861');return false;">XEテンプレート</a>を参考してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改的布局代码保存后即可生效。
+	保存之前请必须先预览后再保存。
+        XE布局语法请参考<strong><a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">XE模板</a></strong>。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[儲存修改後的版面，即可生效。
+	     儲存之前，請先預覽後再儲存。
+        XE 版面設計語法，請參考<a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">XE 樣版</a>。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous conservez la code de Mise en Page après l'éditer, la code sera appliquée sur le service.
+        Utilisez [Avant-première] avant conserver la code S.V.P.
+        Vous pouvez référer la grammaire de modèle de XE sur <a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">Modèle du XE</a>.]]></value>
+		<value xml:lang="ru"><![CDATA[Применения к службе будут проиведены, когда Вы сохраните код лейаут после редактирование.
+        Пожалуйста, сначала используйте предпросмотр кода и затем сохраните его.
+        Вы можете обратиться к грамматике шаблонов XE с <a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">XE Template</a>.]]></value>
+		<value xml:lang="es"><![CDATA[El diseño sera aplicado al servicio cuando usted guarda el código del diseño luego de haber editado.
+		Primero visualiza previamente tus códigos y luego guardalos
+        Referente al código de planillas de XE dirijirse a<a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">XE Pamphlet(Ingles)</a> ]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzeni kodunu düzenledikten sonra kaydettiğinizde, hizmete girecektir.
+        Lütfen önce kodunuzun önizlemesini yapın ve sonra kaydedin.
+        XE'nin şablolunu örnek alabilirsiniz : <a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;">XE Template</a>.]]></value>
+		<value xml:lang="vi"><![CDATA[Nó sẽ được áp dụng vào Website ngay khi bạn bấm '<b>Lưu</b>' sau khi sửa đổi.
+        Hãy bấm '<b>Xem trước</b>' trước khi bấm '<b>Lưu</b>'.
+        Bạn có thể tham khảo cách sửa giao diện tại <a href="#" onclick="winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;"><b>XE Template</b></a>.]]></value>
+	</item>
+	<item name="layout_export">
+		<value xml:lang="ko"><![CDATA[내보내기]]></value>
+		<value xml:lang="en"><![CDATA[Export]]></value>
+		<value xml:lang="jp"><![CDATA[エクスポート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导出]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面匯出]]></value>
+		<value xml:lang="tr"><![CDATA[Dışa Aktar]]></value>
+		<value xml:lang="vi"><![CDATA[Xuất ra]]></value>
+	</item>
+	<item name="layout_btn_export">
+		<value xml:lang="ko"><![CDATA[내 레이아웃 다운로드]]></value>
+		<value xml:lang="en"><![CDATA[Download My Layout]]></value>
+		<value xml:lang="jp"><![CDATA[マイレイアウトをダウンロードする]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载布局设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載版面]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzenimi İndir]]></value>
+		<value xml:lang="vi"><![CDATA[Download giao diện của tôi]]></value>
+	</item>
+	<item name="about_layout_export">
+		<value xml:lang="ko"><![CDATA[현재 수정된 레이아웃을 내보내기를 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Export currently edited layout.]]></value>
+		<value xml:lang="jp"><![CDATA[カスタマイズした自分のレイアウトをエクスポートします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以导出当前已修改好的布局。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可匯出目前修改過的版面。]]></value>
+		<value xml:lang="ru"><![CDATA[Export currently editted layout.]]></value>
+		<value xml:lang="tr"><![CDATA[Düzenlenmiş mevcut yerleşim düzenini dışa aktar.]]></value>
+		<value xml:lang="vi"><![CDATA[Xuất giao diện sửa chữa hiện tại.]]></value>
+	</item>
+	<item name="layout_import">
+		<value xml:lang="ko"><![CDATA[가져오기]]></value>
+		<value xml:lang="en"><![CDATA[Import]]></value>
+		<value xml:lang="jp"><![CDATA[インポート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导入]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面匯入]]></value>
+		<value xml:lang="tr"><![CDATA[İçe Aktar]]></value>
+		<value xml:lang="vi"><![CDATA[Nhập vào]]></value>
+	</item>
+	<item name="about_layout_import">
+		<value xml:lang="ko"><![CDATA[가져오기를 할 경우 기존에 수정된 레이아웃은 삭제됩니다. 가져오기를 하기 전에 내보내기를 통해 백업을 하시기 바랍니다.]]></value>
+		<value xml:lang="en"><![CDATA[Previously modified layout will be deleted when you import a new one. Please export the current layout for a backup before importing a new one.]]></value>
+		<value xml:lang="jp"><![CDATA[インポートする場合、既存の修正されたレイアウトを上書きします。インポート前にエクスポートでバックアップすることをお勧めします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导入之前请利用<strong>导出功能</strong>备份好当前的布局及设置，因为导入会删除当前的布局及设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面匯入時，將會刪除目前的版面設置。
+    版面匯入前，請先匯出備份目前的版面設置。]]></value>
+		<value xml:lang="fr"><![CDATA[가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.]]></value>
+		<value xml:lang="ru"><![CDATA[Original layout will be deleted when you import. Please export current layout before importing.]]></value>
+		<value xml:lang="es"><![CDATA[가져오기를 할 경우 기존 수정된 레이아웃을 삭제가 됩니다. 가져오기를 하기전에 내보내기를 통해 백업을 하시기 바랍니다.]]></value>
+		<value xml:lang="tr"><![CDATA[İçe yeni bir yerleşim düzeni aktarmanız durumunda, önceden değiştirdiğiniz yerleşim düzeni silinecektir. Lütfen içe aktarım yapmadan önce, mevcut yerleşim düzeninin yedeğini almış olmak için dışa aktarınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Giao diện nguyên bản sẽ bị xóa khi bạn nhập vào. Hãy xuất ra để lưu giao diện hiện thời trước khi nhập vào.]]></value>
+	</item>
+	<item name="layout_manager" type="array">
+		<item name="0">
+			<value xml:lang="ko"><![CDATA[레이아웃 매니저]]></value>
+			<value xml:lang="en"><![CDATA[Layout Manager]]></value>
+			<value xml:lang="jp"><![CDATA[レイアウトマネジャー]]></value>
+			<value xml:lang="zh-CN"><![CDATA[布局管理器]]></value>
+			<value xml:lang="zh-TW"><![CDATA[版面管理者]]></value>
+			<value xml:lang="de"><![CDATA[L]]></value>
+			<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Yöneticisi]]></value>
+			<value xml:lang="vi"><![CDATA[Quản lý giao diện]]></value>
+
+		</item>
+		<item name="1">
+			<value xml:lang="ko"><![CDATA[저장]]></value>
+			<value xml:lang="en"><![CDATA[Save]]></value>
+			<value xml:lang="jp"><![CDATA[保存]]></value>
+			<value xml:lang="zh-CN"><![CDATA[保存]]></value>
+			<value xml:lang="zh-TW"><![CDATA[儲存]]></value>
+			<value xml:lang="de"><![CDATA[a]]></value>
+			<value xml:lang="tr"><![CDATA[Kaydet]]></value>
+			<value xml:lang="vi"><![CDATA[Lưu lại]]></value>
+
+		</item>
+		<item name="2">
+			<value xml:lang="ko"><![CDATA[취소]]></value>
+			<value xml:lang="en"><![CDATA[Cancel]]></value>
+			<value xml:lang="jp"><![CDATA[取り消し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[取消]]></value>
+			<value xml:lang="zh-TW"><![CDATA[取消]]></value>
+			<value xml:lang="de"><![CDATA[y]]></value>
+			<value xml:lang="tr"><![CDATA[İptal]]></value>
+			<value xml:lang="vi"><![CDATA[Loại bỏ]]></value>
+
+		</item>
+		<item name="3">
+			<value xml:lang="ko"><![CDATA[형태]]></value>
+			<value xml:lang="en"><![CDATA[Form]]></value>
+			<value xml:lang="jp"><![CDATA[基本レイアウト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[宽度]]></value>
+			<value xml:lang="zh-TW"><![CDATA[模式]]></value>
+			<value xml:lang="de"><![CDATA[o]]></value>
+			<value xml:lang="tr"><![CDATA[Biçim]]></value>
+
+		</item>
+		<item name="4">
+			<value xml:lang="ko"><![CDATA[배열]]></value>
+			<value xml:lang="en"><![CDATA[Array]]></value>
+			<value xml:lang="jp"><![CDATA[配列]]></value>
+			<value xml:lang="zh-CN"><![CDATA[版式]]></value>
+			<value xml:lang="zh-TW"><![CDATA[樣式]]></value>
+			<value xml:lang="de"><![CDATA[u]]></value>
+			<value xml:lang="tr"><![CDATA[Dizi]]></value>
+			<value xml:lang="vi"><![CDATA[Giãn ra]]></value>
+
+		</item>
+		<item name="5">
+			<value xml:lang="ko"><![CDATA[정렬]]></value>
+			<value xml:lang="en"><![CDATA[Arrange]]></value>
+			<value xml:lang="jp"><![CDATA[整列]]></value>
+			<value xml:lang="zh-CN"><![CDATA[对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[對齊]]></value>
+			<value xml:lang="de"><![CDATA[t]]></value>
+			<value xml:lang="tr"><![CDATA[Yerleştir]]></value>
+			<value xml:lang="vi"><![CDATA[Thu lại]]></value>
+
+		</item>
+		<item name="6">
+			<value xml:lang="ko"><![CDATA[고정 레이아웃]]></value>
+			<value xml:lang="en"><![CDATA[Fixed Layout]]></value>
+			<value xml:lang="jp"><![CDATA[固定型レイアウト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[固定宽度]]></value>
+			<value xml:lang="zh-TW"><![CDATA[固定版面]]></value>
+			<value xml:lang="de"><![CDATA[-]]></value>
+			<value xml:lang="tr"><![CDATA[Sabit Yerleşim Düzeni]]></value>
+			<value xml:lang="vi"><![CDATA[Cố định giao diện]]></value>
+
+		</item>
+		<item name="7">
+			<value xml:lang="ko"><![CDATA[가변 레이아웃]]></value>
+			<value xml:lang="en"><![CDATA[Variable Layout]]></value>
+			<value xml:lang="jp"><![CDATA[可変型レイアウト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[自适应宽度]]></value>
+			<value xml:lang="zh-TW"><![CDATA[變動版面]]></value>
+			<value xml:lang="de"><![CDATA[E]]></value>
+			<value xml:lang="tr"><![CDATA[Değişken Yerleşim Düzeni]]></value>
+			<value xml:lang="vi"><![CDATA[Giao diện biến thiên]]></value>
+
+		</item>
+		<item name="8">
+			<value xml:lang="ko"><![CDATA[고정+가변(내용)]]></value>
+			<value xml:lang="en"><![CDATA[Fixed+Variable (Content)]]></value>
+			<value xml:lang="jp"><![CDATA[固定+(内容部分)可変]]></value>
+			<value xml:lang="zh-CN"><![CDATA[固定+自适应(内容)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[固定+變動(內容)]]></value>
+			<value xml:lang="de"><![CDATA[i]]></value>
+			<value xml:lang="tr"><![CDATA[Sabit+Değişken (İçerik)]]></value>
+			<value xml:lang="vi"><![CDATA[Cố định+Biến thiên (Nội dung)]]></value>
+
+		</item>
+		<item name="9">
+			<value xml:lang="ko"><![CDATA[1칸]]></value>
+			<value xml:lang="en"><![CDATA[1 Cell]]></value>
+			<value xml:lang="jp"><![CDATA[1段]]></value>
+			<value xml:lang="zh-CN"><![CDATA[1栏]]></value>
+			<value xml:lang="zh-TW"><![CDATA[1欄]]></value>
+			<value xml:lang="de"><![CDATA[n]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre 1]]></value>
+			<value xml:lang="vi"><![CDATA[1 ô]]></value>
+
+		</item>
+		<item name="10">
+			<value xml:lang="ko"><![CDATA[2칸 (내용 왼쪽)]]></value>
+			<value xml:lang="en"><![CDATA[2 Cells (left of content)]]></value>
+			<value xml:lang="jp"><![CDATA[2段 (内容左側配置)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[2栏 (左侧内容区)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[2欄 (左側內容區)]]></value>
+			<value xml:lang="de"><![CDATA[s]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre 2 (içeriğin sol kısmında)]]></value>
+			<value xml:lang="vi"><![CDATA[2 ô (Trái của nội dung)]]></value>
+
+		</item>
+		<item name="11">
+			<value xml:lang="ko"><![CDATA[2칸 (내용 오른쪽)]]></value>
+			<value xml:lang="en"><![CDATA[2 Cells (right of content)]]></value>
+			<value xml:lang="jp"><![CDATA[2段 (内容右側配置)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[2栏 (右侧内容区)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[2欄 (右側內容區)]]></value>
+			<value xml:lang="de"><![CDATA[t]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre 2 (içeriğin sağ kısmında)]]></value>
+			<value xml:lang="vi"><![CDATA[2 ô (Phải của nội dung)]]></value>
+
+		</item>
+		<item name="12">
+			<value xml:lang="ko"><![CDATA[3칸 (내용 왼쪽)]]></value>
+			<value xml:lang="en"><![CDATA[3 Cells (left of content)]]></value>
+			<value xml:lang="jp"><![CDATA[3段 (内容左側配置)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[3栏 (左侧内容区)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[3欄 (左側內容區)]]></value>
+			<value xml:lang="de"><![CDATA[e]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre 3 (içeriğin sol kısmında)]]></value>
+			<value xml:lang="vi"><![CDATA[3 ô (Trái của nội dung)]]></value>
+
+		</item>
+		<item name="13">
+			<value xml:lang="ko"><![CDATA[3칸 (내용 가운데)]]></value>
+			<value xml:lang="en"><![CDATA[3 Cells (center of content)]]></value>
+			<value xml:lang="jp"><![CDATA[3段 (内容中央配置)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[3栏 (剧中内容区)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[3欄 (居中內容區)]]></value>
+			<value xml:lang="de"><![CDATA[l]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre 3 (içeriğin orta kısmında)]]></value>
+			<value xml:lang="vi"><![CDATA[3 ô (Giữa của nội dung)]]></value>
+
+		</item>
+		<item name="14">
+			<value xml:lang="ko"><![CDATA[3칸 (내용 오른쪽)]]></value>
+			<value xml:lang="en"><![CDATA[3 Cells (right of content)]]></value>
+			<value xml:lang="jp"><![CDATA[3段 (内容右側配置)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[3栏 (右侧内容区)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[3欄 (右側內容區)]]></value>
+			<value xml:lang="de"><![CDATA[l]]></value>
+			<value xml:lang="tr"><![CDATA[Hücre 3 (içeriğin sol kısmında)]]></value>
+			<value xml:lang="vi"><![CDATA[3 ô (Phải của nội dung)]]></value>
+
+		</item>
+		<item name="15">
+			<value xml:lang="ko"><![CDATA[왼쪽]]></value>
+			<value xml:lang="en"><![CDATA[Left]]></value>
+			<value xml:lang="jp"><![CDATA[左]]></value>
+			<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠左對齊]]></value>
+			<value xml:lang="de"><![CDATA[u]]></value>
+			<value xml:lang="tr"><![CDATA[Sol]]></value>
+			<value xml:lang="vi"><![CDATA[Trái]]></value>
+
+		</item>
+		<item name="16">
+			<value xml:lang="ko"><![CDATA[가운데]]></value>
+			<value xml:lang="en"><![CDATA[Center]]></value>
+			<value xml:lang="jp"><![CDATA[中央]]></value>
+			<value xml:lang="zh-CN"><![CDATA[剧中对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[置中對齊]]></value>
+			<value xml:lang="de"><![CDATA[n]]></value>
+			<value xml:lang="tr"><![CDATA[Orta]]></value>
+			<value xml:lang="vi"><![CDATA[Giữa]]></value>
+
+		</item>
+		<item name="17">
+			<value xml:lang="ko"><![CDATA[오른쪽]]></value>
+			<value xml:lang="en"><![CDATA[Right]]></value>
+			<value xml:lang="jp"><![CDATA[右]]></value>
+			<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠右對齊]]></value>
+			<value xml:lang="de"><![CDATA[g]]></value>
+			<value xml:lang="tr"><![CDATA[Sağ]]></value>
+			<value xml:lang="vi"><![CDATA[Phải]]></value>
+
+		</item>
+		<item name="18">
+			<value xml:lang="ko"><![CDATA[전체]]></value>
+			<value xml:lang="en"><![CDATA[All]]></value>
+			<value xml:lang="jp"><![CDATA[すべて]]></value>
+			<value xml:lang="zh-CN"><![CDATA[全局]]></value>
+			<value xml:lang="zh-TW"><![CDATA[整體]]></value>
+			<value xml:lang="de"><![CDATA[e]]></value>
+			<value xml:lang="tr"><![CDATA[Tümü]]></value>
+			<value xml:lang="vi"><![CDATA[Dàn đều]]></value>
+
+		</item>
+		<item name="19">
+			<value xml:lang="ko"><![CDATA[레이아웃]]></value>
+			<value xml:lang="en"><![CDATA[Layout]]></value>
+			<value xml:lang="jp"><![CDATA[レイアウト]]></value>
+			<value xml:lang="zh-CN"><![CDATA[布局]]></value>
+			<value xml:lang="zh-TW"><![CDATA[版面]]></value>
+			<value xml:lang="de"><![CDATA[n]]></value>
+			<value xml:lang="tr"><![CDATA[Yerleşim Düzeni]]></value>
+			<value xml:lang="vi"><![CDATA[Giao diện]]></value>
+
+		</item>
+		<item name="20">
+			<value xml:lang="ko"><![CDATA[위젯 추가]]></value>
+			<value xml:lang="en"><![CDATA[Add Widget]]></value>
+			<value xml:lang="jp"><![CDATA[ウィジェット追加]]></value>
+			<value xml:lang="zh-CN"><![CDATA[添加控件]]></value>
+			<value xml:lang="zh-TW"><![CDATA[新增Widget]]></value>
+			<value xml:lang="tr"><![CDATA[Widget ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Thêm Widget]]></value>
+
+		</item>
+		<item name="21">
+			<value xml:lang="ko"><![CDATA[내용 위젯 추가]]></value>
+			<value xml:lang="en"><![CDATA[Add Content Widget]]></value>
+			<value xml:lang="jp"><![CDATA[内容 ウィジェット追加]]></value>
+			<value xml:lang="zh-CN"><![CDATA[添加内容]]></value>
+			<value xml:lang="zh-TW"><![CDATA[新增內容]]></value>
+			<value xml:lang="tr"><![CDATA[İçerik Widgetı ekle]]></value>
+			<value xml:lang="vi"><![CDATA[Thêm Widget nội dung]]></value>
+
+		</item>
+		<item name="22">
+			<value xml:lang="ko"><![CDATA[속성]]></value>
+			<value xml:lang="en"><![CDATA[Attribute]]></value>
+			<value xml:lang="jp"><![CDATA[属性]]></value>
+			<value xml:lang="zh-CN"><![CDATA[属性]]></value>
+			<value xml:lang="zh-TW"><![CDATA[屬性]]></value>
+			<value xml:lang="tr"><![CDATA[Öznitelik]]></value>
+			<value xml:lang="vi"><![CDATA[Thuộc tính]]></value>
+
+		</item>
+		<item name="23">
+			<value xml:lang="ko"><![CDATA[위젯 스타일]]></value>
+			<value xml:lang="en"><![CDATA[Widget Style]]></value>
+			<value xml:lang="jp"><![CDATA[ウィジェットスタイル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[控件样式]]></value>
+			<value xml:lang="zh-TW"><![CDATA[Widget樣式]]></value>
+			<value xml:lang="tr"><![CDATA[Widget Tarzı]]></value>
+			<value xml:lang="vi"><![CDATA[Kiểu dáng Widget]]></value>
+
+		</item>
+		<item name="24">
+			<value xml:lang="ko"><![CDATA[수정]]></value>
+			<value xml:lang="en"><![CDATA[Modify]]></value>
+			<value xml:lang="jp"><![CDATA[修正]]></value>
+			<value xml:lang="zh-CN"><![CDATA[修改]]></value>
+			<value xml:lang="zh-TW"><![CDATA[修改]]></value>
+			<value xml:lang="tr"><![CDATA[Düzenle]]></value>
+			<value xml:lang="vi"><![CDATA[Điều chỉnh]]></value>
+
+		</item>
+		<item name="25">
+			<value xml:lang="ko"><![CDATA[삭제]]></value>
+			<value xml:lang="en"><![CDATA[Delete]]></value>
+			<value xml:lang="jp"><![CDATA[削除]]></value>
+			<value xml:lang="zh-CN"><![CDATA[删除]]></value>
+			<value xml:lang="zh-TW"><![CDATA[刪除]]></value>
+			<value xml:lang="tr"><![CDATA[Sil]]></value>
+			<value xml:lang="vi"><![CDATA[Xóa]]></value>
+
+		</item>
+		<item name="26">
+			<value xml:lang="ko"><![CDATA[정렬]]></value>
+			<value xml:lang="en"><![CDATA[Align]]></value>
+			<value xml:lang="jp"><![CDATA[整列]]></value>
+			<value xml:lang="zh-CN"><![CDATA[对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Hizala]]></value>
+			<value xml:lang="vi"><![CDATA[Căn chỉnh]]></value>
+
+		</item>
+		<item name="27">
+			<value xml:lang="ko"><![CDATA[한줄 차지]]></value>
+			<value xml:lang="en"><![CDATA[Occupy a Line]]></value>
+			<value xml:lang="jp"><![CDATA[一行占め]]></value>
+			<value xml:lang="zh-CN"><![CDATA[占段落]]></value>
+			<value xml:lang="zh-TW"><![CDATA[換行]]></value>
+			<value xml:lang="tr"><![CDATA[Satır atla]]></value>
+			<value xml:lang="vi"><![CDATA[Chiếm 1 hàng]]></value>
+		</item>
+		<item name="28">
+			<value xml:lang="ko"><![CDATA[왼쪽]]></value>
+			<value xml:lang="en"><![CDATA[Left]]></value>
+			<value xml:lang="jp"><![CDATA[左]]></value>
+			<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠左對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Sol]]></value>
+			<value xml:lang="vi"><![CDATA[Trái]]></value>
+		</item>
+		<item name="29">
+			<value xml:lang="ko"><![CDATA[오른쪽]]></value>
+			<value xml:lang="en"><![CDATA[Right]]></value>
+			<value xml:lang="jp"><![CDATA[右]]></value>
+			<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+			<value xml:lang="zh-TW"><![CDATA[靠右對齊]]></value>
+			<value xml:lang="tr"><![CDATA[Sağ]]></value>
+			<value xml:lang="vi"><![CDATA[Phải]]></value>
+		</item>
+		<item name="30">
+			<value xml:lang="ko"><![CDATA[가로]]></value>
+			<value xml:lang="en"><![CDATA[Width]]></value>
+			<value xml:lang="jp"><![CDATA[横幅サイズ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[宽度]]></value>
+			<value xml:lang="zh-TW"><![CDATA[寬度]]></value>
+			<value xml:lang="fr"><![CDATA[가로 너비]]></value>
+			<value xml:lang="es"><![CDATA[가로 너비]]></value>
+			<value xml:lang="tr"><![CDATA[Genişlik]]></value>
+			<value xml:lang="vi"><![CDATA[Chiều rộng]]></value>
+		</item>
+		<item name="31">
+			<value xml:lang="ko"><![CDATA[세로]]></value>
+			<value xml:lang="en"><![CDATA[Height]]></value>
+			<value xml:lang="jp"><![CDATA[高さ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[高度]]></value>
+			<value xml:lang="zh-TW"><![CDATA[高度]]></value>
+			<value xml:lang="fr"><![CDATA[높이]]></value>
+			<value xml:lang="es"><![CDATA[높이]]></value>
+			<value xml:lang="tr"><![CDATA[Uzunluk]]></value>
+			<value xml:lang="vi"><![CDATA[Chiều cao]]></value>
+		</item>
+		<item name="32">
+			<value xml:lang="ko"><![CDATA[바깥 여백]]></value>
+			<value xml:lang="en"><![CDATA[Margin]]></value>
+			<value xml:lang="jp"><![CDATA[外側余白]]></value>
+			<value xml:lang="zh-CN"><![CDATA[外边距]]></value>
+			<value xml:lang="zh-TW"><![CDATA[邊距]]></value>
+			<value xml:lang="tr"><![CDATA[Kenar Boşluğu]]></value>
+			<value xml:lang="vi"><![CDATA[Lề]]></value>
+		</item>
+		<item name="33">
+			<value xml:lang="ko"><![CDATA[안쪽 여백]]></value>
+			<value xml:lang="en"><![CDATA[Padding]]></value>
+			<value xml:lang="jp"><![CDATA[内側余白]]></value>
+			<value xml:lang="zh-CN"><![CDATA[内填充]]></value>
+			<value xml:lang="zh-TW"><![CDATA[內距]]></value>
+			<value xml:lang="tr"><![CDATA[Dolgu]]></value>
+			<value xml:lang="vi"><![CDATA[Lót]]></value>
+		</item>
+		<item name="34">
+			<value xml:lang="ko"><![CDATA[위]]></value>
+			<value xml:lang="en"><![CDATA[Top]]></value>
+			<value xml:lang="jp"><![CDATA[上]]></value>
+			<value xml:lang="zh-CN"><![CDATA[上]]></value>
+			<value xml:lang="zh-TW"><![CDATA[上]]></value>
+			<value xml:lang="tr"><![CDATA[Üst]]></value>
+			<value xml:lang="vi"><![CDATA[Đỉnh]]></value>
+		</item>
+		<item name="35">
+			<value xml:lang="ko"><![CDATA[왼]]></value>
+			<value xml:lang="en"><![CDATA[Left]]></value>
+			<value xml:lang="jp"><![CDATA[左]]></value>
+			<value xml:lang="zh-CN"><![CDATA[左]]></value>
+			<value xml:lang="zh-TW"><![CDATA[左]]></value>
+			<value xml:lang="tr"><![CDATA[Sol]]></value>
+			<value xml:lang="vi"><![CDATA[Trái]]></value>
+		</item>
+		<item name="36">
+			<value xml:lang="ko"><![CDATA[오른]]></value>
+			<value xml:lang="en"><![CDATA[Right]]></value>
+			<value xml:lang="jp"><![CDATA[右]]></value>
+			<value xml:lang="zh-CN"><![CDATA[右]]></value>
+			<value xml:lang="zh-TW"><![CDATA[右]]></value>
+			<value xml:lang="tr"><![CDATA[Sağ]]></value>
+			<value xml:lang="vi"><![CDATA[Phải]]></value>
+		</item>
+		<item name="37">
+			<value xml:lang="ko"><![CDATA[아래]]></value>
+			<value xml:lang="en"><![CDATA[Bottom]]></value>
+			<value xml:lang="jp"><![CDATA[下]]></value>
+			<value xml:lang="zh-CN"><![CDATA[下]]></value>
+			<value xml:lang="zh-TW"><![CDATA[下]]></value>
+			<value xml:lang="tr"><![CDATA[Alt]]></value>
+			<value xml:lang="vi"><![CDATA[Dưới]]></value>
+		</item>
+		<item name="38">
+			<value xml:lang="ko"><![CDATA[테두리]]></value>
+			<value xml:lang="en"><![CDATA[Border]]></value>
+			<value xml:lang="jp"><![CDATA[ボーダー]]></value>
+			<value xml:lang="zh-CN"><![CDATA[边框]]></value>
+			<value xml:lang="zh-TW"><![CDATA[外框]]></value>
+			<value xml:lang="tr"><![CDATA[Kenarlık]]></value>
+			<value xml:lang="vi"><![CDATA[Viền]]></value>
+		</item>
+		<item name="39">
+			<value xml:lang="ko"><![CDATA[없음]]></value>
+			<value xml:lang="en"><![CDATA[None]]></value>
+			<value xml:lang="jp"><![CDATA[なし]]></value>
+			<value xml:lang="zh-CN"><![CDATA[无]]></value>
+			<value xml:lang="zh-TW"><![CDATA[無]]></value>
+			<value xml:lang="tr"><![CDATA[Hiçbiri]]></value>
+			<value xml:lang="vi"><![CDATA[Không]]></value>
+		</item>
+		<item name="40">
+			<value xml:lang="ko"><![CDATA[배경]]></value>
+			<value xml:lang="en"><![CDATA[Background]]></value>
+			<value xml:lang="jp"><![CDATA[背景]]></value>
+			<value xml:lang="zh-CN"><![CDATA[背景]]></value>
+			<value xml:lang="zh-TW"><![CDATA[背景]]></value>
+			<value xml:lang="tr"><![CDATA[Arkaplan]]></value>
+			<value xml:lang="vi"><![CDATA[Nền]]></value>
+		</item>
+		<item name="41">
+			<value xml:lang="ko"><![CDATA[색상]]></value>
+			<value xml:lang="en"><![CDATA[Color]]></value>
+			<value xml:lang="jp"><![CDATA[色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[顏色]]></value>
+			<value xml:lang="tr"><![CDATA[Renk]]></value>
+			<value xml:lang="vi"><![CDATA[Màu]]></value>
+		</item>
+		<item name="42">
+			<value xml:lang="ko"><![CDATA[그림]]></value>
+			<value xml:lang="en"><![CDATA[Image]]></value>
+			<value xml:lang="jp"><![CDATA[画像]]></value>
+			<value xml:lang="zh-CN"><![CDATA[图片]]></value>
+			<value xml:lang="zh-TW"><![CDATA[圖片]]></value>
+			<value xml:lang="tr"><![CDATA[Resim]]></value>
+			<value xml:lang="vi"><![CDATA[Hình ảnh]]></value>
+		</item>
+		<item name="43">
+			<value xml:lang="ko"><![CDATA[선택]]></value>
+			<value xml:lang="en"><![CDATA[Select]]></value>
+			<value xml:lang="jp"><![CDATA[選択]]></value>
+			<value xml:lang="zh-CN"><![CDATA[选择]]></value>
+			<value xml:lang="zh-TW"><![CDATA[選擇]]></value>
+			<value xml:lang="tr"><![CDATA[Seç]]></value>
+			<value xml:lang="vi"><![CDATA[Lựa chọn]]></value>
+		</item>
+		<item name="44">
+			<value xml:lang="ko"><![CDATA[배경 그림 반복]]></value>
+			<value xml:lang="en"><![CDATA[Repeat Background]]></value>
+			<value xml:lang="jp"><![CDATA[背景画像繰り返し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[背景重复]]></value>
+			<value xml:lang="zh-TW"><![CDATA[背景重複]]></value>
+			<value xml:lang="tr"><![CDATA[Arkaplan Tekrarı]]></value>
+			<value xml:lang="vi"><![CDATA[Lặp lại nền]]></value>
+		</item>
+		<item name="45">
+			<value xml:lang="ko"><![CDATA[반복]]></value>
+			<value xml:lang="en"><![CDATA[Repeat]]></value>
+			<value xml:lang="jp"><![CDATA[繰り返し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[平铺]]></value>
+			<value xml:lang="zh-TW"><![CDATA[重複]]></value>
+			<value xml:lang="tr"><![CDATA[Tekrar]]></value>
+			<value xml:lang="vi"><![CDATA[Lặp lại]]></value>
+		</item>
+		<item name="46">
+			<value xml:lang="ko"><![CDATA[반복 안함]]></value>
+			<value xml:lang="en"><![CDATA[No Repeat]]></value>
+			<value xml:lang="jp"><![CDATA[繰り返ししない]]></value>
+			<value xml:lang="zh-CN"><![CDATA[不重复]]></value>
+			<value xml:lang="zh-TW"><![CDATA[不重複]]></value>
+			<value xml:lang="tr"><![CDATA[Tekrar Yok]]></value>
+			<value xml:lang="vi"><![CDATA[Không lặp]]></value>
+		</item>
+		<item name="47">
+			<value xml:lang="ko"><![CDATA[가로 반복]]></value>
+			<value xml:lang="en"><![CDATA[Repeat Width]]></value>
+			<value xml:lang="jp"><![CDATA[横方向繰り返し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[水平重复]]></value>
+			<value xml:lang="zh-TW"><![CDATA[水平重複]]></value>
+			<value xml:lang="tr"><![CDATA[Genişlik Tekrarı]]></value>
+			<value xml:lang="vi"><![CDATA[Lặp lại chiều rộng]]></value>
+		</item>
+		<item name="48">
+			<value xml:lang="ko"><![CDATA[세로 반복]]></value>
+			<value xml:lang="en"><![CDATA[Repeat Height]]></value>
+			<value xml:lang="jp"><![CDATA[縦方向繰り返し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[垂直重复]]></value>
+			<value xml:lang="zh-TW"><![CDATA[垂直重複]]></value>
+			<value xml:lang="tr"><![CDATA[Uzunluk Tekrarı]]></value>
+			<value xml:lang="vi"><![CDATA[Lặp lại chiều cao]]></value>
+		</item>
+		<item name="49">
+			<value xml:lang="ko"><![CDATA[적용]]></value>
+			<value xml:lang="en"><![CDATA[Apply]]></value>
+			<value xml:lang="jp"><![CDATA[適用]]></value>
+			<value xml:lang="zh-CN"><![CDATA[应用]]></value>
+			<value xml:lang="zh-TW"><![CDATA[應用]]></value>
+			<value xml:lang="tr"><![CDATA[Uygula]]></value>
+			<value xml:lang="vi"><![CDATA[Áp dụng]]></value>
+		</item>
+		<item name="50">
+			<value xml:lang="ko"><![CDATA[취소]]></value>
+			<value xml:lang="en"><![CDATA[Cancel]]></value>
+			<value xml:lang="jp"><![CDATA[取り消し]]></value>
+			<value xml:lang="zh-CN"><![CDATA[取消]]></value>
+			<value xml:lang="zh-TW"><![CDATA[取消]]></value>
+			<value xml:lang="tr"><![CDATA[İptal]]></value>
+			<value xml:lang="vi"><![CDATA[Loại bỏ]]></value>
+		</item>
+		<item name="51">
+			<value xml:lang="ko"><![CDATA[초기화]]></value>
+			<value xml:lang="en"><![CDATA[Reset]]></value>
+			<value xml:lang="jp"><![CDATA[初期化]]></value>
+			<value xml:lang="zh-CN"><![CDATA[初始化]]></value>
+			<value xml:lang="zh-TW"><![CDATA[重置]]></value>
+			<value xml:lang="tr"><![CDATA[Sıfırla]]></value>
+			<value xml:lang="vi"><![CDATA[Thiết lập lại]]></value>
+		</item>
+		<item name="52">
+			<value xml:lang="ko"><![CDATA[글자]]></value>
+			<value xml:lang="en"><![CDATA[Text]]></value>
+			<value xml:lang="jp"><![CDATA[文字]]></value>
+			<value xml:lang="zh-CN"><![CDATA[字体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[字型]]></value>
+			<value xml:lang="tr"><![CDATA[Metin]]></value>
+			<value xml:lang="vi"><![CDATA[Chữ]]></value>
+		</item>
+		<item name="53">
+			<value xml:lang="ko"><![CDATA[글자 폰트]]></value>
+			<value xml:lang="en"><![CDATA[Font]]></value>
+			<value xml:lang="jp"><![CDATA[文字フォント]]></value>
+			<value xml:lang="zh-CN"><![CDATA[字体]]></value>
+			<value xml:lang="zh-TW"><![CDATA[字體]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı Tipi]]></value>
+			<value xml:lang="vi"><![CDATA[Kiểu chữ]]></value>
+		</item>
+		<item name="54">
+			<value xml:lang="ko"><![CDATA[글자 색]]></value>
+			<value xml:lang="en"><![CDATA[Font Color]]></value>
+			<value xml:lang="jp"><![CDATA[文字の色]]></value>
+			<value xml:lang="zh-CN"><![CDATA[文字颜色]]></value>
+			<value xml:lang="zh-TW"><![CDATA[文字顏色]]></value>
+			<value xml:lang="tr"><![CDATA[Yazı Rengi]]></value>
+			<value xml:lang="vi"><![CDATA[Màu chữ]]></value>
+		</item>
+	</item>
+	<item name="layout_image_repository">
+		<value xml:lang="ko"><![CDATA[레이아웃 파일 저장소]]></value>
+		<value xml:lang="en"><![CDATA[Layout Repository]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトファイル保存場所]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局文件库]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面檔案庫]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Havuzu]]></value>
+		<value xml:lang="vi"><![CDATA[Nơi chứa giao diện]]></value>
+	</item>
+	<item name="about_layout_image_repository">
+		<value xml:lang="ko"><![CDATA[선택된 레이아웃에 사용될 이미지/플래시파일 등을 올릴 수 있습니다. 내보내기에 같이 포함 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can upload image/flash files for the selected layout. They will be included in exports.]]></value>
+		<value xml:lang="jp"><![CDATA[選択したレイアウトに使う画像・Flashファイル等のアップロードできます。また、エクスポートする際、一緒に含まれます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以上传要在所选布局中使用的图片/FLASH文件(导出时包含此库文件)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可在所選擇的版面中上傳圖片/ Flash 檔案。匯出時將包含此檔案。]]></value>
+		<value xml:lang="fr"><![CDATA[선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다]]></value>
+		<value xml:lang="ru"><![CDATA[You can upload images/flash files for selected layout. They will be included in exports]]></value>
+		<value xml:lang="es"><![CDATA[선택된 레이아웃에 사용될 이미지/플래시파일등을 올릴 수 있습니다. 내보내기에 같이 포함이 됩니다]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili yerleşim düzeni için resimler/flashlar ekleyebilirsiniz. Dışa aktarımda onlar da beraber aktarılacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể Upload File hình ảnh hoặc Flash cho giao diện đã chọn. Nó sẽ đi kèm khi xuất giao diện ra.]]></value>
+	</item>
+	<item name="msg_layout_image_target">
+		<value xml:lang="ko"><![CDATA[gif, png, jpg, swf, flv파일만 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only gif, png, jpg, swf, flv files are allowed]]></value>
+		<value xml:lang="jp"><![CDATA[gif, png, jpg, swf, flvファイルのみ可能です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只允许上传gif, png, jpg, swf, flv文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只允許上傳 gif, png, jpg, swf, flv 等檔案格式。]]></value>
+		<value xml:lang="fr"><![CDATA[gif, png, jpg, swf, flv파일만 가능합니다]]></value>
+		<value xml:lang="es"><![CDATA[gif, png, jpg, swf, flv파일만 가능합니다]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece gif, png, jpg, swf, flv dosyalarına izin verilmiştir]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ cho phép những định dạng File: .gif, .png, .jpg, .swf, .flv]]></value>
+	</item>
+	<item name="layout_migration">
+		<value xml:lang="ko"><![CDATA[레이아웃 내보내기/들이기]]></value>
+		<value xml:lang="en"><![CDATA[Layout Migration]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトのエクスポート/インポート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[导入/导出]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面匯出/匯入]]></value>
+		<value xml:lang="fr"><![CDATA[레이아웃 내보내기/ 들이기]]></value>
+		<value xml:lang="es"><![CDATA[레이아웃 내보내기/ 들이기]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Geçişi]]></value>
+		<value xml:lang="vi"><![CDATA[Di chuyển giao diện]]></value>
+	</item>
+	<item name="about_layout_migration">
+		<value xml:lang="ko"><![CDATA[수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다
+(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다.)]]></value>
+		<value xml:lang="en"><![CDATA[You can export or import the editted layout as a tar file.
+(So far only FaceOff supports exports/imports)]]></value>
+		<value xml:lang="jp"><![CDATA[修正したレイアウトをtar形式の圧縮ファイルにエクスポートしたり、tar形式として保存されたファイルをインポートすることができます。
+(まだ、faceOffレイアウトのみエクスポート/インポートが可能です。)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以把已修改好的布局导出为tar文件或把已有的tar文件直接导入。
+(目前此功能只能在faceOff布局中使用)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可將修改過的版面匯出成 tar 檔案或是直接匯入現有的 tar 檔案。
+(此功能目前只能用於 faceOff 版面中]]></value>
+		<value xml:lang="fr"><![CDATA[수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다
+(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다]]></value>
+		<value xml:lang="ru"><![CDATA[You can export or import editted layout as tar file
+(So far only FaceOff supports exports/imports)]]></value>
+		<value xml:lang="es"><![CDATA[수정된 레이아웃을 tar 파일로 내보내거나 tar 파일로 저장된 것을 불러올 수 있습니다
+(아직은 faceOff레이아웃만 내보내기/들이기가 됩니다]]></value>
+		<value xml:lang="tr"><![CDATA[Değiştirilmiş yerleşim düzenlerini tar dosyası olarak içe veya dışa aktarabilirsiniz.
+(Şimdilik sadece FaceOff iç/dış aktarım desteği sunmaktadır)]]></value>
+		<value xml:lang="vi"><![CDATA[You can export or import editted layout as tar file
+(So far only FaceOff supports exports/imports)]]></value>
+	</item>
+	<item name="about_faceoff" type="array">
+		<item name="title">
+			<value xml:lang="ko"><![CDATA[XpressEngine FaceOff Layout 관리자]]></value>
+			<value xml:lang="en"><![CDATA[XpressEngine FaceOff Layout Manager]]></value>
+			<value xml:lang="jp"><![CDATA[XpressEngine FaceOff レイアウト管理ツール]]></value>
+			<value xml:lang="zh-CN"><![CDATA[XpressEngine FaceOff布局管理工具]]></value>
+			<value xml:lang="zh-TW"><![CDATA[XpressEngine FaceOff 版面管理者]]></value>
+			<value xml:lang="tr"><![CDATA[XpressEngine FaceOff Yerleşim Düzeni Yöneticisi]]></value>
+			<value xml:lang="vi"><![CDATA[Quản lý giao diện XpressEngine FaceOff]]></value>
+		</item>
+		<item name="description">
+			<value xml:lang="ko"><![CDATA[FaceOff Layout관리자로 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요.]]></value>
+			<value xml:lang="en"><![CDATA[FaceOff Layout Manager willl help you design layout on the web easily.<br/>Please design your own layout with components and functions as shown below.]]></value>
+			<value xml:lang="jp"><![CDATA[FaceOffレイアウト管理ツールでウェブ上で、かんたんにレイアウトを変更することができます。 下の図を参照しながら構成要素と機能を理解し、自由にレイアウトをカスタマイズしてみてください。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[利用FaceOff布局管理工具，可以在线随意布置您的布局。<br/>请仔细查看下面的布局示意图和功能简介后，尽情发挥吧！<br/>FaceOff的布局示意图如下：]]></value>
+			<value xml:lang="zh-TW"><![CDATA[FaceOff Layout 版面管理者，可方便地在線上修改與設計版面。<br/>下圖為版面架構示意圖和功能簡介，瞭解後發揮創意製作出自己想要的版面吧!]]></value>
+			<value xml:lang="fr"><![CDATA[FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요]]></value>
+			<value xml:lang="es"><![CDATA[FaceOff Layout관리자는 웹상에서 쉽게 레이아웃을 꾸밀 수 있습니다.<br/>아래 그림을 보시고 구성요소와 기능을 이용하여 원하시는 레이아웃을 만드세요]]></value>
+			<value xml:lang="tr"><![CDATA[FaceOff Yerleşim Düzeni Yöneticisi, tarayıcınızı kullanarak kolayca yerleşim düzenini tasarlamanıza yardımcı olacaktır.<br/>Lütfen kendi yerleşim düzeninize, aşağıda da gösterildiği gibi, bileşenler ve özellikler tasarlayınız.]]></value>
+			<value xml:lang="vi"><![CDATA[Quản lý giao diện FaceOff sẽ giúp bạn tao ra một giao diện cho riêng mình một cách dễ dàng.<br/>Xin hãy thiết kế giao diện của mình với những thành phần và những chức năng hiển thị phía dưới.]]></value>
+		</item>
+		<item name="layout">
+			<value xml:lang="ko"><![CDATA[FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)과 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.]]></value>
+			<value xml:lang="en"><![CDATA[FaceOff has HTML structure as above.<br/>You can arrange/align with CSS, or use Style to design.<br/>You can add widget from Extension(e1, e2), Neck and Knee.<br/>Also Body, Layout, Header, Body, Footer can designed by Style, and Content will display content.]]></value>
+			<value xml:lang="jp"><![CDATA[FaceOffは上記のようなHTML構造になっています。 この構造にてCSSを用いた「レイアウト／配列／整列」の調整が可能になり、さらにStyleを使った自由なカスタマイズができます。 ウィジェットの追加はExtension(e1、e2)と Neck、 Kneeにて可能です。 その他にもBody、Layout、Header、Body、FooterはStyleをカスタマイズができ、Contentではモジュールの内容が出力されます。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[根据布局示意图，对其进行宽度/版式/对齐方式的调整。<br/>控件插入区为Extension(e1, e2)区和Neck, Knee区。<br/>另外的Body, Layout, Header, Body, Footer区可以使用Style来进行渲染，Content区是内容显示区。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[FaceOff 的架構和 HTML 相同。<br/>可以使用 CSS 或樣式設計。<br/>可新增 Widget 到 Extension(e1, e2), Neck, Knee 等區域。<br/>另外 Body, Layout, Header, Body, Footer 可以使用樣式設計，而 Content 區域會顯示內容。]]></value>
+			<value xml:lang="fr"><![CDATA[FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.]]></value>
+			<value xml:lang="es"><![CDATA[FaceOff는 위와 같은 HTML 구조로 되어 있습니다.<br/>이 구조에서 CSS를 이용하여 형태/배열/정렬을 할 수 있고 또 Style을 이용하여 꾸밀 수 있습니다.<br/>위젯 추가는 Extension(e1, e2)와 Neck, Knee에서 가능합니다.<br/>이 외 Body, Layout, Header, Body, Footer는 Style을 꾸밀 수 있고 Content는 모듈의 내용이 출력됩니다.]]></value>
+			<value xml:lang="tr"><![CDATA[FaceOff yukardaki gibi bir HTML yapısına sahiptir.<br/>Tasarlamak için Style kullanabilir ya da CSS ile ayarlayabilirsiniz.<br/>Extension(e1, e2), Neck ve Knee den widget ekleyebilirsiniz.<br/>Aynı zamanda Body, Layout, Header, Body, Footer; Style tarafından tasarlanabilir, ve İçerik, içeriği gösterecektir.]]></value>
+			<value xml:lang="vi"><![CDATA[FaceOff có cấu trúc HTML như trên.<br/>bạn có thể thu vào hoặc giãn ra với CSS, hay sử dụng kiểu dáng để thiết kế.<br/>Bạn có thể thêm Widget từ phần mở rộng (e1, e2), Neck và Knee.<br/>Ngoài ra Body, Giao diện, Header, Body, Footer có thể được thiết kế theo kích cỡ, và Content sẽ hiển thị nội dung.]]></value>
+		</item>
+		<item name="setting">
+			<value xml:lang="ko"><![CDATA[좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다.</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>]]></value>
+			<value xml:lang="en"><![CDATA[Here are the explanations of the upper menu on the left.<br/><ul><li>Save : Save current settings.</li><li>Cancel : Discard current settings and go back.</li><li>Reset : Clear current settings</li><li>Form : Set form as Fixed/ Variable/ Fixed+Variable(Content).</li><li>Arrange : Arrange 2 Extensions and Content.</li><li>Align : Align the position of layout.</li></ul>]]></value>
+			<value xml:lang="jp"><![CDATA[左上メニューの説明<br/><ul><li>保存 : 設定内容を保存します。</li><li>取り消し : 設定内容を保存せずに、差し戻します。</li><li>初期化 : 何の設定もない白紙状態（もしくはインストール時のデフォールト状態）に戻ります。</li><li>レイアウトタイプ : 固定／可変／固定+可変（内容）型のレイアウトを指定します。</li><li>配列 : Body部分に2つのExtensionとContentを配列します。</li><li>整列 : レイアウトの位置を整列します。</li></ul>]]></value>
+			<value xml:lang="zh-CN"><![CDATA[布局管理工具顶部左侧菜单说明：<br/><ul><li>保存 : 保存已修改的设置</li><li>取消 : 不保存返回</li><li>初始化 : 重置为空白布局</li><li>宽度 : 可指定固定/自适应/固定+自适应(内容)布局宽度样式</li><li>版式 : 可布置2个Extension区和Content区的样式</li><li>对齐 : 布局对齐方式</li></ul>]]></value>
+			<value xml:lang="zh-TW"><![CDATA[左上方的選單說明：<br/><ul><li>儲存 : 儲存設定內容</li><li>取消 : 不儲存設定內容並返回上一頁</li><li>重置 : 重新設置回到最原始的版面設定</li><li>模式 : 可設定版面模式為固定/ 變動/ 固定+變動(內容)</li><li>樣式 : 可設置兩個 Extension 區域和 Content 區域</li><li>對齊 : 可選擇版面的對齊方式</li></ul>]]></value>
+			<value xml:lang="fr"><![CDATA[좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>]]></value>
+			<value xml:lang="ru"><![CDATA[Let me explain you the upper menu on left.<br/><ul><li>Save : Save current settings.</li><li>Cancel : Discard current settings and go back.</li><li>Reset : Clear current settings</li><li>Form : Set form as Fixed/ Variable/ Fixed+Variable(Content).</li><li>Arrange : Arrange 2 Extensions and Content.</li><li>Align : Align the position of layout.</li></ul>]]></value>
+			<value xml:lang="es"><![CDATA[좌측 상단의 메뉴에 대해 설명 드립니다.<br/><ul><li>저장 : 설정된 내용을 저장합니다.</li><li>취소 : 설정한 내용을 저장하지 않고 돌아갑니다.</li><li>초기화 : 아무 설정도 되어 있지 않은 백지 상태로 돌립니다</li><li>형태 : 고정/ 가변/ 고정+가변(내용)의 형태를 지정합니다.</li><li>배열 : Extension 2개와 Content를 배열합니다.</li><li>정렬 : 레이아웃의 위치를 정렬시킬 수 있습니다.</li></ul>]]></value>
+			<value xml:lang="tr"><![CDATA[Sol üsteki menüyü açıklayalım..<br/><ul><li>Kaydet : Mevcut ayarları kaydeder.</li><li>İptal : Mevcut ayarlardan vazgeçer ve geri döner.</li><li>Sıfırla : Mevcut ayarları temizler</li><li>Biçim : Biçim, Sabit/ Değişken/ Sabit+Değişken(İçerik).</li><li>Yerleştir : 2 Uzantı ve İçerik yerleştirir.</li><li>Hizala : Yerleşim düzeninin konumunu hizalar.</li></ul>]]></value>
+			<value xml:lang="vi"><![CDATA[Menu phía bên trái.<br/><ul><li>"Lưu lại": là lưu lại những thiết lập hiện tại.</li><li>"Loại bỏ": là bỏ qua những thay đổi hiện tại và trở lại.</li><li>"Thiết lập lại": là xóa bỏ tất cả những thay đổi.</li><li>"Form": đặt Form dạng Cố định, Biến thiên, Cố định+Biến thiên (Nội dung).</li><li>"Thu nhỏ": là thu nhỏ hai phần mở rộng và nội dung.</li><li>"Căn chỉnh" : là sắp xếp sự thẳng hàng.</li></ul>]]></value>
+		</item>
+		<item name="hotkey">
+			<value xml:lang="ko"><![CDATA[마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을 때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을 때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>]]></value>
+			<value xml:lang="en"><![CDATA[You can design your layout more easily with Hot Keys.<br/><ul><li>tab : Unless a widget is selected, Header, Body, Footer will be selected in order. If not, next widget will be selected.</li><li>Shift + tab : It does the opposite function to tab key.</li><li>Esc : If nothing is selected, Neck, Extension(e1,e2), Knee will be selected in order, if a widget is selected, area of the widget will be selected.</li><li>Arrow Key : If a widget is selected, arrow key will move the widget to other areas.</li></ul>]]></value>
+			<value xml:lang="jp"><![CDATA[マウスを使って各領域を選択しながら、Hot Keyを利用すると、より便利なカスタマイズできます。<br/><ul><li>tabキー : ウィジェットが選択されてない場合、Header、Body、 Footer順に選択されます。ウィジェットが選択されている場合は、次のウィジェットに選択されます。</li><li>Shift + tabキー : tabキーと逆の役割をします。</li><li>Esc : 何も選択されてない場合、Escを押すとNeck、Extension(e1、e2)、Knee順に選択され、また、ウィジェットが選択されている場合は選択されたウィジェットを囲む領域が選択されます。</li><li>矢印 : ウィジェットが選択されている時、矢印キーを用いて、ウィジェットを他の領域に移せます。</li></ul>]]></value>
+			<value xml:lang="zh-CN"><![CDATA[选取各个区域可以利用鼠标，还可以利用快捷键：<br/><ul><li>tab键 : 当前没有被选取的控件，选取顺序为： Header, Body, Footer；已有被选取的控件，将选取下一个控件。</li><li>Shift + tab键 : 与tab键作用相反。</li><li>Esc键 : 当前没有被选取的区域，选取顺序为： Neck, Extension(e1,e2),Knee；已有被选取的控件，将选取包含此控件的区域。</li><li>方向键 : 已有被选取的控件时，可以利用方向键移到别的区域。</li></ul>]]></value>
+			<value xml:lang="zh-TW"><![CDATA[除了可利用滑鼠選取各區域外，也能使用熱鍵選取：<br/><ul><li>tab鍵 : 當沒有選取 Widget 時，選擇順序是： Header, Footer, Body；當有選取 Widget 時，將會選擇下一個。</li><li>Shift + tab 鍵 : 功能和 tab 鍵相反</li><li>Esc 鍵 : 當沒有選擇區域時，選擇順序是： Neck, Extension(e1,e2),Knee；當有選擇 Widget 時，將會選則此 Widget 所屬的區域。</li><li>方向鍵 : 當有選擇 Widget 時，可利用方向鍵作移動。</li></ul>]]></value>
+			<value xml:lang="fr"><![CDATA[마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>]]></value>
+			<value xml:lang="ru"><![CDATA[You can design your layout more easily with Hot Keys.<br/><ul><li>tab : Unless a widget is selected, Header, Body, Footer will be selected in order. If not, next widget will be selected.</li><li>Shift + tab : It does the opposite function to tab key.</li><li>Esc : If nothing is selected, Neck, Extension(e1,e2),Knee will be selected in order, if a widget is selected, area of the widget will be selected.</li><li>Arrow Key : If a widget is selected, arrow key will move the widget to other areas.</li></ul>]]></value>
+			<value xml:lang="es"><![CDATA[마우스로 각 영역을 선택하면서 Hot Key를 이용하시면 더 쉽게 꾸미실 수 있습니다.<br/><ul><li>tab 키 : 위젯이 선택되어 있지 않으면 Header, Body, Footer 순으로 선택됩니다. 위젯이 선택되어 있다면 다음 위젯으로 선택이 이동됩니다.</li><li>Shift + tab키 : tab키와 반대 역할을 합니다.</li><li>Esc : 아무것도 선택되어 있지 않을때 Esc를 누르면 Neck, Extension(e1,e2),Knee 순서대로 선택이 되며 위젯이 선택되어 있다면 선택된 위젯을 감싸는 영역이 선택됩니다.</li><li>방향키 : 위젯이 선택되어 있을때 방향키를 이용하여 위젯을 다른 영역으로 이동시킬 수 있습니다.</li></ul>]]></value>
+			<value xml:lang="tr"><![CDATA[Yerleşim düzenini kısayol tuşlarıyla daha kolay tasarlayabilirsiniz.<br/><ul><li>sekme tuşu(tab) : Bir widget seçilmedikçe; Header, Body, Footer sırasıyla seçilecektir. Eğer seçilmezse, bir sonraki widget seçilecektir.</li><li>Shift + sekme tuşu : Sekme tuşunun tersi hareket gerçekleştirir.</li><li>Esc : Eğer hiçbir şey seçilmediyse, Neck, Extension(e1,e2),Knee sırasıyla seçilecektir, eğer bir widget seçilmişse, widget alanı seçilecektir.</li><li>Yön Tuşları : Eğer bir widget seçiliyse, yön tuşları widget uygulanan yönlere hareket ettirecektir</li></ul>]]></value>
+			<value xml:lang="vi"><![CDATA[Bạn có thể thiết kế giao diện của mình dễ dàng hơn nữa với những phím tắt.<br/><ul><li>"Tab": trừ khi một Widget được chọn, Header, Body, Footer sẽ được chọn trong lệnh. Nếu không, Widget tiếp theo sẽ được chọn.</li><li>"Shift+Tab": nó ngược lại với phím "Tab".</li><li>"Esc": Nếu không có gì được chọn, Neck, Extension (e1, e2 ), Knee sẽ được lựa chọn theo thứ tự, nếu một Widget được chọn, kích thước Widget sẽ được lựa chọn.</li><li>"4 phím mũi tên": Nếu Widget đã được chọn, nó sẽ di chuyển Widget tới một vị trí mới.</li></ul>]]></value>
+		</item>
+		<item name="attribute">
+			<value xml:lang="ko"><![CDATA[위젯을 제외한 각 영역들은 모두 배경 색/ 이미지를 지정할 수 있고 글자색(a 태그 포함됨)을 정할 수 있습니다.]]></value>
+			<value xml:lang="en"><![CDATA[You can set background color/image to every area except for a widget, and font color (include <a> tag).]]></value>
+			<value xml:lang="jp"><![CDATA[ウィジェットを除いた各領域はすべて背景の色・イメージ・文字のテキスト色(「a」タグを含む)の指定が可能です。]]></value>
+			<value xml:lang="zh-CN"><![CDATA[除控件之外的各个区域都可以对其指定背景色/背景图片及字体颜色(包括a标签)。]]></value>
+			<value xml:lang="zh-TW"><![CDATA[除了 Widget 以外的各個區域都可以指定背景顏色/圖片及文字顏色(包含 a 標籤)。]]></value>
+			<value xml:lang="ru"><![CDATA[You can set background color/image to every area except widget, and font color(include <a> tag).]]></value>
+			<value xml:lang="tr"><![CDATA[Widget harici, tüm alanların arkaplan rengini/resmini ve yazı rengini(<a> etiketi de dahil) ayarlayabilirsiniz.]]></value>
+			<value xml:lang="vi"><![CDATA[Bạn có thể đặt màu nền / hình nền tới mọi khu vực trừ Widget, và màu chữ (bao gồm cả Tag).]]></value>
+		</item>
+	</item>
+	<item name="mobile_layout_list">
+		<value xml:lang="ko"><![CDATA[모바일 레이아웃 목록]]></value>
+		<value xml:lang="en"><![CDATA[Mobile Layout List]]></value>
+		<value xml:lang="jp"><![CDATA[モバイルレイアウトリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动版布局目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[手機版面列表]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli Yerleşim Düzeni Listesi]]></value>
+	</item>
+	<item name="mobile_downloaded_list">
+		<value xml:lang="ko"><![CDATA[모바일 다운로드 목록]]></value>
+		<value xml:lang="en"><![CDATA[Downloaded Mobile Layouts]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロードしたモバイルレイアウト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动版布局下载目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載手機版面]]></value>
+		<value xml:lang="tr"><![CDATA[İndirilmiş Hareketli Yerleşim Düzenleri]]></value>
+	</item>
+	<item name="apply_mobile_view">
+		<value xml:lang="ko"><![CDATA[모바일 뷰 일괄 적용]]></value>
+		<value xml:lang="en"><![CDATA[Apply Mobile View]]></value>
+		<value xml:lang="jp"><![CDATA[モバイルスキン使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动版布局共享]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli Görünümü Uygula]]></value>
+	</item>
+	<item name="about_apply_mobile_view">
+		<value xml:lang="ko"><![CDATA[체크하시면 연결된 모든 메뉴에서 모바일 뷰를 사용합니다.]]></value>
+		<value xml:lang="en"><![CDATA[All connected modules use the mobile view to display when accessing with mobile device.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると、繋がっているすべてのモジュールでモバイルスキンが適用されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[勾选表示连接到此布局的所有菜单项全部采用此移动版布局。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[All connected module use mobile view to display when accessing with mobile device.]]></value>
+		<value xml:lang="fr"><![CDATA[All connected module use mobile view to display when accessing with mobile device.]]></value>
+		<value xml:lang="ru"><![CDATA[All connected module use mobile view to display when accessing with mobile device.]]></value>
+		<value xml:lang="es"><![CDATA[All connected module use mobile view to display when accessing with mobile device.]]></value>
+		<value xml:lang="tr"><![CDATA[Hareketli cihazlarla bağlanırken, bağlı tüm modüller hareketli görünüme geçerler.]]></value>
+		<value xml:lang="vi"><![CDATA[All connected module use mobile view to display when accessing with mobile device.]]></value>
+	</item>
+	<item name="installed_layout">
+		<value xml:lang="ko"><![CDATA[설치된 레이아웃]]></value>
+		<value xml:lang="en"><![CDATA[Installed Layout]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされているレイアウト]]></value>
+	</item>
+	<item name="faceoff_export">
+		<value xml:lang="ko"><![CDATA[FaceOff 레이아웃 내보내기]]></value>
+		<value xml:lang="en"><![CDATA[Export FaceOff layout]]></value>
+		<value xml:lang="jp"><![CDATA[Faceoffレイアウトをエクスポートする]]></value>
+	</item>
+	<item name="about_faceoff_export">
+		<value xml:lang="ko"><![CDATA[FaceOff 레이아웃을 tar 파일로 내보낼 수 있습니다. 백업 받은 FaceOff 레이아웃을 일반 레이아웃으로 변경하세요.]]></value>
+		<value xml:lang="en"><![CDATA[You can download current edited layout. Use this, you can change FaceOff layout to general layout.]]></value>
+		<value xml:lang="jp"><![CDATA[FaceOffレイアウトをtarファイルでエクスポートすることができます。バックアップしたFaceOffレイアウトを一般レイアウトに変更してください。]]></value>
+	</item>
+	<item name="faceoff_migration" type="array">
+		<item name="0">
+			<value xml:lang="ko"><![CDATA[FaceOff 레이아웃은 지원이 중단될 예정입니다. 반드시 안내에 따라 FaceOff 레이아웃을 일반 레이아웃으로 변경하여 주시기 바랍니다.]]></value>
+			<value xml:lang="en"><![CDATA[FaceOff layout will deprecated. You must change faceoff layout to general layout.]]></value>
+			<value xml:lang="jp"><![CDATA[FaceOffレイアウトは、サポートが中断される予定です。必ず案内に従って、FaceOffレイアウトを一般レイアウトに変更してください。]]></value>
+			
+		</item>
+		<item name="1">
+			<value xml:lang="ko"><![CDATA[FaceOff 레이아웃 변경 안내]]></value>
+			<value xml:lang="en"><![CDATA[Instruction of change FaceOff layout to general layout]]></value>
+			<value xml:lang="jp"><![CDATA[FaceOffレイアウト変更案内]]></value>
+		</item>
+		<item name="2">
+			<value xml:lang="ko"><![CDATA[사용 중인 FaceOff 레이아웃의 내보내기를 통해 레이아웃을 백업 받습니다.]]></value>
+			<value xml:lang="en"><![CDATA[Export FaceOff layout.]]></value>
+			<value xml:lang="jp"><![CDATA[使用中のFaceOffレイアウトのエクスポートを通じてレイアウトをバックアップします。]]></value>
+		</item>
+		<item name="3">
+			<value xml:lang="ko"><![CDATA[내려받은 tar 파일의 압축을 해제합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Untar downloaded tar file.]]></value>
+			<value xml:lang="jp"><![CDATA[ダウンロードしたtarファイルの圧縮を解凍します。]]></value>
+		</item>
+		<item name="4">
+			<value xml:lang="ko"><![CDATA[폴더명을 임의의 이름으로 변경합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Change folder name to any name.]]></value>
+			<value xml:lang="jp"><![CDATA[フォルダ名を任意の名前に変更します。]]></value>
+		</item>
+		<item name="5">
+			<value xml:lang="ko"><![CDATA[FTP를 통해 ./layouts에 업로드합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Upload to ./layouts through FTP.]]></value>
+			<value xml:lang="jp"><![CDATA[FTPを通じて ./layoutsにアップロードします。]]></value>
+		</item>
+		<item name="6">
+			<value xml:lang="ko"><![CDATA[레이아웃 목록에서 업로드한 레이아웃을 이용하여 레이아웃을 생성합니다. 이때 레이아웃 경로가 업로드한 경로가 맞는지 확인하세요. 로고 이미지 등 레이아웃 설정은 다시 하셔야 합니다.]]></value>
+			<value xml:lang="en"><![CDATA[Insert new layout from installed layout. Make sure to check if the path of layout is the same as the uploaded path. You need to set the layout including logo images.]]></value>
+		　　<value xml:lang="jp"><![CDATA[レイアウトリストでアップロードしたレイアウトを利用してレイアウトを生成します。このとき、レイアウトのパスが、アップロードしたパスであるか確認してください。ロゴイメージはなどレイアウトの設定は、改めて行ってください。]]></value>
+		</item>
+	</item>
+</lang>
diff --git a/modules/layout/lang/ru.lang.php b/modules/layout/lang/ru.lang.php
deleted file mode 100644
index 25fb27c38..000000000
--- a/modules/layout/lang/ru.lang.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->cmd_layout_management = 'Настройки лейаута';
-    $lang->cmd_layout_edit = 'Редактировать лейаут';
-
-    $lang->layout_name = 'Имя лейаута';
-    $lang->layout_maker = "Разработчик лейаута";
-    $lang->layout_license = 'License';
-    $lang->layout_history = "Обновления";
-    $lang->layout_info = "Информация лейаута";
-    $lang->layout_list = 'Список лейаутов';
-    $lang->menu_count = 'Меню';
-    $lang->downloaded_list = 'Список закачек';
-    $lang->layout_preview_content = 'Содержимое отображается здесь';
-    $lang->not_apply_menu = 'Применить лейауты';
-	$lang->layout_management = '레이아웃 관리';
-
-    $lang->cmd_move_to_installed_list = "Просмотреть созданный список";
-
-    $lang->about_downloaded_layouts = "Список скаченных лейаутов";
-    $lang->about_title = 'Пожалуйста, введите название, которое легко проверить при подключении к модулю';
-    $lang->about_not_apply_menu = 'Все подключенные лейауты модулей будут изменены при включении это опции.';
-
-    $lang->about_layout = "Модуль лейаутов помогает Вам создать лейаут сайта с легкостью.<br />Используя настройки лейаута и подключение меню, полная форма сайта будет отображена множеством модулей.<br />* Теми лейаутами, которые невозможно удалить или изменить, являются лейауты блога и лейауты других модулей.";
-    $lang->about_layout_code = 
-        "Применения к службе будут проиведены, когда Вы сохраните код лейаут после редактирование.
-        Пожалуйста, сначала используйте предпросмотр кода и затем сохраните его.
-        Вы можете обратиться к грамматике шаблонов XE с <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Template</a>.";
-
-    $lang->layout_export = 'Export';
-    $lang->layout_btn_export = 'Download My Layout';
-    $lang->about_layout_export = 'Export currently editted layout.';
-    $lang->layout_import = 'Import';
-    $lang->about_layout_import = 'Original layout will be deleted when you import. Please export current layout before importing.';
-    
-	$lang->layout_manager = array(
-        0  => 'Layout Manager',
-        1  => 'Save',
-        2  => 'Cancel',
-        3  => 'Form',
-        4  => 'Array',
-        5  => 'Arrange',
-        6  => 'Fixed Layout',
-        7  => 'Variable Layout',
-        8  => 'Fixed+Variable (Content)',
-        9  => '1 Cell',
-        10 => '2 Cells (left of content)',
-        11 => '2 Cells (right of content)',
-        12 => '3 Cells (left of content)',
-        13 => '3 Cells (center of content)',
-        14 => '3 Cells (right of content)',
-        15 => 'Left',
-        16 => 'Center',
-        17 => 'Right',
-        18 => 'All',
-        19 => 'Layout',
-        20 => 'Add Widget',
-        21 => 'Add Content Widget',
-        22 => 'Attribute',
-        23 => 'Widget Style',
-        24 => 'Modify',
-        25 => 'Delete',
-        26 => 'Align',
-        27 => 'Occupy a Line',
-        28 => 'Left',
-        29 => 'Right',
-        30 => 'Width',
-        31 => 'Height',
-        32 => 'Margin',
-        33 => 'Padding',
-        34 => 'Top',
-        35 => 'Left',
-        36 => 'Right',
-        37 => 'Bottom',
-        38 => 'Border', 
-        39 => 'None',
-        40 => 'Background',
-        41 => 'Color',
-        42 => 'Image',
-        43 => 'Select',
-        44 => 'Repeat Background',
-        45 => 'Repeat',
-        46 => 'No Repeat',
-        47 => 'Repeat Width',
-        48 => 'Repeat Height',
-        49 => 'Apply',
-        50 => 'Cancel',
-        51 => 'Reset',
-        52 => 'Text',
-        53 => 'Font',
-        54 => 'Font Color',
-    );
-
-    $lang->layout_image_repository = 'Layout Repository';
-    $lang->about_layout_image_repository = 'You can upload images/flash files for selected layout. They will be included in exports';
-    $lang->msg_layout_image_target = 'Only gif, png, jpg, swf, flv files are allowed';
-    $lang->layout_migration = 'Layout Migration';
-    $lang->about_layout_migration = 'You can export or import editted layout as tar file'."\n".'(So far only FaceOff supports exports/imports)';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff Layout Manager',
-        'description' => 'FaceOff Layout Manager willl help you design layout on the web easily.<br/>Please design your own layout with components and functions as shown below.',
-        'layout' => 'FaceOff has HTML structure as above.<br/>You can arrange/align with CSS, or use Style to design.<br/>You can add widget from Extension(e1, e2), Neck and Knee.<br/>Also Body, Layout, Header, Body, Footer can designed by Style, and Content will display content.',
-        'setting' => 'Let me explain you the upper menu on left.<br/><ul><li>Save : Save current settings.</li><li>Cancel : Discard current settings and go back.</li><li>Reset : Clear current settings</li><li>Form : Set form as Fixed/ Variable/ Fixed+Variable(Content).</li><li>Arrange : Arrange 2 Extensions and Content.</li><li>Align : Align the position of layout.</li></ul>',
-        'hotkey' => 'You can design your layout more easily with Hot Keys.<br/><ul><li>tab : Unless a widget is selected, Header, Body, Footer will be selected in order. If not, next widget will be selected.</li><li>Shift + tab : It does the opposite function to tab key.</li><li>Esc : If nothing is selected, Neck, Extension(e1,e2),Knee will be selected in order, if a widget is selected, area of the widget will be selected.</li><li>Arrow Key : If a widget is selected, arrow key will move the widget to other areas.</li></ul>',
-        'attribute' => 'You can set background color/image to every area except widget, and font color(include <a> tag).',
-
-    );
-	$lang->mobile_layout_list = "Mobile Layout List";
-	$lang->mobile_downloaded_list = "Downloaded Mobile Layouts";
-	$lang->apply_mobile_view = "Apply Mobile View";
-	$lang->about_apply_mobile_view = "All connected module use mobile view to display when accessing with mobile device.";
-?>
diff --git a/modules/layout/lang/tr.lang.php b/modules/layout/lang/tr.lang.php
deleted file mode 100644
index 2892088f9..000000000
--- a/modules/layout/lang/tr.lang.php
+++ /dev/null
@@ -1,119 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Layout module's basic language pack
-     **/
-
-    $lang->cmd_layout_management = 'Yerleşim Düzeni Ayarları';
-    $lang->cmd_layout_edit = 'Yerleşim Düzeni Düzenle';
-
-    $lang->layout_name = 'Yerleşim Düzeni İsmi';
-    $lang->layout_maker = "Yerleşim Düzeni Geliştiricisi";
-    $lang->layout_license = 'Lisans';
-    $lang->layout_history = "Güncellemeler";
-    $lang->layout_info = "Yerleşim Düzeni Bilgisi";
-    $lang->layout_list = 'Yerleşim Düzeni Listesi';
-    $lang->menu_count = 'Menüler';
-    $lang->downloaded_list = 'İndirme Listesi';
-    $lang->layout_preview_content = 'Burada görüntülenecek içerikler';
-    $lang->not_apply_menu = 'Yerleşim düzenlerini bütünüyle onayla';
-	$lang->layout_management = 'Yerleşim Düzeni Yönetimi';
-
-    $lang->cmd_move_to_installed_list = "Oluşturulmuş Yerleşim Düzenlerini Görüntüle";
-
-    $lang->about_downloaded_layouts = "İndirilmiş yerleşim düzenlerinin listesi";
-    $lang->about_title = 'Modüle bağlanılacağı zaman kolayca doğrulanacak başlığı giriniz';
-    $lang->about_not_apply_menu = 'Menüyle bağlanmış modüllerin yerleşim düzenlerinin hepsi bu seçenekle değiştirilecketir.';
-
-    $lang->about_layout = "Yerleşim düzeni (layout) modülü size, sitenin yerleşim düzenini kolayca oluşturma imkanı sunar.<br />Yerleşim düzeni ayarını ve menü bağlantısını kullandığınzda, websitelerin çeşitli modüllerle tamamlanmış şekilleri gösterilecektir.<br />* Blogların veya diğer modüllerin varsayılan yerleşim düzenlerini silemezseniz; onları, kendi ayar sayfalarından silmeniz gerekmektedir. ";
-    $lang->about_layout_code = 
-        "Yerleşim düzeni kodunu düzenledikten sonra kaydettiğinizde, hizmete girecektir.
-        Lütfen önce kodunuzun önizlemesini yapın ve sonra kaydedin.
-        XE\'nin şablolunu örnek alabilirsiniz : <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE Template</a>.";
-
-    $lang->layout_export = 'Dışa Aktar';
-    $lang->layout_btn_export = 'Yerleşim Düzenimi İndir';
-    $lang->about_layout_export = 'Düzenlenmiş mevcut yerleşim düzenini dışa aktar.';
-    $lang->layout_import = 'İçe Aktar';
-    $lang->about_layout_import = 'İçe yeni bir yerleşim düzeni aktarmanız durumunda, önceden değiştirdiğiniz yerleşim düzeni silinecektir. Lütfen içe aktarım yapmadan önce, mevcut yerleşim düzeninin yedeğini almış olmak için dışa aktarınız.';
-
-    $lang->layout_manager = array(
-        0  => 'Yerleşim Düzeni Yöneticisi',
-        1  => 'Kaydet',
-        2  => 'İptal',
-        3  => 'Biçim',
-        4  => 'Dizi',
-        5  => 'Yerleştir',
-        6  => 'Sabit Yerleşim Düzeni',
-        7  => 'Değişken Yerleşim Düzeni',
-        8  => 'Sabit+Değişken (İçerik)',
-        9  => 'Hücre 1',
-        10 => 'Hücre 2 (içeriğin sol kısmında)',
-        11 => 'Hücre 2 (içeriğin sağ kısmında)',
-        12 => 'Hücre 3 (içeriğin sol kısmında)',
-        13 => 'Hücre 3 (içeriğin orta kısmında)',
-        14 => 'Hücre 3 (içeriğin sol kısmında)',
-        15 => 'Sol',
-        16 => 'Orta',
-        17 => 'Sağ',
-        18 => 'Tümü',
-        19 => 'Yerleşim Düzeni',
-        20 => 'Widget ekle',
-        21 => 'İçerik Widgetı ekle',
-        22 => 'Öznitelik',
-        23 => 'Widget Tarzı',
-        24 => 'Düzenle',
-        25 => 'Sil',
-        26 => 'Hizala',
-        27 => 'Satır atla',
-        28 => 'Sol',
-        29 => 'Sağ',
-        30 => 'Genişlik',
-        31 => 'Uzunluk',
-        32 => 'Kenar Boşluğu',
-        33 => 'Dolgu',
-        34 => 'Üst',
-        35 => 'Sol',
-        36 => 'Sağ',
-        37 => 'Alt',
-        38 => 'Kenarlık', 
-        39 => 'Hiçbiri',
-        40 => 'Arkaplan',
-        41 => 'Renk',
-        42 => 'Resim',
-        43 => 'Seç',
-        44 => 'Arkaplan Tekrarı',
-        45 => 'Tekrar',
-        46 => 'Tekrar Yok',
-        47 => 'Genişlik Tekrarı',
-        48 => 'Uzunluk Tekrarı',
-        49 => 'Uygula',
-        50 => 'İptal',
-        51 => 'Sıfırla',
-        52 => 'Metin',
-        53 => 'Yazı Tipi',
-        54 => 'Yazı Rengi',
-    );
-
-    $lang->layout_image_repository = 'Yerleşim Düzeni Havuzu';
-    $lang->about_layout_image_repository = 'Seçili yerleşim düzeni için resimler/flashlar ekleyebilirsiniz. Dışa aktarımda onlar da beraber aktarılacaktır';
-    $lang->msg_layout_image_target = 'Sadece gif, png, jpg, swf, flv dosyalarına izin verilmiştir';
-    $lang->layout_migration = 'Yerleşim Düzeni Geçişi';
-    $lang->about_layout_migration = 'Değiştirilmiş yerleşim düzenlerini tar dosyası olarak içe veya dışa aktarabilirsiniz.'."\n".'(Şimdilik sadece FaceOff iç/dış aktarım desteği sunmaktadır)';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff Yerleşim Düzeni Yöneticisi',
-        'description' => 'FaceOff Yerleşim Düzeni Yöneticisi, tarayıcınızı kullanarak kolayca yerleşim düzenini tasarlamanıza yardımcı olacaktır.<br/>Lütfen kendi yerleşim düzeninize, aşağıda da gösterildiği gibi, bileşenler ve özellikler tasarlayınız.',
-        'layout' => 'FaceOff yukardaki gibi bir HTML yapısına sahiptir.<br/>Tasarlamak için Style kullanabilir ya da CSS ile ayarlayabilirsiniz.<br/>Extension(e1, e2), Neck ve Knee den widget ekleyebilirsiniz.<br/>Aynı zamanda Body, Layout, Header, Body, Footer; Style tarafından tasarlanabilir, ve İçerik, içeriği gösterecektir.',
-        'setting' => 'Sol üsteki menüyü açıklayalım..<br/><ul><li>Kaydet : Mevcut ayarları kaydeder.</li><li>İptal : Mevcut ayarlardan vazgeçer ve geri döner.</li><li>Sıfırla : Mevcut ayarları temizler</li><li>Biçim : Biçim, Sabit/ Değişken/ Sabit+Değişken(İçerik).</li><li>Yerleştir : 2 Uzantı ve İçerik yerleştirir.</li><li>Hizala : Yerleşim düzeninin konumunu hizalar.</li></ul>',
-        'hotkey' => 'Yerleşim düzenini kısayol tuşlarıyla daha kolay tasarlayabilirsiniz.<br/><ul><li>sekme tuşu(tab) : Bir widget seçilmedikçe; Header, Body, Footer sırasıyla seçilecektir. Eğer seçilmezse, bir sonraki widget seçilecektir.</li><li>Shift + sekme tuşu : Sekme tuşunun tersi hareket gerçekleştirir.</li><li>Esc : Eğer hiçbir şey seçilmediyse, Neck, Extension(e1,e2),Knee sırasıyla seçilecektir, eğer bir widget seçilmişse, widget alanı seçilecektir.</li><li>Yön Tuşları : Eğer bir widget seçiliyse, yön tuşları widget uygulanan yönlere hareket ettirecektir</li></ul>',
-        'attribute' => 'Widget harici, tüm alanların arkaplan rengini/resmini ve yazı rengini(<a> etiketi de dahil) ayarlayabilirsiniz.',
-
-    );
-
-	$lang->mobile_layout_list = "Hareketli Yerleşim Düzeni Listesi";
-	$lang->mobile_downloaded_list = "İndirilmiş Hareketli Yerleşim Düzenleri";
-	$lang->apply_mobile_view = "Hareketli Görünümü Uygula";
-	$lang->about_apply_mobile_view = "Hareketli cihazlarla bağlanırken, bağlı tüm modüller hareketli görünüme geçerler.";
-?>
diff --git a/modules/layout/lang/vi.lang.php b/modules/layout/lang/vi.lang.php
deleted file mode 100644
index 2e8d05765..000000000
--- a/modules/layout/lang/vi.lang.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->cmd_layout_management = 'Thiết lập giao diện';
-    $lang->cmd_layout_edit = 'Sửa giao diện';
-
-    $lang->layout_name = 'Tên giao diện';
-    $lang->layout_maker = "Người tạo";
-    $lang->layout_license = 'Giấy phép';
-    $lang->layout_history = "Cập nhật";
-    $lang->layout_info = "Thông tin giao diện";
-    $lang->layout_list = 'Danh sách giao diện';
-    $lang->menu_count = 'Menu';
-    $lang->downloaded_list = 'Danh sách Download';
-    $lang->layout_preview_content = 'Khu vực nội dung sẽ hiển thị.';
-    $lang->not_apply_menu = 'Áp dụng giao diện';
-	$lang->layout_management = '레이아웃 관리';
-
-    $lang->cmd_move_to_installed_list = "Danh sách đã tạo";
-
-    $lang->about_downloaded_layouts = "Danh sách đã Download";
-    $lang->about_title = 'Xin hãy nhập tiêu đề của giao diện cho dễ dàng lựa chọn về sau.';
-    $lang->about_not_apply_menu = 'Nếu chọn, tất cả các giao diện đang sử dụng sẽ được thay đổi thành giao diện này.';
-
-    $lang->about_layout = "Module giao diện giúp bạn tạo ra giao diện của Website một cách dễ dàng.<br />Bằng cách sử dụng thiết lập giao diện và kết nối Menu, hình dạng hoàn thành của Website sẽ được trình bày bổ xung với nhiều Module.<br />Giao diện nào xuất hiện (<font color='red'>*</font>) là những giao diện không thể xóa hay điều chỉnh được Module. ";
-    $lang->about_layout_code = 
-        "Nó sẽ được áp dụng vào Website ngay khi bạn bấm '<b>Lưu</b>' sau khi sửa đổi.
-        Hãy bấm '<b>Xem trước</b>' trước khi bấm '<b>Lưu</b>'.
-        Bạn có thể tham khảo cách sửa giao diện tại <a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\"><b>XE Template</b></a>.";
-
-    $lang->layout_export = 'Xuất ra';
-    $lang->layout_btn_export = 'Download giao diện của tôi';
-    $lang->about_layout_export = 'Xuất giao diện sửa chữa hiện tại.';
-    $lang->layout_import = 'Nhập vào';
-    $lang->about_layout_import = 'Giao diện nguyên bản sẽ bị xóa khi bạn nhập vào. Hãy xuất ra để lưu giao diện hiện thời trước khi nhập vào.';
-
-    $lang->layout_manager = array(
-        0  => 'Quản lý giao diện',
-        1  => 'Lưu lại',
-        2  => 'Loại bỏ',
-        3  => 'Form',
-        4  => 'Giãn ra',
-        5  => 'Thu lại',
-        6  => 'Cố định giao diện',
-        7  => 'Giao diện biến thiên',
-        8  => 'Cố định+Biến thiên (Nội dung)',
-        9  => '1 ô',
-        10 => '2 ô (Trái của nội dung)',
-        11 => '2 ô (Phải của nội dung)',
-        12 => '3 ô (Trái của nội dung)',
-        13 => '3 ô (Giữa của nội dung)',
-        14 => '3 ô (Phải của nội dung)',
-        15 => 'Trái',
-        16 => 'Giữa',
-        17 => 'Phải',
-        18 => 'Dàn đều',
-        19 => 'Giao diện',
-        20 => 'Thêm Widget',
-        21 => 'Thêm Widget nội dung',
-        22 => 'Thuộc tính',
-        23 => 'Kiểu dáng Widget',
-        24 => 'Điều chỉnh',
-        25 => 'Xóa',
-        26 => 'Căn chỉnh',
-        27 => 'Chiếm 1 hàng',
-        28 => 'Trái',
-        29 => 'Phải',
-        30 => 'Chiều rộng',
-        31 => 'Chiều cao',
-        32 => 'Lề',
-        33 => 'Lót',
-        34 => 'Đỉnh',
-        35 => 'Trái',
-        36 => 'Phải',
-        37 => 'Dưới',
-        38 => 'Viền', 
-        39 => 'Không',
-        40 => 'Nền',
-        41 => 'Màu',
-        42 => 'Hình ảnh',
-        43 => 'Lựa chọn',
-        44 => 'Lặp lại nền',
-        45 => 'Lặp lại',
-        46 => 'Không lặp',
-        47 => 'Lặp lại chiều rộng',
-        48 => 'Lặp lại chiều cao',
-        49 => 'Áp dụng',
-        50 => 'Loại bỏ',
-        51 => 'Thiết lập lại',
-        52 => 'Chữ',
-        53 => 'Kiểu chữ',
-        54 => 'Màu chữ',
-    );
-
-    $lang->layout_image_repository = 'Nơi chứa giao diện';
-    $lang->about_layout_image_repository = 'Bạn có thể Upload File hình ảnh hoặc Flash cho giao diện đã chọn. Nó sẽ đi kèm khi xuất giao diện ra.';
-    $lang->msg_layout_image_target = 'Chỉ cho phép những định dạng File: .gif, .png, .jpg, .swf, .flv';
-    $lang->layout_migration = 'Di chuyển giao diện';
-    $lang->about_layout_migration = 'You can export or import editted layout as tar file'."\n".'(So far only FaceOff supports exports/imports)';
-
-    $lang->about_faceoff = array(
-        'title' => 'Quản lý giao diện XpressEngine FaceOff',
-        'description' => 'Quản lý giao diện FaceOff sẽ giúp bạn tao ra một giao diện cho riêng mình một cách dễ dàng.<br/>Xin hãy thiết kế giao diện của mình với những thành phần và những chức năng hiển thị phía dưới.',
-        'layout' => 'FaceOff có cấu trúc HTML như trên.<br/>bạn có thể thu vào hoặc giãn ra với CSS, hay sử dụng kiểu dáng để thiết kế.<br/>Bạn có thể thêm Widget từ phần mở rộng (e1, e2), Neck và Knee.<br/>Ngoài ra Body, Giao diện, Header, Body, Footer có thể được thiết kế theo kích cỡ, và Content sẽ hiển thị nội dung.',
-        'setting' => 'Menu phía bên trái.<br/><ul><li>"Lưu lại": là lưu lại những thiết lập hiện tại.</li><li>"Loại bỏ": là bỏ qua những thay đổi hiện tại và trở lại.</li><li>"Thiết lập lại": là xóa bỏ tất cả những thay đổi.</li><li>"Form": đặt Form dạng Cố định, Biến thiên, Cố định+Biến thiên (Nội dung).</li><li>"Thu nhỏ": là thu nhỏ hai phần mở rộng và nội dung.</li><li>"Căn chỉnh" : là sắp xếp sự thẳng hàng.</li></ul>',
-        'hotkey' => 'Bạn có thể thiết kế giao diện của mình dễ dàng hơn nữa với những phím tắt.<br/><ul><li>"Tab": trừ khi một Widget được chọn, Header, Body, Footer sẽ được chọn trong lệnh. Nếu không, Widget tiếp theo sẽ được chọn.</li><li>"Shift+Tab": nó ngược lại với phím "Tab".</li><li>"Esc": Nếu không có gì được chọn, Neck, Extension (e1, e2 ), Knee sẽ được lựa chọn theo thứ tự, nếu một Widget được chọn, kích thước Widget sẽ được lựa chọn.</li><li>"4 phím mũi tên": Nếu Widget đã được chọn, nó sẽ di chuyển Widget tới một vị trí mới.</li></ul>',
-        'attribute' => 'Bạn có thể đặt màu nền / hình nền tới mọi khu vực trừ Widget, và màu chữ (bao gồm cả Tag).',
-
-    );
-	$lang->mobile_layout_list = "Mobile Layout List";
-	$lang->mobile_downloaded_list = "Downloaded Mobile Layouts";
-	$lang->apply_mobile_view = "Apply Mobile View";
-	$lang->about_apply_mobile_view = "All connected module use mobile view to display when accessing with mobile device.";
-?>
diff --git a/modules/layout/lang/zh-CN.lang.php b/modules/layout/lang/zh-CN.lang.php
deleted file mode 100644
index f6466bcf3..000000000
--- a/modules/layout/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com) 翻译：guny
-     * @brief  布局(layout) 模块简体中文语言包
-     **/
-
-    $lang->cmd_layout_management = '布局设置';
-    $lang->cmd_layout_edit = '布局编辑';
-
-    $lang->layout_name = '布局名';
-    $lang->layout_maker = "布局作者";
-    $lang->layout_license = '版权';
-    $lang->layout_history = "更新记录 ";
-    $lang->layout_info = "布局信息";
-    $lang->layout_list = '布局列表';
-    $lang->menu_count = '菜单数';
-    $lang->downloaded_list = '下载目录';
-    $lang->layout_preview_content = '显示内容的部分。';
-    $lang->not_apply_menu = '布局共享';
-	$lang->layout_management = '레이아웃 관리';
-
-    $lang->cmd_move_to_installed_list = "查看生成目录";
-
-    $lang->about_downloaded_layouts = "已下载的布局目录";
-    $lang->about_title = '请输入连接模块时容易区分的标题。';
-    $lang->about_not_apply_menu = '勾选表示连接到此布局的菜单项全部采用此布局。';
-
-    $lang->about_layout = "布局模块使网站制作变得更简单。<br />通过布局设置及菜单的链接，可以轻松制作以多种模块组成的完整网站。<br />- 无法删除和修改的布局可能是博客或其他模块自带的模板，因此应到相关模块进行设置。";
-    $lang->about_layout_code = 
-        "修改的布局代码保存后即可生效。
-	保存之前请必须先预览后再保存。
-        XE布局语法请参考<strong><a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE模板</a></strong>。";
-
-    $lang->layout_export = '导出';
-    $lang->layout_btn_export = '下载布局设置';
-    $lang->about_layout_export = '可以导出当前已修改好的布局。';
-    $lang->layout_import = '导入';
-    $lang->about_layout_import = '导入之前请利用<strong>导出功能</strong>备份好当前的布局及设置，因为导入会删除当前的布局及设置。';
-
-    $lang->layout_manager = array(
-        0  => '布局管理器',
-        1  => '保存',
-        2  => '取消',
-        3  => '宽度',
-        4  => '版式',
-        5  => '对齐',
-        6  => '固定宽度',
-        7  => '自适应宽度',
-        8  => '固定+自适应(内容)',
-        9  => '1栏',
-        10 => '2栏 (左侧内容区)',
-        11 => '2栏 (右侧内容区)',
-        12 => '3栏 (左侧内容区)',
-        13 => '3栏 (剧中内容区)',
-        14 => '3栏 (右侧内容区)',
-        15 => '左对齐',
-        16 => '剧中对齐',
-        17 => '右对齐',
-        18 => '全局',
-        19 => '布局',
-        20 => '添加控件',
-        21 => '添加内容',
-        22 => '属性',
-        23 => '控件样式',
-        24 => '修改',
-        25 => '删除',
-        26 => '对齐',
-        27 => '占段落',
-        28 => '左对齐',
-        29 => '右对齐',
-        30 => '宽度',
-        31 => '高度',
-        32 => '外边距',
-        33 => '内填充',
-        34 => '上',
-        35 => '左',
-        36 => '右',
-        37 => '下',
-        38 => '边框', 
-        39 => '无',
-        40 => '背景',
-        41 => '颜色',
-        42 => '图片',
-        43 => '选择',
-        44 => '背景重复',
-        45 => '平铺',
-        46 => '不重复',
-        47 => '水平重复',
-        48 => '垂直重复',
-        49 => '应用',
-        50 => '取消',
-        51 => '初始化',
-        52 => '字体',
-        53 => '字体',
-        54 => '文字颜色',
-    );
-
-    $lang->layout_image_repository = '布局文件库';
-    $lang->about_layout_image_repository = '可以上传要在所选布局中使用的图片/FLASH文件(导出时包含此库文件)。';
-    $lang->msg_layout_image_target = '只允许上传gif, png, jpg, swf, flv文件。';
-    $lang->layout_migration = '导入/导出';
-    $lang->about_layout_migration = '可以把已修改好的布局导出为tar文件或把已有的tar文件直接导入。'."\n".'(目前此功能只能在faceOff布局中使用)';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff布局管理工具',
-        'description' => '利用FaceOff布局管理工具，可以在线随意布置您的布局。<br/>请仔细查看下面的布局示意图和功能简介后，尽情发挥吧！<br/>FaceOff的布局示意图如下：',
-        'layout' => '根据布局示意图，对其进行宽度/版式/对齐方式的调整。<br/>控件插入区为Extension(e1, e2)区和Neck, Knee区。<br/>另外的Body, Layout, Header, Body, Footer区可以使用Style来进行渲染，Content区是内容显示区。',
-        'setting' => '布局管理工具顶部左侧菜单说明：<br/><ul><li>保存 : 保存已修改的设置</li><li>取消 : 不保存返回</li><li>初始化 : 重置为空白布局</li><li>宽度 : 可指定固定/自适应/固定+自适应(内容)布局宽度样式</li><li>版式 : 可布置2个Extension区和Content区的样式</li><li>对齐 : 布局对齐方式</li></ul>',
-        'hotkey' => '选取各个区域可以利用鼠标，还可以利用快捷键：<br/><ul><li>tab键 : 当前没有被选取的控件，选取顺序为： Header, Body, Footer；已有被选取的控件，将选取下一个控件。</li><li>Shift + tab键 : 与tab键作用相反。</li><li>Esc键 : 当前没有被选取的区域，选取顺序为： Neck, Extension(e1,e2),Knee；已有被选取的控件，将选取包含此控件的区域。</li><li>方向键 : 已有被选取的控件时，可以利用方向键移到别的区域。</li></ul>',
-        'attribute' => '除控件之外的各个区域都可以对其指定背景色/背景图片及字体颜色(包括a标签)。',
-
-    );
-	$lang->mobile_layout_list = "移动版布局目录";
-	$lang->mobile_downloaded_list = "移动版布局下载目录";
-	$lang->apply_mobile_view = "移动版布局共享";
-	$lang->about_apply_mobile_view = "勾选表示连接到此布局的所有菜单项全部采用此移动版布局。";
-?>
diff --git a/modules/layout/lang/zh-TW.lang.php b/modules/layout/lang/zh-TW.lang.php
deleted file mode 100644
index ef85040c3..000000000
--- a/modules/layout/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-    /**
-     * @file   modules/layout/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  版面設計(layout)模組正體中文語言
-     **/
-
-    $lang->cmd_layout_management = '版面設置';
-    $lang->cmd_layout_edit = '版面編輯';
-
-    $lang->layout_name = '版面名稱';
-    $lang->layout_maker = "版面作者";
-    $lang->layout_license = '版權';
-    $lang->layout_history = "更新記錄";
-    $lang->layout_info = "版面資訊";
-    $lang->layout_list = '版面列表';
-    $lang->menu_count = '選單數量';
-    $lang->downloaded_list = '版面選擇';
-    $lang->layout_preview_content = '顯示內容的部分。';
-    $lang->not_apply_menu = '套用版面';
-	$lang->layout_management = '版面管理';
-
-    $lang->cmd_move_to_installed_list = "檢視建立列表";
-
-    $lang->about_downloaded_layouts = "已下載的版面列表";
-    $lang->about_title = '連結模組時，請輸入容易區分的標題。';
-    $lang->about_not_apply_menu = '更新所有被連結到選單的版面模組。';
-
-    $lang->about_layout = "版面設計模組使網站製作變得更簡單。<br />透過版面設置及選單的連結，利用多種模組可以輕鬆製作組合出完整的網站。<br />- 無法刪除和修改的版面，可能是部落格或其他模組的原始樣板，因此應到相關模組進行設置。";
-    $lang->about_layout_code = 
-        "儲存修改後的版面，即可生效。
-	     儲存之前，請先預覽後再儲存。
-        XE 版面設計語法，請參考<a href=\"#\" onclick=\"winopen('http://trac.zeroboard.com/trac/wiki/TemplateHandler');return false;\">XE 樣版</a>。";
-
-    $lang->layout_export = '版面匯出';
-    $lang->layout_btn_export = '下載版面';
-    $lang->about_layout_export = '可匯出目前修改過的版面。';
-    $lang->layout_import = '版面匯入';
-    $lang->about_layout_import = '版面匯入時，將會刪除目前的版面設置。
-    版面匯入前，請先匯出備份目前的版面設置。';
-    $lang->layout_manager = array(
-        0  => '版面管理者',
-        1  => '儲存',
-        2  => '取消',
-        3  => '模式',
-        4  => '樣式',
-        5  => '對齊',
-        6  => '固定版面',
-        7  => '變動版面',
-        8  => '固定+變動(內容)',
-        9  => '1欄',
-        10 => '2欄 (左側內容區)',
-        11 => '2欄 (右側內容區)',
-        12 => '3欄 (左側內容區)',
-        13 => '3欄 (居中內容區)',
-        14 => '3欄 (右側內容區)',
-        15 => '靠左對齊',
-        16 => '置中對齊',
-        17 => '靠右對齊',
-        18 => '整體',
-        19 => '版面',
-        20 => '新增Widget',
-        21 => '新增內容',
-        22 => '屬性',
-        23 => 'Widget樣式',
-        24 => '修改',
-        25 => '刪除',
-        26 => '對齊',
-        27 => '換行',
-        28 => '靠左對齊',
-        29 => '靠右對齊',
-        30 => '寬度',
-        31 => '高度',
-        32 => '邊距',
-        33 => '內距',
-        34 => '上',
-        35 => '左',
-        36 => '右',
-        37 => '下',
-        38 => '外框',
-        39 => '無',
-        40 => '背景',
-        41 => '顏色',
-        42 => '圖片',
-        43 => '選擇',
-        44 => '背景重複',
-        45 => '重複',
-        46 => '不重複',
-        47 => '水平重複',
-        48 => '垂直重複',
-        49 => '應用',
-        50 => '取消',
-        51 => '重置',
-        52 => '字型',
-        53 => '字體',
-        54 => '文字顏色',
-    );
-
-    $lang->layout_image_repository = '版面檔案庫';
-    $lang->about_layout_image_repository = '可在所選擇的版面中上傳圖片/ Flash 檔案。匯出時將包含此檔案。';
-    $lang->msg_layout_image_target = '只允許上傳 gif, png, jpg, swf, flv 等檔案格式。';
-    $lang->layout_migration = '版面匯出/匯入';
-    $lang->about_layout_migration = '可將修改過的版面匯出成 tar 檔案或是直接匯入現有的 tar 檔案。'."\n".'(此功能目前只能用於 faceOff 版面中';
-
-    $lang->about_faceoff = array(
-        'title' => 'XpressEngine FaceOff 版面管理者',
-        'description' => 'FaceOff Layout 版面管理者，可方便地在線上修改與設計版面。<br/>下圖為版面架構示意圖和功能簡介，瞭解後發揮創意製作出自己想要的版面吧!',
-        'layout' => 'FaceOff 的架構和 HTML 相同。<br/>可以使用 CSS 或樣式設計。<br/>可新增 Widget 到 Extension(e1, e2), Neck, Knee 等區域。<br/>另外 Body, Layout, Header, Body, Footer 可以使用樣式設計，而 Content 區域會顯示內容。',
-        'setting' => '左上方的選單說明：<br/><ul><li>儲存 : 儲存設定內容</li><li>取消 : 不儲存設定內容並返回上一頁</li><li>重置 : 重新設置回到最原始的版面設定</li><li>模式 : 可設定版面模式為固定/ 變動/ 固定+變動(內容)</li><li>樣式 : 可設置兩個 Extension 區域和 Content 區域</li><li>對齊 : 可選擇版面的對齊方式</li></ul>',
-        'hotkey' => '除了可利用滑鼠選取各區域外，也能使用熱鍵選取：<br/><ul><li>tab鍵 : 當沒有選取 Widget 時，選擇順序是： Header, Footer, Body；當有選取 Widget 時，將會選擇下一個。</li><li>Shift + tab 鍵 : 功能和 tab 鍵相反</li><li>Esc 鍵 : 當沒有選擇區域時，選擇順序是： Neck, Extension(e1,e2),Knee；當有選擇 Widget 時，將會選則此 Widget 所屬的區域。</li><li>方向鍵 : 當有選擇 Widget 時，可利用方向鍵作移動。</li></ul>',
-        'attribute' => '除了 Widget 以外的各個區域都可以指定背景顏色/圖片及文字顏色(包含 a 標籤)。',
-
-    );
-	$lang->mobile_layout_list = "手機版面列表";
-	$lang->mobile_downloaded_list = "下載手機版面";
-	$lang->apply_mobile_view = "Apply Mobile View";
-	$lang->about_apply_mobile_view = "All connected module use mobile view to display when accessing with mobile device.";
-?>
diff --git a/modules/layout/layout.admin.controller.php b/modules/layout/layout.admin.controller.php
index 264a97582..9271baf45 100644
--- a/modules/layout/layout.admin.controller.php
+++ b/modules/layout/layout.admin.controller.php
@@ -1,524 +1,592 @@
-<?php
-    /**
-     * @class  layoutAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  layout 모듈의 admin controller class
-     **/
-
-    class layoutAdminController extends layout {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 레이아웃 신규 생성
-         * 레이아웃의 신규 생성은 제목만 받아서 layouts테이블에 입력함
-         **/
-        function procLayoutAdminInsert() {
-            // 레이아웃 생성과 관련된 기본 정보를 받음
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $args->layout_srl = getNextSequence();
-            $args->layout = Context::get('layout');
-            $args->title = Context::get('title');
-			$args->layout_type = Context::get('layout_type');
-			if(!$args->layout_type) $args->layout_type = "P";
-
-            // DB 입력
-            $output = $this->insertLayout($args);
-            if(!$output->toBool()) return $output;
-
-            // faceOff 레이아웃일 경우 init 필요
-            $this->initLayout($args->layout_srl, $args->layout);
-
-            // 결과 리턴
-            $this->add('layout_srl', $args->layout_srl);
-        }
-
-        // 레이아웃 정보를 DB에 입력
-        function insertLayout($args) {
-            $output = executeQuery("layout.insertLayout", $args);
-            return $output;
-        }
-
-        // faceOff 레이아웃을 경우 init
-        function initLayout($layout_srl, $layout_name){
-            $oLayoutModel = &getModel('layout');
-
-            // faceOff일 경우 sample import
-            if($oLayoutModel->useDefaultLayout($layout_name)) {
-                $this->importLayout($layout_srl, $this->module_path.'tpl/faceOff_sample.tar');
-            // 디렉토리 제거
-            } else {
-                FileHandler::removeDir($oLayoutModel->getUserLayoutPath($layout_srl));
-            }
-        }
-
-        /**
-         * @brief 레이아웃 정보 변경
-         * 생성된 레이아웃의 제목과 확장변수(extra_vars)를 적용한다
-         **/
-        function procLayoutAdminUpdate() {
-            // module, act, layout_srl, layout, title을 제외하면 확장변수로 판단.. 좀 구리다..
-            $extra_vars = Context::getRequestVars();
-            unset($extra_vars->module);
-            unset($extra_vars->act);
-            unset($extra_vars->layout_srl);
-            unset($extra_vars->layout);
-            unset($extra_vars->title);
-            unset($extra_vars->apply_layout);
-			unset($extra_vars->apply_mobile_view);
-
-            $args = Context::gets('layout_srl','title');
-
-            // 레이아웃의 정보를 가져옴
-            $oLayoutModel = &getModel('layout');
-            $oMenuAdminModel = &getAdminModel('menu');
-            $layout_info = $oLayoutModel->getLayout($args->layout_srl);
-            $menus = get_object_vars($layout_info->menu);
-            if(count($menus) ) {
-                foreach($menus as $menu_id => $val) {
-                    $menu_srl = Context::get($menu_id);
-                    if(!$menu_srl) continue;
-
-                    $output = $oMenuAdminModel->getMenu($menu_srl);
-                    $menu_srl_list[] = $menu_srl;
-                    $menu_name_list[$menu_srl] = $output->title;
-
-					$apply_layout = Context::get('apply_layout');
-					$apply_mobile_view = Context::get('apply_mobile_view');
-
-                    if($apply_layout=='Y' || $apply_mobile_view=='Y') {
-                        $menu_args = null;
-                        $menu_args->menu_srl = $menu_srl;
-                        $menu_args->site_srl = $layout_info->site_srl;
-                        $output = executeQueryArray('layout.getLayoutModules', $menu_args);
-                        if($output->data) {
-                            $modules = array();
-                            for($i=0;$i<count($output->data);$i++) {
-                                $modules[] = $output->data[$i]->module_srl;
-                            }
-
-                            if(count($modules)) {
-                                $update_args->module_srls = implode(',',$modules);
-								if($apply_layout == "Y") {
-									$update_args->layout_srl = $args->layout_srl;
-								}
-								if($layout_info->layout_type == "M")
-								{
-									if(Context::get('apply_mobile_view') == "Y")
-									{
-										$update_args->use_mobile = "Y";
-									}
-									$output = executeQuery('layout.updateModuleMLayout', $update_args);
-								}
-								else
-								{
-									$output = executeQuery('layout.updateModuleLayout', $update_args);
-								}
-                            }
-                        }
-                    }
-                }
-            }
-
-            // extra_vars의 type이 image일 경우 별도 처리를 해줌
-            if($layout_info->extra_var) {
-                foreach($layout_info->extra_var as $name => $vars) {
-                    if($vars->type!='image') continue;
-
-                    $image_obj = $extra_vars->{$name};
-                    $extra_vars->{$name} = $layout_info->extra_var->{$name}->value;
-
-                    // 삭제 요청에 대한 변수를 구함
-                    $del_var = $extra_vars->{"del_".$name};
-                    unset($extra_vars->{"del_".$name});
-                    // 삭제 요청이 있거나, 새로운 파일이 업로드 되면, 기존 파일 삭제
-                    if($del_var == 'Y' || $image_obj['tmp_name']) {
-                        FileHandler::removeFile($extra_vars->{$name});
-                        $extra_vars->{$name} = '';
-                        if($del_var == 'Y' && !$image_obj['tmp_name']) continue;
-                    }
-
-                    // 정상적으로 업로드된 파일이 아니면 무시
-                    if(!$image_obj['tmp_name'] || !is_uploaded_file($image_obj['tmp_name'])) continue;
-
-                    // 이미지 파일이 아니어도 무시 (swf는 패스~)
-                    if(!preg_match("/\.(jpg|jpeg|gif|png|swf)$/i", $image_obj['name'])) continue;
-
-                    // 경로를 정해서 업로드
-                    $path = sprintf("./files/attach/images/%s/", $args->layout_srl);
-
-                    // 디렉토리 생성
-                    if(!FileHandler::makeDir($path)) continue;
-
-                    $filename = $path.$image_obj['name'];
-
-                    // 파일 이동
-                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) continue;
-
-                    $extra_vars->{$name} = $filename;
-                }
-            }
-
-            // header script를 레이아웃 모듈의 config에 저장
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-            $layout_config->header_script = Context::get('header_script');
-            $oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
-
-            //menu의 title도 저장하자
-            $extra_vars->menu_name_list = $menu_name_list;
-
-            // DB에 입력하기 위한 변수 설정
-            $args->extra_vars = serialize($extra_vars);
-
-            $output = $this->updateLayout($args);
-            if(!$output->toBool()) return $output;
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
-        function updateLayout($args) {
-            $output = executeQuery('layout.updateLayout', $args);
-            if($output->toBool()) {
-                $oLayoutModel = &getModel('layout');
-                $cache_file = $oLayoutModel->getUserLayoutCache($args->layout_srl, Context::getLangType());
-                FileHandler::removeFile($cache_file);
-            }
-            return $output;
-        }
-
-        /**
-         * @brief 레이아웃 삭제
-         * 삭제시 메뉴 xml 캐시 파일도 삭제
-         **/
-        function procLayoutAdminDelete() {
-            $layout_srl = Context::get('layout_srl');
-            return $this->deleteLayout($layout_srl);
-        }
-
-        function deleteLayout($layout_srl) {
-            $oLayoutModel = &getModel('layout');
-
-            $path = $oLayoutModel->getUserLayoutPath($layout_srl);
-            FileHandler::removeDir($path);
-
-            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
-            if(file_exists($layout_file)) FileHandler::removeFile($layout_file);
-
-            // 레이아웃 삭제
-            $args->layout_srl = $layout_srl;
-            $output = executeQuery("layout.deleteLayout", $args);
-            if(!$output->toBool()) return $output;
-
-            return new Object(0,'success_deleted');
-        }
-
-        /**
-         * @brief 레이아웃 코드 추가
-         **/
-        function procLayoutAdminCodeUpdate() {
-            $layout_srl = Context::get('layout_srl');
-            $code = Context::get('code');
-            $code_css   = Context::get('code_css');
-			$return_url = Context::get('_return_url');
-			$is_post    = (Context::getRequestMethod() == 'POST');
-            if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
-
-            $oLayoutModel = &getModel('layout');
-            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
-            FileHandler::writeFile($layout_file, $code);
-
-            $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_srl);
-            FileHandler::writeFile($layout_css_file, $code_css);
-
-			if($is_post) {
-				if(!$return_url) $return_url = getUrl('module','admin','act','dispLayoutAdminEdit', 'layout_srl', $layout_srl);
-				header('Location: '.$return_url);
-			} else {
-				$this->setMessage('success_updated');
-			}
-        }
-
-        /**
-         * @brief 레이아웃 코드 초기화
-         **/
-        function procLayoutAdminCodeReset() {
-            $layout_srl = Context::get('layout_srl');
-            if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
-
-            // delete user layout file
-            $oLayoutModel = &getModel('layout');
-            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
-            FileHandler::removeFile($layout_file);
-
-            $info = $oLayoutModel->getLayout($layout_srl);
-
-            // if face off delete, tmp file
-            if($oLayoutModel->useDefaultLayout($info->layout)){
-                $this->deleteUserLayoutTempFile($layout_srl);
-                $faceoff_css = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
-                FileHandler::removeFile($faceoff_css);
-            }
-
-            $this->initLayout($layout_srl, $info->layout);
-            $this->setMessage('success_reset');
-        }
-
-
-        /**
-         * @brief 레이아웃 설정페이지 -> 이미지 업로드
-         *
-         **/
-        function procLayoutAdminUserImageUpload(){
-            if(!Context::isUploaded()) exit();
-
-            $image = Context::get('user_layout_image');
-            $layout_srl = Context::get('layout_srl');
-            if(!is_uploaded_file($image['tmp_name'])) exit();
-
-            if(!preg_match('/\.(gif|jpg|jpeg|gif|png|swf|flv)$/i', $image['name'])){
-                return false;
-            }
-
-            $this->insertUserLayoutImage($layout_srl, $image);
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
-        /**
-         * @brief 레이아웃 설정페이지 -> 이미지 업로드
-         *
-         **/
-        function insertUserLayoutImage($layout_srl,$source){
-            $oLayoutModel = &getModel('layout');
-            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-            if(!is_dir($path)) FileHandler::makeDir($path);
-
-            $filename = strtolower($source['name']);
-            if($filename != urlencode($filename)){
-                $ext = substr(strrchr($filename,'.'),1);
-                $filename = sprintf('%s.%s', md5($filename), $ext);
-            }
-
-            if(file_exists($path .'/'. $filename)) @unlink($path . $filename);
-            if(!move_uploaded_file($source['tmp_name'], $path . $filename )) return false;
-            return true;
-        }
-
-
-        /**
-         * @brief 레이아웃 설정페이지 -> 이미지 삭제
-         *
-         **/
-        function removeUserLayoutImage($layout_srl,$filename){
-            $oLayoutModel = &getModel('layout');
-            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-            @unlink($path . $filename);
-        }
-
-        /**
-         * @brief 레이아웃 설정페이지 -> 이미지 삭제
-         *
-         **/
-        function procLayoutAdminUserImageDelete(){
-            $filename = Context::get('filename');
-            $layout_srl = Context::get('layout_srl');
-            $this->removeUserLayoutImage($layout_srl,$filename);
-            $this->setMessage('success_deleted');
-        }
-
-
-        /**
-         * @brief 레이아웃 설정 저장
-         * ini 로 저장한다 faceoff 용
-         **/
-        function procLayoutAdminUserValueInsert(){
-            $oModuleModel = &getModel('module');
-
-            $mid = Context::get('mid');
-            if(!$mid) return new Object(-1, 'msg_invalid_request');
-
-            $site_module_info = Context::get('site_module_info');
-            $module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl);
-            $layout_srl = $module_info->layout_srl;
-            if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
-
-            $oLayoutModel = &getModel('layout');
-
-            // save tmp?
-            $temp = Context::get('saveTemp');
-            if($temp =='Y'){
-                $oLayoutModel->setUseUserLayoutTemp();
-            }else{
-                // delete temp files
-                $this->deleteUserLayoutTempFile($layout_srl);
-            }
-
-            $this->add('saveTemp',$temp);
-
-            // write user layout
-            $extension_obj = Context::gets('e1','e2','neck','knee');
-
-            $file = $oLayoutModel->getUserLayoutHtml($layout_srl);
-            $content = FileHandler::readFile($file);
-            $content = $this->addExtension($layout_srl,$extension_obj,$content);
-            FileHandler::writeFile($file,$content);
-
-            // write faceoff.css
-            $css = Context::get('css');
-
-            $css_file = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
-            FileHandler::writeFile($css_file,$css);
-
-            // write ini
-            $obj = Context::gets('type','align','column');
-            $obj = (array)$obj;
-            $src = $oLayoutModel->getUserLayoutIniConfig($layout_srl);
-            foreach($obj as $key => $val) $src[$key] = $val;
-            $this->insertUserLayoutValue($layout_srl,$src);
-        }
-
-        /**
-         * @brief 레이아웃 설정 ini 저장
-         *
-         **/
-        function insertUserLayoutValue($layout_srl,$arr){
-            $oLayoutModel = &getModel('layout');
-            $file = $oLayoutModel->getUserLayoutIni($layout_srl);
-            FileHandler::writeIniFile($file, $arr);
-        }
-
-        function writeUserLayoutCss(){
-
-        }
-
-        /**
-         * @brief faceoff용 위젯코드를 사용자 layout 파일에 직접 추가한다
-         *
-         **/
-        function addExtension($layout_srl,$arg,$content){
-            $oLayoutModel = &getModel('layout');
-             $reg = '(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)';
-             $extension_content =  '\1' .stripslashes($arg->e1) . '\3';
-             $content = eregi_replace($reg,$extension_content,$content);
-
-             $reg = '(<\!\-\- start\-e2 \-\->)(.*)(<\!\-\- end\-e2 \-\->)';
-             $extension_content =  '\1' .stripslashes($arg->e2) . '\3';
-             $content = eregi_replace($reg,$extension_content,$content);
-
-             $reg = '(<\!\-\- start\-neck \-\->)(.*)(<\!\-\- end\-neck \-\->)';
-             $extension_content =  '\1' .stripslashes($arg->neck) . '\3';
-             $content = eregi_replace($reg,$extension_content,$content);
-
-             $reg = '(<\!\-\- start\-knee \-\->)(.*)(<\!\-\- end\-knee \-\->)';
-             $extension_content =  '\1' .stripslashes($arg->knee) . '\3';
-             $content = eregi_replace($reg,$extension_content,$content);
-            return $content;
-        }
-
-
-        /**
-         * @brief faceoff용 temp file들을 지운다
-         *
-         **/
-         function deleteUserLayoutTempFile($layout_srl){
-             $oLayoutModel = &getModel('layout');
-             $file_list = $oLayoutModel->getUserLayoutTempFileList($layout_srl);
-             foreach($file_list as $key => $file){
-                FileHandler::removeFile($file);
-             }
-         }
-
-        /**
-         * @brief faceoff export
-         *
-         **/
-         function procLayoutAdminUserLayoutExport(){
-            $layout_srl = Context::get('layout_srl');
-            if(!$layout_srl) return new Object('-1','msg_invalid_request');
-
-            require_once(_XE_PATH_.'libs/tar.class.php');
-
-            // 압축할 파일 목록을 가져온다
-            $oLayoutModel = &getModel('layout');
-            $file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
-
-            // 압축을 한다.
-            $tar = new tar();
-            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
-            chdir($user_layout_path);
-            $replace_path = getNumberingPath($layout_srl,3);
-            foreach($file_list as $key => $file) $tar->addFile($file,$replace_path,'__LAYOUT_PATH__');
-
-            $stream = $tar->toTarStream();
-            $filename = 'faceoff_' . date('YmdHis') . '.tar';
-            header("Cache-Control: ");
-            header("Pragma: ");
-            header("Content-Type: application/x-compressed");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-//            header("Content-Length: " .strlen($stream)); ?? why??
-            header('Content-Disposition: attachment; filename="'. $filename .'"');
-            header("Content-Transfer-Encoding: binary\n");
-            echo $stream;
-
-            // Context를 강제로 닫고 종료한다.
-            Context::close();
-            exit();
-         }
-
-        /**
-         * @brief faceoff import
-         *
-         **/
-         function procLayoutAdminUserLayoutImport(){
-            // check upload
-            if(!Context::isUploaded()) exit();
-            $file = Context::get('file');
-            if(!is_uploaded_file($file['tmp_name'])) exit();
-            if(!preg_match('/\.(tar)$/i', $file['name'])) exit();
-
-            $layout_srl = Context::get('layout_srl');
-            if(!$layout_srl) exit();
-
-            $oLayoutModel = &getModel('layout');
-            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
-            if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) exit();
-
-            $this->importLayout($layout_srl, $user_layout_path.'faceoff.tar');
-        }
-
-        function importLayout($layout_srl, $source_file) {
-            $oLayoutModel = &getModel('layout');
-            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
-            $file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
-            foreach($file_list as $key => $file){
-                FileHandler::removeFile($user_layout_path . $file);
-            }
-
-            require_once(_XE_PATH_.'libs/tar.class.php');
-            $image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-            FileHandler::makeDir($image_path);
-            $tar = new tar();
-            $tar->openTAR($source_file);
-
-            // layout.ini 파일이 없으면 
-            if(!$tar->getFile('layout.ini')) return;
-
-            $replace_path = getNumberingPath($layout_srl,3);
-            foreach($tar->files as $key => $info) {
-                FileHandler::writeFile($user_layout_path . $info['name'],str_replace('__LAYOUT_PATH__',$replace_path,$info['file']));
-            }
-
-            // 업로드한 파일을 삭제
-            FileHandler::removeFile($source_file);
-         }
-    }
-?>
+<?php
+    /**
+     * @class  layoutAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of the layout module
+     **/
+
+    class layoutAdminController extends layout {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+		// deprecated
+        /**
+         * @brief Create a new layout
+         * Insert a title into "layouts" table in order to create a layout
+         **/
+        function procLayoutAdminInsert() {
+			if(Context::get('layout') == 'faceoff') return $this->stop('not supported');
+
+            // Get information to create a layout
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->layout_srl = getNextSequence();
+            $args->layout = Context::get('layout');
+            $args->title = Context::get('title');
+			$args->layout_type = Context::get('_layout_type');
+			if(!$args->layout_type) $args->layout_type = "P";
+
+			// Insert into the DB
+            $output = $this->insertLayout($args);
+            if(!$output->toBool()) return $output;
+
+			// initiate if it is faceoff layout
+            $this->initLayout($args->layout_srl, $args->layout);
+
+			// update layout info
+			Context::set('layout_srl', $args->layout_srl);
+			$output = $this->procLayoutAdminUpdate();
+			if (!$output->toBool()) return $output;
+
+			$this->setRedirectUrl(Context::get('success_return_url'));
+        }
+
+        // Insert layout information into the DB
+        function insertLayout($args) {
+            $output = executeQuery("layout.insertLayout", $args);
+            return $output;
+        }
+
+        // Initiate if it is faceoff layout
+        function initLayout($layout_srl, $layout_name){
+            $oLayoutModel = &getModel('layout');
+            // Import a sample layout if it is faceoff
+            if($oLayoutModel->useDefaultLayout($layout_name)) {
+                $this->importLayout($layout_srl, $this->module_path.'tpl/faceOff_sample.tar');
+            // Remove a directory
+            } else {
+                FileHandler::removeDir($oLayoutModel->getUserLayoutPath($layout_srl));
+            }
+        }
+
+        /**
+         * @brief Update layout information
+         * Apply a title of the new layout and extra vars
+         **/
+        function procLayoutAdminUpdate() {
+            // Consider the rest of items as extra vars, except module, act, layout_srl, layout, and title  .. Some gurida ..
+            $extra_vars = Context::getRequestVars();
+            unset($extra_vars->module);
+            unset($extra_vars->act);
+            unset($extra_vars->layout_srl);
+            unset($extra_vars->layout);
+            unset($extra_vars->title);
+            unset($extra_vars->apply_layout);
+			unset($extra_vars->apply_mobile_view);
+
+            $args = Context::gets('layout_srl','title');
+            // Get layout information
+            $oLayoutModel = &getModel('layout');
+            $oMenuAdminModel = &getAdminModel('menu');
+            $layout_info = $oLayoutModel->getLayout($args->layout_srl);
+			if($layout_info->menu) {
+	            $menus = get_object_vars($layout_info->menu);
+			}
+            if(count($menus) ) {
+                foreach($menus as $menu_id => $val) {
+                    $menu_srl = Context::get($menu_id);
+                    if(!$menu_srl) continue;
+
+                    $output = $oMenuAdminModel->getMenu($menu_srl);
+                    $menu_srl_list[] = $menu_srl;
+                    $menu_name_list[$menu_srl] = $output->title;
+
+					$apply_layout = Context::get('apply_layout');
+					$apply_mobile_view = Context::get('apply_mobile_view');
+
+                    if($apply_layout=='Y' || $apply_mobile_view=='Y') {
+                        $menu_args = null;
+                        $menu_args->menu_srl = $menu_srl;
+                        $menu_args->site_srl = $layout_info->site_srl;
+                        $output = executeQueryArray('layout.getLayoutModules', $menu_args);
+                        if($output->data) {
+                            $modules = array();
+                            for($i=0;$i<count($output->data);$i++) {
+                                $modules[] = $output->data[$i]->module_srl;
+                            }
+
+                            if(count($modules)) {
+                                $update_args->module_srls = implode(',',$modules);
+								if($apply_layout == "Y") {
+									$update_args->layout_srl = $args->layout_srl;
+								}
+								if($layout_info->layout_type == "M")
+								{
+									if(Context::get('apply_mobile_view') == "Y")
+									{
+										$update_args->use_mobile = "Y";
+									}
+									$output = executeQuery('layout.updateModuleMLayout', $update_args);
+								}
+								else
+								{
+									$output = executeQuery('layout.updateModuleLayout', $update_args);
+								}
+                            }
+                        }
+                    }
+                }
+            }
+            // Separately handle if a type of extra_vars is an image
+            if($layout_info->extra_var) {
+                foreach($layout_info->extra_var as $name => $vars) {
+                    if($vars->type!='image') continue;
+
+                    $image_obj = $extra_vars->{$name};
+                    $extra_vars->{$name} = $layout_info->extra_var->{$name}->value;
+                    // Get a variable on a request to delete
+                    $del_var = $extra_vars->{"del_".$name};
+                    unset($extra_vars->{"del_".$name});
+                    // Delete the old file if there is a request to delete or a new file is uploaded
+                    if($del_var == 'Y' || $image_obj['tmp_name']) {
+                        FileHandler::removeFile($extra_vars->{$name});
+                        $extra_vars->{$name} = '';
+                        if($del_var == 'Y' && !$image_obj['tmp_name']) continue;
+                    }
+                    // Ignore if the file is not successfully uploaded
+                    if(!$image_obj['tmp_name'] || !is_uploaded_file($image_obj['tmp_name'])) continue;
+                    // Ignore if the file is not an image (swf the paths ~)
+                    if(!preg_match("/\.(jpg|jpeg|gif|png|swf)$/i", $image_obj['name'])) continue;
+                    // Upload the file to a path
+                    $path = sprintf("./files/attach/images/%s/", $args->layout_srl);
+                    // Create a directory
+                    if(!FileHandler::makeDir($path)) continue;
+
+                    $filename = $path.$image_obj['name'];
+                    // Move the file
+                    if(!move_uploaded_file($image_obj['tmp_name'], $filename)) continue;
+
+                    $extra_vars->{$name} = $filename;
+                }
+            }
+            // Save header script into "config" of layout module
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            $layout_config->header_script = Context::get('header_script');
+            $oModuleController->insertModulePartConfig('layout',$args->layout_srl,$layout_config);
+            // Save a title of the menu
+            $extra_vars->menu_name_list = $menu_name_list;
+            // Variable setting for DB insert
+            $args->extra_vars = serialize($extra_vars);
+
+            $output = $this->updateLayout($args);
+            if(!$output->toBool()) return $output;
+
+			$this->setRedirectUrl(Context::get('error_return_url'));
+			return new Object();
+        }
+
+        function updateLayout($args) {
+            $output = executeQuery('layout.updateLayout', $args);
+            if($output->toBool()) {
+                $oLayoutModel = &getModel('layout');
+                $cache_file = $oLayoutModel->getUserLayoutCache($args->layout_srl, Context::getLangType());
+                FileHandler::removeFile($cache_file);
+				//remove from cache
+                $oCacheHandler = &CacheHandler::getInstance('object');
+                if($oCacheHandler->isSupport())
+                {
+                	$cache_key = 'object:'.$args->layout_srl;
+                	$oCacheHandler->delete($cache_key);
+                }
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Delete Layout
+         * Delete xml cache file too when deleting a layout
+         **/
+        function procLayoutAdminDelete() {
+            $layout_srl = Context::get('layout_srl');
+			$this->setRedirectUrl(Context::get('error_return_url'));
+            return $this->deleteLayout($layout_srl);
+        }
+
+        function deleteLayout($layout_srl) {
+            $oLayoutModel = &getModel('layout');
+
+            $path = $oLayoutModel->getUserLayoutPath($layout_srl);
+            FileHandler::removeDir($path);
+
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
+            if(file_exists($layout_file)) FileHandler::removeFile($layout_file);
+            // Delete Layout
+            $args->layout_srl = $layout_srl;
+            $output = executeQuery("layout.deleteLayout", $args);
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+            	$cache_key = 'object:'.$layout_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+            if(!$output->toBool()) return $output;
+
+            return new Object(0,'success_deleted');
+        }
+
+        /**
+         * @brief Adding Layout Code
+         **/
+        function procLayoutAdminCodeUpdate() {
+			$mode = Context::get('mode');
+			if ($mode == 'reset') return $this->procLayoutAdminCodeReset();
+
+            $layout_srl = Context::get('layout_srl');
+            $code = Context::get('code');
+            $code_css   = Context::get('code_css');
+			$is_post    = (Context::getRequestMethod() == 'POST');
+            if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
+
+            $oLayoutModel = &getModel('layout');
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
+            FileHandler::writeFile($layout_file, $code);
+
+            $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_srl);
+            FileHandler::writeFile($layout_css_file, $code_css);
+
+			$this->setRedirectUrl(Context::get('error_return_url'));
+			$this->setMessage('success_updated');
+        }
+
+        /**
+         * @brief Reset layout code
+         **/
+        function procLayoutAdminCodeReset() {
+            $layout_srl = Context::get('layout_srl');
+            if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
+
+            // delete user layout file
+            $oLayoutModel = &getModel('layout');
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_srl);
+            FileHandler::removeFile($layout_file);
+
+            $info = $oLayoutModel->getLayout($layout_srl);
+
+            // if face off delete, tmp file
+            if($oLayoutModel->useDefaultLayout($info->layout)){
+                $this->deleteUserLayoutTempFile($layout_srl);
+                $faceoff_css = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
+                FileHandler::removeFile($faceoff_css);
+            }
+
+            $this->initLayout($layout_srl, $info->layout);
+            $this->setMessage('success_reset');
+			$this->setRedirectUrl(Context::get('error_return_url'));
+        }
+
+
+        /**
+         * @brief Layout setting page -> Upload an image
+         *
+         **/
+        function procLayoutAdminUserImageUpload(){
+            if(!Context::isUploaded()) exit();
+
+            $image = Context::get('user_layout_image');
+            $layout_srl = Context::get('layout_srl');
+            if(!is_uploaded_file($image['tmp_name'])) exit();
+
+            $this->insertUserLayoutImage($layout_srl, $image);
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile("top_refresh.html");
+
+			$this->setRedirectUrl(Context::get('error_return_url'));
+        }
+
+        /**
+         * @brief Layout setting page -> Upload an image
+         *
+         **/
+        function insertUserLayoutImage($layout_srl,$source){
+            $oLayoutModel = &getModel('layout');
+            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            if(!is_dir($path)) FileHandler::makeDir($path);
+
+            $filename = strtolower($source['name']);
+            if($filename != urlencode($filename)){
+                $ext = substr(strrchr($filename,'.'),1);
+                $filename = sprintf('%s.%s', md5($filename), $ext);
+            }
+
+            if(file_exists($path .'/'. $filename)) @unlink($path . $filename);
+            if(!move_uploaded_file($source['tmp_name'], $path . $filename )) return false;
+            return true;
+        }
+
+
+        /**
+         * @brief Layout setting page -> Delete an image
+         *
+         **/
+        function removeUserLayoutImage($layout_srl,$filename){
+            $oLayoutModel = &getModel('layout');
+            $path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            @unlink($path . $filename);
+        }
+
+        /**
+         * @brief Layout setting page -> Delete an image
+         *
+         **/
+        function procLayoutAdminUserImageDelete(){
+            $filename = Context::get('filename');
+            $layout_srl = Context::get('layout_srl');
+            $this->removeUserLayoutImage($layout_srl,$filename);
+            $this->setMessage('success_deleted');
+			$this->setRedirectUrl(Context::get('error_return_url'));
+        }
+
+		// deprecated
+        /**
+         * @brief Save layout configuration
+         * save in "ini" format for faceoff
+         **/
+        function procLayoutAdminUserValueInsert(){
+            $oModuleModel = &getModel('module');
+
+            $mid = Context::get('mid');
+            if(!$mid) return new Object(-1, 'msg_invalid_request');
+
+            $site_module_info = Context::get('site_module_info');
+			$columnList = array('layout_srl');
+            $module_info = $oModuleModel->getModuleInfoByMid($mid, $site_module_info->site_srl, $columnList);
+            $layout_srl = $module_info->layout_srl;
+            if(!$layout_srl) return new Object(-1, 'msg_invalid_request');
+
+            $oLayoutModel = &getModel('layout');
+
+            // save tmp?
+            $temp = Context::get('saveTemp');
+            if($temp =='Y'){
+                $oLayoutModel->setUseUserLayoutTemp();
+            }else{
+                // delete temp files
+                $this->deleteUserLayoutTempFile($layout_srl);
+            }
+
+            $this->add('saveTemp',$temp);
+
+            // write user layout
+            $extension_obj = Context::gets('e1','e2','neck','knee');
+
+            $file = $oLayoutModel->getUserLayoutHtml($layout_srl);
+            $content = FileHandler::readFile($file);
+            $content = $this->addExtension($layout_srl,$extension_obj,$content);
+            FileHandler::writeFile($file,$content);
+
+            // write faceoff.css
+            $css = stripslashes(Context::get('css'));
+
+            $css_file = $oLayoutModel->getUserLayoutFaceOffCss($layout_srl);
+            FileHandler::writeFile($css_file,$css);
+
+            // write ini
+            $obj = Context::gets('type','align','column');
+            $obj = (array)$obj;
+            $src = $oLayoutModel->getUserLayoutIniConfig($layout_srl);
+            foreach($obj as $key => $val) $src[$key] = $val;
+            $this->insertUserLayoutValue($layout_srl,$src);
+        }
+
+        /**
+         * @brief Layout setting, save "ini"
+         *
+         **/
+        function insertUserLayoutValue($layout_srl,$arr){
+            $oLayoutModel = &getModel('layout');
+            $file = $oLayoutModel->getUserLayoutIni($layout_srl);
+            FileHandler::writeIniFile($file, $arr);
+        }
+
+        function writeUserLayoutCss(){
+
+        }
+
+        /**
+         * @brief Add the widget code for faceoff into user layout file
+         *
+         **/
+        function addExtension($layout_srl,$arg,$content){
+            $oLayoutModel = &getModel('layout');
+             $reg = '/(<\!\-\- start\-e1 \-\->)(.*)(<\!\-\- end\-e1 \-\->)/i';
+             $extension_content =  '\1' .stripslashes($arg->e1) . '\3';
+             $content = preg_replace($reg,$extension_content,$content);
+
+             $reg = '/(<\!\-\- start\-e2 \-\->)(.*)(<\!\-\- end\-e2 \-\->)/i';
+             $extension_content =  '\1' .stripslashes($arg->e2) . '\3';
+             $content = preg_replace($reg,$extension_content,$content);
+
+             $reg = '/(<\!\-\- start\-neck \-\->)(.*)(<\!\-\- end\-neck \-\->)/i';
+             $extension_content =  '\1' .stripslashes($arg->neck) . '\3';
+             $content = preg_replace($reg,$extension_content,$content);
+
+             $reg = '/(<\!\-\- start\-knee \-\->)(.*)(<\!\-\- end\-knee \-\->)/i';
+             $extension_content =  '\1' .stripslashes($arg->knee) . '\3';
+             $content = preg_replace($reg,$extension_content,$content);
+            return $content;
+        }
+
+
+        /**
+         * @brief Delete temp files for faceoff
+         *
+         **/
+         function deleteUserLayoutTempFile($layout_srl){
+             $oLayoutModel = &getModel('layout');
+             $file_list = $oLayoutModel->getUserLayoutTempFileList($layout_srl);
+             foreach($file_list as $key => $file){
+                FileHandler::removeFile($file);
+             }
+         }
+
+        /**
+         * @brief faceoff export
+         *
+         **/
+         function procLayoutAdminUserLayoutExport(){
+            $layout_srl = Context::get('layout_srl');
+            if(!$layout_srl) return new Object('-1','msg_invalid_request');
+
+            require_once(_XE_PATH_.'libs/tar.class.php');
+            $oLayoutModel = &getModel('layout');
+			
+			// Copy files to temp path
+			$file_path = $oLayoutModel->getUserLayoutPath($layout_srl);
+			$target_path = $oLayoutModel->getUserLayoutPath(0);
+			FileHandler::copyDir($file_path, $target_path);
+
+			// replace path and ini config
+			$ini_config = $oLayoutModel->getUserLayoutIniConfig(0);
+            $file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
+			unset($file_list[2]);
+
+			foreach($file_list as $file)
+			{
+				if (preg_match('/^images/', $file)) continue;
+
+				// replace path
+				$file = $target_path . $file;
+				$content = FileHandler::readFile($file);
+				$pattern = '/(http:\/\/[^ ]+)?(\.\/)?' . str_replace('/', '\/', (str_replace('./', '', $file_path))) . '/';
+				if (basename($file) == 'faceoff.css' || basename($file) == 'layout.css')
+					$content = preg_replace($pattern, '../', $content);
+				else
+					$content = preg_replace($pattern, './', $content);
+
+				// replace ini config
+				foreach($ini_config as $key => $value)
+				{
+					$content = str_replace('{$layout_info->faceoff_ini_config[\'' . $key . '\']}', $value, $content);
+				}
+
+				FileHandler::writeFile($file, $content);
+			}
+
+			// make info.xml
+			$info_file = $target_path . 'conf/info.xml';
+			FileHandler::copyFile('./modules/layout/faceoff/conf/info.xml', $info_file);
+			$content = FileHandler::readFile($info_file);
+			$content = str_replace('type="faceoff"', '', $content);
+			FileHandler::writeFile($info_file, $content);
+			$file_list[] = 'conf/info.xml';
+
+			// make css file
+			$css_file = $target_path . 'css/layout.css';
+			FileHandler::copyFile('./modules/layout/faceoff/css/layout.css', $css_file);
+			$content = FileHandler::readFile('./modules/layout/tpl/css/widget.css');
+			FileHandler::writeFile($css_file, "\n" . $content, 'a');
+			$content = FileHandler::readFile($target_path . 'faceoff.css');
+			FileHandler::writeFile($css_file, "\n" . $content, 'a');
+			$content = FileHandler::readFile($target_path . 'layout.css');
+			FileHandler::writeFile($css_file, "\n" . $content, 'a');
+
+			// css load
+			$content = FileHandler::readFile($target_path . 'layout.html');
+			$content = "<load target=\"css/layout.css\" />\n" . $content;
+			FileHandler::writeFile($target_path . 'layout.html', $content);
+			unset($file_list[3]);
+			unset($file_list[1]);
+			$file_list[] = 'css/layout.css';
+
+            // Compress the files
+            $tar = new tar();
+            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath(0));
+            chdir($user_layout_path);
+            foreach($file_list as $key => $file) $tar->addFile($file);
+
+            $stream = $tar->toTarStream();
+            $filename = 'faceoff_' . date('YmdHis') . '.tar';
+            header("Cache-Control: ");
+            header("Pragma: ");
+            header("Content-Type: application/x-compressed");
+            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+//            header("Content-Length: " .strlen($stream)); ?? why??
+            header('Content-Disposition: attachment; filename="'. $filename .'"');
+            header("Content-Transfer-Encoding: binary\n");
+            echo $stream;
+            // Close Context and then exit
+            Context::close();
+
+			// delete temp path
+			FileHandler::removeDir($target_path);
+
+            exit();
+         }
+
+		// deprecated
+        /**
+         * @brief faceoff import
+         *
+         **/
+         function procLayoutAdminUserLayoutImport(){
+			return $this->stop('not supported');
+
+            // check upload
+            if(!Context::isUploaded()) exit();
+            $file = Context::get('file');
+            if(!is_uploaded_file($file['tmp_name'])) exit();
+            if(!preg_match('/\.(tar)$/i', $file['name'])) exit();
+
+            $layout_srl = Context::get('layout_srl');
+            if(!$layout_srl) exit();
+
+            $oLayoutModel = &getModel('layout');
+            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
+            if(!move_uploaded_file($file['tmp_name'], $user_layout_path . 'faceoff.tar')) exit();
+
+            $this->importLayout($layout_srl, $user_layout_path.'faceoff.tar');
+
+			$this->setRedirectUrl(Context::get('error_return_url'));
+        }
+
+        function importLayout($layout_srl, $source_file) {
+            $oLayoutModel = &getModel('layout');
+            $user_layout_path = FileHandler::getRealPath($oLayoutModel->getUserLayoutPath($layout_srl));
+            $file_list = $oLayoutModel->getUserLayoutFileList($layout_srl);
+            foreach($file_list as $key => $file){
+                FileHandler::removeFile($user_layout_path . $file);
+            }
+
+            require_once(_XE_PATH_.'libs/tar.class.php');
+            $image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            FileHandler::makeDir($image_path);
+            $tar = new tar();
+            $tar->openTAR($source_file);
+            // If layout.ini file does not exist
+            if(!$tar->getFile('layout.ini')) return;
+
+            $replace_path = getNumberingPath($layout_srl,3);
+            foreach($tar->files as $key => $info) {
+                FileHandler::writeFile($user_layout_path . $info['name'],str_replace('__LAYOUT_PATH__',$replace_path,$info['file']));
+            }
+            // Remove uploaded file
+            FileHandler::removeFile($source_file);
+         }
+    }
+?>
diff --git a/modules/layout/layout.admin.view.php b/modules/layout/layout.admin.view.php
index 5c3779302..7de3e0829 100644
--- a/modules/layout/layout.admin.view.php
+++ b/modules/layout/layout.admin.view.php
@@ -1,334 +1,415 @@
-<?php
-    /**
-     * @class  layoutAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  layout 모듈의 admin view class
-     **/
-
-    class layoutAdminView extends layout {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 레이아웃 관리의 첫 페이지
-         **/
-        function dispLayoutAdminContent() {
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList();
-            Context::set('layout_list', $layout_list);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..layout','layout_list..title');						
-
-            $this->setTemplateFile('index');
-        }
-
-		function dispLayoutAdminMobileContent() {
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList(0, "M");
-            Context::set('layout_list', $layout_list);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..layout','layout_list..title');						
-			
-            $this->setTemplateFile('mindex');
-
-		}
-
-        /**
-         * @brief 레이아웃 등록 페이지
-         * 1차적으로 레이아웃만 선택한 후 DB 에 빈 값을 넣고 그 후 상세 값 설정하는 단계를 거침
-         **/
-        function dispLayoutAdminInsert() {
-            // 레이아웃 목록을 세팅
-            $oLayoutModel = &getModel('layout');
-			$layout_type = Context::get('layout_type');
-            $layout_list = $oLayoutModel->getDownloadedLayoutList($layout_type);
-            Context::set('layout_list', $layout_list);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..layout','layout_list..title');						
-
-            $this->setTemplateFile('insert_layout');
-        }
-
-        /**
-         * @brief 레이아웃 세부 정보 입력
-         **/
-        function dispLayoutAdminModify() {
-
-            // 선택된 레이아웃의 정보를 구해서 세팅
-            $layout_srl = Context::get('layout_srl');
-
-            // 레이아웃의 정보를 가져옴
-            $oLayoutModel = &getModel('layout');
-            $layout_info = $oLayoutModel->getLayout($layout_srl);
-
-            // 등록된 레이아웃이 없으면 오류 표시
-            if(!$layout_info) return $this->dispLayoutAdminContent();
-
-            // faceoff면 경로를 보여줄 필요는 없다
-            if($layout_info->type == 'faceoff') unset($layout_info->path);
-            Context::set('selected_layout', $layout_info);
-
-            // 메뉴 목록을 가져옴
-            $oMenuAdminModel = &getAdminModel('menu');
-            $menu_list = $oMenuAdminModel->getMenus();
-            Context::set('menu_list', $menu_list);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('menu_list..title');					
-			$security->encodeHTML('selected_layout.');
-			
-			/*이미지 명칭 &도 같이 변환됨			
-			$security->encodeHTML('selected_layout.layout_title');
-			$security->encodeHTML('selected_layout.extra_var..value');
-			$security->encodeHTML('selected_layout.extra_var..option..'); */
-			
-            $this->setTemplateFile('layout_modify');
-        }
-
-        /**
-         * @brief 레이아웃 코드 편집
-         **/
-        function dispLayoutAdminEdit() {
-            // 선택된 레이아웃의 정보르 구해서 세팅
-            $layout_srl = Context::get('layout_srl');
-
-            // 레이아웃의 정보를 가져옴
-            $oLayoutModel = &getModel('layout');
-            $layout_info = $oLayoutModel->getLayout($layout_srl);
-
-            // 등록된 레이아웃이 없으면 오류 표시
-            if(!$layout_info) return $this->dispLayoutAdminContent();
-            Context::set('selected_layout', $layout_info);
-
-            // 레이아웃 코드 가져오기
-            $oLayoutModel = &getModel('layout');
-            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
-            if(!file_exists($layout_file)){
-                // faceoff 면
-                if($oLayoutModel->useDefaultLayout($layout_info->layout_srl)){
-                    $layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
-                }else{
-                    $layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
-                }
-            }
-
-            $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
-            if(file_exists($layout_css_file)){
-                $layout_code_css = FileHandler::readFile($layout_css_file);
-                Context::set('layout_code_css', $layout_code_css);
-            }
-
-            $layout_code = FileHandler::readFile($layout_file);
-            Context::set('layout_code', $layout_code);
-
-            // set User Images
-            $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_info->layout_srl);
-            Context::set('layout_image_list', $layout_image_list);
-
-            $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_info->layout_srl);
-            Context::set('layout_image_path', $layout_image_path);
-
-            // 위젯 목록을 세팅
-            $oWidgetModel = &getModel('widget');
-            $widget_list = $oWidgetModel->getDownloadedWidgetList();
-            Context::set('widget_list', $widget_list);
-
-            $this->setTemplateFile('layout_edit');
-        }
-
-        /**
-         * @brief 레이아웃 목록을 보여줌
-         **/
-        function dispLayoutAdminDownloadedList() {
-            // 레이아웃 목록을 세팅
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getDownloadedLayoutList();
-            Context::set('layout_list', $layout_list);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..');	
-			$security->encodeHTML('layout_list..author..');	
-			
-            $this->setTemplateFile('downloaded_layout_list');
-        }
-
-		function dispLayoutAdminDownloadedMobileList() {
-            // 레이아웃 목록을 세팅
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getDownloadedLayoutList(0, "M");
-            Context::set('layout_list', $layout_list);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..');	
-			$security->encodeHTML('layout_list..author..');	
-			
-            $this->setTemplateFile('downloaded_mlayout_list');
-		}
-
-        /**
-         * @brief 레이아웃 미리 보기
-         **/
-        function dispLayoutAdminPreview() {
-            $layout_srl = Context::get('layout_srl');
-            $code = Context::get('code');
-            $code_css = Context::get('code_css');
-            if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
-
-            // 레이아웃 정보 가져오기
-            $oLayoutModel = &getModel('layout');
-            $layout_info = $oLayoutModel->getLayout($layout_srl);
-            if(!$layout_info) return new Object(-1, 'msg_invalid_request');
-
-            // faceoff 레이아웃일 경우 별도 처리
-            if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
-
-            // 직접 입력된 CSS 적용
-            Context::addHtmlHeader("<style type=\"text/css\" charset=\"UTF-8\">".$code_css."</style>");
-
-            // 레이아웃 정보중 extra_vars의 이름과 값을 $layout_info에 입력
-            if($layout_info->extra_var_count) {
-                foreach($layout_info->extra_var as $var_id => $val) {
-                    $layout_info->{$var_id} = $val->value;
-                }
-            }
-
-            // 레이아웃 정보중 menu를 Context::set
-            if($layout_info->menu_count) {
-                foreach($layout_info->menu as $menu_id => $menu) {
-                    if(file_exists($menu->php_file)) @include($menu->php_file);
-                    Context::set($menu_id, $menu);
-                }
-            }
-
-            Context::set('layout_info', $layout_info);
-            Context::set('content', Context::getLang('layout_preview_content'));
-
-            // 코드를 임시로 저장
-            $edited_layout_file = sprintf('./files/cache/layout/tmp.tpl');
-            FileHandler::writeFile($edited_layout_file, $code);
-
-            // 컴파일
-            $oTemplate = &TemplateHandler::getInstance();
-
-            $layout_path = $layout_info->path;
-            $layout_file = 'layout';
-
-            $layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
-            Context::set('layout','none');
-
-            // 위젯등을 변환
-            $oContext = &Context::getInstance();
-            Context::set('layout_tpl', $layout_tpl);
-
-            // 임시 파일 삭제
-            FileHandler::removeFile($edited_layout_file);
-            $this->setTemplateFile('layout_preview');
-
-        }
-
-        /**
-         * @brief 레이아웃의 상세 정보(conf/info.xml)를 팝업 출력
-         **/
-        function dispLayoutAdminInfo() {
-            // 선택된 레이아웃 정보를 구함
-            $oLayoutModel = &getModel('layout');
-            $layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
-            Context::set('layout_info', $layout_info);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');			
-			
-			$security = new Security();
-			$security->encodeHTML('layout_list..');	
-			$security->encodeHTML('layout_list..author..');				
-			$security->encodeHTML('layout_list..history..');
-			$security->encodeHTML('layout_list..history..author..');				
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('layout_detail_info');
-        }
-
-
-        /**
-         * @brief faceoff의 관리자 layout 수정
-         **/
-        function dispLayoutAdminLayoutModify(){
-            //layout_srl 를 가져온다
-            $current_module_info = Context::get('current_module_info');
-            $layout_srl = $current_module_info->layout_srl;
-
-            // 파일로 임시저장을 하기때문에 남아 있을지 모르는 tmp를 지운다
-            // to do 개선이 필요
-            $delete_tmp = Context::get('delete_tmp');
-            if($delete_tmp =='Y'){
-                $oLayoutAdminController = &getAdminController('layout');
-                $oLayoutAdminController->deleteUserLayoutTempFile($layout_srl);
-            }
-
-            $oLayoutModel = &getModel('layout');
-
-            // layout file들은 temp로 사용한다.
-            $oLayoutModel->setUseUserLayoutTemp();
-
-            // css 를 inline style로 뽑는다
-            $faceoffcss = $oLayoutModel->_getUserLayoutFaceOffCss($current_module_info->layout_srl);
-
-            $css = FileHandler::readFile($faceoffcss);
-            $match = null;
-            preg_match_all('/([^\{]+)\{([^\}]*)\}/is',$css,$match);
-            for($i=0,$c=count($match[1]);$i<$c;$i++) {
-                $name = trim($match[1][$i]);
-                $css = trim($match[2][$i]);
-                if(!$css) continue;
-                $css = str_replace('./images/',Context::getRequestUri().$oLayoutModel->getUserLayoutImagePath($layout_srl),$css);
-                $style[] .= sprintf('"%s":"%s"',$name,$css);
-            }
-
-            if(count($style)) {
-                $script = '<script type="text/javascript"> var faceOffStyle = {'.implode(',',$style).'}; </script>';
-                Context::addHtmlHeader($script);
-            }
-
-            $oTemplate = &TemplateHandler::getInstance();
-            Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff'));
-
-            // 위젯 코드를 Javascript 수정모드로 변경
-            $oWidgetController = &getController('widget');
-            $oWidgetController->setWidgetCodeInJavascriptMode();
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('faceoff_layout_edit');
-        }
-
-        function dispLayoutAdminLayoutImageList(){
-            $layout_srl = Context::get('layout_srl');
-            $oLayoutModel = &getModel('layout');
-
-            // 이미지 목록
-            $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_srl);
-            Context::set('layout_image_list',$layout_image_list);
-
-            // 경로
-            $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
-            Context::set('layout_image_path',$layout_image_path);
-
-            $this->setLayoutFile('popup_layout');
-
-            $this->setTemplateFile('layout_image_list');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  layoutAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the layout module
+     **/
+
+    class layoutAdminView extends layout {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+		/**
+		 * @brief Display a installed layout list
+		 **/
+		function dispLayoutAdminInstalledList() {
+			// Set a layout list
+			$oLayoutModel = &getModel('layout');
+			$layout_list = $oLayoutModel->getDownloadedLayoutList('P', true);
+			
+			// get Theme layout
+			$oAdminModel = &getAdminModel('admin');
+			$themeList = $oAdminModel->getThemeList();
+			$themeLayoutList = array();
+			foreach($themeList as $themeInfo){
+				if(strpos($themeInfo->layout_info->name, '.') === false) continue;
+				$themeLayoutList[] = $oLayoutModel->getLayoutInfo($themeInfo->layout_info->name, null, 'P');
+			}
+			$layout_list = array_merge($layout_list, $themeLayoutList);
+			$layout_list[] = $oLayoutModel->getLayoutInfo('faceoff', null, 'P');
+			Context::set('type', 'P');
+
+			$pcLayoutCount = $oLayoutModel->getInstalledLayoutCount('P');
+			$mobileLayoutCount = $oLayoutModel->getInstalledLayoutCount('M');
+			Context::set('pcLayoutCount', $pcLayoutCount);
+			Context::set('mobileLayoutCount', $mobileLayoutCount);
+			$this->setTemplateFile('installed_layout_list');
+
+			$security = new Security($layout_list);
+			$layout_list = $security->encodeHTML('..', '..author..');
+			
+			//Security
+			$security = new Security();
+			$security->encodeHTML('layout_list..layout','layout_list..title');						
+			
+			foreach($layout_list as $no => $layout_info)
+			{
+				$layout_list[$no]->description = nl2br(trim($layout_info->description));
+			}
+			Context::set('layout_list', $layout_list);
+		}
+
+		/**
+		 * @brief Display a installed mobile layout list
+		 */
+		function dispLayoutAdminInstalledMobileList() {
+			// Set a layout list
+			$oLayoutModel = &getModel('layout');
+			$layout_list = $oLayoutModel->getDownloadedLayoutList('M', true);
+			Context::set('type', 'M');
+
+			$pcLayoutCount = $oLayoutModel->getInstalledLayoutCount('P');
+			$mobileLayoutCount = $oLayoutModel->getInstalledLayoutCount('M');
+			Context::set('pcLayoutCount', $pcLayoutCount);
+			Context::set('mobileLayoutCount', $mobileLayoutCount);
+			$this->setTemplateFile('installed_layout_list');
+
+			$security = new Security($layout_list);
+			$layout_info = $security->encodeHTML('..', '..author..');
+
+			foreach($layout_list as $no => $layout_info)
+			{
+				$layout_list[$no]->description = nl2br(trim($layout_info->description));
+			}
+			Context::set('layout_list', $layout_list);
+		}
+
+		/**
+		 * @brief Display list of pc layout instance
+		 */
+		function dispLayoutAdminInstanceList()
+		{
+			$type = Context::get('type');
+			$layout = Context::get('layout');
+
+			if (!in_array($type, array('P', 'M'))) $type = 'P';
+			if (!$layout) return $this->stop('msg_invalid_request');
+
+			$oLayoutModel = &getModel('layout');
+			$layout_info = $oLayoutModel->getLayoutInfo($layout, null, $type);
+			if (!$layout_info) return $this->stop('msg_invalid_request');
+
+			Context::set('layout_info', $layout_info);
+
+			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
+			$layout_list = $oLayoutModel->getLayoutInstanceList(0, $type, $layout, $columnList);
+			Context::set('layout_list', $layout_list);
+
+			$this->setTemplateFile('layout_instance_list');
+
+			$security = new Security();
+			$security->encodeHTML('layout_list..');
+		}
+
+        /**
+         * @brief Layout setting page
+         * Once select a layout with empty value in the DB, then adjust values
+         **/
+        function dispLayoutAdminInsert() {
+			$oModel = &getModel('layout');
+			$type = Context::get('type');
+			if (!in_array($type, array('P', 'M'))) $type = 'P';
+			
+			//Security
+			$security = new Security();
+			$security->encodeHTML('layout_list..layout','layout_list..title');						
+
+			// Get layout info
+			$layout = Context::get('layout');
+			if ($layout == 'faceoff') return $this->stop('not supported');
+
+			$layout_info = $oModel->getLayoutInfo($layout, null, $type);
+			if (!$layout_info) return $this->stop('msg_invalid_request');
+
+			// get Menu list
+			$oMenuAdminModel = &getAdminModel('menu');
+			$menu_list = $oMenuAdminModel->getMenus();
+			Context::set('menu_list', $menu_list);
+
+			$security = new Security();
+			$security->encodeHTML('menu_list..');
+
+			$security = new Security($layout_info);
+			$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..', 'extra_var....');
+
+			$layout_info->description = nl2br(trim($layout_info->description));
+			if (!is_object($layout_info->extra_var)) $layout_info->extra_var = new StdClass();
+			foreach($layout_info->extra_var as $var_name => $val)
+			{
+				if (isset($layout_info->{$var_name}->description))
+					$layout_info->{$var_name}->description = nl2br(trim($val->description));
+			}
+			Context::set('selected_layout', $layout_info);
+
+			$this->setTemplateFile('layout_modify');
+        }
+
+		/**
+         * @brief Insert Layout details
+         **/
+        function dispLayoutAdminModify() {
+            // Set the layout after getting layout information
+            $layout_srl = Context::get('layout_srl');
+
+			// Get layout information
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayout($layout_srl);
+
+			// Error appears if there is no layout information is registered
+            if(!$layout_info) return $this->stop('msg_invalid_request');
+
+            // If faceoff, no need to display the path
+            if($layout_info->type == 'faceoff') unset($layout_info->path);
+
+            // Get a menu list
+            $oMenuAdminModel = &getAdminModel('menu');
+            $menu_list = $oMenuAdminModel->getMenus();
+            Context::set('menu_list', $menu_list);
+
+			$security = new Security();
+			$security->encodeHTML('menu_list..');
+
+			$security = new Security($layout_info);
+			$layout_info = $security->encodeHTML('.', 'author..', 'extra_var..');
+
+			$layout_info->description = nl2br(trim($layout_info->description));
+			if (!is_object($layout_info->extra_var)) $layout_info->extra_var = new StdClass();
+			foreach($layout_info->extra_var as $var_name => $val)
+			{
+				if (isset($layout_info->{$var_name}->description))
+					$layout_info->{$var_name}->description = nl2br(trim($val->description));
+			}
+			Context::set('selected_layout', $layout_info);
+
+			$this->setTemplateFile('layout_modify');
+        }
+
+		// deprecated
+        /**
+         * @brief The first page of the layout admin
+         **/
+        function dispLayoutAdminContent() {
+			$path = Context::get('path');
+			if (!$path) return $this->stop('msg_invalid_request');
+
+            $oLayoutModel = &getModel('layout');
+			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
+            $layout_list = $oLayoutModel->getLayoutList(0, 'P', $columnList);
+            Context::set('layout_list', $layout_list);
+
+            $this->setTemplateFile('index');
+        }
+
+		// deprecated
+		function dispLayoutAdminMobileContent() {
+            $oLayoutModel = &getModel('layout');
+			$columnList = array('layout_srl', 'layout', 'module_srl', 'title', 'regdate');
+            $layout_list = $oLayoutModel->getLayoutList(0, 'M', $columnList);
+            Context::set('layout_list', $layout_list);
+
+            $this->setTemplateFile('mindex');
+
+		}
+
+        /**
+         * @brief Edit layout codes
+         **/
+        function dispLayoutAdminEdit() {
+            // Set the layout with its information
+            $layout_srl = Context::get('layout_srl');
+            // Get layout information
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayout($layout_srl);
+            // Error appears if there is no layout information is registered
+            if(!$layout_info) return $this->dispLayoutAdminContent();
+
+            // Get Layout Code
+            $oLayoutModel = &getModel('layout');
+            $layout_file = $oLayoutModel->getUserLayoutHtml($layout_info->layout_srl);
+            if(!file_exists($layout_file)){
+                // If faceoff
+                if($oLayoutModel->useDefaultLayout($layout_info->layout_srl)){
+                    $layout_file  = $oLayoutModel->getDefaultLayoutHtml($layout_info->layout);
+                }else{
+                    $layout_file = sprintf('%s%s', $layout_info->path, 'layout.html');
+                }
+            }
+
+            $layout_css_file = $oLayoutModel->getUserLayoutCss($layout_info->layout_srl);
+            if(file_exists($layout_css_file)){
+                $layout_code_css = FileHandler::readFile($layout_css_file);
+                Context::set('layout_code_css', $layout_code_css);
+            }
+
+            $layout_code = FileHandler::readFile($layout_file);
+            Context::set('layout_code', $layout_code);
+
+            // set User Images
+            $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_info->layout_srl);
+            Context::set('layout_image_list', $layout_image_list);
+
+            $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_info->layout_srl);
+            Context::set('layout_image_path', $layout_image_path);
+            // Set widget list
+            $oWidgetModel = &getModel('widget');
+            $widget_list = $oWidgetModel->getDownloadedWidgetList();
+            Context::set('widget_list', $widget_list);
+
+            $this->setTemplateFile('layout_edit');
+
+			$security = new Security($layout_info);
+			$layout_info = $security->encodeHTML('.', '.author..');
+			Context::set('selected_layout', $layout_info);
+			
+			//Security
+			$security = new Security();
+			$security->encodeHTML('layout_list..');	
+			$security->encodeHTML('layout_list..author..');	
+			
+			$security = new Security();
+			$security->encodeHTML('layout_code_css', 'layout_code', 'widget_list..title');
+        }
+
+        /**
+         * @brief Preview a layout
+         **/
+        function dispLayoutAdminPreview() {
+            $layout_srl = Context::get('layout_srl');
+            $code = Context::get('code');
+            $code_css = Context::get('code_css');
+            if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
+            // Get the layout information
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayout($layout_srl);
+            if(!$layout_info) return new Object(-1, 'msg_invalid_request');
+            // Separately handle the layout if its type is faceoff
+            if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
+            // Apply CSS directly
+            Context::addHtmlHeader("<style type=\"text/css\" charset=\"UTF-8\">".$code_css."</style>");
+            // Set names and values of extra_vars to $layout_info
+            if($layout_info->extra_var_count) {
+                foreach($layout_info->extra_var as $var_id => $val) {
+                    $layout_info->{$var_id} = $val->value;
+                }
+            }
+            // menu in layout information becomes an argument for Context:: set
+            if($layout_info->menu_count) {
+                foreach($layout_info->menu as $menu_id => $menu) {
+                    if(file_exists($menu->php_file)) @include($menu->php_file);
+                    Context::set($menu_id, $menu);
+                }
+            }
+
+            Context::set('layout_info', $layout_info);
+            Context::set('content', Context::getLang('layout_preview_content'));
+            // Temporary save the codes
+            $edited_layout_file = sprintf('./files/cache/layout/tmp.tpl');
+            FileHandler::writeFile($edited_layout_file, $code);
+
+            // Compile
+            $oTemplate = &TemplateHandler::getInstance();
+
+            $layout_path = $layout_info->path;
+            $layout_file = 'layout';
+
+            $layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
+            Context::set('layout','none');
+            // Convert widgets and others
+            $oContext = &Context::getInstance();
+            Context::set('layout_tpl', $layout_tpl);
+            // Delete Temporary Files
+            FileHandler::removeFile($edited_layout_file);
+            $this->setTemplateFile('layout_preview');
+
+        }
+
+		// deprecated
+        /**
+         * @brief Pop-up details of the layout(conf/info.xml)
+         **/
+        function dispLayoutAdminInfo() {
+            // Get the layout information
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
+            Context::set('layout_info', $layout_info);
+            // Set the layout to be pop-up
+            $this->setLayoutFile('popup_layout');			
+			
+			$security = new Security();
+			$security->encodeHTML('layout_list..');	
+			$security->encodeHTML('layout_list..author..');				
+			$security->encodeHTML('layout_list..history..');
+			$security->encodeHTML('layout_list..history..author..');				
+            // Set a template file
+            $this->setTemplateFile('layout_detail_info');
+        }
+
+		// deprecated
+        /**
+         * @brief Modify admin layout of faceoff
+         **/
+        function dispLayoutAdminLayoutModify(){
+            // Get layout_srl
+            $current_module_info = Context::get('current_module_info');
+            $layout_srl = $current_module_info->layout_srl;
+            // Remove the remaining tmp files because of temporarily saving
+            // This part needs to be modified
+            $delete_tmp = Context::get('delete_tmp');
+            if($delete_tmp =='Y'){
+                $oLayoutAdminController = &getAdminController('layout');
+                $oLayoutAdminController->deleteUserLayoutTempFile($layout_srl);
+            }
+
+            $oLayoutModel = &getModel('layout');
+            // layout file is used as a temp.
+            $oLayoutModel->setUseUserLayoutTemp();
+            // Apply CSS in inline style
+            $faceoffcss = $oLayoutModel->_getUserLayoutFaceOffCss($current_module_info->layout_srl);
+
+            $css = FileHandler::readFile($faceoffcss);
+            $match = null;
+            preg_match_all('/([^\{]+)\{([^\}]*)\}/is',$css,$match);
+            for($i=0,$c=count($match[1]);$i<$c;$i++) {
+                $name = trim($match[1][$i]);
+                $css = trim($match[2][$i]);
+                if(!$css) continue;
+                $css = str_replace('./images/',Context::getRequestUri().$oLayoutModel->getUserLayoutImagePath($layout_srl),$css);
+                $style[] .= sprintf('"%s":"%s"',$name,$css);
+            }
+
+            if(count($style)) {
+                $script = '<script type="text/javascript"> var faceOffStyle = {'.implode(',',$style).'}; </script>';
+                Context::addHtmlHeader($script);
+            }
+
+            $oTemplate = &TemplateHandler::getInstance();
+            Context::set('content', $oTemplate->compile($this->module_path.'tpl','about_faceoff'));
+            // Change widget codes in Javascript mode
+            $oWidgetController = &getController('widget');
+            $oWidgetController->setWidgetCodeInJavascriptMode();
+            // Set a template file
+            $this->setTemplateFile('faceoff_layout_edit');
+        }
+
+		// deprecated
+        function dispLayoutAdminLayoutImageList(){
+            $layout_srl = Context::get('layout_srl');
+            $oLayoutModel = &getModel('layout');
+            // Image List
+            $layout_image_list = $oLayoutModel->getUserLayoutImageList($layout_srl);
+            Context::set('layout_image_list',$layout_image_list);
+            // Path
+            $layout_image_path = $oLayoutModel->getUserLayoutImagePath($layout_srl);
+            Context::set('layout_image_path',$layout_image_path);
+
+            $this->setLayoutFile('popup_layout');
+
+            $this->setTemplateFile('layout_image_list');
+        }
+    }
+?>
diff --git a/modules/layout/layout.class.php b/modules/layout/layout.class.php
index f207fa2e4..387fd8746 100644
--- a/modules/layout/layout.class.php
+++ b/modules/layout/layout.class.php
@@ -1,93 +1,81 @@
-<?php
-    /**
-     * @class  layout
-     * @author NHN (developers@xpressengine.com)
-     * @brief  layout 모듈의 high class
-     **/
-
-    class layout extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // 레이아웃에서 사용할 디렉토리 생성
-            FileHandler::makeDir('./files/cache/layout');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-
-            // 2009. 02. 11 layout 테이블에 site_srl 추가
-            if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
-
-            // 2009. 02. 26 faceOff에 맞춰 기존 레이아웃 편집본을 이동
-            $files = FileHandler::readDir('./files/cache/layout');
-            for($i=0,$c=count($files);$i<$c;$i++) {
-                $filename = $files[$i];
-                if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
-            }
-
-			if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-
-            // 2009. 02. 11 menu 테이블에 site_srl 추가
-            if(!$oDB->isColumnExists('layouts', 'site_srl')) {
-                $oDB->addColumn('layouts','site_srl','number',11,0,true);
-            }
-
-            // 2009. 02. 26 faceOff에 맞춰 기존 레이아웃 편집본을 이동
-            $oLayoutModel = &getModel('layout');
-            $files = FileHandler::readDir('./files/cache/layout');
-            for($i=0,$c=count($files);$i<$c;$i++) {
-                $filename = $files[$i];
-                if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
-                $layout_srl = $match[1];
-                if(!$layout_srl) continue;
-                $path = $oLayoutModel->getUserLayoutPath($layout_srl);
-                if(!is_dir($path)) FileHandler::makeDir($path);
-                FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
-                @unlink('./files/cache/layout/'.$filename);
-            }
-
-			if(!$oDB->isColumnExists('layouts', 'layout_type')) {
-                $oDB->addColumn('layouts','layout_type','char',1,'P',true);
-			}
-
-            return new Object(0, 'success_updated');
-        }
-
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 레이아웃 캐시 삭제 (수정본은 지우지 않음)
-            $path = './files/cache/layout';
-            if(!is_dir($path)) {
-                FileHandler::makeDir($path);
-                return;
-            }
-
-            $directory = dir($path);
-            while($entry = $directory->read()) {
-                if ($entry == "." || $entry == ".." || preg_match('/\.html$/i',$entry) ) continue;
-                FileHandler::removeFile($path."/".$entry);
-            }
-            $directory->close();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  layout
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the layout module 
+     **/
+
+    class layout extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Create a directory to be used in the layout
+            FileHandler::makeDir('./files/cache/layout');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            // 2009. 02. 11 Add site_srl to layout table
+            if(!$oDB->isColumnExists('layouts', 'site_srl')) return true;
+            // 2009. 02. 26 Move the previous layout for faceoff
+            $files = FileHandler::readDir('./files/cache/layout');
+            for($i=0,$c=count($files);$i<$c;$i++) {
+                $filename = $files[$i];
+                if(preg_match('/([0-9]+)\.html/i',$filename)) return true;
+            }
+
+			if(!$oDB->isColumnExists('layouts', 'layout_type')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            // 2009. 02. 11 Add site_srl to menu table
+            if(!$oDB->isColumnExists('layouts', 'site_srl')) {
+                $oDB->addColumn('layouts','site_srl','number',11,0,true);
+            }
+            // 2009. 02. 26 Move the previous layout for faceoff
+            $oLayoutModel = &getModel('layout');
+            $files = FileHandler::readDir('./files/cache/layout');
+            for($i=0,$c=count($files);$i<$c;$i++) {
+                $filename = $files[$i];
+                if(!preg_match('/([0-9]+)\.html/i',$filename,$match)) continue;
+                $layout_srl = $match[1];
+                if(!$layout_srl) continue;
+                $path = $oLayoutModel->getUserLayoutPath($layout_srl);
+                if(!is_dir($path)) FileHandler::makeDir($path);
+                FileHandler::copyFile('./files/cache/layout/'.$filename, $path.'layout.html');
+                @unlink('./files/cache/layout/'.$filename);
+            }
+
+			if(!$oDB->isColumnExists('layouts', 'layout_type')) {
+                $oDB->addColumn('layouts','layout_type','char',1,'P',true);
+			}
+
+            return new Object(0, 'success_updated');
+        }
+
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+            $path = './files/cache/layout';
+            if(!is_dir($path)) {
+                FileHandler::makeDir($path);
+                return;
+            }
+        }
+    }
+?>
diff --git a/modules/layout/layout.model.php b/modules/layout/layout.model.php
index 85f235a34..9bdfe4f88 100644
--- a/modules/layout/layout.model.php
+++ b/modules/layout/layout.model.php
@@ -1,631 +1,693 @@
-<?php
-    /**
-     * @class  layoutModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief  layout 모듈의 Model class
-     **/
-
-    class layoutModel extends layout {
-
-        var $useUserLayoutTemp = null;
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief DB 에 생성된 레이아웃의 목록을 구함
-         * 생성되었다는 것은 DB에 등록이 되었다는 것을 의미
-         **/
-        function getLayoutList($site_srl = 0, $layout_type="P") {
-            if(!$site_srl) {
-                $site_module_info = Context::get('site_module_info');
-                $site_srl = (int)$site_module_info->site_srl;
-            }
-            $args->site_srl = $site_srl;
-			$args->layout_type = $layout_type;
-            $output = executeQuery('layout.getLayoutList', $args);
-            if(!$output->data) return;
-            if(is_array($output->data)) return $output->data;
-            return array($output->data);
-        }
-
-        /**
-         * @brief DB 에 생성된 한개의 레이아웃 정보를 구함
-         * 생성된 레이아웃의 DB정보+XML정보를 return
-         **/
-        function getLayout($layout_srl) {
-            // 일단 DB에서 정보를 가져옴
-            $args->layout_srl = $layout_srl;
-            $output = executeQuery('layout.getLayout', $args);
-            if(!$output->data) return;
-
-            // layout, extra_vars를 정리한 후 xml 파일 정보를 정리해서 return
-            $layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
-            return $layout_info;
-        }
-
-        /**
-         * @brief 레이아웃의 경로를 구함
-         **/
-        function getLayoutPath($layout_name, $layout_type = "P") {
-            if($layout_name == 'faceoff'){
-                $class_path = './modules/layout/faceoff/';
-            }else if($layout_type == "M") {
-				$class_path = sprintf("./m.layouts/%s/", $layout_name);
-			}
-			else
-			{
-                $class_path = sprintf('./layouts/%s/', $layout_name);
-            }
-            if(is_dir($class_path)) return $class_path;
-            return "";
-        }
-
-        /**
-         * @brief 레이아웃의 종류와 정보를 구함
-         * 다운로드되어 있는 레이아웃의 종류 (생성과 다른 의미)
-         **/
-        function getDownloadedLayoutList($layout_type = "P") {
-            // 다운받은 레이아웃과 설치된 레이아웃의 목록을 구함
-			if($layout_type == "M")
-			{
-				$directory = "./m.layouts";
-			}
-			else
-			{
-				$directory = "./layouts";
-			}
-
-            $searched_list = FileHandler::readDir($directory);
-            $searched_count = count($searched_list);
-            if(!$searched_count) return;
-
-            natcasesort($searched_list);
-
-            // 찾아진 레이아웃 목록을 loop돌면서 필요한 정보를 간추려 return
-            for($i=0;$i<$searched_count;$i++) {
-                // 레이아웃의 이름
-                $layout = $searched_list[$i];
-
-                // 해당 레이아웃의 정보를 구함
-                $layout_info = $this->getLayoutInfo($layout, null, $layout_type);
-
-                $list[] = $layout_info;
-            }
-            return $list;
-        }
-
-        /**
-         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
-         * 이것 역시 캐싱을 통해서 xml parsing 시간을 줄인다..
-         **/
-        function getLayoutInfo($layout, $info = null, $layout_type = "P") {
-            if($info) {
-                $layout_title = $info->title;
-                $layout = $info->layout;
-                $layout_srl = $info->layout_srl;
-                $site_srl = $info->site_srl;
-                $vars = unserialize($info->extra_vars);
-
-                if($info->module_srl) {
-                    $layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/','',$info->layout_path);
-                    $xml_file = sprintf('%sskin.xml', $layout_path);
-                }
-            }
-
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
-            if(!is_dir($layout_path)) return;
-
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
-            if(!file_exists($xml_file)) {
-                $layout_info->layout = $layout;
-                $layout_info->path = $layout_path;
-                $layout_info->layout_title = $layout_title;
-				if(!$layout_info->layout_type)
-					$layout_info->layout_type =  $layout_type;
-                return $layout_info;
-            }
-
-            // cache 파일을 비교하여 문제 없으면 include하고 $layout_info 변수를 return
-            if(!$layout_srl){
-                $cache_file = $this->getLayoutCache($layout, Context::getLangType());
-            }else{
-                $cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
-            }
-            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
-                @include($cache_file);
-
-                if($layout_info->extra_var && $vars) {
-                    foreach($vars as $key => $value) {
-                        if(!$layout_info->extra_var->{$key} && !$layout_info->{$key}) {
-                            $layout_info->{$key} = $value;
-                        }
-                    }
-                }
-                return $layout_info;
-            }
-
-            // cache 파일이 없으면 xml parsing하고 변수화 한 후에 캐시 파일에 쓰고 변수 바로 return
-            $oXmlParser = new XmlParser();
-            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-            if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
-            elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
-
-            if(!$xml_obj) return;
-
-            $buff = '';
-            $buff .= sprintf('$layout_info->site_srl = "%s";', $site_srl);
-
-            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
-                // 레이아웃의 제목, 버전
-                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $buff .= sprintf('$layout_info->layout = "%s";', $layout);
-                $buff .= sprintf('$layout_info->type = "%s";', $xml_obj->attrs->type);
-                $buff .= sprintf('$layout_info->path = "%s";', $layout_path);
-                $buff .= sprintf('$layout_info->title = "%s";', $xml_obj->title->body);
-                $buff .= sprintf('$layout_info->description = "%s";', $xml_obj->description->body);
-                $buff .= sprintf('$layout_info->version = "%s";', $xml_obj->version->body);
-                $buff .= sprintf('$layout_info->date = "%s";', $date);
-                $buff .= sprintf('$layout_info->homepage = "%s";', $xml_obj->link->body);
-                $buff .= sprintf('$layout_info->layout_srl = $layout_srl;');
-                $buff .= sprintf('$layout_info->layout_title = $layout_title;');
-                $buff .= sprintf('$layout_info->license = "%s";', $xml_obj->license->body);
-                $buff .= sprintf('$layout_info->license_link = "%s";', $xml_obj->license->attrs->link);
-				$buff .= sprintf('$layout_info->layout_type = "%s";', $layout_type);
-
-                // 작성자 정보
-                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-                else $author_list = $xml_obj->author;
-
-                for($i=0; $i < count($author_list); $i++) {
-                    $buff .= sprintf('$layout_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
-                    $buff .= sprintf('$layout_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
-                    $buff .= sprintf('$layout_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
-                }
-
-
-
-                // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-                $extra_var_groups = $xml_obj->extra_vars->group;
-                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-                foreach($extra_var_groups as $group){
-                    $extra_vars = $group->var;
-                    if($extra_vars) {
-                        if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-
-                        $extra_var_count = count($extra_vars);
-
-                        $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
-                        for($i=0;$i<$extra_var_count;$i++) {
-                            unset($var);
-                            unset($options);
-                            $var = $extra_vars[$i];
-                            $name = $var->attrs->name;
-
-                            $buff .= sprintf('$layout_info->extra_var->%s->group = "%s";', $name, $group->title->body);
-                            $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
-                            $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
-                            $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-                            $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
-
-                            $options = $var->options;
-                            if(!$options) continue;
-
-                            if(!is_array($options)) $options = array($options);
-                            $options_count = count($options);
-                            $thumbnail_exist = false;
-                            for($j=0; $j < $options_count; $j++) {
-                                $thumbnail = $options[$j]->attrs->src;
-                                if($thumbnail) {
-                                    $thumbnail = $layout_path.$thumbnail;
-                                    if(file_exists($thumbnail)) {
-                                        $buff .= sprintf('$layout_info->extra_var->%s->options["%s"]->thumbnail = "%s";', $var->attrs->name, $options[$j]->attrs->value, $thumbnail);
-                                        if(!$thumbnail_exist) {
-                                            $buff .= sprintf('$layout_info->extra_var->%s->thumbnail_exist = true;', $var->attrs->name);
-                                            $thumbnail_exist = true;
-                                        }
-                                    }
-                                }
-                                $buff .= sprintf('$layout_info->extra_var->%s->options["%s"]->val = "%s";', $var->attrs->name, $options[$j]->attrs->value, $options[$j]->title->body);
-
-                            }
-                        }
-                    }
-                }
-
-                // 메뉴
-                if($xml_obj->menus->menu) {
-                    $menus = $xml_obj->menus->menu;
-                    if(!is_array($menus)) $menus = array($menus);
-
-                    $menu_count = count($menus);
-                    $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count);
-                    for($i=0;$i<$menu_count;$i++) {
-                        $name = $menus[$i]->attrs->name;
-                        if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $name);
-                        $buff .= sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
-                        $buff .= sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
-                        $buff .= sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->attrs->maxdepth);
-
-                        $buff .= sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-                        $buff .= sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-                        $buff .= sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
-                    }
-                }
-
-
-                // history
-                if($xml_obj->history) {
-                    if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
-                    else $history_list = $xml_obj->history;
-
-                    for($i=0; $i < count($history_list); $i++) {
-                        sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                        $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                        $buff .= sprintf('$layout_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
-                        $buff .= sprintf('$layout_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
-                        $buff .= sprintf('$layout_info->history['.$i.']->date = "%s";', $date);
-
-                        if($history_list[$i]->author) {
-                            (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
-
-                            for($j=0; $j < count($obj->author_list); $j++) {
-                                $buff .= sprintf('$layout_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
-                                $buff .= sprintf('$layout_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
-                                $buff .= sprintf('$layout_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
-                            }
-                        }
-
-                        if($history_list[$i]->log) {
-                            (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
-
-                            for($j=0; $j < count($obj->log_list); $j++) {
-                                $buff .= sprintf('$layout_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
-                                $buff .= sprintf('$layout_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
-                            }
-                        }
-                    }
-                }
-
-
-
-            } else {
-
-                // 레이아웃의 제목, 버전
-                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $buff .= sprintf('$layout_info->layout = "%s";', $layout);
-                $buff .= sprintf('$layout_info->path = "%s";', $layout_path);
-                $buff .= sprintf('$layout_info->title = "%s";', $xml_obj->title->body);
-                $buff .= sprintf('$layout_info->description = "%s";', $xml_obj->author->description->body);
-                $buff .= sprintf('$layout_info->version = "%s";', $xml_obj->attrs->version);
-                $buff .= sprintf('$layout_info->date = "%s";', $date);
-                $buff .= sprintf('$layout_info->layout_srl = $layout_srl;');
-                $buff .= sprintf('$layout_info->layout_title = $layout_title;');
-
-                // 작성자 정보
-                $buff .= sprintf('$layout_info->author[0]->name = "%s";', $xml_obj->author->name->body);
-                $buff .= sprintf('$layout_info->author[0]->email_address = "%s";', $xml_obj->author->attrs->email_address);
-                $buff .= sprintf('$layout_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
-
-                // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-                $extra_var_groups = $xml_obj->extra_vars->group;
-                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-                foreach($extra_var_groups as $group){
-                    $extra_vars = $group->var;
-                    if($extra_vars) {
-                        if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-
-                        $extra_var_count = count($extra_vars);
-
-                        $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
-                        for($i=0;$i<$extra_var_count;$i++) {
-                            unset($var);
-                            unset($options);
-                            $var = $extra_vars[$i];
-                            $name = $var->attrs->name;
-
-                            $buff .= sprintf('$layout_info->extra_var->%s->group = "%s";', $name, $group->title->body);
-                            $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
-                            $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
-                            $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
-                            $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
-
-                            $options = $var->options;
-                            if(!$options) continue;
-
-                            if(!is_array($options)) $options = array($options);
-                            $options_count = count($options);
-                            for($j=0;$j<$options_count;$j++) {
-                                $buff .= sprintf('$layout_info->extra_var->%s->options["%s"] = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body);
-                            }
-                        }
-                    }
-                }
-
-                // 메뉴
-                if($xml_obj->menus->menu) {
-                    $menus = $xml_obj->menus->menu;
-                    if(!is_array($menus)) $menus = array($menus);
-
-                    $menu_count = count($menus);
-                    $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count);
-                    for($i=0;$i<$menu_count;$i++) {
-                        $name = $menus[$i]->attrs->name;
-                        if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $name);
-                        $buff .= sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
-                        $buff .= sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
-                        $buff .= sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->maxdepth->body);
-
-                        $buff .= sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
-                        $buff .= sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
-                        $buff .= sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
-                    }
-                }
-
-            }
-
-
-            // header_script
-            $oModuleModel = &getModel('module');
-            $layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
-            $header_script = trim($layout_config->header_script);
-
-            if($header_script) $buff .= sprintf(' $layout_info->header_script = "%s"; ', str_replace('"','\\"',$header_script));
-
-            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
-            FileHandler::writeFile($cache_file, $buff);
-            if(file_exists($cache_file)) @include($cache_file);
-            return $layout_info;
-        }
-
-
-        /**
-         * @brief layout설정화면에서의 업로드한 이미지목록을 반환한다
-         **/
-        function getUserLayoutImageList($layout_srl){
-            $path = $this->getUserLayoutImagePath($layout_srl);
-            $list = FileHandler::readDir($path);
-            return $list;
-        }
-
-
-        /**
-         * @brief ini config들을 가져온다 array다.
-         **/
-        function getUserLayoutIniConfig($layout_srl, $layout_name=null){
-            $file = $this->getUserLayoutIni($layout_srl);
-            if($layout_name && !file_exists(FileHandler::getRealPath($file))){
-                FileHandler::copyFile($this->getDefaultLayoutIni($layout_name),$this->getUserLayoutIni($layout_srl));
-            }
-
-            $output = FileHandler::readIniFile($file);
-            return $output;
-        }
-
-        /**
-         * @brief user layout path
-         **/
-        function getUserLayoutPath($layout_srl){
-            return sprintf("./files/faceOff/%s",getNumberingPath($layout_srl,3));
-        }
-
-        /**
-         * @brief user layout image path
-         **/
-        function getUserLayoutImagePath($layout_srl){
-            return $this->getUserLayoutPath($layout_srl). 'images/';
-        }
-
-        /**
-         * @brief user layout css 관리자가 설정화면에서 저장한 css
-         **/
-        function getUserLayoutCss($layout_srl){
-            return $this->getUserLayoutPath($layout_srl). 'layout.css';
-        }
-
-
-        /**
-         * @brief faceoff용 css module handler에서 import 한다
-         **/
-        function getUserLayoutFaceOffCss($layout_srl){
-            $src = $this->_getUserLayoutFaceOffCss($layout_srl);
-            if($this->useUserLayoutTemp == 'temp') return;
-            return $src;
-        }
-
-
-        /**
-         * @brief faceoff용 css module handler에서 import 한다
-         **/
-        function _getUserLayoutFaceOffCss($layout_srl){
-            return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
-        }
-
-        /**
-         * @brief user layout tmp html
-         **/
-        function getUserLayoutTempFaceOffCss($layout_srl){
-            return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
-        }
-
-
-
-        /**
-         * @brief user layout html
-         **/
-        function getUserLayoutHtml($layout_srl){
-            $src = $this->getUserLayoutPath($layout_srl). 'layout.html';
-            $temp = $this->getUserLayoutTempHtml($layout_srl);
-            if($this->useUserLayoutTemp == 'temp'){
-                if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
-                return $temp;
-            }else{
-                return $src;
-            }
-        }
-
-        /**
-         * @brief user layout tmp html
-         **/
-        function getUserLayoutTempHtml($layout_srl){
-            return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
-        }
-
-
-        /**
-         * @brief user layout ini
-         **/
-        function getUserLayoutIni($layout_srl){
-            $src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
-            $temp = $this->getUserLayoutTempIni($layout_srl);
-            if($this->useUserLayoutTemp == 'temp'){
-                if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
-                return $temp;
-            }else{
-                return $src;
-            }
-        }
-
-        /**
-         * @brief user layout tmp ini
-         **/
-        function getUserLayoutTempIni($layout_srl){
-            return $this->getUserLayoutPath($layout_srl). 'tmp.layout.ini';
-        }
-
-        /**
-         * @brief user layout cache 
-         * todo 파일 자체를 삭제 필요가 있다
-         **/
-        function getUserLayoutCache($layout_srl,$lang_type){
-            return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
-        }
-
-        /**
-         * @brief layout cache 
-         **/
-        function getLayoutCache($layout_name,$lang_type){
-            return sprintf("./files/cache/layout/%s.%s.cache.php",$layout_name,$lang_type);
-        }
-
-        /**
-         * @brief default layout ini  사용자의 임의 수정을 막기 위해 
-         **/
-        function getDefaultLayoutIni($layout_name){
-            return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
-        }
-
-        /**
-         * @brief default layout html 사용자의 임의 수정을 막기 위해 
-         **/
-        function getDefaultLayoutHtml($layout_name){
-            return $this->getDefaultLayoutPath($layout_name). 'layout.html';
-        }
-
-        /**
-         * @brief default layout css 사용자의 임의 수정을 막기 위해 
-         **/
-        function getDefaultLayoutCss($layout_name){
-            return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
-        }
-
-        /**
-         * @brief default layout path 사용자의 임의 수정을 막기 위해 
-         **/
-        function getDefaultLayoutPath() {
-            return "./modules/layout/faceoff/";
-        }
-
-
-        /**
-         * @brief faceoff 인지 
-         **/
-        function useDefaultLayout($layout_name){
-            $info = $this->getLayoutInfo($layout_name);
-            if($info->type == 'faceoff') return true;
-            else return false;
-        }
-
-
-        /**
-         * @brief User Layout 을 임시 저장 모드로
-         **/
-        function setUseUserLayoutTemp($flag='temp'){
-            $this->useUserLayoutTemp = $flag;
-        }
-
-
-        /**
-         * @brief User Layout 임시 저장 파일 목록.
-         **/
-        function getUserLayoutTempFileList($layout_srl){
-            $file_list = array(
-                $this->getUserLayoutTempHtml($layout_srl)
-                ,$this->getUserLayoutTempFaceOffCss($layout_srl)
-                ,$this->getUserLayoutTempIni($layout_srl)
-            );
-            return $file_list;
-        }
-
-
-        /**
-         * @brief User Layout 저장 파일 목록.
-         **/
-        function getUserLayoutFileList($layout_srl){
-            $file_list = array(
-                basename($this->getUserLayoutHtml($layout_srl))
-                ,basename($this->getUserLayoutFaceOffCss($layout_srl))
-                ,basename($this->getUserLayoutIni($layout_srl))
-                ,basename($this->getUserLayoutCss($layout_srl))
-            );
-
-            $image_path = $this->getUserLayoutImagePath($layout_srl);
-            $image_list = FileHandler::readDir($image_path,'/(.*(?:swf|jpg|jpeg|gif|bmp|png)$)/i');
-
-            for($i=0,$c=count($image_list);$i<$c;$i++) $file_list[] = 'images/' . $image_list[$i];
-            return $file_list;
-        }
-
-        /**
-         * @brief faceOff관련 서비스 출력을 위한 동작 실행
-         **/
-        function doActivateFaceOff(&$layout_info) {
-            $layout_info->faceoff_ini_config = $this->getUserLayoutIniConfig($layout_info->layout_srl, $layout_info->layout);
-
-            // 기본 faceoff layout CSS
-            Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
-
-            // 레이아웃 매니져에서 생성된 CSS
-            $faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
-            if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
-
-            // 레이아웃의 위젯을 위한 css출력
-            Context::addCSSFile($this->module_path.'/tpl/css/widget.css');
-            if($layout_info->extra_var->colorset->value == 'black') Context::addCSSFile($this->module_path.'/tpl/css/widget@black.css');
-            else Context::addCSSFile($this->module_path.'/tpl/css/widget@white.css');
-
-            // 권한에 따른 다른 내용 출력
-            $logged_info = Context::get('logged_info');
-
-            // faceOff 레이아웃 편집 버튼 노출
-            if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) {
-                Context::addHtmlFooter("<div class=\"faceOffManager\"><a href=\"".getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y')."\" class=\"buttonSet buttonLayoutEditor\"><span>".Context::getLang('cmd_layout_edit')."</span></a></div>");
-            }
-
-            // faceOff페이지 수정시에 메뉴 출력
-            if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) {
-                $oTemplate = &TemplateHandler::getInstance();
-                Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class  layoutModel
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief Model class of the layout module
+     **/
+
+    class layoutModel extends layout {
+
+        var $useUserLayoutTemp = null;
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+		// deprecated
+        /**
+         * @brief Get a layout list created in the DB
+         * If you found a new list, it means that the layout list is inserted to the DB
+         **/
+        function getLayoutList($site_srl = 0, $layout_type="P", $columnList = array()) {
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = (int)$site_module_info->site_srl;
+            }
+            $args->site_srl = $site_srl;
+			$args->layout_type = $layout_type;
+            $output = executeQueryArray('layout.getLayoutList', $args, $columnList);
+			return $output->data;
+        }
+
+		/**
+		 * @brief Get layout instance list
+		 **/
+		function getLayoutInstanceList($siteSrl = 0, $layoutType = 'P', $layout = null, $columnList = array())
+		{
+			if (!$siteSrl)
+			{
+				$siteModuleInfo = Context::get('site_module_info');
+				$siteSrl = (int)$siteModuleInfo->site_srl;
+			}
+			$args->site_srl = $siteSrl;
+			$args->layout_type = $layoutType;
+			$args->layout = $layout;
+			$output = executeQueryArray('layout.getLayoutList', $args, $columnList);
+			return $output->data;
+		}
+
+        /**
+         * @brief Get one of layout information created in the DB
+         * Return DB info + XML info of the generated layout
+         **/
+		function getLayout($layout_srl) {
+            // cache controll
+			$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+				$cache_key = 'object:'.$layout_srl;
+				$layout_info = $oCacheHandler->get($cache_key);
+			}
+			if(!$layout_info) {
+				// Get information from the DB
+	            $args->layout_srl = $layout_srl;
+	            $output = executeQuery('layout.getLayout', $args);
+	            if(!$output->data) return;
+	            // Return xml file informaton after listing up the layout and extra_vars
+	            $layout_info = $this->getLayoutInfo($layout, $output->data, $output->data->layout_type);
+
+				// If deleted layout files, delete layout instance
+				if (!$layout_info) {
+					$oLayoutController = &getAdminController('layout');
+					$oLayoutController->deleteLayout($layout_srl);
+					return;
+				}
+	            
+				//insert in cache
+	            if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$layout_info);
+			}
+        	return $layout_info;
+
+        }
+
+        /**
+         * @brief Get a layout path
+         **/
+        function getLayoutPath($layout_name, $layout_type = "P") {
+			$layout_parse = explode('.', $layout_name);
+			if (count($layout_parse) > 1){
+				$class_path = './themes/'.$layout_parse[0].'/layouts/'.$layout_parse[1].'/';
+			}else if($layout_name == 'faceoff'){
+                $class_path = './modules/layout/faceoff/';
+            }else if($layout_type == "M") {
+				$class_path = sprintf("./m.layouts/%s/", $layout_name);
+			}else {
+                $class_path = sprintf('./layouts/%s/', $layout_name);
+            }
+            if(is_dir($class_path)) return $class_path;
+            return "";
+        }
+
+        /**
+         * @brief Get a type and information of the layout
+         * A type of downloaded layout
+         **/
+        function getDownloadedLayoutList($layout_type = "P", $withAutoinstallInfo = false) {
+			if ($withAutoinstallInfo) $oAutoinstallModel = &getModel('autoinstall');
+
+            // Get a list of downloaded layout and installed layout
+            $searched_list = $this->_getInstalledLayoutDirectories($layout_type);
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+
+            natcasesort($searched_list);
+            // Return information for looping searched list of layouts
+			$list = array();
+            for($i=0;$i<$searched_count;$i++) {
+                // Name of the layout
+                $layout = $searched_list[$i];
+                // Get information of the layout
+                $layout_info = $this->getLayoutInfo($layout, null, $layout_type);
+
+				if ($withAutoinstallInfo)
+				{
+					// get easyinstall remove url
+					$packageSrl = $oAutoinstallModel->getPackageSrlByPath($layout_info->path);
+					$layout_info->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl);
+
+					// get easyinstall need update
+					$package = $oAutoinstallModel->getInstalledPackages($packageSrl);
+					$layout_info->need_update = $package[$packageSrl]->need_update;
+
+					// get easyinstall update url
+					if ($layout_info->need_update)
+					{
+						$layout_info->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
+					}
+				}
+                $list[] = $layout_info;
+            }
+            return $list;
+        }
+
+		/**
+		 * @brief Get a count of layout
+		 * @param $layout_type: a type of layout(P|M)
+		 * @return int
+		 **/
+		function getInstalledLayoutCount($layoutType = 'P')
+		{
+			$searchedList = $this->_getInstalledLayoutDirectories($layoutType);
+			return  count($searchedList);
+		}
+
+		/**
+		 * @brief Get list of layouts directory
+		 * @param $layoutType: a type of layout(P|M)
+		 * @return array
+		 **/
+		function _getInstalledLayoutDirectories($layoutType = 'P')
+		{
+			if ($layoutType == 'M')
+			{
+				$directory = './m.layouts';
+				$globalValueKey = 'MOBILE_LAYOUT_DIRECTOIES';
+			}
+			else
+			{
+				$directory = './layouts';
+				$globalValueKey = 'PC_LAYOUT_DIRECTORIES';
+			}
+
+			if ($GLOBALS[$globalValueKey]) return $GLOBALS[$globalValueKey];
+
+			$searchedList = FileHandler::readDir($directory);
+			if (!$searchedList) $searchedList = array();
+			$GLOBALS[$globalValueKey] = $searchedList;
+
+			return $searchedList;
+		}
+
+        /**
+         * @brief Get information by reading conf/info.xml in the module
+         * It uses caching to reduce time for xml parsing ..
+         **/
+        function getLayoutInfo($layout, $info = null, $layout_type = "P") {
+            if($info) {
+                $layout_title = $info->title;
+                $layout = $info->layout;
+                $layout_srl = $info->layout_srl;
+                $site_srl = $info->site_srl;
+                $vars = unserialize($info->extra_vars);
+
+                if($info->module_srl) {
+                    $layout_path = preg_replace('/([a-zA-Z0-9\_\.]+)(\.html)$/','',$info->layout_path);
+                    $xml_file = sprintf('%sskin.xml', $layout_path);
+                }
+            }
+            // Get a path of the requested module. Return if not exists.
+            if(!$layout_path) $layout_path = $this->getLayoutPath($layout, $layout_type);
+            if(!is_dir($layout_path)) return;
+            // Read the xml file for module skin information
+            if(!$xml_file) $xml_file = sprintf("%sconf/info.xml", $layout_path);
+            if(!file_exists($xml_file)) {
+                $layout_info->layout = $layout;
+                $layout_info->path = $layout_path;
+                $layout_info->layout_title = $layout_title;
+				if(!$layout_info->layout_type)
+					$layout_info->layout_type =  $layout_type;
+                return $layout_info;
+            }
+            // Include the cache file if it is valid and then return $layout_info variable
+            if(!$layout_srl){
+                $cache_file = $this->getLayoutCache($layout, Context::getLangType());
+            }else{
+                $cache_file = $this->getUserLayoutCache($layout_srl, Context::getLangType());
+            }
+            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
+                @include($cache_file);
+
+                if($layout_info->extra_var && $vars) {
+                    foreach($vars as $key => $value) {
+                        if(!$layout_info->extra_var->{$key} && !$layout_info->{$key}) {
+                            $layout_info->{$key} = $value;
+                        }
+                    }
+                }
+                return $layout_info;
+            }
+            // If no cache file exists, parse the xml and then return the variable.
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            if($tmp_xml_obj->layout) $xml_obj = $tmp_xml_obj->layout;
+            elseif($tmp_xml_obj->skin) $xml_obj = $tmp_xml_obj->skin;
+
+            if(!$xml_obj) return;
+
+            $buff = '';
+            $buff .= sprintf('$layout_info->site_srl = "%s";', $site_srl);
+
+            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
+                // Layout title, version and other information
+                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $buff .= sprintf('$layout_info->layout = "%s";', $layout);
+                $buff .= sprintf('$layout_info->type = "%s";', $xml_obj->attrs->type);
+                $buff .= sprintf('$layout_info->path = "%s";', $layout_path);
+                $buff .= sprintf('$layout_info->title = "%s";', $xml_obj->title->body);
+                $buff .= sprintf('$layout_info->description = "%s";', $xml_obj->description->body);
+                $buff .= sprintf('$layout_info->version = "%s";', $xml_obj->version->body);
+                $buff .= sprintf('$layout_info->date = "%s";', $date);
+                $buff .= sprintf('$layout_info->homepage = "%s";', $xml_obj->link->body);
+                $buff .= sprintf('$layout_info->layout_srl = $layout_srl;');
+                $buff .= sprintf('$layout_info->layout_title = $layout_title;');
+                $buff .= sprintf('$layout_info->license = "%s";', $xml_obj->license->body);
+                $buff .= sprintf('$layout_info->license_link = "%s";', $xml_obj->license->attrs->link);
+				$buff .= sprintf('$layout_info->layout_type = "%s";', $layout_type);
+                // Author information
+                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+                else $author_list = $xml_obj->author;
+
+                for($i=0; $i < count($author_list); $i++) {
+                    $buff .= sprintf('$layout_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
+                    $buff .= sprintf('$layout_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
+                    $buff .= sprintf('$layout_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
+                }
+                // Extra vars (user defined variables to use in a template)
+                $extra_var_groups = $xml_obj->extra_vars->group;
+                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+                foreach($extra_var_groups as $group){
+                    $extra_vars = $group->var;
+                    if($extra_vars) {
+                        if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+
+                        $extra_var_count = count($extra_vars);
+
+                        $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
+                        for($i=0;$i<$extra_var_count;$i++) {
+                            unset($var);
+                            unset($options);
+                            $var = $extra_vars[$i];
+                            $name = $var->attrs->name;
+
+                            $buff .= sprintf('$layout_info->extra_var->%s->group = "%s";', $name, $group->title->body);
+                            $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
+                            $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
+                            $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
+                            $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+
+                            $options = $var->options;
+                            if(!$options) continue;
+
+                            if(!is_array($options)) $options = array($options);
+                            $options_count = count($options);
+                            $thumbnail_exist = false;
+                            for($j=0; $j < $options_count; $j++) {
+                                $thumbnail = $options[$j]->attrs->src;
+                                if($thumbnail) {
+                                    $thumbnail = $layout_path.$thumbnail;
+                                    if(file_exists($thumbnail)) {
+                                        $buff .= sprintf('$layout_info->extra_var->%s->options["%s"]->thumbnail = "%s";', $var->attrs->name, $options[$j]->attrs->value, $thumbnail);
+                                        if(!$thumbnail_exist) {
+                                            $buff .= sprintf('$layout_info->extra_var->%s->thumbnail_exist = true;', $var->attrs->name);
+                                            $thumbnail_exist = true;
+                                        }
+                                    }
+                                }
+                                $buff .= sprintf('$layout_info->extra_var->%s->options["%s"]->val = "%s";', $var->attrs->name, $options[$j]->attrs->value, $options[$j]->title->body);
+
+                            }
+                        }
+                    }
+                }
+                // Menu
+                if($xml_obj->menus->menu) {
+                    $menus = $xml_obj->menus->menu;
+                    if(!is_array($menus)) $menus = array($menus);
+
+                    $menu_count = count($menus);
+                    $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count);
+                    for($i=0;$i<$menu_count;$i++) {
+                        $name = $menus[$i]->attrs->name;
+                        if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $name);
+                        $buff .= sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
+                        $buff .= sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
+                        $buff .= sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->attrs->maxdepth);
+
+                        $buff .= sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
+                        $buff .= sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
+                        $buff .= sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+                    }
+                }
+
+
+                // history
+                if($xml_obj->history) {
+                    if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
+                    else $history_list = $xml_obj->history;
+
+                    for($i=0; $i < count($history_list); $i++) {
+                        sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                        $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                        $buff .= sprintf('$layout_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
+                        $buff .= sprintf('$layout_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
+                        $buff .= sprintf('$layout_info->history['.$i.']->date = "%s";', $date);
+
+                        if($history_list[$i]->author) {
+                            (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
+
+                            for($j=0; $j < count($obj->author_list); $j++) {
+                                $buff .= sprintf('$layout_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
+                                $buff .= sprintf('$layout_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
+                                $buff .= sprintf('$layout_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
+                            }
+                        }
+
+                        if($history_list[$i]->log) {
+                            (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
+
+                            for($j=0; $j < count($obj->log_list); $j++) {
+                                $buff .= sprintf('$layout_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
+                                $buff .= sprintf('$layout_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
+                            }
+                        }
+                    }
+                }
+
+
+
+            } else {
+                // Layout title, version and other information
+                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $buff .= sprintf('$layout_info->layout = "%s";', $layout);
+                $buff .= sprintf('$layout_info->path = "%s";', $layout_path);
+                $buff .= sprintf('$layout_info->title = "%s";', $xml_obj->title->body);
+                $buff .= sprintf('$layout_info->description = "%s";', $xml_obj->author->description->body);
+                $buff .= sprintf('$layout_info->version = "%s";', $xml_obj->attrs->version);
+                $buff .= sprintf('$layout_info->date = "%s";', $date);
+                $buff .= sprintf('$layout_info->layout_srl = $layout_srl;');
+                $buff .= sprintf('$layout_info->layout_title = $layout_title;');
+                // Author information
+                $buff .= sprintf('$layout_info->author[0]->name = "%s";', $xml_obj->author->name->body);
+                $buff .= sprintf('$layout_info->author[0]->email_address = "%s";', $xml_obj->author->attrs->email_address);
+                $buff .= sprintf('$layout_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
+                // Extra vars (user defined variables to use in a template)
+                $extra_var_groups = $xml_obj->extra_vars->group;
+                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+                foreach($extra_var_groups as $group){
+                    $extra_vars = $group->var;
+                    if($extra_vars) {
+                        if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+
+                        $extra_var_count = count($extra_vars);
+
+                        $buff .= sprintf('$layout_info->extra_var_count = "%s";', $extra_var_count);
+                        for($i=0;$i<$extra_var_count;$i++) {
+                            unset($var);
+                            unset($options);
+                            $var = $extra_vars[$i];
+                            $name = $var->attrs->name;
+
+                            $buff .= sprintf('$layout_info->extra_var->%s->group = "%s";', $name, $group->title->body);
+                            $buff .= sprintf('$layout_info->extra_var->%s->title = "%s";', $name, $var->title->body);
+                            $buff .= sprintf('$layout_info->extra_var->%s->type = "%s";', $name, $var->attrs->type);
+                            $buff .= sprintf('$layout_info->extra_var->%s->value = $vars->%s;', $name, $name);
+                            $buff .= sprintf('$layout_info->extra_var->%s->description = "%s";', $name, str_replace('"','\"',$var->description->body));
+
+                            $options = $var->options;
+                            if(!$options) continue;
+
+                            if(!is_array($options)) $options = array($options);
+                            $options_count = count($options);
+                            for($j=0;$j<$options_count;$j++) {
+                                $buff .= sprintf('$layout_info->extra_var->%s->options["%s"]->val = "%s";', $var->attrs->name, $options[$j]->value->body, $options[$j]->title->body);
+                            }
+                        }
+                    }
+                }
+                // Menu
+                if($xml_obj->menus->menu) {
+                    $menus = $xml_obj->menus->menu;
+                    if(!is_array($menus)) $menus = array($menus);
+
+                    $menu_count = count($menus);
+                    $buff .= sprintf('$layout_info->menu_count = "%s";', $menu_count);
+                    for($i=0;$i<$menu_count;$i++) {
+                        $name = $menus[$i]->attrs->name;
+                        if($menus[$i]->attrs->default == "true") $buff .= sprintf('$layout_info->default_menu = "%s";', $name);
+                        $buff .= sprintf('$layout_info->menu->%s->name = "%s";',$name, $menus[$i]->attrs->name);
+                        $buff .= sprintf('$layout_info->menu->%s->title = "%s";',$name, $menus[$i]->title->body);
+                        $buff .= sprintf('$layout_info->menu->%s->maxdepth = "%s";',$name, $menus[$i]->maxdepth->body);
+
+                        $buff .= sprintf('$layout_info->menu->%s->menu_srl = $vars->%s;', $name, $name);
+                        $buff .= sprintf('$layout_info->menu->%s->xml_file = "./files/cache/menu/".$vars->%s.".xml.php";',$name, $name);
+                        $buff .= sprintf('$layout_info->menu->%s->php_file = "./files/cache/menu/".$vars->%s.".php";',$name, $name);
+                    }
+                }
+
+            }
+
+
+            // header_script
+            $oModuleModel = &getModel('module');
+            $layout_config = $oModuleModel->getModulePartConfig('layout', $layout_srl);
+            $header_script = trim($layout_config->header_script);
+
+            if($header_script) $buff .= sprintf(' $layout_info->header_script = "%s"; ', str_replace('"','\\"',$header_script));
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
+            FileHandler::writeFile($cache_file, $buff);
+            if(file_exists($cache_file)) @include($cache_file);
+            return $layout_info;
+        }
+
+
+        /**
+         * @brief Return a list of images which are uploaded on the layout setting page
+         **/
+        function getUserLayoutImageList($layout_srl){
+            $path = $this->getUserLayoutImagePath($layout_srl);
+            $list = FileHandler::readDir($path);
+            return $list;
+        }
+
+
+        /**
+         * @brief Get ini configurations and make them an array.
+         **/
+        function getUserLayoutIniConfig($layout_srl, $layout_name=null){
+            $file = $this->getUserLayoutIni($layout_srl);
+            if($layout_name && !file_exists(FileHandler::getRealPath($file))){
+                FileHandler::copyFile($this->getDefaultLayoutIni($layout_name),$this->getUserLayoutIni($layout_srl));
+            }
+
+            $output = FileHandler::readIniFile($file);
+            return $output;
+        }
+
+        /**
+         * @brief user layout path
+         **/
+        function getUserLayoutPath($layout_srl){
+            return sprintf("./files/faceOff/%s",getNumberingPath($layout_srl,3));
+        }
+
+        /**
+         * @brief user layout image path
+         **/
+        function getUserLayoutImagePath($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'images/';
+        }
+
+        /**
+         * @brief css which is set by an administrator on the layout setting page
+         **/
+        function getUserLayoutCss($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'layout.css';
+        }
+
+
+        /**
+         * @brief Import faceoff css from css module handler
+         **/
+        function getUserLayoutFaceOffCss($layout_srl){
+            $src = $this->_getUserLayoutFaceOffCss($layout_srl);
+            if($this->useUserLayoutTemp == 'temp') return;
+            return $src;
+        }
+
+
+        /**
+         * @brief Import faceoff css from css module handler
+         **/
+        function _getUserLayoutFaceOffCss($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'faceoff.css';
+        }
+
+        /**
+         * @brief user layout tmp html
+         **/
+        function getUserLayoutTempFaceOffCss($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'tmp.faceoff.css';
+        }
+
+
+
+        /**
+         * @brief user layout html
+         **/
+        function getUserLayoutHtml($layout_srl){
+            $src = $this->getUserLayoutPath($layout_srl). 'layout.html';
+            $temp = $this->getUserLayoutTempHtml($layout_srl);
+            if($this->useUserLayoutTemp == 'temp'){
+                if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+                return $temp;
+            }else{
+                return $src;
+            }
+        }
+
+        /**
+         * @brief user layout tmp html
+         **/
+        function getUserLayoutTempHtml($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'tmp.layout.html';
+        }
+
+
+        /**
+         * @brief user layout ini
+         **/
+        function getUserLayoutIni($layout_srl){
+            $src = $this->getUserLayoutPath($layout_srl). 'layout.ini';
+            $temp = $this->getUserLayoutTempIni($layout_srl);
+            if($this->useUserLayoutTemp == 'temp'){
+                if(!file_exists(FileHandler::getRealPath($temp))) FileHandler::copyFile($src,$temp);
+                return $temp;
+            }else{
+                return $src;
+            }
+        }
+
+        /**
+         * @brief user layout tmp ini
+         **/
+        function getUserLayoutTempIni($layout_srl){
+            return $this->getUserLayoutPath($layout_srl). 'tmp.layout.ini';
+        }
+
+        /**
+         * @brief user layout cache
+         * todo It may need to remove the file itself
+         **/
+        function getUserLayoutCache($layout_srl,$lang_type){
+            return $this->getUserLayoutPath($layout_srl). "{$lang_type}.cache.php";
+        }
+
+        /**
+         * @brief layout cache
+         **/
+        function getLayoutCache($layout_name,$lang_type){
+            return sprintf("./files/cache/layout/%s.%s.cache.php",$layout_name,$lang_type);
+        }
+
+        /**
+         * @brief default layout ini to prevent arbitrary changes by a user
+         **/
+        function getDefaultLayoutIni($layout_name){
+            return $this->getDefaultLayoutPath($layout_name). 'layout.ini';
+        }
+
+        /**
+         * @brief default layout html to prevent arbitrary changes by a user
+         **/
+        function getDefaultLayoutHtml($layout_name){
+            return $this->getDefaultLayoutPath($layout_name). 'layout.html';
+        }
+
+        /**
+         * @brief default layout css to prevent arbitrary changes by a user
+         **/
+        function getDefaultLayoutCss($layout_name){
+            return $this->getDefaultLayoutPath($layout_name). 'css/layout.css';
+        }
+
+        /**
+         * @brief default layout path to prevent arbitrary changes by a user
+         **/
+        function getDefaultLayoutPath() {
+            return "./modules/layout/faceoff/";
+        }
+
+
+        /**
+         * @brief faceoff is
+         **/
+        function useDefaultLayout($layout_name){
+            $info = $this->getLayoutInfo($layout_name);
+            if($info->type == 'faceoff') return true;
+            else return false;
+        }
+
+
+        /**
+         * @brief Set user layout as temporary save mode
+         **/
+        function setUseUserLayoutTemp($flag='temp'){
+            $this->useUserLayoutTemp = $flag;
+        }
+
+
+        /**
+         * @brief Temp file list for User Layout
+         **/
+        function getUserLayoutTempFileList($layout_srl){
+            $file_list = array(
+                $this->getUserLayoutTempHtml($layout_srl)
+                ,$this->getUserLayoutTempFaceOffCss($layout_srl)
+                ,$this->getUserLayoutTempIni($layout_srl)
+            );
+            return $file_list;
+        }
+
+
+        /**
+         * @brief Saved file list for User Layout
+         **/
+        function getUserLayoutFileList($layout_srl){
+            $file_list = array(
+                basename($this->getUserLayoutHtml($layout_srl))
+                ,basename($this->getUserLayoutFaceOffCss($layout_srl))
+                ,basename($this->getUserLayoutIni($layout_srl))
+                ,basename($this->getUserLayoutCss($layout_srl))
+            );
+
+            $image_path = $this->getUserLayoutImagePath($layout_srl);
+            $image_list = FileHandler::readDir($image_path,'/(.*(?:swf|jpg|jpeg|gif|bmp|png)$)/i');
+
+            for($i=0,$c=count($image_list);$i<$c;$i++) $file_list[] = 'images/' . $image_list[$i];
+            return $file_list;
+        }
+
+        /**
+         * @brief faceOff related services for the operation run out
+         **/
+        function doActivateFaceOff(&$layout_info) {
+            $layout_info->faceoff_ini_config = $this->getUserLayoutIniConfig($layout_info->layout_srl, $layout_info->layout);
+            // faceoff layout CSS
+            Context::addCSSFile($this->getDefaultLayoutCss($layout_info->layout));
+            // CSS generated in the layout manager
+            $faceoff_layout_css = $this->getUserLayoutFaceOffCss($layout_info->layout_srl);
+            if($faceoff_layout_css) Context::addCSSFile($faceoff_layout_css);
+            // CSS output for the widget
+            Context::loadFile($this->module_path.'/tpl/css/widget.css', true);
+            if($layout_info->extra_var->colorset->value == 'black') Context::loadFile($this->module_path.'/tpl/css/widget@black.css', true);
+            else Context::loadFile($this->module_path.'/tpl/css/widget@white.css', true);
+            // Different page displayed upon user's permission
+            $logged_info = Context::get('logged_info');
+            // Display edit button for faceoff layout
+            if(Context::get('module')!='admin' && strpos(Context::get('act'),'Admin')===false && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) {
+                Context::addHtmlFooter('<div class="faceOffManager" style="height: 23px; position: fixed; right: 3px; top: 3px;"><a href="'.getUrl('','mid',Context::get('mid'),'act','dispLayoutAdminLayoutModify','delete_tmp','Y').'">'.Context::getLang('cmd_layout_edit').'</a></div>');
+            }
+            // Display menu when editing the faceOff page
+            if(Context::get('act')=='dispLayoutAdminLayoutModify' && ($logged_info->is_admin == 'Y' || $logged_info->is_site_admin)) {
+                $oTemplate = &TemplateHandler::getInstance();
+                Context::addBodyHeader($oTemplate->compile($this->module_path.'/tpl', 'faceoff_layout_menu'));
+            }
+        }
+    }
+?>
diff --git a/modules/layout/layout.view.php b/modules/layout/layout.view.php
index 50adf6552..772996ccc 100644
--- a/modules/layout/layout.view.php
+++ b/modules/layout/layout.view.php
@@ -1,34 +1,90 @@
-<?php
-    /**
-     * @class  layoutView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  layout 모듈의 admin view class
-     **/
-
-    class layoutView extends layout {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 레이아웃의 상세 정보(conf/info.xml)를 팝업 출력
-         **/
-        function dispLayoutInfo() {
-            // 선택된 레이아웃 정보를 구함 
-            $oLayoutModel = &getModel('layout');
-            $layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
-            if(!$layout_info) exit();
-            Context::set('layout_info', $layout_info);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('layout_detail_info');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  layoutView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the layout module
+     **/
+
+    class layoutView extends layout {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Pop-up layout details(conf/info.xml)
+         **/
+        function dispLayoutInfo() {
+            // Get the layout information
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayoutInfo(Context::get('selected_layout'));
+            if(!$layout_info) exit();
+            Context::set('layout_info', $layout_info);
+            // Set the layout to be pop-up
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('layout_detail_info');
+        }
+
+		/**
+         * @brief Preview a layout
+         **/
+        function dispLayoutPreview() {
+			// admin check
+			// this act is admin view but in normal view because do not load admin css/js files
+			$logged_info = Context::get('logged_info');
+			if ($logged_info->is_admin != 'Y') return $this->stop('msg_invalid_request');
+
+            $layout_srl = Context::get('layout_srl');
+            $code = Context::get('code');
+            $code_css = Context::get('code_css');
+            if(!$layout_srl || !$code) return new Object(-1, 'msg_invalid_request');
+            // Get the layout information
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayout($layout_srl);
+            if(!$layout_info) return new Object(-1, 'msg_invalid_request');
+            // Separately handle the layout if its type is faceoff
+            if($layout_info && $layout_info->type == 'faceoff') $oLayoutModel->doActivateFaceOff($layout_info);
+            // Apply CSS directly
+            Context::addHtmlHeader("<style type=\"text/css\" charset=\"UTF-8\">".$code_css."</style>");
+            // Set names and values of extra_vars to $layout_info
+            if($layout_info->extra_var_count) {
+                foreach($layout_info->extra_var as $var_id => $val) {
+                    $layout_info->{$var_id} = $val->value;
+                }
+            }
+            // menu in layout information becomes an argument for Context:: set
+            if($layout_info->menu_count) {
+                foreach($layout_info->menu as $menu_id => $menu) {
+                    if(file_exists($menu->php_file)) @include($menu->php_file);
+                    Context::set($menu_id, $menu);
+                }
+            }
+
+            Context::set('layout_info', $layout_info);
+            Context::set('content', Context::getLang('layout_preview_content'));
+            // Temporary save the codes
+            $edited_layout_file = sprintf('./files/cache/layout/tmp.tpl');
+            FileHandler::writeFile($edited_layout_file, $code);
+
+            // Compile
+            $oTemplate = &TemplateHandler::getInstance();
+
+            $layout_path = $layout_info->path;
+            $layout_file = 'layout';
+
+            $layout_tpl = $oTemplate->compile($layout_path, $layout_file, $edited_layout_file);
+            Context::set('layout','none');
+            // Convert widgets and others
+            $oContext = &Context::getInstance();
+            Context::set('layout_tpl', $layout_tpl);
+            // Delete Temporary Files
+            FileHandler::removeFile($edited_layout_file);
+            $this->setTemplateFile('layout_preview');
+
+        }
+    }
+?>
diff --git a/modules/layout/queries/getLayoutList.xml b/modules/layout/queries/getLayoutList.xml
index 047a476b4..612762ab2 100644
--- a/modules/layout/queries/getLayoutList.xml
+++ b/modules/layout/queries/getLayoutList.xml
@@ -8,6 +8,7 @@
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" filter="number" default="0" notnull="notnull" />
         <condition operation="equal" column="layout_type" var="layout_type" default="P" pipe="and" />
+		<condition operation="equal" column="layout" var="layout" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="layout_srl" order="desc" />
diff --git a/modules/layout/queries/insertLayout.xml b/modules/layout/queries/insertLayout.xml
index 20a229beb..1bf9a01e8 100644
--- a/modules/layout/queries/insertLayout.xml
+++ b/modules/layout/queries/insertLayout.xml
@@ -8,6 +8,7 @@
         <column name="layout" var="layout" notnull="notnull" />
         <column name="title" var="title" notnull="notnull" />
         <column name="module_srl" var="module_srl" />
+        <column name="extra_vars" var="extra_vars" />
         <column name="layout_path" var="layout_path" />
         <column name="regdate" var="regdate" default="curdate()" />
 		<column name="layout_type" var="layout_type" default="P" />
diff --git a/modules/layout/queries/updateAllLayoutInSiteWithTheme.xml b/modules/layout/queries/updateAllLayoutInSiteWithTheme.xml
new file mode 100644
index 000000000..fdc0f4fca
--- /dev/null
+++ b/modules/layout/queries/updateAllLayoutInSiteWithTheme.xml
@@ -0,0 +1,11 @@
+<query id="updateAllLayoutInSiteWithTheme" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="layout_srl" var="layout_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/layout/ruleset/codeUpdate.xml b/modules/layout/ruleset/codeUpdate.xml
new file mode 100644
index 000000000..d20389403
--- /dev/null
+++ b/modules/layout/ruleset/codeUpdate.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <fields>
+		<field name="code" required="true" />
+		<field name="layout_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/layout/ruleset/deleteLayout.xml b/modules/layout/ruleset/deleteLayout.xml
new file mode 100644
index 000000000..1d29b70f9
--- /dev/null
+++ b/modules/layout/ruleset/deleteLayout.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <fields>
+		<field name="layout_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/layout/ruleset/imageUpload.xml b/modules/layout/ruleset/imageUpload.xml
new file mode 100644
index 000000000..e00d16354
--- /dev/null
+++ b/modules/layout/ruleset/imageUpload.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="imageExtension" type="regex" test="/\.(gif|jpg|jpeg|gif|png|swf|flv)$/i"  />
+    </customrules>
+    <fields>
+		<field name="user_layout_image" required="true" rule="imageExtension" />
+		<field name="layout_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/layout/ruleset/insertLayout.xml b/modules/layout/ruleset/insertLayout.xml
new file mode 100644
index 000000000..5db177373
--- /dev/null
+++ b/modules/layout/ruleset/insertLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" length="1:250" />
+    </fields>
+</ruleset>
diff --git a/modules/layout/ruleset/updateLayout.xml b/modules/layout/ruleset/updateLayout.xml
new file mode 100644
index 000000000..5db177373
--- /dev/null
+++ b/modules/layout/ruleset/updateLayout.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" length="1:250" />
+    </fields>
+</ruleset>
diff --git a/modules/layout/ruleset/userLayoutImport.xml b/modules/layout/ruleset/userLayoutImport.xml
new file mode 100644
index 000000000..814a4183f
--- /dev/null
+++ b/modules/layout/ruleset/userLayoutImport.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="importExtension" type="regex" test="/\.tar$/i"  />
+    </customrules>
+    <fields>
+		<field name="file" required="true" rule="importExtension" />
+		<field name="layout_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/layout/tpl/css/adminEdit.css b/modules/layout/tpl/css/adminEdit.css
new file mode 100644
index 000000000..fe84194c6
--- /dev/null
+++ b/modules/layout/tpl/css/adminEdit.css
@@ -0,0 +1,3 @@
+.uploaded_image_list {list-style: none; margin: 0; padding: 0;}
+.uploaded_image_list li {display: inline-block; margin-right: 10px;}
+.uploaded_image_list img {border: 1px #ccc solid; padding: 3px; width: 96px; height: 96px;}
\ No newline at end of file
diff --git a/modules/layout/tpl/css/faceoff_menu.css b/modules/layout/tpl/css/faceoff_menu.css
index 99c058277..234567b2a 100644
--- a/modules/layout/tpl/css/faceoff_menu.css
+++ b/modules/layout/tpl/css/faceoff_menu.css
@@ -1,208 +1,208 @@
-@charset "utf-8";
-/* NHN > UIT Center > Open UI Technology Team > Kim Taegon(gonom9@nhncorp.com) */
-
-/* toolbar */
-#toolbar { position:relative; z-index:1000; background:url(../images/bgMenu.gif) repeat-x 0 0; font-size:12px; height:35px; clear:both; }
-#toolbar *{ margin:0; padding:0;}
-#toolbar h1 { float:left; color:#fff; padding:10px 20px; font-size:12px;}
-#toolbar .tb-btn-active { font-weight:bold; }
-#toolbar .tb-menu-item-hover { color:white; background-color:navy; }
-#toolbar .tb-menu-item-selected { color:white; background-color:green; }
-
-#faceoffSelector { border:2px dotted #ff6600; }
-
-#smartmenu {  position:absolute; top:10px; right:10px; margin:0; padding:0; font-size:12px; color:#fff; white-space:nowrap;}
-#smartmenu li { display:none; list-style:none; font-weight:bold; }
-#smartmenu li.active{ display:block;}
-#smartmenu li dl{ margin:0; padding:0; display:inline;}
-#smartmenu li dt,
-#smartmenu li dd{ display:inline;}
-#smartmenu li dt{ color:#ccc;}
-#smartmenu li dd button{ background-color:#000; border:0; font-size:12px; font-family:Tahoma; font-weight:normal; color:#fff; cursor:pointer; border:1px solid #888; }
-#layout-preview { display:none; width:120px; left:0px; right:0px; }
-
-/* widgetMenu */
-#toolbar .widgetMenu{ height:35px; margin:0; padding:0; font-size:12px; line-height:1.2; background:url(../images/bgMenu.gif) repeat-x 0 0;}
-#toolbar .widgetMenu ul.widgetMenuList{ margin:0; padding:0; height:35px; float:left; }
-#toolbar .widgetMenu ul.widgetMenuList li ul{ display:none; position:absolute; top:40px; left:0; height:auto; padding:10px 15px; background:#595959; border:1px solid #444;}
-#toolbar .widgetMenu ul.widgetMenuList li.active ul{ display:block;}
-#toolbar .widgetMenu ul.widgetMenuList.aCenter{ margin-left:auto; margin-right:auto;}
-#toolbar .widgetMenu ul.widgetMenuList.aLeft{ margin-right:auto;}
-#toolbar .widgetMenu ul.widgetMenuList.aRight{ margin-left:auto;}
-#toolbar .widgetMenu li{ position:relative; padding-right:3px; float:left; list-style:none; background:url(../images/bgMenu.gif) no-repeat right -40px; white-space:nowrap;}
-#toolbar .widgetMenu li button{ position:relative; float:left; height:35px; color:#fff !important; text-decoration:none !important; cursor:pointer; background-color:transparent; border:0; font-weight:bold; font-size:12px; font-family:Tahoma;}
-#toolbar .widgetMenu li button span{ padding:0 15px;}
-#toolbar .widgetMenu li.first button{ background:url(../images/bgMenu.gif) no-repeat left -40px; color:#f00 !important;}
-#toolbar .widgetMenu li.active{ margin-left:-2px; background:url(../images/bgMenu.gif) no-repeat right -80px;}
-#toolbar .widgetMenu li.active button{ font-weight:bold; color:#ff0 !important; background:url(../images/bgMenu.gif) no-repeat left -80px;}
-#toolbar .widgetMenu li.active li{ float:none; background:none;}
-#toolbar .widgetMenu li.active li.active{ margin:0;}
-#toolbar .widgetMenu li li{ background:none; display:block !important; clear:both !important;}
-#toolbar .widgetMenu li li.first{ background:none;}
-#toolbar .widgetMenu li.active li.first{ padding-top:14px; background:url(../images/bgMenu.gif) no-repeat 30px top;}
-#toolbar .widgetMenu li li button{ background:none; height:auto; font-weight:normal; text-align:left; float:none; display:block;}
-#toolbar .widgetMenu li.active li button{ display:block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none; font-weight:normal;}
-#toolbar .widgetMenu li.active li.active button{ color:#ff0 !important;}
-
-/* preference dialog */
-#propertyDialog { position:absolute; border:1px solid silver; background-color:white; padding:15px 20px; z-index:110; -moz-border-radius:5px; -webkit-border-radius:5px; margin:0 auto; display:none; width:250px; left:20px; top:60px;}
-#propertyDialog fieldset{ border:1px dotted #ccc; padding:5px 10px; margin:0 0 10px 0; white-space:nowrap;}
-#propertyDialog legend{ font-weight:bold; background-color:#fff; padding:0 5px; }
-#propertyDialog label{ cursor:default;}
-#propertyDialog .more { display:none;  margin:0; padding:0 0 0 10px; border-left:2px solid #eee;}
-#propertyDialog .visible-more .more { display:block; }
-#propertyDialog .visible-more .inputall { display:none; }
-#propertyDialog .buttonArea{ text-align:center;}
-#propertyDialog button{ cursor:pointer;}
-.overlay { background-color:black; opacity:0.75; position:absolute; z-index:100; display:none; }
-
-/* layout preview */
-
-/* demoXe */
-#demoXe { position:absolute; background:#fff; border:2px solid #ddd; padding:5px; width:100px; display:none; }
-#demoXe * { margin:0; padding:0; font-size:0; line-height:0; }
-
-/* Container + Header + Body + Footer */
-#demoContainer { position:relative; }
-#demoHeader { position:relative; height:10px; *zoom:1;
-background:#ddd; margin-bottom:5px; }
-#demoHeader:after { content:""; display:block; clear:both; }
-#demoBody { position:relative; *zoom:1;
-margin-bottom:5px; }
-#demoBody:after { content:""; display:block; clear:both; }
-#demoContent { position:relative; height:40px; text-align:justify; background:#ddd; }
-#demoFooter { position:relative; height:10px; *zoom:1;
-background:#ddd; }
-#demoFooter address { text-align:center; }
-
-/* Layout Width */
-.demoFixed #demoContainer { width:100px; margin-left:auto; margin-right:auto; }
-.demoLiquid #demoContainer { width:90%; margin-left:auto; margin-right:auto; }
-.demoHybrid #demoContainer { width:90%; margin-left:auto; margin-right:auto; }
-
-/* Align Layout */
-.demoALeft #demoContainer { margin-left:0; }
-.demoARight #demoContainer { margin-right:0; }
-
-/* Extension */
-.demoExtension,
-.demoSection { position:relative; }
-#demoBody .demoExtension { position:relative; display:none; height:40px; background:#ddd; }
-#demoBody #demoContent { width:100%; height:40px; font-size:small; }
-.demoExtension .demoSection { }
-
-/* Layout Color */
-.demoLiquid #demoHeader,
-.demoLiquid #demoFooter,
-.demoLiquid #demoContent,
-.demoLiquid #demoBody .demoExtension { background:#999; }
-.demoHybrid #demoHeader,
-.demoHybrid #demoFooter,
-.demoHybrid #demoContent { background:#999; }
-
-/* ----- Fixed 2 Column Layout ----- */
-.demoFixed .demoCE #demoBody .demoE1,
-.demoFixed .demoEC #demoBody .demoE1 { width:15px; }
-.demoFixed .demoCE #demoBody #demoContent,
-.demoFixed .demoEC #demoBody #demoContent { width:80px; }
-.demoFixed .demoCE #demoBody #demoContent { float:left; }
-.demoFixed .demoEC #demoBody #demoContent { float:right; }
-.demoFixed .demoCE #demoBody .demoE1,
-.demoFixed .demoEC #demoBody .demoE1 { display:block; }
-.demoFixed .demoCE #demoBody .demoE1 { float:right; clear:right; }
-.demoFixed .demoEC #demoBody .demoE1 { float:left; clear:left; }
-
-/* ----- Liquid 2 Column Layout ----- */
-.demoLiquid .demoCE #demoBody .demoE1,
-.demoLiquid .demoEC #demoBody .demoE1 { width:15%; }
-.demoLiquid .demoCE #demoBody #demoContent,
-.demoLiquid .demoEC #demoBody #demoContent { width:80%; }
-.demoLiquid .demoCE #demoBody #demoContent { float:left; }
-.demoLiquid .demoEC #demoBody #demoContent { float:right; }
-.demoLiquid .demoCE #demoBody .demoE1,
-.demoLiquid .demoEC #demoBody .demoE1 { display:block; }
-.demoLiquid .demoCE #demoBody .demoE1 { float:right; clear:right; }
-.demoLiquid .demoEC #demoBody .demoE1 { float:left; clear:left; }
-
-/* ----- Hybrid 2 Column Layout ----- */
-.demoHybrid .demoCE #demoBody { padding-right:20px; }
-.demoHybrid .demoEC #demoBody { padding-left:20px; }
-.demoHybrid .demoCE #demoBody .demoE1,
-.demoHybrid .demoEC #demoBody .demoE1 { width:15px; }
-.demoHybrid .demoCE #demoBody #demoContent { float:left; }
-.demoHybrid .demoEC #demoBody #demoContent { float:right; }
-.demoHybrid .demoCE #demoBody .demoE1,
-.demoHybrid .demoEC #demoBody .demoE1 { display:block; }
-.demoHybrid .demoCE #demoBody .demoE1 { float:right; clear:right; margin-left:-15px; right:-20px; }
-.demoHybrid .demoEC #demoBody .demoE1 { float:left; clear:left; margin-right:-15px; left:-20px; }
-
-/* ----- Fixed 3 Column Layout ----- */
-.demoFixed .demoCEE #demoBody .demoE1,
-.demoFixed .demoCEE #demoBody .demoE2,
-.demoFixed .demoECE #demoBody .demoE1,
-.demoFixed .demoECE #demoBody .demoE2,
-.demoFixed .demoEEC #demoBody .demoE1,
-.demoFixed .demoEEC #demoBody .demoE2 { display:block; width:15px; }
-.demoFixed .demoCEE #demoBody #demoContent,
-.demoFixed .demoECE #demoBody #demoContent,
-.demoFixed .demoEEC #demoBody #demoContent { width:60px; }
-.demoFixed .demoCEE #demoBody #demoContent { float:left; margin-right:5px; }
-.demoFixed .demoECE #demoBody #demoContent { float:left; margin-right:-100%; left:20px; }
-.demoFixed .demoEEC #demoBody #demoContent { float:right; }
-.demoFixed .demoECE #demoBody .demoE1,
-.demoFixed .demoEEC #demoBody .demoE1 { float:left; margin-right:5px; }
-.demoFixed .demoCEE #demoBody .demoE1,
-.demoFixed .demoEEC #demoBody .demoE2 { float:left; }
-.demoFixed .demoCEE #demoBody .demoE2,
-.demoFixed .demoECE #demoBody .demoE2 { float:right; }
-
-/* ----- Liquid 3 Column Layout ----- */
-.demoLiquid .demoCEE #demoBody .demoE1,
-.demoLiquid .demoCEE #demoBody .demoE2,
-.demoLiquid .demoECE #demoBody .demoE1,
-.demoLiquid .demoECE #demoBody .demoE2,
-.demoLiquid .demoEEC #demoBody .demoE1,
-.demoLiquid .demoEEC #demoBody .demoE2 { display:block; width:15%; }
-.demoLiquid .demoCEE #demoBody #demoContent,
-.demoLiquid .demoECE #demoBody #demoContent,
-.demoLiquid .demoEEC #demoBody #demoContent { width:60%; }
-.demoLiquid .demoCEE #demoBody #demoContent { float:left; margin-right:5%; }
-.demoLiquid .demoECE #demoBody #demoContent { float:left; margin-right:-100%; left:20%; }
-.demoLiquid .demoEEC #demoBody #demoContent { float:right; }
-.demoLiquid .demoECE #demoBody .demoE1,
-.demoLiquid .demoEEC #demoBody .demoE1 { float:left; margin-right:5%; }
-.demoLiquid .demoCEE #demoBody .demoE1,
-.demoLiquid .demoEEC #demoBody .demoE2 { float:left; }
-.demoLiquid .demoCEE #demoBody .demoE2,
-.demoLiquid .demoECE #demoBody .demoE2 { float:right; }
-
-/* ----- Hybrid 3 Column Layout ----- */
-.demoHybrid .demoCEE #demoBody .demoE1,
-.demoHybrid .demoCEE #demoBody .demoE2,
-.demoHybrid .demoECE #demoBody .demoE1,
-.demoHybrid .demoECE #demoBody .demoE2,
-.demoHybrid .demoEEC #demoBody .demoE1,
-.demoHybrid .demoEEC #demoBody .demoE2 { display:block; width:15px; }
-.demoHybrid .demoCEE #demoBody { padding-right:40px; }
-.demoHybrid .demoECE #demoBody { padding-left:20px; padding-right:20px; }
-.demoHybrid .demoEEC #demoBody { padding-left:40px; }
-.demoHybrid .demoCEE #demoBody #demoContent,
-.demoHybrid .demoECE #demoBody #demoContent,
-.demoHybrid .demoEEC #demoBody #demoContent { width:100%; }
-.demoHybrid .demoCEE #demoBody #demoContent,
-.demoHybrid .demoECE #demoBody #demoContent { float:left; margin-right:-100%; }
-.demoHybrid .demoEEC #demoBody #demoContent { float:right; }
-.demoHybrid .demoECE #demoBody .demoE1,
-.demoHybrid .demoEEC #demoBody .demoE2 { float:left; left:-20px; margin-right:-20px; }
-.demoHybrid .demoEEC #demoBody .demoE1 { float:left; left:-40px; margin-right:-20px; }
-.demoHybrid .demoCEE #demoBody .demoE1,
-.demoHybrid .demoECE #demoBody .demoE2 { float:right; left:20px; margin-left:-15px; }
-.demoHybrid .demoCEE #demoBody .demoE2 { float:right; left:40px; margin-left:-15px; }
-
-.aboutFaceOff { background-color:#EEE; color:#000; padding:20px; }
-.aboutFaceOff h3 { padding:0; margin:0; font-size:14px; font-weight:bold; text-decoration:underline; margin-bottom:10px; }
-.aboutFaceOff p,
-.aboutFaceOff li { color:#666; }
-
-fieldset.hideOption { float:left; border:0; margin:0; padding:0; }
-fieldset.hideOption label { margin:10px 10px 0 10px !important; *margin-top:7px; font-family:tahoma; color:#fff !important; display:block; float:left;}
+@charset "utf-8";
+/* NHN > UIT Center > Open UI Technology Team > Kim Taegon(gonom9@nhncorp.com) */
+
+/* toolbar */
+#toolbar { position:relative; z-index:1000; background:url(../images/bgMenu.gif) repeat-x 0 0; font-size:12px; height:35px; clear:both; }
+#toolbar *{ margin:0; padding:0;}
+#toolbar h1 { float:left; color:#fff; padding:10px 20px; font-size:12px;}
+#toolbar .tb-btn-active { font-weight:bold; }
+#toolbar .tb-menu-item-hover { color:white; background-color:navy; }
+#toolbar .tb-menu-item-selected { color:white; background-color:green; }
+
+#faceoffSelector { border:2px dotted #ff6600; }
+
+#smartmenu {  position:absolute; top:10px; right:10px; margin:0; padding:0; font-size:12px; color:#fff; white-space:nowrap;}
+#smartmenu li { display:none; list-style:none; font-weight:bold; }
+#smartmenu li.active{ display:block;}
+#smartmenu li dl{ margin:0; padding:0; display:inline;}
+#smartmenu li dt,
+#smartmenu li dd{ display:inline;}
+#smartmenu li dt{ color:#ccc;}
+#smartmenu li dd button{ background-color:#000; border:0; font-size:12px; font-family:Tahoma; font-weight:normal; color:#fff; cursor:pointer; border:1px solid #888; }
+#layout-preview { display:none; width:120px; left:0px; right:0px; }
+
+/* widgetMenu */
+#toolbar .widgetMenu{ height:35px; margin:0; padding:0; font-size:12px; line-height:1.2; background:url(../images/bgMenu.gif) repeat-x 0 0;}
+#toolbar .widgetMenu ul.widgetMenuList{ margin:0; padding:0; height:35px; float:left; }
+#toolbar .widgetMenu ul.widgetMenuList li ul{ display:none; position:absolute; top:35px; left:0; height:auto; padding:10px 15px; background:#595959; border:1px solid #444;}
+#toolbar .widgetMenu ul.widgetMenuList li.active ul{ display:block;}
+#toolbar .widgetMenu ul.widgetMenuList.aCenter{ margin-left:auto; margin-right:auto;}
+#toolbar .widgetMenu ul.widgetMenuList.aLeft{ margin-right:auto;}
+#toolbar .widgetMenu ul.widgetMenuList.aRight{ margin-left:auto;}
+#toolbar .widgetMenu li{ position:relative; padding-right:3px; float:left; list-style:none; background:url(../images/bgMenu.gif) no-repeat right -40px; white-space:nowrap;}
+#toolbar .widgetMenu li button{ position:relative; float:left; height:35px; color:#fff !important; text-decoration:none !important; cursor:pointer; background-color:transparent; border:0; font-weight:bold; font-size:12px; font-family:Tahoma;}
+#toolbar .widgetMenu li button span{ padding:0 15px;}
+#toolbar .widgetMenu li.first button{ background:url(../images/bgMenu.gif) no-repeat left -40px; color:#f00 !important;}
+#toolbar .widgetMenu li.active{ margin-left:-2px; background:url(../images/bgMenu.gif) no-repeat right -80px;}
+#toolbar .widgetMenu li.active button{ font-weight:bold; color:#ff0 !important; background:url(../images/bgMenu.gif) no-repeat left -80px;}
+#toolbar .widgetMenu li.active li{ float:none; background:none;}
+#toolbar .widgetMenu li.active li.active{ margin:0;}
+#toolbar .widgetMenu li li{ background:none; display:block !important; clear:both !important;}
+#toolbar .widgetMenu li li.first{ background:none;}
+#toolbar .widgetMenu li.active li.first{ padding-top:14px; background:url(../images/bgMenu.gif) no-repeat 30px top;}
+#toolbar .widgetMenu li li button{ background:none; height:auto; font-weight:normal; text-align:left; float:none; display:block;}
+#toolbar .widgetMenu li.active li button{ display:block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none; font-weight:normal;}
+#toolbar .widgetMenu li.active li.active button{ color:#ff0 !important;}
+
+/* preference dialog */
+#propertyDialog { position:absolute; border:1px solid silver; background-color:white; padding:15px 20px; z-index:110; -moz-border-radius:5px; -webkit-border-radius:5px; margin:0 auto; display:none; width:250px; left:20px; top:60px;}
+#propertyDialog fieldset{ border:1px dotted #ccc; padding:5px 10px; margin:0 0 10px 0; white-space:nowrap;}
+#propertyDialog legend{ font-weight:bold; background-color:#fff; padding:0 5px; }
+#propertyDialog label{ cursor:default;}
+#propertyDialog .more { display:none;  margin:0; padding:0 0 0 10px; border-left:2px solid #eee;}
+#propertyDialog .visible-more .more { display:block; }
+#propertyDialog .visible-more .inputall { display:none; }
+#propertyDialog .buttonArea{ text-align:center;}
+#propertyDialog button{ cursor:pointer;}
+.overlay { background-color:black; opacity:0.75; position:absolute; z-index:100; display:none; }
+
+/* layout preview */
+
+/* demoXe */
+#demoXe { position:absolute; background:#fff; border:2px solid #ddd; padding:5px; width:100px; display:none; }
+#demoXe * { margin:0; padding:0; font-size:0; line-height:0; }
+
+/* Container + Header + Body + Footer */
+#demoContainer { position:relative; }
+#demoHeader { position:relative; height:10px; *zoom:1;
+background:#ddd; margin-bottom:5px; }
+#demoHeader:after { content:""; display:block; clear:both; }
+#demoBody { position:relative; *zoom:1;
+margin-bottom:5px; }
+#demoBody:after { content:""; display:block; clear:both; }
+#demoContent { position:relative; height:40px; text-align:justify; background:#ddd; }
+#demoFooter { position:relative; height:10px; *zoom:1;
+background:#ddd; }
+#demoFooter address { text-align:center; }
+
+/* Layout Width */
+.demoFixed #demoContainer { width:100px; margin-left:auto; margin-right:auto; }
+.demoLiquid #demoContainer { width:90%; margin-left:auto; margin-right:auto; }
+.demoHybrid #demoContainer { width:90%; margin-left:auto; margin-right:auto; }
+
+/* Align Layout */
+.demoALeft #demoContainer { margin-left:0; }
+.demoARight #demoContainer { margin-right:0; }
+
+/* Extension */
+.demoExtension,
+.demoSection { position:relative; }
+#demoBody .demoExtension { position:relative; display:none; height:40px; background:#ddd; }
+#demoBody #demoContent { width:100%; height:40px; font-size:small; }
+.demoExtension .demoSection { }
+
+/* Layout Color */
+.demoLiquid #demoHeader,
+.demoLiquid #demoFooter,
+.demoLiquid #demoContent,
+.demoLiquid #demoBody .demoExtension { background:#999; }
+.demoHybrid #demoHeader,
+.demoHybrid #demoFooter,
+.demoHybrid #demoContent { background:#999; }
+
+/* ----- Fixed 2 Column Layout ----- */
+.demoFixed .demoCE #demoBody .demoE1,
+.demoFixed .demoEC #demoBody .demoE1 { width:15px; }
+.demoFixed .demoCE #demoBody #demoContent,
+.demoFixed .demoEC #demoBody #demoContent { width:80px; }
+.demoFixed .demoCE #demoBody #demoContent { float:left; }
+.demoFixed .demoEC #demoBody #demoContent { float:right; }
+.demoFixed .demoCE #demoBody .demoE1,
+.demoFixed .demoEC #demoBody .demoE1 { display:block; }
+.demoFixed .demoCE #demoBody .demoE1 { float:right; clear:right; }
+.demoFixed .demoEC #demoBody .demoE1 { float:left; clear:left; }
+
+/* ----- Liquid 2 Column Layout ----- */
+.demoLiquid .demoCE #demoBody .demoE1,
+.demoLiquid .demoEC #demoBody .demoE1 { width:15%; }
+.demoLiquid .demoCE #demoBody #demoContent,
+.demoLiquid .demoEC #demoBody #demoContent { width:80%; }
+.demoLiquid .demoCE #demoBody #demoContent { float:left; }
+.demoLiquid .demoEC #demoBody #demoContent { float:right; }
+.demoLiquid .demoCE #demoBody .demoE1,
+.demoLiquid .demoEC #demoBody .demoE1 { display:block; }
+.demoLiquid .demoCE #demoBody .demoE1 { float:right; clear:right; }
+.demoLiquid .demoEC #demoBody .demoE1 { float:left; clear:left; }
+
+/* ----- Hybrid 2 Column Layout ----- */
+.demoHybrid .demoCE #demoBody { padding-right:20px; }
+.demoHybrid .demoEC #demoBody { padding-left:20px; }
+.demoHybrid .demoCE #demoBody .demoE1,
+.demoHybrid .demoEC #demoBody .demoE1 { width:15px; }
+.demoHybrid .demoCE #demoBody #demoContent { float:left; }
+.demoHybrid .demoEC #demoBody #demoContent { float:right; }
+.demoHybrid .demoCE #demoBody .demoE1,
+.demoHybrid .demoEC #demoBody .demoE1 { display:block; }
+.demoHybrid .demoCE #demoBody .demoE1 { float:right; clear:right; margin-left:-15px; right:-20px; }
+.demoHybrid .demoEC #demoBody .demoE1 { float:left; clear:left; margin-right:-15px; left:-20px; }
+
+/* ----- Fixed 3 Column Layout ----- */
+.demoFixed .demoCEE #demoBody .demoE1,
+.demoFixed .demoCEE #demoBody .demoE2,
+.demoFixed .demoECE #demoBody .demoE1,
+.demoFixed .demoECE #demoBody .demoE2,
+.demoFixed .demoEEC #demoBody .demoE1,
+.demoFixed .demoEEC #demoBody .demoE2 { display:block; width:15px; }
+.demoFixed .demoCEE #demoBody #demoContent,
+.demoFixed .demoECE #demoBody #demoContent,
+.demoFixed .demoEEC #demoBody #demoContent { width:60px; }
+.demoFixed .demoCEE #demoBody #demoContent { float:left; margin-right:5px; }
+.demoFixed .demoECE #demoBody #demoContent { float:left; margin-right:-100%; left:20px; }
+.demoFixed .demoEEC #demoBody #demoContent { float:right; }
+.demoFixed .demoECE #demoBody .demoE1,
+.demoFixed .demoEEC #demoBody .demoE1 { float:left; margin-right:5px; }
+.demoFixed .demoCEE #demoBody .demoE1,
+.demoFixed .demoEEC #demoBody .demoE2 { float:left; }
+.demoFixed .demoCEE #demoBody .demoE2,
+.demoFixed .demoECE #demoBody .demoE2 { float:right; }
+
+/* ----- Liquid 3 Column Layout ----- */
+.demoLiquid .demoCEE #demoBody .demoE1,
+.demoLiquid .demoCEE #demoBody .demoE2,
+.demoLiquid .demoECE #demoBody .demoE1,
+.demoLiquid .demoECE #demoBody .demoE2,
+.demoLiquid .demoEEC #demoBody .demoE1,
+.demoLiquid .demoEEC #demoBody .demoE2 { display:block; width:15%; }
+.demoLiquid .demoCEE #demoBody #demoContent,
+.demoLiquid .demoECE #demoBody #demoContent,
+.demoLiquid .demoEEC #demoBody #demoContent { width:60%; }
+.demoLiquid .demoCEE #demoBody #demoContent { float:left; margin-right:5%; }
+.demoLiquid .demoECE #demoBody #demoContent { float:left; margin-right:-100%; left:20%; }
+.demoLiquid .demoEEC #demoBody #demoContent { float:right; }
+.demoLiquid .demoECE #demoBody .demoE1,
+.demoLiquid .demoEEC #demoBody .demoE1 { float:left; margin-right:5%; }
+.demoLiquid .demoCEE #demoBody .demoE1,
+.demoLiquid .demoEEC #demoBody .demoE2 { float:left; }
+.demoLiquid .demoCEE #demoBody .demoE2,
+.demoLiquid .demoECE #demoBody .demoE2 { float:right; }
+
+/* ----- Hybrid 3 Column Layout ----- */
+.demoHybrid .demoCEE #demoBody .demoE1,
+.demoHybrid .demoCEE #demoBody .demoE2,
+.demoHybrid .demoECE #demoBody .demoE1,
+.demoHybrid .demoECE #demoBody .demoE2,
+.demoHybrid .demoEEC #demoBody .demoE1,
+.demoHybrid .demoEEC #demoBody .demoE2 { display:block; width:15px; }
+.demoHybrid .demoCEE #demoBody { padding-right:40px; }
+.demoHybrid .demoECE #demoBody { padding-left:20px; padding-right:20px; }
+.demoHybrid .demoEEC #demoBody { padding-left:40px; }
+.demoHybrid .demoCEE #demoBody #demoContent,
+.demoHybrid .demoECE #demoBody #demoContent,
+.demoHybrid .demoEEC #demoBody #demoContent { width:100%; }
+.demoHybrid .demoCEE #demoBody #demoContent,
+.demoHybrid .demoECE #demoBody #demoContent { float:left; margin-right:-100%; }
+.demoHybrid .demoEEC #demoBody #demoContent { float:right; }
+.demoHybrid .demoECE #demoBody .demoE1,
+.demoHybrid .demoEEC #demoBody .demoE2 { float:left; left:-20px; margin-right:-20px; }
+.demoHybrid .demoEEC #demoBody .demoE1 { float:left; left:-40px; margin-right:-20px; }
+.demoHybrid .demoCEE #demoBody .demoE1,
+.demoHybrid .demoECE #demoBody .demoE2 { float:right; left:20px; margin-left:-15px; }
+.demoHybrid .demoCEE #demoBody .demoE2 { float:right; left:40px; margin-left:-15px; }
+
+.aboutFaceOff { background-color:#EEE; color:#000; padding:20px; }
+.aboutFaceOff h3 { padding:0; margin:0; font-size:14px; font-weight:bold; text-decoration:underline; margin-bottom:10px; }
+.aboutFaceOff p,
+.aboutFaceOff li { color:#666; }
+
+fieldset.hideOption { float:left; border:0; margin:0; padding:0; }
+fieldset.hideOption label { margin:10px 10px 0 10px !important; *margin-top:7px; font-family:tahoma; color:#fff !important; display:block; float:left;}
diff --git a/modules/layout/tpl/css/widget.css b/modules/layout/tpl/css/widget.css
index e27138fee..c3283cd11 100755
--- a/modules/layout/tpl/css/widget.css
+++ b/modules/layout/tpl/css/widget.css
@@ -1,801 +1,801 @@
-@charset "utf-8";
-/* NHN (developers@xpressengine.com) */
-
-/* common */
-.open{ display:block !important;}
-.floatLeft{ float:left;}
-.floatRight{ float:right;}
-.clearLeft{ clear:left;}
-.clearRight{ clear:right;}
-.widgetXeInputText{ border:1px solid; padding:2px 5px; font-size:12px;}
-.widgetXeInputCheck{ margin:0; width:13px; height:13px; vertical-align:middle;}
-.widgetXeInputSubmit{ padding:0;}
-.widgetXeAddress{ font-style:normal;}
-
-/* widgetContainer */
-.widgetContainer a{ text-decoration:none;}
-.widgetContainer a:hover,
-.widgetContainer a:active,
-.widgetContainer a:focus{ text-decoration:underline;}
-.widgetContainer img{ border:0;}
-.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
-.widgetContainer form{ margin:0; padding:0;}
-.widgetContainer fieldset{ border:0; margin:0; padding:0;}
-
-/* widgetDivider */
-dl.widgetDivider{ margin:0;}
-dl.widgetDivider dt{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0;}
-dl.widgetDivider dd{ display:none; margin:0;}
-
-/* widgetTableA */
-.widgetTableA { width:100%; font-size:12px; position:relative; border:0;}
-.widgetTableA td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:1px 5px 1px 5px;}
-.widgetTableA td.title{ width:100%; white-space:normal;}
-.widgetTableA td .board{ padding-right:5px;}
-.widgetTableA td .notice{ padding-right:5px;}
-.widgetTableA td .category{ padding-right:5px; font-weight:normal;}
-.widgetTableA td .replyNum a{ font:10px Tahoma;}
-.widgetTableA td .trackbackNum a{ font:10px Tahoma;}
-.widgetTableA td.author{}
-.widgetTableA td.time{ font-size:11px; font-family:Tahoma;}
-
-/* widgetTableB */
-.widgetTableB { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
-.widgetTableB td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:8px 5px 6px 5px; border-bottom:1px solid;}
-.widgetTableB td.title{ width:100%; white-space:normal;}
-.widgetTableB td .board{ padding-right:5px;}
-.widgetTableB td .notice{ padding-right:5px;}
-.widgetTableB td .category{ padding-right:5px; font-weight:normal;}
-.widgetTableB td .replyNum a{ font:10px Tahoma;}
-.widgetTableB td .trackbackNum a{ font:10px Tahoma;}
-.widgetTableB td.author{}
-.widgetTableB td.time{ font-size:11px; font-family:Tahoma;}
-
-/* widgetTableC */
-.widgetTableC { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
-.widgetTableC td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:10px; border-bottom:1px solid;}
-.widgetTableC td.title,
-.widgetTableC td.lastDoc{ width:100%; white-space:nowrap;}
-.widgetTableC td.docNum{}
-.widgetTableC td.docNum em{ display:block; padding:12px 0 0 5px; width:50px; height:21px; font-size:11px; font-weight:bold; font-style:normal; font-family:Tahoma; color:#fff; background:url(../img/white/iconForumNum.gif) no-repeat 0 0;}
-.widgetTableC td.title a{ font-weight:bold; text-decoration:underline !important;}
-.widgetTableC td.title dl{ margin:0;}
-.widgetTableC td.title dd{ margin:0;}
-.widgetTableC td.lastDoc p{ margin:0;}
-.widgetTableC td .author{ margin-right:5px;}
-.widgetTableC td .time{ font-size:11px; font-family:Tahoma;}
-.widgetTableC td .time .date{ margin-right:5px;}
-
-/* widgetUlistA */
-.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
-.widgetUlistA li{ list-style:none;}
-
-/* widgetUlistB */
-.widgetUlistB{ margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
-.widgetUlistB:after{ content:""; display:block; clear:both;}
-.widgetUlistB li{ position:relative; list-style:none; margin-bottom:10px; *zoom:1;}
-.widgetUlistB li .author{ float:left; margin-right:-42px;}
-.widgetUlistB li .author img{ border:1px solid;}
-.widgetUlistB li .title{ position:relative; margin:0 0 0 60px; border:2px solid; padding:10px 15px; _zoom:1;}
-.widgetUlistB li .title a{ text-decoration:underline;}
-.widgetUlistB li .title .arrow{ position:absolute; top:16px; left:-6px; display:block; overflow:hidden; width:6px; height:7px; font-size:0; line-height:0;}
-.widgetUlistB li .title .deco{ position:absolute; display:block; overflow:hidden; width:1px; height:1px; font-size:0; line-height:0;}
-.widgetUlistB li .title .deco .topLeft{}
-.widgetUlistB li .title .date{ font-size:11px; font-family:Tahoma;}
-.widgetUlistB li .title .hour{ font-size:11px; font-family:Tahoma;}
-
-/* widgetOlistA */
-.widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
-.widgetOlistA li{ margin-left:25px;}
-.widgetOlistA li sup{ font-size:9px; font-family:tahoma; padding-left:10px; }
-
-/* widgetDlistA */
-.widgetDlistA{ margin:0; padding:0; font-size:12px; line-height:1.5; zoom:1;}
-.widgetDlistA:after{ content:""; display:block; clear:both;}
-.widgetDlistA dt{ float:left; clear:left; margin-right:5px; white-space:nowrap;}
-.widgetDlistA dd{ clear:right; white-space:nowrap; font-family:Tahoma;}
-
-/* widgetGalleryA */
-.widgetGalleryA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1; _margin-right:-100%;}
-.widgetGalleryA:after{ content:""; display:block; clear:both;}
-.widgetGalleryA li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:0; white-space:nowrap; list-style:none;}
-.widgetGalleryA li.clearRight{ margin-right:0;}
-.widgetGalleryA li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
-.widgetGalleryA li .thumb img{ display:block; position:relative; width:100%;}
-.widgetGalleryA li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
-.widgetGalleryA li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetGalleryA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetGalleryA li .author{ display:block;}
-.widgetGalleryA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetGalleryA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetGalleryA li .date{ font:11px Tahoma;}
-.widgetGalleryA li .hour{ font:11px Tahoma;}
-
-/* widgetGalleryB */
-.widgetGalleryB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
-.widgetGalleryB:after{ content:""; display:block; clear:both;}
-.widgetGalleryB li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none; border-bottom:1px solid;}
-.widgetGalleryB li.clearRight{ margin-right:0;}
-.widgetGalleryB li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
-.widgetGalleryB li .thumb img{ display:block; position:relative; width:100%;}
-.widgetGalleryB li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
-.widgetGalleryB li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetGalleryB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetGalleryB li .author{ display:block;}
-.widgetGalleryB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetGalleryB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetGalleryB li .date{ font:11px Tahoma;}
-.widgetGalleryB li .hour{ font:11px Tahoma;}
-
-/* widgetZineA */
-.widgetZineA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
-.widgetZineA:after{ content:""; display:block; clear:both;}
-.widgetZineA li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; overflow:hidden; *zoom:1;}
-.widgetZineA li p{ margin:0;}
-.widgetZineA li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
-.widgetZineA li p.titleArea{ margin-left:120px; margin-bottom:4px;}
-.widgetZineA li p.titleArea .board{ padding-right:5px;}
-.widgetZineA li p.text{ margin-left:120px; margin-bottom:4px;}
-.widgetZineA li p.authorArea{ margin-left:120px;}
-.widgetZineA li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
-.widgetZineA li .thumb img{ position:relative; width:100%;}
-.widgetZineA li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
-.widgetZineA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetZineA li .title{ font-weight:bold;}
-.widgetZineA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetZineA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetZineA li .author{ margin-right:10px;}
-.widgetZineA li .date{ font:11px Tahoma;}
-.widgetZineA li .hour{ font:11px Tahoma;}
-
-/* widgetZineB */
-.widgetZineB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
-.widgetZineB:after{ content:""; display:block; clear:both;}
-.widgetZineB li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; border-bottom:1px solid;}
-.widgetZineB li p{ margin:0;}
-.widgetZineB li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
-.widgetZineB li p.titleArea{ margin-left:120px; margin-bottom:4px;}
-.widgetZineB li p.titleArea .board{ padding-right:5px;}
-.widgetZineB li p.text{ margin-left:120px; margin-bottom:4px;}
-.widgetZineB li p.authorArea{ margin-left:120px;}
-.widgetZineB li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
-.widgetZineB li .thumb img{ position:relative; width:100%;}
-.widgetZineB li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
-.widgetZineB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetZineB li .title{ font-weight:bold;}
-.widgetZineB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetZineB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
-.widgetZineB li .author{ margin-right:10px;}
-.widgetZineB li .date{ font:11px Tahoma;}
-.widgetZineB li .hour{ font:11px Tahoma;}
-
-/* WidgetTree */
-.widgetTree *{ margin:0; padding:0; font-size:12px;}
-.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
-.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1;}
-.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
-.widgetTree ul li a,
-.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
-.widgetTree ul li a.selected {font-weight:bold;}
-.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -1px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
-.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
-.widgetTree ul li ul li{ display:none;}
-.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
-.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
-.widgetTree ul li.nav_tree_on ul{ display:block;}
-.widgetTree ul li.nav_tree_on ul li{ display:block;}
-.widgetTree ul li.nav_tree_off ul{ display:none;}
-.widgetTree ul li.nav_tree_off ul li{ display:none;}
-.widgetTree .icon{ position:relative; left:16px;}
-
-/* widgetLogin */
-.widgetLogin{ font-size:12px;}
-.widgetLogin fieldset{ border:0; margin:0; padding:0;}
-.widgetLogin dl{ margin:0;}
-.widgetLogin dt{ display:none;}
-.widgetLogin dd{ margin:0 0 5px 0;}
-.widgetLogin dd .widgetXeInputText{ width:90%; height:16px;}
-.widgetLogin p{ margin:5px 0;}
-.widgetLogin p .widgetXeInputCheck{ margin-right:5px;}
-.widgetLogin .help{ position:relative; width:100%; overflow:hidden; margin:10px 0 0 0; padding:0;}
-.widgetLogin .help li{ position:relative; left:-5px; padding-left:5px; list-style:none; display:inline; letter-spacing:-1px;}
-
-/* widgetLastLogin */
-.widgetLastLogin{ margin:10px 0; font-size:12px;}
-.widgetLastLogin dt,
-.widgetLastLogin dd{ display:inline; margin:0;}
-.widgetLastLogin dd{ font-size:11px; font-family:Tahoma;}
-
-/* widgetMyInfo */
-.widgetMyInfo{ margin:0; padding:0; font-size:12px;}
-.widgetMyInfo:after{ content:""; display:block; clear:both; *zoom:1;}
-.widgetMyInfo li{ margin-bottom:5px; padding:0; text-indent:12px; list-style:none;}
-
-/* widgetLevel */
-.widgetLevel{ padding-left:30px; background-repeat:no-repeat; background-position:left 30%;}
-.widgetLevel em{ display:block; width:0; height:0; overflow:hidden; font-size:0; line-height:0; position:absolute;}
-
-/* widgetCounter */
-.widgetCounter{ font-size:12px; margin:0;}
-.widgetCounter dt,
-.widgetCounter dd{ height:18px;}
-.widgetCounter dt{ float:left; clear:left;}
-.widgetCounter dd{ font-size:11px; font-family:Tahoma;}
-
-/* widgetLanguage */
-.widgetLanguage p{ float:right; margin:0;}
-.widgetLanguage .langList{ display:none; position:absolute; margin:0; padding:0; z-index:999;}
-.widgetLanguage .langList li{ list-style:none;}
-.widgetLanguage .langList li a{ font-size:12px; display:block; padding:2px 5px;}
-
-/* widgetTabA */
-.widgetTabA{ position:relative; margin:0; padding:0; *zoom:1; border-bottom:2px solid;}
-.widgetTabA:after{ content:""; display:block; clear:both;}
-.widgetTabA li{ float:left; margin-right:1px; list-style:none; background-repeat:no-repeat; background-position:0 0;}
-.widgetTabA li.active{ background-position:0 -30px;}
-.widgetTabA li a{ position:relative; left:2px; float:left; height:20px; padding:8px 15px 0 15px; text-decoration:none; font-size:12px; background-repeat:no-repeat; background-position:right 0;}
-.widgetTabA li.active a{ background-position:right -30px; font-weight:bold; letter-spacing:-1px;}
-
-/* widgetTabB */
-.widgetTabB{ margin:0; position:absolute; top:1px; right:0; white-space:nowrap; font-size:12px;}
-.widgetTabB li{ display:inline;}
-.widgetTabB li.active a{ font-weight:bold;}
-
-/* widgetTabC */
-.widgetTabC{ margin:0; padding:0; font-size:12px; border-top:1px solid;}
-.widgetTabC li{ list-style:none; border-bottom:1px solid; *zoom:1; margin-bottom:1px;}
-.widgetTabC li a{ display:block; padding:7px 0 6px 10px; text-decoration:none; *zoom:1;}
-
-/* widgetThumb */
-.widgetThumb{ position:relative; margin:0; text-align:center; font-size:12px; line-height:1.5;}
-.widgetThumb .thumb{ display:block; margin-bottom:5px; position:relative; *zoom:1; text-decoration:none; _float:left;}
-.widgetThumb .thumb img{ display:block; width:100%;}
-.widgetThumb .thumb .imgNone{ display:block; position:relative; width:100%; padding-top:30px; padding-bottom:50px; background:#eee; text-align:center; cursor:pointer; color:#000;}
-.widgetThumb .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
-.widgetThumb .title{ display:block;}
-.widgetThumb .author{ display:block;}
-.widgetThumb .date{ font-size:11px; font-family:Tahoma;}
-.widgetThumb .hour{ font-size:11px; font-family:Tahoma;}
-
-/* widgetContainer */
-.widgetContainer{ *zoom:1;}
-.widgetContainer:after{ content:""; display:block; clear:both;}
-
-/* widgetNavigator */
-.widgetNavigator{ margin:0; padding:0; text-align:right; clear:both;}
-.widgetNavigator li{ list-style:none; display:inline;}
-.widgetNavigator li button{ width:16px; height:16px; padding:0; background-color:transparent; background-image:url(../img/white/buttonWidgetNavigation.gif); border:1px solid #999; cursor:pointer;}
-.widgetNavigator li button.prev{ background-position:left center; *background-position:-1px center;}
-.widgetNavigator li button.next{ background-position:right center; *background-position:13px center;}
-.widgetNavigator li button span{ position:absolute; display:block; width:0; height:0; overflow:hidden; visibility:hidden;}
-
-/* widgetTagCloud */
-.widgetTagCloud { text-align:justify; font-size:12px; line-height:1.5; margin:0; padding:0;}
-.widgetTagCloud li{ display:inline; white-space:nowrap; list-style:none;}
-.widgetTagCloud li.level1 a{ font-size:11px;}
-.widgetTagCloud li.level2 a{ font-size:12px;}
-.widgetTagCloud li.level3 a{ font-size:14px; font-weight:bold;}
-.widgetTagCloud li.level4 a{ font-size:18px; font-weight:bold;}
-
-/* widgetCalendar */
-.widgetCalendarNavigation{ position:relative; height:15px; margin-bottom:-15px; z-index:10;}
-.widgetCalendarNavigation button{ position:absolute; top:0; font-size:10px; font-family:Tahoma; background:none; border:0; padding:0; cursor:pointer;}
-.widgetCalendarNavigation button.prevYear{ left:0;}
-.widgetCalendarNavigation button.prevMonth{ left:25px;}
-.widgetCalendarNavigation button.nextYear{ right:0;}
-.widgetCalendarNavigation button.nextMonth{ right:25px;}
-.widgetCalendar{ position:relative; border:0; width:100%;}
-.widgetCalendar caption { position:relative; padding-bottom:5px; text-align:center; font-size:12px; font-weight:bold; font-family:Tahoma;}
-.widgetCalendar th,
-.widgetCalendar td{ border:0; text-align:center; padding:5px 0;}
-.widgetCalendar th{ font-size:10px; font-family:Tahoma; font-weight:normal;}
-.widgetCalendar td,
-.widgetCalendar td a{ font-size:11px; font-family:Tahoma;}
-.widgetCalendar td em{ font-style:normal;}
-
-/* widgetPoint */
-.widgetPoint{ margin:0; *zoom:1; clear:both;}
-.widgetPoint:after{ content:""; display:block; clear:both;}
-.widgetPoint dt{ font-size:12px; font-family:Tahoma; font-weight:bold;}
-.widgetPoint dd{ margin:0;}
-.widgetPoint dd.graph{ height:5px; overflow:hidden; background:#e5e5e5; font-size:0; line-height:0;}
-.widgetPoint dd.graph img{ width:0%;}
-.widgetPoint dd.point{ font-size:10px; font-family:Tahoma; float:left; color:#888;}
-.widgetPoint dd.percentage{ font-size:10px; font-family:Tahoma; float:right; color:#888;}
-
-/* widgetMenuA */
-.widgetMenuA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.2; border-top:1px solid;}
-.widgetMenuA li{ position:relative; list-style:none; border-bottom:1px solid; *zoom:1;}
-.widgetMenuA li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
-.widgetMenuA li li.active sup{ color:#ff1a1a;}
-.widgetMenuA li li{ padding:0; border:0;}
-.widgetMenuA li ul{ display:none; margin:0 0 10px 20px; padding:0;}
-.widgetMenuA li.active ul{ display:block;}
-.widgetMenuA li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important;}
-.widgetMenuA li.active a{ font-weight:bold;}
-.widgetMenuA li.active li a{ font-weight:normal; padding:1px 0; background:none !important;}
-.widgetMenuA li li.active a{ color:#ff1a1a;}
-.widgetMenuA li.active li a:hover,
-.widgetMenuA li.active li a:active,
-.widgetMenuA li.active li a:focus{ text-decoration:underline !important;}
-
-/* widgetMenuB */
-.widgetMenuB{ margin:0; padding:0; font-size:12px; line-height:1.3; border-top:1px solid;}
-.widgetMenuB li{ position:relative; list-style:none; border-bottom:1px solid; white-space:nowrap; *zoom:1;}
-.widgetMenuB li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
-.widgetMenuB li li{ padding:2px 10px; border:none;}
-.widgetMenuB li li.first{ left:-4px; padding-left:14px; background-repeat:no-repeat; background-position:0 center;}
-.widgetMenuB li li.active sup{ color:#ff1a1a;}
-.widgetMenuB li ul{ position:absolute; display:none; top:-1px; left:100%; margin:0 0 0 5px; padding:5px 0 10px 0; border:1px solid}
-.widgetMenuB li.active{ z-index:100;}
-.widgetMenuB li.active ul{ display:block;}
-.widgetMenuB li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important; *zoom:1;}
-.widgetMenuB li.active a{ font-weight:bold;}
-.widgetMenuB li.active li a{ font-weight:normal; padding:0; background:none !important;}
-.widgetMenuB li li.active a{ color:#ff1a1a;}
-.widgetMenuB li.active li a:hover,
-.widgetMenuB li.active li a:active,
-.widgetMenuB li.active li a:focus{ text-decoration:underline !important;}
-
-.widgetMenuC{ margin:0; padding:0; font-size:12px; line-height:1.2; background-repeat:repeat-x;background-position:0 0;}
-.widgetMenuC ul{ margin:0; padding:0; height:35px;}
-.widgetMenuC ul li ul{ display:none; position:absolute; top:40px; left:20px; height:auto; padding-bottom:7px; background:#35ad06; border:1px solid #027a00;}
-.widgetMenuC ul li.active ul{ display:block;}
-.widgetMenuC ul.aCenter{ margin-left:auto; margin-right:auto;}
-.widgetMenuC ul.aLeft{ margin-right:auto;}
-.widgetMenuC ul.aRight{ margin-left:auto;}
-.widgetMenuC li{ position:relative; padding-right:3px; float:left; list-style:none; background-repeat:no-repeat;background-position:right -40px; white-space:nowrap;}
-.widgetMenuC li a{ position:relative; float:left; padding:12px 22px 0 25px; height:23px; color:#fff !important; text-decoration:none !important;}
-.widgetMenuC li.first a{ background-repeat:no-repeat;background-position:left -40px;}
-.widgetMenuC li.active{ margin-left:-2px; background-repeat:no-repeat;background-position:right -80px;}
-.widgetMenuC li.active a{ font-weight:bold; color:#ff0 !important; background-repeat:no-repeat; background-position:left -80px;}
-.widgetMenuC li.active li{ padding:2px 15px; float:none; background:none;}
-.widgetMenuC li.active li.active{ margin:0;}
-.widgetMenuC li.active li.first{ margin-top:-4px; padding-top:14px; background-repeat:no-repeat; background-position:30px top;}
-.widgetMenuC li.active li a{ display:block; _display:inline-block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none;}
-.widgetMenuC li.active li.active a{ color:#ff0 !important;}
-.widgetMenuC li.active li a:hover,
-.widgetMenuC li.active li a:active,
-.widgetMenuC li.active li a:focus{ text-decoration:underline !important;}
-
-/* widgetSearch */
-.widgetSearch{ position:absolute; bottom:30px; right:0;}
-.widgetSearch fieldset{ border:0; margin:0; padding:0; position:absolute; bottom:0; right:0;}
-.widgetSearch .widgetXeInputText{ width:153px; height:16px; padding:2px 20px 2px 5px; vertical-align:middle; border:1px solid #666; border-top-color:#555; border-left-color:#555; background:#444; color:#fff;}
-.widgetSearch .widgetXeInputText:focus{ background:#494949;}
-.widgetSearch .widgetSearch{ position:absolute; top:3px; right:4px; vertical-align:middle;}
-
-address.period { font-style:normal; font-size:10px; font-family:tahoma; text-align:right;}
-
-/* white coloset */
-.widgetContainer .widgetXeInputText{ border-color:#ccc; background:#f4f4f4; color:#000;}
-
-/* widgetTableA */
-.widgetContainer .widgetTableA td.title a{ color:#333;}
-.widgetContainer .widgetTableA td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetTableA td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetTableA td .replyNum a{ color:#ff1a1a;}
-.widgetContainer .widgetTableA td .trackbackNum a{ color:#66c;}
-.widgetContainer .widgetTableA td .author { color:#333;}
-.widgetContainer .widgetTableA td .date{ color:#333;}
-.widgetContainer .widgetTableA td .hour{ color:#888;}
-
-/* widgetTableB */
-.widgetContainer .widgetTableB,
-.widgetContainer .widgetTableB td{ border-color:#e5e5e5;}
-.widgetContainer .widgetTableB td.title a{ color:#333;}
-.widgetContainer .widgetTableB td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetTableB td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetTableB td .replyNum a{ color:#ff1a1a;}
-.widgetContainer .widgetTableB td .trackbackNum a{ color:#66c;}
-.widgetContainer .widgetTableB td .author { color:#333;}
-.widgetContainer .widgetTableB td .date{ color:#333;}
-.widgetContainer .widgetTableB td .hour{ color:#888;}
-
-/* widgetTableC */
-.widgetContainer .widgetTableC{ border-color:#e5e5e5;}
-.widgetContainer .widgetTableC td{ border-color:#e5e5e5;}
-.widgetContainer .widgetTableC td.title a{ color:#333;}
-.widgetContainer .widgetTableC td.title dd{ color:#888;}
-.widgetContainer .widgetTableC td.lastDoc p a{ color:#333;}
-.widgetContainer .widgetTableC td.lastDoc .author{ color:#888;}
-.widgetContainer .widgetTableC td.lastDoc .time{ color:#888;}
-
-/* widgetUlistA */
-.widgetContainer .widgetUlistA li a{ color:#666;}
-
-/* widgetUlistB */
-.widgetContainer .widgetUlistB li .author img{ border-color:#ccc;}
-.widgetContainer .widgetUlistB li .title{ border-color:#eee; color:#333; background:#fff;}
-.widgetContainer .widgetUlistB li .title a{ color:#0066ff;}
-.widgetContainer .widgetUlistB li .title .arrow{ background:url(../img/white/arrowUlistB.gif) no-repeat;}
-.widgetContainer .widgetUlistB li .title .deco{ background:#fff;}
-.widgetContainer .widgetUlistB li .title .date{ color:#333;}
-.widgetContainer .widgetUlistB li .title .hour{ color:#888;}
-
-/* widgetOlistA */
-.widgetContainer .widgetOlistA li,
-.widgetContainer .widgetOlistA li a{ color:#666;}
-.widgetContainer .widgetOlistA li sup{ color:#AAA;}
-
-/* widgetDlistA */
-.widgetContainer .widgetDlistA dt{ color:#333;}
-.widgetContainer .widgetDlistA dd,
-.widgetContainer .widgetDlistA  dd a{ color:#888;}
-
-/* widgetGalleryA */
-.widgetContainer .widgetGalleryA li .title{ color:#333;}
-.widgetContainer .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
-.widgetContainer .widgetGalleryA li .trackbackNum a{ color:#66c;}
-.widgetContainer .widgetGalleryA li .author{ color:#333;}
-.widgetContainer .widgetGalleryA li .date{ color:#333;}
-.widgetContainer .widgetGalleryA li .hour{ color:#888;}
-
-/* widgetGalleryB */
-.widgetContainer .widgetGalleryB li{ border-color:#e5e5e5;}
-.widgetContainer .widgetGalleryB li .title{ color:#333;}
-.widgetContainer .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
-.widgetContainer .widgetGalleryB li .trackbackNum a{ color:#66c;}
-.widgetContainer .widgetGalleryB li .author{ color:#333;}
-.widgetContainer .widgetGalleryB li .date{ color:#333;}
-.widgetContainer .widgetGalleryB li .hour{ color:#888;}
-
-/* widgetZineA */
-.widgetContainer .widgetZineA li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetZineA li .title{ color:#666;}
-.widgetContainer .widgetZineA li .replyNum a{ color:#ff1a1a;}
-.widgetContainer .widgetZineA li .trackbackNum a{ color:#66c;}
-.widgetContainer .widgetZineA li .author{ color:#333;}
-.widgetContainer .widgetZineA li .date{ color:#333;}
-.widgetContainer .widgetZineA li .hour{ color:#888;}
-.widgetContainer .widgetZineA li .text{ color:#888;}
-
-/* widgetZineB */
-.widgetContainer .widgetZineB li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer .widgetZineB li{ border-color:#e5e5e5;}
-.widgetContainer .widgetZineB li .title{ color:#666;}
-.widgetContainer .widgetZineB li .replyNum a{ color:#ff1a1a;}
-.widgetContainer .widgetZineB li .trackbackNum a{ color:#66c;}
-.widgetContainer .widgetZineB li .author{ color:#333;}
-.widgetContainer .widgetZineB li .date{ color:#333;}
-.widgetContainer .widgetZineB li .hour{ color:#888;}
-.widgetContainer .widgetZineB li .text{ color:#888;}
-
-/* widgetLogin */
-.widgetContainer .widgetLogin label{ color:#333;}
-.widgetContainer .widgetLogin .help a{ color:#333;}
-.widgetContainer .widgetLogin .help li{ background:url(../img/white/lineTextDiv.gif) no-repeat left center;}
-
-/* widgetLastLogin */
-.widgetContainer .widgetLastLogin dt{ color:#333;}
-.widgetContainer .widgetLastLogin dd{ color:#888;}
-.widgetContainer .widgetLastLogin a{ color:#333;}
-.widgetContainer .widgetLastLogin li{ background:url(../img/white/iconInfoMine.gif) no-repeat left center;}
-
-/* widgetMyInfo */
-.widgetContainer .widgetMyInfo li a{ color:#666;}
-.widgetContainer .widgetMyInfo li{ background:url(../img/white/iconMyInfo.gif) no-repeat left 1px;}
-
-/* widgetTree */
-.widgetContainer .widgetTree{ color:#333;}
-.widgetContainer .widgetTree a{ color:#333;}
-
-/* widgetCounter */
-.widgetContainer .widgetCounter dt{ color:#333;}
-.widgetContainer .widgetCounter dd{ color:#888;}
-
-/* widgetLanguage */
-.widgetContainer .widgetLanguage p a{ color:#b3b3b3;}
-.widgetContainer .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
-.widgetContainer .widgetLanguage .langList a{ color:#333;}
-
-/* Widget Tree */
-.widgetContainer .widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
-.widgetContainer .widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
-.widgetContainer .widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
-.widgetContainer .widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
-
-/* widgetTabA */
-.widgetContainer .widgetTabA{ border-color:#666;}
-.widgetContainer .widgetTabA li,
-.widgetContainer .widgetTabA li a{ background-image:url(../img/white/buttonWidgetTab.gif);}
-.widgetContainer .widgetTabA li a{ color:#333;}
-
-/* widgetTabB */ 
-.widgetContainer .widgetTabB li a{ color:#333;}
-
-/* widgetTabC */
-.widgetContainer .widgetTabC{ border-color:#e5e5e5;}
-.widgetContainer .widgetTabC li{ border-color:#e5e5e5; background:#f8f8f8;}
-.widgetContainer .widgetTabC li a{ color:#333;}
-.widgetContainer .widgetTabC li a:hover,
-.widgetContainer .widgetTabC li a:active,
-.widgetContainer .widgetTabC li a:focus{ background:#eee;}
-
-/* widgetThumb */
-.widgetContainer .widgetThumb{ color:#333;}
-.widgetContainer .widgetThumb a{ color:#333;}
-.widgetContainer .widgetThumb .hour{ color:#888;}
-
-/* widgetTagCloud */
-.widgetContainer .widgetTagCloud li a{ color:#666;}
-.widgetContainer .widgetTagCloud li.level1 a{ color:#999;}
-.widgetContainer .widgetTagCloud li.level2 a{ color:#666;}
-.widgetContainer .widgetTagCloud li.level3 a{ color:#333;}
-.widgetContainer .widgetTagCloud li.level4 a{ color:#000;}
-
-/* widgetCalendar */
-.widgetContainer .widgetCalendarNavigation button{ color:#333;}
-.widgetContainer .widgetCalendar caption{ color:#333;}
-.widgetContainer .widgetCalendar th{ background:#eee; color:#333;}
-.widgetContainer .widgetCalendar th.sun,
-.widgetContainer .widgetCalendar td.sun,
-.widgetContainer .widgetCalendar td em{ color:#ff1a1a;}
-.widgetContainer .widgetCalendar td,
-.widgetContainer .widgetCalendar td a{ color:#666;}
-.widgetContainer .widgetCalendar td.sun a{ color:#ff1a1a;}
-
-/* widgetPoint */
-.widgetContainer .widgetPoint dt{ color:#333;}
-
-/* widgetMenuA */
-.widgetContainer .widgetMenuA{ border-color:#e5e5e5;}
-.widgetContainer .widgetMenuA li{ border-color:#e5e5e5;}
-.widgetContainer .widgetMenuA li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
-.widgetContainer .widgetMenuA li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
-
-/* widgetMenuB */
-.widgetContainer .widgetMenuB{ border-color:#e5e5e5;}
-.widgetContainer .widgetMenuB li{ border-color:#e5e5e5;}
-.widgetContainer .widgetMenuB li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
-.widgetContainer .widgetMenuB li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
-.widgetContainer .widgetMenuB li ul{ border-color:#ddd; background:#fff;}
-.widgetContainer .widgetMenuB li li.first{ background-image:url(../img/white/arrowMenuB.gif);}
-
-/* widgetMenuCgreen */
-.widgetContainer .widgetMenuCgreen{ background-image:url(../img/white/bgMenuCgreen.gif);}
-.widgetContainer .widgetMenuCgreen ul li ul{ background:#35ad06; border-color:#027a00;}
-.widgetContainer .widgetMenuCgreen li{ background-image:url(../img/white/bgMenuCgreen.gif);}
-.widgetContainer .widgetMenuCgreen li.first a{ background-image:url(../img/white/bgMenuCgreen.gif);}
-.widgetContainer .widgetMenuCgreen li.active{ background-image:url(../img/white/bgMenuCgreen.gif);}
-.widgetContainer .widgetMenuCgreen li.active a{ background-image:url(../img/white/bgMenuCgreen.gif);}
-.widgetContainer .widgetMenuCgreen li.active li.first{ background-image:url(../img/white/arrowMenuCgreen.gif);}
-
-/* widgetMenuCblue */
-.widgetContainer .widgetMenuCblue{ background-image:url(../img/white/bgMenuCblue.gif);}
-.widgetContainer .widgetMenuCblue ul li ul{ background:#0688ad; border-color:#00557a;}
-.widgetContainer .widgetMenuCblue li{ background-image:url(../img/white/bgMenuCblue.gif);}
-.widgetContainer .widgetMenuCblue li.first a{ background-image:url(../img/white/bgMenuCblue.gif);}
-.widgetContainer .widgetMenuCblue li.active{ background-image:url(../img/white/bgMenuCblue.gif);}
-.widgetContainer .widgetMenuCblue li.active a{ background-image:url(../img/white/bgMenuCblue.gif);}
-.widgetContainer .widgetMenuCblue li.active li.first{ background-image:url(../img/white/arrowMenuCblue.gif);}
-
-/* widgetMenuCcyan */
-.widgetContainer .widgetMenuCcyan{ background-image:url(../img/white/bgMenuCcyan.gif);}
-.widgetContainer .widgetMenuCcyan ul li ul{ background:#06a4ad; border-color:#00717a;}
-.widgetContainer .widgetMenuCcyan li{ background-image:url(../img/white/bgMenuCcyan.gif);}
-.widgetContainer .widgetMenuCcyan li.first a{ background-image:url(../img/white/bgMenuCcyan.gif);}
-.widgetContainer .widgetMenuCcyan li.active{ background-image:url(../img/white/bgMenuCcyan.gif);}
-.widgetContainer .widgetMenuCcyan li.active a{ background-image:url(../img/white/bgMenuCcyan.gif);}
-.widgetContainer .widgetMenuCcyan li.active li.first{ background-image:url(../img/white/arrowMenuCcyan.gif);}
-
-/* widgetMenuCorange */
-.widgetContainer .widgetMenuCorange{ background-image:url(../img/white/bgMenuCorange.gif);}
-.widgetContainer .widgetMenuCorange ul li ul{ background:#ad9906; border-color:#7a6600;}
-.widgetContainer .widgetMenuCorange li{ background-image:url(../img/white/bgMenuCorange.gif);}
-.widgetContainer .widgetMenuCorange li.first a{ background-image:url(../img/white/bgMenuCorange.gif);}
-.widgetContainer .widgetMenuCorange li.active{ background-image:url(../img/white/bgMenuCorange.gif);}
-.widgetContainer .widgetMenuCorange li.active a{ background-image:url(../img/white/bgMenuCorange.gif);}
-.widgetContainer .widgetMenuCorange li.active li.first{ background-image:url(../img/white/arrowMenuCorange.gif);}
-
-/* widgetMenuCred */
-.widgetContainer .widgetMenuCred{ background-image:url(../img/white/bgMenuCred.gif);}
-.widgetContainer .widgetMenuCred ul li ul{ background:#ad4606; border-color:#7a1300;}
-.widgetContainer .widgetMenuCred li{ background-image:url(../img/white/bgMenuCred.gif);}
-.widgetContainer .widgetMenuCred li.first a{ background-image:url(../img/white/bgMenuCred.gif);}
-.widgetContainer .widgetMenuCred li.active{ background-image:url(../img/white/bgMenuCred.gif);}
-.widgetContainer .widgetMenuCred li.active a{ background-image:url(../img/white/bgMenuCred.gif);}
-.widgetContainer .widgetMenuCred li.active li.first{ background-image:url(../img/white/arrowMenuCred.gif);}
-
-/* widgetMenuCgray */
-.widgetContainer .widgetMenuCgray{ background-image:url(../img/white/bgMenuCgray.gif);}
-.widgetContainer .widgetMenuCgray ul li ul{ background:#595959; border-color:#7a1300;}
-.widgetContainer .widgetMenuCgray li{ background-image:url(../img/white/bgMenuCgray.gif);}
-.widgetContainer .widgetMenuCgray li.first a{ background-image:url(../img/white/bgMenuCgray.gif);}
-.widgetContainer .widgetMenuCgray li.active{ background-image:url(../img/white/bgMenuCgray.gif);}
-.widgetContainer .widgetMenuCgray li.active a{ background-image:url(../img/white/bgMenuCgray.gif);}
-.widgetContainer .widgetMenuCgray li.active li.first{ background-image:url(../img/white/arrowMenuCgray.gif);}
-
-.widgetContainer address.period { color:#AAA; }
-
-/* black colorset Class */
-.widgetContainer.black .widgetXeInputText{ border-color:#666; background:#333; color:#ccc;}
-
-/* widgetTableA */
-.widgetContainer.black .widgetTableA td.title a{ color:#999;}
-.widgetContainer.black .widgetTableA td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetTableA td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetTableA td .replyNum{ color:#ff1a1a;}
-.widgetContainer.black .widgetTableA td .trackbackNum{ color:#66c;}
-.widgetContainer.black .widgetTableA td .author { color:#999;}
-.widgetContainer.black .widgetTableA td .date{ color:#999;}
-.widgetContainer.black .widgetTableA td .hour{ color:#888;}
-
-/* widgetTableB */
-.widgetContainer.black .widgetTableB,
-.widgetContainer.black .widgetTableB td{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetTableB td.title a{ color:#999;}
-.widgetContainer.black .widgetTableB td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetTableB td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetTableB td .replyNum{ color:#ff1a1a;}
-.widgetContainer.black .widgetTableB td .trackbackNum{ color:#66c;}
-.widgetContainer.black .widgetTableB td .author { color:#999;}
-.widgetContainer.black .widgetTableB td .date{ color:#999;}
-.widgetContainer.black .widgetTableB td .hour{ color:#888;}
-
-/* widgetTableC */
-.widgetContainer.black .widgetTableC{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetTableC td{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetTableC td.title a{ color:#ccc;}
-.widgetContainer.black .widgetTableC td.title dd{ color:#888;}
-.widgetContainer.black .widgetTableC td.lastDoc p a{ color:#ccc;}
-.widgetContainer.black .widgetTableC td.lastDoc .author{ color:#888;}
-.widgetContainer.black .widgetTableC td.lastDoc .time{ color:#888;}
-
-/* widgetUlistA */
-.widgetContainer.black .widgetUlistA li a{ color:#999;}
-
-/* widgetUlistB */
-.widgetContainer.black .widgetUlistB li .author img{ border-color:#666;}
-.widgetContainer.black .widgetUlistB li .title{ border-color:#333; color:#999; background:#000;}
-.widgetContainer.black .widgetUlistB li .title a{ color:#3399ff;}
-.widgetContainer.black .widgetUlistB li .title .arrow{ background:url(../img/black/arrowUlistB.gif) no-repeat;}
-.widgetContainer.black .widgetUlistB li .title .deco{ background:#000;}
-.widgetContainer.black .widgetUlistB li .title .date{ color:#999;}
-.widgetContainer.black .widgetUlistB li .title .hour{ color:#888;}
-
-/* widgetOlistA */
-.widgetContainer.black .widgetOlistA li,
-.widgetContainer.black .widgetOlistA li a{ color:#999;}
-.widgetContainer.black .widgetOlistA li sup{ color:#666;}
-
-/* widgetDlistA */
-.widgetContainer.black .widgetDlistA dt{ color:#999;}
-.widgetContainer.black .widgetDlistA dd,
-.widgetContainer.black .widgetDlistA  dd a{ color:#888;}
-
-/* widgetGalleryA */
-.widgetContainer.black .widgetGalleryA li .title{ color:#999;}
-.widgetContainer.black .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
-.widgetContainer.black .widgetGalleryA li .trackbackNum a{ color:#66c;}
-.widgetContainer.black .widgetGalleryA li .author{ color:#999;}
-.widgetContainer.black .widgetGalleryA li .date{ color:#999;}
-.widgetContainer.black .widgetGalleryA li .hour{ color:#888;}
-
-/* widgetGalleryB */
-.widgetContainer.black .widgetGalleryB li{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetGalleryB li .title{ color:#999;}
-.widgetContainer.black .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
-.widgetContainer.black .widgetGalleryB li .trackbackNum a{ color:#66c;}
-.widgetContainer.black .widgetGalleryB li .author{ color:#999;}
-.widgetContainer.black .widgetGalleryB li .date{ color:#999;}
-.widgetContainer.black .widgetGalleryB li .hour{ color:#888;}
-
-/* widgetZineA */
-.widgetContainer.black .widgetZineA li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetZineA li .title{ color:#999;}
-.widgetContainer.black .widgetZineA li .replyNum a{ color:#ff1a1a;}
-.widgetContainer.black .widgetZineA li .trackbackNum a{ color:#66c;}
-.widgetContainer.black .widgetZineA li .author{ color:#999;}
-.widgetContainer.black .widgetZineA li .date{ color:#999;}
-.widgetContainer.black .widgetZineA li .hour{ color:#888;}
-.widgetContainer.black .widgetZineA li .text{ color:#888;}
-
-/* widgetZineB */
-.widgetContainer.black .widgetZineB li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
-.widgetContainer.black .widgetZineB li{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetZineB li .title{ color:#999;}
-.widgetContainer.black .widgetZineB li .replyNum a{ color:#ff1a1a;}
-.widgetContainer.black .widgetZineB li .trackbackNum a{ color:#66c;}
-.widgetContainer.black .widgetZineB li .author{ color:#999;}
-.widgetContainer.black .widgetZineB li .date{ color:#999;}
-.widgetContainer.black .widgetZineB li .hour{ color:#888;}
-.widgetContainer.black .widgetZineB li .text{ color:#888;}
-
-/* widgetLogin */
-.widgetContainer.black .widgetLogin label{ color:#999;}
-.widgetContainer.black .widgetLogin .help a{ color:#ccc;}
-.widgetContainer.black .widgetLogin .help li{ background:url(../img/black/lineTextDiv.gif) no-repeat left center;}
-
-/* widgetLastLogin */
-.widgetContainer.black .widgetLastLogin dt{ color:#999;}
-.widgetContainer.black .widgetLastLogin dd{ color:#888;}
-.widgetContainer.black .widgetLastLogin a{ color:#333;}
-.widgetContainer.black .widgetLastLogin li{ background:url(../img/black/iconInfoMine.gif) no-repeat left center;}
-
-/* widgetMyInfo */
-.widgetContainer.black .widgetMyInfo li a{ color:#999;}
-.widgetContainer.black .widgetMyInfo li{ background:url(../img/black/iconMyInfo.gif) no-repeat left 1px;}
-
-/* widgetTree */
-.widgetContainer.black .widgetTree{ color:#999;}
-.widgetContainer.black .widgetTree a{ color:#999;}
-
-/* widgetCounter */
-.widgetContainer.black .widgetCounter dt{ color:#999;}
-.widgetContainer.black .widgetCounter dd{ color:#888;}
-
-/* widgetLanguage */
-.widgetContainer.black .widgetLanguage p a{ color:#b3b3b3;}
-.widgetContainer.black .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
-.widgetContainer.black .widgetLanguage .langList a{ color:#333;}
-
-/* Widget Tree */
-.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
-.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
-.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
-.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
-
-/* widgetTabA */
-.widgetContainer.black .widgetTabA{ border-color:#999;}
-.widgetContainer.black .widgetTabA li,
-.widgetContainer.black .widgetTabA li a{ background-image:url(../img/black/buttonWidgetTab.gif);}
-.widgetContainer.black .widgetTabA li a{ color:#999;}
-
-/* widgetTabB */
-.widgetContainer.black .widgetTabB li a{ color:#999;}
-
-/* widgetTabC */
-.widgetContainer.black .widgetTabC{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetTabC li{ border-color:#7f7f7f; background:#222;}
-.widgetContainer.black .widgetTabC li a{ color:#999;}
-.widgetContainer.black .widgetTabC li a:hover,
-.widgetContainer.black .widgetTabC li a:active,
-.widgetContainer.black .widgetTabC li a:focus{ background:#333;}
-
-/* widgetThumb */
-.widgetContainer.black .widgetThumb{ color:#999;}
-.widgetContainer.black .widgetThumb a{ color:#999;}
-.widgetContainer.black .widgetThumb .hour{ color:#888;}
-
-/* widgetTagCloud */
-.widgetContainer.black .widgetTagCloud li a{ color:#999;}
-.widgetContainer.black .widgetTagCloud li.level1 a{ color:#333;}
-.widgetContainer.black .widgetTagCloud li.level2 a{ color:#666;}
-.widgetContainer.black .widgetTagCloud li.level3 a{ color:#999;}
-.widgetContainer.black .widgetTagCloud li.level4 a{ color:#fff;}
-
-/* widgetCalendar */
-.widgetContainer.black .widgetCalendarNavigation button{ color:#999;}
-.widgetContainer.black .widgetCalendar caption{ color:#999;}
-.widgetContainer.black .widgetCalendar th{ background:#333; color:#fff;}
-.widgetContainer.black .widgetCalendar th.sun,
-.widgetContainer.black .widgetCalendar td.sun,
-.widgetContainer.black .widgetCalendar td em{ color:#ff1a1a;}
-.widgetContainer.black .widgetCalendar td,
-.widgetContainer.black .widgetCalendar td a{ color:#999;}
-.widgetContainer.black .widgetCalendar td.sun a{ color:#ff1a1a;}
-
-/* widgetPoint */
-.widgetContainer.black .widgetPoint dt{ color:#999;}
-
-/* widgetMenuA */
-.widgetContainer.black .widgetMenuA{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetMenuA li{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetMenuA li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
-.widgetContainer.black .widgetMenuA li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
-
-/* widgetMenuB */
-.widgetContainer.black .widgetMenuB{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetMenuB li{ border-color:#7f7f7f;}
-.widgetContainer.black .widgetMenuB li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
-.widgetContainer.black .widgetMenuB li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
-.widgetContainer.black .widgetMenuB li ul{ border-color:#777; background:#000;}
-.widgetContainer.black .widgetMenuB li li.first{ background-image:url(../img/black/arrowMenuB.gif);}
-
-
-address.period { color:#333; }
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+
+/* common */
+.open{ display:block !important;}
+.floatLeft{ float:left;}
+.floatRight{ float:right;}
+.clearLeft{ clear:left;}
+.clearRight{ clear:right;}
+.widgetXeInputText{ border:1px solid; padding:2px 5px; font-size:12px;}
+.widgetXeInputCheck{ margin:0; width:13px; height:13px; vertical-align:middle;}
+.widgetXeInputSubmit{ padding:0;}
+.widgetXeAddress{ font-style:normal;}
+
+/* widgetContainer */
+.widgetContainer a{ text-decoration:none;}
+.widgetContainer a:hover,
+.widgetContainer a:active,
+.widgetContainer a:focus{ text-decoration:underline;}
+.widgetContainer img{ border:0;}
+.widgetContainer sup{ position:relative; line-height:1; display:inline-block; margin:-5px 0; *padding:0 1px;}
+.widgetContainer form{ margin:0; padding:0;}
+.widgetContainer fieldset{ border:0; margin:0; padding:0;}
+
+/* widgetDivider */
+dl.widgetDivider{ margin:0;}
+dl.widgetDivider dt{ position:absolute; width:0; height:0; overflow:hidden; font-size:0; line-height:0;}
+dl.widgetDivider dd{ display:none; margin:0;}
+
+/* widgetTableA */
+.widgetTableA { width:100%; font-size:12px; position:relative; border:0;}
+.widgetTableA td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:1px 5px 1px 5px;}
+.widgetTableA td.title{ width:100%; white-space:normal;}
+.widgetTableA td .board{ padding-right:5px;}
+.widgetTableA td .notice{ padding-right:5px;}
+.widgetTableA td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableA td .replyNum a{ font:10px Tahoma;}
+.widgetTableA td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableA td.author{}
+.widgetTableA td.time{ font-size:11px; font-family:Tahoma;}
+
+/* widgetTableB */
+.widgetTableB { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableB td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:8px 5px 6px 5px; border-bottom:1px solid;}
+.widgetTableB td.title{ width:100%; white-space:normal;}
+.widgetTableB td .board{ padding-right:5px;}
+.widgetTableB td .notice{ padding-right:5px;}
+.widgetTableB td .category{ padding-right:5px; font-weight:normal;}
+.widgetTableB td .replyNum a{ font:10px Tahoma;}
+.widgetTableB td .trackbackNum a{ font:10px Tahoma;}
+.widgetTableB td.author{}
+.widgetTableB td.time{ font-size:11px; font-family:Tahoma;}
+
+/* widgetTableC */
+.widgetTableC { width:100%; font-size:12px; position:relative; border:0; border-top:1px solid;}
+.widgetTableC td{ border:0; line-height:1.5; white-space:nowrap; vertical-align:top; padding:10px; border-bottom:1px solid;}
+.widgetTableC td.title,
+.widgetTableC td.lastDoc{ width:100%; white-space:nowrap;}
+.widgetTableC td.docNum{}
+.widgetTableC td.docNum em{ display:block; padding:12px 0 0 5px; width:50px; height:21px; font-size:11px; font-weight:bold; font-style:normal; font-family:Tahoma; color:#fff; background:url(../img/white/iconForumNum.gif) no-repeat 0 0;}
+.widgetTableC td.title a{ font-weight:bold; text-decoration:underline !important;}
+.widgetTableC td.title dl{ margin:0;}
+.widgetTableC td.title dd{ margin:0;}
+.widgetTableC td.lastDoc p{ margin:0;}
+.widgetTableC td .author{ margin-right:5px;}
+.widgetTableC td .time{ font-size:11px; font-family:Tahoma;}
+.widgetTableC td .time .date{ margin-right:5px;}
+
+/* widgetUlistA */
+.widgetUlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetUlistA li{ list-style:none;}
+
+/* widgetUlistB */
+.widgetUlistB{ margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetUlistB:after{ content:""; display:block; clear:both;}
+.widgetUlistB li{ position:relative; list-style:none; margin-bottom:10px; *zoom:1;}
+.widgetUlistB li .author{ float:left; margin-right:-42px;}
+.widgetUlistB li .author img{ border:1px solid;}
+.widgetUlistB li .title{ position:relative; margin:0 0 0 60px; border:2px solid; padding:10px 15px; _zoom:1;}
+.widgetUlistB li .title a{ text-decoration:underline;}
+.widgetUlistB li .title .arrow{ position:absolute; top:16px; left:-6px; display:block; overflow:hidden; width:6px; height:7px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco{ position:absolute; display:block; overflow:hidden; width:1px; height:1px; font-size:0; line-height:0;}
+.widgetUlistB li .title .deco .topLeft{}
+.widgetUlistB li .title .date{ font-size:11px; font-family:Tahoma;}
+.widgetUlistB li .title .hour{ font-size:11px; font-family:Tahoma;}
+
+/* widgetOlistA */
+.widgetOlistA { margin:0; padding:0; font-size:12px; line-height:1.5;}
+.widgetOlistA li{ margin-left:25px;}
+.widgetOlistA li sup{ font-size:9px; font-family:tahoma; padding-left:10px; }
+
+/* widgetDlistA */
+.widgetDlistA{ margin:0; padding:0; font-size:12px; line-height:1.5; zoom:1;}
+.widgetDlistA:after{ content:""; display:block; clear:both;}
+.widgetDlistA dt{ float:left; clear:left; margin-right:5px; white-space:nowrap;}
+.widgetDlistA dd{ clear:right; white-space:nowrap; font-family:Tahoma;}
+
+/* widgetGalleryA */
+.widgetGalleryA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1; _margin-right:-100%;}
+.widgetGalleryA:after{ content:""; display:block; clear:both;}
+.widgetGalleryA li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:0; white-space:nowrap; list-style:none;}
+.widgetGalleryA li.clearRight{ margin-right:0;}
+.widgetGalleryA li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryA li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryA li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryA li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryA li .author{ display:block;}
+.widgetGalleryA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryA li .date{ font:11px Tahoma;}
+.widgetGalleryA li .hour{ font:11px Tahoma;}
+
+/* widgetGalleryB */
+.widgetGalleryB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetGalleryB:after{ content:""; display:block; clear:both;}
+.widgetGalleryB li { float:left; overflow:hidden; width:100px; margin-right:28px; margin-bottom:15px; padding-bottom:15px; white-space:nowrap; list-style:none; border-bottom:1px solid;}
+.widgetGalleryB li.clearRight{ margin-right:0;}
+.widgetGalleryB li .thumb{ display:block; position:relative; width:100px; height:75px; margin-bottom:10px; overflow:hidden; text-decoration:none;}
+.widgetGalleryB li .thumb img{ display:block; position:relative; width:100%;}
+.widgetGalleryB li .thumb .imgNone{ display:block; position:relative; width:100%; height:70%; padding-top:30%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetGalleryB li .thumb .board{ display:block; position:absolute; width:100%; top:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetGalleryB li .author{ display:block;}
+.widgetGalleryB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetGalleryB li .date{ font:11px Tahoma;}
+.widgetGalleryB li .hour{ font:11px Tahoma;}
+
+/* widgetZineA */
+.widgetZineA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineA:after{ content:""; display:block; clear:both;}
+.widgetZineA li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; overflow:hidden; *zoom:1;}
+.widgetZineA li p{ margin:0;}
+.widgetZineA li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineA li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.titleArea .board{ padding-right:5px;}
+.widgetZineA li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineA li p.authorArea{ margin-left:120px;}
+.widgetZineA li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineA li .thumb img{ position:relative; width:100%;}
+.widgetZineA li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineA li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineA li .title{ font-weight:bold;}
+.widgetZineA li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineA li .author{ margin-right:10px;}
+.widgetZineA li .date{ font:11px Tahoma;}
+.widgetZineA li .hour{ font:11px Tahoma;}
+
+/* widgetZineB */
+.widgetZineB{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.5; *zoom:1;}
+.widgetZineB:after{ content:""; display:block; clear:both;}
+.widgetZineB li { list-style:none; clear:both; margin-bottom:10px; padding-bottom:10px; border-bottom:1px solid;}
+.widgetZineB li p{ margin:0;}
+.widgetZineB li p.thumbArea{ position:relative; float:left; width:100px; margin-right:-100px; overflow:hidden;}
+.widgetZineB li p.titleArea{ margin-left:120px; margin-bottom:4px;}
+.widgetZineB li p.titleArea .board{ padding-right:5px;}
+.widgetZineB li p.text{ margin-left:120px; margin-bottom:4px;}
+.widgetZineB li p.authorArea{ margin-left:120px;}
+.widgetZineB li .thumb{ display:block; position:relative; width:100px; height:75px; text-decoration:none; overflow:hidden;}
+.widgetZineB li .thumb img{ position:relative; width:100%;}
+.widgetZineB li .thumb .imgNone{ display:block; position:relative; width:100%; height:80%; padding-top:20%; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetZineB li .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetZineB li .title{ font-weight:bold;}
+.widgetZineB li .replyNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineB li .trackbackNum a{ font:10px Tahoma; margin:0 -1px;}
+.widgetZineB li .author{ margin-right:10px;}
+.widgetZineB li .date{ font:11px Tahoma;}
+.widgetZineB li .hour{ font:11px Tahoma;}
+
+/* WidgetTree */
+.widgetTree *{ margin:0; padding:0; font-size:12px;}
+.widgetTree a strong{ letter-spacing:-1px; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul{ position:relative; display:block; padding:3px 0 0 0 !important; zoom:1;}
+.widgetTree ul li{ list-style:none; position:relative; padding:3px 0 2px 8px; white-space:nowrap;}
+.widgetTree ul li a,
+.widgetTree ul li span.nav_tree_label{ position:relative; left:16px; _left /**/:0; top:0;}
+.widgetTree ul li a.selected {font-weight:bold;}
+.widgetTree ul li button{ display:inline-block; position:relative; _left /**/:-16px; *top:-2px; width:13px; height:13px; *width:17px; *height:17px; margin:0 -13px 0 0; *margin:0 -17px -1px -2px; text-indent:-10000px; *text-indent:0; *font:0/0 Sans-serif; border:none; cursor:pointer; _cursor /**/:hand;}
+.widgetTree ul li ul{ display:none; padding:2px 0 0 0 !important; margin:0 0 -2px 6px; background-position:left top;}
+.widgetTree ul li ul li{ display:none;}
+.widgetTree ul li.nav_tree_on button{ background-position:0 -13px; *background-position:2px -11px;}
+.widgetTree ul li.nav_tree_off button{ background-position:0 0; *background-position:2px 2px;}
+.widgetTree ul li.nav_tree_on ul{ display:block;}
+.widgetTree ul li.nav_tree_on ul li{ display:block;}
+.widgetTree ul li.nav_tree_off ul{ display:none;}
+.widgetTree ul li.nav_tree_off ul li{ display:none;}
+.widgetTree .icon{ position:relative; left:16px;}
+
+/* widgetLogin */
+.widgetLogin{ font-size:12px;}
+.widgetLogin fieldset{ border:0; margin:0; padding:0;}
+.widgetLogin dl{ margin:0;}
+.widgetLogin dt{ display:none;}
+.widgetLogin dd{ margin:0 0 5px 0;}
+.widgetLogin dd .widgetXeInputText{ width:90%; height:16px;}
+.widgetLogin p{ margin:5px 0;}
+.widgetLogin p .widgetXeInputCheck{ margin-right:5px;}
+.widgetLogin .help{ position:relative; width:100%; overflow:hidden; margin:10px 0 0 0; padding:0;}
+.widgetLogin .help li{ position:relative; left:-5px; padding-left:5px; list-style:none; display:inline; letter-spacing:-1px;}
+
+/* widgetLastLogin */
+.widgetLastLogin{ margin:10px 0; font-size:12px;}
+.widgetLastLogin dt,
+.widgetLastLogin dd{ display:inline; margin:0;}
+.widgetLastLogin dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetMyInfo */
+.widgetMyInfo{ margin:0; padding:0; font-size:12px;}
+.widgetMyInfo:after{ content:""; display:block; clear:both; *zoom:1;}
+.widgetMyInfo li{ margin-bottom:5px; padding:0; text-indent:12px; list-style:none;}
+
+/* widgetLevel */
+.widgetLevel{ padding-left:30px; background-repeat:no-repeat; background-position:left 30%;}
+.widgetLevel em{ display:block; width:0; height:0; overflow:hidden; font-size:0; line-height:0; position:absolute;}
+
+/* widgetCounter */
+.widgetCounter{ font-size:12px; margin:0;}
+.widgetCounter dt,
+.widgetCounter dd{ height:18px;}
+.widgetCounter dt{ float:left; clear:left;}
+.widgetCounter dd{ font-size:11px; font-family:Tahoma;}
+
+/* widgetLanguage */
+.widgetLanguage p{ float:right; margin:0;}
+.widgetLanguage .langList{ display:none; position:absolute; margin:0; padding:0; z-index:999;}
+.widgetLanguage .langList li{ list-style:none;}
+.widgetLanguage .langList li a{ font-size:12px; display:block; padding:2px 5px;}
+
+/* widgetTabA */
+.widgetTabA{ position:relative; margin:0; padding:0; *zoom:1; border-bottom:2px solid;}
+.widgetTabA:after{ content:""; display:block; clear:both;}
+.widgetTabA li{ float:left; margin-right:1px; list-style:none; background-repeat:no-repeat; background-position:0 0;}
+.widgetTabA li.active{ background-position:0 -30px;}
+.widgetTabA li a{ position:relative; left:2px; float:left; height:20px; padding:8px 15px 0 15px; text-decoration:none; font-size:12px; background-repeat:no-repeat; background-position:right 0;}
+.widgetTabA li.active a{ background-position:right -30px; font-weight:bold; letter-spacing:-1px;}
+
+/* widgetTabB */
+.widgetTabB{ margin:0; position:absolute; top:1px; right:0; white-space:nowrap; font-size:12px;}
+.widgetTabB li{ display:inline;}
+.widgetTabB li.active a{ font-weight:bold;}
+
+/* widgetTabC */
+.widgetTabC{ margin:0; padding:0; font-size:12px; border-top:1px solid;}
+.widgetTabC li{ list-style:none; border-bottom:1px solid; *zoom:1; margin-bottom:1px;}
+.widgetTabC li a{ display:block; padding:7px 0 6px 10px; text-decoration:none; *zoom:1;}
+
+/* widgetThumb */
+.widgetThumb{ position:relative; margin:0; text-align:center; font-size:12px; line-height:1.5;}
+.widgetThumb .thumb{ display:block; margin-bottom:5px; position:relative; *zoom:1; text-decoration:none; _float:left;}
+.widgetThumb .thumb img{ display:block; width:100%;}
+.widgetThumb .thumb .imgNone{ display:block; position:relative; width:100%; padding-top:30px; padding-bottom:50px; background:#eee; text-align:center; cursor:pointer; color:#000;}
+.widgetThumb .thumb .category{ display:block; position:absolute; width:100%; bottom:0; left:0; padding:2px 0 0 0 !important; cursor:pointer; text-align:center; font-weight:normal; background:#000; color:#fff; opacity:0.6;  filter:alpha(opacity=60); -ms-filter:alpha('opacity=60'); }
+.widgetThumb .title{ display:block;}
+.widgetThumb .author{ display:block;}
+.widgetThumb .date{ font-size:11px; font-family:Tahoma;}
+.widgetThumb .hour{ font-size:11px; font-family:Tahoma;}
+
+/* widgetContainer */
+.widgetContainer{ *zoom:1;}
+.widgetContainer:after{ content:""; display:block; clear:both;}
+
+/* widgetNavigator */
+.widgetNavigator{ margin:0; padding:0; text-align:right; clear:both;}
+.widgetNavigator li{ list-style:none; display:inline;}
+.widgetNavigator li button{ width:16px; height:16px; padding:0; background-color:transparent; background-image:url(../img/white/buttonWidgetNavigation.gif); border:1px solid #999; cursor:pointer;}
+.widgetNavigator li button.prev{ background-position:left center; *background-position:-1px center;}
+.widgetNavigator li button.next{ background-position:right center; *background-position:13px center;}
+.widgetNavigator li button span{ position:absolute; display:block; width:0; height:0; overflow:hidden; visibility:hidden;}
+
+/* widgetTagCloud */
+.widgetTagCloud { text-align:justify; font-size:12px; line-height:1.5; margin:0; padding:0;}
+.widgetTagCloud li{ display:inline; white-space:nowrap; list-style:none;}
+.widgetTagCloud li.level1 a{ font-size:11px;}
+.widgetTagCloud li.level2 a{ font-size:12px;}
+.widgetTagCloud li.level3 a{ font-size:14px; font-weight:bold;}
+.widgetTagCloud li.level4 a{ font-size:18px; font-weight:bold;}
+
+/* widgetCalendar */
+.widgetCalendarNavigation{ position:relative; height:15px; margin-bottom:-15px; z-index:10;}
+.widgetCalendarNavigation button{ position:absolute; top:0; font-size:10px; font-family:Tahoma; background:none; border:0; padding:0; cursor:pointer;}
+.widgetCalendarNavigation button.prevYear{ left:0;}
+.widgetCalendarNavigation button.prevMonth{ left:25px;}
+.widgetCalendarNavigation button.nextYear{ right:0;}
+.widgetCalendarNavigation button.nextMonth{ right:25px;}
+.widgetCalendar{ position:relative; border:0; width:100%;}
+.widgetCalendar caption { position:relative; padding-bottom:5px; text-align:center; font-size:12px; font-weight:bold; font-family:Tahoma;}
+.widgetCalendar th,
+.widgetCalendar td{ border:0; text-align:center; padding:5px 0;}
+.widgetCalendar th{ font-size:10px; font-family:Tahoma; font-weight:normal;}
+.widgetCalendar td,
+.widgetCalendar td a{ font-size:11px; font-family:Tahoma;}
+.widgetCalendar td em{ font-style:normal;}
+
+/* widgetPoint */
+.widgetPoint{ margin:0; *zoom:1; clear:both;}
+.widgetPoint:after{ content:""; display:block; clear:both;}
+.widgetPoint dt{ font-size:12px; font-family:Tahoma; font-weight:bold;}
+.widgetPoint dd{ margin:0;}
+.widgetPoint dd.graph{ height:5px; overflow:hidden; background:#e5e5e5; font-size:0; line-height:0;}
+.widgetPoint dd.graph img{ width:0%;}
+.widgetPoint dd.point{ font-size:10px; font-family:Tahoma; float:left; color:#888;}
+.widgetPoint dd.percentage{ font-size:10px; font-family:Tahoma; float:right; color:#888;}
+
+/* widgetMenuA */
+.widgetMenuA{ position:relative; margin:0; padding:0; font-size:12px; line-height:1.2; border-top:1px solid;}
+.widgetMenuA li{ position:relative; list-style:none; border-bottom:1px solid; *zoom:1;}
+.widgetMenuA li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuA li li.active sup{ color:#ff1a1a;}
+.widgetMenuA li li{ padding:0; border:0;}
+.widgetMenuA li ul{ display:none; margin:0 0 10px 20px; padding:0;}
+.widgetMenuA li.active ul{ display:block;}
+.widgetMenuA li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important;}
+.widgetMenuA li.active a{ font-weight:bold;}
+.widgetMenuA li.active li a{ font-weight:normal; padding:1px 0; background:none !important;}
+.widgetMenuA li li.active a{ color:#ff1a1a;}
+.widgetMenuA li.active li a:hover,
+.widgetMenuA li.active li a:active,
+.widgetMenuA li.active li a:focus{ text-decoration:underline !important;}
+
+/* widgetMenuB */
+.widgetMenuB{ margin:0; padding:0; font-size:12px; line-height:1.3; border-top:1px solid;}
+.widgetMenuB li{ position:relative; list-style:none; border-bottom:1px solid; white-space:nowrap; *zoom:1;}
+.widgetMenuB li sup{ font-size:10px; font-family:Tahoma; line-height:1; color:#888; font-weight:normal;}
+.widgetMenuB li li{ padding:2px 10px; border:none;}
+.widgetMenuB li li.first{ left:-4px; padding-left:14px; background-repeat:no-repeat; background-position:0 center;}
+.widgetMenuB li li.active sup{ color:#ff1a1a;}
+.widgetMenuB li ul{ position:absolute; display:none; top:-1px; left:100%; margin:0 0 0 5px; padding:5px 0 10px 0; border:1px solid}
+.widgetMenuB li.active{ z-index:100;}
+.widgetMenuB li.active ul{ display:block;}
+.widgetMenuB li a{ position:relative; display:block; padding:7px 0 7px 10px; background-repeat:no-repeat; background-position:0 center; text-decoration:none !important; *zoom:1;}
+.widgetMenuB li.active a{ font-weight:bold;}
+.widgetMenuB li.active li a{ font-weight:normal; padding:0; background:none !important;}
+.widgetMenuB li li.active a{ color:#ff1a1a;}
+.widgetMenuB li.active li a:hover,
+.widgetMenuB li.active li a:active,
+.widgetMenuB li.active li a:focus{ text-decoration:underline !important;}
+
+.widgetMenuC{ margin:0; padding:0; font-size:12px; line-height:1.2; background-repeat:repeat-x;background-position:0 0;}
+.widgetMenuC ul{ margin:0; padding:0; height:35px;}
+.widgetMenuC ul li ul{ display:none; position:absolute; top:40px; left:20px; height:auto; padding-bottom:7px; background:#35ad06; border:1px solid #027a00;}
+.widgetMenuC ul li.active ul{ display:block;}
+.widgetMenuC ul.aCenter{ margin-left:auto; margin-right:auto;}
+.widgetMenuC ul.aLeft{ margin-right:auto;}
+.widgetMenuC ul.aRight{ margin-left:auto;}
+.widgetMenuC li{ position:relative; padding-right:3px; float:left; list-style:none; background-repeat:no-repeat;background-position:right -40px; white-space:nowrap;}
+.widgetMenuC li a{ position:relative; float:left; padding:12px 22px 0 25px; height:23px; color:#fff !important; text-decoration:none !important;}
+.widgetMenuC li.first a{ background-repeat:no-repeat;background-position:left -40px;}
+.widgetMenuC li.active{ margin-left:-2px; background-repeat:no-repeat;background-position:right -80px;}
+.widgetMenuC li.active a{ font-weight:bold; color:#ff0 !important; background-repeat:no-repeat; background-position:left -80px;}
+.widgetMenuC li.active li{ padding:2px 15px; float:none; background:none;}
+.widgetMenuC li.active li.active{ margin:0;}
+.widgetMenuC li.active li.first{ margin-top:-4px; padding-top:14px; background-repeat:no-repeat; background-position:30px top;}
+.widgetMenuC li.active li a{ display:block; _display:inline-block; padding:0; float:none; height:auto; font-weight:normal; color:#fff !important; background:none;}
+.widgetMenuC li.active li.active a{ color:#ff0 !important;}
+.widgetMenuC li.active li a:hover,
+.widgetMenuC li.active li a:active,
+.widgetMenuC li.active li a:focus{ text-decoration:underline !important;}
+
+/* widgetSearch */
+.widgetSearch{ position:absolute; bottom:30px; right:0;}
+.widgetSearch fieldset{ border:0; margin:0; padding:0; position:absolute; bottom:0; right:0;}
+.widgetSearch .widgetXeInputText{ width:153px; height:16px; padding:2px 20px 2px 5px; vertical-align:middle; border:1px solid #666; border-top-color:#555; border-left-color:#555; background:#444; color:#fff;}
+.widgetSearch .widgetXeInputText:focus{ background:#494949;}
+.widgetSearch .widgetSearch{ position:absolute; top:3px; right:4px; vertical-align:middle;}
+
+address.period { font-style:normal; font-size:10px; font-family:tahoma; text-align:right;}
+
+/* white coloset */
+.widgetContainer .widgetXeInputText{ border-color:#ccc; background:#f4f4f4; color:#000;}
+
+/* widgetTableA */
+.widgetContainer .widgetTableA td.title a{ color:#333;}
+.widgetContainer .widgetTableA td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableA td .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetTableA td .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetTableA td .author { color:#333;}
+.widgetContainer .widgetTableA td .date{ color:#333;}
+.widgetContainer .widgetTableA td .hour{ color:#888;}
+
+/* widgetTableB */
+.widgetContainer .widgetTableB,
+.widgetContainer .widgetTableB td{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableB td.title a{ color:#333;}
+.widgetContainer .widgetTableB td .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .category{ color:#888; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetTableB td .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetTableB td .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetTableB td .author { color:#333;}
+.widgetContainer .widgetTableB td .date{ color:#333;}
+.widgetContainer .widgetTableB td .hour{ color:#888;}
+
+/* widgetTableC */
+.widgetContainer .widgetTableC{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableC td{ border-color:#e5e5e5;}
+.widgetContainer .widgetTableC td.title a{ color:#333;}
+.widgetContainer .widgetTableC td.title dd{ color:#888;}
+.widgetContainer .widgetTableC td.lastDoc p a{ color:#333;}
+.widgetContainer .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer .widgetTableC td.lastDoc .time{ color:#888;}
+
+/* widgetUlistA */
+.widgetContainer .widgetUlistA li a{ color:#666;}
+
+/* widgetUlistB */
+.widgetContainer .widgetUlistB li .author img{ border-color:#ccc;}
+.widgetContainer .widgetUlistB li .title{ border-color:#eee; color:#333; background:#fff;}
+.widgetContainer .widgetUlistB li .title a{ color:#0066ff;}
+.widgetContainer .widgetUlistB li .title .arrow{ background:url(../img/white/arrowUlistB.gif) no-repeat;}
+.widgetContainer .widgetUlistB li .title .deco{ background:#fff;}
+.widgetContainer .widgetUlistB li .title .date{ color:#333;}
+.widgetContainer .widgetUlistB li .title .hour{ color:#888;}
+
+/* widgetOlistA */
+.widgetContainer .widgetOlistA li,
+.widgetContainer .widgetOlistA li a{ color:#666;}
+.widgetContainer .widgetOlistA li sup{ color:#AAA;}
+
+/* widgetDlistA */
+.widgetContainer .widgetDlistA dt{ color:#333;}
+.widgetContainer .widgetDlistA dd,
+.widgetContainer .widgetDlistA  dd a{ color:#888;}
+
+/* widgetGalleryA */
+.widgetContainer .widgetGalleryA li .title{ color:#333;}
+.widgetContainer .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetGalleryA li .author{ color:#333;}
+.widgetContainer .widgetGalleryA li .date{ color:#333;}
+.widgetContainer .widgetGalleryA li .hour{ color:#888;}
+
+/* widgetGalleryB */
+.widgetContainer .widgetGalleryB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetGalleryB li .title{ color:#333;}
+.widgetContainer .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetGalleryB li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetGalleryB li .author{ color:#333;}
+.widgetContainer .widgetGalleryB li .date{ color:#333;}
+.widgetContainer .widgetGalleryB li .hour{ color:#888;}
+
+/* widgetZineA */
+.widgetContainer .widgetZineA li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetZineA li .title{ color:#666;}
+.widgetContainer .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetZineA li .author{ color:#333;}
+.widgetContainer .widgetZineA li .date{ color:#333;}
+.widgetContainer .widgetZineA li .hour{ color:#888;}
+.widgetContainer .widgetZineA li .text{ color:#888;}
+
+/* widgetZineB */
+.widgetContainer .widgetZineB li .board{ color:#333; background:url(../img/white/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer .widgetZineB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetZineB li .title{ color:#666;}
+.widgetContainer .widgetZineB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer .widgetZineB li .trackbackNum a{ color:#66c;}
+.widgetContainer .widgetZineB li .author{ color:#333;}
+.widgetContainer .widgetZineB li .date{ color:#333;}
+.widgetContainer .widgetZineB li .hour{ color:#888;}
+.widgetContainer .widgetZineB li .text{ color:#888;}
+
+/* widgetLogin */
+.widgetContainer .widgetLogin label{ color:#333;}
+.widgetContainer .widgetLogin .help a{ color:#333;}
+.widgetContainer .widgetLogin .help li{ background:url(../img/white/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer .widgetLastLogin dt{ color:#333;}
+.widgetContainer .widgetLastLogin dd{ color:#888;}
+.widgetContainer .widgetLastLogin a{ color:#333;}
+.widgetContainer .widgetLastLogin li{ background:url(../img/white/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer .widgetMyInfo li a{ color:#666;}
+.widgetContainer .widgetMyInfo li{ background:url(../img/white/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetTree */
+.widgetContainer .widgetTree{ color:#333;}
+.widgetContainer .widgetTree a{ color:#333;}
+
+/* widgetCounter */
+.widgetContainer .widgetCounter dt{ color:#333;}
+.widgetContainer .widgetCounter dd{ color:#888;}
+
+/* widgetLanguage */
+.widgetContainer .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
+.widgetContainer .widgetLanguage .langList a{ color:#333;}
+
+/* Widget Tree */
+.widgetContainer .widgetTree ul{ background:url(../img/white/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer .widgetTree ul li{ background:url(../img/white/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer .widgetTree ul li button{ background:url(../img/white/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer .widgetTree ul li.nav_tree_last{ background:url(../img/white/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* widgetTabA */
+.widgetContainer .widgetTabA{ border-color:#666;}
+.widgetContainer .widgetTabA li,
+.widgetContainer .widgetTabA li a{ background-image:url(../img/white/buttonWidgetTab.gif);}
+.widgetContainer .widgetTabA li a{ color:#333;}
+
+/* widgetTabB */ 
+.widgetContainer .widgetTabB li a{ color:#333;}
+
+/* widgetTabC */
+.widgetContainer .widgetTabC{ border-color:#e5e5e5;}
+.widgetContainer .widgetTabC li{ border-color:#e5e5e5; background:#f8f8f8;}
+.widgetContainer .widgetTabC li a{ color:#333;}
+.widgetContainer .widgetTabC li a:hover,
+.widgetContainer .widgetTabC li a:active,
+.widgetContainer .widgetTabC li a:focus{ background:#eee;}
+
+/* widgetThumb */
+.widgetContainer .widgetThumb{ color:#333;}
+.widgetContainer .widgetThumb a{ color:#333;}
+.widgetContainer .widgetThumb .hour{ color:#888;}
+
+/* widgetTagCloud */
+.widgetContainer .widgetTagCloud li a{ color:#666;}
+.widgetContainer .widgetTagCloud li.level1 a{ color:#999;}
+.widgetContainer .widgetTagCloud li.level2 a{ color:#666;}
+.widgetContainer .widgetTagCloud li.level3 a{ color:#333;}
+.widgetContainer .widgetTagCloud li.level4 a{ color:#000;}
+
+/* widgetCalendar */
+.widgetContainer .widgetCalendarNavigation button{ color:#333;}
+.widgetContainer .widgetCalendar caption{ color:#333;}
+.widgetContainer .widgetCalendar th{ background:#eee; color:#333;}
+.widgetContainer .widgetCalendar th.sun,
+.widgetContainer .widgetCalendar td.sun,
+.widgetContainer .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer .widgetCalendar td,
+.widgetContainer .widgetCalendar td a{ color:#666;}
+.widgetContainer .widgetCalendar td.sun a{ color:#ff1a1a;}
+
+/* widgetPoint */
+.widgetContainer .widgetPoint dt{ color:#333;}
+
+/* widgetMenuA */
+.widgetContainer .widgetMenuA{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuA li{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuA li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetContainer .widgetMenuA li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+
+/* widgetMenuB */
+.widgetContainer .widgetMenuB{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuB li{ border-color:#e5e5e5;}
+.widgetContainer .widgetMenuB li a{ color:#333; background-image:url(../img/white/iconMenuAnormal.gif);}
+.widgetContainer .widgetMenuB li.active a{ background-image:url(../img/white/iconMenuAactive.gif);}
+.widgetContainer .widgetMenuB li ul{ border-color:#ddd; background:#fff;}
+.widgetContainer .widgetMenuB li li.first{ background-image:url(../img/white/arrowMenuB.gif);}
+
+/* widgetMenuCgreen */
+.widgetContainer .widgetMenuCgreen{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen ul li ul{ background:#35ad06; border-color:#027a00;}
+.widgetContainer .widgetMenuCgreen li{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.first a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active a{ background-image:url(../img/white/bgMenuCgreen.gif);}
+.widgetContainer .widgetMenuCgreen li.active li.first{ background-image:url(../img/white/arrowMenuCgreen.gif);}
+
+/* widgetMenuCblue */
+.widgetContainer .widgetMenuCblue{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue ul li ul{ background:#0688ad; border-color:#00557a;}
+.widgetContainer .widgetMenuCblue li{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.first a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active a{ background-image:url(../img/white/bgMenuCblue.gif);}
+.widgetContainer .widgetMenuCblue li.active li.first{ background-image:url(../img/white/arrowMenuCblue.gif);}
+
+/* widgetMenuCcyan */
+.widgetContainer .widgetMenuCcyan{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan ul li ul{ background:#06a4ad; border-color:#00717a;}
+.widgetContainer .widgetMenuCcyan li{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.first a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active a{ background-image:url(../img/white/bgMenuCcyan.gif);}
+.widgetContainer .widgetMenuCcyan li.active li.first{ background-image:url(../img/white/arrowMenuCcyan.gif);}
+
+/* widgetMenuCorange */
+.widgetContainer .widgetMenuCorange{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange ul li ul{ background:#ad9906; border-color:#7a6600;}
+.widgetContainer .widgetMenuCorange li{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.first a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active a{ background-image:url(../img/white/bgMenuCorange.gif);}
+.widgetContainer .widgetMenuCorange li.active li.first{ background-image:url(../img/white/arrowMenuCorange.gif);}
+
+/* widgetMenuCred */
+.widgetContainer .widgetMenuCred{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred ul li ul{ background:#ad4606; border-color:#7a1300;}
+.widgetContainer .widgetMenuCred li{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.first a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active a{ background-image:url(../img/white/bgMenuCred.gif);}
+.widgetContainer .widgetMenuCred li.active li.first{ background-image:url(../img/white/arrowMenuCred.gif);}
+
+/* widgetMenuCgray */
+.widgetContainer .widgetMenuCgray{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray ul li ul{ background:#595959; border-color:#7a1300;}
+.widgetContainer .widgetMenuCgray li{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.first a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active a{ background-image:url(../img/white/bgMenuCgray.gif);}
+.widgetContainer .widgetMenuCgray li.active li.first{ background-image:url(../img/white/arrowMenuCgray.gif);}
+
+.widgetContainer address.period { color:#AAA; }
+
+/* black colorset Class */
+.widgetContainer.black .widgetXeInputText{ border-color:#666; background:#333; color:#ccc;}
+
+/* widgetTableA */
+.widgetContainer.black .widgetTableA td.title a{ color:#999;}
+.widgetContainer.black .widgetTableA td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableA td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableA td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableA td .author { color:#999;}
+.widgetContainer.black .widgetTableA td .date{ color:#999;}
+.widgetContainer.black .widgetTableA td .hour{ color:#888;}
+
+/* widgetTableB */
+.widgetContainer.black .widgetTableB,
+.widgetContainer.black .widgetTableB td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableB td.title a{ color:#999;}
+.widgetContainer.black .widgetTableB td .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .notice{ color:#ff1a1a; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .category{ color:#666; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetTableB td .replyNum{ color:#ff1a1a;}
+.widgetContainer.black .widgetTableB td .trackbackNum{ color:#66c;}
+.widgetContainer.black .widgetTableB td .author { color:#999;}
+.widgetContainer.black .widgetTableB td .date{ color:#999;}
+.widgetContainer.black .widgetTableB td .hour{ color:#888;}
+
+/* widgetTableC */
+.widgetContainer.black .widgetTableC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTableC td.title a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.title dd{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc p a{ color:#ccc;}
+.widgetContainer.black .widgetTableC td.lastDoc .author{ color:#888;}
+.widgetContainer.black .widgetTableC td.lastDoc .time{ color:#888;}
+
+/* widgetUlistA */
+.widgetContainer.black .widgetUlistA li a{ color:#999;}
+
+/* widgetUlistB */
+.widgetContainer.black .widgetUlistB li .author img{ border-color:#666;}
+.widgetContainer.black .widgetUlistB li .title{ border-color:#333; color:#999; background:#000;}
+.widgetContainer.black .widgetUlistB li .title a{ color:#3399ff;}
+.widgetContainer.black .widgetUlistB li .title .arrow{ background:url(../img/black/arrowUlistB.gif) no-repeat;}
+.widgetContainer.black .widgetUlistB li .title .deco{ background:#000;}
+.widgetContainer.black .widgetUlistB li .title .date{ color:#999;}
+.widgetContainer.black .widgetUlistB li .title .hour{ color:#888;}
+
+/* widgetOlistA */
+.widgetContainer.black .widgetOlistA li,
+.widgetContainer.black .widgetOlistA li a{ color:#999;}
+.widgetContainer.black .widgetOlistA li sup{ color:#666;}
+
+/* widgetDlistA */
+.widgetContainer.black .widgetDlistA dt{ color:#999;}
+.widgetContainer.black .widgetDlistA dd,
+.widgetContainer.black .widgetDlistA  dd a{ color:#888;}
+
+/* widgetGalleryA */
+.widgetContainer.black .widgetGalleryA li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryA li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryA li .hour{ color:#888;}
+
+/* widgetGalleryB */
+.widgetContainer.black .widgetGalleryB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetGalleryB li .title{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetGalleryB li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetGalleryB li .author{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .date{ color:#999;}
+.widgetContainer.black .widgetGalleryB li .hour{ color:#888;}
+
+/* widgetZineA */
+.widgetContainer.black .widgetZineA li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineA li .title{ color:#999;}
+.widgetContainer.black .widgetZineA li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineA li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineA li .author{ color:#999;}
+.widgetContainer.black .widgetZineA li .date{ color:#999;}
+.widgetContainer.black .widgetZineA li .hour{ color:#888;}
+.widgetContainer.black .widgetZineA li .text{ color:#888;}
+
+/* widgetZineB */
+.widgetContainer.black .widgetZineB li .board{ color:#999; background:url(../img/black/lineTextDiv.gif) no-repeat right center;}
+.widgetContainer.black .widgetZineB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetZineB li .title{ color:#999;}
+.widgetContainer.black .widgetZineB li .replyNum a{ color:#ff1a1a;}
+.widgetContainer.black .widgetZineB li .trackbackNum a{ color:#66c;}
+.widgetContainer.black .widgetZineB li .author{ color:#999;}
+.widgetContainer.black .widgetZineB li .date{ color:#999;}
+.widgetContainer.black .widgetZineB li .hour{ color:#888;}
+.widgetContainer.black .widgetZineB li .text{ color:#888;}
+
+/* widgetLogin */
+.widgetContainer.black .widgetLogin label{ color:#999;}
+.widgetContainer.black .widgetLogin .help a{ color:#ccc;}
+.widgetContainer.black .widgetLogin .help li{ background:url(../img/black/lineTextDiv.gif) no-repeat left center;}
+
+/* widgetLastLogin */
+.widgetContainer.black .widgetLastLogin dt{ color:#999;}
+.widgetContainer.black .widgetLastLogin dd{ color:#888;}
+.widgetContainer.black .widgetLastLogin a{ color:#333;}
+.widgetContainer.black .widgetLastLogin li{ background:url(../img/black/iconInfoMine.gif) no-repeat left center;}
+
+/* widgetMyInfo */
+.widgetContainer.black .widgetMyInfo li a{ color:#999;}
+.widgetContainer.black .widgetMyInfo li{ background:url(../img/black/iconMyInfo.gif) no-repeat left 1px;}
+
+/* widgetTree */
+.widgetContainer.black .widgetTree{ color:#999;}
+.widgetContainer.black .widgetTree a{ color:#999;}
+
+/* widgetCounter */
+.widgetContainer.black .widgetCounter dt{ color:#999;}
+.widgetContainer.black .widgetCounter dd{ color:#888;}
+
+/* widgetLanguage */
+.widgetContainer.black .widgetLanguage p a{ color:#b3b3b3;}
+.widgetContainer.black .widgetLanguage .langList{ background:#fff; border:1px solid #ccc;}
+.widgetContainer.black .widgetLanguage .langList a{ color:#333;}
+
+/* Widget Tree */
+.widgetContainer.black .widgetTree ul{ background:url(../img/black/lineTreeVr.gif) repeat-y 0 -1px;}
+.widgetContainer.black .widgetTree ul li{ background:url(../img/black/lineTreeHr.gif) no-repeat 1px 5px !important;}
+.widgetContainer.black .widgetTree ul li button{ background:url(../img/black/buttonTreeCollapse.gif) no-repeat;}
+.widgetContainer.black .widgetTree ul li.nav_tree_last{ background:url(../img/black/lineTreeLastHr.gif) no-repeat 0 5px !important;}
+
+/* widgetTabA */
+.widgetContainer.black .widgetTabA{ border-color:#999;}
+.widgetContainer.black .widgetTabA li,
+.widgetContainer.black .widgetTabA li a{ background-image:url(../img/black/buttonWidgetTab.gif);}
+.widgetContainer.black .widgetTabA li a{ color:#999;}
+
+/* widgetTabB */
+.widgetContainer.black .widgetTabB li a{ color:#999;}
+
+/* widgetTabC */
+.widgetContainer.black .widgetTabC{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetTabC li{ border-color:#7f7f7f; background:#222;}
+.widgetContainer.black .widgetTabC li a{ color:#999;}
+.widgetContainer.black .widgetTabC li a:hover,
+.widgetContainer.black .widgetTabC li a:active,
+.widgetContainer.black .widgetTabC li a:focus{ background:#333;}
+
+/* widgetThumb */
+.widgetContainer.black .widgetThumb{ color:#999;}
+.widgetContainer.black .widgetThumb a{ color:#999;}
+.widgetContainer.black .widgetThumb .hour{ color:#888;}
+
+/* widgetTagCloud */
+.widgetContainer.black .widgetTagCloud li a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level1 a{ color:#333;}
+.widgetContainer.black .widgetTagCloud li.level2 a{ color:#666;}
+.widgetContainer.black .widgetTagCloud li.level3 a{ color:#999;}
+.widgetContainer.black .widgetTagCloud li.level4 a{ color:#fff;}
+
+/* widgetCalendar */
+.widgetContainer.black .widgetCalendarNavigation button{ color:#999;}
+.widgetContainer.black .widgetCalendar caption{ color:#999;}
+.widgetContainer.black .widgetCalendar th{ background:#333; color:#fff;}
+.widgetContainer.black .widgetCalendar th.sun,
+.widgetContainer.black .widgetCalendar td.sun,
+.widgetContainer.black .widgetCalendar td em{ color:#ff1a1a;}
+.widgetContainer.black .widgetCalendar td,
+.widgetContainer.black .widgetCalendar td a{ color:#999;}
+.widgetContainer.black .widgetCalendar td.sun a{ color:#ff1a1a;}
+
+/* widgetPoint */
+.widgetContainer.black .widgetPoint dt{ color:#999;}
+
+/* widgetMenuA */
+.widgetContainer.black .widgetMenuA{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuA li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuA li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
+
+/* widgetMenuB */
+.widgetContainer.black .widgetMenuB{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuB li{ border-color:#7f7f7f;}
+.widgetContainer.black .widgetMenuB li a{ color:#999; background-image:url(../img/black/iconMenuAnormal.gif);}
+.widgetContainer.black .widgetMenuB li.active a{ background-image:url(../img/black/iconMenuAactive.gif);}
+.widgetContainer.black .widgetMenuB li ul{ border-color:#777; background:#000;}
+.widgetContainer.black .widgetMenuB li li.first{ background-image:url(../img/black/arrowMenuB.gif);}
+
+
+address.period { color:#333; }
diff --git a/modules/layout/tpl/downloaded_layout_list.html b/modules/layout/tpl/downloaded_layout_list.html
index 81111cf78..21ab5b23d 100644
--- a/modules/layout/tpl/downloaded_layout_list.html
+++ b/modules/layout/tpl/downloaded_layout_list.html
@@ -1,16 +1,17 @@
 <!--#include("header.html")-->
 
 <!-- 레이아웃의 목록 -->
-<table cellspacing="0" class="crossTable">
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
 <thead>
     <tr>
-        <th scope="col" class="halfwide"><div>{$lang->layout_name}</div></th>
-        <th scope="col"><div>{$lang->version}</div></th>
-        <th scope="col"><div>{$lang->author}</div></th>
-        <th scope="col"><div>{$lang->menu_count}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->path}</div></th>
-        <th scope="col"><div>{$lang->cmd_make}</div></th>
+        <th scope="col" class="halfwide">{$lang->layout_name}</th>
+        <th scope="col">{$lang->version}</th>
+        <th scope="col">{$lang->author}</th>
+        <th scope="col">{$lang->menu_count}</th>
+        <th scope="col">{$lang->date}</th>
+        <th scope="col">{$lang->path}</th>
+        <th scope="col">{$lang->cmd_make}</th>
     </tr>
 </thead>
 <tbody>
@@ -19,12 +20,8 @@
         <!--// 레이아웃 정보 파일(conf/info.xml)가 있는 경우-->
         <!--@if($val->title)-->
         <tr class="row{$cycle_idx}">
-            <th rowspan="2">
-                <div>
-                    <a href="{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}" onclick="popopen(this.href,'layout_info');return false" class="blue">{$val->title}</a> <br />
-                    ({$val->layout})
-                </div>
-            </th>
+            <th rowspan="2"> <a href="{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}" onclick="popopen(this.href,'layout_info');return false" class="blue">{$val->title}</a> <br />
+                ({$val->layout})            </th>
             <td>{$val->version}</td>
             <td>
                 <!--@foreach($val->author as $author)-->
@@ -34,10 +31,10 @@
             <td>{$val->menu_count}</td>
             <td>{zdate($val->date, 'Y-m-d')}</td>
             <td>{$val->path}</td>
-            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}" class="button"><span>{$lang->cmd_make}</span></a></td>
+            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout)}">{$lang->cmd_make}</a></td>
         </tr>
         <tr>
-            <td colspan="6" class="left">
+            <td colspan="6" >
                 {nl2br(trim($val->description))}
             </td>
         </tr>
@@ -52,3 +49,4 @@
     <!--@end-->
 </tbody>
 </table>
+</div>
diff --git a/modules/layout/tpl/downloaded_mlayout_list.html b/modules/layout/tpl/downloaded_mlayout_list.html
index 878070d19..8b493e677 100644
--- a/modules/layout/tpl/downloaded_mlayout_list.html
+++ b/modules/layout/tpl/downloaded_mlayout_list.html
@@ -1,16 +1,17 @@
 <!--#include("header.html")-->
 
 <!-- 레이아웃의 목록 -->
-<table cellspacing="0" class="crossTable">
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
 <thead>
     <tr>
-        <th scope="col" class="halfwide"><div>{$lang->layout_name}</div></th>
-        <th scope="col"><div>{$lang->version}</div></th>
-        <th scope="col"><div>{$lang->author}</div></th>
-        <th scope="col"><div>{$lang->menu_count}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->path}</div></th>
-        <th scope="col"><div>{$lang->cmd_make}</div></th>
+        <th scope="col" class="halfwide">{$lang->layout_name}</th>
+        <th scope="col">{$lang->version}</th>
+        <th scope="col">{$lang->author}</th>
+        <th scope="col">{$lang->menu_count}</th>
+        <th scope="col">{$lang->date}</th>
+        <th scope="col">{$lang->path}</th>
+        <th scope="col">{$lang->cmd_make}</th>
     </tr>
 </thead>
 <tbody>
@@ -19,12 +20,8 @@
         <!--// 레이아웃 정보 파일(conf/info.xml)가 있는 경우-->
         <!--@if($val->title)-->
         <tr class="row{$cycle_idx}">
-            <th rowspan="2">
-                <div>
-                    <a href="{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}" onclick="popopen(this.href,'layout_info');return false" class="blue">{$val->title}</a> <br />
-                    ({$val->layout})
-                </div>
-            </th>
+            <th rowspan="2"> <a href="{getUrl('','module','layout','act','dispLayoutAdminInfo','selected_layout',$val->layout)}" onclick="popopen(this.href,'layout_info');return false" class="blue">{$val->title}</a> <br />
+                ({$val->layout})            </th>
             <td>{$val->version}</td>
             <td>
                 <!--@foreach($val->author as $author)-->
@@ -34,10 +31,10 @@
             <td>{$val->menu_count}</td>
             <td>{zdate($val->date, 'Y-m-d')}</td>
             <td>{$val->path}</td>
-            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout,'layout_type','M')}" class="button"><span>{$lang->cmd_make}</span></a></td>
+            <td><a href="{getUrl('act','dispLayoutAdminInsert','layout',$val->layout,'layout_type','M')}">{$lang->cmd_make}</a></td>
         </tr>
         <tr>
-            <td colspan="6" class="left">
+            <td colspan="6" >
                 {nl2br(trim($val->description))}
             </td>
         </tr>
@@ -52,3 +49,5 @@
     <!--@end-->
 </tbody>
 </table>
+</div>
+
diff --git a/modules/layout/tpl/faceoff_layout_edit.html b/modules/layout/tpl/faceoff_layout_edit.html
index 8b019caef..d9f1e44a0 100644
--- a/modules/layout/tpl/faceoff_layout_edit.html
+++ b/modules/layout/tpl/faceoff_layout_edit.html
@@ -1 +1 @@
-{$content}
+{$content}
diff --git a/modules/layout/tpl/faceoff_layout_menu.html b/modules/layout/tpl/faceoff_layout_menu.html
index b2d5e9c18..bb3e16ce4 100644
--- a/modules/layout/tpl/faceoff_layout_menu.html
+++ b/modules/layout/tpl/faceoff_layout_menu.html
@@ -1,347 +1,347 @@
-<!--%load_js_plugin("ui")-->
-<!--%load_js_plugin("ui.colorpicker")-->
-<!--%import("js/ui.hotkey.js",optimized=false)-->
-<!--%import("js/ui.toolbar.js",optimized=false)-->
-<!--%import("js/faceoff.js",optimized=false)-->
-<!--%import("js/layout_image_list.js",optimized=false)-->
-<!--%import("css/faceoff_menu.css",optimized=false)-->
-<!--%import("js/layout_admin.js",optimized=false)-->
-<!--%import("filter/reset_layout_code.xml")-->
-
-<div id="toolbar">
-
-    <form id="fo_layout" action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-    <input type="hidden" name="layout_srl" id="layout_srl" value="{$layout_info->layout_srl}" />
-    <div class="widgetMenu buttons">
-        <ul class="widgetMenuList">
-            <li><button type="button"><span>File</span></button>
-                <ul class="noneToolBar">
-                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="FaceOff.saveLayoutConfig()">{$lang->layout_manager[1]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="document.location.href=request_uri.setQuery('mid',current_mid)">{$lang->layout_manager[2]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="doResetLayoutCode('{$layout_srl}');return false">{$lang->layout_manager[51]}</button></li>
-                </ul>
-
-            </li>
-            <li><button type="button"><span>{$lang->layout_manager[3]}</span></button>
-                <ul>
-                    <li class="menu" tb:type="radio" tb:arg="t,fixed"><button type="button">{$lang->layout_manager[6]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="t,liquid"><button type="button">{$lang->layout_manager[7]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="t,hybrid"><button type="button">{$lang->layout_manager[8]}</button></li>
-                </ul>
-            </li>
-            <li><button type="button"><span>{$lang->layout_manager[4]}</span></button>
-                <ul>
-                    <li class="menu" tb:type="radio" tb:arg="c,c"><button type="button">{$lang->layout_manager[9]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="c,ce"><button type="button">{$lang->layout_manager[10]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="c,ec"><button type="button">{$lang->layout_manager[11]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="c,cee"><button type="button">{$lang->layout_manager[12]}</button></li>
-                    <li class="menu" class="menu" tb:type="radio" tb:arg="c,ece"><button type="button">{$lang->layout_manager[13]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="c,eec"><button type="button">{$lang->layout_manager[14]}</button></li>
-                </ul>
-            </li>
-            <li><button type="button"><span>{$lang->layout_manager[5]}</span></button>
-                <ul>
-                    <li class="menu" tb:type="radio" tb:arg="a,aLeft"><button type="button">{$lang->layout_manager[15]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="a,aCenter"><button type="button">{$lang->layout_manager[16]}</button></li>
-                    <li class="menu" tb:type="radio" tb:arg="a,aRight"><button type="button">{$lang->layout_manager[17]}</button></li>
-                </ul>
-            </li>
-        </ul>
-
-        <fieldset class="hideOption">
-            <label for="useHeader"><input type="checkbox" id="useHeader" /> Header</label>
-            <label for="useFooter"><input type="checkbox" id="useFooter" /> Footer</label>
-        </fieldset>
-    </div>
-
-    <!-- smartmenu start -->
-    <ul id="smartmenu">
-        <li id="for-all" style="display:block">
-            <dl>
-                <dt style="display:none">{$lang->layout_manager[18]}</dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
-                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> 
-                </dd>
-            </dl>
-        </li>
-        <li id="for-extension">
-            <dl>
-                <dt style="display:none">{$lang->layout_manager[18]}</dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
-                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
-                </dd>
-                <dt>Extension</dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.popupAddWidget()">{$lang->layout_manager[20]}</button>
-                    <button type="button" onclick="FaceOff.popupAddContent()">{$lang->layout_manager[21]}</button>
-                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
-                </dd>
-            </dl>
-        </li>
-        <li id="for-widget">
-            <dl>
-                <dt style="display:none">{$lang->layout_manager[18]}</dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
-                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
-                </dd>
-
-                <dt>Widget &gt; </dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.popupAddWidgetStyle()">{$lang->layout_manager[23]}</button>
-                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
-                    <button type="button" onclick="FaceOff.popupAddWidget()">{$lang->layout_manager[24]}</button>
-                    <button type="button" onclick="FaceOff.deleteWidget()">{$lang->layout_manager[25]}</button>
-                </dd>
-            </dl>
-        <li id="for-block">
-            <dl>
-                <dt style="display:none">{$lang->layout_manager[18]}</dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
-                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
-                </dd>
-
-                <dt>Block</dt>
-                <dd>
-                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
-                </dd>
-            </dl>
-        </li>
-    </ul>
-    <!-- smartmenu end -->
-
-    <!-- preview start -->
-    <div id="demoXe" class="demoFixed">
-        <div id="demoContainer" class="demoC">
-            <div id="demoHeader">
-            </div>
-            <div id="demoBody">
-                <div id="demoContent">
-                </div>
-                <div class="demoExtension demoE1">
-                </div>
-                <div class="demoExtension demoE2">
-                </div>
-            </div>
-            <div id="demoFooter">
-            </div>
-        </div>
-    </div>
-    <!-- preview end -->
-
-    </form>
-
-</div>
-
-<div id="propertyDialog">
-    <form>
-        <fieldset name="float" style="display:none">
-            <legend>{$lang->layout_manager[26]}</legend>
-            <div class="visible-more">
-                <label for="background-color">{$lang->layout_manager[26]} : </label>
-                <select id="float">
-                    <option value=''>{$lang->layout_manager[27]}</option>
-                    <option value='left'>{$lang->layout_manager[28]}</option>
-                    <option value='right'>{$lang->layout_manager[29]}</option>
-                </select>
-            </div>
-        </fieldset>
-        <fieldset name="width" style="display:none">
-            <legend>{$lang->layout_manager[30]}</legend>
-            <div class="visible-more">
-                <label for="width">{$lang->layout_manager[30]} : </label>
-                <input type="text" id="width" size="5" />
-            </div>
-        </fieldset>
-        <!--
-        <fieldset name="height" style="display:none">
-            <legend>{$lang->layout_manager[31]}</legend>
-            <div class="visible-more">
-                <label for="background-color">{$lang->layout_manager[31]} : </label>
-                <input type="text" id="height" size="5" />
-            </div>
-        </fieldset>
-        -->
-        <fieldset name="margin">
-            <legend>{$lang->layout_manager[32]}</legend>
-            <input type="text" id="margin" size="15" class="inputall" title="margin+px">
-            <button type="button" class="morelink"><span>+</span></button>
-            <div class="more">
-                <div>
-                    <label for="margin-top">{$lang->layout_manager[34]} : </label>
-                    <input type="text" id="margin-top" size="3">
-                </div>
-                <div>
-                    <label for="margin-left">{$lang->layout_manager[35]} : </label>
-                    <input type="text" id="margin-left" size="3">
-                </div>
-                <div>
-                    <label for="margin-right">{$lang->layout_manager[36]} : </label>
-                    <input type="text" id="margin-right" size="3">
-                </div>
-                <div>
-                    <label for="margin-bottom">{$lang->layout_manager[37]} : </label>
-                    <input type="text" id="margin-bottom" size="3">
-                </div>
-            </div>
-        </fieldset>
-        <fieldset name="padding">
-            <legend>{$lang->layout_manager[33]}</legend>
-            <input type="text" id="padding" size="15" class="inputall" title="padding+px">
-            <button type="button" class="morelink"><span>+</span></button>
-            <div class="more">
-                <div>
-                    <label for="padding-top">{$lang->layout_manager[34]} : </label>
-                    <input type="text" id="padding-top" size="3">
-                </div>
-
-                <div>
-                    <label for="padding-left">{$lang->layout_manager[35]} : </label>
-                    <input type="text" id="padding-left" size="3">
-                </div>
-
-                <div>
-                    <label for="padding-right">{$lang->layout_manager[36]} : </label>
-                    <input type="text" id="padding-right" size="3">
-                </div>
-
-                <div>
-                    <label for="padding-bottom">{$lang->layout_manager[37]} : </label>
-                    <input type="text" id="padding-bottom" size="3">
-                </div>
-            </div>
-        </fieldset>
-        <fieldset name="border">
-            <legend>{$lang->layout_manager[38]}</legend>
-            <span class="inputall">
-                <input type="text" id="border-width" size="3" title="border-width+px" />
-                <input type="text" id="border-color" size="7" class="color-indicator" title="border-color" />
-                <select id="border-style" title="border-style">
-                    <option value="none">{$lang->layout_manager[39]}</option>
-                    <option value="hidden">hidden</option>
-                    <option value="dotted">dotted</option>
-                    <option value="dashed">dashed</option>
-                    <option value="solid">solid</option>
-                    <option value="double">double</option>
-                    <option value="groove">groove</option>
-                    <option value="ridge">ridge</option>
-                    <option value="inset">inset</option>
-                    <option value="inset">outset</option>
-                </select>
-            </span>
-            <button type="button" class="morelink"><span>+</span></button>
-            <div class="more">
-                <div>
-                    <label for="border-top-width">{$lang->layout_manager[34]} : </label>
-                    <input type="text" id="border-top-width" size="3" title="border-width+px" />
-                    <input type="text" id="border-top-color" size="7" class="color-indicator" title="border-color" />
-                    <select id="border-top-style" title="border-style">
-                        <option value="none">{$lang->layout_manager[39]}</option>
-                        <option value="hidden">hidden</option>
-                        <option value="dotted">dotted</option>
-                        <option value="dashed">dashed</option>
-                        <option value="solid">solid</option>
-                        <option value="double">double</option>
-                        <option value="groove">groove</option>
-                        <option value="ridge">ridge</option>
-                        <option value="inset">inset</option>
-                        <option value="inset">outset</option>
-                    </select>
-                </div>
-                <div>
-                    <label for="border-right-width">{$lang->layout_manager[36]} : </label>
-                    <input type="text" id="border-right-width" size="3" title="border-width+px" />
-                    <input type="text" id="border-right-color" size="7" class="color-indicator" title="border-color" />
-                    <select id="border-right-style" title="border-style">
-                        <option value="none">{$lang->layout_manager[39]}</option>
-                        <option value="hidden">hidden</option>
-                        <option value="dotted">dotted</option>
-                        <option value="dashed">dashed</option>
-                        <option value="solid">solid</option>
-                        <option value="double">double</option>
-                        <option value="groove">groove</option>
-                        <option value="ridge">ridge</option>
-                        <option value="inset">inset</option>
-                        <option value="inset">outset</option>
-                    </select>
-                </div>
-                <div>
-                    <label for="border-bottom-width">{$lang->layout_manager[37]} : </label>
-                    <input type="text" id="border-bottom-width" size="3" title="border-width+px" />
-                    <input type="text" id="border-bottom-color" size="7" class="color-indicator" title="border-color" />
-                    <select id="border-bottom-style" title="border-style">
-                        <option value="none">{$lang->layout_manager[39]}</option>
-                        <option value="hidden">hidden</option>
-                        <option value="dotted">dotted</option>
-                        <option value="dashed">dashed</option>
-                        <option value="solid">solid</option>
-                        <option value="double">double</option>
-                        <option value="groove">groove</option>
-                        <option value="ridge">ridge</option>
-                        <option value="inset">inset</option>
-                        <option value="inset">outset</option>
-                    </select>
-                </div>
-                <div>
-                    <label for="border-left-width">{$lang->layout_manager[35]} : </label>
-                    <input type="text" id="border-left-width" size="3" title="border-width+px" />
-                    <input type="text" id="border-left-color" size="7" class="color-indicator" title="border-color" />
-                    <select id="border-left-style" title="border-style">
-                        <option value="none">{$lang->layout_manager[39]}</option>
-                        <option value="hidden">hidden</option>
-                        <option value="dotted">dotted</option>
-                        <option value="dashed">dashed</option>
-                        <option value="solid">solid</option>
-                        <option value="double">double</option>
-                        <option value="groove">groove</option>
-                        <option value="ridge">ridge</option>
-                        <option value="inset">inset</option>
-                        <option value="inset">outset</option>
-                    </select>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset name="background">
-            <legend>{$lang->layout_manager[40]}</legend>
-            <div class="visible-more">
-                <div>
-                    <label for="background-color">{$lang->layout_manager[41]} : </label>
-                    <input type="text" id="background-color" size="7" class="color-indicator" />
-                </div>
-                <div>
-                    <label for="background-image">{$lang->layout_manager[42]} :</label>
-                    <input type="text" id="background-image" size="14" /><button type="button" onclick="popupLayoutImageList({$layout_info->layout_srl})">{$lang->layout_manager[43]}</button>
-                </div>
-                <div>
-                    <label for="background-repeat">{$lang->layout_manager[44]} : </label>
-                    <select id="background-repeat">
-                        <option value="repeat">{$lang->layout_manager[45]}</option>
-                        <option value="no-repeat">{$lang->layout_manager[46]}</option>
-                        <option value="repeat-x">{$lang->layout_manager[47]}</option>
-                        <option value="repeat-y">{$lang->layout_manager[48]}</option>
-                    </select>
-                </div>
-            </div>
-        </fieldset>
-        <fieldset name="font">
-            <legend>{$lang->layout_manager[52]}</legend>
-            <div class="visible-more">
-                <div>
-                    <label for="font-family">{$lang->layout_manager[53]} :</label>
-                    <input type="text" id="font-family" size="14" />
-                </div>
-                <div>
-                    <label for="color">{$lang->layout_manager[54]} : </label>
-                    <input type="text" id="color" size="7" class="color-indicator" />
-                </div>
-            </div>
-        </fieldset>
-        <div class="buttonArea">
-            <button type="submit">{$lang->layout_manager[49]}</button>
-            <button type="reset">{$lang->layout_manager[50]}</button>
-        </div>
-    </form>
-</div>
+<!--%load_js_plugin("ui")-->
+<!--%load_js_plugin("ui.colorpicker")-->
+<!--%import("js/ui.hotkey.js",optimized=false)-->
+<!--%import("js/ui.toolbar.js",optimized=false)-->
+<!--%import("js/faceoff.js",optimized=false)-->
+<!--%import("js/layout_image_list.js",optimized=false)-->
+<!--%import("css/faceoff_menu.css",optimized=false)-->
+<!--%import("js/layout_admin.js",optimized=false)-->
+<!--%import("filter/reset_layout_code.xml")-->
+
+<div id="toolbar">
+
+    <form id="fo_layout" action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe">
+    <input type="hidden" name="layout_srl" id="layout_srl" value="{$layout_info->layout_srl}" />
+    <div class="widgetMenu buttons">
+        <ul class="widgetMenuList">
+            <li><button type="button"><span>File</span></button>
+                <ul class="noneToolBar">
+                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="FaceOff.saveLayoutConfig()">{$lang->layout_manager[1]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="document.location.href=request_uri.setQuery('mid',current_mid)">{$lang->layout_manager[2]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg=""><button type="button" onclick="doResetLayoutCode('{$layout_srl}');return false">{$lang->layout_manager[51]}</button></li>
+                </ul>
+
+            </li>
+            <li><button type="button"><span>{$lang->layout_manager[3]}</span></button>
+                <ul>
+                    <li class="menu" tb:type="radio" tb:arg="t,fixed"><button type="button">{$lang->layout_manager[6]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="t,liquid"><button type="button">{$lang->layout_manager[7]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="t,hybrid"><button type="button">{$lang->layout_manager[8]}</button></li>
+                </ul>
+            </li>
+            <li><button type="button"><span>{$lang->layout_manager[4]}</span></button>
+                <ul>
+                    <li class="menu" tb:type="radio" tb:arg="c,c"><button type="button">{$lang->layout_manager[9]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,ce"><button type="button">{$lang->layout_manager[10]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,ec"><button type="button">{$lang->layout_manager[11]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,cee"><button type="button">{$lang->layout_manager[12]}</button></li>
+                    <li class="menu" class="menu" tb:type="radio" tb:arg="c,ece"><button type="button">{$lang->layout_manager[13]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="c,eec"><button type="button">{$lang->layout_manager[14]}</button></li>
+                </ul>
+            </li>
+            <li><button type="button"><span>{$lang->layout_manager[5]}</span></button>
+                <ul>
+                    <li class="menu" tb:type="radio" tb:arg="a,aLeft"><button type="button">{$lang->layout_manager[15]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="a,aCenter"><button type="button">{$lang->layout_manager[16]}</button></li>
+                    <li class="menu" tb:type="radio" tb:arg="a,aRight"><button type="button">{$lang->layout_manager[17]}</button></li>
+                </ul>
+            </li>
+        </ul>
+
+        <fieldset class="hideOption">
+            <label for="useHeader"><input type="checkbox" id="useHeader" /> Header</label>
+            <label for="useFooter"><input type="checkbox" id="useFooter" /> Footer</label>
+        </fieldset>
+    </div>
+
+    <!-- smartmenu start -->
+    <ul id="smartmenu">
+        <li id="for-all" style="display:block">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> 
+                </dd>
+            </dl>
+        </li>
+        <li id="for-extension">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
+                </dd>
+                <dt>Extension</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.popupAddWidget()">{$lang->layout_manager[20]}</button>
+                    <button type="button" onclick="FaceOff.popupAddContent()">{$lang->layout_manager[21]}</button>
+                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
+                </dd>
+            </dl>
+        </li>
+        <li id="for-widget">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
+                </dd>
+
+                <dt>Widget &gt; </dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.popupAddWidgetStyle()">{$lang->layout_manager[23]}</button>
+                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
+                    <button type="button" onclick="FaceOff.popupAddWidget()">{$lang->layout_manager[24]}</button>
+                    <button type="button" onclick="FaceOff.deleteWidget()">{$lang->layout_manager[25]}</button>
+                </dd>
+            </dl>
+        <li id="for-block">
+            <dl>
+                <dt style="display:none">{$lang->layout_manager[18]}</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference(event,'html>body')">{$lang->layout_manager[18]}</button> >
+                    <button type="button" onclick="FaceOff.showPreference(event,'#container')">{$lang->layout_manager[19]}</button> >
+                </dd>
+
+                <dt>Block</dt>
+                <dd>
+                    <button type="button" onclick="FaceOff.showPreference()">{$lang->layout_manager[22]}</button>
+                </dd>
+            </dl>
+        </li>
+    </ul>
+    <!-- smartmenu end -->
+
+    <!-- preview start -->
+    <div id="demoXe" class="demoFixed">
+        <div id="demoContainer" class="demoC">
+            <div id="demoHeader">
+            </div>
+            <div id="demoBody">
+                <div id="demoContent">
+                </div>
+                <div class="demoExtension demoE1">
+                </div>
+                <div class="demoExtension demoE2">
+                </div>
+            </div>
+            <div id="demoFooter">
+            </div>
+        </div>
+    </div>
+    <!-- preview end -->
+
+    </form>
+
+</div>
+
+<div id="propertyDialog">
+    <form>
+        <fieldset name="float" style="display:none">
+            <legend>{$lang->layout_manager[26]}</legend>
+            <div class="visible-more">
+                <label for="background-color">{$lang->layout_manager[26]} : </label>
+                <select id="float">
+                    <option value=''>{$lang->layout_manager[27]}</option>
+                    <option value='left'>{$lang->layout_manager[28]}</option>
+                    <option value='right'>{$lang->layout_manager[29]}</option>
+                </select>
+            </div>
+        </fieldset>
+        <fieldset name="width" style="display:none">
+            <legend>{$lang->layout_manager[30]}</legend>
+            <div class="visible-more">
+                <label for="width">{$lang->layout_manager[30]} : </label>
+                <input type="text" id="width" size="5" />
+            </div>
+        </fieldset>
+        <!--
+        <fieldset name="height" style="display:none">
+            <legend>{$lang->layout_manager[31]}</legend>
+            <div class="visible-more">
+                <label for="background-color">{$lang->layout_manager[31]} : </label>
+                <input type="text" id="height" size="5" />
+            </div>
+        </fieldset>
+        -->
+        <fieldset name="margin">
+            <legend>{$lang->layout_manager[32]}</legend>
+            <input type="text" id="margin" size="15" class="inputall" title="margin+px">
+            <button type="button" class="morelink"><span>+</span></button>
+            <div class="more">
+                <div>
+                    <label for="margin-top">{$lang->layout_manager[34]} : </label>
+                    <input type="text" id="margin-top" size="3">
+                </div>
+                <div>
+                    <label for="margin-left">{$lang->layout_manager[35]} : </label>
+                    <input type="text" id="margin-left" size="3">
+                </div>
+                <div>
+                    <label for="margin-right">{$lang->layout_manager[36]} : </label>
+                    <input type="text" id="margin-right" size="3">
+                </div>
+                <div>
+                    <label for="margin-bottom">{$lang->layout_manager[37]} : </label>
+                    <input type="text" id="margin-bottom" size="3">
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="padding">
+            <legend>{$lang->layout_manager[33]}</legend>
+            <input type="text" id="padding" size="15" class="inputall" title="padding+px">
+            <button type="button" class="morelink"><span>+</span></button>
+            <div class="more">
+                <div>
+                    <label for="padding-top">{$lang->layout_manager[34]} : </label>
+                    <input type="text" id="padding-top" size="3">
+                </div>
+
+                <div>
+                    <label for="padding-left">{$lang->layout_manager[35]} : </label>
+                    <input type="text" id="padding-left" size="3">
+                </div>
+
+                <div>
+                    <label for="padding-right">{$lang->layout_manager[36]} : </label>
+                    <input type="text" id="padding-right" size="3">
+                </div>
+
+                <div>
+                    <label for="padding-bottom">{$lang->layout_manager[37]} : </label>
+                    <input type="text" id="padding-bottom" size="3">
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="border">
+            <legend>{$lang->layout_manager[38]}</legend>
+            <span class="inputall">
+                <input type="text" id="border-width" size="3" title="border-width+px" />
+                <input type="text" id="border-color" size="7" class="color-indicator" title="border-color" />
+                <select id="border-style" title="border-style">
+                    <option value="none">{$lang->layout_manager[39]}</option>
+                    <option value="hidden">hidden</option>
+                    <option value="dotted">dotted</option>
+                    <option value="dashed">dashed</option>
+                    <option value="solid">solid</option>
+                    <option value="double">double</option>
+                    <option value="groove">groove</option>
+                    <option value="ridge">ridge</option>
+                    <option value="inset">inset</option>
+                    <option value="inset">outset</option>
+                </select>
+            </span>
+            <button type="button" class="morelink"><span>+</span></button>
+            <div class="more">
+                <div>
+                    <label for="border-top-width">{$lang->layout_manager[34]} : </label>
+                    <input type="text" id="border-top-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-top-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-top-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+                <div>
+                    <label for="border-right-width">{$lang->layout_manager[36]} : </label>
+                    <input type="text" id="border-right-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-right-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-right-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+                <div>
+                    <label for="border-bottom-width">{$lang->layout_manager[37]} : </label>
+                    <input type="text" id="border-bottom-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-bottom-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-bottom-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+                <div>
+                    <label for="border-left-width">{$lang->layout_manager[35]} : </label>
+                    <input type="text" id="border-left-width" size="3" title="border-width+px" />
+                    <input type="text" id="border-left-color" size="7" class="color-indicator" title="border-color" />
+                    <select id="border-left-style" title="border-style">
+                        <option value="none">{$lang->layout_manager[39]}</option>
+                        <option value="hidden">hidden</option>
+                        <option value="dotted">dotted</option>
+                        <option value="dashed">dashed</option>
+                        <option value="solid">solid</option>
+                        <option value="double">double</option>
+                        <option value="groove">groove</option>
+                        <option value="ridge">ridge</option>
+                        <option value="inset">inset</option>
+                        <option value="inset">outset</option>
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="background">
+            <legend>{$lang->layout_manager[40]}</legend>
+            <div class="visible-more">
+                <div>
+                    <label for="background-color">{$lang->layout_manager[41]} : </label>
+                    <input type="text" id="background-color" size="7" class="color-indicator" />
+                </div>
+                <div>
+                    <label for="background-image">{$lang->layout_manager[42]} :</label>
+                    <input type="text" id="background-image" size="14" /><button type="button" onclick="popupLayoutImageList({$layout_info->layout_srl})">{$lang->layout_manager[43]}</button>
+                </div>
+                <div>
+                    <label for="background-repeat">{$lang->layout_manager[44]} : </label>
+                    <select id="background-repeat">
+                        <option value="repeat">{$lang->layout_manager[45]}</option>
+                        <option value="no-repeat">{$lang->layout_manager[46]}</option>
+                        <option value="repeat-x">{$lang->layout_manager[47]}</option>
+                        <option value="repeat-y">{$lang->layout_manager[48]}</option>
+                    </select>
+                </div>
+            </div>
+        </fieldset>
+        <fieldset name="font">
+            <legend>{$lang->layout_manager[52]}</legend>
+            <div class="visible-more">
+                <div>
+                    <label for="font-family">{$lang->layout_manager[53]} :</label>
+                    <input type="text" id="font-family" size="14" />
+                </div>
+                <div>
+                    <label for="color">{$lang->layout_manager[54]} : </label>
+                    <input type="text" id="color" size="7" class="color-indicator" />
+                </div>
+            </div>
+        </fieldset>
+        <div class="buttonArea">
+            <button type="submit">{$lang->layout_manager[49]}</button>
+            <button type="reset">{$lang->layout_manager[50]}</button>
+        </div>
+    </form>
+</div>
diff --git a/modules/layout/tpl/faceoff_migration/01.png b/modules/layout/tpl/faceoff_migration/01.png
new file mode 100644
index 000000000..1beafd180
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/01.png differ
diff --git a/modules/layout/tpl/faceoff_migration/01_en.png b/modules/layout/tpl/faceoff_migration/01_en.png
new file mode 100644
index 000000000..ed143f065
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/01_en.png differ
diff --git a/modules/layout/tpl/faceoff_migration/02.png b/modules/layout/tpl/faceoff_migration/02.png
new file mode 100644
index 000000000..067889fc3
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/02.png differ
diff --git a/modules/layout/tpl/faceoff_migration/02_en.png b/modules/layout/tpl/faceoff_migration/02_en.png
new file mode 100644
index 000000000..7a7c491e1
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/02_en.png differ
diff --git a/modules/layout/tpl/faceoff_migration/03.png b/modules/layout/tpl/faceoff_migration/03.png
new file mode 100644
index 000000000..5359d67f7
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/03.png differ
diff --git a/modules/layout/tpl/faceoff_migration/04.png b/modules/layout/tpl/faceoff_migration/04.png
new file mode 100644
index 000000000..4c59b1ae3
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/04.png differ
diff --git a/modules/layout/tpl/faceoff_migration/04_en.png b/modules/layout/tpl/faceoff_migration/04_en.png
new file mode 100644
index 000000000..48416d80b
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/04_en.png differ
diff --git a/modules/layout/tpl/faceoff_migration/05.png b/modules/layout/tpl/faceoff_migration/05.png
new file mode 100644
index 000000000..c6b4a9f51
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/05.png differ
diff --git a/modules/layout/tpl/faceoff_migration/05_en.png b/modules/layout/tpl/faceoff_migration/05_en.png
new file mode 100644
index 000000000..c8148d72a
Binary files /dev/null and b/modules/layout/tpl/faceoff_migration/05_en.png differ
diff --git a/modules/layout/tpl/header.html b/modules/layout/tpl/header.html
index 7f8ee133c..768124b35 100644
--- a/modules/layout/tpl/header.html
+++ b/modules/layout/tpl/header.html
@@ -1,17 +1,44 @@
-<!--%import("js/layout_admin.js")-->
+<style type="text/css">
+	#faceoff_migration_info img { border: 1px solid #ccc; padding: 5px; }
+</style>
 
-<h3 class="xeAdmin"><span class="gray">{$lang->layout_management}</span></h3>
+<h1 class="h1">{$lang->installed_layout}</h1>
 
-<div class="infoText">{nl2br($lang->about_layout)}</div>
-
-<!-- 관리자 페이지용 메뉴 -->
-<!--@if($module == 'admin')-->
-<div class="header4">
-    <ul class="localNavigation">
-        <li <!--@if($act=='dispLayoutAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminContent','layout_type','')}">{$lang->layout_list}</a></li>
-        <li <!--@if($act=='dispLayoutAdminDownloadedList')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminDownloadedList','layout_type','')}">{$lang->downloaded_list}</a></li>
-        <li <!--@if($act=='dispLayoutAdminMobileContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminMobileContent','layout_type','')}">{$lang->mobile_layout_list}</a></li>
-        <li <!--@if($act=='dispLayoutAdminDownloadedMobileList')-->class="on"<!--@end-->><a href="{getUrl('act','dispLayoutAdminDownloadedMobileList','layout_type','')}">{$lang->mobile_downloaded_list}</a></li>
-    </ul>
+<div cond="$layout == 'faceoff'" class="message error">
+	<p>{$lang->faceoff_migration[0]}</p>
+	<p><a href="#faceoff_migration_info" class="modalAnchor">{$lang->faceoff_migration[1]}</a></p>
+</div>
+<div cond="$layout == 'faceoff'" id="faceoff_migration_info" class="modal">
+	<div class="fg">
+		<ol>
+			<li>
+				<p>{$lang->faceoff_migration[2]}</p>
+				<img cond="$lang_type == 'ko'" src="./faceoff_migration/01.png" alt="" />
+				<img cond="$lang_type != 'ko'" src="./faceoff_migration/01_en.png" alt="" />
+			</li>
+			<li>
+				<p>{$lang->faceoff_migration[3]}</p>
+				<img cond="$lang_type == 'ko'" src="./faceoff_migration/02.png" alt="" />
+				<img cond="$lang_type != 'ko'" src="./faceoff_migration/02_en.png" alt="" />
+			</li>
+			<li>
+				<p>{$lang->faceoff_migration[4]}</p>
+				<img src="./faceoff_migration/03.png" alt="" />
+			</li>
+			<li>
+				<p>{$lang->faceoff_migration[5]}</p>
+				<img cond="$lang_type == 'ko'" src="./faceoff_migration/04.png" alt="" />
+				<img cond="$lang_type != 'ko'" src="./faceoff_migration/04_en.png" alt="" />
+			</li>
+			<li>
+				<p>{$lang->faceoff_migration[6]}</p>
+				<img cond="$lang_type == 'ko'" src="./faceoff_migration/05.png" alt="" />
+				<img cond="$lang_type != 'ko'" src="./faceoff_migration/05_en.png" alt="" />
+			</li>
+		</ol>
+	</div>
+</div>
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-<!--@end-->
diff --git a/modules/layout/tpl/include.multilang.html b/modules/layout/tpl/include.multilang.html
new file mode 100644
index 000000000..8a45e064d
--- /dev/null
+++ b/modules/layout/tpl/include.multilang.html
@@ -0,0 +1,23 @@
+<block cond="$use_multilang">
+	<div id="langEdit" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput form">
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
+</block>
diff --git a/modules/layout/tpl/include.multilang.textarea.html b/modules/layout/tpl/include.multilang.textarea.html
new file mode 100644
index 000000000..5b05c0b24
--- /dev/null
+++ b/modules/layout/tpl/include.multilang.textarea.html
@@ -0,0 +1,27 @@
+<block cond="$use_multilang_textarea">
+	<style type="text/css">
+		#langEditTextarea textarea { width: 258px; }
+	</style>
+
+	<div id="langEditTextarea" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput form">
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <textarea id="{$code}_var1"></textarea></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
+</block>
diff --git a/modules/layout/tpl/index.html b/modules/layout/tpl/index.html
index 5e5ddbfb9..7af772489 100644
--- a/modules/layout/tpl/index.html
+++ b/modules/layout/tpl/index.html
@@ -8,43 +8,43 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="crossTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div>{$lang->layout}</div></th>
-        <th scope="col"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="3"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($layout_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="number center">{$no+1}</td>
-        <td>
-            {$val->layout}
-            <!--@if($val->module_srl)-->
-            (module) 
-            <!--@end-->
-        </td>
-        <td class="wide">{$val->title}</td>
-        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td>
-            <!--@if(!$val->module_srl)-->
-                <a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_management)}" class="buttonSet buttonSetting"><span>{$lang->cmd_layout_management}</span></a>
-            <!--@else-->
-                &nbsp;
-            <!--@end-->
-        </td>
-        <td><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_edit)}" class="buttonSet buttonLayoutEditor"><span>{$lang->cmd_layout_edit}</span></a></td>
-        <td><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <th colspan="7" class="button">
-            <a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th scope="col"><div>{$lang->no}</div></th>
+				<th scope="col"><div>{$lang->layout}</div></th>
+				<th scope="col"><div>{$lang->title}</div></th>
+				<th scope="col"><div>{$lang->regdate}</div></th>
+				<th scope="col" colspan="3"><div>&nbsp;</div></th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($layout_list as $no => $val)-->
+			<tr class="row{$cycle_idx}">
+				<td>{$no+1}</td>
+				<td>
+					{$val->layout}
+					<!--@if($val->module_srl)-->
+					(module) 
+					<!--@end-->
+				</td>
+				<td >{$val->title}</td>
+				<td>{zdate($val->regdate,"Y-m-d")}</td>
+				<td>
+					<!--@if(!$val->module_srl)-->
+					<a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_management)}" class="buttonSet buttonSetting"><span>{$lang->cmd_layout_management}</span></a>
+					<!--@else-->
+					&nbsp;
+					<!--@end-->
+				</td>
+				<td><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_edit)}" class="buttonSet buttonLayoutEditor"><span>{$lang->cmd_layout_edit}</span></a></td>
+				<td><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn"><a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','')}">{$lang->cmd_make}</a></span>
+</div>
diff --git a/modules/layout/tpl/insert_layout.html b/modules/layout/tpl/insert_layout.html
index e3ed8e83a..6789bd43d 100644
--- a/modules/layout/tpl/insert_layout.html
+++ b/modules/layout/tpl/insert_layout.html
@@ -1,38 +1,39 @@
-<!--%import("filter/insert_layout.xml")-->
-
 <!--#include("header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_layout)">
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertLayout" action="./" method="post">
+	<input type="hidden" name="module" value="layout" />
+	<input type="hidden" name="act" value="procLayoutAdminInsert" />
 	<input type="hidden" name="layout_type" value="{$layout_type}" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->layout_name}</div></th>
-        <td>
-            <select name="layout">
-                <option value="faceoff">faceoff</option>
-
-                <optgroup label="{$lang->downloaded_list}">
-                <!--@foreach($layout_list as $key => $val)-->
-                <option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="selected"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
-                <!--@end-->
-                </optgroup>
-
-            </select>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->title}</div></th>
-        <td>
-            <input type="text" name="title" value="{$info->title}" class="inputTypeText w400" />
-            <p>{$lang->about_title}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row" colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_next}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->layout_name}</th>
+				<td>
+					<select name="layout">
+						<option value="faceoff">faceoff</option>
+						
+						<optgroup label="{$lang->downloaded_list}">
+						<!--@foreach($layout_list as $key => $val)-->
+						<option value="{$val->layout}" <!--@if($layout == $val->layout)-->selected="selected"<!--@end-->> <!--@if($val->title)-->{$val->title} ({$val->layout})<!--@else-->{$val->layout}<!--@end--></option>
+						<!--@end-->
+						</optgroup>
+						
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->title}</th>
+				<td>
+					<input type="text" name="title" value="{$info->title}" />
+					<p>{$lang->about_title}</p>
+				</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_next}" /></span>
+	</div>
 </form>
diff --git a/modules/layout/tpl/installed_layout_list.html b/modules/layout/tpl/installed_layout_list.html
new file mode 100644
index 000000000..6b8b33c65
--- /dev/null
+++ b/modules/layout/tpl/installed_layout_list.html
@@ -0,0 +1,57 @@
+<include target="header.html" />
+<div class="table even easyList">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>
+				<a cond="$act != 'dispLayoutAdminInstalledList'" href="{getUrl('act', 'dispLayoutAdminInstalledList')}">PC({$pcLayoutCount})</a>
+				<block cond="$act == 'dispLayoutAdminInstalledList'">PC({$pcLayoutCount})</block>
+				|
+				<a cond="$act != 'dispLayoutAdminInstalledMobileList'" href="{getUrl('act', 'dispLayoutAdminInstalledMobileList')}">Mobile({$mobileLayoutCount})</a>
+				<block cond="$act == 'dispLayoutAdminInstalledMobileList'">Mobile({$mobileLayoutCount})</block>
+		</caption>
+		<thead>
+			<tr>
+				<th scope="col" class="title">{$lang->layout_name}</th>
+				<th scope="col">{$lang->version}</th>
+				<th scope="col">{$lang->author}</th>
+				<th scope="col">{$lang->path}</th>
+				<th scope="col">{$lang->cmd_delete}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<block loop="$layout_list => $key, $layout">
+			<tr>
+				<block cond="$layout->title">
+					<td class="title">
+						<p><a href="{getUrl('act', 'dispLayoutAdminInstanceList', 'type', $type, 'layout', $layout->layout)}">{$layout->title}</a></p>
+						<p>{$layout->description}</p>
+						<p cond="$layout->need_update == 'Y'" class="update">
+							{$lang->msg_avail_easy_update} <a href="{$layout->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
+						</p>
+					</td>
+					<td>{$layout->version}</td>
+					<td>
+						<block loop="$layout->author => $author">
+							<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
+							<block cond="!$author->homepage">{$author->name}</block>
+						</block>
+					</td>
+					<td>{$layout->path}</td>
+					<td><a cond="$layout->remove_url" href="{$layout->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
+				</block>
+				<block cond="!$layout->title">
+					<td class="title">
+						<p><a href="{getUrl('act', 'dispLayoutAdminInstanceList', 'type', $type, 'layout', $layout->layout)}">{$layout->layout}</a></p>
+						<p cond="$layout->need_update == 'Y'" class="update">
+							{$lang->msg_avail_easy_update} <a href="{$layout->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
+						</p>
+					</td>
+					<td>-</td>
+					<td>-</td>
+					<td>{$layout->path}</td>
+					<td><a cond="$layout->remove_url" href="{$layout->remove_url}&amp;return_url={urlencodegetRequestUriByServerEnviroment()}">{$lang->cmd_delete}</a></td>
+				</block>
+			</tr>
+			</block>
+		</tbody>
+	</table>
+</div>
diff --git a/modules/layout/tpl/js/adminEdit.js b/modules/layout/tpl/js/adminEdit.js
new file mode 100644
index 000000000..c0ffa12e3
--- /dev/null
+++ b/modules/layout/tpl/js/adminEdit.js
@@ -0,0 +1,24 @@
+jQuery(document).ready(function($){
+	$('.uploaded_image').css('cursor', 'pointer');
+	$('.uploaded_image_path').hide();
+	$('.uploaded_image').bind('click', function(e){
+		var path = $(this).siblings('.uploaded_image_path').html();
+		var html = '<div class="selected_image_path">' + path + '</div>';
+
+		$('.selected_image_path').remove();
+		$('.uploaded_image_list').after(html);
+	});
+});
+
+function doPreviewLayoutCode()
+{
+	var $form = jQuery('#fo_layout'), $act = $form.find('input[name=act]');
+	var og_act = $act.val();
+
+	$form.attr('target', '_LayoutPreview');
+	$act.val('dispLayoutPreview');
+	$form.submit();
+
+	$form.removeAttr('target');
+	$act.val(og_act);
+}
\ No newline at end of file
diff --git a/modules/layout/tpl/js/adminList.js b/modules/layout/tpl/js/adminList.js
new file mode 100644
index 000000000..9610f3ff0
--- /dev/null
+++ b/modules/layout/tpl/js/adminList.js
@@ -0,0 +1,8 @@
+var ConfirmCheck = xe.createPlugin('confirm_check', {
+	API_BEFORE_VALIDATE: function(sender, params){
+		return confirm(xe.lang.confirm_delete);
+	}
+});
+
+var Validator = xe.getApp('Validator')[0];
+Validator.registerPlugin(new ConfirmCheck());
\ No newline at end of file
diff --git a/modules/layout/tpl/js/faceoff.js b/modules/layout/tpl/js/faceoff.js
index 75e0b729b..bf073e529 100644
--- a/modules/layout/tpl/js/faceoff.js
+++ b/modules/layout/tpl/js/faceoff.js
@@ -1,995 +1,994 @@
-jQuery(function($){
-
-// constants
-var FACEOFF_TYPE   = ['fixed','liquid','hybrid'];
-var FACEOFF_COLUMN = ['ece','c','ec','ce','cee','eec'];
-var FACEOFF_ALIGN  = ['aCenter','aLeft','aRight'];
-
-var FaceOff = {
-    curElement    : null,
-    _widgetParent : null,
-
-    preview  : $('#demoXe'),
-    propDialog : null,
-
-    init : function() {
-        var fo = this;
-
-        // toolbar
-        $('#toolbar').toolbar({
-            fade  : 300,
-            click : function(data) {
-                var args = (data.arg || '').split(',');
-
-                switch(args[0]) {
-                    case 'a': fo.setLayoutAlign(args[1],false); break;
-                    case 'c': fo.setLayoutColumn(args[1],false); break;
-                    case 't': fo.setLayoutType(args[1],false); break;
-                }
-            },
-            hover : function(data) {
-                var item = data.element;
-                if(item.parent().is('.noneToolBar')) return;
-
-                var args = data.arg.split(',');
-                var pos_item = item.offset();
-                var pos_preview = fo.preview.show().css({left:0,top:0}).offset();
-                var type, col, align;
-                type  = 'demo'+capitalize(args[0]=='t'?args[1]:fo.getLayoutType());
-                col   = 'demo'+(args[0]=='c'?args[1]:fo.getLayoutColumn()).toUpperCase();
-                align = 'demo'+capitalize(args[0]=='a'?args[1]:fo.getLayoutAlign());
-
-                fo.preview.dequeue().stop().css({
-                    width: '60px',
-                    left : pos_item.left - pos_preview.left + item.parent().width() + 2,
-                    top  : pos_item.top - pos_preview.top
-                }).attr('class', 'layoutDemo demoBox '+type+' '+align);
-
-                $('#demoContainer').attr('class','').addClass(col);
-
-                (function(){
-                    if (!fo.preview.is(':visible')) return;
-
-                    fo.preview.animate({width:'150'}, 1000).animate({width:'120'}, 1000, 'linear', arguments.callee);
-                })();
-            },
-            hide : function(menu) {
-                fo.preview.dequeue().stop().hide();
-            }
-        });
-
-        if(typeof(faceOffStyle)!='undefined') {
-            for(var i in faceOffStyle) {
-                if(i=="body") {
-                    $("html>body").attr("style",faceOffStyle[i]);
-                } else {
-                    try {
-                        $(i).attr("style",faceOffStyle[i]);
-                    } catch(e) {
-                    }
-                }
-            }
-        }
-
-        $('#xe , #body, #header, #footer, #neck, #knee, div.e1, div.e2, div.neck, div.knee').each( function(i) { $(this).find('a').css('color',$(this).css('color')).css('font-family',$(this).css('font-family')); } );
-
-        if($('#header').css('display')!='none') $('#useHeader').attr('checked',true);
-        else $('#useHeader').attr('checked',false);
-        if($('#footer').css('display')!='none') $('#useFooter').attr('checked',true);
-        else $('#useFooter').attr('checked',false);
-
-        $('#useHeader').click(function(event) {
-            if($('#useHeader').attr('checked')) {
-                $('#header').css('display','block');
-                $('#useHeader').attr('checked', true);
-            } else {
-                $('#header').css('display','none');
-                $('#useHeader').attr('checked', false);
-            }
-        });
-
-        $('#useFooter').click(function(event) {
-            if($('#useFooter').attr('checked')) $('#footer').css('display','block');
-            else $('#footer').css('display','none');
-        });
-
-        // tab to select widget
-        $(document).mousedown(function(event){
-            var filter = '#xe .widgetOutput, #xe .extension, #body, #header, #footer, #toolbar, #propertyDialog, #faceoffSelector, .overlay';
-            var target = $(event.target);
-            var selection = target.parents(filter).add(target);
-
-            if (selection.is('#toolbar, #propertyDialog, #faceoffSelector, .overlay')) return;
-
-            if (selection.is(filter)) {
-                fo.selectElement(selection.filter(filter).eq(0));
-
-                event.stopPropagation();
-                event.preventDefault();
-            } else if(fo.curElement) {
-                fo.selectElement(null);
-            }
-        }).hotkey({
-            'TAB'   : method(this.selectByTAB, this),
-            'Shift+TAB' : method(this.selectByTAB, this),
-            'UP'    : method(this.moveWidget, this),
-            'DOWN'  : method(this.moveWidget, this),
-            'LEFT'  : method(this.moveWidget, this),
-            'RIGHT' : method(this.moveWidget, this),
-            'ESC'   : method(this.selectByESC, this),
-            'ENTER' : method(this.showPreference, this)
-        });
-
-        // select default menus
-        var type  = this.getLayoutType();
-        var col   = this.getLayoutColumn();
-        var align = this.getLayoutAlign();
-
-        $('#toolbar .buttons li.menu').each(function(){
-            var arg = $(this).attr('tb:arg');
-            if (!arg.indexOf('t,'+type) || !arg.indexOf('c,'+col) || !arg.indexOf('a,'+align)) $(this).click();
-        });
-
-        this.propDialog = PropertyDialog.init('#propertyDialog');
-    },
-    getLayoutType : function() {
-        var sel = $('#container[style],#header[style]:visible,#footer[style]:visible')
-            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
-            .add('div[id^=ex_][style]:visible, div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible');
-        //sel.css('padding','').css('margin','');
-        return findEnum($('#xe').attr('class'), FACEOFF_TYPE);
-    },
-    // LaytoutType : 'fixed','liquid','hybrid' 을 set
-    // fixed : Use fixed width for all column
-    // liquid : Use flexible width for all column
-    // hybrid : Use flexible width for all column but content column
-    setLayoutType : function(type) {
-        $('#xe').removeClass(FACEOFF_TYPE.join(' ')).addClass(_enum(type, FACEOFF_TYPE));
-    },
-    getLayoutColumn : function() {
-        return findEnum($('#container').attr('class'), FACEOFF_COLUMN);
-    },
-    //'ece','c','ec','ce','cee','eec' 컬럼타입을 set 한다 크기와 관련된 스타일은 초기화 한다
-    setLayoutColumn : function(type,init){
-        $('#container').removeClass(FACEOFF_COLUMN.join(' ')).addClass(_enum(type, FACEOFF_COLUMN));
-        var sel = $('#container[style],#header[style]:visible,#footer[style]:visible')
-            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
-            .add('div[id^=ex_][style]:visible, div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible');
-
-        if(init) sel.css('padding','').css('margin','');
-
-        // 칼럼의 변경으로, 현재 선택된 위젯이 보이지 않게 된다면, 위젯 선택을 해제한다.
-        if (this.curElement && !this.curElement.parents('#xe .extension:visible').length) {
-            this.selectElement(null);
-        }
-    },
-    getLayoutAlign  : function() {
-        return findEnum($('#xe').attr('class'), FACEOFF_ALIGN);
-    },
-    setLayoutAlign : function(type) {
-        $('#xe').removeClass(FACEOFF_ALIGN.join(' ')).addClass(_enum(type, FACEOFF_ALIGN));
-    },
-    saveLayoutConfig : function(saveTemp) {
-        $.exec_json('layout.procLayoutAdminUserValueInsert', {
-            'saveTemp':saveTemp || '',
-            mid  : current_mid,
-            type : this.getLayoutType(),
-            column : this.getLayoutColumn(),
-            align  : this.getLayoutAlign(),
-            neck : this.getWidgetContent($('#body .neck:visible')),
-            knee : this.getWidgetContent($('#body .knee:visible')),
-            e1   : this.getWidgetContent($('#body .e1:visible')),
-            e2   : this.getWidgetContent($('#body .e2:visible')),
-            neck : this.getWidgetContent($('#neck:visible')),
-            knee : this.getWidgetContent($('#knee:visible')),
-            css  : this.getFaceoffStyle()
-        },function(data){
-            if(data.saveTemp=='Y'){
-                document.location.href = request_uri.setQuery('mid',current_mid).setQuery('act','dispLayoutAdminLayoutModify');
-            }else{
-                document.location.href = request_uri.setQuery('mid',current_mid);
-            }
-        });
-    },
-    getWidgetContent : function(el) {
-        if (!el.length) return '';
-
-        var text = [];
-
-        el.find('div[widget]').each(function(){
-            var type = $(this).attr('widget');
-
-            switch(type) {
-                case 'widgetContent':
-                    var div  = $('<div>');
-                    var attr = [];
-
-                    $(this.attributes).each(function(){
-                        if (!this.nodeName || !this.nodeValue) return;
-
-                        var name = this.nodeName.toLowerCase(), val = this.nodeValue;
-                        if ('.contenteditable.src.widget.class.widget_width.widget_width_type.xdpx.xdpy.height.'.indexOf('.'+name+'.') > -1) return;
-
-                        div.text(val);
-                        attr.push(name+'="'+div.html()+'"');
-                    });
-
-                    var content = $(this).children('div.widgetContent');
-                    if (!content.length) return;
-                    return text.push('<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" '+attr.join(' ')+' />');
-                default:
-                    var div  = $('<div>');
-                    var attr = [];
-
-                    $(this.attributes).each(function(){
-                        if (!this.nodeName || !this.nodeValue) return;
-
-                        var name = this.nodeName.toLowerCase(), val = this.nodeValue;
-                        if ('.style.contenteditable.src.widget.body.class.widget_width.widget_width_type.xdpx.xdpy.height.'.indexOf('.'+name+'.') > -1) return;
-
-                        div.text(val);
-                        attr.push(name+'="'+div.html()+'"');
-                    });
-                    attr.push('style="'+$(this).attr('style')+'"');
-
-//                    return text.push('<img class="zbxe_widget_output" widget="'+type+'" addclass="section" '+attr.join(' ')+' />');
-                    return text.push('<img class="zbxe_widget_output" widget="'+type+'" '+attr.join(' ')+' />');
-            }
-        });
-
-        return text.join('');
-    },
-    getFaceoffStyle : function() {
-        var sty = [];
-        var sel = $('html>body,#container[style],#header[style],#footer[style]')
-            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
-            .add('div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible'); //div[id^=ex_][style]:visible,
-
-        sel.each(function(){
-            var bgImage = $(this).css("backgroundImage");
-            if(bgImage && bgImage!='none') {
-                bgImage = bgImage.replace(/(.+)images\/([a-z0-9]+)\.(jpg|jpeg|gif|png|swf|flv)\)/i,'url(./images/$2.$3)');
-                $(this).css("background-image",bgImage);
-            }
-            var style = $(this).attr('style');
-            if($(this).is('.neck, .knee, .e1, .e2')) {
-                if (!style) return;
-                if($(this).is('.e1')) sty.push( 'div.e1 { ' + style + ' } ');
-                else if($(this).is('.e2')) sty.push( 'div.e2 { ' + style + ' } ');
-                else if($(this).is('.neck')) sty.push( 'div.neck { ' + style + ' } ');
-                else if($(this).is('.knee')) sty.push( 'div.knee { ' + style + ' } ');
-            }else if($(this).is('html>body')) {
-                style = 'background-color:' + $(this).css('backgroundColor')
-                + ';background-image:' + $(this).css('backgroundImage')
-                + ';background-repeat:' + $(this).css('backgroundRepeat');
-                + ';font-family:'+ $(this).css('fontFamily');
-                + ';color:'+ $(this).css('color');
-                sty.push('body' + ' { ' + style +' }');
-                if($(this).css('fontFamily')) sty.push('body a { font-family:'+$(this).css('fontFamily')+'; }');
-                if($(this).css('color')) sty.push('body a { color:'+$(this).css('color')+'; }');
-            } else {
-                if (!style) return;
-                sty.push('#' + this.id + ' { ' + style +' }');
-                if($(this).css('fontFamily')) sty.push('#'+this.id+' a { font-family:'+$(this).css('fontFamily')+'; }');
-                if($(this).css('color')) sty.push('#'+this.id+' a { color:'+$(this).css('color')+'; }');
-            }
-        });
-
-        return sty.join('\n');
-    },
-    doAddWidgetCode : function(widget_code) {
-
-        var par = this._widgetParent;
-        var obj = $(widget_code);
-        var uniqueId = '', style = '';
-
-        if (!par) return;
-
-
-        if (par.is('.widgetOutput')) {
-            uniqueId = par.attr('id');
-            obj.attr('id', uniqueId).addClass('section');
-            par.replaceWith(obj).attr('style', par.attr('style'));
-            if(!obj.css("float")) obj.css("clear","both");
-            else(obj.css("clear",""));
-        } else {
-            uniqueId = 'ex_'+(new Date()).getTime();
-            obj.attr('id', uniqueId).addClass('section');
-            obj.appendTo(this._widgetParent).attr('style','');
-            obj.css("clear","both");
-        }
-
-        this.selectElement(this._widgetParent);
-        this._widgetParent = null;
-
-        this.saveLayoutConfig('Y');
-    },
-    selectByTAB : function(event, key) {
-        var els   = null;
-        var cur   = this.curElement;
-        var shift = event.shiftKey, els, len, idx;
-
-        if (!cur || cur.hasClass('widgetOutput')) els = $('#xe .extension:visible > .widgetOutput');
-        else if (cur.is('#body, #header, #footer')) els = $('#body, #header, #footer');
-        else if (cur.is('.extension')) els = $('#xe .extension:visible');
-
-        if (!els.length) els = $('#xe .extension:visible');
-
-        if (!(len = els.length)) return;
-        if (cur && (idx = els.index(cur)) < 0) {
-            this.selectElement(null);
-            return this.selectByTAB(event, key);
-        }
-
-        if (cur) {
-            if (shift) this.selectElement( els.eq( idx?idx-1:len-1 ) );
-            else this.selectElement( els.eq( idx==len-1?0:idx+1 ) );
-        } else {
-            this.selectElement( els.eq( shift ? len-1 : 0 ) );
-        }
-    },
-    selectByESC : function(event, key) {
-        var cur = this.curElement, par;
-
-        if (!cur) return this.selectByTAB(event, key);
-
-        if (cur.is('#body, #header, #footer')) {
-            this.selectElement(null);
-        } else if (cur.hasClass('extension')) {
-            par = cur.parent('#body, #header, #footer').add(cur.prev('#header')).add(cur.next('#footer'));
-            par.length?this.selectElement(par.eq(0)):this.selectElement(null);
-        } else if (cur.hasClass('widgetOutput')) {
-            this.selectElement( cur.parent('.extension').eq(0) );
-        }
-    },
-    moveWidget : function(event, key) {
-        var vert = 0, horz = 0;
-        var cur = this.curElement;
-        var selection;
-
-        if (!cur || !cur.hasClass('widgetOutput')) return;
-
-        switch(key) {
-            case 'UP': vert = -1; break;
-            case 'DOWN' : vert = 1; break;
-            case 'LEFT' : horz = -1; break;
-            case 'RIGHT' : horz = 1; break;
-        }
-
-        if (horz && cur.parents('#body').length && this.getLayoutColumn().length > 2) {
-            if (horz > 0 && cur.parents('.e1').length && $('#body > .e2:visible').length) {
-                $('#body > .e2').append(cur);
-            } else if (horz < 0 && cur.parents('.e2').length && $('#body > .e1:visible').length) {
-                $('#body > .e1').append(cur);
-            }
-        } else if (vert < 0) { // up
-            if ((selection = cur.prev('.widgetOutput')).length) {
-                selection.before(cur);
-            } else if (cur.parents('.e1, .e2').length) {
-                $('#neck > .extension').append(cur);
-            } else if (cur.parents('#knee:visible').length) {
-                $('#body > .extension:visible:last').append(cur);
-            }
-        } else if (vert > 0) { // down
-            if ((selection = cur.next('.widgetOutput')).length) {
-                selection.after(cur);
-            } else if (cur.parents('.e1, .e2').length) {
-                $('#knee > .extension').prepend(cur);
-            } else if (cur.parents('#neck:visible').length) {
-                $('#body > .extension:visible:first').prepend(cur);
-            }
-        }
-
-        this.selectElement(cur);
-    },
-    deleteWidget : function(){
-        var cur = this.curElement;
-
-        if (!cur.is('.widgetOutput')) return;
-        cur.remove();
-
-        this.saveLayoutConfig('Y');
-    },
-    popupAddWidgetStyle : function(){
-        var cur = this.curElement;
-        this._widgetParent = this.curElement;
-
-        if (!cur.is('.widgetOutput')) return;
-
-        selectedWidget = cur.get(0);
-        popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+cur.attr('widget')+"&widgetstyle="+cur.attr('widgetstyle'),'GenerateCodeInPage');
-    },
-
-    popupAddWidget : function() {
-        var cur = this.curElement;
-        var url = request_uri.replace(/\?.+$/, '')+'?module=widget&type=faceoff';
-        var win = 'GenerateWidgetCode';
-
-        if (!cur.is('.widgetOutput, .extension')) return;
-
-        this._widgetParent = this.curElement;
-
-        if (cur.is('.widgetOutput')) {
-            selectedWidget = cur.get(0);
-            // modify widget
-            if (cur.attr('widget') == 'widgetContent') {
-                // content widget
-                url += '&act=dispWidgetAdminAddContent&module_srl='+$('#layout_srl').val()+'&document_srl='+cur.attr('document_srl');
-                popopen(url, 'addContent');
-            } else {
-                // widget
-                url += '&act=dispWidgetGenerateCodeInPage&selected_widget='+cur.attr('widget');
-                popopen(url, 'GenerateCodeInPage');
-            }
-        } else {
-            // add new widget
-            url += '&act=dispWidgetGenerateCodeInPage';
-            popopen(url, 'GenerateCodeInPage');
-        }
-    },
-    popupAddContent : function() {
-        var url = request_uri.replace(/\?.+$/,'')+'?module=widget&act=dispWidgetAdminAddContent&type=faceoff&mid=current_mid&module_srl='+$('#layout_srl').val();
-
-        this._widgetParent = this.curElement;
-
-        popopen(url, "addContent");
-    },
-    selectElement  : function(element) {
-        var selector = $('#faceoffSelector'), cur, pos_cur, pos_sel;
-        var cur = this.curElement = element || null;
-
-        if (!selector.length) selector = $('<div id="faceoffSelector">');
-
-        // hide selector
-        selector.hide();
-        var sel = $('#neck[style]:visible .extension, #knee[style]:visible .extension,div.e1[style]:visible, div.e2[style]:visible').height('');
-
-        // 위젯을 할당한다. 선택된 위젯이 jQuery 객체가 아니거나 혹은 해당하는 DOM이 없다면 현재 선택된 위젯은 없다.
-        if (cur && ( !cur.jquery || !cur.length )) cur = this.curElement = null;
-
-        $('#smartmenu>li').hide();
-        // effect on select
-        if (cur) {
-            $(cur.get(0).offsetParent).append(selector);
-
-            pos_cur = cur.offset();
-            pos_sel = selector.css({position:'absolute',left:0,top:0}).show().offset();
-
-            if(cur.height() == 0) cur.height(20);
-
-            selector.css({
-                left : pos_cur.left - pos_sel.left,
-                top  : pos_cur.top  - pos_sel.top
-            })
-            .width(cur.attr('offsetWidth'))
-            .height(cur.attr('offsetHeight'));
-
-            if (cur.is('#body, #header, #footer')) {
-                $('#for-block').show();
-                $('>dl>dt:visible','#for-block').html(cur.attr('id')+' &gt; ');
-            } else if (cur.is('.extension')) {
-
-                var selected = 'Extension';
-                if(cur.parent().is('#neck')){
-                    selected = 'Neck';
-                }else if(cur.parent().is('#knee')){
-                    selected = 'Knee';
-                }else if(cur.is('.neck')){
-                    selected = 'Extension Neck';
-                }else if(cur.is('.knee')){
-                    selected = 'Extension Knee';
-                }else if(cur.is('.e1')){
-                    selected = 'Extension 1';
-                }else if(cur.is('.e2')){
-                    selected = 'Extension 2';
-                }
-                $('>dl>dt','#for-extension').html(selected+' &gt; ');
-
-                $('#for-extension').show();
-            } else if (cur.is('.widgetOutput')) {
-                $('#for-widget').show();
-
-            }
-        } else {
-            $('#for-all').show();
-        }
-    },
-    showPreference : function(event,target) {
-        if(target && target=='html>body' || target=='#container'){
-            this.propDialog.open($(target));
-        }else{
-            var cur = this.curElement;
-
-            if (!cur || !cur.length) return this.closePreference();
-
-            this.propDialog.open(this.curElement);
-        }
-    },
-    paint : function() {
-        if (!this.curElement) return;
-
-        // repaint selection size
-
-        if (this.propDialog.visible())
-
-        this.propDialog.paint();
-    }
-};
-
-var PropertyDialog = {
-    element : null,
-    overlay : null,
-    target  : null,
-
-    init : function(element) {
-        this.element = $(element).draggable();
-
-        if (!this.overlay) this.overlay = Overlay.create();
-
-        // more link
-        this.element.find('button.morelink').click( method(this.more, this) );
-
-        // form
-        this.element.find('form')
-            .bind('submit', method(this.save, this))
-            .bind('reset', method(this.cancel, this));
-
-        return this;
-    },
-    open : function(selectedElement) {
-        var sel = selectedElement;
-        var dlg = $('#propertyDialog');
-        var vals = [], i = 0, j = 0;
-        var type = ['margin', 'padding'];
-        var dirs = ['top','right','bottom','left'];
-        var reSame = /^([0-9a-z%\-]+) \1 \1 \1$/;
-        var isWidget = false;
-        var isBody = false;
-        var isLayout = false;
-        dlg.css( { position : 'absolute' } );
-
-        function same_all(arr) {
-            return (arr[0] == arr[1] && arr[1] == arr[2] && arr[2] == arr[3]);
-        }
-
-        // target element
-        this.target = sel;
-
-        // is the target a widget?
-        isWidget = sel.is('.widgetOutput');
-        isBody  = sel.is('html>body');
-        isContainer  = sel.is('#container');
-        isHeader = sel.is('#header');
-
-
-        $('fieldset',dlg).show();
-
-        if(!isWidget){
-            $('fieldset[name=float],fieldset[name=width],fieldset[name=height],fieldset[name=margin],fieldset[name=padding]',dlg).hide();
-        }
-
-        if(isBody){
-            $('fieldset[name!=background]',dlg).hide();
-            $('fieldset[name=font]',dlg).show();
-        }
-
-        if(isHeader){
-            $('fieldset[name=margin]',dlg).show();
-            $('fieldset[name=padding]',dlg).show();
-        }
-
-        // remove visible more
-        this.element.find('.visible-more').removeClass('visible-more');
-
-        // get preferences
-        if($('fieldset[name=float]:visible',dlg).size() > 0){
-            //float
-            $('#float').val(sel.css('float'));
-            $('#width').val(sel.css('width'));
-            //$('#height').val(sel.css('height'));
-        }
-
-        if($('fieldset[name=margin]:visible',dlg).size() > 0){
-            // margins and paddings
-            for(j=0; j < type.length; j++) {
-                for(i=0, vals=[]; i < dirs.length; i++) {
-                    vals[i] = (j&&sel.is('.widgetOutput')?sel.find('div.widgetBorder > div:first'):sel).css(type[j]+'-'+dirs[i]).toLowerCase();
-
-                    if ($.browser.msie && vals[i] == 'auto') vals[i] = '0px';
-                    $('#'+type[j]+'-'+dirs[i]).val(vals[i]);
-                }
-
-                $('#'+type[j]).val( reSame.test(vals.join(' '))?vals[0]:vals.join(' ') );
-            }
-        }
-
-
-        if($('fieldset[name=border]:visible',dlg).size() > 0){
-            // border
-            var style = [], width = [], color = [];
-            for(i=0; i < dirs.length; i++) {
-                style[i] = sel.css('border-'+dirs[i]+'-style').toLowerCase();
-                width[i] = sel.css('border-'+dirs[i]+'-width').toLowerCase();
-                color[i] = this._formatColor(sel.css('border-'+dirs[i]+'-color'));
-            }
-            if ( same_all(style) && same_all(width) && same_all(color) ) {
-                $('#border-style').val(style[0]);
-                $('#border-width').val(width[0]);
-                $('#border-color').val(color[0]);
-            } else {
-                dlg.find('fieldset[name=border]').addClass('visible-more');
-
-                for(i=0; i < dirs.length; i++) {
-                    $('#border-'+dirs[i]+'-style').val( style[i] );
-                    $('#border-'+dirs[i]+'-width').val( width[i] );
-                    $('#border-'+dirs[i]+'-color').val( color[i] );
-                }
-            }
-        }
-
-        if($('fieldset[name=font]:visible',dlg).size() > 0){
-            //font
-            $('#font-family').val(sel.css('font-family'));
-            $('#color').val(sel.css('color'));
-        }
-
-        if($('fieldset[name!=background]',dlg).size() > 0){
-            // background
-
-            dlg.find('fieldset[name=background]').addClass('visible-more');
-            $('#background-color').val(this._formatColor(sel.css('background-color')));
-            if(sel.css('background-image')) $('#background-image').val(sel.css('background-image').replace(/url\(([^\)]*)\)/i,'$1'));
-            $('#background-repeat').val(sel.css('background-repeat'));
-        }
-
-        this.element.show();
-        this.overlay.show(selectedElement);
-
-        // disable hotkey
-        $(document).hotkey('disable');
-
-        // add esc key event
-        $(window).keyup( function(e) { if(e.keyCode == 27) window.FaceOff.propDialog.close(); } );
-    },
-    save : function(event) {
-        var val;
-
-        if (!this.target) return false;
-
-        var dlg = $('#propertyDialog');
-
-        if($('fieldset[name=margin]:visible',dlg).size() > 0){
-            // margins
-            if ($('#margin').is(':visible')) {
-                val = $('#margin').val();
-            } else {
-                val = this._compactValues(
-                    $('#margin-top').val(),
-                    $('#margin-right').val(),
-                    $('#margin-bottom').val(),
-                    $('#margin-left').val()
-                );
-            }
-
-            if (this.target.is('.widgetOutput')) {
-                this.target.css('margin', val);
-
-                val = this._expandValues( $.trim(val).split(' ') );
-                this.target
-                    .attr('widget_margin_top', val[0])
-                    .attr('widget_margin_right', val[1])
-                    .attr('widget_margin_bottom', val[2])
-                    .attr('widget_margin_left', val[3]);
-            } else {
-                this.target.css('margin', val);
-            }
-        }
-
-
-        if($('fieldset[name=padding]:visible',dlg).size() > 0){
-            // paddings
-            if ($('#padding').is(':visible')) {
-                val = $('#padding').val();
-            } else {
-                val = this._compactValues(
-                    $('#padding-top').val(),
-                    $('#padding-right').val(),
-                    $('#padding-bottom').val(),
-                    $('#padding-left').val()
-                );
-            }
-
-            if (this.target.is('.widgetOutput')) {
-                this.target.find('div.widgetBorder > div:first').attr('style','').css('padding', val);
-
-                val = this._expandValues( $.trim(val).split(' ') );
-                this.target
-                    .attr('widget_padding_top', val[0])
-                    .attr('widget_padding_right', val[1])
-                    .attr('widget_padding_bottom', val[2])
-                    .attr('widget_padding_left', val[3]);
-            } else {
-                this.target.css('padding', val);
-            }
-        }
-
-
-        if($('fieldset[name=border]:visible',dlg).size() > 0){
-            // border
-            if (this.element.find('fieldset[name=border] .inputall').is(':visible')) {
-                this.target.css( 'border', $('#border-width').val()+' '+$('#border-style').val()+' '+$('#border-color').val() );
-            } else {
-
-                this.target.css( 'border-top', $('#border-top-width').val()+' '+$('#border-top-style').val()+' '+$('#border-top-color').val() );
-                this.target.css( 'border-right', $('#border-right-width').val()+' '+$('#border-right-style').val()+' '+$('#border-right-color').val() );
-                this.target.css( 'border-bottom', $('#border-bottom-width').val()+' '+$('#border-bottom-style').val()+' '+$('#border-bottom-color').val() );
-                this.target.css( 'border-left', $('#border-left-width').val()+' '+$('#border-left-style').val()+' '+$('#border-left-color').val() );
-            }
-        }
-
-        // background
-        val = $('#background-image').val().trim();
-        if (val == 'none' || val == '') val = '';
-        if (val) val = 'url("'+val+'")';
-
-        this.target.css({
-            'background-color' : $('#background-color').val(),
-            'background-image' : val,
-            'background-repeat' : $('#background-repeat').val()
-        });
-
-
-        // font 
-        this.target.css({
-            'font-family' : $('#font-family').val(),
-            'color' : $('#color').val()
-        });
-
-        this.target.find('a').css({
-            'font-family' : $('#font-family').val(),
-            'color' : $('#color').val()
-        });
-
-
-        if($('fieldset[name=float]:visible',dlg).size() > 0){
-            if(this.target.is('.widgetOutput')){
-                this.target.css({
-                    'float' : $('#float').val(),
-                    'width' : $('#width').val(),
-                    'clear' : ''
-                    //'height' : $('#height').val()
-                });
-            }
-        }
-
-
-        // close this dialog
-        this.close();
-
-        return false;
-    },
-    cancel : function() {
-        // close this dialog
-        this.close();
-
-        return false;
-    },
-    close : function() {
-        this.target = null;
-
-        this.element.hide();
-        this.overlay.hide();
-
-        // enable hotkey
-        $(document).hotkey('enable');
-    },
-    more : function(event) {
-        var block  = $(event.target).parent();
-        var name   = '';
-        var val    = '';
-        var items = ['top', 'right', 'bottom', 'left'];
-        var reUnit = /^(\-?[0-9]+(?:%|px|em|pt)|auto)$/;
-        var i;
-
-        name = block.toggleClass('visible-more').attr('name');
-
-        if (block.is('.visible-more')) {
-            switch(name) {
-                case 'margin':
-                case 'padding':
-                    val = $('#'+name).val();
-                    val = $.trim(val).replace('\s{2,}', ' ').split(' ');
-                    val = this._expandValues(val);
-
-                    for(i=0; i < val.length; i++) {
-                        if (!val[i] || !reUnit.test(val[i])) val[i] = '0px';
-                        $('#'+name+'-'+items[i]).val(val[i]);
-                    }
-
-                    $('#'+name+'-top').focus();
-                    break;
-                case 'border':
-                    val = $('#border-width').val();
-                    if (!val || !reUnit.test(val)) val = '0px';
-
-                    for(i=0; i < items.length; i++) {
-                        $('#border-'+items[i]+'-style').val( $('#border-style').val() );
-                        $('#border-'+items[i]+'-width').val( val );
-                        $('#border-'+items[i]+'-color').val( this._formatColor($('#border-color').val()) );
-                    }
-                    break;
-            }
-        } else {
-            switch(name) {
-                case 'margin':
-                case 'padding':
-                    for(i=0; i < val.length; i++) {
-                        if (!val[i] || !reUnit.test(val[i])) val[i] = '0px';
-                        $('#'+name+'-'+items[i]).val(val[i]);
-                    }
-
-                    val = this._compactValues(
-                        $('#'+name+'-top').val(),
-                        $('#'+name+'-right').val(),
-                        $('#'+name+'-bottom').val(),
-                        $('#'+name+'-left').val()
-                    );
-
-                    $('#'+name).val(val).focus();
-                    break;
-                case 'border':
-                    $('#border-style').val( $('#border-top-style').val() );
-                    $('#border-width').val( $('#border-top-width').val() );
-                    $('#border-color').val( this._formatColor($('#border-top-color').val()) );
-                    break;
-            }
-        }
-    },
-    visible : function() {
-        return this.element.is(':visible');
-    },
-    paint : function(selectedElement) {
-        this.overlay.paint(selectedElement);
-    },
-    _compactValues : function(top,right,bottom,left) {
-        if (top == right && right == left && left == bottom) {
-            return top;
-        } else if (top == bottom && right == left) {
-            return top+' '+left;
-        } else {
-            return top+' '+right+' '+bottom+' '+left;
-        }
-    },
-    _expandValues : function(values) {
-        var v = values;
-
-        if (v.length == 1) return [ v[0], v[0], v[0], v[0] ];
-        if (v.length == 2) return [ v[0], v[1], v[0], v[1] ];
-        if (v.length == 3) v.push(v[1]);
-
-        return v;
-    },
-    _formatColor : function(color) {
-        function hex(s) {
-            s = parseInt(s,10).toString(16);
-            return s.length<2?'0'+s:s;
-        }
-
-        if (/rgb\(([0-9, ]+)\)/i.test(color)) {
-            var rgb = RegExp.$1.replace(/\s+/g, '').split(',');
-
-            return '#'+hex(rgb[0])+hex(rgb[1])+hex(rgb[2]);
-        }
-
-        return color;
-    }
-};
-
-var Overlay = {
-    element : null,
-
-    create : function() {
-        // create overlay
-        this.element = $('<div /><div /><div /><div />').appendTo(document.body).attr('class', 'overlay').css('opacity', 0.75);
-
-        return this;
-    },
-    toggle : function(selectedElement) {
-        if (this.element.is(':visible')) {
-            this.show(selecetedElement);
-        } else {
-            this.hide();
-        }
-    },
-    show : function(selectedElement) {
-        this.paint(selectedElement);
-        this.element.show();
-    },
-    hide : function() {
-        this.element.hide();
-    },
-    paint : function(selectedElement) {
-        var sel = selectedElement;
-        var doc = $(document);
-        var pos = sel.offset();
-        var ovr = this.element;
-
-        // top
-        ovr.eq(0).css({
-            left : 0,
-            top  : 0,
-            width  : '100%',
-            height : pos.top+'px'
-        });
-
-        // left
-        ovr.eq(1).css({
-            left : 0,
-            top  : pos.top+'px',
-            width  : pos.left+'px',
-            height : sel.get(0).offsetHeight+'px'
-        });
-
-        // right
-        ovr.eq(2).css({
-            right : 0,
-            top   : pos.top+'px',
-            width  : doc.width()-pos.left-sel.get(0).offsetWidth+'px',
-            height : sel.get(0).offsetHeight+'px'
-        });
-
-        // bottom
-        ovr.eq(3).css({
-            left   : 0,
-            bottom : 0,
-            width  : '100%',
-            height : doc.height()-pos.top-sel.get(0).offsetHeight+'px'
-        });
-    }
-}
-
-// bind a function as a method
-function method(func, thisObj) {
-    return function() {
-        return func.apply(thisObj,arguments);
-    }
-}
-
-//  특정한 값이 주어진 타입에 해당하는지 확인하고 그렇지 않다면 기본값으로 대체한다.
-function _enum(value, enums, defaultIndex) {
-    if (!$.isArray(enums) || enums.length < 1) return value;
-    if (typeof defaultIndex == "undefined") defaultIndex = 0;
-
-    return $.inArray(value, enums)?value:enums[defaultIndex];
-}
-
-// 클래스 문자열에서 주어진 타입에 해당하는 클래스를 추출
-function findEnum(strClass, enums) {
-    var regex = new RegExp(' (' + enums.join('|') + ') ');
-
-    return regex.test(' ' + strClass + ' ')?RegExp.$1:'';
-}
-
-function capitalize(str) {
-    return str.charAt(0).toUpperCase() + str.substr(1);
-}
-
-// register objects as global
-window.FaceOff = FaceOff;
-window.doAddWidgetCode = function(widget_code){ FaceOff.doAddWidgetCode(widget_code) };
-FaceOff.init();
-
-});
-
-// overriding displayMultiMedia()
-window.displayMultimedia = function(src, width, height, options) {
-    var html = _displayMultimedia(src, width, height, options);
-
-    if (jQuery.isReady) {
-
-    } else {
-        document.write(html);
-    }
-}
-
-var selectedWidget =null;
+jQuery(function($){
+
+// constants
+var FACEOFF_TYPE   = ['fixed','liquid','hybrid'];
+var FACEOFF_COLUMN = ['ece','c','ec','ce','cee','eec'];
+var FACEOFF_ALIGN  = ['aCenter','aLeft','aRight'];
+
+var FaceOff = {
+    curElement    : null,
+    _widgetParent : null,
+
+    preview  : $('#demoXe'),
+    propDialog : null,
+
+    init : function() {
+        var fo = this;
+
+        // toolbar
+        $('#toolbar').toolbar({
+            fade  : 300,
+            click : function(data) {
+                var args = (data.arg || '').split(',');
+
+                switch(args[0]) {
+                    case 'a': fo.setLayoutAlign(args[1],false); break;
+                    case 'c': fo.setLayoutColumn(args[1],false); break;
+                    case 't': fo.setLayoutType(args[1],false); break;
+                }
+            },
+            hover : function(data) {
+                var item = data.element;
+                if(item.parent().is('.noneToolBar')) return;
+
+                var args = data.arg.split(',');
+                var pos_item = item.offset();
+                var pos_preview = fo.preview.show().css({left:0,top:0}).offset();
+                var type, col, align;
+                type  = 'demo'+capitalize(args[0]=='t'?args[1]:fo.getLayoutType());
+                col   = 'demo'+(args[0]=='c'?args[1]:fo.getLayoutColumn()).toUpperCase();
+                align = 'demo'+capitalize(args[0]=='a'?args[1]:fo.getLayoutAlign());
+
+                fo.preview.dequeue().stop().css({
+                    width: '60px',
+                    left : pos_item.left - pos_preview.left + item.parent().width() + 2,
+                    top  : pos_item.top - pos_preview.top
+                }).attr('class', 'layoutDemo demoBox '+type+' '+align);
+
+                $('#demoContainer').attr('class','').addClass(col);
+
+                (function(){
+                    if (!fo.preview.is(':visible')) return;
+
+                    fo.preview.animate({width:'150'}, 1000).animate({width:'120'}, 1000, 'linear', arguments.callee);
+                })();
+            },
+            hide : function(menu) {
+                fo.preview.dequeue().stop().hide();
+            }
+        });
+
+        if(typeof(faceOffStyle)!='undefined') {
+            for(var i in faceOffStyle) {
+                if(i=="body") {
+                    $("html>body").attr("style",faceOffStyle[i]);
+                } else {
+                    try {
+                        $(i).attr("style",faceOffStyle[i]);
+                    } catch(e) {
+                    }
+                }
+            }
+        }
+
+        $('#xe , #body, #header, #footer, #neck, #knee, div.e1, div.e2, div.neck, div.knee').each( function(i) { $(this).find('a').css('color',$(this).css('color')).css('font-family',$(this).css('font-family')); } );
+
+        if($('#header').css('display')!='none') $('#useHeader').attr('checked',true);
+        else $('#useHeader').attr('checked',false);
+        if($('#footer').css('display')!='none') $('#useFooter').attr('checked',true);
+        else $('#useFooter').attr('checked',false);
+
+        $('#useHeader').click(function(event) {
+            if($('#useHeader').attr('checked')) {
+                $('#header').css('display','block');
+                $('#useHeader').attr('checked', true);
+            } else {
+                $('#header').css('display','none');
+                $('#useHeader').attr('checked', false);
+            }
+        });
+
+        $('#useFooter').click(function(event) {
+            if($('#useFooter').attr('checked')) $('#footer').css('display','block');
+            else $('#footer').css('display','none');
+        });
+
+        // tab to select widget
+        $(document).mousedown(function(event){
+            var filter = '#xe .widgetOutput, #xe .extension, #body, #header, #footer, #toolbar, #propertyDialog, #faceoffSelector, .overlay';
+            var target = $(event.target);
+            var selection = target.parents(filter).add(target);
+            if (selection.is('#toolbar, #propertyDialog, #faceoffSelector, .overlay')) return;
+
+            if (selection.is(filter)) {
+                fo.selectElement(selection.filter(filter).eq(0));
+
+                event.stopPropagation();
+                event.preventDefault();
+            } else if(fo.curElement) {
+                fo.selectElement(null);
+            }
+        }).hotkey({
+            'TAB'   : method(this.selectByTAB, this),
+            'Shift+TAB' : method(this.selectByTAB, this),
+            'UP'    : method(this.moveWidget, this),
+            'DOWN'  : method(this.moveWidget, this),
+            'LEFT'  : method(this.moveWidget, this),
+            'RIGHT' : method(this.moveWidget, this),
+            'ESC'   : method(this.selectByESC, this),
+            'ENTER' : method(this.showPreference, this)
+        });
+
+        // select default menus
+        var type  = this.getLayoutType();
+        var col   = this.getLayoutColumn();
+        var align = this.getLayoutAlign();
+
+        $('#toolbar .buttons li.menu').each(function(){
+            var arg = $(this).attr('tb:arg');
+            if (!arg.indexOf('t,'+type) || !arg.indexOf('c,'+col) || !arg.indexOf('a,'+align)) $(this).click();
+        });
+
+        this.propDialog = PropertyDialog.init('#propertyDialog');
+    },
+    getLayoutType : function() {
+        var sel = $('#container[style],#header[style]:visible,#footer[style]:visible')
+            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
+            .add('div[id^=ex_][style]:visible, div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible');
+        //sel.css('padding','').css('margin','');
+        return findEnum($('#xe').attr('class'), FACEOFF_TYPE);
+    },
+    // LaytoutType : 'fixed','liquid','hybrid' 을 set
+    // fixed : Use fixed width for all column
+    // liquid : Use flexible width for all column
+    // hybrid : Use flexible width for all column but content column
+    setLayoutType : function(type) {
+        $('#xe').removeClass(FACEOFF_TYPE.join(' ')).addClass(_enum(type, FACEOFF_TYPE));
+    },
+    getLayoutColumn : function() {
+        return findEnum($('#container').attr('class'), FACEOFF_COLUMN);
+    },
+    //'ece','c','ec','ce','cee','eec' 컬럼타입을 set 한다 크기와 관련된 스타일은 초기화 한다
+    setLayoutColumn : function(type,init){
+        $('#container').removeClass(FACEOFF_COLUMN.join(' ')).addClass(_enum(type, FACEOFF_COLUMN));
+        var sel = $('#container[style],#header[style]:visible,#footer[style]:visible')
+            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
+            .add('div[id^=ex_][style]:visible, div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible');
+
+        if(init) sel.css('padding','').css('margin','');
+
+        // 칼럼의 변경으로, 현재 선택된 위젯이 보이지 않게 된다면, 위젯 선택을 해제한다.
+        if (this.curElement && !this.curElement.parents('#xe .extension:visible').length) {
+            this.selectElement(null);
+        }
+    },
+    getLayoutAlign  : function() {
+        return findEnum($('#xe').attr('class'), FACEOFF_ALIGN);
+    },
+    setLayoutAlign : function(type) {
+        $('#xe').removeClass(FACEOFF_ALIGN.join(' ')).addClass(_enum(type, FACEOFF_ALIGN));
+    },
+    saveLayoutConfig : function(saveTemp) {
+        $.exec_json('layout.procLayoutAdminUserValueInsert', {
+            'saveTemp':saveTemp || '',
+            mid  : current_mid,
+            type : this.getLayoutType(),
+            column : this.getLayoutColumn(),
+            align  : this.getLayoutAlign(),
+            neck : this.getWidgetContent($('#body .neck:visible')),
+            knee : this.getWidgetContent($('#body .knee:visible')),
+            e1   : this.getWidgetContent($('#body .e1:visible')),
+            e2   : this.getWidgetContent($('#body .e2:visible')),
+            neck : this.getWidgetContent($('#neck:visible')),
+            knee : this.getWidgetContent($('#knee:visible')),
+            css  : this.getFaceoffStyle()
+        },function(data){
+            if(data.saveTemp=='Y'){
+                document.location.href = request_uri.setQuery('mid',current_mid).setQuery('act','dispLayoutAdminLayoutModify');
+            }else{
+                document.location.href = request_uri.setQuery('mid',current_mid);
+            }
+        });
+    },
+    getWidgetContent : function(el) {
+        if (!el.length) return '';
+
+        var text = [];
+
+        el.find('div[widget]').each(function(){
+            var type = $(this).attr('widget');
+
+            switch(type) {
+                case 'widgetContent':
+                    var div  = $('<div>');
+                    var attr = [];
+
+                    $(this.attributes).each(function(){
+                        if (!this.nodeName || !this.nodeValue) return;
+
+                        var name = this.nodeName.toLowerCase(), val = this.nodeValue;
+                        if ('.contenteditable.src.widget.class.widget_width.widget_width_type.xdpx.xdpy.height.'.indexOf('.'+name+'.') > -1) return;
+
+                        div.text(val);
+                        attr.push(name+'="'+div.html()+'"');
+                    });
+
+                    var content = $(this).children('div.widgetContent');
+                    if (!content.length) return;
+                    return text.push('<img src="./common/img/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" '+attr.join(' ')+' />');
+                default:
+                    var div  = $('<div>');
+                    var attr = [];
+
+                    $(this.attributes).each(function(){
+                        if (!this.nodeName || !this.nodeValue) return;
+
+                        var name = this.nodeName.toLowerCase(), val = this.nodeValue;
+                        if ('.style.contenteditable.src.widget.body.class.widget_width.widget_width_type.xdpx.xdpy.height.'.indexOf('.'+name+'.') > -1) return;
+
+                        div.text(val);
+                        attr.push(name+'="'+div.html()+'"');
+                    });
+                    attr.push('style="'+$(this).attr('style')+'"');
+
+//                    return text.push('<img class="zbxe_widget_output" widget="'+type+'" addclass="section" '+attr.join(' ')+' />');
+                    return text.push('<img class="zbxe_widget_output" widget="'+type+'" '+attr.join(' ')+' />');
+            }
+        });
+
+        return text.join('');
+    },
+    getFaceoffStyle : function() {
+        var sty = [];
+        var sel = $('html>body,#container[style],#header[style],#footer[style]')
+            .add('#neck[style]:visible, #knee[style]:visible, #body[style], #content[style] ')
+            .add('div.neck[style]:visible, div.knee[style]:visible, div.e1[style]:visible, div.e2[style]:visible'); //div[id^=ex_][style]:visible,
+
+        sel.each(function(){
+            var bgImage = $(this).css("backgroundImage");
+            if(bgImage && bgImage!='none') {
+                bgImage = bgImage.replace(/(.+)images\/([a-z0-9]+)\.(jpg|jpeg|gif|png|swf|flv)\)/i,'url(./images/$2.$3)');
+                $(this).css("background-image",bgImage);
+            }
+            var style = $(this).attr('style');
+            if($(this).is('.neck, .knee, .e1, .e2')) {
+                if (!style) return;
+                if($(this).is('.e1')) sty.push( 'div.e1 { ' + style + ' } ');
+                else if($(this).is('.e2')) sty.push( 'div.e2 { ' + style + ' } ');
+                else if($(this).is('.neck')) sty.push( 'div.neck { ' + style + ' } ');
+                else if($(this).is('.knee')) sty.push( 'div.knee { ' + style + ' } ');
+            }else if($(this).is('html>body')) {
+                style = 'background-color:' + $(this).css('backgroundColor')
+                + ';background-image:' + $(this).css('backgroundImage')
+                + ';background-repeat:' + $(this).css('backgroundRepeat');
+                + ';font-family:'+ $(this).css('fontFamily');
+                + ';color:'+ $(this).css('color');
+                sty.push('body' + ' { ' + style +' }');
+                if($(this).css('fontFamily')) sty.push('body a { font-family:'+$(this).css('fontFamily')+'; }');
+                if($(this).css('color')) sty.push('body a { color:'+$(this).css('color')+'; }');
+            } else {
+                if (!style) return;
+                sty.push('#' + this.id + ' { ' + style +' }');
+                if($(this).css('fontFamily')) sty.push('#'+this.id+' a { font-family:'+$(this).css('fontFamily')+'; }');
+                if($(this).css('color')) sty.push('#'+this.id+' a { color:'+$(this).css('color')+'; }');
+            }
+        });
+
+        return sty.join('\n');
+    },
+    doAddWidgetCode : function(widget_code) {
+
+        var par = this._widgetParent;
+        var obj = $(widget_code);
+        var uniqueId = '', style = '';
+
+        if (!par) return;
+
+
+        if (par.is('.widgetOutput')) {
+            uniqueId = par.attr('id');
+            obj.attr('id', uniqueId).addClass('section');
+            par.replaceWith(obj).attr('style', par.attr('style'));
+            if(!obj.css("float")) obj.css("clear","both");
+            else(obj.css("clear",""));
+        } else {
+            uniqueId = 'ex_'+(new Date()).getTime();
+            obj.attr('id', uniqueId).addClass('section');
+            obj.appendTo(this._widgetParent).attr('style','');
+            obj.css("clear","both");
+        }
+
+        this.selectElement(this._widgetParent);
+        this._widgetParent = null;
+
+        this.saveLayoutConfig('Y');
+    },
+    selectByTAB : function(event, key) {
+        var els   = null;
+        var cur   = this.curElement;
+        var shift = event.shiftKey, els, len, idx;
+
+        if (!cur || cur.hasClass('widgetOutput')) els = $('#xe .extension:visible > .widgetOutput');
+        else if (cur.is('#body, #header, #footer')) els = $('#body, #header, #footer');
+        else if (cur.is('.extension')) els = $('#xe .extension:visible');
+
+        if (!els.length) els = $('#xe .extension:visible');
+
+        if (!(len = els.length)) return;
+        if (cur && (idx = els.index(cur)) < 0) {
+            this.selectElement(null);
+            return this.selectByTAB(event, key);
+        }
+
+        if (cur) {
+            if (shift) this.selectElement( els.eq( idx?idx-1:len-1 ) );
+            else this.selectElement( els.eq( idx==len-1?0:idx+1 ) );
+        } else {
+            this.selectElement( els.eq( shift ? len-1 : 0 ) );
+        }
+    },
+    selectByESC : function(event, key) {
+        var cur = this.curElement, par;
+
+        if (!cur) return this.selectByTAB(event, key);
+
+        if (cur.is('#body, #header, #footer')) {
+            this.selectElement(null);
+        } else if (cur.hasClass('extension')) {
+            par = cur.parent('#body, #header, #footer').add(cur.prev('#header')).add(cur.next('#footer'));
+            par.length?this.selectElement(par.eq(0)):this.selectElement(null);
+        } else if (cur.hasClass('widgetOutput')) {
+            this.selectElement( cur.parent('.extension').eq(0) );
+        }
+    },
+    moveWidget : function(event, key) {
+        var vert = 0, horz = 0;
+        var cur = this.curElement;
+        var selection;
+
+        if (!cur || !cur.hasClass('widgetOutput')) return;
+
+        switch(key) {
+            case 'UP': vert = -1; break;
+            case 'DOWN' : vert = 1; break;
+            case 'LEFT' : horz = -1; break;
+            case 'RIGHT' : horz = 1; break;
+        }
+
+        if (horz && cur.parents('#body').length && this.getLayoutColumn().length > 2) {
+            if (horz > 0 && cur.parents('.e1').length && $('#body > .e2:visible').length) {
+                $('#body > .e2').append(cur);
+            } else if (horz < 0 && cur.parents('.e2').length && $('#body > .e1:visible').length) {
+                $('#body > .e1').append(cur);
+            }
+        } else if (vert < 0) { // up
+            if ((selection = cur.prev('.widgetOutput')).length) {
+                selection.before(cur);
+            } else if (cur.parents('.e1, .e2').length) {
+                $('#neck > .extension').append(cur);
+            } else if (cur.parents('#knee:visible').length) {
+                $('#body > .extension:visible:last').append(cur);
+            }
+        } else if (vert > 0) { // down
+            if ((selection = cur.next('.widgetOutput')).length) {
+                selection.after(cur);
+            } else if (cur.parents('.e1, .e2').length) {
+                $('#knee > .extension').prepend(cur);
+            } else if (cur.parents('#neck:visible').length) {
+                $('#body > .extension:visible:first').prepend(cur);
+            }
+        }
+
+        this.selectElement(cur);
+    },
+    deleteWidget : function(){
+        var cur = this.curElement;
+
+        if (!cur.is('.widgetOutput')) return;
+        cur.remove();
+
+        this.saveLayoutConfig('Y');
+    },
+    popupAddWidgetStyle : function(){
+        var cur = this.curElement;
+        this._widgetParent = this.curElement;
+
+        if (!cur.is('.widgetOutput')) return;
+
+        selectedWidget = cur.get(0);
+        popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+cur.attr('widget')+"&widgetstyle="+cur.attr('widgetstyle'),'GenerateCodeInPage');
+    },
+
+    popupAddWidget : function() {
+        var cur = this.curElement;
+        var url = request_uri.replace(/\?.+$/, '')+'?module=widget&type=faceoff';
+        var win = 'GenerateWidgetCode';
+
+        if (!cur.is('.widgetOutput, .extension')) return;
+
+        this._widgetParent = this.curElement;
+
+        if (cur.is('.widgetOutput')) {
+            selectedWidget = cur.get(0);
+            // modify widget
+            if (cur.attr('widget') == 'widgetContent') {
+                // content widget
+                url += '&act=dispWidgetAdminAddContent&module_srl='+$('#layout_srl').val()+'&document_srl='+cur.attr('document_srl');
+                popopen(url, 'addContent');
+            } else {
+                // widget
+                url += '&act=dispWidgetGenerateCodeInPage&selected_widget='+cur.attr('widget');
+                popopen(url, 'GenerateCodeInPage');
+            }
+        } else {
+            // add new widget
+            url += '&act=dispWidgetGenerateCodeInPage';
+            popopen(url, 'GenerateCodeInPage');
+        }
+    },
+    popupAddContent : function() {
+        var url = request_uri.replace(/\?.+$/,'')+'?module=widget&act=dispWidgetAdminAddContent&type=faceoff&mid=current_mid&module_srl='+$('#layout_srl').val();
+
+        this._widgetParent = this.curElement;
+
+        popopen(url, "addContent");
+    },
+    selectElement  : function(element) {
+        var selector = $('#faceoffSelector'), cur, pos_cur, pos_sel;
+        var cur = this.curElement = element || null;
+
+        if (!selector.length) selector = $('<div id="faceoffSelector">');
+
+        // hide selector
+        selector.hide();
+        var sel = $('#neck[style]:visible .extension, #knee[style]:visible .extension,div.e1[style]:visible, div.e2[style]:visible').height('');
+
+        // 위젯을 할당한다. 선택된 위젯이 jQuery 객체가 아니거나 혹은 해당하는 DOM이 없다면 현재 선택된 위젯은 없다.
+        if (cur && ( !cur.jquery || !cur.length )) cur = this.curElement = null;
+
+        $('#smartmenu>li').hide();
+        // effect on select
+        if (cur) {
+            $(cur.get(0).offsetParent).append(selector);
+
+            pos_cur = cur.offset();
+            pos_sel = selector.css({position:'absolute',left:0,top:0}).show().offset();
+
+            if(cur.height() == 0) cur.height(20);
+
+            selector.css({
+                left : pos_cur.left - pos_sel.left,
+                top  : pos_cur.top  - pos_sel.top
+            })
+            .width(cur.outerWidth())
+            .height(cur.outerHeight());
+
+            if (cur.is('#body, #header, #footer')) {
+                $('#for-block').show();
+                $('>dl>dt:visible','#for-block').html(cur.attr('id')+' &gt; ');
+            } else if (cur.is('.extension')) {
+
+                var selected = 'Extension';
+                if(cur.parent().is('#neck')){
+                    selected = 'Neck';
+                }else if(cur.parent().is('#knee')){
+                    selected = 'Knee';
+                }else if(cur.is('.neck')){
+                    selected = 'Extension Neck';
+                }else if(cur.is('.knee')){
+                    selected = 'Extension Knee';
+                }else if(cur.is('.e1')){
+                    selected = 'Extension 1';
+                }else if(cur.is('.e2')){
+                    selected = 'Extension 2';
+                }
+                $('>dl>dt','#for-extension').html(selected+' &gt; ');
+
+                $('#for-extension').show();
+            } else if (cur.is('.widgetOutput')) {
+                $('#for-widget').show();
+
+            }
+        } else {
+            $('#for-all').show();
+        }
+    },
+    showPreference : function(event,target) {
+        if(target && target=='html>body' || target=='#container'){
+            this.propDialog.open($(target));
+        }else{
+            var cur = this.curElement;
+
+            if (!cur || !cur.length) return this.closePreference();
+
+            this.propDialog.open(this.curElement);
+        }
+    },
+    paint : function() {
+        if (!this.curElement) return;
+
+        // repaint selection size
+
+        if (this.propDialog.visible())
+
+        this.propDialog.paint();
+    }
+};
+
+var PropertyDialog = {
+    element : null,
+    overlay : null,
+    target  : null,
+
+    init : function(element) {
+        this.element = $(element).draggable();
+
+        if (!this.overlay) this.overlay = Overlay.create();
+
+        // more link
+        this.element.find('button.morelink').click( method(this.more, this) );
+
+        // form
+        this.element.find('form')
+            .bind('submit', method(this.save, this))
+            .bind('reset', method(this.cancel, this));
+
+        return this;
+    },
+    open : function(selectedElement) {
+        var sel = selectedElement;
+        var dlg = $('#propertyDialog');
+        var vals = [], i = 0, j = 0;
+        var type = ['margin', 'padding'];
+        var dirs = ['top','right','bottom','left'];
+        var reSame = /^([0-9a-z%\-]+) \1 \1 \1$/;
+        var isWidget = false;
+        var isBody = false;
+        var isLayout = false;
+        dlg.css( { position : 'absolute' } );
+
+        function same_all(arr) {
+            return (arr[0] == arr[1] && arr[1] == arr[2] && arr[2] == arr[3]);
+        }
+
+        // target element
+        this.target = sel;
+
+        // is the target a widget?
+        isWidget = sel.is('.widgetOutput');
+        isBody  = sel.is('html>body');
+        isContainer  = sel.is('#container');
+        isHeader = sel.is('#header');
+
+
+        $('fieldset',dlg).show();
+
+        if(!isWidget){
+            $('fieldset[name=float],fieldset[name=width],fieldset[name=height],fieldset[name=margin],fieldset[name=padding]',dlg).hide();
+        }
+
+        if(isBody){
+            $('fieldset[name!=background]',dlg).hide();
+            $('fieldset[name=font]',dlg).show();
+        }
+
+        if(isHeader){
+            $('fieldset[name=margin]',dlg).show();
+            $('fieldset[name=padding]',dlg).show();
+        }
+
+        // remove visible more
+        this.element.find('.visible-more').removeClass('visible-more');
+
+        // get preferences
+        if($('fieldset[name=float]:visible',dlg).size() > 0){
+            //float
+            $('#float').val(sel.css('float'));
+            $('#width').val(sel.css('width'));
+            //$('#height').val(sel.css('height'));
+        }
+
+        if($('fieldset[name=margin]:visible',dlg).size() > 0){
+            // margins and paddings
+            for(j=0; j < type.length; j++) {
+                for(i=0, vals=[]; i < dirs.length; i++) {
+                    vals[i] = (j&&sel.is('.widgetOutput')?sel.find('div.widgetBorder > div:first'):sel).css(type[j]+'-'+dirs[i]).toLowerCase();
+
+                    if ($.browser.msie && vals[i] == 'auto') vals[i] = '0px';
+                    $('#'+type[j]+'-'+dirs[i]).val(vals[i]);
+                }
+
+                $('#'+type[j]).val( reSame.test(vals.join(' '))?vals[0]:vals.join(' ') );
+            }
+        }
+
+
+        if($('fieldset[name=border]:visible',dlg).size() > 0){
+            // border
+            var style = [], width = [], color = [];
+            for(i=0; i < dirs.length; i++) {
+                style[i] = sel.css('border-'+dirs[i]+'-style').toLowerCase();
+                width[i] = sel.css('border-'+dirs[i]+'-width').toLowerCase();
+                color[i] = this._formatColor(sel.css('border-'+dirs[i]+'-color'));
+            }
+            if ( same_all(style) && same_all(width) && same_all(color) ) {
+                $('#border-style').val(style[0]);
+                $('#border-width').val(width[0]);
+                $('#border-color').val(color[0]);
+            } else {
+                dlg.find('fieldset[name=border]').addClass('visible-more');
+
+                for(i=0; i < dirs.length; i++) {
+                    $('#border-'+dirs[i]+'-style').val( style[i] );
+                    $('#border-'+dirs[i]+'-width').val( width[i] );
+                    $('#border-'+dirs[i]+'-color').val( color[i] );
+                }
+            }
+        }
+
+        if($('fieldset[name=font]:visible',dlg).size() > 0){
+            //font
+            $('#font-family').val(sel.css('font-family'));
+            $('#color').val(sel.css('color'));
+        }
+
+        if($('fieldset[name!=background]',dlg).size() > 0){
+            // background
+
+            dlg.find('fieldset[name=background]').addClass('visible-more');
+            $('#background-color').val(this._formatColor(sel.css('background-color')));
+            if(sel.css('background-image')) $('#background-image').val(sel.css('background-image').replace(/url\(([^\)]*)\)/i,'$1'));
+            $('#background-repeat').val(sel.css('background-repeat'));
+        }
+
+        this.element.show();
+        this.overlay.show(selectedElement);
+
+        // disable hotkey
+        $(document).hotkey('disable');
+
+        // add esc key event
+        $(window).keyup( function(e) { if(e.keyCode == 27) window.FaceOff.propDialog.close(); } );
+    },
+    save : function(event) {
+        var val;
+
+        if (!this.target) return false;
+
+        var dlg = $('#propertyDialog');
+
+        if($('fieldset[name=margin]:visible',dlg).size() > 0){
+            // margins
+            if ($('#margin').is(':visible')) {
+                val = $('#margin').val();
+            } else {
+                val = this._compactValues(
+                    $('#margin-top').val(),
+                    $('#margin-right').val(),
+                    $('#margin-bottom').val(),
+                    $('#margin-left').val()
+                );
+            }
+
+            if (this.target.is('.widgetOutput')) {
+                this.target.css('margin', val);
+
+                val = this._expandValues( $.trim(val).split(' ') );
+                this.target
+                    .attr('widget_margin_top', val[0])
+                    .attr('widget_margin_right', val[1])
+                    .attr('widget_margin_bottom', val[2])
+                    .attr('widget_margin_left', val[3]);
+            } else {
+                this.target.css('margin', val);
+            }
+        }
+
+
+        if($('fieldset[name=padding]:visible',dlg).size() > 0){
+            // paddings
+            if ($('#padding').is(':visible')) {
+                val = $('#padding').val();
+            } else {
+                val = this._compactValues(
+                    $('#padding-top').val(),
+                    $('#padding-right').val(),
+                    $('#padding-bottom').val(),
+                    $('#padding-left').val()
+                );
+            }
+
+            if (this.target.is('.widgetOutput')) {
+                this.target.find('div.widgetBorder > div:first').attr('style','').css('padding', val);
+
+                val = this._expandValues( $.trim(val).split(' ') );
+                this.target
+                    .attr('widget_padding_top', val[0])
+                    .attr('widget_padding_right', val[1])
+                    .attr('widget_padding_bottom', val[2])
+                    .attr('widget_padding_left', val[3]);
+            } else {
+                this.target.css('padding', val);
+            }
+        }
+
+
+        if($('fieldset[name=border]:visible',dlg).size() > 0){
+            // border
+            if (this.element.find('fieldset[name=border] .inputall').is(':visible')) {
+                this.target.css( 'border', $('#border-width').val()+' '+$('#border-style').val()+' '+$('#border-color').val() );
+            } else {
+
+                this.target.css( 'border-top', $('#border-top-width').val()+' '+$('#border-top-style').val()+' '+$('#border-top-color').val() );
+                this.target.css( 'border-right', $('#border-right-width').val()+' '+$('#border-right-style').val()+' '+$('#border-right-color').val() );
+                this.target.css( 'border-bottom', $('#border-bottom-width').val()+' '+$('#border-bottom-style').val()+' '+$('#border-bottom-color').val() );
+                this.target.css( 'border-left', $('#border-left-width').val()+' '+$('#border-left-style').val()+' '+$('#border-left-color').val() );
+            }
+        }
+
+        // background
+        val = $('#background-image').val().trim();
+        if (val == 'none' || val == '') val = '';
+        if (val) val = 'url("'+val+'")';
+
+        this.target.css({
+            'background-color' : $('#background-color').val(),
+            'background-image' : val,
+            'background-repeat' : $('#background-repeat').val()
+        });
+
+
+        // font
+        this.target.css({
+            'font-family' : $('#font-family').val(),
+            'color' : $('#color').val()
+        });
+
+        this.target.find('a').css({
+            'font-family' : $('#font-family').val(),
+            'color' : $('#color').val()
+        });
+
+
+        if($('fieldset[name=float]:visible',dlg).size() > 0){
+            if(this.target.is('.widgetOutput')){
+                this.target.css({
+                    'float' : $('#float').val(),
+                    'width' : $('#width').val(),
+                    'clear' : ''
+                    //'height' : $('#height').val()
+                });
+            }
+        }
+
+
+        // close this dialog
+        this.close();
+
+        return false;
+    },
+    cancel : function() {
+        // close this dialog
+        this.close();
+
+        return false;
+    },
+    close : function() {
+        this.target = null;
+
+        this.element.hide();
+        this.overlay.hide();
+
+        // enable hotkey
+        $(document).hotkey('enable');
+    },
+    more : function(event) {
+        var block  = $(event.target).parent();
+        var name   = '';
+        var val    = '';
+        var items = ['top', 'right', 'bottom', 'left'];
+        var reUnit = /^(\-?[0-9]+(?:%|px|em|pt)|auto)$/;
+        var i;
+
+        name = block.toggleClass('visible-more').attr('name');
+
+        if (block.is('.visible-more')) {
+            switch(name) {
+                case 'margin':
+                case 'padding':
+                    val = $('#'+name).val();
+                    val = $.trim(val).replace('\s{2,}', ' ').split(' ');
+                    val = this._expandValues(val);
+
+                    for(i=0; i < val.length; i++) {
+                        if (!val[i] || !reUnit.test(val[i])) val[i] = '0px';
+                        $('#'+name+'-'+items[i]).val(val[i]);
+                    }
+
+                    $('#'+name+'-top').focus();
+                    break;
+                case 'border':
+                    val = $('#border-width').val();
+                    if (!val || !reUnit.test(val)) val = '0px';
+
+                    for(i=0; i < items.length; i++) {
+                        $('#border-'+items[i]+'-style').val( $('#border-style').val() );
+                        $('#border-'+items[i]+'-width').val( val );
+                        $('#border-'+items[i]+'-color').val( this._formatColor($('#border-color').val()) );
+                    }
+                    break;
+            }
+        } else {
+            switch(name) {
+                case 'margin':
+                case 'padding':
+                    for(i=0; i < val.length; i++) {
+                        if (!val[i] || !reUnit.test(val[i])) val[i] = '0px';
+                        $('#'+name+'-'+items[i]).val(val[i]);
+                    }
+
+                    val = this._compactValues(
+                        $('#'+name+'-top').val(),
+                        $('#'+name+'-right').val(),
+                        $('#'+name+'-bottom').val(),
+                        $('#'+name+'-left').val()
+                    );
+
+                    $('#'+name).val(val).focus();
+                    break;
+                case 'border':
+                    $('#border-style').val( $('#border-top-style').val() );
+                    $('#border-width').val( $('#border-top-width').val() );
+                    $('#border-color').val( this._formatColor($('#border-top-color').val()) );
+                    break;
+            }
+        }
+    },
+    visible : function() {
+        return this.element.is(':visible');
+    },
+    paint : function(selectedElement) {
+        this.overlay.paint(selectedElement);
+    },
+    _compactValues : function(top,right,bottom,left) {
+        if (top == right && right == left && left == bottom) {
+            return top;
+        } else if (top == bottom && right == left) {
+            return top+' '+left;
+        } else {
+            return top+' '+right+' '+bottom+' '+left;
+        }
+    },
+    _expandValues : function(values) {
+        var v = values;
+
+        if (v.length == 1) return [ v[0], v[0], v[0], v[0] ];
+        if (v.length == 2) return [ v[0], v[1], v[0], v[1] ];
+        if (v.length == 3) v.push(v[1]);
+
+        return v;
+    },
+    _formatColor : function(color) {
+        function hex(s) {
+            s = parseInt(s,10).toString(16);
+            return s.length<2?'0'+s:s;
+        }
+
+        if (/rgb\(([0-9, ]+)\)/i.test(color)) {
+            var rgb = RegExp.$1.replace(/\s+/g, '').split(',');
+
+            return '#'+hex(rgb[0])+hex(rgb[1])+hex(rgb[2]);
+        }
+
+        return color;
+    }
+};
+
+var Overlay = {
+    element : null,
+
+    create : function() {
+        // create overlay
+        this.element = $('<div /><div /><div /><div />').appendTo(document.body).attr('class', 'overlay').css('opacity', 0.75);
+
+        return this;
+    },
+    toggle : function(selectedElement) {
+        if (this.element.is(':visible')) {
+            this.show(selecetedElement);
+        } else {
+            this.hide();
+        }
+    },
+    show : function(selectedElement) {
+        this.paint(selectedElement);
+        this.element.show();
+    },
+    hide : function() {
+        this.element.hide();
+    },
+    paint : function(selectedElement) {
+        var sel = selectedElement;
+        var doc = $(document);
+        var pos = sel.offset();
+        var ovr = this.element;
+
+        // top
+        ovr.eq(0).css({
+            left : 0,
+            top  : 0,
+            width  : '100%',
+            height : pos.top+'px'
+        });
+
+        // left
+        ovr.eq(1).css({
+            left : 0,
+            top  : pos.top+'px',
+            width  : pos.left+'px',
+            height : sel.get(0).offsetHeight+'px'
+        });
+
+        // right
+        ovr.eq(2).css({
+            right : 0,
+            top   : pos.top+'px',
+            width  : doc.width()-pos.left-sel.get(0).offsetWidth+'px',
+            height : sel.get(0).offsetHeight+'px'
+        });
+
+        // bottom
+        ovr.eq(3).css({
+            left   : 0,
+            bottom : 0,
+            width  : '100%',
+            height : doc.height()-pos.top-sel.get(0).offsetHeight+'px'
+        });
+    }
+}
+
+// bind a function as a method
+function method(func, thisObj) {
+    return function() {
+        return func.apply(thisObj,arguments);
+    }
+}
+
+//  특정한 값이 주어진 타입에 해당하는지 확인하고 그렇지 않다면 기본값으로 대체한다.
+function _enum(value, enums, defaultIndex) {
+    if (!$.isArray(enums) || enums.length < 1) return value;
+    if (typeof defaultIndex == "undefined") defaultIndex = 0;
+
+    return $.inArray(value, enums)?value:enums[defaultIndex];
+}
+
+// 클래스 문자열에서 주어진 타입에 해당하는 클래스를 추출
+function findEnum(strClass, enums) {
+    var regex = new RegExp(' (' + enums.join('|') + ') ');
+
+    return regex.test(' ' + strClass + ' ')?RegExp.$1:'';
+}
+
+function capitalize(str) {
+    return str.charAt(0).toUpperCase() + str.substr(1);
+}
+
+// register objects as global
+window.FaceOff = FaceOff;
+window.doAddWidgetCode = function(widget_code){ FaceOff.doAddWidgetCode(widget_code) };
+FaceOff.init();
+
+});
+
+// overriding displayMultiMedia()
+window.displayMultimedia = function(src, width, height, options) {
+    var html = _displayMultimedia(src, width, height, options);
+
+    if (jQuery.isReady) {
+
+    } else {
+        document.write(html);
+    }
+}
+
+var selectedWidget =null;
diff --git a/modules/layout/tpl/js/layout_image_list.js b/modules/layout/tpl/js/layout_image_list.js
index 52054a414..7391633af 100644
--- a/modules/layout/tpl/js/layout_image_list.js
+++ b/modules/layout/tpl/js/layout_image_list.js
@@ -1,13 +1,13 @@
-var input_image = null;
-
-function popupLayoutImageList(layout_srl){
-    input_image = jQuery('#background-image');
-    if(!layout_srl) return;
-    var url = request_uri.setQuery('module','layout').setQuery('act','dispLayoutAdminLayoutImageList').setQuery('layout_srl',layout_srl);
-    popopen(url, "LayoutImageList");
-}
-
-function selectLayoutImage(url){
-    opener.input_image.val(url);
-    window.close();
-}
+var input_image = null;
+
+function popupLayoutImageList(layout_srl){
+    input_image = jQuery('#background-image');
+    if(!layout_srl) return;
+    var url = request_uri.setQuery('module','layout').setQuery('act','dispLayoutAdminLayoutImageList').setQuery('layout_srl',layout_srl);
+    popopen(url, "LayoutImageList");
+}
+
+function selectLayoutImage(url){
+    opener.input_image.val(url);
+    window.close();
+}
diff --git a/modules/layout/tpl/js/ui.toolbar.js b/modules/layout/tpl/js/ui.toolbar.js
index 10989ffc6..871503387 100644
--- a/modules/layout/tpl/js/ui.toolbar.js
+++ b/modules/layout/tpl/js/ui.toolbar.js
@@ -1,138 +1,116 @@
-/*
- * jQuery Toolbar Plug-in
- * @author NHN (developer@xpressengine.com)
- */
-
-(function($){
-
-$.fn.toolbar = function(settings) {	
-	settings = $.extend({
-		items : '.buttons button',
-		fade  : false,
-		click   : function(){},
-		hover   : function(){},
-		show    : function(){},
-		hide    : function(){}
-	}, settings);
-	
-	// get elements
-	var items = this.find(settings.items);
-	var menus = items.find('+ ul');
-	var menuitems = menus.find('> li');
-	
-	// hover action - submenu
-	menus.mouseout(
-		function(event) {
-			var el = $(event.relatedTarget).parents().add(event.relatedTarget);
-
-			if ( el.index(this) < 0 && el.index($(this).prev()) < 0 ) hideMenu($(this), settings);
-		}
-	).click(
-		function(event) {
-			var item = $(event.target).parent();
-
-			var data = createData(item);
-			
-			if ( !item.is('li') ) return;
-			
-			// radio button
-			selectItem(data);
-			
-			// callback
-			settings.click(data);
-		}
-	);
-	
-	menuitems.mouseover(
-		function(event){
-			var item = $(this);
-			
-			item.parent().find('> li').removeClass('tb-menu-item-hover');
-			item.addClass('tb-menu-item-hover');
-			
-			// callback
-			settings.hover(createData(item));
-		}
-	);
-	
-	// hover action - button
-	items.hover(
-		function(event) {
-			showMenu($(this).find('+ ul'), settings);
-		},
-		function(event) {
-			var menu = $(this).find('+ ul');
-			var el   = $(event.relatedTarget).parents().add(event.relatedTarget);
-			
-			// hide menu
-			if ( el.index(menu) < 0 && el.index(this) < 0 ) hideMenu(menu, settings);
-		}
-	);
-	
-	return this;
-}
-
-function hideMenu(menu, settings) {
-	menu[settings.fade?'fadeOut':'hide'](settings.fade)
-		.removeClass('tb-menu-active')
-		.find('> li').removeClass('tb-menu-item-hover');
-	
-	menu.prev().removeClass('tb-btn-active');
-	
-	// hidemenu event
-	settings.hide(menu);
-}
-
-function showMenu(menu, settings) {	
-	menu[settings.fade?'fadeIn':'show'](settings.fade)
-		.addClass('tb-menu-active')
-		.css({position:'absolute',left:0,top:0});
-	
-	menu.prev().addClass('tb-btn-active');
-
-	// positioning
-	var btn = menu.prev();
-	var btn_pos = btn.offset();
-	var mnu_pos = menu.offset();
-	
-	menu.css({
-		left : btn_pos.left - mnu_pos.left,
-		top  : btn_pos.top  - mnu_pos.top + btn.height()
-	})
-	
-	// showmenu event
-	settings.show(menu);
-}
-
-function selectItem(data) {
-	var item = data.element;
-	
-	switch(data.type){
-		case 'radio':
-			item.parent().find('> li').removeClass('tb-menu-item-selected');
-			item.addClass('tb-menu-item-selected')
-			data.checked = true;
-			break;
-		case 'checkbox':
-			data.checked = !data.checked;
-			if (data.checked) {
-				item.addClass('tb-menu-item-selected');
-			} else {
-				item.removeClass('tb-menu-item-selected');
-			}
-			break;
-		default:
-			break;
-	};
-}
-
-function createData(item) {
-	return {
-		element : item,
-		type    : item.attr('tb:type'),
-		arg     : item.attr('tb:arg'),
-		checked : item.hasClass('tb-menu-item-selected')
-	};
-}
-
-})(jQuery);
\ No newline at end of file
+/*
+ * jQuery Toolbar Plug-in
+ * @author NHN (developer@xpressengine.com)
+ */
+
+(function($){
+
+$.fn.toolbar = function(settings) {	
+	settings = $.extend({
+		items : '.buttons button',
+		fade  : false,
+		click   : function(){},
+		hover   : function(){},
+		show    : function(){},
+		hide    : function(){}
+	}, settings);
+	
+	this.find(settings.items)
+		.mouseover(function(){
+			var $ul = $(this).next('ul');
+			if($ul.length) showMenu($ul, settings);
+		})
+		.find('+ul>li')
+			.mouseover(function(){
+				var clss = 'tb-menu-item-hover';
+				$(this).siblings('li').removeClass(clss).end().addClass(clss);
+
+				// callback
+				settings.hover(createData(this));
+			})
+			.find('>button')
+				.click(function(){
+					var data = createData(this.parentNode);
+
+					// radio button
+					selectItem(data);
+					
+					// callback
+					settings.click(data);
+				})
+			.end()
+		.end()
+		.parent()
+			.mouseleave(function(){
+				var $ul = $(this).find('>ul:visible');
+				if($ul.length) hideMenu($ul,settings);
+			});
+	
+	return this;
+}
+
+function hideMenu(menu, settings) {
+	menu[settings.fade?'fadeOut':'hide'](settings.fade)
+		.removeClass('tb-menu-active')
+		.find('> li').removeClass('tb-menu-item-hover');
+	
+	menu.prev().removeClass('tb-btn-active');
+	
+	// hidemenu event
+	settings.hide(menu);
+}
+
+function showMenu(menu, settings) {	
+	menu[settings.fade?'fadeIn':'show'](settings.fade)
+		.addClass('tb-menu-active')
+		.css({position:'absolute',left:0,top:0});
+	
+	menu.prev().addClass('tb-btn-active');
+
+	// positioning
+	var btn = menu.prev();
+	var btn_pos = btn.offset();
+	var mnu_pos = menu.offset();
+	
+	menu.css({
+		left : btn_pos.left - mnu_pos.left,
+		top  : btn_pos.top  - mnu_pos.top + btn.height()
+	})
+	
+	// showmenu event
+	settings.show(menu);
+}
+
+function selectItem(data) {
+	var item = data.element;
+	
+	switch(data.type){
+		case 'radio':
+			item.parent().find('> li').removeClass('tb-menu-item-selected');
+			item.addClass('tb-menu-item-selected')
+			data.checked = true;
+			break;
+		case 'checkbox':
+			data.checked = !data.checked;
+			if (data.checked) {
+				item.addClass('tb-menu-item-selected');
+			} else {
+				item.removeClass('tb-menu-item-selected');
+			}
+			break;
+		default:
+			break;
+	};
+}
+
+function createData(item) {
+	var $item = $(item);
+	return {
+		element : $item,
+		type    : $item.attr('tb:type'),
+		arg     : $item.attr('tb:arg'),
+		checked : $item.hasClass('tb-menu-item-selected')
+	};
+}
+
+})(jQuery);
diff --git a/modules/layout/tpl/layout_detail_info.html b/modules/layout/tpl/layout_detail_info.html
index b2b8964fb..0eca4c26d 100644
--- a/modules/layout/tpl/layout_detail_info.html
+++ b/modules/layout/tpl/layout_detail_info.html
@@ -1,10 +1,8 @@
-<div id="popHeader">
-    <h3 class="xeAdmin">{$lang->layout_maker}</h3>
-</div>
+<h1 class="h1">{$lang->layout_maker}</h1>
 
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
+    <tr>
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$layout_info->title} ver {$layout_info->version}</td>
     </tr>
@@ -17,7 +15,7 @@
         </td>
     </tr>
 <!--@if($layout_info->homepage)-->
-    <tr class="row2">
+    <tr>
         <th scope="row"><div>{$lang->homepage}</div></th>
         <td><a href="{$layout_info->author->homepage}" onclick="window.open(this.href);return false;">{$layout_info->homepage}</a></td>
     </tr><!--@end-->
@@ -26,7 +24,7 @@
         <td>{zdate($layout_info->date, 'Y-m-d')}</td>
     </tr>
 <!--@if($layout_info->license || $layout_info->license_link)-->
-    <tr class="row2">
+    <tr>
         <th scope="row"><div>{$lang->layout_license}</div></th>
         <td>
             {nl2br(trim($layout_info->license))}
@@ -45,12 +43,10 @@
 </div>
 
 <!--@if($layout_info->history)-->
-<div id="popHistoryHeadder">
-    <h3 class="xeAdmin">{$lang->layout_history}</h3>
-</div>
+<h1 class="h1">{$lang->layout_history}</h1>
 
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <!--@foreach($layout_info->history as $history)-->
     <tr class="row{$cycle_idx}">
         <th scope="row"><div>
diff --git a/modules/layout/tpl/layout_edit.html b/modules/layout/tpl/layout_edit.html
index 536c92968..a0a743a59 100644
--- a/modules/layout/tpl/layout_edit.html
+++ b/modules/layout/tpl/layout_edit.html
@@ -1,121 +1,89 @@
-<!--%import("filter/update_layout_code.xml")-->
-<!--%import("filter/reset_layout_code.xml")-->
+<include target="header.html" />
+<load target="css/adminEdit.css" usecdn="true" />
+<load target="js/adminEdit.js" usecdn="true" />
 
-<!--#include("header.html")-->
-<h3 class="xeAdmin">{$selected_layout->layout_title}</h3>
+<h2 class="h2">{$selected_layout->layout_title}</h2>
 
-<div class="header4">
-    <ul class="localNavigation">
-        <li><a href="{getUrl('act','dispLayoutAdminModify')}">{$lang->cmd_layout_management}</a></li>
-        <li class="on"><a href="#" onclick="return false;">{$lang->cmd_layout_edit}</a></li>
-    </ul>
-</div>
+<h3 class="h3">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</h3>
+<p>{nl2br($lang->about_layout_code)}</p>
 
-<h4 class="xeAdmin">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</h4>
-<p class="summary">{nl2br($lang->about_layout_code)}</p>
+<h3 class="h3">{$lang->layout_image_repository}</h3>
+<p>{nl2br($lang->about_layout_image_repository)}</p>
 
-<h4 class="xeAdmin">{$lang->layout_image_repository}</h4>
-<p class="summary">{nl2br($lang->about_layout_image_repository)}</p>
-<form action="{Context::getRequestUri()}" target="hidden_iframe" method="post" onsubmit="return checkFile(this)" enctype="multipart/form-data">
-    <input type="hidden" name="module" value="layout" />
-    <input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
-    <input type="hidden" name="layout_srl" value="{$layout_srl}" />
+<fieldset class="section">
+	<ul class="uploaded_image_list">
+		<li loop="$layout_image_list => $no, $file">
+			{@$ext=substr(strrchr($file,'.'),1)}
+			<div class="a uploaded_image">
+				<script cond="$ext == 'swf' || $ext == 'flv'" type="text/javascript">
+					//<![CDATA[
+					displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100px', '100px');
+					//]]>
+				</script>
+				<img cond="$ext != 'swf' && $ext != 'flv'" src="{getUrl('')}{$layout_image_path}{$file}" />
+			</div>
+			<div class="uploaded_image_path">{$layout_image_path}{$file}</div>
+			<form action="./" method="post">
+			<input type="hidden" name="module" value="layout" />
+			<input type="hidden" name="act" value="procLayoutAdminUserImageDelete" />
+			<input type="hidden" name="layout_srl" value="{$layout_srl}" />
+			<input type="hidden" name="filename" value="{$file}" />
 
-    <table cellspacing="0" class="crossTable">
-    <tbody>
-        <tr>
-            <td>
-                <!--@foreach($layout_image_list as $no => $file)-->
-                {@$ext=substr(strrchr($file,'.'),1)}
-                <div class="preview_image" style="width:100px;height:100px;float:left; position:relative;margin-right:10px; ">
-                    <!--@if($ext=='swf'||$ext=='flv')-->
-                    <script type="text/javascript">//<![CDATA[
-                    displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100%', '100%');
-                    //]]></script>
-                    <!--@elseif(in_array($ext,array('gif','png','jpg','jpeg')))-->
-                        <img src="{getUrl('')}{$layout_image_path}{$file}" width="100%" height="100%" />
-                    <!--@end-->
-                    <a href="#" onclick="deleteFile({$layout_srl},'{$file}');return false" onmouseover="jQuery('div.imagePath').html('{$layout_image_path}{$file}')" style="position:absolute; left:3px; top:3px;" class="small button red"><span>{$lang->cmd_delete}</span></a>
-                </div>
-                <!--@end-->
-                &nbsp;
-            </td>
-        </tr>
-    </tbody>
-    <tfoot>
-        <tr>
-            <td>
-                <div class="imagePath"></div>
-                <input name="user_layout_image" type="file" />
-                <span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
-                {$lang->msg_layout_image_target}
-            </td>
-        </tr>
-    </tfoot>
-    </table>
-</form>
+				<input class="text" type="submit" value="{$lang->cmd_delete}" />
+			</form>
+		</li>
+	</ul>
+	<form class="form" ruleset="imageUpload" action="./" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="layout" />
+	<input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
+	<input type="hidden" name="layout_srl" value="{$layout_srl}" />
+		<ul>
+			<li>
+				<p class="a"><input type="file" name="user_layout_image" value="" /> <span class="desc">{$lang->msg_layout_image_target}</span></p>
+			</li>
+		</ul>
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</form>
+</fieldset>
 
+<block cond="$selected_layout->type == 'faceoff'">
+	<fieldset class="section">
+		<h3 class="h3">{$lang->faceoff_export}</h3>
+		<p>{nl2br($lang->about_faceoff_export)}</p>
+			<ul class="form">
+				<li>
+					<p class="q">{$lang->layout_export}</p>
+					<p class="a"><span class="btn small"><a href="{getUrl('', 'act', 'procLayoutAdminUserLayoutExport', 'layout_srl', $layout_srl)}">{$lang->layout_btn_export}</a></span></p>
+					<p class="desc">{$lang->about_layout_export}</p>
+				</li>
+			</ul>
+	</fieldset>
+</block>
 
-<!--@if($selected_layout->type=='faceoff')-->
-<h4 class="xeAdmin">{$lang->layout_migration}</h4>
-<p class="summary">{nl2br($lang->about_layout_migration)}</p>
-<table cellspacing="0" class="rowTable">
-<tr>
-    <th scope="row"><div>{$lang->layout_export}</div></th>
-    <td>
-        <a href="{getUrl('','act','procLayoutAdminUserLayoutExport','layout_srl',$layout_srl)}" class="button black strong"><span>{$lang->layout_btn_export}</span></a>
-        <p>{$lang->about_layout_export}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->layout_import}</div></th>
-    <td>
-        <form action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-            <input type="hidden" name="module" value="layout" />
-            <input type="hidden" name="act" value="procLayoutAdminUserLayoutImport" />
-            <input type="hidden" name="layout_srl" value="{$layout_srl}" />
-            <input type="file" name="file" />
-            <span class="button black strong"><button type="submit">{$lang->cmd_submit}</button></span>
-        </form>
-        <p>{$lang->about_layout_import}</p>
-    </td>
-</tr>
-</table>
-<!--@end-->
+<fieldset class="section">
+	<form id="fo_layout" class="form" ruleset="codeUpdate" action="./" method="post">
+	<input type="hidden" name="module" value="layout" />
+	<input type="hidden" name="layout_srl" value="{$layout_srl}" />
+	<input type="hidden" name="act" value="procLayoutAdminCodeUpdate" />
 
+		<h3 class="h3">HTML</h3>
+		<div>
+			<textarea name="code" style="width:100%;height:300px;font-size:11px;">{$layout_code}</textarea>
+			<span loop="$widget_list => $widget" class="btn"><a href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a></span>
+		</div>
 
-<form id="fo_layout" action="{getUrl('','module','admin')}" method="post">
-<input type="hidden" name="layout_srl" value="{$layout_srl}" />
-<input type="hidden" name="act" value="procLayoutAdminCodeUpdate" />
-<input type="hidden" name="_filter" value="update_layout_code" />
-<input type="hidden" name="_return_url" value="{htmlspecialchars($current_url)}" />
-
-<table cellspacing="0" class="rowTable">
-<tbody>
-    <tr><th class="title">HTML</th></tr>
-    <tr>
-        <td>
-            <textarea name="code" style="width:100%;height:300px;font-size:11px;">{htmlspecialchars($layout_code)}</textarea>
-            <!--@foreach($widget_list as $widget)-->
-            <a href="{getUrl('','module','widget','act','dispWidgetGenerateCode','selected_widget',$widget->widget,'module_srl',$module_srl)}" onclick="popopen(this.href,'GenerateCodeInPage');return false;" class="button"><span>{$widget->title}</span></a>
-            <!--@end-->
-        </td>
-    </tr>
-    <tr><th class="title">CSS</th></tr>
-    <tr>
-        <td>
-            <textarea name="code_css" style="width:100%;height:300px;font-size:11px;">{htmlspecialchars($layout_code_css)}</textarea>
-        </td>
-    </tr>
-    <tr>
-        <th class="button">
-			<span class="button black strong"><button type="submit" onclick="this.form.act.value='procLayoutAdminCodeUpdate'">{$lang->cmd_save}</button></span>
-			<span class="button"><button type="button" onclick="doPreviewLayoutCode();">{$lang->cmd_preview}</button></span>
-			<span class="button red"><button type="reset" onclick="doResetLayoutCode('{$layout_srl}')">{$lang->cmd_reset}</button></span>
-        </th>
-    </tr>
-</tbody>
-</table>
-</form>
-
-<iframe name="hidden_iframe" style="width:0;height:0;border:0" ></iframe>
+		<h3 class="h3">CSS</h3>
+		<div>
+			<textarea name="code_css" style="width:100%;height:300px;font-size:11px;">{$layout_code_css}</textarea>
+		</div>
+		<div class="btnArea" style="float: left" >
+			<span class="btn medium"><button type="submit" name="mode" value="reset">{$lang->cmd_reset}</button></span>
+		</div>
+		<div class="btnArea">
+			<span class="btn medium"><button type="button" onclick="doPreviewLayoutCode();">{$lang->cmd_preview}</button></span>
+			<span class="btn medium"><button type="submit" name="mode" value="save">{$lang->cmd_save}</button></span>
+		</div>
+	</form>
+</fieldset>
diff --git a/modules/layout/tpl/layout_image_list.html b/modules/layout/tpl/layout_image_list.html
index 1286d6e74..f8b470bbf 100644
--- a/modules/layout/tpl/layout_image_list.html
+++ b/modules/layout/tpl/layout_image_list.html
@@ -1,34 +1,26 @@
-<!--%import("js/layout_image_list.js")-->
-<!--%import("js/layout_admin.js")-->
-<!--%import("../../admin/tpl/css/admin.css")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">레이아웃 이미지 목록</h3>
-</div>
-
-<div id="popBody">
-    <!--@foreach($layout_image_list as $no => $file)-->
-        {@$ext=substr(strrchr($file,'.'),1)}
-        <div class="filebox_preview_{$val->module_filebox_srl}" style="width:100px;height:100px;float:left; position:relative;margin-right:10px; ">
-            <!--@if($ext=='swf'||$ext=='flv')-->
-            <script type="text/javascript">//<![CDATA[
-            displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100%', '100%');
-            //]]></script>
-            <!--@elseif(in_array($ext,array('gif','png','jpg','jpeg')))-->
-                <img src="{getUrl('')}{$layout_image_path}{$file}" width="100%" height="100%" />
-            <!--@end-->
-            <span class="small button" style="position:absolute;left:3px; top:3px;"><button type="button" onclick="selectLayoutImage(request_uri+'{$layout_image_path}{$file}');">{$lang->cmd_select}</button></span>
-        </div>
-    <!--@end-->
-
-</div>
-<div id="popFooter">
-    <form action="{Context::getRequestUri()}" target="hidden_iframe" method="post" onsubmit="return checkFile(this)" enctype="multipart/form-data">
-    <input type="hidden" name="module" value="layout" />
-    <input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
-    <input type="hidden" name="layout_srl" value="{$layout_srl}" />
-        <input name="user_layout_image" type="file" />
-        <span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
-    </form>
-</div>
-<iframe name="hidden_iframe" style="width:0;height:0;border:0"></iframe>
+<!--%import("js/layout_image_list.js")-->
+<!--%import("js/layout_admin.js")-->
+<!--%import("../../admin/tpl/css/admin.css")-->
+
+<h1 class="h1">레이아웃 이미지 목록</h1>
+<!--@foreach($layout_image_list as $no => $file)-->
+	{@$ext=substr(strrchr($file,'.'),1)}
+	<div class="filebox_preview_{$val->module_filebox_srl}" style="width:100px;height:100px;float:left; position:relative;margin-right:10px; ">
+		<!--@if($ext=='swf'||$ext=='flv')-->
+		<script type="text/javascript">//<![CDATA[
+		displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100%', '100%');
+		//]]></script>
+		<!--@elseif(in_array($ext,array('gif','png','jpg','jpeg')))-->
+			<img src="{getUrl('')}{$layout_image_path}{$file}" width="100%" height="100%" />
+		<!--@end-->
+		<span class="btn"><button type="button" onclick="selectLayoutImage(request_uri+'{$layout_image_path}{$file}');">{$lang->cmd_select}</button></span>
+	</div>
+<!--@end-->
+<form action="{Context::getRequestUri()}" target="hidden_iframe" method="post" onsubmit="return checkFile(this)" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="layout" />
+	<input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
+	<input type="hidden" name="layout_srl" value="{$layout_srl}" />
+	<input name="user_layout_image" type="file" />
+	<span class="button black strong"><button type="submit">{$lang->cmd_save}</button></span>
+</form>
+<iframe name="hidden_iframe" style="width:0;height:0;border:0"></iframe>
diff --git a/modules/layout/tpl/layout_instance_list.html b/modules/layout/tpl/layout_instance_list.html
new file mode 100644
index 000000000..5b49f6911
--- /dev/null
+++ b/modules/layout/tpl/layout_instance_list.html
@@ -0,0 +1,43 @@
+<include target="header.html" />
+<load target="js/adminList.js" usecdn="true" />
+
+<script type="text/javascript">
+	xe.lang.confirm_delete = '{$lang->confirm_delete}';
+</script>
+
+<h2 class="h2">{$layout_info->title} ver {$layout_info->version} ({$layout_info->layout})</h2>
+<div class="table even easyList">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col" class="title">{$lang->title}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col">{$lang->cmd_layout_management}</th>
+				<th scope="col">{$lang->cmd_layout_edit}</th>
+				<th scope="col">{$lang->cmd_delete}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr loop="$layout_list => $no, $layout">
+				<td>{$no+1}</td>
+				<td class="title">{$layout->title}</td>
+				<td>{zdate($layout->regdate, "Y-m-d")}</td>
+				<td><a href="{getUrl('act', 'dispLayoutAdminModify', 'layout_srl', $layout->layout_srl)}">{$lang->cmd_layout_management}</a></td>
+				<td><a href="{getUrl('act', 'dispLayoutAdminEdit', 'layout_srl', $layout->layout_srl)}">{$lang->cmd_layout_edit}</a></td>
+				<td>
+					<form class="layout_delete_form" ruleset="deleteLayout" action="./" method="post">
+						<input type="hidden" name="module" value="layout" />
+						<input type="hidden" name="act" value="procLayoutAdminDelete" />
+						<input type="hidden" name="layout_srl" value="{$layout->layout_srl}" />
+
+						<input class="text" type="submit" value="{$lang->cmd_delete}" />
+					</form>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<div cond="$layout_info->layout != 'faceoff'" class="btnArea">
+	<span class="btn"><a href="{getUrl('act', 'dispLayoutAdminInsert', 'layout', $layout_info->layout)}">{$lang->cmd_insert}</a></span>
+</div>
diff --git a/modules/layout/tpl/layout_modify.html b/modules/layout/tpl/layout_modify.html
index 90f9e0370..5523b2c30 100644
--- a/modules/layout/tpl/layout_modify.html
+++ b/modules/layout/tpl/layout_modify.html
@@ -1,180 +1,157 @@
-<!--%import("filter/update_layout_info.xml")-->
+<include target="header.html" />
 
-<!--#include("header.html")-->
+<h2 cond="$act == 'dispLayoutAdminModify'" class="h2">{$selected_layout->layout_title}</h2>
+<h2 cond="$act == 'dispLayoutAdminInsert'" class="h2">{$selected_layout->title}</h2>
 
-<h3 class="xeAdmin">{$selected_layout->layout_title}</h3>
-<div class="header4">
-    <ul class="localNavigation">
-        <li class="on"><a href="#" onclick="return false;">{$lang->cmd_layout_management}</a></li>
-        <li><a href="{getUrl('act','dispLayoutAdminEdit')}">{$lang->cmd_layout_edit}</a></li>
-    </ul>
-</div>
-
-<form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
+<form ruleset="updateLayout"|cond="$act == 'dispLayoutAdminModify'" ruleset="insertLayout"|cond="$act == 'dispLayoutAdminInsert'" action="./" class="form" enctype="multipart/form-data" method="post">
 <input type="hidden" name="module" value="layout" />
-<input type="hidden" name="act" value="procLayoutAdminUpdate" />
+<input type="hidden" name="act" value="procLayoutAdminUpdate"|cond="$act == 'dispLayoutAdminModify'" value="procLayoutAdminInsert"|cond="$act == 'dispLayoutAdminInsert'" />
 <input type="hidden" name="layout_srl" value="{$layout_srl}" />
 <input type="hidden" name="layout" value="{$selected_layout->layout}" />
+<input type="hidden" name="_layout_type" value="{$selected_layout->layout_type}" />
+<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispLayoutAdminInstanceList')}" />
+
+	<ul>
+		<li>
+			<p class="q">{$lang->layout}</p>
+			<p class="a">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</p>
+		</li>
+		<li cond="$selected_layout->path">
+			<p class="q">{$lang->path}</p>
+			<p class="a">{$selected_layout->path}</p>
+		</li>
+		<li cond="$selected_layout->description">
+			<p class="q">{$lang->description}</p>
+			<p class="a">{$selected_layout->description}</p>
+		</li>
+		<li cond="$selected_layout->author->homepage">
+			<p class="q">{$lang->author}</p>
+			<p class="a"><a href="{$selected_layout->author->homepage}" target="_blank">{$selected_layout->author->name}</a></p>
+		</li>
+		<li>
+			<p class="q">{$lang->title} <em>*</em></p>
+			<p class="a">
+				<input type="text" name="title" value="{$selected_layout->layout_title}" />
+			</p>
+			<p class="desc">{$lang->about_title}</p>
+		</li>
+		<li>
+			<p class="q">{$lang->header_script}</p>
+			<p class="a">
+				<textarea name="header_script" cols="42" rows="5">{$selected_layout->header_script}</textarea>
+			</p>
+			<p class="desc">{$lang->about_header_script}</p>
+		</li>
+	</ul>
+
+	<block loop="$selected_layout->extra_var => $name, $var">
+		<block cond="!$not_first && !$var->group"><ul></block>
+		<block cond="$group != $var->group">
+			<block cond="$not_first"></ul></block>
+			<h3 class="h3">{$var->group}</h3>
+			<ul>
+			{@$group = $var->group}
+		</block>
+		{@$not_first = true}
+		<li>
+			<p class="q">{$var->title}</p>
+			<div class="a">
+				<div cond="$var->type == 'text'" class="multiLangEdit">
+					{@$use_multilang = true}
+					<input type="hidden" name="{$name}" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end-->" class="vLang" />
+					<input type="text" id="{$name}" value="{$var->value}" class="vLang" />
+					<span class="desc"><a href="#langEdit" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+				</div>
+
+				<div cond="$var->type == 'textarea'" class="multiLangEdit">
+					{@$use_multilang_textarea = true}
+					<input type="hidden" name="{$name}" value="<!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end-->" class="vLang" />
+					<textarea id="{$name}" cols="42" rows="5" class="vLang">{$var->value}</textarea>
+					<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+				</div>
+
+				<block cond="$var->type == 'image'">
+					<block cond="$var->value">
+						<p><img src="../../../{$var->value}" alt="" /> <input type="checkbox" name="del_{$name}" value="Y" id="del_{$name}" /><label for="del_{$name}">{$lang->cmd_delete}</label></p>
+					</block>
+					<p><input type="file" name="{$name}" value="" /></p>
+				</block>
+
+				<select cond="$var->type == 'select'" name="{$name}">
+					<option loop="$var->options => $key, $val" value="{$key}" selected="selected"|cond="$key == $var->value">{$val->val}</option>
+				</select>
+
+				<block cond="$var->type == 'radio'">
+					<block loop="$var->options => $key, $val">
+						<block cond="$val->thumbnail">
+							{@
+								$_img_info = getImageSize($val->thumbnail);
+								$_height = $_img_info[1] + 40;
+								$_width = $img_info[0] + 20;
+								$_talign = 'center';
+							}
+						</block>
+						<block cond="!$val->thumbnail">
+							{@
+								$_width = 200;
+								$_height = 20;
+								$_talign = 'left';
+							}
+						</block>
+
+						<block cond="$var->thumbnail_exist">
+							<div cond= style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
+						</block>
+						<label>
+							<input type="radio" name="{$name}" value="{$key}" />{$val->val}
+							<block cond="$val->thumbnail">
+								<br />
+								<img src="../../../{$val->thumbnail}" alt="{$val->val}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
+							</block>
+						</label>
+						<block cond="$var->thumbnail_exist">
+							</div>
+						</block>
+					</block>
+				</block>
+			</div>
+			<p class="desc">{$var->description}</p>
+		</li>
+	</block>
+	</ul>
 
 
-<table cellspacing="0" class="rowTable">
-<col width="200" />
-<col width="*" />
-<tr>
-    <th scope="row"><div>{$lang->layout}</div></th>
-    <td class="wide">{$selected_layout->title} ver {$selected_layout->version} ({$selected_layout->layout})</td>
-</tr>
+	<h3 class="h3" cond="$selected_layout->menu">{$lang->menu}</h3>
+	<ul cond="$selected_layout->menu">
+		<li loop="$selected_layout->menu => $menu_name, $menu_info">
+			<p class="q">{$menu_info->title}({$menu_name})</p>
+			<p class="a">
+				<select name="{$menu_name}">
+					<option value="0">{$lang->cmd_select}</option>
+					<option loop="$menu_list => $key, $val" value="{$val->menu_srl}" selected="selected"|cond="$val->menu_srl == $menu_info->menu_srl">{$val->title}</option>
+				</select>
+				<a href="{getUrl('module','admin','act','dispMenuAdminSiteMap')}">{$lang->cmd_management}</a>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->not_apply_menu}</p>
+			<p class="a">
+				<input type="checkbox" name="apply_layout" id="apply_layout" value="Y" /> <label for="apply_layout">{$lang->about_not_apply_menu}</label>
+			</p>
+		</li>
+		<li cond="$selected_layout->layout_type == 'M'">
+			<p class="q">{$lang->apply_mobile_view}</p>
+			<p class="a">
+				<input type="checkbox" name="apply_mobile_view" id="apply_mobile_layout" value="Y" /> <label for="apply_mobile_layout">{$lang->about_apply_mobile_view}</label>
+			</p>
+		</li>
+	</ul>
 
-<!--@if($selected_layout->path)-->
-<tr class="row2">
-    <th scope="row"><div>{$lang->path}</div></th>
-    <td>{$selected_layout->path}</td>
-</tr>
-<!--@end-->
-
-<!--@if($selected_layout->description)-->
-<tr class="row2">
-    <th scope="row"><div>{$lang->description}</div></th>
-    <td>{nl2br(trim($selected_layout->description))}</td>
-</tr>
-<!--@end-->
-
-<!--@if($selected_layout->author->homepage)-->
-<tr>
-    <th scope="row"><div>{$lang->author}</div></th>
-    <td><a href="{$selected_layout->author->homepage}" onclick="window.open(this.href);return false;" class="blue">{$selected_layout->author->name}</a></td>
-</tr>
-<!--@end-->
-
-<tr>
-    <th scope="row"><div>{$lang->header_script}</div></th>
-    <td>
-        <textarea name="header_script" class="inputTypeTextArea w400">{$selected_layout->header_script}</textarea>
-        <p>{$lang->about_header_script}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->title}</div></th>
-    <td>
-        <input type="text" name="title" value="{$selected_layout->layout_title}" class="inputTypeText w400" />
-        <p>{$lang->about_title}</p>
-    </td>
-</tr>
-
-<!--@foreach($selected_layout->extra_var as $name => $var)-->
-
-<!--@if($var->group && ((!$group) || $group != $var->group))-->
-</table>
-
-{@$group = $var->group}
-<h4 class="xeAdmin">{$group}</h4>
-<table cellspacing="0" class="rowTable">
-<col width="200" />
-<col width="*" />
-<!--@end-->
-
-<tr>
-    <th scope="row"><div>{$var->title}</div></th>
-    <td>
-    <!--@if($var->type == "text")-->
-        <input type="text" name="{$name}" value="{htmlspecialchars($var->value)}"  class="inputTypeText w400"/>
-
-    <!--@elseif($var->type == "textarea")-->
-        <textarea name="{$name}" class="inputTypeTextArea w400">{htmlspecialchars($var->value)}</textarea>
-
-    <!--@elseif($var->type=="image")-->
-
-      <!--@if($var->value)-->
-      <div>
-          <img src="../../../{$var->value}" alt="image" /><br />
-          <input type="checkbox" name="del_{$name}" value="Y" id="del_{$name}" class="checkbox" />
-          <label for="del_{$name}">{$lang->cmd_delete}</label>
-      </div>
-      <!--@end-->
-
-      <input type="file" name="{$name}" value="" />
-
-    <!--@elseif($var->type == "select")-->
-        <select name="{$name}">
-            <!--@foreach($var->options as $key => $val)-->
-            <option value="{$key}" <!--@if($key==$var->value)-->selected="selected"<!--@end-->>{$val->val}</option>
-            <!--@end-->
-        </select>
-
-    <!--@elseif($var->type == "radio")-->
-        <!--@foreach($var->options as $key => $val)-->
-            <!--@if($val->thumbnail)-->
-            {@ $_img_info = getImageSize($val->thumbnail); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-            <!--@else-->
-            {@ $_width = 200; $_height = 20; $_talign = "left"; }
-            <!--@end-->
-
-            <!--@if($var->thumbnail_exist)-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-            <!--@endif-->
-
-            <label>
-            <input type="radio" name="colorset" value="{$key}" /> {$val->val}
-            <!--@if($val->thumbnail)-->
-                <br />
-                <img src="../../../{$val->thumbnail}" alt="{$val->val}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-            <!--@endif-->
-            </label>
-
-            <!--@if($var->thumbnail_exist)-->
-            </div>
-            <!--@endif-->
-        <!--@endforeach-->
-    <!--@endif-->
-        <p style="clear:both;">{$var->description}</p>
-    </td>
-</tr>
-<!--@end-->
-</table>
-
-<h4 class="xeAdmin">{$lang->menu}</h4>
-<table cellspacing="0" class="rowTable">
-<col width="200" />
-<col width="*" />
-<!--@foreach($selected_layout->menu as $menu_name => $menu_info)-->
-<tr class="row{$cycle_idx}">
-    <th scope="row"><div>{$menu_info->title}<br />({$menu_name})</div></th>
-    <td class="left tahoma">
-        <select name="{$menu_name}">
-            <option value="0">------------------------</option>
-            <!--@foreach($menu_list as $key => $val)-->
-            <option value="{$val->menu_srl}" <!--@if($val->menu_srl == $menu_info->menu_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-        </select>
-        <a href="#" onclick="doMenuManagement('{$menu_name}');return false;" class="button"><span>{$lang->cmd_management}</span></a>
-    </td>
-</tr>
-<!--@end-->
-<tr>
-    <th scope="row"><div>{$lang->not_apply_menu}</div></th>
-    <td>
-        <input type="checkbox" name="apply_layout" value="Y" />
-        {$lang->about_not_apply_menu}
-    </td>
-</tr>
-<!--@if($selected_layout->layout_type == "M")-->
-<tr>
-	<th scope="row"><div>{$lang->apply_mobile_view}</div></th>
-	<td>
-        <input type="checkbox" name="apply_mobile_view" value="Y" />
-        {$lang->about_apply_mobile_view}
-    </td>
-</tr>
-<!--@end-->
-</table>
-
-<div class="buttonArea">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-    <!--@if($module=="admin")-->
-    <a href="{getUrl('act','dispLayoutAdminContent')}" class="button"><span>{$lang->cmd_list}</span></a>
-    <!--@else-->
-    <a href="{getUrl('act','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    <!--@end-->
-</div>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+	<div class="btnArea">
+		<span class="btn medium">
+			<input type="submit" value="{$lang->cmd_insert}"|cond="$act == 'dispLayoutAdminInsert'" value="{$lang->cmd_save}"|cond="$act == 'dispLayoutAdminModify'" />
+		</span>
+	</div>
+	<include target="include.multilang.html" />
+	<include target="include.multilang.textarea.html" />
+</form>
diff --git a/modules/layout/tpl/mindex.html b/modules/layout/tpl/mindex.html
index 71adb11a0..fc7319d3b 100644
--- a/modules/layout/tpl/mindex.html
+++ b/modules/layout/tpl/mindex.html
@@ -8,43 +8,43 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="crossTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div>{$lang->layout}</div></th>
-        <th scope="col"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="3"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($layout_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="number center">{$no+1}</td>
-        <td>
-            {$val->layout}
-            <!--@if($val->module_srl)-->
-            (module) 
-            <!--@end-->
-        </td>
-        <td class="wide">{$val->title}</td>
-        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td>
-            <!--@if(!$val->module_srl)-->
-                <a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_management)}" class="buttonSet buttonSetting"><span>{$lang->cmd_layout_management}</span></a>
-            <!--@else-->
-                &nbsp;
-            <!--@end-->
-        </td>
-        <td><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_edit)}" class="buttonSet buttonLayoutEditor"><span>{$lang->cmd_layout_edit}</span></a></td>
-        <td><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <th colspan="7" class="button">
-            <a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','','layout_type','M')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col">{$lang->layout}</th>
+				<th scope="col">{$lang->title}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col" colspan="3">&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($layout_list as $no => $val)-->
+			<tr class="row{$cycle_idx}">
+				<td>{$no+1}</td>
+				<td>
+					{$val->layout}
+					<!--@if($val->module_srl)-->
+					(module) 
+					<!--@end-->
+				</td>
+				<td >{$val->title}</td>
+				<td>{zdate($val->regdate,"Y-m-d")}</td>
+				<td>
+					<!--@if(!$val->module_srl)-->
+					<a href="{getUrl('act','dispLayoutAdminModify','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_management)}" class="buttonSet buttonSetting"><span>{$lang->cmd_layout_management}</span></a>
+					<!--@else-->
+					&nbsp;
+					<!--@end-->
+				</td>
+				<td><a href="{getUrl('act','dispLayoutAdminEdit','layout_srl',$val->layout_srl)}" title="{htmlspecialchars($lang->cmd_layout_edit)}" class="buttonSet buttonLayoutEditor"><span>{$lang->cmd_layout_edit}</span></a></td>
+				<td><a href="#" onclick="doDeleteLayout('{$val->layout_srl}');return false;" title="{htmlspecialchars($lang->cmd_delete)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn"><a href="{getUrl('act','dispLayoutAdminInsert','layout_srl','','layout_type','M')}">{$lang->cmd_make}</a></span>
+</div>
diff --git a/modules/member/conf/info.xml b/modules/member/conf/info.xml
index d53217ddb..980c54fe6 100644
--- a/modules/member/conf/info.xml
+++ b/modules/member/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">회원 관리</title>
-    <title xml:lang="zh-CN">会员管理</title>
-    <title xml:lang="jp">会員 管理</title>
-    <title xml:lang="en">Member Management</title>
-    <title xml:lang="vi">Quản lý thành viên</title>
-    <title xml:lang="es">Usuario Gestión</title>
-    <title xml:lang="ru">Управление пользователями</title>
-    <title xml:lang="zh-TW">會員 管理</title>
-    <title xml:lang="tr">Üye Yönetimi</title>
-    <description xml:lang="ko">회원 관리 및 회원 관련 설정등을 하는 모듈입니다.</description>
-    <description xml:lang="zh-CN">对会员进行管理及相关设置的模块。</description>
-    <description xml:lang="jp">会員管理及び会員関連設定などを行うモジュールです。</description>
-    <description xml:lang="en">This module is for managing or configuring members.</description>
-    <description xml:lang="vi">Module này dành cho việc quản lý và tạo thành viên.</description>
-    <description xml:lang="es">Este módulo es para el manejo y la configuración de los usuarios.</description>
-    <description xml:lang="ru">Этот модуль служит для управления и конфигурирования пользователей.</description>
-    <description xml:lang="zh-TW">對會員進行管理與相關設置的模組。</description>
-    <description xml:lang="tr">Bu modül üyeleri yönetmek/yapılandırmak için kullanılır</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>member</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">회원</title>
+    <title xml:lang="zh-CN">会员</title>
+    <title xml:lang="jp">会員</title>
+    <title xml:lang="en">Member</title>
+    <title xml:lang="vi">Quản lý thành viên</title>
+    <title xml:lang="es">Usuario Gestión</title>
+    <title xml:lang="ru">Управление пользователями</title>
+    <title xml:lang="zh-TW">會員 管理</title>
+    <title xml:lang="tr">Üye Yönetimi</title>
+    <description xml:lang="ko">회원 관리 및 설정을 하는 모듈입니다.</description>
+    <description xml:lang="zh-CN">对会员进行管理及相关设置的模块。</description>
+    <description xml:lang="jp">会員管理及び会員関連設定などを行うモジュールです。</description>
+    <description xml:lang="en">This module is for managing or configuring members.</description>
+    <description xml:lang="vi">Module này dành cho việc quản lý và tạo thành viên.</description>
+    <description xml:lang="es">Este módulo es para el manejo y la configuración de los usuarios.</description>
+    <description xml:lang="ru">Этот модуль служит для управления и конфигурирования пользователей.</description>
+    <description xml:lang="zh-TW">對會員進行管理與相關設置的模組。</description>
+    <description xml:lang="tr">Bu modül üyeleri yönetmek/yapılandırmak için kullanılır</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>member</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/member/conf/module.xml b/modules/member/conf/module.xml
index bafe3eb3e..cac92b386 100644
--- a/modules/member/conf/module.xml
+++ b/modules/member/conf/module.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
-    <permissions />
+    <permissions>
+    </permissions>
     <actions>
         <action name="dispMemberInfo" type="view" standalone="true" />
         <action name="dispMemberSignUpForm" type="view" standalone="true" />
@@ -19,13 +20,13 @@
 		<action name="dispMemberResendAuthMail" type="view" standalone="true" />
         <action name="dispSavedDocumentList" type="view" standalone="true" />
 
-        <action name="dispMemberAdminList" type="view" standalone="true" index="true" admin_index="true" />
-        <action name="dispMemberAdminConfig" type="view" standalone="true" />
-        <action name="dispMemberAdminInsert" type="view" standalone="true" />
+        <action name="dispMemberAdminList" type="view" standalone="true" index="true" admin_index="true" menu_name="userList" menu_index="true"/>
+        <action name="dispMemberAdminConfig" type="view" menu_name="userSetting" menu_index="true" />
+        <action name="dispMemberAdminInsert" type="view" menu_name="userList" />
         <action name="dispMemberAdminDeleteForm" type="view" standalone="true" />
-        <action name="dispMemberAdminGroupList" type="view" standalone="true" />
+        <action name="dispMemberAdminGroupList" type="view" menu_name="userGroup" menu_index="true" />
         <action name="dispMemberAdminJoinFormList" type="view" standalone="true" />
-        <action name="dispMemberAdminInfo" type="view" standalone="true" />
+        <action name="dispMemberAdminInfo" type="view" menu_name="userList" />
         <action name="dispMemberAdminInsertJoinForm" type="view" standalone="true" />
         <action name="dispMemberAdminDeniedIDList" type="view" standalone="true" />
         <action name="dispMemberAdminManageGroup" type="view" standalone="true" />
@@ -33,28 +34,30 @@
 
         <action name="getMemberMenu" type="model" standalone="true" />
         <action name="getMemberAdminColorset" type="model" standalone="true" />
+		<action name="getMemberAdminInsertJoinForm" type="model" />
+		<action name="getMemberAdminIPCheck" type="model" standalone="true" />
 
-        <action name="procMemberLogin" type="controller" standalone="true" />
-        <action name="procMemberOpenIDLogin" type="controller" standalone="true" />
+        <action name="procMemberLogin" type="controller" standalone="true" ruleset="@login" />
+        <action name="procMemberOpenIDLogin" type="controller" standalone="true" ruleset="openidLogin" />
         <action name="procMemberOpenIDValidate" type="controller" standalone="true" />
-        <action name="procModuleSiteSignUp" type="controller" standalone="true" />
-        <action name="procModuleSiteLeave" type="controller" standalone="true" />
         <action name="procMemberAddOpenIDToMember" type="controller" standalone="true" />
         <action name="procMemberValidateAddOpenIDToMember" type="controller" standalone="true" />
         <action name="procMemberDeleteOpenIDFromMember" type="controller" standalone="true" />
         <action name="procMemberLogout" type="controller" standalone="true" />
         <action name="procMemberCheckValue" type="controller" standalone="true" />
-        <action name="procMemberInsert" type="controller" standalone="true" />
-        <action name="procMemberModifyInfo" type="controller" standalone="true" />
-        <action name="procMemberModifyPassword" type="controller" standalone="true" />
-        <action name="procMemberLeave" type="controller" standalone="true" />
+        <action name="procMemberInsert" type="controller" standalone="true" ruleset="@insertMember" />
+        <action name="procMemberModifyInfo" type="controller" standalone="true" ruleset="@insertMember" />
+        <action name="procMemberModifyPassword" type="controller" standalone="true" ruleset="modifyPassword" />
+        <action name="procMemberLeave" type="controller" standalone="true" ruleset="leaveMember" />
         <action name="procMemberOpenIDLeave" type="controller" standalone="true" />
-        <action name="procMemberInsertProfileImage" type="controller" standalone="true" />
-        <action name="procMemberInsertImageName" type="controller" standalone="true" />
-        <action name="procMemberInsertImageMark" type="controller" standalone="true" />
+        <action name="procMemberInsertProfileImage" type="controller" standalone="true" ruleset="insertProfileImage" />
+        <action name="procMemberInsertImageName" type="controller" standalone="true" ruleset="insertImageName" />
+        <action name="procMemberInsertImageMark" type="controller" standalone="true" ruleset="insertImageMark" />
         <action name="procMemberDeleteProfileImage" type="controller" standalone="true" />
         <action name="procMemberDeleteImageName" type="controller" standalone="true" />
         <action name="procMemberDeleteImageMark" type="controller" standalone="true" />
+        <action name="procMemberSiteSignUp" type="controller" standalone="true" />
+        <action name="procMemberSiteLeave" type="controller" standalone="true" />
 
         <action name="procMemberScrapDocument" type="controller" standalone="true" />
         <action name="procMemberDeleteScrap" type="controller" standalone="true" />
@@ -65,19 +68,65 @@
         <action name="procMemberFindAccountByQuestion" type="controller" standalone="true" />
         <action name="procMemberAuthAccount" type="controller" standalone="true" />
         <action name="procMemberUpdateAuthMail" type="controller" standalone="true" />
-		<action name="procMemberResendAuthMail" type="controller" standalone="true" />
+		<action name="procMemberResendAuthMail" type="controller" standalone="true" ruleset="resendAuthMail" />
 
-        <action name="procMemberAdminInsert" type="controller" standalone="true" />
+        <action name="procMemberAdminInsert" type="controller" standalone="true" ruleset="@insertAdminMember" />
         <action name="procMemberAdminDelete" type="controller" standalone="true" />
-        <action name="procMemberAdminInsertConfig" type="controller" standalone="true" />
-        <action name="procMemberAdminInsertGroup" type="controller" standalone="true" />
-        <action name="procMemberAdminUpdateGroup" type="controller" standalone="true" />
-        <action name="procMemberAdminUpdateMembersGroup" type="controller" standalone="true" />
+        <action name="procMemberAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
+        <action name="procMemberAdminInsertGroup" type="controller" standalone="true" ruleset="insertGroup" />
+        <action name="procMemberAdminUpdateGroup" type="controller" standalone="true" ruleset="updateGroup" />
+        <action name="procMemberAdminDeleteGroup" type="controller" standalone="true" ruleset="deleteGroup" />
+        <action name="procMemberAdminUpdateMembersGroup" type="controller" standalone="true" ruleset="manageMemberGroup" />
         <action name="procMemberAdminDeleteMembers" type="controller" standalone="true" />
-        <action name="procMemberAdminInsertJoinForm" type="controller" standalone="true" />
+        <action name="procMemberAdminInsertJoinForm" type="controller" standalone="true" ruleset="insertJoinForm" />
         <action name="procMemberAdminUpdateJoinForm" type="controller" standalone="true" />
-        <action name="procMemberAdminInsertDeniedID" type="controller" standalone="true" />
+        <action name="procMemberAdminDeleteJoinForm" type="controller" standalone="true" />
+        <action name="procMemberAdminInsertDeniedID" type="controller" standalone="true" ruleset="insertDeniedId" />
         <action name="procMemberAdminUpdateDeniedID" type="controller" standalone="true" />
         <action name="procMemberAdminUpdateGroupOrder" type="controller" standalone="true" />
+
+        <action name="procMemberAdminSelectedMemberManage" type="controller" ruleset="updateSeletecdMemberInfo" />
+        <action name="procMemberAdminGroupConfig" type="controller" />
     </actions>
+	<menus>
+		<menu name="userList">
+			<title xml:lang="en">Member List</title>
+			<title xml:lang="ko">회원 목록</title>
+			<title xml:lang="zh-CN">Member List</title>
+			<title xml:lang="jp">Member List</title>
+			<title xml:lang="es">Member List</title>
+			<title xml:lang="ru">Member List</title>
+			<title xml:lang="fr">Member List</title>
+			<title xml:lang="zh-TW">Member List</title>
+			<title xml:lang="vi">Member List</title>
+			<title xml:lang="mn">Member List</title>
+			<title xml:lang="tr">Member List</title>
+		</menu>
+		<menu name="userGroup">
+			<title xml:lang="en">Member Group</title>
+			<title xml:lang="ko">회원 그룹</title>
+			<title xml:lang="zh-CN">Member Group</title>
+			<title xml:lang="jp">Member Group</title>
+			<title xml:lang="es">Member Group</title>
+			<title xml:lang="ru">Member Group</title>
+			<title xml:lang="fr">Member Group</title>
+			<title xml:lang="zh-TW">Member Group</title>
+			<title xml:lang="vi">Member Group</title>
+			<title xml:lang="mn">Member Group</title>
+			<title xml:lang="tr">Member Group</title>
+		</menu>
+		<menu name="userSetting">
+			<title xml:lang="en">Member Setting</title>
+			<title xml:lang="ko">회원 설정</title>
+			<title xml:lang="zh-CN">Member Setting</title>
+			<title xml:lang="jp">Member Setting</title>
+			<title xml:lang="es">Member Setting</title>
+			<title xml:lang="ru">Member Setting</title>
+			<title xml:lang="fr">Member Setting</title>
+			<title xml:lang="zh-TW">Member Setting</title>
+			<title xml:lang="vi">Member Setting</title>
+			<title xml:lang="mn">Member Setting</title>
+			<title xml:lang="tr">Member Setting</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/member/lang/en.lang.php b/modules/member/lang/en.lang.php
deleted file mode 100644
index 7f1a9a4fc..000000000
--- a/modules/member/lang/en.lang.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only Basic Things)
-     **/
-
-    $lang->member = 'Member';
-    $lang->member_default_info = 'Basic Info';
-    $lang->member_extend_info = 'Additional Info';
-    $lang->default_group_1 = "Associate Member";
-    $lang->default_group_2 = "Regular Member";
-    $lang->admin_group = "Managing Group";
-    $lang->keep_signed = 'Keep me signed in';
-    $lang->remember_user_id = 'Remember ID';
-    $lang->already_logged = "You are already signed in";
-    $lang->denied_user_id = 'You have entered a prohibited ID.';
-    $lang->null_user_id = 'Please input ID';
-    $lang->null_password = 'Please input password';
-    $lang->invalid_authorization = 'The account is not activated.';
-    $lang->invalid_user_id= "You have entered an invalid ID";
-    $lang->invalid_password = 'You have entered an invalid password';
-    $lang->invalid_new_password = 'New password must not be the same as old one.';
-    $lang->allow_mailing = 'Join Mailing';
-    $lang->denied = 'Prohibited';
-    $lang->is_admin = 'Superadmin Permission';
-    $lang->group = 'Group';
-    $lang->group_title = 'Group Name';
-    $lang->group_srl = 'Group Number';
-    $lang->signature = 'Signature';
-    $lang->profile_image = 'Profile Image';
-    $lang->profile_image_max_width = 'Max Width';
-    $lang->profile_image_max_height = 'Max Height';
-    $lang->image_name = 'Image Name';
-    $lang->image_name_max_width = 'Max Width';
-    $lang->image_name_max_height = 'Max Height';
-    $lang->image_mark = 'Image Mark';
-    $lang->image_mark_max_width = 'Max Width';
-    $lang->image_mark_max_height = 'Max Height';
-    $lang->group_image_mark = 'Group Image Mark';
-    $lang->group_image_mark_max_width = 'Max Width';
-    $lang->group_image_mark_max_height = 'Max Height';
-    $lang->group_image_mark_order = 'Group Image Mark Order';
-    $lang->signature_max_height = 'Max Signature Height';
-    $lang->enable_openid = 'Enable OpenID';
-    $lang->enable_join = 'Accept New Members';
-    $lang->enable_confirm = 'Email Activation';
-    $lang->enable_ssl = 'Enable SSL';
-    $lang->security_sign_in = 'Sign in using enhanced security';
-    $lang->limit_day = 'Temporary Limit Date';
-    $lang->limit_date = 'Limit Date';
-    $lang->after_login_url = 'URL after Sign in';
-    $lang->after_logout_url = 'URL after Sign out';
-    $lang->redirect_url = 'URL after Sign up';
-    $lang->agreement = 'Sign up Agreement';
-    $lang->accept_agreement = 'Agree';
-    $lang->member_info = 'Member Info';
-    $lang->current_password = 'Current Password';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = 'Allow Messages';
-    $lang->allow_message_type = array(
-            'Y' => 'Allow All',
-            'F' => 'Allow for Friends',
-            'N' => 'Reject All',
-    );
-    $lang->about_allow_message = 'You may allow or reject messages.';
-    $lang->logged_users = 'Logged on Users';
-
-    $lang->webmaster_name = "Webmaster Name";
-    $lang->webmaster_email = "Webmaster Email";
-
-    $lang->about_keep_signed = 'You will be still signed in even when the browser is closed.\n\nIt is not recommended to use this if you are using a public computer for your personal information could be violated';
-    $lang->about_keep_warning = 'You will be still signed in even when the browser is closed. It is not recommended to use this if you are using a public computer for your personal information could be violated';
-    $lang->about_webmaster_name = "Please input webmaster's name which will be used for verification mails or other site administration. (default : webmaster)";
-    $lang->about_webmaster_email = "Please input webmaster's email address.";
-
-    $lang->search_target_list = array(
-        'user_id' => 'ID',
-        'user_name' => 'Name',
-        'nick_name' => 'Nickname',
-        'email_address' => 'Email Address',
-        'regdate' => 'Sign up Date',
-        'regdate_more' => 'Sign up Date (more)',
-        'regdate_less' => 'Sign up Date (less)',
-        'last_login' => 'Last Sign in Date',
-        'last_login_more' => 'Last Sign in Date (more)',
-        'last_login_less' => 'Last Sign in Date (less)',
-        'extra_vars' => 'Extra Vars',
-    );
-
-    $lang->cmd_login = 'Sign In';
-    $lang->cmd_logout = 'Sign Out';
-    $lang->cmd_signup = 'Sign Up';
-    $lang->cmd_site_signup = 'Sign Up';
-    $lang->cmd_modify_member_info = 'Modify Member Info';
-    $lang->cmd_modify_member_password = 'Modify Password';
-    $lang->cmd_view_member_info = 'Member Info';
-    $lang->cmd_leave = 'Leave';
-    $lang->cmd_find_member_account = 'Find Account Info';
-    $lang->cmd_resend_auth_mail = 'Request for Activation Mail';
-
-    $lang->cmd_member_list = 'Member List';
-    $lang->cmd_module_config = 'Default Setting';
-    $lang->cmd_member_group = 'Member Groups';
-    $lang->cmd_send_mail = 'Send Mail';
-    $lang->cmd_manage_id = 'Prohibited IDs';
-    $lang->cmd_manage_form = 'Sign up Form';
-    $lang->cmd_view_own_document = 'Written Articles';
-    $lang->cmd_manage_member_info = 'Manage Member Info';
-    $lang->cmd_trace_document = 'Trace Written Articles';
-    $lang->cmd_trace_comment = 'Trace Written Comments';
-    $lang->cmd_view_scrapped_document = 'Scraps';
-    $lang->cmd_view_saved_document = 'Saved Articles';
-    $lang->cmd_send_email = 'Send Mail';
-
-    $lang->msg_email_not_exists = "You have entered an invalid email address";
-
-    $lang->msg_alreay_scrapped = 'This article is already scrapped';
-
-    $lang->msg_cart_is_null = 'Please select the target';
-    $lang->msg_checked_file_is_deleted = '%d attached file(s) is(are) deleted';
-
-    $lang->msg_find_account_title = 'Account Info';
-    $lang->msg_find_account_info = 'This is requested account info.';
-    $lang->msg_find_account_comment = 'The password will be modified as above one as you click below link.<br />Please modify the password after login.';
-    $lang->msg_confirm_account_title = 'Zeroboard XE Account Activation';
-    $lang->msg_confirm_account_info = 'This is your account information:';
-    $lang->msg_confirm_account_comment = 'Click on the followed link to complete your account activation.';
-    $lang->msg_auth_mail_sent = 'The activation mail has been sent to %s. Please check your mail.';
-    $lang->msg_confirm_mail_sent = 'We just sent the activation email to %s. Please check your mail.';
-    $lang->msg_invalid_auth_key = 'This is an invalid request of verification.<br />Please retry finding account info or contact to administrator.';
-    $lang->msg_success_authed = 'Your account has been successfully activated and logged on.\n Please modify the password to your own one with the password in the mail.';
-    $lang->msg_success_confirmed = 'Your account has been activated successfully.';
-
-    $lang->msg_new_member = 'Add Member';
-    $lang->msg_update_member = 'Modify Member Info';
-    $lang->msg_leave_member = 'Leave';
-    $lang->msg_group_is_null = 'There is no group';
-    $lang->msg_not_delete_default = 'Default items cannot be deleted';
-    $lang->msg_not_exists_member = "Invalid member";
-    $lang->msg_cannot_delete_admin = 'Admin ID cannot be deleted. Please remove the ID from administration and try again.';
-    $lang->msg_exists_user_id = 'This ID already exists. Please try with another one.';
-    $lang->msg_exists_email_address = 'This email address already exists. Please try with another one.';
-    $lang->msg_exists_nick_name = 'This nickname already exists. Please try with another one.';
-    $lang->msg_signup_disabled = 'You are not able to sign up';
-    $lang->msg_already_logged = 'You have already signed up';
-    $lang->msg_not_logged = 'Please sign in first';
-    $lang->msg_insert_group_name = 'Please input the name of group';
-    $lang->msg_check_group = 'Please select the group';
-
-    $lang->msg_not_uploaded_profile_image = 'Profile image could not be registered';
-    $lang->msg_not_uploaded_image_name = 'Image name could not be registered';
-    $lang->msg_not_uploaded_image_mark = 'Image mark could not be registered';
-    $lang->msg_not_uploaded_group_image_mark = 'Group image mark could not be registered';
-
-    $lang->msg_accept_agreement = 'You have to agree with the agreement';
-
-    $lang->msg_user_denied = 'You have entered a prohibited ID';
-    $lang->msg_user_not_confirmed = 'Your account is not activated yet. Please check your email.';
-    $lang->msg_user_limited = 'You have entered an ID that can be used after %s';
-
-    $lang->about_user_id = 'User ID should be 3~20 letters long and consist of alphabet+number with alphabet as first letter.';
-    $lang->about_password = 'Password should be 6~20 letters long';
-    $lang->about_user_name = 'Name should be 2~20 letters long';
-    $lang->about_nick_name = 'Nickname should be 2~20 letters long';
-    $lang->about_email_address = 'Email address will be used to modify/find password after email verification';
-    $lang->about_homepage = 'Please input if you have your websites';
-    $lang->about_blog_url = 'Please input if you have your blogs';
-    $lang->about_birthday = 'Please input your birth date';
-    $lang->about_allow_mailing = "If you don't join mailing, you will not able to receive group mail";
-    $lang->about_denied = 'Check to prohibit the ID';
-    $lang->about_is_admin = 'Check to give Superadmin permission';
-    $lang->about_member_description = "Administrator's memo about members";
-    $lang->about_group = 'An ID can belong to many groups';
-
-    $lang->about_column_type = 'Please set the format of additional sign up form';
-    $lang->about_column_name = 'Please input English name that can be used in template (name as variable)';
-    $lang->about_column_title = 'This will be displayed on sign up or modifying/viewing member info form';
-    $lang->about_default_value = 'You can set default values';
-    $lang->about_active = 'You have to check on active items to show on sign up form';
-    $lang->about_form_description = 'If you input in description form, it will be displayed on join form';
-    $lang->about_required = 'If you check, it will be essential item for sign up';
-
-    $lang->about_enable_openid = 'Please check if you want to provide OpenID service';
-    $lang->about_enable_join = 'Please check if you want to allow new members to sign up your site';
-    $lang->about_enable_confirm = 'Please check if you want new members to activate their accounts via their emails.';
-    $lang->about_enable_ssl = 'Personal information from Sign up/Modify Member Info/Sign in can be sent as SSL(https) mode if server provides SSL service.';
-    $lang->about_limit_day = 'You can limit activation date after sign up';
-    $lang->about_limit_date = 'Users cannot sign in until assigned date';
-    $lang->about_after_login_url = 'You can set URL after login. Blank means current page.';
-    $lang->about_after_logout_url = 'You can set URL after logout. Blank means current page.';
-    $lang->about_redirect_url = 'Please input URL where users will go after sign up. When this is empty, it will be set as the previous page of sign up page.';
-    $lang->about_agreement = "Sign up Agreement will be displayed if it's not empty";
-
-    $lang->about_image_name = "Members will be able to use image name instead of text";
-    $lang->about_image_mark = "Members will be able to use image mark in front of their names";
-    $lang->about_group_image_mark = "You may use group marks shown before their names";
-    $lang->about_profile_image = 'Members will be able to use profile images';
-    $lang->about_accept_agreement = "I have read the agreement and agree with it";
-
-    $lang->about_member_default = 'It will be set as default group on sign up';
-
-    $lang->about_openid = 'When you join as OpenID, basic info like ID or email address will be saved on this site, process for password and verification management will be done on current OpenID offering service';
-    $lang->about_openid_leave = 'The secession of OpenID means deletion of your member info from this site.<br />If you login after secession, it will be recognized as a new member, so you will no longer have the permission for your ex-written articles.';
-
-    $lang->about_member = "Member module will help you create, modify and remove members and manage groups or sign up form.\nYou can add a custom group to manage members, and also get additional information by modifying sign up form.";
-    $lang->about_find_member_account = 'Your account info will be noticed by registered email address.<br />Please input email address which you have input on registration, and press "Find Account Info" button.<br />';
-    $lang->about_ssl_port = 'Please input if you are using non-default SSL port';
-    $lang->add_openid = 'Add OpenID';
-
-    $lang->about_resend_auth_mail = 'You can request for activation mail if you have not activated before';
-    $lang->no_article = 'There exists no article';
-
-    $lang->find_account_question = 'Question for a temporary password.';
-    $lang->find_account_answer = 'Answer for a temporary password.';
-    $lang->about_find_account_question = 'You can get a temporary password by your ID, email address, and the answer for the question you set.';
-    $lang->find_account_question_items = array(''
-                                        ,'What is your alternate email address?'
-                                        ,'What is your favorite thing?'
-                                        ,'What elementary school did you graduate?'
-                                        ,'Where is your hometown?'
-                                        ,'What is your ideal match?'
-                                        ,"What is your mother's name?"
-                                        ,"What is your father's name?"
-                                        ,'What is your favorite color?'
-                                        ,'What is your favorite food?'
-                                        );
-    $lang->temp_password = 'Temporary password';
-    $lang->cmd_get_temp_password = 'Get a temporary password';
-    $lang->about_get_temp_password = 'Change your password after you logged in.';
-    $lang->msg_question_not_exists = 'You haven`t set your question for a temporary password.';
-    $lang->msg_answer_not_matches = 'Your answer for the question is not correct.';
-
-    $lang->change_password_date = 'Password renewal cycle';
-    $lang->about_change_password_date = 'If you set a value to this, you will be notified to change your password periodically. (if set to 0, disabled)';
-?>
diff --git a/modules/member/lang/es.lang.php b/modules/member/lang/es.lang.php
deleted file mode 100644
index 81c2e7b77..000000000
--- a/modules/member/lang/es.lang.php
+++ /dev/null
@@ -1,237 +0,0 @@
-<?php
-    /**
-     * @file   es.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Spanish Language Pack (Only Basic Things)
-     **/
-
-    $lang->member = 'Usuario';
-    $lang->member_default_info = 'Información Basica';
-    $lang->member_extend_info = 'Información adicional';
-    $lang->default_group_1 = "Usuario registrado";
-    $lang->default_group_2 = "Usuario regular";
-    $lang->admin_group = "Manejo del grupo";
-    $lang->keep_signed = 'Keep me signed in';
-    $lang->remember_user_id = 'Guardar ID';
-    $lang->already_logged = "Ya está conectado";
-    $lang->denied_user_id = 'Este ID está prohibido.';
-    $lang->null_user_id = 'IngresarID';
-    $lang->null_password = 'Ingresar la contraseña';
-    $lang->invalid_authorization = 'No está certificado';
-    $lang->invalid_user_id= "Este ID no existe";
-    $lang->invalid_password = 'Contraseña incorrecta';
-    $lang->invalid_new_password = '이전 비밀번호와 같습니다.';
-    $lang->allow_mailing = 'Registro del envío de mail';
-    $lang->denied = 'Prohibido';
-    $lang->is_admin = 'Atribución del administrador superior';
-    $lang->group = 'Grupo asignado';
-    $lang->group_title = 'Nombre del grupo';
-    $lang->group_srl = 'Número del grupo';
-    $lang->signature = 'Firma';
-    $lang->profile_image = 'Perfil de Imagen';
-    $lang->profile_image_max_width = 'Max Anchura';
-    $lang->profile_image_max_height = 'Max Altura';
-    $lang->image_name = 'Nombre de la imagen';
-    $lang->image_name_max_width = 'Ancho Máximo';
-    $lang->image_name_max_height = 'Altura Máxima';
-    $lang->image_mark = 'Marca de la imagen';
-    $lang->image_mark_max_width = 'Ancho Máximo';
-    $lang->image_mark_max_height = 'Altura Máxima';
-    $lang->group_image_mark = 'Group Image Mark';
-    $lang->group_image_mark_max_width = 'Ancho Máximo';
-    $lang->group_image_mark_max_height = 'Altura Máxima';
-    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
-    $lang->enable_openid = 'Activar OpenID';
-    $lang->enable_join = 'Permitir el registro del usuario';
-    $lang->enable_confirm = '메일 인증 사용';
-    $lang->enable_ssl = 'Activar SSL';
-    $lang->security_sign_in = 'Sign in using enhanced security';
-    $lang->limit_day = 'Límite de la fecha temporal';
-    $lang->limit_date = 'Límite de fecha';
-    $lang->after_login_url = 'URL después del inicio de sesión';
-    $lang->after_logout_url = 'URL después de cerrar sesión';
-    $lang->redirect_url = 'URL luego del registro';
-    $lang->agreement = 'Acuerdo del registro del usuario';
-    $lang->accept_agreement = 'Acepto';
-    $lang->member_info = 'Información del Usuario';
-    $lang->current_password = 'Contraseña actual';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = '쪽지 허용';
-    $lang->allow_message_type = array(
-            'Y' => '모두 허용',
-            'F' => '등록된 친구들만 허용',
-            'N' => '모두 금지',
-    );
-    $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
-    $lang->logged_users = 'Logged Users';
-
-    $lang->webmaster_name = 'Nombre del Webmaster';
-    $lang->webmaster_email = 'Correo electrónico Webmaster';
-
-    $lang->about_keep_signed = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다.\n\n로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다.\n\n단, 게임방, 학교 등 공공장소에서 이용시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요';
-    $lang->about_keep_warning = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다. 로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다. 단, 게임방, 학교 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.';
-    $lang->about_webmaster_name = 'Por favor, webmaster de entrada el nombre que se utilizará para la autenticación de los correos u otros sitio de la administración. (Por defecto: webmaster)';
-    $lang->about_webmaster_email = 'Introduzca la dirección de correo electrónico webmaster.';
-
-    $lang->search_target_list = array(
-        'user_id' => 'ID',
-        'user_name' => 'Nombre',
-        'nick_name' => 'Apodo',
-        'email_address' => 'Dirección de Email',
-        'regdate' => 'Fecha del registro',
-        'regdate_more' => '가입일시(이상)',
-        'regdate_less' => '가입일시(이하)',
-        'last_login' => 'Fecha de su última conección',
-        'last_login_more' => '최근로그인일시(이상)',
-        'last_login_less' => '최근로그인일시(이하)',
-        'extra_vars' => 'Variables Extra',
-    );
-
-
-    $lang->cmd_login = 'Conectar';
-    $lang->cmd_logout = 'Desconectar';
-    $lang->cmd_signup = 'Registrar';
-    $lang->cmd_site_signup = 'Join';
-    $lang->cmd_modify_member_info = 'Modificar nombre del usuario';
-    $lang->cmd_modify_member_password = 'Cambiar la contraseña';
-    $lang->cmd_view_member_info = 'Información del usuario';
-    $lang->cmd_leave = 'Dejar de ser usuario';
-    $lang->cmd_find_member_account = 'Find Account Info';
-
-    $lang->cmd_member_list = 'Lista de los Usuarios';
-    $lang->cmd_module_config = 'Configuración predefinidos';
-    $lang->cmd_member_group = 'Manejo del grupo';
-    $lang->cmd_send_mail = 'Enviar Email';
-    $lang->cmd_manage_id = 'Manejo de ID prohibidos';
-    $lang->cmd_manage_form = 'Manejo de forma del registro';
-    $lang->cmd_view_own_document = 'Ver documentos escritos';
-    $lang->cmd_manage_member_info = 'Manage Member Info';
-    $lang->cmd_trace_document = 'Trace Written Articles';
-    $lang->cmd_trace_comment = 'Trace Written Comments';
-    $lang->cmd_view_scrapped_document = 'Ver Scraps';
-    $lang->cmd_view_saved_document = 'Ver artículos guardados';
-    $lang->cmd_send_email = 'Enviar Email';
-
-    $lang->msg_email_not_exists = "Email address doesn't exists";
-
-    $lang->msg_alreay_scrapped = 'Este documento ya esta hecho scrap';
-
-    $lang->msg_cart_is_null = 'Seleciona el objetivo';
-    $lang->msg_checked_file_is_deleted = '%d archivos adjuntos son eliminados';
-
-    $lang->msg_find_account_title = 'Account Info';
-    $lang->msg_find_account_info = 'Esto se solicita la información de la cuenta';
-    $lang->msg_find_account_comment = 'La contraseña se modificará para arriba al hacer clic en un enlace a continuación. <br /> Por favor, después de modificar la contraseña de acceso.';
-    $lang->msg_confirm_account_title = '가입 인증 메일 입니다';
-    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다';
-    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
-    $lang->msg_auth_mail_sent = 'La autenticación de correo ha sido enviado a% s. Por favor, compruebe su correo.';
-    $lang->msg_confirm_mail_sent = '%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.';
-    $lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요';
-    $lang->msg_success_authed = 'Esto no es válido solicitud de autenticación. <br /> Por favor, inténtelo encontrar información de la cuenta o póngase en contacto con el administrador.';
-    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
-
-    $lang->msg_new_member = 'Agregar usuario';
-    $lang->msg_update_member = 'Modificar información del usuario';
-    $lang->msg_leave_member = 'Dejar de ser usuario';
-    $lang->msg_group_is_null = 'No es un grupo registrado';
-    $lang->msg_not_delete_default = 'Los artículos predefinidos no pueden ser eliminados';
-    $lang->msg_not_exists_member = "Este usuario no existe";
-    $lang->msg_cannot_delete_admin = 'ID del Administrador no puede ser eliminado. Remover el ID desde la Administración y trate nuevamente.';
-    $lang->msg_exists_user_id = 'Este ID ya existe. Por favor trate con otro ID';
-    $lang->msg_exists_email_address = 'Esta dirección del email ya existe. Por favor trate con otra dirección del email.';
-    $lang->msg_exists_nick_name = 'Este apodo ya existe. Por favor trate con otro apodo.';
-    $lang->msg_signup_disabled = 'Usted no puede ser registrado';
-    $lang->msg_already_logged = 'Usted ya ha sido registrado';
-    $lang->msg_not_logged = 'Por favor conectese primero';
-    $lang->msg_insert_group_name = 'Por favor ingresar el nombre del grupo';
-    $lang->msg_check_group = 'Introduce nombre de grupo';
-
-    $lang->msg_not_uploaded_image_name = 'Imagen del nombre no puede ser registrado';
-    $lang->msg_not_uploaded_image_mark = 'Imagen de marca no puede ser resistrado';
-    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
-
-    $lang->msg_accept_agreement = 'Usted primero debe aceptar el acuerdo';
-
-    $lang->msg_user_denied = 'ID ingresado ha sido prohibido para su uso';
-    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요';
-    $lang->msg_user_limited = 'ID ingresado puede ser usado luego de %s';
-
-    $lang->about_user_id = 'ID del usuario debe ser entre 3-20 letras que consiste en alfabetos+número con alfabeto como primera letra.';
-    $lang->about_password = 'Contraseña debe ser entre 6-20 letras';
-    $lang->about_user_name = 'Nombre debe ser entre 2-20 letras';
-    $lang->about_nick_name = 'Apodo debe ser entre 2-20 letras';
-    $lang->about_email_address = 'Dirección de email es usado para modificar/encontrar contraseña luego de la certificación de email';
-    $lang->about_homepage = 'Ingresar su sitio web, si es que lo tiene';
-    $lang->about_blog_url = 'Ingresar su blog, si es que lo tiene';
-    $lang->about_birthday = 'Ingresar su fecha de nacimiento';
-    $lang->about_allow_mailing = "Si usted no se ha registrado el envío de email, usted no podrá recibir el email del grupo";
-    $lang->about_denied = 'Si selecciona esta opción prohibirá el uso del ID';
-    $lang->about_is_admin = 'Si selecciona esta opción para obtener la atribución del administrador superior';
-    $lang->about_member_description = "Nota del administrador acerca de los usuarios";
-    $lang->about_group = 'Un ID puede pertenecer a muchos grupos';
-
-    $lang->about_column_type = 'Definir el estilo de la forma de registro que desea agregar';
-    $lang->about_column_name = 'Ingresar el nombre en español para poder usar en plantilla (nombre como variable)';
-    $lang->about_column_title = 'Esto sera mostrado cuando el usuario registra o modifica/visualiza la información del usuario';
-    $lang->about_default_value = 'Usted puede predefinir los valores';
-    $lang->about_active = 'Si selecciona "Activar" los artículos seran mostrados en el momento de registrar';
-    $lang->about_form_description = 'Si Usted ingresa la forma de la descripción, será mostrado en el momento de registrar';
-    $lang->about_required = 'Si selecciona esta opción, será artículo esencial para el registro';
-
-    $lang->about_enable_openid = 'Selecciona esta opción si activado OpenID';
-    $lang->about_enable_join = 'Debe seleccionar esta opción para permitir el registro de los usuarios';
-    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다';
-    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다';
-    $lang->about_limit_day = 'Usted puede limitar la fecha de la certificación luego de registrar';
-    $lang->about_limit_date = 'Usuario no podra conectarse hasta la fecha indicada';
-    $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
-    $lang->about_after_logout_url = '로그아웃 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
-    $lang->about_redirect_url = 'Ingresar la URL que va a abrir luego de registrar los usuarios. Cuando esto esta vacío, se habrirá la página anterior a la del registro.';
-    $lang->about_agreement = "Acuerdo del registro no será mostrado si esta vacío";
-
-    $lang->about_image_name = "Permitir a los usuarios el uso de imagen del nombre en ves del nombre del usuario";
-    $lang->about_image_mark = "Permitir a los usuarios el uso de imagen de marca delante de sus nombres";
-    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
-    $lang->about_profile_image = 'Permitir a los usuarios a utilizar nombre de la imagen en lugar de texto nombre';
-    $lang->about_accept_agreement = "Yo he leído todo el acuerdo y acepto";
-
-    $lang->about_member_default = 'Al registrar se configura como grupo predefinido';
-
-    $lang->about_openid = 'Cuando tu registra como OpenID, la información básica como ID o la dirección del email sera guardado en este sitio, pero la contraseña y la resolución de la certificación se hará en el servicio ofrecido por openID';
-    $lang->about_openid_leave = 'La secesión de OpenID medios eliminación de su información de miembros de este sitio. <br /> Si se registra después de la secesión, se le reconocerá como un nuevo miembro, de modo que ya no tienen el permiso para que su ex-escrito artículos.';
-
-    $lang->about_member = "Esto es un módulo para crear/modificar/eliminar usuarios y manejar grupos o el formato del registro.\n Usted puede manejar usuarios creando nuevos grupos, y obtener información adicional manejando el formato del registro";
-    $lang->about_find_member_account = 'Su información de la cuenta será observado por dirección de correo electrónico registrada. <br /> Introduce la dirección de correo electrónico que usted tiene de entrada en el registro, y pulse "Buscar" Información de la cuenta ". <br />';
-    $lang->about_ssl_port = 'Please input if you are using different SSL port with default one';
-    $lang->add_openid = 'Add OpenID';
-
-    $lang->about_resend_auth_mail = 'You can request for authentication mail if you have failed before.';
-    $lang->no_article = 'There exists no article';
-
-    $lang->find_account_question = '비밀번호 찾기 질문/답변';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '가입시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.';
-    /*
-    $lang->find_account_question_items = array(''
-                                        ,'다른 이메일 주소는?'
-                                        ,'나의 보물 1호는?'
-                                        ,'나의 출신 초등학교는?'
-                                        ,'나의 출신 고향은?'
-                                        ,'나의 이상형은?'
-                                        ,'어머니 성함은?'
-                                        ,'아버지 성함은?'
-                                        ,'가장 좋아하는 색깔은?'
-                                        ,'가장 좋아하는 음식은?'
-                                        );
-*/
-    $lang->temp_password = '임시 비밀번호';
-    $lang->cmd_get_temp_password = '임시 비밀번호 발급';
-    $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.';
-    $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.';
-    $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.';
-
-    $lang->change_password_date = '비밀번호 갱신주기';
-    $lang->about_change_password_date = '일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ';
-
-?>
diff --git a/modules/member/lang/fr.lang.php b/modules/member/lang/fr.lang.php
deleted file mode 100644
index 80f38c991..000000000
--- a/modules/member/lang/fr.lang.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-    /**
-     * @file   fr.lang.php
-     * @author NHN (developers@xpressengine.com)  Traduit par Pierre Duvent (PierreDuvent@gmail.com)
-     * @brief  Paquet du langage en français pour le module de Membre
-     **/
-
-    $lang->member = 'Membre';
-    $lang->member_default_info = 'Information fondamentale';
-    $lang->member_extend_info = 'Information additionnelle';
-    $lang->default_group_1 = "Membre Associé";
-    $lang->default_group_2 = "Membre Régulier";
-    $lang->admin_group = "Groupe des administrateurs";
-    $lang->keep_signed = 'Garder la session ouverte';
-    $lang->remember_user_id = 'Mémorisez mon Compte';
-    $lang->already_logged = "La session est déjà ouverte";
-    $lang->denied_user_id = 'C\'est un comte interdit.';
-    $lang->null_user_id = 'Entrez le compte, S.V.P.';
-    $lang->null_password = 'Entrez le mot de passe, S.V.P.';
-    $lang->invalid_authorization = 'Le compte n\'est pas encore certifié.';
-    $lang->invalid_user_id= "C'est un compte qui n'existe pas.";
-    $lang->invalid_password = 'C\'est un mot de passe invalide';
-    $lang->invalid_new_password = '이전 비밀번호와 같습니다.';
-    $lang->allow_mailing = 'Inscrire au Mailing';
-    $lang->denied = 'Arrêté à utiliser';
-    $lang->is_admin = 'Permission Superadministrative';
-    $lang->group = 'Groupe assigné';
-    $lang->group_title = 'Nom du Groupe';
-    $lang->group_srl = 'Numéro du Groupe';
-    $lang->signature = 'Signature';
-    $lang->profile_image = 'Image du profil';
-    $lang->profile_image_max_width = 'Largeur Maximum';
-    $lang->profile_image_max_height = 'Hauteur Maximum';
-    $lang->image_name = 'Nom en Image';
-    $lang->image_name_max_width = 'Largeur Maximum';
-    $lang->image_name_max_height = 'Hauteur Maximum';
-    $lang->image_mark = 'Marque en Image';
-    $lang->image_mark_max_width = 'Largeur Maximum';
-    $lang->image_mark_max_height = 'Hauteur Maximum';
-    $lang->group_image_mark = 'Group Image Mark';
-    $lang->group_image_mark_max_width = 'Largeur Maximum';
-    $lang->group_image_mark_max_height = 'Hauteur Maximum';
-    $lang->group_image_mark_order = '그룹 이미지 마크 순서';
-    $lang->signature_max_height = 'Hauteur Maximum de la Signature';
-    $lang->enable_openid = 'Permettre OpenID';
-    $lang->enable_join = 'Permettre l\'inscription';
-    $lang->enable_confirm = 'Utiliser Authentification par mél';
-    $lang->enable_ssl = 'Utiliser SSL';
-    $lang->security_sign_in = 'Ouvrir une Session en utilisant sécurité rehaussé';
-    $lang->limit_day = 'Jour de Limite Temporaire';
-    $lang->limit_date = 'Jour de Limite';
-    $lang->after_login_url = 'URL après la connexion';
-    $lang->after_logout_url = 'URL après la déconnexion ';
-    $lang->redirect_url = 'URL après l\'Inscription';
-    $lang->agreement = 'Accord de l\'Inscription comme Membre';
-    $lang->accept_agreement = 'D\'accord';
-    $lang->member_info = 'Information de Membre';
-    $lang->current_password = 'Mot de Passe courant';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = '쪽지 허용';
-    $lang->allow_message_type = array(
-            'Y' => '모두 허용',
-            'F' => '등록된 친구들만 허용',
-            'N' => '모두 금지',
-    );
-    $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
-    $lang->logged_users = 'Logged Users';
-
-    $lang->webmaster_name = "Nom de Webmestre";
-    $lang->webmaster_email = "Mél de Webmestre";
-
-    $lang->about_keep_signed = 'Malgré que le navigateur est fermé, votre session peut rester ouverte. \n\nSi vous utilisez cette fonction sur l\'ordinateur publique, vos informations privé peut être exposé. Nous vous recommandons de ne pas utiliser cette fonctions sur l\'ordinateur publique.';
-    $lang->about_keep_warning = 'Malgré que le navigateur est fermé, votre session peut rester ouverte. Si vous utilisez cette fonction sur l\'ordinateur publique, vos informations privé peut être exposé. Nous vous recommandons de ne pas utiliser cette fonctions sur l\'ordinateur publique.';
-    $lang->about_webmaster_name = "Entrez le nom de webmestre qui va être utilisé pour le mél de certification ou l\'autre administration du site. (défaut : webmestre)";
-    $lang->about_webmaster_email = "Entrez l\'adresse du mél de webmestre, S.V.P.";
-
-    $lang->search_target_list = array(
-        'user_id' => 'Compte',
-        'user_name' => 'Nom',
-        'nick_name' => 'Surnom',
-        'email_address' => 'Mél',
-        'regdate' => 'Jour d\'Inscription',
-        'regdate_more' => '가입일시(이상)',
-        'regdate_less' => '가입일시(이하)',
-        'last_login' => 'Jour de la connexion dernière',
-        'last_login_more' => '최근로그인일시(이상)',
-        'last_login_less' => '최근로그인일시(이하)',
-        'extra_vars' => 'Variables additionnels ',
-    );
-
-    $lang->cmd_login = 'Connexion';
-    $lang->cmd_logout = 'Déconnexion';
-    $lang->cmd_signup = 'Inscription';
-    $lang->cmd_site_signup = 'Join';
-    $lang->cmd_modify_member_info = 'Modifier Mon Information';
-    $lang->cmd_modify_member_password = 'Modifier le Mot de Passe';
-    $lang->cmd_view_member_info = 'Voir Mon Information';
-    $lang->cmd_leave = 'Quitter';
-    $lang->cmd_find_member_account = 'J\'ai perdu le compte / le mot de passe';
-    $lang->cmd_resend_auth_mail = '인증 메일 재발송';
-
-    $lang->cmd_member_list = 'Liste de Membres';
-    $lang->cmd_module_config = 'Configuration par Défaut';
-    $lang->cmd_member_group = 'Administrer des Groupes';
-    $lang->cmd_send_mail = 'Envoyer des Méls';
-    $lang->cmd_manage_id = 'Administrer les Comptes Interdits';
-    $lang->cmd_manage_form = 'Administrer la Forme d\'Inscription';
-    $lang->cmd_view_own_document = 'Voir les Articles écrits';
-    $lang->cmd_manage_member_info = 'Manage Member Info';
-    $lang->cmd_trace_document = 'Tracer les Articles écrits';
-    $lang->cmd_trace_comment = 'Tracer les Commentaires écrits';
-    $lang->cmd_view_scrapped_document = 'Voir les Coupures';
-    $lang->cmd_view_saved_document = 'Voir les Articles conservés';
-    $lang->cmd_send_email = 'Envoyer des Méls';
-
-    $lang->msg_email_not_exists = "L'adresse mél n'existe pas.";
-
-    $lang->msg_alreay_scrapped = 'Cet article est déjà coupé.';
-
-    $lang->msg_cart_is_null = 'Choisissez l\'Objet, S.V.P.';
-    $lang->msg_checked_file_is_deleted = '%d fichier(s) attaché(s) est(sont) supprimé(s)';
-
-    $lang->msg_find_account_title = 'Information de compte';
-    $lang->msg_find_account_info = 'Voilà votre information de compte.';
-    $lang->msg_find_account_comment = 'Le Mot de Passe sera modifié comme celui ci-dessus si vous cliquez le lien ci-dessous.<br />Modifiez le Mot de Passe après ouvrir la connexion, S.V.P.';
-    $lang->msg_confirm_account_title = 'Mél à confirmer l\'Authentification';
-    $lang->msg_confirm_account_info = 'Voilà votre Information de l\'inscription du Compte:';
-    $lang->msg_confirm_account_comment = 'Cliquez le lien de confirmation suivant pour compléter votre inscription.';
-    $lang->msg_auth_mail_sent = 'Le mél de certification a été envoyé à %s. Vérifiez votre mél.';
-    $lang->msg_confirm_mail_sent = 'On a justement envoyé un mél de confirmation à %s. Cliquez sur le lien de confirmation dans le mél pour compléter l\'inscription.';
-    $lang->msg_invalid_auth_key = 'Cette Requête à Certifier est invalide.<br />Essayez encore une fois à retrouver votre information de compte ou contactez l\'administrateur.';
-    $lang->msg_success_authed = 'Votre compte a été certifié avec succès et ouvert une session. \n Modifiez le Mot de Passe après vous ouvrez une session en utilisant le Mot de Passe dans le mél.';
-    $lang->msg_success_confirmed = 'L\'authentification est complétée avec succèss.';
-
-    $lang->msg_new_member = 'Ajouter un membre';
-    $lang->msg_update_member = 'Modifier l\'Information de Membre';
-    $lang->msg_leave_member = 'Sécession';
-    $lang->msg_group_is_null = 'Il n\'y a pas de groupe enrégistré';
-    $lang->msg_not_delete_default = 'Elément fondamental ne pourra pas être supprimé';
-    $lang->msg_not_exists_member = "Membre Invalide";
-    $lang->msg_cannot_delete_admin = 'Le Compte de l\'Administrateur ne pourra pas être supprimé. Annulez l\'administration du compte et essayez encore une fois.';
-    $lang->msg_exists_user_id = 'Le compte existe déjà. Essayez un autre.';
-    $lang->msg_exists_email_address = 'L\'adresse mél existe déjà. Essayez une autre.';
-    $lang->msg_exists_nick_name = 'Le surnom existe déjà. Essayez un autre.';
-    $lang->msg_signup_disabled = 'Vous ne pouvez pas vous inscrire.';
-    $lang->msg_already_logged = 'Vous vous êtes déjà inscrit(e).';
-    $lang->msg_not_logged = 'Ouvrez une session d\'abord';
-    $lang->msg_insert_group_name = 'Entrez le nom de groupe, S.V.P.';
-    $lang->msg_check_group = 'Choisissez le groupe';
-
-    $lang->msg_not_uploaded_profile_image = 'L\'image de Profil n\'a pas pu être enrégistré';
-    $lang->msg_not_uploaded_image_name = 'Le nom d\'image n\'a pas pu être enrégistré';
-    $lang->msg_not_uploaded_image_mark = 'La marque en image n\'a pas pu être enrégistrée';
-    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수가 없습니다';
-
-    $lang->msg_accept_agreement = 'Vous devez agréer l\'accord';
-
-    $lang->msg_user_denied = 'Le compte que vous avez entré est suspendu';
-    $lang->msg_user_not_confirmed = 'Vous n\'avez pas encore authentifié. Verifiez votre mél, S.V.P.';
-    $lang->msg_user_limited = 'Vous avez entré un compte qui peut être utilisé depuis %s';
-
-    $lang->about_user_id = 'Le compte d\'utilisateur doit être long de 3~20 lettres et se composer des alphabets et des chiffres avec un alphabet au premier.';
-    $lang->about_password = 'Le Mot de Passe doit être long de 6~20 lettres.';
-    $lang->about_user_name = 'Le Nom doit être long de 2~20 lettres.';
-    $lang->about_nick_name = 'Le Surnom doit être long de 2~20 lettres.';
-    $lang->about_email_address = 'L\'Adresse mél sera utilisé à modifier/trouver le Mot de Passe après la certification en mél.';
-    $lang->about_homepage = 'Entrez si vous avez un site Web.';
-    $lang->about_blog_url = 'Entrez si vous avez un blogue.';
-    $lang->about_birthday = 'Entrez votre anniversaire.';
-    $lang->about_allow_mailing = "Si vous ne vous inscrivez pas sur mailing, vous ne pouvez pas recevoir le mél du groupe.";
-    $lang->about_denied = 'Cocher pour interdire le compte';
-    $lang->about_is_admin = 'Cocher pour autoriser la permission de Superadministrateur';
-    $lang->about_member_description = "La description de l\'Administrateur sur le membre";
-    $lang->about_group = 'Un compte peut appartenir aux plusieurs groupes.';
-
-    $lang->about_column_type = 'Choisissez la format que vous voulez ajouter';
-    $lang->about_column_name = 'Entrez le nom composé en alphabet qui peut être utilisé dans le modèle (nom comme variable)';
-    $lang->about_column_title = 'Ce titre sera exposé sur la formule d\'inscription ou sur l\'écran pour modifier/voir les informations de membre';
-    $lang->about_default_value = 'Vous pouvez mettre les valeurs par défaut';
-    $lang->about_active = 'Cochez si vous voulez l\'exposer sur la formule d\'inscription';
-    $lang->about_form_description = 'Si vous entrez la description, elle sera exposé sur la formule d\'incription';
-    $lang->about_required = 'Si vous cochez, ce sera obligatoire';
-
-    $lang->about_enable_openid = 'Cochez si vous voulez permettre OpenID';
-    $lang->about_enable_join = 'Cochez si vous voulez permettre l\'inscription';
-    $lang->about_enable_confirm = 'Envoyer mél de confirmation pour compléter l\'inscription.';
-    $lang->about_enable_ssl = 'Les informations personnelles (Inscription / Modification des informations du membre / Connexion) peuvent être envoyées comme mode SSL(https) si le serveur offre le service SSL.';
-    $lang->about_limit_day = 'Vous pouvez limiter le jour de certification après l\'inscription';
-    $lang->about_limit_date = 'Utilisateur ne peut pas ouverir la connexion jusqu\'au jour assigné';
-    $lang->about_after_login_url = 'Vous pouvez indiquer URL où l\'on va après la connexion. Le vide signifie la page courante.';
-    $lang->about_after_logout_url = 'Vous pouvez indiquer URL où l\'on va après la déconnexion. Le vide signifie la page courrante.';
-    $lang->about_redirect_url = 'Entrez URL où l\'utilisateur irra après l\'inscription, S.V.P. Si c\'est vide, ce sera la page précédente de la page d\'inscription.';
-    $lang->about_agreement = "L'Accord d'Inscription comme Membre sera exposé seulement quand il n'est pas vide.";
-
-    $lang->about_image_name = "Permettre aux utilisateurs d'utiliser une image pour présenter leurs noms au lieu des lettres";
-    $lang->about_image_mark = "Permettre aux utilisateurs d'utiliser une marque devent leurs noms";
-    $lang->about_group_image_mark = '사용자의 이름앞에 그룹 마크를 달 수 있습니다';
-    $lang->about_profile_image = 'Permettre aux utilisateurs d\'utiliser une image de profil';
-    $lang->about_accept_agreement = "J'ai lu l'Accord et je suis d'accord.";
-
-    $lang->about_member_default = 'On sera par défaut dans ce groupe après l\'inscription';
-
-    $lang->about_openid = 'Si vous vous inscrivez avec OpenID, vos informations primaires comme le Compte(ID) ou l\'adresse mél sera gardés sur ce site. Mais le procès pour le Mot de Passe et la certification sera fait sur le service courant qui offre OpenID';
-    $lang->about_openid_leave = 'La sécession de OpenID nous fait supprimer vos informations du membre dans notre site.<br />Si vous ouvrez la connexion après la sécession, nous vous reconnaîtrons comme un nouveau membre, c\'est-à-dire, vous n\'aurez plus la permission sur les articles que vous avez écrits avant.';
-
-    $lang->about_find_member_account = 'L\information de votre compte sera annoncé par le mél sur l\'inscription. <br />Entrez l\'adresse mél que vous avez entré sur l\'inscription et appuyez le bouton "Recherce l\'Information du Compte".<br />';
-
-    $lang->about_member = "C'est le module pour administrer des membres avec lequel vous pouvez créer/modifier/supprimer des membres ou administrer les groupes et la formule d'inscription.\nVous pouvez administrer membres par création un nouveau groupe, ou gagner les informations additionnelles par l'administration la formule d'inscrioption.";
-    $lang->about_find_member_account = 'Your account info will be noticed by registered email address.<br />Please input email address which you have input on registration, and press "Find Account Info" button.<br />';
-    $lang->about_ssl_port = 'Please input if you are using different SSL port with default one';
-    $lang->add_openid = 'Add OpenID';
-
-    $lang->about_resend_auth_mail = 'You can request for authentication mail if you have failed before.';
-    $lang->no_article = 'There exists no article';
-
-    $lang->find_account_question = '비밀번호 찾기 질문/답변';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '가입시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.';
-    /*
-    $lang->find_account_question_items = array(''
-                                        ,'다른 이메일 주소는?'
-                                        ,'나의 보물 1호는?'
-                                        ,'나의 출신 초등학교는?'
-                                        ,'나의 출신 고향은?'
-                                        ,'나의 이상형은?'
-                                        ,'어머니 성함은?'
-                                        ,'아버지 성함은?'
-                                        ,'가장 좋아하는 색깔은?'
-                                        ,'가장 좋아하는 음식은?'
-                                        );
-*/
-    $lang->temp_password = '임시 비밀번호';
-    $lang->cmd_get_temp_password = '임시 비밀번호 발급';
-    $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.';
-    $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.';
-    $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.';
-
-    $lang->change_password_date = '비밀번호 갱신주기';
-    $lang->about_change_password_date = '일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ';
-
-?>
diff --git a/modules/member/lang/jp.lang.php b/modules/member/lang/jp.lang.php
deleted file mode 100644
index cd4c51f9c..000000000
--- a/modules/member/lang/jp.lang.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-    /**
-     * @file   modules/member/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ、liahona
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    $lang->member = '会員';
-    $lang->member_default_info = '基本情報';
-    $lang->member_extend_info = '追加情報';
-    $lang->default_group_1 = '準会員';
-    $lang->default_group_2 = '正会員';
-    $lang->admin_group = '管理グループ';
-    $lang->keep_signed = '次回からID入力を省略';
-    $lang->remember_user_id = 'ID保存';
-    $lang->already_logged = '既にログインされています。';
-    $lang->denied_user_id = '使用が禁じられているＩＤです。';
-    $lang->null_user_id = 'ユーザーＩＤをもう一度入力して下さい。';
-    $lang->null_password = 'パスワードを入力して下さい。';
-    $lang->invalid_authorization = '認証出来ませんでした。';
-    $lang->invalid_user_id= '存在しないユーザＩＤです。';
-    $lang->invalid_password = '無効なパスワードです。';
-    $lang->invalid_new_password = '以前のパスワードと同じパスワードを使う事はできません。';
-    $lang->allow_mailing = 'メーリングリストに登録';
-    $lang->denied = '使用中止';
-    $lang->is_admin = '最高管理権限';
-    $lang->group = '所属グループ';
-    $lang->group_title = 'グループ名';
-    $lang->group_srl = 'グループ番号';
-    $lang->signature = '署名';
-    $lang->profile_image = 'プロフィール写真';
-    $lang->profile_image_max_width = '制限横幅サイズ';
-    $lang->profile_image_max_height = '制限縦幅サイズ';
-    $lang->image_name = 'イメージ名';
-    $lang->image_name_max_width = '制限横幅サイズ';
-    $lang->image_name_max_height = '制限縦幅サイズ';
-    $lang->image_mark = 'イメージマーク';
-    $lang->image_mark_max_width = '制限横幅サイズ';
-    $lang->image_mark_max_height = '制限縦幅サイズ';
-    $lang->group_image_mark = 'グループ用イメージマーク';
-    $lang->group_image_mark_max_width = '制限横幅サイズ';
-    $lang->group_image_mark_max_height = '制限縦幅サイズ';
-    $lang->group_image_mark_order = 'グループ用イメージマークの順番';
-    $lang->signature_max_height = '制限署名欄の高さ';
-    $lang->enable_openid = 'OpenIDサポート';
-    $lang->enable_join = '会員登録を許可する';
-    $lang->enable_confirm = 'メール認証機能を使用';
-    $lang->enable_ssl = 'SSL使用';
-    $lang->security_sign_in = 'セキュア（SSL）';
-    $lang->limit_day = '臨時制限期間（日）';
-    $lang->limit_date = '制限日';
-    $lang->after_login_url = 'ログイン後、表示するページのURL';
-    $lang->after_logout_url = 'ログアウト後、表示するページのURL';
-    $lang->redirect_url = '会員登録後、表示するページ';
-    $lang->agreement = '会員登録規約';
-    $lang->accept_agreement = '規約に同意する';
-    $lang->member_info = '会員情報';
-    $lang->current_password = '現在のパスワード';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = 'メッセージ許可';
-    $lang->allow_message_type = array(
-            'Y' => '全て許可',
-            'F' => '登録した友達のみ許可',
-            'N' => '全て禁止',
-    );
-    $lang->about_allow_message = 'メッセージの許可タイプ及び対象を設定します。';
-    $lang->logged_users = '現在ログイン中の会員';
-
-    $lang->webmaster_name = 'ウェブマスターのお名前';
-    $lang->webmaster_email = 'ウェブマスターのメールアドレス';
-
-    $lang->about_keep_signed = 'ブラウザを閉じてもログイン状態が維持されます。\n\nログイン維持機能を利用すると、次回からログインする必要がなくなります。\n\nただ、インターネットカフェ、学校など公共場所で利用する場合、個人情報が流出する恐れがありますので、必ずログアウトして下さい。';
-    $lang->about_keep_warning = 'ブラウザを閉じてもログイン状態が維持されます。\n\nログイン維持機能を利用すると、次回からログインする必要がなくなります。 ただ、インターネットカフェ、学校など公共場所で利用する場合、個人情報が流出する恐れがありますので、必ずログアウトして下さい。';
-    $lang->about_webmaster_name = '確認メール、またはサイト管理時に使用されるウェブマスターのお名前を入力して下さい（デフォルト : webmaster）。';
-    $lang->about_webmaster_email = 'ウェブマスターのメールアドレスを入力して下さい。';
-
-    $lang->search_target_list = array(
-        'user_id' => 'ユーザーＩＤ',
-        'user_name' => 'お名前',
-        'nick_name' => 'ニックネーム',
-        'email_address' => 'メールアドレス',
-        'regdate' => '登録日',
-        'regdate_more' => '登録日(以上)',
-        'regdate_less' => '登録日(以下)',
-        'last_login' => '最近のログイン',
-        'last_login_more' => '最近ログイン日(以上)',
-        'last_login_less' => '最近ログイン日(以下)',
-        'extra_vars' => '拡張変数',
-    );
-
-    $lang->cmd_login = 'ログイン';
-    $lang->cmd_logout = 'ログアウト';
-    $lang->cmd_signup = '会員登録';
-    $lang->cmd_site_signup = '登録';
-    $lang->cmd_modify_member_info = '会員情報修正';
-    $lang->cmd_modify_member_password = 'パスワード変更';
-    $lang->cmd_view_member_info = '会員情報確認';
-    $lang->cmd_leave = '退会';
-    $lang->cmd_find_member_account = 'IDとパスワードのリマインダー';
-    $lang->cmd_resend_auth_mail = '認証メール再申請';
-
-    $lang->cmd_member_list = '会員リスト';
-    $lang->cmd_module_config = '基本設定';
-    $lang->cmd_member_group = 'グループ管理';
-    $lang->cmd_send_mail = 'メール送信';
-    $lang->cmd_manage_id = '禁止ＩＤ管理';
-    $lang->cmd_manage_form = '会員登録フォーム管理';
-    $lang->cmd_view_own_document = '書き込み履歴';
-    $lang->cmd_manage_member_info = '会員情報管理';
-    $lang->cmd_trace_document = '書き込みの追跡';
-    $lang->cmd_trace_comment = 'コメント追跡';
-    $lang->cmd_view_scrapped_document = 'スクラップ';
-    $lang->cmd_view_saved_document = '保存ドキュメント';
-    $lang->cmd_send_email = 'メール送信';
-
-    $lang->msg_email_not_exists = '登録されたメールアドレスがありません。';
-
-    $lang->msg_alreay_scrapped = '既にスクラップされたコンテンツです。';
-
-    $lang->msg_cart_is_null = '対象を選択して下さい。';
-    $lang->msg_checked_file_is_deleted = "%d個の添付ファイルが削除されました。";
-
-    $lang->msg_find_account_title = '会員IDどパスワードの情報';
-    $lang->msg_find_account_info = '登録された会員情報は下記の通りです。';
-    $lang->msg_find_account_comment = '下のリンクをクリックすると上のパスワードに変更されます。<br />ログインしてからパスワードを変更して下さい。';
-    $lang->msg_confirm_account_title = '確認メールです。';
-    $lang->msg_confirm_account_info = '作成した会員の情報';
-    $lang->msg_confirm_account_comment = '下記のURLをクリックして会員登録手続きを完了して下さい。';
-    $lang->msg_auth_mail_sent = "%s 宛に認証情報内容が送信されました。メールを確認して下さい。";
-    $lang->msg_confirm_mail_sent = "%s 宛に確認メールを送信しました。メールをご確認下さい。";
-    $lang->msg_invalid_auth_key = '正しくないアカウントの認証要求です。<br />IDとパスワードの検索を行うか、サイト管理者にアカウント情報をお問い合わせ下さい。';
-    $lang->msg_success_authed = '認証が正常に行われ、ログイン出来ました。\n必ず確認メールに記載されたパスワードを利用してお好みのパスワードに変更して下さい。';
-    $lang->msg_success_confirmed = '会員登録、有難うございます。';
-
-    $lang->msg_new_member = '会員追加';
-    $lang->msg_update_member = '会員情報修正';
-    $lang->msg_leave_member = '会員退会';
-    $lang->msg_group_is_null = '登録されたグループがありません。';
-    $lang->msg_not_delete_default = '基本項目は削除出来ません。';
-    $lang->msg_not_exists_member = '存在しないユーザＩＤです。';
-    $lang->msg_cannot_delete_admin = '管理者ＩＤは削除出来ません。管理者権限を解除した上で削除してみて下さい。';
-    $lang->msg_exists_user_id = '既に存在するユーザＩＤです。他のＩＤを入力して下さい。';
-    $lang->msg_exists_email_address = '既に存在するメールアドレスです。他のメールアドレスを入力して下さい。';
-    $lang->msg_exists_nick_name = '既に存在するニックネームです。他のニックネームを入力して下さい。';
-    $lang->msg_signup_disabled = '会員登録が制限されています。<br />サイト管理者にお問合せ下さい。';
-    $lang->msg_already_logged = '既に会員に登録されています。';
-    $lang->msg_not_logged = 'ログインしていません。';
-    $lang->msg_insert_group_name = 'グループ名を入力して下さい。';
-    $lang->msg_check_group = 'グループを選択して下さい。';
-
-    $lang->msg_not_uploaded_profile_image = 'プロフィールイメージを登録することが出来ません。';
-    $lang->msg_not_uploaded_image_name = 'イメージ名を登録することが出来ません。';
-    $lang->msg_not_uploaded_image_mark = 'イメージマークを登録することが出来ません。';
-    $lang->msg_not_uploaded_group_image_mark = 'グループ用イメージマークの登録が出来ません。';
-
-    $lang->msg_accept_agreement = '規約に同意しなければなりません。';
-
-    $lang->msg_user_denied = '入力されたユーザＩＤは使用が中止されました。';
-    $lang->msg_user_not_confirmed = 'まだメールの確認が出来ませんでした。届いたメールをご確認下さい。';
-    $lang->msg_user_limited = '入力されたユーザＩＤは%s以降から使用出来ます。';
-
-    $lang->about_user_id = 'ユーザＩＤは３～２０の英数文字で構成され、最先頭の文字は英字でなければなりません。';
-    $lang->about_password = 'パスワードは６～２０文字です。';
-    $lang->about_user_name = '名前は２～２０文字です。';
-    $lang->about_nick_name = 'ニックネームは２～２０文字です。';
-    $lang->about_email_address = 'メールアドレスはメール認証後、パスワード変更または検索などに使用されます。';
-    $lang->about_homepage = 'ホームページがある場合は入力して下さい。';
-    $lang->about_blog_url = '運用しているブログがあれば入力して下さい。';
-    $lang->about_birthday = '生年月日を入力して下さい。';
-    $lang->about_allow_mailing = 'メーリングリストにチェックされていない場合は、全体メールの送信時にメールを受け取りません。';
-    $lang->about_denied = 'チェックするとユーザＩＤを使用出来ないようにします。';
-    $lang->about_is_admin = 'チェックすると最高管理者権限が取得出来ます。';
-    $lang->about_member_description = '会員に対する管理者のメモ帳です。';
-    $lang->about_group = '一つのユーザＩＤは多数のグループに属することが出来ます。';
-
-    $lang->about_column_type = '追加する登録フォームのタイプを指定して下さい。';
-    $lang->about_column_name = 'テンプレートで使用出来る英文字の名前を入力して下さい（変数名）。';
-    $lang->about_column_title = '登録または情報修正・閲覧時に表示されるタイトルです。';
-    $lang->about_default_value = 'デフォルトで入力される値を指定することが出来ます。';
-    $lang->about_active = '活性化（有効化）にチェックを入れないと正常に表示されません。';
-    $lang->about_form_description = '説明欄に入力すると登録時に表示されます。';
-    $lang->about_required = 'チェックを入れると会員登録時に必須入力項目として設定されます。';
-
-    $lang->about_enable_openid = 'OpenIDをサポートする際にチェックを入れます。';
-    $lang->about_enable_join = 'チェックを入れないとユーザが会員に登録出来ません。';
-    $lang->about_enable_confirm = '登録されたメールアドレスに確認メールを送信し、会員登録を確認します。';
-    $lang->about_enable_ssl = 'サーバーでSSLが可能な場合、会員登録/情報変更/ログイン等の個人情報はSSL(https)経由でサーバーにより安全に送信されます。';
-    $lang->about_limit_day = '会員登録後一定の期間中、認証制限を行うことが出来ます。';
-    $lang->about_limit_date = '指定された期間まで該当ユーザはログインできなくします。';
-    $lang->about_after_login_url = 'ログイン後表示されるページのURLを指定出来ます。指定のない場合、現在のページが維持されます。';
-    $lang->about_after_logout_url = 'ログアウト後表示されるページのURLを指定出来ます。指定のない場合、現在のページが維持されます。';
-    $lang->about_redirect_url = '会員登録後、表示されるページのURLを指定出来ます。指定のない場合は会員登録する前のページに戻ります。';
-    $lang->about_agreement = '会員登録規約がない場合は表示されません。';
-
-    $lang->about_image_name = 'ユーザの名前を文字の代わりにイメージで表示させることが出来ます。';
-    $lang->about_image_mark = '使用者の名前の前にマークを付けることが出来ます。';
-    $lang->about_group_image_mark = 'ユーザー名の前にグループマークを表示します。';
-    $lang->about_profile_image = 'ユーザのプロフィールイメージが使用出来るようにします。';
-    $lang->about_signature_max_height = '署名欄の高さのサイズを制限します。 (0 もしくは空の場合は制限なし。)';
-    $lang->about_accept_agreement = '登録規約をすべて読んだ上で同意します。';
-
-    $lang->about_member_default = '会員登録時に基本グループとして設定されます。';
-
-    $lang->about_openid = 'OpenIDで登録する際、ＩＤとメールなどの基本情報は、このサイトに保存されますが、パスワードと認証のための処理用の情報は該当するOpenID提供サービス側で行われます。';
-    $lang->about_openid_leave = 'OpenIDの退会は現在のサイトから会員情報を削除することを意味します。<br />退会後ログインすると新しく登録することになり、書き込んだコンテンツに対する権限を維持することが出来ません。';
-    $lang->about_find_member_account = 'ID/パスワードは登録時に登録されたメールにてお知らせします。<br />登録時に登録したメールアドレスを入力して「IDとパスワードのリマインダー」ボタンをクリックして下さい。<br />';
-
-    $lang->about_member = "会員の作成・修正・削除することが出来、グループの管理、登録フォームの管理などが行える会員管理モジュールです。\nデフォルトで作成されたグループにグループを追加作成して会員管理が出来るようにし、会員登録フォーム管理では基本情報の他、フォームの入力情報を追加することが出来ます。";
-    $lang->about_ssl_port = '基本ポート以外のSSLポートを利用する場合、入力して下さい。';
-    $lang->add_openid = 'OpenIDの追加';
-
-    $lang->about_resend_auth_mail = '認証メールが届いてなかった場合、再送信の申請が可能です。<br />※申請の前に、当サイトからメールの受信が出来るように設定して下さい。';
-    $lang->no_article = '書き込みがありません。';
-
-    $lang->find_account_question = '秘密質問';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '登録した時、入力したIDとメールアドレス、秘密質問の答えで仮のパスワードをもらえる事ができます。';
-
-
-    $lang->find_account_question_items = array(''
-                                        ,'他のメールアドレスは？'
-                                        ,'私の一番大事なものは？'
-                                        ,'私の卒業した小学校は？'
-                                        ,'私の生まれた街は？'
-                                        ,'私の理想型は？'
-                                        ,'お母さんのお名前は？'
-                                        ,'お父さんのお名前は？'
-                                        ,'大好きな色は？'
-                                        ,'大好きな食べ物は？'
-                                        );
-
-    $lang->temp_password = '仮のパスワード';
-    $lang->cmd_get_temp_password = '仮のパスワードをもらう';
-    $lang->about_get_temp_password = 'ログインして直ちにパスワードを変更して下さい。';
-    $lang->msg_question_not_exists = '秘密質問を決めていません。';
-    $lang->msg_answer_not_matches = '秘密質問の答えが正しくありません。';
-
-    $lang->change_password_date = 'パスワード更新周期';
-    $lang->about_change_password_date = '設定した更新周期によってパスワード変更のお知らせがもらえます。（０に設定すると非活性化） ';
-
-?>
diff --git a/modules/member/lang/ko.lang.php b/modules/member/lang/ko.lang.php
deleted file mode 100644
index 0b766d55f..000000000
--- a/modules/member/lang/ko.lang.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-    /**
-     * @file   ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->member = '회원';
-    $lang->member_default_info = '기본 정보';
-    $lang->member_extend_info = '추가 정보';
-    $lang->default_group_1 = '준회원';
-    $lang->default_group_2 = '정회원';
-    $lang->admin_group = '관리그룹';
-    $lang->keep_signed = '로그인 유지';
-    $lang->remember_user_id = '아이디 저장';
-    $lang->already_logged = '이미 로그인되어 있습니다.';
-    $lang->denied_user_id = '사용 금지된 아이디입니다.';
-    $lang->null_user_id = '사용자 아이디를 입력해주세요.';
-    $lang->null_password = '비밀번호를 입력해주세요.';
-    $lang->invalid_authorization = '인증이 되지 않았습니다.';
-    $lang->invalid_user_id= '존재하지 않는 사용자 아이디입니다.';
-    $lang->invalid_password = '잘못된 비밀번호입니다.';
-    $lang->invalid_new_password = '이전 비밀번호와 같습니다.';
-    $lang->allow_mailing = '메일링 가입';
-    $lang->denied = '사용중지';
-    $lang->is_admin = '최고관리 권한';
-    $lang->group = '소속 그룹';
-    $lang->group_title = '그룹제목';
-    $lang->group_srl = '그룹번호';
-    $lang->group_order = '그룹 우선순위';
-    $lang->group_order_change = '그룹 우선순위 변경';
-    $lang->signature = '서명';
-    $lang->profile_image = '프로필 사진';
-    $lang->profile_image_max_width = '가로 제한 길이';
-    $lang->profile_image_max_height = '세로 제한 길이';
-    $lang->image_name = '이미지 이름';
-    $lang->image_name_max_width = '가로 제한 길이';
-    $lang->image_name_max_height = '세로 제한 길이';
-    $lang->image_mark = '이미지 마크';
-    $lang->image_mark_max_width = '가로 제한 길이';
-    $lang->image_mark_max_height = '세로 제한 길이';
-    $lang->group_image_mark = '그룹 이미지 마크';
-    $lang->group_image_mark_max_width = '가로 제한 길이';
-    $lang->group_image_mark_max_height = '세로 제한 길이';
-    $lang->signature_max_height = '서명 높이 제한';
-    $lang->enable_openid = 'OpenID 지원';
-    $lang->enable_join = '회원 가입 허가';
-    $lang->enable_confirm = '메일 인증 사용';
-    $lang->enable_ssl = 'SSL 기능 사용';
-    $lang->security_sign_in = '보안로그인 사용';
-    $lang->limit_day = '임시 제한 일자';
-    $lang->limit_date = '제한일';
-    $lang->after_login_url = '로그인 후 이동할 URL';
-    $lang->after_logout_url = '로그아웃 후 이동할 URL';
-    $lang->redirect_url = '회원 가입 후 이동할 페이지';
-    $lang->agreement = '회원 가입 약관';
-    $lang->accept_agreement = '약관동의';
-    $lang->member_info = '회원 정보';
-    $lang->current_password = '현재 비밀번호';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = '쪽지 허용';
-    $lang->allow_message_type = array(
-            'Y' => '모두 허용',
-            'F' => '등록된 친구들만 허용',
-            'N' => '모두 금지',
-    );
-    $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다.';
-    $lang->logged_users = '현재 접속자';
-
-    $lang->webmaster_name = '웹마스터 이름';
-    $lang->webmaster_email = '웹마스터 메일주소';
-
-    $lang->about_keep_signed = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다.\n\n로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다.\n\n단, 게임방, 학교 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.';
-    $lang->about_keep_warning = '브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다. 로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다. 단, 게임방, 학교 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.';
-    $lang->about_webmaster_name = '인증 메일이나 기타 사이트 관리 시 사용될 웹마스터의 이름을 입력해주세요. (기본 : webmaster)';
-    $lang->about_webmaster_email = '웹마스터의 메일 주소를 입력해주세요.';
-
-    $lang->search_target_list = array(
-        'user_id' => '아이디',
-        'user_name' => '이름',
-        'nick_name' => '닉네임',
-        'email_address' => '메일 주소',
-        'regdate' => '가입일시',
-        'regdate_more' => '가입일시(이상)',
-        'regdate_less' => '가입일시(이하)',
-        'last_login' => '최근 로그인 일시',
-        'last_login_more' => '최근 로그인 일시(이상)',
-        'last_login_less' => '최근 로그인 일시(이하)',
-        'extra_vars' => '확장변수',
-    );
-
-    $lang->cmd_login = '로그인';
-    $lang->cmd_logout = '로그아웃';
-    $lang->cmd_signup = '회원 가입';
-    $lang->cmd_site_signup = '가입';
-    $lang->cmd_modify_member_info = '회원 정보 수정';
-    $lang->cmd_modify_member_password = '비밀번호 변경';
-    $lang->cmd_view_member_info = '회원 정보 보기';
-    $lang->cmd_leave = '탈퇴';
-    $lang->cmd_find_member_account = '아이디/비밀번호 찾기';
-    $lang->cmd_resend_auth_mail = '인증 메일 재발송';
-
-    $lang->cmd_member_list = '회원 목록';
-    $lang->cmd_module_config = '기본 설정';
-    $lang->cmd_member_group = '그룹 관리';
-    $lang->cmd_send_mail = '메일발송';
-    $lang->cmd_manage_id = '금지 아이디 관리';
-    $lang->cmd_manage_form = '가입 폼 관리';
-    $lang->cmd_view_own_document = '작성 글 보기';
-    $lang->cmd_manage_member_info = '회원 정보 관리';
-    $lang->cmd_trace_document = '작성글 추적';
-    $lang->cmd_trace_comment = '작성 댓글 추적';
-    $lang->cmd_view_scrapped_document = '스크랩 보기';
-    $lang->cmd_view_saved_document = '저장함 보기';
-    $lang->cmd_send_email = '메일 보내기';
-
-    $lang->msg_email_not_exists = '이메일 주소가 존재하지 않습니다.';
-
-    $lang->msg_alreay_scrapped = '이미 스크랩된 게시물입니다.';
-
-    $lang->msg_cart_is_null = '대상을 선택해주세요.';
-    $lang->msg_checked_file_is_deleted = "%d개의 첨부 파일이 삭제되었습니다.";
-
-    $lang->msg_find_account_title = '아이디/비밀번호 정보입니다.';
-    $lang->msg_find_account_info = '요청하신 계정 정보는 아래와 같습니다.';
-    $lang->msg_find_account_comment = '아래 링크를 클릭하시면 위에 적힌 비밀번호로 바뀌게 됩니다.<br />로그인 하신 후 비밀번호를 바꾸어주세요.';
-    $lang->msg_confirm_account_title = '가입 인증 메일 입니다.';
-    $lang->msg_confirm_account_info = '가입하신 계정 정보는 아래와 같습니다.';
-    $lang->msg_confirm_account_comment = '아래 링크를 클릭하시면 가입 인증이 이루어집니다.';
-    $lang->msg_auth_mail_sent = "%s 메일로 인증 정보를 담은 메일이 발송되었습니다. 메일을 확인하세요.";
-    $lang->msg_confirm_mail_sent = "%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.";
-    $lang->msg_invalid_auth_key = '잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요.';
-    $lang->msg_success_authed = '인증이 정상적으로 되어 로그인 처리가 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하시는 비밀번호로 변경하세요.';
-    $lang->msg_success_confirmed = '가입 인증이 정상적으로 처리 되었습니다.';
-
-    $lang->msg_new_member = '회원 추가';
-    $lang->msg_update_member = '회원 정보 수정';
-    $lang->msg_leave_member = '회원 탈퇴';
-    $lang->msg_group_is_null = '등록된 그룹이 없습니다.';
-    $lang->msg_not_delete_default = '기본 항목을 삭제할 수 없습니다.';
-    $lang->msg_not_exists_member = '존재하지 않는 사용자입니다.';
-    $lang->msg_cannot_delete_admin = '관리자 아이디는 삭제할 수 없습니다. 관리자 해제 후 다시 삭제시도해주세요.';
-    $lang->msg_exists_user_id = '이미 존재하는 아이디입니다. 다른 아이디를 입력해주세요.';
-    $lang->msg_exists_email_address = '이미 존재하는 메일 주소입니다. 다른 메일 주소를 입력해주세요.';
-    $lang->msg_exists_nick_name = '이미 존재하는 닉네임입니다. 다른 닉네임을 입력해주세요.';
-    $lang->msg_signup_disabled = '회원 가입을 하실 수 없습니다.';
-    $lang->msg_already_logged = '이미 회원 가입을 하신 상태입니다.';
-    $lang->msg_not_logged = '로그인을 하지 않으셨습니다.';
-    $lang->msg_insert_group_name = '그룹명을 입력해 주세요.';
-    $lang->msg_check_group = '그룹을 선택해 주세요.';
-
-    $lang->msg_not_uploaded_profile_image = '프로필 이미지를 등록할 수 없습니다.';
-    $lang->msg_not_uploaded_image_name = '이미지 이름을 등록할 수 없습니다.';
-    $lang->msg_not_uploaded_image_mark = '이미지 마크를 등록할 수 없습니다.';
-    $lang->msg_not_uploaded_group_image_mark = '그룹 이미지 마크를 등록할 수 없습니다.';
-
-    $lang->msg_accept_agreement = '약관에 동의하셔야 합니다.';
-
-    $lang->msg_user_denied = '입력하신 아이디의 사용이 중지되셨습니다.';
-    $lang->msg_user_not_confirmed = '아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요.';
-    $lang->msg_user_limited = "입력하신 아이디는 %s 이후부터 사용하실 수 있습니다.";
-
-    $lang->about_user_id = '사용자 ID는 3~20자 사이의 영문+숫자로 이루어져야 하며 영문으로 시작되어야 합니다.';
-    $lang->about_password = '비밀번호는 6~20자로 되어야 합니다.';
-    $lang->about_user_name = '이름은 2~20자 이내여야 합니다.';
-    $lang->about_nick_name = '닉네임은 2~20자 이내여야 합니다.';
-    $lang->about_email_address = '메일주소는 메일인증 후 비밀번호 변경이나 찾기 등에 사용됩니다.';
-    $lang->about_homepage = '홈페이지가 있을 경우 입력해주세요.';
-    $lang->about_blog_url = '운영하는 블로그가 있을 경우 입력해주세요.';
-    $lang->about_birthday = '생년월일을 입력해주세요.';
-    $lang->about_allow_mailing = '메일링 가입이 체크되지 않으면 단체메일 발송시 메일을 받지 않습니다.';
-    $lang->about_denied = '체크시 아이디를 사용할 수 없도록 합니다.';
-    $lang->about_is_admin = '체크시 최고 관리자 권한을 가지게 됩니다.';
-    $lang->about_member_description = '회원에 대한 관리자 메모입니다.';
-    $lang->about_group = '한 아이디는 여러 개의 group에 속할 수 있습니다.';
-
-    $lang->about_column_type = '추가하실 가입 폼의 형식을 지정해주세요.';
-    $lang->about_column_name = '템플릿에서 사용할 수 있는 영문으로 된 이름을 적어주세요. (변수명)';
-    $lang->about_column_title = '가입 또는 정보 수정/조회시에 표시될 제목입니다.';
-    $lang->about_default_value = '기본으로 입력될 값을 정하실 수 있습니다.';
-    $lang->about_active = '활성 항목에 체크를 하셔야 가입시 정상적으로 노출됩니다.';
-    $lang->about_form_description = '설명란에 입력을 하시면 가입시 표시가 됩니다.';
-    $lang->about_required = '체크하시면 회원가입시 필수항목으로 입력하도록 됩니다.';
-
-    $lang->about_enable_openid = 'OpenID 지원을 할 경우 체크하시면 됩니다.';
-    $lang->about_enable_join = '체크를 하셔야 사용자들이 회원가입을 할 수 있습니다.';
-    $lang->about_enable_confirm = '입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다.';
-    $lang->about_enable_ssl = '서버에서 SSL지원이 될 경우 회원가입, 정보수정, 로그인 등의 개인정보가 서버로 보내질 때 SSL(https)를 이용하도록 할 수 있습니다.';
-    $lang->about_limit_day = '회원 가입 후 정해진 일자동안 인증 제한을 할 수 있습니다.';
-    $lang->about_limit_date = '지정된 일자까지 해당 사용자는 로그인을 할 수 없습니다.';
-    $lang->about_after_login_url = '로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
-    $lang->about_after_logout_url = '로그아웃 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.';
-    $lang->about_redirect_url = '회원 가입 후 이동할 url을 입력해 주세요. 비어 있으면 가입 이전 페이지로 돌아갑니다.';
-    $lang->about_agreement = '회원 가입 약관이 없을 경우 표시되지 않습니다.';
-
-    $lang->about_image_name = '사용자의 이름을 글자 대신 이미지로 사용할 수 있게 합니다.';
-    $lang->about_image_mark = '사용자의 이름 앞에 마크를 달 수 있습니다.';
-    $lang->about_group_image_mark = '사용자의 이름 앞에 그룹 마크를 달 수 있습니다.';
-    $lang->about_profile_image = '사용자의 프로필 이미지를 사용할 수 있게 합니다.';
-    $lang->about_signature_max_height = '서명란의 높이를 제한 할 수 있습니다. (0 또는 비워두면 제한하지 않습니다.)';
-    $lang->about_accept_agreement = '약관을 모두 읽었으며 동의합니다.';
-
-    $lang->about_member_default = '회원가입시 기본 그룹으로 설정됩니다.';
-
-    $lang->about_openid = '오픈아이디로 가입시 아이디와 메일 등의 기본 정보는 이 사이트에 저장 되지만 비밀번호와 인증을 위한 처리는 해당 오픈아이디 제공서비스에서 이루어집니다.';
-    $lang->about_openid_leave = '오픈아이디의 탈퇴는 현 사이트에서의 회원 정보를 삭제하는 것입니다.<br />탈퇴 후 로그인하시면 새로 가입하시는 것으로 되어 작성한 글에 대한 권한을 가질 수 없게 됩니다.';
-    $lang->about_find_member_account = '아이디/ 비밀번호는 가입시 등록한 메일 주소로 알려드립니다.<br />가입할 때 등록하신 메일 주소를 입력하시고 "아이디/비밀번호 찾기" 버튼을 클릭해주세요.<br />';
-
-    $lang->about_member = "회원을 생성/수정/삭제 할 수 있고 그룹관리나 가입 폼 관리 등을 할 수 있는 회원 관리 모듈입니다.\n기본으로 생성된 그룹외의 그룹을 생성하여 회원 관리가 가능하고 가입 폼 관리를 통한 기본 정보외의 추가 정보를 요구할 수도 있습니다.";
-    $lang->about_ssl_port = '기본 포트 이외의 SSL 포트를 사용하는 경우 포트번호를 입력해주세요.';
-    $lang->add_openid = '오픈아이디 추가';
-
-    $lang->about_resend_auth_mail = '인증 메일을 받지 못하신 경우 다시 받으실 수 있습니다.';
-    $lang->no_article = '글이 없습니다.';
-
-    $lang->find_account_question = '비밀번호 찾기 질문/답변';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '가입시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.';
-    $lang->find_account_question_items = array(''
-                                        ,'다른 이메일 주소는?'
-                                        ,'나의 보물 1호는?'
-                                        ,'나의 출신 초등학교는?'
-                                        ,'나의 출신 고향은?'
-                                        ,'나의 이상형은?'
-                                        ,'어머니 성함은?'
-                                        ,'아버지 성함은?'
-                                        ,'가장 좋아하는 색깔은?'
-                                        ,'가장 좋아하는 음식은?'
-                                        );
-
-    $lang->temp_password = '임시 비밀번호';
-    $lang->cmd_get_temp_password = '임시 비밀번호 발급';
-    $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.';
-    $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.';
-    $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.';
-
-    $lang->change_password_date = '비밀번호 갱신주기';
-    $lang->about_change_password_date = '일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ';
-	$lang->msg_kr_address = '읍, 면, 동 이름으로 검색하세요.';
-	$lang->msg_kr_address_etc = '나머지 주소(번지)를 입력하세요.';
-	$lang->cmd_search_again   = '다시 검색';
-?>
diff --git a/modules/member/lang/lang.xml b/modules/member/lang/lang.xml
new file mode 100644
index 000000000..feabfc713
--- /dev/null
+++ b/modules/member/lang/lang.xml
@@ -0,0 +1,2398 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="member">
+		<value xml:lang="ko"><![CDATA[회원]]></value>
+		<value xml:lang="en"><![CDATA[Member]]></value>
+		<value xml:lang="jp"><![CDATA[会員]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員]]></value>
+		<value xml:lang="fr"><![CDATA[Membre]]></value>
+		<value xml:lang="ru"><![CDATA[Пользователь]]></value>
+		<value xml:lang="es"><![CDATA[Usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye]]></value>
+		<value xml:lang="vi"><![CDATA[Thành viên]]></value>
+	</item>
+	<item name="member_default_info">
+		<value xml:lang="ko"><![CDATA[기본 정보]]></value>
+		<value xml:lang="en"><![CDATA[Basic Info]]></value>
+		<value xml:lang="jp"><![CDATA[基本情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[基本资料]]></value>
+		<value xml:lang="zh-TW"><![CDATA[基本資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information fondamentale]]></value>
+		<value xml:lang="ru"><![CDATA[Основная информация]]></value>
+		<value xml:lang="es"><![CDATA[Información Basica]]></value>
+		<value xml:lang="tr"><![CDATA[Temel Bilgi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin cá nhân]]></value>
+	</item>
+	<item name="member_extend_info">
+		<value xml:lang="ko"><![CDATA[추가 정보]]></value>
+		<value xml:lang="en"><![CDATA[Additional Info]]></value>
+		<value xml:lang="jp"><![CDATA[追加情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[扩展信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[延伸資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information additionnelle]]></value>
+		<value xml:lang="ru"><![CDATA[Дополнительная информация]]></value>
+		<value xml:lang="es"><![CDATA[Información adicional]]></value>
+		<value xml:lang="tr"><![CDATA[Detaylı Bilgi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin bổ xung]]></value>
+	</item>
+	<item name="default_group_1">
+		<value xml:lang="ko"><![CDATA[준회원]]></value>
+		<value xml:lang="en"><![CDATA[Associate Member]]></value>
+		<value xml:lang="jp"><![CDATA[準会員]]></value>
+		<value xml:lang="zh-CN"><![CDATA[准会员]]></value>
+		<value xml:lang="zh-TW"><![CDATA[準會員]]></value>
+		<value xml:lang="fr"><![CDATA[Membre Associé]]></value>
+		<value xml:lang="ru"><![CDATA[Новичок]]></value>
+		<value xml:lang="es"><![CDATA[Usuario registrado]]></value>
+		<value xml:lang="tr"><![CDATA[Asil Üye]]></value>
+		<value xml:lang="vi"><![CDATA[Member]]></value>
+	</item>
+	<item name="default_group_2">
+		<value xml:lang="ko"><![CDATA[정회원]]></value>
+		<value xml:lang="en"><![CDATA[Regular Member]]></value>
+		<value xml:lang="jp"><![CDATA[正会員]]></value>
+		<value xml:lang="zh-CN"><![CDATA[正会员]]></value>
+		<value xml:lang="zh-TW"><![CDATA[正會員]]></value>
+		<value xml:lang="fr"><![CDATA[Membre Régulier]]></value>
+		<value xml:lang="ru"><![CDATA[Постоянный участник]]></value>
+		<value xml:lang="es"><![CDATA[Usuario regular]]></value>
+		<value xml:lang="tr"><![CDATA[Sıradan Üye]]></value>
+		<value xml:lang="vi"><![CDATA[Moderator]]></value>
+	</item>
+	<item name="admin_group">
+		<value xml:lang="ko"><![CDATA[관리그룹]]></value>
+		<value xml:lang="en"><![CDATA[Managing Group]]></value>
+		<value xml:lang="jp"><![CDATA[管理グループ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理組]]></value>
+		<value xml:lang="fr"><![CDATA[Groupe des administrateurs]]></value>
+		<value xml:lang="ru"><![CDATA[Администратор]]></value>
+		<value xml:lang="es"><![CDATA[Manejo del grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Grup Yönetimi]]></value>
+		<value xml:lang="vi"><![CDATA[Administrator]]></value>
+	</item>
+	<item name="keep_signed">
+		<value xml:lang="ko"><![CDATA[로그인 유지]]></value>
+		<value xml:lang="en"><![CDATA[Keep me signed in.]]></value>
+		<value xml:lang="jp"><![CDATA[次回からID入力を省略]]></value>
+		<value xml:lang="zh-CN"><![CDATA[自动登录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[自動登入]]></value>
+		<value xml:lang="fr"><![CDATA[Garder la session ouverte]]></value>
+		<value xml:lang="ru"><![CDATA[Сохранить логин]]></value>
+		<value xml:lang="tr"><![CDATA[Beni bağlı tut]]></value>
+		<value xml:lang="vi"><![CDATA[Nhớ thông tin đăng nhập]]></value>
+	</item>
+	<item name="remember_user_id">
+		<value xml:lang="ko"><![CDATA[아이디 저장]]></value>
+		<value xml:lang="en"><![CDATA[Remember ID.]]></value>
+		<value xml:lang="jp"><![CDATA[ID保存]]></value>
+		<value xml:lang="zh-CN"><![CDATA[保存ID]]></value>
+		<value xml:lang="zh-TW"><![CDATA[儲存 ID]]></value>
+		<value xml:lang="fr"><![CDATA[Mémorisez mon Compte]]></value>
+		<value xml:lang="ru"><![CDATA[Сохранить ID]]></value>
+		<value xml:lang="es"><![CDATA[Guardar ID]]></value>
+		<value xml:lang="tr"><![CDATA[Kimliği Hatırla]]></value>
+		<value xml:lang="vi"><![CDATA[Lưu tên sử dụng]]></value>
+	</item>
+	<item name="already_logged">
+		<value xml:lang="ko"><![CDATA[이미 로그인되어 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You are already signed in.]]></value>
+		<value xml:lang="jp"><![CDATA[既にログインされています。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您已经登录！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您已經登入！]]></value>
+		<value xml:lang="fr"><![CDATA[La session est déjà ouverte]]></value>
+		<value xml:lang="ru"><![CDATA[Вы уже вошли]]></value>
+		<value xml:lang="es"><![CDATA[Ya está conectado]]></value>
+		<value xml:lang="tr"><![CDATA[Zaten giriş yaptınız]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn đã đăng nhập]]></value>
+	</item>
+	<item name="denied_user_id">
+		<value xml:lang="ko"><![CDATA[사용 금지된 아이디입니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered a prohibited ID.]]></value>
+		<value xml:lang="jp"><![CDATA[使用が禁じられているＩＤです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[被禁止的用户名。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[被禁止的帳號。]]></value>
+		<value xml:lang="fr"><![CDATA[C'est un comte interdit.]]></value>
+		<value xml:lang="ru"><![CDATA[Извините. Этот ID запрещен]]></value>
+		<value xml:lang="es"><![CDATA[Este ID está prohibido.]]></value>
+		<value xml:lang="tr"><![CDATA[Yasaklanmış bir kimlik girdiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[ID đăng nhập của bạn đã bị cấm sử dụng.]]></value>
+	</item>
+	<item name="null_user_id">
+		<value xml:lang="ko"><![CDATA[회원 아이디를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter your ID.]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザーIDをもう一度入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入用户名。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入帳號。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le compte, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите ID]]></value>
+		<value xml:lang="es"><![CDATA[IngresarID]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen kimliğinizi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng nhập ID đăng nhập]]></value>
+	</item>
+	<item name="null_password">
+		<value xml:lang="ko"><![CDATA[비밀번호를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter your password.]]></value>
+		<value xml:lang="jp"><![CDATA[パスワードを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入密码。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入密碼。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le mot de passe, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите пароль]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar la contraseña]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen şifrenizi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng nhập mật khẩu]]></value>
+	</item>
+	<item name="invalid_authorization">
+		<value xml:lang="ko"><![CDATA[인증이 되지 않았습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The account is not activated.]]></value>
+		<value xml:lang="jp"><![CDATA[認証できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[还没有认证！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[還沒有認證！]]></value>
+		<value xml:lang="fr"><![CDATA[Le compte n'est pas encore certifié.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы не авторизированы]]></value>
+		<value xml:lang="es"><![CDATA[No está certificado]]></value>
+		<value xml:lang="tr"><![CDATA[Hesap etkinleştirilmemiş.]]></value>
+		<value xml:lang="vi"><![CDATA[Tài khoản đăng nhập không đúng.]]></value>
+	</item>
+	<item name="invalid_user_id">
+		<value xml:lang="ko"><![CDATA[존재하지 않는 회원 아이디입니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered an invalid ID.]]></value>
+		<value xml:lang="jp"><![CDATA[存在しないユーザーIDです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[该用户名不存在，请检查您的输入是否有误！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[該帳號不存在，請檢查您的輸入是否有誤！]]></value>
+		<value xml:lang="fr"><![CDATA[C'est un compte qui n'existe pas.]]></value>
+		<value xml:lang="ru"><![CDATA[Указанный ID не существует]]></value>
+		<value xml:lang="es"><![CDATA[Este ID no existe]]></value>
+		<value xml:lang="tr"><![CDATA[Geçerli olmayan bir kimlik girdiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn đã nhập sai tên sử dụng]]></value>
+	</item>
+	<item name="invalid_password">
+		<value xml:lang="ko"><![CDATA[잘못된 비밀번호입니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered an invalid password.]]></value>
+		<value xml:lang="jp"><![CDATA[無効なパスワードです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您的密码不正确！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您的密碼不正確！]]></value>
+		<value xml:lang="fr"><![CDATA[C'est un mot de passe invalide]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный пароль]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña incorrecta]]></value>
+		<value xml:lang="tr"><![CDATA[Hatalı bir şifre girdiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu không đúng]]></value>
+	</item>
+	<item name="invalid_new_password">
+		<value xml:lang="ko"><![CDATA[이전 비밀번호와 같습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter a password you haven't previously used.]]></value>
+		<value xml:lang="jp"><![CDATA[以前のパスワードと同じパスワードを使うことはできません。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新密碼不能與舊密碼相同]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni şifre, eski şifreyle aynı olmamalı.]]></value>
+	</item>
+	<item name="allow_mailing">
+		<value xml:lang="ko"><![CDATA[메일링 가입]]></value>
+		<value xml:lang="en"><![CDATA[Join Mailing]]></value>
+		<value xml:lang="jp"><![CDATA[メーリングリストに登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[接收邮件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[接收郵件]]></value>
+		<value xml:lang="fr"><![CDATA[Inscrire au Mailing]]></value>
+		<value xml:lang="ru"><![CDATA[Получать рассылки]]></value>
+		<value xml:lang="es"><![CDATA[Registro del envío de mail]]></value>
+		<value xml:lang="tr"><![CDATA[Mailleşmeyi Aç]]></value>
+		<value xml:lang="vi"><![CDATA[Đồng ý nhận Email]]></value>
+	</item>
+	<item name="is_admin">
+		<value xml:lang="ko"><![CDATA[최고관리 권한]]></value>
+		<value xml:lang="en"><![CDATA[Superadmin Permission]]></value>
+		<value xml:lang="jp"><![CDATA[最高管理権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最高管理权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最高管理權限]]></value>
+		<value xml:lang="fr"><![CDATA[Permission Superadministrative]]></value>
+		<value xml:lang="ru"><![CDATA[Суперадминистративные права]]></value>
+		<value xml:lang="es"><![CDATA[Atribución del administrador superior]]></value>
+		<value xml:lang="tr"><![CDATA[Süperadmin Yetkisi]]></value>
+		<value xml:lang="vi"><![CDATA[Toàn quyền Administrator]]></value>
+	</item>
+	<item name="member_group">
+		<value xml:lang="ko"><![CDATA[회원 그룹]]></value>
+		<value xml:lang="en"><![CDATA[Member Group]]></value>
+		<value xml:lang="jp"><![CDATA[所属グループ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組]]></value>
+		<value xml:lang="fr"><![CDATA[Groupe assigné]]></value>
+		<value xml:lang="ru"><![CDATA[Группа]]></value>
+		<value xml:lang="es"><![CDATA[Grupo asignado]]></value>
+		<value xml:lang="tr"><![CDATA[Grup]]></value>
+		<value xml:lang="vi"><![CDATA[Phân nhóm]]></value>
+	</item>
+	<item name="group_title">
+		<value xml:lang="ko"><![CDATA[그룹제목]]></value>
+		<value xml:lang="en"><![CDATA[Group Name]]></value>
+		<value xml:lang="jp"><![CDATA[グループ名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组标题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組標題]]></value>
+		<value xml:lang="fr"><![CDATA[Nom du Groupe]]></value>
+		<value xml:lang="ru"><![CDATA[Имя группы]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Grup Adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên nhóm]]></value>
+	</item>
+	<item name="group_srl">
+		<value xml:lang="ko"><![CDATA[그룹번호]]></value>
+		<value xml:lang="en"><![CDATA[Group Number]]></value>
+		<value xml:lang="jp"><![CDATA[グループ番号]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组编号]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組編號]]></value>
+		<value xml:lang="fr"><![CDATA[Numéro du Groupe]]></value>
+		<value xml:lang="ru"><![CDATA[Номер группы]]></value>
+		<value xml:lang="es"><![CDATA[Número del grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Grup Numarası]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm số]]></value>
+	</item>
+	<item name="group_order">
+		<value xml:lang="ko"><![CDATA[그룹 우선순위]]></value>
+		<value xml:lang="en"><![CDATA[Gropu Priority]]></value>
+		<value xml:lang="jp"><![CDATA[グループ優先順位]]></value>
+	</item>
+	<item name="group_order_change">
+		<value xml:lang="ko"><![CDATA[그룹 우선순위 변경]]></value>
+		<value xml:lang="en"><![CDATA[Change Group Priority]]></value>
+		<value xml:lang="jp"><![CDATA[グループ優先順位変更]]></value>
+	</item>
+	<item name="signature">
+		<value xml:lang="ko"><![CDATA[서명]]></value>
+		<value xml:lang="en"><![CDATA[Signature]]></value>
+		<value xml:lang="jp"><![CDATA[署名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[签名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[簽名檔]]></value>
+		<value xml:lang="ru"><![CDATA[Подпись]]></value>
+		<value xml:lang="es"><![CDATA[Firma]]></value>
+		<value xml:lang="tr"><![CDATA[İmza]]></value>
+		<value xml:lang="vi"><![CDATA[Chữ kí]]></value>
+	</item>
+	<item name="profile_image">
+		<value xml:lang="ko"><![CDATA[프로필 사진]]></value>
+		<value xml:lang="en"><![CDATA[Profile Image]]></value>
+		<value xml:lang="jp"><![CDATA[プロフィール写真]]></value>
+		<value xml:lang="zh-CN"><![CDATA[个性头像]]></value>
+		<value xml:lang="zh-TW"><![CDATA[個人圖片]]></value>
+		<value xml:lang="fr"><![CDATA[Image du profil]]></value>
+		<value xml:lang="ru"><![CDATA[Фотография участника]]></value>
+		<value xml:lang="es"><![CDATA[Perfil de Imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Profil Resmi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình đại diện]]></value>
+	</item>
+	<item name="profile_image_max_width">
+		<value xml:lang="ko"><![CDATA[가로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Width]]></value>
+		<value xml:lang="jp"><![CDATA[制限横幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Largeur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. ширина]]></value>
+		<value xml:lang="es"><![CDATA[Max Anchura]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiểu rộng tối đa]]></value>
+	</item>
+	<item name="profile_image_max_height">
+		<value xml:lang="ko"><![CDATA[세로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Height]]></value>
+		<value xml:lang="jp"><![CDATA[制限縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Hauteur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. высота]]></value>
+		<value xml:lang="es"><![CDATA[Max Altura]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Uzunluk]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao tối đa&nbsp;&nbsp;]]></value>
+	</item>
+	<item name="image_name">
+		<value xml:lang="ko"><![CDATA[이미지 이름]]></value>
+		<value xml:lang="en"><![CDATA[Image Name]]></value>
+		<value xml:lang="jp"><![CDATA[イメージ名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[昵称图片]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暱稱圖片]]></value>
+		<value xml:lang="fr"><![CDATA[Nom en Image]]></value>
+		<value xml:lang="ru"><![CDATA[Имя изображения]]></value>
+		<value xml:lang="es"><![CDATA[Nombre de la imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Resim İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình thay thế tên hiển thị]]></value>
+	</item>
+	<item name="image_name_max_width">
+		<value xml:lang="ko"><![CDATA[가로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Width]]></value>
+		<value xml:lang="jp"><![CDATA[制限横幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Largeur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho Máximo]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiểu rộng tối đa]]></value>
+	</item>
+	<item name="image_name_max_height">
+		<value xml:lang="ko"><![CDATA[세로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Height]]></value>
+		<value xml:lang="jp"><![CDATA[制限縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Hauteur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. высота]]></value>
+		<value xml:lang="es"><![CDATA[Altura Máxima]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Uzunluk]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao tối đa&nbsp;&nbsp;]]></value>
+	</item>
+	<item name="image_mark">
+		<value xml:lang="ko"><![CDATA[이미지 마크]]></value>
+		<value xml:lang="en"><![CDATA[Image Mark]]></value>
+		<value xml:lang="jp"><![CDATA[イメージマーク]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户图标]]></value>
+		<value xml:lang="zh-TW"><![CDATA[用戶圖示]]></value>
+		<value xml:lang="fr"><![CDATA[Marque en Image]]></value>
+		<value xml:lang="es"><![CDATA[Marca de la imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Resim İmi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình đánh dấu]]></value>
+	</item>
+	<item name="image_mark_max_width">
+		<value xml:lang="ko"><![CDATA[가로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Width]]></value>
+		<value xml:lang="jp"><![CDATA[制限横幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Largeur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho Máximo]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiểu rộng tối đa]]></value>
+	</item>
+	<item name="image_mark_max_height">
+		<value xml:lang="ko"><![CDATA[세로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Height]]></value>
+		<value xml:lang="jp"><![CDATA[制限縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Hauteur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. высота]]></value>
+		<value xml:lang="es"><![CDATA[Altura Máxima]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Uzunluk]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao tối đa&nbsp;&nbsp;]]></value>
+	</item>
+	<item name="group_image_mark">
+		<value xml:lang="ko"><![CDATA[그룹 이미지 마크]]></value>
+		<value xml:lang="en"><![CDATA[Group Image Mark]]></value>
+		<value xml:lang="jp"><![CDATA[グループ用イメージマーク]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组图标]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組圖示]]></value>
+		<value xml:lang="tr"><![CDATA[Grup Simgesi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình đại diện nhóm]]></value>
+	</item>
+	<item name="group_image_mark_max_width">
+		<value xml:lang="ko"><![CDATA[가로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Width]]></value>
+		<value xml:lang="jp"><![CDATA[制限横幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Largeur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho Máximo]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiểu rộng tối đa]]></value>
+	</item>
+	<item name="group_image_mark_max_height">
+		<value xml:lang="ko"><![CDATA[세로 제한 길이]]></value>
+		<value xml:lang="en"><![CDATA[Max Height]]></value>
+		<value xml:lang="jp"><![CDATA[制限縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[高度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[高度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Hauteur Maximum]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. высота]]></value>
+		<value xml:lang="es"><![CDATA[Altura Máxima]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. Uzunluk]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao tối đa&nbsp;&nbsp;]]></value>
+	</item>
+	<item name="signature_max_height">
+		<value xml:lang="ko"><![CDATA[서명 높이 제한]]></value>
+		<value xml:lang="en"><![CDATA[Max Signature Height]]></value>
+		<value xml:lang="jp"><![CDATA[制限署名欄の高さ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[签名高度限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[簽名檔高度限制]]></value>
+		<value xml:lang="fr"><![CDATA[Hauteur Maximum de la Signature]]></value>
+		<value xml:lang="tr"><![CDATA[En Yük. İmza Uzunluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều cao lớn nhất của chữ kí]]></value>
+	</item>
+	<item name="enable_openid">
+		<value xml:lang="ko"><![CDATA[OpenID 지원]]></value>
+		<value xml:lang="en"><![CDATA[Enable OpenID]]></value>
+		<value xml:lang="jp"><![CDATA[OpenIDサポート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[支持OpenID]]></value>
+		<value xml:lang="zh-TW"><![CDATA[支援 OpenID]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre OpenID]]></value>
+		<value xml:lang="ru"><![CDATA[Включить открытый ID (OpenID)]]></value>
+		<value xml:lang="es"><![CDATA[Activar OpenID]]></value>
+		<value xml:lang="tr"><![CDATA[OpenID Aç]]></value>
+		<value xml:lang="vi"><![CDATA[Kích hoạt OpenID]]></value>
+	</item>
+	<item name="enable_join">
+		<value xml:lang="ko"><![CDATA[회원 가입 허가]]></value>
+		<value xml:lang="en"><![CDATA[Accept New Members]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録を許可する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[允许会员注册]]></value>
+		<value xml:lang="zh-TW"><![CDATA[允許會員註冊]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre l'inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешение на регистрацию]]></value>
+		<value xml:lang="es"><![CDATA[Permitir el registro del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni Üye Kabul Et]]></value>
+		<value xml:lang="vi"><![CDATA[Đồng ý đăng kí thành viên]]></value>
+	</item>
+	<item name="enable_confirm">
+		<value xml:lang="ko"><![CDATA[메일 인증 사용]]></value>
+		<value xml:lang="en"><![CDATA[Email Activation]]></value>
+		<value xml:lang="jp"><![CDATA[メール認証機能を使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用邮件认证]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用郵件認證]]></value>
+		<value xml:lang="fr"><![CDATA[Utiliser Authentification par mél]]></value>
+		<value xml:lang="ru"><![CDATA[Активация по email]]></value>
+		<value xml:lang="tr"><![CDATA[E-posta Doğrulaması]]></value>
+		<value xml:lang="vi"><![CDATA[Xác nhận qua Email]]></value>
+	</item>
+	<item name="enable_ssl">
+		<value xml:lang="ko"><![CDATA[SSL 기능 사용]]></value>
+		<value xml:lang="en"><![CDATA[Enable SSL]]></value>
+		<value xml:lang="jp"><![CDATA[SSL使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用SSL功能]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用 SSL功能]]></value>
+		<value xml:lang="fr"><![CDATA[Utiliser SSL]]></value>
+		<value xml:lang="ru"><![CDATA[использоватьSSL]]></value>
+		<value xml:lang="es"><![CDATA[Activar SSL]]></value>
+		<value xml:lang="tr"><![CDATA[SSL Etkinleştir]]></value>
+		<value xml:lang="vi"><![CDATA[Mở SSL]]></value>
+	</item>
+	<item name="security_sign_in">
+		<value xml:lang="ko"><![CDATA[보안로그인 사용]]></value>
+		<value xml:lang="en"><![CDATA[Sign in using enhanced security]]></value>
+		<value xml:lang="jp"><![CDATA[セキュア（SSL）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用安全登录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用安全登入]]></value>
+		<value xml:lang="fr"><![CDATA[Ouvrir une Session en utilisant sécurité rehaussé]]></value>
+		<value xml:lang="tr"><![CDATA[Gelişmiş güvenliği kullanarak giriş yap]]></value>
+		<value xml:lang="vi"><![CDATA[Bảo mật đăng nhập]]></value>
+	</item>
+	<item name="limit_day">
+		<value xml:lang="ko"><![CDATA[임시 제한 일자]]></value>
+		<value xml:lang="en"><![CDATA[Temporary Limit Date]]></value>
+		<value xml:lang="jp"><![CDATA[一時制限期間（日）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[认证限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[認證限制]]></value>
+		<value xml:lang="fr"><![CDATA[Jour de Limite Temporaire]]></value>
+		<value xml:lang="ru"><![CDATA[Дата временного лимит]]></value>
+		<value xml:lang="es"><![CDATA[Límite de la fecha temporal]]></value>
+		<value xml:lang="tr"><![CDATA[Geçici Zaman Sınırı]]></value>
+		<value xml:lang="vi"><![CDATA[Hạn sử dụng]]></value>
+	</item>
+	<item name="limit_date">
+		<value xml:lang="ko"><![CDATA[제한일]]></value>
+		<value xml:lang="en"><![CDATA[Limit Date]]></value>
+		<value xml:lang="jp"><![CDATA[制限日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[限制日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[限制日期]]></value>
+		<value xml:lang="fr"><![CDATA[Jour de Limite]]></value>
+		<value xml:lang="ru"><![CDATA[Дата лимита]]></value>
+		<value xml:lang="es"><![CDATA[Límite de fecha]]></value>
+		<value xml:lang="tr"><![CDATA[Zaman Sınırı]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày giới hạn]]></value>
+	</item>
+	<item name="after_login_url">
+		<value xml:lang="ko"><![CDATA[로그인 후 이동할 URL]]></value>
+		<value xml:lang="en"><![CDATA[URL to redirect after Sign in]]></value>
+		<value xml:lang="jp"><![CDATA[ログイン後、表示するページのURL]]></value>
+		<value xml:lang="zh-CN"><![CDATA[登录后页面转向]]></value>
+		<value xml:lang="zh-TW"><![CDATA[登入後頁面轉向]]></value>
+		<value xml:lang="fr"><![CDATA[URL après la connexion]]></value>
+		<value xml:lang="ru"><![CDATA[URL после логин]]></value>
+		<value xml:lang="es"><![CDATA[URL después del inicio de sesión]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş yaptıktan sonraki URL]]></value>
+		<value xml:lang="vi"><![CDATA[URL sau khi đăng nhập]]></value>
+	</item>
+	<item name="after_logout_url">
+		<value xml:lang="ko"><![CDATA[로그아웃 후 이동할 URL]]></value>
+		<value xml:lang="en"><![CDATA[URL to redirect after Sign out]]></value>
+		<value xml:lang="jp"><![CDATA[ログアウト後、表示するページのURL]]></value>
+		<value xml:lang="zh-CN"><![CDATA[退出后页面转向]]></value>
+		<value xml:lang="zh-TW"><![CDATA[登出後頁面轉向]]></value>
+		<value xml:lang="fr"><![CDATA[URL après la déconnexion ]]></value>
+		<value xml:lang="ru"><![CDATA[URL после логаут]]></value>
+		<value xml:lang="es"><![CDATA[URL después de cerrar sesión]]></value>
+		<value xml:lang="tr"><![CDATA[Çıkış yaptıktan sonraki URL]]></value>
+		<value xml:lang="vi"><![CDATA[URL sau khi thoát]]></value>
+	</item>
+	<item name="redirect_url">
+		<value xml:lang="ko"><![CDATA[회원 가입 후 이동할 페이지]]></value>
+		<value xml:lang="en"><![CDATA[URL to redirect after Sign up]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録後、表示するページ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册会员后页面转向]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員註冊後頁面轉向]]></value>
+		<value xml:lang="fr"><![CDATA[URL après l'Inscription]]></value>
+		<value xml:lang="ru"><![CDATA[URL после регистрации]]></value>
+		<value xml:lang="es"><![CDATA[URL luego del registro]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş yaptıktan sonraki URL]]></value>
+		<value xml:lang="vi"><![CDATA[URL sau khi đăng kí]]></value>
+	</item>
+	<item name="agreement">
+		<value xml:lang="ko"><![CDATA[회원 가입 약관]]></value>
+		<value xml:lang="en"><![CDATA[Terms of Service]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録規約]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员注册条款]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員使用條款]]></value>
+		<value xml:lang="fr"><![CDATA[Accord de l'Inscription comme Membre]]></value>
+		<value xml:lang="ru"><![CDATA[Пользовательское соглашение о регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Acuerdo del registro del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üyelik Sözleşmesi]]></value>
+		<value xml:lang="vi"><![CDATA[Quy định sử dụng]]></value>
+	</item>
+	<item name="accept_agreement">
+		<value xml:lang="ko"><![CDATA[약관동의]]></value>
+		<value xml:lang="en"><![CDATA[Agree]]></value>
+		<value xml:lang="jp"><![CDATA[利用規約に同意する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[同意条款]]></value>
+		<value xml:lang="zh-TW"><![CDATA[同意條款]]></value>
+		<value xml:lang="fr"><![CDATA[D'accord]]></value>
+		<value xml:lang="ru"><![CDATA[Согласен]]></value>
+		<value xml:lang="es"><![CDATA[Acepto]]></value>
+		<value xml:lang="tr"><![CDATA[Kabul Et]]></value>
+		<value xml:lang="vi"><![CDATA[Đồng ý]]></value>
+	</item>
+	<item name="member_info">
+		<value xml:lang="ko"><![CDATA[회원 정보]]></value>
+		<value xml:lang="en"><![CDATA[User Info]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information de Membre]]></value>
+		<value xml:lang="ru"><![CDATA[Пользовательская информация]]></value>
+		<value xml:lang="es"><![CDATA[Información del Usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin cá nhân]]></value>
+	</item>
+	<item name="current_password">
+		<value xml:lang="ko"><![CDATA[현재 비밀번호]]></value>
+		<value xml:lang="en"><![CDATA[Current Password]]></value>
+		<value xml:lang="jp"><![CDATA[現在のパスワード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[当前密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[舊密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Mot de Passe courant]]></value>
+		<value xml:lang="ru"><![CDATA[Текущий пароль]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña actual]]></value>
+		<value xml:lang="tr"><![CDATA[Geçerli Şifre]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu hiện tại]]></value>
+	</item>
+	<item name="openid">
+		<value xml:lang="ko"><![CDATA[OpenID]]></value>
+		<value xml:lang="en"><![CDATA[OpenID]]></value>
+	</item>
+	<item name="allow_message">
+		<value xml:lang="ko"><![CDATA[쪽지 허용]]></value>
+		<value xml:lang="en"><![CDATA[Allow Messages]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージ許可]]></value>
+		<value xml:lang="zh-CN"><![CDATA[接收短消息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[接收短訊息]]></value>
+		<value xml:lang="ru"><![CDATA[Сообщения разрешены]]></value>
+		<value xml:lang="tr"><![CDATA[Mesajlaşmaya İzin Ver]]></value>
+		<value xml:lang="vi"><![CDATA[Nhận tin nhắn]]></value>
+	</item>
+	<item name="allow_message_type" type="array">
+		<item name="Y">
+			<value xml:lang="ko"><![CDATA[모두 허용]]></value>
+			<value xml:lang="en"><![CDATA[Allow All]]></value>
+			<value xml:lang="jp"><![CDATA[すべて許可]]></value>
+			<value xml:lang="zh-CN"><![CDATA[全部接收]]></value>
+			<value xml:lang="zh-TW"><![CDATA[全部允許]]></value>
+			<value xml:lang="ru"><![CDATA[Разрешено всем]]></value>
+			<value xml:lang="tr"><![CDATA[Tümüne İzin Ver]]></value>
+			<value xml:lang="vi"><![CDATA[Tất cả]]></value>
+		</item>
+		<item name="F">
+			<value xml:lang="ko"><![CDATA[등록된 친구들만 허용]]></value>
+			<value xml:lang="en"><![CDATA[Allow for Friends only]]></value>
+			<value xml:lang="jp"><![CDATA[登録した友達のみ許可]]></value>
+			<value xml:lang="zh-CN"><![CDATA[拒收]]></value>
+			<value xml:lang="zh-TW"><![CDATA[允許好友]]></value>
+			<value xml:lang="ru"><![CDATA[Разрешено только зарегистрированным друзьям]]></value>
+			<value xml:lang="tr"><![CDATA[Arkadaşlara İzin Ver]]></value>
+			<value xml:lang="vi"><![CDATA[Chỉ của bạn bè]]></value>
+		</item>
+		<item name="N">
+			<value xml:lang="ko"><![CDATA[모두 금지]]></value>
+			<value xml:lang="en"><![CDATA[Reject All]]></value>
+			<value xml:lang="jp"><![CDATA[すべて禁止]]></value>
+			<value xml:lang="zh-CN"><![CDATA[只允许好友]]></value>
+			<value xml:lang="zh-TW"><![CDATA[全部禁止]]></value>
+			<value xml:lang="ru"><![CDATA[Запрещено всем]]></value>
+			<value xml:lang="tr"><![CDATA[Tümünü Geri Çevir]]></value>
+			<value xml:lang="vi"><![CDATA[Từ chối tất cả]]></value>
+		</item>
+	</item>
+	<item name="about_allow_message">
+		<value xml:lang="ko"><![CDATA[쪽지 허용 방법 및 대상을 지정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may allow or reject messages.]]></value>
+		<value xml:lang="jp"><![CDATA[メッセージの許可タイプ及び対象を設定します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定接收短消息方法及对象。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可選擇是否接收短訊息。]]></value>
+		<value xml:lang="fr"><![CDATA[쪽지 허용 방법 및 대상을 지정할 수 있습니다]]></value>
+		<value xml:lang="ru"><![CDATA[쪽지 허용 방법 및 대상을 지정할 수 있습니다]]></value>
+		<value xml:lang="es"><![CDATA[쪽지 허용 방법 및 대상을 지정할 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Mesajlaşmaya izin verebilir/reddedebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chấp nhận hoặc từ chối những tin nhắn.]]></value>
+	</item>
+	<item name="logged_users">
+		<value xml:lang="ko"><![CDATA[현재 접속자]]></value>
+		<value xml:lang="en"><![CDATA[Logged on Users]]></value>
+		<value xml:lang="jp"><![CDATA[現在ログイン中の会員]]></value>
+		<value xml:lang="zh-CN"><![CDATA[在线用户]]></value>
+		<value xml:lang="zh-TW"><![CDATA[線上會員]]></value>
+		<value xml:lang="fr"><![CDATA[Logged Users]]></value>
+		<value xml:lang="ru"><![CDATA[Logged Users]]></value>
+		<value xml:lang="es"><![CDATA[Logged Users]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş yapmış Kullanıcılar]]></value>
+		<value xml:lang="vi"><![CDATA[Thành viên đăng nhập]]></value>
+	</item>
+	<item name="webmaster_name">
+		<value xml:lang="ko"><![CDATA[웹마스터 이름]]></value>
+		<value xml:lang="en"><![CDATA[Webmaster Name]]></value>
+		<value xml:lang="jp"><![CDATA[ウェブマスターの名前]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理员名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Webmestre]]></value>
+		<value xml:lang="ru"><![CDATA[Имя веб-мастера]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del Webmaster]]></value>
+		<value xml:lang="tr"><![CDATA[Webmaster İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Webmaster]]></value>
+	</item>
+	<item name="webmaster_email">
+		<value xml:lang="ko"><![CDATA[웹마스터 메일주소]]></value>
+		<value xml:lang="en"><![CDATA[Webmaster Email]]></value>
+		<value xml:lang="jp"><![CDATA[ウェブマスターのメールアドレス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理员电子邮件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員電子郵件]]></value>
+		<value xml:lang="fr"><![CDATA[Mél de Webmestre]]></value>
+		<value xml:lang="ru"><![CDATA[Email веб-мастера]]></value>
+		<value xml:lang="es"><![CDATA[Correo electrónico Webmaster]]></value>
+		<value xml:lang="tr"><![CDATA[Webmaster E-postası]]></value>
+		<value xml:lang="vi"><![CDATA[ Email Webmaster]]></value>
+	</item>
+	<item name="about_keep_signed">
+		<value xml:lang="ko"><![CDATA[브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다.\n\n로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다.\n\n단, 게임방, 학교 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[You will be still signed in even when the browser is closed.\n\nIt is not recommended to use this if you are using a public computer, for your personal information could be violated.]]></value>
+		<value xml:lang="jp"><![CDATA[ブラウザを閉じてもログイン状態が維持されます。\n\nログイン維持機能を利用すると、次回からログインする必要がありません。\n\nただし、インターネットカフェ、学校など公共場所で利用する場合、個人情報が流出する恐れがありますので、必ずログアウトしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[关闭浏览器后也将维持登录状态。\n\n使用自动登录功能，可解决每次访问都要输入用户名及密码的麻烦。\n\n为防止个人信息泄露，在网吧，学校等公共场所请务必要确认解除登录状态。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關閉瀏覽器後也將維持登入狀態。\n\n使用此功能，可解決每次訪問都要輸入帳號及密碼的麻煩。\n\n為防止個人資料洩露，在網咖，學校等公共場所，請務必要確認解除登入狀態。]]></value>
+		<value xml:lang="fr"><![CDATA[Malgré que le navigateur est fermé, votre session peut rester ouverte. \n\nSi vous utilisez cette fonction sur l'ordinateur publique, vos informations privé peut être exposé. Nous vous recommandons de ne pas utiliser cette fonctions sur l'ordinateur publique.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы будете в состоянии логин, даже при закрытии окна браузера.\n\nЕсли вы пользуетесь общественным компьютером, сделайте выход в целях сохранения персональных данных]]></value>
+		<value xml:lang="es"><![CDATA[브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다.\n\n로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다.\n\n단, 게임방, 학교 등 공공장소에서 이용시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요]]></value>
+		<value xml:lang="tr"><![CDATA[Tarayıcıyı kapatsanız da sisteme bağlı kalacaksınız.\n\nEğer ortak bir bilgisayar kullanıyorsanız, kişisel bilgilerinizin gizliliği için bunu önermiyoruz]]></value>
+		<value xml:lang="vi"><![CDATA[Mặc dù tắt trình duyệt nhưng thông tin đăng nhập của bạn vẫn được lưu lại trên máy tính này.\n\nNếu bạn sử dụng máy tính dùng chung, người khác cũng có thể đăng nhập dưới tên truy cập của bạn. Vì vậy chức năng này không nên sử dụng nếu máy tính này không phải của riêng bạn!]]></value>
+	</item>
+	<item name="about_keep_warning">
+		<value xml:lang="ko"><![CDATA[브라우저를 닫더라도 로그인이 계속 유지될 수 있습니다. 로그인 유지 기능을 사용할 경우 다음 접속부터는 로그인을 하실 필요가 없습니다. 단, 게임방, 학교 등 공공장소에서 이용 시 개인정보가 유출될 수 있으니 꼭 로그아웃을 해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[You will be still signed in even when the browser is closed. It is not recommended to use this if you are using a public computer, for your personal information could be violated]]></value>
+		<value xml:lang="jp"><![CDATA[ブラウザを閉じてもログイン状態が維持されます。\n\nログイン維持機能を利用すると、次回からログインする必要がありません。 ただし、インターネットカフェ、学校など公共場所で利用する場合、個人情報が流出する恐れがありますので、必ずログアウトしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[关闭浏览器后也将维持登录状态。\n\n使用自动登录功能，可解决每次访问都要输入用户名及密码的麻烦。 为防止个人信息泄露，在网吧，学校等公共场所请务必要确认解除登录状态。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關閉瀏覽器後也將維持登入狀態。使用此功能，可解決每次訪問都要輸入帳號及密碼的麻煩。為防止個人資料洩露，在網咖，學校等公共場所，請務必要確認解除登入狀態。]]></value>
+		<value xml:lang="fr"><![CDATA[Malgré que le navigateur est fermé, votre session peut rester ouverte. Si vous utilisez cette fonction sur l'ordinateur publique, vos informations privé peut être exposé. Nous vous recommandons de ne pas utiliser cette fonctions sur l'ordinateur publique.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы будете в состоянии логин, даже при закрытии окна браузера.Если вы пользуетесь общественным компьютером, сделайте выход в целях сохранения персональных данных]]></value>
+		<value xml:lang="tr"><![CDATA[Tarayıcıyı kapatsanız da sisteme bağlı kalacaksınız. Eğer ortak bir bilgisayar kullanıyorsanız, kişisel bilgilerinizin gizliliği için bunu önermiyoruz]]></value>
+		<value xml:lang="vi"><![CDATA[Mặc dù tắt trình duyệt nhưng thông tin đăng nhập của bạn vẫn được lưu lại trên máy tính này. Nếu bạn sử dụng máy tính dùng chung, người khác cũng có thể đăng nhập dưới tên truy cập của bạn. Vì vậy chức năng này không nên sử dụng nếu máy tính này không phải của riêng bạn!]]></value>
+	</item>
+	<item name="about_webmaster_name">
+		<value xml:lang="ko"><![CDATA[인증 메일이나 기타 사이트 관리 시 사용될 웹마스터의 이름을 입력해주세요. (기본 : webmaster)]]></value>
+		<value xml:lang="en"><![CDATA[Please enter webmaster's name which will be used for verification mails or other site administration. (default : webmaster).]]></value>
+		<value xml:lang="jp"><![CDATA[確認メール、またはサイト管理時に使用されるウェブマスターの名前を入力してください（デフォルト : webmaster）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入认证所需的电子邮件地址或管理其他网站时要使用的网站管理员名称。(默认 : webmaster)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入認證所需的電子郵件地址或管理其他網站時要使用的網站管理員名稱。(預設 : webmaster)]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le nom de webmestre qui va être utilisé pour le mél de certification ou l'autre administration du site. (défaut : webmestre)]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите имя вебмастера, которое будет использоваться для авторизационных писем или другого адиминистрирования сайта. (по умолчанию : webmaster)]]></value>
+		<value xml:lang="es"><![CDATA[Por favor, webmaster de entrada el nombre que se utilizará para la autenticación de los correos u otros sitio de la administración. (Por defecto: webmaster)]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen onay maillerinde veya site yönetiminde kullanılacak webmaster ismini giriniz. (varsayılan : webmaster)]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập tên của Webmaster để nhận Email và quản lý. (Mặc định: webmaster)]]></value>
+	</item>
+	<item name="about_webmaster_email">
+		<value xml:lang="ko"><![CDATA[웹마스터의 메일 주소를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter webmaster's email address.]]></value>
+		<value xml:lang="jp"><![CDATA[ウェブマスターのメールアドレスを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入网站管理员的电子邮件地址。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入網站管理員的電子郵件地址。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez l'adresse du mél de webmestre, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите email адрес вебмастера.]]></value>
+		<value xml:lang="es"><![CDATA[Introduzca la dirección de correo electrónico webmaster.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen webmaster e-posta adresini giriniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập Email của Webmaster.]]></value>
+	</item>
+	<item name="search_target_list" type="array">
+		<item name="email_address">
+			<value xml:lang="ko"><![CDATA[이메일]]></value>
+			<value xml:lang="en"><![CDATA[Email Address]]></value>
+			<value xml:lang="jp"><![CDATA[メールアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[邮箱地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[電子郵件]]></value>
+			<value xml:lang="fr"><![CDATA[Mél]]></value>
+			<value xml:lang="ru"><![CDATA[Email]]></value>
+			<value xml:lang="es"><![CDATA[Dirección de Email]]></value>
+			<value xml:lang="tr"><![CDATA[E-posta Adresi]]></value>
+			<value xml:lang="vi"><![CDATA[Địa chỉ Email]]></value>
+		</item>
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[가입일시]]></value>
+			<value xml:lang="en"><![CDATA[Sign up Date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[注册日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[註冊日期]]></value>
+			<value xml:lang="fr"><![CDATA[Jour d'Inscription]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации]]></value>
+			<value xml:lang="es"><![CDATA[Fecha del registro]]></value>
+			<value xml:lang="tr"><![CDATA[Kayıt Tarihi]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày đăng kí]]></value>
+		</item>
+		<item name="regdate_more">
+			<value xml:lang="ko"><![CDATA[가입일시(이상)]]></value>
+			<value xml:lang="en"><![CDATA[Sign up Date (more)]]></value>
+			<value xml:lang="jp"><![CDATA[登録日(以上)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[注册日期(以上)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[註冊日期(以上)]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации(more)]]></value>
+			<value xml:lang="tr"><![CDATA[Kayıt Tarihi (detaylı)]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày đăng kí nhiều nhất]]></value>
+		</item>
+		<item name="regdate_less">
+			<value xml:lang="ko"><![CDATA[가입일시(이하)]]></value>
+			<value xml:lang="en"><![CDATA[Sign up Date (less)]]></value>
+			<value xml:lang="jp"><![CDATA[登録日(以下)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[注册日期(以下)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[註冊日期(以下)]]></value>
+			<value xml:lang="ru"><![CDATA[Дата регистрации(less)]]></value>
+			<value xml:lang="tr"><![CDATA[Kayıt Tarihi (basit)]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày đăng kí ít nhất]]></value>
+		</item>
+		<item name="last_login">
+			<value xml:lang="ko"><![CDATA[최근 로그인 일시]]></value>
+			<value xml:lang="en"><![CDATA[Last Sign in Date]]></value>
+			<value xml:lang="jp"><![CDATA[最終ログイン]]></value>
+			<value xml:lang="zh-CN"><![CDATA[最后登录]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最近登入]]></value>
+			<value xml:lang="fr"><![CDATA[Jour de la connexion dernière]]></value>
+			<value xml:lang="ru"><![CDATA[Дата последнего входа]]></value>
+			<value xml:lang="es"><![CDATA[Fecha de su última conección]]></value>
+			<value xml:lang="tr"><![CDATA[Son Giriş Tarihi]]></value>
+			<value xml:lang="vi"><![CDATA[Lần cuối đăng nhập]]></value>
+		</item>
+		<item name="last_login_more">
+			<value xml:lang="ko"><![CDATA[최근 로그인 일시(이상)]]></value>
+			<value xml:lang="en"><![CDATA[Last Sign in Date (more)]]></value>
+			<value xml:lang="jp"><![CDATA[最終ログイン日(以上)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[最后登录(以上)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最近登入(以上)]]></value>
+			<value xml:lang="fr"><![CDATA[최근로그인일시(이상)]]></value>
+			<value xml:lang="es"><![CDATA[최근로그인일시(이상)]]></value>
+			<value xml:lang="tr"><![CDATA[Son Giriş Tarihi (detaylı)]]></value>
+			<value xml:lang="vi"><![CDATA[Đăng nhập nhiều nhất]]></value>
+		</item>
+		<item name="last_login_less">
+			<value xml:lang="ko"><![CDATA[최근 로그인 일시(이하)]]></value>
+			<value xml:lang="en"><![CDATA[Last Sign in Date (less)]]></value>
+			<value xml:lang="jp"><![CDATA[最終ログイン日(以下)]]></value>
+			<value xml:lang="zh-CN"><![CDATA[最后登录시(以下)]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最近登入(以下)]]></value>
+			<value xml:lang="fr"><![CDATA[최근로그인일시(이하)]]></value>
+			<value xml:lang="es"><![CDATA[최근로그인일시(이하)]]></value>
+			<value xml:lang="tr"><![CDATA[Son Giriş Tarihi (basit)]]></value>
+			<value xml:lang="vi"><![CDATA[Đăng nhập ít nhất]]></value>
+		</item>
+		<item name="extra_vars">
+			<value xml:lang="ko"><![CDATA[확장변수]]></value>
+			<value xml:lang="en"><![CDATA[Extra Vars]]></value>
+			<value xml:lang="jp"><![CDATA[拡張変数]]></value>
+			<value xml:lang="zh-CN"><![CDATA[扩展信息]]></value>
+			<value xml:lang="zh-TW"><![CDATA[延伸變數]]></value>
+			<value xml:lang="fr"><![CDATA[Variables additionnels ]]></value>
+			<value xml:lang="ru"><![CDATA[Экстра перем.]]></value>
+			<value xml:lang="es"><![CDATA[Variables Extra]]></value>
+			<value xml:lang="tr"><![CDATA[Fazladan Çeş.]]></value>
+			<value xml:lang="vi"><![CDATA[Thông tin bổ xung]]></value>
+		</item>
+	</item>
+	<item name="cmd_login">
+		<value xml:lang="ko"><![CDATA[로그인]]></value>
+		<value xml:lang="en"><![CDATA[Sign In]]></value>
+		<value xml:lang="jp"><![CDATA[ログイン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[登录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[登入]]></value>
+		<value xml:lang="fr"><![CDATA[Connexion]]></value>
+		<value xml:lang="ru"><![CDATA[Вход на сайт]]></value>
+		<value xml:lang="es"><![CDATA[Conectar]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş Yap]]></value>
+		<value xml:lang="vi"><![CDATA[Đăng nhập]]></value>
+	</item>
+	<item name="cmd_logout">
+		<value xml:lang="ko"><![CDATA[로그아웃]]></value>
+		<value xml:lang="en"><![CDATA[Sign Out]]></value>
+		<value xml:lang="jp"><![CDATA[ログアウト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[退出]]></value>
+		<value xml:lang="zh-TW"><![CDATA[登出]]></value>
+		<value xml:lang="fr"><![CDATA[Déconnexion]]></value>
+		<value xml:lang="ru"><![CDATA[Выход]]></value>
+		<value xml:lang="es"><![CDATA[Desconectar]]></value>
+		<value xml:lang="tr"><![CDATA[Çıkış Yap]]></value>
+		<value xml:lang="vi"><![CDATA[Thoát]]></value>
+	</item>
+	<item name="cmd_signup">
+		<value xml:lang="ko"><![CDATA[회원 가입]]></value>
+		<value xml:lang="en"><![CDATA[Sign Up]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[新会员注册]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員註冊]]></value>
+		<value xml:lang="fr"><![CDATA[Inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Регистрация]]></value>
+		<value xml:lang="es"><![CDATA[Registrar]]></value>
+		<value xml:lang="tr"><![CDATA[Kaydol]]></value>
+		<value xml:lang="vi"><![CDATA[Đăng kí]]></value>
+	</item>
+	<item name="cmd_site_signup">
+		<value xml:lang="ko"><![CDATA[가입]]></value>
+		<value xml:lang="en"><![CDATA[Sign Up]]></value>
+		<value xml:lang="jp"><![CDATA[登録]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册]]></value>
+		<value xml:lang="zh-TW"><![CDATA[加入]]></value>
+		<value xml:lang="fr"><![CDATA[Join]]></value>
+		<value xml:lang="ru"><![CDATA[Регистрация]]></value>
+		<value xml:lang="es"><![CDATA[Join]]></value>
+		<value xml:lang="tr"><![CDATA[Kaydol]]></value>
+		<value xml:lang="vi"><![CDATA[Đăng kí]]></value>
+	</item>
+	<item name="cmd_modify_member_info">
+		<value xml:lang="ko"><![CDATA[회원정보 변경]]></value>
+		<value xml:lang="en"><![CDATA[Change Member Info]]></value>
+		<value xml:lang="jp"><![CDATA[会員番号変更]]></value>
+	</item>
+	<item name="cmd_modify_member_password">
+		<value xml:lang="ko"><![CDATA[비밀번호 변경]]></value>
+		<value xml:lang="en"><![CDATA[Change Password]]></value>
+		<value xml:lang="jp"><![CDATA[パスワード変更]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改密碼]]></value>
+		<value xml:lang="fr"><![CDATA[Modifier le Mot de Passe]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить пароль]]></value>
+		<value xml:lang="es"><![CDATA[Cambiar la contraseña]]></value>
+		<value xml:lang="tr"><![CDATA[Şifreyi Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa đổi mật khẩu]]></value>
+	</item>
+	<item name="cmd_view_member_info">
+		<value xml:lang="ko"><![CDATA[회원 정보 보기]]></value>
+		<value xml:lang="en"><![CDATA[View Member Info]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報確認]]></value>
+		<value xml:lang="zh-CN"><![CDATA[个人资料]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員資料]]></value>
+		<value xml:lang="fr"><![CDATA[Voir Mon Information]]></value>
+		<value xml:lang="ru"><![CDATA[Личная информация]]></value>
+		<value xml:lang="es"><![CDATA[Información del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Xem thông tin cá nhân]]></value>
+	</item>
+	<item name="cmd_leave">
+		<value xml:lang="ko"><![CDATA[탈퇴]]></value>
+		<value xml:lang="en"><![CDATA[Delete Account]]></value>
+		<value xml:lang="jp"><![CDATA[退会]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注销]]></value>
+		<value xml:lang="zh-TW"><![CDATA[退出]]></value>
+		<value xml:lang="fr"><![CDATA[Quitter]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить аккаунт]]></value>
+		<value xml:lang="es"><![CDATA[Dejar de ser usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Ayrıl]]></value>
+		<value xml:lang="vi"><![CDATA[Từ bỏ]]></value>
+	</item>
+	<item name="cmd_find_member_account">
+		<value xml:lang="ko"><![CDATA[아이디/비밀번호 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find Account Info]]></value>
+		<value xml:lang="jp"><![CDATA[IDとパスワードのリマインダー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查找用户名/密码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[查詢帳號/密碼]]></value>
+		<value xml:lang="fr"><![CDATA[J'ai perdu le compte / le mot de passe]]></value>
+		<value xml:lang="ru"><![CDATA[Найти ID/пароль]]></value>
+		<value xml:lang="tr"><![CDATA[Hesap Bilgisi Bul]]></value>
+		<value xml:lang="vi"><![CDATA[Lấy lại thông tin]]></value>
+	</item>
+	<item name="cmd_resend_auth_mail">
+		<value xml:lang="ko"><![CDATA[인증 메일 재발송]]></value>
+		<value xml:lang="en"><![CDATA[Request for Activation Mail]]></value>
+		<value xml:lang="jp"><![CDATA[認証メール再申請]]></value>
+		<value xml:lang="zh-CN"><![CDATA[重新发送认证邮件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重寄認證郵件]]></value>
+		<value xml:lang="ru"><![CDATA[Послать email для авторизации]]></value>
+		<value xml:lang="tr"><![CDATA[Etkinleştirme Maili Talebinde Bulun]]></value>
+		<value xml:lang="vi"><![CDATA[Xác nhận lại Email]]></value>
+	</item>
+	<item name="cmd_member_list">
+		<value xml:lang="ko"><![CDATA[회원 목록]]></value>
+		<value xml:lang="en"><![CDATA[Member List]]></value>
+		<value xml:lang="jp"><![CDATA[会員リスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste de Membres]]></value>
+		<value xml:lang="ru"><![CDATA[Список пользователей]]></value>
+		<value xml:lang="es"><![CDATA[Lista de los Usuarios]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách thành viên]]></value>
+	</item>
+	<item name="cmd_module_config">
+		<value xml:lang="ko"><![CDATA[기본 설정]]></value>
+		<value xml:lang="en"><![CDATA[Default Setting]]></value>
+		<value xml:lang="jp"><![CDATA[基本設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[常规选项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[基本設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration par Défaut]]></value>
+		<value xml:lang="ru"><![CDATA[Стандартные настройки]]></value>
+		<value xml:lang="es"><![CDATA[Configuración predefinidos]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan Ayar]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập mặc định]]></value>
+	</item>
+	<item name="cmd_member_group">
+		<value xml:lang="ko"><![CDATA[그룹 관리]]></value>
+		<value xml:lang="en"><![CDATA[Member Groups]]></value>
+		<value xml:lang="jp"><![CDATA[グループ管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer des Groupes]]></value>
+		<value xml:lang="ru"><![CDATA[Управление группами]]></value>
+		<value xml:lang="es"><![CDATA[Manejo del grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Grupları]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý nhóm]]></value>
+	</item>
+	<item name="cmd_send_mail">
+		<value xml:lang="ko"><![CDATA[메일발송]]></value>
+		<value xml:lang="en"><![CDATA[Send Mail]]></value>
+		<value xml:lang="jp"><![CDATA[メール送信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送邮件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送郵件]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyer des Méls]]></value>
+		<value xml:lang="ru"><![CDATA[Отправить письмо]]></value>
+		<value xml:lang="es"><![CDATA[Enviar Email]]></value>
+		<value xml:lang="tr"><![CDATA[Mail Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi Email]]></value>
+	</item>
+	<item name="cmd_manage_id">
+		<value xml:lang="ko"><![CDATA[금지 아이디 관리]]></value>
+		<value xml:lang="en"><![CDATA[Prohibited IDs]]></value>
+		<value xml:lang="jp"><![CDATA[禁止ID 管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止用户名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁止帳號管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer les Comptes Interdits]]></value>
+		<value xml:lang="ru"><![CDATA[Управление запрещенными ID]]></value>
+		<value xml:lang="es"><![CDATA[Manejo de ID prohibidos]]></value>
+		<value xml:lang="tr"><![CDATA[Yasaklanmış Kimlikler]]></value>
+		<value xml:lang="vi"><![CDATA[Tên sử dụng cấm đăng kí]]></value>
+	</item>
+	<item name="cmd_manage_form">
+		<value xml:lang="ko"><![CDATA[가입 폼 관리]]></value>
+		<value xml:lang="en"><![CDATA[Signup Form]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録フォーム管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[扩展注册表单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊表單管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer la Forme d'Inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Управление формой регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Manejo de forma del registro]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt Formu]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý mẫu đăng kí]]></value>
+	</item>
+	<item name="cmd_view_own_document">
+		<value xml:lang="ko"><![CDATA[작성 글 보기]]></value>
+		<value xml:lang="en"><![CDATA[Written Articles]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み履歴]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员话题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發表主題]]></value>
+		<value xml:lang="fr"><![CDATA[Voir les Articles écrits]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть написанные записи]]></value>
+		<value xml:lang="es"><![CDATA[Ver documentos escritos]]></value>
+		<value xml:lang="tr"><![CDATA[Yazılmış Makaleler]]></value>
+		<value xml:lang="vi"><![CDATA[Bài gửi]]></value>
+	</item>
+	<item name="cmd_manage_member_info">
+		<value xml:lang="ko"><![CDATA[회원 정보 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Member Info]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理会员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理會員資料]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить информацию пользователя]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Bilgisini Yönet]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý thông tin thành viên]]></value>
+	</item>
+	<item name="cmd_trace_document">
+		<value xml:lang="ko"><![CDATA[작성글 추적]]></value>
+		<value xml:lang="en"><![CDATA[Trace Written Articles]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みの追跡]]></value>
+		<value xml:lang="zh-CN"><![CDATA[主题追踪]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主題追蹤]]></value>
+		<value xml:lang="fr"><![CDATA[Tracer les Articles écrits]]></value>
+		<value xml:lang="tr"><![CDATA[Yazılmış Makalelerini Gör]]></value>
+		<value xml:lang="vi"><![CDATA[Theo dõi chủ đề]]></value>
+	</item>
+	<item name="cmd_trace_comment">
+		<value xml:lang="ko"><![CDATA[작성 댓글 추적]]></value>
+		<value xml:lang="en"><![CDATA[Trace Written Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメント追跡]]></value>
+		<value xml:lang="zh-CN"><![CDATA[评论追踪]]></value>
+		<value xml:lang="zh-TW"><![CDATA[評論追蹤]]></value>
+		<value xml:lang="fr"><![CDATA[Tracer les Commentaires écrits]]></value>
+		<value xml:lang="tr"><![CDATA[Yazılmış Yorumlarını Gör]]></value>
+		<value xml:lang="vi"><![CDATA[Theo dõi thảo luận]]></value>
+	</item>
+	<item name="cmd_view_scrapped_document">
+		<value xml:lang="ko"><![CDATA[스크랩 보기]]></value>
+		<value xml:lang="en"><![CDATA[Scraps]]></value>
+		<value xml:lang="jp"><![CDATA[スクラップ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[我的收藏]]></value>
+		<value xml:lang="zh-TW"><![CDATA[我的收藏]]></value>
+		<value xml:lang="fr"><![CDATA[Voir les Coupures]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть Scraps]]></value>
+		<value xml:lang="es"><![CDATA[Ver Scraps]]></value>
+		<value xml:lang="tr"><![CDATA[Hasarlılar]]></value>
+		<value xml:lang="vi"><![CDATA[Phân loại]]></value>
+	</item>
+	<item name="cmd_view_saved_document">
+		<value xml:lang="ko"><![CDATA[저장함 보기]]></value>
+		<value xml:lang="en"><![CDATA[Saved Articles]]></value>
+		<value xml:lang="jp"><![CDATA[保存ドキュメント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[临时保存箱]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暫存主題]]></value>
+		<value xml:lang="fr"><![CDATA[Voir les Articles conservés]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть сохраненные записи]]></value>
+		<value xml:lang="es"><![CDATA[Ver artículos guardados]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıtlı Makaleler]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết đã lưu]]></value>
+	</item>
+	<item name="cmd_send_email">
+		<value xml:lang="ko"><![CDATA[메일 보내기]]></value>
+		<value xml:lang="en"><![CDATA[Send Mail]]></value>
+		<value xml:lang="jp"><![CDATA[メール送信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送邮件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送郵件]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyer des Méls]]></value>
+		<value xml:lang="ru"><![CDATA[Отправить письмо]]></value>
+		<value xml:lang="es"><![CDATA[Enviar Email]]></value>
+		<value xml:lang="tr"><![CDATA[Mail Gönder]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi eMail]]></value>
+	</item>
+	<item name="msg_email_not_exists">
+		<value xml:lang="ko"><![CDATA[이메일 주소가 존재하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered an invalid email address.]]></value>
+		<value xml:lang="jp"><![CDATA[登録されたメールアドレスがありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有找到您输入的Email地址。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到您輸入的郵件地址。]]></value>
+		<value xml:lang="fr"><![CDATA[L'adresse mél n'existe pas.]]></value>
+		<value xml:lang="ru"><![CDATA[Email адрес не существует]]></value>
+		<value xml:lang="es"><![CDATA[Email address doesn't exists]]></value>
+		<value xml:lang="tr"><![CDATA[Geçerli olmayan bir e-posta adresi girdiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn đã nhập sai Email]]></value>
+	</item>
+	<item name="msg_alreay_scrapped">
+		<value xml:lang="ko"><![CDATA[이미 스크랩된 게시물입니다.]]></value>
+		<value xml:lang="en"><![CDATA[This article is already scrapped.]]></value>
+		<value xml:lang="jp"><![CDATA[既にスクラップされたコンテンツです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已收藏的主题！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已收藏的主題！]]></value>
+		<value xml:lang="fr"><![CDATA[Cet article est déjà coupé.]]></value>
+		<value xml:lang="ru"><![CDATA[Эта статья уже в Scraps]]></value>
+		<value xml:lang="es"><![CDATA[Este documento ya esta hecho scrap]]></value>
+		<value xml:lang="tr"><![CDATA[Bu makale zaten hasarlı]]></value>
+		<value xml:lang="vi"><![CDATA[Bài viết đã được phân loại.]]></value>
+	</item>
+	<item name="msg_cart_is_null">
+		<value xml:lang="ko"><![CDATA[대상을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select the target.]]></value>
+		<value xml:lang="jp"><![CDATA[対象を選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择对象。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇對象。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez l'Objet, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите назначение]]></value>
+		<value xml:lang="es"><![CDATA[Seleciona el objetivo]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen hedefi seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng lựa chọn vị trí]]></value>
+	</item>
+	<item name="msg_checked_file_is_deleted">
+		<value xml:lang="ko"><![CDATA[%d개의 첨부 파일이 삭제되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d attached file(s) is(are) deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[%d個の添付ファイルが削除されました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已删除%d个附件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已刪除%d個附檔。]]></value>
+		<value xml:lang="fr"><![CDATA[%d fichier(s) attaché(s) est(sont) supprimé(s)]]></value>
+		<value xml:lang="ru"><![CDATA[%d вложенные файлы удалены]]></value>
+		<value xml:lang="es"><![CDATA[%d archivos adjuntos son eliminados]]></value>
+		<value xml:lang="tr"><![CDATA[%d isimli ek dosya silindi]]></value>
+		<value xml:lang="vi"><![CDATA[%d đính kèm đã được xóa.]]></value>
+	</item>
+	<item name="msg_find_account_title">
+		<value xml:lang="ko"><![CDATA[아이디/비밀번호 정보입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Account Info]]></value>
+		<value xml:lang="jp"><![CDATA[会員IDどパスワードの情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊資料。]]></value>
+		<value xml:lang="fr"><![CDATA[Information de compte]]></value>
+		<value xml:lang="ru"><![CDATA[Информация аккаунта]]></value>
+		<value xml:lang="tr"><![CDATA[Hesap Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin đăng kí tại Website http;//4all.kr]]></value>
+	</item>
+	<item name="msg_find_account_info">
+		<value xml:lang="ko"><![CDATA[요청하신 계정 정보는 아래와 같습니다.]]></value>
+		<value xml:lang="en"><![CDATA[This is requested account info.]]></value>
+		<value xml:lang="jp"><![CDATA[登録された会員情報は下記の通りです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您要查找的注册信息如下。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您要尋找的註冊資料如下。]]></value>
+		<value xml:lang="fr"><![CDATA[Voilà votre information de compte.]]></value>
+		<value xml:lang="ru"><![CDATA[Запрашиваемая информация аккаунта.]]></value>
+		<value xml:lang="es"><![CDATA[Esto se solicita la información de la cuenta]]></value>
+		<value xml:lang="tr"><![CDATA[Talep edilen hesap bilgisi.]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin tài khoản.]]></value>
+	</item>
+	<item name="msg_find_account_comment">
+		<value xml:lang="ko"><![CDATA[아래 링크를 클릭하시면 위에 적힌 비밀번호로 바뀌게 됩니다.<br />로그인 하신 후 비밀번호를 바꾸어주세요.]]></value>
+		<value xml:lang="en"><![CDATA[The password will be modified as the one above as you click the link below.<br />Please modify the password after login.]]></value>
+		<value xml:lang="jp"><![CDATA[下のリンクをクリックすると上のパスワードに変更されます。<br />ログインしてからパスワードを変更してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[点击下面的链接您的注册密码将更新为上述的系统自动生成密码。<br />请重新登录后把密码改为您所熟悉的密码。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[按底下的連結，您的註冊密碼將更新為上述系統自動建立的密碼。<br />請重新登入，將密碼更改為您想要的密碼。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Mot de Passe sera modifié comme celui ci-dessus si vous cliquez le lien ci-dessous.<br />Modifiez le Mot de Passe après ouvrir la connexion, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Кликните на ссылку ниже и пароль будет изменен на указанный вами.<br />Пожалуйста, измените пароль после входа на сайт]]></value>
+		<value xml:lang="es"><![CDATA[La contraseña se modificará para arriba al hacer clic en un enlace a continuación. <br /> Por favor, después de modificar la contraseña de acceso.]]></value>
+		<value xml:lang="tr"><![CDATA[Şifreniz aşağıdaki linke tıkladığınızda, yukardaki gibi değiştirilecektir.<br />Lütfen giriş yaptıktan sonra şifrenizi değiştiriniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Mật khẩu sẽ thay đổi khi bạn bấm vào đường Link này.<br />Xin vui lòng thay đổi mật khẩu sau khi đăng nhập!]]></value>
+	</item>
+	<item name="msg_confirm_account_title">
+		<value xml:lang="ko"><![CDATA[가입 인증 메일 입니다.]]></value>
+		<value xml:lang="en"><![CDATA[XE Account Activation]]></value>
+		<value xml:lang="jp"><![CDATA[確認メールです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员注册]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員註冊]]></value>
+		<value xml:lang="fr"><![CDATA[Mél à confirmer l'Authentification]]></value>
+		<value xml:lang="ru"><![CDATA[Письмо, подтверждающее регистрацию]]></value>
+		<value xml:lang="es"><![CDATA[가입 인증 메일 입니다]]></value>
+		<value xml:lang="tr"><![CDATA[XE Hesap Etkinleştirmesi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin đăng kí thành viên tại Website http://4all.kr]]></value>
+	</item>
+	<item name="msg_confirm_account_info">
+		<value xml:lang="ko"><![CDATA[가입하신 계정 정보는 아래와 같습니다.]]></value>
+		<value xml:lang="en"><![CDATA[This is your account information:]]></value>
+		<value xml:lang="jp"><![CDATA[作成した会員の情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您的注册信息如下:]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您的註冊資料如下:]]></value>
+		<value xml:lang="fr"><![CDATA[Voilà votre Information de l'inscription du Compte:]]></value>
+		<value xml:lang="ru"><![CDATA[Информация аккаунта при регистрации]]></value>
+		<value xml:lang="es"><![CDATA[가입하신 계정 정보는 아래와 같습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Hesap Bilginiz:]]></value>
+		<value xml:lang="vi"><![CDATA[Đây là thông tin bạn đã đăng kí tại Website http://4all.kr:]]></value>
+	</item>
+	<item name="msg_confirm_account_comment">
+		<value xml:lang="ko"><![CDATA[아래 링크를 클릭하시면 가입 인증이 이루어집니다.]]></value>
+		<value xml:lang="en"><![CDATA[Click on the following link to complete your account activation.]]></value>
+		<value xml:lang="jp"><![CDATA[下記のURLをクリックして会員登録手続きを完了してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请点击下面链接完成会员认证。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請按下面連結完成會員認證。]]></value>
+		<value xml:lang="fr"><![CDATA[Cliquez le lien de confirmation suivant pour compléter votre inscription.]]></value>
+		<value xml:lang="ru"><![CDATA[Подтвердите авторизацию, кликнув на ссылку ниже]]></value>
+		<value xml:lang="tr"><![CDATA[Hesabınızı etkinleştirmek için takip eden linke tıklayınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Bấm vào đường Link này để hoàn tất việc đăng kí.]]></value>
+	</item>
+	<item name="msg_auth_mail_sent">
+		<value xml:lang="ko"><![CDATA[%s 메일로 인증 정보를 담은 메일이 발송되었습니다. 메일을 확인하세요.]]></value>
+		<value xml:lang="en"><![CDATA[The activation mail has been sent to %s. Please check your mail.]]></value>
+		<value xml:lang="jp"><![CDATA[%s 宛に認証情報内容が送信されました。メールを確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已向%s发送了认证邮件。请确认！！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已向%s發送了認證郵件。請確認！！]]></value>
+		<value xml:lang="fr"><![CDATA[Le mél de certification a été envoyé à %s. Vérifiez votre mél.]]></value>
+		<value xml:lang="ru"><![CDATA[Письмо с регистрационной информацией отправлено для %s. Пожалуйста, проверьте Вашу почту]]></value>
+		<value xml:lang="es"><![CDATA[La autenticación de correo ha sido enviado a% s. Por favor, compruebe su correo.]]></value>
+		<value xml:lang="tr"><![CDATA[Etknileştirme maili %s adresine gönderildi. Lütfen mailinizi kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Email xác nhận đã được gửi đến %s. Xin vui lòng kiểm tra Inbox hoặc Bulk mail của bạn!]]></value>
+	</item>
+	<item name="msg_confirm_mail_sent">
+		<value xml:lang="ko"><![CDATA[%s 메일로 가입 인증 메일이 발송되었습니다. 메일을 확인하세요.]]></value>
+		<value xml:lang="en"><![CDATA[We have just sent the activation email to %s. Please check your mail.]]></value>
+		<value xml:lang="jp"><![CDATA[%s 宛に確認メールを送信しました。メールを確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已向%s发送了认证邮件。请确认！！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已向%s發送了認證郵件。請確認！！]]></value>
+		<value xml:lang="fr"><![CDATA[On a justement envoyé un mél de confirmation à %s. Cliquez sur le lien de confirmation dans le mél pour compléter l'inscription.]]></value>
+		<value xml:lang="ru"><![CDATA[Письмо для авторизации отправлено для %s. Пожалуйста, проверьте Вашу почту]]></value>
+		<value xml:lang="tr"><![CDATA[%s adresine etkinleştirme maili gönderdik. Lütfen mailinizi kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Chúng tôi đã gửi Email xác nhận đến %s. Xin vui lòng bấm vào Link đi kèm trong Email để hoàn tất việc đăng kí!]]></value>
+	</item>
+	<item name="msg_invalid_auth_key">
+		<value xml:lang="ko"><![CDATA[잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[This is an invalid request of verification.<br />Please retry finding account info or contact the administrator.]]></value>
+		<value xml:lang="jp"><![CDATA[正しくないアカウントの認証要求です。<br />IDとパスワードの検索を行うか、サイト管理者にアカウント情報をお問い合わせください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[错误的注册信息请求。<br />请重新查找用户名及密码， 或联系管理员。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[錯誤的註冊資料請求。<br />請重新尋找帳號及密碼，或聯繫管理員。]]></value>
+		<value xml:lang="fr"><![CDATA[Cette Requête à Certifier est invalide.<br />Essayez encore une fois à retrouver votre information de compte ou contactez l'administrateur.]]></value>
+		<value xml:lang="ru"><![CDATA[Неверный запрос на авторизацию.<br />Пожалуйста, попытайтеть найти информацию аккаунта или свяжитесь с администратором.]]></value>
+		<value xml:lang="es"><![CDATA[잘못된 계정 인증 요청입니다.<br />아이디/비밀번호 찾기를 다시 하시거나 사이트 관리자에게 계정 정보를 문의해주세요]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz doğrulama talebi.<br />Lütfen hesap bilgisini tekrar bulmayı deneyin ya da yöneticilerle iletişime geçin.]]></value>
+		<value xml:lang="vi"><![CDATA[Xác nhận không hợp lệ.<br />Xin vui lòng kiểm tra lại hoặc liên hệ với Webmaster để được hỗ trợ!]]></value>
+	</item>
+	<item name="msg_success_authed">
+		<value xml:lang="ko"><![CDATA[인증이 정상적으로 되어 로그인 처리가 되었습니다.\n꼭 인증 메일에 표시된 비밀번호를 이용하여 원하시는 비밀번호로 변경하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Your account has been successfully activated and logged on.\n Please modify the password to your own one with the password in the mail.]]></value>
+		<value xml:lang="jp"><![CDATA[認証が正常に行われ、ログインできました。\n必ず確認メールに記載されたパスワードを利用してお好みのパスワードに変更してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[新的注册信息已得到认证。请用邮件中的新密码修改您要想使用的密码。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新註冊的資料已得到認證。請用郵件中的新密碼修改成您要想使用的密碼。]]></value>
+		<value xml:lang="fr"><![CDATA[Votre compte a été certifié avec succès et ouvert une session. \n Modifiez le Mot de Passe après vous ouvrez une session en utilisant le Mot de Passe dans le mél.]]></value>
+		<value xml:lang="ru"><![CDATA[Ваш аккаунт был успешно авторизован.\nВход произведен. Пожалуйста, измените пароль на Ваш собственный.]]></value>
+		<value xml:lang="es"><![CDATA[Esto no es válido solicitud de autenticación. <br /> Por favor, inténtelo encontrar información de la cuenta o póngase en contacto con el administrador.]]></value>
+		<value xml:lang="tr"><![CDATA[Hesabınız başarıyla etkinleştirildi ve giriş yapıldı.\n Lütfen mailinize gelen şifreyi kullanarak yeni şifreinizi oluşturunuz.]]></value>
+		<value xml:lang="vi"><![CDATA[Tài khoản của bạn đã được xác nhận.\n Xin vui lòng thay đổi mật khẩu khác với mật khẩu trong Email và dễ nhớ hơn!]]></value>
+	</item>
+	<item name="msg_success_confirmed">
+		<value xml:lang="ko"><![CDATA[가입 인증이 정상적으로 처리 되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Your account has been activated successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録、有難うございます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册信息已成功激活！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊資料已成功確認！]]></value>
+		<value xml:lang="fr"><![CDATA[L'authentification est complétée avec succèss.]]></value>
+		<value xml:lang="ru"><![CDATA[Авторизация Вашего аккаунта прошла успешно]]></value>
+		<value xml:lang="tr"><![CDATA[Hesabınız başarıyla etkinleştirildi.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã xác nhận thành công.<br />Xin cảm ơn đã tham gia cùng chúng tôi!]]></value>
+	</item>
+	<item name="msg_new_member">
+		<value xml:lang="ko"><![CDATA[회원 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Member]]></value>
+		<value xml:lang="jp"><![CDATA[会員追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员注册]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員註冊]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un membre]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить пользователя]]></value>
+		<value xml:lang="es"><![CDATA[Agregar usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm thành viên]]></value>
+	</item>
+	<item name="msg_update_member">
+		<value xml:lang="ko"><![CDATA[회원 정보 수정]]></value>
+		<value xml:lang="en"><![CDATA[Modify User Info]]></value>
+		<value xml:lang="jp"><![CDATA[会員情報修正]]></value>
+		<value xml:lang="zh-CN"><![CDATA[修改会员信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改會員資料]]></value>
+		<value xml:lang="fr"><![CDATA[Modifier l'Information de Membre]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить информацию пользователя]]></value>
+		<value xml:lang="es"><![CDATA[Modificar información del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Bilgisini Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa đổi thông tin thành viên]]></value>
+	</item>
+	<item name="msg_leave_member">
+		<value xml:lang="ko"><![CDATA[회원 탈퇴]]></value>
+		<value xml:lang="en"><![CDATA[Delete Account]]></value>
+		<value xml:lang="jp"><![CDATA[会員退会]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注销会员]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員退出]]></value>
+		<value xml:lang="fr"><![CDATA[Sécession]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить аккаунт]]></value>
+		<value xml:lang="es"><![CDATA[Dejar de ser usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Ayrıl]]></value>
+		<value xml:lang="vi"><![CDATA[Loại bỏ]]></value>
+	</item>
+	<item name="msg_group_is_null">
+		<value xml:lang="ko"><![CDATA[등록된 그룹이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is no group.]]></value>
+		<value xml:lang="jp"><![CDATA[登録されたグループがありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有用户组。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無群組。]]></value>
+		<value xml:lang="fr"><![CDATA[Il n'y a pas de groupe enrégistré]]></value>
+		<value xml:lang="ru"><![CDATA[Зарегистрированной группы нет]]></value>
+		<value xml:lang="es"><![CDATA[No es un grupo registrado]]></value>
+		<value xml:lang="tr"><![CDATA[Grup yok]]></value>
+		<value xml:lang="vi"><![CDATA[Không đăng kí vào nhóm nào]]></value>
+	</item>
+	<item name="msg_not_delete_default">
+		<value xml:lang="ko"><![CDATA[기본 항목을 삭제할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Default items cannot be deleted]]></value>
+		<value xml:lang="jp"><![CDATA[基本項目は削除できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能删除基本项目]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法刪除基本項目]]></value>
+		<value xml:lang="fr"><![CDATA[Elément fondamental ne pourra pas être supprimé]]></value>
+		<value xml:lang="ru"><![CDATA[Стандартные объекты не могут быть удалены]]></value>
+		<value xml:lang="es"><![CDATA[Los artículos predefinidos no pueden ser eliminados]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan ögeler silinemez]]></value>
+		<value xml:lang="vi"><![CDATA[Mặc định không thể xóa]]></value>
+	</item>
+	<item name="msg_not_exists_member">
+		<value xml:lang="ko"><![CDATA[존재하지 않는 회원입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid member]]></value>
+		<value xml:lang="jp"><![CDATA[存在しないユーザーIDです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不存在的用户]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不存在的帳號]]></value>
+		<value xml:lang="fr"><![CDATA[Membre Invalide]]></value>
+		<value xml:lang="ru"><![CDATA[Пользователь не существует]]></value>
+		<value xml:lang="es"><![CDATA[Este usuario no existe]]></value>
+		<value xml:lang="tr"><![CDATA[Geçersiz üye]]></value>
+		<value xml:lang="vi"><![CDATA[Thành viên không hợp lệ]]></value>
+	</item>
+	<item name="msg_cannot_delete_admin">
+		<value xml:lang="ko"><![CDATA[관리자 아이디는 삭제할 수 없습니다. 관리자 해제 후 다시 삭제시도해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Admin ID cannot be deleted. Please remove the ID from administration and try again.]]></value>
+		<value xml:lang="jp"><![CDATA[管理者ＩＤは削除できません。管理者権限を解除した上で削除してみてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能删除管理员 ID .解除管理后再删除]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法解除管理員帳號，請解除管理後再刪除]]></value>
+		<value xml:lang="fr"><![CDATA[Le Compte de l'Administrateur ne pourra pas être supprimé. Annulez l'administration du compte et essayez encore une fois.]]></value>
+		<value xml:lang="ru"><![CDATA[Административный ID не может быть удален. Пожалуйста, удалить ID  из администрации и попробуйте снова.]]></value>
+		<value xml:lang="es"><![CDATA[ID del Administrador no puede ser eliminado. Remover el ID desde la Administración y trate nuevamente.]]></value>
+		<value xml:lang="tr"><![CDATA[Admin Kimliği silinemez. Kimliği yönetimden çıkartıp tekrar deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Admin ID không thể xóa!]]></value>
+	</item>
+	<item name="msg_exists_user_id">
+		<value xml:lang="ko"><![CDATA[이미 존재하는 아이디입니다. 다른 아이디를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[This ID already exists. Please try another one.]]></value>
+		<value xml:lang="jp"><![CDATA[既に存在するユーザーIDです。他のIDを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[重复的用户名 ，请重新输入用户名。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重複的帳號，請重新輸入。]]></value>
+		<value xml:lang="fr"><![CDATA[Le compte existe déjà. Essayez un autre.]]></value>
+		<value xml:lang="ru"><![CDATA[Этот ID уже существует. Пожалуйста, попробуйте другой.]]></value>
+		<value xml:lang="es"><![CDATA[Este ID ya existe. Por favor trate con otro ID]]></value>
+		<value xml:lang="tr"><![CDATA[Bu kimlik önceden alınmış. Lütfen başka bir kimlik deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên sử dụng này đã có người dùng. Xin vui lòng thử lại với tên truy cập khác!]]></value>
+	</item>
+	<item name="msg_exists_email_address">
+		<value xml:lang="ko"><![CDATA[이미 존재하는 메일 주소입니다. 다른 메일 주소를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[This email address already exists. Please try another one.]]></value>
+		<value xml:lang="jp"><![CDATA[既に存在するメールアドレスです。他のメールアドレスを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[重复的电子邮件地址，请重新输入电子邮件地址。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重複的電子郵件地址，請重新輸入電子郵件地址。]]></value>
+		<value xml:lang="fr"><![CDATA[L'adresse mél existe déjà. Essayez une autre.]]></value>
+		<value xml:lang="ru"><![CDATA[Этот email адрес уже зарегистрирован. Пожалуйста, попробуйте другой.]]></value>
+		<value xml:lang="es"><![CDATA[Esta dirección del email ya existe. Por favor trate con otra dirección del email.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu mail adresi zaten kullanımda. Lütfen başka bir mail adresi deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Email này đã có người sử dụng. Xin vui lòng thử lại với Email khác!]]></value>
+	</item>
+	<item name="msg_exists_nick_name">
+		<value xml:lang="ko"><![CDATA[이미 존재하는 닉네임입니다. 다른 닉네임을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[This nickname already exists. Please try another one.]]></value>
+		<value xml:lang="jp"><![CDATA[同じニックネームがすでに登録されています。他のニックネームを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[重复的昵称，请重新输入昵称。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重複的暱稱，請重新輸入。]]></value>
+		<value xml:lang="fr"><![CDATA[Le surnom existe déjà. Essayez un autre.]]></value>
+		<value xml:lang="ru"><![CDATA[Этот ник уже существует. Пожалуйста, попробуйте другой.]]></value>
+		<value xml:lang="es"><![CDATA[Este apodo ya existe. Por favor trate con otro apodo.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu rumuz önceden alınmış. Lütfen başka bir rumuz deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Nickname này đã có người sử dụng. Xin vui lòng thử lại với Nickname khác!]]></value>
+	</item>
+	<item name="msg_signup_disabled">
+		<value xml:lang="ko"><![CDATA[회원 가입을 하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You are not able to sign up]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録が制限されています。<br />サイト管理者にお問合せください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能注册会员]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法註冊會員]]></value>
+		<value xml:lang="fr"><![CDATA[Vous ne pouvez pas vous inscrire.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы не можете зарегистрироваться]]></value>
+		<value xml:lang="es"><![CDATA[Usted no puede ser registrado]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt olma yetkiniz bulunmamaktadır]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không thể đăng kí.]]></value>
+	</item>
+	<item name="msg_already_logged">
+		<value xml:lang="ko"><![CDATA[이미 회원 가입을 하신 상태입니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have already signed up.]]></value>
+		<value xml:lang="jp"><![CDATA[既に会員登録されています。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您是注册会员。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您是註冊會員。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous vous êtes déjà inscrit(e).]]></value>
+		<value xml:lang="ru"><![CDATA[Вы уже зарегистрированы]]></value>
+		<value xml:lang="es"><![CDATA[Usted ya ha sido registrado]]></value>
+		<value xml:lang="tr"><![CDATA[Zaten giriş yapmış bulunmaktasınız]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn đã đăng kí rồi.]]></value>
+	</item>
+	<item name="msg_not_logged">
+		<value xml:lang="ko"><![CDATA[로그인을 하지 않으셨습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please sign in first.]]></value>
+		<value xml:lang="jp"><![CDATA[ログインしていません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您还没有登录。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您還沒登入。]]></value>
+		<value xml:lang="fr"><![CDATA[Ouvrez une session d'abord]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, сначала сделайте вход на сайт]]></value>
+		<value xml:lang="es"><![CDATA[Por favor conectese primero]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen önce giriş yapınız]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng đăng nhập trước!]]></value>
+	</item>
+	<item name="msg_insert_group_name">
+		<value xml:lang="ko"><![CDATA[그룹명을 입력해 주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the name of group.]]></value>
+		<value xml:lang="jp"><![CDATA[グループ名を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入组名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入群組名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le nom de groupe, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите имя группы]]></value>
+		<value xml:lang="es"><![CDATA[Por favor ingresar el nombre del grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen grup ismini giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng nhập tên của nhóm!]]></value>
+	</item>
+	<item name="msg_check_group">
+		<value xml:lang="ko"><![CDATA[그룹을 선택해 주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select the group.]]></value>
+		<value xml:lang="jp"><![CDATA[グループを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇群組]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez le groupe]]></value>
+		<value xml:lang="ru"><![CDATA[Выберите группу]]></value>
+		<value xml:lang="es"><![CDATA[Introduce nombre de grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen grubu seçiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin vui lòng chọn nhóm!]]></value>
+	</item>
+	<item name="msg_not_uploaded_profile_image">
+		<value xml:lang="ko"><![CDATA[프로필 이미지를 등록할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Profile image could not be registered.]]></value>
+		<value xml:lang="jp"><![CDATA[プロフィールイメージを登録することができません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能登录签名图像！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法登錄個人圖片！]]></value>
+		<value xml:lang="fr"><![CDATA[L'image de Profil n'a pas pu être enrégistré]]></value>
+		<value xml:lang="tr"><![CDATA[Profil resmi kaydedilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể đăng kí được hình đại diện.]]></value>
+	</item>
+	<item name="msg_not_uploaded_image_name">
+		<value xml:lang="ko"><![CDATA[이미지 이름을 등록할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Image name could not be registered.]]></value>
+		<value xml:lang="jp"><![CDATA[イメージ名を登録することができません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能登录昵称图像！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法登錄暱稱圖片！]]></value>
+		<value xml:lang="fr"><![CDATA[Le nom d'image n'a pas pu être enrégistré]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно зарегистрировать имя фотографии]]></value>
+		<value xml:lang="es"><![CDATA[Imagen del nombre no puede ser registrado]]></value>
+		<value xml:lang="tr"><![CDATA[Resim İsmi kaydedilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể gửi được hình ảnh thay Nickname.]]></value>
+	</item>
+	<item name="msg_not_uploaded_image_mark">
+		<value xml:lang="ko"><![CDATA[이미지 마크를 등록할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Image mark could not be registered.]]></value>
+		<value xml:lang="jp"><![CDATA[イメージマークを登録することができません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能登录用户图标！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法登錄用戶圖示！]]></value>
+		<value xml:lang="fr"><![CDATA[La marque en image n'a pas pu être enrégistrée]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно зарегистрировать марку фотографии]]></value>
+		<value xml:lang="es"><![CDATA[Imagen de marca no puede ser resistrado]]></value>
+		<value xml:lang="tr"><![CDATA[Resim İmi kaydedilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình đánh dấu đã không được gửi.]]></value>
+	</item>
+	<item name="msg_not_uploaded_group_image_mark">
+		<value xml:lang="ko"><![CDATA[그룹 이미지 마크를 등록할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Group image mark could not be registered.]]></value>
+		<value xml:lang="jp"><![CDATA[グループ用イメージマークの登録ができません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定用户组图标。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法登錄群組圖示！]]></value>
+		<value xml:lang="fr"><![CDATA[그룹 이미지 마크를 등록할 수가 없습니다]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно зарегистрировать марку изображения группы]]></value>
+		<value xml:lang="es"><![CDATA[그룹 이미지 마크를 등록할 수가 없습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Grup resim imi kaydedilemedi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình thay thế nhóm đã không được gửi]]></value>
+	</item>
+	<item name="msg_accept_agreement">
+		<value xml:lang="ko"><![CDATA[약관에 동의하셔야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have to accept the agreement.]]></value>
+		<value xml:lang="jp"><![CDATA[利用規約に同意しなければなりません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您必须同意条款。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您必須同意條款。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous devez agréer l'accord]]></value>
+		<value xml:lang="ru"><![CDATA[Вы должны принять Соглашение]]></value>
+		<value xml:lang="es"><![CDATA[Usted primero debe aceptar el acuerdo]]></value>
+		<value xml:lang="tr"><![CDATA[Sözleşmeyi kabul etmeniz gerekmektedir]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn phải đồng ý với điều khoản sử dụng của chúng tôi.]]></value>
+	</item>
+	<item name="msg_user_denied">
+		<value xml:lang="ko"><![CDATA[입력하신 아이디의 사용이 중지되셨습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered a prohibited ID.]]></value>
+		<value xml:lang="jp"><![CDATA[利用が中止されているユーザIDです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您输入的用户名已禁止使用！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您輸入的帳號已禁止使用！]]></value>
+		<value xml:lang="fr"><![CDATA[Le compte que vous avez entré est suspendu]]></value>
+		<value xml:lang="ru"><![CDATA[Введенный ID запрещен]]></value>
+		<value xml:lang="es"><![CDATA[ID ingresado ha sido prohibido para su uso]]></value>
+		<value xml:lang="tr"><![CDATA[Yasaklanmış bir Kimlik girdiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Tên sử dụng này đã bị cấm đăng kí.]]></value>
+	</item>
+	<item name="msg_user_not_confirmed">
+		<value xml:lang="ko"><![CDATA[아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Your account is not activated yet. Please check your email.]]></value>
+		<value xml:lang="jp"><![CDATA[メールでの認証が行われていません。メールを確認してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您的注册信息还没有被激活，请确认您的电子邮箱。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您的註冊資料還沒有被確認，請確認您的電子郵箱。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous n'avez pas encore authentifié. Verifiez votre mél, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы еще не прошли авторизацию, проверьте свою почту]]></value>
+		<value xml:lang="es"><![CDATA[아직 메일 인증이 이루어지지 않았습니다. 메일을 확인해 주세요]]></value>
+		<value xml:lang="tr"><![CDATA[Hesabınız henüz etkinleştirilmemiş. Lütfen mailinizi kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn chưa xác nhận việc đăng kí. Xin vui lòng kiểm tra Email!]]></value>
+	</item>
+	<item name="msg_user_limited">
+		<value xml:lang="ko"><![CDATA[입력하신 아이디는 %s 이후부터 사용하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have entered an ID that can be used after %s]]></value>
+		<value xml:lang="jp"><![CDATA[入力したユーザーIDは%s以降から使用できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您输入的用户名%s以后才可以开始使用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您輸入的帳號%s以後才可以開始使用。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous avez entré un compte qui peut être utilisé depuis %s]]></value>
+		<value xml:lang="ru"><![CDATA[Введенный ID возможно использовать после %s]]></value>
+		<value xml:lang="es"><![CDATA[ID ingresado puede ser usado luego de %s]]></value>
+		<value xml:lang="tr"><![CDATA[Bu kimlik, %s Tarihinden sonra kullanılabilir]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn được phép sử dụng đến ngày %s]]></value>
+	</item>
+	<item name="about_user_id">
+		<value xml:lang="ko"><![CDATA[회원 ID는 3~20자 사이의 영문+숫자로 이루어져야 하며 영문으로 시작되어야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[User ID should be 3~20 characters long, consist of alphanumeric and start with a letter.]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザーIDは、3~20字までの英数文字にしてください。先頭文字は英字でなければなりません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户名长度必须由 3 ~20 字以内的英文+数字组成，且首个字母必须是英文字母。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[帳號必須由 3~20 字以內的英文+數字組成，開頭必須是英文。]]></value>
+		<value xml:lang="fr"><![CDATA[Le compte d'utilisateur doit être long de 3~20 lettres et se composer des alphabets et des chiffres avec un alphabet au premier.]]></value>
+		<value xml:lang="ru"><![CDATA[Юзер ID должен состоять из 3~20 знаков и содержать алфавит или цифры, начинаясь с алфавитного знака.]]></value>
+		<value xml:lang="es"><![CDATA[ID del usuario debe ser entre 3-20 letras que consiste en alfabetos+número con alfabeto como primera letra.]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcı kimliği 3~20 karakter uzunluğunda ve hem harf hem rakam içermeli ve ilk bir harfle başlamalıdır.]]></value>
+		<value xml:lang="vi"><![CDATA[Độ dài của tên truy cập được giới hạn từ 3 đến 20 kí tự gồm a-z và các số.]]></value>
+	</item>
+	<item name="about_password">
+		<value xml:lang="ko"><![CDATA[비밀번호는 6~20자로 되어야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Password should be 6~20 characters long.]]></value>
+		<value xml:lang="jp"><![CDATA[パスワードは6~20字にしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[密码长度必须在6~20字以内。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[密碼必須在 6~20 字以內。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Mot de Passe doit être long de 6~20 lettres.]]></value>
+		<value xml:lang="ru"><![CDATA[Пароль должен состоять из 6~20 знаков]]></value>
+		<value xml:lang="es"><![CDATA[Contraseña debe ser entre 6-20 letras]]></value>
+		<value xml:lang="tr"><![CDATA[Şifre 6~20 karakter uzunluğunda olmalıdır]]></value>
+		<value xml:lang="vi"><![CDATA[Độ dài mật khẩu giới hạn từ 6 đến 20 kí tự.]]></value>
+	</item>
+	<item name="about_user_name">
+		<value xml:lang="ko"><![CDATA[이름은 2~20자 이내여야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Name should be 2~20 letters long.]]></value>
+		<value xml:lang="jp"><![CDATA[名前は2~20字にしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[姓名必须是2~20字以内。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[姓名必須是 2~20 字以內。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Nom doit être long de 2~20 lettres.]]></value>
+		<value xml:lang="ru"><![CDATA[Имя должно состоять из 2~20 знаков]]></value>
+		<value xml:lang="es"><![CDATA[Nombre debe ser entre 2-20 letras]]></value>
+		<value xml:lang="tr"><![CDATA[İsim 2~20 karakter uzunluğunda olmalıdır]]></value>
+		<value xml:lang="vi"><![CDATA[Giới hạn của tên từ 2 đến 20 kí tự.]]></value>
+	</item>
+	<item name="about_nick_name">
+		<value xml:lang="ko"><![CDATA[닉네임은 2~20자 이내여야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Nickname should be 2~20 characters long.]]></value>
+		<value xml:lang="jp"><![CDATA[ニックネームは2~20字にしてください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[昵称必须是2~20字以内。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暱稱必須是 2~20 字以內。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Surnom doit être long de 2~20 lettres.]]></value>
+		<value xml:lang="ru"><![CDATA[Ник должен состоять из  2~20 знаков]]></value>
+		<value xml:lang="es"><![CDATA[Apodo debe ser entre 2-20 letras]]></value>
+		<value xml:lang="tr"><![CDATA[Rumuz 2~20 karakter uzunluğunda olmalıdır]]></value>
+		<value xml:lang="vi"><![CDATA[Độ dài của Nickname từ 2 đến 20 kí tự.]]></value>
+	</item>
+	<item name="about_email_address">
+		<value xml:lang="ko"><![CDATA[메일주소는 메일인증 후 비밀번호 변경이나 찾기 등에 사용됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Email address will be used to modify/find password after email verification.]]></value>
+		<value xml:lang="jp"><![CDATA[メールアドレスはメール認証後に、パスワード変更または検索などに使われます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[电子邮件地址除邮件认证外，在修改密码或找回密码时使用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[電子郵件地址除郵件認證外，當修改密碼或忘記密碼時也可以使用。]]></value>
+		<value xml:lang="fr"><![CDATA[L'Adresse mél sera utilisé à modifier/trouver le Mot de Passe après la certification en mél.]]></value>
+		<value xml:lang="ru"><![CDATA[Email адрес используется для изменения/получения пароля после его авторизации.]]></value>
+		<value xml:lang="es"><![CDATA[Dirección de email es usado para modificar/encontrar contraseña luego de la certificación de email]]></value>
+		<value xml:lang="tr"><![CDATA[E-posta adresiniz, e-posta onaylamasından sonra şifre düzenlemesi için kullanılacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Email được sử dụng để lên lạc, xác nhận và lấy lại mật khẩu nếu lỡ quên.]]></value>
+	</item>
+	<item name="about_homepage">
+		<value xml:lang="ko"><![CDATA[홈페이지가 있을 경우 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter your homepage address if you have any.]]></value>
+		<value xml:lang="jp"><![CDATA[ホームページがある場合は入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入您的主页地址。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入您的網址。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez si vous avez un site Web.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите, если у Вас есть вебсайт]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar su sitio web, si es que lo tiene]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen varsa website adresinizi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn có Website hãy nhập vào đây.]]></value>
+	</item>
+	<item name="about_blog_url">
+		<value xml:lang="ko"><![CDATA[운영하는 블로그가 있을 경우 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter your blog address if you have any.]]></value>
+		<value xml:lang="jp"><![CDATA[運用しているブログがあれば入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入博客地址。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入部落格網址。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez si vous avez un blogue.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите, если у Вас есть блог]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar su blog, si es que lo tiene]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen varsa blog adresinizi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn có Blog hãy nhập vào đây.]]></value>
+	</item>
+	<item name="about_birthday">
+		<value xml:lang="ko"><![CDATA[생년월일을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter your birth date.]]></value>
+		<value xml:lang="jp"><![CDATA[生年月日を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入您的出生年月日。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入您的出生年月日。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez votre anniversaire.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите Вашу дату рождения]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar su fecha de nacimiento]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen doğum tarihinizi giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy chọn ngày sinh nhật của bạn.]]></value>
+	</item>
+	<item name="about_allow_mailing">
+		<value xml:lang="ko"><![CDATA[메일링 가입이 체크되지 않으면 단체메일 발송시 메일을 받지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[If you don't join mailing, you will not able to receive group mails]]></value>
+		<value xml:lang="jp"><![CDATA[メーリングリストにチェックしない場合は、全体メールの送信時にメールを受け取りません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[如不选择此项，以后不能接收站内发送的重要信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不選擇此項，以後無法接收站內發送的重要資料。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous ne vous inscrivez pas sur mailing, vous ne pouvez pas recevoir le mél du groupe.]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы не присоединитесь к списку рассылки, Вы не сможете получать почтовые сообщения, направленные Вашей группе]]></value>
+		<value xml:lang="es"><![CDATA[Si usted no se ha registrado el envío de email, usted no podrá recibir el email del grupo]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer mailleşmeyi etkinleştirmezseniz, grup maillerini alamayacaksınız]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu không đồng ý nhận Email, bạn sẽ không thể nhận được những liên lạc của bạn bè hoặc của nhóm.]]></value>
+	</item>
+	<item name="about_denied">
+		<value xml:lang="ko"><![CDATA[체크 시 아이디를 사용할 수 없도록 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Check this to prohibit the ID.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると、ユーザーIDを使用できないようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择时不能使用此用户名。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇時不能使用此帳號。]]></value>
+		<value xml:lang="fr"><![CDATA[Cocher pour interdire le compte]]></value>
+		<value xml:lang="ru"><![CDATA[Запретить ID]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción prohibirá el uso del ID]]></value>
+		<value xml:lang="tr"><![CDATA[Kimliği yasaklanmak için işaretleyiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểm tra tên sử dụng bị cấm.]]></value>
+	</item>
+	<item name="about_is_admin">
+		<value xml:lang="ko"><![CDATA[체크 시 최고 관리자 권한을 가지게 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Check this to give Superadmin permissions.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると最高管理者権限が取得できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择时将具有最高管理权限。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇時將具有最高管理權限。]]></value>
+		<value xml:lang="fr"><![CDATA[Cocher pour autoriser la permission de Superadministrateur]]></value>
+		<value xml:lang="ru"><![CDATA[Наделить Суперадминистративными правами]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción para obtener la atribución del administrador superior]]></value>
+		<value xml:lang="tr"><![CDATA[Superadmin yetkisi vermek için işaretleyiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểm tra toàn quyền Administrator]]></value>
+	</item>
+	<item name="about_member_description">
+		<value xml:lang="ko"><![CDATA[회원에 대한 관리자 메모입니다.]]></value>
+		<value xml:lang="en"><![CDATA[Administrator's memo about user.]]></value>
+		<value xml:lang="jp"><![CDATA[会員に対する管理者のメモ帳です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理员对会员的备忘录。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理員對會員的註記。]]></value>
+		<value xml:lang="fr"><![CDATA[La description de l'Administrateur sur le membre]]></value>
+		<value xml:lang="ru"><![CDATA[Заметки администратора о пользователях]]></value>
+		<value xml:lang="es"><![CDATA[Nota del administrador acerca de los usuarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yöneticinin kullanıcılar hakkındaki kısa notu]]></value>
+		<value xml:lang="vi"><![CDATA[Ghi nhớ của Admin về những thành viên]]></value>
+	</item>
+	<item name="about_group">
+		<value xml:lang="ko"><![CDATA[한 아이디는 여러 개의 group에 속할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[An ID can belong to many groups.]]></value>
+		<value xml:lang="jp"><![CDATA[一つのユーザーIDは多数のグループに属することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[一个用户名可属多个用户组。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[一個帳號可擁有多個群組。]]></value>
+		<value xml:lang="fr"><![CDATA[Un compte peut appartenir aux plusieurs groupes.]]></value>
+		<value xml:lang="ru"><![CDATA[ID может принадлежать нескольким группам]]></value>
+		<value xml:lang="es"><![CDATA[Un ID puede pertenecer a muchos grupos]]></value>
+		<value xml:lang="tr"><![CDATA[Bir kimlik, birçok grubun üyesi olabilir]]></value>
+		<value xml:lang="vi"><![CDATA[Một tên sử dụng có thể tham gia nhiều nhóm]]></value>
+	</item>
+	<item name="about_column_type">
+		<value xml:lang="ko"><![CDATA[추가하실 가입 폼의 형식을 지정해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please set the format of additional signup form.]]></value>
+		<value xml:lang="jp"><![CDATA[追加する登録フォームのタイプを指定してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择要添加的注册表单格式。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要新增的註冊表單格式。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez la format que vous voulez ajouter]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, установите формат дополнительной формы регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Definir el estilo de la forma de registro que desea agregar]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen detaylı kayıt formunun biçimini ayarlayınız]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy chọn một định dạng để sử dụng.]]></value>
+	</item>
+	<item name="about_column_name">
+		<value xml:lang="ko"><![CDATA[템플릿에서 사용할 수 있는 영문으로 된 이름을 적어주세요. (변수명)]]></value>
+		<value xml:lang="en"><![CDATA[Please enter English name that can be used in the template (name as variable).]]></value>
+		<value xml:lang="jp"><![CDATA[テンプレートで使用できる英文字の名前を入力してください（変数名）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入在模板中可以使用的英文名称。（变数名）]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入在樣板中可以使用的英文名稱。(變數名稱)]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez le nom composé en alphabet qui peut être utilisé dans le modèle (nom comme variable)]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите английское название, которое будет использоваться в шаблоне как переменная]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar el nombre en español para poder usar en plantilla (nombre como variable)]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen şablonda kullanılabilecek İngilizce bir isim giriniz. (isim değişkendir)]]></value>
+		<value xml:lang="vi"><![CDATA[Nhập tên theo Tiếng Anh.]]></value>
+	</item>
+	<item name="about_column_title">
+		<value xml:lang="ko"><![CDATA[가입 또는 정보 수정/조회시에 표시될 제목입니다.]]></value>
+		<value xml:lang="en"><![CDATA[This will be displayed on signup or modifying/viewing member info form.]]></value>
+		<value xml:lang="jp"><![CDATA[登録または情報修正・閲覧時に表示されるタイトルです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册或修改/查看信息时要显示的标题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊或修改/檢視資料時要顯示的標題。]]></value>
+		<value xml:lang="fr"><![CDATA[Ce titre sera exposé sur la formule d'inscription ou sur l'écran pour modifier/voir les informations de membre]]></value>
+		<value xml:lang="ru"><![CDATA[Это будет отображено, когда пользователь регистрируется или изменяет/просматривает информацию пользователя]]></value>
+		<value xml:lang="es"><![CDATA[Esto sera mostrado cuando el usuario registra o modifica/visualiza la información del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Bu girdi, kayıt veya üye bilgisi düzenleme/görüntüleme formunda gösterilecektir]]></value>
+		<value xml:lang="vi"><![CDATA[Sẽ được hiển thị khi đăng kí, sửa đổi hay xem thông tin thành viên.]]></value>
+	</item>
+	<item name="about_default_value">
+		<value xml:lang="ko"><![CDATA[기본으로 입력될 값을 정하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can set the values to enter by default.]]></value>
+		<value xml:lang="jp"><![CDATA[デフォルトで入力される値を指定することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置缺省值。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以設置預設值。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez mettre les valeurs par défaut]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить значения по умолчанию]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede predefinir los valores]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan değerleri ayarlayabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt giá trị mặc định.]]></value>
+	</item>
+	<item name="about_active">
+		<value xml:lang="ko"><![CDATA[활성 항목에 체크를 하셔야 가입시 정상적으로 노출됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You have to check on active items to show on signup form.]]></value>
+		<value xml:lang="jp"><![CDATA[有効項目にチェックを入れないと加入時に正常に表示されません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[必须选择此项后才可以正常启用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[必須選擇此項後才可以正常啟用。]]></value>
+		<value xml:lang="fr"><![CDATA[Cochez si vous voulez l'exposer sur la formule d'inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Вам следует выбрать активные объекты для отображения в форме регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona "Activar" los artículos seran mostrados en el momento de registrar]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt formunu gösterebilmeniz için, öğeleri etkinleştirdiğinizden emin olun]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu chọn, thông tin này sẽ được hiển thị trong bảng đăng kí.]]></value>
+	</item>
+	<item name="about_form_description">
+		<value xml:lang="ko"><![CDATA[설명란에 입력을 하시면 가입시 표시가 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[If you enter description in this form, it will be displayed on join form.]]></value>
+		<value xml:lang="jp"><![CDATA[説明欄に入力すると登録時に表示されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[说明栏里输入的内容，注册时将会显示。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[說明欄裡輸入的內容，在註冊時會顯示。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous entrez la description, elle sera exposé sur la formule d'incription]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы введете описание, оно будет отображено в форме регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Si Usted ingresa la forma de la descripción, será mostrado en el momento de registrar]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer tanım formuna giriş yaparsanız, bu girdiler giriş formunda görünecektir]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn nhập mô tả, nó sẽ được hiển thị trong bảng đăng kí.]]></value>
+	</item>
+	<item name="about_required">
+		<value xml:lang="ko"><![CDATA[체크하시면 회원가입시 필수항목으로 입력하도록 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Check this to make it mandatory item when signing up.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると会員登録時に必須入力項目として設定されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册时成为必填项目。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊時成為必填項目。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous cochez, ce sera obligatoire]]></value>
+		<value xml:lang="ru"><![CDATA[Сделать элемент обязательным в форме регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción, será artículo esencial para el registro]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer işaretlerseniz, kayıt için gerekli bir öğe olacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu chọn, thông tin này sẽ được hiển thị trong bảng đăng kí.]]></value>
+	</item>
+	<item name="about_enable_openid">
+		<value xml:lang="ko"><![CDATA[OpenID 지원을 할 경우 체크하시면 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Check this if you want to provide an OpenID service.]]></value>
+		<value xml:lang="jp"><![CDATA[OpenIDをサポートする際にチェックを入れます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[要想网站支持OpenID时请勾选此项。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[想要網站支援 OpenID時，請勾選此項。]]></value>
+		<value xml:lang="fr"><![CDATA[Cochez si vous voulez permettre OpenID]]></value>
+		<value xml:lang="ru"><![CDATA[Позволить пользователям регистрироваться как OpenID]]></value>
+		<value xml:lang="es"><![CDATA[Selecciona esta opción si activado OpenID]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer OpenID hizmeti sunmak istiyorsanız, lütfen işaretleyiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Kích hoạt đăng nhập bằng OpenID.]]></value>
+	</item>
+	<item name="about_enable_join">
+		<value xml:lang="ko"><![CDATA[체크하면 회원가입을 할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please check this if you want to allow new members to sign up your site.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れないとユーザーが会員に登録できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择此项后用户才可以注册。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇此項後，用戶才可以註冊。]]></value>
+		<value xml:lang="fr"><![CDATA[Cochez si vous voulez permettre l'inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Позволить пользователям регистрироваться]]></value>
+		<value xml:lang="es"><![CDATA[Debe seleccionar esta opción para permitir el registro de los usuarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni üyelerin sitenize kayıt yapmalarına izin vermek istiyorsanız lütfen işaretleyiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép thành viên đăng kí.]]></value>
+	</item>
+	<item name="about_enable_confirm">
+		<value xml:lang="ko"><![CDATA[입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please check if you want new members to activate their accounts via their emails.]]></value>
+		<value xml:lang="jp"><![CDATA[登録されたメールアドレスに確認メールを送信し、会員登録を確認します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[为激活会员注册信息，将向会员输入的邮件地址发送注册认证邮件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[為確認會員註冊資料，會向會員輸入的郵件地址發送註冊認證郵件。]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyer mél de confirmation pour compléter l'inscription.]]></value>
+		<value xml:lang="es"><![CDATA[입력된 메일 주소로 인증 메일을 보내 회원 가입을 확인 합니다]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni üyelerin hesaplarını e-posta yoluyla etkinleştirmelerini istiyorsanız lütfen işaretleyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Gửi Email xác nhận sau khi đăng kí.]]></value>
+	</item>
+	<item name="about_enable_ssl">
+		<value xml:lang="ko"><![CDATA[서버에서 SSL지원이 될 경우 회원가입, 정보수정, 로그인 등의 개인정보가 서버로 보내질 때 SSL(https)를 이용하도록 할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Personal information from Sign up/Modify Member Info/Sign in can be sent as SSL(https) mode if server provides SSL service.]]></value>
+		<value xml:lang="jp"><![CDATA[サーバーでSSLが可能な場合、会員登録/情報変更/ログイン等の個人情報はSSL(https)経由でサーバーにより安全に送信されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[如服务器提供SSL协议服务，新会员注册/修改会员信息/登录等信息的传送将使用SSL(https)协议。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[如主機提供 SSL認證服務，新會員註冊/修改會員資料/登入等資料的傳送將使用 SSL(https)認證。]]></value>
+		<value xml:lang="fr"><![CDATA[Les informations personnelles (Inscription / Modification des informations du membre / Connexion) peuvent être envoyées comme mode SSL(https) si le serveur offre le service SSL.]]></value>
+		<value xml:lang="ru"><![CDATA[Personal information from Sign up/Modify Member Info/Sign in can be sent as SSL(https) mode if server provides SSL service]]></value>
+		<value xml:lang="es"><![CDATA[서버에서 SSL지원이 될 경우 회원가입/정보수정/로그인등의 개인정보가 서버로 보내질때 SSL(https)를 이용하도록 할 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt Ol/Üye Bilgisini Değiştir/Giriş Yap 'daki kişisel bilgiler, eğer sunucunuz da SSL servisi veriyorsa, SSL (https) olarak ayarlanabilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin cá nhân khi thành viên Đăng kí, Đăng nhập và Sủa đổi sẽ được gửi dưới dạng SSL(https). Hãy chọn nếu Server cho phép sử dụng chức năng này.]]></value>
+	</item>
+	<item name="about_limit_day">
+		<value xml:lang="ko"><![CDATA[회원 가입 후 정해진 일자동안 인증 제한을 할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can limit activation date after sign up]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録後一定の期間中、認証制限を行うことができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册会员后的认证有效期限。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊會員後的認證有效期限。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez limiter le jour de certification après l'inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете ограничить дату авторизации после регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede limitar la fecha de la certificación luego de registrar]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıttan sonraki hesap etkinleştirme süresini kısıtlayabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể giới hạn ngày xác nhận sau khi đăng kí.]]></value>
+	</item>
+	<item name="about_limit_date">
+		<value xml:lang="ko"><![CDATA[지정한 날짜까지 로그인을 할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Users cannot sign in until the specified date]]></value>
+		<value xml:lang="jp"><![CDATA[指定された期間まで該当ユーザーはログインできなくします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[直到指定日期该用户不能登录。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[直到指定日期，否則該帳號都無法登入。]]></value>
+		<value xml:lang="fr"><![CDATA[Utilisateur ne peut pas ouverir la connexion jusqu'au jour assigné]]></value>
+		<value xml:lang="ru"><![CDATA[Пользователь не может войти до указанной даты]]></value>
+		<value xml:lang="es"><![CDATA[Usuario no podra conectarse hasta la fecha indicada]]></value>
+		<value xml:lang="tr"><![CDATA[Üyeler, belirlenen tarihe kadar kayıt yapamazlar]]></value>
+		<value xml:lang="vi"><![CDATA[Thành viên không thể đăng nhập nếu quá hạn xác nhận đăng kí.]]></value>
+	</item>
+	<item name="about_after_login_url">
+		<value xml:lang="ko"><![CDATA[로그인 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can set a URL after login. Blank means the current page.]]></value>
+		<value xml:lang="jp"><![CDATA[ログイン後表示されるページのURLを指定できます。指定のない場合、現在のページが維持されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定登录后的页面转向url(留空为当前页面)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定登入後的頁面轉向網址(留空為目前頁面)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez indiquer URL où l'on va après la connexion. Le vide signifie la page courante.]]></value>
+		<value xml:lang="ru"><![CDATA[Возможен переход на указанный URL после логин. Если не укажете, то данная страница отобразиться.]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş yaptıktan sonraki gidilecek URL'yi ayarlayabilirsiniz. Boş bırakmak, geçerli sayfayı bırakır.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể thiết đặt địa chỉ nào đó sẽ hiển thị sau khi đăng nhập. Để trống nếu không sử dụng.]]></value>
+	</item>
+	<item name="about_after_logout_url">
+		<value xml:lang="ko"><![CDATA[로그아웃 후 이동할 URL을 정하실 수 있습니다. 비어 있으면 해당 페이지가 유지됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can set a URL after logout. Blank means the current page.]]></value>
+		<value xml:lang="jp"><![CDATA[ログアウト後表示されるページのURLを指定できます。指定のない場合、現在のページが維持されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定退出登录后的页面转向url(留空为当前页面)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定登出後的頁面轉向網址(留空為目前頁面)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez indiquer URL où l'on va après la déconnexion. Le vide signifie la page courrante.]]></value>
+		<value xml:lang="ru"><![CDATA[Возможен переход на указанный URL после выхода. Если не укажете, то данная страница отобразиться.]]></value>
+		<value xml:lang="tr"><![CDATA[Çıkış yaptıktan sonraki gidilecek URL'yi ayarlayabilirsiniz. Boş bırakmak, geçerli sayfa manasına gelir.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể thiết đặt địa chỉ nào đó sẽ hiển thị sau khi thoát. Để trống nếu không sử dụng.]]></value>
+	</item>
+	<item name="about_redirect_url">
+		<value xml:lang="ko"><![CDATA[회원 가입 후 이동할 url을 입력해 주세요. 비어 있으면 가입 이전 페이지로 돌아갑니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter a URL where users will go after sign up. When this is empty, it will be set as the previous page of the sign up page.]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録後、表示されるページのURLを指定できます。指定のない場合は会員登録する前のページに戻ります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入注册会员后的页面转向 url。(留空为返回前页)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入會員註冊後的頁面轉向網址。(留空為返回前頁)]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez URL où l'utilisateur irra après l'inscription, S.V.P. Si c'est vide, ce sera la page précédente de la page d'inscription.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите URL, куда пользователи попадут после регистрации. Когда поле пустое, будет установлена страница предшествующая странице регистрации.]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar la URL que va a abrir luego de registrar los usuarios. Cuando esto esta vacío, se habrirá la página anterior a la del registro.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen üyelerin kayıt olduktan sonraki yönlendirilecekleri URL'yi giriniz. Bır url girilmediğinde, kayıt sayfasından bir önceki sayfaya yönlendirileceklerdir.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập địa chỉ trang sẽ chuyển đến sau khi thành viên đăng kí. Để trống nếu không sử dụng.]]></value>
+	</item>
+	<item name="about_agreement">
+		<value xml:lang="ko"><![CDATA[회원 가입 약관이 없을 경우 표시되지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Sign up Agreement will be displayed if it's not empty]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録規約がない場合は表示されません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有会员条款时不显示。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有會員條款時不會顯示。]]></value>
+		<value xml:lang="fr"><![CDATA[L'Accord d'Inscription comme Membre sera exposé seulement quand il n'est pas vide.]]></value>
+		<value xml:lang="ru"><![CDATA[Регистрационное соглашение будет показано, если оно содержит текст]]></value>
+		<value xml:lang="es"><![CDATA[Acuerdo del registro no será mostrado si esta vacío]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer boş bırakılmadıysa, Kayıt Sözleşmesi görüntülenecektir]]></value>
+		<value xml:lang="vi"><![CDATA[Điều khoản sử dụng sẽ hiển thị trong Form đăng kí nếu có nội dung.]]></value>
+	</item>
+	<item name="about_image_name">
+		<value xml:lang="ko"><![CDATA[회원의 이름을 글자 대신 이미지로 사용할 수 있게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Members will be able to use image name instead of text]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザーの名前を文字の代わりにイメージで表示させることができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户昵称可以用小图片来替代显示。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[用戶暱稱可以用圖片替代。]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre aux utilisateurs d'utiliser une image pour présenter leurs noms au lieu des lettres]]></value>
+		<value xml:lang="ru"><![CDATA[Возможно использование изображение вместо текста]]></value>
+		<value xml:lang="es"><![CDATA[Permitir a los usuarios el uso de imagen del nombre en ves del nombre del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üyeler, metin yerine resim adı kullanabileceklerdir]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép thành viên sử dụng hình ảnh thay cho tên.]]></value>
+	</item>
+	<item name="about_image_mark">
+		<value xml:lang="ko"><![CDATA[회원의 이름 앞에 마크를 달 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Members will be able to use image mark in front of their names]]></value>
+		<value xml:lang="jp"><![CDATA[使用者の名前の前にマークを付けることができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[显示在用户昵称前的小图标。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顯示在用戶暱稱前的圖示。]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre aux utilisateurs d'utiliser une marque devent leurs noms]]></value>
+		<value xml:lang="ru"><![CDATA[Возможно использование марки перед именем]]></value>
+		<value xml:lang="es"><![CDATA[Permitir a los usuarios el uso de imagen de marca delante de sus nombres]]></value>
+		<value xml:lang="tr"><![CDATA[Üyeler, isimlerinin önünde işaret resmi kullanabilirler]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép sử dụng hình ảnh nhỏ truóc tên của họ.]]></value>
+	</item>
+	<item name="about_group_image_mark">
+		<value xml:lang="ko"><![CDATA[회원의 이름 앞에 그룹 마크를 달 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may use group marks shown before their names]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザー名の前にグループマークを表示します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户名前显示用户组图标。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顯示在用戶群組前的圖示。]]></value>
+		<value xml:lang="fr"><![CDATA[회원의 이름앞에 그룹 마크를 달 수 있습니다]]></value>
+		<value xml:lang="ru"><![CDATA[Возможно использование групповой марки перед именем]]></value>
+		<value xml:lang="es"><![CDATA[회원의 이름앞에 그룹 마크를 달 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcıların isimlerinin önlerinde görüntülenecek grup işaretleri kullanabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể sử dụng biểu tượng nhóm sẽ hiển thị trước tên thành viên.]]></value>
+	</item>
+	<item name="about_profile_image">
+		<value xml:lang="ko"><![CDATA[회원의 프로필 이미지를 사용할 수 있게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Members will be able to use profile images]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザーのプロフィールイメージが使用できるようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以使用签名图片。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以使用個人圖片。]]></value>
+		<value xml:lang="fr"><![CDATA[Permettre aux utilisateurs d'utiliser une image de profil]]></value>
+		<value xml:lang="ru"><![CDATA[Позволить пользователям использовать изображения профиля]]></value>
+		<value xml:lang="es"><![CDATA[Permitir a los usuarios a utilizar nombre de la imagen en lugar de texto nombre]]></value>
+		<value xml:lang="tr"><![CDATA[Üyeler, profil resmi kullanabilirler]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép thành viên sử dụng thông tin cá nhân bằng hình ảnh.]]></value>
+	</item>
+	<item name="about_signature_max_height">
+		<value xml:lang="ko"><![CDATA[서명란의 높이를 제한할 수 있습니다. (0 또는 비워두면 제한하지 않습니다.)]]></value>
+		<value xml:lang="en"><![CDATA[You can limit the signature max height. Set this as 0 or leave it blank not to limit it.]]></value>
+		<value xml:lang="jp"><![CDATA[署名欄の高さのサイズを制限します。 (0 もしくは空の場合は制限なし。)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以限制签名栏高度(0或留空为不限制)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以限制簽名檔高度(零或留空為不限制)。]]></value>
+		<value xml:lang="ru"><![CDATA[Возможно установить лимит подписи. (0 Если оставите пустым, то лимита не будет.)]]></value>
+	</item>
+	<item name="about_accept_agreement">
+		<value xml:lang="ko"><![CDATA[약관을 모두 읽었으며 동의합니다.]]></value>
+		<value xml:lang="en"><![CDATA[I have read the agreement and agree with it]]></value>
+		<value xml:lang="jp"><![CDATA[登録規約をすべて読み、同意します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已阅读全部条款并同意。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已閱讀全部條款並同意。]]></value>
+		<value xml:lang="fr"><![CDATA[J'ai lu l'Accord et je suis d'accord.]]></value>
+		<value xml:lang="ru"><![CDATA[Я прочитал соглашение полностью и согласен]]></value>
+		<value xml:lang="es"><![CDATA[Yo he leído todo el acuerdo y acepto]]></value>
+		<value xml:lang="tr"><![CDATA[Anlaşmayı okudum ve kabul ediyorum]]></value>
+		<value xml:lang="vi"><![CDATA[Tôi đã đọc và đồng ý với điều khoản sử dụng của Website.]]></value>
+	</item>
+	<item name="about_member_default">
+		<value xml:lang="ko"><![CDATA[회원 가입을 한 사람이 최초에 속하는 그룹을 말합니다.]]></value>
+		<value xml:lang="en"><![CDATA[It will be set as the default group on sign up]]></value>
+		<value xml:lang="jp"><![CDATA[会員登録時に基本グループとして設定されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[将成为注册会员时的默认用户组。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[將成為註冊會員時的預設群組。]]></value>
+		<value xml:lang="fr"><![CDATA[On sera par défaut dans ce groupe après l'inscription]]></value>
+		<value xml:lang="ru"><![CDATA[При регистрации устанавливается стандартная группа]]></value>
+		<value xml:lang="es"><![CDATA[Al registrar se configura como grupo predefinido]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan grup, kullanıcı kayıt olduktan sonra yönlendirileceği grup olacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Sẽ là nhóm mặc định khi thành viên đăng kí.]]></value>
+	</item>
+	<item name="about_openid">
+		<value xml:lang="ko"><![CDATA[오픈아이디로 가입시 아이디와 메일 등의 기본 정보는 이 사이트에 저장 되지만 비밀번호와 인증을 위한 처리는 해당 오픈아이디 제공서비스에서 이루어집니다.]]></value>
+		<value xml:lang="en"><![CDATA[When you join using an OpenID, basic info like ID or email address will be saved on this site, process for password and verification management will be done on current OpenID offering service]]></value>
+		<value xml:lang="jp"><![CDATA[OpenIDで登録する際、ＩＤとメールなどの基本情報は、このサイトに保存されますが、パスワードと認証のための処理用の情報は該当するOpenID提供サービス側で行われます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用OpenID注册时该网站只保存用户名和 邮件等基本信息，密码和认证处理是在提供OpenID服务的站点中得到解决。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[用 OpenID註冊時，該網站只儲存帳號和郵件等基本資料，密碼和認證處理是在提供 OpenID服務的網站中得到解決。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous vous inscrivez avec OpenID, vos informations primaires comme le Compte(ID) ou l'adresse mél sera gardés sur ce site. Mais le procès pour le Mot de Passe et la certification sera fait sur le service courant qui offre OpenID]]></value>
+		<value xml:lang="ru"><![CDATA[При регистраци как OpenID, основнаая информация (ID или email адрес) будет сохранена на сайте, но операции с паролем и авторизацией будут произведены над текущим OpenID в представленном сервисе]]></value>
+		<value xml:lang="es"><![CDATA[Cuando tu registra como OpenID, la información básica como ID o la dirección del email sera guardado en este sitio, pero la contraseña y la resolución de la certificación se hará en el servicio ofrecido por openID]]></value>
+		<value xml:lang="tr"><![CDATA[OpenID olarak giriş yaptığınızda, e-posta adresi ya da kimliğiniz gibi temel bilgi sitede kaydedilecektir, şifre ve onaylama yönetimi işlemi, hizmet veren geçerli OpenID tarafından yapılacaktır]]></value>
+		<value xml:lang="vi"><![CDATA[Khi bạn đăng nhập bằng OpenID, những thông tin cơ bản và Email của bạn sẽ lưu lại tại Website này. Việc này sẽ giúp bạn lấy lại thông tin nếu như bạn lỡ quên hoặc nhận những thông báo từ Ban Quản trị Website.]]></value>
+	</item>
+	<item name="about_openid_leave">
+		<value xml:lang="ko"><![CDATA[오픈아이디의 탈퇴는 현 사이트에서의 회원 정보를 삭제하는 것입니다.<br />탈퇴 후 로그인하시면 새로 가입하시는 것으로 되어 작성한 글에 대한 권한을 가질 수 없게 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[The secession of OpenID means deletion of your member info from this site.<br />If you login after secession, it will be recognized as a new member, so you will no longer have the permission for your ex-written articles.]]></value>
+		<value xml:lang="jp"><![CDATA[OpenIDの退会は現在のサイトから会員情報を削除することを意味します。<br />退会後ログインすると新しく登録することになり、書き込んだコンテンツに対する権限を維持することができません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除OpenID就等于永久删除站内用户的信息。<br />被删除后的重新登录就等于新会员注册，因此对以前自己写的主题将失去相应权限。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除 OpenID就等於永久刪除站內會員的資料。<br />被刪除後，再重新登錄就等於新會員註冊，因此對以前自己寫的主題將失去其權限。]]></value>
+		<value xml:lang="fr"><![CDATA[La sécession de OpenID nous fait supprimer vos informations du membre dans notre site.<br />Si vous ouvrez la connexion après la sécession, nous vous reconnaîtrons comme un nouveau membre, c'est-à-dire, vous n'aurez plus la permission sur les articles que vous avez écrits avant.]]></value>
+		<value xml:lang="ru"><![CDATA[Удаление аккаунта с OpenID производит удаление Вашей информации пользователя на сайте.<br />Если Вы войдете после удаления аккаунта, Вы будете разпознаны как новый пользователь и доступ к написанным Вами ранее записям будет закрыт.]]></value>
+		<value xml:lang="es"><![CDATA[La secesión de OpenID medios eliminación de su información de miembros de este sitio. <br /> Si se registra después de la secesión, se le reconocerá como un nuevo miembro, de modo que ya no tienen el permiso para que su ex-escrito artículos.]]></value>
+		<value xml:lang="tr"><![CDATA[OpenID'nin bu bölünmesi, üyelik bilginizin bu siteden silinmesi demektir.<br />Bölünmeden sonra giriş yaparsanız, yeni bir üye gibi kabul edilecekseniz, bu yüzden eski makalelerinize ulaşma yetkiniz olmayacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin OpenID của bạn sẽ được cập nhật tại Website này.<br />Nếu bạn đăng nhập, Thông tin OpenID của bạn sẽ được lưu lại như một thành viên đã đăng kí, và bạn có thể gửi bài viết hay bình luận.]]></value>
+	</item>
+	<item name="about_find_member_account">
+		<value xml:lang="ko"><![CDATA[아이디/ 비밀번호는 가입시 등록한 메일 주소로 알려드립니다.<br />가입할 때 등록하신 메일 주소를 입력하시고 "아이디/비밀번호 찾기" 버튼을 클릭해주세요.<br />]]></value>
+		<value xml:lang="en"><![CDATA[Your account info will be sent to this email address.<br />Please input the email address you have entered during the registration, then press "Find Account Info" button.<br />]]></value>
+		<value xml:lang="jp"><![CDATA[ID/パスワードは登録時に登録されたメールにてお知らせします。<br />登録時に登録したメールアドレスを入力して「IDとパスワードのリマインダー」ボタンをクリックしてください。<br />]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户名/密码将发送到您注册时所输入的电子邮件当中。<br />输入注册时的电子邮件地址后，请点击“查找用户名/密码”按钮。<br />]]></value>
+		<value xml:lang="zh-TW"><![CDATA[帳號/密碼將發送到您註冊時，所輸入的電子郵件當中。<br />輸入註冊時的電子郵件地址後，請按「查詢帳號/密碼」按鈕。<br />]]></value>
+		<value xml:lang="fr"><![CDATA[Your account info will be noticed by registered email address.<br />Please input email address which you have input on registration, and press "Find Account Info" button.<br />]]></value>
+		<value xml:lang="ru"><![CDATA[ID и пароль при регистрации будут посланы Вам по имейл адресу.<br /> Введите имейл адрес, указанный при регистрации и кликните на кнопку "Поиск ID/пароль".<br />]]></value>
+		<value xml:lang="es"><![CDATA[Su información de la cuenta será observado por dirección de correo electrónico registrada. <br /> Introduce la dirección de correo electrónico que usted tiene de entrada en el registro, y pulse "Buscar" Información de la cuenta ". <br />]]></value>
+		<value xml:lang="tr"><![CDATA[Hesap bilginiz, kayıt olduğunuz e-posta adresine gönderilecektir.<br />Kayıt esnasında kullandığınız e-posta adresini giriniz ve "Hesap Bilgisini Bul" tuşuna basınız.<br />]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin tài khoản của bạn sẽ được tìm thấy với Email bạn đã đăng kí.<br />Xin vui lòng nhập Email mà bạn đã đăng kí và bấm "Lấy lại thông tin" để nhận được thông tin đăng nhập!.<br />]]></value>
+	</item>
+	<item name="about_temp_password">
+		<value xml:lang="ko"><![CDATA[임시 비밀번호가 정상적으로 발급되었습니다.<br />로그인 후 반드시 비밀번호를 변경하시기 바랍니다.<br/>]]></value>
+	</item>
+	<item name="about_member">
+		<value xml:lang="ko"><![CDATA[회원을 생성/수정/삭제 할 수 있고 그룹관리나 가입 폼 관리 등을 할 수 있는 회원 관리 모듈입니다.
+기본으로 생성된 그룹외의 그룹을 생성하여 회원 관리가 가능하고 가입 폼 관리를 통한 기본 정보외의 추가 정보를 요구할 수도 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Member module will help you create, modify and remove members and manage groups or the sign up form.
+You can add a custom group to manage members, and also get additional information by modifying the sign up form.]]></value>
+		<value xml:lang="jp"><![CDATA[会員の作成・修正・削除することができ、グループの管理、登録フォームの管理などが行える会員管理モジュールです。
+デフォルトで作成されたグループにグループを追加作成して会員管理ができるようにし、会員登録フォーム管理では基本情報の他、フォームの入力情報を追加することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以添加/修改/删除会员及管理用户组或注册表单的会员管理模块。
+此模块不仅可以生成缺省用户组以外的其他用户组来管理会员，并且通过注册表单的管理获得除会员基本信息以外的扩展信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以新增/修改/刪除會員及管理群組或註冊表單的會員管理模組。
+此模組不僅可以建立預設群組以外的其他群組來管理會員，並且通過註冊表單的管理獲得會員基本資料以外的延伸資料。]]></value>
+		<value xml:lang="fr"><![CDATA[C'est le module pour administrer des membres avec lequel vous pouvez créer/modifier/supprimer des membres ou administrer les groupes et la formule d'inscription.
+Vous pouvez administrer membres par création un nouveau groupe, ou gagner les informations additionnelles par l'administration la formule d'inscrioption.]]></value>
+		<value xml:lang="ru"><![CDATA[Этот модуль служит для создания/изменения/удаления пользователей, управления их группами и формой регистрации.
+Вы можете управлять пользователями посредством создания новых групп, и получить дополнительную информацию, управляя формой регистрации]]></value>
+		<value xml:lang="es"><![CDATA[Esto es un módulo para crear/modificar/eliminar usuarios y manejar grupos o el formato del registro.
+ Usted puede manejar usuarios creando nuevos grupos, y obtener información adicional manejando el formato del registro]]></value>
+		<value xml:lang="tr"><![CDATA[Üye modülü size; üyeleri oluşturmada, düzenlemede, silmede ve kayıt formunu ya da grupları düzenlemede yardımcı olur.
+Üyeleri yönetmek için özel gruplar ekleyebilir ve aynı zamanda kayıt formunu değiştirerek üyeler hakkında ek bilgi alabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Chức năng của Module này sẽ cho phép bạn tạo, sửa, xóa thành viên và quản lý nhóm hay Form đăng kí.
+Bạn có thể quản lý thành viên bằng cách tạo những nhóm mới, và thêm những thông tin trong Form đăng kí.]]></value>
+	</item>
+	<item name="about_ssl_port">
+		<value xml:lang="ko"><![CDATA[기본 포트 이외의 SSL 포트를 사용하는 경우 포트번호를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter if you are using non-default SSL port]]></value>
+		<value xml:lang="jp"><![CDATA[基本ポート以外のSSLポートを利用する場合、入力してください。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入想要使用 SSL預設埠口以外的埠口。]]></value>
+		<value xml:lang="fr"><![CDATA[Please input if you are using different SSL port with default one]]></value>
+		<value xml:lang="ru"><![CDATA[Please input if you are using different SSL port with default one]]></value>
+		<value xml:lang="es"><![CDATA[Please input if you are using different SSL port with default one]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer varsayılan SSL portundan farklı bir port kullanıyorsanız, lütfen giriniz]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập cổng kết nối mặc định cho SSL.]]></value>
+	</item>
+	<item name="add_openid">
+		<value xml:lang="ko"><![CDATA[오픈아이디 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add OpenID]]></value>
+		<value xml:lang="jp"><![CDATA[OpenIDの追加]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增 OpenID]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить OpenID]]></value>
+		<value xml:lang="tr"><![CDATA[OpenID Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm OpenID]]></value>
+	</item>
+	<item name="about_resend_auth_mail">
+		<value xml:lang="ko"><![CDATA[인증 메일을 받지 못하신 경우 다시 받으실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can request for the activation email if you have not activated yet.]]></value>
+		<value xml:lang="jp"><![CDATA[認証メールが届いてなかった場合、再送信の申請が可能です。<br />※申請の前に、当サイトからメールの受信ができるように設定してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有收到认证邮件时，可以在此重新发送认证邮件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[如果沒有收到認證郵件可以再重寄一次。]]></value>
+		<value xml:lang="fr"><![CDATA[You can request for authentication mail if you have failed before.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете получить снова письмо для авторизации, если еще не получили.]]></value>
+		<value xml:lang="es"><![CDATA[You can request for authentication mail if you have failed before.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer daha önce etkinleştirmediyseniz, etkinleştirme maili talebinde bulunabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Nhận lại mã kích hoạt nếu bạn đã không nhận được Email kích hoạt khi đăng kí.]]></value>
+	</item>
+	<item name="no_article">
+		<value xml:lang="ko"><![CDATA[글이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No articles]]></value>
+		<value xml:lang="jp"><![CDATA[書き込みがありません。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主題不存在]]></value>
+		<value xml:lang="fr"><![CDATA[There exists no article]]></value>
+		<value xml:lang="ru"><![CDATA[Записей нет]]></value>
+		<value xml:lang="es"><![CDATA[There exists no article]]></value>
+		<value xml:lang="tr"><![CDATA[Hiçbir makale bulunmuyor]]></value>
+	</item>
+	<item name="find_account_question">
+		<value xml:lang="ko"><![CDATA[비밀번호 찾기 질문/답변]]></value>
+		<value xml:lang="en"><![CDATA[Question for a temporary password.]]></value>
+		<value xml:lang="jp"><![CDATA[秘密質問]]></value>
+		<value xml:lang="zh-TW"><![CDATA[密碼提示問答]]></value>
+		<value xml:lang="tr"><![CDATA[Geçici şifre sorusu]]></value>
+	</item>
+	<item name="find_account_answer">
+		<value xml:lang="ko"><![CDATA[비밀번호 찾기 답변]]></value>
+		<value xml:lang="en"><![CDATA[Answer for a temporary password.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[忘記密碼提示]]></value>
+		<value xml:lang="jp"><![CDATA[秘密質問の答え]]></value>
+	</item>
+	<item name="about_find_account_question">
+		<value xml:lang="ko"><![CDATA[가입 시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can get a temporary password by your ID, email address, and the answer for the question you have set.]]></value>
+		<value xml:lang="jp"><![CDATA[登録した時、入力したIDとメールアドレス、秘密質問の答えで仮のパスワードをもらえる事ができます。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可透過帳號、電子郵件和設定提示問答來獲得臨時密碼。]]></value>
+		<value xml:lang="tr"><![CDATA[Kimliğinize, mail adresinize ya da cevapladığınız soruya göre geçici şifre edinebilirsiniz.]]></value>
+	</item>
+	<item name="find_account_question_items" type="array">
+		<item name="0">
+			<value xml:lang="ko"><![CDATA[]]></value>
+		</item>
+		<item name="1">
+			<value xml:lang="ko"><![CDATA[다른 이메일 주소는?]]></value>
+			<value xml:lang="en"><![CDATA[What is your alternate email address?]]></value>
+			<value xml:lang="jp"><![CDATA[他のメールアドレスは？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[其他電子郵件?]]></value>
+			<value xml:lang="tr"><![CDATA[Diğer e-posta adresiniz nedir?]]></value>
+		</item>
+		<item name="2">
+			<value xml:lang="ko"><![CDATA[나의 보물 1호는?]]></value>
+			<value xml:lang="en"><![CDATA[What is your favorite thing?]]></value>
+			<value xml:lang="jp"><![CDATA[私の一番大事なものは？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[我最愛的是?]]></value>
+			<value xml:lang="tr"><![CDATA[En sevdiğiniz şey?]]></value>
+		</item>
+		<item name="3">
+			<value xml:lang="ko"><![CDATA[나의 출신 초등학교는?]]></value>
+			<value xml:lang="en"><![CDATA[Which elementary school did you attend?]]></value>
+			<value xml:lang="jp"><![CDATA[私の卒業した小学校は？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[我讀的國小是?]]></value>
+			<value xml:lang="tr"><![CDATA[Mezun olduğunuz ilkokul?]]></value>
+		</item>
+		<item name="4">
+			<value xml:lang="ko"><![CDATA[나의 출신 고향은?]]></value>
+			<value xml:lang="en"><![CDATA[Where is your hometown?]]></value>
+			<value xml:lang="jp"><![CDATA[私の生まれた街は？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[我的出生地?]]></value>
+			<value xml:lang="tr"><![CDATA[Memleketiniz neresi?]]></value>
+		</item>
+		<item name="5">
+			<value xml:lang="ko"><![CDATA[나의 이상형은?]]></value>
+			<value xml:lang="en"><![CDATA[What is your ideal match?]]></value>
+			<value xml:lang="jp"><![CDATA[私の理想のタイプは？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[我的理想?]]></value>
+			<value xml:lang="tr"><![CDATA[İdeal eşiniz nasıl olmalı?]]></value>
+		</item>
+		<item name="6">
+			<value xml:lang="ko"><![CDATA[어머니 성함은?]]></value>
+			<value xml:lang="en"><![CDATA[What is your mother's name?]]></value>
+			<value xml:lang="jp"><![CDATA[母の名前は？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[母親的姓名?]]></value>
+			<value xml:lang="tr"><![CDATA[Annenizin adı?]]></value>
+		</item>
+		<item name="7">
+			<value xml:lang="ko"><![CDATA[아버지 성함은?]]></value>
+			<value xml:lang="en"><![CDATA[What is your father's name?]]></value>
+			<value xml:lang="jp"><![CDATA[父の名前は？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[父親的姓名?]]></value>
+			<value xml:lang="tr"><![CDATA[Babanızın adı?]]></value>
+		</item>
+		<item name="8">
+			<value xml:lang="ko"><![CDATA[가장 좋아하는 색깔은?]]></value>
+			<value xml:lang="en"><![CDATA[What is your favorite color?]]></value>
+			<value xml:lang="jp"><![CDATA[好きな色は？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最喜歡的顏色?]]></value>
+			<value xml:lang="tr"><![CDATA[En sevdiğiniz renk?]]></value>
+		</item>
+		<item name="9">
+			<value xml:lang="ko"><![CDATA[가장 좋아하는 음식은?]]></value>
+			<value xml:lang="en"><![CDATA[What is your favorite food?]]></value>
+			<value xml:lang="jp"><![CDATA[好きな食べ物は？]]></value>
+			<value xml:lang="zh-TW"><![CDATA[最愛的食物是?]]></value>
+			<value xml:lang="tr"><![CDATA[En sevdiğiniz yemek?]]></value>
+		</item>
+	</item>
+	<item name="temp_password">
+		<value xml:lang="ko"><![CDATA[임시 비밀번호]]></value>
+		<value xml:lang="en"><![CDATA[Temporary password]]></value>
+		<value xml:lang="jp"><![CDATA[仮のパスワード]]></value>
+		<value xml:lang="zh-TW"><![CDATA[臨時密碼]]></value>
+		<value xml:lang="tr"><![CDATA[Geçici şifre]]></value>
+	</item>
+	<item name="cmd_get_temp_password">
+		<value xml:lang="ko"><![CDATA[임시 비밀번호 발급]]></value>
+		<value xml:lang="en"><![CDATA[Get a temporary password]]></value>
+		<value xml:lang="jp"><![CDATA[仮のパスワードをもらう]]></value>
+		<value xml:lang="zh-TW"><![CDATA[取得臨時密碼]]></value>
+		<value xml:lang="tr"><![CDATA[Geçici bir şifre edin]]></value>
+	</item>
+	<item name="about_get_temp_password">
+		<value xml:lang="ko"><![CDATA[로그인 후 비밀번호 변경해 주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Change your password after you logged in.]]></value>
+		<value xml:lang="jp"><![CDATA[ログインしてから直ちにパスワードを変更してください。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請再登入後變更密碼。]]></value>
+		<value xml:lang="tr"><![CDATA[Giriş yaptıktan sonra şifrenizi değiştirin.]]></value>
+	</item>
+	<item name="msg_question_not_exists">
+		<value xml:lang="ko"><![CDATA[등록한 비밀번호 찾기 질문/답변이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You haven`t set your question for a temporary password.]]></value>
+		<value xml:lang="jp"><![CDATA[秘密質問を決めていません。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尚未輸入提示問答]]></value>
+		<value xml:lang="tr"><![CDATA[Geçici şifre için güvenlik sorusunu belirlemediniz.]]></value>
+	</item>
+	<item name="msg_answer_not_matches">
+		<value xml:lang="ko"><![CDATA[비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Your answer for the question is not correct.]]></value>
+		<value xml:lang="jp"><![CDATA[秘密質問の答えが正しくありません。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[答案不正確]]></value>
+		<value xml:lang="tr"><![CDATA[Soru için verdiğiniz cevap doğru değil.]]></value>
+	</item>
+	<item name="change_password_date">
+		<value xml:lang="ko"><![CDATA[비밀번호 갱신주기]]></value>
+		<value xml:lang="en"><![CDATA[Password renewal cycle]]></value>
+		<value xml:lang="jp"><![CDATA[パスワード更新周期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[密碼更新]]></value>
+		<value xml:lang="tr"><![CDATA[Şifre yenileme döngüsü]]></value>
+	</item>
+	<item name="about_change_password_date">
+		<value xml:lang="ko"><![CDATA[일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ]]></value>
+		<value xml:lang="en"><![CDATA[If you set a value to this, you will be notified to change your password periodically. (If set to 0, disabled)]]></value>
+		<value xml:lang="jp"><![CDATA[設定した更新周期によってパスワード変更のお知らせがもらえます。（０に設定すると無効になる） ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可設定密碼更新週期，將會定期通知更換密碼。 (設為零則不使用)]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer buna bir değer biçerseniz, şifrenizi belirli aralıklarla değiştirmeniz konusunda bildirim alacaksanız (eğer 0 olarak ayarlandıysa, devredışıdır)]]></value>
+	</item>
+	<item name="msg_kr_address">
+		<value xml:lang="ko"><![CDATA[읍, 면, 동 이름으로 검색하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Search for the name of eup, myeon or dong of your address.]]></value>
+	</item>
+	<item name="msg_kr_address_etc">
+		<value xml:lang="ko"><![CDATA[나머지 주소(번지)를 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[Enter the rest of your address.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入剩餘的地址(街道)。]]></value>
+		<value xml:lang="jp"><![CDATA[住所を入力してください。]]></value>
+	</item>
+	<item name="cmd_search_again">
+		<value xml:lang="ko"><![CDATA[다시 검색]]></value>
+		<value xml:lang="en"><![CDATA[Search again]]></value>
+		<value xml:lang="jp"><![CDATA[再検索]]></value>
+		<value xml:lang="zh-TW"><![CDATA[再找一次]]></value>
+	</item>
+	<item name="msg_select_user">
+		<value xml:lang="ko"><![CDATA[관리할 회원을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select a member to manage.]]></value>
+		<value xml:lang="jp"><![CDATA[管理する会員を選択してください。]]></value>
+	</item>
+	<item name="msg_delete_user">
+		<value xml:lang="ko"><![CDATA[선택한 회원을 삭제합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Delete the selected member.]]></value>
+	</item>
+	<item name="cmd_selected_user_manage">
+		<value xml:lang="ko"><![CDATA[선택한 회원 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage selected memter]]></value>
+		<value xml:lang="jp"><![CDATA[選択した会員管理]]></value>
+	</item>
+	<item name="about_change_user_group">
+		<value xml:lang="ko"><![CDATA[선택한 회원의 그룹을 다시 설정.]]></value>
+		<value xml:lang="en"><![CDATA[Resets the selected group of memebers.]]></value>
+		<value xml:lang="jp"><![CDATA[選択した会員のグループを再設定する。]]></value>
+	</item>
+	<item name="about_send_message">
+		<value xml:lang="ko"><![CDATA[회원에게 쪽지를 발송해서 이 사실을 알립니다. 작성하지 않으면 발송하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Send a message to the member about this. If you don't write a message, it is not sent.]]></value>
+		<value xml:lang="jp"><![CDATA[会員にメッセージを送信して、知らせます。作成しなければ送信されません。]]></value>
+	</item>
+	<item name="cmd_required">
+		<value xml:lang="ko"><![CDATA[필수]]></value>
+		<value xml:lang="en"><![CDATA[Required]]></value>
+		<value xml:lang="jp"><![CDATA[必須]]></value>
+	</item>
+	<item name="cmd_optional">
+		<value xml:lang="ko"><![CDATA[선택]]></value>
+		<value xml:lang="en"><![CDATA[Optional]]></value>
+		<value xml:lang="jp"><![CDATA[選択]]></value>
+	</item>
+	<item name="cmd_image_max_width">
+		<value xml:lang="ko"><![CDATA[너비 제한]]></value>
+		<value xml:lang="en"><![CDATA[Max Width]]></value>
+		<value xml:lang="jp"><![CDATA[横幅制限]]></value>
+	</item>
+	<item name="cmd_image_max_height">
+		<value xml:lang="ko"><![CDATA[높이 제한]]></value>
+		<value xml:lang="en"><![CDATA[Max Height]]></value>
+		<value xml:lang="jp"><![CDATA[高さ制限]]></value>
+	</item>
+	<item name="cmd_input_extend_form">
+		<value xml:lang="ko"><![CDATA[회원 정의 입력]]></value>
+		<value xml:lang="en"><![CDATA[User Defined Input]]></value>
+	</item>
+	<item name="about_multi_type">
+		<value xml:lang="ko"><![CDATA[다중 또는 단일 항목의 선택 값을 입력하세요.(줄 바꿈으로 구분)]]></value>
+		<value xml:lang="en"><![CDATA[Enter the value of multi-or single-item selection.(separated by line breaks)]]></value>
+	</item>
+	<item name="msg_delete_extend_form">
+		<value xml:lang="ko"><![CDATA[선택한 항목을 삭제합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Delete the selected item.]]></value>
+	</item>
+	<item name="set_manage_id">
+		<value xml:lang="ko"><![CDATA[줄 바꿈으로 구분]]></value>
+		<value xml:lang="en"><![CDATA[Separated by line breaks.]]></value>
+		<value xml:lang="jp"><![CDATA[改行で区別]]></value>
+	</item>
+	<item name="count_manage_id">
+		<value xml:lang="ko"><![CDATA[<span class="_deniedIDCount">%s</span>개의 금지아이디가 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There are <strong>%s</strong> prohibited ID.]]></value>
+		<value xml:lang="jp"><![CDATA[<span class="_deniedIDCount">%s</span>個の禁止IDがあります。]]></value>
+	</item>
+	<item name="user_list">
+		<value xml:lang="ko"><![CDATA[회원 목록]]></value>
+		<value xml:lang="en"><![CDATA[Member List]]></value>
+		<value xml:lang="jp"><![CDATA[会員リスト]]></value>
+	</item>
+	<item name="cmd_show_all_member">
+		<value xml:lang="ko"><![CDATA[모든 회원]]></value>
+		<value xml:lang="en"><![CDATA[All Member]]></value>
+		<value xml:lang="jp"><![CDATA[すべての会員]]></value>
+	</item>
+	<item name="cmd_show_super_admin_member">
+		<value xml:lang="ko"><![CDATA[최고 관리자]]></value>
+		<value xml:lang="en"><![CDATA[Super Admin]]></value>
+		<value xml:lang="jp"><![CDATA[最高管理者]]></value>
+	</item>
+	<item name="cmd_show_site_admin_member">
+		<value xml:lang="ko"><![CDATA[사이트 관리자]]></value>
+		<value xml:lang="en"><![CDATA[Site Admin]]></value>
+		<value xml:lang="jp"><![CDATA[サイト管理者]]></value>
+	</item>
+	<item name="approval">
+		<value xml:lang="ko"><![CDATA[승인]]></value>
+		<value xml:lang="en"><![CDATA[Approval]]></value>
+		<value xml:lang="jp"><![CDATA[承認]]></value>
+	</item>
+	<item name="denied">
+		<value xml:lang="ko"><![CDATA[거부]]></value>
+		<value xml:lang="en"><![CDATA[Denied]]></value>
+		<value xml:lang="jp"><![CDATA[拒否]]></value>
+	</item>
+	<item name="use_group_image_mark">
+		<value xml:lang="ko"><![CDATA[그룹 이미지 마크 사용]]></value>
+		<value xml:lang="en"><![CDATA[Use group image mark]]></value>
+		<value xml:lang="jp"><![CDATA[グループイメージマーク使用]]></value>
+	</item>
+	<item name="group_image_mark">
+		<value xml:lang="ko"><![CDATA[그룹 이미지 마크]]></value>
+		<value xml:lang="en"><![CDATA[Group image mark]]></value>
+		<value xml:lang="jp"><![CDATA[グループイメージマーク]]></value>
+	</item>
+	<item name="usable_group_image_mark_list">
+		<value xml:lang="ko"><![CDATA[사용가능한 그룹 이미지 마크 목록]]></value>
+		<value xml:lang="en"><![CDATA[ Usable list of group image mark]]></value>
+		<value xml:lang="jp"><![CDATA[使用可能なグループイメージマークリスト]]></value>
+	</item>
+	<item name="add_group_image_mark">
+		<value xml:lang="ko"><![CDATA[그룹 이미지 마크 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add group image mark]]></value>
+		<value xml:lang="jp"><![CDATA[グループイメージマーク追加]]></value>
+	</item>
+	<item name="link_file_box">
+		<value xml:lang="ko"><![CDATA[파일박스 관리 바로가기...]]></value>
+		<value xml:lang="en"><![CDATA[Go to Manage FileBox...]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルボックス管理]]></value>
+	</item>
+	<item name="msg_group_delete">
+		<value xml:lang="ko"><![CDATA[선택한 그룹을 삭제합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Delete selected group.]]></value>
+		<value xml:lang="jp"><![CDATA[選択グループを削除します。]]></value>
+	</item>
+	<item name="email">
+		<value xml:lang="ko"><![CDATA[이메일]]></value>
+		<value xml:lang="en"><![CDATA[Email]]></value>
+		<value xml:lang="jp"><![CDATA[メール]]></value>
+	</item>
+	<item name="add_prohibited_id">
+		<value xml:lang="ko"><![CDATA[금지 아이디 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add prohibited id]]></value>
+		<value xml:lang="jp"><![CDATA[禁止ID追加]]></value>
+	</item>
+	<item name="multi_line_input">
+		<value xml:lang="ko"><![CDATA[여러 항목은 줄을 바꾸어 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[To enter multiple entries, please change the line input.]]></value>
+		<value xml:lang="jp"><![CDATA[複数の項目は、改行して入力してください。]]></value>
+	</item>
+	<item name="add_extend_form">
+		<value xml:lang="ko"><![CDATA[사용자 정의 항목 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add user defined item]]></value>
+		<value xml:lang="jp"><![CDATA[ユーザー定義項目追加]]></value>
+	</item>
+	<item name="msg_null_prohibited_id">
+		<value xml:lang="ko"><![CDATA[추가할 금지 아이디를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter an ID to prohibit.]]></value>
+		<value xml:lang="jp"><![CDATA[追加する禁止IDを入力してください。]]></value>
+	</item>
+	<item name="identifier">
+		<value xml:lang="ko"><![CDATA[로그인 계정]]></value>
+		<value xml:lang="en"><![CDATA[Login Account]]></value>
+		<value xml:lang="jp"><![CDATA[ログインアカウント]]></value>
+	</item>
+	<item name="about_identifier">
+		<value xml:lang="ko"><![CDATA[로그인에 사용할 계정을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select an account to use when logging in.]]></value>
+		<value xml:lang="jp"><![CDATA[ログインに使用するアカウントを選択してください。]]></value>
+	</item>
+	<item name="use_after_save">
+		<value xml:lang="ko"><![CDATA[저장 후 사용]]></value>
+		<value xml:lang="en"><![CDATA[Use after saved]]></value>
+	</item>
+	<item name="cmd_add_group">
+		<value xml:lang="ko"><![CDATA[그룹 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add group]]></value>
+	</item>
+	<item name="msg_groups_exist">
+		<value xml:lang="ko"><![CDATA[개 그룹이 존재합니다.]]></value>
+		<value xml:lang="en"><![CDATA[groups are exist.]]></value>
+	</item>
+	<item name="cmd_member_config">
+		<value xml:lang="ko"><![CDATA[회원 설정]]></value>
+		<value xml:lang="en"><![CDATA[Member Configuration]]></value>
+	</item>
+</lang>
diff --git a/modules/member/lang/ru.lang.php b/modules/member/lang/ru.lang.php
deleted file mode 100644
index 6c07e0d87..000000000
--- a/modules/member/lang/ru.lang.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->member = 'Пользователь';
-    $lang->member_default_info = 'Основная информация';
-    $lang->member_extend_info = 'Дополнительная информация';
-    $lang->default_group_1 = "Новичок";
-    $lang->default_group_2 = "Постоянный участник";
-    $lang->admin_group = "Администратор";
-    $lang->keep_signed = 'Сохранить логин';
-    $lang->remember_user_id = 'Сохранить ID';
-    $lang->already_logged = "Вы уже вошли";
-    $lang->denied_user_id = 'Извините. Этот ID запрещен';
-    $lang->null_user_id = 'Пожалуйста, введите ID';
-    $lang->null_password = 'Пожалуйста, введите пароль';
-    $lang->invalid_authorization = 'Вы не авторизированы';
-    $lang->invalid_user_id= "Указанный ID не существует";
-    $lang->invalid_password = 'Неверный пароль';
-    $lang->invalid_new_password = '이전 비밀번호와 같습니다.';
-    $lang->allow_mailing = 'Получать рассылки';
-    $lang->denied = 'Отменить пользование';
-    $lang->is_admin = 'Суперадминистративные права';
-    $lang->group = 'Группа';
-    $lang->group_title = 'Имя группы';
-    $lang->group_srl = 'Номер группы';
-    $lang->signature = 'Подпись';
-    $lang->profile_image = 'Фотография участника';
-    $lang->profile_image_max_width = 'Макс. ширина';
-    $lang->profile_image_max_height = 'Макс. высота';
-    $lang->image_name = 'Имя изображения';
-    $lang->image_name_max_width = 'Макс. ширина';
-    $lang->image_name_max_height = 'Макс. высота';
-    $lang->image_mark = 'Image Mark';
-    $lang->image_mark_max_width = 'Макс. ширина';
-    $lang->image_mark_max_height = 'Макс. высота';
-    $lang->group_image_mark = 'Group Image Mark';
-    $lang->group_image_mark_max_width = 'Макс. ширина';
-    $lang->group_image_mark_max_height = 'Макс. высота';
-    $lang->group_image_mark_order = 'Group Image Mark Order';
-    $lang->signature_max_height = 'Max Signature Height';
-    $lang->enable_openid = 'Включить открытый ID (OpenID)';
-    $lang->enable_join = 'Разрешение на регистрацию';
-    $lang->enable_confirm = 'Активация по email';
-    $lang->enable_ssl = 'использоватьSSL';
-    $lang->security_sign_in = 'Sign in using enhanced security';
-    $lang->limit_day = 'Дата временного лимит';
-    $lang->limit_date = 'Дата лимита';
-    $lang->after_login_url = 'URL после логин';
-    $lang->after_logout_url = 'URL после логаут';
-    $lang->redirect_url = 'URL после регистрации';
-    $lang->agreement = 'Пользовательское соглашение о регистрации';
-    $lang->accept_agreement = 'Согласен';
-    $lang->member_info = 'Пользовательская информация';
-    $lang->current_password = 'Текущий пароль';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = 'Сообщения разрешены';
-    $lang->allow_message_type = array(
-            'Y' => 'Разрешено всем',
-            'F' => 'Разрешено только зарегистрированным друзьям',
-            'N' => 'Запрещено всем',
-    );
-    $lang->about_allow_message = '쪽지 허용 방법 및 대상을 지정할 수 있습니다';
-    $lang->logged_users = 'Logged Users';
-
-    $lang->webmaster_name = "Имя веб-мастера";
-    $lang->webmaster_email = "Email веб-мастера";
-
-    $lang->about_keep_signed = 'Вы будете в состоянии логин, даже при закрытии окна браузера.\n\nЕсли вы пользуетесь общественным компьютером, сделайте выход в целях сохранения персональных данных';    
-    $lang->about_keep_warning = 'Вы будете в состоянии логин, даже при закрытии окна браузера.Если вы пользуетесь общественным компьютером, сделайте выход в целях сохранения персональных данных';   
-    $lang->about_webmaster_name = "Пожалуйста, введите имя вебмастера, которое будет использоваться для авторизационных писем или другого адиминистрирования сайта. (по умолчанию : webmaster)";
-    $lang->about_webmaster_email = "Пожалуйста, введите email адрес вебмастера.";
-
-    $lang->search_target_list = array(
-        'user_id' => 'ID',
-        'user_name' => 'Имя',
-        'nick_name' => 'Ник',
-        'email_address' => 'Email',
-        'regdate' => 'Дата регистрации',
-        'regdate_more' => 'Дата регистрации(more)',
-        'regdate_less' => 'Дата регистрации(less)',
-        'last_login' => 'Дата последнего входа',
-        'last_login_more' => 'Last Sign in Date (more)',
-        'last_login_less' => 'Last Sign in Date (less)',
-        'extra_vars' => 'Экстра перем.',
-    );
-
-    $lang->cmd_login = 'Вход на сайт';
-    $lang->cmd_logout = 'Выход';
-    $lang->cmd_signup = 'Регистрация';
-    $lang->cmd_site_signup = 'Регистрация';
-    $lang->cmd_modify_member_info = 'Изменить информацию пользователя';
-    $lang->cmd_modify_member_password = 'Изменить пароль';
-    $lang->cmd_view_member_info = 'Личная информация';
-    $lang->cmd_leave = 'Удалить аккаунт';
-    $lang->cmd_find_member_account = 'Найти ID/пароль';
-    $lang->cmd_resend_auth_mail = 'Послать email для авторизации';
-
-    $lang->cmd_member_list = 'Список пользователей';
-    $lang->cmd_module_config = 'Стандартные настройки';
-    $lang->cmd_member_group = 'Управление группами';
-    $lang->cmd_send_mail = 'Отправить письмо';
-    $lang->cmd_manage_id = 'Управление запрещенными ID';
-    $lang->cmd_manage_form = 'Управление формой регистрации';
-    $lang->cmd_view_own_document = 'Просмотреть написанные записи';
-    $lang->cmd_manage_member_info = 'Изменить информацию пользователя';
-    $lang->cmd_trace_document = 'Trace Written Articles';
-    $lang->cmd_trace_comment = 'Trace Written Comments';
-    $lang->cmd_view_scrapped_document = 'Просмотреть Scraps';
-    $lang->cmd_view_saved_document = 'Просмотреть сохраненные записи';
-    $lang->cmd_send_email = 'Отправить письмо';
-
-    $lang->msg_email_not_exists = "Email адрес не существует";
-
-    $lang->msg_alreay_scrapped = 'Эта статья уже в Scraps';
-
-    $lang->msg_cart_is_null = 'Пожалуйста, выберите назначение';
-    $lang->msg_checked_file_is_deleted = '%d вложенные файлы удалены';
-
-    $lang->msg_find_account_title = 'Информация аккаунта';
-    $lang->msg_find_account_info = 'Запрашиваемая информация аккаунта.';
-    $lang->msg_find_account_comment = 'Кликните на ссылку ниже и пароль будет изменен на указанный вами.<br />Пожалуйста, измените пароль после входа на сайт';
-    $lang->msg_confirm_account_title = 'Письмо, подтверждающее регистрацию';
-    $lang->msg_confirm_account_info = 'Информация аккаунта при регистрации';
-    $lang->msg_confirm_account_comment = 'Подтвердите авторизацию, кликнув на ссылку ниже';
-    $lang->msg_auth_mail_sent = 'Письмо с регистрационной информацией отправлено для %s. Пожалуйста, проверьте Вашу почту';
-    $lang->msg_confirm_mail_sent = 'Письмо для авторизации отправлено для %s. Пожалуйста, проверьте Вашу почту';
-    $lang->msg_invalid_auth_key = 'Неверный запрос на авторизацию.<br />Пожалуйста, попытайтеть найти информацию аккаунта или свяжитесь с администратором.';
-    $lang->msg_success_authed = 'Ваш аккаунт был успешно авторизован.\nВход произведен. Пожалуйста, измените пароль на Ваш собственный.';
-    $lang->msg_success_confirmed = 'Авторизация Вашего аккаунта прошла успешно';
-
-    $lang->msg_new_member = 'Добавить пользователя';
-    $lang->msg_update_member = 'Изменить информацию пользователя';
-    $lang->msg_leave_member = 'Удалить аккаунт';
-    $lang->msg_group_is_null = 'Зарегистрированной группы нет';
-    $lang->msg_not_delete_default = 'Стандартные объекты не могут быть удалены';
-    $lang->msg_not_exists_member = "Пользователь не существует";
-    $lang->msg_cannot_delete_admin = 'Административный ID не может быть удален. Пожалуйста, удалить ID  из администрации и попробуйте снова.';
-    $lang->msg_exists_user_id = 'Этот ID уже существует. Пожалуйста, попробуйте другой.';
-    $lang->msg_exists_email_address = 'Этот email адрес уже зарегистрирован. Пожалуйста, попробуйте другой.';
-    $lang->msg_exists_nick_name = 'Этот ник уже существует. Пожалуйста, попробуйте другой.';
-    $lang->msg_signup_disabled = 'Вы не можете зарегистрироваться';
-    $lang->msg_already_logged = 'Вы уже зарегистрированы';
-    $lang->msg_not_logged = 'Пожалуйста, сначала сделайте вход на сайт';
-    $lang->msg_insert_group_name = 'Пожалуйста, введите имя группы';
-    $lang->msg_check_group = 'Выберите группу';
-
-    $lang->msg_not_uploaded_image_name = 'Невозможно зарегистрировать фотографию профиля';
-    $lang->msg_not_uploaded_image_name = 'Невозможно зарегистрировать имя фотографии';
-    $lang->msg_not_uploaded_image_mark = 'Невозможно зарегистрировать марку фотографии';
-    $lang->msg_not_uploaded_group_image_mark = 'Невозможно зарегистрировать марку изображения группы';
-    
-    $lang->msg_accept_agreement = 'Вы должны принять Соглашение';
-
-    $lang->msg_user_denied = 'Введенный ID запрещен';
-    $lang->msg_user_not_confirmed = 'Вы еще не прошли авторизацию, проверьте свою почту';
-    $lang->msg_user_limited = 'Введенный ID возможно использовать после %s';
-
-    $lang->about_user_id = 'Юзер ID должен состоять из 3~20 знаков и содержать алфавит или цифры, начинаясь с алфавитного знака.';
-    $lang->about_password = 'Пароль должен состоять из 6~20 знаков';
-    $lang->about_user_name = 'Имя должно состоять из 2~20 знаков';
-    $lang->about_nick_name = 'Ник должен состоять из  2~20 знаков';
-    $lang->about_email_address = 'Email адрес используется для изменения/получения пароля после его авторизации.';
-    $lang->about_homepage = 'Пожалуйста, введите, если у Вас есть вебсайт';
-    $lang->about_blog_url = 'Пожалуйста, введите, если у Вас есть блог';
-    $lang->about_birthday = 'Пожалуйста, введите Вашу дату рождения';
-    $lang->about_allow_mailing = "Если Вы не присоединитесь к списку рассылки, Вы не сможете получать почтовые сообщения, направленные Вашей группе";
-    $lang->about_denied = 'Запретить ID';
-    $lang->about_is_admin = 'Наделить Суперадминистративными правами';
-    $lang->about_member_description = "Заметки администратора о пользователях";
-    $lang->about_group = 'ID может принадлежать нескольким группам';
-
-    $lang->about_column_type = 'Пожалуйста, установите формат дополнительной формы регистрации';
-    $lang->about_column_name = 'Пожалуйста, введите английское название, которое будет использоваться в шаблоне как переменная';
-    $lang->about_column_title = 'Это будет отображено, когда пользователь регистрируется или изменяет/просматривает информацию пользователя';
-    $lang->about_default_value = 'Вы можете установить значения по умолчанию';
-    $lang->about_active = 'Вам следует выбрать активные объекты для отображения в форме регистрации';
-    $lang->about_form_description = 'Если Вы введете описание, оно будет отображено в форме регистрации';
-    $lang->about_required = 'Сделать элемент обязательным в форме регистрации';
-
-    $lang->about_enable_openid = 'Позволить пользователям регистрироваться как OpenID';
-    $lang->about_enable_join = 'Позволить пользователям регистрироваться';
-    $lang->about_enable_confirm = 'Please check if you want new members to activate their accounts via their emails.';
-    $lang->about_enable_ssl = 'Personal information from Sign up/Modify Member Info/Sign in can be sent as SSL(https) mode if server provides SSL service';
-    $lang->about_limit_day = 'Вы можете ограничить дату авторизации после регистрации';
-    $lang->about_limit_date = 'Пользователь не может войти до указанной даты';
-    $lang->about_after_login_url = 'Возможен переход на указанный URL после логин. Если не укажете, то данная страница отобразиться.';
-    $lang->about_after_logout_url = 'Возможен переход на указанный URL после выхода. Если не укажете, то данная страница отобразиться.';
-    $lang->about_redirect_url = 'Пожалуйста, введите URL, куда пользователи попадут после регистрации. Когда поле пустое, будет установлена страница предшествующая странице регистрации.';
-    $lang->about_agreement = 'Регистрационное соглашение будет показано, если оно содержит текст';
-
-    $lang->about_image_name = 'Возможно использование изображение вместо текста';
-    $lang->about_image_mark = 'Возможно использование марки перед именем';
-    $lang->about_group_image_mark = 'Возможно использование групповой марки перед именем';
-    $lang->about_profile_image = 'Позволить пользователям использовать изображения профиля';
-    $lang->about_signature_max_height = 'Возможно установить лимит подписи. (0 Если оставите пустым, то лимита не будет.)';
-    $lang->about_accept_agreement = 'Я прочитал соглашение полностью и согласен';
-
-    $lang->about_member_default = 'При регистрации устанавливается стандартная группа';
-
-    $lang->about_openid = 'При регистраци как OpenID, основнаая информация (ID или email адрес) будет сохранена на сайте, но операции с паролем и авторизацией будут произведены над текущим OpenID в представленном сервисе';
-    $lang->about_openid_leave = 'Удаление аккаунта с OpenID производит удаление Вашей информации пользователя на сайте.<br />Если Вы войдете после удаления аккаунта, Вы будете разпознаны как новый пользователь и доступ к написанным Вами ранее записям будет закрыт.';
-    $lang->about_find_member_account = 'ID и пароль при регистрации будут посланы Вам по имейл адресу.<br /> Введите имейл адрес, указанный при регистрации и кликните на кнопку "Поиск ID/пароль".<br />';
-
-    $lang->about_member = "Этот модуль служит для создания/изменения/удаления пользователей, управления их группами и формой регистрации.\nВы можете управлять пользователями посредством создания новых групп, и получить дополнительную информацию, управляя формой регистрации";
-    $lang->about_ssl_port = 'Please input if you are using different SSL port with default one';
-    $lang->add_openid = 'Добавить OpenID';
-
-    $lang->about_resend_auth_mail = 'Вы можете получить снова письмо для авторизации, если еще не получили.';
-    $lang->no_article = 'Записей нет';
-
-    $lang->find_account_question = '비밀번호 찾기 질문/답변';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '가입시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.';
-    /*
-    $lang->find_account_question_items = array(''
-                                        ,'다른 이메일 주소는?'
-                                        ,'나의 보물 1호는?'
-                                        ,'나의 출신 초등학교는?'
-                                        ,'나의 출신 고향은?'
-                                        ,'나의 이상형은?'
-                                        ,'어머니 성함은?'
-                                        ,'아버지 성함은?'
-                                        ,'가장 좋아하는 색깔은?'
-                                        ,'가장 좋아하는 음식은?'
-                                        );
-*/
-    $lang->temp_password = '임시 비밀번호';
-    $lang->cmd_get_temp_password = '임시 비밀번호 발급';
-    $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.';
-    $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.';
-    $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.';
-
-    $lang->change_password_date = '비밀번호 갱신주기';
-    $lang->about_change_password_date = '일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ';
-
-?>
diff --git a/modules/member/lang/tr.lang.php b/modules/member/lang/tr.lang.php
deleted file mode 100644
index f66e139ee..000000000
--- a/modules/member/lang/tr.lang.php
+++ /dev/null
@@ -1,235 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (Only Basic Things)
-     **/
-
-    $lang->member = 'Üye';
-    $lang->member_default_info = 'Temel Bilgi';
-    $lang->member_extend_info = 'Detaylı Bilgi';
-    $lang->default_group_1 = "Asil Üye";
-    $lang->default_group_2 = "Sıradan Üye";
-    $lang->admin_group = "Grup Yönetimi";
-    $lang->keep_signed = 'Beni bağlı tut';
-    $lang->remember_user_id = 'Kimliği Hatırla';
-    $lang->already_logged = "Zaten giriş yaptınız";
-    $lang->denied_user_id = 'Yasaklanmış bir kimlik girdiniz.';
-    $lang->null_user_id = 'Lütfen kimliğinizi giriniz';
-    $lang->null_password = 'Lütfen şifrenizi giriniz';
-    $lang->invalid_authorization = 'Hesap etkinleştirilmemiş.';
-    $lang->invalid_user_id= "Geçerli olmayan bir kimlik girdiniz";
-    $lang->invalid_password = 'Hatalı bir şifre girdiniz';
-    $lang->invalid_new_password = 'Yeni şifre, eski şifreyle aynı olmamalı.';
-    $lang->allow_mailing = 'Mailleşmeyi Aç';
-    $lang->denied = 'Yasaklanmış';
-    $lang->is_admin = 'Süperadmin Yetkisi';
-    $lang->group = 'Grup';
-    $lang->group_title = 'Grup Adı';
-    $lang->group_srl = 'Grup Numarası';
-    $lang->signature = 'İmza';
-    $lang->profile_image = 'Profil Resmi';
-    $lang->profile_image_max_width = 'En Yük. Genişlik';
-    $lang->profile_image_max_height = 'En Yük. Uzunluk';
-    $lang->image_name = 'Resim İsmi';
-    $lang->image_name_max_width = 'En Yük. Genişlik';
-    $lang->image_name_max_height = 'En Yük. Uzunluk';
-    $lang->image_mark = 'Resim İmi';
-    $lang->image_mark_max_width = 'En Yük. Genişlik';
-    $lang->image_mark_max_height = 'En Yük. Uzunluk';
-    $lang->group_image_mark = 'Grup Simgesi';
-    $lang->group_image_mark_max_width = 'En Yük. Genişlik';
-    $lang->group_image_mark_max_height = 'En Yük. Uzunluk';
-    $lang->group_image_mark_order = 'Grup Simge Sıralaması';
-    $lang->signature_max_height = 'En Yük. İmza Uzunluğu';
-    $lang->enable_openid = 'OpenID Aç';
-    $lang->enable_join = 'Yeni Üye Kabul Et';
-    $lang->enable_confirm = 'E-posta Doğrulaması';
-    $lang->enable_ssl = 'SSL Etkinleştir';
-    $lang->security_sign_in = 'Gelişmiş güvenliği kullanarak giriş yap';
-    $lang->limit_day = 'Geçici Zaman Sınırı';
-    $lang->limit_date = 'Zaman Sınırı';
-    $lang->after_login_url = 'Giriş yaptıktan sonraki URL';
-    $lang->after_logout_url = 'Çıkış yaptıktan sonraki URL';
-    $lang->redirect_url = 'Giriş yaptıktan sonraki URL';
-    $lang->agreement = 'Üyelik Sözleşmesi';
-    $lang->accept_agreement = 'Kabul Et';
-    $lang->member_info = 'Üye Bilgisi';
-    $lang->current_password = 'Geçerli Şifre';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = 'Mesajlaşmaya İzin Ver';
-    $lang->allow_message_type = array(
-            'Y' => 'Tümüne İzin Ver',
-            'F' => 'Arkadaşlara İzin Ver',
-            'N' => 'Tümünü Geri Çevir',
-    );
-    $lang->about_allow_message = 'Mesajlaşmaya izin verebilir/reddedebilirsiniz.';
-    $lang->logged_users = 'Giriş yapmış Kullanıcılar';
-
-    $lang->webmaster_name = "Webmaster İsmi";
-    $lang->webmaster_email = "Webmaster E-postası";
-
-    $lang->about_keep_signed = 'Tarayıcıyı kapatsanız da sisteme bağlı kalacaksınız.\n\nEğer ortak bir bilgisayar kullanıyorsanız, kişisel bilgilerinizin gizliliği için bunu önermiyoruz';
-    $lang->about_keep_warning = 'Tarayıcıyı kapatsanız da sisteme bağlı kalacaksınız. Eğer ortak bir bilgisayar kullanıyorsanız, kişisel bilgilerinizin gizliliği için bunu önermiyoruz';
-	$lang->about_webmaster_name = "Lütfen onay maillerinde veya site yönetiminde kullanılacak webmaster ismini giriniz. (varsayılan : webmaster)";
-    $lang->about_webmaster_email = "Lütfen webmaster e-posta adresini giriniz.";
-
-    $lang->search_target_list = array(
-        'user_id' => 'Kimlik',
-        'user_name' => 'İsim',
-        'nick_name' => 'Takma Ad',
-        'email_address' => 'E-posta Adresi',
-        'regdate' => 'Kayıt Tarihi',
-        'regdate_more' => 'Kayıt Tarihi (detaylı)',
-        'regdate_less' => 'Kayıt Tarihi (basit)',
-        'last_login' => 'Son Giriş Tarihi',
-        'last_login_more' => 'Son Giriş Tarihi (detaylı)',
-        'last_login_less' => 'Son Giriş Tarihi (basit)',
-        'extra_vars' => 'Fazladan Çeş.',
-    );
-
-    $lang->cmd_login = 'Giriş Yap';
-    $lang->cmd_logout = 'Çıkış Yap';
-    $lang->cmd_signup = 'Kaydol';
-    $lang->cmd_site_signup = 'Kaydol';
-    $lang->cmd_modify_member_info = 'Üye Bilgilerini Düzenle';
-    $lang->cmd_modify_member_password = 'Şifreyi Düzenle';
-    $lang->cmd_view_member_info = 'Üye Bilgisi';
-    $lang->cmd_leave = 'Ayrıl';
-    $lang->cmd_find_member_account = 'Hesap Bilgisi Bul';
-	$lang->cmd_resend_auth_mail = 'Etkinleştirme Maili Talebinde Bulun';
-
-    $lang->cmd_member_list = 'Üye Listesi';
-    $lang->cmd_module_config = 'Varsayılan Ayar';
-    $lang->cmd_member_group = 'Üye Grupları';
-    $lang->cmd_send_mail = 'Mail Gönder';
-    $lang->cmd_manage_id = 'Yasaklanmış Kimlikler';
-    $lang->cmd_manage_form = 'Kayıt Formu';
-    $lang->cmd_view_own_document = 'Yazılmış Makaleler';
-    $lang->cmd_manage_member_info = 'Üye Bilgisini Yönet';
-    $lang->cmd_trace_document = 'Yazılmış Makalelerini Gör';
-    $lang->cmd_trace_comment = 'Yazılmış Yorumlarını Gör';
-    $lang->cmd_view_scrapped_document = 'Hasarlılar';
-    $lang->cmd_view_saved_document = 'Kayıtlı Makaleler';
-    $lang->cmd_send_email = 'Mail Gönder';
-
-    $lang->msg_email_not_exists = "Geçerli olmayan bir e-posta adresi girdiniz";
-
-    $lang->msg_alreay_scrapped = 'Bu makale zaten hasarlı';
-
-    $lang->msg_cart_is_null = 'Lütfen hedefi seçiniz';
-    $lang->msg_checked_file_is_deleted = '%d isimli ek dosya silindi';
-
-    $lang->msg_find_account_title = 'Hesap Bilgisi';
-    $lang->msg_find_account_info = 'Talep edilen hesap bilgisi.';
-    $lang->msg_find_account_comment = 'Şifreniz aşağıdaki linke tıkladığınızda, yukardaki gibi değiştirilecektir.<br />Lütfen giriş yaptıktan sonra şifrenizi değiştiriniz.';
-    $lang->msg_confirm_account_title = 'Zeroboard XE Hesap Etkinleştirmesi';
-    $lang->msg_confirm_account_info = 'Hesap Bilginiz:';
-    $lang->msg_confirm_account_comment = 'Hesabınızı etkinleştirmek için takip eden linke tıklayınız.';
-    $lang->msg_auth_mail_sent = 'Etknileştirme maili %s adresine gönderildi. Lütfen mailinizi kontrol ediniz.';
-    $lang->msg_confirm_mail_sent = '%s adresine etkinleştirme maili gönderdik. Lütfen mailinizi kontrol ediniz.';
-    $lang->msg_invalid_auth_key = 'Geçersiz doğrulama talebi.<br />Lütfen hesap bilgisini tekrar bulmayı deneyin ya da yöneticilerle iletişime geçin.';
-    $lang->msg_success_authed = 'Hesabınız başarıyla etkinleştirildi ve giriş yapıldı.\n Lütfen mailinize gelen şifreyi kullanarak yeni şifreinizi oluşturunuz.';
-    $lang->msg_success_confirmed = 'Hesabınız başarıyla etkinleştirildi.';
-
-    $lang->msg_new_member = 'Üye Ekle';
-    $lang->msg_update_member = 'Üye Bilgisini Düzenle';
-    $lang->msg_leave_member = 'Ayrıl';
-    $lang->msg_group_is_null = 'Grup yok';
-    $lang->msg_not_delete_default = 'Varsayılan ögeler silinemez';
-    $lang->msg_not_exists_member = "Geçersiz üye";
-    $lang->msg_cannot_delete_admin = 'Admin Kimliği silinemez. Kimliği yönetimden çıkartıp tekrar deneyiniz.';
-    $lang->msg_exists_user_id = 'Bu kimlik önceden alınmış. Lütfen başka bir kimlik deneyiniz.';
-    $lang->msg_exists_email_address = 'Bu mail adresi zaten kullanımda. Lütfen başka bir mail adresi deneyiniz.';
-    $lang->msg_exists_nick_name = 'Bu rumuz önceden alınmış. Lütfen başka bir rumuz deneyiniz.';
-    $lang->msg_signup_disabled = 'Kayıt olma yetkiniz bulunmamaktadır';
-    $lang->msg_already_logged = 'Zaten giriş yapmış bulunmaktasınız';
-    $lang->msg_not_logged = 'Lütfen önce giriş yapınız';
-    $lang->msg_insert_group_name = 'Lütfen grup ismini giriniz';
-    $lang->msg_check_group = 'Lütfen grubu seçiniz';
-
-    $lang->msg_not_uploaded_profile_image = 'Profil resmi kaydedilemedi';
-    $lang->msg_not_uploaded_image_name = 'Resim İsmi kaydedilemedi';
-    $lang->msg_not_uploaded_image_mark = 'Resim İmi kaydedilemedi';
-    $lang->msg_not_uploaded_group_image_mark = 'Grup resim imi kaydedilemedi';
-
-    $lang->msg_accept_agreement = 'Sözleşmeyi kabul etmeniz gerekmektedir';
-
-    $lang->msg_user_denied = 'Yasaklanmış bir Kimlik girdiniz';
-    $lang->msg_user_not_confirmed = 'Hesabınız henüz etkinleştirilmemiş. Lütfen mailinizi kontrol ediniz.';
-    $lang->msg_user_limited = 'Bu kimlik, %s Tarihinden sonra kullanılabilir';
-
-    $lang->about_user_id = 'Kullanıcı kimliği 3~20 karakter uzunluğunda ve hem harf hem rakam içermeli ve ilk bir harfle başlamalıdır.';
-    $lang->about_password = 'Şifre 6~20 karakter uzunluğunda olmalıdır';
-    $lang->about_user_name = 'İsim 2~20 karakter uzunluğunda olmalıdır';
-    $lang->about_nick_name = 'Rumuz 2~20 karakter uzunluğunda olmalıdır';
-    $lang->about_email_address = 'E-posta adresiniz, e-posta onaylamasından sonra şifre düzenlemesi için kullanılacaktır';
-    $lang->about_homepage = 'Lütfen varsa website adresinizi giriniz';
-    $lang->about_blog_url = 'Lütfen varsa blog adresinizi giriniz';
-    $lang->about_birthday = 'Lütfen doğum tarihinizi giriniz';
-    $lang->about_allow_mailing = "Eğer mailleşmeyi etkinleştirmezseniz, grup maillerini alamayacaksınız";
-    $lang->about_denied = 'Kimliği yasaklanmak için işaretleyiniz';
-    $lang->about_is_admin = 'Superadmin yetkisi vermek için işaretleyiniz';
-    $lang->about_member_description = "Yöneticinin kullanıcılar hakkındaki kısa notu";
-    $lang->about_group = 'Bir kimlik, birçok grubun üyesi olabilir';
-
-    $lang->about_column_type = 'Lütfen detaylı kayıt formunun biçimini ayarlayınız';
-    $lang->about_column_name = 'Lütfen şablonda kullanılabilecek İngilizce bir isim giriniz. (isim değişkendir)';
-    $lang->about_column_title = 'Bu girdi, kayıt veya üye bilgisi düzenleme/görüntüleme formunda gösterilecektir';
-    $lang->about_default_value = 'Varsayılan değerleri ayarlayabilirsiniz';
-    $lang->about_active = 'Kayıt formunu gösterebilmeniz için, öğeleri etkinleştirdiğinizden emin olun';
-    $lang->about_form_description = 'Eğer tanım formuna giriş yaparsanız, bu girdiler giriş formunda görünecektir';
-    $lang->about_required = 'Eğer işaretlerseniz, kayıt için gerekli bir öğe olacaktır';
-
-    $lang->about_enable_openid = 'Eğer OpenID hizmeti sunmak istiyorsanız, lütfen işaretleyiniz';
-    $lang->about_enable_join = 'Yeni üyelerin sitenize kayıt yapmalarına izin vermek istiyorsanız lütfen işaretleyiniz';
-    $lang->about_enable_confirm = 'Yeni üyelerin hesaplarını e-posta yoluyla etkinleştirmelerini istiyorsanız lütfen işaretleyiniz.';
-    $lang->about_enable_ssl = 'Kayıt Ol/Üye Bilgisini Değiştir/Giriş Yap \'daki kişisel bilgiler, eğer sunucunuz da SSL servisi veriyorsa, SSL (https) olarak ayarlanabilir.';
-    $lang->about_limit_day = 'Kayıttan sonraki hesap etkinleştirme süresini kısıtlayabilirsiniz';
-    $lang->about_limit_date = 'Üyeler, belirlenen tarihe kadar kayıt yapamazlar';
-    $lang->about_after_login_url = 'Giriş yaptıktan sonraki gidilecek URL\'yi ayarlayabilirsiniz. Boş bırakmak, geçerli sayfayı bırakır.';
-    $lang->about_after_logout_url = 'Çıkış yaptıktan sonraki gidilecek URL\'yi ayarlayabilirsiniz. Boş bırakmak, geçerli sayfa manasına gelir.';
-    $lang->about_redirect_url = 'Lütfen üyelerin kayıt olduktan sonraki yönlendirilecekleri URL\'yi giriniz. Bır url girilmediğinde, kayıt sayfasından bir önceki sayfaya yönlendirileceklerdir.';
-    $lang->about_agreement = "Eğer boş bırakılmadıysa, Kayıt Sözleşmesi görüntülenecektir";
-
-    $lang->about_image_name = "Üyeler, metin yerine resim adı kullanabileceklerdir";
-    $lang->about_image_mark = "Üyeler, isimlerinin önünde işaret resmi kullanabilirler";
-    $lang->about_group_image_mark = "Kullanıcıların isimlerinin önlerinde görüntülenecek grup işaretleri kullanabilirsiniz";
-    $lang->about_profile_image = 'Üyeler, profil resmi kullanabilirler';
-    $lang->about_accept_agreement = "Anlaşmayı okudum ve kabul ediyorum";
-
-    $lang->about_member_default = 'Varsayılan grup, kullanıcı kayıt olduktan sonra yönlendirileceği grup olacaktır';
-
-    $lang->about_openid = 'OpenID olarak giriş yaptığınızda, e-posta adresi ya da kimliğiniz gibi temel bilgi sitede kaydedilecektir, şifre ve onaylama yönetimi işlemi, hizmet veren geçerli OpenID tarafından yapılacaktır';
-    $lang->about_openid_leave = 'OpenID\'nin bu bölünmesi, üyelik bilginizin bu siteden silinmesi demektir.<br />Bölünmeden sonra giriş yaparsanız, yeni bir üye gibi kabul edilecekseniz, bu yüzden eski makalelerinize ulaşma yetkiniz olmayacaktır.';
-
-    $lang->about_member = "Üye modülü size; üyeleri oluşturmada, düzenlemede, silmede ve kayıt formunu ya da grupları düzenlemede yardımcı olur.\nÜyeleri yönetmek için özel gruplar ekleyebilir ve aynı zamanda kayıt formunu değiştirerek üyeler hakkında ek bilgi alabilirsiniz.";
-    $lang->about_find_member_account = 'Hesap bilginiz, kayıt olduğunuz e-posta adresine gönderilecektir.<br />Kayıt esnasında kullandığınız e-posta adresini giriniz ve "Hesap Bilgisini Bul" tuşuna basınız.<br />';
-	$lang->about_ssl_port = 'Eğer varsayılan SSL portundan farklı bir port kullanıyorsanız, lütfen giriniz';
-    $lang->add_openid = 'OpenID Ekle';
-
-	$lang->about_resend_auth_mail = 'Eğer daha önce etkinleştirmediyseniz, etkinleştirme maili talebinde bulunabilirsiniz';
-    $lang->no_article = 'Hiçbir makale bulunmuyor';
-
-	$lang->find_account_question = 'Geçici şifre sorusu';
-	$lang->about_find_account_question = 'Kimliğinize, mail adresinize ya da cevapladığınız soruya göre geçici şifre edinebilirsiniz.';
-	$lang->find_account_question_items = array(''
-										,'Diğer e-posta adresiniz nedir?'
-										,'En sevdiğiniz şey?'
-										,'Mezun olduğunuz ilkokul?'
-										,'Memleketiniz neresi?'
-										,'İdeal eşiniz nasıl olmalı?'
-										,"Annenizin adı?"
-										,"Babanızın adı?"
-										,'En sevdiğiniz renk?'
-										,'En sevdiğiniz yemek?'
-										);
-	$lang->temp_password = 'Geçici şifre';
-	$lang->cmd_get_temp_password = 'Geçici bir şifre edin';
-	$lang->about_get_temp_password = 'Giriş yaptıktan sonra şifrenizi değiştirin.';
-	$lang->msg_question_not_exists = 'Geçici şifre için güvenlik sorusunu belirlemediniz.';
-	$lang->msg_answer_not_matches = 'Soru için verdiğiniz cevap doğru değil.';
-
-	$lang->change_password_date = 'Şifre yenileme döngüsü';
-	$lang->about_change_password_date = 'Eğer buna bir değer biçerseniz, şifrenizi belirli aralıklarla değiştirmeniz konusunda bildirim alacaksanız (eğer 0 olarak ayarlandıysa, devredışıdır)';
-?>
diff --git a/modules/member/lang/vi.lang.php b/modules/member/lang/vi.lang.php
deleted file mode 100644
index ba26ee270..000000000
--- a/modules/member/lang/vi.lang.php
+++ /dev/null
@@ -1,240 +0,0 @@
-<?php
-/*            ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-            ░░  * @File   :  common/lang/vi.lang.php                                              ░░
-            ░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-            ░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)                                  ░░
-            ░░    * @Website:  http://vietxe.net                                                      ░░
-            ░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-            ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░               */
-
-    $lang->member = 'Thành viên';
-    $lang->member_default_info = 'Thông tin cá nhân';
-    $lang->member_extend_info = 'Thông tin bổ xung';
-    $lang->default_group_1 = "Member";
-    $lang->default_group_2 = "Moderator";
-    $lang->admin_group = "Administrator";
-    $lang->keep_signed = 'Nhớ thông tin đăng nhập';
-    $lang->remember_user_id = 'Lưu tên sử dụng';
-    $lang->already_logged = "Bạn đã đăng nhập";
-    $lang->denied_user_id = 'ID đăng nhập của bạn đã bị cấm sử dụng.';
-    $lang->null_user_id = 'Xin vui lòng nhập ID đăng nhập';
-    $lang->null_password = 'Xin vui lòng nhập mật khẩu';
-    $lang->invalid_authorization = 'Tài khoản đăng nhập không đúng.';
-    $lang->invalid_user_id= "Bạn đã nhập sai tên sử dụng";
-    $lang->allow_mailing = 'Đồng ý nhận Email';
-    $lang->invalid_password = 'Mật khẩu không đúng';
-    $lang->invalid_new_password = '이전 비밀번호와 같습니다.';
-    $lang->denied = 'Bị từ chối';
-    $lang->is_admin = 'Toàn quyền Administrator';
-    $lang->group = 'Phân nhóm';
-    $lang->group_title = 'Tên nhóm';
-    $lang->group_srl = 'Nhóm số';
-    $lang->signature = 'Chữ kí';
-    $lang->profile_image = 'Hình đại diện';
-    $lang->profile_image_max_width = 'Chiểu rộng tối đa';
-    $lang->profile_image_max_height = 'Chiều cao tối đa&nbsp;&nbsp;';
-    $lang->image_name = 'Hình thay thế tên hiển thị';
-    $lang->image_name_max_width = 'Chiểu rộng tối đa';
-    $lang->image_name_max_height = 'Chiều cao tối đa&nbsp;&nbsp;';
-    $lang->image_mark = 'Hình đánh dấu';
-    $lang->image_mark_max_width = 'Chiểu rộng tối đa';
-    $lang->image_mark_max_height = 'Chiều cao tối đa&nbsp;&nbsp;';
-    $lang->group_image_mark = 'Hình đại diện nhóm';
-    $lang->group_image_mark_max_width = 'Chiểu rộng tối đa';
-    $lang->group_image_mark_max_height = 'Chiều cao tối đa&nbsp;&nbsp;';
-    $lang->group_image_mark_order = 'Thứ tự hình đại diện nhóm';
-    $lang->signature_max_height = 'Chiều cao lớn nhất của chữ kí';
-    $lang->enable_openid = 'Kích hoạt OpenID';
-    $lang->enable_join = 'Đồng ý đăng kí thành viên';
-    $lang->enable_confirm = 'Xác nhận qua Email';
-    $lang->enable_ssl = 'Mở SSL';
-    $lang->security_sign_in = 'Bảo mật đăng nhập';
-    $lang->limit_day = 'Hạn sử dụng';
-    $lang->limit_date = 'Ngày giới hạn';
-    $lang->after_login_url = 'URL sau khi đăng nhập';
-    $lang->after_logout_url = 'URL sau khi thoát';
-    $lang->redirect_url = 'URL sau khi đăng kí';
-    $lang->agreement = 'Quy định sử dụng';
-    $lang->accept_agreement = 'Đồng ý';
-    $lang->member_info = 'Thông tin cá nhân';
-    $lang->current_password = 'Mật khẩu hiện tại';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = 'Nhận tin nhắn';
-    $lang->allow_message_type = array(
-            'Y' => 'Tất cả',
-            'F' => 'Chỉ của bạn bè',
-            'N' => 'Từ chối tất cả',
-    );
-    $lang->about_allow_message = 'Bạn có thể chấp nhận hoặc từ chối những tin nhắn.';
-    $lang->logged_users = 'Thành viên đăng nhập';
-
-    $lang->webmaster_name = "Tên Webmaster";
-    $lang->webmaster_email = " Email Webmaster";
-
-    $lang->about_keep_signed = 'Mặc dù tắt trình duyệt nhưng thông tin đăng nhập của bạn vẫn được lưu lại trên máy tính này.\n\nNếu bạn sử dụng máy tính dùng chung, người khác cũng có thể đăng nhập dưới tên truy cập của bạn. Vì vậy chức năng này không nên sử dụng nếu máy tính này không phải của riêng bạn!';
-    $lang->about_keep_warning = 'Mặc dù tắt trình duyệt nhưng thông tin đăng nhập của bạn vẫn được lưu lại trên máy tính này. Nếu bạn sử dụng máy tính dùng chung, người khác cũng có thể đăng nhập dưới tên truy cập của bạn. Vì vậy chức năng này không nên sử dụng nếu máy tính này không phải của riêng bạn!';
-    $lang->about_webmaster_name = "Xin hãy nhập tên của Webmaster để nhận Email và quản lý. (Mặc định: webmaster)";
-    $lang->about_webmaster_email = "Xin hãy nhập Email của Webmaster.";
-
-    $lang->search_target_list = array(
-        'user_id' => 'ID đăng nhập',
-        'user_name' => 'Tên thật',
-        'nick_name' => 'Nickname',
-        'email_address' => 'Địa chỉ Email',
-        'regdate' => 'Ngày đăng kí',
-        'regdate_more' => 'Ngày đăng kí nhiều nhất',
-        'regdate_less' => 'Ngày đăng kí ít nhất',
-        'last_login' => 'Lần cuối đăng nhập',
-        'last_login_more' => 'Đăng nhập nhiều nhất',
-        'last_login_less' => 'Đăng nhập ít nhất',
-        'extra_vars' => 'Thông tin bổ xung',
-    );
-
-    $lang->cmd_login = 'Đăng nhập';
-    $lang->cmd_logout = 'Thoát';
-    $lang->cmd_signup = 'Đăng kí';
-    $lang->cmd_site_signup = 'Đăng kí';
-    $lang->cmd_modify_member_info = 'Sửa đổi thông tin cá nhân';
-    $lang->cmd_modify_member_password = 'Sửa đổi mật khẩu';
-    $lang->cmd_view_member_info = 'Xem thông tin cá nhân';
-    $lang->cmd_leave = 'Từ bỏ';
-    $lang->cmd_find_member_account = 'Lấy lại thông tin';
-    $lang->cmd_resend_auth_mail = 'Xác nhận lại Email';
-
-    $lang->cmd_member_list = 'Danh sách thành viên';
-    $lang->cmd_module_config = 'Thiết lập mặc định';
-    $lang->cmd_member_group = 'Quản lý nhóm';
-    $lang->cmd_send_mail = 'Gửi Email';
-    $lang->cmd_manage_id = 'Tên sử dụng cấm đăng kí';
-    $lang->cmd_manage_form = 'Quản lý mẫu đăng kí';
-    $lang->cmd_view_own_document = 'Bài gửi';
-    $lang->cmd_manage_member_info = 'Quản lý thông tin thành viên';
-    $lang->cmd_trace_document = 'Theo dõi chủ đề';
-    $lang->cmd_trace_comment = 'Theo dõi thảo luận';
-    $lang->cmd_view_scrapped_document = 'Phân loại';
-    $lang->cmd_view_saved_document = 'Bài viết đã lưu';
-    $lang->cmd_send_email = 'Gửi eMail';
-
-    $lang->msg_email_not_exists = "Bạn đã nhập sai Email";
-
-    $lang->msg_alreay_scrapped = 'Bài viết đã được phân loại.';
-
-    $lang->msg_cart_is_null = 'Xin vui lòng lựa chọn vị trí';
-    $lang->msg_checked_file_is_deleted = '%d đính kèm đã được xóa.';
-
-    $lang->msg_find_account_title = 'Thông tin đăng kí tại Website http;//4all.kr';
-    $lang->msg_find_account_info = 'Thông tin tài khoản.';
-    $lang->msg_find_account_comment = 'Mật khẩu sẽ thay đổi khi bạn bấm vào đường Link này.<br />Xin vui lòng thay đổi mật khẩu sau khi đăng nhập!';
-    $lang->msg_confirm_account_title = 'Thông tin đăng kí thành viên tại Website http://4all.kr';
-    $lang->msg_confirm_account_info = 'Đây là thông tin bạn đã đăng kí tại Website http://4all.kr:';
-    $lang->msg_confirm_account_comment = 'Bấm vào đường Link này để hoàn tất việc đăng kí.';
-    $lang->msg_auth_mail_sent = 'Email xác nhận đã được gửi đến %s. Xin vui lòng kiểm tra Inbox hoặc Bulk mail của bạn!';
-    $lang->msg_confirm_mail_sent = 'Chúng tôi đã gửi Email xác nhận đến %s. Xin vui lòng bấm vào Link đi kèm trong Email để hoàn tất việc đăng kí!';
-    $lang->msg_invalid_auth_key = 'Xác nhận không hợp lệ.<br />Xin vui lòng kiểm tra lại hoặc liên hệ với Webmaster để được hỗ trợ!';
-    $lang->msg_success_authed = 'Tài khoản của bạn đã được xác nhận.\n Xin vui lòng thay đổi mật khẩu khác với mật khẩu trong Email và dễ nhớ hơn!';
-    $lang->msg_success_confirmed = 'Đã xác nhận thành công.<br />Xin cảm ơn đã tham gia cùng chúng tôi!';
-
-    $lang->msg_new_member = 'Thêm thành viên';
-    $lang->msg_update_member = 'Sửa đổi thông tin thành viên';
-    $lang->msg_leave_member = 'Loại bỏ';
-    $lang->msg_group_is_null = 'Không đăng kí vào nhóm nào';
-    $lang->msg_not_delete_default = 'Mặc định không thể xóa';
-    $lang->msg_not_exists_member = "Thành viên không hợp lệ";
-    $lang->msg_cannot_delete_admin = 'Admin ID không thể xóa!';
-    $lang->msg_exists_user_id = 'Tên sử dụng này đã có người dùng. Xin vui lòng thử lại với tên truy cập khác!';
-    $lang->msg_exists_email_address = 'Email này đã có người sử dụng. Xin vui lòng thử lại với Email khác!';
-    $lang->msg_exists_nick_name = 'Nickname này đã có người sử dụng. Xin vui lòng thử lại với Nickname khác!';
-    $lang->msg_signup_disabled = 'Bạn không thể đăng kí.';
-    $lang->msg_already_logged = 'Bạn đã đăng kí rồi.';
-    $lang->msg_not_logged = 'Xin vui lòng đăng nhập trước!';
-    $lang->msg_insert_group_name = 'Xin vui lòng nhập tên của nhóm!';
-    $lang->msg_check_group = 'Xin vui lòng chọn nhóm!';
-
-    $lang->msg_not_uploaded_profile_image = 'Không thể đăng kí được hình đại diện.';
-    $lang->msg_not_uploaded_image_name = 'Không thể gửi được hình ảnh thay Nickname.';
-    $lang->msg_not_uploaded_image_mark = 'Hình đánh dấu đã không được gửi.';
-    $lang->msg_not_uploaded_group_image_mark = 'Hình thay thế nhóm đã không được gửi';
-
-    $lang->msg_accept_agreement = 'Bạn phải đồng ý với điều khoản sử dụng của chúng tôi.'; 
-
-    $lang->msg_user_denied = 'Tên sử dụng này đã bị cấm đăng kí.';
-    $lang->msg_user_not_confirmed = 'Bạn chưa xác nhận việc đăng kí. Xin vui lòng kiểm tra Email!';
-    $lang->msg_user_limited = 'Bạn được phép sử dụng đến ngày %s';
-
-    $lang->about_user_id = 'Độ dài của tên truy cập được giới hạn từ 3 đến 20 kí tự gồm a-z và các số.';
-    $lang->about_password = 'Độ dài mật khẩu giới hạn từ 6 đến 20 kí tự.';
-    $lang->about_user_name = 'Giới hạn của tên từ 2 đến 20 kí tự.';
-    $lang->about_nick_name = 'Độ dài của Nickname từ 2 đến 20 kí tự.';
-    $lang->about_email_address = 'Email được sử dụng để lên lạc, xác nhận và lấy lại mật khẩu nếu lỡ quên.';
-    $lang->about_homepage = 'Nếu bạn có Website hãy nhập vào đây.';
-    $lang->about_blog_url = 'Nếu bạn có Blog hãy nhập vào đây.';
-    $lang->about_birthday = 'Hãy chọn ngày sinh nhật của bạn.';
-    $lang->about_allow_mailing = "Nếu không đồng ý nhận Email, bạn sẽ không thể nhận được những liên lạc của bạn bè hoặc của nhóm.";
-    $lang->about_denied = 'Kiểm tra tên sử dụng bị cấm.';
-    $lang->about_is_admin = 'Kiểm tra toàn quyền Administrator';
-    $lang->about_member_description = "Ghi nhớ của Admin về những thành viên";
-    $lang->about_group = 'Một tên sử dụng có thể tham gia nhiều nhóm';
-
-    $lang->about_column_type = 'Hãy chọn một định dạng để sử dụng.';
-    $lang->about_column_name = 'Nhập tên theo Tiếng Anh.';
-    $lang->about_column_title = 'Sẽ được hiển thị khi đăng kí, sửa đổi hay xem thông tin thành viên.';
-    $lang->about_default_value = 'Bạn có thể đặt giá trị mặc định.';
-    $lang->about_active = 'Nếu chọn, thông tin này sẽ được hiển thị trong bảng đăng kí.';
-    $lang->about_form_description = 'Nếu bạn nhập mô tả, nó sẽ được hiển thị trong bảng đăng kí.';
-    $lang->about_required = 'Nếu chọn, thông tin này sẽ được hiển thị trong bảng đăng kí.';
-
-    $lang->about_enable_openid = 'Kích hoạt đăng nhập bằng OpenID.';
-    $lang->about_enable_join = 'Cho phép thành viên đăng kí.';
-    $lang->about_enable_confirm = 'Gửi Email xác nhận sau khi đăng kí.';
-    $lang->about_enable_ssl = 'Thông tin cá nhân khi thành viên Đăng kí, Đăng nhập và Sủa đổi sẽ được gửi dưới dạng SSL(https). Hãy chọn nếu Server cho phép sử dụng chức năng này.';
-    $lang->about_limit_day = 'Bạn có thể giới hạn ngày xác nhận sau khi đăng kí.';
-    $lang->about_limit_date = 'Thành viên không thể đăng nhập nếu quá hạn xác nhận đăng kí.';
-    $lang->about_after_login_url = 'Bạn có thể thiết đặt địa chỉ nào đó sẽ hiển thị sau khi đăng nhập. Để trống nếu không sử dụng.';
-    $lang->about_after_logout_url = 'Bạn có thể thiết đặt địa chỉ nào đó sẽ hiển thị sau khi thoát. Để trống nếu không sử dụng.';
-    $lang->about_redirect_url = 'Hãy nhập địa chỉ trang sẽ chuyển đến sau khi thành viên đăng kí. Để trống nếu không sử dụng.';
-    $lang->about_agreement = "Điều khoản sử dụng sẽ hiển thị trong Form đăng kí nếu có nội dung.";
-
-    $lang->about_image_name = "Cho phép thành viên sử dụng hình ảnh thay cho tên.";
-    $lang->about_image_mark = "Cho phép sử dụng hình ảnh nhỏ truóc tên của họ.";
-    $lang->about_group_image_mark = "Bạn có thể sử dụng biểu tượng nhóm sẽ hiển thị trước tên thành viên.";
-    $lang->about_profile_image = 'Cho phép thành viên sử dụng thông tin cá nhân bằng hình ảnh.';
-    $lang->about_accept_agreement = "Tôi đã đọc và đồng ý với điều khoản sử dụng của Website."; 
-
-    $lang->about_member_default = 'Sẽ là nhóm mặc định khi thành viên đăng kí.';
-
-    $lang->about_openid = 'Khi bạn đăng nhập bằng OpenID, những thông tin cơ bản và Email của bạn sẽ lưu lại tại Website này. Việc này sẽ giúp bạn lấy lại thông tin nếu như bạn lỡ quên hoặc nhận những thông báo từ Ban Quản trị Website.';
-    $lang->about_openid_leave = 'Thông tin OpenID của bạn sẽ được cập nhật tại Website này.<br />Nếu bạn đăng nhập, Thông tin OpenID của bạn sẽ được lưu lại như một thành viên đã đăng kí, và bạn có thể gửi bài viết hay bình luận.';
-
-    $lang->about_member = "Chức năng của Module này sẽ cho phép bạn tạo, sửa, xóa thành viên và quản lý nhóm hay Form đăng kí.\nBạn có thể quản lý thành viên bằng cách tạo những nhóm mới, và thêm những thông tin trong Form đăng kí.";
-    $lang->about_find_member_account = 'Thông tin tài khoản của bạn sẽ được tìm thấy với Email bạn đã đăng kí.<br />Xin vui lòng nhập Email mà bạn đã đăng kí và bấm "Lấy lại thông tin" để nhận được thông tin đăng nhập!.<br />';
-    $lang->about_ssl_port = 'Xin hãy nhập cổng kết nối mặc định cho SSL.';
-    $lang->add_openid = 'Thêm OpenID';
-
-    $lang->about_resend_auth_mail = 'Nhận lại mã kích hoạt nếu bạn đã không nhận được Email kích hoạt khi đăng kí.';
-
-    $lang->find_account_question = '비밀번호 찾기 질문/답변';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '가입시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.';
-/*
-    $lang->find_account_question_items = array(''
-                                        ,'다른 이메일 주소는?'
-                                        ,'나의 보물 1호는?'
-                                        ,'나의 출신 초등학교는?'
-                                        ,'나의 출신 고향은?'
-                                        ,'나의 이상형은?'
-                                        ,'어머니 성함은?'
-                                        ,'아버지 성함은?'
-                                        ,'가장 좋아하는 색깔은?'
-                                        ,'가장 좋아하는 음식은?'
-                                        );
-*/
-    $lang->temp_password = '임시 비밀번호';
-    $lang->cmd_get_temp_password = '임시 비밀번호 발급';
-    $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.';
-    $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.';
-    $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.';
-
-    $lang->change_password_date = '비밀번호 갱신주기';
-    $lang->about_change_password_date = '일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ';
-
-?>
diff --git a/modules/member/lang/zh-CN.lang.php b/modules/member/lang/zh-CN.lang.php
deleted file mode 100644
index 81e47761e..000000000
--- a/modules/member/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  会员模块简体中文语言包
-     **/
-
-    $lang->member = '会员';
-    $lang->member_default_info = '基本资料';
-    $lang->member_extend_info = '扩展信息';
-    $lang->default_group_1 = "准会员";
-    $lang->default_group_2 = "正会员";
-    $lang->admin_group = "管理组";
-    $lang->keep_signed = '自动登录';
-    $lang->remember_user_id = '保存ID';
-    $lang->already_logged = '您已经登录！';
-    $lang->denied_user_id = '被禁止的用户名。';
-    $lang->null_user_id = '请输入用户名。';
-    $lang->null_password = '请输入密码。';
-    $lang->invalid_authorization = '还没有认证！';
-    $lang->invalid_user_id= '该用户名不存在，请检查您的输入是否有误！';
-    $lang->invalid_password = '您的密码不正确！';
-    $lang->invalid_new_password = '이전 비밀번호와 같습니다.';
-    $lang->allow_mailing = '接收邮件';
-    $lang->denied = '禁止使用';
-    $lang->is_admin = '最高管理权限';
-    $lang->group = '用户组';
-    $lang->group_title = '用户组标题';
-    $lang->group_srl = '用户组编号';
-    $lang->signature = '签名';
-    $lang->profile_image = '个性头像';
-    $lang->profile_image_max_width = '宽度限制';
-    $lang->profile_image_max_height = '高度限制';
-    $lang->image_name = '昵称图片';
-    $lang->image_name_max_width = '宽度限制';
-    $lang->image_name_max_height = '高度限制';
-    $lang->image_mark = '用户图标';
-    $lang->image_mark_max_width = '宽度限制';
-    $lang->image_mark_max_height = '高度限制';
-    $lang->group_image_mark = '用户组图标';
-    $lang->group_image_mark_max_width = '宽度限制';
-    $lang->group_image_mark_max_height = '高度限制';
-    $lang->group_image_mark_order = '用户组图标顺序';
-    $lang->signature_max_height = '签名高度限制';
-    $lang->enable_openid = '支持OpenID';
-    $lang->enable_join = '允许会员注册';
-    $lang->enable_confirm = '使用邮件认证';
-    $lang->enable_ssl = '使用SSL功能';
-    $lang->security_sign_in = '使用安全登录';
-    $lang->limit_day = '认证限制';
-    $lang->limit_date = '限制日期';
-    $lang->after_login_url = '登录后页面转向';
-    $lang->after_logout_url = '退出后页面转向';
-    $lang->redirect_url = '注册会员后页面转向';
-    $lang->agreement = '会员注册条款';
-    $lang->accept_agreement = '同意条款';
-    $lang->member_info = '会员信息';
-    $lang->current_password = '当前密码';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = '接收短消息';
-    $lang->allow_message_type = array(
-            'Y' => '全部接收',
-            'F' => '拒收',
-            'N' => '只允许好友',
-    );
-    $lang->about_allow_message = '可以指定接收短消息方法及对象。';
-    $lang->logged_users = '在线用户';
-
-    $lang->webmaster_name = '管理员名';
-    $lang->webmaster_email = '管理员电子邮件';
-
-    $lang->about_keep_signed = '关闭浏览器后也将维持登录状态。\n\n使用自动登录功能，可解决每次访问都要输入用户名及密码的麻烦。\n\n为防止个人信息泄露，在网吧，学校等公共场所请务必要确认解除登录状态。';
-    $lang->about_keep_warning = '关闭浏览器后也将维持登录状态。\n\n使用自动登录功能，可解决每次访问都要输入用户名及密码的麻烦。 为防止个人信息泄露，在网吧，学校等公共场所请务必要确认解除登录状态。';
-    $lang->about_webmaster_name = '请输入认证所需的电子邮件地址或管理其他网站时要使用的网站管理员名称。(默认 : webmaster)';
-    $lang->about_webmaster_email = '请输入网站管理员的电子邮件地址。';
-
-    $lang->search_target_list = array(
-        'user_id' => '用户名',
-        'user_name' => '姓名',
-        'nick_name' => '昵称',
-        'email_address' => '邮箱地址',
-        'regdate' => '注册日期',
-        'regdate_more' => '注册日期(以上)',
-        'regdate_less' => '注册日期(以下)',
-        'last_login' => '最后登录',
-        'last_login_more' => '最后登录(以上)',
-        'last_login_less' => '最后登录시(以下)',
-        'extra_vars' => '扩展信息',
-    );
-
-
-    $lang->cmd_login = '登录';
-    $lang->cmd_logout = '退出';
-    $lang->cmd_signup = '新会员注册';
-    $lang->cmd_site_signup = '注册';
-    $lang->cmd_modify_member_info = '编辑个人资料';
-    $lang->cmd_modify_member_password = '修改密码';
-    $lang->cmd_view_member_info = '个人资料';
-    $lang->cmd_leave = '注销';
-    $lang->cmd_find_member_account = '查找用户名/密码';
-    $lang->cmd_resend_auth_mail = '重新发送认证邮件';
-
-    $lang->cmd_member_list = '会员目录';
-    $lang->cmd_module_config = '常规选项';
-    $lang->cmd_member_group = '用户组';
-    $lang->cmd_send_mail = '发送邮件';
-    $lang->cmd_manage_id = '禁止用户名';
-    $lang->cmd_manage_form = '扩展注册表单';
-    $lang->cmd_view_own_document = '会员话题';
-    $lang->cmd_manage_member_info = '管理会员信息';
-    $lang->cmd_trace_document = '主题追踪';
-    $lang->cmd_trace_comment = '评论追踪';
-    $lang->cmd_view_scrapped_document = '我的收藏';
-    $lang->cmd_view_saved_document = '临时保存箱';
-    $lang->cmd_send_email = '发送邮件';
-
-    $lang->msg_email_not_exists = "没有找到您输入的Email地址。";
-
-    $lang->msg_alreay_scrapped = '已收藏的主题！';
-
-    $lang->msg_cart_is_null = '请选择对象。';
-    $lang->msg_checked_file_is_deleted = '已删除%d个附件。';
-
-    $lang->msg_find_account_title = '注册信息。';
-    $lang->msg_find_account_info = '您要查找的注册信息如下。';
-    $lang->msg_find_account_comment = '点击下面的链接您的注册密码将更新为上述的系统自动生成密码。<br />请重新登录后把密码改为您所熟悉的密码。';
-    $lang->msg_confirm_account_title = '会员注册';
-    $lang->msg_confirm_account_info = '您的注册信息如下:';
-    $lang->msg_confirm_account_comment = '请点击下面链接完成会员认证。';
-    $lang->msg_auth_mail_sent = '已向%s发送了认证邮件。请确认！！';
-    $lang->msg_confirm_mail_sent = '已向%s发送了认证邮件。请确认！！';
-    $lang->msg_invalid_auth_key = '错误的注册信息请求。<br />请重新查找用户名及密码， 或联系管理员。';
-    $lang->msg_success_authed = '新的注册信息已得到认证。请用邮件中的新密码修改您要想使用的密码。';
-    $lang->msg_success_confirmed = '注册信息已成功激活！';
-
-    $lang->msg_new_member = '会员注册';
-    $lang->msg_update_member = '修改会员信息';
-    $lang->msg_leave_member = '注销会员';
-    $lang->msg_group_is_null = '没有用户组。';
-    $lang->msg_not_delete_default = '不能删除基本项目';
-    $lang->msg_not_exists_member = '不存在的用户';
-    $lang->msg_cannot_delete_admin = '不能删除管理员 ID .解除管理后再删除';
-    $lang->msg_exists_user_id = '重复的用户名 ，请重新输入用户名。';
-    $lang->msg_exists_email_address = '重复的电子邮件地址，请重新输入电子邮件地址。';
-    $lang->msg_exists_nick_name = '重复的昵称，请重新输入昵称。';
-    $lang->msg_signup_disabled = '不能注册会员';
-    $lang->msg_already_logged = '您是注册会员。';
-    $lang->msg_not_logged = '您还没有登录。';
-    $lang->msg_insert_group_name = '请输入组名称';
-    $lang->msg_check_group = '请选择组';
-
-    $lang->msg_not_uploaded_profile_image = '不能登录签名图像！';
-    $lang->msg_not_uploaded_image_name = '不能登录昵称图像！';
-    $lang->msg_not_uploaded_image_mark = '不能登录用户图标！';
-    $lang->msg_not_uploaded_group_image_mark = '可以指定用户组图标。';
-
-    $lang->msg_accept_agreement = '您必须同意条款。';
-
-    $lang->msg_user_denied = '您输入的用户名已禁止使用！';
-    $lang->msg_user_not_confirmed = '您的注册信息还没有被激活，请确认您的电子邮箱。';
-    $lang->msg_user_limited = '您输入的用户名%s以后才可以开始使用。';
-
-    $lang->about_user_id = '用户名长度必须由 3 ~20 字以内的英文+数字组成，且首个字母必须是英文字母。';
-    $lang->about_password = '密码长度必须在6~20字以内。';
-    $lang->about_user_name = '姓名必须是2~20字以内。';
-    $lang->about_nick_name = '昵称必须是2~20字以内。';
-    $lang->about_email_address = '电子邮件地址除邮件认证外，在修改密码或找回密码时使用。';
-    $lang->about_homepage = '请输入您的主页地址。';
-    $lang->about_blog_url = '请输入博客地址。';
-    $lang->about_birthday = '请输入您的出生年月日。';
-    $lang->about_allow_mailing = '如不选择此项，以后不能接收站内发送的重要信息。';
-    $lang->about_denied = '选择时不能使用此用户名。';
-    $lang->about_is_admin = '选择时将具有最高管理权限。';
-    $lang->about_member_description = '管理员对会员的备忘录。';
-    $lang->about_group = '一个用户名可属多个用户组。';
-
-    $lang->about_column_type = '请选择要添加的注册表单格式。';
-    $lang->about_column_name = '请输入在模板中可以使用的英文名称。（变数名）';
-    $lang->about_column_title = '注册或修改/查看信息时要显示的标题。';
-    $lang->about_default_value = '可以设置缺省值。';
-    $lang->about_active = '必须选择此项后才可以正常启用。';
-    $lang->about_form_description = '说明栏里输入的内容，注册时将会显示。';
-    $lang->about_required = '注册时成为必填项目。';
-
-    $lang->about_enable_openid = '要想网站支持OpenID时请勾选此项。';
-    $lang->about_enable_join = '选择此项后用户才可以注册。';
-    $lang->about_enable_confirm = '为激活会员注册信息，将向会员输入的邮件地址发送注册认证邮件。';
-    $lang->about_enable_ssl = '如服务器提供SSL协议服务，新会员注册/修改会员信息/登录等信息的传送将使用SSL(https)协议。';
-    $lang->about_limit_day = '注册会员后的认证有效期限。';
-    $lang->about_limit_date = '直到指定日期该用户不能登录。';
-    $lang->about_after_login_url = '可以指定登录后的页面转向url(留空为当前页面)。';
-    $lang->about_after_logout_url = '可以指定退出登录后的页面转向url(留空为当前页面)。';
-    $lang->about_redirect_url = '请输入注册会员后的页面转向 url。(留空为返回前页)';
-    $lang->about_agreement = '没有会员条款时不显示。';
-
-    $lang->about_image_name = '用户昵称可以用小图片来替代显示。';
-    $lang->about_image_mark = '显示在用户昵称前的小图标。';
-    $lang->about_group_image_mark = '用户名前显示用户组图标。';
-    $lang->about_profile_image = '可以使用签名图片。';
-    $lang->about_signature_max_height = '可以限制签名栏高度(0或留空为不限制)。';
-    $lang->about_accept_agreement = '已阅读全部条款并同意。';
-
-    $lang->about_member_default = '将成为注册会员时的默认用户组。';
-
-    $lang->about_openid = '用OpenID注册时该网站只保存用户名和 邮件等基本信息，密码和认证处理是在提供OpenID服务的站点中得到解决。';
-    $lang->about_openid_leave = '删除OpenID就等于永久删除站内用户的信息。<br />被删除后的重新登录就等于新会员注册，因此对以前自己写的主题将失去相应权限。';
-    $lang->about_find_member_account = '用户名/密码将发送到您注册时所输入的电子邮件当中。<br />输入注册时的电子邮件地址后，请点击“查找用户名/密码”按钮。<br />';
-
-    $lang->about_member = "可以添加/修改/删除会员及管理用户组或注册表单的会员管理模块。\n此模块不仅可以生成缺省用户组以外的其他用户组来管理会员，并且通过注册表单的管理获得除会员基本信息以外的扩展信息。";
-
-    $lang->about_resend_auth_mail = '没有收到认证邮件时，可以在此重新发送认证邮件。';
-
-    $lang->find_account_question = '비밀번호 찾기 질문/답변';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '가입시 아이디와 이메일, 질문/답변으로 임시 비밀번호를 발급 받을 수 있습니다.';
-    /*
-    $lang->find_account_question_items = array(''
-                                        ,'다른 이메일 주소는?'
-                                        ,'나의 보물 1호는?'
-                                        ,'나의 출신 초등학교는?'
-                                        ,'나의 출신 고향은?'
-                                        ,'나의 이상형은?'
-                                        ,'어머니 성함은?'
-                                        ,'아버지 성함은?'
-                                        ,'가장 좋아하는 색깔은?'
-                                        ,'가장 좋아하는 음식은?'
-                                        );
-*/
-    $lang->temp_password = '임시 비밀번호';
-    $lang->cmd_get_temp_password = '임시 비밀번호 발급';
-    $lang->about_get_temp_password = '로그인 후 비밀번호 변경해 주세요.';
-    $lang->msg_question_not_exists = '등록한 비밀번호 찾기 질문/답변이 없습니다.';
-    $lang->msg_answer_not_matches = '비밀번호 찾기 질문/답변 또는 정보가 올바르지 않습니다.';
-
-    $lang->change_password_date = '비밀번호 갱신주기';
-    $lang->about_change_password_date = '일정기간이 지나면 비밀번호 변경을 하도록 유도하는 기능입니다. (사용하지 않음 : 0 입력) ';
-
-?>
diff --git a/modules/member/lang/zh-TW.lang.php b/modules/member/lang/zh-TW.lang.php
deleted file mode 100644
index 60a463ea1..000000000
--- a/modules/member/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,241 +0,0 @@
-<?php
-    /**
-     * @file   modules/member/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  會員(member)模組正體中文語言
-     **/
-
-    $lang->member = '會員';
-    $lang->member_default_info = '基本資料';
-    $lang->member_extend_info = '延伸資料';
-    $lang->default_group_1 = "準會員";
-    $lang->default_group_2 = "正會員";
-    $lang->admin_group = "管理組";
-    $lang->keep_signed = '自動登入';
-    $lang->remember_user_id = '儲存 ID';
-    $lang->already_logged = '您已經登入！';
-    $lang->denied_user_id = '被禁止的帳號。';
-    $lang->null_user_id = '請輸入帳號。';
-    $lang->null_password = '請輸入密碼。';
-    $lang->invalid_authorization = '還沒有認證！';
-    $lang->invalid_user_id= '該帳號不存在，請檢查您的輸入是否有誤！';
-    $lang->invalid_password = '您的密碼不正確！';
-    $lang->invalid_new_password = '新密碼不能與舊密碼相同';
-    $lang->allow_mailing = '接收郵件';
-    $lang->denied = '禁止使用';
-    $lang->is_admin = '最高管理權限';
-    $lang->group = '群組';
-    $lang->group_title = '群組標題';
-    $lang->group_srl = '群組編號';
-    $lang->signature = '簽名檔';
-    $lang->profile_image = '個人圖片';
-    $lang->profile_image_max_width = '寬度限制';
-    $lang->profile_image_max_height = '高度限制';
-    $lang->image_name = '暱稱圖片';
-    $lang->image_name_max_width = '寬度限制';
-    $lang->image_name_max_height = '高度限制';
-    $lang->image_mark = '用戶圖示';
-    $lang->image_mark_max_width = '寬度限制';
-    $lang->image_mark_max_height = '高度限制';
-    $lang->group_image_mark = '群組圖示';
-    $lang->group_image_mark_max_width = '寬度限制';
-    $lang->group_image_mark_max_height = '高度限制';
-    $lang->group_image_mark_order = '群組圖示順序';
-    $lang->signature_max_height = '簽名檔高度限制';
-    $lang->enable_openid = '支援 OpenID';
-    $lang->enable_join = '允許會員註冊';
-    $lang->enable_confirm = '使用郵件認證';
-    $lang->enable_ssl = '使用 SSL 功能';
-    $lang->security_sign_in = '使用安全登入';
-    $lang->limit_day = '認證限制';
-    $lang->limit_date = '限制日期';
-    $lang->after_login_url = '登入後頁面轉向';
-    $lang->after_logout_url = '登出後頁面轉向';
-    $lang->redirect_url = '會員註冊後頁面轉向';
-    $lang->agreement = '會員使用條款';
-    $lang->accept_agreement = '同意條款';
-    $lang->member_info = '會員資料';
-    $lang->current_password = '舊密碼';
-    $lang->openid = 'OpenID';
-    $lang->allow_message = '接收短訊息';
-    $lang->allow_message_type = array(
-            'Y' => '全部允許',
-            'F' => '允許好友',
-            'N' => '全部禁止',
-    );
-    $lang->about_allow_message = '可選擇是否接收短訊息。';
-    $lang->logged_users = '線上會員';
-
-    $lang->webmaster_name = '管理員名稱';
-    $lang->webmaster_email = '管理員電子郵件';
-
-    $lang->about_keep_signed = '關閉瀏覽器後也將維持登入狀態。<br />使用此功能，可解決每次訪問都要輸入帳號及密碼的麻煩。<br />為防止個人資料洩露，在網咖，學校等公共場所，請務必要確認解除登入狀態。';
-    $lang->about_keep_warning = '關閉瀏覽器後也將維持登入狀態。<br />使用此功能，可解決每次訪問都要輸入帳號及密碼的麻煩。<br />為防止個人資料洩露，在網咖，學校等公共場所，請務必要確認解除登入狀態。';
-    $lang->about_webmaster_name = '請輸入認證所需的電子郵件地址或管理其他網站時要使用的網站管理員名稱。(預設 : webmaster)';
-    $lang->about_webmaster_email = '請輸入網站管理員的電子郵件地址。';
-
-    $lang->search_target_list = array(
-        'user_id' => '帳號',
-        'user_name' => '姓名',
-        'nick_name' => '暱稱',
-        'email_address' => '電子郵件',
-        'regdate' => '註冊日期',
-        'regdate_more' => '註冊日期(以上)',
-        'regdate_less' => '註冊日期(以下)',
-        'last_login' => '最近登入',
-        'last_login_more' => '最近登入(以上)',
-        'last_login_less' => '最近登入(以下)',
-        'extra_vars' => '延伸變數',
-    );
-
-    $lang->cmd_login = '登入';
-    $lang->cmd_logout = '登出';
-    $lang->cmd_signup = '會員註冊';
-    $lang->cmd_site_signup = '加入';
-    $lang->cmd_modify_member_info = '修改會員資料';
-    $lang->cmd_modify_member_password = '修改密碼';
-    $lang->cmd_view_member_info = '檢視會員資料';
-    $lang->cmd_leave = '退出';
-    $lang->cmd_find_member_account = '查詢帳號/密碼';
-    $lang->cmd_resend_auth_mail = '重寄認證郵件';
-
-    $lang->cmd_member_list = '會員列表';
-    $lang->cmd_module_config = '基本設置';
-    $lang->cmd_member_group = '群組管理';
-    $lang->cmd_send_mail = '發送郵件';
-    $lang->cmd_manage_id = '禁止帳號管理';
-    $lang->cmd_manage_form = '註冊表單管理';
-    $lang->cmd_view_own_document = '檢視發表主題';
-    $lang->cmd_manage_member_info = '管理會員資料';
-    $lang->cmd_trace_document = '主題追蹤';
-    $lang->cmd_trace_comment = '評論追蹤';
-    $lang->cmd_view_scrapped_document = '檢視收藏';
-    $lang->cmd_view_saved_document = '檢視臨時儲存箱';
-    $lang->cmd_send_email = '發送郵件';
-
-    $lang->msg_email_not_exists = '找不到您輸入的郵件地址。';
-
-    $lang->msg_alreay_scrapped = '已收藏的主題！';
-
-    $lang->msg_cart_is_null = '請選擇對象。';
-    $lang->msg_checked_file_is_deleted = '已刪除%d個附檔。';
-
-    $lang->msg_find_account_title = '註冊資料。';
-    $lang->msg_find_account_info = '您要尋找的註冊資料如下。';
-    $lang->msg_find_account_comment = '按底下的連結，您的註冊密碼將更新為上述系統自動建立的密碼。<br />請重新登入，將密碼更改為您想要的密碼。';
-    $lang->msg_confirm_account_title = '會員註冊';
-    $lang->msg_confirm_account_info = '您的註冊資料如下:';
-    $lang->msg_confirm_account_comment = '請按下面連結完成會員認證。';
-    $lang->msg_auth_mail_sent = '已向%s發送了認證郵件。請確認！！';
-    $lang->msg_confirm_mail_sent = '已向%s發送了認證郵件。請確認！！';
-    $lang->msg_invalid_auth_key = '錯誤的註冊資料請求。<br />請重新尋找帳號及密碼，或聯繫管理員。';
-    $lang->msg_success_authed = '新註冊的資料已得到認證。請用郵件中的新密碼修改成您要想使用的密碼。';
-    $lang->msg_success_confirmed = '註冊資料已成功確認！';
-
-    $lang->msg_new_member = '會員註冊';
-    $lang->msg_update_member = '修改會員資料';
-    $lang->msg_leave_member = '會員退出';
-    $lang->msg_group_is_null = '無群組。';
-    $lang->msg_not_delete_default = '無法刪除基本項目';
-    $lang->msg_not_exists_member = '不存在的帳號';
-    $lang->msg_cannot_delete_admin = '無法解除管理員帳號，請解除管理後再刪除';
-    $lang->msg_exists_user_id = '重複的帳號，請重新輸入。';
-    $lang->msg_exists_email_address = '重複的電子郵件地址，請重新輸入電子郵件地址。';
-    $lang->msg_exists_nick_name = '重複的暱稱，請重新輸入。';
-    $lang->msg_signup_disabled = '無法註冊會員';
-    $lang->msg_already_logged = '您是註冊會員。';
-    $lang->msg_not_logged = '您還沒登入。';
-    $lang->msg_insert_group_name = '請輸入群組名稱';
-    $lang->msg_check_group = '請選擇群組';
-
-    $lang->msg_not_uploaded_profile_image = '無法登錄個人圖片！';
-    $lang->msg_not_uploaded_image_name = '無法登錄暱稱圖片！';
-    $lang->msg_not_uploaded_image_mark = '無法登錄用戶圖示！';
-    $lang->msg_not_uploaded_group_image_mark = '無法登錄群組圖示！';
-
-    $lang->msg_accept_agreement = '您必須同意條款。';
-
-    $lang->msg_user_denied = '您輸入的帳號已禁止使用！';
-    $lang->msg_user_not_confirmed = '您的註冊資料還沒有被確認，請確認您的電子郵箱。';
-    $lang->msg_user_limited = '您輸入的帳號%s以後才可以開始使用。';
-
-    $lang->about_user_id = '帳號必須由 3~20 字以內的英文+數字組成，開頭必須是英文。';
-    $lang->about_password = '密碼必須在 6~20 字以內。';
-    $lang->about_user_name = '姓名必須是 2~20 字以內。';
-    $lang->about_nick_name = '暱稱必須是 2~20 字以內。';
-    $lang->about_email_address = '電子郵件地址除郵件認證外，當修改密碼或忘記密碼時也可以使用。';
-    $lang->about_homepage = '請輸入您的網址。';
-    $lang->about_blog_url = '請輸入部落格網址。';
-    $lang->about_birthday = '請輸入您的出生年月日。';
-    $lang->about_allow_mailing = '不選擇此項，以後無法接收站內發送的重要資料。';
-    $lang->about_denied = '選擇時不能使用此帳號。';
-    $lang->about_is_admin = '選擇時將具有最高管理權限。';
-    $lang->about_member_description = '管理員對會員的註記。';
-    $lang->about_group = '一個帳號可擁有多個群組。';
-
-    $lang->about_column_type = '請選擇要新增的註冊表單格式。';
-    $lang->about_column_name = '請輸入在樣板中可以使用的英文名稱。(變數名稱)';
-    $lang->about_column_title = '註冊或修改/檢視資料時要顯示的標題。';
-    $lang->about_default_value = '可以設置預設值。';
-    $lang->about_active = '必須選擇此項後才可以正常啟用。';
-    $lang->about_form_description = '說明欄裡輸入的內容，在註冊時會顯示。';
-    $lang->about_required = '註冊時成為必填項目。';
-
-    $lang->about_enable_openid = '想要網站支援 OpenID 時，請勾選此項。';
-    $lang->about_enable_join = '選擇此項後，用戶才可以註冊。';
-    $lang->about_enable_confirm = '為確認會員註冊資料，會向會員輸入的郵件地址發送註冊認證郵件。';
-    $lang->about_enable_ssl = '如主機提供 SSL 認證服務，新會員註冊/修改會員資料/登入等資料的傳送將使用 SSL(https) 認證。';
-    $lang->about_limit_day = '註冊會員後的認證有效期限。';
-    $lang->about_limit_date = '直到指定日期，否則該帳號都無法登入。';
-    $lang->about_after_login_url = '可以指定登入後的頁面轉向網址(留空為目前頁面)。';
-    $lang->about_after_logout_url = '可以指定登出後的頁面轉向網址(留空為目前頁面)。';
-    $lang->about_redirect_url = '請輸入會員註冊後的頁面轉向網址。(留空為返回前頁)';
-    $lang->about_agreement = '沒有會員條款時不會顯示。';
-
-    $lang->about_image_name = '用戶暱稱可以用圖片替代。';
-    $lang->about_image_mark = '顯示在用戶暱稱前的圖示。';
-    $lang->about_group_image_mark = '顯示在用戶群組前的圖示。';
-    $lang->about_profile_image = '可以使用個人圖片。';
-    $lang->about_signature_max_height = '可以限制簽名檔高度(零或留空為不限制)。';
-    $lang->about_accept_agreement = '已閱讀全部條款並同意。';
-
-    $lang->about_member_default = '將成為註冊會員時的預設群組。';
-
-    $lang->about_openid = '用 OpenID 註冊時，該網站只儲存帳號和郵件等基本資料，密碼和認證處理是在提供 OpenID 服務的網站中得到解決。';
-    $lang->about_openid_leave = '刪除 OpenID 就等於永久刪除站內會員的資料。<br />被刪除後，再重新登錄就等於新會員註冊，因此對以前自己寫的主題將失去其權限。';
-    $lang->about_find_member_account = '帳號/密碼將發送到您註冊時，所輸入的電子郵件當中。<br />輸入註冊時的電子郵件地址後，請按「查詢帳號/密碼」按鈕。<br />';
-
-    $lang->about_member = "可以新增/修改/刪除會員及管理群組或註冊表單的會員管理模組。\n此模組不僅可以建立預設群組以外的其他群組來管理會員，並且通過註冊表單的管理獲得會員基本資料以外的延伸資料。";
-    $lang->about_ssl_port = '請輸入想要使用 SSL 預設埠口以外的埠口。';
-    $lang->add_openid = '新增 OpenID';
-
-    $lang->about_resend_auth_mail = '如果沒有收到認證郵件可以再重寄一次。';
-    $lang->no_article = '主題不存在';
-
-    $lang->find_account_question = '密碼提示問答';
-    $lang->find_account_answer = '비밀번호 찾기 답변';
-    $lang->about_find_account_question = '可透過帳號、電子郵件和設定提示問答來獲得臨時密碼。';
-    $lang->find_account_question_items = array(''
-                                        ,'其他電子郵件?'
-                                        ,'我最愛的是?'
-                                        ,'我讀的國小是?'
-                                        ,'我的出生地?'
-                                        ,'我的理想?'
-                                        ,'母親的姓名?'
-                                        ,'父親的姓名?'
-                                        ,'最喜歡的顏色?'
-                                        ,'最愛的食物是?'
-                                        );
-
-    $lang->temp_password = '臨時密碼';
-    $lang->cmd_get_temp_password = '取得臨時密碼';
-    $lang->about_get_temp_password = '請再登入後變更密碼。';
-    $lang->msg_question_not_exists = '尚未輸入提示問答';
-    $lang->msg_answer_not_matches = '答案不正確';
-
-    $lang->change_password_date = '密碼更新';
-    $lang->about_change_password_date = '可設定密碼更新週期，將會定期通知更換密碼。 (設為零則不使用)';
-	$lang->msg_kr_address = '읍, 면, 동 이름으로 검색하세요.';
-	$lang->msg_kr_address_etc = '請輸入剩餘的地址(街道)。';
-	$lang->cmd_search_again   = '再找一次';
-?>
diff --git a/modules/member/member.admin.controller.php b/modules/member/member.admin.controller.php
index e277bc33f..425985713 100644
--- a/modules/member/member.admin.controller.php
+++ b/modules/member/member.admin.controller.php
@@ -1,542 +1,942 @@
-<?php
-    /**
-     * @class  memberAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module의 admin controller class
-     **/
-
-    class memberAdminController extends member {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 사용자 추가 (관리자용)
-         **/
-        function procMemberAdminInsert() {
-            if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
-            // 필수 정보들을 미리 추출
-            $args = Context::gets('member_srl','user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
-
-            // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
-            $all_args = Context::getRequestVars();
-            unset($all_args->module);
-            unset($all_args->act);
-            if(!isset($args->limit_date)) $args->limit_date = "";
-
-            // 모든 request argument에서 필수 정보만 제외 한 후 추가 데이터로 입력
-            $extra_vars = delObjectVars($all_args, $args);
-            $args->extra_vars = serialize($extra_vars);
-
-            // member_srl이 넘어오면 원 회원이 있는지 확인
-            if($args->member_srl) {
-                // 멤버 모델 객체 생성
-                $oMemberModel = &getModel('member');
-
-                // 회원 정보 구하기
-                $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
-
-                // 만약 원래 회원이 없으면 새로 입력하기 위한 처리
-                if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
-            }
-
-            $oMemberController = &getController('member');
-
-            // member_srl의 값에 따라 insert/update
-            if(!$args->member_srl) {
-                $output = $oMemberController->insertMember($args);
-                $msg_code = 'success_registed';
-            } else {
-                $output = $oMemberController->updateMember($args);
-                $msg_code = 'success_updated';
-            }
-
-            if(!$output->toBool()) return $output;
-
-            // 서명 저장
-            $signature = Context::get('signature');
-            $oMemberController->putSignature($args->member_srl, $signature);
-
-            // 결과 리턴
-            $this->add('member_srl', $args->member_srl);
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 사용자 삭제 (관리자용)
-         **/
-        function procMemberAdminDelete() {
-            // 일단 입력된 값들을 모두 받아서 db 입력항목과 그외 것으로 분리
-            $member_srl = Context::get('member_srl');
-
-            $oMemberController = &getController('member');
-            $output = $oMemberController->deleteMember($member_srl);
-            if(!$output->toBool()) return $output;
-
-            $this->add('page',Context::get('page'));
-            $this->setMessage("success_deleted");
-        }
-
-        /**
-         * @brief 회원 관리용 기본 정보의 추가
-         **/
-        function procMemberAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args = Context::gets(
-                'webmaster_name', 'webmaster_email',
-                'skin', 'colorset',
-                'editor_skin', 'editor_colorset',
-                'enable_openid', 'enable_join', 'enable_confirm', 'limit_day',
-                'after_login_url', 'after_logout_url', 'redirect_url', 'agreement',
-                'profile_image', 'profile_image_max_width', 'profile_image_max_height',
-                'image_name', 'image_name_max_width', 'image_name_max_height',
-                'image_mark', 'image_mark_max_width', 'image_mark_max_height',
-                'group_image_mark', 'group_image_mark_max_width', 'group_image_mark_max_height',
-                'signature','signature_max_height','change_password_date'
-            );
-
-            if(!$args->skin) $args->skin = "default";
-            if(!$args->colorset) $args->colorset = "white";
-            if(!$args->editor_skin) $args->editor_skin= "xpresseditor";
-            if(!$args->editor_colorset) $args->editor_colorset = "white";
-            if($args->enable_join!='Y') $args->enable_join = 'N';
-            if($args->enable_openid!='Y') $args->enable_openid= 'N';
-            if($args->profile_image !='Y') $args->profile_image = 'N';
-            if($args->image_name!='Y') $args->image_name = 'N';
-            if($args->image_mark!='Y') $args->image_mark = 'N';
-            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-            if($args->signature!='Y') $args->signature = 'N';
-            if(!trim(strip_tags($args->agreement))) $args->agreement = null;
-            $args->limit_day = (int)$args->limit_day;
-            if(!$args->change_password_date) $args->change_password_date = 0; 
-
-            $oMemberController = &getController('member');
-            $output = $oMemberController->setMemberConfig($args);
-            return $output;
-        }
-
-        /**
-         * @brief 사용자 그룹 추가
-         **/
-        function procMemberAdminInsertGroup() {
-            $args = Context::gets('title','description','is_default','image_mark');
-            $output = $this->insertGroup($args);
-            if(!$output->toBool()) return $output;
-
-            $this->add('group_srl','');
-            $this->add('page',Context::get('page'));
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 사용자 그룹 정보 수정
-         **/
-        function procMemberAdminUpdateGroup() {
-            $group_srl = Context::get('group_srl');
-            $mode = Context::get('mode');
-
-            switch($mode) {
-                case 'delete' :
-                        $output = $this->deleteGroup($group_srl);
-                        if(!$output->toBool()) return $output;
-                        $msg_code = 'success_deleted';
-                    break;
-                case 'update' :
-                        $args = Context::gets('group_srl','title','description','is_default','image_mark');
-                        $args->site_srl = 0;
-                        $output = $this->updateGroup($args);
-                        if(!$output->toBool()) return $output;
-                        $msg_code = 'success_updated';
-                    break;
-            }
-
-            $this->add('group_srl','');
-            $this->add('page',Context::get('page'));
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 가입 항목 추가
-         **/
-        function procMemberAdminInsertJoinForm() {
-            $args->member_join_form_srl = Context::get('member_join_form_srl');
-
-            $args->column_type = Context::get('column_type');
-            $args->column_name = strtolower(Context::get('column_name'));
-            $args->column_title = Context::get('column_title');
-            $args->default_value = explode('|@|', Context::get('default_value'));
-            $args->is_active = Context::get('is_active');
-            if(!in_array(strtoupper($args->is_active), array('Y','N'))) $args->is_active = 'N';
-            $args->required = Context::get('required');
-            if(!in_array(strtoupper($args->required), array('Y','N'))) $args->required = 'N';
-            $args->description = Context::get('description');
-
-            // 기본값의 정리
-            if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value) ) {
-                $args->default_value = serialize($args->default_value);
-            } else {
-                $args->default_value = '';
-            }
-
-            // member_join_form_srl이 있으면 수정, 없으면 추가
-            if(!$args->member_join_form_srl){
-                $args->list_order = getNextSequence();
-                $output = executeQuery('member.insertJoinForm', $args);
-            }else{
-                $output = executeQuery('member.updateJoinForm', $args);
-            }
-
-            if(!$output->toBool()) return $output;
-
-            $this->add('act','dispJoinForm');
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 가입 항목의 상/하 이동 및 내용 수정
-         **/
-        function procMemberAdminUpdateJoinForm() {
-            $member_join_form_srl = Context::get('member_join_form_srl');
-            $mode = Context::get('mode');
-
-            switch($mode) {
-                case 'up' :
-                        $output = $this->moveJoinFormUp($member_join_form_srl);
-                        $msg_code = 'success_moved';
-                    break;
-                case 'down' :
-                        $output = $this->moveJoinFormDown($member_join_form_srl);
-                        $msg_code = 'success_moved';
-                    break;
-                case 'delete' :
-                        $output = $this->deleteJoinForm($member_join_form_srl);
-                        $msg_code = 'success_deleted';
-                    break;
-                case 'update' :
-                    break;
-            }
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 선택된 회원들을 일괄 삭제
-         */
-        function procMemberAdminDeleteMembers() {
-            $target_member_srls = Context::get('target_member_srls');
-            if(!$target_member_srls) return new Object(-1, 'msg_invalid_request');
-            $member_srls = explode(',', $target_member_srls);
-            $oMemberController = &getController('member');
-
-            foreach($member_srls as $member) {
-                $output = $oMemberController->deleteMember($member);
-                if(!$output->toBool()) {
-                    $this->setMessage('failed_deleted');
-                    return $output;
-                }
-            }
-
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 선택된 회원들의 그룹을 일괄 변경
-         **/
-        function procMemberAdminUpdateMembersGroup() {
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return new Object(-1,'msg_invalid_request');
-            $member_srls = explode(',',$member_srl);
-
-            $group_srl = Context::get('group_srls');
-            $group_srls = explode('|@|', $group_srl);
-            if(!$group_srl) return new Object(-1,'msg_check_group');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 선택된 회원들의 그룹을 삭제
-            $args->member_srl = $member_srl;
-            $output = executeQuery('member.deleteMembersGroup', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 선택된 그룹으로 추가
-            $group_count = count($group_srls);
-            $member_count = count($member_srls);
-            for($j=0;$j<$group_count;$j++) {
-                $group_srl = (int)trim($group_srls[$j]);
-                if(!$group_srl) continue;
-                for($i=0;$i<$member_count;$i++) {
-                    $member_srl = (int)trim($member_srls[$i]);
-                    if(!$member_srl) continue;
-
-                    $args = null;
-                    $args->member_srl = $member_srl;
-                    $args->group_srl = $group_srl;
-
-                    $output = executeQuery('member.addMemberToGroup', $args);
-                    if(!$output->toBool()) {
-                        $oDB->rollback();
-                        return $output;
-                    }
-                }
-            }
-            $oDB->commit();
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 금지 아이디 추가
-         **/
-        function procMemberAdminInsertDeniedID() {
-            $user_id = Context::get('user_id');
-            $description = Context::get('description');
-
-            $output = $this->insertDeniedID($user_id, $description);
-            if(!$output->toBool()) return $output;
-
-            $this->add('group_srl','');
-            $this->add('page',Context::get('page'));
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 금지 아이디 업데이트
-         **/
-        function procMemberAdminUpdateDeniedID() {
-            $user_id = Context::get('user_id');
-            $mode = Context::get('mode');
-
-            switch($mode) {
-                case 'delete' :
-                        $output = $this->deleteDeniedID($user_id);
-                        if(!$output->toBool()) return $output;
-                        $msg_code = 'success_deleted';
-                    break;
-            }
-
-            $this->add('page',Context::get('page'));
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 관리자를 추가한다
-         **/
-        function insertAdmin($args) {
-            // 관리자임을 설정
-            $args->is_admin = 'Y';
-
-            // 관리자 그룹을 구해와서 설정
-            $oMemberModel = &getModel('member');
-            $admin_group = $oMemberModel->getAdminGroup();
-            $args->group_srl_list = $admin_group->group_srl;
-
-            $oMemberController = &getController('member');
-            return $oMemberController->insertMember($args);
-        }
-
-        /**
-         * @brief 회원의 그룹값을 변경
-         **/
-        function changeGroup($source_group_srl, $target_group_srl) {
-            $args->source_group_srl = $source_group_srl;
-            $args->target_group_srl = $target_group_srl;
-
-            return executeQuery('member.changeGroup', $args);
-        }
-
-        /**
-         * @brief 그룹 등록
-         **/
-        function insertGroup($args) {
-            if(!$args->site_srl) $args->site_srl = 0;
-            // is_default값을 체크, Y일 경우 일단 모든 is_default에 대해서 N 처리
-            if($args->is_default!='Y') {
-                $args->is_default = 'N';
-            } else {
-                $output = executeQuery('member.updateGroupDefaultClear', $args);
-                if(!$output->toBool()) return $output;
-            }
-
-			if (!$args->group_srl) $args->group_srl = getNextSequence();
-            return executeQuery('member.insertGroup', $args);
-        }
-
-        /**
-         * @brief 그룹 정보 수정
-         **/
-        function updateGroup($args) {
-            // is_default값을 체크, Y일 경우 일단 모든 is_default에 대해서 N 처리
-            if($args->is_default!='Y') $args->is_default = 'N';
-            else {
-                $output = executeQuery('member.updateGroupDefaultClear', $args);
-                if(!$output->toBool()) return $output;
-            }
-
-            return executeQuery('member.updateGroup', $args);
-        }
-
-        /**
-         * 그룹 삭제
-         **/
-        function deleteGroup($group_srl, $site_srl = null) {
-            // 멤버모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // 삭제 대상 그룹을 가져와서 체크 (is_default == 'Y'일 경우 삭제 불가)
-            $group_info = $oMemberModel->getGroup($group_srl);
-
-            if(!$group_info) return new Object(-1, 'lang->msg_not_founded');
-            if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default');
-
-            // is_default == 'Y'인 그룹을 가져옴
-            $default_group = $oMemberModel->getDefaultGroup($site_srl);
-            $default_group_srl = $default_group->group_srl;
-
-            // default_group_srl로 변경
-            $this->changeGroup($group_srl, $default_group_srl);
-
-            $args->group_srl = $group_srl;
-            return executeQuery('member.deleteGroup', $args);
-        }
-
-
-        function procMemberAdminUpdateGroupOrder() {
-			$vars = Context::getRequestVars();
-			
-			foreach($vars->group_srls as $key => $val){
-				$args->group_srl = $val;
-				$args->list_order = $key + 1;
-				executeQuery('member.updateMemberGroupListOrder', $args);
-			}
-
-			header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')));
-        }
-
-        /**
-         * @brief 금지아이디 등록
-         **/
-        function insertDeniedID($user_id, $description = '') {
-            $args->user_id = $user_id;
-            $args->description = $description;
-            $args->list_order = -1*getNextSequence();
-
-            return executeQuery('member.insertDeniedID', $args);
-        }
-
-        /**
-         * @brief 금지아이디 삭제
-         **/
-        function deleteDeniedID($user_id) {
-            $args->user_id = $user_id;
-            return executeQuery('member.deleteDeniedID', $args);
-        }
-
-        /**
-         * @brief 가입폼 항목을 삭제
-         **/
-        function deleteJoinForm($member_join_form_srl) {
-            $args->member_join_form_srl = $member_join_form_srl;
-            $output = executeQuery('member.deleteJoinForm', $args);
-            return $output;
-        }
-
-        /**
-         * @brief 가입항목을 상단으로 이동
-         **/
-        function moveJoinFormUp($member_join_form_srl) {
-            $oMemberModel = &getModel('member');
-
-            // 선택된 가입항목의 정보를 구한다
-            $args->member_join_form_srl = $member_join_form_srl;
-            $output = executeQuery('member.getJoinForm', $args);
-
-            $join_form = $output->data;
-            $list_order = $join_form->list_order;
-
-            // 전체 가입항목 목록을 구한다
-            $join_form_list = $oMemberModel->getJoinFormList();
-            $join_form_srl_list = array_keys($join_form_list);
-            if(count($join_form_srl_list)<2) return new Object();
-
-            $prev_member_join_form = NULL;
-            foreach($join_form_list as $key => $val) {
-                if($val->member_join_form_srl == $member_join_form_srl) break;
-                $prev_member_join_form = $val;
-            }
-
-            // 이전 가입항목가 없으면 그냥 return
-            if(!$prev_member_join_form) return new Object();
-
-            // 선택한 가입항목의 정보
-            $cur_args->member_join_form_srl = $member_join_form_srl;
-            $cur_args->list_order = $prev_member_join_form->list_order;
-
-            // 대상 가입항목의 정보
-            $prev_args->member_join_form_srl = $prev_member_join_form->member_join_form_srl;
-            $prev_args->list_order = $list_order;
-
-            // DB 처리
-            $output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-            if(!$output->toBool()) return $output;
-
-            executeQuery('member.updateMemberJoinFormListorder', $prev_args);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-
-        /**
-         * @brief 가입항목을 하단으로 이동
-         **/
-        function moveJoinFormDown($member_join_form_srl) {
-            $oMemberModel = &getModel('member');
-
-            // 선택된 가입항목의 정보를 구한다
-            $args->member_join_form_srl = $member_join_form_srl;
-            $output = executeQuery('member.getJoinForm', $args);
-
-            $join_form = $output->data;
-            $list_order = $join_form->list_order;
-
-            // 전체 가입항목 목록을 구한다
-            $join_form_list = $oMemberModel->getJoinFormList();
-            $join_form_srl_list = array_keys($join_form_list);
-            if(count($join_form_srl_list)<2) return new Object();
-
-            for($i=0;$i<count($join_form_srl_list);$i++) {
-                if($join_form_srl_list[$i]==$member_join_form_srl) break;
-            }
-
-            $next_member_join_form_srl = $join_form_srl_list[$i+1];
-
-            // 이전 가입항목가 없으면 그냥 return
-            if(!$next_member_join_form_srl) return new Object();
-            $next_member_join_form = $join_form_list[$next_member_join_form_srl];
-
-            // 선택한 가입항목의 정보
-            $cur_args->member_join_form_srl = $member_join_form_srl;
-            $cur_args->list_order = $next_member_join_form->list_order;
-
-            // 대상 가입항목의 정보
-            $next_args->member_join_form_srl = $next_member_join_form->member_join_form_srl;
-            $next_args->list_order = $list_order;
-
-            // DB 처리
-            $output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('member.updateMemberJoinFormListorder', $next_args);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  memberAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief member module of the admin controller class
+     **/
+
+    class memberAdminController extends member {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Add a user (Administrator)
+         **/
+        function procMemberAdminInsert() {
+           // if(Context::getRequestMethod() == "GET") return new Object(-1, "msg_invalid_request");
+            // Extract the necessary information in advance
+            $args = Context::gets('member_srl','email_address','find_account_answer', 'allow_mailing','allow_message','denied','is_admin','description','group_srl_list','limit_date');
+            $oMemberModel = &getModel ('member');
+            $config = $oMemberModel->getMemberConfig ();
+			$getVars = array();
+			if ($config->signupForm){
+				foreach($config->signupForm as $formInfo){
+					if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired)){
+						$getVars[] = $formInfo->name;
+					}
+				}
+			}
+			foreach($getVars as $val){
+				$args->{$val} = Context::get($val);
+			}
+			$args->member_srl = Context::get('member_srl');
+			if (Context::get('reset_password'))
+				$args->password = Context::get('reset_password');
+			else unset($args->password);
+
+            // Remove some unnecessary variables from all the vars
+            $all_args = Context::getRequestVars();
+            unset($all_args->module);
+            unset($all_args->act);
+            unset($all_args->mid);
+            unset($all_args->error_return_url);
+            unset($all_args->success_return_url);
+            unset($all_args->ruleset);
+            if(!isset($args->limit_date)) $args->limit_date = "";
+            // Add extra vars after excluding necessary information from all the requested arguments
+            $extra_vars = delObjectVars($all_args, $args);
+            $args->extra_vars = serialize($extra_vars);
+            // Check if an original member exists having the member_srl
+            if($args->member_srl) {
+                // Create a member model object
+                $oMemberModel = &getModel('member');
+                // Get memebr profile
+				$columnList = array('member_srl');
+                $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl, 0, $columnList);
+                // If no original member exists, make a new one
+                if($member_info->member_srl != $args->member_srl) unset($args->member_srl);
+            }
+
+			// remove whitespace
+			$checkInfos = array('user_id', 'nick_name', 'email_address');
+			$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
+			foreach($checkInfos as $val){
+				if(isset($args->{$val})){
+					$args->{$val} = str_replace($replaceStr, '', $args->{$val});
+				}
+			}
+
+            $oMemberController = &getController('member');
+            // Execute insert or update depending on the value of member_srl
+            if(!$args->member_srl) {
+				$args->password = Context::get('password');
+                $output = $oMemberController->insertMember($args);
+                $msg_code = 'success_registed';
+            } else {
+                $output = $oMemberController->updateMember($args);
+                $msg_code = 'success_updated';
+            }
+
+            if(!$output->toBool()) return $output;
+            // Save Signature
+            $signature = Context::get('signature');
+            $oMemberController->putSignature($args->member_srl, $signature);
+            // Return result
+            $this->add('member_srl', $args->member_srl);
+            $this->setMessage($msg_code);
+
+			$profile_image = $_FILES['profile_image'];
+			if (is_uploaded_file($profile_image['tmp_name'])){
+				$oMemberController->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
+			}
+
+			$image_mark = $_FILES['image_mark'];
+			if (is_uploaded_file($image_mark['tmp_name'])){
+				$oMemberController->insertImageMark($args->member_srl, $image_mark['tmp_name']);
+			}
+
+			$image_name = $_FILES['image_name'];
+			if (is_uploaded_file($image_name['tmp_name'])){
+				$oMemberController->insertImageName($args->member_srl, $image_name['tmp_name']);
+			}
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Delete a user (Administrator)
+         **/
+        function procMemberAdminDelete() {
+            // Separate all the values into DB entries and others
+            $member_srl = Context::get('member_srl');
+
+            $oMemberController = &getController('member');
+            $output = $oMemberController->deleteMember($member_srl);
+            if(!$output->toBool()) return $output;
+
+            $this->add('page',Context::get('page'));
+            $this->setMessage("success_deleted");
+        }
+
+		function procMemberAdminInsertConfig(){
+            $input_args = Context::gets(
+				'enable_join',
+				'enable_confirm',
+				'webmaster_name',
+				'webmaster_email',
+				'limit_day',
+				'change_password_date',
+				'agreement',
+				'after_login_url',
+				'after_logout_url',
+				'redirect_url',
+				'skin',
+				'colorset',
+                'profile_image', 'profile_image_max_width', 'profile_image_max_height',
+                'image_name', 'image_name_max_width', 'image_name_max_height',
+                'image_mark', 'image_mark_max_width', 'image_mark_max_height'
+            );
+
+			$list_order = Context::get('list_order');
+			$usable_list = Context::get('usable_list');
+			$all_args = Context::getRequestVars();
+
+			$oModuleController = &getController('module');
+            $oMemberModel = &getModel('member');
+
+			// default setting start
+            if($input_args->enable_join != 'Y'){
+				$args->enable_join = 'N';
+			}else{
+				$args = $input_args;
+				$args->enable_join = 'Y';
+				if($args->enable_confirm !='Y') $args->enable_confirm = 'N';
+				$args->limit_day = (int)$args->limit_day;
+				if(!$args->change_password_date) $args->change_password_date = 0; 
+				if(!trim(strip_tags($args->agreement))) $args->agreement = null;
+				if(!trim(strip_tags($args->after_login_url))) $args->after_login_url = null;
+				if(!trim(strip_tags($args->after_logout_url))) $args->after_logout_url = null;
+				if(!trim(strip_tags($args->redirect_url))) $args->redirect_url = null;
+
+				if(!$args->skin) $args->skin = "default";
+				if(!$args->colorset) $args->colorset = "white";
+
+				$args->profile_image = $args->profile_image?'Y':'N';
+				$args->image_name = $args->image_name?'Y':'N';
+				$args->image_mark = $args->image_mark?'Y':'N';
+				if($args->signature!='Y') $args->signature = 'N';
+				$args->identifier = $all_args->identifier;
+
+				// signupForm
+				global $lang;
+				$signupForm = array();
+				$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark', 'profile_image_max_width', 'profile_image_max_height', 'image_name_max_width', 'image_name_max_height', 'image_mark_max_width', 'image_mark_max_height');
+				$mustRequireds = array('email_address', 'nick_name', 'password', 'find_account_question');
+				$extendItems = $oMemberModel->getJoinFormList();
+				foreach($list_order as $key){
+					unset($signupItem);
+					$signupItem->isIdentifier = ($key == $all_args->identifier);
+					$signupItem->isDefaultForm = in_array($key, $items);
+					
+					$signupItem->name = $key;
+					if(in_array($key, $items)) $signupItem->title = $key;
+					else $signupItem->title = $lang->{$key};
+					$signupItem->mustRequired = in_array($key, $mustRequireds);
+					$signupItem->imageType = (strpos($key, 'image') !== false);
+					$signupItem->required = ($all_args->{$key} == 'required') || $signupItem->mustRequired || $signupItem->isIdentifier;
+					$signupItem->isUse = in_array($key, $usable_list) || $signupItem->required;
+
+					if ($signupItem->imageType){
+						$signupItem->max_width = $all_args->{$key.'_max_width'};
+						$signupItem->max_height = $all_args->{$key.'_max_height'};
+					}
+
+					// set extends form
+					if (!$signupItem->isDefaultForm){
+						$extendItem = $extendItems[$all_args->{$key.'_member_join_form_srl'}];
+						$signupItem->type = $extendItem->column_type;
+						$signupItem->member_join_form_srl = $extendItem->member_join_form_srl;
+						$signupItem->title = $extendItem->column_title;
+						$signupItem->description = $extendItem->description;
+
+						// check usable value change, required/option
+						if ($signupItem->isUse != ($extendItem->is_active == 'Y') || $signupItem->required != ($extendItem->required == 'Y')){
+							unset($update_args);
+							$update_args->member_join_form_srl = $extendItem->member_join_form_srl;
+							$update_args->is_active = $signupItem->isUse?'Y':'N';
+							$update_args->required = $signupItem->required?'Y':'N';
+
+							$update_output = executeQuery('member.updateJoinForm', $update_args);
+						}
+						unset($extendItem);
+					}
+					$signupForm[] = $signupItem;
+				}
+				$args->signupForm = $signupForm;
+
+				// create Ruleset
+				$this->_createSignupRuleset($signupForm);
+				$this->_createLoginRuleset($args->identifier);
+				$this->_createFindAccountByQuestion($args->identifier);
+			}
+			$output = $oModuleController->updateModuleConfig('member', $args);
+			// default setting end
+
+ 			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminConfig');
+				$this->setRedirectUrl($returnUrl);
+				return;
+ 			}
+		}
+
+		function _createSignupRuleset($signupForm){
+			$xml_file = './files/ruleset/insertMember.xml';
+			$admin_xml_file = './files/ruleset/insertAdmintMember.xml';
+			$buff = '<?xml version="1.0" encoding="utf-8"?>'
+					.'<ruleset version="1.5.0">'
+				    .'<customrules>'
+					.'</customrules>'
+					.'<fields>%s</fields>'						
+					.'</ruleset>';
+
+			$fields = array();
+			foreach($signupForm as $formInfo){
+				if ($formInfo->required || $formInfo->mustRequired){
+					if($formInfo->type == 'tel' || $formInfo->type == 'kr_zip'){
+						$fields[] = sprintf('<field name="%s[]" required="true" />', $formInfo->name);
+					}else if($formInfo->name == 'password'){
+						$fields[] = '<field name="password"><if test="$act == \'procMemberInsert\'" attr="required" value="true" /><if test="$act == \'procMemberInsert\'" attr="length" value="3: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'){
+						$fields[100] = '<field name="find_account_question" required="true" />';
+						$fields[101] = '<field name="find_account_answer" required="true" length=":250"/>';
+					}else if($formInfo->name == 'email_address'){
+						$fields[] = sprintf('<field name="%s" required="true" rule="email"/>', $formInfo->name);
+					}else if($formInfo->name == 'user_id'){
+						$fields[] = sprintf('<field name="%s" required="true" rule="userid" length="3:20" />', $formInfo->name);
+					}else{
+						$fields[] = sprintf('<field name="%s" required="true" />', $formInfo->name);
+					}
+				}
+			}
+
+			$xml_buff = sprintf($buff, implode('', $fields));
+            FileHandler::writeFile($xml_file, $xml_buff);
+			unset($xml_buff);
+
+			$adminFields = $fields;
+			$adminFields[100] = '<field name="find_account_question" />';
+			$adminFields[101] = '<field name="find_account_answer" length=":250"/>';
+
+			$xml_buff = sprintf($buff, implode('', $adminFields));
+            FileHandler::writeFile($admin_xml_file, $xml_buff);
+			unset($xml_buff);
+
+			$validator   = new Validator($xml_file);
+			$validator->setCacheDir('files/cache');
+			$validator->getJsPath();
+
+			$adminValidator   = new Validator($admin_xml_file);
+			$adminValidator->setCacheDir('files/cache');
+			$adminValidator->getJsPath();
+		}
+
+		function _createLoginRuleset($identifier){
+			$xml_file = './files/ruleset/login.xml';
+			$buff = '<?xml version="1.0" encoding="utf-8"?>'
+					.'<ruleset version="1.5.0">'
+				    .'<customrules>'
+					.'</customrules>'
+					.'<fields>%s</fields>'						
+					.'</ruleset>';
+
+			$fields = array();
+			$trans = array('email_address'=>'email', 'user_id'=> 'userid');
+			$fields[] = sprintf('<field name="user_id" required="true" rule="%s"/>', $trans[$identifier]);
+			$fields[] = '<field name="password" required="true" />';
+
+			$xml_buff = sprintf($buff, implode('', $fields));
+            Filehandler::writeFile($xml_file, $xml_buff);
+
+			$validator   = new Validator($xml_file);
+			$validator->setCacheDir('files/cache');
+			$validator->getJsPath();
+		}
+
+		function _createFindAccountByQuestion($identifier){
+			$xml_file = './files/ruleset/find_member_account_by_question.xml';
+			$buff = '<?xml version="1.0" encoding="utf-8"?>'
+					.'<ruleset version="1.5.0">'
+				    .'<customrules>'
+					.'</customrules>'
+					.'<fields>%s</fields>'						
+					.'</ruleset>';
+
+			$fields = array();
+			if ($identifier == 'user_id')
+				$fields[] = '<field name="user_id" required="true" rule="userid" />';
+
+			$fields[] = '<field name="email_address" required="true" rule="email" />';
+			$fields[] = '<field name="find_account_question" required="true" />';
+			$fields[] = '<field name="find_account_answer" required="true" length=":250"/>';
+
+			$xml_buff = sprintf($buff, implode('', $fields));
+            Filehandler::writeFile($xml_file, $xml_buff);
+
+			$validator   = new Validator($xml_file);
+			$validator->setCacheDir('files/cache');
+			$validator->getJsPath();
+		}
+
+        /**
+         * @brief Add a user group
+         **/
+        function procMemberAdminInsertGroup() {
+            $args = Context::gets('title','description','is_default','image_mark');
+            $output = $this->insertGroup($args);
+            if(!$output->toBool()) return $output;
+
+            $this->add('group_srl','');
+            $this->add('page',Context::get('page'));
+            $this->setMessage('success_registed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Update user group information
+         **/
+        function procMemberAdminUpdateGroup() {
+            $group_srl = Context::get('group_srl');
+
+			$args = Context::gets('group_srl','title','description','is_default','image_mark');
+			$args->site_srl = 0;
+			$output = $this->updateGroup($args);
+			if(!$output->toBool()) return $output;
+
+            $this->add('group_srl','');
+            $this->add('page',Context::get('page'));
+            $this->setMessage('success_updated');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Update user group information
+         **/
+        function procMemberAdminDeleteGroup() {
+            $group_srl = Context::get('group_srl');
+
+			$output = $this->deleteGroup($group_srl);
+			if(!$output->toBool()) return $output;
+
+            $this->add('group_srl','');
+            $this->add('page',Context::get('page'));
+            $this->setMessage('success_deleted');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Add a join form
+         **/
+        function procMemberAdminInsertJoinForm() {
+            $args->member_join_form_srl = Context::get('member_join_form_srl');
+
+            $args->column_type = Context::get('column_type');
+            $args->column_name = strtolower(Context::get('column_name'));
+            $args->column_title = Context::get('column_title');
+            $args->default_value = explode("\n", str_replace("\r", '', Context::get('default_value')));
+            $args->required = Context::get('required');
+			$args->is_active = (isset($args->required));
+            if(!in_array(strtoupper($args->required), array('Y','N')))$args->required = 'N';
+            $args->description = Context::get('description');
+            // Default values
+            if(in_array($args->column_type, array('checkbox','select','radio')) && count($args->default_value) ) {
+                $args->default_value = serialize($args->default_value);
+            } else {
+                $args->default_value = '';
+            }
+            // Fix if member_join_form_srl exists. Add if not exists.
+            $isInsert;
+			if(!$args->member_join_form_srl){
+				$isInsert = true;
+				$args->list_order = $args->member_join_form_srl = getNextSequence();
+                $output = executeQuery('member.insertJoinForm', $args);
+            }else{
+                $output = executeQuery('member.updateJoinForm', $args);
+            }
+
+            if(!$output->toBool()) return $output;
+
+			// memberConfig update
+			$signupItem->name = $args->column_name;
+			$signupItem->title = $args->column_title;
+			$signupItem->type = $args->column_type;
+			$signupItem->member_join_form_srl = $args->member_join_form_srl;
+			$signupItem->required = ($args->required == 'Y');
+			$signupItem->isUse = ($args->is_active == 'Y');
+			$signupItem->description = $args->description;
+
+			$oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+
+			if($isInsert){
+				$config->signupForm[] = $signupItem;	
+			}else{
+				foreach($config->signupForm as $key=>$val){
+					if ($val->member_join_form_srl == $signupItem->member_join_form_srl){
+						$config->signupForm[$key] = $signupItem;
+					}
+				}
+			}
+			$oModuleController = &getController('module');
+			$output = $oModuleController->updateModuleConfig('member', $config);
+
+            $this->setMessage('success_registed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminJoinFormList');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+		function procMemberAdminDeleteJoinForm(){
+            $member_join_form_srl = Context::get('member_join_form_srl');
+			$this->deleteJoinForm($member_join_form_srl);
+
+			$oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+
+			foreach($config->signupForm as $key=>$val){
+				if ($val->member_join_form_srl == $member_join_form_srl){
+					unset($config->signupForm[$key]);
+					break;
+				}
+			}
+			$oModuleController = &getController('module');
+			$output = $oModuleController->updateModuleConfig('member', $config);
+		}
+
+        /**
+         * @brief Move up/down the member join form and modify it
+         **/
+        function procMemberAdminUpdateJoinForm() {
+            $member_join_form_srl = Context::get('member_join_form_srl');
+            $mode = Context::get('mode');
+
+            switch($mode) {
+                case 'up' :
+                        $output = $this->moveJoinFormUp($member_join_form_srl);
+                        $msg_code = 'success_moved';
+                    break;
+                case 'down' :
+                        $output = $this->moveJoinFormDown($member_join_form_srl);
+                        $msg_code = 'success_moved';
+                    break;
+                case 'delete' :
+                        $output = $this->deleteJoinForm($member_join_form_srl);
+                        $msg_code = 'success_deleted';
+                    break;
+                case 'update' :
+                    break;
+            }
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage($msg_code);
+        }
+
+		/**
+		 * selected member manager layer in dispAdminList 
+		 **/
+		function procMemberAdminSelectedMemberManage(){
+			$var = Context::getRequestVars();
+			$groups = $var->groups;
+			$members = $var->member_srls;
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+			$oMemberController = &getController('member');
+			foreach($members as $key=>$member_srl){
+				unset($args);
+				$args->member_srl = $member_srl; 
+				switch($var->type){
+					case 'modify':{
+									  if (count($groups) > 0){
+											$args->site_srl = 0;
+											// One of its members to delete all the group
+											$output = executeQuery('member.deleteMemberGroupMember', $args);
+											if(!$output->toBool()) {
+												$oDB->rollback();
+												return $output;
+											}
+											// Enter one of the loop a
+											foreach($groups as $group_srl) {
+												$output = $oMemberController->addMemberToGroup($args->member_srl,$group_srl);
+												if(!$output->toBool()) {
+													$oDB->rollback();
+													return $output;
+												}
+											}
+									  }
+									  if ($var->denied){
+										  $args->denied = $var->denied;
+										  $output = executeQuery('member.updateMemberDeniedInfo', $args);
+										  if(!$output->toBool()) {
+											  $oDB->rollback();
+											  return $output;
+										  }
+									  }
+									  break;
+								  }
+					case 'delete':{
+									  $oMemberController->memberInfo = null;
+									  $output = $oMemberController->deleteMember($member_srl);
+									  if(!$output->toBool()) {
+										  $oDB->rollback();
+										  return $output;
+									  }
+								  }
+				}
+			}
+
+			$message = $var->message;
+			// Send a message
+			if($message) {
+				$oCommunicationController = &getController('communication');
+
+				$logged_info = Context::get('logged_info');
+				$title = cut_str($message,10,'...');
+				$sender_member_srl = $logged_info->member_srl;
+
+				foreach($members as $member_srl){
+					$oCommunicationController->sendMessage($sender_member_srl, $member_srl, $title, $message, false);
+				}
+			}
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminList');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+		}
+
+        /**
+         * @brief Delete the selected members
+         */
+        function procMemberAdminDeleteMembers() {
+            $target_member_srls = Context::get('target_member_srls');
+            if(!$target_member_srls) return new Object(-1, 'msg_invalid_request');
+            $member_srls = explode(',', $target_member_srls);
+            $oMemberController = &getController('member');
+
+            foreach($member_srls as $member) {
+                $output = $oMemberController->deleteMember($member);
+                if(!$output->toBool()) {
+                    $this->setMessage('failed_deleted');
+                    return $output;
+                }
+            }
+
+            $this->setMessage('success_deleted');
+        }
+
+        /**
+         * @brief Update a group of selected memebrs
+         **/
+        function procMemberAdminUpdateMembersGroup() {
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return new Object(-1,'msg_invalid_request');
+            $member_srls = explode(',',$member_srl);
+
+            $group_srl = Context::get('group_srls');
+            if(!is_array($group_srl)) $group_srls = explode('|@|', $group_srl);
+			else $group_srls = $group_srl;
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Delete a group of selected members
+            $args->member_srl = $member_srl;
+            $output = executeQuery('member.deleteMembersGroup', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Add to a selected group
+            $group_count = count($group_srls);
+            $member_count = count($member_srls);
+            for($j=0;$j<$group_count;$j++) {
+                $group_srl = (int)trim($group_srls[$j]);
+                if(!$group_srl) continue;
+                for($i=0;$i<$member_count;$i++) {
+                    $member_srl = (int)trim($member_srls[$i]);
+                    if(!$member_srl) continue;
+
+                    $args = null;
+                    $args->member_srl = $member_srl;
+                    $args->group_srl = $group_srl;
+
+                    $output = executeQuery('member.addMemberToGroup', $args);
+                    if(!$output->toBool()) {
+                        $oDB->rollback();
+                        return $output;
+                    }
+                }
+            }
+            $oDB->commit();
+            $this->setMessage('success_updated');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				global $lang;
+				htmlHeader();
+				alertScript($lang->success_updated);
+				reload(true);
+				closePopupScript();
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+        }
+
+        /**
+         * @brief Add a denied ID
+         **/
+        function procMemberAdminInsertDeniedID() {
+            $user_ids = Context::get('user_id');
+
+			$user_ids = explode(',',$user_ids);
+			$success_ids = array();
+
+			foreach($user_ids as $val){
+				$output = $this->insertDeniedID($val, '');
+				if($output->toBool()) $success_ids[] = $val;
+			}
+
+			$this->add('user_ids', implode(',',$success_ids));
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminDeniedIDList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Update denied ID
+         **/
+        function procMemberAdminUpdateDeniedID() {
+            $user_id = Context::get('user_id');
+            $mode = Context::get('mode');
+
+            switch($mode) {
+                case 'delete' :
+                        $output = $this->deleteDeniedID($user_id);
+                        if(!$output->toBool()) return $output;
+                        $msg_code = 'success_deleted';
+                    break;
+            }
+
+            $this->add('page',Context::get('page'));
+            $this->setMessage($msg_code);
+        }
+
+        /**
+         * @brief Add an administrator
+         **/
+        function insertAdmin($args) {
+            // Assign an administrator
+            $args->is_admin = 'Y';
+            // Get admin group and set
+            $oMemberModel = &getModel('member');
+            $admin_group = $oMemberModel->getAdminGroup();
+            $args->group_srl_list = $admin_group->group_srl;
+
+            $oMemberController = &getController('member');
+            return $oMemberController->insertMember($args);
+        }
+
+        /**
+         * @brief Change the group values of member
+         **/
+        function changeGroup($source_group_srl, $target_group_srl) {
+            $args->source_group_srl = $source_group_srl;
+            $args->target_group_srl = $target_group_srl;
+
+            return executeQuery('member.changeGroup', $args);
+        }
+
+        /**
+         * @brief find_account_answerInsert a group
+         **/
+        function insertGroup($args) {
+            if(!$args->site_srl) $args->site_srl = 0;
+            // Check the value of is_default. 
+            if($args->is_default!='Y') {
+				$args->is_default = 'N';
+			} else {
+				 $output = executeQuery('member.updateGroupDefaultClear', $args);
+				 if(!$output->toBool()) return $output;
+			}
+			
+			if (!$args->group_srl) $args->group_srl = getNextSequence();
+            return executeQuery('member.insertGroup', $args);
+        }
+
+        /**
+         * @brief Modify Group Information
+         **/
+        function updateGroup($args) {
+            // Check the value of is_default. 
+			if(!$args->group_srl) return new Object(-1, 'lang->msg_not_founded');
+            if($args->is_default!='Y') {
+				$args->is_default = 'N';
+			} else {
+				 $output = executeQuery('member.updateGroupDefaultClear', $args);
+				 if(!$output->toBool()) return $output;
+			}
+
+            return executeQuery('member.updateGroup', $args);
+        }
+
+        /**
+         * Delete a Group
+         **/
+        function deleteGroup($group_srl, $site_srl = 0) {
+            // Create a member model object
+            $oMemberModel = &getModel('member');
+            // Check the group_srl (If is_default == 'Y', it cannot be deleted)
+			$columnList = array('group_srl', 'is_default');
+            $group_info = $oMemberModel->getGroup($group_srl, $columnList);
+
+            if(!$group_info) return new Object(-1, 'lang->msg_not_founded');
+            if($group_info->is_default == 'Y') return new Object(-1, 'msg_not_delete_default');
+            // Get groups where is_default == 'Y'
+			$columnList = array('site_srl', 'group_srl');
+            $default_group = $oMemberModel->getDefaultGroup($site_srl, $columnList);
+            $default_group_srl = $default_group->group_srl;
+            // Change to default_group_srl
+            $this->changeGroup($group_srl, $default_group_srl);
+
+            $args->group_srl = $group_srl;
+            return executeQuery('member.deleteGroup', $args);
+        }
+
+        /**
+         * Set group config
+         **/
+		function procMemberAdminGroupConfig() {
+			$vars = Context::getRequestVars();	
+
+			$oMemberModel = &getModel('member');
+			$oModuleController = &getController('module');
+
+			// group image mark option
+			$config = $oMemberModel->getMemberConfig();
+			$config->group_image_mark = $vars->group_image_mark;
+			$output = $oModuleController->updateModuleConfig('member', $config);
+
+			// group data save
+			$group_srls = $vars->group_srls;
+			foreach($group_srls as $order=>$group_srl){
+				unset($update_args);
+				$update_args->title = $vars->group_titles[$order];
+				$update_args->is_default = ($vars->defaultGroup == $group_srl)?'Y':'N';
+				$update_args->description = $vars->descriptions[$order];
+				$update_args->image_mark = $vars->image_marks[$order];
+				$update_args->list_order = $order + 1;
+
+				if (is_numeric($group_srl)){
+					$update_args->group_srl = $group_srl;
+					$output = $this->updateGroup($update_args);
+				}else
+					$output = $this->insertGroup($update_args);
+			}
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+		}
+
+        function procMemberAdminUpdateGroupOrder() {
+			$vars = Context::getRequestVars();
+			
+			foreach($vars->group_srls as $key => $val){
+				$args->group_srl = $val;
+				$args->list_order = $key + 1;
+				executeQuery('member.updateMemberGroupListOrder', $args);
+			}
+
+			header(sprintf('Location:%s', getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMemberAdminGroupList')));
+        }
+
+        /**
+         * @brief Register denied ID
+         **/
+        function insertDeniedID($user_id, $description = '') {
+            $args->user_id = $user_id;
+            $args->description = $description;
+            $args->list_order = -1*getNextSequence();
+
+            return executeQuery('member.insertDeniedID', $args);
+        }
+
+        /**
+         * @brief Delete a denied ID
+         **/
+        function deleteDeniedID($user_id) {
+            $args->user_id = $user_id;
+            return executeQuery('member.deleteDeniedID', $args);
+        }
+
+        /**
+         * @brief Delete a join form
+         **/
+        function deleteJoinForm($member_join_form_srl) {
+            $args->member_join_form_srl = $member_join_form_srl;
+            $output = executeQuery('member.deleteJoinForm', $args);
+            return $output;
+        }
+
+        /**
+         * @brief Move up a join form
+         **/
+        function moveJoinFormUp($member_join_form_srl) {
+            $oMemberModel = &getModel('member');
+            // Get information of the join form
+            $args->member_join_form_srl = $member_join_form_srl;
+            $output = executeQuery('member.getJoinForm', $args);
+
+            $join_form = $output->data;
+            $list_order = $join_form->list_order;
+            // Get a list of all join forms
+            $join_form_list = $oMemberModel->getJoinFormList();
+            $join_form_srl_list = array_keys($join_form_list);
+            if(count($join_form_srl_list)<2) return new Object();
+
+            $prev_member_join_form = NULL;
+            foreach($join_form_list as $key => $val) {
+                if($val->member_join_form_srl == $member_join_form_srl) break;
+                $prev_member_join_form = $val;
+            }
+            // Return if no previous join form exists
+            if(!$prev_member_join_form) return new Object();
+            // Information of the join form
+            $cur_args->member_join_form_srl = $member_join_form_srl;
+            $cur_args->list_order = $prev_member_join_form->list_order;
+            // Information of the target join form
+            $prev_args->member_join_form_srl = $prev_member_join_form->member_join_form_srl;
+            $prev_args->list_order = $list_order;
+            // Execute Query
+            $output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
+            if(!$output->toBool()) return $output;
+
+            executeQuery('member.updateMemberJoinFormListorder', $prev_args);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+
+        /**
+         * @brief Move down a join form
+         **/
+        function moveJoinFormDown($member_join_form_srl) {
+            $oMemberModel = &getModel('member');
+            // Get information of the join form
+            $args->member_join_form_srl = $member_join_form_srl;
+            $output = executeQuery('member.getJoinForm', $args);
+
+            $join_form = $output->data;
+            $list_order = $join_form->list_order;
+            // Get information of all join forms
+            $join_form_list = $oMemberModel->getJoinFormList();
+            $join_form_srl_list = array_keys($join_form_list);
+            if(count($join_form_srl_list)<2) return new Object();
+
+            for($i=0;$i<count($join_form_srl_list);$i++) {
+                if($join_form_srl_list[$i]==$member_join_form_srl) break;
+            }
+
+            $next_member_join_form_srl = $join_form_srl_list[$i+1];
+            // Return if no previous join form exists
+            if(!$next_member_join_form_srl) return new Object();
+            $next_member_join_form = $join_form_list[$next_member_join_form_srl];
+            // Information of the join form
+            $cur_args->member_join_form_srl = $member_join_form_srl;
+            $cur_args->list_order = $next_member_join_form->list_order;
+            // Information of the target join form
+            $next_args->member_join_form_srl = $next_member_join_form->member_join_form_srl;
+            $next_args->list_order = $list_order;
+            // Execute Query
+            $output = executeQuery('member.updateMemberJoinFormListorder', $cur_args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('member.updateMemberJoinFormListorder', $next_args);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/member/member.admin.model.php b/modules/member/member.admin.model.php
index 751a26f0f..14c1f5c03 100644
--- a/modules/member/member.admin.model.php
+++ b/modules/member/member.admin.model.php
@@ -1,142 +1,232 @@
-<?php
-    /**
-     * @class  memberAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module의 admin model class
-     **/
-
-    class memberAdminModel extends member {
-
-        /**
-         * @brief 자주 호출될거라 예상되는 데이터는 내부적으로 가지고 있자...
-         **/
-        var $member_info = NULL;
-        var $member_groups = NULL;
-        var $join_form_list = NULL;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 회원 목록을 구함
-         **/
-        function getMemberList() {
-            // 검색 옵션 정리
-            $args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-            $args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
-            $args->selected_group_srl = Context::get('selected_group_srl');
-
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
-
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'user_id' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_id = $search_keyword;
-                        break;
-                    case 'user_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_name = $search_keyword;
-                        break;
-                    case 'nick_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_nick_name = $search_keyword;
-							$args->html_nick_name = htmlspecialchars($search_keyword);
-                        break;
-                    case 'email_address' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_email_address = $search_keyword;
-                        break;
-                    case 'regdate' :
-                            $args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
-                        break;
-                    case 'regdate_more' :
-                            $args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
-                        break;
-                    case 'regdate_less' :
-                            $args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
-                        break;
-                    case 'last_login' :
-                            $args->s_last_login = $search_keyword;
-                        break;
-                    case 'last_login_more' :
-                            $args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
-                        break;
-                    case 'last_login_less' :
-                            $args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
-                        break;
-                    case 'extra_vars' :
-                            $args->s_extra_vars = ereg_replace("[^0-9]","",$search_keyword);
-                        break;
-                }
-            }
-
-            // selected_group_srl이 있으면 query id를 변경 (table join때문에)
-            $sort_order = Context::get('sort_order');
-            $sort_index = Context::get('sort_index');
-            if($sort_index != 'last_login') {
-                $sort_index = "list_order";
-            }else{
-                $sort_order = 'desc';
-            }
-            if($args->selected_group_srl) {
-                $query_id = 'member.getMemberListWithinGroup';
-                $args->sort_index = "member.".$sort_index;
-            } else {
-                $query_id = 'member.getMemberList';
-                $args->sort_index = $sort_index; 
-            }
-            if($sort_order != "desc") $sort_order = "asc";
-            $args->sort_order = $sort_order;
-            Context::set('sort_order', $sort_order);
-
-            // 기타 변수들 정리
-            $args->page = Context::get('page');
-            $args->list_count = 40;
-            $args->page_count = 10;
-            $output = executeQuery($query_id, $args);
-            return $output;
-        }
-
-        /**
-         * @brief 사이트별 회원 목록을 구함
-         **/
-        function getSiteMemberList($site_srl, $page = 1) {
-            $args->site_srl = $site_srl;
-            $args->page = $page;
-            $args->list_count = 40;
-            $args->page_count = 10;
-            $query_id = 'member.getSiteMemberList';
-            $output = executeQueryArray($query_id, $args);
-            return $output;
-        }
-
-        /**
-         * @brief 회원 모듈의 특정 스킨에 속한 컬러셋 목록을 return
-         **/
-        function getMemberAdminColorset() {
-            $skin = Context::get('skin');
-            if(!$skin) $tpl = "";
-            else {
-                $oModuleModel = &getModel('module');
-                $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-                Context::set('skin_info', $skin_info);
-
-                $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('member');
-                if(!$config->colorset) $config->colorset = "white";
-                Context::set('config', $config);
-
-                $oTemplate = &TemplateHandler::getInstance();
-                $tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
-            }
-
-            $this->add('tpl', $tpl);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  memberAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief  admin model class of member module
+     **/
+
+    class memberAdminModel extends member {
+
+        /**
+         * @brief Keep data internally which may be frequently called.
+         **/
+        var $member_info = NULL;
+        var $member_groups = NULL;
+        var $join_form_list = NULL;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Get a member list
+         **/
+        function getMemberList() {
+            // Search option
+            $args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
+            $args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+            $args->selected_group_srl = Context::get('selected_group_srl');
+
+			$filter = Context::get('filter_type');
+			switch($filter){
+				case 'super_admin' : $args->is_admin = 'Y';break;
+				case 'site_admin' : $args->member_srls = $this->getSiteAdminMemberSrls();break;
+				case 'enable' : $args->is_denied = 'N';break;
+				case 'disable' : $args->is_denied = 'Y';break;
+			}
+
+            $search_target = trim(Context::get('search_target'));
+            $search_keyword = trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                        break;
+                    case 'user_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_name = $search_keyword;
+                        break;
+                    case 'nick_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_nick_name = $search_keyword;
+							$args->html_nick_name = htmlspecialchars($search_keyword);
+                        break;
+                    case 'email_address' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_email_address = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = preg_replace("/[^0-9]/","",$search_keyword);
+                        break;
+                    case 'regdate_more' :
+                            $args->s_regdate_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+                        break;
+                    case 'regdate_less' :
+                            $args->s_regdate_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+                        break;
+                    case 'last_login' :
+                            $args->s_last_login = $search_keyword;
+                        break;
+                    case 'last_login_more' :
+                            $args->s_last_login_more = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+                        break;
+                    case 'last_login_less' :
+                            $args->s_last_login_less = substr(preg_replace("/[^0-9]/","",$search_keyword) . '00000000000000',0,14);
+                        break;
+                    case 'extra_vars' :
+                            $args->s_extra_vars = $search_keyword;
+                        break;
+                }
+            }
+
+            // Change the query id if selected_group_srl exists (for table join)
+            $sort_order = Context::get('sort_order');
+            $sort_index = Context::get('sort_index');
+            if($sort_index != 'last_login') {
+                $sort_index = "list_order";
+            }else{
+                $sort_order = 'desc';
+            }
+            if($args->selected_group_srl) {
+                $query_id = 'member.getMemberListWithinGroup';
+                $args->sort_index = "member.".$sort_index;
+            } else {
+                $query_id = 'member.getMemberList';
+                $args->sort_index = $sort_index; 
+            }
+            if($sort_order != "desc") $sort_order = "asc";
+            $args->sort_order = $sort_order;
+            Context::set('sort_order', $sort_order);
+            // Other variables
+            $args->page = Context::get('page');
+            $args->list_count = 40;
+            $args->page_count = 10;
+            $output = executeQuery($query_id, $args);
+
+            return $output;
+        }
+
+        /**
+         * @brief Get a memebr list for each site
+         **/
+        function getSiteMemberList($site_srl, $page = 1) {
+            $args->site_srl = $site_srl;
+            $args->page = $page;
+            $args->list_count = 40;
+            $args->page_count = 10;
+            $query_id = 'member.getSiteMemberList';
+            $output = executeQueryArray($query_id, $args);
+            return $output;
+        }
+
+		function getSiteAdminMemberSrls(){
+			$output = executeQueryArray('member.getSiteAdminMemberSrls');
+			if (!$output->toBool() || !$output->data) return array();
+
+			$member_srls = array();
+			foreach($output->data as $member_info){
+				$member_srls[] = $member_info->member_srl;
+			}
+
+			return $member_srls;
+		}
+
+        /**
+         * @brief Return colorset list of a skin in the member module
+         **/
+        function getMemberAdminColorset() {
+            $skin = Context::get('skin');
+            if(!$skin) $tpl = "";
+            else {
+                $oModuleModel = &getModel('module');
+                $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
+                Context::set('skin_info', $skin_info);
+
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('member');
+                if(!$config->colorset) $config->colorset = "white";
+                Context::set('config', $config);
+
+                $oTemplate = &TemplateHandler::getInstance();
+                $tpl = $oTemplate->compile($this->module_path.'tpl', 'colorset_list');
+            }
+
+            $this->add('tpl', $tpl);
+        }
+
+        /**
+         * @brief Return member count with date
+         **/
+        function getMemberCountByDate($date = '') {
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+
+			$output = executeQuery('member.getMemberCountByDate', $args);
+			if(!$output->toBool()) return 0;
+
+			return $output->data->count;
+        }
+
+        /**
+         * @brief Return site join member count with date
+         **/
+        function getMemberGroupMemberCountByDate($date = '') {
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+
+			$output = executeQuery('member.getMemberGroupMemberCountByDate', $args);
+			if(!$output->toBool()) return 0;
+
+			return count($output->data);
+        }
+
+        /**
+         * @brief Return add join Form
+         **/
+        function getMemberAdminInsertJoinForm() {
+			$member_join_form_srl = Context::get('member_join_form_srl');
+
+			$args->member_join_form_srl = $member_join_form_srl;
+			$output = executeQuery('member.getJoinForm', $args);
+
+			if($output->toBool() && $output->data){
+				$formInfo = $output->data;
+				$default_value = $formInfo->default_value;
+				if ($default_value){
+					$default_value = unserialize($default_value);
+					Context::set('default_value', $default_value);
+				}
+				Context::set('formInfo', $output->data);
+			}
+
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'insert_join_form');
+
+            $this->add('tpl', str_replace("\n"," ",$tpl));
+		}
+		function getMemberAdminIPCheck() {
+		
+			$db_info = Context::getDBInfo();
+			$admin_ip_list = $db_info->admin_ip_list;
+			$admin_ip_list = explode(",",$admin_ip_list);
+			$oMemberModel = &getModel('member');
+			$ip = $_SERVER['REMOTE_ADDR'];
+			$falg = false;
+			foreach($admin_ip_list as $admin_ip_list_key => $admin_ip_value) {
+				if(preg_match('/^\d{1,3}(?:.(\d{1,3}|\*)){3}\s*$/', $admin_ip_value, $matches) && $ip) {
+					$admin_ip = $matches[0];
+					$admin_ip = str_replace('*','',$admin_ip);
+					$admin_ip_patterns[] = preg_quote($admin_ip);				
+					$admin_ip_pattern = '/^('.implode($admin_ip_patterns,'|').')/';				
+					if(preg_match($admin_ip_pattern, $ip, $matches)) return true;
+					$flag = true;
+				} 
+
+			}
+			if(!$flag) return true;
+			return false;
+		}
+    }
+?>
diff --git a/modules/member/member.admin.view.php b/modules/member/member.admin.view.php
index 297ee1534..bafe122a2 100644
--- a/modules/member/member.admin.view.php
+++ b/modules/member/member.admin.view.php
@@ -1,270 +1,481 @@
-<?php	
-    /**
-     * @class  memberAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module's admin view class
-     **/
-
-    class memberAdminView extends member {
-
-        var $group_list = NULL; ///< group list 
-        var $member_info = NULL; ///< selected member info 
-
-        /**
-         * @brief initialization 
-         **/
-        function init() {
-            $oMemberModel = &getModel('member');
-
-            // if member_srl exists, set member_info
-            $member_srl = Context::get('member_srl');
-            if($member_srl) {
-                $this->member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-                if(!$this->member_info) Context::set('member_srl','');
-                else Context::set('member_info',$this->member_info);
-            }
-
-            // retrieve group list 
-            $this->group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $this->group_list);
-
-			$security = new Security();						
-			$security->encodeHTML('group_list..');
-			
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief display member list 
-         **/
-        function dispMemberAdminList() {
-
-            $oMemberAdminModel = &getAdminModel('member');
-            $oMemberModel = &getModel('member');
-            $output = $oMemberAdminModel->getMemberList();
-
-            // retrieve list of groups for each member
-            if($output->data) {
-                foreach($output->data as $key => $member) {
-                    $output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
-                }
-            }
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('member_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-			
-			$security = new Security();			
-			$security->encodeHTML('member_list..user_name','member_list..group_list..');
-			
-			$this->setTemplateFile('member_list');
-        }
-
-        /**
-         * @brief default configuration for member management
-         **/
-        function dispMemberAdminConfig() {
-            // retrieve configuration via module model instance
-            $oModuleModel = &getModel('module');
-            $oMemberModel = &getModel('member');
-            $config = $oMemberModel->getMemberConfig();
-            Context::set('config',$config);
-
-            // list of skins for member module
-            $skin_list = $oModuleModel->getSkins($this->module_path);
-            Context::set('skin_list', $skin_list);
-
-            // retrieve skins of editor
-            $oEditorModel = &getModel('editor');
-            Context::set('editor_skin_list', $oEditorModel->getEditorSkinList());
-
-            // get an editor
-            $option->primary_key_name = 'temp_srl';
-            $option->content_key_name = 'agreement';
-            $option->allow_fileupload = false;
-            $option->enable_autosave = false;
-            $option->enable_default_component = true;
-            $option->enable_component = true;
-            $option->resizable = true;
-            $option->height = 300;
-            $editor = $oEditorModel->getEditor(0, $option);
-            Context::set('editor', $editor);
-
-			$security = new Security();
-			$security->encodeHTML('config..');
-			
-            $this->setTemplateFile('member_config');
-        }
-
-        /**
-         * @brief display member information
-         **/
-        function dispMemberAdminInfo() {
-            $oMemberModel = &getModel('member');
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-            Context::set('member_config', $member_config);
-            Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info));
-			
-			$security = new Security();
-			$security->encodeHTML('member_config..');
-			$security->encodeHTML('member_info.user_name','member_info.description','member_info.group_list..');			
-			$security->encodeHTML('extend_form_list...');
-			
-            $this->setTemplateFile('member_info');
-        }
-
-        /**
-         * @brief display member insert form
-         **/
-        function dispMemberAdminInsert() {
-            // retrieve extend form
-            $oMemberModel = &getModel('member');
-            Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->member_info));
-
-            $member_info = Context::get('member_info');
-            $member_info->signature = $oMemberModel->getSignature($this->member_info->member_srl);
-            Context::set('member_info', $member_info);
-
-            // get an editor for the signature
-            if($this->member_info->member_srl) {
-                $oEditorModel = &getModel('editor');
-                $option->primary_key_name = 'member_srl';
-                $option->content_key_name = 'signature';
-                $option->allow_fileupload = false;
-                $option->enable_autosave = false;
-                $option->enable_default_component = true;
-                $option->enable_component = false;
-                $option->resizable = false;
-                $option->height = 200;
-                $editor = $oEditorModel->getEditor($this->member_info->member_srl, $option);
-                Context::set('editor', $editor);
-            }
-			
-			$security = new Security();				
-			$security->encodeHTML('extend_form_list..');
-			$security->encodeHTML('extend_form_list..default_value.');			
-			
-            $this->setTemplateFile('insert_member');
-        }
-
-        /** O
-         * @brief display member delete form 
-         **/
-        function dispMemberAdminDeleteForm() {
-            if(!Context::get('member_srl')) return $this->dispMemberAdminList();
-            $this->setTemplateFile('delete_form');
-        }
-
-        /** ->group_update_form
-         * @brief display group list
-         **/
-        function dispMemberAdminGroupList() {
-            $oModuleModel = &getModel('module');
-
-            $config = $oModuleModel->getModuleConfig('member');
-            Context::set('config', $config);
-
-            $group_srl = Context::get('group_srl');
-			
-            if($group_srl && $this->group_list[$group_srl]) {
-                Context::set('selected_group', $this->group_list[$group_srl]);
-				$this->setTemplateFile('group_update_form');
-            } else {
-                $this->setTemplateFile('group_list');
-            }			
-        }
-
-        /** O
-         * @brief 회원 가입 폼 목록 출력
-         **/
-        function dispMemberAdminJoinFormList() {
-            // 멤버모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // 추가로 설정한 가입 항목 가져오기
-            $form_list = $oMemberModel->getJoinFormList();
-            Context::set('form_list', $form_list);
-			$security = new Security($form_list);						
-			$security->encodeHTML('form_list..');
-			
-            $this->setTemplateFile('join_form_list');
-        }
-
-        /** O h, ck
-         * @brief 회원 가입 폼 관리 화면 출력
-         **/
-        function dispMemberAdminInsertJoinForm() {
-            // 수정일 경우 대상 join_form의 값을 구함
-            $member_join_form_srl = Context::get('member_join_form_srl');
-            if($member_join_form_srl) {
-                $oMemberModel = &getModel('member');
-                $join_form = $oMemberModel->getJoinForm($member_join_form_srl);
-
-                if(!$join_form) Context::set('member_join_form_srl','',true);
-                else {
-					Context::set('join_form', $join_form);
-					$security = new Security();
-					$security->encodeHTML('join_form..');
-				}
-				
-            }
-            $this->setTemplateFile('insert_join_form');
-        }
-
-        /** O
-         * @brief 금지 목록 아이디 출력
-         **/
-        function dispMemberAdminDeniedIDList() {
-            // 멤버모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // 사용금지 목록 가져오기
-            $output = $oMemberModel->getDeniedIDList();
-
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('member_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-			
-			$security = new Security();
-			$security->encodeHTML('member_list..');			
-            $this->setTemplateFile('denied_id_list');
-        }
-
-        /**
-         * @brief 회원 그룹 일괄 변경
-         **/
-        function dispMemberAdminManageGroup() {
-            // 선택된 회원 목록을 구함
-            $args->member_srl = trim(Context::get('member_srls'));
-            $output = executeQueryArray('member.getMembers', $args);
-            Context::set('member_list', $output->data);
-
-            // 회원 그룹 목록을 구함
-            $oMemberModel = &getModel('member');
-            Context::set('member_groups', $oMemberModel->getGroups());
-			
-			$security = new Security();
-			$security->encodeHTML('member_list..');	
-			
-            $this->setLayoutFile('popup_layout');
-            $this->setTemplateFile('manage_member_group');
-        }
-
-        /**
-         * @brief 회원 일괄 삭제
-         **/
-        function dispMemberAdminDeleteMembers() {
-            // 선택된 회원 목록을 구함
-            $args->member_srl = trim(Context::get('member_srls'));
-            $output = executeQueryArray('member.getMembers', $args);
-            Context::set('member_list', $output->data);
-
-			$this->setLayoutFile('popup_layout');
-            $this->setTemplateFile('delete_members');
-        }
-    }
-?>
+<?php	
+    /**
+     * @class  memberAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief  member module's admin view class
+     **/
+
+    class memberAdminView extends member {
+
+        var $group_list = NULL; ///< group list        
+		var $memberInfo = NULL; ///< selected member info
+        /**
+         * @brief initialization         
+		 **/
+        function init() {
+            $oMemberModel = &getModel('member');
+
+            // if member_srl exists, set memberInfo            
+			$member_srl = Context::get('member_srl');
+            if($member_srl) {
+                $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);                if(!$this->memberInfo) Context::set('member_srl','');                else Context::set('member_info',$this->memberInfo);            }
+
+            // retrieve group list            
+			$this->group_list = $oMemberModel->getGroups();
+            Context::set('group_list', $this->group_list);
+
+			$security = new Security();						
+			$security->encodeHTML('group_list..');
+			
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief display member list         
+		 **/
+        function dispMemberAdminList() {
+            $oMemberAdminModel = &getAdminModel('member');
+            $oMemberModel = &getModel('member');
+            $output = $oMemberAdminModel->getMemberList();
+
+			$filter = Context::get('filter_type');
+			global $lang;			
+			switch($filter){				
+				case 'super_admin' : Context::set('filter_type_title', $lang->cmd_show_super_admin_member);break;
+				case 'site_admin' : Context::set('filter_type_title', $lang->cmd_show_site_admin_member);break;
+				case 'enable' :  Context::set('filter_type_title', $lang->approval);break;
+				case 'disable' : Context::set('filter_type_title', $lang->denied);break;
+				default : Context::set('filter_type_title', $lang->cmd_show_all_member);break;			
+			}
+			// retrieve list of groups for each member
+            if($output->data) {
+                foreach($output->data as $key => $member) {
+                    $output->data[$key]->group_list = $oMemberModel->getMemberGroups($member->member_srl,0);
+                }
+            }
+			$config = $oMemberModel->getMemberConfig();			
+			$memberIdentifiers = array('user_id'=>'user_id', 'user_name'=>'user_name', 'nick_name'=>'nick_name');			
+			$usedIdentifiers = array();			
+
+			if (is_array($config->signupForm)){
+				foreach($config->signupForm as $signupItem){				
+					if (!count($memberIdentifiers)) break;				
+					if(in_array($signupItem->name, $memberIdentifiers) && ($signupItem->required || $signupItem->isUse)){					
+						unset($memberIdentifiers[$signupItem->name]);					
+						$usedIdentifiers[$signupItem->name] = $lang->{$signupItem->name};				
+					}			
+				}
+			}
+			Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('member_list', $output->data);
+            Context::set('usedIdentifiers', $usedIdentifiers);            
+			Context::set('page_navigation', $output->page_navigation);
+			
+			$security = new Security();			
+			$security->encodeHTML('member_list..user_name','member_list..group_list..');
+			
+			$this->setTemplateFile('member_list');
+        }
+
+        /**
+         * @brief default configuration for member management
+         **/
+        function dispMemberAdminConfig() {
+			global $lang;            // retrieve configuration via module model instance
+            $oModuleModel = &getModel('module');
+            $oMemberModel = &getModel('member');
+            $config = $oMemberModel->getMemberConfig();
+            // Get join form list which is additionally set            
+			$extendItems = $oMemberModel->getJoinFormList();            
+			
+			Context::set('config',$config);
+
+            // list of skins for member module
+            $skin_list = $oModuleModel->getSkins($this->module_path);
+            Context::set('skin_list', $skin_list);
+
+            // retrieve skins of editor
+            $oEditorModel = &getModel('editor');
+            Context::set('editor_skin_list', $oEditorModel->getEditorSkinList());
+
+            // get an editor
+            $option->primary_key_name = 'temp_srl';
+            $option->content_key_name = 'agreement';
+            $option->allow_fileupload = false;
+            $option->enable_autosave = false;
+            $option->enable_default_component = true;
+            $option->enable_component = true;
+            $option->resizable = true;
+            $option->height = 300;
+            $editor = $oEditorModel->getEditor(0, $option);
+            Context::set('editor', $editor);
+
+			// get denied ID list
+            $denied_list = $oMemberModel->getDeniedIDs();
+			Context::set('deniedIDs', $denied_list);
+
+			$security = new Security();
+			$security->encodeHTML('config..');
+
+            $this->setTemplateFile('member_config');
+        }
+
+        /**
+         * @brief display member information
+         **/
+        function dispMemberAdminInfo() {
+            $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            Context::set('member_config', $member_config);
+			$extendForm = $oMemberModel->getCombineJoinForm($this->memberInfo);            
+			Context::set('extend_form_list', $extendForm);			
+			$memberInfo = get_object_vars(Context::get('member_info'));			
+			if (!is_array($memberInfo['group_list'])) $memberInfo['group_list'] = array();
+			Context::set('memberInfo', $memberInfo);			
+			
+			$disableColumns = array('password', 'find_account_question');			
+			Context::set('disableColumns', $disableColumns);			
+			
+			$security = new Security();
+			$security->encodeHTML('member_config..');
+			$security->encodeHTML('member_info.user_name','member_info.description','member_info.group_list..');			
+			$security->encodeHTML('extend_form_list...');
+			
+            $this->setTemplateFile('member_info');
+        }
+
+        /**
+         * @brief display member insert form
+         **/
+        function dispMemberAdminInsert() {
+            // retrieve extend form
+            $oMemberModel = &getModel('member');
+
+            $memberInfo = Context::get('member_info');            
+			$memberInfo->signature = $oMemberModel->getSignature($this->memberInfo->member_srl);            
+			Context::set('member_info', $memberInfo);
+            
+			// get an editor for the signature
+            if($memberInfo->member_srl) {                
+				$oEditorModel = &getModel('editor');
+                $option->primary_key_name = 'member_srl';
+                $option->content_key_name = 'signature';
+                $option->allow_fileupload = false;
+                $option->enable_autosave = false;
+                $option->enable_default_component = true;
+                $option->enable_component = false;
+                $option->resizable = false;
+                $option->height = 200;
+                $editor = $oEditorModel->getEditor($this->memberInfo->member_srl, $option);                
+				Context::set('editor', $editor);
+            }
+			
+			$security = new Security();				
+			$security->encodeHTML('extend_form_list..');
+			$security->encodeHTML('extend_form_list..default_value.');			
+			
+			$formTags = $this->_getMemberInputTag($memberInfo);			
+			Context::set('formTags', $formTags);			
+			$member_config = $oMemberModel->getMemberConfig();			
+			
+			global $lang;			
+			$identifierForm->title = $lang->{$member_config->identifier};			
+			$identifierForm->name = $member_config->identifier;			
+			$identifierForm->value = $memberInfo->{$member_config->identifier};			
+			Context::set('identifierForm', $identifierForm);            
+			$this->setTemplateFile('insert_member');
+        }
+
+		function _getMemberInputTag($memberInfo){
+            $oMemberModel = &getModel('member');
+            $extend_form_list = $oMemberModel->getCombineJoinForm($memberInfo);
+			
+			if ($memberInfo)
+				$memberInfo = get_object_vars($memberInfo);
+			$member_config = $oMemberModel->getMemberConfig();
+			$formTags = array();
+			global $lang;
+
+			foreach($member_config->signupForm as $no=>$formInfo){
+				if (!$formInfo->isUse)continue;
+				if ($formInfo->name == $member_config->identifier || $formInfo->name == 'password') continue;
+				unset($formTag);
+				$inputTag = '';
+				$formTag->title = $formInfo->title;
+				if ($formInfo->required || $formInfo->mustRequired && $formInfo->name != 'password') $formTag->title = $formTag->title.' <em style="color:red">*</em>';
+				$formTag->name = $formInfo->name;
+
+				if($formInfo->isDefaultForm){
+					if($formInfo->imageType){
+						if($formInfo->name == 'profile_image'){
+							$target = $memberInfo['profile_image'];
+							$functionName = 'doDeleteProfileImage';
+						}elseif($formInfo->name == 'image_name'){
+							$target = $memberInfo['image_name'];
+							$functionName = 'doDeleteImageName';
+						}elseif($formInfo->name == 'image_mark'){
+							$target = $memberInfo['image_mark'];
+							$functionName = 'doDeleteImageMark';
+						}
+						if($target->src){
+							$inputTag = sprintf('<p class="a"><span id="%s"><img src="%s" alt="%s" /> <button type="button" class="text" onclick="%s(%d);return false;">%s</button></span></p>'
+												,$formInfo->name.'tag'
+												,$target->src
+												,$formInfo->title
+												,$functionName
+												,$memberInfo['member_srl']
+												,$lang->cmd_delete);
+						}
+						$inputTag .= sprintf('<p class="a"><input type="file" name="%s" id="%s" value="" /> <span class="desc">%s : %dpx, %s : %dpx</span></p>'
+											 ,$formInfo->name
+											 ,$formInfo->name
+											 ,$lang->{$formInfo->name.'_max_width'}
+											 ,$member_config->{$formInfo->name.'_max_width'}
+											 ,$lang->{$formInfo->name.'_max_height'}
+											 ,$member_config->{$formInfo->name.'_max_height'});
+					}//end imageType
+					elseif($formInfo->name == 'birthday'){
+						$inputTag = sprintf('<input type="hidden" name="birthday" id="date_birthday" value="%s" /><input type="text" class="inputDate" id="birthday" value="%s" /> <input type="button" value="%s" class="dateRemover" />'
+								,$memberInfo['birthday']
+								,zdate($memberInfo['birthday'], 'Y-m-d', false)
+								,$lang->cmd_delete);
+					}elseif($formInfo->name == 'find_account_question'){
+						$inputTag = '<select name="find_account_question" style="width:290px">%s</select><br />';
+						$optionTag = array();
+						foreach($lang->find_account_question_items as $key=>$val){
+							if($key == $memberInfo['find_account_question']) $selected = 'selected="selected"';
+							else $selected = '';
+							$optionTag[] = sprintf('<option value="%s" %s >%s</option>'
+													,$key
+													,$selected
+													,$val);
+						}
+						$inputTag = sprintf($inputTag, implode('', $optionTag));
+						$inputTag .= '<input type="text" name="find_account_answer" value="'.$memberInfo['find_account_answer'].'" />';
+					}else{
+						$inputTag = sprintf('<input type="text" name="%s" value="%s" />'
+									,$formInfo->name
+									,$memberInfo[$formInfo->name]);
+					}
+				}//end isDefaultForm
+				else{
+					$extendForm = $extend_form_list[$formInfo->member_join_form_srl];
+					$replace = array('column_name' => $extendForm->column_name,
+									 'value'		=> $extendForm->value);
+					$extentionReplace = array();
+
+					if($extendForm->column_type == 'text' || $extendForm->column_type == 'homepage' || $extendForm->column_type == 'email_address'){
+						$template = '<input type="text" name="%column_name%" value="%value%" />';
+					}elseif($extendForm->column_type == 'tel'){
+						$extentionReplace = array('tel_0' => $extendForm->value[0],
+												  'tel_1' => $extendForm->value[1],
+												  'tel_2' => $extendForm->value[2]);
+						$template = '<input type="text" name="%column_name%[]" value="%tel_0%" size="4" />-<input type="text" name="%column_name%[]" value="%tel_1%" size="4" />-<input type="text" name="%column_name%[]" value="%tel_2%" size="4" />';
+					}elseif($extendForm->column_type == 'textarea'){
+						$template = '<textarea name="%column_name%">%value%</textarea>';
+					}elseif($extendForm->column_type == 'checkbox'){
+						$template = '';
+						if($extendForm->default_value){
+							$__i = 0;
+							foreach($extendForm->default_value as $v){
+								$checked = '';
+								if(is_array($extendForm->value) && in_array($v, $extendForm->value))$checked = 'checked="checked"';
+								$template .= '<input type="checkbox" id="%column_name%'.$__i.'" name="%column_name%[]" value="'.htmlspecialchars($v).'" '.$checked.' /><label for="%column_name%'.$__i.'">'.$v.'</label>';
+								$__i++;
+							}
+						}
+					}elseif($extendForm->column_type == 'radio'){
+						$template = '';
+						if($extendForm->default_value){
+							$template = '<ul class="radio">%s</ul>';
+							$optionTag = array();
+							foreach($extendForm->default_value as $v){
+								if($extendForm->value == $v)$checked = 'checked="checked"';
+								else $checked = '';
+								$optionTag[] = '<li><input type="radio" name="%column_name%" value="'.$v.'" '.$checked.' />'.$v.'</li>';
+							}
+							$template = sprintf($template, implode('', $optionTag));
+						}
+					}elseif($extendForm->column_type == 'select'){
+						$template = '<select name="'.$formInfo->name.'">%s</select>';
+						$optionTag = array();
+						if($extendForm->default_value){
+							foreach($extendForm->default_value as $v){
+								if($v == $extendForm->value) $selected = 'selected="selected"';
+								else $selected = '';
+								$optionTag[] = sprintf('<option value="%s" %s >%s</option>'
+														,$v
+														,$selected
+														,$v);
+							}
+						}
+						$template = sprintf($template, implode('', $optionTag));
+					}elseif($extendForm->column_type == 'kr_zip'){
+						Context::loadFile(array('./modules/member/tpl/js/krzip_search.js', 'body'), true);
+						$extentionReplace = array(
+										 'msg_kr_address'       => $lang->msg_kr_address,
+										 'msg_kr_address_etc'       => $lang->msg_kr_address_etc,
+										 'cmd_search'	=> $lang->cmd_search,
+										 'cmd_search_again'	=> $lang->cmd_search_again,
+										 'addr_0'	=> $extendForm->value[0],
+										 'addr_1'	=> $extendForm->value[1],);
+						$replace = array_merge($extentionReplace, $replace);
+						$template = <<<EOD
+						<div class="krZip">
+							<div class="a" id="zone_address_search_%column_name%" >
+								<label for="krzip_address1_%column_name%">%msg_kr_address%</label><br />
+								<input type="text" id="krzip_address1_%column_name%" value="%addr_0%" />
+								<button type="button">%cmd_search%</button>
+							</div>
+							<div class="a" id="zone_address_list_%column_name%" style="display:none">
+								<select name="%column_name%[]" id="address_list_%column_name%"><option value="%addr_0%">%addr_0%</select>
+								<button type="button">%cmd_search_again%</button>
+							</div>
+							<div class="a address2">
+								<label for="krzip_address2_%column_name%">%msg_kr_address_etc%</label><br />
+								<input type="text" name="%column_name%[]" id="krzip_address2_%column_name%" value="%addr_1%" />
+							</div>
+						</div>
+						<script type="text/javascript">jQuery(function($){ $.krzip('%column_name%') });</script>
+EOD;
+					}elseif($extendForm->column_type == 'jp_zip'){
+						$template = '<input type="text" name="%column_name%" value="%value%" />';
+					}elseif($extendForm->column_type == 'date'){
+						$extentionReplace = array('date' => zdate($extendForm->value, 'Y-m-d'),
+												  'cmd_delete' => $lang->cmd_delete);
+						$template = '<input type="hidden" name="%column_name%" id="date_%column_name%" value="%value%" /><input type="text" class="inputDate" value="%date%" readonly="readonly" /> <input type="button" value="%cmd_delete%" class="dateRemover" />';
+					}
+
+					$replace = array_merge($extentionReplace, $replace);
+					$inputTag = preg_replace('@%(\w+)%@e', '$replace[$1]', $template);
+
+					if($extendForm->description)
+						$inputTag .= '<p style="color:#999;">'.htmlspecialchars($extendForm->description).'</p>';
+				}
+				$formTag->inputTag = $inputTag;
+				$formTags[] = $formTag;
+			}
+			return $formTags;
+		}
+
+        /**
+         * @brief display member delete form
+         **/
+        function dispMemberAdminDeleteForm() {
+            if(!Context::get('member_srl')) return $this->dispMemberAdminList();
+            $this->setTemplateFile('delete_form');
+        }
+
+        /**
+         * @brief display group list
+         **/
+        function dispMemberAdminGroupList() {
+            $oModuleModel = &getModel('module');
+
+            $config = $oModuleModel->getModuleConfig('member');
+            Context::set('config', $config);
+
+            $group_srl = Context::get('group_srl');
+			
+            if($group_srl && $this->group_list[$group_srl]) {
+                Context::set('selected_group', $this->group_list[$group_srl]);
+				$this->setTemplateFile('group_update_form');
+            } else {
+                $this->setTemplateFile('group_list');
+            }			
+			$output = $oModuleModel->getModuleFileBoxList();			
+			Context::set('fileBoxList', $output->data);        
+		}
+
+        /**
+         * @brief Display a list of member join form         
+		 **/
+        function dispMemberAdminJoinFormList() {
+            // Create a member model object            
+			$oMemberModel = &getModel('member');
+            // Get join form list which is additionally set            
+			$form_list = $oMemberModel->getJoinFormList();
+            Context::set('form_list', $form_list);
+			$security = new Security($form_list);						
+			$security->encodeHTML('form_list..');
+			
+            $this->setTemplateFile('join_form_list');
+        }
+
+        /**
+         * @brief Display an admin page for memebr join forms         
+		 **/
+        function dispMemberAdminInsertJoinForm() {
+            // Get the value of join_form            
+			$member_join_form_srl = Context::get('member_join_form_srl');
+            if($member_join_form_srl) {
+                $oMemberModel = &getModel('member');
+                $join_form = $oMemberModel->getJoinForm($member_join_form_srl);
+
+                if(!$join_form) Context::set('member_join_form_srl','',true);
+                else {
+					Context::set('join_form', $join_form);
+					$security = new Security();
+					$security->encodeHTML('join_form..');
+				}
+				
+            }
+            $this->setTemplateFile('insert_join_form');
+        }
+
+        /**
+         * @brief Display denied ID list         
+		 **/
+        function dispMemberAdminDeniedIDList() {
+            // Create a member model object            
+			$oMemberModel = &getModel('member');
+            // Get a denied ID list            
+			$output = $oMemberModel->getDeniedIDList();
+
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('member_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+			
+			$security = new Security();
+			$security->encodeHTML('member_list..');			
+            $this->setTemplateFile('denied_id_list');
+        }
+
+        /**
+         * @brief Update all the member groups         
+		 **/
+        function dispMemberAdminManageGroup() {
+            // Get a list of the selected member            
+			$args->member_srl = trim(Context::get('member_srls'));
+            $output = executeQueryArray('member.getMembers', $args);
+            Context::set('member_list', $output->data);
+            // Get a list of the selected member            
+			$oMemberModel = &getModel('member');
+            Context::set('member_groups', $oMemberModel->getGroups());
+			
+			$security = new Security();
+			$security->encodeHTML('member_list..');	
+			
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('manage_member_group');
+        }
+
+        /**
+         * @brief Delete all members         
+		 **/
+        function dispMemberAdminDeleteMembers() {
+            // Get a list of the selected member            
+			$args->member_srl = trim(Context::get('member_srls'));
+            $output = executeQueryArray('member.getMembers', $args);
+            Context::set('member_list', $output->data);
+
+			$this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('delete_members');
+        }
+    }
+?>
diff --git a/modules/member/member.api.php b/modules/member/member.api.php
index 3aca073e7..a749955ff 100644
--- a/modules/member/member.api.php
+++ b/modules/member/member.api.php
@@ -1,40 +1,40 @@
-<?php
-    /**
-     * @class  memberAPI
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member 모듈의 View Action에 대한 API 처리
-     **/
-
-    class memberAPI extends member {
-
-
-        /**
-         * @brief 컨텐츠 목록
-         **/
-        function dispSavedDocumentList(&$oModule) {
-            $document_list = $this->arrangeContentList(Context::get('document_list'));
-            $oModule->add('document_list',$document_list);
-            $oModule->add('page_navigation',Context::get('page_navigation'));
-        }
-
-
-
-        function arrangeContentList($content_list) {
-            $output = array();
-            if(count($content_list)) {
-                foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);
-            }
-            return $output;
-        }
-
-
-        function arrangeContent($content) {
-            $output = null;
-            if($content){
-                $output= $content->gets('document_srl','category_srl','is_secret','nick_name','user_id','user_name','title','content','tags','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars');
-            }
-            return $output;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  memberAPI
+     * @author NHN (developers@xpressengine.com)
+     * @brief API Processing of View Action in the member module
+     **/
+
+    class memberAPI extends member {
+
+
+        /**
+         * @brief Content List
+         **/
+        function dispSavedDocumentList(&$oModule) {
+            $document_list = $this->arrangeContentList(Context::get('document_list'));
+            $oModule->add('document_list',$document_list);
+            $oModule->add('page_navigation',Context::get('page_navigation'));
+        }
+
+
+
+        function arrangeContentList($content_list) {
+            $output = array();
+            if(count($content_list)) {
+                foreach($content_list as $key => $val) $output[] = $this->arrangeContent($val);
+            }
+            return $output;
+        }
+
+
+        function arrangeContent($content) {
+            $output = null;
+            if($content){
+                $output= $content->gets('document_srl','category_srl','nick_name','user_id','user_name','title','content','tags','voted_count','blamed_count','comment_count','regdate','last_update','extra_vars','status');
+            }
+            return $output;
+        }
+
+    }
+?>
diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index 3fcd30361..5b842752c 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -1,246 +1,339 @@
-<?php
-    /**
-     * @class  member
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module의 high class
-     **/
-    class member extends ModuleObject {
-
-        /**
-         * @brief constructor
-         **/
-        function member() {
-            if(!Context::isInstalled()) return;
-
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-
-            // SSL 사용시 회원가입/정보/비밀번호등과 관련된 action에 대해 SSL 전송하도록 지정
-            if(Context::get('_use_ssl') == 'optional') {
-                Context::addSSLAction('dispMemberModifyPassword');
-                Context::addSSLAction('dispMemberSignUpForm');
-                Context::addSSLAction('dispMemberModifyInfo');
-                Context::addSSLAction('procMemberLogin');
-                Context::addSSLAction('procMemberModifyPassword');
-                Context::addSSLAction('procMemberInsert');
-                Context::addSSLAction('procMemberModifyInfo');
-                Context::addSSLAction('procMemberFindAccount');
-            }
-        }
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            $oDB = &DB::getInstance();
-            $oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
-
-            $oModuleModel = &getModel('module');
-            $args = $oModuleModel->getModuleConfig('member');
-
-            // 기본 정보를 세팅
-            $args->enable_join = 'Y';
-            if(!$args->enable_openid) $args->enable_openid = 'N';
-            if(!$args->enable_auth_mail) $args->enable_auth_mail = 'N';
-            if(!$args->image_name) $args->image_name = 'Y';
-            if(!$args->image_mark) $args->image_mark = 'Y';
-            if(!$args->profile_image) $args->profile_image = 'Y';
-            if(!$args->image_name_max_width) $args->image_name_max_width = '90';
-            if(!$args->image_name_max_height) $args->image_name_max_height = '20';
-            if(!$args->image_mark_max_width) $args->image_mark_max_width = '20';
-            if(!$args->image_mark_max_height) $args->image_mark_max_height = '20';
-            if(!$args->profile_image_max_width) $args->profile_image_max_width = '80';
-            if(!$args->profile_image_max_height) $args->profile_image_max_height = '80';
-            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-
-            $oModuleController->insertModuleConfig('member',$args);
-
-            // 멤버 컨트롤러 객체 생성
-            $oMemberModel = &getModel('member');
-            $oMemberController = &getController('member');
-            $oMemberAdminController = &getAdminController('member');
-
-            $groups = $oMemberModel->getGroups();
-            if(!count($groups)) {
-                // 관리자, 정회원, 준회원 그룹을 입력
-                $group_args->title = Context::getLang('admin_group');
-                $group_args->is_default = 'N';
-                $group_args->is_admin = 'Y';
-                $output = $oMemberAdminController->insertGroup($group_args);
-
-                unset($group_args);
-                $group_args->title = Context::getLang('default_group_1');
-                $group_args->is_default = 'Y';
-                $group_args->is_admin = 'N';
-                $output = $oMemberAdminController->insertGroup($group_args);
-
-                unset($group_args);
-                $group_args->title = Context::getLang('default_group_2');
-                $group_args->is_default = 'N';
-                $group_args->is_admin = 'N';
-                $oMemberAdminController->insertGroup($group_args);
-            }
-
-            // 관리자 정보 세팅
-            $admin_args->is_admin = 'Y';
-            $output = executeQuery('member.getMemberList', $admin_args);
-            if(!$output->data) {
-                $admin_info = Context::gets('user_id','password','nick_name','user_name', 'email_address');
-                if($admin_info->user_id) {
-                    // 관리자 정보 입력
-                    $oMemberAdminController->insertAdmin($admin_info);
-
-                    // 로그인 처리시킴
-                    $output = $oMemberController->doLogin($admin_info->user_id);
-                }
-            }
-
-            // 금지 아이디 등록 (기본 + 모듈명)
-            $oModuleModel = &getModel('module');
-            $module_list = $oModuleModel->getModuleList();
-            foreach($module_list as $key => $val) {
-                $oMemberAdminController->insertDeniedID($val->module,'');
-            }
-            $oMemberAdminController->insertDeniedID('www','');
-            $oMemberAdminController->insertDeniedID('root','');
-            $oMemberAdminController->insertDeniedID('administrator','');
-            $oMemberAdminController->insertDeniedID('telnet','');
-            $oMemberAdminController->insertDeniedID('ftp','');
-            $oMemberAdminController->insertDeniedID('http','');
-
-            // member 에서 사용할 cache디렉토리 생성
-            FileHandler::makeDir('./files/member_extra_info/image_name');
-            FileHandler::makeDir('./files/member_extra_info/image_mark');
-            FileHandler::makeDir('./files/member_extra_info/profile_image');
-            FileHandler::makeDir('./files/member_extra_info/signature');
-
-            $oDB->addIndex("member_openid_association","idx_assoc", array("server_url(255)","handle"), false);
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-
-            // member 디렉토리 체크 (2007. 8. 11 추가)
-            if(!is_dir("./files/member_extra_info")) return true;
-
-            // member 디렉토리 체크 (2007. 10. 22 추가)
-            if(!is_dir("./files/member_extra_info/profile_image")) return true;
-
-            // member_auth_mail 테이블에 is_register 필드 추가 (2008. 04. 22)
-            $act = $oDB->isColumnExists("member_auth_mail", "is_register");
-            if(!$act) return true;
-
-            // member_group_member 테이블에 site_srl 추가 (2008. 11. 15)
-            if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
-            if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
-            if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
-
-			// Add a column for list_order (05/18/2011)
-            if(!$oDB->isColumnExists("member_group", "list_order")) return true;
-
-            // image_mark 추가 (2009. 02. 14)
-            if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
-
-            // password 유효기간을 위한 추가
-            if(!$oDB->isColumnExists("member", "change_password_date")) return true;
-
-            // 비밀번호 찾기 질문/답변을 위한 추가
-            if(!$oDB->isColumnExists("member", "find_account_question")) return true;
-            if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
-
-            if(!$oDB->isColumnExists("member", "list_order")) return true;
-            if(!$oDB->isIndexExists("member","idx_list_order")) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleController = &getController('module');
-
-            // member 디렉토리 체크
-            FileHandler::makeDir('./files/member_extra_info/image_name');
-            FileHandler::makeDir('./files/member_extra_info/image_mark');
-            FileHandler::makeDir('./files/member_extra_info/signature');
-            FileHandler::makeDir('./files/member_extra_info/profile_image');
-
-            // DB 필드 추가
-            if (!$oDB->isColumnExists("member_auth_mail", "is_register")) {
-                $oDB->addColumn("member_auth_mail", "is_register", "char", 1, "N", true);
-            }
-
-            // member_group_member 테이블에 site_srl 추가 (2008. 11. 15)
-            if (!$oDB->isColumnExists("member_group_member", "site_srl")) {
-                $oDB->addColumn("member_group_member", "site_srl", "number", 11, 0, true);
-                $oDB->addIndex("member_group_member", "idx_site_srl", "site_srl", false);
-            }
-            if (!$oDB->isColumnExists("member_group", "site_srl")) {
-                $oDB->addColumn("member_group", "site_srl", "number", 11, 0, true);
-                $oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
-            }
-            if($oDB->isIndexExists("member_group","uni_member_group_title")) {
-                $oDB->dropIndex("member_group","uni_member_group_title",true);
-            }
-
-            // Add a column(list_order) to "member_group" table (05/18/2011)
-            if (!$oDB->isColumnExists("member_group", "list_order")) {
-                $oDB->addColumn("member_group", "list_order", "number", 11, '', true);
-                $oDB->addIndex("member_group","idx_list_order", "list_order",false);
-                $output = executeQuery('member.updateAllMemberGroupListOrder');
-            }
-
-            // image_mark 추가 (2009. 02. 14)
-            if(!$oDB->isColumnExists("member_group", "image_mark")) {
-                $oDB->addColumn("member_group", "image_mark", "text");
-            }
-
-            // password 유효기간을 위한 추가
-            if(!$oDB->isColumnExists("member", "change_password_date")) {
-                $oDB->addColumn("member", "change_password_date", "date");
-                executeQuery('member.updateAllChangePasswordDate');
-            }
-
-            // 비밀번호 찾기 질문/답변을 위한 추가
-            if(!$oDB->isColumnExists("member", "find_account_question")) {
-                $oDB->addColumn("member", "find_account_question", "number", 11);
-            }
-            if(!$oDB->isColumnExists("member", "find_account_answer")) {
-                $oDB->addColumn("member", "find_account_answer", "varchar", 250);
-            }
-
-            if(!$oDB->isColumnExists("member", "list_order")) {
-                $oDB->addColumn("member", "list_order", "number", 11);
-                set_time_limit(0);
-                $args->list_order = 'member_srl';
-                executeQuery('member.updateMemberListOrderAll',$args);
-                executeQuery('member.updateMemberListOrderAll');
-            }
-            if(!$oDB->isIndexExists("member","idx_list_order")) {
-                $oDB->addIndex("member","idx_list_order", array("list_order"));
-            }
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
-            require_once('Auth/OpenID/XEStore.php');
-            $store = new Auth_OpenID_XEStore();
-            $store->reset();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  member
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the member module
+     **/
+    class member extends ModuleObject {
+
+        /**
+         * @brief constructor
+         **/
+        function member() {
+            if(!Context::isInstalled()) return;
+
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            // Set to use SSL upon actions related member join/information/password and so on
+            if(Context::get('_use_ssl') == 'optional') {
+                Context::addSSLAction('dispMemberModifyPassword');
+                Context::addSSLAction('dispMemberSignUpForm');
+                Context::addSSLAction('dispMemberModifyInfo');
+                Context::addSSLAction('procMemberLogin');
+                Context::addSSLAction('procMemberModifyPassword');
+                Context::addSSLAction('procMemberInsert');
+                Context::addSSLAction('procMemberModifyInfo');
+                Context::addSSLAction('procMemberFindAccount');
+            }
+        }
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+
+            $oDB = &DB::getInstance();
+            $oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
+
+            $oModuleModel = &getModel('module');
+            $args = $oModuleModel->getModuleConfig('member');
+            // Set the basic information
+            $args->enable_join = 'Y';
+            if(!$args->enable_openid) $args->enable_openid = 'N';
+            if(!$args->enable_auth_mail) $args->enable_auth_mail = 'N';
+            if(!$args->image_name) $args->image_name = 'Y';
+            if(!$args->image_mark) $args->image_mark = 'Y';
+            if(!$args->profile_image) $args->profile_image = 'Y';
+            if(!$args->image_name_max_width) $args->image_name_max_width = '90';
+            if(!$args->image_name_max_height) $args->image_name_max_height = '20';
+            if(!$args->image_mark_max_width) $args->image_mark_max_width = '20';
+            if(!$args->image_mark_max_height) $args->image_mark_max_height = '20';
+            if(!$args->profile_image_max_width) $args->profile_image_max_width = '80';
+            if(!$args->profile_image_max_height) $args->profile_image_max_height = '80';
+            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
+
+			global $lang;
+			$oMemberModel = &getModel('member');
+			$identifier = 'email_address';
+			$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
+			$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
+			$list_order = array();
+			foreach($items as $key){
+				unset($signupItem);
+				$signupItem->isDefaultForm = true;
+				$signupItem->name = $key;
+				$signupItem->title = $key;
+				$signupItem->mustRequired = in_array($key, $mustRequireds);
+				$signupItem->imageType = (strpos($key, 'image') !== false);
+				$signupItem->required = $signupItem->mustRequired;
+				$signupItem->isUse = $signupItem->mustRequired;
+				$signupItem->isIdentifier = ($key == $identifier);
+				if ($signupItem->imageType){
+					$signupItem->max_width = $config->{$key.'_max_width'};
+					$signupItem->max_height = $config->{$key.'_max_height'};
+				}
+				if ($signupItem->isIdentifier)
+					array_unshift($list_order, $signupItem);
+				else
+					$list_order[] = $signupItem;
+			}
+			$args->signupForm = $list_order;
+			$args->identifier = $identifier;
+
+            $oModuleController->insertModuleConfig('member',$args);
+
+            // Create a member controller object
+            $oMemberController = &getController('member');
+            $oMemberAdminController = &getAdminController('member');
+
+			// Create Ruleset File
+			FileHandler::makeDir('./files/ruleset');
+			$oMemberAdminController->_createSignupRuleset($args->signupForm);
+			$oMemberAdminController->_createLoginRuleset($args->identifier);
+			$oMemberAdminController->_createFindAccountByQuestion($args->identifier);
+
+            $groups = $oMemberModel->getGroups();
+            if(!count($groups)) {
+                // Set an administrator, regular member(group1), and associate member(group2)
+                $group_args->title = Context::getLang('admin_group');
+                $group_args->is_default = 'N';
+                $group_args->is_admin = 'Y';
+                $output = $oMemberAdminController->insertGroup($group_args);
+
+                unset($group_args);
+                $group_args->title = Context::getLang('default_group_1');
+                $group_args->is_default = 'Y';
+                $group_args->is_admin = 'N';
+                $output = $oMemberAdminController->insertGroup($group_args);
+
+                unset($group_args);
+                $group_args->title = Context::getLang('default_group_2');
+                $group_args->is_default = 'N';
+                $group_args->is_admin = 'N';
+                $oMemberAdminController->insertGroup($group_args);
+            }
+            // Configure administrator information
+            $admin_args->is_admin = 'Y';
+            $output = executeQuery('member.getMemberList', $admin_args);
+            if(!$output->data) {
+                $admin_info = Context::gets('user_id','password','nick_name','user_name', 'email_address');
+                if($admin_info->user_id) {
+                    // Insert admin information
+                    $oMemberAdminController->insertAdmin($admin_info);
+                    // Log-in Processing
+                    $output = $oMemberController->doLogin($admin_info->email_address);
+                }
+            }
+            // Register denied ID(default + module name)
+            $oModuleModel = &getModel('module');
+            $module_list = $oModuleModel->getModuleList();
+            foreach($module_list as $key => $val) {
+                $oMemberAdminController->insertDeniedID($val->module,'');
+            }
+            $oMemberAdminController->insertDeniedID('www','');
+            $oMemberAdminController->insertDeniedID('root','');
+            $oMemberAdminController->insertDeniedID('administrator','');
+            $oMemberAdminController->insertDeniedID('telnet','');
+            $oMemberAdminController->insertDeniedID('ftp','');
+            $oMemberAdminController->insertDeniedID('http','');
+            // Create cache directory to use in the member module
+            FileHandler::makeDir('./files/member_extra_info/image_name');
+            FileHandler::makeDir('./files/member_extra_info/image_mark');
+            FileHandler::makeDir('./files/member_extra_info/profile_image');
+            FileHandler::makeDir('./files/member_extra_info/signature');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            // check member directory (11/08/2007 added)
+            if(!is_dir("./files/member_extra_info")) return true;
+            // check member directory (22/10/2007 added)
+            if(!is_dir("./files/member_extra_info/profile_image")) return true;
+            // Add a column(is_register) to "member_auth_mail" table (22/04/2008)
+            $act = $oDB->isColumnExists("member_auth_mail", "is_register");
+            if(!$act) return true;
+            // Add a column(site_srl) to "member_group_member" table (11/15/2008)
+            if(!$oDB->isColumnExists("member_group_member", "site_srl")) return true;
+            if(!$oDB->isColumnExists("member_group", "site_srl")) return true;
+            if($oDB->isIndexExists("member_group","uni_member_group_title")) return true;
+
+			// Add a column for list_order (05/18/2011)
+            if(!$oDB->isColumnExists("member_group", "list_order")) return true;
+
+            // image_mark 추가 (2009. 02. 14)
+            if(!$oDB->isColumnExists("member_group", "image_mark")) return true;
+            // Add c column for password expiration date
+            if(!$oDB->isColumnExists("member", "change_password_date")) return true;
+
+            // Add columns of question and answer to verify a password
+            if(!$oDB->isColumnExists("member", "find_account_question")) return true;
+            if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
+
+            if(!$oDB->isColumnExists("member", "list_order")) return true;
+            if(!$oDB->isIndexExists("member","idx_list_order")) return true;
+
+            $oMemberModel = &getModel('member');
+            $config = $oMemberModel->getMemberConfig();
+			// check signup form ordering info
+			if (!$config->signupForm) return true;
+
+			if (!is_readable('./files/ruleset/insertMember.xml')) return true;
+			if (!is_readable('./files/ruleset/login.xml')) return true;
+			if (!is_readable('./files/ruleset/find_member_account_by_question.xml')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleController = &getController('module');
+            // Check member directory
+            FileHandler::makeDir('./files/member_extra_info/image_name');
+            FileHandler::makeDir('./files/member_extra_info/image_mark');
+            FileHandler::makeDir('./files/member_extra_info/signature');
+            FileHandler::makeDir('./files/member_extra_info/profile_image');
+            // Add a column
+            if (!$oDB->isColumnExists("member_auth_mail", "is_register")) {
+                $oDB->addColumn("member_auth_mail", "is_register", "char", 1, "N", true);
+            }
+            // Add a column(site_srl) to "member_group_member" table (11/15/2008)
+            if (!$oDB->isColumnExists("member_group_member", "site_srl")) {
+                $oDB->addColumn("member_group_member", "site_srl", "number", 11, 0, true);
+                $oDB->addIndex("member_group_member", "idx_site_srl", "site_srl", false);
+            }
+            if (!$oDB->isColumnExists("member_group", "site_srl")) {
+                $oDB->addColumn("member_group", "site_srl", "number", 11, 0, true);
+                $oDB->addIndex("member_group","idx_site_title", array("site_srl","title"),true);
+            }
+            if($oDB->isIndexExists("member_group","uni_member_group_title")) {
+                $oDB->dropIndex("member_group","uni_member_group_title",true);
+            }
+           
+            // Add a column(list_order) to "member_group" table (05/18/2011)
+            if (!$oDB->isColumnExists("member_group", "list_order")) {
+                $oDB->addColumn("member_group", "list_order", "number", 11, '', true);
+                $oDB->addIndex("member_group","idx_list_order", "list_order",false);
+                $output = executeQuery('member.updateAllMemberGroupListOrder');
+            }
+            // Add a column for image_mark (02/14/2009)
+            if(!$oDB->isColumnExists("member_group", "image_mark")) {
+                $oDB->addColumn("member_group", "image_mark", "text");
+            }
+            // Add a column for password expiration date
+            if(!$oDB->isColumnExists("member", "change_password_date")) {
+                $oDB->addColumn("member", "change_password_date", "date");
+                executeQuery('member.updateAllChangePasswordDate');
+            }
+
+            // Add columns of question and answer to verify a password
+            if(!$oDB->isColumnExists("member", "find_account_question")) {
+                $oDB->addColumn("member", "find_account_question", "number", 11);
+            }
+            if(!$oDB->isColumnExists("member", "find_account_answer")) {
+                $oDB->addColumn("member", "find_account_answer", "varchar", 250);
+            }
+
+            if(!$oDB->isColumnExists("member", "list_order")) {
+                $oDB->addColumn("member", "list_order", "number", 11);
+                set_time_limit(0);
+                $args->list_order = 'member_srl';
+                executeQuery('member.updateMemberListOrderAll',$args);
+                executeQuery('member.updateMemberListOrderAll');
+            }
+            if(!$oDB->isIndexExists("member","idx_list_order")) {
+                $oDB->addIndex("member","idx_list_order", array("list_order"));
+            }
+
+            $oMemberModel = &getModel('member');
+            $config = $oMemberModel->getMemberConfig();
+
+			// check signup form ordering info
+			if (!$config->signupForm || !is_array($config->signupForm)){
+				global $lang;
+				$oModuleController = &getController('module');
+				// Get join form list which is additionally set
+				$extendItems = $oMemberModel->getJoinFormList();
+				
+				$identifier = 'user_id';
+				$items = array('user_id', 'password', 'user_name', 'nick_name', 'email_address', 'find_account_question', 'homepage', 'blog', 'birthday', 'signature', 'profile_image', 'image_name', 'image_mark');
+				$mustRequireds = array('email_address', 'nick_name','password', 'find_account_question');
+				$orgRequireds = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name');
+				$orgUse = array('email_address', 'password', 'find_account_question', 'user_id', 'nick_name', 'user_name', 'homepage', 'blog', 'birthday');
+				$list_order = array();
+				foreach($items as $key){
+					unset($signupItem);
+					$signupItem->isDefaultForm = true;
+					$signupItem->name = $key;
+					$signupItem->title = $key;
+					$signupItem->mustRequired = in_array($key, $mustRequireds);
+					$signupItem->imageType = (strpos($key, 'image') !== false);
+					$signupItem->required = in_array($key, $orgRequireds);
+					$signupItem->isUse = ($config->{$key} == 'Y') || in_array($key, $orgUse);
+					$signupItem->isIdentifier = ($key == $identifier);
+					if ($signupItem->imageType){
+						$signupItem->max_width = $config->{$key.'_max_width'};
+						$signupItem->max_height = $config->{$key.'_max_height'};
+					}
+					if ($signupItem->isIdentifier)
+						array_unshift($list_order, $signupItem);
+					else
+						$list_order[] = $signupItem;
+				}
+				if (is_array($extendItems)){
+					foreach($extendItems as $form_srl=>$item_info){
+						unset($signupItem);
+						$signupItem->name = $item_info->column_name;
+						$signupItem->title = $item_info->column_title;
+						$signupItem->type = $item_info->column_type;
+						$signupItem->member_join_form_srl = $form_srl;
+						$signupItem->mustRequired = in_array($key, $mustRequireds);
+						$signupItem->required = ($item_info->required == 'Y');
+						$signupItem->isUse = ($item_info->is_active == 'Y');
+						$signupItem->description = $item_info->description;
+						if ($signupItem->imageType){
+							$signupItem->max_width = $config->{$key.'_max_width'};
+							$signupItem->max_height = $config->{$key.'_max_height'};
+						}
+						$list_order[] = $signupItem;
+					}
+				}
+				$config->signupForm = $list_order;
+				$config->identifier = $identifier;
+				$output = $oModuleController->updateModuleConfig('member', $config);
+			}
+
+			
+			FileHandler::makeDir('./files/ruleset');
+			$oMemberAdminController = &getAdminController('member');
+			if (!is_readable('./files/ruleset/insertMember.xml'))
+				$oMemberAdminController->_createSignupRuleset($config->signupForm);
+			if (!is_readable('./files/ruleset/login.xml'))
+				$oMemberAdminController->_createLoginRuleset($config->identifier);
+			if (!is_readable('./files/ruleset/find_member_account_by_question.xml'))
+				$oMemberAdminController->_createFindAccountByQuestion($config->identifier);
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
+            require_once('Auth/OpenID/XEStore.php');
+            $store = new Auth_OpenID_XEStore();
+            $store->reset();
+        }
+    }
+?>
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 9a8e43a2f..2bd779545 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1,1943 +1,2022 @@
-<?php
-    /**
-     * @class  memberController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module의 Controller class
-     **/
-
-    class memberController extends member {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief user_id, password를 체크하여 로그인 시킴
-         **/
-        function procMemberLogin($user_id = null, $password = null, $keep_signed = null) {
-            // 변수 정리
-            if(!$user_id) $user_id = Context::get('user_id');
-            $user_id = trim($user_id);
-
-            if(!$password) $password = Context::get('password');
-            $password = trim($password);
-
-            if(!$keep_signed) $keep_signed = Context::get('keep_signed');
-
-            // 아이디나 비밀번호가 없을때 오류 return
-            if(!$user_id) return new Object(-1,'null_user_id');
-            if(!$password) return new Object(-1,'null_password');
-
-            $output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
-
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-            if($config->after_login_url) $this->setRedirectUrl($config->after_login_url);
-
-            // 설정된 change_password_date 확인
-            $limit_date = $config->change_password_date;
-
-            // change_password_date가 설정되어 있으면 확인
-            if ($limit_date > 0) {
-                $oMemberModel = &getModel('member');
-                $member_info = $oMemberModel->getMemberInfoByUserID($user_id);
-                if ($member_info->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day'))) {
-                    $this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'));
-                }
-            }
-
-            $redirect_url = Context::get('redirect_url'); 
-            if ($output->toBool () && Context::getRequestMethod () == "POST" && $redirect_url) {
-                header ("location:" . $redirect_url);
-            }
-
-            return $output;
-        }
-
-        /**
-         * @brief openid로그인
-         **/
-        function procMemberOpenIDLogin($validator = "procMemberOpenIDValidate") {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-            if($config->enable_openid != 'Y') $this->stop('msg_invalid_request');
-
-            if(!defined('Auth_OpenID_RAND_SOURCE') && !file_exists("/dev/urandom"))
-            {
-                define('Auth_OpenID_RAND_SOURCE', null);
-            }
-
-            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
-            require_once('Auth/OpenID.php');
-            require_once('Auth/OpenID/Consumer.php');
-            require_once('Auth/OpenID/XEStore.php');
-            $store = new Auth_OpenID_XEStore();
-            $consumer = new Auth_OpenID_Consumer($store);
-
-            $user_id = Context::get('user_id');
-            if (!$user_id) $user_id = Context::get('openid');
-            $auth_request = $consumer->begin($user_id); 
-            $auth_request->addExtensionArg('sreg', 'required', 'email');
-            $auth_request->addExtensionArg('sreg', 'optional', 'dob');
-            if(!$auth_request)
-            {
-                return new Object(-1, "association failed");
-            }
-
-            $trust_root = 'http://'.$_SERVER["HTTP_HOST"];
-            $referer_url = Context::get('referer_url');
-            if (!$referer_url) $referer_url = $_SERVER['HTTP_REFERER'];
-            if (!$referer_url)
-                $referer_url = htmlspecialchars_decode(getRequestUri(RELEASE_SSL));
-            $goto = urlencode($referer_url);
-            $ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=" . $validator. "&goto=" . $goto;
-            $redirect_url = $auth_request->redirectURL($trust_root, $ApprovedURL);
-            $this->add("redirect_url", $redirect_url);
-            if (Context::getRequestMethod() == 'POST')
-                header("location:" . $redirect_url);
-        }
-
-        function getLegacyUserIDsFromOpenID($openid_identity) {
-            //  Issue 17515512: workaround
-            $result = array();
-            $uri_matches = array();
-            preg_match(Auth_OpenID_getURIPattern(), $openid_identity, $uri_matches);
-
-            if (count($uri_matches) < 9) {
-                for ($i = count($uri_matches); $i <= 9; $i++) {
-                    $uri_matches[] = '';
-                }
-            }
-
-            $scheme = $uri_matches[2];
-            $authority = $uri_matches[4];
-            $path = $uri_matches[5];
-            $query = $uri_matches[6];
-            $fragment = $uri_matches[8];
-
-            if ($scheme === null) $scheme = '';
-            if ($authority === null) $authority = '';
-            if ($path === null) $path = '';
-            if ($query === null) $query = '';
-            if ($fragment === null) $fragment = '';
-
-            if ($scheme == 'http' or $scheme == '')
-                $scheme_part = '';
-            else
-                $scheme_part = $scheme."://";
-
-
-            if ($path == '' || $path == '/') {
-                $result[] = $scheme_part.$authority.''.$query.$fragment;
-                $result[] = $scheme_part.$authority.'/'.$query.$fragment;
-            }
-            else {
-                $result[] = $scheme_part.$authority.$path.$query.$fragment;
-            }
-
-            return $result;
-        }
-
-        /**
-         * @brief openid 인증 체크
-         **/
-        function procMemberOpenIDValidate() {
-            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
-            require_once('Auth/OpenID.php');
-            require_once('Auth/OpenID/Consumer.php');
-            require_once('Auth/OpenID/XEStore.php');
-            require_once('Auth/OpenID/URINorm.php');
-
-            $store = new Auth_OpenID_XEStore();
-            $consumer = new Auth_OpenID_Consumer($store);
-            $response = $consumer->complete($_GET);
-            switch($response->status) {
-                case Auth_OpenID_CANCEL :
-                // 사용자가 인증을 취소했을 때의 처리
-                return $this->stop('authorization_canceled');
-            case Auth_OpenID_FAILURE :
-                // 무언가의 문제로 인해 인증이 실패했을 때의 처리(인증을 요구한 openid가 없다든가..)
-                return $this->stop('invalid_authorization');
-            case Auth_OpenID_SUCCESS :
-                // 인증성공!!
-                break;
-            default:
-                return $this->stop('invalid_authorization');
-            }
-
-            // 인증 성공
-            $oMemberModel = &getModel('member');
-
-            //  이 오픈아이디와 연결된 (또는 연결되어 있을 가능성이 있는) 제로보드 아이디들을 받아온다.
-            $login_success = false;
-            $assoc_member_info = null;
-            $openid_identity = $response->signed_args["openid.identity"];
-            $args->openid = $openid_identity;
-            $output = executeQuery('member.getMemberSrlByOpenID', $args);
-
-            if ($output->toBool() && $output->data && !is_array($output->data)) {
-                $member_srl = $output->data->member_srl;
-                $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-                if ($member_info) {
-                    $assoc_member_info = $member_info;
-                }
-            }
-            
-            $user_id_candidates = $this->getLegacyUserIDsFromOpenID($openid_identity);
-            $default_user_id = $user_id_candidates[0];
-
-            if ($assoc_member_info != null) {
-                $user_id_candidates = array_merge(array($assoc_member_info->user_id), $user_id_candidates);
-            }
-            $sreg = $response->extensionResponse('sreg');
-
-            foreach($user_id_candidates as $user_id) {
-                $args->user_id = $args->nick_name = $user_id;
-                // 기본 정보들을 받음
-                $args->email_address = $sreg['email']; 
-                $args->user_name = $sreg['fullname'];
-                if(!$args->user_name) list($args->user_name) = explode('@', $args->email_address);
-                $args->birthday = str_replace('-','',$sreg['dob']);
-
-                // 자체 인증 시도
-                $output = $this->doLogin($args->user_id);
-
-                if ($output->toBool()) {
-                    if ($assoc_member_info == null) {
-                        $logged_info = Context::get('logged_info');
-                        $args->member_srl = $logged_info->member_srl;
-                        $args->openid = $openid_identity;
-                        executeQuery('member.addOpenIDToMember', $args);
-                    }
-                    $login_success = true;
-                    break;
-                }
-            }
-
-            // 자체 인증 실패시 회원 가입시킴
-            if(!$login_success) {
-                $args->user_id = $args->nick_name = $default_user_id;
-                $args->password = md5(getmicrotime());
-
-                $output = $this->insertMember($args);
-                if(!$output->toBool()) return $this->stop($output->getMessage());
-                $output = $this->doLogin($args->user_id);
-                if(!$output->toBool()) return $this->stop($output->getMessage());
-
-                $logged_info = Context::get('logged_info');
-                $args->member_srl = $logged_info->member_srl;
-                $args->openid = $openid_identity;
-                executeQuery('member.addOpenIDToMember', $args);
-            }
-
-            Context::close();
-
-            // 페이지 이동
-            if(Context::get('goto')) {
-                $goto = Context::get('goto');
-                header("location:" . $goto);
-            } else {
-                header("location:./");
-            }
-
-            exit();
-        }
-
-        /**
-         * @brief 오픈아이디 연결 요청
-         **/
-        function procMemberAddOpenIDToMember() {
-            return $this->procMemberOpenIDLogin("procMemberValidateAddOpenIDToMember");
-        }
-
-        /**
-         * @brief 오픈아이디 연결 요청 마무리
-         **/
-        function procMemberValidateAddOpenIDToMember() {
-            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
-            require_once('Auth/OpenID.php');
-            require_once('Auth/OpenID/Consumer.php');
-            require_once('Auth/OpenID/XEStore.php');
-            require_once('Auth/OpenID/URINorm.php');
-
-            $store = new Auth_OpenID_XEStore();
-            $consumer = new Auth_OpenID_Consumer($store);
-            $response = $consumer->complete($_GET);
-
-            switch($response->status) {
-                case Auth_OpenID_CANCEL :
-                // 사용자가 인증을 취소했을 때의 처리
-                return $this->stop('authorization_canceled');
-            case Auth_OpenID_FAILURE :
-                // 무언가의 문제로 인해 인증이 실패했을 때의 처리(인증을 요구한 openid가 없다든가..)
-                return $this->stop('invalid_authorization');
-            case Auth_OpenID_SUCCESS :
-                {
-                    $logged_info = Context::get('logged_info');
-                    if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
-
-                    $member_srl = $logged_info->member_srl;
-
-                    $args->member_srl = $member_srl;
-                    $openid_identity = $response->signed_args["openid.identity"];
-                    $args->openid = $openid_identity;
-
-                    $output = executeQuery('member.addOpenIDToMember', $args);
-                    if (!$output->toBool()) return $output;
-
-                    Context::close();
-
-                    if(Context::get('goto')){
-                        $goto = Context::get('goto');
-                        header("location:" . $goto);
-                    }else{
-                        header("location:./");
-                    }
-                    exit();
-                }
-                // 인증성공!!
-                break;
-            default:
-                return $this->stop('invalid_authorization');
-            }
-        }
-
-        /**
-         * @brief 오픈아이디 연결 해제
-         **/
-        function procMemberDeleteOpenIDFromMember() {
-            $logged_info = Context::get('logged_info');
-            $openid_identity = Context::get('openid_to_delete');
-            $arg->openid = $openid_identity;
-            $result = executeQuery('member.getMemberSrlByOpenID', $arg);
-
-            if (!Context::get('is_logged')) {
-                $this->setError(-1);
-                $this->setMessage('msg_not_logged');
-                return;
-            } else if (!$result->data || is_array($result->data)) {
-                $this->setError(-1);
-                $this->setMessage('msg_not_founded');
-                return;
-            } else if ($result->data->member_srl != $logged_info->member_srl) {
-                $this->setError(-1);
-                $this->setMessage('msg_not_permitted');
-                return;
-            }
-
-            $arg->openid = $openid_identity;
-
-            $output = executeQuery('member.deleteMemberOpenID', $arg);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_updated');
-        }
-
-
-        /**
-         * @brief 로그아웃
-         **/
-        function procMemberLogout() {
-            // 로그아웃 이전에 trigger 호출 (before)
-            $logged_info = Context::get('logged_info');
-            $trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-            // 세션 정보 파기
-            $this->destroySessionInfo();
-
-            // 로그아웃 이후 trigger 호출 (after)
-            $trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-            $output = new Object();
-
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-            if($config->after_logout_url) Context::set('redirect_url', $config->after_logout_url);
-
-            return $output;
-        }
-
-        /**
-         * @brief 스크랩 기능
-         **/
-        function procMemberScrapDocument() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            $document_srl = (int)Context::get('document_srl');
-            if(!$document_srl) $document_srl = (int)Context::get('target_srl');
-            if(!$document_srl) return new Object(-1,'msg_invalid_request');
-
-            // 문서 가져오기
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-
-            // 변수 정리
-            $args->document_srl = $document_srl;
-            $args->member_srl = $logged_info->member_srl;
-            $args->user_id = $oDocument->get('user_id');
-            $args->user_name = $oDocument->get('user_name');
-            $args->nick_name = $oDocument->get('nick_name');
-            $args->target_member_srl = $oDocument->get('member_srl');
-            $args->title = $oDocument->get('title');
-
-            // 있는지 조사
-            $output = executeQuery('member.getScrapDocument', $args);
-            if($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
-
-            // 입력
-            $output = executeQuery('member.addScrapDocument', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setError(-1);
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 스크랩 삭제
-         **/
-        function procMemberDeleteScrap() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            $document_srl = (int)Context::get('document_srl');
-            if(!$document_srl) return new Object(-1,'msg_invalid_request');
-
-            // 변수 정리
-            $args->member_srl = $logged_info->member_srl;
-            $args->document_srl = $document_srl;
-            return executeQuery('member.deleteScrapDocument', $args);
-        }
-
-        /**
-         * @brief 게시글 저장
-         **/
-        function procMemberSaveDocument() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-
-            // form 정보를 모두 받음
-            $obj = Context::getRequestVars();
-
-            // 글의 대상 모듈을 회원 정보로 변경
-            $obj->module_srl = $logged_info->member_srl;
-			unset($obj->is_notice);
-
-            // 제목을 사용하지 않는 방명록 등에서 내용 앞 부분을 제목 가져오기
-            if(!$obj->title) {
-                $obj->title = cut_str(strip_tags($obj->content), 20, '...');
-            }
-
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-
-            // 이미 존재하는 글인지 체크
-            $oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
-
-            // 이미 존재하는 경우 수정
-            if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
-                $output = $oDocumentController->updateDocument($oDocument, $obj);
-                $msg_code = 'success_updated';
-
-            // 그렇지 않으면 신규 등록
-            } else {
-                $output = $oDocumentController->insertDocument($obj);
-                $msg_code = 'success_registed';
-                $obj->document_srl = $output->get('document_srl');
-                $oDocument = $oDocumentModel->getDocument($obj->document_srl, $this->grant->manager);
-            }
-
-            // 등록된 첨부파일의 상태를 무효로 지정
-            if($oDocument->hasUploadedFiles()) {
-                $args->upload_target_srl = $oDocument->document_srl;
-                $args->isvalid = 'N';
-                executeQuery('file.updateFileValid', $args);
-            }
-
-            $this->setMessage('success_saved');
-            $this->add('document_srl', $obj->document_srl);
-        }
-
-        /**
-         * @brief 저장된 글 삭제
-         **/
-        function procMemberDeleteSavedDocument() {
-            // 로그인 정보 체크
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
-            $logged_info = Context::get('logged_info');
-
-            $document_srl = (int)Context::get('document_srl');
-            if(!$document_srl) return new Object(-1,'msg_invalid_request');
-
-            // 변수 정리
-            $oDocumentController = &getController('document');
-            $oDocumentController->deleteDocument($document_srl, true);
-        }
-
-        /**
-         * @brief 회원 가입시 특정 항목들에 대한 값 체크
-         **/
-        function procMemberCheckValue() {
-            $name = Context::get('name');
-            $value = Context::get('value');
-            if(!$value) return;
-
-            $oMemberModel = &getModel('member');
-
-            // 로그인 여부 체크
-            $logged_info = Context::get('logged_info');
-
-
-            switch($name) {
-                case 'user_id' :
-                        // 금지 아이디 검사
-                        if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id');
-
-                        // 중복 검사
-                        $member_srl = $oMemberModel->getMemberSrlByUserID($value);
-                        if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
-                    break;
-                case 'nick_name' :
-                        // 중복 검사
-                        $member_srl = $oMemberModel->getMemberSrlByNickName($value);
-                        if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
-
-                    break;
-                case 'email_address' :
-                        // 중복 검사
-                        $member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
-                        if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address');
-                    break;
-            }
-        }
-
-        /**
-         * @brief 회원 가입
-         **/
-        function procMemberInsert() {
-            if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
-            $oMemberModel = &getModel ('member');
-            $config = $oMemberModel->getMemberConfig ();
-
-            // before 트리거 호출
-            $trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
-            if (!$trigger_output->toBool ()) return $trigger_output;
-
-            // 관리자가 회원가입을 허락하였는지 검사
-            if ($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
-
-            // 약관에 동의하였는지 검사 (약관이 있을 경우만)
-            if ($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
-
-            // 필수 정보들을 미리 추출
-            $args = Context::gets('user_id','user_name','nick_name','homepage','blog','birthday','email_address','password','allow_mailing','find_account_question','find_account_answer');
-            $args->member_srl = getNextSequence();
-            $args->list_order = -1 * $args->member_srl;
-
-            // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
-            $all_args = Context::getRequestVars();
-            unset($all_args->module);
-            unset($all_args->act);
-            unset($all_args->is_admin);
-            unset($all_args->description);
-            unset($all_args->group_srl_list);
-            unset($all_args->body);
-            unset($all_args->accept_agreement);
-            unset($all_args->signature);
-            unset($all_args->password2);
-
-            // 메일 인증 기능 사용시 회원 상태를 denied로 설정
-            if ($config->enable_confirm == 'Y') $args->denied = 'Y';
-
-            // 모든 request argument에서 필수 정보만 제외 한 후 추가 데이터로 입력
-            $extra_vars = delObjectVars($all_args, $args);
-            $args->extra_vars = serialize($extra_vars);
-
-            // member_srl의 값에 따라 insert/update
-            $output = $this->insertMember($args);
-            if(!$output->toBool()) return $output;
-
-            // 가상사이트일 경우 사이트 가입
-            $site_module_info = Context::get('site_module_info');
-            if($site_module_info->site_srl > 0) {
-                $default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl);
-                if($default_group->group_srl) {
-                    $this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
-                }
-
-            }
-
-            // 로그인 시킴
-            if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
-
-            // 결과 정리
-            $this->add('member_srl', $args->member_srl);
-            if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
-            if ($config->enable_confirm == 'Y') {
-                $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
-                $this->setMessage($msg);
-            }
-            else $this->setMessage('success_registed');
-
-            // after 트리거 호출
-            $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
-            if(!$trigger_output->toBool()) return $trigger_output;
-        }
-
-        /**
-         * @brief 회원 정보 수정
-         **/
-        function procMemberModifyInfo() {
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-
-            // 필수 정보들을 미리 추출
-            $args = Context::gets('user_name','nick_name','homepage','blog','birthday','email_address','allow_mailing','find_account_question','find_account_answer');
-
-            // 로그인 정보
-            $logged_info = Context::get('logged_info');
-            $args->member_srl = $logged_info->member_srl;
-
-            // 넘어온 모든 변수중에서 몇가지 불필요한 것들 삭제
-            $all_args = Context::getRequestVars();
-            unset($all_args->module);
-            unset($all_args->act);
-            unset($all_args->is_admin);
-            unset($all_args->description);
-            unset($all_args->group_srl_list);
-            unset($all_args->body);
-            unset($all_args->accept_agreement);
-            unset($all_args->signature);
-            unset($all_args->_filter);
-
-            // 모든 request argument에서 필수 정보만 제외 한 후 추가 데이터로 입력
-            $extra_vars = delObjectVars($all_args, $args);
-            $args->extra_vars = serialize($extra_vars);
-
-            // 멤버 모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // member_srl의 값에 따라 insert/update
-            $output = $this->updateMember($args);
-            if(!$output->toBool()) return $output;
-
-            // 서명 저장
-            $signature = Context::get('signature');
-            $this->putSignature($args->member_srl, $signature);
-
-            // user_id 에 따른 정보 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
-
-            // 로그인 성공후 trigger 호출 (after)
-            $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-            $this->setSessionInfo($member_info);
-
-            // 결과 리턴
-            $this->add('member_srl', $args->member_srl);
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 회원 비밀번호 수정
-         **/
-        function procMemberModifyPassword() {
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-
-            // 필수 정보들을 미리 추출
-            $current_password = trim(Context::get('current_password'));
-            $password = trim(Context::get('password'));
-
-            // 로그인한 유저의 정보를 가져옴
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            // member model 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // member_srl 에 따른 정보 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-
-            // 현재 비밀번호가 맞는지 확인
-            if(!$oMemberModel->isValidPassword($member_info->password, $current_password)) return new Object(-1, 'invalid_password');
-
-            // 이전 비밀번호와 같은지 확인
-            if ($current_password == $password) return new Object(-1, 'invalid_new_password');
-
-            // member_srl의 값에 따라 insert/update
-            $args->member_srl = $member_srl;
-            $args->password = $password;
-            $output = $this->updateMemberPassword($args);
-            if(!$output->toBool()) return $output;
-
-            $this->add('member_srl', $args->member_srl);
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 탈퇴
-         **/
-        function procMemberLeave() {
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-
-            // 필수 정보들을 미리 추출
-            $password = trim(Context::get('password'));
-
-            // 로그인한 유저의 정보를 가져옴
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            // member model 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // member_srl 에 따른 정보 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-
-            // 현재 비밀번호가 맞는지 확인
-            if(!$oMemberModel->isValidPassword($member_info->password, $password)) return new Object(-1, 'invalid_password');
-
-            $output = $this->deleteMember($member_srl);
-            if(!$output->toBool()) return $output;
-
-            // 모든 세션 정보 파기
-            $this->destroySessionInfo();
-
-            // 성공 메세지 리턴
-            $this->setMessage('success_leaved');
-        }
-
-        /**
-         * @brief 오픈아이디 탈퇴
-         **/
-        function procMemberOpenIDLeave() {
-            // 비로그인 상태이면 에러
-            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
-
-            // 현재 ip와 세션 아이피 비교
-            if($_SESSION['ipaddress']!=$_SERVER['REMOTE_ADDR']) return $this->stop('msg_not_permitted');
-
-            // 로그인한 유저의 정보를 가져옴
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            $output = $this->deleteMember($member_srl);
-            if(!$output->toBool()) return $output;
-
-            // 모든 세션 정보 파기
-            $this->destroySessionInfo();
-
-            // 성공 메세지 리턴
-            $this->setMessage('success_leaved');
-        }
-
-        /**
-         * @brief 프로필 이미지 추가
-         **/
-        function procMemberInsertProfileImage() {
-            // 정상적으로 업로드 된 파일인지 검사
-            $file = $_FILES['profile_image'];
-            if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
-
-            // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
-
-            // 회원 모듈 설정에서 이미지 이름 사용 금지를 하였을 경우 관리자가 아니면 return;
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-            if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
-
-            $this->insertProfileImage($member_srl, $file['tmp_name']);
-
-            // 페이지 리프레쉬
-            $this->setRefreshPage();
-        }
-
-        function insertProfileImage($member_srl, $target_file) {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            // 정해진 사이즈를 구함
-            $max_width = $config->profile_image_max_width;
-            if(!$max_width) $max_width = "90";
-            $max_height = $config->profile_image_max_height;
-            if(!$max_height) $max_height = "20";
-
-            // 저장할 위치 구함
-            $target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
-            FileHandler::makeDir($target_path);
-
-            // 파일 정보 구함
-            list($width, $height, $type, $attrs) = @getimagesize($target_file);
-            if($type == 3) $ext = 'png';
-            elseif($type == 2) $ext = 'jpg';
-            else $ext = 'gif';
-
-            $target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
-
-            // 지정된 사이즈보다 크거나 gif가 아니면 변환
-            if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
-            else @copy($target_file, $target_filename);
-        }
-
-        /**
-         * @brief 이미지 이름을 추가
-         **/
-        function procMemberInsertImageName() {
-            // 정상적으로 업로드 된 파일인지 검사
-            $file = $_FILES['image_name'];
-            if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
-
-            // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
-
-            // 회원 모듈 설정에서 이미지 이름 사용 금지를 하였을 경우 관리자가 아니면 return;
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-            if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
-
-            $this->insertImageName($member_srl, $file['tmp_name']);
-
-            // 페이지 리프레쉬
-            $this->setRefreshPage();
-        }
-
-        function insertImageName($member_srl, $target_file) {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            // 정해진 사이즈를 구함
-            $max_width = $config->image_name_max_width;
-            if(!$max_width) $max_width = "90";
-            $max_height = $config->image_name_max_height;
-            if(!$max_height) $max_height = "20";
-
-            // 저장할 위치 구함
-            $target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
-            FileHandler::makeDir($target_path);
-
-            $target_filename = sprintf('%s%d.gif', $target_path, $member_srl);
-
-            // 파일 정보 구함
-            list($width, $height, $type, $attrs) = @getimagesize($target_file);
-
-            // 지정된 사이즈보다 크거나 gif가 아니면 변환
-            if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
-            else @copy($target_file, $target_filename);
-        }
-
-        /**
-         * @brief 프로필 이미지를 삭제
-         **/
-        function procMemberDeleteProfileImage() {
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return new Object(0,'success');
-
-            $logged_info = Context::get('logged_info');
-
-            if($logged_info->is_admin != 'Y') {
-                $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('member');
-                if($config->profile_image == 'N') return new Object(0,'success');
-            }
-
-            if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) {
-                $oMemberModel = &getModel('member');
-                $profile_image = $oMemberModel->getProfileImage($member_srl);
-                FileHandler::removeFile($profile_image->file);
-            }
-            return new Object(0,'success');
-        }
-
-        /**
-         * @brief 이미지 이름을 삭제
-         **/
-        function procMemberDeleteImageName() {
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return new Object(0,'success');
-
-            $logged_info = Context::get('logged_info');
-
-            if($logged_info->is_admin != 'Y') {
-                $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('member');
-                if($config->image_name == 'N') return new Object(0,'success');
-            }
-
-            if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) {
-                $oMemberModel = &getModel('member');
-                $image_name = $oMemberModel->getImageName($member_srl);
-                FileHandler::removeFile($image_name->file);
-            }
-            return new Object(0,'success');
-        }
-
-        /**
-         * @brief 이미지 마크를 추가
-         **/
-        function procMemberInsertImageMark() {
-            // 정상적으로 업로드 된 파일인지 검사
-            $file = $_FILES['image_mark'];
-            if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
-
-            // 회원 정보를 검사해서 회원번호가 없거나 관리자가 아니고 회원번호가 틀리면 무시
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
-
-            // 회원 모듈 설정에서 이미지 마크 사용 금지를 하였을 경우 관리자가 아니면 return;
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-            if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
-
-            $this->insertImageMark($member_srl, $file['tmp_name']);
-
-            // 페이지 리프레쉬
-            $this->setRefreshPage();
-        }
-
-        function insertImageMark($member_srl, $target_file) {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            // 정해진 사이즈를 구함
-            $max_width = $config->image_mark_max_width;
-            if(!$max_width) $max_width = "20";
-            $max_height = $config->image_mark_max_height;
-            if(!$max_height) $max_height = "20";
-
-            $target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
-            FileHandler::makeDir($target_path);
-
-            $target_filename = sprintf('%s%d.gif', $target_path, $member_srl);
-
-            // 파일 정보 구함
-            list($width, $height, $type, $attrs) = @getimagesize($target_file);
-
-            if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
-            else @copy($target_file, $target_filename);
-
-        }
-
-        /**
-         * @brief 이미지 마크를  삭제
-         **/
-        function procMemberDeleteImageMark() {
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return new Object(0,'success');
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) {
-                $oMemberModel = &getModel('member');
-                $image_mark = $oMemberModel->getImageMark($member_srl);
-                FileHandler::removeFile($image_mark->file);
-            }
-            return new Object(0,'success');
-        }
-
-        /**
-         * @brief 아이디/ 비밀번호 찾기
-         **/
-        function procMemberFindAccount() {
-            $email_address = Context::get('email_address');
-            if(!$email_address) return new Object(-1, 'msg_invalid_request');
-
-            $oMemberModel = &getModel('member');
-            $oModuleModel = &getModel('module');
-
-            // 메일 주소에 해당하는 회원이 있는지 검사
-            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-            if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
-
-            // 회원의 정보를 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-
-            // 아이디/비밀번호 찾기가 가능한 상태의 회원인지 검사
-            if ($member_info->denied == 'Y') {
-                $chk_args->member_srl = $member_info->member_srl;
-                $output = executeQuery('member.chkAuthMail', $chk_args);
-                if ($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
-            }
-
-            // 인증 DB에 데이터를 넣음
-            $args->user_id = $member_info->user_id;
-            $args->member_srl = $member_info->member_srl;
-            $args->new_password = rand(111111,999999);
-            $args->auth_key = md5( rand(0,999999 ) );
-            $args->is_register = 'N';
-
-            $output = executeQuery('member.insertAuthMail', $args);
-            if(!$output->toBool()) return $output;
-
-            // 메일 내용을 구함
-            Context::set('auth_args', $args);
-            Context::set('member_info', $member_info);
-
-            $member_config = $oModuleModel->getModuleConfig('member');
-            if(!$member_config->skin) $member_config->skin = "default";
-            if(!$member_config->colorset) $member_config->colorset = "white";
-
-            Context::set('member_config', $member_config);
-
-            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
-
-            $find_url = getFullUrl ('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
-            Context::set('find_url', $find_url);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            $content = $oTemplate->compile($tpl_path, 'find_member_account_mail');
-
-            // 사이트 웹마스터 정보를 구함
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-
-            // 메일 발송
-            $oMail = new Mail();
-            $oMail->setTitle( Context::getLang('msg_find_account_title') );
-            $oMail->setContent($content);
-            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-            $oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
-            $oMail->send();
-
-            // 메세지 return
-            $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
-            return new Object(0,$msg);
-        }
-
-
-        /**
-         * @brief 질문/답변을 통한 임시 비밀번호 생성
-         **/
-        function procMemberFindAccountByQuestion() {
-            $email_address = Context::get('email_address');
-            $user_id = Context::get('user_id');
-            $find_account_question = trim(Context::get('find_account_question'));
-            $find_account_answer = trim(Context::get('find_account_answer'));
-
-            if(!$user_id || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
-
-            $oMemberModel = &getModel('member');
-            $oModuleModel = &getModel('module');
-
-            // 메일 주소에 해당하는 회원이 있는지 검사
-            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-            if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
-
-            // 회원의 정보를 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-
-            // 질문 응답이 없으면 
-            if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
-
-            if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
-
-            // 임시비밀번호로 변경 및 비밀번호 변경시간을 1로 설정
-            $args->member_srl = $member_srl;
-            list($usec, $sec) = explode(" ", microtime()); 
-            $temp_password = substr(md5($user_id . $member_info->find_account_answer. $usec . $sec),0,15);
-
-            $args->password = $temp_password;
-            $args->change_password_date = '1';
-            $output = $this->updateMemberPassword($args);
-            if(!$output->toBool()) return $output;
-
-            $_SESSION['xe_temp_password_'.$user_id] = $temp_password;
-
-            $this->add('user_id',$user_id);
-        }
-
-        /**
-         * @brief 아이디/비밀번호 찾기 기능 실행
-         * 메일에 등록된 링크를 선택시 호출되는 method로 비밀번호를 바꾸고 인증을 시켜버림
-         **/
-        function procMemberAuthAccount() {
-            // user_id, authkey 검사
-            $member_srl = Context::get('member_srl');
-            $auth_key = Context::get('auth_key');
-            if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
-
-            // user_id, authkey로 비밀번호 찾기 로그 검사
-            $args->member_srl = $member_srl;
-            $args->auth_key = $auth_key;
-            $output = executeQuery('member.getAuthMail', $args);
-            if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_auth_key');
-
-            // 인증 정보가 맞다면 새비밀번호로 비밀번호를 바꿈
-            if ($output->data->is_register == 'Y') {
-                $args->password = $output->data->new_password;
-                $args->denied = 'N';
-            } else {
-                $args->password = md5($output->data->new_password);
-                unset($args->denied);
-            }
-
-            // $output->data->is_register 값을 백업해 둔다.
-            $is_register = $output->data->is_register;
-
-            $output = executeQuery('member.updateMemberPassword', $args);
-            if(!$output->toBool()) return $this->stop($output->getMessage());
-
-            // 인증 테이블에서 member_srl에 해당하는 모든 값을 지움
-            executeQuery('member.deleteAuthMail',$args);
-
-            // 결과를 통보
-            Context::set('is_register', $is_register);
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('msg_success_authed');
-        }
-
-        /**
-         * @brief 아이디/비밀번호 찾기 기능 실행
-         * 메일에 등록된 링크를 선택시 호출되는 method로 비밀번호를 바꾸고 인증을 시켜버림
-         **/
-        function procMemberUpdateAuthMail() {
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl) return new Object(-1, 'msg_invalid_request');
-
-            $oMemberModel = &getModel('member');
-
-            // 회원의 정보를 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-
-            // 인증메일 재발송 요청이 가능한 상태의 회원인지 검사
-            if ($member_info->denied != 'Y')
-                return new Object(-1, 'msg_invalid_request');
-
-            $chk_args->member_srl = $member_srl;
-            $output = executeQuery('member.chkAuthMail', $chk_args);
-            if ($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
-
-            // 인증 DB에 데이터를 넣음
-            $auth_args->member_srl = $member_srl;
-            $auth_args->auth_key = md5(rand(0, 999999));
-
-            $output = executeQuery('member.updateAuthMail', $auth_args);
-            if (!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 메일 내용을 구함
-            Context::set('auth_args', $auth_args);
-            Context::set('member_info', $member_info);
-
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-            if(!$member_config->skin) $member_config->skin = "default";
-            if(!$member_config->colorset) $member_config->colorset = "white";
-
-            Context::set('member_config', $member_config);
-
-            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
-
-            $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
-            Context::set('auth_url', $auth_url);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
-
-            // 사이트 웹마스터 정보를 구함
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-
-            // 메일 발송
-            $oMail = new Mail();
-            $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
-            $oMail->setContent($content);
-            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-            $oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
-            $oMail->send();
-
-            // 메세지 return
-            $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
-            return new Object(-1, $msg);
-        }
-
-        /**
-         * @brief 인증 메일 재발송
-         **/
-        function procMemberResendAuthMail() {
-            // email_address 검사
-            $email_address = Context::get('email_address');
-            if(!$email_address) return $this->stop('msg_invalid_request');
-
-            // email_address로 비밀번호 찾기 로그 검사
-            $oMemberModel = &getModel('member');
-
-            $args->email_address = $email_address;
-            $member_info = $oMemberModel->getMemberSrlByEmailAddress($email_address);
-            if(!$member_info) return $this->stop('msg_not_exists_member');
-
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_info);
-
-            // 이전에 인증 메일을 보냈는지 확인
-            $chk_args->member_srl = $member_info->member_srl;
-            $output = executeQuery('member.chkAuthMail', $chk_args);
-            if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
-
-            $auth_args->member_srl = $member_info->member_srl;
-            $output = executeQueryArray('member.getAuthMailInfo', $auth_args);
-            if(!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
-            $auth_info = $output->data[0];
-
-            // 메일 내용을 구함
-            Context::set('member_info', $member_info);
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-            if(!$member_config->skin) $member_config->skin = "default";
-            if(!$member_config->colorset) $member_config->colorset = "white";
-
-            Context::set('member_config', $member_config);
-
-            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
-
-            $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_info->auth_key);
-            Context::set('auth_url', $auth_url);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
-
-            // 사이트 웹마스터 정보를 구함
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-
-            // 메일 발송
-            $oMail = new Mail();
-            $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
-            $oMail->setContent($content);
-            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-            $oMail->setReceiptor( $args->user_name, $args->email_address );
-            $oMail->send();
-
-            $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
-            $this->setMessage($msg);
-        }
-
-        /**
-         * @brief 가상 사이트 가입
-         **/
-        function procModuleSiteSignUp() {
-            $site_module_info = Context::get('site_module_info');
-            $logged_info = Context::get('logged_info');
-            if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
-
-            $oMemberModel = &getModel('member');
-            $default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl);
-            $this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
-            $groups[$default_group->group_srl] = $default_group->title;
-            $logged_info->group_list = $groups;
-        }
-
-        /**
-         * @brief 가상 사이트 탈퇴
-         **/
-        function procModuleSiteLeave() {
-            $site_module_info = Context::get('site_module_info');
-            $logged_info = Context::get('logged_info');
-            if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
-
-            $args->site_srl= $site_module_info->site_srl;
-            $args->member_srl = $logged_info->member_srl;
-            $output = executeQuery('member.deleteMembersGroup', $args);
-            if(!$output->toBool()) return $output;
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 회원 설정 정보를 저장
-         **/
-        function setMemberConfig($args) {
-            if(!$args->skin) $args->skin = "default";
-            if(!$args->colorset) $args->colorset = "white";
-            if(!$args->editor_skin) $args->editor_skin= "xpresseditor";
-            if(!$args->editor_colorset) $args->editor_colorset = "white";
-            if($args->enable_join!='Y') $args->enable_join = 'N';
-            if($args->enable_openid!='Y') $args->enable_openid= 'N';
-            if($args->profile_image !='Y') $args->profile_image = 'N';
-            if($args->image_name!='Y') $args->image_name = 'N';
-            if($args->image_mark!='Y') $args->image_mark = 'N';
-            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
-            if(!trim(strip_tags($args->agreement))) $args->agreement = null;
-            $args->limit_day = (int)$args->limit_day;
-
-            $agreement = trim($args->agreement);
-            unset($args->agreement);
-
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('member',$args);
-            if(!$output->toBool()) return $output;
-
-            $agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
-            FileHandler::writeFile($agreement_file, $agreement);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 서명을 파일로 저장
-         **/
-        function putSignature($member_srl, $signature) {
-            $signature = trim(removeHackTag($signature));
-            $signature = preg_replace('/<(\/?)(embed|object|param)/is', '&lt;$1$2', $signature);
-
-            $check_signature = trim(str_replace(array('&nbsp;',"\n","\r"),'',strip_tags($signature,'<img><object>')));
-            $path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
-            $filename = sprintf('%s%d.signature.php', $path, $member_srl);
-
-            if(!$check_signature) return FileHandler::removeFile($filename);
-
-            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature);
-            FileHandler::makeDir($path);
-            FileHandler::writeFile($filename, $buff);
-        }
-
-        /**
-         * @brief 서명 파일 삭제
-         **/
-        function delSignature($member_srl) {
-            $filename = sprintf('files/member_extra_info/signature/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-            FileHandler::removeFile($filename);
-        }
-
-        /**
-         * @brief member_srl에 group_srl을 추가
-         **/
-        function addMemberToGroup($member_srl,$group_srl,$site_srl=0) {
-            $args->member_srl = $member_srl;
-            $args->group_srl = $group_srl;
-            if($site_srl) $args->site_srl = $site_srl;
-
-            $oModel =& getModel('member');
-            $groups = $oModel->getMemberGroups($member_srl, $site_srl, true);
-            if($groups[$group_srl]) return new Object();
-
-            // 추가
-            $output = executeQuery('member.addMemberToGroup',$args);
-            $output2 = ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
-
-            return $output;
-        }
-
-        /**
-         * @brief 특정 회원들의 그룹을 일괄 변경
-         * 가상 사이트와 같이 한 회원이 하나의 그룹만 가질 경우 사용할 수 있음
-         **/
-        function replaceMemberGroup($args) {
-            $obj->site_srl = $args->site_srl;
-            $obj->member_srl = implode(',',$args->member_srl);
-
-            $output = executeQueryArray('member.getMembersGroup', $obj);
-            if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
-
-            $output = executeQuery('member.deleteMembersGroup', $obj);
-            if(!$output->toBool()) return $output;
-
-            $inserted_members = array();
-            foreach($args->member_srl as $key => $val) {
-                if($inserted_members[$val]) continue;
-                $inserted_members[$val] = true;
-
-                unset($obj);
-                $obj->member_srl = $val;
-                $obj->group_srl = $args->group_srl;
-                $obj->site_srl = $args->site_srl;
-                $obj->regdate = $date[$obj->member_srl];
-                $output = executeQuery('member.addMemberToGroup', $obj);
-                if(!$output->toBool()) return $output;
-            }
-            return new Object();
-        }
-
-
-        /**
-         * @brief 자동 로그인 시킴
-         **/
-        function doAutologin() {
-            // 자동 로그인 키 값을 구함
-            $args->autologin_key = $_COOKIE['xeak'];
-
-            // 키값에 해당하는 정보 구함
-            $output = executeQuery('member.getAutologin', $args);
-
-            // 정보가 없으면 쿠키 삭제
-            if(!$output->toBool() || !$output->data) {
-                setCookie('xeak',null,time()+60*60*24*365, '/');
-                return;
-            }
-
-            $user_id = $output->data->user_id;
-            $password = $output->data->password;
-            if(!$user_id || !$password) {
-                setCookie('xeak',null,time()+60*60*24*365, '/');
-                return;
-            }
-
-            $do_auto_login = false;
-
-            // 정보를 바탕으로 키값 비교
-            $key = md5($user_id.$password.$_SERVER['REMOTE_ADDR']);
-
-            if($key == $args->autologin_key) {
-
-                // 설정된 change_password_date 확인
-                $oModuleModel = &getModel('module');
-                $member_config = $oModuleModel->getModuleConfig('member');
-                $limit_date = $member_config->change_password_date;
-
-                // change_password_date가 설정되어 있으면 확인
-                if($limit_date > 0) {
-                    $oMemberModel = &getModel('member');
-                    $member_info = $oMemberModel->getMemberInfoByUserID($user_id);
-
-                    if($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day')) ){
-                        $do_auto_login = true;
-                    }
-
-                } else {
-                    $do_auto_login = true;
-                }
-            }
-            
-            
-            if($do_auto_login) {
-                $output = $this->doLogin($user_id);
-            } else {
-                executeQuery('member.deleteAutologin', $args);
-                setCookie('xeak',null,time()+60*60*24*365, '/');
-            }
-        }
-
-        /**
-         * @brief 로그인 시킴
-         **/
-        function doLogin($user_id, $password = '', $keep_signed = false) {
-            $user_id = strtolower($user_id);
-
-            // 로그인 이전에 trigger 호출 (before)
-            $trigger_obj->user_id = $user_id;
-            $trigger_obj->password = $password;
-            $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-            // member model 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // user_id 에 따른 정보 가져옴
-            $member_info = $oMemberModel->getMemberInfoByUserID($user_id);
-
-            // return 값이 없으면 존재하지 않는 사용자로 지정
-            if(!$user_id || strtolower($member_info->user_id) != strtolower($user_id)) return new Object(-1, 'invalid_user_id');
-
-            // 비밀번호 검사
-            if($password && !$oMemberModel->isValidPassword($member_info->password, $password)) return new Object(-1, 'invalid_password');
-
-            // denied == 'Y' 이면 알림
-            if($member_info->denied == 'Y') {
-                $args->member_srl = $member_info->member_srl;
-                $output = executeQuery('member.chkAuthMail', $args);
-                if ($output->toBool() && $output->data->count != '0') return new Object(-1,'msg_user_not_confirmed');
-                return new Object(-1,'msg_user_denied');
-            }
-
-            // denied_date가 현 시간보다 적으면 알림
-            if($member_info->limit_date && substr($member_info->limit_date,0,8) >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($member_info->limit_date,"Y-m-d")));
-
-            // 사용자 정보의 최근 로그인 시간을 기록
-            $args->member_srl = $member_info->member_srl;
-            $output = executeQuery('member.updateLastLogin', $args);
-
-            // 로그인 성공후 trigger 호출 (after)
-            $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $member_info);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-            // 자동 로그인 사용시 정보 처리
-            if($keep_signed) {
-                // 자동 로그인 키 생성
-                $autologin_args->autologin_key = md5(strtolower($user_id).$member_info->password.$_SERVER['REMOTE_ADDR']);
-                $autologin_args->member_srl = $member_info->member_srl;
-                executeQuery('member.deleteAutologin', $autologin_args);
-                $autologin_output = executeQuery('member.insertAutologin', $autologin_args);
-                if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+60*60*24*365, '/');
-            }
-
-            $this->setSessionInfo($member_info);
-
-            return $output;
-        }
-
-        /**
-         * @brief 세션 정보 갱싱 또는 생성
-         **/
-        function setSessionInfo($member_info = null) {
-            $oMemberModel = &getModel('member');
-
-            // 사용자 정보가 넘어오지 않았다면 현재 세션 정보에서 사용자 정보를 추출
-            if(!$member_info && $_SESSION['member_srl'] && $oMemberModel->isLogged() ) {
-                $member_info = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']);
-
-                // 회원정보가 없다면 세션 파기
-                if($member_info->member_srl != $_SESSION['member_srl']) {
-                    $this->destroySessionInfo();
-                    return;
-                }
-            }
-
-            // 사용중지 아이디이면 세션 파기
-            if($member_info->denied=='Y') {
-                $this->destroySessionInfo();
-                return;
-            }
-
-            // 오픈아이디인지 체크 (일단 아이디 형식으로만 결정)
-            if(preg_match("/^([_0-9a-zA-Z]+)$/is", $member_info->user_id)) $member_info->is_openid = false;
-            else $member_info->is_openid = true;
-
-            // 로그인 처리를 위한 세션 설정
-            $_SESSION['is_logged'] = true;
-            $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];
-            $_SESSION['member_srl'] = $member_info->member_srl;
-            $_SESSION['is_admin'] = '';
-
-            // 비밀번호는 세션에 저장되지 않도록 지워줌;;
-            //unset($member_info->password);
-
-            // 사용자 그룹 설정
-            /*
-            if($member_info->group_list) {
-                $group_srl_list = array_keys($member_info->group_list);
-                $_SESSION['group_srls'] = $group_srl_list;
-
-                // 관리자 그룹일 경우 관리자로 지정
-                $oMemberModel = &getModel('member');
-                $admin_group = $oMemberModel->getAdminGroup();
-                if($admin_group->group_srl && in_array($admin_group->group_srl, $group_srl_list)) $_SESSION['is_admin'] = 'Y';
-            }
-            */
-
-            // 세션에 로그인 사용자 정보 저장
-            $_SESSION['logged_info'] = $member_info;
-            Context::set('is_logged', true);
-            Context::set('logged_info', $member_info);
-
-            // 사용자의 전용 메뉴 구성 (이 메뉴는 애드온등으로 변경될 수 있음)
-            $this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info');
-            $this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document');
-            $this->addMemberMenu( 'dispMemberSavedDocument', 'cmd_view_saved_document');
-            $this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
-        }
-
-        /**
-         * @brief 로그인한 사용자의 개인화된 메뉴 제공을 위한 method
-         * 로그인 정보 출력 위젯 또는 개인화 페이지에서 사용됨
-         **/
-        function addMemberMenu($act, $str) {
-            $logged_info = Context::get('logged_info');
-
-            $logged_info->menu_list[$act] = Context::getLang($str);
-
-            Context::set('logged_info', $logged_info);
-            $_SESSION['logged_info'] = $logged_info;
-        }
-
-        /**
-         * @brief 로그인 회원의 닉네임등을 클릭할때 나타나는 팝업 메뉴를 추가하는 method
-         **/
-        function addMemberPopupMenu($url, $str, $icon = '', $target = 'self') {
-            $member_popup_menu_list = Context::get('member_popup_menu_list');
-            if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
-
-            $obj->url = $url;
-            $obj->str = $str;
-            $obj->icon = $icon;
-            $obj->target = $target;
-            $member_popup_menu_list[] = $obj;
-
-            Context::set('member_popup_menu_list', $member_popup_menu_list);
-        }
-
-        /**
-         * @brief member 테이블에 사용자 추가
-         **/
-        function insertMember(&$args, $password_is_hashed = false) {
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
-            if(!$output->toBool()) return $output;
-
-            // 멤버 설정 정보에서 가입약관 부분을 재확인
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            $logged_info = Context::get('logged_info');
-
-            // 임시 제한 일자가 있을 경우 제한 일자에 내용 추가
-            if($config->limit_day) $args->limit_date = date("YmdHis", time()+$config->limit_day*60*60*24);
-
-            // 입력할 사용자의 아이디를 소문자로 변경
-            $args->user_id = strtolower($args->user_id);
-
-            // 필수 변수들의 조절
-            if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-            if($args->denied!='Y') $args->denied = 'N';
-            $args->allow_message= 'Y';
-
-            if($logged_info->is_admin == 'Y') {
-                if($args->is_admin!='Y') $args->is_admin = 'N';
-            } else {
-                unset($args->is_admin);
-            }
-
-            list($args->email_id, $args->email_host) = explode('@', $args->email_address);
-
-            // 홈페이지, 블로그의 주소 검사
-            if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-            if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
-
-            // 모델 객체 생성
-            $oMemberModel = &getModel('member');
-            // 금지 아이디인지 체크
-            if($oMemberModel->isDeniedID($args->user_id)) return new Object(-1,'denied_user_id');
-
-            // 아이디, 닉네임, email address 의 중복 체크
-            $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-            if($member_srl) return new Object(-1,'msg_exists_user_id');
-
-            $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-            if($member_srl) return new Object(-1,'msg_exists_nick_name');
-
-            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-            if($member_srl) return new Object(-1,'msg_exists_email_address');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // DB에 입력
-            $args->member_srl = getNextSequence();
-            $args->list_order = -1 * $args->member_srl;
-			$args->nick_name = htmlspecialchars($args->nick_name);
-			$args->homepage = htmlspecialchars($args->homepage);
-			$args->blog = htmlspecialchars($args->blog);
-            if($args->password && !$password_is_hashed) $args->password = md5($args->password);
-            elseif(!$args->password) unset($args->password);
-
-            $output = executeQuery('member.insertMember', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 입력된 그룹 값이 없으면 기본 그룹의 값을 등록
-            if(!$args->group_srl_list) {
-                $default_group = $oMemberModel->getDefaultGroup(0);
-
-                // 기본 그룹에 추가
-                $output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
-                if(!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-
-            // 입력된 그룹 값이 있으면 해당 그룹의 값을 등록
-            } else {
-                $group_srl_list = explode('|@|', $args->group_srl_list);
-                for($i=0;$i<count($group_srl_list);$i++) {
-                    $output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
-
-                    if(!$output->toBool()) {
-                        $oDB->rollback();
-                        return $output;
-                    }
-                }
-            }
-
-            // 메일 인증 모드 사용시(가입된 회원이 denied일 때) 인증 메일 발송
-            if ($args->denied == 'Y') {
-                // 인증 DB에 데이터를 넣음
-                $auth_args->user_id = $args->user_id;
-                $auth_args->member_srl = $args->member_srl;
-                $auth_args->new_password = $args->password;
-                $auth_args->auth_key = md5(rand(0, 999999));
-                $auth_args->is_register = 'Y';
-
-                $output = executeQuery('member.insertAuthMail', $auth_args);
-                if (!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-
-                // 메일 내용을 구함
-                Context::set('auth_args', $auth_args);
-                Context::set('member_info', $args);
-
-                $member_config = $oModuleModel->getModuleConfig('member');
-                if(!$member_config->skin) $member_config->skin = "default";
-                if(!$member_config->colorset) $member_config->colorset = "white";
-
-                Context::set('member_config', $member_config);
-
-                $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
-                if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
-
-                $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$args->member_srl, 'auth_key',$auth_args->auth_key);
-                Context::set('auth_url', $auth_url);
-
-                $oTemplate = &TemplateHandler::getInstance();
-                $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
-
-                // 사이트 웹마스터 정보를 구함
-                $oModuleModel = &getModel('module');
-                $member_config = $oModuleModel->getModuleConfig('member');
-
-                // 메일 발송
-                $oMail = new Mail();
-                $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
-                $oMail->setContent($content);
-                $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
-                $oMail->setReceiptor( $args->user_name, $args->email_address );
-                $oMail->send();
-            }
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('member.insertMember', 'after', $args);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            $oDB->commit(true);
-
-            $output->add('member_srl', $args->member_srl);
-            return $output;
-        }
-
-        /**
-         * @brief member 정보 수정
-         **/
-        function updateMember($args) {
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
-            if(!$output->toBool()) return $output;
-
-            // 모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            $logged_info = Context::get('logged_info');
-
-            // 수정하려는 대상의 원래 정보 가져오기
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
-            if(!$args->user_id) $args->user_id = $member_info->user_id;
-
-            // 필수 변수들의 조절
-            if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
-            if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
-
-            if($logged_info->is_admin == 'Y') {
-                if($args->denied!='Y') $args->denied = 'N';
-                if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
-            } else {
-                unset($args->is_admin);
-                unset($args->denied);
-            }
-
-            list($args->email_id, $args->email_host) = explode('@', $args->email_address);
-
-            // 홈페이지, 블로그의 주소 검사
-            if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
-            if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
-
-            // 아이디, 닉네임, email address 의 중복 체크
-            $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
-            if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_user_id');
-
-            $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
-            if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_nick_name');
-
-            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
-            if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // DB에 update
-            if($args->password) $args->password = md5($args->password);
-            else $args->password = $member_info->password;
-            if(!$args->user_name) $args->user_name = $member_info->user_name;
-			$args->nick_name = htmlspecialchars($args->nick_name);
-			$args->homepage = htmlspecialchars($args->homepage);
-			$args->blog = htmlspecialchars($args->blog);
-
-			if(!$args->description) $args->description = '';
-            $output = executeQuery('member.updateMember', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 그룹 정보가 있으면 그룹 정보를 변경
-            if($args->group_srl_list) {
-                $group_srl_list = explode('|@|', $args->group_srl_list);
-                $args->site_srl = 0;
-
-                // 일단 해당 회원의 모든 그룹 정보를 삭제
-                $output = executeQuery('member.deleteMemberGroupMember', $args);
-                if(!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-
-                // 하나 하나 루프를 돌면서 입력
-                for($i=0;$i<count($group_srl_list);$i++) {
-                    $output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
-                    if(!$output->toBool()) {
-                        $oDB->rollback();
-                        return $output;
-                    }
-                }
-            }
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('member.updateMember', 'after', $args);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            $oDB->commit();
-
-            // 세션에 저장
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->member_srl == $member_srl) {
-                $_SESSION['logged_info'] = $member_info;
-            }
-
-            $output->add('member_srl', $args->member_srl);
-            return $output;
-        }
-
-        /**
-         * @brief member 비밀번호 수정
-         **/
-        function updateMemberPassword($args) {
-            $output = executeQuery('member.updateChangePasswordDate', $args);
-            $args->password = md5($args->password);
-            return executeQuery('member.updateMemberPassword', $args);
-        }
-
-        /**
-         * @brief 사용자 삭제
-         **/
-        function deleteMember($member_srl) {
-            // trigger 호출 (before)
-            $trigger_obj->member_srl = $member_srl;
-            $output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
-            if(!$output->toBool()) return $output;
-
-            // 모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // 해당 사용자의 정보를 가져옴
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-            if(!$member_info) return new Object(-1, 'msg_not_exists_member');
-
-            // 관리자의 경우 삭제 불가능
-            if($member_info->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $args->member_srl = $member_srl;
-            // member_auth_mail에서 해당 항목들 삭제
-            $output = executeQuery('member.deleteAuthMail', $args);
-            if (!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            //  member_openid에서 해당 항목들 삭제
-            $output = executeQuery('member.deleteMemberOpenIDByMemberSrl', $ags);
-
-            //  TODO: 테이블 업그레이드를 하지 않은 경우에 실패할 수 있다.
-            /*
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-            */
-
-            // member_group_member에서 해당 항목들 삭제
-            $output = executeQuery('member.deleteMemberGroupMember', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // member 테이블에서 삭제
-            $output = executeQuery('member.deleteMember', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('member.deleteMember', 'after', $trigger_obj);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            $oDB->commit();
-
-            // 이름이미지, 이미지마크, 서명 삭제
-            $this->procMemberDeleteImageName();
-            $this->procMemberDeleteImageMark();
-            $this->delSignature($member_srl);
-
-            return $output;
-        }
-
-        /**
-         * @brief 모든 세션 정보 파기
-         **/
-        function destroySessionInfo() {
-            if(!$_SESSION || !is_array($_SESSION)) return;
-            foreach($_SESSION as $key => $val) {
-                $_SESSION[$key] = '';
-            }
-            session_destroy();
-            setcookie(session_name(), '', time()-42000, '/');
-            setcookie('sso','',time()-42000, '/');
-
-            if($_COOKIE['xeak']) {
-                $args->autologin_key = $_COOKIE['xeak'];
-                executeQuery('member.deleteAutologin', $args);
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class  memberController
+     * @author NHN (developers@xpressengine.com)
+     * @brief Controller class of member module
+     **/
+
+    class memberController extends member {
+		var $memberInfo;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Log-in by checking user_id and password
+         **/
+        function procMemberLogin($user_id = null, $password = null, $keep_signed = null) {
+			// Variables
+			if(!$user_id) $user_id = Context::get('user_id');
+			$user_id = trim($user_id);
+
+			if(!$password) $password = Context::get('password');
+			$password = trim($password);
+
+			if(!$keep_signed) $keep_signed = Context::get('keep_signed');
+			// Return an error when id and password doesn't exist
+			if(!$user_id) return new Object(-1,'null_user_id');
+			if(!$password) return new Object(-1,'null_password');
+
+			$output = $this->doLogin($user_id, $password, $keep_signed=='Y'?true:false);
+			if (!$output->toBool()) return $output;
+
+			$oModuleModel = &getModel('module');
+			$config = $oModuleModel->getModuleConfig('member');
+
+			// Check change_password_date
+			$limit_date = $config->change_password_date;
+
+			// Check if change_password_date is set
+			if ($limit_date > 0) {
+				$oMemberModel = &getModel('member');
+				//$member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
+				if ($this->memberInfo->change_password_date < date ('YmdHis', strtotime ('-' . $limit_date . ' day'))) {
+					$this->setRedirectUrl(getNotEncodedUrl('','vid',Context::get('vid'),'mid',Context::get('mid'),'act','dispMemberModifyPassword'));
+				}
+			}
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				
+				if(!$config->after_login_url) {
+					$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				} else {
+					$returnUrl = $config->after_login_url;
+				}
+
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+
+			return $output;
+        }
+
+        /**
+         * @brief Login by openid
+         **/
+        function procMemberOpenIDLogin($validator = "procMemberOpenIDValidate") {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            if($config->enable_openid != 'Y') $this->stop('msg_invalid_request');
+
+            if(!defined('Auth_OpenID_RAND_SOURCE') && !file_exists("/dev/urandom"))
+            {
+                define('Auth_OpenID_RAND_SOURCE', null);
+            }
+
+            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
+            require_once('Auth/OpenID.php');
+            require_once('Auth/OpenID/Consumer.php');
+            require_once('Auth/OpenID/XEStore.php');
+            $store = new Auth_OpenID_XEStore();
+            $consumer = new Auth_OpenID_Consumer($store);
+
+            $user_id = Context::get('user_id');
+            if (!$user_id) $user_id = Context::get('openid');
+            $auth_request = $consumer->begin($user_id);
+            $auth_request->addExtensionArg('sreg', 'required', 'email');
+            $auth_request->addExtensionArg('sreg', 'optional', 'dob');
+            if(!$auth_request)
+            {
+                return new Object(-1, "association failed");
+            }
+
+            $trust_root = 'http://'.$_SERVER["HTTP_HOST"];
+            $referer_url = Context::get('referer_url');
+            if (!$referer_url) $referer_url = $_SERVER['HTTP_REFERER'];
+            if (!$referer_url)
+                $referer_url = htmlspecialchars_decode(getRequestUri(RELEASE_SSL));
+            $goto = urlencode($referer_url);
+            $ApprovedURL = Context::getRequestUri(RELEASE_SSL) . "?module=member&act=" . $validator. "&goto=" . $goto;
+            $redirect_url = $auth_request->redirectURL($trust_root, $ApprovedURL);
+            $this->add("redirect_url", $redirect_url);
+            if (Context::getRequestMethod() == 'POST')
+                header("location:" . $redirect_url);
+        }
+
+        function getLegacyUserIDsFromOpenID($openid_identity) {
+            //  Issue 17515512: workaround
+            $result = array();
+            $uri_matches = array();
+            preg_match(Auth_OpenID_getURIPattern(), $openid_identity, $uri_matches);
+
+            if (count($uri_matches) < 9) {
+                for ($i = count($uri_matches); $i <= 9; $i++) {
+                    $uri_matches[] = '';
+                }
+            }
+
+            $scheme = $uri_matches[2];
+            $authority = $uri_matches[4];
+            $path = $uri_matches[5];
+            $query = $uri_matches[6];
+            $fragment = $uri_matches[8];
+
+            if ($scheme === null) $scheme = '';
+            if ($authority === null) $authority = '';
+            if ($path === null) $path = '';
+            if ($query === null) $query = '';
+            if ($fragment === null) $fragment = '';
+
+            if ($scheme == 'http' or $scheme == '')
+                $scheme_part = '';
+            else
+                $scheme_part = $scheme."://";
+
+
+            if ($path == '' || $path == '/') {
+                $result[] = $scheme_part.$authority.''.$query.$fragment;
+                $result[] = $scheme_part.$authority.'/'.$query.$fragment;
+            }
+            else {
+                $result[] = $scheme_part.$authority.$path.$query.$fragment;
+            }
+
+            return $result;
+        }
+
+        /**
+         * @brief openid authentication check
+         **/
+        function procMemberOpenIDValidate() {
+            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
+            require_once('Auth/OpenID.php');
+            require_once('Auth/OpenID/Consumer.php');
+            require_once('Auth/OpenID/XEStore.php');
+            require_once('Auth/OpenID/URINorm.php');
+
+            $store = new Auth_OpenID_XEStore();
+            $consumer = new Auth_OpenID_Consumer($store);
+            $response = $consumer->complete($_GET);
+			switch($response->status) {
+				case Auth_OpenID_CANCEL :
+					// Handle if user authentication is canceled
+					return $this->stop('authorization_canceled');
+				case Auth_OpenID_FAILURE :
+					// Handle if user authentication is failed due to a certain problem (for example, openid doesn't exist) (there is no authentication required deunga openid ..)
+					return $this->stop('invalid_authorization');
+				case Auth_OpenID_SUCCESS :
+					// Authentication success!
+					break;
+				default:
+					return $this->stop('invalid_authorization');
+			}
+            // Authentication success
+            $oMemberModel = &getModel('member');
+            // Get zeroboard ID which is corresponded to the openID ID.
+            $login_success = false;
+            $assoc_member_info = null;
+            $openid_identity = $response->signed_args["openid.identity"];
+            $args->openid = $openid_identity;
+            $output = executeQuery('member.getMemberSrlByOpenID', $args);
+
+            if ($output->toBool() && $output->data && !is_array($output->data)) {
+                $member_srl = $output->data->member_srl;
+				$columnList = array('member_srl', 'user_id');
+                $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+                if ($member_info) {
+                    $assoc_member_info = $member_info;
+                }
+            }
+
+            $user_id_candidates = $this->getLegacyUserIDsFromOpenID($openid_identity);
+            $default_user_id = $user_id_candidates[0];
+
+            if ($assoc_member_info != null) {
+                $user_id_candidates = array_merge(array($assoc_member_info->user_id), $user_id_candidates);
+            }
+            $sreg = $response->extensionResponse('sreg');
+
+            foreach($user_id_candidates as $user_id) {
+                $args->user_id = $args->nick_name = $user_id;
+                // Get basic information
+                $args->email_address = $sreg['email'];
+                $args->user_name = $sreg['fullname'];
+                if(!$args->user_name) list($args->user_name) = explode('@', $args->email_address);
+                $args->birthday = str_replace('-','',$sreg['dob']);
+                // Attempts self-authentication
+                $output = $this->doLogin($args->user_id);
+
+                if ($output->toBool()) {
+                    if ($assoc_member_info == null) {
+                        $logged_info = Context::get('logged_info');
+                        $args->member_srl = $logged_info->member_srl;
+                        $args->openid = $openid_identity;
+                        executeQuery('member.addOpenIDToMember', $args);
+                    }
+                    $login_success = true;
+                    break;
+                }
+            }
+            // Member join if self-authentication is failed
+            if(!$login_success) {
+                $args->user_id = $args->nick_name = $default_user_id;
+                $args->password = md5(getmicrotime());
+
+                $output = $this->insertMember($args);
+                if(!$output->toBool()) return $this->stop($output->getMessage());
+                $output = $this->doLogin($args->user_id);
+                if(!$output->toBool()) return $this->stop($output->getMessage());
+
+                $logged_info = Context::get('logged_info');
+                $args->member_srl = $logged_info->member_srl;
+                $args->openid = $openid_identity;
+                executeQuery('member.addOpenIDToMember', $args);
+            }
+
+            Context::close();
+            // Move the page
+            if(Context::get('goto')) {
+                $goto = Context::get('goto');
+                header("location:" . $goto);
+            } else {
+                header("location:./");
+            }
+
+            exit();
+        }
+
+        /**
+         * @brief Request member join by openID
+         **/
+        function procMemberAddOpenIDToMember() {
+            return $this->procMemberOpenIDLogin("procMemberValidateAddOpenIDToMember");
+        }
+
+        /**
+         * @brief Validate openID processing
+         **/
+        function procMemberValidateAddOpenIDToMember() {
+            set_include_path(_XE_PATH_."modules/member/php-openid-1.2.3");
+            require_once('Auth/OpenID.php');
+            require_once('Auth/OpenID/Consumer.php');
+            require_once('Auth/OpenID/XEStore.php');
+            require_once('Auth/OpenID/URINorm.php');
+
+            $store = new Auth_OpenID_XEStore();
+            $consumer = new Auth_OpenID_Consumer($store);
+            $response = $consumer->complete($_GET);
+
+            switch($response->status) {
+                case Auth_OpenID_CANCEL :
+                // Handle if user authentication is canceled
+                return $this->stop('authorization_canceled');
+            case Auth_OpenID_FAILURE :
+                // Handle if user authentication is failed due to a certain problem (for example, openid doesn't exist) (there is no authentication required deunga openid ..)
+                return $this->stop('invalid_authorization');
+            case Auth_OpenID_SUCCESS :
+                {
+                    $logged_info = Context::get('logged_info');
+                    if (!Context::get('is_logged')) return $this->stop('msg_not_logged');
+
+                    $member_srl = $logged_info->member_srl;
+
+                    $args->member_srl = $member_srl;
+                    $openid_identity = $response->signed_args["openid.identity"];
+                    $args->openid = $openid_identity;
+
+                    $output = executeQuery('member.addOpenIDToMember', $args);
+                    if (!$output->toBool()) return $output;
+
+                    Context::close();
+
+                    if(Context::get('goto')){
+                        $goto = Context::get('goto');
+                        header("location:" . $goto);
+                    }else{
+                        header("location:./");
+                    }
+                    exit();
+                }
+                // Authentication success!
+                break;
+            default:
+                return $this->stop('invalid_authorization');
+            }
+        }
+
+        /**
+         * @brief Disconnect OpenID
+         **/
+        function procMemberDeleteOpenIDFromMember() {
+            $logged_info = Context::get('logged_info');
+            $openid_identity = Context::get('openid_to_delete');
+            $arg->openid = $openid_identity;
+            $result = executeQuery('member.getMemberSrlByOpenID', $arg);
+
+            if (!Context::get('is_logged')) {
+                $this->setError(-1);
+                $this->setMessage('msg_not_logged');
+                return;
+            } else if (!$result->data || is_array($result->data)) {
+                $this->setError(-1);
+                $this->setMessage('msg_not_founded');
+                return;
+            } else if ($result->data->member_srl != $logged_info->member_srl) {
+                $this->setError(-1);
+                $this->setMessage('msg_not_permitted');
+                return;
+            }
+
+            $arg->openid = $openid_identity;
+
+            $output = executeQuery('member.deleteMemberOpenID', $arg);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_updated');
+        }
+
+
+        /**
+         * @brief Log-out
+         **/
+        function procMemberLogout() {
+            // Call a trigger before log-out (before)
+            $logged_info = Context::get('logged_info');
+            $trigger_output = ModuleHandler::triggerCall('member.doLogout', 'before', $logged_info);
+            if(!$trigger_output->toBool()) return $trigger_output;
+            // Destroy session information
+            $this->destroySessionInfo();
+            // Call a trigger after log-out (after)
+            $trigger_output = ModuleHandler::triggerCall('member.doLogout', 'after', $logged_info);
+            if(!$trigger_output->toBool()) return $trigger_output;
+
+            $output = new Object();
+
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            if($config->after_logout_url) 
+				$output->redirect_url = $config->after_logout_url;
+
+            return $output;
+        }
+
+        /**
+         * @brief Scrap
+         **/
+        function procMemberScrapDocument() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $document_srl = (int)Context::get('document_srl');
+            if(!$document_srl) $document_srl = (int)Context::get('target_srl');
+            if(!$document_srl) return new Object(-1,'msg_invalid_request');
+            // Get document
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            // Variables
+            $args->document_srl = $document_srl;
+            $args->member_srl = $logged_info->member_srl;
+            $args->user_id = $oDocument->get('user_id');
+            $args->user_name = $oDocument->get('user_name');
+            $args->nick_name = $oDocument->get('nick_name');
+            $args->target_member_srl = $oDocument->get('member_srl');
+            $args->title = $oDocument->get('title');
+            // Check if already scrapped
+            $output = executeQuery('member.getScrapDocument', $args);
+            if($output->data->count) return new Object(-1, 'msg_alreay_scrapped');
+            // Insert
+            $output = executeQuery('member.addScrapDocument', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setError(-1);
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief Delete a scrap
+         **/
+        function procMemberDeleteScrap() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $document_srl = (int)Context::get('document_srl');
+            if(!$document_srl) return new Object(-1,'msg_invalid_request');
+            // Variables
+            $args->member_srl = $logged_info->member_srl;
+            $args->document_srl = $document_srl;
+            return executeQuery('member.deleteScrapDocument', $args);
+        }
+
+        /**
+         * @brief Save posts
+		 * @Deplicated - instead Document Controller - procDocumentTempSave method use
+         **/
+        function procMemberSaveDocument() {
+			return new Object(0, 'Deplicated method');
+        }
+
+        /**
+         * @brief Delete the post
+         **/
+        function procMemberDeleteSavedDocument() {
+            // Check login information
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_logged');
+            $logged_info = Context::get('logged_info');
+
+            $document_srl = (int)Context::get('document_srl');
+            if(!$document_srl) return new Object(-1,'msg_invalid_request');
+            // Variables
+            $oDocumentController = &getController('document');
+            $oDocumentController->deleteDocument($document_srl, true);
+        }
+
+        /**
+         * @brief Check values when member joining
+         **/
+        function procMemberCheckValue() {
+            $name = Context::get('name');
+            $value = Context::get('value');
+            if(!$value) return;
+
+            $oMemberModel = &getModel('member');
+            // Check if logged-in
+            $logged_info = Context::get('logged_info');
+
+
+            switch($name) {
+                case 'user_id' :
+                        // Check denied ID
+                        if($oMemberModel->isDeniedID($value)) return new Object(0,'denied_user_id');
+                        // Check if duplicated
+                        $member_srl = $oMemberModel->getMemberSrlByUserID($value);
+                        if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_user_id');
+                    break;
+                case 'nick_name' :
+                        // Check if duplicated
+                        $member_srl = $oMemberModel->getMemberSrlByNickName($value);
+                        if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_nick_name');
+
+                    break;
+                case 'email_address' :
+                        // Check if duplicated
+                        $member_srl = $oMemberModel->getMemberSrlByEmailAddress($value);
+                        if($member_srl && $logged_info->member_srl != $member_srl ) return new Object(0,'msg_exists_email_address');
+                    break;
+            }
+        }
+
+        /**
+         * @brief Join Membership
+         **/
+        function procMemberInsert() {
+            if (Context::getRequestMethod () == "GET") return new Object (-1, "msg_invalid_request");
+            $oMemberModel = &getModel ('member');
+            $config = $oMemberModel->getMemberConfig ();
+
+            // call a trigger (before)
+            $trigger_output = ModuleHandler::triggerCall ('member.procMemberInsert', 'before', $config);
+            if (!$trigger_output->toBool ()) return $trigger_output;
+            // Check if an administrator allows a membership
+            if ($config->enable_join != 'Y') return $this->stop ('msg_signup_disabled');
+            // Check if the user accept the license terms (only if terms exist)
+            if ($config->agreement && Context::get('accept_agreement')!='Y') return $this->stop('msg_accept_agreement');
+
+            // Extract the necessary information in advance
+			$getVars = array();
+			if ($config->signupForm){
+				foreach($config->signupForm as $formInfo){
+					if($formInfo->isDefaultForm && $formInfo->isUse && ($formInfo->required || $formInfo->mustRequired)){
+						$getVars[] = $formInfo->name;
+					}
+				}
+			}
+			foreach($getVars as $val){
+				$args->{$val} = Context::get($val);
+			}
+            $args->member_srl = getNextSequence();
+            $args->list_order = -1 * $args->member_srl;
+			$args->find_account_answer = Context::get('find_account_answer');
+			$args->allow_mailing = Context::get('allow_mailing');
+			$args->allow_message = Context::get('allow_message');
+
+			if($args->password1) $args->password = $args->password1;
+
+            // Remove some unnecessary variables from all the vars
+            $all_args = Context::getRequestVars();
+            unset($all_args->module);
+            unset($all_args->act);
+            unset($all_args->is_admin);
+            unset($all_args->description);
+            unset($all_args->group_srl_list);
+            unset($all_args->body);
+            unset($all_args->accept_agreement);
+            unset($all_args->signature);
+            unset($all_args->password);
+            unset($all_args->password2);
+            unset($all_args->mid);
+            unset($all_args->error_return_url);
+            unset($all_args->ruleset);
+            unset($all_args->captchaType);
+            unset($all_args->secret_text);
+
+            // Set the user state as "denied" when using mail authentication
+            if ($config->enable_confirm == 'Y') $args->denied = 'Y';
+            // Add extra vars after excluding necessary information from all the requested arguments
+            $extra_vars = delObjectVars($all_args, $args);
+            $args->extra_vars = serialize($extra_vars);
+            // Execute insert or update depending on the value of member_srl
+
+			if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
+			if (!$args->user_name) $args->user_name = $args->member_srl;
+			if (!$args->nick_name) $args->nick_name = $args->member_srl;
+
+			// remove whitespace
+			$checkInfos = array('user_id', 'nick_name', 'email_address');
+			$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
+			foreach($checkInfos as $val){
+				if(isset($args->{$val})){
+					$args->{$val} = str_replace($replaceStr, '', $args->{$val});
+				}
+			}
+            $output = $this->insertMember($args);
+            if(!$output->toBool()) return $output;
+
+			// insert ProfileImage, ImageName, ImageMark
+            // If a virtual site, join the site
+            $site_module_info = Context::get('site_module_info');
+            if($site_module_info->site_srl > 0) {
+				$columnList = array('site_srl', 'group_srl');
+                $default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
+                if($default_group->group_srl) {
+                    $this->addMemberToGroup($args->member_srl, $default_group->group_srl, $site_module_info->site_srl);
+                }
+
+            }
+            // Log-in
+            if ($config->enable_confirm != 'Y') $this->doLogin($args->user_id);
+            //get redirect url from cookie and invalidate cookie
+            $config->redirect_url = $_COOKIE["XE_REDIRECT_URL"];
+            setcookie("XE_REDIRECT_URL", '', 1);
+            // Results
+            $this->add('member_srl', $args->member_srl);
+            if($config->redirect_url) $this->add('redirect_url', $config->redirect_url);
+            if ($config->enable_confirm == 'Y') {
+                $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
+                $this->setMessage($msg);
+            }
+            else $this->setMessage('success_registed');
+            // Call a trigger (after)
+            $trigger_output = ModuleHandler::triggerCall('member.procMemberInsert', 'after', $config);
+            if(!$trigger_output->toBool()) return $trigger_output;
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Edit member profile
+         **/
+        function procMemberModifyInfo() {
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            // Extract the necessary information in advance
+            $oMemberModel = &getModel ('member');
+            $config = $oMemberModel->getMemberConfig ();
+			$getVars = array('find_account_answer','allow_mailing','allow_message');
+			if ($config->signupForm){
+				foreach($config->signupForm as $formInfo){
+					if($formInfo->isDefaultForm && ($formInfo->isUse || $formInfo->required || $formInfo->mustRequired)){
+						$getVars[] = $formInfo->name;
+					}
+				}
+			}
+			foreach($getVars as $val){
+				$args->{$val} = Context::get($val);
+			}
+            // Login Information
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+            // Remove some unnecessary variables from all the vars
+            $all_args = Context::getRequestVars();
+            unset($all_args->module);
+            unset($all_args->act);
+            unset($all_args->is_admin);
+            unset($all_args->description);
+            unset($all_args->group_srl_list);
+            unset($all_args->body);
+            unset($all_args->accept_agreement);
+            unset($all_args->signature);
+            unset($all_args->_filter);
+            unset($all_args->mid);
+            unset($all_args->error_return_url);
+            unset($all_args->ruleset);
+            unset($all_args->password);
+
+            // Add extra vars after excluding necessary information from all the requested arguments
+            $extra_vars = delObjectVars($all_args, $args);
+            $args->extra_vars = serialize($extra_vars);
+            // Create a member model object
+            $oMemberModel = &getModel('member');
+
+			// remove whitespace
+			$checkInfos = array('user_id', 'nick_name', 'email_address');
+			$replaceStr = array("\r\n", "\r", "\n", " ", "\t", "\xC2\xAD");
+			foreach($checkInfos as $val){
+				if(isset($args->{$val})){
+					$args->{$val} = str_replace($replaceStr, '', $args->{$val});
+				}
+			}
+            // Execute insert or update depending on the value of member_srl
+            $output = $this->updateMember($args);
+            if(!$output->toBool()) return $output;
+
+			$profile_image = $_FILES['profile_image'];
+			if (is_uploaded_file($profile_image['tmp_name'])){
+				$this->insertProfileImage($args->member_srl, $profile_image['tmp_name']);
+			}
+
+			$image_mark = $_FILES['image_mark'];
+			if (is_uploaded_file($image_mark['tmp_name'])){
+				$this->insertImageMark($args->member_srl, $image_mark['tmp_name']);
+			}
+
+			$image_name = $_FILES['image_name'];
+			if (is_uploaded_file($image_name['tmp_name'])){
+				$this->insertImageName($args->member_srl, $image_name['tmp_name']);
+			}
+
+            // Save Signature
+            $signature = Context::get('signature');
+            $this->putSignature($args->member_srl, $signature);
+            // Get user_id information
+            $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+            // Call a trigger after successfully log-in (after)
+            $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
+            if(!$trigger_output->toBool()) return $trigger_output;
+
+            $this->setSessionInfo();
+            // Return result
+            $this->add('member_srl', $args->member_srl);
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Change the user password
+         **/
+        function procMemberModifyPassword() {
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            // Extract the necessary information in advance
+            $current_password = trim(Context::get('current_password'));
+            $password = trim(Context::get('password1'));
+            // Get information of logged-in user
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            // Create a member model object
+            $oMemberModel = &getModel('member');
+            // Get information of member_srl
+			$columnList = array('member_srl', 'password');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+            // Verify the cuttent password
+            if(!$oMemberModel->isValidPassword($member_info->password, $current_password)) return new Object(-1, 'invalid_password');
+
+            // Check if a new password is as same as the previous password
+            if ($current_password == $password) return new Object(-1, 'invalid_new_password');
+
+            // Execute insert or update depending on the value of member_srl
+            $args->member_srl = $member_srl;
+            $args->password = $password;
+            $output = $this->updateMemberPassword($args);
+            if(!$output->toBool()) return $output;
+
+            $this->add('member_srl', $args->member_srl);
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Membership withdrawal
+         **/
+        function procMemberLeave() {
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            // Extract the necessary information in advance
+            $password = trim(Context::get('password'));
+            // Get information of logged-in user
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            // Create a member model object
+            $oMemberModel = &getModel('member');
+            // Get information of member_srl
+			if(!$this->memberInfo->password)
+			{
+				$columnList = array('member_srl', 'password');
+	            $memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+				$this->memberInfo->password = $memberInfo->password;
+			}
+            // Verify the cuttent password
+            if(!$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
+
+            $output = $this->deleteMember($member_srl);
+            if(!$output->toBool()) return $output;
+            // Destroy all session information
+            $this->destroySessionInfo();
+            // Return success message
+            $this->setMessage('success_leaved');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief OpenID Withdrawal
+         **/
+        function procMemberOpenIDLeave() {
+            // Return an error if in the non-login state
+            if(!Context::get('is_logged')) return $this->stop('msg_not_logged');
+            // Compare the current IP with session IP
+            if($_SESSION['ipaddress']!=$_SERVER['REMOTE_ADDR']) return $this->stop('msg_not_permitted');
+            // Get information of logged-in user
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+
+            $output = $this->deleteMember($member_srl);
+            if(!$output->toBool()) return $output;
+            // Destroy all session information
+            $this->destroySessionInfo();
+            // Return success message
+            $this->setMessage('success_leaved');
+        }
+
+        /**
+         * @brief Add a profile image
+         **/
+        function procMemberInsertProfileImage() {
+            // Check if the file is successfully uploaded
+            $file = $_FILES['profile_image'];
+            if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_profile_image');
+            // Ignore if member_srl is invalid or doesn't exist.
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return $this->stop('msg_not_uploaded_profile_image');
+
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_profile_image');
+            // Return if member module is set not to use an image name or the user is not an administrator ;
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            if($logged_info->is_admin != 'Y' && $config->profile_image != 'Y') return $this->stop('msg_not_uploaded_profile_image');
+
+            $this->insertProfileImage($member_srl, $file['tmp_name']);
+            // Page refresh
+            //$this->setRefreshPage();
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        function insertProfileImage($member_srl, $target_file) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            // Get an image size
+            $max_width = $config->profile_image_max_width;
+            if(!$max_width) $max_width = "90";
+            $max_height = $config->profile_image_max_height;
+            if(!$max_height) $max_height = "20";
+            // Get a target path to save
+            $target_path = sprintf('files/member_extra_info/profile_image/%s', getNumberingPath($member_srl));
+            FileHandler::makeDir($target_path);
+            // Get file information
+            list($width, $height, $type, $attrs) = @getimagesize($target_file);
+            if($type == 3) $ext = 'png';
+            elseif($type == 2) $ext = 'jpg';
+            else $ext = 'gif';
+
+            $target_filename = sprintf('%s%d.%s', $target_path, $member_srl, $ext);
+            // Convert if the image size is larger than a given size or if the format is not a gif
+            if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, $ext);
+            else @copy($target_file, $target_filename);
+        }
+
+        /**
+         * @brief Add an image name
+         **/
+        function procMemberInsertImageName() {
+            // Check if the file is successfully uploaded
+            $file = $_FILES['image_name'];
+            if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_name');
+            // Ignore if member_srl is invalid or doesn't exist.
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return $this->stop('msg_not_uploaded_image_name');
+
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_name');
+            // Return if member module is set not to use an image name or the user is not an administrator ;
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            if($logged_info->is_admin != 'Y' && $config->image_name != 'Y') return $this->stop('msg_not_uploaded_image_name');
+
+            $this->insertImageName($member_srl, $file['tmp_name']);
+            // Page refresh
+            //$this->setRefreshPage();
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        function insertImageName($member_srl, $target_file) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            // Get an image size
+            $max_width = $config->image_name_max_width;
+            if(!$max_width) $max_width = "90";
+            $max_height = $config->image_name_max_height;
+            if(!$max_height) $max_height = "20";
+            // Get a target path to save
+            $target_path = sprintf('files/member_extra_info/image_name/%s/', getNumberingPath($member_srl));
+            FileHandler::makeDir($target_path);
+
+            $target_filename = sprintf('%s%d.gif', $target_path, $member_srl);
+            // Get file information
+            list($width, $height, $type, $attrs) = @getimagesize($target_file);
+            // Convert if the image size is larger than a given size or if the format is not a gif
+            if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+            else @copy($target_file, $target_filename);
+        }
+
+        /**
+         * @brief Delete profile image
+         **/
+        function procMemberDeleteProfileImage() {
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return new Object(0,'success');
+
+            $logged_info = Context::get('logged_info');
+
+            if($logged_info->is_admin != 'Y') {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('member');
+                if($config->profile_image == 'N') return new Object(0,'success');
+            }
+
+            if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) {
+                $oMemberModel = &getModel('member');
+                $profile_image = $oMemberModel->getProfileImage($member_srl);
+                FileHandler::removeFile($profile_image->file);
+            }
+            return new Object(0,'success');
+        }
+
+        /**
+         * @brief Delete Image name
+         **/
+        function procMemberDeleteImageName() {
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return new Object(0,'success');
+
+            $logged_info = Context::get('logged_info');
+
+            if($logged_info->is_admin != 'Y') {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('member');
+                if($config->image_name == 'N') return new Object(0,'success');
+            }
+
+            if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) {
+                $oMemberModel = &getModel('member');
+                $image_name = $oMemberModel->getImageName($member_srl);
+                FileHandler::removeFile($image_name->file);
+            }
+            return new Object(0,'success');
+        }
+
+        /**
+         * @brief Add an image to mark
+         **/
+        function procMemberInsertImageMark() {
+            // Check if the file is successfully uploaded
+            $file = $_FILES['image_mark'];
+            if(!is_uploaded_file($file['tmp_name'])) return $this->stop('msg_not_uploaded_image_mark');
+            // Ignore if member_srl is invalid or doesn't exist.
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return $this->stop('msg_not_uploaded_image_mark');
+
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_srl) return $this->stop('msg_not_uploaded_image_mark');
+            // Membership in the images mark the module using the ban was set by an administrator or return;
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            if($logged_info->is_admin != 'Y' && $config->image_mark != 'Y') return $this->stop('msg_not_uploaded_image_mark');
+
+            $this->insertImageMark($member_srl, $file['tmp_name']);
+            // Page refresh
+            //$this->setRefreshPage();
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', 'dispMemberModifyInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        function insertImageMark($member_srl, $target_file) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+            // Get an image size
+            $max_width = $config->image_mark_max_width;
+            if(!$max_width) $max_width = "20";
+            $max_height = $config->image_mark_max_height;
+            if(!$max_height) $max_height = "20";
+
+            $target_path = sprintf('files/member_extra_info/image_mark/%s/', getNumberingPath($member_srl));
+            FileHandler::makeDir($target_path);
+
+            $target_filename = sprintf('%s%d.gif', $target_path, $member_srl);
+            // Get file information
+            list($width, $height, $type, $attrs) = @getimagesize($target_file);
+
+            if($width > $max_width || $height > $max_height || $type!=1) FileHandler::createImageFile($target_file, $target_filename, $max_width, $max_height, 'gif');
+            else @copy($target_file, $target_filename);
+
+        }
+
+        /**
+         * @brief Delete Image Mark
+         **/
+        function procMemberDeleteImageMark() {
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return new Object(0,'success');
+
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin == 'Y' || $logged_info->member_srl == $member_srl) {
+                $oMemberModel = &getModel('member');
+                $image_mark = $oMemberModel->getImageMark($member_srl);
+                FileHandler::removeFile($image_mark->file);
+            }
+            return new Object(0,'success');
+        }
+
+        /**
+         * @brief Find ID/Password
+         **/
+        function procMemberFindAccount() {
+            $email_address = Context::get('email_address');
+            if(!$email_address) return new Object(-1, 'msg_invalid_request');
+
+            $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
+            // Check if a member having the same email address exists
+            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
+            if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+            // Get information of the member
+			$columnList = array('denied', 'member_srl', 'user_id', 'user_name', 'email_address', 'nick_name');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+            // Check if possible to find member's ID and password
+            if ($member_info->denied == 'Y') {
+                $chk_args->member_srl = $member_info->member_srl;
+                $output = executeQuery('member.chkAuthMail', $chk_args);
+                if ($output->toBool() && $output->data->count != '0') return new Object(-1, 'msg_user_not_confirmed');
+            }
+            // Insert data into the authentication DB
+            $args->user_id = $member_info->user_id;
+            $args->member_srl = $member_info->member_srl;
+            $args->new_password = rand(111111,999999);
+            $args->auth_key = md5( rand(0,999999 ) );
+            $args->is_register = 'N';
+
+            $output = executeQuery('member.insertAuthMail', $args);
+            if(!$output->toBool()) return $output;
+            // Get content of the email to send a member
+            Context::set('auth_args', $args);
+
+            $member_config = $oModuleModel->getModuleConfig('member');
+			global $lang;
+			if (is_array($member_config->signupForm)){
+				$exceptForm=array('password', 'find_account_question');
+				foreach($member_config->signupForm as $form){
+					if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired)){
+						$memberInfo[$lang->{$form->name}] = $member_info->{$form->name};
+					}
+				}
+			}else{
+				$memberInfo[$lang->user_id] = $args->user_id;
+				$memberInfo[$lang->user_name] = $args->user_name;
+				$memberInfo[$lang->nick_name] = $args->nick_name;
+				$memberInfo[$lang->email_address] = $args->email_address;
+			}
+			Context::set('memberInfo', $memberInfo);
+
+            if(!$member_config->skin) $member_config->skin = "default";
+            if(!$member_config->colorset) $member_config->colorset = "white";
+
+            Context::set('member_config', $member_config);
+
+            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+
+            $find_url = getFullUrl ('', 'module', 'member', 'act', 'procMemberAuthAccount', 'member_srl', $member_info->member_srl, 'auth_key', $args->auth_key);
+            Context::set('find_url', $find_url);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            $content = $oTemplate->compile($tpl_path, 'find_member_account_mail');
+            // Get information of the Webmaster
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            // Send a mail
+            $oMail = new Mail();
+            $oMail->setTitle( Context::getLang('msg_find_account_title') );
+            $oMail->setContent($content);
+            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
+            $oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+            $oMail->send();
+            // Return message
+            $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
+            return new Object(0,$msg);
+        }
+
+
+        /**
+         * @brief Generate a temp password by answering to the pre-determined question
+         **/
+        function procMemberFindAccountByQuestion() {
+            $oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+
+            $email_address = Context::get('email_address');
+            $user_id = Context::get('user_id');
+            $find_account_question = trim(Context::get('find_account_question'));
+            $find_account_answer = trim(Context::get('find_account_answer'));
+
+            if(($config->identifier == 'user_id' && !$user_id) || !$email_address || !$find_account_question || !$find_account_answer) return new Object(-1, 'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+            // Check if a member having the same email address exists
+            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
+            if(!$member_srl) return new Object(-1, 'msg_email_not_exists');
+            // Get information of the member
+			$columnList = array('member_srl', 'find_account_question', 'find_account_answer');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+
+            // Display a message if no answer is entered
+            if (!$member_info->find_account_question || !$member_info->find_account_answer) return new Object(-1, 'msg_question_not_exists');
+
+            if(trim($member_info->find_account_question) != $find_account_question || trim($member_info->find_account_answer) != $find_account_answer) return new Object(-1, 'msg_answer_not_matches');
+
+			if ($config->identifier == 'email_address'){
+				$user_id = $email_address;
+			}
+
+            // Update to a temporary password and set change_password_date to 1
+            $args->member_srl = $member_srl;
+            list($usec, $sec) = explode(" ", microtime());
+            $temp_password = substr(md5($user_id . $member_info->find_account_answer. $usec . $sec),0,15);
+
+            $args->password = $temp_password;
+            $args->change_password_date = '1';
+            $output = $this->updateMemberPassword($args);
+            if(!$output->toBool()) return $output;
+
+            $_SESSION['xe_temp_password_'.$user_id] = $temp_password;
+
+            $this->add('user_id',$user_id);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				$this->setRedirectUrl($returnUrl.'&user_id='.$user_id);
+				return;
+			}
+        }
+
+        /**
+         * @brief Execute finding ID/Passoword
+         * When clicking the link in the verification email, a method is called to change the old password and to authenticate it
+         **/
+        function procMemberAuthAccount() {
+            // Test user_id and authkey
+            $member_srl = Context::get('member_srl');
+            $auth_key = Context::get('auth_key');
+            if(!$member_srl || !$auth_key) return $this->stop('msg_invalid_request');
+            // Test logs for finding password by user_id and authkey
+            $args->member_srl = $member_srl;
+            $args->auth_key = $auth_key;
+            $output = executeQuery('member.getAuthMail', $args);
+            if(!$output->toBool() || $output->data->auth_key != $auth_key) return $this->stop('msg_invalid_auth_key');
+            // If credentials are correct, change the password to a new one
+            if ($output->data->is_register == 'Y') {
+                $args->password = $output->data->new_password;
+                $args->denied = 'N';
+            } else {
+                $args->password = md5($output->data->new_password);
+                unset($args->denied);
+            }
+            // Back up the value of $Output->data->is_register
+            $is_register = $output->data->is_register;
+
+            $output = executeQuery('member.updateMemberPassword', $args);
+            if(!$output->toBool()) return $this->stop($output->getMessage());
+            // Remove all values having the member_srl from authentication table
+            executeQuery('member.deleteAuthMail',$args);
+            // Notify the result
+            Context::set('is_register', $is_register);
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('msg_success_authed');
+        }
+
+        /**
+         * @brief Execute finding ID/Passoword
+         * When clicking the link in the verification email, a method is called to change the old password and to authenticate it
+         **/
+        function procMemberUpdateAuthMail() {
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl) return new Object(-1, 'msg_invalid_request');
+
+            $oMemberModel = &getModel('member');
+            // Get information of the member
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+            // Check if the member is set to allow a request to re-send an authentication mail
+            if ($member_info->denied != 'Y')
+                return new Object(-1, 'msg_invalid_request');
+
+            $chk_args->member_srl = $member_srl;
+            $output = executeQuery('member.chkAuthMail', $chk_args);
+            if ($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
+            // Insert data into the authentication DB
+            $auth_args->member_srl = $member_srl;
+            $auth_args->auth_key = md5(rand(0, 999999));
+
+            $output = executeQuery('member.updateAuthMail', $auth_args);
+            if (!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Get content of the email to send a member
+            Context::set('auth_args', $auth_args);
+            Context::set('member_info', $member_info);
+
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            if(!$member_config->skin) $member_config->skin = "default";
+            if(!$member_config->colorset) $member_config->colorset = "white";
+
+            Context::set('member_config', $member_config);
+
+            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+
+            $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$member_info->member_srl, 'auth_key',$auth_args->auth_key);
+            Context::set('auth_url', $auth_url);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
+            // Get information of the Webmaster
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            // Send a mail
+            $oMail = new Mail();
+            $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+            $oMail->setContent($content);
+            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
+            $oMail->setReceiptor( $member_info->user_name, $member_info->email_address );
+            $oMail->send();
+            // Return message
+            $msg = sprintf(Context::getLang('msg_auth_mail_sent'), $member_info->email_address);
+            return new Object(-1, $msg);
+        }
+
+        /**
+         * @brief Request to re-send the authentication mail
+         **/
+        function procMemberResendAuthMail() {
+            // Get an email_address
+            $email_address = Context::get('email_address');
+            if(!$email_address) return $this->stop('msg_invalid_request');
+            // Log test by using email_address
+            $oMemberModel = &getModel('member');
+
+            $args->email_address = $email_address;
+            $memberSrl = $oMemberModel->getMemberSrlByEmailAddress($email_address);
+            if(!$memberSrl) return $this->stop('msg_not_exists_member');
+
+			$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address');
+            $memberInfo = $oMemberModel->getMemberInfoByMemberSrl($memberSrl, 0, $columnList);
+
+            // Check if a authentication mail has been sent previously
+            $chk_args->member_srl = $memberInfo->member_srl;
+            $output = executeQuery('member.chkAuthMail', $chk_args);
+            if($output->toBool() && $output->data->count == '0') return new Object(-1, 'msg_invalid_request');
+
+            $auth_args->member_srl = $memberInfo->member_srl;
+            $output = executeQueryArray('member.getAuthMailInfo', $auth_args);
+            if(!$output->data || !$output->data[0]->auth_key)  return new Object(-1, 'msg_invalid_request');
+            $auth_info = $output->data[0];
+            // Get content of the email to send a member
+            Context::set('member_info', $memberInfo);
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            if(!$member_config->skin) $member_config->skin = "default";
+            if(!$member_config->colorset) $member_config->colorset = "white";
+
+            Context::set('member_config', $member_config);
+
+            $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+
+            $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$memberInfo->member_srl, 'auth_key',$auth_info->auth_key);
+            Context::set('auth_url', $auth_url);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
+            // Get information of the Webmaster
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+            // Send a mail
+            $oMail = new Mail();
+            $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+            $oMail->setContent($content);
+            $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
+            $oMail->setReceiptor( $args->user_name, $args->email_address );
+            $oMail->send();
+
+            $msg = sprintf(Context::getLang('msg_confirm_mail_sent'), $args->email_address);
+            $this->setMessage($msg);
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'mid', Context::get('mid'), 'act', '');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Join a virtual site
+         **/
+        function procMemberSiteSignUp() {
+            $site_module_info = Context::get('site_module_info');
+            $logged_info = Context::get('logged_info');
+            if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+
+            $oMemberModel = &getModel('member');
+			$columnList = array('site_srl', 'group_srl', 'title');
+            $default_group = $oMemberModel->getDefaultGroup($site_module_info->site_srl, $columnList);
+            $this->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, $site_module_info->site_srl);
+            $groups[$default_group->group_srl] = $default_group->title;
+            $logged_info->group_list = $groups;
+        }
+
+        /**
+         * @brief Leave the virtual site
+         **/
+        function procMemberSiteLeave() {
+            $site_module_info = Context::get('site_module_info');
+            $logged_info = Context::get('logged_info');
+            if(!$site_module_info->site_srl || !Context::get('is_logged') || count($logged_info->group_srl_list) ) return new Object(-1,'msg_invalid_request');
+
+            $args->site_srl= $site_module_info->site_srl;
+            $args->member_srl = $logged_info->member_srl;
+            $output = executeQuery('member.deleteMembersGroup', $args);
+            if(!$output->toBool()) return $output;
+            $this->setMessage('success_deleted');
+        }
+
+        /**
+         * @brief Save the member configurations
+         **/
+        function setMemberConfig($args) {
+            if(!$args->skin) $args->skin = "default";
+            if(!$args->colorset) $args->colorset = "white";
+            if(!$args->editor_skin) $args->editor_skin= "xpresseditor";
+            if(!$args->editor_colorset) $args->editor_colorset = "white";
+            if($args->enable_join!='Y') $args->enable_join = 'N';
+            if($args->enable_openid!='Y') $args->enable_openid= 'N';
+            if($args->profile_image !='Y') $args->profile_image = 'N';
+            if($args->image_name!='Y') $args->image_name = 'N';
+            if($args->image_mark!='Y') $args->image_mark = 'N';
+            if($args->group_image_mark!='Y') $args->group_image_mark = 'N';
+            if(!trim(strip_tags($args->agreement))) $args->agreement = null;
+            $args->limit_day = (int)$args->limit_day;
+
+            $agreement = trim($args->agreement);
+            unset($args->agreement);
+
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('member',$args);
+            if(!$output->toBool()) return $output;
+
+            $agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
+            FileHandler::writeFile($agreement_file, $agreement);
+
+            return new Object();
+        }
+
+        /**
+         * @brief Save the signature as a file
+         **/
+        function putSignature($member_srl, $signature) {
+            $signature = trim(removeHackTag($signature));
+            $signature = preg_replace('/<(\/?)(embed|object|param)/is', '&lt;$1$2', $signature);
+
+            $check_signature = trim(str_replace(array('&nbsp;',"\n","\r"),'',strip_tags($signature,'<img><object>')));
+            $path = sprintf('files/member_extra_info/signature/%s/', getNumberingPath($member_srl));
+            $filename = sprintf('%s%d.signature.php', $path, $member_srl);
+
+            if(!$check_signature) return FileHandler::removeFile($filename);
+
+            $buff = sprintf('<?php if(!defined("__ZBXE__")) exit();?>%s', $signature);
+            FileHandler::makeDir($path);
+            FileHandler::writeFile($filename, $buff);
+        }
+
+        /**
+         * @brief Delete the signature file
+         **/
+        function delSignature($member_srl) {
+            $filename = sprintf('files/member_extra_info/signature/%s%d.gif', getNumberingPath($member_srl), $member_srl);
+            FileHandler::removeFile($filename);
+        }
+
+        /**
+         * @brief Add group_srl to member_srl
+         **/
+        function addMemberToGroup($member_srl,$group_srl,$site_srl=0) {
+            $args->member_srl = $member_srl;
+            $args->group_srl = $group_srl;
+            if($site_srl) $args->site_srl = $site_srl;
+
+            $oModel =& getModel('member');
+            $groups = $oModel->getMemberGroups($member_srl, $site_srl, true);
+            if($groups[$group_srl]) return new Object();
+
+            // Add
+            $output = executeQuery('member.addMemberToGroup',$args);
+            $output2 = ModuleHandler::triggerCall('member.addMemberToGroup', 'after', $args);
+
+            return $output;
+        }
+
+        /**
+         * @brief Change a group of certain members
+         * Available only when a member has a single group
+         **/
+        function replaceMemberGroup($args) {
+            $obj->site_srl = $args->site_srl;
+            $obj->member_srl = implode(',',$args->member_srl);
+
+            $output = executeQueryArray('member.getMembersGroup', $obj);
+            if($output->data) foreach($output->data as $key => $val) $date[$val->member_srl] = $val->regdate;
+
+            $output = executeQuery('member.deleteMembersGroup', $obj);
+            if(!$output->toBool()) return $output;
+
+            $inserted_members = array();
+            foreach($args->member_srl as $key => $val) {
+                if($inserted_members[$val]) continue;
+                $inserted_members[$val] = true;
+
+                unset($obj);
+                $obj->member_srl = $val;
+                $obj->group_srl = $args->group_srl;
+                $obj->site_srl = $args->site_srl;
+                $obj->regdate = $date[$obj->member_srl];
+                $output = executeQuery('member.addMemberToGroup', $obj);
+                if(!$output->toBool()) return $output;
+            }
+            return new Object();
+        }
+
+
+        /**
+         * @brief Auto-login
+         **/
+        function doAutologin() {
+            // Get a key value of auto log-in
+            $args->autologin_key = $_COOKIE['xeak'];
+            // Get information of the key
+            $output = executeQuery('member.getAutologin', $args);
+            // If no information exists, delete a cookie
+            if(!$output->toBool() || !$output->data) {
+                setCookie('xeak',null,time()+60*60*24*365, '/');
+                return;
+            }
+
+            $user_id = $output->data->user_id;
+            $password = $output->data->password;
+            if(!$user_id || !$password) {
+                setCookie('xeak',null,time()+60*60*24*365, '/');
+                return;
+            }
+
+            $do_auto_login = false;
+
+            // Compare key values based on the information
+            $key = md5($user_id.$password.$_SERVER['REMOTE_ADDR']);
+
+            if($key == $args->autologin_key) {
+
+                // Check change_password_date
+                $oModuleModel = &getModel('module');
+                $member_config = $oModuleModel->getModuleConfig('member');
+                $limit_date = $member_config->change_password_date;
+
+                // Check if change_password_date is set
+                if($limit_date > 0) {
+                    $oMemberModel = &getModel('member');
+					$columnList = array('member_srl', 'change_password_date');
+                    $member_info = $oMemberModel->getMemberInfoByUserID($user_id, $columnList);
+
+                    if($member_info->change_password_date >= date('YmdHis', strtotime('-'.$limit_date.' day')) ){
+                        $do_auto_login = true;
+                    }
+
+                } else {
+                    $do_auto_login = true;
+                }
+            }
+
+
+            if($do_auto_login) {
+                $output = $this->doLogin($user_id);
+            } else {
+                executeQuery('member.deleteAutologin', $args);
+                setCookie('xeak',null,time()+60*60*24*365, '/');
+            }
+        }
+
+        /**
+         * @brief Log-in
+         **/
+        function doLogin($user_id, $password = '', $keep_signed = false) {
+            $user_id = strtolower($user_id);
+            // Call a trigger before log-in (before)
+            $trigger_obj->user_id = $user_id;
+            $trigger_obj->password = $password;
+            $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'before', $trigger_obj);
+            if(!$trigger_output->toBool()) return $trigger_output;
+            // Create a member model object
+            $oMemberModel = &getModel('member');
+
+	    // check identifier
+	    $config = $oMemberModel->getMemberConfig();
+	    if ($config->identifier == 'email_address'){
+		    // Get user_id information
+		    $this->memberInfo = $oMemberModel->getMemberInfoByEmailAddress($user_id);
+		    // Set an invalid user if no value returned
+		    if(!$user_id || strtolower($this->memberInfo->email_address) != strtolower($user_id)) return new Object(-1, 'invalid_email_address');
+
+	    }else{
+		    // Get user_id information
+		    $this->memberInfo = $oMemberModel->getMemberInfoByUserID($user_id);
+		    // Set an invalid user if no value returned
+		    if(!$user_id || strtolower($this->memberInfo->user_id) != strtolower($user_id)) return new Object(-1, 'invalid_user_id');
+	    }
+            // Password Check
+            if($password && !$oMemberModel->isValidPassword($this->memberInfo->password, $password)) return new Object(-1, 'invalid_password');
+            // If denied == 'Y', notify
+            if($this->memberInfo->denied == 'Y') {
+                $args->member_srl = $this->memberInfo->member_srl;
+                $output = executeQuery('member.chkAuthMail', $args);
+                if ($output->toBool() && $output->data->count != '0') return new Object(-1,'msg_user_not_confirmed');
+                return new Object(-1,'msg_user_denied');
+            }
+            // Notify if denied_date is less than the current time
+            if($this->memberInfo->limit_date && substr($this->memberInfo->limit_date,0,8) >= date("Ymd")) return new Object(-1,sprintf(Context::getLang('msg_user_limited'),zdate($this->memberInfo->limit_date,"Y-m-d")));
+            // Update the latest login time
+            $args->member_srl = $this->memberInfo->member_srl;
+            $output = executeQuery('member.updateLastLogin', $args);
+            // Call a trigger after successfully log-in (after)
+            $trigger_output = ModuleHandler::triggerCall('member.doLogin', 'after', $this->memberInfo);
+            if(!$trigger_output->toBool()) return $trigger_output;
+            // When user checked to use auto-login
+            if($keep_signed) {
+                // Key generate for auto login
+                $autologin_args->autologin_key = md5(strtolower($user_id).$this->memberInfo->password.$_SERVER['REMOTE_ADDR']);
+                $autologin_args->member_srl = $this->memberInfo->member_srl;
+                executeQuery('member.deleteAutologin', $autologin_args);
+                $autologin_output = executeQuery('member.insertAutologin', $autologin_args);
+                if($autologin_output->toBool()) setCookie('xeak',$autologin_args->autologin_key, time()+60*60*24*365, '/');
+            }
+			if($this->memberInfo->is_admin == 'Y') {
+				 $oMemberAdminModel = &getAdminModel('member');
+				if(!$oMemberAdminModel->getMemberAdminIPCheck()) {
+		            $_SESSION['denied_admin'] = 'Y';
+				}
+			}
+
+            $this->setSessionInfo();
+
+            return $output;
+        }
+
+        /**
+         * @brief Update or create session information
+         **/
+        function setSessionInfo() {
+            $oMemberModel = &getModel('member');
+            // If your information came through the current session information to extract information from the users
+            if(!$this->memberInfo && $_SESSION['member_srl'] && $oMemberModel->isLogged() ) {
+                $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($_SESSION['member_srl']);
+                // If you do not destroy the session Profile
+                if($this->memberInfo->member_srl != $_SESSION['member_srl']) {
+                    $this->destroySessionInfo();
+                    return;
+                }
+            }
+            // Stop using the session id is destroyed
+            if($this->memberInfo->denied=='Y') {
+                $this->destroySessionInfo();
+                return;
+            }
+            // OpenID is a check (only for a determined identity types)
+            if(preg_match("/^([_0-9a-zA-Z]+)$/is", $this->memberInfo->user_id)) $this->memberInfo->is_openid = false;
+            else $this->memberInfo->is_openid = true;
+            // Log in for treatment sessions set
+            $_SESSION['is_logged'] = true;
+            $_SESSION['ipaddress'] = $_SERVER['REMOTE_ADDR'];
+            $_SESSION['member_srl'] = $this->memberInfo->member_srl;
+			$_SESSION['is_admin'] = '';
+			// Do not save your password in the session jiwojum;;
+            //unset($this->memberInfo->password);
+            // User Group Settings
+            /*
+            if($this->memberInfo->group_list) {
+                $group_srl_list = array_keys($this->memberInfo->group_list);
+                $_SESSION['group_srls'] = $group_srl_list;
+                // If the group is designated as an administrator administrator
+                $oMemberModel = &getModel('member');
+                $admin_group = $oMemberModel->getAdminGroup();
+                if($admin_group->group_srl && in_array($admin_group->group_srl, $group_srl_list)) $_SESSION['is_admin'] = 'Y';
+            }
+            */
+            // Information stored in the session login user
+            Context::set('is_logged', true);
+            Context::set('logged_info', $this->memberInfo);
+
+            // Only the menu configuration of the user (such as an add-on to the menu can be changed)
+            $this->addMemberMenu( 'dispMemberInfo', 'cmd_view_member_info');
+            $this->addMemberMenu( 'dispMemberScrappedDocument', 'cmd_view_scrapped_document');
+            $this->addMemberMenu( 'dispMemberSavedDocument', 'cmd_view_saved_document');
+            $this->addMemberMenu( 'dispMemberOwnDocument', 'cmd_view_own_document');
+        }
+
+        /**
+         * @brief Logged method for providing a personalized menu
+         * Login information is used in the output widget, or personalized page
+         **/
+        function addMemberMenu($act, $str) {
+            $logged_info = Context::get('logged_info');
+
+            $logged_info->menu_list[$act] = Context::getLang($str);
+
+            Context::set('logged_info', $logged_info);
+        }
+
+        /**
+         * @brief Nickname and click Log In to add a pop-up menu that appears when the method
+         **/
+        function addMemberPopupMenu($url, $str, $icon = '', $target = 'self') {
+            $member_popup_menu_list = Context::get('member_popup_menu_list');
+            if(!is_array($member_popup_menu_list)) $member_popup_menu_list = array();
+
+            $obj->url = $url;
+            $obj->str = $str;
+            $obj->icon = $icon;
+            $obj->target = $target;
+            $member_popup_menu_list[] = $obj;
+
+            Context::set('member_popup_menu_list', $member_popup_menu_list);
+        }
+
+        /**
+         * @brief Add users to the member table
+         **/
+        function insertMember(&$args, $password_is_hashed = false) {
+            // Call a trigger (before)
+            $output = ModuleHandler::triggerCall('member.insertMember', 'before', $args);
+            if(!$output->toBool()) return $output;
+            // Terms and Conditions portion of the information set up by members reaffirmed
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+
+            $logged_info = Context::get('logged_info');
+            // If the date of the temporary restrictions limit further information on the date of
+            if($config->limit_day) $args->limit_date = date("YmdHis", time()+$config->limit_day*60*60*24);
+
+            $args->member_srl = getNextSequence();
+            // Enter the user's identity changed to lowercase
+			if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
+			else $args->user_id = strtolower($args->user_id);
+            // Control of essential parameters
+            if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
+            if($args->denied!='Y') $args->denied = 'N';
+            $args->allow_message= 'Y';
+
+            if($logged_info->is_admin == 'Y') {
+                if($args->is_admin!='Y') $args->is_admin = 'N';
+            } else {
+                unset($args->is_admin);
+            }
+
+            list($args->email_id, $args->email_host) = explode('@', $args->email_address);
+            // Website, blog, checks the address
+            if($args->homepage && !preg_match("/^[a-z]+:\/\//i",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
+            if($args->blog && !preg_match("/^[a-z]+:\/\//i",$args->blog)) $args->blog = 'http://'.$args->blog;
+            // Create a model object
+            $oMemberModel = &getModel('member');
+            // ID check is prohibited
+            if($oMemberModel->isDeniedID($args->user_id)) return new Object(-1,'denied_user_id');
+            // ID, nickname, email address of the redundancy check
+            $member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
+            if($member_srl) return new Object(-1,'msg_exists_user_id');
+
+            $member_srl = $oMemberModel->getMemberSrlByNickName($args->nick_name);
+            if($member_srl) return new Object(-1,'msg_exists_nick_name');
+
+            $member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
+            if($member_srl) return new Object(-1,'msg_exists_email_address');
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Insert data into the DB
+            $args->list_order = -1 * $args->member_srl;
+			$args->nick_name = htmlspecialchars($args->nick_name);
+			$args->homepage = htmlspecialchars($args->homepage);
+			$args->blog = htmlspecialchars($args->blog);
+
+			$args->nick_name = htmlspecialchars($args->nick_name);
+			$args->homepage = htmlspecialchars($args->homepage);
+			$args->blog = htmlspecialchars($args->blog);
+            if($args->password && !$password_is_hashed) $args->password = md5($args->password);
+            elseif(!$args->password) unset($args->password);
+
+			if (!$args->user_id) $args->user_id = 't'.$args->member_srl;
+			if (!$args->user_name) $args->user_name = $args->member_srl;
+
+            $output = executeQuery('member.insertMember', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+			if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+			else $group_srl_list = explode('|@|', $args->group_srl_list);
+            // If no value is entered the default group, the value of group registration
+            if(!$args->group_srl_list) {
+				$columnList = array('site_srl', 'group_srl');
+                $default_group = $oMemberModel->getDefaultGroup(0, $columnList);
+                // Add to the default group
+                $output = $this->addMemberToGroup($args->member_srl,$default_group->group_srl);
+                if(!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+            // If the value is the value of the group entered the group registration
+            } else {
+                for($i=0;$i<count($group_srl_list);$i++) {
+                    $output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
+
+                    if(!$output->toBool()) {
+                        $oDB->rollback();
+                        return $output;
+                    }
+                }
+            }
+
+			$member_config = $oModuleModel->getModuleConfig('member');
+            // When using email authentication mode (when you subscribed members denied a) certified mail sent
+            if ($args->denied == 'Y') {
+                // Insert data into the authentication DB
+                $auth_args->user_id = $args->user_id;
+                $auth_args->member_srl = $args->member_srl;
+                $auth_args->new_password = $args->password;
+                $auth_args->auth_key = md5(rand(0, 999999));
+                $auth_args->is_register = 'Y';
+
+                $output = executeQuery('member.insertAuthMail', $auth_args);
+                if (!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+                // Get content of the email to send a member
+                Context::set('auth_args', $auth_args);
+
+				global $lang;
+				if (is_array($member_config->signupForm)){
+					$exceptForm=array('password', 'find_account_question');
+					foreach($member_config->signupForm as $form){
+						if(!in_array($form->name, $exceptForm) && $form->isDefaultForm && ($form->required || $form->mustRequired)){
+							$memberInfo[$lang->{$form->name}] = $args->{$form->name};
+						}
+					}
+				}else{
+					$memberInfo[$lang->user_id] = $args->user_id;
+					$memberInfo[$lang->user_name] = $args->user_name;
+					$memberInfo[$lang->nick_name] = $args->nick_name;
+					$memberInfo[$lang->email_address] = $args->email_address;
+				}
+                Context::set('memberInfo', $memberInfo);
+
+                if(!$member_config->skin) $member_config->skin = "default";
+                if(!$member_config->colorset) $member_config->colorset = "white";
+
+                Context::set('member_config', $member_config);
+
+                $tpl_path = sprintf('%sskins/%s', $this->module_path, $member_config->skin);
+                if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+
+                $auth_url = getFullUrl('','module','member','act','procMemberAuthAccount','member_srl',$args->member_srl, 'auth_key',$auth_args->auth_key);
+                Context::set('auth_url', $auth_url);
+
+                $oTemplate = &TemplateHandler::getInstance();
+                $content = $oTemplate->compile($tpl_path, 'confirm_member_account_mail');
+                // Get information of the Webmaster
+                $oModuleModel = &getModel('module');
+                $member_config = $oModuleModel->getModuleConfig('member');
+                // Send a mail
+                $oMail = new Mail();
+                $oMail->setTitle( Context::getLang('msg_confirm_account_title') );
+                $oMail->setContent($content);
+                $oMail->setSender( $member_config->webmaster_name?$member_config->webmaster_name:'webmaster', $member_config->webmaster_email);
+                $oMail->setReceiptor( $args->user_name, $args->email_address );
+                $oMail->send();
+            }
+            // Call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('member.insertMember', 'after', $args);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            $oDB->commit(true);
+
+            $output->add('member_srl', $args->member_srl);
+            return $output;
+        }
+
+        /**
+         * @brief Modify member information
+         **/
+        function updateMember($args) {
+            // Call a trigger (before)
+            $output = ModuleHandler::triggerCall('member.updateMember', 'before', $args);
+            if(!$output->toBool()) return $output;
+            // Create a model object
+            $oMemberModel = &getModel('member');
+
+            $logged_info = Context::get('logged_info');
+            // Get what you want to modify the original information
+			if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+            // Control of essential parameters
+            if($args->allow_mailing!='Y') $args->allow_mailing = 'N';
+            if($args->allow_message && !in_array($args->allow_message, array('Y','N','F'))) $args->allow_message = 'Y';
+
+            if($logged_info->is_admin == 'Y') {
+                if($args->denied!='Y') $args->denied = 'N';
+                if($args->is_admin!='Y' && $logged_info->member_srl != $args->member_srl) $args->is_admin = 'N';
+            } else {
+                unset($args->is_admin);
+                unset($args->denied);
+            }
+
+			// check mamber identifier form
+			$config = $oMemberModel->getMemberConfig();
+
+			$output = executeQuery('member.getMemberInfoByMemberSrl', $args);
+			$orgMemberInfo = $output->data;
+
+			if ($config->identifier == 'email_address'){
+				$member_srl = $oMemberModel->getMemberSrlByEmailAddress($args->email_address);
+				if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address');
+
+				$args->email_address = $orgMemberInfo->email_address;
+			}else{
+				$member_srl = $oMemberModel->getMemberSrlByUserID($args->user_id);
+				if($member_srl&&$args->member_srl!=$member_srl) return new Object(-1,'msg_exists_email_address');
+
+				$args->user_id = $orgMemberInfo->user_id;
+			}
+
+			list($args->email_id, $args->email_host) = explode('@', $args->email_address);
+            // Website, blog, checks the address
+            if($args->homepage && !preg_match("/^[a-z]+:\/\//is",$args->homepage)) $args->homepage = 'http://'.$args->homepage;
+            if($args->blog && !preg_match("/^[a-z]+:\/\//is",$args->blog)) $args->blog = 'http://'.$args->blog;
+
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // DB in the update
+
+            if($args->password) $args->password = md5($args->password);
+            else $args->password = $orgMemberInfo->password;
+			if(!$args->user_name) $args->user_name = $orgMemberInfo->user_name;
+			if(!$args->user_id) $args->user_id = $orgMemberInfo->user_id;
+			if(!$args->nick_name) $args->nick_name = $orgMemberInfo->nick_name;
+			$args->nick_name = htmlspecialchars($args->nick_name);
+			$args->homepage = htmlspecialchars($args->homepage);
+			$args->blog = htmlspecialchars($args->blog);
+
+			if(!$args->description) $args->description = '';
+
+            $output = executeQuery('member.updateMember', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+			if ($args->group_srl_list){
+				if(is_array($args->group_srl_list)) $group_srl_list = $args->group_srl_list;
+				else $group_srl_list = explode('|@|', $args->group_srl_list);
+				// If the group information, group information changes
+				if(count($group_srl_list) > 0) {
+					$args->site_srl = 0;
+					// One of its members to delete all the group
+					$output = executeQuery('member.deleteMemberGroupMember', $args);
+					if(!$output->toBool()) {
+						$oDB->rollback();
+						return $output;
+					}
+					// Enter one of the loop a
+					for($i=0;$i<count($group_srl_list);$i++) {
+						$output = $this->addMemberToGroup($args->member_srl,$group_srl_list[$i]);
+						if(!$output->toBool()) {
+							$oDB->rollback();
+							return $output;
+						}
+					}
+
+					// if group is changed, point changed too.
+					$this->_updatePointByGroup($orgMemberInfo->member_srl, $group_srl_list);
+				}
+			}
+            // Call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('member.updateMember', 'after', $args);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            $oDB->commit();
+            // Save Session
+            if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($args->member_srl);
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+            	$cache_key = 'object:'.$args->member_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+            $logged_info = Context::get('logged_info');
+
+            $output->add('member_srl', $args->member_srl);
+            return $output;
+        }
+
+        /**
+         * @brief Modify member password
+         **/
+        function updateMemberPassword($args) {
+            $output = executeQuery('member.updateChangePasswordDate', $args);
+			//remove from cache
+       		$oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+            	$cache_key = 'object:'.$args->member_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+            $args->password = md5($args->password);
+            return executeQuery('member.updateMemberPassword', $args);
+        }
+
+        /**
+         * @brief Delete User
+         **/
+        function deleteMember($member_srl) {
+            // Call a trigger (before)
+            $trigger_obj->member_srl = $member_srl;
+            $output = ModuleHandler::triggerCall('member.deleteMember', 'before', $trigger_obj);
+            if(!$output->toBool()) return $output;
+            // Create a model object
+            $oMemberModel = &getModel('member');
+            // Bringing the user's information
+            if(!$this->memberInfo) {
+				$columnList = array('member_srl', 'is_admin');
+				$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+			}
+            if(!$this->memberInfo) return new Object(-1, 'msg_not_exists_member');
+            // If managers can not be deleted
+            if($this->memberInfo->is_admin == 'Y') return new Object(-1, 'msg_cannot_delete_admin');
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $args->member_srl = $member_srl;
+            // Delete the entries in member_auth_mail
+            $output = executeQuery('member.deleteAuthMail', $args);
+            if (!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Delete the entries in member_openid
+            $output = executeQuery('member.deleteMemberOpenIDByMemberSrl', $ags);
+            // TODO: If the table is not an upgrade may fail.
+            /*
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            */
+            // Delete the entries in member_group_member
+            $output = executeQuery('member.deleteMemberGroupMember', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // member removed from the table
+            $output = executeQuery('member.deleteMember', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('member.deleteMember', 'after', $trigger_obj);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            $oDB->commit();
+            // Name, image, image, mark, sign, delete
+            $this->procMemberDeleteImageName();
+            $this->procMemberDeleteImageMark();
+            $this->delSignature($member_srl);
+
+            return $output;
+        }
+
+        /**
+         * @brief Destroy all session information
+         **/
+        function destroySessionInfo() {
+            if(!$_SESSION || !is_array($_SESSION)) return;
+            foreach($_SESSION as $key => $val) {
+                $_SESSION[$key] = '';
+            }
+            session_destroy();
+            setcookie(session_name(), '', time()-42000, '/');
+            setcookie('sso','',time()-42000, '/');
+
+            if($_COOKIE['xeak']) {
+                $args->autologin_key = $_COOKIE['xeak'];
+                executeQuery('member.deleteAutologin', $args);
+            }
+        }
+
+		function _updatePointByGroup($memberSrl, $groupSrlList)
+		{
+			$oModuleModel = &getModel('module');
+			$pointModuleConfig = $oModuleModel->getModuleConfig('point');
+			$pointGroup = $pointModuleConfig->point_group;
+
+			if(is_array($pointGroup) && count($pointGroup)>0)
+			{
+				$levelGroup = array_flip($pointGroup);
+				ksort($levelGroup);
+			}
+			$maxLevel = 0;
+			$resultGroup = array_intersect($levelGroup, $groupSrlList);
+			if(count($resultGroup) > 0)
+				$maxLevel = max(array_flip($resultGroup));
+
+			if($maxLevel > 0)
+			{
+				$oPointModel = &getModel('point');
+				$originPoint = $oPointModel->getPoint($memberSrl);
+
+				if($pointModuleConfig->level_step[$maxLevel] > $originPoint)
+				{
+					$oPointController = &getController('point');
+					$oPointController->setPoint($memberSrl, $pointModuleConfig->level_step[$maxLevel], 'update');
+				}
+			}
+		}
+    }
+?>
diff --git a/modules/member/member.mobile.php b/modules/member/member.mobile.php
index 990179938..4950b0035 100644
--- a/modules/member/member.mobile.php
+++ b/modules/member/member.mobile.php
@@ -2,10 +2,21 @@
 
 class memberMobile extends member
 {
+	var $memberInfo;
+
     function init() {
-        // 회원 관리 정보를 받음
+        // Get the member configuration
         $oModuleModel = &getModel('module');
         $this->member_config = $oModuleModel->getModuleConfig('member');
+
+		// if member_srl exists, set memberInfo
+		$member_srl = Context::get('member_srl');
+		if($member_srl) {
+			$oMemberModel = &getModel('member');
+			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+			if(!$this->memberInfo) Context::set('member_srl','');
+			else Context::set('member_info',$this->memberInfo);
+		}
         
         Context::set('member_config', $this->member_config);
 
@@ -20,7 +31,7 @@ class memberMobile extends member
             return;
         }
 
-        // 템플릿 파일 지정
+        // Set a template file
 
         Context::set('referer_url', $_SERVER['HTTP_REFERER']);
         $this->setTemplateFile('login_form');
@@ -35,11 +46,19 @@ class memberMobile extends member
         if(!$trigger_output->toBool()) return $trigger_output;
 
         if ($this->member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
-        Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
+		$oMemberAdminView = &getAdminView('member');
+		$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
+		Context::set('formTags', $formTags);
 
-        $member_config = $oMemberModel->getMemberConfig();
-        Context::set('member_config', $member_config);
+		$member_config = $oMemberModel->getMemberConfig();
+		Context::set('member_config', $member_config);
 
+		global $lang;
+		$identifierForm->title = $lang->{$member_config->identifier};
+		$identifierForm->name = $member_config->identifier;
+		$identifierForm->value = $member_info->{$member_config->identifier};
+		Context::set('identifierForm', $identifierForm);
+		// Set a template file
         $this->setTemplateFile('signup_form');
     }
 
@@ -47,7 +66,7 @@ class memberMobile extends member
         $oMemberModel = &getModel('member');
         $logged_info = Context::get('logged_info');
 
-        // 비회원일 경우 정보 열람 중지
+        // Don't display member info to non-logged user
         if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
         $member_srl = Context::get('member_srl');
         if(!$member_srl && Context::get('is_logged')) {
@@ -57,46 +76,50 @@ class memberMobile extends member
         }
             
         $site_module_info = Context::get('site_module_info');
-        $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl);
-        unset($member_info->password);
-        unset($member_info->email_id);
-        unset($member_info->email_host);
-        unset($member_info->email_address);
+		if(!$this->memberInfo)
+		{
+			$columnList = array('user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login');
+	        $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList);
+		}
+        unset($this->memberInfo->password);
+        unset($this->memberInfo->email_id);
+        unset($this->memberInfo->email_host);
+        unset($this->memberInfo->email_address);
                 
-        if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
+        if(!$this->memberInfo->member_srl) return $this->dispMemberSignUpForm();
                 
-        Context::set('member_info', $member_info);
-        Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
-        if ($member_info->member_srl == $logged_info->member_srl)
+        Context::set('member_info', $this->memberInfo);
+        Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
+        if ($this->memberInfo->member_srl == $logged_info->member_srl)
             Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
         $this->setTemplateFile('member_info_mobile');
     }
 
     /**
-     * @brief 회원 정보 수정
+     * @brief Edit member profile
      **/
     function dispMemberModifyInfo() {
         $oMemberModel = &getModel('member');
         $oModuleModel = &getModel('module');
         $memberModuleConfig = $oModuleModel->getModuleConfig('member');
 
-        // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
+        // A message appears if the user is not logged-in
         if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
         $logged_info = Context::get('logged_info');
         $member_srl = $logged_info->member_srl;
 
-        $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-        $member_info->signature = $oMemberModel->getSignature($member_srl);
-        Context::set('member_info',$member_info);
+		if(!$this->memberInfo) $this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+        $this->memberInfo->signature = $oMemberModel->getSignature($member_srl);
+        Context::set('member_info',$this->memberInfo);
 
-        // 추가 가입폼 목록을 받음
-        Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
+        // Receive a member join form
+        Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($this->memberInfo));
 
         Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
 
-        // 에디터 모듈의 getEditor를 호출하여 서명용으로 세팅
-        if($member_info->member_srl) {
+        // Call getEditor of the editor module and set it for signiture
+        if($this->memberInfo->member_srl) {
             $oEditorModel = &getModel('editor');
             $option->primary_key_name = 'member_srl';
             $option->content_key_name = 'signature';
@@ -109,49 +132,55 @@ class memberMobile extends member
             $option->height = 200;
             $option->skin = $this->member_config->editor_skin;
             $option->colorset = $this->member_config->editor_colorset;
-            $editor = $oEditorModel->getEditor($member_info->member_srl, $option);
+            $editor = $oEditorModel->getEditor($this->memberInfo->member_srl, $option);
             Context::set('editor', $editor);
         }
 
-        // 템플릿 파일 지정
+        // Set a template file
         $this->setTemplateFile('modify_info');
     }
 
     /**
-     * @brief 회원 비밀번호 수정
+     * @brief Change the user password
      **/
     function dispMemberModifyPassword() {
         $oMemberModel = &getModel('member');
 
-        // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
+        // A message appears if the user is not logged-in
         if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
         $logged_info = Context::get('logged_info');
         $member_srl = $logged_info->member_srl;
 
-        $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-        Context::set('member_info',$member_info);
+		if(!$this->memberInfo) {
+			$columnList = array('member_srl', 'user_id');
+			$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+		}
+        Context::set('member_info',$this->memberInfo);
 
-        // 템플릿 파일 지정
+        // Set a template file
         $this->setTemplateFile('modify_password');
     }
 
     /**
-     * @brief 탈퇴 화면
+     * @brief Member withdrawl
      **/
     function dispMemberLeave() {
         $oMemberModel = &getModel('member');
 
-        // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
+        // A message appears if the user is not logged-in
         if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
 
         $logged_info = Context::get('logged_info');
         $member_srl = $logged_info->member_srl;
 
-        $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-        Context::set('member_info',$member_info);
+		if(!$this->memberInfo) {
+			$columnList = array('member_srl', 'user_id');
+        	$this->memberInfo = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+		}
+        Context::set('member_info',$this->memberInfo);
 
-        // 템플릿 파일 지정
+        // Set a template file
         $this->setTemplateFile('leave_form');
     }
 }
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 91f34347f..66f372a68 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -1,723 +1,766 @@
-<?php
-    /**
-     * @class  memberModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module의 Model class
-     **/
-
-    class memberModel extends member {
-
-        /**
-         * @brief 자주 호출될거라 예상되는 데이터는 내부적으로 가지고 있자...
-         **/
-        var $join_form_list = NULL;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 회원 설정 정보를 return
-         **/
-        function getMemberConfig() {
-            // DB에 저장되는 회원 설정 정보 구함
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            // 회원가입 약관 구함
-            $agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
-            if(file_exists($agreement_file)) $config->agreement = FileHandler::readFile($agreement_file);
-
-            if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
-            if(!$config->image_name_max_width) $config->image_name_max_width = 90;
-            if(!$config->image_name_max_height) $config->image_name_max_height = 20;
-            if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
-            if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
-            if(!$config->profile_image_max_width) $config->profile_image_max_width = 80;
-            if(!$config->profile_image_max_height) $config->profile_image_max_height = 80;
-            if(!$config->skin) $config->skin = "default";
-            if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = "xpresseditor";
-            if(!$config->group_image_mark) $config->group_image_mark = "N";
-
-            return $config;
-        }
-
-        /**
-         * @brief 선택된 회원의 간단한 메뉴를 표시
-         **/
-        function getMemberMenu() {
-            // 요청된 회원 번호와 현재 사용자의 로그인 정보 구함
-            $member_srl = Context::get('target_srl');
-            $mid = Context::get('cur_mid');
-            $logged_info = Context::get('logged_info');
-            $act = Context::get('cur_act');
-
-            // 자신의 아이디를 클릭한 경우
-            if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
-
-            // 다른 사람의 아이디를 클릭한 경우
-            else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
-
-            $member_srl = $member_info->member_srl;
-            if(!$member_srl) return;
-
-            // 변수 정리
-            $user_id = $member_info->user_id;
-            $user_name = $member_info->user_name;
-
-            ModuleHandler::triggerCall('member.getMemberMenu', 'before', $null);
-
-            $oMemberController = &getController('member');
-
-            // 회원 정보 보기 (비회원일 경우 볼 수 없도록 수정)
-            if($logged_info->member_srl) {
-                $url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
-                $icon_path = './modules/member/tpl/images/icon_view_info.gif';
-                $oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
-            }
-
-            // 다른 사람의 아이디를 클릭한 경우
-            if($member_srl != $logged_info->member_srl) {
-
-                // 메일 보내기
-                if($member_info->email_address) {
-                    $url = 'mailto:'.htmlspecialchars($member_info->email_address);
-                    $icon_path = './modules/member/tpl/images/icon_sendmail.gif';
-                    $oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path);
-                }
-            }
-
-            // 홈페이지 보기
-            if($member_info->homepage)
-                $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage), 'homepage', './modules/member/tpl/images/icon_homepage.gif','blank');
-
-            // 블로그 보기
-            if($member_info->blog)
-                $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog), 'blog', './modules/member/tpl/images/icon_blog.gif','blank');
-
-            // trigger 호출 (after)
-            ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
-
-            // 최고 관리자라면 회원정보 수정 메뉴 만듬
-            if($logged_info->is_admin == 'Y') {
-                $url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
-                $icon_path = './modules/member/tpl/images/icon_management.gif';
-                $oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo');
-
-                $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
-                $icon_path = './modules/member/tpl/images/icon_trace_document.gif';
-                $oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
-
-                $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl);
-                $icon_path = './modules/member/tpl/images/icon_trace_comment.gif';
-                $oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment');
-            }
-
-            // 팝업메뉴의 언어 변경
-            $menus = Context::get('member_popup_menu_list');
-            $menus_count = count($menus);
-            for($i=0;$i<$menus_count;$i++) {
-                $menus[$i]->str = Context::getLang($menus[$i]->str);
-            }
-
-            // 최종적으로 정리된 팝업메뉴 목록을 구함
-            $this->add('menus', $menus);
-        }
-
-        /**
-         * @brief 로그인 되어 있는지에 대한 체크
-         **/
-        function isLogged() {
-            if($_SESSION['is_logged']&&$_SESSION['ipaddress']==$_SERVER['REMOTE_ADDR']) return true;
-
-            $_SESSION['is_logged'] = false;
-            $_SESSION['logged_info'] = '';
-            return false;
-        }
-
-        /**
-         * @brief 인증된 사용자의 정보 return
-         **/
-        function getLoggedInfo() {
-            // 로그인 되어 있고 세션 정보를 요청하면 세션 정보를 return
-            if($this->isLogged()) {
-                $logged_info = $_SESSION['logged_info'];
-
-                // site_module_info에 따라서 관리자/ 그룹 목록을 매번 재지정
-                $site_module_info = Context::get('site_module_info');
-                if($site_module_info->site_srl) {
-                    $logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
-
-                    // 사이트 관리자이면 로그인 정보에 is_site_admin bool변수를 추가
-                    $oModuleModel = &getModel('module');
-                    if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
-                    else $logged_info->is_site_admin = false;
-                } else {
-                    // 만약 기본 사이트인데 회원 그룹이 존재하지 않으면 등록
-                    if(!count($logged_info->group_list)) {
-                        $default_group = $this->getDefaultGroup(0);
-                        $oMemberController = &getController('member');
-                        $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, 0);
-                        $groups[$default_group->group_srl] = $default_group->title;
-                        $logged_info->group_list = $groups;
-                    }
-
-                    $logged_info->is_site_admin = false;
-                }
-
-                $_SESSION['logged_info'] = $logged_info;
-
-                return $logged_info;
-            }
-            return NULL;
-        }
-
-        /**
-         * @brief user_id에 해당하는 사용자 정보 return
-         **/
-        function getMemberInfoByUserID($user_id) {
-            if(!$user_id) return;
-
-            $args->user_id = $user_id;
-            $output = executeQuery('member.getMemberInfo', $args);
-            if(!$output->toBool()) return $output;
-            if(!$output->data) return;
-
-            $member_info = $this->arrangeMemberInfo($output->data);
-
-            return $member_info;
-        }
-
-        /**
-         * @brief member_srl로 사용자 정보 return
-         **/
-        function getMemberInfoByMemberSrl($member_srl, $site_srl = 0) {
-            if(!$member_srl) return;
-
-            if(!$GLOBALS['__member_info__'][$member_srl]) {
-                $args->member_srl = $member_srl;
-                $output = executeQuery('member.getMemberInfoByMemberSrl', $args);
-                if(!$output->data) return;
-
-                $this->arrangeMemberInfo($output->data, $site_srl);
-            }
-
-            return $GLOBALS['__member_info__'][$member_srl];
-        }
-
-        /**
-         * @brief 사용자 정보 중 extra_vars와 기타 정보를 알맞게 편집
-         **/
-        function arrangeMemberInfo($info, $site_srl = 0) {
-            if(!$GLOBALS['__member_info__'][$info->member_srl]) {
-                $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('member');
-
-
-                $info->profile_image = $this->getProfileImage($info->member_srl);
-                $info->image_name = $this->getImageName($info->member_srl);
-                $info->image_mark = $this->getImageMark($info->member_srl);
-                if($config->group_image_mark=='Y'){
-                    $info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
-                }
-                $info->signature = $this->getSignature($info->member_srl);
-                $info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
-
-                $extra_vars = unserialize($info->extra_vars);
-                unset($info->extra_vars);
-                if($extra_vars) {
-                    foreach($extra_vars as $key => $val) {
-                        if(preg_match('/\|\@\|/i', $val)) $val = explode('|@|', $val);
-                        if(!$info->{$key}) $info->{$key} = $val;
-                    }
-                }
-
-                $GLOBALS['__member_info__'][$info->member_srl] = $info;
-            }
-
-            return $GLOBALS['__member_info__'][$info->member_srl];
-        }
-
-        /**
-         * @brief userid에 해당하는 member_srl을 구함
-         **/
-        function getMemberSrlByUserID($user_id) {
-            $args->user_id = $user_id;
-            $output = executeQuery('member.getMemberSrl', $args);
-            return $output->data->member_srl;
-        }
-
-        /**
-         * @brief EmailAddress에 해당하는 member_srl을 구함
-         **/
-        function getMemberSrlByEmailAddress($email_address) {
-            $args->email_address = $email_address;
-            $output = executeQuery('member.getMemberSrl', $args);
-            return $output->data->member_srl;
-        }
-
-        /**
-         * @brief NickName에 해당하는 member_srl을 구함
-         **/
-        function getMemberSrlByNickName($nick_name) {
-            $args->nick_name = $nick_name;
-            $output = executeQuery('member.getMemberSrl', $args);
-            return $output->data->member_srl;
-        }
-
-        /**
-         * @brief 현재 접속자의 member_srl을 return
-         **/
-        function getLoggedMemberSrl() {
-            if(!$this->isLogged()) return;
-            return $_SESSION['member_srl'];
-        }
-
-        /**
-         * @brief 현재 접속자의 user_id을 return
-         **/
-        function getLoggedUserID() {
-            if(!$this->isLogged()) return;
-            $logged_info = $_SESSION['logged_info'];
-            return $logged_info->user_id;
-        }
-
-        /**
-         * @brief member_srl이 속한 group 목록을 가져옴
-         **/
-        function getMemberGroups($member_srl, $site_srl = 0, $force_reload = false) {
-            static $member_groups = array();
-            if(!$member_groups[$member_srl][$site_srl] || $force_reload) {
-                $args->member_srl = $member_srl;
-                $args->site_srl = $site_srl;
-                $output = executeQuery('member.getMemberGroups', $args);
-                if(!$output->data) return array();
-
-                $group_list = $output->data;
-                if(!is_array($group_list)) $group_list = array($group_list);
-
-                foreach($group_list as $group) {
-                    $result[$group->group_srl] = $group->title;
-                }
-                $member_groups[$member_srl][$site_srl] = $result;
-            }
-            return $member_groups[$member_srl][$site_srl];
-        }
-
-        /**
-         * @brief member_srl들이 속한 group 목록을 가져옴
-         **/
-        function getMembersGroups($member_srls, $site_srl = 0) {
-            $args->member_srls = implode(',',$member_srls);
-            $args->site_srl = $site_srl;
-            $output = executeQueryArray('member.getMembersGroups', $args);
-            if(!$output->data) return array();
-
-            $result = array();
-            foreach($output->data as $key=>$val) {
-                $result[$val->member_srl][] = $val->title;
-            }
-            return $result;
-        }
-
-        /**
-         * @brief 기본 그룹을 가져옴
-         **/
-        function getDefaultGroup($site_srl = 0) {
-            $args->site_srl = $site_srl;
-            $output = executeQuery('member.getDefaultGroup', $args);
-            return $output->data;
-        }
-
-        /**
-         * @brief 관리자 그룹을 가져옴
-         **/
-        function getAdminGroup() {
-            $output = executeQuery('member.getAdminGroup');
-            return $output->data;
-        }
-
-        /**
-         * @brief group_srl에 해당하는 그룹 정보 가져옴
-         **/
-        function getGroup($group_srl) {
-            $args->group_srl = $group_srl;
-            $output = executeQuery('member.getGroup', $args);
-            return $output->data;
-        }
-
-        /**
-         * @brief 그룹 목록을 가져옴
-         **/
-        function getGroups($site_srl = 0) {
-            if(!$GLOBALS['__group_info__'][$site_srl]) {
-                $args->site_srl = $site_srl;
-				$args->sort_index = 'list_order';
-				$args->order_type = 'asc';
-                $output = executeQuery('member.getGroups', $args);
-                if(!$output->data) return;
-
-                $group_list = $output->data;
-                if(!is_array($group_list)) $group_list = array($group_list);
-
-                foreach($group_list as $val) {
-                    $result[$val->group_srl] = $val;
-                }
-
-                $GLOBALS['__group_info__'][$site_srl] = $result;
-            }
-            return $GLOBALS['__group_info__'][$site_srl];
-        }
-
-        /**
-         * @brief 회원 가입폼 추가 확장 목록 가져오기
-         *
-         * 이 메소드는 modules/member/tpl/filter/insert.xml 의 extend_filter로 동작을 한다.
-         * extend_filter로 사용을 하기 위해서는 인자값으로 boolean값을 받도록 규정한다.
-         * 이 인자값이 true일 경우 filter 타입에 맞는 형태의 object로 결과를 return하여야 한다.
-         **/
-        function getJoinFormList($filter_response = false) {
-            global $lang;
-
-            // 최고관리자는 무시하도록 설정
-            $logged_info = Context::get('logged_info');
-
-            if(!$this->join_form_list) {
-                // list_order 컬럼의 정렬을 위한 인자 세팅
-                $args->sort_index = "list_order";
-                $output = executeQuery('member.getJoinFormList', $args);
-
-                // 결과 데이터가 없으면 NULL return
-                $join_form_list = $output->data;
-                if(!$join_form_list) return NULL;
-
-                // default_value의 경우 DB에 array가 serialize되어 입력되므로 unserialize가 필요
-                if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
-                $join_form_count = count($join_form_list);
-                for($i=0;$i<$join_form_count;$i++) {
-                    $join_form_list[$i]->column_name = strtolower($join_form_list[$i]->column_name);
-
-                    $member_join_form_srl = $join_form_list[$i]->member_join_form_srl;
-                    $column_type = $join_form_list[$i]->column_type;
-                    $column_name = $join_form_list[$i]->column_name;
-                    $column_title = $join_form_list[$i]->column_title;
-                    $default_value = $join_form_list[$i]->default_value;
-
-                    // 언어변수에 추가
-                    $lang->extend_vars[$column_name] = $column_title;
-
-                    // checkbox, select등 다수 데이터 형식일 경우 unserialize해줌
-                    if(in_array($column_type, array('checkbox','select','radio'))) {
-                        $join_form_list[$i]->default_value = unserialize($default_value);
-                        if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
-                    } else {
-                        $join_form_list[$i]->default_value = '';
-                    }
-
-                    $list[$member_join_form_srl] = $join_form_list[$i];
-                }
-                $this->join_form_list = $list;
-            }
-
-            // filter_response가 true일 경우 object 스타일을 구함
-            if($filter_response && count($this->join_form_list)) {
-
-                foreach($this->join_form_list as $key => $val) {
-                    if($val->is_active != 'Y') continue;
-                    unset($obj);
-                    $obj->type = $val->column_type;
-                    $obj->name = $val->column_name;
-                    $obj->lang = $val->column_title;
-                    if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
-                    else $obj->required = false;
-                    $filter_output[] = $obj;
-
-                    unset($open_obj);
-                    $open_obj->name = 'open_'.$val->column_name;
-                    $open_obj->required = false;
-                    $filter_output[] = $open_obj;
-
-                }
-                return $filter_output;
-
-            }
-
-            // 결과 리턴
-            return $this->join_form_list;
-        }
-
-        /**
-         * @brief 추가 회원가입폼과 특정 회원의 정보를 조합 (회원정보 수정등에 사용)
-         **/
-        function getCombineJoinForm($member_info) {
-            $extend_form_list = $this->getJoinFormlist();
-            if(!$extend_form_list) return;
-
-            // 관리자이거나 자기 자신이 아니면 비공개의 경우 무조건 패스해버림
-            $logged_info = Context::get('logged_info');
-
-            foreach($extend_form_list as $srl => $item) {
-                $column_name = $item->column_name;
-                $value = $member_info->{$column_name};
-
-                if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_info->member_srl && $member_info->{'open_'.$column_name}!='Y') {
-                    $extend_form_list[$srl]->is_private = true;
-                    continue;
-                }
-
-                // 추가 확장폼의 종류에 따라 값을 변경
-                switch($item->column_type) {
-                    case 'checkbox' :
-                            if($value && !is_array($value)) $value = array($value);
-                        break;
-                    case 'text' :
-                    case 'homepage' :
-                    case 'email_address' :
-                    case 'tel' :
-                    case 'textarea' :
-                    case 'select' :
-                    case 'kr_zip' :
-                        break;
-                }
-
-                $extend_form_list[$srl]->value = $value;
-
-                if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
-                else $extend_form_list[$srl]->is_opened = false;
-            }
-            return $extend_form_list;
-        }
-
-        /**
-         * @brief 한개의 가입항목을 가져옴
-         **/
-        function getJoinForm($member_join_form_srl) {
-            $args->member_join_form_srl = $member_join_form_srl;
-            $output = executeQuery('member.getJoinForm', $args);
-            $join_form = $output->data;
-            if(!$join_form) return NULL;
-
-            $column_type = $join_form->column_type;
-            $default_value = $join_form->default_value;
-
-            if(in_array($column_type, array('checkbox','select','radio'))) {
-                $join_form->default_value = unserialize($default_value);
-            } else {
-                $join_form->default_value = '';
-            }
-
-            return $join_form;
-        }
-
-        /**
-         * @brief 금지 아이디 목록 가져오기
-         **/
-        function getDeniedIDList() {
-            if(!$this->denied_id_list) {
-                $args->sort_index = "list_order";
-                $args->page = Context::get('page');
-                $args->list_count = 40;
-                $args->page_count = 10;
-
-                $output = executeQuery('member.getDeniedIDList', $args);
-                $this->denied_id_list = $output;
-            }
-            return $this->denied_id_list;
-        }
-
-        /**
-         * @brief 금지 아이디인지 확인
-         **/
-        function isDeniedID($user_id) {
-            $args->user_id = $user_id;
-            $output = executeQuery('member.chkDeniedID', $args);
-            if($output->data->count) return true;
-            return false;
-        }
-
-        /**
-         * @brief 프로필 이미지의 정보를 구함
-         **/
-        function getProfileImage($member_srl) {
-            if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl])) {
-                $GLOBALS['__member_info__']['profile_image'][$member_srl] = null;
-                $exts = array('gif','jpg','png');
-                for($i=0;$i<3;$i++) {
-                    $image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $exts[$i]);
-                    if(file_exists($image_name_file)) {
-                        list($width, $height, $type, $attrs) = getimagesize($image_name_file);
-                        $info = null;
-                        $info->width = $width;
-                        $info->height = $height;
-                        $info->src = Context::getRequestUri().$image_name_file;
-                        $info->file = './'.$image_name_file;
-                        $GLOBALS['__member_info__']['profile_image'][$member_srl] = $info;
-                        break;
-                    }
-                }
-            }
-
-            return $GLOBALS['__member_info__']['profile_image'][$member_srl];
-        }
-
-        /**
-         * @brief 이미지이름의 정보를 구함
-         **/
-        function getImageName($member_srl) {
-            if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl])) {
-                $image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-                if(file_exists($image_name_file)) {
-                    list($width, $height, $type, $attrs) = getimagesize($image_name_file);
-                    $info->width = $width;
-                    $info->height = $height;
-                    $info->src = Context::getRequestUri().$image_name_file;
-                    $info->file = './'.$image_name_file;
-                    $GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
-                } else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
-            }
-            return $GLOBALS['__member_info__']['image_name'][$member_srl];
-        }
-
-        /**
-         * @brief 이미지마크의 정보를 구함
-         **/
-        function getImageMark($member_srl) {
-            if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl])) {
-                $image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
-                if(file_exists($image_mark_file)) {
-                    list($width, $height, $type, $attrs) = getimagesize($image_mark_file);
-                    $info->width = $width;
-                    $info->height = $height;
-                    $info->src = Context::getRequestUri().$image_mark_file;
-                    $info->file = './'.$image_mark_file;
-                    $GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
-                } else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
-            }
-
-            return $GLOBALS['__member_info__']['image_mark'][$member_srl];
-        }
-
-
-        /**
-         * @brief group의 이미지마크 정보를 구함
-         **/
-        function getGroupImageMark($member_srl,$site_srl=0) {
-            if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) {
-				$oModuleModel = &getModel('module');
-				$config = $oModuleModel->getModuleConfig('member');
-				if($config->group_image_mark!='Y'){
-					return null;
-				}
-				$member_group = $this->getMemberGroups($member_srl,$site_srl);
-				$groups_info = $this->getGroups($site_srl);
-				$image_mark_info = null;
-
-				foreach($groups_info as $key=>$val){
-					$target = $member_group[$key];
-					if (!empty($target) && !empty($val->image_mark))
-					{
-						$info->title = $val->title;
-						$info->description = $val->description;
-						$info->src = $val->image_mark;
-						$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
-						break;
-					}
-				}
-				if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
-			}
-			if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
-
-			return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
-        }
-
-        /**
-         * @brief 사용자의 signature를 구함
-         **/
-        function getSignature($member_srl) {
-            if(!isset($GLOBALS['__member_info__']['signature'][$member_srl])) {
-                $filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
-                if(file_exists($filename)) {
-                    $buff = FileHandler::readFile($filename);
-                    $signature = trim(substr($buff, 40));
-                    $GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
-                } else $GLOBALS['__member_info__']['signature'][$member_srl] = null;
-            }
-            return $GLOBALS['__member_info__']['signature'][$member_srl];
-        }
-
-        /**
-         * @brief 입력된 plain text 비밀번호와 DB에 저장된 비밀번호와의 비교
-         **/
-        function isValidPassword($hashed_password, $password_text) {
-            // 입력된 비밀번호가 없으면 무조건 falase
-            if(!$password_text) return false;
-
-            // md5 해쉬된값가 맞으면 return true
-            if($hashed_password == md5($password_text)) return true;
-
-            // mysql_pre4_hash_password함수의 값과 동일하면 return true
-            if(mysql_pre4_hash_password($password_text) == $hashed_password) return true;
-
-            // 현재 DB에서 mysql DB를 이용시 직접 old_password를 이용하여 검사하고 맞으면 비밀번호를 변경
-            if(substr(Context::getDBType(),0,5)=='mysql') {
-                $oDB = &DB::getInstance();
-                if($oDB->isValidOldPassword($password_text, $hashed_password)) return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * @brief 멤버와 연결된 오픈아이디들을 모두 리턴한다.
-         **/
-        function getMemberOpenIDByMemberSrl($member_srl) {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            $result = array();
-            if ($config->enable_openid != 'Y') return $result;
-
-            $args->member_srl = $member_srl;
-            $output = executeQuery('member.getMemberOpenIDByMemberSrl', $args);
-
-            if (!$output->data) {
-            }
-            else if (is_array($output->data)) {
-                foreach($output->data as $row) {
-                    $result[] = $row;
-                }
-            }
-            else {
-                $result[] = $output->data;
-            }
-
-            foreach($result as $row) {
-                $openid = $row->openid;
-                $bookmarklet_header = "javascript:var%20U='";
-                $bookmarklet_footer = "';function%20Z(W){var%20X=/(openid|ident)/i;try{var%20F=W.frames;var%20E=W.document.getElementsByTagName('input');for(var%20i=0;i<E.length;i++){var%20A=E[i];if(A.type=='text'&&X.test(A.name)){if(!J)J=E[i]}if(A.name=='submit'){V=A}}for(var%20i=0;i<F.length;i++){Z(F[i]);}}catch(e){}}var%20J,V;Z(window);try{try{V.parentNode.removeChild(V);}catch(z){}J.value=U;J.form.submit();}catch(e){top.document.location.href=((/^https?:\/\//img).test(U)?'':'http://')+U;}";
-                $row->bookmarklet = $bookmarklet_header . $openid . $bookmarklet_footer;
-            }
-
-            return $result;
-        }
-
-        /**
-         * @brief 오픈아이디에 연결된 멤버를 리턴한다.
-         **/
-        function getMemberSrlByOpenID($openid) {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('member');
-
-            if ($config->enable_openid != 'Y') return $result;
-
-            $args->member_srl = $member_srl;
-            $output = executeQuery('member.getMemberSrlByOpenID', $args);
-
-            if (!$output->data) return null;
-            return $output->data->member_srl;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  memberModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief Model class of the member module
+     **/
+
+    class memberModel extends member {
+
+        /**
+         * @brief Keep data internally which may be frequently called ...
+         **/
+        var $join_form_list = NULL;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Return member's configuration
+         **/
+        function getMemberConfig() {
+            // Get member configuration stored in the DB
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+			//for multi language
+			if(is_array($config->signupForm))
+			{
+				foreach($config->signupForm AS $key=>$value)
+				{
+					$config->signupForm[$key]->title = Context::getLang($value->title);
+				}
+			}
+
+            // Get terms of user
+            $agreement_file = _XE_PATH_.'files/member_extra_info/agreement.txt';
+            if(!$config->agreement && file_exists($agreement_file)) $config->agreement = FileHandler::readFile($agreement_file);
+
+            if(!$config->webmaster_name) $config->webmaster_name = 'webmaster';
+            if(!$config->image_name_max_width) $config->image_name_max_width = 90;
+            if(!$config->image_name_max_height) $config->image_name_max_height = 20;
+            if(!$config->image_mark_max_width) $config->image_mark_max_width = 20;
+            if(!$config->image_mark_max_height) $config->image_mark_max_height = 20;
+            if(!$config->profile_image_max_width) $config->profile_image_max_width = 80;
+            if(!$config->profile_image_max_height) $config->profile_image_max_height = 80;
+            if(!$config->skin) $config->skin = "default";
+            if(!$config->editor_skin || $config->editor_skin == 'default') $config->editor_skin = "xpresseditor";
+            if(!$config->group_image_mark) $config->group_image_mark = "N";
+
+			if (!$config->identifier) $config->identifier = 'user_id';
+
+            return $config;
+        }
+
+        /**
+         * @brief Display menus of the member
+         **/
+        function getMemberMenu() {
+            // Get member_srl of he target member and logged info of the current user
+            $member_srl = Context::get('target_srl');
+            $mid = Context::get('cur_mid');
+            $logged_info = Context::get('logged_info');
+            $act = Context::get('cur_act');
+            // When click user's own nickname
+            if($member_srl == $logged_info->member_srl) $member_info = $logged_info;
+            // When click other's nickname
+            else $member_info = $this->getMemberInfoByMemberSrl($member_srl);
+
+            $member_srl = $member_info->member_srl;
+            if(!$member_srl) return;
+            // List variables
+            $user_id = $member_info->user_id;
+            $user_name = $member_info->user_name;
+
+            ModuleHandler::triggerCall('member.getMemberMenu', 'before', $null);
+
+            $oMemberController = &getController('member');
+            // Display member information (Don't display to non-logged user)
+            if($logged_info->member_srl) {
+                $url = getUrl('','mid',$mid,'act','dispMemberInfo','member_srl',$member_srl);
+                $oMemberController->addMemberPopupMenu($url,'cmd_view_member_info',$icon_path,'self');
+            }
+            // When click other's nickname
+            if($member_srl != $logged_info->member_srl) {
+                // Send an email
+                if($member_info->email_address) {
+                    $url = 'mailto:'.htmlspecialchars($member_info->email_address);
+                    $oMemberController->addMemberPopupMenu($url,'cmd_send_email',$icon_path);
+                }
+            }
+            // View homepage info
+            if($member_info->homepage)
+                $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->homepage), 'homepage', '', 'blank');
+            // View blog info
+            if($member_info->blog)
+                $oMemberController->addMemberPopupMenu(htmlspecialchars($member_info->blog), 'blog', '', 'blank');
+            // Call a trigger (after)
+            ModuleHandler::triggerCall('member.getMemberMenu', 'after', $null);
+            // Display a menu for editting member info to a top administrator
+            if($logged_info->is_admin == 'Y') {
+                $url = getUrl('','module','admin','act','dispMemberAdminInsert','member_srl',$member_srl);
+                $oMemberController->addMemberPopupMenu($url,'cmd_manage_member_info',$icon_path,'MemberModifyInfo');
+
+                $url = getUrl('','module','admin','act','dispDocumentAdminList','search_target','member_srl','search_keyword',$member_srl);
+                $oMemberController->addMemberPopupMenu($url,'cmd_trace_document',$icon_path,'TraceMemberDocument');
+
+                $url = getUrl('','module','admin','act','dispCommentAdminList','search_target','member_srl','search_keyword',$member_srl);
+                $oMemberController->addMemberPopupMenu($url,'cmd_trace_comment',$icon_path,'TraceMemberComment');
+            }
+            // Change a language of pop-up menu
+            $menus = Context::get('member_popup_menu_list');
+            $menus_count = count($menus);
+            for($i=0;$i<$menus_count;$i++) {
+                $menus[$i]->str = Context::getLang($menus[$i]->str);
+            }
+            // Get a list of finalized pop-up menu
+            $this->add('menus', $menus);
+        }
+
+        /**
+         * @brief Check if logged-in
+         **/
+        function isLogged() {
+            if($_SESSION['is_logged']&&$_SESSION['ipaddress']==$_SERVER['REMOTE_ADDR']) return true;
+
+            $_SESSION['is_logged'] = false;
+            return false;
+        }
+
+        /**
+         * @brief Return session information of the logged-in user
+         **/
+        function getLoggedInfo() {
+            // Return session info if session info is requested and the user is logged-in
+            if($this->isLogged()) {
+                $logged_info = Context::get('logged_info');
+                // Admin/Group list defined depending on site_module_info
+                $site_module_info = Context::get('site_module_info');
+                if($site_module_info->site_srl) {
+                    $logged_info->group_list = $this->getMemberGroups($logged_info->member_srl, $site_module_info->site_srl);
+                    // Add is_site_admin bool variable into logged_info if site_administrator is
+                    $oModuleModel = &getModel('module');
+                    if($oModuleModel->isSiteAdmin($logged_info)) $logged_info->is_site_admin = true;
+                    else $logged_info->is_site_admin = false;
+                } else {
+                    // Register a default group if the site doesn't have a member group
+                    if(!count($logged_info->group_list)) {
+                        $default_group = $this->getDefaultGroup(0);
+                        $oMemberController = &getController('member');
+                        $oMemberController->addMemberToGroup($logged_info->member_srl, $default_group->group_srl, 0);
+                        $groups[$default_group->group_srl] = $default_group->title;
+                        $logged_info->group_list = $groups;
+                    }
+
+                    $logged_info->is_site_admin = false;
+                }
+				Context::set('logged_info', $logged_info);
+
+                return $logged_info;
+            }
+            return NULL;
+        }
+
+        /**
+         * @brief Return member information with user_id
+         **/
+        function getMemberInfoByUserID($user_id, $columnList = array()) {
+            if(!$user_id) return;
+
+            $args->user_id = $user_id;
+            $output = executeQuery('member.getMemberInfo', $args, $columnList);
+            if(!$output->toBool()) return $output;
+            if(!$output->data) return;
+
+            $member_info = $this->arrangeMemberInfo($output->data);
+
+            return $member_info;
+        }
+
+        /**
+         * @brief Return member information with email_address
+         **/
+        function getMemberInfoByEmailAddress($email_address) {
+            if(!$email_address) return;
+
+            $args->email_address = $email_address;
+            $output = executeQuery('member.getMemberInfoByEmailAddress', $args);
+            if(!$output->toBool()) return $output;
+            if(!$output->data) return;
+
+            $member_info = $this->arrangeMemberInfo($output->data);
+            return $member_info;
+        }
+
+        /**
+         * @brief Return member information with member_srl
+         **/
+        function getMemberInfoByMemberSrl($member_srl, $site_srl = 0, $columnList = array()) {
+            if(!$member_srl) return;
+
+			//columnList size zero... get full member info
+            if(!$GLOBALS['__member_info__'][$member_srl] || count($columnList) == 0) {
+            //if(true) {
+	            $oCacheHandler = &CacheHandler::getInstance('object');
+				if($oCacheHandler->isSupport()){
+					$cache_key = 'object:'.$member_srl;
+					$output = $oCacheHandler->get($cache_key);
+				}
+				if(!$output){
+					$args->member_srl = $member_srl;
+	                $output = executeQuery('member.getMemberInfoByMemberSrl', $args, $columnList);
+	                if(!$output->data) return;
+	                //insert in cache
+	                if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+				}
+				
+				$this->arrangeMemberInfo($output->data, $site_srl);
+                
+            }
+
+            return $GLOBALS['__member_info__'][$member_srl];
+        }
+
+        /**
+         * @brief Add member info from extra_vars and other information
+         **/
+        function arrangeMemberInfo($info, $site_srl = 0) {
+            if(!$GLOBALS['__member_info__'][$info->member_srl]) {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('member');
+
+
+                $info->profile_image = $this->getProfileImage($info->member_srl);
+                $info->image_name = $this->getImageName($info->member_srl);
+                $info->image_mark = $this->getImageMark($info->member_srl);
+                if($config->group_image_mark=='Y'){
+                    $info->group_mark = $this->getGroupImageMark($info->member_srl,$site_srl);
+                }
+                $info->signature = $this->getSignature($info->member_srl);
+                $info->group_list = $this->getMemberGroups($info->member_srl, $site_srl);
+
+                $extra_vars = unserialize($info->extra_vars);
+                unset($info->extra_vars);
+                if($extra_vars) {
+                    foreach($extra_vars as $key => $val) {
+                        if(!is_array($val)) if(preg_match('/\|\@\|/i', $val)) $val = explode('|@|', $val);
+                        if(!$info->{$key}) $info->{$key} = $val;
+                    }
+                }
+
+                $GLOBALS['__member_info__'][$info->member_srl] = $info;
+            }
+
+            return $GLOBALS['__member_info__'][$info->member_srl];
+        }
+
+        /**
+         * @brief Get member_srl corresponding to userid
+         **/
+        function getMemberSrlByUserID($user_id) {
+            $args->user_id = $user_id;
+            $output = executeQuery('member.getMemberSrl', $args);
+            return $output->data->member_srl;
+        }
+
+        /**
+         * @brief Get member_srl corresponding to EmailAddress 
+         **/
+        function getMemberSrlByEmailAddress($email_address) {
+            $args->email_address = $email_address;
+            $output = executeQuery('member.getMemberSrl', $args);
+            return $output->data->member_srl;
+        }
+
+        /**
+         * @brief Get member_srl corresponding to nickname
+         **/
+        function getMemberSrlByNickName($nick_name) {
+            $args->nick_name = $nick_name;
+            $output = executeQuery('member.getMemberSrl', $args);
+            return $output->data->member_srl;
+        }
+
+        /**
+         * @brief Return member_srl of the current logged-in user
+         **/
+        function getLoggedMemberSrl() {
+            if(!$this->isLogged()) return;
+            return $_SESSION['member_srl'];
+        }
+
+        /**
+         * @brief Return user_id of the current logged-in user
+         **/
+        function getLoggedUserID() {
+            if(!$this->isLogged()) return;
+            $logged_info = Context::get('logged_info');
+            return $logged_info->user_id;
+        }
+
+        /**
+         * @brief Get a list of groups which the member_srl belongs to
+         **/
+        function getMemberGroups($member_srl, $site_srl = 0, $force_reload = false) {
+             // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object_member_groups:'.$member_srl.'_'.$site_srl;
+                    $output = $oCacheHandler->get($cache_key);
+            }
+            static $member_groups = array();
+            if(!$member_groups[$member_srl][$site_srl] || $force_reload) {
+                if(!$output){
+                    $args->member_srl = $member_srl;
+                    $args->site_srl = $site_srl;
+                    $output = executeQuery('member.getMemberGroups', $args);
+                    //insert in cache
+                    if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+                }
+                if(!$output->data) return array();
+                
+
+                $group_list = $output->data;
+                if(!is_array($group_list)) $group_list = array($group_list);
+
+                foreach($group_list as $group) {
+                    $result[$group->group_srl] = $group->title;
+                }
+                $member_groups[$member_srl][$site_srl] = $result;
+            }
+            return $member_groups[$member_srl][$site_srl];
+        }
+
+        /**
+         * @brief Get a list of groups which member_srls belong to
+         **/
+        function getMembersGroups($member_srls, $site_srl = 0) {
+            $args->member_srls = implode(',',$member_srls);
+            $args->site_srl = $site_srl;
+			$args->sort_index = 'list_order';
+            $output = executeQueryArray('member.getMembersGroups', $args);
+            if(!$output->data) return array();
+
+            $result = array();
+            foreach($output->data as $key=>$val) {
+                $result[$val->member_srl][] = $val->title;
+            }
+            return $result;
+        }
+
+        /**
+         * @brief Get a default group
+         **/
+        function getDefaultGroup($site_srl = 0, $columnList = array()) {
+            $args->site_srl = $site_srl;
+            $output = executeQuery('member.getDefaultGroup', $args, $columnList);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get an admin group
+         **/
+        function getAdminGroup($columnList = array()) {
+            $output = executeQuery('member.getAdminGroup', $args, $columnList);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get group info corresponding to group_srl
+         **/
+        function getGroup($group_srl, $columnList = array()) {
+            $args->group_srl = $group_srl;
+            $output = executeQuery('member.getGroup', $args, $columnList);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get a list of groups
+         **/
+        function getGroups($site_srl = 0) {
+            if(!$GLOBALS['__group_info__'][$site_srl]) {
+		if(!isset($site_srl)) $site_srl = 0;
+                $args->site_srl = $site_srl;
+				$args->sort_index = 'list_order';
+				$args->order_type = 'asc';
+                $output = executeQuery('member.getGroups', $args);
+                if(!$output->data) return;
+
+                $group_list = $output->data;
+                if(!is_array($group_list)) $group_list = array($group_list);
+
+                foreach($group_list as $val) {
+                    $result[$val->group_srl] = $val;
+                }
+
+                $GLOBALS['__group_info__'][$site_srl] = $result;
+            }
+            return $GLOBALS['__group_info__'][$site_srl];
+        }
+
+        /**
+         * @brief Get a list of member join forms
+         *
+         * This method works as an extend filter of modules/member/tpl/filter/insert.xml.
+         * To use as extend_filter, the argument should be boolean.
+         * When the argument is true, it returns object result in type of filter.
+         **/
+        function getJoinFormList($filter_response = false) {
+            global $lang;
+            // Set to ignore if a super administrator.
+            $logged_info = Context::get('logged_info');
+
+            if(!$this->join_form_list) {
+                // Argument setting to sort list_order column
+                $args->sort_index = "list_order";
+                $output = executeQuery('member.getJoinFormList', $args);
+                // NULL if output data deosn't exist
+                $join_form_list = $output->data;
+                if(!$join_form_list) return NULL;
+                // Need to unserialize because serialized array is inserted into DB in case of default_value
+                if(!is_array($join_form_list)) $join_form_list = array($join_form_list);
+                $join_form_count = count($join_form_list);
+                for($i=0;$i<$join_form_count;$i++) {
+                    $join_form_list[$i]->column_name = strtolower($join_form_list[$i]->column_name);
+
+                    $member_join_form_srl = $join_form_list[$i]->member_join_form_srl;
+                    $column_type = $join_form_list[$i]->column_type;
+                    $column_name = $join_form_list[$i]->column_name;
+                    $column_title = $join_form_list[$i]->column_title;
+                    $default_value = $join_form_list[$i]->default_value;
+                    // Add language variable
+                    $lang->extend_vars[$column_name] = $column_title;
+                    // unserialize if the data type if checkbox, select and so on
+                    if(in_array($column_type, array('checkbox','select','radio'))) {
+                        $join_form_list[$i]->default_value = unserialize($default_value);
+                        if(!$join_form_list[$i]->default_value[0]) $join_form_list[$i]->default_value = '';
+                    } else {
+                        $join_form_list[$i]->default_value = '';
+                    }
+
+                    $list[$member_join_form_srl] = $join_form_list[$i];
+                }
+                $this->join_form_list = $list;
+            }
+            // Get object style if the filter_response is true
+            if($filter_response && count($this->join_form_list)) {
+
+                foreach($this->join_form_list as $key => $val) {
+                    if($val->is_active != 'Y') continue;
+                    unset($obj);
+                    $obj->type = $val->column_type;
+                    $obj->name = $val->column_name;
+                    $obj->lang = $val->column_title;
+                    if($logged_info->is_admin != 'Y') $obj->required = $val->required=='Y'?true:false;
+                    else $obj->required = false;
+                    $filter_output[] = $obj;
+
+                    unset($open_obj);
+                    $open_obj->name = 'open_'.$val->column_name;
+                    $open_obj->required = false;
+                    $filter_output[] = $open_obj;
+
+                }
+                return $filter_output;
+
+            }
+            // Return the result
+            return $this->join_form_list;
+        }
+
+        /**
+         * @brief Combine extend join form and member information (used to modify member information)
+         **/
+        function getCombineJoinForm($member_info) {
+            $extend_form_list = $this->getJoinFormlist();
+            if(!$extend_form_list) return;
+            // Member info is open only to an administrator and him/herself when is_private is true. 
+            $logged_info = Context::get('logged_info');
+
+            foreach($extend_form_list as $srl => $item) {
+                $column_name = $item->column_name;
+                $value = $member_info->{$column_name};
+
+                if($logged_info->is_admin != 'Y' && $logged_info->member_srl != $member_info->member_srl && $member_info->{'open_'.$column_name}!='Y') {
+                    $extend_form_list[$srl]->is_private = true;
+                    continue;
+                }
+                // Change values depening on the type of extend form
+                switch($item->column_type) {
+                    case 'checkbox' :
+                            if($value && !is_array($value)) $value = array($value);
+                        break;
+                    case 'text' :
+                    case 'homepage' :
+                    case 'email_address' :
+                    case 'tel' :
+                    case 'textarea' :
+                    case 'select' :
+                    case 'kr_zip' :
+                        break;
+                }
+
+                $extend_form_list[$srl]->value = $value;
+
+                if($member_info->{'open_'.$column_name}=='Y') $extend_form_list[$srl]->is_opened = true;
+                else $extend_form_list[$srl]->is_opened = false;
+            }
+            return $extend_form_list;
+        }
+
+        /**
+         * @brief Get a join form
+         **/
+        function getJoinForm($member_join_form_srl) {
+            $args->member_join_form_srl = $member_join_form_srl;
+            $output = executeQuery('member.getJoinForm', $args);
+            $join_form = $output->data;
+            if(!$join_form) return NULL;
+
+            $column_type = $join_form->column_type;
+            $default_value = $join_form->default_value;
+
+            if(in_array($column_type, array('checkbox','select','radio'))) {
+                $join_form->default_value = unserialize($default_value);
+            } else {
+                $join_form->default_value = '';
+            }
+
+            return $join_form;
+        }
+
+        /**
+         * @brief Get a list of denied IDs
+         **/
+        function getDeniedIDList() {
+            if(!$this->denied_id_list) {
+                $args->sort_index = "list_order";
+                $args->page = Context::get('page');
+                $args->list_count = 40;
+                $args->page_count = 10;
+
+                $output = executeQuery('member.getDeniedIDList', $args);
+                $this->denied_id_list = $output;
+            }
+            return $this->denied_id_list;
+        }
+
+		function getDeniedIDs(){
+			$output = executeQueryArray('member.getDeniedIDs');
+			if(!$output->toBool()) return array();
+			return $output->data;
+		}
+
+        /**
+         * @brief Verify if ID is denied
+         **/
+        function isDeniedID($user_id) {
+            $args->user_id = $user_id;
+            $output = executeQuery('member.chkDeniedID', $args);
+            if($output->data->count) return true;
+            return false;
+        }
+
+        /**
+         * @brief Get information of the profile image
+         **/
+        function getProfileImage($member_srl) {
+            if(!isset($GLOBALS['__member_info__']['profile_image'][$member_srl])) {
+                $GLOBALS['__member_info__']['profile_image'][$member_srl] = null;
+                $exts = array('gif','jpg','png');
+                for($i=0;$i<3;$i++) {
+                    $image_name_file = sprintf('files/member_extra_info/profile_image/%s%d.%s', getNumberingPath($member_srl), $member_srl, $exts[$i]);
+                    if(file_exists($image_name_file)) {
+                        list($width, $height, $type, $attrs) = getimagesize($image_name_file);
+                        $info = null;
+                        $info->width = $width;
+                        $info->height = $height;
+                        $info->src = Context::getRequestUri().$image_name_file;
+                        $info->file = './'.$image_name_file;
+                        $GLOBALS['__member_info__']['profile_image'][$member_srl] = $info;
+                        break;
+                    }
+                }
+            }
+
+            return $GLOBALS['__member_info__']['profile_image'][$member_srl];
+        }
+
+        /**
+         * @brief Get the image name
+         **/
+        function getImageName($member_srl) {
+            if(!isset($GLOBALS['__member_info__']['image_name'][$member_srl])) {
+                $image_name_file = sprintf('files/member_extra_info/image_name/%s%d.gif', getNumberingPath($member_srl), $member_srl);
+                if(file_exists($image_name_file)) {
+                    list($width, $height, $type, $attrs) = getimagesize($image_name_file);
+                    $info->width = $width;
+                    $info->height = $height;
+                    $info->src = Context::getRequestUri().$image_name_file;
+                    $info->file = './'.$image_name_file;
+                    $GLOBALS['__member_info__']['image_name'][$member_srl] = $info;
+                } else $GLOBALS['__member_info__']['image_name'][$member_srl] = null;
+            }
+            return $GLOBALS['__member_info__']['image_name'][$member_srl];
+        }
+
+        /**
+         * @brief Get the image mark
+         **/
+        function getImageMark($member_srl) {
+            if(!isset($GLOBALS['__member_info__']['image_mark'][$member_srl])) {
+                $image_mark_file = sprintf('files/member_extra_info/image_mark/%s%d.gif', getNumberingPath($member_srl), $member_srl);
+                if(file_exists($image_mark_file)) {
+                    list($width, $height, $type, $attrs) = getimagesize($image_mark_file);
+                    $info->width = $width;
+                    $info->height = $height;
+                    $info->src = Context::getRequestUri().$image_mark_file;
+                    $info->file = './'.$image_mark_file;
+                    $GLOBALS['__member_info__']['image_mark'][$member_srl] = $info;
+                } else $GLOBALS['__member_info__']['image_mark'][$member_srl] = null;
+            }
+
+            return $GLOBALS['__member_info__']['image_mark'][$member_srl];
+        }
+
+
+        /**
+         * @brief Get the image mark of the group
+         **/
+        function getGroupImageMark($member_srl,$site_srl=0) {
+            if(!isset($GLOBALS['__member_info__']['group_image_mark'][$member_srl])) {
+				$oModuleModel = &getModel('module');
+				$config = $oModuleModel->getModuleConfig('member');
+				if($config->group_image_mark!='Y'){
+					return null;
+				}
+				$member_group = $this->getMemberGroups($member_srl,$site_srl);
+				$groups_info = $this->getGroups($site_srl);
+				$image_mark_info = null;
+				if(count($member_group) > 0 && is_array($member_group)){
+					$group_srl = array_keys($member_group);
+				}
+
+				$i = 0;
+				while($i < count($group_srl)){
+					$target = $groups_info[$group_srl[$i++]];
+					if ($target->image_mark)
+					{
+						$info->title = $target->title;
+						$info->description = $target->description;
+						$info->src = $target->image_mark;
+						$GLOBALS['__member_info__']['group_image_mark'][$member_srl] = $info;
+					}
+				}
+				if (!$info) $GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N';
+			}
+			if ($GLOBALS['__member_info__']['group_image_mark'][$member_srl] == 'N') return null;
+
+			return $GLOBALS['__member_info__']['group_image_mark'][$member_srl];
+        }
+
+        /**
+         * @brief Get user's signature
+         **/
+        function getSignature($member_srl) {
+            if(!isset($GLOBALS['__member_info__']['signature'][$member_srl])) {
+                $filename = sprintf('files/member_extra_info/signature/%s%d.signature.php', getNumberingPath($member_srl), $member_srl);
+                if(file_exists($filename)) {
+                    $buff = FileHandler::readFile($filename);
+                    $signature = trim(substr($buff, 40));
+                    $GLOBALS['__member_info__']['signature'][$member_srl] = $signature;
+                } else $GLOBALS['__member_info__']['signature'][$member_srl] = null;
+            }
+            return $GLOBALS['__member_info__']['signature'][$member_srl];
+        }
+
+        /**
+         * @brief Compare plain text password to the password saved in DB
+         **/
+        function isValidPassword($hashed_password, $password_text) {
+            // False if no password in entered
+            if(!$password_text) return false;
+            // Return true if the user input is equal to md5 hash value
+            if($hashed_password == md5($password_text)) return true;
+            // Return true if the user input is equal to the value of mysql_pre4_hash_password
+            if(mysql_pre4_hash_password($password_text) == $hashed_password) return true;
+            // Verify the password by using old_password if the current db is MySQL. If correct, return true.
+            if(substr(Context::getDBType(),0,5)=='mysql') {
+                $oDB = &DB::getInstance();
+                if($oDB->isValidOldPassword($password_text, $hashed_password)) return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * @brief Return all the open IDs of the member
+         **/
+        function getMemberOpenIDByMemberSrl($member_srl) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+
+            $result = array();
+            if ($config->enable_openid != 'Y') return $result;
+
+            $args->member_srl = $member_srl;
+            $output = executeQuery('member.getMemberOpenIDByMemberSrl', $args);
+
+            if (!$output->data) {
+            }
+            else if (is_array($output->data)) {
+                foreach($output->data as $row) {
+                    $result[] = $row;
+                }
+            }
+            else {
+                $result[] = $output->data;
+            }
+
+            foreach($result as $row) {
+                $openid = $row->openid;
+                $bookmarklet_header = "javascript:var%20U='";
+                $bookmarklet_footer = "';function%20Z(W){var%20X=/(openid|ident)/i;try{var%20F=W.frames;var%20E=W.document.getElementsByTagName('input');for(var%20i=0;i<E.length;i++){var%20A=E[i];if(A.type=='text'&&X.test(A.name)){if(!J)J=E[i]}if(A.name=='submit'){V=A}}for(var%20i=0;i<F.length;i++){Z(F[i]);}}catch(e){}}var%20J,V;Z(window);try{try{V.parentNode.removeChild(V);}catch(z){}J.value=U;J.form.submit();}catch(e){top.document.location.href=((/^https?:\/\//img).test(U)?'':'http://')+U;}";
+                $row->bookmarklet = $bookmarklet_header . $openid . $bookmarklet_footer;
+            }
+
+            return $result;
+        }
+
+        /**
+         * @brief Return the member of the open ID.
+         **/
+        function getMemberSrlByOpenID($openid) {
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('member');
+
+            if ($config->enable_openid != 'Y') return $result;
+
+            $args->member_srl = $member_srl;
+            $output = executeQuery('member.getMemberSrlByOpenID', $args);
+
+            if (!$output->data) return null;
+            return $output->data->member_srl;
+        }
+
+		function getAdminGroupSrl($site_srl = 0)
+		{
+			$groupSrl = 0;
+			$output = $this->getGroups($site_srl);
+			if(is_array($output))
+			{
+				foreach($output AS $key=>$value)
+				{
+					if($value->is_admin == 'Y')
+					{
+						$groupSrl = $value->group_srl;
+						break;
+					}
+				}
+			}
+			return $groupSrl;
+		}
+    }
+?>
diff --git a/modules/member/member.view.php b/modules/member/member.view.php
index 04d835635..5fb4016f4 100644
--- a/modules/member/member.view.php
+++ b/modules/member/member.view.php
@@ -1,357 +1,370 @@
-<?php
-    /**
-     * @class  memberView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  member module의 View class
-     **/
-
-    class memberView extends member {
-
-        var $group_list = NULL; ///< 그룹 목록 정보
-        var $member_info = NULL; ///< 선택된 사용자의 정보
-        var $skin = 'default';
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 회원 관리 정보를 받음
-            $oModuleModel = &getModel('module');
-            $this->member_config = $oModuleModel->getModuleConfig('member');
-            if(!$this->member_config->skin) $this->member_config->skin = "default";
-            if(!$this->member_config->colorset) $this->member_config->colorset = "white";
-
-            Context::set('member_config', $this->member_config);
-            $skin = $this->member_config->skin;
-
-            // template path 지정
-            $tpl_path = sprintf('%sskins/%s', $this->module_path, $skin);
-            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
-            $this->setTemplatePath($tpl_path);
-        }
-
-        /**
-         * @brief 회원 정보 출력
-         **/
-        function dispMemberInfo() {
-            $oMemberModel = &getModel('member');
-            $logged_info = Context::get('logged_info');
-
-            // 비회원일 경우 정보 열람 중지
-            if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
-
-            $member_srl = Context::get('member_srl');
-            if(!$member_srl && Context::get('is_logged')) {
-                $member_srl = $logged_info->member_srl;
-            } elseif(!$member_srl) {
-                return $this->dispMemberSignUpForm();
-            }
-
-            $site_module_info = Context::get('site_module_info');
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl);
-            unset($member_info->password);
-            unset($member_info->email_id);
-            unset($member_info->email_host);
-            unset($member_info->email_address);
-
-            if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
-
-            Context::set('member_info', $member_info);
-            Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
-            if ($member_info->member_srl == $logged_info->member_srl)
-                Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
-
-            $this->setTemplateFile('member_info');
-        }
-
-        /**
-         * @brief 회원 가입 폼 출력
-         **/
-        function dispMemberSignUpForm() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인한 회원일 경우 해당 회원의 정보를 받음
-            if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
-
-            // before 트리거 호출
-            $trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $this->member_config);
-            if(!$trigger_output->toBool()) return $trigger_output;
-
-            // 회원가입을 중지시켰을 때는 에러 표시
-            if($this->member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
-            Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
-
-            $member_config = $oMemberModel->getMemberConfig();
-            Context::set('member_config', $member_config);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('signup_form');
-        }
-
-        /**
-         * @brief 회원 정보 수정
-         **/
-        function dispMemberModifyInfo() {
-            $oMemberModel = &getModel('member');
-            $oModuleModel = &getModel('module');
-            $memberModuleConfig = $oModuleModel->getModuleConfig('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-            $member_info->signature = $oMemberModel->getSignature($member_srl);
-            Context::set('member_info',$member_info);
-
-            // 추가 가입폼 목록을 받음
-            Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
-
-            Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
-
-            // 에디터 모듈의 getEditor를 호출하여 서명용으로 세팅
-            if($member_info->member_srl) {
-                $oEditorModel = &getModel('editor');
-                $option->primary_key_name = 'member_srl';
-                $option->content_key_name = 'signature';
-                $option->allow_fileupload = false;
-                $option->enable_autosave = false;
-                $option->enable_default_component = true;
-                $option->enable_component = false;
-                $option->resizable = false;
-                $option->disable_html = true;
-                $option->height = 200;
-                $option->skin = $this->member_config->editor_skin;
-                $option->colorset = $this->member_config->editor_colorset;
-                $editor = $oEditorModel->getEditor($member_info->member_srl, $option);
-                Context::set('editor', $editor);
-            }
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('modify_info');
-        }
-
-
-        /**
-         * @brief 회원 작성글 보기
-         **/
-        function dispMemberOwnDocument() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            $module_srl = Context::get('module_srl');
-            Context::set('module_srl',Context::get('selected_module_srl'));
-            Context::set('search_target','member_srl');
-            Context::set('search_keyword',$member_srl);
-
-            $oDocumentAdminView = &getAdminView('document');
-            $oDocumentAdminView->dispDocumentAdminList();
-
-            Context::set('module_srl', $module_srl);
-            $this->setTemplateFile('document_list');
-        }
-
-        /**
-         * @brief 회원 스크랩 게시물 보기
-         **/
-        function dispMemberScrappedDocument() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-            $args->member_srl = $logged_info->member_srl;
-            $args->page = (int)Context::get('page');
-
-            $output = executeQuery('member.getScrapDocumentList', $args);
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('document_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            $this->setTemplateFile('scrapped_list');
-        }
-
-        /**
-         * @brief 회원의 저장함 보기
-         **/
-        function dispMemberSavedDocument() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            // 저장함에 보관된 글을 가져옴 (저장함은 module_srl이 member_srl로 세팅되어 있음)
-            $logged_info = Context::get('logged_info');
-            $args->module_srl = $logged_info->member_srl;
-            $args->page = (int)Context::get('page');
-
-            $oDocumentModel = &getModel('document');
-            $output = $oDocumentModel->getDocumentList($args, true);
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('document_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            $this->setTemplateFile('saved_list');
-        }
-
-        /**
-         * @brief 로그인 폼 출력
-         **/
-        function dispMemberLoginForm() {
-            if(Context::get('is_logged')) {
-                Context::set('redirect_url', getUrl('act',''));
-                $this->setTemplatePath($this->module_path.'tpl');
-                $this->setTemplateFile('redirect.html');
-                return;
-            }
-
-            // 템플릿 파일 지정
-            Context::set('referer_url', $_SERVER['HTTP_REFERER']);
-            $this->setTemplateFile('login_form');
-        }
-
-        /**
-         * @brief 회원 비밀번호 수정
-         **/
-        function dispMemberModifyPassword() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-            Context::set('member_info',$member_info);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('modify_password');
-        }
-
-        /**
-         * @brief 탈퇴 화면
-         **/
-        function dispMemberLeave() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-            Context::set('member_info',$member_info);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('leave_form');
-        }
-
-        /**
-         * @brief 오픈 아이디 탈퇴 화면
-         **/
-        function dispMemberOpenIDLeave() {
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
-            Context::set('member_info',$member_info);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('openid_leave_form');
-        }
-
-        /**
-         * @brief 로그아웃 출력
-         **/
-        function dispMemberLogout() {
-            $oMemberController = &getController('member');
-            $oMemberController->procMemberLogout();
-
-            Context::set('layout','none');
-            $this->setTemplatePath($this->module_path.'/tpl');
-            $this->setTemplateFile('logout');
-        }
-
-        /**
-         * @brief 저장된 글 목록을 보여줌
-         **/
-        function dispSavedDocumentList() {
-            $this->setLayoutFile('popup_layout');
-
-            $oMemberModel = &getModel('member');
-
-            // 로그인 되어 있지 않을 경우 로그인 되어 있지 않다는 메세지 출력
-            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
-
-            // 저장함에 보관된 글을 가져옴 (저장함은 module_srl이 member_srl로 세팅되어 있음)
-            $logged_info = Context::get('logged_info');
-            $args->module_srl = $logged_info->member_srl;
-            $args->page = (int)Context::get('page');
-            $args->list_count = 10;
-
-            $oDocumentModel = &getModel('document');
-            $output = $oDocumentModel->getDocumentList($args, true);
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('document_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            $this->setTemplateFile('saved_list_popup');
-        }
-
-        /**
-         * @brief  아이디/ 비밀번호 찾기 기능
-         **/
-        function dispMemberFindAccount() {
-            if(Context::get('is_logged')) return $this->stop('already_logged');
-
-            $this->setTemplateFile('find_member_account');
-        }
-
-        /**
-         * @brief  임시 비밀번호 발급
-         **/
-        function dispMemberGetTempPassword() {
-            if(Context::get('is_logged')) return $this->stop('already_logged');
-
-            $user_id = Context::get('user_id');
-            $temp_password = $_SESSION['xe_temp_password_'.$user_id];
-            unset($_SESSION['xe_temp_password_'.$user_id]);
-
-            if(!$user_id||!$temp_password) return new Object(-1,'msg_invaild_request');
-
-            Context::set('temp_password', $temp_password);
-
-            $this->setTemplateFile('find_temp_password');
-        }
-
-        /**
-         * @brief  인증 메일 재발송 페이지
-         **/
-        function dispMemberResendAuthMail() {
-            if(Context::get('is_logged')) return $this->stop('already_logged');
-
-            $this->setTemplateFile('resend_auth_mail');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  memberView
+     * @author NHN (developers@xpressengine.com)
+     * @brief View class of member module
+     **/
+
+    class memberView extends member {
+
+        var $group_list = NULL; // /< Group list information
+        var $member_info = NULL; // /< Member information of the user
+        var $skin = 'default';
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Get the member configuration
+            $oModuleModel = &getModel('module');
+            $this->member_config = $oModuleModel->getModuleConfig('member');
+            if(!$this->member_config->skin) $this->member_config->skin = "default";
+            if(!$this->member_config->colorset) $this->member_config->colorset = "white";
+
+            Context::set('member_config', $this->member_config);
+            $skin = $this->member_config->skin;
+            // Set the template path
+            $tpl_path = sprintf('%sskins/%s', $this->module_path, $skin);
+            if(!is_dir($tpl_path)) $tpl_path = sprintf('%sskins/%s', $this->module_path, 'default');
+            $this->setTemplatePath($tpl_path);
+        }
+
+        /**
+         * @brief Display member information
+         **/
+        function dispMemberInfo() {
+            $oMemberModel = &getModel('member');
+            $logged_info = Context::get('logged_info');
+            // Don't display member info to non-logged user
+            if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
+
+            $member_srl = Context::get('member_srl');
+            if(!$member_srl && Context::get('is_logged')) {
+                $member_srl = $logged_info->member_srl;
+            } elseif(!$member_srl) {
+                return $this->dispMemberSignUpForm();
+            }
+
+            $oModuleModel = &getModel('module');
+            $member_config = $oModuleModel->getModuleConfig('member');
+			if(is_array($member_config->signupForm))
+			{
+				global $lang;
+				foreach($member_config->signupForm AS $key=>$value)
+				{
+					if($lang->{$value->title})
+						$member_config->signupForm[$key]->title = $lang->{$value->title};
+				}
+			}
+            Context::set('member_config', $member_config);
+
+            $site_module_info = Context::get('site_module_info');
+			$columnList = array('member_srl', 'user_id', 'email_address', 'user_name', 'nick_name', 'homepage', 'blog', 'birthday', 'regdate', 'last_login', 'extra_vars');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, $site_module_info->site_srl, $columnList);
+            unset($member_info->password);
+            unset($member_info->email_id);
+            unset($member_info->email_host);
+
+            if(!$member_info->member_srl) return $this->dispMemberSignUpForm();
+			
+			Context::set('memberInfo', get_object_vars($member_info));
+
+			$extendForm = $oMemberModel->getCombineJoinForm($member_info);
+            unset($extendForm->find_member_account);
+            unset($extendForm->find_member_answer);
+            Context::set('extend_form_list', $extendForm);
+            if ($member_info->member_srl == $logged_info->member_srl)
+                Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
+
+            $this->setTemplateFile('member_info');
+        }
+
+        /**
+         * @brief Display member join form
+         **/
+        function dispMemberSignUpForm() {
+        	//setcookie for redirect url in case of going to member sign up
+            if (!isset($_COOKIE["XE_REDIRECT_URL"]))
+			setcookie("XE_REDIRECT_URL", $_SERVER['HTTP_REFERER']);
+			
+            $oMemberModel = &getModel('member');
+            // Get the member information if logged-in
+            if($oMemberModel->isLogged()) return $this->stop('msg_already_logged');
+            // call a trigger (before) 
+            $trigger_output = ModuleHandler::triggerCall('member.dispMemberSignUpForm', 'before', $this->member_config);
+            if(!$trigger_output->toBool()) return $trigger_output;
+            // Error appears if the member is not allowed to join
+            if($this->member_config->enable_join != 'Y') return $this->stop('msg_signup_disabled');
+
+			$oMemberAdminView = &getAdminView('member');
+			$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
+			Context::set('formTags', $formTags);
+
+            $member_config = $oMemberModel->getMemberConfig();
+            Context::set('member_config', $member_config);
+			
+			global $lang;
+			$identifierForm->title = $lang->{$member_config->identifier};
+			$identifierForm->name = $member_config->identifier;
+			$identifierForm->value = $member_info->{$member_config->identifier};
+			Context::set('identifierForm', $identifierForm);
+            // Set a template file
+            $this->setTemplateFile('signup_form');
+        }
+
+        /**
+         * @brief Modify member information
+         **/
+        function dispMemberModifyInfo() {
+            $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
+            $memberModuleConfig = $oModuleModel->getModuleConfig('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+
+			$columnList = array('member_srl', 'user_id', 'user_name', 'nick_name', 'email_address', 'find_account_answer', 'homepage', 'blog', 'birthday', 'allow_mailing');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+            $member_info->signature = $oMemberModel->getSignature($member_srl);
+            Context::set('member_info',$member_info);
+            // Get a list of extend join form
+            Context::set('extend_form_list', $oMemberModel->getCombineJoinForm($member_info));
+
+            Context::set('openids', $oMemberModel->getMemberOpenIDByMemberSrl($member_srl));
+            // Editor of the module set for signing by calling getEditor
+            if($member_info->member_srl) {
+                $oEditorModel = &getModel('editor');
+                $option->primary_key_name = 'member_srl';
+                $option->content_key_name = 'signature';
+                $option->allow_fileupload = false;
+                $option->enable_autosave = false;
+                $option->enable_default_component = true;
+                $option->enable_component = false;
+                $option->resizable = false;
+                $option->disable_html = true;
+                $option->height = 200;
+                $option->skin = $this->member_config->editor_skin;
+                $option->colorset = $this->member_config->editor_colorset;
+                $editor = $oEditorModel->getEditor($member_info->member_srl, $option);
+                Context::set('editor', $editor);
+            }
+
+			$oMemberAdminView = &getAdminView('member');
+			$formTags = $oMemberAdminView->_getMemberInputTag($member_info);
+			Context::set('formTags', $formTags);
+
+            $member_config = $oMemberModel->getMemberConfig();
+            Context::set('member_config', $member_config);
+
+			global $lang;
+			$identifierForm->title = $lang->{$member_config->identifier};
+			$identifierForm->name = $member_config->identifier;
+			$identifierForm->value = $member_info->{$member_config->identifier};
+			Context::set('identifierForm', $identifierForm);
+            // Set a template file
+            $this->setTemplateFile('modify_info');
+        }
+
+
+        /**
+         * @brief Display documents written by the member
+         **/
+        function dispMemberOwnDocument() {
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+
+            $module_srl = Context::get('module_srl');
+            Context::set('module_srl',Context::get('selected_module_srl'));
+            Context::set('search_target','member_srl');
+            Context::set('search_keyword',$member_srl);
+
+            $oDocumentAdminView = &getAdminView('document');
+            $oDocumentAdminView->dispDocumentAdminList();
+
+            Context::set('module_srl', $module_srl);
+            $this->setTemplateFile('document_list');
+        }
+
+        /**
+         * @brief Display documents scrapped by the member
+         **/
+        function dispMemberScrappedDocument() {
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+            $args->page = (int)Context::get('page');
+
+            $output = executeQuery('member.getScrapDocumentList', $args);
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('document_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            $this->setTemplateFile('scrapped_list');
+        }
+
+        /**
+         * @brief Display documents saved by the member
+         **/
+        function dispMemberSavedDocument() {
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+            // Get the saved document(module_srl is set to member_srl instead)
+            $logged_info = Context::get('logged_info');
+            $args->member_srl = $logged_info->member_srl;
+            $args->page = (int)Context::get('page');
+			$args->statusList = array('TEMP');
+
+            $oDocumentModel = &getModel('document');
+            $output = $oDocumentModel->getDocumentList($args, true);
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('document_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+
+            $this->setTemplateFile('saved_list');
+        }
+
+        /**
+         * @brief Display the login form 
+         **/
+        function dispMemberLoginForm() {
+            if(Context::get('is_logged')) {
+                Context::set('redirect_url', getUrl('act',''));
+                $this->setTemplatePath($this->module_path.'tpl');
+                $this->setTemplateFile('redirect.html');
+                return;
+            }
+            // Set a template file
+            Context::set('referer_url', $_SERVER['HTTP_REFERER']);
+			Context::set('act', 'procMemberLogin');
+            $this->setTemplateFile('login_form');
+        }
+
+        /**
+         * @brief Change the user password
+         **/
+        function dispMemberModifyPassword() {
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+
+			$columnList = array('member_srl', 'user_id');
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl, 0, $columnList);
+            Context::set('member_info',$member_info);
+            // Set a template file
+            $this->setTemplateFile('modify_password');
+        }
+
+        /**
+         * @brief Member withdrawl
+         **/
+        function dispMemberLeave() {
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+            Context::set('member_info',$member_info);
+            // Set a template file
+            $this->setTemplateFile('leave_form');
+        }
+
+        /**
+         * @brief OpenID member withdrawl
+         **/
+        function dispMemberOpenIDLeave() {
+            $oMemberModel = &getModel('member');
+            // A message appears if the user is not logged-in
+            if(!$oMemberModel->isLogged()) return $this->stop('msg_not_logged');
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+
+            $member_info = $oMemberModel->getMemberInfoByMemberSrl($member_srl);
+            Context::set('member_info',$member_info);
+            // Set a template file
+            $this->setTemplateFile('openid_leave_form');
+        }
+
+        /**
+         * @brief Member log-out
+         **/
+        function dispMemberLogout() {
+            $oMemberController = &getController('member');
+            $output = $oMemberController->procMemberLogout();
+			if(!$output->redirect_url)
+				$this->setRedirectUrl(getNotEncodedUrl('act', ''));
+			else
+				$this->setRedirectUrl($output->redirect_url);
+		
+			return;
+        }
+
+        /**
+         * @brief Display a list of saved articles
+		 * @Deplicated - instead Document View - dispTempSavedList method use
+         **/
+        function dispSavedDocumentList() {
+			return new Object(0, 'Deplicated method');
+        }
+
+        /**
+         * @brief Find user ID and password
+         **/
+        function dispMemberFindAccount() {
+            if(Context::get('is_logged')) return $this->stop('already_logged');
+
+			$oMemberModel = &getModel('member');
+			$config = $oMemberModel->getMemberConfig();
+			
+			Context::set('identifier', $config->identifier);
+
+            $this->setTemplateFile('find_member_account');
+        }
+
+        /**
+         * @brief Generate a temporary password
+         **/
+        function dispMemberGetTempPassword() {
+            if(Context::get('is_logged')) return $this->stop('already_logged');
+
+            $user_id = Context::get('user_id');
+            $temp_password = $_SESSION['xe_temp_password_'.$user_id];
+            unset($_SESSION['xe_temp_password_'.$user_id]);
+
+            if(!$user_id||!$temp_password) return new Object(-1,'msg_invaild_request');
+
+            Context::set('temp_password', $temp_password);
+
+            $this->setTemplateFile('find_temp_password');
+        }
+
+        /**
+         * @brief Page of re-sending an authentication mail
+         **/
+        function dispMemberResendAuthMail() {
+            if(Context::get('is_logged')) return $this->stop('already_logged');
+
+            $this->setTemplateFile('resend_auth_mail');
+        }
+    }
+?>
diff --git a/modules/member/queries/getDeniedIDs.xml b/modules/member/queries/getDeniedIDs.xml
new file mode 100644
index 000000000..e367ab393
--- /dev/null
+++ b/modules/member/queries/getDeniedIDs.xml
@@ -0,0 +1,8 @@
+<query id="getDeniedIDs" action="select">
+    <tables>
+        <table name="member_denied_user_id" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+</query>
diff --git a/modules/member/queries/getMemberCountByDate.xml b/modules/member/queries/getMemberCountByDate.xml
new file mode 100644
index 000000000..4dd02a5b1
--- /dev/null
+++ b/modules/member/queries/getMemberCountByDate.xml
@@ -0,0 +1,11 @@
+<query id="getMemberCountByDate" action="select">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+		<condition operation="like_prefix" column="regdate" var="regDate" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/getMemberGroupMemberCountByDate.xml b/modules/member/queries/getMemberGroupMemberCountByDate.xml
new file mode 100644
index 000000000..c696b3532
--- /dev/null
+++ b/modules/member/queries/getMemberGroupMemberCountByDate.xml
@@ -0,0 +1,14 @@
+<query id="getMemberGroupMemberCountByDate" action="select">
+    <tables>
+        <table name="member_group_member" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+		<condition operation="like_prefix" column="regdate" var="regDate" />
+    </conditions>
+    <groups>
+		<group column="member_srl" />
+    </groups>
+</query>
diff --git a/modules/member/queries/getMemberInfoByEmailAddress.xml b/modules/member/queries/getMemberInfoByEmailAddress.xml
new file mode 100644
index 000000000..14ab0f645
--- /dev/null
+++ b/modules/member/queries/getMemberInfoByEmailAddress.xml
@@ -0,0 +1,11 @@
+<query id="getMemberInfoByEmailAddress" action="select">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="email_address" var="email_address" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/getMemberList.xml b/modules/member/queries/getMemberList.xml
index 5caf02d90..6b9fb7bc6 100644
--- a/modules/member/queries/getMemberList.xml
+++ b/modules/member/queries/getMemberList.xml
@@ -8,6 +8,7 @@
     <conditions>
         <condition operation="equal" column="is_admin" var="is_admin" />
         <condition operation="equal" column="denied" var="is_denied" pipe="and" />
+        <condition operation="in" column="member_srl" var="member_srls" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="user_id" var="s_user_id" />
             <condition operation="like" column="user_name" var="s_user_name" pipe="or" />
diff --git a/modules/member/queries/getMemberListWithinGroup.xml b/modules/member/queries/getMemberListWithinGroup.xml
index 646604828..9d1dc2705 100644
--- a/modules/member/queries/getMemberListWithinGroup.xml
+++ b/modules/member/queries/getMemberListWithinGroup.xml
@@ -10,6 +10,7 @@
         <group pipe="and">
             <condition operation="equal" column="member.is_admin" var="is_admin" />
             <condition operation="equal" column="member.denied" var="is_denied" pipe="and" />
+			<condition operation="in" column="member.member_srls" var="member_srls" pipe="and" />
         </group>
         <group pipe="and">
             <condition operation="like" column="member.user_id" var="s_user_id" />
@@ -26,6 +27,9 @@
             <condition operation="less" column="member.last_login" var="s_last_login_less" pipe="or" />
         </group>
     </conditions>
+	<groups>
+		<group column="member.member_srl" />
+	</groups>
     <navigation>
         <index var="sort_index" default="member.list_order" order="sort_order" />
         <list_count var="list_count" default="20" />
diff --git a/modules/member/queries/getMembersGroups.xml b/modules/member/queries/getMembersGroups.xml
index b26191ff4..ec75ffdc1 100644
--- a/modules/member/queries/getMembersGroups.xml
+++ b/modules/member/queries/getMembersGroups.xml
@@ -13,4 +13,7 @@
         <condition operation="equal" column="a.group_srl" default="b.group_srl" pipe="and" />
         <condition operation="in" column="b.member_srl" var="member_srls" filter="numbers" notnull="notnull" pipe="and" />
     </conditions>
+	<navigation>
+		<index var="sort_index" default="a.group_srl" order="desc" />
+	</navigation>
 </query>
diff --git a/modules/member/queries/getSiteAdminMemberSrls.xml b/modules/member/queries/getSiteAdminMemberSrls.xml
new file mode 100644
index 000000000..6c2c9a7b0
--- /dev/null
+++ b/modules/member/queries/getSiteAdminMemberSrls.xml
@@ -0,0 +1,11 @@
+<query id="getSiteAdminMemberSrls" action="select">
+    <tables>
+        <table name="site_admin" />
+    </tables>
+    <columns>
+        <column name="member_srl" />
+    </columns>
+	<groups>
+		<group column="member_srl" />
+	</groups>
+</query>
diff --git a/modules/member/queries/updateGroup.xml b/modules/member/queries/updateGroup.xml
index d69e1a304..793924b5d 100644
--- a/modules/member/queries/updateGroup.xml
+++ b/modules/member/queries/updateGroup.xml
@@ -7,6 +7,7 @@
         <column name="is_default" var="is_default" default="N" notnull="notnull" />
         <column name="description" var="description" default="" />
         <column name="image_mark" var="image_mark" default="" />
+		<column name="list_order" var="list_order" />
     </columns>
     <conditions>
         <condition operation="equal" column="group_srl" var="group_srl" notnull="notnull" filter="number" />
diff --git a/modules/member/queries/updateMember.xml b/modules/member/queries/updateMember.xml
index 724cfa7e8..8989b4588 100644
--- a/modules/member/queries/updateMember.xml
+++ b/modules/member/queries/updateMember.xml
@@ -3,14 +3,13 @@
         <table name="member" />
     </tables>
     <columns>
-        <column name="email_address" var="email_address" filter="email" notnull="notnull" />
         <column name="password" var="password" notnull="notnull" />
-        <column name="email_id" var="email_id" notnull="notnull" />
-        <column name="email_host" var="email_host" notnull="notnull" />
         <column name="user_name" var="user_name" notnull="notnull" minlength="2" maxlength="40" />
         <column name="nick_name" var="nick_name" notnull="notnull" minlength="2" maxlength="40" />
+        <column name="user_id" var="user_id" notnull="notnull" />
+		<column name="email_address" var="email_address" notnull="notnull"/>
         <column name="find_account_question" var="find_account_question" />
-        <column name="find_account_answer" var="find_account_answer" />
+        <column name="find_account_answer" var="find_account_answer" default="" />
         <column name="homepage" var="homepage" default="" />
         <column name="blog" var="blog" default="" />
         <column name="birthday" var="birthday" />
diff --git a/modules/member/queries/updateMemberDeniedInfo.xml b/modules/member/queries/updateMemberDeniedInfo.xml
new file mode 100644
index 000000000..4725a459d
--- /dev/null
+++ b/modules/member/queries/updateMemberDeniedInfo.xml
@@ -0,0 +1,11 @@
+<query id="updatememberDeniedInfo" action="update">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="denied" var="denied" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
+    </conditions>
+</query>
diff --git a/modules/member/ruleset/deleteGroup.xml b/modules/member/ruleset/deleteGroup.xml
new file mode 100644
index 000000000..c15f708cc
--- /dev/null
+++ b/modules/member/ruleset/deleteGroup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="group_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/insert.xml b/modules/member/ruleset/insert.xml
new file mode 100644
index 000000000..b4e26144f
--- /dev/null
+++ b/modules/member/ruleset/insert.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="user_id" required="true" length="3:20" />
+		<field name="user_name" required="true" length="2:40" />
+		<field name="nick_name" required="true" length="2:40" />
+		<field name="email_address" required="true" length="1:200" rule="email" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/insertConfig.xml b/modules/member/ruleset/insertConfig.xml
new file mode 100644
index 000000000..58503c1cf
--- /dev/null
+++ b/modules/member/ruleset/insertConfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="webmaster_name" required="true" length="2:40" />
+		<field name="webmaster_email" length="1:200" rule="email" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/insertDeniedId.xml b/modules/member/ruleset/insertDeniedId.xml
new file mode 100644
index 000000000..2b5b037fd
--- /dev/null
+++ b/modules/member/ruleset/insertDeniedId.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="user_id" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/insertGroup.xml b/modules/member/ruleset/insertGroup.xml
new file mode 100644
index 000000000..79b27e272
--- /dev/null
+++ b/modules/member/ruleset/insertGroup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/insertJoinForm.xml b/modules/member/ruleset/insertJoinForm.xml
new file mode 100644
index 000000000..e4d593d79
--- /dev/null
+++ b/modules/member/ruleset/insertJoinForm.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="column_type" required="true" />
+		<field name="column_name" required="true" rule="alpha" />
+		<field name="column_title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/leaveMember.xml b/modules/member/ruleset/leaveMember.xml
new file mode 100644
index 000000000..332ab7264
--- /dev/null
+++ b/modules/member/ruleset/leaveMember.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="password" required="true" length=":20" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/login.xml b/modules/member/ruleset/login.xml
new file mode 100644
index 000000000..8208d831f
--- /dev/null
+++ b/modules/member/ruleset/login.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="user_id" required="true" rule="userid" />
+		<field name="password" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/manageMemberGroup.xml b/modules/member/ruleset/manageMemberGroup.xml
new file mode 100644
index 000000000..3ea817e84
--- /dev/null
+++ b/modules/member/ruleset/manageMemberGroup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="group_srls" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/modifyInfo.xml b/modules/member/ruleset/modifyInfo.xml
new file mode 100644
index 000000000..be2a73867
--- /dev/null
+++ b/modules/member/ruleset/modifyInfo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="user_name" required="true" length="2:40" />
+		<field name="nick_name" required="true" length="2:40" />
+		<field name="email_address" required="true" length="1:200" rule="email" />
+		<field name="find_account_question" required="true" />
+		<field name="find_account_answer" required="true" length=":250" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/modifyPassword.xml b/modules/member/ruleset/modifyPassword.xml
new file mode 100644
index 000000000..ec847a6f1
--- /dev/null
+++ b/modules/member/ruleset/modifyPassword.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="current_password" required="true" length="1:50" />
+		<field name="password1" required="true" length="6:20" />
+		<field name="password2" required="true" length="6:20" equalto="password1" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/openidLogin.xml b/modules/member/ruleset/openidLogin.xml
new file mode 100644
index 000000000..0b2a7ef1b
--- /dev/null
+++ b/modules/member/ruleset/openidLogin.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="openid" required="true" />
+		<field name="referer_url" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/resendAuthMail.xml b/modules/member/ruleset/resendAuthMail.xml
new file mode 100644
index 000000000..108ab2e1f
--- /dev/null
+++ b/modules/member/ruleset/resendAuthMail.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="email_address" required="true" length="1:200" rule="email" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/signup.xml b/modules/member/ruleset/signup.xml
new file mode 100644
index 000000000..74b592132
--- /dev/null
+++ b/modules/member/ruleset/signup.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="user_id" required="true" length="3:20" />
+		<field name="password1" required="true" length="6:20" />
+		<field name="password2" required="true" length="6:20" equalto="password1" />
+		<field name="user_name" required="true" length="2:40" />
+		<field name="nick_name" required="true" length="2:40" />
+		<field name="email_address" required="true" length="1:200" rule="email" />
+		<field name="find_account_question" required="true" />
+		<field name="find_account_answer" required="true" length=":250" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/updateGroup.xml b/modules/member/ruleset/updateGroup.xml
new file mode 100644
index 000000000..adde869ac
--- /dev/null
+++ b/modules/member/ruleset/updateGroup.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="group_srl" required="true" rule="number" />
+		<field name="title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/member/ruleset/updateSeletedMemberInfo.xml b/modules/member/ruleset/updateSeletedMemberInfo.xml
new file mode 100644
index 000000000..360bd78c1
--- /dev/null
+++ b/modules/member/ruleset/updateSeletedMemberInfo.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="member_srls" required="true" />
+		<field name="groups">
+			<if test="$type == 'modify'" attr="required" value="true" />
+		</field>
+    </fields>
+</ruleset>
diff --git a/modules/member/skins/default/common_header.html b/modules/member/skins/default/common_header.html
index cfce1d9ee..8f68d9fb1 100644
--- a/modules/member/skins/default/common_header.html
+++ b/modules/member/skins/default/common_header.html
@@ -1,12 +1,10 @@
-<!--%import("js/member.js")-->
-<!--%import("css/default.css")-->
-
-<div id="memberModule">
-
-    <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
-    <ul class="localNavigation">
-        <!--@foreach($logged_info->menu_list as $key => $val)-->
-        <li <!--@if($key == $act)-->class="on"<!--@end-->><a href="{getUrl('act',$key)}">{Context::getLang($val)}</a></li>
-        <!--@end-->
-    </ul>
-    <!--@end-->
+<load target="js/member.js" />
+<load target="css/member.css" />
+<div class="xm">
+    <div class="nav" cond="$is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl)">
+		<ul>
+			<li loop="$logged_info->menu_list=>$key,$val" class="active"|cond="$key==$act">
+				<a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}"><span>{Context::getLang($val)}</span></a>
+			</li>
+		</ul>
+	</div>
diff --git a/modules/member/skins/default/confirm_member_account_mail.html b/modules/member/skins/default/confirm_member_account_mail.html
index ba12e647b..1e0950baf 100644
--- a/modules/member/skins/default/confirm_member_account_mail.html
+++ b/modules/member/skins/default/confirm_member_account_mail.html
@@ -2,10 +2,7 @@
 <hr noshade="noshade" />
 <ul>
     <li>Site : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
-    <li>{$lang->user_id} : {$member_info->user_id}</li>
-    <li>{$lang->user_name} : {$member_info->user_name}</li>
-    <li>{$lang->nick_name} : {$member_info->nick_name}</li>
-    <li>{$lang->email_address} : {$member_info->email_address}</li>
+    <li loop="$memberInfo=>$name,$value">{$name} : {$value}</li>
 </ul>
 <hr noshade="noshade" />
 {$lang->msg_confirm_account_comment}<br />
diff --git a/modules/member/skins/default/css/default.css b/modules/member/skins/default/css/default.css
deleted file mode 100644
index 453573bbf..000000000
--- a/modules/member/skins/default/css/default.css
+++ /dev/null
@@ -1,129 +0,0 @@
-@charset "utf-8";
-
-#memberModule h3 {border-bottom:2px solid #ccc; padding:5px 0 5px 25px; margin:0 0 10px 0; background:url(../img/iconH2.gif) no-repeat left center; font-size:12px; color:#666; }
-#memberModule h4 {padding:5px 0 5px 20px; background:url(../img/iconH3.gif) no-repeat left center;}
-#memberModule h4 span.vr { font-size:11px; color:#AAA; }
-#memberModule h4 a.view { font-size:11px; font-family:vertical; color:#777e86; }
-#memberModule p.summary, 
-#memberModule div.infoText { margin:0 0 15px 0; line-height:1.6;}
-#memberModule p.summary{ color:#888;}
-#memberModule p.summary a { text-decoration:none; color:#888; }
-#memberModule p.summary.red { color:#A54D4D; }
-#memberModule p.summary.red a { text-decoration:none; color:#A54D4D; }
-#memberModule div.infoText { color:#888;}
-#memberModule select{ font-size:12px}
-
-#memberModule .agreementBox { border:1px solid #CCC; margin:10px 0 0 0; padding:10px; border-bottom:none; height:200px; overflow-y:scroll;}
-#memberModule .agreementButton { background-color:#EFEFEF; padding:10px; border:1px solid #CCC; border-top:none; margin-bottom:10px;}
-
-#memberModule .localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; }
-#memberModule .localNavigation:after {content:""; display:block; clear:both;}
-#memberModule .localNavigation li{ position:relative; list-style:none; float:left; margin:0 -1px 0 0; padding:0;background:#fff;}
-#memberModule .localNavigation li a{ float:left; padding:7px 15px 0 15px; height:18px; border:1px solid #ddd; border-bottom:none; background:url(../img/bgTab.gif) repeat-x;}
-#memberModule .localNavigation li a{ text-decoration:none !important; color:#666;}
-#memberModule .localNavigation li.active a{ font-weight:bold; color:#1e6aac;}
-#memberModule .localNavigation li.on { margin-bottom:-1px;}
-#memberModule .localNavigation li.on a{ height:19px; background:none;}
-
-#memberModule .layer { display:none; position:absolute; border:2px solid #777; margin:0; font-size:12px; background:#fff;}
-#memberModule .layer * { margin:0; padding:0; font-size:12px; }
-#memberModule .layer h4 { font-size:14px !important; font-family:Dotum; background:#f4f4f4 !important; padding:8px 30px 8px 15px !important; letter-spacing:-1px !important; }
-#memberModule .layer .xButton { position:absolute; top:9px; right:9px; width:15px; height:14px; background-color:transparent; background:url(../img/buttonClose.gif) no-repeat; border:0; cursor:pointer; overflow:hidden; }
-#memberModule .layer .xButton span { position:relative; z-index:-1; visibility:hidden; }
-#memberModule .layer .layerBody{ margin:15px;}
-
-#memberModule .crossTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
-#memberModule .crossTable th div { white-space:nowrap; }
-#memberModule .crossTable th,
-#memberModule .crossTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
-#memberModule .crossTable thead th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
-#memberModule .crossTable thead th:first-child{ background-image:none;}
-#memberModule .crossTable tbody th{ border-bottom:1px solid #e5e5e5; text-align:left;}
-#memberModule .crossTable td{ border-bottom:1px solid #f0f0f0;}
-
-#memberModule .colTable{ width:100%; border:0; margin:0 0 20px 0; padding:0;}
-#memberModule .colTable th div { white-space:nowrap; }
-#memberModule .colTable th,
-#memberModule .colTable td{ border:0; padding:5px 10px; vertical-align:top; font-weight:normal;}
-#memberModule .colTable th{ border-top:2px solid #cfcfcf; border-bottom:1px solid #e5e5e5; background:#f4f4f4; background-image:url(../img/lineVrText.gif); background-repeat:no-repeat; background-position:left center;}
-#memberModule .colTable th:first-child{ background-image:none;}
-#memberModule .colTable td{ border-bottom:1px solid #f0f0f0;}
-
-#memberModule .rowTable{ width:100%; border:0; border-top:2px solid #cfcfcf; margin:0 0 20px 0; padding:0;}
-#memberModule .rowTable th div { white-space:nowrap; }
-#memberModule .rowTable th,
-#memberModule .rowTable td{ border:0; padding:10px 10px; text-align:left; vertical-align:top; font-weight:normal;}
-#memberModule .rowTable tbody th{ border-bottom:1px solid #e5e5e5;}
-#memberModule .rowTable td{ border-bottom:1px solid #e5e5e5;}
-
-#memberModule .rowTable th.button, 
-#memberModule .colTable th.button, 
-#memberModule .crossTable th.button { text-align:right; background:#EAEAEA; }
-
-#memberModule .colTable td a,
-#memberModule .rowTable td a,
-#memberModule .crossTable td a { color:#000; text-decoration:none; }
-
-#memberModule .colTable td.wide, 
-#memberModule .rowTable td.wide, 
-#memberModule .crossTable td.wide { width:100%;}
-
-#memberModule .rowTable th.title,
-#memberModule .crossTable th.title,
-#memberModule .colTable th.title { padding:10px; font-weight:bold; text-align:center; border-bottom:1px solid #DDD;  background:url(../img/bgTab.gif) repeat-x left bottom;}
-
-#memberModule p { color:#666; margin:3px 0 0 0; padding:0;}
-#dummy_check_nick_name { color:red; margin:3px 0 0 0; padding:0; }
-#memberModule .require { color:red; font-size:10px; font-family:tahoma; font-weight:bold; margin-left:5px; }
-#memberModule .publicItem { margin:5px 0 0 0; padding:0; color:#aaa; }
-#memberModule .publicItem input { padding:0; margin: 0; }
-
-#memberModule caption{ font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
-
-#memberModule td.openids div { float:left; margin-right:10px; margin-bottom:10px; }
-#memberModule td.openids div a { color:#AAA; text-decoration:none;}
-#memberModule .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:200px;}
-#memberModule .insertOpenID { clear:both; margin-top:10px; }
-#memberModule .savedContent { margin-top:10px; border:1px solid #EEE; padding:10px; }
-
-#memberModule .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
-#memberModule .pagination *{ margin:0; padding:0;}
-#memberModule .pagination img{ border:0;}
-#memberModule .pagination a,
-#memberModule .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
-#memberModule .pagination a:hover,
-#memberModule .pagination a:active,
-#memberModule .pagination a:focus{ background-color:#f4f4f4 !important; }
-#memberModule .pagination strong{ color:#ff6600 !important;}
-#memberModule .pagination a.prev,
-#memberModule .pagination a.prevEnd,
-#memberModule .pagination a.next,
-#memberModule .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
-
-#memberModule .pagination.a1 a,
-#memberModule .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
-#memberModule .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
-#memberModule .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
-#memberModule .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
-#memberModule .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
-
-#memberModule .memberSmallBox { border:1px solid #EFEFEF; margin:50px auto 20px auto; padding:0; width:400px;}
-#memberModule .memberSmallBox .header { padding:10px; font-weight:bold; text-align:center; border-bottom:1px solid #DDD;  background:url(../img/bgTab.gif) repeat-x left bottom;}
-#memberModule fieldset { position:relative; border:0; margin:0; padding:10px;}
-#memberModule .memberSmallBox .login dl { margin:0; padding:0; overflow:hidden; margin-right:10px; width:250px;}
-#memberModule .memberSmallBox .login dl dt { margin:0; padding:0; width:100px; clear:left; float:left; color:#54564b; height:24px; padding-top:3px; text-indent:10px;}
-#memberModule .memberSmallBox .login dl dd { margin:0; padding:0; float:left; height:27px; width:150px; }
-#memberModule .memberSmallBox .login .keep { clear:both; white-space:nowrap; margin-left:100px;}
-#memberModule .memberSmallBox .login .keep input { vertical-align:middle;}
-#memberModule .memberSmallBox .login .keep label { margin:0; padding:0; font-size:12px; color:#999999;}
-#memberModule .memberSmallBox .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:120px;}
-#memberModule .memberSmallBox .help { background:#f5f5f3; color:#666666; border-top:1px solid #eaebe7; overflow:hidden; padding:1.1em; color:#ccc;}
-#memberModule .memberSmallBox .help a{ color:#666; text-decoration:underline;}
-#memberModule .memberSmallBox .buttonArea{ position:absolute; top:10px; left:260px;}
-
-#memberModule ul.checkbox,
-#memberModule ul.radio { list-style:none; margin:0; padding:0; }
-
-#memberModule .item{ position:relative; margin:0 0 4px 0}
-#memberModule .iLabel{display:block; position:static; left:5px; top:6px; white-space:nowrap; color:#666;}
-#memberModule .iText{position:relative; height:14px; padding:4px 5px; font:12px Tahoma; height:14px; color:#666; border:1px solid #b7b7b7; border-right-color:#e1e1e1; border-bottom-color:#e1e1e1; background:transparent;}
\ No newline at end of file
diff --git a/modules/member/skins/default/css/member.css b/modules/member/skins/default/css/member.css
new file mode 100644
index 000000000..88416f698
--- /dev/null
+++ b/modules/member/skins/default/css/member.css
@@ -0,0 +1,117 @@
+@charset "utf-8";
+/* Element Reset */
+.xm,
+.xm table,
+.xm input,
+.xm textarea,
+.xm select,
+.xm button{font-family:Tahoma,Geneva,sans-serif;font-size:12px;color:#333}
+.xm button,
+.xm input[type=submit],
+.xm input[type=reset],
+.xm input[type=button]{cursor:pointer;overflow:visible}
+.xm img{border:0}
+.xm p{line-height:1.5}
+/* Heading */
+.xm .h1, 
+.xm .h2, 
+.xm .h3, 
+.xm .h4{position:relative;border-bottom-style:solid;border-bottom-color:#ccc;zoom:1}
+.xm .h1{border-bottom-width:4px;font-size:24px}
+.xm .h2{border-bottom-width:3px;font-size:20px}
+.xm .h3{border-bottom-width:2px;font-size:16px}
+.xm .h4{border-bottom-width:1px;font-size:12px}
+/* Lined Tab Navigation */
+.xm .nav{padding:0;margin:1em 0}
+.xm .nav ul{position:relative;margin:0;padding:0;list-style:none;border-bottom:1px solid #ccc;zoom:1}
+.xm .nav ul:after{content:"";display:block;clear:both}
+.xm .nav li{float:left;margin-bottom:-1px}
+.xm .nav li a{position:relative;float:left;text-decoration:none;border:1px solid #eee;border-bottom-color:#ccc;background:#fafafa;color:#333}
+.xm .nav li a span{display:inline-block;height:14px;padding:6px 15px 6px 15px;letter-spacing:-1px;cursor:pointer}
+.xm .nav li.active a{border:1px solid #ccc;border-bottom:1px solid #fff;margin-top:-1px;background:transparent}
+.xm .nav li.active a span{padding-top:7px;font-weight:bold}
+/* Form */
+.xm .form{margin:1em 0;padding:0}
+.xm .form fieldset{margin:0 0 2em 0;padding:0;border:0}
+.xm .form em{font-style:normal;color:#e00}
+.xm .form label{margin-right:1em;line-height:1;vertical-align:middle}
+.xm .form input[type=checkbox]+label,
+.xm .form input[type=radio]+label,
+.xm .form input[type=file]{cursor:pointer}
+.xm .form ul{position:relative;margin:0;padding:0;list-style:none;border-top:2px solid #ccc;border-bottom:1px solid #ccc;zoom:1}
+.xm .form li{list-style:none;border:1px solid #ddd;border-left:0;border-right:0;margin:-1px 0;padding:8px 0;vertical-align:top;zoom:1}
+.xm .form li:first-child{border-top:0}
+.xm .form li>label:first-child{display:block;font-weight:bold}
+.xm .form li label em{font-weight:normal}
+.xm .form label.overlap{position:absolute;color:#aaa}
+.xm .form input[type=text],
+.xm .form input[type=password],
+.xm .form input[type=file],
+.xm .form textarea{position:relative;width:280px;margin:2px 0;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1;background:transparent}
+.xm .form input[type=text],
+.xm .form input[type=password],
+.xm .form input[type=file]{height:22px;line-height:22px;vertical-align:middle;padding:0 4px}
+.xm .form input[type=text].loading,
+.xm .form input.loading[type=password]{padding-right:24px;width:260px;background:transparent url(../img/preLoader16.gif) no-repeat 265px center}
+.xm .form input[type=checkbox],
+.xm .form input[type=radio]{margin:0;padding:0;width:13px;height:13px;vertical-align:middle}
+.xm .form input[type=text][disabled=disabled],
+.xm .form input[type=password][disabled=disabled],
+.xm .form input[type=checkbox][disabled=disabled],
+.xm .form input[type=radio][disabled=disabled],
+.xm .form input[type=file][disabled=disabled],
+.xm .form textarea[disabled=disabled],
+.xm .form select[disabled=disabled]{background:#ddd !important;text-shadow:1px 1px 0 #fff}
+.xm .form textarea{padding:3px 4px;vertical-align:top}
+.xm .form span.desc, 
+.xm .form em.desc{line-height:22px;vertical-align:middle;margin:0 10px}
+.xm .form p.desc{margin:.25em 0;line-height:1.4}
+.xm .form .q{font-weight:bold;margin:0 0 5px 0}
+.xm .form .a{margin:0 0 5px 0}
+.xm .form .tgForm{margin-right:1em}
+.xm .form .h1 + ul,
+.xm .form .h2 + ul,
+.xm .form .h3 + ul,
+.xm .form .h4 + ul{border-top:0}
+/* Table */
+.xm .table{margin:1em 0}
+.xm .table table{width:100%;border:0;border-collapse:collapse;border-top:2px solid #ccc}
+.xm .table caption{font-weight:bold;text-align:left;line-height:22px;padding:5px 0}
+.xm .table caption:after{content:"";display:block;clear:both}
+.xm .table caption a{font-weight:normal}
+.xm .table caption em{float:right;margin-left:1em}
+.xm .table caption strong{color:#e00}
+.xm .table caption .side{float:right;font-weight:normal;margin-left:1em}
+.xm .table th,
+.xm .table td{border:0;padding:8px;vertical-align:top;text-align:left;border-bottom:1px solid #ddd;white-space:nowrap}
+.xm .table th{background:#f8f8f8}
+.xm .table thead th{border-bottom:1px solid #999}
+.xm .table tfoot td{font-weight:bold;background:#f8f8f8}
+.xm .table.even tbody tr:nth-of-type(even) td{background-color:#fafafa}
+.xm .table td>input[type=text]{margin:-1px 0 -3px 0 !important;vertical-align:middle}
+.xm .table img{vertical-align:middle}
+.xm .table em{font-style:normal;font-weight:normal;color:#e00}
+.xm .table .title,
+.xm .table .text{white-space:normal}
+/* Pagination */
+.xm .pagination{margin:1em 0;text-align:center;line-height:normal}
+.xm .pagination *{vertical-align:middle}
+.xm .pagination a,
+.xm .pagination strong{position:relative;display:inline-block;padding:2px 4px;font-weight:bold;text-decoration:none;line-height:normal;color:#333 !important;vertical-align:middle}
+.xm .pagination a:hover,
+.xm .pagination a:active,
+.xm .pagination a:focus{border:1px solid #ddd;margin:0 -1px}
+.xm .pagination strong{color:#e00 !important;font-size:20px}
+.xm .pagination .direction{font-weight:normal;white-space:nowrap}
+.xm .pagination .direction:hover,
+.xm .pagination .direction:active,
+.xm .pagination .direction:focus{border:0;margin:0;text-decoration:underline}
+.xm .pagination input{width:30px;text-align:center}
+.xm .pagination button{overflow:visible}
+/* Text Button */
+.xm input.text, 
+.xm button.text{border:0;overflow:visible;padding:0;margin:0 4px 0 0;color:#33a;background:none;text-decoration:underline}
+/* Agreement */
+.xm .agreement{ margin:1em 0}
+.xm .agreement .text{ margin:1em 0}
+.xm .agreement .confirm{ margin:1em 0}
diff --git a/modules/member/skins/default/document_list.html b/modules/member/skins/default/document_list.html
index 29f6639aa..f0a6fd39c 100644
--- a/modules/member/skins/default/document_list.html
+++ b/modules/member/skins/default/document_list.html
@@ -1,63 +1,52 @@
-<!--#include("./common_header.html")-->
-
-<h3>{$member_title = $lang->cmd_view_own_document }</h3>
-
-<!-- 모듈 선택 -->
-<div class="fr gap1">
-    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="small button green"><span>{$lang->cmd_find_module}</span></a>
-    <!--@if($selected_module_srl)--><a href="{getUrl('selected_module_srl','')}" class="small button red"><span>{$lang->cmd_cancel}</span></a><!--@end-->
-</div>
-
-<!-- 목록 -->
-<table cellspacing="0" class="colTable">
-<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th class="title"><div>{$lang->no}</div></th>
-        <th class="title" class="wide"><div>{$lang->title}</div></th>
-        <th class="title"><div>{$lang->readed_count}</div></th>
-        <th class="title"><div>{$lang->voted_count}</div></th>
-        <th class="title"><div>{$lang->date}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($document_list as $no => $oDocument)-->
-    <tr>
-        <td>{$no}</td>
-        <td class="wide">
-            <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false;">{$oDocument->getTitleText()}</a>
-            <!--@if($oDocument->getCommentCount())-->
-                [{$oDocument->getCommentCount()}]
-            <!--@end-->
-
-            <!--@if($oDocument->getTrackbackCount())-->
-                [{$oDocument->getTrackbackCount()}]
-            <!--@end-->
-        </td>
-        <td>{$oDocument->get('readed_count')}</td>
-        <td>{$oDocument->get('voted_count')}</td>
-        <td class="nowrap">{$oDocument->getRegdate("Y-m-d")}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th class="button" colspan="5">
-            <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+<h1 class="h1">{$member_title = $lang->cmd_view_own_document }</h1>
+<div class="table even">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>
+			Total: {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}
+			<span class="side">
+				<a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;">{$lang->cmd_find_module}</a>
+				<a href="{getUrl('selected_module_srl','')}" cond="$selected_module_srl">{$lang->cmd_cancel}</a>
+			</span>
+		</caption>
+		<thead>
+			<tr>
+				<th>{$lang->no}</th>
+				<th class="title">{$lang->title}</th>
+				<th>{$lang->date}</th>
+				<th>{$lang->readed_count}</th>
+				<th>{$lang->voted_count}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr loop="$document_list => $no,$oDocument">
+				<td>{$no}</td>
+				<td class="title">
+					<a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false;">{$oDocument->getTitleText()}</a>
+					<!--@if($oDocument->getCommentCount())-->
+						[{$oDocument->getCommentCount()}]
+					<!--@end-->
+		
+					<!--@if($oDocument->getTrackbackCount())-->
+						[{$oDocument->getTrackbackCount()}]
+					<!--@end-->
+				</td>
+				<td>{$oDocument->getRegdate("Y-m-d")}</td>
+				<td>{$oDocument->get('readed_count')}</td>
+				<td>{$oDocument->get('voted_count')}</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html
index aeada05e9..ad1519d05 100644
--- a/modules/member/skins/default/find_member_account.html
+++ b/modules/member/skins/default/find_member_account.html
@@ -1,66 +1,56 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/find_member_account.xml")-->
-<!--%import("filter/find_member_account_by_question.xml")-->
-
-<h3>{$lang->cmd_find_member_account}</h3>
-
-<p class="summary">{$lang->about_find_member_account}</p>
-
-<form action="./" method="get" onsubmit="return procFilter(this, find_member_account)">
+<include target="./common_header.html" />
+<load target="filter/find_member_account.xml" />
+<h1 class="h1">{$lang->cmd_find_member_account}</h1>
+<p>{$lang->about_find_member_account}</p>
+<form action="./" method="get" class="form" onsubmit="return procFilter(this, find_member_account)">
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$document_srl}" />
     <input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="rowTable" title="{$lang->email_address}">
-        <tr>
-            <th><div><label for="cpw">{$lang->email_address}</label></div></th>
-            <td class="wide"><input type="text" name="email_address" class="iText w400" /></td>
-        </tr>
-        <tr>
-            <th class="button" colspan="2"><span class="button black strong"><input type="submit" value="{$lang->cmd_find_member_account}" accesskey="s" /></span></th>
-        </tr>
-    </table>
+	<ul>
+		<li>
+			<p class="q"><label for="cpw">{$lang->email_address}</label></p>
+			<p class="a"><input type="text" name="email_address" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_find_member_account}" accesskey="s" /></span>
+	</div>
 </form>
-
-
 <!--@if(count($lang->find_account_question_items)>1)-->
-<h3>{$lang->cmd_find_member_account}</h3>
-
-<p class="summary">{$lang->about_find_account_question}</p>
-
-<form action="./" method="get" onsubmit="return procFilter(this, find_member_account_by_question)">
+<h1 class="h1">{$lang->cmd_find_member_account}</h1>
+<p>{$lang->about_find_account_question}</p>
+<form action="./" method="get" class="form" ruleset="@find_member_account_by_question">
+	<input type="hidden" name="module" value="member" />
     <input type="hidden" name="mid" value="{$mid}" />
-    <input type="hidden" name="document_srl" value="{$document_srl}" />
+    <input type="hidden" name="document_srl" value="{$document_srl}" />	
+	<input type="hidden" name="act" value="procMemberFindAccountByQuestion" />
+	<input type="hidden" name="success_return_url" value="{getUrl('', 'act', 'dispMemberGetTempPassword')}" />
     <input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="rowTable" title="{$lang->email_address}">
-        <tr>
-            <th><div><label for="cpw">{$lang->user_id}</label></div></th>
-            <td class="wide"><input type="text" name="user_id" class="iText" /></td>
-        </tr>
-        <tr>
-            <th><div><label for="cpw">{$lang->email_address}</label></div></th>
-            <td class="wide"><input type="text" name="email_address" class="iText w400" /></td>
-        </tr>
-
-		<tr>
-			<th><div><label for="cpw">{$lang->find_account_question}</label></div></th>
-			<td>
-				<select name="find_account_question">
+	<ul>
+		<li cond="$identifier == 'user_id'">
+			<p class="q"><label for="cpw">{$lang->user_id}</label></p>
+			<p class="a"><input type="text" name="user_id" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="cpw">{$lang->email_address}</label></p>
+			<p class="a"><input type="text" name="email_address" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="cpw">{$lang->find_account_question}</label></p>
+			<p class="a">
+				<select name="find_account_question" style="width:290px">
 				<!--@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>
 				<br />
-				<input type="text" name="find_account_answer" value="" class="iText w300"/>
-			</td>
-		</tr>
-
-        <tr>
-            <th class="button" colspan="2"><span class="button black strong"><input type="submit" value="{$lang->cmd_get_temp_password}" accesskey="s" /></span></th>
-        </tr>
-    </table>
+				<input type="text" name="find_account_answer" value="" />
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_get_temp_password}" /></span>
+	</div>
 </form>
 <!--@end-->
-
-<!--#include("./common_footer.html")-->
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/find_member_account_mail.html b/modules/member/skins/default/find_member_account_mail.html
index ca9bed876..26c4a3bec 100644
--- a/modules/member/skins/default/find_member_account_mail.html
+++ b/modules/member/skins/default/find_member_account_mail.html
@@ -2,10 +2,7 @@
 <hr noshade="noshade" />
 <ul>
     <li>Site : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
-    <li>{$lang->user_id} : {$member_info->user_id}</li>
-    <li>{$lang->user_name} : {$member_info->user_name}</li>
-    <li>{$lang->nick_name} :  {$member_info->nick_name}</li>
-    <li>{$lang->email_address} : {$member_info->email_address}</li>
+    <li loop="$memberInfo=>$name,$value">{$name} : {$value}</li>
     <li>{$lang->password} : <span style="color:red">{$auth_args->new_password}</span></li>
 </ul>
 <hr noshade="noshade" />
diff --git a/modules/member/skins/default/find_temp_password.html b/modules/member/skins/default/find_temp_password.html
index 876a45f43..efb2ac77a 100644
--- a/modules/member/skins/default/find_temp_password.html
+++ b/modules/member/skins/default/find_temp_password.html
@@ -1,8 +1,6 @@
-<!--#include("./common_header.html")-->
-
-<h3>{$lang->cmd_find_member_account}</h3>
-<p class="summary">{$lang->about_find_member_account}</p>
-
-{$temp_password}
-
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+<h1 class="h1">{$lang->cmd_find_member_account}</h1>
+<p>{$lang->about_temp_password}</p>
+<p>{$lang->user_id} : {$user_id}</p>
+<p>{$lang->temp_password} : {$temp_password}</p>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/img/bgTab.gif b/modules/member/skins/default/img/bgTab.gif
deleted file mode 100755
index 8835361b8..000000000
Binary files a/modules/member/skins/default/img/bgTab.gif and /dev/null differ
diff --git a/modules/member/skins/default/img/buttonClose.gif b/modules/member/skins/default/img/buttonClose.gif
deleted file mode 100755
index 5bdbbc1ef..000000000
Binary files a/modules/member/skins/default/img/buttonClose.gif and /dev/null differ
diff --git a/modules/member/skins/default/img/iconH2.gif b/modules/member/skins/default/img/iconH2.gif
deleted file mode 100755
index 457867741..000000000
Binary files a/modules/member/skins/default/img/iconH2.gif and /dev/null differ
diff --git a/modules/member/skins/default/img/iconH3.gif b/modules/member/skins/default/img/iconH3.gif
deleted file mode 100755
index 889e2818e..000000000
Binary files a/modules/member/skins/default/img/iconH3.gif and /dev/null differ
diff --git a/modules/member/skins/default/img/lineVrText.gif b/modules/member/skins/default/img/lineVrText.gif
deleted file mode 100755
index 27566578d..000000000
Binary files a/modules/member/skins/default/img/lineVrText.gif and /dev/null differ
diff --git a/modules/member/skins/default/js/member.js b/modules/member/skins/default/js/member.js
index 1b2ff9176..30fe0e19c 100644
--- a/modules/member/skins/default/js/member.js
+++ b/modules/member/skins/default/js/member.js
@@ -43,39 +43,29 @@ function _doUploadImage(fo_obj, act) {
 
 /* 프로필 이미지/ 이미지 이름/마크 등록 */
 function doUploadProfileImage() {
-    var fo_obj = xGetElementById("fo_insert_member");
+    var fo_obj = get_by_id("fo_insert_member");
     if(!fo_obj.profile_image.value) return;
     _doUploadImage(fo_obj, 'procMemberInsertProfileImage');
 }
 function doUploadImageName() {
-    var fo_obj = xGetElementById("fo_insert_member");
+    var fo_obj = get_by_id("fo_insert_member");
     if(!fo_obj.image_name.value) return;
     _doUploadImage(fo_obj, 'procMemberInsertImageName');
 }
 
 function doUploadImageMark() {
-    var fo_obj = xGetElementById("fo_insert_member");
+    var fo_obj = get_by_id("fo_insert_member");
     if(!fo_obj.image_mark.value) return;
     _doUploadImage(fo_obj, 'procMemberInsertImageMark');
 }
 
-/* 로그인 영역에 포커스 */
-function doFocusUserId(fo_id) {
-    if(xScrollTop()) return;
-    var fo_obj = xGetElementById(fo_id);
-    if(fo_obj.user_id) {
-        try{
-            fo_obj.user_id.focus();
-        } catch(e) {};
-    }
-}
 
 /* 로그인 후 */
 function completeLogin(ret_obj, response_tags, params, fo_obj) {
     if(fo_obj.remember_user_id && fo_obj.remember_user_id.checked) {
         var expire = new Date();
         expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
-        xSetCookie('user_id', fo_obj.user_id.value, expire);
+        setCookie('user_id', fo_obj.user_id.value, expire);
     }
 
     var url =  current_url.setQuery('act','');
@@ -102,23 +92,45 @@ function completeResendAuthMail(ret_obj, response_tags) {
 	if(error != 0) alert(error);
 }
 
-/* 프로필 이미지/이미지 이름, 마크 삭제 */
+/* 프로필 이미지, 이미지 이름, 마크 삭제 */
 function doDeleteProfileImage(member_srl) {
-        var fo_obj = xGetElementById("fo_insert_member");
-        fo_obj.member_srl.value = member_srl;
-        procFilter(fo_obj, delete_profile_image);
+	if (!member_srl) return;
+
+	if (!confirm(xe.lang.deleteProfileImage)) return false;
+
+	exec_xml(
+		'member',
+		'procMemberDeleteProfileImage',
+		{member_srl:member_srl},
+		function(){jQuery('#profile_imagetag').remove()},
+		['error','message']
+	);
 }
 
 function doDeleteImageName(member_srl) {
-        var fo_obj = xGetElementById("fo_insert_member");
-        fo_obj.member_srl.value = member_srl;
-        procFilter(fo_obj, delete_image_name);
+	if (!member_srl) return;
+
+	if (!confirm(xe.lang.deleteImageName)) return false;
+	exec_xml(
+		'member',
+		'procMemberDeleteImageName',
+		{member_srl:member_srl},
+		function(){jQuery('#image_nametag').remove()},
+		['error','message']
+	);
 }
 
 function doDeleteImageMark(member_srl) {
-        var fo_obj = xGetElementById("fo_insert_member");
-        fo_obj.member_srl.value = member_srl;
-        procFilter(fo_obj, delete_image_mark);
+	if (!member_srl) return;
+
+	if (!confirm(xe.lang.deleteImageMark)) return false;
+	exec_xml(
+		'member',
+		'procMemberDeleteImageMark',
+		{member_srl:member_srl},
+		function(){jQuery('#image_marktag').remove()},
+		['error','message']
+	);
 }
 
 /* 스크랩 삭제 */
@@ -157,14 +169,13 @@ function insertSelectedModule(id, module_srl, mid, browser_title) {
 
 /* 오픈아이디 연결 */
 function doAddOpenIDToMember() {
-    var fo_obj = xGetElementById("fo_insert_member");
+    var fo_obj = get_by_id("fo_insert_member");
     procFilter(fo_obj, add_openid_to_member);
 }
 
 /* 오픈아이디 연결 해제 */
 function doDeleteOpenIDFromMember(openid) {
-    var fo_obj = xGetElementById("fo_insert_member");
+    var fo_obj = get_by_id("fo_insert_member");
     fo_obj.openid_to_delete.value = openid;
     procFilter(fo_obj, delete_openid_from_member);
 }
-
diff --git a/modules/member/skins/default/leave_form.html b/modules/member/skins/default/leave_form.html
index 42d7aabbe..d179a3a6e 100644
--- a/modules/member/skins/default/leave_form.html
+++ b/modules/member/skins/default/leave_form.html
@@ -1,28 +1,26 @@
-<!--#include("./common_header.html")-->
-
-<!--%import("filter/leave_member.xml")-->
-
-    <h3>{$member_title = $lang->msg_leave_member}</h3>
-    <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, leave_member)">
+<include target="./common_header.html" />
+<h1 class="h1">{$member_title = $lang->msg_leave_member}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="leaveMember" id="fo_insert_member" class="form" action="./" method="post">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberLeave" />
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$document_srl}" />
     <input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="rowTable" title="{$lang->msg_leave_member}">
-    <tr>
-        <th scope="row"><div>{$lang->user_id}</div></th>
-        <td class="wide">{$member_info->user_id}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div><label for="cpw">{$lang->password}</label></div></th>
-        <td><input type="password" name="password" id="cpw" class="iText" /></td>
-    </tr>
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
-            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
+	<ul>
+		<li>
+			<p class="q">{$lang->user_id}</p>
+			<p class="a">{$member_info->user_id}</p>
+		</li>
+		<li>
+			<p class="q"><label for="cpw">{$lang->password}</label></p>
+			<p class="a"><input type="password" name="password" id="cpw" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_leave}" /></span>
+	</div>
 </form>
-<!--#include("./common_footer.html")-->
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/login_form.html b/modules/member/skins/default/login_form.html
index 08b9952b0..a59445e4a 100644
--- a/modules/member/skins/default/login_form.html
+++ b/modules/member/skins/default/login_form.html
@@ -1,65 +1,47 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/login.xml")-->
-<!--%import("filter/openid_login.xml")-->
-
+<include target="./common_header.html" />
+<load target="filter/openid_login.xml" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<h1 class="h1">{$lang->cmd_login}</h1>
+<form ruleset="@login" action="./" method="post" id="fo_member_login" class="form">
+	<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
+	<ul>
+		<li>
+			<p class="q"><label for="uid">{$lang->user_id}</label></p>
+			<p class="a"><input type="text" name="user_id" id="uid" value="" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="upw">{$lang->password}</label></p>
+			<p class="a"><input type="password" name="password" id="upw" value="" /></p>
+		</li>
+	</ul>	
+	<p style="margin:1em 0">
+		<input type="checkbox" name="keep_signed" id="keepid_opt" value="Y" />
+		<label for="keepid_opt">{$lang->keep_signed}</label>
+	</p>
+	<div class="message info" id="keep_msg">
+		<p>{$lang->about_keep_warning}</p>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_login}" /></span>
+		<span class="etc">
+			<a href="{getUrl('act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a> |
+			<a href="{getUrl('act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
+		</span>
+	</div>
+</form>
 <script type="text/javascript">
-    var keep_signed_msg = "{$lang->about_keep_signed}";
-    xAddEventListener(window, "load", function() { doFocusUserId('fo_member_login'); });
+jQuery(function($){
+	var keep_msg = $('#keep_msg');
+	keep_msg.hide();
+	$('#keepid_opt').change(function(){
+		if($(this).is(':checked')){
+			keep_msg.slideDown(200);
+		} else {
+			keep_msg.slideUp(200);
+		}
+	});
+});
 </script>
-
-<!-- XE 로그인 폼 -->
-<div class="memberSmallBox">
-
-    <div class="header">{$lang->cmd_login}</div>
-
-    <form action="./" method="post" onsubmit="return procFilter(this, login)" id="fo_member_login">
-        <fieldset class="login">
-            <dl>
-                <dt><label for="uid">{$lang->user_id}</label></dt>
-                <dd><input type="text" name="user_id" id="uid" value="" class="iText w140" /></dd>
-                <dt><label for="upw">{$lang->password}</label></dt>
-                <dd><input type="password" name="password" id="upw" value="" class="iText w140" /></dd>
-            </dl>
-
-            <p class="keep">
-                <input type="checkbox" name="keep_signed" id="keepid_opt" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
-                <label for="keepid_opt">{$lang->keep_signed}</label>
-            </p>
-			
-			<div class="buttonArea">
-				<span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span>
-			</div>
-
-        </fieldset>
-    </form>
-
-    <div class="help tCenter">
-        <a href="{getUrl('act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a> |
-        <a href="{getUrl('act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
-    </div>
-</div>
-
-<!--@if($member_config->enable_openid=='Y')-->
-<!-- OpenID 로그인 폼 -->
-<div class="memberSmallBox">
-
-    <div class="header">{$lang->openid}</div>
-
-    <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)">
-        <fieldset class="login">
-            <dl>
-                <dt><label for="open_uid">{$lang->user_id}</label></dt>
-                <dd><input type="text" name="openid" id="open_uid" value="" class="openid_user_id" /></dd>
-            </dl>
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span>
-
-        </fieldset>
-        <input type="hidden" name="referer_url" value="{$referer_url}" />
-    </form>
-
-    <div class="help tLeft">{$lang->about_openid}</div>
-
-</div>
-<!--@end-->
-
-<!--#include("./common_footer.html")-->
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/logout.html b/modules/member/skins/default/logout.html
index 1c61f37fc..27e969a20 100644
--- a/modules/member/skins/default/logout.html
+++ b/modules/member/skins/default/logout.html
@@ -1,22 +1,9 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/logout.xml")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, logout)">
-<input type="hidden" name="mid" value="{$mid}" />
-
-    <h3>{$lang->cmd_logout}</h3>
-
-    <table class="crossTable">
-    <tr>
-        <th class="title">{$lang->confirm_logout}</th>
-    </tr>
-    <tr>
-        <th class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_logout}" /></span>
-            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
-
+<include target="./common_header.html" />
+<import target="filter/logout.xml" />
+<form action="./" method="get" class="form" onsubmit="return procFilter(this, logout)">
+	<input type="hidden" name="mid" value="{$mid}" />
+    <h1 class="h1">{$lang->cmd_logout}</h1>
+	<p>{$lang->confirm_logout}</p>
+	<p><span class="btn"><input type="submit" value="{$lang->cmd_logout}" /></span></p>
 </form>
-<!--#include("./common_footer.html")-->
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/member_info.html b/modules/member/skins/default/member_info.html
index 3b8067ca3..8264f627a 100644
--- a/modules/member/skins/default/member_info.html
+++ b/modules/member/skins/default/member_info.html
@@ -1,133 +1,71 @@
-<!--#include("./common_header.html")-->
+<include target="./common_header.html" />
+<h1 class="h1">{$lang->member_info}</h1>
+<div class="table even">
+	<table width="100%" border="1" cellspacing="0">
+		<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
+		<!--@if($formInfo->isUse && ($formInfo->name != 'password' && $formInfo->name != 'find_account_question'))-->
+		<!--@if($formInfo->isDefaultForm)-->
+{@$title = $formInfo->title}
+{@$value = $memberInfo[$formInfo->name]}
+			<!--@if($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
+{@$target = $memberInfo['profile_image']}
+{@$value = '<img src="'.$target->src.'" />'}
+			<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
+{@$target = $memberInfo['image_name']}
+{@$value = '<img src="'.$target->src.'" />'}
+			<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
+{@$target = $memberInfo['image_mark']}
+{@$value = '<img src="'.$target->src.'" />'}
+			<!--@end-->
+		<!--@else-->
+{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
+{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
+			<!--@if($formInfo->type=='tel')-->
+				{@$value = htmlspecialchars($orgValue[0])}
+					<!--@if($orgValue[1])-->-<!--@end-->
+				{@$value .= htmlspecialchars($orgValue[1])}
+					<!--@if($orgValue[2])-->-<!--@end-->
+				{@$value .= htmlspecialchars($orgValue[2])}
+			<!--@elseif($formInfo->type=='kr_zip')-->
+				{@$value = htmlspecialchars($orgValue[0])}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= htmlspecialchars($orgValue[1])}
+			<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
+				{@$value = htmlspecialchars(implode(", ",$orgValue))}
+			<!--@elseif($formInfo->type=='date')-->
+				{@$value = zdate($orgValue, "Y-m-d")}
+			<!--@else-->
+				{@$value = nl2br(htmlspecialchars($orgValue))}
+			<!--@end-->
+		<!--@end-->
 
-    <h3>{$lang->cmd_view_member_info}</h3>
-
-    <table cellspacing="0" class="rowTable">
-    <tr><th colspan="2" class="title"><div>{$lang->member_default_info}</div></th></tr>
-    <tr>
-        <th><div>{$lang->user_name}</div></th>
-        <td class="wide">{htmlspecialchars($member_info->user_name)}</td>
-    </tr>
-    <tr>
-        <th><div>{$lang->nick_name}</div></th>
-        <td>{htmlspecialchars($member_info->nick_name)}</td>
-    </tr>
-    <!--@if($member_info->profile_image->src)-->
-    <tr>
-        <th><div>{$lang->profile_image}</div></th>
-        <td><img src="{$member_info->profile_image->src}" border="0" alt="profile_image" /></td>
-    </tr>
-    <!--@end-->
-    <!--@if($member_info->image_name->src)-->
-    <tr>
-        <th><div>{$lang->image_name}</div></th>
-        <td><img src="{$member_info->image_name->src}" border="0" alt="image_name" /></td>
-    </tr>
-    <!--@end-->
-    <!--@if($member_info->image_mark->src)-->
-    <tr>
-        <th><div>{$lang->image_mark}</div></th>
-        <td><img src="{$member_info->image_mark->src}" border="0" alt="image_mark" /></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th><div>{$lang->homepage}</div></th>
-        <td><!--@if($member_info->homepage)--><a href="{htmlspecialchars($member_info->homepage)}" onclick="window.open(this.href); return false;">{htmlspecialchars($member_info->homepage)}</a><!--@else-->&nbsp;<!--@end--></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->blog}</div></th>
-        <td><!--@if($member_info->blog)--><a href="{htmlspecialchars($member_info->blog)}" onclick="window.open(this.href); return false;">{htmlspecialchars($member_info->blog)}</a><!--@else-->&nbsp;<!--@end--></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->birthday}</div></th>
-        <td><!--@if($member_info->birthday)-->{zdate($member_info->birthday,"Y-m-d")}<!--@else-->&nbsp;<!--@end--></td>
-    </tr>
-    <!--@if($member_info->signature)-->
-    <tr>
-        <th><div>{$lang->signature}</div></th>
-        <td>{$member_info->signature}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th><div>{$lang->group}</div></th>
-        <td><!--@foreach($member_info->group_list as $key => $val)-->{$val} <!--@end--></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->signup_date}</div></th>
-        <td>{zdate($member_info->regdate,"Y-m-d H:i")}</td>
-    </tr>
-
-    <!--@if($member_info->member_srl == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
-    <tr>
-        <th><div>{$lang->last_login}</div></th>
-        <td>{zdate($member_info->last_login,"Y-m-d H:i")}</td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($member_config->enable_openid=="Y")-->
-    <!--@if(sizeof($openids) > 0)-->
-    <tr>
-        <th colspan="2" class="title"><div>{$lang->openid} </div></th>
-    </tr>
-    <!--@foreach($openids as $openid)-->
-    <tr>
-        <th><div>{$lang->openid}</div></th>
-        <td> <a href="{$openid->bookmarklet}">{$openid->openid}</a> </td>
-    </tr>
-    <!--@end-->
-    <!--@end-->
-    <!--@end-->
-
-    <!--@if($extend_form_list)-->
-    <tr>
-        <th class="title" colspan="2"><div>{$lang->member_extend_info}</div></th>
-    </tr>
-    {@ $dummy_chk = 0 }
-    <!--@foreach($extend_form_list as $key => $val)-->
-    <tr <!--@if($dummy_chk==0)-->class="first-child" {@ $dummy_chk = 1; }<!--@end-->>
-        <th>
-            <div>
-                {htmlspecialchars($val->column_title)}
-            </div>
-        </th>
-        <td>
-            <!--@if($val->is_private)-->
-                <span class="privateItem">{$lang->private}</span>
-            <!--@else--> 
-                <!--@if($val->column_type=='tel' && $val->value[0] && $val->value[1] && $val->value[2])-->
-                    {htmlspecialchars($val->value[0])} 
-                        <!--@if($val->value[1])-->-<!--@end-->
-                    {htmlspecialchars($val->value[1])} 
-                        <!--@if($val->value[2])-->-<!--@end-->
-                    {htmlspecialchars($val->value[2])}
-                <!--@elseif($val->column_type=='kr_zip')-->
-                    {htmlspecialchars($val->value[0])}<!--@if($val->value[1]&&$val->value[0])--><br /><!--@end-->{htmlspecialchars($val->value[1])}
-                <!--@elseif($val->column_type=='checkbox' && is_array($val->value))-->
-                    {htmlspecialchars(implode(", ",$val->value))}&nbsp;
-                <!--@elseif($val->column_type=='date' && $val->value)-->
-                    {zdate($val->value, "Y-m-d")}&nbsp;
-                <!--@else-->
-                    {nl2br(htmlspecialchars($val->value))}&nbsp;
-                <!--@end-->
-            <!--@end--> 
-        </td>
-    </tr>
-    <!--@end-->
-    <!--@end-->
-
-    <tr>
-        <th colspan="2" class="button">
-            <!--@if($member_info->member_srl == $logged_info->member_srl)-->
-            <a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}" class="button black strong"><span>{$lang->cmd_modify_member_info}</span></a>
-                <!--@if($logged_info->is_openid)-->
-                    <a href="{getUrl('act','dispMemberOpenIDLeave','member_srl','')}" class="button red"><span>{$lang->cmd_leave}</span></a>
-                <!--@else-->
-                    <a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}" class="button green"><span>{$lang->cmd_modify_member_password}</span></a>
-                    <a href="{getUrl('act','dispMemberLeave','member_srl','')}" class="button red"><span>{$lang->cmd_leave}</span></a>
-                <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-    </tr>
+		<tr>
+			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
+			<td class="text">{$value}</td>
+		</tr>
+		<!--@end-->
+		<!--@end-->
+		<tr>
+			<th scope="row">{$lang->member_group}</th>
+			<td class="text">{implode(', ', $memberInfo['group_list'])}</td>
+		</tr>
+		<tr>
+			<th>{$lang->signup_date}</th>
+			<td>{zdate($memberInfo[regdate],"Y-m-d")}</td>
+		</tr>
+		<!--@if($memberInfo[member_srl] == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
+		<tr>
+			<th>{$lang->last_login}</th>
+			<td>{zdate($memberInfo[last_login],"Y-m-d")}</td>
+		</tr>
+		<!--@end-->
     </table>
-
-<!--#include("./common_footer.html")-->
+</div>
+<div class="btnArea" cond="$memberInfo['member_srl'] == $logged_info->member_srl">
+	<span class="btn"><a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}">{$lang->cmd_modify_member_info}</a></span>
+	<!--@if($logged_info->is_openid)-->
+	<span class="btn"><a href="{getUrl('act','dispMemberOpenIDLeave','member_srl','')}">{$lang->cmd_leave}</a></span>
+	<!--@else-->
+	<span class="btn"><a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}">{$lang->cmd_modify_member_password}</a></span>
+	<span class="btn"><a href="{getUrl('act','dispMemberLeave','member_srl','')}">{$lang->cmd_leave}</a></span>
+	<!--@end-->
+</div>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/modify_info.html b/modules/member/skins/default/modify_info.html
index b4321d548..a0abcd0c6 100644
--- a/modules/member/skins/default/modify_info.html
+++ b/modules/member/skins/default/modify_info.html
@@ -1,307 +1,70 @@
-<!--#include("./common_header.html")-->
-<!--%import("../../tpl/js/signup_check.js")-->
-
-<!--%import("filter/modify_info.xml")-->
-<!--@if($member_config->profile_image == 'Y')-->
-    <!--%import("filter/delete_profile_image.xml")-->
-<!--@end-->
-
-<!--@if($member_config->image_name == 'Y')-->
-    <!--%import("filter/delete_image_name.xml")-->
-<!--@end-->
-
-<!--@if($member_config->image_mark == 'Y')-->
-    <!--%import("filter/delete_image_mark.xml")-->
-<!--@end-->
-
-<!--@if($member_config->enable_openid=="Y")-->
-    <!--%import("filter/add_openid_to_member.xml")-->
-    <!--%import("filter/delete_openid_from_member.xml")-->
-<!--@end-->
-
+<include target="./common_header.html" />
+<load target="../../tpl/js/signup_check.js" />
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui")-->
 <!--%load_js_plugin("ui.datepicker")-->
-
-    <h3>{$lang->msg_update_member}</h3>
-
-    <form id="fo_insert_member" action="{getUrl()}" method="post" onsubmit="return procFilter(this, modify_info)" <!--@if($member_config->profile_image == 'Y' || $member_config->image_name=='Y' || $member_config->image_mark=='Y')-->enctype="multipart/form-data"<!--@end--> target="tmp_upload_iframe">
-    <input type="hidden" name="act" value="" />
+<h1 class="h1">{$lang->msg_update_member}</h1>
+<script type="text/javascript" >
+	xe.lang.deleteProfileImage = '{$lang->msg_delete_extend_form}';
+	xe.lang.deleteImageMark = '{$lang->msg_delete_extend_form}';
+	xe.lang.deleteImageName = '{$lang->msg_delete_extend_form}';
+</script>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="@insertMember" id="fo_insert_member" class="form" action="./" method="post" enctype="multipart/form-data">
+    <input type="hidden" name="act" value="procMemberModifyInfo" />
     <input type="hidden" name="module" value="member" />
     <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
     <input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
     <input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr><th colspan="2" class="title"><div>{$lang->member_default_info}</div></th></tr>
-    <tr>
-        <th><div>{$lang->user_id}</div></th>
-        <td class="wide">{htmlspecialchars($member_info->user_id)}</td>
-    </tr>
-    <tr>
-        <th><div>{$lang->user_name} <span class="require">*</span></div></th>
-        <td class="wide"><input type="text" name="user_name" value="{htmlspecialchars($member_info->user_name)}" /> <p>{$lang->about_user_name}</p></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->nick_name} <span class="require">*</span></div></th>
-        <td><input type="text" name="nick_name" value="{htmlspecialchars(htmlspecialchars_decode($member_info->nick_name))}" /> <p>{$lang->about_nick_name}</p></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->email_address} <span class="require">*</span></div></th>
-        <td><input type="text" name="email_address" value="{htmlspecialchars($member_info->email_address)}" /><p>{$lang->about_email_address}</p></td>
-    </tr>
-	<!--@if(count($lang->find_account_question_items)>1)-->
-    <tr>
-        <th><div>{$lang->find_account_question} <span class="require">*</span></div></th>
-        <td>
-			<select name="find_account_question">
-			<!--@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>
-            <br />
-			<input type="text" name="find_account_answer" value="{$member_info->find_account_answer}" class="iText w300"/>
-        </td>
-    </tr>
-	<!--@end-->
-
-    <!--@if($member_config->profile_image == 'Y')-->
-    <tr>
-        <th><div>{$lang->profile_image}</div></th>
-        <td>
-            <!--@if($member_info->profile_image->src)-->
-            <div class="memberImage">
-                <div class="info"><img src="{$member_info->profile_image->src}" border="0" alt="profile_image" /></div>
-                <a href="#" onclick="doDeleteProfileImage({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-            </div>
-            <!--@end-->
-
-            <div class="memberImage">
-                <div class="form"><input type="file" name="profile_image" value="" /></div>
-                <a href="#" onclick="doUploadProfileImage();return false;" class="button"><span>{$lang->cmd_registration}</span></a>
-            </div>
-            <p>{$lang->profile_image_max_width} : {$member_config->profile_image_max_width}px, {$lang->profile_image_max_height} : {$member_config->profile_image_max_height}px</p>
-        </td>
-    </tr>
-    <!--@end-->
-    <!--@if($member_config->image_name == 'Y')-->
-    <tr>
-        <th><div>{$lang->image_name}</div></th>
-        <td>
-            <!--@if($member_info->image_name->src)-->
-            <div class="memberImage">
-                <div class="info"><img src="{$member_info->image_name->src}" border="0" alt="image_name" /></div>
-                <a href="#" onclick="doDeleteImageName({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-            </div>
-            <!--@end-->
-
-            <div class="memberImage">
-                <div class="form"><input type="file" name="image_name" value="" /></div>
-                <a href="#" onclick="doUploadImageName();return false;" class="button"><span>{$lang->cmd_registration}</span></a>
-            </div>
-            <p>{$lang->image_name_max_width} : {$member_config->image_name_max_width}px, {$lang->image_name_max_height} : {$member_config->image_name_max_height}px</p>
-        </td>
-    </tr>
-    <!--@end-->
-    <!--@if($member_config->image_mark == 'Y')-->
-    <tr>
-        <th><div>{$lang->image_mark}</div></th>
-        <td>
-            <!--@if($member_info->image_mark->src)-->
-            <div class="memberImage">
-                <div class="info"><img src="{$member_info->image_mark->src}" border="0" alt="image_mark" /></div>
-                <a href="#" onclick="doDeleteImageMark({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-            </div>
-            <!--@end-->
-
-            <div class="memberImage">
-                <div class="form"><input type="file" name="image_mark" value="" /></div>
-                <a href="#" onclick="doUploadImageMark();return false;" class="button"><span>{$lang->cmd_registration}</span></a>
-            </div>
-            <p>{$lang->image_mark_max_width} : {$member_config->image_mark_max_width}px, {$lang->image_mark_max_height} : {$member_config->image_mark_max_height}px</p>
-        </td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th><div>{$lang->homepage}</div></th>
-        <td><input type="text" name="homepage" value="{htmlspecialchars(htmlspecialchars_decode($member_info->homepage))}" /> <p>{$lang->about_homepage}</p></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->blog}</div></th>
-        <td><input type="text" name="blog" value="{htmlspecialchars(htmlspecialchars_decode($member_info->blog))}" /> <p>{$lang->about_blog_url}</p></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->birthday}</div></th>
-        <td>
-
-            <input type="hidden" name="birthday" value="{$member_info->birthday}" />
-            <input type="text" class="inputDate" value="{zdate($member_info->birthday,'Y-m-d')}" readonly="readonly" />
-			<span class="button"><input type="button" value="{$lang->cmd_delete}" class="dateRemover" /></span>
-            <p>{$lang->about_birthday}</p>
-
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->allow_mailing}</div></th>
-        <td><input type="checkbox" name="allow_mailing" value="Y" class="checkbox" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end--> /> <p>{$lang->about_allow_mailing}</p></td>
-    </tr>
-    <!--@if($member_config->signature != 'N')-->
-    <tr>
-        <th><div>{$lang->signature}</div></th>
-        <td>{$editor}</td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($extend_form_list)-->
-    <tr><th colspan="2" class="title"><div>{$lang->member_extend_info}</div></th></tr>
-    {@ $dummy_chk = 0 }
-    <!--@foreach($extend_form_list as $key => $val)--><!--@if($val->is_active=='Y')-->
-    <tr <!--@if($dummy_chk==0)-->class="first-child" {@ $dummy_chk = 1; }<!--@end-->>
-        <th>
-            {htmlspecialchars($val->column_title)}
-            <!--@if($val->required=='Y')--><span class="require">*</span><!--@end-->
-        </th>
-        <td>
-            <!--// 일반 text -->
-            <!--@if($val->column_type == 'text')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w400" />
-
-            <!--// 홈페이지 주소 -->
-            <!--@elseif($val->column_type == 'homepage')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars(htmlspecialchars_decode($val->value))}" class="iText w400" />
-
-            <!--// Email 주소 -->
-            <!--@elseif($val->column_type == 'email_address')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w400" />
-
-            <!--// 전화번호 -->
-            <!--@elseif($val->column_type == 'tel')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="iText" />
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="iText" />
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="iText" />
-
-            <!--// textarea -->
-            <!--@elseif($val->column_type == 'textarea')-->
-                <textarea name="{$val->column_name}" class="iTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--// 다중 선택 -->
-            <!--@elseif($val->column_type == 'checkbox')-->
-                <!--@if($val->default_value)-->
-                    <ul class="checkbox">
-                    <!--@foreach($val->default_value as $v)-->
-                        <li><input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>{$v}</li>
-                    <!--@end-->
-                    </ul>
-                <!--@end-->
-
-            <!--// 라디오 버튼 -->
-            <!--@elseif($val->column_type == 'radio')-->
-                <!--@if($val->default_value)-->
-                    <ul class="radio">
-                    <!--@foreach($val->default_value as $v)-->
-                        <li><input type="radio" name="{$val->column_name}" value="{$v}" <!--@if($val->value == $v)-->checked="checked"<!--@end-->/>{$v}</li>
-                    <!--@end-->
-                    </ul>
-                <!--@end-->
-
-            <!--// 단일 선택 -->
-            <!--@elseif($val->column_type == 'select')-->
-                <select name="{$val->column_name}">
-                <!--@if($val->default_value)-->
-                    <!--@foreach($val->default_value as $v)-->
-                        <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-                    <!--@end-->
-                <!--@end-->
-                </select>
-
-            <!--// 한국 주소 검색 -->
-            <!--@elseif($val->column_type == 'kr_zip')-->
-                <div class="krZip">
-                    <div class="item" id="zone_address_search_{$val->column_name}" style="display:none"|cond="$val->value[0]">
-						<label for="krzip_address1_{$val->column_name}" class="iLabel">{$lang->msg_kr_address}</label>
-                        <input type="text" id="krzip_address1_{$val->column_name}" class="iText w200" value="" />
-                        <span class="button"><button type="button">{$lang->cmd_search}</button></span>
-                    </div>
-                    <div class="item" id="zone_address_list_{$val->column_name}" style="display:none"|cond="!$val->value[0]">
-                        <select name="{$val->column_name}" id="address_list_{$val->column_name}" class="w300">
-							<option value="{$val->value[0]}"|cond="$val->value[0]">{$val->value[0]}</option>
-						</select>
-                        <span class="button"><button type="button">{$lang->cmd_search_again}</button></span>
-                    </div>
-                    <div class="item address2">
-						<label for="krzip_address2_{$val->column_name}" class="iLabel">{$lang->msg_kr_address_etc}</label>
-                        <input type="text" name="{$val->column_name}" id="krzip_address2_{$val->column_name}" value="{htmlspecialchars($val->value[1])}" class="iText w300" />
-                    </div>
-                </div>
-				<load target="../../tpl/js/krzip_search.js" type="body" />
-				<script type="text/javascript">jQuery(function($){ $.krzip('{$val->column_name}') });</script>
-
-            <!--// 일본 주소 검색 -->
-            <!--@elseif($val->column_type == 'jp_zip')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w300" />
-
-            <!--// 날짜 입력 -->
-            <!--@elseif($val->column_type == 'date')-->
-                <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-                <input type="text" class="inputDate" value="{zdate($val->value,'Y-m-d')}" />
-				<span class="button"><input type="button" value="{$lang->cmd_delete}" class="dateRemover" /></span>
-
-
-
-            <!--@end-->
-
-            <p>{$val->description}</p>
-            <div class="publicItem">
-                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" <!--@if($val->is_opened)-->checked="checked"<!--@end--> value="Y" id="open_{$val->column_name}" />
-                <label for="open_{$val->column_name}">{$lang->public}</label>
-            </div>
-        </td>
-    </tr>
-    <!--@end--><!--@end-->
-    <!--@end-->
-
-    <!--@if($member_config->enable_openid=="Y")-->
-    <tr><th class="title" colspan="2"><div>{$lang->openid}</div></th></tr>
-    <tr>
-        <td colspan="2" class="openids">
-            <!--@foreach($openids as $openid)-->
-            <div><a href="{$openid->bookmarklet}">{$openid->openid}</a> <a onclick="doDeleteOpenIDFromMember('{$openid->openid}')" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></div>
-            <!--@end-->
-
-            <div class="insertOpenID">
-                <input name="openid" type="text" class="openid_user_id" />
-                <input name="openid_to_delete" type="hidden" />
-                <a onclick="doAddOpenIDToMember()" class="button"><span>{$lang->cmd_insert}</span></a>
-            </div>
-        </td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-        </th>
-    </tr>
-    </table>
+	<ul>
+		<li>
+			<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
+			<p class="a">
+				<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+				<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" disabled="disabled" />
+			</p>
+		</li>
+		<li loop="$formTags=>$formTag">
+			<p class="q">{$formTag->title}</p>
+			<div class="a" cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
+			<div class="a" cond="$formTag->name =='signature'">{$editor}</div>
+		</li>
+		<li>
+			<p class="q">{$lang->allow_mailing}</p>
+			<p class="a">
+				<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
+				<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->allow_message}</p>
+			<p class="a">
+				<block loop="$lang->allow_message_type=>$key,$val">
+					<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+				</block>
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+		<span class="btn"><a href="{getUrl('act','dispMemberInfo','member_srl','')}">{$lang->cmd_cancel}</a></span>
+	</div>
 </form>
-
-
 <script type="text/javascript">
 (function($){
     $(function(){
-        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
+        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
 
             $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
         };
         $.extend(option,$.datepicker.regional['{$lang_type}']);
         $(".inputDate").datepicker(option);
 		$(".dateRemover").click(function() {
-			$(this).parent().prevAll('input').val('');
+			$(this).prevAll('input').val('');
 			return false;});
     });
 })(jQuery);
 </script>
-
-<iframe id="tmp_upload_iframe" name="tmp_upload_iframe" style="display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px"></iframe>
-
-<!--#include("./common_footer.html")-->
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/modify_password.html b/modules/member/skins/default/modify_password.html
index 16e8a1abe..0c2db2191 100644
--- a/modules/member/skins/default/modify_password.html
+++ b/modules/member/skins/default/modify_password.html
@@ -1,39 +1,31 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/modify_password.xml")-->
-    <h3>{$member_title = $lang->cmd_modify_member_password}</h3>
-    <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, modify_password)">
+<include target="./common_header.html" />
+<h1 class="h1">{$member_title = $lang->cmd_modify_member_password}</h1>
+<form ruleset="modifyPassword" id="fo_insert_member" class="form" action="./" method="post">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberModifyPassword" />
     <input type="hidden" name="mid" value="{$mid}" />
     <input type="hidden" name="document_srl" value="{$document_srl}" />
     <input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="rowTable" title="{$lang->cmd_modify_member_password}">
-    <tr>
-        <th scope="row"><div>{$lang->user_id}</div></th>
-        <td class="wide">{$member_info->user_id}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div><label for="cpw">{$lang->current_password}</label></div></th>
-        <td><input type="password" name="current_password" id="cpw" class="iText" /></td>
-    </tr>
-    <tr>
-        <th scope="row"><div><label for="npw1">{$lang->password1}</label>
-		<br /><br />
-		<label for="npw2">{$lang->password2}</label></div></th>
-        <td>
-            <input type="password" name="password1" id="npw1" class="iText" />
-            <br />
-            <input type="password" name="password2" id="npw2" class="iText" />
-            <br />
-            <p>{$lang->about_password}</p>
-        </td>
-    </tr>
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
-
-    </form>
-<!--#include("./common_footer.html")-->
+	<ul>
+		<li>
+			<p class="q"><label for="uid">{$lang->user_id}</label></p>
+			<p class="a"><input type="text" disabled="disabled" value="{$member_info->user_id}" id="uid" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="cpw">{$lang->current_password}</label></p>
+			<p class="a"><input type="password" name="current_password" id="cpw" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="npw1">{$lang->password1}</label></p>
+			<p class="a"><input type="password" name="password1" id="npw1" /> <span class="desc">{$lang->about_password}</span></p>
+		</li>
+		<li>
+			<p class="q"><label for="npw2">{$lang->password2}</label></p>
+			<p class="a"><input type="password" name="password2" id="npw2" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
+</form>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/openid_leave_form.html b/modules/member/skins/default/openid_leave_form.html
index 53451e7ba..34546dc88 100644
--- a/modules/member/skins/default/openid_leave_form.html
+++ b/modules/member/skins/default/openid_leave_form.html
@@ -1,28 +1,21 @@
-<!--#include("./common_header.html")-->
-<!--%import("filter/openid_leave_member.xml")-->
-
-<h3>{$member_title = $lang->msg_leave_member}</h3>
-
-<form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, openid_leave_member)">
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="document_srl" value="{$document_srl}" />
-<input type="hidden" name="page" value="{$page}" />
-
-    <table cellspacing="0" class="rowTable" title="$lang->msg_leave_member}">
-    <tr>
-        <th><div>{$lang->user_id}</div></th>
-        <td class="wide">
-            {$member_info->user_id}
-            <p>{$lang->about_openid_leave}</p>
-        </td>
-    </tr>
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
-            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
-
+<include target="./common_header.html" />
+<load target="filter/openid_leave_member.xml" />
+<h1 class="h1">{$member_title = $lang->msg_leave_member}</h1>
+<form id="fo_insert_member" class="form" action="./" method="get" onsubmit="return procFilter(this, openid_leave_member)">
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
+	<input type="hidden" name="page" value="{$page}" />
+	<ul>
+		<li>
+			<p class="q"><label for="oid">{$lang->user_id}</label></p>
+			<p class="a">
+				<input type="text" disabled="disabled" value="{$member_info->user_id}" id="oid" /> 
+				<span class="desc">{$lang->about_openid_leave}</span>
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_leave}" /></span>
+	</div>
 </form>
-<!--#include("./common_footer.html")-->
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/resend_auth_mail.html b/modules/member/skins/default/resend_auth_mail.html
index 832c909c2..198bc9b97 100644
--- a/modules/member/skins/default/resend_auth_mail.html
+++ b/modules/member/skins/default/resend_auth_mail.html
@@ -1,20 +1,20 @@
-<!--%import("filter/resend_auth_mail.xml")-->
-<!--%import("css/default.css")-->
-<!--%import("js/member.js")-->
-
-<div id="memberModule">
-<form action="./" method="post" onsubmit="return procFilter(this, resend_auth_mail)">
-    <h3>{$lang->cmd_resend_auth_mail}</h3>
-    <div class="infoText">{$lang->about_resend_auth_mail}</div>
-    <table cellspacing="0" class="rowTable">
-        <tr>
-            <th scope="row">{$lang->email_address}</th>
-            <td><input type="text" name="email_address" value="" class="iText" /></td>
-        </tr>
-        <tr>
-            <th colspan="2"><span class="button black"><input type="submit" value="{$lang->cmd_resend_auth_mail}" /></span></th>
-        </tr>
-    </table>
-
-</form>
+<include target="./common_header.html" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<form ruleset="resendAuthMail" class="form" action="./" method="post">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberResendAuthMail" />
+    <h1 class="h1">{$lang->cmd_resend_auth_mail}</h1>
+    <p>{$lang->about_resend_auth_mail}</p>
+	<ul>
+		<li>
+			<p class="q"><label for="email_address">{$lang->email_address}</label></p>
+			<p class="a"><input type="text" id="email_address" name="email_address" value="" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_resend_auth_mail}" /></span>
+	</div>
+</form>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/saved_list.html b/modules/member/skins/default/saved_list.html
index 1f1dc08ce..6f29d27e9 100644
--- a/modules/member/skins/default/saved_list.html
+++ b/modules/member/skins/default/saved_list.html
@@ -1,46 +1,36 @@
-<!--#include("./common_header.html")-->
-
-<h3>{$member_title = $lang->cmd_view_saved_document}</h3>
-
-<table cellspacing="0" class="colTable">
-<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr class="title">
-        <th class="title"><div>{$lang->date}</th>
-        <th class="title"><div>{$lang->title}</th>
-        <th class="title"><div>{$lang->cmd_delete}</th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($document_list as $no => $val)-->
-    <tr>
-        <td class="nowrap">{$val->getRegdate("Y-m-d H:i:s")}</td>
-        <td class="wide">
-            <div><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); return false;">{$val->getTitle()}</a></div>
-            <div id="saved_document_{$val->document_srl}" class="savedContent" style="display:none;">{$val->getContent(false)}</div>
-        </td>
-        <td><a href="#" onclick="doDeleteSavedDocument('{$val->document_srl}','{$lang->confirm_delete}'); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="3" class="button">
-            <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+<h1 class="h1">{$member_title = $lang->cmd_view_saved_document}</h1>
+<div class="table even">
+	<table width="100%" border="1" cellspacing="0">
+	<caption>Total: {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+	<thead>
+		<tr>
+			<th class="title">{$lang->title}</th>
+			<th>{$lang->date}</th>
+			<th>{$lang->cmd_delete}</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr loop="$document_list => $no,$val">
+			<td class="title">
+				<a href="#saved_document_{$val->document_srl}" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); return false;">{$val->getTitle()}</a>
+				<div id="saved_document_{$val->document_srl}" class="savedContent" style="display:none;">{$val->getContent(false)}</div>
+			</td>
+			<td>{$val->getRegdate("Y-m-d")}</td>
+			<td><button type="button" class="text" onclick="doDeleteSavedDocument('{$val->document_srl}','{$lang->confirm_delete}');">{$lang->cmd_delete}</button></td>
+		</tr>
+	</tbody>
+</table>
+</div>
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/scrapped_list.html b/modules/member/skins/default/scrapped_list.html
index b20740f10..ea1b41d4b 100644
--- a/modules/member/skins/default/scrapped_list.html
+++ b/modules/member/skins/default/scrapped_list.html
@@ -1,48 +1,37 @@
-<!--#include("./common_header.html")-->
-
-<h3>{$member_title = $lang->cmd_view_scrapped_document}</h3>
-
-<!-- 목록 -->
-<table cellspacing="0" class="colTable">
-<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th class="title"><div>{$lang->no}</div></th>
-        <th class="title" class="wide"><div>{$lang->title}</div></th>
-        <th class="title"><div>{$lang->writer}</div></th>
-        <th class="title"><div>{$lang->date}</div></th>
-        <th class="title"><div>{$lang->cmd_delete}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($document_list as $no => $val)-->
-    <tr>
-        <td>{$no}</td>
-        <td class="wide"><a href="{getUrl('','document_srl',$val->document_srl)}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->title)}</a></td>
-        <td class="nowrap"><div class="member_{$val->target_member_srl}">{$val->nick_name}</div></td>
-        <td class="nowrap">{zdate($val->regdate, "Y-m-d H:i")}</td>
-        <td><a href="#" onclick="doDeleteScrap({$val->document_srl}); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th class="button" colspan="5">
-            <a href="{getUrl('act','','selected_module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+<h1 class="h1">{$member_title = $lang->cmd_view_scrapped_document}</h1>
+<div class="table even">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>Total: {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+		<thead>
+			<tr>
+				<th>{$lang->no}</th>
+				<th class="title">{$lang->title}</th>
+				<th>{$lang->writer}</th>
+				<th>{$lang->date}</th>
+				<th>{$lang->cmd_delete}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr loop="$document_list=>$no,$val">
+				<td>{$no}</td>
+				<td class="title"><a href="{getUrl('','document_srl',$val->document_srl)}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->title)}</a></td>
+				<td><a href="#popup_menu_area" class="member_{$val->target_member_srl}">{$val->nick_name}</a></td>
+				<td>{zdate($val->regdate, "Y-m-d")}</td>
+				<td><button type="button" class="text" onclick="doDeleteScrap({$val->document_srl});">{$lang->cmd_delete}</button></td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/signup_form.html b/modules/member/skins/default/signup_form.html
index 1b1bdb6aa..c436c8580 100644
--- a/modules/member/skins/default/signup_form.html
+++ b/modules/member/skins/default/signup_form.html
@@ -1,225 +1,89 @@
-<!--%import("../../tpl/js/signup_check.js")-->
-<!--%import("filter/signup.xml")-->
-
+<load target="../../tpl/js/signup_check.js" />
 <!--// datepicker javascript plugin load -->
 <!--%load_js_plugin("ui")-->
 <!--%load_js_plugin("ui.datepicker")-->
-
-<!--#include("./common_header.html")-->
-
-    <h3>{$lang->cmd_signup}</h3>
-
-    <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, signup)">
-
-    <!--@if(!$is_logged && $member_config->agreement)-->
-    <div class="agreementBox">
-        {$member_config->agreement}
-    </div>
-    <div class="agreementButton">
-        <input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
-        <label for="accept_agree">{$lang->about_accept_agreement}</label>
-    </div>
-    <!--@end-->
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th colspan="2" class="title"><div>{$lang->member_default_info}</div></th>
-    </tr>
-    <tr>
-        <th><div>{$lang->user_id} <span class="require">*</span></div></th>
-        <td class="wide"><input type="text" name="user_id" value="" class="iText"/> <p>{$lang->about_user_id}</p> </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->password} <span class="require">*</span></div></th>
-        <td><input type="password" name="password1" value="" class="iText"/><p>{$lang->about_password}</p></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->password2} <span class="require">*</span></div></th>
-        <td><input type="password" name="password2" value="" class="iText"/></td>
-    </tr>
-    <tr>
-        <th><div>{$lang->user_name} <span class="require">*</span></div></th>
-        <td>
-            <input type="text" name="user_name" value="" class="iText"/><p>{$lang->about_user_name}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->nick_name} <span class="require">*</span></div></th>
-        <td>
-            <input type="text" name="nick_name" value="" class="iText"/><p>{$lang->about_nick_name}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->email_address} <span class="require">*</span></div></th>
-        <td>
-            <input type="text" name="email_address" value="" class="iText"/><p>{$lang->about_email_address}</p>
-        </td>
-    </tr>
-	<!--@if(count($lang->find_account_question_items)>1)-->
-    <tr>
-        <th><div>{$lang->find_account_question} <span class="require">*</span></div></th>
-        <td>
-			<select name="find_account_question">
-			<!--@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>
-            <br />
-			<input type="text" name="find_account_answer" value="" class="iText w300"/>
-        </td>
-    </tr>
-	<!--@end-->
-    <tr>
-        <th><div>{$lang->homepage}</div></th>
-        <td>
-            <input type="text" name="homepage" value="" class="iText"/><p>{$lang->about_homepage}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->blog}</div></th>
-        <td>
-            <input type="text" name="blog" value="" class="iText"/><p>{$lang->about_blog_url}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->birthday}</div></th>
-        <td>
-            <input type="hidden" name="birthday" id="date_birthday" value="" />
-            <input type="text" value="" readonly="readonly" class="inputDate iText" />
-			<span class="button"><input type="button" value="{$lang->cmd_delete}" class="dateRemover" /></span>
-			<p>{$lang->about_birthday}</p>
-        </td>
-    </tr>
-    <tr>
-        <th><div>{$lang->allow_mailing}</div></th>
-        <td><input type="checkbox" class="checkbox" name="allow_mailing" value="Y" checked="checked" /> <p>{$lang->about_allow_mailing}</p></td>
-    </tr>
-    <!--@if($extend_form_list)-->
-    <tr>
-        <th class="title" colspan="2"><div>{$lang->member_extend_info}</div></th>
-    </tr>
-
-        <!--@foreach($extend_form_list as $key => $val)--><!--@if($val->is_active=='Y')-->
-        <tr>
-            <th>
-                {htmlspecialchars($val->column_title)}
-                <!--@if($val->required=='Y')--><span class="require">*</span><!--@end-->
-            </th>
-        <td>
-            <!--// 일반 text -->
-            <!--@if($val->column_type == 'text')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w400" />
-
-            <!--// 홈페이지 주소 -->
-            <!--@elseif($val->column_type == 'homepage')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w400" />
-
-            <!--// Email 주소 -->
-            <!--@elseif($val->column_type == 'email_address')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" class="iText w400" />
-
-            <!--// 전화번호 -->
-            <!--@elseif($val->column_type == 'tel')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4" class="iText" />
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4" class="iText" />
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4" class="iText" />
-
-            <!--// textarea -->
-            <!--@elseif($val->column_type == 'textarea')-->
-                <textarea name="{$val->column_name}" class="iTextArea w400">{htmlspecialchars($val->value)}</textarea>
-
-            <!--// 다중 선택 -->
-            <!--@elseif($val->column_type == 'checkbox')-->
-                <!--@if($val->default_value)-->
-                    <ul class="checkbox">
-                    <!--@foreach($val->default_value as $v)-->
-                        <li><input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>{$v}</li>
-                    <!--@end-->
-                    </ul>
-                <!--@end-->
-
-
-            <!--@elseif($val->column_type == 'radio')-->
-                <!--@if($val->default_value)-->
-                    <ul class="radio">
-                    <!--@foreach($val->default_value as $v)-->
-                        <li><input type="radio" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>{$v}</li>
-                    <!--@end-->
-                    </ul>
-                <!--@end-->
-
-            <!--// 단일 선택 -->
-            <!--@elseif($val->column_type == 'select')-->
-                <select name="{$val->column_name}">
-                <!--@if($val->default_value)-->
-                    <!--@foreach($val->default_value as $v)-->
-                        <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-                    <!--@end-->
-                <!--@end-->
-                </select>
-
-            <!--// 한국 주소 검색 -->
-            <!--@elseif($val->column_type == 'kr_zip')-->
-                <div class="krZip">
-                    <div class="item" id="zone_address_search_{$val->column_name}" style="display:none"|cond="$val->value[0]">
-						<label for="krzip_address1_{$val->column_name}" class="iLabel">{$lang->msg_kr_address}</label>
-                        <input type="text" id="krzip_address1_{$val->column_name}" class="iText w200" value="" />
-                        <span class="button"><button type="button">{$lang->cmd_search}</button></span>
-                    </div>
-                    <div class="item" id="zone_address_list_{$val->column_name}" style="display:none">
-                        <select name="{$val->column_name}" id="address_list_{$val->column_name}" class="w300"></select>
-                        <span class="button"><button type="button">{$lang->cmd_search_again}</button></span>
-                    </div>
-                    <div class="item address2">
-						<label for="krzip_address2_{$val->column_name}" class="iLabel">{$lang->msg_kr_address_etc}</label>
-                        <input type="text" name="{$val->column_name}" id="krzip_address2_{$val->column_name}" value="{htmlspecialchars($val->value[1])}" class="iText w300" />
-                    </div>
-                </div>
-				<load target="../../tpl/js/krzip_search.js" type="body" />
-				<script type="text/javascript">jQuery(function($){ $.krzip('{$val->column_name}') });</script>
-            <!--// 일본 주소 검색 -->
-            <!--@elseif($val->column_type == 'jp_zip')-->
-                <input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" />
-
-            <!--// 날짜 입력 -->
-            <!--@elseif($val->column_type == 'date')-->
-                <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-                <input type="text" class="inputDate iText" value="{zdate($val->value,'Y-m-d')}" readonly="readonly" />
-				<span class="button"><input type="button" value="{$lang->cmd_delete}" class="dateRemover" /></span>
-            <!--@end-->
-
-            <p>{$val->description}</p>
-
-            <div class="publicItem">
-                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" value="Y" id="open_{$val->column_name}" />
-                <label for="open_{$val->column_name}">{$lang->public}</label>
-            </div>
-        </td>
-    </tr>
-        <!--@end--><!--@end-->
-    <!--@end-->
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-        </th>
-    </tr>
-    </table>
-</form>
-
-<script type="text/javascript">
-(function($){
-    $(function(){
-        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
-
-            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
-        };
-        $.extend(option,$.datepicker.regional['{$lang_type}']);
-        $(".inputDate").datepicker(option);
-		$(".dateRemover").click(function() {
-			$(this).parent().prevAll('input').val('');
-			return false;});
-    });
-})(jQuery);
-</script>
-<!--#include("./common_footer.html")-->
+<include target="./common_header.html" />
+    <h1 class="h1">{$lang->cmd_signup}</h1>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+    <form ruleset="@insertMember" id="fo_insert_member" class="form" action="./" method="post" enctype="multipart/form-data">
+		<input type="hidden" name="module" value="member" />
+		<input type="hidden" name="act" value="procMemberInsert" />
+		<!--@if(!$is_logged && $member_config->agreement)-->
+		<div class="agreement">
+			<div class="text">
+				{$member_config->agreement}
+			</div>
+			<div class="confirm">
+				<input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
+				<label for="accept_agree">{$lang->about_accept_agreement}</label>
+			</div>
+		</div>
+		<!--@end-->
+		<ul>
+			<li>
+				<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
+				<p class="a">
+					<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->password} <em style="color:red">*</em></p>
+				<p class="a">
+					<input type="password" name="password" value=""/>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->password2} <em style="color:red">*</em></p>
+				<p class="a">
+					<input type="password" name="password2" value=""/>
+				</p>
+			</li>
+			<li loop="$formTags=>$formTag" cond="$formTag->name != 'signature'">
+				<p class="q">{$formTag->title}</p>
+				<div class="a">{$formTag->inputTag}</div>
+			</li>
+			<li>
+				<p class="q">{$lang->allow_mailing}</p>
+				<p class="a">
+					<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
+					<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->allow_message}</p>
+				<p class="a">
+					<block loop="$lang->allow_message_type=>$key,$val">
+						<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key || (!$member_info && $key == 'Y')" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+					</block>
+				</p>
+			</li>
+			<li cond="class_exists('AddonCaptcha') && $oCaptcha && $oCaptcha->addon_info->apply_signup=='apply'">
+				<p class="q">{$lang->captcha}</p>
+				<p class="a">
+					{$oCaptcha->inlineDisplay()}
+				</p>
+			</li>
+		</ul>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+			<span class="btn"><a href="{getUrl('act','','member_srl','')}">{$lang->cmd_cancel}</a></span>
+		</div>
+	</form>
+	<script type="text/javascript">
+	(function($){
+		$(function(){
+			var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
+	
+				$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
+			};
+			$.extend(option,$.datepicker.regional['{$lang_type}']);
+			$(".inputDate").datepicker(option);
+			$(".dateRemover").click(function() {
+				$(this).parent().prevAll('input').val('');
+				return false;});
+		});
+	})(jQuery);
+	</script>
+<include target="./common_footer.html" />
diff --git a/modules/member/skins/default/skin.xml b/modules/member/skins/default/skin.xml
index 6142202c1..5ca6aa3b2 100644
--- a/modules/member/skins/default/skin.xml
+++ b/modules/member/skins/default/skin.xml
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">회원 기본 스킨</title>
-    <title xml:lang="zh-CN">会员模块默认皮肤</title>
-    <title xml:lang="jp">会員デフォルトスキン</title>
-    <title xml:lang="en">Default Member Skin</title>
-    <title xml:lang="vi">Giao diện thành viên mặc định</title>	
-    <title xml:lang="es">Por defecto miembro piel</title>
-    <title xml:lang="ru">По умолчанию членом кожи</title>
-    <title xml:lang="zh-TW">會員模組預設面板</title>
-    <title xml:lang="tr">Varsayılan Kullanıcı Dış Görünümü</title>
-    <description xml:lang="ko">
-        회원모듈의 default스킨
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="zh-CN">
-        会员模块的默认皮肤。
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="jp">
-        会員モジュールのデフォルトスキン
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="en">
-        default skin of member module
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="vi">
-        Giao diện mặc định của Module Thành viên
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="es">
-        Por defecto de la piel miembro módulo
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="ru">
-        умолчанию кожу члена модуль
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="zh-TW">
-        會員模組預設面板。
-        NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="tr">
-       Üye modülünün varsayılan dış görünümü
-        NHN (developers@xpressengine.com)
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="white">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="en">default</title>
-            <title xml:lang="vi">Mặc định</title>
-            <title xml:lang="es">Por defecto</title>
-            <title xml:lang="ru">умолчанию</title>
-            <title xml:lang="zh-TW">預設</title>
-            <title xml:lang="tr">varsayılan</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">회원 기본 스킨</title>
+    <title xml:lang="zh-CN">会员模块默认皮肤</title>
+    <title xml:lang="jp">会員デフォルトスキン</title>
+    <title xml:lang="en">Default Member Skin</title>
+    <title xml:lang="vi">Giao diện thành viên mặc định</title>	
+    <title xml:lang="es">Por defecto miembro piel</title>
+    <title xml:lang="ru">По умолчанию членом кожи</title>
+    <title xml:lang="zh-TW">會員模組預設面板</title>
+    <title xml:lang="tr">Varsayılan Kullanıcı Dış Görünümü</title>
+    <description xml:lang="ko">
+        회원모듈의 default스킨
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+        会员模块的默认皮肤。
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="jp">
+        会員モジュールのデフォルトスキン
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+        The default skin of the member module
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="vi">
+        Giao diện mặc định của Module Thành viên
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="es">
+        Por defecto de la piel miembro módulo
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="ru">
+        умолчанию кожу члена модуль
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-TW">
+        會員模組預設面板。
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="tr">
+       Üye modülünün varsayılan dış görünümü
+        NHN (developers@xpressengine.com)
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="es">Por defecto</title>
+            <title xml:lang="ru">умолчанию</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">varsayılan</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/modules/member/tpl/colorset_list.html b/modules/member/tpl/colorset_list.html
index 38ad56473..9aedbb55a 100644
--- a/modules/member/tpl/colorset_list.html
+++ b/modules/member/tpl/colorset_list.html
@@ -12,5 +12,4 @@
     <img src="../../../{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
     <!--@end-->
 </div>
-<!--@if($key%2==1)--><div class="clear"></div><!--@end-->
 <!--@end-->
diff --git a/modules/member/tpl/css/member_admin.css b/modules/member/tpl/css/member_admin.css
deleted file mode 100644
index 771a98c15..000000000
--- a/modules/member/tpl/css/member_admin.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@charset "utf-8";
-
-.publicItem { display:block; margin-top:5px;}
-.publicItem input { margin:0; padding:0;}
-.publicItem label { font-weight:normal; margin:0; padding:0; color:#666666;}
-span.publicItem { display:inline; margin:0; font-weight:normal; color:#666666; }
-
-.display_date { cursor:pointer; width:80px; float:left; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; height:1em; padding:3px; }
-
-.ui-sortable { list-style:none; margin:0; padding:0; }
-.ui-sortable li { display:block; width:100%; border:1px solid #E5E5E5; background:#F6F6F6; padding:5px; margin:3px 0; }
-.ui-sortable li.active { cursor:move; }
-
-.item{ position:relative; margin:0 0 4px 0}
-.iLabel{ display:block; position:static; left:5px; top:6px;}
-.iText{ position:relative; padding:4px 5px; height:14px; border:1px solid #b7b7b7; border-right-color:#e1e1e1; border-bottom-color:#e1e1e1; background:transparent;}
diff --git a/modules/member/tpl/css/msignup.css b/modules/member/tpl/css/msignup.css
index 18ca5afb8..0798f4df1 100644
--- a/modules/member/tpl/css/msignup.css
+++ b/modules/member/tpl/css/msignup.css
@@ -32,13 +32,16 @@ input[type=radio]{width:13px;height:13px;margin:0;padding:0}
 .ff ul{margin:0 10px 10px 10px;padding:10px 0 0 0;list-style:none}
 .ff li{margin:0 0 5px 0;padding:0}
 .ff li p{color:#666}
+.ff li>label:first-child{display:block;font-weight:bold}
 .ff label+input[type=text],
 .ff label+input[type=password],
 .ff label+textarea,
-.ff label+select{display:block;width:96%;font-size:14px;margin:0 0 5px 0}
+.ff label+select,
+.ff label+select+input[type=text]{display:block;width:96%;font-size:14px;margin:0 0 5px 0}
 .ff label+input[type=text],
 .ff label+input[type=password],
-.ff label+textarea{padding:5px}
+.ff label+textarea,
+.ff label+select+input[type=text]{padding:5px}
 /* Button Area */
 .bna{text-align:center;padding:0 10px;margin:10px 0}
 .bna:after{content:"";display:block;clear:both}
diff --git a/modules/member/tpl/delete_form.html b/modules/member/tpl/delete_form.html
index ee030238d..bd777b262 100644
--- a/modules/member/tpl/delete_form.html
+++ b/modules/member/tpl/delete_form.html
@@ -1,31 +1,29 @@
 <!--%import("filter/delete_member.xml")-->
-<!--%import("js/member_admin.js")-->
+<load target="js/member_admin.js" usecdn="true" />
 <!--#include("header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, delete_member)" class="gap1">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->user_id}</div></th>
-        <td class="wide">{$member_info->user_id}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->nick_name}</div></th>
-        <td>{$member_info->nick_name}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->email_address}</div></th>
-        <td>{$member_info->email_address}</td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
-            <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
-
+<form action="./" method="get" onsubmit="return procFilter(this, delete_member)">
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
+    <h3 class="h3">{$lang->confirm_delete}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->user_id}</th>
+				<td>{$member_info->user_id}</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->nick_name}</th>
+				<td>{$member_info->nick_name}</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->email_address}</th>
+				<td>{$member_info->email_address}</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_delete}" /></span>
+	</div>
 </form>
 
diff --git a/modules/member/tpl/delete_members.html b/modules/member/tpl/delete_members.html
index cd2730ebb..3e3356f23 100644
--- a/modules/member/tpl/delete_members.html
+++ b/modules/member/tpl/delete_members.html
@@ -1,34 +1,32 @@
 <!--%import("filter/delete_members.xml")-->
-<!--%import("js/member_admin.js")-->
+<load target="js/member_admin.js" usecdn="true" />
 
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_delete} ({$lang->target} : {count($member_list)})</h3>
-</div>
+<h1 class="h1">{$lang->cmd_delete} ({$lang->target} : {count($member_list)})</h1>
 
 <form action="./" method="get" id="fo_management" onsubmit="return procFilter(this, delete_members);">
-<input type="hidden" name="target_member_srls" value="{$member_srls}" />
+	<input type="hidden" name="target_member_srls" value="{$member_srls}" />
+	
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+		<tr>
+			<th scope="col">{$lang->user_id}</th>
+			<th scope="col">{$lang->nick_name}</th>
+			<th scope="col">{$lang->signup_date}</th>
+		</tr>
+		<!--@foreach($member_list as $key => $val)-->
+		<tr>
+			<td>{$val->user_id}</td>
+			<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
+			<td>{zdate($val->regdate, "Y-m-d H:i")}</td>
+		</tr>
+		<!--@end-->
+		</table>
+	</div>
 
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col" class="half_wide"><div>{$lang->user_id}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->nick_name}</div></th>
-        <th scope="col"><div>{$lang->signup_date}</div></th>
-    </tr>
-    <!--@foreach($member_list as $key => $val)-->
-    <tr>
-        <td>{$val->user_id}</td>
-        <td><div class="member_{$val->member_srl}">{$val->nick_name}</div></td>
-        <td class="date center nowrap">{zdate($val->regdate, "Y-m-d H:i")}</td>
-    </tr>
-    <!--@end-->
-    </table>
-</div>
-
-<!--@if(count($member_list))-->
-<div id="popFooter">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
-</div>
-<!--@end-->
+	<!--@if(count($member_list))-->
+	<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_delete}" /></span>
+	</div>
+	<!--@end-->
 
 </form>
diff --git a/modules/member/tpl/denied_id_list.html b/modules/member/tpl/denied_id_list.html
index 2f91e3c6b..223c459b1 100644
--- a/modules/member/tpl/denied_id_list.html
+++ b/modules/member/tpl/denied_id_list.html
@@ -1,70 +1,73 @@
-<!--#include("header.html")-->
-<!--%import("filter/insert_denied_id.xml")-->
-<!--%import("filter/update_denied_id.xml")-->
-
-<!-- 금지아이디의 삭제와 관련된 form -->
-<form id="fo_denied_id_info" action="./" method="get">
-<input type="hidden" name="user_id" value="" />
-<input type="hidden" name="mode" value="" />
-</form>
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->user_id}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($member_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td>{$no}</td>
-        <td>{$val->user_id}</td>
-        <td>{$val->description}&nbsp;</td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        <td><a href="#" onclick="doUpdateDeniedID('{$val->user_id}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
-<!-- 금지 아이디 추가 -->
-<form action="./" method="get" onsubmit="return procFilter(this, insert_denied_id)">
-<input type="hidden" name="page" value="{$page}" />
-
-<div>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->user_id}</div></th>
-        <td class="wide"><input type="text" name="user_id" class="inputTypeText w400" /></td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td class="left"><textarea name="description" class="inputTypeTextArea w400"></textarea></td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</div>
-
-</form>
+<!--#include("header.html")-->
+<!--%import("filter/update_denied_id.xml")-->
+
+<!-- 금지아이디의 삭제와 관련된 form -->
+<form id="fo_denied_id_info" action="./" method="get">
+<input type="hidden" name="user_id" value="" />
+<input type="hidden" name="mode" value="" />
+</form>
+
+<!-- 목록 -->
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col">{$lang->user_id}</th>
+				<th scope="col">{$lang->description}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col">&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($member_list as $no => $val)-->
+			<tr class="row{$cycle_idx}">
+				<td>{$no}</td>
+				<td>{$val->user_id}</td>
+				<td>{$val->description}&nbsp;</td>
+				<td>{zdate($val->regdate,"Y-m-d")}</td>
+				<td><a href="#" onclick="doUpdateDeniedID('{$val->user_id}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+
+<!-- 금지 아이디 추가 -->
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertDeniedId" action="./" method="post">
+<input type="hidden" name="module" value="member" />
+<input type="hidden" name="act" value="procMemberAdminInsertDeniedID" />
+<input type="hidden" name="page" value="{$page}" />
+
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
+    <tr>
+        <th scope="row">{$lang->user_id}</th>
+        <td ><input type="text" name="user_id" /></td>
+    </tr>
+    <tr>
+        <th scope="row">{$lang->description}</th>
+        <td ><textarea name="description"></textarea></td>
+    </tr>
+    </table>
+</div>
+<div class="btnArea">
+	<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+</div>
+</form>
diff --git a/modules/member/tpl/group_list.html b/modules/member/tpl/group_list.html
index 48611968c..97cb5bceb 100644
--- a/modules/member/tpl/group_list.html
+++ b/modules/member/tpl/group_list.html
@@ -1,100 +1,135 @@
-<!--%import("filter/insert_group.xml")-->
-<!--%import("filter/update_group.xml")-->
+<load target="js/member_admin_group.js" usecdn="true" />
+<script type="text/javascript" >
+	xe.lang.groupDeleteMessage = '{$lang->msg_group_delete}';
+	xe.lang.multilingual = '{$lang->cmd_set_multilingual}';
+	xe.lang.modify = '{$lang->cmd_modify}';
+	xe.lang.delete = '{$lang->cmd_delete}';
+</script>
+<style type="text/css">
+	._imageMarkButton img { max-height:16px }
+	.filebox_item { border: 1px solid #ccc!important; padding: 2px; max-height: 16px; }
+	.x .multiLangEdit input.vLang { width:120px }
+	.x .multiLangEdit input.vLang.loading { padding-right:24px;width:100px;background:transparent url(../../admin/tpl/img/preLoader16.gif) no-repeat 96px center }
+</style>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<h1 class="h1">{$lang->member_group}</h1>
+<form action="" class="form" method="post" ruleset="insertGroupConfig">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberAdminGroupConfig" />
+	<div class="table even">
+		<table width="100%" border="1" cellspacing="0" class="sortable">
+			<caption>
+				<strong>{count($group_list)}</strong> {$lang->msg_groups_exist}
+				<span class="side">
+					{$lang->use_group_image_mark}: 
+					<input type="radio" name="group_image_mark" id="yes" value="Y" checked="checked"|cond="$config->group_image_mark == 'Y'" /> <label for="yes">{$lang->cmd_yes}</label>
+					<input type="radio" name="group_image_mark" id="no" value="N" checked="checked"|cond="$config->group_image_mark != 'Y'" /> <label for="no">{$lang->cmd_no}</label>
+				</span>
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col">{$lang->group_title}</th>
+					<th scope="col">{$lang->description}</th>
+					<th scope="col">{$lang->is_default}
+						[<a href="#helpDefault" class="tgAnchor">?</a>]
+						<div class="tgContent layer" id="helpDefault" style="right:0">
+							<p>{$lang->about_member_default}</p>
+						</div>
+					</th>
+					<th scope="col" class="_imageMarkButton">{$lang->group_image_mark}</th>
+					<th scope="col"></th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td>&nbsp;</td>
+					<td class="_imageMarkButton">&nbsp;</td>
+					<td><a href="#" class="_addGroup">{$lang->cmd_add_group}</a></td>
+				</tr>
+			</tfoot>
+			<tbody class="uDrag _groupList">
+				<tr loop="$group_list=>$group_srl,$group_info">
+					<td class="multiLangEdit"><div class="wrap" style="height:22px"><button type="button" class="dragBtn">Move to</button>
+						<input type="hidden" name="group_srls[]" value="{$group_info->group_srl}" />
+						<input type="hidden" name="group_titles[]" value="{htmlspecialchars($group_info->title)}" class="vLang"/>
+						<input type="text" value="{$group_info->title}" class="vLang" />
+						<span class="desc"><a href="#langEdit" class="tgAnchor editUserLang" data-effect="slide">{$lang->cmd_set_multilingual}</a></span>
+						</div>
+					</td>
+					<td><input type="text" name="descriptions[]" value="{$group_info->description}" style="width:240px" /></td>
+					<td><input type="radio" name="defaultGroup" value="{$group_info->group_srl}" title="Default" checked="checked"|cond="$group_info->is_default=='Y'" /></td>
+					<td class="_imageMarkButton"><input type="hidden" name="image_marks[]" value="{$group_info->image_mark}" class="_imgMarkHidden" />
+						<img src="{$group_info->image_mark}" alt="{$group_info->title}" cond="$config->group_image_mark == 'Y' && $group_info->image_mark" />
+						<a href="#imageMark" class="modalAnchor _imageMark filebox">{$lang->cmd_modify}</a></td>
+					<td><div class="_deleteTD" style="display:none"|cond="$group_info->is_default == 'Y'"><a href="#{$group_srl}" class="_deleteGroup">{$lang->cmd_delete}</a></div></td>
+				</tr>
+				<tr style="display:none" class="_template">
+					<td class="multiLangEdit"><div class="wrap" style="height:22px"><button type="button" class="dragBtn">Move to</button>
+						<input type="hidden" name="group_srls[]" value="new" disabled="disabled"/>
+						<input type="hidden" name="group_titles[]" value=""  disabled="disabled" class="vLang" />
+						<input type="text" value="" class="vLang" />
+						<span class="desc"><a href="#langEdit" class="tgAnchor editUserLang">{$lang->cmd_set_multilingual}</a></span>
+						</div>
+					</td>
+					<td><input type="text" name="descriptions[]" value="" style="width:240px" disabled="disabled" /></td>
+					<td><input type="radio" name="defaultGroup" value="" title="Default" disabled="disabled" /></td>
+					<td class="_imageMarkButton"><input type="hidden" name="image_marks[]" value="" class="_imgMarkHidden" disabled="disabled" />
+						<a href="#imageMark" class="modalAnchor _imageMark">{$lang->cmd_modify}</a></td>
+					<td><div class="_deleteTD"><a href="#new" class="_deleteGroup">{$lang->cmd_delete}</a></div></td>
+				</tr>
 
-<!--#include("header.html")-->
-<!--%load_js_plugin("ui")-->
-<!--%load_js_plugin("filebox")-->
+			</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 
-
-<!-- 그룹의 삭제와 관련된 form -->
-<form id="fo_group_info" action="./" method="get">
-<input type="hidden" name="act" value="procMemberAdminUpdateGroup" />
-<input type="hidden" name="group_srl" value="" />
-<input type="hidden" name="mode" value="" />
+	<!-- Multilingual -->
+	<div id="langEdit" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput">
+			<h2>{$lang->cmd_multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
 </form>
 
-<form id="fo_group_order" action="./" method="get">
-<input type="hidden" name="act" value="procMemberAdminUpdateGroupOrder" />
-<table cellspacing="0" class="rowTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->group_order}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->group_title}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->description}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->is_default}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->group_order_change}</div></th>
-        <th scope="col" colspan="2"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@if(!count($group_list))-->
-    <tr>
-        <td colspan="7">{$lang->msg_group_is_null}</td>
-    </tr>
-    <!--@end-->
-{@$__i=1}
-    <!--@foreach($group_list as $group_srl => $group_info)-->
-    <tr class="row{$cycle_idx}">
-		<input type="hidden" name="group_srls[]" value="{$group_info->group_srl}" />
-		<td>{$__i++}</td>
-        <td><!--@if($config->group_image_mark=='Y' && $group_info->image_mark)--><img src="{$group_info->image_mark}" style="vertical-align: middle; margin-right: 3px;" /><!--@endif-->{$group_info->title}</td>
-        <td>{nl2br($group_info->description)}&nbsp;</td>
-        <td>{zdate($group_info->regdate,"Y-m-d H:i:s")}</td>
-        <td><!--@if($group_info->is_default=='Y')-->Y<!--@else-->&nbsp;<!--@end--></td>
-		<td><a href="#" class="_up">위로</a> <a href="#" class="_down"><span>아래로</span></a></td>
-        <td><a href="{getUrl('group_srl',$group_info->group_srl)}" title="{$lang->cmd_modify}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
-        <td>
-            <!--@if($group_info->is_default!='Y' && $group_info->is_admin !='Y')-->
-            <a href="#" onclick="doUpdateGroup('{$group_info->group_srl}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
-            <!--@else-->
-            &nbsp;
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="8" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </th>
-    </tr>
-</tbody>
-</table>
-</form>
-
-<!-- 그룹 추가 -->
-<form action="./" method="get" onsubmit="return procFilter(this, insert_group)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="group_srl" value="" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->group_title}</div></th>
-        <td class="wide"><input type="text" name="title" class="inputTypeText w400" /></td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->is_default}</div></th>
-        <td><input type="checkbox" name="is_default" value="Y" class="checkbox" /> {$lang->about_member_default}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td><textarea name="description" class="inputTypeTextArea w400"></textarea></td>
-    </tr>
-
-    <tr class="row2">
-        <th scope="row"><div>{$lang->group_image_mark}</div></th>
-        <td class="left">
-            <div id="filebox_preview_image_mark" style="width:100px;height:100px;display:none"></div>
-            <input type="hidden" name="image_mark" value="" />
-            <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
-            <span id="filebox_cancel_image_mark" class="button red" style="display:none"><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
-        </td>
-    </tr>
-
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</form>
+<div class="modal" id="imageMark">
+	<div class="fg portlet">
+		<div class="_useImageMark" style="display:none">
+		<h2>{$lang->use_group_image_mark}</h2>
+				<input id="useImageMark" type="radio" name="useImageMark" value="Y" />
+				<label for="useImageMark">{$lang->use}</label>
+				<input id="noImageMark" type="radio" name="useImageMark" value="N" />
+				<label for="noImageMark">{$lang->notuse}</label>
+		</div>
+		<!--@if($fileBoxList)-->
+		<div>
+		<h2>{$lang->usable_group_image_mark_list}</h2>
+		<div class="filebox_list">
+		</div>
+		</div>
+		<!--@end-->
+		<h2>{$lang->add_group_image_mark}</h2>
+		<a href="{getUrl('', 'module','admin', 'act', 'dispModuleAdminFileBox')}" target="_blank">{$lang->link_file_box}</a>
+	</div>
+</div>
diff --git a/modules/member/tpl/group_update_form.html b/modules/member/tpl/group_update_form.html
index 4d6c688c0..7458bd634 100644
--- a/modules/member/tpl/group_update_form.html
+++ b/modules/member/tpl/group_update_form.html
@@ -1,45 +1,49 @@
 <!--#include("header.html")-->
-<!--%import("filter/update_group.xml")-->
 <!--%load_js_plugin("filebox")-->
 
 <!-- 그룹 수정 -->
 <!--@if($selected_group)-->
-<form action="./" method="get" onsubmit="return procFilter(this, update_group)">
-<input type="hidden" name="group_srl" value="{$selected_group->group_srl}" />
-<input type="hidden" name="mode" value="update" />
-<!--@if($selected_group->is_default=='Y')--><input type="hidden" name="is_default" value="Y" /><!--@end-->
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->group_title}</div></th>
-        <td class="left"><input type="text" name="title" id="title" class="inputTypeText w400 lang_code" value="{$selected_group->title}"/></td>
-    </tr>
-    <!--@if($selected_group->is_default!='Y' && $selected_group->is_admin!='Y')-->
-    <tr class="row2">
-        <th scope="row"><div>{$lang->is_default}</div></th>
-        <td class="left"><input type="checkbox" name="is_default" value="Y" class="checkbox" /> {$lang->about_member_default}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td class="left"><textarea name="description" class="inputTypeTextArea w400">{$selected_group->description}</textarea></td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->group_image_mark}</div></th>
-        <td class="left">
-            <div id="filebox_preview_image_mark" style="width:100px;height:100px;<!--@if(!$selected_group->image_mark)-->display:none<!--@endif-->"></div>
-            <input type="hidden" name="image_mark" value="{$selected_group->image_mark}" />
-            <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
-            <span id="filebox_cancel_image_mark" class="button red"<!--@if(!$selected_group->image_mark)--> style="display:none" <!--@endif-->><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
-            <script type="text/javascript">//<![CDATA[
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="updateGroup" action="./" method="post">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberAdminUpdateGroup" />
+	<input type="hidden" name="group_srl" value="{$selected_group->group_srl}" />
+	<input type="hidden" name="mode" value="update" />
+	<!--@if($selected_group->is_default=='Y')--><input type="hidden" name="is_default" value="Y" /><!--@end-->
+    <div class="table">
+    	<table width="100%" border="1" cellspacing="0">
+    		<tr>
+    			<th scope="row">{$lang->group_title}</th>
+    			<td ><input type="text" name="title" id="title" value="{$selected_group->title}"/></td>
+   			</tr>
+    		<!--@if($selected_group->is_default!='Y' && $selected_group->is_admin!='Y')-->
+    		<tr>
+    			<th scope="row">{$lang->is_default}</th>
+    			<td ><input type="checkbox" name="is_default" value="Y" class="checkbox" /> {$lang->about_member_default}</td>
+   			</tr>
+    		<!--@end-->
+    		<tr>
+    			<th scope="row">{$lang->description}</th>
+    			<td ><textarea name="description">{$selected_group->description}</textarea></td>
+   			</tr>
+    		<tr>
+    			<th scope="row">{$lang->group_image_mark}</th>
+    			<td >
+    				<div id="filebox_preview_image_mark" style="width:100px;height:100px;<!--@if(!$selected_group->image_mark)-->display:none<!--@endif-->"></div>
+    				<input type="hidden" name="image_mark" value="{$selected_group->image_mark}" />
+    				<span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name=image_mark]').get(0), 'jpg,jpeg,gif,png')">{$lang->cmd_select}</button></span>
+    				<span id="filebox_cancel_image_mark" class="button red"<!--@if(!$selected_group->image_mark)--> style="display:none" <!--@endif-->><button type="button" onclick="XE.filebox.cancel('image_mark')">{$lang->cmd_delete}</button></span>
+    				<script type="text/javascript">//<![CDATA[
                 XE.filebox.init('image_mark');
             //]]></script>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
+   				</td>
+   			</tr>
+   		</table>
+   	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_modify}" /></span>
+	</div>
 </form>
 <!--@end-->
diff --git a/modules/member/tpl/header.html b/modules/member/tpl/header.html
index 3b00e8589..e8e97cfd7 100644
--- a/modules/member/tpl/header.html
+++ b/modules/member/tpl/header.html
@@ -1,5 +1,5 @@
-<!--%import("js/member_admin.js")-->
-<!--%import("css/member_admin.css")-->
+<load target="js/member_admin.js" usecdn="true" />
+<load target="css/member_admin.css" usecdn="true" />
 <!--%load_js_plugin("ui")-->
 
 <h3 class="xeAdmin">{$lang->member} <span class="gray">{$lang->cmd_management}</span></h3>
@@ -8,10 +8,10 @@
 
 <div class="header4">
     <ul class="localNavigation">
-        <li <!--@if($act=='dispMemberAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminList','member_srl','')}">{$lang->cmd_member_list}</a></li>
-        <li <!--@if($act=='dispMemberAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminConfig')}">{$lang->cmd_module_config}</a></li>
-        <li <!--@if($act=='dispMemberAdminGroupList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminGroupList')}">{$lang->cmd_member_group}</a></li>
-        <li <!--@if($act=='dispMemberAdminJoinFormList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminJoinFormList')}">{$lang->cmd_manage_form}</a></li>
-        <li <!--@if($act=='dispMemberAdminDeniedIDList')-->class="on"<!--@end-->><a href="{getUrl('act','dispMemberAdminDeniedIDList')}">{$lang->cmd_manage_id}</a></li>
+        <li <!--@if($act=='dispMemberAdminList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminList','member_srl','')}">{$lang->cmd_member_list}</a></li>
+        <li <!--@if($act=='dispMemberAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminConfig')}">{$lang->cmd_module_config}</a></li>
+        <li <!--@if($act=='dispMemberAdminGroupList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminGroupList')}">{$lang->cmd_member_group}</a></li>
+        <li <!--@if($act=='dispMemberAdminJoinFormList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminJoinFormList')}">{$lang->cmd_manage_form}</a></li>
+        <li <!--@if($act=='dispMemberAdminDeniedIDList')-->class="on"<!--@end-->><a href="{getUrl('', 'module', 'admin', 'act','dispMemberAdminDeniedIDList')}">{$lang->cmd_manage_id}</a></li>
     </ul>
 </div>
diff --git a/modules/member/tpl/images/icon_blog.gif b/modules/member/tpl/images/icon_blog.gif
deleted file mode 100644
index 80f892e39..000000000
Binary files a/modules/member/tpl/images/icon_blog.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_homepage.gif b/modules/member/tpl/images/icon_homepage.gif
deleted file mode 100644
index 30df51134..000000000
Binary files a/modules/member/tpl/images/icon_homepage.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_management.gif b/modules/member/tpl/images/icon_management.gif
deleted file mode 100755
index 0e9a40c81..000000000
Binary files a/modules/member/tpl/images/icon_management.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_on.gif b/modules/member/tpl/images/icon_on.gif
deleted file mode 100644
index 9a1566245..000000000
Binary files a/modules/member/tpl/images/icon_on.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_sendmail.gif b/modules/member/tpl/images/icon_sendmail.gif
deleted file mode 100644
index 370f8f2c0..000000000
Binary files a/modules/member/tpl/images/icon_sendmail.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_trace_comment.gif b/modules/member/tpl/images/icon_trace_comment.gif
deleted file mode 100755
index b234dec94..000000000
Binary files a/modules/member/tpl/images/icon_trace_comment.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_trace_document.gif b/modules/member/tpl/images/icon_trace_document.gif
deleted file mode 100755
index 42ec550e9..000000000
Binary files a/modules/member/tpl/images/icon_trace_document.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_view_info.gif b/modules/member/tpl/images/icon_view_info.gif
deleted file mode 100644
index bce3adda2..000000000
Binary files a/modules/member/tpl/images/icon_view_info.gif and /dev/null differ
diff --git a/modules/member/tpl/images/icon_view_written.gif b/modules/member/tpl/images/icon_view_written.gif
deleted file mode 100644
index 540ed6b95..000000000
Binary files a/modules/member/tpl/images/icon_view_written.gif and /dev/null differ
diff --git a/modules/member/tpl/insert_join_form.html b/modules/member/tpl/insert_join_form.html
index 650e277bd..354a1b4b2 100644
--- a/modules/member/tpl/insert_join_form.html
+++ b/modules/member/tpl/insert_join_form.html
@@ -1,86 +1,52 @@
-<!--#include("header.html")-->
-<!--%import("filter/insert_join_form.xml")-->
-
-<form id="fo_join_form" action="./" method="get" onsubmit="return procFilter(this, insert_join_form)">
-<input type="hidden" name="member_join_form_srl" value="{$join_form->member_join_form_srl}" />
-<input type="hidden" name="default_value" value="<!--@if(is_array($join_form->default_value))-->{implode($join_form->default_value,'|@|')}<!--@end-->" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2" id="zone_column_type">
-        <th scope="row"><div>{$lang->column_type}</div></th>
-        <td>
-            <select name="column_type" onchange="doShowJoinFormValue(this)">
-                <!--@foreach($lang->column_type_list as $key => $val)-->
-                <option value="{$key}" <!--@if($join_form->column_type==$key)-->selected="selected"<!--@end-->>{$lang->column_type_list[$key]}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_column_type}</p>
-
-            <div id="zone_default_value" style="<!--@if($join_form->default_value)-->display:block;<!--@else-->display:none<!--@end-->">
-
-                <div>
-                    <select name="default_value_list" size="8" style="width:400px;height:80px;" id="default_value_listup">
-                        <!--@if($join_form->default_value)-->
-                        <!--@foreach($join_form->default_value as $value_key => $value_val)-->
-                            <!--@if($value_val)-->
-                        <option value="{$value_val}">{$value_val}</option>
-                            <!--@end-->
-                        <!--@end-->
-                        <!--@end-->
-                    </select>
-                </div>
-                <div class="gap1">
-                    <a href="#" onclick="doEditDefaultValue(this,'up');return false;" class="button"><span>{$lang->cmd_move_up}</span></a>
-                    <a href="#" onclick="doEditDefaultValue(this,'down');return false;" class="button"><span>{$lang->cmd_move_down}</span></a>
-                    <a href="#" onclick="doEditDefaultValue(this, 'delete');return false;" class="button black"><span>{$lang->cmd_delete}</span></a>
-                </div>
-                <div class="gap1">
-                    <input type="text" name="default_value_item" id="default_value_item" class="inputTypeText w400" />
-                    <a href="#" onclick="doEditDefaultValue(this, 'insert');return false;" class="button"><span>{$lang->cmd_insert}</span></a>
-                </div>
-            </div>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->column_name}</div></th>
-        <td>
-            <input type="text" name="column_name" value="{$join_form->column_name}" class="inputTypeText w400" />
-            <p>{$lang->about_column_name}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->column_title}</div></th>
-        <td>
-            <input type="text" name="column_title" value="{$join_form->column_title}" class="inputTypeText w400" />
-            <p>{$lang->about_column_title}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->is_active}</div></th>
-        <td>
-            <input type="checkbox" name="is_active" value="Y" <!--@if($join_form->is_active=='Y')-->checked="checked"<!--@end-->/>
-            <p>{$lang->about_active}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->is_required}</div></th>
-        <td>
-            <input type="checkbox" name="required" value="Y" <!--@if($join_form->required=='Y')-->checked="checked"<!--@end-->/>
-            <p>{$lang->about_required}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>
-            <textarea name="description" class="inputTypeTextArea w400">{$join_form->description}</textarea>
-            <p>{$lang->about_form_description}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        </th>
-    </tr>
-    </table>
-
-</form>
+<input type="hidden" name="member_join_form_srl" value="{$formInfo->member_join_form_srl}" />
+	<h2 class="h2">{$lang->cmd_input_extend_form}</h2>
+	<ul>
+		<li>
+			<p class="q"><label for="column_name">{$lang->column_name} *</label></p>
+			<p class="a"><input type="text" id="column_name" name="column_name" value="{$formInfo->column_name}" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="column_title">{$lang->column_title} *</label></p>
+			<p class="a"><input type="text" id="column_title" name="column_title" value="{$formInfo->column_title}" /></p>
+		</li>
+		<li>
+			<p class="q">{$lang->column_type} *</p>
+			<p class="a">
+				<select class="typeSelect" style="width:290px" name="column_type">
+					<option loop="$lang->column_type_list=>$key,$type_info" value="{$key}" selected="selected"|cond="$formInfo->column_type == $key" >{$lang->column_type_list[$key]}</option>
+				</select>
+			</p>
+			<p class="q multiExample">{$lang->about_multi_type}</p>
+			<p class="a multiExample"><textarea rows="5" cols="42" id="multiSelect" name="default_value"><block cond="$default_value">{implode('<enter>', $default_value)}</block></textarea></p>
+		</li>
+		<script type="text/javascript">
+		var $ = jQuery;
+		var typeSelect = $('.typeSelect');
+		var multiOption = $('.typeSelect>option[value=checkbox], .typeSelect>option[value=radio], .typeSelect>option[value=selectM], .typeSelect>option[value=select]');
+		var multiExample = $('.multiExample');
+{@$default_value_types = array('checkbox', 'radio', 'select')}
+<!--@if(!in_array($formInfo->column_type, $default_value_types))-->
+		multiExample.hide();
+<!--@end-->
+		typeSelect.change(function(){
+			if(multiOption.is(':selected')){
+				multiExample.slideDown(200);
+			} else {
+				multiExample.slideUp(200);
+			}
+		});
+		</script>
+		<li>
+			<p class="q"><label for="desc">{$lang->description}</label></p>
+			<p class="a"><textarea rows="5" cols="42" id="desc" name="description">{$formInfo->description}</textarea></p>
+		</li>
+		<li>
+			<p class="a">
+				<input type="radio" id="radio_required" name="required" value="Y" /> <label for="radio_required">{$lang->cmd_required}</label>
+				<input type="radio" id="radio_option" name="required" value="N" /> <label for="radio_option">{$lang->cmd_optional}</label>
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<button type="submit" name="mode" <!--@if($formInfo)-->value="update"<!--@else-->value="insert"<!--@end--> >{$lang->cmd_save}</button>
+	</div>
diff --git a/modules/member/tpl/insert_member.html b/modules/member/tpl/insert_member.html
index 8f8e87152..53a161ecc 100644
--- a/modules/member/tpl/insert_member.html
+++ b/modules/member/tpl/insert_member.html
@@ -1,284 +1,126 @@
-<!--#include("header.html")-->
-<!--@if($member_info->member_srl)-->
-    <!--%import("filter/update_member.xml")-->
-<!--@else-->
-    <!--%import("filter/insert.xml")-->
-<!--@endif-->
-<!--%import("css/member_admin.css")-->
-
-<!--// datepicker javascript plugin load -->
+<load target="js/member_admin.js" usecdn="true" />
+<load target="js/krzip_search.js" usecdn="true" />
 <!--%load_js_plugin("ui.datepicker")-->
-<!--%load_js_plugin("filebox")-->
-
-<form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, insert)">
-    <input type="hidden" name="page" value="{$page}" />
-    <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-    <input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
-    <!--@if($member_info->member_srl)-->
-    <input type="hidden" name="user_id" value="{$member_info->user_id}" />
-    <!--@end-->
-
-
-    <h4 class="xeAdmin">{$lang->member_default_info}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->user_id}</div></th>
-        <td class="wide">
-            <!--@if($member_info->member_srl)-->
-            {$member_info->user_id}
-            <!--@else-->
-            <input type="text" name="user_id" value="" class="inputTypeText" />
-            <p>{$lang->about_user_id}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->password}</div></th>
-        <td>
-            <input type="text" name="password" value="" class="inputTypeText" />
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->user_name}</div></th>
-        <td>
-            <input type="text" name="user_name" value="{$member_info->user_name}" class="inputTypeText" />
-            <p>{$lang->about_user_name}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->nick_name}</div></th>
-        <td>
-            <input type="text" name="nick_name" value="{$member_info->nick_name}" class="inputTypeText" />
-            <p>{$lang->about_nick_name}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->email_address}</div></th>
-        <td>
-            <input type="text" name="email_address" value="{$member_info->email_address}" class="inputTypeText" />
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td>
-            <input type="text" name="homepage" value="{$member_info->homepage}" class="inputTypeText"/>
-            <p>{$lang->about_homepage}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->blog}</div></th>
-        <td>
-            <input type="text" name="blog" value="{$member_info->blog}" class="inputTypeText" />
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->birthday}</div></th>
-        <td>
-            <input type="hidden" name="birthday" id="date_birthday" value="{$member_info->birthday}" />
-            <input type="text" class="inputDate" value="{zdate($member_info->birthday,'Y-m-d',false)}" readonly="readonly" />
-			<span class="button"><input type="button" value="{$lang->cmd_delete}" class="dateRemover" /></span>
-            <p>{$lang->about_birthday}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->allow_mailing}</div></th>
-        <td>
-            <input type="checkbox" name="allow_mailing" value="Y" <!--@if($member_info->allow_mailing!='N')-->checked="checked"<!--@end-->/>
-            {$lang->about_allow_mailing}
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->allow_message}</div></th>
-        <td>
-            <select name="allow_message">
-                <!--@foreach($lang->allow_message_type as $key => $val)-->
-                <option value="{$key}" <!--@if($member_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_allow_message}</p>
-        </td>
-    </tr>
-    <!--@if($member_srl && $editor)-->
-    <tr>
-        <th scope="row"><div>{$lang->signature}</div></th>
-        <td>{$editor}</td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <th scope="row"><div>{$lang->denied}</div></th>
-        <td>
-            <input type="checkbox" name="denied" value="Y" <!--@if($member_info->denied=='Y')-->checked="checked"<!--@end-->/>
-            <p>{$lang->about_denied}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->limit_date}</div></th>
-        <td>
-            <input type="hidden" name="limit_date" id="date_limit_date" value="{$member_info->limit_date}" />
-            <input type="text" class="inputDate" value="{zdate($member_info->limit_date,'Y-m-d',false)}" readonly="readonly" />
-			<span class="button"><input type="button" value="{$lang->cmd_delete}" class="dateRemover" /></span>
-
-            <p class="clear">{$lang->about_limit_date}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->is_admin}</div></th>
-        <td>
-            <input type="checkbox" name="is_admin" value="Y" <!--@if($member_info->is_admin=='Y')-->checked="checked"<!--@end-->/>
-            <p>{$lang->about_is_admin}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>
-            <textarea name="description" class="inputTypeTextArea fullWidth">{$member_info->description}</textarea>
-            <p>{$lang->about_member_description}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->group}</div></th>
-        <td>
-            <!--@foreach($group_list as $key=>$val)-->
-                <input type="checkbox" name="group_srl_list" value="{$key}" id="group_{$key}" <!--@if($member_info->group_list[$key])-->checked="checked"<!--@end--> class="checkbox" />
-                <label for="group_{$key}">{$val->title}</label>
-            <!--@end-->
-            <p>{$lang->about_group}</p>
-        </td>
-    </tr>
-    </table>
-
-    <!--@if($extend_form_list)-->
-
-    <h4 class="xeAdmin">{$lang->member_extend_info}</h4>
-    <table cellspacing="0" class="rowTable">
-    <!--@foreach($extend_form_list as $key => $val)-->
-        <!--@if($val->is_active=='Y')-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>
-            {$val->column_title}
-            <!--@if($val->required=='Y')-->*<!--@end-->
-            <div class="publicItem">
-                <input type="checkbox" class="checkbox" name="open_{$val->column_name}" <!--@if($val->is_opened)-->checked="checked"<!--@end--> value="Y" id="open_{$val->column_name}" />
-                <label for="open_{$val->column_name}">{$lang->public}</label>
-            </div>
-        </div></th>
-        <td class="wide">
-            <!--// 일반 text -->
-            <!--@if($val->column_type == 'text')-->
-                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
-
-            <!--// 홈페이지 주소 -->
-            <!--@elseif($val->column_type == 'homepage')-->
-                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
-
-            <!--// Email 주소 -->
-            <!--@elseif($val->column_type == 'email_address')-->
-                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
-
-            <!--// 전화번호 -->
-            <!--@elseif($val->column_type == 'tel')-->
-                <input type="text" name="{$val->column_name}" value="{$val->value[0]}" size="4" class="inputTypeText" />-
-                <input type="text" name="{$val->column_name}" value="{$val->value[1]}" size="4" class="inputTypeText" />-
-                <input type="text" name="{$val->column_name}" value="{$val->value[2]}" size="4" class="inputTypeText" />
-
-            <!--// textarea -->
-            <!--@elseif($val->column_type == 'textarea')-->
-                <textarea name="{$val->column_name}" class="inputTypeTextArea w400">{$val->value}</textarea>
-
-            <!--// 다중 선택 -->
-            <!--@elseif($val->column_type == 'checkbox')-->
-                <!--@if($val->default_value)-->
-                    <!--@foreach($val->default_value as $v)-->
-                        <input type="checkbox" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/>    {$v}
-                    <!--@end-->
-                <!--@end-->
-
-            <!--@elseif($val->column_type == 'radio')-->
-                <!--@if($val->default_value)-->
-                    <ul class="radio">
-                    <!--@foreach($val->default_value as $v)-->
-                        <li><input type="radio" name="{$val->column_name}" value="{$v}" <!--@if($val->value == $v)-->checked="checked"<!--@end-->/>{$v}</li>
-                    <!--@end-->
-                    </ul>
-                <!--@end-->
-
-
-            <!--// 단일 선택 -->
-            <!--@elseif($val->column_type == 'select')-->
-                <select name="{$val->column_name}">
-                <!--@if($val->default_value)-->
-                    <!--@foreach($val->default_value as $v)-->
-                        <option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-                    <!--@end-->
-                <!--@end-->
-                </select>
-
-            <!--// 한국 주소 검색 -->
-            <!--@elseif($val->column_type == 'kr_zip')-->
-                <div class="krZip">
-                    <div class="item" id="zone_address_search_{$val->column_name}" style="display:none"|cond="$val->value[0]">
-						<label for="krzip_address1_{$val->column_name}" class="iLabel">{$lang->msg_kr_address}</label>
-                        <input type="text" id="krzip_address1_{$val->column_name}" class="iText w400" value="" />
-                        <span class="button"><button type="button">{$lang->cmd_search}</button></span>
-                    </div>
-                    <div class="item" id="zone_address_list_{$val->column_name}" style="display:none">
-                        <select name="{$val->column_name}" id="address_list_{$val->column_name}" class="w400"></select>
-                        <span class="button"><button type="button">{$lang->cmd_search_again}</button></span>
-                    </div>
-                    <div class="item address2">
-						<label for="krzip_address2_{$val->column_name}" class="iLabel">{$lang->msg_kr_address_etc}</label>
-                        <input type="text" name="{$val->column_name}" id="krzip_address2_{$val->column_name}" value="{$val->value[1]}" class="iText w400" />
-                    </div>
-                </div>
-				<load target="js/krzip_search.js" type="body" />
-				<script type="text/javascript">jQuery(function($){ $.krzip('{$val->column_name}') });</script>
-            <!--// 일본 주소 검색 -->
-            <!--@elseif($val->column_type == 'jp_zip')-->
-                <input type="text" name="{$val->column_name}" value="{$val->value}" class="inputTypeText w400" />
-
-            <!--// 날짜 입력 -->
-            <!--@elseif($val->column_type == 'date')-->
-                <input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-                <input type="text" class="inputDate" value="{zdate($val->value,"Y-m-d")}" />
-
-
-            <!--@end-->
-            <!--@if($val->description)--><p class="clear">{$val->description}</p><!--@end-->
-        </td>
-    </tr>
-        <!--@end-->
-    <!--@end-->
-    </table>
-    <!--@end-->
-
-    <table cellspacing="0" class="rowTable">
-    <tbody>
-    <tr>
-        <th class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-            <!--@if($member_srl)-->
-            <a href="{getUrl('act','dispMemberAdminInfo')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-            <!--@else-->
-            <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_cancel}</span></a>
-            <!--@end-->
-        </td>
-    </tr>
-    </tbody>
-    </table>
+<script type="text/javascript" >
+	xe.lang.deleteProfileImage = '{$lang->msg_delete_extend_form}';
+	xe.lang.deleteImageMark = '{$lang->msg_delete_extend_form}';
+	xe.lang.deleteImageName = '{$lang->msg_delete_extend_form}';
+</script>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="./" class="form" ruleset="@insertAdminMember" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberAdminInsert" />
+	<input type="hidden" name="member_srl" value="{$member_srl}" />
+	<input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
+	<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" cond="$member_srl" />
+	<input type="hidden" name="success_return_url" value="{getUrl('act', 'dispMemberAdminList')}" cond="!$member_srl" />
+	<h1 class="h1" cond="$member_srl">{$lang->msg_update_member}</h1>
+	<h1 class="h1" cond="!$member_srl">{$lang->msg_new_member}</h1>
+	<ul>
+		<li cond="$member_srl">
+			<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
+			<p class="a">
+				<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+				<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" disabled="disabled" />
+			</p>
+		</li>
+		<li cond="!$member_srl">
+			<p class="q">{$identifierForm->title} <em style="color:red">*</em></p>
+			<p class="a">
+				<input type="text" name="{$identifierForm->name}" value="" />
+			</p>
+		</li>
+		<li cond="$member_srl">
+			<p class="q">{$lang->password} <em style="color:red">*</em></p>
+			<p class="a">
+				<input type="hidden" name="password" value="{$member_info->password}" />
+				<input type="text" name="reset_password" value="" />
+			</p>
+		</li>
+		<li cond="!$member_srl">
+			<p class="q">{$lang->password} <em style="color:red">*</em></p>
+			<p class="a">
+				<input type="text" name="password" value="" />
+			</p>
+		</li>
+		<li loop="$formTags=>$formTag">
+			<p class="q">{$formTag->title}</p>
+			<div class="a" cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
+			<div class="a" cond="$formTag->name =='signature'">{$editor}</div>
+		</li>
+		<li>
+			<p class="q">{$lang->allow_mailing}</p>
+			<p class="a">
+				<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
+				<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->allow_message}</p>
+			<p class="a">
+				<block loop="$lang->allow_message_type=>$key,$val">
+					<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+				</block>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->status}</p>
+			<p class="a">
+				<input type="radio" name="denied" id="appoval" value="N" checked="checked"|cond="$member_info->denied != 'Y'" > <label for="appoval">{$lang->approval}</label>
+				<input type="radio" name="denied" id="deny" value="Y" checked="checked"|cond="$member_info->denied == 'Y'" > <label for="deny">{$lang->denied}</label>
+			</p>
+		</li>
+		<li>
+			<p class="q"><label for="until">{$lang->limit_date}</label></p>
+			<p class="a">
+				<input type="hidden" name="limit_date" id="date_limit_date" value="{$member_info->limit_date}" />
+				<input type="text" class="inputDate" id="until" value="{zdate($member_info->limit_date,'Y-m-d',false)}" />
+				<input type="button" value="{$lang->cmd_delete}" class="dateRemover" />
+				<span class="desc">{$lang->about_limit_date}</span>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->is_admin}</p>
+			<p class="a">
+				<input type="radio" name="is_admin" id="is_admin" value="Y" checked="checked"|cond="$member_info->is_admin == 'Y'" > <label for="is_admin">{$lang->cmd_yes}</label>
+				<input type="radio" name="is_admin" id="not_admin" value="N" checked="checked"|cond="$member_info->is_admin != 'Y'" > <label for="not_admin">{$lang->cmd_no}</label>
+			</p>
+		</li>
+		<li>
+			<p class="q"><label for="description">{$lang->description}</label></p>
+			<p class="a">
+				<textarea name="description" id="description" cols="42" rows="5">{htmlspecialchars($member_info->description)}</textarea>
+				<span class="desc">{$lang->about_member_description}</span>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->member_group}</p>
+			<p class="a">
+				<!--@foreach($group_list as $key=>$val)-->
+					<input type="checkbox" name="group_srl_list[]" value="{$key}" id="group_{$key}" <!--@if($member_info->group_list[$key])-->checked="checked"<!--@end--> />
+					<label for="group_{$key}">{$val->title}</label>
+				<!--@end-->
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->save}" /></span>
+	</div>
+	</table>
 </form>
-
-
 <script type="text/javascript">
 (function($){
     $(function(){
-        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
+        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
 
             $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
         };
         $.extend(option,$.datepicker.regional['{$lang_type}']);
         $(".inputDate").datepicker(option);
 		$(".dateRemover").click(function() {
-			$(this).parent().prevAll('input').val('');
+			$(this).prevAll('input').val('');
 			return false;});
     });
 })(jQuery);
diff --git a/modules/member/tpl/join_form_list.html b/modules/member/tpl/join_form_list.html
index 1acef3440..9c0c54c23 100644
--- a/modules/member/tpl/join_form_list.html
+++ b/modules/member/tpl/join_form_list.html
@@ -8,37 +8,39 @@
 </form>
 
 <!-- 목록 -->
-<table cellspacing="0" class="rowTable">
-<thead>
-    <tr>
-        <th scope="col" class="half_wide"><div>{$lang->column_title}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->column_name}</div></th>
-        <th scope="col"><div>{$lang->column_type}</div></th>
-        <th scope="col"><div>{$lang->is_active}</div></th>
-        <th scope="col"><div>{$lang->is_required}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="4"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($form_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td>{$val->column_title}</td>
-        <td>{$val->column_name}</td>
-        <td>{$lang->column_type_list[$val->column_type]}</td>
-        <td>{$val->is_active}</td>
-        <td>{$val->required}</td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        <td><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','up');return false;" title="{$lang->cmd_move_up}" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a></td>
-        <td><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','down');return false;" title="{$lang->cmd_move_down}" class="buttonSet buttonDown"><span>{$lang->cmd_move_down}</span></a></td>
-        <td><a href="{getUrl('member_join_form_srl',$val->member_join_form_srl,'act','dispMemberAdminInsertJoinForm')}" title="{$lang->cmd_modify}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
-        <td><a href="#" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','delete','{$lang->confirm_delete}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <th colspan="10" class="button">
-            <a href="{getUrl('act','dispMemberAdminInsertJoinForm','member_join_form_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
+<div class="table even">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th scope="col">{$lang->column_title}</th>
+				<th scope="col">{$lang->column_name}</th>
+				<th scope="col">{$lang->column_type}</th>
+				<th scope="col">{$lang->is_active}</th>
+				<th scope="col">{$lang->is_required}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col" colspan="4">&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($form_list as $no => $val)-->
+			<tr>
+				<td>{$val->column_title}</td>
+				<td>{$val->column_name}</td>
+				<td>{$lang->column_type_list[$val->column_type]}</td>
+				<td>{$val->is_active}</td>
+				<td>{$val->required}</td>
+				<td>{zdate($val->regdate,"Y-m-d")}</td>
+				<td>
+					<button type="button" class="text" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','up');return false;">{$lang->cmd_move_up}</button>
+					<button type="button" class="text" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','down');return false;">{$lang->cmd_move_down}</button>
+					<a href="{getUrl('member_join_form_srl',$val->member_join_form_srl,'act','dispMemberAdminInsertJoinForm')}">{$lang->cmd_modify}</a>
+					<button type="button" class="text" onclick="doUpdateJoinForm('{$val->member_join_form_srl}','delete','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</button>
+				</td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn"><a href="{getUrl('act','dispMemberAdminInsertJoinForm','member_join_form_srl','')}">{$lang->cmd_make}</a></span>
+</div>
diff --git a/modules/member/tpl/js/krzip_search.js b/modules/member/tpl/js/krzip_search.js
index 5d86c9086..bd23b616b 100644
--- a/modules/member/tpl/js/krzip_search.js
+++ b/modules/member/tpl/js/krzip_search.js
@@ -20,8 +20,9 @@ function doSelectKrZip(column_name) {
 	var val  = form.find('select[name=_tmp_address_list_'+column_name+']').val();
 	var addr = form.find('input[name='+column_name+']');
 
-	addr.eq(0).val(val);
-	addr.eq(1).focus();
+	addr
+		.eq(0).val(val).end()
+		.eq(1).focus();
 }
 
 function doSearchKrZip(column_name) {
@@ -58,31 +59,6 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) {
 	$j('#fo_insert_member select[name=_tmp_address_list_'+column_name+']').html(address_list.join('')).get(0).selectedIndex = 0;
 }
 
-jQuery(function($){
-	// Input Clear
-	var iText = $('.item>.iLabel').next('.iText');
-	$('.item>.iLabel').css('position','absolute');
-	iText
-		.focus(function(){
-			$(this).prev('.iLabel').css('visibility','hidden');
-		})
-		.blur(function(){
-			if($(this).val() == ''){
-				$(this).prev('.iLabel').css('visibility','visible');
-			} else {
-				$(this).prev('.iLabel').css('visibility','hidden');
-			}
-		})
-		.change(function(){
-			if($(this).val() == ''){
-				$(this).prev('.iLabel').css('visibility','visible');
-			} else {
-				$(this).prev('.iLabel').css('visibility','hidden');
-			}
-		})
-		.blur();
-});
-
 (function($){
 
 $.krzip = function(column_name) {
diff --git a/modules/member/tpl/js/member_admin.js b/modules/member/tpl/js/member_admin.js
index dbfdeb8a5..efc83022f 100644
--- a/modules/member/tpl/js/member_admin.js
+++ b/modules/member/tpl/js/member_admin.js
@@ -43,10 +43,9 @@ function completeInsertGroup(ret_obj) {
 function doUpdateGroup(group_srl, mode, message) {
     if(typeof(message)!='undefined'&&!confirm(message)) return;
 
-    var fo_obj = xGetElementById('fo_group_info');
+    var fo_obj = get_by_id('fo_group_info');
     fo_obj.group_srl.value = group_srl;
-    fo_obj.mode.value = mode;
-    procFilter(fo_obj, update_group);
+	fo_obj.submit();
 }
 
 function completeUpdateGroup(ret_obj) {
@@ -68,21 +67,11 @@ function completeInsertDeniedID(ret_obj) {
     location.href = url;
 }
 
-/* 금지아이디 관련 작업들 */
-function doUpdateDeniedID(user_id, mode, message) {
-    if(typeof(message)!='undefined'&&!confirm(message)) return;
-
-    var fo_obj = xGetElementById('fo_denied_id_info');
-    fo_obj.user_id.value = user_id;
-    fo_obj.mode.value = mode;
-    procFilter(fo_obj, update_denied_id);
-}
-
 /* 가입폼 관련 작업들 */
 function doUpdateJoinForm(member_join_form_srl, mode, message) {
     if(typeof(message)!='undefined'&&!confirm(message)) return;
 
-    var fo_obj = xGetElementById('fo_join_form_info');
+    var fo_obj = get_by_id('fo_join_form_info');
     fo_obj.member_join_form_srl.value = member_join_form_srl;
     fo_obj.mode.value = mode;
 
@@ -121,17 +110,17 @@ function doShowJoinFormValue(sel_obj) {
         case 'radio' :
         case 'checkbox' :
         case 'select' :
-                xGetElementById('zone_default_value').style.display = 'block';
+                get_by_id('zone_default_value').style.display = 'block';
             break;
         default :
-                xGetElementById('zone_default_value').style.display = 'none';
+                get_by_id('zone_default_value').style.display = 'none';
             break;
     }
 }
 
 function doEditDefaultValue(obj, cmd) {
-    var listup_obj = xGetElementById('default_value_listup');
-    var item_obj = xGetElementById('default_value_item');
+    var listup_obj = get_by_id('default_value_listup');
+    var item_obj = get_by_id('default_value_item');
     var idx = listup_obj.selectedIndex;
     var lng = listup_obj.options.length;
     var val = item_obj.value;
@@ -171,16 +160,16 @@ function doEditDefaultValue(obj, cmd) {
         value_list[value_list.length] = listup_obj.options[i].value;
     }
 
-    xGetElementById('fo_join_form').default_value.value = value_list.join('|@|');
+    get_by_id('fo_join_form').default_value.value = value_list.join('|@|');
 }
 
 /* 한국 우편 번호 관련 */
 function doHideKrZipList(column_name) {
-    var zone_list_obj = xGetElementById('zone_address_list_'+column_name);
-    var zone_search_obj = xGetElementById('zone_address_search_'+column_name);
-    var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name);
-    var addr1_obj = xGetElementById('fo_insert_member')[column_name][0];
-    var field_obj = xGetElementById('fo_insert_member')['_tmp_address_search_'+column_name];
+    var zone_list_obj = get_by_id('zone_address_list_'+column_name);
+    var zone_search_obj = get_by_id('zone_address_search_'+column_name);
+    var zone_addr1_obj = get_by_id('zone_address_1_'+column_name);
+    var addr1_obj = get_by_id('fo_insert_member')[column_name][0];
+    var field_obj = get_by_id('fo_insert_member')['_tmp_address_search_'+column_name];
 
     zone_addr1_obj.style.display = 'none';
     zone_list_obj.style.display = 'none';
@@ -190,13 +179,13 @@ function doHideKrZipList(column_name) {
 }
 
 function doSelectKrZip(column_name) {
-    var zone_list_obj = xGetElementById('zone_address_list_'+column_name);
-    var zone_search_obj = xGetElementById('zone_address_search_'+column_name);
-    var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name);
-    var sel_obj = xGetElementById('fo_insert_member')['_tmp_address_list_'+column_name];
+    var zone_list_obj = get_by_id('zone_address_list_'+column_name);
+    var zone_search_obj = get_by_id('zone_address_search_'+column_name);
+    var zone_addr1_obj = get_by_id('zone_address_1_'+column_name);
+    var sel_obj = get_by_id('fo_insert_member')['_tmp_address_list_'+column_name];
     var value = sel_obj.options[sel_obj.selectedIndex].value;
-    var addr1_obj = xGetElementById('fo_insert_member')[column_name][0];
-    var addr2_obj = xGetElementById('fo_insert_member')[column_name][1];
+    var addr1_obj = get_by_id('fo_insert_member')[column_name][0];
+    var addr2_obj = get_by_id('fo_insert_member')[column_name][1];
     addr1_obj.value = value;
     zone_search_obj.style.display = 'none';
     zone_list_obj.style.display = 'none';
@@ -205,7 +194,7 @@ function doSelectKrZip(column_name) {
 }
 
 function doSearchKrZip(column_name) {
-    var field_obj = xGetElementById('fo_insert_member')['_tmp_address_search_'+column_name];
+    var field_obj = get_by_id('fo_insert_member')['_tmp_address_search_'+column_name];
     var addr = field_obj.value;
     if(!addr) return;
 
@@ -225,10 +214,10 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) {
     var address_list = ret_obj['address_list'].split("\n");
     var column_name = callback_args['column_name'];
 
-    var zone_list_obj = xGetElementById('zone_address_list_'+column_name);
-    var zone_search_obj = xGetElementById('zone_address_search_'+column_name);
-    var zone_addr1_obj = xGetElementById('zone_address_1_'+column_name);
-    var sel_obj = xGetElementById('fo_insert_member')['_tmp_address_list_'+column_name];
+    var zone_list_obj = get_by_id('zone_address_list_'+column_name);
+    var zone_search_obj = get_by_id('zone_address_search_'+column_name);
+    var zone_addr1_obj = get_by_id('zone_address_1_'+column_name);
+    var sel_obj = get_by_id('fo_insert_member')['_tmp_address_list_'+column_name];
 
     for(var i=0;i<address_list.length;i++) {
             var opt = new Option(address_list[i],address_list[i],false,false);
@@ -249,44 +238,50 @@ function completeSearchKrZip(ret_obj, response_tags, callback_args) {
 
 /* 프로필 이미지, 이미지 이름, 마크 삭제 */
 function doDeleteProfileImage(member_srl) {
-    var fo_obj = xGetElementById("fo_image");
-    fo_obj.member_srl.value = member_srl;
-    procFilter(fo_obj, delete_profile_image);
+	if (!member_srl) return;
+
+	if (!confirm(xe.lang.deleteProfileImage)) return false;
+
+	exec_xml(
+		'member',
+		'procMemberDeleteProfileImage',
+		{member_srl:member_srl},
+		function(){jQuery('#profile_imagetag').remove()},
+		['error','message','tpl']
+	);
 }
 
 function doDeleteImageName(member_srl) {
-    var fo_obj = xGetElementById("fo_image");
-    fo_obj.member_srl.value = member_srl;
-    procFilter(fo_obj, delete_image_name);
+	if (!member_srl) return;
+
+	if (!confirm(xe.lang.deleteImageName)) return false;
+	exec_xml(
+		'member',
+		'procMemberDeleteImageName',
+		{member_srl:member_srl},
+		function(){jQuery('#image_nametag').remove()},
+		['error','message','tpl']
+	);
 }
 
 function doDeleteImageMark(member_srl) {
-    var fo_obj = xGetElementById("fo_image");
-    fo_obj.member_srl.value = member_srl;
-    procFilter(fo_obj, delete_image_mark);
+	if (!member_srl) return;
+
+	if (!confirm(xe.lang.deleteImageMark)) return false;
+	exec_xml(
+		'member',
+		'procMemberDeleteImageMark',
+		{member_srl:member_srl},
+		function(){jQuery('#image_marktag').remove()},
+		['error','message','tpl']
+	);
 }
 
 
-/* 멤버 스킨 컬러셋 구해옴 */
-function doGetSkinColorset(skin) {
-    var params = new Array();
-    params['skin'] = skin;
-
-    var response_tags = new Array('error','message','tpl');
-    exec_xml('member', 'getMemberAdminColorset', params, doDisplaySkinColorset, response_tags);
-}
-
-function doDisplaySkinColorset(ret_obj) {
-    var tpl = ret_obj["tpl"];
-    var old_height = xHeight("member_colorset");
-    xInnerHtml("member_colorset", tpl);
-    var new_height = xHeight("member_colorset");
-    if(typeof(fixAdminLayoutFooter)=="function") fixAdminLayoutFooter(new_height - old_height);
-}
 
 /* 그룹 일괄 변경 */
 function doManageMemberGroup() {
-    var fo_obj = xGetElementById("member_fo");
+    var fo_obj = get_by_id("member_fo");
     var member_srl = new Array();
 
     if(typeof(fo_obj.cart.length)=='undefined') {
@@ -314,21 +309,16 @@ function completeUpdateMemberGroup(ret_obj) {
 
 /* 일괄 삭제 */
 function doDeleteMembers() {
-    var fo_obj = xGetElementById("member_fo");
-    var member_srl = new Array();
+    var carts = get_by_id('member_fo').elements['cart'], member_srls = [], i, c, url;
 
-    if(typeof(fo_obj.cart.length)=='undefined') {
-        if(fo_obj.cart.checked) member_srl[member_srl.length] = fo_obj.cart.value;
-    } else {
-        var length = fo_obj.cart.length;
-        for(var i=0;i<length;i++) {
-            if(fo_obj.cart[i].checked) member_srl[member_srl.length] = fo_obj.cart[i].value;
-        }
-    }
+	if(!is_def(carts.length)) carts = [carts];
+	for(i=0,c=carts.length; i < c; i++) {
+		if(carts[i].checked) member_srls.push(carts[i].value);
+	}
+	if(member_srls.length < 1) return;
 
-    if(member_srl.length<1) return;
+	url = './?module=member&act=dispMemberAdminDeleteMembers&member_srls=' + member_srls.join(',');
 
-    var url = './?module=member&act=dispMemberAdminDeleteMembers&member_srls='+member_srl.join(',');
     winopen(url, 'deleteMembers','scrollbars=no,width=400,height=500,toolbars=no');
 }
 
diff --git a/modules/member/tpl/js/member_admin_config.js b/modules/member/tpl/js/member_admin_config.js
new file mode 100644
index 000000000..7f487cdb0
--- /dev/null
+++ b/modules/member/tpl/js/member_admin_config.js
@@ -0,0 +1,187 @@
+/* 멤버 스킨 컬러셋 구해옴 */
+function doGetSkinColorset(skin) {
+    var params = {skin:skin};
+    var response_tags = ['error','message','tpl'];
+
+	function on_complete(ret) {
+		jQuery('#colorset').show();
+		var $colorset = jQuery('#member_colorset'), old_h, new_h;
+
+		old_h = $colorset.height();
+		$colorset.html(ret.tpl);
+		new_h = $colorset.height();
+
+		try{ fixAdminLayoutFooter(new_h - old_h) }catch(e){ };
+	}
+
+    exec_xml(
+		'member',
+		'getMemberAdminColorset',
+		{skin:skin},
+		on_complete,
+		['error','message','tpl']
+	);
+}
+
+/* 금지아이디 관련 작업들 */
+function doUpdateDeniedID(user_id, mode, message) {
+    if(typeof(message)!='undefined'&&!confirm(message)) return;
+
+    exec_xml(
+		'member',
+		'procMemberAdminUpdateDeniedID',
+		{user_id:user_id, mode:mode},
+		function(){
+			if (mode == 'delete'){
+				jQuery('#denied_'+user_id).remove();
+				jQuery('._deniedIDCount').html(jQuery('#deniedList li').length);
+			}
+		},
+		['error','message','tpl']
+	);
+}
+
+jQuery(function($){
+	// hide form if enable_join is setted "No" 
+	var suSetting = $('fieldset.suSetting'); // 회원가입 설정
+	var suForm = $('fieldset.suForm'); // 회원가입 양식
+	var isEnable = suSetting.find(':radio[name=enable_join]:checked').val();
+	if (isEnable == 'N'){
+		suSetting.find('>ul>li:gt(0)').hide();
+		suForm.hide();
+	}
+
+	suSetting.find(':radio[name=enable_join]').change(function(){
+		if($('#enable_join_yes').is(':checked')){ 
+			// 회원 가입을 허용하지 않는 경우 불필요한 항목을 모두 감춘다
+			suSetting.find('>ul>li:gt(0)').slideDown(200);
+			suForm.slideDown(200);
+		} else { 
+			// 회원 가입을 허용하는 경우 필요한 항목을 모두 펼친다
+			suSetting.find('>ul>li:gt(0)').slideUp(200);
+			suForm.slideUp(200);
+		}
+	});
+	suForm.find(':checkbox').each(function(){
+		var $i = $(this);
+		$i.change(function(){
+			if($i.is(':checked')){
+				$i.parent('td').next('td')
+							   .find(':radio, :text')
+									.removeAttr('disabled')
+									.end()
+							   .find(':radio[value=option]').attr('checked', 'checked');
+				
+			} else {
+				$i.parent('td').next('td').find(':radio, :text').attr('disabled','disabled').removeAttr('checked').next('label').css('fontWeight','normal');
+			}
+		});
+	});
+
+	suForm.find('._imageType')
+		.find('input:checkbox:not(:checked)').closest('tr')
+			.find('._subItem').hide().end()
+			.end()
+		.end()
+		.find('input:checkbox')
+			.change(function(){
+				var $subItem = $(this).closest('tr').find('._subItem');
+				if($(this).is(':checked')) $subItem.show();
+				else $subItem.hide();
+			})
+		.end();
+
+		$('a.modalAnchor._extendFormEdit').bind('before-open.mw', function(event){
+		var memberFormSrl = $(event.target).parent().attr('id');
+		var checked = $(event.target).closest('tr').find('input:radio:checked').val();
+
+		exec_xml(
+			'member',
+			'getMemberAdminInsertJoinForm',
+			{member_join_form_srl:memberFormSrl},
+			function(ret){
+				var tpl = ret.tpl.replace(/<enter>/g, '\n');
+				$('#extendForm').html(tpl);
+
+				if (checked)$('#extendForm #radio_'+checked).attr('checked', 'checked');
+			},
+			['error','message','tpl']
+		);
+
+	});
+	
+	$('a._extendFormDelete').click(function(event){
+		event.preventDefault();
+		if (!confirm(xe.lang.msg_delete_extend_form)) return;
+
+		var memberFormSrl = $(event.target).parent().attr('id');
+		var targetTR = $(event.target).closest('tr'); 
+
+		exec_xml(
+			'member',
+			'procMemberAdminDeleteJoinForm',
+			{member_join_form_srl:memberFormSrl},
+			function(ret){
+				targetTR.remove();
+			},
+			['error','message','tpl']
+		);
+	});
+
+	$('button._addDeniedID').click(function(){
+		var ids = $('#prohibited_id').val();
+		if(ids == ''){ 
+			alert(xe.lang.msg_null_prohibited_id);
+			$('#prohibited_id').focus();
+			return;
+		}
+		
+
+		ids = ids.replace(/\n/g, ',');
+
+		var tag;
+		function on_complete(data){
+			var uids = data.user_ids.split(',');
+			for (var i=0; i<uids.length; i++){
+				tag = '<li id="denied_'+uids[i]+'">'+uids[i]+' <a href="#" class="side" onclick="doUpdateDeniedID(\''+uids[i]+'\', \'delete\', \''+xe.lang.confirm_delete+'\');return false;">'+xe.lang.cmd_delete+'</a></li>';
+				$('#deniedList').append($(tag));
+			}
+			$('#prohibited_id').val('');
+
+			$('._deniedIDCount').html($('#deniedList li').length);
+		}
+
+		jQuery.exec_json('member.procMemberAdminInsertDeniedID', {'user_id': ids}, on_complete);
+
+	});
+
+	$('input[name=identifier]').change(function(){
+		var $checkedTR = $('input[name=identifier]:checked').closest('tr');
+		var $notCheckedTR = $('input[name=identifier]:not(:checked)').closest('tr');
+		var name, notName;
+		if (!$checkedTR.hasClass('sticky')){
+			name = $checkedTR.find('input[name="list_order[]"]').val();
+			if (!$checkedTR.find('input[type=hidden][name="usable_list[]"]').length) $('<input type="hidden" name="usable_list[]" value="'+name+'" />').insertBefore($checkedTR);
+			if (!$checkedTR.find('input[type=hidden][name='+name+']').length) $('<input type="hidden" name="'+name+'" value="required" />').insertBefore($checkedTR);
+			$checkedTR.find('th').html('<span class="_title" style="padding-left:20px" >'+$checkedTR.find('th ._title').html()+'</span>');
+			$checkedTR.find('input[type=checkbox][name="usable_list[]"]').attr('checked', 'checked').attr('disabled', 'disabled');
+			$checkedTR.find('input[type=radio][name='+name+'][value=required]').attr('checked', 'checked').attr('disabled', 'disabled');
+			$checkedTR.find('input[type=radio][name='+name+'][value=option]').removeAttr('checked').attr('disabled', 'disabled');
+			$checkedTR.addClass('sticky');
+			$checkedTR.parent().prepend($checkedTR);
+
+			notName = $notCheckedTR.find('input[name="list_order[]"]').val();
+			if (notName == 'user_id'){
+				if ($notCheckedTR.find('input[type=hidden][name="usable_list[]"]').length) $notCheckedTR.find('input[type=hidden][name="usable_list[]"]').remove();
+				if ($notCheckedTR.find('input[type=hidden][name='+name+']').length) $notCheckedTR.find('input[type=hidden][name='+name+']').remove();
+				$notCheckedTR.find('input[type=checkbox][name="usable_list[]"]').removeAttr('disabled');
+				$notCheckedTR.find('input[type=radio][name='+notName+']').removeAttr('disabled');
+			}
+			$notCheckedTR.find('th').html('<div class="wrap"><button type="button" class="dragBtn">Move to</button><span class="_title" >'+$notCheckedTR.find('th ._title').html()+'</span></div>');
+			$notCheckedTR.removeClass('sticky');
+
+			// add sticky class 
+		}
+	});
+
+});
diff --git a/modules/member/tpl/js/member_admin_group.js b/modules/member/tpl/js/member_admin_group.js
new file mode 100644
index 000000000..8068e6a34
--- /dev/null
+++ b/modules/member/tpl/js/member_admin_group.js
@@ -0,0 +1,100 @@
+jQuery(function ($){
+	if($('input[name=group_image_mark]:checked').val() == 'Y') $('._imageMarkButton').show();
+	else $('._imageMarkButton').hide();
+	
+	$('input[name=group_image_mark]').click(function (){
+		var checked = $(this).val();
+		if (checked == 'Y') $('._imageMarkButton').show();
+		else $('._imageMarkButton').hide();
+	});
+
+	$('input:radio[name=defaultGroup]').click(function(){
+		$('._deleteTD').show();
+		if ($(this).attr('checked')){
+			$(this).closest('tr').find('._deleteTD').hide();
+		}
+	});
+	/**
+	 * use dispMemberAdminSiteMemberGroup
+	 **/
+	$('a.modalAnchor._imageMark').bind('before-open.mw', function(e){
+		var $targetImage = $(e.target).parent().find('img');
+		var $imageMarkHidden = $(e.target).parent().find('._imgMarkHidden');
+		if ($targetImage.length){
+			$("._useImageMark").show();
+			$("#useImageMark").attr("checked", "checked");
+			$("#noImageMark").removeAttr("checked")
+				.click(function (){
+					$targetImage.remove();
+					$imageMarkHidden.val('');
+					$('a.modalAnchor._imageMark').trigger('close.mw');
+				});
+		}else{
+			$("._useImageMark").hide();
+			$("#useImageMark").removeAttr("checked");
+			$("#noImageMark").attr("checked", "checked");
+		}
+	});
+
+	$('._deleteGroup').click(function (event){
+		event.preventDefault();
+		var $target = $(event.target).closest('tr');
+		var group_srl = $(event.target).attr('href').substr(1); 
+		if(!confirm(xe.lang.groupDeleteMessage)) return;
+
+		if (group_srl.indexOf("new") > 0){
+			$target.remove();
+			return;
+		}
+
+		exec_xml(
+			'member',
+			'procMemberAdminDeleteGroup',
+			{group_srl:group_srl},
+			function(){location.reload();},
+			['error','message','tpl']
+		);
+
+	});
+
+	$('._addGroup').click(function (event){
+		var $tbody = $('._groupList');
+		var index = 'new'+ new Date().getTime();
+
+		$tbody.find('._template').clone(true)
+			.removeClass('_template')
+			.find('input').removeAttr('disabled').end()
+			.find('input:radio').val(index).end()
+			.find('input[name="group_srls[]"]').val(index).end()
+			.show()
+			.appendTo($tbody);
+
+		return false;
+	});
+
+	$('.filebox').bind('filebox.selected', function (e, src){
+		var $targetImage = $(this).parent().find('img');
+		var $imageMarkHidden = $(this).parent().find('._imgMarkHidden');
+		
+		if ($targetImage.length){
+			$targetImage.attr('src', src);
+		}else{
+			$targetImage = $('<img src="'+src+'" alt="" />').insertBefore(this);
+		}
+		$imageMarkHidden.val(src);
+	});
+	//add plugin
+	var CheckTitle = xe.createPlugin('checkTitle', {
+		API_BEFORE_VALIDATE : function(sender, params){
+			$('input[name="group_titles[]"]').each(function(index){
+				if ($(this).val() == ""){
+					$(this).val($(this).closest('td').find('input:text.vLang').val());
+				}
+			});
+		}
+	});
+	
+	var checkTitle = new CheckTitle();
+	var v = xe.getApp('Validator')[0];
+	v.registerPlugin(checkTitle);
+});
diff --git a/modules/member/tpl/js/member_admin_list.js b/modules/member/tpl/js/member_admin_list.js
new file mode 100644
index 000000000..a17730335
--- /dev/null
+++ b/modules/member/tpl/js/member_admin_list.js
@@ -0,0 +1,20 @@
+jQuery(function ($){
+	
+	$('a.modalAnchor._member').bind('before-open.mw', function(){
+		var $memberList = $('._memberList input[name=user]:checked');
+		if ($memberList.length == 0){
+			alert(xe.lang.msg_select_user);
+			return false;
+		}
+		var memberInfo, memberSrl;
+		var memberTag = "";
+		$('input[name="groups[]"]:checked').removeAttr('checked');
+		$('#message').val('');
+		for (var i = 0; i<$memberList.length; i++){
+			memberInfo = $memberList.eq(i).val().split('\t');
+			memberSrl = memberInfo.shift();
+			memberTag += '<tr><td>'+memberInfo.join("</td><td>")+'<input type="hidden" name="member_srls[]" value="'+memberSrl+'"/></td></tr>' 
+		}
+		$('#popupBody').empty().html(memberTag);
+	});
+});
diff --git a/modules/member/tpl/js/signup_check.js b/modules/member/tpl/js/signup_check.js
index 78dac67f7..77116ddb4 100644
--- a/modules/member/tpl/js/signup_check.js
+++ b/modules/member/tpl/js/signup_check.js
@@ -1,52 +1,52 @@
-/**
- * @brief 회원 가입시나 정보 수정시 각 항목의 중복 검사등을 하는 기능을 구현
- * @author NHN (developer@xpressengine.com)
- **/
-
-// 입력이 시작된 것과 입력후 정해진 시간동안 내용이 변하였을 경우 서버에 ajax로 체크를 하기 위한 변수 설정
-var memberCheckObj = { target:null, value:null }
-
-// domready시에 특정 필드들에 대해 이벤트를 걸어 놓음
-jQuery(document).ready(memberSetEvent);
-
-function memberSetEvent() {
-	jQuery('#fo_insert_member :input')
-		.filter('[name=user_id],[name=nick_name],[name=email_address]')
-		.blur(memberCheckValue);
-}
-
-
-// 실제 서버에 특정 필드의 value check를 요청하고 이상이 있으면 메세지를 뿌려주는 함수
-function memberCheckValue(event) {
-	var field  = event.target;
-	var _name  = field.name;
-	var _value = field.value;
-	if(!_name || !_value) return;
-
-	var params = {name:_name, value:_value};
-	var response_tags = ['error','message'];
-
-	exec_xml('member','procMemberCheckValue', params, completeMemberCheckValue, response_tags, field);
-}
-
-// 서버에서 응답이 올 경우 이상이 있으면 메세지를 출력
-function completeMemberCheckValue(ret_obj, response_tags, field) {
-	var _id   = 'dummy_check'+field.name;
-	var dummy = jQuery('#'+_id);
-   
-    if(ret_obj['message']=='success') {
-        dummy.html('').hide();
-        return;
-    }
-
-	if (!dummy.length) {
-		dummy = jQuery('<div class="checkValue" />').attr('id', _id).appendTo(field.parentNode);
-	}
-
-	dummy.html(ret_obj['message']).show();
-}
-
-// 결과 메세지를 정리하는 함수
-function removeMemberCheckValueOutput(dummy, obj) {
-    dummy.style.display = "none";
-}
+/**
+ * @brief 회원 가입시나 정보 수정시 각 항목의 중복 검사등을 하는 기능을 구현
+ * @author NHN (developer@xpressengine.com)
+ **/
+
+// 입력이 시작된 것과 입력후 정해진 시간동안 내용이 변하였을 경우 서버에 ajax로 체크를 하기 위한 변수 설정
+var memberCheckObj = { target:null, value:null }
+
+// domready시에 특정 필드들에 대해 이벤트를 걸어 놓음
+jQuery(document).ready(memberSetEvent);
+
+function memberSetEvent() {
+	jQuery('#fo_insert_member :input')
+		.filter('[name=user_id],[name=nick_name],[name=email_address]')
+		.blur(memberCheckValue);
+}
+
+
+// 실제 서버에 특정 필드의 value check를 요청하고 이상이 있으면 메세지를 뿌려주는 함수
+function memberCheckValue(event) {
+	var field  = event.target;
+	var _name  = field.name;
+	var _value = field.value;
+	if(!_name || !_value) return;
+
+	var params = {name:_name, value:_value};
+	var response_tags = ['error','message'];
+
+	exec_xml('member','procMemberCheckValue', params, completeMemberCheckValue, response_tags, field);
+}
+
+// 서버에서 응답이 올 경우 이상이 있으면 메세지를 출력
+function completeMemberCheckValue(ret_obj, response_tags, field) {
+	var _id   = 'dummy_check'+field.name;
+	var dummy = jQuery('#'+_id);
+   
+    if(ret_obj['message']=='success') {
+        dummy.html('').hide();
+        return;
+    }
+
+	if (!dummy.length) {
+		dummy = jQuery('<div class="checkValue" />').attr('id', _id).appendTo(field.parentNode);
+	}
+
+	dummy.html(ret_obj['message']).show();
+}
+
+// 결과 메세지를 정리하는 함수
+function removeMemberCheckValueOutput(dummy, obj) {
+    dummy.style.display = "none";
+}
diff --git a/modules/member/tpl/leave_form.html b/modules/member/tpl/leave_form.html
index 27b1d8135..39606a6ce 100644
--- a/modules/member/tpl/leave_form.html
+++ b/modules/member/tpl/leave_form.html
@@ -1,12 +1,12 @@
-{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
+{@ Context::loadFile(array("./common/js/jquery.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/js_app.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/common.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_handler.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_js_filter.js", 'head', '', -100000), true) }
 
-<!--%import("css/msignup.css")-->
+<load target="css/msignup.css" usecdn="true" />
 <!--%import("../skins/default/filter/leave_member.xml")-->
-<!--%import("../skins/default/js/member.js")-->
+<load target="../skins/default/js/member.js" usecdn="true" />
 <div class="bd">
     <h2 class="h2">{$member_title = $lang->msg_leave_member}</h2>
     <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, leave_member)">
@@ -23,6 +23,6 @@
 		<input type="submit" value="{$lang->cmd_leave}" accesskey="s" class="bn"/>
 		<a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
 	</div>
-     
+
 </form>
 </div>
diff --git a/modules/member/tpl/login_form.html b/modules/member/tpl/login_form.html
index 6289ce853..3b8b89d73 100644
--- a/modules/member/tpl/login_form.html
+++ b/modules/member/tpl/login_form.html
@@ -1,19 +1,19 @@
-<!--%import("css/mlogin.css")-->
-<div class="bd">	
-<div class="hx h2">
-	<h2>{$lang->cmd_login}</h2>
-</div>
-	<form action="./" method="POST" class="ff">
-		<input type="hidden" name="module" value="member" />
-		<input type="hidden" name="act" value="procMemberLogin" />
-		<input type="hidden" name="redirect_url" value="{getUrl('act','')}" />
-		<ul>
-			<li><label for="id">{$lang->user_id}</label><input name="user_id" type="text" id="id" value="" /></li>
-			<li><label for="pw">{$lang->password}</label><input name="password" type="password" id="pw" value="" /></li>
-		</ul>
-		<div class="bna">
-			<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
-			<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
-		</div>
-	</form>
-</div>
+<load target="css/mlogin.css" usecdn="true" />
+<div class="bd">
+<div class="hx h2">
+	<h2>{$lang->cmd_login}</h2>
+</div>
+	<form action="./" method="POST" class="ff">
+		<input type="hidden" name="module" value="member" />
+		<input type="hidden" name="act" value="procMemberLogin" />
+		<input type="hidden" name="redirect_url" value="{getUrl('act','')}" />
+		<ul>
+			<li><label for="id">{$lang->user_id}</label><input name="user_id" type="text" id="id" value="" /></li>
+			<li><label for="pw">{$lang->password}</label><input name="password" type="password" id="pw" value="" /></li>
+		</ul>
+		<div class="bna">
+			<div class="fl"><input name="keep_signed" type="checkbox" value="Y" id="autoLogin" /> <label for="autoLogin">{$lang->keep_signed}</label></div>
+			<div class="fr"><button type="submit" class="bn dark">{$lang->cmd_login}</button></div>
+		</div>
+	</form>
+</div>
diff --git a/modules/member/tpl/manage_member_group.html b/modules/member/tpl/manage_member_group.html
index cc8aecf23..ed467641a 100644
--- a/modules/member/tpl/manage_member_group.html
+++ b/modules/member/tpl/manage_member_group.html
@@ -1,49 +1,45 @@
-<!--%import("filter/manage_member_group.xml")-->
-<!--%import("js/member_admin.js")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_member_group} ({$lang->target} : {count($member_list)})</h3>
-</div>
-
-<form action="./" method="get" id="fo_management" onsubmit="return procFilter(this, manage_member_group);">
-<input type="hidden" name="member_srl" value="{$member_srls}" />
-
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td>
-            <!--@foreach($group_list as $key => $val)-->
-            <!--@if($val->is_admin != 'Y')-->
-            <input type="checkbox" value="{$key}" name="group_srls" id="member_group_{$key}"/> <label for="member_group_{$key}">{$val->title}</label> &nbsp;<br/>
-            <!--@end-->
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@if(count($member_list))-->
-    <tr>
-        <th class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" /></span>
-        </th>
-    </tr>
-    <!--@end-->
-    </table>
-
-    <table cellspacing="0" class="crossTable">
-    <thead>
-    <tr>
-        <th scope="col" class="half_wide"><div>{$lang->user_id}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->nick_name}</div></th>
-        <th scope="col"><div>{$lang->signup_date}</div></th>
-    </tr>
-    </thead>
-    <!--@foreach($member_list as $key => $val)-->
-    <tr>
-        <td>{$val->user_id}</td>
-        <td><div class="member_{$val->member_srl}">{$val->nick_name}</div></td>
-        <td class="date nowrap center">{zdate($val->regdate, "Y-m-d H:i")}</td>
-    </tr>
-    <!--@end-->
-    </table>
+<load target="js/member_admin.js" usecdn="true" />
+<h1 class="h1">{$lang->cmd_member_group} ({$lang->target} : {count($member_list)})</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
+<form ruleset="manageMemberGroup" action="./" method="post" id="fo_management">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberAdminUpdateMembersGroup" />
+	<input type="hidden" name="member_srl" value="{$member_srls}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<td>
+					<!--@foreach($group_list as $key => $val)-->
+					<!--@if($val->is_admin != 'Y')-->
+					<input type="checkbox" value="{$key}" name="group_srls[]" id="member_group_{$key}"/> <label for="member_group_{$key}">{$val->title}</label> &nbsp;<br/>
+					<!--@end-->
+					<!--@end-->
+					</td>
+				</tr>
+		</table>
+	</div>
+	<div class="btnArea" cond="count($member_list)">
+		<span class="btn"><input type="submit" value="{$lang->cmd_apply}" /></span>
+	</div>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col">{$lang->user_id}</th>
+					<th scope="col">{$lang->nick_name}</th>
+					<th scope="col">{$lang->signup_date}</th>
+					</tr>
+				</thead>
+			<!--@foreach($member_list as $key => $val)-->
+			<tr>
+				<td>{$val->user_id}</td>
+				<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
+				<td>{zdate($val->regdate, "Y-m-d H:i")}</td>
+				</tr>
+			<!--@end-->
+		</table>
+	</div>
 
 </form>
diff --git a/modules/member/tpl/member_config.html b/modules/member/tpl/member_config.html
index 4214ccaec..21d7af964 100644
--- a/modules/member/tpl/member_config.html
+++ b/modules/member/tpl/member_config.html
@@ -1,187 +1,205 @@
-<!--%import("filter/insert_config.xml")-->
-<!--%import("../../editor/tpl/js/editor_module_config.js",optimized=false)-->
-
-<!--#include("header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-<input type="hidden" name="temp_srl" value="" />
-<input type="hidden" name="agreement" value="{htmlspecialchars($config->agreement)}" />
-
-<table cellspacing="0" class="rowTable">
-<tr class="row2">
-    <th scope="row"><div>{$lang->webmaster_name}</div></th>
-    <td>
-        <input type="text" name="webmaster_name" value="{$config->webmaster_name}" size="20" class="inputTypeText lang_code" id="webmaster_name" />
-        <p>{$lang->about_webmaster_name}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->webmaster_email}</div></th>
-    <td>
-        <input type="text" name="webmaster_email" value="{$config->webmaster_email}" size="40" class="inputTypeText" />
-        <p>{$lang->about_webmaster_email}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->enable_openid}</div></th>
-    <td>
-        <input type="checkbox" name="enable_openid" value="Y" <!--@if($config->enable_openid=='Y')-->checked="checked"<!--@end--> class="checkbox" />
-        {$lang->about_enable_openid}
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->enable_join}</div></th>
-    <td>
-        <input type="checkbox" name="enable_join" value="Y" <!--@if($config->enable_join=='Y')-->checked="checked"<!--@end--> class="checkbox" />
-        {$lang->about_enable_join}
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->enable_confirm}</div></th>
-<td>
-    <input type="checkbox" name="enable_confirm" value="Y" <!--@if($config->enable_confirm=='Y')-->checked="checked"<!--@end--> class="checkbox" />
-    {$lang->about_enable_confirm}
-</td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->change_password_date}</div></th>
-    <td>
-        <input type="text" name="change_password_date" value="{$config->change_password_date}" size="2" class="inputTypeText" />{$lang->unit_day}
-        <p>{$lang->about_change_password_date}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->limit_day}</div></th>
-    <td>
-        <input type="text" name="limit_day" value="{$config->limit_day}" size="2" class="inputTypeText" />{$lang->unit_day}
-        <p>{$lang->about_limit_day}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->profile_image}</div></th>
-    <td>
-        <p>
-            <input type="checkbox" name="profile_image" value="Y" <!--@if($config->profile_image=='Y')-->checked="checked"<!--@end--> class="checkbox" />
-            {$lang->about_profile_image}
-        </p>
-        {$lang->profile_image_max_width} : <input type="text" name="profile_image_max_width" size="3" value="{$config->profile_image_max_width}" class="inputTypeText" />px<br />
-        {$lang->profile_image_max_height} : <input type="text" name="profile_image_max_height" size="3" value="{$config->profile_image_max_height}" class="inputTypeText" />px<br />
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->image_name}</div></th>
-    <td>
-        <p>
-            <input type="checkbox" name="image_name" value="Y" <!--@if($config->image_name=='Y')-->checked="checked"<!--@end--> class="checkbox" />
-            {$lang->about_image_name}
-        </p>
-        {$lang->image_name_max_width} : <input type="text" name="image_name_max_width" size="3" value="{$config->image_name_max_width}" class="inputTypeText" />px<br />
-        {$lang->image_name_max_height} : <input type="text" name="image_name_max_height" size="3" value="{$config->image_name_max_height}" class="inputTypeText" />px<br />
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->image_mark}</div></th>
-    <td>
-        <p>
-            <input type="checkbox" name="image_mark" value="Y" <!--@if($config->image_mark=='Y')-->checked="checked"<!--@end--> class="checkbox"/>
-            {$lang->about_image_mark}
-        </p>
-        {$lang->image_mark_max_width} : <input type="text" name="image_mark_max_width" size="3" value="{$config->image_mark_max_width}" class="inputTypeText"/>px<br />
-        {$lang->image_mark_max_height} : <input type="text" name="image_mark_max_height" size="3" value="{$config->image_mark_max_height}" class="inputTypeText"/>px<br />
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->group_image_mark}</div></th>
-    <td>
-        <p>
-            <input type="checkbox" name="group_image_mark" value="Y" <!--@if($config->group_image_mark=='Y')-->checked="checked"<!--@end--> class="checkbox"/>
-            {$lang->about_group_image_mark}
-        </p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->signature}</div></th>
-    <td>
-        <p>
-            <input type="checkbox" name="signature" value="Y" <!--@if($config->signature=='Y')-->checked="checked"<!--@end--> class="checkbox"/>
-        </p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->signature_max_height}</div></th>
-    <td>
-        <input type="text" name="signature_max_height" size="3" value="{$config->signature_max_height}" class="inputTypeText"/>px
-        <p>{$lang->about_signature_max_height}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->editor_skin}</div></th>
-    <td>
-        <select name="editor_skin" onchange="getEditorSkinColorList(this.value)">
-        <!--@foreach($editor_skin_list as $editor_skin)-->
-        <option value="{$editor_skin}" <!--@if($editor_skin==$config->editor_skin)-->selected="selected"<!--@end-->>{$editor_skin}</option>
-        <!--@end-->
-        </select>
-        <select name="editor_colorset" id="sel_editor_colorset" style="display:none"></select>
-        <script "text/javascript">//<![CDATA[
-            getEditorSkinColorList('{$config->editor_skin}','{$config->editor_colorset}');
-        //]]></script>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->after_login_url}</div></th>
-    <td>
-        <input type="text" name="after_login_url" value="{$config->after_login_url}" class="inputTypeText w400" />
-        <p>{$lang->about_after_login_url}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->after_logout_url}</div></th>
-    <td>
-        <input type="text" name="after_logout_url" value="{$config->after_logout_url}" class="inputTypeText w400" />
-        <p>{$lang->about_after_logout_url}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->redirect_url}</div></th>
-    <td>
-        <input type="text" name="redirect_url" value="{$config->redirect_url}" class="inputTypeText w400" />
-        <p>{$lang->about_redirect_url}</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->agreement}</div></th>
-    <td>
-        {$editor}
-        <p>{$lang->about_agreement}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->skin}</div></th>
-    <td>
-        <select name="skin" onchange="doGetSkinColorset(this.options[this.selectedIndex].value);return false;">
-            <!--@foreach($skin_list as $key => $val)-->
-            <option value="{$key}" <!--@if($config->skin == $key)-->selected="selected"<!--@end-->>{$val->title} ({$key})</option>
-            <!--@end-->
-        </select>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->colorset}</div></th>
-    <td><div id="member_colorset"></div></td>
-</tr>
-<tr class="row2">
-    <th colspan="2" class="button">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
-        <!--@if($module=="admin")-->
-        <a href="{getUrl('act','dispMemberAdminList')}" class="button"><span>{$lang->cmd_back}</span></a>
-        <!--@end-->
-    </th>
-</tr>
-</table>
-
-</form>
-
+<load target="js/member_admin_config.js" usecdn="true" />
 <script type="text/javascript">
-    xAddEventListener(window,'load', function() { doGetSkinColorset("{$config->skin}"); });
+	xe.lang.msg_delete_extend_form = '{$lang->msg_delete_extend_form}';
+	xe.lang.confirm_delete = '{$lang->confirm_delete}';
+	xe.lang.cmd_delete = '{$lang->cmd_delete}';
+	xe.lang.msg_null_prohibited_id = '{$lang->msg_null_prohibited_id}';
 </script>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="./" class="form" ruleset="insertConfig" method="post">
+<input type="hidden" name="module" value="member" />
+<input type="hidden" name="act" value="procMemberAdminInsertConfig" />
+<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" />
+<input type="hidden" name="agreement" value="{$config->agreement}" />
+	<h1 class="h1">{$lang->cmd_member_config}</h1>
+	<fieldset class="section suSetting">
+		<h2 class="h2">{$lang->cmd_module_config}</h2>
+		<ul>
+			<li>
+				<p class="q">{$lang->enable_join}</p>
+				<p class="a">
+					<input type="radio" name="enable_join" id="enable_join_yes" value="Y" checked="checked"|cond="$config->enable_join == 'Y'" /> <label for="enable_join_yes">{$lang->cmd_yes}</label>
+					<input type="radio" name="enable_join" id="enable_join_no" value="N" checked="checked"|cond="$config->enable_join != 'Y'" /> <label for="enable_join_no">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q">{$lang->enable_confirm}</p>
+				<p class="a">
+					<input type="radio" name="enable_confirm" id="enable_confirm_yes" value="Y" checked="checked"|cond="$config->enable_confirm == 'Y'" /> <label for="enable_confirm_yes">{$lang->cmd_yes}</label>
+					<input type="radio" name="enable_confirm" id="enable_confirm_no" value="N" checked="checked"|cond="$config->enable_confirm != 'Y'"/> <label for="enable_confirm_no">{$lang->cmd_no}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="webmaster_name">{$lang->webmaster_name}</label></p>
+				<p class="a">
+					<input type="text" id="webmaster_name" name="webmaster_name" value="{$config->webmaster_name}" size="20" /></p>
+				<p class="desc">{$lang->about_webmaster_name}</p>
+			</li>
+			<li>
+				<p class="q"><label for="webmaster_email">{$lang->webmaster_email}</label></p>
+				<p class="a">
+					<input type="text" id="webmaster_email" name="webmaster_email" value="{$config->webmaster_email}" size="40" /></p>
+				<p class="desc">{$lang->about_webmaster_email}</p>
+			</li>
+			<li>
+				<p class="q"><label for="limit_day">{$lang->limit_day}</label></p>
+				<p class="a"><input type="text" id="limit_day" name="limit_day" value="{$config->limit_day}" style="width:30px" /><span class="desc">{$lang->unit_day}({$lang->about_limit_day})</span></p>
+			</li>
+			<li>
+				<p class="q"><label for="change_password_date">{$lang->change_password_date}</label></p>
+				<p class="a"><input type="text" id="change_password_date" name="change_password_date" value="{$config->change_password_date}" style="width:30px" /><span class="desc">{$lang->unit_day}({$lang->about_change_password_date})</span></p>
+			</li>
+			<li>
+				<p class="q"><label for="agreement">{$lang->agreement}</label></p>
+				<p class="a">{$editor}</p>
+			</li>
+			<li>
+				<p class="q"><label for="after_login_url">{$lang->after_login_url}</label></p>
+				<p class="a">
+					<input type="text" id="after_login_url" name="after_login_url" value="{$config->after_login_url}" /></p>
+				<p class="desc">{$lang->about_after_login_url}</p>
+			</li>
+			<li>
+				<p class="q"><label for="after_logout_url">{$lang->after_logout_url}</label></p>
+				<p class="a">
+					<input type="text" id="after_logout_url" name="after_logout_url" value="{$config->after_logout_url}" /></p>
+				<p class="desc">{$lang->about_after_logout_url}</p>
+			</li>
+			<li>
+				<p class="q"><label for="redirect_url">{$lang->redirect_url}</label></p>
+				<p class="a">
+					<input type="text" id="redirect_url" name="redirect_url" value="{$config->redirect_url}" /></p>
+				<p class="desc">{$lang->about_redirect_url}</p>
+			</li>
+			<li>
+				<p class="q"><label for="skin">{$lang->skin}</label></p>
+				<p class="a">
+					<select id="skin" name="skin" onchange="doGetSkinColorset(this.options[this.selectedIndex].value)">
+						<option loop="$skin_list=>$key,$val" value="{$key}" selected="selected"|cond="$config->skin==$key">{$val->title} ({$key})</option>
+					</select>
+				</p>
+			</li>
+			<li id="colorset" style="display:none"|cond="!$config->colorset">
+				<p class="q"><label for="member_colorset">{$lang->colorset}</label></p>
+				<p class="a"><div id="member_colorset"></div></p>
+			</li>
+			<li>
+				<p class="q"><label for="prohibited_id">{$lang->cmd_manage_id}({$lang->about_manage_id} {sprintf($lang->count_manage_id, count($deniedIDs))})</label></p>
+				<div class="a">
+					<ul class="textList" id="deniedList">
+						<li loop="$deniedIDs=>$denied_info" id="denied_{$denied_info->user_id}">{$denied_info->user_id} <a href="#" class="side" onclick="doUpdateDeniedID('{$denied_info->user_id}','delete','{$lang->confirm_delete}');return false;">{$lang->delete}</a></li>
+					</ul>
+				</div>
+				<div class="a">
+					<textarea rows="4" cols="42" id="prohibited_id" title="{$lang->add_prohibited_id}"></textarea>
+					<span class="btn"><button type="button" class="_addDeniedID">{$lang->add}</button></span>
+					<span class="desc">{$lang->multi_line_input}</span>
+				</div>
+			</li>
+		</ul>
+	</fieldset>
+	<fieldset class="section suForm">
+		<h2 class="h2">{$lang->cmd_manage_form}</h2>
+		<div class="table even">
+			<table width="100%" border="1" cellspacing="0" class="sortable">
+				<thead>
+				<tr>
+					<th scope="col">{$lang->target}</th>
+					<th scope="col">{$lang->identifier}
+						[<a href="#helpDefault" class="tgAnchor">?</a>]
+						<div class="tgContent layer" id="helpDefault" style="right:0">
+							<p>{$lang->about_identifier}</p>
+						</div>
+					</th>
+					<th scope="col">{$lang->use}</th>
+					<th scope="col">{$lang->cmd_required}/{$lang->cmd_optional}</th>
+					<th scope="col" class="text">{$lang->description}</th>
+					<th scope="col">{$lang->cmd_edit}</th>
+				</thead>
+				<tbody class="uDrag">
+					<!--@foreach($config->signupForm as $item)-->
+					<!--@if($item->isIdentifier)-->
+					<tr class="sticky">
+						<input type="hidden" name="list_order[]" value="{$item->name}" />
+						<input type="hidden" name="usable_list[]" value="{$item->name}"/>
+						<input type="hidden" name="{$item->name}" value="requierd"/>
+						<th scope="row">
+							<span class="_title" style="padding-left:20px">{$item->title}</span>
+						</th>
+						<td><input type="radio" name="identifier" value="{$item->name}" checked="checked" /></td>
+						<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"  disabled="disabled" /></td>
+						<td>
+							<input type="radio" id="{$item->name}_re" name="{$item->name}" value="requierd" checked="checked" disabled="disabled" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
+							<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" disabled="disabled" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
+						</td>
+						<td class="text">&nbsp;</td>
+						<td>&nbsp;</td>
+					</tr>
+					<!--@elseif($item->isDefaultForm)-->
+					<tr class="_imageType"|cond="$item->imageType">
+						<input type="hidden" name="list_order[]" value="{$item->name}" />
+						<input type="hidden" name="usable_list[]" value="{$item->name}" cond="$item->mustRequired"/>
+						<input type="hidden" name="{$item->name}" value="requierd" cond="$item->mustRequired"/>
+						<th scope="row">
+							<div class="wrap">
+								<button type="button" class="dragBtn">Move to</button>
+								<span class="_title">{$item->title}</span>
+							</div>
+						</th>
+						<td><input type="radio" name="identifier" value="{$item->name}" cond="$item->name== 'email_address' || $item->name=='user_id'" /></td>
+						<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->mustRequired || $item->isUse" disabled="disabled"|cond="$item->mustRequired" /></td>
+						<td>
+							<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->mustRequired || $item->required" disabled="disabled"|cond="$item->mustRequired || !$item->isUse" /> <label for="{$item->name}_re">{$lang->cmd_required}</label>
+							<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="!$item->mustRequired && ($item->isUse && !$item->required)" disabled="disabled"|cond="$item->mustRequired || !$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
+							<div cond="$item->imageType" class="_subItem">
+								<label for="{$item->name}_max_width">{$lang->cmd_image_max_width}</label><input type="text" name="{$item->name}_max_width" id="{$item->name}_max_width" value="{$item->max_width}" style="width:30px" /> px
+								/
+								<label for="{$item->name}_max_height">{$lang->cmd_image_max_height}</label><input type="text" name="{$item->name}_max_height" id="{$item->name}_max_height" value="{$item->max_height}" style="width:30px" /> px
+							</div>
+						</td>
+						<td class="text">&nbsp;</td>
+						<td>&nbsp;</td>
+					</tr>
+					<!--@else-->
+					<tr>
+						<input type="hidden" name="list_order[]" value="{$item->name}" />
+						<input type="hidden" name="{$item->name}_member_join_form_srl" value="{$item->member_join_form_srl}" />
+						<th scope="row">
+							<div class="wrap">
+								<button type="button" class="dragBtn">Move to</button>
+								<span class="_title">{$item->title}</span>
+							</div>
+						</th>
+						<td></td>
+						<td><input type="checkbox" name="usable_list[]" value="{$item->name}" title="{$lang->use}" checked="checked"|cond="$item->isUse" /></td>
+						<td>
+							<input type="radio" id="{$item->name}_re" name="{$item->name}" value="required" checked="checked"|cond="$item->required" disabled="disabled"|cond="!$item->isUse"/> <label for="{$item->name}_re">{$lang->cmd_required}</label>
+							<input type="radio" id="{$item->name}_op" name="{$item->name}" value="option" checked="checked"|cond="$item->isUse && !$item->required" disabled="disabled"|cond="!$item->isUse" /> <label for="{$item->name}_op">{$lang->cmd_optional}</label>
+						</td>
+						<td class="text">{$item->description}</td>
+						<td id="{$item->member_join_form_srl}"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->cmd_edit}</a> | <a href="#" class="_extendFormDelete">{$lang->cmd_delete}</a></td>
+					</tr>
+					<!--@end-->
+					<!--@end-->
+				</tbody>
+			</table>
+		</div>
+		<p class="btnArea">
+			<span class="btn small"><a href="#userDefine" class="modalAnchor _extendFormEdit">{$lang->add_extend_form}...</a></span>
+		</p>
+	</fieldset>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
+</form>
+<div class="modal" id="userDefine">
+	<form action="./" class="fg form" ruleset="insertJoinForm" method="post">
+		<input type="hidden" name="module" value="member" />
+		<input type="hidden" name="act" value="procMemberAdminInsertJoinForm" />
+		<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" />
+		<div id="extendForm">
+		</div>
+	</form>
+</div>
diff --git a/modules/member/tpl/member_info.html b/modules/member/tpl/member_info.html
index 84cc2a124..50e6b9c1b 100644
--- a/modules/member/tpl/member_info.html
+++ b/modules/member/tpl/member_info.html
@@ -1,188 +1,77 @@
-<!--%import("filter/delete_profile_image.xml")-->
-<!--%import("filter/delete_image_name.xml")-->
-<!--%import("filter/delete_image_mark.xml")-->
-<!--#include("header.html")-->
+<h1 class="h1">{$lang->member_info}</h1>
+<div class="table even">
+	<table width="100%" border="1" cellspacing="0">
+		<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
+		<!--@if($formInfo->isDefaultForm)-->
+{@$title = $formInfo->title}
+{@$value = $memberInfo[$formInfo->name]}
+			<!--@if($formInfo->name == 'find_account_question')-->
+{@$value = $lang->find_account_question_items[$value].' : '.$memberInfo['find_account_answer']}
+			<!--@elseif($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
+{@$target = $memberInfo['profile_image']}
+{@$value = '<img src="'.$target->src.'" />'}
+			<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
+{@$target = $memberInfo['image_name']}
+{@$value = '<img src="'.$target->src.'" />'}
+			<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
+{@$target = $memberInfo['image_mark']}
+{@$value = '<img src="'.$target->src.'" />'}
+			<!--@end-->
+		<!--@else-->
+{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
+{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
+			<!--@if($formInfo->type=='tel')-->
+				{@$value = htmlspecialchars($orgValue[0])}
+					<!--@if($orgValue[1])-->-<!--@end-->
+				{@$value .= htmlspecialchars($orgValue[1])}
+					<!--@if($orgValue[2])-->-<!--@end-->
+				{@$value .= htmlspecialchars($orgValue[2])}
+			<!--@elseif($formInfo->type=='kr_zip')-->
+				{@$value = htmlspecialchars($orgValue[0])}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= htmlspecialchars($orgValue[1])}
+			<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
+				{@$value = htmlspecialchars(implode(", ",$orgValue))}
+			<!--@elseif($formInfo->type=='date')-->
+				{@$value = zdate($orgValue, "Y-m-d")}
+			<!--@else-->
+				{@$value = nl2br(htmlspecialchars($orgValue))}
+			<!--@end-->
+		<!--@end-->
 
-<!-- 이미지 이름/마크를 삭제하기 위한 폼 -->
-<form action="./" method="get" id="fo_image">
-    <input type="hidden" name="member_srl" />
-</form>
-
-<table cellspacing="0" class="rowTable">
-<tr class="row2">
-    <th scope="row"><div>{$lang->user_id}</div></th>
-    <td>{$member_info->user_id}</td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->user_name}</div></th>
-    <td>{$member_info->user_name}</td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->nick_name}</div></th>
-    <td>{$member_info->nick_name}</td>
-</tr>
-<tr>
-    <th scope="row" rowspan="2"><div>{$lang->profile_image}</div></th>
-    <td>
-        <!--@if($member_info->profile_image->src)-->
-        <img src="{$member_info->profile_image->src}" border="0" alt="profile_image" />
-        <a href="#" onclick="doDeleteProfileImage({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        <!--@else-->
-        &nbsp;
-        <!--@end-->
-    </td>
-</tr>
-<tr class="row2">
-    <td>
-        <form action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
-        <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-        <input type="hidden" name="module" value="member" />
-        <input type="hidden" name="act" value="procMemberInsertProfileImage" />
-            <input type="file" name="profile_image" value="" />
-            <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
-        </form>
-        <p>{$lang->profile_image_max_width} : {$member_config->profile_image_max_width}px, {$lang->profile_image_max_height} : {$member_config->profile_image_max_height}px</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row" rowspan="2"><div>{$lang->image_name}</div></th>
-    <td>
-        <!--@if($member_info->image_name->src)-->
-        <img src="{$member_info->image_name->src}" border="0" alt="image_name" />
-        <a href="#" onclick="doDeleteImageName({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        <!--@else-->
-        &nbsp;
-        <!--@end-->
-    </td>
-</tr>
-<tr class="row2">
-    <td>
-        <form action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
-        <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-        <input type="hidden" name="module" value="member" />
-        <input type="hidden" name="act" value="procMemberInsertImageName" />
-            <input type="file" name="image_name" value="" />
-            <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
-        </form>
-        <p>{$lang->image_name_max_width} : {$member_config->image_name_max_width}px, {$lang->image_name_max_height} : {$member_config->image_name_max_height}px</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row" rowspan="2"><div>{$lang->image_mark}</div></th>
-    <td>
-        <!--@if($member_info->image_mark->src)-->
-        <img src="{$member_info->image_mark->src}" border="0" alt="image_mark" />
-        <a href="#" onclick="doDeleteImageMark({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        <!--@else-->
-        &nbsp;
-        <!--@end-->
-    </td>
-</tr>
-<tr class="row2">
-    <td>
-        <form action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
-        <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
-        <input type="hidden" name="module" value="member" />
-        <input type="hidden" name="act" value="procMemberInsertImageMark" />
-        <input type="file" name="image_mark" value="" />
-        <span class="button"><input type="submit" value="{$lang->cmd_submit}" /></span>
-        </form>
-        <p>{$lang->image_mark_max_width} : {$member_config->image_mark_max_width}px, {$lang->image_mark_max_height} : {$member_config->image_mark_max_height}px</p>
-    </td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->email_address}</div></th>
-    <td>{$member_info->email_address}</td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->homepage}</div></th>
-    <td><!--@if($member_info->homepage)--><a href="{$member_info->homepage}" onclick="winopen(this.href); return false;">{$member_info->homepage}</a><!--@end-->&nbsp;</td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->blog}</div></th>
-    <td><!--@if($member_info->blog)--><a href="{$member_info->blog}" onclick="windopen(this.href); return false;">{$member_info->blog}</a><!--@end-->&nbsp;</td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->birthday}</div></th>
-    <td>{zdate($member_info->birthday,'Y-m-d')}&nbsp;</td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->allow_mailing}</div></th>
-    <td>{$member_info->allow_mailing}&nbsp;</td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->allow_message}</div></th>
-    <td>{$lang->allow_message_type[$member_info->allow_message]}</td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->signature}</div></th>
-    <td>{$member_info->signature}&nbsp;</td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->denied}</div></th>
-    <td>{$member_info->denied}</td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->limit_date}</div></th>
-    <td>
-        <!--@if($member_info->limit_date)-->
-            {zdate($member_info->limit_date,"Y-m-d H:i")}
-        <!--@end-->
-        &nbsp;
-    </td>
-</tr>
-<tr class="row2">
-    <th scope="row"><div>{$lang->is_admin}</div></th>
-    <td>{$member_info->is_admin}</td>
-</tr>
-<tr>
-    <th scope="row"><div>{$lang->group}</div></th>
-    <td>
-        <!--@foreach($member_info->group_list as $key => $val)-->
-            {$val}
-        <!--@end-->
-    </td>
-</tr>
-<!--@if($extend_form_list)-->
-<!--@foreach($extend_form_list as $key => $val)-->
-<tr class="row{$cycle_idx}">
-    <th scope="row"><div>{$val->column_title}<!--@if($val->is_opened)--> <span class="publicItem">({$lang->public})</span><!--@end--></div></th>
-    <td>
-        <!--@if($val->column_type=='tel')-->
-            {$val->value[0]}
-                <!--@if($val->value[1])-->-<!--@end-->
-            {$val->value[1]}
-                <!--@if($val->value[2])-->-<!--@end-->
-            {$val->value[2]}
-        <!--@elseif($val->column_type=='kr_zip')-->
-            {$val->value[0]}<!--@if($val->value[1]&&$val->value[0])--><br /><!--@end-->{$val->value[1]}
-        <!--@elseif($val->column_type=='checkbox' && is_array($val->value))-->
-            {implode(", ",$val->value)}
-        <!--@elseif($val->column_type=='date')-->
-            {zdate($val->value, "Y-m-d")}
-        <!--@else-->
-            {nl2br($val->value)}
-        <!--@end-->
-        &nbsp;
-    </td>
-</tr>
-<!--@end-->
-<!--@end-->
-<tr>
-    <th scope="row"><div>{$lang->description}</div></th>
-    <td>{$member_info->description}&nbsp;</td>
-</tr>
-<tr class="row2">
-    <th colspan="2" class="button">
-        <a href="{getUrl('act','dispMemberAdminInsert')}" class="button black strong"><span>{$lang->cmd_modify}</span></a>
-        <!--@if($member_info->is_admin!='Y')-->
-        <a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl',$member_info->member_srl)}" class="button red"><span>{$lang->cmd_delete}</span></a>
-        <!--@end-->
-        <!--@if($module=="admin")-->
-        <a href="{getUrl('act','dispMemberAdminList','module_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
-        <!--@end-->
-    </th>
-</tr>
-</table>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+		<tr cond="$formInfo->isUse && $formInfo->name != 'password'">
+			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
+			<td class="text">{$value}</td>
+		</tr>
+		<!--@end-->
+		<tr>
+			<th scope="row">{$lang->allow_mailing}</th>
+			<td class="text"><!--@if($memberInfo['allow_mailing'] == 'Y')-->{$lang->cmd_yes}<!--@else-->{$lang->cmd_no}<!--@end--></td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->allow_message}</th>
+			<td class="text">{$lang->allow_message_type[$memberInfo['allow_message']]}</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->denied}</th>
+			<td class="text"><!--@if($memberInfo['denied'] == 'N')-->{$lang->cmd_no}<!--@else-->{$lang->cmd_yes}<!--@end--></td>
+		</tr>
+		<tr cond="$memberInfo['limit_date']">
+			<th scope="row">{$lang->limit_date}</th>
+			<td class="text">{zdate($memberInfo['limit_date'],"Y-m-d H:i")}</td>
+		</tr>
+		<tr cond="$memberInfo['is_admin'] == 'Y'">
+			<th scope="row">{$lang->is_admin}</th>
+			<td class="text">{$lang->cmd_yes}</td>
+		</tr>
+		<tr>
+			<th scope="row">{$lang->member_group}</th>
+			<td class="text">{implode(', ', $memberInfo['group_list'])}</td>
+		</tr>
+		<tr cond="$memberInfo['description']">
+			<th scope="row"><div>{$lang->description}</div></th>
+			<td>{$memberInfo['description']}&nbsp;</td>
+		</tr>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn medium"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl)}">{$lang->cmd_modify}...</a></span>
+</div>
diff --git a/modules/member/tpl/member_info_mobile.html b/modules/member/tpl/member_info_mobile.html
index ad650232c..6d0e08bb6 100644
--- a/modules/member/tpl/member_info_mobile.html
+++ b/modules/member/tpl/member_info_mobile.html
@@ -1,15 +1,15 @@
-{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
+{@ Context::loadFile(array("./common/js/jquery.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/js_app.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/common.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_handler.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_js_filter.js", 'head', '', -100000), true) }
 
 
-<!--%import("css/msignup.css")-->
+<load target="css/msignup.css" usecdn="true" />
 <div class="bd">
 	<h2 class="h2">{$lang->cmd_view_member_info}</h2>
     <h3 class="h3">{$lang->member_default_info}</h3>
-	<form>
+	<form action="" method="post">
 	<fieldset class="sn">
 		<ul>
 			<li><label for="uname" class="db fb al">{$lang->user_name}</label><div id="uname">{htmlspecialchars($member_info->user_name)}</div></li>
@@ -29,7 +29,7 @@
 			<!--@if($member_info->signature)-->
 			<li><label for="sign" class="db fb al">{$lang->signature}</label><div>{$member_info->signature}</div></li>
 			<!--@end-->
-			<li><label for="group" class="db fb al">{$lang->group}</label><div><!--@foreach($member_info->group_list as $key => $val)-->{$val} <!--@end--></div></li>
+			<li><label for="group" class="db fb al">{$lang->member_group}</label><div><!--@foreach($member_info->group_list as $key => $val)-->{$val} <!--@end--></div></li>
 			<li><label for="sdate" class="db fb al">{$lang->signup_date}</label><div id="sdate">{zdate($member_info->regdate,"Y-m-d H:i")}</div></li>
 			<!--@if($member_info->member_srl == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
 			<li><label for="llogin" class="db fb al">{$lang->last_login}</label><div>{zdate($member_info->last_login,"Y-m-d H:i")}</div></li>
@@ -52,11 +52,11 @@
 			    <li><label class="db fb al">{htmlspecialchars($val->column_title)}</label>
 				<!--@if($val->is_private)-->
 					<span class="privateItem">{$lang->private}</span>
-				<!--@else--> 
+				<!--@else-->
 				<!--@if($val->column_type=='tel' && $val->value[0] && $val->value[1] && $val->value[2])-->
-					{htmlspecialchars($val->value[0])} 
+					{htmlspecialchars($val->value[0])}
 					<!--@if($val->value[1])-->-<!--@end-->
-					{htmlspecialchars($val->value[1])} 
+					{htmlspecialchars($val->value[1])}
 					<!--@if($val->value[2])-->-<!--@end-->
 					{htmlspecialchars($val->value[2])}
 				<!--@elseif($val->column_type=='kr_zip')-->
@@ -69,7 +69,7 @@
 					{nl2br(htmlspecialchars($val->value))}&nbsp;
 				<!--@end-->
 				</li>
-			<!--@end--> 
+			<!--@end-->
     <!--@end-->
 		</ul>
 	</fieldset>
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index abbec5969..6b2949bf4 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -1,132 +1,202 @@
-<!-- 설명 -->
-<!--#include("header.html")-->
-<!--%import("css/member_list.css")-->
-
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-
-    <fieldset>
-
-        <select name="is_admin">
-            <option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-            <option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
-        </select>
-        <select name="is_denied">
-            <option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-            <option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
-        </select>
-        <select name="selected_group_srl">
-            <option value="0">{$lang->group}</option>
-            <!--@foreach($group_list as $key => $val)-->
-            <option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-        </select>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
-
-<!-- 목록 -->
-<form method="get" action="./" id="member_fo">
-    <table cellspacing="0" class="rowTable">
-    <caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-    <thead>
-        <tr>
-            <th scope="col"><div><a href="{getUrl('sort_index','','sort_order',$sort_index!='last_login'&&$sort_order=='desc'?'asc':'')}">{$lang->no}</a></div></th>
-            <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;"/></div></th>
-            <th scope="col" class="quarter_wide"><div>{$lang->user_id}</div></th>
-            <th scope="col" class="quarter_wide"><div>{$lang->user_name}</div></th>
-            <th scope="col" class="quarter_wide"><div>{$lang->nick_name}</div></th>
-            <th scope="col" class="quarter_wide"><div><a href="{getUrl('sort_index','','sort_order',$sort_index!='last_login'&&$sort_order=='desc'?'asc':'')}">{$lang->signup_date}</a></div></th>
-            <th scope="col"><div><a href="{getUrl('sort_index','last_login','sort_order',$sort_index=='last_login'&&$sort_order=='desc'?'asc':'')}">{$lang->last_login}</a></div></th>
-            <th scope="col" colspan="2"><div>&nbsp;</div></th>
-        </tr>
-    </thead>
-    <tbody>
-        <!--@foreach($member_list as $no => $val)-->
-        {@ $val->group_list = implode(', ', $val->group_list)}
-        <tr class="row{$cycle_idx}">
-            <td rowspan="2">{$no}</td>
-            <td rowspan="2"><input type="checkbox" name="cart" value="{$val->member_srl}"/></td>
-            <td><a href="{getUrl('act','dispMemberAdminInfo','member_srl',$val->member_srl)}">{$val->user_id}</a></td>
-            <td>{$val->user_name}</td>
-            <td><span class="member_{$val->member_srl}">{$val->nick_name}</span></td>
-            <td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
-            <td>{zdate($val->last_login,"Y-m-d H:i:s")}</td>
-            <td class="nowrap">
-                <!--@if($val->homepage)--><a href="{htmlspecialchars($val->homepage)}" class="homepage" onclick="window.open(this.href);return false;"><img src="./images/icon_homepage.gif" title="{$lang->homepage}" alt="{$lang->homepage}" /></a> <!--@end-->
-                <!--@if($val->blog)--><a href="{htmlspecialchars($val->blog)}" class="blog" onclick="window.open(this.href);return false;"><img src="./images/icon_blog.gif" title="{$lang->blog}" alt="{$lang->blog}" /></a> <!--@end-->&nbsp;
-            </td>
-            <td><!--@if($val->is_admin != 'Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a><!--@else--><img src="./images/icon_management.gif" title="{$lang->is_admin}" alt="{$lang->is_admin}" /><!--@end--></td>
-        </tr>
-        <tr>
-            <td colspan="8"><p>{$val->group_list}&nbsp;</p></td>
-        </tr>
-        <!--@end-->
-    </tbody>
-    </table>
-
-    <!-- 버튼 -->
-    <div class="clear">
-        <div class="fl">
-            <a href="#" onclick="doManageMemberGroup(); return false;" class="button blue"><span>{$lang->cmd_member_group}</span></a>
-            <a href="#" onclick="doDeleteMembers(); return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
-        </div>
-        <div class="fr">
-            <a href="{getUrl('act','dispMemberAdminInsert','member_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-        </div>
-    </div>
-
-    <!-- 페이지 네비게이션 -->
-    <div class="pagination a1">
-        <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-        <!--@while($page_no = $page_navigation->getNextPage())-->
-            <!--@if($page == $page_no)-->
-                <strong>{$page_no}</strong> 
-            <!--@else-->
-                <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-            <!--@end-->
-        <!--@end-->
-        <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-    </div>
-</form>
-
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-
-    <fieldset>
-
-        <select name="is_admin">
-            <option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-            <option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
-        </select>
-        <select name="is_denied">
-            <option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-            <option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
-        </select>
-        <select name="selected_group_srl">
-            <option value="0">{$lang->group}</option>
-            <!--@foreach($group_list as $key => $val)-->
-            <option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-        </select>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
+<load target="js/member_admin_list.js" type="body" usecdn="true" />
+<script type="text/javascript">
+	xe.lang.msg_select_user = '{$lang->msg_select_user}';
+	xe.lang.msg_delete_user = '{$lang->msg_delete_user}';
+</script>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="" class="form" method="post">
+	<h1 class="h1">{$lang->user_list}</h1>
+	<div class="table even">
+		<div class="cnb">
+			<a href="{getUrl('filter_type', '', 'page', '')}" class="active"|cond="$filter_type==''">{$lang->cmd_show_all_member}</a>
+			|
+			<a href="{getUrl('filter_type', 'super_admin', 'page', '')}" class="active"|cond="$filter_type==super_admin">{$lang->cmd_show_super_admin_member}</a>
+			|
+			<a href="{getUrl('filter_type', 'enable', 'page', '')}" class="active"|cond="$filter_type==enable">{$lang->approval}</a>
+			|
+			<a href="{getUrl('filter_type', 'disable', 'page', '')}" class="active"|cond="$filter_type==disable">{$lang->denied}</a>
+		</div>
+		<table width="100%" border="1" cellspacing="0" class="_memberList">
+			<caption>
+				{$filter_type_title}({$total_count})
+				<span class="side">
+					<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert')}">{$lang->cmd_make}</a></span>
+					<span class="btn"><a href="#listManager" class="modalAnchor _member">{$lang->cmd_selected_user_manage}...</a></span>
+				</span>
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col">{$lang->email}</th>
+					<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
+					<th scope="col">{$lang->signup_date}</th>
+					<th scope="col">{$lang->last_login}</th>
+					<th scope="col" class="text">{$lang->member_group}</th>
+					<th scope="col">{$lang->status}</th>
+					<th scope="col">{$lang->cmd_view}</th>
+					<th scope="col">{$lang->cmd_modify}</th>
+					<th scope="col">
+						<input type="checkbox" title="Check All" data-name="user" />
+					</th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<th scope="col">{$lang->email}</th>
+					<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
+					<th scope="col">{$lang->signup_date}</th>
+					<th scope="col">{$lang->last_login}</th>
+					<th scope="col" class="text">{$lang->member_group}</th>
+					<th scope="col">{$lang->status}</th>
+					<th scope="col">{$lang->cmd_view}</th>
+					<th scope="col">{$lang->cmd_modify}</th>
+					<th scope="col">
+						<input type="checkbox" title="Check All" data-name="user" />
+					</th>
+				</tr>
+			</tfoot>
+			<tbody>
+				<tr loop="$member_list=>$no,$member_info">
+{@$member_info = get_object_vars($member_info)}
+					<td>
+						<a href="#popup_menu_area" class="cMenu member_{$member_info['member_srl']}">Info</a>
+						<span class="masked">{getEncodeEmailAddress($member_info['email_address'])}</span>
+					</td>
+					{@ $member_info['group_list'] = implode(', ', $member_info['group_list'])}
+					<td loop="$usedIdentifiers=>$name,$title">{$member_info[$name]}</td>
+					<td>{zdate($member_info['regdate'], 'Y-m-d')}</td>
+					<td>{zdate($member_info['last_login'], 'Y-m-d')}</td>
+					<td class="text">{$member_info['group_list']}&nbsp;</td>
+					{@ $lang_denied = ($member_info['denied'] == 'N')?$lang->approval:$lang->denied}
+					<td>{$lang_denied}</td>
+					<td>
+						<a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'member_srl', $member_info['member_srl'])}">{$lang->cmd_view}</a>
+					</td>
+					<td><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_info['member_srl'])}">{$lang->cmd_modify}</a></td>
+					{@$used_values = ''}
+					<!--@foreach($usedIdentifiers as $name=>$title)-->
+						{@$used_values .= "\t".$member_info[$name]}
+					<!--@end-->
+					<td><input type="checkbox" name="user" value="{$member_info['member_srl']."\t".$member_info['email_address'].$used_values."\t".$member_info['group_list']."\t".$lang_denied}" disabled="disabled"|cond="$member_info['is_admin'] == 'Y'"/></td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="side">
+			<span class="btn"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert')}">{$lang->cmd_make}</a></span>
+			<span class="btn"><a href="#listManager" class="modalAnchor _member">{$lang->cmd_selected_user_manage}...</a></span>
+		</span>
+	</div>
+</form>
+<div class="modal" id="listManager">
+	<form action="./" ruleset="updateSeletecdMemberInfo" class="fg form" method="post">
+	<input type="hidden" name="module" value="member" />
+	<input type="hidden" name="act" value="procMemberAdminSelectedMemberManage" />
+	<input type="hidden" name="success_return_url" value="{getUrl('act', $act)}" />
+		<h2 class="h2">{$lang->cmd_selected_user_manage}</h2>
+		<div class="table even">
+			<table width="100%" border="1" cellspacing="0">
+				<thead>
+					<tr>
+						<th scope="col">{$lang->email_address}</th>
+						<th scope="col" loop="$usedIdentifiers=>$name,$title">{$title}</th>
+						<th scope="col" class="text">{$lang->member_group}</th>
+						<th scope="col">{$lang->status}</th>
+					</tr>
+				</thead>
+				<tbody id="popupBody">
+				</tbody>
+			</table>
+		</div>
+		<p class="q">{$lang->status}</p>
+		<p>
+			<input type="radio" name="denied" id="approval" value="N" > <label for="approval">{$lang->approval}</label>
+			<input type="radio" name="denied" id="deny" value="Y" > <label for="deny">{$lang->denied}</label>
+		</p>
+		<p class="q">{$lang->member_group}</p>
+		<p>
+			<!--@foreach($group_list as $key=>$val)-->
+			<input type="checkbox" name="groups[]" id="g{$val->group_srl}" value="{$val->group_srl}"/> <label for="g{$val->group_srl}">{$val->title}</label>
+			<!--@end-->
+		</p>
+		<p class="q"><label for="message">{$lang->about_send_message}</label></p>
+		<p>
+			<textarea cols="42" rows="3" id="message" style="width:98%" name="message" ></textarea>
+		</p>
+		<div class="btnArea">
+			<span class="btn"><button type="submit" name="type" value="modify">{$lang->cmd_modify}</button></span>
+			<span class="btn"><button type="submit" name="type" value="delete">{$lang->cmd_delete}</button></span>
+		</div>
+	</form>
+</div>
+<div class="search">
+	<form action="" class="pagination" method="post">
+		<input type="hidden" name="error_return_url" value="" />
+		<input type="hidden" name="module" value="{$module}" />
+		<input type="hidden" name="act" value="{$act}" />
+		<input cond="$order_target" type="hidden" name="order_target" value="{$order_target}" />
+		<input cond="$order_type" type="hidden" name="order_type" value="{$order_type}" />
+		<input cond="$category_srl" type="hidden" name="category_srl" value="{$category_srl}" />
+		<input cond="$childrenList" type="hidden" name="childrenList" value="{$childrenList}" />
+		<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+
+		<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+
+		<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+			{@$isGoTo = true}
+			<a href="{getUrl('page', '')}">1</a>
+			<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		</block>
+
+		<!--@while($page_no = $page_navigation->getNextPage())-->
+			{@$last_page = $page_no}
+			<strong cond="$page_no == $page">{$page_no}</strong>
+			<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+		<!--@end-->
+
+		<block cond="$last_page != $page_navigation->last_page">
+			{@$isGoTo = true}
+			<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+		</block>
+
+		<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+
+		<span cond="$isGoTo" id="goTo" class="tgContent">
+			<input name="page" title="{$lang->cmd_go_to_page}" />
+			<button type="submit">Go</button>
+		</span>
+	</form>
+	<form action="" method="post">
+		<input type="hidden" name="module" value="{$module}" />
+		<select name="search_target">
+			<option value="">{$lang->search_target}</option>
+			{@$lang->search_target_list = array_merge($lang->search_target_list, $usedIdentifiers)}
+			<option value="{$key}" loop="$lang->search_target_list=>$key,$val" selected="selected"|cond="$search_target==$key">{$val}</option>
+		</select>
+		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+		<input type="submit" value="{$lang->cmd_search}" />
+		<a href="{getUrl('search_target', '', 'search_keyword', '')}">{$lang->cmd_cancel}</a>
+	</form>
+</div>
+<script type="text/javascript">
+jQuery(function($){
+	var clickedBTN = '';
+
+	$('.btnArea button').click(function(){
+		clickedBTN = $(this).val();
+	});
+
+	var CheckConfirm = xe.createPlugin('checkConfirm', {
+		API_BEFORE_VALIDATE : function(sender, params){
+			if (clickedBTN == 'delete') return confirm(xe.lang.msg_delete_user);
+		}
+	});
+
+	var checkConfirm = new CheckConfirm();
+	var v = xe.getApp('Validator')[0];
+	v.registerPlugin(checkConfirm);
+});
+</script>
diff --git a/modules/member/tpl/modify_info_mobile.html b/modules/member/tpl/modify_info_mobile.html
index 2e0893dd5..a0871382e 100644
--- a/modules/member/tpl/modify_info_mobile.html
+++ b/modules/member/tpl/modify_info_mobile.html
@@ -1,14 +1,14 @@
-{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
+{@ Context::loadFile(array("./common/js/jquery.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/js_app.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/common.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_handler.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_js_filter.js", 'head', '', -100000), true) }
 
-<!--%import("css/msignup.css")-->
-<!--%import("js/signup_check.js")-->
-<!--%import("js/krzip_search.js")-->
+<load target="css/msignup.css" usecdn="true" />
+<load target="js/signup_check.js" usecdn="true" />
+<load target="js/krzip_search.js" usecdn="true" />
 <!--%import("../skins/default/filter/modify_info.xml")-->
-<!--%import("../skins/default/js/member.js")-->
+<load target="../skins/default/js/member.js" usecdn="true" />
 
 <!--@if($member_config->profile_image == 'Y')-->
     <!--%import("../skins/default/filter/delete_profile_image.xml")-->
@@ -47,7 +47,7 @@
 				<!--@if($member_info->profile_image->src)-->
 				<div id="p_image">
 					<img src="{$member_info->profile_image->src}" border="0" alt="profile_image" />
-					<a href="#" onclick="doDeleteProfileImage({$member_info->member_srl});return false;" class="bn"><span>{$lang->cmd_delete}</span></a>
+					<button type="button" onclick="doDeleteProfileImage({$member_info->member_srl});">{$lang->cmd_delete}</button>
 				</div>
 				<!--@end-->
 				<div id="p_image">
@@ -62,7 +62,7 @@
 				<!--@if($member_info->image_name->src)-->
 				<div id="p_image">
 					<div><img src="{$member_info->image_name->src}" border="0" alt="image_name" /></div>
-					<a href="#" onclick="doDeleteImageName({$member_info->member_srl});return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+					<button type="button" onclick="doDeleteImageName({$member_info->member_srl});">{$lang->cmd_delete}</button>
 				</div>
 				<!--@end-->
 				<div id="p_image">
@@ -77,7 +77,7 @@
 				<!--@if($member_info->image_mark->src)-->
 				<div id="image_mark">
 					<img src="{$member_info->image_mark->src}" border="0" alt="image_mark" />
-					<a href="#" onclick="doDeleteImageMark({$member_info->member_srl});return false;" class="bn"><span>{$lang->cmd_delete}</span></a>
+					<button type="button" onclick="doDeleteImageMark({$member_info->member_srl});return false;">{$lang->cmd_delete}</button>
 				</div>
 				<!--@end-->
 
@@ -134,7 +134,7 @@
 							<input type="radio" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/><label for="{$v}">{$v}</label>
 						<!--@end-->
 					<!--@end-->
-				
+
 				<!--// 단일 선택 -->
 				<!--@elseif($val->column_type == 'select')-->
 					<select name="{$val->column_name}">
@@ -153,7 +153,7 @@
 							<a href="#" onclick="doHideKrZipList('{$val->column_name}'); return false;" class="bn"><span>{$lang->cmd_cancel}</span></a>
 						</div>
 						<div id="zone_address_list_{$val->column_name}" style="display:none">
-							<select name="_tmp_address_list_{$val->column_name}" class="w300"></select>
+							<select name="_tmp_address_list_{$val->column_name}"></select>
 							<a href="#" onclick="doSelectKrZip('{$val->column_name}'); return false;" class="bn"><span>{$lang->cmd_select}</span></a>
 							<a href="#" onclick="doHideKrZipList('{$val->column_name}'); return false;" class="bn"><span>{$lang->cmd_cancel}</span></a>
 						</div>
diff --git a/modules/member/tpl/modify_password.html b/modules/member/tpl/modify_password.html
index 03e30f74e..d34087fa3 100644
--- a/modules/member/tpl/modify_password.html
+++ b/modules/member/tpl/modify_password.html
@@ -1,12 +1,12 @@
-{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
+{@ Context::loadFile(array("./common/js/jquery.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/js_app.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/common.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_handler.js", 'head', '', -100000), true) }
+{@ Context::loadFile(array("./common/js/xml_js_filter.js", 'head', '', -100000), true) }
 
-<!--%import("css/msignup.css")-->
+<load target="css/msignup.css" usecdn="true" />
 <!--%import("../skins/default/filter/modify_password.xml")-->
-<!--%import("../skins/default/js/member.js")-->
+<load target="../skins/default/js/member.js" usecdn="true" />
 <div class="bd">
     <h2 class="h2">{$member_title = $lang->cmd_modify_member_password}</h2>
     <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, modify_password)">
@@ -25,6 +25,6 @@
 	<div class="cm">
 	   <input type="submit" value="{$lang->cmd_registration}" accesskey="s" class="bn"/><a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="bn"><span>{$lang->cmd_back}</span></a>
 	</div>
-	
+
 	</form>
 </div>
\ No newline at end of file
diff --git a/modules/member/tpl/signup_form.html b/modules/member/tpl/signup_form.html
index c604533a6..d682c36c8 100644
--- a/modules/member/tpl/signup_form.html
+++ b/modules/member/tpl/signup_form.html
@@ -1,117 +1,75 @@
-{@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
-{@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
-
-<!--%import("css/msignup.css")-->
-<!--%import("js/signup_check.js")-->
-<!--%import("../skins/default/filter/signup.xml")-->
-<!--%import("../skins/default/js/member.js")-->
+<load target="css/msignup.css" usecdn="true" />
+<load target="js/signup_check.js" usecdn="true" />
+<!--%load_js_plugin("ui")-->
+<!--%load_js_plugin("ui.datepicker")-->
 <div class="bd">
 	<div class="hx h2">
 		<h2>{$lang->cmd_signup}</h2>
 	</div>
-	<div class="hx h3">
-		<h3>{$lang->member_default_info}</h3>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
 	</div>
-	<form id="fo_insert_member" action="./" method="get" class="ff" onsubmit="return procFilter(this, signup)">
-	<fieldset>
+    <form ruleset="@insertMember" id="fo_insert_member" class="ff" action="./" method="post" enctype="multipart/form-data">
+		<input type="hidden" name="module" value="member" />
+		<input type="hidden" name="act" value="procMemberInsert" />
+		<!--@if(!$is_logged && $member_config->agreement)-->
+		<div class="agreement">
+			<div class="text">
+				{$member_config->agreement}
+			</div>
+			<div class="confirm">
+				<input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
+				<label for="accept_agree">{$lang->about_accept_agreement}</label>
+			</div>
+		</div>
+		<!--@end-->
 		<ul>
-			<li><label for="id">{$lang->user_id}</label><input name="user_id" type="text" id="id" value="" /><p>{$lang->about_user_id}</p></li>
-			<li><label for="pw">{$lang->password}</label><input name="password1" type="password" id="pw" value="" /><p>{$lang->about_password}</p></li>
-			<li><label for="pw2">{$lang->password2}</label><input name="password2" type="password" id="pw2" value="" /></li>
-			<li><label for="uname">{$lang->user_name}</label><input name="user_name" type="text" id="uname" value="" /><p>{$lang->about_user_name}</p></li>
-			<li><label for="nname">{$lang->nick_name}</label><input name="nick_name" type="text" id="nname" value="" /><p>{$lang->about_nick_name}</p></li>
-			<li><label for="email">{$lang->email_address}</label><input name="email_address" type="text" id="email" value="" /><p>{$lang->about_email_address}</p></li>
-			<li><label for="hpage">{$lang->homepage}</label><input name="homepage" type="text" id="hpage" value="" /><p>{$lang->about_homepage}</p></li>
-			<li><label for="bpage">{$lang->blog}</label><input name="blog" type="text" id="bpage" value="" /><p>{$lang->about_blog_url}</p></li>
-			<li><label for="bday">{$lang->birthday}</label><input name="birthday" type="text" id="bday" value="" /><p>{$lang->about_birthday}</p></li>
+			<li> 
+				<label for="{$identifierForm->name}">{$identifierForm->title} <em style="color:red">*</em></label>
+				<input type="text" name="{$identifierForm->name}" id="{$identifierForm->name}" value="{$identifierForm->value}" />
+			</li>
+			<li> 
+				<label for="password">{$lang->password} <em style="color:red">*</em></label>
+				<input type="password" name="password" id="password" value=""/>
+			</li>
+			<li> 
+				<label for="password2">{$lang->password2} <em style="color:red">*</em></label>
+				<input type="password" name="password2" id="password2" value=""/>
+			</li>
+			<li loop="$formTags=>$formTag"> 
+				<label>{$formTag->title}</label>
+				<block cond="$formTag->name != 'signature'">{$formTag->inputTag}</block>
+				<block cond="$formTag->name =='signature'">{$editor}</block>
+			</li>
+			<li> 
+				<label>{$lang->allow_mailing}</label>
+				<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
+				<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
+			</li>
+			<li> 
+				<label>{$lang->allow_message}</label>
+				<block loop="$lang->allow_message_type=>$key,$val">
+					<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+				</block>
+			</li>
 		</ul>
-	</fieldset>
-	<!--@if($extend_form_list)-->
-	<div class="hx h3">
-		<h3>{$lang->member_extend_info}</h3>
-	</div>
-	<fieldset>
-		<ul>
-			<!--@foreach($extend_form_list as $key => $val)--><!--@if($val->is_active=='Y')-->
-				<li><label>{htmlspecialchars($val->column_title)}</label>
-				<!--// 일반 text -->
-				<!--@if($val->column_type == 'text')-->
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" />
-				<!--// 홈페이지 주소 -->
-				<!--@elseif($val->column_type == 'homepage')-->
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" />
-				<!--// Email 주소 -->
-				<!--@elseif($val->column_type == 'email_address')-->
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" />
-				<!--// 전화번호 -->
-				<!--@elseif($val->column_type == 'tel')-->
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[0])}" size="4"/>
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[1])}" size="4"/>
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value[2])}" size="4"/>
-				<!--// textarea -->
-				<!--@elseif($val->column_type == 'textarea')-->
-					<textarea name="{$val->column_name}">{htmlspecialchars($val->value)}</textarea>
-				<!--// 다중 선택 -->
-				<!--@elseif($val->column_type == 'checkbox')-->
-					<!--@if($val->default_value)-->
-						<!--@foreach($val->default_value as $v)-->
-							<input type="checkbox" id="{$v}" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/><label for="{$v}">{$v}</label>
-						<!--@end-->
-					<!--@end-->
-				<!--@elseif($val->column_type == 'radio')-->
-					<!--@if($val->default_value)-->
-					   <!--@foreach($val->default_value as $v)-->
-							<input type="radio" name="{$val->column_name}" value="{$v}" <!--@if(is_array($val->value)&&in_array($v, $val->value))-->checked="checked"<!--@end-->/><label for="{$v}">{$v}</label>
-						<!--@end-->
-					<!--@end-->
-				
-				<!--// 단일 선택 -->
-				<!--@elseif($val->column_type == 'select')-->
-					<select name="{$val->column_name}">
-					<!--@if($val->default_value)-->
-						<!--@foreach($val->default_value as $v)-->
-							<option value="{$v}" <!--@if($v == $val->value)-->selected="selected"<!--@end-->>{$v}</option>
-						<!--@end-->
-					<!--@end-->
-					</select>
-
-				<!--// 한국 주소 검색 -->
-				<!--@elseif($val->column_type == 'kr_zip')-->
-					<div class="krZip">
-						<div id="zone_address_search_{$val->column_name}" style="display:<!--@if($val->value[0])-->none<!--@else-->block<!--@end-->;">
-							<input type="text" id="krzip_address1_{$val->column_name}" value="{$lang->msg_kr_address}" onfocus="this.value=''" />
-							<button type="button" class="bn">{$lang->cmd_search}</button>
-						</div>
-						<div id="zone_address_list_{$val->column_name}" style="display:none">
-							<select name="{$val->column_name}" id="address_list_{$val->column_name}" class="w300"></select>
-							<button type="button" class="bn">{$lang->cmd_search_again}</button>
-						</div>
-						<div class="address2">
-							<input type="text" name="{$val->column_name}" id="krzip_address2_{$val->column_name}" value="{$lang->msg_kr_address_etc}" onfocus="this.value=''" />
-						</div>
-					</div>
-					<load target="js/krzip_search.js" type="body" />
-					<script type="text/javascript">jQuery(function($){ $.krzip('{$val->column_name}') });</script>
-				<!--// 일본 주소 검색 -->
-				<!--@elseif($val->column_type == 'jp_zip')-->
-					<input type="text" name="{$val->column_name}" value="{htmlspecialchars($val->value)}" />
-				<!--// 날짜 입력 -->
-				<!--@elseif($val->column_type == 'date')-->
-					<input type="hidden" name="{$val->column_name}" id="date_{$val->column_name}" value="{$val->value}" />
-					<input type="text" class="inputDate inputTypeText" value="" />
-				<!--@end-->
-				<p>{$val->description}</p>
-				<!--// 공개 필드 css확인 필요 -->
-				<!--input type="checkbox" class="checkbox" name="open_{$val->column_name}" value="Y" id="open_{$val->column_name}" /><label for="open_{$val->column_name}">{$lang->public}</label--></li>
-		<!--@end--><!--@end-->
-		</ul>
-	</fieldset>
-	<!--@end-->
 	<div class="bna">
 		<input type="submit" class="bn dark" value="{$lang->cmd_registration}" accesskey="s" />
 	</div>
 	</form>
 </div>
+	<script type="text/javascript">
+	(function($){
+		$(function(){
+			var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
+	
+				$(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
+			};
+			$.extend(option,$.datepicker.regional['{$lang_type}']);
+			$(".inputDate").datepicker(option);
+			$(".dateRemover").click(function() {
+				$(this).parent().prevAll('input').val('');
+				return false;});
+		});
+	})(jQuery);
+	</script>
diff --git a/modules/menu/conf/info.xml b/modules/menu/conf/info.xml
index 2405dd08e..c4e249f86 100644
--- a/modules/menu/conf/info.xml
+++ b/modules/menu/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">메뉴</title>
-    <title xml:lang="zh-CN">菜单管理</title>
-    <title xml:lang="jp">メニュー</title>
-    <title xml:lang="en">Menu</title>
-    <title xml:lang="vi">Menu</title>
-    <title xml:lang="es">Menú</title>
-    <title xml:lang="ru">Меню</title>
-    <title xml:lang="zh-TW">選單</title>
-    <title xml:lang="tr">Menü</title>
-    <description xml:lang="ko">레이아웃, 모듈을 연결하는 메뉴를 생성/관리하는 모듈입니다.</description>
-    <description xml:lang="zh-CN">此模块将生成并管理连接布局，模块的菜单。</description>
-    <description xml:lang="jp">レイアウト、モジュールを連動させるメニューを作成・管理するモジュールです。</description>
-    <description xml:lang="en">This module is for creating/managering menues that linking layouts or modules.</description>
-    <description xml:lang="vi">Module này dành cho việc tạo và quản lý Menu sẽ liên kết với giao diện hoặc Mudule.</description>
-    <description xml:lang="es">Este módulo es para crear/manejar los menús que que son conectados con los diseños o módulos.</description>
-    <description xml:lang="ru">Этот модуль служит для создания/управления меню, соединяюще лейауты и модули.</description>
-    <description xml:lang="zh-TW">可建立並管理連結版面和模組的選單。</description>
-    <description xml:lang="tr">Bu modül, yerleşim düzenlerine ya da modüllere bağlı menüleri oluşturmak/yönetmek içindir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>construction</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">메뉴</title>
+    <title xml:lang="zh-CN">菜单管理</title>
+    <title xml:lang="jp">メニュー</title>
+    <title xml:lang="en">Menu</title>
+    <title xml:lang="vi">Menu</title>
+    <title xml:lang="es">Menú</title>
+    <title xml:lang="ru">Меню</title>
+    <title xml:lang="zh-TW">選單</title>
+    <title xml:lang="tr">Menü</title>
+    <description xml:lang="ko">레이아웃, 모듈을 연결하는 메뉴를 생성/관리하는 모듈입니다.</description>
+    <description xml:lang="zh-CN">此模块将生成并管理连接布局，模块的菜单。</description>
+    <description xml:lang="jp">レイアウト、モジュールを連動させるメニューを作成・管理するモジュールです。</description>
+    <description xml:lang="en">This module is for creating/managing menus which link to layouts or modules.</description>
+    <description xml:lang="vi">Module này dành cho việc tạo và quản lý Menu sẽ liên kết với giao diện hoặc Mudule.</description>
+    <description xml:lang="es">Este módulo es para crear/manejar los menús que que son conectados con los diseños o módulos.</description>
+    <description xml:lang="ru">Этот модуль служит для создания/управления меню, соединяюще лейауты и модули.</description>
+    <description xml:lang="zh-TW">可建立並管理連結版面和模組的選單。</description>
+    <description xml:lang="tr">Bu modül, yerleşim düzenlerine ya da modüllere bağlı menüleri oluşturmak/yönetmek içindir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>construction</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/menu/conf/module.xml b/modules/menu/conf/module.xml
index f9311eb0f..217cb4cf9 100644
--- a/modules/menu/conf/module.xml
+++ b/modules/menu/conf/module.xml
@@ -3,24 +3,44 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispMenuAdminContent" type="view" admin_index="true" standalone="true" />
+        <action name="dispMenuAdminContent" type="view" standalone="true" />
         <action name="dispMenuAdminInsert" type="view" standalone="true" />
         <action name="dispMenuAdminManagement" type="view" standalone="true" />
         <action name="dispMenuAdminMidList" type="view" standalone="true" />
+        <action name="dispMenuAdminSiteMap" type="view" standalone="true" admin_index="true" menu_name="siteMap" menu_index="true" />
 
         <action name="getMenuAdminTplInfo" type="model" standalone="true" />
+        <action name="getMenuAdminItemInfo" type="model" standalone="true" />
 
-        <action name="procMenuAdminInsert" type="controller" standalone="true" />
-        <action name="procMenuAdminUpdate" type="controller" standalone="true" />
+        <action name="procMenuAdminInsert" type="controller" standalone="true" ruleset="insertMenu" />
+        <action name="procMenuAdminUpdate" type="controller" standalone="true" ruleset="updateMenuTitle" />
         <action name="procMenuAdminDelete" type="controller" standalone="true" />
-        <action name="procMenuAdminInsertItem" type="controller" standalone="true" />
+        <action name="procMenuAdminInsertItem" type="controller" standalone="true" ruleset="insertMenuItem" />
+        <action name="procMenuAdminInsertItemForAdminMenu" type="controller" standalone="true" />
         <action name="procMenuAdminDeleteItem" type="controller" standalone="true" />
         <action name="procMenuAdminMakeXmlFile" type="controller" standalone="true" />
         <action name="procMenuAdminMoveItem" type="controller" standalone="true" />
+        <action name="procMenuAdminArrangeItem" type="controller" standalone="true" />
 
         <action name="procMenuAdminUploadButton" type="controller" standalone="true" />
         <action name="procMenuAdminDeleteButton" type="controller" standalone="true" />
+        <action name="procMenuAdminAllActList" type="controller" standalone="true" />
 
 		<action name="dispMenuMenu" type="mobile" standalone="true" />
     </actions>
+	<menus>
+		<menu name="siteMap">
+			<title xml:lang="en">Site Map</title>
+			<title xml:lang="ko">사이트맵</title>
+			<title xml:lang="zh-CN">Site Map</title>
+			<title xml:lang="jp">Site Map</title>
+			<title xml:lang="es">Site Map</title>
+			<title xml:lang="ru">Site Map</title>
+			<title xml:lang="fr">Site Map</title>
+			<title xml:lang="zh-TW">Site Map</title>
+			<title xml:lang="vi">Site Map</title>
+			<title xml:lang="mn">Site Map</title>
+			<title xml:lang="tr">Site Map</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/menu/lang/en.lang.php b/modules/menu/lang/en.lang.php
deleted file mode 100644
index bf6bdb815..000000000
--- a/modules/menu/lang/en.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Menu module's basic language pack
-     **/
-
-    $lang->cmd_menu_insert = 'Create Menu';
-    $lang->cmd_menu_management = 'Menu Management';
-
-    $lang->menu = 'Menu'; 
-    $lang->menu_count = 'No. of menu';
-    $lang->menu_management = 'Menu Management';
-    $lang->depth = 'Step';
-    $lang->parent_menu_name = 'Parent Menu Name';
-    $lang->menu_name = 'Menu Name';
-    $lang->menu_srl = 'Menu Serial Number';
-    $lang->menu_id = 'Menu ID';
-    $lang->menu_url = 'Menu URL';
-    $lang->menu_open_window = 'Open a new window';
-    $lang->menu_expand = 'Expand';
-    $lang->menu_img_btn = 'Image button';
-    $lang->menu_normal_btn = 'Normal';
-    $lang->menu_hover_btn = 'Mouse over';
-    $lang->menu_active_btn = 'When selected';
-    $lang->menu_group_srls = 'Accessable Groups';
-    $lang->layout_maker = "Layout Maker";
-    $lang->layout_history = "Update History ";
-    $lang->layout_info = "Layout Info";
-    $lang->layout_list = 'Layouts List';
-    $lang->downloaded_list = 'Downloads List';
-    $lang->limit_menu_depth = 'Display Enabled';
-
-    $lang->cmd_make_child = 'Add a Child Menu';
-    $lang->cmd_move_to_installed_list = "View Created List";
-    $lang->cmd_enable_move_menu = "Move Menu (Drag the top menu after selecting)";
-    $lang->cmd_search_mid = "Search mid";
-
-    $lang->msg_cannot_delete_for_child = 'A menu with child menus cannot be deleted.';
-
-    $lang->about_title = 'Please input the title that is easy to verify when connecting to module.';
-    $lang->about_menu_management = "Menu management enables you to consist menu in the selected layout.\nYou can create menu upto setted depth and can enter information in details by clicking the menu.\nMenu will be expanded by cliking the folder image.\nIf menu is not shown normally, refresh the information by clicking the button \"Re-create cache file\".\n* Menu created over the depth limit may not be shown properly.";
-    $lang->about_menu_name = 'The name will be shown as a menu name if it is not an admin or image button.';
-    $lang->about_menu_url = "It is the menu URL when select the menu.<br />You may enter only id value to link to other module.<br />If no contents exist, nothing will happen even though you click the menu.";
-    $lang->about_menu_open_window = 'You can assign it to open a page in a new window when the menu clicked.';
-    $lang->about_menu_expand = 'It enables the menu to remain expanded when the tree menu(tree_menu.js) is used.';
-    $lang->about_menu_img_btn = 'If you register an image button, the image button will automatically replace the text button, and it will be shown in the layout.';
-    $lang->about_menu_group_srls = 'If you select a group, only the group members can see the menu. (if xml file is directly opened, it will be shown.)';
-
-    $lang->about_menu = "Menu module will help you to create a complete site through the convenient menu management which arranges created modules and links to layouts without any manual works..\nMenu is not a site manager, but it just has information which can link to modules and layouts so you can express different types of menu.";
-
-    $lang->alert_image_only = "Only image files can be registered.";
-?>
diff --git a/modules/menu/lang/es.lang.php b/modules/menu/lang/es.lang.php
deleted file mode 100644
index bfe5cb5dc..000000000
--- a/modules/menu/lang/es.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/menu/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma español para el Menú del módulo básico
-     **/
-
-    $lang->cmd_menu_insert = 'Crear Menú';
-    $lang->cmd_menu_management = 'Comfiguración del Menú';
-
-    $lang->menu = 'Menú'; 
-    $lang->menu_count = 'Número del menú';
-    $lang->menu_management = 'Configuración del Menú';
-    $lang->depth = 'Nivel';
-    $lang->parent_menu_name = 'Nombre del Menú principal';
-    $lang->menu_name = 'Nombre del menú';
-    $lang->menu_srl = 'Número característico del menú';
-    $lang->menu_id = 'ID del menú';
-    $lang->menu_url = 'URL del Menú';
-    $lang->menu_open_window = 'Abrir en una nueva ventana';
-    $lang->menu_expand = 'Expandir';
-    $lang->menu_img_btn = 'Botón de imagen';
-    $lang->menu_normal_btn = 'Normal';
-    $lang->menu_hover_btn = 'Mouse arriba';
-    $lang->menu_active_btn = 'Al momento de seleccionar';
-    $lang->menu_group_srls = 'Grupos accesibles';
-    $lang->layout_maker = "Marcar el diseño";
-    $lang->layout_history = "Actualizar la historia";
-    $lang->layout_info = "Información del diseño";
-    $lang->layout_list = 'Lista del diseño';
-    $lang->downloaded_list = 'Lista de descarga';
-    $lang->limit_menu_depth = 'Exhibicion permitido';
-
-    $lang->cmd_make_child = 'Agregar un submenú';
-    $lang->cmd_move_to_installed_list = "Ver la lista de los creadores";
-    $lang->cmd_enable_move_menu = "Mover el menú (Mover el menú luego de seleccionar)";
-    $lang->cmd_search_mid = "Buscar mid";
-
-    $lang->msg_cannot_delete_for_child = 'No se puede eliminar un menú si posee un submenú.';
-
-    $lang->about_title = 'Ingresar el título que sea fácil de identificar al momento de conectar al módulo.';
-    $lang->about_menu_management = "Configuración del menú permite construir el menú del diseño seleccionado.\nUsted puede crear el menú hasta el nivel seleccionado y para la información más detallada debe seleccionar el menú ingresado.\nEl menú será expandido al presionar la imagen del directorio.\nSi el menú no se ve correctamente, renueva la informacion presionado el botón\"Rehacer archivo caché\".\n El menú creado sobre el nivel límite podría no verse apropiadamente.";
-    $lang->about_menu_name = 'El nombre se verá como un nombre de menú si no es un botón del administrador o botón de imagen.';
-    $lang->about_menu_url = "Este es el URL al momento de seleccionar el menú.<br />Si desea conectar a otro módulo sólo debe colocar el valor de id.<br />Si no hay contenido, no pasara nada aun cuando haya presinado el menú.";
-    $lang->about_menu_open_window = 'Usted puede asignar si desea abrir la página en una nueva ventana al momento de presionar el menú.';
-    $lang->about_menu_expand = 'Al usar el menú arbol(tree_menu.js) puede mantener el menú expandido.';
-    $lang->about_menu_img_btn = 'Si Usted registra un botón de imagen, ese botón automáticamente reemplazará el botón de texto, y se mostrará en el diseño.';
-    $lang->about_menu_group_srls = 'Si tu selecciona el grupo, sólo los usuarios del grupo pueden ver el menú. (Si el archivo xml es abierto directamente, lo mostrará.)';
-
-    $lang->about_menu = "Módulo del menú te ayudara a crear un sitio completo a través de un conveniente manejo del menú que ordena los módulos creados y conecta con el diseño sin ningún otro trabajo.\nEl menú no es un manejador del sitio, sino que permite conectar los módulos con el diseño y a través del diseño puede expresar variados estilos del menú.";
-
-    $lang->alert_image_only = "Sólo los archivos de imagen pueden ser registradas.";
-?>
diff --git a/modules/menu/lang/fr.lang.php b/modules/menu/lang/fr.lang.php
deleted file mode 100644
index e7bbdc8d4..000000000
--- a/modules/menu/lang/fr.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gamail.com>
-     * @brief Paque du langage en français pour le module de Menu
-     **/
-
-    $lang->cmd_menu_insert = 'Créer un Menu';
-    $lang->cmd_menu_management = 'Administer des Menus';
-
-    $lang->menu = 'Menu'; 
-    $lang->menu_count = 'Somme de menu';
-    $lang->menu_management = 'Administration de Menu';
-    $lang->depth = 'Niveau';
-    $lang->parent_menu_name = 'Nom de Menu supérieur';
-    $lang->menu_name = 'Nom de Menu';
-    $lang->menu_srl = 'Numéro de série de Menu';
-    $lang->menu_id = 'Nom d\'Identité de Menu';
-    $lang->menu_url = 'URL de Menu';
-    $lang->menu_open_window = 'Ouvrire une nouvelle fenêtre';
-    $lang->menu_expand = 'Étendre';
-    $lang->menu_img_btn = 'Bouton en Image';
-    $lang->menu_normal_btn = 'Normal';
-    $lang->menu_hover_btn = 'Survolé';
-    $lang->menu_active_btn = 'Choisi';
-    $lang->menu_group_srls = 'Groupes qui peuvent accéder';
-    $lang->layout_maker = "Auteur de la Mise en Page";
-    $lang->layout_history = "Histoire des Mises à Jour";
-    $lang->layout_info = "Information de la Mise en Page";
-    $lang->layout_list = 'Liste des Mises en Page';
-    $lang->downloaded_list = 'Liste de Téléchargement';
-    $lang->limit_menu_depth = 'Niveau permis d\'exposer';
-
-    $lang->cmd_make_child = 'Ajouter un menu inférieur';
-    $lang->cmd_move_to_installed_list = "Voir la liste créé";
-    $lang->cmd_enable_move_menu = "Bouger le Menu (glisser-déposer un menu après cocher)";
-    $lang->cmd_search_mid = "Rechercher mid";
-
-    $lang->msg_cannot_delete_for_child = 'Un menu qui a des menus inférieurs ne peut pas être supprimé.';
-
-    $lang->about_title = 'Entrez un titre facile à vérifier quand on le connecte à un module.';
-    $lang->about_menu_management = "Administration de Menu vous permet de composer le menu dans la Mise en Page que vous choisissez.\nVous pouvez créer le menu jusqu'au niveau permis et entrer des informations détaillées si vou cliquez le menu.\nMenu sera étendu si vous cliquez l'image de dossier.\nSi le menu n'est pas représenté normalement, rafraîchir les informations en cliquant le bouton \"Recréer \'antémémoire de fichier\".\n* Menu cré qui passe plus que le niveau permis pourra être représenté incorrectement.";
-    $lang->about_menu_name = 'Ce nom sera représenté comme le nom de menu si ce n\'est pas le bouton en image ou le bouton pour administrer.';
-    $lang->about_menu_url = "C'est le URL où l'on bouge quand on choisit le menu.<br />Vous pouvez entrer la valeur d'identité(nom d'idendité) seulement pour lier à un autre module.<br />Si nul contenu n'existe, rien n'aura lieu même si l'on clique le menu.";
-    $lang->about_menu_open_window = 'Vous pouvez faire ouvrir une page dans une nouvelle fenêtre quand le menu est cliqué.';
-    $lang->about_menu_expand = 'L\'Arbre de Menu(tree_menu.js) peut faire resté le menu étendu toujours.';
-    $lang->about_menu_img_btn = 'Si vous enrégistez un bouton en image, l\'image remplacera automatiquement le bouton en texte, et ce sera représenté dans la Mise en Page.';
-    $lang->about_menu_group_srls = 'Si vous choisissez un groupe, les membres de ce groupe seulement peuvent voir le menu. (Si l\'on ouvre un fichier xml, le fichier sera exposé.)';
-
-    $lang->about_menu = "Le Module de Menu vous aidrera à établir un site complet par l'administration confortable qui arrange les modules créés et liens à la mise en page sans aucun travaux manuels.\nMenu n'est pas un administrateur du Site, mais il a seulement l'information qui peut lier les modules à la mise en page, et on peut représenter les menu en formes diverses par la mise en page.";
-
-    $lang->alert_image_only = "Fichiers d'image seulement peuvent être enrégistrés.";
-?>
diff --git a/modules/menu/lang/jp.lang.php b/modules/menu/lang/jp.lang.php
deleted file mode 100644
index 53f64f9b8..000000000
--- a/modules/menu/lang/jp.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、liahona、ミニミ
-     * @brief  メニュー（menu）モジュールの基本言語パッケージ
-     **/
-
-    $lang->cmd_menu_insert = 'メニュー生成';
-    $lang->cmd_menu_management = 'メニュー設定';
-
-    $lang->menu = 'メニュー'; 
-    $lang->menu_count = 'メニュー数';
-    $lang->menu_management = 'メニュー管理';
-    $lang->depth = 'スレッド';
-    $lang->parent_menu_name = '上位メニュー名';
-    $lang->menu_name = 'メニュー名';
-    $lang->menu_srl = 'メニュー固有番号';
-    $lang->menu_id = 'メニュー名';
-    $lang->menu_url = 'リンクURL';
-    $lang->menu_open_window = '新しいウィンドウズで開く';
-    $lang->menu_expand = '拡張表示';
-    $lang->menu_img_btn = 'イメージボタン';
-    $lang->menu_normal_btn = '一般ボタン';
-    $lang->menu_hover_btn = 'マウスオーバー';
-    $lang->menu_active_btn = '選択時のボタン';
-    $lang->menu_group_srls = 'グループ制限';
-    $lang->layout_maker = 'レイアウト作者';
-    $lang->layout_history = '変更内容';
-    $lang->layout_info = 'レイアウト情報';
-    $lang->layout_list = 'レイアウトリスト';
-    $lang->downloaded_list = 'ダウンロードリスト';
-    $lang->limit_menu_depth = '表示スレッド';
-
-    $lang->cmd_make_child = '下位メニュー追加';
-    $lang->cmd_move_to_installed_list = '生成されたリスト表示';
-    $lang->cmd_enable_move_menu = 'メニュー移動（選択後メニューをドラッグして下さい）';
-    $lang->cmd_search_mid = 'mid 検索';
-
-    $lang->msg_cannot_delete_for_child = '下位メニューが存在するメニューは削除出来ません。';
-
-    $lang->about_title = 'モジュールをリンクする際に分かりやすいタイトルを入力して下さい。';
-    $lang->about_menu_management = "メニュー管理は、選択されたレイアウトで使用するメニューを構成出来るようにします。<br />一定レベルまでメニューの構成が出来、入力したメニューをクリックすると詳細情報が入力出来ます。<br />フォルダーのイメージをクリックするとメニューを拡張することが出来ます。<br />もしメニューが正常に表示されない場合は、 「キャッシュファイル再生成」ボタンをクリックして情報を更新して下さい。<br />* 一定レベル以上のメニューは正しく表示されない場合があります。";
-    $lang->about_menu_name = '管理及びイメージボタンではない場合、メニュー名として表示されるタイトルです。';
-    $lang->about_menu_url = 'メニュー選択時、移動するURLです。<br />他のモジュールとリンクを張る場合はＩＤの値のみ入力して下さい。<br />内容がない場合は、メニューを選択しても何の動作もありません。';
-    $lang->about_menu_open_window = 'メニュー選択時、新しいウィンドウで開くかを指定することが出来ます。';
-    $lang->about_menu_expand = 'ツリーメニュー（tree_menu.js）を利用すると常に拡張表示（すべて表示）の状態にすることが出来ます。';
-    $lang->about_menu_img_btn = 'イメージボタンを登録するとレイアウトで自動的にイメージボタンに入れ替わって表示されます。';
-    $lang->about_menu_group_srls = 'グループを選択すると該当するグループのユーザにのみメニューが表示されます（XMLファイルを直接開くと情報が表示されます）。';
-
-    $lang->about_menu = "メニューモジュールは、メニュー管理機能にて生成モジュールの整理やレイアウトとのリンクを設定し、簡単に管理者画面上でサイトを構築出来るようにします。\nメニューはサイトを管理するというより、モジュールとレイアウトをリンクし、様々なメニューを表示させる情報だけ持っています。";
-
-    $lang->alert_image_only = 'イメージ(画像)ファイルのみ登録出来ます。';
-?>
diff --git a/modules/menu/lang/ko.lang.php b/modules/menu/lang/ko.lang.php
deleted file mode 100644
index c2580e269..000000000
--- a/modules/menu/lang/ko.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  메뉴(menu) 모듈의 기본 언어팩
-     **/
-
-    $lang->cmd_menu_insert = '메뉴 생성';
-    $lang->cmd_menu_management = '메뉴 설정';
-
-    $lang->menu = '메뉴'; 
-    $lang->menu_count = '메뉴 수';
-    $lang->menu_management = '메뉴 관리';
-    $lang->depth = '단계';
-    $lang->parent_menu_name = '상위 메뉴명';
-    $lang->menu_name = '메뉴명';
-    $lang->menu_srl = '메뉴 고유 번호';
-    $lang->menu_id = '메뉴 이름';
-    $lang->menu_url = '연결 url';
-    $lang->menu_open_window = '새 창 열기';
-    $lang->menu_expand = '펼침';
-    $lang->menu_img_btn = '이미지 버튼';
-    $lang->menu_normal_btn = '일반';
-    $lang->menu_hover_btn = '마우스 오버';
-    $lang->menu_active_btn = '선택 시';
-    $lang->menu_group_srls = '그룹 제한';
-    $lang->layout_maker = '레이아웃 제작자';
-    $lang->layout_history = '변경 사항 ';
-    $lang->layout_info = '레이아웃 정보';
-    $lang->layout_list = '레이아웃 목록';
-    $lang->downloaded_list = '다운로드 목록';
-    $lang->limit_menu_depth = '표시 가능';
-
-    $lang->cmd_make_child = '하부 메뉴 추가';
-    $lang->cmd_move_to_installed_list = '생성된 목록 보기';
-    $lang->cmd_enable_move_menu = '메뉴 옮기기 (선택 후, 위 메뉴를 드래그하세요.)';
-    $lang->cmd_search_mid = 'mid 찾기';
-
-    $lang->msg_cannot_delete_for_child = '하부 메뉴가 있는 메뉴는 삭제하실 수 없습니다.';
-
-    $lang->about_title = '모듈에 연결할 때, 쉽게 구분할 수 있는 제목을 입력해주세요.';
-    $lang->about_menu_management = "메뉴관리는 선택하신 레이아웃에서 사용하는 메뉴를 구성할 수 있도록 합니다.\n정해진 단계까지 메뉴를 구성 가능하며 입력하신 메뉴를 클릭하시면 상세 정보를 입력할 수 있습니다.\n폴더 그림을 클릭하시면 메뉴를 확장하실 수 있습니다.\n간혹 메뉴가 정상적으로 나타나지 않으면 \"캐시파일 재생성\" 버튼을 눌러서 정보를 갱신하세요.\n* 정해진 단계 이상의 메뉴는 제대로 표시되지 않을 수 있습니다.";
-    $lang->about_menu_name = '관리 및 이미지 버튼이 아닐 경우 메뉴 명으로 나타날 제목입니다.';
-    $lang->about_menu_url = '메뉴 선택 시 이동할 URL입니다.<br />다른 모듈을 연결하고자 할 때는 mid값만 입력해주시면 됩니다.<br />내용이 없으면 이 메뉴를 선택해도 아무런 동작이 없습니다.';
-    $lang->about_menu_open_window = '메뉴를 선택 했을 때, 새 창을 띄울 것인지 정할 수 있습니다.';
-    $lang->about_menu_expand = '트리메뉴(tree_menu.js)를 사용 하면, 메뉴가 늘 펼쳐진 상태로 있게 합니다.';
-    $lang->about_menu_img_btn = '이미지 버튼을 등록하면 레이아웃에서 이 메뉴가 이미지 버튼으로 교체되어 표시 됩니다.';
-    $lang->about_menu_group_srls = '그룹을 선택하시면 해당 그룹의 사용자만 메뉴가 보이게 됩니다. (xml파일을 직접 열람하면 노출이 됩니다.)';
-
-    $lang->about_menu = "메뉴모듈은 생성된 모듈을 편리한 메뉴관리기를 통해 정리하고 레이아웃과 연결하여 별도의 수작업 없이 완성된 사이트를 구축하도록 도와줍니다. \n메뉴는 사이트를 관리하기 보다는 모듈과 레이아웃을 연결해 주며 레이아웃을 통해 여러 가지 형태의 메뉴를 표시할 수 있도록 하는 정보만 가지고 있습니다.";
-
-    $lang->alert_image_only = '이미지 파일만 등록 가능합니다.';
-?>
diff --git a/modules/menu/lang/lang.xml b/modules/menu/lang/lang.xml
new file mode 100644
index 000000000..100c124a4
--- /dev/null
+++ b/modules/menu/lang/lang.xml
@@ -0,0 +1,559 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_menu_insert">
+		<value xml:lang="ko"><![CDATA[메뉴 생성]]></value>
+		<value xml:lang="en"><![CDATA[Create Menu]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー生成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[生成菜单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[建立選單]]></value>
+		<value xml:lang="fr"><![CDATA[Créer un Menu]]></value>
+		<value xml:lang="ru"><![CDATA[Создать меню]]></value>
+		<value xml:lang="es"><![CDATA[Crear Menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü Oluştur]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo Menu]]></value>
+	</item>
+	<item name="cmd_menu_management">
+		<value xml:lang="ko"><![CDATA[메뉴 설정]]></value>
+		<value xml:lang="en"><![CDATA[Menu Setting]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單設置]]></value>
+		<value xml:lang="fr"><![CDATA[Administer des Menus]]></value>
+		<value xml:lang="ru"><![CDATA[Управление меню]]></value>
+		<value xml:lang="es"><![CDATA[Comfiguración del Menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü Yönetimi]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý Menu]]></value>
+	</item>
+	<item name="menu_count">
+		<value xml:lang="ko"><![CDATA[메뉴 수]]></value>
+		<value xml:lang="en"><![CDATA[No. of menus]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單數]]></value>
+		<value xml:lang="fr"><![CDATA[Somme de menu]]></value>
+		<value xml:lang="ru"><![CDATA[Меню No.]]></value>
+		<value xml:lang="es"><![CDATA[Número del menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü numarası]]></value>
+		<value xml:lang="vi"><![CDATA[Số Menu]]></value>
+	</item>
+	<item name="menu_management">
+		<value xml:lang="ko"><![CDATA[메뉴 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Menu]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administration de Menu]]></value>
+		<value xml:lang="ru"><![CDATA[Управление меню]]></value>
+		<value xml:lang="es"><![CDATA[Configuración del Menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü Yönetimi]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý Menu]]></value>
+	</item>
+	<item name="collapsing">
+		<value xml:lang="ko"><![CDATA[접기]]></value>
+		<value xml:lang="en"><![CDATA[Collapse]]></value>
+		<value xml:lang="jp"><![CDATA[畳む]]></value>
+	</item>
+	<item name="expanding">
+		<value xml:lang="ko"><![CDATA[펼치기]]></value>
+		<value xml:lang="en"><![CDATA[Expand]]></value>
+		<value xml:lang="jp"><![CDATA[展開]]></value>
+	</item>
+	<item name="add_menu">
+		<value xml:lang="ko"><![CDATA[메뉴 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Menu]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー追加]]></value>
+	</item>
+	<item name="edit_menu">
+		<value xml:lang="ko"><![CDATA[메뉴 편집]]></value>
+		<value xml:lang="en"><![CDATA[Edit Menu]]></value>
+		<value xml:lang="jp"><![CDATA[メニューの編集]]></value>
+	</item>
+	<item name="add_new_sitemap">
+		<value xml:lang="ko"><![CDATA[새 사이트맵 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add New Site Map]]></value>
+		<value xml:lang="jp"><![CDATA[新しいサイトマップ追加]]></value>
+	</item>
+	<item name="module_or_url">
+		<value xml:lang="ko"><![CDATA[모듈 또는 URL]]></value>
+		<value xml:lang="en"><![CDATA[Module or URL]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール、またはURL]]></value>
+	</item>
+	<item name="create_module_in_menu">
+		<value xml:lang="ko"><![CDATA[모듈 생성]]></value>
+		<value xml:lang="en"><![CDATA[Create Module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール生成]]></value>
+	</item>
+	<item name="select_module_in_menu">
+		<value xml:lang="ko"><![CDATA[모듈 선택]]></value>
+		<value xml:lang="en"><![CDATA[Select Module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール選択]]></value>
+	</item>
+	<item name="create_mid_in_menu">
+		<value xml:lang="ko"><![CDATA[모듈 아이디 생성]]></value>
+		<value xml:lang="en"><![CDATA[Create Module ID]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールID生成]]></value>
+	</item>
+	<item name="select_mid_in_menu">
+		<value xml:lang="ko"><![CDATA[모듈 아이디 선택]]></value>
+		<value xml:lang="en"><![CDATA[Select Module ID]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールID選択]]></value>
+	</item>
+	<item name="depth">
+		<value xml:lang="ko"><![CDATA[단계]]></value>
+		<value xml:lang="en"><![CDATA[Step]]></value>
+		<value xml:lang="jp"><![CDATA[階層]]></value>
+		<value xml:lang="zh-CN"><![CDATA[层级]]></value>
+		<value xml:lang="zh-TW"><![CDATA[層級]]></value>
+		<value xml:lang="fr"><![CDATA[Niveau]]></value>
+		<value xml:lang="ru"><![CDATA[Ступень]]></value>
+		<value xml:lang="es"><![CDATA[Nivel]]></value>
+		<value xml:lang="tr"><![CDATA[Adım]]></value>
+		<value xml:lang="vi"><![CDATA[Bước]]></value>
+	</item>
+	<item name="parent_menu_name">
+		<value xml:lang="ko"><![CDATA[상위 메뉴명]]></value>
+		<value xml:lang="en"><![CDATA[Parent Menu Name]]></value>
+		<value xml:lang="jp"><![CDATA[上位メニュー名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上级菜单名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主選單名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Menu supérieur]]></value>
+		<value xml:lang="ru"><![CDATA[Имя верхнего меню]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del Menú principal]]></value>
+		<value xml:lang="tr"><![CDATA[Üst Menü İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Menu chính]]></value>
+	</item>
+	<item name="menu_name">
+		<value xml:lang="ko"><![CDATA[메뉴 이름]]></value>
+		<value xml:lang="en"><![CDATA[Menu Name]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Menu]]></value>
+		<value xml:lang="ru"><![CDATA[Имя меню]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü İsmi]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Menu]]></value>
+	</item>
+	<item name="menu_srl">
+		<value xml:lang="ko"><![CDATA[메뉴 고유 번호]]></value>
+		<value xml:lang="en"><![CDATA[Menu Serial Number]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー固有番号]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单固有编号]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單編號]]></value>
+		<value xml:lang="fr"><![CDATA[Numéro de série de Menu]]></value>
+		<value xml:lang="ru"><![CDATA[SRL меню]]></value>
+		<value xml:lang="es"><![CDATA[Número característico del menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü Seri Numarası]]></value>
+		<value xml:lang="vi"><![CDATA[Số Serial của Menu]]></value>
+	</item>
+	<item name="menu_id">
+		<value xml:lang="ko"><![CDATA[메뉴 이름]]></value>
+		<value xml:lang="en"><![CDATA[Menu ID]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom d'Identité de Menu]]></value>
+		<value xml:lang="ru"><![CDATA[ID меню]]></value>
+		<value xml:lang="es"><![CDATA[ID del menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü Kimliği]]></value>
+	</item>
+	<item name="menu_url">
+		<value xml:lang="ko"><![CDATA[연결 url]]></value>
+		<value xml:lang="en"><![CDATA[Menu URL]]></value>
+		<value xml:lang="jp"><![CDATA[リンクURL]]></value>
+		<value xml:lang="zh-CN"><![CDATA[链接]]></value>
+		<value xml:lang="zh-TW"><![CDATA[連結]]></value>
+		<value xml:lang="fr"><![CDATA[URL de Menu]]></value>
+		<value xml:lang="ru"><![CDATA[URL меню]]></value>
+		<value xml:lang="es"><![CDATA[URL del Menú]]></value>
+		<value xml:lang="tr"><![CDATA[Menü URLsi]]></value>
+	</item>
+	<item name="menu_open_window">
+		<value xml:lang="ko"><![CDATA[새 창 열기]]></value>
+		<value xml:lang="en"><![CDATA[Open a new window]]></value>
+		<value xml:lang="jp"><![CDATA[新規ウィンドウで開く]]></value>
+		<value xml:lang="zh-CN"><![CDATA[新窗口]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新視窗]]></value>
+		<value xml:lang="fr"><![CDATA[Ouvrire une nouvelle fenêtre]]></value>
+		<value xml:lang="ru"><![CDATA[Открыть новое окно]]></value>
+		<value xml:lang="es"><![CDATA[Abrir en una nueva ventana]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni pencere aç]]></value>
+		<value xml:lang="vi"><![CDATA[Mở ra trang mới]]></value>
+	</item>
+	<item name="menu_self_window">
+		<value xml:lang="ko"><![CDATA[현재창 열기]]></value>
+		<value xml:lang="en"><![CDATA[Open a self window]]></value>
+		<value xml:lang="jp"><![CDATA[現在のウィンドウで開く]]></value>
+	</item>
+	<item name="menu_expand">
+		<value xml:lang="ko"><![CDATA[펼침]]></value>
+		<value xml:lang="en"><![CDATA[Expand]]></value>
+		<value xml:lang="jp"><![CDATA[展開]]></value>
+		<value xml:lang="zh-CN"><![CDATA[展开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[展開]]></value>
+		<value xml:lang="fr"><![CDATA[Étendre]]></value>
+		<value xml:lang="ru"><![CDATA[Раскрыть]]></value>
+		<value xml:lang="es"><![CDATA[Expandir]]></value>
+		<value xml:lang="tr"><![CDATA[Genişlet]]></value>
+		<value xml:lang="vi"><![CDATA[Trải rộng]]></value>
+	</item>
+	<item name="menu_img_btn">
+		<value xml:lang="ko"><![CDATA[이미지 버튼]]></value>
+		<value xml:lang="en"><![CDATA[Image button]]></value>
+		<value xml:lang="jp"><![CDATA[イメージボタン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[图片按钮]]></value>
+		<value xml:lang="zh-TW"><![CDATA[圖片按鈕]]></value>
+		<value xml:lang="fr"><![CDATA[Bouton en Image]]></value>
+		<value xml:lang="ru"><![CDATA[Изображение кнопки]]></value>
+		<value xml:lang="es"><![CDATA[Botón de imagen]]></value>
+		<value xml:lang="tr"><![CDATA[Resim Tuşu]]></value>
+		<value xml:lang="vi"><![CDATA[Hình nút bấm]]></value>
+	</item>
+	<item name="menu_normal_btn">
+		<value xml:lang="ko"><![CDATA[일반]]></value>
+		<value xml:lang="en"><![CDATA[Normal]]></value>
+		<value xml:lang="jp"><![CDATA[一般ボタン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[普通]]></value>
+		<value xml:lang="zh-TW"><![CDATA[普通]]></value>
+		<value xml:lang="ru"><![CDATA[Обычное]]></value>
+		<value xml:lang="vi"><![CDATA[Bình thường]]></value>
+	</item>
+	<item name="menu_hover_btn">
+		<value xml:lang="ko"><![CDATA[마우스 오버]]></value>
+		<value xml:lang="en"><![CDATA[Mouse over]]></value>
+		<value xml:lang="jp"><![CDATA[マウスオーバー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[鼠标滑过]]></value>
+		<value xml:lang="zh-TW"><![CDATA[滑鼠移過]]></value>
+		<value xml:lang="fr"><![CDATA[Survolé]]></value>
+		<value xml:lang="ru"><![CDATA[Мышь над]]></value>
+		<value xml:lang="es"><![CDATA[Mouse arriba]]></value>
+		<value xml:lang="tr"><![CDATA[Fare üzerine geldiğinde]]></value>
+		<value xml:lang="vi"><![CDATA[Khi trỏ chuột]]></value>
+	</item>
+	<item name="menu_active_btn">
+		<value xml:lang="ko"><![CDATA[선택 시]]></value>
+		<value xml:lang="en"><![CDATA[When selected]]></value>
+		<value xml:lang="jp"><![CDATA[選択時のボタン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[激活链接]]></value>
+		<value xml:lang="zh-TW"><![CDATA[啟動連結]]></value>
+		<value xml:lang="fr"><![CDATA[Choisi]]></value>
+		<value xml:lang="ru"><![CDATA[При выборе]]></value>
+		<value xml:lang="es"><![CDATA[Al momento de seleccionar]]></value>
+		<value xml:lang="tr"><![CDATA[Seçildiğinde]]></value>
+		<value xml:lang="vi"><![CDATA[Khi chọn]]></value>
+	</item>
+	<item name="menu_group_srls">
+		<value xml:lang="ko"><![CDATA[그룹 제한]]></value>
+		<value xml:lang="en"><![CDATA[Accessable Groups]]></value>
+		<value xml:lang="jp"><![CDATA[グループ制限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[群組]]></value>
+		<value xml:lang="fr"><![CDATA[Groupes qui peuvent accéder]]></value>
+		<value xml:lang="ru"><![CDATA[Группы с доступом]]></value>
+		<value xml:lang="es"><![CDATA[Grupos accesibles]]></value>
+		<value xml:lang="tr"><![CDATA[Erişilebilir Gruplar]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm được phép]]></value>
+	</item>
+	<item name="layout_maker">
+		<value xml:lang="ko"><![CDATA[레이아웃 제작자]]></value>
+		<value xml:lang="en"><![CDATA[Layout Maker]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面作者]]></value>
+		<value xml:lang="fr"><![CDATA[Auteur de la Mise en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Маркет лейаута]]></value>
+		<value xml:lang="es"><![CDATA[Marcar el diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim Düzeni Yapıcısı]]></value>
+		<value xml:lang="vi"><![CDATA[Người tạo giao diện]]></value>
+	</item>
+	<item name="layout_history">
+		<value xml:lang="ko"><![CDATA[변경 사항 ]]></value>
+		<value xml:lang="en"><![CDATA[Update History ]]></value>
+		<value xml:lang="jp"><![CDATA[変更内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新列表 ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新列表]]></value>
+		<value xml:lang="fr"><![CDATA[Histoire des Mises à Jour]]></value>
+		<value xml:lang="ru"><![CDATA[История обновлений]]></value>
+		<value xml:lang="es"><![CDATA[Actualizar la historia]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleştirme Geçmişi ]]></value>
+		<value xml:lang="vi"><![CDATA[Lịch sử cập nhật]]></value>
+	</item>
+	<item name="layout_info">
+		<value xml:lang="ko"><![CDATA[레이아웃 정보]]></value>
+		<value xml:lang="en"><![CDATA[Layout Info]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウト情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information de la Mise en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Информация лейаутов]]></value>
+		<value xml:lang="es"><![CDATA[Información del diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yer. Düzeni Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin giao diện]]></value>
+	</item>
+	<item name="layout_list">
+		<value xml:lang="ko"><![CDATA[레이아웃 목록]]></value>
+		<value xml:lang="en"><![CDATA[Layouts List]]></value>
+		<value xml:lang="jp"><![CDATA[レイアウトリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[布局目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Mises en Page]]></value>
+		<value xml:lang="ru"><![CDATA[Список лейаутов]]></value>
+		<value xml:lang="es"><![CDATA[Lista del diseño]]></value>
+		<value xml:lang="tr"><![CDATA[Yer. Düzeni Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách giao diện]]></value>
+	</item>
+	<item name="downloaded_list">
+		<value xml:lang="ko"><![CDATA[다운로드 목록]]></value>
+		<value xml:lang="en"><![CDATA[Downloads List]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロードリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版面選擇]]></value>
+		<value xml:lang="fr"><![CDATA[Liste de Téléchargement]]></value>
+		<value xml:lang="ru"><![CDATA[Список закачек]]></value>
+		<value xml:lang="es"><![CDATA[Lista de descarga]]></value>
+		<value xml:lang="tr"><![CDATA[İndirilenler Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Download]]></value>
+	</item>
+	<item name="limit_menu_depth">
+		<value xml:lang="ko"><![CDATA[표시 가능]]></value>
+		<value xml:lang="en"><![CDATA[Display Enabled]]></value>
+		<value xml:lang="jp"><![CDATA[表示可能]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可显示]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可顯示]]></value>
+		<value xml:lang="fr"><![CDATA[Niveau permis d'exposer]]></value>
+		<value xml:lang="ru"><![CDATA[Лимит глубины]]></value>
+		<value xml:lang="es"><![CDATA[Exhibicion permitido]]></value>
+		<value xml:lang="tr"><![CDATA[Görüntü Etkinleştirildi]]></value>
+		<value xml:lang="vi"><![CDATA[Được phép hiển thị]]></value>
+	</item>
+	<item name="cmd_make_child">
+		<value xml:lang="ko"><![CDATA[하부 메뉴 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add a Child Menu]]></value>
+		<value xml:lang="jp"><![CDATA[下位メニュー追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加下级菜单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增子選單]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un menu inférieur]]></value>
+		<value xml:lang="ru"><![CDATA[Добавть дочернее меню]]></value>
+		<value xml:lang="es"><![CDATA[Agregar un submenú]]></value>
+		<value xml:lang="tr"><![CDATA[Alt Menü Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm Menu con]]></value>
+	</item>
+	<item name="cmd_move_to_installed_list">
+		<value xml:lang="ko"><![CDATA[생성된 목록 보기]]></value>
+		<value xml:lang="en"><![CDATA[View Created List]]></value>
+		<value xml:lang="jp"><![CDATA[生成されたリスト表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看生成目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視建立列表]]></value>
+		<value xml:lang="fr"><![CDATA[Voir la liste créé]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть созданные меню]]></value>
+		<value xml:lang="es"><![CDATA[Ver la lista de los creadores]]></value>
+		<value xml:lang="tr"><![CDATA[Oluşturulanlar Listesini Görüntüle]]></value>
+		<value xml:lang="vi"><![CDATA[Xem danh sách đã tạo]]></value>
+	</item>
+	<item name="cmd_enable_move_menu">
+		<value xml:lang="ko"><![CDATA[메뉴 옮기기 (선택 후, 위 메뉴를 드래그하세요.)]]></value>
+		<value xml:lang="en"><![CDATA[Move Menu (Drag the top menu after selecting)]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー移動（選択後メニューをドラッグしてください）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单顺序(勾选后用鼠标拖动)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單順序(勾選後可用滑鼠拖曳)]]></value>
+		<value xml:lang="fr"><![CDATA[Bouger le Menu (glisser-déposer un menu après cocher)]]></value>
+		<value xml:lang="ru"><![CDATA[Переместить меню (Перетащите верхнее меню после выделения)]]></value>
+		<value xml:lang="es"><![CDATA[Mover el menú (Mover el menú luego de seleccionar)]]></value>
+		<value xml:lang="tr"><![CDATA[Menüyü Taşı (seçtikten sonra üst menüyü sürükleyin)]]></value>
+		<value xml:lang="vi"><![CDATA[Di chuyển Menu (Kéo lên Menu trên sau khi lựa chọn)]]></value>
+	</item>
+	<item name="cmd_search_mid">
+		<value xml:lang="ko"><![CDATA[mid 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Search mid]]></value>
+		<value xml:lang="jp"><![CDATA[mid 検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查找 mid]]></value>
+		<value xml:lang="zh-TW"><![CDATA[尋找 mid]]></value>
+		<value xml:lang="fr"><![CDATA[Rechercher mid]]></value>
+		<value xml:lang="ru"><![CDATA[Поиск mid]]></value>
+		<value xml:lang="es"><![CDATA[Buscar mid]]></value>
+		<value xml:lang="tr"><![CDATA[mid Ara]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm kiếm Module]]></value>
+	</item>
+	<item name="msg_cannot_delete_for_child">
+		<value xml:lang="ko"><![CDATA[하부 메뉴가 있는 메뉴는 삭제하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[A menu with child menus cannot be deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[下位メニューのあるメニューは削除できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[有下级菜单的菜单不能删除。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[有子選單的選單不能刪除。]]></value>
+		<value xml:lang="fr"><![CDATA[Un menu qui a des menus inférieurs ne peut pas être supprimé.]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно удалить меню с дочерними меню]]></value>
+		<value xml:lang="es"><![CDATA[No se puede eliminar un menú si posee un submenú.]]></value>
+		<value xml:lang="tr"><![CDATA[Altmenüleri olan bir menü silinemez.]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể xóa Menu khi có những Menu con.]]></value>
+	</item>
+	<item name="msg_cannot_delete_for_admin_topmenu">
+		<value xml:lang="ko"><![CDATA[최상위 메뉴는 삭제할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[A top menu cannot be deleted]]></value>
+		<value xml:lang="jp"><![CDATA[最上位メニューは、削除できません。]]></value>
+	</item>
+	<item name="about_title">
+		<value xml:lang="ko"><![CDATA[모듈에 연결할 때, 쉽게 구분할 수 있는 제목을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the title that is easy to verify when connecting to the module.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールをリンクする際に分かりやすいタイトルを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入连接模块时容易区分的标题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入連接模組時，容易區分的標題。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez un titre facile à vérifier quand on le connecte à un module.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, введите название меню, которое легко проверить при подключению к модулю]]></value>
+		<value xml:lang="es"><![CDATA[Ingresar el título que sea fácil de identificar al momento de conectar al módulo.]]></value>
+		<value xml:lang="tr"><![CDATA[Modüle bağlanacakken, kolayca onaylanacak başlık giriniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy nhập tiêu đề để dễ dàng xác minh khi kết nối tới Module.]]></value>
+	</item>
+	<item name="about_menu_management">
+		<value xml:lang="ko"><![CDATA[메뉴관리는 선택하신 레이아웃에서 사용하는 메뉴를 구성할 수 있도록 합니다.
+정해진 단계까지 메뉴를 구성 가능하며 입력하신 메뉴를 클릭하시면 상세 정보를 입력할 수 있습니다.
+폴더 그림을 클릭하시면 메뉴를 확장하실 수 있습니다.
+간혹 메뉴가 정상적으로 나타나지 않으면 "캐시파일 재생성" 버튼을 눌러서 정보를 갱신하세요.
+* 정해진 단계 이상의 메뉴는 제대로 표시되지 않을 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The menu management enables you to organize your menus in the selected layout.
+You can create menus up to setted depth and can enter information in details by clicking them.
+The menu will be expanded by clicking the folder image.
+If the menu is not shown normally, refresh the information by clicking the button "Re-create cache file".
+* The menu created over the depth limit may not be shown properly.]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー管理では、選択したレイアウトを利用して、使用するメニューを構成できます。<br />決められた階層までメニューを構成することができ、入力したメニューをクリックして詳細情報を入力できます。<br />フォルダーのイメージをクリックするとメニューを展開することがれきます。<br />もしメニューが正常に表示されない場合は、 「キャッシュファイル再生成」ボタンをクリックして情報を更新してください。<br />* 一定レベル以上のメニューは正しく表示されない場合があります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[在此创建要在布局中使用的菜单。
+点击菜单前的文件夹图标可以展开收缩菜单。
+偶尔不能正常显示菜单时，请按"更新缓冲"按钮更新信息。
+* 不能正常显示指定级(层级)以上的菜单，创建菜单项的时候，请确认你要使用的布局究竟支持多少级别的菜单。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單管理可以建構所選擇版面中使用的選單。
+不僅可以建構指定級(層級)選單，點擊輸入的選單名稱即可對其進行詳細設置。
+點擊選單前圖標可以展開選單。
+偶爾無法正常顯示選單時，請按"重新建立暫存檔"按鈕更新資料。
+* 可能無法正常顯示指定級(層級)以上的選單。]]></value>
+		<value xml:lang="fr"><![CDATA[Administration de Menu vous permet de composer le menu dans la Mise en Page que vous choisissez.
+Vous pouvez créer le menu jusqu'au niveau permis et entrer des informations détaillées si vou cliquez le menu.
+Menu sera étendu si vous cliquez l'image de dossier.
+Si le menu n'est pas représenté normalement, rafraîchir les informations en cliquant le bouton "Recréer 'antémémoire de fichier".
+* Menu cré qui passe plus que le niveau permis pourra être représenté incorrectement.]]></value>
+		<value xml:lang="ru"><![CDATA[Управление меню позволяет Вам заключить меню в вабранный лейаут.
+Вы можете создать меню до установленной грубины и ввести информацию детально посредством целчка по нему
+Меню будет разкрыто щелчком по изображению папки.
+Если меню не отображается нормально, обновите информацию щелчком по кнопке "Пересоздать файл кеша".
+* Меню, созданное за пределами лимита глубины может отображаться неверно.]]></value>
+		<value xml:lang="es"><![CDATA[Configuración del menú permite construir el menú del diseño seleccionado.
+Usted puede crear el menú hasta el nivel seleccionado y para la información más detallada debe seleccionar el menú ingresado.
+El menú será expandido al presionar la imagen del directorio.
+Si el menú no se ve correctamente, renueva la informacion presionado el botón"Rehacer archivo caché".
+ El menú creado sobre el nivel límite podría no verse apropiadamente.]]></value>
+		<value xml:lang="tr"><![CDATA[Menü yönetimi size, seçili yerleşim düzeninde menü oluşturma imkani sunar.
+Ayarlanmış derinlikte menü oluşturabilir ve menüye tıklayarak detaylı menü bilgisi girebilirsiniz.
+Dosya resmine tıklayınca menü genişletilecektir.
+Eğer menü normal görüntülenmiyorsa, "önbellek dosyasını tekrar oluştur" tuşuna basarak bilgiyi tazeleyiniz.
+* Menü, derinlik limitini geçecek şekilde oluşturulduysa, düzgün gösterilmeyebilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý Menu cho phép bạn bố trí, chọn cách trình bày của Menu.
+Bạn có thể tạo những menu và nhập những thông tin khi menu được lựa chọn.
+Menu sẽ đuwọc trải rộng khi bấm và hình thư mục trên Menu.
+Nếu Menu không hiển thị một cách bình thường, hãy làm mới thông tin bằng cách bấm "Tạo File Cache mới".
+<font color='red'>*</font> Menu được tạo quá giới hạn có thể sẽ không hiển thị được như mong muốn.]]></value>
+	</item>
+	<item name="about_menu_name">
+		<value xml:lang="ko"><![CDATA[관리 및 이미지 버튼이 아닐 경우 메뉴 명으로 나타날 제목입니다.]]></value>
+		<value xml:lang="en"><![CDATA[The name will be shown as a menu name if it is not an admin or image button.]]></value>
+		<value xml:lang="jp"><![CDATA[管理ボタンやイメージボタンでない場合にメニュー名として表示されるタイトルです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入不是图片按钮时显示为菜单名标题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入不是圖片按鈕時，顯示為選單名標題。]]></value>
+		<value xml:lang="fr"><![CDATA[Ce nom sera représenté comme le nom de menu si ce n'est pas le bouton en image ou le bouton pour administrer.]]></value>
+		<value xml:lang="ru"><![CDATA[Это имя будет показано, если это не административная книпка или кнопка с изображением.]]></value>
+		<value xml:lang="es"><![CDATA[El nombre se verá como un nombre de menú si no es un botón del administrador o botón de imagen.]]></value>
+		<value xml:lang="tr"><![CDATA[İsim, eğer yönetici tuşu veya resimli tuş değilse, menü ismi olarak görünecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên sẽ hiển thị là Tên Menu nếu không phải là Admin hay nút hình ảnh.]]></value>
+	</item>
+	<item name="about_menu_url">
+		<value xml:lang="ko"><![CDATA[메뉴 선택 시 이동할 URL입니다.<br />다른 모듈을 연결하고자 할 때는 mid값만 입력해주시면 됩니다.<br />내용이 없으면 이 메뉴를 선택해도 아무런 동작이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[It is the menu URL when select the menu.<br />You may enter only id value to link to other module.<br />If no contents exist, nothing will happen even though you click the menu.]]></value>
+		<value xml:lang="jp"><![CDATA[メニュー選択時、移動するURLです。<br />他のモジュールとリンクを張る場合はIDの値のみ入力してください。<br />内容がない場合は、メニューを選択しても何の動作も行われません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[点击菜单时要移动的URL。<br />连接其他模块时只输入id值即可。<br />没有内容时点击菜单也不会有什么动作。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[按選單名稱後，要移往的網址。<br />連結其他模組時，只要輸入模組mid即可。<br />沒有內容時，點擊選單不會產生任何事情。]]></value>
+		<value xml:lang="fr"><![CDATA[C'est le URL où l'on bouge quand on choisit le menu.<br />Vous pouvez entrer la valeur d'identité(nom d'idendité) seulement pour lier à un autre module.<br />Si nul contenu n'existe, rien n'aura lieu même si l'on clique le menu.]]></value>
+		<value xml:lang="ru"><![CDATA[Это URL, связанный с меню.<br />Вы можете ввести только ID значение к ссылке на другой модуль.<br />Если содержания нет, ничего не произойдет при щелчке по меню.]]></value>
+		<value xml:lang="es"><![CDATA[Este es el URL al momento de seleccionar el menú.<br />Si desea conectar a otro módulo sólo debe colocar el valor de id.<br />Si no hay contenido, no pasara nada aun cuando haya presinado el menú.]]></value>
+		<value xml:lang="tr"><![CDATA[Menü seçildiğindeki menü URLsidir.<br />Sadece diğer menüye köprü olacak id değerini girebilirsiniz.<br />Eğer hiçbir içerik yoksa, menüye tıklasanız da hiçbir eylem gerçekleşmeyecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nó sẽ là đường dẫn khi bấm vào Menu.<br />Bạn có thể chỉ nhập ID cho đường dẫn của Module.<br />Nếu để trống, sẽ không thấy tác dụng gì khi bấm vào Menu.]]></value>
+	</item>
+	<item name="about_menu_open_window">
+		<value xml:lang="ko"><![CDATA[메뉴를 선택 했을 때, 새 창을 띄울 것인지 정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can assign it to open a page in a new window when the menu is clicked.]]></value>
+		<value xml:lang="jp"><![CDATA[メニューを選択した際に新しいウィンドウで開くかを指定することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以设置点击菜单时是否要在新窗口中打开。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[按選單後，是否要以新視窗開啟。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez faire ouvrir une page dans une nouvelle fenêtre quand le menu est cliqué.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете присвоить это для открытия ссылки в новом окне при щелчке по меню.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede asignar si desea abrir la página en una nueva ventana al momento de presionar el menú.]]></value>
+		<value xml:lang="tr"><![CDATA[Menüye tıkladığında, sayfanın yeni pencerede açılmasını belirleyebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy chọn nếu bạn muốn mở ra một trang mới khi bấm vào Menu.]]></value>
+	</item>
+	<item name="about_menu_expand">
+		<value xml:lang="ko"><![CDATA[트리메뉴(tree_menu.js)를 사용 하면, 메뉴가 늘 펼쳐진 상태로 있게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[It enables the menu to remain expanded when the tree menu(tree_menu.js) is used.]]></value>
+		<value xml:lang="jp"><![CDATA[ツリーメニュー（tree_menu.js）を利用すると、常にメニューが展開された状態になります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用树型（tree_menu.js）菜单时总是呈展开状态。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用樹型選單(tree_menu.js)時，總是呈現展開狀態。]]></value>
+		<value xml:lang="fr"><![CDATA[L'Arbre de Menu(tree_menu.js) peut faire resté le menu étendu toujours.]]></value>
+		<value xml:lang="ru"><![CDATA[Это позволяет меню оставаться раскрытым, когда древовидное меню (tree_menu.js) используется.]]></value>
+		<value xml:lang="es"><![CDATA[Al usar el menú arbol(tree_menu.js) puede mantener el menú expandido.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu, menünün agaç-menü(tree_menu.js) haline geldiği zaman geniş kalmasını sağlar.]]></value>
+		<value xml:lang="vi"><![CDATA[Cho phép Menu luôn trải ra khi (tree_menu.js) được sử dụng.]]></value>
+	</item>
+	<item name="about_menu_img_btn">
+		<value xml:lang="ko"><![CDATA[이미지 버튼을 등록하면 레이아웃에서 이 메뉴가 이미지 버튼으로 교체되어 표시 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[If you register an image button, it will automatically replace the text button, and will be shown in the layout.]]></value>
+		<value xml:lang="jp"><![CDATA[イメージボタンを登録するとレイアウトで自動的にイメージボタンに入れ替わって表示されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[如登录图片按钮，在布局中自动替换显示为图片按钮。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[如果登錄圖片按鈕，在版面中會自動替換顯示為圖片按鈕。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous enrégistez un bouton en image, l'image remplacera automatiquement le bouton en texte, et ce sera représenté dans la Mise en Page.]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы регистрируете кнопку с изображением, изображение автоматически заменит текстовую кнопку, и будет показано в лейауте.]]></value>
+		<value xml:lang="es"><![CDATA[Si Usted registra un botón de imagen, ese botón automáticamente reemplazará el botón de texto, y se mostrará en el diseño.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer bir resimli tuş kaydederseniz, resimli tuş otomatik olarak yazı düğmeciğinin yerini alacaktır ve bu yerleşim düzeninde görüntülenecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu đăng kí nút hình ảnh, hình ảnh sẽ tự động chèn lên tên của Menu, và sẽ hiển thị trong giao diện.]]></value>
+	</item>
+	<item name="about_menu_group_srls">
+		<value xml:lang="ko"><![CDATA[그룹을 선택하시면 해당 그룹의 사용자만 메뉴가 보이게 됩니다. (xml파일을 직접 열람하면 노출이 됩니다.)]]></value>
+		<value xml:lang="en"><![CDATA[If you select a group, only the group members can see the menu. (if xml file is directly opened, it will be visible to anyone who opens it.)]]></value>
+		<value xml:lang="jp"><![CDATA[グループを選択すると該当するグループのユーザーにのみメニューが表示されます（XMLファイルを直接開くと情報が表示されます）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[如选择用户组，只有所属组用户才能看到此菜单。 —（xml文件中不能隐藏）]]></value>
+		<value xml:lang="zh-TW"><![CDATA[如果選擇群組，只有所屬群組才能看到此選單。(如果可直接連結xml檔案，內容將無法隱藏)]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous choisissez un groupe, les membres de ce groupe seulement peuvent voir le menu. (Si l'on ouvre un fichier xml, le fichier sera exposé.)]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы выберите группу, то только ее члены могут видеть это меню. (если XML файл открыт напрямую, оно будет показано.)]]></value>
+		<value xml:lang="es"><![CDATA[Si tu selecciona el grupo, sólo los usuarios del grupo pueden ver el menú. (Si el archivo xml es abierto directamente, lo mostrará.)]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer bir grup seçerseniz, sadece grup üyeleri menüyü göreceklerdir. (eğer xml dosyası doğrudan açılırsa, menü görüntülenecektir.)]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu lựa chọn nhóm, thì chỉ những nhóm được chọn mới thấy được Menu. (nếu File XML trực tiếp mở ra, nó sẽ được hiển thị).]]></value>
+	</item>
+	<item name="about_menu">
+		<value xml:lang="ko"><![CDATA[메뉴모듈은 생성된 모듈을 편리한 메뉴관리기를 통해 정리하고 레이아웃과 연결하여 별도의 수작업 없이 완성된 사이트를 구축하도록 도와줍니다.
+메뉴는 사이트를 관리하기 보다는 모듈과 레이아웃을 연결해 주며 레이아웃을 통해 여러 가지 형태의 메뉴를 표시할 수 있도록 하는 정보만 가지고 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Menu module will help you create a complete site through the convenient menu management which arranges the created modules and links to layouts without any manual work.
+However, menu is not a site manager. It just has the information which can link to modules and layouts so you can express different types of menus.]]></value>
+		<value xml:lang="jp"><![CDATA[メニューモジュールは、メニュー管理機能にて生成モジュールの整理やレイアウトとのリンクを設定し、かんたんに管理者画面でサイトを構築できるようにします。
+メニューはサイトを管理するというより、モジュールとレイアウトを繋げ、レイアウトを通じて様々なタイプのメニューを表示させる情報のみを持っています。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[菜单模块可以通过菜单管理器整理已生成的模块并同布局相连接来轻松建设一个完整的网站。
+菜单模块虽然具有连接模块和布局并通过布局来显示多种形态菜单的信息，但它不具备管理网站的功能。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選單模組可以透過選單管理器，管理已建立的模組並可和版面相互連結，輕鬆架設一個完整的網站。
+選單模組雖然可連結模組和版面，並透過版面來顯示多種類型的選單，但它不具備管理網站的功能。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Module de Menu vous aidrera à établir un site complet par l'administration confortable qui arrange les modules créés et liens à la mise en page sans aucun travaux manuels.
+Menu n'est pas un administrateur du Site, mais il a seulement l'information qui peut lier les modules à la mise en page, et on peut représenter les menu en formes diverses par la mise en page.]]></value>
+		<value xml:lang="ru"><![CDATA[Модуль меню поможет Вам создать полноценный сайт посредством удобного менеджмента меню, которое расставляет созданные модули и ссылки в лейауты без всякой ручной работы.
+Меню не является менеджером сайта, но оно содержит информацию, которая может связываться с модулями и лейаутами так, что Вы можете выразить различные виды меню.]]></value>
+		<value xml:lang="es"><![CDATA[Módulo del menú te ayudara a crear un sitio completo a través de un conveniente manejo del menú que ordena los módulos creados y conecta con el diseño sin ningún otro trabajo.
+El menú no es un manejador del sitio, sino que permite conectar los módulos con el diseño y a través del diseño puede expresar variados estilos del menú.]]></value>
+		<value xml:lang="tr"><![CDATA[Menü modülü size, oluşturulmuş menüleri ve linkleri otomatik yolla yerleşim düzenine uyduran uygun menü yönetim yoluyla bütün bir site oluşturmanıza yardımcı olur.
+Menü site yöneticisi değildir fakat; yerleşim düzenlerine ve modüllere köprüleme bilgisi vardır bu şekilde kendinizi farklı şekillerde ifade edebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Menu Module sẽ giúp bạn hoàn thiện một trang Web thông qua việc quản lý và sắp xếp thuận tiện, nó sẽ liên kết tới những Module trong Website.
+Menu không phải là người quản lý, nhiệm vụ của nó chỉ là liên kết và tạo sự phong phú trong Website của bạn.]]></value>
+	</item>
+	<item name="alert_image_only">
+		<value xml:lang="ko"><![CDATA[이미지 파일만 등록 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only image files can be registered.]]></value>
+		<value xml:lang="jp"><![CDATA[イメージ(画像)ファイルのみ登録できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只允许图形文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只允許圖形檔案。]]></value>
+		<value xml:lang="fr"><![CDATA[Fichiers d'image seulement peuvent être enrégistrés.]]></value>
+		<value xml:lang="ru"><![CDATA[Возможна регистрация только картинок]]></value>
+		<value xml:lang="es"><![CDATA[Sólo los archivos de imagen pueden ser registradas.]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece resim dosyaları kaydedilebilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ được phép sử dụng File hình ảnh.]]></value>
+	</item>
+</lang>
diff --git a/modules/menu/lang/ru.lang.php b/modules/menu/lang/ru.lang.php
deleted file mode 100644
index 6bc903385..000000000
--- a/modules/menu/lang/ru.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->cmd_menu_insert = 'Создать меню';
-    $lang->cmd_menu_management = 'Управление меню';
-
-    $lang->menu = 'Меню'; 
-    $lang->menu_count = 'Меню No.';
-    $lang->menu_management = 'Управление меню';
-    $lang->depth = 'Ступень';
-    $lang->parent_menu_name = 'Имя верхнего меню';
-    $lang->menu_name = 'Имя меню';
-    $lang->menu_srl = 'SRL меню';
-    $lang->menu_id = 'ID меню';
-    $lang->menu_url = 'URL меню';
-    $lang->menu_open_window = 'Открыть новое окно';
-    $lang->menu_expand = 'Раскрыть';
-    $lang->menu_img_btn = 'Изображение кнопки';
-    $lang->menu_normal_btn = 'Обычное';
-    $lang->menu_hover_btn = 'Мышь над';
-    $lang->menu_active_btn = 'При выборе';
-    $lang->menu_group_srls = 'Группы с доступом';
-    $lang->layout_maker = "Маркет лейаута";
-    $lang->layout_history = "История обновлений";
-    $lang->layout_info = "Информация лейаутов";
-    $lang->layout_list = 'Список лейаутов';
-    $lang->downloaded_list = 'Список закачек';
-    $lang->limit_menu_depth = 'Лимит глубины';
-
-    $lang->cmd_make_child = 'Добавть дочернее меню';
-    $lang->cmd_move_to_installed_list = "Просмотреть созданные меню";
-    $lang->cmd_enable_move_menu = "Переместить меню (Перетащите верхнее меню после выделения)";
-    $lang->cmd_search_mid = "Поиск mid";
-
-    $lang->msg_cannot_delete_for_child = 'Невозможно удалить меню с дочерними меню';
-
-    $lang->about_title = 'Пожалуйста, введите название меню, которое легко проверить при подключению к модулю';
-    $lang->about_menu_management = "Управление меню позволяет Вам заключить меню в вабранный лейаут.\nВы можете создать меню до установленной грубины и ввести информацию детально посредством целчка по нему\nМеню будет разкрыто щелчком по изображению папки.\nЕсли меню не отображается нормально, обновите информацию щелчком по кнопке \"Пересоздать файл кеша\".\n* Меню, созданное за пределами лимита глубины может отображаться неверно.";
-    $lang->about_menu_name = 'Это имя будет показано, если это не административная книпка или кнопка с изображением.';
-    $lang->about_menu_url = "Это URL, связанный с меню.<br />Вы можете ввести только ID значение к ссылке на другой модуль.<br />Если содержания нет, ничего не произойдет при щелчке по меню.";
-    $lang->about_menu_open_window = 'Вы можете присвоить это для открытия ссылки в новом окне при щелчке по меню.';
-    $lang->about_menu_expand = 'Это позволяет меню оставаться раскрытым, когда древовидное меню (tree_menu.js) используется.';
-    $lang->about_menu_img_btn = 'Если Вы регистрируете кнопку с изображением, изображение автоматически заменит текстовую кнопку, и будет показано в лейауте.';
-    $lang->about_menu_group_srls = 'Если Вы выберите группу, то только ее члены могут видеть это меню. (если XML файл открыт напрямую, оно будет показано.)';
-
-    $lang->about_menu = "Модуль меню поможет Вам создать полноценный сайт посредством удобного менеджмента меню, которое расставляет созданные модули и ссылки в лейауты без всякой ручной работы.\nМеню не является менеджером сайта, но оно содержит информацию, которая может связываться с модулями и лейаутами так, что Вы можете выразить различные виды меню.";
-
-    $lang->alert_image_only = "Возможна регистрация только картинок";
-?>
diff --git a/modules/menu/lang/tr.lang.php b/modules/menu/lang/tr.lang.php
deleted file mode 100644
index 8d77f222b..000000000
--- a/modules/menu/lang/tr.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Menu module's basic language pack
-     **/
-
-    $lang->cmd_menu_insert = 'Menü Oluştur';
-    $lang->cmd_menu_management = 'Menü Yönetimi';
-
-    $lang->menu = 'Menü'; 
-    $lang->menu_count = 'Menü numarası';
-    $lang->menu_management = 'Menü Yönetimi';
-    $lang->depth = 'Adım';
-    $lang->parent_menu_name = 'Üst Menü İsmi';
-    $lang->menu_name = 'Menü İsmi';
-    $lang->menu_srl = 'Menü Seri Numarası';
-    $lang->menu_id = 'Menü Kimliği';
-    $lang->menu_url = 'Menü URLsi';
-    $lang->menu_open_window = 'Yeni pencere aç';
-    $lang->menu_expand = 'Genişlet';
-    $lang->menu_img_btn = 'Resim Tuşu';
-    $lang->menu_normal_btn = 'Normal';
-    $lang->menu_hover_btn = 'Fare üzerine geldiğinde';
-    $lang->menu_active_btn = 'Seçildiğinde';
-    $lang->menu_group_srls = 'Erişilebilir Gruplar';
-    $lang->layout_maker = "Yerleşim Düzeni Yapıcısı";
-    $lang->layout_history = "Güncelleştirme Geçmişi ";
-    $lang->layout_info = "Yer. Düzeni Bilgisi";
-    $lang->layout_list = 'Yer. Düzeni Listesi';
-    $lang->downloaded_list = 'İndirilenler Listesi';
-    $lang->limit_menu_depth = 'Görüntü Etkinleştirildi';
-
-    $lang->cmd_make_child = 'Alt Menü Ekle';
-    $lang->cmd_move_to_installed_list = "Oluşturulanlar Listesini Görüntüle";
-    $lang->cmd_enable_move_menu = "Menüyü Taşı (seçtikten sonra üst menüyü sürükleyin)";
-    $lang->cmd_search_mid = "mid Ara";
-
-    $lang->msg_cannot_delete_for_child = 'Altmenüleri olan bir menü silinemez.';
-
-    $lang->about_title = 'Modüle bağlanacakken, kolayca onaylanacak başlık giriniz.';
-    $lang->about_menu_management = "Menü yönetimi size, seçili yerleşim düzeninde menü oluşturma imkani sunar.\nAyarlanmış derinlikte menü oluşturabilir ve menüye tıklayarak detaylı menü bilgisi girebilirsiniz.\nDosya resmine tıklayınca menü genişletilecektir.\nEğer menü normal görüntülenmiyorsa, \"önbellek dosyasını tekrar oluştur\" tuşuna basarak bilgiyi tazeleyiniz.\n* Menü, derinlik limitini geçecek şekilde oluşturulduysa, düzgün gösterilmeyebilir.";
-    $lang->about_menu_name = 'İsim, eğer yönetici tuşu veya resimli tuş değilse, menü ismi olarak görünecektir.';
-    $lang->about_menu_url = "Menü seçildiğindeki menü URLsidir.<br />Sadece diğer menüye köprü olacak id değerini girebilirsiniz.<br />Eğer hiçbir içerik yoksa, menüye tıklasanız da hiçbir eylem gerçekleşmeyecektir.";
-    $lang->about_menu_open_window = 'Menüye tıkladığında, sayfanın yeni pencerede açılmasını belirleyebilirsiniz.';
-    $lang->about_menu_expand = 'Bu, menünün agaç-menü(tree_menu.js) haline geldiği zaman geniş kalmasını sağlar.';
-    $lang->about_menu_img_btn = 'Eğer bir resimli tuş kaydederseniz, resimli tuş otomatik olarak yazı düğmeciğinin yerini alacaktır ve bu yerleşim düzeninde görüntülenecektir.';
-    $lang->about_menu_group_srls = 'Eğer bir grup seçerseniz, sadece grup üyeleri menüyü göreceklerdir. (eğer xml dosyası doğrudan açılırsa, menü görüntülenecektir.)';
-
-    $lang->about_menu = "Menü modülü size, oluşturulmuş menüleri ve linkleri otomatik yolla yerleşim düzenine uyduran uygun menü yönetim yoluyla bütün bir site oluşturmanıza yardımcı olur.\nMenü site yöneticisi değildir fakat; yerleşim düzenlerine ve modüllere köprüleme bilgisi vardır bu şekilde kendinizi farklı şekillerde ifade edebilirsiniz.";
-
-    $lang->alert_image_only = "Sadece resim dosyaları kaydedilebilir.";
-?>
diff --git a/modules/menu/lang/vi.lang.php b/modules/menu/lang/vi.lang.php
deleted file mode 100644
index a9ed11e80..000000000
--- a/modules/menu/lang/vi.lang.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->cmd_menu_insert = 'Tạo Menu';
-    $lang->cmd_menu_management = 'Quản lý Menu';
-
-    $lang->menu = 'Menu'; 
-    $lang->menu_count = 'Số Menu';
-    $lang->menu_management = 'Quản lý Menu';
-    $lang->depth = 'Bước';
-    $lang->parent_menu_name = 'Tên Menu chính';
-    $lang->menu_name = 'Tên Menu';
-    $lang->menu_srl = 'Số Serial của Menu';
-    $lang->menu_id = 'Menu ID';
-    $lang->menu_url = 'Menu URL';
-    $lang->menu_open_window = 'Mở ra trang mới';
-    $lang->menu_expand = 'Trải rộng';
-    $lang->menu_img_btn = 'Hình nút bấm';
-    $lang->menu_normal_btn = 'Bình thường';
-    $lang->menu_hover_btn = 'Khi trỏ chuột';
-    $lang->menu_active_btn = 'Khi chọn';
-    $lang->menu_group_srls = 'Nhóm được phép';
-    $lang->layout_maker = "Người tạo giao diện";
-    $lang->layout_history = "Lịch sử cập nhật";
-    $lang->layout_info = "Thông tin giao diện";
-    $lang->layout_list = 'Danh sách giao diện';
-    $lang->downloaded_list = 'Danh sách Download';
-    $lang->limit_menu_depth = 'Được phép hiển thị';
-
-    $lang->cmd_make_child = 'Thêm Menu con';
-    $lang->cmd_move_to_installed_list = "Xem danh sách đã tạo";
-    $lang->cmd_enable_move_menu = "Di chuyển Menu (Kéo lên Menu trên sau khi lựa chọn)";
-    $lang->cmd_search_mid = "Tìm kiếm Module";
-
-    $lang->msg_cannot_delete_for_child = 'Không thể xóa Menu khi có những Menu con.';
-
-    $lang->about_title = 'Xin hãy nhập tiêu đề để dễ dàng xác minh khi kết nối tới Module.';
-    $lang->about_menu_management = "Quản lý Menu cho phép bạn bố trí, chọn cách trình bày của Menu.\nBạn có thể tạo những menu và nhập những thông tin khi menu được lựa chọn.\nMenu sẽ đuwọc trải rộng khi bấm và hình thư mục trên Menu.\nNếu Menu không hiển thị một cách bình thường, hãy làm mới thông tin bằng cách bấm \"Tạo File Cache mới\".\n<font color='red'>*</font> Menu được tạo quá giới hạn có thể sẽ không hiển thị được như mong muốn.";
-    $lang->about_menu_name = 'Tên sẽ hiển thị là Tên Menu nếu không phải là Admin hay nút hình ảnh.';
-    $lang->about_menu_url = "Nó sẽ là đường dẫn khi bấm vào Menu.<br />Bạn có thể chỉ nhập ID cho đường dẫn của Module.<br />Nếu để trống, sẽ không thấy tác dụng gì khi bấm vào Menu.";
-    $lang->about_menu_open_window = 'Hãy chọn nếu bạn muốn mở ra một trang mới khi bấm vào Menu.';
-    $lang->about_menu_expand = 'Cho phép Menu luôn trải ra khi (tree_menu.js) được sử dụng.';
-    $lang->about_menu_img_btn = 'Nếu đăng kí nút hình ảnh, hình ảnh sẽ tự động chèn lên tên của Menu, và sẽ hiển thị trong giao diện.';
-    $lang->about_menu_group_srls = 'Nếu lựa chọn nhóm, thì chỉ những nhóm được chọn mới thấy được Menu. (nếu File XML trực tiếp mở ra, nó sẽ được hiển thị).';
-
-    $lang->about_menu = "Menu Module sẽ giúp bạn hoàn thiện một trang Web thông qua việc quản lý và sắp xếp thuận tiện, nó sẽ liên kết tới những Module trong Website.\nMenu không phải là người quản lý, nhiệm vụ của nó chỉ là liên kết và tạo sự phong phú trong Website của bạn.";
-
-    $lang->alert_image_only = "Chỉ được phép sử dụng File hình ảnh.";
-?>
diff --git a/modules/menu/lang/zh-CN.lang.php b/modules/menu/lang/zh-CN.lang.php
deleted file mode 100644
index 34108b4fe..000000000
--- a/modules/menu/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  菜单(menu) 模块的基本语言包
-     **/
-
-    $lang->cmd_menu_insert = '生成菜单';
-    $lang->cmd_menu_management = '菜单设置';
-
-    $lang->menu = '菜单'; 
-    $lang->menu_count = '菜单数';
-    $lang->menu_management = '菜单管理';
-    $lang->depth = '层级';
-    $lang->parent_menu_name = '上级菜单名';
-    $lang->menu_name = '菜单名';
-    $lang->menu_srl = '菜单固有编号';
-    $lang->menu_id = '菜单名称';
-    $lang->menu_url = '链接';
-    $lang->menu_open_window = '新窗口';
-    $lang->menu_expand = '展开';
-    $lang->menu_img_btn = '图片按钮';
-    $lang->menu_normal_btn = '普通';
-    $lang->menu_hover_btn = '鼠标滑过';
-    $lang->menu_active_btn = '激活链接';
-    $lang->menu_group_srls = '用户组';
-    $lang->layout_maker = "布局作者";
-    $lang->layout_history = "更新列表 ";
-    $lang->layout_info = "布局信息";
-    $lang->layout_list = '布局目录';
-    $lang->downloaded_list = '下载目录';
-    $lang->limit_menu_depth = '可显示';
-
-    $lang->cmd_make_child = '添加下级菜单';
-    $lang->cmd_move_to_installed_list = "查看生成目录";
-    $lang->cmd_enable_move_menu = "菜单顺序(勾选后用鼠标拖动)";
-    $lang->cmd_search_mid = "查找 mid";
-
-    $lang->msg_cannot_delete_for_child = '有下级菜单的菜单不能删除。';
-
-    $lang->about_title = '请输入连接模块时容易区分的标题。';
-    $lang->about_menu_management = "在此创建要在布局中使用的菜单。\n点击菜单前的文件夹图标可以展开收缩菜单。\n偶尔不能正常显示菜单时，请按\"更新缓冲\"按钮更新信息。\n* 不能正常显示指定级(层级)以上的菜单，创建菜单项的时候，请确认你要使用的布局究竟支持多少级别的菜单。";
-    $lang->about_menu_name = '输入不是图片按钮时显示为菜单名标题。';
-    $lang->about_menu_url = "点击菜单时要移动的URL。<br />连接其他模块时只输入id值即可。<br />没有内容时点击菜单也不会有什么动作。";
-    $lang->about_menu_open_window = '可以设置点击菜单时是否要在新窗口中打开。';
-    $lang->about_menu_expand = '使用树型（tree_menu.js）菜单时总是呈展开状态。';
-    $lang->about_menu_img_btn = '如登录图片按钮，在布局中自动替换显示为图片按钮。';
-    $lang->about_menu_group_srls = '如选择用户组，只有所属组用户才能看到此菜单。 —（xml文件中不能隐藏）';
-
-    $lang->about_menu = "菜单模块可以通过菜单管理器整理已生成的模块并同布局相连接来轻松建设一个完整的网站。\n菜单模块虽然具有连接模块和布局并通过布局来显示多种形态菜单的信息，但它不具备管理网站的功能。";
-
-    $lang->alert_image_only = "只允许图形文件。";
-?>
diff --git a/modules/menu/lang/zh-TW.lang.php b/modules/menu/lang/zh-TW.lang.php
deleted file mode 100644
index af91649ed..000000000
--- a/modules/menu/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-    /**
-     * @file   modules/menu/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  選單(menu) 模組正體中文語言
-     **/
-
-    $lang->cmd_menu_insert = '建立選單';
-    $lang->cmd_menu_management = '選單設置';
-
-    $lang->menu = '選單'; 
-    $lang->menu_count = '選單數';
-    $lang->menu_management = '選單管理';
-    $lang->depth = '層級';
-    $lang->parent_menu_name = '主選單名稱';
-    $lang->menu_name = '選單名稱';
-    $lang->menu_srl = '選單編號';
-    $lang->menu_id = '選單名稱';
-    $lang->menu_url = '連結';
-    $lang->menu_open_window = '新視窗';
-    $lang->menu_expand = '展開';
-    $lang->menu_img_btn = '圖片按鈕';
-    $lang->menu_normal_btn = '普通';
-    $lang->menu_hover_btn = '滑鼠移過';
-    $lang->menu_active_btn = '啟動連結';
-    $lang->menu_group_srls = '群組';
-    $lang->layout_maker = "版面作者";
-    $lang->layout_history = "更新列表";
-    $lang->layout_info = "版面資料";
-    $lang->layout_list = '版面列表';
-    $lang->downloaded_list = '版面選擇';
-    $lang->limit_menu_depth = '可顯示';
-
-    $lang->cmd_make_child = '新增子選單';
-    $lang->cmd_move_to_installed_list = "檢視建立列表";
-    $lang->cmd_enable_move_menu = "選單順序(勾選後可用滑鼠拖曳)";
-    $lang->cmd_search_mid = "尋找 mid";
-
-    $lang->msg_cannot_delete_for_child = '有子選單的選單不能刪除。';
-
-    $lang->about_title = '請輸入連接模組時，容易區分的標題。';
-    $lang->about_menu_management = "選單管理可以建構所選擇版面中使用的選單。\n不僅可以建構指定級(層級)選單，點擊輸入的選單名稱即可對其進行詳細設置。\n點擊選單前圖標可以展開選單。\n偶爾無法正常顯示選單時，請按\"重新建立暫存檔\"按鈕更新資料。\n* 可能無法正常顯示指定級(層級)以上的選單。";
-    $lang->about_menu_name = '輸入不是圖片按鈕時，顯示為選單名標題。';
-    $lang->about_menu_url = "按選單名稱後，要移往的網址。<br />連結其他模組時，只要輸入模組mid即可。<br />沒有內容時，點擊選單不會產生任何事情。";
-    $lang->about_menu_open_window = '按選單後，是否要以新視窗開啟。';
-    $lang->about_menu_expand = '使用樹型選單(tree_menu.js)時，總是呈現展開狀態。';
-    $lang->about_menu_img_btn = '如果登錄圖片按鈕，在版面中會自動替換顯示為圖片按鈕。';
-    $lang->about_menu_group_srls = '如果選擇群組，只有所屬群組才能看到此選單。(如果可直接連結xml檔案，內容將無法隱藏)';
-
-    $lang->about_menu = "選單模組可以透過選單管理器，管理已建立的模組並可和版面相互連結，輕鬆架設一個完整的網站。\n選單模組雖然可連結模組和版面，並透過版面來顯示多種類型的選單，但它不具備管理網站的功能。";
-
-    $lang->alert_image_only = "只允許圖形檔案。";
-?>
diff --git a/modules/menu/menu.admin.controller.php b/modules/menu/menu.admin.controller.php
index 1084dc426..696c04416 100644
--- a/modules/menu/menu.admin.controller.php
+++ b/modules/menu/menu.admin.controller.php
@@ -1,654 +1,946 @@
-<?php
-    /**
-     * @class  menuAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  menu 모듈의 admin controller class
-     **/
-
-    class menuAdminController extends menu {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 메뉴 추가
-         **/
-        function procMenuAdminInsert() {
-            // 입력할 변수 정리
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $args->title = Context::get('title');
-            $args->menu_srl = getNextSequence();
-            $args->listorder = $args->menu_srl * -1;
-
-            $output = executeQuery('menu.insertMenu', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->add('menu_srl', $args->menu_srl);
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 메뉴 제목 변경
-         **/
-        function procMenuAdminUpdate() {
-            // 입력할 변수 정리
-            $args->title = Context::get('title');
-            $args->menu_srl = Context::get('menu_srl');
-
-            $output = executeQuery('menu.updateMenu', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 메뉴 삭제
-         * menu_item과 xml 캐시 파일 모두 삭제
-         **/
-        function procMenuAdminDelete() {
-            $menu_srl = Context::get('menu_srl');
-            return $this->deleteMenu($menu_srl);
-        }
-        
-        function deleteMenu($menu_srl) {
-            // 캐시 파일 삭제
-            $cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
-            if(count($cache_list)) {
-                foreach($cache_list as $cache_file) {
-                    $pos = strpos($cache_file, $menu_srl.'_');
-                    if($pos>0)FileHandler::removeFile($cache_file);
-                }
-            }
-
-            // 이미지 버튼 모두 삭제
-            $image_path = sprintf('./files/attach/menu_button/%s', $menu_srl);
-            FileHandler::removeDir($image_path);
-
-            $args->menu_srl = $menu_srl;
-
-            // 메뉴 메뉴 삭제
-            $output = executeQuery("menu.deleteMenuItems", $args);
-            if(!$output->toBool()) return $output;
-
-            // 메뉴 삭제
-            $output = executeQuery("menu.deleteMenu", $args);
-            if(!$output->toBool()) return $output;
-
-            return new Object(0,'success_deleted');
-        }
-
-        /**
-         * @brief 메뉴에 아이템 추가
-         **/
-        function procMenuAdminInsertItem() {
-            // 입력할 변수 정리
-            $source_args = Context::getRequestVars();
-            unset($source_args->module);
-            unset($source_args->act);
-            if($source_args->menu_open_window!="Y") $source_args->menu_open_window = "N";
-            if($source_args->menu_expand !="Y") $source_args->menu_expand = "N";
-            $source_args->group_srls = str_replace('|@|',',',$source_args->group_srls);
-            $source_args->parent_srl = (int)$source_args->parent_srl;
-
-            // 변수를 다시 정리 (form문의 column과 DB column이 달라서)
-            $args->menu_srl = $source_args->menu_srl;
-            $args->menu_item_srl = $source_args->menu_item_srl;
-            $args->parent_srl = $source_args->parent_srl;
-            $args->menu_srl = $source_args->menu_srl;
-            $args->menu_id = $source_args->menu_id;
-            $args->name = $source_args->menu_name;
-            $args->url = trim($source_args->menu_url);
-            $args->open_window = $source_args->menu_open_window;
-            $args->expand = $source_args->menu_expand;
-            $args->normal_btn = $source_args->normal_btn;
-            $args->hover_btn = $source_args->hover_btn;
-            $args->active_btn = $source_args->active_btn;
-            $args->group_srls = $source_args->group_srls;
-
-            // 이미 존재하는지를 확인
-            $oMenuModel = &getAdminModel('menu');
-            $item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
-
-            // 존재하게 되면 update를 해준다
-            if($item_info->menu_item_srl == $args->menu_item_srl) {
-                $output = executeQuery('menu.updateMenuItem', $args);
-                if(!$output->toBool()) return $output;
-
-            // 존재하지 않으면 insert를 해준다
-            } else {
-                $args->listorder = -1*$args->menu_item_srl;
-                $output = executeQuery('menu.insertMenuItem', $args);
-                if(!$output->toBool()) return $output;
-            }
-
-            // 해당 메뉴의 정보를 구함
-            $menu_info = $oMenuModel->getMenu($args->menu_srl);
-            $menu_title = $menu_info->title;
-
-            // XML 파일을 갱신하고 위치을 넘겨 받음
-            $xml_file = $this->makeXmlFile($args->menu_srl);
-
-            // url이 mid일 경우 기록 남김
-            if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $args->url)) {
-                $mid = $args->url;
-
-                $mid_args->menu_srl = $args->menu_srl;
-                $mid_args->mid = $mid;
-
-                // menu_srl에 해당하는 레이아웃 값을 구함
-                $output = executeQuery('menu.getMenuLayout', $args);
-
-                // 해당 모듈에 레이아웃 값이 정해져 있지 않으면 지정
-                $oModuleModel = &getModel('module');
-                $module_info = $oModuleModel->getModuleInfoByMid($mid);
-                if(!$module_info->layout_srl&&$output->data->layout_srl) $mid_args->layout_srl = $output->data->layout_srl;
-
-                // 해당 mid의 메뉴값을 선택된 메뉴로 변경
-                $oModuleController = &getController('module');
-                $oModuleController->updateModuleMenu($mid_args);
-            }
-
-            $this->add('xml_file', $xml_file);
-            $this->add('menu_srl', $args->menu_srl);
-            $this->add('menu_item_srl', $args->menu_item_srl);
-            $this->add('menu_title', $menu_title);
-            $this->add('parent_srl', $args->parent_srl);
-        }
-
-        /**
-         * @brief 메뉴 메뉴 삭제
-         **/
-        function procMenuAdminDeleteItem() {
-            // 변수 정리
-            $args = Context::gets('menu_srl','menu_item_srl');
-
-            $oMenuAdminModel = &getAdminModel('menu');
-
-            // 원정보를 가져옴
-            $item_info = $oMenuAdminModel->getMenuItemInfo($args->menu_item_srl);
-            if($item_info->parent_srl) $parent_srl = $item_info->parent_srl;
-
-            // 자식 노드가 있는지 체크하여 있으면 삭제 못한다는 에러 출력
-            $output = executeQuery('menu.getChildMenuCount', $args);
-            if(!$output->toBool()) return $output;
-            if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child');
-
-            // DB에서 삭제
-            $output = executeQuery("menu.deleteMenuItem", $args);
-            if(!$output->toBool()) return $output;
-
-            // 해당 메뉴의 정보를 구함
-            $menu_info = $oMenuAdminModel->getMenu($args->menu_srl);
-            $menu_title = $menu_info->title;
-
-            // XML 파일을 갱신하고 위치을 넘겨 받음
-            $xml_file = $this->makeXmlFile($args->menu_srl);
-
-            // 이미지 버튼 모두 삭제
-            if($item_info->normal_btn) FileHandler::removeFile($item_info->normal_btn);
-            if($item_info->hover_btn) FileHandler::removeFile($item_info->hover_btn);
-            if($item_info->active_btn) FileHandler::removeFile($item_info->active_btn);
-
-            $this->add('xml_file', $xml_file);
-            $this->add('menu_title', $menu_title);
-            $this->add('menu_item_srl', $parent_srl);
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 메뉴의 메뉴를 이동
-         **/
-        function procMenuAdminMoveItem() {
-            $menu_srl = Context::get('menu_srl');
-            $mode = Context::get('mode');
-            $parent_srl = Context::get('parent_srl');
-            $source_srl = Context::get('source_srl');
-            $target_srl = Context::get('target_srl');
-
-            if(!$menu_srl || !$mode || !$target_srl) return new Object(-1,'msg_invalid_request');
-            $this->moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode);
-        }
-
-        function moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode){
-            // 원본 메뉴들을 구함
-            $oMenuAdminModel = &getAdminModel('menu');
-
-            $target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
-            if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
-
-            // 위치 이동 (순서 조절)
-            if($mode == 'move') {
-                $args->parent_srl = $parent_srl;
-                $args->menu_srl = $menu_srl;
-
-                if($source_srl) {
-                    $source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
-                    if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
-                    $args->listorder = $source_item->listorder-1;
-                }  else {
-                    $output = executeQuery('menu.getMaxListorder', $args);
-                    if(!$output->toBool()) return $output;
-                    $args->listorder = (int)$output->data->listorder;
-                    if(!$args->listorder) $args->listorder= 0;
-                }
-                $args->parent_srl = $parent_srl;
-                $output = executeQuery('menu.updateMenuItemListorder', $args);
-                if(!$output->toBool()) return $output;
-
-                $args->parent_srl = $parent_srl;
-                $args->menu_item_srl = $target_srl;
-                $output = executeQuery('menu.updateMenuItemNode', $args);
-                if(!$output->toBool()) return $output;
-            // 자식으로 추가
-            } elseif($mode == 'insert') {
-                $args->menu_item_srl = $target_srl;
-                $args->parent_srl = $parent_srl;
-                $args->listorder = -1*getNextSequence();
-                $output = executeQuery('menu.updateMenuItemNode', $args);
-                if(!$output->toBool()) return $output;
-            }
-
-            $xml_file = $this->makeXmlFile($menu_srl);
-            return $xml_file;
-        }
-
-        /**
-         * @brief xml 파일을 갱신
-         * 관리자페이지에서 메뉴 구성 후 간혹 xml파일이 재생성 안되는 경우가 있는데\n
-         * 이럴 경우 관리자의 수동 갱신 기능을 구현해줌\n
-         * 개발 중간의 문제인 것 같고 현재는 문제가 생기지 않으나 굳이 없앨 필요 없는 기능
-         **/
-        function procMenuAdminMakeXmlFile() {
-            // 입력값을 체크
-            $menu_srl = Context::get('menu_srl');
-
-            // 해당 메뉴의 정보를 구함
-            $oMenuAdminModel = &getAdminModel('menu');
-            $menu_info = $oMenuAdminModel->getMenu($menu_srl);
-            $menu_title = $menu_info->title;
-
-            // xml파일 재생성
-            $xml_file = $this->makeXmlFile($menu_srl);
-
-            // return 값 설정
-            $this->add('menu_title',$menu_title);
-            $this->add('xml_file',$xml_file);
-        }
-
-        /**
-         * @brief 메뉴 이미지 버튼을 등록
-         **/
-        function procMenuAdminUploadButton() {
-            $menu_srl = Context::get('menu_srl');
-            $menu_item_srl = Context::get('menu_item_srl');
-            $target = Context::get('target');
-            $target_file = Context::get($target);
-
-            // 필수 요건이 없거나 업로드된 파일이 아니면 오류 발생
-            if(!$menu_srl || !$menu_item_srl || !$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)/i',$target_file['name'])) {
-                Context::set('error_messge', Context::getLang('msg_invalid_request'));
-
-            // 요건을 만족하고 업로드된 파일이면 지정된 위치로 이동
-            } else {
-                $tmp_arr = explode('.',$target_file['name']);
-                $ext = $tmp_arr[count($tmp_arr)-1];
-
-                $path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
-                $filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
-
-                if(!is_dir($path)) FileHandler::makeDir($path);
-
-                move_uploaded_file($target_file['tmp_name'], $filename);
-                Context::set('filename', $filename);
-            }
-
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('menu_file_uploaded');
-        }
-
-        /**
-         * @brief 등록된 메뉴 이미지 제거
-         **/
-        function procMenuAdminDeleteButton() {
-            $menu_srl = Context::get('menu_srl');
-            $menu_item_srl = Context::get('menu_item_srl');
-            $target = Context::get('target');
-            $filename = Context::get('filename');
-            FileHandler::removeFile($filename);
-
-            $this->add('target', $target);
-        }
-
-        /**
-         * @brief 메뉴의 xml 파일을 만들고 위치를 return
-         **/
-        function makeXmlFile($menu_srl) {
-            // xml파일 생성시 필요한 정보가 없으면 그냥 return
-            if(!$menu_srl) return;
-
-            // 메뉴 정보를 구함
-            $args->menu_srl = $menu_srl;
-            $output = executeQuery('menu.getMenu', $args);
-            if(!$output->toBool() || !$output->data) return $output;
-            $site_srl = (int)$output->data->site_srl;
-
-            if($site_srl) {
-                $oModuleModel = &getModel('module');
-                $site_info = $oModuleModel->getSiteInfo($site_srl);
-                $domain = $site_info->domain;
-            }
-
-            // DB에서 menu_srl에 해당하는 메뉴 아이템 목록을 listorder순으로 구해옴
-            $args->menu_srl = $menu_srl;
-            $args->sort_index = 'listorder';
-            $output = executeQuery('menu.getMenuItems', $args);
-            if(!$output->toBool()) return;
-
-            // 캐시 파일의 이름을 지정
-            $xml_file = sprintf("./files/cache/menu/%s.xml.php", $menu_srl);
-            $php_file = sprintf("./files/cache/menu/%s.php", $menu_srl);
-
-            // 구해온 데이터가 없다면 노드데이터가 없는 xml 파일만 생성
-            $list = $output->data;
-            if(!$list) {
-                $xml_buff = "<root />";
-                FileHandler::writeFile($xml_file, $xml_buff);
-                FileHandler::writeFile($php_file, '<?php if(!defined("__ZBXE__")) exit(); ?>');
-                return $xml_file;
-            }
-
-            // 구해온 데이터가 하나라면 array로 바꾸어줌
-            if(!is_array($list)) $list = array($list);
-
-            // 루프를 돌면서 tree 구성
-            $list_count = count($list);
-            for($i=0;$i<$list_count;$i++) {
-                $node = $list[$i];
-                $menu_item_srl = $node->menu_item_srl;
-                $parent_srl = $node->parent_srl;
-
-                $tree[$parent_srl][$menu_item_srl] = $node;
-            }
-
-            // 캐시 파일의 권한과 그룹 설정을 위한 공통 헤더
-            $header_script =
-                '$lang_type = Context::getLangType(); '.
-                '$is_logged = Context::get(\'is_logged\'); '.
-                '$logged_info = Context::get(\'logged_info\'); '.
-                '$site_srl = '.$site_srl.';'.
-                '$site_admin = false;'.
-                'if($site_srl) { '.
-                '$oModuleModel = &getModel(\'module\');'.
-                '$site_module_info = $oModuleModel->getSiteInfo($site_srl); '.
-                'Context::set(\'site_module_info\',$site_module_info);'.
-                '$grant = $oModuleModel->getGrant($site_module_info, $logged_info); '.
-                'if($grant->manager ==1) $site_admin = true;'.
-                '}'.
-                'if($is_logged) {'.
-                    'if($logged_info->is_admin=="Y" || $site_admin) $is_admin = true; '.
-                    'else $is_admin = false; '.
-                    '$group_srls = array_keys($logged_info->group_list); '.
-                '} else { '.
-                    '$is_admin = false; '.
-                    '$group_srsl = array(); '.
-                '} ';
-
-            // xml 캐시 파일 생성 (xml캐시는 따로 동작하기에 session 지정을 해주어야 함)
-            $xml_buff = sprintf(
-                '<?php '.
-                'define(\'__ZBXE__\', true); '.
-                'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
-                '$oContext = &Context::getInstance(); '.
-                '$oContext->init(); '.
-                'header("Content-Type: text/xml; charset=UTF-8"); '.
-                'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
-                'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
-                'header("Cache-Control: no-store, no-cache, must-revalidate"); '.
-                'header("Cache-Control: post-check=0, pre-check=0", false); '.
-                'header("Pragma: no-cache"); '.
-                '%s '.
-                '$oContext->close(); '.
-                '?>'.
-                '<root>%s</root>',
-                $header_script,
-                $this->getXmlTree($tree[0], $tree, $site_srl, $domain)
-            );
-
-            // php 캐시 파일 생성
-            $php_output = $this->getPhpCacheCode($tree[0], $tree, $site_srl, $domain);
-            $php_buff = sprintf(
-                '<?php '.
-                'if(!defined("__ZBXE__")) exit(); '.
-                '%s; '.
-                '%s; '.
-                '$menu->list = array(%s); '.
-                '?>',
-                $header_script,
-                $php_output['name'],
-                $php_output['buff']
-            );
-
-            // 파일 저장
-            FileHandler::writeFile($xml_file, $xml_buff);
-            FileHandler::writeFile($php_file, $php_buff);
-            return $xml_file;
-        }
-
-        /**
-         * @brief array로 정렬된 노드들을 parent_srl을 참조하면서 recursive하게 돌면서 xml 데이터 생성
-         * 메뉴 xml파일은 node라는 tag가 중첩으로 사용되며 이 xml doc으로 관리자 페이지에서 메뉴를 구성해줌\n
-         * (tree_menu.js 에서 xml파일을 바로 읽고 tree menu를 구현)
-         **/
-        function getXmlTree($source_node, $tree, $site_srl, $domain) {
-            if(!$source_node) return;
-
-            $oMenuAdminModel = &getAdminModel('menu');
-
-            foreach($source_node as $menu_item_srl => $node) {
-                $child_buff = "";
-
-                // 자식 노드의 데이터 가져옴
-                if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
-
-                // 변수 정리
-                $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
-                foreach($names as $key => $val) {
-                    $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace('\\','\\\\',htmlspecialchars($val)));
-                }
-                $name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
-
-                $url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-                if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url)) {
-                    $href = getSiteUrl($domain, '','mid',$node->url);
-                    $pos = strpos($href, $_SERVER['HTTP_HOST']);
-                    if($pos !== false) $href = substr($href, $pos+strlen($_SERVER['HTTP_HOST']));
-                } else $href = $url;
-                $open_window = $node->open_window;
-                $expand = $node->expand;
-
-                $normal_btn = $node->normal_btn;
-                if($normal_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$normal_btn)) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-                else $normal_btn = '';
-                $hover_btn = $node->hover_btn;
-                if($hover_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$hover_btn)) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-                else $hover_btn = '';
-                $active_btn = $node->active_btn;
-                if($active_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$active_btn)) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-                else $active_btn = '';
-
-                $group_srls = $node->group_srls;
-
-                if($normal_btn) {
-                    if(preg_match('/\.png$/',$normal_btn)) $classname = 'class=&quot;iePngFix&quot;';
-                    else $classname = '';
-                    if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
-                    if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
-                    $link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type]) ?>&quot; %s %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str, $classname);
-                } else {
-                    $link = '<?php print $_names[$lang_type]; ?>';
-                }
-
-                // node->group_srls값이 있으면
-                if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
-                else $group_check_code = "true";
-                $attribute = sprintf(
-                    'node_srl="%s" parent_srl="%s" text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?"%s":"")?>" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
-                    $menu_item_srl,
-                    $node->parent_srl,
-                    $group_check_code,
-                    $name_str,
-                    $group_check_code,
-                    $url,
-                    $group_check_code,
-                    $href,
-                    $open_window,
-                    $expand,
-                    $normal_btn,
-                    $hover_btn,
-                    $active_btn,
-                    $group_check_code,
-                    $link
-                );
-
-                if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
-                else $buff .=  sprintf('<node %s />', $attribute);
-            }
-            return $buff;
-        }
-
-        /**
-         * @brief array로 정렬된 노드들을 php code로 변경하여 return
-         * 메뉴에서 메뉴를 tpl에 사용시 xml데이터를 사용할 수도 있지만 별도의 javascript 사용이 필요하기에
-         * php로 된 캐시파일을 만들어서 db이용없이 바로 메뉴 정보를 구할 수 있도록 한다
-         * 이 캐시는 ModuleHandler::displayContent() 에서 include하여 Context::set() 한다
-         **/
-        function getPhpCacheCode($source_node, $tree, $site_srl, $domain) {
-            $output = array("buff"=>"", "url_list"=>array());
-            if(!$source_node) return $output;
-
-            $oMenuAdminModel = &getAdminModel('menu');
-
-            foreach($source_node as $menu_item_srl => $node) {
-                // 자식 노드가 있으면 자식 노드의 데이터를 먼저 얻어옴
-                if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
-                else $child_output = array("buff"=>"", "url_list"=>array());
-
-                // 변수 정리
-                $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
-                foreach($names as $key => $val) {
-                    $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace(array('\\','"'),array('\\\\','&quot;'),$val));
-                }
-                $name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
-
-                // 현재 노드의 url값이 공란이 아니라면 url_list 배열값에 입력
-                if($node->url) $child_output['url_list'][] = $node->url;
-                $output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
-
-                // node->group_srls값이 있으면
-                if($node->group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
-                else $group_check_code = "true";
-
-                // 변수 정리
-                $href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
-                $url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
-                if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url)) {
-                    $href = getSiteUrl($domain, '','mid',$node->url);
-                    $pos = strpos($href, $_SERVER['HTTP_HOST']);
-                    if($pos !== false) $href = substr($href, $pos+strlen($_SERVER['HTTP_HOST']));
-                } else $href = $url;
-                $open_window = $node->open_window;
-                $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
-                $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->hover_btn);
-                $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->active_btn);
-                $selected = '"'.implode('","',$child_output['url_list']).'"';
-                $child_buff = $child_output['buff'];
-                $expand = $node->expand;
-
-                $normal_btn = $node->normal_btn;
-                if($normal_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$normal_btn)) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
-                else $normal_btn = '';
-
-                $hover_btn = $node->hover_btn;
-                if($hover_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$hover_btn)) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
-                else $hover_btn = '';
-
-                $active_btn = $node->active_btn;
-                if($active_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$active_btn)) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
-                else $active_btn = '';
-
-                $group_srls = $node->group_srls;
-
-                if($normal_btn) {
-                    if(preg_match('/\.png$/',$normal_btn)) $classname = 'class=\"iePngFix\"';
-                    else $classname = '';
-                    if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
-                    if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
-                    $link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str, $classname);
-                    if($active_btn) $link_active = sprintf('"<img src=\"%s\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $node->menu_item_srl, $classname);
-                    else $link_active = $link;
-                } else {
-                    $link_active = $link = sprintf('$_menu_names[%d][$lang_type]', $node->menu_item_srl);
-                }
-
-                // 속성을 생성한다 ( url_list를 이용해서 선택된 메뉴의 노드에 속하는지를 검사한다. 꽁수지만 빠르고 강력하다고 생각;;)
-                $attribute = sprintf(
-                    '"node_srl"=>"%s","parent_srl"=>"%s","text"=>(%s?$_menu_names[%d][$lang_type]:""),"href"=>(%s?"%s":""),"url"=>(%s?"%s":""),"open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(array(%s)&&in_array(Context::get("mid"),array(%s))?1:0),"expand"=>"%s", "list"=>array(%s),  "link"=>(%s? ( array(%s)&&in_array(Context::get("mid"),array(%s)) ?%s:%s):""),',
-                    $node->menu_item_srl,
-                    $node->parent_srl,
-                    $group_check_code,
-                    $node->menu_item_srl,
-                    $group_check_code,
-                    $href,
-                    $group_check_code,
-                    $url,
-                    $open_window,
-                    $normal_btn,
-                    $hover_btn,
-                    $active_btn,
-                    $selected,
-                    $selected,
-                    $expand,
-                    $child_buff,
-                    $group_check_code,
-                    $selected,
-                    $selected,
-                    $link_active,
-                    $link
-                );
-
-                // buff 데이터를 생성한다
-                $output['buff'] .=  sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
-                $output['name'] .= $name_str;
-            }
-            return $output;
-        }
-
-        /**
-         * @brief 메뉴와 레이아웃 매핑
-         * 레이아웃에서 메뉴를 지정할때 지정된 메뉴의 기본 레이아웃을 매핑
-         **/
-        function updateMenuLayout($layout_srl, $menu_srl_list) {
-            if(!count($menu_srl_list)) return;
-
-            // 일단 menu_srls의 값을 지움
-            $args->menu_srls = implode(',',$menu_srl_list);
-            $output = executeQuery('menu.deleteMenuLayout', $args);
-            if(!$output->toBool()) return $output;
-
-            $args->layout_srl = $layout_srl;
-
-            // menu_srls, layout_srl 매핑
-            for($i=0;$i<count($menu_srl_list);$i++) {
-                $args->menu_srl = $menu_srl_list[$i];
-                $output = executeQuery('menu.insertMenuLayout', $args);
-                if(!$output->toBool()) return $output;
-            }
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  menuAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief  admin controller class of the menu module
+     **/
+
+    class menuAdminController extends menu {
+		var $menuSrl = null;
+		var $itemKeyList = array();
+		var $map = array();
+		var $checked = array();
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Add a menu
+         **/
+        function procMenuAdminInsert() {
+            // List variables
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->title = Context::get('title');
+            $args->menu_srl = getNextSequence();
+            $args->listorder = $args->menu_srl * -1;
+
+            $output = executeQuery('menu.insertMenu', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->add('menu_srl', $args->menu_srl);
+            $this->setMessage('success_registed');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminContent');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Change the menu title
+         **/
+        function procMenuAdminUpdate() {
+            // List variables
+            $args->title = Context::get('title');
+            $args->menu_srl = Context::get('menu_srl');
+
+            $output = executeQuery('menu.updateMenu', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_registed');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Delete menu
+         * Delete menu_item and xml cache files
+         **/
+        function procMenuAdminDelete() {
+            $menu_srl = Context::get('menu_srl');
+
+			$oMenuAdminModel = &getAdminModel('menu');
+			$menu_info = $oMenuAdminModel->getMenu($menu_srl);
+
+			if($menu_info->title == '__XE_ADMIN__')
+				return new Object(-1, 'msg_adminmenu_cannot_delete');
+
+            $this->deleteMenu($menu_srl);
+
+			$this->setMessage('success_deleted', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        function deleteMenu($menu_srl) {
+            // Delete cache files
+            $cache_list = FileHandler::readDir("./files/cache/menu","",false,true);
+            if(count($cache_list)) {
+                foreach($cache_list as $cache_file) {
+                    $pos = strpos($cache_file, $menu_srl.'.');
+                    if($pos>0)FileHandler::removeFile($cache_file);
+                }
+            }
+            // Delete images of menu buttons
+            $image_path = sprintf('./files/attach/menu_button/%s', $menu_srl);
+            FileHandler::removeDir($image_path);
+
+            $args->menu_srl = $menu_srl;
+            // Delete menu items
+            $output = executeQuery("menu.deleteMenuItems", $args);
+            if(!$output->toBool()) return $output;
+            // Delete the menu
+            $output = executeQuery("menu.deleteMenu", $args);
+            if(!$output->toBool()) return $output;
+
+            return new Object(0,'success_deleted');
+        }
+
+        /**
+         * @brief Add an item to the menu
+         **/
+        function procMenuAdminInsertItem() {
+            // List variables to insert
+            $source_args = Context::getRequestVars();
+            unset($source_args->module);
+            unset($source_args->act);
+            if($source_args->menu_open_window!="Y") $source_args->menu_open_window = "N";
+            if($source_args->menu_expand !="Y") $source_args->menu_expand = "N";
+            if(!is_array($source_args->group_srls)) $source_args->group_srls = str_replace('|@|',',',$source_args->group_srls);
+			else $source_args->group_srls = implode(',', $source_args->group_srls);
+            $source_args->parent_srl = (int)$source_args->parent_srl;
+
+			if($source_args->cType == 'CREATE') $source_args->menu_url = $source_args->create_menu_url;
+			else if($source_args->cType == 'SELECT') $source_args->menu_url = $source_args->select_menu_url;
+
+			// upload button
+			$btnOutput = $this->_uploadButton($source_args);
+
+            // Re-order variables (Column's order is different between form and DB)
+            $args->menu_srl = $source_args->menu_srl;
+            $args->menu_item_srl = $source_args->menu_item_srl;
+            $args->parent_srl = $source_args->parent_srl;
+            $args->menu_srl = $source_args->menu_srl;
+            $args->menu_id = $source_args->menu_id;
+
+			if ($source_args->menu_name_key)
+	            $args->name = $source_args->menu_name_key;
+			else
+				$args->name = $source_args->menu_name;
+
+            $args->url = trim($source_args->menu_url);
+            $args->open_window = $source_args->menu_open_window;
+            $args->expand = $source_args->menu_expand;
+            if($btnOutput['normal_btn']) $args->normal_btn = $btnOutput['normal_btn'];
+            if($btnOutput['hover_btn']) $args->hover_btn = $btnOutput['hover_btn'];
+            if($btnOutput['active_btn']) $args->active_btn = $btnOutput['active_btn'];
+            $args->group_srls = $source_args->group_srls;
+
+			// if cType is CREATE, create module
+			if($source_args->cType == 'CREATE')
+			{
+				$site_module_info = Context::get('site_module_info');
+				$cmArgs->site_srl = (int)$site_module_info->site_srl;
+				$cmArgs->mid = $source_args->create_menu_url;
+				$cmArgs->browser_title = $args->name;
+
+				switch ($source_args->module_type){
+					case 'WIDGET' :
+					case 'ARTICLE' :
+					case 'OUTSIDE' :
+						$cmArgs->module = 'page';
+						$cmArgs->page_type = $source_args->module_type;
+						break;
+					default:
+						$cmArgs->module = $source_args->module_type;
+						unset($cmArgs->page_type);
+				}
+
+				$cmArgs->menu_srl = $source_args->menu_srl;
+                $oModuleController = &getController('module');
+				$output = $oModuleController->insertModule($cmArgs);
+				if(!$output->toBool()) return new Object(-1, $output->message);
+			}
+
+            // Check if already exists
+            $oMenuModel = &getAdminModel('menu');
+            $item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
+
+			// button is deleted, db delete
+			if($source_args->isNormalDelete == 'Y') $args->normal_btn = '';
+			if($source_args->isHoverDelete == 'Y') $args->hover_btn = '';
+			if($source_args->isActiveDelete == 'Y') $args->active_btn = '';
+
+			$message = '';
+            // Update if exists
+            if(!empty($args->menu_item_srl) && $item_info->menu_item_srl == $args->menu_item_srl) {
+                $output = executeQuery('menu.updateMenuItem', $args);
+                if(!$output->toBool()) return $output;
+				$message = 'success_updated';
+            // Insert if not exist
+            } else {
+				if(!$args->menu_item_srl) $args->menu_item_srl = getNextSequence();
+                $args->listorder = -1*$args->menu_item_srl;
+                $output = executeQuery('menu.insertMenuItem', $args);
+                if(!$output->toBool()) return $output;
+				$message = 'success_registed';
+            }
+            // Get information of the menu
+            $menu_info = $oMenuModel->getMenu($args->menu_srl);
+            $menu_title = $menu_info->title;
+            // Update the xml file and get its location
+            $xml_file = $this->makeXmlFile($args->menu_srl);
+            // If a new menu item that mid is URL is added, the current layout is applied
+            if(preg_match('/^([a-zA-Z0-9\_\-]+)$/', $args->url)) {
+                $mid = $args->url;
+
+                $mid_args->menu_srl = $args->menu_srl;
+                $mid_args->mid = $mid;
+                // Get layout value of menu_srl
+                $output = executeQuery('menu.getMenuLayout', $args);
+                // Set if layout value is not specified in the module
+                $oModuleModel = &getModel('module');
+				$columnList = array('layout_srl');
+                $module_info = $oModuleModel->getModuleInfoByMid($mid, 0, $columnList);
+                if(!$module_info->layout_srl&&$output->data->layout_srl) $mid_args->layout_srl = $output->data->layout_srl;
+                // Change menu value of the mid to the menu
+                $oModuleController = &getController('module');
+                $oModuleController->updateModuleMenu($mid_args);
+            }
+
+            $this->add('xml_file', $xml_file);
+            $this->add('menu_srl', $args->menu_srl);
+            $this->add('menu_item_srl', $args->menu_item_srl);
+            $this->add('menu_title', $menu_title);
+            $this->add('parent_srl', $args->parent_srl);
+
+			$this->setMessage($message, 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap', 'menu_srl', $args->menu_srl);
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Delete menu item(menu of the menu)
+         **/
+        function procMenuAdminDeleteItem() {
+            // List variables
+            $args = Context::gets('menu_srl','menu_item_srl');
+
+            $oMenuAdminModel = &getAdminModel('menu');
+
+            // Get information of the menu
+            $menu_info = $oMenuAdminModel->getMenu($args->menu_srl);
+            $menu_title = $menu_info->title;
+
+            // Get original information
+            $item_info = $oMenuAdminModel->getMenuItemInfo($args->menu_item_srl);
+
+			if($menu_title == '__XE_ADMIN__' && $item_info->parent_srl == 0)return $this->stop('msg_cannot_delete_for_admin_topmenu');
+
+            if($item_info->parent_srl) $parent_srl = $item_info->parent_srl;
+            // Display an error that the category cannot be deleted if it has a child node
+            $output = executeQuery('menu.getChildMenuCount', $args);
+            if(!$output->toBool()) return $output;
+            if($output->data->count>0) return new Object(-1, 'msg_cannot_delete_for_child');
+            // Remove from the DB
+            $output = executeQuery("menu.deleteMenuItem", $args);
+            if(!$output->toBool()) return $output;
+            // Update the xml file and get its location
+            $xml_file = $this->makeXmlFile($args->menu_srl);
+            // Delete all of image buttons
+            if($item_info->normal_btn) FileHandler::removeFile($item_info->normal_btn);
+            if($item_info->hover_btn) FileHandler::removeFile($item_info->hover_btn);
+            if($item_info->active_btn) FileHandler::removeFile($item_info->active_btn);
+
+            $this->add('xml_file', $xml_file);
+            $this->add('menu_title', $menu_title);
+            $this->add('menu_item_srl', $parent_srl);
+            $this->setMessage('success_deleted');
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Move menu items
+         **/
+        function procMenuAdminMoveItem() {
+            $menu_srl = Context::get('menu_srl');
+            $mode = Context::get('mode');
+            $parent_srl = Context::get('parent_srl');
+            $source_srl = Context::get('source_srl');
+            $target_srl = Context::get('target_srl');
+
+            if(!$menu_srl || !$mode || !$target_srl) return new Object(-1,'msg_invalid_request');
+            $this->moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode);
+        }
+
+        /**
+         * @brief Arrange menu items
+         **/
+		function procMenuAdminArrangeItem()
+		{
+			$this->menuSrl = Context::get('menu_srl');
+            $args->title = Context::get('title');
+			$parentKeyList = Context::get('parent_key');
+			$this->itemKeyList = Context::get('item_key');
+
+			// menu name update
+            $args->menu_srl = $this->menuSrl;
+            $output = executeQuery('menu.updateMenu', $args);
+            if(!$output->toBool()) return $output;
+
+			$this->map = array();
+			if(is_array($parentKeyList))
+			{
+				foreach($parentKeyList as $no=>$srl)
+				{
+					if ($srl === 0) continue;
+					if (!is_array($this->map[$srl]))$this->map[$srl] = array();
+					$this->map[$srl][] = $no;
+				}
+			}
+
+			$result = array();
+			if(is_array($this->itemKeyList))
+			{
+				foreach($this->itemKeyList as $srl)
+				{
+					if (!$this->checked[$srl]){
+						unset($target);
+						$this->checked[$srl] = 1;
+						$target->node = $srl;
+						$target->child= array();
+
+						while(count($this->map[$srl])){
+							$this->_setParent($srl, array_shift($this->map[$srl]), $target);
+						}
+						$result[] = $target;
+					}
+				}
+			}
+
+			if(is_array($result))
+			{
+				$i = 0;
+				foreach($result AS $key=>$node)
+				{
+					$this->moveMenuItem($this->menuSrl, 0, $i, $node->node, 'move');	//move parent node
+					$this->_recursiveMoveMenuItem($node);	//move child node
+					$i = $node->node;
+				}
+			}
+
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMenuAdminManagement', 'menu_srl', $args->menu_srl);
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+		}
+
+		function _setParent($parent_srl, $child_index, &$target)
+		{
+			$child_srl = $this->itemKeyList[$child_index];
+			$this->checked[$child_srl] = 1;
+
+			$child_node->node = $child_srl;
+			$child_node->parent_node = $parent_srl;
+			$child_node->child = array();
+			$target->child[] = $child_node;
+
+			while(count($this->map[$child_srl])){
+				$this->_setParent($child_srl, array_shift($this->map[$child_srl]), $child_node);
+			}
+			//return $target;
+		}
+
+		function _recursiveMoveMenuItem($result)
+		{
+			$i = 0;
+			while(count($result->child))
+			{
+				unset($node);
+				$node = array_shift($result->child);
+
+				$this->moveMenuItem($this->menuSrl, $node->parent_node, $i, $node->node, 'move');
+				$this->_recursiveMoveMenuItem($node);
+				$i = $node->node;
+			}
+		}
+
+        function moveMenuItem($menu_srl,$parent_srl,$source_srl,$target_srl,$mode){
+            // Get the original menus
+            $oMenuAdminModel = &getAdminModel('menu');
+
+            $target_item = $oMenuAdminModel->getMenuItemInfo($target_srl);
+            if($target_item->menu_item_srl != $target_srl) return new Object(-1,'msg_invalid_request');
+            // Move the menu location(change the order menu appears)
+            if($mode == 'move') {
+                $args->parent_srl = $parent_srl;
+                $args->menu_srl = $menu_srl;
+
+                if($source_srl) {
+                    $source_item = $oMenuAdminModel->getMenuItemInfo($source_srl);
+                    if($source_item->menu_item_srl != $source_srl) return new Object(-1,'msg_invalid_request');
+                    $args->listorder = $source_item->listorder-1;
+                }  else {
+                    $output = executeQuery('menu.getMaxListorder', $args);
+                    if(!$output->toBool()) return $output;
+                    $args->listorder = (int)$output->data->listorder;
+                    if(!$args->listorder) $args->listorder= 0;
+                }
+                $args->parent_srl = $parent_srl;
+                $output = executeQuery('menu.updateMenuItemListorder', $args);
+                if(!$output->toBool()) return $output;
+
+                $args->parent_srl = $parent_srl;
+                $args->menu_item_srl = $target_srl;
+                $output = executeQuery('menu.updateMenuItemNode', $args);
+                if(!$output->toBool()) return $output;
+            // Add a child
+            } elseif($mode == 'insert') {
+                $args->menu_item_srl = $target_srl;
+                $args->parent_srl = $parent_srl;
+                $args->listorder = -1*getNextSequence();
+                $output = executeQuery('menu.updateMenuItemNode', $args);
+                if(!$output->toBool()) return $output;
+            }
+
+            $xml_file = $this->makeXmlFile($menu_srl);
+            return $xml_file;
+        }
+
+        /**
+         * @brief Update xml file
+         * XML file is not often generated after setting menus on the admin page\n
+         * For this occasional cases, manually update was implemented. \n
+         * It looks unnecessary at this moment however no need to eliminate the feature. Just leave it.
+         **/
+        function procMenuAdminMakeXmlFile() {
+            // Check input value
+            $menu_srl = Context::get('menu_srl');
+            // Get information of the menu
+            $oMenuAdminModel = &getAdminModel('menu');
+            $menu_info = $oMenuAdminModel->getMenu($menu_srl);
+            $menu_title = $menu_info->title;
+            // Re-generate the xml file
+            $xml_file = $this->makeXmlFile($menu_srl);
+            // Set return value
+            $this->add('menu_title',$menu_title);
+            $this->add('xml_file',$xml_file);
+        }
+
+        /**
+         * @brief Register a menu image button
+         **/
+        function procMenuAdminUploadButton() {
+            $menu_srl = Context::get('menu_srl');
+            $menu_item_srl = Context::get('menu_item_srl');
+            $target = Context::get('target');
+            $target_file = Context::get($target);
+            // Error occurs when the target is neither a uploaded file nor a valid file
+            if(!$menu_srl || !$menu_item_srl || !$target_file || !is_uploaded_file($target_file['tmp_name']) || !preg_match('/\.(gif|jpeg|jpg|png)/i',$target_file['name'])) {
+                Context::set('error_messge', Context::getLang('msg_invalid_request'));
+            // Move the file to a specific director if the uploaded file meets requirement
+            } else {
+                $tmp_arr = explode('.',$target_file['name']);
+                $ext = $tmp_arr[count($tmp_arr)-1];
+
+                $path = sprintf('./files/attach/menu_button/%d/', $menu_srl);
+                $filename = sprintf('%s%d.%s.%s', $path, $menu_item_srl, $target, $ext);
+
+                if(!is_dir($path)) FileHandler::makeDir($path);
+
+                move_uploaded_file($target_file['tmp_name'], $filename);
+                Context::set('filename', $filename);
+            }
+
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('menu_file_uploaded');
+        }
+
+        /**
+         * @brief Remove the menu image button
+         **/
+        function procMenuAdminDeleteButton() {
+            $menu_srl = Context::get('menu_srl');
+            $menu_item_srl = Context::get('menu_item_srl');
+            $target = Context::get('target');
+            $filename = Context::get('filename');
+            FileHandler::removeFile($filename);
+
+            $this->add('target', $target);
+        }
+
+        /**
+         * @brief get all act list for admin menu
+         **/
+        function procMenuAdminAllActList() {
+            $oModuleModel = &getModel('module');
+            $installed_module_list = $oModuleModel->getModulesXmlInfo();
+			if(is_array($installed_module_list))
+			{
+				$currentLang = Context::getLangType();
+				$menuList = array();
+				foreach($installed_module_list AS $key=>$value)
+				{
+					$info = $oModuleModel->getModuleActionXml($value->module);
+					if($info->menu) $menuList[$value->module] = $info->menu;
+					unset($info->menu);
+				}
+			}
+            $this->add('menuList', $menuList);
+        }
+
+        /**
+         * @brief get all act list for admin menu
+         **/
+		function procMenuAdminInsertItemForAdminMenu()
+		{
+            $requestArgs = Context::getRequestVars();
+			$tmpMenuName = explode(':', $requestArgs->menu_name);
+			$moduleName = $tmpMenuName[0];
+			$menuName = $tmpMenuName[1];
+
+			// variable setting
+			$logged_info = Context::get('logged_info');
+			//$oMenuAdminModel = &getAdminModel('menu');
+			$oMemberModel = &getModel('member');
+
+			//$parentMenuInfo = $oMenuAdminModel->getMenuItemInfo($requestArgs->parent_srl);
+			$groupSrlList = $oMemberModel->getMemberGroups($logged_info->member_srl);
+
+			//preg_match('/\{\$lang->menu_gnb\[(.*?)\]\}/i', $parentMenuInfo->name, $m);
+			$oModuleModel = &getModel('module');
+			//$info = $oModuleModel->getModuleInfoXml($moduleName);
+			$info = $oModuleModel->getModuleActionXml($moduleName);
+
+			$url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->menu->{$menuName}->index);
+			if(empty($url)) $url = getNotEncodedUrl('', 'module', 'admin', 'act', $info->admin_index_act);
+			if(empty($url)) $url = getNotEncodedUrl('', 'module', 'admin');
+
+			$args->menu_item_srl = (!$requestArgs->menu_item_srl) ? getNextSequence() : $requestArgs->menu_item_srl;
+			$args->parent_srl = $requestArgs->parent_srl;
+			$args->menu_srl = $requestArgs->menu_srl;
+			$args->name = sprintf('{$lang->menu_gnb_sub[\'%s\']}', $menuName);
+			$args->url = $url;
+			$args->open_window = 'N';
+			$args->expand = 'N';
+			$args->normal_btn = '';
+			$args->hover_btn = '';
+			$args->active_btn = '';
+			$args->group_srls = implode(',', array_keys($groupSrlList));
+			$args->listorder = -1*$args->menu_item_srl;
+
+            // Check if already exists
+            $oMenuModel = &getAdminModel('menu');
+            $item_info = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
+            // Update if exists
+            if($item_info->menu_item_srl == $args->menu_item_srl) {
+                $output = executeQuery('menu.updateMenuItem', $args);
+                if(!$output->toBool()) return $output;
+            }
+            // Insert if not exist
+			else {
+                $args->listorder = -1*$args->menu_item_srl;
+                $output = executeQuery('menu.insertMenuItem', $args);
+                if(!$output->toBool()) return $output;
+            }
+            // Get information of the menu
+            $menu_info = $oMenuModel->getMenu($args->menu_srl);
+            $menu_title = $menu_info->title;
+            // Update the xml file and get its location
+            $xml_file = $this->makeXmlFile($args->menu_srl);
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispAdminSetup');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+		}
+
+        /**
+         * @brief Generate XML file for menu and return its location
+         **/
+        function makeXmlFile($menu_srl) {
+            // Return if there is no information when creating the xml file
+            if(!$menu_srl) return;
+            // Get menu informaton
+            $args->menu_srl = $menu_srl;
+            $output = executeQuery('menu.getMenu', $args);
+            if(!$output->toBool() || !$output->data) return $output;
+            $site_srl = (int)$output->data->site_srl;
+
+            if($site_srl) {
+                $oModuleModel = &getModel('module');
+				$columnList = array('sites.domain');
+                $site_info = $oModuleModel->getSiteInfo($site_srl, $columnList);
+                $domain = $site_info->domain;
+            }
+            // Get a list of menu items corresponding to menu_srl by listorder
+            $args->menu_srl = $menu_srl;
+            $args->sort_index = 'listorder';
+            $output = executeQuery('menu.getMenuItems', $args);
+            if(!$output->toBool()) return;
+            // Specify the name of the cache file
+            $xml_file = sprintf("./files/cache/menu/%s.xml.php", $menu_srl);
+            $php_file = sprintf("./files/cache/menu/%s.php", $menu_srl);
+            // If no data found, generate an XML file without node data
+            $list = $output->data;
+            if(!$list) {
+                $xml_buff = "<root />";
+                FileHandler::writeFile($xml_file, $xml_buff);
+                FileHandler::writeFile($php_file, '<?php if(!defined("__ZBXE__")) exit(); ?>');
+                return $xml_file;
+            }
+            // Change to an array if only a single data is obtained
+            if(!is_array($list)) $list = array($list);
+            // Create a tree for loop
+            $list_count = count($list);
+            for($i=0;$i<$list_count;$i++) {
+                $node = $list[$i];
+                $menu_item_srl = $node->menu_item_srl;
+                $parent_srl = $node->parent_srl;
+
+                $tree[$parent_srl][$menu_item_srl] = $node;
+            }
+            // A common header to set permissions of the cache file and groups
+            $header_script =
+                '$lang_type = Context::getLangType(); '.
+                '$is_logged = Context::get(\'is_logged\'); '.
+                '$logged_info = Context::get(\'logged_info\'); '.
+                '$site_srl = '.$site_srl.';'.
+                '$site_admin = false;'.
+                'if($site_srl) { '.
+                '$oModuleModel = &getModel(\'module\');'.
+                '$site_module_info = $oModuleModel->getSiteInfo($site_srl); '.
+				'if($site_module_info) Context::set(\'site_module_info\',$site_module_info);'.
+				'else $site_module_info = Context::get(\'site_module_info\');'.
+                '$grant = $oModuleModel->getGrant($site_module_info, $logged_info); '.
+                'if($grant->manager ==1) $site_admin = true;'.
+				'}'.
+                'if($is_logged) {'.
+                    'if($logged_info->is_admin=="Y") $is_admin = true; '.
+                    'else $is_admin = false; '.
+                    '$group_srls = array_keys($logged_info->group_list); '.
+                '} else { '.
+                    '$is_admin = false; '.
+                    '$group_srsl = array(); '.
+                '}';
+            // Create the xml cache file (a separate session is needed for xml cache)
+            $xml_buff = sprintf(
+                '<?php '.
+                'define(\'__ZBXE__\', true); '.
+                'require_once(\''.FileHandler::getRealPath('./config/config.inc.php').'\'); '.
+                '$oContext = &Context::getInstance(); '.
+                '$oContext->init(); '.
+                'header("Content-Type: text/xml; charset=UTF-8"); '.
+                'header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); '.
+                'header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); '.
+                'header("Cache-Control: no-store, no-cache, must-revalidate"); '.
+                'header("Cache-Control: post-check=0, pre-check=0", false); '.
+                'header("Pragma: no-cache"); '.
+                '%s '.
+                '$oContext->close(); '.
+                '?>'.
+                '<root>%s</root>',
+                $header_script,
+                $this->getXmlTree($tree[0], $tree, $site_srl, $domain)
+            );
+            // Create php cache file
+            $php_output = $this->getPhpCacheCode($tree[0], $tree, $site_srl, $domain);
+            $php_buff = sprintf(
+                '<?php '.
+                'if(!defined("__ZBXE__")) exit(); '.
+                '%s; '.
+                '%s; '.
+                '$menu->list = array(%s); '.
+				'Context::set("included_menu", $menu); '.
+                '?>',
+                $header_script,
+                $php_output['name'],
+                $php_output['buff']
+            );
+            // Save File
+            FileHandler::writeFile($xml_file, $xml_buff);
+            FileHandler::writeFile($php_file, $php_buff);
+            return $xml_file;
+        }
+
+        /**
+         * @brief Create xml data recursively looping for array nodes by referencing to parent_srl
+         * menu xml file uses a tag named "node" and this XML configures menus on admin page.
+         * (Implement tree menu by reading the xml file in tree_menu.js)
+         **/
+        function getXmlTree($source_node, $tree, $site_srl, $domain) {
+            if(!$source_node) return;
+
+            $oMenuAdminModel = &getAdminModel('menu');
+
+            foreach($source_node as $menu_item_srl => $node) {
+                $child_buff = "";
+                // Get data of the child nodes
+                if($menu_item_srl&&$tree[$menu_item_srl]) $child_buff = $this->getXmlTree($tree[$menu_item_srl], $tree, $site_srl, $domain);
+                // List variables
+                $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
+                foreach($names as $key => $val) {
+                    $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace('\\','\\\\',htmlspecialchars($val)));
+                }
+                $name_str = sprintf('$_names = array(%s); print $_names[$lang_type];', $name_arr_str);
+
+                $url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
+                if(preg_match('/^([0-9a-zA-Z\_\-]+)$/', $node->url)) {
+                    $href = getSiteUrl($domain, '','mid',$node->url);
+                    $pos = strpos($href, $_SERVER['HTTP_HOST']);
+                    if($pos !== false) $href = substr($href, $pos+strlen($_SERVER['HTTP_HOST']));
+                } else $href = $url;
+                $open_window = $node->open_window;
+                $expand = $node->expand;
+
+                $normal_btn = $node->normal_btn;
+                if($normal_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$normal_btn)) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+                else $normal_btn = '';
+                $hover_btn = $node->hover_btn;
+                if($hover_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$hover_btn)) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+                else $hover_btn = '';
+                $active_btn = $node->active_btn;
+                if($active_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$active_btn)) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+                else $active_btn = '';
+
+                $group_srls = $node->group_srls;
+
+                if($normal_btn) {
+                    if(preg_match('/\.png$/',$normal_btn)) $classname = 'class=&quot;iePngFix&quot;';
+                    else $classname = '';
+                    if($hover_btn) $hover_str = sprintf('onmouseover=&quot;this.src=\'%s\'&quot;', $hover_btn); else $hover_str = '';
+                    if($active_btn) $active_str = sprintf('onmousedown=&quot;this.src=\'%s\'&quot;', $active_btn); else $active_str = '';
+                    $link = sprintf('&lt;img src=&quot;%s&quot; onmouseout=&quot;this.src=\'%s\'&quot; alt=&quot;<?php print htmlspecialchars($_names[$lang_type]) ?>&quot; %s %s %s /&gt;', $normal_btn, $normal_btn, $hover_str, $active_str, $classname);
+                } else {
+                    $link = '<?php print $_names[$lang_type]; ?>';
+                }
+                // If the value of node->group_srls exists
+                if($group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$group_srls);
+                else $group_check_code = "true";
+                $attribute = sprintf(
+                    'node_srl="%s" parent_srl="%s" text="<?php if(%s) { %s }?>" url="<?php print(%s?"%s":"")?>" href="<?php print(%s?"%s":"")?>" open_window="%s" expand="%s" normal_btn="%s" hover_btn="%s" active_btn="%s" link="<?php if(%s) {?>%s<?php }?>"',
+                    $menu_item_srl,
+                    $node->parent_srl,
+                    $group_check_code,
+                    $name_str,
+                    $group_check_code,
+                    $url,
+                    $group_check_code,
+                    $href,
+                    $open_window,
+                    $expand,
+                    $normal_btn,
+                    $hover_btn,
+                    $active_btn,
+                    $group_check_code,
+                    $link
+                );
+
+                if($child_buff) $buff .= sprintf('<node %s>%s</node>', $attribute, $child_buff);
+                else $buff .=  sprintf('<node %s />', $attribute);
+            }
+            return $buff;
+        }
+
+        /**
+         * @brief Return php code converted from nodes in an array
+         * Although xml data can be used for tpl, menu to menu, it needs to use javascript separately
+         * By creating cache file in php and then you can get menu information without DB
+         * This cache includes in ModuleHandler::displayContent() and then Context::set()
+         **/
+        function getPhpCacheCode($source_node, $tree, $site_srl, $domain) {
+            $output = array("buff"=>"", "url_list"=>array());
+            if(!$source_node) return $output;
+
+            $oMenuAdminModel = &getAdminModel('menu');
+
+            foreach($source_node as $menu_item_srl => $node) {
+                // Get data from child nodes if exist.
+                if($menu_item_srl&&$tree[$menu_item_srl]) $child_output = $this->getPhpCacheCode($tree[$menu_item_srl], $tree, $site_srl, $domain);
+                else $child_output = array("buff"=>"", "url_list"=>array());
+                // List variables
+                $names = $oMenuAdminModel->getMenuItemNames($node->name, $site_srl);
+				unset($name_arr_str);
+                foreach($names as $key => $val) {
+                    $name_arr_str .= sprintf('"%s"=>"%s",',$key, str_replace(array('\\','"'),array('\\\\','&quot;'),$val));
+                }
+                $name_str = sprintf('$_menu_names[%d] = array(%s); %s', $node->menu_item_srl, $name_arr_str, $child_output['name']);
+                // If url value is not empty in the current node, put the value into an array url_list
+                if($node->url) $child_output['url_list'][] = $node->url;
+                $output['url_list'] = array_merge($output['url_list'], $child_output['url_list']);
+                // If node->group_srls value exists
+                if($node->group_srls) $group_check_code = sprintf('($is_admin==true||(is_array($group_srls)&&count(array_intersect($group_srls, array(%s)))))',$node->group_srls);
+                else $group_check_code = "true";
+                // List variables
+                $href = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->href);
+                $url = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->url);
+                if(preg_match('/^([0-9a-zA-Z\_\-]+)$/i', $node->url)) {
+                    $href = getSiteUrl($domain, '','mid',$node->url);
+                    $pos = strpos($href, $_SERVER['HTTP_HOST']);
+                    if($pos !== false) $href = substr($href, $pos+strlen($_SERVER['HTTP_HOST']));
+                } else $href = $url;
+                $open_window = $node->open_window;
+                $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->normal_btn);
+                $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->hover_btn);
+                $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$node->active_btn);
+                $selected = '"'.implode('","',$child_output['url_list']).'"';
+                $child_buff = $child_output['buff'];
+                $expand = $node->expand;
+
+                $normal_btn = $node->normal_btn;
+                if($normal_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$normal_btn)) $normal_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$normal_btn);
+                else $normal_btn = '';
+
+                $hover_btn = $node->hover_btn;
+                if($hover_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$hover_btn)) $hover_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$hover_btn);
+                else $hover_btn = '';
+
+                $active_btn = $node->active_btn;
+                if($active_btn && preg_match('/^\.\/files\/attach\/menu_button/i',$active_btn)) $active_btn = str_replace(array('&','"','<','>'),array('&amp;','&quot;','&lt;','&gt;'),$active_btn);
+                else $active_btn = '';
+
+                $group_srls = $node->group_srls;
+
+                if($normal_btn) {
+                    if(preg_match('/\.png$/',$normal_btn)) $classname = 'class=\"iePngFix\"';
+                    else $classname = '';
+                    if($hover_btn) $hover_str = sprintf('onmouseover=\"this.src=\'%s\'\"', $hover_btn); else $hover_str = '';
+                    if($active_btn) $active_str = sprintf('onmousedown=\"this.src=\'%s\'\"', $active_btn); else $active_str = '';
+                    $link = sprintf('"<img src=\"%s\" onmouseout=\"this.src=\'%s\'\" alt=\"".$_menu_names[%d][$lang_type]."\" %s %s %s />"', $normal_btn, $normal_btn, $node->menu_item_srl, $hover_str, $active_str, $classname);
+                    if($active_btn) $link_active = sprintf('"<img src=\"%s\" alt=\"".$_menu_names[%d][$lang_type]."\" %s />"', $active_btn, $node->menu_item_srl, $classname);
+                    else $link_active = $link;
+                } else {
+                    $link_active = $link = sprintf('$_menu_names[%d][$lang_type]', $node->menu_item_srl);
+                }
+                // Create properties (check if it belongs to the menu node by url_list. It looks a trick but fast and powerful)
+                $attribute = sprintf(
+                    '"node_srl"=>"%s","parent_srl"=>"%s","text"=>(%s?$_menu_names[%d][$lang_type]:""),"href"=>(%s?"%s":""),"url"=>(%s?"%s":""),"open_window"=>"%s","normal_btn"=>"%s","hover_btn"=>"%s","active_btn"=>"%s","selected"=>(array(%s)&&in_array(Context::get("mid"),array(%s))?1:0),"expand"=>"%s", "list"=>array(%s),  "link"=>(%s? ( array(%s)&&in_array(Context::get("mid"),array(%s)) ?%s:%s):""),',
+                    $node->menu_item_srl,
+                    $node->parent_srl,
+                    $group_check_code,
+                    $node->menu_item_srl,
+                    $group_check_code,
+                    $href,
+                    $group_check_code,
+                    $url,
+                    $open_window,
+                    $normal_btn,
+                    $hover_btn,
+                    $active_btn,
+                    $selected,
+                    $selected,
+                    $expand,
+                    $child_buff,
+                    $group_check_code,
+                    $selected,
+                    $selected,
+                    $link_active,
+                    $link
+                );
+                // Generate buff data
+                $output['buff'] .=  sprintf('%s=>array(%s),', $node->menu_item_srl, $attribute);
+                $output['name'] .= $name_str;
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Mapping menu and layout
+         * When setting menu on the layout, map the default layout
+         **/
+        function updateMenuLayout($layout_srl, $menu_srl_list) {
+            if(!count($menu_srl_list)) return;
+            // Delete the value of menu_srls
+            $args->menu_srls = implode(',',$menu_srl_list);
+            $output = executeQuery('menu.deleteMenuLayout', $args);
+            if(!$output->toBool()) return $output;
+
+            $args->layout_srl = $layout_srl;
+            // Mapping menu_srls, layout_srl
+            for($i=0;$i<count($menu_srl_list);$i++) {
+                $args->menu_srl = $menu_srl_list[$i];
+                $output = executeQuery('menu.insertMenuLayout', $args);
+                if(!$output->toBool()) return $output;
+            }
+        }
+
+        /**
+         * @brief Register a menu image button
+         **/
+        function _uploadButton($args)
+		{
+			// path setting
+			$path = sprintf('./files/attach/menu_button/%d/', $args->menu_srl);
+			if($args->menu_normal_btn || $args->menu_hover_btn || $args->menu_active_btn)
+                if(!is_dir($path)) FileHandler::makeDir($path);
+
+			if($args->isNormalDelete == 'Y' || $args->isHoverDelete == 'Y' || $args->isActiveDelete == 'Y')
+			{
+				$oMenuModel = &getAdminModel('menu');
+            	$itemInfo = $oMenuModel->getMenuItemInfo($args->menu_item_srl);
+
+				if($args->isNormalDelete == 'Y' && $itemInfo->normal_btn) FileHandler::removeFile($itemInfo->normal_btn);
+				if($args->isHoverDelete == 'Y' && $itemInfo->hover_btn) FileHandler::removeFile($itemInfo->hover_btn);
+				if($args->isActiveDelete == 'Y' && $itemInfo->active_btn) FileHandler::removeFile($itemInfo->active_btn);
+			}
+
+			$returnArray = array();
+			// normal button
+			if($args->menu_normal_btn)
+			{
+				$tmp_arr = explode('.',$args->menu_normal_btn['name']);
+				$ext = $tmp_arr[count($tmp_arr)-1];
+
+				$filename = sprintf('%s%d.%s.%s', $path, $args->menu_item_srl, 'menu_normal_btn', $ext);
+				move_uploaded_file($args->menu_normal_btn['tmp_name'], $filename);
+				$returnArray['normal_btn'] = $filename;
+			}
+
+			// hover button
+			if($args->menu_hover_btn)
+			{
+				$tmp_arr = explode('.',$args->menu_hover_btn['name']);
+				$ext = $tmp_arr[count($tmp_arr)-1];
+
+				$filename = sprintf('%s%d.%s.%s', $path, $args->menu_item_srl, 'menu_hover_btn', $ext);
+				move_uploaded_file($args->menu_hover_btn['tmp_name'], $filename);
+				$returnArray['hover_btn'] = $filename;
+			}
+
+			// active button
+			if($args->menu_active_btn)
+			{
+				$tmp_arr = explode('.',$args->menu_active_btn['name']);
+				$ext = $tmp_arr[count($tmp_arr)-1];
+
+				$filename = sprintf('%s%d.%s.%s', $path, $args->menu_item_srl, 'menu_active_btn', $ext);
+				move_uploaded_file($args->menu_active_btn['tmp_name'], $filename);
+				$returnArray['active_btn'] = $filename;
+			}
+			return $returnArray;
+        }
+    }
+?>
diff --git a/modules/menu/menu.admin.model.php b/modules/menu/menu.admin.model.php
index 4464a1f4f..6c4b5f2f3 100644
--- a/modules/menu/menu.admin.model.php
+++ b/modules/menu/menu.admin.model.php
@@ -1,160 +1,274 @@
-<?php
-    /**
-     * @class  menuAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief  menu 모듈의 admin model class
-     **/
-
-    class menuAdminModel extends menu {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 전체 메뉴 목록을 구해옴
-         **/
-        function getMenuList($obj) {
-            if(!$obj->site_srl) {
-                $site_module_info = Context::get('site_module_info');
-                $obj->site_srl = (int)$site_module_info->site_srl;
-            }
-            $args->site_srl = $obj->site_srl;
-            $args->sort_index = $obj->sort_index;
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-
-            // document.getDocumentList 쿼리 실행
-            $output = executeQuery('menu.getMenuList', $args);
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if(!$output->toBool()||!count($output->data)) return $output;
-
-            return $output;
-        }
-
-        /**
-         * @brief 등록된 모든 메뉴를 return
-         **/
-        function getMenus($site_srl = null) {
-            if(!isset($site_srl)) {
-                $site_module_info = Context::get('site_module_info');
-                $site_srl = (int)$site_module_info->site_srl;
-            }
-            // 일단 DB에서 정보를 가져옴
-            $args->site_srl = $site_srl ;
-            $args->menu_srl = $menu_srl;
-            $output = executeQuery('menu.getMenus', $args);
-            if(!$output->data) return;
-            $menus = $output->data;
-            if(!is_array($menus)) $menus = array($menus);
-            return $menus;
-        }
-
-        /**
-         * @brief DB 에 생성된 한개의 메뉴 정보를 구함
-         * 생성된 메뉴의 DB정보+XML정보를 return
-         **/
-        function getMenu($menu_srl) {
-            // 일단 DB에서 정보를 가져옴
-            $args->menu_srl = $menu_srl;
-            $output = executeQuery('menu.getMenu', $args);
-            if(!$output->data) return;
-            
-            $menu_info = $output->data;
-            $menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
-            $menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl);
-            return $menu_info;
-        }
-
-        /**
-         * @brief 특정 menu_srl의 아이템 정보를 return
-         * 이 정보중에 group_srls의 경우는 , 로 연결되어 들어가며 사용시에는 explode를 통해 array로 변환 시킴
-         **/
-        function getMenuItemInfo($menu_item_srl) {
-            // menu_item_srl이 있으면 해당 메뉴의 정보를 가져온다
-            $args->menu_item_srl = $menu_item_srl;
-            $output = executeQuery('menu.getMenuItem', $args);
-            $node = $output->data;
-            if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
-            else $node->group_srls = array();
-
-            $tmp_name = unserialize($node->name);
-            if($tmp_name && count($tmp_name) ) {
-                $selected_lang = array();
-                $rand_name = $tmp_name[Context::getLangType()];
-                if(!$rand_name) $rand_name = array_shift($tmp_name);
-                $node->name = $rand_name;
-            }
-            return $node;
-        }
-
-        /**
-         * @brief 다국어 지원을 위해 menu의 name을 언어별로 나눠서 return
-         */
-        function getMenuItemNames($source_name, $site_srl = null) {
-            if(!$site_srl) {
-                $site_module_info = Context::get('site_module_info');
-                $site_srl = (int)$site_module_info->site_srl;
-            }
-
-            // 언어코드 구함
-            $oModuleAdminModel = &getAdminModel('module');
-            return $oModuleAdminModel->getLangCode($site_srl, $source_name);
-        }
-
-        /**
-         * @brief 특정 menu_srl의 정보를 이용하여 템플릿을 구한후 return
-         * 관리자 페이지에서 특정 메뉴의 정보를 추가하기 위해 서버에서 tpl을 컴파일 한후 컴파일 된 html을 직접 return
-         **/
-        function getMenuAdminTplInfo() {
-            // 해당 메뉴의 정보를 가져오기 위한 변수 설정
-            $menu_item_srl = Context::get('menu_item_srl');
-            $parent_srl = Context::get('parent_srl');
-
-            // 회원 그룹의 목록을 가져옴
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);	
-			
-            // parent_srl이 있고 menu_item_srl이 없으면 하부 메뉴 추가임
-            if(!$menu_item_srl && $parent_srl) {
-                // 상위 메뉴의 정보를 가져옴
-                $parent_info = $this->getMenuItemInfo($parent_srl);
-
-                // 추가하려는 메뉴의 기본 변수 설정 
-                $item_info->menu_item_srl = getNextSequence();
-                $item_info->parent_srl = $parent_srl;
-                $item_info->parent_menu_name = $parent_info->name;
-
-            // root에 메뉴 추가하거나 기존 메뉴의 수정일 경우
-            } else {
-                // menu_item_srl 이 있으면 해당 메뉴의 정보를 가져온다
-                if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
-
-                // 찾아진 값이 없다면 신규 메뉴 추가로 보고 menu_item_srl값만 구해줌
-                if(!$item_info->menu_item_srl) {
-                    $item_info->menu_item_srl = getNextSequence();
-                }
-            }
-            Context::set('item_info', $item_info);
-			
-			//Security
-			$security = new Security();						
-			$security->encodeHTML('group_list..title');
-			$security->encodeHTML('item_info.url');
-			$security->encodeHTML('item_info.name');			
-				
-            // template 파일을 직접 컴파일한후 tpl변수에 담아서 return한다.
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');			
-			
-            $this->add('tpl', str_replace("\n"," ",$tpl));
-        }
-
-    }
-?>
\ No newline at end of file
+<?php
+    /**
+     * @class  menuAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief admin model class of the menu module
+     **/
+
+    class menuAdminModel extends menu {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Get a list of all menus
+         **/
+        function getMenuList($obj) {
+            if(!$obj->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $obj->site_srl = (int)$site_module_info->site_srl;
+            }
+            $args->site_srl = $obj->site_srl;
+            $args->sort_index = $obj->sort_index;
+            $args->page = $obj->page?$obj->page:1;
+            $args->list_count = $obj->list_count?$obj->list_count:20;
+            $args->page_count = $obj->page_count?$obj->page_count:10;
+            // document.getDocumentList query execution
+            $output = executeQuery('menu.getMenuList', $args);
+            // Return if no result or an error occurs
+            if(!$output->toBool()||!count($output->data)) return $output;
+
+            return $output;
+        }
+
+        /**
+         * @brief Return all menus
+         **/
+        function getMenus($site_srl = null) {
+            if(!isset($site_srl)) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = (int)$site_module_info->site_srl;
+            }
+            // Get information from the DB
+            $args->site_srl = $site_srl ;
+            $args->menu_srl = $menu_srl;
+            $output = executeQueryArray('menu.getMenus', $args);
+            if(!$output->data) return;
+            $menus = $output->data;
+            return $menus;
+        }
+
+        /**
+         * @brief Get information of a new menu from the DB
+         * Return DB and XML information of the menu
+         **/
+        function getMenu($menu_srl) {
+            // Get information from the DB
+            $args->menu_srl = $menu_srl;
+            $output = executeQuery('menu.getMenu', $args);
+            if(!$output->data) return;
+
+            $menu_info = $output->data;
+            $menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_srl);
+            $menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_srl);
+            return $menu_info;
+        }
+
+        /**
+         * @brief Get information of a new menu from the DB, search condition is menu title
+         * Return DB and XML information of the menu
+         **/
+        function getMenuByTitle($title) {
+            // Get information from the DB
+            $args->title = $title;
+            $output = executeQuery('menu.getMenuByTitle', $args);
+            if(!$output->data) return;
+
+			if(is_array($output->data)) $menu_info = $output->data[0];
+			else $menu_info = $output->data;
+
+            if($menu_info->menu_srl)
+			{
+				$menu_info->xml_file = sprintf('./files/cache/menu/%s.xml.php',$menu_info->menu_srl);
+	            $menu_info->php_file = sprintf('./files/cache/menu/%s.php',$menu_info->menu_srl);
+			}
+            return $menu_info;
+        }
+
+        /**
+         * @brief Return item information of the menu_srl
+         * group_srls uses a seperator with comma(,) and converts to an array by explode
+         **/
+        function getMenuItemInfo($menu_item_srl) {
+            // Get the menu information if menu_item_srl exists
+            $args->menu_item_srl = $menu_item_srl;
+            $output = executeQuery('menu.getMenuItem', $args);
+            $node = $output->data;
+            if($node->group_srls) $node->group_srls = explode(',',$node->group_srls);
+            else $node->group_srls = array();
+
+            $tmp_name = unserialize($node->name);
+            if($tmp_name && count($tmp_name) ) {
+                $selected_lang = array();
+                $rand_name = $tmp_name[Context::getLangType()];
+                if(!$rand_name) $rand_name = array_shift($tmp_name);
+                $node->name = $rand_name;
+            }
+            return $node;
+        }
+
+        /**
+         * @brief Return item information of the menu_srl
+         **/
+        function getMenuAdminItemInfo()
+		{
+			$menuItemSrl = Context::get('menu_item_srl');
+			$menuItem = $this->getMenuItemInfo($menuItemSrl);
+
+			if(!$menuItem->url)
+			{
+				$menuItem->moduleType = null;
+			}
+			else if(!preg_match('/^http/i',$menuItem->url))
+			{
+				$oModuleModel = &getModel('module');
+				$moduleInfo = $oModuleModel->getModuleInfoByMid($menuItem->url, 0);
+				if(!$moduleInfo) $menuItem->moduleType = 'url';
+				else
+				{
+					if($moduleInfo->mid == $menuItem->url) {
+						$menuItem->moduleType = $moduleInfo->module;
+						$menuItem->pageType = $moduleInfo->page_type;
+					}
+				}
+			}
+			else $menuItem->moduleType = 'url';
+
+			// get groups
+			$oMemberModel = &getModel('member');
+			$oModuleAdminModel = &getAdminModel('module');
+			$output = $oMemberModel->getGroups();
+			if(is_array($output))
+			{
+				$groupList = array();
+				foreach($output AS $key=>$value)
+				{
+
+					$groupList[$value->group_srl]->group_srl = $value->group_srl;
+            		if(substr($value->title,0,12)=='$user_lang->') {
+						$tmp = $oModuleAdminModel->getLangCode(0, $value->title);
+						$groupList[$value->group_srl]->title = $tmp[Context::getLangType()];
+					}
+					else $groupList[$value->group_srl]->title = $value->title;
+
+					if(in_array($key, $menuItem->group_srls)) $groupList[$value->group_srl]->isChecked = true;
+					else $groupList[$value->group_srl]->isChecked = false;
+				}
+			}
+			$menuItem->groupList = $groupList;
+
+			$oModuleController = &getController('module');
+			$menuItem->name_key = $menuItem->name;
+			$oModuleController->replaceDefinedLangCode($menuItem->name);
+
+			$this->add('menu_item', $menuItem);
+        }
+
+		function getMenuItems($menu_srl, $parent_srl = null, $columnList = array())
+		{
+			$args->menu_srl = $menu_srl;
+			$args->parent_srl = $parent_srl;
+
+			$output = executeQueryArray('menu.getMenuItems', $args, $columnList);
+			return $output;
+		}
+
+        /**
+         * @brief Return menu name in each language to support multi-language
+         */
+        function getMenuItemNames($source_name, $site_srl = null) {
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = (int)$site_module_info->site_srl;
+            }
+            // Get language code
+            $oModuleAdminModel = &getAdminModel('module');
+            return $oModuleAdminModel->getLangCode($site_srl, $source_name);
+        }
+
+        /**
+         * @brief Get a template by using the menu_srl and retrun.
+         * Return html after compiling tpl on the server in order to add menu information on the admin page
+         **/
+        function getMenuAdminTplInfo() {
+            // Get information on the menu for the parameter settings
+            $menu_item_srl = Context::get('menu_item_srl');
+            $parent_srl = Context::get('parent_srl');
+            // Get a list of member groups
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups();
+            Context::set('group_list', $group_list);
+            // Add a sub-menu if there is parent_srl but not menu_item_srl
+            if(!$menu_item_srl && $parent_srl) {
+                // Get information of the parent menu
+                $parent_info = $this->getMenuItemInfo($parent_srl);
+                // Default parameter settings for a new menu
+                $item_info->menu_item_srl = getNextSequence();
+                $item_info->parent_srl = $parent_srl;
+                $item_info->parent_menu_name = $parent_info->name;
+            // In case of modifying the existing menu or addting a new menu to the root
+            } else {
+                // Get information of the menu if menu_item_srl exists
+                if($menu_item_srl) $item_info = $this->getMenuItemInfo($menu_item_srl);
+                // Get only menu_item_srl if no values found, considering it as adding a new menu
+                if(!$item_info->menu_item_srl) {
+                    $item_info->menu_item_srl = getNextSequence();
+                }
+            }
+            Context::set('item_info', $item_info);
+			//Security
+			$security = new Security();
+			$security->encodeHTML('group_list..title');
+			$security->encodeHTML('item_info.url');
+			$security->encodeHTML('item_info.name');
+
+			// Compile the template file into tpl variable and then return it
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'menu_item_info');
+
+            $this->add('tpl', str_replace("\n"," ",$tpl));
+        }
+
+        /**
+         * @brief when menu add in sitemap, select module list
+		 * this menu showing with trigger
+         **/
+		function getModuleListInSitemap()
+		{
+			$oModuleModel = &getModel('module');
+			$columnList = array('module');
+			$moduleList = array('page');
+
+			$output = $oModuleModel->getModuleListByInstance($columnList);
+			if(is_array($output->data))
+			{
+				foreach($output->data AS $key=>$value)
+				{
+					array_push($moduleList, $value->module);
+				}
+			}
+
+            // after trigger
+            $output = ModuleHandler::triggerCall('menu.getModuleListInSitemap', 'after', $moduleList);
+            if(!$output->toBool()) return $output;
+
+			$moduleList = array_unique($moduleList);
+
+			$moduleInfoList = array();
+			if(is_array($moduleList))
+			{
+				foreach($moduleList AS $key=>$value)
+				{
+					$moduleInfo = $oModuleModel->getModuleInfoXml($value);
+					$moduleInfoList[$value] = $moduleInfo;
+				}
+			}
+
+            return $moduleInfoList;
+		}
+    }
+?>
diff --git a/modules/menu/menu.admin.view.php b/modules/menu/menu.admin.view.php
index 80bb9dbff..df7dd8424 100644
--- a/modules/menu/menu.admin.view.php
+++ b/modules/menu/menu.admin.view.php
@@ -1,119 +1,225 @@
-<?php
-    /**
-     * @class  menuAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  menu 모듈의 admin view class
-     **/
-
-    class menuAdminView extends menu {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 메뉴 관리의 첫 페이지
-         **/
-        function dispMenuAdminContent() {
-            // 등록된 메뉴 목록을 구해옴 
-            $obj->page = Context::get('page');
-            $obj->sort_index = 'listorder';
-            $obj->list_count = 20;
-            $obj->page_count = 20;
-
-            $oMenuModel = &getAdminModel('menu');
-            $output = $oMenuModel->getMenuList($obj);
-
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);			
-            Context::set('menu_list', $output->data);
-			Context::set('page_navigation', $output->page_navigation);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('menu_list..title');	
-			
-            $this->setTemplateFile('index');
-        }
- 
-        /**
-         * @brief 메뉴 등록 페이지
-         **/
-        function dispMenuAdminInsert() {
-            // 선택된 메뉴의 정보르 구해서 세팅 
-            $menu_srl = Context::get('menu_srl');
-
-            if($menu_srl) {
-                // 메뉴의 정보를 가져옴
-                $oMenuModel = &getAdminModel('menu');
-                $menu_info = $oMenuModel->getMenu($menu_srl);
-                if($menu_info->menu_srl == $menu_srl) Context::set('menu_info', $menu_info);
-            }
-
-            $this->setTemplateFile('menu_insert');
-        }
- 
-        /**
-         * @brief 메뉴 관리 페이지
-         **/
-        function dispMenuAdminManagement() {
-            // 선택된 메뉴의 정보르 구해서 세팅 
-            $menu_srl = Context::get('menu_srl');
-
-            if(!$menu_srl) return $this->dispMenuAdminContent();
-
-            // 메뉴의 정보를 가져옴
-            $oMenuModel = &getAdminModel('menu');
-            $menu_info = $oMenuModel->getMenu($menu_srl);
-            if($menu_info->menu_srl != $menu_srl) return $this->dispMenuAdminContent();
-            		
-			Context::set('menu_info', $menu_info);
-						
-			//Security
-			$security = new Security();
-			$security->encodeHTML('menu_info..title');			
-			
-            // 레이아웃을 팝업으로 지정
-            $this->setTemplateFile('menu_management');
-        }
-
-
-        /**
-         * @brief 메뉴에서 선택할 수 있는 mid목록을 보여줌
-         **/
-        function dispMenuAdminMidList() {
-            $oModuleModel = &getModel('module');
-
-            // 모듈 카테고리 목록을 구함
-            $module_category = $oModuleModel->getModuleCategories();
-            Context::set('module_category', $module_category);
-
-            // 모듈 목록을 구함 
-            $module_list = $oModuleModel->getModuleList();
-            Context::set('module_list', $module_list);
-			
-            // mid 목록을 구해옴
-            $args->module_category_srl = Context::get('module_category_srl');
-            $args->module = Context::get('target_module');
-            $mid_list = $oModuleModel->getMidList($args);
-            Context::set('mid_list', $mid_list);			
-			
-            // 메뉴을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_category..title');
-			$security->encodeHTML('module_list..module');
-			$security->encodeHTML('mid_list..module');
-			$security->encodeHTML('mid_list..browser_title');			
-			
-            // 템플릿 파일 지정
-            $this->setTemplateFile('mid_list');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  menuAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the menu module
+     **/
+
+    class menuAdminView extends menu {
+		var $tmpMenu = null;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief The first page of the menu admin
+         **/
+        function dispMenuAdminContent() {
+            // Get a list of registered menus
+            $obj->page = Context::get('page');
+            $obj->sort_index = 'listorder';
+            $obj->list_count = 20;
+            $obj->page_count = 20;
+
+            $oMenuModel = &getAdminModel('menu');
+            $output = $oMenuModel->getMenuList($obj);
+
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('menu_list', $output->data);
+			Context::set('page_navigation', $output->page_navigation);
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('menu_list..title');
+
+            $this->setTemplateFile('index');
+        }
+
+        /**
+         * @brief Page to insert a menu
+         **/
+        function dispMenuAdminInsert() {
+            // Set the menu with menu information
+            $menu_srl = Context::get('menu_srl');
+
+            if($menu_srl) {
+                // Get information of the menu
+                $oMenuModel = &getAdminModel('menu');
+                $menu_info = $oMenuModel->getMenu($menu_srl);
+                if($menu_info->menu_srl == $menu_srl) Context::set('menu_info', $menu_info);
+            }
+
+            $this->setTemplateFile('menu_insert');
+        }
+
+        /**
+         * @brief Menu admin page
+         **/
+        function dispMenuAdminManagement() {
+            // Get information of the menu
+            $menu_srl = Context::get('menu_srl');
+
+            if(!$menu_srl) return $this->dispMenuAdminContent();
+            // Get information of the menu
+            $oMenuModel = &getAdminModel('menu');
+            $menu_info = $oMenuModel->getMenu($menu_srl);
+            if($menu_info->menu_srl != $menu_srl) return $this->dispMenuAdminContent();
+
+            Context::set('menu_info', $menu_info);
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('menu_info..title');
+
+			// Set the layout to be pop-up
+            $this->setTemplateFile('menu_management');
+        }
+
+
+        /**
+         * @brief Display a mid list to be able to select on the menu
+		 * @perphaps this method not use
+         **/
+        function dispMenuAdminMidList() {
+            $oModuleModel = &getModel('module');
+            // Get a list of module categories
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
+            // Get a list of modules
+            $module_list = $oModuleModel->getModuleList();
+            Context::set('module_list', $module_list);
+            // Get a list of mid
+            $args->module_category_srl = Context::get('module_category_srl');
+            $args->module = Context::get('target_module');
+			$columnList = array('module_srl', 'module', 'module_category_srl', 'browser_title');
+            $mid_list = $oModuleModel->getMidList($args, $columnList);
+            Context::set('mid_list', $mid_list);
+            // Set the menu as a pop-up
+            $this->setLayoutFile('popup_layout');
+			//Security
+			$security = new Security();
+			$security->encodeHTML('module_category..title');
+			$security->encodeHTML('module_list..module');
+			$security->encodeHTML('mid_list..module');
+			$security->encodeHTML('mid_list..browser_title');
+
+			// Set a template file
+            $this->setTemplateFile('mid_list');
+        }
+
+        /**
+         * @brief Site map admin menu index page
+         **/
+		function dispMenuAdminSiteMap()
+		{
+			$oMenuAdminModel = &getAdminModel('menu');
+			$menuListFromDB = $oMenuAdminModel->getMenus();
+			if(is_array($menuListFromDB)) $output = array_reverse($menuListFromDB);
+
+			$menuList = array();
+			if(is_array($output))
+			{
+				$menuItems = array();
+				foreach($output AS $key=>$value)
+				{
+					if($value->title == '__XE_ADMIN__') unset($output[$key]);
+					else
+					{
+						unset($menu);
+						unset($menuItems);
+						$value->xml_file = sprintf('./files/cache/menu/%s.xml.php',$value->menu_srl);
+						$value->php_file = sprintf('./files/cache/menu/%s.php',$value->menu_srl);
+						if(file_exists($value->php_file)) @include($value->php_file);
+
+						if(count($menu->list)>0)
+						{
+							foreach($menu->list AS $key2=>$value2)
+							{
+								$this->_menuInfoSetting($menu->list[$key2]);
+							}
+						}
+
+						//array_push($menuList, $value->xml_file);
+						$menuItems->menuSrl = $value->menu_srl;
+						$menuItems->title = $value->title;
+						$menuItems->menuItems = $menu;
+						array_push($menuList, $menuItems);
+					}
+				}
+			}
+            Context::set('menu_list', $menuList);
+
+			// get installed module list
+			$oPageController = &getController('page');	//for lang
+			$resultModuleList = $oMenuAdminModel->getModuleListInSitemap();
+            Context::set('module_list', $resultModuleList);
+
+			// get default group list
+			$oMemberModel = &getModel('member');
+			$output = $oMemberModel->getGroups();
+			if(is_array($output))
+			{
+				$groupList = array();
+				foreach($output AS $key=>$value)
+				{
+					$groupList[$value->group_srl]->group_srl = $value->group_srl;
+					$groupList[$value->group_srl]->title = $value->title;
+				}
+			}
+            Context::set('group_list', $groupList);
+
+            $this->setTemplateFile('sitemap');
+		}
+
+		function _menuInfoSetting(&$menu)
+		{
+			$oModuleModel = &getModel('module');
+			if(!preg_match('/^http/i', $menu['url']))
+			{
+				unset($midInfo);
+				unset($moduleInfo);
+				$midInfo = $oModuleModel->getModuleInfoByMid($menu['url'], 0);
+				$moduleInfo = $oModuleModel->getModuleInfoXml($midInfo->module);
+				if($moduleInfo->setup_index_act)
+				{
+					$menu['module_srl'] = $midInfo->module_srl;
+					$menu['setup_index_act'] = $moduleInfo->setup_index_act;
+				}
+			}
+			if(count($menu['list']) > 0)
+			{
+				foreach($menu['list'] AS $key=>$value)
+				{
+					$this->_menuInfoSetting($menu['list'][$key]);
+				}
+			}
+		}
+
+		function _arrangeMenuItem($menuItems)
+		{
+			if(is_array($menuItems))
+			{
+				$arrangedMenuItemList = array();
+				foreach($menuItems AS $key=>$value)
+				{
+					if($value->parent_srl == 0)
+					{
+						$arrangedMenuItemList[$value->menu_item_srl] = array('name'=>$value->name, 'subMenu'=>array());
+					}
+
+					if($value->parent_srl > 0 && isset($arrangedMenuItemList[$value->parent_srl]))
+					{
+						$arrangedMenuItemList[$value->parent_srl]['subMenu'][$value->menu_item_srl] = $value;
+					}
+				}
+			}
+			return $arrangedMenuItemList;
+		}
+    }
+?>
diff --git a/modules/menu/menu.class.php b/modules/menu/menu.class.php
index 4a2ba9f5c..fe2420284 100644
--- a/modules/menu/menu.class.php
+++ b/modules/menu/menu.class.php
@@ -1,67 +1,60 @@
-<?php
-    /**
-     * @class  menu
-     * @author NHN (developers@xpressengine.com)
-     * @brief  menu 모듈의 high class
-     **/
-
-    class menu extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // 메뉴 사용할 디렉토리 생성
-            FileHandler::makeDir('./files/cache/menu');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-
-            // 2009. 02. 11 menu 테이블에 site_srl 추가
-            if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-
-            // 2009. 02. 11 menu 테이블에 site_srl 추가
-            if(!$oDB->isColumnExists('menu', 'site_srl')) {
-                $oDB->addColumn('menu','site_srl','number',11,0,true);
-            }
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 메뉴 모듈의 캐시 파일 모두 삭제
-            FileHandler::removeFilesInDir("./files/cache/menu");
-
-            $oMenuAdminController = &getAdminController('menu');
-
-            // 블로그 모듈 목록을 모두 구함
-            $output = executeQueryArray("menu.getMenus");
-            $list = $output->data;
-            if(!count($list)) return;
-
-            // 메뉴 모듈에서 사용되는 모든 메뉴 목록을 재 생성
-            foreach($list as $menu_item) {
-                $menu_srl = $menu_item->menu_srl;
-                $oMenuAdminController->makeXmlFile($menu_srl);
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class  menu
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the menu module
+     **/
+
+    class menu extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Create a directory to use menu
+            FileHandler::makeDir('./files/cache/menu');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            // 2009. 02. 11 menu added to the table site_srl
+            if(!$oDB->isColumnExists('menu', 'site_srl')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            // 2009. 02. 11 menu added to the table site_srl
+            if(!$oDB->isColumnExists('menu', 'site_srl')) {
+                $oDB->addColumn('menu','site_srl','number',11,0,true);
+            }
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+            $oMenuAdminController = &getAdminController('menu');
+            // Wanted list of all the blog module
+            $output = executeQueryArray("menu.getMenus");
+            $list = $output->data;
+            if(!count($list)) return;
+            // The menu module is used in the re-create all the menu list
+            foreach($list as $menu_item) {
+                $menu_srl = $menu_item->menu_srl;
+                $oMenuAdminController->makeXmlFile($menu_srl);
+            }
+        }
+    }
+?>
diff --git a/modules/menu/queries/getMenuByTitle.xml b/modules/menu/queries/getMenuByTitle.xml
new file mode 100644
index 000000000..4d8dae6f0
--- /dev/null
+++ b/modules/menu/queries/getMenuByTitle.xml
@@ -0,0 +1,11 @@
+<query id="getMenuByTitle" action="select">
+    <tables>
+        <table name="menu" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="title" var="title" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/menu/queries/getMenuItems.xml b/modules/menu/queries/getMenuItems.xml
index 4c82034fb..8038e5c46 100644
--- a/modules/menu/queries/getMenuItems.xml
+++ b/modules/menu/queries/getMenuItems.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="parent_srl" var="parent_srl" filter="number" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="listorder" order="desc" />
diff --git a/modules/menu/queries/getMenus.xml b/modules/menu/queries/getMenus.xml
index b7e2f3995..2b25b02b1 100644
--- a/modules/menu/queries/getMenus.xml
+++ b/modules/menu/queries/getMenus.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" filter="number" />
+        <condition operation="notequal" column="title" default="__XE_ADMIN__" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="listorder" order="asc" />
diff --git a/modules/menu/queries/updateMenuItem.xml b/modules/menu/queries/updateMenuItem.xml
index cc6502ac4..986300365 100644
--- a/modules/menu/queries/updateMenuItem.xml
+++ b/modules/menu/queries/updateMenuItem.xml
@@ -7,9 +7,9 @@
         <column name="url" var="url" />
         <column name="open_window" var="open_window" />
         <column name="expand" var="expand" />
-        <column name="normal_btn" var="normal_btn" default="" />
-        <column name="hover_btn" var="hover_btn" default="" />
-        <column name="active_btn" var="active_btn" default="" />
+        <column name="normal_btn" var="normal_btn" />
+        <column name="hover_btn" var="hover_btn" />
+        <column name="active_btn" var="active_btn" />
         <column name="group_srls" var="group_srls" />
     </columns>
     <conditions>
diff --git a/modules/menu/ruleset/insertMenu.xml b/modules/menu/ruleset/insertMenu.xml
new file mode 100644
index 000000000..79b27e272
--- /dev/null
+++ b/modules/menu/ruleset/insertMenu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/menu/ruleset/insertMenuItem.xml b/modules/menu/ruleset/insertMenuItem.xml
new file mode 100644
index 000000000..66bcb5d56
--- /dev/null
+++ b/modules/menu/ruleset/insertMenuItem.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="menu_srl" required="true" rule="number" />
+		<field name="menu_name" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/menu/ruleset/updateMenuTitle.xml b/modules/menu/ruleset/updateMenuTitle.xml
new file mode 100644
index 000000000..8aed7fb69
--- /dev/null
+++ b/modules/menu/ruleset/updateMenuTitle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" />
+		<field name="menu_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/menu/tpl/css/mmenu.css b/modules/menu/tpl/css/mmenu.css
index ca44f408e..9c497dfde 100644
--- a/modules/menu/tpl/css/mmenu.css
+++ b/modules/menu/tpl/css/mmenu.css
@@ -1,19 +1,19 @@
-@charset "utf-8";
-/* Mobile XE (/modules/menu/tpl/menu.html) */
-.bd{background:#f8f8f8;padding:1px 0}
-/* Global Navigation */
-.gn{margin:0;padding:0;list-style:none;background:#d3d1cc;text-shadow:1px 1px 0 #fff;font-size:14px}
-.gn li{background:#c3c3c3;border:1px solid #a3a09a;border-left:0;border-right:0;margin:0 0 -1px 0}
-.gn li li{background:#f8f8f8;border:1px solid #c9c9c9;border-left:0;border-right:0}
-.gn li li li{background:#e8e8e8}
-.gn ul{margin:0 0 -1px 0;padding:0;list-style:none}
-.gn a{position:relative;text-decoration:none;display:block;padding:10px}
-.gn li a{color:#333}
-.gn li a:after{position:absolute;top:7px;right:10px;content:"›";color:#888;font-size:18px;font-weight:bold;font-family:Verdana, Geneva, sans-serif}
-.gn li li a:before{content:"";display:inline-block;width:6px;height:6px;border:1px dotted #666;border-top:0;border-right:0;margin:0 4px 0 0;vertical-align:top}
-.gn li li a{padding-left:15px}
-.gn li li li a{padding-left:30px}
-.gn li li li li a{padding-left:45px}
-.gn li li li li li a{padding-left:60px}
-.gn em{color:#f63;font-size:12px}
-
+@charset "utf-8";
+/* Mobile XE (/modules/menu/tpl/menu.html) */
+.bd{background:#f8f8f8;padding:1px 0}
+/* Global Navigation */
+.gn{margin:0;padding:0;list-style:none;background:#d3d1cc;text-shadow:1px 1px 0 #fff;font-size:14px}
+.gn li{background:#c3c3c3;border:1px solid #a3a09a;border-left:0;border-right:0;margin:0 0 -1px 0}
+.gn li li{background:#f8f8f8;border:1px solid #c9c9c9;border-left:0;border-right:0}
+.gn li li li{background:#e8e8e8}
+.gn ul{margin:0 0 -1px 0;padding:0;list-style:none}
+.gn a{position:relative;text-decoration:none;display:block;padding:10px}
+.gn li a{color:#333}
+.gn li a:after{position:absolute;top:7px;right:10px;content:"›";color:#888;font-size:18px;font-weight:bold;font-family:Verdana, Geneva, sans-serif}
+.gn li li a:before{content:"";display:inline-block;width:6px;height:6px;border:1px dotted #666;border-top:0;border-right:0;margin:0 4px 0 0;vertical-align:top}
+.gn li li a{padding-left:15px}
+.gn li li li a{padding-left:30px}
+.gn li li li li a{padding-left:45px}
+.gn li li li li li a{padding-left:60px}
+.gn em{color:#f63;font-size:12px}
+
diff --git a/modules/menu/tpl/index.html b/modules/menu/tpl/index.html
index 9ac5bfa73..ed7db4220 100644
--- a/modules/menu/tpl/index.html
+++ b/modules/menu/tpl/index.html
@@ -1,51 +1,53 @@
-<!--%import("filter/delete_menu.xml")-->
-<!--%import("js/menu_admin.js")-->
-
-<!--#include("header.html")-->
-
-<!-- 삭제를 위한 임시 form -->
-<form id="fo_menu" action="./" method="get">
-    <input type="hidden" name="menu_srl" value="" />
-</form>
-
-<!-- 목록 -->
-<table cellspacing="0" class="crossTable">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col" class="wide"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="2"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($menu_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="number center">{$no}</td>
-        <td class="wide">{$val->title}</td>
-        <td class="nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td><a href="{getUrl('act','dispMenuAdminManagement','menu_srl',$val->menu_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
-        <td><a href="#" onclick="doDeleteMenu('{$val->menu_srl}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="5" class="button">
-            <a href="{getUrl('act','dispMenuAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-        </th>
-    </tr>
-</tbody>
-</table>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<!--%import("filter/delete_menu.xml")-->
+<!--%import("js/menu_admin.js")-->
+
+<!--#include("header.html")-->
+
+<!-- 삭제를 위한 임시 form -->
+<form id="fo_menu" action="./" method="get">
+    <input type="hidden" name="menu_srl" value="" />
+</form>
+
+<!-- 목록 -->
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col" >{$lang->title}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col">&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($menu_list as $no => $val)-->
+			<tr class="row{$cycle_idx}">
+				<td>{$no}</td>
+				<td >{$val->title}</td>
+				<td>{zdate($val->regdate,"Y-m-d")}</td>
+				<td>
+					<a href="{getUrl('act','dispMenuAdminManagement','menu_srl',$val->menu_srl)}">{$lang->cmd_setup}</a>
+					<button type="button" onclick="doDeleteMenu('{$val->menu_srl}');return false;" title="{$lang->cmd_delete}" class="text">{$lang->cmd_delete}</button>
+				</td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn"><a href="{getUrl('act','dispMenuAdminInsert','module_srl','')}">{$lang->cmd_make}</a></span>
+</div>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
diff --git a/modules/menu/tpl/js/menu_admin.js b/modules/menu/tpl/js/menu_admin.js
index c93dc1605..b54435976 100644
--- a/modules/menu/tpl/js/menu_admin.js
+++ b/modules/menu/tpl/js/menu_admin.js
@@ -99,7 +99,14 @@ function doReloadTreeMenu(menu_srl) {
 
     // 서버에 요청하여 해당 노드의 정보를 수정할 수 있도록 한다. 
     var response_tags = new Array('error','message', 'xml_file', 'menu_title');
-    exec_xml('menu', 'procMenuAdminMakeXmlFile', params, completeInsertMenuItem, response_tags, params);
+    exec_xml('menu', 'procMenuAdminMakeXmlFile', params, completeRemakeCache, response_tags, params);
+}
+
+function completeRemakeCache(ret_obj) {
+	if(ret_obj.error == 0)
+	{
+		document.location.reload();
+	}
 }
 
 /* 메뉴 삭제 */
diff --git a/modules/menu/tpl/js/menu_tree.js b/modules/menu/tpl/js/menu_tree.js
index adb56f8d1..ef9028a82 100644
--- a/modules/menu/tpl/js/menu_tree.js
+++ b/modules/menu/tpl/js/menu_tree.js
@@ -1,174 +1,174 @@
-function Tree(url){
-    // clear tree;
-    jQuery('#menu > ul > li > ul').remove();
-
-    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" alt="'+lang_cmd_insert+'" title="'+lang_cmd_insert+'" /></a>').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
-
-    //ajax get data and transeform ul il
-    jQuery.get(url,function(data){
-        jQuery(data).find("node").each(function(i){
-            var text = jQuery(this).attr("text");
-            var node_srl = jQuery(this).attr("node_srl");
-            var parent_srl = jQuery(this).attr("parent_srl");
-            var url = jQuery(this).attr("url");
-
-            // node
-            var node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
-
-            // button
-            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" alt="'+lang_cmd_insert+'" title="'+lang_cmd_insert+'" /></a>').bind("click",function(e){
-                addNode(node_srl,e);
-                return false;
-            }).appendTo(node);
-
-            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" alt="'+lang_cmd_modify+'" title="'+lang_cmd_modify+'" /></a>').bind("click",function(e){
-                modifyNode(node_srl,e);
-                return false;
-            }).appendTo(node);
-
-            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" alt="'+lang_cmd_delete+'" title="'+lang_cmd_delete+'" /></a>').bind("click",function(e){
-                deleteNode(node_srl);
-                return false;
-            }).appendTo(node);
-
-            // insert parent child
-            if(parent_srl>0){
-                if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('<ul>'));
-                jQuery('#tree_'+parent_srl+'> ul').append(node);
-            }else{
-                if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("<ul>").appendTo('#menu ul.simpleTree > li');
-                jQuery('#menu ul.simpleTree > li > ul').append(node);
-            }
-
-        });
-
-        //button show hide
-        jQuery("#menu li").each(function(){
-            if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
-            if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
-        });
-
-
-        // draw tree
-        simpleTreeCollection = jQuery('.simpleTree').simpleTree({
-            autoclose: false,
-            afterClick:function(node){
-                //alert("text-"+jQuery('span:first',node).text());
-            },
-            afterDblClick:function(node){
-                //alert("text-"+jQuery('span:first',node).text());
-            },
-            afterMove:function(destination, source, pos){
-
-                jQuery("#menu_zone_info").html("");
-
-                if(destination.size() == 0){
-                    Tree(xml_url);
-                    return;
-                }
-                var menu_srl = jQuery("#fo_menu input[name=menu_srl]").val();
-                var parent_srl = destination.attr('id').replace(/.*_/g,'');
-                var target_srl = source.attr('id').replace(/.*_/g,'');
-                var brothers = jQuery('#'+destination.attr('id')+' > ul > li:not([class^=line])').length;
-                var mode = brothers >1 ? 'move':'insert';
-                var source_srl = pos == 0 ? 0: source.prevAll("li:not(.line)").get(0).id.replace(/.*_/g,'');
-
-                jQuery.exec_json("menu.procMenuAdminMoveItem",{"menu_srl":menu_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl,"mode":mode},
-                function(data){
-                    if(data.error>0) Tree(xml_url);
-                });
-
-            },
-
-            // i want you !! made by sol
-            beforeMovedToLine : function(destination, source, pos){
-//                if(typeof(destination.id) == 'undefined') return false;
-                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
-            },
-
-            // i want you !! made by sol
-            beforeMovedToFolder : function(destination, source, pos){
-//                if(typeof(destination.id) == 'undefined') return false;
-                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
-            },
-            afterAjax:function()
-            {
-                //alert('Loaded');
-            },
-            animate:true
-            ,docToFolderConvert:true
-        });
-
-
-        // image url replace
-//        jQuery("#menu ul.simpleTree img").attr("src",function(){ return jQuery(this).attr("src").replace("images/","./common/js/plugins/ui.tree/images/");});
-
-
-
-
-        // open all node
-        nodeToggleAll();
-    },"xml");
-}
-
-function nodeToggleAll(){
-    jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
-        simpleTreeCollection[0].nodeToggle(this);
-    });
-}
-
-
-
-function modifyNode(node_srl,e){
-    jQuery('#menu_zone_info').html('');
-    jQuery("#tree_"+node_srl+" > span").click();
-    var params ={
-            "parent_srl":0
-            ,"menu_item_srl":node_srl
-            };
-
-    jQuery.exec_json('menu.getMenuAdminTplInfo', params, function(data){
-        jQuery('#menu_zone_info').html(data.tpl).css('position','absolute').css("left",e.pageX).css("top",e.pageY).css('display','block');
-    });
-}
-
-function addNode(node_srl,e){
-
-    jQuery('#menu_zone_info').html('');
-    jQuery("#tree_"+node_srl+" > span").click();
-
-    var params ={
-            "menu_item_srl":0
-            ,"parent_srl":node_srl
-            };
-
-    jQuery.exec_json('menu.getMenuAdminTplInfo', params, function(data){
-        jQuery('#menu_zone_info').html(data.tpl).css('position','absolute').css("left",e.pageX).css("top",e.pageY).css('display','block');
-    });
-}
-
-
-function deleteNode(node_srl){
-
-    if(confirm(lang_confirm_delete)){
-        jQuery('#menu_zone_info').html('');
-        var params ={
-                "menu_item_srl":node_srl
-                ,"menu_srl":jQuery("form input[name=menu_srl]").val()
-                };
-        jQuery.exec_json('menu.procMenuAdminDeleteItem', params, function(data){
-            Tree(xml_url);
-        });
-    }
-}
-
-
-function completeInsertMenuItem(ret_obj) {
-    jQuery('#menu_zone_info').html('');
-    Tree(xml_url);
-}
-
-function doMoveMenuInfo() {
-	var $ = jQuery;
-	$(function(){ $('#fo_menu').appendTo(document.body); $('#menu_zone_info').css('width', '550px'); });
-}
+function Tree(url){
+    // clear tree;
+    jQuery('#menu > ul > li > ul').remove();
+
+    if(jQuery("ul.simpleTree > li > a").size() ==0)jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" alt="'+lang_cmd_insert+'" title="'+lang_cmd_insert+'" /></a>').bind("click",function(e){addNode(0,e);}).appendTo("ul.simpleTree > li");
+
+    //ajax get data and transeform ul il
+    jQuery.get(url,function(data){
+        jQuery(data).find("node").each(function(i){
+            var text = jQuery(this).attr("text");
+            var node_srl = jQuery(this).attr("node_srl");
+            var parent_srl = jQuery(this).attr("parent_srl");
+            var url = jQuery(this).attr("url");
+
+            // node
+            var node = jQuery('<li id="tree_'+node_srl+'"><span>'+text+'</span></li>');
+
+            // button
+            jQuery('<a href="#" class="add"><img src="./common/js/plugins/ui.tree/images/iconAdd.gif" alt="'+lang_cmd_insert+'" title="'+lang_cmd_insert+'" /></a>').bind("click",function(e){
+                addNode(node_srl,e);
+                return false;
+            }).appendTo(node);
+
+            jQuery('<a href="#" class="modify"><img src="./common/js/plugins/ui.tree/images/iconModify.gif" alt="'+lang_cmd_modify+'" title="'+lang_cmd_modify+'" /></a>').bind("click",function(e){
+                modifyNode(node_srl,e);
+                return false;
+            }).appendTo(node);
+
+            jQuery('<a href="#" class="delete"><img src="./common/js/plugins/ui.tree/images/iconDel.gif" alt="'+lang_cmd_delete+'" title="'+lang_cmd_delete+'" /></a>').bind("click",function(e){
+                deleteNode(node_srl);
+                return false;
+            }).appendTo(node);
+
+            // insert parent child
+            if(parent_srl>0){
+                if(jQuery('#tree_'+parent_srl+'>ul').length==0) jQuery('#tree_'+parent_srl).append(jQuery('<ul>'));
+                jQuery('#tree_'+parent_srl+'> ul').append(node);
+            }else{
+                if(jQuery('#menu ul.simpleTree > li > ul').length==0) jQuery("<ul>").appendTo('#menu ul.simpleTree > li');
+                jQuery('#menu ul.simpleTree > li > ul').append(node);
+            }
+
+        });
+
+        //button show hide
+        jQuery("#menu li").each(function(){
+            if(jQuery(this).parents('ul').size() > max_menu_depth) jQuery("a.add",this).hide();
+            if(jQuery(">ul",this).size()>0) jQuery(">a.delete",this).hide();
+        });
+
+
+        // draw tree
+        simpleTreeCollection = jQuery('.simpleTree').simpleTree({
+            autoclose: false,
+            afterClick:function(node){
+                //alert("text-"+jQuery('span:first',node).text());
+            },
+            afterDblClick:function(node){
+                //alert("text-"+jQuery('span:first',node).text());
+            },
+            afterMove:function(destination, source, pos){
+
+                jQuery("#menu_zone_info").html("");
+
+                if(destination.size() == 0){
+                    Tree(xml_url);
+                    return;
+                }
+                var menu_srl = jQuery("#fo_menu input[name=menu_srl]").val();
+                var parent_srl = destination.attr('id').replace(/.*_/g,'');
+                var target_srl = source.attr('id').replace(/.*_/g,'');
+                var brothers = jQuery('#'+destination.attr('id')+' > ul > li:not([class^=line])').length;
+                var mode = brothers >1 ? 'move':'insert';
+                var source_srl = pos == 0 ? 0: source.prevAll("li:not(.line)").get(0).id.replace(/.*_/g,'');
+
+                jQuery.exec_json("menu.procMenuAdminMoveItem",{"menu_srl":menu_srl,"parent_srl":parent_srl,"target_srl":target_srl,"source_srl":source_srl,"mode":mode},
+                function(data){
+                    if(data.error>0) Tree(xml_url);
+                });
+
+            },
+
+            // i want you !! made by sol
+            beforeMovedToLine : function(destination, source, pos){
+//                if(typeof(destination.id) == 'undefined') return false;
+                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth);
+            },
+
+            // i want you !! made by sol
+            beforeMovedToFolder : function(destination, source, pos){
+//                if(typeof(destination.id) == 'undefined') return false;
+                return (jQuery(destination).parents('ul').size() + jQuery('ul',source).size() <= max_menu_depth-1);
+            },
+            afterAjax:function()
+            {
+                //alert('Loaded');
+            },
+            animate:true
+            ,docToFolderConvert:true
+        });
+
+
+        // image url replace
+//        jQuery("#menu ul.simpleTree img").attr("src",function(){ return jQuery(this).attr("src").replace("images/","./common/js/plugins/ui.tree/images/");});
+
+
+
+
+        // open all node
+        nodeToggleAll();
+    },"xml");
+}
+
+function nodeToggleAll(){
+    jQuery("[class*=close]", simpleTreeCollection[0]).each(function(){
+        simpleTreeCollection[0].nodeToggle(this);
+    });
+}
+
+
+
+function modifyNode(node_srl,e){
+    jQuery('#menu_zone_info').html('');
+    jQuery("#tree_"+node_srl+" > span").click();
+    var params ={
+            "parent_srl":0
+            ,"menu_item_srl":node_srl
+            };
+
+    jQuery.exec_json('menu.getMenuAdminTplInfo', params, function(data){
+        jQuery('#menu_zone_info').html(data.tpl).css('position','absolute').css("left",e.pageX).css("top",e.pageY).css('display','block');
+    });
+}
+
+function addNode(node_srl,e){
+
+    jQuery('#menu_zone_info').html('');
+    jQuery("#tree_"+node_srl+" > span").click();
+
+    var params ={
+            "menu_item_srl":0
+            ,"parent_srl":node_srl
+            };
+
+    jQuery.exec_json('menu.getMenuAdminTplInfo', params, function(data){
+        jQuery('#menu_zone_info').html(data.tpl).css('position','absolute').css("left",e.pageX).css("top",e.pageY).css('display','block');
+    });
+}
+
+
+function deleteNode(node_srl){
+
+    if(confirm(lang_confirm_delete)){
+        jQuery('#menu_zone_info').html('');
+        var params ={
+                "menu_item_srl":node_srl
+                ,"menu_srl":jQuery("form input[name=menu_srl]").val()
+                };
+        jQuery.exec_json('menu.procMenuAdminDeleteItem', params, function(data){
+            Tree(xml_url);
+        });
+    }
+}
+
+
+function completeInsertMenuItem(ret_obj) {
+    jQuery('#menu_zone_info').html('');
+    Tree(xml_url);
+}
+
+function doMoveMenuInfo() {
+	var $ = jQuery;
+	$(function(){ $('#fo_menu').appendTo(document.body); $('#menu_zone_info').css('width', '550px'); });
+}
diff --git a/modules/menu/tpl/js/sitemap.js b/modules/menu/tpl/js/sitemap.js
new file mode 100644
index 000000000..96b8c8cd3
--- /dev/null
+++ b/modules/menu/tpl/js/sitemap.js
@@ -0,0 +1,219 @@
+/* NHN (developers@xpressengine.com) */
+jQuery(function($){
+
+$('form.siteMap')
+	.delegate('li:not(.placeholder)', 'dropped.st', function() {
+		var $this = $(this), $pkey, $mkey, is_child;
+
+		$pkey = $this.find('>input._parent_key');
+		is_child = !!$this.parent('ul').parent('li').length;
+
+		if(is_child) {
+			$pkey.val($this.parent('ul').parent('li').find('>input._item_key').val());
+		} else {
+			$pkey.val('0');
+		}
+	})
+
+	var editForm = $('#editForm');
+	var menuSrl = null;
+	var menuForm = null;
+	var menuUrl = null;
+
+	$('a._edit').click(function(){
+		resetEditForm();
+		var itemKey = $(this).parent().prevAll('._item_key').val();
+		menuSrl = $(this).parents().prevAll('input[name=menu_srl]').val();
+		menuForm = $('#menu_'+menuSrl);
+		var menuItemSrl = null;
+
+		menuItemSrl = itemKey;
+
+		var params = new Array();
+		var response_tags = new Array('menu_item');
+		params['menu_item_srl'] = menuItemSrl;
+
+		exec_xml("menu","getMenuAdminItemInfo", params, completeGetActList, response_tags);
+	});
+
+	function completeGetActList(obj)
+	{
+		var menuItem = obj.menu_item;
+		menuUrl = menuItem.url;
+		editForm.find('.h2').html('Edit Menu');
+		editForm.find('input[name=menu_srl]').val(menuItem.menu_srl);
+		editForm.find('input[name=menu_item_srl]').val(menuItem.menu_item_srl);
+		editForm.find('input[name=parent_srl]').val(menuItem.parent_srl);
+		editForm.find('input[name=menu_name_key]').val(menuItem.name_key);
+		editForm.find('input[name=menu_name]').val(menuItem.name);
+
+		var moduleType = menuItem.moduleType;
+		if(menuItem.pageType) moduleType = menuItem.pageType;
+		var inputCType = editForm.find('input[name=cType]');
+
+		if(moduleType == 'url')
+		{
+			inputCType[2].checked = true;
+			editForm.find('input[name=menu_url]').val(menuItem.url);
+		}
+		else
+		{
+			inputCType[1].checked = true;
+			editForm.find('select[name=module_type]').val(moduleType);
+			editForm.find('select[name=select_menu_url]').val(menuItem.url);
+		}
+		typeCheck();
+		getModuleList();
+
+		var openWindow = menuItem.open_window;
+		var openWindowForm = editForm.find('input=[name=menu_open_window]');
+		if(openWindow == 'Y') openWindowForm[1].checked = true;
+		else openWindowForm[0].checked = true;
+
+		// button image
+		if(menuItem.normal_btn) $('#normal_btn_preview').html('<img src="'+menuItem.normal_btn+'" /><input type="checkbox" name="isNormalDelete" value="Y"> Delete');
+		if(menuItem.hover_btn) $('#hover_btn_preview').html('<img src="'+menuItem.hover_btn+'" /><input type="checkbox" name="isHoverDelete" value="Y"> Delete');
+		if(menuItem.active_btn) $('#active_btn_preview').html('<img src="'+menuItem.active_btn+'" /><input type="checkbox" name="isActiveDelete" value="Y"> Delete');
+
+		var htmlBuffer = '';
+		for(x in menuItem.groupList.item)
+		{
+			var groupObj = menuItem.groupList.item[x];
+
+			htmlBuffer += '<input type="checkbox" name="group_srls[]" id="group_srls_'+groupObj.group_srl+'" value="'+groupObj.group_srl+'"';
+			if(groupObj.isChecked) htmlBuffer += ' checked="checked" ';
+			htmlBuffer += '/> <label for="group_srls_'+groupObj.group_srl+'">'+groupObj.title+'</label>'
+		}
+		$('#groupList').html(htmlBuffer);
+	}
+
+	$('a._delete').click(function() {
+		if(confirmDelete())
+		{
+			menuSrl = $(this).parents().prevAll('input[name=menu_srl]').val();
+			menuForm = $('#menu_'+menuSrl);
+
+			var menu_item_srl = $(this).parent().prevAll('._item_key').val();
+			menuForm.find('input[name=menu_item_srl]').val(menu_item_srl);
+			menuForm.find('input[name=act]').val('procMenuAdminDeleteItem');
+			menuForm.submit();
+		}
+	});
+
+	var kindModuleLayer = $('#kindModule');
+	var createModuleLayer = $('#createModule');
+	var selectModuleLayer = $('#selectModule');
+	var insertUrlLayer = $('#insertUrl');
+
+	function resetEditForm()
+	{
+		kindModuleLayer.hide();
+		createModuleLayer.hide()
+		selectModuleLayer.hide()
+		insertUrlLayer.hide()
+
+		editForm.find('input[name=menu_item_srl]').val('');
+		editForm.find('input[name=parent_srl]').val(0);
+		editForm.find('input[name=menu_name]').val('');
+		editForm.find('input[name=cType]').attr('checked', false);
+		editForm.find('input=[name=create_menu_url]').val('');
+		editForm.find('input=[name=select_menu_url]').val('');
+		editForm.find('input=[name=menu_url]').val('');
+		editForm.find('input=[name=menu_open_window]')[0].checked = true;
+		editForm.find('input=[name=group_srls\\[\\]]').attr('checked', false);
+	}
+
+	$('a._add').click(function()
+	{
+		var $this = $(this);
+
+		resetEditForm();
+		
+		editForm.find('.h2').html('Add Menu');
+		editForm.find('input[name=menu_srl]').val($this.closest('form').find('input[name=menu_srl]:first').val());
+		editForm.find('input[name=parent_srl]').val($this.parent().prevAll('input._item_key').val());
+	});
+
+	$('input._typeCheck').click(typeCheck);
+
+	function typeCheck()
+	{
+		var inputTypeCheck = $('input._typeCheck');
+		var checkedValue = null;
+		for(var i=0; i<3; i++)
+		{
+			if(inputTypeCheck[i].checked)
+			{
+				checkedValue = inputTypeCheck[i].value;
+				break;
+			}
+		}
+
+		if(checkedValue == 'CREATE')
+		{
+			kindModuleLayer.show();
+			createModuleLayer.show()
+			selectModuleLayer.hide()
+			insertUrlLayer.hide()
+		}
+		else if(checkedValue == 'SELECT')
+		{
+			kindModuleLayer.show();
+			createModuleLayer.hide()
+			selectModuleLayer.show()
+			insertUrlLayer.hide()
+		}
+		// type is URL
+		else
+		{
+			kindModuleLayer.hide();
+			createModuleLayer.hide()
+			selectModuleLayer.hide()
+			insertUrlLayer.show()
+		}
+	}
+
+	$('#kModule').change(getModuleList).change();
+	function getModuleList()
+	{
+		var params = new Array();
+		var response_tags = ['error', 'message', 'module_list'];
+
+		exec_xml('module','procModuleAdminGetList',params, completeGetModuleList, response_tags);
+	}
+
+	function completeGetModuleList(ret_obj)
+	{
+		var module = $('#kModule').val();
+		if(module == 'WIDGET' || module == 'ARTICLE' || module == 'OUTSIDE') module = 'page';
+
+		var midList = ret_obj.module_list[module].list;
+		var htmlBuffer = "";
+		for(x in midList)
+		{
+			var midObject = midList[x];
+			htmlBuffer += '<option value="'+midObject.mid+'"';
+			if(menuUrl == midObject.mid) htmlBuffer += ' selected ';
+			htmlBuffer += '>'+midObject.browser_title+'</option>';
+		}
+		selectModuleLayer.find('select').html(htmlBuffer);
+	}
+
+	$('a.tgMap').click(function() {
+		var $this = $(this);
+		var curToggleStatus = getCookie('sitemap_toggle_'+$this.attr('href'));
+		var toggleStatus = curToggleStatus == 1 ? '0' : 1;
+
+		$($this.attr('href')).slideToggle('fast');
+		$this.closest('.siteMap').toggleClass('fold');
+		setCookie('sitemap_toggle_'+$this.attr('href'), toggleStatus);
+
+		return false;
+	});
+});
+
+function confirmDelete()
+{
+	if(confirm(xe.lang.confirm_delete)) return true;
+	return false;
+}
diff --git a/modules/menu/tpl/menu.html b/modules/menu/tpl/menu.html
index 4aaf5a6b6..05198fa7d 100644
--- a/modules/menu/tpl/menu.html
+++ b/modules/menu/tpl/menu.html
@@ -1,30 +1,30 @@
-<!--%import("css/mmenu.css")-->
-<div class="bd">
-	<ul class="gn">
-		{@ $start = true }
-		{@ $depth = 0 }
-		<!--@foreach($menu as $val)-->
-		<!--@if(!$start && $val->depth == $depth)-->
-		</li>
-		<!--@end-->
-		<!--@if($val->depth > $depth)--> 
-		<ul>
-		<!--@else-->
-		<!--@while($val->depth < $depth)-->
-		</li>
-		</ul>
-		{@ $depth -= 1}
-		<!--@end-->
-		<!--@endif-->
-		<li><a href="{$val->href}" >{$val->text}</a>
-			{@ $start = false }
-			{@ $depth = $val->depth }
-		<!--@end-->
-		<!--@while($depth > 0)-->
-		</li>
-		</ul>
-		{@ $depth -= 1}
-		<!--@end-->
-		</li>
-	</ul>
-</div>
+<!--%import("css/mmenu.css")-->
+<div class="bd">
+	<ul class="gn">
+		{@ $start = true }
+		{@ $depth = 0 }
+		<!--@foreach($menu as $val)-->
+		<!--@if(!$start && $val->depth == $depth)-->
+		</li>
+		<!--@end-->
+		<!--@if($val->depth > $depth)--> 
+		<ul>
+		<!--@else-->
+		<!--@while($val->depth < $depth)-->
+		</li>
+		</ul>
+		{@ $depth -= 1}
+		<!--@end-->
+		<!--@endif-->
+		<li><a href="{$val->href}" >{$val->text}</a>
+			{@ $start = false }
+			{@ $depth = $val->depth }
+		<!--@end-->
+		<!--@while($depth > 0)-->
+		</li>
+		</ul>
+		{@ $depth -= 1}
+		<!--@end-->
+		</li>
+	</ul>
+</div>
diff --git a/modules/menu/tpl/menu_insert.html b/modules/menu/tpl/menu_insert.html
index 039069102..e79efe1e1 100644
--- a/modules/menu/tpl/menu_insert.html
+++ b/modules/menu/tpl/menu_insert.html
@@ -1,26 +1,28 @@
-<!--%import("filter/insert_menu.xml")-->
 <!--%import("js/menu_admin.js")-->
 <!--#include("header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_menu)">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col"><div>{$lang->cmd_menu_insert}</div></th>
-        <td>{nl2br($lang->about_menu_management)}</td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->title}</div></th>
-        <td>
-            <input type="text" name="title" value="{$menu_info->title}" class="inputTypeText w400" />
-            <p>{$lang->about_title}</p>
-        </td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_submit}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertMenu" action="./" method="post">
+<input type="hidden" name="module" value="menu" />
+<input type="hidden" name="act" value="procMenuAdminInsert" />
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<tr>
+			<th scope="col">{$lang->cmd_menu_insert}</th>
+			<td>{nl2br($lang->about_menu_management)}</td>
+		</tr>
+		<tr>
+			<th scope="col">{$lang->title}</th>
+			<td>
+				<input type="text" name="title" value="{$menu_info->title}" />
+				<p>{$lang->about_title}</p>
+			</td>
+		</tr>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn"><input type="submit" value="{$lang->cmd_submit}" /></span>
+</div>
 </form>
diff --git a/modules/menu/tpl/menu_item_info.html b/modules/menu/tpl/menu_item_info.html
index 67abc27fe..98070054c 100644
--- a/modules/menu/tpl/menu_item_info.html
+++ b/modules/menu/tpl/menu_item_info.html
@@ -3,117 +3,121 @@
 <input type="hidden" name="normal_btn" value="{$item_info->normal_btn}" />
 <input type="hidden" name="hover_btn" value="{$item_info->hover_btn}" />
 <input type="hidden" name="active_btn" value="{$item_info->active_btn}" />
-
 <div class="layer" style="display:block;">
-
-    <h4 class="xeAdmin">{$lang->menu}</h4>
-    <button class="xButton" type="button" onclick="hideCategoryInfo();return false" ><span>{$lang->cmd_close}</span></button>
-
-    <div class="layerBody">
-
-        <table cellspacing="0" class="rowTable">
-        <!--@if($item_info->parent_menu_name)-->
-        <tr class="row{$cycle_idx}">
-            <th scope="row"><div>{$lang->parent_menu_name}</div></th>
-            <td>{$item_info->parent_menu_name}</td>
-        </tr>
-        <!--@end-->
-
-        <tr>
-            <th scope="row"><div>{$lang->menu_name}</div></th>
-            <td>
-                <input type="text" name="menu_name" id="menu_name" value="{$item_info->name}" class="inputTypeText w300"/>
-                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','menu_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_url}</div></th>
-            <td>
-                <input type="text" name="menu_url" value="{$item_info->url}" class="inputTypeText" />
-                <a href="{getUrl('module','menu','act','dispMenuAdminMidList')}" onclick="popopen(this.href);return false;" class="button black"><span>{$lang->cmd_search_mid}</span> </a>
-                <p class="clear">{$lang->about_menu_url}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_open_window}</div></th>
-            <td>
-                <input type="checkbox" name="menu_open_window" value="Y" <!--@if($item_info->open_window=="Y")-->checked="checked"<!--@end--> />
-                <p>{$lang->about_menu_open_window}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_expand}</div></th>
-            <td>
-                <input type="checkbox" name="menu_expand" value="Y" <!--@if($item_info->expand=="Y")-->checked="checked"<!--@end--> />
-                <p>{$lang->about_menu_expand}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_img_btn}</div></th>
-            <td><p>{$lang->about_menu_img_btn}</p></td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_normal_btn}</div></th>
-            <td>
-                <div id="menu_normal_btn_zone" <!--@if(!$item_info->normal_btn)-->style="display:none;"<!--@end-->>
-                    <img src="{$item_info->normal_btn}" alt="" id="menu_normal_btn_img" /><br />
-                    <a href="#" onclick="doDeleteButton('menu_normal_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-                </div>
-                <input type="file" name="menu_normal_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_hover_btn}</div></th>
-            <td>
-                <div id="menu_hover_btn_zone") <!--@if(!$item_info->hover_btn)-->style="display:none;"<!--@end-->>
-                    <img src="{$item_info->hover_btn}" alt="" id="menu_hover_btn_img" /><br />
-                    <a href="#" onclick="doDeleteButton('menu_hover_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-                </div>
-                <input type="file" name="menu_hover_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_active_btn}</div></th>
-            <td>
-                <div id="menu_active_btn_zone" <!--@if(!$item_info->active_btn)-->style="display:none;"<!--@end-->>
-                    <img src="{$item_info->active_btn}" alt="" id="menu_active_btn_img" /><br />
-                    <a href="#" onclick="doDeleteButton('menu_active_btn');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-                </div>
-                <input type="file" name="menu_active_btn" value="" class="inputTypeText" onchange="doMenuUploadButton(this); return false;"/>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->menu_group_srls}</div></th>
-            <td>
-                <!--@foreach($group_list as $key=>$val)-->
-                <input type="checkbox" name="group_srls" value="{$key}" id="group_{$key}" <!--@if(is_array($item_info->group_srls)&&in_array($key, $item_info->group_srls))-->checked="checked"<!--@end-->/>
-                <label for="group_{$key}">{$val->title}</label>
-                <!--@end-->
-                <p>{$lang->about_menu_group_srls}</p>
-            </td>
-        </tr>
-        <tr>
-            <th scope="row" colspan="3" class="button"><div>
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-            </div></th>
-        </tr>
-        </table>
-
-        <script type="text/javascript">
-
-        (function($){
-        $("[name^=menu_name_]").bind("blur",function(e){
-            if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){
-                $("[name^=ck_menu_name_]:checked").each(function(i){
-                    $("[name="+$(this).attr("name").substring(3)+"]").val(e.target.value);
-                });
-            }
-        });
-
-        $('input#menu_name').focus();
-        
-        })(jQuery);
-        </script>
-
-    </div>
+	<h3 class="h3">{$lang->menu}</h3>
+	<button type="button" onclick="hideCategoryInfo();return false" >{$lang->cmd_close}</button>
+	<div class="layerBody">
+		<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<!--@if($item_info->parent_menu_name)-->
+			<tr class="row{$cycle_idx}">
+				<th scope="row">{$lang->parent_menu_name}</th>
+				<td>{$item_info->parent_menu_name}</td>
+			</tr>
+			<!--@end-->
+			
+			<tr>
+				<th scope="row">{$lang->menu_name}</th>
+				<td>
+					<input type="text" name="menu_name" id="menu_name" value="{$item_info->name}" />
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','menu_name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a> </td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->menu_url}</th>
+				<td>
+					<input type="text" name="menu_url" value="{$item_info->url}"  />
+					<a href="{getUrl('module','menu','act','dispMenuAdminMidList')}" onclick="popopen(this.href);return false;" class="button black"><span>{$lang->cmd_search_mid}</span> </a>
+					<p>{$lang->about_menu_url}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->menu_open_window}</th>
+				<td> <input type="checkbox" name="menu_open_window" value="Y" <!--@if($item_info->open_window=="Y")-->checked="checked"<!--@end--> />
+					<p>{$lang->about_menu_open_window}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->menu_expand}</th>
+				<td> <input type="checkbox" name="menu_expand" value="Y" <!--@if($item_info->expand=="Y")-->checked="checked"<!--@end--> />
+					<p>{$lang->about_menu_expand}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->menu_img_btn}</th>
+				<td>
+					<p>{$lang->about_menu_img_btn}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->menu_normal_btn}</th>
+				<td> <div id="menu_normal_btn_zone" <!--@if(!$item_info->normal_btn)-->style="display:none;"<!--@end-->> <img src="{$item_info->normal_btn}" alt="" id="menu_normal_btn_img" /><br />
+					<button type="button" onclick="doDeleteButton('menu_normal_btn');">{$lang->cmd_delete}</button>
+			
+					</div>
+			
+			<input type="file" name="menu_normal_btn" value=""  onchange="doMenuUploadButton(this); return false;"/>
+			
+					</td>
+			
+			
+					</tr>
+			
+			<tr>
+				<th scope="row">{$lang->menu_hover_btn}</th>
+				<td> <div id="menu_hover_btn_zone") <!--@if(!$item_info->hover_btn)-->style="display:none;"<!--@end-->> <img src="{$item_info->hover_btn}" alt="" id="menu_hover_btn_img" /><br />
+					<button type="button" onclick="doDeleteButton('menu_hover_btn');return false;">{$lang->cmd_delete}</button>
+			
+					</div>
+			
+			<input type="file" name="menu_hover_btn" value=""  onchange="doMenuUploadButton(this); return false;"/>
+			
+					</td>
+			
+			
+					</tr>
+			
+			<tr>
+				<th scope="row">{$lang->menu_active_btn}</th>
+				<td> <div id="menu_active_btn_zone" <!--@if(!$item_info->active_btn)-->style="display:none;"<!--@end-->> <img src="{$item_info->active_btn}" alt="" id="menu_active_btn_img" /><br />
+					<button type="button" onclick="doDeleteButton('menu_active_btn');return false;">{$lang->cmd_delete}</button>
+			
+					</div>
+			
+			<input type="file" name="menu_active_btn" value=""  onchange="doMenuUploadButton(this); return false;"/>
+			
+					</td>
+			
+			
+					</tr>
+			
+			<tr>
+				<th scope="row">{$lang->menu_group_srls}</th>
+				<td> 
+					<!--@foreach($group_list as $key=>$val)--> 
+					<input type="checkbox" name="group_srls[]" value="{$key}" id="group_{$key}" <!--@if(is_array($item_info->group_srls)&&in_array($key, $item_info->group_srls))-->checked="checked"<!--@end-->/>
+					<label for="group_{$key}">{$val->title}</label>
+					<!--@end-->
+					<p>{$lang->about_menu_group_srls}</p>
+				</td>
+			</tr>
+		</table>
+		</div>
+		<div class="btnArea"> 
+			<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+		<script type="text/javascript">
+			(function($){
+			$("[name^=menu_name_]").bind("blur",function(e){
+				if($("[name=ck_"+$(this).attr("name")+"]:checked").size()>0){
+					$("[name^=ck_menu_name_]:checked").each(function(i){
+						$("[name="+$(this).attr("name").substring(3)+"]").val(e.target.value);
+					});
+				}
+			});
+			
+			$('input#menu_name').focus();
+			
+			})(jQuery);
+		</script>
+	</div>
 </div>
diff --git a/modules/menu/tpl/menu_management.html b/modules/menu/tpl/menu_management.html
index ea633783b..2305e8255 100644
--- a/modules/menu/tpl/menu_management.html
+++ b/modules/menu/tpl/menu_management.html
@@ -1,10 +1,9 @@
-<load target="filter/update_menu_title.xml" />
 <load target="filter/insert_menu_item.xml" />
 <load target="filter/delete_menu_item.xml" />
 <load target="filter/move_menu_item.xml" />
 
-<load target="js/menu_admin.js" type="body" />
-<load target="js/menu_tree.js" type="body" />
+<load target="js/menu_admin.js" type="body" usecdn="true" />
+<load target="js/menu_tree.js" type="body" usecdn="true" />
 
 <!--// tree javascript plugin load -->
 <!--%load_js_plugin("ui.tree")-->
@@ -16,68 +15,70 @@
 <div class="menuManagement">
 
     <!--@if($module == 'admin')-->
-        <form action="./" method="get" onsubmit="return procFilter(this, update_menu_title)">
-        <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
-            <h4 class="xeAdmin">{$lang->menu_management}</h4>
-            <table cellspacing="0" class="rowTable">
-            <tr>
-                <th scope="col"><div>{$lang->title}</div></th>
-                <td>
-                    <div class="fl">
-                        <input type="text" name="title" value="{$menu_info->title}" class="inputTypeText" />
-                    </div>
-                    <div class="fr">
-                        <span class="button"><input type="submit" value="{$lang->cmd_modify}" /></span>
-                    </div>
-                </td>
-            </tr>
-            <tr>
-                <th scope="col"><div>{$lang->menu_management}</div></th>
-                <td class="left">{nl2br($lang->about_menu_management)}
-<span style="float:right"><a href="#" onclick="doReloadTreeMenu('{$menu_info->menu_srl}');return false;" class="button"><span>{$lang->cmd_remake_cache}</span></a></span>
-                </td>
-            </tr>
-            </table>
-        </form>
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+	<form ruleset="updateMenuTitle" action="./" method="post">
+		<input type="hidden" name="module" value="menu" />
+		<input type="hidden" name="act" value="procMenuAdminUpdate" />
+		<input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
+		<h3 class="h3">{$lang->menu_management}</h3>
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0">
+				<tr>
+					<th scope="col">{$lang->title}</th>
+					<td>
+						<input type="text" name="title" value="{$menu_info->title}" />
+						<input type="submit" value="{$lang->cmd_modify}" />					
+					</td>
+				</tr>
+				<tr>
+					<th scope="col">{$lang->menu_management}</th>
+					<td >
+						{nl2br($lang->about_menu_management)} 
+						<button type="button" onclick="doReloadTreeMenu('{$menu_info->menu_srl}');return false;">{$lang->cmd_remake_cache}</button>
+					</td>
+				</tr>
+			</table>
+		</div>
+	</form>
 
     <!--@else-->
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <th scope="col"><div>{$lang->title}</div></th>
-            <td class="left">
-                {$menu_info->title}
-            </td>
-        </tr>
-        <tr>
-            <th scope="col"><div>{$lang->menu_management}</div></th>
-            <td class="left">{nl2br($lang->about_menu_management)}</td>
-        </tr>
-        </table>
+        <div class="table">
+        	<table width="100%" border="1" cellspacing="0">
+        		<tr>
+        			<th scope="col">{$lang->title}</th>
+        			<td >
+        				{$menu_info->title}
+       				</td>
+       			</tr>
+        		<tr>
+        			<th scope="col">{$lang->menu_management}</th>
+        			<td >{nl2br($lang->about_menu_management)}</td>
+       			</tr>
+			</table>
+		</div>
     <!--@end-->
 
 
-    <div class="gap1">
-        <form id="fo_menu" action="./" method="post" onsubmit="return procFilter(this, insert_menu_item)" class="clear" target="tmp_upload_iframe" enctype="multipart/form-data">
-        <input type="hidden" name="title" value="{$menu_info->title}" />
-        <input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
-        <input type="hidden" name="xml_file" value="{$menu_info->xml_file}" />
-        <input type="hidden" name="php_file" value="{$menu_info->php_file}" />
-        <input type="hidden" name="module" value="menu" />
-        <input type="hidden" name="act" value="" />
-        <input type="hidden" name="target" value="" />
-        <div id="menu_zone_info"></div>
-        </form>
-        <div id="menu">
-            <ul class="simpleTree">
-                <li class="root" id='tree_0'><span>{$lang->menu}</span></li>
-            </ul>
-        </div>
-    </div>
+	<form ruleset="insertMenuItem" id="fo_menu" action="./" method="post" enctype="multipart/form-data">
+		<input type="hidden" name="module" value="menu" />
+		<input type="hidden" name="act" value="procMenuAdminInsertItem" />
+		<input type="hidden" name="title" value="{$menu_info->title}" />
+		<input type="hidden" name="menu_srl" value="{$menu_info->menu_srl}" />
+		<input type="hidden" name="xml_file" value="{$menu_info->xml_file}" />
+		<input type="hidden" name="php_file" value="{$menu_info->php_file}" />
+		<input type="hidden" name="module" value="menu" />
+		<input type="hidden" name="target" value="" />
+		<div id="menu_zone_info"></div>
+	</form>
+	<div id="menu">
+		<ul class="simpleTree">
+			<li class="root" id='tree_0'><span>{$lang->menu}</span></li>
+		</ul>
+	</div>
 </div>
 
-<iframe id='tmp_upload_iframe' name='tmp_upload_iframe' style='display:none;width:1px;height:1px;position:absolute;top:-10px;left:-10px'></iframe>
-
-
 <script type="text/javascript">//<![CDATA[
 //언어파일 로드용
 var lang_cmd_insert = "{htmlspecialchars($lang->cmd_insert)}";
diff --git a/modules/menu/tpl/mid_list.html b/modules/menu/tpl/mid_list.html
index d61b6c3b1..d965df703 100644
--- a/modules/menu/tpl/mid_list.html
+++ b/modules/menu/tpl/mid_list.html
@@ -1,55 +1,50 @@
 <!--%import("js/menu_admin.js")-->
 <!--%import("../../common/css/popup.css")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">{$lang->cmd_search_mid}</h3>
-</div>
-
-<div id="popBody">
-    <form action="./" method="get">
-    <input type="hidden" name="module" value="{$module}" />
-    <input type="hidden" name="act" value="{$act}" />
-
-    <select name="module_category_srl" class="w5">
-        <option value="">{$lang->module_category}</option>
-        <!--@foreach($module_category as $key => $val)-->
-        <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-        <!--@end-->
-    </select>
-    <select name="target_module" class="w5">
-        <option value="">{$lang->module}</option>
-        <!--@foreach($module_list as $key => $val)-->
-        <option value="{$val->module}" <!--@if($target_module ==$val->module)-->selected="selected"<!--@end-->>{$val->module}</option>
-        <!--@end-->
-    </select>
-    <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-    <table cellspacing="0" class="rowTable topGap">
-    <thead>
-      <tr>
-          <th scope="row"><div>{$lang->module_category}</div></th>
-          <th scope="row"><div>{$lang->module}</div></th>
-          <th scope="row" class="wide"><div>{$lang->mid}</div></th>
-          <th scope="row"><div>{$lang->cmd_select}</div></th>
-      </tr>
-    </thead>
-    <tbody>
-
-    <!--@foreach($mid_list as $key => $val)-->
-    <tr>
-        <td class="nowrap center">
-            <!--@if(!$val->module_category_srl)-->
-                {$lang->not_exists}
-            <!--@else-->
-                {$module_category[$val->module_category_srl]->title}
-            <!--@end-->
-        </td>
-        <td class="center nowrap">{$val->module}</td>
-        <td>{$val->browser_title} ({$key})</td>
-        <td class="modify center"><a href="#" onclick="doInsertMid('{$key}','{$menu_id}'); return false;">{$lang->cmd_select}</a></td>
-    </tr>
-    <!--@end-->
-    </tbody>
-    </table>
-
-    </form>
-</div>
+<h1 class="h1">{$lang->cmd_search_mid}</h1>
+<form action="./" method="get">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	
+	<select name="module_category_srl">
+		<option value="">{$lang->module_category}</option>
+		<!--@foreach($module_category as $key => $val)-->
+		<option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+		<!--@end-->
+	</select>
+	<select name="target_module">
+		<option value="">{$lang->module}</option>
+		<!--@foreach($module_list as $key => $val)-->
+		<option value="{$val->module}" <!--@if($target_module ==$val->module)-->selected="selected"<!--@end-->>{$val->module}</option>
+		<!--@end-->
+	</select>
+	<input type="submit" name="go_button" id="go_button" value="GO" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="row">{$lang->module_category}</th>
+					<th scope="row">{$lang->module}</th>
+					<th scope="row" >{$lang->mid}</th>
+					<th scope="row">{$lang->cmd_select}</th>
+					</tr>
+				</thead>
+			<tbody>
+				
+				<!--@foreach($mid_list as $key => $val)-->
+				<tr>
+					<td>
+						<!--@if(!$val->module_category_srl)-->
+						{$lang->not_exists}
+						<!--@else-->
+						{$module_category[$val->module_category_srl]->title}
+						<!--@end-->
+						</td>
+					<td>{$val->module}</td>
+					<td>{$val->browser_title} ({$key})</td>
+					<td><button type="button" onclick="doInsertMid('{$key}','{$menu_id}'); return false;">{$lang->cmd_select}</button></td>
+					</tr>
+				<!--@end-->
+				</tbody>
+		</table>
+	</div>
+</form>
diff --git a/modules/menu/tpl/sitemap.html b/modules/menu/tpl/sitemap.html
new file mode 100644
index 000000000..f3cfb30db
--- /dev/null
+++ b/modules/menu/tpl/sitemap.html
@@ -0,0 +1,163 @@
+<script type="text/javascript">
+xe.lang.confirm_delete = "{$lang->confirm_delete}";
+</script>
+<load target="./js/menu_admin.js" usecdn="true" />
+<load target="../../admin/tpl/js/sitemap.js" usecdn="true" />
+<load target="./js/sitemap.js" usecdn="true" />
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<h1 class="h1">{$lang->menu_gnb_sub['siteMap']}</h1>
+
+<block loop="$menu_list=>$key,$value">
+{@$menuSrl = $value->menuSrl}
+<form class="portlet siteMap" id="menu_{$menuSrl}" method="post">
+<input type="hidden" name="module" value="{$module}" />
+<input type="hidden" name="act" value="procMenuAdminArrangeItem" />
+<input type="hidden" name="menu_srl" value="{$menuSrl}" />
+<input type="hidden" name="menu_item_srl" value="" />
+<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
+
+	<h2 class="h2"><input name="title" value="{$value->title}" /></h2>
+	<a href="#nav_{$key}" class="tgMap">{$lang->collapsing}/{$lang->expanding}</a>
+	<ul class="lined" id="nav_{$key}" cond="count($value->menuItems->list > 0)" <!--@if($_COOKIE['sitemap_toggle_#nav_'.$key])-->style="display:none;"<!--@end-->>
+	<block loop="$value->menuItems->list=>$key2,$value2">
+	{@$item = $value2}
+	<include target="sitemap.item.html" />
+	</block>
+	</ul>
+	<p class="btnArea">
+		<span class="btn"><a href="#editMenu" class="modalAnchor _add">{$lang->add_menu}...</a></span>
+		<span class="btn"><button value="procMenuAdminArrangeItem" name="act" type="submit">{$lang->cmd_save}</button></span>
+		<span class="etc">
+			<span class="btn"><button value="procMenuAdminDelete" name="act" type="submit" onclick="return confirmDelete();">{$lang->cmd_delete}</button></span>
+			<span class="btn"><a href="#remakeCache" onclick="doReloadTreeMenu('{$menuSrl}');return false;">{$lang->cmd_remake_cache}</a></span>
+		</span>
+	</p>
+</form>
+</block>
+
+<form action="./" method="post" class="form">
+<input type="hidden" name="module" value="{$module}" />
+<input type="hidden" name="act" value="procMenuAdminInsert" />
+<input type="hidden" name="title" value="{$lang->untitle}" />
+<input type="hidden" name="success_return_url" value="{getUrl('', 'module', 'admin', 'act', 'dispMenuAdminSiteMap')}" />
+<div class="btnArea">
+	<span class="btn medium"><button type="submit">{$lang->add_new_sitemap}...</button></span>
+</div>
+</form>
+<div class="modal" id="editMenu">
+	<div class="fg">
+		<form ruleset="insertMenuItem" id="editForm" action="./" method="post" enctype="multipart/form-data" class="form">
+		<input type="hidden" name="module" value="menu" />
+		<input type="hidden" name="act" value="procMenuAdminInsertItem" />
+		<input type="hidden" name="menu_srl" value="" />
+		<input type="hidden" name="menu_item_srl" value="{$menu_info->menu_srl}" />
+		<input type="hidden" name="parent_srl" value="{$menu_info->menu_srl}" />
+			<h2 class="h2"></h2>
+			<ul>
+				<li>
+					<p class="q"><label for="name">{$lang->menu_name}({$lang->browser_title}) <em>*</em></label></p>
+					<div class="a multiLangEdit">
+						<input type="hidden" class="vLang" name="menu_name_key" />
+						<input type="text" class="vLang" id="name" name="menu_name" />
+						<!-- Multilingual -->
+						<div id="langEdit" class="langEdit tgContent">
+							<ul class="langList"></ul>
+							<div class="langInput">
+								<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+								<ul>
+									{@
+										/* move current language to the top */
+										$a = array($lang_type=>$lang_supported[$lang_type]);
+										unset($lang_supported[$lang_type]);
+										$lang_supported = array_merge($a, $lang_supported);
+									}
+									<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
+								</ul>
+								<div class="action">
+									<div class="btnArea">
+										<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+									</div>
+									<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+								</div>
+							</div>
+						</div>
+						<!-- /Multilingual -->
+						<span class="desc"><a href="#langEdit" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+					</div>
+				</li>
+				<li>
+					<p class="q">{$lang->module_or_url} <em>*</em></p>
+					<p class="a">
+						<input type="radio" name="cType" id="cModule" class="_typeCheck" value="CREATE" /> <label for="cModule">{$lang->create_module_in_menu}</label>
+						<input type="radio" name="cType" id="sModule" class="_typeCheck" value="SELECT" /> <label for="sModule">{$lang->select_module_in_menu}</label>
+						<input type="radio" name="cType" id="url" class="_typeCheck" value="URL" /> <label for="url">{$lang->menu_url}</label>
+					</p>
+				</li>
+				<li id="kindModule">
+					<p class="q"><label for="kModule">{$lang->select_module_in_menu} <em>*</em></label></p>
+					<p class="a">
+						<select style="width:290px" id="kModule" name="module_type">
+							<block loop="$module_list=>$key,$value">
+							<optgroup label="{$lang->page}" cond="$key=='page'">
+								<option value="ARTICLE">{$lang->page_type_name['ARTICLE']}</option>
+								<option value="WIDGET">{$lang->page_type_name['WIDGET']}</option>
+								<option value="OUTSIDE">{$lang->page_type_name['OUTSIDE']}</option>
+							</optgroup>
+							<option value="{$key}" cond="$key!='page'">{$value->title}</option>
+							</block>
+						</select>
+					</p>
+				</li>
+				<li id="createModule">
+					<p class="q"><label for="cModule_id">{$lang->create_mid_in_menu} <em>*</em></label></p>
+					<div class="a">
+						<input type="text" id="cModule_id" name="create_menu_url" />
+					</div>
+				</li>
+				<li id="selectModule">
+					<p class="q"><label for="sModule_id">{$lang->select_mid_in_menu} <em>*</em></label></p>
+					<p class="a">
+						<select style="width:290px" id="sModule_id" name="select_menu_url">
+						</select>
+					</p>
+				</li>
+				<li id="insertUrl">
+					<p class="q"><label for="link_url">{$lang->menu_url} <em>*</em></label></p>
+					<div class="a">
+						<input type="text" id="link_url" name="menu_url" value="http://" />
+					</div>
+				</li>
+				<li>
+					<p class="q">{$lang->about_menu_open_window} <em>*</em></p>
+					<p class="a">
+						<input type="radio" name="menu_open_window" id="self" value="N" /> <label for="self">{$lang->menu_self_window}</label>
+						<input type="radio" name="menu_open_window" id="blank" value="Y" /> <label for="blank">{$lang->menu_open_window}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->menu_img_btn}</p>
+					<p class="a">
+						<span id="normal_btn_preview"></span><br />
+						<input type="file" name="menu_normal_btn" id="menu_normal_btn" /> <label for="menu_normal_btn">{$lang->menu_normal_btn}</label><br />
+						<span id="hover_btn_preview"></span><br />
+						<input type="file" name="menu_hover_btn" id="menu_hover_btn" /> <label for="menu_hover_btn">{$lang->menu_hover_btn}</label><br />
+						<span id="active_btn_preview"></span><br />
+						<input type="file" name="menu_active_btn" id="menu_active_btn" /> <label for="menu_active_btn">{$lang->menu_active_btn}</label>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->menu_group_srls}</p>
+					<p class="a" id="groupList">
+						<block loop="$group_list=>$key,$value"><input type="checkbox" name="group_srls[]" id="group_srls_{$value->group_srl}" value="{$value->group_srl}" /> <label for="group_srls_{$value->group_srl}">{$value->title}</label></block>
+					</p>
+				</li>
+			</ul>
+			<div class="btnArea">
+				<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+			</div>
+		</form>
+	</div>
+</div>
diff --git a/modules/menu/tpl/sitemap.item.html b/modules/menu/tpl/sitemap.item.html
new file mode 100644
index 000000000..6cb9303ad
--- /dev/null
+++ b/modules/menu/tpl/sitemap.item.html
@@ -0,0 +1,18 @@
+	<li>
+		<input type="hidden" name="parent_key[]" value="{$item['parent_srl']}" class="_parent_key" />
+		<input type="hidden" name="item_key[]" value="{$item['node_srl']}" class="_item_key" />
+		<!--@if($item['href'])--><a href="{$item['href']}" class="ms" target="_blank">{$item['text']}</a><!--@else-->{$item['text']}<!--@end-->
+		<span class="side">
+			<block cond="$item['setup_index_act']"><a href="{getUrl('', 'module', 'admin', 'act', $item['setup_index_act'], 'module_srl', $item['module_srl'])}">{$lang->cmd_setup}</a> |</block>
+			<a href="#editMenu" class="modalAnchor _edit">{$lang->cmd_edit}</a> |
+			<a href="#delete" class="_delete">{$lang->cmd_delete}</a> |
+			<a href="#editMenu" class="modalAnchor _add _child">{$lang->add}</a>
+		</span>
+		<ul cond="count($item['list']>0)">
+		<block loop="$item['list']=>$idx,$val">
+		{@$item = $val}
+		<include target="sitemap.item.html" />
+		</block>
+		</ul>
+	</li>
+
diff --git a/modules/message/conf/info.xml b/modules/message/conf/info.xml
index 28fdcc214..02e6186a0 100644
--- a/modules/message/conf/info.xml
+++ b/modules/message/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">오류 표시</title>
-    <title xml:lang="jp">エラー表示</title>
-    <title xml:lang="zh-CN">错误信息</title>
-    <title xml:lang="en">Display Errors</title>
-    <title xml:lang="vi">Hiển thị lỗi</title>
-    <title xml:lang="es">Mostrar el error</title>
-    <title xml:lang="ru">Отображение ошибок</title>
-    <title xml:lang="zh-TW">錯誤訊息</title>
-    <title xml:lang="tr">Hata Görüntüleme</title>
-    <description xml:lang="ko">오류 및 각종 시스템 메세지 관리 모듈</description>
-    <description xml:lang="jp">エラー及びシステムメッセージ管理モジュール</description>
-    <description xml:lang="zh-CN">管理错误信息及各种系统信息的模块。</description>
-    <description xml:lang="en">This module managers erros and system messages.</description>
-    <description xml:lang="vi">Module này quản lý những thông báo lỗi của hệ thống.</description>
-    <description xml:lang="es">Este módulo es para manejar los errores y mensajes del sistema.</description>
-    <description xml:lang="ru">Этот модуль управляет ошибками и системными сообщениями.</description>
-    <description xml:lang="zh-TW">管理錯誤訊息及各種系統訊息的模組。</description>
-    <description xml:lang="tr">Bu modül, hataları ve sistem mesajlarını yönetir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>system</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">오류 표시</title>
+    <title xml:lang="jp">エラー表示</title>
+    <title xml:lang="zh-CN">错误信息</title>
+    <title xml:lang="en">Display Errors</title>
+    <title xml:lang="vi">Hiển thị lỗi</title>
+    <title xml:lang="es">Mostrar el error</title>
+    <title xml:lang="ru">Отображение ошибок</title>
+    <title xml:lang="zh-TW">錯誤訊息</title>
+    <title xml:lang="tr">Hata Görüntüleme</title>
+    <description xml:lang="ko">오류 및 각종 시스템 메세지 관리 모듈</description>
+    <description xml:lang="jp">エラー及びシステムメッセージ管理モジュール</description>
+    <description xml:lang="zh-CN">管理错误信息及各种系统信息的模块。</description>
+    <description xml:lang="en">This module managers erros and system messages.</description>
+    <description xml:lang="vi">Module này quản lý những thông báo lỗi của hệ thống.</description>
+    <description xml:lang="es">Este módulo es para manejar los errores y mensajes del sistema.</description>
+    <description xml:lang="ru">Этот модуль управляет ошибками и системными сообщениями.</description>
+    <description xml:lang="zh-TW">管理錯誤訊息及各種系統訊息的模組。</description>
+    <description xml:lang="tr">Bu modül, hataları ve sistem mesajlarını yönetir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>system</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/message/lang/en.lang.php b/modules/message/lang/en.lang.php
deleted file mode 100644
index 147edfa1d..000000000
--- a/modules/message/lang/en.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (basic)
-     **/
-
-    $lang->message = 'Display Errors';
-    $lang->about_skin = "You may select skins of error messages";
-?>
diff --git a/modules/message/lang/es.lang.php b/modules/message/lang/es.lang.php
deleted file mode 100644
index 5182af3c0..000000000
--- a/modules/message/lang/es.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/message/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español (básico)
- **/
-
-    $lang->message = 'Mostrar el error';
-    $lang->about_skin = "Usted puede seleccionar los temas de los mensajes del error.";
-?>
diff --git a/modules/message/lang/fr.lang.php b/modules/message/lang/fr.lang.php
deleted file mode 100644
index 0fb7d1446..000000000
--- a/modules/message/lang/fr.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) traduit par Pierre Duvent <PierreDuvent@gamil.com>
-     * @brief  Paque du langage en français pour le module de Message
-     **/
-
-    $lang->message = 'Montrer Erreurs';
-    $lang->about_skin = "Vous pouvez choisir un habillage pour le message des erreurs";
-?>
diff --git a/modules/message/lang/jp.lang.php b/modules/message/lang/jp.lang.php
deleted file mode 100644
index 75b7a511c..000000000
--- a/modules/message/lang/jp.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa
-     * @brief  日本語言語パッページ（基本的な内容のみ）
-     **/
-
-    $lang->message = 'エラー表示';
-    $lang->about_skin = 'メッセージを表示する際のスキンが指定出来ます。';
-?>
diff --git a/modules/message/lang/ko.lang.php b/modules/message/lang/ko.lang.php
deleted file mode 100644
index a97922d3e..000000000
--- a/modules/message/lang/ko.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->message = '오류 표시';
-    $lang->about_skin = '오류 메시지용 스킨을 지정하실 수 있습니다.';
-?>
diff --git a/modules/message/lang/lang.xml b/modules/message/lang/lang.xml
new file mode 100644
index 000000000..ee439f4ff
--- /dev/null
+++ b/modules/message/lang/lang.xml
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="message">
+		<value xml:lang="ko"><![CDATA[오류 표시]]></value>
+		<value xml:lang="en"><![CDATA[Display Errors]]></value>
+		<value xml:lang="jp"><![CDATA[エラー表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[错误信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[錯誤提示]]></value>
+		<value xml:lang="fr"><![CDATA[Montrer Erreurs]]></value>
+		<value xml:lang="ru"><![CDATA[Отображать ошибки]]></value>
+		<value xml:lang="es"><![CDATA[Mostrar el error]]></value>
+		<value xml:lang="tr"><![CDATA[Hata Görüntüleme]]></value>
+		<value xml:lang="vi"><![CDATA[Hiển thị lỗi]]></value>
+	</item>
+	<item name="about_skin">
+		<value xml:lang="ko"><![CDATA[오류 메시지용 스킨을 지정하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may select skins for error messages.]]></value>
+		<value xml:lang="jp"><![CDATA[エラーメッセージを表示する際のスキンを指定できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[提示信息可以指定皮肤。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[提示訊息時，可以指定面板。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez choisir un habillage pour le message des erreurs]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете выбрать скин сообщений об ошибках]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede seleccionar los temas de los mensajes del error.]]></value>
+		<value xml:lang="tr"><![CDATA[Hata mesajlarının dış görünümlerini seçebilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể chọn giao diện khi hiển thị lỗi.]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/message/lang/ru.lang.php b/modules/message/lang/ru.lang.php
deleted file mode 100644
index 58da27fcc..000000000
--- a/modules/message/lang/ru.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->message = 'Отображать ошибки';
-    $lang->about_skin = "Вы можете выбрать скин сообщений об ошибках";
-?>
diff --git a/modules/message/lang/tr.lang.php b/modules/message/lang/tr.lang.php
deleted file mode 100644
index 231e7ab97..000000000
--- a/modules/message/lang/tr.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (basic)
-     **/
-
-    $lang->message = 'Hata Görüntüleme';
-    $lang->about_skin = "Hata mesajlarının dış görünümlerini seçebilirsiniz";
-?>
diff --git a/modules/message/lang/vi.lang.php b/modules/message/lang/vi.lang.php
deleted file mode 100644
index 7b19009d9..000000000
--- a/modules/message/lang/vi.lang.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->message = 'Hiển thị lỗi';
-    $lang->about_skin = "Bạn có thể chọn giao diện khi hiển thị lỗi.";
-?>
diff --git a/modules/message/lang/zh-CN.lang.php b/modules/message/lang/zh-CN.lang.php
deleted file mode 100644
index 3bcdc5760..000000000
--- a/modules/message/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com) 翻译：guny
-     * @brief  错误信息模块简体中文语言包
-     **/
-
-    $lang->message = '错误信息';
-    $lang->about_skin = "提示信息可以指定皮肤。";
-?>
\ No newline at end of file
diff --git a/modules/message/lang/zh-TW.lang.php b/modules/message/lang/zh-TW.lang.php
deleted file mode 100644
index 1cedd9fec..000000000
--- a/modules/message/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-    /**
-     * @file   modules/message/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  訊息(message)模組正體中文語言
-     **/
-
-    $lang->message = '錯誤提示';
-    $lang->about_skin = "提示訊息時，可以指定面板。";
-?>
\ No newline at end of file
diff --git a/modules/message/m.skins/default/system_message.html b/modules/message/m.skins/default/system_message.html
index 483f96c8e..9c0b8250f 100644
--- a/modules/message/m.skins/default/system_message.html
+++ b/modules/message/m.skins/default/system_message.html
@@ -1,63 +1,64 @@
-<!--%import("message.css")-->
-<div class="bd">
-	<div class="hx h2">
-		<h2>{$system_message}</h2>
-	</div>
-	<div class="co">
-		<!--@if(!$is_logged)-->
-        {@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
-        {@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
-        {@ Context::addJsFile("./common/js/x.js", true, '', -100000) }
-        {@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
-        {@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
-        {@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
-		<!--%import("./filter/login.xml")-->
-		<!--%import("./filter/openid_login.xml")-->
-		<div class="mLogin" id="gLogin">
-			<form action="./" method="post" onsubmit="return procFilter(this, message_login)" id="gForm" class="ff">
-				<fieldset>
-					<ul>
-						<li><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" value="" /></li>
-						<li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li>
-					</ul>
-					<p>
-						<input type="checkbox" name="keep_signed" id="keepid" value="Y" />						
-						<label for="keepid">{$lang->keep_signed}</label>
-					</p>
-					<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
-					<ul class="hp">
-						<li><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
-						<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
-						<!--@if($member_config->enable_openid=='Y')-->
-						<li><a href="#oLogin">Open ID</a></li>
-						<!--@end-->
-					</ul>
-				</fieldset>
-			</form>
-		</div>
-		<!-- OpenID -->
-		<!--@if($member_config->enable_openid=='Y')-->
-		<div class="mLogin" id="oLogin">
-			<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="oForm" class="ff">
-				<fieldset>
-					<ul>
-						<li><label for="openid">Open ID</label><input type="text" name="openid" id="openid" value="" /></li>
-					</ul>
-					<div class="buttonArea">
-					<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
-					</div>
-					<ul class="hp">
-						<li><a href="#gLogin">{$lang->cmd_common_id}</a></li>
-					</ul>
-				</fieldset>
-			</form>
-		</div>
-		<!--@end-->
-		<!--@end-->
-		<!--@if($is_logged)-->
-		<div class="logOut">
-			<a href="{getUrl('act','dispMemberLogout','module','')}" class="bn dark">{$lang->cmd_logout}</a>
-		</div>
-		<!--@end-->
-	</div>
-</div>
+<!--%import("message.css")-->
+<div class="bd">
+	<div class="hx h2">
+		<h2>{$system_message}</h2>
+	</div>
+	<div class="co">
+		<!--@if(!$is_logged)-->
+        {@ Context::addJsFile("./common/js/jquery.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/js_app.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/x.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/common.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/xml_handler.js", true, '', -100000) }
+        {@ Context::addJsFile("./common/js/xml_js_filter.js", true, '', -100000) }
+		<!--%import("./filter/openid_login.xml")-->
+		<div class="mLogin" id="gLogin">
+			<form action="./" method="post" ruleset="@login" id="gForm" class="ff">
+			<input type="hidden" name="module" value="member" />
+			<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+				<fieldset>
+					<ul>
+						<li><label for="uid">{$lang->user_id}</label><input type="text" name="user_id" id="uid" value="" /></li>
+						<li><label for="upw">{$lang->password}</label><input type="password" name="password" id="upw" value="" /></li>
+					</ul>
+					<p>
+						<input type="checkbox" name="keep_signed" id="keepid" value="Y" />						
+						<label for="keepid">{$lang->keep_signed}</label>
+					</p>
+					<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
+					<ul class="hp">
+						<li><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
+						<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
+						<!--@if($member_config->enable_openid=='Y')-->
+						<li><a href="#oLogin">Open ID</a></li>
+						<!--@end-->
+					</ul>
+				</fieldset>
+			</form>
+		</div>
+		<!-- OpenID -->
+		<!--@if($member_config->enable_openid=='Y')-->
+		<div class="mLogin" id="oLogin">
+			<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" id="oForm" class="ff">
+				<fieldset>
+					<ul>
+						<li><label for="openid">Open ID</label><input type="text" name="openid" id="openid" value="" /></li>
+					</ul>
+					<div class="buttonArea">
+					<input type="submit" value="{$lang->cmd_login}" class="bn dark" />
+					</div>
+					<ul class="hp">
+						<li><a href="#gLogin">{$lang->cmd_common_id}</a></li>
+					</ul>
+				</fieldset>
+			</form>
+		</div>
+		<!--@end-->
+		<!--@end-->
+		<!--@if($is_logged)-->
+		<div class="logOut">
+			<a href="{getUrl('act','dispMemberLogout','module','')}" class="bn dark">{$lang->cmd_logout}</a>
+		</div>
+		<!--@end-->
+	</div>
+</div>
diff --git a/modules/message/message.admin.controller.php b/modules/message/message.admin.controller.php
index b9f22ac55..eed7ee199 100644
--- a/modules/message/message.admin.controller.php
+++ b/modules/message/message.admin.controller.php
@@ -1,31 +1,35 @@
-<?php
-    /**
-     * @class  messageAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  message module의 admin controller class
-     **/
-
-    class messageAdminController extends message {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정
-         **/
-        function procMessageAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args->skin = Context::get('skin');
-
-            // module Controller 객체 생성하여 입력
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('message',$args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage('success_updated');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  messageAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of message module
+     **/
+
+    class messageAdminController extends message {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Configuration
+         **/
+        function procMessageAdminInsertConfig() {
+            // Get information
+            $args->skin = Context::get('skin');
+            // Create a module Controller object 
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('message',$args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispMessageAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+    }
+?>
diff --git a/modules/message/message.admin.view.php b/modules/message/message.admin.view.php
index 62f8ccdf8..6a3322db6 100644
--- a/modules/message/message.admin.view.php
+++ b/modules/message/message.admin.view.php
@@ -1,40 +1,38 @@
-<?php
-    /**
-     * @class  messageAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  message모듈의 admin view class
-     **/
-
-    class messageAdminView extends message {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정 
-         **/
-        function dispMessageAdminConfig() {
-            // 스킨 목록을 구해옴
-            $oModuleModel = &getModel('module');
-            $skin_list = $oModuleModel->getskins($this->module_path);
-            Context::set('skin_list', $skin_list);
-
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $config = $oModuleModel->getModuleConfig('message');
-            Context::set('config',$config);
-
-            // 템플릿 파일 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('skin_list..title');				
-			
-            $this->setTemplateFile('config');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  messageAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the message module
+     **/
+
+    class messageAdminView extends message {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Configuration
+         **/
+        function dispMessageAdminConfig() {
+            // Get a list of skins(themes)
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getskins($this->module_path);
+            Context::set('skin_list', $skin_list);
+            // Get configurations (using module model object)
+            $config = $oModuleModel->getModuleConfig('message');
+            Context::set('config',$config);
+            // Set a template file
+            $this->setTemplatePath($this->module_path.'tpl');
+			
+			//Security
+			$security = new Security();
+			$security->encodeHTML('skin_list..title');				
+			
+            $this->setTemplateFile('config');
+        }
+
+    }
+?>
diff --git a/modules/message/message.class.php b/modules/message/message.class.php
index 1ef02f550..748f61962 100644
--- a/modules/message/message.class.php
+++ b/modules/message/message.class.php
@@ -1,37 +1,37 @@
-<?php
-    /**
-     * @class  message
-     * @author NHN (developers@xpressengine.com)
-     * @brief  message모듈의 high class
-     **/
-
-    class message extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object();
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  message
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of message module
+     **/
+
+    class message extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            return new Object();
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/message/message.mobile.php b/modules/message/message.mobile.php
index 458b091b2..31bb66869 100644
--- a/modules/message/message.mobile.php
+++ b/modules/message/message.mobile.php
@@ -4,29 +4,26 @@
     class messageMobile extends messageView {
 
         /**
-         * @brief 초기화
+         * @brief Initialization
          **/
         function init() {
         }
 
         /**
-         * @brief 메세지 출력 
+         * @brief Message output
          **/
         function dispMessage() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
+            // Get configurations (using module model object)
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('message');
             if(!$config->skin) $config->skin = 'default';
-
-            // 템플릿 경로를 지정
+            // Set the template path
             $template_path = sprintf('%sm.skins/%s', $this->module_path, $config->skin);
-
-            // 회원 관리 정보를 받음
+            // Get the member configuration
             $oModuleModel = &getModel('module');
             $member_config = $oModuleModel->getModuleConfig('member');
             Context::set('member_config', $member_config);
-
-            // ssl 사용시 현재 https접속상태인지에 대한 flag및 https url 생성
+            // Set a flag to check if the https connection is made when using SSL and create https url 
             $ssl_mode = false;
             if($member_config->enable_ssl == 'Y') {
                 if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
@@ -35,6 +32,9 @@
 
             Context::set('system_message', nl2br($this->getMessage()));
 
+			Context::set('act', 'procMemberLogin');
+			Context::set('mid', '');
+
             $this->setTemplatePath($template_path);
             $this->setTemplateFile('system_message');
         }
diff --git a/modules/message/message.view.php b/modules/message/message.view.php
index e8806c152..015307c49 100644
--- a/modules/message/message.view.php
+++ b/modules/message/message.view.php
@@ -1,47 +1,55 @@
-<?php
-    /**
-     * @class  messageView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  message모듈의 view class
-     **/
-
-    class messageView extends message {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 메세지 출력 
-         **/
-        function dispMessage() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('message');
-            if(!$config->skin) $config->skin = 'default';
-
-            // 템플릿 경로를 지정
-            $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
-
-            // 회원 관리 정보를 받음
-            $oModuleModel = &getModel('module');
-            $member_config = $oModuleModel->getModuleConfig('member');
-            Context::set('member_config', $member_config);
-
-            // ssl 사용시 현재 https접속상태인지에 대한 flag및 https url 생성
-            $ssl_mode = false;
-            if($member_config->enable_ssl == 'Y') {
-                if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
-            }
-            Context::set('ssl_mode',$ssl_mode);
-
-            Context::set('system_message', nl2br($this->getMessage()));
-
-            $this->setTemplatePath($template_path);
-            $this->setTemplateFile('system_message');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  messageView
+     * @author NHN (developers@xpressengine.com)
+     * @brief view class of the message module
+     **/
+
+    class messageView extends message {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Display messages
+         **/
+        function dispMessage() {
+        	//setcookie for redirect url in case of going to member sign up
+        	setcookie("XE_REDIRECT_URL", $_SERVER['REQUEST_URI']);
+            // Get configurations (using module model object)
+            $oModuleModel = &getModel('module');
+            $this->module_config = $config = $oModuleModel->getModuleConfig('message', $this->module_info->site_srl);
+            if(!$config->skin){
+	        $config->skin = 'default';
+		$template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
+	    }else{
+		//check theme
+		$config_parse = explode('.', $config->skin);
+		if (count($config_parse) > 1){
+		    $template_path = sprintf('./themes/%s/modules/message/', $config_parse[0]);
+		}else{
+		    $template_path = sprintf('%sskins/%s', $this->module_path, $config->skin);
+		}
+	    }
+            // Template path
+            $this->setTemplatePath($template_path);
+
+            // Get the member configuration
+            $member_config = $oModuleModel->getModuleConfig('member');
+            Context::set('member_config', $member_config);
+            // Set a flag to check if the https connection is made when using SSL and create https url 
+            $ssl_mode = false;
+            if($member_config->enable_ssl == 'Y') {
+                if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
+            }
+            Context::set('ssl_mode',$ssl_mode);
+
+            Context::set('system_message', nl2br($this->getMessage()));
+
+			$this->setTemplateFile('system_message');
+        }
+    }
+?>
diff --git a/modules/message/skins/default/http_status_code.html b/modules/message/skins/default/http_status_code.html
new file mode 100644
index 000000000..b3fd23bde
--- /dev/null
+++ b/modules/message/skins/default/http_status_code.html
@@ -0,0 +1,18 @@
+<style type="text/css">
+.sorry{width:50%;margin:2em auto;padding:2em 3em;border:4px solid #444;font-family:Tahoma, Geneva, sans-serif;background:#666;border-radius:10px;box-shadow:0 0 10px #999;overflow:hidden}
+.sorry .hx{float:left;margin:0 20px 0 0;color:#fff}
+.sorry .msg{float:left;border-left:1px solid #fff;padding:0 0 0 20px;color:#eee}
+.sorry h1{font-size:32px;margin:0;white-space:nowrap}
+.sorry p{font-size:16px;line-height:1.5;margin:0}
+@media only all and (max-width:480px){
+.sorry{width:80%}
+}
+</style>
+<div class="sorry">
+	<h1 class="hx">Sorry!</h1>
+	<div class="msg">
+		<h1>{$http_status_code}</h1>
+		<p>{$http_status_message}</p><br />
+		<p>{$system_message}</p>
+	</div>
+</div>
diff --git a/modules/message/skins/default/message.css b/modules/message/skins/default/message.css
index 42cb64378..441dd0e35 100644
--- a/modules/message/skins/default/message.css
+++ b/modules/message/skins/default/message.css
@@ -1,39 +1,33 @@
-@charset "utf-8";
-/* NHN | dece24@nhncorp.com */
-#loginAccess{ position:relative; width:384px; border:2px solid #757575; margin:30px auto; padding:20px 0 0 0; background:#fff; font-size:12px; font-family:Tahoma; line-height:normal;}
-#loginAccess form{ margin:0; padding:0;}
-#loginAccess fieldset{ border:0; margin:0; padding:0;}
-#loginAccess h1{ margin:0 28px 20px 28px; font-size:12px; color:#e77161;}
-#loginAccess ul{ margin:0; padding:0; list-style:none;}
-#loginAccess .mLogin{ display:none;}
-#loginAccess .idpw{ margin:0 28px 20px 28px;}
-#loginAccess .oid{ margin:0 28px 20px 28px;}
-#loginAccess .idpw li{ margin:0 0 5px 0;}
-#loginAccess .inputText{ font-size:12px; height:22px; color:#767676; font-weight:bold; border:1px solid #b7b7b7; border-right-color:#e1e1e1; border-bottom-color:#e1e1e1;}
-#loginAccess .idpw .inputText{ width:316px; padding:8px 0 0 10px;}
-#loginAccess .oid .inputText{ width:291px; padding:8px 0 0 35px; background:url(./images/openid_login_bg.gif) no-repeat 10px center;}
-#loginAccess .inputCheck{ width:13px; height:13px; margin:0; padding:0; vertical-align:middle;}
-#loginAccess label{ vertical-align:middle;}
-#loginAccess #warning{ display:none; margin:0 0 20px 0;}
-#loginAccess #warning.open{ display:block;}
-#loginAccess #warning p{ margin:0;}
-#loginAccess .buttonArea{ position:relative; margin:0 28px; padding:0; color:#767676; *zoom:1;}
-#loginAccess .buttonArea .keeping{ position:relative; margin:0 0 20px 0; height:32px; line-height:32px;}
-#loginAccess #gLogin .buttonArea .buttonAccount{ position:absolute; top:0; right:0;}
-#loginAccess #oLogin .buttonArea{ text-align:center; margin-bottom:20px;}
-#loginAccess .buttonAccount,
-#loginAccess .buttonAccount a,
-#loginAccess .buttonAccount input{ position:relative; display:inline-block; margin:0; padding:0; overflow:visible; height:32px; line-height:32px; font-size:12px; font-weight:bold; color:#fff; vertical-align:middle; cursor:pointer; border:0; text-decoration:none !important; background:transparent url(./images/buttonAction.gif) no-repeat;}
-#loginAccess .buttonAccount{ margin:0 4px 0 0; background-position:left top;}
-#loginAccess .buttonAccount a,
-#loginAccess .buttonAccount input{ left:4px; background-position:right top; *vertical-align:top; padding:0 24px 0 36px;}
-#loginAccess .help{ position:relative; padding:15px 0; background:#fafafa; border-top:1px solid #d9d9d9; text-align:center;}
-#loginAccess .help li{ display:inline; border-left:1px solid #c3c3c3; padding:0 0 0 10px; margin:0 6px 0 0; line-height:1;}
-#loginAccess .help li.first{ border:0; padding:0;}
-#loginAccess .help a{ text-decoration:none; color:#333;}
-#loginAccess .help a:hover,
-#loginAccess .help a:active,
-#loginAccess .help a:focus{ text-decoration:underline;}
-#loginAccess .logOut{ text-align:left; margin:0 28px; padding:0 0 20px 0;}
-.gLogin #gLogin,
-.oLogin #oLogin{ display:block;}
\ No newline at end of file
+@charset "utf-8";
+/* NHN | dece24@nhncorp.com */
+#loginAccess{position:relative;width:384px;border:2px solid #757575;margin:30px auto;padding:20px 0 0 0;background:#fff;font-size:12px;font-family:Tahoma;line-height:normal;border-radius:5px;box-shadow:0 0 10px #ccc}
+#loginAccess form{margin:0;padding:0}
+#loginAccess fieldset{border:0;margin:0;padding:0}
+#loginAccess h1{margin:0 28px 20px 28px;font-size:12px;color:#e77161}
+#loginAccess ul{margin:0;padding:0;list-style:none}
+#loginAccess .idpw{margin:0 28px 20px 28px}
+#loginAccess .idpw li{margin:0 0 5px 0}
+#loginAccess .inputText{font-size:12px;height:22px;color:#767676;font-weight:bold;border:1px solid #b7b7b7;border-right-color:#e1e1e1;border-bottom-color:#e1e1e1}
+#loginAccess .idpw .inputText{width:316px;padding:8px 0 0 10px}
+#loginAccess .inputCheck{width:13px;height:13px;margin:0;padding:0;vertical-align:middle}
+#loginAccess label{vertical-align:middle}
+#loginAccess #warning{display:none;margin:0 0 20px 0}
+#loginAccess #warning.open{display:block}
+#loginAccess #warning p{margin:0}
+#loginAccess .buttonArea{position:relative;margin:0 28px;padding:0;color:#767676;*zoom:1}
+#loginAccess .buttonArea .keeping{position:relative;margin:0 0 20px 0;height:32px;line-height:32px}
+#loginAccess #gLogin .buttonArea .buttonAccount{position:absolute;top:0;right:0}
+#loginAccess .buttonAccount,
+#loginAccess .buttonAccount a,
+#loginAccess .buttonAccount input{position:relative;display:inline-block;margin:0;padding:0;overflow:visible;height:32px;line-height:32px;font-size:12px;font-weight:bold;color:#fff;vertical-align:middle;cursor:pointer;border:0;text-decoration:none !important;background:transparent url(./images/buttonAction.gif) no-repeat}
+#loginAccess .buttonAccount{margin:0 4px 0 0;background-position:left top}
+#loginAccess .buttonAccount a,
+#loginAccess .buttonAccount input{left:4px;background-position:right top;vertical-align:top;padding:0 24px 0 36px}
+#loginAccess .help{position:relative;padding:15px 0;background:#fafafa;border-top:1px solid #d9d9d9;text-align:center;border-radius:0 0 5px 5px}
+#loginAccess .help li{display:inline;border-left:1px solid #c3c3c3;padding:0 0 0 10px;margin:0 6px 0 0;line-height:1}
+#loginAccess .help li.first{border:0;padding:0}
+#loginAccess .help a{text-decoration:none;color:#333}
+#loginAccess .help a:hover,
+#loginAccess .help a:active,
+#loginAccess .help a:focus{text-decoration:underline}
+#loginAccess .logOut{text-align:left;margin:0 28px;padding:0 0 20px 0}
diff --git a/modules/message/skins/default/message.js b/modules/message/skins/default/message.js
index 815cb0cec..8523b8ec3 100644
--- a/modules/message/skins/default/message.js
+++ b/modules/message/skins/default/message.js
@@ -1,38 +1,38 @@
-/* 로그인 후 */
-function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
-    var url =  current_url.setQuery('act','');
-    location.href = url;
-}
-
-/* 오픈아이디 로그인 후 */
-function completeMessageOpenIDLogin(ret_obj, response_tags) {
-    var redirect_url =  ret_obj['redirect_url'];
-    location.href = redirect_url;
-}
-
-function doLogin(o,filter){
-	jQuery('input.inputText',o).each(function(){
-		var t = jQuery(this);
-		if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
-	});
-	procFilter(o,filter);
-	initLoginTitleMsg();
-	return false;
-}
-
-
-function initLoginTitleMsg(){
-	jQuery('.gLogin, .mLogin').find('input.inputText').focus(function(){
-		var t = jQuery(this);
-		if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
-	}).blur(function(){
-		var t = jQuery(this);
-		if(t.attr('title').length>0 && t.val()=='') t.val(t.attr('title'));
-	}).focus().blur();
-}
-
-jQuery(function(){
-	initLoginTitleMsg();
-});
-
-
+/* 로그인 후 */
+function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeMessageOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+function doLogin(o,filter){
+	jQuery('input.inputText',o).each(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
+	});
+	procFilter(o,filter);
+	initLoginTitleMsg();
+	return false;
+}
+
+
+function initLoginTitleMsg(){
+	jQuery('.gLogin, .mLogin').find('input.inputText').focus(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
+	}).blur(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.val()=='') t.val(t.attr('title'));
+	}).focus().blur();
+}
+
+jQuery(function(){
+	initLoginTitleMsg();
+});
+
+
diff --git a/modules/message/skins/default/system_message.html b/modules/message/skins/default/system_message.html
index 71f7dc475..e0818d688 100644
--- a/modules/message/skins/default/system_message.html
+++ b/modules/message/skins/default/system_message.html
@@ -1,60 +1,43 @@
-<!--%import("message.css")-->
-
-<div id="loginAccess" class="gLogin">
-	<h1>{$system_message}</h1>
-	<!--@if(!$is_logged)-->
-    <!--%import("../../../../common/js/jquery.js")-->
-	<!--%import("./filter/login.xml")-->
-	<!--%import("./filter/openid_login.xml")-->
-	<!--%import("./message.js")-->
-	<div class="mLogin" id="gLogin">
-		<form action="./" method="post" onsubmit="return doLogin(this, message_login)" id="gForm">
-			<fieldset>
-				<ul class="idpw">
-					<li><input type="text" name="user_id" id="uid" value="" class="inputText" title="{$lang->user_id}" /></li>
-					<li><input type="password" name="password" id="upw" value="" class="inputText" title="{$lang->password}" /></li>
-				</ul>
-				<div class="buttonArea">
-					<p class="keeping">
-						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />						
-						<label for="keepid">{$lang->keep_signed}</label>
-					</p>
-					<div id="warning" class="">
-						<p>{$lang->about_keep_warning}</p>
-					</div>
-					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
-				</div>
-			</fieldset>
-		</form>
-		<ul class="help">
-			<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
-			<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
-			<!--@if($member_config->enable_openid=='Y')-->
-			<li><a href="#oLogin" onclick="jQuery('#loginAccess').removeClass('gLogin'); jQuery('#loginAccess').addClass('oLogin'); return false;">Open ID</a></li>
-			<!--@end-->
-		</ul>
-	</div>
-	
-	<!-- OpenID -->
-	<!--@if($member_config->enable_openid=='Y')-->
-	<div class="mLogin" id="oLogin">
-		<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm">
-			<fieldset>
-					<div class="oid">
-						<input type="text" name="openid" class="inputText" title="Open ID" value="" />
-					</div>
-					<div class="buttonArea">
-					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
-				</div>
-			</fieldset>
-		</form>
-		<div class="help"><a href="#gLogin" onclick="jQuery('#loginAccess').removeClass('oLogin'); jQuery('#loginAccess').addClass('gLogin'); return false;">{$lang->cmd_common_id}</a></div>
-	</div>
-	<!--@end-->
-	<!--@end-->
-	<!--@if($is_logged)-->
-	<div class="logOut">
-		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
-	</div>
-	<!--@end-->
-</div>
+<load target="../../../../common/js/jquery.js" />
+<load target="./filter/openid_login.xml" />
+<load target="./message.css" />
+<load target="./message.js" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<div id="loginAccess" class="gLogin">
+	<h1>{$system_message}</h1>
+	<div class="mLogin" id="gLogin" cond="!$is_logged && $module == 'admin'">
+		<form ruleset="@login" action="./" method="post" id="gForm">
+		<input type="hidden" name="module" value="member" />
+		<input type="hidden" name="act" value="procMemberLogin" />
+		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+			<fieldset>
+				<ul class="idpw">
+					<li><input type="text" name="user_id" id="uid" value="" class="inputText" title="{$lang->user_id}" /></li>
+					<li><input type="password" name="password" id="upw" value="" class="inputText" title="{$lang->password}" /></li>
+				</ul>
+				<div class="buttonArea">
+					<p class="keeping">
+						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />						
+						<label for="keepid">{$lang->keep_signed}</label>
+					</p>
+					<div id="warning" class="">
+						<p>{$lang->about_keep_warning}</p>
+					</div>
+					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
+				</div>
+			</fieldset>
+		</form>
+		<ul class="help">
+			<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
+			<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
+		</ul>
+	</div>
+	<div class="logOut" cond="$is_logged && $module == 'admin'">
+		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
+	</div>
+	<div class="logOut" cond="!$is_logged && $module != 'admin'">
+		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLoginForm','module','', 'mid', '')}">{$lang->cmd_login}</a></span>
+	</div>
+</div>
diff --git a/modules/message/tpl/config.html b/modules/message/tpl/config.html
index 0aed54c96..e76a001e8 100644
--- a/modules/message/tpl/config.html
+++ b/modules/message/tpl/config.html
@@ -1,24 +1,25 @@
-<!--%import("filter/insert_config.xml")-->
+<h1 class="h1">{$lang->message} {$lang->cmd_management}</h1>
 
-<h3 class="xeAdmin">{$lang->message} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-    <p class="summary">{$lang->about_skin}</p>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col"><div>{$lang->skin}</div></th>
-        <td class="wide">
-            <select name="skin">
-                <!--@foreach($skin_list as $key => $val)-->
-                <option value="{$key}" <!--@if($key==$config->skin)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="./" method="post">
+<input type="hidden" name="module" value="message" />
+<input type="hidden" name="act" value="procMessageAdminInsertConfig" />
+    <p>{$lang->about_skin}</p>
+	<ul>
+		<li>
+			<p class="q"><label for="skin">{$lang->skin}</label></p>
+			<p class="a">
+				<select name="skin" id="skin">
+					<!--@foreach($skin_list as $key => $val)-->
+					<option value="{$key}" <!--@if($key==$config->skin)-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+				</select>
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
diff --git a/modules/module/conf/info.xml b/modules/module/conf/info.xml
index c78197ec7..eee5c1e21 100644
--- a/modules/module/conf/info.xml
+++ b/modules/module/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">모듈</title>
-    <title xml:lang="zh-CN">模块列表</title>
-    <title xml:lang="jp">モジュール</title>
-    <title xml:lang="en">Module</title>
-    <title xml:lang="vi">Module</title>
-    <title xml:lang="es">Módulo</title>
-    <title xml:lang="ru">Модули</title>
-    <title xml:lang="zh-TW">模組</title>
-    <title xml:lang="tr">Modül</title>
-    <description xml:lang="ko">모듈 생성 및 관리하는 모듈입니다.</description>
-    <description xml:lang="zh-CN">生成及管理模块的模块。</description>
-    <description xml:lang="jp">モジュールの生成、管理するモジュールです。</description>
-    <description xml:lang="en">This module is for creating/managering the other modules.</description>
-    <description xml:lang="vi">Module cho phép tạo và quản lý những Module khác.</description>
-    <description xml:lang="es">Este módulo is para crear y manejar los otros módulos.</description>
-    <description xml:lang="ru">Этот модуль служит для создания/управления другими модулями.</description>
-    <description xml:lang="zh-TW">用於建立與管理其他模組。</description>
-    <description xml:lang="tr">Bu modül, başka modüller oluşturmak ve yönetmek içindir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>system</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">모듈</title>
+    <title xml:lang="zh-CN">模块列表</title>
+    <title xml:lang="jp">モジュール</title>
+    <title xml:lang="en">Module</title>
+    <title xml:lang="vi">Module</title>
+    <title xml:lang="es">Módulo</title>
+    <title xml:lang="ru">Модули</title>
+    <title xml:lang="zh-TW">模組</title>
+    <title xml:lang="tr">Modül</title>
+    <description xml:lang="ko">모듈 생성 및 관리하는 모듈입니다.</description>
+    <description xml:lang="zh-CN">生成及管理模块的模块。</description>
+    <description xml:lang="jp">モジュールの生成、管理するモジュールです。</description>
+    <description xml:lang="en">This module is for creating/managering the other modules.</description>
+    <description xml:lang="vi">Module cho phép tạo và quản lý những Module khác.</description>
+    <description xml:lang="es">Este módulo is para crear y manejar los otros módulos.</description>
+    <description xml:lang="ru">Этот модуль служит для создания/управления другими модулями.</description>
+    <description xml:lang="zh-TW">用於建立與管理其他模組。</description>
+    <description xml:lang="tr">Bu modül, başka modüller oluşturmak ve yönetmek içindir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>system</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/module/conf/module.xml b/modules/module/conf/module.xml
index 94ff1e4a1..8873951a8 100644
--- a/modules/module/conf/module.xml
+++ b/modules/module/conf/module.xml
@@ -8,15 +8,16 @@
         <action name="dispModuleSelectList" type="view" standalone="true" />
         <action name="dispModuleSkinInfo" type="view" standalone="true" />
 
-        <action name="dispModuleAdminContent" type="view" standalone="true" admin_index="true" />
+        <action name="dispModuleAdminContent" type="view" standalone="true"  menu_name="installedModule" menu_index="true" admin_index="true" />
         <action name="dispModuleAdminList" type="view" standalone="true" />
-        <action name="dispModuleAdminCategory" type="view" standalone="true" />
+        <action name="dispModuleAdminCategory" type="view" standalone="true" menu_name="installedModule" />
         <action name="dispModuleAdminInfo" type="view" standalone="true" />
         <action name="dispModuleAdminModuleSetup" type="view" standalone="true" />
         <action name="dispModuleAdminModuleAdditionSetup" type="view" standalone="true" />
         <action name="dispModuleAdminModuleGrantSetup" type="view" standalone="true" />
         <action name="dispModuleAdminCopyModule" type="view" standalone="true" />
-        <action name="dispModuleAdminLangcode" type="view" standalone="true" />
+        <action name="dispModuleAdminLangcode" type="view" standalone="true" menu_name="multilingual" menu_index="true" />
+        <action name="dispModuleAdminFileBox" type="view" menu_name="filebox" menu_index="true" />
 
         <action name="dispModuleFileBox" type="view" standalone="true" />
         <action name="dispModuleFileBoxAdd" type="view" standalone="true" />
@@ -27,17 +28,65 @@
 
         <action name="getModuleAdminModuleList" type="model" standalone="true" />
         <action name="getModuleAdminLangCode" type="model" standalone="true" />
+        <action name="getModuleAdminLangListByName" type="model" standalone="true" />
+        <action name="getModuleAdminLangListByValue" type="model" standalone="true" />
+        <action name="getLangListByLangcodeForAutoComplete" type="model" standalone="true" />
+		<action name="getFileBoxListHtml" type="model" />
+		<action name="getLangByLangcode" type="model" />
 
-        <action name="procModuleAdminInsertCategory" type="controller" standalone="true" />
-        <action name="procModuleAdminUpdateCategory" type="controller" standalone="true" />
-        <action name="procModuleAdminCopyModule" type="controller" standalone="true" />
+        <action name="procModuleAdminInsertCategory" type="controller" standalone="true" ruleset="insertCategory" />
+        <action name="procModuleAdminUpdateCategory" type="controller" standalone="true" ruleset="updateCategory" />
+        <action name="procModuleAdminDeleteCategory" type="controller" standalone="true" ruleset="deleteCategory" />
+        <action name="procModuleAdminCopyModule" type="controller" standalone="true" ruleset="copyModule" />
         <action name="procModuleAdminInsertGrant" type="controller" standalone="true" />
         <action name="procModuleAdminUpdateSkinInfo" type="controller" standalone="true" />
-        <action name="procModuleAdminModuleSetup" type="controller" standalone="true" />
-        <action name="procModuleAdminModuleGrantSetup" type="controller" standalone="true" />
+        <action name="procModuleAdminModuleSetup" type="controller" standalone="true" ruleset="insertModuleSetup" />
+        <action name="procModuleAdminModuleGrantSetup" type="controller" standalone="true" ruleset="insertModulesGrant" />
         <action name="procModuleAdminInsertLang" type="controller" standalone="true" />
         <action name="procModuleAdminDeleteLang" type="controller" standalone="true" />
+        <action name="procModuleAdminGetList" type="controller" standalone="true" />
 
 		<action name="dispModuleChangeLang" type="mobile" />
     </actions>
+	<menus>
+		<menu name="installedModule">
+			<title xml:lang="en">Installed Module</title>
+			<title xml:lang="ko">설치된 모듈</title>
+			<title xml:lang="zh-CN">Installed Module</title>
+			<title xml:lang="jp">Installed Module</title>
+			<title xml:lang="es">Installed Module</title>
+			<title xml:lang="ru">Installed Module</title>
+			<title xml:lang="fr">Installed Module</title>
+			<title xml:lang="zh-TW">Installed Module</title>
+			<title xml:lang="vi">Installed Module</title>
+			<title xml:lang="mn">Installed Module</title>
+			<title xml:lang="tr">Installed Module</title>
+		</menu>
+		<menu name="multilingual">
+			<title xml:lang="en">Multilingual</title>
+			<title xml:lang="ko">다국어</title>
+			<title xml:lang="zh-CN">Multilingual</title>
+			<title xml:lang="jp">Multilingual</title>
+			<title xml:lang="es">Multilingual</title>
+			<title xml:lang="ru">Multilingual</title>
+			<title xml:lang="fr">Multilingual</title>
+			<title xml:lang="zh-TW">Multilingual</title>
+			<title xml:lang="vi">Multilingual</title>
+			<title xml:lang="mn">Multilingual</title>
+			<title xml:lang="tr">Multilingual</title>
+		</menu>
+		<menu name="filebox">
+			<title xml:lang="en">FileBox</title>
+			<title xml:lang="ko">파일박스</title>
+			<title xml:lang="zh-CN">FileBox</title>
+			<title xml:lang="jp">FileBox</title>
+			<title xml:lang="es">FileBox</title>
+			<title xml:lang="ru">FileBox</title>
+			<title xml:lang="fr">FileBox</title>
+			<title xml:lang="zh-TW">FileBox</title>
+			<title xml:lang="vi">FileBox</title>
+			<title xml:lang="mn">FileBox</title>
+			<title xml:lang="tr">FileBox</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/module/lang/en.lang.php b/modules/module/lang/en.lang.php
deleted file mode 100644
index dfda4e598..000000000
--- a/modules/module/lang/en.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    /**
-     * @file   modules/module/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack
-     **/
-
-    $lang->virtual_site = "Virtual Site";
-    $lang->module_list = "Modules List";
-    $lang->module_index = "Modules List";
-    $lang->module_category = "Module Category";
-    $lang->module_info = "Module Info";
-    $lang->add_shortcut = "Add Shortcuts";
-    $lang->module_action = "Actions";
-    $lang->module_maker = "Module Developer";
-    $lang->module_license = 'License';
-    $lang->module_history = "Update history";
-    $lang->category_title = "Category Title";
-    $lang->header_text = 'Header Text';
-    $lang->footer_text = 'Footer Text';
-    $lang->use_category = 'Enable Category';
-    $lang->category_title = 'Category Title';
-    $lang->checked_count = 'Number of Checked Articles';
-    $lang->skin_default_info = 'Default Skin Info';
-    $lang->skin_author = 'Skin Developer';
-    $lang->skin_license = 'License';
-    $lang->skin_history = 'Update history';
-    $lang->module_copy = "Duplicate Module";
-    $lang->module_selector = "Module Selector";
-    $lang->do_selected = "I want to";
-    $lang->bundle_setup = "Bundle Setup";
-    $lang->bundle_addition_setup = "Bundle Additional Setup";
-    $lang->bundle_grant_setup = "Bundle Permission Setup";
-    $lang->lang_code = "Language Code";
-    $lang->filebox = "FileBox";
-
-    $lang->access_type = 'Access Type';
-    $lang->access_domain = 'With Domain Name';
-    $lang->access_vid = 'With Site ID';
-    $lang->about_domain = "In order to create more than one virtual site, every club needs to have its own domain name.<br />Sub-domain (e.g., aaa.bbb.com of bbb.com) also can be used. Input the address including the path where XE is installed. <br /> ex) www.xpressengine.com/xe";
-    $lang->about_vid = 'Users can access via http://XEaddress/ID. You cannot use same site id as the existing module name(mid).<br />Site id should start with an alphabet character . Alphabet characters, numbers and _ can be used for the site id.';
-    $lang->msg_already_registed_vid = 'Already registered site id. Please input another ID.';
-    $lang->msg_already_registed_domain = "Domain name has already been used. Please input another domain name.";
-
-    $lang->header_script = "Header Script";
-    $lang->about_header_script = "You can input the html script between &lt;header&gt; and &lt;/header&gt; by yourself.<br />You can use &lt;script, &lt;style or &lt;meta tag";
-
-    $lang->grant_access = "Access";
-    $lang->grant_manager = "Management";
-
-    $lang->grant_to_all = "All users";
-    $lang->grant_to_login_user = "Logged users";
-    $lang->grant_to_site_user = "Registered users";
-    $lang->grant_to_group = "Specification group users";
-
-    $lang->cmd_add_shortcut = "Add Shortcut";
-    $lang->cmd_install = "Install";
-    $lang->cmd_update = "Update";
-    $lang->cmd_manage_category = 'Manage Categories';
-    $lang->cmd_manage_grant = 'Manage Permission';
-    $lang->cmd_manage_skin = 'Manage Skins';
-    $lang->cmd_manage_document = 'Manage Articles';
-    $lang->cmd_find_module = 'Find Module';
-    $lang->cmd_find_langcode = 'Find lang code';
-
-    $lang->msg_new_module = "Create new module";
-    $lang->msg_update_module = "Modify module";
-    $lang->msg_module_name_exists = "The name already exists. Please try another name.";
-    $lang->msg_category_is_null = 'There is no registered category.';
-    $lang->msg_grant_is_null = 'There is no permission list.';
-    $lang->msg_no_checked_document = 'No checked articles exist.';
-    $lang->msg_move_failed = 'Failed to move';
-    $lang->msg_cannot_delete_for_child = 'Cannot delete a category having child categories.';
-	$lang->msg_limit_mid ="Only alphabets+[alphabets+numbers+_] can be used as module name.";
-    $lang->msg_extra_name_exists = 'Already registered extra variable name. Please input another name.';
-
-    $lang->about_browser_title = "It will be shown in the browser title. It will be also used in a RSS/Trackback.";
-    $lang->about_mid = "The module name will be used like http://address/?mid=ModuleName.\n(Only english alphabet + [english alphabet, numbers, and underscore(_)] are allowed. The maximum length is 40.)";
-    $lang->about_default = "If checked, the default will be shown when access to the site without no mid value(mid=NoValue).";
-    $lang->about_module_category = "It enables you to manage it through module category.\n The URL for the module manager is <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Manage module > Module category </a>.";
-    $lang->about_description= 'It is the description only for a manager.';
-    $lang->about_default = 'If checked, this module will be shown when users access to the site without mid value (mid=NoValue).';
-    $lang->about_header_text = 'The contents will be shown on the top of the module.(html tags available)';
-    $lang->about_footer_text = 'The contents will be shown on the bottom of the module.(html tags available)';
-    $lang->about_skin = 'You may choose a module skin.';
-    $lang->about_use_category = 'If checked, category function will be enabled.';
-    $lang->about_list_count = 'You can set the number of limit to show article in a page.(default is 20)';
-	$lang->about_search_list_count = 'You may set the number of articles to be exposed when you use search or category function. (default is 20)';
-    $lang->about_page_count = 'You can set the number of page link to move pages in a bottom of page.(default is 10)';
-    $lang->about_admin_id = 'You can grant a manager to have all permissions to the module.';
-    $lang->about_grant = 'If you disable all permissions for a specific object, members who has not logged in would get permission.';
-    $lang->about_grant_deatil = 'Registered users mean users who signed-up to the virtual sites (e.g., cafeXE).';
-    $lang->about_module = "XE consists of modules except basic library.\n [Module Manage] module will show all installed modules and help you to manage them.";
-
-	$lang->about_extra_vars_default_value = 'If multiple default values are needed,	 you can link them with comma(,).';
-    $lang->about_search_virtual_site = "Input domain of virtual sites.<br />To search modules of non-virtual site, search with blank";
-    $lang->about_langcode = "If you want to configure seperately, use 'find language code'";
-    $lang->about_file_extension= "Only %s extension(s) is available.";
-?>
diff --git a/modules/module/lang/es.lang.php b/modules/module/lang/es.lang.php
deleted file mode 100644
index ad699a9a0..000000000
--- a/modules/module/lang/es.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/module/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario  Paquete del idioma español
-     **/
-
-    $lang->virtual_site = "Virtual Site";
-    $lang->module_list = "Lista de Módulos";
-    $lang->module_index = "Lista de Módulos";
-    $lang->module_category = "Categoría de Módulos ";
-    $lang->module_info = "Información";
-    $lang->add_shortcut = "Añadir en el menú del administrador";
-    $lang->module_action = "Acción";
-    $lang->module_maker = "Módulo del desarrollador";
-    $lang->module_license = 'License';
-    $lang->module_history = "Historia de actualización";
-    $lang->category_title = "Título de categoría";
-    $lang->header_text = 'Encabezado';
-    $lang->footer_text = 'Pie de página';
-    $lang->use_category = 'Usar categoría';
-    $lang->category_title = 'Título de categoría';
-    $lang->checked_count = 'Múmero de los documentos selecionados';
-    $lang->skin_default_info = 'información del tema predefinido';
-    $lang->skin_author = 'Desarrollador de tema';
-    $lang->skin_license = 'License';
-    $lang->skin_history = 'Historia de actualización';
-    $lang->module_copy = "Copy Module";
-    $lang->module_selector = "Module Selector";
-    $lang->do_selected = "선택된 것들을...";
-    $lang->bundle_setup = "일괄 기본 설정";
-    $lang->bundle_addition_setup = "일괄 추가 설정";
-    $lang->bundle_grant_setup = "일괄 권한 설정";
-    $lang->lang_code = "언어 코드";
-    $lang->filebox = "파일박스";
-
-    $lang->access_type = '접속 방법';
-    $lang->access_domain = 'Domain 접속';
-    $lang->access_vid = 'Site ID 접속';
-    $lang->about_domain = 'Para crear un dominio privado de la site requiere. <br/> Independiente de dominio o subdominio, y XE está instalado, el camino que en su conjunto. <br /> Ej.) www.xpressengine.com / zbxe';
-    $lang->about_vid = '별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다.<br/>첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-    $lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
-    $lang->msg_already_registed_domain = 'Ya es de dominio registrado. Por favor, use un dominio diferente';
-
-    $lang->header_script = "헤더 스크립트";
-    $lang->about_header_script = "html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그등을 이용하실 수 있습니다";
-
-    $lang->grant_access = "Access";
-    $lang->grant_manager = "Management";
-
-    $lang->grant_to_all = "All users";
-    $lang->grant_to_login_user = "Logged users";
-    $lang->grant_to_site_user = "Joined users";
-    $lang->grant_to_group = "Specification group users";
-
-    $lang->cmd_add_shortcut = "añadir acceso directo";
-    $lang->cmd_install = "Instalar";
-    $lang->cmd_update = "Actualizar";
-    $lang->cmd_manage_category = 'Manejo de categorías';
-    $lang->cmd_manage_grant = 'Manejo de atribuciones';
-    $lang->cmd_manage_skin = 'Manejo de temas';
-    $lang->cmd_manage_document = 'Manejo de documentos';
-    $lang->cmd_find_module = '모듈 찾기';
-    $lang->cmd_find_langcode = 'Find lang code';
-
-    $lang->msg_new_module = "Crear un nuevo módulo";
-    $lang->msg_update_module = "Modificar el módulo";
-    $lang->msg_module_name_exists = "El nombre ya existe. Por favor tratar con otro nombre.";
-    $lang->msg_category_is_null = 'No existe categoría registrada.';
-    $lang->msg_grant_is_null = 'No existe el objetivo de atribución registrado.';
-    $lang->msg_no_checked_document = 'No existe documento seleccionado.';
-    $lang->msg_move_failed = 'No pudo moverse';
-    $lang->msg_cannot_delete_for_child = 'No puede eliminar la categoría si posee subcategoría.';
-    $lang->msg_limit_mid ='모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
-    $lang->msg_extra_name_exists = '이미 존재하는 확장변수 이름입니다. 다른 이름을 입력해주세요.';
-
-    $lang->about_browser_title = "Esto es el valor que se mostrará en el título del navegador. También es usado en RSS/Trackback.";
-    $lang->about_mid = "El nombre del módulo será usado como http://direccion/?mid=NombreMódulo.\n(sólo alfabeto español+[alfabeto español, números y el gión abajo(_)] son permitidos. The maximum length is 40.)";
-    $lang->about_default = "Si selecciona esta opción, se mostrara de manera predefinida sin el valor de mid.";
-    $lang->about_module_category = "Es posible manejar a traves de categoría.\n EL URL para en manejo del módulo de categoría es <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Manejo de módulo > Módulo de categoría </a>.";
-    $lang->about_description= 'Descripción usada para la administración.';
-    $lang->about_default = 'Si selecciona esta opción, se mostrará de manera predefinida sin el valor de mid.';
-    $lang->about_header_text = 'El contenido se mostrará en la parte superior del módulo.(tags de html permitido)';
-    $lang->about_footer_text = 'El contenido se mostrará en la parte inferior del módulo.(tags de html permitido)';
-    $lang->about_skin = 'Usted puede elegir un tema del módulo.';
-    $lang->about_use_category = 'Si selecciona esta opción, la función de categoría sera activada.';
-    $lang->about_list_count = 'Usted puede definir el número límite de los documentos a mostrar en una página.(Predefinido es 20)';
-    $lang->about_search_list_count = 'Usted puede configurar el número de artículos que se exponen cuando se utiliza la función de búsqueda o categoría. (Por defecto es 20)';
-    $lang->about_page_count = 'Usted puede definir el número de página enlazada para mover páginas en un botón de la página.(Predefinido es 10)';
-    $lang->about_admin_id = 'Usted puede definir el administrador de atribuciones superiores al módulo.\n Usted puede asignar múltiples IDs.';
-    $lang->about_grant = 'Si usted desea desactivar a todos los objetos teniendo atribuciones especificas, incluso el usuario no conectado pueden tener atribuciones.';
-    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
-    $lang->about_module = "XE consiste de módulos excepto la librería básica.\n Módulo del Manejo del Módulo muestra todos los módulos instalados y ayuda el manejo de ellos.";
-
-	$lang->about_extra_vars_default_value = 'Si múltiples valores predefinidos son requeridos, usted puede enlazar con la coma(,).';
-    $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
-    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
-    $lang->about_file_extension= "%s 파일만 가능합니다.";
-?>
diff --git a/modules/module/lang/fr.lang.php b/modules/module/lang/fr.lang.php
deleted file mode 100644
index ce43eb534..000000000
--- a/modules/module/lang/fr.lang.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-    /**
-     * @file   modules/module/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) traduit par Pierre duvent <PierreDuvent@gmail.com>
-     * @brief  Paque du langage en français pour le module de Module
-     **/
-
-    $lang->virtual_site = "Virtual Site";
-    $lang->module_list = "Liste des Modules";
-    $lang->module_index = "Liste des Modules";
-    $lang->module_category = "Catégorie des Modules";
-    $lang->module_info = "Information de Module";
-    $lang->add_shortcut = "Ajouter un raccourci dans le menu pour l'administrateur";
-    $lang->module_action = "Actions";
-    $lang->module_maker = "Développeur du Module";
-    $lang->module_license = 'Licence';
-    $lang->module_history = "Histoire de Mise à Jour";
-    $lang->category_title = "Titre de la Catégorie";
-    $lang->header_text = 'Texte en-tête';
-    $lang->footer_text = 'Text au bas de page';
-    $lang->use_category = 'Utiliser catégorie';
-    $lang->category_title = 'Titre de la Catégorie';
-    $lang->checked_count = 'somme des Articles choisis';
-    $lang->skin_default_info = 'Information fondamental de l\'habillage';
-    $lang->skin_author = 'Developpeur de l\'habillage';
-    $lang->skin_license = 'Licence';
-    $lang->skin_history = 'Histoire des Mises à jour';
-    $lang->module_copy = "Copier un Module";
-    $lang->module_selector = "Module Selector";
-    $lang->do_selected = "선택된 것들을...";
-    $lang->bundle_setup = "일괄 기본 설정";
-    $lang->bundle_addition_setup = "일괄 추가 설정";
-    $lang->bundle_grant_setup = "일괄 권한 설정";
-    $lang->lang_code = "언어 코드";
-    $lang->filebox = "파일박스";
-
-    $lang->access_type = '접속 방법';
-    $lang->access_domain = 'Domain 접속';
-    $lang->access_vid = 'Site ID 접속';
-    $lang->about_vid = '별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다.<br/>첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-    $lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
-    $lang->msg_already_registed_domain = '이미 등록된 도메인입니다. 다른 도메인을 사용해주세요';
-
-    $lang->header_script = "Script en-tête";
-    $lang->about_header_script = "Vous pouvez entrer un script en html par vous-même entre &lt;header&gt; et &lt;/header&gt;.<br />Vous pouvez utiliser &lt;script, &lt;style ou &lt;meta tag";
-
-    $lang->grant_access = "Access";
-    $lang->grant_manager = "Management";
-
-    $lang->grant_to_all = "All users";
-    $lang->grant_to_login_user = "Logged users";
-    $lang->grant_to_site_user = "Joined users";
-    $lang->grant_to_group = "Specification group users";
-
-    $lang->cmd_add_shortcut = "Ajouter un raccourci";
-    $lang->cmd_install = "Installer";
-    $lang->cmd_update = "Mettre à Jour";
-    $lang->cmd_manage_category = 'Administrer des Catégories';
-    $lang->cmd_manage_grant = 'Administrer des Permissions';
-    $lang->cmd_manage_skin = 'Administrer des Habillages';
-    $lang->cmd_manage_document = 'Administrer des Articles';
-    $lang->cmd_find_module = '모듈 찾기';
-    $lang->cmd_find_langcode = 'Find lang code';
-
-    $lang->msg_new_module = "Créer un module";
-    $lang->msg_update_module = "Modifier un module";
-    $lang->msg_module_name_exists = "Le nom existe déjà. Essayez un autre nom, S.V.P.";
-    $lang->msg_category_is_null = 'Il n\'y a pas de catégorie enrégistrée.';
-    $lang->msg_grant_is_null = 'Il n\'y a pas de liste de permission.';
-    $lang->msg_no_checked_document = 'Pas un article est choisi.';
-    $lang->msg_move_failed = 'Echoué de bouger';
-    $lang->msg_cannot_delete_for_child = 'On ne peut pas supprimer une catégorie qui a des catégories inférieures.';
-    $lang->msg_limit_mid ='모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
-    $lang->msg_extra_name_exists = '이미 존재하는 확장변수 이름입니다. 다른 이름을 입력해주세요.';
-
-    $lang->about_browser_title = "C'est la valeur qui se représentera dans le titre de navigateur Web. Ce sera encore utilisé dans RSS/Rétrolien.";
-    $lang->about_mid = "Le nom de module sera utilisé comme http://adresse/?mid=ModuleName.\n(alphabet anglais + [alphabet anglais, nombres, et soulignement(_)] sont seulement permis. The maximum length is 40.)";
-    $lang->about_default = "Si c'est coché, on verra ce module quand on connecte ce site sans aucune valeur de mid(mid=Nulle Valeur).";
-    $lang->about_module_category = "Ça vous permet d'administrer le module par la catégorie.\nOn peut administrer la classification des modules à <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Administration des modules > Catégorie des Modules </a>.";
-    $lang->about_description= 'C\'est la description pour la facilité à administrer.';
-    $lang->about_default = 'Si c\'est coché, on verra ce module quand on connecte ce site sans aucune valeur de mid(mid=Nulle Valeur).';
-    $lang->about_header_text = 'Ce contenu sera exposé en tête du module.(balise en html est disponible)';
-    $lang->about_footer_text = 'Ce contenu sera exposé en bas du module.(balise en html est disponible)';
-    $lang->about_skin = 'Vous pouvez choisir un habillage pour le module.';
-    $lang->about_use_category = 'Cochez pour utiliser la fonction de catégorie, .';
-    $lang->about_list_count = 'Vous pouvez configurer combien d\'articles soient exposés dans une page.(20 par défaut)';
-	$lang->about_search_list_count = 'Vous pouvez configurer combien d\'articles soient exposés quand vous utilisez la fonction de recherche ou de catégorie. (20 par défaut)';
-    $lang->about_page_count = 'Vous pouvez configurer combien de liens pour les Pages à Bouger en bas de chaque page.(10 par défaut)';
-    $lang->about_admin_id = 'Vous pouvez désigner un directeur qui aura tous les permissions sur le module.\nVous pouvez entrer plusieurs compte en utilisant.';
-    $lang->about_grant = 'Si vous ne donnez pas la permission à aucune personne, même les membres qui n\'a pas ouvert la connexion auront la permission. ';
-    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
-    $lang->about_module = "XE se compose des modules sauf la bibliothèque fondamental.\nLe module [Administration des Modules] montera tous les modules installés et vous aidera les administrer.";
-
-	$lang->about_extra_vars_default_value = 'Si plusieurs valeurs sont nécessaires, vous pouvez les connecter avec la virgule(,).';
-    $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
-    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
-    $lang->about_file_extension= "%s 파일만 가능합니다.";
-?>
diff --git a/modules/module/lang/jp.lang.php b/modules/module/lang/jp.lang.php
deleted file mode 100644
index 0f35eb2f8..000000000
--- a/modules/module/lang/jp.lang.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-    /**
-     * @file   modules/module/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、liahona、ミニミ
-     * @brief  日本語言語パッケージ
-     **/
-
-    $lang->virtual_site = 'バーチャル（Virtual）サイト';
-    $lang->module_list = 'モジュールリスト';
-    $lang->module_index = 'モジュールインデックス';
-    $lang->module_category = 'モジュールカテゴリ';
-    $lang->module_info = '詳細';
-    $lang->add_shortcut = '管理者メニューに追加する';
-    $lang->module_action = '動作';
-    $lang->module_maker = 'モジュール作者';
-    $lang->module_license = 'ライセンス';
-    $lang->module_history = '変更履歴 ';
-    $lang->category_title = 'カテゴリ名';
-    $lang->header_text = 'ヘッダー内容';
-    $lang->footer_text = 'フッター内容';
-    $lang->use_category = 'カテゴリ使用';
-    $lang->category_title = 'カテゴリ名';
-    $lang->checked_count = '選択された書き込み数';
-    $lang->skin_default_info = 'スキン基本情報';
-    $lang->skin_author = 'スキン作者';
-    $lang->skin_license = 'ライセンス';
-    $lang->skin_history = '変更内容';
-    $lang->module_copy = 'モジュールコピー';
-    $lang->module_selector = 'モジュールセレクター';
-    $lang->do_selected = '選択したものを...';
-    $lang->bundle_setup = '一括基本設定';
-    $lang->bundle_addition_setup = '一括追加設定';
-    $lang->bundle_grant_setup = '一括権限設定';
-    $lang->lang_code = '言語コード';
-    $lang->filebox = 'ファイルボックス';
-
-    $lang->access_type = 'アクセスタイプ';
-    $lang->access_domain = 'Doaminアクセス';
-    $lang->access_vid = 'Site IDアクセス';
-    $lang->about_domain = '複数のホームページを作成するためには、「オリジナルドメイン」や「サブ ドメイン」のような専用のドメインが必要です。<br />また、 XEのインストールパスも一緒に記入して下さい。<br />ex) www.xpressengine.com/xe';
-    $lang->about_vid = '別の違うドメインではなく、「http://XEアドレス/ID」へのアクセスが可能です。この際、モジュール名(mid)と重複しないように登録して下さい。<br/>必ず、頭文字は半角英文字にし、「（すべて半角の）英数字・_ 」 だけの組み合わせで入力して下さい。';
-    $lang->msg_already_registed_vid = '既に登録されたサイトIDです。掲示板などのmidと重複は不可です。異なるIDを入力して下さい。';
-    $lang->msg_already_registed_domain = '既に登録されているドメインです。異なるドメインを利用して下さい。';
-
-    $lang->header_script = 'ヘッダースクリプト';
-    $lang->about_header_script = 'HTMLの&lt;header&gt;と&lt;/header&gt;の間に入れるコードを直接入力出来ます。<br />&lt;script、&lt;styleまたは&lt;metaタグなどが利用出来ます。';
-
-    $lang->grant_access = 'アクセス権限';
-    $lang->grant_manager = '管理権限';
-
-    $lang->grant_to_all = 'すべてのユーザー';
-    $lang->grant_to_login_user = 'ログインユーザー';
-    $lang->grant_to_site_user = '登録ユーザー';
-    $lang->grant_to_group = '特定グループのユーザー';
-
-    $lang->cmd_add_shortcut = 'ショットカット追加';
-    $lang->cmd_install = 'インストール';
-    $lang->cmd_update = 'アップデート';
-    $lang->cmd_manage_category = 'カテゴリ管理';
-    $lang->cmd_manage_grant = '権限管理';
-    $lang->cmd_manage_skin = 'スキン管理';
-    $lang->cmd_manage_document = '書き込み管理';
-    $lang->cmd_find_module = 'モジュール検索';
-    $lang->cmd_find_langcode = '言語コード検索';
-
-    $lang->msg_new_module = 'モジュール作成';
-    $lang->msg_update_module = 'モジュール修正';
-    $lang->msg_module_name_exists = '既に存在するモジュール名です。他の名前を入力して下さい。';
-    $lang->msg_category_is_null = '登録されているカテゴリがありません。';
-    $lang->msg_grant_is_null = '登録された権限がありません。';
-    $lang->msg_no_checked_document = '選択された書き込みがありません。';
-    $lang->msg_move_failed = '移動することが出来ませんでした。';
-    $lang->msg_cannot_delete_for_child = '下位カテゴリのカテゴリは削除することが出来ません。';
-    $lang->msg_limit_mid ='モジュール名は「 半角英小文字+[半角英小文字+半角数字+_] 」のみ出来ます。';
-    $lang->msg_extra_name_exists = '既に存在する拡張変数名です。他の拡張変数名を入力して下さい。';
-
-    $lang->about_browser_title = 'ブラウザのタイトルバーに表示される内容です。RSS/Trackbackでも使用します。';
-    $lang->about_mid = 'モジュール名は「http://アドレス/?mid=モジュール名」のように直接呼び出せるパラメーター値です。<br />※英数の頭文字と[英数と_のみ]の組み合わせ （すべて半角、最大40文字） ';
-    $lang->about_default = 'チェックすると、サイトに「mid値」なしでアクセスした場合、デフォルトで表示します。';
-    $lang->about_module_category = "カテゴリで管理出来るようにします。モジュールのカテゴリの管理は、「<a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">モジュール管理 &gt; モジュールカテゴリ</a>」にて行います。";
-    $lang->about_description= '管理用として用いられる説明です。';
-    $lang->about_header_text = 'モジュールのヘッダーに表示される内容です。（HTMLタグの使用可能）';
-    $lang->about_footer_text = 'モジュールのフッターに表示される内容です。（HTMLタグの使用可能）';
-    $lang->about_skin = 'モジュールのスキンを選択します。';
-    $lang->about_use_category = 'チェックするとカテゴリ機能が使用出来ます。';
-    $lang->about_list_count = '１ページ当たりに表示される書き込みの数が指定出来ます（デフォルト20個）。';
-    $lang->about_search_list_count = 'お勧めの記事数を設定するにさらされるかのカテゴリ検索機能を使用する場合です。 （デフォルトは20 ）';
-    $lang->about_page_count = 'リストの下段に移動出来るページのリンク数が指定出来ます（デフォルト10個）。';
-    $lang->about_admin_id = '該当するモジュールに対して最高権限を持つ管理者を指定することが出来ます。';
-    $lang->about_grant = '特定権限の対象をすべて解除するとログインしていない会員ユーザまで権限が与えられます。';
-    $lang->about_grant_deatil = '登録ユーザーとはcafeXEなど分譲型バーチャル(Virtual)サイトに登録した、ログインユーザーを意味します。';
-    $lang->about_module = "XEは、基本ライブラリの他は、すべてモジュールで構成されています。モジュール管理用のモジュールはインストールされたすべてを表示し、管理出来るようにします。";
-    $lang->about_extra_vars_default_value = '多重・単一選択などのデフォルト値が、複数必要な場合は、「, （コンマ）」で区切って追加することが出来ます。';
-    $lang->about_search_virtual_site = 'バーチャル(Virtual)サイト（：cafeXEなど）のドメインを入力して検索して下さい。<br />バーチャル(Virtual)サイト以外のモジュールは内容を空にしてから検索します。（http://は省く）';
-    $lang->about_extra_vars_eid_value = '拡張変数名を入力して下さい。　（英字+[英字+数字+_]のみ可能（全て半角））';
-    $lang->about_langcode = '言語ごとに異なる設定をする場合、言語コード検索を利用して下さい。';
-    $lang->about_file_extension= "%s ファイルのみ可能です。";
-?>
diff --git a/modules/module/lang/ko.lang.php b/modules/module/lang/ko.lang.php
deleted file mode 100644
index 831f8a742..000000000
--- a/modules/module/lang/ko.lang.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-    /**
-     * @file   modules/module/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩
-     **/
-
-    $lang->virtual_site = '가상 사이트';
-    $lang->module_list = '모듈 목록';
-    $lang->module_index = '모듈 목록';
-    $lang->module_category = '모듈 분류';
-    $lang->module_info = '모듈 정보';
-    $lang->add_shortcut = '관리자 메뉴에 추가';
-    $lang->module_action = '동작';
-    $lang->module_maker = '모듈 제작자';
-    $lang->module_license = '라이선스';
-    $lang->module_history = '변경 이력 ';
-    $lang->category_title = '분류 이름';
-    $lang->header_text = '상단 내용';
-    $lang->footer_text = '하단 내용';
-    $lang->use_category = '분류 사용';
-    $lang->category_title = '분류명';
-    $lang->checked_count = '선택된 글 수';
-    $lang->skin_default_info = '스킨 기본정보';
-    $lang->skin_author = '스킨 제작자';
-    $lang->skin_license = '라이선스';
-    $lang->skin_history = '변경 이력';
-    $lang->module_copy = '모듈 복사';
-    $lang->module_selector = '모듈 선택기';
-    $lang->do_selected = '선택된 것들을...';
-    $lang->bundle_setup = '일괄 기본 설정';
-    $lang->bundle_addition_setup = '일괄 추가 설정';
-    $lang->bundle_grant_setup = '일괄 권한 설정';
-    $lang->lang_code = '언어 코드';
-    $lang->filebox = '파일박스';
-
-    $lang->access_type = '접속 방법';
-    $lang->access_domain = 'Domain 접속';
-    $lang->access_vid = 'Site ID 접속';
-    $lang->about_domain = '1개 이상의 사이트를 만들기 위해서는 전용 도메인이 있어야 합니다.<br/>독립 도메인이나 서브 도메인이 있으면 되고 XE가 설치된 경로까지 같이 넣어주세요.<br />예) www.xpressengine.com/xe';
-    $lang->about_vid = '별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)과 중복될 수 없습니다.<br/>첫 글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-    $lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판 등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
-    $lang->msg_already_registed_domain = '이미 등록된 도메인입니다. 다른 도메인을 사용해주세요';
-
-    $lang->header_script = '헤더 스크립트';
-    $lang->about_header_script = 'HTML의 &lt;head&gt;와 &lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그 등을 이용하실 수 있습니다';
-
-    $lang->grant_access = '접근 권한';
-    $lang->grant_manager = '관리 권한';
-
-    $lang->grant_to_all = '모든 사용자';
-    $lang->grant_to_login_user = '로그인 사용자';
-    $lang->grant_to_site_user = '가입한 사용자';
-    $lang->grant_to_group = '특정 그룹 사용자';
-
-    $lang->cmd_add_shortcut = '바로가기 추가';
-    $lang->cmd_install = '설치';
-    $lang->cmd_update = '업데이트';
-    $lang->cmd_manage_category = '분류 관리';
-    $lang->cmd_manage_grant = '권한 관리';
-    $lang->cmd_manage_skin = '스킨 관리';
-    $lang->cmd_manage_document = '게시글 관리';
-    $lang->cmd_find_module = '모듈 찾기';
-    $lang->cmd_find_langcode = '언어 코드 찾기';
-
-    $lang->msg_new_module = '모듈 생성';
-    $lang->msg_update_module = '모듈 수정';
-    $lang->msg_module_name_exists = '이미 존재하는 모듈 이름입니다. 다른 이름을 입력해주세요.';
-    $lang->msg_category_is_null = '등록된 분류가 없습니다.';
-    $lang->msg_grant_is_null = '등록된 권한 대상이 없습니다.';
-    $lang->msg_no_checked_document = '선택된 게시물이 없습니다.';
-    $lang->msg_move_failed = '이동 실패하였습니다.';
-    $lang->msg_cannot_delete_for_child = '하부 분류가 있는 분류는 삭제하실 수 없습니다.';
-    $lang->msg_limit_mid ='모듈 이름은 영문+[영문+숫자+_] 만 가능합니다.';
-    $lang->msg_extra_name_exists = '이미 존재하는 확장 변수 이름입니다. 다른 이름을 입력해주세요.';
-
-    $lang->about_browser_title = '브라우저 제목에 나타나는 값입니다. RSS/Trackback에서도 사용됩니다.';
-    $lang->about_mid = '모듈 이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. (영문+[영문+숫자+_] 만 가능. 최대 40 글자)';
-    $lang->about_default = '선택하시면 사이트에 mid값 없이 접속하였을 경우 기본으로 보여줍니다.';
-    $lang->about_module_category = "분류를 통한 관리를 할 수 있도록 합니다. 모듈 분류 관리는 <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">모듈관리 > 모듈분류</a>에서 하실 수 있습니다.";
-    $lang->about_description= '관리용으로 사용되는 설명입니다.';
-    $lang->about_header_text = '모듈 상단에 표시되는 내용입니다. (HTML 태그 사용 가능)';
-    $lang->about_footer_text = '모듈 하단에 표시되는 내용입니다. (HTML 태그 사용 가능)';
-    $lang->about_skin = '모듈 스킨을 선택하실 수 있습니다.';
-    $lang->about_use_category = '선택하시면 분류 기능을 사용할 수 있습니다.';
-    $lang->about_list_count = '한 페이지에 표시될 글 수를 지정하실 수 있습니다. (기본 20개)';
-    $lang->about_search_list_count = '검색, 카테고리 선택 등을 할 경우 표시될 글 수를 지정하실 수 있습니다. (기본 20개)';
-    $lang->about_page_count = '목록 하단, 페이지를 이동하는 링크 수를 지정하실 수 있습니다. (기본 10개)';
-    $lang->about_admin_id = '해당 모듈에 대해 최고 권한을 가지는 관리자를 지정할 수 있습니다.';
-    $lang->about_grant = '특정 권한의 대상을 모두 해제하면 로그인하지 않은 회원까지 권한을 가질 수 있습니다.';
-    $lang->about_grant_deatil = '가입한 사용자는 cafeXE 등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다.';
-    $lang->about_module = "XE는 기본 라이브러리를 제외한 나머지는 모두 모듈로 구성되어 있습니다.\n모듈 관리 모듈은 설치된 모든 모듈을 보여주고 관리를 돕습니다.";
-    $lang->about_extra_vars_default_value = '다중/단일 선택 등 기본 값이 여러 개가 필요한 경우 , (콤마)로 연결하시면 됩니다.';
-    $lang->about_search_virtual_site = '가상 사이트(예:cafeXE) 도메인을 입력하신 후 검색하세요.<br/>가상 사이트 이외의 모듈은 내용을 비우고 검색하시면 됩니다. (http:// 는 제외)';
-    $lang->about_extra_vars_eid_value = '확장 변수의 이름을 적어주세요. (영문+[영문+숫자+_] 만 가능)';
-    $lang->about_langcode = '언어별로 다르게 설정하고 싶으시면 언어 코드 찾기를 이용해주세요.';
-    $lang->about_file_extension= "%s 파일만 가능합니다.";
-?>
diff --git a/modules/module/lang/lang.xml b/modules/module/lang/lang.xml
new file mode 100644
index 000000000..3953dd38d
--- /dev/null
+++ b/modules/module/lang/lang.xml
@@ -0,0 +1,996 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>	
+	<item name="msg_avail_install">
+		<value xml:lang="ko"><![CDATA[이 항목 설치가 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can install this item.]]></value>
+		<value xml:lang="jp"><![CDATA[この項目のインストールが可能です。]]></value>
+    </item>
+	<item name="msg_avail_update">
+		<value xml:lang="ko"><![CDATA[이 항목 업데이트가 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can update this item.]]></value>
+		<value xml:lang="jp"><![CDATA[この項目のアップデートが可能です。]]></value>
+    </item>
+	<item name="msg_avail_easy_update">
+		<value xml:lang="ko"><![CDATA[이 항목의 새로운 버전이 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is new version for this item.]]></value>
+		<value xml:lang="jp"><![CDATA[この項目の新しいバージョンがあります。]]></value>
+    </item>
+	<item name="msg_do_you_like_install">
+		<value xml:lang="ko"><![CDATA[설치하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would you like to install?]]></value>
+		<value xml:lang="jp"><![CDATA[インストールしますか?]]></value>
+	</item>
+	<item name="msg_do_you_like_update">
+		<value xml:lang="ko"><![CDATA[업데이트하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Would you like to update?]]></value>
+		<value xml:lang="jp"><![CDATA[アップデートしますか?]]></value>
+	</item>
+	<item name="virtual_site">
+		<value xml:lang="ko"><![CDATA[가상 사이트]]></value>
+		<value xml:lang="en"><![CDATA[Virtual Site]]></value>
+		<value xml:lang="jp"><![CDATA[バーチャル（Virtual）サイト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[站点]]></value>
+		<value xml:lang="zh-TW"><![CDATA[虛擬網站]]></value>
+		<value xml:lang="tr"><![CDATA[Sanal Siteler]]></value>
+		<value xml:lang="vi"><![CDATA[Site thực]]></value>
+	</item>
+	<item name="module_list">
+		<value xml:lang="ko"><![CDATA[모듈 목록]]></value>
+		<value xml:lang="en"><![CDATA[Modules List]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Modules]]></value>
+		<value xml:lang="ru"><![CDATA[Список модулей]]></value>
+		<value xml:lang="es"><![CDATA[Lista de Módulos]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Module]]></value>
+	</item>
+	<item name="module_index">
+		<value xml:lang="ko"><![CDATA[모듈 목록]]></value>
+		<value xml:lang="en"><![CDATA[Modules List]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールインデックス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Modules]]></value>
+		<value xml:lang="ru"><![CDATA[Список модулей]]></value>
+		<value xml:lang="es"><![CDATA[Lista de Módulos]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách Module]]></value>
+	</item>
+	<item name="module_category">
+		<value xml:lang="ko"><![CDATA[모듈 분류]]></value>
+		<value xml:lang="en"><![CDATA[Module Category]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールカテゴリ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組分類]]></value>
+		<value xml:lang="fr"><![CDATA[Catégorie des Modules]]></value>
+		<value xml:lang="ru"><![CDATA[Категория модуля]]></value>
+		<value xml:lang="es"><![CDATA[Categoría de Módulos ]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Kategorisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thể loại]]></value>
+	</item>
+	<item name="module_info">
+		<value xml:lang="ko"><![CDATA[모듈 정보]]></value>
+		<value xml:lang="en"><![CDATA[Module Info]]></value>
+		<value xml:lang="jp"><![CDATA[詳細]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information de Module]]></value>
+		<value xml:lang="ru"><![CDATA[Информация]]></value>
+		<value xml:lang="es"><![CDATA[Información]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin Module]]></value>
+	</item>
+	<item name="add_shortcut">
+		<value xml:lang="ko"><![CDATA[관리자 메뉴에 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Shortcuts]]></value>
+		<value xml:lang="jp"><![CDATA[管理者メニューに追加する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加到快捷菜单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增到快捷選單]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un raccourci dans le menu pour l'administrateur]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить ярлыки]]></value>
+		<value xml:lang="es"><![CDATA[Añadir en el menú del administrador]]></value>
+		<value xml:lang="tr"><![CDATA[Kısayol Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm phím tắt]]></value>
+	</item>
+	<item name="module_action">
+		<value xml:lang="ko"><![CDATA[동작]]></value>
+		<value xml:lang="en"><![CDATA[Actions]]></value>
+		<value xml:lang="jp"><![CDATA[動作]]></value>
+		<value xml:lang="zh-CN"><![CDATA[动作]]></value>
+		<value xml:lang="zh-TW"><![CDATA[動作]]></value>
+		<value xml:lang="ru"><![CDATA[Действия]]></value>
+		<value xml:lang="es"><![CDATA[Acción]]></value>
+		<value xml:lang="tr"><![CDATA[Eylemler]]></value>
+		<value xml:lang="vi"><![CDATA[Hoạt động]]></value>
+	</item>
+	<item name="module_maker">
+		<value xml:lang="ko"><![CDATA[모듈 제작자]]></value>
+		<value xml:lang="en"><![CDATA[Module Developer]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組作者]]></value>
+		<value xml:lang="fr"><![CDATA[Développeur du Module]]></value>
+		<value xml:lang="ru"><![CDATA[Разработчик модуля]]></value>
+		<value xml:lang="es"><![CDATA[Módulo del desarrollador]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Geliştirici]]></value>
+		<value xml:lang="vi"><![CDATA[Người thiết kế]]></value>
+	</item>
+	<item name="module_license">
+		<value xml:lang="ko"><![CDATA[라이선스]]></value>
+		<value xml:lang="en"><![CDATA[License]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="fr"><![CDATA[Licence]]></value>
+		<value xml:lang="ru"><![CDATA[Лицензия]]></value>
+		<value xml:lang="tr"><![CDATA[Lisans]]></value>
+		<value xml:lang="vi"><![CDATA[Giấy phép]]></value>
+	</item>
+	<item name="module_history">
+		<value xml:lang="ko"><![CDATA[변경 이력 ]]></value>
+		<value xml:lang="en"><![CDATA[Revision History]]></value>
+		<value xml:lang="jp"><![CDATA[変更履歴 ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新事项 ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新紀錄]]></value>
+		<value xml:lang="fr"><![CDATA[Histoire de Mise à Jour]]></value>
+		<value xml:lang="ru"><![CDATA[История обновлений]]></value>
+		<value xml:lang="es"><![CDATA[Historia de actualización]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleştirme Geçmişi]]></value>
+		<value xml:lang="vi"><![CDATA[Lịch sử cập nhật]]></value>
+	</item>
+	<item name="category_title">
+		<value xml:lang="ko"><![CDATA[분류명]]></value>
+		<value xml:lang="en"><![CDATA[Category Title]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Titre de la Catégorie]]></value>
+		<value xml:lang="ru"><![CDATA[Название категории]]></value>
+		<value xml:lang="es"><![CDATA[Título de categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori Başlığı]]></value>
+		<value xml:lang="vi"><![CDATA[Tiêu đề phân loại]]></value>
+	</item>
+	<item name="header_text">
+		<value xml:lang="ko"><![CDATA[상단 내용]]></value>
+		<value xml:lang="en"><![CDATA[Header Text]]></value>
+		<value xml:lang="jp"><![CDATA[ヘッダー内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[头部修饰]]></value>
+		<value xml:lang="zh-TW"><![CDATA[頂端內容]]></value>
+		<value xml:lang="fr"><![CDATA[Texte en-tête]]></value>
+		<value xml:lang="ru"><![CDATA[Верхний колонтитул]]></value>
+		<value xml:lang="es"><![CDATA[Encabezado]]></value>
+		<value xml:lang="tr"><![CDATA[Başlık Metni]]></value>
+		<value xml:lang="vi"><![CDATA[Nội dung Header]]></value>
+	</item>
+	<item name="footer_text">
+		<value xml:lang="ko"><![CDATA[하단 내용]]></value>
+		<value xml:lang="en"><![CDATA[Footer Text]]></value>
+		<value xml:lang="jp"><![CDATA[フッター内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[尾部修饰]]></value>
+		<value xml:lang="zh-TW"><![CDATA[底端內容]]></value>
+		<value xml:lang="fr"><![CDATA[Text au bas de page]]></value>
+		<value xml:lang="ru"><![CDATA[Нижний колонтитул]]></value>
+		<value xml:lang="es"><![CDATA[Pie de página]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfa Altlığı Metni]]></value>
+		<value xml:lang="vi"><![CDATA[Nội dung Footer]]></value>
+	</item>
+	<item name="use_category">
+		<value xml:lang="ko"><![CDATA[분류 사용]]></value>
+		<value xml:lang="en"><![CDATA[Enable Category]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ使用]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用分類]]></value>
+		<value xml:lang="fr"><![CDATA[Utiliser catégorie]]></value>
+		<value xml:lang="ru"><![CDATA[Включить категорию]]></value>
+		<value xml:lang="es"><![CDATA[Usar categoría]]></value>
+		<value xml:lang="tr"><![CDATA[Kategoriyi Etkinleştir]]></value>
+		<value xml:lang="vi"><![CDATA[Mở phân loại]]></value>
+	</item>
+	<item name="checked_count">
+		<value xml:lang="ko"><![CDATA[선택된 글 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of Checked Articles]]></value>
+		<value xml:lang="jp"><![CDATA[選択された書き込み数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[所选主题数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[所選擇的主題數]]></value>
+		<value xml:lang="fr"><![CDATA[somme des Articles choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Число выбранных статей]]></value>
+		<value xml:lang="es"><![CDATA[Múmero de los documentos selecionados]]></value>
+		<value xml:lang="tr"><![CDATA[Denetlenen Makale Sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số bài viết đã chọn]]></value>
+	</item>
+	<item name="skin_default_info">
+		<value xml:lang="ko"><![CDATA[스킨 기본정보]]></value>
+		<value xml:lang="en"><![CDATA[Default Skin Info]]></value>
+		<value xml:lang="jp"><![CDATA[スキン基本情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[皮肤默认信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[預設面板資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information fondamental de l'habillage]]></value>
+		<value xml:lang="ru"><![CDATA[Информация стандартного скина]]></value>
+		<value xml:lang="es"><![CDATA[información del tema predefinido]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan Dış Görünüm Bilgisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin Skin mặc định]]></value>
+	</item>
+	<item name="skin_author">
+		<value xml:lang="ko"><![CDATA[스킨 제작자]]></value>
+		<value xml:lang="en"><![CDATA[Skin Developer]]></value>
+		<value xml:lang="jp"><![CDATA[スキン作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[皮肤作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[面板作者]]></value>
+		<value xml:lang="fr"><![CDATA[Developpeur de l'habillage]]></value>
+		<value xml:lang="ru"><![CDATA[Разработчик скина]]></value>
+		<value xml:lang="es"><![CDATA[Desarrollador de tema]]></value>
+		<value xml:lang="tr"><![CDATA[Dış Görünüm Geliştiricisi]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết kế]]></value>
+	</item>
+	<item name="skin_license">
+		<value xml:lang="ko"><![CDATA[라이선스]]></value>
+		<value xml:lang="en"><![CDATA[License]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="fr"><![CDATA[Licence]]></value>
+		<value xml:lang="tr"><![CDATA[Lisans]]></value>
+		<value xml:lang="vi"><![CDATA[Giấy phép]]></value>
+	</item>
+	<item name="skin_history">
+		<value xml:lang="ko"><![CDATA[변경 이력]]></value>
+		<value xml:lang="en"><![CDATA[Revision History]]></value>
+		<value xml:lang="jp"><![CDATA[変更内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新日志]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新事項]]></value>
+		<value xml:lang="fr"><![CDATA[Histoire des Mises à jour]]></value>
+		<value xml:lang="ru"><![CDATA[История обновлений]]></value>
+		<value xml:lang="es"><![CDATA[Historia de actualización]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleştirme Geçmişi]]></value>
+		<value xml:lang="vi"><![CDATA[Lịch sử cập nhật]]></value>
+	</item>
+	<item name="module_copy">
+		<value xml:lang="ko"><![CDATA[모듈 복사]]></value>
+		<value xml:lang="en"><![CDATA[Duplicate Module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールコピー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块复制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[複製模組]]></value>
+		<value xml:lang="fr"><![CDATA[Copier un Module]]></value>
+		<value xml:lang="ru"><![CDATA[Копировать модуль]]></value>
+		<value xml:lang="es"><![CDATA[Copy Module]]></value>
+		<value xml:lang="tr"><![CDATA[Çoğaltma Modülü]]></value>
+		<value xml:lang="vi"><![CDATA[Nhân bản Module]]></value>
+	</item>
+	<item name="module_selector">
+		<value xml:lang="ko"><![CDATA[모듈 선택기]]></value>
+		<value xml:lang="en"><![CDATA[Module Selector]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールセレクター]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块选择器]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組選擇器]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Seçini]]></value>
+		<value xml:lang="vi"><![CDATA[Chọn lọc Module]]></value>
+	</item>
+	<item name="do_selected">
+		<value xml:lang="ko"><![CDATA[선택된 것들을...]]></value>
+		<value xml:lang="en"><![CDATA[I want to]]></value>
+		<value xml:lang="jp"><![CDATA[選択したものを...]]></value>
+		<value xml:lang="zh-CN"><![CDATA[把所选模块...]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇項目...]]></value>
+		<value xml:lang="ru"><![CDATA[Выбранные...]]></value>
+		<value xml:lang="tr"><![CDATA[Şunu yap]]></value>
+		<value xml:lang="vi"><![CDATA[Bình chọn / Phê bình.]]></value>
+	</item>
+	<item name="bundle_setup">
+		<value xml:lang="ko"><![CDATA[일괄 기본 설정]]></value>
+		<value xml:lang="en"><![CDATA[Bundle Setup]]></value>
+		<value xml:lang="jp"><![CDATA[一括基本設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[批量设置-常规选项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[批次設定-設置]]></value>
+		<value xml:lang="tr"><![CDATA[Toplu Ayar]]></value>
+		<value xml:lang="vi"><![CDATA[Gói cài đặt]]></value>
+	</item>
+	<item name="bundle_addition_setup">
+		<value xml:lang="ko"><![CDATA[일괄 추가 설정]]></value>
+		<value xml:lang="en"><![CDATA[Bundle Additional Setup]]></value>
+		<value xml:lang="jp"><![CDATA[一括追加設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[批量设置-高级选项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[批次設定-延伸設置]]></value>
+		<value xml:lang="tr"><![CDATA[Toplu Ek Ayar]]></value>
+		<value xml:lang="vi"><![CDATA[Gói cài đặt bổ xung]]></value>
+	</item>
+	<item name="bundle_grant_setup">
+		<value xml:lang="ko"><![CDATA[일괄 권한 설정]]></value>
+		<value xml:lang="en"><![CDATA[Bundle Permission Setup]]></value>
+		<value xml:lang="jp"><![CDATA[一括権限設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[批量设置-权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[批次設定-權限管理]]></value>
+		<value xml:lang="tr"><![CDATA[Toplu Yetki Ayarı]]></value>
+		<value xml:lang="vi"><![CDATA[Gói cài đặt cho phép]]></value>
+	</item>
+	<item name="lang_code">
+		<value xml:lang="ko"><![CDATA[언어 코드]]></value>
+		<value xml:lang="en"><![CDATA[Language Code]]></value>
+		<value xml:lang="jp"><![CDATA[言語コード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[语言变量]]></value>
+		<value xml:lang="zh-TW"><![CDATA[語言代碼]]></value>
+		<value xml:lang="ru"><![CDATA[Код языка]]></value>
+		<value xml:lang="tr"><![CDATA[Dil Kodu]]></value>
+		<value xml:lang="vi"><![CDATA[Mã ngôn ngữ]]></value>
+	</item>
+	<item name="filebox">
+		<value xml:lang="ko"><![CDATA[파일박스]]></value>
+		<value xml:lang="en"><![CDATA[FileBox]]></value>
+		<value xml:lang="jp"><![CDATA[ファイルボックス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檔案管理]]></value>
+		<value xml:lang="ru"><![CDATA[Файлбокс]]></value>
+		<value xml:lang="tr"><![CDATA[Dosya Kutusu]]></value>
+	</item>
+	<item name="upload_file">
+		<value xml:lang="ko"><![CDATA[파일 올리기]]></value>
+		<value xml:lang="en"><![CDATA[Upload File]]></value>
+	</item>
+	<item name="access_type">
+		<value xml:lang="ko"><![CDATA[접속 방법]]></value>
+		<value xml:lang="en"><![CDATA[Access Type]]></value>
+		<value xml:lang="jp"><![CDATA[アクセスタイプ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[访问方式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[訪問類型]]></value>
+		<value xml:lang="ru"><![CDATA[Способ соединения]]></value>
+		<value xml:lang="tr"><![CDATA[Erişim Türü]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểu truy cập]]></value>
+	</item>
+	<item name="access_domain">
+		<value xml:lang="ko"><![CDATA[Domain 접속]]></value>
+		<value xml:lang="en"><![CDATA[With Domain Name]]></value>
+		<value xml:lang="jp"><![CDATA[ドメインアクセス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[域名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Domain]]></value>
+		<value xml:lang="ru"><![CDATA[Domain соединения]]></value>
+		<value xml:lang="tr"><![CDATA[Alan adıyla]]></value>
+		<value xml:lang="vi"><![CDATA[Với tên miền]]></value>
+	</item>
+	<item name="access_vid">
+		<value xml:lang="ko"><![CDATA[Site ID 접속]]></value>
+		<value xml:lang="en"><![CDATA[With Site ID]]></value>
+		<value xml:lang="jp"><![CDATA[Site IDアクセス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[站点ID]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Site ID]]></value>
+		<value xml:lang="ru"><![CDATA[Site ID соединение]]></value>
+		<value xml:lang="tr"><![CDATA[Site kimliğiyle]]></value>
+		<value xml:lang="vi"><![CDATA[Với ID Website]]></value>
+	</item>
+	<item name="about_domain">
+		<value xml:lang="ko"><![CDATA[1개 이상의 사이트를 만들기 위해서는 전용 도메인이 있어야 합니다.<br />독립 도메인이나 서브 도메인이 있으면 되고 XE가 설치된 경로까지 같이 넣어주세요.<br />예) www.xpressengine.com/xe]]></value>
+		<value xml:lang="en"><![CDATA[In order to create more than one virtual site, every club needs to have its own domain name.<br />A sub-domain (e.g., aaa.bbb.com of bbb.com) also can be used. Input the address including the path where XE is installed. <br /> ex) www.xpressengine.com/xe]]></value>
+		<value xml:lang="jp"><![CDATA[複数のホームページを作成するためには、「オリジナルドメイン」や「サブ ドメイン」のような専用のドメインが必要です。<br />また、 XEのインストールパスも一緒に記入してください。<br />ex) www.xpressengine.com/xe]]></value>
+		<value xml:lang="zh-CN"><![CDATA[要创建一个站点必须有一个专用域名。<br />一级域名或二级域名皆可。输入的时候请把XE安装路径也一起输入。<br />ex) www.xpressengine.com/xe]]></value>
+		<value xml:lang="zh-TW"><![CDATA[要建立網站必須要有個專屬域名。<br />頂級域名或次級域名都可以。輸入時，請將 XE 安裝路徑也一起輸入。<br />例) www.xpressengine.com/xe]]></value>
+		<value xml:lang="es"><![CDATA[Para crear un dominio privado de la site requiere. <br /> Independiente de dominio o subdominio, y XE está instalado, el camino que en su conjunto. <br /> Ej.) www.xpressengine.com / zbxe]]></value>
+		<value xml:lang="tr"><![CDATA[Birden fazla sanal website oluşturabilmek için, her birinin kendi alanadına ihtiyacı vardır.<br />Alt-alanadı (örn., aaa.bbb.com of bbb.com) da kullanılabilir. XE'nin de içinde kurulu olduğu yolun adresini giriniz. <br /> örn.) www.xpressengine.com/xe]]></value>
+		<value xml:lang="vi"><![CDATA[Để tạo nhiều Website nhỏ, các Website nhỏ này cần những tên miền riêng của mình.<br />Có thể sử dụng những Subdomain dạng aaa.bbb.com của bbb.com. Hãy nhập địa chỉ bao gồm cả Domain cài đặt XE. <br /> Ví dụ: www.vietxe.net/xe]]></value>
+	</item>
+	<item name="about_vid">
+		<value xml:lang="ko"><![CDATA[별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)과 중복될 수 없습니다.<br />첫 글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다]]></value>
+		<value xml:lang="en"><![CDATA[Users can access via http://XEaddress/ID. You cannot use same site id as the existing module name(mid).<br />Site id should start with an alphabet character. Alphabet characters, numbers and underscore can be used for the site id.]]></value>
+		<value xml:lang="jp"><![CDATA[別途のドメインではなく、「http://XEアドレス/ID」へのアクセスが可能です。この際、モジュール名(mid)と重複しないように登録してください。<br />必ず、頭文字は半角英文字にし、「（すべて半角の）英数字・_ 」 だけの組み合わせで入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[直接以http://XE安装地址/ID的方式访问。<br />模块名(mid)不能重复。<br />模块名要以英文字母开头，且只允许使用英文字母，数字及"_"。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[直接以 http://程式安裝位址/ID 的方式訪問。模組名稱(mid)不能重複。<br />必須要以英文字母開頭，只允許使用底線、英文及數字。]]></value>
+		<value xml:lang="fr"><![CDATA[별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다.<br />첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다]]></value>
+		<value xml:lang="ru"><![CDATA[별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다.<br />첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다]]></value>
+		<value xml:lang="es"><![CDATA[별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다.<br />첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcılar, http://XEaddress/ID adresiyle ulaşabilirler. Varolan bir modül adıyla(mid) aynı olan site kimliği kullanamazsınız .<br />Site kimliği bir harfle başlamaladır . Alfabetik karakterler, sayılar ve _ işareti site kimliği için kullanılabilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Người sử dụng có thể truy cập qua http://XEaddress/ID. Bạn không thể sử dụng ID giống nhau và giống tên Module đã có.<br />Teen ID có dạng là các chữ cái, số và dấu gạch dưới (_).]]></value>
+	</item>
+	<item name="msg_already_registed_vid">
+		<value xml:lang="ko"><![CDATA[이미 등록된 사이트 ID 입니다. 게시판 등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Already registered site id. Please input another ID.]]></value>
+		<value xml:lang="jp"><![CDATA[既に登録されているサイトIDです。掲示板などのmidと重複は不可です。異なるIDを入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[重复的站点ID，请重新输入(注：站点ID不能重复，而且也不能与版面mid重复)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已註冊的 Site ID。不可與討論板的 mid 相同。請輸入其他 ID 名稱。]]></value>
+		<value xml:lang="fr"><![CDATA[이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.]]></value>
+		<value xml:lang="ru"><![CDATA[이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.]]></value>
+		<value xml:lang="es"><![CDATA[이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.]]></value>
+		<value xml:lang="tr"><![CDATA[Önceden kaydedilmiş site kimliği. Lütfen başka bir kimlik giriniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên ID này đã được đăng kí. Xin hãy chọn tên khác.]]></value>
+	</item>
+	<item name="msg_already_registed_domain">
+		<value xml:lang="ko"><![CDATA[이미 등록된 도메인입니다. 다른 도메인을 사용해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Domain name has already been used. Please input another domain name.]]></value>
+		<value xml:lang="jp"><![CDATA[既に登録されているドメインです。異なるドメインを利用してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[对不起！已有相同的域名。请重新输入。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已註冊的域名。請使用其他的網域。]]></value>
+		<value xml:lang="es"><![CDATA[Ya es de dominio registrado. Por favor, use un dominio diferente.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu alanadı önceden kullanıldı. Lütfen farklı bir alanadı giriniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên miền đã được sử dụng. Xin hãy chọn tên khác.]]></value>
+	</item>
+	<item name="header_script">
+		<value xml:lang="ko"><![CDATA[헤더 스크립트]]></value>
+		<value xml:lang="en"><![CDATA[Header Script]]></value>
+		<value xml:lang="jp"><![CDATA[ヘッダースクリプト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[文件头部脚本]]></value>
+		<value xml:lang="fr"><![CDATA[Script en-tête]]></value>
+		<value xml:lang="ru"><![CDATA[Скрипт Header]]></value>
+		<value xml:lang="tr"><![CDATA[Başlık Betiği(script)]]></value>
+	</item>
+	<item name="about_header_script">
+		<value xml:lang="ko"><![CDATA[HTML &lt;head&gt;...&lt;/head&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. 예) &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; ...]]></value>
+		<value xml:lang="en"><![CDATA[You can input the html script between &lt;header&gt; and &lt;/header&gt; by yourself. You can use &lt;script&gt;, &lt;style&gt; or &lt;meta&gt; tags.]]></value>
+		<value xml:lang="jp"><![CDATA[HTMLの&lt;header&gt;と&lt;/header&gt;の間に入れるコードを直接入力できます。 &lt;script&gt;、&lt;style&gt;または&lt;meta&gt;タグなどを利用できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以直接输入插入到html中&lt;head&gt;区的代码。 可使用&lt;script&gt;, &lt;style&gt; 或 &lt;meta&gt; 等标签。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以直接輸入，並插入到 HTML 的&lt;head&gt;之間。 可使用&lt;script&gt;,&lt;style&gt;或&lt;meta&gt;等標籤。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez entrer un script en html par vous-même entre &lt;header&gt; et &lt;/header&gt;. Vous pouvez utiliser &lt;script&gt;, &lt;style&gt; ou &lt;meta&gt; tag]]></value>
+		<value xml:lang="ru"><![CDATA[html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; 태그등을 이용하실 수 있습니다]]></value>
+		<value xml:lang="es"><![CDATA[html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다. &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; 태그등을 이용하실 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Html betiğini(script) &lt;header&gt; ile &lt;/header&gt; arasına kendiniz ekleyebilirsiniz.  &lt;script&gt;, &lt;style&gt;, &lt;meta&gt; tag kullanabilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn co thể nhập mã dang HTML vào giữa  &lt;header&gt; và &lt;/header&gt;. Bạn có thể sử dụng &lt;script&gt;, &lt;style&gt; hay &lt;meta&gt; tag]]></value>
+	</item>
+	<item name="grant_access">
+		<value xml:lang="ko"><![CDATA[접근 권한]]></value>
+		<value xml:lang="en"><![CDATA[Access]]></value>
+		<value xml:lang="jp"><![CDATA[アクセス権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[访问权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[訪問]]></value>
+		<value xml:lang="tr"><![CDATA[Yetki]]></value>
+		<value xml:lang="vi"><![CDATA[Truy cập]]></value>
+	</item>
+	<item name="grant_manager">
+		<value xml:lang="ko"><![CDATA[관리 권한]]></value>
+		<value xml:lang="en"><![CDATA[Management]]></value>
+		<value xml:lang="jp"><![CDATA[管理権限]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理权限]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理]]></value>
+		<value xml:lang="tr"><![CDATA[Yönetim]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý]]></value>
+	</item>
+	<item name="grant_to_all">
+		<value xml:lang="ko"><![CDATA[모든 사용자]]></value>
+		<value xml:lang="en"><![CDATA[All users]]></value>
+		<value xml:lang="jp"><![CDATA[すべてのユーザー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不限制]]></value>
+		<value xml:lang="zh-TW"><![CDATA[所有用戶]]></value>
+		<value xml:lang="tr"><![CDATA[Tüm kullanıcılar]]></value>
+		<value xml:lang="vi"><![CDATA[Tất cả]]></value>
+	</item>
+	<item name="grant_to_login_user">
+		<value xml:lang="ko"><![CDATA[로그인 사용자]]></value>
+		<value xml:lang="en"><![CDATA[Login users]]></value>
+		<value xml:lang="jp"><![CDATA[ログインユーザー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已登录用户]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已登入用戶]]></value>
+		<value xml:lang="tr"><![CDATA[Oturum açmış kullanıcılar]]></value>
+		<value xml:lang="vi"><![CDATA[Đã đăng nhập]]></value>
+	</item>
+	<item name="grant_to_site_user">
+		<value xml:lang="ko"><![CDATA[가입한 사용자]]></value>
+		<value xml:lang="en"><![CDATA[Registered users]]></value>
+		<value xml:lang="jp"><![CDATA[登録ユーザー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[子站会员]]></value>
+		<value xml:lang="zh-TW"><![CDATA[網站用戶]]></value>
+		<value xml:lang="fr"><![CDATA[Joined users]]></value>
+		<value xml:lang="ru"><![CDATA[Joined users]]></value>
+		<value xml:lang="es"><![CDATA[Joined users]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıtlı kullanıcılar]]></value>
+		<value xml:lang="vi"><![CDATA[Đã đăng kí]]></value>
+	</item>
+	<item name="grant_to_group">
+		<value xml:lang="ko"><![CDATA[선택 그룹 사용자]]></value>
+		<value xml:lang="en"><![CDATA[Selected group users]]></value>
+		<value xml:lang="jp"><![CDATA[特定グループのユーザー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[特定用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[特定群組]]></value>
+		<value xml:lang="tr"><![CDATA[Belirli grup kullanıcıları]]></value>
+		<value xml:lang="vi"><![CDATA[Nhóm chỉ định]]></value>
+	</item>
+	<item name="cmd_add_shortcut">
+		<value xml:lang="ko"><![CDATA[바로가기 추가]]></value>
+		<value xml:lang="en"><![CDATA[Add Shortcut]]></value>
+		<value xml:lang="jp"><![CDATA[ショートカット追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加到快捷菜单]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增到快捷選單]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un raccourci]]></value>
+		<value xml:lang="ru"><![CDATA[Добавить ярлык]]></value>
+		<value xml:lang="es"><![CDATA[añadir acceso directo]]></value>
+		<value xml:lang="tr"><![CDATA[Kısayol Ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Thêm phím tắt]]></value>
+	</item>
+	<item name="cmd_install">
+		<value xml:lang="ko"><![CDATA[설치]]></value>
+		<value xml:lang="en"><![CDATA[Install]]></value>
+		<value xml:lang="jp"><![CDATA[インストール]]></value>
+		<value xml:lang="zh-CN"><![CDATA[安装]]></value>
+		<value xml:lang="zh-TW"><![CDATA[安裝]]></value>
+		<value xml:lang="fr"><![CDATA[Installer]]></value>
+		<value xml:lang="ru"><![CDATA[Установить]]></value>
+		<value xml:lang="es"><![CDATA[Instalar]]></value>
+		<value xml:lang="tr"><![CDATA[Kur]]></value>
+		<value xml:lang="vi"><![CDATA[Cài đặt]]></value>
+	</item>
+	<item name="cmd_update">
+		<value xml:lang="ko"><![CDATA[업데이트]]></value>
+		<value xml:lang="en"><![CDATA[Update]]></value>
+		<value xml:lang="jp"><![CDATA[アップデート]]></value>
+		<value xml:lang="zh-CN"><![CDATA[升级]]></value>
+		<value xml:lang="zh-TW"><![CDATA[升級]]></value>
+		<value xml:lang="fr"><![CDATA[Mettre à Jour]]></value>
+		<value xml:lang="ru"><![CDATA[Обновить]]></value>
+		<value xml:lang="es"><![CDATA[Actualizar]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleştir]]></value>
+		<value xml:lang="vi"><![CDATA[Cập nhật]]></value>
+	</item>
+	<item name="cmd_manage_category">
+		<value xml:lang="ko"><![CDATA[분류 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Categories]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリ管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[分类管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[分類管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer des Catégories]]></value>
+		<value xml:lang="ru"><![CDATA[Управление категориями]]></value>
+		<value xml:lang="es"><![CDATA[Manejo de categorías]]></value>
+		<value xml:lang="tr"><![CDATA[Kategorileri Yönet]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý thể loại]]></value>
+	</item>
+	<item name="cmd_manage_grant">
+		<value xml:lang="ko"><![CDATA[권한 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Permission]]></value>
+		<value xml:lang="jp"><![CDATA[権限管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[权限管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[權限管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer des Permissions]]></value>
+		<value xml:lang="ru"><![CDATA[Управление правами доступа]]></value>
+		<value xml:lang="es"><![CDATA[Manejo de atribuciones]]></value>
+		<value xml:lang="tr"><![CDATA[Yetkileri Yönet]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý quyền]]></value>
+	</item>
+	<item name="cmd_manage_skin">
+		<value xml:lang="ko"><![CDATA[스킨 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Skins]]></value>
+		<value xml:lang="jp"><![CDATA[スキン管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[皮肤管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[面板管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer des Habillages]]></value>
+		<value xml:lang="ru"><![CDATA[Управление скинами]]></value>
+		<value xml:lang="es"><![CDATA[Manejo de temas]]></value>
+		<value xml:lang="tr"><![CDATA[Dış Görünümleri Yönet]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý Skin]]></value>
+	</item>
+	<item name="cmd_manage_document">
+		<value xml:lang="ko"><![CDATA[게시글 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage Articles]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み管理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[主题管理]]></value>
+		<value xml:lang="zh-TW"><![CDATA[主題管理]]></value>
+		<value xml:lang="fr"><![CDATA[Administrer des Articles]]></value>
+		<value xml:lang="ru"><![CDATA[Управление статьями]]></value>
+		<value xml:lang="es"><![CDATA[Manejo de documentos]]></value>
+		<value xml:lang="tr"><![CDATA[Makaleleri Yönet]]></value>
+		<value xml:lang="vi"><![CDATA[Quản lý bài viết]]></value>
+	</item>
+	<item name="cmd_find_module">
+		<value xml:lang="ko"><![CDATA[모듈 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find Module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查找模块]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋模組]]></value>
+		<value xml:lang="ru"><![CDATA[Искать модуль]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Bul]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm Module]]></value>
+	</item>
+	<item name="cmd_find_langcode">
+		<value xml:lang="ko"><![CDATA[언어 코드 찾기]]></value>
+		<value xml:lang="en"><![CDATA[Find lang code]]></value>
+		<value xml:lang="jp"><![CDATA[言語コード検索]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择语言变量]]></value>
+		<value xml:lang="zh-TW"><![CDATA[搜尋語言代碼]]></value>
+		<value xml:lang="tr"><![CDATA[Dil kodu bul]]></value>
+		<value xml:lang="vi"><![CDATA[Tìm mã ngôn ngữ]]></value>
+	</item>
+	<item name="msg_new_module">
+		<value xml:lang="ko"><![CDATA[모듈 생성]]></value>
+		<value xml:lang="en"><![CDATA[Create new module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール作成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块生成]]></value>
+		<value xml:lang="zh-TW"><![CDATA[建立模組]]></value>
+		<value xml:lang="fr"><![CDATA[Créer un module]]></value>
+		<value xml:lang="ru"><![CDATA[Создать новый модуль]]></value>
+		<value xml:lang="es"><![CDATA[Crear un nuevo módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Yeni modül oluştur]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo Module mới]]></value>
+	</item>
+	<item name="msg_update_module">
+		<value xml:lang="ko"><![CDATA[모듈 수정]]></value>
+		<value xml:lang="en"><![CDATA[Modify module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール修正]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块修改]]></value>
+		<value xml:lang="zh-TW"><![CDATA[修改模組]]></value>
+		<value xml:lang="fr"><![CDATA[Modifier un module]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить модуль]]></value>
+		<value xml:lang="es"><![CDATA[Modificar el módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Düzelt]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa Module]]></value>
+	</item>
+	<item name="msg_module_name_exists">
+		<value xml:lang="ko"><![CDATA[이미 존재하는 모듈 이름입니다. 다른 이름을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[The name already exists. Please try another name.]]></value>
+		<value xml:lang="jp"><![CDATA[既に存在するモジュール名です。他の名前を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已存在的模块名称。请输入其他名称。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已存在的模組名稱。請輸入其他名稱。]]></value>
+		<value xml:lang="fr"><![CDATA[Le nom existe déjà. Essayez un autre nom, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Имя уже существует. Пожалуйста, попробуйте другое]]></value>
+		<value xml:lang="es"><![CDATA[El nombre ya existe. Por favor tratar con otro nombre.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu isim önceden zaten alınmış. Lütfen başka bir tane deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên này đã được sử dụng. Hãy thử lại với tên khác.]]></value>
+	</item>
+	<item name="msg_category_is_null">
+		<value xml:lang="ko"><![CDATA[등록된 분류가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is no registered category.]]></value>
+		<value xml:lang="jp"><![CDATA[登録されているカテゴリがありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有登录的分类]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有登錄的分類]]></value>
+		<value xml:lang="fr"><![CDATA[Il n'y a pas de catégorie enrégistrée.]]></value>
+		<value xml:lang="ru"><![CDATA[Зарегистрированной категории не существует.]]></value>
+		<value xml:lang="es"><![CDATA[No existe categoría registrada.]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıtlı kategori yok.]]></value>
+		<value xml:lang="vi"><![CDATA[Không có phân loại nào được tạo.]]></value>
+	</item>
+	<item name="msg_grant_is_null">
+		<value xml:lang="ko"><![CDATA[등록된 권한 대상이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is no permission list.]]></value>
+		<value xml:lang="jp"><![CDATA[登録されている権限がありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有登录的权限对象]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有權限]]></value>
+		<value xml:lang="fr"><![CDATA[Il n'y a pas de liste de permission.]]></value>
+		<value xml:lang="ru"><![CDATA[Списка для управления правами доступа не существует.]]></value>
+		<value xml:lang="es"><![CDATA[No existe el objetivo de atribución registrado.]]></value>
+		<value xml:lang="tr"><![CDATA[Yetki listesi yok.]]></value>
+		<value xml:lang="vi"><![CDATA[Không có danh sách quyền nào.]]></value>
+	</item>
+	<item name="msg_no_checked_document">
+		<value xml:lang="ko"><![CDATA[선택된 게시물이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No checked articles exist.]]></value>
+		<value xml:lang="jp"><![CDATA[選択した書き込みがありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有被选择的主题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有被選擇的主題]]></value>
+		<value xml:lang="fr"><![CDATA[Pas un article est choisi.]]></value>
+		<value xml:lang="ru"><![CDATA[Нет выбранных статей.]]></value>
+		<value xml:lang="es"><![CDATA[No existe documento seleccionado.]]></value>
+		<value xml:lang="tr"><![CDATA[Denetlenmiş makaleler bulunmamakta.]]></value>
+		<value xml:lang="vi"><![CDATA[Không có bài viết nào được kiểm tra.]]></value>
+	</item>
+	<item name="msg_move_failed">
+		<value xml:lang="ko"><![CDATA[이동에 실패하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to move.]]></value>
+		<value xml:lang="jp"><![CDATA[移動できませんでした。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[移动失败！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[移動失敗！]]></value>
+		<value xml:lang="fr"><![CDATA[Echoué de bouger]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно переместить]]></value>
+		<value xml:lang="es"><![CDATA[No pudo moverse]]></value>
+		<value xml:lang="tr"><![CDATA[Taşıma hatası]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể di chuyển]]></value>
+	</item>
+	<item name="msg_cannot_delete_for_child">
+		<value xml:lang="ko"><![CDATA[하부 분류가 있는 분류는 삭제하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot delete a category which has child categories.]]></value>
+		<value xml:lang="jp"><![CDATA[下位カテゴリのあるカテゴリは削除できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能删除有下级分类的分类！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法刪除有子分類的分類！]]></value>
+		<value xml:lang="fr"><![CDATA[On ne peut pas supprimer une catégorie qui a des catégories inférieures.]]></value>
+		<value xml:lang="ru"><![CDATA[Невозможно удалить категорию, имеющую дочерние категории.]]></value>
+		<value xml:lang="es"><![CDATA[No puede eliminar la categoría si posee subcategoría.]]></value>
+		<value xml:lang="tr"><![CDATA[Alt kategorileri olan kategoriler silinemez.]]></value>
+		<value xml:lang="vi"><![CDATA[Không thể xóa được phân loại khi có những phân loại con.]]></value>
+	</item>
+	<item name="msg_limit_mid">
+		<value xml:lang="ko"><![CDATA[모듈 이름은 영문+[영문+숫자+_] 만 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only alphanumeric can be used in the module name.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール名は「 半角英小文字+[半角英小文字+半角数字+_] 」のみ可能です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块名称只允许英文字母+[英文字母+数字]。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組名稱可由英文 + [ 英文，數字及底線 ]等非常多種組合。]]></value>
+		<value xml:lang="fr"><![CDATA[모듈이름은 영문+[영문+숫자+_] 만 가능합니다.]]></value>
+		<value xml:lang="ru"><![CDATA[모듈이름은 영문+[영문+숫자+_] 만 가능합니다.]]></value>
+		<value xml:lang="es"><![CDATA[모듈이름은 영문+[영문+숫자+_] 만 가능합니다.]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece harfler+[harfler+sayılar+_] modül ismi olarak kullanılabilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Module chỉ hỗ trợ định dạng [Kí tự], [Kí tự+Số], [Kí tự+Số+_].]]></value>
+	</item>
+	<item name="msg_extra_name_exists">
+		<value xml:lang="ko"><![CDATA[이미 존재하는 확장 변수 이름입니다. 다른 이름을 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Already registered extra variable name. Please input another name.]]></value>
+		<value xml:lang="jp"><![CDATA[既に存在する拡張変数名です。他の拡張変数名を入力してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已有的扩展变量名称，请重新输入！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已存在的延伸變數名稱。請輸入其他名稱。]]></value>
+		<value xml:lang="fr"><![CDATA[이미 존재하는 확장변수 이름입니다. 다른 이름을 입력해주세요.]]></value>
+		<value xml:lang="ru"><![CDATA[이미 존재하는 확장변수 이름입니다. 다른 이름을 입력해주세요.]]></value>
+		<value xml:lang="es"><![CDATA[이미 존재하는 확장변수 이름입니다. 다른 이름을 입력해주세요.]]></value>
+		<value xml:lang="tr"><![CDATA[Önceden kayıtlı değişken isim. Lütfen başka bir tane giriniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Tên biến đã được sử dụng. Xin hãy chọn tên khác.]]></value>
+	</item>
+	<item name="about_browser_title">
+		<value xml:lang="ko"><![CDATA[브라우저 제목에 나타나는 값입니다. RSS/Trackback에서도 사용됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[It will be shown in the browser title. It will be also used in a RSS/Trackback.]]></value>
+		<value xml:lang="jp"><![CDATA[ブラウザのタイトルバーに表示される内容です。RSS/Trackbackでも使用します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[显示在浏览器窗口的标题值。 在RSS/Trackback也可以使用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顯示在瀏覽器視窗的標題。在 RSS/Trackback 也可以使用。]]></value>
+		<value xml:lang="fr"><![CDATA[C'est la valeur qui se représentera dans le titre de navigateur Web. Ce sera encore utilisé dans RSS/Rétrolien.]]></value>
+		<value xml:lang="ru"><![CDATA[Это будет показано в заголовке браузера. Также, это будет использоваться в RSS/Трекбеке.]]></value>
+		<value xml:lang="es"><![CDATA[Esto es el valor que se mostrará en el título del navegador. También es usado en RSS/Trackback.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu girdi tarayıcı başlığında gösterilecektir. Aynı zamanda RSS/Geri İzleme(trackback)'de de kullanılacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Nó sẽ hiển thị trên tiêu đề của trình duyệt và trong RSS/Trackback.]]></value>
+	</item>
+	<item name="about_mid">
+		<value xml:lang="ko"><![CDATA[모듈 이름은 http://주소/?mid=모듈이름 처럼 직접 호출할 수 있는 값입니다. (영문+[영문+숫자+_] 만 가능. 최대 40 글자)]]></value>
+		<value xml:lang="en"><![CDATA[The module name will be used like http://address/?mid=ModuleName.
+(Only english alphabet letters, numbers and underscore can be used. The maximum length is 40.)]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール名は「http://アドレス/?mid=モジュール名」のように直接呼び出せるパラメーター値です。<br />※英数の頭文字と[英数と_のみ]の組み合わせ （すべて半角、最大40文字） ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块名称只允许使用英文，数字和下划线(最多不能超过40字节)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[模組名稱只允許使用英文，數字和底線。最大長度 40 個字元。]]></value>
+		<value xml:lang="fr"><![CDATA[Le nom de module sera utilisé comme http://adresse/?mid=ModuleName.
+(alphabet anglais + [alphabet anglais, nombres, et soulignement(_)] sont seulement permis. The maximum length is 40.)]]></value>
+		<value xml:lang="ru"><![CDATA[Имя модуля будет использовано как http://address/?mid=Имя_модуля.
+(только латиница, цифры и символ подчеркивания(_) разрешены. The maximum length is 40.)]]></value>
+		<value xml:lang="es"><![CDATA[El nombre del módulo será usado como http://direccion/?mid=NombreMódulo.
+(sólo alfabeto español+[alfabeto español, números y el gión abajo(_)] son permitidos. The maximum length is 40.)]]></value>
+		<value xml:lang="tr"><![CDATA[Modül ismi, http://adres/?mid=Modulismi şeklinde kullanılacaktır.
+(Sadece ingilizce harflere + [ingilizce harflere, sayılara, ve altçizgiye (_)] izin verilmiştir. Azami uzunluk 40 karakterdir.)]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Module được sử dụng dạng http://address/?mid=<b>ModuleName</b>.
+(Chỉ cho phép chữ cái tiếng Anh + [chữ cái tiếng Anh, số, và dấu gạch dưới (_)] và tối đa 40 kí tự.)]]></value>
+	</item>
+	<item name="about_default">
+		<value xml:lang="ko"><![CDATA[선택하시면 사이트에 mid값 없이 접속하였을 경우 기본으로 보여줍니다.]]></value>
+		<value xml:lang="en"><![CDATA[If checked, this module will be shown when users access the site without mid value (mid=NoValue).]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると、サイトに「mid値」なしでアクセスした場合、デフォルトで表示します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用没有mid值的网址访问网站时，将会显示默认。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[用沒有 mid 值的網址訪問網站時，將會顯示預設。]]></value>
+		<value xml:lang="fr"><![CDATA[Si c'est coché, on verra ce module quand on connecte ce site sans aucune valeur de mid(mid=Nulle Valeur).]]></value>
+		<value xml:lang="ru"><![CDATA[Если выбрано, этот модуль будет показан, когда пользователи входят на сайт без идентификатора модуля (mid=NoValue).]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción, se mostrará de manera predefinida sin el valor de mid.]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer işaretlenmişse, kullanıcılar siteye modül kimlik değeri (mid=değer yok) olmadan erişirken bu modül görüntülenecektir .]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu chọn, Sẽ hiển thị mặc định là (mid=NoValue) khi truy cập tên Module không đúng.]]></value>
+	</item>
+	<item name="about_module_category">
+		<value xml:lang="ko"><![CDATA[분류를 통한 관리를 할 수 있도록 합니다. 모듈 분류 관리는 <a href="./?module=admin&amp;act=dispModuleAdminCategory">모듈관리 > 모듈분류</a>에서 하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[It enables you to manage it through a module category.
+ The URL for the module manager is <a href="./?module=admin&amp;act=dispModuleAdminCategory">Manage module > Module category </a>.]]></value>
+		<value xml:lang="jp"><![CDATA[カテゴリで管理できるようにします。モジュールのカテゴリの管理は、「<a href="./?module=admin&amp;act=dispModuleAdminCategory">モジュール管理 &gt; モジュールカテゴリ</a>」にて行います。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以分类管理模块。 模块分类可以在 <a href="./?module=admin&amp;act=dispModuleAdminCategory">模块管理 > 模块分类 </a>中进行管理。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以分類管理模組。模組分類可以在<a href="./?module=admin&amp;act=dispModuleAdminCategory">模組管理 > 模組分類 </a>中進行管理。]]></value>
+		<value xml:lang="fr"><![CDATA[Ça vous permet d'administrer le module par la catégorie.
+On peut administrer la classification des modules à <a href="./?module=admin&amp;act=dispModuleAdminCategory">Administration des modules > Catégorie des Modules </a>.]]></value>
+		<value xml:lang="ru"><![CDATA[Это позволяет Вам управлять посредством категорий модулей.
+URL для менеджера модулей <a href="./?module=admin&amp;act=dispModuleAdminCategory">Manage module > Категория Модуля </a>.]]></value>
+		<value xml:lang="es"><![CDATA[Es posible manejar a traves de categoría.
+ EL URL para en manejo del módulo de categoría es <a href="./?module=admin&amp;act=dispModuleAdminCategory">Manejo de módulo > Módulo de categoría </a>.]]></value>
+		<value xml:lang="tr"><![CDATA[Size, modül kategorisi yoluyla yönetme imkanı sunar.
+ Modül Yöneticisi için URL: <a href="./?module=admin&amp;act=dispModuleAdminCategory">Manage module > Modül Kategorisi</a>dir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nó cho phép bạn quản lý thông qua Module thể loại.
+ URL quản lý có dạng <a href="./?module=admin&amp;act=dispModuleAdminCategory">Quản lý Module > Module thể loại </a>.]]></value>
+	</item>
+	<item name="about_description">
+		<value xml:lang="ko"><![CDATA[관리용으로 사용되는 설명입니다.]]></value>
+		<value xml:lang="en"><![CDATA[This description is only for a manager.]]></value>
+		<value xml:lang="jp"><![CDATA[管理用として使用する説明です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理用使用说明。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理使用說明。]]></value>
+		<value xml:lang="fr"><![CDATA[C'est la description pour la facilité à administrer.]]></value>
+		<value xml:lang="ru"><![CDATA[Это описание только для менеджера.]]></value>
+		<value xml:lang="es"><![CDATA[Descripción usada para la administración.]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece yöneticilerin görebileceği açıklamadır.]]></value>
+		<value xml:lang="vi"><![CDATA[Mô tả cho một quản lý.]]></value>
+	</item>
+	<item name="about_header_text">
+		<value xml:lang="ko"><![CDATA[모듈 상단에 표시되는 내용입니다. (HTML 태그 사용 가능)]]></value>
+		<value xml:lang="en"><![CDATA[The contents will be shown on the top of the module. (html tags available)]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールのヘッダーに表示される内容です。（HTMLタグの使用可能）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块头部修饰内容。(可以使用HTML)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顯示在模組頂部的內容。(可使用 HTML)]]></value>
+		<value xml:lang="fr"><![CDATA[Ce contenu sera exposé en tête du module.(balise en html est disponible)]]></value>
+		<value xml:lang="ru"><![CDATA[Это содержимое будет показано сверху модуля. (HTML разрешен)]]></value>
+		<value xml:lang="es"><![CDATA[El contenido se mostrará en la parte superior del módulo.(tags de html permitido)]]></value>
+		<value xml:lang="tr"><![CDATA[Modülün üst kısmında gösterilecek içeriklerdir.(html etiketleri etkin)]]></value>
+		<value xml:lang="vi"><![CDATA[Nội dung sẽ hiển thị trên đầu Module.(sau http tag có sẵn)]]></value>
+	</item>
+	<item name="about_footer_text">
+		<value xml:lang="ko"><![CDATA[모듈 하단에 표시되는 내용입니다. (HTML 태그 사용 가능)]]></value>
+		<value xml:lang="en"><![CDATA[The contents will be shown on the bottom of the module. (html tags available)]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールのフッターに表示される内容です。（HTMLタグの使用可能）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[模块尾部修饰内容。(可以使用HTML)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[顯示在模組底部的內容。(可使用 HTML)]]></value>
+		<value xml:lang="fr"><![CDATA[Ce contenu sera exposé en bas du module.(balise en html est disponible)]]></value>
+		<value xml:lang="ru"><![CDATA[Это содержимое будет показано снизу модуля. (HTML разрешен)]]></value>
+		<value xml:lang="es"><![CDATA[El contenido se mostrará en la parte inferior del módulo.(tags de html permitido)]]></value>
+		<value xml:lang="tr"><![CDATA[Modülün alt kısmında gösterilecek içeriklerdir.(html etiketleri etkin)]]></value>
+		<value xml:lang="vi"><![CDATA[Nội dung sẽ hiển thị phía dưới Module.(trước http tag có sẵn)]]></value>
+	</item>
+	<item name="about_skin">
+		<value xml:lang="ko"><![CDATA[모듈 스킨을 선택하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may choose a module skin.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュールのスキンを選択します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以选择模块皮肤。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以選擇模組面板。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez choisir un habillage pour le module.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете выбрать скин модуля.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede elegir un tema del módulo.]]></value>
+		<value xml:lang="tr"><![CDATA[Modül dış görünümünü seçebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Banj có thể chọn Skin cho Module.]]></value>
+	</item>
+	<item name="about_use_category">
+		<value xml:lang="ko"><![CDATA[선택하시면 분류 기능을 사용할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[If checked, the category function will be enabled.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れるとカテゴリ機能を使用できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择此项可以使用分类功能。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇此項可以使用分類功能。]]></value>
+		<value xml:lang="fr"><![CDATA[Cochez pour utiliser la fonction de catégorie, .]]></value>
+		<value xml:lang="ru"><![CDATA[Если выбрано, функция категорий будет включена.]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción, la función de categoría sera activada.]]></value>
+		<value xml:lang="tr"><![CDATA[İşaretlediğiniz taktirde, kategori özelliği etkinleştirilecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu chon, chức năng thể loại sẽ hoạt động.]]></value>
+	</item>
+	<item name="about_list_count">
+		<value xml:lang="ko"><![CDATA[한 페이지에 표시될 글 수를 지정하실 수 있습니다. (기본 20개)]]></value>
+		<value xml:lang="en"><![CDATA[You can limit the number of article to show on one page. The default is 20.]]></value>
+		<value xml:lang="jp"><![CDATA[１ページ当たりに表示される書き込み数を指定できます（デフォルト20個）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定每页显示的主题数。(默认为20个)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定每頁顯示的主題數。(預設為 20 個)]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer combien d'articles soient exposés dans une page.(20 par défaut)]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить лимит показа статей на страницу. (по умолчанию: 20)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede definir el número límite de los documentos a mostrar en una página.(Predefinido es 20)]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfada gösterilecek makalelerin sayı üstsınırını ayarlayabilirsiniz.(varsayılan : 20)]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể giới hạn bài viết hiển thị trên một trang.(Mặc định là 20)]]></value>
+	</item>
+	<item name="about_search_list_count">
+		<value xml:lang="ko"><![CDATA[검색, 카테고리 선택 등을 할 경우 표시될 글 수를 지정하실 수 있습니다. (기본 20개)]]></value>
+		<value xml:lang="en"><![CDATA[You may set the number of articles to be exposed when you use search or category function. (default is 20)]]></value>
+		<value xml:lang="jp"><![CDATA[検索、カテゴリ選択などを行う場合に表示する書き込みの数を指定できます。（デフォルトは20件 ）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定搜索或选择分类时每页要显示的帖子数(默认为20个)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定搜尋或選擇分類時，每頁要顯示的文章數(預設為 20 個)。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer combien d'articles soient exposés quand vous utilisez la fonction de recherche ou de catégorie. (20 par défaut)]]></value>
+		<value xml:lang="ru"><![CDATA[검색 또는 카테고리 선택등을 할 경우 표시될 글의 수를 지정하실 수 있습니다. 기본(20개)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede configurar el número de artículos que se exponen cuando se utiliza la función de búsqueda o categoría. (Por defecto es 20)]]></value>
+		<value xml:lang="tr"><![CDATA[Kategori veya arama özelliğini kullanırken gösterilecek makalelerin sayısını ayarlayabilirsiniz. (varsayılan : 20)]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt giới hạn số bài viết sẽ hiển thị khi tìm kiếm hay chọn thể loại. (Mặc định là 20)]]></value>
+	</item>
+	<item name="about_page_count">
+		<value xml:lang="ko"><![CDATA[목록 하단, 페이지를 이동하는 링크 수를 지정하실 수 있습니다. (기본 10개)]]></value>
+		<value xml:lang="en"><![CDATA[You can set the number of page links to move pages in a bottom of the page. (default is 10)]]></value>
+		<value xml:lang="jp"><![CDATA[リスト下部、ページ移動可能なリンク数を指定できます（デフォルト10個）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定显示在目录下方的页面数(默认为10个)。 ]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定顯示在清單下方的頁面數(預設為 10 個)。 ]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer combien de liens pour les Pages à Bouger en bas de chaque page.(10 par défaut)]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить число страниц внизу. (по умолчанию: 10)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede definir el número de página enlazada para mover páginas en un botón de la página.(Predefinido es 10)]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfanın alt kısmında sayfa geçiş linklerinin sayısını ayarlayabilirsiniz.(varsayılan : 10)]]></value>
+		<value xml:lang="vi"><![CDATA[bạn có thể giới hạn số trang liên kết hiển thị phía dưới.(Mặc định là 10)]]></value>
+	</item>
+	<item name="about_admin_id">
+		<value xml:lang="ko"><![CDATA[해당 모듈에 대해 최고 권한을 가지는 관리자를 지정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can grant a manager to have all permissions to the module.]]></value>
+		<value xml:lang="jp"><![CDATA[該当モジュールに対して最高権限を持つ管理者を指定することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以对该模块指定拥有最高管理权限的管理员。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以對該模組指定最高管理權限。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez désigner un directeur qui aura tous les permissions sur le module.\nVous pouvez entrer plusieurs compte en utilisant.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете разрешить менеджеру иметь полные права доступа к этому модулю.\nВы можете ввести несколько ID, используя ]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede definir el administrador de atribuciones superiores al módulo.\n Usted puede asignar múltiples IDs.]]></value>
+		<value xml:lang="tr"><![CDATA[Modüle tam yetkisi olan bir yönetici atayabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt quyền hạn cho người sử dụng khi truy cập tới Module.]]></value>
+	</item>
+	<item name="about_grant_deatil">
+		<value xml:lang="ko"><![CDATA[가입한 사용자는 cafeXE 등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Registered users mean users who signed-up to the virtual sites (e.g., cafeXE).]]></value>
+		<value xml:lang="jp"><![CDATA[登録ユーザーとは、cafeXEなど分譲型バーチャル(Virtual)サイトに登録した、ログインユーザーを意味します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[子站会员是指注册到子站点已在线的用户.]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已註冊的用戶是指在虛擬網站註冊的用戶]]></value>
+		<value xml:lang="fr"><![CDATA[가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다]]></value>
+		<value xml:lang="ru"><![CDATA[가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다]]></value>
+		<value xml:lang="es"><![CDATA[가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıtlı kullanıcı, sanal sitelere (örn., cafeXE) kayıt olmuş kullanıcı demektir .]]></value>
+		<value xml:lang="vi"><![CDATA[Khi thành viên dăng kí tại trang chủ, nghĩa là họ cũng là thành viên của những trang khác (Ví dụ: cafeXE,...).]]></value>
+	</item>
+	<item name="about_module">
+		<value xml:lang="ko"><![CDATA[XE는 기본 라이브러리를 제외한 나머지는 모두 모듈로 구성되어 있습니다.
+모듈 관리 모듈은 설치된 모든 모듈을 보여주고 관리를 돕습니다.]]></value>
+		<value xml:lang="en"><![CDATA[XE consists of modules except the basic library.
+ [Module Manage] module will show all installed modules and help you to manage them.]]></value>
+		<value xml:lang="jp"><![CDATA[XEは、基本ライブラリの他は、すべてモジュールで構成されています。モジュール管理用のモジュールはインストールされたすべてを表示し、管理できるようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[除基本library以外XE全部由模块组成。
+模块管理中列出所有已安装的模块，因此易于管理。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[除基本函式庫以外 XE 全部由模組組成。
+模組管理中列出所有已安裝的模組，因此易於管理。]]></value>
+		<value xml:lang="fr"><![CDATA[XE se compose des modules sauf la bibliothèque fondamental.
+Le module [Administration des Modules] montera tous les modules installés et vous aidera les administrer.]]></value>
+		<value xml:lang="ru"><![CDATA[XE состоит из модулей, за исключением базовой библиотеки.
+ Управление модулем покажет все установленные модули и поможет управлять ими.]]></value>
+		<value xml:lang="es"><![CDATA[XE consiste de módulos excepto la librería básica.
+ Módulo del Manejo del Módulo muestra todos los módulos instalados y ayuda el manejo de ellos.]]></value>
+		<value xml:lang="tr"><![CDATA[XE, temel kitaplık dışında, modüllerden oluşmaktadır.
+ [Modül Yönetimi] modülü, size kurulu tüm modülleri gösterecek ve onları yönetmenize yardımcı olacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Khu vực Module trong XE ngoại trừ Library là tại [Module Manage]. Tất cả những Module đang có sẽ hiển thị, giúp bạn quản lý một cách dễ dàng.]]></value>
+	</item>
+	<item name="about_extra_vars_default_value">
+		<value xml:lang="ko"><![CDATA[다중/단일 선택 등 기본 값이 여러 개가 필요한 경우 , (콤마)로 연결하시면 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[If multiple default values are needed, you can link them with comma.]]></value>
+		<value xml:lang="jp"><![CDATA[多重・単一選択などのデフォルト値が、複数必要な場合は、「, （コンマ）」で区切って追加することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[复选/单选缺省值需要多个时,用,(逗号)来分隔。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[當復選或單選的預設值需要很多個時，用逗號(,)區隔。]]></value>
+		<value xml:lang="fr"><![CDATA[Si plusieurs valeurs sont nécessaires, vous pouvez les connecter avec la virgule(,).]]></value>
+		<value xml:lang="ru"><![CDATA[Если нужно несколько значений по умолчанию, разделите их запятыми(,).]]></value>
+		<value xml:lang="es"><![CDATA[Si múltiples valores predefinidos son requeridos, usted puede enlazar con la coma(,).]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer çoklu varsayılan değerler gerekiyorsa,	 onları virgülle(,) köprüleyebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu cần nhiều giá trị mặc định, bạn có thể thêm dấu (,) và giữa các kết nối.]]></value>
+	</item>
+	<item name="about_search_virtual_site">
+		<value xml:lang="ko"><![CDATA[가상 사이트(예:cafeXE) 도메인을 입력하신 후 검색하세요.<br/>가상 사이트 이외의 모듈은 내용을 비우고 검색하시면 됩니다. (http:// 는 제외)]]></value>
+		<value xml:lang="en"><![CDATA[Enter domain of virtual sites.<br />To search modules of non-virtual site, search with blank]]></value>
+		<value xml:lang="jp"><![CDATA[バーチャル(Virtual)サイト（：cafeXEなど）のドメインを入力して検索してください。<br />バーチャル(Virtual)サイト以外のモジュールは内容を空にしてから検索します。（http://は省く）]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入子站点域名后再进行搜索。<br/>子站点以外的模块可以留空搜索。(输入时http://除外)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入網站域名後再搜尋。<br/>網站以外的模組可直接進行搜尋。(http://不用輸入)。]]></value>
+		<value xml:lang="fr"><![CDATA[가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)]]></value>
+		<value xml:lang="ru"><![CDATA[가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)]]></value>
+		<value xml:lang="es"><![CDATA[가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)]]></value>
+		<value xml:lang="tr"><![CDATA[Sanal sitelerin alanadlarını giriniz.<br />Sanal olmayan sitelerin modüllerini aramak için, boş arama yapınız]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập tên miền thực tế của Website.<br />Để tìm kiếm những Module không thực tế của Website hãy để trống.]]></value>
+	</item>
+	<item name="about_extra_vars_eid_value">
+		<value xml:lang="ko"><![CDATA[확장 변수의 이름을 적어주세요. 영문, 숫자, _를 조합해서 사용할 수 있으며 첫 글자는 영문이어야 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Enter the name of extra var. You can use a combination of English alphabets, numbers and underscore(_), as long as it starts with an alphabet.]]></value>
+		<value xml:lang="jp"><![CDATA[拡張変数名を入力してください。　（英字+[英字+数字+_]のみ可能（すべて半角））]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入扩展变量名称(只允许英文字母+[英文字母+数字+_])。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入延伸變數名稱。( 只允許使用英文 + [ 英文，數字及底線 ] )]]></value>
+	</item>
+	<item name="about_langcode">
+		<value xml:lang="ko"><![CDATA[언어별로 다르게 설정하고 싶으시면 언어 코드 찾기를 이용해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[If you want to configure seperately, use 'find language code']]></value>
+		<value xml:lang="jp"><![CDATA[言語ごとに異なる設定をする場合、言語コード検索を利用してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[要想实现多国语言切换请点击[选择语言变量]按钮。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[想要實現多國語言功能，請按[語言代碼]按鈕。]]></value>
+		<value xml:lang="fr"><![CDATA[언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요]]></value>
+		<value xml:lang="ru"><![CDATA[언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요]]></value>
+		<value xml:lang="es"><![CDATA[언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요]]></value>
+		<value xml:lang="tr"><![CDATA[Eğer tek tek yapılandırma yapmak istiyorsanız, 'dil kodu bul'' u kullanınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn muốn sử dụng định hình riêng, hãy sử dụng 'Tìm kiếm mã ngôn ngữ']]></value>
+	</item>
+	<item name="about_file_extension">
+		<value xml:lang="ko"><![CDATA[%s 파일만 가능합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only %s extension(s) is available.]]></value>
+		<value xml:lang="jp"><![CDATA[%s ファイルのみ可能です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只允许%s文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只允許 %s 檔案。]]></value>
+		<value xml:lang="tr"><![CDATA[Yalnızca %s uzantı(ları) mevucut.]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ cho phép những phần mở rộng là: %s.]]></value>
+	</item>
+	<item name="fail_module_regist">
+		<value xml:lang="ko"><![CDATA[모듈 등록에 실패하였습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Fail Regist Module]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール登録に失敗しました。]]></value>
+	</item>
+	<item name="multilingual_desc">
+		<value xml:lang="ko"><![CDATA[현재 12 종류의 다국어 문자를 지원할 수 있습니다. 다른 종류의 다국어 지원을 원하는 경우 /common/lang/ 폴더의 다국어 가운데 하나의 세트를 번역해서 XE 개발자(contact@xpressengine.com)에게 보내주세요.]]></value>
+		<value xml:lang="en"><![CDATA[XE supports 12 languages currently. If you want to use another language, translate one set of languages in /common/lang/ folder into that language and send it to us (contact@xpressengine.com).]]></value>
+		<value xml:lang="jp"><![CDATA[XEは、12種類の多国語をサポートしています。他の種類の多国語のサポートを希望する場合は、/common/lang/フォルダの多国語のうち、ひとつのセットを翻訳してXE開発者(contact@xpressengine.com)までお送りください。]]></value>
+	</item>
+	<item name="add_word">
+		<value xml:lang="ko"><![CDATA[새로운 단어 또는 문장 추가...]]></value>
+		<value xml:lang="en"><![CDATA[Add New Word or Sentence...]]></value>
+		<value xml:lang="jp"><![CDATA[新しい単語、または文章追加...]]></value>
+	</item>
+	<item name="installed_module">
+		<value xml:lang="ko"><![CDATA[설치된 모듈]]></value>
+		<value xml:lang="en"><![CDATA[Installed Module]]></value>
+	</item>
+	<item name="cmd_show_hide">
+		<value xml:lang="ko"><![CDATA[보기/숨김]]></value>
+		<value xml:lang="en"><![CDATA[show/hide]]></value>
+	</item>
+	<item name="no_multi_lang">
+		<value xml:lang="ko"><![CDATA[아직 등록된 다국어가 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[There is no multi language.]]></value>
+	</item>
+	<item name="module_admin">
+		<value xml:lang="ko"><![CDATA[모듈 관리자]]></value>
+		<value xml:lang="en"><![CDATA[Module Administrator]]></value>
+	</item>
+	<item name="permission_setting">
+		<value xml:lang="ko"><![CDATA[권한 설정]]></value>
+		<value xml:lang="en"><![CDATA[Permission Setting]]></value>
+	</item>
+	<item name="msg_cannot_delete_startmodule">
+		<value xml:lang="ko"><![CDATA[시작 모듈은 삭제할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cannot delete a start module.]]></value>
+	</item>
+</lang>
diff --git a/modules/module/lang/ru.lang.php b/modules/module/lang/ru.lang.php
deleted file mode 100644
index a0c12a934..000000000
--- a/modules/module/lang/ru.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->virtual_site = "Virtual Site";
-    $lang->module_list = "Список модулей";
-    $lang->module_index = "Список модулей";
-    $lang->module_category = "Категория модуля";
-    $lang->module_info = "Информация";
-    $lang->add_shortcut = "Добавить ярлыки";
-    $lang->module_action = "Действия";
-    $lang->module_maker = "Разработчик модуля";
-    $lang->module_license = 'Лицензия';
-    $lang->module_history = "История обновлений";
-    $lang->category_title = "Название категории";
-    $lang->header_text = 'Верхний колонтитул';
-    $lang->footer_text = 'Нижний колонтитул';
-    $lang->use_category = 'Включить категорию';
-    $lang->category_title = 'Название категории';
-    $lang->checked_count = 'Число выбранных статей'; // translator's note: возможно "checked" следует перевести как "проверенных"
-    $lang->skin_default_info = 'Информация стандартного скина';
-    $lang->skin_author = 'Разработчик скина';
-    $lang->skin_license = 'License';
-    $lang->skin_history = 'История обновлений';
-    $lang->module_selector = "Module Selector";
-    $lang->do_selected = "Выбранные...";
-    $lang->bundle_setup = "일괄 기본 설정";
-    $lang->bundle_addition_setup = "일괄 추가 설정";
-    $lang->bundle_grant_setup = "일괄 권한 설정";
-    $lang->lang_code = "Код языка";
-    $lang->filebox = "Файлбокс";
-
-    $lang->access_type = 'Способ соединения';
-    $lang->access_domain = 'Domain соединения';
-    $lang->access_vid = 'Site ID соединение';
-    $lang->about_vid = '별도의 도메인이 아닌 http://XE주소/ID 로 접속할 수 있습니다. 모듈명(mid)와 중복될 수 없습니다.<br/>첫글자는 영문으로 시작해야 하고 영문과 숫자 그리고 _ 만 사용할 수 있습니다';
-    $lang->msg_already_registed_vid = '이미 등록된 사이트 ID 입니다. 게시판등의 mid와도 중복이 되지 않습니다. 다른 ID를 입력해주세요.';
-    $lang->msg_already_registed_domain = '이미 등록된 도메인입니다. 다른 도메인을 사용해주세요';
-
-    $lang->module_copy = "Копировать модуль";
-
-    $lang->header_script = "Скрипт Header";
-    $lang->about_header_script = "html의 &lt;header&gt;와 &lt;/header&gt; 사이에 들어가는 코드를 직접 입력할 수 있습니다.<br />&lt;script, &lt;style 또는 &lt;meta 태그등을 이용하실 수 있습니다";
-
-    $lang->grant_access = "Access";
-    $lang->grant_manager = "Management";
-
-    $lang->grant_to_all = "All users";
-    $lang->grant_to_login_user = "Logged users";
-    $lang->grant_to_site_user = "Joined users";
-    $lang->grant_to_group = "Specification group users";
-
-    $lang->cmd_add_shortcut = "Добавить ярлык";
-    $lang->cmd_install = "Установить";
-    $lang->cmd_update = "Обновить";
-    $lang->cmd_manage_category = 'Управление категориями';
-    $lang->cmd_manage_grant = 'Управление правами доступа';
-    $lang->cmd_manage_skin = 'Управление скинами';
-    $lang->cmd_manage_document = 'Управление статьями';
-    $lang->cmd_find_module = 'Искать модуль';
-    $lang->cmd_find_langcode = 'Find lang code';
-
-    $lang->msg_new_module = "Создать новый модуль";
-    $lang->msg_update_module = "Изменить модуль";
-    $lang->msg_module_name_exists = "Имя уже существует. Пожалуйста, попробуйте другое";
-    $lang->msg_category_is_null = 'Зарегистрированной категории не существует.';
-    $lang->msg_grant_is_null = 'Списка для управления правами доступа не существует.';
-    $lang->msg_no_checked_document = 'Нет выбранных статей.'; // translator's note: выше...
-    $lang->msg_move_failed = 'Невозможно переместить';
-    $lang->msg_cannot_delete_for_child = 'Невозможно удалить категорию, имеющую дочерние категории.';
-    $lang->msg_limit_mid ='모듈이름은 영문+[영문+숫자+_] 만 가능합니다.';
-    $lang->msg_extra_name_exists = '이미 존재하는 확장변수 이름입니다. 다른 이름을 입력해주세요.';
-
-    $lang->about_browser_title = "Это будет показано в заголовке браузера. Также, это будет использоваться в RSS/Трекбеке.";
-    $lang->about_mid = "Имя модуля будет использовано как http://address/?mid=Имя_модуля.\n(только латиница, цифры и символ подчеркивания(_) разрешены. The maximum length is 40.)";
-    $lang->about_default = "Если выбрано, модуль будет главным на сайте. Для доступа не нужен будет идентификатор модуля.";
-    $lang->about_module_category = "Это позволяет Вам управлять посредством категорий модулей.\nURL для менеджера модулей <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Manage module > Категория Модуля </a>.";
-    $lang->about_description= 'Это описание только для менеджера.';
-    $lang->about_default = 'Если выбрано, этот модуль будет показан, когда пользователи входят на сайт без идентификатора модуля (mid=NoValue).';
-    $lang->about_header_text = 'Это содержимое будет показано сверху модуля. (HTML разрешен)';
-    $lang->about_footer_text = 'Это содержимое будет показано снизу модуля. (HTML разрешен)';
-    $lang->about_skin = 'Вы можете выбрать скин модуля.';
-    $lang->about_use_category = 'Если выбрано, функция категорий будет включена.';
-    $lang->about_list_count = 'Вы можете установить лимит показа статей на страницу. (по умолчанию: 20)';
-    $lang->about_search_list_count = '검색 또는 카테고리 선택등을 할 경우 표시될 글의 수를 지정하실 수 있습니다. 기본(20개)';
-    $lang->about_page_count = 'Вы можете установить число страниц внизу. (по умолчанию: 10)';
-    $lang->about_admin_id = 'Вы можете разрешить менеджеру иметь полные права доступа к этому модулю.\nВы можете ввести несколько ID, используя ';
-    $lang->about_grant = 'Если Вы отключите все права доступа для отдельного объекта, не прошедшие процедуру входа на сайт пользователи получат доступ.';
-    $lang->about_grant_deatil = '가입한 사용자는 cafeXE등 분양형 가상 사이트에 가입을 한 로그인 사용자를 의미합니다';
-    $lang->about_module = "XE состоит из модулей, за исключением базовой библиотеки.\n Управление модулем покажет все установленные модули и поможет управлять ими.";
-
-	$lang->about_extra_vars_default_value = 'Если нужно несколько значений по умолчанию, разделите их запятыми(,).';
-    $lang->about_search_virtual_site = "가상 사이트(카페XE등)의 도메인을 입력하신 후 검색하세요.<br/>가상 사이트이외의 모듈은 내용을 비우고 검색하시면 됩니다.  (http:// 는 제외)";
-    $lang->about_langcode = "언어별로 다르게 설정하고 싶으시면 언어코드 찾기를 이용해주세요";
-    $lang->about_file_extension= "%s 파일만 가능합니다.";
-?>
diff --git a/modules/module/lang/tr.lang.php b/modules/module/lang/tr.lang.php
deleted file mode 100644
index fb8feb763..000000000
--- a/modules/module/lang/tr.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    /**
-     * @file   modules/module/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack
-     **/
-
-    $lang->virtual_site = "Sanal Siteler";
-    $lang->module_list = "Modül Listesi";
-    $lang->module_index = "Modül Listesi";
-    $lang->module_category = "Modül Kategorisi";
-    $lang->module_info = "Modül Bilgisi";
-    $lang->add_shortcut = "Kısayol Ekle";
-    $lang->module_action = "Eylemler";
-    $lang->module_maker = "Modül Geliştirici";
-    $lang->module_license = 'Lisans';
-    $lang->module_history = "Güncelleştirme Geçmişi";
-    $lang->category_title = "Kategori Başlığı";
-    $lang->header_text = 'Başlık Metni';
-    $lang->footer_text = 'Sayfa Altlığı Metni';
-    $lang->use_category = 'Kategoriyi Etkinleştir';
-    $lang->category_title = 'Kategori Başlığı';
-    $lang->checked_count = 'Denetlenen Makale Sayısı';
-    $lang->skin_default_info = 'Varsayılan Dış Görünüm Bilgisi';
-    $lang->skin_author = 'Dış Görünüm Geliştiricisi';
-    $lang->skin_license = 'Lisans';
-    $lang->skin_history = 'Güncelleştirme Geçmişi';
-    $lang->module_copy = "Çoğaltma Modülü";
-    $lang->module_selector = "Modül Seçini";
-    $lang->do_selected = "Şunu yap";
-    $lang->bundle_setup = "Toplu Ayar";
-    $lang->bundle_addition_setup = "Toplu Ek Ayar";
-    $lang->bundle_grant_setup = "Toplu Yetki Ayarı";
-    $lang->lang_code = "Dil Kodu";
-    $lang->filebox = "Dosya Kutusu";
-
-    $lang->access_type = 'Erişim Türü';
-    $lang->access_domain = 'Alan adıyla';
-    $lang->access_vid = 'Site kimliğiyle';
-    $lang->about_domain = "Birden fazla sanal website oluşturabilmek için, her birinin kendi alanadına ihtiyacı vardır.<br />Alt-alanadı (örn., aaa.bbb.com of bbb.com) da kullanılabilir. XE'nin de içinde kurulu olduğu yolun adresini giriniz. <br /> örn.) www.xpressengine.com/xe";
-    $lang->about_vid = 'Kullanıcılar, http://XEaddress/ID adresiyle ulaşabilirler. Varolan bir modül adıyla(mid) aynı olan site kimliği kullanamazsınız .<br />Site kimliği bir harfle başlamaladır . Alfabetik karakterler, sayılar ve _ işareti site kimliği için kullanılabilir.';
-    $lang->msg_already_registed_vid = 'Önceden kaydedilmiş site kimliği. Lütfen başka bir kimlik giriniz.';
-    $lang->msg_already_registed_domain = "Bu alanadı önceden kullanıldı. Lütfen farklı bir alanadı giriniz.";
-
-    $lang->header_script = "Başlık Betiği(script)";
-    $lang->about_header_script = "Html betiğini(script) &lt;header&gt; ile &lt;/header&gt; arasına kendiniz ekleyebilirsiniz.<br /> &lt;script, &lt;style or &lt;meta tag kullanabilirsiniz";
-
-    $lang->grant_access = "Yetki";
-    $lang->grant_manager = "Yönetim";
-
-    $lang->grant_to_all = "Tüm kullanıcılar";
-    $lang->grant_to_login_user = "Oturum açmış kullanıcılar";
-    $lang->grant_to_site_user = "Kayıtlı kullanıcılar";
-    $lang->grant_to_group = "Belirli grup kullanıcıları";
-
-    $lang->cmd_add_shortcut = "Kısayol Ekle";
-    $lang->cmd_install = "Kur";
-    $lang->cmd_update = "Güncelleştir";
-    $lang->cmd_manage_category = 'Kategorileri Yönet';
-    $lang->cmd_manage_grant = 'Yetkileri Yönet';
-    $lang->cmd_manage_skin = 'Dış Görünümleri Yönet';
-    $lang->cmd_manage_document = 'Makaleleri Yönet';
-    $lang->cmd_find_module = 'Modül Bul';
-    $lang->cmd_find_langcode = 'Dil kodu bul';
-
-    $lang->msg_new_module = "Yeni modül oluştur";
-    $lang->msg_update_module = "Modül Düzelt";
-    $lang->msg_module_name_exists = "Bu isim önceden zaten alınmış. Lütfen başka bir tane deneyiniz.";
-    $lang->msg_category_is_null = 'Kayıtlı kategori yok.';
-    $lang->msg_grant_is_null = 'Yetki listesi yok.';
-    $lang->msg_no_checked_document = 'Denetlenmiş makaleler bulunmamakta.';
-    $lang->msg_move_failed = 'Taşıma hatası';
-    $lang->msg_cannot_delete_for_child = 'Alt kategorileri olan kategoriler silinemez.';
-	$lang->msg_limit_mid ="Sadece harfler+[harfler+sayılar+_] modül ismi olarak kullanılabilir.";
-    $lang->msg_extra_name_exists = 'Önceden kayıtlı değişken isim. Lütfen başka bir tane giriniz.';
-
-    $lang->about_browser_title = "Bu girdi tarayıcı başlığında gösterilecektir. Aynı zamanda RSS/Geri İzleme(trackback)\'de de kullanılacaktır.";
-    $lang->about_mid = "Modül ismi, http://adres/?mid=Modulismi şeklinde kullanılacaktır.\n(Sadece ingilizce harflere + [ingilizce harflere, sayılara, ve altçizgiye (_)] izin verilmiştir. Azami uzunluk 40 karakterdir.)";
-    $lang->about_default = "İşaretlenmişse, modül kimlik değeri(mid=Değer Yok) olmadan siteye erişirken varsayılan kullanılacaktır.";
-    $lang->about_module_category = "Size, modül kategorisi yoluyla yönetme imkanı sunar.\n Modül Yöneticisi için URL: <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Manage module > Modül Kategorisi</a>dir.";
-    $lang->about_description= 'Sadece yöneticilerin görebileceği açıklamadır.';
-    $lang->about_default = 'Eğer işaretlenmişse, kullanıcılar siteye modül kimlik değeri (mid=değer yok) olmadan erişirken bu modül görüntülenecektir .';
-    $lang->about_header_text = 'Modülün üst kısmında gösterilecek içeriklerdir.(html etiketleri etkin)';
-    $lang->about_footer_text = 'Modülün alt kısmında gösterilecek içeriklerdir.(html etiketleri etkin)';
-    $lang->about_skin = 'Modül dış görünümünü seçebilirsiniz.';
-    $lang->about_use_category = 'İşaretlediğiniz taktirde, kategori özelliği etkinleştirilecektir.';
-    $lang->about_list_count = 'Sayfada gösterilecek makalelerin sayı üstsınırını ayarlayabilirsiniz.(varsayılan : 20)';
-	$lang->about_search_list_count = 'Kategori veya arama özelliğini kullanırken gösterilecek makalelerin sayısını ayarlayabilirsiniz. (varsayılan : 20)';
-    $lang->about_page_count = 'Sayfanın alt kısmında sayfa geçiş linklerinin sayısını ayarlayabilirsiniz.(varsayılan : 10)';
-    $lang->about_admin_id = 'Modüle tam yetkisi olan bir yönetici atayabilirsiniz.';
-    $lang->about_grant = 'Belirli bir nesne için tüm yetkileri kapatırsanız, siteye üye girişi yapmamış üyeler yetki sahibi olacaklardır.';
-    $lang->about_grant_deatil = 'Kayıtlı kullanıcı, sanal sitelere (örn., cafeXE) kayıt olmuş kullanıcı demektir .';
-    $lang->about_module = "XE, temel kitaplık dışında, modüllerden oluşmaktadır.\n [Modül Yönetimi] modülü, size kurulu tüm modülleri gösterecek ve onları yönetmenize yardımcı olacaktır.";
-
-	$lang->about_extra_vars_default_value = 'Eğer çoklu varsayılan değerler gerekiyorsa,	 onları virgülle(,) köprüleyebilirsiniz.';
-    $lang->about_search_virtual_site = "Sanal sitelerin alanadlarını giriniz.<br />Sanal olmayan sitelerin modüllerini aramak için, boş arama yapınız";
-    $lang->about_langcode = "Eğer tek tek yapılandırma yapmak istiyorsanız, 'dil kodu bul'\' u kullanınız.";
-    $lang->about_file_extension= "Yalnızca %s uzantı(ları) mevucut.";
-?>
diff --git a/modules/module/lang/vi.lang.php b/modules/module/lang/vi.lang.php
deleted file mode 100644
index f002f6473..000000000
--- a/modules/module/lang/vi.lang.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->virtual_site = "Site thực";
-    $lang->module_list = "Danh sách Module";
-    $lang->module_index = "Danh sách Module";
-    $lang->module_category = "Thể loại";
-    $lang->module_info = "Thông tin Module";
-    $lang->add_shortcut = "Thêm phím tắt";
-    $lang->module_action = "Hoạt động";
-    $lang->module_maker = "Người thiết kế";
-    $lang->module_license = 'Giấy phép';
-    $lang->module_history = "Lịch sử cập nhật";
-    $lang->category_title = "Tiêu đề phân loại";
-    $lang->header_text = 'Nội dung Header';
-    $lang->footer_text = 'Nội dung Footer';
-    $lang->use_category = 'Mở phân loại';
-    $lang->category_title = 'Tiêu đề phân loại';
-    $lang->checked_count = 'Số bài viết đã chọn';
-    $lang->skin_default_info = 'Thông tin Skin mặc định';
-    $lang->skin_author = 'Thiết kế';
-    $lang->skin_license = 'Giấy phép';
-    $lang->skin_history = 'Lịch sử cập nhật';
-    $lang->module_copy = "Nhân bản Module";
-    $lang->module_selector = "Chọn lọc Module";
-    $lang->do_selected = "Bình chọn / Phê bình.";
-    $lang->bundle_setup = "Gói cài đặt";
-    $lang->bundle_addition_setup = "Gói cài đặt bổ xung";
-    $lang->bundle_grant_setup = "Gói cài đặt cho phép";
-    $lang->lang_code = "Mã ngôn ngữ";
-    $lang->filebox = "FileBox";
-
-    $lang->access_type = 'Kiểu truy cập';
-    $lang->access_domain = 'Với tên miền';
-    $lang->access_vid = 'Với ID Website';
-    $lang->about_domain = "Để tạo nhiều Website nhỏ, các Website nhỏ này cần những tên miền riêng của mình.<br />Có thể sử dụng những Subdomain dạng aaa.bbb.com của bbb.com. Hãy nhập địa chỉ bao gồm cả Domain cài đặt XE. <br /> Ví dụ: www.vietxe.net/xe";
-    $lang->about_vid = 'Người sử dụng có thể truy cập qua http://XEaddress/ID. Bạn không thể sử dụng ID giống nhau và giống tên Module đã có.<br />Teen ID có dạng là các chữ cái, số và dấu gạch dưới (_).';
-    $lang->msg_already_registed_vid = 'Tên ID này đã được đăng kí. Xin hãy chọn tên khác.';
-    $lang->msg_already_registed_domain = "Tên miền đã được sử dụng. Xin hãy chọn tên khác.";
-
-    $lang->header_script = "Header Script";
-    $lang->about_header_script = "Bạn co thể nhập mã dang HTML vào giữa  &lt;header&gt; và &lt;/header&gt;.<br />Bạn có thể sử dụng &lt;script, &lt;style hay &lt;meta tag";
-
-    $lang->grant_access = "Truy cập";
-    $lang->grant_manager = "Quản lý";
-
-    $lang->grant_to_all = "Tất cả";
-    $lang->grant_to_login_user = "Đã đăng nhập";
-    $lang->grant_to_site_user = "Đã đăng kí";
-    $lang->grant_to_group = "Nhóm chỉ định";
-
-    $lang->cmd_add_shortcut = "Thêm phím tắt";
-    $lang->cmd_install = "Cài đặt";
-    $lang->cmd_update = "Cập nhật";
-    $lang->cmd_manage_category = 'Quản lý thể loại';
-    $lang->cmd_manage_grant = 'Quản lý quyền';
-    $lang->cmd_manage_skin = 'Quản lý Skin';
-    $lang->cmd_manage_document = 'Quản lý bài viết';
-    $lang->cmd_find_module = 'Tìm Module';
-    $lang->cmd_find_langcode = 'Tìm mã ngôn ngữ';
-
-    $lang->msg_new_module = "Tạo Module mới";
-    $lang->msg_update_module = "Sửa Module";
-    $lang->msg_module_name_exists = "Tên này đã được sử dụng. Hãy thử lại với tên khác.";
-    $lang->msg_category_is_null = 'Không có phân loại nào được tạo.';
-    $lang->msg_grant_is_null = 'Không có danh sách quyền nào.';
-    $lang->msg_no_checked_document = 'Không có bài viết nào được kiểm tra.';
-    $lang->msg_move_failed = 'Không thể di chuyển';
-    $lang->msg_cannot_delete_for_child = 'Không thể xóa được phân loại khi có những phân loại con.';
-	$lang->msg_limit_mid ="Tên Module chỉ hỗ trợ định dạng [Kí tự], [Kí tự+Số], [Kí tự+Số+_].";
-    $lang->msg_extra_name_exists = 'Tên biến đã được sử dụng. Xin hãy chọn tên khác.';
-
-    $lang->about_browser_title = "Nó sẽ hiển thị trên tiêu đề của trình duyệt và trong RSS/Trackback.";
-    $lang->about_mid = "Tên Module được sử dụng dạng http://address/?mid=<b>ModuleName</b>.\n(Chỉ cho phép chữ cái tiếng Anh + [chữ cái tiếng Anh, số, và dấu gạch dưới (_)] và tối đa 40 kí tự.)";
-    $lang->about_default = "Nếu chọn, Sẽ hiển thị mặc định là (mid=NoValue) khi truy cập tên Module không đúng.";
-    $lang->about_module_category = "Nó cho phép bạn quản lý thông qua Module thể loại.\n URL quản lý có dạng <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Quản lý Module > Module thể loại </a>.";
-    $lang->about_description= 'Mô tả cho một quản lý.';
-    $lang->about_default = 'Nếu chọn, Sẽ hiển thị mặc định là (mid=NoValue) khi truy cập tên Module không đúng.';
-    $lang->about_header_text = 'Nội dung sẽ hiển thị trên đầu Module.(sau http tag có sẵn)';
-    $lang->about_footer_text = 'Nội dung sẽ hiển thị phía dưới Module.(trước http tag có sẵn)';
-    $lang->about_skin = 'Banj có thể chọn Skin cho Module.';
-    $lang->about_use_category = 'Nếu chon, chức năng thể loại sẽ hoạt động.';
-    $lang->about_list_count = 'Bạn có thể giới hạn bài viết hiển thị trên một trang.(Mặc định là 20)';
-	$lang->about_search_list_count = 'Bạn có thể đặt giới hạn số bài viết sẽ hiển thị khi tìm kiếm hay chọn thể loại. (Mặc định là 20)';
-    $lang->about_page_count = 'bạn có thể giới hạn số trang liên kết hiển thị phía dưới.(Mặc định là 10)';
-    $lang->about_admin_id = 'Bạn có thể đặt quyền hạn cho người sử dụng khi truy cập tới Module.';
-    $lang->about_grant = 'Nếu bạn khóa tất cả quyền hạn cho một thành viên đặc biệt nào đó, những thành viên đó sẽ không được phép đăng nhập.';
-    $lang->about_grant_deatil = 'Khi thành viên dăng kí tại trang chủ, nghĩa là họ cũng là thành viên của những trang khác (Ví dụ: cafeXE,...).';
-    $lang->about_module = "Khu vực Module trong XE ngoại trừ Library là tại [Module Manage]. Tất cả những Module đang có sẽ hiển thị, giúp bạn quản lý một cách dễ dàng.";
-
-	$lang->about_extra_vars_default_value = 'Nếu cần nhiều giá trị mặc định, bạn có thể thêm dấu (,) và giữa các kết nối.';
-    $lang->about_search_virtual_site = "Hãy nhập tên miền thực tế của Website.<br />Để tìm kiếm những Module không thực tế của Website hãy để trống.";
-    $lang->about_langcode = "Nếu bạn muốn sử dụng định hình riêng, hãy sử dụng 'Tìm kiếm mã ngôn ngữ'";
-    $lang->about_file_extension= "Chỉ cho phép những phần mở rộng là: %s.";
-?>
diff --git a/modules/module/lang/zh-CN.lang.php b/modules/module/lang/zh-CN.lang.php
deleted file mode 100644
index 0a47be86e..000000000
--- a/modules/module/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,99 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  简体中文语言包
-     **/
-
-    $lang->virtual_site = "站点";
-    $lang->module_list = "模块目录";
-    $lang->module_index = "模块列表";
-    $lang->module_category = "模块分类";
-    $lang->module_info = "模块信息";
-    $lang->add_shortcut = "添加到快捷菜单";
-    $lang->module_action = "动作";
-    $lang->module_maker = "模块作者";
-    $lang->module_license = '版权';
-    $lang->module_history = "更新事项 ";
-    $lang->category_title = "分类名称";
-    $lang->header_text = '头部修饰';
-    $lang->footer_text = '尾部修饰';
-    $lang->use_category = '使用分类';
-    $lang->category_title = '分类名';
-    $lang->checked_count = '所选主题数';
-    $lang->skin_default_info = '皮肤默认信息';
-    $lang->skin_author = '皮肤作者';
-    $lang->skin_license = '版权';
-    $lang->skin_history = '更新日志';
-    $lang->module_copy = "模块复制";
-    $lang->module_selector = "模块选择器";
-    $lang->do_selected = "把所选模块...";
-    $lang->bundle_setup = "批量设置-常规选项";
-    $lang->bundle_addition_setup = "批量设置-高级选项";
-    $lang->bundle_grant_setup = "批量设置-权限";
-    $lang->lang_code = "语言变量";
-    $lang->filebox = "文件管理";
-
-    $lang->access_type = '访问方式';
-    $lang->access_domain = '域名';
-    $lang->access_vid = '站点ID';
-    $lang->about_domain = "要创建一个站点必须有一个专用域名。<br/>一级域名或二级域名皆可。输入的时候请把XE安装路径也一起输入。<br />ex) www.xpressengine.com/xe";
-    $lang->about_vid = '直接以http://XE安装地址/ID的方式访问。<br/>模块名(mid)不能重复。<br/>模块名要以英文字母开头，且只允许使用英文字母，数字及"_"。';
-    $lang->msg_already_registed_vid = '重复的站点ID，请重新输入(注：站点ID不能重复，而且也不能与版面mid重复)。';
-    $lang->msg_already_registed_domain = "对不起！已有相同的域名。请重新输入。";
-
-    $lang->header_script = "文件头部脚本";
-    $lang->about_header_script = "可以直接输入插入到html中&lt;head&gt;区的代码。<br />可使用&lt;script, &lt;style 或 &lt;meta 等标签。";
-
-    $lang->grant_access = "访问权限";
-    $lang->grant_manager = "管理权限";
-
-    $lang->grant_to_all = "不限制";
-    $lang->grant_to_login_user = "已登录用户";
-    $lang->grant_to_site_user = "子站会员";
-    $lang->grant_to_group = "特定用户组";
-
-    $lang->cmd_add_shortcut = "添加到快捷菜单";
-    $lang->cmd_install = "安装";
-    $lang->cmd_update = "升级";
-    $lang->cmd_manage_category = '分类管理';
-    $lang->cmd_manage_grant = '权限管理';
-    $lang->cmd_manage_skin = '皮肤管理';
-    $lang->cmd_manage_document = '主题管理';
-    $lang->cmd_find_module = '查找模块';
-    $lang->cmd_find_langcode = '选择语言变量';
-
-    $lang->msg_new_module = "模块生成";
-    $lang->msg_update_module = "模块修改";
-    $lang->msg_module_name_exists = "已存在的模块名称。请输入其他名称。";
-    $lang->msg_category_is_null = '没有登录的分类';
-    $lang->msg_grant_is_null = '没有登录的权限对象';
-    $lang->msg_no_checked_document = '没有被选择的主题';
-    $lang->msg_move_failed = '移动失败！';
-    $lang->msg_cannot_delete_for_child = '不能删除有下级分类的分类！';
-    $lang->msg_limit_mid ="模块名称只允许英文字母+[英文字母+数字]。";
-    $lang->msg_extra_name_exists = '已有的扩展变量名称，请重新输入！';
-
-    $lang->about_browser_title = "显示在浏览器窗口的标题值。 在RSS/Trackback也可以使用。";
-    $lang->about_mid = "模块名称只允许使用英文，数字和下划线(最多不能超过40字节)。";
-    $lang->about_default = "用没有mid值的网址访问网站时，将会显示默认。";
-    $lang->about_module_category = "可以分类管理模块。 模块分类可以在 <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">模块管理 > 模块分类 </a>中进行管理。";
-    $lang->about_description= '管理用使用说明。';
-    $lang->about_default = '用没有mid值的网址访问网站时，将会显示默认。';
-    $lang->about_header_text = '模块头部修饰内容。(可以使用HTML)';
-    $lang->about_footer_text = '模块尾部修饰内容。(可以使用HTML)';
-    $lang->about_skin = '可以选择模块皮肤。';
-    $lang->about_use_category = '选择此项可以使用分类功能。';
-    $lang->about_list_count = '可以指定每页显示的主题数。(默认为20个)';
-    $lang->about_search_list_count = '可以指定搜索或选择分类时每页要显示的帖子数(默认为20个)。';
-    $lang->about_page_count = '可以指定显示在目录下方的页面数(默认为10个)。 ';
-    $lang->about_admin_id = '可以对该模块指定拥有最高管理权限的管理员。';
-    $lang->about_grant = '全部解除特定权限的对象时，没有登录的会员也将具有相关权限。';
-    $lang->about_grant_deatil = '子站会员是指注册到子站点已在线的用户.';
-    $lang->about_module = "除基本library以外XE全部由模块组成。\n模块管理中列出所有已安装的模块，因此易于管理。";
-    $lang->about_extra_vars_default_value = '复选/单选缺省值需要多个时,用,(逗号)来分隔。';
-    $lang->about_search_virtual_site = "请输入子站点域名后再进行搜索。<br/>子站点以外的模块可以留空搜索。(输入时http://除外)。";
-    $lang->about_extra_vars_eid_value = '请输入扩展变量名称(只允许英文字母+[英文字母+数字+_])。';
-    $lang->about_langcode = "要想实现多国语言切换请点击[选择语言变量]按钮。";
-    $lang->about_file_extension= "只允许%s文件。";
-?>
diff --git a/modules/module/lang/zh-TW.lang.php b/modules/module/lang/zh-TW.lang.php
deleted file mode 100644
index f968c6ab1..000000000
--- a/modules/module/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-    /**
-     * @file   modules/module/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  模組(module)正體中文語言
-     **/
-
-    $lang->virtual_site = "虛擬網站";
-    $lang->module_list = "模組列表";
-    $lang->module_index = "模組列表";
-    $lang->module_category = "模組分類";
-    $lang->module_info = "模組資料";
-    $lang->add_shortcut = "新增到快捷選單";
-    $lang->module_action = "動作";
-    $lang->module_maker = "模組作者";
-    $lang->module_license = '版權';
-    $lang->module_history = "更新紀錄";
-    $lang->category_title = "分類名稱";
-    $lang->header_text = '頂端內容';
-    $lang->footer_text = '底端內容';
-    $lang->use_category = '使用分類';
-    $lang->category_title = '分類名稱';
-    $lang->checked_count = '所選擇的主題數';
-    $lang->skin_default_info = '預設面板資料';
-    $lang->skin_author = '面板作者';
-    $lang->skin_license = '版權';
-    $lang->skin_history = '更新事項';
-    $lang->module_copy = '複製模組';
-    $lang->module_selector = '模組選擇器';
-    $lang->do_selected = '選擇項目...';
-    $lang->bundle_setup = '批次設定-設置';
-    $lang->bundle_addition_setup = '批次設定-延伸設置';
-    $lang->bundle_grant_setup = '批次設定-權限管理';
-    $lang->lang_code = '語言代碼';
-    $lang->filebox = '檔案管理';
-    $lang->access_type = '訪問類型';
-    $lang->access_domain = 'Domain';
-    $lang->access_vid = 'Site ID';
-    $lang->about_domain = "要建立網站必須要有個專屬域名。<br/>頂級域名或次級域名都可以。輸入時，請將 XE 安裝路徑也一起輸入。<br />例) www.xpressengine.com/xe";
-    $lang->about_vid = '直接以 http://程式安裝位址/ID 的方式訪問。模組名稱(mid)不能重複。<br/>必須要以英文字母開頭，只允許使用底線、英文及數字。';
-    $lang->msg_already_registed_vid = '已註冊的 Site ID。不可與討論板的 mid 相同。請輸入其他 ID 名稱。';
-    $lang->msg_already_registed_domain = "已註冊的域名。請使用其他的網域。";
-
-    $lang->header_script = "Header Script";
-    $lang->about_header_script = "可以直接輸入，並插入到 HTML 的&lt;head&gt;之間。<br />可使用&lt;script&gt;,&lt;style&gt;或&lt;meta&gt;等標籤。";
-
-    $lang->grant_access = "訪問";
-    $lang->grant_manager = "管理";
-
-    $lang->grant_to_all = "所有用戶";
-    $lang->grant_to_login_user = "已登入用戶";
-    $lang->grant_to_site_user = "網站用戶";
-    $lang->grant_to_group = "特定群組";
-
-    $lang->cmd_add_shortcut = "新增到快捷選單";
-    $lang->cmd_install = "安裝";
-    $lang->cmd_update = "升級";
-    $lang->cmd_manage_category = '分類管理';
-    $lang->cmd_manage_grant = '權限管理';
-    $lang->cmd_manage_skin = '面板管理';
-    $lang->cmd_manage_document = '主題管理';
-    $lang->cmd_find_module = '搜尋模組';
-    $lang->cmd_find_langcode = '搜尋語言代碼';
-
-    $lang->msg_new_module = "建立模組";
-    $lang->msg_update_module = "修改模組";
-    $lang->msg_module_name_exists = "已存在的模組名稱。請輸入其他名稱。";
-    $lang->msg_category_is_null = '沒有登錄的分類';
-    $lang->msg_grant_is_null = '沒有權限';
-    $lang->msg_no_checked_document = '沒有被選擇的主題';
-    $lang->msg_move_failed = '移動失敗！';
-    $lang->msg_cannot_delete_for_child = '無法刪除有子分類的分類！';
-    $lang->msg_limit_mid ="模組名稱可由英文 + [ 英文，數字及底線 ]等非常多種組合。";
-    $lang->msg_extra_name_exists = '已存在的延伸變數名稱。請輸入其他名稱。';
-
-    $lang->about_browser_title = "顯示在瀏覽器視窗的標題。在 RSS/Trackback 也可以使用。";
-    $lang->about_mid = "模組名稱只允許使用英文，數字和底線。最大長度 40 個字元。";
-    $lang->about_default = "用沒有 mid 值的網址訪問網站時，將會顯示預設。";
-    $lang->about_module_category = "可以分類管理模組。模組分類可以在<a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">模組管理 > 模組分類 </a>中進行管理。";
-    $lang->about_description= '管理使用說明。';
-    $lang->about_default = '用沒有 mid 值的網址訪問網站時，將會顯示預設。';
-    $lang->about_header_text = '顯示在模組頂部的內容。(可使用 HTML)';
-    $lang->about_footer_text = '顯示在模組底部的內容。(可使用 HTML)';
-    $lang->about_skin = '可以選擇模組面板。';
-    $lang->about_use_category = '選擇此項可以使用分類功能。';
-    $lang->about_list_count = '可以指定每頁顯示的主題數。(預設為 20 個)';
-    $lang->about_search_list_count = '可以指定搜尋或選擇分類時，每頁要顯示的文章數(預設為 20 個)。';
-    $lang->about_page_count = '可以指定顯示在清單下方的頁面數(預設為 10 個)。 ';
-    $lang->about_admin_id = '可以對該模組指定最高管理權限。';
-    $lang->about_grant = '全部解除特定權限的對象時，沒有登錄的會員也將具有相關權限。';
-    $lang->about_grant_deatil = '已註冊的用戶是指在虛擬網站註冊的用戶';
-    $lang->about_module = "除基本函式庫以外 XE 全部由模組組成。\n模組管理中列出所有已安裝的模組，因此易於管理。";
-    $lang->about_extra_vars_default_value = '當復選或單選的預設值需要很多個時，用逗號(,)區隔。';
-    $lang->about_search_virtual_site = "請輸入網站域名後再搜尋。<br/>網站以外的模組可直接進行搜尋。(http://不用輸入)。";
-    $lang->about_extra_vars_eid_value = '請輸入延伸變數名稱。( 只允許使用英文 + [ 英文，數字及底線 ] )';
-    $lang->about_langcode = "想要實現多國語言功能，請按[語言代碼]按鈕。";
-    $lang->about_file_extension= "只允許 %s 檔案。";
-?>
diff --git a/modules/module/module.admin.controller.php b/modules/module/module.admin.controller.php
index 0bee98253..97a7614a8 100644
--- a/modules/module/module.admin.controller.php
+++ b/modules/module/module.admin.controller.php
@@ -1,487 +1,615 @@
-<?php
-    /**
-     * @class  moduleAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  module 모듈의 admin controller class
-     **/
-
-    class moduleAdminController extends module {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 모듈 카테고리 추가
-         **/
-        function procModuleAdminInsertCategory() {
-            $args->title = Context::get('title');
-            $output = executeQuery('module.insertModuleCategory', $args);
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage("success_registed");
-        }
-
-        /**
-         * @brief 카테고리의 내용 수정
-         **/
-        function procModuleAdminUpdateCategory() {
-            $mode = Context::get('mode');
-
-            switch($mode) {
-                case 'delete' :
-                        $output = $this->doDeleteModuleCategory();
-                        $msg_code = 'success_deleted';
-                    break;
-                case 'update' :
-                        $output = $this->doUpdateModuleCategory();
-                        $msg_code = 'success_updated';
-                    break;
-            }
-            if(!$output->toBool()) return $output;
-
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 모듈 카테고리의 제목 변경
-         **/
-        function doUpdateModuleCategory() {
-            $args->title = Context::get('title');
-            $args->module_category_srl = Context::get('module_category_srl');
-            return executeQuery('module.updateModuleCategory', $args);
-        }
-
-        /**
-         * @brief 모듈 카테고리 삭제
-         **/
-        function doDeleteModuleCategory() {
-            $args->module_category_srl = Context::get('module_category_srl');
-            return executeQuery('module.deleteModuleCategory', $args);
-        }
-
-        /**
-         * @brief 모듈 복사
-         **/
-        function procModuleAdminCopyModule() {
-            // 복사하려는 대상 모듈의 정보를 구함
-            $module_srl = Context::get('module_srl');
-            if(!$module_srl) return;
-
-            // 새로 생성하려는 모듈들의 이름/브라우저 제목을 구함
-            $clones = array();
-            $args = Context::getAll();
-            for($i=1;$i<=10;$i++) {
-                $mid = trim($args->{"mid_".$i});
-                if(!$mid) continue;
-                if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
-                $browser_title = $args->{"browser_title_".$i};
-                if(!$mid) continue;
-                if($mid && !$browser_title) $browser_title = $mid;
-                $clones[$mid] = $browser_title;
-            }
-            if(!count($clones)) return;
-
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 모듈 정보 가져옴
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-
-            // 권한 정보 가져옴
-            $module_args->module_srl = $module_srl;
-            $output = executeQueryArray('module.getModuleGrants', $module_args);
-            $grant = array();
-            if($output->data) {
-                foreach($output->data as $key => $val) $grant[$val->name][] = $val->group_srl;
-            }
-
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 모듈 복사
-            foreach($clones as $mid => $browser_title) {
-                $clone_args = null;
-                $clone_args = clone($module_info);
-                $clone_args->module_srl = null;
-                $clone_args->content = null;
-                $clone_args->mid = $mid;
-                $clone_args->browser_title = $browser_title;
-                $clone_args->is_default = 'N';
-
-                // 모듈 생성
-                $output = $oModuleController->insertModule($clone_args);
-                $module_srl = $output->get('module_srl');
-
-                // 권한 정보 등록
-                if(count($grant)) $oModuleController->insertModuleGrants($module_srl, $grant);
-            }
-
-            $oDB->commit();
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 모듈 권한 저장
-         **/
-        function procModuleAdminInsertGrant() {
-            $oModuleController = &getController('module');
-            $oModuleModel = &getModel('module');
-
-            // 모듈 번호 구함
-            $module_srl = Context::get('module_srl');
-
-            // 해당 모듈의 정보를 구함
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$module_info) return new Object(-1,'msg_invalid_request');
-
-            // 관리자 아이디 등록
-            $oModuleController->deleteAdminId($module_srl);
-            $admin_member = Context::get('admin_member');
-            if($admin_member) {
-                $admin_members = explode(',',$admin_member);
-                for($i=0;$i<count($admin_members);$i++) {
-                    $admin_id = trim($admin_members[$i]);
-                    if(!$admin_id) continue;
-                    $oModuleController->insertAdminId($module_srl, $admin_id);
-
-                }
-            }
-
-            // 권한 정리
-            $xml_info = $oModuleModel->getModuleActionXML($module_info->module);
-
-            $grant_list = $xml_info->grant;
-
-            $grant_list->access->default = 'guest';
-            $grant_list->manager->default = 'manager';
-
-            foreach($grant_list as $grant_name => $grant_info) {
-                // default값을 구함
-                $default = Context::get($grant_name.'_default');
-
-                // -1 = 로그인 사용자만, -2 = 사이트 가입자만, 0 = 모든 사용자
-                if(strlen($default)){
-                    $grant->{$grant_name}[] = $default;
-                    continue;
-
-                // 특정 그룹 사용자
-                } else {
-                    $group_srls = Context::get($grant_name);
-                    if($group_srls) {
-                        if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-                        elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-                        else $group_srls = array($group_srls);
-                        $grant->{$grant_name} = $group_srls;
-                    }
-                    continue;
-                }
-                $grant->{$group_srls} = array();
-            }
-            
-            // DB에 저장
-            $args->module_srl = $module_srl;
-            $output = executeQuery('module.deleteModuleGrants', $args);
-            if(!$output->toBool()) return $output;
-
-            // DB에 권한 저장 
-			if ($grant){
-				foreach($grant as $grant_name => $group_srls) {
-					foreach($group_srls as $key => $val) {
-						$args = null;
-						$args->module_srl = $module_srl;
-						$args->name = $grant_name;
-						$args->group_srl = $val;
-						$output = executeQuery('module.insertModuleGrant', $args);
-						if(!$output->toBool()) return $output;
-					}
-				}
-			}
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 스킨 정보 업데이트
-         **/
-        function procModuleAdminUpdateSkinInfo() {
-            // module_srl에 해당하는 정보들을 가져오기
-            $module_srl = Context::get('module_srl');
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if($module_info->module_srl) {
-                $skin = $module_info->skin;
-
-                // 스킨의 정보를 구해옴 (extra_vars를 체크하기 위해서)
-                $module_path = './modules/'.$module_info->module;
-                $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
-                $skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
-                // 입력받은 변수들을 체크 (mo, act, module_srl, page등 기본적인 변수들 없앰)
-                $obj = Context::getRequestVars();
-                unset($obj->act);
-                unset($obj->module_srl);
-                unset($obj->page);
-                unset($obj->mid);
-                unset($obj->module);
-
-                // 원 skin_info에서 extra_vars의 type이 image일 경우 별도 처리를 해줌
-                if($skin_info->extra_vars) {
-                    foreach($skin_info->extra_vars as $vars) {
-                        if($vars->type!='image') continue;
-
-                        $image_obj = $obj->{$vars->name};
-
-                        // 삭제 요청에 대한 변수를 구함
-                        $del_var = $obj->{"del_".$vars->name};
-                        unset($obj->{"del_".$vars->name});
-                        if($del_var == 'Y') {
-                            FileHandler::removeFile($skin_vars[$vars->name]->value);
-                            continue;
-                        }
-
-                        // 업로드 되지 않았다면 이전 데이터를 그대로 사용
-                        if(!$image_obj['tmp_name']) {
-                            $obj->{$vars->name} = $skin_vars[$vars->name]->value;
-                            continue;
-                        }
-
-                        // 정상적으로 업로드된 파일이 아니면 무시
-                        if(!is_uploaded_file($image_obj['tmp_name'])) {
-                            unset($obj->{$vars->name});
-                            continue;
-                        }
-
-                        // 이미지 파일이 아니어도 무시
-                        if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
-                            unset($obj->{$vars->name});
-                            continue;
-                        }
-
-                        // 경로를 정해서 업로드
-                        $path = sprintf("./files/attach/images/%s/", $module_srl);
-
-                        // 디렉토리 생성
-                        if(!FileHandler::makeDir($path)) return false;
-
-                        $filename = $path.$image_obj['name'];
-
-                        // 파일 이동
-                        if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
-                            unset($obj->{$vars->name});
-                            continue;
-                        }
-
-                        // 정상 파일 업로드 
-                        FileHandler::removeFile($skin_vars[$vars->name]->value);
-                        // 변수를 바꿈
-                        unset($obj->{$vars->name});
-                        $obj->{$vars->name} = $filename;
-                    }
-                }
-                // 해당 모듈의 전체 스킨 불러와서 이미지는 제거
-                /*
-                if($skin_info->extra_vars) {
-                    foreach($skin_info->extra_vars as $vars) {
-                        if($vars->type!='image') continue;
-                        $value = $skin_vars[$vars->name];
-                        if(file_exists($value)) @unlink($value);
-                    }
-                }
-                */
-                $oModuleController = &getController('module');
-                $oModuleController->deleteModuleSkinVars($module_srl);
-
-                // 등록
-                $oModuleController->insertModuleSkinVars($module_srl, $obj);
-            }
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath('./modules/module/tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
-        /**
-         * @brief 모듈 일괄 정리
-         **/
-        function procModuleAdminModuleSetup() {
-            $vars = Context::getRequestVars();
-
-            if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
-
-            $module_srls = explode(',',$vars->module_srls);
-            if(!count($module_srls)) return new Object(-1,'msg_invalid_request');
-
-            $oModuleModel = &getModel('module');
-            $oModuleController= &getController('module');
-            foreach($module_srls as $module_srl) {
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                $module_info->module_category_srl = $vars->module_category_srl;
-                $module_info->layout_srl = $vars->layout_srl;
-                $module_info->skin = $vars->skin;
-                $module_info->description = $vars->description;
-                $module_info->header_text = $vars->header_text;
-                $module_info->footer_text = $vars->footer_text;
-                $oModuleController->updateModule($module_info);
-            }
-
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 모듈 권한 일괄 정리
-         **/
-        function procModuleAdminModuleGrantSetup() {
-            $module_srls = Context::get('module_srls');
-            if(!$module_srls) return new Object(-1,'msg_invalid_request');
-
-            $modules = explode(',',$module_srls);
-            if(!count($modules)) return new Object(-1,'msg_invalid_request');
-
-            $oModuleController = &getController('module');
-            $oModuleModel = &getModel('module');
-
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0]);
-            $xml_info = $oModuleModel->getModuleActionXml($module_info->module);
-            $grant_list = $xml_info->grant;
-
-            $grant_list->access->default = 'guest';
-            $grant_list->manager->default = 'manager';
-
-            foreach($grant_list as $grant_name => $grant_info) {
-                // default값을 구함
-                $default = Context::get($grant_name.'_default');
-
-                // -1 = 로그인 사용자만, 0 = 모든 사용자
-                if(strlen($default)){
-                    $grant->{$grant_name}[] = $default;
-                    continue;
-
-                // 특정 그룹 사용자
-                } else {
-                    $group_srls = Context::get($grant_name);
-                    if($group_srls) {
-                        if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
-                        elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
-                        else $group_srls = array($group_srls);
-                        $grant->{$grant_name} = $group_srls;
-                    }
-                    continue;
-                }
-                $grant->{$group_srls} = array();
-            }
-
-            
-            // DB에 저장
-            foreach($modules as $module_srl) {
-                $args = null;
-                $args->module_srl = $module_srl;
-                $output = executeQuery('module.deleteModuleGrants', $args);
-                if(!$output->toBool()) continue;
-
-                // DB에 권한 저장 
-                foreach($grant as $grant_name => $group_srls) {
-                    foreach($group_srls as $key => $val) {
-                        $args = null;
-                        $args->module_srl = $module_srl;
-                        $args->name = $grant_name;
-                        $args->group_srl = $val;
-                        $output = executeQuery('module.insertModuleGrant', $args);
-                        if(!$output->toBool()) return $output;
-                    }
-                }
-            }
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 언어 추가/ 업데이트
-         **/
-        function procModuleAdminInsertLang() {
-            // 언어코드명 가져옴 
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $args->name = str_replace(' ','_',Context::get('lang_code'));
-            if(!$args->name) return new Object(-1,'msg_invalid_request');
-
-            // 언어코드가 있는지 조사
-            $output = executeQueryArray('module.getLang', $args);
-            if(!$output->toBool()) return $output;
-
-            // 있으면 업데이트를 위해 기존 값들을 지움
-            if($output->data) $output = executeQuery('module.deleteLang', $args);
-            if(!$output->toBool()) return $output;
-
-            // 입력
-            $lang_supported = Context::get('lang_supported');
-            foreach($lang_supported as $key => $val) {
-                $args->lang_code = $key;
-                $args->value = trim(Context::get($key));
-                if(!$args->value) {
-                    $args->value = Context::get(strtolower($key));
-                    if(!$args->value) $args->value = $args->name;
-                }
-                $output = executeQuery('module.insertLang', $args);
-                if(!$output->toBool()) return $output;
-            }
-            $this->makeCacheDefinedLangCode($args->site_srl);
-
-            $this->add('name', $args->name);
-        }
-
-        /**
-         * @brief 언어 제거
-         **/
-        function procModuleAdminDeleteLang() {
-            // 언어코드명 가져옴 
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $args->name = str_replace(' ','_',Context::get('name'));
-            if(!$args->name) return new Object(-1,'msg_invalid_request');
-
-            $output = executeQuery('module.deleteLang', $args);
-            if(!$output->toBool()) return $output;
-            $this->makeCacheDefinedLangCode($args->site_srl);
-        }
-
-        /**
-         * @brief 사용자 정이 언어코드 파일 저장
-         **/
-        function makeCacheDefinedLangCode($site_srl = 0) {
-            // 현재 사이트의 언어파일 가져오기
-            if(!$site_srl) {
-                $site_module_info = Context::get('site_module_info');
-                $args->site_srl = (int)$site_module_info->site_srl;
-            } else {
-                $args->site_srl = $site_srl;
-            }
-            $output = executeQueryArray('module.getLang', $args);
-            if(!$output->toBool() || !$output->data) return;
-
-            // 캐시 디렉토리 설정
-            $cache_path = _XE_PATH_.'files/cache/lang_defined/';
-            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
-
-            $lang_supported = Context::get('lang_supported');
-            foreach($lang_supported as $key => $val) {
-                $fp[$key] = fopen( sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $key), 'w' );
-                if(!$fp[$key]) return;
-                fwrite($fp[$key],"<?php if(!defined('__ZBXE__')) exit(); \r\n");
-            }
-
-            foreach($output->data as $key => $val) {
-                if($fp[$val->lang_code]) fwrite($fp[$val->lang_code], sprintf('$lang["%s"] = "%s";'."\r\n", $val->name, str_replace('"','\\"',$val->value)));
-            }
-
-            foreach($lang_supported as $key => $val) {
-                if(!$fp[$key]) continue;
-                fwrite($fp[$key],"?>");
-                fclose($fp[$key]);
-            }
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  moduleAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of the module module
+     **/
+
+    class moduleAdminController extends module {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Add the module category
+         **/
+        function procModuleAdminInsertCategory() {
+            $args->title = Context::get('title');
+            $output = executeQuery('module.insertModuleCategory', $args);
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage("success_registed");
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Update category
+         **/
+        function procModuleAdminUpdateCategory() {
+			$output = $this->doUpdateModuleCategory();
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Delete category
+         **/
+        function procModuleAdminDeleteCategory() {
+			$output = $this->doDeleteModuleCategory();
+            if(!$output->toBool()) return $output;
+
+            $this->setMessage('success_deleted');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Change the title of the module category
+         **/
+        function doUpdateModuleCategory() {
+            $args->title = Context::get('title');
+            $args->module_category_srl = Context::get('module_category_srl');
+            return executeQuery('module.updateModuleCategory', $args);
+        }
+
+        /**
+         * @brief Delete the module category
+         **/
+        function doDeleteModuleCategory() {
+            $args->module_category_srl = Context::get('module_category_srl');
+            return executeQuery('module.deleteModuleCategory', $args);
+        }
+
+        /**
+         * @brief Copy Module
+         **/
+        function procModuleAdminCopyModule() {
+            // Get information of the target module to copy
+            $module_srl = Context::get('module_srl');
+            if(!$module_srl) return;
+            // Get module name to create and browser title
+            $clones = array();
+            $args = Context::getAll();
+            for($i=1;$i<=10;$i++) {
+                $mid = trim($args->{"mid_".$i});
+                if(!$mid) continue;
+                if(!preg_match("/^[a-zA-Z]([a-zA-Z0-9_]*)$/i", $mid)) return new Object(-1, 'msg_limit_mid');
+                $browser_title = $args->{"browser_title_".$i};
+                if(!$mid) continue;
+                if($mid && !$browser_title) $browser_title = $mid;
+                $clones[$mid] = $browser_title;
+            }
+            if(!count($clones)) return;
+
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // Get module information
+			$columnList = array('module', 'module_category_srl', 'layout_srl', 'use_mobile', 'mlayout_srl', 'menu_srl', 'site_srl', 'skin', 'mskin', 'description', 'mcontent', 'open_rss', 'header_text', 'footer_text', 'regdate');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            // Get permission information
+            $module_args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleGrants', $module_args);
+            $grant = array();
+            if($output->data) {
+                foreach($output->data as $key => $val) $grant[$val->name][] = $val->group_srl;
+            }
+
+			// get Extra Vars
+			$extra_args->module_srl = $module_srl;
+			$extra_output = executeQueryArray('module.getModuleExtraVars', $extra_args);
+			if ($extra_output->toBool() && is_array($extra_output->data)){
+				foreach($extra_output->data as $info){
+					$extra_vars->{$info->name} = $info->value;
+				}
+			}
+
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Copy a module
+            foreach($clones as $mid => $browser_title) {
+                $clone_args = null;
+                $clone_args = clone($module_info);
+                $clone_args->module_srl = null;
+                $clone_args->content = null;
+                $clone_args->mid = $mid;
+                $clone_args->browser_title = $browser_title;
+                $clone_args->is_default = 'N';
+                // Create a module
+                $output = $oModuleController->insertModule($clone_args);
+                $module_srl = $output->get('module_srl');
+                // Grant module permissions
+                if(count($grant)) $oModuleController->insertModuleGrants($module_srl, $grant);
+				if ($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+
+            }
+
+            $oDB->commit();
+            $this->setMessage('success_registed');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				global $lang;
+				htmlHeader();
+				alertScript($lang->success_registed);
+				reload(true);
+				closePopupScript();
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+        }
+
+        /**
+         * @brief Save the module permissions
+         **/
+        function procModuleAdminInsertGrant() {
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+            // Get module_srl
+            $module_srl = Context::get('module_srl');
+            // Get information of the module
+			$columnList = array('module_srl', 'module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            if(!$module_info) return new Object(-1,'msg_invalid_request');
+            // Register Admin ID
+            $oModuleController->deleteAdminId($module_srl);
+            $admin_member = Context::get('admin_member');
+            if($admin_member) {
+                $admin_members = explode(',',$admin_member);
+                for($i=0;$i<count($admin_members);$i++) {
+                    $admin_id = trim($admin_members[$i]);
+                    if(!$admin_id) continue;
+                    $oModuleController->insertAdminId($module_srl, $admin_id);
+
+                }
+            }
+            // List permissions
+            $xml_info = $oModuleModel->getModuleActionXML($module_info->module);
+
+            $grant_list = $xml_info->grant;
+
+            $grant_list->access->default = 'guest';
+            $grant_list->manager->default = 'manager';
+
+            foreach($grant_list as $grant_name => $grant_info) {
+                // Get the default value
+                $default = Context::get($grant_name.'_default');
+                // -1 = Log-in user only, -2 = site members only, 0 = all users
+                if(strlen($default)){
+                    $grant->{$grant_name}[] = $default;
+                    continue;
+                // users in a particular group
+                } else {
+                    $group_srls = Context::get($grant_name);
+                    if($group_srls) {
+                        if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
+                        elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+                        else $group_srls = array($group_srls);
+                        $grant->{$grant_name} = $group_srls;
+                    }
+                    continue;
+                }
+                $grant->{$group_srls} = array();
+            }
+
+            // Stored in the DB
+            $args->module_srl = $module_srl;
+            $output = executeQuery('module.deleteModuleGrants', $args);
+            if(!$output->toBool()) return $output;
+            // Permissions stored in the DB
+			if ($grant){
+				foreach($grant as $grant_name => $group_srls) {
+					foreach($group_srls as $key => $val) {
+						$args = null;
+						$args->module_srl = $module_srl;
+						$args->name = $grant_name;
+						$args->group_srl = $val;
+						$output = executeQuery('module.insertModuleGrant', $args);
+						if(!$output->toBool()) return $output;
+					}
+				}
+			}
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief Updating Skins
+         **/
+        function procModuleAdminUpdateSkinInfo() {
+            // Get information of the module_srl
+            $module_srl = Context::get('module_srl');
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module', 'skin');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            if($module_info->module_srl) {
+                $skin = $module_info->skin;
+                // Get skin information (to check extra_vars)
+                $module_path = './modules/'.$module_info->module;
+                $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
+                $skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
+                // Check received variables (unset such variables as act, module_srl, page, mid, module)
+                $obj = Context::getRequestVars();
+                unset($obj->act);
+                unset($obj->module_srl);
+                unset($obj->page);
+                unset($obj->mid);
+                unset($obj->module);
+                // Separately handle if a type of extra_vars is an image in the original skin_info
+                if($skin_info->extra_vars) {
+                    foreach($skin_info->extra_vars as $vars) {
+                        if($vars->type!='image') continue;
+
+                        $image_obj = $obj->{$vars->name};
+                        // Get a variable to delete
+                        $del_var = $obj->{"del_".$vars->name};
+                        unset($obj->{"del_".$vars->name});
+                        if($del_var == 'Y') {
+                            FileHandler::removeFile($skin_vars[$vars->name]->value);
+                            continue;
+                        }
+                        // Use the previous data if not uploaded
+                        if(!$image_obj['tmp_name']) {
+                            $obj->{$vars->name} = $skin_vars[$vars->name]->value;
+                            continue;
+                        }
+                        // Ignore if the file is not successfully uploaded
+                        if(!is_uploaded_file($image_obj['tmp_name'])) {
+                            unset($obj->{$vars->name});
+                            continue;
+                        }
+                        // Ignore if the file is not an image
+                        if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) {
+                            unset($obj->{$vars->name});
+                            continue;
+                        }
+                        // Upload the file to a path
+                        $path = sprintf("./files/attach/images/%s/", $module_srl);
+                        // Create a directory
+                        if(!FileHandler::makeDir($path)) return false;
+
+                        $filename = $path.$image_obj['name'];
+                        // Move the file
+                        if(!move_uploaded_file($image_obj['tmp_name'], $filename)) {
+                            unset($obj->{$vars->name});
+                            continue;
+                        }
+                        // Upload the file
+                        FileHandler::removeFile($skin_vars[$vars->name]->value);
+                        // Change a variable
+                        unset($obj->{$vars->name});
+                        $obj->{$vars->name} = $filename;
+                    }
+                }
+                // Load the entire skin of the module and then remove the image
+                /*
+                if($skin_info->extra_vars) {
+                    foreach($skin_info->extra_vars as $vars) {
+                        if($vars->type!='image') continue;
+                        $value = $skin_vars[$vars->name];
+                        if(file_exists($value)) @unlink($value);
+                    }
+                }
+                */
+                $oModuleController = &getController('module');
+                $oModuleController->deleteModuleSkinVars($module_srl);
+                // Register
+                $oModuleController->insertModuleSkinVars($module_srl, $obj);
+            }
+        	//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+            	$cache_key = 'object:'.$module_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('default_layout.html');
+            $this->setTemplatePath('./modules/module/tpl');
+            $this->setTemplateFile("top_refresh.html");
+        }
+
+        /**
+         * @brief List module information
+         **/
+        function procModuleAdminModuleSetup() {
+            $vars = Context::getRequestVars();
+
+            if(!$vars->module_srls) return new Object(-1,'msg_invalid_request');
+
+            $module_srls = explode(',',$vars->module_srls);
+            if(!count($module_srls)) return new Object(-1,'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+            $oModuleController= &getController('module');
+			$columnList = array('module_srl', 'module', 'use_mobile', 'mlayout_srl', 'menu_srl', 'site_srl', 'mid', 'mskin', 'browser_title', 'is_default', 'content', 'mcontent', 'open_rss', 'regdate');
+            foreach($module_srls as $module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+                $module_info->module_category_srl = $vars->module_category_srl;
+                $module_info->layout_srl = $vars->layout_srl;
+                $module_info->skin = $vars->skin;
+                $module_info->description = $vars->description;
+                $module_info->header_text = $vars->header_text;
+                $module_info->footer_text = $vars->footer_text;
+                $output = $oModuleController->updateModule($module_info);
+            }
+
+            $this->setMessage('success_registed');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				if (Context::get('success_return_url')) {
+					$this->setRedirectUrl(Context::get('success_return_url'));
+				}else{
+					global $lang;
+					htmlHeader();
+					alertScript($lang->success_registed);
+					closePopupScript();
+					htmlFooter();
+					Context::close();
+					exit;
+				}
+			}
+        }
+
+        /**
+         * @brief List permissions of the module
+         **/
+        function procModuleAdminModuleGrantSetup() {
+            $module_srls = Context::get('module_srls');
+            if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) return new Object(-1,'msg_invalid_request');
+
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+
+			$columnList = array('module_srl', 'module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
+            $xml_info = $oModuleModel->getModuleActionXml($module_info->module);
+            $grant_list = $xml_info->grant;
+
+            $grant_list->access->default = 'guest';
+            $grant_list->manager->default = 'manager';
+
+            foreach($grant_list as $grant_name => $grant_info) {
+                // Get the default value
+                $default = Context::get($grant_name.'_default');
+                // -1 = Sign only, 0 = all users
+                if(strlen($default)){
+                    $grant->{$grant_name}[] = $default;
+                    continue;
+                // Users in a particular group
+                } else {
+                    $group_srls = Context::get($grant_name);
+                    if($group_srls) {
+                        if(strpos($group_srls,'|@|')!==false) $group_srls = explode('|@|',$group_srls);
+                        elseif(strpos($group_srls,',')!==false) $group_srls = explode(',',$group_srls);
+                        else $group_srls = array($group_srls);
+                        $grant->{$grant_name} = $group_srls;
+                    }
+                    continue;
+                }
+                $grant->{$group_srls} = array();
+            }
+
+
+            // Stored in the DB
+            foreach($modules as $module_srl) {
+                $args = null;
+                $args->module_srl = $module_srl;
+                $output = executeQuery('module.deleteModuleGrants', $args);
+                if(!$output->toBool()) continue;
+                // Permissions stored in the DB
+                foreach($grant as $grant_name => $group_srls) {
+                    foreach($group_srls as $key => $val) {
+                        $args = null;
+                        $args->module_srl = $module_srl;
+                        $args->name = $grant_name;
+                        $args->group_srl = $val;
+                        $output = executeQuery('module.insertModuleGrant', $args);
+                        if(!$output->toBool()) return $output;
+                    }
+                }
+            }
+            $this->setMessage('success_registed');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				if (Context::get('success_return_url')) {
+					$this->setRedirectUrl(Context::get('success_return_url'));
+				}else{
+					global $lang;
+					htmlHeader();
+					alertScript($lang->success_registed);
+					closePopupScript();
+					htmlFooter();
+					Context::close();
+					exit;
+				}
+			}
+        }
+
+        /**
+         * @brief Add/Update language
+         **/
+        function procModuleAdminInsertLang() {
+            // Get language code
+            $site_module_info = Context::get('site_module_info');
+			$target = Context::get('target');
+			$module = Context::get('module');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->name = str_replace(' ','_',Context::get('lang_code'));
+            $args->lang_name = str_replace(' ','_',Context::get('lang_name'));
+			if(!empty($args->lang_name)) $args->name = $args->lang_name;
+
+			// if args->name is empty, random generate for user define language
+			if(empty($args->name)) $args->name = 'userLang'.date('YmdHis').''.sprintf('%03d', mt_rand(0, 100));
+
+            if(!$args->name) return new Object(-1,'msg_invalid_request');
+            // Check whether a language code exists
+            $output = executeQueryArray('module.getLang', $args);
+            if(!$output->toBool()) return $output;
+            // If exists, clear the old values for updating
+            if($output->data) $output = executeQuery('module.deleteLang', $args);
+            if(!$output->toBool()) return $output;
+            // Enter
+            $lang_supported = Context::get('lang_supported');
+            foreach($lang_supported as $key => $val) {
+                $args->lang_code = $key;
+                $args->value = trim(Context::get($key));
+
+				// if request method is json, strip slashes
+				if (Context::getRequestMethod() == 'JSON' && version_compare(PHP_VERSION, "5.9.0", "<") && get_magic_quotes_gpc())
+				{
+					$args->value = stripslashes($args->value);
+				}
+
+				if($args->value)
+				{
+					$output = executeQuery('module.insertLang', $args);
+					if(!$output->toBool()) return $output;
+				}
+            }
+            $this->makeCacheDefinedLangCode($args->site_srl);
+
+            $this->add('name', $args->name);
+            $this->setMessage("success_saved", 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', $module, 'target', $target, 'act', 'dispModuleAdminLangcode');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Remove language
+         **/
+        function procModuleAdminDeleteLang() {
+            // Get language code
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+            $args->name = str_replace(' ','_',Context::get('name'));
+            $args->lang_name = str_replace(' ','_',Context::get('lang_name'));
+			if(!empty($args->lang_name)) $args->name = $args->lang_name;
+            if(!$args->name) return new Object(-1,'msg_invalid_request');
+
+            $output = executeQuery('module.deleteLang', $args);
+            if(!$output->toBool()) return $output;
+            $this->makeCacheDefinedLangCode($args->site_srl);
+
+            $this->setMessage("success_deleted", 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminLangcode');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+		function procModuleAdminGetList()
+		{
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+
+			$oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+            // Variable setting for site keyword
+            $site_keyword = Context::get('site_keyword');
+            $site_srl = Context::get('site_srl');
+            // If there is no site keyword, use as information of the current virtual site
+            $args = null;
+            $logged_info = Context::get('logged_info');
+			$site_module_info = Context::get('site_module_info');
+			if($site_keyword) $args->site_keyword = $site_keyword;
+
+			if(!$site_srl)
+			{
+				if($logged_info->is_admin == 'Y' && !$site_keyword) $args->site_srl = 0;
+				else $args->site_srl = (int)$site_module_info->site_srl;
+			}
+			else $args->site_srl = $site_srl;
+
+			$args->sort_index1 = 'sites.domain';
+
+            // Get a list of modules at the site
+            $output = executeQueryArray('module.getSiteModules', $args);
+            $mid_list = array();
+            if(count($output->data)) {
+                foreach($output->data as $key => $val) {
+                    $module = trim($val->module);
+                    if(!$module) continue;
+
+					// replace user defined lang.
+					$oModuleController->replaceDefinedLangCode($val->browser_title);
+
+                    $obj = null;
+                    $obj->module_srl = $val->module_srl;
+                    $obj->browser_title = $val->browser_title;
+                    $obj->mid = $val->mid;
+                    $mid_list[$module]->list[$val->mid] = $obj;
+                }
+            }
+
+            $selected_module = Context::get('selected_module');
+            if(count($mid_list)) {
+                foreach($mid_list as $module => $val) {
+                    if(!$selected_module) $selected_module = $module;
+                    $xml_info = $oModuleModel->getModuleInfoXml($module);
+                    $mid_list[$module]->title = $xml_info->title;
+                }
+            }
+
+			$security = new Security($mid_list);
+			$security->encodeHTML('....browser_title');
+
+			$this->add('module_list', $mid_list);
+		}
+
+        /**
+         * @brief Save the file of user-defined language code
+         **/
+        function makeCacheDefinedLangCode($site_srl = 0) {
+            // Get the language file of the current site
+            if(!$site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $args->site_srl = (int)$site_module_info->site_srl;
+            } else {
+                $args->site_srl = $site_srl;
+            }
+            $output = executeQueryArray('module.getLang', $args);
+            if(!$output->toBool() || !$output->data) return;
+            // Set the cache directory
+            $cache_path = _XE_PATH_.'files/cache/lang_defined/';
+            if(!is_dir($cache_path)) FileHandler::makeDir($cache_path);
+
+            $lang_supported = Context::get('lang_supported');
+            foreach($lang_supported as $key => $val) {
+                $fp[$key] = fopen( sprintf('%s/%d.%s.php', $cache_path, $args->site_srl, $key), 'w' );
+                if(!$fp[$key]) return;
+                fwrite($fp[$key],"<?php if(!defined('__ZBXE__')) exit(); \r\n");
+            }
+
+            foreach($output->data as $key => $val) {
+                if($fp[$val->lang_code]) fwrite($fp[$val->lang_code], sprintf('$lang["%s"] = "%s";'."\r\n", $val->name, str_replace('"','\\"',$val->value)));
+            }
+
+            foreach($lang_supported as $key => $val) {
+                if(!$fp[$key]) continue;
+                fwrite($fp[$key],"?>");
+                fclose($fp[$key]);
+            }
+        }
+
+    }
+?>
diff --git a/modules/module/module.admin.model.php b/modules/module/module.admin.model.php
index 0ff7eff71..24c0f9b00 100644
--- a/modules/module/module.admin.model.php
+++ b/modules/module/module.admin.model.php
@@ -1,201 +1,270 @@
-<?php
-    /**
-     * @class  moduleAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief  module 모듈의 AdminModel class
-     **/
-
-    class moduleAdminModel extends module {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief module_srl (,콤마로 연결된)로 대상 모듈들의 목록을 return)
-         * 모듈 선택기(ModuleSelector)에서 사용됨
-         **/
-        function getModuleAdminModuleList() {
-            $args->module_srls = Context::get('module_srls');
-            $output = executeQueryArray('module.getModulesInfo', $args);
-            if(!$output->toBool() || !$output->data) return new Object();
-
-            foreach($output->data as $key => $val) {
-                $list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title);
-            }
-            $modules = explode(',',$args->module_srls);
-            for($i=0;$i<count($modules);$i++) {
-                $module_list[$modules[$i]] = $list[$modules[$i]];
-            }
-
-            $this->add('id', Context::get('id'));
-            $this->add('module_list', $module_list);
-        }
-
-        function getModuleMidList($args){
-            $args->list_count = 20;
-            $args->page_count = 10;
-            $output = executeQueryArray('module.getModuleMidList', $args);
-            if(!$output->toBool()) return $output;
-
-            ModuleModel::syncModuleToSite($output->data);
-
-            return $output;
-        }
-
-        /**
-         * @brief 공통 :: 모듈의 모듈 권한 출력 페이지
-         * 모듈의 모듈 권한 출력은 모든 모듈에서 module instance를 이용할때 사용할 수 있음
-         **/
-        function getModuleGrantHTML($module_srl, $source_grant_list) {
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-
-            // access, manager 권한은 가상 권한으로 설정
-            $grant_list->access->title = Context::getLang('grant_access');
-            $grant_list->access->default = 'guest';
-            if(count($source_grant_list)) {
-                foreach($source_grant_list as $key => $val) {
-                    if(!$val->default) $val->default = 'guest';
-                    if($val->default == 'root') $val->default = 'manager';
-                    $grant_list->{$key} = $val;
-                }
-            }
-            $grant_list->manager->title = Context::getLang('grant_manager');
-            $grant_list->manager->default = 'manager';
-            Context::set('grant_list', $grant_list);
-
-            // 현재 모듈에 설정된 권한 그룹을 가져옴
-            $default_grant = array();
-            $args->module_srl = $module_srl;
-            $output = executeQueryArray('module.getModuleGrants', $args);
-            if($output->data) {
-                foreach($output->data as $val) {
-                    if($val->group_srl == 0) $default_grant[$val->name] = 'all';
-                    else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
-                    else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
-                    else {
-                        $selected_group[$val->name][] = $val->group_srl;
-                        $default_grant[$val->name] = 'group';
-                    }
-                }
-            }
-            Context::set('selected_group', $selected_group);
-            Context::set('default_grant', $default_grant);
-            Context::set('module_srl', $module_srl);
-            // 현재 모듈에 설정된 관리자 아이디를 추출
-            $admin_member = $oModuleModel->getAdminId($module_srl);
-            Context::set('admin_member', $admin_member);
-
-            // 그룹을 가져옴
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups($module_info->site_srl);
-            Context::set('group_list', $group_list);
-
-			//Security			
-			$security = new Security();
-			$security->encodeHTML('group_list..title');
-			$security->encodeHTML('group_list..description');
-			
-            // grant 정보를 추출
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($this->module_path.'tpl', 'module_grants');
-        }
-
-        /**
-         * @brief 공통 :: 모듈의 스킨 설정 출력 페이지
-         **/
-        function getModuleSkinHTML($module_srl) {
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$module_info) return;
-
-            $skin = $module_info->skin;
-            $module_path = './modules/'.$module_info->module;
-
-            // 스킨의 XML 정보를 구함
-            $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
-
-            // DB에 설정된 스킨 정보를 구함
-            $skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
-
-            if(count($skin_info->extra_vars)) {
-                foreach($skin_info->extra_vars as $key => $val) {
-                    $group = $val->group;
-                    $name = $val->name;
-                    $type = $val->type;
-                    if($skin_vars[$name]) $value = $skin_vars[$name]->value;
-                    else $value = '';
-                    if($type=="checkbox") $value = $value?unserialize($value):array();
-
-                    $skin_info->extra_vars[$key]->value= $value;
-                }
-            }
-
-            Context::set('module_info', $module_info);
-            Context::set('mid', $module_info->mid);
-            Context::set('skin_info', $skin_info);
-            Context::set('skin_vars', $skin_vars);	
-			
-			//Security
-			$security = new Security(); 
-			$security->encodeHTML('mid');
-			$security->encodeHTML('module_info.browser_title');
-			$security->encodeHTML('skin_info...');
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($this->module_path.'tpl', 'skin_config');
-        }
-
-        /**
-         * @brief 특정 언어 코드에 대한 값들을 가져오기
-         * lang_code를 직접 기입하면 해당 언어코드에 대해서만 가져오고 값이 없으면 $name을 그대로 return
-         **/
-        function getLangCode($site_srl, $name) {
-            $lang_supported = Context::get('lang_supported');
-
-            if(substr($name,0,12)=='$user_lang->') {
-                $args->site_srl = (int)$site_srl;
-                $args->name = substr($name,12);
-                $output = executeQueryArray('module.getLang', $args);
-                if($output->data) {
-                    foreach($output->data as $key => $val) {
-                        $selected_lang[$val->lang_code] = $val->value;
-                    }
-                }
-            } else {
-                $tmp = unserialize($name);
-                if($tmp) {
-                    $selected_lang = array();
-                    $rand_name = $tmp[Context::getLangType()];
-                    if(!$rand_name) $rand_name = array_shift($tmp);
-                    foreach($lang_supported as $key => $val) {
-                        $selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
-                    }
-                }
-            }
-
-            $output = array();
-            foreach($lang_supported as $key => $val) {
-                $output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
-            }
-            return $output;
-        }
-
-        /**
-         * @brief 모듈 언어를 ajax로 요청시 return
-         **/
-        function getModuleAdminLangCode() {
-            $name = Context::get('name');
-            if(!$name) return new Object(-1,'msg_invalid_request');
-            $site_module_info = Context::get('site_module_info');
-            $this->add('name', $name);
-            $output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
-            $this->add('langs', $output);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  moduleAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief AdminModel class of the "module" module
+     **/
+
+    class moduleAdminModel extends module {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Return a list of target modules by using module_srls separated by comma(,)
+         * Used in the ModuleSelector
+         **/
+        function getModuleAdminModuleList() {
+			$oModuleController = &getController('module');
+			$oModuleModel = &getModel('module');
+            $args->module_srls = Context::get('module_srls');
+            $output = executeQueryArray('module.getModulesInfo', $args);
+            if(!$output->toBool() || !$output->data) return new Object();
+
+            foreach($output->data as $key => $val) {
+				$info_xml = $oModuleModel->getModuleInfoXml($val->module);
+				$oModuleController->replaceDefinedLangCode($val->browser_title);
+                $list[$val->module_srl] = array('module_srl'=>$val->module_srl,'mid'=>$val->mid,'browser_title'=>$val->browser_title, 'module_name' => $info_xml->title);
+            }
+            $modules = explode(',',$args->module_srls);
+            for($i=0;$i<count($modules);$i++) {
+                $module_list[$modules[$i]] = $list[$modules[$i]];
+            }
+
+            $this->add('id', Context::get('id'));
+            $this->add('module_list', $module_list);
+        }
+
+        function getModuleMidList($args){
+            $args->list_count = 20;
+            $args->page_count = 10;
+            $output = executeQueryArray('module.getModuleMidList', $args);
+            if(!$output->toBool()) return $output;
+
+            ModuleModel::syncModuleToSite($output->data);
+
+            return $output;
+        }
+
+        /**
+         * @brief Common:: module's permission displaying page in the module
+         * Available when using module instance in all the modules
+         **/
+        function getModuleGrantHTML($module_srl, $source_grant_list) {
+			// get member module's config
+			$oMemberModel = &getModel('member');
+			$member_config = $oMemberModel->getMemberConfig();
+			Context::set('member_config', $member_config);
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'site_srl');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            // Grant virtual permission for access and manager
+            $grant_list->access->title = Context::getLang('grant_access');
+            $grant_list->access->default = 'guest';
+            if(count($source_grant_list)) {
+                foreach($source_grant_list as $key => $val) {
+                    if(!$val->default) $val->default = 'guest';
+                    if($val->default == 'root') $val->default = 'manager';
+                    $grant_list->{$key} = $val;
+                }
+            }
+            $grant_list->manager->title = Context::getLang('grant_manager');
+            $grant_list->manager->default = 'manager';
+            Context::set('grant_list', $grant_list);
+            // Get a permission group granted to the current module
+            $default_grant = array();
+            $args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleGrants', $args);
+            if($output->data) {
+                foreach($output->data as $val) {
+                    if($val->group_srl == 0) $default_grant[$val->name] = 'all';
+                    else if($val->group_srl == -1) $default_grant[$val->name] = 'member';
+                    else if($val->group_srl == -2) $default_grant[$val->name] = 'site';
+                    else {
+                        $selected_group[$val->name][] = $val->group_srl;
+                        $default_grant[$val->name] = 'group';
+                    }
+                }
+            }
+            Context::set('selected_group', $selected_group);
+            Context::set('default_grant', $default_grant);
+            Context::set('module_srl', $module_srl);
+            // Extract admin ID set in the current module
+            $admin_member = $oModuleModel->getAdminId($module_srl);
+            Context::set('admin_member', $admin_member);
+            // Get a list of groups
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($module_info->site_srl);
+            Context::set('group_list', $group_list);
+
+			//Security			
+			$security = new Security();
+			$security->encodeHTML('group_list..title');
+			$security->encodeHTML('group_list..description');
+
+			// Get information of module_grants
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'module_grants');
+        }
+
+        /**
+         * @brief Common:: skin setting page for the module
+         **/
+        function getModuleSkinHTML($module_srl) {
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            if(!$module_info) return;
+
+            $skin = $module_info->skin;
+            $module_path = './modules/'.$module_info->module;
+            // Get XML information of the skin
+            $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
+            // Get skin information set in DB
+            $skin_vars = $oModuleModel->getModuleSkinVars($module_srl);
+
+            if(count($skin_info->extra_vars)) {
+                foreach($skin_info->extra_vars as $key => $val) {
+                    $group = $val->group;
+                    $name = $val->name;
+                    $type = $val->type;
+                    if($skin_vars[$name]) $value = $skin_vars[$name]->value;
+                    else $value = '';
+                    if($type=="checkbox") $value = $value?unserialize($value):array();
+
+                    $skin_info->extra_vars[$key]->value= $value;
+                }
+            }
+
+            Context::set('module_info', $module_info);
+            Context::set('mid', $module_info->mid);
+            Context::set('skin_info', $skin_info);
+            Context::set('skin_vars', $skin_vars);	
+			
+			//Security
+			$security = new Security(); 
+			$security->encodeHTML('mid');
+			$security->encodeHTML('module_info.browser_title');
+			$security->encodeHTML('skin_info...');
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($this->module_path.'tpl', 'skin_config');
+        }
+
+        /**
+         * @brief Get values for a particular language code
+         * Return its corresponding value if lang_code is specified. Otherwise return $name.
+         **/
+        function getLangCode($site_srl, $name) {
+            $lang_supported = Context::get('lang_supported');
+
+            if(substr($name,0,12)=='$user_lang->') {
+                $args->site_srl = (int)$site_srl;
+                $args->name = substr($name,12);
+                $output = executeQueryArray('module.getLang', $args);
+                if($output->data) {
+                    foreach($output->data as $key => $val) {
+                        $selected_lang[$val->lang_code] = $val->value;
+                    }
+                }
+            } else {
+                $tmp = unserialize($name);
+                if($tmp) {
+                    $selected_lang = array();
+                    $rand_name = $tmp[Context::getLangType()];
+                    if(!$rand_name) $rand_name = array_shift($tmp);
+					if(is_array($lang_supported))
+					{
+						foreach($lang_supported as $key => $val)
+							$selected_lang[$key] = $tmp[$key]?$tmp[$key]:$rand_name;
+					}
+                }
+            }
+
+            $output = array();
+			if(is_array($lang_supported))
+			{
+				foreach($lang_supported as $key => $val)
+					$output[$key] = $selected_lang[$key]?$selected_lang[$key]:$name;
+			}
+            return $output;
+        }
+
+        /**
+         * @brief Return if the module language in ajax is requested
+         **/
+        function getModuleAdminLangCode() {
+            $name = Context::get('name');
+            if(!$name) return new Object(-1,'msg_invalid_request');
+            $site_module_info = Context::get('site_module_info');
+            $this->add('name', $name);
+            $output = $this->getLangCode($site_module_info->site_srl, '$user_lang->'.$name);
+            $this->add('langs', $output);
+        }
+
+        /**
+         * @brief Returns lang list by lang name
+         **/
+		function getModuleAdminLangListByName()
+		{
+			$args = Context::getRequestVars();
+			if(!$args->site_srl) $args->site_srl = 0;
+
+			$columnList = array('lang_code', 'name', 'value');
+
+			$langList = array();
+
+			$args->langName = preg_replace('/^\$user_lang->/', '', $args->lang_name);
+            $output = executeQueryArray('module.getLangListByName', $args, $columnList);
+			if($output->toBool()) $langList = $output->data;
+
+			$this->add('lang_list', $langList);
+			$this->add('lang_name', $args->langName);
+		}
+
+        /**
+         * @brief Return lang list
+         **/
+		function getModuleAdminLangListByValue()
+		{
+			$args = Context::getRequestVars();
+			if(!$args->site_srl) $args->site_srl = 0;
+
+			$langList = array();
+
+			// search value
+			$output = executeQueryArray('module.getLangNameByValue', $args);
+			if ($output->toBool() && is_array($output->data)){
+				unset($args->value);
+
+				foreach($output->data as $data) {
+					$args->langName = $data->name;
+					$columnList = array('lang_code', 'name', 'value');
+					$outputByName = executeQueryArray('module.getLangListByName', $args, $columnList);
+
+					if($outputByName->toBool()) {
+ 						$langList = array_merge($langList, $outputByName->data);
+					}
+				}
+			}
+
+			$this->add('lang_list', $langList);
+		}
+
+        /**
+         * @brief Return current lang list
+         **/
+		function getLangListByLangcode($args)
+		{
+            $output = executeQueryArray('module.getLangListByLangcode', $args);
+			if(!$output->toBool()) return array();
+
+			return $output;
+		}
+
+    }
+?>
diff --git a/modules/module/module.admin.view.php b/modules/module/module.admin.view.php
index c2323b300..209fb7416 100644
--- a/modules/module/module.admin.view.php
+++ b/modules/module/module.admin.view.php
@@ -1,247 +1,289 @@
-<?php
-    /**
-     * @class  moduleAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  module 모듈의 admin view class
-     **/
-
-    class moduleAdminView extends module {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // template path 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 모듈 관리자 페이지
-         **/
-        function dispModuleAdminContent() {
-            $this->dispModuleAdminList();
-        }
-
-        /**
-         * @brief 모듈 목록 출력
-         **/
-        function dispModuleAdminList() {
-            // 모듈 목록을 구해서 
-            $oModuleModel = &getModel('module');
-            $module_list = $oModuleModel->getModuleList();
-            Context::set('module_list', $module_list);			
-						
-			$security = new Security();				
-			$security->encodeHTML('module_list....');			
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_list');
-        }
-
-        /**
-         * @brief 모듈의 상세 정보(conf/info.xml)를 팝업 출력
-         **/
-        function dispModuleAdminInfo() {
-            // 모듈 목록을 구해서 
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoXml(Context::get('selected_module'));
-            Context::set('module_info', $module_info);
-			
-			$security = new Security();				
-			$security->encodeHTML('module_info...');
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_info');
-        }
-
-        /**
-         * @brief 모듈 카테고리 목록
-         **/
-        function dispModuleAdminCategory() {
-            $module_category_srl = Context::get('module_category_srl');
-            
-            // 모듈 목록을 구해서 
-            $oModuleModel = &getModel('module');
-
-            // 선택된 카테고리가 있으면 해당 카테고리의 정보 수정 페이지로
-			//Security
-			$security = new Security();				
-			
-            if($module_category_srl) {
-                $selected_category  = $oModuleModel->getModuleCategory($module_category_srl);
-                Context::set('selected_category', $selected_category);
-				
-				//Security
-				$security->encodeHTML('selected_category.title');				
-
-                // 템플릿 파일 지정
-                $this->setTemplateFile('category_update_form');
-
-            // 아니면 전체 목록
-            } else {
-                $category_list = $oModuleModel->getModuleCategories();
-                Context::set('category_list', $category_list);
-				
-				//Security
-				$security->encodeHTML('category_list..title');
-				
-                // 템플릿 파일 지정
-                $this->setTemplateFile('category_list');
-            }
-        }
-
-        /**
-         * @brief 모듈 복사 기능
-         **/
-        function dispModuleAdminCopyModule() {
-            // 복사하려는 대상 모듈을 구함
-            $module_srl = Context::get('module_srl');
-
-            // 해당 모듈의 정보를 구함
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            Context::set('module_info', $module_info);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('copy_module');
-        }
-
-        /**
-         * @brief 모듈 기본 설정 일괄 적용
-         **/
-        function dispModuleAdminModuleSetup() {
-            $module_srls = Context::get('module_srls');
-
-            $modules = explode(',',$module_srls);
-            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0]);
-
-            // 모듈의 스킨 목록을 구함
-            $skin_list = $oModuleModel->getSkins('./modules/'.$module_info->module);
-            Context::set('skin_list',$skin_list);
-
-            // 레이아웃 목록을 구해옴
-            $oLayoutMode = &getModel('layout');
-            $layout_list = $oLayoutMode->getLayoutList();
-            Context::set('layout_list', $layout_list);
-			
-            // 모듈 카테고리 목록을 구함
-            $module_category = $oModuleModel->getModuleCategories();
-            Context::set('module_category', $module_category);
-
-			$security = new Security();				
-			$security->encodeHTML('layout_list..title','layout_list..layout');
-			$security->encodeHTML('skin_list....');
-			$security->encodeHTML('module_category...');			
-			
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_setup');
-        }
-
-        /**
-         * @brief 모듈 추가 설정 일괄 적용
-         **/
-        function dispModuleAdminModuleAdditionSetup() {
-            $module_srls = Context::get('module_srls');
-
-            $modules = explode(',',$module_srls);
-            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
-
-            // content는 다른 모듈에서 call by reference로 받아오기에 미리 변수 선언만 해 놓음
-            $content = '';
-
-            // 추가 설정을 위한 트리거 호출 
-            // 게시판 모듈이지만 차후 다른 모듈에서의 사용도 고려하여 trigger 이름을 공용으로 사용할 수 있도록 하였음
-            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
-            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
-            Context::set('setup_content', $content);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_addition_setup');
-        }
-
-        /**
-         * @brief 모듈 권한 설정 일괄 적용
-         **/
-        function dispModuleAdminModuleGrantSetup() {
-            $module_srls = Context::get('module_srls');
-
-            $modules = explode(',',$module_srls);
-            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0]);
-            $xml_info = $oModuleModel->getModuleActionXml($module_info->module);
-            $source_grant_list = $xml_info->grant;
-
-            // access, manager 권한은 가상 권한으로 설정
-            $grant_list->access->title = Context::getLang('grant_access');
-            $grant_list->access->default = 'guest';
-            if(count($source_grant_list)) {
-                foreach($source_grant_list as $key => $val) {
-                    if(!$val->default) $val->default = 'guest';
-                    if($val->default == 'root') $val->default = 'manager';
-                    $grant_list->{$key} = $val;
-                }
-            }
-            $grant_list->manager->title = Context::getLang('grant_manager');
-            $grant_list->manager->default = 'manager';
-            Context::set('grant_list', $grant_list);
-
-            // 그룹을 가져옴
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups($module_info->site_srl);
-            Context::set('group_list', $group_list);
-			
-			$security = new Security();				
-			$security->encodeHTML('group_list..title');
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_grant_setup');
-        }
-
-        /**
-         * @brief 언어 코드
-         **/
-        function dispModuleAdminLangcode() {
-            // 현재 사이트의 언어파일 가져오기
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = (int)$site_module_info->site_srl;
-            $args->sort_index = 'name';
-            $args->order_type = 'asc';
-            $output = executeQueryArray('module.getLangList', $args);
-            Context::set('lang_list', $output->data);
-
-            // 현재 선택된 언어 가져오기
-            $name = Context::get('name');
-            if($name) {
-                $oModuleAdminModel = &getAdminModel('module');
-                Context::set('selected_lang', $oModuleAdminModel->getLangCode($args->site_srl,'$user_lang->'.$name));
-            }
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_langcode');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  moduleAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class of the module module
+     **/
+
+    class moduleAdminView extends module {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Set the template path
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Module admin page
+         **/
+        function dispModuleAdminContent() {
+            $this->dispModuleAdminList();
+        }
+
+        /**
+         * @brief Display a lost of modules
+         **/
+        function dispModuleAdminList() {
+			// Obtain a list of modules
+            $oAdminModel = &getAdminModel('admin');
+			$oModuleModel = &getModel('module');
+			$oAutoinstallModel = &getModel('autoinstall');
+
+			$module_list = $oModuleModel->getModuleList();
+			if(is_array($module_list))
+			{
+				foreach($module_list as $key => $val) {
+					$module_list[$key]->delete_url = $oAutoinstallModel->getRemoveUrlByPath($val->path);
+
+					// get easyinstall need update
+					$packageSrl = $oAutoinstallModel->getPackageSrlByPath($val->path);
+					$package = $oAutoinstallModel->getInstalledPackages($packageSrl);
+					$module_list[$key]->need_autoinstall_update = $package[$packageSrl]->need_update;
+
+					// get easyinstall update url
+					if ($module_list[$key]->need_autoinstall_update == 'Y')
+					{
+						$module_list[$key]->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
+					}
+				}
+			}
+
+			$output = $oAdminModel->getFavoriteList('0');
+
+			$favoriteList = $output->get('favoriteList');
+			$favoriteModuleList = array();
+			if ($favoriteList){
+				foreach($favoriteList as $favorite => $favorite_info){
+					$favoriteModuleList[] = $favorite_info->module;
+				}
+			}
+
+            Context::set('favoriteModuleList', $favoriteModuleList);
+			Context::set('module_list', $module_list);
+
+			$security = new Security();
+			$security->encodeHTML('module_list....');
+
+            // Set a template file
+            $this->setTemplateFile('module_list');
+
+        }
+
+        /**
+         * @brief Pop-up details of the module (conf/info.xml)
+         **/
+        function dispModuleAdminInfo() {
+            // Obtain a list of modules
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoXml(Context::get('selected_module'));
+            Context::set('module_info', $module_info);
+
+			$security = new Security();				
+			$security->encodeHTML('module_info...');
+
+			// Set the layout to be pop-up
+			$this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('module_info');
+        }
+
+        /**
+         * @brief Module Categories
+         **/
+        function dispModuleAdminCategory() {
+            $module_category_srl = Context::get('module_category_srl');
+
+            // Obtain a list of modules
+            $oModuleModel = &getModel('module');
+            // Display the category page if a category is selected
+			//Security
+			$security = new Security();				
+			
+            if($module_category_srl) {
+                $selected_category  = $oModuleModel->getModuleCategory($module_category_srl);
+                Context::set('selected_category', $selected_category);
+
+				//Security
+				$security->encodeHTML('selected_category.title');				
+
+				// Set a template file
+                $this->setTemplateFile('category_update_form');
+            // If not selected, display a list of categories
+            } else {
+                $category_list = $oModuleModel->getModuleCategories();
+                Context::set('category_list', $category_list);
+
+				//Security
+				$security->encodeHTML('category_list..title');
+
+				// Set a template file
+                $this->setTemplateFile('category_list');
+            }
+        }
+
+        /**
+         * @brief Feature to copy module
+         **/
+        function dispModuleAdminCopyModule() {
+            // Get a target module to copy
+            $module_srl = Context::get('module_srl');
+            // Get information of the module
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module', 'mid', 'browser_title');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            Context::set('module_info', $module_info);
+            // Set the layout to be pop-up
+			$this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('copy_module');
+        }
+
+        /**
+         * @brief Applying the default settings to all modules
+         **/
+        function dispModuleAdminModuleSetup() {
+            $module_srls = Context::get('module_srls');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
+            // Get a skin list of the module
+            $skin_list = $oModuleModel->getSkins('./modules/'.$module_info->module);
+            Context::set('skin_list',$skin_list);
+            // Get a layout list
+            $oLayoutMode = &getModel('layout');
+            $layout_list = $oLayoutMode->getLayoutList();
+            Context::set('layout_list', $layout_list);
+            // Get a list of module categories
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
+
+			$security = new Security();				
+			$security->encodeHTML('layout_list..title','layout_list..layout');
+			$security->encodeHTML('skin_list....');
+			$security->encodeHTML('module_category...');
+
+			// Set the layout to be pop-up
+			$this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('module_setup');
+        }
+
+        /**
+         * @brief Apply module addition settings to all modules
+         **/
+        function dispModuleAdminModuleAdditionSetup() {
+            $module_srls = Context::get('module_srls');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+            // pre-define variables because you can get contents from other module (call by reference)
+            $content = '';
+            // Call a trigger for additional settings
+            // Considering uses in the other modules, trigger name cen be publicly used
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'before', $content);
+            $output = ModuleHandler::triggerCall('module.dispAdditionSetup', 'after', $content);
+            Context::set('setup_content', $content);
+            // Set the layout to be pop-up
+			$this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('module_addition_setup');
+        }
+
+        /**
+         * @brief Applying module permission settings to all modules
+         **/
+        function dispModuleAdminModuleGrantSetup() {
+            $module_srls = Context::get('module_srls');
+
+            $modules = explode(',',$module_srls);
+            if(!count($modules)) if(!$module_srls) return new Object(-1,'msg_invalid_request');
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module', 'site_srl');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($modules[0], $columnList);
+            $xml_info = $oModuleModel->getModuleActionXml($module_info->module);
+            $source_grant_list = $xml_info->grant;
+            // Grant virtual permissions for access and manager
+            $grant_list->access->title = Context::getLang('grant_access');
+            $grant_list->access->default = 'guest';
+            if(count($source_grant_list)) {
+                foreach($source_grant_list as $key => $val) {
+                    if(!$val->default) $val->default = 'guest';
+                    if($val->default == 'root') $val->default = 'manager';
+                    $grant_list->{$key} = $val;
+                }
+            }
+            $grant_list->manager->title = Context::getLang('grant_manager');
+            $grant_list->manager->default = 'manager';
+            Context::set('grant_list', $grant_list);
+            // Get a list of groups
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($module_info->site_srl);
+            Context::set('group_list', $group_list);
+			$security = new Security();				
+			$security->encodeHTML('group_list..title');
+
+			// Set the layout to be pop-up
+			$this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('module_grant_setup');
+        }
+
+
+        /**
+         * @brief Language codes
+         **/
+        function dispModuleAdminLangcode() {
+            // Get the language file of the current site
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = (int)$site_module_info->site_srl;
+			$args->langCode = Context::get('lang_type');
+            $args->page = Context::get('page'); // /< Page
+            $args->list_count = 30; // /< the number of posts to display on a single page
+            $args->page_count = 5; // /< the number of pages that appear in the page navigation
+            $args->sort_index = 'name';
+            $args->order_type = 'asc';
+            $args->search_target = Context::get('search_target'); // /< search (title, contents ...)
+            $args->search_keyword = Context::get('search_keyword'); // /< keyword to search
+
+			$oModuleAdminModel = &getAdminModel('module');
+			$output = $oModuleAdminModel->getLangListByLangcode($args);
+
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('lang_code_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+			
+			if(Context::get('module') != 'admin')
+			{
+				$this->setLayoutPath('./common/tpl');
+				$this->setLayoutFile('popup_layout');
+			}
+            // Set a template file
+            $this->setTemplateFile('module_langcode');
+        }
+
+		function dispModuleAdminFileBox(){
+            $oModuleModel = &getModel('module');
+            $output = $oModuleModel->getModuleFileBoxList();
+			$page = Context::get('page');
+			$page = $page?$page:1;
+            Context::set('filebox_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+            Context::set('page', $page);
+            $this->setTemplateFile('adminFileBox');
+		}
+    }
+?>
diff --git a/modules/module/module.class.php b/modules/module/module.class.php
index c8809298f..af71a70ae 100644
--- a/modules/module/module.class.php
+++ b/modules/module/module.class.php
@@ -1,367 +1,357 @@
-<?php
-    /**
-     * @class  module
-     * @author NHN (developers@xpressengine.com)
-     * @brief  module 모듈의 high class
-     **/
-
-    class module extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            $oDB = &DB::getInstance();
-            $oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
-			$oDB->addIndex('sites','unique_domain',array('domain'),true);
-
-            // module 모듈에서 사용할 디렉토리 생성
-            FileHandler::makeDir('./files/cache/module_info');
-            FileHandler::makeDir('./files/cache/triggers');
-
-            // sites 테이블에 기본 사이트 정보 입력
-            $args->site_srl = 0;
-            $output = $oDB->executeQuery('module.getSite', $args);
-            if(!$output->data || !$output->data->index_module_srl) {
-                $db_info = Context::getDBInfo();
-                $domain = Context::getDefaultUrl();
-                $url_info = parse_url($domain);
-                $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
-                $site_args->site_srl = 0;
-                $site_args->index_module_srl  = 0;
-                $site_args->domain = $domain;
-                $site_args->default_language = $db_info->lang_type;
-
-                $output = executeQuery('module.insertSite', $site_args);
-                if(!$output->toBool()) return $output;
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-
-            // 2008. 10. 27 module_part_config 테이블의 결합 인덱스 추가
-            if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
-
-            // 2008. 11. 13 modules 의 mid를 unique를 없애고 site_srl을 추가 후에 site_srl + mid unique index
-            if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
-
-            // 모든 모듈의 권한/스킨정보를 grants 테이블로 이전시키는 업데이트
-            if($oDB->isColumnExists('modules', 'grants')) return true;
-
-            // 모든 모듈의 권한/스킨정보를 grants 테이블로 이전시키는 업데이트
-            if(!$oDB->isColumnExists('sites', 'default_language')) return true;
-
-            // extra_vars* 컬럼 제거
-            for($i=1;$i<=20;$i++) {
-                if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
-            }
-
-            // sites 테이블에 기본 사이트 정보 입력
-            $args->site_srl = 0;
-            $output = $oDB->executeQuery('module.getSite', $args);
-            if(!$output->data) return true;
-
-			// sites 테이블에서 도메인이 인덱스로 걸린경우
-            if($oDB->isIndexExists('sites', 'idx_domain')) return true;
-			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
-
-			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
-			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
-			if(!$oDB->isColumnExists("modules", "mskin")) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-
-            // 2008. 10. 27 module_part_config 테이블의 결합 인덱스 추가하고 기존에 module_config에 몰려 있던 모든 정보를 재점검
-            if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) {
-                $oModuleModel = &getModel('module');
-                $oModuleController = &getController('module');
-                $modules = $oModuleModel->getModuleList();
-                foreach($modules as $key => $module_info) {
-                    $module = $module_info->module;
-                    if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
-                    $config = $oModuleModel->getModuleConfig($module);
-
-                    $module_config = null;
-                    switch($module) {
-                        case 'point' :
-                                $module_config = $config->module_point;
-                                unset($config->module_point);
-                            break;
-                        case 'trackback' :
-                        case 'rss' :
-                        case 'file' :
-                        case 'comment' :
-                        case 'editor' :
-                                $module_config = $config->module_config;
-                                unset($config->module_config);
-                                if(is_array($module_config) && count($module_config)) {
-                                    foreach($module_config as $key => $val) {
-                                        if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
-                                    }
-                                }
-                            break;
-                        case 'layout' :
-                                $tmp = $config->header_script;
-                                if(is_array($tmp) && count($tmp)) {
-                                    foreach($tmp as $k => $v) {
-                                        if(!$v && !trim($v)) continue;
-                                        $module_config[$k]->header_script = $v;
-                                    }
-                                }
-                                $config = null;
-                            break;
-
-                    }
-
-                    $oModuleController->insertModuleConfig($module, $config);
-
-                    if(is_array($module_config) && count($module_config)) {
-                        foreach($module_config as $module_srl => $module_part_config) {
-                            $oModuleController->insertModulePartConfig($module,$module_srl,$module_part_config);
-                        }
-                    }
-                }
-                $oDB->addIndex("module_part_config","idx_module_part_config", array("module","module_srl"));
-            }
-
-            // 2008. 11. 13 modules 의 mid를 unique를 없애고 site_srl을 추가 후에 site_srl + mid unique index
-            if(!$oDB->isIndexExists('modules',"idx_site_mid")) {
-                $oDB->dropIndex("modules","unique_mid",true);
-                $oDB->addColumn('modules','site_srl','number',11,0,true);
-                $oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
-            }
-
-            // document 확장변수의 확장을 위한 처리
-            if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
-
-            if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
-
-            // 모든 모듈의 권한, 스킨정보, 확장정보, 관리자 아이디를 grants 테이블로 이전시키는 업데이트
-            if($oDB->isColumnExists('modules', 'grants')) {
-                $oModuleController = &getController('module');
-                $oDocumentController = &getController('document');
-
-                // 현재 시스템 언어 코드값을 가져옴
-                $lang_code = Context::getLangType();
-
-                // 모든 모듈의 module_info를 가져옴
-                $output = executeQueryArray('module.getModuleInfos');
-                if(count($output->data)) {
-                    foreach($output->data as $module_info) {
-                        // 모듈들의 권한/ 확장변수(게시글 확장 포함)/ 스킨 변수/ 최고관리권한 정보 분리
-                        $module_srl = trim($module_info->module_srl);
-
-                        // 권한 등록
-                        $grants = unserialize($module_info->grants);
-                        if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
-
-                        // 스킨 변수 등록
-                        $skin_vars = unserialize($module_info->skin_vars);
-                        if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
-
-                        // 최고 관리자 아이디 등록
-                        $admin_id = trim($module_info->admin_id);
-                        if($admin_id && $admin_id != 'Array') {
-                            $admin_ids = explode(',',$admin_id);
-                            if(count($admin_id)) {
-                                foreach($admin_ids as $admin_id) {
-                                    $oModuleController->insertAdminId($module_srl, $admin_id);
-                                }
-                            }
-                        }
-
-                        // 모듈별 추가 설정 저장 (기본 modules에 없던 컬럼 데이터)
-                        $extra_vars = unserialize($module_info->extra_vars);
-                        $document_extra_keys = null;
-                        if($extra_vars->extra_vars && count($extra_vars->extra_vars)) {
-                            $document_extra_keys = $extra_vars->extra_vars;
-                            unset($extra_vars->extra_vars);
-                        }
-                        if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
-
-                        /**
-                         * 게시글 확장변수 이동 (documents모듈에서 해야 하지만 modules 테이블의 추가 변수들이 정리되기에 여기서 함)
-                         **/
-                        // 플래닛모듈의 경우 직접 추가 변수 입력
-                        if($module_info->module == 'planet') {
-                            if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
-                            $planet_extra_keys->name = 'postscript';
-                            $planet_extra_keys->type = 'text';
-                            $planet_extra_keys->is_required = 'N';
-                            $planet_extra_keys->search = 'N';
-                            $planet_extra_keys->default = '';
-                            $planet_extra_keys->desc = '';
-                            $document_extra_keys[20] = $planet_extra_keys;
-                        }
-
-                        // 게시글 확장변수 키 등록
-                        if(count($document_extra_keys)) {
-                            foreach($document_extra_keys as $var_idx => $val) {
-                                $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
-                            }
-
-                            // 2009-04-14 #17923809 게시물 100개의 확장 변수만 이전되는 문제점 수정
-                            $oDocumentModel = &getModel('document');
-                            $total_count = $oDocumentModel->getDocumentCount($module_srl);
-
-                            if ($total_count > 0) {
-                                $per_page = 100;
-                                $total_pages = (int) (($total_count - 1) / $per_page) + 1;
-
-                                // 확장변수가 존재하면 확장변수 가져오기
-                                $doc_args = null;
-                                $doc_args->module_srl = $module_srl;
-                                $doc_args->list_count = $per_page;
-                                $doc_args->sort_index = 'list_order';
-                                $doc_args->order_type = 'asc';
-
-                                for ($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++) {
-                                    $output = executeQueryArray('document.getDocumentList', $doc_args);
-
-                                    if ($output->toBool() && $output->data && count($output->data)) {
-                                        foreach ($output->data as $document) {
-                                            if (!$document) continue;
-                                            foreach ($document as $key => $var) {
-                                                if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
-                                                $var_idx = str_replace('extra_vars','',$key);
-                                                $oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
-                                            }
-                                        }
-                                    }
-                                } // for total_pages
-                            } // if count
-                        }
-
-                        // 해당 모듈들의 추가 변수들 제거
-                        $module_info->grant = null;
-                        $module_info->extra_vars = null;
-                        $module_info->skin_vars = null;
-                        $module_info->admin_id = null;
-                        executeQuery('module.updateModule', $module_info);
-                    }
-                }
-
-                // 각종 column drop
-                $oDB->dropColumn('modules','grants');
-                $oDB->dropColumn('modules','admin_id');
-                $oDB->dropColumn('modules','skin_vars');
-                $oDB->dropColumn('modules','extra_vars');
-            }
-
-            // 모든 모듈의 권한/스킨정보를 grants 테이블로 이전시키는 업데이트
-            if(!$oDB->isColumnExists('sites', 'default_language')) {
-                $oDB->addColumn('sites','default_language','varchar',255,0,false);
-            }
-
-            // extra_vars* 컬럼 제거
-            for($i=1;$i<=20;$i++) {
-                if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
-                $oDB->dropColumn('documents','extra_vars'.$i);
-            }
-
-            // sites 테이블에 기본 사이트 정보 입력
-            $args->site_srl = 0;
-            $output = $oDB->executeQuery('module.getSite', $args);
-            if(!$output->data) {
-                // 기본 mid, 언어 구함
-                $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
-                $db_info = Context::getDBInfo();
-                $domain = Context::getDefaultUrl();
-                $url_info = parse_url($domain);
-                $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
-                $site_args->site_srl = 0;
-                $site_args->index_module_srl  = $mid_output->data->module_srl;
-                $site_args->domain = $domain;
-                $site_args->default_language = $db_info->lang_type;
-
-				$output = executeQuery('module.insertSite', $site_args);
-				if(!$output->toBool()) return $output;
-			}
-
-            if($oDB->isIndexExists('sites','idx_domain')){
-                $oDB->dropIndex('sites','idx_domain');
-            }
-            if(!$oDB->isIndexExists('sites','unique_domain')){
-                $this->updateForUniqueSiteDomain();
-                $oDB->addIndex('sites','unique_domain',array('domain'),true);
-            }
-
-			if(!$oDB->isColumnExists("modules", "use_mobile")) {
-				$oDB->addColumn('modules','use_mobile','char',1,'N');
-			}
-			if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
-				$oDB->addColumn('modules','mlayout_srl','number',11, 0);
-			}
-			if(!$oDB->isColumnExists("modules", "mcontent")) {
-				$oDB->addColumn('modules','mcontent','bigtext');
-			}
-			if(!$oDB->isColumnExists("modules", "mskin")) {
-				$oDB->addColumn('modules','mskin','varchar',250);
-			}
-
-            return new Object(0, 'success_updated');
-        }
-
-        function updateForUniqueSiteDomain()
-        {
-            $output = executeQueryArray("module.getNonuniqueDomains");
-            if(!$output->data) return;
-            foreach($output->data as $data)
-            {
-                if($data->count == 1) continue;
-                $domain = $data->domain;
-                $args = null;
-                $args->domain = $domain;
-                $output2 = executeQueryArray("module.getSiteByDomain", $args);
-                $bFirst = true;
-                foreach($output2->data as $site)
-                {
-                    if($bFirst) 
-                    {
-                        $bFirst = false;
-                        continue;
-                    }
-                    $domain .= "_";
-                    $args = null;
-                    $args->domain = $domain;
-                    $args->site_srl = $site->site_srl;
-                    $output3 = executeQuery("module.updateSite", $args);
-                }
-            }
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 모듈 정보 캐시 파일 모두 삭제
-            FileHandler::removeFilesInDir("./files/cache/module_info");
-
-            // 트리거 정보가 있는 파일 모두 삭제
-            FileHandler::removeFilesInDir("./files/cache/triggers");
-
-            // DB캐시 파일을 모두 삭제
-            FileHandler::removeFilesInDir("./files/cache/db");
-
-            // 기타 캐시 삭제
-            FileHandler::removeDir("./files/cache/tmp");
-        }
-    }
-?>
+<?php
+    /**
+     * @class  module
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the module module
+     **/
+
+    class module extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+
+            $oDB = &DB::getInstance();
+            $oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"), true);
+			$oDB->addIndex('sites','unique_domain',array('domain'),true);
+            // Create a directory to use in the module module
+            FileHandler::makeDir('./files/cache/module_info');
+            FileHandler::makeDir('./files/cache/triggers');
+			FileHandler::makeDir('./files/ruleset');
+            // Insert site information into the sites table
+            $args->site_srl = 0;
+            $output = $oDB->executeQuery('module.getSite', $args);
+            if(!$output->data || !$output->data->index_module_srl) {
+                $db_info = Context::getDBInfo();
+                $domain = Context::getDefaultUrl();
+                $url_info = parse_url($domain);
+                $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+                $site_args->site_srl = 0;
+                $site_args->index_module_srl  = 0;
+                $site_args->domain = $domain;
+                $site_args->default_language = $db_info->lang_type;
+
+                $output = executeQuery('module.insertSite', $site_args);
+                if(!$output->toBool()) return $output;
+            }
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            // 2008. 10. 27 Add multi-index in the table, the module_part_config
+            if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) return true;
+            // 2008. 11. 13 Delete unique constraint on mid in modules. Add site_srl and then create unique index on site_srl and mid
+            if(!$oDB->isIndexExists('modules',"idx_site_mid")) return true;
+            // Move permissions/skin information of all modules to the table, grants.
+            if($oDB->isColumnExists('modules', 'grants')) return true;
+            // Move permissions/skin information of all modules to the table, grants.
+            if(!$oDB->isColumnExists('sites', 'default_language')) return true;
+            // Delete extra_vars* column
+            for($i=1;$i<=20;$i++) {
+                if($oDB->isColumnExists("documents","extra_vars".$i)) return true;
+            }
+            // Insert site information to the table, sites
+            $args->site_srl = 0;
+            $output = $oDB->executeQuery('module.getSite', $args);
+            if(!$output->data) return true;
+
+			// If domain index is defined on the table, sites
+            if($oDB->isIndexExists('sites', 'idx_domain')) return true;
+			if(!$oDB->isIndexExists('sites','unique_domain')) return true;
+
+			if(!$oDB->isColumnExists("modules", "use_mobile")) return true;
+			if(!$oDB->isColumnExists("modules", "mlayout_srl")) return true;
+			if(!$oDB->isColumnExists("modules", "mcontent")) return true;
+			if(!$oDB->isColumnExists("modules", "mskin")) return true;
+
+			// check fix skin
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")) return true;
+			
+			if(!$oDB->isColumnExists("module_config", "site_srl")) return true;
+
+			if(!is_dir('./files/ruleset')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            // 2008. 10. 27 module_part_config Add a multi-index to the table and check all information of module_configg
+            if(!$oDB->isIndexExists("module_part_config","idx_module_part_config")) {
+                $oModuleModel = &getModel('module');
+                $oModuleController = &getController('module');
+                $modules = $oModuleModel->getModuleList();
+                foreach($modules as $key => $module_info) {
+                    $module = $module_info->module;
+                    if(!in_array($module, array('point','trackback','layout','rss','file','comment','editor'))) continue;
+                    $config = $oModuleModel->getModuleConfig($module);
+
+                    $module_config = null;
+                    switch($module) {
+                        case 'point' :
+                                $module_config = $config->module_point;
+                                unset($config->module_point);
+                            break;
+                        case 'trackback' :
+                        case 'rss' :
+                        case 'file' :
+                        case 'comment' :
+                        case 'editor' :
+                                $module_config = $config->module_config;
+                                unset($config->module_config);
+                                if(is_array($module_config) && count($module_config)) {
+                                    foreach($module_config as $key => $val) {
+                                        if(isset($module_config[$key]->module_srl)) unset($module_config[$key]->module_srl);
+                                    }
+                                }
+                            break;
+                        case 'layout' :
+                                $tmp = $config->header_script;
+                                if(is_array($tmp) && count($tmp)) {
+                                    foreach($tmp as $k => $v) {
+                                        if(!$v && !trim($v)) continue;
+                                        $module_config[$k]->header_script = $v;
+                                    }
+                                }
+                                $config = null;
+                            break;
+
+                    }
+
+                    $oModuleController->insertModuleConfig($module, $config);
+
+                    if(is_array($module_config) && count($module_config)) {
+                        foreach($module_config as $module_srl => $module_part_config) {
+                            $oModuleController->insertModulePartConfig($module,$module_srl,$module_part_config);
+                        }
+                    }
+                }
+                $oDB->addIndex("module_part_config","idx_module_part_config", array("module","module_srl"));
+            }
+            // 2008. 11. 13 drop index(unique_mid). Add a column and index on site_srl and mid columns
+            if(!$oDB->isIndexExists('modules',"idx_site_mid")) {
+                $oDB->dropIndex("modules","unique_mid",true);
+                $oDB->addColumn('modules','site_srl','number',11,0,true);
+                $oDB->addIndex("modules","idx_site_mid", array("site_srl","mid"),true);
+            }
+            // document extra vars
+            if(!$oDB->isTableExists('document_extra_vars')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_vars.xml');
+
+            if(!$oDB->isTableExists('document_extra_keys')) $oDB->createTableByXmlFile('./modules/document/schemas/document_extra_keys.xml');
+            // Move permission, skin info, extection info, admin ID of all modules to the table, grants
+            if($oDB->isColumnExists('modules', 'grants')) {
+                $oModuleController = &getController('module');
+                $oDocumentController = &getController('document');
+                // Get a value of the current system language code
+                $lang_code = Context::getLangType();
+                // Get module_info of all modules
+                $output = executeQueryArray('module.getModuleInfos');
+                if(count($output->data)) {
+                    foreach($output->data as $module_info) {
+                        // Separate information about permission granted to the module, extra vars, skin vars, super-admin's authority
+                        $module_srl = trim($module_info->module_srl);
+                        // grant an authority
+                        $grants = unserialize($module_info->grants);
+                        if($grants) $oModuleController->insertModuleGrants($module_srl, $grants);
+                        // Insert skin vars
+                        $skin_vars = unserialize($module_info->skin_vars);
+                        if($skin_vars) $oModuleController->insertModuleSkinVars($module_srl, $skin_vars);
+                        // Insert super admin's ID
+                        $admin_id = trim($module_info->admin_id);
+                        if($admin_id && $admin_id != 'Array') {
+                            $admin_ids = explode(',',$admin_id);
+                            if(count($admin_id)) {
+                                foreach($admin_ids as $admin_id) {
+                                    $oModuleController->insertAdminId($module_srl, $admin_id);
+                                }
+                            }
+                        }
+                        // Save extra configurations for each module(column data which doesn't exist in the defaut modules)
+                        $extra_vars = unserialize($module_info->extra_vars);
+                        $document_extra_keys = null;
+                        if($extra_vars->extra_vars && count($extra_vars->extra_vars)) {
+                            $document_extra_keys = $extra_vars->extra_vars;
+                            unset($extra_vars->extra_vars);
+                        }
+                        if($extra_vars) $oModuleController->insertModuleExtraVars($module_srl, $extra_vars);
+
+                        /**
+                         * Move document extra vars(it should have conducted in the documents module however extra vars in modules table should be listed up in this module)
+                         **/
+                        // Insert extra vars if planet module is
+                        if($module_info->module == 'planet') {
+                            if(!$document_extra_keys || !is_array($document_extra_keys)) $document_extra_keys = array();
+                            $planet_extra_keys->name = 'postscript';
+                            $planet_extra_keys->type = 'text';
+                            $planet_extra_keys->is_required = 'N';
+                            $planet_extra_keys->search = 'N';
+                            $planet_extra_keys->default = '';
+                            $planet_extra_keys->desc = '';
+                            $document_extra_keys[20] = $planet_extra_keys;
+                        }
+                        // Register keys for document extra vars
+                        if(count($document_extra_keys)) {
+                            foreach($document_extra_keys as $var_idx => $val) {
+                                $oDocumentController->insertDocumentExtraKey($module_srl, $var_idx, $val->name, $val->type, $val->is_required, $val->search, $val->default, $val->desc, 'extra_vars'.$var_idx);
+                            }
+                            // 2009-04-14 Fixed a bug that only 100 extra vars are moved
+                            $oDocumentModel = &getModel('document');
+                            $total_count = $oDocumentModel->getDocumentCount($module_srl);
+
+                            if ($total_count > 0) {
+                                $per_page = 100;
+                                $total_pages = (int) (($total_count - 1) / $per_page) + 1;
+                                // Get extra vars if exist
+                                $doc_args = null;
+                                $doc_args->module_srl = $module_srl;
+                                $doc_args->list_count = $per_page;
+                                $doc_args->sort_index = 'list_order';
+                                $doc_args->order_type = 'asc';
+
+                                for ($doc_args->page = 1; $doc_args->page <= $total_pages; $doc_args->page++) {
+                                    $output = executeQueryArray('document.getDocumentList', $doc_args);
+
+                                    if ($output->toBool() && $output->data && count($output->data)) {
+                                        foreach ($output->data as $document) {
+                                            if (!$document) continue;
+                                            foreach ($document as $key => $var) {
+                                                if (strpos($key, 'extra_vars') !== 0 || !trim($var) || $var == 'N;') continue;
+                                                $var_idx = str_replace('extra_vars','',$key);
+                                                $oDocumentController->insertDocumentExtraVar($module_srl, $document->document_srl, $var_idx, $var, 'extra_vars'.$var_idx, $lang_code);
+                                            }
+                                        }
+                                    }
+                                } // for total_pages
+                            } // if count
+                        }
+                        // Additional variables of the module, remove
+                        $module_info->grant = null;
+                        $module_info->extra_vars = null;
+                        $module_info->skin_vars = null;
+                        $module_info->admin_id = null;
+                        executeQuery('module.updateModule', $module_info);
+                    }
+                }
+                // Various column drop
+                $oDB->dropColumn('modules','grants');
+                $oDB->dropColumn('modules','admin_id');
+                $oDB->dropColumn('modules','skin_vars');
+                $oDB->dropColumn('modules','extra_vars');
+            }
+            // Rights of all modules/skins transferring the information into a table Update grants
+            if(!$oDB->isColumnExists('sites', 'default_language')) {
+                $oDB->addColumn('sites','default_language','varchar',255,0,false);
+            }
+            // extra_vars * Remove Column
+            for($i=1;$i<=20;$i++) {
+                if(!$oDB->isColumnExists("documents","extra_vars".$i)) continue;
+                $oDB->dropColumn('documents','extra_vars'.$i);
+            }
+            // Enter the main site information sites on the table
+            $args->site_srl = 0;
+            $output = $oDB->executeQuery('module.getSite', $args);
+            if(!$output->data) {
+                // Basic mid, language Wanted
+                $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
+                $db_info = Context::getDBInfo();
+                $domain = Context::getDefaultUrl();
+                $url_info = parse_url($domain);
+                $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+                $site_args->site_srl = 0;
+                $site_args->index_module_srl  = $mid_output->data->module_srl;
+                $site_args->domain = $domain;
+                $site_args->default_language = $db_info->lang_type;
+
+				$output = executeQuery('module.insertSite', $site_args);
+				if(!$output->toBool()) return $output;
+			}
+
+            if($oDB->isIndexExists('sites','idx_domain')){
+                $oDB->dropIndex('sites','idx_domain');
+            }
+            if(!$oDB->isIndexExists('sites','unique_domain')){
+                $this->updateForUniqueSiteDomain();
+                $oDB->addIndex('sites','unique_domain',array('domain'),true);
+            }
+
+			if(!$oDB->isColumnExists("modules", "use_mobile")) {
+				$oDB->addColumn('modules','use_mobile','char',1,'N');
+			}
+			if(!$oDB->isColumnExists("modules", "mlayout_srl")) {
+				$oDB->addColumn('modules','mlayout_srl','number',11, 0);
+			}
+			if(!$oDB->isColumnExists("modules", "mcontent")) {
+				$oDB->addColumn('modules','mcontent','bigtext');
+			}
+			if(!$oDB->isColumnExists("modules", "mskin")) {
+				$oDB->addColumn('modules','mskin','varchar',250);
+			}
+			if(!$oDB->isColumnExists("modules", "is_skin_fix")){
+				$oDB->addColumn('modules', 'is_skin_fix', 'char', 1, 'N');
+				$output = executeQueryArray('module.getAllSkinSetModule');
+				if ($output->toBool() && $output->data){
+					$module_srls = array();
+					foreach($output->data as $val){
+						$module_srls[] = $val->module_srl;
+					}
+					unset($args);
+					$args->module_srls = implode(',', $module_srls);
+					$args->is_skin_fix = 'Y';
+					$output = executeQuery('module.updateSkinFixModules', $args);
+				}
+			}
+			if(!$oDB->isColumnExists("module_config", "site_srl")){
+				$oDB->addColumn('module_config', 'site_srl', 'number', 11, 0, true);
+			}
+			FileHandler::makeDir('./files/ruleset');
+            return new Object(0, 'success_updated');
+        }
+
+        function updateForUniqueSiteDomain()
+        {
+            $output = executeQueryArray("module.getNonuniqueDomains");
+            if(!$output->data) return;
+            foreach($output->data as $data)
+            {
+                if($data->count == 1) continue;
+                $domain = $data->domain;
+                $args = null;
+                $args->domain = $domain;
+                $output2 = executeQueryArray("module.getSiteByDomain", $args);
+                $bFirst = true;
+                foreach($output2->data as $site)
+                {
+                    if($bFirst) 
+                    {
+                        $bFirst = false;
+                        continue;
+                    }
+                    $domain .= "_";
+                    $args = null;
+                    $args->domain = $domain;
+                    $args->site_srl = $site->site_srl;
+                    $output3 = executeQuery("module.updateSite", $args);
+                }
+            }
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+			$oModuleModel = &getModel('module');
+			$oModuleModel->getModuleList();
+        }
+    }
+?>
diff --git a/modules/module/module.controller.php b/modules/module/module.controller.php
index 5c367b229..f78d34164 100644
--- a/modules/module/module.controller.php
+++ b/modules/module/module.controller.php
@@ -1,757 +1,892 @@
-<?php
-    /**
-     * @class  moduleController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  module 모듈의 controller class
-     **/
-
-    class moduleController extends module {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief action forward 추가
-         * action foward는 등록된 action이 요청된 모듈에 없을 경우 찾아서 포워딩을 하는 구조이다
-         * 모듈의 설치시에 사용된다.
-         **/
-        function insertActionForward($module, $type, $act) {
-            $args->module = $module;
-            $args->type = $type;
-            $args->act = $act;
-
-            $output = executeQuery('module.insertActionForward', $args);
-            return $output;
-        }
-
-        /**
-         * @brief action forward 삭제
-         **/
-        function deleteActionForward($module, $type, $act) {
-            $args->module = $module;
-            $args->type = $type;
-            $args->act = $act;
-
-            $output = executeQuery('module.deleteActionForward', $args);
-            return $output;
-        }
-
-        /**
-         * @brief module trigger 추가
-         * module trigger는 trigger 대상이 등록된 대상을 호출하는 방법이다.
-         *
-         **/
-        function insertTrigger($trigger_name, $module, $type, $called_method, $called_position) {
-            $args->trigger_name = $trigger_name;
-            $args->module = $module;
-            $args->type = $type;
-            $args->called_method = $called_method;
-            $args->called_position = $called_position;
-
-            $output = executeQuery('module.insertTrigger', $args);
-
-            // 트리거 정보가 있는 파일 모두 삭제
-            FileHandler::removeFilesInDir("./files/cache/triggers");
-
-            return $output;
-        }
-
-        /**
-         * @brief module trigger 삭제
-         *
-         **/
-        function deleteTrigger($trigger_name, $module, $type, $called_method, $called_position) {
-            $args->trigger_name = $trigger_name;
-            $args->module = $module;
-            $args->type = $type;
-            $args->called_method = $called_method;
-            $args->called_position = $called_position;
-
-            $output = executeQuery('module.deleteTrigger', $args);
-
-            // 트리거 캐시 삭제
-            FileHandler::removeFilesInDir('./files/cache/triggers');
-
-            return $output;
-        }
-
-        /**
-         * @brief module extend 추가
-         *
-         **/
-		function insertModuleExtend($parent_module, $extend_module, $type, $kind=''){
-			if($kind != 'admin') $kind = '';
-			if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
-			if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
-
-			$cache_file = './files/config/module_extend.php';
-			FileHandler::removeFile($cache_file);
-
-            $args->parent_module = $parent_module;
-            $args->extend_module = $extend_module;
-            $args->type = $type;
-            $args->kind = $kind;
-
-            $output = executeQuery('module.getModuleExtendCount', $args);
-			if($output->data->count>0) return false;
-
-            $output = executeQuery('module.insertModuleExtend', $args);
-			return $output;
-		}
-
-        /**
-         * @brief module extend 삭제
-         *
-         **/
-		function deleteModuleExtend($parent_module, $extend_module, $type, $kind=''){
-			$cache_file = './files/config/module_extend.php';
-			FileHandler::removeFile($cache_file);
-
-            $args->parent_module = $parent_module;
-            $args->extend_module = $extend_module;
-            $args->type = $type;
-            $args->kind = $kind;
-
-            $output = executeQuery('module.deleteModuleExtend', $args);
-
-			return $output;
-		}
-
-        /**
-         * @brief 특정 모듈의 설정 입력
-         * board, member등 특정 모듈의 global config 관리용
-         **/
-        function insertModuleConfig($module, $config) {
-            $args->module = $module;
-            $args->config = serialize($config);
-
-            $output = executeQuery('module.deleteModuleConfig', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('module.insertModuleConfig', $args);
-            return $output;
-        }
-
-        /**
-         * @brief 특정 mid의 모듈 설정 정보 저장
-         * mid의 모듈 의존적인 설정을 관리
-         **/
-        function insertModulePartConfig($module, $module_srl, $config) {
-            $args->module = $module;
-            $args->module_srl = $module_srl;
-            $args->config = serialize($config);
-
-            $output = executeQuery('module.deleteModulePartConfig', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('module.insertModulePartConfig', $args);
-            return $output;
-        }
-
-        /**
-         * @brief virtual site 생성
-         **/
-        function insertSite($domain, $index_module_srl) {
-            if(isSiteID($domain)) {
-                $oModuleModel = &getModel('module');
-                if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
-            }else{
-                $domain = strtolower($domain);
-            }
-            
-            $args->site_srl = getNextSequence();
-            $args->domain = preg_replace('/\/$/','',$domain);
-            $args->index_module_srl = $index_module_srl;
-            $args->default_language = Context::getLangType();
-            $output = executeQuery('module.getSiteInfoByDomain', $args);
-            if($output->data) return new Object(-1,'msg_already_registed_vid');
-
-            $output = executeQuery('module.insertSite', $args);
-            if(!$output->toBool()) return $output;
-
-            $output->add('site_srl', $args->site_srl);
-            return $output;
-        }
-
-        /**
-         * @brief virtual site 수정
-         **/
-        function updateSite($args) {
-            $oModuleModel = &getModel('module');
-            $site_info = $oModuleModel->getSiteInfo($args->site_srl);
-            if($site_info->domain != $args->domain) {
-                $info = $oModuleModel->getSiteInfoByDomain($args->domain);
-                if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
-                if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
-
-                if($args->domain && !isSiteID($args->domain)) {
-                    $args->domain = strtolower($args->domain);
-                }
-
-            }
-            $output = executeQuery('module.updateSite', $args);
-            return $output;
-        }
-
-        /**
-         * @brief 모듈 정보 정리
-         **/
-        function arrangeModuleInfo(&$args, &$extra_vars) {
-            // 불필요한 내용 제거
-            unset($args->body);
-            unset($args->act);
-            unset($args->page);
-
-            // mid값 검사
-            if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
-
-            // 변수를 검사 (modules의 기본 변수와 그렇지 않은 변수로 분리)
-            $extra_vars = clone($args);
-            unset($extra_vars->module_srl);
-            unset($extra_vars->module);
-            unset($extra_vars->module_category_srl);
-            unset($extra_vars->layout_srl);
-			unset($extra_vars->mlayout_srl);
-			unset($extra_vars->use_mobile);
-            unset($extra_vars->menu_srl);
-            unset($extra_vars->site_srl);
-            unset($extra_vars->mid);
-            unset($extra_vars->skin);
-			unset($extra_vars->mskin);
-            unset($extra_vars->browser_title);
-            unset($extra_vars->description);
-            unset($extra_vars->is_default);
-            unset($extra_vars->content);
-            unset($extra_vars->mcontent);
-            unset($extra_vars->open_rss);
-            unset($extra_vars->header_text);
-            unset($extra_vars->footer_text);
-            $args = delObjectVars($args, $extra_vars);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 모듈 입력
-         **/
-        function insertModule($args) {
-            $output = $this->arrangeModuleInfo($args, $extra_vars);
-            if(!$output->toBool()) return $output;
-
-            // 이미 존재하는 모듈 이름인지 체크
-            if(!$args->site_srl) $args->site_srl = 0;
-            $oModuleModel = &getModel('module');
-            if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
-
-            // begin transaction
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 선택된 스킨정보에서 colorset을 구함
-            $module_path = ModuleHandler::getModulePath($args->module);
-            $skin_info = $oModuleModel->loadSkinInfo($module_path, $args->skin);
-            $skin_vars->colorset = $skin_info->colorset[0]->name;
-
-            // 변수 정리후 query 실행
-            if(!$args->module_srl) $args->module_srl = getNextSequence();
-
-            // 모듈 등록
-            $output = executeQuery('module.insertModule', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 모듈 추가 변수 등록
-            $this->insertModuleExtraVars($args->module_srl, $extra_vars);
-
-            // commit
-            $oDB->commit();
-
-            $output->add('module_srl',$args->module_srl);
-            return $output;
-        }
-
-        /**
-         * @brief 모듈의 정보를 수정
-         **/
-        function updateModule($args) {
-            $output = $this->arrangeModuleInfo($args, $extra_vars);
-            if(!$output->toBool()) return $output;
-
-            // begin transaction
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-
-            $args->site_srl = (int)$module_info->site_srl;
-            if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
-
-            $output = executeQuery('module.isExistsModuleName', $args);
-            if(!$output->toBool() || $output->data->count) {
-                $oDB->rollback();
-                return new Object(-1, 'msg_module_name_exists');
-            }
-
-            $output = executeQuery('module.updateModule', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 모듈 추가 변수 등록
-            $this->insertModuleExtraVars($args->module_srl, $extra_vars);
-
-            $oDB->commit();
-
-            $output->add('module_srl',$args->module_srl);
-            return $output;
-        }
-
-        /**
-         * @brief 모듈의 가상사이트 변경
-         **/
-        function updateModuleSite($module_srl, $site_srl, $layout_srl = 0) {
-            $args->module_srl = $module_srl;
-            $args->site_srl = $site_srl;
-            $args->layout_srl = $layout_srl;
-            return executeQuery('module.updateModuleSite', $args);
-        }
-
-        /**
-         * @brief 모듈을 삭제
-         *
-         * 모듈 삭제시는 관련 정보들을 모두 삭제 시도한다.
-         **/
-        function deleteModule($module_srl) {
-            if(!$module_srl) return new Object(-1,'msg_invalid_request');
-
-            // trigger 호출 (before)
-            $trigger_obj->module_srl = $module_srl;
-            $output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
-            if(!$output->toBool()) return $output;
-
-            // begin transaction
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $args->module_srl = $module_srl;
-
-            // module 정보를 DB에서 삭제
-            $output = executeQuery('module.deleteModule', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 권한 정보 삭제
-            $this->deleteModuleGrants($module_srl);
-
-            // 스킨 정보 삭제
-            $this->deleteModuleSkinVars($module_srl);
-
-            // 모듈 추가 변수 삭제
-            $this->deleteModuleExtraVars($module_srl);
-
-            // 모듈 관리자 제거
-            $this->deleteAdminId($module_srl);
-
-            // trigger 호출 (after)
-            if($output->toBool()) {
-                $trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
-                if(!$trigger_output->toBool()) {
-                    $oDB->rollback();
-                    return $trigger_output;
-                }
-            }
-
-            // commit
-            $oDB->commit();
-
-            return $output;
-        }
-
-        /**
-         * @brief 모듈의 기타 정보를 변경
-         **/
-        function updateModuleSkinVars($module_srl, $skin_vars) {
-            // skin_vars 정보 세팅
-            $args->module_srl = $module_srl;
-            $args->skin_vars = $skin_vars;
-            $output = executeQuery('module.updateModuleSkinVars', $args);
-            if(!$output->toBool()) return $output;
-
-            return $output;
-        }
-
-        /**
-         * @brief 모든 모듈의 is_default값을 N 으로 세팅 (기본 모듈 해제)
-         **/
-        function clearDefaultModule() {
-            $output = executeQuery('module.clearDefaultModule');
-            if(!$output->toBool()) return $output;
-
-            return $output;
-        }
-
-        /**
-         * @brief 지정된 menu_srl에 속한 mid 의 menu_srl 을 변경
-         **/
-        function updateModuleMenu($args) {
-            return executeQuery('module.updateModuleMenu', $args);
-        }
-
-        /**
-         * @brief 지정된 menu_srl에 속한 mid 의 layout_srl을 변경
-         **/
-        function updateModuleLayout($layout_srl, $menu_srl_list) {
-            if(!count($menu_srl_list)) return;
-
-            $args->layout_srl = $layout_srl;
-            $args->menu_srls = implode(',',$menu_srl_list);
-            $output = executeQuery('module.updateModuleLayout', $args);
-            return $output;
-        }
-
-        /**
-         * @brief 사이트의 관리를 변경
-         **/
-        function insertSiteAdmin($site_srl, $arr_admins) {
-            // 사이트 관리자 제거
-            $args->site_srl = $site_srl;
-            $output = executeQuery('module.deleteSiteAdmin', $args);
-            if(!$output->toBool()) return $output;
-
-            // 관리자 대상 멤버 번호를 구함
-            if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
-            foreach($arr_admins as $key => $user_id) {
-                if(!trim($user_id)) continue;
-                $admins[] = trim($user_id);
-            }
-            if(!count($admins)) return new Object();
-
-            $args->user_ids = '\''.implode('\',\'',$admins).'\'';
-            $output = executeQueryArray('module.getAdminSrls', $args);
-            if(!$output->toBool()||!$output->data) return $output;
-
-            foreach($output->data as $key => $val) {
-                unset($args);
-                $args->site_srl = $site_srl;
-                $args->member_srl = $val->member_srl;
-                $output = executeQueryArray('module.insertSiteAdmin', $args);
-                if(!$output->toBool()) return $output;
-            }
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 모듈에 관리자 아이디 지정
-         **/
-        function insertAdminId($module_srl, $admin_id) {
-            $oMemberModel = &getModel('member');
-            $member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-            if(!$member_info->member_srl) return;
-            $args->module_srl = $module_srl;
-            $args->member_srl = $member_info->member_srl;
-            return executeQuery('module.insertAdminId', $args);
-        }
-
-        /**
-         * @brief 특정 모듈의 관리자 아이디 제거
-         **/
-        function deleteAdminId($module_srl, $admin_id = '') {
-            $args->module_srl = $module_srl;
-
-            if($admin_id) {
-                $oMemberModel = &getModel('member');
-                $member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
-                if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
-            }
-            return executeQuery('module.deleteAdminId', $args);
-        }
-
-        /**
-         * @brief 특정 모듈에 스킨 변수 등록
-         **/
-        function insertModuleSkinVars($module_srl, $obj) {
-            $this->deleteModuleSkinVars($module_srl);
-            if(!$obj || !count($obj)) return;
-
-            $args->module_srl = $module_srl;
-            foreach($obj as $key => $val) {
-                // #17927989 예전 블로그 모듈을 사용하던 게시판의 경우
-                // 스킨 정보 필드에 메뉴 항목(stdClass)을 저장해놓은 경우가 있어
-                // 1.2.0 이상 버전으로 업그레이드한 후 모듈 업데이트할 때
-                // 오류가 발생하는 문제 수정
-                if (is_object($val)) continue;
-                if (is_array($val)) $val = serialize($val);
-
-                $args->name = trim($key);
-                $args->value = trim($val);
-                if(!$args->name || !$args->value) continue;
-                executeQuery('module.insertModuleSkinVars', $args);
-            }
-        }
-
-        /**
-         * @brief 특정 모듈의 스킨 변수 제거
-         **/
-        function deleteModuleSkinVars($module_srl) {
-            $args->module_srl = $module_srl;
-            return executeQuery('module.deleteModuleSkinVars', $args);
-        }
-
-        /**
-         * @brief 특정 모듈에 확장 변수 등록
-         **/
-        function insertModuleExtraVars($module_srl, $obj) {
-            $this->deleteModuleExtraVars($module_srl);
-            if(!$obj || !count($obj)) return;
-
-            foreach($obj as $key => $val) {
-                $args = null;
-                $args->module_srl = $module_srl;
-                $args->name = trim($key);
-                $args->value = trim($val);
-                if(!$args->name || !$args->value) continue;
-                executeQuery('module.insertModuleExtraVars', $args);
-            }
-        }
-
-        /**
-         * @brief 특정 모듈의 확장 변수 제거
-         **/
-        function deleteModuleExtraVars($module_srl) {
-            $args->module_srl = $module_srl;
-            return executeQuery('module.deleteModuleExtraVars', $args);
-        }
-
-        /**
-         * @brief 특정 모듈에 권한 등록
-         **/
-        function insertModuleGrants($module_srl, $obj) {
-            $this->deleteModuleGrants($module_srl);
-            if(!$obj || !count($obj)) return;
-
-            foreach($obj as $name => $val) {
-                if(!$val || !count($val)) continue;
-
-                foreach($val as $group_srl) {
-                    $args = null;
-                    $args->module_srl = $module_srl;
-                    $args->name = $name;
-                    $args->group_srl = trim($group_srl);
-                    if(!$args->name || !$args->group_srl) continue;
-                    executeQuery('module.insertModuleGrant', $args);
-
-                }
-            }
-        }
-
-        /**
-         * @brief 특정 모듈의 권한 제거
-         **/
-        function deleteModuleGrants($module_srl) {
-            $args->module_srl = $module_srl;
-            return executeQuery('module.deleteModuleGrants', $args);
-        }
-
-        /**
-         * @brief 사용자 정의 언어 변경
-         **/
-        function replaceDefinedLangCode(&$output) {
-            $output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
-        }
-        function _replaceLangCode($matches) {
-            static $lang = null;
-            if(is_null($lang)) {
-                $site_module_info = Context::get('site_module_info');
-                $cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
-                if(!file_exists($cache_file)) {
-                    $oModuleAdminController = &getAdminController('module');
-                    $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
-                }
-
-                if(file_exists($cache_file)) require_once($cache_file);
-            }
-            if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
-
-            return str_replace('$user_lang->','',$matches[0]);
-        }
-
-
-        /**
-         * @brief 파일박스에 파일 추가 및 업데이트
-         **/
-        function procModuleFileBoxAdd(){
-
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
-
-            $vars = Context::gets('comment','addfile','filter');
-            $module_filebox_srl = Context::get('module_filebox_srl');
-
-            $ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
-            $vars->ext = $ext;
-            if($vars->filter) $filter = explode(',',$vars->filter);
-            else $filter = array('jpg','jpeg','gif','png');
-            if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
-
-            $vars->member_srl = $logged_info->member_srl;
-
-            // update
-            if($module_filebox_srl > 0){
-                $vars->module_filebox_srl = $module_filebox_srl;
-                $output = $this->updateModuleFileBox($vars);
-
-            // insert
-            }else{
-                if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
-                $addfile = Context::get('addfile');
-                if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
-                if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
-                $output = $this->insertModuleFileBox($vars);
-            }
-
-            $url  = getUrl('','module','module','act','dispModuleFileBox','input',Context::get('input'),'filter',$vars->filter);
-            $url = html_entity_decode($url);
-            $vars = Context::set('url',$url);
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('move_filebox_list');
-        }
-
-
-        /**
-         * @brief 파일박스에 파일 업데이트
-         **/
-        function updateModuleFileBox($vars){
-
-            // have file
-            if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name'])){
-                $oModuleModel = &getModel('module');
-                $output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
-                FileHandler::removeFile($output->data->filename);
-
-                $path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
-                FileHandler::makeDir($path);
-
-                $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
-                $tmp = $vars->addfile['tmp_name'];
-
-                if(!@move_uploaded_file($tmp, $save_filename)) {
-                    return false;
-                }
-
-                $args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
-                $args->filename = $save_filename;
-                $args->filesize = $vars->addfile['size'];
-
-            }
-
-            $args->module_filebox_srl = $vars->module_filebox_srl;
-            $args->comment = $vars->comment;
-
-            return executeQuery('module.updateModuleFileBox', $vars);
-        }
-
-
-        /**
-         * @brief 파일박스에 파일 추가
-         **/
-        function insertModuleFileBox($vars){
-            // set module_filebox_srl
-            $vars->module_filebox_srl = getNextSequence();
-
-            // get file path
-            $oModuleModel = &getModel('module');
-            $path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
-            FileHandler::makeDir($path);
-            $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
-            $tmp = $vars->addfile['tmp_name'];
-
-            // upload
-            if(!@move_uploaded_file($tmp, $save_filename)) {
-                return false;
-            }
-
-
-            // insert
-            $args->module_filebox_srl = $vars->module_filebox_srl;
-            $args->member_srl = $vars->member_srl;
-            $args->comment = $vars->comment;
-            $args->filename = $save_filename;
-            $args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
-            $args->filesize = $vars->addfile['size'];
-
-            $output = executeQuery('module.insertModuleFileBox', $args);
-            return $output;
-        }
-
-
-        /**
-         * @brief 파일박스에 파일 삭제
-         **/
-
-        function procModuleFileBoxDelete(){
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
-
-            $module_filebox_srl = Context::get('module_filebox_srl');
-            if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
-            $vars->module_filebox_srl = $module_filebox_srl;
-            $output = $this->deleteModuleFileBox($vars);
-            if(!$output->toBool()) return $output;
-        }
-
-        function deleteModuleFileBox($vars){
-
-            // delete real file
-            $oModuleModel = &getModel('module');
-            $output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
-            FileHandler::removeFile($output->data->filename);
-
-            $args->module_filebox_srl = $vars->module_filebox_srl;
-            return executeQuery('module.deleteModuleFileBox', $args);
-        }
-
-        /**
-         * @brief function of locking (timeout is in seconds)
-         */
-        function lock($lock_name, $timeout, $member_srl = null) {
-            $this->unlockTimeoutPassed();
-            $args->lock_name = $lock_name;
-            if(!$timeout) $timeout = 60;
-            $args->deadline = date("YmdHis", time() + $timeout);
-            if($member_srl) $args->member_srl = $member_srl;
-            $output = executeQuery('module.insertLock', $args);
-            if($output->toBool()) {
-                $output->add('lock_name', $lock_name);
-                $output->add('deadline', $args->deadline);
-            }
-            return $output;
-        }
-
-        function unlockTimeoutPassed() {
-            executeQuery('module.deleteLocksTimeoutPassed');
-        }
-
-        function unlock($lock_name, $deadline) {
-            $args->lock_name = $lock_name;
-            $args->deadline = $deadline;
-            $output = executeQuery('module.deleteLock', $args);
-            return $output;
-        }
-
-		function updateModuleInSites($site_srls, $args)
-		{
-			$args->site_srls = $site_srls;
-			$output = executeQuery('module.updateModuleInSites', $args);
-			return $output;
-		}
-    }
-?>
+<?php
+    /**
+     * @class  moduleController
+     * @author NHN (developers@xpressengine.com)
+     * @brief controller class of the module module
+     **/
+
+    class moduleController extends module {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Add action forward
+         * Action forward finds and forwards if an action is not in the requested module
+         * This is used when installing a module
+         **/
+        function insertActionForward($module, $type, $act) {
+            $args->module = $module;
+            $args->type = $type;
+            $args->act = $act;
+
+            $output = executeQuery('module.insertActionForward', $args);
+            return $output;
+        }
+
+        /**
+         * @brief Delete action forward
+         **/
+        function deleteActionForward($module, $type, $act) {
+            $args->module = $module;
+            $args->type = $type;
+            $args->act = $act;
+
+            $output = executeQuery('module.deleteActionForward', $args);
+            return $output;
+        }
+
+        /**
+         * @brief Add module trigger
+         * module trigger is to call a trigger to a target module
+         *
+         **/
+        function insertTrigger($trigger_name, $module, $type, $called_method, $called_position) {
+            $args->trigger_name = $trigger_name;
+            $args->module = $module;
+            $args->type = $type;
+            $args->called_method = $called_method;
+            $args->called_position = $called_position;
+
+            $output = executeQuery('module.insertTrigger', $args);
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $cache_key = 'object:'.$trigger_name.'_'.$called_position;
+                $oCacheHandler->delete($cache_key);
+            }
+
+            // Delete all the files which contain trigger information
+            FileHandler::removeFilesInDir("./files/cache/triggers");
+
+            return $output;
+
+        }
+
+        /**
+         * @brief Delete module trigger
+         *
+         **/
+        function deleteTrigger($trigger_name, $module, $type, $called_method, $called_position) {
+            $args->trigger_name = $trigger_name;
+            $args->module = $module;
+            $args->type = $type;
+            $args->called_method = $called_method;
+            $args->called_position = $called_position;
+
+            $output = executeQuery('module.deleteTrigger', $args);
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $cache_key = 'object:'.$trigger_name.'_'.$called_position;
+                $oCacheHandler->delete($cache_key);
+            }
+
+            // Remove the trigger cache
+            FileHandler::removeFilesInDir('./files/cache/triggers');
+
+            return $output;
+        }
+
+        /**
+         * @brief Add module extend
+         *
+         **/
+		function insertModuleExtend($parent_module, $extend_module, $type, $kind=''){
+			if($kind != 'admin') $kind = '';
+			if(!in_array($type,array('model','controller','view','api','mobile'))) return false;
+			if(in_array($parent_module, array('module','addon','widget','layout'))) return false;
+
+			$cache_file = './files/config/module_extend.php';
+			FileHandler::removeFile($cache_file);
+
+            $args->parent_module = $parent_module;
+            $args->extend_module = $extend_module;
+            $args->type = $type;
+            $args->kind = $kind;
+
+            $output = executeQuery('module.getModuleExtendCount', $args);
+			if($output->data->count>0) return false;
+
+            $output = executeQuery('module.insertModuleExtend', $args);
+			return $output;
+		}
+
+        /**
+         * @brief Delete module extend
+         *
+         **/
+		function deleteModuleExtend($parent_module, $extend_module, $type, $kind=''){
+			$cache_file = './files/config/module_extend.php';
+			FileHandler::removeFile($cache_file);
+
+            $args->parent_module = $parent_module;
+            $args->extend_module = $extend_module;
+            $args->type = $type;
+            $args->kind = $kind;
+
+            $output = executeQuery('module.deleteModuleExtend', $args);
+
+			return $output;
+		}
+
+
+		function updateModuleConfig($module, $config, $site_srl = 0){
+			$args->module = $module;
+			$args->site_srl = $site_srl;
+
+			$oModuleModel = &getModel('module');
+			$origin_config = $oModuleModel->getModuleConfig($module, $site_srl);
+
+			foreach($config as $key => $val){
+				$origin_config->{$key} = $val;
+			}
+
+			return $this->insertModuleConfig($module, $origin_config, $site_srl);
+                        //remove from cache
+                        $oCacheHandler = &CacheHandler::getInstance('object');
+                        if($oCacheHandler->isSupport())
+                        {
+                            $cache_key = 'object:module_config:module_'.$module.'_site_srl_'.$site_srl;
+                            $oCacheHandler->delete($cache_key);
+                        }
+		}
+
+        /**
+         * @brief Enter a specific set of modules
+         * In order to manage global configurations of modules such as board, member and so on
+         **/
+        function insertModuleConfig($module, $config, $site_srl = 0) {
+            $args->module = $module;
+            $args->config = serialize($config);
+			$args->site_srl = $site_srl;
+
+            $output = executeQuery('module.deleteModuleConfig', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('module.insertModuleConfig', $args);
+            return $output;
+        }
+
+        /**
+         * @brief Save module configurations of the mid
+         * Manage mid configurations depending on module
+         **/
+        function insertModulePartConfig($module, $module_srl, $config) {
+            $args->module = $module;
+            $args->module_srl = $module_srl;
+            $args->config = serialize($config);
+
+            $output = executeQuery('module.deleteModulePartConfig', $args);
+            if(!$output->toBool()) return $output;
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $cache_key = 'object_module_part_config:'.$module.'_'.$module_srl;
+                $oCacheHandler->delete($cache_key);
+            }
+
+            $output = executeQuery('module.insertModulePartConfig', $args);
+
+
+
+            return $output;
+        }
+
+        /**
+         * @brief create virtual site
+         **/
+        function insertSite($domain, $index_module_srl) {
+            if(isSiteID($domain)) {
+                $oModuleModel = &getModel('module');
+                if($oModuleModel->isIDExists($domain, 0)) return new Object(-1,'msg_already_registed_vid');
+            }else{
+                $domain = strtolower($domain);
+            }
+
+            $args->site_srl = getNextSequence();
+            $args->domain = preg_replace('/\/$/','',$domain);
+            $args->index_module_srl = $index_module_srl;
+            $args->default_language = Context::getLangType();
+
+			$columnList = array('modules.site_srl');
+            $oModuleModel = &getModel('module');
+			$output = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
+            if($output) return new Object(-1,'msg_already_registed_vid');
+
+            $output = executeQuery('module.insertSite', $args);
+            if(!$output->toBool()) return $output;
+
+            $output->add('site_srl', $args->site_srl);
+            return $output;
+        }
+
+        /**
+         * @brief modify virtual site
+         **/
+        function updateSite($args) {
+            $oModuleModel = &getModel('module');
+			$columnList = array('sites.site_srl', 'sites.domain');
+            $site_info = $oModuleModel->getSiteInfo($args->site_srl, $columnList);
+            if($site_info->domain != $args->domain) {
+                $info = $oModuleModel->getSiteInfoByDomain($args->domain, $columnList);
+                if($info->site_srl && $info->site_srl != $args->site_srl) return new Object(-1,'msg_already_registed_domain');
+                if(isSiteID($args->domain) && $oModuleModel->isIDExists($args->domain)) return new Object(-1,'msg_already_registed_vid');
+
+                if($args->domain && !isSiteID($args->domain)) {
+                    $args->domain = strtolower($args->domain);
+                }
+
+            }
+            $output = executeQuery('module.updateSite', $args);
+            //clear cache for default mid
+            if($args->site_srl == 0) $vid='';
+            else $vid=$args->domain;
+
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->index_module_srl);
+            $mid = $module_info->mid;
+
+	        $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+            	if($args->site_srl == 0){
+            		$cache_key = 'object_default_mid:_';
+            		$oCacheHandler->delete($cache_key);
+            	}
+            	$cache_key = 'object_default_mid:'.$vid.'_'.$mid;
+            	$oCacheHandler->delete($cache_key);
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Arrange module information
+         **/
+        function arrangeModuleInfo(&$args, &$extra_vars) {
+            // Remove unnecessary information
+            unset($args->body);
+            unset($args->act);
+            unset($args->page);
+            // Test mid value
+            if(!preg_match("/^[a-z][a-z0-9_]+$/i", $args->mid)) return new Object(-1, 'msg_limit_mid');
+            // Test variables (separate basic vars and other vars in modules)
+            $extra_vars = clone($args);
+            unset($extra_vars->module_srl);
+            unset($extra_vars->module);
+            unset($extra_vars->module_category_srl);
+            unset($extra_vars->layout_srl);
+			unset($extra_vars->mlayout_srl);
+			unset($extra_vars->use_mobile);
+            unset($extra_vars->menu_srl);
+            unset($extra_vars->site_srl);
+            unset($extra_vars->mid);
+            unset($extra_vars->skin);
+			unset($extra_vars->mskin);
+            unset($extra_vars->browser_title);
+            unset($extra_vars->description);
+            unset($extra_vars->is_default);
+            unset($extra_vars->content);
+            unset($extra_vars->mcontent);
+            unset($extra_vars->open_rss);
+            unset($extra_vars->header_text);
+            unset($extra_vars->footer_text);
+            $args = delObjectVars($args, $extra_vars);
+
+            return new Object();
+        }
+
+        /**
+         * @brief Insert module
+         **/
+        function insertModule($args) {
+            $output = $this->arrangeModuleInfo($args, $extra_vars);
+            if(!$output->toBool()) return $output;
+            // Check whether the module name already exists
+            if(!$args->site_srl) $args->site_srl = 0;
+            $oModuleModel = &getModel('module');
+            if($oModuleModel->isIDExists($args->mid, $args->site_srl)) return new Object(-1, 'msg_module_name_exists');
+
+            // begin transaction
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Get colorset from the skin information
+            $module_path = ModuleHandler::getModulePath($args->module);
+            $skin_info = $oModuleModel->loadSkinInfo($module_path, $args->skin);
+            $skin_vars->colorset = $skin_info->colorset[0]->name;
+            // Arrange variables and then execute a query
+            if(!$args->module_srl) $args->module_srl = getNextSequence();
+            // Insert a module
+            $output = executeQuery('module.insertModule', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Insert module extra vars
+            $this->insertModuleExtraVars($args->module_srl, $extra_vars);
+
+            // commit
+            $oDB->commit();
+
+            $output->add('module_srl',$args->module_srl);
+            return $output;
+        }
+
+        /**
+         * @brief Modify module information
+         **/
+        function updateModule($args) {
+            $output = $this->arrangeModuleInfo($args, $extra_vars);
+            if(!$output->toBool()) return $output;
+
+            // begin transaction
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+			if(!$args->site_srl || !$args->browser_title)
+			{
+				$oModuleModel = &getModel('module');
+				$columnList = array('module_srl', 'site_srl', 'browser_title');
+				$module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
+
+				if(!$args->site_srl) $args->site_srl = (int)$module_info->site_srl;
+				if(!$args->browser_title) $args->browser_title = $module_info->browser_title;
+			}
+
+            $output = executeQuery('module.isExistsModuleName', $args);
+            if(!$output->toBool() || $output->data->count) {
+                $oDB->rollback();
+                return new Object(-1, 'msg_module_name_exists');
+            }
+
+            $output = executeQuery('module.updateModule', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Insert module extra vars
+            $this->insertModuleExtraVars($args->module_srl, $extra_vars);
+
+            $oDB->commit();
+
+            $output->add('module_srl',$args->module_srl);
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+            	$cache_key = 'object_module_info:'.$args->module_srl;
+            	$oCacheHandler->delete($cache_key);
+            	$cache_key = 'object:'.$args->mid.'_'.$args->site_srl;
+            	$oCacheHandler->delete($cache_key);
+                $cache_key = 'object:module_extra_vars_'.$args->module_srl;
+                $oCacheHandler->delete($cache_key);
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Change the module's virtual site
+         **/
+        function updateModuleSite($module_srl, $site_srl, $layout_srl = 0) {
+            $args->module_srl = $module_srl;
+            $args->site_srl = $site_srl;
+            $args->layout_srl = $layout_srl;
+            return executeQuery('module.updateModuleSite', $args);
+        }
+
+        /**
+         * @brief Delete module
+         *
+         * Attempt to delete all related information when deleting a module.
+         **/
+        function deleteModule($module_srl) {
+            if(!$module_srl) return new Object(-1,'msg_invalid_request');
+
+			// check start module
+            $oModuleModel = &getModel('module');
+			$columnList = array('sites.index_module_srl');
+			$start_module = $oModuleModel->getSiteInfo(0, $columnList);
+			if($module_srl == $start_module->index_module_srl) return new Object(-1, 'msg_cannot_delete_startmodule');
+
+            // Call a trigger (before)
+            $trigger_obj->module_srl = $module_srl;
+            $output = ModuleHandler::triggerCall('module.deleteModule', 'before', $trigger_obj);
+            if(!$output->toBool()) return $output;
+
+            // begin transaction
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $args->module_srl = $module_srl;
+            // Delete module information from the DB
+            $output = executeQuery('module.deleteModule', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Delete permission information
+            $this->deleteModuleGrants($module_srl);
+            // Remove skin information
+            $this->deleteModuleSkinVars($module_srl);
+            // Delete module extra vars
+            $this->deleteModuleExtraVars($module_srl);
+            // Remove the module manager
+            $this->deleteAdminId($module_srl);
+            // Call a trigger (after)
+            if($output->toBool()) {
+                $trigger_output = ModuleHandler::triggerCall('module.deleteModule', 'after', $trigger_obj);
+                if(!$trigger_output->toBool()) {
+                    $oDB->rollback();
+                    return $trigger_output;
+                }
+            }
+
+            // commit
+            $oDB->commit();
+			//remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+            	$cache_key = 'object_module_info:'.$args->module_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+            return $output;
+        }
+
+        /**
+         * @brief Change other information of the module
+         **/
+        function updateModuleSkinVars($module_srl, $skin_vars) {
+            // skin_vars setting
+            $args->module_srl = $module_srl;
+            $args->skin_vars = $skin_vars;
+            $output = executeQuery('module.updateModuleSkinVars', $args);
+            if(!$output->toBool()) return $output;
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $cache_key = 'object_module_skin_vars:'.$module_srl;
+                $oCacheHandler->delete($cache_key);
+            }
+
+            return $output;
+        }
+
+        /**
+         * @brief Set is_default as N in all modules(the default module is disabled)
+         **/
+        function clearDefaultModule() {
+            $output = executeQuery('module.clearDefaultModule');
+			if(!$output->toBool()) return $output;
+
+            return $output;
+        }
+
+        /**
+         * @brief Update menu_srl of mid which belongs to menu_srl
+         **/
+        function updateModuleMenu($args) {
+            return executeQuery('module.updateModuleMenu', $args);
+        }
+
+        /**
+         * @brief Update layout_srl of mid which belongs to menu_srl
+         **/
+        function updateModuleLayout($layout_srl, $menu_srl_list) {
+            if(!count($menu_srl_list)) return;
+
+            $args->layout_srl = $layout_srl;
+            $args->menu_srls = implode(',',$menu_srl_list);
+            $output = executeQuery('module.updateModuleLayout', $args);
+            return $output;
+        }
+
+        /**
+         * @brief Change the site administrator
+         **/
+        function insertSiteAdmin($site_srl, $arr_admins) {
+            // Remove the site administrator
+            $args->site_srl = $site_srl;
+
+	        $output = executeQuery('module.deleteSiteAdmin', $args);
+            
+			if(!$output->toBool()) return $output;
+            // Get user id of an administrator
+            if(!is_array($arr_admins) || !count($arr_admins)) return new Object();
+            foreach($arr_admins as $key => $user_id) {
+                if(!trim($user_id)) continue;
+                $admins[] = trim($user_id);
+            }
+            if(!count($admins)) return new Object();
+
+			$oMemberModel = &getModel('member');
+			$member_config = $oMemberModel->getMemberConfig();
+			if($member_config->identifier == 'email_address') {	
+				$args->email_address = '\''.implode('\',\'',$admins).'\'';
+			} else {
+				$args->user_ids = '\''.implode('\',\'',$admins).'\'';
+			}	
+           	$output = executeQueryArray('module.getAdminSrls', $args);
+            if(!$output->toBool()||!$output->data) return $output;
+			
+			foreach($output->data as $key => $val) {
+                unset($args);
+                $args->site_srl = $site_srl;
+                $args->member_srl = $val->member_srl;
+                $output = executeQueryArray('module.insertSiteAdmin', $args);
+                if(!$output->toBool()) return $output;
+            }
+            return new Object();
+        }
+
+        /**
+         * @brief Specify the admin ID to a module
+         **/
+        function insertAdminId($module_srl, $admin_id) {
+            $oMemberModel = &getModel('member');
+			$member_config = $oMemberModel->getMemberConfig();
+
+			if ($member_config->identifier == 'email_address')
+	            $member_info = $oMemberModel->getMemberInfoByEmailAddress($admin_id);
+			else
+	            $member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+
+            if(!$member_info->member_srl) return;
+            $args->module_srl = $module_srl;
+            $args->member_srl = $member_info->member_srl;
+            return executeQuery('module.insertAdminId', $args);
+        }
+
+        /**
+         * @brief Remove the admin ID from a module
+         **/
+        function deleteAdminId($module_srl, $admin_id = '') {
+            $args->module_srl = $module_srl;
+
+            if($admin_id) {
+                $oMemberModel = &getModel('member');
+                $member_info = $oMemberModel->getMemberInfoByUserID($admin_id);
+                if($member_info->member_srl) $args->member_srl = $member_info->member_srl;
+            }
+            return executeQuery('module.deleteAdminId', $args);
+        }
+
+        /**
+         * @brief Insert skin vars to a module
+         **/
+        function insertModuleSkinVars($module_srl, $obj) {
+            $this->deleteModuleSkinVars($module_srl);
+            if(!$obj || !count($obj)) return;
+
+            $args->module_srl = $module_srl;
+            foreach($obj as $key => $val) {
+                // #17927989 For an old board which used the old blog module
+                // it often saved menu item(stdClass) on the skin info column
+                // When updating the module on XE core 1.2.0 later versions, it occurs an error
+                // fixed the error
+                if (is_object($val)) continue;
+                if (is_array($val)) $val = serialize($val);
+
+                $args->name = trim($key);
+                $args->value = trim($val);
+                if(!$args->name || !$args->value) continue;
+                executeQuery('module.insertModuleSkinVars', $args);
+            }
+        }
+
+        /**
+         * @brief Remove skin vars of a module
+         **/
+        function deleteModuleSkinVars($module_srl) {
+            $args->module_srl = $module_srl;
+
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+                $cache_key = 'object_module_skin_vars:'.$module_srl;
+                $oCacheHandler->delete($cache_key);
+            }
+
+            return executeQuery('module.deleteModuleSkinVars', $args);
+        }
+
+        /**
+         * @brief Register extra vars to the module
+         **/
+        function insertModuleExtraVars($module_srl, $obj) {
+            $this->deleteModuleExtraVars($module_srl);
+            if(!$obj || !count($obj)) return;
+
+            foreach($obj as $key => $val) {
+                $args = null;
+                $args->module_srl = $module_srl;
+                $args->name = trim($key);
+                $args->value = trim($val);
+                if(!$args->name || !$args->value) continue;
+                $output = executeQuery('module.insertModuleExtraVars', $args);
+            }
+        }
+
+        /**
+         * @brief Remove extra vars from the module
+         **/
+        function deleteModuleExtraVars($module_srl) {
+            $args->module_srl = $module_srl;
+            return executeQuery('module.deleteModuleExtraVars', $args);
+            //remove from cache
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport())
+            {
+            	$cache_key = 'object:module_extra_vars_'.$module_srl;
+            	$oCacheHandler->delete($cache_key);
+            }
+        }
+
+        /**
+         * @brief Grant permission to the module
+         **/
+        function insertModuleGrants($module_srl, $obj) {
+            $this->deleteModuleGrants($module_srl);
+            if(!$obj || !count($obj)) return;
+
+            foreach($obj as $name => $val) {
+                if(!$val || !count($val)) continue;
+
+                foreach($val as $group_srl) {
+                    $args = null;
+                    $args->module_srl = $module_srl;
+                    $args->name = $name;
+                    $args->group_srl = trim($group_srl);
+                    if(!$args->name || !$args->group_srl) continue;
+                    executeQuery('module.insertModuleGrant', $args);
+
+                }
+            }
+        }
+
+        /**
+         * @brief Remove permission from the module
+         **/
+        function deleteModuleGrants($module_srl) {
+            $args->module_srl = $module_srl;
+            return executeQuery('module.deleteModuleGrants', $args);
+        }
+
+        /**
+         * @brief Change user-defined language
+         **/
+        function replaceDefinedLangCode(&$output) {
+            $output = preg_replace_callback('!\$user_lang->([a-z0-9\_]+)!is', array($this,'_replaceLangCode'), $output);
+        }
+        function _replaceLangCode($matches) {
+            static $lang = null;
+            if(is_null($lang)) {
+                $site_module_info = Context::get('site_module_info');
+				if(!$site_module_info){
+					$oModuleModel = &getModel('module');
+					$site_module_info = $oModuleModel->getDefaultMid();
+					Context::set('site_module_info', $site_module_info);
+				}
+                $cache_file = sprintf('%sfiles/cache/lang_defined/%d.%s.php', _XE_PATH_, $site_module_info->site_srl, Context::getLangType());
+                if(!file_exists($cache_file)) {
+                    $oModuleAdminController = &getAdminController('module');
+                    $oModuleAdminController->makeCacheDefinedLangCode($site_module_info->site_srl);
+                }
+
+                if(file_exists($cache_file)) require_once($cache_file);
+            }
+            if(!Context::get($matches[1]) && $lang[$matches[1]]) return $lang[$matches[1]];
+
+            return str_replace('$user_lang->','',$matches[0]);
+        }
+
+
+        /**
+         * @brief Add and update a file into the file box
+         **/
+        function procModuleFileBoxAdd(){
+			$ajax = Context::get('ajax');
+			if ($ajax) Context::setRequestMethod('JSON');
+
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $vars = Context::gets('comment','addfile','filter');
+            $module_filebox_srl = Context::get('module_filebox_srl');
+
+            $ext = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+            $vars->ext = $ext;
+            if($vars->filter) $filter = explode(',',$vars->filter);
+            else $filter = array('jpg','jpeg','gif','png');
+            if(!in_array($ext,$filter)) return new Object(-1, 'msg_error_occured');
+
+            $vars->member_srl = $logged_info->member_srl;
+
+            // update
+            if($module_filebox_srl > 0){
+                $vars->module_filebox_srl = $module_filebox_srl;
+                $output = $this->updateModuleFileBox($vars);
+
+            // insert
+            }else{
+                if(!Context::isUploaded()) return new Object(-1, 'msg_error_occured');
+                $addfile = Context::get('addfile');
+                if(!is_uploaded_file($addfile['tmp_name'])) return new Object(-1, 'msg_error_occured');
+                if($vars->addfile['error'] != 0) return new Object(-1, 'msg_error_occured');
+                $output = $this->insertModuleFileBox($vars);
+            }
+
+			$this->setTemplatePath($this->module_path.'tpl');
+
+			if (!$ajax)
+			{
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminFileBox');
+				header('location:'.$returnUrl);
+				return;
+			}
+			else
+			{
+				$this->add('save_filename', $output->get('save_filename'));
+			}
+        }
+
+
+        /**
+         * @brief Update a file into the file box
+         **/
+        function updateModuleFileBox($vars){
+
+            // have file
+            if($vars->addfile['tmp_name'] && is_uploaded_file($vars->addfile['tmp_name'])){
+                $oModuleModel = &getModel('module');
+                $output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
+                FileHandler::removeFile($output->data->filename);
+
+                $path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
+                FileHandler::makeDir($path);
+
+                $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $ext);
+                $tmp = $vars->addfile['tmp_name'];
+
+                if(!@move_uploaded_file($tmp, $save_filename)) {
+                    return false;
+                }
+
+                $args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+                $args->filename = $save_filename;
+                $args->filesize = $vars->addfile['size'];
+
+            }
+
+            $args->module_filebox_srl = $vars->module_filebox_srl;
+            $args->comment = $vars->comment;
+
+            return executeQuery('module.updateModuleFileBox', $vars);
+        }
+
+
+        /**
+         * @brief Add a file into the file box
+         **/
+        function insertModuleFileBox($vars){
+            // set module_filebox_srl
+            $vars->module_filebox_srl = getNextSequence();
+
+            // get file path
+            $oModuleModel = &getModel('module');
+            $path = $oModuleModel->getModuleFileBoxPath($vars->module_filebox_srl);
+            FileHandler::makeDir($path);
+            $save_filename = sprintf('%s%s.%s',$path, $vars->module_filebox_srl, $vars->ext);
+            $tmp = $vars->addfile['tmp_name'];
+
+            // upload
+            if(!@move_uploaded_file($tmp, $save_filename)) {
+                return false;
+            }
+
+
+            // insert
+            $args->module_filebox_srl = $vars->module_filebox_srl;
+            $args->member_srl = $vars->member_srl;
+            $args->comment = $vars->comment;
+            $args->filename = $save_filename;
+            $args->fileextension = strtolower(substr(strrchr($vars->addfile['name'],'.'),1));
+            $args->filesize = $vars->addfile['size'];
+
+            $output = executeQuery('module.insertModuleFileBox', $args);
+			$output->add('save_filename', $save_filename);
+            return $output;
+        }
+
+
+        /**
+         * @brief Delete a file from the file box
+         **/
+
+        function procModuleFileBoxDelete(){
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $module_filebox_srl = Context::get('module_filebox_srl');
+            if(!$module_filebox_srl) return new Object(-1, 'msg_invalid_request');
+            $vars->module_filebox_srl = $module_filebox_srl;
+            $output = $this->deleteModuleFileBox($vars);
+            if(!$output->toBool()) return $output;
+        }
+
+        function deleteModuleFileBox($vars){
+
+            // delete real file
+            $oModuleModel = &getModel('module');
+            $output = $oModuleModel->getModuleFileBox($vars->module_filebox_srl);
+            FileHandler::removeFile($output->data->filename);
+
+            $args->module_filebox_srl = $vars->module_filebox_srl;
+            return executeQuery('module.deleteModuleFileBox', $args);
+        }
+
+        /**
+         * @brief function of locking (timeout is in seconds)
+         */
+        function lock($lock_name, $timeout, $member_srl = null) {
+            $this->unlockTimeoutPassed();
+            $args->lock_name = $lock_name;
+            if(!$timeout) $timeout = 60;
+            $args->deadline = date("YmdHis", time() + $timeout);
+            if($member_srl) $args->member_srl = $member_srl;
+            $output = executeQuery('module.insertLock', $args);
+            if($output->toBool()) {
+                $output->add('lock_name', $lock_name);
+                $output->add('deadline', $args->deadline);
+            }
+            return $output;
+        }
+
+        function unlockTimeoutPassed() {
+            executeQuery('module.deleteLocksTimeoutPassed');
+        }
+
+        function unlock($lock_name, $deadline) {
+            $args->lock_name = $lock_name;
+            $args->deadline = $deadline;
+            $output = executeQuery('module.deleteLock', $args);
+            return $output;
+        }
+
+		function updateModuleInSites($site_srls, $args)
+		{
+			$args->site_srls = $site_srls;
+			$output = executeQuery('module.updateModuleInSites', $args);
+			return $output;
+		}
+    }
+?>
diff --git a/modules/module/module.model.php b/modules/module/module.model.php
index 88874af95..c8b27955b 100644
--- a/modules/module/module.model.php
+++ b/modules/module/module.model.php
@@ -1,1333 +1,1541 @@
-<?php
-    /**
-     * @class  moduleModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  module 모듈의 Model class
-     **/
-
-    class moduleModel extends module {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief mid, vid 사용할 수 있는지 검사
-         **/
-        function isIDExists($id, $site_srl = 0) {
-            if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) return true;
-
-            // directory 및 rss/atom/api 등 예약어 검사
-            $dirs = FileHandler::readDir(_XE_PATH_);
-            $dirs[] = 'rss';
-            $dirs[] = 'atom';
-            $dirs[] = 'api';
-            if(in_array($id, $dirs)) return true;
-
-            // mid 검사
-            $args->mid = $id;
-            $args->site_srl = $site_srl;
-            $output = executeQuery('module.isExistsModuleName', $args);
-            if($output->data->count) return true;
-
-            // vid 검사 (site_srl이 0일때 즉 가상사이트가 아닌 경우 mid != vid임을 체크)
-            if(!$site_srl) {
-                $site_args->domain = $id;
-                $output = executeQuery('module.isExistsSiteDomain', $site_args);
-                if($output->data->count) return true;
-            }
-
-            return false;
-        }
-
-        /**
-         * @brief site 정보를 구함
-         **/
-        function getSiteInfo($site_srl) {
-            $args->site_srl = $site_srl;
-            $output = executeQuery('module.getSiteInfo', $args);
-            return $output->data;
-        }
-
-        function getSiteInfoByDomain($domain) {
-            $args->domain= $domain;
-            $output = executeQuery('module.getSiteInfoByDomain', $args);
-            return $output->data;
-        }
-
-        /**
-         * @brief document_srl로 모듈의 정보르 구함
-         * 이 경우는 캐시파일을 이용할 수가 없음
-         **/
-        function getModuleInfoByDocumentSrl($document_srl) {
-            $args->document_srl = $document_srl;
-            $output = executeQuery('module.getModuleInfoByDocument', $args);
-            return $this->addModuleExtraVars($output->data);
-        }
-
-        /**
-         * @brief domain에 따른 기본 mid를 구함
-         **/
-        function getDefaultMid() {
-            $default_url = preg_replace('/\/$/','',Context::getDefaultUrl());
-            $request_url = preg_replace('/\/$/','',Context::getRequestUri());
-            $vid = Context::get('vid');
-            $mid = Context::get('mid');
-
-            // 기본 URL이 설정되어 있고 이 기본 URL과 요청 URL이 다르면 가상 사이트 확인
-            if($default_url && $default_url != $request_url) {
-                $url_info = parse_url($request_url);
-                $hostname = $url_info['host'];
-                $path = preg_replace('/\/$/','',$url_info['path']);
-                $sites_args->domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
-                $output = executeQuery('module.getSiteInfoByDomain', $sites_args);
-            }
-            if(!$output || !$output->data)
-            {
-                if(!$vid) $vid = $mid;
-                if($vid) {
-                    $vid_args->domain = $vid;
-                    $output = executeQuery('module.getSiteInfoByDomain', $vid_args);
-                    if($output->toBool() && $output->data) {
-                        Context::set('vid', $output->data->domain, true);
-                        if($mid==$output->data->domain) Context::set('mid',$output->data->mid,true);
-                    }
-                }
-            }
-
-            // 가상 사이트가 아닐 경우 기본 사이트 정보를 구함
-            if(!$output->data) {
-                $args->site_srl = 0;
-                $output = executeQuery('module.getSiteInfo', $args);
-
-                // 기본 사이트 정보가 없으면 관련된 정보를 갱신
-                if(!$output->data) {
-                    // sites 테이블이 없을 경우 생성
-                    $oDB = &DB::getInstance();
-                    if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
-                    if(!$oDB->isTableExists('sites')) return;
-
-                    // 기본 mid, 언어 구함
-                    $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
-                    $db_info = Context::getDBInfo();
-                    $domain = Context::getDefaultUrl();
-                    $url_info = parse_url($domain);
-                    $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
-                    $site_args->site_srl = 0;
-                    $site_args->index_module_srl  = $mid_output->data->module_srl;
-                    $site_args->domain = $domain;
-                    $site_args->default_language = $db_info->lang_type;
-
-                    if($output->data && !$output->data->index_module_srl) {
-                        $output = executeQuery('module.updateSite', $site_args);
-                    } else {
-                        $output = executeQuery('module.insertSite', $site_args);
-                        if(!$output->toBool()) return $output;
-                    }
-                    $output = executeQuery('module.getSiteInfo', $args);
-                }
-            }
-            $module_info = $output->data;
-            if(!$module_info->module_srl) return $module_info;
-            if(is_array($module_info) && $module_info->data[0]) $module_info = $module_info[0];
-            return $this->addModuleExtraVars($module_info);
-        }
-
-        /**
-         * @brief mid로 모듈의 정보를 구함
-         **/
-        function getModuleInfoByMid($mid, $site_srl = 0) {
-            $args->mid = $mid;
-            $args->site_srl = (int)$site_srl;
-            $output = executeQuery('module.getMidInfo', $args);
-            $module_info = $output->data;
-            if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
-            return $this->addModuleExtraVars($module_info);
-        }
-
-        /**
-         * @brief module_srl에 해당하는 모듈의 정보를 구함
-         **/
-        function getModuleInfoByModuleSrl($module_srl) {
-            // 데이터를 가져옴
-            $args->module_srl = $module_srl;
-            $output = executeQuery('module.getMidInfo', $args);
-            if(!$output->data) return;
-            $module_info = $this->addModuleExtraVars($output->data);
-            return $module_info;
-        }
-
-        /**
-         * @brief layout_srl에 해당하는 모듈의 정보를 구함
-         **/
-        function getModulesInfoByLayout($layout_srl) {
-            // 데이터를 가져옴
-            $args->layout_srl = $layout_srl;
-            $output = executeQueryArray('module.getModulesByLayout', $args);
-
-            $count = count($output->data);
-
-            $modules = array();
-            for($i=0;$i<$count;$i++) {
-                $modules[] = $output->data[$i];
-            }
-            return $this->addModuleExtraVars($modules);
-        }
-
-        /**
-         * @brief 여러개의 module_srl에 해당하는 모듈의 정보를 구함
-         **/
-        function getModulesInfo($module_srls) {
-            if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
-            $args->module_srls = $module_srls;
-            $output = executeQueryArray('module.getModulesInfo', $args);
-            if(!$output->toBool()) return;
-            return $this->addModuleExtraVars($output->data);
-        }
-
-        /**
-         * @brief 모듈의 기본 정보에 추가 변수 구함
-         **/
-        function addModuleExtraVars($module_info) {
-            // 1개 이상의 모듈정보를 요청받아도 처리 가능하도록
-            if(!is_array($module_info)) $target_module_info = array($module_info);
-            else $target_module_info = $module_info;
-
-            // 모듈 번호를 구함
-            $module_srls = array();
-            foreach($target_module_info as $key => $val) {
-                $module_srl = $val->module_srl;
-                if(!$module_srl) continue;
-                $module_srls[] = $val->module_srl;
-            }
-
-            // 모듈의 추가정보/ 스킨 정보를 추출
-            $extra_vars = $this->getModuleExtraVars($module_srls);
-            if(!count($module_srls) || !count($extra_vars)) return $module_info;
-
-            foreach($target_module_info as $key => $val) {
-                if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
-                foreach($extra_vars[$val->module_srl] as $k => $v) {
-                    if($target_module_info[$key]->{$k}) continue;
-                    $target_module_info[$key]->{$k} = $v;
-                }
-            }
-            if(is_array($module_info)) return $target_module_info;
-            return $target_module_info[0];
-        }
-
-        /**
-         * @brief DB에 생성된 mid 전체 목록을 구해옴
-         **/
-        function getMidList($args = null) {
-            $output = executeQuery('module.getMidList', $args);
-            if(!$output->toBool()) return $output;
-
-            $list = $output->data;
-            if(!$list) return;
-
-            if(!is_array($list)) $list = array($list);
-
-            foreach($list as $val) {
-                $mid_list[$val->mid] = $val;
-            }
-            return $mid_list;
-        }
-
-        /**
-         * @brief mid 목록에 대응하는 module_srl을 배열로 return
-         **/
-        function getModuleSrlByMid($mid) {
-            if($mid && !is_array($mid)) $mid = explode(',',$mid);
-            if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
-
-            $site_module_info = Context::get('site_module_info');
-
-            $args->mid = $mid;
-            if($site_module_info) $args->site_srl = $site_module_info->site_srl;
-            $output = executeQuery('module.getModuleSrlByMid', $args);
-            if(!$output->toBool()) return $output;
-
-            $list = $output->data;
-            if(!$list) return;
-            if(!is_array($list)) $list = array($list);
-
-            foreach($list as $key => $val) {
-                $module_srl_list[] = $val->module_srl;
-            }
-
-            return $module_srl_list;
-        }
-
-        /**
-         * @brief act 값에 의한 forward 값을 구함
-         **/
-        function getActionForward($act, $module = "") {
-            $args->act = $act;
-            $args->module = ($module)?$module:null;
-            if (strlen ($args->module) > 0) $output = executeQuery ('module.getActionForwardWithModule', $args);
-            else $output = executeQuery('module.getActionForward',$args);
-            return $output->data;
-        }
-
-        /**
-         * @brief trigger_name에 등록된 모든 목록을 추출
-         **/
-        function getTriggers($trigger_name, $called_position) {
-            $args->trigger_name = $trigger_name;
-            $args->called_position = $called_position;
-            $output = executeQueryArray('module.getTriggers',$args);
-            return $output->data;
-        }
-
-        /**
-         * @brief 특정 trigger_name의 특정 대상을 추출
-         **/
-        function getTrigger($trigger_name, $module, $type, $called_method, $called_position) {
-            $args->trigger_name = $trigger_name;
-            $args->module = $module;
-            $args->type = $type;
-            $args->called_method = $called_method;
-            $args->called_position = $called_position;
-            $output = executeQuery('module.getTrigger',$args);
-            return $output->data;
-        }
-
-        /**
-         * @brief 특정 module extend 가져옴
-         **/
-		function getModuleExtend($parent_module, $type, $kind='') {
-			$key = $parent_module.'.'.$kind.'.'.$type;
-
-			$module_extend_info = $this->loadModuleExtends();
-			if(array_key_exists($key, $module_extend_info))
-			{
-				return $module_extend_info[$key];
-			}
-
-			return false;
-		}
-
-        /**
-         * @brief 모든 module extend 가져옴
-         **/
-		function loadModuleExtends() {
-			$cache_file = './files/config/module_extend.php';
-			$cache_file = FileHandler::getRealPath($cache_file);
-
-			if(!isset($GLOBALS['__MODULE_EXTEND__'])){
-
-				// check pre install
-				if(file_exists(FileHandler::getRealPath('./files')) && !file_exists($cache_file)) {
-					$arr = array();
-					$output = executeQueryArray('module.getModuleExtend');
-					if($output->data){
-						foreach($output->data as $v){
-							$arr[] = sprintf("'%s.%s.%s' => '%s'", $v->parent_module, $v->kind, $v->type, $v->extend_module);
-						}
-					}
-
-					$str = '<?PHP return array(%s); ?>';
-					$str = sprintf($str, join(',',$arr));
-
-					FileHandler::writeFile($cache_file, $str);
-				}
-
-				
-				if(file_exists($cache_file)) {
-					$GLOBALS['__MODULE_EXTEND__'] = include($cache_file);
-				} else {
-					$GLOBALS['__MODULE_EXTEND__'] = array();
-				}
-			}
-
-			return $GLOBALS['__MODULE_EXTEND__'];
-		}
-
-        /**
-         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
-         **/
-        function getModuleInfoXml($module) {
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            $module_path = ModuleHandler::getModulePath($module);
-            if(!$module_path) return;
-
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $xml_file = sprintf("%s/conf/info.xml", $module_path);
-            if(!file_exists($xml_file)) return;
-
-            $oXmlParser = new XmlParser();
-            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-            $xml_obj = $tmp_xml_obj->module;
-
-            if(!$xml_obj) return;
-
-            // 모듈 정보
-            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
-                // module format 0.2
-                $module_info->title = $xml_obj->title->body;
-                $module_info->description = $xml_obj->description->body;
-                $module_info->version = $xml_obj->version->body;
-                $module_info->homepage = $xml_obj->link->body;
-                $module_info->category = $xml_obj->category->body;
-                if(!$module_info->category) $module_info->category = 'service';
-                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $module_info->license = $xml_obj->license->body;
-                $module_info->license_link = $xml_obj->license->attrs->link;
-
-                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-                else $author_list = $xml_obj->author;
-
-                foreach($author_list as $author) {
-                    unset($author_obj);
-                    $author_obj->name = $author->name->body;
-                    $author_obj->email_address = $author->attrs->email_address;
-                    $author_obj->homepage = $author->attrs->link;
-                    $module_info->author[] = $author_obj;
-                }
-
-                // history
-                if($xml_obj->history) {
-                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
-                    else $history = $xml_obj->history;
-
-                    foreach($history as $item) {
-                        unset($obj);
-
-                        if($item->author) {
-                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
-
-                            foreach($obj->author_list as $author) {
-                                unset($author_obj);
-                                $author_obj->name = $author->name->body;
-                                $author_obj->email_address = $author->attrs->email_address;
-                                $author_obj->homepage = $author->attrs->link;
-                                $obj->author[] = $author_obj;
-                            }
-                        }
-
-                        $obj->name = $item->name->body;
-                        $obj->email_address = $item->attrs->email_address;
-                        $obj->homepage = $item->attrs->link;
-                        $obj->version = $item->attrs->version;
-                        $obj->date = $item->attrs->date;
-                        $obj->description = $item->description->body;
-
-                        if($item->log) {
-                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
-
-                            foreach($obj->log as $log) {
-                                unset($logs_obj);
-                                $logs_obj->text = $log->body;
-                                $logs_obj->link = $log->attrs->link;
-                                $obj->logs[] = $logs_obj;
-                            }
-                        }
-
-                        $module_info->history[] = $obj;
-                    }
-                }
-
-
-            } else {
-                // module format 0.1
-                $module_info->title = $xml_obj->title->body;
-                $module_info->description = $xml_obj->author->description->body;
-                $module_info->version = $xml_obj->attrs->version;
-                $module_info->category = $xml_obj->attrs->category;
-                if(!$module_info->category) $module_info->category = 'service';
-                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $author_obj->name = $xml_obj->author->name->body;
-                $author_obj->email_address = $xml_obj->author->attrs->email_address;
-                $author_obj->homepage = $xml_obj->author->attrs->link;
-                $module_info->author[] = $author_obj;
-            }
-
-            // action 정보를 얻어서 admin_index를 추가
-            $action_info = $this->getModuleActionXml($module);
-            $module_info->admin_index_act = $action_info->admin_index_act;
-            $module_info->default_index_act = $action_info->default_index_act;
-            $module_info->setup_index_act = $action_info->setup_index_act;
-
-            return $module_info;
-        }
-
-        /**
-         * @brief module의 conf/module.xml 을 통해 grant(권한) 및 action 데이터를 return
-         * module.xml 파일의 경우 파싱하는데 시간이 걸리기에 캐싱을 한다...
-         * 캐싱을 할때 바로 include 할 수 있도록 역시 코드까지 추가하여 캐싱을 한다.
-         * 이게 퍼포먼스 상으로는 좋은데 어떤 부정적인 결과를 유도할지는 잘 모르겠...
-         **/
-        function getModuleActionXml($module) {
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            $class_path = ModuleHandler::getModulePath($module);
-            if(!$class_path) return;
-
-            // 해당 경로에 module.xml 파일이 있는지 체크한다. 없으면 return
-            $xml_file = sprintf("%sconf/module.xml", $class_path);
-            if(!file_exists($xml_file)) return;
-
-            // 캐시된 파일이 있는지 확인
-            $cache_file = sprintf("./files/cache/module_info/%s.%s.php", $module, Context::getLangType());
-
-            // 캐시 파일이 없거나 캐시 파일이 xml 파일보다 오래되었으면 내용 다시 갱신
-            if(!file_exists($cache_file) || filemtime($cache_file)<filemtime($xml_file)) {
-
-                $buff = ""; ///< 캐시 파일에 쓸 buff 변수 설정
-
-                $xml_obj = XmlParser::loadXmlFile($xml_file); ///< xml 파일을 읽어서 xml object로 변환
-
-                if(!count($xml_obj->module)) return; ///< xml 내용중에 module 태그가 없다면 오류;;
-
-                $grants = $xml_obj->module->grants->grant; ///< 권한 정보 (없는 경우도 있음)
-                $permissions = $xml_obj->module->permissions->permission; ///< 권한 대행 (없는 경우도 있음)
-                $actions = $xml_obj->module->actions->action; ///< action list (필수)
-
-                $default_index = $admin_index = '';
-
-                // 권한 정보의 정리
-                if($grants) {
-                    if(is_array($grants)) $grant_list = $grants;
-                    else $grant_list[] = $grants;
-
-                    foreach($grant_list as $grant) {
-                        $name = $grant->attrs->name;
-                        $default = $grant->attrs->default?$grant->attrs->default:'guest';
-                        $title = $grant->title->body;
-
-                        $info->grant->{$name}->title = $title;
-                        $info->grant->{$name}->default = $default;
-
-                        $buff .= sprintf('$info->grant->%s->title=\'%s\';', $name, $title);
-                        $buff .= sprintf('$info->grant->%s->default=\'%s\';', $name, $default);
-                    }
-                }
-
-                // 권한 허용 정리
-                if($permissions) {
-                    if(is_array($permissions)) $permission_list = $permissions;
-                    else $permission_list[] = $permissions;
-
-                    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);
-                    }
-                }
-
-                // actions 정리
-                if($actions) {
-                    if(is_array($actions)) $action_list = $actions;
-                    else $action_list[] = $actions;
-
-                    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=='true'?'true':'false';
-
-                        $index = $action->attrs->index;
-                        $admin_index = $action->attrs->admin_index;
-                        $setup_index = $action->attrs->setup_index;
-
-                        $output->action->{$name}->type = $type;
-                        $output->action->{$name}->grant = $grant;
-                        $output->action->{$name}->standalone= $standalone;
-
-                        $info->action->{$name}->type = $type;
-                        $info->action->{$name}->grant = $grant;
-                        $info->action->{$name}->standalone = $standalone=='true'?true:false;
-
-                        $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);
-
-                        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;
-                        }
-                    }
-                }
-                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit();$info->default_index_act = \'%s\';$info->setup_index_act=\'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $setup_index_act, $admin_index_act, $buff);
-
-                FileHandler::writeFile($cache_file, $buff);
-
-                return $info;
-            }
-
-            @include($cache_file);
-
-            return $info;
-        }
-
-
-        /**
-         * @brief 주어진 곳의 스킨 목록을 구함
-         * 스킨과 skin.xml 파일을 분석 정리한 결과를 return
-         **/
-        function getSkins($path, $dir = 'skins') {
-            $skin_path = sprintf("%s/%s/", $path, $dir);
-            $list = FileHandler::readDir($skin_path);
-            if(!count($list)) return;
-
-            natcasesort($list);
-
-            foreach($list as $skin_name) {
-                unset($skin_info);
-                $skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
-                if(!$skin_info) $skin_info->title = $skin_name;
-
-                $skin_list[$skin_name] = $skin_info;
-            }
-
-            return $skin_list;
-        }
-
-        /**
-         * @brief 특정 위치의 특정 스킨의 정보를 구해옴
-         **/
-        function loadSkinInfo($path, $skin, $dir = 'skins') {
-
-            // 모듈의 스킨의 정보 xml 파일을 읽음
-            if(substr($path,-1)!='/') $path .= '/';
-            $skin_xml_file = sprintf("%s%s/%s/skin.xml", $path, $dir, $skin);
-            if(!file_exists($skin_xml_file)) return;
-
-            // XmlParser 객체 생성
-            $oXmlParser = new XmlParser();
-            $_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
-
-            // 스킨 정보가 없으면 return
-            if(!$_xml_obj->skin) return;
-            $xml_obj = $_xml_obj->skin;
-
-            // 스킨이름
-            $skin_info->title = $xml_obj->title->body;
-
-
-            // 작성자 정보
-            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
-                // skin format v0.2
-                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $skin_info->version = $xml_obj->version->body;
-                $skin_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $skin_info->homepage = $xml_obj->link->body;
-                $skin_info->license = $xml_obj->license->body;
-                $skin_info->license_link = $xml_obj->license->attrs->link;
-                $skin_info->description = $xml_obj->description->body;
-
-                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-                else $author_list = $xml_obj->author;
-
-                foreach($author_list as $author) {
-                    unset($author_obj);
-                    $author_obj->name = $author->name->body;
-                    $author_obj->email_address = $author->attrs->email_address;
-                    $author_obj->homepage = $author->attrs->link;
-                    $skin_info->author[] = $author_obj;
-                }
-
-                // 확장변수를 정리
-                if($xml_obj->extra_vars) {
-                    $extra_var_groups = $xml_obj->extra_vars->group;
-                    if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-                    if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-
-                    foreach($extra_var_groups as $group) {
-                        $extra_vars = $group->var;
-                        if(!is_array($group->var)) $extra_vars = array($group->var);
-
-                        foreach($extra_vars as $key => $val) {
-                            unset($obj);
-                            if(!$val->attrs->type) { $val->attrs->type = 'text'; }
-
-                            $obj->group = $group->title->body;
-                            $obj->name = $val->attrs->name;
-                            $obj->title = $val->title->body;
-                            $obj->type = $val->attrs->type;
-                            $obj->description = $val->description->body;
-                            $obj->value = $extra_vals->{$obj->name};
-                            $obj->default = $val->attrs->default;
-                            if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
-                            if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
-
-                            // 'select'type에서 option목록을 구한다.
-                            if(is_array($val->options)) {
-                                $option_count = count($val->options);
-
-                                for($i = 0; $i < $option_count; $i++) {
-                                    $obj->options[$i]->title = $val->options[$i]->title->body;
-                                    $obj->options[$i]->value = $val->options[$i]->attrs->value;
-                                }
-                            } else {
-                                $obj->options[0]->title = $val->options->title->body;
-                                $obj->options[0]->value = $val->options->attrs->value;
-                            }
-
-                            $skin_info->extra_vars[] = $obj;
-                        }
-                    }
-                }
-
-                // history
-                if($xml_obj->history) {
-                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
-                    else $history = $xml_obj->history;
-
-                    foreach($history as $item) {
-                        unset($obj);
-
-                        if($item->author) {
-                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
-
-                            foreach($obj->author_list as $author) {
-                                unset($author_obj);
-                                $author_obj->name = $author->name->body;
-                                $author_obj->email_address = $author->attrs->email_address;
-                                $author_obj->homepage = $author->attrs->link;
-                                $obj->author[] = $author_obj;
-                            }
-                        }
-
-                        $obj->name = $item->name->body;
-                        $obj->email_address = $item->attrs->email_address;
-                        $obj->homepage = $item->attrs->link;
-                        $obj->version = $item->attrs->version;
-                        $obj->date = $item->attrs->date;
-                        $obj->description = $item->description->body;
-
-                        if($item->log) {
-                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
-
-                            foreach($obj->log as $log) {
-                                unset($log_obj);
-                                $log_obj->text = $log->body;
-                                $log_obj->link = $log->attrs->link;
-                                $obj->logs[] = $log_obj;
-                            }
-                        }
-
-                        $skin_info->history[] = $obj;
-                    }
-                }
-
-
-            } else {
-
-                // skin format v0.1
-                sscanf($xml_obj->maker->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-
-                $skin_info->version = $xml_obj->version->body;
-                $skin_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $skin_info->homepage = $xml_obj->link->body;
-                $skin_info->license = $xml_obj->license->body;
-                $skin_info->license_link = $xml_obj->license->attrs->link;
-                $skin_info->description = $xml_obj->maker->description->body;
-
-                $skin_info->author[0]->name = $xml_obj->maker->name->body;
-                $skin_info->author[0]->email_address = $xml_obj->maker->attrs->email_address;
-                $skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
-
-                // 스킨에서 사용되는 변수들
-                $extra_var_groups = $xml_obj->extra_vars->group;
-                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-
-                foreach($extra_var_groups as $group){
-                    $extra_vars = $group->var;
-
-                    if($extra_vars) {
-
-                        if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
-
-                        foreach($extra_vars as $var) {
-                            unset($obj);
-                            unset($options);
-
-                            $group = $group->title->body;
-                            $name = $var->attrs->name;
-                            $type = $var->attrs->type;
-                            $title = $var->title->body;
-                            $description = $var->description->body;
-
-                            // 'select'type에서 option목록을 구한다.
-                            if(is_array($var->default)) {
-                                $option_count = count($var->default);
-
-                                for($i = 0; $i < $option_count; $i++) {
-                                    $options[$i]->title = $var->default[$i]->body;
-                                    $options[$i]->value = $var->default[$i]->body;
-                                }
-                            } else {
-                                $options[0]->title = $var->default->body;
-                                $options[0]->value = $var->default->body;
-                            }
-
-                            $width = $var->attrs->width;
-                            $height = $var->attrs->height;
-
-                            unset($obj);
-                            $obj->group = $group;
-                            $obj->title = $title;
-                            $obj->description = $description;
-                            $obj->name = $name;
-                            $obj->type = $type;
-                            $obj->options = $options;
-                            $obj->width = $width;
-                            $obj->height = $height;
-                            $obj->default = $options[0]->value;
-
-                            $skin_info->extra_vars[] = $obj;
-                        }
-                    }
-                }
-            }
-
-            // colorset
-            $colorset = $xml_obj->colorset->color;
-            if($colorset) {
-                if(!is_array($colorset)) $colorset = array($colorset);
-
-                foreach($colorset as $color) {
-                    $name = $color->attrs->name;
-                    $title = $color->title->body;
-                    $screenshot = $color->attrs->src;
-                    if($screenshot) {
-                        $screenshot = sprintf("%sskins/%s/%s", $path, $skin, $screenshot);
-                        if(!file_exists($screenshot)) $screenshot = "";
-                    } else $screenshot = "";
-
-                    unset($obj);
-                    $obj->name = $name;
-                    $obj->title = $title;
-                    $obj->screenshot = $screenshot;
-                    $skin_info->colorset[] = $obj;
-                }
-            }
-
-            // 메뉴 종류 (레이아웃을 위한 설정)
-            if($xml_obj->menus->menu) {
-                $menus = $xml_obj->menus->menu;
-                if(!is_array($menus)) $menus = array($menus);
-
-                $menu_count = count($menus);
-                $skin_info->menu_count = $menu_count;
-                for($i=0;$i<$menu_count;$i++) {
-                    unset($obj);
-
-                    $obj->name = $menus[$i]->attrs->name;
-                    if($menus[$i]->attrs->default == "true") $obj->default = true;
-                    $obj->title = $menus[$i]->title->body;
-                    $obj->maxdepth = $menus[$i]->maxdepth->body;
-
-                    $skin_info->menu->{$obj->name} = $obj;
-                }
-            }
-
-            return $skin_info;
-        }
-
-        /**
-         * @brief 특정 가상 사이트에 등록된 특정 모듈의 개수를 return
-         **/
-        function getModuleCount($site_srl, $module = null) {
-            $args->site_srl = $site_srl;
-            if(!is_null($module)) $args->module = $module;
-            $output = executeQuery('module.getModuleCount', $args);
-            return $output->data->count;
-        }
-
-        /**
-         * @brief 특정 모듈의 설정 return
-         * board, member등 특정 모듈의 global config 관리용
-         **/
-        function getModuleConfig($module) {
-            if(!$GLOBALS['__ModuleConfig__'][$module]) {
-                $args->module = $module;
-                $output = executeQuery('module.getModuleConfig', $args);
-                $config = unserialize($output->data->config);
-                $GLOBALS['__ModuleConfig__'][$module] = $config;
-            }
-            return $GLOBALS['__ModuleConfig__'][$module];
-        }
-
-        /**
-         * @brief 특정 mid의 모듈 설정 정보 return
-         * mid의 모듈 의존적인 설정을 관리
-         **/
-        function getModulePartConfig($module, $module_srl) {
-            if(!$GLOBALS['__ModulePartConfig__'][$module][$module_srl]) {
-                $args->module = $module;
-                $args->module_srl = $module_srl;
-                $output = executeQuery('module.getModulePartConfig', $args);
-                $config = unserialize($output->data->config);
-                $GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config;
-            }
-            return $GLOBALS['__ModulePartConfig__'][$module][$module_srl];
-        }
-
-        /**
-         * @brief mid별 모듈 설정 정보 전체를 구함
-         **/
-        function getModulePartConfigs($module, $site_srl = 0) {
-            $args->module = $module;
-            if($site_srl) $args->site_srl = $site_srl;
-            $output = executeQueryArray('module.getModulePartConfigs', $args);
-            if(!$output->toBool() || !$output->data) return array();
-
-            foreach($output->data as $key => $val) {
-                $result[$val->module_srl] = unserialize($val->config);
-            }
-            return $result;
-        }
-
-
-        /**
-         * @brief 모듈 카테고리의 목록을 구함
-         **/
-        function getModuleCategories() {
-            // 데이터를 DB에서 가져옴
-            $output = executeQuery('module.getModuleCategories');
-            if(!$output->toBool()) return $output;
-            $list = $output->data;
-            if(!$list) return;
-            if(!is_array($list)) $list = array($list);
-
-            foreach($list as $val) {
-                $category_list[$val->module_category_srl] = $val;
-            }
-            return $category_list;
-        }
-
-        /**
-         * @brief 특정 모듈 카테고리의 내용을 구함
-         **/
-        function getModuleCategory($module_category_srl) {
-            // 데이터를 DB에서 가져옴
-            $args->module_category_srl = $module_category_srl;
-            $output = executeQuery('module.getModuleCategory', $args);
-            if(!$output->toBool()) return $output;
-            return $output->data;
-        }
-
-        /**
-         * @brief 모듈의 xml 정보만 구함
-         **/
-        function getModulesXmlInfo() {
-            // 다운받은 모듈과 설치된 모듈의 목록을 구함
-            $searched_list = FileHandler::readDir('./modules');
-            $searched_count = count($searched_list);
-            if(!$searched_count) return;
-            sort($searched_list);
-
-            for($i=0;$i<$searched_count;$i++) {
-                // 모듈의 이름
-                $module_name = $searched_list[$i];
-
-                $path = ModuleHandler::getModulePath($module_name);
-
-                // 해당 모듈의 정보를 구함
-                $info = $this->getModuleInfoXml($module_name);
-                unset($obj);
-
-                $info->module = $module_name;
-                $info->created_table_count = $created_table_count;
-                $info->table_count = $table_count;
-                $info->path = $path;
-                $info->admin_index_act = $info->admin_index_act;
-                $list[] = $info;
-            }
-            return $list;
-        }
-
-        function checkNeedInstall($module_name)
-        {
-            $oDB = &DB::getInstance();
-            $info = null;
-
-            $moduledir = ModuleHandler::getModulePath($module_name);
-            if(file_exists(FileHandler::getRealPath($moduledir."schemas")))
-            {
-                $tmp_files = FileHandler::readDir($moduledir."schemas", '/(\.xml)$/');
-                $table_count = count($tmp_files);
-
-                // 테이블이 설치되어 있는지 체크
-                $created_table_count = 0;
-                for($j=0;$j<count($tmp_files);$j++) {
-                    list($table_name) = explode(".",$tmp_files[$j]);
-                    if($oDB->isTableExists($table_name)) $created_table_count ++;
-                }
-
-                // 설치 유무 체크 (설치는 DB의 설치만 관리)
-                if($table_count > $created_table_count) return true; 
-                else return false; 
-            }
-            return false;
-        }
-
-        function checkNeedUpdate($module_name)
-        {
-            // 각 모듈의 module.class.php로 upgrade 유무 체크
-            $oDummy = &getModule($module_name, 'class');
-            if($oDummy && method_exists($oDummy, "checkUpdate")) {
-                return $oDummy->checkUpdate();
-            }
-            return false;
-        }
-
-        /**
-         * @brief 모듈의 종류와 정보를 구함
-         **/
-        function getModuleList() {
-            // DB 객체 생성
-            $oDB = &DB::getInstance();
-
-            // 다운받은 모듈과 설치된 모듈의 목록을 구함
-            $searched_list = FileHandler::readDir('./modules');
-            sort($searched_list);
-
-            $searched_count = count($searched_list);
-            if(!$searched_count) return;
-
-            for($i=0;$i<$searched_count;$i++) {
-                // 모듈의 이름
-                $module_name = $searched_list[$i];
-
-                $path = ModuleHandler::getModulePath($module_name);
-
-                // schemas내의 테이블 생성 xml파일수를 구함
-                $tmp_files = FileHandler::readDir($path."schemas", '/(\.xml)$/');
-                $table_count = count($tmp_files);
-
-                // 테이블이 설치되어 있는지 체크
-                $created_table_count = 0;
-                for($j=0;$j<count($tmp_files);$j++) {
-                    list($table_name) = explode(".",$tmp_files[$j]);
-                    if($oDB->isTableExists($table_name)) $created_table_count ++;
-                }
-
-                // 해당 모듈의 정보를 구함
-                $info = $this->getModuleInfoXml($module_name);
-                unset($obj);
-
-                $info->module = $module_name;
-                $info->category = $info->category;
-                $info->created_table_count = $created_table_count;
-                $info->table_count = $table_count;
-                $info->path = $path;
-                $info->admin_index_act = $info->admin_index_act;
-
-                // 설치 유무 체크 (설치는 DB의 설치만 관리)
-                if($table_count > $created_table_count) $info->need_install = true;
-                else $info->need_install = false;
-
-                // 각 모듈의 module.class.php로 upgrade 유무 체크
-                $oDummy = null;
-                $oDummy = &getModule($module_name, 'class');
-                if($oDummy && method_exists($oDummy, "checkUpdate")) {
-                    $info->need_update = $oDummy->checkUpdate();
-                }
-                else
-                {
-                    continue;
-                }
-
-                $list[] = $info;
-            }
-            return $list;
-        }
-
-        /**
-         * @brief 특정 module srls를 sites의 domain과 결합
-         * 아직 XE DBHandler에서 left outer join이 안되어서..
-         * $output->data[]->module_srl 과 같은 구조여야 함
-         **/
-        function syncModuleToSite(&$data) {
-            if(!$data) return;
-
-            if(is_array($data)) {
-                foreach($data as $key => $val) {
-                    $module_srls[] = $val->module_srl;
-                }
-                if(!count($module_srls)) return;
-            } else {
-                $module_srls[] = $data->module_srl;
-            }
-
-            $args->module_srls = implode(',',$module_srls);
-            $output = executeQueryArray('module.getModuleSites', $args);
-            if(!$output->data) return array();
-            foreach($output->data as $key => $val) {
-                $modules[$val->module_srl] = $val;
-            }
-
-            if(is_array($data)) {
-                foreach($data as $key => $val) {
-                    $data[$key]->domain = $modules[$val->module_srl]->domain;
-                }
-            } else {
-                $data->domain = $modules[$data->module_srl]->domain;
-            }
-        }
-
-        /**
-         * @brief site_module_info의 관리자 인지 체크
-         **/
-        function isSiteAdmin($member_info, $site_srl = null) {
-            if(!$member_info->member_srl) return false;
-            if($member_info->is_admin == 'Y') return true;
-
-            if(!isset($site_srl))
-            {
-                $site_module_info = Context::get('site_module_info');
-                if(!$site_module_info) return;
-                $args->site_srl = $site_module_info->site_srl;
-            }
-            else
-            {
-                $args->site_srl = $site_srl;
-            }
-
-            $args->member_srl = $member_info->member_srl;
-            $output = executeQuery('module.isSiteAdmin', $args);
-            if($output->data->member_srl == $args->member_srl) return true;
-            return false;
-
-        }
-
-        /**
-         * @brief site의 관리자 정보를 구함
-         **/
-        function getSiteAdmin($site_srl) {
-            $args->site_srl = $site_srl;
-            $output = executeQueryArray('module.getSiteAdmin', $args);
-            return $output->data;
-        }
-
-        /**
-         * @brief 특정 모듈의 관리자 아이디 구함
-         **/
-        function getAdminId($module_srl) {
-            $obj->module_srl = $module_srl;
-            $output = executeQueryArray('module.getAdminID', $obj);
-            if(!$output->toBool() || !$output->data) return;
-
-            return $output->data;
-        }
-
-        /**
-         * @brief 특정 모듈의 추가 변수를 구함
-         * modules 테이블의 기본 정보 이외의 것
-         **/
-        function getModuleExtraVars($module_srl) {
-            if(is_array($module_srl)) $module_srl = implode(',',$module_srl);
-            $args->module_srl = $module_srl;
-            $output = executeQueryArray('module.getModuleExtraVars',$args);
-            if(!$output->toBool() || !$output->data) return;
-
-            $vars = array();
-            foreach($output->data as $key => $val) {
-                if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
-                $vars[$val->module_srl]->{$val->name} = $val->value;
-            }
-            return $vars;
-        }
-
-        /**
-         * @brief 특정 모듈의 스킨 정보를 구함
-         **/
-        function getModuleSkinVars($module_srl) {
-            $args->module_srl = $module_srl;
-            $output = executeQueryArray('module.getModuleSkinVars',$args);
-            if(!$output->toBool() || !$output->data) return;
-
-            $skin_vars = array();
-            foreach($output->data as $val) $skin_vars[$val->name] = $val;
-            return $skin_vars;
-        }
-
-        /**
-         * @brief 특정 모듈의 스킨 정보를 모듈 정보와 결합
-         **/
-        function syncSkinInfoToModuleInfo(&$module_info) {
-            if(!$module_info->module_srl) return;
-
-            $args->module_srl = $module_info->module_srl;
-            $output = executeQueryArray('module.getModuleSkinVars',$args);
-            if(!$output->toBool() || !$output->data) return;
-
-            foreach($output->data as $val) {
-                if(isset($module_info->{$val->name})) continue;
-                $module_info->{$val->name} = $val->value;
-            }
-        }
-
-        /**
-         * @brief 특정 모듈정보와 XML, 그리고 회원 정보로 권한을 return
-         **/
-        function getGrant($module_info, $member_info, $xml_info = '') {
-            if(!$xml_info) {
-                $module = $module_info->module;
-                $xml_info = $this->getModuleActionXml($module);
-            }
-            // 그룹 권한 설정에 필요한 변수를 세팅
-            $module_srl = $module_info->module_srl;
-            $grant_info = $xml_info->grant;
-            if($member_info->member_srl) {
-                if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
-                else $group_list = array();
-            } else {
-                $group_list = array();
-            }
-
-            // module_srl이 없는 즉 별도의 권한 설정이 안되는 경우
-            if(!$module_srl) {
-                $grant->access = true;
-                if($this->isSiteAdmin($member_info)) $grant->access = $grant->is_admin = $grant->manager = true;
-                else $grant->is_admin = $grant->manager = $member_info->is_admin=='Y'?true:false;
-
-            // module_srl이 있는 경우
-            } else {
-
-                // grant 종류를 구함
-                $grant->access = $grant->is_admin = $grant->manager = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info))?true:false;
-
-                // 관리자가 아니라 로그인 회원일 경우 이 모듈의 관리자인지 확인
-                if(!$grant->manager && $member_info->member_srl) {
-                    $args->module_srl = $module_srl;
-                    $args->member_srl = $member_info->member_srl;
-                    $output = executeQuery('module.getModuleAdmin',$args);
-                    if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = $grant->is_admin = true;
-                }
-
-                // 관리자가 아니면 직접 DB에서 정보를 구해서 권한 설정
-                if(!$grant->manager) {
-                    $args = null;
-
-                    // 플래닛인 경우 planet home의 권한 설정을 가져온다
-                    if ($module_info->module == 'planet') {
-                        $output = executeQueryArray('module.getPlanetGrants', $args);
-                    }
-                    else {
-                        $args->module_srl = $module_srl;
-                        $output = executeQueryArray('module.getModuleGrants', $args);
-                    }
-
-                    $grant_exists = $granted = array();
-
-                    if($output->data) {
-                        // 1차적으로 권한 대상 이름과 그룹을 정리
-                        foreach($output->data as $val) {
-                            $grant_exists[$val->name] = true;
-                            if($granted[$val->name]) continue;
-
-                            // 로그인 회원만
-                            if($val->group_srl == -1) {
-                                $granted[$val->name] = true;
-                                if($member_info->member_srl) $grant->{$val->name} = true;
-
-                            // 사이트 가입한 회원만
-                            } elseif($val->group_srl == -2) {
-                                $granted[$val->name] = true;
-                                // 비로그인 회원이면 권한 미부여
-                                if(!$member_info->member_srl) $grant->{$val->name} = false;
-                                // 로그인 회원
-                                else {
-                                    $site_module_info = Context::get('site_module_info');
-                                    // 현재 접속된 사이트 정보가 없으면 권한 부여
-                                    if(!$site_module_info->site_srl) $grant->{$val->name} = true;
-                                    // 현재 접속된 사이트의 그룹 정보가 있 으면 권한 미부여
-                                    elseif(count($group_list)) $grant->{$val->name} = true;
-                                }
-
-                            // 비로그인 회원 모두
-                            } elseif($val->group_srl == 0) {
-                                $granted[$val->name] = true;
-                                $grant->{$val->name} = true;
-                            // 특정 그룹 대상일 경우
-                            } else {
-                                if($group_list && count($group_list) && in_array($val->group_srl, $group_list)) {
-                                    $grant->{$val->name} = true;
-                                    $granted[$val->name] = true;
-                                }
-                            }
-                        }
-                    }
-
-                    // 가상 그룹인 access에 대해서 별도 처리
-                    if(!$grant_exists['access']) $grant->access = true;
-                    if(count($grant_info)) {
-                        foreach($grant_info as  $grant_name => $grant_item) {
-                            if($grant_exists[$grant_name]) continue;
-                            switch($grant_item->default) {
-                                case 'guest' :
-                                        $grant->{$grant_name} = true;
-                                    break;
-                                case 'member' :
-                                        if($member_info->member_srl) $grant->{$grant_name} = true;
-                                        else $grant->{$grant_name} = false;
-                                    break;
-                                case 'site' :
-                                        $site_module_info = Context::get('site_module_info');
-                                        if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
-                                        else $grant->{$grant_name} = false;
-                                    break;
-                                case 'manager' :
-                                case 'root' :
-                                        if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
-                                        else $grant->{$grant_name} = false;
-                                    break;
-                            }
-                        }
-                    }
-                }
-
-                // 관리자일 경우 모든 권한에 대해 true 지정
-                if($grant->manager) {
-                    $grant->access = true;
-                    if(count($grant_info)) {
-                        foreach($grant_info as $key => $val) {
-                            $grant->{$key} = true;
-                        }
-                    }
-                }
-
-            }
-            return $grant;
-        }
-
-
-
-        function getModuleFileBox($module_filebox_srl){
-            $args->module_filebox_srl = $module_filebox_srl;
-            return executeQuery('module.getModuleFileBox', $args);
-        }
-
-        function getModuleFileBoxList(){
-            $args->page = Context::get('page');
-            $args->list_count = 10;
-            $args->page_count = 10;
-            return executeQuery('module.getModuleFileBoxList', $args);
-        }
-
-        function getModuleFileBoxPath($module_filebox_srl){
-            return sprintf("./files/attach/filebox/%s",getNumberingPath($module_filebox_srl,3));
-        }
-    }
-?>
+<?php
+    /**
+     * @class  moduleModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief Model class of module module
+     **/
+
+    class moduleModel extends module {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Check if mid, vid are available
+         **/
+        function isIDExists($id, $site_srl = 0) {
+            if(!preg_match('/^[a-z]{1}([a-z0-9_]+)$/i',$id)) return true;
+            // directory and rss/atom/api reserved checking, etc.
+            $dirs = FileHandler::readDir(_XE_PATH_);
+            $dirs[] = 'rss';
+            $dirs[] = 'atom';
+            $dirs[] = 'api';
+            if(in_array($id, $dirs)) return true;
+            // mid test
+            $args->mid = $id;
+            $args->site_srl = $site_srl;
+            $output = executeQuery('module.isExistsModuleName', $args);
+            if($output->data->count) return true;
+            // vid test (check mid != vid if site_srl=0, which means it is not a virtual site)
+            if(!$site_srl) {
+                $site_args->domain = $id;
+                $output = executeQuery('module.isExistsSiteDomain', $site_args);
+                if($output->data->count) return true;
+            }
+
+            return false;
+        }
+
+        /**
+         * @brief Get site information
+         **/
+        function getSiteInfo($site_srl, $columnList = array()) {
+            $args->site_srl = $site_srl;
+            $output = executeQuery('module.getSiteInfo', $args, $columnList);
+            return $output->data;
+        }
+
+        function getSiteInfoByDomain($domain, $columnList = array()) {
+            $args->domain= $domain;
+            $output = executeQuery('module.getSiteInfoByDomain', $args, $columnList);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get module information with document_srl
+         * In this case, it is unable to use the cache file
+         **/
+        function getModuleInfoByDocumentSrl($document_srl) {
+            $args->document_srl = $document_srl;
+            $output = executeQuery('module.getModuleInfoByDocument', $args);
+            return $this->addModuleExtraVars($output->data);
+        }
+
+        /**
+         * @brief Get the defaul mid according to the domain
+         **/
+        function getDefaultMid() {
+            $default_url = preg_replace('/\/$/','',Context::getDefaultUrl());
+            $request_url = preg_replace('/\/$/','',Context::getRequestUri());
+            $vid = Context::get('vid');
+            $mid = Context::get('mid');
+
+            // Set up
+            // test.xe.com
+            $domain = '';
+            if($default_url && $default_url != $request_url) {
+                $url_info = parse_url($request_url);
+                $hostname = $url_info['host'];
+                $path = preg_replace('/\/$/','',$url_info['path']);
+                $domain = sprintf('%s%s%s', $hostname, $url_info['port']&&$url_info['port']!=80?':'.$url_info['port']:'',$path);
+            }
+            // xe.com/blog
+            if($domain === ''){
+                    if(!$vid) $vid = $mid;
+                    if($vid) {
+                            $domain = $vid;
+                    }
+            }
+
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            // If domain is set, look for subsite
+            if($domain !== ''){
+                if($oCacheHandler->isSupport()) $output = $oCacheHandler->get('domain_' . $domain);
+                if(!$output){
+                    $args->domain = $domain;
+                    $output = executeQuery('module.getSiteInfoByDomain', $args);
+                    if($oCacheHandler->isSupport() && $output->data) $oCacheHandler->put('domain_' . $domain, $output);
+                }
+                if($output->toBool() && $output->data && $vid) {
+                    Context::set('vid', $output->data->domain, true);
+                    if($mid==$output->data->domain) Context::set('mid',$output->data->mid,true);
+                }
+                if(!$output || !$output->data) { $domain = ''; unset($output); }
+            }
+            // If no virtual website was found, get default website
+            if($domain === '') {
+                if($oCacheHandler->isSupport())	$output = $oCacheHandler->get('default_site');
+                if(!$output){
+                    $args->site_srl = 0;
+                    $output = executeQuery('module.getSiteInfo', $args);
+                    // Update the related informaion if there is no default site info
+                    if(!$output->data) {
+                        // Create a table if sites table doesn't exist
+                        $oDB = &DB::getInstance();
+                        if(!$oDB->isTableExists('sites')) $oDB->createTableByXmlFile(_XE_PATH_.'modules/module/schemas/sites.xml');
+                        if(!$oDB->isTableExists('sites')) return;
+                        // Get mid, language
+                        $mid_output = $oDB->executeQuery('module.getDefaultMidInfo', $args);
+                        $db_info = Context::getDBInfo();
+                        $domain = Context::getDefaultUrl();
+                        $url_info = parse_url($domain);
+                        $domain = $url_info['host'].( (!empty($url_info['port'])&&$url_info['port']!=80)?':'.$url_info['port']:'').$url_info['path'];
+                        $site_args->site_srl = 0;
+                        $site_args->index_module_srl  = $mid_output->data->module_srl;
+                        $site_args->domain = $domain;
+                        $site_args->default_language = $db_info->lang_type;
+
+                        if($output->data && !$output->data->index_module_srl) {
+                                $output = executeQuery('module.updateSite', $site_args);
+                        } else {
+                                $output = executeQuery('module.insertSite', $site_args);
+                                if(!$output->toBool()) return $output;
+                        }
+                        $output = executeQuery('module.getSiteInfo', $args);
+                    }
+                    if($oCacheHandler->isSupport()) $oCacheHandler->put('default_site',$output);
+                }
+            }
+            $module_info = $output->data;
+            if(!$module_info->module_srl) return $module_info;
+            if(is_array($module_info) && $module_info->data[0]) $module_info = $module_info[0];
+            return $this->addModuleExtraVars($module_info);
+        }
+
+        /**
+         * @brief Get module information by mid
+         **/
+        function getModuleInfoByMid($mid, $site_srl = 0, $columnList = array()) {
+            $args->mid = $mid;
+            $args->site_srl = (int)$site_srl;
+            $oCacheHandler = &CacheHandler::getInstance('object');
+        	if($oCacheHandler->isSupport()){
+					$cache_key = 'object:'.$mid.'_'.$site_srl;
+					$module_srl = $oCacheHandler->get($cache_key);
+					if($module_srl){
+						$cache_key = 'object_module_info:'.$module_srl;
+						$output = $oCacheHandler->get($cache_key);
+					}
+			}
+			if(!$output){
+				$output = executeQuery('module.getMidInfo', $args);
+				if($oCacheHandler->isSupport()) {
+					$cache_key = 'object:'.$mid.'_'.$site_srl;
+					$oCacheHandler->put($cache_key,$output->data->module_srl);
+					$cache_key = 'object_module_info:'.$output->data->module_srl;
+					$oCacheHandler->put($cache_key,$output);
+				}
+			}
+
+            $module_info = $output->data;
+            if(!$module_info->module_srl && $module_info->data[0]) $module_info = $module_info->data[0];
+            return $this->addModuleExtraVars($module_info);
+        }
+
+        /**
+         * @brief Get module information corresponding to module_srl
+         **/
+        function getModuleInfoByModuleSrl($module_srl, $columnList = array()) {
+            // Get data
+            $args->module_srl = $module_srl;
+        	$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+				$cache_key = 'object:'.$module_srl;
+				$output = $oCacheHandler->get($cache_key);
+			}
+			if(!$output){
+            	$output = executeQuery('module.getMidInfo', $args );
+            	if(!$output->data) return;
+            	if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+			}
+    		if(count($columnList)){
+				foreach ($output->data as $key => $item) {
+		            if (in_array($key, $columnList)){
+		            	$module_info->$key = $item;
+		            }
+	            }
+			} else $module_info = $output->data;
+            return $this->addModuleExtraVars($module_info);
+        }
+
+        /**
+         * @brief Get module information corresponding to layout_srl
+         **/
+        function getModulesInfoByLayout($layout_srl, $columnList = array()) {
+            // Imported data
+            $args->layout_srl = $layout_srl;
+            $output = executeQueryArray('module.getModulesByLayout', $args, $columnList);
+
+            $count = count($output->data);
+
+            $modules = array();
+            for($i=0;$i<$count;$i++) {
+                $modules[] = $output->data[$i];
+            }
+            return $this->addModuleExtraVars($modules);
+        }
+
+        /**
+         * @brief Get module information corresponding to multiple module_srls
+         **/
+        function getModulesInfo($module_srls, $columnList = array()) {
+            if(is_array($module_srls)) $module_srls = implode(',',$module_srls);
+            $args->module_srls = $module_srls;
+            $output = executeQueryArray('module.getModulesInfo', $args, $columnList);
+            if(!$output->toBool()) return;
+            return $this->addModuleExtraVars($output->data);
+        }
+
+        /**
+         * @brief Add extra vars to the module basic information
+         **/
+        function addModuleExtraVars($module_info) {
+            // Process although one or more module informaion is requested
+            if(!is_array($module_info)) $target_module_info = array($module_info);
+            else $target_module_info = $module_info;
+            // Get module_srl
+            $module_srls = array();
+            foreach($target_module_info as $key => $val) {
+                $module_srl = $val->module_srl;
+                if(!$module_srl) continue;
+                $module_srls[] = $val->module_srl;
+            }
+            // Extract extra information of the module and skin
+            $extra_vars = $this->getModuleExtraVars($module_srls);
+            if(!count($module_srls) || !count($extra_vars)) return $module_info;
+
+            foreach($target_module_info as $key => $val) {
+                if(!$extra_vars[$val->module_srl] || !count($extra_vars[$val->module_srl])) continue;
+                foreach($extra_vars[$val->module_srl] as $k => $v) {
+                    if($target_module_info[$key]->{$k}) continue;
+                    $target_module_info[$key]->{$k} = $v;
+                }
+            }
+            if(is_array($module_info)) return $target_module_info;
+            return $target_module_info[0];
+        }
+
+        /**
+         * @brief Get a complete list of mid, which is created in the DB
+         **/
+        function getMidList($args = null, $columnList = array()) {
+            $output = executeQuery('module.getMidList', $args, $columnList);
+            if(!$output->toBool()) return $output;
+
+            $list = $output->data;
+            if(!$list) return;
+
+            if(!is_array($list)) $list = array($list);
+
+            foreach($list as $val) {
+                $mid_list[$val->mid] = $val;
+            }
+            return $mid_list;
+        }
+
+        /**
+         * @brief Get a complete list of module_srl, which is created in the DB
+         **/
+		function getModuleSrlList($args = null, $columnList = array())
+		{
+            $output = executeQueryArray('module.getMidList', $args, $columnList);
+            if(!$output->toBool()) return $output;
+
+            $list = $output->data;
+            if(!$list) return;
+
+			return $list;
+		}
+
+        /**
+         * @brief Return an array of module_srl corresponding to a mid list
+         **/
+        function getModuleSrlByMid($mid) {
+            if($mid && !is_array($mid)) $mid = explode(',',$mid);
+            if(is_array($mid)) $mid = "'".implode("','",$mid)."'";
+
+            $site_module_info = Context::get('site_module_info');
+
+            $args->mid = $mid;
+            if($site_module_info) $args->site_srl = $site_module_info->site_srl;
+            $output = executeQuery('module.getModuleSrlByMid', $args);
+            if(!$output->toBool()) return $output;
+
+            $list = $output->data;
+            if(!$list) return;
+            if(!is_array($list)) $list = array($list);
+
+            foreach($list as $key => $val) {
+                $module_srl_list[] = $val->module_srl;
+            }
+
+            return $module_srl_list;
+        }
+
+        /**
+         * @brief Get forward value by the value of act
+         **/
+        function getActionForward($act, $module = "") {
+            $args->act = $act;
+            $args->module = ($module)?$module:null;
+            if (strlen ($args->module) > 0) $output = executeQuery ('module.getActionForwardWithModule', $args);
+            else $output = executeQuery('module.getActionForward',$args);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get a list of all triggers on the trigger_name
+         **/
+        function getTriggers($trigger_name, $called_position) {
+             // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object:'.$trigger_name.'_'.$called_position;
+                    $output = $oCacheHandler->get($cache_key);
+            }
+            if(!$output) {
+                $args->trigger_name = $trigger_name;
+                $args->called_position = $called_position;
+                $output = executeQueryArray('module.getTriggers',$args);
+                if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+            }
+            return $output->data;
+        }
+
+        /**
+         * @brief Get specific triggers from the trigger_name
+         **/
+        function getTrigger($trigger_name, $module, $type, $called_method, $called_position) {
+            $args->trigger_name = $trigger_name;
+            $args->module = $module;
+            $args->type = $type;
+            $args->called_method = $called_method;
+            $args->called_position = $called_position;
+            $output = executeQuery('module.getTrigger',$args);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get module extend
+         **/
+		function getModuleExtend($parent_module, $type, $kind='') {
+			$key = $parent_module.'.'.$kind.'.'.$type;
+
+			$module_extend_info = $this->loadModuleExtends();
+			if(array_key_exists($key, $module_extend_info))
+			{
+				return $module_extend_info[$key];
+			}
+
+			return false;
+		}
+
+        /**
+         * @brief Get all the module extend
+         **/
+		function loadModuleExtends() {
+			$cache_file = './files/config/module_extend.php';
+			$cache_file = FileHandler::getRealPath($cache_file);
+
+			if(!isset($GLOBALS['__MODULE_EXTEND__'])){
+
+				// check pre install
+				if(file_exists(FileHandler::getRealPath('./files')) && !file_exists($cache_file)) {
+					$arr = array();
+					$output = executeQueryArray('module.getModuleExtend');
+					if($output->data){
+						foreach($output->data as $v){
+							$arr[] = sprintf("'%s.%s.%s' => '%s'", $v->parent_module, $v->kind, $v->type, $v->extend_module);
+						}
+					}
+
+					$str = '<?PHP return array(%s); ?>';
+					$str = sprintf($str, join(',',$arr));
+
+					FileHandler::writeFile($cache_file, $str);
+				}
+
+
+				if(file_exists($cache_file)) {
+					$GLOBALS['__MODULE_EXTEND__'] = include($cache_file);
+				} else {
+					$GLOBALS['__MODULE_EXTEND__'] = array();
+				}
+			}
+
+			return $GLOBALS['__MODULE_EXTEND__'];
+		}
+
+        /**
+         * @brief Get information from conf/info.xml
+         **/
+        function getModuleInfoXml($module) {
+            // Get a path of the requested module. Return if not exists.
+            $module_path = ModuleHandler::getModulePath($module);
+            if(!$module_path) return;
+            // Read the xml file for module skin information
+            $xml_file = sprintf("%s/conf/info.xml", $module_path);
+            if(!file_exists($xml_file)) return;
+
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            $xml_obj = $tmp_xml_obj->module;
+
+            if(!$xml_obj) return;
+            // Module Information
+            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
+                // module format 0.2
+                $module_info->title = $xml_obj->title->body;
+                $module_info->description = $xml_obj->description->body;
+                $module_info->version = $xml_obj->version->body;
+                $module_info->homepage = $xml_obj->link->body;
+                $module_info->category = $xml_obj->category->body;
+                if(!$module_info->category) $module_info->category = 'service';
+                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $module_info->license = $xml_obj->license->body;
+                $module_info->license_link = $xml_obj->license->attrs->link;
+
+                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+                else $author_list = $xml_obj->author;
+
+                foreach($author_list as $author) {
+                    unset($author_obj);
+                    $author_obj->name = $author->name->body;
+                    $author_obj->email_address = $author->attrs->email_address;
+                    $author_obj->homepage = $author->attrs->link;
+                    $module_info->author[] = $author_obj;
+                }
+
+                // history
+                if($xml_obj->history) {
+                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
+                    else $history = $xml_obj->history;
+
+                    foreach($history as $item) {
+                        unset($obj);
+
+                        if($item->author) {
+                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
+
+                            foreach($obj->author_list as $author) {
+                                unset($author_obj);
+                                $author_obj->name = $author->name->body;
+                                $author_obj->email_address = $author->attrs->email_address;
+                                $author_obj->homepage = $author->attrs->link;
+                                $obj->author[] = $author_obj;
+                            }
+                        }
+
+                        $obj->name = $item->name->body;
+                        $obj->email_address = $item->attrs->email_address;
+                        $obj->homepage = $item->attrs->link;
+                        $obj->version = $item->attrs->version;
+                        $obj->date = $item->attrs->date;
+                        $obj->description = $item->description->body;
+
+                        if($item->log) {
+                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
+
+                            foreach($obj->log as $log) {
+                                unset($logs_obj);
+                                $logs_obj->text = $log->body;
+                                $logs_obj->link = $log->attrs->link;
+                                $obj->logs[] = $logs_obj;
+                            }
+                        }
+
+                        $module_info->history[] = $obj;
+                    }
+                }
+
+
+            } else {
+                // module format 0.1
+                $module_info->title = $xml_obj->title->body;
+                $module_info->description = $xml_obj->author->description->body;
+                $module_info->version = $xml_obj->attrs->version;
+                $module_info->category = $xml_obj->attrs->category;
+                if(!$module_info->category) $module_info->category = 'service';
+                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $module_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $author_obj->name = $xml_obj->author->name->body;
+                $author_obj->email_address = $xml_obj->author->attrs->email_address;
+                $author_obj->homepage = $xml_obj->author->attrs->link;
+                $module_info->author[] = $author_obj;
+            }
+            // Add admin_index by using action information
+            $action_info = $this->getModuleActionXml($module);
+            $module_info->admin_index_act = $action_info->admin_index_act;
+            $module_info->default_index_act = $action_info->default_index_act;
+            $module_info->setup_index_act = $action_info->setup_index_act;
+
+            return $module_info;
+        }
+
+        /**
+         * @brief Return permisson and action data by conf/module.xml in the module
+         * Cache it because it takes too long to parse module.xml file
+         * When caching, add codes so to include it directly
+         * This is apparently good for performance, but not sure about its side-effects
+         **/
+        function getModuleActionXml($module) {
+            // Get a path of the requested module. Return if not exists.
+            $class_path = ModuleHandler::getModulePath($module);
+            if(!$class_path) return;
+            // Check if module.xml exists in the path. Return if not exist
+            $xml_file = sprintf("%sconf/module.xml", $class_path);
+            if(!file_exists($xml_file)) return;
+            // Check if cached file exists
+            $cache_file = sprintf("./files/cache/module_info/%s.%s.%s.php", $module, Context::getLangType(), __ZBXE_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)) {
+
+                $buff = ""; // /< Set buff variable to use in the cache file
+
+                $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;
+
+                    foreach($grant_list as $grant) {
+                        $name = $grant->attrs->name;
+                        $default = $grant->attrs->default?$grant->attrs->default:'guest';
+                        $title = $grant->title->body;
+
+                        $info->grant->{$name}->title = $title;
+                        $info->grant->{$name}->default = $default;
+
+                        $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;
+
+                    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;
+
+                    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}->title = $menu_title;
+						$info->menu->{$menu_name}->acts = array();
+						$info->menu->{$menu_name}->type = $menu_type;
+
+                        $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;
+
+                    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=='true'?'true':'false';
+                        $ruleset = $action->attrs->ruleset?$action->attrs->ruleset:'';
+
+                        $index = $action->attrs->index;
+                        $admin_index = $action->attrs->admin_index;
+                        $setup_index = $action->attrs->setup_index;
+                        $menu_index = $action->attrs->menu_index;
+
+                        $output->action->{$name}->type = $type;
+                        $output->action->{$name}->grant = $grant;
+                        $output->action->{$name}->standalone= $standalone;
+
+                        $info->action->{$name}->type = $type;
+                        $info->action->{$name}->grant = $grant;
+                        $info->action->{$name}->standalone = $standalone=='true'?true:false;
+                        $info->action->{$name}->ruleset = $ruleset;
+						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);
+							}
+							array_push($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->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);
+
+                        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;
+                        }
+                    }
+                }
+                $buff = sprintf('<?php if(!defined("__ZBXE__")) exit();$info->default_index_act = \'%s\';$info->setup_index_act=\'%s\';$info->admin_index_act = \'%s\';%s?>', $default_index_act, $setup_index_act, $admin_index_act, $buff);
+
+                FileHandler::writeFile($cache_file, $buff);
+
+                return $info;
+            }
+
+            @include($cache_file);
+
+            return $info;
+        }
+
+
+        /**
+         * @brief Get a list of skins for the module
+         * Return file analysis of skin and skin.xml
+         **/
+        function getSkins($path, $dir = 'skins') {
+            $skin_path = sprintf("%s/%s/", $path, $dir);
+            $list = FileHandler::readDir($skin_path);
+            if(!count($list)) return;
+
+            natcasesort($list);
+
+            foreach($list as $skin_name) {
+                unset($skin_info);
+                $skin_info = $this->loadSkinInfo($path, $skin_name, $dir);
+                if(!$skin_info) $skin_info->title = $skin_name;
+
+                $skin_list[$skin_name] = $skin_info;
+            }
+
+            return $skin_list;
+        }
+
+        /**
+         * @brief Get skin information on a specific location
+         **/
+        function loadSkinInfo($path, $skin, $dir = 'skins') {
+            // Read xml file having skin information
+            if(substr($path,-1)!='/') $path .= '/';
+            $skin_xml_file = sprintf("%s%s/%s/skin.xml", $path, $dir, $skin);
+            if(!file_exists($skin_xml_file)) return;
+            // Create XmlParser object
+            $oXmlParser = new XmlParser();
+            $_xml_obj = $oXmlParser->loadXmlFile($skin_xml_file);
+            // Return if no skin information is
+            if(!$_xml_obj->skin) return;
+            $xml_obj = $_xml_obj->skin;
+            // Skin Name
+            $skin_info->title = $xml_obj->title->body;
+            // Author information
+            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
+                // skin format v0.2
+                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $skin_info->version = $xml_obj->version->body;
+                $skin_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $skin_info->homepage = $xml_obj->link->body;
+                $skin_info->license = $xml_obj->license->body;
+                $skin_info->license_link = $xml_obj->license->attrs->link;
+                $skin_info->description = $xml_obj->description->body;
+
+                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+                else $author_list = $xml_obj->author;
+
+                foreach($author_list as $author) {
+                    unset($author_obj);
+                    $author_obj->name = $author->name->body;
+                    $author_obj->email_address = $author->attrs->email_address;
+                    $author_obj->homepage = $author->attrs->link;
+                    $skin_info->author[] = $author_obj;
+                }
+                // List extra vars
+                if($xml_obj->extra_vars) {
+                    $extra_var_groups = $xml_obj->extra_vars->group;
+                    if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                    if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+
+                    foreach($extra_var_groups as $group) {
+                        $extra_vars = $group->var;
+                        if(!is_array($group->var)) $extra_vars = array($group->var);
+
+                        foreach($extra_vars as $key => $val) {
+                            unset($obj);
+                            if(!$val->attrs->type) { $val->attrs->type = 'text'; }
+
+                            $obj->group = $group->title->body;
+                            $obj->name = $val->attrs->name;
+                            $obj->title = $val->title->body;
+                            $obj->type = $val->attrs->type;
+                            $obj->description = $val->description->body;
+                            $obj->value = $extra_vals->{$obj->name};
+                            $obj->default = $val->attrs->default;
+                            if(strpos($obj->value, '|@|') != false) { $obj->value = explode('|@|', $obj->value); }
+                            if($obj->type == 'mid_list' && !is_array($obj->value)) { $obj->value = array($obj->value); }
+                            // Get an option list from 'select'type
+                            if(is_array($val->options)) {
+                                $option_count = count($val->options);
+
+                                for($i = 0; $i < $option_count; $i++) {
+                                    $obj->options[$i]->title = $val->options[$i]->title->body;
+                                    $obj->options[$i]->value = $val->options[$i]->attrs->value;
+                                }
+                            } else {
+                                $obj->options[0]->title = $val->options->title->body;
+                                $obj->options[0]->value = $val->options->attrs->value;
+                            }
+
+                            $skin_info->extra_vars[] = $obj;
+                        }
+                    }
+                }
+
+                // history
+                if($xml_obj->history) {
+                    if(!is_array($xml_obj->history)) $history[] = $xml_obj->history;
+                    else $history = $xml_obj->history;
+
+                    foreach($history as $item) {
+                        unset($obj);
+
+                        if($item->author) {
+                            (!is_array($item->author)) ? $obj->author_list[] = $item->author : $obj->author_list = $item->author;
+
+                            foreach($obj->author_list as $author) {
+                                unset($author_obj);
+                                $author_obj->name = $author->name->body;
+                                $author_obj->email_address = $author->attrs->email_address;
+                                $author_obj->homepage = $author->attrs->link;
+                                $obj->author[] = $author_obj;
+                            }
+                        }
+
+                        $obj->name = $item->name->body;
+                        $obj->email_address = $item->attrs->email_address;
+                        $obj->homepage = $item->attrs->link;
+                        $obj->version = $item->attrs->version;
+                        $obj->date = $item->attrs->date;
+                        $obj->description = $item->description->body;
+
+                        if($item->log) {
+                            (!is_array($item->log)) ? $obj->log[] = $item->log : $obj->log = $item->log;
+
+                            foreach($obj->log as $log) {
+                                unset($log_obj);
+                                $log_obj->text = $log->body;
+                                $log_obj->link = $log->attrs->link;
+                                $obj->logs[] = $log_obj;
+                            }
+                        }
+
+                        $skin_info->history[] = $obj;
+                    }
+                }
+
+
+            } else {
+
+                // skin format v0.1
+                sscanf($xml_obj->maker->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+
+                $skin_info->version = $xml_obj->version->body;
+                $skin_info->date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $skin_info->homepage = $xml_obj->link->body;
+                $skin_info->license = $xml_obj->license->body;
+                $skin_info->license_link = $xml_obj->license->attrs->link;
+                $skin_info->description = $xml_obj->maker->description->body;
+
+                $skin_info->author[0]->name = $xml_obj->maker->name->body;
+                $skin_info->author[0]->email_address = $xml_obj->maker->attrs->email_address;
+                $skin_info->author[0]->homepage = $xml_obj->maker->attrs->link;
+                // Variables used in the skin
+                $extra_var_groups = $xml_obj->extra_vars->group;
+                if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+                if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+
+                foreach($extra_var_groups as $group){
+                    $extra_vars = $group->var;
+
+                    if($extra_vars) {
+
+                        if(!is_array($extra_vars)) $extra_vars = array($extra_vars);
+
+                        foreach($extra_vars as $var) {
+                            unset($obj);
+                            unset($options);
+
+                            $group = $group->title->body;
+                            $name = $var->attrs->name;
+                            $type = $var->attrs->type;
+                            $title = $var->title->body;
+                            $description = $var->description->body;
+                            // Get an option list from 'select'type.
+                            if(is_array($var->default)) {
+                                $option_count = count($var->default);
+
+                                for($i = 0; $i < $option_count; $i++) {
+                                    $options[$i]->title = $var->default[$i]->body;
+                                    $options[$i]->value = $var->default[$i]->body;
+                                }
+                            } else {
+                                $options[0]->title = $var->default->body;
+                                $options[0]->value = $var->default->body;
+                            }
+
+                            $width = $var->attrs->width;
+                            $height = $var->attrs->height;
+
+                            unset($obj);
+                            $obj->group = $group;
+                            $obj->title = $title;
+                            $obj->description = $description;
+                            $obj->name = $name;
+                            $obj->type = $type;
+                            $obj->options = $options;
+                            $obj->width = $width;
+                            $obj->height = $height;
+                            $obj->default = $options[0]->value;
+
+                            $skin_info->extra_vars[] = $obj;
+                        }
+                    }
+                }
+            }
+
+            // colorset
+            $colorset = $xml_obj->colorset->color;
+            if($colorset) {
+                if(!is_array($colorset)) $colorset = array($colorset);
+
+                foreach($colorset as $color) {
+                    $name = $color->attrs->name;
+                    $title = $color->title->body;
+                    $screenshot = $color->attrs->src;
+                    if($screenshot) {
+                        $screenshot = sprintf("%sskins/%s/%s", $path, $skin, $screenshot);
+                        if(!file_exists($screenshot)) $screenshot = "";
+                    } else $screenshot = "";
+
+                    unset($obj);
+                    $obj->name = $name;
+                    $obj->title = $title;
+                    $obj->screenshot = $screenshot;
+                    $skin_info->colorset[] = $obj;
+                }
+            }
+            // Menu type (settings for layout)
+            if($xml_obj->menus->menu) {
+                $menus = $xml_obj->menus->menu;
+                if(!is_array($menus)) $menus = array($menus);
+
+                $menu_count = count($menus);
+                $skin_info->menu_count = $menu_count;
+                for($i=0;$i<$menu_count;$i++) {
+                    unset($obj);
+
+                    $obj->name = $menus[$i]->attrs->name;
+                    if($menus[$i]->attrs->default == "true") $obj->default = true;
+                    $obj->title = $menus[$i]->title->body;
+                    $obj->maxdepth = $menus[$i]->maxdepth->body;
+
+                    $skin_info->menu->{$obj->name} = $obj;
+                }
+            }
+
+            $thumbnail = sprintf("%s%s/%s/thumbnail.png", $path, $dir, $skin);
+            $skin_info->thumbnail = (file_exists($thumbnail))?$thumbnail:null;
+            return $skin_info;
+        }
+
+        /**
+         * @brief Return the number of modules which are registered on a virtual site
+         **/
+        function getModuleCount($site_srl, $module = null) {
+            $args->site_srl = $site_srl;
+            if(!is_null($module)) $args->module = $module;
+            $output = executeQuery('module.getModuleCount', $args);
+            return $output->data->count;
+        }
+
+        /**
+         * @brief Return module configurations
+         * Global configuration is used to manage board, member and others
+         **/
+        function getModuleConfig($module, $site_srl = 0) {
+            // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object:module_config:module_'.$module.'_site_srl_'.$site_srl;
+                    $config = $oCacheHandler->get($cache_key);
+            }
+            if(!$config) {
+                if(!$GLOBALS['__ModuleConfig__'][$site_srl][$module]) {
+                    $args->module = $module;
+                    $args->site_srl = $site_srl;
+                    $output = executeQuery('module.getModuleConfig', $args);
+                    $config = unserialize($output->data->config);
+                    //insert in cache
+                    if($oCacheHandler->isSupport()) {
+                        if($config)
+							$oCacheHandler->put($cache_key,$config);
+                    }
+                    $GLOBALS['__ModuleConfig__'][$site_srl][$module] = $config;
+                }
+                return $GLOBALS['__ModuleConfig__'][$site_srl][$module];
+            }
+
+            return $config;
+        }
+
+        /**
+         * @brief Return the module configuration of mid
+         * Manage mid configurations which depend on module
+         **/
+        function getModulePartConfig($module, $module_srl) {
+            // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object_module_part_config:'.$module.'_'.$module_srl;
+                    $config = $oCacheHandler->get($cache_key);
+            }
+            if(!$config) {
+                if(!$GLOBALS['__ModulePartConfig__'][$module][$module_srl]) {
+                    $args->module = $module;
+                    $args->module_srl = $module_srl;
+                    $output = executeQuery('module.getModulePartConfig', $args);
+                    $config = unserialize($output->data->config);
+                    //insert in cache
+                    if($oCacheHandler->isSupport()) {
+                        if($config) $oCacheHandler->put($cache_key,$config);
+                    }
+                    $GLOBALS['__ModulePartConfig__'][$module][$module_srl] = $config;
+                }
+				return $GLOBALS['__ModulePartConfig__'][$module][$module_srl];
+            }
+
+            return $config;
+
+        }
+
+        /**
+         * @brief Get all of module configurations for each mid
+         **/
+        function getModulePartConfigs($module, $site_srl = 0) {
+            $args->module = $module;
+            if($site_srl) $args->site_srl = $site_srl;
+            $output = executeQueryArray('module.getModulePartConfigs', $args);
+            if(!$output->toBool() || !$output->data) return array();
+
+            foreach($output->data as $key => $val) {
+                $result[$val->module_srl] = unserialize($val->config);
+            }
+            return $result;
+        }
+
+
+        /**
+         * @brief Get a list of module category
+         **/
+        function getModuleCategories() {
+            // Get data from the DB
+            $output = executeQuery('module.getModuleCategories');
+            if(!$output->toBool()) return $output;
+            $list = $output->data;
+            if(!$list) return;
+            if(!is_array($list)) $list = array($list);
+
+            foreach($list as $val) {
+                $category_list[$val->module_category_srl] = $val;
+            }
+            return $category_list;
+        }
+
+        /**
+         * @brief Get content from the module category
+         **/
+        function getModuleCategory($module_category_srl) {
+            // Get data from the DB
+            $args->module_category_srl = $module_category_srl;
+            $output = executeQuery('module.getModuleCategory', $args);
+            if(!$output->toBool()) return $output;
+            return $output->data;
+        }
+
+        /**
+         * @brief Get xml information of the module
+         **/
+        function getModulesXmlInfo() {
+            // Get a list of downloaded and installed modules
+            $searched_list = FileHandler::readDir('./modules');
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+            sort($searched_list);
+
+            for($i=0;$i<$searched_count;$i++) {
+                // Module name
+                $module_name = $searched_list[$i];
+
+                $path = ModuleHandler::getModulePath($module_name);
+                // Get information of the module
+                $info = $this->getModuleInfoXml($module_name);
+                unset($obj);
+
+                $info->module = $module_name;
+                $info->created_table_count = $created_table_count;
+                $info->table_count = $table_count;
+                $info->path = $path;
+                $info->admin_index_act = $info->admin_index_act;
+                $list[] = $info;
+            }
+            return $list;
+        }
+
+        function checkNeedInstall($module_name)
+        {
+            $oDB = &DB::getInstance();
+            $info = null;
+
+            $moduledir = ModuleHandler::getModulePath($module_name);
+            if(file_exists(FileHandler::getRealPath($moduledir."schemas")))
+            {
+                $tmp_files = FileHandler::readDir($moduledir."schemas", '/(\.xml)$/');
+                $table_count = count($tmp_files);
+                // Check if the table is created
+                $created_table_count = 0;
+                for($j=0;$j<count($tmp_files);$j++) {
+                    list($table_name) = explode(".",$tmp_files[$j]);
+                    if($oDB->isTableExists($table_name)) $created_table_count ++;
+                }
+                // Check if DB is installed
+                if($table_count > $created_table_count) return true;
+                else return false;
+            }
+            return false;
+        }
+
+        function checkNeedUpdate($module_name)
+        {
+            // Check if it is upgraded to module.class.php on each module
+            $oDummy = &getModule($module_name, 'class');
+            if($oDummy && method_exists($oDummy, "checkUpdate")) {
+                return $oDummy->checkUpdate();
+            }
+            return false;
+        }
+
+        /**
+         * @brief Get a type and information of the module
+         **/
+        function getModuleList() {
+            // Create DB Object
+            $oDB = &DB::getInstance();
+            // Get a list of downloaded and installed modules
+            $searched_list = FileHandler::readDir('./modules', '/^([a-zA-Z0-9_-]+)$/');
+            sort($searched_list);
+
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+
+            for($i=0;$i<$searched_count;$i++) {
+                // module name
+                $module_name = $searched_list[$i];
+
+                $path = ModuleHandler::getModulePath($module_name);
+				if(!is_dir(FileHandler::getRealPath($path))) continue;
+
+                // Get the number of xml files to create a table in schemas
+                $tmp_files = FileHandler::readDir($path."schemas", '/(\.xml)$/');
+                $table_count = count($tmp_files);
+                // Check if the table is created
+                $created_table_count = 0;
+                for($j=0;$j<count($tmp_files);$j++) {
+                    list($table_name) = explode(".",$tmp_files[$j]);
+                    if($oDB->isTableExists($table_name)) $created_table_count ++;
+                }
+                // Get information of the module
+                $info = $this->getModuleInfoXml($module_name);
+                unset($obj);
+
+                $info->module = $module_name;
+                $info->category = $info->category;
+                $info->created_table_count = $created_table_count;
+                $info->table_count = $table_count;
+                $info->path = $path;
+                $info->admin_index_act = $info->admin_index_act;
+                // Check if DB is installed
+                if($table_count > $created_table_count) $info->need_install = true;
+                else $info->need_install = false;
+                // Check if it is upgraded to module.class.php on each module
+                $oDummy = null;
+                $oDummy = &getModule($module_name, 'class');
+                if($oDummy && method_exists($oDummy, "checkUpdate")) {
+                    $info->need_update = $oDummy->checkUpdate();
+                }
+                else
+                {
+                    continue;
+                }
+
+                $list[] = $info;
+            }
+            return $list;
+        }
+
+        /**
+         * @brief Combine module_srls with domain of sites
+         * Because XE DBHandler doesn't support left outer join,
+         * it should be as same as $Output->data[]->module_srl.
+         **/
+        function syncModuleToSite(&$data) {
+            if(!$data) return;
+
+            if(is_array($data)) {
+                foreach($data as $key => $val) {
+                    $module_srls[] = $val->module_srl;
+                }
+                if(!count($module_srls)) return;
+            } else {
+                $module_srls[] = $data->module_srl;
+            }
+
+            $args->module_srls = implode(',',$module_srls);
+            $output = executeQueryArray('module.getModuleSites', $args);
+            if(!$output->data) return array();
+            foreach($output->data as $key => $val) {
+                $modules[$val->module_srl] = $val;
+            }
+
+            if(is_array($data)) {
+                foreach($data as $key => $val) {
+                    $data[$key]->domain = $modules[$val->module_srl]->domain;
+                }
+            } else {
+                $data->domain = $modules[$data->module_srl]->domain;
+            }
+        }
+
+        /**
+         * @brief Check if it is an administrator of site_module_info
+         **/
+        function isSiteAdmin($member_info, $site_srl = null) {
+            if(!$member_info->member_srl) return false;
+            if($member_info->is_admin == 'Y') return true;
+
+            if(!isset($site_srl))
+            {
+                $site_module_info = Context::get('site_module_info');
+                if(!$site_module_info) return;
+                $args->site_srl = $site_module_info->site_srl;
+            }
+            else
+            {
+                $args->site_srl = $site_srl;
+            }
+
+            $args->member_srl = $member_info->member_srl;
+            $output = executeQuery('module.isSiteAdmin', $args);
+            if($output->data->member_srl == $args->member_srl) return true;
+            return false;
+
+        }
+
+        /**
+         * @brief Get admin information of the site
+         **/
+        function getSiteAdmin($site_srl) {
+            $args->site_srl = $site_srl;
+            $output = executeQueryArray('module.getSiteAdmin', $args);
+            return $output->data;
+        }
+
+        /**
+         * @brief Get admin ID of the module
+         **/
+        function getAdminId($module_srl) {
+            $obj->module_srl = $module_srl;
+            $output = executeQueryArray('module.getAdminID', $obj);
+            if(!$output->toBool() || !$output->data) return;
+
+            return $output->data;
+        }
+
+        /**
+         * @brief Get extra vars of the module
+         * Extra information, not in the modules table
+         **/
+        function getModuleExtraVars($module_srl) {
+             if(is_array($module_srl)) $module_srl = implode(',',$module_srl);
+            // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object:module_extra_vars_'.$module_srl;
+                    $vars = $oCacheHandler->get($cache_key);
+            }
+            if(!$vars) {
+                $args->module_srl = $module_srl;
+                $output = executeQueryArray('module.getModuleExtraVars',$args);
+                if(!$output->toBool() || !$output->data) {
+                    if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,'empty_extra_vars');
+                    return;
+                }
+                $vars = array();
+                foreach($output->data as $key => $val) {
+                    if(in_array($val->name, array('mid','module')) || $val->value == 'Array') continue;
+                    $vars[$val->module_srl]->{$val->name} = $val->value;
+                }
+                if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$vars);
+            } elseif($vars == 'empty_extra_vars') {
+                return;
+            }
+            return $vars;
+        }
+
+        /**
+         * @brief Get skin information of the module
+         **/
+        function getModuleSkinVars($module_srl) {
+            $args->module_srl = $module_srl;
+            $output = executeQueryArray('module.getModuleSkinVars',$args);
+            if(!$output->toBool() || !$output->data) return;
+
+            $skin_vars = array();
+            foreach($output->data as $val) $skin_vars[$val->name] = $val;
+            return $skin_vars;
+        }
+
+        /**
+         * @brief Combine skin information with module information
+         **/
+        function syncSkinInfoToModuleInfo(&$module_info) {
+            if(!$module_info->module_srl) return;
+            // cache controll
+            $oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()){
+                    $cache_key = 'object_module_skin_vars:'.$module_info->module_srl;
+                    $output = $oCacheHandler->get($cache_key);
+            }
+            if(!$output) {
+                $args->module_srl = $module_info->module_srl;
+                $output = executeQueryArray('module.getModuleSkinVars',$args);
+                //insert in cache
+	        if($oCacheHandler->isSupport()) $oCacheHandler->put($cache_key,$output);
+            }
+            if(!$output->toBool() || !$output->data) return;
+
+            foreach($output->data as $val) {
+                if(isset($module_info->{$val->name})) continue;
+                $module_info->{$val->name} = $val->value;
+            }
+        }
+
+        /**
+         * @brief Return permission by using module info, xml info and member info
+         **/
+        function getGrant($module_info, $member_info, $xml_info = '') {
+            if(!$xml_info) {
+                $module = $module_info->module;
+                $xml_info = $this->getModuleActionXml($module);
+            }
+            // Set variables to grant group permission
+            $module_srl = $module_info->module_srl;
+            $grant_info = $xml_info->grant;
+            if($member_info->member_srl) {
+                if(is_array($member_info->group_list)) $group_list = array_keys($member_info->group_list);
+                else $group_list = array();
+            } else {
+                $group_list = array();
+            }
+            // If module_srl doesn't exist(if unable to set permissions)
+            if(!$module_srl) {
+                $grant->access = true;
+                if($this->isSiteAdmin($member_info, $module_info->site_srl)) $grant->access = $grant->is_admin = $grant->manager = $grant->is_site_admin = true;
+                else $grant->is_admin = $grant->manager = $member_info->is_admin=='Y'?true:false;
+            // If module_srl exists
+            } else {
+                // Get a type of granted permission
+                $grant->access = $grant->is_admin = $grant->manager = $grant->is_site_admin = ($member_info->is_admin=='Y'||$this->isSiteAdmin($member_info, $module_info->site_srl))?true:false;
+                // If a just logged-in member is, check if the member is a module administrator
+                if(!$grant->manager && $member_info->member_srl) {
+                    $args->module_srl = $module_srl;
+                    $args->member_srl = $member_info->member_srl;
+                    $output = executeQuery('module.getModuleAdmin',$args);
+                    if($output->data && $output->data->member_srl == $member_info->member_srl) $grant->manager = $grant->is_admin = true;
+                }
+                // If not an administrator, get information from the DB and grant manager privilege.
+                if(!$grant->manager) {
+                    $args = null;
+                    // If planet, get permission settings from the planet home
+                    if ($module_info->module == 'planet') {
+                        $output = executeQueryArray('module.getPlanetGrants', $args);
+                    }
+                    else {
+                        $args->module_srl = $module_srl;
+                        $output = executeQueryArray('module.getModuleGrants', $args);
+                    }
+
+                    $grant_exists = $granted = array();
+
+                    if($output->data) {
+                        // Arrange names and groups who has privileges
+                        foreach($output->data as $val) {
+                            $grant_exists[$val->name] = true;
+                            if($granted[$val->name]) continue;
+                            // Log-in member only
+                            if($val->group_srl == -1) {
+                                $granted[$val->name] = true;
+                                if($member_info->member_srl) $grant->{$val->name} = true;
+                            // Site-joined member only
+                            } elseif($val->group_srl == -2) {
+                                $granted[$val->name] = true;
+                                // Do not grant any permission for non-logged member
+                                if(!$member_info->member_srl) $grant->{$val->name} = false;
+                                // Log-in member
+                                else {
+                                    $site_module_info = Context::get('site_module_info');
+                                    // Permission granted if no information of the currently connected site exists
+                                    if(!$site_module_info->site_srl) $grant->{$val->name} = true;
+                                    // Permission is not granted if information of the currently connected site exists
+                                    elseif(count($group_list)) $grant->{$val->name} = true;
+                                }
+                            // All of non-logged members
+                            } elseif($val->group_srl == 0) {
+                                $granted[$val->name] = true;
+                                $grant->{$val->name} = true;
+                            // If a target is a group
+                            } else {
+                                if($group_list && count($group_list) && in_array($val->group_srl, $group_list)) {
+                                    $grant->{$val->name} = true;
+                                    $granted[$val->name] = true;
+                                }
+                            }
+                        }
+                    }
+                    // Separate processing for the virtual group access
+                    if(!$grant_exists['access']) $grant->access = true;
+                    if(count($grant_info)) {
+                        foreach($grant_info as  $grant_name => $grant_item) {
+                            if($grant_exists[$grant_name]) continue;
+                            switch($grant_item->default) {
+                                case 'guest' :
+                                        $grant->{$grant_name} = true;
+                                    break;
+                                case 'member' :
+                                        if($member_info->member_srl) $grant->{$grant_name} = true;
+                                        else $grant->{$grant_name} = false;
+                                    break;
+                                case 'site' :
+                                        $site_module_info = Context::get('site_module_info');
+                                        if($member_info->member_srl && (($site_module_info->site_srl && count($group_list)) || !$site_module_info->site_srl)) $grant->{$grant_name} = true;
+                                        else $grant->{$grant_name} = false;
+                                    break;
+                                case 'manager' :
+                                case 'root' :
+                                        if($member_info->is_admin == 'Y') $grant->{$grant_name} = true;
+                                        else $grant->{$grant_name} = false;
+                                    break;
+                            }
+                        }
+                    }
+                }
+                // Set true to grant all privileges if an administrator is
+                if($grant->manager) {
+                    $grant->access = true;
+                    if(count($grant_info)) {
+                        foreach($grant_info as $key => $val) {
+                            $grant->{$key} = true;
+                        }
+                    }
+                }
+
+            }
+            return $grant;
+        }
+
+        function getModuleFileBox($module_filebox_srl){
+            $args->module_filebox_srl = $module_filebox_srl;
+            return executeQuery('module.getModuleFileBox', $args);
+        }
+
+        function getModuleFileBoxList(){
+            $args->page = Context::get('page');
+            $args->list_count = 5;
+            $args->page_count = 5;
+            return executeQuery('module.getModuleFileBoxList', $args);
+        }
+
+		function getFileBoxListHtml()
+		{
+			$logged_info = Context::get('logged_info');
+			if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+			$oModuleModel = &getModel('module');
+			$output = $oModuleModel->getModuleFileBoxList();
+			Context::set('filebox_list', $output->data);
+
+			$page = Context::get('page');
+			if (!$page) $page = 1;
+			Context::set('page', $page);
+			Context::set('page_navigation', $output->page_navigation);
+
+			$security = new Security();
+			$security->encodeHTML('filebox_list..comment');
+
+			$oTemplate = &TemplateHandler::getInstance();
+			$html = $oTemplate->compile('./modules/module/tpl/', 'filebox_list_html');
+
+			$this->add('html', $html);
+		}
+
+        function getModuleFileBoxPath($module_filebox_srl){
+            return sprintf("./files/attach/filebox/%s",getNumberingPath($module_filebox_srl,3));
+        }
+
+        /**
+         * @brief Return ruleset cache file path
+		 * @param module, act
+         **/
+        function getValidatorFilePath($module, $ruleset) {
+			// load dynamic ruleset xml file
+			if (strpos($ruleset, '@') !== false){
+				$rulsetFile = str_replace('@', '', $ruleset);
+				$xml_file = sprintf('./files/ruleset/%s.xml', $rulsetFile);
+				return FileHandler::getRealPath($xml_file);
+			}
+            // Get a path of the requested module. Return if not exists.
+            $class_path = ModuleHandler::getModulePath($module);
+            if(!$class_path) return;
+
+            // Check if module.xml exists in the path. Return if not exist
+            $xml_file = sprintf("%sruleset/%s.xml", $class_path, $ruleset);
+            if(!file_exists($xml_file)) return;
+
+			return $xml_file;
+        }
+
+		function getLangListByLangcodeForAutoComplete() {
+			$keyword = Context::get('search_keyword');
+
+			$requestVars = Context::getRequestVars();
+
+            $args->site_srl = (int)$requestVars->site_srl;
+            $args->page = 1; // /< Page
+            $args->list_count = 100; // /< the number of posts to display on a single page
+            $args->page_count = 5; // /< the number of pages that appear in the page navigation
+            $args->sort_index = 'name';
+            $args->order_type = 'asc';
+            $args->search_keyword = Context::get('search_keyword'); // /< keyword to search*/
+
+            $output = executeQueryArray('module.getLangListByLangcode', $args);
+
+			$list = array();
+
+			if($output->toBool()){
+				foreach((array)$output->data as $code_info){
+					unset($codeInfo);
+					$codeInfo = array('name'=>'$user_lang->'.$code_info->name, 'value'=>$code_info->value);
+					$list[] = $codeInfo;
+				}
+			}
+			$this->add('results', $list);
+		}
+
+        /**
+         * @brief already instance created module list
+         **/
+		function getModuleListByInstance($columnList = array())
+		{
+			$output = executeQueryArray('module.getModuleListByInstance', $args, $columnList);
+			return $output;
+		}
+
+		function getLangByLangcode()
+		{
+			$langCode = Context::get('langCode');
+			if (!$langCode) return;
+
+			$oModuleController = &getController('module');
+			$oModuleController->replaceDefinedLangCode($langCode);
+
+			$this->add('lang', $langCode);
+		}
+    }
+?>
diff --git a/modules/module/module.view.php b/modules/module/module.view.php
index 65ec532ab..f111814e3 100644
--- a/modules/module/module.view.php
+++ b/modules/module/module.view.php
@@ -1,161 +1,151 @@
-<?php
-    /**
-     * @class  moduleView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  module 모듈의 view class
-     **/
-
-    class moduleView extends module {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // template path 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 스킨 정보 출력
-         **/
-        function dispModuleSkinInfo() {
-            $selected_module = Context::get('selected_module');
-            $skin = Context::get('skin');
-
-            // 모듈/스킨 정보를 구함
-            $module_path = sprintf("./modules/%s/", $selected_module);
-            if(!is_dir($module_path)) $this->stop("msg_invalid_request");
-
-            $skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
-            if(!file_exists($skin_info_xml)) $this->stop("msg_invalid_request");
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
-            Context::set('skin_info',$skin_info);
-
-            $this->setLayoutFile("popup_layout");
-            $this->setTemplateFile("skin_info");
-        }
-
-        /**
-         * @brief 모듈 선택기
-         **/
-        function dispModuleSelectList() {
-            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
-
-            $oModuleModel = &getModel('module');
-
-            // virtual site의 개수를 추출
-            $output = executeQuery('module.getSiteCount');
-            $site_count = $output->data->count;
-            Context::set('site_count', $site_count);
-
-            // 사이트 검색어 변수 설정
-            $site_keyword = Context::get('site_keyword');
-
-            // 사이트 검색어가 없으면 현재 가상 사이트의 정보를 설정
-            $args = null;
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin == 'Y') {
-                $query_id = 'module.getSiteModules';
-                $module_category_exists = false;
-                if(!$site_keyword) {
-                    $site_module_info = Context::get('site_module_info');
-                    if($site_module_info && $logged_info->is_admin != 'Y') {
-                        $site_keyword = $site_module_info->domain;
-                        $args->site_srl = (int)$site_module_info->site_srl;
-                        Context::set('site_keyword', $site_keyword);
-                    } else {
-                        $query_id = 'module.getDefaultModules';
-                        $args->site_srl = 0;
-                        $module_category_exists = true;
-                    }
-                // 사이트 검색어가 있으면 해당 사이트(들)의 정보를 추출
-                } else {
-                    $args->site_keyword = $site_keyword;
-                }
-            } else {
-                $query_id = 'module.getSiteModules';
-                $site_module_info = Context::get('site_module_info');
-                $args->site_srl = (int)$site_module_info->site_srl;
-            }
-            //if(is_null($args->site_srl)) $query_id = 'module.getDefaultModules';
-
-            // 지정된 사이트(혹은 전체)의 module 목록을 구함
-            $output = executeQueryArray($query_id, $args);
-            $category_list = $mid_list = array();
-            if(count($output->data)) {
-                foreach($output->data as $key => $val) {
-                    $module = trim($val->module);
-                    if(!$module) continue;
-
-                    $category = $val->category;
-                    $obj = null;
-                    $obj->module_srl = $val->module_srl;
-                    $obj->browser_title = $val->browser_title;
-                    $mid_list[$module]->list[$category][$val->mid] = $obj;
-                }
-            }
-
-            $selected_module = Context::get('selected_module');
-            if(count($mid_list)) {
-                foreach($mid_list as $module => $val) {
-                    if(!$selected_module) $selected_module = $module;
-                    $xml_info = $oModuleModel->getModuleInfoXml($module);
-                    $mid_list[$module]->title = $xml_info->title;
-                }
-            }
-
-            Context::set('mid_list', $mid_list);
-            Context::set('selected_module', $selected_module);
-            Context::set('selected_mids', $mid_list[$selected_module]->list);
-            Context::set('module_category_exists', $module_category_exists);
-
-            // 레이아웃을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('module_selector');
-        }
-
-
-        // 파일 박스 보기
-        function dispModuleFileBox(){
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
-
-            $input_name = Context::get('input');
-
-            if(!$input_name) return new Object(-1, 'msg_not_permitted');
-
-
-            $addscript = sprintf('<script type="text/javascript">//<![CDATA[
-                            var selected_filebox_input_name = "%s";
-                          //]]></script>',$input_name);
-            Context::addHtmlHeader($addscript);
-
-            $oModuleModel = &getModel('module');
-            $output = $oModuleModel->getModuleFileBoxList();
-            Context::set('filebox_list', $output->data);
-
-            $filter = Context::get('filter');
-            if($filter) Context::set('arrfilter',explode(',',$filter));
-
-            Context::set('page_navigation', $output->page_navigation);
-            $this->setLayoutFile('popup_layout');
-            $this->setTemplateFile('filebox_list');
-        }
-
-        // 파일 박스 등록화면
-        function dispModuleFileBoxAdd(){
-            $logged_info = Context::get('logged_info');
-            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
-
-            $filter = Context::get('filter');
-            if($filter) Context::set('arrfilter',explode(',',$filter));
-
-            $this->setLayoutFile('popup_layout');
-            $this->setTemplateFile('filebox_add');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  moduleView
+     * @author NHN (developers@xpressengine.com)
+     * @brief view class of the module module
+     **/
+
+    class moduleView extends module {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Set the template path
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Display skin information
+         **/
+        function dispModuleSkinInfo() {
+            $selected_module = Context::get('selected_module');
+            $skin = Context::get('skin');
+            // Get modules/skin information
+            $module_path = sprintf("./modules/%s/", $selected_module);
+            if(!is_dir($module_path)) $this->stop("msg_invalid_request");
+
+            $skin_info_xml = sprintf("%sskins/%s/skin.xml", $module_path, $skin);
+            if(!file_exists($skin_info_xml)) $this->stop("msg_invalid_request");
+
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($module_path, $skin);
+            Context::set('skin_info',$skin_info);
+
+            $this->setLayoutFile("popup_layout");
+            $this->setTemplateFile("skin_info");
+        }
+
+        /**
+         * @brief Select a module
+         **/
+        function dispModuleSelectList() {
+            if(!Context::get('is_logged')) return new Object(-1, 'msg_not_permitted');
+
+            $oModuleModel = &getModel('module');
+            // Extract the number of virtual sites
+            $output = executeQuery('module.getSiteCount');
+            $site_count = $output->data->count;
+            Context::set('site_count', $site_count);
+            // Variable setting for site keyword
+            $site_keyword = Context::get('site_keyword');
+            // If there is no site keyword, use as information of the current virtual site
+            $args = null;
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin == 'Y') {
+                $query_id = 'module.getSiteModules';
+                $module_category_exists = false;
+                if(!$site_keyword) {
+                    $site_module_info = Context::get('site_module_info');
+                    if($site_module_info && $logged_info->is_admin != 'Y') {
+                        $site_keyword = $site_module_info->domain;
+                        $args->site_srl = (int)$site_module_info->site_srl;
+                        Context::set('site_keyword', $site_keyword);
+                    } else {
+                        $query_id = 'module.getDefaultModules';
+                        $args->site_srl = 0;
+                        $module_category_exists = true;
+                    }
+                // If site keyword exists, extract information from the sites
+                } else {
+                    $args->site_keyword = $site_keyword;
+                }
+            } else {
+                $query_id = 'module.getSiteModules';
+                $site_module_info = Context::get('site_module_info');
+                $args->site_srl = (int)$site_module_info->site_srl;
+            }
+            //if(is_null($args->site_srl)) $query_id = 'module.getDefaultModules';
+            // Get a list of modules at the site
+            $output = executeQueryArray($query_id, $args);
+            $category_list = $mid_list = array();
+            if(count($output->data)) {
+                foreach($output->data as $key => $val) {
+                    $module = trim($val->module);
+                    if(!$module) continue;
+
+                    $category = $val->category;
+                    $obj = null;
+                    $obj->module_srl = $val->module_srl;
+                    $obj->browser_title = $val->browser_title;
+                    $mid_list[$module]->list[$category][$val->mid] = $obj;
+                }
+            }
+
+            $selected_module = Context::get('selected_module');
+            if(count($mid_list)) {
+                foreach($mid_list as $module => $val) {
+                    if(!$selected_module) $selected_module = $module;
+                    $xml_info = $oModuleModel->getModuleInfoXml($module);
+                    $mid_list[$module]->title = $xml_info->title;
+                }
+            }
+
+            Context::set('mid_list', $mid_list);
+            Context::set('selected_module', $selected_module);
+            Context::set('selected_mids', $mid_list[$selected_module]->list);
+            Context::set('module_category_exists', $module_category_exists);
+            // Set the layout to be pop-up
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('module_selector');
+        }
+        // See the file box
+        function dispModuleFileBox(){
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $input_name = Context::get('input');
+
+            if(!$input_name) return new Object(-1, 'msg_not_permitted');
+
+
+            $addscript = sprintf('<script type="text/javascript">//<![CDATA[
+                            var selected_filebox_input_name = "%s";
+                          //]]></script>',$input_name);
+            Context::addHtmlHeader($addscript);
+
+            $oModuleModel = &getModel('module');
+            $output = $oModuleModel->getModuleFileBoxList();
+            Context::set('filebox_list', $output->data);
+
+            $filter = Context::get('filter');
+            if($filter) Context::set('arrfilter',explode(',',$filter));
+
+            Context::set('page_navigation', $output->page_navigation);
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('filebox_list');
+        }
+        // Screen to add a file box
+        function dispModuleFileBoxAdd(){
+            $logged_info = Context::get('logged_info');
+            if($logged_info->is_admin !='Y' && !$logged_info->is_site_admin) return new Object(-1, 'msg_not_permitted');
+
+            $filter = Context::get('filter');
+            if($filter) Context::set('arrfilter',explode(',',$filter));
+
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplateFile('filebox_add');
+        }
+    }
+?>
diff --git a/modules/module/queries/deleteModuleConfig.xml b/modules/module/queries/deleteModuleConfig.xml
index 9c16e04b5..1f164d183 100644
--- a/modules/module/queries/deleteModuleConfig.xml
+++ b/modules/module/queries/deleteModuleConfig.xml
@@ -4,5 +4,6 @@
     </tables>
     <conditions>
         <condition operation="equal" column="module" var="module" notnull="notnull" />
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/module/queries/deleteModuleExtend.xml b/modules/module/queries/deleteModuleExtend.xml
index e0b1d1f3a..8a4b45e81 100644
--- a/modules/module/queries/deleteModuleExtend.xml
+++ b/modules/module/queries/deleteModuleExtend.xml
@@ -1,11 +1,11 @@
-<query id="deleteModuleExtend" action="delete">
-    <tables>
-        <table name="module_extend" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="parent_module" var="parent_module" notnull="notnull" pipe="and" />
-        <condition operation="equal" column="extend_module" var="extend_module" pipe="and" />
-        <condition operation="equal" column="type" var="type" pipe="and" />
-        <condition operation="equal" column="kind" var="kind" pipe="and" />
-    </conditions>
-</query>
+<query id="deleteModuleExtend" action="delete">
+    <tables>
+        <table name="module_extend" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="parent_module" var="parent_module" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="extend_module" var="extend_module" pipe="and" />
+        <condition operation="equal" column="type" var="type" pipe="and" />
+        <condition operation="equal" column="kind" var="kind" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/module/queries/deleteModuleFileBox.xml b/modules/module/queries/deleteModuleFileBox.xml
index 5c9473ce5..d8c416f9c 100644
--- a/modules/module/queries/deleteModuleFileBox.xml
+++ b/modules/module/queries/deleteModuleFileBox.xml
@@ -1,8 +1,8 @@
-<query id="deleteModuleFileBox" action="delete">
-    <tables>
-        <table name="module_filebox" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" filter="number" notnull="notnull" />
-    </conditions>
+<query id="deleteModuleFileBox" action="delete">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" filter="number" notnull="notnull" />
+    </conditions>
 </query>
\ No newline at end of file
diff --git a/modules/module/queries/deleteTrigger.xml b/modules/module/queries/deleteTrigger.xml
index 9327799b7..8760bdeac 100644
--- a/modules/module/queries/deleteTrigger.xml
+++ b/modules/module/queries/deleteTrigger.xml
@@ -1,12 +1,12 @@
-<query id="deleteTrigger" action="delete">
-    <tables>
-        <table name="module_trigger" />
-    </tables>
-    <conditions>
-        <condition operation="equal" column="trigger_name" var="trigger_name" notnull="notnull" />
-        <condition operation="equal" column="module" var="module" notnull="notnull" pipe="and" />
-        <condition operation="equal" column="type" var="type" notnull="notnull" pipe="and" />
-        <condition operation="equal" column="called_method" var="called_method" notnull="notnull" pipe="and" />
-        <condition operation="equal" column="called_position" var="called_position" notnull="notnull" pipe="and" />
-    </conditions>
+<query id="deleteTrigger" action="delete">
+    <tables>
+        <table name="module_trigger" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="trigger_name" var="trigger_name" notnull="notnull" />
+        <condition operation="equal" column="module" var="module" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="type" var="type" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="called_method" var="called_method" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="called_position" var="called_position" notnull="notnull" pipe="and" />
+    </conditions>
 </query>
\ No newline at end of file
diff --git a/modules/module/queries/getAdminSrls.xml b/modules/module/queries/getAdminSrls.xml
index 7f3e89b39..3aa8ecbaf 100644
--- a/modules/module/queries/getAdminSrls.xml
+++ b/modules/module/queries/getAdminSrls.xml
@@ -7,5 +7,6 @@
     </columns>
     <conditions>
         <condition operation="in" column="user_id" var="user_ids" />
+        <condition operation="in" column="email_address" var="email_address" />
     </conditions>
 </query>
diff --git a/modules/module/queries/getAllSkinSetModule.xml b/modules/module/queries/getAllSkinSetModule.xml
new file mode 100644
index 000000000..0608deb7c
--- /dev/null
+++ b/modules/module/queries/getAllSkinSetModule.xml
@@ -0,0 +1,11 @@
+<query id="getAllSkinSetModule" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="notequal" column="skin" default=" " />
+    </conditions>
+</query>
diff --git a/modules/module/queries/getLangListByLangcode.xml b/modules/module/queries/getLangListByLangcode.xml
new file mode 100644
index 000000000..fe0e12e91
--- /dev/null
+++ b/modules/module/queries/getLangListByLangcode.xml
@@ -0,0 +1,20 @@
+<query id="getLangListByLangcode" action="select">
+    <tables>
+        <table name="lang" />
+    </tables>
+    <columns>
+        <column name="name" />
+        <column name="value" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
+        <condition operation="in" column="lang_code" var="langCode" pipe="and" />
+		<condition operation="like" column="value" var="search_keyword" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="list_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/module/queries/getLangListByName.xml b/modules/module/queries/getLangListByName.xml
new file mode 100644
index 000000000..967e186f8
--- /dev/null
+++ b/modules/module/queries/getLangListByName.xml
@@ -0,0 +1,15 @@
+<query id="getLangList" action="select">
+    <tables>
+        <table name="lang" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
+        <condition operation="in" column="name" var="langName" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="lang_code" order="order_type" />
+    </navigation>
+</query>
diff --git a/modules/syndication/queries/getLang.xml b/modules/module/queries/getLangNameByValue.xml
similarity index 60%
rename from modules/syndication/queries/getLang.xml
rename to modules/module/queries/getLangNameByValue.xml
index eb0c59672..494bd8c81 100644
--- a/modules/syndication/queries/getLang.xml
+++ b/modules/module/queries/getLangNameByValue.xml
@@ -1,4 +1,4 @@
-<query id="getLang" action="select">
+<query id="getLangNameByValue" action="select">
     <tables>
         <table name="lang" />
     </tables>
@@ -7,6 +7,9 @@
     </columns>
     <conditions>
         <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" filter="number" />
-        <condition operation="equal" column="lang_code" var="lang_code" pipe="and" />
+		<condition operation="like_prefix" column="value" var="value" pipe="and" />
     </conditions>
+	<groups>
+		<group column="name" />
+	</groups>
 </query>
diff --git a/modules/module/queries/getModuleConfig.xml b/modules/module/queries/getModuleConfig.xml
index f479357e1..a531f73ac 100644
--- a/modules/module/queries/getModuleConfig.xml
+++ b/modules/module/queries/getModuleConfig.xml
@@ -7,5 +7,6 @@
     </columns>
     <conditions>
         <condition operation="equal" column="module" var="module" />
+        <condition operation="equal" column="site_srl" var="site_srl" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/module/queries/getModuleFileBox.xml b/modules/module/queries/getModuleFileBox.xml
index b8faa2112..c2818239b 100644
--- a/modules/module/queries/getModuleFileBox.xml
+++ b/modules/module/queries/getModuleFileBox.xml
@@ -1,9 +1,9 @@
-<query id="getModuleFileBox" action="select">
-    <tables>
-        <table name="module_filebox" />
-    </tables>
-    <columns />
-    <conditions>
-        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" filter="number" />
-    </conditions>
+<query id="getModuleFileBox" action="select">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns />
+    <conditions>
+        <condition operation="equal" column="module_filebox_srl" var="module_filebox_srl" filter="number" />
+    </conditions>
 </query>
\ No newline at end of file
diff --git a/modules/module/queries/getModuleFileBoxList.xml b/modules/module/queries/getModuleFileBoxList.xml
index 76aa291c0..68ff42b85 100644
--- a/modules/module/queries/getModuleFileBoxList.xml
+++ b/modules/module/queries/getModuleFileBoxList.xml
@@ -1,15 +1,15 @@
-<query id="getModuleFileBoxList" action="select">
-    <tables>
-        <table name="module_filebox" />
-    </tables>
-    <columns />
-    <conditions>
-        <condition operation="in" column="fileextension" var="fileextension" />
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="module_filebox_srl" order="desc" />
-        <list_count var="list_count" default="10" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
+<query id="getModuleFileBoxList" action="select">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns />
+    <conditions>
+        <condition operation="in" column="fileextension" var="fileextension" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_filebox_srl" order="desc" />
+        <list_count var="list_count" default="10" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
 </query>
\ No newline at end of file
diff --git a/modules/module/queries/getModuleListByInstance.xml b/modules/module/queries/getModuleListByInstance.xml
new file mode 100644
index 000000000..f668b74ea
--- /dev/null
+++ b/modules/module/queries/getModuleListByInstance.xml
@@ -0,0 +1,11 @@
+<query id="getModuleListByInstance" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+	<groups>
+		<group column="module" />
+	</groups>
+</query>
diff --git a/modules/module/queries/getSiteModules.xml b/modules/module/queries/getSiteModules.xml
index 2c80abe39..6d9988eea 100644
--- a/modules/module/queries/getSiteModules.xml
+++ b/modules/module/queries/getSiteModules.xml
@@ -17,7 +17,7 @@
         <condition operation="equal" column="sites.site_srl" default="modules.site_srl" pipe="and" />
     </conditions>
     <navigation>
-        <index  var="sort_index" default="modules.module" order="asc" />
-        <index  var="sort_index" default="modules.mid" order="asc" />
+        <index  var="sort_index1" default="modules.module" order="asc" />
+        <index  var="sort_index2" default="modules.mid" order="asc" />
     </navigation>
 </query>
diff --git a/modules/module/queries/insertModuleConfig.xml b/modules/module/queries/insertModuleConfig.xml
index ef871bdf0..a39fa4282 100644
--- a/modules/module/queries/insertModuleConfig.xml
+++ b/modules/module/queries/insertModuleConfig.xml
@@ -5,6 +5,7 @@
     <columns>
         <column name="module" var="module" notnull="notnull" />
         <column name="config" var="config" />
+        <column name="site_srl" var="site_srl" notnull="notnull" />
         <column name="regdate" default="curdate()" />
     </columns>
 </query>
diff --git a/modules/module/queries/insertModuleFileBox.xml b/modules/module/queries/insertModuleFileBox.xml
index e9fc56203..59b0410d8 100644
--- a/modules/module/queries/insertModuleFileBox.xml
+++ b/modules/module/queries/insertModuleFileBox.xml
@@ -1,14 +1,14 @@
-<query id="insertModuleFileBox" action="insert">
-    <tables>
-        <table name="module_filebox" />
-    </tables>
-    <columns>
-        <column name="module_filebox_srl"  var="module_filebox_srl"  notnull="notnull" />
-        <column name="member_srl" var="member_srl" notnull="notnull" />
-        <column name="filename" var="filename" />
-        <column name="fileextension" var="fileextension" />
-        <column name="filesize" var="filesize" />
-        <column name="comment" var="comment" />
-        <column name="regdate" default="curdate()" />
-    </columns>
-</query>
+<query id="insertModuleFileBox" action="insert">
+    <tables>
+        <table name="module_filebox" />
+    </tables>
+    <columns>
+        <column name="module_filebox_srl"  var="module_filebox_srl"  notnull="notnull" />
+        <column name="member_srl" var="member_srl" notnull="notnull" />
+        <column name="filename" var="filename" />
+        <column name="fileextension" var="fileextension" />
+        <column name="filesize" var="filesize" />
+        <column name="comment" var="comment" />
+        <column name="regdate" default="curdate()" />
+    </columns>
+</query>
diff --git a/modules/module/queries/updateAllModuleSkinInSiteWithTheme.xml b/modules/module/queries/updateAllModuleSkinInSiteWithTheme.xml
new file mode 100644
index 000000000..6fb45f38b
--- /dev/null
+++ b/modules/module/queries/updateAllModuleSkinInSiteWithTheme.xml
@@ -0,0 +1,15 @@
+<query id="updateModule" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+		<column name="skin" var="skin" notnull="notnull" />
+	</columns>
+    <conditions>
+        <condition operation="equal" column="site_srl" var="site_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="module" var="module" notnull="notnull" pipe="and" />
+		<condition operation="equal" column="is_skin_fix" default="N" pipe="and" />
+		<condition operation="in" column="module_srl" var="module_srls" pipe="and" />
+    </conditions>
+</query>
+
diff --git a/modules/module/queries/updateSkinFixModules.xml b/modules/module/queries/updateSkinFixModules.xml
new file mode 100644
index 000000000..3c458e211
--- /dev/null
+++ b/modules/module/queries/updateSkinFixModules.xml
@@ -0,0 +1,11 @@
+<query id="updateSkinFixModules" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="is_skin_fix" var="is_skin_fix" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srls" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/module/ruleset/copyModule.xml b/modules/module/ruleset/copyModule.xml
new file mode 100644
index 000000000..188467599
--- /dev/null
+++ b/modules/module/ruleset/copyModule.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_srl" required="true" />
+		<field name="mid_1" rule="alpha_number" />
+		<field name="mid_2" rule="alpha_number" />
+		<field name="mid_3" rule="alpha_number" />
+		<field name="mid_4" rule="alpha_number" />
+		<field name="mid_5" rule="alpha_number" />
+		<field name="mid_6" rule="alpha_number" />
+		<field name="mid_7" rule="alpha_number" />
+		<field name="mid_8" rule="alpha_number" />
+		<field name="mid_9" rule="alpha_number" />
+		<field name="mid_10" rule="alpha_number" />
+    </fields>
+</ruleset>
diff --git a/modules/module/ruleset/deleteCategory.xml b/modules/module/ruleset/deleteCategory.xml
new file mode 100644
index 000000000..2d09d7867
--- /dev/null
+++ b/modules/module/ruleset/deleteCategory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_category_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/module/ruleset/insertCategory.xml b/modules/module/ruleset/insertCategory.xml
new file mode 100644
index 000000000..79b27e272
--- /dev/null
+++ b/modules/module/ruleset/insertCategory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/module/ruleset/insertModuleSetup.xml b/modules/module/ruleset/insertModuleSetup.xml
new file mode 100644
index 000000000..f5e1ba2cd
--- /dev/null
+++ b/modules/module/ruleset/insertModuleSetup.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_srls" required="true" />
+		<field name="module_category_srl" rule="number" />
+		<field name="layout_srl" rule="number" />
+		<field name="skin" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/module/ruleset/insertModulesGrant.xml b/modules/module/ruleset/insertModulesGrant.xml
new file mode 100644
index 000000000..dd09d8203
--- /dev/null
+++ b/modules/module/ruleset/insertModulesGrant.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_srls" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/module/ruleset/updateCategory.xml b/modules/module/ruleset/updateCategory.xml
new file mode 100644
index 000000000..089d3017f
--- /dev/null
+++ b/modules/module/ruleset/updateCategory.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_category_srl" required="true" rule="number" />
+		<field name="title" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/module/schemas/module_config.xml b/modules/module/schemas/module_config.xml
index 3cd9a780f..4bab7e86c 100644
--- a/modules/module/schemas/module_config.xml
+++ b/modules/module/schemas/module_config.xml
@@ -1,5 +1,6 @@
 <table name="module_config">
     <column name="module" type="varchar" size="250" notnull="notnull" primary_key="primary_key" />
+    <column name="site_srl" type="number" size="11" notnull="notnull" />
     <column name="config" type="text" />
     <column name="regdate" type="date" />
 </table>
diff --git a/modules/module/schemas/module_filebox.xml b/modules/module/schemas/module_filebox.xml
index d2b4dfc29..939dcb0ab 100644
--- a/modules/module/schemas/module_filebox.xml
+++ b/modules/module/schemas/module_filebox.xml
@@ -1,9 +1,9 @@
-<table name="module_filebox">
-    <column name="module_filebox_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
-    <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
-    <column name="filename" type="varchar" size="250" notnull="notnull" />
-    <column name="fileextension" type="varchar" size="4" notnull="notnull" index="idx_fileextension" />
-    <column name="filesize" type="number" size="11" default="0" notnull="notnull" />
-    <column name="comment" type="varchar" size="250" />
-    <column name="regdate" type="date" />
+<table name="module_filebox">
+    <column name="module_filebox_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+    <column name="member_srl" type="number" size="11" notnull="notnull" index="idx_member_srl" />
+    <column name="filename" type="varchar" size="250" notnull="notnull" />
+    <column name="fileextension" type="varchar" size="4" notnull="notnull" index="idx_fileextension" />
+    <column name="filesize" type="number" size="11" default="0" notnull="notnull" />
+    <column name="comment" type="varchar" size="250" />
+    <column name="regdate" type="date" />
 </table>
\ No newline at end of file
diff --git a/modules/module/schemas/modules.xml b/modules/module/schemas/modules.xml
index 74e03acec..cf9bc08e4 100644
--- a/modules/module/schemas/modules.xml
+++ b/modules/module/schemas/modules.xml
@@ -8,6 +8,7 @@
     <column name="menu_srl" type="number" size="11" default="0" />
     <column name="site_srl" type="number" size="11" notnull="notnull" default="0" />
     <column name="mid" type="varchar" size="40" notnull="notnull" />
+    <column name="is_skin_fix" type="char" size="1" notnull="notnull" default="Y" />
     <column name="skin" type="varchar" size="250" />
     <column name="mskin" type="varchar" size="250" />
     <column name="browser_title" type="varchar" size="250" notnull="notnull" />
diff --git a/modules/module/tpl/adminFileBox.html b/modules/module/tpl/adminFileBox.html
new file mode 100644
index 000000000..538843364
--- /dev/null
+++ b/modules/module/tpl/adminFileBox.html
@@ -0,0 +1,82 @@
+<!--%load_js_plugin("filebox")-->
+		<h1 class="h1">{$lang->menu_gnb_sub['filebox']}</h1>
+		<div class="fileBox">
+			<form action="" class="portlet form" method="post" enctype="multipart/form-data">
+				<input type="hidden" name="module" value="module" />
+				<input type="hidden" name="act" value="procModuleFileBoxAdd" />
+				<input type="hidden" name="vid" value="{$vid}" />
+				<input type="hidden" name="filter" value="{$filter}" />
+				<input type="hidden" name="input" value="{$input}" />
+				<h2>{$lang->upload_file}</h2>
+				<span class="more"><a href="#fileUp" class="tgAnchor" data-effect="slide" data-duration="200">{$lang->cmd_show_hide}</a></span>
+				<div class="tgContent" id="fileUp">
+					<p>
+						<label for="fileDescription">{$lang->description}</label> <input type="text" name="comment" id="fileDescription" /><br />
+						<label for="file">{$lang->file}</label> <input type="file" name="addfile" id="file"/>
+					</p>
+					<div class="btnArea">
+						<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+					</div>
+				</div>
+			</form>
+			<form action="" class="form">
+				<ul>
+					<li loop="$filebox_list=>$key,$val">
+						<p class="q">{$val->comment}</p>
+						<p class="a">
+							<!--@if($val->fileextension=='swf')-->
+
+							<object height="100" width="100" flashvars="" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" xmlns="http://www.w3.org/1999/xhtml">
+								<param value="{getUrl('')}{$val->filename}" name="movie" xmlns="http://www.w3.org/1999/xhtml" />
+								<param value="transparent" name="wmode" xmlns="http://www.w3.org/1999/xhtml" />
+								<param value="sameDomain" name="allowScriptAccess" xmlns="http://www.w3.org/1999/xhtml" />
+								<param value="high" name="quality" xmlns="http://www.w3.org/1999/xhtml" />
+								<embed height="100" width="100" wmode="transparent" flashvars="" autostart="false" src="{getUrl('')}{$val->filename}" xmlns="http://www.w3.org/1999/xhtml" />
+							</object>
+
+							<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
+								<img src="{getUrl('')}{$val->filename}" style="max-height:100px" />
+							<!--@end-->
+						</p>
+						<button type="button" class="side text" onclick="XE.filebox.deleteFile('{$val->module_filebox_srl}');" >{$lang->cmd_delete}</button>
+					</li>
+				</ul>
+			</form>
+		</div>
+		<form action="" class="pagination" method="post">
+			<input type="hidden" name="error_return_url" value="" />
+			<input type="hidden" name="module" value="{$module}" />
+			<input type="hidden" name="act" value="{$act}" />
+			<input cond="$order_target" type="hidden" name="order_target" value="{$order_target}" />
+			<input cond="$order_type" type="hidden" name="order_type" value="{$order_type}" />
+			<input cond="$category_srl" type="hidden" name="category_srl" value="{$category_srl}" />
+			<input cond="$childrenList" type="hidden" name="childrenList" value="{$childrenList}" />
+			<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+
+			<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+
+			<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+				{@$isGoTo = true}
+				<a href="{getUrl('page', '')}">1</a>
+				<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+			</block>
+
+			<!--@while($page_no = $page_navigation->getNextPage())-->
+				{@$last_page = $page_no}
+				<strong cond="$page_no == $page">{$page_no}</strong>
+				<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+			<!--@end-->
+
+			<block cond="$last_page != $page_navigation->last_page">
+				{@$isGoTo = true}
+				<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+			</block>
+
+			<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+
+			<span cond="$isGoTo" id="goTo" class="tgContent">
+				<input name="page" title="{$lang->cmd_go_to_page}" />
+				<button type="submit">Go</button>
+			</span>
+		</form>
diff --git a/modules/module/tpl/category_list.html b/modules/module/tpl/category_list.html
index 84f4f3fb3..9ee18182c 100644
--- a/modules/module/tpl/category_list.html
+++ b/modules/module/tpl/category_list.html
@@ -1,56 +1,55 @@
-<!--%import("filter/insert_category.xml")-->
 <!--%import("filter/update_category.xml")-->
 
 <!--#include("./header.html")-->
 
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
 <!-- 카테고리의 위/아래, 삭제와 관련된 form -->
-<form id="fo_category_info" action="./" method="get">
+<form id="fo_category_info" action="./" method="post">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminDeleteCategory" />
     <input type="hidden" name="module_category_srl" value="" />
-    <input type="hidden" name="mode" value="" />
 </form>
-
-<table cellspacing="0" class="rowTable">
-<thead>
-    <tr>
-        <th scope="col" class="wide"><div>{$lang->category_title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="2"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@if(!count($category_list))-->
-    <tr>
-        <td colspan="4">{$lang->msg_category_is_null}</td>
-    </tr>
-    <!--@end-->
-    <!--@foreach($category_list as $key => $val)-->
-    <tr>
-        <td class="wide">{$val->title}</td>
-        <td class="nowrap">{zdate($val->regdate,"Y-m-d H:i:s")}</td>
-        <td><a href="{getUrl('module_category_srl',$val->module_category_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}</span></a></td>
-        <td><a href="#" onclick="doUpdateCategory('{$val->module_category_srl}','delete','{$lang->confirm_delete}');return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th scope="col" class="title">{$lang->category_title}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col">&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@if(!count($category_list))-->
+			<tr>
+				<td colspan="3">{$lang->msg_category_is_null}</td>
+			</tr>
+			<!--@end-->
+			<!--@foreach($category_list as $key => $val)-->
+			<tr>
+				<td class="title">{$val->title}</td>
+				<td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
+				<td>
+					<a href="{getUrl('module_category_srl',$val->module_category_srl)}">{$lang->cmd_modify}</a>
+					<button type="button" class="text" onclick="doUpdateCategory('{$val->module_category_srl}','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</button>
+				</td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
 
 <!-- 카테고리 추가 -->
-<form action="./" method="post" onsubmit="return procFilter(this, insert_category)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="module_category_srl" value="" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->category_title}</div></th>
-        <td>
-            <input type="text" name="title" class="inputTypeText w300" />
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="2" class="button">
-            <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
+<form ruleset="insertCategory" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminInsertCategory" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="module_category_srl" value="" />
+    <div class="btnArea">
+		<label for="category_title">{$lang->category_title}</label>
+		<input type="text" name="title" id="category_title" />
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
diff --git a/modules/module/tpl/category_update_form.html b/modules/module/tpl/category_update_form.html
index 6b2dec122..8673bbe10 100644
--- a/modules/module/tpl/category_update_form.html
+++ b/modules/module/tpl/category_update_form.html
@@ -1,24 +1,22 @@
-<!--%import("filter/update_category.xml")-->
-
 <!--#include("./header.html")-->
-
 <!-- 카테고리 수정 -->
 <!--@if($selected_category)-->
-<form action="./" method="post" onsubmit="return procFilter(this, update_category)" enctype="multipart/form-data">
-    <input type="hidden" name="module_category_srl" value="{$selected_category->module_category_srl}" />
-    <input type="hidden" name="mode" value="update" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->category_title}</div></th>
-        <td><input type="text" name="title" value="{$selected_category->title}" class="inputTypeText w300" /></td>
-    </tr>
-    <tr class="row2">
-        <th colspan="2" class="button">
-            <span class="button strong black"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="updateCategory" action="./" method="post" enctype="multipart/form-data" class="form">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminUpdateCategory" />
+	<input type="hidden" name="module_category_srl" value="{$selected_category->module_category_srl}" />
+	<input type="hidden" name="mode" value="update" />
+	<ul>
+		<li>
+			<p class="q"><label for="category_title">{$lang->category_title}</label></p>
+			<p class="a"><input type="text" name="title" id="category_title" value="{$selected_category->title}" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+	</div>
 </form>
 <!--@end-->
diff --git a/modules/module/tpl/copy_module.html b/modules/module/tpl/copy_module.html
index 1cb03996d..19d2252b4 100644
--- a/modules/module/tpl/copy_module.html
+++ b/modules/module/tpl/copy_module.html
@@ -1,82 +1,77 @@
-<!--%import("js/module_admin.js")-->
-<!--%import("filter/copy_module.xml")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->module_copy}</h3>
+<load target="js/module_admin.js" usecdn="true" />
+<h1 class="h1">{$lang->module_copy}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="post" onsubmit="return procFilter(this, copy_module)" >
-<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-
-<div id="popBody">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->module}</div></th>
-        <td class="wide">{$module_info->module}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->mid}</div></th>
-        <td>{$module_info->mid}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->browser_title}</div></th>
-        <td>{$module_info->browser_title}</td>
-    </tr>
-    </table>
-
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col"><div>{$lang->mid}<div></th>
-        <th scope="col"><div>{$lang->browser_title}<div></th>
-    </tr>
-    <tr class="row2">
-        <td><input type="text" name="mid_1" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_1" class="inputTypeText w200" /></td>
-    </tr>
-    <tr>
-        <td><input type="text" name="mid_2" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_2" class="inputTypeText w200" /></td>
-    </tr>
-    <tr class="row2">
-        <td><input type="text" name="mid_3" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_3" class="inputTypeText w200" /></td>
-    </tr>
-    <tr>
-        <td><input type="text" name="mid_4" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_4" class="inputTypeText w200" /></td>
-    </tr>
-    <tr class="row2">
-        <td><input type="text" name="mid_5" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_5" class="inputTypeText w200" /></td>
-    </tr>
-    <tr>
-        <td><input type="text" name="mid_6" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_6" class="inputTypeText w200" /></td>
-    </tr>
-    <tr class="row2">
-        <td><input type="text" name="mid_7" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_7" class="inputTypeText w200" /></td>
-    </tr>
-    <tr>
-        <td><input type="text" name="mid_8" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_8" class="inputTypeText w200" /></td>
-    </tr>
-    <tr class="row2">
-        <td><input type="text" name="mid_9" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_9" class="inputTypeText w200" /></td>
-    </tr>
-    <tr>
-        <td><input type="text" name="mid_10" class="inputTypeText w200" /></td>
-        <td><input type="text" name="browser_title_10" class="inputTypeText w200" /></td>
-    </tr>
-    </table>
-
-</div>
-
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" /></span>
-</div>
-
+<form rule="copyModule" action="./" method="post">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminCopyModule" />
+	<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->module}</th>
+				<td >{$module_info->module}</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->mid}</th>
+				<td>{$module_info->mid}</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->browser_title}</th>
+				<td>{$module_info->browser_title}</td>
+				</tr>
+		</table>
+	</div>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="col"><div>{$lang->mid}<div></th>
+				<th scope="col"><div>{$lang->browser_title}<div></th>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_1" /></td>
+				<td><input type="text" name="browser_title_1" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_2" /></td>
+				<td><input type="text" name="browser_title_2" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_3" /></td>
+				<td><input type="text" name="browser_title_3" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_4" /></td>
+				<td><input type="text" name="browser_title_4" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_5" /></td>
+				<td><input type="text" name="browser_title_5" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_6" /></td>
+				<td><input type="text" name="browser_title_6" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_7" /></td>
+				<td><input type="text" name="browser_title_7" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_8" /></td>
+				<td><input type="text" name="browser_title_8" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_9" /></td>
+				<td><input type="text" name="browser_title_9" /></td>
+				</tr>
+			<tr>
+				<td><input type="text" name="mid_10" /></td>
+				<td><input type="text" name="browser_title_10" /></td>
+				</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </form>
diff --git a/modules/module/tpl/css/mlang.css b/modules/module/tpl/css/mlang.css
index e222155d8..add8b113c 100644
--- a/modules/module/tpl/css/mlang.css
+++ b/modules/module/tpl/css/mlang.css
@@ -1,24 +1,24 @@
-@charset "utf-8";
-/* Mobile XE Language (/modules/module/tpl/lang.html) */
-body{margin:0}
-.bd{background:#f8f8f8;padding:1px 0}
-/* Hx */
-.hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
-.hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
-.hx.h2{background:#e5e5e5;text-shadow:1px 1px 0 #fff}
-.hx h2{margin:0 10px 0 0;display:inline;font-size:16px;line-height:1.4}
-/* Global Navigation */
-.gn{margin:0;padding:0;list-style:none;background:#d3d1cc;text-shadow:1px 1px 0 #fff}
-.gn li{background:#c3c3c3;border:1px solid #a3a09a;border-left:0;border-right:0;margin:0 0 -1px 0}
-.gn li li{background:#f8f8f8;border:1px solid #c9c9c9;border-left:0;border-right:0}
-.gn li li li{background:#e8e8e8}
-.gn ul{margin:0 0 -1px 0;padding:0;list-style:none}
-.gn a,.gn strong{position:relative;text-decoration:none;display:block;padding:10px;font-size:16px}
-.gn li a{color:#333}
-.gn li a:after{position:absolute;top:7px;right:10px;content:"›";color:#888;font-size:18px;font-weight:bold;font-family:Verdana, Geneva, sans-serif}
-.gn li li a:before{content:"";display:inline-block;width:6px;height:6px;border:1px dotted #666;border-top:0;border-right:0;margin:0 4px 0 0;vertical-align:top}
-.gn li li a{padding-left:15px}
-.gn li li li a{padding-left:30px}
-.gn li li li li a{padding-left:45px}
-.gn li li li li li a{padding-left:60px}
-.gn em{color:#f63;font-size:12px}
+@charset "utf-8";
+/* Mobile XE Language (/modules/module/tpl/lang.html) */
+body{margin:0}
+.bd{background:#f8f8f8;padding:1px 0}
+/* Hx */
+.hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
+.hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
+.hx.h2{background:#e5e5e5;text-shadow:1px 1px 0 #fff}
+.hx h2{margin:0 10px 0 0;display:inline;font-size:16px;line-height:1.4}
+/* Global Navigation */
+.gn{margin:0;padding:0;list-style:none;background:#d3d1cc;text-shadow:1px 1px 0 #fff}
+.gn li{background:#c3c3c3;border:1px solid #a3a09a;border-left:0;border-right:0;margin:0 0 -1px 0}
+.gn li li{background:#f8f8f8;border:1px solid #c9c9c9;border-left:0;border-right:0}
+.gn li li li{background:#e8e8e8}
+.gn ul{margin:0 0 -1px 0;padding:0;list-style:none}
+.gn a,.gn strong{position:relative;text-decoration:none;display:block;padding:10px;font-size:16px}
+.gn li a{color:#333}
+.gn li a:after{position:absolute;top:7px;right:10px;content:"›";color:#888;font-size:18px;font-weight:bold;font-family:Verdana, Geneva, sans-serif}
+.gn li li a:before{content:"";display:inline-block;width:6px;height:6px;border:1px dotted #666;border-top:0;border-right:0;margin:0 4px 0 0;vertical-align:top}
+.gn li li a{padding-left:15px}
+.gn li li li a{padding-left:30px}
+.gn li li li li a{padding-left:45px}
+.gn li li li li li a{padding-left:60px}
+.gn em{color:#f63;font-size:12px}
diff --git a/modules/module/tpl/filebox_add.html b/modules/module/tpl/filebox_add.html
index b95dcc392..eaab85f61 100644
--- a/modules/module/tpl/filebox_add.html
+++ b/modules/module/tpl/filebox_add.html
@@ -1,37 +1,32 @@
-<!--%import("./js/module_admin.js")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->filebox}</h3>
-</div>
-
-<form action="{getUrl('')}" method="post" enctype="multipart/form-data">
-<input type="hidden" name="module" value="module" />
-<input type="hidden" name="act" value="procModuleFileBoxAdd" />
-<input type="hidden" name="vid" value="{$vid}" />
-<input type="hidden" name="filter" value="{$filter}" />
-<input type="hidden" name="input" value="{$input}" />
-
-<div id="popBody">
-    <table class="rowTable" cellspacing="0">
-    <tbody>
-        <tr>
-            <th>{$lang->description}</th>
-            <td><input type="text" name="comment" /></td>
-        </tr>
-        <tr>
-            <th>{$lang->file}</th>
-            <td><input type="file" name="addfile" />
-                <p>
-<!--@if($arrfilter && is_array($arrfilter))-->
-	{@sprintf($lang->about_file_extension,join(", ",$arrfilter ))}
-<!--@end-->
-                </p>
-            </td>
-        </tr>
-    </tbody>
-    </table>
-</div>
-<div id="popFooter">
-    <span class="button black"><input type="submit" value="{$lang->cmd_submit}" /></span>
-</div>
-</form>
+<load target="./js/module_admin.js" usecdn="true" />
+<h1 class="h1">{$lang->filebox}</h1>
+<form action="{getUrl('')}" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleFileBoxAdd" />
+	<input type="hidden" name="vid" value="{$vid}" />
+	<input type="hidden" name="filter" value="{$filter}" />
+	<input type="hidden" name="input" value="{$input}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tbody>
+				<tr>
+					<th>{$lang->description}</th>
+					<td><input type="text" name="comment" /></td>
+					</tr>
+				<tr>
+					<th>{$lang->file}</th>
+					<td><input type="file" name="addfile" />
+						<p>
+							<!--@if($arrfilter && is_array($arrfilter))-->
+							{@sprintf($lang->about_file_extension,join(", ",$arrfilter ))}
+							<!--@end-->
+							</p>
+						</td>
+					</tr>
+				</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_submit}" /></span>
+	</div>
+</form>
diff --git a/modules/module/tpl/filebox_list.html b/modules/module/tpl/filebox_list.html
index 8c3fd4380..26011baed 100644
--- a/modules/module/tpl/filebox_list.html
+++ b/modules/module/tpl/filebox_list.html
@@ -1,65 +1,60 @@
-<!--%load_js_plugin("filebox")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->filebox}</h3>
-</div>
-
-<div id="popBody">
-    <table class="rowTable" cellspacing="0" width="90%">
-    <thead>
-        <tr>
-            <th><div>{$lang->file}</div></th>
-            <th><div>{$lang->description}</div></th>
-            <th><div>{$lang->regdate}</div></th>
-            <th><div>&nbsp;</div></th>
-        </tr>
-    </thead>
-    <tbody>
-<!--@foreach($filebox_list as $key=>$val)-->
-    <tr>
-        <td>
-            <div id="filebox_preview_{$val->module_filebox_srl}">
-                <!--@if($val->fileextension=='swf')-->
-
-                <object height="100" width="100" flashvars="" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" xmlns="http://www.w3.org/1999/xhtml">
-                    <param value="{getUrl('')}{$val->filename}" name="movie" xmlns="http://www.w3.org/1999/xhtml" />
-                    <param value="transparent" name="wmode" xmlns="http://www.w3.org/1999/xhtml" />
-                    <param value="sameDomain" name="allowScriptAccess" xmlns="http://www.w3.org/1999/xhtml" />
-                    <param value="high" name="quality" xmlns="http://www.w3.org/1999/xhtml" />
-                    <embed height="100" width="100" wmode="transparent" flashvars="" autostart="false" src="{getUrl('')}{$val->filename}" xmlns="http://www.w3.org/1999/xhtml" />
-                </object>
-
-                <!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
-                    <img src="{getUrl('')}{$val->filename}" width="100" height="100" />
-                <!--@end-->
-            </div>
-        </td>
-        <td class="wide">{$val->comment}&nbsp;</td>
-        <td class="nowrap">{zdate($val->regdate,'Y-m-d H:i')}</td>
-        <td>
-            <!--@if(!$filter || (is_array($arrfilter) && in_array($val->fileextension,$arrfilter)))-->
-            <span class="small button black"><button type="button" onclick="XE.filebox.selectFile('{getUrl('')}{$val->filename}','{$val->module_filebox_srl}');">{$lang->cmd_select}</button></span>
-            <!--@end-->
-            <span class="small button"><button type="button" onclick="XE.filebox.deleteFile('{$val->module_filebox_srl}');">{$lang->cmd_delete}</button></span>
-        </td>
-    </tr>
-<!--@end-->
-    </tbody>
-    </table>
-        <!-- 페이지 네비게이션 -->
-        <div class="pagination a1">
-            <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a>
-            <!--@while($page_no = $page_navigation->getNextPage())-->
-                <!--@if($page == $page_no)-->
-                    <strong>{$page_no}</strong>
-                <!--@else-->
-                    <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
-                <!--@end-->
-            <!--@end-->
-            <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-        </div>
-</div>
-
-<div id="popFooter">
-    <a href="{getUrl('','module','module','act','dispModuleFileBoxAdd','filter',$filter,'input',$input)}" class="button black"><span>{$lang->cmd_registration}</span></a>
-</div>
+<!--%load_js_plugin("filebox")-->
+<h1 class="h1">{$lang->filebox}</h1>
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<thead>
+			<tr>
+				<th>{$lang->file}</th>
+				<th>{$lang->description}</th>
+				<th>{$lang->regdate}</th>
+				<th>&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+<!--@foreach($filebox_list as $key=>$val)-->
+			<tr>
+				<td>
+					<div id="filebox_preview_{$val->module_filebox_srl}">
+						<!--@if($val->fileextension=='swf')-->
+							
+						<object height="100" width="100" flashvars="" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=9,0,28,0" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" xmlns="http://www.w3.org/1999/xhtml">
+							<param value="{getUrl('')}{$val->filename}" name="movie" xmlns="http://www.w3.org/1999/xhtml" />
+							<param value="transparent" name="wmode" xmlns="http://www.w3.org/1999/xhtml" />
+							<param value="sameDomain" name="allowScriptAccess" xmlns="http://www.w3.org/1999/xhtml" />
+							<param value="high" name="quality" xmlns="http://www.w3.org/1999/xhtml" />
+							<embed height="100" width="100" wmode="transparent" flashvars="" autostart="false" src="{getUrl('')}{$val->filename}" xmlns="http://www.w3.org/1999/xhtml" />
+						</object>
+							
+						<!--@elseif(in_array($val->fileextension,array('gif','png','jpg','jpeg')))-->
+						<img src="{getUrl('')}{$val->filename}" width="100" height="100" />
+						<!--@end-->
+					</div>
+				</td>
+				<td >{$val->comment}&nbsp;</td>
+				<td>{zdate($val->regdate,'Y-m-d H:i')}</td>
+				<td>
+					<!--@if(!$filter || (is_array($arrfilter) && in_array($val->fileextension,$arrfilter)))-->
+					<button type="button" onclick="XE.filebox.selectFile('{getUrl('')}{$val->filename}','{$val->module_filebox_srl}');">{$lang->cmd_select}</button>
+					<!--@end-->
+					<button type="button" onclick="XE.filebox.deleteFile('{$val->module_filebox_srl}');">{$lang->cmd_delete}</button>
+				</td>
+			</tr>
+<!--@end-->
+		</tbody>
+	</table>
+</div>
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+	<a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		<!--@if($page == $page_no)-->
+			<strong>{$page_no}</strong>
+		<!--@else-->
+			<a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+		<!--@end-->
+	<!--@end-->
+	<a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+<div class="btnArea">
+    <span class="btn"><a href="{getUrl('','module','module','act','dispModuleFileBoxAdd','filter',$filter,'input',$input)}">{$lang->cmd_registration}</a></span>
+</div>
diff --git a/modules/module/tpl/filebox_list_html.html b/modules/module/tpl/filebox_list_html.html
new file mode 100644
index 000000000..291c19985
--- /dev/null
+++ b/modules/module/tpl/filebox_list_html.html
@@ -0,0 +1,34 @@
+<p cond="!$filebox_list">등록된 파일이 없습니다.</p>
+<ul cond="$filebox_list" class="lined">
+	<li loop="$filebox_list=>$key,$fileInfo">
+		<a href="#" class="select"><img class="filebox_item" src="{$fileInfo->filename}" title="{$fileInfo->comment}" /></a>
+		<span>{$fileInfo->comment}</span>
+	</li>
+</ul>
+<div class="pagination" cond="$page_navigation">
+	<a href="#" class="direction" page="1">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="#" page="1">1</a>
+		<a href="#FileBoxGoTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<block loop="$page_no = $page_navigation->getNextPage()">
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="#" page="{$page_no}">{$page_no}</a>
+	</block>
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#FileBoxGoTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="#" page="{$page_navigation->last_page}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="#" page="{$page_navigation->last_page}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="FileBoxGoTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button>Go</button>
+	</span>
+</div>
+<script type="text/javascript">
+	jQuery('.pagination').xePagination();
+	jQuery('a.tgAnchor').xeContentToggler();
+</script>
diff --git a/modules/module/tpl/header.html b/modules/module/tpl/header.html
index a904798f4..da99d5d1a 100644
--- a/modules/module/tpl/header.html
+++ b/modules/module/tpl/header.html
@@ -1,12 +1,14 @@
-<!--%import("js/module_admin.js")-->
+<load target="js/module_admin.js" usecdn="true" />
 
-<h3 class="xeAdmin">{$lang->module} <span class="gray">{$lang->cmd_management}</span></h3>
+<script type="text/javascript">
+	xe.lang.favorite_on = '{$lang->favorite}({$lang->on})';
+	xe.lang.favorite_off = '{$lang->favorite}({$lang->off})';
+</script>
 
-<!--@if($act == 'dispModuleAdminContent')-->
-<div class="infoText">{nl2br($lang->about_module)}</div>
-<!--@end-->
+<h1 class="h1">{$lang->installed_module}</h1>
 
-<ul class="localNavigation">
-    <li <!--@if($act=='dispModuleAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispModuleAdminContent')}">{$lang->module_index}</a></li>
-    <li <!--@if($act=='dispModuleAdminCategory')-->class="on"<!--@end-->><a href="{getUrl('act','dispModuleAdminCategory')}">{$lang->module_category}</a></li>
-</ul>
+<div class="cnb">
+	<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminContent')}" class="active"|cond="$act=='dispModuleAdminContent'">{$lang->installed_module}</a>
+	|
+	<a href="{getUrl('', 'module', 'admin', 'act', 'dispModuleAdminCategory')}" class="active"|cond="$act=='dispModuleAdminCategory'">{$lang->module_category}</a>
+</div>
diff --git a/modules/module/tpl/include.manage_selected.html b/modules/module/tpl/include.manage_selected.html
new file mode 100644
index 000000000..a6c7389f5
--- /dev/null
+++ b/modules/module/tpl/include.manage_selected.html
@@ -0,0 +1,33 @@
+<load target="js/manage_selected_module.js" usecdn="true" />
+
+<div id="manageSelectedModule" class="modal">
+	<div class="fg">
+		<h2 class="h2">{$lang->do_selected}</h2>
+
+		<div class="table even">
+			<table width="100%" cellspacing="0" border="1">
+				<thead>
+					<tr>
+						<th scope="col">{$lang->mid}</th>
+						<th scope="col">{$lang->browser_title}</th>
+					</tr>
+				</thead>
+				<tbody id="manageSelectedModuleBody">
+				</tbody>
+			</table>
+		</div>
+
+		<div class="cnb">
+			<a href="#manageSelectedModuleSetup" class="tgAnchor">{$lang->bundle_setup}</a>
+			|
+			<a href="#manageSelectedModuleAddition" class="tgAnchor">{$lang->bundle_addition_setup}</a>
+			|
+			<a href="#manageSelectedModuleGrant" class="tgAnchor">{$lang->bundle_grant_setup}</a>
+		</div>
+
+		<include target="include.module_setup.html" />
+		<include target="include.module_addition_setup.html" />
+		<include target="include.module_grant_setup.html" />
+		<include target="include.multilang.textarea.html" />
+	</div>
+</div>
\ No newline at end of file
diff --git a/modules/module/tpl/include.module_addition_setup.html b/modules/module/tpl/include.module_addition_setup.html
new file mode 100644
index 000000000..6c830b83c
--- /dev/null
+++ b/modules/module/tpl/include.module_addition_setup.html
@@ -0,0 +1,3 @@
+<div id="manageSelectedModuleAddition" class="tgContent">
+	{$setup_content}
+</div>
diff --git a/modules/module/tpl/include.module_grant_setup.html b/modules/module/tpl/include.module_grant_setup.html
new file mode 100644
index 000000000..c96c9a582
--- /dev/null
+++ b/modules/module/tpl/include.module_grant_setup.html
@@ -0,0 +1,49 @@
+<load target="js/module_admin.js" usecdn="true" />
+<script type="text/javascript">
+    jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
+</script>
+
+<form ruleset="insertModulesGrant" action="./" method="post" id="manageSelectedModuleGrant">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminModuleGrantSetup" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<input type="hidden" name="module_srls" value="{$module_srls}" />
+    <h3 class="h3">{$lang->permission_setting}</h3>
+    <p>{$lang->about_grant_deatil}</p>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col">{$lang->grant}</th>
+					<th scope="col" colspan="3">{$lang->target}</th>
+				</tr>
+				</thead>
+
+			<tbody>
+				<!--@foreach($grant_list as $grant_name => $grant_item)-->
+				<tr class="row{$cycle_idx}">
+					<th scope="row">{$grant_item->title}</th>
+					<td >
+						<select name="{$grant_name}_default" class="grant_default">
+							<!--@if($grant_item->default == 'guest')--><option value="0">{$lang->grant_to_all}</option><!--@end-->
+							<!--@if($grant_item->default != 'manager')--><option value="-1">{$lang->grant_to_login_user}</option><!--@end-->
+							<!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
+							<option value="">{$lang->grant_to_group}</option>
+						</select>
+						<div id="zone_{$grant_name}" style="display:none">
+							<!--@foreach($group_list as $group_srl => $group_item)-->
+							<input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" />
+							<label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
+							<!--@end-->
+						</div>
+					</td>
+				</tr>
+				<!--@end-->
+				</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
+</form>
+
diff --git a/modules/module/tpl/include.module_setup.html b/modules/module/tpl/include.module_setup.html
new file mode 100644
index 000000000..87090c7c1
--- /dev/null
+++ b/modules/module/tpl/include.module_setup.html
@@ -0,0 +1,76 @@
+<div id="manageSelectedModuleSetup">
+	<h3 class="h3">{$lang->bundle_setup}</h3>
+	<form ruleset="insertModuleSetup" action="./" method="post" class="form tgContent">
+		<input type="hidden" name="module" value="module" />
+		<input type="hidden" name="act" value="procModuleAdminModuleSetup" />
+		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+		<input type="hidden" name="module_srls" value="" />
+		<ul>
+			<li>
+				<p class="q"><label for="module_category_srl">{$lang->module_category}</label></p>
+				<p class="a">
+					<select name="module_category_srl" id="module_category_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($module_category as $key => $val)-->
+						<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+				</p>
+				<p class="desc">{$lang->about_module_category}</p>
+			</li>
+			<li>
+				<p class="q"><label for="layout_srl">{$lang->layout}</label></p>
+				<p class="a">
+					<select name="layout_srl" id="layout_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($layout_list as $key => $val)-->
+						<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+						<!--@end-->
+					</select>
+				</p>
+				<p class="desc">{$lang->about_layout}</p>
+			</li>
+			<li cond="count($skin_list)">
+				<p class="q"><label for="skin">{$lang->skin}</label></p>
+				<p class="a">
+					<select name="skin" id="skin">
+						<!--@foreach($skin_list as $key=>$val)-->
+						<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+				</p>
+				<p class="desc">{$lang->about_skin}</p>
+			</li>
+			<li>
+				<p class="q"><label for="description">{$lang->description}</label></p>
+				<p class="a">
+					<textarea name="description" id="description" rows="4" cols="45">{htmlspecialchars($module_info->description)}</textarea>
+				</p>
+				<p class="desc">{$lang->about_description}</p>
+			</li>
+			<li>
+				<p class="q"><label for="header_text">{$lang->header_text}</label></p>
+				<p class="a multiLangEdit">
+					{@$use_multilang_textarea=true}
+					<input type="hidden" name="header_text" class="vLang" />
+					<textarea id="header_text" rows="4" cols="45" class="vLang"></textarea>
+					<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+				</p>
+				<p class="desc">{$lang->about_header_text}</p>
+			</li>
+			<li>
+				<p class="q"><label for="footer_text">{$lang->footer_text}</label></p>
+				<p class="a multiLangEdit">
+					<input type="hidden" name="footer_text" class="vLang" />
+					<textarea id="footer_text" rows="4" cols="45" class="vLang"></textarea>
+					<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+				</p>
+				<p class="desc">{$lang->about_footer_text}</p>
+			</li>
+		</ul>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+		</div>
+
+	</form>
+</div>
\ No newline at end of file
diff --git a/modules/module/tpl/include.multilang.html b/modules/module/tpl/include.multilang.html
new file mode 100644
index 000000000..8a45e064d
--- /dev/null
+++ b/modules/module/tpl/include.multilang.html
@@ -0,0 +1,23 @@
+<block cond="$use_multilang">
+	<div id="langEdit" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput form">
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
+</block>
diff --git a/modules/module/tpl/include.multilang.textarea.html b/modules/module/tpl/include.multilang.textarea.html
new file mode 100644
index 000000000..5b05c0b24
--- /dev/null
+++ b/modules/module/tpl/include.multilang.textarea.html
@@ -0,0 +1,27 @@
+<block cond="$use_multilang_textarea">
+	<style type="text/css">
+		#langEditTextarea textarea { width: 258px; }
+	</style>
+
+	<div id="langEditTextarea" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput form">
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <textarea id="{$code}_var1"></textarea></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
+</block>
diff --git a/modules/module/tpl/js/filebox.js b/modules/module/tpl/js/filebox.js
index 1bf65d1d2..70717734f 100644
--- a/modules/module/tpl/js/filebox.js
+++ b/modules/module/tpl/js/filebox.js
@@ -1,44 +1,44 @@
-var selected_filebox = {};
-
-// popup
-function openFileBox(file_obj, filter){
-    selected_filebox[file_obj.name] = file_obj;
-    var url = request_uri.setQuery('module','module').setQuery('act','dispModuleFileBox').setQuery('input',file_obj.name).setQuery('filter',filter);
-    popopen(url, "filebox");
-}
-
-function selectFileBoxFile(file_url, module_filebox_srl){
-    if(!selected_filebox_input_name) return;
-    opener.selected_filebox[selected_filebox_input_name].value = file_url;
-    opener.document.getElementById('filebox_preview_'+selected_filebox_input_name).innerHTML = document.getElementById('filebox_preview_' + module_filebox_srl).innerHTML;
-    opener.document.getElementById('filebox_preview_'+selected_filebox_input_name).style.display='';
-    opener.document.getElementById('filebox_unselect_'+selected_filebox_input_name).style.display='';
-    window.close();
-}
-
-function deleteFileBoxFile(module_filebox_srl){
-    var params ={
-            "module_filebox_srl":module_filebox_srl
-        };
-
-    jQuery.exec_json('module.procModuleFileBoxDelete', params, function(data){
-        document.location.reload();
-    });
-}
-
-function unselectFileBox(id){
-    jQuery("[name="+id+"]").val('');
-    jQuery('#filebox_preview_'+id).html('').hide();
-    jQuery('#filebox_unselect_'+id).hide();
-}
-
-function initFileBox(id){
-    if(opener && opener.selectedWidget && opener.selectedWidget.getAttribute("widget")){
-        var file = opener.selectedWidget.getAttribute(id);
-        if(file){
-            var html = _displayMultimedia(file,"100%","100%");
-            jQuery('#filebox_preview_'+id).html(html).show();
-            jQuery('#filebox_unselect_'+id).show();
-        }
-    }
+var selected_filebox = {};
+
+// popup
+function openFileBox(file_obj, filter){
+    selected_filebox[file_obj.name] = file_obj;
+    var url = request_uri.setQuery('module','module').setQuery('act','dispModuleFileBox').setQuery('input',file_obj.name).setQuery('filter',filter);
+    popopen(url, "filebox");
+}
+
+function selectFileBoxFile(file_url, module_filebox_srl){
+    if(!selected_filebox_input_name) return;
+    opener.selected_filebox[selected_filebox_input_name].value = file_url;
+    opener.document.getElementById('filebox_preview_'+selected_filebox_input_name).innerHTML = document.getElementById('filebox_preview_' + module_filebox_srl).innerHTML;
+    opener.document.getElementById('filebox_preview_'+selected_filebox_input_name).style.display='';
+    opener.document.getElementById('filebox_unselect_'+selected_filebox_input_name).style.display='';
+    window.close();
+}
+
+function deleteFileBoxFile(module_filebox_srl){
+    var params ={
+            "module_filebox_srl":module_filebox_srl
+        };
+
+    jQuery.exec_json('module.procModuleFileBoxDelete', params, function(data){
+        document.location.reload();
+    });
+}
+
+function unselectFileBox(id){
+    jQuery("[name="+id+"]").val('');
+    jQuery('#filebox_preview_'+id).html('').hide();
+    jQuery('#filebox_unselect_'+id).hide();
+}
+
+function initFileBox(id){
+    if(opener && opener.selectedWidget && opener.selectedWidget.getAttribute("widget")){
+        var file = opener.selectedWidget.getAttribute(id);
+        if(file){
+            var html = _displayMultimedia(file,"100%","100%");
+            jQuery('#filebox_preview_'+id).html(html).show();
+            jQuery('#filebox_unselect_'+id).show();
+        }
+    }
 }
\ No newline at end of file
diff --git a/modules/module/tpl/js/manage_selected_module.js b/modules/module/tpl/js/manage_selected_module.js
new file mode 100644
index 000000000..1ca2eb56d
--- /dev/null
+++ b/modules/module/tpl/js/manage_selected_module.js
@@ -0,0 +1,37 @@
+// manage selected module
+jQuery(function($){
+
+$('#manageSelectedModule .cnb a.tgAnchor')
+	.bind('before-open.tc', function(){
+		var self = this;
+		$('#manageSelectedModule a.tgAnchor')
+			.filter(function(){
+				if (this == self) return false;
+				return true;
+			})
+			.trigger('close.tc');
+	});
+
+$('a.modalAnchor[href=#manageSelectedModule]')
+	.bind('before-open.mw', function(){
+		var $selectedModule = $('input[type=checkbox].selectedModule:checked');
+		var $selectedBody = $('#manageSelectedModuleBody');
+
+		if (!$selectedModule.length) return false;
+
+		$selectedBody.empty();
+
+		var module_srls = new Array();
+		$selectedModule.each(function(){
+			var $this = $(this);
+			var row = '<tr><td>' + $this.data('mid') + '</td><td>' + $this.data('browser_title') + '</td></tr>';
+			$selectedBody.append(row);
+			module_srls.push($this.val());
+		});
+
+		$('#manageSelectedModuleSetup input[name=module_srls]').val(module_srls);
+		$('#manageSelectedModuleAddition input[name=target_module_srl]').val(module_srls);
+		$('#manageSelectedModuleGrant input[name=module_srls]').val(module_srls);
+	});
+
+});
\ No newline at end of file
diff --git a/modules/module/tpl/js/module_admin.js b/modules/module/tpl/js/module_admin.js
index 944082d76..be37c3374 100644
--- a/modules/module/tpl/js/module_admin.js
+++ b/modules/module/tpl/js/module_admin.js
@@ -1,190 +1,199 @@
-/**
- * @file     modules/module/js/module_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief    module 모듈의 관리자용 javascript
- **/
-
-/* 카테고리 관련 작업들 */
-function doUpdateCategory(module_category_srl, mode, message) {
-    if(typeof(message)!='undefined'&&!confirm(message)) return;
-
-    var fo_obj = xGetElementById('fo_category_info');
-    fo_obj.module_category_srl.value = module_category_srl;
-    fo_obj.mode.value = mode;
-
-    procFilter(fo_obj, update_category);
-}
-
-/* 카테고리 정보 수정 후 */
-function completeUpdateCategory(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    alert(message);
-
-    location.href =  current_url.setQuery('module_category_srl','');
-}
-
-/* 선택된 모듈을 관리자 메뉴의 바로가기에 등록 */
-function doAddShortCut(module) {
-    var fo_obj = xGetElementById("fo_shortcut");
-    fo_obj.selected_module.value = module;
-    procFilter(fo_obj, insert_shortcut);
-}
-
-/* 모듈 설치 */
-function doInstallModule(module) {
-    var params = new Array();
-    params['module_name'] = module;
-    exec_xml('install','procInstallAdminInstall',params, completeInstallModule);
-}
-
-function completeInstallModule(ret_obj) {
-    alert(ret_obj['message']);
-    location.reload();
-}
-
-/* 모듈 업그레이드 */
-function doUpdateModule(module) {
-    var params = new Array();
-    params['module_name'] = module;
-    exec_xml('install','procInstallAdminUpdate',params, completeInstallModule);
-}
-
-/* 모듈 복사후 */
-function completeCopyModule() {
-    if(typeof(opener)!='undefined') opener.location.href = opener.location.href;
-    window.close();
-}
-
-/* 모듈 선택기에서 선택된 모듈의 입력 */
-function insertModule(id, module_srl, mid, browser_title, multi_select) {
-    if(typeof(multi_select)=='undefined') multi_select = true;
-    if(!window.opener) window.close();
-
-    if(multi_select) {
-        if(typeof(opener.insertSelectedModules)=='undefined') return;
-        opener.insertSelectedModules(id, module_srl, mid, browser_title);
-    } else {
-        if(typeof(opener.insertSelectedModule)=='undefined') return;
-        opener.insertSelectedModule(id, module_srl, mid, browser_title);
-        window.close();
-    }
-}
-
-/* 권한 선택용 */
-function doShowGrantZone() {
-    jQuery(".grant_default").each( function() {
-        var id = "#zone_"+this.name.replace(/_default$/,'');
-        if(!jQuery(this).val()) jQuery(id).css("display","block");
-        else jQuery(id).css("display","none");
-    } );
-}
-
-/* 권한 등록 후 알림 메세지 */
-function completeInsertGrant(ret_obj) {
-    alert(ret_obj['message']);
-    location.reload();
-}
-
-/* 관리자 아이디 등록/ 제거 */
-function doInsertAdmin() {
-    var fo_obj = xGetElementById("fo_obj");
-    var sel_obj = fo_obj._admin_member;
-    var admin_id = fo_obj.admin_id.value;
-    if(!admin_id) return;
-
-    var opt = new Option(admin_id,admin_id,true,true);
-    sel_obj.options[sel_obj.options.length] = opt;
-
-    fo_obj.admin_id.value = '';
-    sel_obj.size = sel_obj.options.length;
-    sel_obj.selectedIndex = -1;
-
-    var members = new Array();
-    for(var i=0;i<sel_obj.options.length;i++) {
-        members[members.length] = sel_obj.options[i].value;
-        
-    }
-    fo_obj.admin_member.value = members.join(',');
-
-    fo_obj.admin_id.focus();
-}
-
-function doDeleteAdmin() {
-    var fo_obj = xGetElementById("fo_obj");
-    var sel_obj = fo_obj._admin_member;
-    sel_obj.remove(sel_obj.selectedIndex);
-
-    sel_obj.size = sel_obj.options.length;
-    sel_obj.selectedIndex = -1;
-
-    var members = new Array();
-    for(var i=0;i<sel_obj.options.length;i++) {
-        members[members.length] = sel_obj.options[i].value;
-        
-    }
-    fo_obj.admin_member.value = members.join(',');
-}
-
-
-function completeModuleSetup(ret_obj) {
-    alert(ret_obj['message']);
-    window.close();
-}
-
-/**
- * 언어 관련
- **/
-function doInsertLangCode(name) {
-    var fo_obj = xGetElementById("menu_fo");
-    var target = fo_obj.target.value;
-    if(window.opener && target) {
-        var obj = window.opener.xGetElementById(target);
-        if(obj) obj.value = '$user_lang->'+name;
-    }
-    window.close();
-}
-
-function completeInsertLang(ret_obj) {
-    doInsertLangCode(ret_obj['name']);
-}
-
-function doDeleteLang(name) {
-    var params = new Array();
-    params['name'] = name;
-    var response_args = new Array('error','message');
-    exec_xml('module','procModuleAdminDeleteLang',params, completeDeleteLang);
-}
-
-function completeDeleteLang(ret_obj) {
-    location.href = current_url.setQuery('name','');
-}
-
-function doFillLangName() {
-	if (/[\?&]name=/i.test(location.search)) return;
-
-    var $form  = jQuery("#menu_fo");
-    var target = $form[0].target.value;
-    if(window.opener && window.opener.document.getElementById(target)) {
-        var value = window.opener.document.getElementById(target).value;
-        if(/^\$user_lang->/.test(value)) {
-            var param = new Array();
-            param['name'] = value.replace(/^\$user_lang->/,'');
-            var response_tags = new Array('error','message','name','langs');
-            exec_xml('module','getModuleAdminLangCode',param,completeFillLangName, response_tags);
-        }
-    }
-}
-
-function completeFillLangName(ret_obj, response_tags) {
-    var name  = ret_obj['name'];
-    var langs = ret_obj['langs'];
-    if(typeof(langs)=='undefined') return;
-    var $form = jQuery("#menu_fo");
-    $form[0].lang_code.value = name;
-    for(var i in langs) {
-        $form[0][i].value = langs[i];
-    }
-
-}
+/**
+ * @file     modules/module/js/module_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief    module 모듈의 관리자용 javascript
+ **/
+/* 모듈 즐겨찾기 */
+function doToggleFavoriteModule(obj, module_name) {
+	function on_complete(data){
+		if (data.result == 'on')
+			jQuery(obj).removeClass('fvOff').addClass('fvOn').html(xe.lang.favorite_on);
+		else
+			jQuery(obj).removeClass('fvOn').addClass('fvOff').html(xe.lang.favorite_off);
+	}
+
+	jQuery.exec_json('admin.procAdminToggleFavorite', {'module_name': module_name, 'site_srl': 0}, on_complete);
+}
+
+/* 카테고리 관련 작업들 */
+function doUpdateCategory(module_category_srl, message) {
+    if(typeof(message)!='undefined'&&!confirm(message)) return;
+
+    var fo_obj = get_by_id('fo_category_info');
+    fo_obj.module_category_srl.value = module_category_srl;
+	fo_obj.submit();
+}
+
+/* 카테고리 정보 수정 후 */
+function completeUpdateCategory(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    alert(message);
+
+    location.href =  current_url.setQuery('module_category_srl','');
+}
+
+/* 선택된 모듈을 관리자 메뉴의 바로가기에 등록 */
+function doAddShortCut(module) {
+    var fo_obj = get_by_id("fo_shortcut");
+    fo_obj.selected_module.value = module;
+    procFilter(fo_obj, insert_shortcut);
+}
+
+/* 모듈 설치 */
+function doInstallModule(module) {
+    var params = new Array();
+    params['module_name'] = module;
+    exec_xml('install','procInstallAdminInstall',params, completeInstallModule);
+}
+
+function completeInstallModule(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+/* 모듈 업그레이드 */
+function doUpdateModule(module) {
+    var params = new Array();
+    params['module_name'] = module;
+    exec_xml('install','procInstallAdminUpdate',params, completeInstallModule);
+}
+
+/* 모듈 복사후 */
+function completeCopyModule() {
+    if(typeof(opener)!='undefined') opener.location.href = opener.location.href;
+    window.close();
+}
+
+/* 모듈 선택기에서 선택된 모듈의 입력 */
+function insertModule(id, module_srl, mid, browser_title, multi_select) {
+    if(typeof(multi_select)=='undefined') multi_select = true;
+    if(!window.opener) window.close();
+
+    if(multi_select) {
+        if(typeof(opener.insertSelectedModules)=='undefined') return;
+        opener.insertSelectedModules(id, module_srl, mid, browser_title);
+    } else {
+        if(typeof(opener.insertSelectedModule)=='undefined') return;
+        opener.insertSelectedModule(id, module_srl, mid, browser_title);
+        window.close();
+    }
+}
+
+/* 권한 선택용 */
+function doShowGrantZone() {
+    jQuery(".grant_default").each( function() {
+        var id = "#zone_"+this.name.replace(/_default$/,'');
+        if(!jQuery(this).val()) jQuery(id).css("display","block");
+        else jQuery(id).css("display","none");
+    } );
+}
+
+/* 권한 등록 후 알림 메세지 */
+function completeInsertGrant(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
+
+/* 관리자 아이디 등록/ 제거 */
+function doInsertAdmin() {
+    var fo_obj = get_by_id("fo_obj");
+    var sel_obj = fo_obj._admin_member;
+    var admin_id = fo_obj.admin_id.value;
+    if(!admin_id) return;
+
+    var opt = new Option(admin_id,admin_id,true,true);
+    sel_obj.options[sel_obj.options.length] = opt;
+
+    fo_obj.admin_id.value = '';
+    sel_obj.size = sel_obj.options.length;
+    sel_obj.selectedIndex = -1;
+
+    var members = new Array();
+    for(var i=0;i<sel_obj.options.length;i++) {
+        members[members.length] = sel_obj.options[i].value;
+
+    }
+    fo_obj.admin_member.value = members.join(',');
+
+    fo_obj.admin_id.focus();
+}
+
+function doDeleteAdmin() {
+    var fo_obj = get_by_id("fo_obj");
+    var sel_obj = fo_obj._admin_member;
+    sel_obj.remove(sel_obj.selectedIndex);
+
+    sel_obj.size = sel_obj.options.length;
+    sel_obj.selectedIndex = -1;
+
+    var members = new Array();
+    for(var i=0;i<sel_obj.options.length;i++) {
+        members[members.length] = sel_obj.options[i].value;
+
+    }
+    fo_obj.admin_member.value = members.join(',');
+}
+
+
+function completeModuleSetup(ret_obj) {
+    alert(ret_obj['message']);
+    window.close();
+}
+
+/**
+ * 언어 관련
+ **/
+function doInsertLangCode(name) {
+    var fo_obj = get_by_id("menu_fo");
+    var target = fo_obj.target.value;
+    if(window.opener && target) {
+        var obj = window.opener.get_by_id(target);
+        if(obj) obj.value = '$user_lang->'+name;
+    }
+    window.close();
+}
+
+function completeInsertLang(ret_obj) {
+    doInsertLangCode(ret_obj['name']);
+}
+
+function doDeleteLang(name) {
+    var params = new Array();
+    params['name'] = name;
+    var response_args = new Array('error','message');
+    exec_xml('module','procModuleAdminDeleteLang',params, completeDeleteLang);
+}
+
+function completeDeleteLang(ret_obj) {
+    location.href = current_url.setQuery('name','');
+}
+
+function doFillLangName() {
+	if (/[\?&]name=/i.test(location.search)) return;
+
+    var $form  = jQuery("#menu_fo");
+    var target = $form[0].target.value;
+    if(window.opener && window.opener.document.getElementById(target)) {
+        var value = window.opener.document.getElementById(target).value;
+        if(/^\$user_lang->/.test(value)) {
+            var param = new Array();
+            param['name'] = value.replace(/^\$user_lang->/,'');
+            var response_tags = new Array('error','message','name','langs');
+            exec_xml('module','getModuleAdminLangCode',param,completeFillLangName, response_tags);
+        }
+    }
+}
+
+function completeFillLangName(ret_obj, response_tags) {
+    var name  = ret_obj['name'];
+    var langs = ret_obj['langs'];
+    if(typeof(langs)=='undefined') return;
+    var $form = jQuery("#menu_fo");
+    $form[0].lang_code.value = name;
+    for(var i in langs) {
+        $form[0][i].value = langs[i];
+    }
+
+}
diff --git a/modules/module/tpl/js/multi_order.js b/modules/module/tpl/js/multi_order.js
new file mode 100644
index 000000000..d37f51d2c
--- /dev/null
+++ b/modules/module/tpl/js/multi_order.js
@@ -0,0 +1,75 @@
+(function($){
+
+xe.MultiOrderManager = xe.createApp("MultiOrderManager", {
+	$keyObj: null,
+	$showObj: null,
+	$selectedObj: null,
+
+	init: function(key){
+		var self = this;
+		var $keyObj = this.$keyObj = jQuery('input[name='+key+']');
+		this.$showObj 		= $keyObj.parent().find('.multiorder_show');
+		this.$selectedObj 	= $keyObj.parent().find('.multiorder_selected');
+
+		this.$showObj
+			.nextAll('button')
+				.filter('.multiorder_add').bind('click', function(){ self.cast('MULTIORDER_ADD'); return false; }).end()
+				.filter('.multiorder_del').bind('click', function(){ self.cast('MULTIORDER_DEL'); return false; }).end()
+				.filter('.multiorder_up').bind('click', function(){ self.cast('MULTIORDER_UP'); return false; }).end()
+				.filter('.multiorder_down').bind('click', function(){ self.cast('MULTIORDER_DOWN'); return false; }).end()
+
+		this.cast('MULTIORDER_SYNC');
+	},
+
+	API_MULTIORDER_ADD: function(){
+		this.$showObj
+			.find('>option:selected')
+			.appendTo(this.$selectedObj);
+
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_DEL: function(){
+		this.$selectedObj
+			.find('>option:selected[default!="true"]')
+			.appendTo(this.$showObj);
+
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_UP: function(){
+		var $selected = this.$selectedObj.find('>option:selected');
+		$selected.eq(0).prev('option').before($selected);
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_DOWN: function(){
+		var $selected = this.$selectedObj.find('>option:selected');
+		$selected.eq(-1).next('option').after($selected);
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_SYNC: function(){
+		var values = this.$keyObj.val().split(',');
+		this.$selectedObj.find('>option').appendTo(this.$showObj);
+
+		var targets = [];
+		for(var i in values){
+			var target = this.$showObj.find('>option[value='+values[i]+']').get(0);
+			if (target != undefined) targets.push(target);
+		}
+		$(targets).appendTo(this.$selectedObj);
+	},
+
+	refreshValue : function() {
+		var values = [];
+
+		this.$selectedObj.find('>option').each(function(){
+			values.push(this.value);
+		});
+
+		this.$keyObj.val(values.join(','));
+	}
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/module/tpl/js/multilingual.js b/modules/module/tpl/js/multilingual.js
new file mode 100644
index 000000000..d1f273e8f
--- /dev/null
+++ b/modules/module/tpl/js/multilingual.js
@@ -0,0 +1,55 @@
+jQuery(function($){
+
+// multi-lingual text list
+$('#langList')
+	.find('form').hide().attr('aria-hidden','true').end() // collapse all language input control
+	.delegate('button._edit', 'click', function(){
+		var $this = $(this), $form = $this.parent().next('form');
+
+		// toggle input control
+		if($form.attr('aria-hidden') == 'false') {
+			$form.attr('aria-hidden', 'true').slideUp('fast');
+			$this.closest('li').removeClass('active');
+		}else{
+			$form.attr('aria-hidden', 'false').slideDown('fast');
+			$this.closest('li').addClass('active');
+		}
+
+		if($form.data('lang-loaded') == true) return;
+	
+		$form.data('lang-loaded', true);
+
+		function on_complete(ret) {
+			var name = ret['lang_name'], list = ret['lang_list']['item'], elems = $form[0].elements, item;
+
+			$form.find('label+textarea').prev('label').css('visibility','visible');
+
+			if(!$.isArray(list)) list = [list];
+			for(var i=0,c=list.length; i < c; i++) {
+				item = list[i];
+				if(item && item.lang_code && elems[item.lang_code]) {
+					elems[item.lang_code].value = item.value;
+					if(item.value) $(elems[item.lang_code]).prev('label').css('visibility','hidden');
+				}
+			}
+		}
+
+		exec_xml(
+			'module',
+			'getModuleAdminLangListByName',
+			{lang_name:$form[0].elements['lang_name'].value},
+			on_complete,
+			'error,message,lang_list,lang_name'.split(',')
+		);
+	})
+
+});
+
+function doInsertLangCode(langCode, target)
+{
+    if(window.opener && target) {
+        var obj = window.opener.get_by_id(target);
+        if(obj) obj.value = '$user_lang->'+langCode;
+    }
+    window.close();
+}
diff --git a/modules/module/tpl/lang.html b/modules/module/tpl/lang.html
index 35c350663..955508825 100644
--- a/modules/module/tpl/lang.html
+++ b/modules/module/tpl/lang.html
@@ -1,15 +1,15 @@
-<!--%import("css/mlang.css")-->
-<div class="bd">
-	<div class="hx h2">
-		<h2>Select Your Language</h2>
-	</div>
-	<ul class="gn">
-	<!--@foreach($lang_supported as $key=>$val)-->
-		<!--@if($key != $lang_type)-->
-		<li><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
-		<!--@else-->
-		<li><strong>{$val}</strong></li>
-		<!--@end-->
-	<!--@end-->
-	</ul>
-</div>
+<load target="css/mlang.css" usecdn="true" />
+<div class="bd">
+	<div class="hx h2">
+		<h2>Select Your Language</h2>
+	</div>
+	<ul class="gn">
+	<!--@foreach($lang_supported as $key=>$val)-->
+		<!--@if($key != $lang_type)-->
+		<li><a href="{getUrl('act',$oldact,'l',$key)}">{$val}</a></li>
+		<!--@else-->
+		<li><strong>{$val}</strong></li>
+		<!--@end-->
+	<!--@end-->
+	</ul>
+</div>
diff --git a/modules/module/tpl/module_addition_setup.html b/modules/module/tpl/module_addition_setup.html
index 10efcd3a5..5dd28a583 100644
--- a/modules/module/tpl/module_addition_setup.html
+++ b/modules/module/tpl/module_addition_setup.html
@@ -1,7 +1,2 @@
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->bundle_addition_setup}</h3>
-</div>
-
-<div id="popBody">
-    {$setup_content}
-</div>
+<h1 class="h1">{$lang->bundle_addition_setup}</h1>
+{$setup_content}
diff --git a/modules/module/tpl/module_grant_setup.html b/modules/module/tpl/module_grant_setup.html
index 93c030e3d..6159eb6e4 100644
--- a/modules/module/tpl/module_grant_setup.html
+++ b/modules/module/tpl/module_grant_setup.html
@@ -1,58 +1,51 @@
-<!--%import("js/module_admin.js")-->
-<!--%import("filter/insert_modules_grant.xml")-->
-
+<load target="js/module_admin.js" usecdn="true" />
 <script type="text/javascript">
     jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
 </script>
-
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->bundle_grant_setup}</h3>
+<h1 class="h1">{$lang->bundle_grant_setup}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_modules_grant)" id="fo_obj">
-<input type="hidden" name="module_srls" value="{$module_srls}" />
-
-<div id="popBody">
-
-    <h4 class="xeAdmin">{$lang->about_grant}</h4>
-    <p class="summary">{$lang->about_grant_deatil}</p>
-    <table cellspacing="0" class="crossTable">
-    <thead>
-    <tr>
-        <th scope="col"><div>{$lang->grant}</div></th>
-        <th scope="col" colspan="3"><div>{$lang->target}</div></th>
-    </tr>
-    </thead>
-
-    <tbody>
-        <!--@foreach($grant_list as $grant_name => $grant_item)-->
-        <tr class="row{$cycle_idx}">
-            <th scope="row"><div>{$grant_item->title}</div></th>
-            <td class="wide">
-                <select name="{$grant_name}_default" class="grant_default">
-                    <!--@if($grant_item->default == 'guest')--><option value="0">{$lang->grant_to_all}</option><!--@end-->
-                    <!--@if($grant_item->default != 'manager')--><option value="-1">{$lang->grant_to_login_user}</option><!--@end-->
-                    <!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
-                    <option value="">{$lang->grant_to_group}</option>
-                </select>
-                <div id="zone_{$grant_name}" style="display:none">
-                    <!--@foreach($group_list as $group_srl => $group_item)-->
-                    <input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" /> 
-                    <label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
-                    <!--@end-->
-                </div>
-            </td>
-        </tr>
-        <!--@end-->
-    </tbody>
-    </table>
-
-</div>
-
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
-</div>
-
+<form ruleset="insertModulesGrant" action="./" method="post" id="fo_obj">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminModuleGrantSetup" />
+	<input type="hidden" name="module_srls" value="{$module_srls}" />
+    <h2 class="h2">{$lang->permission_setting}</h2>
+    <p>{$lang->about_grant_deatil}</p>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col">{$lang->grant}</th>
+					<th scope="col" colspan="3">{$lang->target}</th>
+				</tr>
+				</thead>
+			
+			<tbody>
+				<!--@foreach($grant_list as $grant_name => $grant_item)-->
+				<tr class="row{$cycle_idx}">
+					<th scope="row">{$grant_item->title}</th>
+					<td >
+						<select name="{$grant_name}_default" class="grant_default">
+							<!--@if($grant_item->default == 'guest')--><option value="0">{$lang->grant_to_all}</option><!--@end-->
+							<!--@if($grant_item->default != 'manager')--><option value="-1">{$lang->grant_to_login_user}</option><!--@end-->
+							<!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
+							<option value="">{$lang->grant_to_group}</option>
+						</select>
+						<div id="zone_{$grant_name}" style="display:none">
+							<!--@foreach($group_list as $group_srl => $group_item)-->
+							<input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" />
+							<label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
+							<!--@end-->
+						</div>
+					</td>
+				</tr>
+				<!--@end-->
+				</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
 
diff --git a/modules/module/tpl/module_grants.html b/modules/module/tpl/module_grants.html
index 7e4926ef2..a471e7b32 100644
--- a/modules/module/tpl/module_grants.html
+++ b/modules/module/tpl/module_grants.html
@@ -1,73 +1,73 @@
 <!--%import("filter/insert_grant.xml")-->
-<!--%import("js/module_admin.js")-->
+<load target="js/module_admin.js" usecdn="true" />
 
 <script type="text/javascript">
     jQuery( function() { jQuery('.grant_default').change( function(event) { doShowGrantZone(); } ); doShowGrantZone() } );
 </script>
 
-<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)" id="fo_obj">
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="admin_member" value="<!--@foreach($admin_member as $key => $val)-->{$val->user_id},<!--@end-->" />
-
-<h4 class="xeAdmin">{$lang->about_admin_id}</h4>
-<table cellspacing="0" class="rowTable">
-<tr>
-    <th scope="row" rowspan="2"><div>{$lang->admin_id}</div></th>
-    <td class="wide">
-        <select name="_admin_member" multiple="multiple" size="{count($admin_member)?count($admin_member):1}" class="w200">
-        <!--@foreach($admin_member as $key => $val)-->
-            <option value="{$val->user_id}">{$val->nick_name} ({$val->user_id})</option>
-        <!--@end-->
-        </select>
-    </td>
-</tr>
-<tr>
-    <th class="wide">
-        <input type="text" name="admin_id" class="inputTypeText w100" />
-        <span class="button black strong"><button type="button" onclick="doInsertAdmin()">{$lang->cmd_insert}</button></span>
-        <span class="button"><button type="button" onclick="doDeleteAdmin()">{$lang->cmd_delete}</button></span>
-    </th>
-</tr>
-</table>
-
-<h4 class="xeAdmin">{$lang->about_grant}</h4>
-<p class="summary">{$lang->about_grant_deatil}</p>
-<table cellspacing="0" class="crossTable">
-<thead>
-<tr>
-    <th scope="col"><div>{$lang->grant}</div></th>
-    <th scope="col" colspan="3"><div>{$lang->target}</div></th>
-</tr>
-</thead>
-<tbody>
-    <!--@foreach($grant_list as $grant_name => $grant_item)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row"><div>{$grant_item->title}</div></th>
-        <td class="wide">
-            <select name="{$grant_name}_default" class="grant_default">
-                <!--@if($grant_item->default == 'guest')--><option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option><!--@end-->
-                <!--@if($grant_item->default != 'manager')--><option value="-1" <!--@if($default_grant[$grant_name]=='member')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option><!--@end-->
-                <!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
-                <option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
-            </select>
-
-            <div id="zone_{$grant_name}" style="display:none">
-                <!--@foreach($group_list as $group_srl => $group_item)-->
-                <input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" <!--@if(is_array($selected_group[$grant_name])&&in_array($group_srl,$selected_group[$grant_name]))-->checked="checked"<!--@end-->/> 
-                <label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
-                <!--@end-->
-            </div>
-
-        </td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th class="button" colspan="2">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="history.back(); return false;" /></span>
-        </th>
-    </tr>
-</tbody>
-</table>
-
+<form action="./" method="post" onsubmit="return procFilter(this, insert_grant)" id="fo_obj" class="form">
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="admin_member" value="<!--@foreach($admin_member as $key => $val)-->{$val->user_id},<!--@end-->" />
+	
+	<h3 class="h3">{$lang->module_admin}</h3>
+	<p>{$lang->about_admin_id}</p>
+	<ul>
+		<li>
+			<p class="q">
+				<!--@if($member_config->identifier == 'email_address')-->
+					{$lang->admin_email_address}
+				<!--@else-->
+					{$lang->admin_id}
+				<!--@end-->
+			</p>
+			<p class="a">
+				<select name="_admin_member" multiple="multiple" size="{count($admin_member)?count($admin_member):1}" style="width:290px">
+					<!--@foreach($admin_member as $key => $val)-->
+					<option value="{$val->user_id}">{$val->nick_name} (<!--@if($member_config->identifier=='email_address')-->{$val->email_address}<!--@else-->{$val->user_id}<!--@end-->)</option>
+					<!--@end-->
+				</select>
+				<br />
+				<input type="text" name="admin_id" />
+				<span class="btn"><button type="button" onclick="doInsertAdmin()">{$lang->cmd_insert}</button></span>
+				<span class="btn"><button type="button" onclick="doDeleteAdmin()">{$lang->cmd_delete}</button></span>
+			</p>
+		</li>
+	</ul>
+	<h3 class="h3">{$lang->permission_setting}</h3>
+	<p>{$lang->about_grant_deatil}</p>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col">{$lang->grant}</th>
+					<th scope="col" colspan="3">{$lang->target}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<!--@foreach($grant_list as $grant_name => $grant_item)-->
+				<tr>
+					<th scope="row">{$grant_item->title}</th>
+					<td >
+						<select name="{$grant_name}_default" class="grant_default">
+							<!--@if($grant_item->default == 'guest')--><option value="0" <!--@if($default_grant[$grant_name]=='all')-->selected="selected"<!--@end-->>{$lang->grant_to_all}</option><!--@end-->
+							<!--@if($grant_item->default != 'manager')--><option value="-1" <!--@if($default_grant[$grant_name]=='member')-->selected="selected"<!--@end-->>{$lang->grant_to_login_user}</option><!--@end-->
+							<!--@if($grant_item->default != 'manager')--><option value="-2" <!--@if($default_grant[$grant_name]=='site')-->selected="selected"<!--@end-->>{$lang->grant_to_site_user}</option><!--@end-->
+							<option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
+						</select>
+						<div id="zone_{$grant_name}" style="display:none">
+							<!--@foreach($group_list as $group_srl => $group_item)-->
+							<input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" <!--@if(is_array($selected_group[$grant_name])&&in_array($group_srl,$selected_group[$grant_name]))-->checked="checked"<!--@end-->/>
+							<label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
+							<!--@end-->
+						</div>
+						
+						</td>
+					</tr>
+				<!--@end-->
+				</tbody>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </form>
diff --git a/modules/module/tpl/module_info.html b/modules/module/tpl/module_info.html
index 2dd5975f8..edcddd969 100644
--- a/modules/module/tpl/module_info.html
+++ b/modules/module/tpl/module_info.html
@@ -1,16 +1,12 @@
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->module_maker}</h3>
-</div>
-
-<div id="popBody">
-
-    <table cellspacing="0" class="rowTable">
+<h1 class="h1">{$lang->module_maker}</h1>
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <tr>
-        <th scope="row"><div>{$lang->title}</div></th>
+        <th scope="row">{$lang->title}</th>
         <td>{$module_info->title} ver {$module_info->version}</td>
     </tr>
     <tr>
-        <th scope="row"><div>{$lang->author}</div></th>
+        <th scope="row">{$lang->author}</th>
         <td class="blue">
             <!--@foreach($module_info->author as $author)-->
             {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
@@ -19,17 +15,17 @@
     </tr>
     <!--@if($module_info->homepage)-->
     <tr>
-        <th scope="row"><div>{$lang->homepage}</div></th>
+        <th scope="row">{$lang->homepage}</th>
         <td class="blue"><a href="{$module_info->homepage}" onclick="window.open(this.href);return false;">{$module_info->homepage}</a></td>
     </tr>
     <!--@endif-->
     <tr>
-        <th scope="row"><div>{$lang->regdate}</div></th>
+        <th scope="row">{$lang->regdate}</th>
         <td>{zdate($module_info->date, 'Y-m-d')}</td>
     </tr>
     <!--@if($module_info->license || $module_info->license_link)-->
     <tr>
-        <th scope="row"><div>{$lang->module_license}</div></th>
+        <th scope="row">{$lang->module_license}</th>
         <td>
             {nl2br(trim($module_info->license))}
         <!--@if($module_info->license_link)-->
@@ -39,21 +35,18 @@
     </tr>
     <!--@endif--><!--@if($module_info->description)-->
     <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
+        <th scope="row">{$lang->description}</th>
         <td>{nl2br(trim($module_info->description))}</td>
     </tr>
     <!--@endif-->
     </table>
-
 </div>
 
 <!--@if($module_info->history)-->
-<div id="popHistoryHeadder">
-    <h3 class="xeAdmin">{$lang->module_history}</h3>
-</div>
+<h1 class="h1">{$lang->module_history}</h1>
 
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <col width="100" />
     <col />
 
diff --git a/modules/module/tpl/module_langcode.html b/modules/module/tpl/module_langcode.html
index 571f5a7ae..a2b35d2ff 100644
--- a/modules/module/tpl/module_langcode.html
+++ b/modules/module/tpl/module_langcode.html
@@ -1,65 +1,95 @@
-<!--%import("./filter/insert_lang.xml")-->
-<!--%import("./js/module_admin.js")-->
-<!--%import("../../common/css/popup.css")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">{$lang->lang_code}</h3>
+<load target="js/multilingual.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<div id="popBody">
-    <table cellspacing="0" class="colTable">
-    <col width="50%"/>
-    <col width="50%"/>
-    <tr>
-        <td>
-            <table cellspacing="0" class="rowTable">
-            <tbody>
-            <!--@foreach($lang_list as $key => $val)-->
-            <tr>
-                <td>
-                    <div class="fl"><a href="#" onclick="doInsertLangCode('{$val->name}','{$target}'); return false;">{$val->name}</a></div>
-                    <div class="fr">
-                        <a href="{getUrl('name',$val->name)}" class="buttonSet buttonActive"><span>{$lang->cmd_select}</span></a>
-                        <a href="#" onclick="if(confirm('{$lang->confirm_delete}')) doDeleteLang('{$val->name}','{$target}'); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_select}</span></a>
-                    </div>
-                </td>
-            </tr>
-            <!--@end-->
-            </tbody>
-            </table>
-        </td>
-        <td>
-            <form action="./" method="post" onsubmit="return procFilter(this, insert_lang)" id="menu_fo">
-                <input type="hidden" name="target" value="{$target}" />
-                <table cellspacing="0" class="rowTable">
-                <tbody>
-                <tr>
-                    <th scope="row"><div>{$lang->lang_code}</div></th>
-                    <td>
-                        <input type="text" name="lang_code" value="{$name}" class="inputTypeText w200" />
-                    </td>
-                </tr>
-                <!--@foreach($lang_supported as $key => $val)-->
-                <tr>
-                    <th scope="row"><div>{$val}</div></th>
-                    <td>
-                        <textarea name="{$key}" class="inputTypeTextArea" style="height:40px; width:90%;">{$selected_lang[$key]}</textarea>
-                    </td>
-                </tr>
-                <!--@end-->
-                <tr>
-                    <th class="button" colspan="2">
-                        <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"></span>
-                    </th>
-                </tr>
-                </tbody>
-                </table>
-            </form>
-        </td>
-    </tr>
-    </table>
+<h1 class="h1">{$lang->menu_gnb_sub['multilingual']}</h1>
+<p>{$lang->multilingual_desc}</p>
+<div class="mLangEdit ko form"><!-- class="mLangEdit LANGCODE" -->
+	<div class="btnArea">
+		<span class="btn"><a href="#addWord" class="modalAnchor">{$lang->add_word}</a></span>
+	</div>
+	<ul id="langList">
+		<li cond="!is_array($lang_code_list) || count($lang_code_list) < 1">
+			<p>{$lang->no_multi_lang}</p>
+		</li>
+		<li loop="$lang_code_list=>$key,$value">
+		{@$langName = $value->name}
+		<strong>{$value->value}</strong> <span class="side"><button type="button" class="text" cond="$module != 'admin'" onclick="doInsertLangCode('{$value->name}', '{$target}')">{$lang->cmd_apply}</button><button type="button" class="text _edit">{$lang->cmd_edit}</button></span>
+		<form action="./" method="post" id="langForm_{$langName}" >
+			<input type="hidden" name="module" value="{$module}" />
+			<input type="hidden" name="act" value="procModuleAdminInsertLang" />
+			<input type="hidden" name="lang_name" value="{$langName}" />
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li class="{$key2}" loop="$lang_supported=>$key2,$value2"><label for="{$langName}_{$key2}">{$value2}</label> <textarea rows="1" cols="42" name="{$key2}" id="{$langName}_{$key2}"></textarea></li>
+			</ul>
+			<div class="btnArea">
+				<button type="submit" name="act" value="procModuleAdminInsertLang">{$lang->cmd_save}</button>
+				<button type="submit" name="act" value="procModuleAdminDeleteLang">{$lang->cmd_delete}</button>
+			</div>
+		</form>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><a href="#addWord" class="modalAnchor">{$lang->add_word}</a></span>
+	</div>
 </div>
+<div class="modal" id="addWord">
+	<form action="./" method="post" class="form mLangEdit fg" id="langForm_new" >
+	<input type="hidden" name="act" value="procModuleAdminInsertLang" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="target" value="{$target}" />
+	<h2 class="h2">{$lang->add_word}</h2>
+	<ul>
+		<li class="{$key2}" loop="$lang_supported=>$key2,$value2"><label for="{$langName}_{$key2}">{$value2}</label> <textarea rows="1" cols="42" name="{$key2}" id="{$langName}_{$key2}"></textarea></li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn small"><button type="submit">{$lang->cmd_save}</button></span>
+	</div>
+	</form>
+</div>
+<div class="search">
+	<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
 
-<script type="text/javascript">
-	jQuery(function(){ doFillLangName() });
-</script>
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<block loop="$page_no = $page_navigation->getNextPage()">
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	</block>
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+	</form>
+
+	<form action="./" method="get">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="search_target" value="value" />
+	<input type="hidden" name="error_return_url" value="" />
+		<input title="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+		<input type="submit" value="{$lang->cmd_search}" />
+	</form>
+</div>
diff --git a/modules/module/tpl/module_list.html b/modules/module/tpl/module_list.html
index 5956650d5..0ac5b2a05 100644
--- a/modules/module/tpl/module_list.html
+++ b/modules/module/tpl/module_list.html
@@ -1,46 +1,64 @@
-<!--%import("filter/insert_shortcut.xml")-->
-<!--#include("header.html")-->
+<include target="header.html" />
 
-<!-- 관리자 메뉴 바로가기 추가를 위한 임시 form -->
-<form id="fo_shortcut" action="./" method="get">
-    <input type="hidden" name="selected_module" value="" />
-</form>
-    <h4 class="xeAdmin">{$lang->module}</h4>
-    <table cellspacing="0" class="rowTable">
-    <thead>
-        <tr>
-            <th class="wide"><div>{$lang->module_name}</div></th>
-            <th><div>{$lang->version}</div></th>
-            <th><div>{$lang->author}</div></th>
-            <th><div>{$lang->table_count}</div></th>
-            <th><div>{$lang->path}</div></th>
-            <th><div>{$lang->module_action}</div></th>
-        </tr>
-    </thead>
-    <tbody>
-    <!--@foreach($module_list as $key => $val)-->
-        <tr class="row{$cycle_idx}">
-            <td><a href="{getUrl('','module','module','act','dispModuleAdminInfo','selected_module',$val->module)}" onclick="popopen(this.href,'module_info');return false"title="{trim($val->description)}">{$val->title}</a> ({$val->module})</td>
-            <td class="center number">{$val->version}</td>
-            <td class="nowrap">
-                <!--@foreach($val->author as $author)-->
-                <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
-                <!--@endforeach-->
-            </td>
-            <td class="number center <!--@if($val->created_table_count != $val->table_count)-->alert<!--@end-->">
-                {$val->created_table_count}/{$val->table_count}
-            </td>
-            <td class="nowrap">{$val->path}</td>
-            <td class="nowrap center <!--@if($val->need_install || $val->need_update)-->alert<!--@end-->">
-                <!--@if($val->need_install)-->
-                    <a href="#" onclick="doInstallModule('{$val->module}');return false;">{$lang->cmd_install}</a>
-                <!--@elseif($val->need_update)-->
-                    <a href="#" onclick="doUpdateModule('{$val->module}'); return false;">{$lang->cmd_update}</a>
-                <!--@else-->
-                    -
-                <!--@end-->
-            </td>
-        </tr>
-        <!--@end-->
-    </tbody>
-    </table>
+<div class="table even easyList">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>
+		All({count($module_list)})
+		</caption>
+		<thead>
+			<tr>
+				<th scope="col">{$lang->favorite}</th>
+				<th scope="col" class="title">{$lang->module_name}</th>
+				<th scope="col">{$lang->version}</th>
+				<th scope="col">{$lang->author}</th>
+				<th scope="col">{$lang->path}</th>
+				<th scope="col">{$lang->cmd_delete}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($module_list as $key => $val)-->
+			<tr>
+				<td>
+					<!--@if(in_array($val->module,$favoriteModuleList))-->
+					<a href="#" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</a>
+					<!--@else-->
+					<a href="#" class="fvOff" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->off})</a>
+					<!--@end-->
+				</td>
+				<td class="title">
+					<p>
+						<!--@if($val->admin_index_act)-->	
+						<a href="{getUrl('','module','admin','act',$val->admin_index_act)}">{$val->title}</a>
+						<!--@else-->
+						<strong>{$val->title}</strong>
+						<!--@end-->
+					</p>
+					<p>{$val->description}</p>
+						<p cond="$val->need_install" class="update">{$lang->msg_avail_install} <a href="#" onclick="doInstallModule('{$val->module}');return false;">{$lang->msg_do_you_like_install}</a></p>
+						<p cond="$val->need_update" class="update">{$lang->msg_avail_update} <a href=="#" onclick="doUpdateModule('{$val->module}'); return false;">{$lang->msg_do_you_like_update}</a></p>
+						<p cond="$val->need_autoinstall_update == 'Y'" class="update">{$lang->msg_avail_easy_update}<a href="{$val->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a></p>
+				</td>
+				<td>{$val->version}</td>
+				<td>
+					<!--@foreach($val->author as $author)-->
+						<!--@if($author->homepage)-->
+						<a href="{$author->homepage}" onclick="window.open(this.href);return false;"  target="_blank">
+						<!--@end-->
+						{$author->name}
+						<!--@if($author->homepage)-->
+						</a>
+						<!--@end-->
+					<!--@endforeach-->
+				</td>
+				<td>{$val->path}</td>
+				<td>
+					<!--@if($val->delete_url)-->
+					<a href="{$val->delete_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a>
+					<!--@end-->
+				</td>
+			</tr>
+			<!--@end-->
+
+		</tbody>
+	</table>
+</div>
diff --git a/modules/module/tpl/module_selector.html b/modules/module/tpl/module_selector.html
index 3a54708ea..1d34b3786 100644
--- a/modules/module/tpl/module_selector.html
+++ b/modules/module/tpl/module_selector.html
@@ -1,78 +1,76 @@
-<!--%import("./js/module_admin.js")-->
-<!--%import("../../common/css/popup.css")-->
-
-<div id="popHeader">
-    <h3 class="xeAdmin">{$lang->module_selector}</h3>
-</div>
-
-<div id="popBody">
-    <form action="./" method="post">
-        <input type="hidden" name="module" value="module" />
-        <input type="hidden" name="act" value="dispModuleSelectList" />
-        <input type="hidden" name="id" value="{$id}" />
-        <input type="hidden" name="type" value="{$type}" />
-        <input type="hidden" name="vid" value="{$vid}" />
-        <table class="rowTable" cellspacing="0">
-        <tbody>
-            <!--@if($site_count && $logged_info->is_admin == 'Y')-->
-            <tr>
-                <th><div>{$lang->virtual_site}</div></th>
-                <td>
-                    <input type="text" name="site_keyword" value="{$site_keyword}" class="inputTypeText w200" /> <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-                    <p>{$lang->about_search_virtual_site}</p>
-                </td>
-            </tr>
-            <!--@end-->
-            <tr>
-                <th><div>{$lang->module}</div></th>
-                <td>
-                    <select name="selected_module">
-                    <!--@foreach($mid_list as $key=>$val)-->
-                        <option value="{$key}" <!--@if($selected_module == $key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                    <!--@end-->
-                    </select><span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-                </td>
-            </tr>
-        </tbody>
-        </table>
-        <table class="rowTable" cellspacing="0">
-        <thead>
-            <tr>
-                <!--@if($module_category_exists)--><th><div>{$lang->module_category}</div></th><!--@end-->
-                <th><div>{$lang->mid}</div></th>
-                <th class="wide"><div>{$lang->browser_title}</div></th>
-                <th><div>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</div></th>
-            <tr>
-        </thead>
-        <tbody>
-            <!--@if($module_category_exists)-->
-                <!--@foreach($selected_mids as $key => $val)-->
-                <tr>
-                    <td rowspan="{count($val)}">{$key}&nbsp;</td>
-                    {@ $_idx =0; }
-                    <!--@foreach($val as $k => $v)-->
-                    <!--@if($_idx >0)--><tr><!--@end-->
-					{@ $browser_title = str_replace("'", "\\'", htmlspecialchars($v->browser_title)); }
-                    <td>{$k}</td>
-                    <td>{$v->browser_title}</td>
-                    <td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{$browser_title}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
-                    <!--@if($_idx <count($val))--></tr><!--@end-->
-                    {@ $_idx ++; }
-                    <!--@end-->
-                </tr>
-                <!--@end-->
-            <!--@else-->
-                <!--@foreach($selected_mids as $key => $val)-->
-                <!--@foreach($val as $k => $v)-->
-                <tr>
-                    <td>{$k}</td>
-                    <td>{$v->browser_title}</td>
-                    <td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{str_replace("'","\\'",$v->browser_title)}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
-                </tr>
-                <!--@end-->
-                <!--@end-->
-            <!--@end-->
-        </tbody>
-        </table>
-    </form>
-</div>
\ No newline at end of file
+<load target="./js/module_admin.js" usecdn="true" />
+<load target="../../common/css/popup.css" usecdn="true" />
+<h1 class="h1">{$lang->module_selector}</h1>
+<form action="./" method="post">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="dispModuleSelectList" />
+	<input type="hidden" name="id" value="{$id}" />
+	<input type="hidden" name="type" value="{$type}" />
+	<input type="hidden" name="vid" value="{$vid}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tbody>
+				<!--@if($site_count && $logged_info->is_admin == 'Y')-->
+				<tr>
+					<th>{$lang->virtual_site}</th>
+					<td>
+						<input type="text" name="site_keyword" value="{$site_keyword}" /> <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+						<p>{$lang->about_search_virtual_site}</p>
+					</td>
+				</tr>
+				<!--@end-->
+				<tr>
+					<th>{$lang->module}</th>
+					<td>
+						<select name="selected_module">
+							<!--@foreach($mid_list as $key=>$val)-->
+							<option value="{$key}" <!--@if($selected_module == $key)-->selected="selected"<!--@end-->>{$val->title}</option>
+							<!--@end-->
+						</select><span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+					</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<!--@if($module_category_exists)--><th>{$lang->module_category}</th><!--@end-->
+					<th>{$lang->mid}</th>
+					<th >{$lang->browser_title}</th>
+					<th>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</th>
+				<tr>
+			</thead>
+			<tbody>
+				<!--@if($module_category_exists)-->
+				<!--@foreach($selected_mids as $key => $val)-->
+				<tr>
+					<td rowspan="{count($val)}">{$key}&nbsp;</td>
+					{@ $_idx =0; }
+					<!--@foreach($val as $k => $v)-->
+					<!--@if($_idx >0)--><tr><!--@end-->
+						{@ $browser_title = str_replace("'", "\\'", htmlspecialchars($v->browser_title)); }
+						<td>{$k}</td>
+						<td>{$v->browser_title}</td>
+						<td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{$browser_title}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
+					<!--@if($_idx <count($val))--></tr><!--@end-->
+			{@ $_idx ++; }
+			<!--@end-->
+			</tr>
+			<!--@end-->
+			<!--@else-->
+			<!--@foreach($selected_mids as $key => $val)-->
+			<!--@foreach($val as $k => $v)-->
+			<tr>
+				<td>{$k}</td>
+				<td>{$v->browser_title}</td>
+				<td><a href="#" onclick="insertModule('{$id}', {$v->module_srl}, '{$k}', '{str_replace("'","\\'",$v->browser_title)}',{$type=='single'?'false':'true'}); return false;" class="button green"><span>{$type=='single'?$lang->cmd_select:$lang->cmd_insert}</span></a></td>
+				</tr>
+			<!--@end-->
+			<!--@end-->
+			<!--@end-->
+			</tbody>
+		</table>
+	</div>
+</form>
diff --git a/modules/module/tpl/module_setup.html b/modules/module/tpl/module_setup.html
index 72dadf8a2..4fef3d9bb 100644
--- a/modules/module/tpl/module_setup.html
+++ b/modules/module/tpl/module_setup.html
@@ -1,78 +1,72 @@
-<!--%import("./filter/insert_module_setup.xml")-->
-<!--%import("./js/module_admin.js")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->bundle_setup}</h3>
+<load target="./js/module_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_module_setup)" enctype="multipart/form-data">
-<input type="hidden" name="module_srls" value="{$module_srls}" />
-<div id="popBody">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->module_category}</div></th>
-        <td>
-            <select name="module_category_srl">
-                <option value="0">{$lang->notuse}</option>
-                <!--@foreach($module_category as $key => $val)-->
-                <option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_module_category}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->layout}</div></th>
-        <td>
-            <select name="layout_srl">
-            <option value="0">{$lang->notuse}</option>
-            <!--@foreach($layout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_layout}</p>
-        </td>
-    </tr>
-    <!--@if(count($skin_list))-->
-    <tr>
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td>
-            <select name="skin">
-                <!--@foreach($skin_list as $key=>$val)-->
-                <option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_skin}</p>
-        </td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>
-            <textarea name="description" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->description)}</textarea>
-            <p>{$lang->about_description}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->header_text}</div></th>
-        <td>
-            <textarea name="header_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->header_text)}</textarea>
-            <p>{$lang->about_header_text}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->footer_text}</div></th>
-        <td>
-            <textarea name="footer_text" class="inputTypeTextArea fixWidth">{htmlspecialchars($module_info->footer_text)}</textarea>
-            <p>{$lang->about_footer_text}</p>
-        </td>
-    </tr>
-    </table>
-</div>
-
-<div id="popFooter" class="tCenter gap1">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" /></span>
-</div>
-
+<form ruleset="insertModuleSetup" action="./" method="post" enctype="multipart/form-data" class="form">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="act" value="procModuleAdminModuleSetup" />
+	<input type="hidden" name="module_srls" value="{$module_srls}" />
+	<h1 class="h1">{$lang->bundle_setup}</h1>
+	<ul>
+		<li>
+			<p class="q"><label for="module_category_srl">{$lang->module_category}</label></p>
+			<p class="a">
+				<select name="module_category_srl" id="module_category_srl">
+					<option value="0">{$lang->notuse}</option>
+					<!--@foreach($module_category as $key => $val)-->
+					<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+				</select>
+			</p>
+			<p class="desc">{$lang->about_module_category}</p>
+		</li>
+		<li>
+			<p class="q"><label for="layout_srl">{$lang->layout}</label></p>
+			<p class="a">
+				<select name="layout_srl" id="layout_srl">
+					<option value="0">{$lang->notuse}</option>
+					<!--@foreach($layout_list as $key => $val)-->
+					<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+					<!--@end-->
+				</select>
+			</p>
+			<p class="desc">{$lang->about_layout}</p>
+		</li>
+		<li cond="count($skin_list)">
+			<p class="q"><label for="skin">{$lang->skin}</label></p>
+			<p class="a">
+				<select name="skin" id="skin">
+					<!--@foreach($skin_list as $key=>$val)-->
+					<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='xe_board'))-->selected="selected"<!--@end-->>{$val->title}</option>
+					<!--@end-->
+				</select>
+			</p>
+			<p class="desc">{$lang->about_skin}</p>
+		</li>
+		<li>
+			<p class="q"><label for="description">{$lang->description}</label></p>
+			<p class="a">
+				<textarea name="description" id="description" rows="4" cols="45">{htmlspecialchars($module_info->description)}</textarea>
+			</p>
+			<p class="desc">{$lang->about_description}</p>
+		</li>
+		<li>
+			<p class="q"><label for="header_text">{$lang->header_text}</label></p>
+			<p class="a">
+				<textarea name="header_text" id="header_text" rows="4" cols="45">{htmlspecialchars($module_info->header_text)}</textarea>
+			</p>
+			<p class="desc">{$lang->about_header_text}</p>
+		</li>
+		<li>
+			<p class="q"><label for="footer_text">{$lang->footer_text}</label></p>
+			<p class="a">
+				<textarea name="footer_text" rows="4" cols="45">{htmlspecialchars($module_info->footer_text)}</textarea>
+			</p>
+			<p class="desc">{$lang->about_footer_text}</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
+	
 </form>
diff --git a/modules/module/tpl/move_filebox_list.html b/modules/module/tpl/move_filebox_list.html
index fe25e5d99..97f9a7392 100644
--- a/modules/module/tpl/move_filebox_list.html
+++ b/modules/module/tpl/move_filebox_list.html
@@ -1,3 +1,3 @@
-<script type="text/javascript">
-    top.location.href = "{$url}";
+<script type="text/javascript">
+    top.location.href = "{$url}";
 </script>
\ No newline at end of file
diff --git a/modules/module/tpl/skin_config.html b/modules/module/tpl/skin_config.html
index 8506ff858..052df5823 100644
--- a/modules/module/tpl/skin_config.html
+++ b/modules/module/tpl/skin_config.html
@@ -1,150 +1,147 @@
-<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe">
-<input type="hidden" name="module" value="module" />
-<input type="hidden" name="vid" value="{$vid}" />
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="act" value="procModuleAdminUpdateSkinInfo" />
-<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-<input type="hidden" name="page" value="{$page}" />
+<form action="{Context::getRequestUri()}" method="post" enctype="multipart/form-data" target="hidden_iframe" class="form">
+	<input type="hidden" name="module" value="module" />
+	<input type="hidden" name="vid" value="{$vid}" />
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="act" value="procModuleAdminUpdateSkinInfo" />
+	<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+	<input type="hidden" name="page" value="{$page}" />
+	
+    <h3 class="h3">{$lang->skin_default_info}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->skin}</th>
+				<td  >{$skin_info->title}</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->skin_author}</th>
+				<td>
+					<!--@foreach($skin_info->author as $author)-->
+					{$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
+					<!--@endforeach-->
+				</td>
+			</tr>
+	<!--@if($skin_info->homepage)-->
+			<tr>
+				<th scope="row">{$lang->homepage}</th>
+				<td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a></td>
+			</tr><!--@end-->
+			<tr>
+				<th scope="row">{$lang->date}</th>
+				<td>{zdate($skin_info->date, 'Y-m-d')}&nbsp;</td>
+			</tr>
+	<!--@if($skin_info->license || $skin_info->license_link)-->
+			<tr>
+				<th scope="row">{$lang->skin_license}</th>
+				<td>
+					{nl2br(trim($skin_info->license))}
+					<!--@if($skin_info->license_link)-->
+					<p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
+					<!--@end-->
+				</td>
+			</tr><!--@end-->
+	<!--@if($skin_info->description)-->
+			<tr>
+				<th scope="row">{$lang->description}</th>
+				<td>{nl2br(trim($skin_info->description))}</td>
+			</tr><!--@end-->
+		</table>
+	</div>
 
-    <h4 class="xeAdmin">{$lang->skin_default_info}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->skin}</div></th>
-        <td class="wide" >{$skin_info->title}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->skin_author}</div></th>
-        <td>
-            <!--@foreach($skin_info->author as $author)-->
-            {$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
-            <!--@endforeach-->
-        </td>
-    </tr>
-<!--@if($skin_info->homepage)-->
-    <tr>
-        <th scope="row"><div>{$lang->homepage}</div></th>
-        <td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a></td>
-    </tr><!--@end-->
-    <tr>
-        <th scope="row"><div>{$lang->date}</div></th>
-        <td>{zdate($skin_info->date, 'Y-m-d')}&nbsp;</td>
-    </tr>
-<!--@if($skin_info->license || $skin_info->license_link)-->
-    <tr>
-        <th scope="row"><div>{$lang->skin_license}</div></th>
-        <td>
-            {nl2br(trim($skin_info->license))}
-        <!--@if($skin_info->license_link)-->
-            <p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-        <!--@end-->
-        </td>
-    </tr><!--@end-->
-<!--@if($skin_info->description)-->
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>{nl2br(trim($skin_info->description))}</td>
-    </tr><!--@end-->
-    </table>
-
-    <h4 class="xeAdmin">{$lang->extra_vars}</h4>
-    <table cellspacing="0" class="rowTable">
-
-    <tr valign="top">
-        <th scope="row"><div>{$lang->colorset}</div></th>
-        <td class="wide">
-            <!--@foreach($skin_info->colorset as $key => $val)-->
-            <!--@if($val->screenshot)-->
-            {@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
-            <!--@else-->
-            {@ $_width = 200; $_height = 20; $_talign = "left"; }
-            <!--@end-->
-            <div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
-            <input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($skin_vars['colorset']->value==$val->name)-->checked="checked"<!--@end-->/>
-            <label for="colorset_{$key}">{$val->title}</label>
-            <!--@if($val->screenshot)-->
-            <br />
-            <img src="../../../{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
-            <!--@end-->
-            </div>
-            <!--@end-->
-        </td>
-    </tr>
-
-
-    <!--@foreach($skin_info->extra_vars as $key => $val)-->
-
-    <!--@if($val->group && ((!$group) || $group != $val->group))-->
-    {@$group = $val->group}
-    </table>
-    <h4 class="xeAdmin">{$group}</h4>
-    <table cellspacing="0" class="rowTable">
+    <h3 class="h3">{$lang->extra_vars}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			
+			<tr valign="top">
+				<th scope="row"><div>{$lang->colorset}</div></th>
+				<td >
+					<!--@foreach($skin_info->colorset as $key => $val)-->
+					<!--@if($val->screenshot)-->
+					{@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
+					<!--@else-->
+					{@ $_width = 200; $_height = 20; $_talign = "left"; }
+					<!--@end-->
+					<div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
+						<input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($skin_vars['colorset']->value==$val->name)-->checked="checked"<!--@end-->/>
+						<label for="colorset_{$key}">{$val->title}</label>
+						<!--@if($val->screenshot)-->
+						<br />
+						<img src="../../../{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
+						<!--@end-->
+					</div>
+					<!--@end-->
+				</td>
+			</tr>
+			<!--@foreach($skin_info->extra_vars as $key => $val)-->
+			
+			<!--@if($val->group && ((!$group) || $group != $val->group))-->
+			{@$group = $val->group}
+		</table>
+	</div>
+    <h3 class="h3">{$group}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<!--@end-->
+			
+			<tr>
+				<th scope="row"><div>{$val->title}</div></th>
+				<td >
+					<!--@if($val->type=="text")-->
+					<input type="text" name="{$val->name}" value="{$val->value}" id="target{$val->name}" />
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+					
+					<!--@elseif($val->type=="textarea")-->
+					<textarea name="{$val->name}" id="target{$val->name}" rows="5" cols="42">{$val->value}</textarea>
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+					
+					<!--@elseif($val->type=="select")-->
+					<select name="{$val->name}">
+						<!--@foreach($val->options as $k=>$v)-->
+						<option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
+						<!--@end-->
+					</select>
+					
+					<!--@elseif($val->type=="checkbox")-->
+					<!--@foreach($val->options as $k=>$v)-->
+					<span>
+						<input type="checkbox" name="{$val->name}[]" value="{$v->value}" id="ch_{$key}_{$k}" <!--@if(in_array($v->value, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
+						<label for="ch_{$key}_{$k}">{$v->title}</label>
+					</span>
+					<!--@end-->
+					
+					<!--@elseif($val->type=="radio")-->
+					<!--@foreach($val->options as $k=>$v)-->
+					<span>
+						<input type="radio" name="{$val->name}" value="{$v->value}" id="ch_{$key}_{$k}" <!--@if($v->value==$val->value)-->checked="checked"<!--@end-->/> 
+						<label for="ch_{$key}_{$k}">{$v->title}</label>
+					</span>
+					<!--@end-->
+					
+					<!--@elseif($val->type=="image")-->
+					<!--@if($val->value)-->
+					<div>
+						<img src="{$val->value}" /><br />
+						<input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
+						<label for="del_{$val->name}">{$lang->cmd_delete}</label>
+					</div>
+					<!--@end-->
+					
+					<input type="file" name="{$val->name}" value="" />
+					<!--@end-->
+					
+					<!--@if($val->description)-->
+					<p>{nl2br(trim($val->description))}</p>
+					<!--@end-->
+				</td>
+			</tr>
+			<!--@end-->
+			<!--@if(!$group)-->
+		</table>
+	</div>
     <!--@end-->
-
-    <tr>
-        <th scope="row"><div>{$val->title}</div></th>
-        <td class="wide">
-            <!--@if($val->type=="text")-->
-                <input type="text" name="{$val->name}" value="{$val->value}" id="target{$val->name}" class="inputTypeText w400" />
-                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-
-            <!--@elseif($val->type=="textarea")-->
-                <textarea name="{$val->name}" class="inputTypeTextArea w400" id="target{$val->name}">{$val->value}</textarea>
-                <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-
-            <!--@elseif($val->type=="select")-->
-                <select name="{$val->name}">
-                    <!--@foreach($val->options as $k=>$v)-->
-                    <option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
-                    <!--@end-->
-                </select>
-
-            <!--@elseif($val->type=="checkbox")-->
-                <!--@foreach($val->options as $k=>$v)-->
-                <span>
-                    <input type="checkbox" name="{$val->name}[]" value="{$v->value}" id="ch_{$key}_{$k}" <!--@if(in_array($v->value, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
-                    <label for="ch_{$key}_{$k}">{$v->value}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="radio")-->
-                <!--@foreach($val->options as $k=>$v)-->
-                <span>
-                    <input type="radio" name="{$val->name}" value="{$v->value}" id="ch_{$key}_{$k}" <!--@if($v->value==$val->value)-->checked="checked"<!--@end-->/> 
-                    <label for="ch_{$key}_{$k}">{$v->value}</label>
-                </span>
-                <!--@end-->
-
-            <!--@elseif($val->type=="image")-->
-                <!--@if($val->value)-->
-                <div>
-                    <img src="{$val->value}" /><br />
-                    <input type="checkbox" name="del_{$val->name}" value="Y" id="del_{$val->name}" class="checkbox" />
-                    <label for="del_{$val->name}">{$lang->cmd_delete}</label>
-                </div>
-                <!--@end-->
-
-                <input type="file" name="{$val->name}" value="" />
-            <!--@end-->
-
-            <!--@if($val->description)-->
-            <p>{nl2br(trim($val->description))}</p>
-            <!--@end-->
-        </td>
-    </tr>
-    <!--@end-->
-
-    <!--@if($group)-->
-    </table>
-    <table cellspacing="0" class="rowTable">
-    <!--@end-->
-
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
 
 <iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
diff --git a/modules/module/tpl/skin_info.html b/modules/module/tpl/skin_info.html
index 05c403d4e..f634f96d7 100644
--- a/modules/module/tpl/skin_info.html
+++ b/modules/module/tpl/skin_info.html
@@ -1,10 +1,7 @@
-<!--%import("../../admin/tpl/css/admin.css")-->
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$skin_info->title}</h3>
-</div>
-
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
+<load target="../../admin/tpl/css/admin.css" usecdn="true" />
+<h1 class="h1">{$skin_info->title}</h1>
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <col width="100" />
     <col />
     <tr>
@@ -50,12 +47,9 @@
 </div>
 
 <!--@if($skin_info->history)-->
-<div id="popHistoryHeadder">
-    <h3 class="xeAdmin">{$lang->skin_history}</h3>
-</div>
-
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
+<h1 class="h1">{$lang->skin_history}</h1>
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <col width="100" />
     <col />
 
diff --git a/modules/opage/conf/info.xml b/modules/opage/conf/info.xml
deleted file mode 100644
index 3f662b7f2..000000000
--- a/modules/opage/conf/info.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">외부 페이지</title>
-    <title xml:lang="zh-CN">外部页面</title>
-    <title xml:lang="jp">外部ページ</title>
-    <title xml:lang="en">External Page</title>
-    <title xml:lang="vi">Trang ngoài</title>
-    <title xml:lang="es">Afuera Página</title>
-    <title xml:lang="ru">Внешние страницы</title>
-    <title xml:lang="zh-TW">外部頁面</title>
-    <title xml:lang="tr">Harici Sayfa</title>
-    <description xml:lang="ko">외부페이지를 XE내부로 삽입시키는 모듈</description>
-    <description xml:lang="zh-CN">可以把外部页面插入到 Zeroboard XE内部的模块。</description>
-    <description xml:lang="jp">外部ページをXE内部に挿入させるモジュール</description>
-    <description xml:lang="en">Module for inserting external pages into inside of Zeroboard XE.</description>
-    <description xml:lang="vi">Module cho phépchèn một trang từ bên ngoài vào bên trong Zeroboard XE.</description>
-    <description xml:lang="es">외부페이지를 XE내부로 삽입시키는 모듈</description>
-    <description xml:lang="ru">Модуль для вставки внешних страниц внутрь Zeroboard XE.</description>
-    <description xml:lang="zh-TW">可將外部頁面插入至XE裡面的模組。</description>
-    <description xml:lang="tr">Harici sayfaları, Zeroboard XE\'nin içine yerleştirmek için kullanılan modüldür.</description>
-    <version>0.1</version>
-    <date>2007-09-17</date>
-    <category>service</category>
-    <link>http://xpressengine.com/</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
diff --git a/modules/opage/conf/module.xml b/modules/opage/conf/module.xml
deleted file mode 100644
index 9294da794..000000000
--- a/modules/opage/conf/module.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module>
-    <grants />
-    <permissions />
-    <actions>
-        <action name="dispOpageIndex" type="view" index="true" />
-        <action name="dispOpageAdminContent" type="view" admin_index="true" standalone="true" />
-        <action name="dispOpageAdminGrantInfo" type="view" standalone="true" />
-        <action name="dispOpageAdminModuleConfig" type="view" standalone="true" />
-        <action name="dispOpageAdminInsert" type="view" standalone="true" setup_index="true" />
-        <action name="dispOpageAdminDelete" type="view" standalone="true" />
-        <action name="dispOpageAdminContentModify" type="view" standalone="true" />
-        <action name="procOpageAdminRemoveWidgetCache" type="controller" standalone="true" />
-        <action name="procOpageAdminInsert" type="controller" standalone="true" />
-        <action name="procOpageAdminDelete" type="controller" standalone="true" />
-        <action name="procOpageAdminInsertConfig" type="controller" standalone="true" />
-    </actions>
-</module>
diff --git a/modules/opage/lang/en.lang.php b/modules/opage/lang/en.lang.php
deleted file mode 100644
index 27141ef49..000000000
--- a/modules/opage/lang/en.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  basic language pack of external page module
-     **/
-
-    $lang->opage = "External Page";
-    $lang->opage_path = "Location of External Document";
-    $lang->opage_caching_interval = "Caching Time";
-
-    $lang->about_opage = "This module enables usage of external html or php files in XE.<br />It allows absolute or relative path, and if the url starts with 'http://' , it can display the external page of the server.";
-    $lang->about_opage_path= "Please input the location of external document.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-    $lang->about_opage_caching_interval = "The unit is minute, and it displays temporary saved data for assigned time.<br />It is recommended to cache for proper time if a lot of resources are needed when displaying other servers' data or information.<br />A value of 0 will not cache.";
-
-	$lang->opage_mobile_path = 'Location of External Document for Mobile View';
-    $lang->about_opage_mobile_path= "Please input the location of external document for mobile view. If not inputted, it uses the the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-?>
diff --git a/modules/opage/lang/es.lang.php b/modules/opage/lang/es.lang.php
deleted file mode 100644
index 27cb800f9..000000000
--- a/modules/opage/lang/es.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   es.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  basic language pack of external page module
-     **/
-
-    $lang->opage = "Page Exteriores";
-    $lang->opage_path = "Ubicacion del documento externo";
-    $lang->opage_caching_interval = "Establezca el tiempo de cache";
-
-    $lang->about_opage = 'Este modulo permite el uso externo de archivos html o php en XE. <br /> Permite ruta absoluta o relativa, y si la URL comienza con "http://", se puede mostrar la pagina externa del servidor.';
-    $lang->about_opage_path= "Por favor ingrese la ubicacion del documento externos. <br /> Ambos ruta absoluta como '/ path1/path2/sample.php' o ruta relativa como \"../path2/sample.php\" puede ser utilizado. <br /> Si la via de entrada, como \"http://url/sample.php\", el resultado sera recibido y, a continuacion se muestran. <br /> Esta es la actual XE ruta absoluta.<br />";
-    $lang->about_opage_caching_interval = "La unidad es minuto, y se muestra temporal de los datos guardados por el tiempo asignado. <br /> Se recomienda a la cache para una buena vez si una gran cantidad de recursos se necesitan otros servidores cuando se muestran los datos o la informacion. <br /> Un valor de 0 no cache.";
-	$lang->opage_mobile_path = 'Location of External Document for Mobile View';
-    $lang->about_opage_mobile_path= "Please input the location of external document for mobile view. If not inputted, it uses the the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-?>
diff --git a/modules/opage/lang/fr.lang.php b/modules/opage/lang/fr.lang.php
deleted file mode 100644
index 8ee06ec29..000000000
--- a/modules/opage/lang/fr.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par PierreDuvent (PierreDuvent@gmail.com)
-     * @brief  Paque du langage en français pour le module de Page Extérieure
-     **/
-
-    $lang->opage = "Page Extérieure";
-    $lang->opage_path = "Localisation du Document Extérieur";
-    $lang->opage_caching_interval = "Temps de antémémoire";
-
-    $lang->about_opage = "Ce module vous fait pouvoir utiliser des documents extérieurs en html ou en php dans XE.<br />Il est possible d'utiliser le chemin absolu ou relatif, et si l'URL commence avec 'http://' , il est possible de représenter des pages extérieurs du serveur.";
-    $lang->about_opage_path= "Entrez la localisation du document extérieur.<br />Non seulement le chemin absolu comme '/path1/path2/sample.php' mais aussi le chemin relatif comme '../path2/sample.php' peuvent être utilisés.<br />Si vous entrez le chemin comme 'http://url/sample.php', le résultat sera reçu et puis exposé<br />Le chemin suivant, c'est le chemin absolu de XE.<br />";
-    $lang->about_opage_caching_interval = "L'unité est minute, et ça exposera des données conservées temporairement pendant le temps assigné.<br />Il est recommandé d'utiliser l'antémémoire pendant le temps convenable si beaucoup de ressource est nécessaire pour représenter les données ou l'information d'autre serveur.<br />La valeur 0 signifie de ne pas utiliser antémémoire.";
-	$lang->opage_mobile_path = 'Location of External Document for Mobile View';
-    $lang->about_opage_mobile_path= "Please input the location of external document for mobile view. If not inputted, it uses the the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-?>
diff --git a/modules/opage/lang/jp.lang.php b/modules/opage/lang/jp.lang.php
deleted file mode 100644
index b29544fd4..000000000
--- a/modules/opage/lang/jp.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   modules/opage/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa
-     * @brief  外部ページ(opage)モジュールの基本言語パッケージ
-     **/
-
-    $lang->opage = '外部ページ';
-    $lang->opage_path = '外部ドキュメントの場所';
-    $lang->opage_caching_interval = 'キャッシング時間設定';
-
-    $lang->about_opage = '外部のHTMLまたはPHPファイルをXE内部で使用出来るようにするモジュールです。<br />絶対パス、相対パスで指定出来、「http://」で始まるサーバの外部ページも表示出来ます。';
-    $lang->about_opage_path= '外部ドキュメントの場所を入力して下さい。<br />「/path1/path2/sample.php」のような絶対パス、「../path2/sample.php」のような相対パスが使用出来ます。<br />「http://URL/sample.php」のように使用すると結果を読み込んで表示します。<br />現在XEがインストールされている絶対パスは次のようになっています。<br />';
-    $lang->about_opage_caching_interval = '分単位で指定出来、設定された時間の間は、臨時保存されたデータを出力します。<br />他のサーバの情報を出力したり、データを出力する際、リソースが多く使われるため、数分単位でキャッシングすることをお勧めします。<br />「0」に指定するとキャッシングされません。';
-	$lang->opage_mobile_path = 'モバイルバージョン文書へのパス';
-	$lang->about_opage_mobile_path= "モバイルバージョンドキュメントへのパスを指定して下さい。　指定してないと一般ドキュメントのパスに指定されます。<br />/path1/path2/sample.php のような絶対パスや ../path2/sample.phpのような相対パス両方とも指定できます。<br />指定すると対応するドキュメントをウェブからダウンロードして表示します。<br />現在、XEの設置されている絶対パスは次のようになります。";
-?>
diff --git a/modules/opage/lang/ko.lang.php b/modules/opage/lang/ko.lang.php
deleted file mode 100644
index 72e5b2ebc..000000000
--- a/modules/opage/lang/ko.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   modules/opage/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  외부 페이지(opage) 모듈의 기본 언어팩
-     **/
-
-    $lang->opage = '외부 페이지';
-    $lang->opage_path = '외부 문서 위치';
-    $lang->opage_caching_interval = '캐싱 시간 설정';
-
-    $lang->about_opage = 'XE가 아닌 외부 HTML 또는 PHP파일을 XE에서 사용할 수 있도록 하는 모듈입니다.<br />절대경로, 상대경로를 이용할 수 있으며 http:// 로 시작할 경우 서버 외부의 페이지도 표시할 수 있습니다';
-    $lang->about_opage_path= '외부문서의 위치를 입력해주세요.<br />/path1/path2/sample.php 와 같이 절대경로나 ../path2/sample.php와 같은 상대경로 모두 사용가능합니다.<br />http://url/sample.php 와 같이 사용하면 해당 페이지를 웹으로 전송 받아 출력 하게 됩니다.<br />현재 XE가 설치된 절대경로는 다음과 같습니다.<br />';
-    $lang->about_opage_caching_interval = '분 단위이며 정해진 시간동안은 임시 저장한 데이터를 출력합니다.<br />다른 서버의 정보를 출력하거나, 데이터 출력하는데 많은 자원이 필요한 경우, 원하시는 분 단위 시간 간격으로 캐싱하는 것을 추천합니다.<br />0 으로 하시면 캐싱을 하지 않습니다.';
-
-	$lang->opage_mobile_path = '모바일용 외부 문서 위치';
-    $lang->about_opage_mobile_path= '모바일용 외부문서의 위치를 입력해주세요. 입력하지 않으면 위에서 지정한 외부문서 위치의 페이지를 이용합니다. <br />/path1/path2/sample.php 와 같이 절대경로나 ../path2/sample.php와 같은 상대경로 모두 사용가능합니다.<br />http://url/sample.php 와 같이 사용하면 해당 페이지를 웹으로 전송 받아 출력 하게 됩니다.<br />현재 XE가 설치된 절대경로는 다음과 같습니다.<br />';
-?>
diff --git a/modules/opage/lang/ru.lang.php b/modules/opage/lang/ru.lang.php
deleted file mode 100644
index a9d3600c1..000000000
--- a/modules/opage/lang/ru.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->opage = "Внешняя страница";
-    $lang->opage_path = "Расположение внешнего документа";
-    $lang->opage_caching_interval = "Установить время кеширования";
-
-    $lang->about_opage = "Этот модуль позволяет использовать внешние HTML или PHP файлы в XE.<br />Требует ввода абсолютного или относительного пути. Если URL начинается с 'http://', внешняя страница с другого сервера будет показана.";
-    $lang->about_opage_path= "Пожалуйста, введите размещение внешнего документа.<br />Абсолютный путь как '/path1/path2/sample.php', так и относительный как '../path2/sample.php' могут быть использованы.<br />Если Вы введете путь как 'http://url/sample.php', результат будет сначала получен и затем показан.<br />Это текущий абсолютный путь к XE.<br />";
-    $lang->about_opage_caching_interval = "Единица измерения равна одной минуте. Это отображает временно сохраненные данные для присвоенного времени.<br />Рекомендуется устанавливать разумное время кеширования, если множество ресурсов нуждаются в показе данных с других серверов.<br />Значение 0 отключает кеширование.";
-	$lang->opage_mobile_path = 'Location of External Document for Mobile View';
-    $lang->about_opage_mobile_path= "Please input the location of external document for mobile view. If not inputted, it uses the the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-?>
diff --git a/modules/opage/lang/tr.lang.php b/modules/opage/lang/tr.lang.php
deleted file mode 100644
index 657a0accf..000000000
--- a/modules/opage/lang/tr.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   en.lang.php
-     * @author NHN (evelopers@xpressengine.com)
-     * @brief  basic language pack of external page module
-     **/
-
-    $lang->opage = "Harici Sayfa";
-    $lang->opage_path = "Harici Belgenin Konumu";
-    $lang->opage_caching_interval = "Önbelleğe Alma Zamanı";
-
-    $lang->about_opage = "Bu modül, harici html veya php dosyalarının XE\'nin içinde kullanılmasına olanak tanır.<br />Kesin ya da ilgili yola izin verir ve eğer url 'http://' ile başlıyorsa , modül sunucunun harici sayfasını gösterebilir.";
-    $lang->about_opage_path= "Lütfen harici dosyaların konumunu giriniz.<br />'/path1/path2/sample.php' gibi kesin yollar ve  '../path2/sample.php' gibi ilgili yollar kullanılabilir.<br />Eğer 'http://url/sample.php' gibi bir yol giriyorsanız, sonuç önce alınacak sonra gösterilecektir.<br />Bu XE\'nin kesin yoludur.<br />";
-    $lang->about_opage_caching_interval = "Birim dakikadır ve belirlenen zaman için kaydedilmiş geçici dosyayı gösterir.<br />Diğer sunucuların veri veya bilgileri gösterilirken, eğer fazla sayıda kaynağın gösterilmesi gerekiyorsa, uygun zamanın önbelleğe alınması önerilmiştir. <br />0 değeri verilirse, önbelleğe alınma işlemi gerçekleşmeyecektir.";
-
-	$lang->opage_mobile_path = 'Harici Dosyanın Hareketli Görünüm için Konumu';
-    $lang->about_opage_mobile_path= "Lütfen hareketli görünüm için harici dosyanın konumunu giriniz. Eğer konum girilmediyse, harici belgenin belirlenmişini kullanır.<br />'/path1/path2/sample.php' gibi kesin yol veya '../path2/sample.php' gibi ilgili yol kullanılabilir.<br />Eğer 'http://url/sample.php' gibi bir adres girdiyseniz , sonuç önce alınacak sonra görüntülenecektir.<br />Bu XE\'nin kesin yoludur.<br />";
-?>
diff --git a/modules/opage/lang/vi.lang.php b/modules/opage/lang/vi.lang.php
deleted file mode 100644
index cc4d772c4..000000000
--- a/modules/opage/lang/vi.lang.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->opage = "Trang ngoài";
-    $lang->opage_path = "Đường dẫn thư mục";
-    $lang->opage_caching_interval = "Thời gian lưu trữ";
-
-    $lang->about_opage = "Module này tạo ra một trang từ bên ngoài tại XE thông qua File HTML hoặc PHP.<br />Nó cho phép đường dẫn tuyệt đối hay tương đối, nếu bắt đầu bằng 'http://' , nó sẽ hiển thị một trang từ bên ngoài Server.";
-    $lang->about_opage_path= "Xin hãy nhập đường dẫn của thư mục.<br />Có thể sử dụng đường dẫn tuyệt đối dạng '/path1/path2/sample.php' hay tương đối dạng '../path2/sample.php'.<br />Nếu nhập đường dẫn dạng 'http://url/sample.php', nó sẽ nhận và hiển thị nội dung của File đó.<br />Đây là đường dẫn tuyệt đối thư mục cài đặt XE.<br />";
-    $lang->about_opage_caching_interval = "Đơn vị được tính bằng phút, nó sẽ là thời gian lưu trữ tạm thời.<br />Đó là khuyến cáo thời gian lưu trữ tạm thời thích hợp khi cần để hiển thị.<br />Nhập 0 nếu không sử dụng tính năng này.";
-	$lang->opage_mobile_path = 'Location of External Document for Mobile View';
-    $lang->about_opage_mobile_path= "Please input the location of external document for mobile view. If not inputted, it uses the the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-?>
diff --git a/modules/opage/lang/zh-CN.lang.php b/modules/opage/lang/zh-CN.lang.php
deleted file mode 100644
index e15e8bb3f..000000000
--- a/modules/opage/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-    /**
-     * @file   modules/opage/lang/zh_CN.lang.php
-     * @author NHN (developers@xpressengine.com)     翻译：guny(space.china@gmail.com)
-     * @brief  外部页面(opage)模块简体中文语言包
-     **/
-
-    $lang->opage = "外部页面";
-    $lang->opage_path = "外部页面路径";
-    $lang->opage_caching_interval = "缓冲时间设置";
-
-    $lang->about_opage = "此模块是一种可以把外部html或php文件插入到XE内部的模块。<br />可以使用绝对路径及相对路径。而且使用以http:// 开头的地址时，可以把外部服务器中的页面插入到XE当中。";
-    $lang->about_opage_path= "请输入外部文件路径。<br />可以使用如同 /path1/path2/sample.php的绝对路径或如 ../path2/sample.php的相对路径。<br />如使用http://url/sample.php之类的地址，可以把此页面的输出结果显示到XE内部的指定位置。<br />现安装的XE绝对路径如下:<br />";
-    $lang->about_opage_caching_interval = "单位为分。缓冲时间内页面将输出临时储存的数据。<br />输出外部服务器信息或数据时，如消耗资源很大，尽量把缓冲时间设置为大一点的相应值。<br />0 表示无缓冲。";
-    
-    $lang->opage_mobile_path = '移动版外部页面路径';
-    $lang->about_opage_mobile_path= '请输入移动版外部文件路径。留空默认使用上面指定的的普通外部页面。<br />可以使用如同 /path1/path2/sample.php的绝对路径或如 ../path2/sample.php的相对路径。<br />如使用http://url/sample.php之类的地址，可以把此页面的输出结果显示到XE内部的指定位置。<br />现安装的XE绝对路径如下:<br />';
-?>
diff --git a/modules/opage/lang/zh-TW.lang.php b/modules/opage/lang/zh-TW.lang.php
deleted file mode 100644
index 5e3145b8e..000000000
--- a/modules/opage/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-    /**
-     * @file   modules/opage/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  外部頁面(opage)模組正體中文語言
-     **/
-
-    $lang->opage = "外部頁面";
-    $lang->opage_path = "外部頁面路徑";
-    $lang->opage_caching_interval = "暫存時間設置";
-
-    $lang->about_opage = "此模組可把外部HTML或PHP檔案插入到XE中的模組。<br />可以使用絕對路徑及相對路徑。而且使用以『http://』開頭的網址時，可以把外部主機中的頁面插入到XE當中。";
-    $lang->about_opage_path= "請輸入外部檔案路徑。<br />可以使用像『/path1/path2/sample.php』的絕對路徑或是『../path2/sample.php』的相對路徑。<br />如果是用『http://url/sample.php』之類的網址，會將此頁面的結果顯示到XE內部的指定位置。<br />目前安裝的XE絕對路徑如下:<br />";
-    $lang->about_opage_caching_interval = "單位為分。暫存時間內頁面將輸出臨時儲存的資料。<br />輸出外部主機訊息或資料時，如消耗資源很大，盡量把暫存時間設大一點。<br />『0』表示不暫存。";
-	$lang->opage_mobile_path = 'Location of External Document for Mobile View';
-    $lang->about_opage_mobile_path= "Please input the location of external document for mobile view. If not inputted, it uses the the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php' , the result will be received and then displayed.<br />This is current XE's absolute path.<br />";
-?>
diff --git a/modules/opage/opage.admin.controller.php b/modules/opage/opage.admin.controller.php
deleted file mode 100644
index d603c0fef..000000000
--- a/modules/opage/opage.admin.controller.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-    /**
-     * @class  opageAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  opage 모듈의 admin controller class
-     **/
-
-    class opageAdminController extends opage {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 외부페이지 추가
-         **/
-        function procOpageAdminInsert() {
-            // module 모듈의 model/controller 객체 생성
-            $oModuleController = &getController('module');
-            $oModuleModel = &getModel('module');
-
-            // 게시판 모듈의 정보 설정
-            $args = Context::getRequestVars();
-            $args->module = 'opage';
-            $args->mid = $args->opage_name;
-            unset($args->opage_name);
-
-            // module_srl이 넘어오면 원 모듈이 있는지 확인
-            if($args->module_srl) {
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-                if($module_info->module_srl != $args->module_srl) unset($args->module_srl);
-            }
-
-            // module_srl의 값에 따라 insert/update
-            if(!$args->module_srl) {
-                $args->module_srl = getNextSequence();
-                $output = $oModuleController->insertModule($args);
-                $msg_code = 'success_registed';
-            } else {
-                $output = $oModuleController->updateModule($args);
-                $msg_code = 'success_updated';
-
-                // 캐시 파일 삭제
-                $cache_file = sprintf("./files/cache/opage/%d.cache.php", $module_info->module_srl);
-                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
-            }
-
-            if(!$output->toBool()) return $output;
-
-            // 등록 성공후 return될 메세지 정리
-            $this->add("module_srl", $output->get('module_srl'));
-            $this->add("opage", Context::get('opage'));
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 외부페이지 삭제
-         **/
-        function procOpageAdminDelete() {
-            $module_srl = Context::get('module_srl');
-
-            // 원본을 구해온다
-            $oModuleController = &getController('module');
-            $output = $oModuleController->deleteModule($module_srl);
-            if(!$output->toBool()) return $output;
-
-            $this->add('module','opage');
-            $this->add('opage',Context::get('opage'));
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 외부페이지 기본 정보의 추가
-         **/
-        function procOpageAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args = Context::gets('test');
-
-        }
-
-    }
-?>
diff --git a/modules/opage/opage.admin.view.php b/modules/opage/opage.admin.view.php
deleted file mode 100644
index 593a3b24d..000000000
--- a/modules/opage/opage.admin.view.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-    /**
-     * @class  opageAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  opage 모듈의 admin view 클래스
-     **/
-
-    class opageAdminView extends opage {
-
-        var $module_srl = 0;
-        var $list_count = 20;
-        var $page_count = 10;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // module_srl이 있으면 미리 체크하여 존재하는 모듈이면 module_info 세팅
-            $module_srl = Context::get('module_srl');
-
-            // module model 객체 생성 
-            $oModuleModel = &getModel('module');
-
-            // 모듈 카테고리 목록을 구함
-            $module_category = $oModuleModel->getModuleCategories();
-            Context::set('module_category', $module_category);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_category..title');			
-			
-            // 템플릿 경로 구함 (opage의 경우 tpl에 관리자용 템플릿 모아놓음)
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 외부페이지 관리 목록 보여줌
-         **/
-        function dispOpageAdminContent() {
-            $args->sort_index = "module_srl";
-            $args->page = Context::get('page');
-            $args->list_count = 40;
-            $args->page_count = 10;
-            $args->s_module_category_srl = Context::get('module_category_srl');
-            $output = executeQuery('opage.getOpageList', $args);
-
-            // 템플릿에 쓰기 위해서 context::set
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('opage_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);			
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('opage_list..');
-			
-            // 템플릿 파일 지정
-            $this->setTemplateFile('index');
-        }
-
-        /**
-         * @brief 외부페이지 추가 폼 출력
-         **/
-        function dispOpageAdminInsert() {
-            // 권한 그룹의 목록을 가져온다
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $group_list);
-
-            // module.xml에서 권한 관련 목록을 구해옴
-            $grant_list = $this->xml_info->grant;
-            Context::set('grant_list', $grant_list);
-
-            // GET parameter에서 module_srl을 가져옴
-            $module_srl = Context::get('module_srl');
-
-            // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅
-            if($module_srl) {
-                $oModuleModel = &getModel('module');
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
-                else {
-                    unset($module_info);
-                    unset($module_srl);
-                }
-            }
-			
-			// 레이아웃 목록을 구해옴
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList();
-            Context::set('layout_list', $layout_list);
-
-            $mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
-            Context::set('mlayout_list', $mobile_layout_list);
-						
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_info.');			
-			$security->encodeHTML('layout_list..layout');
-			$security->encodeHTML('layout_list..title');
-			$security->encodeHTML('mlayout_list..layout');
-			$security->encodeHTML('mlayout_list..title');						
-			//group_list 및 grant는 사용되는 곳을 모르겠음.
-			/*
-			$security->encodeHTML('group_list..title');
-			$security->encodeHTML('group_list..description');
-			$security->encodeHTML('grant_list..');
-			*/						
-			
-            // 템플릿 파일 지정
-            $this->setTemplateFile('opage_insert');
-        }
-
-
-        /**
-         * @brief 외부페이지 삭제 화면 출력
-         **/
-        function dispOpageAdminDelete() {
-            $module_srl = Context::get('module_srl');
-            if(!$module_srl) return $this->dispContent();
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            Context::set('module_info',$module_info);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_info.module');
-			$security->encodeHTML('module_info.mid');
-			$security->encodeHTML('module_info.browser_title');			
-			
-            // 템플릿 파일 지정
-            $this->setTemplateFile('opage_delete');
-        }
-
-        /**
-         * @brief 권한 목록 출력
-         **/
-        function dispOpageAdminGrantInfo() {
-            // GET parameter에서 module_srl을 가져옴
-            $module_srl = Context::get('module_srl');
-
-            // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅
-            if($module_srl) {
-                $oModuleModel = &getModel('module');
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
-                else {
-                    unset($module_info);
-                    unset($module_srl);
-                }
-            }
-
-			$this->module_info = $module_info;
-
-            // 공통 모듈 권한 설정 페이지 호출
-            $oModuleAdminModel = &getAdminModel('module');
-            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
-            Context::set('grant_content', $grant_content);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_info..');
-			
-            $this->setTemplateFile('grant_list');
-        }
-    }
-?>
diff --git a/modules/opage/opage.class.php b/modules/opage/opage.class.php
deleted file mode 100644
index 43eac3954..000000000
--- a/modules/opage/opage.class.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-    /**
-     * @class  opage
-     * @author NHN (developers@xpressengine.com)
-     * @brief  opage 모듈의 high class
-     **/
-
-    class opage extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // opage 에서 사용할 cache디렉토리 생성
-            FileHandler::makeDir('./files/cache/opage');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            // cache 디렉토리가 없으면 바로 디렉토리 생성
-            if(!is_dir('./files/cache/opage')) FileHandler::makeDir('./files/cache/opage');
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 외부 페이지 캐시 파일 삭제
-            FileHandler::removeFilesInDir("./files/cache/opage");
-        }
-    }
-?>
diff --git a/modules/opage/opage.mobile.php b/modules/opage/opage.mobile.php
deleted file mode 100644
index c4b86ae80..000000000
--- a/modules/opage/opage.mobile.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-require_once(_XE_PATH_.'modules/opage/opage.view.php');
-class opageMobile extends opageView {
-
-    function init() {
-        // 템플릿 경로 구함 (opage의 경우 tpl에 관리자용 템플릿 모아놓음)
-        $this->setTemplatePath($this->module_path.'tpl');
-
-        $oOpageModel = &getModel('opage');
-        $module_info = $oOpageModel->getOpage($this->module_srl);
-        Context::set('module_info', $module_info);
-
-        // 외부 페이지에서 명시된 외부 페이지 경로/ 캐싱 간격을 를 구함
-        if($module_info->mpath) $this->path = $module_info->mpath;
-        else $this->path = $module_info->path;
-        $this->caching_interval = $module_info->caching_interval;
-
-        // 캐시 파일 지정
-        $this->cache_file = sprintf("./files/cache/opage/%d.m.cache.php", $module_info->module_srl);
-    }
-
-}
diff --git a/modules/opage/opage.model.php b/modules/opage/opage.model.php
deleted file mode 100644
index 99a2254f6..000000000
--- a/modules/opage/opage.model.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-    /**
-     * @class  opageModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  opage 모듈의 model 클래스
-     **/
-
-    class opageModel extends opage {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() { }
-
-        /**
-         * @brief 특정 외부 페이지의 정보를 return
-         * 외부 페이지의 경우 기본 모듈의 정보와 설정정보를 함께 다루기 때문에 별도의 model method를 이용하게 한다
-         **/
-        function getOpage($module_srl) {
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if($module_info->module_srl != $module_srl) return;
-
-            $extra_vars = unserialize($module_info->extra_vars);
-            if($extra_vars) {
-                foreach($extra_vars as $key => $val) $module_info->{$key} = $val;
-                unset($module_info->extra_vars);
-            }
-            return $module_info;
-        }
-
-    }
-?>
diff --git a/modules/opage/opage.view.php b/modules/opage/opage.view.php
deleted file mode 100644
index 95d528256..000000000
--- a/modules/opage/opage.view.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-    /**
-     * @class  opageView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  opage 모듈의 view 클래스
-     **/
-
-    class opageView extends opage {
-
-        var $path;
-        var $cache_file;
-        var $caching_interval;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 템플릿 경로 구함 (opage의 경우 tpl에 관리자용 템플릿 모아놓음)
-            $this->setTemplatePath($this->module_path.'tpl');
-
-            // 외부 페이지 모듈의 정보를 구함
-            $oOpageModel = &getModel('opage');
-            $module_info = $oOpageModel->getOpage($this->module_srl);
-            Context::set('module_info', $module_info);
-
-            // 외부 페이지에서 명시된 외부 페이지 경로/ 캐싱 간격을 를 구함
-            $this->path = $module_info->path;
-            $this->caching_interval = $module_info->caching_interval;
-
-            // 캐시 파일 지정
-            $this->cache_file = sprintf("./files/cache/opage/%d.cache.php", $module_info->module_srl);
-        }
-
-        /**
-         * @brief 일반 요청시 출력
-         **/
-        function dispOpageIndex() {
-
-            // http 인지 내부 파일인지 점검
-            if($this->path) {
-                if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->caching_interval, $this->cache_file);
-                else $content = $this->executeFile($this->path, $this->caching_interval, $this->cache_file);
-            }
-
-            Context::set('opage_content', $content);
-
-            // 결과 출력 템플릿 지정
-            $this->setTemplateFile('content');
-        }
-
-        /**
-         * @brief 외부 http로 요청되는 파일일 경우 파일을 받아와서 저장 후 return
-         **/
-        function getHtmlPage($path, $caching_interval, $cache_file) {
-
-            // 캐시 검사
-            if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > time()) {
-
-                $content = FileHandler::readFile($cache_file);
-
-            } else {
-
-                FileHandler::getRemoteFile($path, $cache_file);
-                $content = FileHandler::readFile($cache_file);
-
-            }
-
-            // opage controller 생성
-            $oOpageController = &getController('opage');
-
-            // 외부 서버의 페이지 일 경우 이미지, css, javascript등의 url을 변경
-            $content = $oOpageController->replaceSrc($content, $path);
-
-            // 해당 문서를 utf-8로 변경
-            $buff->content = $content;
-            $buff = Context::convertEncoding($buff);
-            $content = $buff->content;
-
-            // title 추출
-            $title = $oOpageController->getTitle($content);
-            if($title) Context::setBrowserTitle($title);
-
-            // header script 추출
-            $head_script = $oOpageController->getHeadScript($content);
-            if($head_script) Context::addHtmlHeader($head_script);
-
-            // body 내용 추출
-            $body_script = $oOpageController->getBodyScript($content);
-            if(!$body_script) $body_script = $content;
-
-            return $content;
-        }
-
-        /**
-         * @brief 내부 파일일 경우 include하도록 캐시파일을 만들고 처리
-         **/
-        function executeFile($path, $caching_interval, $cache_file) {
-            // 파일이 없으면 취소
-            if(!file_exists($path)) return;
-
-            // 경로와 파일이름을 구함
-            $tmp_path = explode('/',$cache_file);
-            $filename = $tmp_path[count($tmp_path)-1];
-            $filepath = preg_replace('/'.$filename."$/i","",$cache_file);
-
-            // 캐시 검사
-            if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= time() || filemtime($cache_file)<filemtime($path) ) {
-                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
-
-                // 일단 대상 파일을 읽어서 내용을 구함
-                ob_start();
-                @include($path);
-                $content = ob_get_clean();
-
-                // 상대경로를 절대경로로 변경
-                $path_info = pathinfo($path);
-                $this->path = str_replace('\\', '/', realpath($path_info['dirname'])).'/';
-                $content = preg_replace_callback('/(src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
-                $content = preg_replace_callback('/(<load[^>]+target=)(")([^"]+)(")/is',array($this,'_replacePath'),$content);
-                $content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is',array($this,'_replacePath'),$content);
-
-                FileHandler::writeFile($cache_file, $content);
-
-                // include후 결과를 return
-                if(!file_exists($cache_file)) return;
-
-                // 컴파일 시도
-                $oTemplate = &TemplateHandler::getInstance();
-                $script = $oTemplate->compileDirect($filepath, $filename);
-
-                FileHandler::writeFile($cache_file, $script);
-            }
-
-            $__Context = &$GLOBALS['__Context__'];
-            $__Context->tpl_path = $filepath;
-            if($_SESSION['is_logged']) $__Context->logged_info = $_SESSION['logged_info'];
-
-            ob_start();
-            @include($cache_file);
-            $content = ob_get_clean();
-
-            return $content;
-        }
-
-        function _replacePath($matches) {
-            $val = trim($matches[3]);
-
-            // 외부 또는 /, #, { 로 시작하는 경로라면 그냥 pass
-			// /=absolute path, #=hash in a page, {=Template syntax
-            if(preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i',$val)) {
-				return $matches[0];
-
-            // .. 와 같은 경우 대상 경로를 구함
-            } elseif(preg_match('/^\.\./i',$val)) {
-				$p = Context::pathToUrl($this->path);
-                return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
-            }
-
-            if(substr($val,0,2)=='./') $val = substr($val,2);
-			$p = Context::pathToUrl($this->path);
-            $path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
-
-			return $path;
-        }
-
-    }
-?>
diff --git a/modules/opage/tpl/content.html b/modules/opage/tpl/content.html
deleted file mode 100644
index b34a8de56..000000000
--- a/modules/opage/tpl/content.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{$opage_content}
-
-<!--@if($grant->is_admin)-->
-<!--%import("./js/opage_admin.js")-->
-<div class="tRight gap1 clear">
-    <a href="{getUrl('act','dispOpageAdminInsert','module_srl',$module_info->module_srl)}" class="button"><span>{$lang->cmd_setup}</span></a>
-</div>
-<!--@end-->
diff --git a/modules/opage/tpl/filter/delete_opage.xml b/modules/opage/tpl/filter/delete_opage.xml
deleted file mode 100644
index 9d287dfe1..000000000
--- a/modules/opage/tpl/filter/delete_opage.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<filter name="delete_opage" module="opage" act="procOpageAdminDelete">
-    <form>
-        <node target="module_srl" required="true" />
-    </form>
-    <response callback_func="completeDeleteOpage">
-        <tag name="error" />
-        <tag name="message" />
-        <tag name="opage" />
-    </response>
-</filter>
diff --git a/modules/opage/tpl/grant_list.html b/modules/opage/tpl/grant_list.html
deleted file mode 100644
index b0d8b0c53..000000000
--- a/modules/opage/tpl/grant_list.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<!--#include("./header.html")-->
-
-{$grant_content}
diff --git a/modules/opage/tpl/header.html b/modules/opage/tpl/header.html
deleted file mode 100644
index 3a4e4b8be..000000000
--- a/modules/opage/tpl/header.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--%import("js/opage_admin.js")-->
-<h3 class="xeAdmin">{$lang->opage} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<div class="infoText">{nl2br($lang->about_opage)}</div>
-
-<!--@if($module_info)-->
-<div class="header4">
-    <!--@if($module_info->mid)-->
-    <h4 class="xeAdmin">{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
-    <!--@end-->
-
-    <ul class="localNavigation">
-        <li><a href="{getUrl('act','dispOpageAdminContent','module_srl','')}">{$lang->cmd_back}</a></li>
-        <li <!--@if($act=='dispOpageAdminInsert')-->class="on"<!--@end-->><a href="{getUrl('act','dispOpageAdminInsert')}">{$lang->cmd_setup}</a></li>
-        <li <!--@if($act=='dispOpageAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispOpageAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
-    </ul>
-</div>
-<!--@end-->
diff --git a/modules/opage/tpl/index.html b/modules/opage/tpl/index.html
deleted file mode 100644
index db9727850..000000000
--- a/modules/opage/tpl/index.html
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--%import("js/opage_admin.js")-->
-<!--#include("header.html")-->
-
-<!-- 정보 -->
-
-<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable">
-<caption>Total {number_format($total_count)}, page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col">
-            <div>
-                <input type="hidden" name="module" value="{$module}" />
-                <input type="hidden" name="act" value="{$act}" />
-                <select name="module_category_srl">
-                    <option value="">{$lang->module_category}</option>
-                    <option value="0" <!--@if($module_category_srl==="0")-->selected="selected"<!--@end-->>{$lang->not_exists}</option>
-                    <!--@foreach($module_category as $key => $val)-->
-                    <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                    <!--@end-->
-                    <option value="">---------</option>
-                    <option value="-1">{$lang->cmd_management}</option>
-                </select>
-                <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-            </div>
-        </th>
-        <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="3"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-
-<tbody>
-    <!--@foreach($opage_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="number center">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
-        <td>
-            <!--@if(!$val->module_category_srl)-->
-                {$lang->not_exists}
-            <!--@else-->
-                {$module_category[$val->module_category_srl]->title}
-            <!--@end-->
-        </td>
-        <td>{$val->mid}</td>
-        <td><a href="{getUrl('','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{$val->browser_title}</a></td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        <td><a href="{getUrl('act','dispOpageAdminInsert','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
-        <td><a href="./?module=module&act=dispModuleAdminCopyModule&module_srl={$val->module_srl}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
-        <td><a href="{getUrl('act','dispOpageAdminDelete','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-<!-- 버튼 -->
-<div class="clear">
-    <div class="fl">
-        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
-        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
-    </div>
-    <div class="fr ">
-        <a href="{getUrl('act','dispOpageAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-    </div>
-</div>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
diff --git a/modules/opage/tpl/js/opage_admin.js b/modules/opage/tpl/js/opage_admin.js
deleted file mode 100644
index 737d7372f..000000000
--- a/modules/opage/tpl/js/opage_admin.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * @file   modules/opage/js/opage_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  opage모듈의 관리자용 javascript
- **/
-
-/* 모듈 생성 후 */
-function completeInsertOpage(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    var opage = ret_obj['opage'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-
-    var url = '';
-    if(location.href.getQuery('module')=='admin') {
-        url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispOpageAdminInsert');
-        if(opage) url = url.setQuery('opage',opage);
-    } else {
-        url = current_url.setQuery('act','').setQuery('module_srl','');
-    }
-
-    location.href = url;
-}
-
-/* 모듈 삭제 후 */
-function completeDeleteOpage(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var opage = ret_obj['opage'];
-    alert(message);
-
-    var url = current_url.setQuery('act','dispOpageAdminContent');
-    if(opage) url = url.setQuery('opage',opage);
-
-    location.href = url;
-}
-
-/* 카테고리 이동 */
-function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
-    if(module_category_srl==-1) {
-        location.href = current_url.setQuery('act','dispModuleAdminCategory');
-        return false;
-    }
-    return true;
-}
-
-/* 일괄 설정 */
-function doCartSetup(url) {
-    var module_srl = new Array();
-    jQuery('#fo_list input[name=cart]:checked').each(function() {
-        module_srl[module_srl.length] = jQuery(this).val();
-    });
-
-    if(module_srl.length<1) return;
-
-    url += "&module_srls="+module_srl.join(',');
-    popopen(url,'modulesSetup');
-}
diff --git a/modules/opage/tpl/opage_delete.html b/modules/opage/tpl/opage_delete.html
deleted file mode 100644
index f97b6cd0a..000000000
--- a/modules/opage/tpl/opage_delete.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--%import("filter/delete_opage.xml")-->
-<!--%import("js/opage_admin.js")-->
-<!--#include("header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, delete_opage)">
-<input type="hidden" name="opage" value="{$opage}" />
-<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->module_name}</div></th>
-        <td class="wide">{$module_info->mid}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->module}</div></th>
-        <td>{$module_info->module}</td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
-            <a href="{getUrl('act','dispOpageAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
-
-
-</form>
-
diff --git a/modules/opage/tpl/opage_insert.html b/modules/opage/tpl/opage_insert.html
deleted file mode 100644
index 5aab31f88..000000000
--- a/modules/opage/tpl/opage_insert.html
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--%import("filter/insert_opage.xml")-->
-<!--#include("header.html")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_opage)" enctype="multipart/form-data">
-<input type="hidden" name="opage" value="{$opage}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-    <table cellspacing="0" class="rowTable">
-    <!--@if($logged_info->is_admin!='Y')-->
-    <input type="hidden" name="mid" value="{$module_info->mid}" />
-    <!--@else-->
-    <tr class="row2">
-        <th scope="row"><div>{$lang->mid}</div></th>
-        <td colspan="3">
-            <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
-            <p>{$lang->about_mid}</p>
-        </td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <th scope="row"><div>{$lang->module_category}</div></th>
-        <td colspan="3">
-            <select name="module_category_srl">
-                <option value="0">{$lang->notuse}</option>
-                <!--@foreach($module_category as $key => $val)-->
-                <option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_module_category}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->browser_title}</div></th>
-        <td colspan="3">
-            <input type="text" name="browser_title" value="{$module_info->browser_title}"  class="inputTypeText w400" id="browser_title"/>
-            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-            <p>{$lang->about_browser_title}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->layout}</div></th>
-        <td colspan="3">
-            <select name="layout_srl">
-            <option value="0">{$lang->notuse}</option>
-            <!--@foreach($layout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_layout}</p>
-        </td>
-    </tr>
-	<tr>
-		<th scope="row"><div>{$lang->mobile_view}</div></th>
-		<td>
-			<input type="checkbox" name="use_mobile" value="Y" <!--@if($module_info->use_mobile == "Y")-->checked="checked"<!--@end--> />
-			<p>{$lang->about_mobile_view}</p>
-		</td>
-	</tr>
-	<tr>
-	<th scope="row"><div>{$lang->mobile_layout}</div></th>
-	<td>
-	<select name="mlayout_srl">
-	<option value="0">{$lang->notuse}</option>
-	<!--@foreach($mlayout_list as $key => $val)-->
-	<option value="{$val->layout_srl}" <!--@if($module_info->mlayout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-	<!--@end-->
-	</select>
-	<p>{$lang->about_layout}</p>
-	</td>
-	</tr>
-    <tr>
-        <th scope="row"><div>{$lang->opage_caching_interval}</div></th>
-        <td colspan="3">
-            <input type="text" name="opage_caching_interval" value="{(int)$module_info->caching_interval}"  class="inputTypeText w40" /> {$lang->unit_min}
-            <p>{$lang->about_opage_caching_interval}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->opage_path}</div></th>
-        <td colspan="3">
-            <input type="text" name="opage_path" value="{$module_info->path}"  class="inputTypeText w400" />
-            <p>{$lang->about_opage_path}<b>{realpath("./")}</b></p>
-        </td>
-    </tr>
-    <tr class="row">
-        <th scope="row"><div>{$lang->opage_mobile_path}</div></th>
-        <td colspan="3">
-            <input type="text" name="opage_mpath" value="{$module_info->mpath}"  class="inputTypeText w400" />
-            <p>{$lang->about_opage_mobile_path}<b>{realpath("./")}</b></p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="4" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-            <!--@if($module == 'admin')-->
-            <span class="button"><input type="button" value="{$lang->cmd_list}" onclick="location.href='./?module=admin&act=dispOpageAdminContent';return false;" /></span>
-            <!--@else-->
-            <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href=current_url.setQuery('module_srl','').setQuery('act','');return false;" /></span>
-            <!--@end-->
-        </th>
-    </tr>
-    </table>
-
-</form>
diff --git a/modules/page/conf/info.xml b/modules/page/conf/info.xml
index 72465184d..13e5d174e 100644
--- a/modules/page/conf/info.xml
+++ b/modules/page/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">페이지</title>
-    <title xml:lang="zh-CN">页面管理</title>
-    <title xml:lang="jp">ページ</title>
-    <title xml:lang="en">Page</title>
-    <title xml:lang="vi">Trang</title>
-    <title xml:lang="es">Página</title>
-    <title xml:lang="ru">Страницы</title>
-    <title xml:lang="zh-TW">頁面</title>
-    <title xml:lang="tr">Sayfa</title>
-    <description xml:lang="ko">페이지를 제작하여 컨텐츠로 연결할 수 있는 모듈</description>
-    <description xml:lang="zh-CN">制作页面并能连接到内容区的模块。</description>
-    <description xml:lang="jp">ページを作成してコンテンツとしてリンク出来るようにするモジュールです。</description>
-    <description xml:lang="en">This module is for creating pages to link with contents.</description>
-    <description xml:lang="vi">Module này dành cho việc tạo trang cho liên kết với nội dung.</description>
-    <description xml:lang="es">Este módulo is para crear página para enlazar con contenidos.</description>
-    <description xml:lang="ru">Этот модуль служит для создания страниц, чтобы связать их с содержимым.</description>
-    <description xml:lang="zh-TW">製作頁面並連結內容的模組。</description>
-    <description xml:lang="tr">Bu modül içeriklere bağlanacak sayfaları oluşturmak içindir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>service</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">페이지</title>
+    <title xml:lang="zh-CN">页面管理</title>
+    <title xml:lang="jp">ページ</title>
+    <title xml:lang="en">Page</title>
+    <title xml:lang="vi">Trang</title>
+    <title xml:lang="es">Página</title>
+    <title xml:lang="ru">Страницы</title>
+    <title xml:lang="zh-TW">頁面</title>
+    <title xml:lang="tr">Sayfa</title>
+    <description xml:lang="ko">페이지를 제작하여 컨텐츠로 연결할 수 있는 모듈</description>
+    <description xml:lang="zh-CN">制作页面并能连接到内容区的模块。</description>
+    <description xml:lang="jp">ページを作成してコンテンツとしてリンク出来るようにするモジュールです。</description>
+    <description xml:lang="en">This module is for creating pages to link with contents.</description>
+    <description xml:lang="vi">Module này dành cho việc tạo trang cho liên kết với nội dung.</description>
+    <description xml:lang="es">Este módulo is para crear página para enlazar con contenidos.</description>
+    <description xml:lang="ru">Этот модуль служит для создания страниц, чтобы связать их с содержимым.</description>
+    <description xml:lang="zh-TW">製作頁面並連結內容的模組。</description>
+    <description xml:lang="tr">Bu modül içeriklere bağlanacak sayfaları oluşturmak içindir.</description>
+    <version>0.2</version>
+    <date>2011-06-15</date>
+    <category>service</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/page/conf/module.xml b/modules/page/conf/module.xml
index daa2d2ad7..f009aa82d 100644
--- a/modules/page/conf/module.xml
+++ b/modules/page/conf/module.xml
@@ -11,9 +11,9 @@
         <action name="dispPageIndex" type="view" index="true" />
         <action name="dispPageAdminContent" type="view" admin_index="true" standalone="true" />
         <action name="dispPageAdminGrantInfo" type="view" standalone="true" />
-        <action name="dispPageAdminInfo" type="view" standalone="true" />
+        <action name="dispPageAdminInfo" type="view" standalone="true" setup_index="true" />
         <action name="dispPageAdminPageAdditionSetup" type="view" standalone="true" />
-        <action name="dispPageAdminInsert" type="view" standalone="true" setup_index="true" />
+        <action name="dispPageAdminInsert" type="view" standalone="true" />
         <action name="dispPageAdminDelete" type="view" standalone="true" />
         <action name="dispPageAdminContentModify" type="view" standalone="true" />
         <action name="dispPageAdminAddContent" type="view" standalone="true" />
@@ -21,10 +21,12 @@
 		<action name="dispPageAdminMobileContent" type="view" standalone="true" />
 
         <action name="procPageAdminRemoveWidgetCache" type="controller" standalone="true" />
-        <action name="procPageAdminInsert" type="controller" standalone="true" />
+        <action name="procPageAdminInsert" type="controller" standalone="true" ruleset="insertPage" />
+        <action name="procPageAdminUpdate" type="controller" standalone="true" ruleset="updatePage" />
         <action name="procPageAdminInsertContent" type="controller" standalone="true" />
-        <action name="procPageAdminDelete" type="controller" standalone="true" />
+        <action name="procPageAdminDelete" type="controller" standalone="true" ruleset="deletePage" />
         <action name="procPageAdminInsertConfig" type="controller" standalone="true" />
         <action name="procPageAdminAddContent" type="controller" standalone="true" />
+        <action name="procPageAdminArticleDocumentInsert" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/page/lang/en.lang.php b/modules/page/lang/en.lang.php
deleted file mode 100644
index ff56151e2..000000000
--- a/modules/page/lang/en.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   modules/page/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page module / basic language pack
-     **/
-
-    $lang->page = "Page";
-    $lang->about_page = "It is a blog module which you can create a complete page.\nUsing latest or other widgets, you can create a dynamic page. Through the editor component, you can also create a great variety of pages.\nIts URL is same as other module's such as mid=module name.\n If it is selected as a default, it will be the main page of the site.";
-    $lang->cmd_page_modify = "Modify";
-    $lang->cmd_page_create = 'Create a Page';
-    $lang->page_caching_interval = "Caching Time";
-    $lang->about_page_caching_interval = "The unit is minute, and it displays temporary saved data for assigned time.<br />It is recommended to cache for proper time if a lot of resources are needed when displaying other servers' data or information.<br />A value of 0 will not cache.";
-	$lang->about_mcontent = 'This is the page you will see from mobile devices. If you have not set this page, rearranged default page will be displayed.';
-	$lang->page_management = 'Page Management';
-?>
diff --git a/modules/page/lang/es.lang.php b/modules/page/lang/es.lang.php
deleted file mode 100644
index 7161fb256..000000000
--- a/modules/page/lang/es.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/page/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para la página de módulo (básico)
-     **/
-
-    $lang->page = "Página";
-    $lang->about_page = "Esto es un módulo de blog, lo cual usted puede crear una página completa.\nUsando los últimos u otros widgets, Usted puede crear una página dinámica. A través del componente del editor, también puede crear páginas de gran variedad.\nURL de conección es el mismo que de los otros módulos como mid=Nombre del módulo.\n Si selcciona como predefinido esta página será la página principal del sitio.";
-    $lang->page_caching_interval = "Establezca el tiempo de cache";
-    $lang->about_page_caching_interval = "La unidad es minuto, y se muestra temporal de los datos guardados por el tiempo asignado. <br /> Se recomienda a la cache para una buena vez si una gran cantidad de recursos se necesitan otros servidores cuando se muestran los datos o la informacion. <br /> Un valor de 0 no cache.";
-    $lang->cmd_page_modify = "Modificar";
-    $lang->cmd_page_create = '페이지 생성';
-	$lang->about_mcontent = 'This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view\'s page.';
-	$lang->page_management = '페이지 관리';
-?>
diff --git a/modules/page/lang/fr.lang.php b/modules/page/lang/fr.lang.php
deleted file mode 100644
index 7f43fd38d..000000000
--- a/modules/page/lang/fr.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   modules/page/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent (PierreDuvent@gmail.com)
-     * @brief  Paquet du langage en français pour le module de Page
-     **/
-
-    $lang->page = "Page";
-    $lang->about_page = "C'est un module qui peut créer une page complet.\nVous pouvez créer une page dynamique en utilisant des gadgets des Documents derniers ou d'autres. Vous pouvez aussi créer une page avec variété par le composant d'editeur.\nL'URL d'accès est égal celui d'autre module comme mid=module.\nSi c'est choisi par défaut, ce sera la première page du site.";
-    $lang->cmd_page_modify = "Modifier";
-    $lang->cmd_page_create = '페이지 생성';
-    $lang->page_caching_interval = "Temps de antémémoire";
-    $lang->about_page_caching_interval = "L'unité est minute, et ça exposera des données conservées temporairement pendant le temps assigné.<br />Il est recommandé d'utiliser l'antémémoire pendant le temps convenable si beaucoup de ressource est nécessaire pour représenter les données ou l'information d'autre serveur.<br />La valeur 0 signifie de ne pas utiliser antémémoire.";
-	$lang->about_mcontent = 'This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view\'s page.';
-	$lang->page_management = '페이지 관리';
-?>
diff --git a/modules/page/lang/jp.lang.php b/modules/page/lang/jp.lang.php
deleted file mode 100644
index c104431ca..000000000
--- a/modules/page/lang/jp.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   modules/page/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ページ（page）モジュールの基本言語パッケージ
-     **/
-
-    $lang->page = 'ページ';
-    $lang->about_page = "一枚のページを作成出来るモジュールです。\n最新書き込みウィジェットや他のウィジェットを用いて動的なページが作成が出来、さらにエディターのコンポネントで様々なデザインも出来ます。\n接続URLは、他のモジュールと同様に、「mid=モジュール名」でアクセスし、デフォルトとして指定するとサイトにアクセスする際、メインページとして使われます。";
-    $lang->cmd_page_modify = 'ページ修正';
-    $lang->cmd_page_create = 'ページ作成';
-    $lang->page_caching_interval = 'キャッシング時間設定';
-    $lang->about_page_caching_interval = '分単位で指定出来、設定された時間の間は、臨時保存されたデータを出力します。<br />他のサーバの情報を出力したり、データを出力する際、リソースが多く使われるため、数分単位でキャッシングすることをお勧めします。<br />「0」に指定するとキャッシングされません。';
-	$lang->about_mcontent = 'モバイルスキン用のページです。作成しないとPC向けのページを再構成して表示します。';
-	$lang->page_management = 'ページ管理';
-?>
diff --git a/modules/page/lang/ko.lang.php b/modules/page/lang/ko.lang.php
deleted file mode 100644
index 2474f4322..000000000
--- a/modules/page/lang/ko.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   modules/page/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  페이지(page) 모듈의 기본 언어팩
-     **/
-
-    $lang->page = '페이지';
-    $lang->about_page = "하나의 완성된 페이지를 제작할 수 있는 페이지 모듈입니다.\n최근게시물이나 기타 위젯을 이용해서 동적인 페이지 생성이 가능하고 에디터 컴포넌트를 통해서 다양한 모습으로 꾸밀 수 있습니다.\n접속 URL은 다른 모듈과 같이 mid=모듈이름 으로 접속 가능하며 기본으로 선택하면 접속 시 메인 페이지가 됩니다.";
-    $lang->cmd_page_modify = '페이지 수정';
-    $lang->cmd_page_create = '페이지 생성';
-    $lang->page_caching_interval = '캐싱 시간 설정';
-    $lang->about_page_caching_interval = '분 단위이며 정해진 시간동안은 임시 저장한 데이터를 출력합니다.<br />다른 서버의 정보를 출력하거나, 데이터 출력하는데 많은 자원이 필요한 경우, 원하시는 분 단위 시간 간격으로 캐싱하는 것을 추천합니다.<br />0 으로 하시면 캐싱을 하지 않습니다.';
-	$lang->about_mcontent = '모바일에서 보여질 페이지입니다. 만약 작성하지 않으면 기본 페이지 데이터를 재정렬해서 보여줍니다.';
-	$lang->page_management = '페이지 관리';
-?>
diff --git a/modules/page/lang/lang.xml b/modules/page/lang/lang.xml
new file mode 100644
index 000000000..580342cb3
--- /dev/null
+++ b/modules/page/lang/lang.xml
@@ -0,0 +1,173 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="page">
+		<value xml:lang="ko"><![CDATA[페이지]]></value>
+		<value xml:lang="en"><![CDATA[Page]]></value>
+		<value xml:lang="jp"><![CDATA[ページ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[页面]]></value>
+		<value xml:lang="zh-TW"><![CDATA[頁面]]></value>
+		<value xml:lang="ru"><![CDATA[Страница]]></value>
+		<value xml:lang="es"><![CDATA[Página]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfa]]></value>
+		<value xml:lang="vi"><![CDATA[Trang]]></value>
+	</item>
+	<item name="about_page">
+		<value xml:lang="ko"><![CDATA[하나의 완성된 페이지를 제작할 수 있는 페이지 모듈입니다.
+최근게시물이나 기타 위젯을 이용해서 동적인 페이지 생성이 가능하고 에디터 컴포넌트를 통해서 다양한 모습으로 꾸밀 수 있습니다.
+접속 URL은 다른 모듈과 같이 mid=모듈이름 으로 접속 가능하며 기본으로 선택하면 접속 시 메인 페이지가 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[It is a blog module where you can create a complete page.
+Using latest or other widgets, you can create a dynamic page. Through the editor component, you can also create a great variety of pages.
+Its URL is same as other module's such as mid=module name.
+ If it is selected as a default, it will be the main page of the site.]]></value>
+		<value xml:lang="jp"><![CDATA[一枚のページを作成できるモジュールです。
+最新書き込みウィジェットや他のウィジェットを用いて動的なページが作成ができ、さらにエディターのコンポネントで様々なデザインもできます。
+接続URLは、他のモジュールと同様に、「mid=モジュール名」でアクセスし、デフォルトとして指定するとサイトにアクセスする際、メインページとして使われます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可制作完整页面的模块。
+利用最新主题列表或其他控件可以生成动态的页面，且通过网页编辑器做出形式多样的页面。
+连接页面URL同其他模块链接相同。即：mid=模块名称。选择默认选项此页面将变为首页。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可製作完整頁面的模組。
+利用最新主題列表或其他 Widgets 可以建立動態的頁面，且通過網頁編輯器做出多樣化的頁面。
+連結頁面網址和其他模組連結的方式相同。即：mid=模組名稱。選擇預設選項時，此頁面將變為首頁。]]></value>
+		<value xml:lang="fr"><![CDATA[C'est un module qui peut créer une page complet.
+Vous pouvez créer une page dynamique en utilisant des gadgets des Documents derniers ou d'autres. Vous pouvez aussi créer une page avec variété par le composant d'editeur.
+L'URL d'accès est égal celui d'autre module comme mid=module.
+Si c'est choisi par défaut, ce sera la première page du site.]]></value>
+		<value xml:lang="ru"><![CDATA[Это модуль блога, который создает полную страницу.
+Используя последние и другие виджеты, Вы можете создавать динамические страницы. Посредством компонента редактора, Вы можете также создать различные вариации страницы.
+URL модуля следует тем же правилам, что и другие модули: mid=имя_модуля.
+ Если он выбран как модуль по умолчанию, то он будет главной страницей сайта.]]></value>
+		<value xml:lang="es"><![CDATA[Esto es un módulo de blog, lo cual usted puede crear una página completa.
+Usando los últimos u otros widgets, Usted puede crear una página dinámica. A través del componente del editor, también puede crear páginas de gran variedad.
+URL de conección es el mismo que de los otros módulos como mid=Nombre del módulo.
+ Si selcciona como predefinido esta página será la página principal del sitio.]]></value>
+		<value xml:lang="tr"><![CDATA[Eksiksiz sayfa oluşturabileceğiniz bir blog modülüdür.
+Enson veya diğer widgetları kullanarak, dinamik sayfa oluşturabilirsiniz. Editör bileşeni yoluyla, çok farklı sayıda sayfalar oluşturabilirsiniz.
+URL'si diğer modülleriyle aynıdır(mid=module name).
+ Varsayılan olarak seçilirse, sitenin anasayfası olacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Là Module tạo ra một trang đầy đủ.
+Sử dụng Widget mới nhất hoặc những Widget khác giúp bạn có thể tạo một trang động. Thông qua trình bên tập Component, bạn có thể tạo ra sự phong phú cho những trang khác nhau.
+Địa chỉ của nó như một Module dạng '<b>mid=module name</b>'.
+Nếu chọn là mặc định, nó sẽ là trang chủ của Website.]]></value>
+	</item>
+	<item name="cmd_page_modify">
+		<value xml:lang="ko"><![CDATA[페이지 수정]]></value>
+		<value xml:lang="en"><![CDATA[Modify]]></value>
+		<value xml:lang="jp"><![CDATA[ページ修正]]></value>
+		<value xml:lang="zh-CN"><![CDATA[页面编辑]]></value>
+		<value xml:lang="zh-TW"><![CDATA[頁面編輯]]></value>
+		<value xml:lang="fr"><![CDATA[Modifier]]></value>
+		<value xml:lang="ru"><![CDATA[Изменить]]></value>
+		<value xml:lang="es"><![CDATA[Modificar]]></value>
+		<value xml:lang="tr"><![CDATA[Değiştir]]></value>
+		<value xml:lang="vi"><![CDATA[Sửa đổi]]></value>
+	</item>
+	<item name="cmd_page_create">
+		<value xml:lang="ko"><![CDATA[페이지 생성]]></value>
+		<value xml:lang="en"><![CDATA[Create a Page]]></value>
+		<value xml:lang="jp"><![CDATA[ページ作成]]></value>
+		<value xml:lang="zh-TW"><![CDATA[建立頁面]]></value>
+		<value xml:lang="tr"><![CDATA[Sayfa Oluştur]]></value>
+	</item>
+	<item name="cmd_page_article_create">
+		<value xml:lang="ko"><![CDATA[Article 생성]]></value>
+		<value xml:lang="en"><![CDATA[Create an Article]]></value>
+		<value xml:lang="jp"><![CDATA[Article作成]]></value>
+	</item>
+	<item name="page_caching_interval">
+		<value xml:lang="ko"><![CDATA[캐싱 시간 설정]]></value>
+		<value xml:lang="en"><![CDATA[Caching Time]]></value>
+		<value xml:lang="jp"><![CDATA[キャッシング時間設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[缓冲时间设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暫存時間設置]]></value>
+		<value xml:lang="fr"><![CDATA[Temps de antémémoire]]></value>
+		<value xml:lang="ru"><![CDATA[Установить время кеширования]]></value>
+		<value xml:lang="es"><![CDATA[Establezca el tiempo de cache]]></value>
+		<value xml:lang="tr"><![CDATA[Önbelleğe Alma Zamanı]]></value>
+		<value xml:lang="vi"><![CDATA[Thời gian lưu trữ]]></value>
+	</item>
+	<item name="about_page_caching_interval">
+		<value xml:lang="ko"><![CDATA[분 단위이며 정해진 시간동안은 임시 저장한 데이터를 출력합니다.<br />다른 서버의 정보를 출력하거나, 데이터 출력하는데 많은 자원이 필요한 경우, 원하시는 분 단위 시간 간격으로 캐싱하는 것을 추천합니다.<br />0 으로 하시면 캐싱을 하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The unit is minute, and it displays temporary saved data for assigned time.<br />It is recommended to cache for proper time if a lot of resources are needed when displaying other servers' data or information.<br />A value of 0 will not cache.]]></value>
+		<value xml:lang="jp"><![CDATA[分単位で指定でき、設定された時間の間は、一時保存されたデータを出力します。<br />他のサーバの情報を出力したり、データを出力する際、リソースが多く使われるため、数分単位でキャッシングすることをお勧めします。<br />「0」に指定するとキャッシングされません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[单位为分。缓冲时间间隔内页面将输出临时储存的数据。<br />显示外链服务器信息或数据时，如消耗资源很大，尽量把缓冲时间设置为大一点的相应值。<br />0 表示无缓冲。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[單位為分。暫存時間內頁面將輸出臨時儲存的資料。<br />輸出外部主機訊息或資料時，如消耗資源很大，盡量把暫存時間設大一點。<br />『0』表示不暫存。]]></value>
+		<value xml:lang="fr"><![CDATA[L'unité est minute, et ça exposera des données conservées temporairement pendant le temps assigné.<br />Il est recommandé d'utiliser l'antémémoire pendant le temps convenable si beaucoup de ressource est nécessaire pour représenter les données ou l'information d'autre serveur.<br />La valeur 0 signifie de ne pas utiliser antémémoire.]]></value>
+		<value xml:lang="ru"><![CDATA[Единица измерения равна одной минуте. Это отображает временно сохраненные данные для присвоенного времени.<br />Рекомендуется устанавливать разумное время кеширования, если множество ресурсов нуждаются в показе данных с других серверов.<br />Значение 0 отключает кеширование.]]></value>
+		<value xml:lang="es"><![CDATA[La unidad es minuto, y se muestra temporal de los datos guardados por el tiempo asignado. <br /> Se recomienda a la cache para una buena vez si una gran cantidad de recursos se necesitan otros servidores cuando se muestran los datos o la informacion. <br /> Un valor de 0 no cache.]]></value>
+		<value xml:lang="tr"><![CDATA[Birim dakikadır ve belirlenen zaman için geçici olarak kaydedilmiş veriyi gösterir.<br />Diğer sunucuların veri veya bilgileri gösterilirken, eğer fazla sayıda kaynağın gösterilmesi gerekiyorsa, uygun zamanın önbelleğe alınması önerilmiştir.<br />0 değeri verilirse, önbelleğe alınmayacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Đơn vị được tính bằng phút, nó sẽ là thời gian lưu trữ tạm thời.<br />Đó là khuyến cáo thời gian lưu trữ tạm thời thích hợp khi cần để hiển thị.<br />Nhập 0 nếu không sử dụng tính năng này.]]></value>
+	</item>
+	<item name="about_mcontent">
+		<value xml:lang="ko"><![CDATA[모바일에서 보여질 페이지입니다. 만약 작성하지 않으면 기본 페이지 데이터를 재정렬해서 보여줍니다.]]></value>
+		<value xml:lang="en"><![CDATA[This is the page you will see from mobile devices. If you have not set this page, rearranged default page will be displayed.]]></value>
+		<value xml:lang="jp"><![CDATA[モバイルスキン用のページです。作成しないとPC向けのページを再構成して表示します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[此页为移动版页面，如您没有对此页面进行布局，它会自动将PC版页面数据重排序显示。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[此頁面為手機瀏覽頁面。如果沒有編輯此頁面，則會將預設頁面改編重新顯示。]]></value>
+		<value xml:lang="fr"><![CDATA[This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view's page.]]></value>
+		<value xml:lang="ru"><![CDATA[This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view's page.]]></value>
+		<value xml:lang="es"><![CDATA[This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view's page.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu sayfa, sizin hareketli cihazlardan göreceğiniz sayfadır. Eğer bu sayfayı ayarlamadıysanız, düzenlenmiş varsayılan sayfa gösterilecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view's page.]]></value>
+	</item>
+	<item name="page_type">
+		<value xml:lang="ko"><![CDATA[페이지 타입]]></value>
+		<value xml:lang="en"><![CDATA[Page Type]]></value>
+		<value xml:lang="jp"><![CDATA[ページタイプ]]></value>
+	</item>
+	<item name="click_choice">
+		<value xml:lang="ko"><![CDATA[선택해 주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Select]]></value>
+		<value xml:lang="jp"><![CDATA[選択してください。]]></value>
+	</item>
+	<item name="page_type_name" type="array">
+		<item name="ARTICLE">
+			<value xml:lang="ko"><![CDATA[문서 페이지]]></value>
+			<value xml:lang="en"><![CDATA[Article Page]]></value>
+			<value xml:lang="jp"><![CDATA[書き込み Page]]></value>
+		</item>
+		<item name="WIDGET">
+			<value xml:lang="ko"><![CDATA[위젯 페이지]]></value>
+			<value xml:lang="en"><![CDATA[Widget Page]]></value>
+			<value xml:lang="jp"><![CDATA[ウィジェット Page]]></value>
+		</item>
+		<item name="OUTSIDE">
+			<value xml:lang="ko"><![CDATA[외부 페이지]]></value>
+			<value xml:lang="en"><![CDATA[External Page]]></value>
+			<value xml:lang="jp"><![CDATA[外部ページ]]></value>
+		</item>
+	</item>
+	<item name="about_page_type">
+		<value xml:lang="ko"><![CDATA[페이지 타입을 선택하여 원하는 화면을 구성할 수 있습니다. <ol><li>위젯형 : 여러가지 위젯들을 생성하여 화면을 구성합니다.</li><li>문서형 : 제목, 내용, 태그를 갖는 문서를 제작하여 포스팅 형식의 페이지를 작성합니다. </li><li>외부페이지형 : 외부 HTML 또는 PHP 파일을 XE에서 사용할 수 있습니다.</li></ol>]]></value>
+		<value xml:lang="en"><![CDATA[Select Page Type to build a page. <ol><li>Widget: Create multiple widgets.</li><li>Article: Create articles with titles, contents and tags for posting page. </li><li>External Page: Use external HTML or PHP files in XE.</li></ol>]]></value>
+	　　<value xml:lang="jp"><![CDATA[ページタイプを選択して好きな画面を構成できます。<ol><li>ウィジェット型 : いろんなウィジェットを生成して画面を構成します。</li><li>ドキュメント型 : タイトル、内容、タグのあるドキュメントを製作して、投稿形式のページを作成します。</li><li>外部ページ型 : 外部HTML、またはPHPファイルをXEで使用できます。]]></value>
+	</item>
+	<item name="opage_path">
+		<value xml:lang="ko"><![CDATA[외부 문서 위치]]></value>
+		<value xml:lang="en"><![CDATA[Location of External Document]]></value>
+		<value xml:lang="jp"><![CDATA[外部ドキュメントの位置]]></value>
+	</item>
+	<item name="about_opage">
+		<value xml:lang="ko"><![CDATA[XE가 아닌 외부 HTML 또는 PHP파일을 XE에서 사용할 수 있도록 하는 모듈입니다.<br />절대경로, 상대경로를 이용할 수 있으며 http:// 로 시작할 경우 서버 외부의 페이지도 표시할 수 있습니다]]></value>
+		<value xml:lang="en"><![CDATA[This module enables to use external html or php files in XE.<br />It allows absolute or relative path, and if the url starts with 'http://' , it can display the external page of the server.]]></value>
+	　　<value xml:lang="jp"><![CDATA[XEではなく、外部HTML、またはPHPファイルをXEで使用できるようにするモジュールです。<br />絶対パス、相対パスを利用でき、http://で開始する場合にサーバー外部のページも表示できます。]]></value>
+	</item>
+	<item name="about_opage_path">
+		<value xml:lang="ko"><![CDATA[외부문서의 위치를 입력해주세요.<br />/path1/path2/sample.php 와 같이 절대경로나 ../path2/sample.php와 같은 상대경로 모두 사용가능합니다.<br />http://url/sample.php 와 같이 사용하면 해당 페이지를 웹으로 전송 받아 출력 하게 됩니다.<br />현재 XE가 설치된 절대경로는 다음과 같습니다.<br />]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the location of external document.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php', the result will be received and then displayed.<br />This is current XE's absolute path.<br />]]></value>
+	　　<value xml:lang="jp"><![CDATA[外部ドキュメントの位置を入力してください。<br />/path1/path2/sample.phpのような絶対パス、もしくは../path2/sample.phpのような相対パス両方とも使用できます。<br />http://url/sample.phpのように使用すると、該当ページをウェブへ転送し、出力します。<br />現在、XEがインストールされている絶対パスは、次のとおりです。<br />]]></value>
+	</item>
+	<item name="opage_mobile_path">
+		<value xml:lang="ko"><![CDATA[모바일용 외부 문서 위치]]></value>
+		<value xml:lang="en"><![CDATA[Location of External Document for Mobile View]]></value>
+		<value xml:lang="jp"><![CDATA[モバイル用外部ドキュメントの位置]]></value>
+	</item>
+	<item name="about_opage_mobile_path">
+		<value xml:lang="ko"><![CDATA[모바일용 외부문서의 위치를 입력해주세요. 입력하지 않으면 위에서 지정한 외부문서 위치의 페이지를 이용합니다. <br />/path1/path2/sample.php 와 같이 절대경로나 ../path2/sample.php와 같은 상대경로 모두 사용가능합니다.<br />http://url/sample.php 와 같이 사용하면 해당 페이지를 웹으로 전송 받아 출력 하게 됩니다.<br />현재 XE가 설치된 절대경로는 다음과 같습니다.<br />]]></value>
+		<value xml:lang="en"><![CDATA[Please enter the location of external document for mobile view. If not inputted, it uses the external document specified above.<br />Both absolute path such as '/path1/path2/sample.php' or relative path such as '../path2/sample.php' can be used.<br />If you input the path like 'http://url/sample.php', the result will be received and then displayed.<br />This is current XE's absolute path.<br />]]></value>
+	　　<value xml:lang="jp"><![CDATA[モバイル用外部ドキュメントの位置を入力してください。入力しないと上記で指定した外部ドキュメントの位置のページを利用します。<br />/path1/path2/sample.phpのように絶対パス、もしくは../path2/sample.phpのような相対パス両方とも使用できます。<br />http://url/sample.phpのように使用すると、該当ページをウェブへ転送し、出力します。<br />現在、XEのインストールされている絶対パスは、次のとおりです。<br />]]></value>
+	</item>
+	<item name="page_management">
+		<value xml:lang="ko"><![CDATA[페이지 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage of page]]></value>
+	</item>
+</lang>
diff --git a/modules/page/lang/ru.lang.php b/modules/page/lang/ru.lang.php
deleted file mode 100644
index 4538b1dd6..000000000
--- a/modules/page/lang/ru.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->page = "Страница";
-    $lang->about_page = "Это модуль блога, который создает полную страницу.\nИспользуя последние и другие виджеты, Вы можете создавать динамические страницы. Посредством компонента редактора, Вы можете также создать различные вариации страницы.\nURL модуля следует тем же правилам, что и другие модули: mid=имя_модуля.\n Если он выбран как модуль по умолчанию, то он будет главной страницей сайта.";
-    $lang->page_caching_interval = "Установить время кеширования";
-    $lang->about_page_caching_interval = "Единица измерения равна одной минуте. Это отображает временно сохраненные данные для присвоенного времени.<br />Рекомендуется устанавливать разумное время кеширования, если множество ресурсов нуждаются в показе данных с других серверов.<br />Значение 0 отключает кеширование.";
-    $lang->cmd_page_modify = "Изменить";
-    $lang->cmd_page_create = '페이지 생성';
-	$lang->about_mcontent = 'This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view\'s page.';
-	$lang->page_management = '페이지 관리';
-?>
diff --git a/modules/page/lang/tr.lang.php b/modules/page/lang/tr.lang.php
deleted file mode 100644
index 7945917ba..000000000
--- a/modules/page/lang/tr.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   modules/page/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page module / basic language pack
-     **/
-
-    $lang->page = "Sayfa";
-    $lang->about_page = "Eksiksiz sayfa oluşturabileceğiniz bir blog modülüdür.\nEnson veya diğer widgetları kullanarak, dinamik sayfa oluşturabilirsiniz. Editör bileşeni yoluyla, çok farklı sayıda sayfalar oluşturabilirsiniz.\nURL\'si diğer modülleriyle aynıdır(mid=module name).\n Varsayılan olarak seçilirse, sitenin anasayfası olacaktır.";
-    $lang->cmd_page_modify = "Değiştir";
-    $lang->cmd_page_create = 'Sayfa Oluştur';
-    $lang->page_caching_interval = "Önbelleğe Alma Zamanı";
-    $lang->about_page_caching_interval = "Birim dakikadır ve belirlenen zaman için geçici olarak kaydedilmiş veriyi gösterir.<br />Diğer sunucuların veri veya bilgileri gösterilirken, eğer fazla sayıda kaynağın gösterilmesi gerekiyorsa, uygun zamanın önbelleğe alınması önerilmiştir.<br />0 değeri verilirse, önbelleğe alınmayacaktır.";
-	$lang->about_mcontent = 'Bu sayfa, sizin hareketli cihazlardan göreceğiniz sayfadır. Eğer bu sayfayı ayarlamadıysanız, düzenlenmiş varsayılan sayfa gösterilecektir.';
-	$lang->page_management = 'Sayfa Yönetimi';
-?>
diff --git a/modules/page/lang/vi.lang.php b/modules/page/lang/vi.lang.php
deleted file mode 100644
index 3cbd72864..000000000
--- a/modules/page/lang/vi.lang.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->page = "Trang";
-    $lang->about_page = "Là Module tạo ra một trang đầy đủ.\nSử dụng Widget mới nhất hoặc những Widget khác giúp bạn có thể tạo một trang động. Thông qua trình bên tập Component, bạn có thể tạo ra sự phong phú cho những trang khác nhau.\nĐịa chỉ của nó như một Module dạng '<b>mid=module name</b>'.\nNếu chọn là mặc định, nó sẽ là trang chủ của Website.";
-    $lang->cmd_page_modify = "Sửa đổi";
-    $lang->cmd_page_create = '페이지 생성';
-    $lang->page_caching_interval = "Thời gian lưu trữ";
-    $lang->about_page_caching_interval = "Đơn vị được tính bằng phút, nó sẽ là thời gian lưu trữ tạm thời.<br />Đó là khuyến cáo thời gian lưu trữ tạm thời thích hợp khi cần để hiển thị.<br />Nhập 0 nếu không sử dụng tính năng này.";
-	$lang->about_mcontent = 'This is the page for the mobile view. If you do not write this page, the mobile view display reoragnized PC view\'s page.';
-	$lang->page_management = '페이지 관리';
-?>
diff --git a/modules/page/lang/zh-CN.lang.php b/modules/page/lang/zh-CN.lang.php
deleted file mode 100644
index f6a4eae7d..000000000
--- a/modules/page/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)   翻译：guny(space.china@gmail.com)
-     * @brief  页面(page)模块简体中文语言包
-     **/
-
-    $lang->page = "页面";
-    $lang->about_page = "可制作完整页面的模块。\n利用最新主题列表或其他控件可以生成动态的页面，且通过网页编辑器做出形式多样的页面。\n连接页面URL同其他模块链接相同。即：mid=模块名称。选择默认选项此页面将变为首页。";
-    $lang->cmd_page_modify = "页面编辑";
-    $lang->cmd_page_create = '페이지 생성';
-    $lang->page_caching_interval = "缓冲时间设置";
-    $lang->about_page_caching_interval = "单位为分。缓冲时间间隔内页面将输出临时储存的数据。<br />显示外链服务器信息或数据时，如消耗资源很大，尽量把缓冲时间设置为大一点的相应值。<br />0 表示无缓冲。";
-    $lang->about_mcontent = '此页为移动版页面，如您没有对此页面进行布局，它会自动将PC版页面数据重排序显示。';
-	$lang->page_management = '페이지 관리';
-?>
diff --git a/modules/page/lang/zh-TW.lang.php b/modules/page/lang/zh-TW.lang.php
deleted file mode 100644
index ab493c136..000000000
--- a/modules/page/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    /**
-     * @file   modules/page/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  頁面(page) 模組正體中文語言
-     **/
-
-    $lang->page = "頁面";
-    $lang->about_page = "可製作完整頁面的模組。\n利用最新主題列表或其他 Widgets 可以建立動態的頁面，且通過網頁編輯器做出多樣化的頁面。\n連結頁面網址和其他模組連結的方式相同。即：mid=模組名稱。選擇預設選項時，此頁面將變為首頁。";
-    $lang->cmd_page_modify = "頁面編輯";
-    $lang->cmd_page_create = '建立頁面';
-    $lang->page_caching_interval = "暫存時間設置";
-    $lang->about_page_caching_interval = "單位為分。暫存時間內頁面將輸出臨時儲存的資料。<br />輸出外部主機訊息或資料時，如消耗資源很大，盡量把暫存時間設大一點。<br />『0』表示不暫存。";
-	$lang->about_mcontent = '此頁面為手機瀏覽頁面。如果沒有編輯此頁面，則會將預設頁面改編重新顯示。';
-	$lang->page_management = '頁面管理';
-?>
diff --git a/modules/page/m.skins/default/mobile.html b/modules/page/m.skins/default/mobile.html
new file mode 100644
index 000000000..92940b223
--- /dev/null
+++ b/modules/page/m.skins/default/mobile.html
@@ -0,0 +1,12 @@
+<div class="title">제목 : {$oDocument->getTitle()}</div>
+<div class="content">내용 : {$oDocument->getContent()}</div>
+<div class="tag">태그 : {implode(',', $oDocument->get('tag_list'))}</div>
+<!--@if($grant->manager)-->
+    <!--%import("./js/page_admin.js")-->
+    <div class="tRight gap1 clear">
+		<!--@if($logged_info->is_admin=='Y')-->
+        <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <!--@end-->
+        <a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}</span></a>
+    </div>
+<!--@end-->
diff --git a/modules/page/page.admin.controller.php b/modules/page/page.admin.controller.php
index 0e6739c87..01d3ecff2 100644
--- a/modules/page/page.admin.controller.php
+++ b/modules/page/page.admin.controller.php
@@ -1,221 +1,300 @@
-<?php
-    /**
-     * @class  pageAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page 모듈의 admin controller class
-     **/
-
-    class pageAdminController extends page {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 페이지 추가
-         **/
-        function procPageAdminInsert() {
-            // module 모듈의 model/controller 객체 생성
-            $oModuleController = &getController('module');
-            $oModuleModel = &getModel('module');
-
-            // 게시판 모듈의 정보 설정
-            $args = Context::getRequestVars();
-            $args->module = 'page';
-            $args->mid = $args->page_name;
-            unset($args->page_name);
-
-			if($args->use_mobile != 'Y') $args->use_mobile = '';
-
-            // module_srl이 넘어오면 원 모듈이 있는지 확인
-            if($args->module_srl) {
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl);
-                if($module_info->module_srl != $args->module_srl) {
-					unset($args->module_srl);
-				}
-				else
-				{
-					foreach($args as $key=>$val)
-					{
-						$module_info->{$key} = $val;
-					}
-					$args = $module_info;
-				}
-            }
-
-            // module_srl의 값에 따라 insert/update
-            if(!$args->module_srl) {
-                $output = $oModuleController->insertModule($args);
-                $msg_code = 'success_registed';
-            } else {
-                $output = $oModuleController->updateModule($args);
-                $msg_code = 'success_updated';
-            }
-
-            if(!$output->toBool()) return $output;
-
-            $this->add("page", Context::get('page'));
-            $this->add('module_srl',$output->get('module_srl'));
-            $this->setMessage($msg_code);
-        }
-
-		function putDocumentsInPageToArray($target, &$array)
-		{
-			if(!$target) return;
-			preg_match_all('!<img src="./common/tpl/images/widget_bg.jpg" ([^>]+)!is', $target, $matches);
-			$pattern = '!document_srl="(\d+)"!';
-			foreach($matches[1] as $match)
-			{
-				$match2 = null;
-				preg_match($pattern, $match, $match2);
-				if(count($match2))
-				{
-					$array[(int)$match2[1]] = 1;
-				}
-			}
-		}
-
-        /**
-         * @brief 페이지 수정 내용 저장
-         **/
-        function procPageAdminInsertContent() {
-            $module_srl = Context::get('module_srl');
-            $content = Context::get('content');
-            if(!$module_srl) return new Object(-1,'msg_invalid_request');
-			$mcontent = Context::get('mcontent');
-			$type = Context::get('type');
-
-            // 페이지의 원 정보를 구해옴
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-			if($type == "mobile") {
-                if(!$mcontent) $mcontent = '';
-				$module_info->mcontent = $mcontent;
-			}
-			else {
-				if(!isset($content)) $content ='';
-				$module_info->content = $content;
-			}
-
-			$document_srls = array();
-			$this->putDocumentsInPageToArray($module_info->content, $document_srls);
-			$this->putDocumentsInPageToArray($module_info->mcontent, $document_srls);
-
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-            $obj->module_srl = $module_srl;
-            $obj->list_count = 99999999;
-            $output = $oDocumentModel->getDocumentList($obj);
-			if(count($output->data)) {
-				foreach($output->data as $document)
-				{
-					if($document_srls[$document->document_srl]) continue;
-					$oDocumentController->deleteDocument($document->document_srl, true);
-				}
-			}
-            // module 모듈의 controller 객체 생성
-            $oModuleController = &getController('module');
-
-            // 저장
-            $output = $oModuleController->updateModule($module_info);
-            if(!$output->toBool()) return $output;
-
-            // 해당 페이지에 첨부된 파일의 상태를 유효로 변경
-            $oFileController = &getController('file');
-            $oFileController->setFilesValid($module_info->module_srl);
-
-            // 캐시파일 재생성
-            //$this->procPageAdminRemoveWidgetCache();
-
-            $this->add("module_srl", $module_info->module_srl);
-            $this->add("page", Context::get('page'));
-            $this->add("mid", $module_info->mid);
-            $this->setMessage($msg_code);
-        }
-
-        /**
-         * @brief 페이지 삭제
-         **/
-        function procPageAdminDelete() {
-            $module_srl = Context::get('module_srl');
-
-            // 원본을 구해온다
-            $oModuleController = &getController('module');
-            $output = $oModuleController->deleteModule($module_srl);
-            if(!$output->toBool()) return $output;
-
-            $this->add('module','page');
-            $this->add('page',Context::get('page'));
-            $this->setMessage('success_deleted');
-        }
-
-        /**
-         * @brief 페이지 기본 정보의 추가
-         **/
-        function procPageAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args = Context::getRequestVars();
-
-            // module Controller 객체 생성하여 입력
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('page',$args);
-            return $output;
-        }
-
-        /**
-         * @brief 첨부파일 업로드
-         **/
-        function procUploadFile() {
-            // 기본적으로 필요한 변수 설정
-            $upload_target_srl = Context::get('upload_target_srl');
-            $module_srl = Context::get('module_srl');
-
-            // file class의 controller 객체 생성
-            $oFileController = &getController('file');
-            $output = $oFileController->insertFile($module_srl, $upload_target_srl);
-
-            // 첨부파일의 목록을 java script로 출력
-            $oFileController->printUploadedFileList($upload_target_srl);
-        }
-
-        /**
-         * @brief 첨부파일 삭제
-         * 에디터에서 개별 파일 삭제시 사용
-         **/
-        function procDeleteFile() {
-            // 기본적으로 필요한 변수인 upload_target_srl, module_srl을 설정
-            $upload_target_srl = Context::get('upload_target_srl');
-            $module_srl = Context::get('module_srl');
-            $file_srl = Context::get('file_srl');
-
-            // file class의 controller 객체 생성
-            $oFileController = &getController('file');
-            if($file_srl) $output = $oFileController->deleteFile($file_srl, $this->grant->manager);
-
-            // 첨부파일의 목록을 java script로 출력
-            $oFileController->printUploadedFileList($upload_target_srl);
-        }
-
-        /**
-         * @brief 지정된 페이지의 위젯 캐시 파일 지우기
-         **/
-        function procPageAdminRemoveWidgetCache() {
-            $module_srl = Context::get('module_srl');
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-
-            $content = $module_info->content;
-
-            $cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType());
-            if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
-
-            // widget controller 의 캐시파일 재생성 실행
-            $oWidgetController = &getController('widget');
-            $oWidgetController->recompileWidget($content);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  pageAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief page of the module admin controller class
+     **/
+
+    class pageAdminController extends page {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Add a Page
+         **/
+        function procPageAdminInsert() {
+            // Create model/controller object of the module module
+            $oModuleController = &getController('module');
+            $oModuleModel = &getModel('module');
+            // Set board module
+            $args = Context::getRequestVars();
+            $args->module = 'page';
+            $args->mid = $args->page_name;	//because if mid is empty in context, set start page mid
+            unset($args->page_name);
+
+			if($args->use_mobile != 'Y') $args->use_mobile = '';
+            // Check if an original module exists by using module_srl
+            if($args->module_srl) {
+				$columnList = array('module_srl');
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($args->module_srl, $columnList);
+                if($module_info->module_srl != $args->module_srl) {
+					unset($args->module_srl);
+				}
+				else
+				{
+					foreach($args as $key=>$val)
+					{
+						$module_info->{$key} = $val;
+					}
+					$args = $module_info;
+				}
+            }
+
+			switch ($args->page_type){
+				case 'WIDGET' : {
+									unset($args->skin);
+									unset($args->mskin);
+									unset($args->path);
+									unset($args->mpath);
+									break;
+								}
+				case 'ARTICLE' : {
+									unset($args->page_caching_interval);
+									unset($args->path);
+									unset($args->mpath);
+									break;
+								}
+				case 'OUTSIDE' : {
+									unset($args->skin);
+									unset($args->mskin);
+									break;
+								}
+			}
+            // Insert/update depending on module_srl
+            if(!$args->module_srl) {
+                $output = $oModuleController->insertModule($args);
+                $msg_code = 'success_registed';
+            } else {
+                $output = $oModuleController->updateModule($args);
+                $msg_code = 'success_updated';
+            }
+
+            if(!$output->toBool()) return $output;
+
+            $this->add("page", Context::get('page'));
+            $this->add('module_srl',$output->get('module_srl'));
+            $this->setMessage($msg_code);
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Page Modify
+         **/
+		function procPageAdminUpdate()
+		{
+			$this->procPageAdminInsert();
+		}
+
+		function putDocumentsInPageToArray($target, &$array)
+		{
+			if(!$target) return;
+			preg_match_all('!<img hasContent="true" ([^>]+)!is', $target, $matches);
+			$pattern = '!document_srl="(\d+)"!';
+			foreach($matches[1] as $match)
+			{
+				$match2 = null;
+				preg_match($pattern, $match, $match2);
+				if(count($match2))
+				{
+					$array[(int)$match2[1]] = 1;
+				}
+			}
+		}
+
+        /**
+         * @brief Save page edits
+         **/
+        function procPageAdminInsertContent() {
+            $module_srl = Context::get('module_srl');
+            $content = Context::get('content');
+            if(!$module_srl) return new Object(-1,'msg_invalid_request');
+			$mcontent = Context::get('mcontent');
+			$type = Context::get('type');
+            // Guhaeom won information page
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+			if($type == "mobile") {
+                if(!$mcontent) $mcontent = '';
+				$module_info->mcontent = $mcontent;
+			}
+			else {
+				if(!isset($content)) $content ='';
+				$module_info->content = $content;
+			}
+
+			$document_srls = array();
+			$this->putDocumentsInPageToArray($module_info->content, $document_srls);
+			$this->putDocumentsInPageToArray($module_info->mcontent, $document_srls);
+
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
+            $obj->module_srl = $module_srl;
+            $obj->list_count = 99999999;
+            $output = $oDocumentModel->getDocumentList($obj);
+			if(count($output->data)) {
+				foreach($output->data as $document)
+				{
+					if($document_srls[$document->document_srl]) continue;
+					$oDocumentController->deleteDocument($document->document_srl, true);
+				}
+			}
+            // Creates an object of the controller module module
+            $oModuleController = &getController('module');
+            // Save
+            $output = $oModuleController->updateModule($module_info);
+            if(!$output->toBool()) return $output;
+            // On the page, change the validity status of the attached file
+            $oFileController = &getController('file');
+            $oFileController->setFilesValid($module_info->module_srl);
+            // Create cache file
+            //$this->procPageAdminRemoveWidgetCache();
+
+            $this->add("module_srl", $module_info->module_srl);
+            $this->add("page", Context::get('page'));
+            $this->add("mid", $module_info->mid);
+            $this->setMessage($msg_code);
+        }
+
+        /**
+         * @brief Delete page
+         **/
+        function procPageAdminDelete() {
+            $module_srl = Context::get('module_srl');
+            // Get an original
+            $oModuleController = &getController('module');
+            $output = $oModuleController->deleteModule($module_srl);
+            if(!$output->toBool()) return $output;
+
+            $this->add('module','page');
+            $this->add('page',Context::get('page'));
+            $this->setMessage('success_deleted');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'module_srl', $output->get('module_srl'), 'act', 'dispPageAdminInfo');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Additional pages of basic information
+         **/
+        function procPageAdminInsertConfig() {
+            // Get the basic information
+            $args = Context::getRequestVars();
+            // Insert by creating the module Controller object
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('page',$args);
+            return $output;
+        }
+
+        /**
+         * @brief Upload attachments
+         **/
+        function procUploadFile() {
+            // Basic variables setting
+            $upload_target_srl = Context::get('upload_target_srl');
+            $module_srl = Context::get('module_srl');
+            // Create the controller object file class
+            $oFileController = &getController('file');
+            $output = $oFileController->insertFile($module_srl, $upload_target_srl);
+            // Attachment to the output of the list, java script
+            $oFileController->printUploadedFileList($upload_target_srl);
+        }
+
+        /**
+         * @brief Delete the attachment
+         * Delete individual files in the editor using
+         **/
+        function procDeleteFile() {
+            // Basic variable setting(upload_target_srl and module_srl set)
+            $upload_target_srl = Context::get('upload_target_srl');
+            $module_srl = Context::get('module_srl');
+            $file_srl = Context::get('file_srl');
+            // Create the controller object file class
+            $oFileController = &getController('file');
+            if($file_srl) $output = $oFileController->deleteFile($file_srl, $this->grant->manager);
+            // Attachment to the output of the list, java script
+            $oFileController->printUploadedFileList($upload_target_srl);
+        }
+
+        /**
+         * @brief Clear widget cache files of the specified page
+         **/
+        function procPageAdminRemoveWidgetCache() {
+            $module_srl = Context::get('module_srl');
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'content');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+
+            $content = $module_info->content;
+
+            $cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $module_info->module_srl, Context::getLangType());
+            if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+            // widget controller re-run of the cache files
+            $oWidgetController = &getController('widget');
+            $oWidgetController->recompileWidget($content);
+        }
+
+		function procPageAdminArticleDocumentInsert(){
+            $logged_info = Context::get('logged_info');
+			if ($logged_info->is_admin != 'Y')return new Object(-1, 'msg_not_permitted');
+
+            $obj = Context::getRequestVars();
+            $obj->module_srl = $this->module_info->module_srl;
+            $obj->is_notice = 'N';
+
+            settype($obj->title, "string");
+            if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+            //그래도 없으면 Untitled
+            if($obj->title == '') $obj->title = 'Untitled';
+
+            // document module의 model 객체 생성
+            $oDocumentModel = &getModel('document');
+
+            // document module의 controller 객체 생성
+            $oDocumentController = &getController('document');
+
+            // 이미 존재하는 글인지 체크
+            $oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
+
+			$bAnonymous = false;
+
+            // 이미 존재하는 경우 수정
+            if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
+                $output = $oDocumentController->updateDocument($oDocument, $obj);
+                $msg_code = 'success_updated';
+            // 그렇지 않으면 신규 등록
+            } else {
+                $output = $oDocumentController->insertDocument($obj, $bAnonymous);
+                $msg_code = 'success_registed';
+                $obj->document_srl = $output->get('document_srl');
+
+				$oModuleController = &getController('module');
+				$this->module_info->document_srl = $obj->document_srl;
+				$oModuleController->updateModule($this->module_info);
+
+            }
+
+            // 오류 발생시 멈춤
+            if(!$output->toBool()) return $output;
+
+            // 결과를 리턴
+            $this->add('mid', Context::get('mid'));
+            $this->add('document_srl', $output->get('document_srl'));
+
+            // 성공 메세지 등록
+            $this->setMessage($msg_code);
+		}
+
+
+    }
+?>
diff --git a/modules/page/page.admin.view.php b/modules/page/page.admin.view.php
index 698491453..e35d79e7b 100644
--- a/modules/page/page.admin.view.php
+++ b/modules/page/page.admin.view.php
@@ -1,303 +1,320 @@
-<?php
-    /**
-     * @class  pageAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page 모듈의 admin view 클래스
-     **/
-
-    class pageAdminView extends page {
-
-        var $module_srl = 0;
-        var $list_count = 20;
-        var $page_count = 10;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // module_srl이 있으면 미리 체크하여 존재하는 모듈이면 module_info 세팅
-            $module_srl = Context::get('module_srl');
-
-            // module model 객체 생성
-            $oModuleModel = &getModel('module');
-
-            // module_srl이 넘어오면 해당 모듈의 정보를 미리 구해 놓음
-            if($module_srl) {
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                if(!$module_info) {
-                    Context::set('module_srl','');
-                    $this->act = 'list';
-                } else {
-                    ModuleModel::syncModuleToSite($module_info);
-                    $this->module_info = $module_info;
-                    Context::set('module_info',$module_info);
-                }
-            }
-
-            // 모듈 카테고리 목록을 구함
-            $module_category = $oModuleModel->getModuleCategories();
-            Context::set('module_category', $module_category);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_category..title');
-
-            // 템플릿 경로 구함 (page의 경우 tpl에 관리자용 템플릿 모아놓음)
-            $this->setTemplatePath($this->module_path.'tpl');
-
-        }
-
-        /**
-         * @brief 페이지 관리 목록 보여줌
-         **/
-        function dispPageAdminContent() {
-            $args->sort_index = "module_srl";
-            $args->page = Context::get('page');
-            $args->list_count = 40;
-            $args->page_count = 10;
-            $args->s_module_category_srl = Context::get('module_category_srl');
-
-			$s_mid = Context::get('s_mid');
-			if($s_mid) $args->s_mid = $s_mid;
-
-			$s_browser_title = Context::get('s_browser_title');
-			if($s_browser_title) $args->s_browser_title = $s_browser_title;
-
-            $output = executeQuery('page.getPageList', $args);
-            moduleModel::syncModuleToSite($output->data);
-
-            // 템플릿에 쓰기 위해서 context::set
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('page_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('page_list..browser_title');
-			$security->encodeHTML('page_list..mid');
-			$security->encodeHTML('module_info.');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('index');
-        }
-
-        /**
-         * @brief 선택된 페이지의 정보 출력
-         **/
-        function dispPageAdminInfo() {
-            // GET parameter에서 module_srl을 가져옴
-            $module_srl = Context::get('module_srl');
-            $module_info = Context::get('module_info');
-
-            // module_srl 값이 없다면 그냥 index 페이지를 보여줌
-            if(!$module_srl) return $this->dispPageAdminContent();
-
-            // 레이아웃이 정해져 있다면 레이아웃 정보를 추가해줌(layout_title, layout)
-            if($module_info->layout_srl) {
-                $oLayoutModel = &getModel('layout');
-                $layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
-                $module_info->layout = $layout_info->layout;
-                $module_info->layout_title = $layout_info->layout_title;
-            }
-
-            // 레이아웃 목록을 구해옴
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList();
-            Context::set('layout_list', $layout_list);
-
-			$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
-			Context::set('mlayout_list', $mobile_layout_list);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..layout');
-			$security->encodeHTML('layout_list..title');
-			$security->encodeHTML('mlayout_list..layout');
-			$security->encodeHTML('mlayout_list..title');
-			$security->encodeHTML('module_info.');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('page_info');
-        }
-
-        /**
-         * @brief 페이지 추가 설정 보여줌
-         * 추가설정은 서비스형 모듈들에서 다른 모듈과의 연계를 위해서 설정하는 페이지임
-         **/
-        function dispPageAdminPageAdditionSetup() {
-            // content는 다른 모듈에서 call by reference로 받아오기에 미리 변수 선언만 해 놓음
-            $content = '';
-
-            $oEditorView = &getView('editor');
-            $oEditorView->triggerDispEditorAdditionSetup($content);
-            Context::set('setup_content', $content);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('addition_setup');
-
-			$security = new Security();
-			$security->encodeHTML('module_info.');
-        }
-
-        /**
-         * @brief 페이지 추가 폼 출력
-         **/
-        function dispPageAdminInsert() {
-
-            // GET parameter에서 module_srl을 가져옴
-            $module_srl = Context::get('module_srl');
-
-            // module_srl이 있으면 해당 모듈의 정보를 구해서 세팅
-            if($module_srl) {
-                $oModuleModel = &getModel('module');
-                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
-                else {
-                    unset($module_info);
-                    unset($module_srl);
-                }
-            }
-
-            // 레이아웃 목록을 구해옴
-            $oLayoutModel = &getModel('layout');
-            $layout_list = $oLayoutModel->getLayoutList();
-            Context::set('layout_list', $layout_list);
-
-			$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
-			Context::set('mlayout_list', $mobile_layout_list);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('layout_list..layout');
-			$security->encodeHTML('layout_list..title');
-			$security->encodeHTML('mlayout_list..layout');
-			$security->encodeHTML('mlayout_list..title');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('page_insert');
-        }
-
-		function dispPageAdminMobileContent() {
-            if($this->module_srl) Context::set('module_srl',$this->module_srl);
-
-            // 캐시 파일 지정
-            $cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
-            $interval = (int)($this->module_info->page_caching_interval);
-            if($interval>0) {
-                if(!file_exists($cache_file)) $mtime = 0;
-                else $mtime = filemtime($cache_file);
-
-                if($mtime + $interval*60 > time()) {
-                    $page_content = FileHandler::readFile($cache_file);
-                } else {
-                    $oWidgetController = &getController('widget');
-                    $page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
-                    FileHandler::writeFile($cache_file, $page_content);
-                }
-            } else {
-                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
-                $page_content = $this->module_info->mcontent;
-            }
-
-            Context::set('module_info', $this->module_info);
-            Context::set('page_content', $page_content);
-
-            $this->setTemplateFile('mcontent');
-		}
-
-		function dispPageAdminMobileContentModify() {
-            Context::set('module_info', $this->module_info);
-
-            // 내용을 세팅
-            $content = Context::get('mcontent');
-            if(!$content) $content = $this->module_info->mcontent;
-            Context::set('content', $content);
-
-            // 내용중 위젯들을 변환
-            $oWidgetController = &getController('widget');
-            $content = $oWidgetController->transWidgetCode($content, true);
-            Context::set('page_content', $content);
-
-            // 위젯 목록을 세팅
-            $oWidgetModel = &getModel('widget');
-            $widget_list = $oWidgetModel->getDownloadedWidgetList();
-            Context::set('widget_list', $widget_list);
-
-            //Security
-			$security = new Security();
-			$security->encodeHTML('widget_list..title','module_info.mid');
-
-			// 템플릿 파일 지정
-            $this->setTemplateFile('page_mobile_content_modify');
-		}
-
-        /**
-         * @brief 페이지 내용 수정
-         **/
-        function dispPageAdminContentModify() {
-            // 모듈 정보를 세팅
-            Context::set('module_info', $this->module_info);
-
-            // 내용을 세팅
-            $content = Context::get('content');
-            if(!$content) $content = $this->module_info->content;
-            Context::set('content', $content);
-
-            // 내용중 위젯들을 변환
-            $oWidgetController = &getController('widget');
-            $content = $oWidgetController->transWidgetCode($content, true);
-            Context::set('page_content', $content);
-
-            // 위젯 목록을 세팅
-            $oWidgetModel = &getModel('widget');
-            $widget_list = $oWidgetModel->getDownloadedWidgetList();
-            Context::set('widget_list', $widget_list);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('widget_list..title','module_info.mid');
-
-			// 템플릿 파일 지정
-            $this->setTemplateFile('page_content_modify');
-        }
-
-        /**
-         * @brief 페이지 삭제 화면 출력
-         **/
-        function dispPageAdminDelete() {
-            $module_srl = Context::get('module_srl');
-            if(!$module_srl) return $this->dispContent();
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            Context::set('module_info',$module_info);
-
-			//Security
-			$security = new Security();
-			$security->encodeHTML('module_info.module','module_info.mid');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('page_delete');
-
-			$security = new Security();
-			$security->encodeHTML('module_info.');
-        }
-
-        /**
-         * @brief 권한 목록 출력
-         **/
-        function dispPageAdminGrantInfo() {
-            // 공통 모듈 권한 설정 페이지 호출
-            $oModuleAdminModel = &getAdminModel('module');
-            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
-            Context::set('grant_content', $grant_content);
-
-            $this->setTemplateFile('grant_list');
-
-			$security = new Security();
-			$security->encodeHTML('module_info.');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pageAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief page admin view of the module class
+     **/
+
+    class pageAdminView extends page {
+
+        var $module_srl = 0;
+        var $list_count = 20;
+        var $page_count = 10;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Pre-check if module_srl exists. Set module_info if exists
+            $module_srl = Context::get('module_srl');
+            // Create module model object
+            $oModuleModel = &getModel('module');
+            // module_srl two come over to save the module, putting the information in advance
+            if($module_srl) {
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+                if(!$module_info) {
+                    Context::set('module_srl','');
+                    $this->act = 'list';
+                } else {
+                    ModuleModel::syncModuleToSite($module_info);
+                    $this->module_info = $module_info;
+                    Context::set('module_info',$module_info);
+                }
+            }
+            // Get a list of module categories
+            $module_category = $oModuleModel->getModuleCategories();
+            Context::set('module_category', $module_category);
+			//Security
+			$security = new Security();
+			$security->encodeHTML('module_category..title');
+
+			// Get a template path (page in the administrative template tpl putting together)
+            $this->setTemplatePath($this->module_path.'tpl');
+
+        }
+
+        /**
+         * @brief Manage a list of pages showing
+         **/
+        function dispPageAdminContent() {
+            $args->sort_index = "module_srl";
+            $args->page = Context::get('page');
+            $args->list_count = 40;
+            $args->page_count = 10;
+            $args->s_module_category_srl = Context::get('module_category_srl');
+
+			$s_mid = Context::get('s_mid');
+			if($s_mid) $args->s_mid = $s_mid;
+
+			$s_browser_title = Context::get('s_browser_title');
+			if($s_browser_title) $args->s_browser_title = $s_browser_title;
+
+            $output = executeQuery('page.getPageList', $args);
+			$oModuleModel = &getModel('module');
+			$page_list = $oModuleModel->addModuleExtraVars($output->data);
+            moduleModel::syncModuleToSite($page_list);
+
+            // To write to a template context:: set
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('page_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+			//Security
+			$security = new Security();
+			$security->encodeHTML('page_list..browser_title');
+			$security->encodeHTML('page_list..mid');
+			$security->encodeHTML('module_info.');
+
+			// Set a template file
+            $this->setTemplateFile('index');
+        }
+
+        /**
+         * @brief Information output of the selected page
+         **/
+        function dispPageAdminInfo() {
+            // Get module_srl by GET parameter
+            $module_srl = Context::get('module_srl');
+            $module_info = Context::get('module_info');
+            // If you do not value module_srl just showing the index page
+            if(!$module_srl) return $this->dispPageAdminContent();
+            // If the layout is destined to add layout information haejum (layout_title, layout)
+            if($module_info->layout_srl) {
+                $oLayoutModel = &getModel('layout');
+                $layout_info = $oLayoutModel->getLayout($module_info->layout_srl);
+                $module_info->layout = $layout_info->layout;
+                $module_info->layout_title = $layout_info->layout_title;
+            }
+            // Get a layout list
+            $oLayoutModel = &getModel('layout');
+            $layout_list = $oLayoutModel->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
+			$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+			Context::set('mlayout_list', $mobile_layout_list);
+            // Set a template file
+
+			if ($this->module_info->page_type == 'ARTICLE'){
+				$oModuleModel = &getModel('module');
+				$skin_list = $oModuleModel->getSkins($this->module_path);
+				Context::set('skin_list',$skin_list);
+
+				$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
+				Context::set('mskin_list', $mskin_list);
+			}
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('layout_list..layout');
+			$security->encodeHTML('layout_list..title');
+			$security->encodeHTML('mlayout_list..layout');
+			$security->encodeHTML('mlayout_list..title');
+			$security->encodeHTML('module_info.');
+
+            $this->setTemplateFile('page_info');
+        }
+
+        /**
+         * @brief Additional settings page showing
+         * For additional settings in a service module in order to establish links with other modules peyijiim
+         **/
+        function dispPageAdminPageAdditionSetup() {
+            // call by reference content from other modules to come take a year in advance for putting the variable declaration
+            $content = '';
+
+            $oEditorView = &getView('editor');
+            $oEditorView->triggerDispEditorAdditionSetup($content);
+            Context::set('setup_content', $content);
+            // Set a template file
+            $this->setTemplateFile('addition_setup');
+
+			$security = new Security();
+			$security->encodeHTML('module_info.');
+        }
+
+        /**
+         * @brief Add Page Form Output
+         **/
+        function dispPageAdminInsert() {
+            // Get module_srl by GET parameter
+            $module_srl = Context::get('module_srl');
+            // Get and set module information if module_srl exists
+            if($module_srl) {
+                $oModuleModel = &getModel('module');
+				$columnList = array('module_srl', 'mid', 'module_category_srl', 'browser_title', 'layout_srl', 'use_mobile', 'mlayout_srl');
+                $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+                if($module_info->module_srl == $module_srl) Context::set('module_info',$module_info);
+                else {
+                    unset($module_info);
+                    unset($module_srl);
+                }
+            }
+            // Get a layout list
+            $oLayoutModel = &getModel('layout');
+            $layout_list = $oLayoutModel->getLayoutList();
+            Context::set('layout_list', $layout_list);
+
+			$mobile_layout_list = $oLayoutModel->getLayoutList(0,"M");
+			Context::set('mlayout_list', $mobile_layout_list);
+
+            $oModuleModel = &getModel('module');
+            $skin_list = $oModuleModel->getSkins($this->module_path);
+            Context::set('skin_list',$skin_list);
+
+			$mskin_list = $oModuleModel->getSkins($this->module_path, "m.skins");
+			Context::set('mskin_list', $mskin_list);
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('layout_list..layout');
+			$security->encodeHTML('layout_list..title');
+			$security->encodeHTML('mlayout_list..layout');
+			$security->encodeHTML('mlayout_list..title');
+
+            // Set a template file
+            $this->setTemplateFile('page_insert');
+        }
+
+		function dispPageAdminMobileContent() {
+            if($this->module_srl) Context::set('module_srl',$this->module_srl);
+            // Specifying the cache file
+            $cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
+            $interval = (int)($this->module_info->page_caching_interval);
+            if($interval>0) {
+                if(!file_exists($cache_file)) $mtime = 0;
+                else $mtime = filemtime($cache_file);
+
+                if($mtime + $interval*60 > time()) {
+                    $page_content = FileHandler::readFile($cache_file);
+                } else {
+                    $oWidgetController = &getController('widget');
+                    $page_content = $oWidgetController->transWidgetCode($this->module_info->mcontent);
+                    FileHandler::writeFile($cache_file, $page_content);
+                }
+            } else {
+                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+                $page_content = $this->module_info->mcontent;
+            }
+
+            Context::set('module_info', $this->module_info);
+            Context::set('page_content', $page_content);
+
+            $this->setTemplateFile('mcontent');
+		}
+
+		function dispPageAdminMobileContentModify() {
+            Context::set('module_info', $this->module_info);
+            // Setting contents
+            $content = Context::get('mcontent');
+            if(!$content) $content = $this->module_info->mcontent;
+            Context::set('content', $content);
+            // Convert them to teach the widget
+            $oWidgetController = &getController('widget');
+            $content = $oWidgetController->transWidgetCode($content, true);
+            Context::set('page_content', $content);
+            // Set widget list
+            $oWidgetModel = &getModel('widget');
+            $widget_list = $oWidgetModel->getDownloadedWidgetList();
+            Context::set('widget_list', $widget_list);
+
+            //Security
+			$security = new Security();
+			$security->encodeHTML('widget_list..title','module_info.mid');
+
+			// Set a template file
+            $this->setTemplateFile('page_mobile_content_modify');
+		}
+
+        /**
+         * @brief Edit Page Content
+         **/
+        function dispPageAdminContentModify() {
+            // Set the module information
+            Context::set('module_info', $this->module_info);
+
+			if ($this->module_info->page_type == 'WIDGET') $this->_setWidgetTypeContentModify();
+			else if ($this->module_info->page_type == 'ARTICLE') $this->_setArticleTypeContentModify();
+        }
+
+		function _setWidgetTypeContentModify() {
+            // Setting contents
+            $content = Context::get('content');
+            if(!$content) $content = $this->module_info->content;
+            Context::set('content', $content);
+            // Convert them to teach the widget
+            $oWidgetController = &getController('widget');
+            $content = $oWidgetController->transWidgetCode($content, true);
+            Context::set('page_content', $content);
+            // Set widget list
+            $oWidgetModel = &getModel('widget');
+            $widget_list = $oWidgetModel->getDownloadedWidgetList();
+            Context::set('widget_list', $widget_list);
+
+			//Security
+			$security = new Security();
+			$security->encodeHTML('widget_list..title','module_info.mid');
+
+            // Set a template file
+            $this->setTemplateFile('page_content_modify');
+        }
+
+		function _setArticleTypeContentModify() {
+			$oDocumentModel = &getModel('document');
+			$oDocument = $oDocumentModel->getDocument(0, true);
+			
+			if ($this->module_info->document_srl){
+				$document_srl = $this->module_info->document_srl;
+				$oDocument->setDocument($document_srl);
+				Context::set('document_srl', $document_srl);
+			}
+            Context::addJsFilter($this->module_path.'tpl/filter', 'insert_article.xml');
+			Context::set('oDocument', $oDocument);
+			Context::set('mid', $this->module_info->mid);
+            $this->setTemplateFile('article_content_modify');
+		}
+
+        /**
+         * @brief Delete page output
+         **/
+        function dispPageAdminDelete() {
+            $module_srl = Context::get('module_srl');
+            if(!$module_srl) return $this->dispContent();
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module', 'mid');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            Context::set('module_info',$module_info);
+            // Set a template file
+            $this->setTemplateFile('page_delete');
+
+			$security = new Security();
+			$security->encodeHTML('module_info.');
+        }
+
+        /**
+         * @brief Rights Listing
+         **/
+        function dispPageAdminGrantInfo() {
+            // Common module settings page, call rights
+            $oModuleAdminModel = &getAdminModel('module');
+            $grant_content = $oModuleAdminModel->getModuleGrantHTML($this->module_info->module_srl, $this->xml_info->grant);
+            Context::set('grant_content', $grant_content);
+
+            $this->setTemplateFile('grant_list');
+
+			$security = new Security();
+			$security->encodeHTML('module_info.');
+        }
+    }
+?>
diff --git a/modules/page/page.api.php b/modules/page/page.api.php
index 40be8ce4f..01c622ef4 100644
--- a/modules/page/page.api.php
+++ b/modules/page/page.api.php
@@ -1,25 +1,25 @@
-<?php
-    /**
-     * @class  pageAPI
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page 모듈의 View Action에 대한 API 처리
-     **/
-
-    class pageAPI extends page {
-
-        /**
-         * @brief 페이지 내용
-         **/
-        function dispPageIndex(&$oModule) {
-			$page_content = Context::get('page_content');
-			$oWidgetController = &getController('widget');
-
-			$requestMethod = Context::getRequestMethod();
-			Context::setResponseMethod('HTML');
-			$oWidgetController->triggerWidgetCompile(&$page_content);
-			Context::setResponseMethod($requestMethod);
-
-            $oModule->add('page_content',$page_content);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pageAPI
+     * @author NHN (developers@xpressengine.com)
+     * @brief View Action page for the module API processing
+     **/
+
+    class pageAPI extends page {
+
+        /**
+         * @brief Page information
+         **/
+        function dispPageIndex(&$oModule) {
+			$page_content = Context::get('page_content');
+			$oWidgetController = &getController('widget');
+
+			$requestMethod = Context::getRequestMethod();
+			Context::setResponseMethod('HTML');
+			$oWidgetController->triggerWidgetCompile($page_content);
+			Context::setResponseMethod($requestMethod);
+
+            $oModule->add('page_content',$page_content);
+        }
+    }
+?>
diff --git a/modules/page/page.class.php b/modules/page/page.class.php
index 584f88637..7f4ffb74a 100644
--- a/modules/page/page.class.php
+++ b/modules/page/page.class.php
@@ -1,42 +1,78 @@
-<?php
-    /**
-     * @class  page
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page 모듈의 high class
-     **/
-
-    class page extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // page 에서 사용할 cache디렉토리 생성
-            FileHandler::makeDir('./files/cache/page');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            return new Object(0,'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 페이지 캐시 파일 삭제
-            FileHandler::removeFilesInDir("./files/cache/page");
-        }
-    }
-?>
+<?php
+    /**
+     * @class  page
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the module page
+     **/
+
+    class page extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // page generated from the cache directory to use
+            FileHandler::makeDir('./files/cache/page');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+			$output = executeQuery('page.pageTypeOpageCheck');
+			if ($output->toBool() && $output->data) return true;
+
+			$output = executeQuery('page.pageTypeNullCheck');
+			if ($output->toBool() && $output->data) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+			// opage module instance update
+			$output = executeQueryArray('page.pageTypeOpageCheck');
+			if ($output->toBool() && count($output->data) > 0){
+				foreach($output->data as $val){
+					$args->module_srl = $val->module_srl;
+					$args->name = 'page_type';
+					$args->value= 'OUTSIDE';
+					$in_out = executeQuery('page.insertPageType', $args);
+				}
+				$output = executeQuery('page.updateAllOpage');
+				if(!$output->toBool()) return $output;
+			}
+
+			// old page module instance update
+			$output = executeQueryArray('page.pageTypeNullCheck');
+			$skin_update_srls = array();
+			if ($output->toBool() && $output->data){
+				foreach($output->data as $val){
+					$args->module_srl = $val->module_srl;
+					$args->name = 'page_type';
+					$args->value= 'WIDGET';
+					$in_out = executeQuery('page.insertPageType', $args);
+
+					$skin_update_srls[] = $val->module_srl;
+				}
+			}
+			
+			if (count($skin_update_srls)>0){
+				$skin_args->module_srls = implode(',',$skin_update_srls);
+				$skin_args->is_skin_fix = "Y";
+				$ouput = executeQuery('page.updateSkinFix', $skin_args);
+			}
+            return new Object(0,'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/opage/opage.controller.php b/modules/page/page.controller.php
similarity index 83%
rename from modules/opage/opage.controller.php
rename to modules/page/page.controller.php
index 9d2a179a5..88b889481 100644
--- a/modules/opage/opage.controller.php
+++ b/modules/page/page.controller.php
@@ -1,105 +1,102 @@
-<?php
-    /**
-     * @class  documentController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  document 모듈의 controller 클래스
-     **/
-
-    class opageController extends opage {
-
-        var $target_path = '';
-
-        /**
-         * @brief 초기화
-         **/
-        function init() { }
-
-        /**
-         * @brief 타이틀 추출
-         **/
-        function getTitle($content) {
-            preg_match('!<title([^>]*)>(.*?)<\/title>!is', $content, $buff);
-            return trim($buff[2]);
-        }
-
-        /**
-         * @brief header script 추출
-         **/
-        function getHeadScript($content) {
-            // title 태그 제거
-            $content = preg_replace('!<title([^>]*)>(.*?)<\/title>!is','', $content);
-
-            // meta 태그 제거
-            $content = preg_replace('!<(\/){0,1}meta([^>]*)>!is','', $content);
-
-            // <link, <style, <script 등의 정보를 추출
-            preg_match_all('!<link([^>]*)>!is', $content, $link_buff);
-            for($i=0;$i<count($link_buff[0]);$i++) {
-                $tmp_str = trim($link_buff[0][$i]);
-                if(!$tmp_str) continue;
-                $header_script .=  $tmp_str."\n";
-            }
-
-            preg_match_all('!<(style|script)(.*?)<\/(style|script)>!is', $content, $script_buff);
-            for($i=0;$i<count($script_buff[0]);$i++) {
-                $tmp_str = trim($script_buff[0][$i]);
-                if(!$tmp_str) continue;
-                $header_script .=  $tmp_str."\n";
-            }
-
-            return $header_script;
-        }
-
-        /**
-         * @brief body의 내용을 추출
-         **/
-        function getBodyScript($content) {
-            // 내용 추출
-            preg_match('!<body([^>]*)>(.*?)<\/body>!is', $content, $body_buff);
-            $body_script = $body_buff[2];
-
-            // link, style, script등 제거
-            $body_script = preg_replace('!<link([^>]*)>!is', '', $body_script);
-            $body_script = preg_replace('!<(style|script)(.*?)<\/(style|script)>!is', '', $body_script);
-            return $body_script;
-        }
-
-        /**
-         * @brief 내용에 포함된 src, href의 값을 변경
-         **/
-        function replaceSrc($content, $path) {
-            $url_info = parse_url($path);
-            $host = sprintf("%s://%s%s",$url_info['scheme'],$url_info['host'],$url_info['port']?':'.$url_info['port']:'');
-            $this->host = $host.'/';
-            $path = $url_info['path'];
-            if(substr($path,-1)=='/') $path = substr($path,-1);
-            $t = explode('/',$path);
-            $_t = array();
-            for($i=0,$c=count($t)-1;$i<$c;$i++) {
-                $v = trim($t[$i]);
-                if(!$v) continue;
-                $_t[] = $v;
-            }
-            $path = $host.'/'.implode('/',$_t);
-            if(substr($path,-1)!='/') $path .= '/';
-            $this->path = $path;
-            $content = preg_replace_callback('/(src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
-
-            return $content;
-        }
-
-        function _replacePath($matches) {
-            $val = trim($matches[3]);
-            if(preg_match('/^(http|https|ftp|telnet|mms|mailto)/i',$val)) return $matches[0];
-            if(substr($val,0,2)=='./') {
-                $path = $this->path.substr($val,2);
-            } elseif(substr($val,0,1)=='/') {
-                $path = $this->host.substr($val,1);
-            } else {
-                $path = $this->path.$val;
-            }
-            return sprintf("%s%s%s%s", $matches[1], $matches[2], $path, $matches[4]);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  documentController
+     * @author NHN (developers@xpressengine.com)
+     * @brief controller class of the document module
+     **/
+
+    class pageController extends page {
+
+        var $target_path = '';
+
+        /**
+         * @brief Initialization
+         **/
+        function init() { }
+
+        /**
+         * @brief Extract a title
+         **/
+        function getTitle($content) {
+            preg_match('!<title([^>]*)>(.*?)<\/title>!is', $content, $buff);
+            return trim($buff[2]);
+        }
+
+        /**
+         * @brief Extract header script
+         **/
+        function getHeadScript($content) {
+            // remove the title tag
+            $content = preg_replace('!<title([^>]*)>(.*?)<\/title>!is','', $content);
+            // Remove meta tags
+            $content = preg_replace('!<(\/){0,1}meta([^>]*)>!is','', $content);
+            // Extract information such as <link, <style, <script and so on
+            preg_match_all('!<link([^>]*)>!is', $content, $link_buff);
+            for($i=0;$i<count($link_buff[0]);$i++) {
+                $tmp_str = trim($link_buff[0][$i]);
+                if(!$tmp_str) continue;
+                $header_script .=  $tmp_str."\n";
+            }
+
+            preg_match_all('!<(style|script)(.*?)<\/(style|script)>!is', $content, $script_buff);
+            for($i=0;$i<count($script_buff[0]);$i++) {
+                $tmp_str = trim($script_buff[0][$i]);
+                if(!$tmp_str) continue;
+                $header_script .=  $tmp_str."\n";
+            }
+
+            return $header_script;
+        }
+
+        /**
+         * @brief Extract the contents of the body
+         **/
+        function getBodyScript($content) {
+            // Extract content
+            preg_match('!<body([^>]*)>(.*?)<\/body>!is', $content, $body_buff);
+            $body_script = $body_buff[2];
+            // Remove link, style, script, etc.
+            $body_script = preg_replace('!<link([^>]*)>!is', '', $body_script);
+            $body_script = preg_replace('!<(style|script)(.*?)<\/(style|script)>!is', '', $body_script);
+            return $body_script;
+        }
+
+        /**
+         * @brief Change the value of src, href in the content 
+         **/
+        function replaceSrc($content, $path) {
+            $url_info = parse_url($path);
+            $host = sprintf("%s://%s%s",$url_info['scheme'],$url_info['host'],$url_info['port']?':'.$url_info['port']:'');
+            $this->host = $host.'/';
+            $path = $url_info['path'];
+            if(substr($path,-1)=='/') $path = substr($path,-1);
+            $t = explode('/',$path);
+            $_t = array();
+            for($i=0,$c=count($t)-1;$i<$c;$i++) {
+                $v = trim($t[$i]);
+                if(!$v) continue;
+                $_t[] = $v;
+            }
+            $path = $host.'/'.implode('/',$_t);
+            if(substr($path,-1)!='/') $path .= '/';
+            $this->path = $path;
+            $content = preg_replace_callback('/(src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
+
+            return $content;
+        }
+
+        function _replacePath($matches) {
+            $val = trim($matches[3]);
+            if(preg_match('/^(http|https|ftp|telnet|mms|mailto)/i',$val)) return $matches[0];
+            if(substr($val,0,2)=='./') {
+                $path = $this->path.substr($val,2);
+            } elseif(substr($val,0,1)=='/') {
+                $path = $this->host.substr($val,1);
+            } else {
+                $path = $this->path.$val;
+            }
+            return sprintf("%s%s%s%s", $matches[1], $matches[2], $path, $matches[4]);
+        }
+
+    }
+?>
diff --git a/modules/page/page.mobile.php b/modules/page/page.mobile.php
index d0713b6c4..f1e374b35 100644
--- a/modules/page/page.mobile.php
+++ b/modules/page/page.mobile.php
@@ -1,13 +1,44 @@
 <?php
 
-class pageMobile extends ModuleObject {
+require_once(_XE_PATH_.'modules/page/page.view.php');
+
+class pageMobile extends pageView {
 	function init() {
-		// 템플릿 경로 구함 (page의 경우 tpl에 관리자용 템플릿 모아놓음)
+		// Get a template path (page in the administrative template tpl putting together)
 		$this->setTemplatePath($this->module_path.'tpl');
+
+		switch($this->module_info->page_type)
+		{
+			case 'WIDGET' : {
+								$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
+								$this->interval = (int)($this->module_info->page_caching_interval);
+								break;
+							}
+			case 'OUTSIDE' :  {
+								$this->cache_file = sprintf("./files/cache/opage/%d.cache.php", $this->module_info->module_srl); 
+								$this->interval = (int)($this->module_info->page_caching_interval);
+								$this->path = $this->module_info->mpath;
+								break;
+							  }
+		}
 	}
 
 	function dispPageIndex() {
-		// 위젯을 1렬로 정렬 
+		// Variables used in the template Context:: set()
+		if($this->module_srl) Context::set('module_srl',$this->module_srl);
+
+		$page_type_name = strtolower($this->module_info->page_type);
+		$method = '_get' . ucfirst($page_type_name) . 'Content';
+		if (method_exists($this, $method)) $page_content = $this->{$method}();
+		else return new Object(-1, sprintf('%s method is not exists', $method));
+		
+		Context::set('module_info', $this->module_info);
+		Context::set('page_content', $page_content);
+
+		$this->setTemplateFile('mobile');
+	}
+	function _getWidgetContent(){
+		// Arrange a widget ryeolro
 		if($this->module_info->mcontent)
 		{
             $cache_file = sprintf("%sfiles/cache/page/%d.%s.m.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
@@ -28,18 +59,39 @@ class pageMobile extends ModuleObject {
                 if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
                 $page_content = $this->module_info->mcontent;
             }
-            Context::set('content', $page_content);
 		}
 		else
 		{
 			preg_match_all('!(<img)([^\>]*)(widget=)([^\>]*?)(\>)!is', $this->module_info->content, $matches);
-			$content = '';
+			$page_content = '';
 			for($i=0,$c=count($matches[0]);$i<$c;$i++) {
-				$content .= preg_replace('/ style\=\"([^\"]+)\" /i',' style="overflow:hidden;clear:both;margin:0 0 20px 0; _margin-right:10px;" ',$matches[0][$i])."\n\n";
+				$page_content .= preg_replace('/ style\=\"([^\"]+)\" /i',' style="overflow:hidden;clear:both;margin:0 0 20px 0; _margin-right:10px;" ',$matches[0][$i])."\n\n";
 			}
-			Context::set('content', $content);
 		}
-		$this->setTemplateFile('mobile');
+		return $page_content;
+	}
+
+	function _getArticleContent(){
+		$oDocumentModel = &getModel('document');
+		$oDocument = $oDocumentModel->getDocument(0, true);
+		
+		if ($this->module_info->document_srl){
+			$document_srl = $this->module_info->document_srl;
+			$oDocument->setDocument($document_srl);
+			Context::set('document_srl', $document_srl);
+		}
+		Context::set('oDocument', $oDocument);
+		$this->setTemplatePath(sprintf($this->module_path.'m.skins/%s', $this->module_info->skin));
+	}
+
+	function _getOutsideContent(){
+		// check if it is http or internal file
+		if($this->path) {
+			if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+			else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+		}
+	
+		return $content;
 	}
 }
 
diff --git a/modules/page/page.view.php b/modules/page/page.view.php
index 25b253c71..bb4a120bb 100644
--- a/modules/page/page.view.php
+++ b/modules/page/page.view.php
@@ -1,55 +1,205 @@
-<?php
-    /**
-     * @class  pageView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page 모듈의 view 클래스
-     **/
-
-    class pageView extends page {
-
-        var $module_srl = 0;
-        var $list_count = 20;
-        var $page_count = 10;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 템플릿 경로 구함 (page의 경우 tpl에 관리자용 템플릿 모아놓음)
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 일반 요청시 출력
-         **/
-        function dispPageIndex() {
-            // 템플릿에서 사용할 변수를 Context::set()
-            if($this->module_srl) Context::set('module_srl',$this->module_srl);
-
-            // 캐시 파일 지정
-            $cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
-            $interval = (int)($this->module_info->page_caching_interval);
-            if($interval>0) {
-                if(!file_exists($cache_file)) $mtime = 0;
-                else $mtime = filemtime($cache_file);
-
-                if($mtime + $interval*60 > time()) {
-                    $page_content = FileHandler::readFile($cache_file); 
-					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
-                } else {
-                    $oWidgetController = &getController('widget');
-                    $page_content = $oWidgetController->transWidgetCode($this->module_info->content);
-                    FileHandler::writeFile($cache_file, $page_content);
-                }
-            } else {
-                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
-                $page_content = $this->module_info->content;
-            }
-            
-            Context::set('module_info', $this->module_info);
-            Context::set('page_content', $page_content);
-
-            $this->setTemplateFile('content');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pageView
+     * @author NHN (developers@xpressengine.com)
+     * @brief page view class of the module
+     **/
+
+    class pageView extends page {
+
+        var $module_srl = 0;
+        var $list_count = 20;
+        var $page_count = 10;
+		var $cache_file;
+		var $interval;
+		var $path;
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Get a template path (page in the administrative template tpl putting together)
+            $this->setTemplatePath($this->module_path.'tpl');
+
+			switch($this->module_info->page_type)
+			{
+				case 'WIDGET' : {
+									$this->cache_file = sprintf("%sfiles/cache/page/%d.%s.cache.php", _XE_PATH_, $this->module_info->module_srl, Context::getLangType());
+									$this->interval = (int)($this->module_info->page_caching_interval);
+									break;
+								}
+				case 'OUTSIDE' :  {
+									$this->cache_file = sprintf("./files/cache/opage/%d.cache.php", $this->module_info->module_srl); 
+									$this->interval = (int)($this->module_info->page_caching_interval);
+									$this->path = $this->module_info->path;
+									break;
+								  }
+			}
+        }
+
+        /**
+         * @brief General request output
+         **/
+        function dispPageIndex() {
+            // Variables used in the template Context:: set()
+            if($this->module_srl) Context::set('module_srl',$this->module_srl);
+
+			$page_type_name = strtolower($this->module_info->page_type);
+			$method = '_get' . ucfirst($page_type_name) . 'Content';
+			if (method_exists($this, $method)) $page_content = $this->{$method}();
+			else return new Object(-1, sprintf('%s method is not exists', $method));
+            
+            Context::set('module_info', $this->module_info);
+            Context::set('page_content', $page_content);
+
+            $this->setTemplateFile('content');
+        }
+
+		function _getWidgetContent(){
+            if($this->interval>0) {
+                if(!file_exists($this->cache_file)) $mtime = 0;
+                else $mtime = filemtime($this->cache_file);
+
+                if($mtime + $interval*60 > time()) {
+                    $page_content = FileHandler::readFile($this->cache_file); 
+					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
+					$page_content = preg_replace('@<\!--#Meta:@', '<!--Meta:', $page_content);
+                } else {
+                    $oWidgetController = &getController('widget');
+                    $page_content = $oWidgetController->transWidgetCode($this->module_info->content);
+                    FileHandler::writeFile($this->cache_file, $page_content);
+                }
+            } else {
+                if(file_exists($this->cache_file)) FileHandler::removeFile($this->cache_file);
+                $page_content = $this->module_info->content;
+            }
+			return $page_content;
+		}
+
+		function _getArticleContent(){
+			$oDocumentModel = &getModel('document');
+			$oDocument = $oDocumentModel->getDocument(0, true);
+			
+			if ($this->module_info->document_srl){
+				$document_srl = $this->module_info->document_srl;
+				$oDocument->setDocument($document_srl);
+				Context::set('document_srl', $document_srl);
+			}
+			Context::set('oDocument', $oDocument);
+
+			if ($this->module_info->skin)
+				$this->setTemplatePath(sprintf($this->module_path.'skins/%s', $this->module_info->skin));
+			else
+				$this->setTemplatePath($this->module_path.'skins/default');
+				
+		}
+
+		function _getOutsideContent(){
+            // check if it is http or internal file
+            if($this->path) {
+                if(preg_match("/^([a-z]+):\/\//i",$this->path)) $content = $this->getHtmlPage($this->path, $this->interval, $this->cache_file);
+                else $content = $this->executeFile($this->path, $this->interval, $this->cache_file);
+            }
+		
+			return $content;
+		}
+
+        /**
+         * @brief Save the file and return if a file is requested by http
+         **/
+        function getHtmlPage($path, $caching_interval, $cache_file) {
+            // Verify cache
+            if($caching_interval > 0 && file_exists($cache_file) && filemtime($cache_file) + $caching_interval*60 > time()) {
+
+                $content = FileHandler::readFile($cache_file);
+
+            } else {
+
+                FileHandler::getRemoteFile($path, $cache_file);
+                $content = FileHandler::readFile($cache_file);
+
+            }
+            // Create opage controller
+            $oPageController = &getController('page');
+            // change url of image, css, javascript and so on if the page is from external server
+            $content = $oPageController->replaceSrc($content, $path);
+            // Change the document to utf-8 format
+            $buff->content = $content;
+            $buff = Context::convertEncoding($buff);
+            $content = $buff->content;
+            // Extract a title
+            $title = $oPageController->getTitle($content);
+            if($title) Context::setBrowserTitle($title);
+            // Extract header script
+            $head_script = $oPageController->getHeadScript($content);
+            if($head_script) Context::addHtmlHeader($head_script);
+            // Extract content from the body
+            $body_script = $oPageController->getBodyScript($content);
+            if(!$body_script) $body_script = $content;
+
+            return $content;
+        }
+
+        /**
+         * @brief Create a cache file in order to include if it is an internal file
+         **/
+        function executeFile($path, $caching_interval, $cache_file) {
+            // Cancel if the file doesn't exist
+            if(!file_exists($path)) return;
+            // Get a path and filename
+            $tmp_path = explode('/',$cache_file);
+            $filename = $tmp_path[count($tmp_path)-1];
+            $filepath = preg_replace('/'.$filename."$/i","",$cache_file);
+            // Verify cache
+            if($caching_interval <1 || !file_exists($cache_file) || filemtime($cache_file) + $caching_interval*60 <= time() || filemtime($cache_file)<filemtime($path) ) {
+                if(file_exists($cache_file)) FileHandler::removeFile($cache_file);
+                // Read a target file and get content
+                ob_start();
+                @include($path);
+                $content = ob_get_clean();
+                // Replace relative path to the absolute path 
+                $path_info = pathinfo($path);
+                $this->path = str_replace('\\', '/', realpath($path_info['dirname'])).'/';
+                $content = preg_replace_callback('/(target=|src=|href=|url\()("|\')?([^"\'\)]+)("|\'\))?/is',array($this,'_replacePath'),$content);
+                $content = preg_replace_callback('/(<!--%import\()(\")([^"]+)(\")/is',array($this,'_replacePath'),$content);
+
+                FileHandler::writeFile($cache_file, $content);
+                // Include and then Return the result
+                if(!file_exists($cache_file)) return;
+                // Attempt to compile
+                $oTemplate = &TemplateHandler::getInstance();
+                $script = $oTemplate->compileDirect($filepath, $filename);
+
+                FileHandler::writeFile($cache_file, $script);
+            }
+
+            $__Context = &$GLOBALS['__Context__'];
+            $__Context->tpl_path = $filepath;
+
+            ob_start();
+            @include($cache_file);
+            $content = ob_get_clean();
+
+            return $content;
+        }
+
+        function _replacePath($matches) {
+            $val = trim($matches[3]);
+            // Pass if the path is external or starts with /, #, { characters
+			// /=absolute path, #=hash in a page, {=Template syntax
+            if(preg_match('@^((?:http|https|ftp|telnet|mms)://|(?:mailto|javascript):|[/#{])@i',$val)) {
+				return $matches[0];
+            // In case of  .. , get a path
+            } elseif(preg_match('/^\.\./i',$val)) {
+				$p = Context::pathToUrl($this->path);
+                return sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+            }
+
+            if(substr($val,0,2)=='./') $val = substr($val,2);
+			$p = Context::pathToUrl($this->path);
+            $path = sprintf("%s%s%s%s",$matches[1],$matches[2],$p.$val,$matches[4]);
+
+			return $path;
+        }
+    }
+?>
diff --git a/modules/page/page.wap.php b/modules/page/page.wap.php
index 0754cee6e..54a4d7770 100644
--- a/modules/page/page.wap.php
+++ b/modules/page/page.wap.php
@@ -1,26 +1,25 @@
-<?php
-    /**
-     * @class  pageWap
-     * @author NHN (developers@xpressengine.com)
-     * @brief  page 모듈의 wap class
-     **/
-
-    class pageWap extends page {
-
-        /**
-         * @brief wap procedure method
-         *
-         * 페이지 모듈은 형식이 정해져 있지 않기에 전체 컨텐츠를 mobile class에서 제어해서 출력함
-         **/
-        function procWAP(&$oMobile) {
-            // 권한 체크
-            if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
-
-            // 위젯의 내용을 추출함
-            $oWidgetController = &getController('widget');
-            $content = $oWidgetController->transWidgetCode($this->module_info->content);
-            $oMobile->setContent($content);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  pageWap
+     * @author NHN (developers@xpressengine.com)
+     * @brief wap class page of the module
+     **/
+
+    class pageWap extends page {
+
+        /**
+         * @brief wap procedure method
+         *
+         * Page module does not include the following items on the full content control and output from the mobile class
+         **/
+        function procWAP(&$oMobile) {
+            // Check permissions
+            if(!$this->grant->access) return $oMobile->setContent(Context::getLang('msg_not_permitted'));
+            // The contents of the widget chuchulham
+            $oWidgetController = &getController('widget');
+            $content = $oWidgetController->transWidgetCode($this->module_info->content);
+            $oMobile->setContent($content);
+        }
+
+    }
+?>
diff --git a/modules/page/queries/getArticlePageSrls.xml b/modules/page/queries/getArticlePageSrls.xml
new file mode 100644
index 000000000..28f177c75
--- /dev/null
+++ b/modules/page/queries/getArticlePageSrls.xml
@@ -0,0 +1,12 @@
+<query id="getArticlePageSrls" action="select">
+    <tables>
+        <table name="module_extra_vars" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="name" default="page_type" />
+		<condition operation="equal" column="value" default="ARTICLE" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/page/queries/insertPageType.xml b/modules/page/queries/insertPageType.xml
new file mode 100644
index 000000000..225b3fd10
--- /dev/null
+++ b/modules/page/queries/insertPageType.xml
@@ -0,0 +1,10 @@
+<query id="insertPageType" action="insert">
+	<tables>
+		<table name="module_extra_vars" />
+	</tables>
+	<columns>
+		<column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
+		<column name="name" var="name" notnull="notnull" />
+		<column name="value" var="value" />
+	</columns>
+</query>
diff --git a/modules/page/queries/pageTypeNullCheck.xml b/modules/page/queries/pageTypeNullCheck.xml
new file mode 100644
index 000000000..6b04d03ac
--- /dev/null
+++ b/modules/page/queries/pageTypeNullCheck.xml
@@ -0,0 +1,20 @@
+<query id="pageTypeNullCheck" action="select">
+    <tables>
+        <table name="modules" alias="m" />
+        <table name="module_extra_vars" alias="ev" type="left join">
+			<conditions>
+			<condition operation="equal" column="ev.name" default="page_type" />
+				<condition operation="equal" column="m.module_srl" default="ev.module_srl" pipe="and" />
+			</conditions>
+		</table>
+    </tables>
+    <columns>
+        <column name="m.module_srl" />
+        <column name="m.mid" />
+		<column name="ev.value" />
+    </columns>
+    <conditions>
+		<condition operation="equal" column="m.module" default="page" />
+		<condition operation="null" column="ev.value" default="NULL" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/page/queries/pageTypeOpageCheck.xml b/modules/page/queries/pageTypeOpageCheck.xml
new file mode 100644
index 000000000..33ad41563
--- /dev/null
+++ b/modules/page/queries/pageTypeOpageCheck.xml
@@ -0,0 +1,11 @@
+<query id="pageTypeOpageCheck" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+		<condition operation="equal" column="module" default="opage" />
+    </conditions>
+</query>
diff --git a/modules/page/queries/updateAllOpage.xml b/modules/page/queries/updateAllOpage.xml
new file mode 100644
index 000000000..6eda1ab9d
--- /dev/null
+++ b/modules/page/queries/updateAllOpage.xml
@@ -0,0 +1,12 @@
+<query id="updateAllOpage" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="module" default="page" notnull="notnull" />
+		<column name="is_skin_fix" default="Y" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+    </conditions>
+</query>
diff --git a/modules/page/queries/updateSkinFix.xml b/modules/page/queries/updateSkinFix.xml
new file mode 100644
index 000000000..5d094ae8a
--- /dev/null
+++ b/modules/page/queries/updateSkinFix.xml
@@ -0,0 +1,11 @@
+<query id="updateSkinFix" action="update">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+		<column name="is_skin_fix" var="is_skin_fix" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module_srl" var="module_srls" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/page/ruleset/deletePage.xml b/modules/page/ruleset/deletePage.xml
new file mode 100644
index 000000000..73623c1be
--- /dev/null
+++ b/modules/page/ruleset/deletePage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="module_srl" required="true" rule="number" />
+    </fields>
+</ruleset>
diff --git a/modules/page/ruleset/insertPage.xml b/modules/page/ruleset/insertPage.xml
new file mode 100644
index 000000000..fbdaf7125
--- /dev/null
+++ b/modules/page/ruleset/insertPage.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="mid" type="regex" test="/^[a-zA-Z]+[0-9a-zA-Z_]*$/"  />
+    </customrules>
+    <fields>
+		<field name="page_type" required="true" rule="alpha" />
+		<field name="page_name" required="true" length=":40" rule="mid" />
+		<field name="browser_title" required="true" length=":250" />
+		<field name="path">
+			<if test="$page_type == 'OUTSIDE'" attr="required" value="true" />
+		</field>
+    </fields>
+</ruleset>
diff --git a/modules/page/ruleset/updatePage.xml b/modules/page/ruleset/updatePage.xml
new file mode 100644
index 000000000..0d62d8782
--- /dev/null
+++ b/modules/page/ruleset/updatePage.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="mid" type="regex" test="/^[a-zA-Z]+[0-9a-zA-Z_]*$/"  />
+    </customrules>
+    <fields>
+		<field name="page_name" required="true" length=":40" rule="mid" />
+		<field name="browser_title" required="true" length=":250" />
+		<field name="path">
+			<if test="$page_type == 'OUTSIDE'" attr="required" value="true" />
+		</field>
+    </fields>
+</ruleset>
diff --git a/modules/page/skins/default/content.html b/modules/page/skins/default/content.html
new file mode 100644
index 000000000..01c640cf8
--- /dev/null
+++ b/modules/page/skins/default/content.html
@@ -0,0 +1,9 @@
+<h1>{$oDocument->getTitle()}</h1>
+{$oDocument->getContent()}
+<block cond="$grant->manager">
+	<load target="../../tpl/js/page_admin.js" />
+	<div class="btnArea">
+		<span class="btn"><a cond="$logged_info->is_admin=='Y'" href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}</a></span>
+		<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}</a></span>
+	</div>
+</block>
diff --git a/modules/page/tpl/article_content_modify.html b/modules/page/tpl/article_content_modify.html
new file mode 100644
index 000000000..2c51f1319
--- /dev/null
+++ b/modules/page/tpl/article_content_modify.html
@@ -0,0 +1,25 @@
+<load target="js/page_admin.js" usecdn="true" />
+<form action="./" method="post" onsubmit="return procFilter(this, insert_article)" id="fo_write">
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="content" value="{$oDocument->getContentText()}" />
+	<input type="hidden" name="document_srl" value="{$document_srl}" />
+	<div class="form" style="margin-right:10px">
+		<input type="text" name="title" value="{htmlspecialchars($oDocument->getTitleText())}" title="{$lang->title}" style="width:100%" />
+	</div>
+
+    <div class="editor">{$oDocument->getEditor()}</div>
+
+    <div class="tag">
+        <input type="text" name="tags" value="{htmlspecialchars($oDocument->get('tags'))}" class="inputText" title="Tag" />
+		<p>{$lang->about_tag}</p>
+    </div>
+	<div class="btnArea">
+        <!--@if($is_logged)-->
+		<!--@if(!$oDocument->isExists() || $oDocument->get('status') == 'TEMP')-->
+        <span class="btn"><button type="button" onclick="doDocumentSave(this);">{$lang->cmd_temp_save}</button></span>
+        <span class="btn"><button type="button" onclick="doDocumentLoad(this);">{$lang->cmd_load}</button></span>
+		<!--@end-->
+        <!--@end-->
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
+</form>
diff --git a/modules/page/tpl/content.html b/modules/page/tpl/content.html
index 56fdea24a..fb75c500f 100644
--- a/modules/page/tpl/content.html
+++ b/modules/page/tpl/content.html
@@ -1,15 +1,18 @@
-<div>{$page_content}</div>
-
+{$page_content}
 <!--@if($grant->manager)-->
-    <!--%import("./js/page_admin.js")-->
-    <div class="tRight gap1 clear">
-        <a href="#" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;" class="button blue"><span>{$lang->cmd_remake_cache}</span></a>
-        <!--@if($logged_info->is_admin=='Y')-->
-        <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}</span></a>
+	<load target="./js/page_admin.js" usecdn="true" />
+    <div class="btnArea">
+		<!--@if($module_info->page_type == 'WIDGET')-->
+        <span class="btn"><button type="button" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;">{$lang->cmd_remake_cache}</button></span>
+        <!--@end-->
+		<!--@if($logged_info->is_admin=='Y')-->
+        <span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}</a></span>
+        <!--@end-->
+		<!--@if($module_info->page_type != 'OUTSIDE')-->
+        <span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}</a></span>
         <!--@end-->
-        <a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}</span></a>
 		<!--@if($module_info->use_mobile =="Y")-->
-        <a href="{getUrl('act','dispPageAdminMobileContent','module_srl',$module_info->module_srl)}" class="button black"><span>Mobile</span></a>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminMobileContent','module_srl',$module_info->module_srl)}">Mobile</a></span>
 		<!--@end-->
     </div>
 <!--@end-->
diff --git a/modules/page/tpl/filter/insert_article.xml b/modules/page/tpl/filter/insert_article.xml
new file mode 100644
index 000000000..7532ecff2
--- /dev/null
+++ b/modules/page/tpl/filter/insert_article.xml
@@ -0,0 +1,13 @@
+<filter name="insert_article" module="page" act="procPageAdminArticleDocumentInsert">
+  <form>
+    <node target="title" required="true" minlength="1" maxlength="250" />
+    <node target="content" required="true" />
+  </form>
+  <response callback_func="completeArticleDocumentInserted">
+    <tag name="error" />
+    <tag name="message" />
+    <tag name="mid" />
+    <tag name="document_srl" />
+    <tag name="category_srl" />
+  </response>
+</filter>
diff --git a/modules/opage/tpl/filter/insert_opage.xml b/modules/page/tpl/filter/insert_outside.xml
similarity index 84%
rename from modules/opage/tpl/filter/insert_opage.xml
rename to modules/page/tpl/filter/insert_outside.xml
index 56533df4d..bf63e2189 100644
--- a/modules/opage/tpl/filter/insert_opage.xml
+++ b/modules/page/tpl/filter/insert_outside.xml
@@ -1,11 +1,11 @@
-<filter name="insert_opage" module="opage" act="procOpageAdminInsert" confirm_msg_code="confirm_submit">
+<filter name="insert_outside" module="page" act="procPageAdminInsert" confirm_msg_code="confirm_submit">
     <form>
         <node target="mid" required="true" maxlength="40" filter="alpha_number" />
         <node target="browser_title" required="true" maxlength="250" />
         <node target="opage_path" required="true" maxlength="250" />
     </form>
     <parameter>
-        <param name="opage_name" target="mid" />
+        <param name="page_name" target="mid" />
         <param name="module_srl" target="module_srl" />
         <param name="module_category_srl" target="module_category_srl" />
         <param name="layout_srl" target="layout_srl" />
@@ -14,7 +14,7 @@
         <param name="path" target="opage_path" />
         <param name="mpath" target="opage_mpath" />
     </parameter>
-    <response callback_func="completeInsertOpage">
+    <response callback_func="completeInsertPage">
         <tag name="error" />
         <tag name="message" />
         <tag name="module_srl" />
diff --git a/modules/page/tpl/header.html b/modules/page/tpl/header.html
index d377f1ed4..8424024a1 100644
--- a/modules/page/tpl/header.html
+++ b/modules/page/tpl/header.html
@@ -1,29 +1,31 @@
-<!--%import("js/page_admin.js")-->
-<h3 class="xeAdmin"><span class="gray">{$lang->page_management}</span></h3>
+<load target="js/page_admin.js" usecdn="true" />
+<h1 class="h1">{$lang->page_management}</h1>
 
-<div class="infoText">{nl2br($lang->about_page)}</div>
+<p>{nl2br($lang->about_page)}</p>
 
 <!--@if($module_info)-->
-<div class="header4">
-    <!--@if($module_info->mid)-->
-    <h4 class="xeAdmin">{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
-    <!--@end-->
-
-    <ul class="localNavigation">
-        <!--@if($module=='admin')-->
-        <li><a href="{getUrl('act','dispPageAdminContent','module_srl','')}">{$lang->cmd_list}</a></li>
-        <!--@else-->
-        <li><a href="{getUrl('act','')}">{$lang->cmd_back}</a></li>
-        <!--@end-->
-
-		<!--@if($module_srl)-->
-        <li <!--@if($act=='dispPageAdminInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPageAdminInfo')}">{$lang->module_info}</a></li>
-        <li <!--@if($act=='dispPageAdminPageAdditionSetup')-->class="on"<!--@end-->><a href="{getUrl('act','dispPageAdminPageAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
-        <li <!--@if($act=='dispPageAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPageAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
+<!--@if($module_info->mid)-->
+<h2 class="h2">
+	{$module_info->mid} <!--@if($module_info->is_default=='Y')-->({$lang->is_default})<!--@end--> 
+	| 
+	<a href="{getSiteUrl($module_info->domain,'','mid',$module_info->mid)}">View</a>
+</h2>
+<!--@end-->
+<div class="cnb">
+	<ul>
+		<!--@if($module=='admin')-->
+		<li <!--@if($act=='dispPageAdminContent')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminContent','module_srl','')}">{$lang->cmd_list}</a></li>
 		<!--@else-->
-		<li <!--@if($act=='dispPageAdminGrantInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispPageAdminInsert')}">{$lang->cmd_page_create}</a></li>
+		<li><a href="{getUrl('act','')}">{$lang->cmd_back}</a></li>
 		<!--@end-->
-    </ul>
+		<!--@if($module_srl)-->
+		<li <!--@if($act=='dispPageAdminInfo')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminInfo')}">{$lang->module_info}</a></li>
+		<li <!--@if($act=='dispPageAdminPageAdditionSetup')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminPageAdditionSetup')}">{$lang->cmd_addition_setup}</a></li>
+		<li <!--@if($act=='dispPageAdminGrantInfo')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminGrantInfo')}">{$lang->cmd_manage_grant}</a></li>
+		<!--@else-->
+		<li <!--@if($act=='dispPageAdminInsert')-->class="active"<!--@end-->><a href="{getUrl('act','dispPageAdminInsert')}">{$lang->cmd_page_create}</a></li>
+		<!--@end-->
+	</ul>
 </div>
 <!--@end-->
 
diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html
index a092dbfb4..d58e81bd2 100644
--- a/modules/page/tpl/index.html
+++ b/modules/page/tpl/index.html
@@ -1,101 +1,103 @@
-<!--%import("js/page_admin.js")-->
-<!--#include("header.html")-->
-
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-	<input type="hidden" name="module" value="{$module}" />
-	<input type="hidden" name="mid" value="{$mid}" />
-	<input type="hidden" name="vid" value="{$vid}" />
-	<input type="hidden" name="act" value="dispPageAdminContent" />
-
-        <fieldset>
-			{$lang->mid} <input type="text" name="s_mid" value="{htmlspecialchars($s_mid)}" class="inputTypeText" />
-			{$lang->browser_title} <input type="text" name="s_browser_title" value="{htmlspecialchars($s_browser_title)}" class="inputTypeText" />
-            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-            <a href="{getUrl('s_mid','','s_browser_title','','page','')}" class="button black"><span>{$lang->cmd_cancel}</span></a>
-        </fieldset>
-</form>
-
-<!-- 목록 -->
-<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
-<table cellspacing="0" class="rowTable">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col">
-            <div>
-                    <input type="hidden" name="module" value="{$module}" />
-                    <input type="hidden" name="act" value="{$act}" />
-                    <select name="module_category_srl">
-                        <option value="">{$lang->module_category}</option>
-                        <option value="0" <!--@if($module_category_srl==="0")-->selected="selected"<!--@end-->>{$lang->not_exists}</option>
-                        <!--@foreach($module_category as $key => $val)-->
-                        <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                        <!--@end-->
-                        <option value="">---------</option>
-                        <option value="-1">{$lang->cmd_management}</option>
-                    </select>
-                    <input type="submit" name="go_button" id="go_button" value="GO" class="buttonTypeGo" />
-            </div>
-        </th>
-        <th scope="col" class="half_wide"><div>{$lang->mid}</div></th>
-        <th scope="col" class="half_wide"><div>{$lang->browser_title}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col" colspan="3"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-
-<tbody>
-    <!--@foreach($page_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="number center">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
-        <td>
-            <!--@if(!$val->module_category_srl)-->
-                <!--@if($val->site_srl)-->
-                {$lang->virtual_site}
-                <!--@else-->
-                {$lang->not_exists}
-                <!--@end-->
-            <!--@else-->
-                {$module_category[$val->module_category_srl]->title}
-            <!--@end-->
-        </td>
-        <td>{$val->mid}</td>
-        <td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{$val->browser_title}</a></td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        <td><a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}" class="buttonSet buttonSetting"><span>{$lang->cmd_setup}</span></a></td>
-        <td><a href="{getUrl('','module','module','act','dispModuleAdminCopyModule','module_srl',$val->module_srl)}" onclick="popopen(this.href);return false;" class="buttonSet buttonCopy"><span>{$lang->cmd_copy}</span></a></td>
-        <td><a href="{getUrl('act','dispPageAdminDelete','module_srl', $val->module_srl)}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-<!-- 버튼 -->
-<div class="clear gap1">
-    <div class="fl">
-        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
-        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
-    </div>
-    <div class="fr">
-        <a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
-    </div>
-</div>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<load target="js/page_admin.js" usecdn="true" />
+<!--#include("header.html")-->
+
+<!-- 검색 -->
+<form action="./" method="get" class="adminSearch">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="mid" value="{$mid}" />
+	<input type="hidden" name="vid" value="{$vid}" />
+	<input type="hidden" name="act" value="dispPageAdminContent" />
+
+        <fieldset>
+			{$lang->mid} <input type="text" name="s_mid" value="{htmlspecialchars($s_mid)}"  />
+			{$lang->browser_title} <input type="text" name="s_browser_title" value="{htmlspecialchars($s_browser_title)}"  />
+            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
+            <a href="{getUrl('s_mid','','s_browser_title','','page','')}" class="button black"><span>{$lang->cmd_cancel}</span></a>
+        </fieldset>
+</form>
+
+<!-- 목록 -->
+<form action="./" method="get" onsubmit="return doChangeCategory(this);" id="fo_list">
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col"><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></th>
+				<th scope="col">
+					<input type="hidden" name="module" value="{$module}" />
+					<input type="hidden" name="act" value="{$act}" />
+					<select name="module_category_srl">
+						<option value="">{$lang->module_category}</option>
+						<option value="0" <!--@if($module_category_srl==="0")-->selected="selected"<!--@end-->>{$lang->not_exists}</option>
+						<!--@foreach($module_category as $key => $val)-->
+						<option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+						<option value="">---------</option>
+						<option value="-1">{$lang->cmd_management}</option>
+						</select>
+					<input type="submit" name="go_button" id="go_button" value="GO" />
+        		</th>
+				<th scope="col">{$lang->page_type}</th>
+				<th scope="col">{$lang->mid}</th>
+				<th scope="col">{$lang->browser_title}</th>
+				<th scope="col">{$lang->regdate}</th>
+				<th scope="col">&nbsp;</th>
+				</tr>
+			</thead>
+		
+		<tbody>
+			<!--@foreach($page_list as $no => $val)-->
+			<tr class="row{$cycle_idx}">
+				<td>{$no}</td>
+				<td><input type="checkbox" name="cart" value="{$val->module_srl}" /></td>
+				<td>
+					<!--@if(!$val->module_category_srl)-->
+					<!--@if($val->site_srl)-->
+					{$lang->virtual_site}
+					<!--@else-->
+					{$lang->not_exists}
+					<!--@end-->
+					<!--@else-->
+					{$module_category[$val->module_category_srl]->title}
+					<!--@end-->
+					</td>
+				<td>{$val->page_type}</td>
+				<td>{$val->mid}</td>
+				<td><a href="{getSiteUrl($val->domain,'','mid',$val->mid)}" target="_blank">{$val->browser_title}</a></td>
+				<td>{zdate($val->regdate,"Y-m-d")}</td>
+				<td>
+					<a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}">{$lang->cmd_setup}</a>
+					<a href="{getUrl('','module','module','act','dispModuleAdminCopyModule','module_srl',$val->module_srl)}" onclick="popopen(this.href);return false;">{$lang->cmd_copy}</a>
+					<a href="{getUrl('act','dispPageAdminDelete','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a>
+					</td>
+				</tr>
+			<!--@end-->
+			</tbody>
+	</table>
+</div>
+
+<!-- 버튼 -->
+<div class="btnArea">
+    <div class="etc">
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
+    </div>
+	<a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
+</div>
+
+</form>
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a>
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong>
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
diff --git a/modules/page/tpl/js/page_admin.js b/modules/page/tpl/js/page_admin.js
index 61bb7ed7c..3514551c5 100644
--- a/modules/page/tpl/js/page_admin.js
+++ b/modules/page/tpl/js/page_admin.js
@@ -1,110 +1,126 @@
-/**
- * @file   modules/page/js/page_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  page모듈의 관리자용 javascript
- **/
-
-/* 모듈 생성 후 */
-function completeInsertPage(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-
-    alert(message);
-
-    var url = '';
-    if(location.href.getQuery('module')=='admin') {
-        url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispPageAdminInfo');
-        if(page) url = url.setQuery('page',page);
-    } else {
-        url = current_url;
-    }
-
-    location.href = url;
-}
-
-/* 내용 저장 후 */
-function completeInsertPageContent(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-    var mid = ret_obj['mid'];
-
-    location.href = current_url.setQuery('mid',mid).setQuery('act','');
-}
-
-function completeInsertMobilePageContent(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-
-    var page = ret_obj['page'];
-    var module_srl = ret_obj['module_srl'];
-    var mid = ret_obj['mid'];
-
-    location.href = current_url.setQuery('mid',mid).setQuery('act','dispPageAdminMobileContent');
-}
-
-/* 수정한 페이지 컨텐츠를 저장 */
-function doSubmitPageContent(fo_obj) {
-    var html = getWidgetContent();
-    fo_obj.content.value = html;
-    return procFilter(fo_obj, insert_page_content);
-}
-
-function doSubmitMPageContent(fo_obj) {
-    var html = getWidgetContent();
-    fo_obj.content.value = html;
-    return procFilter(fo_obj, insert_mpage_content);
-}
-
-/* 모듈 삭제 후 */
-function completeDeletePage(ret_obj) {
-    var error = ret_obj['error'];
-    var message = ret_obj['message'];
-    var page = ret_obj['page'];
-    alert(message);
-
-    var url = current_url.setQuery('act','dispPageAdminContent').setQuery('module_srl','');
-    if(page) url = url.setQuery('page',page);
-
-    location.href = url;
-}
-
-/* 카테고리 이동 */
-function doChangeCategory(fo_obj) {
-    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
-    if(module_category_srl==-1) {
-        location.href = current_url.setQuery('act','dispModuleAdminCategory');
-        return false;
-    }
-    return true;
-}
-
-/* 위젯 재컴파일 */
-function doRemoveWidgetCache(module_srl) {
-    var params = new Array();
-    params["module_srl"] = module_srl;
-    exec_xml('page', 'procPageAdminRemoveWidgetCache', params, completeRemoveWidgetCache);
-}
-
-function completeRemoveWidgetCache(ret_obj) {
-    var message = ret_obj['message'];
-    location.reload(); 
-}
-
-/* 일괄 설정 */
-function doCartSetup(url) {
-    var module_srl = new Array();
-    jQuery('#fo_list input[name=cart]:checked').each(function() {
-        module_srl[module_srl.length] = jQuery(this).val();
-    });
-
-    if(module_srl.length<1) return;
-
-    url += "&module_srls="+module_srl.join(',');
-    popopen(url,'modulesSetup');
-}
+/**
+ * @file   modules/page/js/page_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  page모듈의 관리자용 javascript
+ **/
+
+/* 모듈 생성 후 */
+function completeInsertPage(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    var page = ret_obj['page'];
+    var module_srl = ret_obj['module_srl'];
+
+    alert(message);
+
+    var url = '';
+    if(location.href.getQuery('module')=='admin') {
+        url = current_url.setQuery('module_srl',module_srl).setQuery('act','dispPageAdminInfo');
+        if(page) url = url.setQuery('page',page);
+    } else {
+        url = current_url;
+    }
+
+    location.href = url;
+}
+
+function completeArticleDocumentInserted(ret_obj){
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    var mid = ret_obj['mid'];
+
+    alert(message);
+
+    var url = '';
+        url = current_url.setQuery('act', 'dispPageIndex').setQuery('mid', mid);
+
+
+    location.href = url;
+}
+
+/* 내용 저장 후 */
+function completeInsertPageContent(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    var page = ret_obj['page'];
+    var module_srl = ret_obj['module_srl'];
+    var mid = ret_obj['mid'];
+
+    location.href = current_url.setQuery('mid',mid).setQuery('act','');
+}
+
+function completeInsertMobilePageContent(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    var page = ret_obj['page'];
+    var module_srl = ret_obj['module_srl'];
+    var mid = ret_obj['mid'];
+
+    location.href = current_url.setQuery('mid',mid).setQuery('act','dispPageAdminMobileContent');
+}
+
+/* 수정한 페이지 컨텐츠를 저장 */
+function doSubmitPageContent(fo_obj) {
+    var html = getWidgetContent();
+    fo_obj.content.value = html;
+    return procFilter(fo_obj, insert_page_content);
+}
+
+function doSubmitMPageContent(fo_obj) {
+    var html = getWidgetContent();
+    fo_obj.content.value = html;
+    return procFilter(fo_obj, insert_mpage_content);
+}
+
+/* 모듈 삭제 후 */
+function completeDeletePage(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+    var page = ret_obj['page'];
+    alert(message);
+
+    var url = current_url.setQuery('act','dispPageAdminContent').setQuery('module_srl','');
+    if(page) url = url.setQuery('page',page);
+
+    location.href = url;
+}
+
+/* 카테고리 이동 */
+function doChangeCategory(fo_obj) {
+    var module_category_srl = fo_obj.module_category_srl.options[fo_obj.module_category_srl.selectedIndex].value;
+    if(module_category_srl==-1) {
+        location.href = current_url.setQuery('act','dispModuleAdminCategory');
+        return false;
+    }
+    return true;
+}
+
+/* 위젯 재컴파일 */
+function doRemoveWidgetCache(module_srl) {
+    var params = new Array();
+    params["module_srl"] = module_srl;
+    exec_xml('page', 'procPageAdminRemoveWidgetCache', params, completeRemoveWidgetCache);
+}
+
+function completeRemoveWidgetCache(ret_obj) {
+    var message = ret_obj['message'];
+    location.reload(); 
+}
+
+/* 일괄 설정 */
+function doCartSetup(url) {
+    var module_srl = new Array();
+    jQuery('#fo_list input[name=cart]:checked').each(function() {
+        module_srl[module_srl.length] = jQuery(this).val();
+    });
+
+    if(module_srl.length<1) return;
+
+    url += "&module_srls="+module_srl.join(',');
+    popopen(url,'modulesSetup');
+}
+
diff --git a/modules/page/tpl/mcontent.html b/modules/page/tpl/mcontent.html
index 830520c85..e560ccbd2 100644
--- a/modules/page/tpl/mcontent.html
+++ b/modules/page/tpl/mcontent.html
@@ -1,14 +1,13 @@
-<div>{$page_content}</div>
-
+{$page_content}
 <!--@if($grant->manager)-->
-    <!--%import("./js/page_admin.js")-->
-    <div class="tRight gap1 clear">
-        <a href="#" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;" class="button blue"><span>{$lang->cmd_remake_cache}</span></a>
+    <load target="./js/page_admin.js" usecdn="true" />
+    <div class="btnArea">
+        <span class="btn"><button type="button" onclick="doRemoveWidgetCache({$module_info->module_srl}); return false;">{$lang->cmd_remake_cache}</button></span>
         <!--@if($logged_info->is_admin=='Y')-->
-        <a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}</span></a>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}</a></span>
         <!--@end-->
-        <a href="{getUrl('act','dispPageAdminMobileContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}</span></a>
-        <a href="{getUrl('act','','module_srl',$module_info->module_srl)}" class="button black"><span>PC</span></a> 
-		<p style="color:#777">{$lang->about_mcontent}</p>
+        <span class="btn"><a href="{getUrl('act','dispPageAdminMobileContentModify','document_srl','')}">{$lang->cmd_page_modify}</a></span>
+        <span class="btn"><a href="{getUrl('act','','module_srl',$module_info->module_srl)}">PC</a></span>
+		<p>{$lang->about_mcontent}</p>
     </div>
 <!--@end-->
diff --git a/modules/page/tpl/mobile.html b/modules/page/tpl/mobile.html
index 2f68ed9d4..e295f91fe 100644
--- a/modules/page/tpl/mobile.html
+++ b/modules/page/tpl/mobile.html
@@ -1,4 +1,4 @@
-<!--%import("css/mpage.css")-->
+<load target="css/mpage.css" usecdn="true" />
 <div class="bd">
-{$content}
+{$page_content}
 </div>
diff --git a/modules/page/tpl/page_content_modify.html b/modules/page/tpl/page_content_modify.html
index bab9fe4f5..64f8c9174 100644
--- a/modules/page/tpl/page_content_modify.html
+++ b/modules/page/tpl/page_content_modify.html
@@ -1,44 +1,32 @@
 <!--%import("filter/insert_page_content.xml")-->
-<!--%import("js/page_admin.js")-->
-<!--%import("css/page.css")-->
+<load target="js/page_admin.js" usecdn="true" />
+<load target="css/page.css" usecdn="true" />
 
-<!--%import("../../widget/tpl/js/widget.js")-->
-<!--%import("../../widget/tpl/css/widget.css")-->
-
-<div class="clear"></div>
+<load target="../../widget/tpl/js/widget.js" usecdn="true" />
+<load target="../../widget/tpl/css/widget.css" usecdn="true" />
 <div id="zonePageContent">{$page_content}</div>
-<div class="clear"></div>
-<div class="adminLayer">
-    <form action="./" method="post" id="pageFo" onsubmit="return doSubmitPageContent(this);">
-        <input type="hidden" name="mid" value="{$module_info->mid}" />
-        <input type="hidden" name="module" value="page" />
-        <input type="hidden" name="act" value="dispPageAdminContentModify" />
-        <input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-        <input type="hidden" name="content" value="{htmlspecialchars($content)}" />
+<form action="./" method="post" id="pageFo" onsubmit="return doSubmitPageContent(this);">
+	<input type="hidden" name="mid" value="{$module_info->mid}" />
+	<input type="hidden" name="module" value="page" />
+	<input type="hidden" name="act" value="dispPageAdminContentModify" />
+	<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+	<input type="hidden" name="content" value="{htmlspecialchars($content)}" />
 
-        <div class="buttonBox">
-
-            <div class="fl">
-                <span class="button black "><input type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox(); return false;" /></span>
-            </div>
-            <div class="fr">
-                <select name="widget_list">
-                    <!--@foreach($widget_list as $widget)-->
-                    <option value="{$widget->widget}" <!--@if($widget->widget=='content')-->selected="selected"<!--@end-->>{$widget->title}</option>
-                    <!--@end-->
-                </select>
-                <span class="button blue"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
-                <span class="button green"><input type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}'); return false;" /></span>
-            </div>
-            <div class="buttonDiv"></div>
-            <div class="tRight">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"/></span>
-                <span class="button red"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
-                <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href=current_url.setQuery('mid','{$module_info->mid}').setQuery('act','');return false;"/></span>
-            </div>
-        </div>
-    </form>
-</div>
+	<div class="btnArea">
+		<div class="etc">
+			<span class="btn"><input type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox(); return false;" /></span>
+			<span class="btn"><input type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}'); return false;" /></span>
+			<select name="widget_list">
+				<!--@foreach($widget_list as $widget)-->
+				<option value="{$widget->widget}" <!--@if($widget->widget=='content')-->selected="selected"<!--@end-->>{$widget->title}</option>
+				<!--@end-->
+			</select>
+			<span class="btn"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
+		</div>
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+		<span class="btn"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
+	</div>
+</form>
 
 <div id="widgetButton" class="widgetButtons">
     <div class="widgetStyle"></div>
@@ -55,7 +43,7 @@
 
 <script type="text/javascript">
     var confirm_delete_msg = "{$lang->confirm_delete}";
-    xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div#xeAdmin').css('background-color','transparent');});
+    xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
 </script>
 
 <!--#include("../../widget/tpl/widget_layer.html")-->
diff --git a/modules/page/tpl/page_delete.html b/modules/page/tpl/page_delete.html
index 5612cc12c..265f765de 100644
--- a/modules/page/tpl/page_delete.html
+++ b/modules/page/tpl/page_delete.html
@@ -1,26 +1,30 @@
-<!--%import("filter/delete_page.xml")-->
-<!--%import("js/page_admin.js")-->
+<load target="js/page_admin.js" usecdn="true" />
 <!--#include("header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, delete_page)">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
-    <h4 class="xeAdmin">{$lang->confirm_delete}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->module_name}</div></th>
-        <td class="wide">{$module_info->mid}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->module}</div></th>
-        <td>{$module_info->module}</td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_delete}" /></span>
-            <a href="{getUrl('act','dispPageAdminContent')}" class="button"><span>{$lang->cmd_back}</span></a>
-        </th>
-    </tr>
-    </table>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="deletePage" action="./" method="post">
+	<input type="hidden" name="module" value="page" />
+	<input type="hidden" name="act" value="procPageAdminDelete" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
+    <h3 class="h3">{$lang->confirm_delete}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->module_name}</th>
+				<td >{$module_info->mid}</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->module}</th>
+				<td>{$module_info->module}</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_delete}" /></span>
+		<span class="btn"><a href="{getUrl('act','dispPageAdminContent')}">{$lang->cmd_back}</a></span>
+	</div>
 </form>
 
diff --git a/modules/page/tpl/page_info.html b/modules/page/tpl/page_info.html
index bf0a5eddf..6d5f0eacd 100644
--- a/modules/page/tpl/page_info.html
+++ b/modules/page/tpl/page_info.html
@@ -1,87 +1,138 @@
-<!--%import("filter/insert_page.xml")-->
 <!--#include("header.html")-->
 
-<form action="./" method="post" onsubmit="return procFilter(this, insert_page)" enctype="multipart/form-data">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->mid}</div></th>
-        <td colspan="3">
-            <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
-            <p>{$lang->about_mid}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->module_category}</div></th>
-        <td colspan="3">
-            <select name="module_category_srl">
-                <option value="0">{$lang->notuse}</option>
-                <!--@foreach($module_category as $key => $val)-->
-                <option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_module_category}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->browser_title}</div></th>
-        <td colspan="3">
-            <input type="text" name="browser_title" value="{$module_info->browser_title}"  class="inputTypeText w400" id="browser_title"/>
-            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-            <p>{$lang->about_browser_title}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->layout}</div></th>
-        <td colspan="3">
-            <select name="layout_srl">
-            <option value="0">{$lang->notuse}</option>
-            <!--@foreach($layout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_layout}</p>
-        </td>
-    </tr>
-	<tr>
-		<th scope="row"><div>{$lang->mobile_view}</div></th>
-		<td>
-			<input type="checkbox" name="use_mobile" value="Y" <!--@if($module_info->use_mobile == "Y")-->checked="checked"<!--@end--> />
-			<p>{$lang->about_mobile_view}</p>
-		</td>
-	</tr>
-    <tr>
-        <th scope="row"><div>{$lang->mobile_layout}</div></th>
-        <td>
-            <select name="mlayout_srl">
-            <option value="0">{$lang->notuse}</option>
-            <!--@foreach($mlayout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($module_info->mlayout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_layout}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->page_caching_interval}</div></th>
-        <td colspan="3">
-            <input type="text" name="page_caching_interval" value="{(int)$module_info->page_caching_interval}"  class="inputTypeText w40" /> {$lang->unit_min}
-            <p>{$lang->about_page_caching_interval}</p>
-        </td>
-    </tr>
-    <tr>
-        <th colspan="4" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-            <a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" onclick="window.open(this.href,'PageEdit','width=850,height=650,scrollbars=yes,resizable=yes,toolbars=no');return false;" class="button red"><span>{$lang->cmd_page_modify}</span></a>
-            <!--@if($module=="admin")-->
-            <a href="{getUrl('act','dispPageAdminContent','module_srl','')}" class="button"><span>{$lang->cmd_list}</span></a>
-            <!--@else-->
-            <a href="{getUrl('act','')}" class="button"><span>{$lang->cmd_back}</span></a>
-            <!--@end-->
-        </th>
-    </tr>
-    </table>
-
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="updatePage" action="./" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="page" />
+	<input type="hidden" name="act" value="procPageAdminUpdate" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row">{$lang->page_type}</th>
+				<td class="text">
+					{$lang->page_type_name[$module_info->page_type]}
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->mid}</th>
+				<td class="text">
+					<input type="text" name="page_name" value="{$module_info->mid}" />
+					<p>{$lang->about_mid}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->module_category}</th>
+				<td class="text">
+					<select name="module_category_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($module_category as $key => $val)-->
+						<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+					<p>{$lang->about_module_category}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->browser_title}</th>
+				<td class="text">
+					<input type="text" name="browser_title" value="{$module_info->browser_title}"  id="browser_title"/>
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+					<p>{$lang->about_browser_title}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->layout}</th>
+				<td class="text">
+					<select name="layout_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($layout_list as $key => $val)-->
+						<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+						<!--@end-->
+					</select>
+					<p>{$lang->about_layout}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->mobile_view}</th>
+				<td class="text">
+					<input type="checkbox" name="use_mobile" id="use_mobile" value="Y" <!--@if($module_info->use_mobile == "Y")-->checked="checked"<!--@end--> />
+					<label for="use_mobile">{$lang->about_mobile_view}</label>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row">{$lang->mobile_layout}</th>
+				<td class="text">
+					<select name="mlayout_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($mlayout_list as $key => $val)-->
+						<option value="{$val->layout_srl}" <!--@if($module_info->mlayout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+						<!--@end-->
+					</select>
+					<p>{$lang->about_layout}</p>
+				</td>
+			</tr>
+			<!--@if($module_info->page_type != 'ARTICLE')-->
+			<tr>
+				<th scope="row">{$lang->page_caching_interval}</th>
+				<td class="text">
+					<input type="text" name="page_caching_interval" value="{(int)$module_info->page_caching_interval}"  /> {$lang->unit_min}
+					<p>{$lang->about_page_caching_interval}</p>
+				</td>
+			</tr>
+			<!--@end-->
+			<!--@if($module_info->page_type == 'OUTSIDE')-->
+			<tr>
+				<th scope="row">{$lang->opage_path}</th>
+				<td class="text">
+					<input type="text" name="path" value="{htmlspecialchars($module_info->path)}"  />
+					<p>{$lang->about_opage_path}<b>{realpath("./")}</b></p>
+				</td>
+			</tr>
+			<tr class="row">
+				<th scope="row">{$lang->opage_mobile_path}</th>
+				<td class="text">
+					<input type="text" name="mpath" value="{htmlspecialchars($module_info->mpath)}"  />
+					<p>{$lang->about_opage_mobile_path}<b>{realpath("./")}</b></p>
+				</td>
+			</tr>
+			<!--@end-->
+			<!--@if($module_info->page_type == 'ARTICLE')-->
+			<tr>
+				<th scope="row">{$lang->skin}</th>
+				<td class="text">
+					<select name="skin">
+						<!--@foreach($skin_list as $key=>$val)-->
+						<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='default'))-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+					<p>{$lang->about_skin}</p>
+				</td>
+			</tr>
+			<tr class="optionnalData articleType">
+				<th scope="row">{$lang->mobile_skin}</th>
+				<td class="text">
+					<select name="mskin">
+						<!--@foreach($mskin_list as $key=>$val)-->
+						<option value="{$key}" <!--@if($module_info->mskin==$key ||(!$module_info->mskin && $key=='default'))-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+					</select>
+					<p>{$lang->about_skin}</p>
+				</td>
+			</tr>
+			<!--@end-->
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		<!--@if($module_info->page_type != 'OUTSIDE')-->
+		<span class="btn"><a href="{getUrl('','module','page','act','dispPageAdminContentModify','module_srl',$module_info->module_srl)}" onclick="window.open(this.href,'PageEdit','width=850,height=650,scrollbars=yes,resizable=yes,toolbars=no');return false;">{$lang->cmd_page_modify}</a></span>
+		<!--@end-->
+		<!--@if($module=="admin")-->
+		<span class="btn"><a href="{getUrl('act','dispPageAdminContent','module_srl','')}">{$lang->cmd_list}</a></span>
+		<!--@end-->
+	</div>
 </form>
diff --git a/modules/page/tpl/page_insert.html b/modules/page/tpl/page_insert.html
index 7ff68a748..7349b55f4 100644
--- a/modules/page/tpl/page_insert.html
+++ b/modules/page/tpl/page_insert.html
@@ -1,84 +1,155 @@
-<!--%import("filter/insert_page.xml")-->
+<!--%import("filter/insert_outside.xml")-->
 <!--#include("header.html")-->
 
-<form action="./" method="post" onsubmit="return procFilter(this, insert_page)" enctype="multipart/form-data">
-<input type="hidden" name="page" value="{$page}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-    <table cellspacing="0" class="rowTable topGap">
-    <!--@if($logged_info->is_admin!='Y')-->
-    <input type="hidden" name="mid" value="{$module_info->mid}" />
-    <!--@else-->
-    <tr class="row2">
-        <th scope="row"><div>{$lang->mid}</div></th>
-        <td colspan="3">
-            <input type="text" name="mid" value="{$module_info->mid}" class="inputTypeText w200" />
-            <p>{$lang->about_mid}</p>
-        </td>
-    </tr>
-    <!--@end-->
-    <tr class="row2">
-        <th scope="row"><div>{$lang->module_category}</div></th>
-        <td colspan="3">
-            <select name="module_category_srl">
-                <option value="0">{$lang->notuse}</option>
-                <!--@foreach($module_category as $key => $val)-->
-                <option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
-                <!--@end-->
-            </select>
-            <p>{$lang->about_module_category}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->browser_title}</div></th>
-        <td colspan="3">
-            <input type="text" name="browser_title" value="{$module_info->browser_title}"  class="inputTypeText w400" id="browser_title"/>
-            <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-            <p>{$lang->about_browser_title}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row"><div>{$lang->layout}</div></th>
-        <td colspan="3">
-            <select name="layout_srl">
-            <option value="0">{$lang->notuse}</option>
-            <!--@foreach($layout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_layout}</p>
-        </td>
-    </tr>
-	<tr>
-		<th scope="row"><div>{$lang->mobile_view}</div></th>
-		<td>
-			<input type="checkbox" name="use_mobile" value="Y" <!--@if($module_info->use_mobile == "Y")-->checked="checked"<!--@end--> />
-			<p>{$lang->about_mobile_view}</p>
-		</td>
-	</tr>
-    <tr>
-        <th scope="row"><div>{$lang->mobile_layout}</div></th>
-        <td>
-            <select name="mlayout_srl">
-            <option value="0">{$lang->notuse}</option>
-            <!--@foreach($mlayout_list as $key => $val)-->
-            <option value="{$val->layout_srl}" <!--@if($module_info->mlayout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_layout}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->page_caching_interval}</div></th>
-        <td colspan="3">
-            <input type="text" name="page_caching_interval" value="{(int)$module_info->caching_interval}"  class="inputTypeText w40" /> {$lang->unit_min}
-            <p>{$lang->about_page_caching_interval}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="4" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertPage" id="fo_insert_page" action="./" method="post" enctype="multipart/form-data">
+	<input type="hidden" name="module" value="page" />
+	<input type="hidden" name="act" value="procPageAdminInsert" />
+	<input type="hidden" name="page" value="{$page}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<!--@if($module_srl)-->
+			<tr>
+				<th scope="row">{$lang->page_type}</th>
+				<td class="text"></td>
+			</tr>
+			<!--@else-->
+			<tr>
+				<th scope="row">{$lang->page_type}</th>
+				<td class="text">
+					<select name="page_type">
+						<option value="">{$lang->click_choice}</option>
+						<option value="WIDGET">{$lang->page_type_name['WIDGET']}</option>
+						<option value="ARTICLE">{$lang->page_type_name['ARTICLE']}</option>
+						<option value="OUTSIDE">{$lang->page_type_name['OUTSIDE']}</option>
+						</select>
+					<p>{$lang->about_page_type}</p>
+					</td>
+				</tr>
+			<!--@end-->
+			<!--@if($logged_info->is_admin!='Y')-->
+			<input type="hidden" name="page_name" value="{$module_info->mid}" />
+			<!--@else-->
+			<tr>
+				<th scope="row">{$lang->mid}</th>
+				<td class="text">
+					<input type="text" name="page_name" value="{$module_info->mid}" />
+					<p>{$lang->about_mid}</p>
+					</td>
+				</tr>
+			<!--@end-->
+			<tr>
+				<th scope="row">{$lang->module_category}</th>
+				<td class="text">
+					<select name="module_category_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($module_category as $key => $val)-->
+						<option value="{$key}" <!--@if($module_info->module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+						</select>
+					<p>{$lang->about_module_category}</p>
+					</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->browser_title}</th>
+				<td class="text">
+					<input type="text" name="browser_title" value="{$module_info->browser_title}"  id="browser_title"/>
+					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
+					<p>{$lang->about_browser_title}</p>
+					</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->layout}</th>
+				<td class="text">
+					<select name="layout_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($layout_list as $key => $val)-->
+						<option value="{$val->layout_srl}" <!--@if($module_info->layout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+						<!--@end-->
+						</select>
+					<p>{$lang->about_layout}</p>
+					</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->mobile_view}</th>
+				<td class="text">
+					<input type="checkbox" name="use_mobile" id="use_mobile" value="Y" <!--@if($module_info->use_mobile == "Y")-->checked="checked"<!--@end--> />
+					<label for="use_mobile">{$lang->about_mobile_view}</label>
+					</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->mobile_layout}</th>
+				<td class="text">
+					<select name="mlayout_srl">
+						<option value="0">{$lang->notuse}</option>
+						<!--@foreach($mlayout_list as $key => $val)-->
+						<option value="{$val->layout_srl}" <!--@if($module_info->mlayout_srl==$val->layout_srl)-->selected="selected"<!--@end-->>{$val->title} ({$val->layout})</option>
+						<!--@end-->
+						</select>
+					<p>{$lang->about_layout}</p>
+					</td>
+				</tr>
+			<tr class="optionnalData widgetType outsideType">
+				<th scope="row">{$lang->page_caching_interval}</th>
+				<td class="text">
+					<input type="text" name="page_caching_interval" value="{(int)$module_info->caching_interval}"  /> {$lang->unit_min}
+					<p>{$lang->about_page_caching_interval}</p>
+					</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->skin}</th>
+				<td class="text">
+					<select name="skin">
+						<!--@foreach($skin_list as $key=>$val)-->
+						<option value="{$key}" <!--@if($module_info->skin==$key ||(!$module_info->skin && $key=='default'))-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+						</select>
+					<p>{$lang->about_skin}</p>
+					</td>
+				</tr>
+			<tr class="optionnalData articleType">
+				<th scope="row">{$lang->mobile_skin}</th>
+				<td class="text">
+					<select name="mskin">
+						<!--@foreach($mskin_list as $key=>$val)-->
+						<option value="{$key}" <!--@if($module_info->mskin==$key ||(!$module_info->mskin && $key=='default'))-->selected="selected"<!--@end-->>{$val->title}</option>
+						<!--@end-->
+						</select>
+					<p>{$lang->about_skin}</p>
+					</td>
+				</tr>
+			<tr>
+				<th scope="row">{$lang->opage_path}</th>
+				<td class="text">
+					<input type="text" name="path" value="{htmlspecialchars($module_info->path)}"  />
+					<p>{$lang->about_opage_path}<b>{realpath("./")}</b></p>
+					</td>
+				</tr>
+			<tr class="row optionnalData outsideType">
+				<th scope="row">{$lang->opage_mobile_path}</th>
+				<td class="text">
+					<input type="text" name="mpath" value="{htmlspecialchars($module_info->mpath)}"  />
+					<p>{$lang->about_opage_mobile_path}<b>{realpath("./")}</b></p>
+					</td>
+				</tr>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
 </form>
+<script type="text/javascript">
+(function($){
+	$('.optionnalData').hide();
+	$('select[name=page_type]').change(function(){
+		$('.optionnalData').hide();
+		var select = $('select[name=page_type] :selected').val();
+		if(select != ""){
+			$('.'+select.toLowerCase()+'Type').show();
+		}
+	});
+ })(jQuery);
+</script>
diff --git a/modules/page/tpl/page_mobile_content_modify.html b/modules/page/tpl/page_mobile_content_modify.html
index bcdff88e3..c3b95d248 100644
--- a/modules/page/tpl/page_mobile_content_modify.html
+++ b/modules/page/tpl/page_mobile_content_modify.html
@@ -1,13 +1,11 @@
 <!--%import("filter/insert_mpage_content.xml")-->
-<!--%import("js/page_admin.js")-->
-<!--%import("css/page.css")-->
+<load target="js/page_admin.js" usecdn="true" />
+<load target="css/page.css" usecdn="true" />
 
-<!--%import("../../widget/tpl/js/widget.js")-->
-<!--%import("../../widget/tpl/css/widget.css")-->
+<load target="../../widget/tpl/js/widget.js" usecdn="true" />
+<load target="../../widget/tpl/css/widget.css" usecdn="true" />
 
-<div class="clear"></div>
 <div id="zonePageContent">{$page_content}</div>
-<div class="clear"></div>
 <div class="adminLayer">
     <form action="./" method="post" id="pageFo" onsubmit="return doSubmitMPageContent(this);">
         <input type="hidden" name="mid" value="{$module_info->mid}" />
@@ -17,27 +15,19 @@
         <input type="hidden" name="content" value="{htmlspecialchars($content)}" />
 		<input type="hidden" name="type" value="mobile" />
 
-        <div class="buttonBox">
-
-            <div class="fl">
-                <span class="button black "><input type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox(); return false;" /></span>
-            </div>
-            <div class="fr">
+        <div class="btnArea">
+            <div class="etc">
+                <span class="btn"><input type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox(); return false;" /></span>
+                <span class="btn"><input type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}'); return false;" /></span>
                 <select name="widget_list">
                     <!--@foreach($widget_list as $widget)-->
                     <option value="{$widget->widget}" <!--@if($widget->widget=='content')-->selected="selected"<!--@end-->>{$widget->title}</option>
                     <!--@end-->
                 </select>
-                <span class="button blue"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
-                <span class="button green"><input type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}'); return false;" /></span>
+                <span class="btn"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
             </div>
-            <div class="buttonDiv"></div>
-            <div class="tRight">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}"/></span>
-                <span class="button red"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
-                <span class="button"><input type="button" value="{$lang->cmd_back}" onclick="location.href=current_url.setQuery('mid','{$module_info->mid}').setQuery('act','dispPageAdminMobileContent');return false;"/></span>
-            </div>
-        </div>
+			<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+			<span class="btn"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
     </form>
 </div>
 
@@ -56,7 +46,7 @@
 
 <script type="text/javascript">
     var confirm_delete_msg = "{$lang->confirm_delete}";
-    xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div#xeAdmin').css('background-color','transparent');});
+    xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
 </script>
 
 <!--#include("../../widget/tpl/widget_layer.html")-->
diff --git a/modules/point/conf/info.xml b/modules/point/conf/info.xml
index 8d8cabad2..255f8d638 100644
--- a/modules/point/conf/info.xml
+++ b/modules/point/conf/info.xml
@@ -1,72 +1,72 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">포인트 시스템</title>
-    <title xml:lang="zh-CN">积分系统</title>
-    <title xml:lang="jp">ポイントシステム</title>
-    <title xml:lang="en">Point System</title>
-    <title xml:lang="vi">Hệ thống điểm</title>
-    <title xml:lang="es">Sistema de Punto</title>
-    <title xml:lang="ru">Система поитов</title>
-    <title xml:lang="zh-TW">點數系統</title>
-    <title xml:lang="tr">Puanlama Sistemi</title>
-    <description xml:lang="ko">
-        글작성/삭제/댓글작성/삭제시에 포인트를 부여할 수 있습니다.
-        포인트마다 레벨을 지정하여 사용자 이름 앞에 아이콘을 표시할 수도 있습니다.
-        단 포인트 관련 애드온을 활성화 시키셔야 됩니다.
-    </description>
-    <description xml:lang="zh-CN">
-        可以在发表/删除新帖，发表/删除评论时，付与相应积分。
-        也可以以积分设置级别，并在用户名前显示级别图标。
-        必须是先激活积分系统才可以使用。
-    </description>
-    <description xml:lang="jp">
-        書き込み作成・削除/コメント作成・削除の活動に対するポイントを計算するシステムです。
-        ポイントごとレベルを指定してユーザ名の前にアイコンを表示させることが出来ます。
-        但し、ポイントシステムアドオンを「使用」に設定しないと作動しません。
-    </description>
-    <description xml:lang="en">
-        You can grant point on writing/deleting/adding comments/deleting comments.
-        You can also display point icon in front of user name by selecting level on each point.
-        But to enable these functions, you need to activate point related addons.
-    </description>
-    <description xml:lang="tr">
-        Yazmaya/silmeye, yorum eklemeye/yorum silmeye puan atayabilirsiniz.
-        Her puanın seviyesini seçerek, kullanıcı isimlerinin başında puan simgesi gösterebilirsiniz.
-        Bu özellikleri mümkün kılmak için, puanlamayla alakalı eklentileri etkinleştirmeniz gerekmektedir.
-    </description>
-    <description xml:lang="vi">
-        Bạn có thể cho hay trừ điểm của các thành viên khi Gửi bài, Xóa bài, Thêm bình luận, Xóa bình luận.
-        bạn cũng có thể cho phép hiển thị Icon của cấp độ điểm trước tên sử dụng bằng việc lụa chọn Icon cấp độ điểm.
-        Để kích hoạt chức năng này, bạn phải kích hoạt Addon Hệ thống điểm.
-    </description>
-    <description xml:lang="es">
-        Usted puede entregar puntos a las acciones de escribir/eliminar/agregar comentarios/eliminar comentarios.
-        Usted también puede mostrar el ícono de punto delande del nombre del usuario seleccionando el nivel sobre cada puntos.
-        Pero para activar esas funciones, Usted necesita activar addon relacionado a los puntos.
-    </description>
-    <description xml:lang="ru">
-        Вы можете назначать поинты за написание/удаление/добавление комментариев/удаление комментариев.
-        Вы также можете отображать икнку поинтов напротив имени пользователя, установив уровени для поинтов.
-        Но чтобы включить эти функции, Вам надо активировать аддоны, относящиеся к поинтам.
-    </description>
-    <description xml:lang="zh-TW">
-        可在發表/刪除評論時，付出相對應的點數。
-        也能以點數設置等級，並在用戶名稱前顯示等級圖示。
-        但是必須先啟用點數系統才能使用。
-    </description>
-    <version>0.1</version>
-    <date>2007-07-26</date>
-    <category>member</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">포인트 시스템</title>
+    <title xml:lang="zh-CN">积分系统</title>
+    <title xml:lang="jp">ポイントシステム</title>
+    <title xml:lang="en">Point System</title>
+    <title xml:lang="vi">Hệ thống điểm</title>
+    <title xml:lang="es">Sistema de Punto</title>
+    <title xml:lang="ru">Система поитов</title>
+    <title xml:lang="zh-TW">點數系統</title>
+    <title xml:lang="tr">Puanlama Sistemi</title>
+    <description xml:lang="ko">
+        글작성/삭제/댓글작성/삭제시에 포인트를 부여할 수 있습니다.
+        포인트마다 레벨을 지정하여 사용자 이름 앞에 아이콘을 표시할 수도 있습니다.
+        단 포인트 관련 애드온을 활성화 시키셔야 됩니다.
+    </description>
+    <description xml:lang="zh-CN">
+        可以在发表/删除新帖，发表/删除评论时，付与相应积分。
+        也可以以积分设置级别，并在用户名前显示级别图标。
+        必须是先激活积分系统才可以使用。
+    </description>
+    <description xml:lang="jp">
+        書き込み作成・削除/コメント作成・削除の活動に対するポイントを計算するシステムです。
+        ポイントごとレベルを指定してユーザ名の前にアイコンを表示させることが出来ます。
+        但し、ポイントシステムアドオンを「使用」に設定しないと作動しません。
+    </description>
+    <description xml:lang="en">
+        You can grant points for writing/deleting/adding contents or comments.
+        You can also display point icon in front of a user name by selecting level for each point.
+        But to enable these functions, you need to activate point related addons.
+    </description>
+    <description xml:lang="tr">
+        Yazmaya/silmeye, yorum eklemeye/yorum silmeye puan atayabilirsiniz.
+        Her puanın seviyesini seçerek, kullanıcı isimlerinin başında puan simgesi gösterebilirsiniz.
+        Bu özellikleri mümkün kılmak için, puanlamayla alakalı eklentileri etkinleştirmeniz gerekmektedir.
+    </description>
+    <description xml:lang="vi">
+        Bạn có thể cho hay trừ điểm của các thành viên khi Gửi bài, Xóa bài, Thêm bình luận, Xóa bình luận.
+        bạn cũng có thể cho phép hiển thị Icon của cấp độ điểm trước tên sử dụng bằng việc lụa chọn Icon cấp độ điểm.
+        Để kích hoạt chức năng này, bạn phải kích hoạt Addon Hệ thống điểm.
+    </description>
+    <description xml:lang="es">
+        Usted puede entregar puntos a las acciones de escribir/eliminar/agregar comentarios/eliminar comentarios.
+        Usted también puede mostrar el ícono de punto delande del nombre del usuario seleccionando el nivel sobre cada puntos.
+        Pero para activar esas funciones, Usted necesita activar addon relacionado a los puntos.
+    </description>
+    <description xml:lang="ru">
+        Вы можете назначать поинты за написание/удаление/добавление комментариев/удаление комментариев.
+        Вы также можете отображать икнку поинтов напротив имени пользователя, установив уровени для поинтов.
+        Но чтобы включить эти функции, Вам надо активировать аддоны, относящиеся к поинтам.
+    </description>
+    <description xml:lang="zh-TW">
+        可在發表/刪除評論時，付出相對應的點數。
+        也能以點數設置等級，並在用戶名稱前顯示等級圖示。
+        但是必須先啟用點數系統才能使用。
+    </description>
+    <version>0.1</version>
+    <date>2007-07-26</date>
+    <category>member</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/point/conf/module.xml b/modules/point/conf/module.xml
index 9f892b81c..e7ad161e5 100644
--- a/modules/point/conf/module.xml
+++ b/modules/point/conf/module.xml
@@ -3,13 +3,13 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispPointAdminConfig" type="view" admin_index="true" standalone="true" />
-        <action name="dispPointAdminModuleConfig" type="view" standalone="true" />
-        <action name="dispPointAdminPointList" type="view" standalone="true" />
+        <action name="dispPointAdminConfig" type="view" admin_index="true" menu_name="point" standalone="true" menu_index="true" />
+        <action name="dispPointAdminModuleConfig" type="view" standalone="true" menu_name="point" />
+        <action name="dispPointAdminPointList" type="view" standalone="true" menu_name="point" />
 
-        <action name="procPointAdminInsertConfig" type="controller" standalone="true" />
+        <action name="procPointAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
         <action name="procPointAdminInsertModuleConfig" type="controller" standalone="true" />
-        <action name="procPointAdminUpdatePoint" type="controller" standalone="true" />
+        <action name="procPointAdminUpdatePoint" type="controller" standalone="true" ruleset="updatePoint" />
         <action name="procPointAdminInsertPointModuleConfig" type="controller" standalone="true" />
         <action name="procPointAdminApplyPoint" type="controller" standalone="true" />
         <action name="procPointAdminReset" type="controller" standalone="true" />
@@ -17,4 +17,19 @@
         <action name="procPointAdminReCal" type="controller" standalone="true" />
         <action name="getMembersPointInfo" type="model" standalone="true" />
     </actions>
+	<menus>
+		<menu name="point">
+			<title xml:lang="en">Point</title>
+			<title xml:lang="ko">포인트</title>
+			<title xml:lang="zh-CN">Point</title>
+			<title xml:lang="jp">Point</title>
+			<title xml:lang="es">Point</title>
+			<title xml:lang="ru">Point</title>
+			<title xml:lang="fr">Point</title>
+			<title xml:lang="zh-TW">Point</title>
+			<title xml:lang="vi">Point</title>
+			<title xml:lang="mn">Point</title>
+			<title xml:lang="tr">Point</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/point/icons/default/0.gif b/modules/point/icons/default/0.gif
index 9fdbf26a7..359603476 100755
Binary files a/modules/point/icons/default/0.gif and b/modules/point/icons/default/0.gif differ
diff --git a/modules/point/icons/default/1.gif b/modules/point/icons/default/1.gif
index 14b24afb5..41048a0f1 100755
Binary files a/modules/point/icons/default/1.gif and b/modules/point/icons/default/1.gif differ
diff --git a/modules/point/icons/default/10.gif b/modules/point/icons/default/10.gif
index b8ce2fdea..e599a2d7a 100755
Binary files a/modules/point/icons/default/10.gif and b/modules/point/icons/default/10.gif differ
diff --git a/modules/point/icons/default/11.gif b/modules/point/icons/default/11.gif
index 795def313..7980a4100 100755
Binary files a/modules/point/icons/default/11.gif and b/modules/point/icons/default/11.gif differ
diff --git a/modules/point/icons/default/12.gif b/modules/point/icons/default/12.gif
index 21099e54e..842580e31 100755
Binary files a/modules/point/icons/default/12.gif and b/modules/point/icons/default/12.gif differ
diff --git a/modules/point/icons/default/13.gif b/modules/point/icons/default/13.gif
index 93e956e77..74e629d12 100755
Binary files a/modules/point/icons/default/13.gif and b/modules/point/icons/default/13.gif differ
diff --git a/modules/point/icons/default/14.gif b/modules/point/icons/default/14.gif
index 04e294bbd..0a7659f30 100755
Binary files a/modules/point/icons/default/14.gif and b/modules/point/icons/default/14.gif differ
diff --git a/modules/point/icons/default/15.gif b/modules/point/icons/default/15.gif
index c687defbd..1120a2dd2 100755
Binary files a/modules/point/icons/default/15.gif and b/modules/point/icons/default/15.gif differ
diff --git a/modules/point/icons/default/16.gif b/modules/point/icons/default/16.gif
index e927be162..20ea06fef 100755
Binary files a/modules/point/icons/default/16.gif and b/modules/point/icons/default/16.gif differ
diff --git a/modules/point/icons/default/17.gif b/modules/point/icons/default/17.gif
index 822cbd62a..6c439b13b 100755
Binary files a/modules/point/icons/default/17.gif and b/modules/point/icons/default/17.gif differ
diff --git a/modules/point/icons/default/18.gif b/modules/point/icons/default/18.gif
index 4b36c4a9b..6352899e7 100755
Binary files a/modules/point/icons/default/18.gif and b/modules/point/icons/default/18.gif differ
diff --git a/modules/point/icons/default/19.gif b/modules/point/icons/default/19.gif
index dd076afa2..5c9ec44ae 100755
Binary files a/modules/point/icons/default/19.gif and b/modules/point/icons/default/19.gif differ
diff --git a/modules/point/icons/default/2.gif b/modules/point/icons/default/2.gif
index 1863417b0..8dd3104e0 100755
Binary files a/modules/point/icons/default/2.gif and b/modules/point/icons/default/2.gif differ
diff --git a/modules/point/icons/default/20.gif b/modules/point/icons/default/20.gif
index 6ee91be2f..2334c9e92 100755
Binary files a/modules/point/icons/default/20.gif and b/modules/point/icons/default/20.gif differ
diff --git a/modules/point/icons/default/21.gif b/modules/point/icons/default/21.gif
index dbda98786..a4ac63a04 100755
Binary files a/modules/point/icons/default/21.gif and b/modules/point/icons/default/21.gif differ
diff --git a/modules/point/icons/default/22.gif b/modules/point/icons/default/22.gif
index bbf1ce7f4..73ebbe9aa 100755
Binary files a/modules/point/icons/default/22.gif and b/modules/point/icons/default/22.gif differ
diff --git a/modules/point/icons/default/23.gif b/modules/point/icons/default/23.gif
index 791a2bcea..04f6f1cd4 100755
Binary files a/modules/point/icons/default/23.gif and b/modules/point/icons/default/23.gif differ
diff --git a/modules/point/icons/default/24.gif b/modules/point/icons/default/24.gif
index 5fa028161..ce3afd8d7 100755
Binary files a/modules/point/icons/default/24.gif and b/modules/point/icons/default/24.gif differ
diff --git a/modules/point/icons/default/25.gif b/modules/point/icons/default/25.gif
index f4f9e0036..0c29e548d 100755
Binary files a/modules/point/icons/default/25.gif and b/modules/point/icons/default/25.gif differ
diff --git a/modules/point/icons/default/26.gif b/modules/point/icons/default/26.gif
index 6dc6db6cd..9d048204f 100755
Binary files a/modules/point/icons/default/26.gif and b/modules/point/icons/default/26.gif differ
diff --git a/modules/point/icons/default/27.gif b/modules/point/icons/default/27.gif
index f637f7b44..d63a58f63 100755
Binary files a/modules/point/icons/default/27.gif and b/modules/point/icons/default/27.gif differ
diff --git a/modules/point/icons/default/28.gif b/modules/point/icons/default/28.gif
index 3f58933d6..e57a79469 100755
Binary files a/modules/point/icons/default/28.gif and b/modules/point/icons/default/28.gif differ
diff --git a/modules/point/icons/default/29.gif b/modules/point/icons/default/29.gif
index 425f5ddb0..aeee8da06 100755
Binary files a/modules/point/icons/default/29.gif and b/modules/point/icons/default/29.gif differ
diff --git a/modules/point/icons/default/3.gif b/modules/point/icons/default/3.gif
index bab6835da..5b6cb9497 100755
Binary files a/modules/point/icons/default/3.gif and b/modules/point/icons/default/3.gif differ
diff --git a/modules/point/icons/default/30.gif b/modules/point/icons/default/30.gif
index 216791f19..6493f63d9 100755
Binary files a/modules/point/icons/default/30.gif and b/modules/point/icons/default/30.gif differ
diff --git a/modules/point/icons/default/4.gif b/modules/point/icons/default/4.gif
index 3b3924d0d..1b92db06b 100755
Binary files a/modules/point/icons/default/4.gif and b/modules/point/icons/default/4.gif differ
diff --git a/modules/point/icons/default/5.gif b/modules/point/icons/default/5.gif
index 4adae8ee4..cc7e8a745 100755
Binary files a/modules/point/icons/default/5.gif and b/modules/point/icons/default/5.gif differ
diff --git a/modules/point/icons/default/6.gif b/modules/point/icons/default/6.gif
index c124321d2..fa0c44285 100755
Binary files a/modules/point/icons/default/6.gif and b/modules/point/icons/default/6.gif differ
diff --git a/modules/point/icons/default/7.gif b/modules/point/icons/default/7.gif
index cb99dbdb2..47ba20be3 100755
Binary files a/modules/point/icons/default/7.gif and b/modules/point/icons/default/7.gif differ
diff --git a/modules/point/icons/default/8.gif b/modules/point/icons/default/8.gif
index de35d3082..e08367d61 100755
Binary files a/modules/point/icons/default/8.gif and b/modules/point/icons/default/8.gif differ
diff --git a/modules/point/icons/default/9.gif b/modules/point/icons/default/9.gif
index b4f0a1b0c..ab7452e06 100755
Binary files a/modules/point/icons/default/9.gif and b/modules/point/icons/default/9.gif differ
diff --git a/modules/point/lang/en.lang.php b/modules/point/lang/en.lang.php
deleted file mode 100644
index 77c4a731a..000000000
--- a/modules/point/lang/en.lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Default language pack of point module
-     **/
-
-    $lang->point = "Point"; 
-    $lang->level = "Level"; 
-
-    $lang->about_point_module = "You can grant points on writing/adding comments/uploading/downloading.";
-    $lang->about_act_config = "Each module like board/blog has its own actions such as \"writing/deleting/adding comments/deleting comments\".<br />You can just add act values to link modules with point system except board/blog.<br />Comma(,) will distinguish multiple values."; 
-
-    $lang->max_level = 'Max Level';
-    $lang->about_max_level = 'You may set the max level. Level icons should be considered and the level of 1000 is the maximum value you can set'; 
-
-    $lang->level_icon = 'Level Icon';
-    $lang->about_level_icon = 'Path of level icon is "./module/point/icons/[level].gif" and max level could be different with icon set. So please be careful'; 
-
-    $lang->point_name = 'Point Name';
-    $lang->about_point_name = 'You may give a name or unit for point'; 
-
-    $lang->level_point = 'Level Point';
-    $lang->about_level_point = 'Level will be adjusted when point gets to each level point or drops under each level point'; 
-
-    $lang->disable_download = 'Prohibit Downloads';
-    $lang->about_disable_download = "This will prohibit downloads when there are not enough points. (Exclude image files)"; 
-    $lang->disable_read_document = 'Prohibit Readings';
-    $lang->about_disable_read_document = 'Users will be unable to read articles when they do not have enough points';
-
-    $lang->level_point_calc = 'Point Calculation per Point';
-    $lang->expression = 'Please input Javascript formula by using level variable <b>i</b>. ex) Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = 'Calculate';
-    $lang->cmd_exp_reset = 'Reset';
-
-    $lang->cmd_point_recal = 'Reset Point';
-	$lang->about_cmd_point_recal = 'All point will be initialized only with articles/comments/attachments/join points.<br />Only members who do website activities will get signup points after reset.<br />Please use this function when complete initialization is required in case of data transferring or other situations.';
-
-    $lang->point_link_group = 'Group Change by Level';
-    $lang->point_group_reset_and_add = 'Reset adjusted groups and add new groups';
-    $lang->point_group_add_only = 'Only to new groups';
-    $lang->about_point_link_group = 'If you specify level for a specific group, users are assigned into the group when they adavnce to the level by getting points.';
-
-    $lang->about_module_point = "You can set point for each module and modules which don't have any value will use default point.<br />All point will be restored on acting reverse.";
-
-    $lang->point_signup = 'Signup';
-    $lang->point_insert_document = 'On Writing';
-    $lang->point_delete_document = 'On Deleting';
-    $lang->point_insert_comment = 'On Adding Comments';
-    $lang->point_delete_comment = 'On Deleting Comments';
-    $lang->point_upload_file = 'On Uploading';
-    $lang->point_delete_file = 'On Deleting Files';
-    $lang->point_download_file = 'On Downloading Files (Exclude images)';
-    $lang->point_read_document = 'On Reading';
-    $lang->point_voted = 'On Recommended';
-    $lang->point_blamed = 'On Accused';
-
-
-    $lang->cmd_point_config = 'Default Setting';
-    $lang->cmd_point_module_config = 'Module Setting';
-    $lang->cmd_point_act_config = 'Act Setting';
-    $lang->cmd_point_member_list = 'Member Point List';
-
-    $lang->msg_cannot_download = "You don't have enough point to download";
-    $lang->msg_disallow_by_point = "You need more points to read the article (You need %d, but you have %d)";
-
-    $lang->point_recal_message = 'Adjusting Point. (%d / %d)';
-    $lang->point_recal_finished = 'Point recalculation is finished.';
-?>
diff --git a/modules/point/lang/es.lang.php b/modules/point/lang/es.lang.php
deleted file mode 100644
index 6af8099c6..000000000
--- a/modules/point/lang/es.lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/point/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paqqete del idioma español del módulo de puntos
-     **/
-
-    $lang->point = "Punto"; 
-    $lang->level = "Nivel"; 
-
-    $lang->about_point_module = "Usted puede entregar puntos a las acciones de escribir/agregar comentarios/subir/descargar.";
-    $lang->about_act_config = "Cada módulo ya sea el tablero o blog tiene sus propias actiones como escribir/eliminar/agregar comentarios/eliminar comentarios/etc. <br />Usted puede añadir valores de actos para enlazar con sistema de módulo de puntos excepto el tablero y blog.<br />El enlace debe hacerse con una coma(,).";
-
-    $lang->max_level = 'Nivel Máximo';
-    $lang->about_max_level = 'Usted puede definir el nivel máximo. Los íconos del nivel deberan ser considerados y el nivel máximo de puntos límite es 1000';
-
-    $lang->level_icon = 'Iconos del nivel';
-    $lang->about_level_icon = 'Ruta de íconos del nivel es ./module/point/icons/[level].gif y el nivel máximo puede ser diferente con el conjunto de íconos. Tenga cuidado';
-
-    $lang->point_name = 'Nombre del punto';
-    $lang->about_point_name = 'Usted puede otorgar nombre o unidad de punto';
-
-    $lang->level_point = 'Nivel del punto';
-    $lang->about_level_point = 'El nivel sera ajustado cuando los puntos alcancen a cada nivel de puntos o cuando disminuyen a cada nivel de puntos';
-
-    $lang->disable_download = 'Prohibida la descarga';
-    $lang->about_disable_download = "Se prohibe la descarga de archivos al tener los puntos insuficientes.. (Excepto los archivos de imagen)";
-    $lang->disable_read_document = '글 열람 금지';
-    $lang->about_disable_read_document = '포인트가 없을 경우 글 열람을 금지하게 됩니다';
-
-    $lang->level_point_calc = 'Punto por punto cálculo';
-    $lang->expression = 'Por favor, de entrada mediante el uso de Javascript fórmula nivel variable <b> i </ b>. Ex) Math.pow (i, 2) * 90';
-    $lang->cmd_exp_calc = 'Calcular';
-    $lang->cmd_exp_reset = 'Restablecer';
-
-    $lang->cmd_point_recal = '포인트 초기화';
-    $lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.';
-
-    $lang->point_link_group = 'Grupo de cambio de nivel';
-    $lang->point_group_reset_and_add = '설정된 그룹 초기화 후 새 그룹 부여';
-    $lang->point_group_add_only = '새 그룹만 부여';
-    $lang->about_point_link_group = 'Si especifica nivel para un grupo específico, a los usuarios se les asigna en el grupo cuando se adavnce al nivel por conseguir puntos.';
-
-    $lang->about_module_point = "Usted puede definir los puntos para cada módulo y los módulos que no tengan ningun valor usarán punto predefinido.<br />Todos los puntos serán restituidos al actuar en forma contraria.";
-
-    $lang->point_signup = 'Fecha del';
-    $lang->point_insert_document = 'Al escribir documento';
-    $lang->point_delete_document = 'Al borrar documento';
-    $lang->point_insert_comment = 'Al agregar comentarios';
-    $lang->point_delete_comment = 'Al eliminar comentarios';
-    $lang->point_upload_file = 'Al subri archivos';
-    $lang->point_delete_file = 'Al borrar archivos';
-    $lang->point_download_file = 'Al descargar archivos (Excepto imágenes)';
-    $lang->point_read_document = 'El Reading';
-    $lang->point_voted = '추천 받음';
-    $lang->point_blamed = '비추천 받음';
-
-
-    $lang->cmd_point_config = 'Configuración predefinida';
-    $lang->cmd_point_module_config = 'Configuración del módulo';
-    $lang->cmd_point_act_config = 'Configuración de actos';
-    $lang->cmd_point_member_list = 'Lista de puntos del usuario';
-
-    $lang->msg_cannot_download = "No tiene puntos suficientes para descagar";
-    $lang->msg_disallow_by_point = "포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)";
-
-    $lang->point_recal_message = 'Ajuste de Punto. (%d / %d)';
-    $lang->point_recal_finished = 'Punto cálculo está acabado.';
-?>
diff --git a/modules/point/lang/fr.lang.php b/modules/point/lang/fr.lang.php
deleted file mode 100644
index 2da5826d2..000000000
--- a/modules/point/lang/fr.lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Point
-     **/
-
-    $lang->point = "Point"; 
-    $lang->level = "Niveau"; 
-
-    $lang->about_point_module = "Vous pouvez donnez des poins sur l'action d'écrire/d'ajouter commentaire/de télécharger vers le serveur/de télécharger vers le PC etc.";
-    $lang->about_act_config = "Chaque module comme celui de panneau ou de blogue a les actions propres comme \"écrire/supprimer/ajouter un commentaire/supprimer un commentaire\".<br />Vous pouvez ajouter seulement les valeurs des actions pour appliquer le Système de Point au module excepté celui de panneau ou de blogue.<br />Vous pouvez délimiter chaque valeur avec virgule(,)."; 
-
-    $lang->max_level = 'Niveau le plus haut';
-    $lang->about_max_level = 'Vous pouvez configurer le niveau le plus haut. Les icônes des niveaux doit être réflechissés et le niveau de 1 000 est la valeur maximum que vous pouvez configurer.'; 
-
-    $lang->level_icon = 'Icône de Niveau';
-    $lang->about_level_icon = 'Le Chemin d\'icône est "./module/point/icons/[niveau].gif" et le niveau le plus haut peut différer de l\'ensemble des icônes. Alors faites attention, S.V.P.'; 
-
-    $lang->point_name = 'Nom de Point';
-    $lang->about_point_name = 'Vous pouvez nommer le point ou configurer l\'unité du point'; 
-
-    $lang->level_point = 'Point de niveau';
-    $lang->about_level_point = 'Le Niveau sera ajusté quand le point devient les valeurs aux Points de Niveaux ci-dessous.'; 
-
-    $lang->disable_download = 'Interdire de télécharger';
-    $lang->about_disable_download = "Il est impossible de télécharger quand il n'y a pas de points suffisants. (Sauf les fichier d'images)"; 
-    $lang->disable_read_document = '글 열람 금지';
-    $lang->about_disable_read_document = '포인트가 없을 경우 글 열람을 금지하게 됩니다';
-
-    $lang->level_point_calc = 'Calcul des Points par Niveau';
-    $lang->expression = 'Entrez la formule en Javascript en utilisant la Variable de Niveau <b>i</b>. ex) Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = 'Calculer';
-    $lang->cmd_exp_reset = 'Restaurer';
-
-    $lang->cmd_point_recal = 'Restaurer le Point';
-	$lang->about_cmd_point_recal = 'Tous les points seront recalculés basé seulement sur les points des articles/commentaires/annexes/inscription.<br />Après la restauration, Les membres gagneront le point d\'inscription seulement quand il fait de l\'activité dans le site Web.<br />Utilisez cette fonction seulement quand l\'initialisation complète est necessaire comme le cas de transfert des données etc.';
-
-    $lang->point_link_group = 'Changement du Groupe lié à celui du Niveau';
-    $lang->point_group_reset_and_add = '설정된 그룹 초기화 후 새 그룹 부여';
-    $lang->point_group_add_only = '새 그룹만 부여';
-    $lang->about_point_link_group = 'Si vous designez un niveau à un groupe particulier, les utilisateur s sont assignés dans le groupe quand ils s\'avancent au groupe en gagnant des points.';
-
-    $lang->about_module_point = "Vous pouvez configurer les points pour chaque module. Le module qui n'a pas de valeurs utilisera les points par défaut.<br />Tous les points seront restaurés quand on fait de l'action inverse.";
-
-    $lang->point_signup = 'Inscription';
-    $lang->point_insert_document = 'Écrire';
-    $lang->point_delete_document = 'Supprimer';
-    $lang->point_insert_comment = 'Ajouter un Commentaire';
-    $lang->point_delete_comment = 'Supprimer un Commentaire';
-    $lang->point_upload_file = 'Télécharger les Fichiers sur Serveur';
-    $lang->point_delete_file = 'Supprimer un Fichier';
-    $lang->point_download_file = 'Télécharger les Fichiers sur PC(Sauf des images)';
-    $lang->point_read_document = 'lire';
-    $lang->point_voted = 'Être Recommandé';
-    $lang->point_blamed = 'Être Blâmé';
-
-
-    $lang->cmd_point_config = 'Configuration primaire';
-    $lang->cmd_point_module_config = 'Configuration du Module';
-    $lang->cmd_point_act_config = 'Configuration des Actions de chaque fonction';
-    $lang->cmd_point_member_list = 'Liste des Points des Membres';
-
-    $lang->msg_cannot_download = "Vous n'avez pas assez de point pour télécharger";
-    $lang->msg_disallow_by_point = "포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)";
-
-    $lang->point_recal_message = 'En train d\'Adjuster le Point. (%d / %d)';
-    $lang->point_recal_finished = 'Recalcul des Points est fini.';
-?>
diff --git a/modules/point/lang/jp.lang.php b/modules/point/lang/jp.lang.php
deleted file mode 100644
index 146418eff..000000000
--- a/modules/point/lang/jp.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ポイント（point）モジュールの基本言語パッケージ
-     **/
-
-    $lang->point = 'ポイント';
-    $lang->level = 'レベル';
-
-    $lang->about_point_module = 'ポイントモジュールでは、書き込み作成/コメント作成/アップロード/ダウンロードなどのユーザの活動に対してポイントの計算を行います。';
-    $lang->about_act_config = '掲示板、ブログなどのモジュールごとに「書き込み作成・削除/コメント作成・削除」などのアクションがあります。掲示板/ブログ以外のモジュールにポイントシステムを連動させたい場合は、各機能のアクションの「act値」を追加します。連動は半角「,（コンマ）」で区切って追加します。';
-
-    $lang->max_level = '最高レベル';
-    $lang->about_max_level = '最高レベルを指定することが出来ます。最高レベルは「1000」がマクシマムなので、レベルアイコンに注意が必要です。';
-
-    $lang->level_icon = 'レベルアイコン';
-    $lang->about_level_icon = 'レベルアイコンは、「./modules/point/icons/レベル.gif」で指定されるため、最高レベルとアイコンセットが異なる場合があります。ご注意下さい。';
-
-    $lang->point_name = 'ポイント名';
-    $lang->about_point_name = 'ポイントの名前、単位が指定出来ます。';
-
-    $lang->level_point = 'レベルポイント';
-    $lang->about_level_point = '下の各レベルのポイントが増加したり、減少するとレベルが調整されます。';
-
-    $lang->disable_download = 'ダウンロード禁止';
-    $lang->about_disable_download = 'チェックするとポイントがない場合、ダウンロードを禁止します（イメージファイル除外）。';
-    $lang->disable_read_document = '閲覧禁止';
-    $lang->about_disable_read_document = 'ポイントがない場合、閲覧を禁止します。';
-
-    $lang->level_point_calc = 'レベル別ポイント計算';
-    $lang->expression = 'レベル変数<b>i</b>を使用してJavaスクリプト数式を入力して下さい（例: Math.pow(i, 2) * 90）。';
-    $lang->cmd_exp_calc = '計算';
-    $lang->cmd_exp_reset = '初期化';
-
-    $lang->cmd_point_recal = 'ポイントの初期化';
-    $lang->about_cmd_point_recal = '書き込み/コメント/添付ファイル/会員登録のポイントのみ取り、全ての他のポイントを初期化します。<br />但し、会員登録ポイントは初期化後、該当会員の活動がスタートしたら付与されます。<br />データ移管などによるポイントを完全に初期化する必要がある場合など、利用は慎重に行なって下さい。';
-
-    $lang->point_link_group = 'グループ連動';
-    $lang->point_group_reset_and_add = '設定されたグループの初期化後、新規グループに付与';
-    $lang->point_group_add_only = '新規グループのみ付与';
-    $lang->about_point_link_group = 'グループにレベルを指定すると、該当レベルになったらグループが変更されます。';
-
-    $lang->about_module_point = 'モジュール別にポイントを指定することが出来ますが、指定されていないモジュールでは、デフォルトポイントが使用されます。すべてのポイント数は、反対のアクションを行った際には原状復帰されます。';
-
-    $lang->point_signup = '加入';
-    $lang->point_insert_document = '書き込み作成';
-    $lang->point_delete_document = '書き込み削除';
-    $lang->point_insert_comment = 'コメント作成';
-    $lang->point_delete_comment = 'コメント削除';
-    $lang->point_upload_file = 'アップロード';
-    $lang->point_delete_file = 'ファイル削除';
-    $lang->point_download_file = 'ダウンロード';
-    $lang->point_read_document = '書き込み閲覧';
-    $lang->point_voted = '推薦';
-    $lang->point_blamed = '非推薦';
-
-    $lang->cmd_point_config = 'デフォルト設定';
-    $lang->cmd_point_module_config = 'モジュール別設定';
-    $lang->cmd_point_act_config = '機能別アクション設定';
-    $lang->cmd_point_member_list = '会員ポイントリスト';
-
-    $lang->msg_cannot_download = 'ポイントが不足しているため、ダウンロード出来ません。';
-    $lang->msg_disallow_by_point = "ポイントが不足しているため、閲覧が出来ません。(必要ポイント : %d、 保有ポイント : %d)";
-
-    $lang->point_recal_message = 'ただ今ポイントを適用しています。 (%d / %d)';
-    $lang->point_recal_finished = 'ポイント再計算が完了しました。';
-?>
diff --git a/modules/point/lang/ko.lang.php b/modules/point/lang/ko.lang.php
deleted file mode 100644
index 685c0139e..000000000
--- a/modules/point/lang/ko.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  포인트 (point) 모듈의 기본 언어팩
-     **/
-
-    $lang->point = '포인트';
-    $lang->level = '레벨';
-
-    $lang->about_point_module = '포인트 모듈은 글 작성/댓글작성/업로드/다운로드 등의 행동을 할 때 포인트를 부여할 수 있게 합니다.';
-    $lang->about_act_config = '게시판, 블로그 등 각 모듈마다 글 작성/삭제/댓글작성/삭제 등의 action이 있습니다.<br />게시판/블로그 외에 다른 모듈에 포인트 기능 연동을 하고 싶을 때는 각 기능에 맞는 act값을 추가 하시면 됩니다.<br />연결은 ,(콤마)로 하시면 됩니다.';
-
-    $lang->max_level = '최고 레벨';
-    $lang->about_max_level = '최고레벨을 지정할 수 있습니다. 레벨 아이콘을 염두에 두셔야 하고 최고 레벨은 1000이 한계입니다.';
-
-    $lang->level_icon = '레벨 아이콘';
-    $lang->about_level_icon = '레벨 아이콘은 ./modules/point/icons/레벨.gif 로 지정되며 최고레벨과 아이콘셋이 다를 수 있으니 주의해주세요!';
-
-    $lang->point_name = '포인트 명칭';
-    $lang->about_point_name = '포인트 이름이나 단위를 정할 수 있습니다.';
-
-    $lang->level_point = '레벨 포인트';
-    $lang->about_level_point = '각 회원의 포인트가 아래 레벨별 포인트에 도달하거나 미달하게 되면 해당 회원의 레벨이 조절됩니다.';
-
-    $lang->disable_download = '다운로드 금지';
-    $lang->about_disable_download = '포인트가 부족할 경우 다운로드를 금지 합니다. (이미지 파일, 동영상 파일등 직접 링크가 가능한 파일들은 예외입니다.)';
-    $lang->disable_read_document = '글 열람 금지';
-    $lang->about_disable_read_document = '포인트가 부족할 경우 글 열람을 금지 합니다';
-
-    $lang->level_point_calc = '레벨별 포인트 계산';
-    $lang->expression = '레벨 변수 <b>i</b>를 사용하여 자바스크립트 수식을 입력하세요. 예: Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = '계산';
-    $lang->cmd_exp_reset = '초기화';
-
-    $lang->cmd_point_recal = '포인트 초기화';
-    $lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전 등을 하여 포인트를 완전히 초기화해야 할 경우에만 사용하세요.';
-
-    $lang->point_link_group = '그룹 연동';
-    $lang->point_group_reset_and_add = '설정된 그룹 초기화 후 새 그룹 부여';
-    $lang->point_group_add_only = '새 그룹만 부여';
-    $lang->about_point_link_group = '그룹에 원하는 레벨을 지정하면, 회원의 포인트가 해당 레벨의 포인트에 도달할 때 그룹이 변경됩니다.';
-
-    $lang->about_module_point = '모듈별 포인트를 지정할 수 있으며 지정되지 않은 모듈은 기본 포인트를 이용합니다.<br />모든 점수는 반대 행동을 하였을 경우 원상복구 됩니다.';
-
-    $lang->point_signup = '가입';
-    $lang->point_insert_document = '글 작성';
-    $lang->point_delete_document = '글 삭제';
-    $lang->point_insert_comment = '댓글 작성';
-    $lang->point_delete_comment = '댓글 삭제';
-    $lang->point_upload_file = '파일 업로드';
-    $lang->point_delete_file = '파일 삭제';
-    $lang->point_download_file = '파일 다운로드 (이미지 제외)';
-    $lang->point_read_document = '게시글 조회';
-    $lang->point_voted = '추천 받음';
-    $lang->point_blamed = '비추천 받음';
-
-    $lang->cmd_point_config = '기본 설정';
-    $lang->cmd_point_module_config = '모듈별 설정';
-    $lang->cmd_point_act_config = '기능별 act 설정';
-    $lang->cmd_point_member_list = '회원 포인트 목록';
-
-    $lang->msg_cannot_download = '포인트가 부족하여 다운로드를 하실 수 없습니다.';
-    $lang->msg_disallow_by_point = "포인트가 부족하여 글을 읽으실 수 없습니다. (필요한 포인트 : %d, 현재 포인트 : %d)";
-
-    $lang->point_recal_message = '포인트 적용중입니다. (%d / %d)';
-    $lang->point_recal_finished = '포인트 재계산이 완료되었습니다.';
-?>
diff --git a/modules/point/lang/lang.xml b/modules/point/lang/lang.xml
new file mode 100644
index 000000000..f404bf497
--- /dev/null
+++ b/modules/point/lang/lang.xml
@@ -0,0 +1,541 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="point">
+		<value xml:lang="ko"><![CDATA[포인트]]></value>
+		<value xml:lang="en"><![CDATA[Point]]></value>
+		<value xml:lang="jp"><![CDATA[ポイント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數]]></value>
+		<value xml:lang="ru"><![CDATA[Поинты]]></value>
+		<value xml:lang="es"><![CDATA[Punto]]></value>
+		<value xml:lang="tr"><![CDATA[Puan]]></value>
+		<value xml:lang="vi"><![CDATA[Điểm]]></value>
+	</item>
+	<item name="level">
+		<value xml:lang="ko"><![CDATA[레벨]]></value>
+		<value xml:lang="en"><![CDATA[Level]]></value>
+		<value xml:lang="jp"><![CDATA[レベル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[级别]]></value>
+		<value xml:lang="zh-TW"><![CDATA[等級]]></value>
+		<value xml:lang="fr"><![CDATA[Niveau]]></value>
+		<value xml:lang="ru"><![CDATA[Уровень]]></value>
+		<value xml:lang="es"><![CDATA[Nivel]]></value>
+		<value xml:lang="tr"><![CDATA[Seviye]]></value>
+		<value xml:lang="vi"><![CDATA[Cấp bậc]]></value>
+	</item>
+	<item name="about_point_module">
+		<value xml:lang="ko"><![CDATA[포인트 모듈은 글 작성/댓글작성/업로드/다운로드 등의 행동을 할 때 포인트를 부여할 수 있게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can grant points for writing/adding comments/uploading/downloading.]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントモジュールでは、書き込み作成/コメント作成/アップロード/ダウンロードなどのユーザーの活動に対してポイントの計算を行います。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分系统可以在发表新帖及评论，上传/下载文件等动作时，付与其相应的积分的模块。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數系統可以在發表/刪除主題，發表/刪除評論，上傳/下載/刪除/檔案等動作時，付出相對應的點數。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez donnez des poins sur l'action d'écrire/d'ajouter commentaire/de télécharger vers le serveur/de télécharger vers le PC etc.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете распределять поинты за написание/добавление комментариев, закачку/скачку файлов.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede entregar puntos a las acciones de escribir/agregar comentarios/subir/descargar.]]></value>
+		<value xml:lang="tr"><![CDATA[Yazmaya/silmeye, yorum eklemeye/yorum silmeye puan atayabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt mức điểm khi thành viên gửi, thêm bài viết, bình luận, Download, Upload.<br />Nhưng điểm chỉ có thể cho và tích lũy khi Addon điểm được kích hoạt.]]></value>
+	</item>
+	<item name="about_act_config">
+		<value xml:lang="ko"><![CDATA[게시판, 블로그 등 각 모듈마다 글 작성/삭제/댓글작성/삭제 등의 action이 있습니다. 게시판/블로그 외에 다른 모듈에 포인트 기능 연동을 하고 싶을 때는 각 기능에 맞는 act값을 추가 하시면 됩니다.<br />연결은 ,(콤마)로 하시면 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Each module like board/blog has its own actions such as "writing/deleting/adding comments/deleting comments". You can just add act values to link modules with point system except board/blog.<br />Comma (,) will distinguish multiple values.]]></value>
+		<value xml:lang="jp"><![CDATA[掲示板、ブログなどのモジュールごとに「書き込み作成・削除/コメント作成・削除」などのアクションがあります。掲示板/ブログ以外のモジュールにポイントシステムを連動させたい場合は、各機能のアクションの「act値」を追加します。連動は半角「,（コンマ）」で区切って追加します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版面，博客等模块都有发表/删除新帖，发表/删除评论等动作。 <br />要想与版面/博客之外的模块关联积分功能时，添加与其各模块功能相适合的act值即可。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[討論板，部落格等模組都有發表/刪除主題，發表/刪除評論等動作。 <br />想要與討論板/部落格之外的模組關聯點數功能時，新增與其各模組功能適合的act值即可。]]></value>
+		<value xml:lang="fr"><![CDATA[Chaque module comme celui de panneau ou de blogue a les actions propres comme "écrire/supprimer/ajouter un commentaire/supprimer un commentaire".<br />Vous pouvez ajouter seulement les valeurs des actions pour appliquer le Système de Point au module excepté celui de panneau ou de blogue.<br />Vous pouvez délimiter chaque valeur avec virgule(,).]]></value>
+		<value xml:lang="ru"><![CDATA[Каждый модуль, такой как форум/блог, имеет имеет свои действия, такие как"написание/удаление/добавление комментариев/удаление комментариев".<br />Вы можете просто добавить значения действий, чтобы связать ситему поинтов, за исключением форума/блога.<br />Запятая(,) используется как разделитель значений.]]></value>
+		<value xml:lang="es"><![CDATA[Cada módulo ya sea el tablero o blog tiene sus propias actiones como escribir/eliminar/agregar comentarios/eliminar comentarios/etc. <br />Usted puede añadir valores de actos para enlazar con sistema de módulo de puntos excepto el tablero y blog.<br />El enlace debe hacerse con una coma(,).]]></value>
+		<value xml:lang="tr"><![CDATA[Pano/blog gibi her modülün, "yazma/silme/yorum ekleme/yorum silme gibi kendi eylemleri bulunmaktadır. ".<br />Pano/blog harici, puan sistemli link modüllerine davranış değerleri ekleyebilirsiniz.<br />Virgül(,) çoklu değerleri ayıracaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Mỗi Module, Board hay Blog có một mức cho điểm khác nhau khi  "gửi bài, xóa bài, thêm bài, gửi bình luận, xóa bình luận".<br />Bạn có thể chỉ thêm những giá trị liên kết với hệ thống điểm vào mỗi Module Blog, Board.<br />Để thêm nhiều giá trị bằng cách sử dụng dấu (,) giữa các giá trị.]]></value>
+	</item>
+	<item name="max_level">
+		<value xml:lang="ko"><![CDATA[최고 레벨]]></value>
+		<value xml:lang="en"><![CDATA[Max Level]]></value>
+		<value xml:lang="jp"><![CDATA[最高レベル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最高级别]]></value>
+		<value xml:lang="zh-TW"><![CDATA[最高等級]]></value>
+		<value xml:lang="fr"><![CDATA[Niveau le plus haut]]></value>
+		<value xml:lang="ru"><![CDATA[Макс. уровень]]></value>
+		<value xml:lang="es"><![CDATA[Nivel Máximo]]></value>
+		<value xml:lang="tr"><![CDATA[Azami Seviye]]></value>
+		<value xml:lang="vi"><![CDATA[Cấp bậc lớn nhất]]></value>
+	</item>
+	<item name="about_max_level">
+		<value xml:lang="ko"><![CDATA[최고레벨을 지정할 수 있습니다. 레벨 아이콘을 염두에 두셔야 하고 최고 레벨은 1000이 한계입니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may set the max level. Level icons should be considered and the level of 1000 is the maximum value you can set]]></value>
+		<value xml:lang="jp"><![CDATA[最高レベルを指定することができます。最高レベルは「1000」が最大値であるため、レベルアイコンに注意が必要です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定最高级别。级别共设1000级，因此制作级别图标时要好好考虑一下。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以指定最高等級。等級共設1000級，因此製作等級圖示時要好好考慮一下。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer le niveau le plus haut. Les icônes des niveaux doit être réflechissés et le niveau de 1 000 est la valeur maximum que vous pouvez configurer.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить максимальный уровень. Иконки уровней должны быть присвоены. (макс. значение равно 1000)]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede definir el nivel máximo. Los íconos del nivel deberan ser considerados y el nivel máximo de puntos límite es 1000]]></value>
+		<value xml:lang="tr"><![CDATA[Azami seviyeyi ayarlayabilirsiniz. Seviye simgelerine değer verirken dikkate alınmalıdır. Verebileceğiniz en yüksek değer 1000dir.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể quy định cấp bậc lớn nhất. Kiểm tra lại Icon của cấp bậc, và bạn có thể đặt cấp bậc tối đa là 1000.]]></value>
+	</item>
+	<item name="level_icon">
+		<value xml:lang="ko"><![CDATA[레벨 아이콘]]></value>
+		<value xml:lang="en"><![CDATA[Level Icon]]></value>
+		<value xml:lang="jp"><![CDATA[レベルアイコン]]></value>
+		<value xml:lang="zh-CN"><![CDATA[级别图标]]></value>
+		<value xml:lang="zh-TW"><![CDATA[等級圖示]]></value>
+		<value xml:lang="fr"><![CDATA[Icône de Niveau]]></value>
+		<value xml:lang="ru"><![CDATA[Иконка уровня]]></value>
+		<value xml:lang="es"><![CDATA[Iconos del nivel]]></value>
+		<value xml:lang="tr"><![CDATA[Seviye Simgesi]]></value>
+		<value xml:lang="vi"><![CDATA[Icon của cấp bậc]]></value>
+	</item>
+	<item name="about_level_icon">
+		<value xml:lang="ko"><![CDATA[레벨 아이콘은 ./modules/point/icons/레벨.gif 로 지정되며 최고레벨과 아이콘셋이 다를 수 있으니 주의해주세요!]]></value>
+		<value xml:lang="en"><![CDATA[Path of level icon is "./module/point/icons/[level].gif" and max level could be different with icon set. So please be careful]]></value>
+		<value xml:lang="jp"><![CDATA[レベルアイコンは、「./modules/point/icons/レベル.gif」で指定されるため、最高レベルとアイコンセットが異なる場合があります。ご注意ください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[级别图标要以 ./modules/point/icons/级别.gif形式指定，有时出现最高级别的图标跟您指定的最高级别图标不同的现象，敬请注意。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[等級圖示格式與位置 ./modules/point/icons/等級.gif，請注意，有時出現最高等級的圖示跟您指定的最高等級圖示不同的現象。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Chemin d'icône est "./module/point/icons/[niveau].gif" et le niveau le plus haut peut différer de l'ensemble des icônes. Alors faites attention, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Путь иконок уровней "./module/point/icons/[level].gif" и максимальный уровень может меняться с набором иконок. Поэтому будте осторожны]]></value>
+		<value xml:lang="es"><![CDATA[Ruta de íconos del nivel es ./module/point/icons/[level].gif y el nivel máximo puede ser diferente con el conjunto de íconos. Tenga cuidado]]></value>
+		<value xml:lang="tr"><![CDATA[Seviye simgesi yolu "./module/point/icons/[seviye].gif" olmalıdır. Azami seviye farklı simge setiyle gösterilebilir. Bu yüzden lütfen dikkatli olunuz.]]></value>
+		<value xml:lang="vi"><![CDATA[Thư mục chứa Icon của cấp bậc có dạng "./module/point/icons/[level].gif" và cấp độ lớn nhất có thể khác với bộ Icon hiện tại. Vì vậy xin hãy cẩn thận.]]></value>
+	</item>
+	<item name="point_name">
+		<value xml:lang="ko"><![CDATA[포인트 명칭]]></value>
+		<value xml:lang="en"><![CDATA[Point Name]]></value>
+		<value xml:lang="jp"><![CDATA[ポイント名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分名]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Point]]></value>
+		<value xml:lang="ru"><![CDATA[Имя поинта]]></value>
+		<value xml:lang="es"><![CDATA[Nombre del punto]]></value>
+		<value xml:lang="tr"><![CDATA[Puan Adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên điểm]]></value>
+	</item>
+	<item name="about_point_name">
+		<value xml:lang="ko"><![CDATA[포인트 이름이나 단위를 정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may give a name or unit to a point]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントの名前、単位を指定できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定积分名或积分单位。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可指定點數名稱或點數單位。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez nommer le point ou configurer l'unité du point]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете дать имя или единицу измерения для поинта]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede otorgar nombre o unidad de punto]]></value>
+		<value xml:lang="tr"><![CDATA[Puan için bir isim veya birim belirleyebilirsiniz]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt tên hay đặt một giá trị nào đó cho điểm.]]></value>
+	</item>
+	<item name="level_point">
+		<value xml:lang="ko"><![CDATA[레벨 포인트]]></value>
+		<value xml:lang="en"><![CDATA[Level Point]]></value>
+		<value xml:lang="jp"><![CDATA[レベルポイント]]></value>
+		<value xml:lang="zh-CN"><![CDATA[级别积分]]></value>
+		<value xml:lang="zh-TW"><![CDATA[等級點數]]></value>
+		<value xml:lang="fr"><![CDATA[Point de niveau]]></value>
+		<value xml:lang="ru"><![CDATA[Уровень поинтов]]></value>
+		<value xml:lang="es"><![CDATA[Nivel del punto]]></value>
+		<value xml:lang="tr"><![CDATA[Seviye Puanı]]></value>
+		<value xml:lang="vi"><![CDATA[Điểm thăng cấp]]></value>
+	</item>
+	<item name="about_level_point">
+		<value xml:lang="ko"><![CDATA[각 회원의 포인트가 아래 레벨별 포인트에 도달하거나 미달하게 되면 해당 회원의 레벨이 조절됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Level will be adjusted when point gets to each level point or drops under each level point]]></value>
+		<value xml:lang="jp"><![CDATA[下の各レベルのポイントが増加したり、減少するとレベルが調整されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分达到或减少到下列各级别所设置的积分值时，将会自动调节相应级别。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數達到或減少到下列各等級所設置的點數時，將會自動調節相對應等級。]]></value>
+		<value xml:lang="fr"><![CDATA[Le Niveau sera ajusté quand le point devient les valeurs aux Points de Niveaux ci-dessous.]]></value>
+		<value xml:lang="ru"><![CDATA[Уровень будет изменен, когда поинты достигают каждого уровня поинтов или падают ниже его]]></value>
+		<value xml:lang="es"><![CDATA[El nivel sera ajustado cuando los puntos alcancen a cada nivel de puntos o cuando disminuyen a cada nivel de puntos]]></value>
+		<value xml:lang="tr"><![CDATA[Puan herhangi bir seviyeye gelince veya bir puan seviyesinin altına düşünce, seviye otomatik ayarlanacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Cấp độ sẽ được thay đổi khi đạt tới số điểm giới hạn.]]></value>
+	</item>
+	<item name="disable_download">
+		<value xml:lang="ko"><![CDATA[다운로드 금지]]></value>
+		<value xml:lang="en"><![CDATA[Prohibit Downloads]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード禁止]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止下载]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁止下載]]></value>
+		<value xml:lang="fr"><![CDATA[Interdire de télécharger]]></value>
+		<value xml:lang="ru"><![CDATA[Запретить скачивание]]></value>
+		<value xml:lang="es"><![CDATA[Prohibida la descarga]]></value>
+		<value xml:lang="tr"><![CDATA[İndirmeleri Yasakla]]></value>
+		<value xml:lang="vi"><![CDATA[Cấm Download]]></value>
+	</item>
+	<item name="about_disable_download">
+		<value xml:lang="ko"><![CDATA[포인트가 부족할 경우 다운로드를 금지 합니다. (이미지 파일, 동영상 파일등 직접 링크가 가능한 파일들은 예외입니다.)]]></value>
+		<value xml:lang="en"><![CDATA[This will prohibit downloads when there are not enough points. (Exclude image files)]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れるとポイントがない場合、ダウンロードを禁止します（イメージファイル除外）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有积分时，将禁止下载。 (图片除外)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有點數時，將禁止下載。(圖片除外)]]></value>
+		<value xml:lang="fr"><![CDATA[Il est impossible de télécharger quand il n'y a pas de points suffisants. (Sauf les fichier d'images)]]></value>
+		<value xml:lang="ru"><![CDATA[Это запретит скачивание файлов, когда не хватает достаточного кол-ва поинтов. (За исключением файлов изображений)]]></value>
+		<value xml:lang="es"><![CDATA[Se prohibe la descarga de archivos al tener los puntos insuficientes.. (Excepto los archivos de imagen)]]></value>
+		<value xml:lang="tr"><![CDATA[Yeterli puan olmadığı zaman indirme yapamayacaklardır. (Resim dosyaları harici)]]></value>
+		<value xml:lang="vi"><![CDATA[Điều này sẽ cấm thành viên Download khi không đủ điểm. (Ngoại trừ File hình ảnh)]]></value>
+	</item>
+	<item name="disable_read_document">
+		<value xml:lang="ko"><![CDATA[글 열람 금지]]></value>
+		<value xml:lang="en"><![CDATA[Prohibit Readings]]></value>
+		<value xml:lang="jp"><![CDATA[閲覧禁止]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止查看主题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁止閱讀文章]]></value>
+		<value xml:lang="tr"><![CDATA[Okumayı Yasakla]]></value>
+		<value xml:lang="vi"><![CDATA[Cấm đọc bài]]></value>
+	</item>
+	<item name="about_disable_read_document">
+		<value xml:lang="ko"><![CDATA[포인트가 부족할 경우 글 열람을 금지 합니다]]></value>
+		<value xml:lang="en"><![CDATA[Users will be unable to read articles when they do not have enough points]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントがない場合、閲覧を禁止します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有积分时，将禁止查看主题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有點數時，將禁止閱讀文章。]]></value>
+		<value xml:lang="fr"><![CDATA[포인트가 없을 경우 글 열람을 금지하게 됩니다]]></value>
+		<value xml:lang="ru"><![CDATA[포인트가 없을 경우 글 열람을 금지하게 됩니다]]></value>
+		<value xml:lang="es"><![CDATA[포인트가 없을 경우 글 열람을 금지하게 됩니다]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanıcıların yeterli puanı olmadığında, makaleleri okuyamayacaklardır.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu số điểm không đủ, thành viên sẽ không thể đọc được bài viết.]]></value>
+	</item>
+	<item name="level_point_calc">
+		<value xml:lang="ko"><![CDATA[레벨별 포인트 계산]]></value>
+		<value xml:lang="en"><![CDATA[Point Calculation per Point]]></value>
+		<value xml:lang="jp"><![CDATA[レベル別ポイント計算]]></value>
+		<value xml:lang="zh-CN"><![CDATA[计算级别积分]]></value>
+		<value xml:lang="zh-TW"><![CDATA[計算等級點數]]></value>
+		<value xml:lang="fr"><![CDATA[Calcul des Points par Niveau]]></value>
+		<value xml:lang="es"><![CDATA[Punto por punto cálculo]]></value>
+		<value xml:lang="tr"><![CDATA[Puan başına Puan Hesaplaması]]></value>
+		<value xml:lang="vi"><![CDATA[Tính toán trên điểm]]></value>
+	</item>
+	<item name="expression">
+		<value xml:lang="ko"><![CDATA[레벨 변수 <b>i</b>를 사용하여 자바스크립트 수식을 입력하세요. 예: Math.pow(i, 2) * 90]]></value>
+		<value xml:lang="en"><![CDATA[Please input Javascript formula by using level variable <b>i</b>. ex) Math.pow(i, 2) * 90]]></value>
+		<value xml:lang="jp"><![CDATA[レベル変数<b>i</b>を使用してJavaスクリプト数式を入力してください（例: Math.pow(i, 2) * 90）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用级别变数<b>"i"</b>输入JS数学函数。例: Math.pow(i, 2) * 90]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用等級變數<b>"i"</b>輸入JS數學函數。例: Math.pow(i,2) * 90]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez la formule en Javascript en utilisant la Variable de Niveau <b>i</b>. ex) Math.pow(i, 2) * 90]]></value>
+		<value xml:lang="es"><![CDATA[Por favor, de entrada mediante el uso de Javascript fórmula nivel variable <b> i </ b>. Ex) Math.pow (i, 2) * 90]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen seviye değişkenini kullanarak Javascript formülü ekleyiniz <b></b>. örn) Math.pow(i, 2) * 90]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập công thức cần sử dụng <b>i</b>. Ví dụ: Math.pow(i, 2) * 90]]></value>
+	</item>
+	<item name="cmd_exp_calc">
+		<value xml:lang="ko"><![CDATA[계산]]></value>
+		<value xml:lang="en"><![CDATA[Calculate]]></value>
+		<value xml:lang="jp"><![CDATA[計算]]></value>
+		<value xml:lang="zh-CN"><![CDATA[计算]]></value>
+		<value xml:lang="zh-TW"><![CDATA[計算]]></value>
+		<value xml:lang="fr"><![CDATA[Calculer]]></value>
+		<value xml:lang="es"><![CDATA[Calcular]]></value>
+		<value xml:lang="tr"><![CDATA[Hesapla]]></value>
+		<value xml:lang="vi"><![CDATA[Tính toán]]></value>
+	</item>
+	<item name="cmd_exp_reset">
+		<value xml:lang="ko"><![CDATA[초기화]]></value>
+		<value xml:lang="en"><![CDATA[Reset]]></value>
+		<value xml:lang="jp"><![CDATA[初期化]]></value>
+		<value xml:lang="zh-CN"><![CDATA[初始化]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重置]]></value>
+		<value xml:lang="fr"><![CDATA[Restaurer]]></value>
+		<value xml:lang="es"><![CDATA[Restablecer]]></value>
+		<value xml:lang="tr"><![CDATA[Sıfırla]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập lại]]></value>
+	</item>
+	<item name="cmd_point_recal">
+		<value xml:lang="ko"><![CDATA[포인트 초기화]]></value>
+		<value xml:lang="en"><![CDATA[Reset Point]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントの初期化]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分初始化]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重置點數]]></value>
+		<value xml:lang="fr"><![CDATA[Restaurer le Point]]></value>
+		<value xml:lang="tr"><![CDATA[Puan Sıfırla]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập lại điểm]]></value>
+	</item>
+	<item name="about_cmd_point_recal">
+		<value xml:lang="ko"><![CDATA[게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화합니다. 회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다. 데이터 이전 등을 하여 포인트를 완전히 초기화해야 할 경우에만 사용하세요.]]></value>
+		<value xml:lang="en"><![CDATA[All point will be initialized only with articles/comments/attachments/join points. Only members who do website activities will get signup points after reset. Please use this function when complete initialization is required in case of data transferring or other situations.]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み/コメント/添付ファイル/会員登録のポイントのみを利用し、すべての他のポイントを初期化します。<br />会員登録ポイントは、初期化後に該当会員の活動がスタートしたときにポイントが付けられます。<br />データ移転などによるポイントを完全に初期化するのみ使用し、利用は慎重に行ってください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分初始化。即只保留文章/评论/附件/新会员注册的相关积分项。<br />其中，初始化后的新会员注册积分项，将在会员有相关动作(发表主题/评论等)时，才付与其相应的积分。<br />此项功能请务必慎用！此项功能只能在数据转移或真的需要初始化所有积分时才可以使用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重置點數。即只保留文章/評論/附加檔案/新會員註冊的相關點數項目。<br />其中，重置後的新會員註冊點數，將在會員有相關動作(例如:發表主題/評論等)時，才付與其相對應的點數。<br />此項功能請務必慎用！此項功能只能在資料轉移或真的需要重置所有點數時才可以使用。]]></value>
+		<value xml:lang="fr"><![CDATA[Tous les points seront recalculés basé seulement sur les points des articles/commentaires/annexes/inscription.<br />Après la restauration, Les membres gagneront le point d'inscription seulement quand il fait de l'activité dans le site Web.<br />Utilisez cette fonction seulement quand l'initialisation complète est necessaire comme le cas de transfert des données etc.]]></value>
+		<value xml:lang="ru"><![CDATA[게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.]]></value>
+		<value xml:lang="es"><![CDATA[게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece makalelerdeki/yorumlardaki/eklerdeki/katılımlardaki tüm puanlar sıfırlanacaktır.<br />Sıfırlamadan sonra sadece, website aktiviteleri yapan üyeler, giriş puanı alacaklardır.<br />Lütfen bu özelliği sadece veri taşıma veya cidden gerekliliği olduğu durumlarda kullanınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Điểm chỉ có thể có được khi gửi bài, bình luận, đính kèm và khi đăng kí.<br />Chỉ có thể thiết lập lại điểm của những thành viên đã đăng kí là thành viên.<br />Xin hãy chỉ sử dụng chức năng này khi bạn chuyển nội dung của Website qua một Website khác.]]></value>
+	</item>
+	<item name="point_link_group">
+		<value xml:lang="ko"><![CDATA[그룹 연동]]></value>
+		<value xml:lang="en"><![CDATA[Group Change by Level]]></value>
+		<value xml:lang="jp"><![CDATA[グループ連動]]></value>
+		<value xml:lang="zh-CN"><![CDATA[用户组绑定]]></value>
+		<value xml:lang="zh-TW"><![CDATA[自動升級]]></value>
+		<value xml:lang="fr"><![CDATA[Changement du Groupe lié à celui du Niveau]]></value>
+		<value xml:lang="es"><![CDATA[Grupo de cambio de nivel]]></value>
+		<value xml:lang="tr"><![CDATA[Seviyeye Göre Grup Değiştirme]]></value>
+		<value xml:lang="vi"><![CDATA[Chuyển nhóm với cấp độ]]></value>
+	</item>
+	<item name="point_group_reset_and_add">
+		<value xml:lang="ko"><![CDATA[설정된 그룹 초기화 후 새 그룹 부여]]></value>
+		<value xml:lang="en"><![CDATA[Reset adjusted groups and add new groups]]></value>
+		<value xml:lang="jp"><![CDATA[設定されたグループを初期化後に新規グループに付与]]></value>
+		<value xml:lang="zh-CN"><![CDATA[初始化已有用户组重新设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重新調整與新增群組]]></value>
+		<value xml:lang="tr"><![CDATA[Düzenlenmiş grupları sıfırla ve yeni gruplar ekle]]></value>
+		<value xml:lang="vi"><![CDATA[Điểm số để thăng cấp cho nhóm mới.]]></value>
+	</item>
+	<item name="point_group_add_only">
+		<value xml:lang="ko"><![CDATA[새 그룹만 부여]]></value>
+		<value xml:lang="en"><![CDATA[Only to new groups]]></value>
+		<value xml:lang="jp"><![CDATA[新規グループのみ付与]]></value>
+		<value xml:lang="zh-CN"><![CDATA[只应用到新用户组]]></value>
+		<value xml:lang="zh-TW"><![CDATA[只限新群組]]></value>
+		<value xml:lang="tr"><![CDATA[Sadece yeni gruplara]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ cấp cho nhóm mới]]></value>
+	</item>
+	<item name="about_point_link_group">
+		<value xml:lang="ko"><![CDATA[그룹에 원하는 레벨을 지정하면, 회원의 포인트가 해당 레벨의 포인트에 도달할 때 그룹이 변경됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[If you specify level for a specific group, users are assigned into the group when they advance to the level by getting points.]]></value>
+		<value xml:lang="jp"><![CDATA[グループにレベルを指定すると、該当レベルになったときにグループが変更されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[即级别绑定用户组。当级别达到指定级别时，会员所属用户组将自动更新为与其相对应的用户组。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[即群組隨等級變化。當等級達到指定等級時，會員所屬群組將自動更新成相對應的群組。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous designez un niveau à un groupe particulier, les utilisateur s sont assignés dans le groupe quand ils s'avancent au groupe en gagnant des points.]]></value>
+		<value xml:lang="ru"><![CDATA[그룹에 원하는 레벨을 지정하면 해당 레벨에 도달할때 그룹이 변경됩니다.]]></value>
+		<value xml:lang="es"><![CDATA[Si especifica nivel para un grupo específico, a los usuarios se les asigna en el grupo cuando se adavnce al nivel por conseguir puntos.]]></value>
+		<value xml:lang="tr"><![CDATA[Belirli bir grup için seviye belirliyorsanız, kullanıcılar gruba o seviyenin puanına eriştiklerinde atanacaklardır.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn đặt cấp độ cho một nhóm đặc biệt nào đó, người sử dụng trong nhóm đó khi đạt đến số điểm giới hạn sẽ tự động được chuyển sang nhóm mới.]]></value>
+	</item>
+	<item name="about_module_point">
+		<value xml:lang="ko"><![CDATA[모듈별 포인트를 지정할 수 있으며 지정되지 않은 모듈은 기본 포인트를 이용합니다. 모든 점수는 반대 행동을 하였을 경우 원상복구 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can set point for each module, and modules which don't have any value will use the default point. All points will be restored on acting reverse.]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール別にポイントを指定することができますが、指定されていないモジュールには、デフォルトポイントが使用されます。すべてのポイントは、反対の行動の行った場合に元に戻ります。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以分别对各模块进行积分设置，没有被设置的模块将使用默认值。<br />所有积分在相反动作下恢复原始值。即：发表新帖后再删除得到的积分为0分。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[可以分別對各模組進行點數設置，沒有設置的模組將使用預設值。<br />所有動作在反向操作下將恢復原始值。即：發表主題後再刪除得到的點數為零。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez configurer les points pour chaque module. Le module qui n'a pas de valeurs utilisera les points par défaut.<br />Tous les points seront restaurés quand on fait de l'action inverse.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установть поинты для каждого модуля, а модули, не имеющие значения будут использовать значение по умолчанию для поинтов.<br />Все поинты будут восстановлены при обратном действии.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede definir los puntos para cada módulo y los módulos que no tengan ningun valor usarán punto predefinido.<br />Todos los puntos serán restituidos al actuar en forma contraria.]]></value>
+		<value xml:lang="tr"><![CDATA[Her modül için puan ayarlayabilirsiniz. Hiçbir değer atanmayan modüller varsayılan puan sistemini kullanacaktır.<br />Tersi hareket durumunda tüm puanlar iade edilecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt thang điểm riêng cho mỗi Module, Module nào không được đặt sẽ sử dụng sự thiết lập mặc định.<br />Tất cả điểm sẽ khác khi sử dụng chức năng này.]]></value>
+	</item>
+	<item name="point_signup">
+		<value xml:lang="ko"><![CDATA[가입]]></value>
+		<value xml:lang="en"><![CDATA[Sign up]]></value>
+		<value xml:lang="jp"><![CDATA[加入]]></value>
+		<value xml:lang="zh-CN"><![CDATA[注册]]></value>
+		<value xml:lang="zh-TW"><![CDATA[註冊]]></value>
+		<value xml:lang="fr"><![CDATA[Inscription]]></value>
+		<value xml:lang="ru"><![CDATA[Присвоить]]></value>
+		<value xml:lang="es"><![CDATA[Fecha del]]></value>
+		<value xml:lang="tr"><![CDATA[Kayıt Olmaya]]></value>
+		<value xml:lang="vi"><![CDATA[Khi đăng kí]]></value>
+	</item>
+	<item name="point_insert_document">
+		<value xml:lang="ko"><![CDATA[글 작성]]></value>
+		<value xml:lang="en"><![CDATA[On Writing]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み作成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发表新帖]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發表主題]]></value>
+		<value xml:lang="fr"><![CDATA[Écrire]]></value>
+		<value xml:lang="ru"><![CDATA[При написании]]></value>
+		<value xml:lang="es"><![CDATA[Al escribir documento]]></value>
+		<value xml:lang="tr"><![CDATA[Yazıya]]></value>
+		<value xml:lang="vi"><![CDATA[Khi gửi bài]]></value>
+	</item>
+	<item name="point_delete_document">
+		<value xml:lang="ko"><![CDATA[글 삭제]]></value>
+		<value xml:lang="en"><![CDATA[On Deleting]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除主题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除主題]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer]]></value>
+		<value xml:lang="ru"><![CDATA[При удалении]]></value>
+		<value xml:lang="es"><![CDATA[Al borrar documento]]></value>
+		<value xml:lang="tr"><![CDATA[Silmeye]]></value>
+		<value xml:lang="vi"><![CDATA[Khi xóa bài]]></value>
+	</item>
+	<item name="point_insert_comment">
+		<value xml:lang="ko"><![CDATA[댓글 작성]]></value>
+		<value xml:lang="en"><![CDATA[On Adding Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメント作成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发表评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發表評論]]></value>
+		<value xml:lang="fr"><![CDATA[Ajouter un Commentaire]]></value>
+		<value xml:lang="ru"><![CDATA[При добавлении комментариев]]></value>
+		<value xml:lang="es"><![CDATA[Al agregar comentarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yorum Eklemeye]]></value>
+		<value xml:lang="vi"><![CDATA[Khi thêm bình luận]]></value>
+	</item>
+	<item name="point_delete_comment">
+		<value xml:lang="ko"><![CDATA[댓글 삭제]]></value>
+		<value xml:lang="en"><![CDATA[On Deleting Comments]]></value>
+		<value xml:lang="jp"><![CDATA[コメント削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除评论]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除評論]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer un Commentaire]]></value>
+		<value xml:lang="ru"><![CDATA[При удалении комментариев]]></value>
+		<value xml:lang="es"><![CDATA[Al eliminar comentarios]]></value>
+		<value xml:lang="tr"><![CDATA[Yorum Silmeye]]></value>
+		<value xml:lang="vi"><![CDATA[Khi xóa bình luận]]></value>
+	</item>
+	<item name="point_upload_file">
+		<value xml:lang="ko"><![CDATA[파일 업로드]]></value>
+		<value xml:lang="en"><![CDATA[On Uploading]]></value>
+		<value xml:lang="jp"><![CDATA[アップロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上传文件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[上傳檔案]]></value>
+		<value xml:lang="fr"><![CDATA[Télécharger les Fichiers sur Serveur]]></value>
+		<value xml:lang="ru"><![CDATA[При закачке файлов]]></value>
+		<value xml:lang="es"><![CDATA[Al subri archivos]]></value>
+		<value xml:lang="tr"><![CDATA[Karşıya Yüklemeye (upload)]]></value>
+		<value xml:lang="vi"><![CDATA[Khi Upload]]></value>
+	</item>
+	<item name="point_delete_file">
+		<value xml:lang="ko"><![CDATA[파일 삭제]]></value>
+		<value xml:lang="en"><![CDATA[On Deleting Files]]></value>
+		<value xml:lang="jp"><![CDATA[ファイル削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除文件]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除檔案]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer un Fichier]]></value>
+		<value xml:lang="ru"><![CDATA[При скачке файлов]]></value>
+		<value xml:lang="es"><![CDATA[Al borrar archivos]]></value>
+		<value xml:lang="tr"><![CDATA[Dosyaları Silmeye]]></value>
+		<value xml:lang="vi"><![CDATA[Khi xóa File]]></value>
+	</item>
+	<item name="point_download_file">
+		<value xml:lang="ko"><![CDATA[파일 다운로드(이미지 제외)]]></value>
+		<value xml:lang="en"><![CDATA[On Downloading Files(Exclude images)]]></value>
+		<value xml:lang="jp"><![CDATA[ダウンロード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下载文件(图片除外)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下載檔案(圖片除外)]]></value>
+		<value xml:lang="fr"><![CDATA[Télécharger les Fichiers sur PC(Sauf des images)]]></value>
+		<value xml:lang="ru"><![CDATA[При скачке файлов(кроме изображений)]]></value>
+		<value xml:lang="es"><![CDATA[Al descargar archivos(Excepto imágenes)]]></value>
+		<value xml:lang="tr"><![CDATA[Dosyaları İndirmeye(resimler hariç)]]></value>
+		<value xml:lang="vi"><![CDATA[Khi Download(Trừ hình ảnh)]]></value>
+	</item>
+	<item name="point_read_document">
+		<value xml:lang="ko"><![CDATA[게시글 조회]]></value>
+		<value xml:lang="en"><![CDATA[On Reading]]></value>
+		<value xml:lang="jp"><![CDATA[書き込み閲覧]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看主题]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視主題]]></value>
+		<value xml:lang="fr"><![CDATA[lire]]></value>
+		<value xml:lang="es"><![CDATA[El Reading]]></value>
+		<value xml:lang="tr"><![CDATA[Okumaya]]></value>
+		<value xml:lang="vi"><![CDATA[Khi đọc bài]]></value>
+	</item>
+	<item name="point_voted">
+		<value xml:lang="ko"><![CDATA[추천 받음]]></value>
+		<value xml:lang="en"><![CDATA[On Recommended]]></value>
+		<value xml:lang="jp"><![CDATA[推薦]]></value>
+		<value xml:lang="zh-CN"><![CDATA[推荐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[推薦]]></value>
+		<value xml:lang="fr"><![CDATA[Être Recommandé]]></value>
+		<value xml:lang="tr"><![CDATA[Önerilene]]></value>
+		<value xml:lang="vi"><![CDATA[Khi bình chọn]]></value>
+	</item>
+	<item name="point_blamed">
+		<value xml:lang="ko"><![CDATA[비추천 받음]]></value>
+		<value xml:lang="en"><![CDATA[On Not Recommended]]></value>
+		<value xml:lang="jp"><![CDATA[非推薦]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反对]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反對]]></value>
+		<value xml:lang="fr"><![CDATA[Être Blâmé]]></value>
+		<value xml:lang="tr"><![CDATA[Suçlanana]]></value>
+		<value xml:lang="vi"><![CDATA[Khi phê bình]]></value>
+	</item>
+	<item name="cmd_point_config">
+		<value xml:lang="ko"><![CDATA[기본 설정]]></value>
+		<value xml:lang="en"><![CDATA[Default Setting]]></value>
+		<value xml:lang="jp"><![CDATA[デフォルト設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[常规选项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[基本設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration primaire]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки по умолчанию]]></value>
+		<value xml:lang="es"><![CDATA[Configuración predefinida]]></value>
+		<value xml:lang="tr"><![CDATA[Varsayılan Ayar]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập mặc định]]></value>
+	</item>
+	<item name="cmd_point_module_config">
+		<value xml:lang="ko"><![CDATA[모듈별 설정]]></value>
+		<value xml:lang="en"><![CDATA[Module Setting]]></value>
+		<value xml:lang="jp"><![CDATA[モジュール別設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[对象模块设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[目標模組設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration du Module]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки модуля]]></value>
+		<value xml:lang="es"><![CDATA[Configuración del módulo]]></value>
+		<value xml:lang="tr"><![CDATA[Modül Ayarı]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập Module]]></value>
+	</item>
+	<item name="cmd_point_act_config">
+		<value xml:lang="ko"><![CDATA[기능별 act 설정]]></value>
+		<value xml:lang="en"><![CDATA[Act Setting]]></value>
+		<value xml:lang="jp"><![CDATA[機能別アクション設定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[功能act设置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Act設置]]></value>
+		<value xml:lang="fr"><![CDATA[Configuration des Actions de chaque fonction]]></value>
+		<value xml:lang="ru"><![CDATA[Настройки действий]]></value>
+		<value xml:lang="es"><![CDATA[Configuración de actos]]></value>
+		<value xml:lang="tr"><![CDATA[Eylem Ayarı]]></value>
+		<value xml:lang="vi"><![CDATA[Thiết lập khác]]></value>
+	</item>
+	<item name="cmd_point_member_list">
+		<value xml:lang="ko"><![CDATA[회원 포인트 목록]]></value>
+		<value xml:lang="en"><![CDATA[Member Point List]]></value>
+		<value xml:lang="jp"><![CDATA[会員ポイントリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会员积分目录]]></value>
+		<value xml:lang="zh-TW"><![CDATA[會員點數列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste des Points des Membres]]></value>
+		<value xml:lang="ru"><![CDATA[Список поинтов пользователей]]></value>
+		<value xml:lang="es"><![CDATA[Lista de puntos del usuario]]></value>
+		<value xml:lang="tr"><![CDATA[Üye Puan listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách điểm thành viên]]></value>
+	</item>
+	<item name="msg_cannot_download">
+		<value xml:lang="ko"><![CDATA[포인트가 부족하여 다운로드를 하실 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You don't have enough points to download]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントが不足しているため、ダウンロードできません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分不足无法下载！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數不足無法下載！]]></value>
+		<value xml:lang="fr"><![CDATA[Vous n'avez pas assez de point pour télécharger]]></value>
+		<value xml:lang="ru"><![CDATA[У Вас нет достаточного количества поитов, чтобы иметь разрешение скачивать файлы.]]></value>
+		<value xml:lang="es"><![CDATA[No tiene puntos suficientes para descagar]]></value>
+		<value xml:lang="tr"><![CDATA[İndirmek için yeteri puanınız bulunmamaktadır]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không đủ điểm để Download.]]></value>
+	</item>
+	<item name="msg_disallow_by_point">
+		<value xml:lang="ko"><![CDATA[포인트가 부족하여 글을 읽으실 수 없습니다. (필요한 포인트 : %d, 현재 포인트 : %d)]]></value>
+		<value xml:lang="en"><![CDATA[You need more points to read the article (You need %d, but you have %d).]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントが不足しているため、閲覧ができません。(必要なポイント : %d、 現在のポイント : %d)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分不够，无法查看主题。(所需积分 : %d, 当前积分 : %d)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數不足無法閱讀文章 (需要 : %d, 目前 : %d)]]></value>
+		<value xml:lang="fr"><![CDATA[포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)]]></value>
+		<value xml:lang="ru"><![CDATA[포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)]]></value>
+		<value xml:lang="es"><![CDATA[포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)]]></value>
+		<value xml:lang="tr"><![CDATA[Makaleyi okumak için daha fazla puana ihtiyacınız var (%d lazımken, %d puanınız var)]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn không thể xem được bài viết vì điểm của bạn không đủ. (Điểm yêu cầu: %d, Điểm hiện tại: %d)]]></value>
+	</item>
+	<item name="point_recal_message">
+		<value xml:lang="ko"><![CDATA[포인트 적용중입니다. (%d / %d)]]></value>
+		<value xml:lang="en"><![CDATA[Adjusting Point. (%d / %d)]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントを適用しています。 (%d / %d)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[计算并应用中(%d / %d)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[計算並套用中(%d / %d)。]]></value>
+		<value xml:lang="fr"><![CDATA[En train d'Adjuster le Point. (%d / %d)]]></value>
+		<value xml:lang="es"><![CDATA[Ajuste de Punto. (%d / %d)]]></value>
+		<value xml:lang="tr"><![CDATA[Puan Düzeltiliyor. (%d / %d)]]></value>
+		<value xml:lang="vi"><![CDATA[Điều chỉnh điểm. (%d / %d)]]></value>
+	</item>
+	<item name="point_recal_finished">
+		<value xml:lang="ko"><![CDATA[포인트 재계산이 완료되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Point recalculation is finished.]]></value>
+		<value xml:lang="jp"><![CDATA[ポイントの再計算が完了しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[积分重新计算并应用完毕。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[點數重新計算並套用完畢。]]></value>
+		<value xml:lang="fr"><![CDATA[Recalcul des Points est fini.]]></value>
+		<value xml:lang="ru"><![CDATA[포인트 재계산이 모두 완료되었습니다]]></value>
+		<value xml:lang="es"><![CDATA[Punto cálculo está acabado.]]></value>
+		<value xml:lang="tr"><![CDATA[Puan tekrar hesaplaması bitti.]]></value>
+		<value xml:lang="vi"><![CDATA[Đã kết thúc việc tính toán lại điểm.]]></value>
+	</item>
+	<item name="point_update_desc">
+		<value xml:lang="ko"><![CDATA[포인트를 증가시키려면 +를 감소시키려면 -를 숫자앞에 표기한 후 업데이트 해 주세요. + 또는 - 표시가 없으면 입력한 값으로 설정됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Insert + in front of the number to increase the point or - to decrease, and update the point. If you don't insert + or -, the point will be set as the value you entered.]]></value>
+	　　<value xml:lang="jp"><![CDATA[ポイントを増加させるには+を、減少させるには-を、数字の前に表記した後、アップデートしてください。+、または-表示がなければ入力した値が設定されます。]]></value>
+	</item>
+	<item name="give_point">
+		<value xml:lang="ko"><![CDATA[포인트 부여]]></value>
+		<value xml:lang="en"><![CDATA[Give the point]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/point/lang/ru.lang.php b/modules/point/lang/ru.lang.php
deleted file mode 100644
index 7cd7ff58a..000000000
--- a/modules/point/lang/ru.lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->point = "Поинты"; 
-    $lang->level = "Уровень"; 
-
-    $lang->about_point_module = "Вы можете распределять поинты за написание/добавление комментариев, закачку/скачку файлов.";
-    $lang->about_act_config = "Каждый модуль, такой как форум/блог, имеет имеет свои действия, такие как\"написание/удаление/добавление комментариев/удаление комментариев\".<br />Вы можете просто добавить значения действий, чтобы связать ситему поинтов, за исключением форума/блога.<br />Запятая(,) используется как разделитель значений."; 
-
-    $lang->max_level = 'Макс. уровень';
-    $lang->about_max_level = 'Вы можете установить максимальный уровень. Иконки уровней должны быть присвоены. (макс. значение равно 1000)'; 
-
-    $lang->level_icon = 'Иконка уровня';
-    $lang->about_level_icon = 'Путь иконок уровней "./module/point/icons/[level].gif" и максимальный уровень может меняться с набором иконок. Поэтому будте осторожны'; 
-
-    $lang->point_name = 'Имя поинта';
-    $lang->about_point_name = 'Вы можете дать имя или единицу измерения для поинта'; 
-
-    $lang->level_point = 'Уровень поинтов';
-    $lang->about_level_point = 'Уровень будет изменен, когда поинты достигают каждого уровня поинтов или падают ниже его'; 
-
-    $lang->disable_download = 'Запретить скачивание';
-    $lang->about_disable_download = "Это запретит скачивание файлов, когда не хватает достаточного кол-ва поинтов. (За исключением файлов изображений)"; 
-    $lang->disable_read_document = '글 열람 금지';
-    $lang->about_disable_read_document = '포인트가 없을 경우 글 열람을 금지하게 됩니다';
-
-    $lang->level_point_calc = '레벨별 포인트 계산';
-    $lang->expression = '레벨 변수 <b>i</b>를 사용하여 자바스크립트 수식을 입력하세요. 예: Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = '계산';
-    $lang->cmd_exp_reset = '초기화';
-
-    $lang->cmd_point_recal = '포인트 초기화';
-    $lang->about_cmd_point_recal = '게시글/댓글/첨부파일/회원가입 점수만 이용하여 모든 포인트 점수를 초기화 합니다.<br />회원 가입 점수는 초기화 후 해당 회원이 활동을 하면 부여되고 그 전에는 부여되지 않습니다.<br />데이터 이전등을 하여 포인트를 완전히 초기화 해야 할 경우에만 사용하세요.';
-
-    $lang->point_link_group = '그룹 연동';
-    $lang->point_group_reset_and_add = '설정된 그룹 초기화 후 새 그룹 부여';
-    $lang->point_group_add_only = '새 그룹만 부여';
-    $lang->about_point_link_group = '그룹에 원하는 레벨을 지정하면 해당 레벨에 도달할때 그룹이 변경됩니다.';
-
-    $lang->about_module_point = "Вы можете установть поинты для каждого модуля, а модули, не имеющие значения будут использовать значение по умолчанию для поинтов.<br />Все поинты будут восстановлены при обратном действии.";
-
-    $lang->point_signup = 'Присвоить';
-    $lang->point_insert_document = 'При написании';
-    $lang->point_delete_document = 'При удалении';
-    $lang->point_insert_comment = 'При добавлении комментариев';
-    $lang->point_delete_comment = 'При удалении комментариев';
-    $lang->point_upload_file = 'При закачке файлов';
-    $lang->point_delete_file = 'При скачке файлов';
-    $lang->point_download_file = 'При скачке файлов (кроме изображений)';
-    $lang->point_read_document = '게시글 조회';
-    $lang->point_voted = '추천 받음';
-    $lang->point_blamed = '비추천 받음';
-
-
-    $lang->cmd_point_config = 'Настройки по умолчанию';
-    $lang->cmd_point_module_config = 'Настройки модуля';
-    $lang->cmd_point_act_config = 'Настройки действий';
-    $lang->cmd_point_member_list = 'Список поинтов пользователей';
-
-    $lang->msg_cannot_download = "У Вас нет достаточного количества поитов, чтобы иметь разрешение скачивать файлы.";
-    $lang->msg_disallow_by_point = "포인트가 부족하여 글을 읽을 수 없습니다 (필요포인트 : %d, 현재포인트 : %d)";
-
-    $lang->point_recal_message = '포인트 적용중입니다. (%d / %d)';
-    $lang->point_recal_finished = '포인트 재계산이 모두 완료되었습니다';
-?>
diff --git a/modules/point/lang/tr.lang.php b/modules/point/lang/tr.lang.php
deleted file mode 100644
index 5e60f0c73..000000000
--- a/modules/point/lang/tr.lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Default language pack of point module
-     **/
-
-    $lang->point = "Puan"; 
-    $lang->level = "Seviye"; 
-
-    $lang->about_point_module = "Yazmaya/silmeye, yorum eklemeye/yorum silmeye puan atayabilirsiniz.";
-    $lang->about_act_config = "Pano/blog gibi her modülün, \"yazma/silme/yorum ekleme/yorum silme gibi kendi eylemleri bulunmaktadır. \".<br />Pano/blog harici, puan sistemli link modüllerine davranış değerleri ekleyebilirsiniz.<br />Virgül(,) çoklu değerleri ayıracaktır."; 
-
-    $lang->max_level = 'Azami Seviye';
-    $lang->about_max_level = 'Azami seviyeyi ayarlayabilirsiniz. Seviye simgelerine değer verirken dikkate alınmalıdır. Verebileceğiniz en yüksek değer 1000dir.'; 
-
-    $lang->level_icon = 'Seviye Simgesi';
-    $lang->about_level_icon = 'Seviye simgesi yolu "./module/point/icons/[seviye].gif" olmalıdır. Azami seviye farklı simge setiyle gösterilebilir. Bu yüzden lütfen dikkatli olunuz.'; 
-
-    $lang->point_name = 'Puan Adı';
-    $lang->about_point_name = 'Puan için bir isim veya birim belirleyebilirsiniz'; 
-
-    $lang->level_point = 'Seviye Puanı';
-    $lang->about_level_point = 'Puan herhangi bir seviyeye gelince veya bir puan seviyesinin altına düşünce, seviye otomatik ayarlanacaktır.'; 
-
-    $lang->disable_download = 'İndirmeleri Yasakla';
-    $lang->about_disable_download = "Yeterli puan olmadığı zaman indirme yapamayacaklardır. (Resim dosyaları harici)"; 
-    $lang->disable_read_document = 'Okumayı Yasakla';
-    $lang->about_disable_read_document = 'Kullanıcıların yeterli puanı olmadığında, makaleleri okuyamayacaklardır.';
-
-    $lang->level_point_calc = 'Puan başına Puan Hesaplaması';
-    $lang->expression = 'Lütfen seviye değişkenini kullanarak Javascript formülü ekleyiniz <b></b>. örn) Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = 'Hesapla';
-    $lang->cmd_exp_reset = 'Sıfırla';
-
-    $lang->cmd_point_recal = 'Puan Sıfırla';
-	$lang->about_cmd_point_recal = 'Sadece makalelerdeki/yorumlardaki/eklerdeki/katılımlardaki tüm puanlar sıfırlanacaktır.<br />Sıfırlamadan sonra sadece, website aktiviteleri yapan üyeler, giriş puanı alacaklardır.<br />Lütfen bu özelliği sadece veri taşıma veya cidden gerekliliği olduğu durumlarda kullanınız.';
-
-    $lang->point_link_group = 'Seviyeye Göre Grup Değiştirme';
-    $lang->point_group_reset_and_add = 'Düzenlenmiş grupları sıfırla ve yeni gruplar ekle';
-    $lang->point_group_add_only = 'Sadece yeni gruplara';
-    $lang->about_point_link_group = 'Belirli bir grup için seviye belirliyorsanız, kullanıcılar gruba o seviyenin puanına eriştiklerinde atanacaklardır.';
-
-    $lang->about_module_point = "Her modül için puan ayarlayabilirsiniz. Hiçbir değer atanmayan modüller varsayılan puan sistemini kullanacaktır.<br />Tersi hareket durumunda tüm puanlar iade edilecektir.";
-
-    $lang->point_signup = 'Kayıt Olmaya';
-    $lang->point_insert_document = 'Yazıya';
-    $lang->point_delete_document = 'Silmeye';
-    $lang->point_insert_comment = 'Yorum Eklemeye';
-    $lang->point_delete_comment = 'Yorum Silmeye';
-    $lang->point_upload_file = 'Karşıya Yüklemeye (upload)';
-    $lang->point_delete_file = 'Dosyaları Silmeye';
-    $lang->point_download_file = 'Dosyaları İndirmeye (resimler hariç)';
-    $lang->point_read_document = 'Okumaya';
-    $lang->point_voted = 'Önerilene';
-    $lang->point_blamed = 'Suçlanana';
-
-
-    $lang->cmd_point_config = 'Varsayılan Ayar';
-    $lang->cmd_point_module_config = 'Modül Ayarı';
-    $lang->cmd_point_act_config = 'Eylem Ayarı';
-    $lang->cmd_point_member_list = 'Üye Puan listesi';
-
-    $lang->msg_cannot_download = "İndirmek için yeteri puanınız bulunmamaktadır";
-    $lang->msg_disallow_by_point = "Makaleyi okumak için daha fazla puana ihtiyacınız var (%d lazımken, %d puanınız var)";
-
-    $lang->point_recal_message = 'Puan Düzeltiliyor. (%d / %d)';
-    $lang->point_recal_finished = 'Puan tekrar hesaplaması bitti.';
-?>
diff --git a/modules/point/lang/vi.lang.php b/modules/point/lang/vi.lang.php
deleted file mode 100644
index 2111d9700..000000000
--- a/modules/point/lang/vi.lang.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->point = "Điểm"; 
-    $lang->level = "Cấp bậc"; 
-
-    $lang->about_point_module = "Bạn có thể đặt mức điểm khi thành viên gửi, thêm bài viết, bình luận, Download, Upload.<br />Nhưng điểm chỉ có thể cho và tích lũy khi Addon điểm được kích hoạt.";
-    $lang->about_act_config = "Mỗi Module, Board hay Blog có một mức cho điểm khác nhau khi  \"gửi bài, xóa bài, thêm bài, gửi bình luận, xóa bình luận\".<br />Bạn có thể chỉ thêm những giá trị liên kết với hệ thống điểm vào mỗi Module Blog, Board.<br />Để thêm nhiều giá trị bằng cách sử dụng dấu (,) giữa các giá trị."; 
-
-    $lang->max_level = 'Cấp bậc lớn nhất';
-    $lang->about_max_level = 'Bạn có thể quy định cấp bậc lớn nhất. Kiểm tra lại Icon của cấp bậc, và bạn có thể đặt cấp bậc tối đa là 1000.'; 
-
-    $lang->level_icon = 'Icon của cấp bậc';
-    $lang->about_level_icon = 'Thư mục chứa Icon của cấp bậc có dạng "./module/point/icons/[level].gif" và cấp độ lớn nhất có thể khác với bộ Icon hiện tại. Vì vậy xin hãy cẩn thận.'; 
-
-    $lang->point_name = 'Tên điểm';
-    $lang->about_point_name = 'Bạn có thể đặt tên hay đặt một giá trị nào đó cho điểm.'; 
-
-    $lang->level_point = 'Điểm thăng cấp';
-    $lang->about_level_point = 'Cấp độ sẽ được thay đổi khi đạt tới số điểm giới hạn.'; 
-
-    $lang->disable_download = 'Cấm Download';
-    $lang->about_disable_download = "Điều này sẽ cấm thành viên Download khi không đủ điểm. (Ngoại trừ File hình ảnh)"; 
-    $lang->disable_read_document = 'Cấm đọc bài';
-    $lang->about_disable_read_document = 'Nếu số điểm không đủ, thành viên sẽ không thể đọc được bài viết.';
-
-    $lang->level_point_calc = 'Tính toán trên điểm';
-    $lang->expression = 'Hãy nhập công thức cần sử dụng <b>i</b>. Ví dụ: Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = 'Tính toán';
-    $lang->cmd_exp_reset = 'Thiết lập lại';
-
-    $lang->cmd_point_recal = 'Thiết lập lại điểm';
-	$lang->about_cmd_point_recal = 'Điểm chỉ có thể có được khi gửi bài, bình luận, đính kèm và khi đăng kí.<br />Chỉ có thể thiết lập lại điểm của những thành viên đã đăng kí là thành viên.<br />Xin hãy chỉ sử dụng chức năng này khi bạn chuyển nội dung của Website qua một Website khác.';
-
-    $lang->point_link_group = 'Chuyển nhóm với cấp độ';
-    $lang->point_group_reset_and_add = 'Điểm số để thăng cấp cho nhóm mới.';
-    $lang->point_group_add_only = 'Chỉ cấp cho nhóm mới';
-    $lang->about_point_link_group = 'Nếu bạn đặt cấp độ cho một nhóm đặc biệt nào đó, người sử dụng trong nhóm đó khi đạt đến số điểm giới hạn sẽ tự động được chuyển sang nhóm mới.';
-
-    $lang->about_module_point = "Bạn có thể đặt thang điểm riêng cho mỗi Module, Module nào không được đặt sẽ sử dụng sự thiết lập mặc định.<br />Tất cả điểm sẽ khác khi sử dụng chức năng này.";
-
-    $lang->point_signup = 'Khi đăng kí';
-    $lang->point_insert_document = 'Khi gửi bài';
-    $lang->point_delete_document = 'Khi xóa bài';
-    $lang->point_insert_comment = 'Khi thêm bình luận';
-    $lang->point_delete_comment = 'Khi xóa bình luận';
-    $lang->point_upload_file = 'Khi Upload';
-    $lang->point_delete_file = 'Khi xóa File';
-    $lang->point_download_file = 'Khi Download (Trừ hình ảnh)';
-    $lang->point_read_document = 'Khi đọc bài';
-    $lang->point_voted = 'Khi bình chọn';
-    $lang->point_blamed = 'Khi phê bình';
-
-
-    $lang->cmd_point_config = 'Thiết lập mặc định';
-    $lang->cmd_point_module_config = 'Thiết lập Module';
-    $lang->cmd_point_act_config = 'Thiết lập khác';
-    $lang->cmd_point_member_list = 'Danh sách điểm thành viên';
-
-    $lang->msg_cannot_download = "Bạn không đủ điểm để Download.";
-    $lang->msg_disallow_by_point = "Bạn không thể xem được bài viết vì điểm của bạn không đủ. (Điểm yêu cầu: %d, Điểm hiện tại: %d)";
-
-    $lang->point_recal_message = 'Điều chỉnh điểm. (%d / %d)';
-    $lang->point_recal_finished = 'Đã kết thúc việc tính toán lại điểm.';
-?>
diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php
deleted file mode 100644
index b5790224d..000000000
--- a/modules/point/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  积分 (point) 模块简体中文语言包
-     **/
-
-    $lang->point = "积分"; 
-    $lang->level = "级别"; 
-
-    $lang->about_point_module = "积分系统可以在发表新帖及评论，上传/下载文件等动作时，付与其相应的积分的模块。";
-    $lang->about_act_config = "版面，博客等模块都有发表/删除新帖，发表/删除评论等动作。 <br />要想与版面/博客之外的模块关联积分功能时，添加与其各模块功能相适合的act值即可。";
-
-    $lang->max_level = '最高级别';
-    $lang->about_max_level = '可以指定最高级别。级别共设1000级，因此制作级别图标时要好好考虑一下。';
-
-    $lang->level_icon = '级别图标';
-    $lang->about_level_icon = '级别图标要以 ./modules/point/icons/级别.gif形式指定，有时出现最高级别的图标跟您指定的最高级别图标不同的现象，敬请注意。';
-
-    $lang->point_name = '积分名';
-    $lang->about_point_name = '可以指定积分名或积分单位。';
-
-    $lang->level_point = '级别积分';
-    $lang->about_level_point = '积分达到或减少到下列各级别所设置的积分值时，将会自动调节相应级别。';
-
-    $lang->disable_download = '禁止下载';
-    $lang->about_disable_download = '没有积分时，将禁止下载。 (图片除外)';
-    $lang->disable_read_document = '禁止查看主题';
-    $lang->about_disable_read_document = '没有积分时，将禁止查看主题。';
-
-    $lang->level_point_calc = '计算级别积分';
-    $lang->expression = '使用级别变数<b>"i"</b>输入JS数学函数。例: Math.pow(i, 2) * 90';
-    $lang->cmd_exp_calc = '计算';
-    $lang->cmd_exp_reset = '初始化';
-
-    $lang->cmd_point_recal = '积分初始化';
-    $lang->about_cmd_point_recal = '积分初始化。即只保留文章/评论/附件/新会员注册的相关积分项。<br />其中，初始化后的新会员注册积分项，将在会员有相关动作(发表主题/评论等)时，才付与其相应的积分。<br />此项功能请务必慎用！此项功能只能在数据转移或真的需要初始化所有积分时才可以使用。';
-
-    $lang->point_link_group = '用户组绑定';
-    $lang->point_group_reset_and_add = '初始化已有用户组重新设置';
-    $lang->point_group_add_only = '只应用到新用户组';
-    $lang->about_point_link_group = '即级别绑定用户组。当级别达到指定级别时，会员所属用户组将自动更新为与其相对应的用户组。';
-
-    $lang->about_module_point = '可以分别对各模块进行积分设置，没有被设置的模块将使用默认值。<br />所有积分在相反动作下恢复原始值。即：发表新帖后再删除得到的积分为0分。';
-
-    $lang->point_signup = '注册';
-    $lang->point_insert_document = '发表新帖';
-    $lang->point_delete_document = '删除主题';
-    $lang->point_insert_comment = '发表评论';
-    $lang->point_delete_comment = '删除评论';
-    $lang->point_upload_file = '上传文件';
-    $lang->point_delete_file = '删除文件';
-    $lang->point_download_file = '下载文件 (图片除外)';
-    $lang->point_read_document = '查看主题';
-    $lang->point_voted = '推荐';
-    $lang->point_blamed = '反对';
-
-    $lang->cmd_point_config = '常规选项';
-    $lang->cmd_point_module_config = '对象模块设置';
-    $lang->cmd_point_act_config = '功能act设置';
-    $lang->cmd_point_member_list = '会员积分目录';
-
-    $lang->msg_cannot_download = '积分不足无法下载！';
-    $lang->msg_disallow_by_point = "积分不够，无法查看主题。(所需积分 : %d, 当前积分 : %d)";
-
-    $lang->point_recal_message = '计算并应用中(%d / %d)。';
-    $lang->point_recal_finished = '积分重新计算并应用完毕。';
-?>
diff --git a/modules/point/lang/zh-TW.lang.php b/modules/point/lang/zh-TW.lang.php
deleted file mode 100644
index c09e1d9ea..000000000
--- a/modules/point/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-    /**
-     * @file   modules/point/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  點數(point)模組正體中文語言
-     **/
-
-    $lang->point = "點數"; 
-    $lang->level = "等級"; 
-
-    $lang->about_point_module = "點數系統可以在發表/刪除主題，發表/刪除評論，上傳/下載/刪除/檔案等動作時，付出相對應的點數。";
-    $lang->about_act_config = "討論板，部落格等模組都有發表/刪除主題，發表/刪除評論等動作。 <br />想要與討論板/部落格之外的模組關聯點數功能時，新增與其各模組功能適合的act值即可。";
-
-    $lang->max_level = '最高等級';
-    $lang->about_max_level = '可以指定最高等級。等級共設1000級，因此製作等級圖示時要好好考慮一下。';
-
-    $lang->level_icon = '等級圖示';
-    $lang->about_level_icon = '等級圖示格式與位置 ./modules/point/icons/等級.gif，請注意，有時出現最高等級的圖示跟您指定的最高等級圖示不同的現象。';
-
-    $lang->point_name = '點數名稱';
-    $lang->about_point_name = '可指定點數名稱或點數單位。';
-
-    $lang->level_point = '等級點數';
-    $lang->about_level_point = '點數達到或減少到下列各等級所設置的點數時，將會自動調節相對應等級。';
-
-    $lang->disable_download = '禁止下載';
-    $lang->about_disable_download = '沒有點數時，將禁止下載。(圖片除外)';
-    $lang->disable_read_document = '禁止閱讀文章';
-    $lang->about_disable_read_document = '沒有點數時，將禁止閱讀文章。';
-
-    $lang->level_point_calc = '計算等級點數';
-    $lang->expression = '使用等級變數<b>"i"</b>輸入JS數學函數。例: Math.pow(i,2) * 90';
-    $lang->cmd_exp_calc = '計算';
-    $lang->cmd_exp_reset = '重置';
-
-    $lang->cmd_point_recal = '重置點數';
-    $lang->about_cmd_point_recal = '重置點數。即只保留文章/評論/附加檔案/新會員註冊的相關點數項目。<br />其中，重置後的新會員註冊點數，將在會員有相關動作(例如:發表主題/評論等)時，才付與其相對應的點數。<br />此項功能請務必慎用！此項功能只能在資料轉移或真的需要重置所有點數時才可以使用。';
-
-    $lang->point_link_group = '自動升級';
-    $lang->point_group_reset_and_add = '重新調整與新增群組';
-    $lang->point_group_add_only = '只限新群組';
-    $lang->about_point_link_group = '即群組隨等級變化。當等級達到指定等級時，會員所屬群組將自動更新成相對應的群組。';
-
-    $lang->about_module_point = '可以分別對各模組進行點數設置，沒有設置的模組將使用預設值。<br />所有動作在反向操作下將恢復原始值。即：發表主題後再刪除得到的點數為零。';
-
-    $lang->point_signup = '註冊';
-    $lang->point_insert_document = '發表主題';
-    $lang->point_delete_document = '刪除主題';
-    $lang->point_insert_comment = '發表評論';
-    $lang->point_delete_comment = '刪除評論';
-    $lang->point_upload_file = '上傳檔案';
-    $lang->point_delete_file = '刪除檔案';
-    $lang->point_download_file = '下載檔案 (圖片除外)';
-    $lang->point_read_document = '檢視主題';
-    $lang->point_voted = '推薦';
-    $lang->point_blamed = '反對';
-
-
-    $lang->cmd_point_config = '基本設置';
-    $lang->cmd_point_module_config = '目標模組設置';
-    $lang->cmd_point_act_config = 'Act設置';
-    $lang->cmd_point_member_list = '會員點數列表';
-
-    $lang->msg_cannot_download = '點數不足無法下載！';
-    $lang->msg_disallow_by_point = "點數不足無法閱讀文章 (需要 : %d, 目前 : %d)";
-
-    $lang->point_recal_message = '計算並套用中(%d / %d)。';
-    $lang->point_recal_finished = '點數重新計算並套用完畢。';
-?>
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index 78b52f1ca..3e3dad0b0 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -1,311 +1,327 @@
-<?php
-    /**
-     * @class  pointAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  point모듈의 admin controller class
-     **/
-
-    class pointAdminController extends point {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 기본 설정 저장
-         **/
-        function procPointAdminInsertConfig() {
-            // 설정 정보 가져오기
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-
-            // 변수 정리
-            $args = Context::getRequestVars();
-
-            // 포인트 이름 체크
-            $config->point_name = $args->point_name;
-            if(!$config->point_name) $config->point_name = 'point';
-
-            // 기본 포인트 지정
-            $config->signup_point = (int)$args->signup_point;
-            $config->login_point = (int)$args->login_point;
-            $config->insert_document = (int)$args->insert_document;
-            $config->read_document = (int)$args->read_document;
-            $config->insert_comment = (int)$args->insert_comment;
-            $config->upload_file = (int)$args->upload_file;
-            $config->download_file = (int)$args->download_file;
-            $config->voted = (int)$args->voted;
-            $config->blamed = (int)$args->blamed;
-
-            // 최고 레벨
-            $config->max_level = $args->max_level;
-            if($config->max_level>1000) $config->max_level = 1000;
-            if($config->max_level<1) $config->max_level = 1;
-
-            // 레벨 아이콘 설정
-            $config->level_icon = $args->level_icon;
-
-            // 포인트 미달시 다운로드 금지 여부 체크
-            if($args->disable_download == 'Y') $config->disable_download = 'Y';
-            else $config->disable_download = 'N';
-
-            // 포인트 미달시 글 열람 금지 여부 체크
-            if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
-            else $config->disable_read_document = 'N';
-
-            // 레벨별 그룹 설정
-            foreach($args as $key => $val) {
-                if(substr($key, 0, strlen('point_group_')) != 'point_group_') continue;
-                $group_srl = substr($key, strlen('point_group_'));
-                $level = $val;
-                if(!$level) unset($config->point_group[$group_srl]);
-                else $config->point_group[$group_srl] = $level;
-            }
-            $config->group_reset = $args->group_reset;
-
-            // 레벨별 포인트 설정
-            unset($config->level_step);
-            for($i=1;$i<=$config->max_level;$i++) {
-                $key = "level_step_".$i;
-                $config->level_step[$i] = (int)$args->{$key};
-            }
-
-            // 레벨별 포인트 계산 함수
-            $config->expression = $args->expression;
-
-            // 저장
-            $oModuleController = &getController('module');
-            $oModuleController->insertModuleConfig('point', $config);
-
-            $this->cacheActList();
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 모듈별 설정 저장
-         **/
-        function procPointAdminInsertModuleConfig() {
-            $args = Context::getRequestVars();
-
-            foreach($args as $key => $val) {
-                preg_match("/^(insert_document|insert_comment|upload_file|download_file|read_document|voted|blamed)_([0-9]+)$/", $key, $matches);
-                if(!$matches[1]) continue;
-                $name = $matches[1];
-                $module_srl = $matches[2];
-                if(strlen($val)>0) $module_config[$module_srl][$name] = (int)$val;
-            }
-
-            $oModuleController = &getController('module');
-            if(count($module_config)) {
-                foreach($module_config as $module_srl => $config) {
-                    $oModuleController->insertModulePartConfig('point',$module_srl,$config);
-                }
-            }
-
-            $this->cacheActList();
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 모듈별 개별 포인트 저장
-         **/
-        function procPointAdminInsertPointModuleConfig() {
-            $module_srl = Context::get('target_module_srl');
-            if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-            // 여러개의 모듈 일괄 설정일 경우
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-
-            // 설정 저장
-            $oModuleController = &getController('module');
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                unset($config);
-                $config['insert_document'] = (int)Context::get('insert_document');
-                $config['insert_comment'] = (int)Context::get('insert_comment');
-                $config['upload_file'] = (int)Context::get('upload_file');
-                $config['download_file'] = (int)Context::get('download_file');
-                $config['read_document'] = (int)Context::get('read_document');
-                $config['voted'] = (int)Context::get('voted');
-                $config['blamed'] = (int)Context::get('blamed');
-                $oModuleController->insertModulePartConfig('point', $srl, $config);
-            }
-
-            $this->setError(-1);
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 회원 포인트 변경
-         **/
-        function procPointAdminUpdatePoint() {
-            $action = Context::get('action');
-            $member_srl = Context::get('member_srl');
-            $point = Context::get('point');
-
-            $oPointController = &getController('point');
-            return $oPointController->setPoint($member_srl, (int)$point, $action);
-        }
-
-        /**
-         * @brief 전체글/ 댓글/ 첨부파일과 가입정보를 바탕으로 포인트를 재계산함. 단 로그인 점수는 1번만 부여됨
-         **/
-        function procPointAdminReCal() {
-            set_time_limit(0);
-
-            // 모듈별 포인트 정보를 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-
-            $module_config = $oModuleModel->getModulePartConfigs('point');
-
-            // 회원의 포인트 저장을 위한 변수
-            $member = array();
-
-            // 게시글 정보를 가져옴
-            $output = executeQueryArray('point.getDocumentPoint');
-            if(!$output->toBool()) return $output;
-
-            if($output->data) {
-                foreach($output->data as $key => $val) {
-                    if($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
-                    else $insert_point = $config->insert_document;
-
-                    if(!$val->member_srl) continue;
-                    $point = $insert_point * $val->count;
-                    $member[$val->member_srl] += $point;
-                }
-            }
-            $output = null;
-
-            // 댓글 정보를 가져옴
-            $output = executeQueryArray('point.getCommentPoint');
-            if(!$output->toBool()) return $output;
-
-            if($output->data) {
-                foreach($output->data as $key => $val) {
-                    if($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
-                    else $insert_point = $config->insert_comment;
-
-                    if(!$val->member_srl) continue;
-                    $point = $insert_point * $val->count;
-                    $member[$val->member_srl] += $point;
-                }
-            }
-            $output = null;
-
-            // 첨부파일 정보를 가져옴
-            $output = executeQueryArray('point.getFilePoint');
-            if(!$output->toBool()) return $output;
-
-            if($output->data) {
-                foreach($output->data as $key => $val) {
-                    if($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
-                    else $insert_point = $config->upload_file;
-
-                    if(!$val->member_srl) continue;
-                    $point = $insert_point * $val->count;
-                    $member[$val->member_srl] += $point;
-                }
-            }
-            $output = null;
-
-            // 모든 회원의 포인트를 0으로 세팅
-            $output = executeQuery("point.initMemberPoint");
-            if(!$output->toBool()) return $output;
-
-            // 임시로 파일 저장
-            $f = fopen("./files/cache/pointRecal.txt","w");
-            foreach($member as $key => $val) {
-                $val += (int)$config->signup_point;
-                fwrite($f, $key.','.$val."\r\n");
-            }
-            fclose($f);
-
-            $this->add('total', count($member));
-            $this->add('position', 0);
-            $this->setMessage( sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')) );
-        }
-
-        /**
-         * @brief 파일로 저장한 회원 포인트를 5000명 단위로 적용
-         **/
-        function procPointAdminApplyPoint() {
-            $position = (int)Context::get('position');
-            $total = (int)Context::get('total');
-
-            if(!file_exists('./files/cache/pointRecal.txt')) return new Object(-1, 'msg_invalid_request');
-
-            $idx = 0;
-            $f = fopen("./files/cache/pointRecal.txt","r");
-            while(!feof($f)) {
-                $str = trim(fgets($f, 1024));
-                $idx ++;
-                if($idx > $position) {
-                    list($member_srl, $point) = explode(',',$str);
-
-                    $args = null;
-                    $args->member_srl = $member_srl;
-                    $args->point = $point;
-                    $output = executeQuery('point.insertPoint',$args);
-                    if($idx%5000==0) break;
-                }
-            }
-
-            if(feof($f)) {
-                FileHandler::removeFile('./files/cache/pointRecal.txt');
-                $idx = $total;
-
-                FileHandler::rename('./files/member_extra_info/point','./files/member_extra_info/point.old');
-
-                FileHandler::removeDir('./files/member_extra_info/point.old');
-            }
-            fclose($f);
-
-
-            $this->add('total', $total);
-            $this->add('position', $idx);
-            $this->setMessage(sprintf(Context::getLang('point_recal_message'), $idx, $total));
-
-        }
-
-        /**
-         * @brief 개별 모듈의 포인트 리셋
-         **/
-        function procPointAdminReset() {
-            $module_srl = Context::get('module_srls');
-            if(!$module_srl) return new Object(-1, 'msg_invalid_request');
-
-            // 여러개의 모듈 일괄 설정일 경우
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-
-            // 설정 저장
-            $oModuleController = &getController('module');
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                unset($args);
-                $args->module = 'point';
-                $args->module_srl = $srl;
-                executeQuery('module.deleteModulePartConfig', $args);
-            }
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 캐시파일 저장
-         **/
-        function cacheActList() {
-            return;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  pointAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin controller class of the point module
+     **/
+
+    class pointAdminController extends point {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Save the default configurations
+         **/
+        function procPointAdminInsertConfig() {
+            // Get the configuration information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            // Arrange variables
+            $args = Context::getRequestVars();
+            // Check the point name
+            $config->point_name = $args->point_name;
+            if(!$config->point_name) $config->point_name = 'point';
+            // Specify the default points
+            $config->signup_point = (int)$args->signup_point;
+            $config->login_point = (int)$args->login_point;
+            $config->insert_document = (int)$args->insert_document;
+            $config->read_document = (int)$args->read_document;
+            $config->insert_comment = (int)$args->insert_comment;
+            $config->upload_file = (int)$args->upload_file;
+            $config->download_file = (int)$args->download_file;
+            $config->voted = (int)$args->voted;
+            $config->blamed = (int)$args->blamed;
+            // The highest level
+            $config->max_level = $args->max_level;
+            if($config->max_level>1000) $config->max_level = 1000;
+            if($config->max_level<1) $config->max_level = 1;
+            // Set the level icon
+            $config->level_icon = $args->level_icon;
+            // Check if downloads are not allowed
+            if($args->disable_download == 'Y') $config->disable_download = 'Y';
+            else $config->disable_download = 'N';
+            // Check if reading a document is not allowed
+            if($args->disable_read_document == 'Y') $config->disable_read_document = 'Y';
+            else $config->disable_read_document = 'N';
+            // Per-level group configurations
+            foreach($args as $key => $val) {
+                if(substr($key, 0, strlen('point_group_')) != 'point_group_') continue;
+                $group_srl = substr($key, strlen('point_group_'));
+                $level = $val;
+                if(!$level) unset($config->point_group[$group_srl]);
+                else $config->point_group[$group_srl] = $level;
+            }
+            $config->group_reset = $args->group_reset;
+            // Per-level point configurations
+            unset($config->level_step);
+            for($i=1;$i<=$config->max_level;$i++) {
+                $key = "level_step_".$i;
+                $config->level_step[$i] = (int)$args->{$key};
+            }
+            // A function to calculate per-level points
+            $config->expression = $args->expression;
+            // Save
+            $oModuleController = &getController('module');
+            $oModuleController->insertModuleConfig('point', $config);
+
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Save per-module configurations
+         **/
+        function procPointAdminInsertModuleConfig() {
+            $args = Context::getRequestVars();
+
+            foreach($args as $key => $val) {
+                preg_match("/^(insert_document|insert_comment|upload_file|download_file|read_document|voted|blamed)_([0-9]+)$/", $key, $matches);
+                if(!$matches[1]) continue;
+                $name = $matches[1];
+                $module_srl = $matches[2];
+                if(strlen($val)>0) $module_config[$module_srl][$name] = (int)$val;
+            }
+
+            $oModuleController = &getController('module');
+            if(count($module_config)) {
+                foreach($module_config as $module_srl => $config) {
+                    $oModuleController->insertModulePartConfig('point',$module_srl,$config);
+                }
+            }
+
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminModuleConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Save individual points per module
+         **/
+        function procPointAdminInsertPointModuleConfig() {
+            $module_srl = Context::get('target_module_srl');
+            if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+            // In case of batch configuration of several modules
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+            // Save configurations
+            $oModuleController = &getController('module');
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                unset($config);
+                $config['insert_document'] = (int)Context::get('insert_document');
+                $config['insert_comment'] = (int)Context::get('insert_comment');
+                $config['upload_file'] = (int)Context::get('upload_file');
+                $config['download_file'] = (int)Context::get('download_file');
+                $config['read_document'] = (int)Context::get('read_document');
+                $config['voted'] = (int)Context::get('voted');
+                $config['blamed'] = (int)Context::get('blamed');
+                $oModuleController->insertModulePartConfig('point', $srl, $config);
+            }
+
+            $this->setError(-1);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Change members points
+         **/
+        function procPointAdminUpdatePoint() {
+            $member_srl = Context::get('member_srl');
+            $point = Context::get('point');
+
+			preg_match('/^(\+|-)?([1-9][0-9]*)$/', $point, $m);
+
+			$action = '';
+			switch($m[1])
+			{
+				case '+':
+					$action = 'add';
+					break;
+
+				case '-':
+					$action = 'minus';
+					break;
+
+				default:
+					$action = 'update';
+					break;
+			}
+			$point = $m[2];
+
+            $oPointController = &getController('point');
+            $output = $oPointController->setPoint($member_srl, (int)$point, $action);
+
+            $this->setError(-1);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPointAdminPointList');
+				$this->setRedirectUrl($returnUrl);
+				return;
+			}
+			return $output;
+        }
+
+        /**
+         * @brief Recalculate points based on the list/comment/attachment and registration information. Granted only once a first-time login score.
+         **/
+        function procPointAdminReCal() {
+            set_time_limit(0);
+            // Get per-module points information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+
+            $module_config = $oModuleModel->getModulePartConfigs('point');
+            // A variable to store member's points
+            $member = array();
+            // Get post information
+            $output = executeQueryArray('point.getDocumentPoint');
+            if(!$output->toBool()) return $output;
+
+            if($output->data) {
+                foreach($output->data as $key => $val) {
+                    if($module_config[$val->module_srl]['insert_document']) $insert_point = $module_config[$val->module_srl]['insert_document'];
+                    else $insert_point = $config->insert_document;
+
+                    if(!$val->member_srl) continue;
+                    $point = $insert_point * $val->count;
+                    $member[$val->member_srl] += $point;
+                }
+            }
+            $output = null;
+            // Get comments information
+            $output = executeQueryArray('point.getCommentPoint');
+            if(!$output->toBool()) return $output;
+
+            if($output->data) {
+                foreach($output->data as $key => $val) {
+                    if($module_config[$val->module_srl]['insert_comment']) $insert_point = $module_config[$val->module_srl]['insert_comment'];
+                    else $insert_point = $config->insert_comment;
+
+                    if(!$val->member_srl) continue;
+                    $point = $insert_point * $val->count;
+                    $member[$val->member_srl] += $point;
+                }
+            }
+            $output = null;
+            // Get the attached files' information
+            $output = executeQueryArray('point.getFilePoint');
+            if(!$output->toBool()) return $output;
+
+            if($output->data) {
+                foreach($output->data as $key => $val) {
+                    if($module_config[$val->module_srl]['upload_file']) $insert_point = $module_config[$val->module_srl]['upload_file'];
+                    else $insert_point = $config->upload_file;
+
+                    if(!$val->member_srl) continue;
+                    $point = $insert_point * $val->count;
+                    $member[$val->member_srl] += $point;
+                }
+            }
+            $output = null;
+            // Set all members' points to 0
+            $output = executeQuery("point.initMemberPoint");
+            if(!$output->toBool()) return $output;
+            // Save the file temporarily
+            $f = fopen("./files/cache/pointRecal.txt","w");
+            foreach($member as $key => $val) {
+                $val += (int)$config->signup_point;
+                fwrite($f, $key.','.$val."\r\n");
+            }
+            fclose($f);
+
+            $this->add('total', count($member));
+            $this->add('position', 0);
+            $this->setMessage( sprintf(Context::getLang('point_recal_message'), 0, $this->get('total')) );
+        }
+
+        /**
+         * @brief Apply member points saved by file to units of 5,000 people
+         **/
+        function procPointAdminApplyPoint() {
+            $position = (int)Context::get('position');
+            $total = (int)Context::get('total');
+
+            if(!file_exists('./files/cache/pointRecal.txt')) return new Object(-1, 'msg_invalid_request');
+
+            $idx = 0;
+            $f = fopen("./files/cache/pointRecal.txt","r");
+            while(!feof($f)) {
+                $str = trim(fgets($f, 1024));
+                $idx ++;
+                if($idx > $position) {
+                    list($member_srl, $point) = explode(',',$str);
+
+                    $args = null;
+                    $args->member_srl = $member_srl;
+                    $args->point = $point;
+                    $output = executeQuery('point.insertPoint',$args);
+                    if($idx%5000==0) break;
+                }
+            }
+
+            if(feof($f)) {
+                FileHandler::removeFile('./files/cache/pointRecal.txt');
+                $idx = $total;
+
+                FileHandler::rename('./files/member_extra_info/point','./files/member_extra_info/point.old');
+
+                FileHandler::removeDir('./files/member_extra_info/point.old');
+            }
+            fclose($f);
+
+            $this->add('total', $total);
+            $this->add('position', $idx);
+            $this->setMessage(sprintf(Context::getLang('point_recal_message'), $idx, $total));
+
+        }
+
+        /**
+         * @brief Reset points for each module
+         **/
+        function procPointAdminReset() {
+            $module_srl = Context::get('module_srls');
+            if(!$module_srl) return new Object(-1, 'msg_invalid_request');
+            // In case of batch configuration of several modules
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+            // Save configurations
+            $oModuleController = &getController('module');
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                unset($args);
+                $args->module = 'point';
+                $args->module_srl = $srl;
+                executeQuery('module.deleteModulePartConfig', $args);
+            }
+
+            $this->setMessage('success_updated');
+        }
+
+        /**
+         * @brief Save the cache files
+		 * @deprecated
+         **/
+        function cacheActList() {
+            return;
+        }
+
+    }
+?>
diff --git a/modules/point/point.admin.view.php b/modules/point/point.admin.view.php
index 11622fd74..db6d252f5 100644
--- a/modules/point/point.admin.view.php
+++ b/modules/point/point.admin.view.php
@@ -1,111 +1,113 @@
-<?php
-    /**
-     * @class  pointAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  point모듈의 admin view class
-     **/
-
-    class pointAdminView extends point {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 설정 정보 가져오기
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-
-            // 설정 변수 지정
-            Context::set('config', $config);				
-
-			//Security
-			$security = new Security();			
-			$security->encodeHTML('config.point_name','config.level_icon');
-			$security->encodeHTML('module_info..');			
-			
-            // template path지정
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 기본 설정
-         **/
-        function dispPointAdminConfig() {
-            // 레벨 아이콘 목록 구함
-            $level_icon_list = FileHandler::readDir("./modules/point/icons");
-            Context::set('level_icon_list', $level_icon_list);
-
-            // 그룹 목록 가져오기
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups();
-            $selected_group_list = array();
-            if(count($group_list)) {
-                foreach($group_list as $key => $val) {
-                    if($val->is_admin == 'Y' || $val->is_default == 'Y') continue;    
-                    $selected_group_list[$key] = $val;
-                }
-            }			
-            Context::set('group_list', $selected_group_list);
-
-			//Security
-			$security = new Security();			
-			$security->encodeHTML('group_list..title','group_list..description');			
-			
-            // 템플릿 지정
-            $this->setTemplateFile('config');
-        }
-
-        /**
-         * @brief 모듈별 점수 지정
-         **/
-        function dispPointAdminModuleConfig() {
-            // mid 목록 가져오기
-            $oModuleModel = &getModel('module');
-            $mid_list = $oModuleModel->getMidList();
-            Context::set('mid_list', $mid_list);
-
-            Context::set('module_config', $oModuleModel->getModulePartConfigs('point'));
-
-			//Security
-			$security = new Security();			
-			$security->encodeHTML('mid_list..browser_title','mid_list..mid');			
-			
-            // 템플릿 지정
-            $this->setTemplateFile('module_config');
-        }
-
-        /**
-         * @brief 회원 포인트순 목록 가져오기
-         **/
-        function dispPointAdminPointList() {
-            $oPointModel = &getModel('point');
-
-            $args->list_count = 20;
-            $args->page = Context::get('page');
-
-            $output = $oPointModel->getMemberList($args);
-
-            // 템플릿에 쓰기 위해서 context::set
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('member_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-
-            // 멤버모델 객체 생성
-            $oMemberModel = &getModel('member');
-
-            // group 목록 가져오기
-            $this->group_list = $oMemberModel->getGroups();
-            Context::set('group_list', $this->group_list);
-			
-			//Security
-			$security = new Security();			
-			$security->encodeHTML('group_list..title','group_list..description');
-			$security->encodeHTML('member_list..');			
-
-            // 템플릿 지정
-            $this->setTemplateFile('member_list');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pointAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin view class of the point module
+     **/
+
+    class pointAdminView extends point {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Get teh configuration information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            // Set the configuration variable
+            Context::set('config', $config);				
+
+			//Security
+			$security = new Security();			
+			$security->encodeHTML('config.point_name','config.level_icon');
+			$security->encodeHTML('module_info..');			
+
+			// Set the template path
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Default configurations
+         **/
+        function dispPointAdminConfig() {
+            // Get the list of level icons
+            $level_icon_list = FileHandler::readDir("./modules/point/icons");
+            Context::set('level_icon_list', $level_icon_list);
+            // Get the list of groups
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups();
+            $selected_group_list = array();
+            if(count($group_list)) {
+                foreach($group_list as $key => $val) {
+                    if($val->is_admin == 'Y' || $val->is_default == 'Y') continue;    
+                    $selected_group_list[$key] = $val;
+                }
+            }			
+            Context::set('group_list', $selected_group_list);
+			//Security
+			$security = new Security();			
+			$security->encodeHTML('group_list..title','group_list..description');			
+
+			// Set the template
+            $this->setTemplateFile('config');
+        }
+
+        /**
+         * @brief Set per-module scores
+         **/
+        function dispPointAdminModuleConfig() {
+            // Get a list of mid
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'mid', 'browser_title');
+            $mid_list = $oModuleModel->getMidList(null, $columnList);
+            Context::set('mid_list', $mid_list);
+
+            Context::set('module_config', $oModuleModel->getModulePartConfigs('point'));
+			//Security
+			$security = new Security();			
+			$security->encodeHTML('mid_list..browser_title','mid_list..mid');			
+
+			// Set the template
+            $this->setTemplateFile('module_config');
+        }
+
+        /**
+         * @brief Configure the functional act
+         **/
+        function dispPointAdminActConfig() {
+            // Set the template
+            $this->setTemplateFile('action_config');
+        }
+
+        /**
+         * @brief Get a list of member points
+         **/
+        function dispPointAdminPointList() {
+            $oPointModel = &getModel('point');
+
+            $args->list_count = 20;
+            $args->page = Context::get('page');
+
+			$columnList = array('member.member_srl', 'member.user_id', 'member.user_name', 'member.nick_name', 'point.point');
+            $output = $oPointModel->getMemberList($args, $columnList);
+            // context::set for writing into a template 
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('member_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+            // Create a member model object
+            $oMemberModel = &getModel('member');
+            // Get a list of groups
+            $this->group_list = $oMemberModel->getGroups();
+            Context::set('group_list', $this->group_list);
+			//Security
+			$security = new Security();			
+			$security->encodeHTML('group_list..title','group_list..description');
+			$security->encodeHTML('member_list..');			
+
+			// Set the template
+            $this->setTemplateFile('member_list');
+        }
+    }
+?>
diff --git a/modules/point/point.class.php b/modules/point/point.class.php
index 5df190bac..0ef4a593f 100644
--- a/modules/point/point.class.php
+++ b/modules/point/point.class.php
@@ -1,197 +1,172 @@
-<?php
-    /**
-     * @class  point
-     * @author NHN (developers@xpressengine.com)
-     * @brief  point모듈의 high class
-     **/
-
-    class point extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            // 포인트 정보를 기록할 디렉토리 생성
-            FileHandler::makeDir('./files/member_extra_info/point');
-
-            $oModuleController = &getController('module');
-
-            // 최고레벨
-            $config->max_level = 30;
-
-            // 레벨별 점수
-            for($i=1;$i<=30;$i++) {
-                $config->level_step[$i] = pow($i,2)*90;
-            }
-
-            // 회원가입
-            $config->signup_point = 10;
-
-            // 로그인 가입
-            $config->login_point = 5;
-
-            // 포인트 호칭
-            $config->point_name = 'point';
-
-            // 레벨 아이콘 디렉토리
-            $config->level_icon = "default";
-
-            // 점수가 없을때 다운로드 금지 기능
-            $config->disable_download = false;
-
-            /**
-             * 모듈별 기본 점수 및 각 action 정의 (게시판,블로그외에 어떤 모듈이 생길지 모르니 act값을 명시한다
-             **/
-
-            // 글작성
-            $config->insert_document = 10;
-
-            $config->insert_document_act = 'procBoardInsertDocument';
-            $config->delete_document_act = 'procBoardDeleteDocument';
-
-            // 댓글작성
-            $config->insert_comment = 5;
-
-            $config->insert_comment_act = 'procBoardInsertComment,procBlogInsertComment';
-            $config->delete_comment_act = 'procBoardDeleteComment,procBlogDeleteComment';
-
-            // 업로드
-            $config->upload_file = 5;
-
-            $config->upload_file_act = 'procFileUpload';
-            $config->delete_file_act = 'procFileDelete';
-
-            // 다운로드
-            $config->download_file = -5;
-            $config->download_file_act = 'procFileDownload';
-
-            // 조회
-            $config->read_document = 0;
-
-            // 추천 / 비추천
-            $config->voted = 0;
-            $config->blamed = 0;
-
-            // 설정 저장
-            $oModuleController->insertModuleConfig('point', $config);
-
-            // 빠른 실행을 위해서 act list를 캐싱
-            $oPointController = &getAdminController('point');
-            $oPointController->cacheActList();
-
-            // 가입/글작성/댓글작성/파일업로드/다운로드에 대한 트리거 추가
-            $oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
-            $oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
-            $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
-            $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
-            $oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
-            $oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
-            $oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
-            $oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
-            $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
-            $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
-            $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
-            $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
-
-            // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
-            $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
-
-            // 임시저장글을 정상 저장시 포인트 지급하도록 트리거 추가 2009. 05. 19 zero
-            $oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-
-            // 가입/글작성/댓글작성/파일업로드/다운로드에 대한 트리거 추가
-            if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
-            if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
-            if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
-            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
-            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
-            if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
-
-            // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
-            if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
-
-            // 임시저장글을 정상 저장시 포인트 지급하도록 트리거 추가 2009. 05. 19 zero
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 가입/글작성/댓글작성/파일업로드/다운로드에 대한 트리거 추가
-            if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
-                $oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
-                $oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
-                $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
-                $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
-                $oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
-            if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
-                $oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
-            if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
-                $oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
-            if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
-                $oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
-            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
-                $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
-            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
-                $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
-            if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
-                $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
-            if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
-                $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
-
-            // 추천 / 비추천에 대한 트리거 추가 2008.05.13 haneul
-            if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
-                $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
-
-            // 임시저장글을 정상 저장시 포인트 지급하도록 트리거 추가 2009. 05. 19 zero
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
-                $oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // point action 파일 재정의
-            $oPointAdminController = &getAdminController('point');
-            $oPointAdminController->cacheActList();
-
-        }
-    }
-?>
+<?php
+    /**
+     * @class  point
+     * @author NHN (developers@xpressengine.com)
+     * @brief The parent class of the point module
+     **/
+
+    class point extends ModuleObject {
+
+        /**
+         * @brief Additional tasks required to accomplish during the installation
+         **/
+        function moduleInstall() {
+            // Registration in action forward (for using in the administrator mode)
+            $oModuleController = &getController('module');
+            // Create a directory to store points information
+            FileHandler::makeDir('./files/member_extra_info/point');
+
+            $oModuleController = &getController('module');
+            // The highest level
+            $config->max_level = 30;
+            // Per-level score
+            for($i=1;$i<=30;$i++) {
+                $config->level_step[$i] = pow($i,2)*90;
+            }
+            // Points for registration
+            $config->signup_point = 10;
+            // Login points
+            $config->login_point = 5;
+            // Point's name
+            $config->point_name = 'point';
+            // Level icon directory
+            $config->level_icon = "default";
+            // Prevent downloads if there are no scores
+            $config->disable_download = false;
+
+            /**
+             * Define the default points per module as well as all actions (as we do not know if it is forum or blogs, specify "act")
+             **/
+            // Insert document
+            $config->insert_document = 10;
+
+            $config->insert_document_act = 'procBoardInsertDocument';
+            $config->delete_document_act = 'procBoardDeleteDocument';
+            // Insert comment
+            $config->insert_comment = 5;
+
+            $config->insert_comment_act = 'procBoardInsertComment,procBlogInsertComment';
+            $config->delete_comment_act = 'procBoardDeleteComment,procBlogDeleteComment';
+            // Upload
+            $config->upload_file = 5;
+
+            $config->upload_file_act = 'procFileUpload';
+            $config->delete_file_act = 'procFileDelete';
+            // Download
+            $config->download_file = -5;
+            $config->download_file_act = 'procFileDownload';
+            // View
+            $config->read_document = 0;
+            // Vote up / Vote down
+            $config->voted = 0;
+            $config->blamed = 0;
+            // Save configurations
+            $oModuleController->insertModuleConfig('point', $config);
+            // Cash act list for faster execution
+            $oPointController = &getAdminController('point');
+            $oPointController->cacheActList();
+            // Add a trigger for registration/insert document/insert comment/upload a file/download
+            $oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
+            $oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
+            $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
+            $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
+            $oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
+            $oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
+            $oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
+            $oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
+            $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
+            $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
+            $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
+            $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
+            // Add a trigger for voting up and down 2008.05.13 haneul
+            $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+            // Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
+            $oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief A method to check if the installation has been successful
+         **/
+        function checkUpdate() {
+            // Get the information of the point module
+            $oModuleModel = &getModel('module');
+            // Add a trigger for registration/insert document/insert comment/upload a file/download
+            if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) return true;
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) return true;
+            if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) return true;
+            if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) return true;
+            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) return true;
+            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) return true;
+            if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after')) return true;
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) return true;
+            // Add a trigger for voting up and down 2008.05.13 haneul
+            if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after')) return true;
+            // Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            // Get the information of the point module
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // Add a trigger for registration/insert document/insert comment/upload a file/download
+            if(!$oModuleModel->getTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after')) 
+                $oModuleController->insertTrigger('member.insertMember', 'point', 'controller', 'triggerInsertMember', 'after');
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after')) 
+                $oModuleController->insertTrigger('document.insertDocument', 'point', 'controller', 'triggerInsertDocument', 'after');
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before')) 
+                $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerBeforeDeleteDocument', 'before');
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after')) 
+                $oModuleController->insertTrigger('document.deleteDocument', 'point', 'controller', 'triggerDeleteDocument', 'after');
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after')) 
+                $oModuleController->insertTrigger('comment.insertComment', 'point', 'controller', 'triggerInsertComment', 'after');
+            if(!$oModuleModel->getTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after')) 
+                $oModuleController->insertTrigger('comment.deleteComment', 'point', 'controller', 'triggerDeleteComment', 'after');
+            if(!$oModuleModel->getTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after')) 
+                $oModuleController->insertTrigger('file.insertFile', 'point', 'controller', 'triggerInsertFile', 'after');
+            if(!$oModuleModel->getTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after')) 
+                $oModuleController->insertTrigger('file.deleteFile', 'point', 'controller', 'triggerDeleteFile', 'after');
+            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before')) 
+                $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerBeforeDownloadFile', 'before');
+            if(!$oModuleModel->getTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after')) 
+                $oModuleController->insertTrigger('file.downloadFile', 'point', 'controller', 'triggerDownloadFile', 'after');
+            if(!$oModuleModel->getTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after'))
+                $oModuleController->insertTrigger('member.doLogin', 'point', 'controller', 'triggerAfterLogin', 'after');
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after')) 
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'point', 'view', 'triggerDispPointAdditionSetup', 'after');
+            if(!$oModuleModel->getTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after')) 
+                $oModuleController->insertTrigger('document.updateReadedCount', 'point', 'controller', 'triggerUpdateReadedCount', 'after');
+            // Add a trigger for voting up and down 2008.05.13 haneul
+            if(!$oModuleModel->getTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after'))
+                $oModuleController->insertTrigger('document.updateVotedCount', 'point', 'controller', 'triggerUpdateVotedCount', 'after');
+            // Add a trigger for using points for permanent saving of a temporarily saved document 2009.05.19 zero
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before')) 
+                $oModuleController->insertTrigger('document.updateDocument', 'point', 'controller', 'triggerUpdateDocument', 'before');
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-create the cache file
+         **/
+        function recompileCache() {
+            // redefine point action file
+            $oPointAdminController = &getAdminController('point');
+            $oPointAdminController->cacheActList();
+
+        }
+    }
+?>
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index 2be6a7172..f03153827 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -1,661 +1,573 @@
-<?php
-    /**
-     * @class  pointController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  point모듈의 Controller class
-     **/
-
-    class pointController extends point {
-
-        var $config = null;
-        var $oPointModel = null;
-        var $member_code = array();
-        var $icon_width = 0;
-        var $icon_height = 0;
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 회원가입 포인트 적용 trigger
-         **/
-        function triggerInsertMember(&$obj) {
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-
-            // 가입한 회원의 member_srl을 구함
-            $member_srl = $obj->member_srl;
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $config->signup_point;
-
-            // 포인트 증감
-            $cur_point += $point;
-            $this->setPoint($member_srl,$cur_point, 'signup');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 회원 로그인 포인트 적용 trigger
-         **/
-        function triggerAfterLogin(&$obj) {
-            $member_srl = $obj->member_srl;
-            if(!$member_srl) return new Object();
-
-            // 바로 이전 로그인이 오늘이 아니어야 포인트를 줌
-            if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $config->login_point;
-
-            // 포인트 증감
-            $cur_point += $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 게시글 등록 포인트 적용 trigger
-         **/
-        function triggerInsertDocument(&$obj) {
-            $module_srl = $obj->module_srl;
-            $member_srl = $obj->member_srl;
-            if(!$module_srl || !$member_srl) return new Object();
-
-            // 임시저장일 경우 포인트를 지급하지 않도록 수정
-            if($module_srl == $member_srl) return new Object();
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $module_config['insert_document'];
-            if(!isset($point)) $point = $config->insert_document;
-            $cur_point += $point;
-
-            // 첨부파일 등록에 대한 포인트 추가
-            $point = $module_config['upload_file'];
-            if(!isset($point)) $point = $config->upload_file;
-            if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
-
-            // 포인트 증감
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 임시저장된 글을 정상 등록시 포인트 적용하는 trigger
-         * 1.2.3 에서 임시저장시에 포인트 지급되지 않도록 변경됨
-         **/
-        function triggerUpdateDocument(&$obj) {
-            $oDocumentModel = &getModel('document');
-            $oModuleModel = &getModel('module');
-
-            $document_srl = $obj->document_srl;
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-
-            $module_srl = $oDocument->get('module_srl');
-            $member_srl = $oDocument->get('member_srl');
-            if(!$module_srl || !$member_srl) return new Object();
-
-            // 임시저장된 것이 아니면 return
-            if($module_srl != $member_srl) return new Object();
-
-            // point 모듈 정보 가져옴
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $module_config['insert_document'];
-            if(!isset($point)) $point = $config->insert_document;
-            $cur_point += $point;
-
-            // 첨부파일 등록에 대한 포인트 추가
-            $point = $module_config['upload_file'];
-            if(!isset($point)) $point = $config->upload_file;
-            if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
-
-            // 포인트 증감
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-
-        }
-
-        /**
-         * @brief 게시글 삭제 이전에 게시글의 댓글에 대한 포인트 감소 처리를 하는 trigger
-         **/
-        function triggerBeforeDeleteDocument(&$obj) {
-            $document_srl = $obj->document_srl;
-            $member_srl = $obj->member_srl;
-
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists()) return new Object();
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
-
-            // 지울 대상 글의 댓글에 대한 처리
-            $comment_point = $module_config['insert_comment'];
-            if(!isset($comment_point)) $comment_point = $config->insert_comment;
-
-            // 댓글 포인트가 있으면 증감(+) 이면 차감 시도
-            if($comment_point>0) return new Object();
-
-            // 해당 글에 포함된 모든 댓글을 추출
-            $cp_args->document_srl = $document_srl;
-            $output = executeQueryArray('point.getCommentUsers', $cp_args);
-
-            // 대상이 없으면 return
-            if(!$output->data) return new Object();
-
-            // 대상 회원 번호를 정리
-            $member_srls = array();
-            $cnt = count($output->data);
-            for($i=0;$i<$cnt;$i++) {
-                if($output->data[$i]->member_srl<1) continue;
-                $member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
-            }
-
-            // 원글 작성 회원의 번호는 제거
-            if($member_srl) unset($member_srls[abs($member_srl)]);
-            if(!count($member_srls)) return new Object();
-
-            // 각 회원들을 모두 돌면서 포인트 감소
-            $oPointModel = &getModel('point');
-
-            // 포인트를 구해옴
-            $point = $module_config['download_file'];
-            foreach($member_srls as $member_srl => $cnt) {
-                $cur_point = $oPointModel->getPoint($member_srl, true);
-                $cur_point -= $cnt * $comment_point;
-                $this->setPoint($member_srl,$cur_point);
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief 게시글 삭제 포인트 적용 trigger
-         **/
-        function triggerDeleteDocument(&$obj) {
-            $module_srl = $obj->module_srl;
-            $member_srl = $obj->member_srl;
-
-            // 지울 대상 글에 대한 처리
-            if(!$module_srl || !$member_srl) return new Object();
-
-            // 로그인 상태일때만 실행
-            $logged_info = Context::get('logged_info');
-            if(!$logged_info->member_srl) return new Object();
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            $point = $module_config['insert_document'];
-            if(!isset($point)) $point = $config->insert_document;
-
-            // 포인트가 마이너스 즉 글을 작성시 마다 차감되는 경우라면 글 삭제시 증가시켜주지 않도록 수정
-            if($point < 0) return new Object();
-            $cur_point -= $point;
-
-            // 첨부파일 삭제에 대한 포인트 추가
-            $point = $module_config['upload_file'];
-            if(!isset($point)) $point = $config->upload_file;
-            if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
-
-            // 포인트 증감
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 댓글 등록 포인트 적용 trigger
-         **/
-        function triggerInsertComment(&$obj) {
-            $module_srl = $obj->module_srl;
-            $member_srl = $obj->member_srl;
-            if(!$module_srl || !$member_srl) return new Object();
-
-            // 원글이 본인의 글이라면 포인트를 올리지 않음
-            $document_srl = $obj->document_srl;
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $module_config['insert_comment'];
-            if(!isset($point)) $point = $config->insert_comment;
-
-            // 포인트 증감
-            $cur_point += $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 댓글 삭제 포인트 적용 trigger
-         **/
-        function triggerDeleteComment(&$obj) {
-            $oModuleModel = &getModel('module');
-            $oPointModel = &getModel('point');
-            $oDocumentModel = &getModel('document');
-
-            $module_srl = $obj->module_srl;
-            $member_srl = abs($obj->member_srl);
-            $document_srl = $obj->document_srl;
-            if(!$module_srl || !$member_srl) return new Object();
-
-            // 원글을 가져옴 (원글이 없거나 원글이 자신의 글이라면 포인트 적용 하지 않음)
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists()) return new Object();
-            if($oDocument->get('member_srl')==$member_srl) return new Object();
-
-            // point 모듈 정보 가져옴
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            // 대상 회원의 포인트를 구함
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $module_config['insert_comment'];
-            if(!isset($point)) $point = $config->insert_comment;
-
-            // 포인트가 마이너스 즉 댓글을 작성시 마다 차감되는 경우라면 댓글 삭제시 증가시켜주지 않도록 수정
-            if($point < 0) return new Object();
-
-            // 포인트 증감
-            $cur_point -= $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 파일 등록 trigger 추가
-         * 비유효 파일의 등록에 의한 포인트 획득을 방지하고자 이 method는 일단 무효로 둠
-         **/
-        function triggerInsertFile(&$obj) {
-            return new Object();
-        }
-
-        /**
-         * @brief 파일 삭제 포인트 적용 trigger
-         * 유효파일을 삭제할 경우에만 포인트 삭제
-         **/
-        function triggerDeleteFile(&$obj) {
-            if($obj->isvalid != 'Y') return new Object();
-
-            $module_srl = $obj->module_srl;
-            $member_srl = $obj->member_srl;
-            if(!$module_srl || !$member_srl) return new Object();
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            $point = $module_config['upload_file'];
-            if(!isset($point)) $point = $config->upload_file;
-
-            // 포인트 증감
-            $cur_point -= $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 파일 다운로드 전에 호출되는 trigger
-         **/
-        function triggerBeforeDownloadFile(&$obj) {
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-            $module_srl = $obj->module_srl;
-            if(!$module_srl) return new Object();
-
-            // 자신의 올린 파일이면 패스
-            if(abs($obj->member_srl) == abs($member_srl)) return new Object();
-
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            // 포인트가 없으면 다운로드가 안되도록 하였으면 비로그인 회원일 경우 중지
-            if(!Context::get('is_logged'))
-			{
-				if($config->disable_download == 'Y' && isset($module_config['download_file'])) return new Object(-1,'msg_not_permitted_download');
-				else return new Object();
-			}
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            // 포인트를 구해옴
-            $point = $module_config['download_file'];
-            if(!isset($point)) $point = $config->download_file;
-
-            // 포인트가 0보다 작고 포인트가 없으면 파일 다운로드가 안되도록 했다면 오류
-            if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_not_permitted_download');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 파일 다운로드 포인트 적용 trigger
-         **/
-        function triggerDownloadFile(&$obj) {
-            // 로그인 상태일때만 실행
-            $logged_info = Context::get('logged_info');
-            if(!$logged_info->member_srl) return new Object();
-            $module_srl = $obj->module_srl;
-            $member_srl = $logged_info->member_srl;
-            if(!$module_srl) return new Object();
-
-            // 자신의 올린 파일이면 패스
-            if(abs($obj->member_srl) == abs($member_srl)) return new Object();
-
-            // point 모듈 정보 가져옴
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            // 대상 회원의 포인트를 구함
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            // 포인트를 구해옴
-            $point = $module_config['download_file'];
-            if(!isset($point)) $point = $config->download_file;
-
-            // 포인트 증감
-            $cur_point += $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 조회수 증가시 포인트 적용
-         * 포인트가 없을때 조회를 하지 못하는 기능의 적용도 실행
-         **/
-        function triggerUpdateReadedCount(&$obj) {
-            $oModuleModel = &getModel('module');
-            $oPointModel = &getModel('point');
-
-            // 접속자의 정보 구함
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl;
-
-            // 원글의 회원 번호 구함
-            $target_member_srl = abs($obj->get('member_srl'));
-
-            // 원글을 적은 이와 동일하면 조회수 올리지 않고 pass
-            if($target_member_srl == $member_srl) return new Object();
-
-            // 모듈별 point 정보 가져옴
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
-
-            // 조회 포인트를 구해옴
-            $point = $module_config['read_document'];
-            if(!isset($point)) $point = $config->read_document;
-
-            // 조회 포인트가 없으면 pass
-            if(!$point) return new Object();
-
-            // 회원일 경우 읽은 적이 있으면 그냥 pass 하고 그렇지 않으면 현재 포인트 구함
-            if($member_srl) {
-                $args->member_srl = $member_srl;
-                $args->document_srl = $obj->document_srl;
-                $output = executeQuery('document.getDocumentReadedLogInfo', $args);
-                if($output->data->count) return new Object();
-                $cur_point = $oPointModel->getPoint($member_srl, true);
-            } else {
-                $cur_point = 0;
-            }
-
-            // 포인트 모듈 기본 설정 가져옴
-            $config = $oModuleModel->getModuleConfig('point');
-
-            // 조회 포인트가 -(마이너스)일때 현재 포인트와 비교
-            if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point) {
-                $obj->add('content', sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point));
-                return new Object();
-            }
-
-            // 로그인 사용자가 아니라면 pass
-            if(!$logged_info->member_srl) return new Object();
-
-            // 조회 포인트가 없으면 패스
-            if(!$point) return new Object();
-
-            // 읽은 기록이 없으면 기록 남김
-            $output = executeQuery('document.insertDocumentReadedLog', $args);
-
-            // 포인트 증감
-            $cur_point += $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 추천/비추천 시 포인트 적용
-         **/
-
-        function triggerUpdateVotedCount(&$obj) {
-            $module_srl = $obj->module_srl;
-            $member_srl = $obj->member_srl;
-            if(!$module_srl || !$member_srl) return new Object();
-
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('point');
-            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
-
-            $oPointModel = &getModel('point');
-            $cur_point = $oPointModel->getPoint($member_srl, true);
-
-            if( $obj->point > 0 ) {
-                $point = $module_config['voted'];
-                if(!isset($point)) $point = $config->voted;
-            } else {
-                $point = $module_config['blamed'];
-                if(!isset($point)) $point = $config->blamed;
-            }
-
-            if(!$point) return new Object();
-
-            // 포인트 증감
-            $cur_point += $point;
-            $this->setPoint($member_srl,$cur_point);
-
-            return new Object();
-        }
-
-        /**
-         * @brief 포인트 설정
-         **/
-        function setPoint($member_srl, $point, $mode = null) {
-            $member_srl = abs($member_srl);
-            $mode_arr = array('add', 'minus', 'update', 'signup');
-            if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
-
-            // 설정 정보 가져오기
-            $oMemberModel = &getModel('member');
-            $oModuleModel = &getModel('module');
-            $oPointModel = &getModel('point');
-            $config = $oModuleModel->getModuleConfig('point');
-
-            // 기존 포인트 정보를 구함
-            $prev_point = $oPointModel->getPoint($member_srl, true);
-            $prev_level = $oPointModel->getLevel($prev_point, $config->level_step);
-
-            // 포인트 변경
-            $args->member_srl = $member_srl;
-            $args->point = $prev_point;
-
-            switch($mode) {
-
-                case 'add' :
-                        $args->point += $point;
-                    break;
-                case 'minus' :
-                        $args->point -= $point;
-                    break;
-                case 'update' :
-                        $args->point = $point;
-                    break;
-                case 'signup' :
-                        $args->point = $point;
-                    break;
-            }
-            if($args->point < 0) $args->point = 0;
-            $point = $args->point;
-
-            // 포인트가 있으면 update, 없으면 insert
-            $oPointModel = &getModel('point');
-            if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
-            else executeQuery("point.insertPoint", $args);
-
-            // 새로운 레벨을 구함
-            $level = $oPointModel->getLevel($point, $config->level_step);
-
-            // 기존 레벨과 새로운 레벨이 다르면 포인트 그룹 설정 시도
-            if($level != $prev_level) {
-
-                // 현재 포인트 대비하여 레벨을 계산하고 레벨에 맞는 그룹 설정을 체크
-                $point_group = $config->point_group;
-
-                // 포인트 그룹 정보가 있을때 시행
-                if($point_group && is_array($point_group) && count($point_group) ) {
-
-                    // 기본 그룹을 구함
-                    $default_group = $oMemberModel->getDefaultGroup();
-
-                    // 제거될 그룹과 새로 부여 받을 그룹을 구함
-                    $del_group_list = array();
-                    $new_group_srls = array();
-
-                    asort($point_group);
-
-					//그룹 초기화 후 재설정
-					if($config->group_reset != 'N') {
-						//새로운 레벨에 맞는 그룹이 있다면
-						if(in_array($level, $point_group)) {
-							//현재 레벨의 그룹을 제외한 나머지는 모두 삭제
-							foreach($point_group as $group_srl => $target_level) {
-								$del_group_list[] = $group_srl;
-								if($target_level == $level) $new_group_srls[] = $group_srl;
-							}
-						}
-						//그렇지 않고 레벨 감소인 경우 바로 이전 그룹을 추가
-						else {
-							$i = $level;
-							while($i > 0) {
-								if(in_array($i, $point_group)) {
-									foreach($point_group as $group_srl => $target_level) {
-										if ($target_level == $i) {
-											$new_group_srls[] = $group_srl;
-										}
-									}
-									$i = 0;
-								}
-								
-								$i--;
-							}
-						}
-
-						//현재 레벨보다 높은 레벨의 그룹은 삭제
-						foreach($point_group as $group_srl => $target_level) {
-							if($target_level	 > $level) $del_group_list[] = $group_srl;
-						}
-					}
-					//새 그룹만 부여
-					else {			
-						// 포인트 그룹 설정을 돌면서 현재 레벨까지 체크
-						foreach($point_group as $group_srl => $target_level) {
-							$del_group_list[] = $group_srl;
-							if($target_level <= $level) $new_group_srls[] = $group_srl;
-						}
-					}
-
-                    // 만약 새로운 그룹이 없다면 기본 그룹을 부여 받음
-                    if(!$new_group_srls[0]) $new_group_srls[0] = $default_group->group_srl;
-
-                    // 연동 그룹 제거
-                    if($del_group_list && count($del_group_list)) {
-                        $del_group_args->member_srl = $member_srl;
-                        $del_group_args->group_srl = implode(',', $del_group_list);
-                        $del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
-                    }
-
-                    // 새로운 그룹을 부여
-                    foreach($new_group_srls as $group_srl) {
-                        $new_group_args->member_srl = $member_srl;
-                        $new_group_args->group_srl = $group_srl;
-                        executeQuery('member.addMemberToGroup', $new_group_args);
-                    }
-                }
-            }
-
-            // 캐시 설정
-            $cache_path = sprintf('./files/member_extra_info/point/%s/', getNumberingPath($member_srl));
-            FileHandler::makedir($cache_path);
-
-            $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl);
-            FileHandler::writeFile($cache_filename, $point);
-
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pointController
+     * @author NHN (developers@xpressengine.com)
+     * @brief Controller class of point modules
+     **/
+
+    class pointController extends point {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Membership point application trigger
+         **/
+        function triggerInsertMember(&$obj) {
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            // Get the member_srl of the newly registered member
+            $member_srl = $obj->member_srl;
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+
+            $point = $config->signup_point;
+            // Increase the point
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point, 'signup');
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to add points to the member for login
+         **/
+        function triggerAfterLogin(&$obj) {
+            $member_srl = $obj->member_srl;
+            if(!$member_srl) return new Object();
+            // If the last login is not today, give the points
+            if(substr($obj->last_login,0,8)==date("Ymd")) return new Object();
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+
+            $point = $config->login_point;
+            // Increase the point
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to add points to the member for creating a post
+         **/
+        function triggerInsertDocument(&$obj) {
+			$oDocumentModel = &getModel('document');
+			if($obj->status != $oDocumentModel->getConfigStatus('temp'))
+			{
+				$module_srl = $obj->module_srl;
+				$member_srl = $obj->member_srl;
+				if(!$module_srl || !$member_srl) return new Object();
+				// The fix to disable giving points for saving the document temporarily
+				if($module_srl == $member_srl) return new Object();
+				// Get the point module information
+				$oModuleModel = &getModel('module');
+				$config = $oModuleModel->getModuleConfig('point');
+				$module_config = $oModuleModel->getModulePartConfig('point',$module_srl);
+				// Get the points of the member
+				$oPointModel = &getModel('point');
+				$cur_point = $oPointModel->getPoint($member_srl, true);
+
+				$point = $module_config['insert_document'];
+				if(!isset($point)) $point = $config->insert_document;
+				$cur_point += $point;
+				// Add points for attaching a file
+				$point = $module_config['upload_file'];
+				if(!isset($point)) $point = $config->upload_file;
+				if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+				// Increase the point
+				$this->setPoint($member_srl,$cur_point);
+			}
+
+            return new Object();
+        }
+
+        /**
+         * @brief The trigger to give points for normal saving the temporarily saved document
+         * Temporary storage at the point in 1.2.3 changed to avoid payment
+         **/
+        function triggerUpdateDocument(&$obj) {
+			$oDocumentModel = &getModel('document');
+			$document_srl = $obj->document_srl;
+			$oDocument = $oDocumentModel->getDocument($document_srl);
+
+			// if status is TEMP or PUBLIC... give not point, only status is empty
+			if($oDocument->get('status') == $oDocumentModel->getConfigStatus('temp') && $obj->status != $oDocumentModel->getConfigStatus('temp'))
+			{
+				$oModuleModel = &getModel('module');
+
+				// Get the point module information
+				$config = $oModuleModel->getModuleConfig('point');
+				$module_config = $oModuleModel->getModulePartConfig('point',$obj->module_srl);
+				// Get the points of the member
+				$oPointModel = &getModel('point');
+				$cur_point = $oPointModel->getPoint($oDocument->get('member_srl'), true);
+
+				$point = $module_config['insert_document'];
+				if(!isset($point)) $point = $config->insert_document;
+				$cur_point += $point;
+				// Add points for attaching a file
+				$point = $module_config['upload_file'];
+				if(!isset($point)) $point = $config->upload_file;
+				if($obj->uploaded_count) $cur_point += $point * $obj->uploaded_count;
+				// Increase the point
+				$this->setPoint($oDocument->get('member_srl'), $cur_point);
+			}
+
+            return new Object();
+
+        }
+
+        /**
+         * @brief The trigger which deducts the points related to post comments before deleting the post itself
+         **/
+        function triggerBeforeDeleteDocument(&$obj) {
+            $document_srl = $obj->document_srl;
+            $member_srl = $obj->member_srl;
+
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return new Object();
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point',$oDocument->get('module_srl'));
+            // The process related to clearing the post comments
+            $comment_point = $module_config['insert_comment'];
+            if(!isset($comment_point)) $comment_point = $config->insert_comment;
+            // If there are comment points, attempt to deduct
+            if($comment_point>0) return new Object();
+            // Get all the comments related to this post
+            $cp_args->document_srl = $document_srl;
+            $output = executeQueryArray('point.getCommentUsers', $cp_args);
+            // Return if there is no object
+            if(!$output->data) return new Object();
+            // Organize the member number
+            $member_srls = array();
+            $cnt = count($output->data);
+            for($i=0;$i<$cnt;$i++) {
+                if($output->data[$i]->member_srl<1) continue;
+                $member_srls[abs($output->data[$i]->member_srl)] = $output->data[$i]->count;
+            }
+            // Remove the member number who has written the original post
+            if($member_srl) unset($member_srls[abs($member_srl)]);
+            if(!count($member_srls)) return new Object();
+            // Remove all the points for each member
+            $oPointModel = &getModel('point');
+            // Get the points
+            $point = $module_config['download_file'];
+            foreach($member_srls as $member_srl => $cnt) {
+                $cur_point = $oPointModel->getPoint($member_srl, true);
+                $cur_point -= $cnt * $comment_point;
+                $this->setPoint($member_srl,$cur_point);
+            }
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to give points for deleting the post
+         **/
+        function triggerDeleteDocument(&$obj) {
+            $module_srl = $obj->module_srl;
+            $member_srl = $obj->member_srl;
+            // The process related to clearing the post object
+            if(!$module_srl || !$member_srl) return new Object();
+            // Run only when logged in
+            $logged_info = Context::get('logged_info');
+            if(!$logged_info->member_srl) return new Object();
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+
+            $point = $module_config['insert_document'];
+            if(!isset($point)) $point = $config->insert_document;
+            // if the point is set to decrease when writing a document, make sure it does not increase the points when deleting an article
+            if($point < 0) return new Object();
+            $cur_point -= $point;
+            // Add points related to deleting an attachment
+            $point = $module_config['upload_file'];
+            if(!isset($point)) $point = $config->upload_file;
+            if($obj->uploaded_count) $cur_point -= $point * $obj->uploaded_count;
+            // Increase the point
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger which gives points for entering a comment
+         **/
+        function triggerInsertComment(&$obj) {
+            $module_srl = $obj->module_srl;
+            $member_srl = $obj->member_srl;
+            if(!$module_srl || !$member_srl) return new Object();
+            // Do not increase the points if the member is the author of the post
+            $document_srl = $obj->document_srl;
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists() || abs($oDocument->get('member_srl'))==abs($member_srl)) return new Object();
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+
+            $point = $module_config['insert_comment'];
+            if(!isset($point)) $point = $config->insert_comment;
+            // Increase the point
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger which gives points for deleting a comment
+         **/
+        function triggerDeleteComment(&$obj) {
+            $oModuleModel = &getModel('module');
+            $oPointModel = &getModel('point');
+            $oDocumentModel = &getModel('document');
+
+            $module_srl = $obj->module_srl;
+            $member_srl = abs($obj->member_srl);
+            $document_srl = $obj->document_srl;
+            if(!$module_srl || !$member_srl) return new Object();
+            // Get the original article (if the original article is missing or if the member is its author, do not apply the points)
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return new Object();
+            if($oDocument->get('member_srl')==$member_srl) return new Object();
+            // Get the point module information
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+            // Get the points of the member
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+
+            $point = $module_config['insert_comment'];
+            if(!isset($point)) $point = $config->insert_comment;
+            // if the point is set to decrease when writing a comment, make sure it does not increase the points when deleting a comment
+            if($point < 0) return new Object();
+            // Increase the point
+            $cur_point -= $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief Add the file registration trigger
+         * To prevent taking points for invalid file registration this method wlil return a null object
+         **/
+        function triggerInsertFile(&$obj) {
+            return new Object();
+        }
+
+        /**
+         * @brief A trigger to give points for deleting a file
+         * Remove points only in case an invalid file is being deleted
+         **/
+        function triggerDeleteFile(&$obj) {
+            if($obj->isvalid != 'Y') return new Object();
+
+            $module_srl = $obj->module_srl;
+            $member_srl = $obj->member_srl;
+            if(!$module_srl || !$member_srl) return new Object();
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+
+            $point = $module_config['upload_file'];
+            if(!isset($point)) $point = $config->upload_file;
+            // Increase the point
+            $cur_point -= $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief The trigger called before a file is downloaded
+         **/
+        function triggerBeforeDownloadFile(&$obj) {
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            $module_srl = $obj->module_srl;
+            if(!$module_srl) return new Object();
+            // Pass if it is your file
+            if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+            // If it is set not to allow downloading for non-logged in users, do not permit
+            if(!Context::get('is_logged'))
+			{
+				if($config->disable_download == 'Y' && isset($module_config['download_file'])) return new Object(-1,'msg_not_permitted_download');
+				else return new Object();
+			}
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+            // Get the points
+            $point = $module_config['download_file'];
+            if(!isset($point)) $point = $config->download_file;
+            // If points are less than 0, and if downloading a file is not allowed in this case, give an errors
+            if($cur_point + $point < 0 && $config->disable_download == 'Y') return new Object(-1,'msg_not_permitted_download');
+
+            return new Object();
+        }
+
+        /**
+         * @brief The trigger to give points for downloading the file
+         **/
+        function triggerDownloadFile(&$obj) {
+            // Run only when logged in
+            $logged_info = Context::get('logged_info');
+            if(!$logged_info->member_srl) return new Object();
+            $module_srl = $obj->module_srl;
+            $member_srl = $logged_info->member_srl;
+            if(!$module_srl) return new Object();
+            // Pass if it is your file
+            if(abs($obj->member_srl) == abs($member_srl)) return new Object();
+            // Get the point module information
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+            // Get the points of the member
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+            // Get the points
+            $point = $module_config['download_file'];
+            if(!isset($point)) $point = $config->download_file;
+            // Increase the point
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief Give points for hits increase
+         * Run it even if there are no points
+         **/
+        function triggerUpdateReadedCount(&$obj) {
+            $oModuleModel = &getModel('module');
+            $oPointModel = &getModel('point');
+            // Get visitor information
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl;
+            // Get the original author number
+            $target_member_srl = abs($obj->get('member_srl'));
+            // Pass without increasing the hits if the viewer is the same as the author
+            if($target_member_srl == $member_srl) return new Object();
+            // Get the point information for each module
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $obj->get('module_srl'));
+            // Get hits points
+            $point = $module_config['read_document'];
+            if(!isset($point)) $point = $config->read_document;
+            // Pass if there are no requested points
+            if(!$point) return new Object();
+            // In case of a registered member, if it is read but cannot just pass, then get the current points
+            if($member_srl) {
+                $args->member_srl = $member_srl;
+                $args->document_srl = $obj->document_srl;
+                $output = executeQuery('document.getDocumentReadedLogInfo', $args);
+                if($output->data->count) return new Object();
+                $cur_point = $oPointModel->getPoint($member_srl, true);
+            } else {
+                $cur_point = 0;
+            }
+            // Get the defaul configurations of the Point Module
+            $config = $oModuleModel->getModuleConfig('point');
+            // When the requested points are negative, compared it with the current point
+            if($config->disable_read_document == 'Y' && $point < 0 && abs($point)>$cur_point) {
+                $obj->add('content', sprintf(Context::getLang('msg_disallow_by_point'), abs($point), $cur_point));
+                return new Object();
+            }
+            // If not logged in, pass
+            if(!$logged_info->member_srl) return new Object();
+            // Pass, if there are no requested points
+            if(!$point) return new Object();
+            // If the read record is missing, leave it
+            $output = executeQuery('document.insertDocumentReadedLog', $args);
+            // Increase the point
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief Points for voting up or down
+         **/
+
+        function triggerUpdateVotedCount(&$obj) {
+            $module_srl = $obj->module_srl;
+            $member_srl = $obj->member_srl;
+            if(!$module_srl || !$member_srl) return new Object();
+
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+            $module_config = $oModuleModel->getModulePartConfig('point', $module_srl);
+
+            $oPointModel = &getModel('point');
+            $cur_point = $oPointModel->getPoint($member_srl, true);
+
+            if( $obj->point > 0 ) {
+                $point = $module_config['voted'];
+                if(!isset($point)) $point = $config->voted;
+            } else {
+                $point = $module_config['blamed'];
+                if(!isset($point)) $point = $config->blamed;
+            }
+
+            if(!$point) return new Object();
+            // Increase the point
+            $cur_point += $point;
+            $this->setPoint($member_srl,$cur_point);
+
+            return new Object();
+        }
+
+        /**
+         * @brief Set points
+         **/
+        function setPoint($member_srl, $point, $mode = null) {
+            $member_srl = abs($member_srl);
+            $mode_arr = array('add', 'minus', 'update', 'signup');
+            if(!$mode || !in_array($mode,$mode_arr)) $mode = 'update';
+            // Get configuration information
+            $oMemberModel = &getModel('member');
+            $oModuleModel = &getModel('module');
+            $oPointModel = &getModel('point');
+            $config = $oModuleModel->getModuleConfig('point');
+            // Get the default configuration information
+            $prev_point = $oPointModel->getPoint($member_srl, true);
+            $prev_level = $oPointModel->getLevel($prev_point, $config->level_step);
+            // Change points
+            $args->member_srl = $member_srl;
+            $args->point = $prev_point;
+
+            switch($mode) {
+
+                case 'add' :
+                        $args->point += $point;
+                    break;
+                case 'minus' :
+                        $args->point -= $point;
+                    break;
+                case 'update' :
+                        $args->point = $point;
+                    break;
+                case 'signup' :
+                        $args->point = $point;
+                    break;
+            }
+            if($args->point < 0) $args->point = 0;
+            $point = $args->point;
+            // If there are points, update, if no, insert
+            $oPointModel = &getModel('point');
+            if($oPointModel->isExistsPoint($member_srl)) executeQuery("point.updatePoint", $args);
+            else executeQuery("point.insertPoint", $args);
+            // Get a new level
+            $level = $oPointModel->getLevel($point, $config->level_step);
+            // If existing level and a new one are different attempt to set a point group
+            if($level != $prev_level) {
+                // Check if the level, for which the current points are prepared, is calculate and set the correct group
+                $point_group = $config->point_group;
+                // If the point group exists
+                if($point_group && is_array($point_group) && count($point_group) ) {
+                    // Get the default group
+                    $default_group = $oMemberModel->getDefaultGroup();
+                    // Get the removed group and the newly granted group
+                    $del_group_list = array();
+                    $new_group_srls = array();
+
+                    asort($point_group);
+                    // Reset group after initialization
+					if($config->group_reset != 'N') {
+                        // If the new level is in the right group
+						if(in_array($level, $point_group)) {
+                        // Delete all groups except the one which the current level belongs to
+							foreach($point_group as $group_srl => $target_level) {
+								$del_group_list[] = $group_srl;
+								if($target_level == $level) $new_group_srls[] = $group_srl;
+							}
+						}
+                        // Otherwise, in case the level is reduced, add the recent group
+						else {
+							$i = $level;
+							while($i > 0) {
+								if(in_array($i, $point_group)) {
+									foreach($point_group as $group_srl => $target_level) {
+										if ($target_level == $i) {
+											$new_group_srls[] = $group_srl;
+										}
+									}
+									$i = 0;
+								}
+								
+								$i--;
+							}
+						}
+                        // Delete the group of a level which is higher than the current level
+						foreach($point_group as $group_srl => $target_level) {
+							if($target_level	 > $level) $del_group_list[] = $group_srl;
+						}
+					}
+                    // Grant a new group
+					else {			
+                        // Check until the current level by rotating setting the configurations of the point groups
+						foreach($point_group as $group_srl => $target_level) {
+							$del_group_list[] = $group_srl;
+							if($target_level <= $level) $new_group_srls[] = $group_srl;
+						}
+					}
+                    // If there is no a new group, granted the default group
+                    if(!$new_group_srls[0]) $new_group_srls[0] = $default_group->group_srl;
+                    // Remove linkage group
+                    if($del_group_list && count($del_group_list)) {
+                        $del_group_args->member_srl = $member_srl;
+                        $del_group_args->group_srl = implode(',', $del_group_list);
+                        $del_group_output = executeQuery('point.deleteMemberGroup', $del_group_args);
+                    }
+                    // Grant a new group
+                    foreach($new_group_srls as $group_srl) {
+                        $new_group_args->member_srl = $member_srl;
+                        $new_group_args->group_srl = $group_srl;
+                        executeQuery('member.addMemberToGroup', $new_group_args);
+                    }
+                }
+            }
+            // Cache Settings
+            $cache_path = sprintf('./files/member_extra_info/point/%s/', getNumberingPath($member_srl));
+            FileHandler::makedir($cache_path);
+
+            $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $member_srl);
+            FileHandler::writeFile($cache_filename, $point);
+
+            return $output;
+        }
+    }
+?>
diff --git a/modules/point/point.model.php b/modules/point/point.model.php
index a7da64224..21f7dd51a 100644
--- a/modules/point/point.model.php
+++ b/modules/point/point.model.php
@@ -1,146 +1,174 @@
-<?php
-    /**
-     * @class  pointModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  point 모듈의 model class
-     **/
-
-    class pointModel extends point {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 포인트 정보가 있는지 체크
-         **/
-        function isExistsPoint($member_srl) {
-            $member_srl = abs($member_srl);
-            $args->member_srl = $member_srl;
-            $output = executeQuery('point.getPoint', $args);
-            if($output->data->member_srl == $member_srl) return true;
-            return false;
-        }
-
-        /**
-         * @brief 포인트를 구해옴
-         **/
-        function getPoint($member_srl, $from_db = false) {
-            $member_srl = abs($member_srl);
-            $path = sprintf('./files/member_extra_info/point/%s',getNumberingPath($member_srl));
-            if(!is_dir($path)) FileHandler::makeDir($path);
-            $cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
-
-            if(!$from_db && file_exists($cache_filename)) return trim(FileHandler::readFile($cache_filename));
-
-            // DB에서 가져옴
-            $args->member_srl = $member_srl;
-            $output = executeQuery('point.getPoint', $args);
-            $point = (int)$output->data->point;
-
-            FileHandler::writeFile($cache_filename, $point);
-
-            return $point;
-        }
-
-        /**
-         * @brief 레벨을 구함
-         **/
-        function getLevel($point, $level_step) {
-            $level_count = count($level_step);
-            for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
-            $level --;
-            return $level;
-        }
-
-		function getMembersPointInfo()
-		{
-			$member_srls = Context::get('member_srls');
-			$member_srls = explode(',',$member_srls);
-			if(count($member_srls)==0) return;
-			array_unique($member_srls);
-
-			$oModuleModel = &getModel('module');
-			$config = $oModuleModel->getModuleConfig('point');
-
-			$info = array();
-			foreach($member_srls as $v)
-			{
-				$obj = new stdClass;
-				$obj->point = $this->getPoint($v);
-				$obj->level = $this->getLevel($obj->point, $config->level_step);
-				$obj->member_srl = $v;
-				$info[] = $obj;
-			}
-
-			$this->add('point_info',$info);
-		}
-
-
-        /**
-         * @brief 포인트 순 회원목록 가져오기
-         **/
-        function getMemberList($args = null) {
-
-            // 검색 옵션 정리
-            $args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
-            $args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
-            $args->selected_group_srl = Context::get('selected_group_srl');
-
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
-
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'user_id' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_id = $search_keyword;
-                        break;
-                    case 'user_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_user_name = $search_keyword;
-                        break;
-                    case 'nick_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_nick_name = $search_keyword;
-                        break;
-                    case 'email_address' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_email_address = $search_keyword;
-                        break;
-                    case 'regdate' :
-                            $args->s_regdate = $search_keyword;
-                        break;
-                    case 'last_login' :
-                            $args->s_last_login = $search_keyword;
-                        break;
-                    case 'extra_vars' :
-                            $args->s_extra_vars = $search_keyword;
-                        break;
-                }
-            }
-
-            // selected_group_srl이 있으면 query id를 변경 (table join때문에)
-            if($args->selected_group_srl) {
-                $query_id = 'point.getMemberListWithinGroup';
-            } else {
-                $query_id = 'point.getMemberList';
-            }
-
-            $output = executeQuery($query_id, $args);
-
-            if($output->total_count) {
-                $oModuleModel = &getModel('module');
-                $config = $oModuleModel->getModuleConfig('point');
-
-                foreach($output->data as $key => $val) {
-                    $output->data[$key]->level = $this->getLevel($val->point, $config->level_step);
-                }
-            }
-
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pointModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief The model class fo the point module
+     **/
+
+    class pointModel extends point {
+		var $pointList = array();
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Check if there is points information
+         **/
+        function isExistsPoint($member_srl) {
+            $member_srl = abs($member_srl);
+
+			// Get from instance memory
+			if($this->pointList[$member_srl]) return true;
+
+			// Get from file cache
+            $path = sprintf('./files/member_extra_info/point/%s',getNumberingPath($member_srl));
+            $cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
+            if(file_exists($cache_filename))
+			{
+				if(!$this->pointList[$member_srl])
+					$this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+				return true;
+			}
+
+            $args->member_srl = $member_srl;
+            $output = executeQuery('point.getPoint', $args);
+            if($output->data->member_srl == $member_srl)
+			{
+				if(!$this->pointList[$member_srl])
+					$this->pointList[$member_srl] = (int)$output->data->point;
+				return true;
+			}
+            return false;
+        }
+
+        /**
+         * @brief Get the points
+         **/
+        function getPoint($member_srl, $from_db = false) {
+            $member_srl = abs($member_srl);
+
+			// Get from instance memory
+			if(!$from_db && $this->pointList[$member_srl]) return $this->pointList[$member_srl];
+
+			// Get from file cache
+            $path = sprintf('./files/member_extra_info/point/%s',getNumberingPath($member_srl));
+            $cache_filename = sprintf('%s%d.cache.txt', $path, $member_srl);
+
+            if(!$from_db && file_exists($cache_filename))
+				return $this->pointList[$member_srl] = trim(FileHandler::readFile($cache_filename));
+
+            // Get from the DB
+            $args->member_srl = $member_srl;
+            $output = executeQuery('point.getPoint', $args);
+
+			if(isset($output->data->member_srl))
+			{
+				$point = (int)$output->data->point;
+				$this->pointList[$member_srl] = $point;
+            	if(!is_dir($path)) FileHandler::makeDir($path);
+				FileHandler::writeFile($cache_filename, $point);
+            	return $point;
+			}
+			return 0;
+        }
+
+        /**
+         * @brief Get the level
+         **/
+        function getLevel($point, $level_step) {
+            $level_count = count($level_step);
+            for($level=0;$level<=$level_count;$level++) if($point < $level_step[$level]) break;
+            $level --;
+            return $level;
+        }
+
+		function getMembersPointInfo()
+		{
+			$member_srls = Context::get('member_srls');
+			$member_srls = explode(',',$member_srls);
+			if(count($member_srls)==0) return;
+			array_unique($member_srls);
+
+			$oModuleModel = &getModel('module');
+			$config = $oModuleModel->getModuleConfig('point');
+
+			$info = array();
+			foreach($member_srls as $v)
+			{
+				$obj = new stdClass;
+				$obj->point = $this->getPoint($v);
+				$obj->level = $this->getLevel($obj->point, $config->level_step);
+				$obj->member_srl = $v;
+				$info[] = $obj;
+			}
+
+			$this->add('point_info',$info);
+		}
+
+
+        /**
+         * @brief Get a list of points members list
+         **/
+        function getMemberList($args = null, $columnList = array()) {
+            // Arrange the search options
+            $args->is_admin = Context::get('is_admin')=='Y'?'Y':'';
+            $args->is_denied = Context::get('is_denied')=='Y'?'Y':'';
+            $args->selected_group_srl = Context::get('selected_group_srl');
+
+            $search_target = trim(Context::get('search_target'));
+            $search_keyword = trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'user_id' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_id = $search_keyword;
+                        break;
+                    case 'user_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_user_name = $search_keyword;
+                        break;
+                    case 'nick_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_nick_name = $search_keyword;
+                        break;
+                    case 'email_address' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_email_address = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'last_login' :
+                            $args->s_last_login = $search_keyword;
+                        break;
+                    case 'extra_vars' :
+                            $args->s_extra_vars = $search_keyword;
+                        break;
+                }
+            }
+            // If there is a selected_group_srl, change the "query id" (for table join)
+            if($args->selected_group_srl) {
+                $query_id = 'point.getMemberListWithinGroup';
+            } else {
+                $query_id = 'point.getMemberList';
+            }
+
+            $output = executeQuery($query_id, $args, $columnList);
+
+            if($output->total_count) {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('point');
+
+                foreach($output->data as $key => $val) {
+                    $output->data[$key]->level = $this->getLevel($val->point, $config->level_step);
+                }
+            }
+
+            return $output;
+        }
+    }
+?>
diff --git a/modules/point/point.view.php b/modules/point/point.view.php
index d1e88e9ff..cd19ea9d6 100644
--- a/modules/point/point.view.php
+++ b/modules/point/point.view.php
@@ -1,62 +1,60 @@
-<?php
-    /**
-     * @class  pointView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  point module의 view class
-     *
-     * POINT 2.0형식으로 문서 출력
-     *
-     **/
-
-    class pointView extends point {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 서비스형 모듈의 추가 설정을 위한 부분
-         * point의 사용 형태에 대한 설정만 받음
-         **/
-        function triggerDispPointAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            // 설정 정보 가져오기
-            $oModuleModel = &getModel('module');
-
-            if($current_module_srl) {
-                $module_config = $oModuleModel->getModulePartConfig('point', $current_module_srl);
-                if(!$module_config) {
-                    $config = $oModuleModel->getModuleConfig('point');
-                    $module_config['insert_document'] = $config->insert_document;
-                    $module_config['insert_comment'] = $config->insert_comment;
-                    $module_config['upload_file'] = $config->upload_file;
-                    $module_config['download_file'] = $config->download_file;
-                    $module_config['read_document'] = $config->read_document;
-                    $module_config['voted'] = $config->voted;
-                    $module_config['blamed'] = $config->blamed;
-                }
-            }
-
-            $module_config['module_srl'] = $current_module_srl;
-            $module_config['point_name'] = $config->point_name;
-            Context::set('module_config', $module_config);
-
-            // 템플릿 파일 지정
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'point_module_config');
-            $obj .= $tpl;
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pointView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The view class of the point module
+     *
+     * POINT 2.0 format document output
+     *
+     **/
+
+    class pointView extends point {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Additional configurations for a service module
+         * Receive the form for the form used by point
+         **/
+        function triggerDispPointAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+            // Get the configuration information
+            $oModuleModel = &getModel('module');
+
+            if($current_module_srl) {
+                $module_config = $oModuleModel->getModulePartConfig('point', $current_module_srl);
+                if(!$module_config) {
+                    $config = $oModuleModel->getModuleConfig('point');
+                    $module_config['insert_document'] = $config->insert_document;
+                    $module_config['insert_comment'] = $config->insert_comment;
+                    $module_config['upload_file'] = $config->upload_file;
+                    $module_config['download_file'] = $config->download_file;
+                    $module_config['read_document'] = $config->read_document;
+                    $module_config['voted'] = $config->voted;
+                    $module_config['blamed'] = $config->blamed;
+                }
+            }
+
+            $module_config['module_srl'] = $current_module_srl;
+            $module_config['point_name'] = $config->point_name;
+            Context::set('module_config', $module_config);
+            // Set the template file
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'point_module_config');
+            $obj .= $tpl;
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/point/queries/getCommentPoint.xml b/modules/point/queries/getCommentPoint.xml
index 2344aa1dc..e74f85e06 100644
--- a/modules/point/queries/getCommentPoint.xml
+++ b/modules/point/queries/getCommentPoint.xml
@@ -1,14 +1,23 @@
 <query id="getCommentPoint" action="select">
-    <tables>
-        <table name="comments" />
-    </tables>
-    <columns>
-        <column name="module_srl" />
-        <column name="member_srl" />
-        <column name="count(*)" alias="count" />
-    </columns>
-    <groups>
-        <group column="module_srl" />
-        <group column="member_srl" />
-    </groups>
+	<tables>
+		<table name="comments" />
+		<table name="documents" type="left outer join" >
+			<conditions>
+				<condition operation="equal" column="comments.document_srl" default="documents.document_srl" />
+			</conditions>
+		</table>
+	</tables>
+	<columns>
+		<column name="comments.module_srl" />
+		<column name="comments.member_srl" />
+		<column name="count(*)" alias="count" />
+	</columns>
+	<conditions>
+		<condition operation="notequal" column="comments.member_srl" default="0" />
+		<condition operation="notequal" column="comments.member_srl" default="documents.member_srl" pipe="and" />
+	</conditions>
+	<groups>
+		<group column="comments.module_srl" />
+		<group column="comments.member_srl" />
+	</groups>
 </query>
diff --git a/modules/point/queries/getDocumentPoint.xml b/modules/point/queries/getDocumentPoint.xml
index e60b8b84e..e0e5c5cd3 100644
--- a/modules/point/queries/getDocumentPoint.xml
+++ b/modules/point/queries/getDocumentPoint.xml
@@ -7,6 +7,9 @@
         <column name="member_srl" />
         <column name="count(*)" alias="count" />
     </columns>
+	<conditions>
+		<condition operation="notequal" column="member_srl" default="0" />
+	</conditions>
     <groups>
         <group column="module_srl" />
         <group column="member_srl" />
diff --git a/modules/point/queries/getFilePoint.xml b/modules/point/queries/getFilePoint.xml
index 3a7247233..3b057a3d8 100644
--- a/modules/point/queries/getFilePoint.xml
+++ b/modules/point/queries/getFilePoint.xml
@@ -8,7 +8,8 @@
         <column name="count(*)" alias="count" />
     </columns>
     <conditions>
-        <condition operation="equal" column="isvalid" default="Y" notnull="notnull" />
+		<condition operation="notequal" column="member_srl" default="0" />
+        <condition operation="equal" column="isvalid" default="Y" notnull="notnull" pipe="and" />
     </conditions>
     <groups>
         <group column="module_srl" />
diff --git a/modules/point/queries/getMemberCount.xml b/modules/point/queries/getMemberCount.xml
index e59d056e1..24779b32f 100644
--- a/modules/point/queries/getMemberCount.xml
+++ b/modules/point/queries/getMemberCount.xml
@@ -1,8 +1,8 @@
-<query id="getMemberCount" action="select">
-    <tables>
-        <table name="member" />
-    </tables>
-    <columns>
-        <column name="member_srl" />
-    </columns>
+<query id="getMemberCount" action="select">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="member_srl" />
+    </columns>
 </query>
\ No newline at end of file
diff --git a/modules/point/queries/getPointCount.xml b/modules/point/queries/getPointCount.xml
index d336275cf..669a451c2 100644
--- a/modules/point/queries/getPointCount.xml
+++ b/modules/point/queries/getPointCount.xml
@@ -1,8 +1,8 @@
-<query id="getPointCount" action="select">
-    <tables>
-        <table name="point" />
-    </tables>
-    <columns>
-        <column name="count(*)" alias="count" />
-    </columns>
+<query id="getPointCount" action="select">
+    <tables>
+        <table name="point" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
 </query>
\ No newline at end of file
diff --git a/modules/point/ruleset/insertConfig.xml b/modules/point/ruleset/insertConfig.xml
new file mode 100644
index 000000000..7f5583679
--- /dev/null
+++ b/modules/point/ruleset/insertConfig.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="less_than_1000" type="expr" test="$$ &lt; 1000" />
+    </customrules>
+    <fields>
+		<field name="max_level" required="true" rule="number,less_than_1000" />
+		<field name="point_name" required="true" />
+		<field name="signup_point" required="true" default="0" />
+		<field name="login_point" required="true" default="0" />
+		<field name="insert_document" required="true" default="0" />
+		<field name="insert_comment" required="true" default="0" />
+		<field name="upload_file" required="true" default="0" />
+		<field name="download_file" required="true" default="0" />
+		<field name="read_document" required="true" default="0" />
+		<field name="voted" required="true" default="0" />
+		<field name="blamed" required="true" default="0" />
+		<field name="level_icon" required="true" default="default" />
+    </fields>
+</ruleset>
diff --git a/modules/point/ruleset/updatePoint.xml b/modules/point/ruleset/updatePoint.xml
new file mode 100644
index 000000000..a7d95de8a
--- /dev/null
+++ b/modules/point/ruleset/updatePoint.xml
@@ -0,0 +1,10 @@
+<?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]*$/"  />
+    </customrules>
+    <fields>
+		<field name="member_srl" required="true" rule="number" />
+		<field name="point" required="true" rule="number_with_plus_minus" />
+    </fields>
+</ruleset>
diff --git a/modules/point/tpl/config.html b/modules/point/tpl/config.html
index 3fd5753e5..e01a2bcdc 100644
--- a/modules/point/tpl/config.html
+++ b/modules/point/tpl/config.html
@@ -1,195 +1,161 @@
-<!--%import("filter/insert_config.xml")-->
 <!--#include("./header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config);">
-
-<div class="adminLeftContent">
-
-    <h4 class="xeAdmin">{$lang->max_level}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td colspan="2">
-            <input type="text" class="inputTypeText w80" value="{$config->max_level}" name="max_level" />
-            <p>{$lang->about_max_level}</p>
-        </td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->point_name}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td colspan="2">
-            <input type="text" class="inputTypeText w80" value="{$config->point_name}" name="point_name" />
-            <p>{$lang->about_point_name}</p>
-        </td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->is_default}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr class="row2">
-        <td><div>{$lang->point_signup}</div></td>
-        <td>
-            <input type="text" class="inputTypeText w80" value="{$config->signup_point}" name="signup_point" /> {$config->point_name}
-            <p>{$lang->about_point_signup}</p>
-        </td>
-    </tr>
-    <tr>
-        <td><div>{$lang->cmd_login}</div></td>
-        <td><input type="text" class="inputTypeText w80" value="{$config->login_point}" name="login_point" /> {$config->point_name}</td>
-    </tr>
-    <tr class="row2">
-        <td><div>{$lang->point_insert_document}</div></td>
-        <td><input type="text" name="insert_document" value="{$config->insert_document}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <tr>
-        <td><div>{$lang->point_insert_comment}</div></td>
-        <td><input type="text" name="insert_comment" value="{$config->insert_comment}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <tr class="row2">
-        <td><div>{$lang->point_upload_file}</div></td>
-        <td><input type="text" name="upload_file" value="{$config->upload_file}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <tr>
-        <td><div>{$lang->point_download_file}</div></td>
-        <td><input type="text" name="download_file" value="{$config->download_file}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <tr class="row2">
-        <td><div>{$lang->point_read_document}</div></td>
-        <td><input type="text" name="read_document" value="{$config->read_document}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <tr>
-        <td><div>{$lang->point_voted}</div></td>
-        <td><input type="text" name="voted" value="{$config->voted}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <tr class="row2">
-        <td><div>{$lang->point_blamed}</div></td>
-        <td><input type="text" name="blamed" value="{$config->blamed}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->level_icon}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td colspan="2">
-            <select name="level_icon" class="fullWidth">
-            <!--@foreach($level_icon_list as $key => $val)-->
-                <option value="{$val}" <!--@if($config->level_icon == $val)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-            </select>
-            <p>{$lang->about_level_icon}</p>
-        </td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->disable_download}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td colspan="2">
-            <input type="checkbox" name="disable_download" value="Y" <!--@if($config->disable_download=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_disable_download}</p>
-        </td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->disable_read_document}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td colspan="2">
-            <input type="checkbox" name="disable_read_document" value="Y" <!--@if($config->disable_read_document=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_disable_read_document}</p>
-        </td>
-    </tr>
-    </table>
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->point_link_group}</h4>
-    <table cellspacing="0" class="rowTable">
-    <thead>
-    <tr>
-        <th class="half_wide"><div>{$lang->group}<div></th>
-        <th class="half_wide"><div>{$lang->level}<div></th>
-    </tr>
-    </thead>
-    <tbody>
-    <!--@foreach($group_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="center"><div>{$val->title}</div></td>
-        <td class="center"><input type="text" class="inputTypeText w80" value="{$config->point_group[$key]}" name="point_group_{$key}" /></td>
-    </tr>
-    <!--@end-->
-    <tr class="row{$cycle_idx}">
-        <td colspan="2">
-            <select name="group_reset">
-                <option value="Y"<!--@if($config->group_reset != 'N')--> selected="selected"<!--@end-->>{$lang->point_group_reset_and_add}</option>
-                <option value="N"<!--@if($config->group_reset == 'N')--> selected="selected"<!--@end-->>{$lang->point_group_add_only}</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <td colspan="2"><p>{$lang->about_point_link_group}</p></td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </tbody>
-    </table>
+<p>{$lang->about_point_module}</p>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<div class="adminRightExtra">
-    <h4 class="xeAdmin">{$lang->level_point_calc}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td><input name="expression" value="{$config->expression}" size="4" class="inputTypeText w100"/> <input type="button" onclick="exp_calc(this.form)" value="{$lang->cmd_exp_calc}" /> <input type="button" onclick="exp_calc(this.form, true)" value="{$lang->cmd_exp_reset}" /><p>{$lang->expression}</p>
-        </td>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->level_point}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td>1</td>
-        <td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/1.gif" alt="" /></td>
-        <td><input type="text" name="level_step_1" value="{$config->level_step[1]}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <!--@for($i=2;$i<=$config->max_level;$i++)-->
-    <tr class="row{(($i-1)%2+1)}">
-        <td>{$i}</td>
-        <td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/{$i}.gif" alt="" /></td>
-        <td><input type="text" id="level_step_{$i}" name="level_step_{$i}" value="{$config->level_step[$i]}" class="inputTypeText w80" /> {$config->point_name}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="4" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
-    <h4 class="xeAdmin">{$lang->cmd_point_recal}</h4>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <td>
-            <p>{$lang->about_cmd_point_recal}</p>
-            <p id="pointReCal"></p>
-        </td>
-    </tr>
-    <tr>
-        <th class="button">
-            <span class="button black strong"><input type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
-        </td>
-    </tr>
-    </table>
-</div>
-
-
+<form ruleset="insertConfig" action="./" method="post" class="form">
+	<input type="hidden" name="module" value="point" />
+	<input type="hidden" name="act" value="procPointAdminInsertConfig" />
+	<fieldset>
+		<h2 class="h2">{$lang->is_default}</h2>
+		<ul>
+			<li>
+				<p class="q"><label for="max_level">{$lang->max_level}</label></p>
+				<p class="a">
+					<input type="text" value="{$config->max_level}" name="max_level" id="max_level" style="width:30px" />
+					<span class="desc">{$lang->about_max_level}</span>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="point_name">{$lang->point_name}</label></p>
+				<p class="a">
+					<input type="text" value="{$config->point_name}" name="point_name" id="point_name" style="width:30px" />
+					<span class="desc">{$lang->about_point_name}</span>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label>{$lang->give_point}</label></p>
+				<p class="a">
+					<input type="text" value="{$config->signup_point}" name="signup_point" id="signup_point" style="width:30px" /> : 
+					<label for="signup_point">{$lang->point_signup}</label>
+					<br />
+					<input type="text" value="{$config->login_point}" name="login_point" id="login_point" style="width:30px" /> :
+					<label for="login_point">{$lang->cmd_login}</label>
+					<br />
+					<input type="text" name="insert_document" value="{$config->insert_document}" id="insert_document" style="width:30px" /> :
+					<label for="insert_document">{$lang->point_insert_document}</label>
+					<br />
+					<input type="text" name="insert_comment" value="{$config->insert_comment}" id="insert_comment" style="width:30px" /> :
+					<label for="insert_comment">{$lang->point_insert_comment}</label>
+					<br />
+					<input type="text" name="upload_file" value="{$config->upload_file}" id="upload_file" style="width:30px" /> :
+					<label for="upload_file">{$lang->point_upload_file}</label>
+					<br />
+					<input type="text" name="download_file" value="{$config->download_file}" id="download_file" style="width:30px" /> :
+					<label for="download_file">{$lang->point_download_file}</label>
+					<br />
+					<input type="text" name="read_document" value="{$config->read_document}" id="read_document" style="width:30px" /> :
+					<label for="read_document">{$lang->point_read_document}</label>
+					<br />
+					<input type="text" name="voted" value="{$config->voted}" style="width:30px" id="voted" /> :
+					<label for="voted">{$lang->point_voted}</label>
+					<br />
+					<input type="text" name="blamed" value="{$config->blamed}" id="blamed" style="width:30px" /> :
+					<label for="blamed">{$lang->point_blamed}</label>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="level_icon">{$lang->level_icon}</label></p>
+				<p class="a">
+					<select name="level_icon" id="level_icon">
+						<!--@foreach($level_icon_list as $key => $val)-->
+						<option value="{$val}" selected="selected"|cond="$config->level_icon == $val">{$val}</option>
+						<!--@end-->
+					</select>
+					<span class="desc">{$lang->about_level_icon}</span>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="disable_download">{$lang->disable_download}</label></p>
+				<p class="a">
+					<input type="checkbox" name="disable_download" id="disable_download" value="Y" checked="checked"|cond="$config->disable_download=='Y'" />
+					<span class="desc">{$lang->about_disable_download}</span>
+				</p>
+			</li>
+			<li>
+				<p class="q"><label for="disable_read_document">{$lang->disable_read_document}</label></p>
+				<p class="a">
+					<input type="checkbox" name="disable_read_document" id="disable_read_document" value="Y" checked="checked"|cond="$config->disable_read_document=='Y'" />
+					<span class="desc">{$lang->about_disable_read_document}</span>
+				</p>
+			</li>
+		</ul>
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</fieldset>
+	<fieldset>
+		<h2 class="h2">{$lang->point_link_group}</h2>
+		<div class="table even">
+			<table width="100%" border="1" cellspacing="0">
+				<caption>
+					{$lang->about_point_link_group}
+					<span class="side">
+						<input type="radio" name="group_reset" id="group_reset_y" checked="checked"|cond="$config->group_reset != 'N'" /> 
+						<label for="group_reset_y">{$lang->point_group_reset_and_add}</label>
+						<input type="radio" name="group_reset" id="group_reset_n" checked="checked"|cond="$config->group_reset == 'N'" /> 
+						<label for="group_reset_n">{$lang->point_group_add_only}</label>
+					</span>
+				</caption>
+				<thead>
+					<tr>
+						<th>{$lang->member_group}</th>
+						<th>{$lang->level}</th>
+					</tr>
+				</thead>
+				<tbody>
+					<tr loop="$group_list => $key,$val">
+						<td><label for="point_group_{$key}">{$val->title}</label></td>
+						<td><input type="text" value="{$config->point_group[$key]}" name="point_group_{$key}" id="point_group_{$key}" style="width:30px" /></td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</fieldset>
+	<fieldset>
+		<h2 class="h2">{$lang->level_point}</h2>
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0">
+				<caption>
+					<span class="side">
+						<label for="">{$lang->expression}</label>
+						<input value="{$config->expression}" size="30" class="level_expression" />
+						<button type="button" class="calc_point">{$lang->level_point_calc}</button> 
+						<button type="button" class="calc_point _reset">{$lang->cmd_exp_reset}</button>
+					</span>
+				</caption>
+				<tr>
+					<th scope="col">{$lang->level}</th>
+					<th scope="col">{$lang->level_icon}</th>
+					<th scope="col">{$lang->point}</th>
+				</tr>
+				<tr>
+					<td>1</td>
+					<td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/1.gif" alt="" /></td>
+					<td><input type="text" name="level_step_1" value="{$config->level_step[1]}" style="width:40px;text-align:right" /> {$config->point_name}</td>
+				</tr>
+				<!--@for($i=2;$i<=$config->max_level;$i++)-->
+				<tr class="row{(($i-1)%2+1)}">
+					<td>{$i}</td>
+					<td><img src="{getUrl()}/modules/point/icons/{$config->level_icon}/{$i}.gif" alt="" /></td>
+					<td><input type="text" id="level_step_{$i}" name="level_step_{$i}" value="{$config->level_step[$i]}" style="width:40px;text-align:right" /> {$config->point_name}</td>
+				</tr>
+				<!--@end-->
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</fieldset>
+	<fieldset>
+		<h2 class="h2">{$lang->cmd_point_recal}</h2>
+		<p>{$lang->about_cmd_point_recal}</p>
+		<p id="pointReCal"></p>
+		<div class="btnArea">
+			<span class="btn medium"><input type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
+		</div>
+	</fieldset>
 </form>
diff --git a/modules/point/tpl/header.html b/modules/point/tpl/header.html
index d158e7d5a..0f0af6c78 100644
--- a/modules/point/tpl/header.html
+++ b/modules/point/tpl/header.html
@@ -1,18 +1,11 @@
-<!--%import("js/point_admin.js")-->
-<h3 class="xeAdmin">{$lang->point} <span class="gray">{$lang->cmd_management}</span></h3>
-<!--@if($act=="dispPointAdminModuleConfig")-->
-<div class="infoText">{$lang->about_module_point}</div>
-<!--@else-->
-<div class="infoText">{$lang->about_point_module}</div>
-<!--@end-->
-
+<load target="js/point_admin.js" usecdn="true" />
+<h1 class="h1">{$lang->point} {$lang->cmd_management}</h1>
 <!--@if($module=='admin')-->
-<div class="header4">
-
-    <ul class="localNavigation">
-        <li <!--@if($act=='dispPointAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispPointAdminConfig')}">{$lang->cmd_point_config}</a></li>
-        <li <!--@if($act=='dispPointAdminModuleConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispPointAdminModuleConfig')}">{$lang->cmd_point_module_config}</a></li>
-        <li <!--@if($act=='dispPointAdminPointList')-->class="on"<!--@end-->><a href="{getUrl('act','dispPointAdminPointList')}">{$lang->cmd_point_member_list}</a></li>
+<div class="cnb">
+    <ul>
+        <li <!--@if($act=='dispPointAdminConfig')-->class="active"<!--@end-->><a href="{getUrl('act','dispPointAdminConfig')}">{$lang->cmd_point_config}</a></li>
+        <li <!--@if($act=='dispPointAdminModuleConfig')-->class="active"<!--@end-->><a href="{getUrl('act','dispPointAdminModuleConfig')}">{$lang->cmd_point_module_config}</a></li>
+        <li <!--@if($act=='dispPointAdminPointList')-->class="active"<!--@end-->><a href="{getUrl('act','dispPointAdminPointList')}">{$lang->cmd_point_member_list}</a></li>
     </ul>
 </div>
 <!--@end-->
diff --git a/modules/point/tpl/js/point_admin.js b/modules/point/tpl/js/point_admin.js
index 1bfe63f89..3b5a28e62 100644
--- a/modules/point/tpl/js/point_admin.js
+++ b/modules/point/tpl/js/point_admin.js
@@ -1,70 +1,86 @@
-/**
- * @file   modules/point/js/point_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  point 모듈의 관리자용 javascript
- **/
-
-function exp_calc (form, reset) {
-    var fo_obj = xGetElementById(form)
-    var level = fo_obj.max_level.value
-    var exp = fo_obj.expression
-    var exp_default = "Math.pow(i, 2) * 90"
-
-    if(reset || !exp.value) exp.value = exp_default
-
-    for(i = 1; i <= level; i++) {
-        point = eval("fo_obj.level_step_" + i)
-        point.value = eval(exp.value);
-    }
-}
-
-/**
- * @brief 포인트를 전부 체크하여 재계산하는 action 호출
- **/
-function doPointRecal() {
-
-    var params = new Array();
-    var response_tags = new Array('error','message','total', 'position');
-
-    exec_xml('point','procPointAdminReCal',params, completePointRecal, response_tags);
-}
-
-function completePointRecal(ret_obj) {
-    var total = ret_obj['total'];
-    var message = ret_obj['message'];
-    var position = ret_obj['position'];
-
-    if(position == total) {
-        xInnerHtml('pointReCal', message);
-        alert(message);
-        location.reload();
-    } else {
-        xInnerHtml('pointReCal', message);
-
-        var params = new Array();
-        params['position'] = position;
-        params['total'] = total;
-        var response_tags = new Array('error','message','total', 'position');
-
-        exec_xml('point','procPointAdminApplyPoint',params, completePointRecal, response_tags);
-    }
-}
-
-function updatePoint(member_srl, action)
-{
-    var pointEl = jQuery("#point_"+member_srl);
-    var e = jQuery("#update_member_srl").val(member_srl);
-    e = jQuery("#update_action").val(action);
-    e = jQuery("#update_point").val(pointEl.attr("value"));
-    var hF = jQuery("#updateForm").get(0);
-    procFilter(hF, update_point);
-}
-
-
-function doPointReset(module_srls) {
-    var params = new Array();
-    var response_tags = new Array('error','message');
-    params['module_srls'] = module_srls;
-
-    exec_xml('point','procPointAdminReset',params,function(ret_obj) {alert(ret_obj['message']);}, response_tags);
-}
+/**
+ * @file   modules/point/js/point_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  point 모듈의 관리자용 javascript
+ **/
+
+jQuery(function($){
+
+$('button.calc_point').click(function(){
+	var $this, form, elems, reset, el, fn, i=0;
+	
+	$this = $(this);
+	$expr = $('input.level_expression');
+	form  = this.form;
+	elems = form.elements;
+	reset = $this.hasClass('_reset');
+
+	if(reset || !$expr.val()) $expr.val('Math.pow(i,2) * 90');
+
+	try {
+		fn = new Function('i', 'return ('+$expr.val()+')');
+	} catch(e){
+		fn = null;
+	}
+
+	if(!fn) return;
+
+	while(el = elems['level_step_'+(++i)]) el.value = fn(i);
+});
+
+});
+
+/**
+ * @brief 포인트를 전부 체크하여 재계산하는 action 호출
+ **/
+function doPointRecal() {
+	var resp, $recal;
+
+	function on_complete(ret) {
+		if(!$recal) $recal = jQuery('#pointReCal');
+
+		$recal.html(ret.message);
+
+		if(ret.position == ret.total) {
+			alert(message);
+			location.reload();
+		} else {
+			exec_xml(
+				'point',
+				'procPointAdminApplyPoint',
+				{position : ret.position, total : ret.total},
+				on_complete,
+				resp
+			);
+		}
+	}
+
+    exec_xml(
+		'point', // module
+		'procPointAdminReCal', // procedure
+		{}, // parameters
+		on_complete, // callback
+		resp=['error','message','total','position'] // response tags
+	);
+}
+
+function updatePoint(member_srl)
+{
+	var $point = jQuery('#point_'+member_srl);
+	get_by_id('update_member_srl').value = member_srl;
+	get_by_id('update_point').value = $point.val();
+
+    var hF = get_by_id('updateForm');
+	hF.submit();
+}
+
+
+function doPointReset(module_srls) {
+    exec_xml(
+		'point',
+		'procPointAdminReset',
+		{module_srls : module_srls},
+		function(ret_obj){alert(ret_obj['message']);},
+		['error','message']
+	);
+}
diff --git a/modules/point/tpl/member_list.html b/modules/point/tpl/member_list.html
index 3a74d0aa3..8eff21c58 100644
--- a/modules/point/tpl/member_list.html
+++ b/modules/point/tpl/member_list.html
@@ -1,91 +1,95 @@
-<!--%import("filter/update_point.xml")-->
-<!--%import("js/point_admin.js")-->
-<!--#include("header.html")-->
-
-<table cellspacing="0" class="crossTable">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div>{$lang->user_id}</div></th>
-        <th scope="col"><div>{$lang->user_name}</div></th>
-        <th scope="col"><div>{$lang->nick_name}</div></th>
-        <th scope="col"><div>{$lang->point}</div></th>
-        <th scope="col"><div>{$lang->level}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($member_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="center number">{$no}</td>
-        <td class="nowrap">{$val->user_id}</td>
-        <td class="nowrap">{$val->user_name}</td>
-        <td class="nowrap"><span class="member_{$val->member_srl}">{$val->nick_name}</span></td>
-        <td class="nowrap">
-            <form action="./" method="get">
-                <input type="hidden" name="member_srl" value="{$val->member_srl}" />
-                <input type="text" name="orgpoint" value="{$val->point}" class="inputTypeText w80" readonly />
-                <input type="text" id="point_{$val->member_srl}" name="point" class="inputTypeText w80" />
-                <span class="button"><input type="button" value="+" onclick="updatePoint({$val->member_srl}, 'add')"/></span>
-                <span class="button"><input type="button" value="-" onclick="updatePoint({$val->member_srl}, 'minus')"/></span>
-                <span class="button"><input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl}, 'update')" /></span>
-            </form>
-        </td>
-        <td class="number center">{$val->level}</td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-<form id="updateForm" action="./" method="POST">
-    <input type="hidden" id="update_action" name="action" value="" />
-    <input type="hidden" id="update_member_srl" name="member_srl" value="" />
-    <input type="hidden" id="update_point" name="point" class="inputTypeText w80" />
-</form>
-
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-
-    <fieldset>
-
-        <select name="is_admin">
-            <option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-            <option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
-        </select>
-        <select name="is_denied">
-            <option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
-            <option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
-        </select>
-        <select name="selected_group_srl">
-            <option value="0">{$lang->group}</option>
-            <!--@foreach($group_list as $key => $val)-->
-            <option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
-            <!--@end-->
-        </select>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="#" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
+<!--#include("header.html")-->
+<load target="js/point_admin.js" usecdn="true" />
+<p>{$lang->about_point_module} {$lang->point_update_desc}</p>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<div class="table form">	
+	<table width="100%" border="1" cellspacing="0">
+		<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+		<thead>
+			<tr>
+				<th scope="col">{$lang->no}</th>
+				<th scope="col">{$lang->user_id}</th>
+				<th scope="col">{$lang->user_name}</th>
+				<th scope="col">{$lang->nick_name}</th>
+				<th scope="col">{$lang->point}</th>
+				<th scope="col">{$lang->level}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<!--@foreach($member_list as $no => $val)-->
+			<tr>
+				<td>{$no}</td>
+				<td>{$val->user_id}</td>
+				<td>{$val->user_name}</td>
+				<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
+				<td>
+					<form action="./" method="get">
+						<input type="hidden" name="module" value="point" />
+						<input type="hidden" name="member_srl" value="{$val->member_srl}" />
+						<input type="text" name="orgpoint" value="{$val->point}" disabled="disabled" style="width:40px;text-align:right" />
+						<input type="text" id="point_{$val->member_srl}" name="point" style="width:40px;text-align:right" />
+						<input type="button" value="{$lang->cmd_update}" onclick="updatePoint({$val->member_srl})" class="text" />
+					</form>
+				</td>
+				<td>{$val->level}</td>
+			</tr>
+			<!--@end-->
+		</tbody>
+	</table>
+</div>
+
+<form ruleset="updatePoint" id="updateForm" action="./" method="POST">
+	<input type="hidden" name="module" value="point" />
+	<input type="hidden" name="act" value="procPointAdminUpdatePoint" />
+    <input type="hidden" id="update_member_srl" name="member_srl" value="" />
+    <input type="hidden" id="update_point" name="point" />
+</form>
+
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination">
+    <a href="{getUrl('page','','module_srl','')}" class="direction">&lsaquo; {$lang->first_page}</a>
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong>
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a>
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="direction">{$lang->last_page} &rsaquo;</a>
+</div>
+
+<!-- 검색 -->
+<form action="./" method="get" class="adminSearch">
+<input type="hidden" name="module" value="{$module}" />
+<input type="hidden" name="act" value="{$act}" />
+
+    <fieldset>
+
+        <select name="is_admin">
+            <option value="" <!--@if($is_admin!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
+            <option value="Y" <!--@if($is_admin=='Y')-->selected="selected"<!--@end-->>{$lang->is_admin}</option>
+        </select>
+        <select name="is_denied">
+            <option value="" <!--@if($is_denied!='Y')-->selected="selected"<!--@end-->>{$lang->total}</option>
+            <option value="Y" <!--@if($is_denied=='Y')-->selected="selected"<!--@end-->>{$lang->denied}</option>
+        </select>
+        <select name="selected_group_srl">
+            <option value="0">{$lang->member_group}</option>
+            <!--@foreach($group_list as $key => $val)-->
+            <option value="{$val->group_srl}" <!--@if($selected_group_srl==$val->group_srl)-->selected="selected"<!--@end-->>{$val->title}</option>
+            <!--@end-->
+        </select>
+        <select name="search_target">
+            <option value="">{$lang->search_target}</option>
+            <!--@foreach($lang->search_target_list as $key => $val)-->
+            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+            <!--@end-->
+        </select>
+        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+        <span class="btn"><input type="submit" value="{$lang->cmd_search}" /></span>
+        <span class="btn"><button type="button" onclick="location.href='{getUrl('','module',$module,'act',$act)}';return false;">{$lang->cmd_cancel}</button></span>
+    </fieldset>
+</form>
diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html
index ec66b85d3..09088b0c1 100644
--- a/modules/point/tpl/module_config.html
+++ b/modules/point/tpl/module_config.html
@@ -1,41 +1,40 @@
-<!--%import("filter/insert_module_config.xml")-->
 <!--#include("./header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_module_config);" id="fo_point">
-
-    <table cellspacing="0" class="crossTable">
-    <thead>
-        <tr>
-            <th><div>{$lang->point_insert_document}</div></th>
-            <th><div>{$lang->point_insert_comment}</div></th>
-            <th><div>{$lang->point_upload_file}</div></th>
-            <th><div>{$lang->point_download_file}</div></th>
-            <th><div>{$lang->point_read_document}</div></th>
-            <th><div>{$lang->point_voted}</div></th>
-            <th><div>{$lang->point_blamed}</div></th>
-        </tr>
-    </thead>
-    <tbody>
-    <!--@foreach($mid_list as $key => $val)-->
-    <tr class="row2">
-        <th colspan="7" scope="col"><div><strong>{$val->browser_title}</strong> ({$val->mid})</div></th>
-    </tr>
-    <tr>
-        <td><input type="text" name="insert_document_{$val->module_srl}" value="{$module_config[$val->module_srl]['insert_document']}" class="inputTypeText w40" /> {$config->point_name}</td>
-        <td><input type="text" name="insert_comment_{$val->module_srl}" value="{$module_config[$val->module_srl]['insert_comment']}" class="inputTypeText w40" /> {$config->point_name}</td>
-        <td><input type="text" name="upload_file_{$val->module_srl}" value="{$module_config[$val->module_srl]['upload_file']}" class="inputTypeText w40" /> {$config->point_name}</td>
-        <td><input type="text" name="download_file_{$val->module_srl}" value="{$module_config[$val->module_srl]['download_file']}" class="inputTypeText w40" /> {$config->point_name}</td>
-        <td><input type="text" name="read_document_{$val->module_srl}" value="{$module_config[$val->module_srl]['read_document']}" class="inputTypeText w40" /> {$config->point_name}</td>
-        <td><input type="text" name="voted_{$val->module_srl}" value="{$module_config[$val->module_srl]['voted']}" class="inputTypeText w40" /> {$config->point_name}</td>
-        <td><input type="text" name="blamed_{$val->module_srl}" value="{$module_config[$val->module_srl]['blamed']}" class="inputTypeText w40" /> {$config->point_name}</td>
-    </tr>
-    <!--@end-->
-    <tr>
-        <th colspan="7" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </tbody>
-    </table>
-
+<p>{$lang->about_module_point}</p>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="./" method="post" id="fo_point" class="form">
+	<input type="hidden" name="module" value="point" />
+	<input type="hidden" name="act" value="procPointAdminInsertModuleConfig" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col">{$lang->module}</th>
+					<th scope="col">{$lang->point_insert_document}</th>
+					<th scope="col">{$lang->point_insert_comment}</th>
+					<th scope="col">{$lang->point_upload_file}</th>
+					<th scope="col">{$lang->point_download_file}</th>
+					<th scope="col">{$lang->point_read_document}</th>
+					<th scope="col">{$lang->point_voted}</th>
+					<th scope="col">{$lang->point_blamed}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr loop="$mid_list => $key,$val">
+					<th scope="row">{$val->browser_title}({$val->mid})</th>
+					<td><input type="text" style="width:30px;text-align:right" name="insert_document_{$val->module_srl}" value="{$module_config[$val->module_srl]['insert_document']}" /> {$config->point_name}</td>
+					<td><input type="text" style="width:30px;text-align:right" name="insert_comment_{$val->module_srl}" value="{$module_config[$val->module_srl]['insert_comment']}" /> {$config->point_name}</td>
+					<td><input type="text" style="width:30px;text-align:right" name="upload_file_{$val->module_srl}" value="{$module_config[$val->module_srl]['upload_file']}" /> {$config->point_name}</td>
+					<td><input type="text" style="width:30px;text-align:right" name="download_file_{$val->module_srl}" value="{$module_config[$val->module_srl]['download_file']}" /> {$config->point_name}</td>
+					<td><input type="text" style="width:30px;text-align:right" name="read_document_{$val->module_srl}" value="{$module_config[$val->module_srl]['read_document']}" /> {$config->point_name}</td>
+					<td><input type="text" style="width:30px;text-align:right" name="voted_{$val->module_srl}" value="{$module_config[$val->module_srl]['voted']}" /> {$config->point_name}</td>
+					<td><input type="text" style="width:30px;text-align:right" name="blamed_{$val->module_srl}" value="{$module_config[$val->module_srl]['blamed']}" /> {$config->point_name}</td>
+				</tr>
+			</tbody>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_registration}" /></span>
+	</div>
 </form>
diff --git a/modules/point/tpl/point_module_config.html b/modules/point/tpl/point_module_config.html
index 030c18b0f..d44065e1f 100644
--- a/modules/point/tpl/point_module_config.html
+++ b/modules/point/tpl/point_module_config.html
@@ -1,48 +1,49 @@
 <!--%import("filter/insert_point_module_config.xml")-->
-<!--%import("js/point_admin.js")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_point_module_config);" id="fo_point">
-<input type="hidden" name="target_module_srl" value="{$module_config['module_srl']?$module_config['module_srl']:$module_srls}" />
-
-<h4 class="xeAdmin">{$lang->point}</h4>
-<table cellspacing="0" class="rowTable">
-<tr>
-    <th><div>{$lang->point_insert_document}</div></th>
-    <td class="wide"><input type="text" name="insert_document" value="{$module_config['insert_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-    <th><div>{$lang->point_insert_comment}</div></th>
-    <td><input type="text" name="insert_comment" value="{$module_config['insert_comment']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-    <th><div>{$lang->point_upload_file}</div></th>
-    <td><input type="text" name="upload_file" value="{$module_config['upload_file']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-    <th><div>{$lang->point_download_file}</div></th>
-    <td><input type="text" name="download_file" value="{$module_config['download_file']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-    <th><div>{$lang->point_read_document}</div></th>
-    <td><input type="text" name="read_document" value="{$module_config['read_document']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-	<th><div>{$lang->point_voted}</div></th>
-	<td><input type="text" name="voted" value="{$module_config['voted']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-	<th><div>{$lang->point_blamed}</div></th>
-	<td><input type="text" name="blamed" value="{$module_config['blamed']}" class="inputTypeText w80" /> {$module_config['point_name']}</td>
-</tr>
-<tr>
-    <th colspan="2" class="button">
-        <span class="button strong black"><input type="submit" value="{$lang->cmd_save}" /></span>
-        <span class="button"><input type="button" value="{$lang->cmd_reset}" onclick="doPointReset('{$module_config['module_srl']?$module_config['module_srl']:$module_srls}'); return false"/></span>
-    </th>
-</tr>
-</table>
-
-<!-- 버튼 -->
-
+<load target="js/point_admin.js" usecdn="true" />
+<form action="./" method="post" id="fo_point" class="form">
+	<input type="hidden" name="module" value="point" />
+	<input type="hidden" name="act" value="procPointAdminInsertPointModuleConfig" />
+	<input type="hidden" name="target_module_srl" value="{$module_config['module_srl']?$module_config['module_srl']:$module_srls}" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	
+	<h3 class="h3">{$lang->point}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row"><label for="insert_document">{$lang->point_insert_document}</label></th>
+				<td class="text"><input type="text" name="insert_document" id="insert_document" value="{$module_config['insert_document']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="insert_comment">{$lang->point_insert_comment}</label></th>
+				<td class="text"><input type="text" name="insert_comment" id="insert_comment" value="{$module_config['insert_comment']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="upload_file">{$lang->point_upload_file}</label></th>
+				<td class="text"><input type="text" name="upload_file" id="upload_file" value="{$module_config['upload_file']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="download_file">{$lang->point_download_file}</label></th>
+				<td class="text"><input type="text" name="download_file" id="download_file" value="{$module_config['download_file']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="read_document">{$lang->point_read_document}</label></th>
+				<td class="text"><input type="text" name="read_document" id="read_document" value="{$module_config['read_document']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="voted">{$lang->point_voted}</label></th>
+				<td class="text"><input type="text" name="voted" id="voted" value="{$module_config['voted']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="blamed">{$lang->point_blamed}</label></th>
+				<td class="text"><input type="text" name="blamed" id="blamed" value="{$module_config['blamed']}" style="width:30px" /> {$module_config['point_name']}</td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="btn"><button type="button" onclick="doPointReset('{$module_config['module_srl']?$module_config['module_srl']:$module_srls}')">{$lang->cmd_reset}</button></span>
+	</div>
+	
+	<!-- 버튼 -->
+	
 </form>
-<div class="gap1"></div>
diff --git a/modules/poll/conf/info.xml b/modules/poll/conf/info.xml
index 8c5d0f3dc..4fd0a980a 100644
--- a/modules/poll/conf/info.xml
+++ b/modules/poll/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">설문조사</title>
-    <title xml:lang="zh-CN">投票系统</title>
-    <title xml:lang="jp">アンケート</title>
-    <title xml:lang="en">Poll</title>
-    <title xml:lang="vi">Bình chọn, Thăm dò</title>
-    <title xml:lang="es">Encuesta</title>
-    <title xml:lang="ru">Опрос</title>
-    <title xml:lang="zh-TW">投票調查</title>
-    <title xml:lang="tr">Oylama</title>
-    <description xml:lang="ko">설문조사 관리 모듈</description>
-    <description xml:lang="zh-CN">管理投票调查的模块。</description>
-    <description xml:lang="jp">アンケート管理モジュール</description>
-    <description xml:lang="en">This module is for managering polls.</description>
-    <description xml:lang="vi">Module này quản lý những bình chọn và thăm dò.</description>
-    <description xml:lang="es">Este módulo es para manejar las encuestas.</description>
-    <description xml:lang="ru">Этот модуль служит для управления опросами.</description>
-    <description xml:lang="zh-TW">管理投票調查的模組。</description>
-    <description xml:lang="tr">Oylamaları düzenlemek için kullanılan modüldür.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>content</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">설문</title>
+    <title xml:lang="zh-CN">投票系统</title>
+    <title xml:lang="jp">アンケート</title>
+    <title xml:lang="en">Poll</title>
+    <title xml:lang="vi">Bình chọn, Thăm dò</title>
+    <title xml:lang="es">Encuesta</title>
+    <title xml:lang="ru">Опрос</title>
+    <title xml:lang="zh-TW">投票調查</title>
+    <title xml:lang="tr">Oylama</title>
+    <description xml:lang="ko">설문조사 관리 모듈</description>
+    <description xml:lang="zh-CN">管理投票调查的模块。</description>
+    <description xml:lang="jp">アンケート管理モジュール</description>
+    <description xml:lang="en">This module is for managering polls.</description>
+    <description xml:lang="vi">Module này quản lý những bình chọn và thăm dò.</description>
+    <description xml:lang="es">Este módulo es para manejar las encuestas.</description>
+    <description xml:lang="ru">Этот модуль служит для управления опросами.</description>
+    <description xml:lang="zh-TW">管理投票調查的模組。</description>
+    <description xml:lang="tr">Oylamaları düzenlemek için kullanılan modüldür.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>content</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/poll/conf/module.xml b/modules/poll/conf/module.xml
index 780305b12..ba83aa667 100644
--- a/modules/poll/conf/module.xml
+++ b/modules/poll/conf/module.xml
@@ -3,7 +3,7 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispPollAdminList" type="view" admin_index="true" standalone="true" />
+        <action name="dispPollAdminList" type="view" admin_index="true" standalone="true" menu_name="poll" menu_index="true" />
         <action name="dispPollAdminResult" type="view" standalone="true" />
 
         <action name="dispPollAdminConfig" type="view" standalone="true" />
@@ -13,9 +13,26 @@
         <action name="getPollAdminTarget" type="model" standalone="true" />
 
         <action name="procInsert" type="controller" standalone="true" />
-        <action name="procPoll" type="controller" standalone="true" />
+        <action name="procPoll" type="controller" standalone="true" ruleset="poll" />
         <action name="procPollViewResult" type="controller" standalone="true" />
-        <action name="procPollAdminDeleteChecked" type="controller" standalone="true" />
-        <action name="procPollAdminInsertConfig" type="controller" standalone="true" />
+        <action name="procPollGetList" type="controller" standalone="true" />
+        <action name="procPollAdminDeleteChecked" type="controller" standalone="true" ruleset="deleteChecked" />
+        <action name="procPollAdminInsertConfig" type="controller" standalone="true" ruleset="insertConfig" />
+        <action name="procPollAdminAddCart" type="controller" standalone="true" />
     </actions>
+	<menus>
+		<menu name="poll">
+			<title xml:lang="en">Poll</title>
+			<title xml:lang="ko">설문</title>
+			<title xml:lang="zh-CN">Poll</title>
+			<title xml:lang="jp">Poll</title>
+			<title xml:lang="es">Poll</title>
+			<title xml:lang="ru">Poll</title>
+			<title xml:lang="fr">Poll</title>
+			<title xml:lang="zh-TW">Poll</title>
+			<title xml:lang="vi">Poll</title>
+			<title xml:lang="mn">Poll</title>
+			<title xml:lang="tr">Poll</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/poll/lang/en.lang.php b/modules/poll/lang/en.lang.php
deleted file mode 100644
index 53ee47574..000000000
--- a/modules/poll/lang/en.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file   modules/poll/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll module / basic language pack 
-     **/
-
-    $lang->poll = "Poll"; 
-    $lang->poll_stop_date = "Expiration Date";
-    $lang->poll_join_count = "Participants";
-    $lang->poll_checkcount = "Number of required items";
-
-    $lang->cmd_poll_list = 'View poll list';
-    $lang->cmd_delete_checked_poll = 'Delete selected poll'; 
-    $lang->cmd_apply_poll = 'Apply poll';
-    $lang->cmd_view_result = 'Preview result';
-    $lang->cmd_delete_checked_poll = 'Delete selected poll';  
-
-    $lang->success_poll = 'Thank you for joining the poll.';
-
-    $lang->msg_already_poll = 'You already polled!';
-    $lang->msg_cart_is_null = 'Please select an article to delete.';
-    $lang->msg_checked_poll_is_deleted = '%d poll(s) are deleted.';
-    $lang->msg_check_poll_item = 'Please select a poll item to poll.\n(Required poll item(s) may be different in each poll.)';
-    $lang->msg_cart_is_null = 'Please select a poll to delete.';
-    $lang->msg_checked_poll_is_deleted = '%d poll(s) are deleted.';
-    $lang->msg_poll_not_exists = 'Selected poll does not exist.';
-
-    $lang->cmd_null_item = "No item value exist to post a poll. Please re-try.";
-
-    $lang->confirm_poll_submit = "Confirm to submit the poll?";
-
-    $lang->search_target_list = array(
-        'title' => 'Title',
-        'regdate' => 'Posting date',
-        'ipaddress' => 'IP Address',
-    );
-?>
diff --git a/modules/poll/lang/es.lang.php b/modules/poll/lang/es.lang.php
deleted file mode 100644
index d7f0eec65..000000000
--- a/modules/poll/lang/es.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/poll/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para el módulo de encuesta 
-     **/
-
-    $lang->poll = "Encuesta"; 
-    $lang->poll_stop_date = "Fecha de expiración";
-    $lang->poll_join_count = "Participantes";
-    $lang->poll_checkcount = "Número de artículos requeridos.";
-
-    $lang->cmd_poll_list = 'Ver la lista de la encuesta';
-    $lang->cmd_delete_checked_poll = 'Eliminar la encuesta seleccionada'; 
-    $lang->cmd_apply_poll = 'Aplicar la encuesta';
-    $lang->cmd_view_result = 'Preview result';
-    $lang->cmd_delete_checked_poll = 'Eliminar la encuesta seleccionada';  
-
-    $lang->success_poll = 'Gracias por participar en la encuesta.';
-
-    $lang->msg_already_poll = 'Usted ya realizo la encuesta!';
-    $lang->msg_cart_is_null = 'Por favor seleciona un artículo a eliminar.';
-    $lang->msg_checked_poll_is_deleted = '%d encustas son eliminados.';
-    $lang->msg_check_poll_item = 'Por favor selecciona un artículo de la encuesta.\n(Artículos requeridos pueden ser diferentes in cada encuesta.)';
-    $lang->msg_cart_is_null = 'Por favor selecciona una encuesta a eliminar.';
-    $lang->msg_checked_poll_is_deleted = '%d encuestas son eliminados.';
-    $lang->msg_poll_not_exists = 'Encuesta seleccionada no existe.';
-
-    $lang->cmd_null_item = "No existe ningún valor para la encuesta. Por favor trate nuevamente.";
-
-    $lang->confirm_poll_submit = "¿Confirma la participación de la encuesta?";
-
-    $lang->search_target_list = array(
-        'title' => 'Título',
-        'regdate' => 'Fecha de la participación',
-        'ipaddress' => 'Dirección IP',
-    );
-?>
diff --git a/modules/poll/lang/fr.lang.php b/modules/poll/lang/fr.lang.php
deleted file mode 100644
index cd76aaab0..000000000
--- a/modules/poll/lang/fr.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file  modules/poll/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  paquet du langage en français pour le module d\'Enquête
-     **/
-
-    $lang->poll = "Enquête"; 
-    $lang->poll_stop_date = "Jour d'Expiration";
-    $lang->poll_join_count = "Participants";
-    $lang->poll_checkcount = "Nombre obligé à choisir";
-
-    $lang->cmd_poll_list = 'Voir la liste des Enquêtes';
-    $lang->cmd_delete_checked_poll = 'Supprimer l\'Enquête choisi'; 
-    $lang->cmd_apply_poll = 'Participer(Soumettre)';
-    $lang->cmd_view_result = 'Voir le Résultat';
-    $lang->cmd_delete_checked_poll = 'Supprimer l\'Enquête choisi';
-
-    $lang->success_poll = 'Merci pour participer.';
-
-    $lang->msg_already_poll = 'Vous avez déjà participé!';
-    $lang->msg_cart_is_null = 'Choisissez des Enquêtes à supprimer.';
-    $lang->msg_checked_poll_is_deleted = '%d Enquête(s) est(sont) supprimée(s).';
-    $lang->msg_check_poll_item = 'Choisissez un des item.\n(Nombre obligé à choisir peut être différent par chaque Enquête.)';
-    $lang->msg_cart_is_null = 'Choisissez des Enquêtes à supprimer.';
-    $lang->msg_checked_poll_is_deleted = '%d Enquête(s) est(sont) supprimée(s).';
-    $lang->msg_poll_not_exists = 'L\'Enquête choisi n\'existe pas.';
-
-    $lang->cmd_null_item = "Aucune valeur à enrégistrer comme enquête n'existe pas. Essayez encore une fois, S.V.P.";
-
-    $lang->confirm_poll_submit = "Vous voulez sûrement soumettre?";
-
-    $lang->search_target_list = array(
-        'title' => 'Titre',
-        'regdate' => 'Jour posté',
-        'ipaddress' => 'Adresse IP',
-    );
-?>
diff --git a/modules/poll/lang/jp.lang.php b/modules/poll/lang/jp.lang.php
deleted file mode 100644
index 6f0b12f2d..000000000
--- a/modules/poll/lang/jp.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file   modules/poll/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  アンケート（poll）モジュールの基本言語パッケージ
-     **/
-
-    $lang->poll = 'アンケート調査'; 
-    $lang->poll_stop_date = 'アンケート調査の終了日';
-    $lang->poll_join_count = '参加者';
-    $lang->poll_checkcount = '必須選択項目数';
-
-    $lang->cmd_poll_list = 'アンケートのリスト表示';
-    $lang->cmd_delete_checked_poll = '選択項目削除';
-    $lang->cmd_apply_poll = 'アンケート調査へ参加する';
-    $lang->cmd_view_result = '結果を見る';
-    $lang->cmd_delete_checked_poll = '選択アンケート削除';
-
-    $lang->success_poll = 'アンケート調査へのご応募ありがとうございます。';
-
-    $lang->msg_already_poll = '既にアンケート調査に応募しました。';
-    $lang->msg_cart_is_null = '削除する書き込みを選択して下さい。';
-    $lang->msg_checked_poll_is_deleted = '%d個のアンケートが削除されました。';
-    $lang->msg_check_poll_item = 'アンケート調査の項目を選択して下さい（アンケート調査ごと必須の選択項目が異なる場合があります）。';
-    $lang->msg_cart_is_null = '削除するアンケートを選択して下さい。';
-    $lang->msg_checked_poll_is_deleted = '%d個のアンケートが削除されました。';
-    $lang->msg_poll_not_exists = '選択したアンケートは存在しません。';
-
-    $lang->cmd_null_item = "アンケート調査に登録する項目がありません。\nもう一度設定して下さい。";
-
-    $lang->confirm_poll_submit = 'アンケート調査にご応募しますか？';
-
-    $lang->search_target_list = array(
-        'title' => 'タイトル',
-        'regdate' => '登録日',
-        'ipaddress' => 'IPアドレス',
-    );
-?>
diff --git a/modules/poll/lang/ko.lang.php b/modules/poll/lang/ko.lang.php
deleted file mode 100644
index 14a3ac259..000000000
--- a/modules/poll/lang/ko.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file   modules/poll/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  설문조사 (poll) 모듈의 기본 언어팩
-     **/
-
-    $lang->poll = '설문조사'; 
-    $lang->poll_stop_date = '설문조사 종료일';
-    $lang->poll_join_count = '참가자';
-    $lang->poll_checkcount = '필수 선택 항목 수';
-
-    $lang->cmd_poll_list = '설문조사 목록 보기';
-    $lang->cmd_delete_checked_poll = '선택항목 삭제';
-    $lang->cmd_apply_poll = '설문 참여';
-    $lang->cmd_view_result = '결과 보기';
-    $lang->cmd_delete_checked_poll = '선택 설문 삭제';
-
-    $lang->success_poll = '설문에 응하여 주셔서 감사합니다.';
-
-    $lang->msg_already_poll = '이미 설문조사를 하셨습니다.';
-    $lang->msg_cart_is_null = '삭제할 글을 선택해주세요.';
-    $lang->msg_checked_poll_is_deleted = '%d개의 설문조사가 삭제되었습니다.';
-    $lang->msg_check_poll_item = '설문에 응할 항목을 선택하여 주세요. (설문조사 마다 필수 선택항목이 다를 수 있습니다.)';
-    $lang->msg_cart_is_null = '삭제할 설문을 선택해주세요.';
-    $lang->msg_checked_poll_is_deleted = '%d개의 설문이 삭제되었습니다.';
-    $lang->msg_poll_not_exists = '선택하신 설문이 존재하지 않습니다.';
-
-    $lang->cmd_null_item = "설문조사로 등록할 값이 없습니다.\n다시 설정해주세요.";
-
-    $lang->confirm_poll_submit = '설문조사에 응하시겠습니까?';
-
-    $lang->search_target_list = array(
-        'title' => '제목',
-        'regdate' => '등록일',
-        'ipaddress' => 'IP 주소',
-    );
-?>
diff --git a/modules/poll/lang/lang.xml b/modules/poll/lang/lang.xml
new file mode 100644
index 000000000..429b6efad
--- /dev/null
+++ b/modules/poll/lang/lang.xml
@@ -0,0 +1,255 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="poll">
+		<value xml:lang="ko"><![CDATA[설문]]></value>
+		<value xml:lang="en"><![CDATA[Poll]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査]]></value>
+		<value xml:lang="zh-CN"><![CDATA[投票系统]]></value>
+		<value xml:lang="zh-TW"><![CDATA[投票調查]]></value>
+		<value xml:lang="fr"><![CDATA[Enquête]]></value>
+		<value xml:lang="ru"><![CDATA[Опрос]]></value>
+		<value xml:lang="es"><![CDATA[Encuesta]]></value>
+		<value xml:lang="tr"><![CDATA[Oylama]]></value>
+		<value xml:lang="vi"><![CDATA[Thăm dò]]></value>
+	</item>
+	<item name="poll_stop_date">
+		<value xml:lang="ko"><![CDATA[설문조사 종료일]]></value>
+		<value xml:lang="en"><![CDATA[Expiration Date]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査の終了日]]></value>
+		<value xml:lang="zh-CN"><![CDATA[投票调查结束日期]]></value>
+		<value xml:lang="zh-TW"><![CDATA[投票調查結束日期]]></value>
+		<value xml:lang="fr"><![CDATA[Jour d'Expiration]]></value>
+		<value xml:lang="ru"><![CDATA[Дата истечения]]></value>
+		<value xml:lang="es"><![CDATA[Fecha de expiración]]></value>
+		<value xml:lang="tr"><![CDATA[Kullanım Süresi Bitimi]]></value>
+		<value xml:lang="vi"><![CDATA[Ngày hết hạn]]></value>
+	</item>
+	<item name="poll_join_count">
+		<value xml:lang="ko"><![CDATA[참가자]]></value>
+		<value xml:lang="en"><![CDATA[Participants]]></value>
+		<value xml:lang="jp"><![CDATA[参加者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[投票者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[投票人數]]></value>
+		<value xml:lang="ru"><![CDATA[Участников]]></value>
+		<value xml:lang="es"><![CDATA[Participantes]]></value>
+		<value xml:lang="tr"><![CDATA[Katılımcılar]]></value>
+		<value xml:lang="vi"><![CDATA[Người tham gia]]></value>
+	</item>
+	<item name="poll_checkcount">
+		<value xml:lang="ko"><![CDATA[필수 항목 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of required items]]></value>
+		<value xml:lang="jp"><![CDATA[必須選択項目数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[必选项目数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[必選項目數]]></value>
+		<value xml:lang="fr"><![CDATA[Nombre obligé à choisir]]></value>
+		<value xml:lang="ru"><![CDATA[Число полей выбора]]></value>
+		<value xml:lang="es"><![CDATA[Número de artículos requeridos.]]></value>
+		<value xml:lang="tr"><![CDATA[Gerekli ögelerin sayısı]]></value>
+		<value xml:lang="vi"><![CDATA[Số mục yêu cầu]]></value>
+	</item>
+	<item name="cmd_poll_list">
+		<value xml:lang="ko"><![CDATA[설문조사 목록 보기]]></value>
+		<value xml:lang="en"><![CDATA[View poll list]]></value>
+		<value xml:lang="jp"><![CDATA[アンケートのリスト表示]]></value>
+		<value xml:lang="zh-CN"><![CDATA[投票列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢視列表]]></value>
+		<value xml:lang="fr"><![CDATA[Voir la liste des Enquêtes]]></value>
+		<value xml:lang="ru"><![CDATA[Просмотреть список опросов]]></value>
+		<value xml:lang="es"><![CDATA[Ver la lista de la encuesta]]></value>
+		<value xml:lang="tr"><![CDATA[Oylama listesini gör]]></value>
+		<value xml:lang="vi"><![CDATA[Xem danh sách thăm dò]]></value>
+	</item>
+	<item name="cmd_delete_checked_poll">
+		<value xml:lang="ko"><![CDATA[선택 설문 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete selected poll]]></value>
+		<value xml:lang="jp"><![CDATA[選択アンケート削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer l'Enquête choisi]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить выбранные опросы]]></value>
+		<value xml:lang="es"><![CDATA[Eliminar la encuesta seleccionada]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili oylamayı sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa thăm dò đã chọn]]></value>
+	</item>
+	<item name="cmd_apply_poll">
+		<value xml:lang="ko"><![CDATA[설문 참여]]></value>
+		<value xml:lang="en"><![CDATA[Apply poll]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査へ参加する]]></value>
+		<value xml:lang="zh-CN"><![CDATA[参与投票]]></value>
+		<value xml:lang="zh-TW"><![CDATA[參與投票]]></value>
+		<value xml:lang="fr"><![CDATA[Participer(Soumettre)]]></value>
+		<value xml:lang="ru"><![CDATA[Применеть опрос]]></value>
+		<value xml:lang="es"><![CDATA[Aplicar la encuesta]]></value>
+		<value xml:lang="tr"><![CDATA[Oyla]]></value>
+		<value xml:lang="vi"><![CDATA[Áp dụng thăm dò]]></value>
+	</item>
+	<item name="cmd_view_result">
+		<value xml:lang="ko"><![CDATA[결과 보기]]></value>
+		<value xml:lang="en"><![CDATA[Preview result]]></value>
+		<value xml:lang="jp"><![CDATA[結果を見る]]></value>
+		<value xml:lang="zh-CN"><![CDATA[查看结果]]></value>
+		<value xml:lang="zh-TW"><![CDATA[看結果]]></value>
+		<value xml:lang="fr"><![CDATA[Voir le Résultat]]></value>
+		<value xml:lang="ru"><![CDATA[Предпросмотр результата]]></value>
+		<value xml:lang="tr"><![CDATA[Sonuç Önizlemesi]]></value>
+		<value xml:lang="vi"><![CDATA[Xem kết quả]]></value>
+	</item>
+	<item name="success_poll">
+		<value xml:lang="ko"><![CDATA[설문에 응하여 주셔서 감사합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Thank you for joining the poll.]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査へのご応募ありがとうございます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[感谢您参与投票。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[感謝您參與投票。]]></value>
+		<value xml:lang="fr"><![CDATA[Merci pour participer.]]></value>
+		<value xml:lang="ru"><![CDATA[Благодарим за присоединение к опросу.]]></value>
+		<value xml:lang="es"><![CDATA[Gracias por participar en la encuesta.]]></value>
+		<value xml:lang="tr"><![CDATA[Oylamaya katıldığınız için teşekkürler.]]></value>
+		<value xml:lang="vi"><![CDATA[Cảm ơn bạn đã tham gia thăm dò.]]></value>
+	</item>
+	<item name="msg_already_poll">
+		<value xml:lang="ko"><![CDATA[이미 설문조사를 하셨습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You already polled!]]></value>
+		<value xml:lang="jp"><![CDATA[既にアンケート調査に応募しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能重复投票！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不能重複投票！]]></value>
+		<value xml:lang="fr"><![CDATA[Vous avez déjà participé!]]></value>
+		<value xml:lang="ru"><![CDATA[Вы уже голосовали!]]></value>
+		<value xml:lang="es"><![CDATA[Usted ya realizo la encuesta!]]></value>
+		<value xml:lang="tr"><![CDATA[Zaten oylamada bulundunuz!]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn đã bỏ phiếu rồi!]]></value>
+	</item>
+	<item name="msg_cart_is_null">
+		<value xml:lang="ko"><![CDATA[삭제할 설문을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select a poll to delete.]]></value>
+		<value xml:lang="jp"><![CDATA[削除するアンケートを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择要删除的问卷。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的問卷。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez des Enquêtes à supprimer.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите опрос для удаления.]]></value>
+		<value xml:lang="es"><![CDATA[Por favor selecciona una encuesta a eliminar.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen silmek için bir oylama seçiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy chọn thăm dò để xóa.]]></value>
+	</item>
+	<item name="msg_checked_poll_is_deleted">
+		<value xml:lang="ko"><![CDATA[%d개의 설문이 삭제되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d poll(s) are deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[%d個のアンケートが削除されました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已删除%d个问卷。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已刪除%d個問卷。]]></value>
+		<value xml:lang="fr"><![CDATA[%d Enquête(s) est(sont) supprimée(s).]]></value>
+		<value xml:lang="ru"><![CDATA[%d опросов удалено.]]></value>
+		<value xml:lang="es"><![CDATA[%d encuestas son eliminados.]]></value>
+		<value xml:lang="tr"><![CDATA[%d oylama silindi.]]></value>
+		<value xml:lang="vi"><![CDATA[%d đã được xóa.]]></value>
+	</item>
+	<item name="msg_check_poll_item">
+		<value xml:lang="ko"><![CDATA[설문에 응할 항목을 선택하여 주세요. (설문조사 마다 필수 선택항목이 다를 수 있습니다.)]]></value>
+		<value xml:lang="en"><![CDATA[Please select a poll item to poll.\n(Required poll item(s) may be different in each poll.)]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査の項目を選択してください（アンケート調査ごと必須の選択項目が異なる場合があります）。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择问卷回应的项目。 (每个问卷调查有不同的必选项目)]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇問卷回應的項目。 (每個問卷調查有不同的必選項目)]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez un des item.\n(Nombre obligé à choisir peut être différent par chaque Enquête.)]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите ответ, чтобы проголосовать.\n(Требуемые объекты могут различаться для каждого из опросов.)]]></value>
+		<value xml:lang="es"><![CDATA[Por favor selecciona un artículo de la encuesta.\n(Artículos requeridos pueden ser diferentes in cada encuesta.)]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen oylama yapmak için oylama parçası seçiniz.\n(Gerekli oylama parçaları her oylamada farklılık gösterebilir.)]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy chọn những mục để tạo thăm dò.\n(Yêu cầu những mục để tạo thăm dò phải là những mục chưa được tạo.)]]></value>
+	</item>
+	<item name="msg_poll_not_exists">
+		<value xml:lang="ko"><![CDATA[선택하신 설문이 존재하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The selected poll does not exist.]]></value>
+		<value xml:lang="jp"><![CDATA[選択したアンケートは存在しません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您选择的问卷不存在！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您選擇的問卷不存在！]]></value>
+		<value xml:lang="fr"><![CDATA[L'Enquête choisi n'existe pas.]]></value>
+		<value xml:lang="ru"><![CDATA[Выбранный опрос не существует.]]></value>
+		<value xml:lang="es"><![CDATA[Encuesta seleccionada no existe.]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili oylama mevcut değil.]]></value>
+		<value xml:lang="vi"><![CDATA[Thăm dò đã chọn không tồn tại.]]></value>
+	</item>
+	<item name="cmd_null_item">
+		<value xml:lang="ko"><![CDATA[설문조사로 등록할 값이 없습니다.
+다시 설정해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[No item value exists to post a poll. Please re-try.]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査に登録する項目がありません。
+もう一度設定してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[没有要登录为投票调查的值。
+请重新设置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[沒有要登錄為投票調查的值。
+請重新設置。]]></value>
+		<value xml:lang="fr"><![CDATA[Aucune valeur à enrégistrer comme enquête n'existe pas. Essayez encore une fois, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Не выбран ответ для голосования. Пожалуйста, попробуйте еще.]]></value>
+		<value xml:lang="es"><![CDATA[No existe ningún valor para la encuesta. Por favor trate nuevamente.]]></value>
+		<value xml:lang="tr"><![CDATA[Oylama göndermek için hiçbir öge değeri yok. Lütfen tekrar deneyiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Không có giá trị để gửi một thăm dò. Xin hãy thử lại.]]></value>
+	</item>
+	<item name="confirm_poll_submit">
+		<value xml:lang="ko"><![CDATA[설문조사에 응하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Confirm to submit the poll?]]></value>
+		<value xml:lang="jp"><![CDATA[アンケート調査に応募しますか？]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您要参与投票吗？]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您要參與投票嗎？]]></value>
+		<value xml:lang="fr"><![CDATA[Vous voulez sûrement soumettre?]]></value>
+		<value xml:lang="ru"><![CDATA[Подтверждаете ли Вы размещение опроса?]]></value>
+		<value xml:lang="es"><![CDATA[¿Confirma la participación de la encuesta?]]></value>
+		<value xml:lang="tr"><![CDATA[Oylamayı göndermeyi onaylıyor musunuz?]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có chắc chắn muốn gửi thăm dò?]]></value>
+	</item>
+	<item name="search_target_list" type="array">
+		<item name="title">
+			<value xml:lang="ko"><![CDATA[제목]]></value>
+			<value xml:lang="en"><![CDATA[Title]]></value>
+			<value xml:lang="jp"><![CDATA[タイトル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+			<value xml:lang="fr"><![CDATA[Titre]]></value>
+			<value xml:lang="ru"><![CDATA[Заголовок]]></value>
+			<value xml:lang="es"><![CDATA[Título]]></value>
+			<value xml:lang="tr"><![CDATA[Başlık]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		</item>
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[등록일]]></value>
+			<value xml:lang="en"><![CDATA[Posting date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[登录日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[登錄日期]]></value>
+			<value xml:lang="fr"><![CDATA[Jour posté]]></value>
+			<value xml:lang="ru"><![CDATA[Дата Размещения]]></value>
+			<value xml:lang="es"><![CDATA[Fecha de la participación]]></value>
+			<value xml:lang="tr"><![CDATA[Mesaj Tarihi]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+		</item>
+		<item name="ipaddress">
+			<value xml:lang="ko"><![CDATA[IP 주소]]></value>
+			<value xml:lang="en"><![CDATA[IP Address]]></value>
+			<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[IP 地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
+			<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
+			<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
+			<value xml:lang="es"><![CDATA[Dirección IP]]></value>
+			<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+			<value xml:lang="vi"><![CDATA[IP]]></value>
+		</item>
+	</item>
+	<item name="single_check">
+		<value xml:lang="ko"><![CDATA[단일 선택]]></value>
+		<value xml:lang="en"><![CDATA[Single Check]]></value>
+		<value xml:lang="jp"><![CDATA[ひとつだけ選択]]></value>
+	</item>
+	<item name="multi_check">
+		<value xml:lang="ko"><![CDATA[다중 선택]]></value>
+		<value xml:lang="en"><![CDATA[Multi Check]]></value>
+		<value xml:lang="jp"><![CDATA[複数選択]]></value>
+	</item>
+	<item name="poll_manager">
+		<value xml:lang="ko"><![CDATA[선택한 설문 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage selected poll]]></value>
+		<value xml:lang="jp"><![CDATA[選択したアンケートの管理]]></value>
+	</item>
+	<item name="selected_poll">
+		<value xml:lang="ko"><![CDATA[선택한 설문]]></value>
+		<value xml:lang="en"><![CDATA[Selected poll]]></value>
+		<value xml:lang="jp"><![CDATA[選択したアンケート]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/poll/lang/ru.lang.php b/modules/poll/lang/ru.lang.php
deleted file mode 100644
index 9088dce75..000000000
--- a/modules/poll/lang/ru.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->poll = "Опрос"; 
-    $lang->poll_stop_date = "Дата истечения";
-    $lang->poll_join_count = "Участников";
-    $lang->poll_checkcount = "Число полей выбора";
-
-    $lang->cmd_poll_list = 'Просмотреть список опросов';
-    $lang->cmd_delete_checked_poll = 'Удалить выбранные опросы'; 
-    $lang->cmd_apply_poll = 'Применеть опрос';
-    $lang->cmd_view_result = 'Предпросмотр результата';
-    $lang->cmd_delete_checked_poll = 'Удалить выбранные опросы'; // translator's remark for devs: double entry, already has  $lang->cmd_delete_checked_poll
-
-    $lang->success_poll = 'Благодарим за присоединение к опросу.';
-
-    $lang->msg_already_poll = 'Вы уже голосовали!';
-    $lang->msg_cart_is_null = 'Пожалуйста, выберите статью для удаления.';
-    $lang->msg_checked_poll_is_deleted = '%d опросов удалено.';
-    $lang->msg_check_poll_item = 'Пожалуйста, выберите ответ, чтобы проголосовать.\n(Требуемые объекты могут различаться для каждого из опросов.)';
-    $lang->msg_cart_is_null = 'Пожалуйста, выберите опрос для удаления.'; // translator's remark for devs: double entry, already has it...
-    $lang->msg_checked_poll_is_deleted = '%d опросов удалено.'; // translator's remark for devs: double entry, already has it...
-    $lang->msg_poll_not_exists = 'Выбранный опрос не существует.';
-
-    $lang->cmd_null_item = "Не выбран ответ для голосования. Пожалуйста, попробуйте еще.";
-
-    $lang->confirm_poll_submit = "Подтверждаете ли Вы размещение опроса?";
-
-    $lang->search_target_list = array(
-        'title' => 'Заголовок',
-        'regdate' => 'Дата Размещения', // // translator's remark: this may be as "Дата Регистрации"
-        'ipaddress' => 'IP-адрес',
-    );
-?>
diff --git a/modules/poll/lang/tr.lang.php b/modules/poll/lang/tr.lang.php
deleted file mode 100644
index 0978a5dd8..000000000
--- a/modules/poll/lang/tr.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file   modules/poll/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll module / basic language pack 
-     **/
-
-    $lang->poll = "Oylama"; 
-    $lang->poll_stop_date = "Kullanım Süresi Bitimi";
-    $lang->poll_join_count = "Katılımcılar";
-    $lang->poll_checkcount = "Gerekli ögelerin sayısı";
-
-    $lang->cmd_poll_list = 'Oylama listesini gör';
-    $lang->cmd_delete_checked_poll = 'Seçili oylamayı sil'; 
-    $lang->cmd_apply_poll = 'Oyla';
-    $lang->cmd_view_result = 'Sonuç Önizlemesi';
-    $lang->cmd_delete_checked_poll = 'Seçili oylamayı sil';  
-
-    $lang->success_poll = 'Oylamaya katıldığınız için teşekkürler.';
-
-    $lang->msg_already_poll = 'Zaten oylamada bulundunuz!';
-    $lang->msg_cart_is_null = 'Lütfen silmek için bir makale seçiniz.';
-    $lang->msg_checked_poll_is_deleted = '%d oylama silindi.';
-    $lang->msg_check_poll_item = 'Lütfen oylama yapmak için oylama parçası seçiniz.\n(Gerekli oylama parçaları her oylamada farklılık gösterebilir.)';
-    $lang->msg_cart_is_null = 'Lütfen silmek için bir oylama seçiniz.';
-    $lang->msg_checked_poll_is_deleted = '%d oylama silindi.';
-    $lang->msg_poll_not_exists = 'Seçili oylama mevcut değil.';
-
-    $lang->cmd_null_item = "Oylama göndermek için hiçbir öge değeri yok. Lütfen tekrar deneyiniz.";
-
-    $lang->confirm_poll_submit = "Oylamayı göndermeyi onaylıyor musunuz?";
-
-    $lang->search_target_list = array(
-        'title' => 'Başlık',
-        'regdate' => 'Mesaj Tarihi',
-        'ipaddress' => 'IP Adresi',
-    );
-?>
diff --git a/modules/poll/lang/vi.lang.php b/modules/poll/lang/vi.lang.php
deleted file mode 100644
index 8cafed053..000000000
--- a/modules/poll/lang/vi.lang.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->poll = "Thăm dò"; 
-    $lang->poll_stop_date = "Ngày hết hạn";
-    $lang->poll_join_count = "Người tham gia";
-    $lang->poll_checkcount = "Số mục yêu cầu";
-
-    $lang->cmd_poll_list = 'Xem danh sách thăm dò';
-    $lang->cmd_delete_checked_poll = 'Xóa thăm dò đã chọn'; 
-    $lang->cmd_apply_poll = 'Áp dụng thăm dò';
-    $lang->cmd_view_result = 'Xem kết quả';
-    $lang->cmd_delete_checked_poll = 'Xóa thăm dò đã chọn';  
-
-    $lang->success_poll = 'Cảm ơn bạn đã tham gia thăm dò.';
-
-    $lang->msg_already_poll = 'Bạn đã bỏ phiếu rồi!';
-    $lang->msg_cart_is_null = 'Hãy chọn bài viết để xóa.';
-    $lang->msg_checked_poll_is_deleted = '%d thăm dò đã được xóa.';
-    $lang->msg_check_poll_item = 'Xin hãy chọn những mục để tạo thăm dò.\n(Yêu cầu những mục để tạo thăm dò phải là những mục chưa được tạo.)';
-    $lang->msg_cart_is_null = 'Xin hãy chọn thăm dò để xóa.';
-    $lang->msg_checked_poll_is_deleted = '%d đã được xóa.';
-    $lang->msg_poll_not_exists = 'Thăm dò đã chọn không tồn tại.';
-
-    $lang->cmd_null_item = "Không có giá trị để gửi một thăm dò. Xin hãy thử lại.";
-
-    $lang->confirm_poll_submit = "Bạn có chắc chắn muốn gửi thăm dò?";
-
-    $lang->search_target_list = array(
-        'title' => 'Tiêu đề',
-        'regdate' => 'Ngày gửi',
-        'ipaddress' => 'IP',
-    );
-?>
diff --git a/modules/poll/lang/zh-CN.lang.php b/modules/poll/lang/zh-CN.lang.php
deleted file mode 100644
index a01f21ef2..000000000
--- a/modules/poll/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file   modules/poll/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  投票系统 (poll) 模块简体中文语言包
-     **/
-
-    $lang->poll = "投票系统";
-    $lang->poll_stop_date = "投票调查结束日期";
-    $lang->poll_join_count = "投票者";
-    $lang->poll_checkcount = "必选项目数";
-
-    $lang->cmd_poll_list = '投票列表';
-    $lang->cmd_delete_checked_poll = '删除所选项目';
-    $lang->cmd_apply_poll = '参与投票';
-    $lang->cmd_view_result = '查看结果';
-    $lang->cmd_delete_checked_poll = '删除所选';
-
-    $lang->success_poll = '感谢您参与投票。';
-
-    $lang->msg_already_poll = '不能重复投票！';
-    $lang->msg_cart_is_null = '请选择要删除的文章。';
-    $lang->msg_checked_poll_is_deleted = '已删除%d个投票调查。';
-    $lang->msg_check_poll_item = '请选择问卷回应的项目。 (每个问卷调查有不同的必选项目)';
-    $lang->msg_cart_is_null = '请选择要删除的问卷。';
-    $lang->msg_checked_poll_is_deleted = '已删除%d个问卷。';
-    $lang->msg_poll_not_exists = '您选择的问卷不存在！';
-
-    $lang->cmd_null_item = "没有要登录为投票调查的值。\n请重新设置。";
-
-    $lang->confirm_poll_submit = "您要参与投票吗？";
-
-    $lang->search_target_list = array(
-        'title' => '标题',
-        'regdate' => '登录日期',
-        'ipaddress' => 'IP 地址',
-    );
-?>
diff --git a/modules/poll/lang/zh-TW.lang.php b/modules/poll/lang/zh-TW.lang.php
deleted file mode 100644
index 76f2f95ef..000000000
--- a/modules/poll/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-    /**
-     * @file   modules/poll/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  投票調查 (poll) 模組正體中文語言
-     **/
-
-    $lang->poll = "投票調查";
-    $lang->poll_stop_date = "投票調查結束日期";
-    $lang->poll_join_count = "投票人數";
-    $lang->poll_checkcount = "必選項目數";
-
-    $lang->cmd_poll_list = '檢視列表';
-    $lang->cmd_delete_checked_poll = '刪除所選項目';
-    $lang->cmd_apply_poll = '參與投票';
-    $lang->cmd_view_result = '看結果';
-    $lang->cmd_delete_checked_poll = '刪除所選';
-
-    $lang->success_poll = '感謝您參與投票。';
-
-    $lang->msg_already_poll = '不能重複投票！';
-    $lang->msg_cart_is_null = '請選擇要刪除的文章。';
-    $lang->msg_checked_poll_is_deleted = '已刪除%d個投票調查。';
-    $lang->msg_check_poll_item = '請選擇問卷回應的項目。 (每個問卷調查有不同的必選項目)';
-    $lang->msg_cart_is_null = '請選擇要刪除的問卷。';
-    $lang->msg_checked_poll_is_deleted = '已刪除%d個問卷。';
-    $lang->msg_poll_not_exists = '您選擇的問卷不存在！';
-
-    $lang->cmd_null_item = "沒有要登錄為投票調查的值。\n請重新設置。";
-
-    $lang->confirm_poll_submit = "您要參與投票嗎？";
-
-    $lang->search_target_list = array(
-        'title' => '標題',
-        'regdate' => '登錄日期',
-        'ipaddress' => 'IP位址',
-    );
-?>
diff --git a/modules/poll/poll.admin.controller.php b/modules/poll/poll.admin.controller.php
index eb92f7ade..7cc7bfc3b 100644
--- a/modules/poll/poll.admin.controller.php
+++ b/modules/poll/poll.admin.controller.php
@@ -1,111 +1,142 @@
-<?php
-    /**
-     * @class  pollAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll모듈의 admin controller class
-     **/
-
-    class pollAdminController extends poll {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정 저장
-         **/
-        function procPollAdminInsertConfig() {
-            $config->skin = Context::get('skin');
-            $config->colorset = Context::get('colorset');
-
-            $oModuleController = &getController('module');
-            $oModuleController->insertModuleConfig('poll', $config);
-
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief 관리자 페이지에서 선택된 설문조사들을 삭제
-         **/
-        function procPollAdminDeleteChecked() {
-            // 선택된 글이 없으면 오류 표시
-            $cart = Context::get('cart');
-            if(!$cart) return $this->stop('msg_cart_is_null');
-
-            $poll_srl_list= explode('|@|', $cart);
-            $poll_count = count($poll_srl_list);
-            if(!$poll_count) return $this->stop('msg_cart_is_null');
-
-            // 글삭제
-            for($i=0;$i<$poll_count;$i++) {
-                $poll_index_srl = trim($poll_srl_list[$i]);
-                if(!$poll_index_srl) continue;
-
-                $output = $this->deletePollTitle($poll_index_srl, true);
-                if(!$output->toBool()) return $output;
-            }
-
-            $this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
-        }
-
-        /**
-         * @brief 설문조사 삭제 (한번에 여러개의 설문 등록시 그 중 하나의 설문만 삭제)
-         **/
-        function deletePollTitle($poll_index_srl) {
-            $args->poll_index_srl = $poll_index_srl;
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $output = $oDB->executeQuery('poll.deletePollTitle', $args);
-            if(!$output) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $output = $oDB->executeQuery('poll.deletePollItem', $args);
-            if(!$output) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $oDB->commit();
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설문조사 삭제 (하나의 묶인 설문조사를 통째로 삭제)
-         **/
-        function deletePoll($poll_srl) {
-            $args->poll_srl = $poll_srl;
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $output = $oDB->executeQuery('poll.deletePoll', $args);
-            if(!$output) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $output = $oDB->executeQuery('poll.deletePollTitle', $args);
-            if(!$output) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $output = $oDB->executeQuery('poll.deletePollItem', $args);
-            if(!$output) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $oDB->commit();
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pollAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin controller class of the poll module
+     **/
+
+    class pollAdminController extends poll {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Save the configurations
+         **/
+        function procPollAdminInsertConfig() {
+            $config->skin = Context::get('skin');
+            $config->colorset = Context::get('colorset');
+
+            $oModuleController = &getController('module');
+            $oModuleController->insertModuleConfig('poll', $config);
+
+            $this->setMessage('success_updated');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Delete the polls selected in the administrator's page
+         **/
+        function procPollAdminDeleteChecked() {
+            // Display an error no post is selected
+            $cart = Context::get('cart');
+
+			if(is_array($cart)) $poll_srl_list = $cart;
+			else $poll_srl_list= explode('|@|', $cart);
+
+            $poll_count = count($poll_srl_list);
+            if(!$poll_count) return $this->stop('msg_cart_is_null');
+            // Delete the post
+            for($i=0;$i<$poll_count;$i++) {
+                $poll_index_srl = trim($poll_srl_list[$i]);
+                if(!$poll_index_srl) continue;
+
+                $output = $this->deletePollTitle($poll_index_srl, true);
+                if(!$output->toBool()) return $output;
+            }
+
+            $this->setMessage( sprintf(Context::getLang('msg_checked_poll_is_deleted'), $poll_count) );
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+		function procPollAdminAddCart()
+		{
+			$poll_index_srl = (int)Context::get('poll_index_srl');
+
+			$oPollAdminModel = &getAdminModel('poll');
+			//$columnList = array('comment_srl');
+			$args->pollIndexSrlList = array($poll_index_srl);
+			$args->list_count = 100;
+
+			$output = $oPollAdminModel->getPollList($args);
+
+			if(is_array($output->data))
+			{
+				foreach($output->data AS $key=>$value)
+				{
+					if($_SESSION['poll_management'][$value->poll_index_srl]) unset($_SESSION['poll_management'][$value->poll_index_srl]);
+					else $_SESSION['poll_management'][$value->poll_index_srl] = true;
+				}
+			}
+		}
+
+        /**
+         * @brief Delete the poll (when several questions are registered in one poll, delete this question)
+         **/
+        function deletePollTitle($poll_index_srl) {
+            $args->poll_index_srl = $poll_index_srl;
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $output = $oDB->executeQuery('poll.deletePollTitle', $args);
+            if(!$output) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $output = $oDB->executeQuery('poll.deletePollItem', $args);
+            if(!$output) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $oDB->commit();
+
+            return new Object();
+        }
+
+        /**
+         * @brief Delete the poll (delete the entire poll)
+         **/
+        function deletePoll($poll_srl) {
+            $args->poll_srl = $poll_srl;
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $output = $oDB->executeQuery('poll.deletePoll', $args);
+            if(!$output) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $output = $oDB->executeQuery('poll.deletePollTitle', $args);
+            if(!$output) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $output = $oDB->executeQuery('poll.deletePollItem', $args);
+            if(!$output) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $oDB->commit();
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/poll/poll.admin.model.php b/modules/poll/poll.admin.model.php
index b83b131fa..0c4a0ffb6 100644
--- a/modules/poll/poll.admin.model.php
+++ b/modules/poll/poll.admin.model.php
@@ -1,50 +1,61 @@
-<?php
-    /**
-     * @class  pollAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll 모듈의 admin model class
-     **/
-
-    class pollAdminModel extends poll {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설문 목록 구해옴
-         **/
-        function getPollList($args) {
-            $output = executeQuery('poll.getPollList', $args);
-            if(!$output->toBool()) return $output;
-
-            if($output->data && !is_array($output->data)) $output->data = array($output->data);
-            return $output;
-        }
-
-        /**
-         * @brief 설문조사의 원본을 구함
-         **/
-        function getPollAdminTarget() {
-            $poll_srl = Context::get('poll_srl');
-            $upload_target_srl = Context::get('upload_target_srl');
-
-            $oDocumentModel = &getModel('document');
-            $oCommentModel = &getModel('comment');
-
-            $oDocument = $oDocumentModel->getDocument($upload_target_srl);
-
-            if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
-
-            if($oComment && $oComment->isExists()) {
-                $this->add('document_srl', $oComment->get('document_srl'));
-                $this->add('comment_srl', $oComment->get('comment_srl'));
-            } elseif($oDocument->isExists()) {
-                $this->add('document_srl', $oDocument->get('document_srl'));
-            } else return new Object(-1, 'msg_not_founded');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  pollAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin model class of the poll module
+     **/
+
+    class pollAdminModel extends poll {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Get the list of polls
+         **/
+        function getPollList($args) {
+            $output = executeQueryArray('poll.getPollList', $args);
+            if(!$output->toBool()) return $output;
+
+            //if($output->data && !is_array($output->data)) $output->data = array($output->data);
+            return $output;
+        }
+
+        /**
+         * @brief Get the list of polls with member info
+         **/
+		function getPollListWithMember($args)
+		{
+            $output = executeQueryArray('poll.getPollListWithMember', $args);
+            if(!$output->toBool()) return $output;
+
+            return $output;
+		}
+
+        /**
+         * @brief Get the original poll
+         **/
+        function getPollAdminTarget() {
+            $poll_srl = Context::get('poll_srl');
+            $upload_target_srl = Context::get('upload_target_srl');
+
+            $oDocumentModel = &getModel('document');
+            $oCommentModel = &getModel('comment');
+
+            $oDocument = $oDocumentModel->getDocument($upload_target_srl);
+
+            if(!$oDocument->isExists()) $oComment = $oCommentModel->getComment($upload_target_srl);
+
+            if($oComment && $oComment->isExists()) {
+                $this->add('document_srl', $oComment->get('document_srl'));
+                $this->add('comment_srl', $oComment->get('comment_srl'));
+            } elseif($oDocument->isExists()) {
+                $this->add('document_srl', $oDocument->get('document_srl'));
+            } else return new Object(-1, 'msg_not_founded');
+        }
+
+    }
+?>
diff --git a/modules/poll/poll.admin.view.php b/modules/poll/poll.admin.view.php
index 524119b0c..cab29a60b 100644
--- a/modules/poll/poll.admin.view.php
+++ b/modules/poll/poll.admin.view.php
@@ -1,135 +1,160 @@
-<?php
-    /**
-     * @class  pollAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll모듈의 admin view class
-     **/
-
-    class pollAdminView extends poll {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 관리자 페이지
-         **/
-        function dispPollAdminList() {
-            // 검색 옵션 정리
-            $search_target = trim(Context::get('search_target'));
-            $search_keyword = trim(Context::get('search_keyword'));
-
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'title' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_title= $search_keyword;
-                        break;
-                    case 'regdate' :
-                            $args->s_regdate = $search_keyword;
-                        break;
-                    case 'ipaddress' :
-                            $args->s_ipaddress= $search_keyword;
-                        break;
-                }
-            }
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 50; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'list_order'; ///< 소팅 값
-
-            // 목록 구함
-            $oPollAdminModel = &getAdminModel('poll');
-            $output = $oPollAdminModel->getPollList($args);
-
-            // 템플릿 변수 설정
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('poll_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-            Context::set('module_list', $module_list);			
-			
-			$security = new Security();				
-			$security->encodeHTML('poll_list..title');
-
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('poll_list');
-        }
-
-        /**
-         * @brief 설문조사 스킨, 컬러셋 설정
-         **/
-        function dispPollAdminConfig() {
-            $oModuleModel = &getModel('module');
-
-            // 설정 정보 가져오기
-            $config = $oModuleModel->getModuleConfig('poll');
-            Context::set('config', $config);
-
-            // 스킨 정보 가져오기
-            $skin_list = $oModuleModel->getSkins($this->module_path);
-            Context::set('skin_list', $skin_list);
-
-            if(!$skin_list[$config->skin]) $config->skin = "default";
-
-            // 설정된 스킨의 컬러셋 설정
-            Context::set('colorset_list', $skin_list[$config->skin]->colorset);
-			
-			$security = new Security();				
-			$security->encodeHTML('config..');
-			$security->encodeHTML('skin_list..title');
-			$security->encodeHTML('colorset_list..name','colorset_list..title');
-			
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('config');
-        }
-
-        /**
-         * @brief 설문조사 결과
-         **/
-        function dispPollAdminResult() {
-            // 팝업 레이아웃
-            $this->setLayoutFile("popup_layout");
-
-            // 결과 뽑기
-            $args->poll_srl = Context::get('poll_srl'); 
-            $args->poll_index_srl = Context::get('poll_index_srl'); 
-
-            $output = executeQuery('poll.getPoll', $args);
-            if(!$output->data) return $this->stop('msg_poll_not_exists');
-            $poll->stop_date = $output->data->stop_date;
-            $poll->poll_count = $output->data->poll_count;
-
-            $output = executeQuery('poll.getPollTitle', $args);
-            if(!$output->data) return $this->stop('msg_poll_not_exists');
-
-            $poll->poll[$args->poll_index_srl]->title = $output->data->title;
-            $poll->poll[$args->poll_index_srl]->checkcount = $output->data->checkcount;
-            $poll->poll[$args->poll_index_srl]->poll_count = $output->data->poll_count;
-
-            $output = executeQuery('poll.getPollItem', $args);
-            foreach($output->data as $key => $val) {
-                $poll->poll[$val->poll_index_srl]->item[] = $val;
-            }
-
-            $poll->poll_srl = $poll_srl;
-
-            Context::set('poll',$poll);
-
-            // 기본 설정의 스킨, 컬러셋 설정 
-            $oModuleModel = &getModel('module');
-            $poll_config = $oModuleModel->getModuleConfig('poll');
-            Context::set('poll_config', $poll_config);
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('result');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pollAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin view class of the poll module
+     **/
+
+    class pollAdminView extends poll {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Administrator's Page
+         **/
+        function dispPollAdminList() {
+            // Arrange the search options
+            $search_target = trim(Context::get('search_target'));
+            $search_keyword = trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'title' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_title= $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress= $search_keyword;
+                        break;
+                }
+            }
+            // Options to get a list of pages
+            $args->page = Context::get('page');
+            $args->list_count = 50; // The number of posts to show on one page
+            $args->page_count = 10; // The number of pages to display in the page navigation
+
+            $args->sort_index = 'P.list_order'; // Sorting value
+
+            // Get the list
+            $oPollAdminModel = &getAdminModel('poll');
+            $output = $oPollAdminModel->getPollListWithMember($args);
+
+			// check poll type. document or comment
+			if(is_array($output->data))
+			{
+				$uploadTargetSrlList = array();
+				foreach($output->data AS $key=>$value)
+				{
+					array_push($uploadTargetSrlList, $value->upload_target_srl);
+				}
+
+            	$oDocumentModel = &getModel('document');
+				$targetDocumentOutput = $oDocumentModel->getDocuments($uploadTargetSrlList);
+				if(!is_array($targetDocumentOutput)) $targetDocumentOutput = array();
+
+				$oCommentModel = &getModel('comment');
+				$columnList = array('comment_srl', 'document_srl');
+				$targetCommentOutput = $oCommentModel->getComments($uploadTargetSrlList, $columnList);
+				if(!is_array($targetCommentOutput)) $targetCommentOutput = array();
+
+				foreach($output->data AS $key=>$value)
+				{
+					if(array_key_exists($value->upload_target_srl, $targetDocumentOutput))
+						$value->document_srl = $value->upload_target_srl;
+
+					if(array_key_exists($value->upload_target_srl, $targetCommentOutput))
+					{
+						$value->comment_srl = $value->upload_target_srl;
+						$value->document_srl = $targetCommentOutput[$value->comment_srl]->document_srl;
+					}
+				}
+			}
+
+            // Configure the template variables
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('poll_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+            Context::set('module_list', $module_list);			
+			
+			$security = new Security();				
+			$security->encodeHTML('poll_list..title');
+            // Set a template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('poll_list');
+        }
+
+        /**
+         * @brief Confgure the poll skin and colorset
+         **/
+        function dispPollAdminConfig() {
+            $oModuleModel = &getModel('module');
+            // Get the configuration information
+            $config = $oModuleModel->getModuleConfig('poll');
+            Context::set('config', $config);
+            // Get the skin information
+            $skin_list = $oModuleModel->getSkins($this->module_path);
+            Context::set('skin_list', $skin_list);
+
+            if(!$skin_list[$config->skin]) $config->skin = "default";
+            // Set the skin colorset once the configurations is completed
+            Context::set('colorset_list', $skin_list[$config->skin]->colorset);
+			
+			$security = new Security();				
+			$security->encodeHTML('config..');
+			$security->encodeHTML('skin_list..title');
+			$security->encodeHTML('colorset_list..name','colorset_list..title');
+			
+            // Set a template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('config');
+        }
+
+        /**
+         * @brief Poll Results
+         **/
+        function dispPollAdminResult() {
+            // Popup layout
+            $this->setLayoutFile("popup_layout");
+            // Draw results
+            $args->poll_srl = Context::get('poll_srl'); 
+            $args->poll_index_srl = Context::get('poll_index_srl'); 
+
+            $output = executeQuery('poll.getPoll', $args);
+            if(!$output->data) return $this->stop('msg_poll_not_exists');
+            $poll->stop_date = $output->data->stop_date;
+            $poll->poll_count = $output->data->poll_count;
+
+            $output = executeQuery('poll.getPollTitle', $args);
+            if(!$output->data) return $this->stop('msg_poll_not_exists');
+
+            $poll->poll[$args->poll_index_srl]->title = $output->data->title;
+            $poll->poll[$args->poll_index_srl]->checkcount = $output->data->checkcount;
+            $poll->poll[$args->poll_index_srl]->poll_count = $output->data->poll_count;
+
+            $output = executeQuery('poll.getPollItem', $args);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->item[] = $val;
+            }
+
+            $poll->poll_srl = $poll_srl;
+
+            Context::set('poll',$poll);
+            // Configure the skin and the colorset for the default configuration
+            $oModuleModel = &getModel('module');
+            $poll_config = $oModuleModel->getModuleConfig('poll');
+            Context::set('poll_config', $poll_config);
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('result');
+        }
+    }
+?>
diff --git a/modules/poll/poll.class.php b/modules/poll/poll.class.php
index eed9d5030..4f70b28d1 100644
--- a/modules/poll/poll.class.php
+++ b/modules/poll/poll.class.php
@@ -1,83 +1,78 @@
-<?php
-    /**
-     * @class  poll
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll모듈의 high class
-     **/
-
-    class poll extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            // 기본 스킨 설정
-            $oModuleController = &getController('module');
-            $config->skin = 'default';
-            $config->colorset = 'normal';
-            $oModuleController->insertModuleConfig('poll', $config);
-
-            // 2007. 10. 17 글/댓글의 삭제시 설문조사도 삭제
-            $oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
-            $oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
-            $oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
-            $oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
-            $oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
-            $oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            // 2007. 10. 17 글/댓글의 삭제시 설문조사도 삭제
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
-            if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 2007. 10. 17 글/댓글의 삭제시 설문조사도 삭제
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
-                $oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
-            if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
-                $oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
-
-            // 2008. 04. 22 글/댓글의 추가기 설문조사의 연결
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) 
-                $oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) 
-                $oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) 
-                $oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) 
-                $oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  poll
+     * @author NHN (developers@xpressengine.com)
+     * @brief The parent class of the poll module
+     **/
+
+    class poll extends ModuleObject {
+
+        /**
+         * @brief Additional tasks required to accomplish during the installation
+         **/
+        function moduleInstall() {
+            // Register in the action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+            // Set the default skin
+            $oModuleController = &getController('module');
+            $config->skin = 'default';
+            $config->colorset = 'normal';
+            $oModuleController->insertModuleConfig('poll', $config);
+            // 2007.10.17 When deleting posts/comments delete the poll as well
+            $oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
+            $oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
+            $oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
+            $oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
+            $oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
+            $oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
+
+            return new Object();
+        }
+
+        /**
+         * @brief A method to check if the installation has been successful
+         **/
+        function checkUpdate() {
+            $oModuleModel = &getModel('module');
+            // 2007.10.17 When deleting posts/comments delete the poll as well
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after')) return true;
+            if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // 2007.10.17 When deleting posts/comments delete the poll as well
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after'))
+                $oModuleController->insertTrigger('document.deleteDocument', 'poll', 'controller', 'triggerDeleteDocumentPoll', 'after');
+            if(!$oModuleModel->getTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after'))
+                $oModuleController->insertTrigger('comment.deleteComment', 'poll', 'controller', 'triggerDeleteCommentPoll', 'after');
+            // 2008.04.22 A poll connection to add posts/comments
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after')) 
+                $oModuleController->insertTrigger('document.insertDocument', 'poll', 'controller', 'triggerInsertDocumentPoll', 'after');
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after')) 
+                $oModuleController->insertTrigger('comment.insertComment', 'poll', 'controller', 'triggerInsertCommentPoll', 'after');
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after')) 
+                $oModuleController->insertTrigger('document.updateDocument', 'poll', 'controller', 'triggerUpdateDocumentPoll', 'after');
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after')) 
+                $oModuleController->insertTrigger('comment.updateComment', 'poll', 'controller', 'triggerUpdateCommentPoll', 'after');
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index 674761028..cc7288e0a 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -1,316 +1,344 @@
-<?php
-    /**
-     * @class  pollController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll모듈의 Controller class
-     **/
-
-    class pollController extends poll {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 팝업창에서 설문 작성 완료후 저장을 누를때 설문 등록
-         **/
-        function procInsert() {
-            $stop_date = Context::get('stop_date');
-            if($stop_date < date("Ymd")) $stop_date = date("YmdHis", time()+60*60*24*365);
-
-            $vars = Context::getRequestVars();
-            foreach($vars as $key => $val) {
-                if(strpos($key,'tidx')) continue;
-                if(!preg_match("/^(title|checkcount|item)_/i", $key)) continue;
-                if(!trim($val)) continue;
-
-                $tmp_arr = explode('_',$key);
-
-                $poll_index = $tmp_arr[1];
-
-                if(Context::get('is_logged')) {
-                    $logged_info = Context::get('logged_info');
-                    // 세션에서 최고 관리자가 아니면 태그 제거
-                    if($logged_info->is_admin != 'Y') $val = htmlspecialchars($val);
-                }
-
-                if($tmp_arr[0]=='title') $tmp_args[$poll_index]->title = $val;
-                else if($tmp_arr[0]=='checkcount') $tmp_args[$poll_index]->checkcount = $val;
-                else if($tmp_arr[0]=='item') $tmp_args[$poll_index]->item[] = $val;
-            }
-
-            foreach($tmp_args as $key => $val) {
-                if(!$val->checkcount) $val->checkcount = 1;
-                if($val->title && count($val->item)) $args->poll[] = $val;
-            }
-
-            if(!count($args->poll)) return new Object(-1, 'cmd_null_item');
-
-            $args->stop_date = $stop_date;
-
-            // 변수 설정
-            $poll_srl = getNextSequence();
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            // 설문의 등록
-            unset($poll_args);
-            $poll_args->poll_srl = $poll_srl;
-            $poll_args->member_srl = $member_srl;
-            $poll_args->list_order = $poll_srl*-1;
-            $poll_args->stop_date = $args->stop_date;
-            $poll_args->poll_count = 0;
-            $output = executeQuery('poll.insertPoll', $poll_args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 개별 설문 등록
-            foreach($args->poll as $key => $val) {
-                unset($title_args);
-                $title_args->poll_srl = $poll_srl;
-                $title_args->poll_index_srl = getNextSequence();
-                $title_args->title = $val->title;
-                $title_args->checkcount = $val->checkcount;
-                $title_args->poll_count = 0;
-                $title_args->list_order = $title_args->poll_index_srl * -1;
-                $title_args->member_srl = $member_srl;
-                $title_args->upload_target_srl = $upload_target_srl;
-                $output = executeQuery('poll.insertPollTitle', $title_args);
-                if(!$output->toBool()) {
-                    $oDB->rollback();
-                    return $output;
-                }
-
-                // 개별 설문의 항목 추가
-                foreach($val->item as $k => $v) {
-                    unset($item_args);
-                    $item_args->poll_srl = $poll_srl;
-                    $item_args->poll_index_srl = $title_args->poll_index_srl;
-                    $item_args->title = $v;
-                    $item_args->poll_count = 0;
-                    $item_args->upload_target_srl = $upload_target_srl;
-                    $output = executeQuery('poll.insertPollItem', $item_args);
-                    if(!$output->toBool()) {
-                        $oDB->rollback();
-                        return $output;
-                    }
-                }
-            }
-
-            $oDB->commit();
-
-            $this->add('poll_srl', $poll_srl);
-            $this->setMessage('success_registed');
-        }
-
-        /**
-         * @brief 설문 조사에 응함
-         **/
-        function procPoll() {
-            $poll_srl = Context::get('poll_srl'); 
-            $poll_srl_indexes = Context::get('poll_srl_indexes'); 
-            $tmp_item_srls = explode(',',$poll_srl_indexes);
-            for($i=0;$i<count($tmp_item_srls);$i++) {
-                $srl = (int)trim($tmp_item_srls[$i]);
-                if(!$srl) continue;
-                $item_srls[] = $srl;
-            }
-
-            // 응답항목이 없으면 오류
-            if(!count($item_srls)) return new Object(-1, 'msg_check_poll_item');
-
-            // 이미 설문하였는지 조사
-            $oPollModel = &getModel('poll');
-            if($oPollModel->isPolled($poll_srl)) return new Object(-1, 'msg_already_poll');
-
-            $oDB = &DB::getInstance();
-            $oDB->begin();
-
-            $args->poll_srl = $poll_srl;
-
-            // 해당 글의 모든 설문조사의 응답수 올림
-            $output = executeQuery('poll.updatePoll', $args);
-            $output = executeQuery('poll.updatePollTitle', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 각 설문조사의 선택된 항목을 기록
-            $args->poll_item_srl = implode(',',$item_srls);
-            $output = executeQuery('poll.updatePollItems', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            // 응답자 정보를 로그로 남김
-            $log_args->poll_srl = $poll_srl;
-
-            $logged_info = Context::get('logged_info');
-            $member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
-
-            $log_args->member_srl = $member_srl;
-            $log_args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            $output = executeQuery('poll.insertPollLog', $log_args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
-            }
-
-            $oDB->commit();
-
-            $skin = Context::get('skin'); 
-            if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
-
-            // tpl 가져오기
-            $tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
-
-            $this->add('poll_srl', $poll_srl);
-            $this->add('tpl',$tpl);
-            $this->setMessage('success_poll');
-        }
-
-        /**
-         * @brief 결과 미리 보기
-         **/
-        function procPollViewResult() {
-            $poll_srl = Context::get('poll_srl'); 
-
-            $skin = Context::get('skin'); 
-            if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
-
-            $oPollModel = &getModel('poll');
-            $tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
-
-            $this->add('poll_srl', $poll_srl);
-            $this->add('tpl',$tpl);
-        }
-
-        /**
-         * @brief 게시글 등록시 poll 연결하는 trigger
-         **/
-        function triggerInsertDocumentPoll(&$obj) {
-            $this->syncPoll($obj->document_srl, $obj->content);
-            return new Object();
-        }
-
-        /**
-         * @brief 댓글 등록시 poll 연결하는 trigger
-         **/
-        function triggerInsertCommentPoll(&$obj) {
-            $this->syncPoll($obj->comment_srl, $obj->content);
-            return new Object();
-        }
-
-        /**
-         * @brief 게시글 수정시 poll 연결하는 trigger
-         **/
-        function triggerUpdateDocumentPoll(&$obj) {
-            $this->syncPoll($obj->document_srl, $obj->content);
-            return new Object();
-        }
-
-        /**
-         * @brief 댓글 등록시 poll 연결하는 trigger
-         **/
-        function triggerUpdateCommentPoll(&$obj) {
-            $this->syncPoll($obj->comment_srl, $obj->content);
-            return new Object();
-        }
-
-        /**
-         * @brief 게시글 삭제시 poll 삭제하는 trigger
-         **/
-        function triggerDeleteDocumentPoll(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            // 설문조사를 구함
-            $args->upload_target_srl = $document_srl;
-            $output = executeQuery('poll.getPollByTargetSrl', $args);
-            if(!$output->data) return new Object();
-
-            $poll_srl = $output->data->poll_srl;
-            if(!$poll_srl) return new Object();
-
-            $args->poll_srl = $poll_srl;
-
-            $output = executeQuery('poll.deletePoll', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('poll.deletePollItem', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('poll.deletePollTitle', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('poll.deletePollLog', $args);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-
-        /**
-         * @brief 댓글 삭제시 poll 삭제하는 trigger
-         **/
-        function triggerDeleteCommentPoll(&$obj) {
-            $comment_srl = $obj->comment_srl;
-            if(!$comment_srl) return new Object();
-
-            // 설문조사를 구함
-            $args->upload_target_srl = $comment_srl;
-            $output = executeQuery('poll.getPollByTargetSrl', $args);
-            if(!$output->data) return new Object();
-
-            $poll_srl = $output->data->poll_srl;
-            if(!$poll_srl) return new Object();
-
-            $args->poll_srl = $poll_srl;
-
-            $output = executeQuery('poll.deletePoll', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('poll.deletePollItem', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('poll.deletePollTitle', $args);
-            if(!$output->toBool()) return $output;
-
-            $output = executeQuery('poll.deletePollLog', $args);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-
-        /**
-         * @brief 게시글 내용의 설문조사를 구해와서 문서 번호와 연결 
-         **/
-        function syncPoll($upload_target_srl, $content) {
-            $match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is',$content, $matches);
-            for($i=0;$i<$match_cnt;$i++) {
-                $poll_srl = $matches[3][$i];
-
-                $args = null;
-                $args->poll_srl = $poll_srl;
-                $output = executeQuery('poll.getPoll', $args);
-                $poll = $output->data;
-
-                if($poll->upload_target_srl) continue;
-
-                $args->upload_target_srl = $upload_target_srl;
-                $output = executeQuery('poll.updatePollTarget', $args);
-                $output = executeQuery('poll.updatePollTitleTarget', $args);
-                $output = executeQuery('poll.updatePollItemTarget', $args);
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pollController
+     * @author NHN (developers@xpressengine.com)
+     * @brief Controller class for poll module
+     **/
+
+    class pollController extends poll {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief after a qeustion is created in the popup window, register the question during the save time
+         **/
+        function procInsert() {
+            $stop_date = Context::get('stop_date');
+            if($stop_date < date("Ymd")) $stop_date = date("YmdHis", time()+60*60*24*365);
+
+            $vars = Context::getRequestVars();
+            foreach($vars as $key => $val) {
+                if(strpos($key,'tidx')) continue;
+                if(!preg_match("/^(title|checkcount|item)_/i", $key)) continue;
+                if(!trim($val)) continue;
+
+                $tmp_arr = explode('_',$key);
+
+                $poll_index = $tmp_arr[1];
+
+                if(Context::get('is_logged')) {
+                    $logged_info = Context::get('logged_info');
+                    // Remove the tag if the it is not the top administrator in the session
+                    if($logged_info->is_admin != 'Y') $val = htmlspecialchars($val);
+                }
+
+                if($tmp_arr[0]=='title') $tmp_args[$poll_index]->title = $val;
+                else if($tmp_arr[0]=='checkcount') $tmp_args[$poll_index]->checkcount = $val;
+                else if($tmp_arr[0]=='item') $tmp_args[$poll_index]->item[] = $val;
+            }
+
+            foreach($tmp_args as $key => $val) {
+                if(!$val->checkcount) $val->checkcount = 1;
+                if($val->title && count($val->item)) $args->poll[] = $val;
+            }
+
+            if(!count($args->poll)) return new Object(-1, 'cmd_null_item');
+
+            $args->stop_date = $stop_date;
+            // Configure the variables
+            $poll_srl = getNextSequence();
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+            // Register the poll
+            unset($poll_args);
+            $poll_args->poll_srl = $poll_srl;
+            $poll_args->member_srl = $member_srl;
+            $poll_args->list_order = $poll_srl*-1;
+            $poll_args->stop_date = $args->stop_date;
+            $poll_args->poll_count = 0;
+            $output = executeQuery('poll.insertPoll', $poll_args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Individual poll registration
+            foreach($args->poll as $key => $val) {
+                unset($title_args);
+                $title_args->poll_srl = $poll_srl;
+                $title_args->poll_index_srl = getNextSequence();
+                $title_args->title = $val->title;
+                $title_args->checkcount = $val->checkcount;
+                $title_args->poll_count = 0;
+                $title_args->list_order = $title_args->poll_index_srl * -1;
+                $title_args->member_srl = $member_srl;
+                $title_args->upload_target_srl = $upload_target_srl;
+                $output = executeQuery('poll.insertPollTitle', $title_args);
+                if(!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+                // Add the individual survey items
+                foreach($val->item as $k => $v) {
+                    unset($item_args);
+                    $item_args->poll_srl = $poll_srl;
+                    $item_args->poll_index_srl = $title_args->poll_index_srl;
+                    $item_args->title = $v;
+                    $item_args->poll_count = 0;
+                    $item_args->upload_target_srl = $upload_target_srl;
+                    $output = executeQuery('poll.insertPollItem', $item_args);
+                    if(!$output->toBool()) {
+                        $oDB->rollback();
+                        return $output;
+                    }
+                }
+            }
+
+            $oDB->commit();
+
+            $this->add('poll_srl', $poll_srl);
+            $this->setMessage('success_registed');
+        }
+
+        /**
+         * @brief Accept the poll
+         **/
+        function procPoll() {
+            $poll_srl = Context::get('poll_srl'); 
+            $poll_srl_indexes = Context::get('poll_srl_indexes'); 
+            $tmp_item_srls = explode(',',$poll_srl_indexes);
+            for($i=0;$i<count($tmp_item_srls);$i++) {
+                $srl = (int)trim($tmp_item_srls[$i]);
+                if(!$srl) continue;
+                $item_srls[] = $srl;
+            }
+
+            // If there is no response item, display an error
+            if(!count($item_srls)) return new Object(-1, 'msg_check_poll_item');
+            // Make sure is the poll has already been taken
+            $oPollModel = &getModel('poll');
+            if($oPollModel->isPolled($poll_srl)) return new Object(-1, 'msg_already_poll');
+
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            $args->poll_srl = $poll_srl;
+            // Update all poll responses related to the post
+            $output = executeQuery('poll.updatePoll', $args);
+            $output = executeQuery('poll.updatePollTitle', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Record each polls selected items
+            $args->poll_item_srl = implode(',',$item_srls);
+            $output = executeQuery('poll.updatePollItems', $args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+            // Log the respondent's information
+            $log_args->poll_srl = $poll_srl;
+
+            $logged_info = Context::get('logged_info');
+            $member_srl = $logged_info->member_srl?$logged_info->member_srl:0;
+
+            $log_args->member_srl = $member_srl;
+            $log_args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            $output = executeQuery('poll.insertPollLog', $log_args);
+            if(!$output->toBool()) {
+                $oDB->rollback();
+                return $output;
+            }
+
+            $oDB->commit();
+
+            $skin = Context::get('skin'); 
+            if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
+            // Get tpl
+            $tpl = $oPollModel->getPollHtml($poll_srl, '', $skin);
+
+            $this->add('poll_srl', $poll_srl);
+            $this->add('tpl',$tpl);
+            $this->setMessage('success_poll');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispPollAdminConfig');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Preview the results
+         **/
+        function procPollViewResult() {
+            $poll_srl = Context::get('poll_srl'); 
+
+            $skin = Context::get('skin'); 
+            if(!$skin || !is_dir('./modules/poll/skins/'.$skin)) $skin = 'default';
+
+            $oPollModel = &getModel('poll');
+            $tpl = $oPollModel->getPollResultHtml($poll_srl, $skin);
+
+            $this->add('poll_srl', $poll_srl);
+            $this->add('tpl',$tpl);
+        }
+
+        /**
+         * @brief poll list
+         **/
+        function procPollGetList()
+		{
+			if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+			$pollSrls = Context::get('poll_srls');
+			if($pollSrls) $pollSrlList = explode(',', $pollSrls);
+
+			global $lang;
+			if(count($pollSrlList) > 0) {
+				$oPollAdminModel = &getAdminModel('poll');
+				$args->pollIndexSrlList = $pollSrlList;
+				$output = $oPollAdminModel->getPollListWithMember($args);
+				$pollList = $output->data;
+
+				if(is_array($pollList))
+				{
+					foreach($pollList AS $key=>$value)
+					{
+						if($value->checkcount == 1) $value->checkName = $lang->single_check;
+						else $value->checkName = $lang->multi_check;
+					}
+				}
+			}
+			else
+			{
+				$pollList = array();
+				$this->setMessage($lang->no_documents);
+			}
+
+			$this->add('poll_list', $pollList);
+        }
+
+        /**
+         * @brief A poll synchronization trigger when a new post is registered
+         **/
+        function triggerInsertDocumentPoll(&$obj) {
+            $this->syncPoll($obj->document_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief A poll synchronization trigger when a new comment is registered
+         **/
+        function triggerInsertCommentPoll(&$obj) {
+            $this->syncPoll($obj->comment_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief A poll synchronization trigger when a post is updated
+         **/
+        function triggerUpdateDocumentPoll(&$obj) {
+            $this->syncPoll($obj->document_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief A poll synchronization trigger when a comment is updated
+         **/
+        function triggerUpdateCommentPoll(&$obj) {
+            $this->syncPoll($obj->comment_srl, $obj->content);
+            return new Object();
+        }
+
+        /**
+         * @brief A poll deletion trigger when a post is removed
+         **/
+        function triggerDeleteDocumentPoll(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+            // Get the poll
+            $args->upload_target_srl = $document_srl;
+            $output = executeQuery('poll.getPollByTargetSrl', $args);
+            if(!$output->data) return new Object();
+
+            $poll_srl = $output->data->poll_srl;
+            if(!$poll_srl) return new Object();
+
+            $args->poll_srl = $poll_srl;
+
+            $output = executeQuery('poll.deletePoll', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('poll.deletePollItem', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('poll.deletePollTitle', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('poll.deletePollLog', $args);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+
+        /**
+         * @brief A poll deletion trigger when a comment is removed
+         **/
+        function triggerDeleteCommentPoll(&$obj) {
+            $comment_srl = $obj->comment_srl;
+            if(!$comment_srl) return new Object();
+            // Get the poll
+            $args->upload_target_srl = $comment_srl;
+            $output = executeQuery('poll.getPollByTargetSrl', $args);
+            if(!$output->data) return new Object();
+
+            $poll_srl = $output->data->poll_srl;
+            if(!$poll_srl) return new Object();
+
+            $args->poll_srl = $poll_srl;
+
+            $output = executeQuery('poll.deletePoll', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('poll.deletePollItem', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('poll.deletePollTitle', $args);
+            if(!$output->toBool()) return $output;
+
+            $output = executeQuery('poll.deletePollLog', $args);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+
+        /**
+         * @brief As post content's poll is obtained, synchronize the poll using the document number
+         **/
+        function syncPoll($upload_target_srl, $content) {
+            $match_cnt = preg_match_all('!<img([^\>]*)poll_srl=(["\']?)([0-9]*)(["\']?)([^\>]*?)\>!is',$content, $matches);
+            for($i=0;$i<$match_cnt;$i++) {
+                $poll_srl = $matches[3][$i];
+
+                $args = null;
+                $args->poll_srl = $poll_srl;
+                $output = executeQuery('poll.getPoll', $args);
+                $poll = $output->data;
+
+                if($poll->upload_target_srl) continue;
+
+                $args->upload_target_srl = $upload_target_srl;
+                $output = executeQuery('poll.updatePollTarget', $args);
+                $output = executeQuery('poll.updatePollTitleTarget', $args);
+                $output = executeQuery('poll.updatePollItemTarget', $args);
+            }
+        }
+    }
+?>
diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php
index 9aea81ada..c4335fde0 100644
--- a/modules/poll/poll.model.php
+++ b/modules/poll/poll.model.php
@@ -1,142 +1,138 @@
-<?php
-    /**
-     * @class  pollModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  poll 모듈의 model class
-     **/
-
-    class pollModel extends poll {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 이미 설문 조사를 하였는지 검사하는 함수
-         **/
-        function isPolled($poll_srl) {
-            $args->poll_srl = $poll_srl;
-
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                $args->member_srl = $logged_info->member_srl;
-            } else {
-                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
-            }
-            $output = executeQuery('poll.getPollLog', $args);
-            if($output->data->count) return true;
-            return false;
-        }
-
-        /**
-         * @brief 설문조사의 html데이터를 return
-         * 설문조사에 응하였는지에 대한 체크를 한 후 결과를 return
-         **/
-        function getPollHtml($poll_srl, $style = '', $skin = 'default') {
-
-            $args->poll_srl = $poll_srl;
-
-            // 해당 설문조사에 대한 내용을 조사
-            $output = executeQuery('poll.getPoll', $args);
-            if(!$output->data) return '';
-
-            $poll->style = $style;
-            $poll->poll_count = (int)$output->data->poll_count;
-            $poll->stop_date = $output->data->stop_date;
-
-            $output = executeQuery('poll.getPollTitle', $args);
-            if(!$output->data) return;
-            if(!is_array($output->data)) $output->data = array($output->data);
-            foreach($output->data as $key => $val) {
-                $poll->poll[$val->poll_index_srl]->title = $val->title;
-                $poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
-                $poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
-            }
-
-            $output = executeQuery('poll.getPollItem', $args);
-            foreach($output->data as $key => $val) {
-                $poll->poll[$val->poll_index_srl]->item[] = $val;
-            }
-
-            $poll->poll_srl = $poll_srl;
-
-            // 종료일이 지났으면 무조건 결과만
-            if($poll->stop_date > date("Ymd")) {
-                if($this->isPolled($poll_srl)) $tpl_file = "result";
-                else $tpl_file = "form";
-            } else {
-                $tpl_file = "result";
-            }
-
-            Context::set('poll',$poll);
-            Context::set('skin',$skin);
-
-            // 기본 설정의 스킨, 컬러셋 설정 
-            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 결과 html을 return
-         **/
-        function getPollResultHtml($poll_srl, $skin = 'default') {
-            $args->poll_srl = $poll_srl;
-
-            // 해당 설문조사에 대한 내용을 조사
-            $output = executeQuery('poll.getPoll', $args);
-            if(!$output->data) return '';
-
-            $poll->style = $style;
-            $poll->poll_count = (int)$output->data->poll_count;
-            $poll->stop_date = $output->data->stop_date;
-
-            $output = executeQuery('poll.getPollTitle', $args);
-            if(!$output->data) return;
-            if(!is_array($output->data)) $output->data = array($output->data);
-            foreach($output->data as $key => $val) {
-                $poll->poll[$val->poll_index_srl]->title = $val->title;
-                $poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
-                $poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
-            }
-
-            $output = executeQuery('poll.getPollItem', $args);
-            foreach($output->data as $key => $val) {
-                $poll->poll[$val->poll_index_srl]->item[] = $val;
-            }
-
-            $poll->poll_srl = $poll_srl;
-
-            $tpl_file = "result";
-
-            Context::set('poll',$poll);
-
-            // 기본 설정의 스킨, 컬러셋 설정 
-            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
-
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-        /**
-         * @brief 선택된 설문조사 - 스킨의 컬러셋을 return
-         **/
-        function getPollGetColorsetList() {
-            $skin = Context::get('skin');
-
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
-
-            for($i=0;$i<count($skin_info->colorset);$i++) {
-                $colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
-                $colorset_list[] = $colorset;
-            }
-
-            if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
-            $this->add('colorset_list', $colorsets);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  pollModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief The model class for the poll modules
+     **/
+
+    class pollModel extends poll {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief The function examines if the user has already been polled
+         **/
+        function isPolled($poll_srl) {
+            $args->poll_srl = $poll_srl;
+
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                $args->member_srl = $logged_info->member_srl;
+            } else {
+                $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            }
+            $output = executeQuery('poll.getPollLog', $args);
+            if($output->data->count) return true;
+            return false;
+        }
+
+        /**
+         * @brief Return the HTML data of the survey
+         * Return the result after checking if the poll has responses
+         **/
+        function getPollHtml($poll_srl, $style = '', $skin = 'default') {
+            $args->poll_srl = $poll_srl;
+            // Get the information related to the survey
+			$columnList = array('poll_count', 'stop_date');
+            $output = executeQuery('poll.getPoll', $args, $columnList);
+            if(!$output->data) return '';
+
+            $poll->style = $style;
+            $poll->poll_count = (int)$output->data->poll_count;
+            $poll->stop_date = $output->data->stop_date;
+
+			$columnList = array('poll_index_srl', 'title', 'checkcount', 'poll_count');
+            $output = executeQuery('poll.getPollTitle', $args, $columnList);
+            if(!$output->data) return;
+            if(!is_array($output->data)) $output->data = array($output->data);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->title = $val->title;
+                $poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
+                $poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
+            }
+
+            $output = executeQuery('poll.getPollItem', $args);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->item[] = $val;
+            }
+
+            $poll->poll_srl = $poll_srl;
+            // Only ongoing poll results
+            if($poll->stop_date > date("Ymd")) {
+                if($this->isPolled($poll_srl)) $tpl_file = "result";
+                else $tpl_file = "form";
+            } else {
+                $tpl_file = "result";
+            }
+
+            Context::set('poll',$poll);
+            Context::set('skin',$skin);
+            // The skin for the default configurations, and the colorset configurations
+            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+        /**
+         * @brief Return the result's HTML
+         **/
+        function getPollResultHtml($poll_srl, $skin = 'default') {
+            $args->poll_srl = $poll_srl;
+            // Get the information related to the survey
+            $output = executeQuery('poll.getPoll', $args);
+            if(!$output->data) return '';
+
+            $poll->style = $style;
+            $poll->poll_count = (int)$output->data->poll_count;
+            $poll->stop_date = $output->data->stop_date;
+
+			$columnList = array('poll_index_srl', 'checkcount', 'poll_count');
+            $output = executeQuery('poll.getPollTitle', $args, $columnList);
+            if(!$output->data) return;
+            if(!is_array($output->data)) $output->data = array($output->data);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->title = $val->title;
+                $poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
+                $poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
+            }
+
+            $output = executeQuery('poll.getPollItem', $args);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->item[] = $val;
+            }
+
+            $poll->poll_srl = $poll_srl;
+
+            $tpl_file = "result";
+
+            Context::set('poll',$poll);
+            // The skin for the default configurations, and the colorset configurations
+            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $skin);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+        /** [TO REVIEW]
+         * @brief Selected poll - return the colorset of the skin
+         **/
+        function getPollGetColorsetList() {
+            $skin = Context::get('skin');
+
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($this->module_path, $skin);
+
+            for($i=0;$i<count($skin_info->colorset);$i++) {
+                $colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
+                $colorset_list[] = $colorset;
+            }
+
+            if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+            $this->add('colorset_list', $colorsets);
+        }
+    }
+?>
diff --git a/modules/poll/queries/getPollList.xml b/modules/poll/queries/getPollList.xml
index 1e7bba724..1c2154a78 100644
--- a/modules/poll/queries/getPollList.xml
+++ b/modules/poll/queries/getPollList.xml
@@ -6,7 +6,8 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="like" column="title" var="s_title" />
+        <condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" />
+        <condition operation="like" column="title" var="s_title" pipe="or"/>
         <condition operation="like_prefix" column="regdate" var="s_regdate" pipe="or" />
         <condition operation="like_prefix" column="ipaddress" var="s_ipaddress" pipe="or" />
     </conditions>
diff --git a/modules/poll/queries/getPollListWithMember.xml b/modules/poll/queries/getPollListWithMember.xml
new file mode 100644
index 000000000..92b229067
--- /dev/null
+++ b/modules/poll/queries/getPollListWithMember.xml
@@ -0,0 +1,24 @@
+<query id="getPollList" action="select">
+    <tables>
+        <table name="poll_title" alias="P" />
+        <table name="member" alias="M" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+		<group pipe="and">
+			<condition operation="equal" column="P.member_srl" var="M.member_srl" notnull="notnull" />
+			<condition operation="in" column="poll_index_srl" var="pollIndexSrlList" filter="number" pipe="and" />
+		</group>
+        <condition operation="like" column="P.title" var="s_title" pipe="or"/>
+        <condition operation="like_prefix" column="P.regdate" var="s_regdate" pipe="or" />
+        <condition operation="like_prefix" column="P.ipaddress" var="s_ipaddress" pipe="or" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="P.list_order" order="asc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/poll/ruleset/deleteChecked.xml b/modules/poll/ruleset/deleteChecked.xml
new file mode 100644
index 000000000..55a24f35c
--- /dev/null
+++ b/modules/poll/ruleset/deleteChecked.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="cart" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/poll/ruleset/insertConfig.xml b/modules/poll/ruleset/insertConfig.xml
new file mode 100644
index 000000000..8701ae984
--- /dev/null
+++ b/modules/poll/ruleset/insertConfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="skin" required="true" />
+		<field name="colorset" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/poll/ruleset/poll.xml b/modules/poll/ruleset/poll.xml
new file mode 100644
index 000000000..b4f91605a
--- /dev/null
+++ b/modules/poll/ruleset/poll.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="poll_srl" required="true" rule="number" />
+		<field name="poll_srl_indexes" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/poll/skins/default/css/poll.min.css b/modules/poll/skins/default/css/poll.min.css
new file mode 100644
index 000000000..bc2aa2d12
--- /dev/null
+++ b/modules/poll/skins/default/css/poll.min.css
@@ -0,0 +1 @@
+.poll_table{table-layout:fixed;width:100%;padding:0;border:none}.poll_table td{padding:0;margin:0}.poll_table td.h{background:url(../images/top_bg.png) repeat-x left top}.poll_table td.title{height:28px;background:url(../images/top_title_bg.png) repeat-x left top;padding:0 20px 0 20px;color:#C3C3C4}.poll_table td.title strong{color:#FFFFFF;font-weight:bold}.poll_table td.l{border-left:1px solid #E5E5E5}.poll_table td.r{border-right:1px solid #E5E5E5}.poll_table td.poll_content{padding:18px 13px 18px 13px}.poll_table td.poll_button{border:1px solid #E5E5E5;border-bottom:none;background-color:#F6F6F5}.poll_table td.poll_button div{padding:5px 0 2px 0;text-align:center}.poll_table td.b{background-color:#F6F6F5;height:7px}.poll_table td.b img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}.poll_table td.bb{height:7px}.poll_table td.bb img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}.poll_table td.poll_content div.title{color:#000000;background-color:#F5F5F5;border-top:2px solid #C1C0BD;border-bottom:2px solid #C1C0BD;font-weight:bold;padding:7px 0 7px 10px;margin-bottom:10px}.poll_table td.poll_content div.item_text{color:#636363;padding:0 10px 0 10px;margin-top:10px}.poll_table td.poll_content div.item_text strong{font-weight:bold;color:#000000;font-family:돋움;font-size:12px}.poll_table td.poll_content table.item_bar_table{width:100%;table-layout:fixed;border-bottom:1px solid #EDEDED;margin-top:10px}.poll_table td.poll_content table.noborder{border-bottom:none;margin-bottom:10px}.poll_table td.poll_content table.item_bar_table td.bar{padding:0 0 5px 0;background:url(../images/back_bar.png) repeat-x left 4px}.poll_table td.poll_content table.item_bar_table td.bar img{width:100%;height:6px}.poll_table td.poll_content table.item_bar_table td.status{font-size:.9em;padding-bottom:5px;color:#636363;padding-left:15px}.poll_table td.poll_content table.item_bar_table td.status strong{font-weight:bold;color:#58C011}.poll_table td.poll_content div.item{color:#636363;border-bottom:1px solid #EDEDED;padding:5px 0 8px 10px;margin-bottom:3px}.poll_table td.poll_content div.noborder{border-bottom:none;margin-bottom:10px}.poll_table td.poll_content div.checkcount{border-bottom:1px dashed #EDEDED;padding:0 0 8px 10px;margin-bottom:3px;text-align:right;color:#636363}
\ No newline at end of file
diff --git a/modules/poll/skins/default/form.html b/modules/poll/skins/default/form.html
index e5c036e74..b4581871f 100644
--- a/modules/poll/skins/default/form.html
+++ b/modules/poll/skins/default/form.html
@@ -1,6 +1,10 @@
-<!--%import("filter/poll.xml")-->
-<!--%import("js/poll.js")-->
-<!--%import("css/poll.css")-->
+<!--@if(__DEBUG__)-->
+	<load target="css/poll.css" />
+	<load target="../../tpl/js/poll.js" />
+<!--@else-->
+	<load target="css/poll.min.css" />
+	<load target="../../tpl/js/poll.min.js" />
+<!--@end-->
 
 <script type="text/javascript">
     var poll_alert_lang = "{$lang->msg_check_poll_item}";
@@ -8,10 +12,16 @@
 
 <div id="poll_{$poll->poll_srl}" style="{$poll->style}">
 
-    <form action="./" method="get" onsubmit="return doPoll(this)">
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+    <form ruleset="poll" action="./" method="post" onsubmit="return doPoll(this)">
+	<input type="hidden" name="module" value="poll" />
+	<input type="hidden" name="act" value="procPoll" />
     <input type="hidden" name="poll_srl" value="{$poll->poll_srl}" />
     <input type="hidden" name="poll_srl_indexes" value="" />
     <input type="hidden" name="skin" value="{$skin}" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 
     <table cellspacing="0" class="poll_table">
     <col width="7" />
@@ -67,8 +77,8 @@
     <tr>
         <td colspan="3" class="poll_button">
             <div>
-                <span class="button"><input type="button" value="{$lang->cmd_view_result}" class="poll_button" onclick="doPollViewResult('{$poll->poll_srl}','{$skin}'); return false;"/></span>
-                <span class="button"><input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" /></span>
+                <span class="btn"><input type="button" value="{$lang->cmd_view_result}" class="poll_button _poll_result _srl_{$poll->poll_srl} _skin_{$skin}" /></span>
+                <span class="btn"><input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" /></span>
             </div>
         </td>
     </tr>
diff --git a/modules/poll/skins/default/js/poll.js b/modules/poll/skins/default/js/poll.js
deleted file mode 100644
index 5c359e814..000000000
--- a/modules/poll/skins/default/js/poll.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/* 설문 참여 함수 */
-function doPoll(fo_obj) {
-
-    var checkcount = new Array();
-    var item = new Array();
-
-    for(var i=0;i<fo_obj.length;i++) {
-        var obj = fo_obj[i];
-        if(obj.nodeName != 'INPUT') continue;
-
-        var name = obj.name;
-        if(name.indexOf('checkcount')>-1) {
-            var t = name.split('_');
-            var poll_srl_index = parseInt(t[1],10);
-            checkcount[poll_srl_index] = obj.value;
-            item[poll_srl_index] = new Array();
-
-        } else if(name.indexOf('item_')>-1) {
-            var t = name.split('_');
-            var poll_srl = parseInt(t[1],10); 
-            var poll_srl_index = parseInt(t[2],10); 
-            if(obj.checked == true) item[poll_srl_index][item[poll_srl_index].length] = obj.value;
-        }
-    }
-
-    var poll_srl_indexes = "";
-    for(var poll_srl_index in checkcount) {
-	if(!checkcount.hasOwnProperty(poll_srl_index)) continue;
-        var count = checkcount[poll_srl_index];
-        var items = item[poll_srl_index];
-        if(items.length < 1 || count < items.length) {
-            alert(poll_alert_lang);
-            return false;
-        }
-
-        poll_srl_indexes += items.join(',')+',';
-    }
-    fo_obj.poll_srl_indexes.value = poll_srl_indexes;
-
-    procFilter(fo_obj, poll);
-    return false;
-}
-
-/* 설문 조사후 내용을 바꿀 함수 */
-function completePoll(ret_obj) {
-    var poll_srl = ret_obj['poll_srl'];
-    var tpl = ret_obj['tpl'];
-    var width = xWidth("poll_"+poll_srl);
-    xInnerHtml("poll_"+poll_srl, tpl);
-    xWidth("poll_"+poll_srl, width);
-}
-
-/* 설문 미리 보기 */
-function doPollViewResult(poll_srl, skin) {
-    var params = new Array();
-    params['poll_srl'] = poll_srl;
-
-    if(typeof(skin)=='undefined') skin = 'default';
-    params['skin'] = skin;
-
-    var response_tags = new Array('error','message','poll_srl', 'tpl');
-
-    exec_xml('poll','procPollViewResult', params, completePoll, response_tags);
-}
diff --git a/modules/poll/skins/default/result.html b/modules/poll/skins/default/result.html
index 640f974a2..fc1ed0d73 100644
--- a/modules/poll/skins/default/result.html
+++ b/modules/poll/skins/default/result.html
@@ -28,7 +28,12 @@
             <!--@foreach($poll->poll as $poll_srl_index => $val)-->
                 <div class="title">{$val->title} ({$val->poll_count})</div>
                 <!--@foreach($val->item as $item_srl => $item)-->
-                    {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
+					<block cond="$val->poll_count">
+						{@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
+					</block>
+					<block cond="!$val->poll_count">
+						{@$per = 0}
+					</block>
 
                     <div class="item_text">
                         <strong>{$item_srl+1}</strong> <img src="./images/pipe.png" alt="" /> {$item->title}
diff --git a/modules/poll/skins/default/skin.xml b/modules/poll/skins/default/skin.xml
index fc726fa53..60e0b4963 100644
--- a/modules/poll/skins/default/skin.xml
+++ b/modules/poll/skins/default/skin.xml
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">설문조사 기본 스킨</title>
-    <title xml:lang="zh-CN">投票系统默认皮肤</title>
-    <title xml:lang="jp">アンケート調査デフォルトスキン</title>
-    <title xml:lang="en">Default Skin of Poll</title>
-    <title xml:lang="vi">Skin mặc định của thăm dò</title>
-    <title xml:lang="zh-TW">投票系統預設面板</title>
-    <title xml:lang="tr">Oylamanın Varsayılan Dış Görünümü</title>
-    <description xml:lang="ko">설문조사 기본 스킨</description>
-    <description xml:lang="zh-CN">投票系统默认皮肤。</description>
-    <description xml:lang="jp">アンケート調査デフォルトスキン</description>
-    <description xml:lang="en">Default Skin of Poll</description>
-    <description xml:lang="vi">Skin mặc định của thăm dò.</description>
-    <description xml:lang="zh-TW">投票系統預設面板。</description>
-    <description xml:lang="tr">Oylamanın Varsayılan Dış Görünümü</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="vi">Mặc định</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="en">Default</title>
-            <title xml:lang="zh-TW">預設</title>
-            <title xml:lang="tr">Varsayılan</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">설문조사 기본 스킨</title>
+    <title xml:lang="zh-CN">投票系统默认皮肤</title>
+    <title xml:lang="jp">アンケート調査デフォルトスキン</title>
+    <title xml:lang="en">Default Skin of teh Poll</title>
+    <title xml:lang="vi">Skin mặc định của thăm dò</title>
+    <title xml:lang="zh-TW">投票系統預設面板</title>
+    <title xml:lang="tr">Oylamanın Varsayılan Dış Görünümü</title>
+    <description xml:lang="ko">설문조사 기본 스킨</description>
+    <description xml:lang="zh-CN">投票系统默认皮肤。</description>
+    <description xml:lang="jp">アンケート調査デフォルトスキン</description>
+    <description xml:lang="en">Default Skin of the Poll</description>
+    <description xml:lang="vi">Skin mặc định của thăm dò.</description>
+    <description xml:lang="zh-TW">投票系統預設面板。</description>
+    <description xml:lang="tr">Oylamanın Varsayılan Dış Görünümü</description>
+    <version>0.2</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="normal">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="en">Default</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">Varsayılan</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/modules/poll/skins/simple/css/poll.min.css b/modules/poll/skins/simple/css/poll.min.css
new file mode 100644
index 000000000..b42ac0cf4
--- /dev/null
+++ b/modules/poll/skins/simple/css/poll.min.css
@@ -0,0 +1 @@
+.simple_poll{table-layout:fixed;padding:0;margin:0;border:none}.simple_poll td{padding:0;margin:0}.simple_poll td.title{text-align:right}.simple_poll td .itemDiv{border-top:1px solid #BBBBBB;margin-top:3px;padding:3px 0 3px 0}.simple_poll td .title{color:#000000;font-weight:bold;letter-spacing:-1px}.simple_poll td .checkcount{color:#AAAAAA}.simple_poll td .item{color:#636363;margin:5px 0 5px 0}.simple_poll td .item input{margin:0;padding:0}.simple_poll td .item label{letter-spacing:-1px}.simple_poll td .resultItem{color:#636363;margin:6px 0 0 10px;letter-spacing:-1px}.simple_poll td .barBox{margin-left:10px}.simple_poll td .barBox .bar{margin:3px 0}.simple_poll td .barBox .status{color:#AAAAAA}.simple_poll td.stopDate{color:#AAAAAA;border-top:1px solid #BBBBBB;padding-top:3px}.simple_poll td.stopDate a{color:#AAAAAA;text-decoration:none}.simple_poll td.poll_button{text-align:left;padding-top:3px}.simple_poll td.poll_button .poll_button{border:1px solid #EEEEEE;background-color:#AAAAAA;color:#FFFFFF;font-weight:bold;padding:1px 3px 1px 3px;height:20px}.simple_poll td.b{background-color:#F6F6F5;height:7px}.simple_poll td.b img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}.simple_poll td.bb{height:7px}.simple_poll td.bb img{width:100%;height:6px;border-bottom:1px solid #E5E5E5}
\ No newline at end of file
diff --git a/modules/poll/skins/simple/form.html b/modules/poll/skins/simple/form.html
index b961cc593..6c67026a6 100644
--- a/modules/poll/skins/simple/form.html
+++ b/modules/poll/skins/simple/form.html
@@ -1,6 +1,10 @@
-<!--%import("filter/poll.xml")-->
-<!--%import("js/poll.js")-->
-<!--%import("css/poll.css")-->
+<!--@if(__DEBUG__)-->
+	<load target="css/poll.css" />
+	<load target="../../tpl/js/poll.js" />
+<!--@else-->
+	<load target="css/poll.min.css" />
+	<load target="../../tpl/js/poll.min.js" />
+<!--@end-->
 
 <script type="text/javascript">
     var poll_alert_lang = "{$lang->msg_check_poll_item}";
@@ -8,10 +12,16 @@
 
 <div id="poll_{$poll->poll_srl}" style="{$poll->style}">
 
-    <form action="./" method="get" onsubmit="return doPoll(this)">
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+    <form action="./" method="post" onsubmit="return doPoll(this)">
+	<input type="hidden" name="module" value="poll" />
+	<input type="hidden" name="act" value="procPoll" />
     <input type="hidden" name="poll_srl" value="{$poll->poll_srl}" />
     <input type="hidden" name="poll_srl_indexes" value="" />
     <input type="hidden" name="skin" value="{$skin}" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 
     <table cellspacing="0" class="simple_poll">
     <tr>
@@ -47,7 +57,7 @@
     </tr>
     <tr>
         <td class="stopDate">
-            ~<strong>{zdate($poll->stop_date, "Y-m-d")}</strong> (<a href="#" onclick="doPollViewResult('{$poll->poll_srl}','{$skin}'); return false;"/>{$lang->cmd_view_result}</a>)
+            ~<strong>{zdate($poll->stop_date, "Y-m-d")}</strong> (<a href="#" class="_poll_result _srl_{$poll->poll_srl} _skin_{$skin}">{$lang->cmd_view_result}</a>)
         </td>
     </tr>
     <tr>
diff --git a/modules/poll/skins/simple/result.html b/modules/poll/skins/simple/result.html
index ac1f11c36..3eb9e03fc 100644
--- a/modules/poll/skins/simple/result.html
+++ b/modules/poll/skins/simple/result.html
@@ -12,7 +12,12 @@
                 <div class="title">{$val->title} ({$val->poll_count})</div>
 
                 <!--@foreach($val->item as $item_srl => $item)-->
-                    {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
+					<block cond="$val->poll_count">
+						{@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
+					</block>
+					<block cond="!$val->poll_count">
+						{@$per = 0}
+					</block>
 
                     <div class="resultItem">
                         {$item->title} 
diff --git a/modules/poll/skins/simple/skin.xml b/modules/poll/skins/simple/skin.xml
index 01c072ded..1cc968eab 100644
--- a/modules/poll/skins/simple/skin.xml
+++ b/modules/poll/skins/simple/skin.xml
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">설문조사 간단한 스킨</title>
-    <title xml:lang="vi">Skin thăm dò đơn giản</title>
-    <title xml:lang="jp">アンケート調査の簡単スキン</title>
-    <title xml:lang="zh-CN">投票系统简易皮肤</title>
-    <title xml:lang="zh-TW">投票系統簡單面板</title>
-    <title xml:lang="tr">Oylama Sistem Dış Görünümü</title>
-    <description xml:lang="ko">설문조사 간단한 스킨</description>
-    <description xml:lang="vi">Skin hiển thị thăm dò đơn giản.</description>
-    <description xml:lang="jp">アンケート調査の簡単スキン</description>
-    <description xml:lang="zh-CN">投票系统简易皮肤。</description>
-    <description xml:lang="zh-TW">投票系統簡單面板。</description>
-    <description xml:lang="tr">Oylama Sistemi Dış Görünümü</description>
-    <version>0.1</version>
-    <date>2008-04-16</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="normal">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="vi">Mặc định</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="en">Default</title>
-            <title xml:lang="zh-TW">預設</title>
-            <title xml:lang="tr">Varsayılan</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">설문조사 간단한 스킨</title>
+    <title xml:lang="vi">Skin thăm dò đơn giản</title>
+    <title xml:lang="jp">アンケート調査の簡単スキン</title>
+    <title xml:lang="zh-CN">投票系统简易皮肤</title>
+    <title xml:lang="zh-TW">投票系統簡單面板</title>
+    <title xml:lang="tr">Oylama Sistem Dış Görünümü</title>
+    <description xml:lang="ko">설문조사 간단한 스킨</description>
+    <description xml:lang="vi">Skin hiển thị thăm dò đơn giản.</description>
+    <description xml:lang="jp">アンケート調査の簡単スキン</description>
+    <description xml:lang="zh-CN">投票系统简易皮肤。</description>
+    <description xml:lang="zh-TW">投票系統簡單面板。</description>
+    <description xml:lang="tr">Oylama Sistemi Dış Görünümü</description>
+    <version>0.2</version>
+    <date>2008-04-16</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="normal">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="en">Default</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">Varsayılan</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/modules/poll/tpl/config.html b/modules/poll/tpl/config.html
index 7df32d416..f7102cc0d 100644
--- a/modules/poll/tpl/config.html
+++ b/modules/poll/tpl/config.html
@@ -1,36 +1,38 @@
-<!--%import("filter/insert_config.xml")-->
-<!--%import("js/poll_admin.js")-->
+<load target="js/poll_admin.js" usecdn="true" />
 <!--#include("./header.html")-->
 
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config);" id="fo_poll">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col" class="half_wide"><div>{$lang->skin}</div></th>
-        <td class="center">
-            <select name="skin" onchange="doDisplaySkinColorset(this);return false;">
-            <!--@foreach($skin_list as $key => $val)-->
-                <option value="{$key}" <!--@if($config->skin == $key)-->selected="selected"<!--@end-->>{$val->title} ({htmlspecialchars($key)})</option>
-            <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="col" class="half_wide"><div>{$lang->colorset}</div></th>
-        <td class="center">
-            <select name="colorset" id="poll_colorset">
-            <!--@foreach($colorset_list as $key => $val)-->
-                <option value="{$val->name}" <!--@if($config->colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title} ({$val->name})</option>
-            <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="row" colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </tbody>
-    </table>
-
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form ruleset="insertConfig" action="./" method="post" id="fo_poll">
+<input type="hidden" name="module" value="poll" />
+<input type="hidden" name="act" value="procPollAdminInsertConfig" />
+<div class="table">
+	<table width="100%" border="1" cellspacing="0">
+		<tr>
+			<th scope="col">{$lang->skin}</th>
+			<td>
+				<select name="skin" onchange="doDisplaySkinColorset(this);return false;">
+					<!--@foreach($skin_list as $key => $val)-->
+					<option value="{$key}" <!--@if($config->skin == $key)-->selected="selected"<!--@end-->>{$val->title} ({htmlspecialchars($key)})</option>
+					<!--@end-->
+					</select>
+				</td>
+			</tr>
+		<tr>
+			<th scope="col">{$lang->colorset}</th>
+			<td>
+				<select name="colorset" id="poll_colorset">
+					<!--@foreach($colorset_list as $key => $val)-->
+					<option value="{$val->name}" <!--@if($config->colorset == $val->name)-->selected="selected"<!--@end-->>{$val->title} ({$val->name})</option>
+					<!--@end-->
+					</select>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
+<div class="btnArea">
+	<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
+</div>
 </form>
diff --git a/modules/poll/tpl/css/poll.min.css b/modules/poll/tpl/css/poll.min.css
new file mode 100644
index 000000000..898bbba06
--- /dev/null
+++ b/modules/poll/tpl/css/poll.min.css
@@ -0,0 +1 @@
+.poll_box{border:3px solid #555555;background-color:#EEEEEE;margin:5px;padding:8px 5px 8px 5px;width:500px}.poll_title_box{border:2px solid #444444;background-color:#888888;color:#FFFFFF;font-weight:bold;margin:5px;padding:5px;height:13px;clear:both}.poll_stop_date{float:left}.poll_join_count{float:right}.poll_detail_box{border:1px solid #444444;background-color:#FFFFFF;margin:5px;padding-bottom:5px}.poll_detail_box .title{background-color:#555555;color:#FFFFFF;padding:5px;font-weight:bold}.poll_detail_box .item{padding:5px;border-bottom:1px solid #EEEEEE}.poll_detail_box .checkcount{background-color:#AAAAAA;text-align:right;color:#EEEEEE;padding:5px}.poll_detail_box .text{margin:5px 0px 5px 20px}.poll_detail_box .bar_box{width:80%;margin-bottom:10px;border:1px solid #DDDDDD;margin:0px 5px 5px 35px;padding:1px}.poll_detail_box .bar{background-color:#444444;border-bottom:1px solid #AAAAAA;height:5px}.poll_button_area{text-align:center}.poll_button{border:1px solid #555555;background-color:#FFFFFF;font-weight:bold;height:20px}
\ No newline at end of file
diff --git a/modules/poll/skins/simple/js/poll.js b/modules/poll/tpl/js/poll.js
similarity index 64%
rename from modules/poll/skins/simple/js/poll.js
rename to modules/poll/tpl/js/poll.js
index 5c359e814..f6e59a511 100644
--- a/modules/poll/skins/simple/js/poll.js
+++ b/modules/poll/tpl/js/poll.js
@@ -37,28 +37,38 @@ function doPoll(fo_obj) {
     }
     fo_obj.poll_srl_indexes.value = poll_srl_indexes;
 
-    procFilter(fo_obj, poll);
-    return false;
+	fo_obj.submit();
 }
 
-/* 설문 조사후 내용을 바꿀 함수 */
-function completePoll(ret_obj) {
-    var poll_srl = ret_obj['poll_srl'];
-    var tpl = ret_obj['tpl'];
-    var width = xWidth("poll_"+poll_srl);
-    xInnerHtml("poll_"+poll_srl, tpl);
-    xWidth("poll_"+poll_srl, width);
-}
+jQuery(function($){
+	/* View poll result */
+	$('._poll_result').click(function(){
+		var cls = $(this).attr('class'), srl, skin;
 
-/* 설문 미리 보기 */
-function doPollViewResult(poll_srl, skin) {
-    var params = new Array();
-    params['poll_srl'] = poll_srl;
+		try{
+			srl  = cls.match(/\b_srl_(\d+)\b/)[1];
+			skin = cls.match(/\b_skin_(.+?)\b/)[1];
+		}catch(e){ };
 
-    if(typeof(skin)=='undefined') skin = 'default';
-    params['skin'] = skin;
+		if(!srl) return false;
+		if(!skin) skin = 'default';
 
-    var response_tags = new Array('error','message','poll_srl', 'tpl');
+		function on_complete(ret) {
+			var $poll = $('#poll_'+srl), width;
 
-    exec_xml('poll','procPollViewResult', params, completePoll, response_tags);
-}
+			width  = $poll.width();
+			$poll.html(ret['tpl']);
+			$poll.width(width);
+		}
+
+		exec_xml(
+			'poll', // module
+			'procPollViewResult', // act
+			{poll_srl:srl, skin:skin}, // parameters
+			on_complete,
+			['error','message','tpl']
+		);
+
+		return false;
+	});
+});
diff --git a/modules/poll/tpl/js/poll.min.js b/modules/poll/tpl/js/poll.min.js
new file mode 100644
index 000000000..26b7cad4a
--- /dev/null
+++ b/modules/poll/tpl/js/poll.min.js
@@ -0,0 +1,2 @@
+function doPoll(fo_obj){var checkcount=new Array(),item=new Array();for(var i=0;i<fo_obj.length;i++){var obj=fo_obj[i];if(obj.nodeName!='INPUT')continue;var name=obj.name;if(name.indexOf('checkcount')>-1){var t=name.split('_'),poll_srl_index=parseInt(t[1],10);checkcount[poll_srl_index]=obj.value;item[poll_srl_index]=new Array()}else if(name.indexOf('item_')>-1){var t=name.split('_'),poll_srl=parseInt(t[1],10),poll_srl_index=parseInt(t[2],10);if(obj.checked==true)item[poll_srl_index][item[poll_srl_index].length]=obj.value}};var poll_srl_indexes="";for(var poll_srl_index in checkcount){if(!checkcount.hasOwnProperty(poll_srl_index))continue;var count=checkcount[poll_srl_index],items=item[poll_srl_index];if(items.length<1||count<items.length){alert(poll_alert_lang);return false};poll_srl_indexes+=items.join(',')+','};fo_obj.poll_srl_indexes.value=poll_srl_indexes;procFilter(fo_obj,poll);return false};jQuery(function($){$('._poll_result').click(function(){var cls=$(this).attr('class'),srl,skin;try{srl=cls.match(/\b_srl_(\d+)\b/)[1];skin=cls.match(/\b_skin_(.+?)\b/)[1]}catch(e){};if(!srl)return false;if(!skin)skin='default'
+function on_complete(ret){var $poll=$('#poll_'+srl),width;width=$poll.width();$poll.html(ret.tpl);$poll.width(width)};exec_xml('poll','procPollViewResult',{poll_srl:srl,skin:skin},on_complete,['error','message','tpl']);return false})})
\ No newline at end of file
diff --git a/modules/poll/tpl/js/poll_admin.js b/modules/poll/tpl/js/poll_admin.js
index 455d8e199..7fa7c235d 100644
--- a/modules/poll/tpl/js/poll_admin.js
+++ b/modules/poll/tpl/js/poll_admin.js
@@ -1,56 +1,114 @@
-/**
- * @file   modules/poll/js/poll_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  poll 모듈의 관리자용 javascript
- **/
-
-/* 위젯 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */
-function doDisplaySkinColorset(sel, colorset) {
-    var skin = sel.options[sel.selectedIndex].value;
-
-    var params = new Array();
-    params["skin"] = skin;
-    params["colorset"] = colorset;
-
-    var response_tags = new Array("error","message","colorset_list");
-
-    exec_xml("poll", "getPollGetColorsetList", params, completeGetSkinColorset, response_tags, params);
-}
-
-/* 서버에서 받아온 컬러셋을 표시 */
-function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj) {
-    var sel = xGetElementById("fo_poll").poll_colorset;
-    var length = sel.options.length;
-    var selected_colorset = params["colorset"];
-    for(var i=0;i<length;i++) sel.remove(0);
-
-    var colorset_list = ret_obj["colorset_list"].split("\n");
-    var selected_index = 0;
-    for(var i=0;i<colorset_list.length;i++) {
-        var tmp = colorset_list[i].split("|@|");
-        if(selected_colorset && selected_colorset==tmp[0]) selected_index = i;
-        var opt = new Option(tmp[1], tmp[0], false, false);
-        sel.options.add(opt);
-    }
-
-    sel.selectedIndex = selected_index;
-}
-
-/* 관리자 페이지에서 선택된 설문조사 원본글로 이동하는 함수 */
-function doMovePoll(poll_srl, upload_target_srl) {
-
-    var params = new Array();
-    params['poll_srl'] = poll_srl;
-    params['upload_target_srl'] = upload_target_srl;
-
-    var response_tags = new Array('error','message','document_srl','comment_srl');
-    exec_xml('poll','getPollAdminTarget', params, completeMovePoll, response_tags);
-}
-
-function completeMovePoll(ret_obj, response_tags) {
-    var document_srl = ret_obj['document_srl'];
-    var comment_srl = ret_obj['comment_srl'];
-    var url = request_uri.setQuery('document_srl', document_srl);
-    if(comment_srl) url = url+'#comment_'+comment_srl;
-    winopen(url, 'pollTarget');
-}
+/**
+ * @file   modules/poll/js/poll_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  poll 모듈의 관리자용 javascript
+ **/
+
+/* 위젯 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */
+function doDisplaySkinColorset(sel, colorset) {
+    var skin = sel.options[sel.selectedIndex].value;
+
+    var params = new Array();
+    params["skin"] = skin;
+    params["colorset"] = colorset;
+
+    var response_tags = new Array("error","message","colorset_list");
+
+    exec_xml("poll", "getPollGetColorsetList", params, completeGetSkinColorset, response_tags, params);
+}
+
+/* 서버에서 받아온 컬러셋을 표시 */
+function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj) {
+    var sel = get_by_id("fo_poll").poll_colorset;
+    var length = sel.options.length;
+    var selected_colorset = params["colorset"];
+    for(var i=0;i<length;i++) sel.remove(0);
+
+    var colorset_list = ret_obj["colorset_list"].split("\n");
+    var selected_index = 0;
+    for(var i=0;i<colorset_list.length;i++) {
+        var tmp = colorset_list[i].split("|@|");
+        if(selected_colorset && selected_colorset==tmp[0]) selected_index = i;
+        var opt = new Option(tmp[1], tmp[0], false, false);
+        sel.options.add(opt);
+    }
+
+    sel.selectedIndex = selected_index;
+}
+
+/* 관리자 페이지에서 선택된 설문조사 원본글로 이동하는 함수 */
+function doMovePoll(poll_srl, upload_target_srl) {
+
+    var params = new Array();
+    params['poll_srl'] = poll_srl;
+    params['upload_target_srl'] = upload_target_srl;
+
+    var response_tags = new Array('error','message','document_srl','comment_srl');
+    exec_xml('poll','getPollAdminTarget', params, completeMovePoll, response_tags);
+}
+
+function completeMovePoll(ret_obj, response_tags) {
+    var document_srl = ret_obj['document_srl'];
+    var comment_srl = ret_obj['comment_srl'];
+    var url = request_uri.setQuery('document_srl', document_srl);
+    if(comment_srl) url = url+'#comment_'+comment_srl;
+    winopen(url, 'pollTarget');
+}
+
+function getPollList()
+{
+	var pollListTable = jQuery('#pollListTable');
+	var cartList = [];
+	pollListTable.find(':checkbox[name=cart]').each(function(){
+		if(this.checked) cartList.push(this.value); 
+	});
+
+    var params = new Array();
+    var response_tags = ['error','message', 'poll_list'];
+	params["poll_srls"] = cartList.join(",");
+
+    exec_xml('poll','procPollGetList',params, completeGetPollList, response_tags);
+}
+
+function completeGetPollList(ret_obj, response_tags)
+{
+	var htmlListBuffer = '';
+
+	if(ret_obj['poll_list'] == null)
+	{
+		htmlListBuffer = '<tr>' +
+							'<td colspan="3" style="text-align:center;">'+ret_obj['message']+'</td>' +
+						'</tr>';
+	}
+	else
+	{
+		var poll_list = ret_obj['poll_list']['item'];
+		if(!jQuery.isArray(poll_list)) poll_list = [poll_list];
+		for(var x in poll_list)
+		{
+			var objPoll = poll_list[x];
+			htmlListBuffer += '<tr>' +
+								'<td class="title">'+objPoll.title+'</td>' +
+								'<td>'+objPoll.poll_count+'</td>' +
+								'<td>'+objPoll.nick_name+'</td>' +
+							'</tr>' +
+							'<input type="hidden" name="cart[]" value="'+objPoll.poll_index_srl+'" />';
+		}
+		jQuery('#selectedPollCount').html(poll_list.length);
+	}
+	jQuery('#pollManageListTable>tbody').html(htmlListBuffer);
+}
+
+function checkSearch(form)
+{
+	if(form.search_target.value == '')
+	{
+		alert(xe.lang.msg_empty_search_target);
+		return false;
+	}
+	if(form.search_keyword.value == '')
+	{
+		alert(xe.lang.msg_empty_search_keyword);
+		return false;
+	}
+}
diff --git a/modules/poll/tpl/js/poll_admin.min.js b/modules/poll/tpl/js/poll_admin.min.js
new file mode 100644
index 000000000..1312a1380
--- /dev/null
+++ b/modules/poll/tpl/js/poll_admin.min.js
@@ -0,0 +1,9 @@
+/**
+ * @file   modules/poll/js/poll_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  poll 모듈의 관리자용 javascript
+ **/
+function doDisplaySkinColorset(sel,colorset){var skin=sel.options[sel.selectedIndex].value,params=new Array();params.skin=skin;params.colorset=colorset;var response_tags=new Array("error","message","colorset_list");exec_xml("poll","getPollGetColorsetList",params,completeGetSkinColorset,response_tags,params)}
+function completeGetSkinColorset(ret_obj,response_tags,params,fo_obj){var sel=get_by_id("fo_poll").poll_colorset,length=sel.options.length,selected_colorset=params.colorset;for(var i=0;i<length;i++)sel.remove(0);var colorset_list=ret_obj.colorset_list.split("\n"),selected_index=0;for(var i=0;i<colorset_list.length;i++){var tmp=colorset_list[i].split("|@|");if(selected_colorset&&selected_colorset==tmp[0])selected_index=i;var opt=new Option(tmp[1],tmp[0],false,false);sel.options.add(opt)};sel.selectedIndex=selected_index}
+function doMovePoll(poll_srl,upload_target_srl){var params=new Array();params.poll_srl=poll_srl;params.upload_target_srl=upload_target_srl;var response_tags=new Array('error','message','document_srl','comment_srl');exec_xml('poll','getPollAdminTarget',params,completeMovePoll,response_tags)}
+function completeMovePoll(ret_obj,response_tags){var document_srl=ret_obj.document_srl,comment_srl=ret_obj.comment_srl,url=request_uri.setQuery('document_srl',document_srl);if(comment_srl)url=url+'#comment_'+comment_srl;winopen(url,'pollTarget')}
\ No newline at end of file
diff --git a/modules/poll/tpl/poll_list.html b/modules/poll/tpl/poll_list.html
index 2ddbdb079..692533de9 100644
--- a/modules/poll/tpl/poll_list.html
+++ b/modules/poll/tpl/poll_list.html
@@ -1,79 +1,128 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--%import("js/poll_admin.js")-->
-
-<!--#include("./header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, delete_checked)" id="fo_list">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 목록 -->
-<table cellspacing="0" class="crossTable">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col" class="wide"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->poll_checkcount}</div></th>
-        <th scope="col"><div>{$lang->poll_join_count}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>&nbsp;</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($poll_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td class="number center">{$no}</td>
-        <td class="center"><input type="checkbox" name="cart" value="{$val->poll_index_srl}" /></td>
-        <td><a href="#" onclick="doMovePoll({$val->poll_srl},{$val->upload_target_srl});return false;">{$val->title}</a></td>
-        <td class="number center">{$val->checkcount}</td>
-        <td class="number center">{$val->poll_count}</td>
-        <td class="date nowrap center">{zdate($val->regdate,"Y-m-d H:i")}</td>
-        <td class="center nowrap view"><a href="{getUrl('','module','poll','act','dispPollAdminResult','poll_srl',$val->poll_srl,'poll_index_srl',$val->poll_index_srl)}" onclick="popopen(this.href); return false;" title="{htmlspecialchars($lang->cmd_view)}">{$lang->cmd_view}</a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-
-<!-- 버튼 -->
-<div class="clear">
-    <div class="fl">
-        <a href="javascript:XE.checkboxToggleAll({ checked:false })" class="button"><span>{$lang->cmd_unselect_all}</span></a>
-        <a href="javascript:XE.checkboxToggleAll()" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-    </div>
-    <div class="fr">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_delete_checked_poll}" /></span>
-    </div>
-</div>
-
-</form>
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
-
-<!-- 검색 -->
-<form action="./" method="get" class="adminSearch">
-<input type="hidden" name="module" value="{$module}" />
-<input type="hidden" name="act" value="{$act}" />
-    <fieldset>
-        <select name="search_target">
-            <option value="">{$lang->search_target}</option>
-            <!--@foreach($lang->search_target_list as $key => $val)-->
-            <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-            <!--@end-->
-        </select>
-        <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-        <span class="button"><input type="submit" value="{$lang->cmd_search}" /></span>
-        <a href="{getUrl('','module',$module,'act',$act)}" class="button"><span>{$lang->cmd_cancel}</span></a>
-    </fieldset>
-</form>
+<script type="text/javascript">
+xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
+xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+</script>
+<load target="js/poll_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="" class="form">
+	<input type="hidden" name="module" value="poll" />
+	<h1 class="h1">{$lang->poll}</h1>
+	<div class="table even">
+		<table width="100%" border="1" cellspacing="0" id="pollListTable">
+			<caption>
+				All({number_format($total_count)})
+				<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getPollList();">{$lang->poll_manager}...</a></span></span>
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col" class="text">{$lang->title}</th>
+					<th scope="col">{$lang->poll_checkcount}</th>
+					<th scope="col">{$lang->poll_join_count}</th>
+					<th scope="col">{$lang->author}</th>
+					<th scope="col">{$lang->regdate}</th>
+					<th scope="col"><input type="checkbox" data-name="cart"title="Check All" /></th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<th scope="col" class="text">{$lang->title}</th>
+					<th scope="col">{$lang->poll_checkcount}</th>
+					<th scope="col">{$lang->poll_join_count}</th>
+					<th scope="col">{$lang->author}</th>
+					<th scope="col">{$lang->regdate}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</tfoot>
+			<tbody>
+				<!--@foreach($poll_list as $no => $val)-->
+				<tr>
+					<td class="title"><a href="<!--@if($val->document_srl)-->{getUrl('')}?document_srl={$val->document_srl}<!--@end--><!--@if($val->comment_srl)-->#comment_{$val->comment_srl}<!--@end-->" target="_blank">{$val->title}</a></td>
+					<td><!--@if($val->checkcount == 1)-->{$lang->single_check}<!--@else-->{$lang->multi_check}<!--@end--></td>
+					<td>{$val->poll_count}</td>
+					<td><a href="#popup_menu_area" class="member_{$val->member_srl}">{$val->nick_name}</a></td>
+					<td>{zdate($val->regdate,"Y-m-d H:i")}</td>
+					<td>
+						<input type="checkbox" name="cart" value="{$val->poll_index_srl}" />
+					</td>
+				</tr>
+				<!--@end-->
+			</tbody>
+		</table>
+		<div class="btnArea">
+			<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getPollList();">{$lang->poll_manager}...</a></span>
+		</div>
+	</div>
+</form>
+<div class="modal" id="listManager">
+	<form ruleset="deleteChecked" action="./" method="post" class="fg form">
+	<input type="hidden" name="module" value="poll" />
+	<input type="hidden" name="act" value="procPollAdminDeleteChecked" />
+	<input type="hidden" name="page" value="{$page}" />
+		<h2 class="h2">{$lang->poll_manager}</h2>
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0" id="pollManageListTable">
+				<caption>{$lang->selected_poll} <strong id="selectedPollCount"></strong></caption>
+				<thead>
+					<tr>
+						<th scope="col" class="text">{$lang->title}</th>
+						<th scope="col">{$lang->poll_join_count}</th>
+						<th scope="col">{$lang->author}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="Delete" /></span>
+		</div>
+	</form>
+</div>
+<div class="search">
+<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+</form>
+
+	<form action="./" method="get" onsubmit="return checkSearch(this)">		
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="error_return_url" value="" />
+		<select name="search_target">
+			<option value="">{$lang->search_target}</option>
+			<!--@foreach($lang->search_target_list as $key => $val)-->
+			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+			<!--@end-->
+		</select>
+		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+		<input type="submit" value="{$lang->cmd_search}" />
+		<a href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
+	</form>
+</div>
diff --git a/modules/poll/tpl/result.html b/modules/poll/tpl/result.html
index e2bb66900..3684b5f8f 100644
--- a/modules/poll/tpl/result.html
+++ b/modules/poll/tpl/result.html
@@ -1,26 +1,22 @@
-<!--%import("css/poll.css")-->
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")} {$lang->poll_join_count} : {number_format($poll->poll_count)}</h3>
-</div>
-<div class="popBody">
-        <!--@foreach($poll->poll as $poll_srl_index => $val)-->
-        <div class="poll_detail_box">
-            <div class="title">{$val->title} ({$val->poll_count})</div>
-            <!--@foreach($val->item as $item_srl => $item)-->
-                {@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
+<load target="css/poll.css" usecdn="true" />
+<h1 class="h1">{$lang->poll_stop_date} : {zdate($poll->stop_date, "Y-m-d H:i")} {$lang->poll_join_count} : {number_format($poll->poll_count)}</h1>
+<!--@foreach($poll->poll as $poll_srl_index => $val)-->
+<div class="poll_detail_box">
+	<div class="title">{$val->title} ({$val->poll_count})</div>
+	<!--@foreach($val->item as $item_srl => $item)-->
+		{@$per = (int)(( $item->poll_count / $val->poll_count)*100) }
 
-                <div class="text">
-                    {$item_srl+1}. {$item->title} : {$item->poll_count} ({$per}%)
-                </div>
-                <div class="bar_box">
-                <!--@if($per)-->
-                    <div class="bar" style="width:{$per}%;"><img src="./images/blank.gif" alt="bar" width="1" height="5" /></div>
-                <!--@else-->
-                    <div class="bar" style="width:2px;"><img src="./images/blank.gif" alt="bar" width="1" height="5" /></div>
-                <!--@end-->
-                </div>
-            <!--@end-->
+		<div class="text">
+			{$item_srl+1}. {$item->title} : {$item->poll_count} ({$per}%)
+		</div>
+		<div class="bar_box">
+		<!--@if($per)-->
+			<div class="bar" style="width:{$per}%;"><img src="./images/blank.gif" alt="bar" width="1" height="5" /></div>
+		<!--@else-->
+			<div class="bar" style="width:2px;"><img src="./images/blank.gif" alt="bar" width="1" height="5" /></div>
+		<!--@end-->
+		</div>
+	<!--@end-->
 
-        </div>
-        <!--@end-->
 </div>
+<!--@end-->
diff --git a/modules/rss/conf/info.xml b/modules/rss/conf/info.xml
index bdbbc84e5..adbcf61b1 100644
--- a/modules/rss/conf/info.xml
+++ b/modules/rss/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">RSS</title>
-    <title xml:lang="zh-CN">整站RSS</title>
-    <title xml:lang="jp">RSS</title>
-    <title xml:lang="en">RSS</title>
-    <title xml:lang="vi">RSS</title>
-    <title xml:lang="es">RSS</title>
-    <title xml:lang="ru">RSS</title>
-    <title xml:lang="zh-TW">RSS</title>
-    <title xml:lang="tr">RSS</title>
-    <description xml:lang="ko">RSS 출력을 담당하는 모듈</description>
-    <description xml:lang="zh-CN">负责输出RSS的模块。</description>
-    <description xml:lang="jp">RSS出力を担うモジュールです。</description>
-    <description xml:lang="en">This modules is for printing RSS.</description>
-    <description xml:lang="vi">Module này dành cho in ấn RSS.</description>
-    <description xml:lang="es">Este módulo es para imprimir RSS.</description>
-    <description xml:lang="ru">Этот модуль служит для печати RSS.</description>
-    <description xml:lang="zh-TW">負責輸出RSS的模組。</description>
-    <description xml:lang="tr">Bu modül RSS çıktısı almak içindir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>utility</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">RSS</title>
+    <title xml:lang="zh-CN">整站RSS</title>
+    <title xml:lang="jp">RSS</title>
+    <title xml:lang="en">RSS</title>
+    <title xml:lang="vi">RSS</title>
+    <title xml:lang="es">RSS</title>
+    <title xml:lang="ru">RSS</title>
+    <title xml:lang="zh-TW">RSS</title>
+    <title xml:lang="tr">RSS</title>
+    <description xml:lang="ko">RSS 출력을 담당하는 모듈</description>
+    <description xml:lang="zh-CN">负责输出RSS的模块。</description>
+    <description xml:lang="jp">RSS出力を担うモジュールです。</description>
+    <description xml:lang="en">This modules is for printing RSS.</description>
+    <description xml:lang="vi">Module này dành cho in ấn RSS.</description>
+    <description xml:lang="es">Este módulo es para imprimir RSS.</description>
+    <description xml:lang="ru">Этот модуль служит для печати RSS.</description>
+    <description xml:lang="zh-TW">負責輸出RSS的模組。</description>
+    <description xml:lang="tr">Bu modül RSS çıktısı almak içindir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>utility</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/rss/conf/module.xml b/modules/rss/conf/module.xml
index 5db36db82..97db269b0 100644
--- a/modules/rss/conf/module.xml
+++ b/modules/rss/conf/module.xml
@@ -3,11 +3,26 @@
     <grants />
     <permissions />
     <actions>
-        <action name="dispRssAdminIndex" type="view" index="true" standalone="true" admin_index="true" />
+        <action name="dispRssAdminIndex" type="view" index="true" standalone="true" admin_index="true" menu_name="rss" menu_index="true" />
         <action name="rss" type="view" standalone="true" />
         <action name="atom" type="view" standalone="true" />
         <action name="procRssAdminToggleActivate" type="controller" standalone="true" />
-        <action name="procRssAdminInsertConfig" type="controller" standalone="true" />
-        <action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" />
+        <action name="procRssAdminInsertConfig" type="controller" standalone="true" ruleset="insertRssConfig" />
+        <action name="procRssAdminInsertModuleConfig" type="controller" standalone="true" ruleset="insertRssModuleConfig" />
     </actions>
+	<menus>
+		<menu name="rss">
+			<title xml:lang="en">RSS</title>
+			<title xml:lang="ko">RSS</title>
+			<title xml:lang="zh-CN">RSS</title>
+			<title xml:lang="jp">RSS</title>
+			<title xml:lang="es">RSS</title>
+			<title xml:lang="ru">RSS</title>
+			<title xml:lang="fr">RSS</title>
+			<title xml:lang="zh-TW">RSS</title>
+			<title xml:lang="vi">RSS</title>
+			<title xml:lang="mn">RSS</title>
+			<title xml:lang="tr">RSS</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/rss/lang/en.lang.php b/modules/rss/lang/en.lang.php
deleted file mode 100644
index 8fb55717f..000000000
--- a/modules/rss/lang/en.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (basic)
-     **/
-
-    // general words
-    $lang->rss_disable = "Disable RSS";
-    $lang->rss_type = "RSS feed type";
-    $lang->open_rss = 'Open RSS';
-    $lang->open_rss_types = array(
-        'Y' => 'Open all',
-        'H' => 'Open summary',
-        'N' => 'Not open',
-    );
-
-    // for description
-    $lang->about_rss_disable = "If checked, RSS will be disabled.";
-    $lang->about_rss_type = "You can assign RSS feed type.";
-    $lang->about_open_rss = 'You can select RSS on the current module to be open to the public.\nNo matter the view permission of article , RSS will be open to the public by its option.';
-
-    // for error message
-    $lang->msg_rss_is_disabled = "RSS function is disabled.";
-?>
diff --git a/modules/rss/lang/es.lang.php b/modules/rss/lang/es.lang.php
deleted file mode 100644
index e95ab9cf9..000000000
--- a/modules/rss/lang/es.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/rss/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español (básico)
-     **/
-
-    // palabras generales
-    $lang->rss_disable = "Desactivar RSS";
-    $lang->rss_type = "Tipo de RSS a imprimir";
-    $lang->open_rss = 'Abrir RSS';
-    $lang->open_rss_types = array(
-        'Y' => 'Abrir todo',
-        'H' => 'Abrir el sumario',
-        'N' => 'No abrir',
-    );
-
-    // para la descripcion
-    $lang->about_rss_disable = "Si selecciona esta opción, RSS será desactivado.";
-    $lang->about_rss_type = "Usted puede asignar el tipo de RSS a imprimir.";
-    $lang->about_open_rss = 'Usted puede seleccionar RSS abierto al público en el módulo actual.\nIndependiente de la atribución de ver, dependiendo de la opción de RSS puede ser abierto al público.';
-
-    // mensajes de error
-    $lang->msg_rss_is_disabled = "Función de RSS esta desactivada.";
-?>
diff --git a/modules/rss/lang/fr.lang.php b/modules/rss/lang/fr.lang.php
deleted file mode 100644
index 81acbdb19..000000000
--- a/modules/rss/lang/fr.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de RSS
-     **/
-
-    // general words
-    $lang->rss_disable = "Invalider RSS";
-    $lang->rss_type = "Le Format pour imprimer RSS";
-    $lang->open_rss = 'Exposer RSS';
-    $lang->open_rss_types = array(
-        'Y' => 'Exposer Tout',
-        'H' => 'Exposer Résumé',
-        'N' => 'Ne pas exposer',
-    );
-
-    // for description
-    $lang->about_rss_disable = "Si vous cochez, RSS sera invalidé.";
-    $lang->about_rss_type = "Vous pouvez désignez le format pour inprimer RSS.";
-    $lang->about_open_rss = 'Vous pouvez exposez au publique le RSS du module courant ou non.\nN\'importe comment est la permission de l\'article, RSS sera exposé au publique selon son option.';
-
-    // for error message
-    $lang->msg_rss_is_disabled = "La fonction RSS est invalidé.";
-?>
diff --git a/modules/rss/lang/jp.lang.php b/modules/rss/lang/jp.lang.php
deleted file mode 100644
index 75fab07e3..000000000
--- a/modules/rss/lang/jp.lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    // 一般用語
-    $lang->feed = 'RSS発行';
-    $lang->total_feed = '統合RSS';
-    $lang->rss_disable = "RSS機能オフ";
-    $lang->feed_copyright = '著作権';
-    $lang->feed_document_count = 'RSSコンテンツ数';
-    $lang->feed_image = 'RSSイメージ';
-    $lang->rss_type = "出力するRSSタイプ";
-    $lang->open_rss = 'RSS配信';
-    $lang->open_rss_types = array(
-        'Y' => '全文配信 ',
-        'H' => '要約配信',
-        'N' => '配信しない',
-    );
-    $lang->open_feed_to_total = '統合RSSに含む';
-
-    // 説明文
-    $lang->about_rss_disable = 'チェックするとRSSの出力を行いません。';
-    $lang->about_rss_type = '出力するRSSタイプを指定することが出来ます。';
-    $lang->about_open_rss = '現在のモジュールに対して「RSS配信」を選択することが出来ます。書き込みの内容が読める権限とは関係なくオプションによってRSSが配信されます。';
-    $lang->about_feed_description = '発行するRSSに関する説明を入力します。未入力した場合は該当モジュールで設定された管理用説明が含まれます。';
-    $lang->about_feed_copyright = '発行するRSSのコンテンツに対する著作権情報です。';
-    $lang->about_part_feed_copyright = '未入力の場合、全体RSS著作権の設定と同様に適用されます。';
-    $lang->about_feed_document_count = 'RSSに配信するコンテンツの数 (デフォルト : 15)';
-
-    // エラーメッセージ
-    $lang->msg_rss_is_disabled = 'RSS機能がロックされています。';
-    $lang->msg_rss_invalid_image_format = 'サポートしないイメージファイルです。\nJPEG, GIF, PNGファイルのみサポートします。';
-?>
diff --git a/modules/rss/lang/ko.lang.php b/modules/rss/lang/ko.lang.php
deleted file mode 100644
index 7b49f3bbb..000000000
--- a/modules/rss/lang/ko.lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    // 일반 단어들
-    $lang->feed = '피드(Feed) 발행';
-    $lang->total_feed = '통합 피드';
-    $lang->rss_disable = '피드(Feed) 끄기';
-    $lang->feed_copyright = '저작권';
-    $lang->feed_document_count = '한 페이지당 글 수';
-    $lang->feed_image = '피드 이미지';
-    $lang->rss_type = '출력할 피드(Feed) 형식';
-    $lang->open_rss = '피드(Feed) 공개';
-    $lang->open_rss_types = array(
-        'Y' => '전문 공개 ',
-        'H' => '요약 공개',
-        'N' => '공개하지 않음',
-    );
-    $lang->open_feed_to_total = '통합 피드에 포함';
-
-    // 설명문
-    $lang->about_rss_disable = '체크하시면 피드(Feed) 출력을 하지 않습니다.';
-    $lang->about_rss_type = '출력하실 피드(Feed) 형식을 지정하실 수 있습니다.';
-    $lang->about_open_rss = '현재 모듈에 대한 피드(Feed) 공개를 선택하실 수 있습니다. 글 열람 권한과 상관없이 옵션에 따라 RSS가 공개됩니다.';
-    $lang->about_feed_description = '발행될 피드에 대한 설명을 입력하실 수 있습니다. 설명을 입력하지 않으실 경우, 해당 모듈에 설정된 관리용 설명이 포함됩니다.';
-    $lang->about_feed_copyright = '발행될 피드에 대한 저작권 정보를 입력하실 수 있습니다.';
-    $lang->about_part_feed_copyright = '입력하지 않으면 전체 피드 저작권 설정과 동일하게 적용됩니다.';
-    $lang->about_feed_document_count = '피드 한 페이지에 공개되는 글 수. (기본 값 : 15)';
-
-    // 에러 메시지들
-    $lang->msg_rss_is_disabled = '피드(Feed) 기능이 잠겨 있습니다.';
-    $lang->msg_rss_invalid_image_format = '이미지의 형식이 잘못되었습니다.\nJPEG, GIF, PNG 파일만 지원합니다.';
-?>
diff --git a/modules/rss/lang/lang.xml b/modules/rss/lang/lang.xml
new file mode 100644
index 000000000..3038e93bc
--- /dev/null
+++ b/modules/rss/lang/lang.xml
@@ -0,0 +1,202 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="feed">
+		<value xml:lang="ko"><![CDATA[피드(Feed) 발행]]></value>
+		<value xml:lang="en"><![CDATA[Publish RSS Feed]]></value>
+		<value xml:lang="jp"><![CDATA[RSS発行]]></value>
+		<value xml:lang="zh-CN"><![CDATA[RSS发布]]></value>
+		<value xml:lang="zh-TW"><![CDATA[RSS Feed]]></value>
+		<value xml:lang="ru"><![CDATA[Создать(Feed)]]></value>
+	</item>
+	<item name="total_feed">
+		<value xml:lang="ko"><![CDATA[통합 피드]]></value>
+		<value xml:lang="en"><![CDATA[Aggregated Feeds]]></value>
+		<value xml:lang="jp"><![CDATA[統合RSS]]></value>
+		<value xml:lang="zh-CN"><![CDATA[整站RSS]]></value>
+		<value xml:lang="zh-TW"><![CDATA[RSS]]></value>
+		<value xml:lang="ru"><![CDATA[Общий Feed]]></value>
+	</item>
+	<item name="rss_disable">
+		<value xml:lang="ko"><![CDATA[피드(Feed) 끄기]]></value>
+		<value xml:lang="en"><![CDATA[Disable RSS Feed]]></value>
+		<value xml:lang="jp"><![CDATA[RSS機能オフ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[关闭RSS]]></value>
+		<value xml:lang="zh-TW"><![CDATA[關閉 RSS Feed]]></value>
+		<value xml:lang="fr"><![CDATA[Invalider RSS]]></value>
+		<value xml:lang="ru"><![CDATA[Отключить RSS]]></value>
+		<value xml:lang="es"><![CDATA[Desactivar RSS]]></value>
+		<value xml:lang="tr"><![CDATA[RSS devredışı]]></value>
+		<value xml:lang="vi"><![CDATA[Tắt RSS]]></value>
+	</item>
+	<item name="feed_copyright">
+		<value xml:lang="ko"><![CDATA[저작권]]></value>
+		<value xml:lang="en"><![CDATA[Copyright]]></value>
+		<value xml:lang="jp"><![CDATA[著作権]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="ru"><![CDATA[Копирайт]]></value>
+	</item>
+	<item name="feed_document_count">
+		<value xml:lang="ko"><![CDATA[한 페이지당 글 수]]></value>
+		<value xml:lang="en"><![CDATA[Number of articles per page]]></value>
+		<value xml:lang="jp"><![CDATA[RSSコンテンツ数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[每页主题数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[每頁主題數]]></value>
+		<value xml:lang="ru"><![CDATA[Количество записей на страницу]]></value>
+	</item>
+	<item name="feed_image">
+		<value xml:lang="ko"><![CDATA[피드 이미지]]></value>
+		<value xml:lang="en"><![CDATA[Feed Image]]></value>
+		<value xml:lang="jp"><![CDATA[RSSイメージ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[RSS图片]]></value>
+		<value xml:lang="zh-TW"><![CDATA[RSS 圖片]]></value>
+		<value xml:lang="ru"><![CDATA[Картинка Feed]]></value>
+	</item>
+	<item name="rss_type">
+		<value xml:lang="ko"><![CDATA[출력할 피드(Feed) 형식]]></value>
+		<value xml:lang="en"><![CDATA[RSS feed type]]></value>
+		<value xml:lang="jp"><![CDATA[出力するRSSタイプ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[RSS Feed显示样式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[RSS Feed 類型]]></value>
+		<value xml:lang="fr"><![CDATA[Le Format pour imprimer RSS]]></value>
+		<value xml:lang="ru"><![CDATA[Тип RSS]]></value>
+		<value xml:lang="es"><![CDATA[Tipo de RSS a imprimir]]></value>
+		<value xml:lang="tr"><![CDATA[RSS besleme türü]]></value>
+		<value xml:lang="vi"><![CDATA[Định dạng RSS]]></value>
+	</item>
+	<item name="open_rss">
+		<value xml:lang="ko"><![CDATA[피드(Feed) 공개]]></value>
+		<value xml:lang="en"><![CDATA[Open RSS]]></value>
+		<value xml:lang="jp"><![CDATA[RSS配信]]></value>
+		<value xml:lang="zh-CN"><![CDATA[RSS公开]]></value>
+		<value xml:lang="zh-TW"><![CDATA[公開程度]]></value>
+		<value xml:lang="fr"><![CDATA[Exposer RSS]]></value>
+		<value xml:lang="ru"><![CDATA[Показать RSS]]></value>
+		<value xml:lang="es"><![CDATA[Abrir RSS]]></value>
+		<value xml:lang="tr"><![CDATA[RSS Aç]]></value>
+		<value xml:lang="vi"><![CDATA[Mở RSS]]></value>
+	</item>
+	<item name="open_rss_types" type="array">
+		<item name="Y">
+			<value xml:lang="ko"><![CDATA[전문 공개 ]]></value>
+			<value xml:lang="en"><![CDATA[Open all]]></value>
+			<value xml:lang="jp"><![CDATA[全文配信 ]]></value>
+			<value xml:lang="zh-CN"><![CDATA[公开全文]]></value>
+			<value xml:lang="zh-TW"><![CDATA[全部公開]]></value>
+			<value xml:lang="fr"><![CDATA[Exposer Tout]]></value>
+			<value xml:lang="ru"><![CDATA[Показать все]]></value>
+			<value xml:lang="es"><![CDATA[Abrir todo]]></value>
+			<value xml:lang="tr"><![CDATA[Tümünü Aç]]></value>
+			<value xml:lang="vi"><![CDATA[Mở tất cả]]></value>
+		</item>
+		<item name="H">
+			<value xml:lang="ko"><![CDATA[요약 공개]]></value>
+			<value xml:lang="en"><![CDATA[Open summary]]></value>
+			<value xml:lang="jp"><![CDATA[要約配信]]></value>
+			<value xml:lang="zh-CN"><![CDATA[公开摘要]]></value>
+			<value xml:lang="zh-TW"><![CDATA[公開摘要]]></value>
+			<value xml:lang="fr"><![CDATA[Exposer Résumé]]></value>
+			<value xml:lang="ru"><![CDATA[Показать выдержку]]></value>
+			<value xml:lang="es"><![CDATA[Abrir el sumario]]></value>
+			<value xml:lang="tr"><![CDATA[Özeti Aç]]></value>
+			<value xml:lang="vi"><![CDATA[Mở tóm tắt]]></value>
+		</item>
+		<item name="N">
+			<value xml:lang="ko"><![CDATA[공개하지 않음]]></value>
+			<value xml:lang="en"><![CDATA[Not open]]></value>
+			<value xml:lang="jp"><![CDATA[配信しない]]></value>
+			<value xml:lang="zh-CN"><![CDATA[不公开]]></value>
+			<value xml:lang="zh-TW"><![CDATA[不公開]]></value>
+			<value xml:lang="fr"><![CDATA[Ne pas exposer]]></value>
+			<value xml:lang="ru"><![CDATA[Не показывать]]></value>
+			<value xml:lang="es"><![CDATA[No abrir]]></value>
+			<value xml:lang="tr"><![CDATA[Açma]]></value>
+			<value xml:lang="vi"><![CDATA[Tắt]]></value>
+		</item>
+	</item>
+	<item name="open_feed_to_total">
+		<value xml:lang="ko"><![CDATA[통합 피드에 포함]]></value>
+		<value xml:lang="en"><![CDATA[Included in aggregated feed]]></value>
+		<value xml:lang="jp"><![CDATA[統合RSSに含む]]></value>
+		<value xml:lang="zh-CN"><![CDATA[包含到整站RSS]]></value>
+		<value xml:lang="zh-TW"><![CDATA[是否使用]]></value>
+		<value xml:lang="ru"><![CDATA[Включено в общий Feed]]></value>
+	</item>
+	<item name="about_rss_disable">
+		<value xml:lang="ko"><![CDATA[체크하시면 피드(Feed) 출력을 하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[If checked, RSS will be disabled.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れるとRSSの出力を行いません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选此项不显示RSS。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[隱藏 RSS Feed。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous cochez, RSS sera invalidé.]]></value>
+		<value xml:lang="ru"><![CDATA[Если выбрано, RSS будет отключен.]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción, RSS será desactivado.]]></value>
+		<value xml:lang="tr"><![CDATA[İşaretlendiğinde, RSS devredışı bırakılacak.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu chọn, RSS sẽ bị tắt.]]></value>
+	</item>
+	<item name="about_rss_type">
+		<value xml:lang="ko"><![CDATA[출력하실 피드(Feed) 형식을 지정하실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can assign RSS feed type.]]></value>
+		<value xml:lang="jp"><![CDATA[出力するRSSタイプを指定することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定要显示的RSS形式。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[指定要顯示的 RSS Feed 類型。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez désignez le format pour inprimer RSS.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете присвоить тип RSS.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede asignar el tipo de RSS a imprimir.]]></value>
+		<value xml:lang="tr"><![CDATA[RSS besleme türünü atayabilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt định dạng cho RSS.]]></value>
+	</item>
+	<item name="about_open_rss">
+		<value xml:lang="ko"><![CDATA[현재 모듈에 대한 피드(Feed) 공개를 선택하실 수 있습니다. 글 열람 권한과 상관없이 옵션에 따라 RSS가 공개됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can select RSS on the current module to be open to the public.\nIf it is enabled, the article will be open to the public despite its view permissions.]]></value>
+		<value xml:lang="jp"><![CDATA[現在のモジュールに対して「RSS配信」を選択することができます。書き込みの内容が読める権限とは関係なくオプションによってRSSが配信されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以指定RSS公开程度,RSS公开不受查看内容权限的限制。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇該模組 RSS Feed 的公開程度。公開 RSS Feed 將不受檢視內容權限的限制，隨公開 RSS Feed 的選項公開 RSS Feed。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez exposez au publique le RSS du module courant ou non.\nN'importe comment est la permission de l'article, RSS sera exposé au publique selon son option.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете выбрать для того, чтобы RSS доступен публично.\nНезависимо от разрешений для статьи, RSS будет доступна публично согласно ее настройке.]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede seleccionar RSS abierto al público en el módulo actual.\nIndependiente de la atribución de ver, dependiendo de la opción de RSS puede ser abierto al público.]]></value>
+		<value xml:lang="tr"><![CDATA[Geçerli modülü herkese açmak için, modüldeki RSS'yi seçebilirsiniz.\nMakale gösterimi iznine bakılmaksızın , RSS bu seçenekle tüm herkese açık hale gelecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể mở công khai RSS trên Module hiện tại.\nKhông ảnh hưởng tới quyền truy cập bài viết, RSS sẽ mở công khai với tùy chọn của nó.]]></value>
+	</item>
+	<item name="about_feed_description">
+		<value xml:lang="ko"><![CDATA[발행될 피드에 대한 설명을 입력하실 수 있습니다. 설명을 입력하지 않으실 경우, 해당 모듈에 설정된 관리용 설명이 포함됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can enter the description on the RSS feed to be published. If you don't enter this, the description of each module is displayed by default.]]></value>
+		<value xml:lang="jp"><![CDATA[発行するRSSに関する説明を入力します。未入力した場合は該当モジュールで設定された管理用説明が含まれます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[可以输入简单说明,留空输出该模块的说明。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入簡介。 也可輸入相關管理使用說明。]]></value>
+	</item>
+	<item name="about_feed_copyright">
+		<value xml:lang="ko"><![CDATA[발행될 피드에 대한 저작권 정보를 입력하실 수 있습니다. 입력하지 않으면 전체 피드 저작권 설정과 동일하게 적용됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[You can enter copyright information on the RSS feed. If you don't enter this, the copyright of the entire RSS feeds is applied.]]></value>
+		<value xml:lang="jp"><![CDATA[発行するRSSのコンテンツに対する著作権情報です。未入力の場合、全体RSS著作権の設定と同様に適用されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[RSS Feed版权信息。留空版权信息参照整站RSS的版权信息。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入 Feed 著作權資料。著作權將會適用所有的 Feed 內容。]]></value>
+	</item>
+	<item name="about_feed_document_count">
+		<value xml:lang="ko"><![CDATA[피드 한 페이지에 공개되는 글 수. (기본 값 : 15)]]></value>
+		<value xml:lang="en"><![CDATA[Number of articles to be displayed on one feed page (default: 15)]]></value>
+		<value xml:lang="jp"><![CDATA[RSSに配信するコンテンツの数 (デフォルト : 15)]]></value>
+		<value xml:lang="zh-CN"><![CDATA[每页要显示的主题数(默认: 15)。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[每頁要顯示的主題數。(預設: 15)]]></value>
+	</item>
+	<item name="msg_rss_is_disabled">
+		<value xml:lang="ko"><![CDATA[피드(Feed) 기능이 잠겨 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[RSS function is disabled.]]></value>
+		<value xml:lang="jp"><![CDATA[RSS機能がロックされています。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[RSS功能处于锁定状态。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[RSS Feed 功能未開啟。]]></value>
+		<value xml:lang="fr"><![CDATA[La fonction RSS est invalidé.]]></value>
+		<value xml:lang="ru"><![CDATA[Функция RSS выключена.]]></value>
+		<value xml:lang="es"><![CDATA[Función de RSS esta desactivada.]]></value>
+		<value xml:lang="tr"><![CDATA[RSS özelliği devredışı.]]></value>
+		<value xml:lang="vi"><![CDATA[Chức năng RSS đã bị tắt.]]></value>
+	</item>
+	<item name="msg_rss_invalid_image_format">
+		<value xml:lang="ko"><![CDATA[이미지의 형식이 잘못되었습니다.\nJPEG, GIF, PNG 파일만 지원합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Invalid image format. \nOnly JPEG, GIF, and PNG files are supported.]]></value>
+		<value xml:lang="jp"><![CDATA[サポートしないイメージファイルです。\nJPEG, GIF, PNGファイルのみサポートします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上传的文件格式错误！\n只允许上传JPEG, GIF, PNG图片文件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[錯誤的檔案格式，無法上傳。\n只允許上傳 JPEG, GIF, PNG 等檔案格式。]]></value>
+		<value xml:lang="ru"><![CDATA[Неправильный тип картинки\nПоддерживаются только JPEG, GIF, PNG файлы]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/rss/lang/ru.lang.php b/modules/rss/lang/ru.lang.php
deleted file mode 100644
index 2b895c08a..000000000
--- a/modules/rss/lang/ru.lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    // главные слова
-    $lang->feed = 'Создать(Feed)';
-    $lang->total_feed = 'Общий Feed';
-	$lang->rss_disable = "Отключить RSS";
-	$lang->feed_copyright = 'Копирайт';
-    $lang->feed_document_count = 'Количество записей на страницу';
-    $lang->feed_image = 'Картинка Feed';
-    $lang->rss_type = "Тип RSS";
-    $lang->open_rss = 'Показать RSS';
-    $lang->open_rss_types = array(
-        'Y' => 'Показать все',
-        'H' => 'Показать выдержку',
-        'N' => 'Не показывать',
-    );
-    $lang->open_feed_to_total = 'Включено в общий Feed';
-	   
-		// для описаний
-    $lang->about_rss_disable = "Если выбрано, RSS будет отключен.";
-    $lang->about_rss_type = "Вы можете присвоить тип RSS.";
-    $lang->about_open_rss = 'Вы можете выбрать для того, чтобы RSS доступен публично.\nНезависимо от разрешений для статьи, RSS будет доступна публично согласно ее настройке.';
-    $lang->about_feed_description = '발행될 피드에 대한 설명을 입력하실 수 있습니다. 설명을 입력하지 않으실 경우, 해당 모듈에 설정된 관리용 설명이 포함됩니다.';
-    $lang->about_feed_copyright = '발행될 피드에 대한 저작권 정보를 입력하실 수 있습니다.';
-    $lang->about_part_feed_copyright = '입력하지 않으면 전체 피드 저작권 설정과 동일하게 적용됩니다.';
-    $lang->about_feed_document_count = '피드 한 페이지에 공개되는 글 수. (기본 값 : 15)';
-
-     // для ошибок
-    $lang->msg_rss_is_disabled = "Функция RSS выключена.";
-    $lang->msg_rss_invalid_image_format = 'Неправильный тип картинки\nПоддерживаются только JPEG, GIF, PNG файлы';
-?>
diff --git a/modules/rss/lang/tr.lang.php b/modules/rss/lang/tr.lang.php
deleted file mode 100644
index d144b7183..000000000
--- a/modules/rss/lang/tr.lang.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English language pack (basic)
-     **/
-
-    // general words
-    $lang->rss_disable = "RSS devredışı";
-    $lang->rss_type = "RSS besleme türü";
-    $lang->open_rss = 'RSS Aç';
-    $lang->open_rss_types = array(
-        'Y' => 'Tümünü Aç',
-        'H' => 'Özeti Aç',
-        'N' => 'Açma',
-    );
-
-    // for description
-    $lang->about_rss_disable = "İşaretlendiğinde, RSS devredışı bırakılacak.";
-    $lang->about_rss_type = "RSS besleme türünü atayabilirsiniz.";
-    $lang->about_open_rss = 'Geçerli modülü herkese açmak için, modüldeki RSS\'yi seçebilirsiniz.\nMakale gösterimi iznine bakılmaksızın , RSS bu seçenekle tüm herkese açık hale gelecektir.';
-
-    // for error message
-    $lang->msg_rss_is_disabled = "RSS özelliği devredışı.";
-?>
diff --git a/modules/rss/lang/vi.lang.php b/modules/rss/lang/vi.lang.php
deleted file mode 100644
index a465b0966..000000000
--- a/modules/rss/lang/vi.lang.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    // general words
-    $lang->rss_disable = "Tắt RSS";
-    $lang->rss_type = "Định dạng RSS";
-    $lang->open_rss = 'Mở RSS';
-    $lang->open_rss_types = array(
-        'Y' => 'Mở tất cả',
-        'H' => 'Mở tóm tắt',
-        'N' => 'Tắt',
-    );
-
-    // for description
-    $lang->about_rss_disable = "Nếu chọn, RSS sẽ bị tắt.";
-    $lang->about_rss_type = "Bạn có thể đặt định dạng cho RSS.";
-    $lang->about_open_rss = 'Bạn có thể mở công khai RSS trên Module hiện tại.\nKhông ảnh hưởng tới quyền truy cập bài viết, RSS sẽ mở công khai với tùy chọn của nó.';
-
-    // for error message
-    $lang->msg_rss_is_disabled = "Chức năng RSS đã bị tắt.";
-?>
diff --git a/modules/rss/lang/zh-CN.lang.php b/modules/rss/lang/zh-CN.lang.php
deleted file mode 100644
index ef6e18d93..000000000
--- a/modules/rss/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)　翻译：guny
-     * @brief  RSS模块简体中文语言包
-     **/
-
-    // 一般单词
-    $lang->feed = 'RSS发布';
-    $lang->total_feed = '整站RSS';
-    $lang->rss_disable = "关闭RSS";
-    $lang->feed_copyright = '版权';
-    $lang->feed_document_count = '每页主题数';
-    $lang->feed_image = 'RSS图片';
-    $lang->rss_type = "RSS Feed显示样式";
-    $lang->open_rss = 'RSS公开';
-    $lang->open_rss_types = array(
-        'Y' => '公开全文',
-        'H' => '公开摘要',
-        'N' => '不公开',
-    );
-    $lang->open_feed_to_total = '包含到整站RSS';
-    
-    // 说明
-    $lang->about_rss_disable = "选此项不显示RSS。";
-    $lang->about_rss_type = "可以指定要显示的RSS形式。";
-    $lang->about_open_rss = '可以指定RSS公开程度,RSS公开不受查看内容权限的限制。';
-    $lang->about_feed_description = '可以输入简单说明,留空输出该模块的说明。';
-    $lang->about_feed_copyright = 'RSS Feed版权信息。';
-    $lang->about_part_feed_copyright = '留空版权信息参照整站RSS的版权信息。';
-    $lang->about_feed_document_count = '每页要显示的主题数(默认: 15)。';
-
-    // 错误提示
-    $lang->msg_rss_is_disabled = "RSS功能处于锁定状态。";
-    $lang->msg_rss_invalid_image_format = '上传的文件格式错误！\n只允许上传JPEG, GIF, PNG图片文件。';
-?>
diff --git a/modules/rss/lang/zh-TW.lang.php b/modules/rss/lang/zh-TW.lang.php
deleted file mode 100644
index 9d0ca1a6b..000000000
--- a/modules/rss/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-    /**
-     * @file   modules/rss/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  RSS 模組正體中文語言
-     **/
-
-    // 一般語言
-    $lang->feed = 'RSS Feed';
-    $lang->total_feed = 'RSS';
-    $lang->rss_disable = "關閉 RSS Feed";
-    $lang->feed_copyright = '版權';
-    $lang->feed_document_count = '每頁主題數';
-    $lang->feed_image = 'RSS 圖片';
-    $lang->rss_type = "RSS Feed 類型";
-    $lang->open_rss = '公開程度';
-    $lang->open_rss_types = array(
-        'Y' => '全部公開',
-        'H' => '公開摘要',
-        'N' => '不公開',
-    );
-    $lang->open_feed_to_total = '是否使用';
-
-    // 說明
-    $lang->about_rss_disable = "隱藏 RSS Feed。";
-    $lang->about_rss_type = "指定要顯示的 RSS Feed 類型。";
-    $lang->about_open_rss = '選擇該模組 RSS Feed 的公開程度。公開 RSS Feed 將不受檢視內容權限的限制，隨公開 RSS Feed 的選項公開 RSS Feed。';
-    $lang->about_feed_description = '請輸入簡介。 也可輸入相關管理使用說明。';
-    $lang->about_feed_copyright = '請輸入 Feed 著作權資料。';
-    $lang->about_part_feed_copyright = '著作權將會適用所有的 Feed 內容。';
-    $lang->about_feed_document_count = '每頁要顯示的主題數。(預設: 15)';
-
-    // 錯誤提示
-    $lang->msg_rss_is_disabled = "RSS Feed 功能未開啟。";
-    $lang->msg_rss_invalid_image_format = '錯誤的檔案格式，無法上傳。\n只允許上傳 JPEG, GIF, PNG 等檔案格式。';
-?>
diff --git a/modules/rss/rss.admin.controller.php b/modules/rss/rss.admin.controller.php
index e17caaa74..0d8ffe5e8 100644
--- a/modules/rss/rss.admin.controller.php
+++ b/modules/rss/rss.admin.controller.php
@@ -1,164 +1,169 @@
-<?php
-    /**
-     * @class  rssAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  rss module의 admin controller class
-     *
-     * RSS 2.0형식으로 문서 출력
-     *
-     **/
-
-    class rssAdminController extends rss {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief RSS 전체피드 설정
-         **/
-        function procRssAdminInsertConfig() {
-            $oModuleModel = &getModel('module');
-            $total_config = $oModuleModel->getModuleConfig('rss');
-
-            $config_vars = Context::getRequestVars();
-
-            $config_vars->feed_document_count = (int)$config_vars->feed_document_count;
-
-            if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
-            if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
-
-            if($config_vars->image || $config_vars->del_image) {
-                $image_obj = $config_vars->image;
-                $config_vars->image = $total_config->image;
-
-                // 삭제 요청에 대한 변수를 구함
-                if($config_vars->del_image == 'Y' || $image_obj) {
-                    FileHandler::removeFile($config_vars->image);
-                    $config_vars->image = '';
-                    $total_config->image = '';
-                }
-
-                // 정상적으로 업로드된 파일이 아니면 무시
-                if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name'])) {
-                    // 이미지 파일이 아니어도 무시 (swf는 패스~)
-                    $image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
-
-                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
-                    else {
-                        // 경로를 정해서 업로드
-                        $path = './files/attach/images/rss/';
-                        // 디렉토리 생성
-                        if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
-                        else{
-                            $filename = $path.$image_obj['name'];
-                            // 파일 이동
-                            if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
-                            else {
-                                $config_vars->image = $filename;
-                            }
-                        }
-                    }
-                }
-            }
-            if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
-
-            $output = $this->setFeedConfig($config_vars);
-
-            if(!$alt_message) $alt_message = 'success_updated';
-
-            $alt_message = Context::getLang($alt_message);
-            Context::set('msg', $alt_message);
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
-
-        /**
-         * @brief RSS 모듈별 설정
-         **/
-        function procRssAdminInsertModuleConfig() {
-            // 대상을 구함
-            $module_srl = Context::get('target_module_srl');
-
-            // 여러개의 모듈 일괄 설정일 경우
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-            if(!is_array($module_srl)) $module_srl[0] = $module_srl;
-
-            $config_vars = Context::getRequestVars();
-
-            $open_rss = $config_vars->open_rss;
-            $open_total_feed = $config_vars->open_total_feed;
-            $feed_description = trim($config_vars->feed_description);
-            $feed_copyright = trim($config_vars->feed_copyright);
-
-            if(!$module_srl || !$open_rss) return new Object(-1, 'msg_invalid_request');
-
-            if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
-
-            // 설정 저장
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                $output = $this->setRssModuleConfig($srl, $open_rss, $open_total_feed, $feed_description, $feed_copyright);
-            }
-
-            $this->setError(-1);
-            $this->setMessage('success_updated');
-        }
-
-
-        /**
-         * @brief Feed 전체 포함/미포함 체인지
-         **/
-        function procRssAdminToggleActivate() {
-            $oRssModel = &getModel('rss');
-
-            // mid값을 받아옴
-            $module_srl = Context::get('module_srl');
-            if($module_srl) {
-                $config = $oRssModel->getRssModuleConfig($module_srl);
-                if($config->open_total_feed == 'T_N') {
-                    $this->setRssModuleConfig($module_srl, $config->open_rss, 'T_Y', $config->feed_description, $config->feed_copyright);
-                    $this->add("open_total_feed", 'T_Y');
-                }
-                else {
-                    $this->setRssModuleConfig($module_srl, $config->open_rss, 'T_N', $config->feed_description, $config->feed_copyright);
-                    $this->add("open_total_feed", 'T_N');
-                }
-            }
-
-            $this->add("module_srl", $module_srl);
-        }
-
-
-        /**
-         * @brief RSS모듈의 전체 Feed 설정용 함수
-         **/
-        function setFeedConfig($config) {
-            $oModuleController = &getController('module');
-            $oModuleController->insertModuleConfig('rss',$config);
-            return new Object();
-        }
-
-
-        /**
-         * @brief RSS 모듈별 설정 함수
-         **/
-        function setRssModuleConfig($module_srl, $open_rss, $open_total_feed = 'N', $feed_description = 'N', $feed_copyright = 'N') {
-            $oModuleController = &getController('module');
-            $config->open_rss = $open_rss;
-            $config->open_total_feed = $open_total_feed;
-            if($feed_description != 'N') { $config->feed_description = $feed_description; }
-            if($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
-            $oModuleController->insertModulePartConfig('rss',$module_srl,$config);
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  rssAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin controller class of the rss module
+     *
+     * RSS 2.0 format document output
+     *
+     **/
+
+    class rssAdminController extends rss {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief All RSS feeds configurations
+         **/
+        function procRssAdminInsertConfig() {
+            $oModuleModel = &getModel('module');
+            $total_config = $oModuleModel->getModuleConfig('rss');
+
+            $config_vars = Context::getRequestVars();
+
+            $config_vars->feed_document_count = (int)$config_vars->feed_document_count;
+
+            if(!$config_vars->use_total_feed) $alt_message = 'msg_invalid_request';
+            if(!in_array($config_vars->use_total_feed, array('Y','N'))) $config_vars->open_rss = 'Y';
+
+            if($config_vars->image || $config_vars->del_image) {
+                $image_obj = $config_vars->image;
+                $config_vars->image = $total_config->image;
+                // Get a variable for the delete request
+                if($config_vars->del_image == 'Y' || $image_obj) {
+                    FileHandler::removeFile($config_vars->image);
+                    $config_vars->image = '';
+                    $total_config->image = '';
+                }
+                // Ignore if the file is not the one which has been successfully uploaded
+                if($image_obj['tmp_name'] && is_uploaded_file($image_obj['tmp_name'])) {
+                    // Ignore if the file is not an image (swf is accepted ~)
+                    $image_obj['name'] = Context::convertEncodingStr($image_obj['name']);
+
+                    if(!preg_match("/\.(jpg|jpeg|gif|png)$/i", $image_obj['name'])) $alt_message = 'msg_rss_invalid_image_format';
+                    else {
+                        // Upload the file to a path
+                        $path = './files/attach/images/rss/';
+                        // Create a directory
+                        if(!FileHandler::makeDir($path)) $alt_message = 'msg_error_occured';
+                        else{
+                            $filename = $path.$image_obj['name'];
+                            // Move the file
+                            if(!move_uploaded_file($image_obj['tmp_name'], $filename)) $alt_message = 'msg_error_occured';
+                            else {
+                                $config_vars->image = $filename;
+                            }
+                        }
+                    }
+                }
+            }
+            if(!$config_vars->image && $config_vars->del_image != 'Y') $config_vars->image = $total_config->image;
+
+            $output = $this->setFeedConfig($config_vars);
+
+            if(!$alt_message) $alt_message = 'success_updated';
+
+            $alt_message = Context::getLang($alt_message);
+            Context::set('msg', $alt_message);
+
+            //$this->setLayoutPath('./common/tpl');
+            //$this->setLayoutFile('default_layout.html');
+            //$this->setTemplatePath($this->module_path.'tpl');
+            //$this->setTemplateFile("top_refresh.html");
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispRssAdminIndex');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+
+        /**
+         * @brief RSS Module configurations
+         **/
+        function procRssAdminInsertModuleConfig() {
+            // Get the object
+            $module_srl = Context::get('target_module_srl');
+            // In case of batch configuration of several modules
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+            if(!is_array($module_srl)) $module_srl[0] = $module_srl;
+
+            $config_vars = Context::getRequestVars();
+
+            $open_rss = $config_vars->open_rss;
+            $open_total_feed = $config_vars->open_total_feed;
+            $feed_description = trim($config_vars->feed_description);
+            $feed_copyright = trim($config_vars->feed_copyright);
+
+            if(!$module_srl || !$open_rss) return new Object(-1, 'msg_invalid_request');
+
+            if(!in_array($open_rss, array('Y','H','N'))) $open_rss = 'N';
+            // Save configurations
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                $output = $this->setRssModuleConfig($srl, $open_rss, $open_total_feed, $feed_description, $feed_copyright);
+            }
+
+            //$this->setError(0);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+
+        /**
+         * @brief All Feeds with or without change
+         **/
+        function procRssAdminToggleActivate() {
+            $oRssModel = &getModel('rss');
+            // Get mid value
+            $module_srl = Context::get('module_srl');
+            if($module_srl) {
+                $config = $oRssModel->getRssModuleConfig($module_srl);
+                if($config->open_total_feed == 'T_N') {
+                    $this->setRssModuleConfig($module_srl, $config->open_rss, 'T_Y', $config->feed_description, $config->feed_copyright);
+                    $this->add("open_total_feed", 'T_Y');
+                }
+                else {
+                    $this->setRssModuleConfig($module_srl, $config->open_rss, 'T_N', $config->feed_description, $config->feed_copyright);
+                    $this->add("open_total_feed", 'T_N');
+                }
+            }
+
+            $this->add("module_srl", $module_srl);
+        }
+
+
+        /**
+         * @brief A funciton to configure all Feeds of the RSS module
+         **/
+        function setFeedConfig($config) {
+            $oModuleController = &getController('module');
+            $oModuleController->insertModuleConfig('rss',$config);
+            return new Object();
+        }
+
+
+        /**
+         * @brief A function t configure the RSS module
+         **/
+        function setRssModuleConfig($module_srl, $open_rss, $open_total_feed = 'N', $feed_description = 'N', $feed_copyright = 'N') {
+            $oModuleController = &getController('module');
+            $config->open_rss = $open_rss;
+            $config->open_total_feed = $open_total_feed;
+            if($feed_description != 'N') { $config->feed_description = $feed_description; }
+            if($feed_copyright != 'N') { $config->feed_copyright = $feed_copyright; }
+            $oModuleController->insertModulePartConfig('rss',$module_srl,$config);
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/rss/rss.admin.view.php b/modules/rss/rss.admin.view.php
index 6ed1e1ed6..e2a8b417c 100644
--- a/modules/rss/rss.admin.view.php
+++ b/modules/rss/rss.admin.view.php
@@ -1,53 +1,56 @@
-<?php
-    /**
-     * @class  rssAdminView
-     * @author misol (misol@korea.ac.kr)
-     * @brief  rss 모듈의 admin view class
-     **/
-
-    class rssAdminView extends rss {
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 템플릿 경로 지정 
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-
-        /**
-         * @brief 관리자 페이지 초기화면
-         **/
-        function dispRssAdminIndex() {
-            $oModuleModel = &getModel('module');
-            $rss_config = $oModuleModel->getModulePartConfigs('rss');
-            $total_config = $oModuleModel->getModuleConfig('rss');
-            $oRssModel = &getModel('rss');
-
-            if($rss_config) {
-                foreach($rss_config as $module_srl => $config) {
-                    if($config) {
-                        $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-                        $site = $oModuleModel->getSiteInfo($module_info->site_srl);
-                        if(!strpos($site->domain, '.')) $vid = $site->domain;
-                        else $site = null;
-                        if($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
-                        $feed_config[$module_srl]['mid'] = $module_info->mid;
-                        $feed_config[$module_srl]['open_feed'] = $config->open_rss;
-                        $feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
-                    }
-                }
-            }
-
-            Context::set('feed_config', $feed_config);
-            Context::set('total_config', $total_config);		
-			
-			$security = new Security();
-			$security->encodeHTML('feed_config..mid','feed_config..url');
-			$security->encodeHTML('total_config..');
-			
-           	$this->setTemplatePath($this->module_path.'tpl');
-		    $this->setTemplateFile('rss_admin_index');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  rssAdminView
+     * @author misol (misol@korea.ac.kr)
+     * @brief The admin view class of the rss module
+     **/
+
+	class rssAdminView extends rss {
+		/**
+		 * @brief Initialization
+		 **/
+		function init() {
+			//Set template path
+			$this->setTemplatePath($this->module_path.'tpl');
+		}
+
+
+		/**
+		 * @brief In case an administrator page has been initialized
+		 **/
+		function dispRssAdminIndex() {
+			$oModuleModel = &getModel('module');
+			$rss_config = $oModuleModel->getModulePartConfigs('rss');
+			$total_config = $oModuleModel->getModuleConfig('rss');
+			$oRssModel = &getModel('rss');
+
+			if($rss_config) {
+				foreach($rss_config as $module_srl => $config) {
+					if($config) {
+						$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+						$columnList = array('sites.domain');
+						$site = $oModuleModel->getSiteInfo($module_info->site_srl, $columnList);
+						if(!strpos($site->domain, '.')) $vid = $site->domain;
+						else $site = null;
+						if($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
+						$feed_config[$module_srl]['mid'] = $module_info->mid;
+						$feed_config[$module_srl]['open_feed'] = $config->open_rss;
+						$feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
+						$feed_config[$module_srl]['feed_description'] = $config->feed_description;
+					}
+				}
+			}
+			if(!$total_config->feed_document_count) $total_config->feed_document_count = 15;
+
+			Context::set('feed_config', $feed_config);
+			Context::set('total_config', $total_config);
+
+			$security = new Security();
+			$security->encodeHTML('feed_config..mid','feed_config..url');
+			$security->encodeHTML('total_config..');
+
+			$this->setTemplatePath($this->module_path.'tpl');
+			$this->setTemplateFile('rss_admin_index');
+		}
+	}
+?>
\ No newline at end of file
diff --git a/modules/rss/rss.class.php b/modules/rss/rss.class.php
index cbbe2e6fb..5b099e6a3 100644
--- a/modules/rss/rss.class.php
+++ b/modules/rss/rss.class.php
@@ -1,80 +1,72 @@
-<?php
-    /**
-     * @class  rss
-     * @author NHN (developers@xpressengine.com)
-     * @brief  rss module의 view class
-     **/
-
-    class rss extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 
-            $oModuleController = &getController('module');
-
-            $oModuleController->insertActionForward('rss', 'view', 'rss');
-            $oModuleController->insertActionForward('rss', 'view', 'atom');
-
-            // 2007. 10. 18 서비스형 모듈의 추가 설정에 참여하기 위한 trigger 추가
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
-
-            // 2007. 10. 19 출력하기 전에 rss url을 세팅하는 트리거 호출
-            $oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            // atom 을 위한 Action forward 추가
-            if(!$oModuleModel->getActionForward('atom')) return true;
-
-            // 2007. 10. 18 서비스형 모듈의 추가 설정에 참여하기 위한 trigger 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
-
-            // 2007. 10. 19 출력하기 전에 rss url을 세팅하는 트리거 호출
-            if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
-
-            if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // atom act 추가
-            if(!$oModuleModel->getActionForward('atom'))
-                $oModuleController->insertActionForward('rss', 'view', 'atom');
-
-            // 2007. 10. 18 서비스형 모듈의 추가 설정에 참여하기 위한 trigger 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) 
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
-
-            // 2007. 10. 19 출력하기 전에 rss url을 세팅하는 트리거 호출
-            if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) 
-                $oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
-            if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
-                $oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  rss
+     * @author NHN (developers@xpressengine.com)
+     * @brief The view class of the rss module
+     **/
+
+    class rss extends ModuleObject {
+
+        /**
+         * @brief Additional tasks required to accomplish during the installation
+         **/
+        function moduleInstall() {
+            // Register in action forward
+            $oModuleController = &getController('module');
+
+            $oModuleController->insertActionForward('rss', 'view', 'rss');
+            $oModuleController->insertActionForward('rss', 'view', 'atom');
+            // 2007.10.18 Add a trigger for participating additional configurations of the service module
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
+            // 2007. 10. 19 Call the trigger to set RSS URL before outputing
+            $oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
+
+            return new Object();
+        }
+
+        /**
+         * @brief A method to check if the installation has been successful
+         **/
+        function checkUpdate() {
+            $oModuleModel = &getModel('module');
+            // Add the Action forward for atom
+            if(!$oModuleModel->getActionForward('atom')) return true;
+            // 2007. 10. Add a trigger for participating additional configurations of the service module
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) return true;
+            // 2007. 10. 19 Call the trigger to set RSS URL before outputing
+            if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) return true;
+
+            if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // Add atom act
+            if(!$oModuleModel->getActionForward('atom'))
+                $oModuleController->insertActionForward('rss', 'view', 'atom');
+            // 2007. 10. An additional set of 18 to participate in a service module, add a trigger
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before')) 
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'rss', 'view', 'triggerDispRssAdditionSetup', 'before');
+            // 2007. 10. 19 outputs the trigger before you call to set up rss url
+            if(!$oModuleModel->getTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after')) 
+                $oModuleController->insertTrigger('moduleHandler.proc', 'rss', 'controller', 'triggerRssUrlInsert', 'after');
+            if($oModuleModel->getTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before'))
+                $oModuleController->deleteTrigger('display', 'rss', 'controller', 'triggerRssUrlInsert', 'before');
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+
+    }
+?>
diff --git a/modules/rss/rss.controller.php b/modules/rss/rss.controller.php
index 2ef6aff91..260a0e1b9 100644
--- a/modules/rss/rss.controller.php
+++ b/modules/rss/rss.controller.php
@@ -1,58 +1,57 @@
-<?php
-    /**
-     * @class  rssController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  rss module의 controller class
-     *
-     * Feed 로 문서 출력
-     *
-     **/
-
-    class rssController extends rss {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief RSS 사용 유무를 체크하여 rss url 추가
-         **/
-        function triggerRssUrlInsert() {
-            $oModuleModel = &getModel('module');
-            $total_config = $oModuleModel->getModuleConfig('rss');
-            $current_module_srl = Context::get('module_srl');
-            $site_module_info = Context::get('site_module_info');
-
-            if(!$current_module_srl) {
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-            }
-
-            if(!$current_module_srl) return new Object();
-
-            // 선택된 모듈의 rss설정을 가져옴
-            $oRssModel = &getModel('rss');
-            $rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
-
-            if($rss_config->open_rss != 'N') {
-                Context::set('rss_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'rss'));
-                Context::set('atom_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'atom'));
-            }
-
-            if(Context::isInstalled() && $site_module_info->mid == Context::get('mid') && $total_config->use_total_feed != 'N') {
-                if(Context::isAllowRewrite() && !Context::get('vid')) {
-                    $request_uri = Context::getRequestUri();
-                    Context::set('general_rss_url', $request_uri.'rss');
-                    Context::set('general_atom_url', $request_uri.'atom');
-                } else {
-                    Context::set('general_rss_url', getUrl('','module','rss','act','rss'));
-                    Context::set('general_atom_url', getUrl('','module','rss','act','atom'));
-                }
-            }
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  rssController
+     * @author NHN (developers@xpressengine.com)
+     * @brief rss module of the controller class
+     *
+     * Feed the document output
+     *
+     **/
+
+    class rssController extends rss {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Check whether to use RSS rss url by adding
+         **/
+        function triggerRssUrlInsert() {
+            $oModuleModel = &getModel('module');
+            $total_config = $oModuleModel->getModuleConfig('rss');
+            $current_module_srl = Context::get('module_srl');
+            $site_module_info = Context::get('site_module_info');
+
+            if(!$current_module_srl) {
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+            }
+
+            if(!$current_module_srl) return new Object();
+            // Imported rss settings of the selected module
+            $oRssModel = &getModel('rss');
+            $rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
+
+            if($rss_config->open_rss != 'N') {
+                Context::set('rss_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'rss'));
+                Context::set('atom_url', $oRssModel->getModuleFeedUrl(Context::get('vid'), Context::get('mid'), 'atom'));
+            }
+
+            if(Context::isInstalled() && $site_module_info->mid == Context::get('mid') && $total_config->use_total_feed != 'N') {
+                if(Context::isAllowRewrite() && !Context::get('vid')) {
+                    $request_uri = Context::getRequestUri();
+                    Context::set('general_rss_url', $request_uri.'rss');
+                    Context::set('general_atom_url', $request_uri.'atom');
+                } else {
+                    Context::set('general_rss_url', getUrl('','module','rss','act','rss'));
+                    Context::set('general_atom_url', getUrl('','module','rss','act','atom'));
+                }
+            }
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/rss/rss.model.php b/modules/rss/rss.model.php
index ee669f9f6..f282eb178 100644
--- a/modules/rss/rss.model.php
+++ b/modules/rss/rss.model.php
@@ -1,44 +1,44 @@
-<?php
-    /**
-     * @class  rssModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  rss module의 model class
-     *
-     * Feed 문서 출력
-     *
-     **/
-
-    class rssModel extends rss {
-        /**
-         * @brief Feed url 생성.
-         **/
-        function getModuleFeedUrl($vid = null, $mid, $format) {
-            if(Context::isAllowRewrite()) {
-                $request_uri = Context::getRequestUri();
-                // 가상 사이트 변수가 있고 이 변수가 mid와 다를때. (vid와 mid는 같을 수 없다고 함)
-                if($vid && $vid != $mid) {
-                    return $request_uri.$vid.'/'.$mid.'/'.$format;
-                }
-                else {
-                    return $request_uri.$mid.'/'.$format;
-                }
-            }
-            else {
-                return getUrl('','mid',$mid,'act',$format);
-            }
-        }
-
-
-        /**
-         * @brief 특정 모듈의 rss 설정을 return
-         **/
-        function getRssModuleConfig($module_srl) {
-            // rss 모듈의 config를 가져옴
-            $oModuleModel = &getModel('module');
-            $module_rss_config = $oModuleModel->getModulePartConfig('rss', $module_srl);
-            if(!$module_rss_config) $module_rss_config->open_rss = 'N';
-            $module_rss_config->module_srl = $module_srl;
-            return $module_rss_config;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  rssModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief The model class of the rss module
+     *
+     * Feed the document output
+     *
+     **/
+
+    class rssModel extends rss {
+        /**
+         * @brief Create the Feed url.
+         **/
+        function getModuleFeedUrl($vid = null, $mid, $format) {
+            if(Context::isAllowRewrite()) {
+                $request_uri = Context::getRequestUri();
+                // If the virtual site variable exists and it is different from mid (vid and mid should not be the same)
+                if($vid && $vid != $mid) {
+                    return $request_uri.$vid.'/'.$mid.'/'.$format;
+                }
+                else {
+                    return $request_uri.$mid.'/'.$format;
+                }
+            }
+            else {
+                return getUrl('','mid',$mid,'act',$format);
+            }
+        }
+
+
+        /**
+         * @brief Return the RSS configurations of the specific modules
+         **/
+        function getRssModuleConfig($module_srl) {
+            // Get the configurations of the rss module
+            $oModuleModel = &getModel('module');
+            $module_rss_config = $oModuleModel->getModulePartConfig('rss', $module_srl);
+            if(!$module_rss_config) $module_rss_config->open_rss = 'N';
+            $module_rss_config->module_srl = $module_srl;
+            return $module_rss_config;
+        }
+    }
+?>
diff --git a/modules/rss/rss.view.php b/modules/rss/rss.view.php
index 32894558e..eac03b4f3 100644
--- a/modules/rss/rss.view.php
+++ b/modules/rss/rss.view.php
@@ -1,234 +1,225 @@
-<?php
-    /**
-     * @class  rssView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  rss module의 view class
-     *
-     * Feed 문서 출력
-     *
-     **/
-
-    class rssView extends rss {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 피드 출력
-         * 직접 RSS를 출력하려고 할때에는 $oRssView->rss($document_list)를 통해서 결과값을 직접 지정 가능
-         **/
-        function rss($document_list = null, $rss_title = null, $add_description = null) {
-            $oDocumentModel = &getModel('document');
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 다른 모듈에서 method로 호출되는 것이 아니라면 현재 요청된 모듈을 대상으로 글과 정보를 구함
-            if(!$document_list) {
-                $site_module_info = Context::get('site_module_info');
-                $site_srl = $site_module_info->site_srl;
-                $mid = Context::get('mid'); ///< 대상 모듈 id, 없으면 전체로
-                $start_date = (int)Context::get('start_date');
-                $end_date = (int)Context::get('end_date');
-
-                $module_srls = array();
-                $rss_config = array();
-                $total_config = '';
-                $total_config = $oModuleModel->getModuleConfig('rss');
-
-                // 하나의 mid가 지정되어 있으면 그 mid에 대한 것만 추출
-                if($mid) {
-                    $module_srl = $this->module_info->module_srl;
-                    $config = $oModuleModel->getModulePartConfig('rss', $module_srl);
-                    if($config->open_rss && $config->open_rss != 'N') {
-                       $module_srls[] = $module_srl; 
-                       $open_rss_config[$module_srl] = $config->open_rss;
-                    }
-
-                // mid 가 선택되어 있지 않으면 전체
-                } else {
-                    if($total_config->use_total_feed != 'N') {
-                        $rss_config = $oModuleModel->getModulePartConfigs('rss', $site_srl);
-                        if($rss_config) {
-                            foreach($rss_config as $module_srl => $config) {
-                                if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N') {
-                                    $module_srls[] = $module_srl;
-                                    $open_rss_config[$module_srl] = $config->open_rss;
-                                }
-                            }
-                        }
-                    }
-                }
-
-                if(!count($module_srls) && !$add_description) return $this->dispError();
-
-                if($module_srls) {
-                    $args->module_srl = implode(',',$module_srls);
-                    $module_list = $oModuleModel->getMidList($args);
-
-                    $args->search_target = 'is_secret';
-                    $args->search_keyword = 'N';
-                    $args->page = (int)Context::get('page');
-                    $args->list_count = 15;
-                    if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
-                    if(!$args->page || $args->page < 1) $args->page = 1;
-                    if($start_date || $start_date != 0) $args->start_date = $start_date;
-                    if($end_date || $end_date != 0) $args->end_date = $end_date;
-                    if($start_date == 0) unset($start_date);
-                    if($end_date == 0) unset($end_date);
-
-                    $args->sort_index = 'list_order'; 
-                    $args->order_type = 'asc';
-                    $output = $oDocumentModel->getDocumentList($args);
-                    $document_list = $output->data;
-
-                    // 피드 제목 및 정보등을 추출 Context::getBrowserTitle 
-                    if($mid) {
-                        $info->title = Context::getBrowserTitle();
-                        $oModuleController->replaceDefinedLangCode($info->title);
-
-                        $info->title = str_replace('\'', '&apos;',$info->title);
-                        if($config->feed_description) {
-                            $info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description));
-                        }
-                        else {
-                            $info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description));
-                        }
-                        $info->link = getUrl('','mid',$mid);
-                        $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($feed_config->feed_copyright));
-                        if(!$info->feed_copyright) {
-                            $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright));
-                        }
-                    }
-                }
-            }
-
-            if(!$info->title) {
-                if($rss_title) $info->title = $rss_title;
-                else if($total_config->feed_title) $info->title = $total_config->feed_title;
-                else {
-                    $site_module_info = Context::get('site_module_info');
-                    $info->title = $site_module_info->browser_title;
-                }
-
-                $oModuleController->replaceDefinedLangCode($info->title);
-                $info->title = str_replace('\'', '&apos;', htmlspecialchars($info->title));
-                $info->description = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_description));
-                $info->link = Context::getRequestUri();
-                $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright));
-            }
-            if($add_description) $info->description .= "\r\n".$add_description;
-
-            if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image));
-            switch (Context::get('format')) {
-                case 'atom':
-                    $info->date = date('Y-m-d\TH:i:sP');
-                    if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
-                    else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
-                    break;
-                case 'rss1.0':
-                    $info->date = date('Y-m-d\TH:i:sP');
-                    break;
-                default:
-                    $info->date = date("D, d M Y H:i:s").' '.$GLOBALS['_time_zone'];
-                    break;
-            }
-
-            if($_SERVER['HTTPS']=='on') $proctcl = 'https://';
-            else $proctcl = 'http://';
-
-            $temp_link = explode('/', $info->link);
-            if($temp_link[0]=='' && $info->link) {
-                $info->link = $proctcl.$_SERVER['HTTP_HOST'].$info->link;
-            }
-
-            $temp_id = explode('/', $info->id);
-            if($temp_id[0]=='' && $info->id) {
-                $info->id = $proctcl.$_SERVER['HTTP_HOST'].$info->id;
-            }
-
-            $info->language = Context::getLangType();
-
-            // RSS 출력물에서 사용될 변수 세팅
-            Context::set('info', $info);
-            Context::set('feed_config', $config);
-            Context::set('open_rss_config', $open_rss_config);
-            Context::set('document_list', $document_list);
-
-            // 결과 출력을 XMLRPC로 강제 지정
-            Context::setResponseMethod("XMLRPC");
-
-            // 결과물을 얻어와서 에디터 컴포넌트등의 전처리 기능을 수행시킴
-            $path = $this->module_path.'tpl/';
-            //if($args->start_date || $args->end_date) $file = 'xe_rss';
-            //else $file = 'rss20';
-            switch (Context::get('format')) {
-                case 'xe':
-                    $file = 'xe_rss';
-                    break;
-                case 'atom':
-                    $file = 'atom10';
-                    break;
-                case 'rss1.0':
-                    $file = 'rss10';
-                    break;
-                default:
-                    $file = 'rss20';
-                    break;
-            }
-
-            $oTemplate = new TemplateHandler();
-
-            $content = $oTemplate->compile($path, $file);
-            Context::set('content', $content);
-
-            // 템플릿 파일 지정
-            $this->setTemplatePath($path);
-            $this->setTemplateFile('display');
-        }
-
-        /** @brief ATOM 출력 **/
-        function atom() {
-            Context::set('format', 'atom');
-            $this->rss();
-        }
-
-        /**
-         * @brief 에러 출력
-         **/
-        function dispError() {
-            // 출력 메세지 작성
-            $this->rss(null, null, Context::getLang('msg_rss_is_disabled') );
-        }
-
-        /**
-         * @brief 서비스형 모듈의 추가 설정을 위한 부분
-         * rss의 사용 형태에 대한 설정만 받음
-         **/
-        function triggerDispRssAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                // 선택된 모듈의 정보를 가져옴
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            // 선택된 모듈의 rss설정을 가져옴
-            $oRssModel = &getModel('rss');
-            $rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
-            Context::set('rss_config', $rss_config);
-
-            // 템플릿 파일 지정
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'rss_module_config');
-            $obj .= $tpl;
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  rssView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The view class of the rss module
+     *
+     * Feed the document output
+     *
+     **/
+
+    class rssView extends rss {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Feed output
+         * When trying to directly print out the RSS, the results variable can be directly specified through $oRssView->rss($document_list)
+         **/
+        function rss($document_list = null, $rss_title = null, $add_description = null) {
+            $oDocumentModel = &getModel('document');
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // Get the content and information for the current requested module if the method is not called from another module
+            if(!$document_list) {
+                $site_module_info = Context::get('site_module_info');
+                $site_srl = $site_module_info->site_srl;
+                $mid = Context::get('mid'); // The target module id, if absent, then all
+                $start_date = (int)Context::get('start_date');
+                $end_date = (int)Context::get('end_date');
+
+                $module_srls = array();
+                $rss_config = array();
+                $total_config = '';
+                $total_config = $oModuleModel->getModuleConfig('rss');
+                // If one is specified, extract only for this mid
+                if($mid) {
+                    $module_srl = $this->module_info->module_srl;
+                    $config = $oModuleModel->getModulePartConfig('rss', $module_srl);
+                    if($config->open_rss && $config->open_rss != 'N') {
+                       $module_srls[] = $module_srl; 
+                       $open_rss_config[$module_srl] = $config->open_rss;
+                    }
+                // If mid is not selected, then get all
+                } else {
+                    if($total_config->use_total_feed != 'N') {
+                        $rss_config = $oModuleModel->getModulePartConfigs('rss', $site_srl);
+                        if($rss_config) {
+                            foreach($rss_config as $module_srl => $config) {
+                                if($config && $config->open_rss != 'N' && $config->open_total_feed != 'T_N') {
+                                    $module_srls[] = $module_srl;
+                                    $open_rss_config[$module_srl] = $config->open_rss;
+                                }
+                            }
+                        }
+                    }
+                }
+
+                if(!count($module_srls) && !$add_description) return $this->dispError();
+
+                if($module_srls) {
+                    $args->module_srl = implode(',',$module_srls);
+                    //$module_list = $oModuleModel->getMidList($args);	//perhaps module_list varialbles not use
+
+                    $args->search_target = 'is_secret';
+                    $args->search_keyword = 'N';
+                    $args->page = (int)Context::get('page');
+                    $args->list_count = 15;
+                    if($total_config->feed_document_count) $args->list_count = $total_config->feed_document_count;
+                    if(!$args->page || $args->page < 1) $args->page = 1;
+                    if($start_date || $start_date != 0) $args->start_date = $start_date;
+                    if($end_date || $end_date != 0) $args->end_date = $end_date;
+                    if($start_date == 0) unset($start_date);
+                    if($end_date == 0) unset($end_date);
+
+                    $args->sort_index = 'list_order'; 
+                    $args->order_type = 'asc';
+                    $output = $oDocumentModel->getDocumentList($args);
+                    $document_list = $output->data;
+                    // Extract the feed title and information with Context::getBrowserTitle
+                    if($mid) {
+                        $info->title = Context::getBrowserTitle();
+                        $oModuleController->replaceDefinedLangCode($info->title);
+
+                        $info->title = str_replace('\'', '&apos;',$info->title);
+                        if($config->feed_description) {
+                            $info->description = str_replace('\'', '&apos;', htmlspecialchars($config->feed_description));
+                        }
+                        else {
+                            $info->description = str_replace('\'', '&apos;', htmlspecialchars($this->module_info->description));
+                        }
+                        $info->link = getUrl('','mid',$mid);
+                        $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($feed_config->feed_copyright));
+                        if(!$info->feed_copyright) {
+                            $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright));
+                        }
+                    }
+                }
+            }
+
+            if(!$info->title) {
+                if($rss_title) $info->title = $rss_title;
+                else if($total_config->feed_title) $info->title = $total_config->feed_title;
+                else {
+                    $site_module_info = Context::get('site_module_info');
+                    $info->title = $site_module_info->browser_title;
+                }
+
+                $oModuleController->replaceDefinedLangCode($info->title);
+                $info->title = str_replace('\'', '&apos;', htmlspecialchars($info->title));
+                $info->description = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_description));
+                $info->link = Context::getRequestUri();
+                $info->feed_copyright = str_replace('\'', '&apos;', htmlspecialchars($total_config->feed_copyright));
+            }
+            if($add_description) $info->description .= "\r\n".$add_description;
+
+            if($total_config->image) $info->image = Context::getRequestUri().str_replace('\'', '&apos;', htmlspecialchars($total_config->image));
+            switch (Context::get('format')) {
+                case 'atom':
+                    $info->date = date('Y-m-d\TH:i:sP');
+                    if($mid) { $info->id = getUrl('','mid',$mid,'act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+                    else { $info->id = getUrl('','module','rss','act','atom','page',Context::get('page'),'start_date',Context::get('start_date'),'end_date',Context::get('end_date')); }
+                    break;
+                case 'rss1.0':
+                    $info->date = date('Y-m-d\TH:i:sP');
+                    break;
+                default:
+                    $info->date = date("D, d M Y H:i:s").' '.$GLOBALS['_time_zone'];
+                    break;
+            }
+
+            if($_SERVER['HTTPS']=='on') $proctcl = 'https://';
+            else $proctcl = 'http://';
+
+            $temp_link = explode('/', $info->link);
+            if($temp_link[0]=='' && $info->link) {
+                $info->link = $proctcl.$_SERVER['HTTP_HOST'].$info->link;
+            }
+
+            $temp_id = explode('/', $info->id);
+            if($temp_id[0]=='' && $info->id) {
+                $info->id = $proctcl.$_SERVER['HTTP_HOST'].$info->id;
+            }
+
+            $info->language = Context::getLangType();
+            // Set the variables used in the RSS output
+            Context::set('info', $info);
+            Context::set('feed_config', $config);
+            Context::set('open_rss_config', $open_rss_config);
+            Context::set('document_list', $document_list);
+            // Force the result output to be of XMLRPC
+            Context::setResponseMethod("XMLRPC");
+            // Perform the preprocessing function of the editor component as the results are obtained
+            $path = $this->module_path.'tpl/';
+            //if($args->start_date || $args->end_date) $file = 'xe_rss';
+            //else $file = 'rss20';
+            switch (Context::get('format')) {
+                case 'xe':
+                    $file = 'xe_rss';
+                    break;
+                case 'atom':
+                    $file = 'atom10';
+                    break;
+                case 'rss1.0':
+                    $file = 'rss10';
+                    break;
+                default:
+                    $file = 'rss20';
+                    break;
+            }
+
+            $oTemplate = new TemplateHandler();
+
+            $content = $oTemplate->compile($path, $file);
+            Context::set('content', $content);
+            // Set the template file
+            $this->setTemplatePath($path);
+            $this->setTemplateFile('display');
+        }
+        /**
+         * @brief ATOM output
+         **/
+        function atom() {
+            Context::set('format', 'atom');
+            $this->rss();
+        }
+
+        /**
+         * @brief Error output
+         **/
+        function dispError() {
+            // Prepare the output message
+            $this->rss(null, null, Context::getLang('msg_rss_is_disabled') );
+        }
+
+        /**
+         * @brief Additional configurations for a service module
+         * Receive the form for the form used by rss
+         **/
+        function triggerDispRssAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // Get information of the selected module
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+            // Get teh RSS configurations for the selected module
+            $oRssModel = &getModel('rss');
+            $rss_config = $oRssModel->getRssModuleConfig($current_module_srl);
+            Context::set('rss_config', $rss_config);
+            // Set the template file
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'rss_module_config');
+            $obj .= $tpl;
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/rss/ruleset/insertRssConfig.xml b/modules/rss/ruleset/insertRssConfig.xml
new file mode 100644
index 000000000..f6b1fd52a
--- /dev/null
+++ b/modules/rss/ruleset/insertRssConfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="boolean" type="enum" test="Y,N" />
+    </customrules>
+    <fields>
+		<field name="module" required="true" default="rss" />
+		<field name="act" required="true" default="procRssAdminInsertConfig" />
+		<field name="use_total_feed" required="true" default="Y" rule="boolean" />
+		<field name="feed_title" required="true" />
+		<field name="feed_document_count" required="true" rule="number" default="15" />
+    </fields>
+</ruleset>
diff --git a/modules/rss/ruleset/insertRssModuleConfig.xml b/modules/rss/ruleset/insertRssModuleConfig.xml
new file mode 100644
index 000000000..45f2488a2
--- /dev/null
+++ b/modules/rss/ruleset/insertRssModuleConfig.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="open_type" type="enum" test="Y,N,H" />
+		<rule name="total_type" type="enum" test="N,T_N" />
+    </customrules>
+    <fields>
+		<field name="act" required="true" default="procRssAdminInsertModuleConfig" />
+		<field name="target_module_srl" required="true" />
+		<field name="open_rss" required="true" rule="open_type" default="Y" />
+		<field name="open_total_feed" required="true" rule="total_type" default="N" />
+    </fields>
+</ruleset>
diff --git a/modules/rss/tpl/atom10.html b/modules/rss/tpl/atom10.html
index 2ebf22df5..86eac9580 100644
--- a/modules/rss/tpl/atom10.html
+++ b/modules/rss/tpl/atom10.html
@@ -1,37 +1,37 @@
-{'<?xml version="1.0" encoding="UTF-8" ?>'}
-
-<feed xmlns="http://www.w3.org/2005/Atom">
-   <title type="text">{$info->title}</title>
-   <!--@if($info->description)-->
-   <subtitle type="html">{str_replace('\'', '&apos;', htmlspecialchars($info->description))}</subtitle>
-   <!--@end-->
-   <updated>{$info->date}</updated>
-   <id>{$info->id}</id>
-   <link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
-   <link rel="self" type="application/atom+xml" href="{$info->id}"/>
-   <generator uri="http://www.xpressengine.com/" version="{__ZBXE_VERSION__}">XpressEngine</generator>
-<!--@foreach($document_list as $oDocument)-->   <entry>
-      <title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText()))}</title>
-      <id>{$oDocument->getPermanentUrl()}</id>
-      <published>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</published>
-      <updated>{zdate($oDocument->get('last_update'),'Y-m-d\TH:i:sP')}</updated>
-      <link rel="alternate" type="text/html" href="{$oDocument->getPermanentUrl()}"/>
-      <link rel="replies" type="text/html" href="{$oDocument->getPermanentUrl()}#comment"/>
-      <author>
-         <name>{str_replace('\'', '&apos;',$oDocument->getNickName())}</name>
-         <!--@if($oDocument->isExistsHomepage())-->
-         <uri>{$oDocument->getHomepageUrl()}</uri>
-         <!--@end-->
-      </author>
-      <!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
-      <content type="html">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true)))}</content>
-      <!--@else-->
-      <summary type="text">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100)))}</summary>
-      <!--@end-->
-      <!--@foreach($oDocument->get('tag_list') as $tag)-->
-      <category term="{str_replace('\'', '&apos;', htmlspecialchars($tag))}"/>
-      <!--@end-->
-      
-   </entry>
-<!--@end-->
-</feed> 
+{'<?xml version="1.0" encoding="UTF-8" ?>'}
+
+<feed xmlns="http://www.w3.org/2005/Atom">
+   <title type="text">{$info->title}</title>
+   <!--@if($info->description)-->
+   <subtitle type="html">{str_replace('\'', '&apos;', htmlspecialchars($info->description))}</subtitle>
+   <!--@end-->
+   <updated>{$info->date}</updated>
+   <id>{$info->id}</id>
+   <link rel="alternate" type="text/html" hreflang="{$info->language}" href="{$info->link}"/>
+   <link rel="self" type="application/atom+xml" href="{$info->id}"/>
+   <generator uri="http://www.xpressengine.com/" version="{__ZBXE_VERSION__}">XpressEngine</generator>
+<!--@foreach($document_list as $oDocument)-->   <entry>
+      <title>{str_replace('\'', '&apos;',htmlspecialchars($oDocument->getTitleText()))}</title>
+      <id>{$oDocument->getPermanentUrl()}</id>
+      <published>{$oDocument->getRegdate('Y-m-d\TH:i:sP')}</published>
+      <updated>{zdate($oDocument->get('last_update'),'Y-m-d\TH:i:sP')}</updated>
+      <link rel="alternate" type="text/html" href="{$oDocument->getPermanentUrl()}"/>
+      <link rel="replies" type="text/html" href="{$oDocument->getPermanentUrl()}#comment"/>
+      <author>
+         <name>{str_replace('\'', '&apos;',$oDocument->getNickName())}</name>
+         <!--@if($oDocument->isExistsHomepage())-->
+         <uri>{$oDocument->getHomepageUrl()}</uri>
+         <!--@end-->
+      </author>
+      <!--@if($open_rss_config[$oDocument->get('module_srl')]=='Y')-->
+      <content type="html">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getTransContent(false,false,true)))}</content>
+      <!--@else-->
+      <summary type="text">{str_replace('\'', '&apos;', htmlspecialchars($oDocument->getContentText(100)))}</summary>
+      <!--@end-->
+      <!--@foreach($oDocument->get('tag_list') as $tag)-->
+      <category term="{str_replace('\'', '&apos;', htmlspecialchars($tag))}"/>
+      <!--@end-->
+      
+   </entry>
+<!--@end-->
+</feed> 
diff --git a/modules/rss/tpl/js/rss.js b/modules/rss/tpl/js/rss.js
index 10f2b3e50..92041982d 100644
--- a/modules/rss/tpl/js/rss.js
+++ b/modules/rss/tpl/js/rss.js
@@ -1,17 +1,17 @@
-
-function doToggleRss(module_srl) {
-  var params = new Array();
-  params['module_srl'] = module_srl;
-
-  var response_tags = new Array('error','message','module_srl','open_total_feed');
-  exec_xml('rss','procRssAdminToggleActivate',params, doChangeIcon ,response_tags );
-}
-
-function doChangeIcon(ret_obj, response_tags) {
-  var obj = document.getElementById('dotogglerss_'+ret_obj['module_srl']);
-  if(ret_obj['open_total_feed'] == 'T_N') {
-    obj.className = "buttonSet buttonDisable";
-  } else {
-    obj.className = "buttonSet buttonActive"; 
-  }
-}
\ No newline at end of file
+
+function doToggleRss(module_srl) {
+  var params = new Array();
+  params['module_srl'] = module_srl;
+
+  var response_tags = new Array('error','message','module_srl','open_total_feed');
+  exec_xml('rss','procRssAdminToggleActivate',params, doChangeIcon ,response_tags );
+}
+
+function doChangeIcon(ret_obj, response_tags) {
+  var obj = document.getElementById('dotogglerss_'+ret_obj['module_srl']);
+  if(ret_obj['open_total_feed'] == 'T_N') {
+    obj.className = "buttonSet buttonDisable";
+  } else {
+    obj.className = "buttonSet buttonActive"; 
+  }
+}
diff --git a/modules/rss/tpl/rss_admin_index.html b/modules/rss/tpl/rss_admin_index.html
index e544e575a..2100ecc6a 100644
--- a/modules/rss/tpl/rss_admin_index.html
+++ b/modules/rss/tpl/rss_admin_index.html
@@ -1,83 +1,92 @@
-<!--%import("js/rss.js")-->
-<h3 class="xeAdmin">{$lang->total_feed} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<!--%import("filter/insert_rss_config.xml")-->
-<form id="fo_layout" action="./" method="post" enctype="multipart/form-data" target="hidden_iframe">
-    <input type="hidden" name="module" value="rss" />
-    <input type="hidden" name="act" value="procRssAdminInsertConfig" />
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->total_feed}</div></th>
-        <td class="wide">
-            <select name="use_total_feed" class="w200">
-                <option value="Y" <!--@if(!$total_config->use_total_feed || $total_config->use_total_feed == 'Y')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="N" <!--@if($total_config->use_total_feed == 'N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->title}</div></th>
-        <td class="wide">
-            <input type="text" class="inputTypeText" name="feed_title" value="{$total_config->feed_title}" />
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td class="wide">
-            <textarea name="feed_description" class="inputTypeTextArea">{$total_config->feed_description}</textarea>
-        </td>
-    </tr>
-    <tr>
-    <th scope="row"><div>{$lang->feed_image}</div></th>
-        <td class="wide">
-            <!--@if($total_config->image)-->
-            <div>
-                <img src="../../../{$total_config->image}" alt="image" /><br />
-                <input type="checkbox" name="del_image" value="Y" id="del_image" class="checkbox" />
-                <label for="del_image">{$lang->cmd_delete}</label>
-            </div>
-            <!--@end-->
-            <input type="file" name="image" value="" />
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->feed_copyright}</div></th>
-        <td class="wide">
-            <input type="text" class="inputTypeText" name="feed_copyright" value="{$total_config->feed_copyright}" />
-            <p>{$lang->about_feed_copyright}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->feed_document_count}</div></th>
-        <td class="wide">
-            <input type="text" class="inputTypeText" name="feed_document_count" value="{$total_config->feed_document_count}" />
-            <p>{$lang->about_feed_document_count}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th class="button" colspan="2"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span></th>
-    </tr>
-    </table>
-</form>
-
-<h3 class="xeAdmin">{$lang->feed} <span class="gray">{$lang->cmd_management}</span></h3>
-<table cellspacing="0" class="crossTable">
-    <thead>
-	      <tr>
-		        <th scope="col">{$lang->mid}</td>
-		        <th scope="col">{$lang->open_rss}</td>
-		        <th scope="col">{$lang->open_feed_to_total}</td>
-	      </tr>
-	  </thead>
-	  <tbody>
-	  <!--@foreach($feed_config as $module_srl => $config)-->
-	      <tr>
-		        <th><!--@if($config['url'])--><a href="{$config['url']}"><!--@endif-->{$config['mid']}<!--@if($config['url'])--></a><!--@endif--></th>
-		        <td>{$lang->open_rss_types[$config['open_feed']]}</td>
-		        <td><a id="dotogglerss_{$module_srl}" onclick="doToggleRss('{$module_srl}')" <!--@if($config['open_total_feed'] == 'T_N')-->class="buttonSet buttonDisable"><span>{$lang->notuse}<!--@else-->class="buttonSet buttonActive"><span>{$lang->use}<!--@end--></span></a></td>
-	      </tr>
-    <!--@end-->
-    </tbody>
-</table>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
\ No newline at end of file
+<load target="js/rss.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<h1 class="h1">RSS</h1>
+<form ruleset="insertRssConfig" id="fo_layout" action="./" method="post" enctype="multipart/form-data" class="form">
+	<input type="hidden" name="module" value="rss" />
+	<input type="hidden" name="act" value="procRssAdminInsertConfig" />
+	<h2 class="h2">{$lang->total_feed} {$lang->cmd_management}</h2>
+	<ul>
+		<li>
+			<p class="q">{$lang->total_feed}</p>
+			<p class="a">
+				<input type="radio" name="use_total_feed" value="Y" id="use_total_feed_yes"  <!--@if(!$total_config->use_total_feed || $total_config->use_total_feed == 'Y')-->checked="checked"<!--@end--> /> <label for="use_total_feed_yes">{$lang->use}(<a href="{getFullSiteUrl()}rss">{getFullSiteUrl()}rss</a>)</label>
+				<input type="radio" name="use_total_feed" value="N" id="use_total_feed_no" <!--@if($total_config->use_total_feed == 'N')-->checked="checked"<!--@end--> /> <label for="use_total_feed_no">{$lang->notuse}</label>
+			</p>
+		</li>
+		<li>
+			<p class="q"><label for="feed_title">{$lang->title}</label></p>
+			<p class="a"><input type="text" name="feed_title" value="{htmlspecialchars($total_config->feed_title)}" id="feed_title" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="feed_description">{$lang->description}</label></p>
+			<p class="a"><textarea name="feed_description" id="feed_description" cols="42" rows="5">{$total_config->feed_description}</textarea></p>
+		</li>
+		<li>
+			<p class="q"><label for="image">{$lang->feed_image}</label></p>
+			<!--@if($total_config->image)-->
+			<p class="a">
+				<img src="../../../{$total_config->image}" alt="image" />
+				<input type="checkbox" name="del_image" value="Y" id="del_image" />
+				<label for="del_image">{$lang->cmd_delete}</label>
+			</p>
+			<!--@end-->
+			<p class="a"><input type="file" name="image" value="" id="image" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="feed_copyright">{$lang->feed_copyright}</label></p>
+			<p class="a"><input type="text" name="feed_copyright" value="{htmlspecialchars($total_config->feed_copyright)}" id="feed_copyright" /></p>
+		</li>
+		<li>
+			<p class="q"><label for="feed_document_count">{$lang->feed_document_count}</label></p>
+			<p class="a"><input type="text" name="feed_document_count" value="{$total_config->feed_document_count}" id="feed_document_count" /></p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn small"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
+</form>
+<form action="" class="form">
+	<h2 class="h2">{$lang->feed} {$lang->cmd_management}</h2>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<thead>
+				<tr>
+					<th scope="col">{$lang->mid}</th>
+					<th scope="col" class="title">{$lang->description}</th>
+					<th scope="col">{$lang->open_rss}</th>
+					<th scope="col">
+						<label for="feed_integration">{$lang->open_feed_to_total}</label>
+					</th>
+					<th scope="col">{$lang->cmd_save}</th>
+				</tr>
+			</thead>
+			<tbody>
+				<!--@foreach($feed_config AS $key=>$value)-->
+				<form ruleset="insertRssModuleConfig" action="./" method="post">
+				<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
+				<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
+				<input type="hidden" name="target_module_srl" value="{$key}" />
+				<tr>
+					<th scope="row"><!--@if($value['url'])--><a href="{$value['url']}" target="_blank"><!--@endif-->{$value['mid']}<!--@if($value['url'])--></a><!--@endif--></th>
+					<td class="title">{$value['feed_description']}</td>
+					<td>
+						<!--@foreach($lang->open_rss_types as $key2=>$value2)-->
+						<input type="radio" name="open_rss" value="{$key2}" id="feed_open_{$key2}" <!--@if($key2 == $value['open_feed'])-->checked="checked"<!--@end--> /><label for="feed_open_{$key2}">{$value2}</label>
+						<!--@end-->
+					</td>
+					<td>
+						<input type="radio" name="open_total_feed" value="N" id="open_total_feed_N" <!--@if($value['open_total_feed'] == 'N')-->checked="checked"<!--@end--> />
+						<label for="open_total_feed_N">{$lang->use}</label>
+						<input type="radio" name="open_total_feed" value="T_N" id="open_total_feed_T_N" <!--@if($value['open_total_feed'] == 'T_N')-->checked="checked"<!--@end--> />
+						<label for="open_total_feed_T_N">{$lang->notuse}</label>
+					</td>
+					<td><input type="submit" value="{$lang->cmd_save}" class="text" /></td>
+				</tr>
+				</form>
+				<!--@end-->
+			</tbody>
+		</table>
+	</div>
+</form>
diff --git a/modules/rss/tpl/rss_module_config.html b/modules/rss/tpl/rss_module_config.html
index e5bca1891..12030eb6c 100644
--- a/modules/rss/tpl/rss_module_config.html
+++ b/modules/rss/tpl/rss_module_config.html
@@ -1,47 +1,49 @@
-<!--%import("filter/insert_rss_module_config.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_rss_module_config)">
+<form ruleset="insertRssModuleConfig" action="./" method="post" class="form">
+<input type="hidden" name="module" value="rss" />
+<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
+<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 <input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
 
-    <h4 class="xeAdmin">{$lang->open_rss}</h4>
-    <p class="summary">{$lang->about_open_rss}</p>
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->open_rss}</div></th>
-        <td class="wide">
-            <select name="open_rss" class="w200">
-                <!--@foreach($lang->open_rss_types as $key=>$val)-->
-                <option value="{$key}" <!--@if(!$rss_config->open_rss && $key=='N')-->selected="selected"<!--@elseif($rss_config->open_rss==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->open_feed_to_total}</div></th>
-        <td class="wide">
-            <select name="open_total_feed" class="w200">
-                <option value="N" <!--@if(!$rss_config->open_total_feed || $rss_config->open_total_feed == 'N')-->selected="selected"<!--@end-->>{$lang->use}</option>
-                <option value="T_N" <!--@if($rss_config->open_total_feed == 'T_N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
-            </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td class="wide">
-            <textarea name="feed_description" class="inputTypeTextArea">{$rss_config->feed_description}</textarea>
-            <p>{$lang->about_feed_description}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->feed_copyright}</div></th>
-        <td class="wide">
-            <input type="text" class="inputTypeText" name="feed_copyright" value="{htmlspecialchars($rss_config->feed_copyright)}" />
-            <p>{$lang->about_feed_copyright}<br />{$lang->about_part_feed_copyright}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th class="button" colspan="2"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span></th>
-    </tr>
-    </table>
-
+    <h3 class="h3">{$lang->open_rss}</h3>
+    <p>{$lang->about_open_rss}</p>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row"><label for="open_rss">{$lang->open_rss}</label></th>
+				<td class="text">
+					<select name="open_rss" id="open_rss">
+						<!--@foreach($lang->open_rss_types as $key=>$val)-->
+						<option value="{$key}" <!--@if(!$rss_config->open_rss && $key=='N')-->selected="selected"<!--@elseif($rss_config->open_rss==$key)-->selected="selected"<!--@end-->>{$val}</option>
+						<!--@end-->
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="open_total_feed">{$lang->open_feed_to_total}</label></th>
+				<td class="text">
+					<select name="open_total_feed" id="open_total_feed">
+						<option value="N" <!--@if(!$rss_config->open_total_feed || $rss_config->open_total_feed == 'N')-->selected="selected"<!--@end-->>{$lang->use}</option>
+						<option value="T_N" <!--@if($rss_config->open_total_feed == 'T_N')-->selected="selected"<!--@end-->>{$lang->notuse}</option>
+					</select>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="feed_description">{$lang->description}</label></th>
+				<td class="text">
+					<textarea name="feed_description" id="feed_description">{$rss_config->feed_description}</textarea>
+					<p class="desc">{$lang->about_feed_description}</p>
+				</td>
+			</tr>
+			<tr>
+				<th scope="row"><label for="feed_copyright">{$lang->feed_copyright}</label></th>
+				<td class="text">
+					<input type="text"  name="feed_copyright" id="feed_copyright" value="{htmlspecialchars($rss_config->feed_copyright)}" />
+					<p class="desc">{$lang->about_feed_copyright}</p>
+				</td>
+			</tr>
+		</table>
+	</div>
+    <div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+	</div>
 </form>
diff --git a/modules/session/conf/info.xml b/modules/session/conf/info.xml
index f06d7acbe..5787cc377 100644
--- a/modules/session/conf/info.xml
+++ b/modules/session/conf/info.xml
@@ -1,50 +1,50 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">세션 관리자</title>
-    <title xml:lang="jp">セッション管理</title>
-    <title xml:lang="en">Session</title>
-    <title xml:lang="vi">Session</title>
-    <title xml:lang="zh-CN">会话管理</title>
-    <title xml:lang="zh-TW">SESSION管理</title>
-    <title xml:lang="tr">Oturum</title>
-    <description xml:lang="ko">
-        접속자의 세션을 관리하는 모듈입니다.
-        기본적인 세션 설정과 사용뿐 아니라 세션 정보를 이용하여 접속자등의 세션 기반의 정보를 제공하는 기능도 있습니다.
-    </description>
-    <description xml:lang="jp">
-        アクセスユーザのセッションを管理します。
-        基本的セッション設定はもちろん、セッション情報を利用してアクセスユーザなどのセッション基盤の情報を提供する機能も持っています。
-    </description>
-    <description xml:lang="en">
-        This module manages session data.
-        You will get not only session setting or using but also session-level data such as visitors by using session data.
-    </description>
-    <description xml:lang="tr">
-        Bu modül oturum verisini yönetir.
-        Siz sadece oturum ayarı veya kullanımı değil ayrıca oturum bilgilerini kullanan kullanıcıların oturum-seviyesi verilerini de elde edeceksiniz.
-    </description>
-    <description xml:lang="vi">Module này quản lý dữ liệu Session.
-        Bạn không phải chỉ duy nhất thiết lập Session hay sử dụng, Cấp độ của Session phụ thuộc vào lượng người truy cập trên Website của bạn.
-    </description>
-    <description xml:lang="zh-CN">
-        管理在线会员会话(session)功能的模块。
-        提供最基本的会话设置及使用，并且还可以获得基于会话功能的在线会员信息。
-    </description>
-    <description xml:lang="zh-TW">
-        管理線上會員SESSION功能的模組。
-        提供最基本的SESSION設置和使用，且還可以獲得此功能的線上會員資料。
-    </description>
-    <version>0.1</version>
-    <date>2008-06-18</date>
-    <category>system</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">세션 관리자</title>
+    <title xml:lang="jp">セッション管理</title>
+    <title xml:lang="en">Session</title>
+    <title xml:lang="vi">Session</title>
+    <title xml:lang="zh-CN">会话管理</title>
+    <title xml:lang="zh-TW">SESSION管理</title>
+    <title xml:lang="tr">Oturum</title>
+    <description xml:lang="ko">
+        접속자의 세션을 관리하는 모듈입니다.
+        기본적인 세션 설정과 사용뿐 아니라 세션 정보를 이용하여 접속자등의 세션 기반의 정보를 제공하는 기능도 있습니다.
+    </description>
+    <description xml:lang="jp">
+        アクセスユーザのセッションを管理します。
+        基本的セッション設定はもちろん、セッション情報を利用してアクセスユーザなどのセッション基盤の情報を提供する機能も持っています。
+    </description>
+    <description xml:lang="en">
+        This module manages session data.
+        It will allow you to get session setting, usage, and session-level data such as visitors.
+    </description>
+    <description xml:lang="tr">
+        Bu modül oturum verisini yönetir.
+        Siz sadece oturum ayarı veya kullanımı değil ayrıca oturum bilgilerini kullanan kullanıcıların oturum-seviyesi verilerini de elde edeceksiniz.
+    </description>
+    <description xml:lang="vi">Module này quản lý dữ liệu Session.
+        Bạn không phải chỉ duy nhất thiết lập Session hay sử dụng, Cấp độ của Session phụ thuộc vào lượng người truy cập trên Website của bạn.
+    </description>
+    <description xml:lang="zh-CN">
+        管理在线会员会话(session)功能的模块。
+        提供最基本的会话设置及使用，并且还可以获得基于会话功能的在线会员信息。
+    </description>
+    <description xml:lang="zh-TW">
+        管理線上會員SESSION功能的模組。
+        提供最基本的SESSION設置和使用，且還可以獲得此功能的線上會員資料。
+    </description>
+    <version>0.1</version>
+    <date>2008-06-18</date>
+    <category>system</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/session/lang/en.lang.php b/modules/session/lang/en.lang.php
deleted file mode 100644
index bbc9228a5..000000000
--- a/modules/session/lang/en.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Korean Language Pack (Basic Contents Only)
-     **/
-
-    $lang->session = 'Session';
-    $lang->about_session = "This module manages sessions\nFrequent session arrangement will provide better environment for your site.";
-
-    $lang->cmd_clear_session = 'Arrange Session';
-    $lang->session_cleared = 'Session data have been arranged succesfully';
-?>
diff --git a/modules/session/lang/fr.lang.php b/modules/session/lang/fr.lang.php
deleted file mode 100644
index d0d3ad35e..000000000
--- a/modules/session/lang/fr.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de la Session
-     **/
-
-    $lang->session = 'Session';
-    $lang->about_session = "Ce module administre les sessions\nL'arrangement fréquent des sessions pourvoira de meilleur environnement pour votre site Web.";
-
-    $lang->cmd_clear_session = 'Arranger la Session';
-    $lang->session_cleared = 'Les données de Session sont arrangées avec succès';
-?>
diff --git a/modules/session/lang/jp.lang.php b/modules/session/lang/jp.lang.php
deleted file mode 100644
index 4bf76e90d..000000000
--- a/modules/session/lang/jp.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    $lang->session = 'セッション';
-    $lang->about_session = "セッションを管理するモジュールです。\n定期的なセッションの整理はサイトパフォーマンスに効果的です。";
-
-    $lang->cmd_clear_session = 'セッション整理';
-    $lang->session_cleared = 'ごみセッションが整理されました。';
-?>
diff --git a/modules/session/lang/ko.lang.php b/modules/session/lang/ko.lang.php
deleted file mode 100644
index 379efb2c8..000000000
--- a/modules/session/lang/ko.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    $lang->session = '세션';
-    $lang->about_session = "세션 관리를 하는 모듈입니다.\n틈틈이 세션 정리를 하시면 사이트 운영에 보다 좋은 효과를 낼 수 있습니다.";
-
-    $lang->cmd_clear_session = '세션 정리';
-    $lang->session_cleared = '쓸모 없는 세션 정보가 정리되었습니다.';
-?>
diff --git a/modules/session/lang/lang.xml b/modules/session/lang/lang.xml
new file mode 100644
index 000000000..462cdaccb
--- /dev/null
+++ b/modules/session/lang/lang.xml
@@ -0,0 +1,49 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="session">
+		<value xml:lang="ko"><![CDATA[세션]]></value>
+		<value xml:lang="en"><![CDATA[Session]]></value>
+		<value xml:lang="jp"><![CDATA[セッション]]></value>
+		<value xml:lang="zh-CN"><![CDATA[会话]]></value>
+		<value xml:lang="zh-TW"><![CDATA[SESSION]]></value>
+		<value xml:lang="tr"><![CDATA[Oturum]]></value>
+	</item>
+	<item name="about_session">
+		<value xml:lang="ko"><![CDATA[세션 관리를 하는 모듈입니다.
+틈틈이 세션 정리를 하시면 사이트 운영에 보다 좋은 효과를 낼 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[This module manages sessions.
+Frequent session arrangement will provide a better environment for your site.]]></value>
+		<value xml:lang="jp"><![CDATA[セッションを管理するモジュールです。
+定期的なセッションの整理はサイトのパフォーマンスに効果的です。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[管理会话的模块。
+有时间清理无用会话，可提高网站效率。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[管理SESSION的模組。
+請定時清理SESSION，可提高網站效率。]]></value>
+		<value xml:lang="fr"><![CDATA[Ce module administre les sessions
+L'arrangement fréquent des sessions pourvoira de meilleur environnement pour votre site Web.]]></value>
+		<value xml:lang="tr"><![CDATA[Bu modül oturumları yönetir
+Alışılmış oturum düzenlemesi, sitenize daha iyi bir ortam sağlayacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Module này quản lý những Session
+Thường xuyên xắp xếp Session sẽ giúp Website của bạn hoạt động ổn định và nhanh hơn.]]></value>
+	</item>
+	<item name="cmd_clear_session">
+		<value xml:lang="ko"><![CDATA[세션 정리]]></value>
+		<value xml:lang="en"><![CDATA[Arrange Session]]></value>
+		<value xml:lang="jp"><![CDATA[セッション整理]]></value>
+		<value xml:lang="zh-CN"><![CDATA[清理会话]]></value>
+		<value xml:lang="zh-TW"><![CDATA[清理SESSION]]></value>
+		<value xml:lang="fr"><![CDATA[Arranger la Session]]></value>
+		<value xml:lang="tr"><![CDATA[Oturum Düzenle]]></value>
+		<value xml:lang="vi"><![CDATA[Sắp xếp Session]]></value>
+	</item>
+	<item name="session_cleared">
+		<value xml:lang="ko"><![CDATA[쓸모 없는 세션 정보가 정리되었습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The old sessions have been cleaned up.]]></value>
+		<value xml:lang="jp"><![CDATA[使わないセッションを整理しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无用会话已清理完毕。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[SESSION已清理完畢。]]></value>
+		<value xml:lang="fr"><![CDATA[Les données de Session sont arrangées avec succès]]></value>
+		<value xml:lang="tr"><![CDATA[Oturum verisi başarıyla düzenlendi]]></value>
+		<value xml:lang="vi"><![CDATA[Session Data đã được sắp xếp thành công!]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/session/lang/tr.lang.php b/modules/session/lang/tr.lang.php
deleted file mode 100644
index 411efd4b2..000000000
--- a/modules/session/lang/tr.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  Korean Language Pack (Basic Contents Only)
-     **/
-
-    $lang->session = 'Oturum';
-    $lang->about_session = "Bu modül oturumları yönetir\nAlışılmış oturum düzenlemesi, sitenize daha iyi bir ortam sağlayacaktır.";
-
-    $lang->cmd_clear_session = 'Oturum Düzenle';
-    $lang->session_cleared = 'Oturum verisi başarıyla düzenlendi';
-?>
diff --git a/modules/session/lang/vi.lang.php b/modules/session/lang/vi.lang.php
deleted file mode 100644
index 26c068b95..000000000
--- a/modules/session/lang/vi.lang.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->session = 'Session';
-    $lang->about_session = "Module này quản lý những Session\nThường xuyên xắp xếp Session sẽ giúp Website của bạn hoạt động ổn định và nhanh hơn.";
-
-    $lang->cmd_clear_session = 'Sắp xếp Session';
-    $lang->session_cleared = 'Session Data đã được sắp xếp thành công!';
-?>
diff --git a/modules/session/lang/zh-CN.lang.php b/modules/session/lang/zh-CN.lang.php
deleted file mode 100644
index 6da3865e5..000000000
--- a/modules/session/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)　翻译：guny
-     * @brief  会话模块简体中文语言包
-     **/
-
-    $lang->session = '会话';
-    $lang->about_session = "管理会话的模块。\n有时间清理无用会话，可提高网站效率。";
-
-    $lang->cmd_clear_session = '清理会话';
-    $lang->session_cleared = '无用会话已清理完毕。';
-?>
diff --git a/modules/session/lang/zh-TW.lang.php b/modules/session/lang/zh-TW.lang.php
deleted file mode 100644
index 94afec7a9..000000000
--- a/modules/session/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-    /**
-     * @file   modules/session/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  SESSION模組正體中文語言
-     **/
-
-    $lang->session = 'SESSION';
-    $lang->about_session = "管理SESSION的模組。\n請定時清理SESSION，可提高網站效率。";
-
-    $lang->cmd_clear_session = '清理SESSION';
-    $lang->session_cleared = 'SESSION已清理完畢。';
-?>
diff --git a/modules/session/queries/getExpiredSessions.xml b/modules/session/queries/getExpiredSessions.xml
new file mode 100644
index 000000000..3f79ba41b
--- /dev/null
+++ b/modules/session/queries/getExpiredSessions.xml
@@ -0,0 +1,12 @@
+<query id="getExpiredSession" action="select">
+    <tables>
+        <table name="session" />
+    </tables>
+    <columns>
+        <column name="session_key" />
+    </columns>
+    <conditions>
+        <condition operation="less" column="expired" default="curdate()" notnull="notnull" />
+    </conditions>
+</query>
+
diff --git a/modules/session/session.admin.controller.php b/modules/session/session.admin.controller.php
index 5bebb9154..635a34627 100644
--- a/modules/session/session.admin.controller.php
+++ b/modules/session/session.admin.controller.php
@@ -1,26 +1,26 @@
-<?php
-    /**
-     * @class  sessionAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  session 모듈의 admin controller class
-     **/
-
-    class sessionAdminController extends session {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 더비 세션 정리하는 action
-         **/
-        function procSessionAdminClear() {
-            $oSessionController = &getController('session');
-            $oSessionController->gc(0);
-
-            $this->add('result',Context::getLang('session_cleared'));
-        }
-    }
-?>
+<?php
+    /**
+     * @class  sessionAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin controller class of the session module
+     **/
+
+    class sessionAdminController extends session {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief The action to clean up the Derby session
+         **/
+        function procSessionAdminClear() {
+            $oSessionController = &getController('session');
+            $oSessionController->gc(0);
+
+            $this->add('result',Context::getLang('session_cleared'));
+        }
+    }
+?>
diff --git a/modules/session/session.admin.view.php b/modules/session/session.admin.view.php
index 46b44f4a7..64ab74cf3 100644
--- a/modules/session/session.admin.view.php
+++ b/modules/session/session.admin.view.php
@@ -1,26 +1,26 @@
-<?php
-    /**
-     * @class  sessionAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  session모듈의 admin view class
-     **/
-
-    class sessionAdminView extends session {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 설정 
-         **/
-        function dispSessionAdminIndex() {
-            // 템플릿 파일 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('index');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  sessionAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin view class of the session module
+     **/
+
+    class sessionAdminView extends session {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Configure
+         **/
+        function dispSessionAdminIndex() {
+            // Set the template file
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('index');
+        }
+
+    }
+?>
diff --git a/modules/session/session.class.php b/modules/session/session.class.php
index 223891743..1798c478c 100644
--- a/modules/session/session.class.php
+++ b/modules/session/session.class.php
@@ -1,83 +1,81 @@
-<?php
-    /**
-     * @class  session
-     * @author NHN (developers@xpressengine.com)
-     * @brief  session 모듈의 high class
-     * @version 0.1
-     *
-     * session 관리를 하는 class
-     **/
-
-    class session extends ModuleObject {
-
-        var $lifetime = 18000;
-        var $session_started = false;
-
-        function session() {
-            if(Context::isInstalled()) $this->session_started= true;
-        }
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            $oDB = &DB::getInstance();
-            $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            if(!$oDB->isTableExists('session')) return true;
-            if(!$oDB->isColumnExists("session","cur_mid")) return true;
-            if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-            
-            if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
-
-            if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
-
-            if(!$oDB->isIndexExists("session","idx_session_update_mid")) $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
-        }
-
-        /**
-         * @brief session string decode
-         **/
-        function unSerializeSession($val) {
-            $vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
-            for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
-            return $result;
-        }
-
-        /**
-         * @brief session string encode
-         **/
-        function serializeSession($data) {
-            if(!count($data)) return;
-
-            $str = '';
-            foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
-            return substr($str, 0, strlen($str)-1).'}';
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // 기존 파일 기반의 세션 삭제
-            FileHandler::removeDir(_XE_PATH_."files/sessions");
-        }
-    }
-?>
+<?php
+    /**
+     * @class  session
+     * @author NHN (developers@xpressengine.com)
+     * @brief session module's high class
+     * @version 0.1
+     *
+     * The session management class
+     **/
+
+    class session extends ModuleObject {
+
+        var $lifetime = 18000;
+        var $session_started = false;
+
+        function session() {
+            if(Context::isInstalled()) $this->session_started= true;
+        }
+
+        /**
+         * @brief Additional tasks required to accomplish during the installation
+         **/
+        function moduleInstall() {
+            $oDB = &DB::getInstance();
+            $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+
+            return new Object();
+        }
+
+        /**
+         * @brief A method to check if the installation has been successful
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            if(!$oDB->isTableExists('session')) return true;
+            if(!$oDB->isColumnExists("session","cur_mid")) return true;
+            if(!$oDB->isIndexExists("session","idx_session_update_mid")) return true;
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            
+            if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+
+            if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+
+            if(!$oDB->isIndexExists("session","idx_session_update_mid")) $oDB->addIndex("session","idx_session_update_mid", array("member_srl","last_update","cur_mid"));
+        }
+
+        /**
+         * @brief session string decode
+         **/
+        function unSerializeSession($val) {
+            $vars = preg_split('/([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff^|]*)\|/', $val,-1,PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE);
+            for($i=0; $vars[$i]; $i++) $result[$vars[$i++]] = unserialize($vars[$i]);
+            return $result;
+        }
+
+        /**
+         * @brief session string encode
+         **/
+        function serializeSession($data) {
+            if(!count($data)) return;
+
+            $str = '';
+            foreach($data as $key => $val) $str .= $key.'|'.serialize($val);
+            return substr($str, 0, strlen($str)-1).'}';
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/session/session.controller.php b/modules/session/session.controller.php
index 37059d6b0..523d5dc46 100644
--- a/modules/session/session.controller.php
+++ b/modules/session/session.controller.php
@@ -1,70 +1,128 @@
-<?php
-    /**
-     * @class  sessionController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  session 모듈의 controller class
-     **/
-
-    class sessionController extends session {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        function open() {
-            return true;
-        }
-
-        function close() {
-            return true;
-        }
-
-        function write($session_key, $val) {
-            if(!$session_key || !$this->session_started) return;
-
-            $args->session_key = $session_key;
-            $output = executeQuery('session.getSession', $args);
-            $session_info = $output->data;
-            if($session_info->session_key == $session_key && $session_info->ipaddress != $_SERVER['REMOTE_ADDR']) {
-                executeQuery('session.deleteSession', $args);
-                return true;
-            }
-
-            $args->expired = date("YmdHis", time()+$this->lifetime);
-            $args->val = $val;
-            $args->cur_mid = Context::get('mid');
-            if(!$args->cur_mid) {
-                $module_info = Context::get('current_module_info');
-                $args->cur_mid = $module_info->mid;
-            }
-
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                $args->member_srl = $logged_info->member_srl;
-            } else {
-                $args->member_srl = 0;
-            }
-
-            if($session_info->session_key) $output = executeQuery('session.updateSession', $args);
-            else $output = executeQuery('session.insertSession', $args);
-
-            return true;
-        }
-
-        function destroy($session_key) {
-            if(!$session_key || !$this->session_started) return;
-
-            $args->session_key = $session_key;
-            executeQuery('session.deleteSession', $args);
-            return true;
-        }
-
-        function gc($maxlifetime) {
-            if(!$this->session_started) return;
-            executeQuery('session.gcSession');
-            return true;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  sessionController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The controller class of the session module
+     **/
+
+    class sessionController extends session {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        function open() {
+            return true;
+        }
+
+        function close() {
+            return true;
+        }
+
+        function write($session_key, $val) {
+            if(!$session_key || !$this->session_started) return;
+       		$oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()) {
+            	$cache_key = 'object:'.$session_key;
+            	$cache_vars = $oCacheHandler->get($cache_key);
+            }
+            
+            $args->session_key = $session_key;
+            if($cache_vars) $session_info = $cache_vars;
+             else {
+             	$output = executeQuery('session.getSession', $args);
+            	$session_info = $output->data;
+             }
+            //if ip has changed delete the session from cache and db
+            if($session_info->session_key == $session_key && $session_info->ipaddress != $_SERVER['REMOTE_ADDR']) {
+            	if($oCacheHandler->isSupport())  $oCacheHandler->delete($cache_key);
+                executeQuery('session.deleteSession', $args);
+                return true;
+            }
+
+            $args->expired = date("YmdHis", time()+$this->lifetime);
+            $args->val = $val;
+            $args->cur_mid = Context::get('mid');
+            if(!$args->cur_mid) {
+                $module_info = Context::get('current_module_info');
+                $args->cur_mid = $module_info->mid;
+            }
+
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                $args->member_srl = $logged_info->member_srl;
+            } else {
+                $args->member_srl = 0;
+            }
+            $args->ipaddress = $_SERVER['REMOTE_ADDR'];
+            $args->last_update = date("YmdHis", time());
+            $diff = $args->last_update - $cache_vars->last_update;
+        	//verify if session values have changed
+            if($val == $cache_vars->val){
+            	// if more than 5 minutes passed than modify the db session also
+            	if($diff > 300){
+            		//put session into cache
+		            if($oCacheHandler->isSupport()) {
+		            	$cache_key = 'object:'.$session_key;
+		            	$oCacheHandler->put($cache_key,$args);
+		            }
+		            //put session into db
+		            if($session_info->session_key) $output = executeQuery('session.updateSession', $args);
+            	}
+            	else {
+            		//put session into cache
+		            if($oCacheHandler->isSupport()) {
+		            	$cache_key = 'object:'.$session_key;
+		            	$oCacheHandler->put($cache_key,$args);
+		            }
+            	}
+            }
+            else {
+            		//put session into cache
+		            if($oCacheHandler->isSupport()) {
+		            	$cache_key = 'object:'.$session_key;
+		            	$oCacheHandler->put($cache_key,$args);
+		            }
+		            //put session into db
+		            if($session_info->session_key) $output = executeQuery('session.updateSession', $args);
+		            else $output = executeQuery('session.insertSession', $args);
+            }
+			
+            
+            return true;
+        }
+
+        function destroy($session_key) {
+            if(!$session_key || !$this->session_started) return;
+            //remove session from cache
+        	$oCacheHandler = &CacheHandler::getInstance('object');
+            if($oCacheHandler->isSupport()) {
+            	$cache_key = 'object:'.$session_key;
+            	$oCacheHandler->delete($cache_key);
+            }
+            //remove session from db
+            $args->session_key = $session_key;
+            executeQuery('session.deleteSession', $args);
+            return true;
+        }
+
+        function gc($maxlifetime) {
+            if(!$this->session_started) return;
+            $expired_sessions = executeQueryArray('session.getExpiredSessions');
+            if($expired_session){
+            	foreach ($expired_sessions as $session_key){
+            	//remove session from cache
+		        	$oCacheHandler = &CacheHandler::getInstance('object');
+		            if($oCacheHandler->isSupport()) {
+		            	$cache_key = 'object:'.$session_key;
+		            	$oCacheHandler->delete($cache_key);
+		            }
+            	}
+            }
+            executeQuery('session.gcSession');
+            return true;
+        }
+    }
+?>
diff --git a/modules/session/session.model.php b/modules/session/session.model.php
index 00b220527..b08375bb7 100644
--- a/modules/session/session.model.php
+++ b/modules/session/session.model.php
@@ -1,93 +1,100 @@
-<?php
-    /**
-     * @class  sessionModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  session 모듈의 Model class
-     **/
-
-    class sessionModel extends session {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        function getLifeTime() {
-            return $this->lifetime;
-        }
-
-        function read($session_key) {
-            if(!$session_key || !$this->session_started) return;
-
-            $args->session_key = $session_key;
-            $output = executeQuery('session.getSession', $args);
-
-            // 읽기 오류 발생시 테이블 생성 유무 확인
-            if(!$output->toBool()) {
-                $oDB = &DB::getInstance();
-                if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
-                if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
-                $output = executeQuery('session.getSession', $args);
-            }
-
-            // 세션 정보에서 cur_mid값이 없을 경우 테이블 생성 체크
-            if(!isset($output->data->cur_mid)) {
-                $oDB = &DB::getInstance();
-                if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
-            }
-
-            return $output->data->val;
-        }
-
-        /**
-         * @brief 현재 접속중인 사용자의 목록을 구함
-         * 여러개의 인자값을 필요로 해서 object를 인자로 받음
-         * limit_count : 대상 수
-         * page : 페이지 번호
-         * period_time : 인자의 값을 n으로 하여 최근 n분 이내에 세션을 갱신한 대상을 추출함
-         * mid : 특정 mid에 속한 사용자
-         **/
-        function getLoggedMembers($args) {
-            if(!$args->site_srl) {
-                $site_module_info = Context::get('site_module_info');
-                $args->site_srl = (int)$site_module_info->site_srl;
-            }
-            if(!$args->list_count) $args->list_count = 20;
-            if(!$args->page) $args->page = 1;
-            if(!$args->period_time) $args->period_time = 3;
-            $args->last_update = date("YmdHis", time() - $args->period_time*60);
-
-            $output = executeQueryArray('session.getLoggedMembers', $args);
-            if(!$output->toBool()) return $output;
-
-            $member_srls = array();
-            if(count($output->data)) {
-                foreach($output->data as $key => $val) {
-                    $member_srls[$key] = $val->member_srl;
-                    $member_keys[$val->member_srl] = $key;
-                }
-            }
-
-            if(Context::get('is_logged')) {
-                $logged_info = Context::get('logged_info');
-                if(!in_array($logged_info->member_srl, $member_srls)) {
-                    $member_srls[0] = $logged_info->member_srl;
-                    $member_keys[$logged_info->member_srl] = 0;
-                }
-            }
-
-            if(!count($member_srls)) return $output;
-
-            $member_args->member_srl = implode(',',$member_srls);
-            $member_output = executeQueryArray('member.getMembers', $member_args);
-            if($member_output->data) {
-                foreach($member_output->data as $key => $val) {
-                    $output->data[$member_keys[$val->member_srl]] = $val;
-                }
-            }
-
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  sessionModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief The Model class of the session module
+     **/
+
+    class sessionModel extends session {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        function getLifeTime() {
+            return $this->lifetime;
+        }
+
+        function read($session_key) {
+            if(!$session_key || !$this->session_started) return;
+            
+        	$oCacheHandler = &CacheHandler::getInstance('object');
+			if($oCacheHandler->isSupport()){
+				$cache_key = 'object:'.$session_key;
+				$output->data = $oCacheHandler->get($cache_key);
+			}
+			if(!$output->data) {
+
+				$args->session_key = $session_key;
+				$columnList = array('session_key', 'cur_mid', 'val');
+	            $output = executeQuery('session.getSession', $args, $columnList);
+	            // Confirm there is a table created if read error occurs
+	            if(!$output->toBool()) {
+	                $oDB = &DB::getInstance();
+	                if(!$oDB->isTableExists('session')) $oDB->createTableByXmlFile($this->module_path.'schemas/session.xml');
+	                if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+	                $output = executeQuery('session.getSession', $args);
+	            }
+	            // Check if there is a table created in case there is no "cur_mid" value in the sessions information
+	            if(!isset($output->data->cur_mid)) {
+	                $oDB = &DB::getInstance();
+	                if(!$oDB->isColumnExists("session","cur_mid")) $oDB->addColumn('session',"cur_mid","varchar",128);
+	            }
+	           
+			}
+            return $output->data->val;
+        }
+
+        /**
+         * @brief Get a list of currently connected users
+         * Requires "object" argument because multiple arguments are expected
+         * limit_count : the number of objects
+         * page : the page number
+         * period_time: "n" specifies the time range in minutes since the last update
+         * mid: a user who belong to a specified mid
+         **/
+        function getLoggedMembers($args) {
+            if(!$args->site_srl) {
+                $site_module_info = Context::get('site_module_info');
+                $args->site_srl = (int)$site_module_info->site_srl;
+            }
+            if(!$args->list_count) $args->list_count = 20;
+            if(!$args->page) $args->page = 1;
+            if(!$args->period_time) $args->period_time = 3;
+            $args->last_update = date("YmdHis", time() - $args->period_time*60);
+
+            $output = executeQueryArray('session.getLoggedMembers', $args);
+            if(!$output->toBool()) return $output;
+
+            $member_srls = array();
+            if(count($output->data)) {
+                foreach($output->data as $key => $val) {
+                    $member_srls[$key] = $val->member_srl;
+                    $member_keys[$val->member_srl] = $key;
+                }
+            }
+
+            if(Context::get('is_logged')) {
+                $logged_info = Context::get('logged_info');
+                if(!in_array($logged_info->member_srl, $member_srls)) {
+                    $member_srls[0] = $logged_info->member_srl;
+                    $member_keys[$logged_info->member_srl] = 0;
+                }
+            }
+
+            if(!count($member_srls)) return $output;
+
+            $member_args->member_srl = implode(',',$member_srls);
+            $member_output = executeQueryArray('member.getMembers', $member_args);
+            if($member_output->data) {
+                foreach($member_output->data as $key => $val) {
+                    $output->data[$member_keys[$val->member_srl]] = $val;
+                }
+            }
+
+            return $output;
+        }
+    }
+?>
diff --git a/modules/session/tpl/index.html b/modules/session/tpl/index.html
index 631d1f8b5..8253308ad 100644
--- a/modules/session/tpl/index.html
+++ b/modules/session/tpl/index.html
@@ -1,4 +1,4 @@
-<!--%import("js/session.js",optimized=false)-->
+<load target="js/session.js" usecdn="true" />
 
 <h3 class="xeAdmin">{$lang->session} <span class="gray">{$lang->cmd_management}</span></h3>
 <div class="infoText">{nl2br($lang->about_session)}</div>
diff --git a/modules/session/tpl/js/session.js b/modules/session/tpl/js/session.js
index 53c740e6a..a555502a4 100644
--- a/modules/session/tpl/js/session.js
+++ b/modules/session/tpl/js/session.js
@@ -1,7 +1,9 @@
 function doClearSession() {
+	if (!confirm(xe.lang.confirm_run)) return;
     var response_tags = new Array('error','message','result');
     var params = new Array();
     exec_xml('session','procSessionAdminClear', params, completeClearSession, response_tags);
+	showWaitingFogLayer();
 }
 
 function completeClearSession(ret_obj, response_tags) {
diff --git a/modules/spamfilter/conf/info.xml b/modules/spamfilter/conf/info.xml
index 47f24c540..8646c3023 100644
--- a/modules/spamfilter/conf/info.xml
+++ b/modules/spamfilter/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">스팸필터</title>
-    <title xml:lang="zh-CN">垃圾过滤</title>
-    <title xml:lang="en">Spam Filter</title>
-    <title xml:lang="vi">Bộ lọc Spam</title>
-    <title xml:lang="es">Filtro de Spam</title>
-    <title xml:lang="jp">スパムフィルター</title>
-    <title xml:lang="ru">Фильтр спама</title>
-    <title xml:lang="tr">Spam Filtreleyici</title>
-    <title xml:lang="zh-TW">垃圾過濾</title>
-    <description xml:lang="ko">XE의 기본 스팸필터입니다.</description>
-    <description xml:lang="zh-CN">XE的基本垃圾过滤模块。</description>
-    <description xml:lang="en">A default spam filter of XE.</description>
-    <description xml:lang="vi">Bộ lọc Spam mặc định của XE.</description>
-    <description xml:lang="es">Filtro de Span predefinido de XE.</description>
-    <description xml:lang="jp">XEのスパムフィルターです。</description>
-    <description xml:lang="ru">Стандартный фильтр спама XE.</description>
-    <description xml:lang="zh-TW">XE的基本垃圾過濾模組。</description>
-    <description xml:lang="tr">XE\'nin varsayılan spam filtreleyicisidir.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>accessory</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">스팸필터</title>
+    <title xml:lang="zh-CN">垃圾过滤</title>
+    <title xml:lang="en">Spam Filter</title>
+    <title xml:lang="vi">Bộ lọc Spam</title>
+    <title xml:lang="es">Filtro de Spam</title>
+    <title xml:lang="jp">スパムフィルター</title>
+    <title xml:lang="ru">Фильтр спама</title>
+    <title xml:lang="tr">Spam Filtreleyici</title>
+    <title xml:lang="zh-TW">垃圾過濾</title>
+    <description xml:lang="ko">XE의 기본 스팸필터입니다.</description>
+    <description xml:lang="zh-CN">XE的基本垃圾过滤模块。</description>
+    <description xml:lang="en">The default spam filter of XE.</description>
+    <description xml:lang="vi">Bộ lọc Spam mặc định của XE.</description>
+    <description xml:lang="es">Filtro de Span predefinido de XE.</description>
+    <description xml:lang="jp">XEのスパムフィルターです。</description>
+    <description xml:lang="ru">Стандартный фильтр спама XE.</description>
+    <description xml:lang="zh-TW">XE的基本垃圾過濾模組。</description>
+    <description xml:lang="tr">XE\'nin varsayılan spam filtreleyicisidir.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>accessory</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/spamfilter/conf/module.xml b/modules/spamfilter/conf/module.xml
index b7988e2a2..217791868 100644
--- a/modules/spamfilter/conf/module.xml
+++ b/modules/spamfilter/conf/module.xml
@@ -2,15 +2,30 @@
 <module>
     <grants />
     <permissions />
+	<menus>
+		<menu name="spamFilter" tyle="super">
+			<title xml:lang="en">Spam Filter</title>
+			<title xml:lang="ko">스팸필터</title>
+			<title xml:lang="zh-CN">Spam Filter</title>
+			<title xml:lang="jp">Spam Filter</title>
+			<title xml:lang="es">Spam Filter</title>
+			<title xml:lang="ru">Spam Filter</title>
+			<title xml:lang="fr">Spam Filter</title>
+			<title xml:lang="zh-TW">Spam Filter</title>
+			<title xml:lang="vi">Spam Filter</title>
+			<title xml:lang="mn">Spam Filter</title>
+			<title xml:lang="tr">Spam Filter</title>
+		</menu>
+	</menus>
     <actions>
-        <action name="dispSpamfilterAdminConfig" type="view" admin_index="true" standalone="true" />
-        <action name="dispSpamfilterAdminDeniedIPList" type="view" standalone="true" />
-        <action name="dispSpamfilterAdminDeniedWordList" type="view" standalone="true" />
+        <action name="dispSpamfilterAdminSetting" type="view" admin_index="true" standalone="true" menu_name="spamFilter" menu_index="true" />
 
-        <action name="procSpamfilterAdminInsertConfig" type="controller" standalone="true" />
-        <action name="procSpamfilterAdminInsertDeniedIP" type="controller" standalone="true" />
-        <action name="procSpamfilterAdminDeleteDeniedIP" type="controller" standalone="true" />
-        <action name="procSpamfilterAdminInsertDeniedWord" type="controller" standalone="true" />
-        <action name="procSpamfilterAdminDeleteDeniedWord" type="controller" standalone="true" />
-    </actions>
+		<action name="procSpamfilterAdminInsertDeniedIP" type="controller" standalone="true" ruleset="insertDeniedIp" />
+        <action name="procSpamfilterAdminInsertDeniedWord" type="controller" standalone="true" ruleset="insertDeniedWord" />
+
+        <action name="procSpamfilterAdminDeleteDeniedIP" type="controller" standalone="true" ruleset="deleteDeniedIp" />
+        <action name="procSpamfilterAdminDeleteDeniedWord" type="controller" standalone="true" ruleset="deleteDeniedWord" />
+        <action name="procSpamfilterAdminInsertConfig" type="controller" standalone="true" ruleset="insertSetting" />
+
+	</actions>
 </module>
diff --git a/modules/spamfilter/lang/en.lang.php b/modules/spamfilter/lang/en.lang.php
deleted file mode 100644
index 9af2e4cab..000000000
--- a/modules/spamfilter/lang/en.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (basic)
-     **/
-
-    // action related
-    $lang->cmd_denied_ip = "IP Address Blacklist";
-    $lang->cmd_denied_word = "Word Blacklist";
-
-    // general word
-    $lang->spamfilter = "Spam filter";
-    $lang->denied_ip = "IP Address";
-    $lang->interval = "Interval for spam filtering";
-    $lang->limit_count = "No. of posting limitation";
-    $lang->check_trackback = "Check Trackbacks";
-    $lang->word = "Word";
-    $lang->hit = 'Hit';
-    $lang->latest_hit = 'Latest Hits';
-
-    // for description word
-    $lang->about_interval = "All articles attempted for posting within the assigned time will be blocked.";
-    $lang->about_limit_count = "If exceeded the posting limitation,\n that IP will be regarded as a spam, thus will have limitations on posting articles, comments, and trackbacks.";
-    $lang->about_denied_ip = "You can add IP address range like 127.0.0.* by using *.";
-    $lang->about_denied_word = "When you add a word to Word Blacklist,\n articles including it will be blocked.";
-    $lang->about_check_trackback = "A single IP per an article is allowed for trackbacks.";
-
-    // to post a message
-    $lang->msg_alert_limited_by_config = 'Posting an article within %s second is not allowed.\n If you keep trying, your IP address will be blacklisted.';
-    $lang->msg_alert_denied_word = 'The word "%s" is not allowed.';
-    $lang->msg_alert_registered_denied_ip = 'Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator.';
-    $lang->msg_alert_trackback_denied = 'Only one trackback per an article is allowed.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/es.lang.php b/modules/spamfilter/lang/es.lang.php
deleted file mode 100644
index e32ac5c1d..000000000
--- a/modules/spamfilter/lang/es.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/spamfilter/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español (básico)
-     **/
-
-    // relacionado a la acciona
-    $lang->cmd_denied_ip = "Lista negra de las direcciones IP";
-    $lang->cmd_denied_word = "Lista negra de palabras";
-
-    // palabras generales
-    $lang->spamfilter = "Filtro de Spam";
-    $lang->denied_ip = "IP prohibido";
-    $lang->interval = "Intervalo para el filtro de spam";
-    $lang->limit_count = "Número limite";
-    $lang->check_trackback = "Chequear trackback";
-    $lang->word = "Palabra";
-    $lang->hit = '히트';
-    $lang->latest_hit = '최근 히트';
-
-    // para las palabras de descripcion
-    $lang->about_interval = "Se bloquea el posteo de todo tipo de documentos durante el tiempo asignado.";
-    $lang->about_limit_count = "Si Usted excede el número límite del posteo,\n Su documento serán reconocido como un spam, y su dirección IP sera agregada en la lista negra.";
-    $lang->about_denied_ip = "Usted puede asignar rangos de direcciones IP como 127.0.0.* usando *.";
-    $lang->about_denied_word = "Cuando Usted agrega una palabra a la lista negra de palabras,\n documentos con esa palabra no será registrado.";
-    $lang->about_check_trackback = "En un documento sólo se permite un trackback por IP.";
-
-    // para registrar un documento
-    $lang->msg_alert_limited_by_config = 'Se prohibe poestear antes de %s segundos.\n Si Usted trata varias veces, su dirección IP puede ser agregada en la lista negra.';
-    $lang->msg_alert_denied_word = 'La palabra "%s" no esta permitido para ser posteado.';
-    $lang->msg_alert_registered_denied_ip = 'Su dirección IP fue agregaa en la lista negra,\n por lo cual Usted puede tener limitaciones en su uso normal de este sitio.\n Si Usted tiene alguna inquietud sobre el tema, por favor contactese con el administrador del sitio.';
-    $lang->msg_alert_trackback_denied = 'Sólo un trackback por documento está permitido.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/fr.lang.php b/modules/spamfilter/lang/fr.lang.php
deleted file mode 100644
index 17a06a69c..000000000
--- a/modules/spamfilter/lang/fr.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module du Filtre contre polluriel
-     **/
-
-    // de l'action
-    $lang->cmd_denied_ip = "Liste noire d'Address IP";
-    $lang->cmd_denied_word = "Liste noire des Mots";
-
-    // mots générals
-    $lang->spamfilter = "Filtre contre Polluriel";
-    $lang->denied_ip = "IP à bloquer";
-    $lang->interval = "Intervalle à filtrer contre polluriel";
-    $lang->limit_count = "Limite d'affichage";
-    $lang->check_trackback = "Vérifier les Rétroliens";
-    $lang->word = "Mot";
-    $lang->hit = '히트';
-    $lang->latest_hit = '최근 히트';
-
-    // descriptions
-    $lang->about_interval = "L'affichage sera bloqué pendant le temps designé.";
-    $lang->about_limit_count = "Si l'on excéde la limite d'affichage pendant le temps désigné,\nles articles en plus seront reconnus comme polluriel, et l'adresse IP sera bloqué.";
-    $lang->about_denied_ip = "Vous pouvez bloquer l'étendue de l'adresse IP comme 127.0.0.* en utilisant *.";
-    $lang->about_denied_word = "Quand vous enrégistrez un mot dans la liste noire, \nl'article qui comporte le mot ne sera pas affichagé.";
-    $lang->about_check_trackback = "Le rétrolien peut être permis à un seul IP par article.";
-
-    // messages
-    $lang->msg_alert_limited_by_config = 'L\'Affichage d\'un article en %s secondes n\'est pas permis.\n Si vous essayez encore, votre adresse IP peut être enrégistré dans la liste noire.';
-    $lang->msg_alert_denied_word = 'Le mot "%s" n\'est pas permis d\'afficher.';
-    $lang->msg_alert_registered_denied_ip = 'Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator. Votre adresse IP est dans la liste noire, \nvous pouvez donc avoir limitation d\'activité dans ce site. Si vous avez quelque question sur ce fait, contactez l\'administrateur du site, S.V.P.';
-    $lang->msg_alert_trackback_denied = 'Un seul rétrolien par article est permis.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/jp.lang.php b/modules/spamfilter/lang/jp.lang.php
deleted file mode 100644
index 0f6e74b6d..000000000
--- a/modules/spamfilter/lang/jp.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  日本語言語パッケージ（基本的な内容のみ）
-     **/
-
-    // action関連
-    $lang->cmd_denied_ip = '禁止IPリスト';
-    $lang->cmd_denied_word = '禁止ワードリスト';
-
-    // 一般用語
-    $lang->spamfilter = 'スパムフィルター';
-    $lang->denied_ip = '禁止IP';
-    $lang->interval = 'スパム処理間隔';
-    $lang->limit_count = '制限数';
-    $lang->check_trackback = 'トラックバック検査';
-    $lang->word = 'ワード';
-    $lang->hit = 'ヒット';
-    $lang->latest_hit = '最近ヒット';
-
-    // 説明文
-    $lang->about_interval = '指定された時間内の書き込みが行えないようにします。';
-    $lang->about_limit_count = '指定された時間内に制限数を超える書き込みが行われるとスパムとして認識し、該当するＩＰを禁止します。';
-    $lang->about_denied_ip = '「127.0.0.* 」のように「*」で、「127.0.0」以下ののIP帯域をすべて禁止することが出来ます。';
-    $lang->about_denied_word = '禁止ワードとして登録されると該当するワードが存在する書き込みを禁することが出来ます。';
-    $lang->about_check_trackback = '一つのIPからのみトラックバックを受信するようにします。';
-
-    // メッセージ出力用
-    $lang->msg_alert_limited_by_config = '%s秒以内の書き込みは禁止されます。続けて行うとスパムとして認識され、禁止IPに登録されます。';
-    $lang->msg_alert_denied_word = '"%s"は使用が禁止されたワードです。';
-    $lang->msg_alert_registered_denied_ip = '禁止IPに登録され、サイト内で正常な活動が制限されています。管理者にお問い合わせ下さい。';
-    $lang->msg_alert_trackback_denied = '一つの書き込みには、１つのトラックバックしか受け取れません。';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/ko.lang.php b/modules/spamfilter/lang/ko.lang.php
deleted file mode 100644
index 5d5c02937..000000000
--- a/modules/spamfilter/lang/ko.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  한국어 언어팩 (기본적인 내용만 수록)
-     **/
-
-    // action 관련
-    $lang->cmd_denied_ip = '금지IP 목록';
-    $lang->cmd_denied_word = '금지 단어 목록';
-
-    // 일반 단어
-    $lang->spamfilter = '스팸필터';
-    $lang->denied_ip = '금지 IP';
-    $lang->interval = '스팸 처리 간격';
-    $lang->limit_count = '제한 수';
-    $lang->check_trackback = '트랙백 검사';
-    $lang->word = '단어';
-    $lang->hit = '히트';
-    $lang->latest_hit = '최근 히트';
-
-    // 설명문
-    $lang->about_interval = '지정된 시간 내에 글을 등록하지 못하게 합니다.';
-    $lang->about_limit_count = '지정된 시간 내에 제한수를 넘겨서 글 작성을 시도하면 스팸으로 인식, 해당 IP의 글 작성, 댓글 작성, 트랙백 발송 등을 금지합니다.';
-    $lang->about_denied_ip = '127.0.0.* 와 같이 * 로 정해진 패턴의 IP 대역을 모두 금지 시킬 수 있습니다.';
-    $lang->about_denied_word = '금지 단어로 등록되면 해당 단어가 있는 글은 등록을 금지 시킬 수 있습니다.';
-    $lang->about_check_trackback = '한 글에 한 IP에만 트랙백을 허용할 수 있습니다.';
-
-    // 메세지 출력용
-    $lang->msg_alert_limited_by_config = '%s 초 이내에 글 작성은 금지 됩니다. 계속 시도하시면 금지 IP에 등록되실 수 있습니다.';
-    $lang->msg_alert_denied_word = '"%s"는 사용 금지된 단어입니다.';
-    $lang->msg_alert_registered_denied_ip = '금지 IP에 등록되셔서 정상적인 활동에 제한을 받게 되셨습니다. 문의는 사이트 관리자에게 해주시기 바랍니다.';
-    $lang->msg_alert_trackback_denied = '한 글에는 하나의 트랙백만 허용 됩니다.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/lang.xml b/modules/spamfilter/lang/lang.xml
new file mode 100644
index 000000000..eeb2844d5
--- /dev/null
+++ b/modules/spamfilter/lang/lang.xml
@@ -0,0 +1,265 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_denied_ip">
+		<value xml:lang="ko"><![CDATA[스팸 IP 목록]]></value>
+		<value xml:lang="en"><![CDATA[IP Address Blacklist]]></value>
+		<value xml:lang="jp"><![CDATA[禁止IPリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止IP列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁止IP列表]]></value>
+		<value xml:lang="fr"><![CDATA[Liste noire d'Address IP]]></value>
+		<value xml:lang="ru"><![CDATA[Черный список IP-адресов]]></value>
+		<value xml:lang="es"><![CDATA[Lista negra de las direcciones IP]]></value>
+		<value xml:lang="tr"><![CDATA[IP Adresleri Kara Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách IP cấm]]></value>
+	</item>
+	<item name="cmd_denied_word">
+		<value xml:lang="ko"><![CDATA[스팸 키워드 목록]]></value>
+		<value xml:lang="en"><![CDATA[Word Blacklist]]></value>
+		<value xml:lang="jp"><![CDATA[禁止ワードリスト]]></value>
+		<value xml:lang="zh-CN"><![CDATA[敏感词列表]]></value>
+		<value xml:lang="zh-TW"><![CDATA[敏感詞清單]]></value>
+		<value xml:lang="fr"><![CDATA[Liste noire des Mots]]></value>
+		<value xml:lang="ru"><![CDATA[Черный список слов]]></value>
+		<value xml:lang="es"><![CDATA[Lista negra de palabras]]></value>
+		<value xml:lang="tr"><![CDATA[Yasak Sözcük Listesi]]></value>
+		<value xml:lang="vi"><![CDATA[Danh sách từ cấm]]></value>
+	</item>
+	<item name="spamfilter">
+		<value xml:lang="ko"><![CDATA[스팸필터]]></value>
+		<value xml:lang="en"><![CDATA[Spam filter]]></value>
+		<value xml:lang="jp"><![CDATA[スパムフィルター]]></value>
+		<value xml:lang="zh-CN"><![CDATA[垃圾过滤]]></value>
+		<value xml:lang="zh-TW"><![CDATA[垃圾過濾]]></value>
+		<value xml:lang="fr"><![CDATA[Filtre contre Polluriel]]></value>
+		<value xml:lang="ru"><![CDATA[Фильтр спама]]></value>
+		<value xml:lang="es"><![CDATA[Filtro de Spam]]></value>
+		<value xml:lang="tr"><![CDATA[Spam filtreleyici]]></value>
+		<value xml:lang="vi"><![CDATA[Bộ lọc Spam]]></value>
+	</item>
+	<item name="denied_ip">
+		<value xml:lang="ko"><![CDATA[금지 IP]]></value>
+		<value xml:lang="en"><![CDATA[Blocked IP Address]]></value>
+		<value xml:lang="jp"><![CDATA[禁止IP]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止IP]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁止IP]]></value>
+		<value xml:lang="fr"><![CDATA[IP à bloquer]]></value>
+		<value xml:lang="ru"><![CDATA[IP в черный список]]></value>
+		<value xml:lang="es"><![CDATA[IP prohibido]]></value>
+		<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+		<value xml:lang="vi"><![CDATA[IP bị cấm]]></value>
+	</item>
+	<item name="interval">
+		<value xml:lang="ko"><![CDATA[스팸 처리 간격]]></value>
+		<value xml:lang="en"><![CDATA[Interval for spam filtering]]></value>
+		<value xml:lang="jp"><![CDATA[スパム処理間隔]]></value>
+		<value xml:lang="zh-CN"><![CDATA[处理垃圾间隔]]></value>
+		<value xml:lang="zh-TW"><![CDATA[處理垃圾間隔]]></value>
+		<value xml:lang="fr"><![CDATA[Intervalle à filtrer contre polluriel]]></value>
+		<value xml:lang="ru"><![CDATA[Интервал фильтрования спама]]></value>
+		<value xml:lang="es"><![CDATA[Intervalo para el filtro de spam]]></value>
+		<value xml:lang="tr"><![CDATA[Spam filtreleyici için aralık]]></value>
+		<value xml:lang="vi"><![CDATA[Thời gian giới hạn]]></value>
+	</item>
+	<item name="limit_count">
+		<value xml:lang="ko"><![CDATA[제한 수]]></value>
+		<value xml:lang="en"><![CDATA[No. of post limited]]></value>
+		<value xml:lang="jp"><![CDATA[制限数]]></value>
+		<value xml:lang="zh-CN"><![CDATA[限制数]]></value>
+		<value xml:lang="zh-TW"><![CDATA[限制數]]></value>
+		<value xml:lang="fr"><![CDATA[Limite d'affichage]]></value>
+		<value xml:lang="ru"><![CDATA[Лимит публикаций]]></value>
+		<value xml:lang="es"><![CDATA[Número limite]]></value>
+		<value xml:lang="tr"><![CDATA[Gönderi Sınırı]]></value>
+		<value xml:lang="vi"><![CDATA[Số bài viết giới hạn]]></value>
+	</item>
+	<item name="check_trackback">
+		<value xml:lang="ko"><![CDATA[트랙백 검사]]></value>
+		<value xml:lang="en"><![CDATA[Check Trackbacks]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバック検査]]></value>
+		<value xml:lang="zh-CN"><![CDATA[检查引用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[檢查引用]]></value>
+		<value xml:lang="fr"><![CDATA[Vérifier les Rétroliens]]></value>
+		<value xml:lang="ru"><![CDATA[Проверять трекбек]]></value>
+		<value xml:lang="es"><![CDATA[Chequear trackback]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izlemeleri kontrol et.]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểm tra liên kết Web]]></value>
+	</item>
+	<item name="word">
+		<value xml:lang="ko"><![CDATA[단어]]></value>
+		<value xml:lang="en"><![CDATA[Word]]></value>
+		<value xml:lang="jp"><![CDATA[ワード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[单词]]></value>
+		<value xml:lang="zh-TW"><![CDATA[單字]]></value>
+		<value xml:lang="fr"><![CDATA[Mot]]></value>
+		<value xml:lang="ru"><![CDATA[Слово]]></value>
+		<value xml:lang="es"><![CDATA[Palabra]]></value>
+		<value xml:lang="tr"><![CDATA[Kelime]]></value>
+		<value xml:lang="vi"><![CDATA[Từ]]></value>
+	</item>
+	<item name="hit">
+		<value xml:lang="ko"><![CDATA[히트]]></value>
+		<value xml:lang="en"><![CDATA[Hit]]></value>
+		<value xml:lang="jp"><![CDATA[ヒット]]></value>
+		<value xml:lang="zh-CN"><![CDATA[点击]]></value>
+		<value xml:lang="vi"><![CDATA[Truy cập]]></value>
+	</item>
+	<item name="latest_hit">
+		<value xml:lang="ko"><![CDATA[최근 히트]]></value>
+		<value xml:lang="en"><![CDATA[Latest Hits]]></value>
+		<value xml:lang="jp"><![CDATA[最新ヒット]]></value>
+		<value xml:lang="zh-CN"><![CDATA[最后点击]]></value>
+		<value xml:lang="tr"><![CDATA[Son Hit'ler]]></value>
+		<value xml:lang="vi"><![CDATA[Truy cập mới nhất]]></value>
+	</item>
+	<item name="about_interval">
+		<value xml:lang="ko"><![CDATA[지정된 시간 내에 글을 등록하지 못하게 합니다.]]></value>
+		<value xml:lang="en"><![CDATA[All articles attempted for posting within the assigned time will be blocked.]]></value>
+		<value xml:lang="jp"><![CDATA[指定された時間に書き込みが行えないようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[指定的时间内禁止发表新主题。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[指定的時間內禁止發表新主題。]]></value>
+		<value xml:lang="fr"><![CDATA[L'affichage sera bloqué pendant le temps designé.]]></value>
+		<value xml:lang="ru"><![CDATA[Все попытки разместить статьи в установленное время будут заблокированы.]]></value>
+		<value xml:lang="es"><![CDATA[Se bloquea el posteo de todo tipo de documentos durante el tiempo asignado.]]></value>
+		<value xml:lang="tr"><![CDATA[Belirlenen süre içerisinde gönderilmeye çalışılan tüm yazılar engellenecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Tất cả những bài viết trong thời gian giới hạn sẽ bị chặn.]]></value>
+	</item>
+	<item name="about_limit_count">
+		<value xml:lang="ko"><![CDATA[지정된 시간 내에 제한수를 넘겨서 글 작성을 시도하면 스팸으로 인식, 해당 IP의 글 작성, 댓글 작성, 트랙백 발송 등을 금지합니다.]]></value>
+		<value xml:lang="en"><![CDATA[If exceeded the posting limitation,
+ that IP will be regarded as a spam, thus will have limitations on posting articles, comments, and trackbacks.]]></value>
+		<value xml:lang="jp"><![CDATA[指定した時間に制限数を超える書き込みが行われるとスパムとして認識し、該当IPを禁止します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[在指定时间内发表的新主题超过限制数时，系统将把它认为是垃圾主题，将自动禁止对方的IP。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[在指定時間內發表的新主題超過限制數時，系統將會認為是垃圾主題，並自動禁止對方的IP。]]></value>
+		<value xml:lang="fr"><![CDATA[Si l'on excéde la limite d'affichage pendant le temps désigné,
+les articles en plus seront reconnus comme polluriel, et l'adresse IP sera bloqué.]]></value>
+		<value xml:lang="ru"><![CDATA[Если Вы вышли за лимит публикаций (статей/комментариев),
+ Ваша статья будет разпознана как спам, и Ваш IP-адрес будет добавлен в черный список.]]></value>
+		<value xml:lang="es"><![CDATA[Si Usted excede el número límite del posteo,
+ Su documento serán reconocido como un spam, y su dirección IP sera agregada en la lista negra.]]></value>
+		<value xml:lang="tr"><![CDATA[Gönderi sınırını aşarsanız,
+ o IP bir spam olarak kabul edilecek ve dolayısıyla yazı göndermede, yorum yapmada ve geri izlemede bulunmada sınırlamalarla karşılaşacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Nếu bạn gửi bài vượt quá số bài viết quy định,
+ bài viết của bạn sẽ bị ghi vào danh sách và IP của bạn sẽ bị lưu vào danh sách IP bị cấm.]]></value>
+	</item>
+	<item name="about_denied_ip">
+		<value xml:lang="ko"><![CDATA['<em>스팸 IP // 메모</em>' 형식으로 입력하세요. 여러개의 항목은 줄을 바꾸어 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[You can add IP address range like 127.0.0.* by using *.]]></value>
+		<value xml:lang="jp"><![CDATA[「127.0.0.* 」のように「*」で、「127.0.0」以下のIP帯域をすべて禁止することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[禁止IP可以使用通配符。(如：如 "127.0.*.*"）]]></value>
+		<value xml:lang="zh-TW"><![CDATA[禁止IP可以使用通配符。(如：如 "127.0.*.*"）]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez bloquer l'étendue de l'adresse IP comme 127.0.0.* en utilisant *.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете добавить в черный список диапазон IP-адресов как 127.0.0.*, используя знак звездочки (*).]]></value>
+		<value xml:lang="es"><![CDATA[Usted puede asignar rangos de direcciones IP como 127.0.0.* usando *.]]></value>
+		<value xml:lang="tr"><![CDATA[* işaretini kullanarak 127.0.0.* şeklinde IP adres aralığı ekleyebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể thêm IP vào danh sách bị cấm dạng 127.0.0.* bằng cách sử dụng *.]]></value>
+	</item>
+	<item name="about_denied_word">
+		<value xml:lang="ko"><![CDATA[여러개의 항목은 줄을 바꾸어 입력하세요.]]></value>
+		<value xml:lang="en"><![CDATA[When you add a word to Word Blacklist,
+ articles including it will be blocked.]]></value>
+		<value xml:lang="jp"><![CDATA[禁止ワードとして登録されると該当するワードが存在する書き込みを禁することができます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[登录为敏感词，可以对要发表的主题进行检测并禁止含有敏感词的主题发表。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[登錄為敏感詞，可以對要發表的主題進行檢測並禁止含有敏感詞的主題發表。]]></value>
+		<value xml:lang="fr"><![CDATA[Quand vous enrégistrez un mot dans la liste noire, 
+l'article qui comporte le mot ne sera pas affichagé.]]></value>
+		<value xml:lang="ru"><![CDATA[Когда Вы добавляете слово в черный список,
+ статьи с этим словом не будут опубликованы]]></value>
+		<value xml:lang="es"><![CDATA[Cuando Usted agrega una palabra a la lista negra de palabras,
+ documentos con esa palabra no será registrado.]]></value>
+		<value xml:lang="tr"><![CDATA[Yasak sözcük listesine bir kelime eklediğinizde,
+ o kelimeyi içeren tüm yazılar engellenecektir.]]></value>
+		<value xml:lang="vi"><![CDATA[Khi bạn thêm từ vào danh sách Từ bị cấm,
+ những bài viết có chứa những từ này sẽ không được gửi.]]></value>
+	</item>
+	<item name="about_check_trackback">
+		<value xml:lang="ko"><![CDATA[한 글에 한 IP에만 트랙백을 허용할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[A single IP per article is allowed for trackbacks.]]></value>
+		<value xml:lang="jp"><![CDATA[ひとつのIPからのみトラックバックを受信するようにします。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[对一个主题只允许一个IP引用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[對一個主題只允許一個IP引用。]]></value>
+		<value xml:lang="fr"><![CDATA[Le rétrolien peut être permis à un seul IP par article.]]></value>
+		<value xml:lang="ru"><![CDATA[Только трекбек для оного IP на статью может быть разрешен.]]></value>
+		<value xml:lang="es"><![CDATA[En un documento sólo se permite un trackback por IP.]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izlemeler için yazı başına tek bir IP'ye izin verilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ cho phép gửi một bài viết với một IP trên một liên kết Web.]]></value>
+	</item>
+	<item name="msg_alert_limited_by_config">
+		<value xml:lang="ko"><![CDATA[%s 초 이내에 글 작성은 금지 됩니다. 계속 시도하시면 금지 IP에 등록되실 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Posting an article within %s seconda is not allowed.\n If you keep trying, your IP address will be blacklisted.]]></value>
+		<value xml:lang="jp"><![CDATA[%s秒以内の書き込みは禁止されます。続けて行うとスパムとして認識され、禁止IPに登録されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[%s秒之内不能连续发表新主题。如您继续再试系统将自动禁止您的IP。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[%s秒之內不能連續發表新主題。如您繼續再試系統將自動禁止您的IP。]]></value>
+		<value xml:lang="fr"><![CDATA[L'Affichage d'un article en %s secondes n'est pas permis.\n Si vous essayez encore, votre adresse IP peut être enrégistré dans la liste noire.]]></value>
+		<value xml:lang="ru"><![CDATA[Размещение статьи с интервалом в %s секунд не разрешено.\n Если Вы будете многократно пытаться это сделать, Ваш IP-адрес может быть добавлен в черный список.]]></value>
+		<value xml:lang="es"><![CDATA[Se prohibe poestear antes de %s segundos.\n Si Usted trata varias veces, su dirección IP puede ser agregada en la lista negra.]]></value>
+		<value xml:lang="tr"><![CDATA[%s saniyede bir yazı göndermek mümkün değildir.\n Denemeyi sürdürürseniz, IP adresiniz kara listeye alınacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Không được phép gửi bài thứ 2 trong khoảng thời gian %s giây.\n Nếu bạn cứ tiếp tục, IP của bạn sẽ bị thêm vào danh sách IP bị cấm.]]></value>
+	</item>
+	<item name="msg_alert_denied_word">
+		<value xml:lang="ko"><![CDATA["%s"는 사용 금지된 단어입니다.]]></value>
+		<value xml:lang="en"><![CDATA[The word "%s" is not allowed.]]></value>
+		<value xml:lang="jp"><![CDATA["%s"は使用が禁止されたワードです。]]></value>
+		<value xml:lang="zh-CN"><![CDATA["%s"是敏感词！]]></value>
+		<value xml:lang="zh-TW"><![CDATA["%s"是敏感詞！]]></value>
+		<value xml:lang="fr"><![CDATA[Le mot "%s" n'est pas permis d'afficher.]]></value>
+		<value xml:lang="ru"><![CDATA[Слово "%s" запрещено для публикации.]]></value>
+		<value xml:lang="es"><![CDATA[La palabra "%s" no esta permitido para ser posteado.]]></value>
+		<value xml:lang="tr"><![CDATA[ "%s" kelimesinin kullanılmasına izin verilmemektedir.]]></value>
+		<value xml:lang="vi"><![CDATA[Không được phép gửi từ "%s".]]></value>
+	</item>
+	<item name="msg_alert_registered_denied_ip">
+		<value xml:lang="ko"><![CDATA[금지 IP에 등록되셔서 정상적인 활동에 제한을 받게 되셨습니다. 문의는 사이트 관리자에게 해주시기 바랍니다.]]></value>
+		<value xml:lang="en"><![CDATA[Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact the site administrator.]]></value>
+		<value xml:lang="jp"><![CDATA[禁止IPに登録され、サイト内で正常な活動が制限されています。管理者にお問い合わせください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[您的IP已被禁止，详情请联系网站管理员。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[您的IP已被禁止，詳情請聯繫網站管理員。]]></value>
+		<value xml:lang="fr"><![CDATA[Your IP address is blacklisted,\n so you may have limitations on normal using of this site.\n If you have any questions on that matter, please contact to the site administrator. Votre adresse IP est dans la liste noire, \nvous pouvez donc avoir limitation d'activité dans ce site. Si vous avez quelque question sur ce fait, contactez l'administrateur du site, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Ваш IP-адрес занесен в черный список,\n поэтому Вы можете иметь ограничения на полноценное использование этого сайта.\n Если у Вас есть вопросы насчет этого, пожалуйста, сообщите администратору сайта.]]></value>
+		<value xml:lang="es"><![CDATA[Su dirección IP fue agregaa en la lista negra,\n por lo cual Usted puede tener limitaciones en su uso normal de este sitio.\n Si Usted tiene alguna inquietud sobre el tema, por favor contactese con el administrador del sitio.]]></value>
+		<value xml:lang="tr"><![CDATA[IP adresiniz kara listeye alındı,\n siteyi kullanırken sınırlamalarla karşılaşacaksınız.\n Bu konuda sorularınız varsa, lütfen site yöneticisi ile görüşün.]]></value>
+		<value xml:lang="vi"><![CDATA[IP của bạn đã bị nằm trong danh sách cấm,\n vì vậy bạn bị giới hạn sử dụng trên Website này.\n Nếu bạn có bất cứ thắc mắc gì, xin vui lòng liên hệ với Webmaster để được giải đáp.]]></value>
+	</item>
+	<item name="msg_alert_trackback_denied">
+		<value xml:lang="ko"><![CDATA[한 글에는 하나의 트랙백만 허용됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Only one trackback per an article is allowed.]]></value>
+		<value xml:lang="jp"><![CDATA[ひとつの書き込みには、１つのトラックバックしか受け取れません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[一个主题只允许一个引用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[一個主題只允許一個引用。]]></value>
+		<value xml:lang="fr"><![CDATA[Un seul rétrolien par article est permis.]]></value>
+		<value xml:lang="ru"><![CDATA[Разрешен только один трекбек на статью.]]></value>
+		<value xml:lang="es"><![CDATA[Sólo un trackback por documento está permitido.]]></value>
+		<value xml:lang="tr"><![CDATA[Yazı başına sadece bir geri izlemeye izin verilmektedir.]]></value>
+		<value xml:lang="vi"><![CDATA[Chỉ cho phép một liên kết Web trên một bài viết.]]></value>
+	</item>
+	<item name="cmd_interval">
+		<value xml:lang="ko"><![CDATA[10초 동안 3회 이상 글을 작성하면 스패머로 간주할까요? 글, 댓글 작성과 엮인글 발송을 차단합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to blacklist the users who attempt to post articles more than 3 times for 10 seconds? The blacklisted users cannot write articles or comments and send trackbacks.]]></value>
+	　　<value xml:lang="jp"><![CDATA[10秒の間3回以上書き込みをすると、スパムとみなしますか？書き込み、コメント作成とトラックバックの送信をブロックします。]]></value>
+	</item>
+	<item name="cmd_check_trackback">
+		<value xml:lang="ko"><![CDATA[하나의 글에 2회 이상 엮인글을 등록하면 스패머로 간주할까요? 엮인글을 차단합니다.]]></value>
+		<value xml:lang="en"><![CDATA[Do you want to blacklist the users who attempt to post more than 2 trackbacks to one article? The blacklisted users cannot post trackbacks.]]></value>
+	　　<value xml:lang="jp"><![CDATA[ひとつの書き込みに2回以上トラックバックを登録するとスパムとみなしますか？トラックバックをブロックします。]]></value>
+	</item>
+	<item name="add">
+		<value xml:lang="ko"><![CDATA[추가]]></value>
+		<value xml:lang="en"><![CDATA[Add]]></value>
+		<value xml:lang="jp"><![CDATA[追加]]></value>
+	</item>
+	<item name="yes">
+		<value xml:lang="ko"><![CDATA[예]]></value>
+		<value xml:lang="en"><![CDATA[Yes]]></value>
+		<value xml:lang="jp"><![CDATA[はい]]></value>
+	</item>
+	<item name="no">
+		<value xml:lang="ko"><![CDATA[아니오]]></value>
+		<value xml:lang="en"><![CDATA[No]]></value>
+		<value xml:lang="jp"><![CDATA[いいえ]]></value>
+		<value xml:lang="de"><![CDATA[Nein]]></value>
+		<value xml:lang="mn"><![CDATA[Дугаар]]></value>
+	</item>
+	<item name="invalid">
+		<value xml:lang="ko"><![CDATA[형식이 유효하지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[The value is invalid.]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/ru.lang.php b/modules/spamfilter/lang/ru.lang.php
deleted file mode 100644
index 58b91f150..000000000
--- a/modules/spamfilter/lang/ru.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    // действия
-    $lang->cmd_denied_ip = "Черный список IP-адресов";
-    $lang->cmd_denied_word = "Черный список слов";
-
-    // главные слова
-    $lang->spamfilter = "Фильтр спама";
-    $lang->denied_ip = "IP в черный список";
-    $lang->interval = "Интервал фильтрования спама";
-    $lang->limit_count = "Лимит публикаций";
-    $lang->check_trackback = "Проверять трекбек";
-    $lang->word = "Слово";
-    $lang->hit = '히트';
-    $lang->latest_hit = '최근 히트';
-
-    // описание
-    $lang->about_interval = "Все попытки разместить статьи в установленное время будут заблокированы.";
-    $lang->about_limit_count = "Если Вы вышли за лимит публикаций (статей/комментариев),\n Ваша статья будет разпознана как спам, и Ваш IP-адрес будет добавлен в черный список.";
-    $lang->about_denied_ip = "Вы можете добавить в черный список диапазон IP-адресов как 127.0.0.*, используя знак звездочки (*).";
-    $lang->about_denied_word = "Когда Вы добавляете слово в черный список,\n статьи с этим словом не будут опубликованы";
-    $lang->about_check_trackback = "Только трекбек для оного IP на статью может быть разрешен.";
-
-    // для отправки сообщений
-    $lang->msg_alert_limited_by_config = 'Размещение статьи с интервалом в %s секунд не разрешено.\n Если Вы будете многократно пытаться это сделать, Ваш IP-адрес может быть добавлен в черный список.';
-    $lang->msg_alert_denied_word = 'Слово "%s" запрещено для публикации.';
-    $lang->msg_alert_registered_denied_ip = 'Ваш IP-адрес занесен в черный список,\n поэтому Вы можете иметь ограничения на полноценное использование этого сайта.\n Если у Вас есть вопросы насчет этого, пожалуйста, сообщите администратору сайта.';
-    $lang->msg_alert_trackback_denied = 'Разрешен только один трекбек на статью.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/tr.lang.php b/modules/spamfilter/lang/tr.lang.php
deleted file mode 100644
index e4570ddb9..000000000
--- a/modules/spamfilter/lang/tr.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  English Language Pack (basic)
-     **/
-
-    // action related
-    $lang->cmd_denied_ip = "IP Adresleri Kara Listesi";
-    $lang->cmd_denied_word = "Yasak Sözcük Listesi";
-
-    // general word
-    $lang->spamfilter = "Spam filtreleyici";
-    $lang->denied_ip = "IP Adresi";
-    $lang->interval = "Spam filtreleyici için aralık";
-    $lang->limit_count = "Gönderi Sınırı";
-    $lang->check_trackback = "Geri izlemeleri kontrol et.";
-    $lang->word = "Kelime";
-    $lang->hit = 'Hit';
-    $lang->latest_hit = 'Son Hit\'ler';
-
-    // for description word
-    $lang->about_interval = "Belirlenen süre içerisinde gönderilmeye çalışılan tüm yazılar engellenecektir.";
-    $lang->about_limit_count = "Gönderi sınırını aşarsanız,\n o IP bir spam olarak kabul edilecek ve dolayısıyla yazı göndermede, yorum yapmada ve geri izlemede bulunmada sınırlamalarla karşılaşacaktır.";
-    $lang->about_denied_ip = "* işaretini kullanarak 127.0.0.* şeklinde IP adres aralığı ekleyebilirsiniz.";
-    $lang->about_denied_word = "Yasak sözcük listesine bir kelime eklediğinizde,\n o kelimeyi içeren tüm yazılar engellenecektir.";
-    $lang->about_check_trackback = "Geri izlemeler için yazı başına tek bir IP'ye izin verilir.";
-
-    // to post a message
-    $lang->msg_alert_limited_by_config = '%s saniyede bir yazı göndermek mümkün değildir.\n Denemeyi sürdürürseniz, IP adresiniz kara listeye alınacaktır.';
-    $lang->msg_alert_denied_word = ' "%s" kelimesinin kullanılmasına izin verilmemektedir.';
-    $lang->msg_alert_registered_denied_ip = 'IP adresiniz kara listeye alındı,\n siteyi kullanırken sınırlamalarla karşılaşacaksınız.\n Bu konuda sorularınız varsa, lütfen site yöneticisi ile görüşün.';
-    $lang->msg_alert_trackback_denied = 'Yazı başına sadece bir geri izlemeye izin verilmektedir.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/vi.lang.php b/modules/spamfilter/lang/vi.lang.php
deleted file mode 100644
index 9170010ae..000000000
--- a/modules/spamfilter/lang/vi.lang.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    // action related
-    $lang->cmd_denied_ip = "Danh sách IP cấm";
-    $lang->cmd_denied_word = "Danh sách từ cấm";
-
-    // general word
-    $lang->spamfilter = "Bộ lọc Spam";
-    $lang->denied_ip = "IP bị cấm";
-    $lang->interval = "Thời gian giới hạn";
-    $lang->limit_count = "Số bài viết giới hạn";
-    $lang->check_trackback = "Kiểm tra liên kết Web";
-    $lang->word = "Từ";
-    $lang->hit = 'Truy cập';
-    $lang->latest_hit = 'Truy cập mới nhất';
-
-    // for description word
-    $lang->about_interval = "Tất cả những bài viết trong thời gian giới hạn sẽ bị chặn.";
-    $lang->about_limit_count = "Nếu bạn gửi bài vượt quá số bài viết quy định,\n bài viết của bạn sẽ bị ghi vào danh sách và IP của bạn sẽ bị lưu vào danh sách IP bị cấm.";
-    $lang->about_denied_ip = "Bạn có thể thêm IP vào danh sách bị cấm dạng 127.0.0.* bằng cách sử dụng *.";
-    $lang->about_denied_word = "Khi bạn thêm từ vào danh sách Từ bị cấm,\n những bài viết có chứa những từ này sẽ không được gửi.";
-    $lang->about_check_trackback = "Chỉ cho phép gửi một bài viết với một IP trên một liên kết Web.";
-
-    // to post a message
-    $lang->msg_alert_limited_by_config = 'Không được phép gửi bài thứ 2 trong khoảng thời gian %s giây.\n Nếu bạn cứ tiếp tục, IP của bạn sẽ bị thêm vào danh sách IP bị cấm.';
-    $lang->msg_alert_denied_word = 'Không được phép gửi từ "%s".';
-    $lang->msg_alert_registered_denied_ip = 'IP của bạn đã bị nằm trong danh sách cấm,\n vì vậy bạn bị giới hạn sử dụng trên Website này.\n Nếu bạn có bất cứ thắc mắc gì, xin vui lòng liên hệ với Webmaster để được giải đáp.';
-    $lang->msg_alert_trackback_denied = 'Chỉ cho phép một liên kết Web trên một bài viết.';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/zh-CN.lang.php b/modules/spamfilter/lang/zh-CN.lang.php
deleted file mode 100644
index a3d968867..000000000
--- a/modules/spamfilter/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com)　翻译：guny
-     * @brief  垃圾过滤简体中文语言包
-     **/
-
-    // action 相关
-    $lang->cmd_denied_ip = "禁止IP列表";
-    $lang->cmd_denied_word = "敏感词列表";
-
-    // 一般用语
-    $lang->spamfilter = "垃圾过滤";
-    $lang->denied_ip = "禁止IP";
-    $lang->interval = "处理垃圾间隔";
-    $lang->limit_count = "限制数";
-    $lang->check_trackback = "检查引用";
-    $lang->word = "单词";
-    $lang->hit = '点击';
-    $lang->latest_hit = '最后点击';
-
-    // 说明文
-    $lang->about_interval = "指定的时间内禁止发表新主题。";
-    $lang->about_limit_count = "在指定时间内发表的新主题超过限制数时，系统将把它认为是垃圾主题，将自动禁止对方的IP。";
-    $lang->about_denied_ip = "禁止IP可以使用通配符。(如：如 \"127.0.*.*\"）";
-    $lang->about_denied_word = "登录为敏感词，可以对要发表的主题进行检测并禁止含有敏感词的主题发表。";
-    $lang->about_check_trackback = "对一个主题只允许一个IP引用。";
-
-    // 提示信息
-    $lang->msg_alert_limited_by_config = '%s秒之内不能连续发表新主题。如您继续再试系统将自动禁止您的IP。';
-    $lang->msg_alert_denied_word = '"%s"是敏感词！';
-    $lang->msg_alert_registered_denied_ip = '您的IP已被禁止，详情请联系网站管理员。';
-    $lang->msg_alert_trackback_denied = '一个主题只允许一个引用。';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/lang/zh-TW.lang.php b/modules/spamfilter/lang/zh-TW.lang.php
deleted file mode 100644
index af2336c2a..000000000
--- a/modules/spamfilter/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-    /**
-     * @file   modules/spamfilter/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  垃圾過濾(spamfilter)模組正體中文語言
-     **/
-
-    // action 相關
-    $lang->cmd_denied_ip = "禁止IP列表";
-    $lang->cmd_denied_word = "敏感詞清單";
-
-    // 一般用語
-    $lang->spamfilter = "垃圾過濾";
-    $lang->denied_ip = "禁止IP";
-    $lang->interval = "處理垃圾間隔";
-    $lang->limit_count = "限制數";
-    $lang->check_trackback = "檢查引用";
-    $lang->word = "單字";
-    $lang->hit = '히트';
-    $lang->latest_hit = '최근 히트';
-
-    // 說明
-    $lang->about_interval = "指定的時間內禁止發表新主題。";
-    $lang->about_limit_count = "在指定時間內發表的新主題超過限制數時，系統將會認為是垃圾主題，並自動禁止對方的IP。";
-    $lang->about_denied_ip = "禁止IP可以使用通配符。(如：如 \"127.0.*.*\"）";
-    $lang->about_denied_word = "登錄為敏感詞，可以對要發表的主題進行檢測並禁止含有敏感詞的主題發表。";
-    $lang->about_check_trackback = "對一個主題只允許一個IP引用。";
-
-    // 提示訊息
-    $lang->msg_alert_limited_by_config = '%s秒之內不能連續發表新主題。如您繼續再試系統將自動禁止您的IP。';
-    $lang->msg_alert_denied_word = '"%s"是敏感詞！';
-    $lang->msg_alert_registered_denied_ip = '您的IP已被禁止，詳情請聯繫網站管理員。';
-    $lang->msg_alert_trackback_denied = '一個主題只允許一個引用。';
-?>
\ No newline at end of file
diff --git a/modules/spamfilter/ruleset/deleteDeniedIp.xml b/modules/spamfilter/ruleset/deleteDeniedIp.xml
new file mode 100644
index 000000000..57632deda
--- /dev/null
+++ b/modules/spamfilter/ruleset/deleteDeniedIp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="ip" type="regex" test="/^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/[^\r\n]*)?[\r\n]*)*$/" />
+    </customrules>
+    <fields>
+		<field name="act" required="true" default="procSpamfilterAdminDeleteDeniedIP" />
+		<field name="ipaddress" required="true" rule="ip" />
+    </fields>
+</ruleset>
diff --git a/modules/spamfilter/ruleset/deleteDeniedWord.xml b/modules/spamfilter/ruleset/deleteDeniedWord.xml
new file mode 100644
index 000000000..823954439
--- /dev/null
+++ b/modules/spamfilter/ruleset/deleteDeniedWord.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+ 		<rule name="word" type="regex" test="/^(.{2,40}[\r\n]+)*.{2,40}$/"  />
+	</customrules>
+    <fields>
+		<field name="act" required="true" default="procSpamfilterAdminDeleteDeniedWord" />
+		<field name="word" required="true" rule="word" />
+    </fields>
+</ruleset>
diff --git a/modules/spamfilter/ruleset/insertSetting.xml b/modules/spamfilter/ruleset/insertSetting.xml
new file mode 100644
index 000000000..fb23e85ad
--- /dev/null
+++ b/modules/spamfilter/ruleset/insertSetting.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+   		<rule name="ip" type="regex" test="/^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/.*)?[^.]*)*$/" />
+ 		<rule name="word" type="regex" test="/^((.{2,40}[\r\n]+)*.{2,40})*$/" />
+	</customrules>
+    <fields>
+	    <field name="act" required="true" default="procSpamfilterAdminInsertSetting" />
+    </fields>
+</ruleset>
diff --git a/modules/spamfilter/spamfilter.admin.controller.php b/modules/spamfilter/spamfilter.admin.controller.php
index b0fa708e2..8b0071b7c 100644
--- a/modules/spamfilter/spamfilter.admin.controller.php
+++ b/modules/spamfilter/spamfilter.admin.controller.php
@@ -1,99 +1,136 @@
-<?php
-    /**
-     * @class  spamfilterAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  spamfilter 모듈의 admin controller class
-     **/
-
-    class spamfilterAdminController extends spamfilter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 스팸필터 설정
-         **/
-        function procSpamfilterAdminInsertConfig() {
-            // 기본 정보를 받음
-            $args = Context::gets('interval','limit_count','check_trackback');
-            if($args->check_trackback!='Y') $args->check_trackback = 'N';
-
-            // module Controller 객체 생성하여 입력
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('spamfilter',$args);
-            return $output;
-        }
-        
-        /**
-         * @brief 금지 IP등록
-         **/
-        function procSpamfilterAdminInsertDeniedIP() {
-            $ipaddress = Context::get('ipaddress');
-            $description = Context::get('description');
-
-            $oSpamfilterController = &getController('spamfilter');
-            return $oSpamfilterController->insertIP($ipaddress, $description);
-        }
-
-        /**
-         * @brief 금지 IP삭제
-         **/
-        function procSpamfilterAdminDeleteDeniedIP() {
-            $ipaddress = Context::get('ipaddress');
-            return $this->deleteIP($ipaddress);
-        }
-        
-        /**
-         * @brief 금지 Word등록
-         **/
-        function procSpamfilterAdminInsertDeniedWord() {
-            $word = Context::get('word');
-            return $this->insertWord($word);
-        }
-
-        /**
-         * @brief 금지 Word삭제
-         **/
-        function procSpamfilterAdminDeleteDeniedWord() {
-            $word = base64_decode(Context::get('word'));
-            return $this->deleteWord($word);
-        }
-
-        /**
-         * @brief IP 제거
-         * 스패머로 등록된 IP를 제거
-         **/
-        function deleteIP($ipaddress) {
-            if(!$ipaddress) return;
-
-            $args->ipaddress = $ipaddress;
-            return executeQuery('spamfilter.deleteDeniedIP', $args);
-        }
-
-        /**
-         * @brief 스팸단어 등록
-         * 등록된 단어가 포함된 글은 스팸글로 간주
-         **/
-        function insertWord($word) {
-            if(!$word) return;
-
-            $args->word = $word;
-            return executeQuery('spamfilter.insertDeniedWord', $args);
-        }
-
-        /**
-         * @brief 스팸단어 제거
-         * 스팸 단어로 등록된 단어 제거
-         **/
-        function deleteWord($word) {
-            if(!$word) return;
-
-            $args->word = $word;
-            return executeQuery('spamfilter.deleteDeniedWord', $args);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  spamfilterAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin controller class of the spamfilter module
+     **/
+
+    class spamfilterAdminController extends spamfilter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+
+		function procSpamfilterAdminInsertConfig() {
+
+            // Get the default information
+            $argsConfig = Context::gets('limits','check_trackback');
+			$flag = Context::get('flag');
+			//interval, limit_count
+            if($argsConfig->check_trackback!='Y') $argsConfig->check_trackback = 'N';
+       	    if($argsConfig->limits!='Y') $argsConfig->limits = 'N';
+            // Create and insert the module Controller object
+   	        $oModuleController = &getController('module');
+       	    $moduleConfigOutput = $oModuleController->insertModuleConfig('spamfilter',$argsConfig);
+			if(!$moduleConfigOutput->toBool()) return $moduleConfigOutput;
+
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+				header('location:'.$returnUrl);
+				return;
+			}
+            return false;
+		}
+
+		function procSpamfilterAdminInsertDeniedIP(){
+			//스팸IP  추가
+			$ipaddressList = Context::get('ipaddressList');
+            $oSpamfilterController = &getController('spamfilter');
+			if($ipaddressList){
+            	$insertIPOutput = $oSpamfilterController->insertIP($ipaddressList);
+				if(!$insertIPOutput->toBool()) return $insertIPOutput;
+			}
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+				header('location:'.$returnUrl);
+				return;
+			}
+            return false;
+
+		}
+		function procSpamfilterAdminInsertDeniedWord(){
+			//스팸 키워드 추가
+			$wordList = Context::get('wordList');
+          	if($wordList){
+				$insertWordOutput = $this->insertWord($wordList);
+				if(!$insertWordOutput->toBool()) return $insertWordOutput;
+			}
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+				header('location:'.$returnUrl);
+				return;
+			}
+            return false;
+		}
+        
+        /**
+         * @brief Delete the banned IP
+         **/
+        function procSpamfilterAdminDeleteDeniedIP() {
+            $ipaddress = Context::get('ipaddress');
+            $output = $this->deleteIP($ipaddress);
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+				header('location:'.$returnUrl);
+				return;
+			}
+			return $output;
+        }
+        
+        /**
+         * @brief Delete the prohibited Word
+         **/
+        function procSpamfilterAdminDeleteDeniedWord() {
+            $word = Context::get('word');
+            //$word = base64_decode(Context::get('word'));
+            $output = $this->deleteWord($word);
+			
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispSpamfilterAdminSetting');
+				header('location:'.$returnUrl);
+				return;
+			}
+			return $output;
+        }
+
+        /**
+         * @brief Delete IP
+         * Remove the IP address which was previously registered as a spammers
+         **/
+        function deleteIP($ipaddress) {
+            if(!$ipaddress) return;
+
+            $args->ipaddress = $ipaddress;
+            return executeQuery('spamfilter.deleteDeniedIP', $args);
+        }
+
+        /**
+         * @brief Register the spam word
+         * The post, which contains the newly registered spam word, should be considered as a spam
+         **/
+        function insertWord($wordList) {
+			$wordList = str_replace("\r","",$wordList);
+            $wordList = explode("\n",$wordList);
+            foreach($wordList as $wordKey => $word) {
+				if(trim($word)) $args->word = $word;
+        		$output = executeQuery('spamfilter.insertDeniedWord', $args);
+            	if(!$output->toBool()) return $output;
+			}
+			return $output;
+        }
+
+        /**
+         * @brief Remove the spam word
+         * Remove the word which was previously registered as a spam word
+         **/
+        function deleteWord($word) {
+            if(!$word) return;
+            $args->word = $word;
+            return executeQuery('spamfilter.deleteDeniedWord', $args);
+        }
+
+    }
+?>
diff --git a/modules/spamfilter/spamfilter.admin.view.php b/modules/spamfilter/spamfilter.admin.view.php
index e422ed0bd..bcf427da7 100644
--- a/modules/spamfilter/spamfilter.admin.view.php
+++ b/modules/spamfilter/spamfilter.admin.view.php
@@ -1,65 +1,44 @@
-<?php
-    /**
-     * @class  spamfilterAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  spamfilter 모듈의 admin view class
-     **/
-
-    class spamfilterAdminView extends spamfilter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            // 템플릿 경로 지정 
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 스팸필터의 설정 화면
-         **/
-        function dispSpamfilterAdminConfig() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('spamfilter');
-            Context::set('config',$config);
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('index');
-        }
-
-        /**
-         * @brief 금지 목록 출력
-         **/
-        function dispSpamfilterAdminDeniedIPList() {
-            // 등록된 금지 IP 목록을 가져옴
-            $oSpamFilterModel = &getModel('spamfilter');
-            $ip_list = $oSpamFilterModel->getDeniedIPList();
-
-            Context::set('ip_list', $ip_list);
-			
-			$security = new Security();
-			$security->encodeHTML('ip_list..');
-			
-            // 템플릿 파일 지정
-            $this->setTemplateFile('denied_ip_list');
-        }
-
-        /**
-         * @brief 금지 목록 출력
-         **/
-        function dispSpamfilterAdminDeniedWordList() {
-            // 등록된 금지 Word 목록을 가져옴
-            $oSpamFilterModel = &getModel('spamfilter');
-            $word_list = $oSpamFilterModel->getDeniedWordList();
-
-            Context::set('word_list', $word_list);
-			
-			$security = new Security();
-			$security->encodeHTML('word_list..word');
-			
-            // 템플릿 파일 지정
-            $this->setTemplateFile('denied_word_list');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  spamfilterAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief The admin view class of the spamfilter module
+     **/
+
+    class spamfilterAdminView extends spamfilter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            // Set template path
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Spam Filter configurations
+		 *        Output the list of banned IPs and words
+         **/
+		function dispSpamfilterAdminSetting() {
+            // Get configurations (using module model object)
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('spamfilter');
+			
+			// Get the list of denied IP addresses and words
+			$oSpamFilterModel = &getModel('spamfilter');
+            $ip_list = $oSpamFilterModel->getDeniedIPList();
+            $word_list = $oSpamFilterModel->getDeniedWordList();
+
+            Context::set('config',$config);
+            Context::set('ip_list', $ip_list);
+            Context::set('word_list', $word_list);
+            
+			$security = new Security();
+			$security->encodeHTML('word_list..word');
+			$security->encodeHTML('ip_list..');
+
+			// Set a template file
+            $this->setTemplateFile('index');
+		}
+    }
+?>
diff --git a/modules/spamfilter/spamfilter.class.php b/modules/spamfilter/spamfilter.class.php
index 7a0191dd8..34d0f3837 100644
--- a/modules/spamfilter/spamfilter.class.php
+++ b/modules/spamfilter/spamfilter.class.php
@@ -1,108 +1,101 @@
-<?php
-    /**
-     * @class  spamfilter
-     * @author NHN (developers@xpressengine.com)
-     * @brief  spamfilter 모듈의 high class
-     **/
-
-    class spamfilter extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-
-            // 2007. 12. 7 글/ 댓글/ 엮인글이 등록될때 스팸필터링을 시도하는 트리거
-            $oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-            $oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-            $oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
-
-
-            //2008-12-17 글 수정시 스펨필터 추가
-            $oModuleController->insertTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-            $oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-
-            // 2007. 12. 7 글/ 댓글/ 엮인글이 등록될때 스팸필터링을 시도하는 트리거
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
-            if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
-
-            //2008-12-17 글 수정시 스펨필터 추가
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
-
-            /**
-             * 히트 카운트 필드(hit) 추가
-             **/
-            if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
-            if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
-
-            if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oDB = &DB::getInstance();
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 2007. 12. 7 글/ 댓글/ 엮인글이 등록될때 스팸필터링을 시도하는 트리거
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
-                $oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-            if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
-                $oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-            if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
-                $oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
-
-            //2008-12-17 글 수정시 스펨필터 추가
-            if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')){
-                $oModuleController->insertTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
-            }
-            //2008-12-17 글 수정시 스펨필터 추가
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')){
-                $oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
-            }
-
-            /**
-             * 히트 카운트 필드(hit) 추가
-             **/
-            if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) {
-                $oDB->addColumn('spamfilter_denied_word','hit','number',12,0,true);
-                $oDB->addIndex('spamfilter_denied_word','idx_hit', 'hit');
-            }
-            if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) {
-                $oDB->addColumn('spamfilter_denied_word','latest_hit','date');
-                $oDB->addIndex('spamfilter_denied_word','idx_latest_hit', 'latest_hit');
-            }
-
-            if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) {
-                $oDB->addColumn('spamfilter_denied_ip','description','varchar', 250);
-            }
-
-            return new Object(0,'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
+<?php
+    /**
+     * @class  spamfilter
+     * @author NHN (developers@xpressengine.com)
+     * @brief The parent class of the spamfilter module
+     **/
+
+    class spamfilter extends ModuleObject {
+
+        /**
+         * @brief Additional tasks required to accomplish during the installation
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+            // 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
+            $oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
+            $oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
+            $oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
+            // 2008-12-17 Add a spamfilter for post modification actions
+            $oModuleController->insertTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
+            $oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
+
+
+            return new Object();
+        }
+
+        /**
+         * @brief A method to check if the installation has been successful
+         **/
+        function checkUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            // 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
+            if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before')) return true;
+            // 2008-12-17 Add a spamfilter for post modification actions
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')) return true;
+
+            /**
+             * Add the hit count field (hit)
+             **/
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) return true;
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) return true;
+
+            if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // 2007.12.7 The triggers which try to perform spam filtering when new posts/comments/trackbacks are registered
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before'))
+                $oModuleController->insertTrigger('document.insertDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
+            if(!$oModuleModel->getTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before'))
+                $oModuleController->insertTrigger('comment.insertComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
+            if(!$oModuleModel->getTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before'))
+                $oModuleController->insertTrigger('trackback.insertTrackback', 'spamfilter', 'controller', 'triggerInsertTrackback', 'before');
+            // 2008-12-17 Add a spamfilter for post modification actions
+            if(!$oModuleModel->getTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before')){
+                $oModuleController->insertTrigger('comment.updateComment', 'spamfilter', 'controller', 'triggerInsertComment', 'before');
+            }
+            // 2008-12-17 Add a spamfilter for post modification actions
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before')){
+                $oModuleController->insertTrigger('document.updateDocument', 'spamfilter', 'controller', 'triggerInsertDocument', 'before');
+            }
+
+            /**
+             * Add the hit count field (hit)
+             **/
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'hit')) {
+                $oDB->addColumn('spamfilter_denied_word','hit','number',12,0,true);
+                $oDB->addIndex('spamfilter_denied_word','idx_hit', 'hit');
+            }
+            if(!$oDB->isColumnExists('spamfilter_denied_word', 'latest_hit')) {
+                $oDB->addColumn('spamfilter_denied_word','latest_hit','date');
+                $oDB->addIndex('spamfilter_denied_word','idx_latest_hit', 'latest_hit');
+            }
+
+            if(!$oDB->isColumnExists('spamfilter_denied_ip', 'description')) {
+                $oDB->addColumn('spamfilter_denied_ip','description','varchar', 250);
+            }
+
+            return new Object(0,'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
 ?>
\ No newline at end of file
diff --git a/modules/spamfilter/spamfilter.controller.php b/modules/spamfilter/spamfilter.controller.php
index 8f774da17..3a10946c2 100644
--- a/modules/spamfilter/spamfilter.controller.php
+++ b/modules/spamfilter/spamfilter.controller.php
@@ -1,173 +1,169 @@
-<?php
-    /**
-     * @class  spamfilterController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  spamfilter 모듈의 controller class
-     **/
-
-    class spamfilterController extends spamfilter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 배치작업등을 할때 스팸필터의 사용을 중지 시킬 필요가 있을 경우 호출
-         **/
-        function setAvoidLog() {
-            $_SESSION['avoid_log'] = true;
-        }
-
-        /**
-         * @brief 글 작성시 글 작성 시간 체크 및 금지 ip/단어 처리 루틴
-         **/
-        function triggerInsertDocument(&$obj) {
-            if($_SESSION['avoid_log']) return new Object();
-
-            // 로그인 여부, 로그인 정보, 권한 유무 체크
-            $is_logged = Context::get('is_logged');
-            $logged_info = Context::get('logged_info');
-            $grant = Context::get('grant');
-
-            // 로그인 되어 있을 경우 관리자 여부를 체크
-            if($is_logged) {
-                if($logged_info->is_admin == 'Y') return new Object();
-                if($grant->manager) return new Object();
-            }
-
-            $oFilterModel = &getModel('spamfilter');
-
-            // ip가 금지되어 있는 경우를 체크
-            $output = $oFilterModel->isDeniedIP();
-            if(!$output->toBool()) return $output;
-
-            // 금지 단어에 있을 경우 체크
-            $text = $obj->title.$obj->content;
-            $output = $oFilterModel->isDeniedWord($text);
-            if(!$output->toBool()) return $output;
-
-            // 지정된 시간 체크, 수정시 제외
-            if($obj->document_srl == 0){
-                $output = $oFilterModel->checkLimited();
-                if(!$output->toBool()) return $output;
-            }
-
-            // 로그 남김
-            $this->insertLog();
-
-            return new Object();
-        }
-
-        /**
-         * @brief 댓글 작성 시간 및 금지 ip/ 단어 처리 루틴
-         **/
-        function triggerInsertComment(&$obj) {
-            if($_SESSION['avoid_log']) return new Object();
-
-            // 로그인 여부, 로그인 정보, 권한 유무 체크
-            $is_logged = Context::get('is_logged');
-            $logged_info = Context::get('logged_info');
-            $grant = Context::get('grant');
-
-            // 로그인 되어 있을 경우 관리자 여부를 체크
-            if($is_logged) {
-                if($logged_info->is_admin == 'Y') return new Object();
-                if($grant->manager) return new Object();
-            }
-
-            $oFilterModel = &getModel('spamfilter');
-
-            // ip가 금지되어 있는 경우를 체크
-            $output = $oFilterModel->isDeniedIP();
-            if(!$output->toBool()) return $output;
-
-            // 금지 단어에 있을 경우 체크
-            $text = $obj->content;
-            $output = $oFilterModel->isDeniedWord($text);
-            if(!$output->toBool()) return $output;
-
-            // 지정된 시간 체크 수정이 아닌경우만
-            if(!$obj->__isupdate){
-                $output = $oFilterModel->checkLimited();
-                if(!$output->toBool()) return $output;
-            }
-            unset($obj->__isupdate);
-
-            // 로그 남김
-            $this->insertLog();
-
-            return new Object();
-        }
-
-        /**
-         * @brief 엮인글 작성시 시간 및 ip 검사
-         **/
-        function triggerInsertTrackback(&$obj) {
-            if($_SESSION['avoid_log']) return new Object();
-
-            $oFilterModel = &getModel('spamfilter');
-
-            // 해당 글에 엮인글을 한번 이상 추가하였는지를 확인
-            $output = $oFilterModel->isInsertedTrackback($obj->document_srl);
-            if(!$output->toBool()) return $output;
-            
-            // ip가 금지되어 있는 경우를 체크
-            $output = $oFilterModel->isDeniedIP();
-            if(!$output->toBool()) return $output;
-
-            // 금지 단어에 있을 경우 체크
-            $text = $obj->blog_name.$obj->title.$obj->excerpt.$obj->url;
-            $output = $oFilterModel->isDeniedWord($text);
-            if(!$output->toBool()) return $output;
-
-            // 필터링 시작
-            $oTrackbackModel = &getModel('trackback');
-            $oTrackbackController = &getController('trackback');
-
-            list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
-            $ipaddress = $ipA.'.'.$ipB.'.'.$ipC;
-
-            // 제목과 블로그이름이 동일할 경우 최근 6시간내의 ip를 조사하여 삭제하고 금지ip로 등록
-            if($obj->title == $obj->excerpt) {
-                $oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
-                $this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback');
-                return new Object(-1,'msg_alert_trackback_denied');
-            }
-
-            // 30분 이내에 1개 이상의 한 C클래스의 ip에서 엮인글 등록 시도시 금지 아이피로 지정하고 해당 ip의 글을 모두 삭제
-            /* 호스팅 환경을 감안하여 일단 이 부분은 동작하지 않도록 주석 처리
-            $count = $oTrackbackModel->getRegistedTrackback(30*60, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
-            if($count > 1) {
-                $oTrackbackController->deleteTrackbackSender(3*60, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
-                $this->insertIP($ipaddress.'.*');
-                return new Object(-1,'msg_alert_trackback_denied');
-            }
-            */
-
-            return new Object();
-        }
-
-        /**
-         * @brief IP 등록
-         * 등록된 IP는 스패머로 간주
-         **/
-        function insertIP($ipaddress, $description = null) {
-            $args->ipaddress = $ipaddress;
-            if($description) $args->description = $description;
-
-            return executeQuery('spamfilter.insertDeniedIP', $args);
-        }
-
-        /**
-         * @brief 로그 등록
-         * 현 접속 IP를 로그에 등록, 로그의 간격이 특정 시간 이내일 경우 도배로 간주하여
-         * 스패머로 등록할 수 있음
-         **/
-        function insertLog() {
-            $output = executeQuery('spamfilter.insertLog');
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  spamfilterController
+     * @author NHN (developers@xpressengine.com)
+     * @brief The controller class for the spamfilter module
+     **/
+
+    class spamfilterController extends spamfilter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Call this function in case you need to stop the spam filter's usage during the batch work
+         **/
+        function setAvoidLog() {
+            $_SESSION['avoid_log'] = true;
+        }
+
+        /**
+         * @brief The routine process to check the time it takes to store a document, when writing it, and to ban IP/word
+         **/
+        function triggerInsertDocument(&$obj) {
+            if($_SESSION['avoid_log']) return new Object();
+            // Check the login status, login information, and permission
+            $is_logged = Context::get('is_logged');
+            $logged_info = Context::get('logged_info');
+            $grant = Context::get('grant');
+            // In case logged in, check if it is an administrator
+            if($is_logged) {
+                if($logged_info->is_admin == 'Y') return new Object();
+                if($grant->manager) return new Object();
+            }
+
+            $oFilterModel = &getModel('spamfilter');
+            // Check if the IP is prohibited
+            $output = $oFilterModel->isDeniedIP();
+            if(!$output->toBool()) return $output;
+            // Check if there is a ban on the word
+            $text = $obj->title.$obj->content;
+            $output = $oFilterModel->isDeniedWord($text);
+            if(!$output->toBool()) return $output;
+            // Check the specified time beside the modificaiton time
+            if($obj->document_srl == 0){
+                $output = $oFilterModel->checkLimited();
+                if(!$output->toBool()) return $output;
+            }
+            // Save a log
+            $this->insertLog();
+
+            return new Object();
+        }
+
+        /**
+         * @brief The routine process to check the time it takes to store a comment, and to ban IP/word
+         **/
+        function triggerInsertComment(&$obj) {
+            if($_SESSION['avoid_log']) return new Object();
+            // Check the login status, login information, and permission
+            $is_logged = Context::get('is_logged');
+            $logged_info = Context::get('logged_info');
+            $grant = Context::get('grant');
+            // In case logged in, check if it is an administrator
+            if($is_logged) {
+                if($logged_info->is_admin == 'Y') return new Object();
+                if($grant->manager) return new Object();
+            }
+
+            $oFilterModel = &getModel('spamfilter');
+            // Check if the IP is prohibited
+            $output = $oFilterModel->isDeniedIP();
+            if(!$output->toBool()) return $output;
+            // Check if there is a ban on the word
+            $text = $obj->content;
+            $output = $oFilterModel->isDeniedWord($text);
+            if(!$output->toBool()) return $output;
+            // If the specified time check is not modified
+            if(!$obj->__isupdate){
+                $output = $oFilterModel->checkLimited();
+                if(!$output->toBool()) return $output;
+            }
+            unset($obj->__isupdate);
+            // Save a log
+            $this->insertLog();
+
+            return new Object();
+        }
+
+        /**
+         * @brief Inspect the trackback creation time and IP
+         **/
+        function triggerInsertTrackback(&$obj) {
+            if($_SESSION['avoid_log']) return new Object();
+
+            $oFilterModel = &getModel('spamfilter');
+            // Confirm if the trackbacks have been added more than once to your document
+            $output = $oFilterModel->isInsertedTrackback($obj->document_srl);
+            if(!$output->toBool()) return $output;
+            
+            // Check if the IP is prohibited
+            $output = $oFilterModel->isDeniedIP();
+            if(!$output->toBool()) return $output;
+            // Check if there is a ban on the word
+            $text = $obj->blog_name.$obj->title.$obj->excerpt.$obj->url;
+            $output = $oFilterModel->isDeniedWord($text);
+            if(!$output->toBool()) return $output;
+            // Start Filtering
+            $oTrackbackModel = &getModel('trackback');
+            $oTrackbackController = &getController('trackback');
+
+            list($ipA,$ipB,$ipC,$ipD) = explode('.',$_SERVER['REMOTE_ADDR']);
+            $ipaddress = $ipA.'.'.$ipB.'.'.$ipC;
+            // In case the title and the blog name are indentical, investigate the IP address of the last 6 hours, delete and ban it.
+            if($obj->title == $obj->excerpt) {
+                $oTrackbackController->deleteTrackbackSender(60*60*6, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+                $this->insertIP($ipaddress.'.*', 'AUTO-DENIED : trackback.insertTrackback');
+                return new Object(-1,'msg_alert_trackback_denied');
+            }
+            // If trackbacks have been registered by one C-class IP address more than once for the last 30 minutes, ban the IP address and delete all the posts
+            /* 호스팅 환경을 감안하여 일단 이 부분은 동작하지 않도록 주석 처리
+            $count = $oTrackbackModel->getRegistedTrackback(30*60, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+            if($count > 1) {
+                $oTrackbackController->deleteTrackbackSender(3*60, $ipaddress, $obj->url, $obj->blog_name, $obj->title, $obj->excerpt);
+                $this->insertIP($ipaddress.'.*');
+                return new Object(-1,'msg_alert_trackback_denied');
+            }
+            */
+
+            return new Object();
+        }
+
+        /**
+         * @brief IP registration
+         * The registered IP address is considered as a spammer
+         **/
+        function insertIP($ipaddressList, $description = null) {
+			//리눅스시.. 변환부분 체크하는 것 다시 봐야할 듯.
+			$ipaddressList = str_replace("\r","",$ipaddressList);
+			$ipaddressList = explode("\n",$ipaddressList);
+			foreach($ipaddressList as $ipaddressKey => $ipaddressValue) {
+				preg_match("/(\d{1,3}(?:.(\d{1,3}|\*)){3})\s*(\/\/\s*(.*))?/",$ipaddressValue,$matches);
+				if($ipaddress=trim($matches[1])) {
+					$args->ipaddress = $ipaddress;
+					if(!$description && $matches[4]) $args->description = $matches[4];
+					else $args->description = $description;
+				}
+
+				$output = executeQuery('spamfilter.insertDeniedIP', $args);
+
+				if(!$output->toBool()) return $output;
+			}
+			return $output;
+
+        }
+
+        /**
+         * @brief Log registration
+         * Register the newly accessed IP address in the log. In case the log interval is withing a certain time,
+         * register it as a spammer
+         **/
+        function insertLog() {
+            $output = executeQuery('spamfilter.insertLog');
+            return $output;
+        }
+    }
+?>
diff --git a/modules/spamfilter/spamfilter.model.php b/modules/spamfilter/spamfilter.model.php
index 263302aff..0ae3a3729 100644
--- a/modules/spamfilter/spamfilter.model.php
+++ b/modules/spamfilter/spamfilter.model.php
@@ -1,150 +1,149 @@
-<?php
-    /**
-     * @class  spamfilterModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  spamfilter 모듈의 Model class
-     **/
-
-    class spamfilterModel extends spamfilter {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 스팸필터 모듈의 사용자 설정 값 return
-         **/
-        function getConfig() {
-            // 설정 정보를 받아옴 (module model 객체를 이용)
-            $oModuleModel = &getModel('module');
-            return $oModuleModel->getModuleConfig('spamfilter');
-        }
-
-        /**
-         * @brief 등록된 금지 IP의 목록을 return
-         **/
-        function getDeniedIPList() {
-            $args->sort_index = "regdate";
-            $args->page = Context::get('page')?Context::get('page'):1;
-            $output = executeQuery('spamfilter.getDeniedIPList', $args);
-            if(!$output->data) return;
-            if(!is_array($output->data)) return array($output->data);
-            return $output->data;
-        }
-
-        /**
-         * @brief 인자로 넘겨진 ipaddress가 금지 ip인지 체크하여 return
-         **/
-        function isDeniedIP() {
-            $ipaddress = $_SERVER['REMOTE_ADDR'];
-
-            $ip_list = $this->getDeniedIPList();
-            if(!count($ip_list)) return new Object();
-
-            $count = count($ip_list);
-            $patterns = array();
-            for($i=0;$i<$count;$i++) {
-                $ip = str_replace('*','',$ip_list[$i]->ipaddress);
-                $patterns[] = preg_quote($ip);
-            }
-
-            $pattern = '/^('.implode($patterns,'|').')/';
-
-            if(preg_match($pattern, $ipaddress, $matches)) return new Object(-1,'msg_alert_registered_denied_ip');
-             
-            return new Object();
-        }
-
-        /**
-         * @brief 등록된 금지 Word 의 목록을 return
-         **/
-        function getDeniedWordList() {
-            $args->sort_index = "hit";
-            $output = executeQuery('spamfilter.getDeniedWordList', $args);
-            if(!$output->data) return;
-            if(!is_array($output->data)) return array($output->data);
-            return $output->data;
-        }
-
-        /**
-         * @brief 넘어온 text에 금지 단어가 있는지 확인
-         **/
-        function isDeniedWord($text) {
-            $word_list = $this->getDeniedWordList();
-            if(!count($word_list)) return new Object();
-
-            $count = count($word_list);
-            for($i=0;$i<$count;$i++) {
-                $word = $word_list[$i]->word;
-                if(preg_match('/'.preg_quote($word,'/').'/is', $text)) {
-                    $args->word = $word;
-                    $output = executeQuery('spamfilter.updateDeniedWordHit', $args);
-                    return new Object(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
-                }
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief 지정된 시간을 체크
-         **/
-        function checkLimited() {
-            $config = $this->getConfig();
-            $limit_count = $config->limit_count?$config->limit_count:5;
-            $interval = $config->interval;
-            if(!$interval) return new Object();
-
-            $count = $this->getLogCount($interval);
-
-            $ipaddress = $_SERVER['REMOTE_ADDR'];
-
-            // 정해진 시간보다 클 경우 금지 ip로 등록
-            if($count>=$limit_count) {
-                $oSpamFilterController = &getController('spamfilter');
-                $oSpamFilterController->insertIP($ipaddress, 'AUTO-DENIED : Over limit');
-                return new Object(-1, 'msg_alert_registered_denied_ip');
-            }
-
-            // 제한 글수까지는 아니지만 정해진 시간내에 글 작성을 계속 할때
-            if($count) {
-                $message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
-
-                $oSpamFilterController = &getController('spamfilter');
-                $oSpamFilterController->insertLog();
-
-                return new Object(-1, $message);
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 글에 이미 엮인글이 등록되어 있는지 확인
-         **/
-        function isInsertedTrackback($document_srl) {
-            $oTrackbackModel = &getModel('trackback');
-            $count = $oTrackbackModel->getTrackbackCountByIPAddress($document_srl, $_SERVER['REMOTE_ADDR']);
-            if($count>0) return new Object(-1, 'msg_alert_trackback_denied');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 지정된 IPaddress의 특정 시간대 내의 로그 수를 return
-         **/
-        function getLogCount($time = 60, $ipaddress='') {
-            if(!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
-
-            $args->ipaddress = $ipaddress;
-            $args->regdate = date("YmdHis", time()-$time);
-            $output = executeQuery('spamfilter.getLogCount', $args);
-            $count = $output->data->count;
-            return $count;
-        }
-
-
-    }
-?>
+<?php
+    /**
+     * @class  spamfilterModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief The Model class of the spamfilter module
+     **/
+
+    class spamfilterModel extends spamfilter {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Return the user setting values of the Spam filter module
+         **/
+        function getConfig() {
+            // Get configurations (using the module model object)
+            $oModuleModel = &getModel('module');
+            return $oModuleModel->getModuleConfig('spamfilter');
+        }
+
+        /**
+         * @brief Return the list of registered IP addresses which were banned
+         **/
+        function getDeniedIPList() {
+            $args->sort_index = "regdate";
+            $args->page = Context::get('page')?Context::get('page'):1;
+            $output = executeQuery('spamfilter.getDeniedIPList', $args);
+            if(!$output->data) return;
+            if(!is_array($output->data)) return array($output->data);
+            return $output->data;
+        }
+
+        /**
+         * @brief Check if the ipaddress is in the list of banned IP addresses
+         **/
+        function isDeniedIP() {
+            $ipaddress = $_SERVER['REMOTE_ADDR'];
+
+            $ip_list = $this->getDeniedIPList();
+            if(!count($ip_list)) return new Object();
+
+            $count = count($ip_list);
+            $patterns = array();
+            for($i=0;$i<$count;$i++) {
+                $ip = str_replace('*','',$ip_list[$i]->ipaddress);
+                $patterns[] = preg_quote($ip);
+            }
+
+            $pattern = '/^('.implode($patterns,'|').')/';
+
+            if(preg_match($pattern, $ipaddress, $matches)) return new Object(-1,'msg_alert_registered_denied_ip');
+             
+            return new Object();
+        }
+
+        /**
+         * @brief Return the list of registered Words which were banned
+         **/
+        function getDeniedWordList() {
+            $args->sort_index = "hit";
+            $output = executeQuery('spamfilter.getDeniedWordList', $args);
+            if(!$output->data) return;
+            if(!is_array($output->data)) return array($output->data);
+            return $output->data;
+        }
+
+        /**
+         * @brief Check if the text, received as a parameter, is banned or not
+         **/
+        function isDeniedWord($text) {
+            $word_list = $this->getDeniedWordList();
+            if(!count($word_list)) return new Object();
+
+            $count = count($word_list);
+            for($i=0;$i<$count;$i++) {
+                $word = $word_list[$i]->word;
+                if(preg_match('/'.preg_quote($word,'/').'/is', $text)) {
+                    $args->word = $word;
+                    $output = executeQuery('spamfilter.updateDeniedWordHit', $args);
+                    return new Object(-1,sprintf(Context::getLang('msg_alert_denied_word'), $word));
+                }
+            }
+
+            return new Object();
+        }
+
+        /**
+         * @brief Check the specified time
+         **/
+        function checkLimited() {
+            $config = $this->getConfig();
+			
+			if($config->limits != 'Y') return new Object(); 
+			$limit_count = '3';
+			$interval = '10';
+
+            $count = $this->getLogCount($interval);
+
+            $ipaddress = $_SERVER['REMOTE_ADDR'];
+            // Ban the IP address if the interval is exceeded
+            if($count>=$limit_count) {
+                $oSpamFilterController = &getController('spamfilter');
+                $oSpamFilterController->insertIP($ipaddress, 'AUTO-DENIED : Over limit');
+                return new Object(-1, 'msg_alert_registered_denied_ip');
+            }
+            // If the number of limited posts is not reached, keep creating.
+            if($count) {
+                $message = sprintf(Context::getLang('msg_alert_limited_by_config'), $interval);
+
+                $oSpamFilterController = &getController('spamfilter');
+                $oSpamFilterController->insertLog();
+
+                return new Object(-1, $message);
+            }
+
+            return new Object();
+        }
+
+        /**
+         * @brief Check if the trackbacks have already been registered to a particular article
+         **/
+        function isInsertedTrackback($document_srl) {
+            $oTrackbackModel = &getModel('trackback');
+            $count = $oTrackbackModel->getTrackbackCountByIPAddress($document_srl, $_SERVER['REMOTE_ADDR']);
+            if($count>0) return new Object(-1, 'msg_alert_trackback_denied');
+
+            return new Object();
+        }
+
+        /**
+         * @brief Return the number of logs recorded within the interval for the specified IPaddress
+         **/
+        function getLogCount($time = 60, $ipaddress='') {
+            if(!$ipaddress) $ipaddress = $_SERVER['REMOTE_ADDR'];
+
+            $args->ipaddress = $ipaddress;
+            $args->regdate = date("YmdHis", time()-$time);
+            $output = executeQuery('spamfilter.getLogCount', $args);
+            $count = $output->data->count;
+            return $count;
+        }
+
+
+    }
+?>
diff --git a/modules/spamfilter/tpl/denied_ip_list.html b/modules/spamfilter/tpl/denied_ip_list.html
deleted file mode 100644
index 750d0314a..000000000
--- a/modules/spamfilter/tpl/denied_ip_list.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!--%import("filter/insert_denied_ip.xml")-->
-<!--%import("filter/delete_denied_ip.xml")-->
-
-<!--#include("header.html")-->
-
-<!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
-<form id="fo_denied_ip" action="./" method="get">
-<input type="hidden" name="ipaddress" value="" />
-</form>
-
-<!-- 수동 추가 -->
-<form action="./" method="get" onsubmit="return procFilter(this, insert_denied_ip)">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->denied_ip}</div></th>
-        <td>
-            <input type="text" name="ipaddress" value="" class="inputTypeText" />
-            <p>{$lang->about_denied_ip}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->description}</div></th>
-        <td>
-            <input type="text" name="description" value="" class="inputTypeText" />
-        </td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</form>
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable">
-<caption>Total{count($ip_list)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-        <th scope="col"><div>{$lang->description}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($ip_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td>{count($ip_list)-$no}</td>
-        <td>{$val->ipaddress}</td>
-        <td class="wide">{$val->description}</td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        <td><a href="#" onclick="doDeleteDeniedIP('{$val->ipaddress}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
diff --git a/modules/spamfilter/tpl/denied_word_list.html b/modules/spamfilter/tpl/denied_word_list.html
deleted file mode 100644
index 64e99e6b3..000000000
--- a/modules/spamfilter/tpl/denied_word_list.html
+++ /dev/null
@@ -1,55 +0,0 @@
-<!--#include("header.html")-->
-
-<!--%import("filter/insert_denied_word.xml")-->
-<!--%import("filter/delete_denied_word.xml")-->
-
-<!-- xml js filter를 이용하기 위한 데이터 전달용 form -->
-<form id="fo_denied_word" action="./" method="get">
-<input type="hidden" name="word" value="" />
-</form>
-
-<!-- 수동 추가 -->
-<form action="./" method="get" onsubmit="return procFilter(this, insert_denied_word)">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->word}</div></th>
-        <td>
-            <input type="text" name="word" value="" class="inputTypeText" />
-            <p>{$lang->about_denied_word}</p>
-        </td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black stron"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</form>
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable">
-<caption>Total {number_format($word_list)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div>{$lang->word}</div></th>
-        <th scope="col"><div>{$lang->hit}</div></th>
-        <th scope="col"><div>{$lang->latest_hit}</div></th>
-        <th scope="col"><div>{$lang->regdate}</div></th>
-        <th scope="col"><div>{$lang->cmd_delete}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($word_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td>{count($word_list)-$no}</td>
-        <td class="wide">{$val->word}</td>
-        <td>{$val->hit}</td>
-        <td><span title="{zdate($val->latest_hit, 'Y-m-d H:i:s')}">{zdate($val->latest_hit, 'Y-m-d')}</span></td>
-        <td>{zdate($val->regdate,"Y-m-d")}</td>
-        {@ $val->word = base64_encode($val->word);}
-        <td><a href="#" onclick="doDeleteDeniedWord('{$val->word}');return false;" title="{$lang->cmd_delete}" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
diff --git a/modules/spamfilter/tpl/header.html b/modules/spamfilter/tpl/header.html
deleted file mode 100644
index 197d8fe09..000000000
--- a/modules/spamfilter/tpl/header.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!--%import("js/spamfilter_admin.js")-->
-
-<h3 class="xeAdmin">{$lang->spamfilter} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<div class="header4 gap1">
-    <ul class="localNavigation">
-        <li <!--@if($act=='dispSpamfilterAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispSpamfilterAdminConfig','module_srl','')}">{$lang->cmd_module_config}</a></li>
-        <li <!--@if($act=='dispSpamfilterAdminDeniedIPList')-->class="on"<!--@end-->><a href="{getUrl('act','dispSpamfilterAdminDeniedIPList')}">{$lang->cmd_denied_ip}</a></li>
-        <li <!--@if($act=='dispSpamfilterAdminDeniedWordList')-->class="on"<!--@end-->><a href="{getUrl('act','dispSpamfilterAdminDeniedWordList')}">{$lang->cmd_denied_word}</a></li>
-    </ul>
-</div>
diff --git a/modules/spamfilter/tpl/index.html b/modules/spamfilter/tpl/index.html
index c5c7d684a..818f12698 100644
--- a/modules/spamfilter/tpl/index.html
+++ b/modules/spamfilter/tpl/index.html
@@ -1,36 +1,79 @@
-<!--%import("filter/insert_config.xml")-->
-
-<!--#include("header.html")-->
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="col"><div>{$lang->interval}</div></th>
-        <td>
-            <input type="text" name="interval" value="{$config->interval}" class="inputTypeText" /> {$lang->unit_sec}
-            <p>{$lang->about_interval}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th scope="col"><div>{$lang->limit_count}</div></th>
-        <td>
-            <input type="text" name="limit_count" value="{$config->limit_count?$config->limit_count:5}" class="inputTypeText" />
-            <p>{$lang->about_limit_count}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="col"><div>{$lang->check_trackback}</div></th>
-        <td>
-            <input type="checkbox" name="check_trackback" value="Y" <!--@if($config->check_trackback=='Y')-->checked="checked"<!--@end--> />
-            <p>{$lang->about_check_trackback}</p>
-        </td>
-    </tr>
-    <tr class="row2">
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-
+<script type="text/javascript">
+</script>
+<load target="js/spamfilter_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+    <p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form id="spamfilterDelete" action="" method="post">
+	<input type="hidden" name="module" value="spamfilter" />
+	<input type="hidden" name="act" value="" />
+	<input type="hidden" name="ipaddress" value="" />
+	<input type="hidden" name="word" value="" />
+	<input type="hidden" name="ruleset" value="">
+</form>
+<form action="" id="spamfilterConfig" class="form" ruleset="@insertConfig">	
+	<input type="hidden" name="act" value="procSpamfilterAdminInsertConfig" />
+	<input type="hidden" name="module" value="spamfilter" />
+	<input type="hidden" name="ruleset" value="insertConfig" />
+	<h1 class="h1">{$lang->spamfilter}</h1>
+	<ul>
+		<li>
+			<p class="q">{$lang->cmd_interval}</p>
+			<p class="a">
+				<input type="radio" name="limits" id="spamCond1_yes" value="Y" <!--@if($config->limits=='Y' || $config->limits =='')-->checked="checked"<!--@end--> />
+				<label for="spamCond1_yes">{$lang->cmd_yes}</label>
+				<input type="radio" name="limits" id="spamCond1_no" value="N" <!--@if($config->limits!='Y' && $config->limits !='')--> checked="checked"<!--@end--> /> <label for="spamCond1_no">{$lang->cmd_no}</label>
+			</p>
+		</li>
+		<li>
+			<p class="q">{$lang->cmd_check_trackback}</p>
+			<p class="a">
+				<input type="radio" name="check_trackback" id="spamCond2_yes" value="Y" <!--@if($config->check_trackback=='Y' || $config->check_trackback=='')--> checked="checked"<!--@end--> />
+				<label for="spamCond2_yes">{$lang->cmd_yes}</label>
+				<input type="radio" name="check_trackback" id="spamCond2_yes" value="N" <!--@if($config->check_trackback!='Y' &&  $config->check_trackback!='')--> checked="checked"<!--@end--> / > <label for="spamCond2_yes">{$lang->cmd_no}</label>
+			</p>
+		</li>
+	</ul>
+	<div class="btnArea">
+		<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
+	</div>
+</form>
+<form action="" id="spamfilterInsert" class="form">
+	<input type="hidden" name="act" value="" />
+	<input type="hidden" name="module" value="spamfilter" />
+	<input type="hidden" name="ruleset" value="" />
+	<ul>
+		<li>
+			<p class="q">{$lang->cmd_denied_ip}</p>
+			<div class="a">
+				<ul class="textList">
+					<!--@foreach($ip_list as $ipListKey)-->
+					<li>{$ipListKey->ipaddress} <!--@if($ipListKey->description)-->// {$ipListKey->description} <!--@end-->
+						<a href="#" onclick="doDeleteDeniedIP('{$ipListKey->ipaddress}')" class="side">{$lang->cmd_delete}</a>
+					</li>
+					<!--@endforeach-->
+				</ul>
+			</div>
+			<p class="a">
+				<textarea rows="4" cols="42" name="ipaddressList" title="스팸 IP 추가"></textarea>
+				<span class="btn small"><button type="button" onclick="doInsertDeniedIP('{$lang->msg_invalid_format}')">{$lang->cmd_insert}</button></span>
+				<span class="desc">{$lang->about_denied_ip}</span>
+			</p>
+		</li>
+		<li>
+			<p class="q"><label for="spamKeyword">{$lang->cmd_denied_word}</label></p>
+			<div class="a">
+				<ul class="textList">
+					<!--@foreach($word_list as $wordListKey)-->
+					<li>{$wordListKey->word} <a href="#" onclick="doDeleteDeniedWord('{$wordListKey->word}')" class="side">{$lang->cmd_delete}</a></li>
+					<!--@end-->
+				</ul>
+			</div>
+			<p class="a">
+				<textarea rows="4" cols="42" name="wordList" title="스팸 키워드 추가"></textarea>
+				<span class="btn small"><button type="button" onclick="doInsertDeniedWord('{$lang->msg_invalid_format}')">{$lang->add}</button></span>
+				<span class="desc">{$lang->about_denied_word}</span>
+			</p>
+		</li>
+	</ul>
 </form>
diff --git a/modules/spamfilter/tpl/js/spamfilter_admin.js b/modules/spamfilter/tpl/js/spamfilter_admin.js
index 46d48d8b5..46a42623a 100644
--- a/modules/spamfilter/tpl/js/spamfilter_admin.js
+++ b/modules/spamfilter/tpl/js/spamfilter_admin.js
@@ -2,16 +2,43 @@
  * @brief 금지 IP 삭제
  **/
 function doDeleteDeniedIP(ipaddress) {
-    var fo_obj = xGetElementById('fo_denied_ip');
+	var fo_obj = get_by_id('spamfilterDelete');
     fo_obj.ipaddress.value = ipaddress;
-    procFilter(fo_obj, delete_denied_ip);
+	fo_obj.act.value = "procSpamfilterAdminDeleteDeniedIP";
+	fo_obj.ruleset.value = 'deleteDeniedIp';
+	fo_obj.submit();
 }
 
 /**
  * @brief 금지 단어 삭제
  **/
 function doDeleteDeniedWord(word) {
-    var fo_obj = xGetElementById('fo_denied_word');
-    fo_obj.word.value = word;
-    procFilter(fo_obj, delete_denied_word);
+	var fo_obj = get_by_id('spamfilterDelete');
+	fo_obj.word.value = word;
+	fo_obj.act.value = "procSpamfilterAdminDeleteDeniedWord";
+	fo_obj.ruleset.value = 'deleteDeniedWord';
+	fo_obj.submit();
 }
+function doInsertDeniedIP(msg_invalid_format){
+	var fo_obj = get_by_id('spamfilterInsert');
+	var reg_ipaddress = /^(\d{1,3}(?:.(\d{1,3}|\*)){3}\s*(\/\/[^\r\n]*)?[\r\n]*)*$/;
+	var matchStr_ipaddress = fo_obj.ipaddressList.value;
+	if(!matchStr_ipaddress.match(reg_ipaddress)) { 
+		alert(msg_invalid_format); return false;
+	}
+	fo_obj.act.value = "procSpamfilterAdminInsertDeniedIP";
+	fo_obj.ruleset.value = "insertDeniedIp";
+	fo_obj.submit();
+}
+function doInsertDeniedWord(msg_invalid_format){
+	var fo_obj = get_by_id('spamfilterInsert');
+	var reg_word = /^(.{2,40}[\r\n]+)*.{0,40}$/;
+	var matchStr_word = fo_obj.wordList.value;
+	if(!matchStr_word.match(reg_word)) { 
+		alert(msg_invalid_format); return false;
+	}
+	fo_obj.act.value = "procSpamfilterAdminInsertDeniedWord";
+	fo_obj.ruleset.value = "insertDeniedWord";
+	fo_obj.submit();
+}
+
diff --git a/modules/syndication/conf/info.xml b/modules/syndication/conf/info.xml
deleted file mode 100644
index 0b5179c48..000000000
--- a/modules/syndication/conf/info.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">Syndication</title>
-    <title xml:lang="zh-TW">聯合供搞</title>
-    <title xml:lang="tr">İçerik Paylaşımı</title>
-    <description xml:lang="ko">검색서비스업체와 직접 통신을 통해 컨텐츠를 잘 검색되도록 하는 Syndication 규약을 따라 정보를 주고받는 모듈</description>
-    <description xml:lang="zh-TW">검색서비스업체와 직접 통신을 통해 컨텐츠를 잘 검색되도록 하는 Syndication 규약을 따라 정보를 주고받는 모듈</description>
-    <description xml:lang="tr">검색서비스업체와 직접 통신을 통해 컨텐츠를 잘 검색되도록 하는 Syndication 규약을 따라 정보를 주고받는 모듈</description>
-    <version>1.0.1</version>
-    <date>2010-06-23</date>
-    <category>interlock</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
diff --git a/modules/syndication/conf/module.xml b/modules/syndication/conf/module.xml
deleted file mode 100644
index cafab0a95..000000000
--- a/modules/syndication/conf/module.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<module>
-    <grants />
-    <permissions />
-    <actions>
-        <action name="getSyndicationList" type="model" standalone="true" />
-        <action name="dispSyndicationAdminConfig" type="view" standalone="true" admin_index="true" />
-        <action name="procSyndicationAdminInsertService" type="controller" standalone="true" />
-        <action name="procSyndicationAdminCheckSitePingResult" type="controller" standalone="true" />
-        <action name="procSyndicationAdminCheckApiStatus" type="controller" standalone="true" />
-    </actions>
-</module>
diff --git a/modules/syndication/lang/en.lang.php b/modules/syndication/lang/en.lang.php
deleted file mode 100644
index 9d17e03a1..000000000
--- a/modules/syndication/lang/en.lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-    $lang->syndication = 'Syndication';
-    $lang->about_syndication = 'Syndication communicates with search service providers with standard protocol called "syndication", and makes it much better to search any information.<br/>It will synchronize contents with search service providers with the least requests.';
-
-    $lang->syndication_service = 'Syndication Service';
-    $lang->about_syndication_service = 'Syndication Service provides syndication services according to standard protocol.<br/>You will get Ping result of selected(deselected) services by applying.';
-
-    $lang->my_syndication_url = 'URL';
-    $lang->about_my_syndication_url = 'Please input URL which will be used when providing syndication information. It would be better to use representative url and keep it as long as you can.';
-
-    $lang->except_module = 'Modules to exclude';
-    $lang->about_except_module = 'Selected modules will not be synchronized with search service providers.';
-
-    $lang->msg_site_url_is_null = 'Please input URL';
-    $lang->success_applied = 'Successfully Applied';
-
-	$lang->msg_ping_test_error = 'Ping test error found. Please check domain and server configurations.';
-	$lang->msg_success_ping_test = 'Ping test works fine.';
-
-	$lang->cmd_check_syndication_echo = 'Check Syndication ariticle printing';
-	$lang->cmd_check_syndication_status = 'Check connection status';
-
-	$lang->site = 'Site';
-	$lang->syndication_synic_start_date = 'Server registered';
-	$lang->syndication_synic_last_date = 'Latest updates';
-	$lang->syndication_visit_ok_count = 'Ping successed';
-	$lang->syndication_visit_fail_count = 'Ping failed';
-
-	$lang->syndication_status_result = 'Status';
-	$lang->syndication_sync_article = 'Synchronized Articles';
-	$lang->syndication_status = 'Synchronization Status';
-?>
diff --git a/modules/syndication/lang/ko.lang.php b/modules/syndication/lang/ko.lang.php
deleted file mode 100644
index e0bfa080c..000000000
--- a/modules/syndication/lang/ko.lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-    $lang->syndication = '신디케이션';
-    $lang->about_syndication = '신디케이션이란 검색 서비스 업체와 syndication 이라는 표준 규약을 통해서 보다 더 잘 검색되게 하는 기능입니다.<br/>최소한의 요청만으로 효과적으로 컨텐츠를 검색 서비스 업체와 동기화합니다';
-
-    $lang->syndication_service = '신디케이션 서비스';
-    $lang->about_syndication_service = '신디케이션 표준 규약에 맞춰 신디케이션 서비스를 제공하는 곳입니다.<br/>[적용하기] 버튼을 선택하시면 선택 또는 해제된 서비스에 Ping 을 통해서 결과를 통보하게 됩니다';
-
-    $lang->my_syndication_url = '사이트 주소';
-    $lang->about_my_syndication_url = '신디케이션 정보를 제공할때 사용되는 사이트의 주소를 입력해주세요. 이 주소는 대표 주소를 이용해주시고 가능한 바꾸시지 않는 것이 좋습니다';
-
-    $lang->except_module = '제외시킬 모듈';
-    $lang->about_except_module = '신디케이션 대상에서 제외시켜 검색서비스 업체와 동기화를 시키지 않을 모듈을 선택해주세요';
-
-    $lang->msg_site_url_is_null = '사이트 주소를 입력해주세요';
-    $lang->success_applied = '적용되었습니다';
-
-	$lang->msg_ping_test_error = 'Ping 테스트 에러입니다. 도메인 및 서버 설정을 확인해주세요';
-	$lang->msg_success_ping_test = '정상적 동작으로 확인되었습니다.';
-
-	$lang->cmd_check_syndication_echo = 'Syndication 문서 출력 동작확인';
-	$lang->cmd_check_syndication_status = '연결상태 확인';
-
-	$lang->site = '사이트';
-	$lang->syndication_synic_start_date = '서버 등록일';
-	$lang->syndication_synic_last_date = '마지막 업데이트';
-	$lang->syndication_visit_ok_count = 'Ping 연속접속 성공 횟수';
-	$lang->syndication_visit_fail_count = 'Ping 실패 횟수';
-
-	$lang->syndication_status_result = '상태정보';
-	$lang->syndication_sync_article = '동기화 문서';
-	$lang->syndication_status = '동기화 상태';
-?>
diff --git a/modules/syndication/lang/tr.lang.php b/modules/syndication/lang/tr.lang.php
deleted file mode 100644
index 23d973abe..000000000
--- a/modules/syndication/lang/tr.lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-    $lang->syndication = 'İçerik Paylaşımı';
-    $lang->about_syndication = 'İçerik Paylaşımı, adı "sendikasyon" olan standard bir protokole bağlı arama hizmeti sunucularıyla iletişime geçer ve her türlü bilgiye ulaşmayı daha kolay hale getirir.<br/>Gerekli olan şeyleri en aza indirerek, arama hizmeti sunucusunu içeriklerle uygun hale getirir.';
-
-    $lang->syndication_service = 'İçerik Paylaşım Hizmeti';
-    $lang->about_syndication_service = 'İçerik Paylaşım Hizmeti, sendikasyon hizmetlerini standard bir protokole göre sağlar.<br/>Tercih edilen(edilmeyen) hizmetlerin Ping sonuçlarını başvurarak alabilirsiniz.';
-
-    $lang->my_syndication_url = 'URL';
-    $lang->about_my_syndication_url = 'Lütfen sendikasyon bilgilerini sağlarken kullanılacak URLyi girin. Temsili bir URLyi mümkün olduğu sürece kullanmak daha uygun olabilir.';
-
-    $lang->except_module = 'Dahil edilmeyecek modüller';
-    $lang->about_except_module = 'Seçili modüller arama hizmeti sağlayıcısıyla uyumlu hale getirilmeyecek.';
-
-    $lang->msg_site_url_is_null = 'Lütfen URL girişi yapın';
-    $lang->success_applied = 'Başarıyla Uygulandı';
-
-	$lang->msg_ping_test_error = 'Ping testi hatası bulundu. Lütfen alan adı ve sunucu yapılandırmasını kontrol edin.';
-	$lang->msg_success_ping_test = 'Ping test gayet iyi çalışıyor.';
-
-	$lang->cmd_check_syndication_echo = 'İçerik paylaşımlı yazı yazdırmayı kontrol et.';
-	$lang->cmd_check_syndication_status = 'Bağlantı statülerini kontrol et';
-
-	$lang->site = 'Site';
-	$lang->syndication_synic_start_date = 'Sunucu kaydedildi.';
-	$lang->syndication_synic_last_date = 'Son Güncellemeler';
-	$lang->syndication_visit_ok_count = 'Ping tamamlandı';
-	$lang->syndication_visit_fail_count = 'Ping tamamlanamadı';
-
-	$lang->syndication_status_result = 'Statüler';
-	$lang->syndication_sync_article = 'Eş zamanlı hale getirilmiş yazılar';
-	$lang->syndication_status = 'Eş zamanlama statüleri';
-?>
diff --git a/modules/syndication/lang/zh-TW.lang.php b/modules/syndication/lang/zh-TW.lang.php
deleted file mode 100644
index ae534294e..000000000
--- a/modules/syndication/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-    $lang->syndication = '聯合供搞';
-    $lang->about_syndication = '신디케이션이란 검색 서비스 업체와 syndication 이라는 표준 규약을 통해서 보다 더 잘 검색되게 하는 기능입니다.<br/>최소한의 요청만으로 효과적으로 컨텐츠를 검색 서비스 업체와 동기화합니다';
-
-    $lang->syndication_service = '供稿服務';
-    $lang->about_syndication_service = '提供根據標準協議的聯合供搞服務。<br/>[應用] 透過 Ping 的方式';
-
-    $lang->my_syndication_url = '供稿網址';
-    $lang->about_my_syndication_url = '신디케이션 정보를 제공할때 사용되는 사이트의 주소를 입력해주세요. 이 주소는 대표 주소를 이용해주시고 가능한 바꾸시지 않는 것이 좋습니다';
-
-    $lang->except_module = '제외시킬 모듈';
-    $lang->about_except_module = '신디케이션 대상에서 제외시켜 검색서비스 업체와 동기화를 시키지 않을 모듈을 선택해주세요';
-
-    $lang->msg_site_url_is_null = '請輸入網站網址';
-    $lang->success_applied = '적용되었습니다';
-?>
diff --git a/modules/syndication/queries/deleteExceptModules.xml b/modules/syndication/queries/deleteExceptModules.xml
deleted file mode 100644
index 981cf5149..000000000
--- a/modules/syndication/queries/deleteExceptModules.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<query id="deleteExceptModules" action="delete">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-</query>
diff --git a/modules/syndication/queries/getDeletedList.xml b/modules/syndication/queries/getDeletedList.xml
deleted file mode 100644
index 6dae7a09a..000000000
--- a/modules/syndication/queries/getDeletedList.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<query id="getDeletedList" action="select">
-    <tables>
-        <table name="syndication_logs" />
-    </tables>
-    <columns>
-        <column name="*" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" />
-        <condition operation="more" column="regdate" var="start_date" filter="number" pipe="and" />
-        <condition operation="less" column="regdate" var="end_date" filter="number" pipe="and" />
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="log_srl" order="asc" />
-        <list_count var="list_count" default="100" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
-</query>
diff --git a/modules/syndication/queries/getDocumentList.xml b/modules/syndication/queries/getDocumentList.xml
deleted file mode 100644
index 79c2ea8b4..000000000
--- a/modules/syndication/queries/getDocumentList.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<query id="getDocumentList" action="select">
-    <tables>
-        <table name="documents" alias="doc" />
-        <table name="modules" alias="modules" />
-        <table name="syndication_except_modules" alias="except_modules" type="left join">
-            <conditions>
-                <condition operation="equal" column="modules.module_srl" default="except_modules.module_srl" />
-            </conditions>
-        </table>
-    </tables>
-    <columns>
-        <column name="doc.*" />
-        <column name="modules.mid" alias="mid" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="doc.module_srl" var="module_srl" filter="number" />
-        <condition operation="notin" column="doc.module_srl" var="except_module_srls" pipe="and" />
-        <condition operation="null" column="except_modules.module_srl" default="1" pipe="and" />
-        <condition operation="equal" column="doc.is_secret" default="N" pipe="and" />
-        <condition operation="equal" column="modules.module_srl" default="doc.module_srl" filter="number" pipe="and" />
-        <condition operation="notin" column="modules.module_srl" var="except_modules" filter="numbers" pipe="and" />
-        <condition operation="more" column="doc.last_update" var="start_date" filter="number" pipe="and" />
-        <condition operation="less" column="doc.last_update" var="end_date" filter="number" pipe="and" />
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="doc.update_order" order="asc" />
-        <list_count var="list_count" default="100" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
-</query>
diff --git a/modules/syndication/queries/getExceptModule.xml b/modules/syndication/queries/getExceptModule.xml
deleted file mode 100644
index 68aec543d..000000000
--- a/modules/syndication/queries/getExceptModule.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<query id="getExceptModule" action="select">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-    <columns>
-        <column name="count(*)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getExceptModules.xml b/modules/syndication/queries/getExceptModules.xml
deleted file mode 100644
index 583350185..000000000
--- a/modules/syndication/queries/getExceptModules.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<query id="getExceptModules" action="select">
-    <tables>
-        <table name="syndication_except_modules" />
-        <table name="modules" />
-    </tables>
-    <columns>
-        <column name="syndication_except_modules.*" />
-        <column name="modules.mid" alias="mid" />
-        <column name="modules.browser_title" alias="browser_title" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="syndication_except_modules.module_srl" default="modules.module_srl" filter="number" notnull="notnull" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getModuleSiteInfo.xml b/modules/syndication/queries/getModuleSiteInfo.xml
deleted file mode 100644
index 921e33431..000000000
--- a/modules/syndication/queries/getModuleSiteInfo.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<query id="getModuleSiteInfo" action="select">
-    <tables>
-        <table name="modules" alias="modules" />
-        <table name="sites" alias="sites" />
-    </tables>
-    <columns>
-        <column name="modules.module_srl" alias="module_srl" />
-        <column name="modules.mid" alias="mid" />
-        <column name="sites.domain" alias="domain" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="modules.module_srl" var="module_srl" filter="number" />
-        <condition operation="equal" column="sites.site_srl" default="modules.site_srl" notnull="notnull" filter="number" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/getSiteUpdatedTime.xml b/modules/syndication/queries/getSiteUpdatedTime.xml
deleted file mode 100644
index 4f902b736..000000000
--- a/modules/syndication/queries/getSiteUpdatedTime.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<query id="getSiteUpdatedTime" action="select">
-    <tables>
-        <table name="documents" alias="doc" />
-        <table name="syndication_except_modules" alias="except_module"/>
-    </tables>
-    <columns>
-        <column name="max(doc.last_update)" alias="last_update" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="doc.module_srl" var="module_srl" filter="number" />
-        <condition operation="more" column="doc.last_update" var="start_date" filter="number" pipe="and" />
-        <condition operation="less" column="doc.last_update" var="end_date" filter="number" pipe="and" />
-        <condition operation="notin" column="doc.module_srl" default="except_module.module_srl" pipe="and" />
-    </conditions>
-</query>
diff --git a/modules/syndication/queries/insertExceptModule.xml b/modules/syndication/queries/insertExceptModule.xml
deleted file mode 100644
index f50e0b818..000000000
--- a/modules/syndication/queries/insertExceptModule.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<query id="insertExceptModule" action="insert">
-    <tables>
-        <table name="syndication_except_modules" />
-    </tables>
-    <columns>
-        <column name="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <column name="regdate" default="curdate()" notnull="notnull" />
-    </columns>
-</query>
diff --git a/modules/syndication/queries/insertLog.xml b/modules/syndication/queries/insertLog.xml
deleted file mode 100644
index d8bd17086..000000000
--- a/modules/syndication/queries/insertLog.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<query id="insertLog" action="insert">
-    <tables>
-        <table name="syndication_logs" />
-    </tables>
-    <columns>
-        <column name="log_srl" default="sequence()" />
-        <column name="module_srl" var="module_srl" />
-        <column name="document_srl" var="document_srl" />
-        <column name="title" var="title" />
-        <column name="summary" var="summary" />
-        <column name="regdate" default="curdate()" notnull="notnull" />
-    </columns>
-</query>
diff --git a/modules/syndication/schemas/syndication_except_modules.xml b/modules/syndication/schemas/syndication_except_modules.xml
deleted file mode 100644
index afb5c516f..000000000
--- a/modules/syndication/schemas/syndication_except_modules.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<table name="syndication_except_modules">
-    <column name="module_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
-    <column name="regdate" type="date" />
-</table>
diff --git a/modules/syndication/schemas/syndication_logs.xml b/modules/syndication/schemas/syndication_logs.xml
deleted file mode 100644
index 666c7b09e..000000000
--- a/modules/syndication/schemas/syndication_logs.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<table name="syndication_logs">
-    <column name="log_srl" type="number" size="11" notnull="notnull" unique="primary_key" />
-    <column name="module_srl" type="number" size="11" default="0" />
-    <column name="document_srl" type="number" size="11" default="0" />
-    <column name="title" type="varchar" size="255" />
-    <column name="summary" type="varchar" size="255" />
-    <column name="regdate" type="date" index="idx_regdate" />
-</table>
diff --git a/modules/syndication/syndication.admin.controller.php b/modules/syndication/syndication.admin.controller.php
deleted file mode 100644
index d370c10db..000000000
--- a/modules/syndication/syndication.admin.controller.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-    /**
-     * @class  syndicationAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  syndication 모듈의 admin Controller class
-     **/
-
-    class syndicationAdminController extends syndication {
-
-        function init() {
-        }
-
-        function procSyndicationAdminInsertService() {
-            $oModuleController = &getController('module');
-            $oSyndicationController = &getController('syndication');
-            $oSyndicationModel = &getModel('syndication');
-
-            $config->target_services = explode('|@|',Context::get('target_services'));
-            $config->site_url = preg_replace('/\/+$/is','',Context::get('site_url'));
-            $config->year = Context::get('year');
-            if(!$config->site_url) return new Object(-1,'msg_site_url_is_null');
-
-            $oModuleController->insertModuleConfig('syndication',$config);
-            $oSyndicationController->ping($oSyndicationModel->getID('site'), 'site');
-
-            $except_module = Context::get('except_module');
-            $output = executeQuery('syndication.deleteExceptModules');
-            if(!$output->toBool()) return $output;
-
-            $modules = explode(',',$except_module);
-            for($i=0,$c=count($modules);$i<$c;$i++) {
-                $args->module_srl = $modules[$i];
-                $output = executeQuery('syndication.insertExceptModule',$args);
-                if(!$output->toBool()) return $output;
-            }
-
-            $this->setMessage('success_applied');
-        }
-
-		function procSyndicationAdminCheckSitePingResult(){
-			$site_url = trim(Context::get('site_url'));
-			if(!$site_url) return new Object(-1,'msg_invalid_request');
-
-            $oSyndicationModel = &getModel('syndication');
-
-            $id = $oSyndicationModel->getID('site');
-			if(substr($site_url,-1)!='/') $site_url .= '/';
-			$site_ping = sprintf('http://%s?module=syndication&act=getSyndicationList&id=%s&type=site', $site_url, $id);
-
-			$headers = array();
-			$headers['Connection'] = 'TE, close';
-			$headers['User-Agent'] = 'Mozilla/4.0 (compatible; NaverBot/1.0; http://help.naver.com/customer_webtxt_02.jsp)';
-
-			$xml = FileHandler::getRemoteResource($site_ping, null, 3, 'GET', '', $headers);
-			if(!$xml) return new Object(-1, 'msg_ping_test_error');
-
-			$oXmlParser = new XmlParser(); 
-			$oXml = $oXmlParser->parse($xml);
-			
-			if(!$oXml || !is_object($oXml) || !$oXml->entry || !$oXml->entry->id || !$oXml->entry->title) {
-				$this->setMessage('msg_ping_test_error');
-				$this->add('ping_result',$xml);
-			}else{
-				$this->setMessage('msg_success_ping_test');
-			}
-		}
-
-		function procSyndicationAdminCheckApiStatus(){
-			$target_service = Context::get('target_service');
-			if(!$target_service) return new Object(-1,'msg_invalid_request');
-
-			$status_url = trim($this->statuses[$target_service]);
-			if(!$status_url) return new Object(-1,'msg_syndication_status_not_support');
-
-            $oModuleModel = &getModel('module');
-
-            $config = $oModuleModel->getModuleConfig('syndication');
-            $site_url = preg_replace('/^(http|https):\/\//i','',$config->site_url);
-
-			$method = 'getSyndicationStatus' . ucfirst(strtolower($target_service));
-			if(!method_exists(&$this, $method)) return new Object(-1,'msg_syndication_status_not_support');
-
-			$output = call_user_func(array(&$this,$method),$site_url);
-			if(!$output->toBool()) return $output;
-
-			$this->add('result_status',$output->get('result_status'));
-		}
-
-		function getSyndicationStatusNaver($site_url){
-			$status_url = trim($this->statuses['Naver']);
-
-			$xml = FileHandler::getRemoteResource(sprintf($status_url,$site_url), null, 3, 'GET', 'application/xml');
-			$oXmlParser = new XmlParser(); 
-			$oXml = $oXmlParser->parse($xml);
-			$oStatus = $oXml->syndication_status;
-			
-			if($oStatus->error->body != 0) return new Object(-1,$oStatus->message->body);
-
-			$result->site_name = $oStatus->site_name->body;
-			$result->first_update = $oStatus->first_update->body;
-			$result->last_update = $oStatus->last_update->body;
-			$result->visit_ok_count = $oStatus->visit_ok_count->body;
-			$result->visit_fail_count = $oStatus->visit_fail_count->body;
-			$result->status = $oStatus->status->body;
-
-			if(!$oStatus->sync || !$oStatus->sync->article){
-				$oArticleList = array();
-			}else{
-				$oArticleList = $oStatus->sync->article;
-				if(!is_array($oArticleList)) $oArticleList = array($oArticleList); 
-			}
-			
-			if(count($oArticleList)>0){
-				$article_count = array();
-				foreach($oArticleList as $article){
-					$article_count[$article->attrs->date] = $article->body;
-				}
-				
-				$result->article_count = $article_count;
-				$result->max_article_count = max($result->article_count);
-
-			}
-
-			Context::set('result', $result);
-			$oTemplateHandler = &TemplateHandler::getInstance();
-			$html = $oTemplateHandler->compile($this->module_path.'tpl', 'naver_result');
-
-			$output = new Object();
-			$output->add('result_status', $html);
-			return $output;
-		}
-    }
-?>
diff --git a/modules/syndication/syndication.admin.view.php b/modules/syndication/syndication.admin.view.php
deleted file mode 100644
index cfd4a9cb1..000000000
--- a/modules/syndication/syndication.admin.view.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php
-    /**
-     * @class  syndicationAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  syndication admin view class
-     **/
-
-    class syndicationAdminView extends syndication {
-
-        function init() {
-        }
-
-        function dispSyndicationAdminConfig() {
-            $oModuleModel = &getModel('module');
-
-            $module_config = $oModuleModel->getModuleConfig('syndication');
-            if(!$module_config->target_services) $module_config->target_services = array();
-
-            foreach($this->services as $key => $val) {
-                unset($obj);
-                $obj->service = $key;
-                $obj->ping = $val;
-                $obj->selected = in_array($key, $module_config->target_services)?true:false;
-                $services[] = $obj;
-            }
-            Context::set('services', $services);
-
-            if(!$module_config->site_url) {
-                $module_config->site_url = Context::getDefaultUrl()?Context::getDefaultUrl():getFullUrl();
-            }
-            Context::set('site_url', preg_replace('/^(http|https):\/\//i','',$module_config->site_url));
-
-            if(!$module_config->year) {
-                $module_config->year = date("Y");
-            }
-            Context::set('year', $module_config->year);
-
-            $output = executeQueryArray('syndication.getExceptModules');
-            $except_module_list = array();
-            for($i=0,$c=count($output->data);$i<$c;$i++) {
-                $except_module_list[] = $output->data[$i];
-            }
-            Context::set('except_module', $except_module_list);
-
-			//Security
-			$security = new Security();			
-			$security->encodeHTML('services..service','except_module..ping');
-			$security->encodeHTML('except_module..mid','except_module..browser_title');
-			
-			
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('config');
-        }
-
-    }
-?>
diff --git a/modules/syndication/syndication.class.php b/modules/syndication/syndication.class.php
deleted file mode 100644
index eb2bfa9f7..000000000
--- a/modules/syndication/syndication.class.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-    /**
-     * @class  syndication
-     * @author NHN (developers@xpressengine.com)
-     * @brief  syndication 모듈의 high class
-     **/
-
-    define('SyndicationModule', 'M');
-    define('SyndicationDocument', 'D');
-
-    define('SyndicationInserted', 'I');
-    define('SyndicationUpdated', 'U');
-    define('SyndicationDeleted', 'D');
-
-    class syndication extends ModuleObject {
-
-        var $services = array(
-            'Naver' => 'http://syndication.openapi.naver.com/ping/',
-        );
-
-        var $statuses = array(
-            'Naver' => 'http://syndication.openapi.naver.com/status/?site=%s',
-        );
-
-        function moduleInstall() {
-            $oModuleController = &getController('module');
-            $oModuleController->insertTrigger('document.insertDocument', 'syndication', 'controller', 'triggerInsertDocument', 'after');
-            $oModuleController->insertTrigger('document.updateDocument', 'syndication', 'controller', 'triggerUpdateDocument', 'after');
-            $oModuleController->insertTrigger('document.deleteDocument', 'syndication', 'controller', 'triggerDeleteDocument', 'after');
-            $oModuleController->insertTrigger('module.deleteModule', 'syndication', 'controller', 'triggerDeleteModule', 'after');
-
-            $oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
-            $oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
-
-            $oAddonAdminModel = &getAdminModel('addon');
-			if($oAddonAdminModel->getAddonInfoXml('catpcha')){
-				$oAddonAdminController = &addonAdminController::getInstance();
-				$oAddonAdminController->doActivate('catpcha');
-				$oAddonAdminController->makeCacheFile();
-			}
-        }
-
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-            if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')) return true;
-
-            return false;
-        }
-
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            if(!$oModuleModel->getTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after')){
-				$oModuleController->insertTrigger('document.moveDocumentToTrash', 'syndication', 'controller', 'triggerMoveDocumentToTrash', 'after');
-			}
-            if(!$oModuleModel->getTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after')){
-				$oModuleController->insertTrigger('document.restoreTrash', 'syndication', 'controller', 'triggerRestoreTrash', 'after');
-			}
-
-            $oAddonAdminModel = &getAdminModel('addon');
-			if($oAddonAdminModel->getAddonInfoXml('catpcha')){
-				$oAddonAdminController = &addonAdminController::getInstance();
-				$oAddonAdminController->doActivate('catpcha');
-				$oAddonAdminController->makeCacheFile();
-			}
-
-        }
-
-        function recompileCache() {
-        }
-    }
-?>
diff --git a/modules/syndication/syndication.controller.php b/modules/syndication/syndication.controller.php
deleted file mode 100644
index fcdf4b979..000000000
--- a/modules/syndication/syndication.controller.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?php
-    /**
-     * @class  syndicationController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  syndication 모듈의 Controller class
-     **/
-
-    class syndicationController extends syndication {
-
-        function triggerInsertDocument(&$obj) {
-            if($obj->module_srl < 1) return new Object();
-
-            $oSyndicationModel = &getModel('syndication');
-            $oModuleModel = &getModel('module');
-
-            if($oSyndicationModel->isExceptedModules($obj->module_srl)) return new Object();
-
-            $config = $oModuleModel->getModuleConfig('syndication');
-
-            $id = $oSyndicationModel->getID('channel', $obj->module_srl);
-            $this->ping($id, 'article');
-
-            return new Object();
-        }
-
-        function triggerUpdateDocument(&$obj) {
-            if($obj->module_srl < 1) return new Object();
-
-            $oSyndicationModel = &getModel('syndication');
-            $oModuleModel = &getModel('module');
-
-            if($oSyndicationModel->isExceptedModules($obj->module_srl)) return new Object();
-
-            $config = $oModuleModel->getModuleConfig('syndication');
-
-            $id = $oSyndicationModel->getID('channel', $obj->module_srl);
-            $this->ping($id, 'article');
-
-            return new Object();
-        }
-
-        function triggerDeleteDocument(&$obj) {
-            if($obj->module_srl < 1) return new Object();
-
-            $oSyndicationModel = &getModel('syndication');
-            $oModuleModel = &getModel('module');
-
-            if($oSyndicationModel->isExceptedModules($obj->module_srl)) return new Object();
-
-            $this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
-
-            $id = $oSyndicationModel->getID('channel', $obj->module_srl);
-            $this->ping($id, 'deleted');
-
-            return new Object();
-        }
-
-        function triggerDeleteModule(&$obj) {
-            $oSyndicationModel = &getModel('syndication');
-            $oModuleModel = &getModel('module');
-
-            if($oSyndicationModel->isExceptedModules($obj->module_srl)) return new Object();
-
-            $this->insertLog($obj->module_srl, $obj->document_srl, $obj->title, $obj->content);
-
-            $output = executeQuery('syndication.getExceptModule', $obj);
-            if($output->data->count) return new Object();
-
-            $id = $oSyndicationModel->getID('site', $obj->module_srl);
-            $this->ping($id, 'deleted');
-
-            return new Object();
-        }
-
-        function triggerMoveDocumentToTrash(&$obj) {
-			$document_srl = $obj->document_srl;
-			$module_srl = $obj->module_srl;
-			
-            $oSyndicationModel = &getModel('syndication');
-            $oModuleModel = &getModel('module');
-
-            if($oSyndicationModel->isExceptedModules($module_srl)) return new Object();
-
-            $id = $oSyndicationModel->getID('channel', $module_srl);
-            $this->ping($id, 'deleted');
-
-			return new Object();
-		}
-
-        function triggerRestoreTrash(&$obj) {
-			$document_srl = $obj->document_srl;
-			$module_srl = $obj->module_srl;
-			
-            $oSyndicationModel = &getModel('syndication');
-            $oModuleModel = &getModel('module');
-
-            if($oSyndicationModel->isExceptedModules($module_srl)) return new Object();
-
-            $id = $oSyndicationModel->getID('article', $module_srl.'-'.$document_srl);
-            $this->ping($id, 'article');
-
-			return new Object();
-		}
-
-        function insertLog($module_srl, $document_srl, $title = null, $summary = null) {
-            $args->module_srl = $module_srl;
-            $args->document_srl = $document_srl;
-            $args->title = $title;
-            $args->summary = $summary;
-            $output = executeQuery('syndication.insertLog', $args);
-        }
-
-        function ping($id, $type) {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('syndication');
-
-            if(!count($config->target_services)) return;
-            if(substr($config->site_url,-1)!='/') $config->site_url .= '/';
-            foreach($config->target_services as $key => $val) {
-                $ping_url = trim($this->services[$val]);
-                if(!$ping_url) continue;
-                $ping_body = sprintf('http://%s?module=syndication&act=getSyndicationList&id=%s&type=%s', $config->site_url, $id, $type);
-                FileHandler::getRemoteResource($ping_url, null, 3, 'POST', 'application/x-www-form-urlencoded', array(), array(), array('link'=>$ping_body));
-            }
-        }
-    }
-?>
diff --git a/modules/syndication/syndication.model.php b/modules/syndication/syndication.model.php
deleted file mode 100644
index 728295155..000000000
--- a/modules/syndication/syndication.model.php
+++ /dev/null
@@ -1,363 +0,0 @@
-<?php
-    /**
-     * @class  getSyndicationList
-     * @author NHN (developers@xpressengine.com)
-     * @brief  syndication 모듈의 model class
-     **/
-
-    class syndicationModel extends syndication {
-
-        var $site_url = null;
-        var $target_services = array();
-        var $year = null;
-        var $langs = array();
-        var $granted_modules = array();
-
-        function init() {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('syndication');
-            $this->site_url = preg_replace('/\/+$/is','',$config->site_url);
-            $this->target_services = $config->target_services;
-            $this->year = $config->year;
-
-            $output = executeQueryArray('syndication.getGrantedModules');
-            if($output->data) {
-                foreach($output->data as $key => $val) {
-                    $this->granted_modules[] = $val->module_srl;
-                }
-            }
-        }
-
-        function isExceptedModules($module_srl) {
-            $args->module_srl = $module_srl;
-            $output = executeQuery('syndication.getExceptModule', $args);
-            if($output->data->count) return true;
-            $output = executeQuery('syndication.getGrantedModule', $args);
-            if($output->data->count) return true;
-            return false;
-
-        }
-
-        function getLang($key, $site_srl)
-        {
-            if(!$this->langs[$site_srl])
-            {
-                $this->langs[$site_srl] = array();
-                $args->site_srl = $site_srl;
-                $args->lang_code = Context::getLangType();
-                $output = executeQueryArray("syndication.getLang", $args);
-                if(!$output->toBool() || !$output->data) return $key;
-                foreach($output->data as $value)
-                {
-                    $this->langs[$site_srl][$value->name] = $value->value;
-                }
-            }
-            if($this->langs[$site_srl][$key])
-            {
-                return $this->langs[$site_srl][$key];
-            }
-            else return $key;
-        }
-
-        function handleLang($title, $site_srl)
-        {
-            $matches = null;
-            if(!preg_match("/\\\$user_lang->(.+)/",$title, $matches)) return $title;
-            else 
-            {
-                return $this->getLang($matches[1], $site_srl); 
-            }
-        }
-
-        function getSyndicationList() {
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('syndication');
-			if(!$config->year || !$config->site_url) return new Object(-1,'msg_check_syndication_config');
-
-            $id = Context::get('id');
-            $type = Context::get('type');
-            $page = Context::get('page');
-            if(!$id || !$type) return new Object(-1,'msg_invalid_request');
-
-			if(!preg_match('/^tag:([^,]+),([0-9]+):(site|channel|article)(.*)$/i',$id,$matches)) return new Object(-1,'msg_invalid_request');
-
-            $url = $matches[1];
-            $year = $matches[2];
-			$target = $matches[3];
-			$id = $matches[4];
-			if($id && $id{0}==':') $id = substr($id, 1);
-
-            if($id && strpos($id,'-')!==false) list($module_srl, $document_srl) = explode('-',$id);
-            elseif($id) $module_srl = $id;
-            if(!$url || !$year || !$target) return new Object(-1,'msg_invalid_request');
-
-            $startTime = Context::get('start-time');
-            $endTime = Context::get('end-time');
-
-            $time_zone = substr($GLOBALS['_time_zone'],0,3).':'.substr($GLOBALS['_time_zone'],3);
-            Context::set('time_zone', $time_zone);
-
-            $site_module_info = Context::get('site_module_info');
-
-            if($target == 'channel' && !$module_srl) $target = 'site';
-            if($target == 'channel' && $module_srl) {
-                $args->module_srls = $module_srl;
-                $output = executeQuery('syndication.getModules', $args);
-                $module_info = $output->data;
-                if($module_info) {
-                    $args->module_srl = $module_srl;
-                    $output = executeQuery('syndication.getExceptModules', $args);
-                    if($output->data->count) $error = 'target is not founded';
-                } else $error = 'target is not founded';
-
-                unset($args);
-            }
-
-            if(!$error) {
-                Context::set('target', $target);
-                Context::set('type', $type);
-                switch($target) {
-                    case 'site' :
-                            $site_info->id = $this->getID('site');
-                            $site_info->title = $this->handleLang($site_module_info->browser_title, $site_module_info->site_srl);
-
-                            $output = executeQuery('syndication.getSiteUpdatedTime');
-                            if($output->data) $site_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
-                            $site_info->self_href = $this->getSelfHref($site_info->id,$type);
-                            $site_info->alternative_href =$this->getAlternativeHref();
-                            Context::set('site_info', $site_info);
-
-                            $this->setTemplateFile('site');
-                            switch($type) {
-                                case 'channel' :
-                                        Context::set('channels', $this->getChannels());
-                                    break;
-                                case 'article' :
-                                        Context::set('articles', $this->getArticles(null, $page, $startTime, $endTime, 'article',$site_info->id));
-                                    break;
-                                case 'deleted' :
-                                    Context::set('deleted', $this->getDeleted(null, $page, $startTime, $endTime, 'deleted',$site_info->id));
-                                    break;
-                                default :
-                                        $this->setTemplateFile('site.info');
-                                    break;
-                            }
-                        break;
-                    case 'channel' :
-                            $channel_info->id = $this->getID('channel', $module_info->module_srl);
-                            $channel_info->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-                            $channel_info->updated = date("Y-m-d\\TH:i:s").$time_zone;
-                            $channel_info->self_href = $this->getSelfHref($channel_info->id, $type);
-                            $channel_info->alternative_href = $this->getAlternativeHref($module_info);
-                            $channel_info->summary = $module_info->description;
-                            if($module_info->module == "textyle")
-                            {
-                                $channel_info->type = "blog";
-                                $channel_info->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-                            }
-                            else
-                            {
-                                $channel_info->type = "web";
-                            }
-                            $output = executeQuery('syndication.getSiteUpdatedTime');
-                            if($output->data) $channel_info->updated = date("Y-m-d\\TH:i:s", ztime($output->data->last_update)).$time_zone;
-                            Context::set('channel_info', $channel_info);
-
-                            $this->setTemplateFile('channel');
-                            switch($type) {
-                                case 'article' :
-                                        Context::set('articles', $this->getArticles($module_srl, $page, $startTime, $endTime, 'article', $channel_info->id));
-                                    break;
-                                case 'deleted' :
-                                        Context::set('deleted', $this->getDeleted($module_srl, $page, $startTime, $endTime, 'deleted', $channel_info->id));
-                                    break;
-                                default :
-                                        $this->setTemplateFile('channel.info');
-                                    break;
-                            }
-                        break;
-						
-						case 'article':
-							Context::set('article', $this->getArticle($document_srl));
-							$this->setTemplateFile('include.articles');
-						break;
-                }
-            } else {
-                Context::set('message', $error);
-                $this->setTemplateFile('error');
-            }
-
-            $this->setTemplatePath($this->module_path.'tpl');
-            Context::setResponseMethod('XMLRPC');
-        }
-
-        function getChannels() {
-            if($module_srls) $args->module_srls = $module_srls;
-            if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
-            $output = executeQueryArray('syndication.getModules', $args);
-            if($output->data) {
-                foreach($output->data as $module_info) {
-                    unset($obj);
-                    $obj->id = $this->getID('channel', $module_info->module_srl);
-                    $obj->title = $this->handleLang($module_info->browser_title, $module_info->site_srl);
-                    $obj->updated = date("Y-m-d\\TH:i:s").$time_zone;
-                    $obj->self_href = $this->getSelfHref($obj->id, 'channel');
-                    $obj->alternative_href = $this->getAlternativeHref($module_info);
-                    $obj->summary = $module_info->description;
-                    if($module_info->module == "textyle")
-                    {
-                        $obj->type = "blog";
-                        $obj->rss_href = getFullSiteUrl($module_info->domain, '', 'mid', $module_info->mid, 'act', 'rss');
-                    }
-                    else
-                    {
-                        $obj->type = "web";
-                    }
-
-                    $list[] = $obj;
-                }
-            }
-            return $list;
-        }
-
-        function getArticle($document_srl) {
-            if($this->site_url==null) $this->init();
-
-			$oDocumentModel = &getModel('document');
-			$oDocument = $oDocumentModel->getDocument($document_srl,false,false);
-			if(!$oDocument->isExists()) return;
-
-			$val = $oDocument->getObjectVars();		
-
-			$val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
-			$val->updated = date("Y-m-d\\TH:i:s", ztime($val->last_update)).$GLOBALS['_time_zone'];
-			$val->alternative_href = getFullSiteUrl($this->site_url, '', 'document_srl', $val->document_srl);
-			$val->channel_alternative_href = $this->getChannelAlternativeHref($val->module_srl);
-			$val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
-			if(!$val->nick_name) $val->nick_name = $val->user_name;
-
-            return $val;
-        }
-
-        function getArticles($module_srl = null, $page=1, $startTime = null, $endTime = null, $type = null, $id = null) {
-            if($this->site_url==null) $this->init();
-
-            if($module_srl) $args->module_srl = $module_srl;
-            if($startTime) $args->start_date = $this->getDate($startTime);
-            if($endTime) $args->end_date = $this->getDate($endTime);
-            if(count($this->granted_modules)) $args->except_module_srls = implode(',',$this->granted_modules);
-            $args->page = $page;
-            $output = executeQueryArray('syndication.getDocumentList', $args);
-            $cur_page = $output->page_navigation->cur_page;
-            $total_page = $output->page_navigation->last_page;
-
-            $result->next_url = null;
-            $result->list = array();
-
-            if($cur_page<$total_page) {
-                $next_url = $this->getSelfHref($id, $type);
-                if($startTime) $next_url .= '&startTime='.$startTime;
-                if($endTime) $next_url .= '&endTime='.$endTime;
-                $result->next_url = $next_url.'&page='.($cur_page+1);
-            }
-
-            if($output->data) {
-                foreach($output->data as $key => $val) {
-                    $val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
-                    $val->updated = date("Y-m-d\\TH:i:s", ztime($val->last_update)).$GLOBALS['_time_zone'];
-                    $val->alternative_href = getFullSiteUrl($this->site_url, '', 'document_srl', $val->document_srl);
-                    $val->channel_alternative_href = $this->getChannelAlternativeHref($val->module_srl);
-                    $val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
-                    if(!$val->nick_name) $val->nick_name = $val->user_name;
-                    $output->data[$key] = $val;
-                }
-                $result->list = $output->data;
-            }
-            return $result;
-        }
-
-        function getDeleted($module_srl = null, $page = 1, $startTime = null, $endTime = null, $type = null, $id = null) {
-            if($this->site_url==null) $this->init();
-
-            if($module_srl) $args->module_srl= $module_srl;
-            if($startTime) $args->start_date = $this->getDate($startTime);
-            if($endTime) $args->end_date = $this->getDate($endTime);
-            $args->page = $page;
-
-            $output = executeQueryArray('syndication.getDeletedList', $args);
-
-            $cur_page = $output->page_navigation->cur_page;
-            $total_page = $output->page_navigation->last_page;
-
-            $result->next_url = null;
-            $result->list = array();
-
-            if($cur_page<$total_page) {
-                $next_url = $this->getSelfHref($id, $type);
-                if($startTime) $next_url .= '&startTime='.$startTime;
-                if($endTime) $next_url .= '&endTime='.$endTime;
-                $result->next_url = $next_url . '&page='.($cur_page+1);
-            }
-
-            if($output->data) {
-                foreach($output->data as $key => $val) {
-                    $val->id = $this->getID('article', $val->module_srl.'-'.$val->document_srl);
-                    $val->deleted = date("Y-m-d\\TH:i:s", ztime($val->regdate)).$GLOBALS['_time_zone'];
-                    $val->alternative_href = getFullSiteUrl($this->site_url, '', 'document_srl', $val->document_srl);
-                    $val->channel_id = $this->getID('channel', $val->module_srl.'-'.$val->document_srl);
-                    $output->data[$key] = $val;
-                }
-                $result->list = $output->data;
-            }
-            return $result;
-        }
-
-        function getID($type, $target_id = null) {
-            if($this->site_url==null) $this->init();
-
-            return sprintf('tag:%s,%d:%s', $this->site_url, $this->year, $type) . ($target_id?':'.$target_id:'');
-        }
-
-        function getChannelAlternativeHref($module_srl) {
-            static $module_info = array();
-            if(!isset($module_info[$module_srl])) {
-                $args->module_srl = $module_srl;
-                $output = executeQuery('syndication.getModuleSiteInfo', $args);
-                if($output->data) $module_info[$module_srl] = $output->data;
-                else $module_info[$module_srl] = null;
-            }
-
-            if(is_null($module_info[$module_srl])) return $this->site_url;
-
-            $domain = $module_info[$module_srl]->domain;
-            $url = getFullSiteUrl($domain, '', 'mid', $module_info[$module_srl]->mid);
-            if(substr($url,0,1)=='/') $domain = 'http://'.$this->site_url.$url;
-            return $url;
-        }
-
-        function getSelfHref($id, $type = null) {
-            if($this->site_url==null) $this->init();
-
-            return  sprintf('http://%s/?module=syndication&act=getSyndicationList&id=%s&type=%s', $this->site_url, $id, $type);
-        }
-
-        function getAlternativeHref($module_info = null) {
-            if($this->site_url==null) $this->init();
-
-            if(!$module_info) return sprintf('http://%s', $this->site_url);
-            if(!$module_info->site_srl) return getFullUrl('', 'mid', $module_info->mid);
-
-            $domain = $module_info->domain;
-            $url = getFullSiteUrl($domain, '', 'mid', $module_info->mid);
-
-            if(substr($url,0,1)=='/') $domain = 'http://'.$this->site_url.$url;
-            return $url;
-        }
-
-        function getDate($date) {
-            $time = strtotime($date);
-            if($time == -1) $time = ztime(str_replace(array('-','T',':'),'',$date));
-            return date('YmdHis', $time);
-        }
-    }
-?>
diff --git a/modules/syndication/tpl/channel.html b/modules/syndication/tpl/channel.html
deleted file mode 100644
index 55cf2b34d..000000000
--- a/modules/syndication/tpl/channel.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <!--#include("./include.channel.html")-->
-    <!--@if($articles->list)-->
-        <!--@if($articles->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($articles->next_url)}" /><!--@end-->
-        <!--@foreach($articles->list as $key => $article)-->
-        <!--#include("./include.articles.html")-->
-        <!--@end-->
-    <!--@elseif($deleted->list)-->
-        <!--@if($deleted->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($deleted->next_url)}" /><!--@end-->
-        <!--@foreach($deleted->list as $key => $delete)-->
-        <!--#include("./include.deleted.html")-->
-        <!--@end-->
-    <!--@end-->
-</feed>
diff --git a/modules/syndication/tpl/channel.info.html b/modules/syndication/tpl/channel.info.html
deleted file mode 100644
index c8543d979..000000000
--- a/modules/syndication/tpl/channel.info.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-
-<entry xmlns="http://www.w3.org/2005/Atom">
-    <!--#include("./include.channel.html")-->
-</entry>
diff --git a/modules/syndication/tpl/config.html b/modules/syndication/tpl/config.html
deleted file mode 100644
index 96c15e98d..000000000
--- a/modules/syndication/tpl/config.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<!--%import("css/syndication.css")-->
-<!--%import("js/syndication.js")-->
-<!--%import("filter/insert_service.xml")-->
-
-<h3 class="xeAdmin">{$lang->syndication} <span class="gray">{$lang->cmd_management}</span></h3>
-<p class="summary">{$lang->about_syndication}</p>
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_service);">
-    <input type="hidden" name="year" value="{$year}" />
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div>{$lang->my_syndication_url}</div></th>
-        <td>
-            http://<input type="text" id="site_url" name="site_url" value="{$site_url}" class="inputTypeText siteUrl" />
-            <span class="button green"><input type="button" value="{$lang->cmd_check_syndication_echo}" onclick="pingSite(jQuery('#site_url').val())" /></span>
-            <p>{$lang->about_my_syndication_url}</p>
-			<p class="ping_test_result"></p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->syndication_service}</div></th>
-        <td>
-            <ul class="syndiService">
-            <!--@foreach($services as $key => $val)-->
-                <li>
-                    <input type="checkbox" name="target_services" value="{$val->service}" id="target_service_{$val->service}" <!--@if($val->selected)-->checked="checked"<!--@end--> />
-                    <label for="target_service_{$val->service}">{$val->service}</label>
-					<!--@if($val->selected)--><span class="button green small"><input type="button" value="{$lang->cmd_check_syndication_status}" onclick="checkSyndicationStatus('{$val->service}')" /></span><!--@end-->
-                </li>
-            <!--@end-->
-            </ul>
-			<div class="print_result_status"></div>
-            <p>{$lang->about_syndication}</p>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row"><div>{$lang->except_module}</div></th>
-        <td>
-            <select name="_except_module" id="_except_module" size="10" class="exceptModuleList">
-                {@$except_module_srls = array()}
-                <!--@foreach($except_module as $v)-->
-                {@$except_module_srls[] = $v->module_srl}
-                <option value="{$v->module_srl}">{$v->browser_title} ({$v->mid})</option>
-                <!--@end-->
-            </select>
-            <ul class="midCommand">
-                <li><a href="{getUrl('','module','module','act','dispModuleSelectList','id','except_module')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a></li>
-                <li><a href="#" onclick="removeExceptModule('except_module');return false;" class="button red"><span>{$lang->cmd_delete}</span></a></li>
-            </ul>
-            <p>{$lang->about_except_module}</p>
-            <input type="hidden" name="except_module" id="except_module" value="{implode(',',$except_module_srls)}" />
-        </td>
-    </tr>
-    <tr>
-        <th colspan="2" class="button">
-            <span class="button black strong"><input type="submit" value="{$lang->cmd_apply}" accesskey="s" /></span>
-        </th>
-    </tr>
-    </table>
-</form>
diff --git a/modules/syndication/tpl/css/syndication.css b/modules/syndication/tpl/css/syndication.css
deleted file mode 100644
index 1a6213680..000000000
--- a/modules/syndication/tpl/css/syndication.css
+++ /dev/null
@@ -1,17 +0,0 @@
-@charset "utf-8";
-
-input.siteUrl { width:400px; }
-ul.syndiService { list-style:none; margin:0; padding:0;}
-ul.syndiService li { padding:10px 0; margin:0;}
-select.exceptModuleList { width:400px; }
-ul.midCommand { margin:20px 0 0 0; padding:0; list-style:none; }
-ul.midCommand li { display:inline; margin:0 20px 0 0; padding:0;}
-
-/* Vertical Bar Graph */
-.vGraph{ padding:20px 0;}
-.vGraph ul{ margin:0; padding:0; height:100px; border:1px solid #ddd; border-top:0; border-right:0; font-size:11px; font-family:Tahoma, Geneva, sans-serif; list-style:none;}
-.vGraph ul:after{ content:""; display:block; clear:both;}
-.vGraph li{ float:left; display:inline; width:8%; height:100%; margin:0 3%; position:relative; text-align:center; white-space:nowrap;}
-.vGraph .gTerm{ position:relative; display:inline-block; width:100%; height:20px; line-height:20px; margin:0 -100% -20px 0; padding:100px 0 0 0; vertical-align:bottom; color:#767676; font-weight:bold;}
-.vGraph .gBar{ position:relative; display:inline-block; width:100%; margin:-1px 0 0 0; border:1px solid #ccc; border-bottom:0; background:#e9e9e9; vertical-align:bottom;}
-.vGraph .gBar span{ position:absolute; width:100%; top:-20px; left:0; color:#767676;}
diff --git a/modules/syndication/tpl/error.html b/modules/syndication/tpl/error.html
deleted file mode 100644
index e641f1dcb..000000000
--- a/modules/syndication/tpl/error.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <error>-1</error>
-    <message>{$message}</message>
-</feed>
diff --git a/modules/syndication/tpl/filter/insert_service.xml b/modules/syndication/tpl/filter/insert_service.xml
deleted file mode 100644
index b81953e60..000000000
--- a/modules/syndication/tpl/filter/insert_service.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<filter name="insert_service" module="syndication" act="procSyndicationAdminInsertService" confirm_msg_code="confirm_submit">
-  <form />
-  <parameter />
-  <response>
-    <tag name="error" />
-    <tag name="message" />
-  </response>
-</filter>
diff --git a/modules/syndication/tpl/include.articles.html b/modules/syndication/tpl/include.articles.html
deleted file mode 100644
index 2d501a39f..000000000
--- a/modules/syndication/tpl/include.articles.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-    <entry>
-        <id>{htmlspecialchars($article->id)}</id>
-        <title>{htmlspecialchars($article->title)}</title>
-        <updated>{$article->updated}</updated>
-        <link rel="alternative" href="{$article->alternative_href}" />
-        <link rel="channel" href="{htmlspecialchars($article->channel_id)}" />
-        <link rel="channel-alternative" href="{$article->channel_alternative_href}" />
-        <published>{date('Y-m-d\TH:i:s',ztime($article->regdate)).$time_zone}</published>
-        <author>
-            <name>{htmlspecialchars($article->nick_name)}</name>
-        </author>
-        <content>{htmlspecialchars($article->content)}</content>
-    </entry>
diff --git a/modules/syndication/tpl/include.channel.html b/modules/syndication/tpl/include.channel.html
deleted file mode 100644
index 4ead02593..000000000
--- a/modules/syndication/tpl/include.channel.html
+++ /dev/null
@@ -1,8 +0,0 @@
-    <id>{htmlspecialchars($channel_info->id)}</id>
-    <title>{htmlspecialchars($channel_info->title)}</title>
-    <updated>{$channel_info->updated}</updated>
-    <link rel="self" href="{htmlspecialchars($channel_info->self_href)}" />
-    <link rel="alternative" href="{$channel_info->alternative_href}" />
-    <!--@if($channel_info->rss_href)--><link rel="rss" href="{$channel_info->rss_href}" /><!--@end-->
-    <type>{$channel_info->type}</type>
-    <summary>{htmlspecialchars($channel_info->summary)}</summary>
diff --git a/modules/syndication/tpl/include.channels.html b/modules/syndication/tpl/include.channels.html
deleted file mode 100644
index 76a6a42cb..000000000
--- a/modules/syndication/tpl/include.channels.html
+++ /dev/null
@@ -1,8 +0,0 @@
-    <entry>
-        <id>{htmlspecialchars($channel_info->id)}</id>
-        <title>{htmlspecialchars($channel_info->title)}</title>
-        <updated>{$channel_info->updated}</updated>
-        <link rel="self" href="{htmlspecialchars($channel_info->self_href)}" />
-        <link rel="alternative" href="{$channel_info->alternative_href}" />
-        <summary>{htmlspecialchars($channel_info->summary)}</summary>
-    </entry>
diff --git a/modules/syndication/tpl/include.deleted.html b/modules/syndication/tpl/include.deleted.html
deleted file mode 100644
index c3bce73a8..000000000
--- a/modules/syndication/tpl/include.deleted.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-    <entry>
-        <id>{htmlspecialchars($delete->id)}</id>
-        <title>{htmlspecialchars($delete->title)}</title>
-        <updated>{$delete->deleted}</updated>
-        <link rel="alternative" href="{$delete->alternative_href}" />
-        <deleted>{$delete->deleted}</deleted>
-    </entry>
diff --git a/modules/syndication/tpl/include.site.html b/modules/syndication/tpl/include.site.html
deleted file mode 100644
index a8499e0c5..000000000
--- a/modules/syndication/tpl/include.site.html
+++ /dev/null
@@ -1,5 +0,0 @@
-    <id>{htmlspecialchars($site_info->id)}</id>
-    <title>{htmlspecialchars($site_info->title)}</title>
-    <updated>{$site_info->updated}</updated>
-    <link rel="self" href="{htmlspecialchars($site_info->self_href)}" />
-    <link rel="alternative" href="{$site_info->alternative_href}" />
diff --git a/modules/syndication/tpl/js/syndication.js b/modules/syndication/tpl/js/syndication.js
deleted file mode 100644
index 7af234ac8..000000000
--- a/modules/syndication/tpl/js/syndication.js
+++ /dev/null
@@ -1,55 +0,0 @@
-function insertSelectedModules(id, module_srl, mid, browser_title) {
-    var sel_obj = xGetElementById('_'+id);
-    for(var i=0;i<sel_obj.options.length;i++) if(sel_obj.options[i].value==module_srl) return;
-    var opt = new Option(browser_title+' ('+mid+')', module_srl, false, false);
-    sel_obj.options[sel_obj.options.length] = opt;
-    if(sel_obj.options.length>8) sel_obj.size = sel_obj.options.length;
-
-    doSyncExceptModules(id);
-}
-
-function removeExceptModule(id) {
-    var sel_obj = xGetElementById('_'+id);
-    sel_obj.remove(sel_obj.selectedIndex);
-    if(sel_obj.options.length) sel_obj.selectedIndex = sel_obj.options.length-1;
-    doSyncExceptModules(id);
-}
-
-function doSyncExceptModules(id) {
-    var selected_module_srls = new Array();
-    var sel_obj = xGetElementById('_'+id);
-    for(var i=0;i<sel_obj.options.length;i++) {
-        selected_module_srls.push(sel_obj.options[i].value);
-    }
-    xGetElementById(id).value = selected_module_srls.join(',');
-}
-
-
-function pingSite(site_url){
-
-	jQuery('p.ping_test_result').html('');
-	var response_tags = new Array('error','message','ping_result');
-	exec_xml('syndication','procSyndicationAdminCheckSitePingResult',{'site_url':site_url},function(ret_obj,response_tags){
-		var error = ret_obj['error'];
-		var message = ret_obj['message'];
-		var ping_result = ret_obj['ping_result'];
-		if(ping_result) jQuery('p.ping_test_result').text(ping_result);
-		alert(message);
-
-	},response_tags);
-}
-
-function checkSyndicationStatus(service){
-
-	jQuery('p.print_result_status').html('');
-	var response_tags = new Array('error','message','result_status');
-	exec_xml('syndication','procSyndicationAdminCheckApiStatus',{target_service:service},function(ret_obj,response_tags){
-		var error = ret_obj['error'];
-		var message = ret_obj['message'];
-		var result = ret_obj['result_status'];
-
-		if(result) jQuery('div.print_result_status').html(result);
-		if(error!=0) alert(message);
-
-	},response_tags);
-}
diff --git a/modules/syndication/tpl/naver_result.html b/modules/syndication/tpl/naver_result.html
deleted file mode 100644
index 29171b78b..000000000
--- a/modules/syndication/tpl/naver_result.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<h3>Naver Syndication Status</h3>
-
-<h4>{$lang->syndication_status_result}</h4>
-<table>
-<tbody>
-<tr>
-	<th>{$lang->site}</th>
-	<td>{$result->site_name}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_status}</th>
-	<td><strong>{$result->status}</strong></td>
-</tr>
-<tr>
-	<th>{$lang->syndication_synic_start_date}</th>
-	<td>{$result->first_update}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_synic_last_date}</th>
-	<td>{$result->last_update}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_visit_ok_count}</th>
-	<td>{number_format($result->visit_ok_count)}</td>
-</tr>
-<tr>
-	<th>{$lang->syndication_visit_fail_count}</th>
-	<td>{number_format($result->visit_fail_count)}</td>
-</tr>
-</tbody>
-</table>
-<h4>{$lang->syndication_sync_article}</h4>
-<div class="vGraph"> 
-<!--@if($result->article_count)-->
-<ul> 
-<!--@foreach($result->article_count as $date => $count)-->
-	<li><span class="gTerm">{$date}</span><span class="gBar" style="height:{intval(($count/$result->max_article_count)*100)}%"><span>{number_format($count)}</span></span></li> 
-<!--@end-->
-</ul> 
-<!--@end-->
-</div>
diff --git a/modules/syndication/tpl/site.html b/modules/syndication/tpl/site.html
deleted file mode 100644
index 04fa4e46f..000000000
--- a/modules/syndication/tpl/site.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<feed xmlns="http://www.w3.org/2005/Atom">
-    <!--#include("./include.site.html")-->
-    <!--@if(count($channels))-->
-        <!--@foreach($channels as $key => $channel_info)-->
-        <entry>
-        <!--#include("./include.channel.html")-->
-        </entry>
-        <!--@end-->
-    <!--@elseif(count($articles->list))-->
-    <!--@if($articles->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($articles->next_url)}" /><!--@end-->
-        <!--@foreach($articles->list as $key => $article)-->
-        <!--#include("./include.articles.html")-->
-        <!--@end-->
-    <!--@elseif(count($deleted->list))-->
-    <!--@if($deleted->next_url)--><link rel="next-in-thread" href="{htmlspecialchars($deleted->next_url)}" /><!--@end-->
-        <!--@foreach($deleted->list as $key => $delete)-->
-        <!--#include("./include.deleted.html")-->
-        <!--@end-->
-    <!--@end-->
-</feed>
diff --git a/modules/syndication/tpl/site.info.html b/modules/syndication/tpl/site.info.html
deleted file mode 100644
index d4aff8112..000000000
--- a/modules/syndication/tpl/site.info.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{'<?xml version="1.0" encoding="utf-8"?>'}
-<entry xmlns="http://www.w3.org/2005/Atom">
-    <!--#include("./include.site.html")-->
-</entry>
diff --git a/modules/tag/conf/info.xml b/modules/tag/conf/info.xml
index 08ce31c8c..5443a8cc8 100644
--- a/modules/tag/conf/info.xml
+++ b/modules/tag/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">꼬리표</title>
-    <title xml:lang="zh-CN">标签</title>
-    <title xml:lang="jp">タグ</title>
-    <title xml:lang="en">Tag</title>
-    <title xml:lang="vi">Tag</title>
-    <title xml:lang="es">Etiqueta</title>
-    <title xml:lang="ru">Теги</title>
-    <title xml:lang="zh-TW">標籤</title>
-    <title xml:lang="tr">Etiket</title>
-    <description xml:lang="ko">꼬리표 관리 모듈</description>
-    <description xml:lang="zh-CN">标签管理模块。</description>
-    <description xml:lang="jp">タグ管理用のモジュールです。</description>
-    <description xml:lang="en">Module for managing tags.</description>
-    <description xml:lang="vi">Module quản lý Tag.</description>
-    <description xml:lang="es">Módulo para manejar etiquetas.</description>
-    <description xml:lang="ru">Модуль для управления тегами.</description>
-    <description xml:lang="zh-TW">標籤管理模組。</description>
-    <description xml:lang="tr">Etiketleri yönetme modülü.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>content</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">꼬리표</title>
+    <title xml:lang="zh-CN">标签</title>
+    <title xml:lang="jp">タグ</title>
+    <title xml:lang="en">Tag</title>
+    <title xml:lang="vi">Tag</title>
+    <title xml:lang="es">Etiqueta</title>
+    <title xml:lang="ru">Теги</title>
+    <title xml:lang="zh-TW">標籤</title>
+    <title xml:lang="tr">Etiket</title>
+    <description xml:lang="ko">꼬리표 관리 모듈</description>
+    <description xml:lang="zh-CN">标签管理模块。</description>
+    <description xml:lang="jp">タグ管理用のモジュールです。</description>
+    <description xml:lang="en">Module for managing tags.</description>
+    <description xml:lang="vi">Module quản lý Tag.</description>
+    <description xml:lang="es">Módulo para manejar etiquetas.</description>
+    <description xml:lang="ru">Модуль для управления тегами.</description>
+    <description xml:lang="zh-TW">標籤管理模組。</description>
+    <description xml:lang="tr">Etiketleri yönetme modülü.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>content</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/tag/tag.admin.controller.php b/modules/tag/tag.admin.controller.php
index 849a9015a..aed330a65 100644
--- a/modules/tag/tag.admin.controller.php
+++ b/modules/tag/tag.admin.controller.php
@@ -1,17 +1,17 @@
-<?php
-    /**
-     * @class  tagAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  tag 모듈의 admin controller class
-     **/
-
-    class tagAdminController extends tag {
-        /**
-         * @brief 특정 모듈의 태그 전체 삭제
-         **/
-        function deleteModuleTags($module_srl) {
-            $args->module_srl = $module_srl;
-            return executeQuery('tag.deleteModuleTags', $args);
-        }
-    }
-?>
+<?php
+    /**
+     * @class  tagAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin controller class of the tag module
+     **/
+
+    class tagAdminController extends tag {
+        /**
+         * @brief Delete all tags for a particular module
+         **/
+        function deleteModuleTags($module_srl) {
+            $args->module_srl = $module_srl;
+            return executeQuery('tag.deleteModuleTags', $args);
+        }
+    }
+?>
diff --git a/modules/tag/tag.class.php b/modules/tag/tag.class.php
index f26ae7c85..3b9d6382d 100644
--- a/modules/tag/tag.class.php
+++ b/modules/tag/tag.class.php
@@ -1,96 +1,88 @@
-<?php
-    /**
-     * @class  tag
-     * @author NHN (developers@xpressengine.com)
-     * @brief  tag 모듈의 high class
-     **/
-
-    class tag extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            $oModuleController = &getController('module');
-            $oDB = &DB::getInstance();
-
-            $oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
-
-            // 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument에 대한 trigger 등록
-            $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
-            $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
-            $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
-            $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
-            $oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 태그도 모두 삭제하는 트리거 추가
-            $oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
-            
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-            $oDB = &DB::getInstance();
-
-            // 2007. 10. 17 trigger 등록이 안되어 있으면 등록
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 태그도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
-
-            // tag 테이블의 tag 컬럼에 index
-            if(!$oDB->isIndexExists("tags","idx_tag")) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-            $oDB = &DB::getInstance();
-
-            // 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument에 대한 trigger 등록
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
-                $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
-
-            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
-                $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
-
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
-                $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
-
-            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
-                $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
-
-            if(!$oModuleModel->getTrigger('document.triggerDeleteTag', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
-                $oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 태그도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
-                $oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
-
-            // tag 테이블의 tag 컬럼에 index
-            if(!$oDB->isIndexExists("tags","idx_tag")) 
-                $oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-    }
-?>
+<?php
+    /**
+     * @class  tag
+     * @author NHN (developers@xpressengine.com)
+     * @brief high class of the tag module
+     **/
+
+    class tag extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            $oModuleController = &getController('module');
+            $oDB = &DB::getInstance();
+
+            $oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+            // 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
+            $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+            $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+            $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+            $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+            $oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
+            // 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
+            $oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
+            
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oModuleModel = &getModel('module');
+            $oDB = &DB::getInstance();
+            // 2007. 10. 17 trigger registration, if registered upset
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
+            // 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
+            // tag in the index column of the table tag
+            if(!$oDB->isIndexExists("tags","idx_tag")) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            $oDB = &DB::getInstance();
+            // 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
+                $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+
+            if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
+                $oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
+                $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+
+            if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
+                $oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+
+            if(!$oModuleModel->getTrigger('document.triggerDeleteTag', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
+                $oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
+            // 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
+                $oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
+            // tag in the index column of the table tag
+            if(!$oDB->isIndexExists("tags","idx_tag")) 
+                $oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+    }
+?>
diff --git a/modules/tag/tag.controller.php b/modules/tag/tag.controller.php
index 4e65b8243..fb77ac9a6 100644
--- a/modules/tag/tag.controller.php
+++ b/modules/tag/tag.controller.php
@@ -1,92 +1,89 @@
-<?php
-    /**
-     * @class  tagController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  tag 모듈의 controller class
-     **/
-
-    class tagController extends tag {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief ,(콤마)로 연결된 태그를 정리하는 trigger
-         **/
-        function triggerArrangeTag(&$obj) {
-            if(!$obj->tags) return new Object();
-
-            // tags변수 정리
-            $tag_list = explode(',', $obj->tags);
-            $tag_count = count($tag_list);
-            $tag_list = array_unique($tag_list);
-            if(!count($tag_list)) return new Object();
-
-            foreach($tag_list as $tag) {
-                if(!trim($tag)) continue;
-                $arranged_tag_list[] = trim($tag); 
-            }
-            if(!count($arranged_tag_list)) $obj->tags = null;
-            else $obj->tags = implode(',',$arranged_tag_list);
-            return new Object();
-        }
-
-        /**
-         * @brief 태그 입력 trigger
-         * 태그 입력은 해당 글의 모든 태그를 삭제 후 재 입력하는 방식을 이용
-         **/
-        function triggerInsertTag(&$obj) {
-            $module_srl = $obj->module_srl;
-            $document_srl = $obj->document_srl;
-            $tags = $obj->tags;
-            if(!$document_srl) return new Object();
-
-            // 해당 글의 tags를 모두 삭제
-            $output = $this->triggerDeleteTag($obj);
-            if(!$output->toBool()) return $output;
-
-            // 다시 태그를 입력
-            $args->module_srl = $module_srl;
-            $args->document_srl = $document_srl;
-
-            $tag_list = explode(',',$tags);
-            $tag_count = count($tag_list);
-            for($i=0;$i<$tag_count;$i++) {
-                unset($args->tag);
-                $args->tag = trim($tag_list[$i]);
-                if(!$args->tag) continue;
-                $output = executeQuery('tag.insertTag', $args);
-                if(!$output->toBool()) return $output;
-            }
-
-            return new Object();
-        }
-
-        /**
-         * @brief 특정 문서의 태그 삭제 trigger
-         * document_srl에 속한 tag 모두 삭제
-         **/
-        function triggerDeleteTag(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            $args->document_srl = $document_srl;
-            return executeQuery('tag.deleteTag', $args);
-        }
-
-        /**
-         * @brief module 삭제시 해당 태그 모두 삭제하는 trigger
-         **/
-        function triggerDeleteModuleTags(&$obj) {
-            $module_srl = $obj->module_srl;
-            if(!$module_srl) return new Object();
-
-            $oTagController = &getAdminController('tag');
-            return $oTagController->deleteModuleTags($module_srl);
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  tagController
+     * @author NHN (developers@xpressengine.com)
+     * @brief tag module's controller class
+     **/
+
+    class tagController extends tag {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief , (Comma) to clean up the tags attached to the trigger
+         **/
+        function triggerArrangeTag(&$obj) {
+            if(!$obj->tags) return new Object();
+            // tags by variable
+            $tag_list = explode(',', $obj->tags);
+            $tag_count = count($tag_list);
+            $tag_list = array_unique($tag_list);
+            if(!count($tag_list)) return new Object();
+
+            foreach($tag_list as $tag) {
+                if(!trim($tag)) continue;
+                $arranged_tag_list[] = trim($tag); 
+            }
+            if(!count($arranged_tag_list)) $obj->tags = null;
+            else $obj->tags = implode(',',$arranged_tag_list);
+            return new Object();
+        }
+
+        /**
+         * @brief Input trigger tag
+         * Enter a Tag to delete that article and then re-enter all the tags using a method
+         **/
+        function triggerInsertTag(&$obj) {
+            $module_srl = $obj->module_srl;
+            $document_srl = $obj->document_srl;
+            $tags = $obj->tags;
+            if(!$document_srl) return new Object();
+            // Remove all tags that article
+            $output = $this->triggerDeleteTag($obj);
+            if(!$output->toBool()) return $output;
+            // Re-enter the tag
+            $args->module_srl = $module_srl;
+            $args->document_srl = $document_srl;
+
+            $tag_list = explode(',',$tags);
+            $tag_count = count($tag_list);
+            for($i=0;$i<$tag_count;$i++) {
+                unset($args->tag);
+                $args->tag = trim($tag_list[$i]);
+                if(!$args->tag) continue;
+                $output = executeQuery('tag.insertTag', $args);
+                if(!$output->toBool()) return $output;
+            }
+
+            return new Object();
+        }
+
+        /**
+         * @brief Delete the tag trigger a specific article
+         * document_srl delete tag belongs to
+         **/
+        function triggerDeleteTag(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+
+            $args->document_srl = $document_srl;
+            return executeQuery('tag.deleteTag', $args);
+        }
+
+        /**
+         * @brief module delete trigger to delete all the tags
+         **/
+        function triggerDeleteModuleTags(&$obj) {
+            $module_srl = $obj->module_srl;
+            if(!$module_srl) return new Object();
+
+            $oTagController = &getAdminController('tag');
+            return $oTagController->deleteModuleTags($module_srl);
+        }
+
+    }
+?>
diff --git a/modules/tag/tag.model.php b/modules/tag/tag.model.php
index 996eb164e..1d09674e3 100644
--- a/modules/tag/tag.model.php
+++ b/modules/tag/tag.model.php
@@ -1,87 +1,86 @@
-<?php
-    /**
-     * @class  tagModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  tag 모듈의 model class
-     **/
-
-    class tagModel extends tag {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 태그 목록을 가져옴
-         * 지정된 모듈의 태그를 개수가 많은 순으로 추출
-         **/
-        function getTagList($obj) {
-            if($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크 
-            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-            $args->list_count = $obj->list_count;
-            $args->count = $obj->sort_index;
-
-            $output = executeQueryArray('tag.getTagList', $args);
-            if(!$output->toBool()) return $output;
-
-            return $output;
-        }
-
-
-        /**
-         * @brief tag로 document_srl를 가져오기
-         **/
-		function getDocumentSrlByTag($obj){
-			if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-
-			$args->tag = $obj->tag;
-			$output = executeQueryArray('tag.getDocumentSrlByTag', $args);
-            if(!$output->toBool()) return $output;
-
-            return $output;
-		}
-
-        /**
-         * @brief document 에서 사용된 tag 가져오기
-         **/
-		function getDocumentsTagList($obj){
-			if(is_array($obj->document_srl)) $args->document_srl = implode(',', $obj->document_srl);
-            else $args->document_srl = $obj->document_srl;
-
-            $output = executeQueryArray('tag.getDocumentsTagList', $args);
-            if(!$output->toBool()) return $output;
-
-            return $output;
-		}
-
-		/**
-		 * @brief 특정tag과 함께 사용된 tag목록
-		 **/
-		function getTagWithUsedList($obj){
-			if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-			else $args->module_srl = $obj->module_srl;
-
-			$args->tag = $obj->tag;
-			$output = $this->getDocumentSrlByTag($args);
-			$document_srl = array();
-
-			if($output->data){
-				foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
-			}
-			unset($args);
-			$args->document_srl = $document_srl;
-			$output = $this->getDocumentsTagList($args);
-			return $output;
-		}
-    }
-?>
+<?php
+    /**
+     * @class  tagModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief tag model class of the module
+     **/
+
+    class tagModel extends tag {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Imported Tag List
+         * Many of the specified module in order to extract the number of tags
+         **/
+        function getTagList($obj) {
+            if($obj->mid) {
+                $oModuleModel = &getModel('module');
+                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+                unset($obj->mid);
+            }
+            // Module_srl passed the array may be a check whether the array
+            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+            $args->list_count = $obj->list_count;
+            $args->count = $obj->sort_index;
+
+            $output = executeQueryArray('tag.getTagList', $args);
+            if(!$output->toBool()) return $output;
+
+            return $output;
+        }
+
+
+        /**
+         * @brief document_srl the import tag
+         **/
+		function getDocumentSrlByTag($obj){
+			if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+
+			$args->tag = $obj->tag;
+			$output = executeQueryArray('tag.getDocumentSrlByTag', $args);
+            if(!$output->toBool()) return $output;
+
+            return $output;
+		}
+
+        /**
+         * @brief document used in the import tag
+         **/
+		function getDocumentsTagList($obj){
+			if(is_array($obj->document_srl)) $args->document_srl = implode(',', $obj->document_srl);
+            else $args->document_srl = $obj->document_srl;
+
+            $output = executeQueryArray('tag.getDocumentsTagList', $args);
+            if(!$output->toBool()) return $output;
+
+            return $output;
+		}
+
+		/**
+		 * @brief Tag is used with a particular tag list
+		 **/
+		function getTagWithUsedList($obj){
+			if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+			else $args->module_srl = $obj->module_srl;
+
+			$args->tag = $obj->tag;
+			$output = $this->getDocumentSrlByTag($args);
+			$document_srl = array();
+
+			if($output->data){
+				foreach($output->data as $k => $v) $document_srl[] = $v->document_srl;
+			}
+			unset($args);
+			$args->document_srl = $document_srl;
+			$output = $this->getDocumentsTagList($args);
+			return $output;
+		}
+    }
+?>
diff --git a/modules/trackback/conf/info.xml b/modules/trackback/conf/info.xml
index ed8730efe..bce9023b3 100644
--- a/modules/trackback/conf/info.xml
+++ b/modules/trackback/conf/info.xml
@@ -1,37 +1,37 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">엮인글</title>
-    <title xml:lang="zh-CN">引用管理</title>
-    <title xml:lang="jp">トラックバック</title>
-    <title xml:lang="en">Trackback</title>
-    <title xml:lang="vi">Liên kết Web</title>
-    <title xml:lang="es">Trackback</title>
-    <title xml:lang="ru">Трекбек</title>
-    <title xml:lang="zh-TW">引用</title>
-    <title xml:lang="tr">Geri izleme</title>
-    <description xml:lang="ko">엮인글 관리 모듈</description>
-    <description xml:lang="zh-CN">管理引用模块。</description>
-    <description xml:lang="jp">トラックバック管理モジュール</description>
-    <description xml:lang="vi">Module dành cho quản lý liên kết Web.</description>
-    <description xml:lang="en">Module for managing trackbacks.</description>
-    <description xml:lang="es">Módulo para el manejo de trackbacks.</description>
-    <description xml:lang="ru">Модуль для управления трекбеками.</description>
-    <description xml:lang="zh-TW">管理引用的模組。</description>
-    <description xml:lang="en">Module for managing trackbacks.</description>
-    <description xml:lang="tr">Geri izlemeleri yönetme modülü.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>content</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">엮인글</title>
+    <title xml:lang="zh-CN">引用管理</title>
+    <title xml:lang="jp">トラックバック</title>
+    <title xml:lang="en">Trackback</title>
+    <title xml:lang="vi">Liên kết Web</title>
+    <title xml:lang="es">Trackback</title>
+    <title xml:lang="ru">Трекбек</title>
+    <title xml:lang="zh-TW">引用</title>
+    <title xml:lang="tr">Geri izleme</title>
+    <description xml:lang="ko">엮인글 관리 모듈</description>
+    <description xml:lang="zh-CN">管理引用模块。</description>
+    <description xml:lang="jp">トラックバック管理モジュール</description>
+    <description xml:lang="vi">Module dành cho quản lý liên kết Web.</description>
+    <description xml:lang="en">Module for managing trackbacks.</description>
+    <description xml:lang="es">Módulo para el manejo de trackbacks.</description>
+    <description xml:lang="ru">Модуль для управления трекбеками.</description>
+    <description xml:lang="zh-TW">管理引用的模組。</description>
+    <description xml:lang="en">Module for managing trackbacks.</description>
+    <description xml:lang="tr">Geri izlemeleri yönetme modülü.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>content</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/trackback/conf/module.xml b/modules/trackback/conf/module.xml
index ed6f063ab..aa83fe228 100644
--- a/modules/trackback/conf/module.xml
+++ b/modules/trackback/conf/module.xml
@@ -4,13 +4,30 @@
     <permissions />
     <actions>
         <action name="dispTrackbackSend" type="view" standalone="true" />
-        <action name="dispTrackbackAdminList" type="view" admin_index="true" standalone="true" />
+        <action name="dispTrackbackAdminList" type="view" admin_index="true" standalone="true" menu_name="trackback" menu_index="true" />
 
         <action name="trackback" type="controller" standalone="true" />
 
-        <action name="procTrackbackSend" type="controller" standalone="true" />
-        <action name="procTrackbackAdminDeleteChecked" type="controller" standalone="true" />
+        <action name="procTrackbackSend" type="controller" standalone="true" ruleset="sendTrackback" />
+        <action name="procTrackbackGetList" type="controller" standalone="true" />
+        <action name="procTrackbackAdminDeleteChecked" type="controller" standalone="true" ruleset="deleteChecked" />
         <action name="procTrackbackAdminInsertConfig" type="controller" standalone="true" />
         <action name="procTrackbackAdminInsertModuleConfig" type="controller" standalone="true" />
+        <action name="procTrackbackAdminAddCart" type="controller" standalone="true" />
     </actions>
+	<menus>
+		<menu name="trackback">
+			<title xml:lang="en">Trackback</title>
+			<title xml:lang="ko">엮인글</title>
+			<title xml:lang="zh-CN">Trackback</title>
+			<title xml:lang="jp">Trackback</title>
+			<title xml:lang="es">Trackback</title>
+			<title xml:lang="ru">Trackback</title>
+			<title xml:lang="fr">Trackback</title>
+			<title xml:lang="zh-TW">Trackback</title>
+			<title xml:lang="vi">Trackback</title>
+			<title xml:lang="mn">Trackback</title>
+			<title xml:lang="tr">Trackback</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/trackback/lang/en.lang.php b/modules/trackback/lang/en.lang.php
deleted file mode 100644
index 22531aad0..000000000
--- a/modules/trackback/lang/en.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback module / basic language pack
-     **/
-	$lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)';
-    $lang->cmd_delete_checked_trackback = 'Delete selected trackback(s)';
-
-    $lang->msg_cart_is_null = 'Please select a trackback to be deleted.';
-    $lang->msg_checked_trackback_is_deleted = '%d trackback(s) deleted.';
-
-	$lang->send_trackback_url = 'Destination URL';
-    $lang->msg_trackback_url_is_invalid = 'Destination URL is invalid';
-    $lang->msg_trackback_send_success = 'Sent successfully';
-	$lang->msg_trackback_send_failed = 'Failed to send';
-
-    $lang->search_target_list = array(
-        'url' => 'Target URL',
-        'blog_name' => 'Target Site Name',
-        'title' => 'Title',
-        'excerpt' => 'Excerpt',
-        'regdate' => 'Posted Date',
-        'ipaddress' => 'IP Address',
-    );
-
-    $lang->enable_trackback = "Use Trackback";
-	$lang->about_enable_trackback = "When the check is disabled, all trackback collection in the site will be stopped";
-?>
diff --git a/modules/trackback/lang/es.lang.php b/modules/trackback/lang/es.lang.php
deleted file mode 100644
index f4718305d..000000000
--- a/modules/trackback/lang/es.lang.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-    /**
-     * @archivo  modules/trackback/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para el módulo de trackback (básico)
-     **/
-
-	$lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)';
-    $lang->cmd_delete_checked_trackback = 'Trackback(s) es eliminado';
-
-    $lang->msg_cart_is_null = 'Seleccione un trackback para ser eliminado.';
-    $lang->msg_checked_trackback_is_deleted = '%d trackback(s) eliminado.';
-
-	$lang->send_trackback_url = 'Destination URL';
-    $lang->msg_trackback_url_is_invalid = 'Destination URL is invalid';
-    $lang->msg_trackback_send_success = 'Sent successfully';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => 'URL objetivo',
-        'blog_name' => 'Ojetivo del nombre de sitio',
-        'title' => 'Título',
-        'excerpt' => 'Contenido',
-        'regdate' => 'Fecha del posteo',
-        'ipaddress' => 'Dirección IP',
-    );
-
-    $lang->enable_trackback = "Usar trackback";
-    $lang->about_enable_trackback = "Si no selecciona esta opción, desactiva la inscripción de trackback en todos los documentos del sitio";
-?>
diff --git a/modules/trackback/lang/fr.lang.php b/modules/trackback/lang/fr.lang.php
deleted file mode 100644
index eff2e0417..000000000
--- a/modules/trackback/lang/fr.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de Rétrolien
-     **/
-	$lang->cmd_toggle_checked_trackback = 'Renverser les rétroliens choisis';
-    $lang->cmd_delete_checked_trackback = 'Supprimer les rétroliens choisis';
-
-    $lang->msg_cart_is_null = 'Choisissez un rétrolien à supprimer, S.V.P.';
-    $lang->msg_checked_trackback_is_deleted = '%d rétrolien(s) est(sont) supprimé(s).';
-
-	$lang->send_trackback_url = 'URL de Destination';
-    $lang->msg_trackback_url_is_invalid = 'URL de Destination est invalide';
-    $lang->msg_trackback_send_success = 'Envoyé avec succès';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => 'URL objectif',
-        'blog_name' => 'Nom du Site objectif',
-        'title' => 'Titre',
-        'excerpt' => 'Contenu',
-        'regdate' => 'Jour',
-        'ipaddress' => 'Adresse IP',
-    );
-
-    $lang->enable_trackback = "Utiliser le Rétrolien";
-	$lang->about_enable_trackback = "Si vous annulez la coché, on arrêtera de ramasser les rétroliens de tous les articles du site";
-?>
diff --git a/modules/trackback/lang/jp.lang.php b/modules/trackback/lang/jp.lang.php
deleted file mode 100644
index df98d91fd..000000000
--- a/modules/trackback/lang/jp.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  トラックバック（trackback）モジュール基本言語パッケージ
-     **/
-	$lang->cmd_toggle_checked_trackback = '選択トラックバック反転';
-    $lang->cmd_delete_checked_trackback = '選択トラックバック削除';
-
-    $lang->msg_cart_is_null = '削除する書き込みを選択して下さい。';
-    $lang->msg_checked_trackback_is_deleted = '%d個のトラックバックが削除されました。';
-
-    $lang->send_trackback_url = '送信するURL';
-    $lang->msg_trackback_url_is_invalid = 'トラックバックのurlが正しくありません。';
-    $lang->msg_trackback_send_success = 'トラックバックの送信が成功しました。';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => 'URL',
-        'blog_name' => 'サイト（ブログ）名',
-        'title' => 'タイトル',
-        'excerpt' => '要約内容',
-        'regdate' => '登録日',
-        'ipaddress' => 'IPアドレス',
-    );
-
-    $lang->enable_trackback = 'トラックバックを可能にする';
-    $lang->about_enable_trackback = 'チェックを外すと、すべてのコンテンツに対し、トラックバックの受信を中止します。';
-?>
diff --git a/modules/trackback/lang/ko.lang.php b/modules/trackback/lang/ko.lang.php
deleted file mode 100644
index 933426840..000000000
--- a/modules/trackback/lang/ko.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  엮인글(trackback) 모듈의 기본 언어팩
-     **/
-	$lang->cmd_toggle_checked_trackback = '선택항목 반전';
-    $lang->cmd_delete_checked_trackback = '선택항목 삭제';
-
-    $lang->msg_cart_is_null = '삭제할 글을 선택해주세요.';
-    $lang->msg_checked_trackback_is_deleted = '%d개의 엮인글이 삭제되었습니다.';
-
-    $lang->send_trackback_url = '발송할 주소';
-    $lang->msg_trackback_url_is_invalid = '발송할 대상 url이 올바르지 않습니다.';
-    $lang->msg_trackback_send_success = '엮인글 발송을 성공하였습니다.';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => '대상 URL',
-        'blog_name' => '대상 사이트 이름',
-        'title' => '제목',
-        'excerpt' => '내용',
-        'regdate' => '등록일',
-        'ipaddress' => 'IP 주소',
-    );
-
-    $lang->enable_trackback = '엮인글 사용';
-    $lang->about_enable_trackback = '체크를 해제하시면 사이트 내에 모든 글의 엮인글 접수를 중지합니다.';
-?>
diff --git a/modules/trackback/lang/lang.xml b/modules/trackback/lang/lang.xml
new file mode 100644
index 000000000..95b296f6e
--- /dev/null
+++ b/modules/trackback/lang/lang.xml
@@ -0,0 +1,199 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_toggle_checked_trackback">
+		<value xml:lang="ko"><![CDATA[선택항목 반전]]></value>
+		<value xml:lang="en"><![CDATA[Invert Selection]]></value>
+		<value xml:lang="jp"><![CDATA[選択トラックバック反転]]></value>
+		<value xml:lang="zh-CN"><![CDATA[反选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[反選]]></value>
+		<value xml:lang="fr"><![CDATA[Renverser les rétroliens choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Reverse selected trackback(s)]]></value>
+		<value xml:lang="es"><![CDATA[Reverse selected trackback(s)]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili geri izlemeleri iptal et]]></value>
+		<value xml:lang="vi"><![CDATA[Nhận liên kết Web đã chọn]]></value>
+	</item>
+	<item name="cmd_delete_checked_trackback">
+		<value xml:lang="ko"><![CDATA[선택항목 삭제]]></value>
+		<value xml:lang="en"><![CDATA[Delete selected]]></value>
+		<value xml:lang="jp"><![CDATA[選択トラックバック削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[删除所选]]></value>
+		<value xml:lang="zh-TW"><![CDATA[刪除所選]]></value>
+		<value xml:lang="fr"><![CDATA[Supprimer les rétroliens choisis]]></value>
+		<value xml:lang="ru"><![CDATA[Удалить выбранные трекбеки]]></value>
+		<value xml:lang="es"><![CDATA[Trackback(s) es eliminado]]></value>
+		<value xml:lang="tr"><![CDATA[Seçili geri izlemeleri sil]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa liên kết Web đã chọn]]></value>
+	</item>
+	<item name="msg_cart_is_null">
+		<value xml:lang="ko"><![CDATA[삭제할 글을 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select a trackback to delete.]]></value>
+		<value xml:lang="jp"><![CDATA[削除する書き込みを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择要删除的文章]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇要刪除的文章]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez un rétrolien à supprimer, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите трекбек для удаления.]]></value>
+		<value xml:lang="es"><![CDATA[Seleccione un trackback para ser eliminado.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen silinecek geri izlemeyi seçin.]]></value>
+		<value xml:lang="vi"><![CDATA[Xin hãy chọn liên kết Web muốn xóa.]]></value>
+	</item>
+	<item name="msg_checked_trackback_is_deleted">
+		<value xml:lang="ko"><![CDATA[%d개의 엮인글을 삭제했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[%d trackback(s) deleted.]]></value>
+		<value xml:lang="jp"><![CDATA[%d個のトラックバックが削除されました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已删除%d个引用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已刪除%d個引用]]></value>
+		<value xml:lang="fr"><![CDATA[%d rétrolien(s) est(sont) supprimé(s).]]></value>
+		<value xml:lang="ru"><![CDATA[%d трекбеков удалено.]]></value>
+		<value xml:lang="es"><![CDATA[%d trackback(s) eliminado.]]></value>
+		<value xml:lang="tr"><![CDATA[%d geri izlemeleri silindi.]]></value>
+		<value xml:lang="vi"><![CDATA[%d đã được xóa.]]></value>
+	</item>
+	<item name="send_trackback_url">
+		<value xml:lang="ko"><![CDATA[발송할 주소]]></value>
+		<value xml:lang="en"><![CDATA[Destination URL]]></value>
+		<value xml:lang="jp"><![CDATA[送信するURL]]></value>
+		<value xml:lang="zh-CN"><![CDATA[发送地址]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送網址]]></value>
+		<value xml:lang="fr"><![CDATA[URL de Destination]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef URL]]></value>
+		<value xml:lang="vi"><![CDATA[Địa chỉ muốn gửi]]></value>
+	</item>
+	<item name="msg_trackback_url_is_invalid">
+		<value xml:lang="ko"><![CDATA[발송할 대상의 주소가 올바르지 않습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Destination URL is invalid.]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバックのurlが正しくありません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[错误的发送地址！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[發送錯誤！]]></value>
+		<value xml:lang="fr"><![CDATA[URL de Destination est invalide]]></value>
+		<value xml:lang="tr"><![CDATA[Hedef URL geçersiz.]]></value>
+		<value xml:lang="vi"><![CDATA[Địa chỉ muốn gửi không hợp lệ]]></value>
+	</item>
+	<item name="msg_trackback_send_success">
+		<value xml:lang="ko"><![CDATA[엮인글을 발송했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Sent successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバックを送信しました。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[成功发送引用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[成功發送。]]></value>
+		<value xml:lang="fr"><![CDATA[Envoyé avec succès]]></value>
+		<value xml:lang="tr"><![CDATA[Başarıyla gönderildi]]></value>
+		<value xml:lang="vi"><![CDATA[Đã gửi thành công.]]></value>
+	</item>
+	<item name="search_target_list" type="array">
+		<item name="url">
+			<value xml:lang="ko"><![CDATA[대상 URL]]></value>
+			<value xml:lang="en"><![CDATA[Target URL]]></value>
+			<value xml:lang="jp"><![CDATA[URL]]></value>
+			<value xml:lang="zh-CN"><![CDATA[对象URL]]></value>
+			<value xml:lang="zh-TW"><![CDATA[目標網址]]></value>
+			<value xml:lang="fr"><![CDATA[URL objectif]]></value>
+			<value xml:lang="ru"><![CDATA[URL назначения]]></value>
+			<value xml:lang="es"><![CDATA[URL objetivo]]></value>
+			<value xml:lang="tr"><![CDATA[Hedef URL]]></value>
+			<value xml:lang="vi"><![CDATA[URL muốn gửi]]></value>
+		</item>
+		<item name="blog_name">
+			<value xml:lang="ko"><![CDATA[대상 사이트 이름]]></value>
+			<value xml:lang="en"><![CDATA[Target Site Name]]></value>
+			<value xml:lang="jp"><![CDATA[サイト（ブログ）名]]></value>
+			<value xml:lang="zh-CN"><![CDATA[对象网站名称]]></value>
+			<value xml:lang="zh-TW"><![CDATA[目標網站名稱]]></value>
+			<value xml:lang="fr"><![CDATA[Nom du Site objectif]]></value>
+			<value xml:lang="ru"><![CDATA[Имя сайта]]></value>
+			<value xml:lang="es"><![CDATA[Ojetivo del nombre de sitio]]></value>
+			<value xml:lang="tr"><![CDATA[Hedef Site Adı]]></value>
+			<value xml:lang="vi"><![CDATA[Tên Website muốn gửi]]></value>
+		</item>
+		<item name="title">
+			<value xml:lang="ko"><![CDATA[제목]]></value>
+			<value xml:lang="en"><![CDATA[Title]]></value>
+			<value xml:lang="jp"><![CDATA[タイトル]]></value>
+			<value xml:lang="zh-CN"><![CDATA[标题]]></value>
+			<value xml:lang="zh-TW"><![CDATA[標題]]></value>
+			<value xml:lang="fr"><![CDATA[Titre]]></value>
+			<value xml:lang="ru"><![CDATA[Заголовок]]></value>
+			<value xml:lang="es"><![CDATA[Título]]></value>
+			<value xml:lang="tr"><![CDATA[Başlık]]></value>
+			<value xml:lang="vi"><![CDATA[Tiêu đề]]></value>
+		</item>
+		<item name="excerpt">
+			<value xml:lang="ko"><![CDATA[내용]]></value>
+			<value xml:lang="en"><![CDATA[Excerpt]]></value>
+			<value xml:lang="jp"><![CDATA[要約内容]]></value>
+			<value xml:lang="zh-CN"><![CDATA[内容]]></value>
+			<value xml:lang="zh-TW"><![CDATA[內容]]></value>
+			<value xml:lang="fr"><![CDATA[Contenu]]></value>
+			<value xml:lang="ru"><![CDATA[Выдержка]]></value>
+			<value xml:lang="es"><![CDATA[Contenido]]></value>
+			<value xml:lang="tr"><![CDATA[Alıntı]]></value>
+			<value xml:lang="vi"><![CDATA[Trích đoạn]]></value>
+		</item>
+		<item name="regdate">
+			<value xml:lang="ko"><![CDATA[등록일]]></value>
+			<value xml:lang="en"><![CDATA[Posted Date]]></value>
+			<value xml:lang="jp"><![CDATA[登録日]]></value>
+			<value xml:lang="zh-CN"><![CDATA[登录日期]]></value>
+			<value xml:lang="zh-TW"><![CDATA[登錄日期]]></value>
+			<value xml:lang="fr"><![CDATA[Jour]]></value>
+			<value xml:lang="ru"><![CDATA[Дата отправки]]></value>
+			<value xml:lang="es"><![CDATA[Fecha del posteo]]></value>
+			<value xml:lang="tr"><![CDATA[Gönderilme Tarihi]]></value>
+			<value xml:lang="vi"><![CDATA[Ngày gửi]]></value>
+		</item>
+		<item name="ipaddress">
+			<value xml:lang="ko"><![CDATA[IP 주소]]></value>
+			<value xml:lang="en"><![CDATA[IP Address]]></value>
+			<value xml:lang="jp"><![CDATA[IPアドレス]]></value>
+			<value xml:lang="zh-CN"><![CDATA[IP地址]]></value>
+			<value xml:lang="zh-TW"><![CDATA[IP位址]]></value>
+			<value xml:lang="fr"><![CDATA[Adresse IP]]></value>
+			<value xml:lang="ru"><![CDATA[IP-адрес]]></value>
+			<value xml:lang="es"><![CDATA[Dirección IP]]></value>
+			<value xml:lang="tr"><![CDATA[IP Adresi]]></value>
+			<value xml:lang="vi"><![CDATA[IP]]></value>
+		</item>
+	</item>
+	<item name="enable_trackback">
+		<value xml:lang="ko"><![CDATA[엮인글 허용]]></value>
+		<value xml:lang="en"><![CDATA[Allow Trackback]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバックを可能にする]]></value>
+		<value xml:lang="zh-CN"><![CDATA[使用引用]]></value>
+		<value xml:lang="zh-TW"><![CDATA[使用引用]]></value>
+		<value xml:lang="fr"><![CDATA[Utiliser le Rétrolien]]></value>
+		<value xml:lang="ru"><![CDATA[Включить трекбек]]></value>
+		<value xml:lang="es"><![CDATA[Usar trackback]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izleme kullan.]]></value>
+		<value xml:lang="vi"><![CDATA[Sử dụng liên kết Web]]></value>
+	</item>
+	<item name="about_enable_trackback">
+		<value xml:lang="ko"><![CDATA[체크를 해제하면 모든 글의 엮인글 접수를 중지합니다.]]></value>
+		<value xml:lang="en"><![CDATA[When it is unchecked, all the trackback collection on the site will be stopped.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを外すと、すべてのコンテンツに対し、トラックバックの受信を中止します。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[取消此项勾选将对网站内的所有主题禁止接收引用。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不選取的話，將會使網站內所有的主題都禁止接收引用。]]></value>
+		<value xml:lang="fr"><![CDATA[Si vous annulez la coché, on arrêtera de ramasser les rétroliens de tous les articles du site]]></value>
+		<value xml:lang="ru"><![CDATA[Эта опция включает/выключает фукцию трекбека.]]></value>
+		<value xml:lang="es"><![CDATA[Si no selecciona esta opción, desactiva la inscripción de trackback en todos los documentos del sitio]]></value>
+		<value xml:lang="tr"><![CDATA[Geri izleme devredışı bırakıldığında, sitedeki tüm geri izleme (trackback) koleksiyonları durdurulacaktır.]]></value>
+		<value xml:lang="vi"><![CDATA[Khi chọn là tắt chức năng này, mọi liên kết Web trên Website sẽ ngừng hoạt động.]]></value>
+	</item>
+	<item name="no_trackbacks">
+		<value xml:lang="ko"><![CDATA[엮인글이 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[No Trackbacks]]></value>
+		<value xml:lang="jp"><![CDATA[トラックバックがありません。]]></value>
+	</item>
+	<item name="trackback_manager">
+		<value xml:lang="ko"><![CDATA[선택한 엮인글 관리]]></value>
+		<value xml:lang="en"><![CDATA[Manage selected trackbacks]]></value>
+		<value xml:lang="jp"><![CDATA[選択したトラックバック管理]]></value>
+	</item>
+	<item name="selected_trackback">
+		<value xml:lang="ko"><![CDATA[선택한 엮인글]]></value>
+		<value xml:lang="en"><![CDATA[Selected trackbacks]]></value>
+		<value xml:lang="jp"><![CDATA[選択したトラックバック]]></value>
+	</item>
+	<item name="site">
+		<value xml:lang="ko"><![CDATA[사이트]]></value>
+		<value xml:lang="en"><![CDATA[Site]]></value>
+		<value xml:lang="jp"><![CDATA[サイト]]></value>
+	</item>
+</lang>
\ No newline at end of file
diff --git a/modules/trackback/lang/ru.lang.php b/modules/trackback/lang/ru.lang.php
deleted file mode 100644
index 6f6270563..000000000
--- a/modules/trackback/lang/ru.lang.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-	$lang->cmd_toggle_checked_trackback = 'Reverse selected trackback(s)';
-    $lang->cmd_delete_checked_trackback = 'Удалить выбранные трекбеки';
-
-    $lang->msg_cart_is_null = 'Пожалуйста, выберите трекбек для удаления.';
-    $lang->msg_checked_trackback_is_deleted = '%d трекбеков удалено.';
-
-	$lang->send_trackback_url = 'Destination URL';
-    $lang->msg_trackback_url_is_invalid = 'Destination URL is invalid';
-    $lang->msg_trackback_send_success = 'Sent successfully';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => 'URL назначения',
-        'blog_name' => 'Имя сайта',
-        'title' => 'Заголовок',
-        'excerpt' => 'Выдержка',
-        'regdate' => 'Дата отправки',
-        'ipaddress' => 'IP-адрес',
-    );
-
-    $lang->enable_trackback = "Включить трекбек";
-    $lang->about_enable_trackback = "Эта опция включает/выключает фукцию трекбека.";
-?>
diff --git a/modules/trackback/lang/tr.lang.php b/modules/trackback/lang/tr.lang.php
deleted file mode 100644
index 4b0432ffa..000000000
--- a/modules/trackback/lang/tr.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback module / basic language pack
-     **/
-	$lang->cmd_toggle_checked_trackback = 'Seçili geri izlemeleri iptal et';
-    $lang->cmd_delete_checked_trackback = 'Seçili geri izlemeleri sil';
-
-    $lang->msg_cart_is_null = 'Lütfen silinecek geri izlemeyi seçin.';
-    $lang->msg_checked_trackback_is_deleted = '%d geri izlemeleri silindi.';
-
-	$lang->send_trackback_url = 'Hedef URL';
-    $lang->msg_trackback_url_is_invalid = 'Hedef URL geçersiz.';
-    $lang->msg_trackback_send_success = 'Başarıyla gönderildi';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => 'Hedef URL',
-        'blog_name' => 'Hedef Site Adı',
-        'title' => 'Başlık',
-        'excerpt' => 'Alıntı',
-        'regdate' => 'Gönderilme Tarihi',
-        'ipaddress' => 'IP Adresi',
-    );
-
-    $lang->enable_trackback = "Geri izleme kullan.";
-	$lang->about_enable_trackback = "Geri izleme devredışı bırakıldığında, sitedeki tüm geri izleme (trackback) koleksiyonları durdurulacaktır.";
-?>
diff --git a/modules/trackback/lang/vi.lang.php b/modules/trackback/lang/vi.lang.php
deleted file mode 100644
index ce02ac7f6..000000000
--- a/modules/trackback/lang/vi.lang.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-	$lang->cmd_toggle_checked_trackback = 'Nhận liên kết Web đã chọn';
-    $lang->cmd_delete_checked_trackback = 'Xóa liên kết Web đã chọn';
-
-    $lang->msg_cart_is_null = 'Xin hãy chọn liên kết Web muốn xóa.';
-    $lang->msg_checked_trackback_is_deleted = '%d đã được xóa.';
-
-	$lang->send_trackback_url = 'Địa chỉ muốn gửi';
-    $lang->msg_trackback_url_is_invalid = 'Địa chỉ muốn gửi không hợp lệ';
-    $lang->msg_trackback_send_success = 'Đã gửi thành công.';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => 'URL muốn gửi',
-        'blog_name' => 'Tên Website muốn gửi',
-        'title' => 'Tiêu đề',
-        'excerpt' => 'Trích đoạn',
-        'regdate' => 'Ngày gửi',
-        'ipaddress' => 'IP',
-    );
-
-    $lang->enable_trackback = "Sử dụng liên kết Web";
-	$lang->about_enable_trackback = "Khi chọn là tắt chức năng này, mọi liên kết Web trên Website sẽ ngừng hoạt động.";
-?>
diff --git a/modules/trackback/lang/zh-CN.lang.php b/modules/trackback/lang/zh-CN.lang.php
deleted file mode 100644
index 302d89a82..000000000
--- a/modules/trackback/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com) 翻译：guny
-     * @brief  引用(trackback) 模块的基本语言包
-     **/
-    $lang->cmd_toggle_checked_trackback = '反选';
-    $lang->cmd_delete_checked_trackback = '删除所选';
-
-    $lang->msg_cart_is_null = '请选择要删除的文章';
-    $lang->msg_checked_trackback_is_deleted = '已删除%d个引用';
-
-    $lang->send_trackback_url = '发送地址';
-    $lang->msg_trackback_url_is_invalid = '错误的发送地址！';
-    $lang->msg_trackback_send_success = '成功发送引用。';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => '对象URL',
-        'blog_name' => '对象网站名称',
-        'title' => '标题',
-        'excerpt' => '内容',
-        'regdate' => '登录日期',
-        'ipaddress' => 'IP地址',
-    );
-
-    $lang->enable_trackback = "使用引用";
-    $lang->about_enable_trackback = "取消此项勾选将对网站内的所有主题禁止接收引用。";
-?>
diff --git a/modules/trackback/lang/zh-TW.lang.php b/modules/trackback/lang/zh-TW.lang.php
deleted file mode 100644
index 017466bba..000000000
--- a/modules/trackback/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-    /**
-     * @file   modules/trackback/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  引用(trackback)模組正體中文語言
-     **/
-    $lang->cmd_toggle_checked_trackback = '反選';
-    $lang->cmd_delete_checked_trackback = '刪除所選';
-
-    $lang->msg_cart_is_null = '請選擇要刪除的文章';
-    $lang->msg_checked_trackback_is_deleted = '已刪除%d個引用';
-
-    $lang->send_trackback_url = '發送網址';
-    $lang->msg_trackback_url_is_invalid = '發送錯誤！';
-    $lang->msg_trackback_send_success = '成功發送。';
-	$lang->msg_trackback_send_failed = '엮인글 발송을 실패하였습니다.';
-
-    $lang->search_target_list = array(
-        'url' => '目標網址',
-        'blog_name' => '目標網站名稱',
-        'title' => '標題',
-        'excerpt' => '內容',
-        'regdate' => '登錄日期',
-        'ipaddress' => 'IP位址',
-    );
-
-    $lang->enable_trackback = "使用引用";
-    $lang->about_enable_trackback = "不選取的話，將會使網站內所有的主題都禁止接收引用。";
-?>
diff --git a/modules/trackback/queries/getTotalTrackbackList.xml b/modules/trackback/queries/getTotalTrackbackList.xml
index d0fab778b..4c779f0e9 100644
--- a/modules/trackback/queries/getTotalTrackbackList.xml
+++ b/modules/trackback/queries/getTotalTrackbackList.xml
@@ -6,7 +6,8 @@
         <column name="*" />
     </columns>
     <conditions>
-        <condition operation="in" column="module_srl" var="s_module_srl" />
+        <condition operation="in" column="trackback_srl" var="trackbackSrlList" filter="number" />
+        <condition operation="in" column="module_srl" var="s_module_srl" pipe="and" />
         <condition operation="notin" column="module_srl" var="exclude_module_srl" pipe="and" />
         <group pipe="and">
             <condition operation="like" column="url" var="s_url" />
diff --git a/modules/trackback/queries/getTrackbackCount.xml b/modules/trackback/queries/getTrackbackCount.xml
index c168a2f51..8bdaeeefa 100644
--- a/modules/trackback/queries/getTrackbackCount.xml
+++ b/modules/trackback/queries/getTrackbackCount.xml
@@ -7,6 +7,7 @@
     </columns>
     <conditions>
         <condition operation="equal" column="document_srl" var="document_srl" filter="number"  />
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="in" column="module_srl" var="module_srl" filter="number" pipe="and" />
+		<condition operation="like_prefix" column="regdate" var="regDate" pipe="and" />
     </conditions>
 </query>
diff --git a/modules/trackback/ruleset/deleteChecked.xml b/modules/trackback/ruleset/deleteChecked.xml
new file mode 100644
index 000000000..55a24f35c
--- /dev/null
+++ b/modules/trackback/ruleset/deleteChecked.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="cart" required="true" />
+    </fields>
+</ruleset>
diff --git a/modules/trackback/ruleset/sendTrackback.xml b/modules/trackback/ruleset/sendTrackback.xml
new file mode 100644
index 000000000..537f222d5
--- /dev/null
+++ b/modules/trackback/ruleset/sendTrackback.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+		<rule name="charset" type="enum" test="UTF-8, EUC-KR, EUC-JP, SHIFT_JIS, EUC-CN, HZ, BIG5" />
+    </customrules>
+    <fields>
+		<field name="target_srl" required="true" rule="number" />
+		<field name="trackback_url" required="true" rule="url" />
+		<field name="charset" required="true" rule="charset" default="UTF-8" />
+    </fields>
+</ruleset>
diff --git a/modules/trackback/tpl/js/trackback_admin.js b/modules/trackback/tpl/js/trackback_admin.js
index 9fa923099..4d04d5735 100644
--- a/modules/trackback/tpl/js/trackback_admin.js
+++ b/modules/trackback/tpl/js/trackback_admin.js
@@ -13,3 +13,64 @@ function doCheckAll(bToggle) {
 function insertSelectedModule(id, module_srl, mid, browser_title) {
     location.href = current_url.setQuery('module_srl',module_srl);
 }
+
+function getTrackbackList()
+{
+	var trackbackListTable = jQuery('#trackbackListTable');
+	var cartList = [];
+	trackbackListTable.find(':checkbox[name=cart]').each(function(){
+		if(this.checked) cartList.push(this.value); 
+	});
+
+    var params = new Array();
+    var response_tags = ['error','message', 'trackback_list'];
+	params["trackback_srls"] = cartList.join(",");
+
+    exec_xml('trackback','procTrackbackGetList',params, completeGetTrackbackList, response_tags);
+}
+
+function completeGetTrackbackList(ret_obj, response_tags)
+{
+	var htmlListBuffer = '';
+	var statusNameList = {"N":"Public", "Y":"Secret"};
+
+	if(ret_obj['trackback_list'] == null)
+	{
+		htmlListBuffer = '<tr>' +
+							'<td colspan="2" style="text-align:center;">'+ret_obj['message']+'</td>' +
+						'</tr>';
+	}
+	else
+	{
+		var trackback_list = ret_obj['trackback_list']['item'];
+		if(!jQuery.isArray(trackback_list)) trackback_list = [trackback_list];
+		for(var x in trackback_list)
+		{
+			var objTrackback = trackback_list[x];
+			htmlListBuffer += '<tr>' +
+							'<tr>' +
+								'<td class="text"> <strong>'+ objTrackback.title +'</strong>' +
+									'<p>'+ objTrackback.excerpt +'</p>' +
+								'</td>' +
+								'<td>'+ objTrackback.blog_name +'</td>' +
+							'</tr>' +
+							'<input type="hidden" name="cart[]" value="'+objTrackback.trackback_srl+'" />';
+		}
+		jQuery('#selectedTrackbackCount').html(trackback_list.length);
+	}
+	jQuery('#trackbackManageListTable>tbody').html(htmlListBuffer);
+}
+
+function checkSearch(form)
+{
+	if(form.search_target.value == '')
+	{
+		alert(xe.lang.msg_empty_search_target);
+		return false;
+	}
+	if(form.search_keyword.value == '')
+	{
+		alert(xe.lang.msg_empty_search_keyword);
+		return false;
+	}
+}
diff --git a/modules/trackback/tpl/send_trackback_form.html b/modules/trackback/tpl/send_trackback_form.html
index 47367fad5..000da0fc1 100644
--- a/modules/trackback/tpl/send_trackback_form.html
+++ b/modules/trackback/tpl/send_trackback_form.html
@@ -1,42 +1,39 @@
-<!--%import("filter/send_trackback.xml")-->
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_send_trackback}</h3>
+<h1 class="h1">{$lang->cmd_send_trackback}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
 </div>
-
-<form action="./" method="get" onsubmit="return procFilter(this, send_trackback)">
-<input type="hidden" name="target_srl" value="{$oDocument->document_srl}" />
-
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th scope="row"><div><label>{$lang->title}</label></div></th>
-        <td>{$oDocument->getTitleText()}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div><label>{$lang->content}</label></div></th>
-        <td>{$oDocument->getSummary()}</td>
-    </tr>
-    <tr>
-        <th scope="row"><div><label for="textfield1">{$lang->send_trackback_url}</label></div></th>
-        <td>
-            <input type="text" id="textfield1" name="trackback_url" value="" class="inputTypeText w300" />
-            <select name="charset">
-                <option value='UTF-8'>UTF-8</option>
-                <option value='EUC-KR'>EUC-KR</option>
-                <option value='EUC-JP'>EUC-JP</option>
-                <option value='SHIFT_JIS'>SHIFT_JIS</option>
-                <option value='EUC-CN'>EUC-CN</option>
-                <option value='HZ'>HZ</option>
-                <option value='BIG5'>BIG5</option>
-            </select>
-        </td>
-    </tr>
-    </table>
-</div>
-
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_send_trackback}" /></span>
-</div>
-
+<form ruleset="sendTrackback" action="./" method="post">
+	<input type="hidden" name="module" value="trackback" />
+	<input type="hidden" name="act" value="procTrackbackSend" />
+	<input type="hidden" name="target_srl" value="{$oDocument->document_srl}" />
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+		<tr>
+			<th scope="row"><label>{$lang->title}</label></th>
+			<td>{$oDocument->getTitleText()}</td>
+		</tr>
+		<tr>
+			<th scope="row"><label>{$lang->content}</label></th>
+			<td>{$oDocument->getSummary()}</td>
+		</tr>
+		<tr>
+			<th scope="row"><label for="textfield1">{$lang->send_trackback_url}</label></th>
+			<td>
+				<input type="text" id="textfield1" name="trackback_url" value="" />
+				<select name="charset">
+					<option value='UTF-8'>UTF-8</option>
+					<option value='EUC-KR'>EUC-KR</option>
+					<option value='EUC-JP'>EUC-JP</option>
+					<option value='SHIFT_JIS'>SHIFT_JIS</option>
+					<option value='EUC-CN'>EUC-CN</option>
+					<option value='HZ'>HZ</option>
+					<option value='BIG5'>BIG5</option>
+				</select>
+			</td>
+		</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_send_trackback}" /></span>
+	</div>
 </form>
diff --git a/modules/trackback/tpl/trackback_list.html b/modules/trackback/tpl/trackback_list.html
index e0354d2f3..52230064b 100644
--- a/modules/trackback/tpl/trackback_list.html
+++ b/modules/trackback/tpl/trackback_list.html
@@ -1,100 +1,127 @@
-<!--%import("filter/delete_checked.xml")-->
-<!--%import("filter/insert_config.xml")-->
-<!--%import("js/trackback_admin.js")-->
-
-<h3 class="xeAdmin">{$lang->trackback} <span class="gray">{$lang->cmd_management}</span></h3>
-
-<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
-<table cellspacing="0" class="rowTable topGap">
-<tr class="row2">
-    <th scope="col"><div>{$lang->enable_trackback}</div></th>
-</tr>
-<tr>
-    <td>
-        <input type="checkbox" name="enable_trackback" value="Y" size="3" <!--@if($config->enable_trackback=='Y')-->checked="checked"<!--@end-->/> {$lang->cmd_use}
-        <p>{$lang->about_enable_trackback}</p>
-    </td>
-</tr>
-<tr class="row2">
-    <th class="button"><span class="button black strong"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span></th>
-</tr>
-</table>
-</form>
-
-<!-- 검색 -->
-<div class="fl">
-    <form action="./" method="get" class="adminSearch">
-    <input type="hidden" name="module" value="{$module}" />
-    <input type="hidden" name="act" value="{$act}" />
-    <input type="hidden" name="module_srl" value="{$module_srl}" />
-
-        <fieldset>
-            <select name="search_target">
-                <option value="">{$lang->search_target}</option>
-                <!--@foreach($lang->search_target_list as $key => $val)-->
-                <option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
-                <!--@end-->
-            </select>
-            <input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" class="inputTypeText" />
-            <span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
-            <a href="{getUrl('','module',$module,'act',$act)}" class="button black"><span>{$lang->cmd_cancel}</span></a>
-        </fieldset>
-    </form>
-</div>
-
-<form id="fo_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked)">
-<input type="hidden" name="page" value="{$page}" />
-
-<!-- 모듈 선택 -->
-<div class="fr">
-    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_find_module}</span></a>
-    <span class="button red"><input type="submit" value="{$lang->cmd_delete_checked_trackback}" /></span>
-</div>
-
-
-<!-- 목록 -->
-<table cellspacing="0" class="rowTable clear">
-<caption>Total {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->no}</div></th>
-        <th scope="col"><div><input type="checkbox" onclick="XE.checkboxToggleAll(); return false;" /></div></th>
-        <th scope="col"><div>{$lang->blog_name}</div></th>
-        <th scope="col" class="wide"><div>{$lang->title}</div></th>
-        <th scope="col"><div>{$lang->date}</div></th>
-        <th scope="col"><div>{$lang->ipaddress}</div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($trackback_list as $no => $val)-->
-    <tr class="row{$cycle_idx}">
-        <td rowspan="2" class="center number" scope="col">{$no}</td>
-        <td rowspan="2" class="center"><input type="checkbox" name="cart" value="{$val->trackback_srl}" /></td>
-        <td rowspan="2"><div class="w200"><a href="{$val->url}" onclick="window.open(this.href); return false;">{$val->blog_name}</a></div></td>
-        <td ><a href="{getUrl('','document_srl',$val->document_srl)}#trackback_{$val->trackback_srl}" onclick="window.open(this.href);return false;">{$val->title}</a></td>
-        <td class="date center nowrap">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="number left nowrap"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
-    </tr>
-    <tr>
-        <td colspan="3">
-            {$val->excerpt}
-        </td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
-</form>
-
-
-<!-- 페이지 네비게이션 -->
-<div class="pagination a1">
-    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-    <!--@while($page_no = $page_navigation->getNextPage())-->
-        <!--@if($page == $page_no)-->
-            <strong>{$page_no}</strong> 
-        <!--@else-->
-            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-        <!--@end-->
-    <!--@end-->
-    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-</div>
+<script type="text/javascript">
+xe.lang.msg_empty_search_target = '{$lang->msg_empty_search_target}';
+xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
+</script>
+<load target="js/trackback_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form action="" class="form">
+	<h1 class="h1">{$lang->trackback}</h1>
+	<div class="table even">
+		<table width="100%" border="1" cellspacing="0" id="trackbackListTable">
+			<caption>
+				All({number_format($total_count)})
+				<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrackbackList();">{$lang->trackback_manager}...</a></span></span>
+			</caption>
+			<thead>
+				<tr>
+					<th scope="col" class="text">{$lang->title}</th>
+					<th scope="col">{$lang->site}</th>
+					<th scope="col">{$lang->date}</th>
+					<th scope="col">{$lang->ipaddress}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</thead>
+			<tfoot>
+				<tr>
+					<th scope="col" class="text">{$lang->title}</th>
+					<th scope="col">{$lang->site}</th>
+					<th scope="col">{$lang->date}</th>
+					<th scope="col">{$lang->ipaddress}</th>
+					<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
+				</tr>
+			</tfoot>
+			<tbody>
+				<!--@foreach($trackback_list as $no => $val)-->
+				<tr>
+					<td class="text">
+						<a href="{getUrl('','document_srl',$val->document_srl)}#trackback_{$val->trackback_srl}" target="_blank">{htmlspecialchars($val->title)}</a>
+						<p>{$val->excerpt}</p>
+					</td>
+					<td><a href="{$val->url}" target="_blank">{htmlspecialchars($val->blog_name)}</a></td>
+					<td>{zdate($val->regdate,"Y-m-d")}</td>
+					<td><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
+					<td><input type="checkbox" name="cart" value="{$val->trackback_srl}" /></td>
+				</tr>
+				<!--@end-->
+			</tbody>
+		</table>
+		<div class="btnArea">
+			<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrackbackList();">{$lang->trackback_manager}...</a></span>
+		</div>
+	</div>
+</form>
+<div class="modal" id="listManager">
+	<form ruleset="deleteChecked" action="./" method="post" class="fg">
+	<input type="hidden" name="module" value="trackback" />
+	<input type="hidden" name="act" value="procTrackbackAdminDeleteChecked" />
+	<input type="hidden" name="page" value="{$page}" />
+		<h2 class="h2">{$lang->trackback_manager}</h2>
+		<div class="table even">
+			<table width="100%" border="1" cellspacing="0" id="trackbackManageListTable">
+				<caption>
+				{$lang->selected_trackback} <strong id="selectedTrackbackCount"></strong>
+				</caption>
+				<thead>
+					<tr>
+						<th scope="col" class="title"><span class="text">{$lang->title}</span></th>
+						<th scope="col">{$lang->site}</th>
+					</tr>
+				</thead>
+				<tbody>
+				</tbody>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="Delete" class="delete" /></span>
+		</div>
+	</form>
+</div>
+<div class="search">
+<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+</form>
+
+	<form action="" onsubmit="return checkSearch(this)">
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+	<input type="hidden" name="module_srl" value="{$module_srl}" />
+	<input type="hidden" name="error_return_url" value="" />
+		<select name="search_target">
+			<option value="">{$lang->search_target}</option>
+			<!--@foreach($lang->search_target_list as $key => $val)-->
+			<option value="{$key}" <!--@if($search_target==$key)-->selected="selected"<!--@end-->>{$val}</option>
+			<!--@end-->
+		</select>
+		<input type="text" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
+		<input type="submit" value="{$lang->cmd_search}" />
+		<a href="{getUrl('','module',$module,'act',$act)}">{$lang->cmd_cancel}</a>
+	</form>
+</div>
diff --git a/modules/trackback/tpl/trackback_module_config.html b/modules/trackback/tpl/trackback_module_config.html
index 409cefe4c..c3d54cabb 100644
--- a/modules/trackback/tpl/trackback_module_config.html
+++ b/modules/trackback/tpl/trackback_module_config.html
@@ -1,16 +1,19 @@
-<!--%import("filter/insert_trackback_module_config.xml")-->
-
-<form action="./" method="post" onsubmit="return procFilter(this, insert_trackback_module_config)">
+<form action="./" method="post" class="form">
+<input type="hidden" name="module" value="trackback" />
+<input type="hidden" name="act" value="procTrackbackAdminInsertModuleConfig" />
+<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
 <input type="hidden" name="target_module_srl" value="{$trackback_config->module_srl?$trackback_config->module_srl:$module_srls}" />
 
-    <h4 class="xeAdmin">{$lang->trackback}</h4> 
-    <table cellspacing="0" class="rowTable">
-    <tr>
-        <th><div>{$lang->enable_trackback}</div></th>
-        <td class="wide"><input type="checkbox" name="enable_trackback" value="Y" <!--@if($trackback_config->enable_trackback == "Y")-->checked="checked"<!--@end--> /></td>
-    </tr>
-    <tr class="row2">
-        <th class="button" colspan="2"><span class="button strong black"><input type="submit" value="{$lang->cmd_save}"/></span></th>
-    </tr>
-    </table>
+    <h3 class="h3">{$lang->trackback}</h3>
+	<div class="table">
+		<table width="100%" border="1" cellspacing="0">
+			<tr>
+				<th scope="row"><label for="enable_trackback">{$lang->enable_trackback}</label></th>
+				<td class="text"><input type="checkbox" name="enable_trackback" id="enable_trackback" value="Y" <!--@if($trackback_config->enable_trackback == "Y")-->checked="checked"<!--@end--> /></td>
+			</tr>
+		</table>
+	</div>
+	<div class="btnArea">
+		<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
+	</div>
 </form>
diff --git a/modules/trackback/trackback.admin.controller.php b/modules/trackback/trackback.admin.controller.php
index ef92c9e72..eb42cde01 100644
--- a/modules/trackback/trackback.admin.controller.php
+++ b/modules/trackback/trackback.admin.controller.php
@@ -1,98 +1,136 @@
-<?php
-    /**
-     * @class  trackbackAdminController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback모듈의 admin controller class
-     **/
-
-    class trackbackAdminController extends trackback {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 관리자 페이지에서 선택된 엮인글들을 삭제
-         **/
-        function procTrackbackAdminDeleteChecked() {
-            // 선택된 글이 없으면 오류 표시
-            $cart = Context::get('cart');
-            if(!$cart) return $this->stop('msg_cart_is_null');
-            $trackback_srl_list= explode('|@|', $cart);
-            $trackback_count = count($trackback_srl_list);
-            if(!$trackback_count) return $this->stop('msg_cart_is_null');
-
-            $oTrackbackController = &getController('trackback');
-
-            // 글삭제
-            for($i=0;$i<$trackback_count;$i++) {
-                $trackback_srl = trim($trackback_srl_list[$i]);
-                if(!$trackback_srl) continue;
-
-                $oTrackbackController->deleteTrackback($trackback_srl, true);
-            }
-
-            $this->setMessage( sprintf(Context::getLang('msg_checked_trackback_is_deleted'), $trackback_count) );
-        }
-
-        /**
-         * @brief 설정 저장
-         **/
-        function procTrackbackAdminInsertConfig() {
-            $config->enable_trackback = Context::get('enable_trackback');
-            if($config->enable_trackback != 'Y') $config->enable_trackback = 'N';
-
-            $oModuleController = &getController('module');
-            $output = $oModuleController->insertModuleConfig('trackback',$config);
-            return $output;
-        }
-
-        /**
-         * @brief Trackback 모듈별 설정
-         **/
-        function procTrackbackAdminInsertModuleConfig() {
-            // 필요한 변수를 받아옴
-            $module_srl = Context::get('target_module_srl');
-            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
-            else $module_srl = array($module_srl);
-
-            $enable_trackback = Context::get('enable_trackback');
-            if(!in_array($enable_trackback, array('Y','N'))) $enable_trackback = 'N';
-            
-            if(!$module_srl || !$enable_trackback) return new Object(-1, 'msg_invalid_request');
-
-            for($i=0;$i<count($module_srl);$i++) {
-                $srl = trim($module_srl[$i]);
-                if(!$srl) continue;
-                $output = $this->setTrackbackModuleConfig($srl, $enable_trackback);
-            }
-
-            $this->setError(-1);
-            $this->setMessage('success_updated');
-        }
-
-        /**
-         * @brief Trackback 모듈별 설정 함수
-         **/
-        function setTrackbackModuleConfig($module_srl, $enable_trackback) {
-            $config->enable_trackback = $enable_trackback;
-
-            $oModuleController = &getController('module');
-            $oModuleController->insertModulePartConfig('trackback', $module_srl, $config);
-            return new Object();
-        }
-
-        /**
-         * @brief 모듈에 속한 모든 트랙백 삭제
-         **/
-        function deleteModuleTrackbacks($module_srl) {
-            // 삭제
-            $args->module_srl = $module_srl;
-            $output = executeQuery('trackback.deleteModuleTrackbacks', $args);
-
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  trackbackAdminController
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module admin controller class
+     **/
+
+    class trackbackAdminController extends trackback {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Trackbacks delete selected in admin page
+         **/
+        function procTrackbackAdminDeleteChecked() {
+            // An error appears if no document is selected
+            $cart = Context::get('cart');
+			if(!is_array($cart)) $trackback_srl_list= explode('|@|', $cart);
+			else $trackback_srl_list = $cart;
+
+            $trackback_count = count($trackback_srl_list);
+            if(!$trackback_count) return $this->stop('msg_cart_is_null');
+
+            $oTrackbackController = &getController('trackback');
+            // Delete the post
+            for($i=0;$i<$trackback_count;$i++) {
+                $trackback_srl = trim($trackback_srl_list[$i]);
+                if(!$trackback_srl) continue;
+
+                $oTrackbackController->deleteTrackback($trackback_srl, true);
+            }
+
+            $this->setMessage( sprintf(Context::getLang('msg_checked_trackback_is_deleted'), $trackback_count) );
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Save Settings
+         **/
+        function procTrackbackAdminInsertConfig() {
+            $config->enable_trackback = Context::get('enable_trackback');
+            if($config->enable_trackback != 'Y') $config->enable_trackback = 'N';
+
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('trackback',$config);
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrackbackAdminList');
+				header('location:'.$returnUrl);
+				return;
+			}
+            return $output;
+        }
+
+        /**
+         * @brief Trackback Module Settings
+         **/
+        function procTrackbackAdminInsertModuleConfig() {
+            // Get variables
+            $module_srl = Context::get('target_module_srl');
+            if(preg_match('/^([0-9,]+)$/',$module_srl)) $module_srl = explode(',',$module_srl);
+            else $module_srl = array($module_srl);
+
+            $enable_trackback = Context::get('enable_trackback');
+            if(!in_array($enable_trackback, array('Y','N'))) $enable_trackback = 'N';
+            
+            if(!$module_srl || !$enable_trackback) return new Object(-1, 'msg_invalid_request');
+
+            for($i=0;$i<count($module_srl);$i++) {
+                $srl = trim($module_srl[$i]);
+                if(!$srl) continue;
+                $output = $this->setTrackbackModuleConfig($srl, $enable_trackback);
+            }
+
+            $this->setError(-1);
+            $this->setMessage('success_updated', 'info');
+			if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispBoardAdminContent');
+				header('location:'.$returnUrl);
+				return;
+			}
+        }
+
+        /**
+         * @brief Trackback Module Settings
+         **/
+        function procTrackbackAdminAddCart()
+		{
+			$trackback_srl = (int)Context::get('trackback_srl');
+
+			$oTrackbackAdminModel = &getAdminModel('trackback');
+			//$columnList = array('trackback_srl');
+			$args->trackbackSrlList = array($trackback_srl);
+
+			$output = $oTrackbackAdminModel->getTotalTrackbackList($args);
+
+			if(is_array($output->data))
+			{
+				foreach($output->data AS $key=>$value)
+				{
+					if($_SESSION['trackback_management'][$value->trackback_srl]) unset($_SESSION['trackback_management'][$value->trackback_srl]);
+					else $_SESSION['trackback_management'][$value->trackback_srl] = true;
+				}
+			}
+        }
+
+        /**
+         * @brief Trackback modular set function
+         **/
+        function setTrackbackModuleConfig($module_srl, $enable_trackback) {
+            $config->enable_trackback = $enable_trackback;
+
+            $oModuleController = &getController('module');
+            $oModuleController->insertModulePartConfig('trackback', $module_srl, $config);
+            return new Object();
+        }
+
+        /**
+         * @brief Modules belonging to remove all trackbacks
+         **/
+        function deleteModuleTrackbacks($module_srl) {
+            // Delete
+            $args->module_srl = $module_srl;
+            $output = executeQuery('trackback.deleteModuleTrackbacks', $args);
+
+            return $output;
+        }
+    }
+?>
diff --git a/modules/trackback/trackback.admin.model.php b/modules/trackback/trackback.admin.model.php
index 820d78b84..f2e0305e6 100644
--- a/modules/trackback/trackback.admin.model.php
+++ b/modules/trackback/trackback.admin.model.php
@@ -1,68 +1,77 @@
-<?php
-    /**
-     * @class  trackbackAdminModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback 모듈의 admin model class
-     **/
-
-    class trackbackAdminModel extends trackback {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 모든 엮인글를 시간 역순으로 가져옴 (관리자용)
-         **/
-        function getTotalTrackbackList($obj) {
-            // 검색 옵션 정리
-            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
-            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
-
-            if($search_target && $search_keyword) {
-                switch($search_target) {
-                    case 'url' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_url = $search_keyword;
-                        break;
-                    case 'title' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_title= $search_keyword;
-                        break;
-                    case 'blog_name' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_blog_name= $search_keyword;
-                        break;
-                    case 'excerpt' :
-                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
-                            $args->s_excerpt = $search_keyword;
-                        break;
-                    case 'regdate' :
-                            $args->s_regdate = $search_keyword;
-                        break;
-                    case 'ipaddress' :
-                            $args->s_ipaddress= $search_keyword;
-                        break;
-                }
-            }
-
-            // 변수 설정
-            $args->sort_index = $obj->sort_index;
-            $args->page = $obj->page?$obj->page:1;
-            $args->list_count = $obj->list_count?$obj->list_count:20;
-            $args->page_count = $obj->page_count?$obj->page_count:10;
-            $args->s_module_srl = $obj->module_srl;
-            $args->exclude_module_srl = $obj->exclude_module_srl;
-
-            // trackback.getTotalTrackbackList 쿼리 실행
-            $output = executeQuery('trackback.getTotalTrackbackList', $args);
-
-            // 결과가 없거나 오류 발생시 그냥 return
-            if(!$output->toBool()||!count($output->data)) return $output;
-
-            return $output;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  trackbackAdminModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module admin model class
+     **/
+
+    class trackbackAdminModel extends trackback {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Trackbacks Bringing all the time in reverse order (administrative)
+         **/
+        function getTotalTrackbackList($obj) {
+            // Search options
+            $search_target = $obj->search_target?$obj->search_target:trim(Context::get('search_target'));
+            $search_keyword = $obj->search_keyword?$obj->search_keyword:trim(Context::get('search_keyword'));
+
+            if($search_target && $search_keyword) {
+                switch($search_target) {
+                    case 'url' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_url = $search_keyword;
+                        break;
+                    case 'title' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_title= $search_keyword;
+                        break;
+                    case 'blog_name' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_blog_name= $search_keyword;
+                        break;
+                    case 'excerpt' :
+                            if($search_keyword) $search_keyword = str_replace(' ','%',$search_keyword);
+                            $args->s_excerpt = $search_keyword;
+                        break;
+                    case 'regdate' :
+                            $args->s_regdate = $search_keyword;
+                        break;
+                    case 'ipaddress' :
+                            $args->s_ipaddress= $search_keyword;
+                        break;
+                }
+            }
+            // Variables
+            $args->sort_index = $obj->sort_index;
+            $args->page = $obj->page?$obj->page:1;
+            $args->list_count = $obj->list_count?$obj->list_count:20;
+            $args->page_count = $obj->page_count?$obj->page_count:10;
+            $args->s_module_srl = $obj->module_srl;
+            $args->exclude_module_srl = $obj->exclude_module_srl;
+			$args->trackbackSrlList = $obj->trackbackSrlList;
+            // trackback.getTotalTrackbackList query execution
+            $output = executeQuery('trackback.getTotalTrackbackList', $args);
+            // Return if no result or an error occurs
+            if(!$output->toBool()||!count($output->data)) return $output;
+
+            return $output;
+        }
+
+		function getTrackbackCountByDate($date = '', $moduleSrlList = array())
+		{
+			if($date) $args->regDate = date('Ymd', strtotime($date));
+			if(count($moduleSrlList)>0) $args->module_srl = $moduleSrlList;
+
+            $output = executeQuery('trackback.getTrackbackCount', $args);
+			if(!$output->toBool()) return 0;
+
+			return $output->data->count;
+		}
+    }
+?>
diff --git a/modules/trackback/trackback.admin.view.php b/modules/trackback/trackback.admin.view.php
index 8ead6edfb..276d74a9e 100644
--- a/modules/trackback/trackback.admin.view.php
+++ b/modules/trackback/trackback.admin.view.php
@@ -1,55 +1,53 @@
-<?php
-    /**
-     * @class  trackbackAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback모듈의 admin view class
-     **/
-
-    class trackbackAdminView extends trackback {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 목록 출력 (관리자용)
-         **/
-        function dispTrackbackAdminList() {
-            // 설정 구함
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModuleConfig('trackback');
-            Context::set('config',$config);
-
-            // 목록을 구하기 위한 옵션
-            $args->page = Context::get('page'); ///< 페이지
-            $args->list_count = 30; ///< 한페이지에 보여줄 글 수
-            $args->page_count = 10; ///< 페이지 네비게이션에 나타날 페이지의 수
-
-            $args->sort_index = 'list_order'; ///< 소팅 값
-            $args->module_srl = Context::get('module_srl');
-
-            // 목록 구함
-            $oTrackbackAdminModel = &getAdminModel('trackback');
-            $output = $oTrackbackAdminModel->getTotalTrackbackList($args);
-
-            // 템플릿에 쓰기 위해서 변수 설정
-            Context::set('total_count', $output->total_count);
-            Context::set('total_page', $output->total_page);
-            Context::set('page', $output->page);
-            Context::set('trackback_list', $output->data);
-            Context::set('page_navigation', $output->page_navigation);
-			
-			//Security
-			$security = new Security();
-			$security->encodeHTML('config.');
-			$security->encodeHTML('trackback_list..');		
-			
-            // 템플릿 지정
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('trackback_list');
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  trackbackAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module admin view class
+     **/
+
+    class trackbackAdminView extends trackback {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Display output list (administrative)
+         **/
+        function dispTrackbackAdminList() {
+            // Wanted set
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('trackback');
+            Context::set('config',$config);
+
+            // Options to get a list
+            $args->page = Context::get('page'); // / "Page
+            $args->list_count = 30; // / "One page of posts to show the
+            $args->page_count = 10; // / "Number of pages that appear in the page navigation
+
+            $args->sort_index = 'list_order'; // / "Sorting values
+            $args->module_srl = Context::get('module_srl');
+            // Get a list
+            $oTrackbackAdminModel = &getAdminModel('trackback');
+            $output = $oTrackbackAdminModel->getTotalTrackbackList($args);
+
+            // To write to a template parameter settings
+            Context::set('total_count', $output->total_count);
+            Context::set('total_page', $output->total_page);
+            Context::set('page', $output->page);
+            Context::set('trackback_list', $output->data);
+            Context::set('page_navigation', $output->page_navigation);
+			//Security
+			$security = new Security();
+			$security->encodeHTML('config.');
+			$security->encodeHTML('trackback_list..');
+
+			// Set a template
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('trackback_list');
+        }
+
+    }
+?>
diff --git a/modules/trackback/trackback.class.php b/modules/trackback/trackback.class.php
index 2e4c72e05..d53b5513a 100644
--- a/modules/trackback/trackback.class.php
+++ b/modules/trackback/trackback.class.php
@@ -1,87 +1,75 @@
-<?php
-    /**
-     * @class  trackback
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback모듈의 high class
-     **/
-
-    class trackback extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // action forward에 등록 (관리자 모드에서 사용하기 위함)
-            $oModuleController = &getController('module');
-            $oModuleController->insertActionForward('trackback', 'controller', 'trackback');
-
-            // 2007. 10. 17 게시글이 삭제될때 엮인글도 삭제되도록 trigger 등록
-            $oModuleController->insertTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 엮인글도 모두 삭제하는 트리거 추가
-            $oModuleController->insertTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after');
-
-            // 2007. 10. 18 게시글 팝업메뉴에서 엮인글 발송 기능 추가 
-            $oModuleController->insertTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after');
-
-            // 2007. 10. 19 모듈별 엮인글 받는 기능 추가
-            $oModuleController->insertTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            // 2007. 10. 17 게시글이 삭제될때 댓글도 삭제되도록 trigger 등록
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after')) return true;
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 엮인글도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after')) return true;
-
-            // 2007. 10. 18 게시글 팝업메뉴에서 엮인글 발송 기능 추가 
-            if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after')) return true;
-
-            // 2007. 10. 19 모듈별 엮인글 받는 기능 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // 2007. 10. 17 게시글이 삭제될때 댓글도 삭제되도록 trigger 등록
-            if(!$oModuleModel->getTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after'))
-                $oModuleController->insertTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after');
-
-            // 2007. 10. 17 모듈이 삭제될때 등록된 엮인글도 모두 삭제하는 트리거 추가
-            if(!$oModuleModel->getTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after'))
-                $oModuleController->insertTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after');
-
-            // 2007. 10. 18 게시글 팝업메뉴에서 엮인글 발송 기능 추가 
-            if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after'))
-                $oModuleController->insertTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after');
-
-            // 2007. 10. 19 모듈별 엮인글 받는 기능 추가
-            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before')) 
-                $oModuleController->insertTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before');
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  trackback
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module's high class
+     **/
+
+    class trackback extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Register action forward (to use in administrator mode)
+            $oModuleController = &getController('module');
+            $oModuleController->insertActionForward('trackback', 'controller', 'trackback');
+            // 2007. 10. 17 posts deleted and will be deleted when the trigger property Trackbacks
+            $oModuleController->insertTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after');
+            // 2007. 10. 17 modules are deleted when you delete all registered triggers that add Trackbacks
+            $oModuleController->insertTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after');
+            // 2007. 10. Yeokingeul sent from the popup menu features 18 additional posts
+            $oModuleController->insertTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after');
+            // 2007. 10. The ability to receive 19 additional modular yeokingeul
+            $oModuleController->insertTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oModuleModel = &getModel('module');
+            // 2007. 10. 17 posts deleted, even when the comments will be deleted trigger property
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after')) return true;
+            // 2007. 10. 17 modules are deleted when you delete all registered triggers that add Trackbacks
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after')) return true;
+            // 2007. 10. Yeokingeul sent from the popup menu features 18 additional posts
+            if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after')) return true;
+            // 2007. 10. The ability to receive 19 additional modular yeokingeul
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // 2007. 10. 17 posts deleted, even when the comments will be deleted trigger property
+            if(!$oModuleModel->getTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after'))
+                $oModuleController->insertTrigger('document.deleteDocument', 'trackback', 'controller', 'triggerDeleteDocumentTrackbacks', 'after');
+            // 2007. 10. 17 modules are deleted when you delete all registered triggers that add Trackbacks
+            if(!$oModuleModel->getTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after'))
+                $oModuleController->insertTrigger('module.deleteModule', 'trackback', 'controller', 'triggerDeleteModuleTrackbacks', 'after');
+            // 2007. 10. Yeokingeul sent from the popup menu features 18 additional posts
+            if(!$oModuleModel->getTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after'))
+                $oModuleController->insertTrigger('document.getDocumentMenu', 'trackback', 'controller', 'triggerSendTrackback', 'after');
+            // 2007. 10. The ability to receive 19 additional modular yeokingeul
+            if(!$oModuleModel->getTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before')) 
+                $oModuleController->insertTrigger('module.dispAdditionSetup', 'trackback', 'view', 'triggerDispTrackbackAdditionSetup', 'before');
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+
+    }
+?>
diff --git a/modules/trackback/trackback.controller.php b/modules/trackback/trackback.controller.php
index 814dbd24a..c42dac186 100644
--- a/modules/trackback/trackback.controller.php
+++ b/modules/trackback/trackback.controller.php
@@ -1,334 +1,342 @@
-<?php
-    /**
-     * @class  trackbackController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback모듈의 Controller class
-     **/
-
-    class trackbackController extends trackback {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 트랙백 발송
-         **/
-        function procTrackbackSend() {
-            // 게시물 번호와 발송하려는 엮인글 주소를 구함
-            $document_srl = Context::get('target_srl');
-            $trackback_url = Context::get('trackback_url');
-            $charset = Context::get('charset');
-            if(!$document_srl || !$trackback_url || !$charset) return new Object(-1, 'msg_invalid_request');
-
-            // 로그인 정보 구함
-            $logged_info = Context::get('logged_info');
-            if(!$logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
-
-            // 게시물의 정보를 구해와서 있는지 여부와 권한을 체크
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists()) return new Object(-1, 'msg_invalid_request');
-            if($oDocument->getMemberSrl() != $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
-
-            // 현재 글이 있는 모듈의 타이틀 지정
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl'));
-            Context::setBrowserTitle($module_info->browser_title);
-
-            // 엮인글 발송
-            return $this->sendTrackback($oDocument, $trackback_url, $charset);
-        }
-
-        /**
-         * @brief 문서 팝업메뉴에서 엮인글을 발송하는 메뉴 추가
-         **/
-        function triggerSendTrackback(&$menu_list) {
-            $logged_info = Context::get('logged_info');
-            if(!$logged_info->member_srl) return new Object();
-
-            // 요청된 게시물 번호와 현재 로그인 정보 구함
-            $document_srl = Context::get('target_srl');
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists()) return new Object();
-            if($oDocument->getMemberSrl() != $logged_info->member_srl) return new Object();
-
-            // 엮인글 발송 링크 추가
-            $oDocumentController = &getController('document');
-            $url = getUrl('','module','trackback','act','dispTrackbackSend','document_srl', $document_srl);
-            $oDocumentController->addDocumentPopupMenu($url,'cmd_send_trackback','./modules/document/tpl/icons/send_trackback.gif','popup');
-
-            return new Object();
-        }
-
-        /**
-         * @brief document삭제시 해당 document의 엮인글을 삭제하는 trigger
-         **/
-        function triggerDeleteDocumentTrackbacks(&$obj) {
-            $document_srl = $obj->document_srl;
-            if(!$document_srl) return new Object();
-
-            return $this->deleteTrackbacks($document_srl, true);
-        }
-
-        /**
-         * @brief module 삭제시 해당 엮인글 모두 삭제하는 trigger
-         **/
-        function triggerDeleteModuleTrackbacks(&$obj) {
-            $module_srl = $obj->module_srl;
-            if(!$module_srl) return new Object();
-
-            $oTrackbackController = &getAdminController('trackback');
-            return $oTrackbackController->deleteModuleTrackbacks($module_srl);
-        }
-
-        /**
-         * @brief 엮인글 입력
-         **/
-        function trackback() {
-            // 출력을 XMLRPC로 설정
-            Context::setRequestMethod("XMLRPC");
-
-            // 엮인글 받을때 필요한 변수를 구함
-            $obj = Context::gets('document_srl','blog_name','url','title','excerpt');
-            if(!$obj->document_srl || !$obj->url || !$obj->title || !$obj->excerpt) return $this->stop('fail');
-
-            // 올바른 trackback url인지 검사
-            $given_key = Context::get('key');
-            $oTrackbackModel = &getModel('trackback');
-            $key = $oTrackbackModel->getTrackbackKey($obj->document_srl);
-            if($key != $given_key) return $this->stop('fail');
-
-            // 엮인글 모듈의 기본 설정을 받음
-            $module_srl = Context::get('module_srl');
-            $oModuleModel = &getModel('module');
-            $config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
-            $enable_trackback = $config->enable_trackback;
-            if(!$enable_trackback) {
-                $config = $oModuleModel->getModuleConfig('trackback');
-                $enable_trackback = $config->enable_trackback;
-            }
-            
-            // 관리자가 금지하였을 경우에는 엮인글을 받지 않음
-            if($enable_trackback == 'N') return $this->stop('fail');
-
-            return $this->insertTrackback($obj);
-        }
-
-        function insertTrackback($obj, $manual_inserted = false) {
-            // 엮인글 정리
-            $obj = Context::convertEncoding($obj);
-            if(!$obj->blog_name) $obj->blog_name = $obj->title;
-            $obj->excerpt = strip_tags($obj->excerpt);
-
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('trackback.insertTrackback', 'before', $obj);
-            if(!$output->toBool()) return $output;
-
-            // GET으로 넘어온 document_srl을 참조, 없으면 오류~
-            $document_srl = $obj->document_srl;
-
-            if(!$manual_inserted) {
-                // document model 객체 생성후 원본글을 가져옴
-                $oDocumentModel = &getModel('document');
-                $oDocument = $oDocumentModel->getDocument($document_srl);
-
-                // 원본글이 없거나 트랙백 허용을 하지 않으면 오류 표시
-                if(!$oDocument->isExists()) return $this->stop('fail');
-                if(!$oDocument->allowTrackback()) return new Object(-1,'fail');
-
-                $obj->module_srl = $oDocument->get('module_srl');
-            }
-
-            // 엮인글을 입력
-            $obj->trackback_srl = getNextSequence();
-            $obj->list_order = $obj->trackback_srl*-1;
-            $output = executeQuery('trackback.insertTrackback', $obj);
-            if(!$output->toBool()) return $output;
-
-            // 입력에 이상이 없으면 해당 글의 엮인글 수를 올림
-            if(!$manual_inserted) {
-                // trackback model 객체 생성
-                $oTrackbackModel = &getModel('trackback');
-
-                // 해당 글의 전체 엮인글 수를 구해옴
-                $trackback_count = $oTrackbackModel->getTrackbackCount($document_srl);
-
-                // document controller 객체 생성
-                $oDocumentController = &getController('document');
-
-                // 해당글의 엮인글 수를 업데이트
-                $output = $oDocumentController->updateTrackbackCount($document_srl, $trackback_count);
-
-                // 결과 return
-                if(!$output->toBool()) return $output;
-            }
-
-            // 원본글에 알림(notify_message)가 설정되어 있으면 메세지 보냄
-            if(!$manual_inserted) $oDocument->notify(Context::getLang('trackback'), $obj->excerpt);
-
-            // trigger 호출 (after)
-            $output = ModuleHandler::triggerCall('trackback.insertTrackback', 'after', $obj);
-            if(!$output->toBool()) return $output;
-
-            return new Object();
-        }
-
-        /**
-         * @brief 단일 엮인글 삭제
-         **/
-        function deleteTrackback($trackback_srl, $is_admin = false) {
-            // trackback model 객체 생성
-            $oTrackbackModel = &getModel('trackback');
-
-            // 삭제하려는 엮인글이 있는지 확인
-            $trackback = $oTrackbackModel->getTrackback($trackback_srl);
-            if($trackback->data->trackback_srl != $trackback_srl) return new Object(-1, 'msg_invalid_request');
-            $document_srl = $trackback->data->document_srl;
-
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('trackback.deleteTrackback', 'before', $trackback);
-            if(!$output->toBool()) return $output;
-
-            // document model 객체 생성
-            $oDocumentModel = &getModel('document');
-
-            // 권한이 있는지 확인
-            if(!$is_admin && !$oDocumentModel->isGranted($document_srl)) return new Object(-1, 'msg_not_permitted');
-
-            $args->trackback_srl = $trackback_srl;
-            $output = executeQuery('trackback.deleteTrackback', $args);
-            if(!$output->toBool()) return new Object(-1, 'msg_error_occured');
-
-            // 엮인글 수를 구해서 업데이트
-            $trackback_count = $oTrackbackModel->getTrackbackCount($document_srl);
-
-            // document controller 객체 생성
-            $oDocumentController = &getController('document','controller');
-
-            // 해당글의 엮인글 수를 업데이트
-            $output = $oDocumentController->updateTrackbackCount($document_srl, $trackback_count);
-            $output->add('document_srl', $document_srl);
-
-            // trigger 호출 (before)
-            $output = ModuleHandler::triggerCall('trackback.deleteTrackback', 'after', $trackback);
-            if(!$output->toBool()) return $output;
-
-            return $output;
-        }
-
-        /**
-         * @brief 글에 속한 모든 트랙백 삭제
-         **/
-        function deleteTrackbacks($document_srl) {
-            // 삭제
-            $args->document_srl = $document_srl;
-            $output = executeQuery('trackback.deleteTrackbacks', $args);
-
-            return $output;
-        }
-
-        /**
-         * @brief 엮인글을 발송
-         *
-         * 발송 후 결과처리는 하지 않는 구조임
-         **/
-        function sendTrackback($oDocument, $trackback_url, $charset) {
-            $oModuleController = &getController('module');
-
-            // 발송할 정보를 정리
-            $http = parse_url($trackback_url);
-            $obj->blog_name = str_replace(array('&lt;','&gt;','&amp;','&quot;'), array('<','>','&','"'), Context::getBrowserTitle());
-            $oModuleController->replaceDefinedLangCode($obj->blog_name);
-            $obj->title = $oDocument->getTitleText();
-            $obj->excerpt = $oDocument->getSummary(200);
-            $obj->url = getFullUrl('','document_srl',$oDocument->document_srl);
-
-            // blog_name, title, excerpt, url의 문자열을 요청된 charset으로 변경
-            if($charset && function_exists('iconv')) {
-                foreach($obj as $key=>$val) {
-                    $obj->{$key} = iconv('UTF-8',$charset,$val);
-                }
-            }
-
-            // socket으로 발송할 내용 작성
-            if($http['query']) $http['query'].="&";
-            if(!$http['port']) $http['port'] = 80;
-
-            $content =
-                sprintf(
-                    "title=%s&".
-                    "url=%s&".
-                    "blog_name=%s&".
-                    "excerpt=%s",
-                    urlencode($obj->title),
-                    urlencode($obj->url),
-                    urlencode($obj->blog_name),
-                    urlencode($obj->excerpt)
-                );
-            if($http['query']) $content .= '&'.$http['query'];
-            $content_length = strlen($content);
-
-            // header 정리
-            $header =
-            sprintf(
-                "POST %s HTTP/1.1\r\n".
-                "Host: %s\r\n".
-                "Content-Type: %s\r\n".
-                "Content-Length: %s\r\n\r\n".
-                "%s\r\n",
-                $http['path'],
-                $http['host'],
-                "application/x-www-form-urlencoded",
-                $content_length,
-                $content
-            );
-            if(!$http['host']||!$http['port']) return new Object(-1,'msg_trackback_url_is_invalid');
-
-            // 발송하려는 대상 서버의 socket을 연다
-            $fp = @fsockopen($http['host'], $http['port'], $errno, $errstr, 5);
-            if(!$fp) return new Object(-1,'msg_trackback_url_is_invalid');
-
-            // 작성한 헤더 정보를 발송
-            fputs($fp, $header);
-
-            // 결과를 기다림 (특정 서버의 경우 EOF가 떨어지지 않을 수가 있음
-            while(!feof($fp)) {
-                $line = trim(fgets($fp, 4096));
-                if(preg_match("/^<error>/i",$line)){
-					$error = preg_replace('/[^0-9]/','',$line);
-					break;
-				}
-            }
-
-            // socket 닫음
-            fclose($fp);
-
-			if($error == "0") return new Object(0, 'msg_trackback_send_success');
-			
-			return new Object(-1, 'msg_trackback_send_failed');
-        }
-
-        /**
-         * @brief 특정 ipaddress의 특정 시간대 내의 엮인글을 모두 삭제
-         **/
-        function deleteTrackbackSender($time, $ipaddress, $url, $blog_name, $title, $excerpt) {
-            $obj->regdate = date("YmdHis",time()-$time);
-            $obj->ipaddress = $ipaddress;
-            $obj->url = $url;
-            $obj->blog_name = $blog_name;
-            $obj->title = $title;
-            $obj->excerpt = $excerpt;
-            $output = executeQueryArray('trackback.getRegistedTrackbacks', $obj);
-            if(!$output->data || !count($output->data)) return;
-
-            foreach($output->data as $trackback) {
-                $trackback_srl = $trackback->trackback_srl;
-                $this->deleteTrackback($trackback_srl, true);
-            }
-        }
-    }
-?>
+<?php
+    /**
+     * @class  trackbackController
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module's Controller class
+     **/
+
+    class trackbackController extends trackback {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Trackbacks sent
+         **/
+        function procTrackbackSend() {
+            // Yeokingeul to post numbers and shipping addresses Wanted
+            $document_srl = Context::get('target_srl');
+            $trackback_url = Context::get('trackback_url');
+            $charset = Context::get('charset');
+            if(!$document_srl || !$trackback_url || !$charset) return new Object(-1, 'msg_invalid_request');
+            // Login Information Wanted
+            $logged_info = Context::get('logged_info');
+            if(!$logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+            // Posts of the information obtained permission to come and check whether
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return new Object(-1, 'msg_invalid_request');
+            if($oDocument->getMemberSrl() != $logged_info->member_srl) return new Object(-1, 'msg_not_permitted');
+            // Specify the title of the module, the current article
+            $oModuleModel = &getModel('module');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($oDocument->get('module_srl'));
+            Context::setBrowserTitle($module_info->browser_title);
+            // Shipping yeokingeul
+            $output = $this->sendTrackback($oDocument, $trackback_url, $charset);
+			if($output->toBool() && !in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+				global $lang;
+				htmlHeader();
+				alertScript($lang->success_registed);
+				reload(true);
+				closePopupScript();
+				htmlFooter();
+				Context::close();
+				exit;
+			}
+			return $output;
+        }
+
+        /**
+         * @brief Trackback List
+         **/
+        function procTrackbackGetList()
+		{
+			if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+			$trackbackSrls = Context::get('trackback_srls');
+			if($trackbackSrls) $trackbackSrlList = explode(',', $trackbackSrls);
+
+			global $lang;
+			if(count($trackbackSrlList) > 0) {
+				$oTrackbackAdminModel = &getAdminModel('trackback');
+				$args->trackbackSrlList = $trackbackSrlList;
+				$args->list_count = 100;
+				$output = $oTrackbackAdminModel->getTotalTrackbackList($args);
+
+				if(is_array($output->data)) $trackbackList = $output->data;
+				else
+				{
+					unset($_SESSION['trackback_management']);
+					$trackbackList = array();
+					$this->setMessage($lang->no_trackbacks);
+				}
+			}
+			else
+			{
+				$trackbackList = array();
+				$this->setMessage($lang->no_trackbacks);
+			}
+
+			$this->add('trackback_list', $trackbackList);
+        }
+
+        /**
+         * @brief Trackbacks send documents from the popup menu add a menu
+         **/
+        function triggerSendTrackback(&$menu_list) {
+            $logged_info = Context::get('logged_info');
+            if(!$logged_info->member_srl) return new Object();
+            // Post number and the current login information requested Wanted
+            $document_srl = Context::get('target_srl');
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return new Object();
+            if($oDocument->getMemberSrl() != $logged_info->member_srl) return new Object();
+            // Add a link sent yeokingeul
+            $oDocumentController = &getController('document');
+            $url = getUrl('','module','trackback','act','dispTrackbackSend','document_srl', $document_srl);
+            $oDocumentController->addDocumentPopupMenu($url,'cmd_send_trackback','','popup');
+
+            return new Object();
+        }
+
+        /**
+         * @brief delete document in the document to delete the trigger Trackbacks
+         **/
+        function triggerDeleteDocumentTrackbacks(&$obj) {
+            $document_srl = $obj->document_srl;
+            if(!$document_srl) return new Object();
+
+            return $this->deleteTrackbacks($document_srl, true);
+        }
+
+        /**
+         * @brief deletion module that deletes all the trigger yeokingeul
+         **/
+        function triggerDeleteModuleTrackbacks(&$obj) {
+            $module_srl = $obj->module_srl;
+            if(!$module_srl) return new Object();
+
+            $oTrackbackController = &getAdminController('trackback');
+            return $oTrackbackController->deleteModuleTrackbacks($module_srl);
+        }
+
+        /**
+         * @brief Trackback inserted
+         **/
+        function trackback() {
+            // Output is set to XMLRPC
+            Context::setRequestMethod("XMLRPC");
+            // When receiving the necessary variables yeokingeul Wanted
+            $obj = Context::gets('document_srl','blog_name','url','title','excerpt');
+            if(!$obj->document_srl || !$obj->url || !$obj->title || !$obj->excerpt) return $this->stop('fail');
+            // Checks for correct trackback url
+            $given_key = Context::get('key');
+            $oTrackbackModel = &getModel('trackback');
+            $key = $oTrackbackModel->getTrackbackKey($obj->document_srl);
+            if($key != $given_key) return $this->stop('fail');
+            // Yeokingeul module out of the default settings
+            $module_srl = Context::get('module_srl');
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
+            $enable_trackback = $config->enable_trackback;
+            if(!$enable_trackback) {
+                $config = $oModuleModel->getModuleConfig('trackback');
+                $enable_trackback = $config->enable_trackback;
+            }
+            
+            // If managers were banned does not Trackbacks
+            if($enable_trackback == 'N') return $this->stop('fail');
+
+            return $this->insertTrackback($obj);
+        }
+
+        function insertTrackback($obj, $manual_inserted = false) {
+            // List trackback
+            $obj = Context::convertEncoding($obj);
+            if(!$obj->blog_name) $obj->blog_name = $obj->title;
+            $obj->excerpt = strip_tags($obj->excerpt);
+            // Call a trigger (before)
+            $output = ModuleHandler::triggerCall('trackback.insertTrackback', 'before', $obj);
+            if(!$output->toBool()) return $output;
+            // Document_srl see passed in GET, if an error ~
+            $document_srl = $obj->document_srl;
+
+            if(!$manual_inserted) {
+                // Imported document model object, it permits you to wonbongeul
+                $oDocumentModel = &getModel('document');
+                $oDocument = $oDocumentModel->getDocument($document_srl);
+                // If you do not allow two or trackback wonbongeul error display
+                if(!$oDocument->isExists()) return $this->stop('fail');
+                if(!$oDocument->allowTrackback()) return new Object(-1,'fail');
+
+                $obj->module_srl = $oDocument->get('module_srl');
+            }
+            // Enter Trackbacks
+            $obj->trackback_srl = getNextSequence();
+            $obj->list_order = $obj->trackback_srl*-1;
+            $output = executeQuery('trackback.insertTrackback', $obj);
+            if(!$output->toBool()) return $output;
+            // If there is more to enter the article number yeokingeul Rounds
+            if(!$manual_inserted) {
+                // trackback model object creation
+                $oTrackbackModel = &getModel('trackback');
+                // All the article number yeokingeul guhaeom
+                $trackback_count = $oTrackbackModel->getTrackbackCount($document_srl);
+                // document controller object creation
+                $oDocumentController = &getController('document');
+                // Update the number of posts that yeokingeul
+                $output = $oDocumentController->updateTrackbackCount($document_srl, $trackback_count);
+                // Return result
+                if(!$output->toBool()) return $output;
+            }
+            // Notify wonbongeul (notify_message) if there is a Send a message
+            if(!$manual_inserted) $oDocument->notify(Context::getLang('trackback'), $obj->excerpt);
+            // Call a trigger (after)
+            $output = ModuleHandler::triggerCall('trackback.insertTrackback', 'after', $obj);
+            if(!$output->toBool()) return $output;
+
+            return new Object();
+        }
+
+        /**
+         * @brief Deleting a single yeokingeul
+         **/
+        function deleteTrackback($trackback_srl, $is_admin = false) {
+            // trackback model object creation
+            $oTrackbackModel = &getModel('trackback');
+            // Make sure that you want to delete Trackbacks
+            $trackback = $oTrackbackModel->getTrackback($trackback_srl);
+            if($trackback->data->trackback_srl != $trackback_srl) return new Object(-1, 'msg_invalid_request');
+            $document_srl = $trackback->data->document_srl;
+            // Call a trigger (before)
+            $output = ModuleHandler::triggerCall('trackback.deleteTrackback', 'before', $trackback);
+            if(!$output->toBool()) return $output;
+            // Create a document model object
+            $oDocumentModel = &getModel('document');
+            // Check if a permossion is granted
+            if(!$is_admin && !$oDocumentModel->isGranted($document_srl)) return new Object(-1, 'msg_not_permitted');
+
+            $args->trackback_srl = $trackback_srl;
+            $output = executeQuery('trackback.deleteTrackback', $args);
+            if(!$output->toBool()) return new Object(-1, 'msg_error_occured');
+            // Obtain the number of yeokingeul Update
+            $trackback_count = $oTrackbackModel->getTrackbackCount($document_srl);
+            // document controller object creation
+            $oDocumentController = &getController('document','controller');
+            // Update the number of posts that yeokingeul
+            $output = $oDocumentController->updateTrackbackCount($document_srl, $trackback_count);
+            $output->add('document_srl', $document_srl);
+            // Call a trigger (before)
+            $output = ModuleHandler::triggerCall('trackback.deleteTrackback', 'after', $trackback);
+            if(!$output->toBool()) return $output;
+
+            return $output;
+        }
+
+        /**
+         * @brief Delete All RSS Trackback
+         **/
+        function deleteTrackbacks($document_srl) {
+            // Delete
+            $args->document_srl = $document_srl;
+            $output = executeQuery('trackback.deleteTrackbacks', $args);
+
+            return $output;
+        }
+
+        /**
+         * @brief Trackbacks sent to
+         *
+         * After sending the results are not sticky and handling
+         **/
+        function sendTrackback($oDocument, $trackback_url, $charset) {
+            $oModuleController = &getController('module');
+            // Information sent by
+            $http = parse_url($trackback_url);
+            $obj->blog_name = str_replace(array('&lt;','&gt;','&amp;','&quot;'), array('<','>','&','"'), Context::getBrowserTitle());
+            $oModuleController->replaceDefinedLangCode($obj->blog_name);
+            $obj->title = $oDocument->getTitleText();
+            $obj->excerpt = $oDocument->getSummary(200);
+            $obj->url = getFullUrl('','document_srl',$oDocument->document_srl);
+            // blog_name, title, excerpt, url charset of the string to the requested change
+            if($charset && function_exists('iconv')) {
+                foreach($obj as $key=>$val) {
+                    $obj->{$key} = iconv('UTF-8',$charset,$val);
+                }
+            }
+            // written information sent to socket
+            if($http['query']) $http['query'].="&";
+            if(!$http['port']) $http['port'] = 80;
+
+            $content =
+                sprintf(
+                    "title=%s&".
+                    "url=%s&".
+                    "blog_name=%s&".
+                    "excerpt=%s",
+                    urlencode($obj->title),
+                    urlencode($obj->url),
+                    urlencode($obj->blog_name),
+                    urlencode($obj->excerpt)
+                );
+            if($http['query']) $content .= '&'.$http['query'];
+            $content_length = strlen($content);
+            // header by
+            $header =
+            sprintf(
+                "POST %s HTTP/1.1\r\n".
+                "Host: %s\r\n".
+                "Content-Type: %s\r\n".
+                "Content-Length: %s\r\n\r\n".
+                "%s\r\n",
+                $http['path'],
+                $http['host'],
+                "application/x-www-form-urlencoded",
+                $content_length,
+                $content
+            );
+            if(!$http['host']||!$http['port']) return new Object(-1,'msg_trackback_url_is_invalid');
+            // Opens a socket on the target server you want to send
+            $fp = @fsockopen($http['host'], $http['port'], $errno, $errstr, 5);
+            if(!$fp) return new Object(-1,'msg_trackback_url_is_invalid');
+            // Header information sent by
+            fputs($fp, $header);
+            // Waiting for the results (in particular the server may not be falling EOF
+            while(!feof($fp)) {
+                $line = trim(fgets($fp, 4096));
+                if(preg_match("/^<error>/i",$line)){
+					$error = preg_replace('/[^0-9]/','',$line);
+					break;
+				}
+            }
+            // Close socket
+            fclose($fp);
+
+			if($error == "0") return new Object(0, 'msg_trackback_send_success');
+			
+			return new Object(-1, 'msg_trackback_send_failed');
+        }
+
+        /**
+         * @brief Within a specific time of a specific ipaddress Trackbacks delete all
+         **/
+        function deleteTrackbackSender($time, $ipaddress, $url, $blog_name, $title, $excerpt) {
+            $obj->regdate = date("YmdHis",time()-$time);
+            $obj->ipaddress = $ipaddress;
+            $obj->url = $url;
+            $obj->blog_name = $blog_name;
+            $obj->title = $title;
+            $obj->excerpt = $excerpt;
+            $output = executeQueryArray('trackback.getRegistedTrackbacks', $obj);
+            if(!$output->data || !count($output->data)) return;
+
+            foreach($output->data as $trackback) {
+                $trackback_srl = $trackback->trackback_srl;
+                $this->deleteTrackback($trackback_srl, true);
+            }
+        }
+    }
+?>
diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php
index 3fade8b7a..16d4e570c 100644
--- a/modules/trackback/trackback.model.php
+++ b/modules/trackback/trackback.model.php
@@ -1,151 +1,151 @@
-<?php
-    /**
-     * @class  trackbackModel
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback 모듈의 model class
-     **/
-
-    class trackbackModel extends trackback {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 하나의 트랙백 정보를 구함
-         **/
-        function getTrackback($trackback_srl) {
-            $args->trackback_srl = $trackback_srl;
-            return executeQuery('trackback.getTrackback', $args);
-        }
-
-        /**
-         * @brief document_srl 에 해당하는 엮인글의 전체 갯수를 가져옴
-         **/
-        function getTrackbackCount($document_srl) {
-            $args->document_srl = $document_srl;
-            $output = executeQuery('trackback.getTrackbackCount', $args);
-            $total_count = $output->data->count;
-
-            return (int)$total_count;
-        }
-
-
-        /**
-         * @brief module_srl 에 해당하는 엮인글의 전체 갯수를 가져옴
-         **/
-        function getTrackbackAllCount($module_srl) {
-            $args->module_srl = $module_srl;
-            $output = executeQuery('trackback.getTrackbackCount', $args);
-            $total_count = $output->data->count;
-
-            return (int)$total_count;
-        }
-
-
-        /**
-         * @brief 특정 document에 특정 ip로 기록된 트랙백의 갯수
-         * spamfilter 에서 사용할 method임
-         **/
-        function getTrackbackCountByIPAddress($document_srl, $ipaddress) {
-            $args->document_srl = $document_srl;
-            $args->ipaddress = $ipaddress;
-            $output = executeQuery('trackback.getTrackbackCountByIPAddress', $args);
-            $total_count = $output->data->count;
-
-            return (int)$total_count;
-        }
-
-        /**
-         * @brief 특정 문서에 속한 엮인글의 목록을 가져옴
-         **/
-        function getTrackbackList($document_srl) {
-            $args->document_srl = $document_srl;
-            $args->list_order = 'list_order';
-            $output = executeQuery('trackback.getTrackbackList', $args);
-
-            if(!$output->toBool()) return $output;
-
-            $trackback_list = $output->data;
-
-            if(!is_array($trackback_list)) $trackback_list = array($trackback_list);
-
-            return $trackback_list;
-        }
-
-        /** 
-         * @brief mid 에 해당하는 엮인글을 가져옴
-         **/
-        function getNewestTrackbackList($obj) {
-            if($obj->mid) {
-                $oModuleModel = &getModel('module');
-                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
-                unset($obj->mid);
-            }
-
-            // 넘어온 module_srl은 array일 수도 있기에 array인지를 체크 
-            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
-            else $args->module_srl = $obj->module_srl;
-            $args->list_count = $obj->list_count;
-            if($obj->site_srl) $args->site_srl = (int)$obj->site_srl;
-            $args->sort_index = 'trackbacks.list_order';
-            $args->order = 'asc';
-
-            $output = executeQueryArray('trackback.getNewestTrackbackList', $args);
-
-            return $output;
-        }
-        
-        /**
-         * @brief 특정 모듈의 trackback 설정을 return
-         **/
-        function getTrackbackModuleConfig($module_srl) {
-            // trackback 모듈의 config를 가져옴
-            $oModuleModel = &getModel('module');
-            $module_trackback_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
-            if(!$module_trackback_config) {
-                $trackback_config = $oModuleModel->getModuleConfig('trackback');
-                $module_trackback_config->enable_trackback = $trackback_config->enable_trackback!='N'?'Y':'N';
-            }
-            $module_trackback_config->module_srl = $module_srl;
-            return $module_trackback_config;
-        }
-
-        /**
-         * @brief 정해진 시간내에 전체 엮인글 등록수를 구함
-         **/
-        function getRegistedTrackback($time, $ipaddress, $url, $blog_name, $title, $excerpt) {
-            $obj->regdate = date("YmdHis",time()-$time);
-            $obj->ipaddress = $ipaddress;
-            $obj->url = $url;
-            $obj->blog_name = $blog_name;
-            $obj->title = $title;
-            $obj->excerpt = $excerpt;
-            $output = executeQuery('trackback.getRegistedTrackback', $obj);
-            return $output->data->count;
-        }
-
-        /**
-         * @brief trackback url을 생성하여 return
-         * trackback url에 key값을 추가함.
-         **/
-        function getTrackbackUrl($document_srl) {
-            $url = getFullUrl('','document_srl',$document_srl,'act','trackback','key',$this->getTrackbackKey($document_srl));
-            return $url;
-        }
-
-        /**
-         * @brief 키값을 생성하여 return
-         * key값은 db 비번 정보 + 10분 단위의 시간값을 합쳐서 hash결과를 이용함
-         * 단 url이 너무 길어져서 1, 10, 20 자리수의 글자 하나씩만을 조합해서 return
-         **/
-        function getTrackbackKey($document_srl) {
-            $time = (int) (time()/(60*10));
-            $db_info = Context::getDBInfo();
-            $key = md5($document_srl.$db_info->db_password.$time);
-            return sprintf("%s%s%s",substr($key,1,1),substr($key,10,1),substr($key,20,1));
-        }
-    }
-?>
+<?php
+    /**
+     * @class  trackbackModel
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module model class
+     **/
+
+    class trackbackModel extends trackback {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Wanted a trackback information
+         **/
+        function getTrackback($trackback_srl, $columnList = array()) {
+            $args->trackback_srl = $trackback_srl;
+            $output = executeQuery('trackback.getTrackback', $args, $columnList);
+            return $output;
+        }
+
+        /**
+         * @brief Trackbacks document_srl corresponding to the bringing of the total number of
+         **/
+        function getTrackbackCount($document_srl) {
+            $args->document_srl = $document_srl;
+            $output = executeQuery('trackback.getTrackbackCount', $args);
+            $total_count = $output->data->count;
+
+            return (int)$total_count;
+        }
+
+
+        /**
+         * @brief Trackbacks module_srl corresponding to the bringing of the total number of
+         **/
+        function getTrackbackAllCount($module_srl) {
+            $args->module_srl = $module_srl;
+            $output = executeQuery('trackback.getTrackbackCount', $args);
+            $total_count = $output->data->count;
+
+            return (int)$total_count;
+        }
+
+
+        /**
+         * @brief For a particular document to a specific ip number of trackbacks recorded
+         * Im spamfilter method used in
+         **/
+        function getTrackbackCountByIPAddress($document_srl, $ipaddress) {
+            $args->document_srl = $document_srl;
+            $args->ipaddress = $ipaddress;
+            $output = executeQuery('trackback.getTrackbackCountByIPAddress', $args);
+            $total_count = $output->data->count;
+
+            return (int)$total_count;
+        }
+
+        /**
+         * @brief Trackbacks certain documents belonging to the bringing of the list
+         **/
+        function getTrackbackList($document_srl) {
+            $args->document_srl = $document_srl;
+            $args->list_order = 'list_order';
+            $output = executeQuery('trackback.getTrackbackList', $args);
+
+            if(!$output->toBool()) return $output;
+
+            $trackback_list = $output->data;
+
+            if(!is_array($trackback_list)) $trackback_list = array($trackback_list);
+
+            return $trackback_list;
+        }
+
+        /** 
+         * @brief Bringing a mid Trackbacks
+         **/
+        function getNewestTrackbackList($obj) {
+            if($obj->mid) {
+                $oModuleModel = &getModel('module');
+                $obj->module_srl = $oModuleModel->getModuleSrlByMid($obj->mid);
+                unset($obj->mid);
+            }
+            // Module_srl passed the array may be a check whether the array
+            if(is_array($obj->module_srl)) $args->module_srl = implode(',', $obj->module_srl);
+            else $args->module_srl = $obj->module_srl;
+            $args->list_count = $obj->list_count;
+            if($obj->site_srl) $args->site_srl = (int)$obj->site_srl;
+            $args->sort_index = 'trackbacks.list_order';
+            $args->order = 'asc';
+
+            $output = executeQueryArray('trackback.getNewestTrackbackList', $args);
+
+            return $output;
+        }
+        
+        /**
+         * @brief Return to a specific set of modules trackback
+         **/
+        function getTrackbackModuleConfig($module_srl) {
+            // Bringing trackback module config
+            $oModuleModel = &getModel('module');
+            $module_trackback_config = $oModuleModel->getModulePartConfig('trackback', $module_srl);
+            if(!$module_trackback_config) {
+                $trackback_config = $oModuleModel->getModuleConfig('trackback');
+                $module_trackback_config->enable_trackback = $trackback_config->enable_trackback!='N'?'Y':'N';
+            }
+            $module_trackback_config->module_srl = $module_srl;
+            return $module_trackback_config;
+        }
+
+        /**
+         * @brief Fixed in time for the entire yeokingeul Wanted to Register
+         **/
+        function getRegistedTrackback($time, $ipaddress, $url, $blog_name, $title, $excerpt) {
+            $obj->regdate = date("YmdHis",time()-$time);
+            $obj->ipaddress = $ipaddress;
+            $obj->url = $url;
+            $obj->blog_name = $blog_name;
+            $obj->title = $title;
+            $obj->excerpt = $excerpt;
+            $output = executeQuery('trackback.getRegistedTrackback', $obj);
+            return $output->data->count;
+        }
+
+        /**
+         * @brief return by creating a trackback url
+         * Adds the key value in the trackback url.
+         **/
+        function getTrackbackUrl($document_srl) {
+            $url = getFullUrl('','document_srl',$document_srl,'act','trackback','key',$this->getTrackbackKey($document_srl));
+            return $url;
+        }
+
+        /**
+         * @brief Return keys by generating
+         * db key value information, plus a 10 minute off-duty time together and hash values and deal with the results
+         * So was extended only url, 1, 10, 20-digit combination of letters only, one return
+         **/
+        function getTrackbackKey($document_srl) {
+            $time = (int) (time()/(60*10));
+            $db_info = Context::getDBInfo();
+            $key = md5($document_srl.$db_info->db_password.$time);
+            return sprintf("%s%s%s",substr($key,1,1),substr($key,10,1),substr($key,20,1));
+        }
+    }
+?>
diff --git a/modules/trackback/trackback.view.php b/modules/trackback/trackback.view.php
index 7c9ff133b..ab80b1279 100644
--- a/modules/trackback/trackback.view.php
+++ b/modules/trackback/trackback.view.php
@@ -1,70 +1,66 @@
-<?php
-    /**
-     * @class  trackbackView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  trackback모듈의 view class
-     **/
-
-    class trackbackView extends trackback {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 목록 출력 (관리자용)
-         **/
-        function dispTrackbackSend() {
-            $document_srl = Context::get('document_srl');
-            if(!$document_srl) return $this->stop('msg_invalid_request');
-
-            $logged_info = Context::get('logged_info');
-            if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
-
-            // 원본 글의 정보를 구함
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            if(!$oDocument->isExists()) return $this->stop('msg_invalid_document');
-            if($oDocument->isSecret()) return $this->stop('msg_invalid_request');
-
-            if($oDocument->getMemberSrl() != $logged_info->member_srl) return $this->stop('msg_not_permitted');
-
-            Context::set('oDocument', $oDocument);
-
-            // 템플릿 지정
-            $this->setLayoutFile('popup_layout');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile('send_trackback_form');
-        }
-
-        /**
-         * @brief 서비스형 모듈의 추가 설정을 위한 부분
-         * trackback의 사용 형태에 대한 설정만 받음
-         **/
-        function triggerDispTrackbackAdditionSetup(&$obj) {
-            $current_module_srl = Context::get('module_srl');
-            $current_module_srls = Context::get('module_srls');
-
-            if(!$current_module_srl && !$current_module_srls) {
-                // 선택된 모듈의 정보를 가져옴
-                $current_module_info = Context::get('current_module_info');
-                $current_module_srl = $current_module_info->module_srl;
-                if(!$current_module_srl) return new Object();
-            }
-
-            // 선택된 모듈의 trackback설정을 가져옴
-            $oTrackbackModel = &getModel('trackback');
-            $trackback_config = $oTrackbackModel->getTrackbackModuleConfig($current_module_srl);
-            Context::set('trackback_config', $trackback_config);
-
-            // 템플릿 파일 지정
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($this->module_path.'tpl', 'trackback_module_config');
-            $obj .= $tpl;
-
-            return new Object();
-        }
-    }
-?>
+<?php
+    /**
+     * @class  trackbackView
+     * @author NHN (developers@xpressengine.com)
+     * @brief trackback module's view class
+     **/
+
+    class trackbackView extends trackback {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Display output list (administrative)
+         **/
+        function dispTrackbackSend() {
+            $document_srl = Context::get('document_srl');
+            if(!$document_srl) return $this->stop('msg_invalid_request');
+
+            $logged_info = Context::get('logged_info');
+            if(!$logged_info->member_srl) return $this->stop('msg_not_permitted');
+            // Wanted Original article information
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return $this->stop('msg_invalid_document');
+            if($oDocument->isSecret()) return $this->stop('msg_invalid_request');
+
+            if($oDocument->getMemberSrl() != $logged_info->member_srl) return $this->stop('msg_not_permitted');
+
+            Context::set('oDocument', $oDocument);
+            // Set a template
+            $this->setLayoutFile('popup_layout');
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('send_trackback_form');
+        }
+
+        /**
+         * @brief An additional set of parts for a service module
+         * Use the form out of the settings for trackback
+         **/
+        function triggerDispTrackbackAdditionSetup(&$obj) {
+            $current_module_srl = Context::get('module_srl');
+            $current_module_srls = Context::get('module_srls');
+
+            if(!$current_module_srl && !$current_module_srls) {
+                // Get information of the current module
+                $current_module_info = Context::get('current_module_info');
+                $current_module_srl = $current_module_info->module_srl;
+                if(!$current_module_srl) return new Object();
+            }
+            // Imported trackback settings of the selected module
+            $oTrackbackModel = &getModel('trackback');
+            $trackback_config = $oTrackbackModel->getTrackbackModuleConfig($current_module_srl);
+            Context::set('trackback_config', $trackback_config);
+            // Set a template file
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($this->module_path.'tpl', 'trackback_module_config');
+            $obj .= $tpl;
+
+            return new Object();
+        }
+    }
+?>
diff --git a/modules/trash/conf/info.xml b/modules/trash/conf/info.xml
new file mode 100644
index 000000000..575a7e247
--- /dev/null
+++ b/modules/trash/conf/info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">휴지통</title>
+    <title xml:lang="en">trash</title>
+    <description xml:lang="ko">문서, 댓글 등을 완전히 삭제하지 않고 복구 가능한 상태로 만들어 관리하는 모듈입니다. </description>
+    <version>0.1</version>
+    <date>2011-05-12</date>
+    <category>content</category>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/trash/conf/module.xml b/modules/trash/conf/module.xml
new file mode 100644
index 000000000..9b7e04a55
--- /dev/null
+++ b/modules/trash/conf/module.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<module>
+    <grants />
+    <permissions>
+        <permission action="dispTrashAdminList" target="manager" />
+        <permission action="procTrashAdminRestore" target="manager" />
+    </permissions>
+    <actions>
+        <action name="dispTrashAdminList" type="view" standalone="true" admin_index="true" menu_name="trash" menu_index="true" />
+
+        <action name="procTrashAdminEmptyTrash" type="controller" standalone="true" ruleset="emptyTrash" />
+        <action name="procTrashAdminRestore" type="controller" standalone="true" />
+        <action name="procTrashAdminGetList" type="controller" standalone="true" />
+    </actions>
+	<menus>
+		<menu name="trash">
+			<title xml:lang="en">Trash</title>
+			<title xml:lang="ko">휴지통</title>
+			<title xml:lang="zh-CN">Trash</title>
+			<title xml:lang="jp">Trash</title>
+			<title xml:lang="es">Trash</title>
+			<title xml:lang="ru">Trash</title>
+			<title xml:lang="fr">Trash</title>
+			<title xml:lang="zh-TW">Trash</title>
+			<title xml:lang="vi">Trash</title>
+			<title xml:lang="mn">Trash</title>
+			<title xml:lang="tr">Trash</title>
+		</menu>
+	</menus>
+</module>
diff --git a/modules/trash/lang/lang.xml b/modules/trash/lang/lang.xml
new file mode 100644
index 000000000..bacaa6ca5
--- /dev/null
+++ b/modules/trash/lang/lang.xml
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_trash">
+		<value xml:lang="ko"><![CDATA[휴지통]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
+	</item>
+	<item name="cmd_restore">
+		<value xml:lang="ko"><![CDATA[복원]]></value>
+		<value xml:lang="en"><![CDATA[Restore]]></value>
+		<value xml:lang="jp"><![CDATA[復元]]></value>
+	</item>
+	<item name="cmd_restore_all">
+		<value xml:lang="ko"><![CDATA[모두 복원]]></value>
+		<value xml:lang="en"><![CDATA[Restore All]]></value>
+		<value xml:lang="jp"><![CDATA[すべて復元]]></value>
+	</item>
+	<item name="in_trash">
+		<value xml:lang="ko"><![CDATA[휴지통]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱]]></value>
+	</item>
+	<item name="trash_date">
+		<value xml:lang="ko"><![CDATA[삭제 날짜]]></value>
+		<value xml:lang="en"><![CDATA[Deleted date]]></value>
+		<value xml:lang="jp"><![CDATA[削除日]]></value>
+	</item>
+	<item name="trash_description">
+		<value xml:lang="ko"><![CDATA[설명]]></value>
+		<value xml:lang="en"><![CDATA[Description]]></value>
+		<value xml:lang="jp"><![CDATA[説明]]></value>
+	</item>
+	<item name="success_trashed">
+		<value xml:lang="ko"><![CDATA[휴지통으로 옮겼습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Moved to Recycle Bin.]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱に移動しました。]]></value>
+	</item>
+	<item name="empty_trash_all">
+		<value xml:lang="ko"><![CDATA[휴지통 비우기]]></value>
+		<value xml:lang="en"><![CDATA[Empty Recycle Bin]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱を空にする]]></value>		
+	</item>
+	<item name="confirm_restore">
+		<value xml:lang="ko"><![CDATA[복원하시겠습니까?]]></value>
+		<value xml:lang="en"><![CDATA[Are you sure you want to restore?]]></value>
+		<value xml:lang="jp"><![CDATA[復元しますか?]]></value>
+	</item>
+	<item name="success_empty">
+		<value xml:lang="ko"><![CDATA[휴지통을 비웠습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Recycle Bin emptied successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱を空にしました。]]></value>
+	</item>
+	<item name="fail_empty">
+		<value xml:lang="ko"><![CDATA[휴지통을 비우지 못했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to empty Recycle Bin.]]></value>
+		<value xml:lang="jp"><![CDATA[ゴミ箱を空にできませんでした。]]></value>
+	</item>
+	<item name="success_restore">
+		<value xml:lang="ko"><![CDATA[복원했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Restored successfully.]]></value>
+		<value xml:lang="jp"><![CDATA[復元しました。]]></value>
+	</item>
+	<item name="fail_restore">
+		<value xml:lang="ko"><![CDATA[복원하지 못했습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Failed to restore.]]></value>
+		<value xml:lang="jp"><![CDATA[復元できませんでした。]]></value>
+	</item>
+	<item name="origin_module_type">
+		<value xml:lang="ko"><![CDATA[원본 타입]]></value>
+		<value xml:lang="en"><![CDATA[Source Type]]></value>
+		<value xml:lang="jp"><![CDATA[原本タイプ]]></value>
+	</item>
+</lang>
diff --git a/modules/trash/model/TrashVO.php b/modules/trash/model/TrashVO.php
new file mode 100644
index 000000000..9061d8b9e
--- /dev/null
+++ b/modules/trash/model/TrashVO.php
@@ -0,0 +1,103 @@
+<?php
+
+class TrashVO
+{
+	var $trashSrl;
+	var $title;
+	var $originModule;
+	var $serializedObject;
+	var $description;
+	var $ipaddress;
+	var $removerSrl;
+	var $userId;
+	var $nickName;
+	var $regdate;
+
+	function getTrashSrl()
+	{
+		return $this->trashSrl;
+	}
+	function setTrashSrl($trashSrl)
+	{
+		$this->trashSrl = $trashSrl;
+	}
+	function getTitle()
+	{
+		if(empty($this->title)) return $lang->untitle;
+		return $this->title;
+	}
+	function setTitle($title)
+	{
+		$this->title = $title;
+	}
+	function getOriginModule()
+	{
+		if(empty($this->originModule)) return 'document';
+		return $this->originModule;
+	}
+	function setOriginModule($originModule)
+	{
+		$this->originModule = $originModule;
+	}
+	function getSerializedObject()
+	{
+		return $this->serializedObject;
+	}
+	function setSerializedObject($serializedObject)
+	{
+		$this->serializedObject = $serializedObject;
+	}
+	function getDescription()
+	{
+		return $this->description;
+	}
+	function setDescription($description)
+	{
+		$this->description = $description;
+	}
+	function getIpaddress()
+	{
+		return $this->ipaddress;
+	}
+	function setIpaddress($ipaddress)
+	{
+		$this->ipaddress = $ipaddress;
+	}
+	function getRemoverSrl()
+	{
+		return $this->removerSrl;
+	}
+	function setRemoverSrl($removerSrl)
+	{
+		$this->removerSrl = $removerSrl;
+	}
+	function getUserId()
+	{
+		return $this->userId;
+	}
+	function setUserId($userId)
+	{
+		$this->userId = $userId;
+	}
+	function getNickName()
+	{
+		return $this->nickName;
+	}
+	function setNickName($nickName)
+	{
+		$this->nickName = $nickName;
+	}
+	function getRegdate()
+	{
+		if(empty($this->regdate)) return date('YmdHis');
+
+		return $this->regdate;
+	}
+	function setRegdate($regdate)
+	{
+		$this->regdate = $regdate;
+	}
+}
+
+/* End of file Trash.php */
+/* Location: ./modules/trash/model/Trash.php */
diff --git a/modules/trash/queries/deleteTrash.xml b/modules/trash/queries/deleteTrash.xml
new file mode 100644
index 000000000..7374de69c
--- /dev/null
+++ b/modules/trash/queries/deleteTrash.xml
@@ -0,0 +1,9 @@
+<query id="deleteTrash" action="delete">
+    <tables>
+        <table name="trash" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="trash_srl" var="trashSrl" filter="number" />
+        <condition operation="in" column="trash_srl" var="trashSrls" filter="number" />
+    </conditions>
+</query>
diff --git a/modules/trash/queries/getTrash.xml b/modules/trash/queries/getTrash.xml
new file mode 100644
index 000000000..0acccabc9
--- /dev/null
+++ b/modules/trash/queries/getTrash.xml
@@ -0,0 +1,11 @@
+<query id="getTrash" action="select">
+    <tables>
+        <table name="trash" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="trash_srl" var="trashSrl" filter="number" notnull="notnull" />
+    </conditions>
+</query>
diff --git a/modules/trash/queries/getTrashList.xml b/modules/trash/queries/getTrashList.xml
new file mode 100644
index 000000000..b3728bc12
--- /dev/null
+++ b/modules/trash/queries/getTrashList.xml
@@ -0,0 +1,22 @@
+<query id="getTrashList" action="select">
+    <tables>
+        <table name="trash" alias="T" />
+        <table name="member" alias="M" />
+    </tables>
+    <columns>
+        <column name="T.*" />
+        <column name="M.user_id" />
+        <column name="M.nick_name" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="T.remover_srl" default="M.member_srl" notnull="notnull" />
+        <condition operation="in" column="trash_srl" var="trashSrl" filter="number" pipe="and" />
+        <condition operation="in" column="origin_module" var="originModule" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="trash_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/trash/queries/insertTrash.xml b/modules/trash/queries/insertTrash.xml
new file mode 100644
index 000000000..c8fadb3d6
--- /dev/null
+++ b/modules/trash/queries/insertTrash.xml
@@ -0,0 +1,15 @@
+<query id="insertTrash" action="insert">
+    <tables>
+        <table name="trash" />
+    </tables>
+    <columns>
+        <column name="trash_srl" var="trashSrl" filter="number" notnull="notnull" />
+        <column name="title" var="title" notnull="notnull" />
+        <column name="origin_module" var="originModule" notnull="notnull" default="document" />
+        <column name="serialized_object" var="serializedObject" />
+        <column name="description" var="description" />
+        <column name="ipaddress" var="ipaddress" default="ipaddress()" />
+        <column name="remover_srl" var="removerSrl" default="0" filter="number" />
+        <column name="regdate" var="regdate" default="curdate()" />
+    </columns>
+</query>
diff --git a/modules/trash/ruleset/emptyTrash.xml b/modules/trash/ruleset/emptyTrash.xml
new file mode 100644
index 000000000..669ec4ff4
--- /dev/null
+++ b/modules/trash/ruleset/emptyTrash.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+		<field name="cart">
+			<if test="$is_all != 'true'" attr="required" value="true" />
+		</field>
+    </fields>
+</ruleset>
diff --git a/modules/trash/schemas/trash.xml b/modules/trash/schemas/trash.xml
new file mode 100644
index 000000000..ee69509da
--- /dev/null
+++ b/modules/trash/schemas/trash.xml
@@ -0,0 +1,10 @@
+<table name="trash">
+    <column name="trash_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
+    <column name="title" type="varchar" size="250" />
+    <column name="origin_module" type="varchar" size="250" default="document" notnull="notnull" />
+    <column name="serialized_object" type="bigtext" notnull="notnull" />
+    <column name="description" type="text" />
+    <column name="ipaddress" type="varchar" size="128" notnull="notnull" />
+    <column name="remover_srl" type="number" size="11" notnull="notnull" />
+    <column name="regdate" type="date" index="idx_regdate" />
+</table>
diff --git a/modules/trash/tpl/filter/emptyTrash.xml b/modules/trash/tpl/filter/emptyTrash.xml
new file mode 100644
index 000000000..6976c489f
--- /dev/null
+++ b/modules/trash/tpl/filter/emptyTrash.xml
@@ -0,0 +1,12 @@
+<filter name="emptyTrash" module="trash" act="procTrashAdminEmptyTrash" confirm_msg_code="confirm_delete">
+    <form>
+        <node target="trash_srl" />
+    </form>
+    <parameter>
+        <param name="trash_srl" target="trash_srl" />
+    </parameter>
+    <response callback_func="completeEmptyTrash">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/trash/tpl/header.html b/modules/trash/tpl/header.html
new file mode 100644
index 000000000..cf7e9e9de
--- /dev/null
+++ b/modules/trash/tpl/header.html
@@ -0,0 +1,2 @@
+<load target="js/trash_admin.js" usecdn="true" />
+<h3 class="xeAdmin">{$lang->cmd_trash} <span class="gray">{$lang->cmd_management}</span></h3>
diff --git a/modules/trash/tpl/js/trash_admin.js b/modules/trash/tpl/js/trash_admin.js
new file mode 100644
index 000000000..eb135c6bf
--- /dev/null
+++ b/modules/trash/tpl/js/trash_admin.js
@@ -0,0 +1,82 @@
+/**
+ * @file   modules/trash/js/trash_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  trash 모듈의 관리자용 javascript
+ **/
+
+
+/* 휴지통 비우기 후 */
+function completeEmptyTrash(ret_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+	alert(message);
+	if(error == '0') window.location.reload();
+}
+
+function goRestore(trash_srl)
+{
+	if(confirm(confirm_restore_msg))
+	{
+		var params = {'trash_srl':trash_srl};
+		exec_xml('admin', 'procTrashAdminRestore', params, completeRestore);
+	}
+}
+
+function completeRestore(ret_obj)
+{
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+	alert(message);
+	if(error == '0') window.location.reload();
+}
+
+function getTrashList()
+{
+	var trashListTable = jQuery('#trashListTable');
+	var cartList = [];
+	trashListTable.find(':checkbox[name=cart]').each(function(){
+		if(this.checked) cartList.push(this.value); 
+	});
+
+    var params = new Array();
+    var response_tags = ['error','message', 'trash_list'];
+	params["trash_srls"] = cartList.join(",");
+
+    exec_xml('trash','procTrashAdminGetList',params, completeGetTrashList, response_tags);
+}
+
+function completeGetTrashList(ret_obj, response_tags)
+{
+	var htmlListBuffer = '';
+
+	if(ret_obj['trash_list'] == null)
+	{
+		htmlListBuffer = '<tr>' +
+							'<td colspan="3" style="text-align:center;">'+ret_obj['message']+'</td>' +
+						'</tr>';
+	}
+	else
+	{
+		var trash_list = ret_obj['trash_list']['item'];
+
+		if(!jQuery.isArray(trash_list)) trash_list = [trash_list];
+		for(var x in trash_list)
+		{
+			var objTrash = trash_list[x];
+			var title = '';
+			if(objTrash.title == '') title = no_text_comment;
+			else title = objTrash.title;
+
+			htmlListBuffer += '<tr>' +
+								'<td class="title">'+ title +'</td>' +
+								'<td>'+ objTrash.nickName +'</td>' +
+								'<td>'+ objTrash.ipaddress +'</td>' +
+							'</tr>' +
+							'<input type="hidden" name="cart[]" value="'+objTrash.trashSrl+'" />';
+		}
+		jQuery('#selectedTrashCount').html(trash_list.length);
+	}
+	jQuery('#trashManageListTable>tbody').html(htmlListBuffer);
+}
diff --git a/modules/trash/tpl/trash_list.html b/modules/trash/tpl/trash_list.html
new file mode 100644
index 000000000..67694c66f
--- /dev/null
+++ b/modules/trash/tpl/trash_list.html
@@ -0,0 +1,120 @@
+<script>
+var confirm_restore_msg = '{$lang->confirm_restore}';
+var no_text_comment = '{$lang->no_text_comment}';
+</script>
+<load target="js/trash_admin.js" usecdn="true" />
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+	<form ruleset="emptyTrash" action="./" method="post" class="form">
+		<input type="hidden" name="module" value="trash" />
+		<input type="hidden" name="act" value="procTrashAdminEmptyTrash" />
+		<input type="hidden" name="page" value="{$page}" />
+		<input type="hidden" name="is_all" value="true" />
+		<h1 class="h1">{$lang->trash}</h1>
+		<div class="table even">
+			<table width="100%" border="1" cellspacing="0" id="trashListTable">
+				<caption>
+					{$lang->trash}({number_format($total_count)})
+					<span class="side"><span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a></span>
+					<span class="btn"><button type="submit" name="is_all" value="true">{$lang->empty_trash_all}</button></span></span>
+
+				</caption>
+				<thead>
+					<tr>
+						<th scope="col" class="title">{$lang->document}({$lang->origin_module_type})</th>
+						<th scope="col">{$lang->trash_nick_name}</th>
+						<th scope="col">{$lang->trash_date}</th>
+						<th scope="col">{$lang->ipaddress}</th>
+						<th scope="col" class="title">{$lang->trash_description}</th>
+						<th scope="col"><input type="checkbox" title="Check All" data-name="cart" /></th>
+					</tr>
+				</thead>
+				<tfoot>
+					<tr>
+						<th scope="col" class="title">{$lang->document}({$lang->origin_module_type})</th>
+						<th scope="col">{$lang->trash_nick_name}</th>
+						<th scope="col">{$lang->trash_date}</th>
+						<th scope="col">{$lang->ipaddress}</th>
+						<th scope="col" class="title">{$lang->trash_description}</th>
+						<th scope="col"><input type="checkbox" title="Check All" data-name="cart" /></th>
+					</tr>
+				</tfoot>
+				<tbody>
+    				<!--@foreach($trash_list as $no => $oTrashVO)-->
+					<tr>
+						<td class="title"><!--@if(!trim($oTrashVO->getTitle()) && $oTrashVO->getOriginModule() == 'comment')--><strong>{$lang->no_text_comment}</strong><!--@else-->{$oTrashVO->getTitle()}<!--@end--> (<!--@if($oTrashVO->getOriginModule() == 'document')-->{$lang->document}<!--@else-->{$lang->comment}<!--@end-->)</td>
+						<td><span class="member_{$oTrashVO->getRemoverSrl()}">{htmlspecialchars($oTrashVO->getNickName())}</span></td>
+						<td>{zdate($oTrashVO->getRegdate(), "Y-m-d H:i:s")}</td>
+						<td>{$oTrashVO->getIpaddress()}</td>
+						<td class="title">{$oTrashVO->getDescription()}</td>
+						<td><input type="checkbox" name="cart" value="{$oTrashVO->getTrashSrl()}" /></td>
+					</tr>
+    				<!--@end-->
+				</tbody>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><a href="#listManager" class="modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a></span>
+			<span class="btn"><button type="submit" name="is_all" value="true">{$lang->empty_trash_all}</button></span>
+		</div>
+	</form>
+	<div class="modal" id="listManager">
+		<form ruleset="emptyTrash" id="fo_list" action="./" method="post" class="fg form">
+		<input type="hidden" name="module" value="trash" />
+		<input type="hidden" name="act" value="procTrashAdminEmptyTrash" />
+		<input type="hidden" name="page" value="{$page}" />
+		<input type="hidden" name="is_all" value="false" />
+		<input type="hidden" name="origin_module" value="{$origin_module}" />
+			<h2 class="h2">{$lang->document_manager}</h2>
+			<div class="table even">
+				<table width="100%" border="1" cellspacing="0" id="trashManageListTable">
+					<caption>{$lang->selected_document} <strong id="selectedTrashCount">0</strong></caption>
+					<thead>
+						<tr>
+							<th scope="col" class="title">{$lang->document}</th>
+							<th scope="col">{$lang->trash_nick_name}</th>
+							<th scope="col">{$lang->ipaddress}</th>
+						</tr>
+					</thead>
+					<tbody>
+					</tbody>
+				</table>
+			</div>
+			<div class="btnArea">
+				<span class="btn"><button type="submit" name="is_all" value="false">{$lang->cmd_delete}</button></span>
+				<span class="btn"><button type="submit" name="act" value="procTrashAdminRestore">{$lang->cmd_restore}</button></span>
+			</div>
+		</form>
+	</div>
+<div class="search">
+	<form action="" class="pagination">
+	<input type="hidden" name="error_return_url" value="" />
+	<input type="hidden" name="module" value="{$module}" />
+	<input type="hidden" name="act" value="{$act}" />
+  	<input cond="$search_keyword" type="hidden" name="search_keyword" value="{$search_keyword}" />
+  	<input cond="$search_target" type="hidden" name="search_target" value="{$search_target}" />
+
+	<a href="{getUrl('page', '')}" class="direction">&laquo; FIRST</a>
+	<block cond="$page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page && $page_navigation->page_count != $page_navigation->total_page">
+		{@$isGoTo = true}
+		<a href="{getUrl('page', '')}">1</a>
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+	</block>
+	<!--@while($page_no = $page_navigation->getNextPage())-->
+		{@$last_page = $page_no}
+		<strong cond="$page_no == $page">{$page_no}</strong>
+		<a cond="$page_no != $page" href="{getUrl('page', $page_no)}">{$page_no}</a>
+	<!--@end-->
+	<block cond="$last_page != $page_navigation->last_page">
+		{@$isGoTo = true}
+		<a href="#goTo" class="tgAnchor" title="{$lang->cmd_go_to_page}">...</a>
+		<a href="{getUrl('page', $page_navigation->last_page)}">{$page_navigation->last_page}</a>
+	</block>
+	<a href="{getUrl('page', $page_navigation->last_page)}" class="direction">LAST &raquo;</a>
+	<span cond="$isGoTo" id="goTo" class="tgContent">
+		<input name="page" title="{$lang->cmd_go_to_page}" />
+		<button type="submit">Go</button>
+	</span>
+	</form>
+</div>
diff --git a/modules/trash/trash.admin.controller.php b/modules/trash/trash.admin.controller.php
new file mode 100644
index 000000000..60ec85c5d
--- /dev/null
+++ b/modules/trash/trash.admin.controller.php
@@ -0,0 +1,191 @@
+<?php
+/**
+ * @class  documentController
+ * @author NHN (developers@xpressengine.com)
+ * @brief document the module's controller class
+ **/
+class trashAdminController extends trash
+{
+	/**
+	 * @brief object insert to trash
+	 * @param $obj : TrashVO type object
+	 **/
+	function insertTrash($obj)
+	{
+		if(Context::get('is_logged'))
+		{
+			$logged_info = Context::get('logged_info');
+
+			$oTrashVO = new TrashVO();
+			$oTrashVO = &$obj;
+
+			if(!$oTrashVO->getTrashSrl()) $oTrashVO->setTrashSrl(getNextSequence());
+			if(!is_string($oTrashVO->getSerializedObject())) $oTrashVO->setSerializedObject(serialize($oTrashVO->getSerializedObject()));
+			$oTrashVO->setIpaddress($_SERVER['REMOTE_ADDR']);
+			$oTrashVO->setRemoverSrl($logged_info->member_srl);
+			$oTrashVO->setRegdate(date('YmdHis'));
+
+			$output = executeQuery('trash.insertTrash', $oTrashVO);
+			return $output;
+		}
+		return new Object(-1, 'msg_not_permitted');
+	}
+
+	/**
+	 * @brief empty trash
+	 * @param trashSrls : trash_srl in array
+	 **/
+	function procTrashAdminEmptyTrash()
+	{
+		global $lang;
+		$isAll = Context::get('is_all');
+		$originModule = Context::get('origin_module');
+		$tmpTrashSrls = Context::get('cart');
+		if(is_array($tmpTrashSrls)) $trashSrls = $tmpTrashSrls;
+		else $trashSrls = explode('|@|', $tmpTrashSrls);
+
+		//module relation data delete...
+		$output = $this->_relationDataDelete($isAll, $trashSrls);
+		if(!$output->toBool()) return new Object(-1, $output->message);
+
+		if(!$this->_emptyTrash($trashSrls)) return new Object(-1, $lang->fail_empty);
+
+		$this->setMessage('success_deleted', 'info');
+		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList', 'origin_module', $originModule);
+			$this->setRedirectUrl($returnUrl);
+			return;
+		}
+		return new Object(0, $lang->success_empty);
+	}
+
+	/**
+	 * @brief empty trash - private method
+	 **/
+	function _relationDataDelete($isAll, &$trashSrls)
+	{
+		if($isAll == 'true') $trashSrls = array();
+		$oTrashModel = &getModel('trash');
+		if(count($trashSrls) > 0) $args->trashSrl = $trashSrls;
+		$output = $oTrashModel->getTrashList($args);
+		if(!$output->toBool()) return new Object(-1, $output->message);
+
+		if(is_array($output->data))
+		{
+			foreach($output->data AS $key=>$oTrashVO)
+			{
+				if($isAll == 'true') array_push($trashSrls, $oTrashVO->getTrashSrl());
+
+				//class file check
+				$classPath = ModuleHandler::getModulePath($oTrashVO->getOriginModule());
+				if(!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
+
+				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $oTrashVO->getOriginModule());
+				$classFile = FileHandler::getRealPath($classFile);
+				if(!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
+
+				$oAdminController = &getAdminController($oTrashVO->getOriginModule());
+				if(!method_exists($oAdminController, 'emptyTrash')) return new Object(-1, 'not exist restore method in module class file');
+
+				$output = $oAdminController->emptyTrash($oTrashVO->getSerializedObject());
+				if(!$output->toBool()) return new Object(-1, $output->message);
+			}
+		}
+		return new Object(0, $lang->success_deleted);
+	}
+
+	/**
+	 * @brief restore content object
+	 **/
+	function procTrashAdminRestore()
+	{
+		global $lang;
+		$trashSrlList = Context::get('cart');
+
+		if(is_array($trashSrlList))
+		{
+			// begin transaction
+			$oDB = &DB::getInstance();
+			$oDB->begin();
+			// eache restore method call in each classfile
+			foreach($trashSrlList AS $key=>$value)
+			{
+				$oTrashModel = &getModel('trash');
+				$output = $oTrashModel->getTrash($value);
+				if(!$output->toBool()) return new Object(-1, $output->message);
+
+				//class file check
+				$classPath = ModuleHandler::getModulePath($output->data->getOriginModule());
+				if(!is_dir(FileHandler::getRealPath($classPath))) return new Object(-1, 'not exist restore module directory');
+
+				$classFile = sprintf('%s%s.admin.controller.php', $classPath, $output->data->getOriginModule());
+				$classFile = FileHandler::getRealPath($classFile);
+				if(!file_exists($classFile)) return new Object(-1, 'not exist restore module class file');
+
+				$oAdminController = &getAdminController($output->data->getOriginModule());
+				if(!method_exists($oAdminController, 'restoreTrash')) return new Object(-1, 'not exist restore method in module class file');
+
+				$originObject = unserialize($output->data->getSerializedObject());
+				$output = $oAdminController->restoreTrash($originObject);
+
+				if(!$output->toBool()) {
+					$oDB->rollback();
+					return new Object(-1, $output->message);
+				}
+			}
+
+			// restore object delete in trash box
+			if(!$this->_emptyTrash($trashSrlList)) {
+				$oDB->rollback();
+				return new Object(-1, $lang->fail_empty);
+			}
+			$oDB->commit();
+		}
+
+		$this->setMessage('success_restore', 'info');
+		if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
+			$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispTrashAdminList');
+			$this->setRedirectUrl($returnUrl);
+			return;
+		}
+	}
+
+	function procTrashAdminGetList()
+	{
+		if(!Context::get('is_logged')) return new Object(-1,'msg_not_permitted');
+		$trashSrls = Context::get('trash_srls');
+		if($trashSrls) $trashSrlList = explode(',', $trashSrls);
+
+		if(count($trashSrlList) > 0) {
+			$oTrashModel = &getModel('trash');
+			$args->trashSrl = $trashSrlList;
+			$output = $oTrashModel->getTrashList($args);
+			$trashList = $output->data;
+		}
+		else
+		{
+			global $lang;
+			$trashList = array();
+			$this->setMessage($lang->no_documents);
+		}
+
+		$this->add('trash_list', $trashList);
+	}
+
+	/**
+	 * @brief empty trash
+	 * @param trashSrls : trash_srl in array
+	 **/
+	function _emptyTrash($trashSrls)
+	{
+		if(!is_array($trashSrls)) return false;
+		$args->trashSrls = $trashSrls;
+		$output = executeQuery('trash.deleteTrash', $args);
+		if(!$output->toBool()) return false;
+
+		return true;
+	}
+}
+
+/* End of file trash.controller.php */
+/* Location: ./modules/trash/trash.controller.php */
diff --git a/modules/trash/trash.admin.view.php b/modules/trash/trash.admin.view.php
new file mode 100644
index 000000000..249defdf7
--- /dev/null
+++ b/modules/trash/trash.admin.view.php
@@ -0,0 +1,47 @@
+<?php
+/**
+ * @class  trashView
+ * @author NHN (developers@xpressengine.com)
+ * @brief View class of the module trash
+ **/
+
+class trashAdminView extends trash {
+
+	/**
+	 * @brief Initialization
+	 **/
+	function init() {
+		// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
+		$template_path = sprintf("%stpl/",$this->module_path);
+		$this->setTemplatePath($template_path);
+	}
+
+	/**
+	 * @brief trash list
+	 **/
+	function dispTrashAdminList() {
+		$args->page = Context::get('page'); // /< Page
+		$args->list_count = 30; // /< the number of posts to display on a single page
+		$args->page_count = 5; // /< the number of pages that appear in the page navigation
+
+		$args->search_target = Context::get('search_target'); // /< search (title, contents ...)
+		$args->search_keyword = Context::get('search_keyword'); // /< keyword to search
+
+		$oTrashModel = getModel('trash');
+		$output = $oTrashModel->getTrashList($args);
+
+		// for no text comment language and for document manange language
+		$oCommentModel = &getModel('comment');
+		$oDocumentModel = &getModel('document');
+
+		Context::set('trash_list', $output->data);
+		Context::set('total_count', $output->total_count);
+		Context::set('total_page', $output->total_page);
+		Context::set('page', $output->page);
+		Context::set('page_navigation', $output->page_navigation);
+
+		// 템플릿 파일 지정
+		$this->setTemplateFile('trash_list');
+	}
+}
+?>
diff --git a/modules/trash/trash.class.php b/modules/trash/trash.class.php
new file mode 100644
index 000000000..067c04079
--- /dev/null
+++ b/modules/trash/trash.class.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @class  document
+ * @author NHN (developers@xpressengine.com)
+ * @brief document the module's high class
+ **/
+
+require_once(_XE_PATH_.'modules/trash/model/TrashVO.php');
+
+class trash extends ModuleObject {
+	/**
+	 * @brief Implement if additional tasks are necessary when installing
+	 **/
+	function moduleInstall() {
+		return new Object();
+	}
+
+	/**
+	 * @brief a method to check if successfully installed
+	 **/
+	function checkUpdate() {
+		//$oDB = &DB::getInstance();
+		//$oModuleModel = &getModel('module');
+
+		return false;
+	}
+
+	/**
+	 * @brief Execute update
+	 **/
+	function moduleUpdate() {
+		//$oDB = &DB::getInstance();
+		//$oModuleModel = &getModel('module');
+
+		return new Object(0,'success_updated');
+
+	}
+}
+?>
diff --git a/modules/trash/trash.controller.php b/modules/trash/trash.controller.php
new file mode 100644
index 000000000..ab78afa50
--- /dev/null
+++ b/modules/trash/trash.controller.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @class  documentController
+ * @author NHN (developers@xpressengine.com)
+ * @brief document the module's controller class
+ **/
+class trashController extends trash
+{
+}
+
+/* End of file trash.controller.php */
+/* Location: ./modules/trash/trash.controller.php */
diff --git a/modules/trash/trash.model.php b/modules/trash/trash.model.php
new file mode 100644
index 000000000..eb26d5f2e
--- /dev/null
+++ b/modules/trash/trash.model.php
@@ -0,0 +1,58 @@
+<?php
+
+class trashModel extends trash
+{
+	/**
+	 * @brief get one trash object
+	 **/
+	function getTrash($trashSrl, $columnList = array())
+	{
+		$oTrashVO = new TrashVO();
+		if(!$trashSrl) return $oTrashVO;
+
+		$args->trashSrl = $trashSrl;
+		$output = executeQuery('trash.getTrash', $args, $columnList);
+
+		$this->_setTrashObject($oTrashVO, $output->data);
+		$output->data = $oTrashVO;
+
+		return $output;
+	}
+
+	/**
+	 * @brief get trash object list
+	 **/
+	function getTrashList($args, $columnList = array())
+	{
+		$output = executeQueryArray('trash.getTrashList', $args, $columnList);
+
+		if(is_array($output->data))
+		{
+			foreach($output->data AS $key=>$value)
+			{
+				$oTrashVO = new TrashVO();
+				$this->_setTrashObject($oTrashVO, $value);
+				$output->data[$key] = $oTrashVO;
+			}
+		}
+		return $output;
+	}
+
+	/**
+	 * @brief set trash object from std object
+	 **/
+	function _setTrashObject(&$oTrashVO, $stdObject)
+	{
+		$oTrashVO->setTrashSrl($stdObject->trash_srl);
+		$oTrashVO->setTitle($stdObject->title);
+		$oTrashVO->setOriginModule($stdObject->origin_module);
+		$oTrashVO->setSerializedObject($stdObject->serialized_object);
+		$oTrashVO->setDescription($stdObject->description);
+		$oTrashVO->setIpaddress($stdObject->ipaddress);
+		$oTrashVO->setRemoverSrl($stdObject->remover_srl);
+		$oTrashVO->setUserId($stdObject->user_id);
+		$oTrashVO->setNickName($stdObject->nick_name);
+		$oTrashVO->setRegdate($stdObject->regdate);
+	}
+}
+
diff --git a/modules/trash/trash.view.php b/modules/trash/trash.view.php
new file mode 100644
index 000000000..7536c6294
--- /dev/null
+++ b/modules/trash/trash.view.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @class  trashView
+ * @author NHN (developers@xpressengine.com)
+ * @brief View class of the module trash
+ **/
+
+class trashView extends trash {
+
+	/**
+	 * @brief Initialization
+	 **/
+	function init() {
+	}
+}
+?>
diff --git a/modules/widget/conf/info.xml b/modules/widget/conf/info.xml
index 2fd5925dd..1439e2d14 100644
--- a/modules/widget/conf/info.xml
+++ b/modules/widget/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module version="0.2">
-    <title xml:lang="ko">위젯</title>
-    <title xml:lang="zh-CN">控件管理</title>
-    <title xml:lang="jp">ウィジェット</title>
-    <title xml:lang="en">Widget</title>
-    <title xml:lang="vi">Widget</title>
-    <title xml:lang="es">Widget</title>
-    <title xml:lang="ru">Виджеты</title>
-    <title xml:lang="zh-TW">Widget</title>
-    <title xml:lang="tr">Görsel Bileşen (widget)</title>
-    <description xml:lang="ko">위젯 관리 모듈</description>
-    <description xml:lang="zh-CN">控件管理模块。</description>
-    <description xml:lang="jp">ウィジェット管理モジュール</description>
-    <description xml:lang="en">Module for managing widgets.</description>
-    <description xml:lang="vi">Module dành cho quản lý Widget.</description>
-    <description xml:lang="es">Módulo para el manejo de widgets.</description>
-    <description xml:lang="ru">Модуль для управления виджетами.</description>
-    <description xml:lang="zh-TW">Widget管理模組。</description>
-    <description xml:lang="tr">Widgetları yönetmek için kullanılan modüldür.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <category>construction</category>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-</module>
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="0.2">
+    <title xml:lang="ko">위젯</title>
+    <title xml:lang="zh-CN">控件管理</title>
+    <title xml:lang="jp">ウィジェット</title>
+    <title xml:lang="en">Widget</title>
+    <title xml:lang="vi">Widget</title>
+    <title xml:lang="es">Widget</title>
+    <title xml:lang="ru">Виджеты</title>
+    <title xml:lang="zh-TW">Widget</title>
+    <title xml:lang="tr">Görsel Bileşen (widget)</title>
+    <description xml:lang="ko">위젯 관리 모듈</description>
+    <description xml:lang="zh-CN">控件管理模块。</description>
+    <description xml:lang="jp">ウィジェット管理モジュール</description>
+    <description xml:lang="en">Module for managing widgets.</description>
+    <description xml:lang="vi">Module dành cho quản lý Widget.</description>
+    <description xml:lang="es">Módulo para el manejo de widgets.</description>
+    <description xml:lang="ru">Модуль для управления виджетами.</description>
+    <description xml:lang="zh-TW">Widget管理模組。</description>
+    <description xml:lang="tr">Widgetları yönetmek için kullanılan modüldür.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <category>construction</category>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</module>
diff --git a/modules/widget/conf/module.xml b/modules/widget/conf/module.xml
index df9aefc57..a57312dc5 100644
--- a/modules/widget/conf/module.xml
+++ b/modules/widget/conf/module.xml
@@ -7,9 +7,12 @@
         <action name="dispWidgetGenerateCode" type="view" standalone="true" />
         <action name="dispWidgetGenerateCodeInPage" type="view" standalone="true" />
         <action name="dispWidgetStyleGenerateCodeInPage" type="view" standalone="true" />
-        <action name="dispWidgetAdminDownloadedList" type="view" standalone="true" admin_index="true" />
+        
+		<action name="dispWidgetAdminDownloadedList" type="view" standalone="true" admin_index="true" menu_name="installedWidget" menu_index="true" />
         <action name="dispWidgetAdminAddContent" type="view" standalone="true" />
-        <action name="procWidgetGenerateCode" type="controller" standalone="true" />
+		<action name="dispWidgetAdminGenerateCode" type="view" menu_name="installedWidget" />
+        
+		<action name="procWidgetGenerateCode" type="controller" standalone="true" />
         <action name="procWidgetStyleExtraImageUpload" type="controller" standalone="true" />
         <action name="procWidgetStyleGenerateCodeInPage" type="controller" standalone="true" />
         <action name="procWidgetAddContent" type="controller" standalone="true" />
@@ -22,4 +25,19 @@
         <action name="procWidgetStyleExtraImageUpload" type="controller" standalone="true" />
         <action name="procWidgetStyleGenerateCodeInPage" type="controller" standalone="true" />
     </actions>
+	<menus>
+		<menu name="installedWidget">
+			<title xml:lang="en">Installed Widget</title>
+			<title xml:lang="ko">설치된 위젯</title>
+			<title xml:lang="zh-CN">Installed Widget</title>
+			<title xml:lang="jp">Installed Widget</title>
+			<title xml:lang="es">Installed Widget</title>
+			<title xml:lang="ru">Installed Widget</title>
+			<title xml:lang="fr">Installed Widget</title>
+			<title xml:lang="zh-TW">Installed Widget</title>
+			<title xml:lang="vi">Installed Widget</title>
+			<title xml:lang="mn">Installed Widget</title>
+			<title xml:lang="tr">Installed Widget</title>
+		</menu>
+	</menus>
 </module>
diff --git a/modules/widget/lang/en.lang.php b/modules/widget/lang/en.lang.php
deleted file mode 100644
index c3d5ad973..000000000
--- a/modules/widget/lang/en.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  widget module- basic language pack
-     **/
-
-    $lang->cmd_generate_code = 'Generate Code';
-
-    $lang->widget_name = 'Widget Name';
-    $lang->widget_maker = 'Developer';
-    $lang->widget_license = 'License';
-    $lang->widget_history = 'Update History';
-    $lang->widget_info = 'Widget Info';
-    $lang->widget_code = 'Code';
-    $lang->widget_cache = 'Cache';
-
-    $lang->widget_fix_width = 'Fix Width';
-    $lang->widget_width = 'Width';
-    $lang->widget_position = 'Position';
-    $lang->widget_position_none = 'Next Line';
-    $lang->widget_position_left = 'Left';
-    $lang->widget_position_right = 'Right';
-    $lang->widget_margin = 'Margin';
-    $lang->widget_margin_top = 'Top Margin';
-    $lang->widget_margin_right = 'Right Margin';
-    $lang->widget_margin_bottom = 'Bottom Margin';
-    $lang->widget_margin_left= 'Left Margin';
-    $lang->about_widget_fix_width = 'Please check to fix the width.';
-    $lang->about_widget_width = 'Please set the width of widget.';
-    $lang->about_widget_position = 'Please select the position if you want to display many widgets in one line.';
-    $lang->about_widget_margin = "You may set the margin of widgets' top, bottom, right and left.";
-    $lang->about_widget_cache = 'Cached data can be used during the time you have set.';
-
-    $lang->generated_code = 'Generated Code';
-    $lang->widgetstyle= 'Widget Style';
-
-    $lang->msg_widget_is_not_exists = "'%s' does not exist.";
-    $lang->msg_widget_object_is_null = "Object of '%s' could not be created.";
-    $lang->msg_widget_proc_is_null = "proc() of '%s' could not be executed.";
-    $lang->msg_widget_skin_is_null = "You should select widget's skin";
-
-    $lang->about_widget_code = 'Please input required value first, and click [Generate Code] button to generate code to add to the template file.';
-    $lang->about_widget_code_in_page = 'After entering the required values, click the [Add] button to insert the widget code into the page.';
-    $lang->about_widget = "A widget is a small free-standing application used in a layout or page module.\n It can be linked with internal module or external open api. Through its configuration setting, wide application is possible. \n You can directly add a widget by using the [Generate Code] function without using the XE page module or layout module.";
-
-    $lang->cmd_content_insert = "Insert Content by Yourself";
-    $lang->cmd_box_widget_insert = "Insert Box Widget";
-    $lang->cmd_remove_all_widgets  = "Remove All Widgets";
-
-    $lang->cmd_widget_size = "Widget Size";
-    $lang->cmd_widget_align = "Align Widget";
-    $lang->cmd_widget_align_left = "Left";
-    $lang->cmd_widget_align_right = "Right";
-    $lang->cmd_widget_margin = "Margin";
-    $lang->cmd_widget_padding = "Padding";
-    $lang->cmd_widget_border = "Border";
-    $lang->cmd_widget_border_solid = "Solid";
-    $lang->cmd_widget_border_dotted = "Dotted";
-    $lang->cmd_widget_background_color = "Background Color";
-    $lang->cmd_widget_background_image_url = "Background Image";
-    $lang->cmd_widget_background_image_repeat = "Repeat";
-    $lang->cmd_widget_background_image_no_repeat = "No Repeat";
-    $lang->cmd_widget_background_image_x_repeat = "X Repeat";
-    $lang->cmd_widget_background_image_y_repeat = "Y Repeat";
-    $lang->cmd_widget_background_image_x = "X Position";
-    $lang->cmd_widget_background_image_y = "Y Position";
-?>
diff --git a/modules/widget/lang/es.lang.php b/modules/widget/lang/es.lang.php
deleted file mode 100644
index 7ce1faf1d..000000000
--- a/modules/widget/lang/es.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @archivo   modules/widget/lang/es.lang.php
-     * @autor NHN (developers@xpressengine.com)
-     * @sumario Paquete del idioma español para el módulo Widget (básico)
-     **/
-
-    $lang->cmd_generate_code = 'Generar Código';
-
-    $lang->widget_name = 'Nombre de Widget';
-    $lang->widget_maker = 'Desarrollador de Widget';
-    $lang->widget_license = 'License';
-    $lang->widget_history = 'Actualizar la historia';
-    $lang->widget_info = 'información de Widget';
-    $lang->widget_code = 'Código';
-    $lang->widget_cache = 'Cache';
-
-    $lang->widget_fix_width = 'Ancho permanente';
-    $lang->widget_width = 'Ancho';
-    $lang->widget_position = 'Posición';
-    $lang->widget_position_none = 'Próxima línea';
-    $lang->widget_position_left = 'Izquierdo';
-    $lang->widget_position_right = 'Derecho';
-    $lang->widget_margin = 'Márgen';
-    $lang->widget_margin_top = 'Márgen superior';
-    $lang->widget_margin_right = 'Márgen derecho';
-    $lang->widget_margin_bottom = 'Márgen inferior';
-    $lang->widget_margin_left= 'Márgen izquierdo';
-    $lang->about_widget_fix_width = 'Si selecciona esta opción el ancho será permanente.';
-    $lang->about_widget_width = 'Ingrese el ancho de Widget.';
-    $lang->about_widget_position = 'Selecciona la posición si desea mostra más widgets en una línea.';
-    $lang->about_widget_margin = "Uste puede ingresar el márgen de los widgets : superior, inferior, derecho e izquierdo.";
-    $lang->about_widget_cache = 'Se puede usar datos de caché creado durante el tiempo asignado.';
-
-    $lang->generated_code = 'Generar códigos';
-    $lang->widgetstyle= '위젯스타일';
-
-    $lang->msg_widget_is_not_exists = 'No existe widget %s .';
-    $lang->msg_widget_object_is_null = 'No puede ser creado el objeto de widget %s.';
-    $lang->msg_widget_proc_is_null = 'No puede ser ejecutado el proc() de widget %s.';
-    $lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다';
-
-    $lang->about_widget_code = 'Ingrese primero los valores requeridos, luego presiona el botón "Generar códigos" para mostrar el código en el espacio inferior para ser añadido en el archivo de los temas.';
-    $lang->about_widget_code_in_page = 'Luego de ingresar los valores requeridos, presiona el botón "Añadir" para insertar el código de widget dentro de la página.';
-    $lang->about_widget = "Un Widget es una pequena aplicación para ser usados en los diseños o en el módulo de páginas.\n Puede ser enlazados con un módulo interno o con open api externo y con la configuración de ella puede utilizar en variadas aplicaciones.\nSin la necesidad de utilizar los módulos de página o del diseño de XE, Usted puede directamente añadir un widget usando la función de [Generar Códigos].";
-
-    $lang->cmd_content_insert = "Introduzca contenido por ti mismo";
-    $lang->cmd_box_widget_insert = "Insertar cuadro de widget";
-    $lang->cmd_remove_all_widgets  = "Eliminar todos los reproductores";
-
-    $lang->cmd_widget_size = "Tamaño artilugio";
-    $lang->cmd_widget_align = "Alinear Widget";
-    $lang->cmd_widget_align_left = "Izquierda";
-    $lang->cmd_widget_align_right = "Derecho";
-    $lang->cmd_widget_margin = "Margen";
-    $lang->cmd_widget_padding = "Relleno";
-    $lang->cmd_widget_border = "Frontera";
-    $lang->cmd_widget_border_solid = "Sólidos";
-    $lang->cmd_widget_border_dotted = "Salpicando";
-    $lang->cmd_widget_background_color = "Color de fondo";
-    $lang->cmd_widget_background_image_url = "Imagen de fondo";
-    $lang->cmd_widget_background_image_repeat = "Repita";
-    $lang->cmd_widget_background_image_no_repeat = "No Repetir";
-    $lang->cmd_widget_background_image_x_repeat = "Repita X";
-    $lang->cmd_widget_background_image_y_repeat = "Repita Y";
-    $lang->cmd_widget_background_image_x = "Posición X";
-    $lang->cmd_widget_background_image_y = "Posición Y";
-?>
diff --git a/modules/widget/lang/fr.lang.php b/modules/widget/lang/fr.lang.php
deleted file mode 100644
index 044029971..000000000
--- a/modules/widget/lang/fr.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/fr.lang.php
-     * @author NHN (developers@xpressengine.com) Traduit par Pierre Duvent <PierreDuvent@gmail.com>
-     * @brief  Paquet du langage en français pour le module de gadget
-     **/
-
-    $lang->cmd_generate_code = 'Générer le Code';
-
-    $lang->widget_name = 'Nom de Gadget';
-    $lang->widget_maker = 'Développeur';
-    $lang->widget_license = 'Licence';
-    $lang->widget_history = 'Histoire de Mise à jours';
-    $lang->widget_info = 'Information de Gadget';
-    $lang->widget_code = 'Code';
-    $lang->widget_cache = 'Antémémoire';
-
-    $lang->widget_fix_width = 'Fixer Largeur';
-    $lang->widget_width = 'Largeur';
-    $lang->widget_position = 'Position';
-    $lang->widget_position_none = 'Ligne suivante';
-    $lang->widget_position_left = 'Gauche';
-    $lang->widget_position_right = 'Droite';
-    $lang->widget_margin = 'Marge';
-    $lang->widget_margin_top = 'Marge en tête';
-    $lang->widget_margin_right = 'Marge à droite';
-    $lang->widget_margin_bottom = 'Marge en pied';
-    $lang->widget_margin_left= 'Marge à gauche';
-    $lang->about_widget_fix_width = 'Cochez pour fixer la largeur, S.V.P.';
-    $lang->about_widget_width = 'Configurez la largeur du gadget, S.V.P.';
-    $lang->about_widget_position = 'Choisissez la position si vous voulez représenter plusieurs gadgets dans une ligne, S.V.P.';
-    $lang->about_widget_margin = "Vous pouvez désigner la marge de gadget 'de tête, en pied, à droite et à gauche.";
-    $lang->about_widget_cache = 'Les données d\'antémémoire peuvent être utilisées pendant le temps que vous désignez.';
-
-    $lang->generated_code = 'Code généré';
-    $lang->widgetstyle= '위젯스타일';
-
-    $lang->msg_widget_is_not_exists = "Le Gadget de(d') '%s' n'existe pas.";
-    $lang->msg_widget_object_is_null = "L'Objet de '%s' n'a pas pu être créé.";
-    $lang->msg_widget_proc_is_null = "proc() de '%s' n'a pas pu être exécuté.";
-    $lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다';
-
-    $lang->about_widget_code = 'Entrez les valeurs qui sont requises par le gadget choisi, et puis cliquz le bouton [Générer le Code] pour générer le code. Le code à appliquer au fichier de modèl se présentera en bas.';
-    $lang->about_widget_code_in_page = 'Après entrer les valeurs requies, cliquez le bouton [Ajouter] pour insérer le gadjet dans la page.';
-    $lang->about_widget = "Un gadjet est un petit application indépendant qui est utilisé dans une Mise en Page ou dans une module de Page. Un gajet peut être lié avec un module intérieur ou avec un API extérieur ouvert. L'application divers est possible par la configuration. \nVous pouvez directement ajouter un gadget en utilisant la fonction [Générer le Code] sans utiliser un module de Page de XE ni un module de Mise en Page.";
-
-    $lang->cmd_content_insert = "Insérer le Contenu par vous-même";
-    $lang->cmd_box_widget_insert = "Insérer le Gadget de Boîte";
-    $lang->cmd_remove_all_widgets  = "Enlever Tous les Gadgets";
-
-    $lang->cmd_widget_size = "Taille du Gadget";
-    $lang->cmd_widget_align = "Alignement des Gadget";
-    $lang->cmd_widget_align_left = "Gauche";
-    $lang->cmd_widget_align_right = "Droite";
-    $lang->cmd_widget_margin = "Marge";
-    $lang->cmd_widget_padding = "Remplissage";
-    $lang->cmd_widget_border = "Bordure";
-    $lang->cmd_widget_border_solid = "Solide";
-    $lang->cmd_widget_border_dotted = "Pointillé";
-    $lang->cmd_widget_background_color = "Couleur d'arrière-plan";
-    $lang->cmd_widget_background_image_url = "Image d'arrière-plan";
-    $lang->cmd_widget_background_image_repeat = "Répéter";
-    $lang->cmd_widget_background_image_no_repeat = "Ne pas répéter";
-    $lang->cmd_widget_background_image_x_repeat = "X Répéter";
-    $lang->cmd_widget_background_image_y_repeat = "Y Répéter";
-    $lang->cmd_widget_background_image_x = "X Position";
-    $lang->cmd_widget_background_image_y = "Y Position";
-?>
diff --git a/modules/widget/lang/jp.lang.php b/modules/widget/lang/jp.lang.php
deleted file mode 100644
index 8a6de2460..000000000
--- a/modules/widget/lang/jp.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/jp.lang.php
-     * @author NHN (developers@xpressengine.com) 翻訳：RisaPapa、ミニミ
-     * @brief  ウィジェット（widget）モジュール基本言語パッケージ
-     **/
-
-    $lang->cmd_generate_code = 'コード生成';
-
-    $lang->widget_name = 'ウィジェット名';
-    $lang->widget_maker = 'ウィジェット作者';
-    $lang->widget_license = 'ライセンス';
-    $lang->widget_history = '変更内容';
-    $lang->widget_info = 'ウィジェット情報';
-    $lang->widget_code = 'コード';
-    $lang->widget_cache = 'キャッシュ';
-
-    $lang->widget_fix_width = '横幅固定';
-    $lang->widget_width = '縦幅サイズ';
-    $lang->widget_position = 'ポジッション';
-    $lang->widget_position_none = '改行';
-    $lang->widget_position_left = '左へ';
-    $lang->widget_position_right = '右へ';
-    $lang->widget_margin = '余白';
-    $lang->widget_margin_top = '上';
-    $lang->widget_margin_right = '右';
-    $lang->widget_margin_bottom = '下 ';
-    $lang->widget_margin_left= '左';
-    $lang->about_widget_fix_width = 'チェックすると横幅が固定されます。';
-    $lang->about_widget_width = '縦幅サイズを選択して下さい。';
-    $lang->about_widget_position = '一つのラインに多数のウィジェットを羅列したい場合は、ポジッションを選択して下さい。';
-    $lang->about_widget_margin = '一つのラインに多数のウィジェットを羅列したい場合は、ポジッションを選択して下さい。';
-    $lang->about_widget_cache = '指定された時間内にキャッシュされたデータが利用出来ます。';
-
-    $lang->generated_code = '生成コード';
-    $lang->widgetstyle= 'ウィジェットスタイル';
-
-    $lang->msg_widget_is_not_exists = '%s ウィジェットが見つかりません。';
-    $lang->msg_widget_object_is_null = '%s ウィジェットのオブジェクトが生成出来ません。';
-    $lang->msg_widget_proc_is_null = '%s ウィセットの proc() が実行出来ません。';
-    $lang->msg_widget_skin_is_null = 'ウィセットスキンを選択してから正常に動作します。';
-
-    $lang->about_widget_code = '選択されたウィゼットで求められる下の項目の値を入力し、「コード生成」ボタンをクリックすると、<br />一番下にテンプレートファイルに適用出来るコードが出力されます。';
-    $lang->about_widget_code_in_page = '下に必要な値を入力した後、追加ボタンをクリックするとページ内にウィジェットが挿入されます。';
-    $lang->about_widget = "ウィジェットまたはページモジュールに用いられる単体の構成要素です。内部モジュールまたは外部のOPEN API と連動が出来、設定によって様々な応用が可能です。XEのページモジュールまたはレイアウトモジュールを使用しなくても、「コード生成」機能で直接ウィジェットも追加出来ます。";
-
-    $lang->cmd_content_insert = '内容直接追加';
-    $lang->cmd_box_widget_insert = 'ボックスウィジェット追加';
-    $lang->cmd_remove_all_widgets  = 'すべての内容削除';
-
-    $lang->cmd_widget_size = 'ウィジェットの大きさ';
-    $lang->cmd_widget_align = 'ウィジェット整列';
-    $lang->cmd_widget_align_left = '左へ';
-    $lang->cmd_widget_align_right = '右へ';
-    $lang->cmd_widget_margin = '外部余白';
-    $lang->cmd_widget_padding = '内部余白';
-    $lang->cmd_widget_border = 'ウィジェットボーダー';
-    $lang->cmd_widget_border_solid = '実線';
-    $lang->cmd_widget_border_dotted = '点線';
-    $lang->cmd_widget_background_color = '背景色';
-    $lang->cmd_widget_background_image_url = '背景イメージ';
-    $lang->cmd_widget_background_image_repeat = '繰り返す';
-    $lang->cmd_widget_background_image_no_repeat = '固定';
-    $lang->cmd_widget_background_image_x_repeat = '横の繰り返し';
-    $lang->cmd_widget_background_image_y_repeat = '縦の繰り返し';
-    $lang->cmd_widget_background_image_x = '横の位置';
-    $lang->cmd_widget_background_image_y = '縦の位置';
-?>
diff --git a/modules/widget/lang/ko.lang.php b/modules/widget/lang/ko.lang.php
deleted file mode 100644
index c74e3c9b3..000000000
--- a/modules/widget/lang/ko.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/ko.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  위젯(widget) 모듈의 기본 언어팩
-     **/
-
-    $lang->cmd_generate_code = '코드생성';
-
-    $lang->widget_name = '위젯 이름';
-    $lang->widget_maker = '위젯 제작자';
-    $lang->widget_license = '라이선스';
-    $lang->widget_history = '변경 이력';
-    $lang->widget_info = '위젯 정보';
-    $lang->widget_code = '코드';
-    $lang->widget_cache = '캐시';
-
-    $lang->widget_fix_width = '크기 고정';
-    $lang->widget_width = '가로 길이';
-    $lang->widget_position = '위치';
-    $lang->widget_position_none = '줄 바꿈';
-    $lang->widget_position_left = '왼쪽';
-    $lang->widget_position_right = '오른쪽';
-    $lang->widget_margin = '외부 여백';
-    $lang->widget_margin_top = '위';
-    $lang->widget_margin_right = '오른쪽';
-    $lang->widget_margin_bottom = '아래 ';
-    $lang->widget_margin_left= '왼쪽';
-    $lang->about_widget_fix_width = '선택하시면 가로 길이가 고정됩니다.';
-    $lang->about_widget_width = '가로 길이를 입력해주세요.';
-    $lang->about_widget_position = '한 줄에 여러 개의 위젯을 나열하고 싶을 때는 위치를 선택해주세요.';
-    $lang->about_widget_margin = '지정된 위젯의 상하좌우 여백을 지정할 수 있습니다.';
-    $lang->about_widget_cache = '지정된 시간동안 캐시된 데이터를 이용할 수 있습니다.';
-
-    $lang->generated_code = '생성된 코드';
-    $lang->widgetstyle= '위젯스타일';
-
-    $lang->msg_widget_is_not_exists = '%s 위젯을 찾을 수 없습니다.';
-    $lang->msg_widget_object_is_null = '%s 위젯의 객체 생성을 할 수 없습니다.';
-    $lang->msg_widget_proc_is_null = '%s 위젯의 proc() 를 실행할 수 없습니다.';
-    $lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다.';
-
-    $lang->about_widget_code = '선택하신 위젯에서 요구하는 아래 항목들의 값을 넣고 [코드생성]버튼을 누르시면 제일 아래 칸에 템플릿 파일에 적용할 수 있는 코드가 출력 됩니다.';
-    $lang->about_widget_code_in_page = '아래 필요한 값들을 입력하신 후 추가 버튼을 누르시면 페이지 내에 위젯이 삽입됩니다.';
-    $lang->about_widget = "위젯은 레이아웃이나 페이지 모듈에서 사용되는 작은 구성요소입니다.\n위젯은 내부 모듈 또는 외부 open api와 연동될 수도 있고, 설정을 통해 다양하게 응용될 수 있습니다.\nXE의 페이지 모듈이나 레이아웃 모듈을 사용하지 않더라도 [코드생성] 기능을 통해 직접 위젯 추가도 할 수 있습니다.";
-
-    $lang->cmd_content_insert = '내용 직접 추가';
-    $lang->cmd_box_widget_insert = '상자 위젯 추가';
-    $lang->cmd_remove_all_widgets  = '내용 모두 지우기';
-
-    $lang->cmd_widget_size = '위젯 크기';
-    $lang->cmd_widget_align = '위젯 정렬';
-    $lang->cmd_widget_align_left = '왼쪽';
-    $lang->cmd_widget_align_right = '오른쪽';
-    $lang->cmd_widget_margin = '외부 여백';
-    $lang->cmd_widget_padding = '내부 여백';
-    $lang->cmd_widget_border = '위젯 테두리';
-    $lang->cmd_widget_border_solid = '실선';
-    $lang->cmd_widget_border_dotted = '점선';
-    $lang->cmd_widget_background_color = '배경색';
-    $lang->cmd_widget_background_image_url = '배경 이미지';
-    $lang->cmd_widget_background_image_repeat = '반복';
-    $lang->cmd_widget_background_image_no_repeat = '고정';
-    $lang->cmd_widget_background_image_x_repeat = '가로 반복';
-    $lang->cmd_widget_background_image_y_repeat = '세로 반복';
-    $lang->cmd_widget_background_image_x = '가로 위치';
-    $lang->cmd_widget_background_image_y = '세로 위치';
-?>
diff --git a/modules/widget/lang/lang.xml b/modules/widget/lang/lang.xml
new file mode 100644
index 000000000..5a10c94f4
--- /dev/null
+++ b/modules/widget/lang/lang.xml
@@ -0,0 +1,625 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<lang>
+	<item name="cmd_generate_code">
+		<value xml:lang="ko"><![CDATA[코드생성]]></value>
+		<value xml:lang="en"><![CDATA[Generate Code]]></value>
+		<value xml:lang="jp"><![CDATA[コード生成]]></value>
+		<value xml:lang="zh-CN"><![CDATA[生成代码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[建立原始碼]]></value>
+		<value xml:lang="fr"><![CDATA[Générer le Code]]></value>
+		<value xml:lang="ru"><![CDATA[Генерировать код]]></value>
+		<value xml:lang="es"><![CDATA[Generar Código]]></value>
+		<value xml:lang="tr"><![CDATA[Kod Üret]]></value>
+		<value xml:lang="vi"><![CDATA[Tạo Code]]></value>
+	</item>
+	<item name="widget_name">
+		<value xml:lang="ko"><![CDATA[위젯 이름]]></value>
+		<value xml:lang="en"><![CDATA[Widget Name]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェット名]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件名称]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget名稱]]></value>
+		<value xml:lang="fr"><![CDATA[Nom de Gadget]]></value>
+		<value xml:lang="ru"><![CDATA[Имя виджета]]></value>
+		<value xml:lang="es"><![CDATA[Nombre de Widget]]></value>
+		<value xml:lang="tr"><![CDATA[Widget Adı]]></value>
+		<value xml:lang="vi"><![CDATA[Tên Widget]]></value>
+	</item>
+	<item name="widget_maker">
+		<value xml:lang="ko"><![CDATA[위젯 제작자]]></value>
+		<value xml:lang="en"><![CDATA[Developer]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェット作者]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件作者]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget作者]]></value>
+		<value xml:lang="fr"><![CDATA[Développeur]]></value>
+		<value xml:lang="ru"><![CDATA[Разработчик виджета]]></value>
+		<value xml:lang="es"><![CDATA[Desarrollador de Widget]]></value>
+		<value xml:lang="tr"><![CDATA[Geliştirici]]></value>
+		<value xml:lang="vi"><![CDATA[Người tạo]]></value>
+	</item>
+	<item name="widget_license">
+		<value xml:lang="ko"><![CDATA[라이선스]]></value>
+		<value xml:lang="en"><![CDATA[License]]></value>
+		<value xml:lang="jp"><![CDATA[ライセンス]]></value>
+		<value xml:lang="zh-CN"><![CDATA[版权]]></value>
+		<value xml:lang="zh-TW"><![CDATA[版權]]></value>
+		<value xml:lang="fr"><![CDATA[Licence]]></value>
+		<value xml:lang="tr"><![CDATA[Lisans]]></value>
+		<value xml:lang="vi"><![CDATA[Giấy phép]]></value>
+	</item>
+	<item name="widget_history">
+		<value xml:lang="ko"><![CDATA[변경 이력]]></value>
+		<value xml:lang="en"><![CDATA[Update History]]></value>
+		<value xml:lang="jp"><![CDATA[変更内容]]></value>
+		<value xml:lang="zh-CN"><![CDATA[更新事项]]></value>
+		<value xml:lang="zh-TW"><![CDATA[更新紀錄]]></value>
+		<value xml:lang="fr"><![CDATA[Histoire de Mise à jours]]></value>
+		<value xml:lang="ru"><![CDATA[История обновлений]]></value>
+		<value xml:lang="es"><![CDATA[Actualizar la historia]]></value>
+		<value xml:lang="tr"><![CDATA[Güncelleme Tarihi]]></value>
+		<value xml:lang="vi"><![CDATA[Lịch sử cập nhật]]></value>
+	</item>
+	<item name="widget_info">
+		<value xml:lang="ko"><![CDATA[위젯 정보]]></value>
+		<value xml:lang="en"><![CDATA[Widget Info]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェット情報]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件信息]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget資料]]></value>
+		<value xml:lang="fr"><![CDATA[Information de Gadget]]></value>
+		<value xml:lang="ru"><![CDATA[Информация виджета]]></value>
+		<value xml:lang="es"><![CDATA[información de Widget]]></value>
+		<value xml:lang="tr"><![CDATA[Widget Bilgileri]]></value>
+		<value xml:lang="vi"><![CDATA[Thông tin Widget]]></value>
+	</item>
+	<item name="widget_code">
+		<value xml:lang="ko"><![CDATA[코드]]></value>
+		<value xml:lang="en"><![CDATA[Code]]></value>
+		<value xml:lang="jp"><![CDATA[コード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[代码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[原始碼]]></value>
+		<value xml:lang="ru"><![CDATA[Код]]></value>
+		<value xml:lang="es"><![CDATA[Código]]></value>
+		<value xml:lang="tr"><![CDATA[Kod]]></value>
+	</item>
+	<item name="widget_cache">
+		<value xml:lang="ko"><![CDATA[캐시]]></value>
+		<value xml:lang="en"><![CDATA[Cache]]></value>
+		<value xml:lang="jp"><![CDATA[キャッシュ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[缓冲]]></value>
+		<value xml:lang="zh-TW"><![CDATA[暫存]]></value>
+		<value xml:lang="fr"><![CDATA[Antémémoire]]></value>
+		<value xml:lang="ru"><![CDATA[Кеш]]></value>
+		<value xml:lang="tr"><![CDATA[Önbellek]]></value>
+		<value xml:lang="vi"><![CDATA[Bộ nhớ đệm]]></value>
+	</item>
+	<item name="widget_fix_width">
+		<value xml:lang="ko"><![CDATA[크기 고정]]></value>
+		<value xml:lang="en"><![CDATA[Fix Width]]></value>
+		<value xml:lang="jp"><![CDATA[横幅固定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[固定大小]]></value>
+		<value xml:lang="zh-TW"><![CDATA[固定大小]]></value>
+		<value xml:lang="fr"><![CDATA[Fixer Largeur]]></value>
+		<value xml:lang="ru"><![CDATA[Фиксированная ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho permanente]]></value>
+		<value xml:lang="tr"><![CDATA[Düzeltme Genişliği]]></value>
+		<value xml:lang="vi"><![CDATA[Cố định chiều rộng]]></value>
+	</item>
+	<item name="widget_width">
+		<value xml:lang="ko"><![CDATA[가로 길이]]></value>
+		<value xml:lang="en"><![CDATA[Width]]></value>
+		<value xml:lang="jp"><![CDATA[縦幅サイズ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[宽度]]></value>
+		<value xml:lang="zh-TW"><![CDATA[寬度]]></value>
+		<value xml:lang="fr"><![CDATA[Largeur]]></value>
+		<value xml:lang="ru"><![CDATA[Ширина]]></value>
+		<value xml:lang="es"><![CDATA[Ancho]]></value>
+		<value xml:lang="tr"><![CDATA[Genişlik]]></value>
+		<value xml:lang="vi"><![CDATA[Chiều rộng]]></value>
+	</item>
+	<item name="widget_position">
+		<value xml:lang="ko"><![CDATA[위치]]></value>
+		<value xml:lang="en"><![CDATA[Position]]></value>
+		<value xml:lang="jp"><![CDATA[ポジション]]></value>
+		<value xml:lang="zh-CN"><![CDATA[位置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[位置]]></value>
+		<value xml:lang="ru"><![CDATA[Позиция]]></value>
+		<value xml:lang="es"><![CDATA[Posición]]></value>
+		<value xml:lang="tr"><![CDATA[Konum]]></value>
+		<value xml:lang="vi"><![CDATA[Vị trí]]></value>
+	</item>
+	<item name="widget_position_none">
+		<value xml:lang="ko"><![CDATA[줄 바꿈]]></value>
+		<value xml:lang="en"><![CDATA[Next Line]]></value>
+		<value xml:lang="jp"><![CDATA[改行]]></value>
+		<value xml:lang="zh-CN"><![CDATA[换行]]></value>
+		<value xml:lang="zh-TW"><![CDATA[換行]]></value>
+		<value xml:lang="fr"><![CDATA[Ligne suivante]]></value>
+		<value xml:lang="ru"><![CDATA[Следующая строка]]></value>
+		<value xml:lang="es"><![CDATA[Próxima línea]]></value>
+		<value xml:lang="tr"><![CDATA[Sonraki Hat]]></value>
+		<value xml:lang="vi"><![CDATA[Dòng tiếp theo]]></value>
+	</item>
+	<item name="widget_position_left">
+		<value xml:lang="ko"><![CDATA[왼쪽]]></value>
+		<value xml:lang="en"><![CDATA[Left]]></value>
+		<value xml:lang="jp"><![CDATA[左へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠左對齊]]></value>
+		<value xml:lang="fr"><![CDATA[Gauche]]></value>
+		<value xml:lang="ru"><![CDATA[Лево]]></value>
+		<value xml:lang="es"><![CDATA[Izquierdo]]></value>
+		<value xml:lang="tr"><![CDATA[Sol]]></value>
+		<value xml:lang="vi"><![CDATA[Trái]]></value>
+	</item>
+	<item name="widget_position_right">
+		<value xml:lang="ko"><![CDATA[오른쪽]]></value>
+		<value xml:lang="en"><![CDATA[Right]]></value>
+		<value xml:lang="jp"><![CDATA[右へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠右對齊]]></value>
+		<value xml:lang="fr"><![CDATA[Droite]]></value>
+		<value xml:lang="ru"><![CDATA[Право]]></value>
+		<value xml:lang="es"><![CDATA[Derecho]]></value>
+		<value xml:lang="tr"><![CDATA[Sağ]]></value>
+		<value xml:lang="vi"><![CDATA[Phải]]></value>
+	</item>
+	<item name="widget_margin">
+		<value xml:lang="ko"><![CDATA[외부 여백]]></value>
+		<value xml:lang="en"><![CDATA[Margin]]></value>
+		<value xml:lang="jp"><![CDATA[余白]]></value>
+		<value xml:lang="zh-CN"><![CDATA[边距]]></value>
+		<value xml:lang="zh-TW"><![CDATA[邊距]]></value>
+		<value xml:lang="fr"><![CDATA[Marge]]></value>
+		<value xml:lang="ru"><![CDATA[Поля]]></value>
+		<value xml:lang="es"><![CDATA[Márgen]]></value>
+		<value xml:lang="tr"><![CDATA[Kenar boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề]]></value>
+	</item>
+	<item name="widget_margin_top">
+		<value xml:lang="ko"><![CDATA[위]]></value>
+		<value xml:lang="en"><![CDATA[Top Margin]]></value>
+		<value xml:lang="jp"><![CDATA[上]]></value>
+		<value xml:lang="zh-CN"><![CDATA[上]]></value>
+		<value xml:lang="zh-TW"><![CDATA[上]]></value>
+		<value xml:lang="fr"><![CDATA[Marge en tête]]></value>
+		<value xml:lang="ru"><![CDATA[Верхнее поле]]></value>
+		<value xml:lang="es"><![CDATA[Márgen superior]]></value>
+		<value xml:lang="tr"><![CDATA[Üst-Kenar Boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề trên]]></value>
+	</item>
+	<item name="widget_margin_right">
+		<value xml:lang="ko"><![CDATA[오른쪽]]></value>
+		<value xml:lang="en"><![CDATA[Right Margin]]></value>
+		<value xml:lang="jp"><![CDATA[右]]></value>
+		<value xml:lang="zh-CN"><![CDATA[右]]></value>
+		<value xml:lang="zh-TW"><![CDATA[右]]></value>
+		<value xml:lang="fr"><![CDATA[Marge à droite]]></value>
+		<value xml:lang="ru"><![CDATA[Правое поле]]></value>
+		<value xml:lang="es"><![CDATA[Márgen derecho]]></value>
+		<value xml:lang="tr"><![CDATA[Sağ-Kenar Boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề phải]]></value>
+	</item>
+	<item name="widget_margin_bottom">
+		<value xml:lang="ko"><![CDATA[아래 ]]></value>
+		<value xml:lang="en"><![CDATA[Bottom Margin]]></value>
+		<value xml:lang="jp"><![CDATA[下 ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[下]]></value>
+		<value xml:lang="zh-TW"><![CDATA[下]]></value>
+		<value xml:lang="fr"><![CDATA[Marge en pied]]></value>
+		<value xml:lang="ru"><![CDATA[Шижнее поле]]></value>
+		<value xml:lang="es"><![CDATA[Márgen inferior]]></value>
+		<value xml:lang="tr"><![CDATA[Alt-Kenar Boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề dưới]]></value>
+	</item>
+	<item name="widget_margin_left">
+		<value xml:lang="ko"><![CDATA[왼쪽]]></value>
+		<value xml:lang="en"><![CDATA[Left Margin]]></value>
+		<value xml:lang="jp"><![CDATA[左]]></value>
+		<value xml:lang="zh-CN"><![CDATA[左]]></value>
+		<value xml:lang="zh-TW"><![CDATA[左]]></value>
+		<value xml:lang="fr"><![CDATA[Marge à gauche]]></value>
+		<value xml:lang="ru"><![CDATA[Левое поле]]></value>
+		<value xml:lang="es"><![CDATA[Márgen izquierdo]]></value>
+		<value xml:lang="tr"><![CDATA[Sol-Kenar Boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề trái]]></value>
+	</item>
+	<item name="about_widget_fix_width">
+		<value xml:lang="ko"><![CDATA[선택하시면 가로 길이가 고정됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Check this to fix the width.]]></value>
+		<value xml:lang="jp"><![CDATA[チェックを入れると横幅が固定されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[选择此项将固定控件显示宽度。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[選擇此項將固定Widget顯示寬度。]]></value>
+		<value xml:lang="fr"><![CDATA[Cochez pour fixer la largeur, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, установите для фиксирования ширины.]]></value>
+		<value xml:lang="es"><![CDATA[Si selecciona esta opción el ancho será permanente.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen genişliği düzeltmeyi kontrol ediniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy kiểm tra để cố định chiều rộng.]]></value>
+	</item>
+	<item name="about_widget_width">
+		<value xml:lang="ko"><![CDATA[가로 길이를 입력해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please set width for the widget.]]></value>
+		<value xml:lang="jp"><![CDATA[縦幅サイズを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请输入宽度大小。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請輸入寬度大小。]]></value>
+		<value xml:lang="fr"><![CDATA[Configurez la largeur du gadget, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, установите ширину виджета.]]></value>
+		<value xml:lang="es"><![CDATA[Ingrese el ancho de Widget.]]></value>
+		<value xml:lang="tr"><![CDATA[Lütfen widgetın genişliğini ayarlayınız.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy đặt chiều rộng cho Widget.]]></value>
+	</item>
+	<item name="about_widget_position">
+		<value xml:lang="ko"><![CDATA[한 줄에 여러 개의 위젯을 나열하고 싶을 때는 위치를 선택해주세요.]]></value>
+		<value xml:lang="en"><![CDATA[Please select the position if you want to display many widgets on one line.]]></value>
+		<value xml:lang="jp"><![CDATA[一行に多数のウィジェットを並べたい場合は、ポジションを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[想要横向显示多个控件时，请选择位置。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[想要橫向顯示多個Widget時，請選擇位置。]]></value>
+		<value xml:lang="fr"><![CDATA[Choisissez la position si vous voulez représenter plusieurs gadgets dans une ligne, S.V.P.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, выберите позицию виджета, если Вы хотите отобразить несколько виджетов в одной строке.]]></value>
+		<value xml:lang="es"><![CDATA[Selecciona la posición si desea mostra más widgets en una línea.]]></value>
+		<value xml:lang="tr"><![CDATA[Tek bir satırda birkaç widget görüntülemek istiyorsanız, lütfen konumlarını seçiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy chọn vị trí nếu bạn muốn nhiều Widget cùng hiển thị.]]></value>
+	</item>
+	<item name="about_widget_margin">
+		<value xml:lang="ko"><![CDATA[지정된 위젯의 상하좌우 여백을 지정할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You may set the top, bottom, right or left margins for the widget.]]></value>
+		<value xml:lang="jp"><![CDATA[一行に多数のウィジェットを並べたい場合は、ポジションを選択してください。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[想要横向显示多个控件时，请设置边距。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[想要橫向顯示多個Widget時，請設置邊距。]]></value>
+		<value xml:lang="fr"><![CDATA[Vous pouvez désigner la marge de gadget 'de tête, en pied, à droite et à gauche.]]></value>
+		<value xml:lang="ru"><![CDATA[Вы можете установить поля виждета, т.е. его отступы со всех четырех сторон.]]></value>
+		<value xml:lang="es"><![CDATA[Uste puede ingresar el márgen de los widgets : superior, inferior, derecho e izquierdo.]]></value>
+		<value xml:lang="tr"><![CDATA[Widgetların üst, alt, sağ ve sol kenar boşluklarını belirleyebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn có thể đặt lề của Widget: Trái, Phải, Trên, Dưới.]]></value>
+	</item>
+	<item name="about_widget_cache">
+		<value xml:lang="ko"><![CDATA[지정된 시간동안 캐시된 데이터를 이용할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Cached data can be used during the time you have set.]]></value>
+		<value xml:lang="jp"><![CDATA[指定時間にキャッシュされたデータを利用できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[指定的时间内可以利用已缓冲的数据。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[指定的時間內可以利用已暫存的資料。]]></value>
+		<value xml:lang="fr"><![CDATA[Les données d'antémémoire peuvent être utilisées pendant le temps que vous désignez.]]></value>
+		<value xml:lang="ru"><![CDATA[Кешированные данные будут использоваться на указанный срок.]]></value>
+		<value xml:lang="es"><![CDATA[Se puede usar datos de caché creado durante el tiempo asignado.]]></value>
+		<value xml:lang="tr"><![CDATA[Önbelleğe alınmış veriler, ayarlamış olduğunuz süre içinde kullanılabilir.]]></value>
+		<value xml:lang="vi"><![CDATA[Bộ nhớ đệm của Data có thể được sử dụng nếu bạn đặt thời gian cho nó.]]></value>
+	</item>
+	<item name="generated_code">
+		<value xml:lang="ko"><![CDATA[생성된 코드]]></value>
+		<value xml:lang="en"><![CDATA[Generated Code]]></value>
+		<value xml:lang="jp"><![CDATA[生成コード]]></value>
+		<value xml:lang="zh-CN"><![CDATA[已生成的代码]]></value>
+		<value xml:lang="zh-TW"><![CDATA[已建立的原始碼]]></value>
+		<value xml:lang="fr"><![CDATA[Code généré]]></value>
+		<value xml:lang="ru"><![CDATA[Сгенерированный код]]></value>
+		<value xml:lang="es"><![CDATA[Generar códigos]]></value>
+		<value xml:lang="tr"><![CDATA[Üretilmiş Kod]]></value>
+		<value xml:lang="vi"><![CDATA[Đã tạo Code]]></value>
+	</item>
+	<item name="widgetstyle">
+		<value xml:lang="ko"><![CDATA[위젯스타일]]></value>
+		<value xml:lang="en"><![CDATA[Widget Style]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェットスタイル]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件样式]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget樣式]]></value>
+		<value xml:lang="tr"><![CDATA[Widget Tarzı]]></value>
+		<value xml:lang="vi"><![CDATA[Kiểu dáng Widget]]></value>
+	</item>
+	<item name="msg_widget_is_not_exists">
+		<value xml:lang="ko"><![CDATA[%s 위젯을 찾을 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA['%s' does not exist.]]></value>
+		<value xml:lang="jp"><![CDATA[%s ウィジェットが見つかりません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[找不到%s控件！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[找不到 %s Widget！]]></value>
+		<value xml:lang="fr"><![CDATA[Le Gadget de(d') '%s' n'existe pas.]]></value>
+		<value xml:lang="ru"><![CDATA[%s виджет не существует.]]></value>
+		<value xml:lang="es"><![CDATA[No existe widget %s .]]></value>
+		<value xml:lang="tr"><![CDATA['%s' bulunmuyot.]]></value>
+		<value xml:lang="vi"><![CDATA['%s' không tồn tại.]]></value>
+	</item>
+	<item name="msg_widget_object_is_null">
+		<value xml:lang="ko"><![CDATA[%s 위젯의 객체 생성을 할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[Object of '%s' could not be created.]]></value>
+		<value xml:lang="jp"><![CDATA[%s ウィジェットのオブジェクトが生成できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[无法生成%s控件对象！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法建立 %s Widget目標！]]></value>
+		<value xml:lang="fr"><![CDATA[L'Objet de '%s' n'a pas pu être créé.]]></value>
+		<value xml:lang="ru"><![CDATA[%s объектов виджета не могут быть созданы.]]></value>
+		<value xml:lang="es"><![CDATA[No puede ser creado el objeto de widget %s.]]></value>
+		<value xml:lang="tr"><![CDATA[ '%s' nesnesi oluşturulamadı.]]></value>
+		<value xml:lang="vi"><![CDATA[Đối tượng của '%s' đã không được tạo.]]></value>
+	</item>
+	<item name="msg_widget_proc_is_null">
+		<value xml:lang="ko"><![CDATA[%s 위젯의 proc() 를 실행할 수 없습니다.]]></value>
+		<value xml:lang="en"><![CDATA[proc() of '%s' could not be executed.]]></value>
+		<value xml:lang="jp"><![CDATA[%s ウィジェットの proc()を実行できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[不能执行%s控件的 proc()！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[無法執行 %s Widget的 proc()！]]></value>
+		<value xml:lang="fr"><![CDATA[proc() de '%s' n'a pas pu être exécuté.]]></value>
+		<value xml:lang="ru"><![CDATA[proc() %s виджета не может быть исполнена.]]></value>
+		<value xml:lang="es"><![CDATA[No puede ser ejecutado el proc() de widget %s.]]></value>
+		<value xml:lang="tr"><![CDATA[ '%s' işlemi tamamlanamadı.]]></value>
+		<value xml:lang="vi"><![CDATA[proc() của '%s' đã không được thực hiện.]]></value>
+	</item>
+	<item name="msg_widget_skin_is_null">
+		<value xml:lang="ko"><![CDATA[위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[You should select widget's skin.]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェットスキンを選択しないと正常に動作できません。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[请选择控件皮肤！]]></value>
+		<value xml:lang="zh-TW"><![CDATA[請選擇一個可正常使用的Widget面板]]></value>
+		<value xml:lang="fr"><![CDATA[위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다]]></value>
+		<value xml:lang="ru"><![CDATA[위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다]]></value>
+		<value xml:lang="es"><![CDATA[위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다]]></value>
+		<value xml:lang="tr"><![CDATA[Widgetın dış görünümünü belirlemelisiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Bạn cần phải chọn Skin cho Widget.]]></value>
+	</item>
+	<item name="about_widget_code">
+		<value xml:lang="ko"><![CDATA[선택하신 위젯에서 요구하는 아래 항목들의 값을 넣고 [코드생성]버튼을 누르시면 제일 아래 칸에 템플릿 파일에 적용할 수 있는 코드가 출력 됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[Please input the required value first, and click [Generate Code] button to generate the code for adding to the template file.]]></value>
+		<value xml:lang="jp"><![CDATA[選択したウィジェットで要求する下記項目の値を入力し、「コード生成」ボタンをクリックすると、<br />一番下にテンプレートファイルに適用できるコードが出力されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入所选控件所需要的下列各项后，按『代码生成』按钮，即可在页面下方获得可以用在布局模版代码片断。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入所選Widget所需要的各項資料後，按『建立原始碼』按鈕，即可在頁面下方獲得運用在版面設計中的部分原始碼。]]></value>
+		<value xml:lang="fr"><![CDATA[Entrez les valeurs qui sont requises par le gadget choisi, et puis cliquz le bouton [Générer le Code] pour générer le code. Le code à appliquer au fichier de modèl se présentera en bas.]]></value>
+		<value xml:lang="ru"><![CDATA[Пожалуйста, сначала введите требуемые значения, и затем щелкните кнопку [Генерировать Код] для генерации кода и добавления его в файл шаблона.]]></value>
+		<value xml:lang="es"><![CDATA[Ingrese primero los valores requeridos, luego presiona el botón "Generar códigos" para mostrar el código en el espacio inferior para ser añadido en el archivo de los temas.]]></value>
+		<value xml:lang="tr"><![CDATA[Kod üretip şablon dosyaya eklemek için lütfen ilk olarak gerekli değeri girin ve ardından [Kod Üret]e tıklayın.]]></value>
+		<value xml:lang="vi"><![CDATA[Hãy nhập các thông tin cần thiết, sau đó bấm nút [<b>Tạo Code</b>] để lấy Code thêm vào giao diện.]]></value>
+	</item>
+	<item name="about_widget_code_in_page">
+		<value xml:lang="ko"><![CDATA[아래 필요한 값들을 입력하신 후 추가 버튼을 누르시면 페이지 내에 위젯이 삽입됩니다.]]></value>
+		<value xml:lang="en"><![CDATA[After entering the required values, click the [Add] button to insert the widget code into the page.]]></value>
+		<value xml:lang="jp"><![CDATA[下記に必要な値を入力した後、追加ボタンをクリックするとページ内にウィジェットが挿入されます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[输入下列各项必要值后，按『生成代码』按钮，即可把控件插入到页面当中。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[輸入下列各項必要資料後，按『建立原始碼』按鈕，即可把Widget插入到頁面當中。]]></value>
+		<value xml:lang="fr"><![CDATA[Après entrer les valeurs requies, cliquez le bouton [Ajouter] pour insérer le gadjet dans la page.]]></value>
+		<value xml:lang="ru"><![CDATA[После ввода требуемых значений, нажмите пнопку [Добавить], чтобы вставить код виджета в страницу.]]></value>
+		<value xml:lang="es"><![CDATA[Luego de ingresar los valores requeridos, presiona el botón "Añadir" para insertar el código de widget dentro de la página.]]></value>
+		<value xml:lang="tr"><![CDATA[Gerekli değerleri girdikten sonra widget kodunu sayfaya eklemek için [Ekle]ye tıklayın.]]></value>
+		<value xml:lang="vi"><![CDATA[Sau khi nhập những thông tin cần thiết, bấm nút [<b>Tạo Code</b>] để chèn Code của Widget vào giao diện.]]></value>
+	</item>
+	<item name="about_widget">
+		<value xml:lang="ko"><![CDATA[위젯은 레이아웃이나 페이지 모듈에서 사용되는 작은 구성요소입니다.
+위젯은 내부 모듈 또는 외부 open api와 연동될 수도 있고, 설정을 통해 다양하게 응용될 수 있습니다.
+XE의 페이지 모듈이나 레이아웃 모듈을 사용하지 않더라도 [코드생성] 기능을 통해 직접 위젯 추가도 할 수 있습니다.]]></value>
+		<value xml:lang="en"><![CDATA[A widget is a small free-standing application used in a layout or page module.
+ It can be linked with internal module or external Open API. Through its configuration setting, wide application is possible. 
+ You can directly add a widget by using the [Generate Code] function without using the XE page module or layout module.]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェット、またはページモジュールに用いられる単体の構成要素です。内部モジュールまたは外部のOPEN API と連動ができ、設定によって様々な応用が可能です。XEのページモジュールまたはレイアウトモジュールを使用しなくても、「コード生成」機能で直接ウィジェットも追加できます。]]></value>
+		<value xml:lang="zh-CN"><![CDATA[控件是在布局或页面模块中使用的一种小部件。
+不仅可以关联内部模块或外部open api，而且通过设置可以用在多种用途。
+即使不使用XE的页面模块或布局模块，也可以通过『代码生成』功能直接可以添加相应控件。]]></value>
+		<value xml:lang="zh-TW"><![CDATA[Widget是在版面或頁面模組中使用的一種元件。
+不僅可以連結內部模組或外部Open API，而且通過設置可以有許多種用途。
+即使不使用XE的頁面或版面設計模組，也可以通過『建立原始碼』功能直接新增相對應Widget。]]></value>
+		<value xml:lang="fr"><![CDATA[Un gadjet est un petit application indépendant qui est utilisé dans une Mise en Page ou dans une module de Page. Un gajet peut être lié avec un module intérieur ou avec un API extérieur ouvert. L'application divers est possible par la configuration. 
+Vous pouvez directement ajouter un gadget en utilisant la fonction [Générer le Code] sans utiliser un module de Page de XE ni un module de Mise en Page.]]></value>
+		<value xml:lang="es"><![CDATA[Un Widget es una pequena aplicación para ser usados en los diseños o en el módulo de páginas.
+ Puede ser enlazados con un módulo interno o con open api externo y con la configuración de ella puede utilizar en variadas aplicaciones.
+Sin la necesidad de utilizar los módulos de página o del diseño de XE, Usted puede directamente añadir un widget usando la función de [Generar Códigos].]]></value>
+		<value xml:lang="tr"><![CDATA[Widget, yerleşim düzeninde veya sayfa modülünde kullanılan küçük bir serbest uygulamadır.
+ Dahili modüle bağlanabileceği gibi, harici açık apilerle de bağlantı kurabilir. Yapılandırma ayarları yoluyla, geniş bir uygulama alanı vardır. 
+  [Kod Üret] fonksiyonunu kullanarak, XE sayfa modülüne veya yerleşim düzeni modülüne ihtiyaç duymadan widget ekleyebilirsiniz.]]></value>
+		<value xml:lang="vi"><![CDATA[Widget là một ứng dụng nhỏ có thể đặt ở bất kì vị trí nào do người dùng lựa chọn.<br />Nó có thể kết nối với những Module trong Website hay Open API bên ngoài và hiển thị nội dung của Module đó.<br />Thông qua sự thiết lập cấu hình, nó có thể là một ứng dụng rộng dãi.<br />Bạn có thể thêm một Widget bằng cách bấm nút [<b>Tạo Code</b>] để lấy Code thêm vào một Module hay trang nào đó.]]></value>
+	</item>
+	<item name="cmd_content_insert">
+		<value xml:lang="ko"><![CDATA[내용 직접 추가]]></value>
+		<value xml:lang="en"><![CDATA[Insert Content by Yourself]]></value>
+		<value xml:lang="jp"><![CDATA[内容追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加内容]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增內容]]></value>
+		<value xml:lang="fr"><![CDATA[Insérer le Contenu par vous-même]]></value>
+		<value xml:lang="es"><![CDATA[Introduzca contenido por ti mismo]]></value>
+		<value xml:lang="tr"><![CDATA[İçeriği kendiniz ekleyin.]]></value>
+		<value xml:lang="vi"><![CDATA[Chèn nội dung của bạn]]></value>
+	</item>
+	<item name="cmd_box_widget_insert">
+		<value xml:lang="ko"><![CDATA[상자 위젯 추가]]></value>
+		<value xml:lang="en"><![CDATA[Insert Box Widget]]></value>
+		<value xml:lang="jp"><![CDATA[ボックスウィジェット追加]]></value>
+		<value xml:lang="zh-CN"><![CDATA[添加控件盒]]></value>
+		<value xml:lang="zh-TW"><![CDATA[新增Widget Box]]></value>
+		<value xml:lang="fr"><![CDATA[Insérer le Gadget de Boîte]]></value>
+		<value xml:lang="es"><![CDATA[Insertar cuadro de widget]]></value>
+		<value xml:lang="tr"><![CDATA[Kutu widgetını ekleyin.]]></value>
+		<value xml:lang="vi"><![CDATA[Chèn khung Widget]]></value>
+	</item>
+	<item name="cmd_remove_all_widgets">
+		<value xml:lang="ko"><![CDATA[내용 모두 지우기]]></value>
+		<value xml:lang="en"><![CDATA[Remove All Widgets]]></value>
+		<value xml:lang="jp"><![CDATA[すべての内容削除]]></value>
+		<value xml:lang="zh-CN"><![CDATA[清空内容]]></value>
+		<value xml:lang="zh-TW"><![CDATA[全部清空]]></value>
+		<value xml:lang="fr"><![CDATA[Enlever Tous les Gadgets]]></value>
+		<value xml:lang="es"><![CDATA[Eliminar todos los reproductores]]></value>
+		<value xml:lang="tr"><![CDATA[Tüm widgetları kaldır.]]></value>
+		<value xml:lang="vi"><![CDATA[Xóa tất cả Widget]]></value>
+	</item>
+	<item name="cmd_widget_size">
+		<value xml:lang="ko"><![CDATA[위젯 크기]]></value>
+		<value xml:lang="en"><![CDATA[Widget Size]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェットの大きさ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[大小]]></value>
+		<value xml:lang="zh-TW"><![CDATA[大小]]></value>
+		<value xml:lang="fr"><![CDATA[Taille du Gadget]]></value>
+		<value xml:lang="es"><![CDATA[Tamaño artilugio]]></value>
+		<value xml:lang="tr"><![CDATA[Widget Boyutu]]></value>
+		<value xml:lang="vi"><![CDATA[Kích thước]]></value>
+	</item>
+	<item name="cmd_widget_align">
+		<value xml:lang="ko"><![CDATA[위젯 정렬]]></value>
+		<value xml:lang="en"><![CDATA[Align Widget]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェット整列]]></value>
+		<value xml:lang="zh-CN"><![CDATA[对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[對齊]]></value>
+		<value xml:lang="fr"><![CDATA[Alignement des Gadget]]></value>
+		<value xml:lang="es"><![CDATA[Alinear Widget]]></value>
+		<value xml:lang="tr"><![CDATA[Hizalama Widgetı]]></value>
+		<value xml:lang="vi"><![CDATA[Căn chỉnh]]></value>
+	</item>
+	<item name="cmd_widget_align_left">
+		<value xml:lang="ko"><![CDATA[왼쪽]]></value>
+		<value xml:lang="en"><![CDATA[Left]]></value>
+		<value xml:lang="jp"><![CDATA[左へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[左对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠左]]></value>
+		<value xml:lang="fr"><![CDATA[Gauche]]></value>
+		<value xml:lang="es"><![CDATA[Izquierda]]></value>
+		<value xml:lang="tr"><![CDATA[Sol]]></value>
+		<value xml:lang="vi"><![CDATA[Trái]]></value>
+	</item>
+	<item name="cmd_widget_align_right">
+		<value xml:lang="ko"><![CDATA[오른쪽]]></value>
+		<value xml:lang="en"><![CDATA[Right]]></value>
+		<value xml:lang="jp"><![CDATA[右へ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[右对齐]]></value>
+		<value xml:lang="zh-TW"><![CDATA[靠右]]></value>
+		<value xml:lang="fr"><![CDATA[Droite]]></value>
+		<value xml:lang="es"><![CDATA[Derecho]]></value>
+		<value xml:lang="tr"><![CDATA[Sağ]]></value>
+		<value xml:lang="vi"><![CDATA[Phải]]></value>
+	</item>
+	<item name="cmd_widget_margin">
+		<value xml:lang="ko"><![CDATA[외부 여백]]></value>
+		<value xml:lang="en"><![CDATA[Margin]]></value>
+		<value xml:lang="jp"><![CDATA[外部余白]]></value>
+		<value xml:lang="zh-CN"><![CDATA[外边距]]></value>
+		<value xml:lang="zh-TW"><![CDATA[邊距]]></value>
+		<value xml:lang="fr"><![CDATA[Marge]]></value>
+		<value xml:lang="es"><![CDATA[Margen]]></value>
+		<value xml:lang="tr"><![CDATA[Kenar Boşluğu]]></value>
+		<value xml:lang="vi"><![CDATA[Lề]]></value>
+	</item>
+	<item name="cmd_widget_padding">
+		<value xml:lang="ko"><![CDATA[내부 여백]]></value>
+		<value xml:lang="en"><![CDATA[Padding]]></value>
+		<value xml:lang="jp"><![CDATA[内部余白]]></value>
+		<value xml:lang="zh-CN"><![CDATA[内填充]]></value>
+		<value xml:lang="zh-TW"><![CDATA[內距]]></value>
+		<value xml:lang="fr"><![CDATA[Remplissage]]></value>
+		<value xml:lang="es"><![CDATA[Relleno]]></value>
+		<value xml:lang="tr"><![CDATA[Dolgu]]></value>
+		<value xml:lang="vi"><![CDATA[Đệm]]></value>
+	</item>
+	<item name="cmd_widget_border">
+		<value xml:lang="ko"><![CDATA[위젯 테두리]]></value>
+		<value xml:lang="en"><![CDATA[Border]]></value>
+		<value xml:lang="jp"><![CDATA[ウィジェットボーダー]]></value>
+		<value xml:lang="zh-CN"><![CDATA[边框]]></value>
+		<value xml:lang="zh-TW"><![CDATA[邊框]]></value>
+		<value xml:lang="fr"><![CDATA[Bordure]]></value>
+		<value xml:lang="es"><![CDATA[Frontera]]></value>
+		<value xml:lang="tr"><![CDATA[Sınır]]></value>
+		<value xml:lang="vi"><![CDATA[Viền]]></value>
+	</item>
+	<item name="cmd_widget_border_solid">
+		<value xml:lang="ko"><![CDATA[실선]]></value>
+		<value xml:lang="en"><![CDATA[Solid]]></value>
+		<value xml:lang="jp"><![CDATA[実線]]></value>
+		<value xml:lang="zh-CN"><![CDATA[实线]]></value>
+		<value xml:lang="zh-TW"><![CDATA[實線]]></value>
+		<value xml:lang="fr"><![CDATA[Solide]]></value>
+		<value xml:lang="es"><![CDATA[Sólidos]]></value>
+		<value xml:lang="tr"><![CDATA[Kesiksiz]]></value>
+		<value xml:lang="vi"><![CDATA[Viền liền]]></value>
+	</item>
+	<item name="cmd_widget_border_dotted">
+		<value xml:lang="ko"><![CDATA[점선]]></value>
+		<value xml:lang="en"><![CDATA[Dotted]]></value>
+		<value xml:lang="jp"><![CDATA[点線]]></value>
+		<value xml:lang="zh-CN"><![CDATA[点线]]></value>
+		<value xml:lang="zh-TW"><![CDATA[虛線]]></value>
+		<value xml:lang="fr"><![CDATA[Pointillé]]></value>
+		<value xml:lang="es"><![CDATA[Salpicando]]></value>
+		<value xml:lang="tr"><![CDATA[Noktalı]]></value>
+		<value xml:lang="vi"><![CDATA[Viền chấm]]></value>
+	</item>
+	<item name="cmd_widget_background_color">
+		<value xml:lang="ko"><![CDATA[배경색]]></value>
+		<value xml:lang="en"><![CDATA[Background Color]]></value>
+		<value xml:lang="jp"><![CDATA[背景色]]></value>
+		<value xml:lang="zh-CN"><![CDATA[背景色]]></value>
+		<value xml:lang="zh-TW"><![CDATA[背景顏色]]></value>
+		<value xml:lang="fr"><![CDATA[Couleur d'arrière-plan]]></value>
+		<value xml:lang="es"><![CDATA[Color de fondo]]></value>
+		<value xml:lang="tr"><![CDATA[Arkaplan Rengi]]></value>
+		<value xml:lang="vi"><![CDATA[Màu nền]]></value>
+	</item>
+	<item name="cmd_widget_background_image_url">
+		<value xml:lang="ko"><![CDATA[배경 이미지]]></value>
+		<value xml:lang="en"><![CDATA[Background Image]]></value>
+		<value xml:lang="jp"><![CDATA[背景イメージ]]></value>
+		<value xml:lang="zh-CN"><![CDATA[背景图片]]></value>
+		<value xml:lang="zh-TW"><![CDATA[背景圖片]]></value>
+		<value xml:lang="fr"><![CDATA[Image d'arrière-plan]]></value>
+		<value xml:lang="es"><![CDATA[Imagen de fondo]]></value>
+		<value xml:lang="tr"><![CDATA[Arkaplan Resmi]]></value>
+		<value xml:lang="vi"><![CDATA[Hình nền]]></value>
+	</item>
+	<item name="cmd_widget_background_image_repeat">
+		<value xml:lang="ko"><![CDATA[반복]]></value>
+		<value xml:lang="en"><![CDATA[Repeat]]></value>
+		<value xml:lang="jp"><![CDATA[繰り返す]]></value>
+		<value xml:lang="zh-CN"><![CDATA[平铺]]></value>
+		<value xml:lang="zh-TW"><![CDATA[重複]]></value>
+		<value xml:lang="fr"><![CDATA[Répéter]]></value>
+		<value xml:lang="es"><![CDATA[Repita]]></value>
+		<value xml:lang="tr"><![CDATA[Tekrar et]]></value>
+		<value xml:lang="vi"><![CDATA[Lặp lại]]></value>
+	</item>
+	<item name="cmd_widget_background_image_no_repeat">
+		<value xml:lang="ko"><![CDATA[고정]]></value>
+		<value xml:lang="en"><![CDATA[No Repeat]]></value>
+		<value xml:lang="jp"><![CDATA[固定]]></value>
+		<value xml:lang="zh-CN"><![CDATA[固定]]></value>
+		<value xml:lang="zh-TW"><![CDATA[不重複]]></value>
+		<value xml:lang="fr"><![CDATA[Ne pas répéter]]></value>
+		<value xml:lang="es"><![CDATA[No Repetir]]></value>
+		<value xml:lang="tr"><![CDATA[Tekrar yok.]]></value>
+		<value xml:lang="vi"><![CDATA[Không lặp]]></value>
+	</item>
+	<item name="cmd_widget_background_image_x_repeat">
+		<value xml:lang="ko"><![CDATA[가로 반복]]></value>
+		<value xml:lang="en"><![CDATA[X Repeat]]></value>
+		<value xml:lang="jp"><![CDATA[横の繰り返し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[横向平铺]]></value>
+		<value xml:lang="zh-TW"><![CDATA[水平重複]]></value>
+		<value xml:lang="fr"><![CDATA[X Répéter]]></value>
+		<value xml:lang="es"><![CDATA[Repita X]]></value>
+		<value xml:lang="tr"><![CDATA[X Tekrar]]></value>
+		<value xml:lang="vi"><![CDATA[Lặp chiều X]]></value>
+	</item>
+	<item name="cmd_widget_background_image_y_repeat">
+		<value xml:lang="ko"><![CDATA[세로 반복]]></value>
+		<value xml:lang="en"><![CDATA[Y Repeat]]></value>
+		<value xml:lang="jp"><![CDATA[縦の繰り返し]]></value>
+		<value xml:lang="zh-CN"><![CDATA[纵向平铺]]></value>
+		<value xml:lang="zh-TW"><![CDATA[垂直重複]]></value>
+		<value xml:lang="fr"><![CDATA[Y Répéter]]></value>
+		<value xml:lang="es"><![CDATA[Repita Y]]></value>
+		<value xml:lang="tr"><![CDATA[Y Tekrar]]></value>
+		<value xml:lang="vi"><![CDATA[Lặp chiều Y]]></value>
+	</item>
+	<item name="cmd_widget_background_image_x">
+		<value xml:lang="ko"><![CDATA[가로 위치]]></value>
+		<value xml:lang="en"><![CDATA[X Position]]></value>
+		<value xml:lang="jp"><![CDATA[横の位置]]></value>
+		<value xml:lang="zh-CN"><![CDATA[水平位置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[水平位置]]></value>
+		<value xml:lang="es"><![CDATA[Posición X]]></value>
+		<value xml:lang="tr"><![CDATA[X Konum]]></value>
+		<value xml:lang="vi"><![CDATA[Vị trí X]]></value>
+	</item>
+	<item name="cmd_widget_background_image_y">
+		<value xml:lang="ko"><![CDATA[세로 위치]]></value>
+		<value xml:lang="en"><![CDATA[Y Position]]></value>
+		<value xml:lang="jp"><![CDATA[縦の位置]]></value>
+		<value xml:lang="zh-CN"><![CDATA[垂直位置]]></value>
+		<value xml:lang="zh-TW"><![CDATA[垂直位置]]></value>
+		<value xml:lang="es"><![CDATA[Posición Y]]></value>
+		<value xml:lang="tr"><![CDATA[Y Konum]]></value>
+		<value xml:lang="vi"><![CDATA[Vị trí Y]]></value>
+	</item>
+	<item name="installed_widget">
+		<value xml:lang="ko"><![CDATA[설치된 위젯]]></value>
+		<value xml:lang="en"><![CDATA[Installed Widget]]></value>
+		<value xml:lang="jp"><![CDATA[インストールされたウィジェット]]></value>
+	</item>
+</lang>
diff --git a/modules/widget/lang/ru.lang.php b/modules/widget/lang/ru.lang.php
deleted file mode 100644
index 00084bfad..000000000
--- a/modules/widget/lang/ru.lang.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-  /**
-     * @file   ru.lang.php
-     * @author NHN (developers@xpressengine.com) | translation by Maslennikov Evgeny aka X-[Vr]bL1s5 | e-mail: x-bliss[a]tut.by; ICQ: 225035467;
-     * @brief  Russian basic language pack
-     **/
-
-    $lang->cmd_generate_code = 'Генерировать код';
-
-    $lang->widget_name = 'Имя виджета';
-    $lang->widget_maker = 'Разработчик виджета';
-    $lang->widget_license = 'License';
-    $lang->widget_history = 'История обновлений';
-    $lang->widget_info = 'Информация виджета';
-    $lang->widget_code = 'Код';
-    $lang->widget_cache = 'Кеш';
-
-    $lang->widget_fix_width = 'Фиксированная ширина';
-    $lang->widget_width = 'Ширина';
-    $lang->widget_position = 'Позиция';
-    $lang->widget_position_none = 'Следующая строка';
-    $lang->widget_position_left = 'Лево';
-    $lang->widget_position_right = 'Право';
-    $lang->widget_margin = 'Поля';
-    $lang->widget_margin_top = 'Верхнее поле';
-    $lang->widget_margin_right = 'Правое поле';
-    $lang->widget_margin_bottom = 'Шижнее поле';
-    $lang->widget_margin_left= 'Левое поле';
-    $lang->about_widget_fix_width = 'Пожалуйста, установите для фиксирования ширины.';
-    $lang->about_widget_width = 'Пожалуйста, установите ширину виджета.';
-    $lang->about_widget_position = 'Пожалуйста, выберите позицию виджета, если Вы хотите отобразить несколько виджетов в одной строке.';
-    $lang->about_widget_margin = "Вы можете установить поля виждета, т.е. его отступы со всех четырех сторон.";
-    $lang->about_widget_cache = 'Кешированные данные будут использоваться на указанный срок.';
-
-    $lang->generated_code = 'Сгенерированный код';
-    $lang->widgetstyle= '위젯스타일';
-
-    $lang->msg_widget_is_not_exists = '%s виджет не существует.';
-    $lang->msg_widget_object_is_null = '%s объектов виджета не могут быть созданы.';
-    $lang->msg_widget_proc_is_null = 'proc() %s виджета не может быть исполнена.';
-    $lang->msg_widget_skin_is_null = '위젯의 스킨을 선택해 주셔야 정상적으로 동작할 수 있습니다';
-
-    $lang->about_widget_code = 'Пожалуйста, сначала введите требуемые значения, и затем щелкните кнопку [Генерировать Код] для генерации кода и добавления его в файл шаблона.';
-    $lang->about_widget_code_in_page = 'После ввода требуемых значений, нажмите пнопку [Добавить], чтобы вставить код виджета в страницу.';
-    $lang->about_addon = "Виджет -- это маленькая самостоятельная программа, используемая в лейауте или модуле страниц.\n Он может быть связан с внутренним модулем или внешними открытыми API. Посредством его детального конфигурирования можно добиться широкого его применения. \n Вы можете напрямую добавить виджет, используя функцию генерирования кода без использования модулей страниц или лейаутов XE.";
-?>
diff --git a/modules/widget/lang/tr.lang.php b/modules/widget/lang/tr.lang.php
deleted file mode 100644
index ba35b6419..000000000
--- a/modules/widget/lang/tr.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/en.lang.php
-     * @author NHN (developers@xpressengine.com)
-     * @brief  widget module- basic language pack
-     **/
-
-    $lang->cmd_generate_code = 'Kod Üret';
-
-    $lang->widget_name = 'Widget Adı';
-    $lang->widget_maker = 'Geliştirici';
-    $lang->widget_license = 'Lisans';
-    $lang->widget_history = 'Güncelleme Tarihi';
-    $lang->widget_info = 'Widget Bilgileri';
-    $lang->widget_code = 'Kod';
-    $lang->widget_cache = 'Önbellek';
-
-    $lang->widget_fix_width = 'Düzeltme Genişliği';
-    $lang->widget_width = 'Genişlik';
-    $lang->widget_position = 'Konum';
-    $lang->widget_position_none = 'Sonraki Hat';
-    $lang->widget_position_left = 'Sol';
-    $lang->widget_position_right = 'Sağ';
-    $lang->widget_margin = 'Kenar boşluğu';
-    $lang->widget_margin_top = 'Üst-Kenar Boşluğu';
-    $lang->widget_margin_right = 'Sağ-Kenar Boşluğu';
-    $lang->widget_margin_bottom = 'Alt-Kenar Boşluğu';
-    $lang->widget_margin_left= 'Sol-Kenar Boşluğu';
-    $lang->about_widget_fix_width = 'Lütfen genişliği düzeltmeyi kontrol ediniz.';
-    $lang->about_widget_width = 'Lütfen widgetın genişliğini ayarlayınız.';
-    $lang->about_widget_position = 'Tek bir satırda birkaç widget görüntülemek istiyorsanız, lütfen konumlarını seçiniz.';
-    $lang->about_widget_margin = "Widgetların üst, alt, sağ ve sol kenar boşluklarını belirleyebilirsiniz.";
-    $lang->about_widget_cache = 'Önbelleğe alınmış veriler, ayarlamış olduğunuz süre içinde kullanılabilir.';
-
-    $lang->generated_code = 'Üretilmiş Kod';
-    $lang->widgetstyle= 'Widget Tarzı';
-
-    $lang->msg_widget_is_not_exists = "'%s' bulunmuyot.";
-    $lang->msg_widget_object_is_null = " '%s' nesnesi oluşturulamadı.";
-    $lang->msg_widget_proc_is_null = " '%s' işlemi tamamlanamadı.";
-    $lang->msg_widget_skin_is_null = "Widgetın dış görünümünü belirlemelisiniz.";
-
-    $lang->about_widget_code = 'Kod üretip şablon dosyaya eklemek için lütfen ilk olarak gerekli değeri girin ve ardından [Kod Üret]e tıklayın.';
-    $lang->about_widget_code_in_page = 'Gerekli değerleri girdikten sonra widget kodunu sayfaya eklemek için [Ekle]ye tıklayın.';
-    $lang->about_widget = "Widget, yerleşim düzeninde veya sayfa modülünde kullanılan küçük bir serbest uygulamadır.\n Dahili modüle bağlanabileceği gibi, harici açık apilerle de bağlantı kurabilir. Yapılandırma ayarları yoluyla, geniş bir uygulama alanı vardır. \n  [Kod Üret] fonksiyonunu kullanarak, XE sayfa modülüne veya yerleşim düzeni modülüne ihtiyaç duymadan widget ekleyebilirsiniz.";
-
-    $lang->cmd_content_insert = "İçeriği kendiniz ekleyin.";
-    $lang->cmd_box_widget_insert = "Kutu widgetını ekleyin.";
-    $lang->cmd_remove_all_widgets  = "Tüm widgetları kaldır.";
-
-    $lang->cmd_widget_size = "Widget Boyutu";
-    $lang->cmd_widget_align = "Hizalama Widgetı";
-    $lang->cmd_widget_align_left = "Sol";
-    $lang->cmd_widget_align_right = "Sağ";
-    $lang->cmd_widget_margin = "Kenar Boşluğu";
-    $lang->cmd_widget_padding = "Dolgu";
-    $lang->cmd_widget_border = "Sınır";
-    $lang->cmd_widget_border_solid = "Kesiksiz";
-    $lang->cmd_widget_border_dotted = "Noktalı";
-    $lang->cmd_widget_background_color = "Arkaplan Rengi";
-    $lang->cmd_widget_background_image_url = "Arkaplan Resmi";
-    $lang->cmd_widget_background_image_repeat = "Tekrar et";
-    $lang->cmd_widget_background_image_no_repeat = "Tekrar yok.";
-    $lang->cmd_widget_background_image_x_repeat = "X Tekrar";
-    $lang->cmd_widget_background_image_y_repeat = "Y Tekrar";
-    $lang->cmd_widget_background_image_x = "X Konum";
-    $lang->cmd_widget_background_image_y = "Y Konum";
-?>
diff --git a/modules/widget/lang/vi.lang.php b/modules/widget/lang/vi.lang.php
deleted file mode 100644
index 526b45209..000000000
--- a/modules/widget/lang/vi.lang.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/*			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
-			░░  * @File   :  common/lang/vi.lang.php                                              ░░
-			░░  * @Author :  NHN (developers@xpressengine.com)                                                 ░░
-			░░  * @Trans  :  Đào Đức Duy (ducduy.dao.vn@vietxe.net)								  ░░
-			░░	* @Website:  http://vietxe.net													  ░░
-			░░  * @Brief  :  Vietnamese Language Pack (Only basic words are included here)        ░░
-			░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░	   		*/
-
-    $lang->cmd_generate_code = 'Tạo Code';
-
-    $lang->widget_name = 'Tên Widget';
-    $lang->widget_maker = 'Người tạo';
-    $lang->widget_license = 'Giấy phép';
-    $lang->widget_history = 'Lịch sử cập nhật';
-    $lang->widget_info = 'Thông tin Widget';
-    $lang->widget_code = 'Code';
-    $lang->widget_cache = 'Bộ nhớ đệm';
-
-    $lang->widget_fix_width = 'Cố định chiều rộng';
-    $lang->widget_width = 'Chiều rộng';
-    $lang->widget_position = 'Vị trí';
-    $lang->widget_position_none = 'Dòng tiếp theo';
-    $lang->widget_position_left = 'Trái';
-    $lang->widget_position_right = 'Phải';
-    $lang->widget_margin = 'Lề';
-    $lang->widget_margin_top = 'Lề trên';
-    $lang->widget_margin_right = 'Lề phải';
-    $lang->widget_margin_bottom = 'Lề dưới';
-    $lang->widget_margin_left= 'Lề trái';
-    $lang->about_widget_fix_width = 'Hãy kiểm tra để cố định chiều rộng.';
-    $lang->about_widget_width = 'Hãy đặt chiều rộng cho Widget.';
-    $lang->about_widget_position = 'Hãy chọn vị trí nếu bạn muốn nhiều Widget cùng hiển thị.';
-    $lang->about_widget_margin = "Bạn có thể đặt lề của Widget: Trái, Phải, Trên, Dưới.";
-    $lang->about_widget_cache = 'Bộ nhớ đệm của Data có thể được sử dụng nếu bạn đặt thời gian cho nó.';
-
-    $lang->generated_code = 'Đã tạo Code';
-    $lang->widgetstyle= 'Kiểu dáng Widget';
-
-    $lang->msg_widget_is_not_exists = "'%s' không tồn tại.";
-    $lang->msg_widget_object_is_null = "Đối tượng của '%s' đã không được tạo.";
-    $lang->msg_widget_proc_is_null = "proc() của '%s' đã không được thực hiện.";
-    $lang->msg_widget_skin_is_null = "Bạn cần phải chọn Skin cho Widget.";
-
-    $lang->about_widget_code = 'Hãy nhập các thông tin cần thiết, sau đó bấm nút [<b>Tạo Code</b>] để lấy Code thêm vào giao diện.';
-    $lang->about_widget_code_in_page = 'Sau khi nhập những thông tin cần thiết, bấm nút [<b>Tạo Code</b>] để chèn Code của Widget vào giao diện.';
-    $lang->about_widget = "Widget là một ứng dụng nhỏ có thể đặt ở bất kì vị trí nào do người dùng lựa chọn.<br />Nó có thể kết nối với những Module trong Website hay Open API bên ngoài và hiển thị nội dung của Module đó.<br />Thông qua sự thiết lập cấu hình, nó có thể là một ứng dụng rộng dãi.<br />Bạn có thể thêm một Widget bằng cách bấm nút [<b>Tạo Code</b>] để lấy Code thêm vào một Module hay trang nào đó.";
-
-    $lang->cmd_content_insert = "Chèn nội dung của bạn";
-    $lang->cmd_box_widget_insert = "Chèn khung Widget";
-    $lang->cmd_remove_all_widgets  = "Xóa tất cả Widget";
-
-    $lang->cmd_widget_size = "Kích thước";
-    $lang->cmd_widget_align = "Căn chỉnh";
-    $lang->cmd_widget_align_left = "Trái";
-    $lang->cmd_widget_align_right = "Phải";
-    $lang->cmd_widget_margin = "Lề";
-    $lang->cmd_widget_padding = "Đệm";
-    $lang->cmd_widget_border = "Viền";
-    $lang->cmd_widget_border_solid = "Viền liền";
-    $lang->cmd_widget_border_dotted = "Viền chấm";
-    $lang->cmd_widget_background_color = "Màu nền";
-    $lang->cmd_widget_background_image_url = "Hình nền";
-    $lang->cmd_widget_background_image_repeat = "Lặp lại";
-    $lang->cmd_widget_background_image_no_repeat = "Không lặp";
-    $lang->cmd_widget_background_image_x_repeat = "Lặp chiều X";
-    $lang->cmd_widget_background_image_y_repeat = "Lặp chiều Y";
-    $lang->cmd_widget_background_image_x = "Vị trí X";
-    $lang->cmd_widget_background_image_y = "Vị trí Y";
-?>
diff --git a/modules/widget/lang/zh-CN.lang.php b/modules/widget/lang/zh-CN.lang.php
deleted file mode 100644
index 839532425..000000000
--- a/modules/widget/lang/zh-CN.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/zh-CN.lang.php
-     * @author NHN (developers@xpressengine.com) 翻译：guny
-     * @brief  控件(widget)模块简体中文语言包
-     **/
-
-    $lang->cmd_generate_code = '生成代码';
-
-    $lang->widget_name = '控件名称';
-    $lang->widget_maker = '控件作者';
-    $lang->widget_license = '版权';
-    $lang->widget_history = '更新事项';
-    $lang->widget_info = '控件信息';
-    $lang->widget_code = '代码';
-    $lang->widget_cache = '缓冲';
-
-    $lang->widget_fix_width = '固定大小';
-    $lang->widget_width = '宽度';
-    $lang->widget_position = '位置';
-    $lang->widget_position_none = '换行';
-    $lang->widget_position_left = '左对齐';
-    $lang->widget_position_right = '右对齐';
-    $lang->widget_margin = '边距';
-    $lang->widget_margin_top = '上';
-    $lang->widget_margin_right = '右';
-    $lang->widget_margin_bottom = '下';
-    $lang->widget_margin_left= '左';
-    $lang->about_widget_fix_width = '选择此项将固定控件显示宽度。';
-    $lang->about_widget_width = '请输入宽度大小。';
-    $lang->about_widget_position = '想要横向显示多个控件时，请选择位置。';
-    $lang->about_widget_margin = '想要横向显示多个控件时，请设置边距。';
-    $lang->about_widget_cache = '指定的时间内可以利用已缓冲的数据。';
-
-    $lang->generated_code = '已生成的代码';
-    $lang->widgetstyle= '控件样式';
-
-    $lang->msg_widget_is_not_exists = '找不到%s控件！';
-    $lang->msg_widget_object_is_null = '无法生成%s控件对象！';
-    $lang->msg_widget_proc_is_null = '不能执行%s控件的 proc()！';
-    $lang->msg_widget_skin_is_null = '请选择控件皮肤！';
-
-    $lang->about_widget_code = '输入所选控件所需要的下列各项后，按『代码生成』按钮，即可在页面下方获得可以用在布局模版代码片断。';
-    $lang->about_widget_code_in_page = '输入下列各项必要值后，按『生成代码』按钮，即可把控件插入到页面当中。';
-    $lang->about_widget = "控件是在布局或页面模块中使用的一种小部件。\n不仅可以关联内部模块或外部open api，而且通过设置可以用在多种用途。\n即使不使用XE的页面模块或布局模块，也可以通过『代码生成』功能直接可以添加相应控件。";
-
-    $lang->cmd_content_insert = "添加内容";
-    $lang->cmd_box_widget_insert = "添加控件盒";
-    $lang->cmd_remove_all_widgets  = "清空内容";
-
-    $lang->cmd_widget_size = "大小";
-    $lang->cmd_widget_align = "对齐";
-    $lang->cmd_widget_align_left = "左对齐";
-    $lang->cmd_widget_align_right = "右对齐";
-    $lang->cmd_widget_margin = "外边距";
-    $lang->cmd_widget_padding = "内填充";
-    $lang->cmd_widget_border = "边框";
-    $lang->cmd_widget_border_solid = "实线";
-    $lang->cmd_widget_border_dotted = "点线";
-    $lang->cmd_widget_background_color = "背景色";
-    $lang->cmd_widget_background_image_url = "背景图片";
-    $lang->cmd_widget_background_image_repeat = "平铺";
-    $lang->cmd_widget_background_image_no_repeat = "固定";
-    $lang->cmd_widget_background_image_x_repeat = "横向平铺";
-    $lang->cmd_widget_background_image_y_repeat = "纵向平铺";
-    $lang->cmd_widget_background_image_x = "水平位置";
-    $lang->cmd_widget_background_image_y = "垂直位置";
-?>
diff --git a/modules/widget/lang/zh-TW.lang.php b/modules/widget/lang/zh-TW.lang.php
deleted file mode 100644
index 0ed694451..000000000
--- a/modules/widget/lang/zh-TW.lang.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-    /**
-     * @file   modules/widget/lang/zh-TW.lang.php
-     * @author NHN (developers@xpressengine.com) 翻譯：royallin
-     * @brief  Widget模組正體中文語言
-     **/
-
-    $lang->cmd_generate_code = '建立原始碼';
-
-    $lang->widget_name = 'Widget名稱';
-    $lang->widget_maker = 'Widget作者';
-    $lang->widget_license = '版權';
-    $lang->widget_history = '更新紀錄';
-    $lang->widget_info = 'Widget資料';
-    $lang->widget_code = '原始碼';
-    $lang->widget_cache = '暫存';
-
-    $lang->widget_fix_width = '固定大小';
-    $lang->widget_width = '寬度';
-    $lang->widget_position = '位置';
-    $lang->widget_position_none = '換行';
-    $lang->widget_position_left = '靠左對齊';
-    $lang->widget_position_right = '靠右對齊';
-    $lang->widget_margin = '邊距';
-    $lang->widget_margin_top = '上';
-    $lang->widget_margin_right = '右';
-    $lang->widget_margin_bottom = '下';
-    $lang->widget_margin_left= '左';
-    $lang->about_widget_fix_width = '選擇此項將固定Widget顯示寬度。';
-    $lang->about_widget_width = '請輸入寬度大小。';
-    $lang->about_widget_position = '想要橫向顯示多個Widget時，請選擇位置。';
-    $lang->about_widget_margin = '想要橫向顯示多個Widget時，請設置邊距。';
-    $lang->about_widget_cache = '指定的時間內可以利用已暫存的資料。';
-
-    $lang->generated_code = '已建立的原始碼';
-    $lang->widgetstyle= 'Widget樣式';
-
-    $lang->msg_widget_is_not_exists = '找不到 %s Widget！';
-    $lang->msg_widget_object_is_null = '無法建立 %s Widget目標！';
-    $lang->msg_widget_proc_is_null = '無法執行 %s Widget的 proc()！';
-    $lang->msg_widget_skin_is_null = '請選擇一個可正常使用的Widget面板';
-
-    $lang->about_widget_code = '輸入所選Widget所需要的各項資料後，按『建立原始碼』按鈕，即可在頁面下方獲得運用在版面設計中的部分原始碼。';
-    $lang->about_widget_code_in_page = '輸入下列各項必要資料後，按『建立原始碼』按鈕，即可把Widget插入到頁面當中。';
-    $lang->about_widget = "Widget是在版面或頁面模組中使用的一種元件。\n不僅可以連結內部模組或外部Open API，而且通過設置可以有許多種用途。\n即使不使用XE的頁面或版面設計模組，也可以通過『建立原始碼』功能直接新增相對應Widget。";
-
-    $lang->cmd_content_insert = "新增內容";
-    $lang->cmd_box_widget_insert = "新增Widget Box";
-    $lang->cmd_remove_all_widgets  = "全部清空";
-
-    $lang->cmd_widget_size = "大小";
-    $lang->cmd_widget_align = "對齊";
-    $lang->cmd_widget_align_left = "靠左";
-    $lang->cmd_widget_align_right = "靠右";
-    $lang->cmd_widget_margin = "邊距";
-    $lang->cmd_widget_padding = "內距";
-    $lang->cmd_widget_border = "邊框";
-    $lang->cmd_widget_border_solid = "實線";
-    $lang->cmd_widget_border_dotted = "虛線";
-    $lang->cmd_widget_background_color = "背景顏色";
-    $lang->cmd_widget_background_image_url = "背景圖片";
-    $lang->cmd_widget_background_image_repeat = "重複";
-    $lang->cmd_widget_background_image_no_repeat = "不重複";
-    $lang->cmd_widget_background_image_x_repeat = "水平重複";
-    $lang->cmd_widget_background_image_y_repeat = "垂直重複";
-    $lang->cmd_widget_background_image_x = "水平位置";
-    $lang->cmd_widget_background_image_y = "垂直位置";
-?>
diff --git a/modules/widget/tpl/add_content_widget.html b/modules/widget/tpl/add_content_widget.html
index f2f273a76..f030ec001 100644
--- a/modules/widget/tpl/add_content_widget.html
+++ b/modules/widget/tpl/add_content_widget.html
@@ -1,35 +1,33 @@
-<!--%import("js/widget.js")-->
-<!--%import("css/widget.css")-->
+<load target="js/widget.js" usecdn="true" />
+<load target="css/widget.css" usecdn="true" />
 
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->cmd_content_insert}</h3>
-</div>
+<div class="x" style="padding: 0 10px;">
 
-<form action="./" method="get" onsubmit="return addContentWidget(this); return false;" id="content_fo">
-<input type="hidden" name="content" value="{$oDocument->getContentText()}" />
-<input type="hidden" name="mid" value="{$module_info->mid}" />
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="document_srl" value="{$document_srl}" />
-<input type="hidden" name="style" value="float:left;padding:none;margin:none;width:100%;" />
-<input type="hidden" name="widget_padding_left" value="" />
-<input type="hidden" name="widget_padding_right" value="" />
-<input type="hidden" name="widget_padding_top" value="" />
-<input type="hidden" name="widget_padding_bottom" value="" />
+	<h2 class="h2">{$lang->cmd_content_insert}</h2>
 
-<div id="popBody">
-    <div class="pageAddContent"></div>
+	<form action="./" method="get" onsubmit="return addContentWidget(this); return false;" id="content_fo">
+		<input type="hidden" name="content" value="{$oDocument->getContentText()}" />
+		<input type="hidden" name="mid" value="{$module_info->mid}" />
+		<input type="hidden" name="module_srl" value="{$module_srl}" />
+		<input type="hidden" name="document_srl" value="{$document_srl}" />
+		<input type="hidden" name="style" value="float:left;padding:none;margin:none;width:100%;" />
+		<input type="hidden" name="widget_padding_left" value="" />
+		<input type="hidden" name="widget_padding_right" value="" />
+		<input type="hidden" name="widget_padding_top" value="" />
+		<input type="hidden" name="widget_padding_bottom" value="" />
 
-        <div class="editor">
-            {$editor}
-        </div>
+		<div class="pageAddContent"></div>
 
-    <script type="text/javascript">
-        xAddEventListener(window, 'load', doSyncPageContent);
-    </script>
-</div>
+		<div class="editor">
+			{$editor}
+		</div>
 
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" class="editor_button" accesskey="s" /></span>
-</div>
+		<script type="text/javascript">
+			xAddEventListener(window, 'load', doSyncPageContent);
+		</script>
 
-</form>
+		<div class="btnArea">
+			<span class="btn small"><input type="submit" value="{$lang->cmd_save}" class="editor_button" accesskey="s" /></span>
+		</div>
+	</form>
+</div>
\ No newline at end of file
diff --git a/modules/widget/tpl/css/widget.css b/modules/widget/tpl/css/widget.css
index 8a46287c3..d75c195c1 100644
--- a/modules/widget/tpl/css/widget.css
+++ b/modules/widget/tpl/css/widget.css
@@ -1,62 +1,50 @@
-@charset "utf-8";
-
-.widget_title { border:1px solid #DDDDDD; margin:10px 5px 5px 0; padding:3px; }
-.widget_mid_list { margin:0 0 5px 10px; }
-.widget_description { color:#AAAAAA; border-top:1px dotted #EEEEEE; margin:5px 0 0 0; padding:5px 0 0 0; }
-#colorset_area { margin-top:.5em; }
-
-#colorset_area .header { float:left; margin-right:.5em; padding-top:.2em;}
-#colorset_area .footer { float:left; }
-
-#zonePageContent { overflow:hidden; width:100%; padding:none !important; margin:none !important;}
-
-.pageAddContent { width:700px; }
-
-.widgetOutput { float:left; cursor:move; z-index:998; overflow:hidden; position:relative; width:100%; }
-
-.widgetOutput .widgetBorder { border:1px solid #C7DBE9; z-index:999; }
-.widgetOutput .widgetBoxBorder { border:1px solid #D2E9C7; z-index:999; }
-
-.widgetOutput .widgetResize { background:transparent url("../images/btn_resize.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:1px; right:1px; cursor:pointer; z-index:1000;}
-.widgetOutput .widgetResizeLeft { background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:0; left:1px; cursor:pointer; z-index:1000;}
-.widgetOutput .widgetBoxResize { background:transparent url("../images/btn_resize.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:1px; right:1px; cursor:pointer; z-index:1000;}
-.widgetOutput .widgetBoxResizeLeft { background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom; width:12px; height:12px; position:absolute; bottom:0; left:1px; cursor:pointer; z-index:1000;}
-
-.widgetButtons { z-index:9999; overflow:hidden; *zoom:1; float:left; padding:3px; position:absolute; visibility:hidden;}
-#widgetButton { background-color:#C7DBE9;left:0; top:0;}
-#widgetBoxButton { background-color:#D2E9C7; right:0; top:0;}
-.widgetButtons div { float:left; }
-.widgetButtons .widgetStyle { background:transparent url("../images/widgetstyle_setup.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
-.widgetButtons .widgetSetup { background:transparent url("../images/widget_setup.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
-.widgetButtons .widgetCopy { background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
-.widgetButtons .widgetSize { background:transparent url("../images/widget_size.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
-.widgetButtons .widgetRemove { background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px; width:14px; height:14px;  cursor:pointer; z-index:1000;}
-.widgetButtons .widgetBoxCopy { background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px; width:14px; height:14px; cursor:pointer; z-index:1000;}
-.widgetButtons .widgetBoxSize { background:transparent url("../images/widget_size.gif") no-repeat 1px 1px; width:14px; height:14px; cursor:pointer; z-index:1000;}
-.widgetButtons .widgetBoxRemove { background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px; width:14px; height:14px; cursor:pointer; z-index:1000;}
-
-#pageSizeLayer { width:500px; overflow:hidden; border:1px solid #888888; background:#FFFFFF; z-index:2000; position:absolute; }
-#pageSizeLayer table { border:0; width:100%; table-layout:fixed; }
-#pageSizeLayer table th { padding:4px 0 4px 0; background-color:#DEDEDE; text-align:center; color:#888888;}
-#pageSizeLayer table th.line  { border-top:1px dotted #EEEEEE; }
-#pageSizeLayer table td { padding:4px 10px 4px 10px; background-color:#EFEFEF;}
-#pageSizeLayer table td div { margin-bottom:5px; }
-#pageSizeLayer table td.line  { border-top:1px dotted #999999; }
-#pageSizeLayer table td.buttonBox { background-color:#FFFFFF; white-space:nowrap; overflow:hidden; vertical-align:top; text-align:center; border-top:1px solid #888888; color:#DDDDDD;}
-#pageSizeLayer .input { background:#FFFFFF; border:1px solid #AAAAAA; padding:1px; font:8pt verdana; width:60px; }
-#pageSizeLayer .full_input { background:#FFFFFF; border:1px solid #AAAAAA; padding:1px; font:8pt verdana; width:90%; }
-#pageSizeLayer .small_input { background:#FFFFFF; border:1px solid #AAAAAA; padding:1px; font:8pt verdana; width:20px; }
-#pageSizeLayer .color_input { background:#FFFFFF; border:1px solid #AAAAAA; padding:1px; font:8pt verdana; width:44px; }
-#pageSizeLayer .submit { width:90%; border:1px solid #DEDEDE; background-color:#FFFFFF;}
-
-.help { padding:5px 0; background-color:#EFEFEF; border-top:1px solid #CCCCCC; }
-
-ul.midCommand { float:left; margin:0 0 0 10px;; padding:0; *zoom:1; }
-ul.midCommand li { display:block; margin-bottom:5px; list-style:none;}
-
-a.widgetStyle { float:left; margin:0 10px 10px 0; border:1px solid #fff; overflow:hidden; *zoom:1;  width:96px; height:96px; position:relative; text-decoration:none;}
-a.widgetStyle:hover { border:1px dashed #ccc; }
-a.widgetStyle:hover span { display:none; }
-a.widgetStyle.selected { border:1px dashed #999; }
-a.widgetStyle img {width:96px; height:96px; margin:1px; }
-a.widgetStyle span { position:absolute; left:0; bottom:0; display:block; width:96px; background-color:#888; color:#fff; padding:4px 3px 3px 3px; opacity:.8; filter:alpha(opacity=80); text-align:center; font-family:tahoma;}
+@charset "utf-8";
+.widget_title{border:1px solid #ddd;margin:10px 5px 5px 0;padding:3px}
+.widget_mid_list{margin:0 0 5px 10px}
+.widget_description{color:#aaa;border-top:1px dotted #eee;margin:5px 0 0 0;padding:5px 0 0 0}
+#colorset_area{margin-top:.5em}
+#colorset_area .header{float:left;margin-right:.5em;padding-top:.2em}
+#colorset_area .footer{float:left}
+#zonePageContent{overflow:hidden;width:100%;padding:none !important;margin:none !important}
+.pageAddContent{width:700px}
+.widgetOutput{float:left;cursor:move;z-index:998;overflow:hidden;position:relative;width:100%}
+.widgetOutput .widgetBorder{border:1px dashed #ccc;z-index:999}
+.widgetOutput .widgetBoxBorder{border:1px dashed #ccc;z-index:999}
+.widgetOutput .widgetResize {border:0;background:transparent url("../images/btn_resize.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:1px;right:1px;cursor:pointer;z-index:1000}
+.widgetOutput .widgetResizeLeft {border:0;background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:0;left:1px;cursor:pointer;z-index:1000}
+.widgetOutput .widgetBoxResize {border:0;background:transparent url("../images/btn_resize.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:1px;right:1px;cursor:pointer;z-index:1000}
+.widgetOutput .widgetBoxResizeLeft{border:0;background:transparent url("../images/btn_resize_left.gif") no-repeat left bottom;width:12px;height:12px;position:absolute;bottom:0;left:1px;cursor:pointer;z-index:1000}
+.widgetButtons{z-index:9999;overflow:hidden;*zoom:1;float:left;padding:3px;position:absolute;visibility:hidden}
+#widgetButton{background-color:#C7DBE9;left:0;top:0}
+#widgetBoxButton{background-color:#D2E9C7;right:0;top:0}
+.widgetButtons div{float:left}
+.widgetButtons .widgetStyle{background:transparent url("../images/widgetstyle_setup.gif") no-repeat 1px 1px;width:14px;height:14px; cursor:pointer;z-index:1000}
+.widgetButtons .widgetSetup{background:transparent url("../images/widget_setup.gif") no-repeat 1px 1px;width:14px;height:14px; cursor:pointer;z-index:1000}
+.widgetButtons .widgetCopy{background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px;width:14px;height:14px; cursor:pointer;z-index:1000}
+.widgetButtons .widgetSize{background:transparent url("../images/widget_size.gif") no-repeat 1px 1px;width:14px;height:14px; cursor:pointer;z-index:1000}
+.widgetButtons .widgetRemove{background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px;width:14px;height:14px; cursor:pointer;z-index:1000}
+.widgetButtons .widgetBoxCopy{background:transparent url("../images/widget_copy.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
+.widgetButtons .widgetBoxSize{background:transparent url("../images/widget_size.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
+.widgetButtons .widgetBoxRemove{background:transparent url("../images/widget_remove.gif") no-repeat 1px 1px;width:14px;height:14px;cursor:pointer;z-index:1000}
+#pageSizeLayer{width:500px;overflow:hidden;border:1px solid #888;background:#fff;z-index:2000;position:absolute}
+#pageSizeLayer table{border:0;width:100%;table-layout:fixed}
+#pageSizeLayer table th{padding:4px 0 4px 0;background-color:#DEDEDE;text-align:center;color:#888}
+#pageSizeLayer table th.line {border-top:1px dotted #eee}
+#pageSizeLayer table td{padding:4px 10px 4px 10px;background-color:#EFEFEF}
+#pageSizeLayer table td div{margin-bottom:5px}
+#pageSizeLayer table td.line {border-top:1px dotted #999}
+#pageSizeLayer table td.buttonBox{background-color:#fff;white-space:nowrap;overflow:hidden;vertical-align:top;text-align:center;border-top:1px solid #888;color:#ddd}
+#pageSizeLayer .input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:60px}
+#pageSizeLayer .full_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:90%}
+#pageSizeLayer .small_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:20px}
+#pageSizeLayer .color_input{background:#fff;border:1px solid #aaa;padding:1px;font:8pt verdana;width:44px}
+#pageSizeLayer .submit{width:90%;border:1px solid #DEDEDE;background-color:#fff}
+.help{padding:5px 0;background-color:#EFEFEF;border-top:1px solid #ccc}
+ul.midCommand{float:left;margin:0 0 0 10px;;padding:0;*zoom:1}
+ul.midCommand li{display:block;margin-bottom:5px;list-style:none}
+a.widgetStyle{display:inline-block;margin:0 10px 10px 0;border:1px solid #fff;overflow:hidden;*zoom:1; width:96px;height:96px;position:relative;text-decoration:none}
+a.widgetStyle:hover{border:1px dashed #ccc}
+a.widgetStyle:hover span{display:none}
+a.widgetStyle.selected{border:1px dashed #999}
+a.widgetStyle img {width:96px;height:96px;margin:1px}
+a.widgetStyle span{position:absolute;left:0;bottom:0;display:block;width:96px;background-color:#888;color:#fff;padding:4px 3px 3px 3px;opacity:.8;filter:alpha(opacity=80);text-align:center;font-family:tahoma}
diff --git a/modules/widget/tpl/downloaded_widget_list.html b/modules/widget/tpl/downloaded_widget_list.html
index 780ff550e..09b5786c3 100644
--- a/modules/widget/tpl/downloaded_widget_list.html
+++ b/modules/widget/tpl/downloaded_widget_list.html
@@ -1,44 +1,38 @@
-<h3 class="xeAdmin">{$lang->widget} <span class="gray">{$lang->cmd_management}</span></h3>
+<include target="header.html" />
 
-<!-- 설명 -->
-<div class="infoText">{nl2br($lang->about_widget)}</div>
-
-<!-- 위젯의 목록 -->
-<table cellspacing="0" class="crossTable">
-<thead>
-    <tr>
-        <th scope="col"><div>{$lang->widget_name}<div></th>
-        <th scope="col"><div>{$lang->version}<div></th>
-        <th scope="col"><div>{$lang->author}<div></th>
-        <th scope="col"><div>{$lang->date}<div></th>
-        <th scope="col"><div>{$lang->path}<div></th>
-        <th scope="col"><div>{$lang->cmd_generate_code}<div></th>
-    </tr>
-</thead>
-<tbody>
-    <!--@foreach($widget_list as $key => $val)-->
-    <tr class="row{$cycle_idx}">
-        <th scope="row" rowspan="2">
-            <div>
-                <a href="{getUrl('','module','widget','act','dispWidgetInfo','selected_widget',$val->widget)}" onclick="popopen(this.href,'widget_info');return false">{$val->title}</a><br />
-                ({$val->widget})
-            </div>
-        </th>
-        <td class="number center">{$val->version}</td>
-        <td class="nowrap">
-            <!--@foreach($val->author as $author)-->
-            <!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;"><!--@end-->{$author->name}<!--@if($author->homepage)--></a><!--@end-->
-            <!--@endforeach-->
-        </td>
-        <td class="date nowrap center">{zdate($val->date, 'Y-m-d')}</td>
-        <td class="number">{$val->path}</td>
-        <td class="center"><a href="{getUrl('','module','widget','act','dispWidgetGenerateCode','selected_widget',$val->widget)}" onclick="popopen(this.href,'widget_code_generate');return false">{$lang->cmd_generate_code}</a></td>
-    </tr>
-    <tr>
-        <td colspan="5" class="left">
-            {nl2br(trim($val->description))}&nbsp;
-        </td>
-    </tr>
-    <!--@end-->
-</tbody>
-</table>
+<div class="table even easyList">
+	<table width="100%" border="1" cellspacing="0">
+		<caption>All({$tCount})</caption>
+		<thead>
+			<tr>
+				<th scope="col" class="title">{$lang->widget_name}</th>
+				<th scope="col">{$lang->version}</th>
+				<th scope="col">{$lang->author}</th>
+				<th scope="col">{$lang->path}</th>
+				<th scope="col">{$lang->cmd_generate_code}</th>
+				<th scope="col">{$lang->cmd_delete}</th>
+			</tr>
+		</thead>
+		<tbody>
+			<tr loop="$widget_list => $widget">
+				<td class="title">
+					<p><strong>{$widget->title}</strong></p>
+					<p>{$widget->description}</p>
+					<p cond="$widget->need_update == 'Y'" class="update">
+						{$lang->msg_avail_easy_update} <a href="{$widget->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
+					</p>
+				</td>
+				<td>{$widget->version}</td>
+				<td>
+					<block loop="$widget->author => $author">
+						<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
+						<block cond="!$author->homepage">{$author->name}</block>
+					</block>
+				</td>
+				<td>{$widget->path}</td>
+				<td><a href="{getUrl('act', 'dispWidgetAdminGenerateCode', 'selected_widget', $widget->widget)}">{$lang->cmd_generate_code}</a></td>
+				<td><a cond="$widget->remove_url" href="{$widget->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
+			</tr>
+		</tbody>
+	</table>
+</div>
diff --git a/modules/widget/tpl/filter/style_generate_code_in_page.xml b/modules/widget/tpl/filter/style_generate_code_in_page.xml
index bbb543a24..5704533dc 100644
--- a/modules/widget/tpl/filter/style_generate_code_in_page.xml
+++ b/modules/widget/tpl/filter/style_generate_code_in_page.xml
@@ -1,9 +1,9 @@
-<filter name="style_generate_code_in_page" module="widget" act="procWidgetGenerateCodeInPage">
-    <response callback_func="completeGenerateCodeInPage">
-        <tag name="error" />
-        <tag name="message" />
-        <tag name="widget_code" />
-        <tag name="tpl" />
-        <tag name="css_header" />
-    </response>
-</filter>
+<filter name="style_generate_code_in_page" module="widget" act="procWidgetGenerateCodeInPage">
+    <response callback_func="completeGenerateCodeInPage">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="widget_code" />
+        <tag name="tpl" />
+        <tag name="css_header" />
+    </response>
+</filter>
diff --git a/modules/widget/tpl/header.html b/modules/widget/tpl/header.html
new file mode 100644
index 000000000..63fcf9766
--- /dev/null
+++ b/modules/widget/tpl/header.html
@@ -0,0 +1,4 @@
+<h1 class="h1">{$lang->installed_widget}</h1>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
\ No newline at end of file
diff --git a/modules/widget/tpl/js/generate_code.js b/modules/widget/tpl/js/generate_code.js
new file mode 100644
index 000000000..f00de4702
--- /dev/null
+++ b/modules/widget/tpl/js/generate_code.js
@@ -0,0 +1,299 @@
+function doDisplaySkinColorset(colorset)
+{
+	var skin = jQuery('select[name=skin]').val();
+	if(!skin) {
+		doHideSkinColorset();
+		return;
+	}
+
+		function completeGetSkinColorset(ret_obj)
+		{
+			var sel = jQuery("select[name=colorset]").get(0);
+			var length = sel.options.length;
+			var selected_colorset = colorset;
+			for(var i=0;i<length;i++) sel.remove(0);
+
+			if(!ret_obj["colorset_list"]) return;
+
+			var colorset_list = ret_obj["colorset_list"].split("\n");
+			var selected_index = 0;
+			for(var i=0;i<colorset_list.length;i++) {
+				var tmp = colorset_list[i].split("|@|");
+				if(selected_colorset && selected_colorset==tmp[0]) selected_index = i;
+				var opt = new Option(tmp[1], tmp[0], false, false);
+				sel.options.add(opt);
+			}
+
+			sel.selectedIndex = selected_index;
+
+			doShowSkinColorset();
+		}
+
+	var params = new Array();
+	params["selected_widget"] = jQuery('input[name=selected_widget]').val();
+	params["skin"] = skin;
+	params["colorset"] = colorset;
+
+	var response_tags = new Array("error","message","colorset_list");
+
+	exec_xml("widget", "procWidgetGetColorsetList", params, completeGetSkinColorset, response_tags, params);
+}
+
+function doHideSkinColorset()
+{
+	jQuery('select[name=colorset]').parents('li').hide();
+}
+
+function doShowSkinColorset()
+{
+	jQuery('select[name=colorset]').parents('li').show();
+}
+
+function completeGenerateCodeInPage(widget_code) {
+    if(!opener || !widget_code) {
+        window.close();
+        return;
+    }
+
+    opener.doAddWidgetCode(widget_code);
+    window.close();
+}
+
+var selected_node = null;
+
+function getWidgetVars() {
+    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
+    selected_node = opener.selectedWidget;
+
+    if(!xGetElementById('fo_widget').widgetstyle.value) {
+        xGetElementById('fo_widget').widgetstyle.value = selected_node.getAttribute('widgetstyle');
+    }
+
+    doFillWidgetVars();
+}
+
+function doFillWidgetVars() {
+    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
+    selected_node = opener.selectedWidget;
+
+    // 스킨과 컬러셋은 기본
+    var skin = selected_node.getAttribute("skin");
+    var colorset = selected_node.getAttribute("colorset");
+    var widget_sequence = parseInt(selected_node.getAttribute("widget_sequence"),10);
+
+    var fo_widget = jQuery("#fo_widget");
+    var fo_obj = xGetElementById("fo_widget");
+    jQuery('#widget_skin').val(skin);
+
+    // 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장
+    var attrs = selected_node.attributes;
+    for (i=0; i< attrs.length ; i++){
+        var name = attrs[i].name;
+        var value = jQuery(selected_node).attr(name);
+        if(value=='Array') continue;
+        if(jQuery("[name="+name+"]",fo_widget).size()>0 || !value || name == 'style') continue;
+
+        var dummy = jQuery('<input type="hidden" name="'+name+'" >').val(value).appendTo("#fo_widget").get(0);
+    }
+
+    // 위젯의 속성 설정
+    var obj_list = new Array();
+    jQuery('input,select,textarea','#fo_widget').each( function() {
+            obj_list.push(this);
+    });
+
+    for(var j=0;j<obj_list.length;j++) {
+        var node = obj_list[j];
+        if(node.name.indexOf('_')==0) continue;
+        if(node.name == 'widgetstyle') continue;
+
+        var length = node.length;
+        var type = node.type;
+        if((typeof(type)=='undefined'||!type) && typeof(length)!='undefined' && typeof(node[0])!='undefined' && length>0) type = node[0].type;
+        else length = 0;
+        var name = node.name;
+
+        switch(type) {
+            case "hidden" :
+            case "text" :
+            case "textarea" :
+                    var val = selected_node.getAttribute(name);
+                    if(!val) continue;
+                    var unescaped_val = unescape(val);
+                    if(!unescaped_val) node.value = val;
+                    else node.value = unescaped_val;
+					jQuery('#'+name).val(node.value);
+                break;
+            case "checkbox" :
+                    if(selected_node.getAttribute(name)) {
+                        var val = selected_node.getAttribute(name).split(',');
+                        if(fo_obj[name].length) {
+                            for(var i=0;i<fo_obj[name].length;i++) {
+                                var v = fo_obj[name][i].value;
+                                for(var k=0;k<val.length;k++) {
+                                    if(v == val[k]) {
+                                        fo_obj[name][i].checked=true;
+                                        break;
+                                    }
+                                }
+                            }
+                        } else {
+                            if(fo_obj[name].value == val) fo_obj[name].checked =true;
+                        }
+                    }
+                break;
+            case "select" :
+            case "select-one" :
+                    var val = selected_node.getAttribute(name);
+                    var sel = fo_obj[name];
+                    if(!val) break;
+                    for(var i=0;i<sel.options.length;i++) {
+                        if(sel.options[i].value == val) sel.options[i].selected = true;
+                        else sel.options[i].selected = false;
+                    }
+                break;
+        }
+
+    }
+
+    var style = selected_node.getAttribute("style");
+    if(typeof(style)=="object") style = style["cssText"];
+    fo_obj.style.value = style;
+
+    fo_obj.widget_padding_left.value = selected_node.getAttribute("widget_padding_left");
+    fo_obj.widget_padding_right.value = selected_node.getAttribute("widget_padding_right");
+    fo_obj.widget_padding_bottom.value = selected_node.getAttribute("widget_padding_bottom");
+    fo_obj.widget_padding_top.value = selected_node.getAttribute("widget_padding_top");
+
+
+    //  컬러셋 설정
+    if(skin && xGetElementById("widget_colorset") && xGetElementById("widget_colorset").options.length<1 && colorset) {
+        doDisplaySkinColorset(colorset);
+    }
+
+    // widget sequence 설정
+    fo_obj.widget_sequence.value = widget_sequence;
+
+	xe.broadcast('MULTIORDER_SYNC');
+	xe.broadcast('MODULELIST_SYNC');
+	xe.broadcast('MID_SYNC');
+	xe.broadcast('MULTILANG_SYNC');
+
+	jQuery('.filebox')
+		.each(function(){
+			var $this = jQuery(this);
+			var src = $this.siblings('input').eq(0).val();
+			if (src) $this.trigger('filebox.selected', [src]);
+		})
+}
+
+var $current_filebox;
+
+jQuery(document).ready(function($){
+	$('select[name=skin]').next('input').bind('click', function(e){
+		doDisplaySkinColorset();
+	});
+	doHideSkinColorset();
+
+	$('.filebox').bind('before-open.mw', function(){
+		$('#filebox_upload').find('input[name=comment], input[name=addfile]').val('');
+	});
+
+	$('.filebox').bind('filebox.selected', function(e, src){
+		$(this)
+			.siblings()
+			.filter(function(){
+				return this.nodeName.toLowerCase() != 'input';
+			})
+			.remove();
+
+		$(this).before('<img src="'+src+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"> <button class="filebox_del text" type="button">'+xe.lang.cmd_delete+'</button>');
+
+		$(this).siblings('input').val(src);
+
+		$('.filebox_del').bind('click', function(){
+			$(this).siblings('input').val('');
+			$(this).prev('img').remove();
+			$(this).remove();
+		});
+	});
+
+	$('.filebox').click(function(){
+		$current_filebox = $(this);
+	});
+
+	$('#filebox_upload').find('input[type=submit]').click(function(){
+		if ($('iframe[name=iframeTarget]').length < 1){
+			var $iframe = $(document.createElement('iframe'));
+
+			$iframe.css('display', 'none');
+			$iframe.attr('src', '#');
+			$iframe.attr('name', 'iframeTarget');
+			$iframe.load(function(){
+				var data = eval('(' + $(window.iframeTarget.document.getElementsByTagName("body")[0]).html() + ')');
+
+				if (data.error){
+					alert(data.message);
+					return;
+				}
+
+				$current_filebox.trigger('filebox.selected', [data.save_filename]);
+				$current_filebox.trigger('close.mw');
+			});
+
+			$('body').append($iframe.get(0));
+
+			$(this).parents('form').attr('target', 'iframeTarget');
+		}
+	});
+
+	$('#widget_code_form').bind('submit', function(){
+		function on_complete(data){
+			if (data.error){
+				alert(data.message);
+				return;
+			}
+
+			$('#widget_code').val(data.widget_code);
+		}
+
+		var datas = $(this).serializeArray();
+		var params = new Object();
+		for(var i in datas){
+			var data = datas[i];
+
+			if(/\[\]$/.test(data.name)) data.name = data.name.replace(/\[\]$/, '');
+			if(params[data.name]) params[data.name] += '|@|' + data.value;
+			else params[data.name] = data.value;
+		}
+
+		$.exec_json('widget.procWidgetGenerateCode', params, on_complete);
+
+		return false;
+	});
+
+	$('#fo_widget').bind('submit', function(){
+		function on_complete(data){
+			if (data['error'] != '0'){
+				alert(data['message']);
+				return;
+			}
+
+			completeGenerateCodeInPage(data['widget_code']);
+		}
+
+		var datas = $(this).serializeArray();
+		var params = new Object();
+		for(var i in datas){
+			var data = datas[i];
+
+			if(/\[\]$/.test(data.name)) data.name = data.name.replace(/\[\]$/, '');
+			if(params[data.name]) params[data.name] += '|@|' + data.value;
+			else params[data.name] = data.value;
+		}
+
+		exec_xml('widget', 'procWidgetGenerateCodeInPage', params, on_complete, ['error', 'message', 'widget_code']);
+
+		return false;
+	});
+});
diff --git a/modules/widget/tpl/js/mid.js b/modules/widget/tpl/js/mid.js
new file mode 100644
index 000000000..c34df454d
--- /dev/null
+++ b/modules/widget/tpl/js/mid.js
@@ -0,0 +1,50 @@
+(function($){
+
+xe.MidManager = xe.createApp("MidManager", {
+	$keyObj: null,
+
+	init: function(key){
+		var self = this;
+		var $keyObj = this.$keyObj = $('.extra_vars input[name='+key+']');
+		var $finder = $keyObj.siblings('.finder');
+
+		$keyObj.siblings('button.search').bind('click', function(){
+			$finder.slideDown(100);
+			return false;
+		});
+
+		$keyObj.siblings('button.delete').bind('click', function(){
+			$keyObj.val('').next().val('');
+			return false;
+		});
+
+		$finder.find('.moduleIdList').siblings('button').bind('click', function(){
+			$keyObj.val($finder.find('.moduleIdList').val());
+			self.cast('MID_SYNC');
+			$finder.slideUp(100);
+			return false;
+		});
+	},
+
+	API_MID_SYNC: function(){
+		var self = this;
+		var $finder = self.$keyObj.closest('.modulefinder');
+
+		var module_srl = this.$keyObj.val();
+		if (!module_srl) return;
+
+		function on_complete(data){
+			if (data.error){
+				alert(data.message);
+				return;
+			}
+
+			self.$keyObj.val(data.module_list[0].module_srl);
+			self.$keyObj.next().val(data.module_list[0].browser_title+' ('+data.module_list[0].mid+', '+data.module_list[0].module_name+')');
+		}
+
+		$.exec_json('module.getModuleAdminModuleList', {'module_srls': module_srl}, on_complete);
+	}
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/widget/tpl/js/module_list.js b/modules/widget/tpl/js/module_list.js
new file mode 100644
index 000000000..36094458c
--- /dev/null
+++ b/modules/widget/tpl/js/module_list.js
@@ -0,0 +1,96 @@
+(function($){
+
+xe.ModuleListManager = xe.createApp("ModuleListManager", {
+	$keyObj: null,
+	$moduleNameObj: null,
+	$moduleSrlObj: null,
+	$selectedObj: null,
+
+	init: function(key){
+		var self = this;
+		var $keyObj = this.$keyObj = $('.extra_vars input[name='+key+']');
+		this.$moduleNameObj = $keyObj.parent().find('.moduleList');
+		this.$moduleSrlObj  = $keyObj.parent().find('.moduleIdList');
+		this.$selectedObj   = $keyObj.parent().find('.modulelist_selected');
+
+		this.$moduleSrlObj
+			.nextAll('button')
+				.filter('.modulelist_add').bind('click', function(){ self.cast('MODULELIST_ADD'); return false; }).hide().end()
+				.filter('.modulelist_del').bind('click', function(){ self.cast('MODULELIST_DEL'); return false; }).end()
+				.filter('.modulelist_up').bind('click', function(){ self.cast('MODULELIST_UP'); return false; }).end()
+				.filter('.modulelist_down').bind('click', function(){ self.cast('MODULELIST_DOWN'); return false; }).end()
+			.end()
+			.bind('show', function(){
+				$(this).nextAll().show();
+			});
+
+		this.cast('MODULELIST_SYNC');
+	},
+
+	API_MODULELIST_ADD: function(){
+		var moduleTitle = this.$moduleNameObj.find('>option:selected').text();
+
+		this.$moduleSrlObj
+			.find('>option:selected').clone(true)
+			.text(function(){ return $(this).text() + ' ('+moduleTitle+')'; })
+			.appendTo(this.$selectedObj);
+
+		this.removeDuplicated();
+		this.refreshValue();
+	},
+
+	API_MODULELIST_DEL: function(){
+		this.$selectedObj.find('>option:selected').remove();
+		this.refreshValue();
+	},
+
+	API_MODULELIST_UP: function(){
+		var $selected = this.$selectedObj.find('>option:selected');
+		$selected.eq(0).prev('option').before($selected);
+		this.refreshValue();
+	},
+
+	API_MODULELIST_DOWN: function(){
+		var $selected = this.$selectedObj.find('>option:selected');
+		$selected.eq(-1).next('option').after($selected);
+		this.refreshValue();
+	},
+
+	API_MODULELIST_SYNC: function(){
+		var values = this.$keyObj.val();
+		if (!values) return;
+
+		var self = this;
+		function on_complete(data){
+			if (data.error) return;
+
+			for(var i in data.module_list){
+				var module = data.module_list[i];
+				var obj = $(document.createElement('option'));
+				obj.val(module.module_srl).html(module.browser_title+' ('+module.module_name+')').appendTo(self.$selectedObj);
+			}
+		}
+
+		$.exec_json('module.getModuleAdminModuleList', {'module_srls': values}, on_complete);
+	},
+
+	removeDuplicated : function() {
+		var selected = {};
+		this.$selectedObj.find('>option').each(function(){
+			if(selected[this.value]) $(this).remove();
+			selected[this.value] = true;
+		});
+	},
+
+	refreshValue : function() {
+		var srls = [];
+
+		this.$selectedObj.find('>option').each(function(){
+			srls.push(this.value);
+		});
+
+		this.$keyObj.val(srls.join(','));
+	}
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/widget/tpl/js/multi_lang.js b/modules/widget/tpl/js/multi_lang.js
new file mode 100644
index 000000000..4805407ad
--- /dev/null
+++ b/modules/widget/tpl/js/multi_lang.js
@@ -0,0 +1,30 @@
+(function($){
+
+xe.MultiLangManager = xe.createApp("MultiLangManager", {
+	$keyObj: null,
+
+	init: function(key){
+		var $keyObj = this.$keyObj = $('.extra_vars input[name='+key+']');
+	},
+
+	API_MULTILANG_SYNC: function(){
+		var self = this;
+		var regexp = /^\$user_lang\-\>/;
+
+		var langCode = this.$keyObj.val();
+		if (!regexp.test(langCode)) return;
+
+		function on_complete(data){
+			if (data.error){
+				alert(data.message);
+				return;
+			}
+
+			$('#' + self.$keyObj.attr('name')).val(data.lang);
+		}
+
+		$.exec_json('module.getLangByLangcode', {'langCode': langCode}, on_complete);
+	}
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/widget/tpl/js/multi_order.js b/modules/widget/tpl/js/multi_order.js
new file mode 100644
index 000000000..c53d8efa2
--- /dev/null
+++ b/modules/widget/tpl/js/multi_order.js
@@ -0,0 +1,75 @@
+(function($){
+
+xe.MultiOrderManager = xe.createApp("MultiOrderManager", {
+	$keyObj: null,
+	$showObj: null,
+	$selectedObj: null,
+
+	init: function(key){
+		var self = this;
+		var $keyObj = this.$keyObj = jQuery('.extra_vars input[name='+key+']');
+		this.$showObj 		= $keyObj.parent().find('.multiorder_show');
+		this.$selectedObj 	= $keyObj.parent().find('.multiorder_selected');
+
+		this.$showObj
+			.nextAll('button')
+				.filter('.multiorder_add').bind('click', function(){ self.cast('MULTIORDER_ADD'); return false; }).end()
+				.filter('.multiorder_del').bind('click', function(){ self.cast('MULTIORDER_DEL'); return false; }).end()
+				.filter('.multiorder_up').bind('click', function(){ self.cast('MULTIORDER_UP'); return false; }).end()
+				.filter('.multiorder_down').bind('click', function(){ self.cast('MULTIORDER_DOWN'); return false; }).end()
+
+		this.cast('MULTIORDER_SYNC');
+	},
+
+	API_MULTIORDER_ADD: function(){
+		this.$showObj
+			.find('>option:selected')
+			.appendTo(this.$selectedObj);
+
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_DEL: function(){
+		this.$selectedObj
+			.find('>option:selected[default!="true"]')
+			.appendTo(this.$showObj);
+
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_UP: function(){
+		var $selected = this.$selectedObj.find('>option:selected');
+		$selected.eq(0).prev('option').before($selected);
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_DOWN: function(){
+		var $selected = this.$selectedObj.find('>option:selected');
+		$selected.eq(-1).next('option').after($selected);
+		this.refreshValue();
+	},
+
+	API_MULTIORDER_SYNC: function(){
+		var values = this.$keyObj.val().split(',');
+		this.$selectedObj.find('>option').appendTo(this.$showObj);
+
+		var targets = [];
+		for(var i in values){
+			var target = this.$showObj.find('>option[value='+values[i]+']').get(0);
+			if (target != undefined) targets.push(target);
+		}
+		$(targets).appendTo(this.$selectedObj);
+	},
+
+	refreshValue : function() {
+		var values = [];
+
+		this.$selectedObj.find('>option').each(function(){
+			values.push(this.value);
+		});
+
+		this.$keyObj.val(values.join(','));
+	}
+});
+
+})(jQuery);
\ No newline at end of file
diff --git a/modules/widget/tpl/js/widget.js b/modules/widget/tpl/js/widget.js
index ce8668a6a..470ee7cc7 100644
--- a/modules/widget/tpl/js/widget.js
+++ b/modules/widget/tpl/js/widget.js
@@ -1,1353 +1,1337 @@
-/**
- * @file   modules/widget/js/widget.js
- * @author NHN (developers@xpressengine.com)
- * @brief  위젯 관리용 자바스크립트
- **/
-
-/* DOM 속성을 구하기 위한 몇가지 함수들.. */
-// style의 값을 구하는게 IE랑 그외가 다름.
-function getStyle(obj) {
-    var style = obj.getAttribute("style");
-    if(!style)
-    {
-        style = obj.style;
-    }
-    if(typeof(style)=="object") style = style["cssText"];
-    return style;
-}
-
-// float: 값을 구하는게 IE랑 그외가 다름
-function getFloat(obj) {
-    var cssFloat = xIE4Up?obj.style.styleFloat:obj.style.cssFloat;
-    if(!cssFloat) cssFloat = 'left';
-    return cssFloat;
-}
-function setFloat(obj, fl) {
-    if(xIE4Up) obj.style.styleFloat = fl;
-    else obj.style.cssFloat = fl;
-}
-
-// padding값을 구하는 함수 (없을 경우 0으로 세팅), zbxe의 위젯에서만 사용
-function getPadding(obj, direct) {
-    var padding = obj.getAttribute("widget_padding_"+direct);
-    if(!padding || padding == null) padding = 0;
-    return padding;
-}
-
-
-/* 위젯 핸들링 시작 */
-var zonePageObj = null;
-var zoneModuleSrl = 0;
-function doStartPageModify(zoneID, module_srl) {
-    zonePageObj = xGetElementById(zoneID);
-    zoneModuleSrl = module_srl;
-
-    // 위젯 크기/여백 조절 레이어를 가장 밖으로 뺌
-	jQuery('#tmpPageSizeLayer')
-		.attr('id', 'pageSizeLayer')
-		.css({position:'absolute',left:0,top:0})
-		.hide()
-		.appendTo('body')
-		.find('>form')
-		.submit(function(){ doApplyWidgetSize(this); return false; });
-
-    // 모든 위젯들의 크기를 정해진 크기로 맞춤
-    doFitBorderSize();
-
-    // 드래그와 리사이즈와 관련된 이벤트 리스너 생성
-    xAddEventListener(document,"click",doCheckWidget);
-    xAddEventListener(document,"mousedown",doCheckWidgetDrag);
-    xAddEventListener(document,'mouseover',widgetSetup);
-}
-
-
-// 내용 모두 삭제
-function removeAllWidget() {
-    if(!confirm(confirm_delete_msg)) return;
-	restoreWidgetButtons(); 
-	xInnerHtml(zonePageObj,'');
-}
-
-/**
- * 특정 영역에 편집된 위젯들을 약속된 태그로 변환하여 return
- **/
-function getWidgetContent(obj) {
-    var html = "";
-    if(typeof(obj)=='undefined' || !obj) obj = zonePageObj;
-
-    var widget = null;
-    jQuery('div.widgetOutput',obj).each(function(){
-    if(jQuery(this).parent().get(0) != obj) return;
-        widget = jQuery(this).attr('widget');
-            switch(widget) {
-                case 'widgetBox' :
-                        html += getWidgetBoxCode(this, widget);
-                    break;
-                case 'widgetContent' :
-                        html += getContentWidgetCode(this, widget);
-                    break;
-                default :
-                        html += getWidgetCode(this, widget);
-                    break;
-            }
-    });
-
-    return html;
-}
-
-// 컨텐츠 위젯 코드 구함
-function getContentWidgetCode(childObj, widget) {
-    var cobj = childObj.firstChild;
-
-    var widgetContent = jQuery('div.widgetContent',childObj);
-    var body = '';
-    var document_srl = 0;
-    var attrs ='';
-
-    if(widgetContent.size() > 0){
-        document_srl = jQuery(childObj).attr('document_srl');
-        if(document_srl>0){
-            body = '';
-        }else{
-            body = widgetContent.html();
-        }
-
-
-        for(var i=0;i<childObj.attributes.length;i++) {
-            if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue) continue;
-            var name = childObj.attributes[i].nodeName.toLowerCase();
-            if(name == "contenteditable"
-                || name == "id"
-                || name=="style"
-                || name=="src"
-                || name=="widget"
-                || name == "body"
-                || name == "class"
-                || name == "widget_width"
-                || name == "widget_width_type"
-                || name == "xdpx"
-                || name == "xdpy"
-                || name == "height"
-                || name == "document_srl"
-                || name == "widget_padding_left"
-                || name == "widget_padding_right"
-                || name == "widget_padding_top"
-                || name == "widget_padding_bottom") continue;
-            var value = childObj.attributes[i].nodeValue;
-            if(!value) continue;
-            attrs += name+'="'+escape(value)+'" ';
-        }
-        return '<img src="./common/tpl/images/widget_bg.jpg" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />';
-    }else{
-        return '';
-    }
-}
-
-// 위젯 박스 코드 구함
-function getWidgetBoxCode(childObj, widget) {
-
-    var attrs = "";
-    for(var i=0;i<childObj.attributes.length;i++) {
-        if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue || /^jquery[0-9]+/i.test(childObj.attributes[i].nodeName)) continue;
-
-        var name = childObj.attributes[i].nodeName.toLowerCase();
-        if(name == "widget_padding_left" || name == "widget_padding_right" || name == "widget_padding_top" || name == "widget_padding_bottom" || name == "contenteditable" || name == "id" || name=="style" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue;
-        var value = childObj.attributes[i].nodeValue;
-        if(!value || value == "Array") continue;
-        attrs += name+'="'+escape(value)+'" ';
-    }
-
-
-    var o;
-
-    if(jQuery('.widget_inner',childObj).size()>0){
-        o = jQuery('.widget_inner',childObj);
-        o = o.get(0);
-    }else{
-        o = jQuery('.nullWidget',childObj).get(0);
-    }
-
-    var body = getWidgetContent(o);
-    return '<div widget="widgetBox" style="'+getStyle(childObj)+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj,'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj, 'bottom')+'" '+attrs+'><div><div>'+body+'<div class="clear"></div></div></div></div>';
-
-/*
-    var cobj = childObj.firstChild;
-    while(cobj) {
-        if(cobj.className == "widgetBorder" || cobj.className == "widgetBoxBorder") {
-            var c2obj = cobj.firstChild;
-            while(c2obj) {
-                if(c2obj.className == "nullWidget") {
-                    var body = getWidgetContent(c2obj);
-                    return '<div widget="widgetBox" style="'+getStyle(childObj)+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj,'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj, 'bottom')+'" '+attrs+'><div><div>'+body+'<div class="clear"></div></div></div></div>';
-                }
-                c2obj = c2obj.nextSibling;
-            }
-        }
-        cobj = cobj.nextSibling;
-    }
-*/
-}
-
-
-
-
-// 일반 위젯 컨텐츠 코드 구함
-function getWidgetCode(childObj, widget) {
-    var attrs = "";
-    var code = "";
-    for(var i=0;i<childObj.attributes.length;i++) {
-        if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue || /^jquery[0-9]+/i.test(childObj.attributes[i].nodeName)) continue;
-
-        var name = childObj.attributes[i].nodeName.toLowerCase();
-        if(name == "contenteditable" || name == "id" || name=="style" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue;
-        var value = childObj.attributes[i].nodeValue;
-        if(!value || value == "Array" || value == "null") continue;
-
-        attrs += name+'="'+escape(value)+'" ';
-    }
-    var style = childObj.getAttribute("style");
-    return '<img class="zbxe_widget_output" style="'+getStyle(childObj)+'" widget="'+widget+'" '+attrs+' />';
-}
-
-/**
- * 직접 내용을 입력하는 위젯을 추가
- **/
-// 팝업 띄움
-function doAddContent(mid) {
-    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetAdminAddContent').setQuery('module_srl',zoneModuleSrl).setQuery('mid',mid);
-    popopen(url, "addContent");
-}
-
-// 직접 내용을 입력하기 위한 에디터 활성화 작업 및 form 데이터 입력
-function doSyncPageContent() {
-    if(opener && opener.selectedWidget) {
-
-        var fo_obj = xGetElementById("content_fo");
-        var sel_obj = opener.selectedWidget;
-        fo_obj.style.value = getStyle(opener.selectedWidget);
-        fo_obj.widget_padding_left.value = getPadding(sel_obj, 'left');
-        fo_obj.widget_padding_right.value = getPadding(sel_obj,'right');
-        fo_obj.widget_padding_bottom.value = getPadding(sel_obj,'bottom');
-        fo_obj.widget_padding_top.value = getPadding(sel_obj,'top');
-
-        var obj = sel_obj.firstChild;
-        while(obj && obj.className != "widgetContent") obj = obj.nextSibling;
-        if(obj && obj.className == "widgetContent") {
-            if(!fo_obj.document_srl || fo_obj.document_srl.value == 0) {
-                try {
-                    var content = Base64.decode(xInnerHtml(obj));
-                    content = editorReplacePath(content);
-                    xGetElementById("content_fo").content.value = content;
-                    xe.Editors["1"].exec("SET_IR", [content]);
-                }
-                catch(e)
-                {
-                }
-            }
-        }
-    }
-
-    if(typeof(editorStart)!='undefined') editorStart(1, "module_srl", "content", false, 400 );
-    //editor_upload_start(1);
-
-    setFixedPopupSize();
-}
-
-// 부모창에 위젯을 추가
-function addContentWidget(fo_obj) {
-    var editor_sequence = fo_obj.getAttribute('editor_sequence');
-    var mid = fo_obj.mid.value;
-    var module_srl = fo_obj.module_srl.value;
-    var document_srl = fo_obj.document_srl.value;
-    var content = editorGetContent(editor_sequence);
-    var response_tags = new Array('error','message','document_srl');
-    var params = new Array();
-    params['editor_sequence'] = editor_sequence;
-    params['content'] = content;
-    params['module_srl'] = module_srl;
-    params['document_srl'] = document_srl;
-    exec_xml('widget',"procWidgetInsertDocument",params,completeAddContent,response_tags,params,fo_obj);
-    return false;
-
-}
-
-function completeAddContent(ret_obj, response_tags, params, fo_obj) {
-    var document_srl = ret_obj['document_srl'];
-
-    var contentWidget = opener.jQuery('div.widgetOutput[widget=widgetContent][document_srl='+document_srl+']');
-    var attr = null;
-    if(contentWidget.size()>0) {
-        attr = contentWidget.get(0).attributes;
-    }
-
-    var editor_sequence = params['editor_sequence'];
-    var content = editorGetContent(editor_sequence);
-
-    var tpl = ''+
-        '<div class="widgetOutput" style="'+fo_obj.style.value+'" widget_padding_left="'+fo_obj.widget_padding_left.value+'" widget_padding_right="'+fo_obj.widget_padding_right.value+'" widget_padding_top="'+fo_obj.widget_padding_top.value+'" widget_padding_bottom="'+fo_obj.widget_padding_bottom.value+'" document_srl="'+document_srl+'" widget="widgetContent">'+
-        '<div class="widgetResize"></div>'+
-        '<div class="widgetResizeLeft"></div>'+
-        '<div class="widgetBorder">'+
-        '<div style="padding:'+fo_obj.widget_padding_top.value+'px '+fo_obj.widget_padding_right.value+'px'+fo_obj.widget_padding_bottom.value+'px'+fo_obj.widget_padding_left.value+'px"></div>'+content+'<div class="clear"></div>'+
-        '</div>'+
-        '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;"></div>'+
-        '</div>';
-
-    var oTpl = jQuery(tpl);
-    if(attr) {
-        jQuery.each(attr,function(i){
-            if(!oTpl.attr(attr[i].name)){
-                oTpl.attr(attr[i].name,attr[i].value);
-            }
-        });
-    }
-
-    oTpl = jQuery('<div>').append(oTpl);
-    tpl = oTpl.html();
-    opener.doAddWidgetCode(tpl);
-    window.close();
-}
-
-/* 박스 위젯 추가 */
-function doAddWidgetBox() {
-    var tpl = ''+
-    '<div class="widgetOutput" style="float:left;width:100%;height:12px;" widget="widgetBox" >'+
-        '<div class="widgetBoxResize"></div>'+
-        '<div class="widgetBoxResizeLeft"></div>'+
-        '<div class="widgetBoxBorder">'+
-            '<div class="nullWidget" style="width:100%;height:100px;"></div>'+
-            '<div class="clear"></div>'+
-        '</div>'+
-    '</div>';
-    xInnerHtml(zonePageObj, xInnerHtml(zonePageObj)+tpl);
-    doFitBorderSize();
-}
-
-
-/* 일반 위젯을 추가하기 위해 위젯 팝업창을 띄움 */
-function doAddWidget(fo) {
-    var sel = fo.widget_list;
-    var idx = sel.selectedIndex;
-    var val = sel.options[idx].value;
-    var module_srl = fo.module_srl.value;
-
-    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetGenerateCodeInPage').setQuery('selected_widget', val).setQuery('module_srl', module_srl);
-    popopen(url,'GenerateWidgetCode');
-}
-
-
-
-// widgetBorder에 height를 widgetOutput와 맞춰줌
-function doFitBorderSize() {
-    var obj_list = xGetElementsByClassName('widgetBorder', zonePageObj);
-    for(var i=0;i<obj_list.length;i++) {
-        var obj = obj_list[i];
-        var height = xHeight(obj.parentNode);
-        if(height<3) height = 20;
-        xHeight(obj, height);
-        obj.parentNode.style.clear = '';
-    }
-    var obj_list = xGetElementsByClassName('widgetBoxBorder', zonePageObj);
-    for(var i=0;i<obj_list.length;i++) {
-        var obj = obj_list[i];
-        xHeight(obj, xHeight(obj.parentNode));
-        obj.parentNode.style.clear = '';
-    }
-}
-
-var selectedWidget = null;
-var writedText = null;
-var checkDocumentWrite = false;
-
-// document.write(ln)의 경우 ajax로 처리시 가로채기 위한 함수
-// 아래 함수는 str 내용을 단지 전역 변수에 보관 후 doAddWidgetCode 에서 재사용하기 위해 사용됨.
-window.document.write = window.document.writeln = function(str){
-    if(checkDocumentWrite) {
-        writedText = str;
-        return;
-    }
-    if ( str.match(/^<\//) ) return;
-    if ( !window.opera ) str = str.replace(/&(?![#a-z0-9]+;)/g, "&");
-    str = str.replace(/(<[a-z]+)/g, "$1 xmlns='http://www.w3.org/1999/xhtml'");
-
-    var div = xCreateElement("DIV");
-    xInnerHtml(div, str);
-
-    var pos;
-    pos = document.getElementsByTagName("*");
-    pos = pos[pos.length - 1];
-    var nodes = div.childNodes;
-    while ( nodes.length ) {
-        pos.parentNode.appendChild( nodes[0] );
-    }
-}
-
-// 위젯 추가
-function doAddWidgetCode(widget_code) {
-    restoreWidgetButtons();
-
-    // css 추가
-    var tmp = widget_code;
-    while(tmp.indexOf("<!--Meta:")>-1) {
-        var pos = tmp.indexOf("<!--Meta:");
-        tmp = tmp.substr(pos);
-        var eos = tmp.indexOf("-->");
-        var cssfile = tmp.substr(9,eos-9);
-        if(cssfile.indexOf('.js')>-1) {
-            tmp = tmp.substr(eos);
-            continue;
-        }
-        if(!cssfile) break;
-        tmp = tmp.substr(eos);
-
-        var cssfile = request_uri+'/'+cssfile;
-        if(typeof(document.createStyleSheet)=='undefined') {
-            var css ='<link rel="stylesheet" href="'+cssfile+'" type="text/css" charset="UTF-8" />';
-            var dummy  = xCreateElement("DIV");
-            xInnerHtml(dummy , css);
-            document.body.appendChild(dummy);
-        } else {
-            document.createStyleSheet(cssfile,0);
-        }
-    }
-
-    // widget 코드에서 javascript 부분을 빼서 eval후 결과값을 대체함
-    checkDocumentWrite = true; ///< document.write(ln)등의 함수값을 바로 사용하기 위한 check flag
-
-    // widget_code의 javascript 부분 수정
-    var tmp = widget_code.toLowerCase();
-    while(tmp.indexOf("<script")>-1) {
-
-        var pos = tmp.indexOf("<script");
-
-        tmp = tmp.substr(pos);
-        var length = tmp.indexOf("</script>")+9;
-
-        var script = widget_code.substr(pos,length);
-        script = script.replace(/^<script([^>]*)>/i,'').replace(/<\/script>$/i,'');
-
-        writedText = null;
-        eval(script);
-        widget_code = widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length);
-        tmp = widget_code.toLowerCase();
-    }
-
-
-
-    // html 추가
-    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);
-        var n = jQuery('div.widget_inner',obj);
-
-        if(n.size()==0) n = jQuery('div.nullWidget',obj);
-        if(o.size()==0) o = jQuery('div.nullWidget',selectedWidget);
-
-        n.html(o.html());
-
-
-        selectedWidget.parentNode.insertBefore(obj, selectedWidget);
-        selectedWidget.parentNode.removeChild(selectedWidget);
-    } else {
-        xGetElementById('zonePageContent').appendChild(obj);
-    }
-    checkDocumentWrite = false;
-    selectedWidget = null;
-
-    /*
-    //zoneObj.style.visibility = 'hidden';
-    zoneObj.style.opacity = 0.2;
-    zoneObj.style.filter = "alpha(opacity=20)";
-
-    // 위젯 추가후 페이지 리로딩
-    var tpl = getWidgetContent();
-
-    var fo_obj = xGetElementById('pageFo');
-    fo_obj.content.value = tpl;
-    fo_obj.mid.value = current_mid;
-    fo_obj.submit();
-    */
-}
-
-// 클릭 이벤트시 위젯의 수정/제거/이벤트 무효화 처리
-function doCheckWidget(e) {
-    var evt = new xEvent(e); if(!evt.target) return;
-    var obj = evt.target;
-
-    selectedWidget = null;
-
-    var pObj = obj.parentNode;
-    while(pObj) {
-        if(pObj.id == "pageSizeLayer") return;
-        pObj = pObj.parentNode;
-    }
-
-    doHideWidgetSizeSetup();
-    // 위젯 설정
-    if(obj.className == 'widgetSetup') {
-        var p_obj = obj.parentNode.parentNode;
-        var widget = p_obj.getAttribute("widget");
-        if(!widget) return;
-        selectedWidget = p_obj;
-        if(widget == 'widgetContent') popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl")+'&mid='+current_mid, "addContent");
-        else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
-        return;
-
-    // 위젯 스타일
-    } else if(obj.className == 'widgetStyle') {
-        var p_obj = obj.parentNode.parentNode;
-        var widget = p_obj.getAttribute("widget");
-        var widgetstyle = p_obj.getAttribute("widgetstyle");
-        if(!widget) return;
-        selectedWidget = p_obj;
-        popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
-        return;
-
-    // 위젯 복사
-    } else if(obj.className == 'widgetCopy' && obj.parentNode.parentNode.className == 'widgetOutput') {
-        p_obj = obj.parentNode.parentNode;
-        restoreWidgetButtons();
-
-        if(p_obj.getAttribute('widget')=='widgetContent' && p_obj.getAttribute('document_srl') ) {
-            var response_tags = new Array('error','message','document_srl');
-            var params = new Array();
-            params['document_srl'] =p_obj.getAttribute('document_srl');
-            exec_xml('widget','procWidgetCopyDocument', params, completeCopyWidgetContent, response_tags, params, p_obj);
-            return;
-        } else {
-            var dummy = xCreateElement("DIV");
-            xInnerHtml(dummy,xInnerHtml(p_obj));
-
-            dummy.widget_sequence = '';
-            dummy.className = "widgetOutput";
-            for(var i=0;i<p_obj.attributes.length;i++) {
-                if(!p_obj.attributes[i].nodeName || !p_obj.attributes[i].nodeValue) continue;
-                var name = p_obj.attributes[i].nodeName.toLowerCase();
-
-                var value = p_obj.attributes[i].nodeValue;
-                if(!value) continue;
-
-                if(value && typeof(value)=="string") value = value.replace(/\"/ig,'&quot;');
-
-                dummy.setAttribute(name, value);
-            }
-
-            if(xIE4Up) dummy.style["cssText"] = p_obj.style["cssText"];
-            p_obj.parentNode.insertBefore(dummy, p_obj);
-        }
-        return;
-
-    // 위젯 사이트/ 여백 조절
-    } else if(obj.className == 'widgetSize' || obj.className == 'widgetBoxSize') {
-        var p_obj = obj.parentNode.parentNode;
-        var widget = p_obj.getAttribute("widget");
-        if(!widget) return;
-        selectedWidget = p_obj;
-        doShowWidgetSizeSetup(evt.pageX, evt.pageY, selectedWidget);
-        return;
-
-    // 위젯 제거
-    } else if(obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') {
-        var p_obj = obj.parentNode.parentNode;
-        var widget = p_obj.getAttribute("widget");
-        if(confirm(confirm_delete_msg)) {
-            restoreWidgetButtons();
-			p_obj.parentNode.removeChild(p_obj);
-        }
-        return;
-    }
-
-    // 내용 클릭 무효화
-    var p_obj = obj;
-    while(p_obj) {
-        if(p_obj.className == 'widgetOutput') {
-            evt.cancelBubble = true;
-            evt.returnValue = false;
-            xPreventDefault(e);
-            xStopPropagation(e);
-            break;
-        }
-        p_obj = p_obj.parentNode;
-    }
-}
-
-// content widget 복사
-function completeCopyWidgetContent(ret_obj, response_tags, params, p_obj) {
-    var document_srl = ret_obj['document_srl'];
-    var dummy = xCreateElement("DIV");
-    xInnerHtml(dummy,xInnerHtml(p_obj));
-
-
-    dummy.widget_sequence = '';
-    dummy.className = "widgetOutput";
-    for(var i=0;i<p_obj.attributes.length;i++) {
-        if(!p_obj.attributes[i].nodeName || !p_obj.attributes[i].nodeValue) continue;
-        var name = p_obj.attributes[i].nodeName.toLowerCase();
-
-        var value = p_obj.attributes[i].nodeValue;
-        if(!value) continue;
-
-        if(value && typeof(value)=="string") value = value.replace(/\"/ig,'&quot;');
-
-        dummy.setAttribute(name, value);
-    }
-    p_obj.setAttribute('document_srl', document_srl);
-
-    if(xIE4Up) dummy.style["cssText"] = p_obj.getAttribute("style")["cssText"];
-    p_obj.parentNode.insertBefore(dummy, p_obj);
-}
-
-// content widget 제거
-function completeDeleteWidgetContent(ret_obj, response_tags, params, p_obj) {
-    restoreWidgetButtons();
-    p_obj.parentNode.removeChild(p_obj);
-}
-
-
-// 마우스 다운 이벤트 발생시 위젯의 이동을 처리
-function doCheckWidgetDrag(e) {
-    var evt = new xEvent(e); if(!evt.target) return;
-    var obj = evt.target;
-
-    if(jQuery(obj).parents('#pageSizeLayer').size() > 0) return;
-
-    doHideWidgetSizeSetup();
-
-    if(obj.className == 'widgetSetup' || obj.className == 'widgetStyle' || obj.className == 'widgetCopy' || obj.className == 'widgetBoxCopy' || obj.className == 'widgetSize' || obj.className == 'widgetBoxSize' || obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') return;
-
-    p_obj = obj;
-    while(p_obj) {
-        if(p_obj.className == 'widgetOutput' || p_obj.className == 'widgetResize' || p_obj.className == 'widgetResizeLeft' || p_obj.className == 'widgetBoxResize' || p_obj.className == 'widgetBoxResizeLeft') {
-            widgetDragEnable(p_obj, widgetDragStart, widgetDrag, widgetDragEnd);
-            widgetMouseDown(e);
-            return;
-        }
-        p_obj = p_obj.parentNode;
-    }
-}
-
-function _getInt(val) {
-    if(!val || val == "null") return 0;
-    if(parseInt(val,10)==NaN) return 0;
-    return parseInt(val,10);
-}
-
-// 위젯 크기 조절 레이어를 보여줌
-var selectedSizeWidget = null;
-function doShowWidgetSizeSetup(px, py, obj) {
-    var layer = jQuery('#pageSizeLayer');
-    var form  = layer.find('>form:first');
-	var obj   = jQuery(obj);
-
-	if (!form.length) return;
-
-	selectedSizeWidget = obj[0];
-
-	var opts = {
-		widget_align : obj.css('float'),
-
-		width  : obj[0].style.width,
-		height : obj[0].style.height,
-		
-		padding_left   : _getInt(obj.attr('widget_padding_left')),
-		padding_right  : _getInt(obj.attr('widget_padding_right')),
-		padding_top    : _getInt(obj.attr('widget_padding_top')),
-		padding_bottom : _getInt(obj.attr('widget_padding_bottom')),
-		
-		margin_left    : _getInt(obj[0].style.marginLeft),
-		margin_right   : _getInt(obj[0].style.marginRight),
-		margin_top     : _getInt(obj[0].style.marginTop),
-		margin_bottom  : _getInt(obj[0].style.marginBottom),
-		
-		border_top_color : transRGB2Hex(obj[0].style.borderTopColor),
-		border_top_thick : obj[0].style.borderTopWidth.replace(/px$/i, ''),
-		border_top_type  : obj[0].style.borderTopStyle,
-		
-		border_bottom_color : transRGB2Hex(obj[0].style.borderBottomColor),
-		border_bottom_thick : obj[0].style.borderBottomWidth.replace(/px$/i, ''),
-		border_bottom_type  : obj[0].style.borderBottomStyle,
-
-		border_right_color : transRGB2Hex(obj[0].style.borderRightColor),
-		border_right_thick : obj[0].style.borderRightWidth.replace(/px$/i, ''),
-		border_right_type  : obj[0].style.borderRightStyle,
-
-		border_left_color : transRGB2Hex(obj[0].style.borderLeftColor),
-		border_left_thick : obj[0].style.borderLeftWidth.replace(/px$/i, ''),
-		border_left_type  : obj[0].style.borderLeftStyle,
-
-		background_color     : transRGB2Hex(obj[0].style.backgroundColor),
-		background_image_url : obj[0].style.backgroundImage.replace(/^url\(/i,'').replace(/\)$/i,''),
-
-		background_x : 0,
-		background_y : 0,
-
-		background_repeat : obj[0].style.backgroundRepeat
-	};
-
-	// background position
-	var pos = obj[0].style.backgroundPosition;
-	if(pos) {
-		pos = pos.split(' ');
-		if(pos.length == 2) {
-			opts.background_x = pos[0];
-			opts.background_y = pos[1];
-		}
-	}
-
-	layer.css('top', py+'px').show();
-	var _zonePageObj   = jQuery(zonePageObj)
-	var zoneOffsetLeft = _zonePageObj.offset().left;
-	var zoneWidth      = _zonePageObj.width();
-	if (px + layer.width() > zoneOffsetLeft + zoneWidth) px = zoneOffsetLeft + zoneWidth - layer.width() - 5;
-	layer.css('left', px+'px');
-
-	jQuery.each(opts, function(key, val){
-		var el = form[0].elements[key];
-		if (el) el.value = val;
-        if (el.tagName.toLowerCase() == "select")
-        { 
-            if(el.selectedIndex == -1) {
-                el.selectedIndex = 0;
-            }
-        }
-	});
-
-	try { form[0].elements[0].focus() } catch(e) {};
-}
-
-function doHideWidgetSizeSetup() {
-	jQuery('#pageSizeLayer').hide();
-	//var layer = xGetElementById("pageSizeLayer");
-    //layer.style.visibility = "hidden";
-    //layer.style.display = "none";
-}
-
-function _getSize(value) {
-    if(!value) return 0;
-    var type = "px";
-    if(value.lastIndexOf("%")>=0)  type = "%";
-    var num = parseInt(value,10);
-    if(num<1) return 0;
-    if(type == "%" && num > 100) num = 100;
-    return ""+num+type;
-}
-
-function _getBorderStyle(fld_color, fld_thick, fld_type) {
-    var color = fld_color.value;
-    color = color.replace(/^#/,'');
-    if(!color) color = '#FFFFFF';
-    else color = '#'+color;
-    var width = fld_thick.value;
-    if(!width) width = '0px';
-    else width = parseInt(width,10)+'px';
-    var style = fld_type.options[fld_type.selectedIndex].value;
-    if(!style) style = 'solid';
-
-    var str = color+' '+width+' '+style;
-    return str;
-}
-
-function _getBGColorStyle(fld_color) {
-    var color = fld_color.replace(/^#/,'');
-    if(!color) color = '#FFFFFF';
-    else color = '#'+color;
-    return color;
-}
-
-function doApplyWidgetSize(fo_obj) {
-    if(selectedSizeWidget) {
-        if(fo_obj.widget_align.selectedIndex == 1) setFloat(selectedSizeWidget, 'right');
-        else setFloat(selectedSizeWidget, 'left');
-
-        var width = _getSize(fo_obj.width.value);
-        if(width) selectedSizeWidget.style.width = width;
-
-        var height = _getSize(fo_obj.height.value);
-        if(height && height != "100%") selectedSizeWidget.style.height = height;
-        else {
-            selectedSizeWidget.style.height = '';
-            var widgetBorder = xGetElementsByClassName('widgetBorder',selectedSizeWidget);
-            for(var i=0;i<widgetBorder.length;i++) {
-                var obj = widgetBorder[i];
-                obj.style.height = '';
-            }
-        }
-
-        selectedSizeWidget.style.borderTop = _getBorderStyle(fo_obj.border_top_color, fo_obj.border_top_thick, fo_obj.border_top_type);
-        selectedSizeWidget.style.borderBottom = _getBorderStyle(fo_obj.border_bottom_color, fo_obj.border_bottom_thick, fo_obj.border_bottom_type);
-        selectedSizeWidget.style.borderLeft = _getBorderStyle(fo_obj.border_left_color, fo_obj.border_left_thick, fo_obj.border_left_type);
-        selectedSizeWidget.style.borderRight = _getBorderStyle(fo_obj.border_right_color, fo_obj.border_right_thick, fo_obj.border_right_type);
-
-        selectedSizeWidget.style.marginTop = _getSize(fo_obj.margin_top.value);
-        selectedSizeWidget.style.marginRight = _getSize(fo_obj.margin_right.value);
-        selectedSizeWidget.style.marginBottom = _getSize(fo_obj.margin_bottom.value);
-        selectedSizeWidget.style.marginLeft = _getSize(fo_obj.margin_left.value);
-
-        if(!fo_obj.background_color.value || fo_obj.background_color.value == 'transparent') selectedSizeWidget.style.backgroundColor = 'transparent';
-        else selectedSizeWidget.style.backgroundColor = _getBGColorStyle(fo_obj.background_color.value);
-
-        var image_url = fo_obj.background_image_url.value;
-        if(image_url && image_url != 'none') selectedSizeWidget.style.backgroundImage = "url("+image_url+")";
-        else selectedSizeWidget.style.backgroundImage = 'none';
-
-        switch(fo_obj.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'; break;
-        }
-
-        selectedSizeWidget.style.backgroundPosition = fo_obj.background_x.value+' '+fo_obj.background_y.value;
-
-        var borderObj = selectedSizeWidget.firstChild;
-        while(borderObj) {
-            if(borderObj.nodeName == "DIV" && (borderObj.className == "widgetBorder" || borderObj.className == "widgetBoxBorder")) {
-                var contentObj = borderObj.firstChild;
-                while(contentObj) {
-                    if(contentObj.nodeName == "DIV") {
-                        contentObj.style.padding = "";
-                        var paddingLeft = _getSize(fo_obj.padding_left.value);
-                        if(paddingLeft) {
-                            contentObj.style.paddingLeft = paddingLeft;
-                            selectedSizeWidget.setAttribute('widget_padding_left', paddingLeft);
-                        } else {
-                            contentObj.style.paddingLeft = '';
-                            selectedSizeWidget.setAttribute('widget_padding_left', '');
-                        }
-
-                        var paddingRight = _getSize(fo_obj.padding_right.value);
-                        if(paddingRight) {
-                            contentObj.style.paddingRight = paddingRight;
-                            selectedSizeWidget.setAttribute('widget_padding_right', paddingRight);
-                        } else {
-                            contentObj.style.paddingRight = '';
-                            selectedSizeWidget.setAttribute('widget_padding_right', '');
-                        }
-
-                        var paddingTop = _getSize(fo_obj.padding_top.value);
-                        if(paddingTop) {
-                            contentObj.style.paddingTop = paddingTop;
-                            selectedSizeWidget.setAttribute('widget_padding_top', paddingTop);
-                        } else {
-                            contentObj.style.paddingTop = '';
-                            selectedSizeWidget.setAttribute('widget_padding_top', '');
-                        }
-
-                        var paddingBottom = _getSize(fo_obj.padding_bottom.value);
-                        if(paddingBottom) {
-                            contentObj.style.paddingBottom = paddingBottom;
-                            selectedSizeWidget.setAttribute('widget_padding_bottom', paddingBottom);
-                        } else {
-                            contentObj.style.paddingBottom = '';
-                            selectedSizeWidget.setAttribute('widget_padding_bottom', '');
-                        }
-
-                        break;
-                    }
-                    contentObj = contentObj.nextSibling;
-                }
-
-                break;
-            }
-
-            borderObj = borderObj.nextSibling;
-        }
-
-        selectedWidget = selectedSizeWidget;
-        selectedSizeWidget = null;
-
-        var widget = selectedWidget.getAttribute("widget");
-        var params = new Array();
-        for(var i=0;i<selectedWidget.attributes.length;i++) {
-            if(!selectedWidget.attributes[i].nodeName || !selectedWidget.attributes[i].nodeValue) continue;
-            var name = selectedWidget.attributes[i].nodeName.toLowerCase();
-            if(name == "contenteditable" || name == "id" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue;
-            var value = selectedWidget.attributes[i].nodeValue;
-            if(!value || value == "Array") continue;
-            params[name] = value;
-        }
-        params["style"] = getStyle(selectedWidget);
-		params["selected_widget"] = widget;
-        params["module_srl"] = xGetElementById("pageFo").module_srl.value;
-
-        exec_xml('widget','procWidgetGenerateCodeInPage',params,function(ret_obj) { doAddWidgetCode(ret_obj["widget_code"]);  },new Array('error','message','widget_code','tpl','css_header'));
-    }
-    doHideWidgetSizeSetup();
-}
-
-var hideElements = new Array();
-function restoreWidgetButtons() {
-    var widgetButton = xGetElementById('widgetButton');
-    var boxWidgetButton = xGetElementById('widgetBoxButton');
-    if(!widgetButton || !boxWidgetButton) return;
-
-    widgetButton.style.visibility = 'hidden';
-    xGetElementById("zonePageContent").parentNode.appendChild(widgetButton);
-    boxWidgetButton.style.visibility = 'hidden';
-    xGetElementById("zonePageContent").parentNode.appendChild(boxWidgetButton);
-
-    for(var i=0;i<hideElements.length;i++) {
-        var obj = hideElements[0];
-        obj.style.paddingTop = 0;
-    }
-    hideElements = new Array();
-}
-
-function showWidgetButton(name, obj) {
-    var widgetButton = xGetElementById(name);
-    if(!widgetButton) return;
-    widgetButton.style.visibility = 'visible';
-    obj.insertBefore(widgetButton, obj.firstChild);
-    /*
-    var cobj = obj.firstChild;
-    while(cobj) {
-        cobj = cobj.nextSibling;
-    }
-
-    obj.appendChild(widgetButton);
-    */
-}
-
-function widgetSetup(evt) {
-    var e = new xEvent(evt);
-    var obj = e.target;
-
-    if(jQuery(obj).is('.widgetButtons') || jQuery(obj).parents('.widgetButtons').size() > 0) return;
-    if(jQuery(obj).is('.buttonBox') || jQuery(obj).parents('.buttonBox').size() > 0) return;
-
-
-    var o = jQuery(obj).parents('.widgetOutput');
-    if(o.size() == 0){
-        restoreWidgetButtons();
-        return;
-    }
-    /*
-    if(!obj || typeof(obj.className)=='undefined' || obj.className != 'widgetOutput') {
-        restoreWidgetButtons();
-        return;
-    }
-*/
-
-    obj = o.get(0);
-    var widget = o.attr('widget');
-    if(!widget) return;
-
-    if(widget == 'widgetBox') {
-        restoreWidgetButtons();
-        showWidgetButton('widgetBoxButton', obj);
-    } else {
-        restoreWidgetButtons();
-        showWidgetButton('widgetButton', obj);
-
-        var p_obj = obj.parentNode;
-        if(p_obj) {
-            while(p_obj) {
-                if(p_obj.nodeName == 'DIV' && p_obj.getAttribute('widget')=='widgetBox') {
-                    showWidgetButton('widgetBoxButton', p_obj);
-                    break;
-                }
-                p_obj = p_obj.parentNode;
-            }
-        }
-    }
-}
-
-/* 위젯 드래그 */
-// 드래그 중이라는 상황을 간직할 변수
-var widgetDragManager = {obj:null, isDrag:false}
-var widgetTmpObject = new Array();
-var widgetDisappear = 0;
-
-function widgetCreateTmpObject(obj) {
-    var id = obj.getAttribute('id');
-
-    tmpObj = xCreateElement('DIV');
-    tmpObj.id = id + '_tmp';
-    tmpObj.className = obj.className;
-    tmpObj.style.overflow = 'hidden';
-    tmpObj.style.margin= '0px';
-    tmpObj.style.padding = '0px';
-    tmpObj.style.width = obj.style.width;
-
-    tmpObj.style.display = 'none';
-    tmpObj.style.position = 'absolute';
-    tmpObj.style.opacity = 1;
-    tmpObj.style.filter = 'alpha(opacity=100)';
-
-    xLeft(tmpObj, xPageX(obj));
-    xTop(tmpObj, xPageY(obj));
-
-    document.body.appendChild(tmpObj);
-    widgetTmpObject[obj.id] = tmpObj;
-    return tmpObj;
-}
-
-// 기생성된 임시 object를 찾아서 return, 없으면 만들어서 return
-var idStep = 0;
-function widgetGetTmpObject(obj) {
-    if(!obj.id) obj.id = 'widget_'+idStep++;
-    var tmpObj = widgetTmpObject[obj.id];
-    if(!tmpObj) tmpObj = widgetCreateTmpObject(obj);
-    return tmpObj;
-}
-
-// 메뉴에 마우스 클릭이 일어난 시점에 드래그를 위한 제일 첫 동작 (해당 object에 각종 함수나 상태변수 설정)
-function widgetDragEnable(obj, funcDragStart, funcDrag, funcDragEnd) {
-
-    // 상위 object에 드래그 가능하다는 상태와 각 드래그 관련 함수를 설정
-    obj.draggable = true;
-    obj.dragStart = funcDragStart;
-    obj.drag = funcDrag;
-    obj.dragEnd = funcDragEnd;
-
-    // 드래그 가능하지 않다면 드래그 가능하도록 상태 지정하고 mousemove이벤트 등록
-    if (!widgetDragManager.isDrag) {
-        widgetDragManager.isDrag = true;
-        xAddEventListener(document, 'mousemove', widgetDragMouseMove, false);
-    }
-}
-
-// 드래그를 시작할때 호출되는 함수 (이동되는 형태를 보여주기 위한 작업을 함)
-function widgetDragStart(tobj, px, py) {
-    if(tobj.className == 'widgetResize' || tobj.className == 'widgetResizeLeft' || tobj.className == 'widgetBoxResize' || tobj.className == 'widgetBoxResizeLeft') return;
-    var obj = widgetGetTmpObject(tobj);
-
-    xInnerHtml(obj, xInnerHtml(tobj));
-
-    xLeft(obj, xPageX(tobj));
-    xTop(obj, xPageY(tobj));
-    xWidth(obj, xWidth(tobj));
-    xHeight(obj, xHeight(tobj));
-
-    xDisplay(obj, 'block');
-}
-
-// 드래그 시작후 마우스를 이동할때 발생되는 이벤트에 의해 실행되는 함수
-function widgetDrag(tobj, dx, dy) {
-    var minWidth = 40;
-    var minHeight = 10;
-
-    var sx = xPageX(tobj.parentNode);
-    var sy = xPageY(tobj.parentNode);
-
-    var nx = tobj.xDPX;
-    var ny = tobj.xDPY;
-
-    var zoneWidth = xWidth(zonePageObj);
-    var zoneLeft = xPageX(zonePageObj);
-    var zoneRight = zoneLeft + zoneWidth;
-
-    var pWidth = xWidth(tobj.parentNode);
-
-    var cssFloat = getFloat(tobj.parentNode);
-    if(!cssFloat) cssFloat = 'left';
-
-    // 위젯 리사이즈 (우측)
-    if(tobj.className == 'widgetResize' || tobj.className == 'widgetBoxResize') {
-        if(nx < sx+minWidth) nx = sx+minWidth;
-        if(nx > zoneRight) nx = zoneRight;
-
-        if(cssFloat == 'right') nx = sx + pWidth;
-
-        var new_width = nx  - sx;
-        if(new_width < minWidth) new_width = minWidth;
-
-        var new_height = ny - sy;
-        if(new_height < minHeight) new_height = minHeight;
-
-        if( zoneRight < sx+new_width) new_width = zoneRight - sx;
-
-        // 위젯의 크기 조절
-        xWidth(tobj.nextSibling.nextSibling, new_width);
-        xHeight(tobj.nextSibling.nextSibling, new_height);
-
-        xWidth(tobj.parentNode, new_width);
-        xHeight(tobj.parentNode, new_height);
-
-    // 위젯 리사이즈 (좌측)
-    } else if(tobj.className == 'widgetResizeLeft' || tobj.className == 'widgetBoxResizeLeft') {
-
-        if(nx < zoneLeft) nx = zoneLeft;
-
-        if(cssFloat == 'left') nx = sx;
-
-        var new_width = pWidth + (sx - nx);
-        if(new_width < minWidth) new_width = minWidth;
-
-        var new_height = ny - sy;
-        if(new_height < minHeight) new_height = minHeight;
-
-        // 위젯의 크기 조절
-        xWidth(tobj.nextSibling, new_width);
-        xHeight(tobj.nextSibling, new_height);
-
-        xWidth(tobj.parentNode, new_width);
-        xHeight(tobj.parentNode, new_height);
-
-    // 위젯 드래그
-    } else {
-        var obj = widgetGetTmpObject(tobj);
-
-        xLeft(obj, parseInt(xPageX(obj),10) + parseInt(dx,10));
-        xTop(obj, parseInt(xPageY(obj),10) + parseInt(dy,10));
-
-        // 박스 안에 있을 경우에는 박스내의 위젯하고 자리를 바꾸고 그 외의 경우에는 박스를 빠져 나간다
-        if(tobj.parentNode != zonePageObj) {
-            // 박스내에 있는 위젯들을 구함
-            var widgetList = xGetElementsByClassName("widgetOutput",tobj.parentNode);
-
-            for(var i=0;i<widgetList.length;i++) {
-                var target_obj = widgetList[i];
-                var l =  xPageX(target_obj);
-                var t =  xPageY(target_obj);
-                var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);
-                var tt =  parseInt(t,10) + parseInt(xHeight(target_obj),10);
-
-                if( tobj != target_obj && tobj.xDPX >= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt && tobj.parentNode == target_obj.parentNode) {
-                    var next1 = target_obj.nextSibling;
-                    if(!next1) {
-                        next1 = xCreateElement("DIV");
-                        target_obj.parentNode.appendChild(next1);
-                    }
-                    var next2 = tobj.nextSibling;
-                    if(!next2) {
-                        next2 = xCreateElement("DIV");
-                        tobj.parentNode.appendChild(next2);
-                    }
-
-                    if(next1) next1.parentNode.insertBefore(tobj, next1);
-                    if(next2) next2.parentNode.insertBefore(target_obj, next2);
-                    doFitBorderSize();
-                    widgetList = null;
-                    return;
-                }
-            }
-            widgetList = null;
-
-            // 만약 다른 위젯과 자리를 바꾸지 못하였는데 자기 부모창밖에 있는게 확인이 되면 박스 밖으로 내보낸다.
-            var p_tobj = jQuery(tobj).parents('div.nullWidget').get(0);
-            var l =  xPageX(p_tobj);
-            var t =  xPageY(p_tobj);
-            var ll =  parseInt(l,10) + parseInt(xWidth(p_tobj),10);
-            var tt =  parseInt(t,10) + parseInt(xHeight(p_tobj),10);
-            if( (tobj.xDPX < l || tobj.xDPX > ll) || (tobj.xDPY < t || tobj.xDPY > tt) ) {
-
-//                zonePageObj.insertBefore(tobj, tobj.parentNode.parentNode.parentNode);
-                zonePageObj.insertBefore(tobj, jQuery(tobj).parents('div.widgetOutput[widget=widgetBox]').get(0));
-
-                doFitBorderSize();
-                return;
-            }
-
-        // 박스 밖에 있을 경우에는 다른 위젯과 자리를 바꾸거나 박스내에 들어가도록 한다
-        } else {
-            // 이동하려는 위젯이 박스 위젯이 아니라면 박스 위젯들을 구해서 입력 유무를 검사한다
-            if(tobj.getAttribute("widget")!="widgetBox") {
-
-                var boxList = xGetElementsByClassName("nullWidget", zonePageObj);
-                for(var i=0;i<boxList.length;i++) {
-                    var target_obj = boxList[i];
-
-                    xHeight(target_obj, xHeight(target_obj.parentNode));
-                    xWidth(target_obj, xWidth(target_obj.parentNode));
-
-                    var l =  xPageX(target_obj);
-                    var t =  xPageY(target_obj);
-                    var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);
-                    var tt =  parseInt(t,10) + parseInt(xHeight(target_obj),10);
-                    if( tobj.xDPX >= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt) {
-
-                        //박스 위젯이다
-                        if(target_obj.className == "nullWidget") {
-
-                            var wb_ws = jQuery('div.widget_inner',jQuery(target_obj));
-
-                            //박스 위젯에 위젯스타일이 적용 안된경우
-                            if(wb_ws.size() == 0){
-                                target_obj.appendChild(tobj);
-
-                            //박스 위젯에 위젯스타일이 적용된경우 또는 박스안에 위젯이 위젯스타일이 적용된겅우
-                            }else{
-                                wb_ws.get(0).appendChild(tobj);
-                             }
-
-                            // 이동을 멈춤
-                            widgetManualEnd();
-
-                            doFitBorderSize();
-                            boxList = null;
-                            return;
-                        }
-                    }
-                }
-                boxList = null;
-            }
-
-            // 다른 위젯들을 구해서 자리를 바꿈
-            var widgetList = xGetElementsByClassName("widgetOutput",zonePageObj);
-            for(var i=0;i<widgetList.length;i++) {
-                var target_obj = widgetList[i];
-                var widget = target_obj.getAttribute("widget");
-                if(widget == 'widgetBox' || target_obj.parentNode != zonePageObj) continue;
-                var l =  xPageX(target_obj);
-                var t =  xPageY(target_obj);
-                var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);
-                var tt =  parseInt(t,10) + parseInt(xHeight(target_obj),10);
-
-                if( tobj != target_obj && tobj.xDPX >= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt && tobj.parentNode == target_obj.parentNode) {
-                    var next1 = target_obj.nextSibling;
-                    if(!next1) next1 = target_obj.parentNode.lastChild;
-                    if(!next1) {
-                        next1 = xCreateElement("DIV");
-                        target_obj.parentNode.appendChild(next1);
-                    }
-                    var next2 = tobj.nextSibling;
-                    if(!next2) {
-                        next2 = xCreateElement("DIV");
-                        tobj.parentNode.appendChild(next2);
-                    }
-
-                    if(next1) next1.parentNode.insertBefore(tobj, next1);
-                    if(next2) next2.parentNode.insertBefore(target_obj, next2);
-                    doFitBorderSize();
-                    widgetList = null;
-                    return;
-                }
-            }
-            widgetList = null;
-        }
-    }
-}
-
-// 드래그 종료 (이동되는 object가 이동할 곳에 서서히 이동되는 것처럼 보이는 효과)
-function widgetDragEnd(tobj, px, py) {
-    var obj = widgetGetTmpObject(tobj);
-    widgetDisapear = widgetDisapearObject(obj, tobj);
-    widgetDragDisable(tobj.getAttribute('id'));
-}
-
-// 스르르 사라지게 함 (일단 사라지게 하는 기능을 제거.. 속도 문제)
-function widgetDisapearObject(obj, tobj) {
-    xInnerHtml(tobj,xInnerHtml(obj));
-    xInnerHtml(obj,'');
-    xDisplay(obj, 'none');
-    obj.parentNode.removeChild(obj);
-    widgetTmpObject[tobj.id] = null;
-    return;
-
-    /*
-    var it = 5;
-    var ib = 1;
-
-    var x = parseInt(xPageX(obj),10);
-    var y = parseInt(xPageY(obj),10);
-    var ldt = (x - parseInt(xPageX(tobj),10)) / ib;
-    var tdt = (y - parseInt(xPageY(tobj),10)) / ib;
-
-    return setInterval(function() {
-        if(ib < 1) {
-            clearInterval(widgetDisapear);
-            xInnerHtml(tobj,xInnerHtml(obj));
-            xInnerHtml(obj,'');
-            xDisplay(obj, 'none');
-            obj.parentNode.removeChild(obj);
-            widgetTmpObject[tobj.id] = null;
-            return;
-        }
-        ib -= 5;
-        x-=ldt;
-        y-=tdt;
-        xLeft(obj, x);
-        xTop(obj, y);
-    }, it/ib);
-    */
-}
-
-// 마우스다운 이벤트 발생시 호출됨
-function widgetMouseDown(e) {
-    var evt = new xEvent(e);
-    var obj = evt.target;
-
-    while(obj && !obj.draggable) {
-        obj = xParent(obj, true);
-    }
-    if(obj) {
-        xPreventDefault(e);
-        obj.xDPX = evt.pageX;
-        obj.xDPY = evt.pageY;
-        widgetDragManager.obj = obj;
-        xAddEventListener(document, 'mouseup', widgetMouseUp, false);
-        if (obj.dragStart) obj.dragStart(obj, evt.pageX, evt.pageY);
-    }
-}
-
-// 마우스 버튼을 놓았을때 동작될 함수 (각종 이벤트 해제 및 변수 설정 초기화)
-function widgetMouseUp(e) {
-    if (widgetDragManager.obj) {
-        xPreventDefault(e);
-        xRemoveEventListener(document, 'mouseup', widgetMouseUp, false);
-
-        if (widgetDragManager.obj.dragEnd) {
-            var evt = new xEvent(e);
-            widgetDragManager.obj.dragEnd(widgetDragManager.obj, evt.pageX, evt.pageY);
-        }
-
-        widgetDragManager.obj = null;
-        widgetDragManager.isDrag = false;
-    }
-}
-
-// 드래그할때의 object이동등을 담당
-function widgetDragMouseMove(e) {
-    var evt = new xEvent(e);
-    if(widgetDragManager.obj) {
-        xPreventDefault(e);
-
-        var obj = widgetDragManager.obj;
-        var dx = evt.pageX - obj.xDPX;
-        var dy = evt.pageY - obj.xDPY;
-
-        obj.xDPX = evt.pageX;
-        obj.xDPY = evt.pageY;
-
-        if (obj.drag) {
-            obj.drag(obj, dx, dy);
-        } else {
-            xMoveTo(obj, xLeft(obj) + dx, xTop(obj) + dy);
-        }
-    }
-}
-
-// 해당 object 에 더 이상 drag가 되지 않도록 설정
-function widgetDragDisable(id) {
-    if (!widgetDragManager) return;
-    var obj = xGetElementById(id);
-    obj.draggable = false;
-    obj.dragStart = null;
-    obj.drag = null;
-    obj.dragEnd = null;
-    //obj.style.backgroundColor = obj.getAttribute('source_color');
-
-    xRemoveEventListener(obj, 'mousedown', widgetMouseDown, false);
-
-    return;
-}
-
-// 강제로 드래그를 종료시킴
-function widgetManualEnd() {
-    var tobj = widgetDragManager.obj;
-    if(!tobj) return;
-
-    xRemoveEventListener(document, 'mouseup', widgetMouseUp, false);
-    xAddEventListener(document, 'mousemove', widgetDragMouseMove, false);
-
-    var obj = widgetGetTmpObject(tobj);
-    widgetDisapear = widgetDisapearObject(obj, tobj);
-    widgetDragDisable(tobj.getAttribute('id'));
-
-    widgetDragManager.obj = null;
-    widgetDragManager.isDrag = false;
-}
+/**
+ * @file   modules/widget/js/widget.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  위젯 관리용 자바스크립트
+ **/
+
+/* DOM 속성을 구하기 위한 몇가지 함수들.. */
+// style의 값을 구하는게 IE랑 그외가 다름.
+function getStyle(obj) {
+    var style = obj.getAttribute("style");
+    if(!style)
+    {
+        style = obj.style;
+    }
+    if(typeof(style)=="object") style = style["cssText"];
+    return style;
+}
+
+// float: 값을 구하는게 IE랑 그외가 다름
+function getFloat(obj) {
+    var cssFloat = xIE4Up?obj.style.styleFloat:obj.style.cssFloat;
+    if(!cssFloat) cssFloat = 'left';
+    return cssFloat;
+}
+function setFloat(obj, fl) {
+    if(xIE4Up) obj.style.styleFloat = fl;
+    else obj.style.cssFloat = fl;
+}
+
+// padding값을 구하는 함수 (없을 경우 0으로 세팅), zbxe의 위젯에서만 사용
+function getPadding(obj, direct) {
+    var padding = obj.getAttribute("widget_padding_"+direct);
+    if(!padding || padding == null) padding = 0;
+    return padding;
+}
+
+
+/* 위젯 핸들링 시작 */
+var zonePageObj = null;
+var zoneModuleSrl = 0;
+function doStartPageModify(zoneID, module_srl) {
+    zonePageObj = xGetElementById(zoneID);
+    zoneModuleSrl = module_srl;
+
+    // 위젯 크기/여백 조절 레이어를 가장 밖으로 뺌
+	jQuery('#tmpPageSizeLayer')
+		.attr('id', 'pageSizeLayer')
+		.css({position:'absolute',left:0,top:0})
+		.hide()
+		.appendTo('body')
+		.find('>form')
+		.submit(function(){ doApplyWidgetSize(this); return false; });
+
+    // 모든 위젯들의 크기를 정해진 크기로 맞춤
+    doFitBorderSize();
+
+    // 드래그와 리사이즈와 관련된 이벤트 리스너 생성
+    xAddEventListener(document,"click",doCheckWidget);
+    xAddEventListener(document,"mousedown",doCheckWidgetDrag);
+    xAddEventListener(document,'mouseover',widgetSetup);
+}
+
+
+// 내용 모두 삭제
+function removeAllWidget() {
+    if(!confirm(confirm_delete_msg)) return;
+	restoreWidgetButtons();
+	xInnerHtml(zonePageObj,'');
+}
+
+/**
+ * 특정 영역에 편집된 위젯들을 약속된 태그로 변환하여 return
+ **/
+function getWidgetContent(obj) {
+    var html = "";
+    if(typeof(obj)=='undefined' || !obj) obj = zonePageObj;
+
+    var widget = null;
+    jQuery('div.widgetOutput',obj).each(function(){
+    if(jQuery(this).parent().get(0) != obj) return;
+        widget = jQuery(this).attr('widget');
+            switch(widget) {
+                case 'widgetBox' :
+                        html += getWidgetBoxCode(this, widget);
+                    break;
+                case 'widgetContent' :
+                        html += getContentWidgetCode(this, widget);
+                    break;
+                default :
+                        html += getWidgetCode(this, widget);
+                    break;
+            }
+    });
+
+    return html;
+}
+
+// 컨텐츠 위젯 코드 구함
+function getContentWidgetCode(childObj, widget) {
+    var cobj = childObj.firstChild;
+
+    var widgetContent = jQuery('div.widgetContent',childObj);
+    var body = '';
+    var document_srl = 0;
+    var attrs ='';
+
+    if(widgetContent.size() > 0){
+        document_srl = jQuery(childObj).attr('document_srl');
+        if(document_srl>0){
+            body = '';
+        }else{
+            body = widgetContent.html();
+        }
+
+
+        for(var i=0;i<childObj.attributes.length;i++) {
+            if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue) continue;
+            var name = childObj.attributes[i].nodeName.toLowerCase();
+            if(name == "contenteditable"
+                || name == "id"
+                || name=="style"
+                || name=="src"
+                || name=="widget"
+                || name == "body"
+                || name == "class"
+                || name == "widget_width"
+                || name == "widget_width_type"
+                || name == "xdpx"
+                || name == "xdpy"
+                || name == "height"
+                || name == "document_srl"
+                || name == "widget_padding_left"
+                || name == "widget_padding_right"
+                || name == "widget_padding_top"
+                || name == "widget_padding_bottom"
+				|| name == "hasContent") continue;
+            var value = childObj.attributes[i].nodeValue;
+            if(!value) continue;
+            attrs += name+'="'+escape(value)+'" ';
+        }
+        return '<img hasContent="true" class="zbxe_widget_output" widget="widgetContent" style="'+getStyle(childObj)+'" body="'+body+'" document_srl="'+document_srl+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj, 'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj,'bottom')+'" '+attrs+' />';
+    }else{
+        return '';
+    }
+}
+
+// 위젯 박스 코드 구함
+function getWidgetBoxCode(childObj, widget) {
+
+    var attrs = "";
+    for(var i=0;i<childObj.attributes.length;i++) {
+        if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue || /^jquery[0-9]+/i.test(childObj.attributes[i].nodeName)) continue;
+
+        var name = childObj.attributes[i].nodeName.toLowerCase();
+        if(name == "widget_padding_left" || name == "widget_padding_right" || name == "widget_padding_top" || name == "widget_padding_bottom" || name == "contenteditable" || name == "id" || name=="style" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue;
+        var value = childObj.attributes[i].nodeValue;
+        if(!value || value == "Array") continue;
+        attrs += name+'="'+escape(value)+'" ';
+    }
+
+
+    var o;
+
+    if(jQuery('.widget_inner',childObj).size()>0){
+        o = jQuery('.widget_inner',childObj);
+        o = o.get(0);
+    }else{
+        o = jQuery('.nullWidget',childObj).get(0);
+    }
+
+    var body = getWidgetContent(o);
+    return '<div widget="widgetBox" style="'+getStyle(childObj)+'" widget_padding_left="'+getPadding(childObj,'left')+'" widget_padding_right="'+getPadding(childObj,'right')+'" widget_padding_top="'+getPadding(childObj, 'top')+'" widget_padding_bottom="'+getPadding(childObj, 'bottom')+'" '+attrs+'><div><div>'+body+'</div></div></div>';
+
+}
+
+
+
+
+// 일반 위젯 컨텐츠 코드 구함
+function getWidgetCode(childObj, widget) {
+    var attrs = "";
+    var code = "";
+    for(var i=0;i<childObj.attributes.length;i++) {
+        if(!childObj.attributes[i].nodeName || !childObj.attributes[i].nodeValue || /^jquery[0-9]+/i.test(childObj.attributes[i].nodeName)) continue;
+
+        var name = childObj.attributes[i].nodeName.toLowerCase();
+        if(name == "contenteditable" || name == "id" || name=="style" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue;
+        var value = childObj.attributes[i].nodeValue;
+        if(!value || value == "Array" || value == "null") continue;
+
+        attrs += name+'="'+escape(value)+'" ';
+    }
+    var style = childObj.getAttribute("style");
+    return '<img class="zbxe_widget_output" style="'+getStyle(childObj)+'" widget="'+widget+'" '+attrs+' />';
+}
+
+/**
+ * 직접 내용을 입력하는 위젯을 추가
+ **/
+// 팝업 띄움
+function doAddContent(mid) {
+    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetAdminAddContent').setQuery('module_srl',zoneModuleSrl).setQuery('mid',mid);
+	popopen(url, "addContent");
+}
+
+// 직접 내용을 입력하기 위한 에디터 활성화 작업 및 form 데이터 입력
+function doSyncPageContent() {
+    if(opener && opener.selectedWidget) {
+
+        var fo_obj = xGetElementById("content_fo");
+        var sel_obj = opener.selectedWidget;
+        fo_obj.style.value = getStyle(opener.selectedWidget);
+        fo_obj.widget_padding_left.value = getPadding(sel_obj, 'left');
+        fo_obj.widget_padding_right.value = getPadding(sel_obj,'right');
+        fo_obj.widget_padding_bottom.value = getPadding(sel_obj,'bottom');
+        fo_obj.widget_padding_top.value = getPadding(sel_obj,'top');
+
+        var obj = sel_obj.firstChild;
+        while(obj && obj.className != "widgetContent") obj = obj.nextSibling;
+        if(obj && obj.className == "widgetContent") {
+            if(!fo_obj.document_srl || fo_obj.document_srl.value == 0) {
+                try {
+                    var content = Base64.decode(xInnerHtml(obj));
+                    content = editorReplacePath(content);
+                    xGetElementById("content_fo").content.value = content;
+                    xe.Editors["1"].exec("SET_IR", [content]);
+                }
+                catch(e)
+                {
+                }
+            }
+        }
+    }
+
+    if(typeof(editorStart)!='undefined') editorStart(1, "module_srl", "content", false, 400 );
+    //editor_upload_start(1);
+
+    //setFixedPopupSize();
+}
+
+// 부모창에 위젯을 추가
+function addContentWidget(fo_obj) {
+    var editor_sequence = fo_obj.getAttribute('editor_sequence');
+    var mid = fo_obj.mid.value;
+    var module_srl = fo_obj.module_srl.value;
+    var document_srl = fo_obj.document_srl.value;
+    var content = editorGetContent(editor_sequence);
+    var response_tags = new Array('error','message','document_srl');
+    var params = new Array();
+    params['editor_sequence'] = editor_sequence;
+    params['content'] = content;
+    params['module_srl'] = module_srl;
+    params['document_srl'] = document_srl;
+    exec_xml('widget',"procWidgetInsertDocument",params,completeAddContent,response_tags,params,fo_obj);
+    return false;
+
+}
+
+function completeAddContent(ret_obj, response_tags, params, fo_obj) {
+    var document_srl = ret_obj['document_srl'];
+
+    var contentWidget = opener.jQuery('div.widgetOutput[widget=widgetContent][document_srl='+document_srl+']');
+    var attr = null;
+    if(contentWidget.size()>0) {
+        attr = contentWidget.get(0).attributes;
+    }
+
+    var editor_sequence = params['editor_sequence'];
+    var content = editorGetContent(editor_sequence);
+
+    var tpl = ''+
+        '<div class="widgetOutput" style="'+fo_obj.style.value+'" widget_padding_left="'+fo_obj.widget_padding_left.value+'" widget_padding_right="'+fo_obj.widget_padding_right.value+'" widget_padding_top="'+fo_obj.widget_padding_top.value+'" widget_padding_bottom="'+fo_obj.widget_padding_bottom.value+'" document_srl="'+document_srl+'" widget="widgetContent">'+
+        '<button type="button" class="widgetResize"></button>'+
+        '<button type="button" class="widgetResizeLeft"></button>'+
+        '<div class="widgetBorder">'+
+        '<div style="padding:'+fo_obj.widget_padding_top.value+'px '+fo_obj.widget_padding_right.value+'px'+fo_obj.widget_padding_bottom.value+'px'+fo_obj.widget_padding_left.value+'px"></div>'+content+
+        '</div>'+
+        '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;"></div>'+
+        '</div>';
+
+    var oTpl = jQuery(tpl);
+    if(attr) {
+        jQuery.each(attr,function(i){
+            if(!oTpl.attr(attr[i].name)){
+                oTpl.attr(attr[i].name,attr[i].value);
+            }
+        });
+    }
+
+    oTpl = jQuery('<div>').append(oTpl);
+    tpl = oTpl.html();
+    opener.doAddWidgetCode(tpl);
+    window.close();
+}
+
+/* 박스 위젯 추가 */
+function doAddWidgetBox() {
+    var tpl = ''+
+    '<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>';
+    xInnerHtml(zonePageObj, xInnerHtml(zonePageObj)+tpl);
+    doFitBorderSize();
+}
+
+
+/* 일반 위젯을 추가하기 위해 위젯 팝업창을 띄움 */
+function doAddWidget(fo) {
+    var sel = fo.widget_list;
+    var idx = sel.selectedIndex;
+    var val = sel.options[idx].value;
+    var module_srl = fo.module_srl.value;
+
+    var url = request_uri.setQuery('module','widget').setQuery('act','dispWidgetGenerateCodeInPage').setQuery('selected_widget', val).setQuery('module_srl', module_srl);
+    popopen(url,'GenerateWidgetCode');
+}
+
+
+
+// widgetBorder에 height를 widgetOutput와 맞춰줌
+function doFitBorderSize() {
+    var obj_list = xGetElementsByClassName('widgetBorder', zonePageObj);
+    for(var i=0;i<obj_list.length;i++) {
+        var obj = obj_list[i];
+        var height = xHeight(obj.parentNode);
+        if(height<3) height = 20;
+        xHeight(obj, height);
+        obj.parentNode.style.clear = '';
+    }
+    var obj_list = xGetElementsByClassName('widgetBoxBorder', zonePageObj);
+    for(var i=0;i<obj_list.length;i++) {
+        var obj = obj_list[i];
+        xHeight(obj, xHeight(obj.parentNode));
+        obj.parentNode.style.clear = '';
+    }
+}
+
+var selectedWidget = null;
+var writedText = null;
+var checkDocumentWrite = false;
+
+// document.write(ln)의 경우 ajax로 처리시 가로채기 위한 함수
+// 아래 함수는 str 내용을 단지 전역 변수에 보관 후 doAddWidgetCode 에서 재사용하기 위해 사용됨.
+window.document.write = window.document.writeln = function(str){
+    if(checkDocumentWrite) {
+        writedText = str;
+        return;
+    }
+    if ( str.match(/^<\//) ) return;
+    if ( !window.opera ) str = str.replace(/&(?![#a-z0-9]+;)/g, "&");
+    str = str.replace(/(<[a-z]+)/g, "$1 xmlns='http://www.w3.org/1999/xhtml'");
+
+    var div = xCreateElement("DIV");
+    xInnerHtml(div, str);
+
+    var pos;
+    pos = document.getElementsByTagName("*");
+    pos = pos[pos.length - 1];
+    var nodes = div.childNodes;
+    while ( nodes.length ) {
+        pos.parentNode.appendChild( nodes[0] );
+    }
+}
+
+// 위젯 추가
+function doAddWidgetCode(widget_code) {
+    restoreWidgetButtons();
+
+    // css 추가
+    var tmp = widget_code;
+    while(tmp.indexOf("<!--Meta:")>-1) {
+        var pos = tmp.indexOf("<!--Meta:");
+        tmp = tmp.substr(pos);
+        var eos = tmp.indexOf("-->");
+        var cssfile = tmp.substr(9,eos-9);
+        if(cssfile.indexOf('.js')>-1) {
+            tmp = tmp.substr(eos);
+            continue;
+        }
+        if(!cssfile) break;
+        tmp = tmp.substr(eos);
+
+        var cssfile = request_uri+'/'+cssfile;
+        if(typeof(document.createStyleSheet)=='undefined') {
+            var css ='<link rel="stylesheet" href="'+cssfile+'" type="text/css" charset="UTF-8" />';
+            var dummy  = xCreateElement("DIV");
+            xInnerHtml(dummy , css);
+            document.body.appendChild(dummy);
+        } else {
+            document.createStyleSheet(cssfile,0);
+        }
+    }
+
+    // widget 코드에서 javascript 부분을 빼서 eval후 결과값을 대체함
+    checkDocumentWrite = true; ///< document.write(ln)등의 함수값을 바로 사용하기 위한 check flag
+
+    // widget_code의 javascript 부분 수정
+    var tmp = widget_code.toLowerCase();
+    while(tmp.indexOf("<script")>-1) {
+
+        var pos = tmp.indexOf("<script");
+
+        tmp = tmp.substr(pos);
+        var length = tmp.indexOf("</script>")+9;
+
+        var script = widget_code.substr(pos,length);
+        script = script.replace(/^<script([^>]*)>/i,'').replace(/<\/script>$/i,'');
+
+        writedText = null;
+        eval(script);
+        widget_code = widget_code.substr(0,pos)+writedText+widget_code.substr(pos+length);
+        tmp = widget_code.toLowerCase();
+    }
+
+
+
+    // html 추가
+    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);
+        var n = jQuery('div.widget_inner',obj);
+
+        if(n.size()==0) n = jQuery('div.nullWidget',obj);
+        if(o.size()==0) o = jQuery('div.nullWidget',selectedWidget);
+
+        n.html(o.html());
+
+
+        selectedWidget.parentNode.insertBefore(obj, selectedWidget);
+        selectedWidget.parentNode.removeChild(selectedWidget);
+    } else {
+        xGetElementById('zonePageContent').appendChild(obj);
+    }
+    checkDocumentWrite = false;
+    selectedWidget = null;
+
+    /*
+    //zoneObj.style.visibility = 'hidden';
+    zoneObj.style.opacity = 0.2;
+    zoneObj.style.filter = "alpha(opacity=20)";
+
+    // 위젯 추가후 페이지 리로딩
+    var tpl = getWidgetContent();
+
+    var fo_obj = xGetElementById('pageFo');
+    fo_obj.content.value = tpl;
+    fo_obj.mid.value = current_mid;
+    fo_obj.submit();
+    */
+}
+
+// 클릭 이벤트시 위젯의 수정/제거/이벤트 무효화 처리
+function doCheckWidget(e) {
+    var evt = new xEvent(e); if(!evt.target) return;
+    var obj = evt.target;
+
+    selectedWidget = null;
+
+    var pObj = obj.parentNode;
+    while(pObj) {
+        if(pObj.id == "pageSizeLayer") return;
+        pObj = pObj.parentNode;
+    }
+
+    doHideWidgetSizeSetup();
+    // 위젯 설정
+    if(obj.className == 'widgetSetup') {
+        var p_obj = obj.parentNode.parentNode;
+        var widget = p_obj.getAttribute("widget");
+        if(!widget) return;
+        selectedWidget = p_obj;
+        if(widget == 'widgetContent') popopen(request_uri+"?module=widget&act=dispWidgetAdminAddContent&module_srl="+zoneModuleSrl+"&document_srl="+p_obj.getAttribute("document_srl"), "addContent");
+        else popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
+        return;
+
+    // 위젯 스타일
+    } else if(obj.className == 'widgetStyle') {
+        var p_obj = obj.parentNode.parentNode;
+        var widget = p_obj.getAttribute("widget");
+        var widgetstyle = p_obj.getAttribute("widgetstyle");
+        if(!widget) return;
+        selectedWidget = p_obj;
+        popopen(request_uri+"?module=widget&act=dispWidgetStyleGenerateCodeInPage&selected_widget="+widget+"&widgetstyle="+widgetstyle,'GenerateCodeInPage');
+        return;
+
+    // 위젯 복사
+    } else if(obj.className == 'widgetCopy' && obj.parentNode.parentNode.className == 'widgetOutput') {
+        p_obj = obj.parentNode.parentNode;
+        restoreWidgetButtons();
+
+        if(p_obj.getAttribute('widget')=='widgetContent' && p_obj.getAttribute('document_srl') ) {
+            var response_tags = new Array('error','message','document_srl');
+            var params = new Array();
+            params['document_srl'] =p_obj.getAttribute('document_srl');
+            exec_xml('widget','procWidgetCopyDocument', params, completeCopyWidgetContent, response_tags, params, p_obj);
+            return;
+        } else {
+            var dummy = xCreateElement("DIV");
+            xInnerHtml(dummy,xInnerHtml(p_obj));
+
+            dummy.widget_sequence = '';
+            dummy.className = "widgetOutput";
+            for(var i=0;i<p_obj.attributes.length;i++) {
+                if(!p_obj.attributes[i].nodeName || !p_obj.attributes[i].nodeValue) continue;
+                var name = p_obj.attributes[i].nodeName.toLowerCase();
+
+                var value = p_obj.attributes[i].nodeValue;
+                if(!value) continue;
+
+                if(value && typeof(value)=="string") value = value.replace(/\"/ig,'&quot;');
+
+                dummy.setAttribute(name, value);
+            }
+
+            if(xIE4Up) dummy.style["cssText"] = p_obj.style["cssText"];
+            p_obj.parentNode.insertBefore(dummy, p_obj);
+        }
+        return;
+
+    // 위젯 사이트/ 여백 조절
+    } else if(obj.className == 'widgetSize' || obj.className == 'widgetBoxSize') {
+        var p_obj = obj.parentNode.parentNode;
+        var widget = p_obj.getAttribute("widget");
+        if(!widget) return;
+        selectedWidget = p_obj;
+        doShowWidgetSizeSetup(evt.pageX, evt.pageY, selectedWidget);
+        return;
+
+    // 위젯 제거
+    } else if(obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') {
+        var p_obj = obj.parentNode.parentNode;
+        var widget = p_obj.getAttribute("widget");
+        if(confirm(confirm_delete_msg)) {
+            restoreWidgetButtons();
+			p_obj.parentNode.removeChild(p_obj);
+        }
+        return;
+    }
+
+    // 내용 클릭 무효화
+    var p_obj = obj;
+    while(p_obj) {
+        if(p_obj.className == 'widgetOutput') {
+            evt.cancelBubble = true;
+            evt.returnValue = false;
+            xPreventDefault(e);
+            xStopPropagation(e);
+            break;
+        }
+        p_obj = p_obj.parentNode;
+    }
+}
+
+// content widget 복사
+function completeCopyWidgetContent(ret_obj, response_tags, params, p_obj) {
+    var document_srl = ret_obj['document_srl'];
+    var dummy = xCreateElement("DIV");
+    xInnerHtml(dummy,xInnerHtml(p_obj));
+
+
+    dummy.widget_sequence = '';
+    dummy.className = "widgetOutput";
+    for(var i=0;i<p_obj.attributes.length;i++) {
+        if(!p_obj.attributes[i].nodeName || !p_obj.attributes[i].nodeValue) continue;
+        var name = p_obj.attributes[i].nodeName.toLowerCase();
+
+        var value = p_obj.attributes[i].nodeValue;
+        if(!value) continue;
+
+        if(value && typeof(value)=="string") value = value.replace(/\"/ig,'&quot;');
+
+        dummy.setAttribute(name, value);
+    }
+    p_obj.setAttribute('document_srl', document_srl);
+
+    if(xIE4Up) dummy.style["cssText"] = p_obj.getAttribute("style")["cssText"];
+    p_obj.parentNode.insertBefore(dummy, p_obj);
+}
+
+// content widget 제거
+function completeDeleteWidgetContent(ret_obj, response_tags, params, p_obj) {
+    restoreWidgetButtons();
+    p_obj.parentNode.removeChild(p_obj);
+}
+
+
+// 마우스 다운 이벤트 발생시 위젯의 이동을 처리
+function doCheckWidgetDrag(e) {
+    var evt = new xEvent(e); if(!evt.target) return;
+    var obj = evt.target;
+
+    if(jQuery(obj).parents('#pageSizeLayer').size() > 0) return;
+
+    doHideWidgetSizeSetup();
+
+    if(obj.className == 'widgetSetup' || obj.className == 'widgetStyle' || obj.className == 'widgetCopy' || obj.className == 'widgetBoxCopy' || obj.className == 'widgetSize' || obj.className == 'widgetBoxSize' || obj.className == 'widgetRemove' || obj.className == 'widgetBoxRemove') return;
+
+    p_obj = obj;
+    while(p_obj) {
+        if(p_obj.className == 'widgetOutput' || p_obj.className == 'widgetResize' || p_obj.className == 'widgetResizeLeft' || p_obj.className == 'widgetBoxResize' || p_obj.className == 'widgetBoxResizeLeft') {
+            widgetDragEnable(p_obj, widgetDragStart, widgetDrag, widgetDragEnd);
+            widgetMouseDown(e);
+            return;
+        }
+        p_obj = p_obj.parentNode;
+    }
+}
+
+function _getInt(val) {
+    if(!val || val == "null") return 0;
+    if(parseInt(val,10)==NaN) return 0;
+    return parseInt(val,10);
+}
+
+// 위젯 크기 조절 레이어를 보여줌
+var selectedSizeWidget = null;
+function doShowWidgetSizeSetup(px, py, obj) {
+    var layer = jQuery('#pageSizeLayer');
+    var form  = layer.find('>form:first');
+	var obj   = jQuery(obj);
+
+	if (!form.length) return;
+
+	selectedSizeWidget = obj[0];
+
+	var opts = {
+		widget_align : obj.css('float'),
+
+		width  : obj[0].style.width,
+		height : obj[0].style.height,
+
+		padding_left   : _getInt(obj.attr('widget_padding_left')),
+		padding_right  : _getInt(obj.attr('widget_padding_right')),
+		padding_top    : _getInt(obj.attr('widget_padding_top')),
+		padding_bottom : _getInt(obj.attr('widget_padding_bottom')),
+
+		margin_left    : _getInt(obj[0].style.marginLeft),
+		margin_right   : _getInt(obj[0].style.marginRight),
+		margin_top     : _getInt(obj[0].style.marginTop),
+		margin_bottom  : _getInt(obj[0].style.marginBottom),
+
+		border_top_color : transRGB2Hex(obj[0].style.borderTopColor),
+		border_top_thick : obj[0].style.borderTopWidth.replace(/px$/i, ''),
+		border_top_type  : obj[0].style.borderTopStyle,
+
+		border_bottom_color : transRGB2Hex(obj[0].style.borderBottomColor),
+		border_bottom_thick : obj[0].style.borderBottomWidth.replace(/px$/i, ''),
+		border_bottom_type  : obj[0].style.borderBottomStyle,
+
+		border_right_color : transRGB2Hex(obj[0].style.borderRightColor),
+		border_right_thick : obj[0].style.borderRightWidth.replace(/px$/i, ''),
+		border_right_type  : obj[0].style.borderRightStyle,
+
+		border_left_color : transRGB2Hex(obj[0].style.borderLeftColor),
+		border_left_thick : obj[0].style.borderLeftWidth.replace(/px$/i, ''),
+		border_left_type  : obj[0].style.borderLeftStyle,
+
+		background_color     : transRGB2Hex(obj[0].style.backgroundColor),
+		background_image_url : obj[0].style.backgroundImage.replace(/^url\(/i,'').replace(/\)$/i,''),
+
+		background_x : 0,
+		background_y : 0,
+
+		background_repeat : obj[0].style.backgroundRepeat
+	};
+
+	// background position
+	var pos = obj[0].style.backgroundPosition;
+	if(pos) {
+		pos = pos.split(' ');
+		if(pos.length == 2) {
+			opts.background_x = pos[0];
+			opts.background_y = pos[1];
+		}
+	}
+
+	layer.css('top', py+'px').show();
+	var _zonePageObj   = jQuery(zonePageObj)
+	var zoneOffsetLeft = _zonePageObj.offset().left;
+	var zoneWidth      = _zonePageObj.width();
+	if (px + layer.width() > zoneOffsetLeft + zoneWidth) px = zoneOffsetLeft + zoneWidth - layer.width() - 5;
+	layer.css('left', px+'px');
+
+	jQuery.each(opts, function(key, val){
+		var el = form[0].elements[key];
+		if (el) el.value = val;
+        if (el.tagName.toLowerCase() == "select")
+        {
+            if(el.selectedIndex == -1) {
+                el.selectedIndex = 0;
+            }
+        }
+	});
+
+	try { form[0].elements[0].focus() } catch(e) {};
+}
+
+function doHideWidgetSizeSetup() {
+	jQuery('#pageSizeLayer').hide();
+	//var layer = xGetElementById("pageSizeLayer");
+    //layer.style.visibility = "hidden";
+    //layer.style.display = "none";
+}
+
+function _getSize(value) {
+    if(!value) return 0;
+    var type = "px";
+    if(value.lastIndexOf("%")>=0)  type = "%";
+    var num = parseInt(value,10);
+    if(num<1) return 0;
+    if(type == "%" && num > 100) num = 100;
+    return ""+num+type;
+}
+
+function _getBorderStyle(fld_color, fld_thick, fld_type) {
+    var color = fld_color.value;
+    color = color.replace(/^#/,'');
+    if(!color) color = '#FFFFFF';
+    else color = '#'+color;
+    var width = fld_thick.value;
+    if(!width) width = '0px';
+    else width = parseInt(width,10)+'px';
+    var style = fld_type.options[fld_type.selectedIndex].value;
+    if(!style) style = 'solid';
+
+    var str = color+' '+width+' '+style;
+    return str;
+}
+
+function _getBGColorStyle(fld_color) {
+    var color = fld_color.replace(/^#/,'');
+    if(!color) color = '#FFFFFF';
+    else color = '#'+color;
+    return color;
+}
+
+function doApplyWidgetSize(fo_obj) {
+    if(selectedSizeWidget) {
+        if(fo_obj.widget_align.selectedIndex == 1) setFloat(selectedSizeWidget, 'right');
+        else setFloat(selectedSizeWidget, 'left');
+
+        var width = _getSize(fo_obj.width.value);
+        if(width) selectedSizeWidget.style.width = width;
+
+        var height = _getSize(fo_obj.height.value);
+        if(height && height != "100%") selectedSizeWidget.style.height = height;
+        else {
+            selectedSizeWidget.style.height = '';
+            var widgetBorder = xGetElementsByClassName('widgetBorder',selectedSizeWidget);
+            for(var i=0;i<widgetBorder.length;i++) {
+                var obj = widgetBorder[i];
+                obj.style.height = '';
+            }
+        }
+
+        selectedSizeWidget.style.borderTop = _getBorderStyle(fo_obj.border_top_color, fo_obj.border_top_thick, fo_obj.border_top_type);
+        selectedSizeWidget.style.borderBottom = _getBorderStyle(fo_obj.border_bottom_color, fo_obj.border_bottom_thick, fo_obj.border_bottom_type);
+        selectedSizeWidget.style.borderLeft = _getBorderStyle(fo_obj.border_left_color, fo_obj.border_left_thick, fo_obj.border_left_type);
+        selectedSizeWidget.style.borderRight = _getBorderStyle(fo_obj.border_right_color, fo_obj.border_right_thick, fo_obj.border_right_type);
+
+        selectedSizeWidget.style.marginTop = _getSize(fo_obj.margin_top.value);
+        selectedSizeWidget.style.marginRight = _getSize(fo_obj.margin_right.value);
+        selectedSizeWidget.style.marginBottom = _getSize(fo_obj.margin_bottom.value);
+        selectedSizeWidget.style.marginLeft = _getSize(fo_obj.margin_left.value);
+
+        if(!fo_obj.background_color.value || fo_obj.background_color.value == 'transparent') selectedSizeWidget.style.backgroundColor = 'transparent';
+        else selectedSizeWidget.style.backgroundColor = _getBGColorStyle(fo_obj.background_color.value);
+
+        var image_url = fo_obj.background_image_url.value;
+        if(image_url && image_url != 'none') selectedSizeWidget.style.backgroundImage = "url("+image_url+")";
+        else selectedSizeWidget.style.backgroundImage = 'none';
+
+        switch(fo_obj.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'; break;
+        }
+
+        selectedSizeWidget.style.backgroundPosition = fo_obj.background_x.value+' '+fo_obj.background_y.value;
+
+        var borderObj = selectedSizeWidget.firstChild;
+        while(borderObj) {
+            if(borderObj.nodeName == "DIV" && (borderObj.className == "widgetBorder" || borderObj.className == "widgetBoxBorder")) {
+                var contentObj = borderObj.firstChild;
+                while(contentObj) {
+                    if(contentObj.nodeName == "DIV") {
+                        contentObj.style.padding = "";
+                        var paddingLeft = _getSize(fo_obj.padding_left.value);
+                        if(paddingLeft) {
+                            contentObj.style.paddingLeft = paddingLeft;
+                            selectedSizeWidget.setAttribute('widget_padding_left', paddingLeft);
+                        } else {
+                            contentObj.style.paddingLeft = '';
+                            selectedSizeWidget.setAttribute('widget_padding_left', '');
+                        }
+
+                        var paddingRight = _getSize(fo_obj.padding_right.value);
+                        if(paddingRight) {
+                            contentObj.style.paddingRight = paddingRight;
+                            selectedSizeWidget.setAttribute('widget_padding_right', paddingRight);
+                        } else {
+                            contentObj.style.paddingRight = '';
+                            selectedSizeWidget.setAttribute('widget_padding_right', '');
+                        }
+
+                        var paddingTop = _getSize(fo_obj.padding_top.value);
+                        if(paddingTop) {
+                            contentObj.style.paddingTop = paddingTop;
+                            selectedSizeWidget.setAttribute('widget_padding_top', paddingTop);
+                        } else {
+                            contentObj.style.paddingTop = '';
+                            selectedSizeWidget.setAttribute('widget_padding_top', '');
+                        }
+
+                        var paddingBottom = _getSize(fo_obj.padding_bottom.value);
+                        if(paddingBottom) {
+                            contentObj.style.paddingBottom = paddingBottom;
+                            selectedSizeWidget.setAttribute('widget_padding_bottom', paddingBottom);
+                        } else {
+                            contentObj.style.paddingBottom = '';
+                            selectedSizeWidget.setAttribute('widget_padding_bottom', '');
+                        }
+
+                        break;
+                    }
+                    contentObj = contentObj.nextSibling;
+                }
+
+                break;
+            }
+
+            borderObj = borderObj.nextSibling;
+        }
+
+        selectedWidget = selectedSizeWidget;
+        selectedSizeWidget = null;
+
+        var widget = selectedWidget.getAttribute("widget");
+        var params = new Array();
+        for(var i=0;i<selectedWidget.attributes.length;i++) {
+            if(!selectedWidget.attributes[i].nodeName || !selectedWidget.attributes[i].nodeValue) continue;
+            var name = selectedWidget.attributes[i].nodeName.toLowerCase();
+            if(name == "contenteditable" || name == "id" || name=="src" || name=="widget" || name == "body" || name == "class" || name == "widget_width" || name == "widget_width_type" || name == "xdpx" || name == "xdpy" || name == "height") continue;
+            var value = selectedWidget.attributes[i].nodeValue;
+            if(!value || value == "Array") continue;
+            params[name] = value;
+        }
+        params["style"] = getStyle(selectedWidget);
+		params["selected_widget"] = widget;
+        params["module_srl"] = xGetElementById("pageFo").module_srl.value;
+
+        exec_xml('widget','procWidgetGenerateCodeInPage',params,function(ret_obj) { doAddWidgetCode(ret_obj["widget_code"]);  },new Array('error','message','widget_code','tpl','css_header'));
+    }
+    doHideWidgetSizeSetup();
+}
+
+var hideElements = new Array();
+function restoreWidgetButtons() {
+    var widgetButton = xGetElementById('widgetButton');
+    var boxWidgetButton = xGetElementById('widgetBoxButton');
+    if(!widgetButton || !boxWidgetButton) return;
+
+    widgetButton.style.visibility = 'hidden';
+    xGetElementById("zonePageContent").parentNode.appendChild(widgetButton);
+    boxWidgetButton.style.visibility = 'hidden';
+    xGetElementById("zonePageContent").parentNode.appendChild(boxWidgetButton);
+
+    for(var i=0;i<hideElements.length;i++) {
+        var obj = hideElements[0];
+        obj.style.paddingTop = 0;
+    }
+    hideElements = new Array();
+}
+
+function showWidgetButton(name, obj) {
+    var widgetButton = xGetElementById(name);
+    if(!widgetButton) return;
+    widgetButton.style.visibility = 'visible';
+    obj.insertBefore(widgetButton, obj.firstChild);
+    /*
+    var cobj = obj.firstChild;
+    while(cobj) {
+        cobj = cobj.nextSibling;
+    }
+
+    obj.appendChild(widgetButton);
+    */
+}
+
+function widgetSetup(evt) {
+    var e = new xEvent(evt);
+    var obj = e.target;
+
+    if(jQuery(obj).is('.widgetButtons') || jQuery(obj).parents('.widgetButtons').size() > 0) return;
+    if(jQuery(obj).is('.buttonBox') || jQuery(obj).parents('.buttonBox').size() > 0) return;
+
+
+    var o = jQuery(obj).parents('.widgetOutput');
+    if(o.size() == 0){
+        restoreWidgetButtons();
+        return;
+    }
+    /*
+    if(!obj || typeof(obj.className)=='undefined' || obj.className != 'widgetOutput') {
+        restoreWidgetButtons();
+        return;
+    }
+*/
+
+    obj = o.get(0);
+    var widget = o.attr('widget');
+    if(!widget) return;
+
+    if(widget == 'widgetBox') {
+        restoreWidgetButtons();
+        showWidgetButton('widgetBoxButton', obj);
+    } else {
+        restoreWidgetButtons();
+        showWidgetButton('widgetButton', obj);
+
+        var p_obj = obj.parentNode;
+        if(p_obj) {
+            while(p_obj) {
+                if(p_obj.nodeName == 'DIV' && p_obj.getAttribute('widget')=='widgetBox') {
+                    showWidgetButton('widgetBoxButton', p_obj);
+                    break;
+                }
+                p_obj = p_obj.parentNode;
+            }
+        }
+    }
+}
+
+/* 위젯 드래그 */
+// 드래그 중이라는 상황을 간직할 변수
+var widgetDragManager = {obj:null, isDrag:false}
+var widgetTmpObject = new Array();
+var widgetDisappear = 0;
+
+function widgetCreateTmpObject(obj) {
+    var id = obj.getAttribute('id');
+
+    tmpObj = xCreateElement('DIV');
+    tmpObj.id = id + '_tmp';
+    tmpObj.className = obj.className;
+    tmpObj.style.overflow = 'hidden';
+    tmpObj.style.margin= '0px';
+    tmpObj.style.padding = '0px';
+    tmpObj.style.width = obj.style.width;
+
+    tmpObj.style.display = 'none';
+    tmpObj.style.position = 'absolute';
+    tmpObj.style.opacity = 1;
+    tmpObj.style.filter = 'alpha(opacity=100)';
+
+    xLeft(tmpObj, xPageX(obj));
+    xTop(tmpObj, xPageY(obj));
+
+    document.body.appendChild(tmpObj);
+    widgetTmpObject[obj.id] = tmpObj;
+    return tmpObj;
+}
+
+// 기생성된 임시 object를 찾아서 return, 없으면 만들어서 return
+var idStep = 0;
+function widgetGetTmpObject(obj) {
+    if(!obj.id) obj.id = 'widget_'+idStep++;
+    var tmpObj = widgetTmpObject[obj.id];
+    if(!tmpObj) tmpObj = widgetCreateTmpObject(obj);
+    return tmpObj;
+}
+
+// 메뉴에 마우스 클릭이 일어난 시점에 드래그를 위한 제일 첫 동작 (해당 object에 각종 함수나 상태변수 설정)
+function widgetDragEnable(obj, funcDragStart, funcDrag, funcDragEnd) {
+
+    // 상위 object에 드래그 가능하다는 상태와 각 드래그 관련 함수를 설정
+    obj.draggable = true;
+    obj.dragStart = funcDragStart;
+    obj.drag = funcDrag;
+    obj.dragEnd = funcDragEnd;
+
+    // 드래그 가능하지 않다면 드래그 가능하도록 상태 지정하고 mousemove이벤트 등록
+    if (!widgetDragManager.isDrag) {
+        widgetDragManager.isDrag = true;
+        xAddEventListener(document, 'mousemove', widgetDragMouseMove, false);
+    }
+}
+
+// 드래그를 시작할때 호출되는 함수 (이동되는 형태를 보여주기 위한 작업을 함)
+function widgetDragStart(tobj, px, py) {
+    if(tobj.className == 'widgetResize' || tobj.className == 'widgetResizeLeft' || tobj.className == 'widgetBoxResize' || tobj.className == 'widgetBoxResizeLeft') return;
+    var obj = widgetGetTmpObject(tobj);
+
+    xInnerHtml(obj, xInnerHtml(tobj));
+
+    xLeft(obj, xPageX(tobj));
+    xTop(obj, xPageY(tobj));
+    xWidth(obj, xWidth(tobj));
+    xHeight(obj, xHeight(tobj));
+
+    xDisplay(obj, 'block');
+}
+
+// 드래그 시작후 마우스를 이동할때 발생되는 이벤트에 의해 실행되는 함수
+function widgetDrag(tobj, dx, dy) {
+    var minWidth = 40;
+    var minHeight = 10;
+
+    var sx = xPageX(tobj.parentNode);
+    var sy = xPageY(tobj.parentNode);
+
+    var nx = tobj.xDPX;
+    var ny = tobj.xDPY;
+
+    var zoneWidth = xWidth(zonePageObj);
+    var zoneLeft = xPageX(zonePageObj);
+    var zoneRight = zoneLeft + zoneWidth;
+
+    var pWidth = xWidth(tobj.parentNode);
+
+    var cssFloat = getFloat(tobj.parentNode);
+    if(!cssFloat) cssFloat = 'left';
+
+    // 위젯 리사이즈 (우측)
+    if(tobj.className == 'widgetResize' || tobj.className == 'widgetBoxResize') {
+        if(nx < sx+minWidth) nx = sx+minWidth;
+        if(nx > zoneRight) nx = zoneRight;
+
+        if(cssFloat == 'right') nx = sx + pWidth;
+
+        var new_width = nx  - sx;
+        if(new_width < minWidth) new_width = minWidth;
+
+        var new_height = ny - sy;
+        if(new_height < minHeight) new_height = minHeight;
+
+        if( zoneRight < sx+new_width) new_width = zoneRight - sx;
+
+        // 위젯의 크기 조절
+        xWidth(tobj.nextSibling.nextSibling, new_width);
+        xHeight(tobj.nextSibling.nextSibling, new_height);
+
+        xWidth(tobj.parentNode, new_width);
+        xHeight(tobj.parentNode, new_height);
+
+    // 위젯 리사이즈 (좌측)
+    } else if(tobj.className == 'widgetResizeLeft' || tobj.className == 'widgetBoxResizeLeft') {
+
+        if(nx < zoneLeft) nx = zoneLeft;
+
+        if(cssFloat == 'left') nx = sx;
+
+        var new_width = pWidth + (sx - nx);
+        if(new_width < minWidth) new_width = minWidth;
+
+        var new_height = ny - sy;
+        if(new_height < minHeight) new_height = minHeight;
+
+        // 위젯의 크기 조절
+        xWidth(tobj.nextSibling, new_width);
+        xHeight(tobj.nextSibling, new_height);
+
+        xWidth(tobj.parentNode, new_width);
+        xHeight(tobj.parentNode, new_height);
+
+    // 위젯 드래그
+    } else {
+        var obj = widgetGetTmpObject(tobj);
+
+        xLeft(obj, parseInt(xPageX(obj),10) + parseInt(dx,10));
+        xTop(obj, parseInt(xPageY(obj),10) + parseInt(dy,10));
+
+        // 박스 안에 있을 경우에는 박스내의 위젯하고 자리를 바꾸고 그 외의 경우에는 박스를 빠져 나간다
+        if(tobj.parentNode != zonePageObj) {
+            // 박스내에 있는 위젯들을 구함
+            var widgetList = xGetElementsByClassName("widgetOutput",tobj.parentNode);
+
+            for(var i=0;i<widgetList.length;i++) {
+                var target_obj = widgetList[i];
+                var l =  xPageX(target_obj);
+                var t =  xPageY(target_obj);
+                var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);
+                var tt =  parseInt(t,10) + parseInt(xHeight(target_obj),10);
+
+                if( tobj != target_obj && tobj.xDPX >= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt && tobj.parentNode == target_obj.parentNode) {
+                    var next1 = target_obj.nextSibling;
+                    if(!next1) {
+                        next1 = xCreateElement("DIV");
+                        target_obj.parentNode.appendChild(next1);
+                    }
+                    var next2 = tobj.nextSibling;
+                    if(!next2) {
+                        next2 = xCreateElement("DIV");
+                        tobj.parentNode.appendChild(next2);
+                    }
+
+                    if(next1) next1.parentNode.insertBefore(tobj, next1);
+                    if(next2) next2.parentNode.insertBefore(target_obj, next2);
+                    doFitBorderSize();
+                    widgetList = null;
+                    return;
+                }
+            }
+            widgetList = null;
+
+            // 만약 다른 위젯과 자리를 바꾸지 못하였는데 자기 부모창밖에 있는게 확인이 되면 박스 밖으로 내보낸다.
+            var p_tobj = jQuery(tobj).parents('div.nullWidget').get(0);
+            var l =  xPageX(p_tobj);
+            var t =  xPageY(p_tobj);
+            var ll =  parseInt(l,10) + parseInt(xWidth(p_tobj),10);
+            var tt =  parseInt(t,10) + parseInt(xHeight(p_tobj),10);
+            if( (tobj.xDPX < l || tobj.xDPX > ll) || (tobj.xDPY < t || tobj.xDPY > tt) ) {
+
+//                zonePageObj.insertBefore(tobj, tobj.parentNode.parentNode.parentNode);
+                zonePageObj.insertBefore(tobj, jQuery(tobj).parents('div.widgetOutput[widget=widgetBox]').get(0));
+
+                doFitBorderSize();
+                return;
+            }
+
+        // 박스 밖에 있을 경우에는 다른 위젯과 자리를 바꾸거나 박스내에 들어가도록 한다
+        } else {
+            // 이동하려는 위젯이 박스 위젯이 아니라면 박스 위젯들을 구해서 입력 유무를 검사한다
+            if(tobj.getAttribute("widget")!="widgetBox") {
+
+                var boxList = xGetElementsByClassName("nullWidget", zonePageObj);
+                for(var i=0;i<boxList.length;i++) {
+                    var target_obj = boxList[i];
+
+                    xHeight(target_obj, xHeight(target_obj.parentNode));
+                    xWidth(target_obj, xWidth(target_obj.parentNode));
+
+                    var l =  xPageX(target_obj);
+                    var t =  xPageY(target_obj);
+                    var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);
+                    var tt =  parseInt(t,10) + parseInt(xHeight(target_obj),10);
+                    if( tobj.xDPX >= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt) {
+
+                        //박스 위젯이다
+                        if(target_obj.className == "nullWidget") {
+
+                            var wb_ws = jQuery('div.widget_inner',jQuery(target_obj));
+
+                            //박스 위젯에 위젯스타일이 적용 안된경우
+                            if(wb_ws.size() == 0){
+                                target_obj.appendChild(tobj);
+
+                            //박스 위젯에 위젯스타일이 적용된경우 또는 박스안에 위젯이 위젯스타일이 적용된겅우
+                            }else{
+                                wb_ws.get(0).appendChild(tobj);
+                             }
+
+                            // 이동을 멈춤
+                            widgetManualEnd();
+
+                            doFitBorderSize();
+                            boxList = null;
+                            return;
+                        }
+                    }
+                }
+                boxList = null;
+            }
+
+            // 다른 위젯들을 구해서 자리를 바꿈
+            var widgetList = xGetElementsByClassName("widgetOutput",zonePageObj);
+            for(var i=0;i<widgetList.length;i++) {
+                var target_obj = widgetList[i];
+                var widget = target_obj.getAttribute("widget");
+                if(widget == 'widgetBox' || target_obj.parentNode != zonePageObj) continue;
+                var l =  xPageX(target_obj);
+                var t =  xPageY(target_obj);
+                var ll =  parseInt(l,10) + parseInt(xWidth(target_obj),10);
+                var tt =  parseInt(t,10) + parseInt(xHeight(target_obj),10);
+
+                if( tobj != target_obj && tobj.xDPX >= l && tobj.xDPX <= ll && tobj.xDPY >= t && tobj.xDPY <= tt && tobj.parentNode == target_obj.parentNode) {
+                    var next1 = target_obj.nextSibling;
+                    if(!next1) next1 = target_obj.parentNode.lastChild;
+                    if(!next1) {
+                        next1 = xCreateElement("DIV");
+                        target_obj.parentNode.appendChild(next1);
+                    }
+                    var next2 = tobj.nextSibling;
+                    if(!next2) {
+                        next2 = xCreateElement("DIV");
+                        tobj.parentNode.appendChild(next2);
+                    }
+
+                    if(next1) next1.parentNode.insertBefore(tobj, next1);
+                    if(next2) next2.parentNode.insertBefore(target_obj, next2);
+                    doFitBorderSize();
+                    widgetList = null;
+                    return;
+                }
+            }
+            widgetList = null;
+        }
+    }
+}
+
+// 드래그 종료 (이동되는 object가 이동할 곳에 서서히 이동되는 것처럼 보이는 효과)
+function widgetDragEnd(tobj, px, py) {
+    var obj = widgetGetTmpObject(tobj);
+    widgetDisapear = widgetDisapearObject(obj, tobj);
+    widgetDragDisable(tobj.getAttribute('id'));
+}
+
+// 스르르 사라지게 함 (일단 사라지게 하는 기능을 제거.. 속도 문제)
+function widgetDisapearObject(obj, tobj) {
+    xInnerHtml(tobj,xInnerHtml(obj));
+    xInnerHtml(obj,'');
+    xDisplay(obj, 'none');
+    obj.parentNode.removeChild(obj);
+    widgetTmpObject[tobj.id] = null;
+    return;
+
+    /*
+    var it = 5;
+    var ib = 1;
+
+    var x = parseInt(xPageX(obj),10);
+    var y = parseInt(xPageY(obj),10);
+    var ldt = (x - parseInt(xPageX(tobj),10)) / ib;
+    var tdt = (y - parseInt(xPageY(tobj),10)) / ib;
+
+    return setInterval(function() {
+        if(ib < 1) {
+            clearInterval(widgetDisapear);
+            xInnerHtml(tobj,xInnerHtml(obj));
+            xInnerHtml(obj,'');
+            xDisplay(obj, 'none');
+            obj.parentNode.removeChild(obj);
+            widgetTmpObject[tobj.id] = null;
+            return;
+        }
+        ib -= 5;
+        x-=ldt;
+        y-=tdt;
+        xLeft(obj, x);
+        xTop(obj, y);
+    }, it/ib);
+    */
+}
+
+// 마우스다운 이벤트 발생시 호출됨
+function widgetMouseDown(e) {
+    var evt = new xEvent(e);
+    var obj = evt.target;
+
+    while(obj && !obj.draggable) {
+        obj = xParent(obj, true);
+    }
+    if(obj) {
+        xPreventDefault(e);
+        obj.xDPX = evt.pageX;
+        obj.xDPY = evt.pageY;
+        widgetDragManager.obj = obj;
+        xAddEventListener(document, 'mouseup', widgetMouseUp, false);
+        if (obj.dragStart) obj.dragStart(obj, evt.pageX, evt.pageY);
+    }
+}
+
+// 마우스 버튼을 놓았을때 동작될 함수 (각종 이벤트 해제 및 변수 설정 초기화)
+function widgetMouseUp(e) {
+    if (widgetDragManager.obj) {
+        xPreventDefault(e);
+        xRemoveEventListener(document, 'mouseup', widgetMouseUp, false);
+
+        if (widgetDragManager.obj.dragEnd) {
+            var evt = new xEvent(e);
+            widgetDragManager.obj.dragEnd(widgetDragManager.obj, evt.pageX, evt.pageY);
+        }
+
+        widgetDragManager.obj = null;
+        widgetDragManager.isDrag = false;
+    }
+}
+
+// 드래그할때의 object이동등을 담당
+function widgetDragMouseMove(e) {
+    var evt = new xEvent(e);
+    if(widgetDragManager.obj) {
+        xPreventDefault(e);
+
+        var obj = widgetDragManager.obj;
+        var dx = evt.pageX - obj.xDPX;
+        var dy = evt.pageY - obj.xDPY;
+
+        obj.xDPX = evt.pageX;
+        obj.xDPY = evt.pageY;
+
+        if (obj.drag) {
+            obj.drag(obj, dx, dy);
+        } else {
+            xMoveTo(obj, xLeft(obj) + dx, xTop(obj) + dy);
+        }
+    }
+}
+
+// 해당 object 에 더 이상 drag가 되지 않도록 설정
+function widgetDragDisable(id) {
+    if (!widgetDragManager) return;
+    var obj = xGetElementById(id);
+    obj.draggable = false;
+    obj.dragStart = null;
+    obj.drag = null;
+    obj.dragEnd = null;
+    //obj.style.backgroundColor = obj.getAttribute('source_color');
+
+    xRemoveEventListener(obj, 'mousedown', widgetMouseDown, false);
+
+    return;
+}
+
+// 강제로 드래그를 종료시킴
+function widgetManualEnd() {
+    var tobj = widgetDragManager.obj;
+    if(!tobj) return;
+
+    xRemoveEventListener(document, 'mouseup', widgetMouseUp, false);
+    xAddEventListener(document, 'mousemove', widgetDragMouseMove, false);
+
+    var obj = widgetGetTmpObject(tobj);
+    widgetDisapear = widgetDisapearObject(obj, tobj);
+    widgetDragDisable(tobj.getAttribute('id'));
+
+    widgetDragManager.obj = null;
+    widgetDragManager.isDrag = false;
+}
diff --git a/modules/widget/tpl/js/widget_admin.js b/modules/widget/tpl/js/widget_admin.js
index 8c5e312ff..1b2720513 100644
--- a/modules/widget/tpl/js/widget_admin.js
+++ b/modules/widget/tpl/js/widget_admin.js
@@ -1,470 +1,470 @@
-/**
- * @file   modules/widget/js/widget_admin.js
- * @author NHN (developers@xpressengine.com)
- * @brief  widget 모듈의 관리자용 javascript
- **/
-
-/* 생성된 코드를 textarea에 출력 */
-function completeGenerateCode(ret_obj) {
-    var widget_code = ret_obj["widget_code"];
-        widget_code = widget_code.replace(/&/g, "&amp;");
-        widget_code = widget_code.replace(/\'/g, "&apos;");
-    var zone = xGetElementById("widget_code");
-    zone.value = widget_code;
-}
-
-/* 생성된 코드를 페이지 zone에 출력 */
-function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
-    var widget_code = ret_obj["widget_code"];
-    if(!opener || !widget_code) {
-        window.close();
-        return;
-    }
-
-    opener.doAddWidgetCode(widget_code);
-    window.close();
-}
-
-/* 위젯 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */
-function doDisplaySkinColorset(sel, colorset) {
-    var skin = sel.options[sel.selectedIndex].value;
-    if(!skin) {
-        xGetElementById("colorset_area").style.display = "none";
-        setFixedPopupSize();
-        return;
-    }
-
-    var params = new Array();
-    params["selected_widget"] = xGetElementById("fo_widget").selected_widget.value;
-    params["skin"] = skin;
-    params["colorset"] = colorset;
-
-    var response_tags = new Array("error","message","colorset_list");
-
-    exec_xml("widget", "procWidgetGetColorsetList", params, completeGetSkinColorset, response_tags, params);
-}
-
-/* 서버에서 받아온 컬러셋을 표시 */
-function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj) {
-    var sel = jQuery("#fo_widget")[0].widget_colorset;
-    var length = sel.options.length;
-    var selected_colorset = params["colorset"];
-    for(var i=0;i<length;i++) sel.remove(0);
-
-    if(!ret_obj["colorset_list"]) return;
-
-    var colorset_list = ret_obj["colorset_list"].split("\n");
-    var selected_index = 0;
-    for(var i=0;i<colorset_list.length;i++) {
-        var tmp = colorset_list[i].split("|@|");
-        if(selected_colorset && selected_colorset==tmp[0]) selected_index = i;
-        var opt = new Option(tmp[1], tmp[0], false, false);
-        sel.options.add(opt);
-    }
-
-    sel.selectedIndex = selected_index;
-
-    jQuery("#colorset_area").show();
-    setFixedPopupSize();
-}
-
-
-var selected_node = null;
-/* 페이지 모듈에서 위젯스타일 수정하려고 할 경우 */
-function getWidgetVars() {
-    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
-    selected_node = opener.selectedWidget;
-
-    if(!xGetElementById('fo_widget').widgetstyle.value) {
-        xGetElementById('fo_widget').widgetstyle.value = selected_node.getAttribute('widgetstyle');
-    }
-
-    doFillWidgetVars();
-}
-
-/* 페이지 모듈에서 내용의 위젯을 더블클릭하여 수정하려고 할 경우 */
-function doFillWidgetVars() {
-    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
-    selected_node = opener.selectedWidget;
-
-    // 스킨과 컬러셋은 기본
-    var skin = selected_node.getAttribute("skin");
-    var colorset = selected_node.getAttribute("colorset");
-    var widget_sequence = parseInt(selected_node.getAttribute("widget_sequence"),10);
-
-    var fo_widget = jQuery("#fo_widget");
-    var fo_obj = xGetElementById("fo_widget");
-    jQuery('#widget_skin').val(skin);
-
-    // 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장
-    var attrs = selected_node.attributes;
-    for (i=0; i< attrs.length ; i++){
-        var name = attrs[i].name;
-        var value = jQuery(selected_node).attr(name);
-        if(value=='Array') continue;
-        if(jQuery("[name="+name+"]",fo_widget).size()>0 || !value || name == 'style') continue;
-
-        var dummy = jQuery('<input type="hidden" name="'+name+'" >').val(value).appendTo("#fo_widget").get(0);
-    }
-
-    // 위젯의 속성 설정
-    var obj_list = new Array();
-    jQuery('input,select,textarea','#fo_widget').each( function() {
-            obj_list.push(this);
-    });
-
-    for(var j=0;j<obj_list.length;j++) {
-        var node = obj_list[j];
-        if(node.name.indexOf('_')==0) continue;
-        if(node.name == 'widgetstyle') continue;
-
-        var length = node.length;
-        var type = node.type;
-        if((typeof(type)=='undefined'||!type) && typeof(length)!='undefined' && typeof(node[0])!='undefined' && length>0) type = node[0].type;
-        else length = 0;
-        var name = node.name;
-
-        switch(type) {
-            case "hidden" :
-            case "text" :
-            case "textarea" :
-                    var val = selected_node.getAttribute(name);
-                    if(!val) continue;
-                    var unescaped_val = unescape(val);
-                    if(!unescaped_val) node.value = val;
-                    else node.value = unescaped_val;
-                break;
-            case "checkbox" :
-                    if(selected_node.getAttribute(name)) {
-                        var val = selected_node.getAttribute(name).split(',');
-                        if(fo_obj[name].length) {
-                            for(var i=0;i<fo_obj[name].length;i++) {
-                                var v = fo_obj[name][i].value;
-                                for(var k=0;k<val.length;k++) {
-                                    if(v == val[k]) {
-                                        fo_obj[name][i].checked=true;
-                                        break;
-                                    }
-                                }
-                            }
-                        } else {
-                            if(fo_obj[name].value == val) fo_obj[name].checked =true;
-                        }
-                    }
-                break;
-            case "select" :
-            case "select-one" :
-                    var val = selected_node.getAttribute(name);
-                    var sel = fo_obj[name];
-                    if(!val) break;
-                    for(var i=0;i<sel.options.length;i++) {
-                        if(sel.options[i].value == val) sel.options[i].selected = true;
-                        else sel.options[i].selected = false;
-                    }
-                break;
-        }
-
-    }
-
-    var style = selected_node.getAttribute("style");
-    if(typeof(style)=="object") style = style["cssText"];
-    fo_obj.style.value = style;
-
-    fo_obj.widget_padding_left.value = selected_node.getAttribute("widget_padding_left");
-    fo_obj.widget_padding_right.value = selected_node.getAttribute("widget_padding_right");
-    fo_obj.widget_padding_bottom.value = selected_node.getAttribute("widget_padding_bottom");
-    fo_obj.widget_padding_top.value = selected_node.getAttribute("widget_padding_top");
-
-
-    //  컬러셋 설정
-    if(skin && xGetElementById("widget_colorset") && xGetElementById("widget_colorset").options.length<1 && colorset) {
-        doDisplaySkinColorset(xGetElementById("widget_skin"), colorset);
-    }
-
-    // widget sequence 설정
-    fo_obj.widget_sequence.value = widget_sequence;
-}
-
-function checkFixType(obj) {
-    var val = obj.options[obj.selectedIndex].value;
-    if(val != "px") {
-        var fo_obj = xGetElementById("fo_widget");
-        var width = fo_obj.widget_width.value;
-        if(width>100) fo_obj.widget_width.value = 100;
-    }
-}
-
-// 위젯의 대상 모듈 입력기 (단일 선택)
-function insertSelectedModule(id, module_srl, mid, browser_title) {
-    var obj= xGetElementById('_'+id);
-    var sObj = xGetElementById(id);
-    sObj.value = module_srl;
-    obj.value = browser_title+' ('+mid+')';
-
-}
-
-// 위젯의 대상 모듈 입력기 (다중 선택)
-function insertSelectedModules(id, module_srl, mid, browser_title) {
-    var sel_obj = jQuery('#_'+id)[0];
-    for(var i=0;i<sel_obj.options.length;i++) if(sel_obj.options[i].value==module_srl) return;
-    var opt = new Option(browser_title+' ('+mid+')', module_srl, false, false);
-    sel_obj.options[sel_obj.options.length] = opt;
-    if(sel_obj.options.length>8) sel_obj.size = sel_obj.options.length;
-
-    syncMid(id);
-}
-
-function midMoveUp(id) {
-    var sel_obj = xGetElementById('_'+id);
-    if(sel_obj.selectedIndex<0) return;
-    var idx = sel_obj.selectedIndex;
-
-    if(idx < 1) return;
-
-    var s_obj = sel_obj.options[idx];
-    var t_obj = sel_obj.options[idx-1];
-    var value = s_obj.value;
-    var text = s_obj.text;
-    s_obj.value = t_obj.value;
-    s_obj.text = t_obj.text;
-    t_obj.value = value;
-    t_obj.text = text;
-    sel_obj.selectedIndex = idx-1;
-
-    syncMid(id);
-}
-
-function midMoveDown(id) {
-    var sel_obj = xGetElementById('_'+id);
-    if(sel_obj.selectedIndex<0) return;
-    var idx = sel_obj.selectedIndex;
-
-    if(idx == sel_obj.options.length-1) return;
-
-    var s_obj = sel_obj.options[idx];
-    var t_obj = sel_obj.options[idx+1];
-    var value = s_obj.value;
-    var text = s_obj.text;
-    s_obj.value = t_obj.value;
-    s_obj.text = t_obj.text;
-    t_obj.value = value;
-    t_obj.text = text;
-    sel_obj.selectedIndex = idx+1;
-
-    syncMid(id);
-}
-
-function midRemove(id) {
-    var sel_obj = xGetElementById('_'+id);
-    if(sel_obj.selectedIndex<0) return;
-    var idx = sel_obj.selectedIndex;
-    sel_obj.remove(idx);
-    idx = idx-1;
-    if(idx < 0) idx = 0;
-    if(sel_obj.options.length) sel_obj.selectedIndex = idx;
-
-    syncMid(id);
-}
-
-function syncMid(id) {
-    var sel_obj = jQuery('#_'+id)[0];
-    var valueArray = [];
-    for(var i=0;i<sel_obj.options.length;i++) valueArray[valueArray.length] = sel_obj.options[i].value;
-    jQuery('#'+id).val( valueArray.join(',') );
-}
-
-function getModuleSrlList(id) {
-    var obj = jQuery('#'+id);
-    if(!obj[0] || !obj.val()) return;
-
-	var params = [];
-    params["module_srls"] = obj.val();
-    params["id"] = id;
-
-    var response_tags = ["error","message","module_list","id"];
-    exec_xml("module", "getModuleAdminModuleList", params, completeGetModuleSrlList, response_tags, params);
-}
-
-function completeGetModuleSrlList(ret_obj, response_tags) {
-    var id = ret_obj['id'];
-    var sel_obj = jQuery('#_'+id);
-    if(!sel_obj[0]) return;
-
-    var module_list = ret_obj['module_list'];
-    if(!module_list) return;
-    var item = module_list['item'];
-    if(typeof(item.length)=='undefined' || item.length<1) item = [item];
-
-    for(var i=0;i<item.length;i++) {
-        var module_srl = item[i].module_srl;
-        var mid = item[i].mid;
-        var browser_title = item[i].browser_title;
-        var opt = new Option(browser_title+' ('+mid+')', module_srl);
-        sel_obj[0].options.add(opt);
-    }
-}
-
-function getModuleSrl(id) {
-    var obj = xGetElementById(id);
-    if(!obj.value) return;
-    var value = obj.value;
-    var params = new Array();
-    params["module_srls"] = obj.value;
-    params["id"] = id;
-
-    var response_tags = new Array("error","message","module_list","id");
-    exec_xml("module", "getModuleAdminModuleList", params, completeGetModuleSrl, response_tags, params);
-}
-
-function completeGetModuleSrl(ret_obj, response_tags) {
-    var id = ret_obj['id'];
-    var obj = xGetElementById('_'+id);
-    var sObj = xGetElementById(id);
-    if(!sObj || !obj) return;
-
-    var module_list = ret_obj['module_list'];
-    if(!module_list) return;
-    var item = module_list['item'];
-    if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
-
-    sObj.value = item[0].module_srl;
-    obj.value = item[0].browser_title+' ('+item[0].mid+')';
-}
-
-var windowLoadEventLoader = new Array();
-function doAddWindowLoadEventLoader(func) {
-    windowLoadEventLoader.push(func);
-}
-function excuteWindowLoadEvent() {
-    for(var i=0;i<windowLoadEventLoader.length;i++) {
-        windowLoadEventLoader[i]();
-    }
-}
-
-jQuery(window).load(excuteWindowLoadEvent);
-
-
-function selectWidget(val){
-    var url =current_url.setQuery('selected_widget', val);
-    document.location.href = url;
-}
-
-function widgetstyle_extra_image_upload(f){
-    f.act.value='procWidgetStyleExtraImageUpload';
-    f.submit();
-}
-
-function MultiOrderSet(id){
-    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
-
-    var value = [];
-    for(i=0;i<selectedObj.options.length;i++){
-        value.push(selectedObj.options[i].value);
-    }
-    jQuery("[name='"+id+"']").val(value.join(','));
-}
-
-
-function MultiOrderAdd(id){
-    var showObj = jQuery("[name='show_"+id+"']").get(0);
-    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
-    var defaultObj = jQuery("[name='default_"+id+"']").val().split(',');
-
-    if(showObj.selectedIndex<0) return;
-    var idx = showObj.selectedIndex;
-    var svalue = showObj.options[idx].value;
-
-
-    for(i=0;i<selectedObj.options.length;i++){
-        if(selectedObj.options[i].value == svalue) return;
-    }
-    selectedObj.options.add(new Option(svalue, svalue, false, false));
-
-    MultiOrderSet(id);
-}
-
-
-function MultiOrderDelete(id){
-    var showObj = jQuery("[name='show_"+id+"']").get(0);
-    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
-    var defaultObj = jQuery("[name='default_"+id+"']").val().split(',');
-
-    var idx = selectedObj.selectedIndex;
-    if(idx<0) return;
-    for(i=0;i<defaultObj.length;i++){
-        if(jQuery.inArray(selectedObj.options[idx].value, defaultObj) > -1) return;
-    }
-
-    selectedObj.remove(idx);
-    idx = idx-1;
-    if(idx < 0) idx = 0;
-    if(selectedObj.options.length) selectedObj.selectedIndex = idx;
-
-    MultiOrderSet(id);
-}
-
-function MultiOrderUp(id){
-    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
-    if(selectedObj.selectedIndex<0) return;
-    var idx = selectedObj.selectedIndex;
-
-    if(idx < 1) return;
-
-    var s_obj = selectedObj.options[idx];
-    var t_obj = selectedObj.options[idx-1];
-    var value = s_obj.value;
-    var text = s_obj.text;
-    s_obj.value = t_obj.value;
-    s_obj.text = t_obj.text;
-    t_obj.value = value;
-    t_obj.text = text;
-    selectedObj.selectedIndex = idx-1;
-
-    MultiOrderSet(id);
-}
-
-
-function MultiOrderDown(id){
-    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
-    if(selectedObj.selectedIndex<0) return;
-    var idx = selectedObj.selectedIndex;
-
-    if(idx == selectedObj.options.length-1) return;
-
-    var s_obj = selectedObj.options[idx];
-    var t_obj = selectedObj.options[idx+1];
-    var value = s_obj.value;
-    var text = s_obj.text;
-    s_obj.value = t_obj.value;
-    s_obj.text = t_obj.text;
-    t_obj.value = value;
-    t_obj.text = text;
-    selectedObj.selectedIndex = idx+1;
-
-    MultiOrderSet(id);
-}
-
-function initMultiOrder(id){
-    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
-    var init_value = jQuery("[name='init_"+id+"']").val();
-    var save_value = jQuery("[name='"+id+"']").val();
-    if(save_value){
-        var arr_save_value = save_value.split(',');
-        for(i=0;i<arr_save_value.length;i++){
-            if(arr_save_value[i].length>0){
-                var opt = new Option(arr_save_value[i], arr_save_value[i]);
-                selectedObj.options.add(opt);
-            }
-        }
-    }else{
-        var arr_init_value = init_value.split(',');
-        for(i=0;i<arr_init_value.length;i++){
-            if(arr_init_value[i].length>0){
-                var opt = new Option(arr_init_value[i], arr_init_value[i]);
-                selectedObj.options.add(opt);
-            }
-        }
-
-    }
-    MultiOrderSet(id);
-}
+/**
+ * @file   modules/widget/js/widget_admin.js
+ * @author NHN (developers@xpressengine.com)
+ * @brief  widget 모듈의 관리자용 javascript
+ **/
+
+/* 생성된 코드를 textarea에 출력 */
+function completeGenerateCode(ret_obj) {
+    var widget_code = ret_obj["widget_code"];
+        widget_code = widget_code.replace(/&/g, "&amp;");
+        widget_code = widget_code.replace(/\'/g, "&apos;");
+    var zone = xGetElementById("widget_code");
+    zone.value = widget_code;
+}
+
+/* 생성된 코드를 페이지 zone에 출력 */
+function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
+    var widget_code = ret_obj["widget_code"];
+    if(!opener || !widget_code) {
+        window.close();
+        return;
+    }
+
+    opener.doAddWidgetCode(widget_code);
+    window.close();
+}
+
+/* 위젯 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */
+function doDisplaySkinColorset(sel, colorset) {
+    var skin = sel.options[sel.selectedIndex].value;
+    if(!skin) {
+        xGetElementById("colorset_area").style.display = "none";
+        setFixedPopupSize();
+        return;
+    }
+
+    var params = new Array();
+    params["selected_widget"] = xGetElementById("fo_widget").selected_widget.value;
+    params["skin"] = skin;
+    params["colorset"] = colorset;
+
+    var response_tags = new Array("error","message","colorset_list");
+
+    exec_xml("widget", "procWidgetGetColorsetList", params, completeGetSkinColorset, response_tags, params);
+}
+
+/* 서버에서 받아온 컬러셋을 표시 */
+function completeGetSkinColorset(ret_obj, response_tags, params, fo_obj) {
+    var sel = jQuery("#fo_widget")[0].widget_colorset;
+    var length = sel.options.length;
+    var selected_colorset = params["colorset"];
+    for(var i=0;i<length;i++) sel.remove(0);
+
+    if(!ret_obj["colorset_list"]) return;
+
+    var colorset_list = ret_obj["colorset_list"].split("\n");
+    var selected_index = 0;
+    for(var i=0;i<colorset_list.length;i++) {
+        var tmp = colorset_list[i].split("|@|");
+        if(selected_colorset && selected_colorset==tmp[0]) selected_index = i;
+        var opt = new Option(tmp[1], tmp[0], false, false);
+        sel.options.add(opt);
+    }
+
+    sel.selectedIndex = selected_index;
+
+    jQuery("#colorset_area").show();
+    setFixedPopupSize();
+}
+
+
+var selected_node = null;
+/* 페이지 모듈에서 위젯스타일 수정하려고 할 경우 */
+function getWidgetVars() {
+    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
+    selected_node = opener.selectedWidget;
+
+    if(!xGetElementById('fo_widget').widgetstyle.value) {
+        xGetElementById('fo_widget').widgetstyle.value = selected_node.getAttribute('widgetstyle');
+    }
+
+    doFillWidgetVars();
+}
+
+/* 페이지 모듈에서 내용의 위젯을 더블클릭하여 수정하려고 할 경우 */
+function doFillWidgetVars() {
+    if(!opener || !opener.selectedWidget || !opener.selectedWidget.getAttribute("widget")) return;
+    selected_node = opener.selectedWidget;
+
+    // 스킨과 컬러셋은 기본
+    var skin = selected_node.getAttribute("skin");
+    var colorset = selected_node.getAttribute("colorset");
+    var widget_sequence = parseInt(selected_node.getAttribute("widget_sequence"),10);
+
+    var fo_widget = jQuery("#fo_widget");
+    var fo_obj = xGetElementById("fo_widget");
+    jQuery('#widget_skin').val(skin);
+
+    // 위젯 스타일 유지를 위한 hidden input 추가하고 값을 저장
+    var attrs = selected_node.attributes;
+    for (i=0; i< attrs.length ; i++){
+        var name = attrs[i].name;
+        var value = jQuery(selected_node).attr(name);
+        if(value=='Array') continue;
+        if(jQuery("[name="+name+"]",fo_widget).size()>0 || !value || name == 'style') continue;
+
+        var dummy = jQuery('<input type="hidden" name="'+name+'" >').val(value).appendTo("#fo_widget").get(0);
+    }
+
+    // 위젯의 속성 설정
+    var obj_list = new Array();
+    jQuery('input,select,textarea','#fo_widget').each( function() {
+            obj_list.push(this);
+    });
+
+    for(var j=0;j<obj_list.length;j++) {
+        var node = obj_list[j];
+        if(node.name.indexOf('_')==0) continue;
+        if(node.name == 'widgetstyle') continue;
+
+        var length = node.length;
+        var type = node.type;
+        if((typeof(type)=='undefined'||!type) && typeof(length)!='undefined' && typeof(node[0])!='undefined' && length>0) type = node[0].type;
+        else length = 0;
+        var name = node.name;
+
+        switch(type) {
+            case "hidden" :
+            case "text" :
+            case "textarea" :
+                    var val = selected_node.getAttribute(name);
+                    if(!val) continue;
+                    var unescaped_val = unescape(val);
+                    if(!unescaped_val) node.value = val;
+                    else node.value = unescaped_val;
+                break;
+            case "checkbox" :
+                    if(selected_node.getAttribute(name)) {
+                        var val = selected_node.getAttribute(name).split(',');
+                        if(fo_obj[name].length) {
+                            for(var i=0;i<fo_obj[name].length;i++) {
+                                var v = fo_obj[name][i].value;
+                                for(var k=0;k<val.length;k++) {
+                                    if(v == val[k]) {
+                                        fo_obj[name][i].checked=true;
+                                        break;
+                                    }
+                                }
+                            }
+                        } else {
+                            if(fo_obj[name].value == val) fo_obj[name].checked =true;
+                        }
+                    }
+                break;
+            case "select" :
+            case "select-one" :
+                    var val = selected_node.getAttribute(name);
+                    var sel = fo_obj[name];
+                    if(!val) break;
+                    for(var i=0;i<sel.options.length;i++) {
+                        if(sel.options[i].value == val) sel.options[i].selected = true;
+                        else sel.options[i].selected = false;
+                    }
+                break;
+        }
+
+    }
+
+    var style = selected_node.getAttribute("style");
+    if(typeof(style)=="object") style = style["cssText"];
+    fo_obj.style.value = style;
+
+    fo_obj.widget_padding_left.value = selected_node.getAttribute("widget_padding_left");
+    fo_obj.widget_padding_right.value = selected_node.getAttribute("widget_padding_right");
+    fo_obj.widget_padding_bottom.value = selected_node.getAttribute("widget_padding_bottom");
+    fo_obj.widget_padding_top.value = selected_node.getAttribute("widget_padding_top");
+
+
+    //  컬러셋 설정
+    if(skin && xGetElementById("widget_colorset") && xGetElementById("widget_colorset").options.length<1 && colorset) {
+        doDisplaySkinColorset(xGetElementById("widget_skin"), colorset);
+    }
+
+    // widget sequence 설정
+    fo_obj.widget_sequence.value = widget_sequence;
+}
+
+function checkFixType(obj) {
+    var val = obj.options[obj.selectedIndex].value;
+    if(val != "px") {
+        var fo_obj = xGetElementById("fo_widget");
+        var width = fo_obj.widget_width.value;
+        if(width>100) fo_obj.widget_width.value = 100;
+    }
+}
+
+// 위젯의 대상 모듈 입력기 (단일 선택)
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    var obj= xGetElementById('_'+id);
+    var sObj = xGetElementById(id);
+    sObj.value = module_srl;
+    obj.value = browser_title+' ('+mid+')';
+
+}
+
+// 위젯의 대상 모듈 입력기 (다중 선택)
+function insertSelectedModules(id, module_srl, mid, browser_title) {
+    var sel_obj = jQuery('#_'+id)[0];
+    for(var i=0;i<sel_obj.options.length;i++) if(sel_obj.options[i].value==module_srl) return;
+    var opt = new Option(browser_title+' ('+mid+')', module_srl, false, false);
+    sel_obj.options[sel_obj.options.length] = opt;
+    if(sel_obj.options.length>8) sel_obj.size = sel_obj.options.length;
+
+    syncMid(id);
+}
+
+function midMoveUp(id) {
+    var sel_obj = xGetElementById('_'+id);
+    if(sel_obj.selectedIndex<0) return;
+    var idx = sel_obj.selectedIndex;
+
+    if(idx < 1) return;
+
+    var s_obj = sel_obj.options[idx];
+    var t_obj = sel_obj.options[idx-1];
+    var value = s_obj.value;
+    var text = s_obj.text;
+    s_obj.value = t_obj.value;
+    s_obj.text = t_obj.text;
+    t_obj.value = value;
+    t_obj.text = text;
+    sel_obj.selectedIndex = idx-1;
+
+    syncMid(id);
+}
+
+function midMoveDown(id) {
+    var sel_obj = xGetElementById('_'+id);
+    if(sel_obj.selectedIndex<0) return;
+    var idx = sel_obj.selectedIndex;
+
+    if(idx == sel_obj.options.length-1) return;
+
+    var s_obj = sel_obj.options[idx];
+    var t_obj = sel_obj.options[idx+1];
+    var value = s_obj.value;
+    var text = s_obj.text;
+    s_obj.value = t_obj.value;
+    s_obj.text = t_obj.text;
+    t_obj.value = value;
+    t_obj.text = text;
+    sel_obj.selectedIndex = idx+1;
+
+    syncMid(id);
+}
+
+function midRemove(id) {
+    var sel_obj = xGetElementById('_'+id);
+    if(sel_obj.selectedIndex<0) return;
+    var idx = sel_obj.selectedIndex;
+    sel_obj.remove(idx);
+    idx = idx-1;
+    if(idx < 0) idx = 0;
+    if(sel_obj.options.length) sel_obj.selectedIndex = idx;
+
+    syncMid(id);
+}
+
+function syncMid(id) {
+    var sel_obj = jQuery('#_'+id)[0];
+    var valueArray = [];
+    for(var i=0;i<sel_obj.options.length;i++) valueArray[valueArray.length] = sel_obj.options[i].value;
+    jQuery('#'+id).val( valueArray.join(',') );
+}
+
+function getModuleSrlList(id) {
+    var obj = jQuery('#'+id);
+    if(!obj[0] || !obj.val()) return;
+
+	var params = [];
+    params["module_srls"] = obj.val();
+    params["id"] = id;
+
+    var response_tags = ["error","message","module_list","id"];
+    exec_xml("module", "getModuleAdminModuleList", params, completeGetModuleSrlList, response_tags, params);
+}
+
+function completeGetModuleSrlList(ret_obj, response_tags) {
+    var id = ret_obj['id'];
+    var sel_obj = jQuery('#_'+id);
+    if(!sel_obj[0]) return;
+
+    var module_list = ret_obj['module_list'];
+    if(!module_list) return;
+    var item = module_list['item'];
+    if(typeof(item.length)=='undefined' || item.length<1) item = [item];
+
+    for(var i=0;i<item.length;i++) {
+        var module_srl = item[i].module_srl;
+        var mid = item[i].mid;
+        var browser_title = item[i].browser_title;
+        var opt = new Option(browser_title+' ('+mid+')', module_srl);
+        sel_obj[0].options.add(opt);
+    }
+}
+
+function getModuleSrl(id) {
+    var obj = xGetElementById(id);
+    if(!obj.value) return;
+    var value = obj.value;
+    var params = new Array();
+    params["module_srls"] = obj.value;
+    params["id"] = id;
+
+    var response_tags = new Array("error","message","module_list","id");
+    exec_xml("module", "getModuleAdminModuleList", params, completeGetModuleSrl, response_tags, params);
+}
+
+function completeGetModuleSrl(ret_obj, response_tags) {
+    var id = ret_obj['id'];
+    var obj = xGetElementById('_'+id);
+    var sObj = xGetElementById(id);
+    if(!sObj || !obj) return;
+
+    var module_list = ret_obj['module_list'];
+    if(!module_list) return;
+    var item = module_list['item'];
+    if(typeof(item.length)=='undefined' || item.length<1) item = new Array(item);
+
+    sObj.value = item[0].module_srl;
+    obj.value = item[0].browser_title+' ('+item[0].mid+')';
+}
+
+var windowLoadEventLoader = new Array();
+function doAddWindowLoadEventLoader(func) {
+    windowLoadEventLoader.push(func);
+}
+function excuteWindowLoadEvent() {
+    for(var i=0;i<windowLoadEventLoader.length;i++) {
+        windowLoadEventLoader[i]();
+    }
+}
+
+jQuery(window).load(excuteWindowLoadEvent);
+
+
+function selectWidget(val){
+    var url =current_url.setQuery('selected_widget', val);
+    document.location.href = url;
+}
+
+function widgetstyle_extra_image_upload(f){
+    f.act.value='procWidgetStyleExtraImageUpload';
+    f.submit();
+}
+
+function MultiOrderSet(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+
+    var value = [];
+    for(i=0;i<selectedObj.options.length;i++){
+        value.push(selectedObj.options[i].value);
+    }
+    jQuery("[name='"+id+"']").val(value.join(','));
+}
+
+
+function MultiOrderAdd(id){
+    var showObj = jQuery("[name='show_"+id+"']").get(0);
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    var defaultObj = jQuery("[name='default_"+id+"']").val().split(',');
+
+    if(showObj.selectedIndex<0) return;
+    var idx = showObj.selectedIndex;
+    var svalue = showObj.options[idx].value;
+
+
+    for(i=0;i<selectedObj.options.length;i++){
+        if(selectedObj.options[i].value == svalue) return;
+    }
+    selectedObj.options.add(new Option(svalue, svalue, false, false));
+
+    MultiOrderSet(id);
+}
+
+
+function MultiOrderDelete(id){
+    var showObj = jQuery("[name='show_"+id+"']").get(0);
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    var defaultObj = jQuery("[name='default_"+id+"']").val().split(',');
+
+    var idx = selectedObj.selectedIndex;
+    if(idx<0) return;
+    for(i=0;i<defaultObj.length;i++){
+        if(jQuery.inArray(selectedObj.options[idx].value, defaultObj) > -1) return;
+    }
+
+    selectedObj.remove(idx);
+    idx = idx-1;
+    if(idx < 0) idx = 0;
+    if(selectedObj.options.length) selectedObj.selectedIndex = idx;
+
+    MultiOrderSet(id);
+}
+
+function MultiOrderUp(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    if(selectedObj.selectedIndex<0) return;
+    var idx = selectedObj.selectedIndex;
+
+    if(idx < 1) return;
+
+    var s_obj = selectedObj.options[idx];
+    var t_obj = selectedObj.options[idx-1];
+    var value = s_obj.value;
+    var text = s_obj.text;
+    s_obj.value = t_obj.value;
+    s_obj.text = t_obj.text;
+    t_obj.value = value;
+    t_obj.text = text;
+    selectedObj.selectedIndex = idx-1;
+
+    MultiOrderSet(id);
+}
+
+
+function MultiOrderDown(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    if(selectedObj.selectedIndex<0) return;
+    var idx = selectedObj.selectedIndex;
+
+    if(idx == selectedObj.options.length-1) return;
+
+    var s_obj = selectedObj.options[idx];
+    var t_obj = selectedObj.options[idx+1];
+    var value = s_obj.value;
+    var text = s_obj.text;
+    s_obj.value = t_obj.value;
+    s_obj.text = t_obj.text;
+    t_obj.value = value;
+    t_obj.text = text;
+    selectedObj.selectedIndex = idx+1;
+
+    MultiOrderSet(id);
+}
+
+function initMultiOrder(id){
+    var selectedObj = jQuery("[name='selected_"+id+"']").get(0);
+    var init_value = jQuery("[name='init_"+id+"']").val();
+    var save_value = jQuery("[name='"+id+"']").val();
+    if(save_value){
+        var arr_save_value = save_value.split(',');
+        for(i=0;i<arr_save_value.length;i++){
+            if(arr_save_value[i].length>0){
+                var opt = new Option(arr_save_value[i], arr_save_value[i]);
+                selectedObj.options.add(opt);
+            }
+        }
+    }else{
+        var arr_init_value = init_value.split(',');
+        for(i=0;i<arr_init_value.length;i++){
+            if(arr_init_value[i].length>0){
+                var opt = new Option(arr_init_value[i], arr_init_value[i]);
+                selectedObj.options.add(opt);
+            }
+        }
+
+    }
+    MultiOrderSet(id);
+}
diff --git a/modules/widget/tpl/skin_info.html b/modules/widget/tpl/skin_info.html
index 05c403d4e..8761beac6 100644
--- a/modules/widget/tpl/skin_info.html
+++ b/modules/widget/tpl/skin_info.html
@@ -1,10 +1,7 @@
-<!--%import("../../admin/tpl/css/admin.css")-->
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$skin_info->title}</h3>
-</div>
-
-<div id="popBody">
-    <table cellspacing="0" class="rowTable">
+<load target="../../admin/tpl/css/admin.css" usecdn="true" />
+<h1 class="h1">{$skin_info->title}</h1>
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <col width="100" />
     <col />
     <tr>
@@ -50,12 +47,10 @@
 </div>
 
 <!--@if($skin_info->history)-->
-<div id="popHistoryHeadder">
-    <h3 class="xeAdmin">{$lang->skin_history}</h3>
-</div>
+<h1 class="h1">{$lang->skin_history}</h1>
 
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <col width="100" />
     <col />
 
diff --git a/modules/widget/tpl/widget_detail_info.html b/modules/widget/tpl/widget_detail_info.html
index eb1b25c94..4af4085ed 100644
--- a/modules/widget/tpl/widget_detail_info.html
+++ b/modules/widget/tpl/widget_detail_info.html
@@ -1,13 +1,10 @@
-<!--%import("css/widget.css")-->
-<!--%import("../../admin/tpl/css/admin.css")-->
+<load target="css/widget.css" usecdn="true" />
+<load target="../../admin/tpl/css/admin.css" usecdn="true" />
 
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->widget}</h3>
-</div>
-
-<div id="popBody">
-    <h4 class="xeAdmin">{$lang->widget_maker}</h4>
-    <table cellspacing="0" class="rowTable">
+<h1 class="h1">{$lang->widget}</h1>
+<h2 class="h2">{$lang->widget_maker}</h2>
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <tr>
         <th scope="row"><div>{$lang->title}</div></th>
         <td>{$widget_info->title} ver {$widget_info->version}</td>
@@ -49,12 +46,10 @@
 </div>
 
 <!--@if($widget_info->history)-->
-<div id="popHistoryHeader">
-    <h3 class="xeAdmin">{$lang->widget_history}</h3>
-</div>
+<h1 class="h1">{$lang->widget_history}</h1>
 
-<div id="popHistoryBody">
-    <table cellspacing="0" class="rowTable">
+<div class="table">
+    <table width="100%" border="1" cellspacing="0">
     <!--@foreach($widget_info->history as $history)-->
     <tr>
         <th scope="row"><div>
diff --git a/modules/widget/tpl/widget_generate_code.filebox.html b/modules/widget/tpl/widget_generate_code.filebox.html
new file mode 100644
index 000000000..6bc8ca01d
--- /dev/null
+++ b/modules/widget/tpl/widget_generate_code.filebox.html
@@ -0,0 +1,35 @@
+<block cond="$use_filebox">
+	<script type="text/javascript">
+		xe.lang.cmd_delete = '{$lang->cmd_delete}';
+	</script>
+
+	<style type="text/css">
+		.filebox_item { border: 1px solid #ccc!important; padding: 5px; max-height: 200px; max-width: 200px; }
+	</style>
+
+	<div class="modal" id="modalFilebox">
+		<div class="fg portlet">
+			<h2 class="h2">FileBox</h2>
+			<div class="filebox_list"></div>
+			<h2 class="h2">Upload</h2>
+			<form id="filebox_upload" class="form" action="./" method="post" enctype="multipart/form-data">
+			<input type="hidden" name="module" value="module" />
+			<input type="hidden" name="act" value="procModuleFileBoxAdd" />
+			<input type="hidden" name="ajax" value="true" />
+				<ul>
+					<li>
+						<p class="q"><label for="comment">{$lang->description}</label></p>
+						<p class="a"><input type="text" name="comment" id="comment" value="" /></p>
+					</li>
+					<li>
+						<p class="q"><label for="addfile">{$lang->file}</label></p>
+						<p class="a"><input type="file" name="addfile" id="addfile" /></p>
+					</li>
+				</ul>
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->cmd_submit}" /></span>
+				</div>
+			</form>
+		</div>
+	</div>
+</block>
\ No newline at end of file
diff --git a/modules/widget/tpl/widget_generate_code.html b/modules/widget/tpl/widget_generate_code.html
index 7767ee40a..d0beb0e99 100644
--- a/modules/widget/tpl/widget_generate_code.html
+++ b/modules/widget/tpl/widget_generate_code.html
@@ -1,26 +1,25 @@
-<!--%import("filter/generate_code.xml")-->
-<!--%import("js/widget_admin.js")-->
-<!--%import("css/widget.css")-->
-<!--%import("../../admin/tpl/css/admin.css")-->
+<include cond="$in_admin" target="header.html" />
+<load target="js/generate_code.js" usecdn="true" />
 
-<form action="./" method="get" onsubmit="return procFilter(this, generate_code);" id="fo_widget">
-    <div id="popHeader" class="wide">
-        <h3 class="xeAdmin">{$lang->cmd_generate_code}</h3>
-    </div>
+<h2 class="h2">{$widget_info->title}</h2>
+<p>{$widget_info->description}</p>
+<form id="widget_code_form" class="form" action="./" method="post">
+	<input type="hidden" name="module" value="widget" />
+	<input type="hidden" name="act" value="procWidgetGenerateCode" />
+	<input type="hidden" name="selected_widget" value="{$widget_info->widget}" />
 
-    <div id="popBody">
-        {@ $_caption = $lang->about_widget_code}
-        <!--#include("widget_generate_code.include.html")-->
-        <h3 class="xeAdmin">{$lang->widget_code}</h3>
-        <table cellspacing="0" class="rowTable">
-        <tr>
-            <td class="wide"><textarea readonly="true" id="widget_code" class="inputTypeTextArea fullWidth"></textarea></td>
-        </tr>
-        </table>
-    </div>
-
-    <div id="popFooter">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_generate_code}"  /></span>
-    </div>
+	<h3 class="h3">{$lang->cmd_generate_code}</h3>
+	<p>{$lang->about_widget_code}</p>
+	<include target="widget_generate_code.include.html" />
 
+	<div class="btnArea">
+		<span class="btn small"><input type="submit" value="{$lang->cmd_generate_code}" /></span>
+	</div>
 </form>
+
+<h3 class="h3">{$lang->widget_code}</h3>
+<p><textarea id="widget_code" style="width: 100%; height: 50px;" readonly="readonly"></textarea>
+
+<include target="widget_generate_code.filebox.html" />
+<include target="widget_generate_code.multilang.html" />
+	<include target="widget_generate_code.multilang.textarea.html" />
\ No newline at end of file
diff --git a/modules/widget/tpl/widget_generate_code.include.html b/modules/widget/tpl/widget_generate_code.include.html
index 09e6692aa..b3b6fad32 100644
--- a/modules/widget/tpl/widget_generate_code.include.html
+++ b/modules/widget/tpl/widget_generate_code.include.html
@@ -1,201 +1,158 @@
+<load target="js/multi_order.js" usecdn="true" />
+<load target="js/module_list.js" usecdn="true" />
+<load target="js/mid.js" usecdn="true" />
+<load target="js/multi_lang.js" usecdn="true" />
 <!--%load_js_plugin("ui.colorpicker")-->
-<!--%load_js_plugin("filebox")-->
-<!--%import("./js/widget.js")-->
-<p class="summary">{nl2br($_caption)}</p>
-<table cellspacing="0" class="rowTable">
-<tr>
-    <th scope="row"><div>{$lang->widget}</div></th>
-    <td>
-        <select name="selected_widget" class="fullWidth">
-        <!--@foreach($widget_list as $widget)-->
-        <option value="{$widget->widget}" <!--@if($widget_info->widget == $widget->widget)--> selected="selected" <!--@end-->>{$widget->title} ver {$widget->version}</option>
-        <!--@end-->
-        </select>
-        <a href="#" class="button small" onclick="selectWidget(jQuery('select[name=selected_widget]').val())"><span>{$lang->cmd_select}</span></a>
-        <!--@if($widget_info->author->description)-->
-        <div class="widget_description">{nl2br(trim($widget_info->author->description))}</div>
-        <!--@end-->
-    </td>
-</tr>
-<!--@if(count($skin_list))-->
-<tr>
-    <th scope="row"><div>{$lang->skin}</div></th>
-    <td>
-        <select name="skin" id="widget_skin" class="fullWidth">
-            <option value="">&nbsp;</option>
-        <!--@foreach($skin_list as $key => $val)-->
-            <option value="{$key}">{$val->title} ({$key})</option>
-        <!--@end-->
-        </select>
-<a href="#" class="button small" onclick="doDisplaySkinColorset(jQuery('#widget_skin').get(0))"><span>{$lang->cmd_select}</span></a>
-        <div id="colorset_area" style="display:none">
-            <div class="header">{$lang->colorset}</div>
-            <div class="footer">
-                <select name="colorset" id="widget_colorset">
-                </select>
-            </div>
-        </div>
-    </td>
-</tr>
-<!--@end-->
-<tr>
-    <th scope="row"><div>{$lang->widget_cache}</div></th>
-    <td>
-        <input type="text" name="widget_cache" value="0" class="inputTypeText" size="2" />{$lang->unit_min}
-        <p>{$lang->about_widget_cache}</p>
-    </td>
-</tr>
-<!--@foreach($widget_info->extra_var as $id => $var)-->
 
-<!--@if($var->group && ((!$group) || $group != $var->group))-->
-{@$group = $var->group}
-</table>
-
-
-<h3 class="xeAdmin">{$group}</h3>
-<table cellspacing="0" class="rowTable">
-<!--@end-->
-<tr class="row{$cycle_idx}">
-    <th scope="row">
-        <div>
-            {$var->name}
-            <!--@if($var->type == "mid_list")-->
-                <input type="checkbox" onclick="XE.checkboxToggleAll('{$id}'); return false;" />
-            <!--@end-->
-        </div>
-    </th>
-    <td>
-        <!--@if($var->type == "text")-->
-        <input type="text" name="{$id}" value="" class="inputTypeText fullWidth" id="lang_{$id}"/>
-        <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','lang_'.$id)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-
-        <!--@elseif($var->type == "color")-->
-        <input type="text" name="{$id}" value="" class="inputTypeText color-indicator" />
-
-        <!--@elseif($var->type == "textarea")-->
-        <textarea name="{$id}" class="inputTypeTextArea fullWidth" id="lang_{$id}"></textarea>
-        <a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','lang_'.$id)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
-
-        <!--@elseif($var->type == "select")-->
-        <select name="{$id}">
-            <!--@foreach($var->options as $key => $val)-->
-            <option value="{$key}">{$val}</option>
-            <!--@end-->
-        </select>
-
-
-
-        <!--@elseif($var->type == "select-multi-order")-->
-        <input type="hidden" name="{$id}" value="" />
-        <input type="hidden" name="default_{$id}" value="" />
-        <input type="hidden" name="init_{$id}" value="" />
-
-        <div style="float:left;margin-left:30px;">
-            <select name="show_{$id}" size="8" class="w100">
-                <!--@foreach($var->options as $key => $val)-->
-                <option value="{$key}">{$key}</option>
-                <!--@end-->
-            </select>
-        </div>
-        <div style="float:left;margin-left:30px;">
-            <a class="buttonSet buttonRight" onclick="MultiOrderAdd('{$id}'); return false;" href="#"></a>
-            <br/><br/>
-            <a class="buttonSet buttonLeft" onclick="MultiOrderDelete('{$id}'); return false;" href="#"></a>
-            <br/><br/>
-            <a class="buttonSet buttonUp" onclick="MultiOrderUp('{$id}'); return false;" href="#"></a>
-            <br/><br/>
-            <a class="buttonSet buttonDown" onclick="MultiOrderDown('{$id}'); return false;" href="#"></a>
-        </div>
-
-
-        <div style="float:left;margin-left:30px;">
-            <select name="selected_{$id}" name="selected_{$id}" size="8" class="w100">
-            </select>
-        </div>
-
-
-        <script type="text/javascript">
-            <!--@foreach($var->options as $key => $val)-->
-                <!--@if($var->default_options[$key] == true)-->
-                    jQuery("[name='default_{$id}']").get(0).value += '{$key},';
-                <!--@end-->
-
-                <!--@if($var->init_options[$key] == true)-->
-                    jQuery("[name='init_{$id}']").get(0).value += ','+'{$key}';
-                <!--@end-->
-
-            <!--@end-->
-
-            if(typeof(initMultiOrder)!=='undefined') {
-                doAddWindowLoadEventLoader( function() { initMultiOrder('{$id}'); } );
-            }
-//            MultiOrderSet('{$id}');
-        </script>
-        <!--@elseif($var->type == "mid_list")-->
-
-            <!--@foreach($mid_list as $module_category_srl => $modules)-->
-                <!--@if($modules->title)-->
-                    <div class="widget_title">{$modules->title}</div>
-                <!--@else-->
-                    <div class="widget_title">{$lang->none_category}</div>
-                <!--@end-->
-
-                <!--@foreach($modules->list as $key => $val)-->
-                    <div class="widget_mid_list">
-                        <input type="checkbox" value="{$key}" name="{$id}" id="chk_mid_list_{$key}" />
-                        <label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
-                    </div>
-                <!--@end-->
-            <!--@end-->
-        <!--@elseif($var->type == "member_group")-->
-
-            <!--@foreach($group_list as $key => $val)-->
-                <input type="checkbox" value="{$key}" name="{$id}" id="chk_member_gruop_{$id}_{$key}" />
-                <label for="chk_member_gruop_{$id}_{$key}">{$val->title}</label>
-            <!--@end-->
-
-        <!--@elseif($var->type == "module_srl_list")-->
-            <input type="hidden" name="{$id}" id="{$id}" value="" />
-            <select name="_{$id}" id="_{$id}" size="8" class="w200 fl"></select>
-            <ul class="midCommand">
-                <li><a href="{getUrl('','module','module','act','dispModuleSelectList','id',$id)}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_insert}</span></a></li>
-                <li><a href="#" onclick="midMoveUp('{$id}');return false;" class="button black"><span>{$lang->cmd_move_up}</span></a></li>
-                <li><a href="#" onclick="midMoveDown('{$id}');return false;" class="button black"><span>{$lang->cmd_move_down}</span></a></li>
-                <li><a href="#" onclick="midRemove('{$id}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a></li>
-            </ul>
-            <script type="text/javascript">
-                if(typeof(getModuleSrlList)!=='undefined') {
-                    doAddWindowLoadEventLoader( function() { getModuleSrlList('{$id}'); } );
-                }
-            </script>
-        <!--@elseif($var->type == "mid")-->
-            <input type="hidden" name="{$id}" id="{$id}" value="" />
-            <input type="text" name="_{$id}" id="_{$id}" value="" class="inputTypeText w300" readonly="readonly"/><a href="{getUrl('','module','module','act','dispModuleSelectList','id',$id,'type','single')}" onclick="popopen(this.href, 'ModuleSelect');return false;" class="button blue"><span>{$lang->cmd_select}</span></a>
-            <script type="text/javascript">
-                if(typeof(getModuleSrlList)!=='undefined') {
-                    doAddWindowLoadEventLoader( function() { getModuleSrl('{$id}'); });
-                }
-            </script>
-        <!--@elseif($var->type == "filebox")-->
-            <div id="filebox_preview_{$id}" style="width:100px;height:100px;display:none" ></div>
-            <input type="hidden" name="{$id}" value="" />
-            <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name={$id}]', '#fo_widget').get(0), '{$var->filter}')">{$lang->cmd_select}</button></span>
-            <span id="filebox_cancel_{$id}" class="button red" style="display:none" ><button type="button" onclick="XE.filebox.cancel('{$id}')">{$lang->cmd_delete}</button></span>
-            <script type="text/javascript">//<![CDATA[
-                XE.filebox.init('{$id}');
-            //]]></script>
-
-
-        <!--@elseif($var->type == "menu")-->
-            <select name="{$id}" class="w300 fl">
-                <option value="">-</option>
-                <!--@foreach($menu_list as $key => $val)-->
-                <option value="{$val->menu_srl}">{$val->title}</option>
-                <!--@end-->
-            </select>
-        <!--@end-->
-        <p class="clear">{nl2br($var->description)}</p>
-    </td>
-</tr>
-<!--@end-->
-</table>
+<ul>
+	<li>
+		<p class="q"><label for="skin">{$lang->skin}</label></p>
+		<p class="a">
+			<select name="skin" id="skin" style="width:280px">
+				<option value="">{$lang->select}</option>
+				<option loop="$skin_list => $skin_name, $skin" value="{$skin_name}">{$skin->title} ({$skin_name})</option>
+			</select>
+			<input type="button" value="{$lang->cmd_select}" />
+		</p>
+	</li>
+	<li>
+		<p class="q"><label for="colorset">{$lang->colorset}</label></p>
+		<p class="a">
+			<select name="colorset" id="widget_colorset" style="width:280px">
+			</select>
+		</p>
+	</li>
+	<li>
+		<p class="q"><label for="widget_cache">{$lang->widget_cache}</label></p>
+		<p class="a">
+			<input type="text" name="widget_cache" id="widget_cache" value="0" size="2" style="width:auto" /> {$lang->unit_min}
+			({$lang->about_widget_cache})
+		</p>
+	</li>
+</ul>
+{@$suggestion_id = 0}
+<block loop="$widget_info->extra_var => $id, $var">
+	{@$suggestion_id++}
+	<block cond="!$not_first && !$var->group"><ul class="extra_vars"></block>
+	<block cond="$group != $var->group">
+		<block cond="$not_first"></ul></block>
+		<h3 class="h3">{$var->group}</h3>
+		<ul class="extra_vars">
+		{@$group = $var->group}
+	</block>
+	{@$not_first = true}
+	<li class="modulefinder"|cond="$var->type == 'mid' || $var->type == 'module_srl_list'">
+		<p class="q"><label for="{$id}">{$var->name}</label></p>
+		<div class="a">
+			<div cond="$var->type == 'text'" class="multiLangEdit">
+				{@$use_multilang = true}
+				<input type="hidden" name="{$id}" value="" class="vLang" />
+				<input type="text" id="{$id}" class="vLang" />
+				<span class="desc"><a href="#langEdit" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+				<script type="text/javascript">
+					xe.registerApp(new xe.MultiLangManager('{$id}'));
+				</script>
+			</div>
+			<input cond="$var->type == 'color'" type="text" name="{$id}" value="" id="{$id}" class="color-indicator" />
+			<div cond="$var->type == 'textarea'" class="multiLangEdit">
+				{@$use_multilang_textarea = true}
+				<input type="hidden" name="{$id}" value="" class="vLang" />
+				<textarea cond="$var->type == 'textarea'" id="{$id}" class="vLang"></textarea>
+				<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
+				<script type="text/javascript">
+					xe.registerApp(new xe.MultiLangManager('{$id}'));
+				</script>
+			</div>
+			<select cond="$var->type == 'select'" name="{$id}" id="{$id}" style="width:290px">
+				<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
+			</select>
+			<block cond="$var->type == 'select-multi-order'">
+				{@$inits = array_keys($var->init_options)}
+				<input type="hidden" name="{$id}" value="{implode(',', $inits)}" />
+				<select class="multiorder_show" size="8" multiple="multiple" style="width:290px;vertical-align:top">
+					<option loop="$var->options => $key, $val" cond="!$var->init_options[$key]" value="{$key}" default="true"|cond="$var->default_options[$key]">{$val}</option>
+				</select>
+				<button type="button" class="text multiorder_add" style="vertical-align:top">{$lang->cmd_insert}</button>
+				<select class="multiorder_selected" size="8" multiple="multiple" style="width:290px;vertical-align:top">
+					<option loop="$var->options => $key, $val" cond="$var->init_options[$key]" value="{$key}" default="true"|cond="$var->default_options[$key]">{$val}</option>
+				</select>
+				<button type="button" class="text multiorder_up" style="vertical-align:top">{$lang->cmd_move_up}</button>
+				<button type="button" class="text multiorder_down" style="vertical-align:top">{$lang->cmd_move_down}</button>
+				<button type="button" class="text multiorder_del" style="vertical-align:top">{$lang->cmd_delete}</button>
+				<script type="text/javascript">
+					xe.registerApp(new xe.MultiOrderManager('{$id}'));
+				</script>
+			</block>
+			<block cond="$var->type == 'mid_list'">
+				<fieldset loop="$mid_list => $module_category_srl, $modules" style="border: 1px solid #ccc; margin:1em 0; padding:.5em 1em">
+					<legend cond="$modules->title">{$modules->title}</legend>
+					<legend cond="!$modules->title">{$lang->none_category}</legend>
+					<div loop="$modules->list => $key, $val">
+						<input type="checkbox" value="{$key}" name="{$id}" id="chk_mid_list_{$key}" />
+						<label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
+					</div>
+				</fieldset>
+			</block>
+			<block cond="$var->type == 'member_group'">
+				<block loop="$group_list => $key, $val">
+					<input type="checkbox" value="{$key}" name="{$id}" id="chk_member_gruop_{$id}_{$key}" />
+					<label for="chk_member_gruop_{$id}_{$key}">{$val->title}</label>
+				</block>
+			</block>
+			<block cond="$var->type == 'module_srl_list'">
+				<input type="hidden" name="{$id}" value="" />
+				<div class="a">
+					<input type="text" /> <a href="#suggestion_{$suggestion_id}" class="tgAnchor findsite">{$lang->find_site}</a>
+					<div id="suggestion_{$suggestion_id}" class="tgContent suggestion">
+						<ul>
+						</ul>
+					</div>
+				</div>
+				<p class="a">
+					<select class="moduleList" style="width:290px"></select>
+				</p>
+				<select class="moduleIdList" size="8" multiple="multiple" style="width:290px;vertical-align:top"></select>
+				<button type="button" class="text modulelist_add" style="vertical-align:top">{$lang->cmd_insert}</button>
+				<select class="modulelist_selected" size="8" multiple="multiple" style="width:290px;"></select>
+				<button type="button" class="text modulelist_up" style="vertical-align:top">{$lang->cmd_move_up}</button>
+				<button type="button" class="text modulelist_down" style="vertical-align:top">{$lang->cmd_move_down}</button>
+				<button type="button" class="text modulelist_del" style="vertical-align:top">{$lang->cmd_delete}</button>
+				<script type="text/javascript">
+					xe.registerApp(new xe.ModuleListManager('{$id}'));
+				</script>
+			</block>
+			<block cond="$var->type == 'mid'">
+				<input type="hidden" name="{$id}" value="" />
+				<input type="text" readonly="readonly" /> <button class="text search">{$lang->cmd_search}</button> <button class="text delete">{$lang->cmd_delete}</button>
+				<div class="finder" style="display: none;">
+					<div class="a">
+						<input type="text" class="site_keyword" /> <a href="#suggestion_{$suggestion_id}" class="tgAnchor findsite">{$lang->find_site}</a>
+						<div id="suggestion_{$suggestion_id}" class="tgContent suggestion">
+							<ul>
+							</ul>
+						</div>
+					</div>
+					<p class="a"><select class="moduleList" style="width:290px;"></select></p>
+					<p class="a"><select class="moduleIdList" style="width:290px;"></select> <button class="text">{$lang->cmd_select}</button></p>
+				</div>
+				<script type="text/javascript">
+					xe.registerApp(new xe.MidManager('{$id}'));
+				</script>
+			</block>
+			<block cond="$var->type == 'filebox'">
+				{@$use_filebox = true}
+				<input type="hidden" name="{$id}" />
+				<a class="modalAnchor filebox" href="#modalFilebox">{$lang->cmd_select}</a>
+			</block>
+			<select cond="$var->type == 'menu'" name="{$id}" style="width:290px">
+				<option value="">-</option>
+				<option loop="$menu_list => $key, $val" value="{$val->menu_srl}">{$val->title}</option>
+			</select>
+		</div>
+		<p class="desc">{$var->description}</p>
+	</li>
+</block>
+</ul>
+<script type="text/javascript">
+	xe.current_lang = "{$lang_type}";
+</script>
diff --git a/modules/widget/tpl/widget_generate_code.multilang.html b/modules/widget/tpl/widget_generate_code.multilang.html
new file mode 100644
index 000000000..8a45e064d
--- /dev/null
+++ b/modules/widget/tpl/widget_generate_code.multilang.html
@@ -0,0 +1,23 @@
+<block cond="$use_multilang">
+	<div id="langEdit" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput form">
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <input type="text" value="" id="{$code}_var1" /></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
+</block>
diff --git a/modules/widget/tpl/widget_generate_code.multilang.textarea.html b/modules/widget/tpl/widget_generate_code.multilang.textarea.html
new file mode 100644
index 000000000..5b05c0b24
--- /dev/null
+++ b/modules/widget/tpl/widget_generate_code.multilang.textarea.html
@@ -0,0 +1,27 @@
+<block cond="$use_multilang_textarea">
+	<style type="text/css">
+		#langEditTextarea textarea { width: 258px; }
+	</style>
+
+	<div id="langEditTextarea" class="langEdit tgContent">
+		<ul class="langList"></ul>
+		<div class="langInput form">
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<ul>
+				{@
+					/* move current language to the top */
+					$a = array($lang_type=>$lang_supported[$lang_type]);
+					unset($lang_supported[$lang_type]);
+					$lang_supported = array_merge($a, $lang_supported);
+				}
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <textarea id="{$code}_var1"></textarea></li>
+			</ul>
+			<div class="action">
+				<div class="btnArea">
+					<span class="btn small"><input type="submit" value="{$lang->use}|{$lang->use_after_save}" /></span>
+				</div>
+				<p><a href="{getUrl('act','dispModuleAdminLangcode')}">{$lang->multilingual_manager}</a></p>
+			</div>
+		</div>
+	</div>
+</block>
diff --git a/modules/widget/tpl/widget_generate_code_in_page.html b/modules/widget/tpl/widget_generate_code_in_page.html
index 3a0e5ca42..cddf7ad81 100644
--- a/modules/widget/tpl/widget_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_generate_code_in_page.html
@@ -1,32 +1,63 @@
-<!--%import("filter/generate_code_in_page.xml")-->
-<!--%import("js/widget_admin.js")-->
-<!--%import("css/widget.css")-->
-<!--%import("../../admin/tpl/css/admin.css")-->
+<load target="../../admin/tpl/js/admin.js" usecdn="true" />
+<load target="../../admin/tpl/css/admin.css" usecdn="true" />
+<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" />
+<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" />
+<load target="js/generate_code.js" usecdn="true" />
 
 <script type="text/javascript">
-    doAddWindowLoadEventLoader(doFillWidgetVars);
+	xe.lang.cmd_delete = '{$lang->cmd_delete}';
+
+	jQuery(document).ready(function(){
+		doFillWidgetVars();
+	});
 </script>
 
-<form action="./" method="get" onsubmit="return procFilter(this, generate_code_in_page);" id="fo_widget">
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="widget_sequence" value="" />
-<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
-<input type="hidden" name="widget_padding_left" value="" />
-<input type="hidden" name="widget_padding_right" value="" />
-<input type="hidden" name="widget_padding_top" value="" />
-<input type="hidden" name="widget_padding_bottom" value="" />
+<div cond="$type=='faceoff'" class="x" style="padding: 0 10px;">
+	<form class="form">
+	<input type="hidden" name="module" value="widget" />
+	<input type="hidden" name="type" value="faceoff" />
+	<input type="hidden" name="act" value="dispWidgetGenerateCodeInPage" />
+	<input type="hidden" name="error_return_url" value="" />
 
-    <div id="popHeader" class="wide">
-        <h3 class="xeAdmin">{$lang->cmd_generate_code}</h3>
-    </div>
+	<h2 class="h2">{$lang->widget}</h2>
+		<ul>
+			<li>
+				<p class="a">
+					<select name="selected_widget">
+						<option loop="$widget_list => $list_widget_info" value="{$list_widget_info->widget}">{$list_widget_info->title}</option>
+					</select>
+					<input type="submit" value="{$lang->cmd_select}" />
+				</p>
+			</li>
+		</ul>
+	</form>
+</div>
+<div class="x" style="padding: 0 10px;">
+	<h2 class="h2">{$widget_info->title}</h2>
+	<p>{$widget_info->description}</p>
 
-    <div id="popBody">
+	<h3 class="h3">{$lang->cmd_generate_code}</h3>
+	<p>{$lang->about_widget_code_in_page}</p>
 
-        {@ $_caption = $lang->about_widget_code_in_page}
-        <!--#include("widget_generate_code.include.html")-->
+	<form class="form" action="./" method="post" id="fo_widget">
+		<input type="hidden" name="module" value="widget" />
+		<input type="hidden" name="module_srl" value="{$module_srl}" />
+		<input type="hidden" name="widget_sequence" value="" />
+		<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
+		<input type="hidden" name="widget_padding_left" value="" />
+		<input type="hidden" name="widget_padding_right" value="" />
+		<input type="hidden" name="widget_padding_top" value="" />
+		<input type="hidden" name="widget_padding_bottom" value="" />
+		<input type="hidden" name="selected_widget" value="{$widget_info->widget}" />
 
-    </div>
-    <div id="popFooter" class="tCenter gap1">
-        <span class="button black strong"><input type="submit" value="{$lang->cmd_generate_code}"  /></span>
-    </div>
-</form>
+		<include target="widget_generate_code.include.html" />
+
+		<div class="btnArea">
+			<span class="btn small"><input type="submit" value="{$lang->cmd_generate_code}" /></span>
+		</div>
+	</form>
+
+	<include target="widget_generate_code.filebox.html" />
+	<include target="widget_generate_code.multilang.html" />
+	<include target="widget_generate_code.multilang.textarea.html" />
+</div>
diff --git a/modules/widget/tpl/widget_layer.html b/modules/widget/tpl/widget_layer.html
index 870da3cf7..7ed9d31ed 100644
--- a/modules/widget/tpl/widget_layer.html
+++ b/modules/widget/tpl/widget_layer.html
@@ -1,117 +1,112 @@
-<div id="tmpPageSizeLayer" class="layer boxModelController">
-<form action="index.php">
-    <h4 class="xeAdmin">&nbsp;</h4>
-    <!--button class="xButton" type="button" onclick="hideCategoryInfo();return false" ><span>{$lang->cmd_close}</span></button-->
-
-    <div class="layerBody">
-        <table cellspacing="0" class="adminTable">
-        <col width="140" />
-        <col />
-        <col />
-        <tr>
-            <th>{$lang->cmd_widget_align}</th>
-            <td colspan="2">
-                <select name="widget_align">
-                    <option value="left">{$lang->cmd_widget_align_left}</option>
-                    <option value="right">{$lang->cmd_widget_align_right}</option>
-                </select>
-            </td>
-        </tr>
-        <tr>
-            <th class="line">{$lang->cmd_widget_size}</th>
-            <td colspan="2" class="line"><input type="text" name="width" class="input" value="" /> - <input type="text" class="input" name="height" value="" /></td>
-        </tr>
-        <tr>
-            <th rowspan="3" class="line">{$lang->cmd_widget_margin}</th>
-            <td colspan="2" class="line tCenter"><input type="text" name="margin_top" class="input" value="" />px</td>
-        </tr>
-        <tr>
-            <td><input type="text" name="margin_left" class="input" value="" />px</td>
-            <td class="tRight"><input type="text" name="margin_right" class="input" value="" />px</td>
-        </tr>
-        <tr>
-            <td colspan="2" class="tCenter"><input type="text" name="margin_bottom" class="input" value="" />px</td>
-        </tr>
-        <tr>
-            <th rowspan="3" class="line">{$lang->cmd_widget_padding}</th>
-            <td colspan="2" class="line tCenter"><input type="text" name="padding_top" class="input" value="" />px</td>
-        </tr>
-        <tr>
-            <td><input type="text" name="padding_left" class="input" value="" />px</td>
-            <td class="tRight"><input type="text" name="padding_right" class="input" value="" />px</td>
-        </tr>
-        <tr>
-            <td colspan="2" class="tCenter"><input type="text" name="padding_bottom" class="input" value="" />px</td>
-        </tr>
-        <tr>
-            <th rowspan="3" class="line">{$lang->cmd_widget_border}</th>
-            <td colspan="2" class="tCenter line">
-                <input type="text" name="border_top_thick" value="" class="small_input" />px
-                <select name="border_top_type">
-                    <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" maxlength="6"/>
-            </td>
-        </tr>
-        <tr>
-            <td>
-                <input type="text" name="border_left_thick" value="" class="small_input" />px
-                <select name="border_left_type">
-                    <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" maxlength="6"/>
-            </td>
-            <td class="tRight">
-                <input type="text" name="border_right_thick" value="" class="small_input" />px
-                <select name="border_right_type">
-                    <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" maxlength="6"/>
-            </td>
-        </tr>
-        <tr>
-            <td colspan="2" class="tCenter">
-                <input type="text" name="border_bottom_thick" value="" class="small_input" />px
-                <select name="border_bottom_type">
-                    <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" maxlength="6"/>
-            </td>
-        </tr>
-        <tr>
-            <th class="line">{$lang->cmd_widget_background_color}</th>
-            <td colspan="2" class="line"><input type="text" name="background_color" value="" class="input" /></td>
-        </tr>
-        <tr>
-            <th class="line">{$lang->cmd_widget_background_image_url}</th>
-            <td colspan="2" class="line">
-                <div><input type="text" name="background_image_url" value="" class="full_input"/></div>
-                <div>
-                    <select name="background_repeat">
-                        <option value="repeat">{$lang->cmd_widget_background_image_repeat}</option>
-                        <option value="no-repeat">{$lang->cmd_widget_background_image_no_repeat}</option>
-                        <option value="repeat-x">{$lang->cmd_widget_background_image_x_repeat}</option>
-                        <option value="repeat-y">{$lang->cmd_widget_background_image_y_repeat}</option>
-                    </select>
-                </div>
-                <div>
-                    {$lang->cmd_widget_background_image_x} : <input type="text" name="background_x" value="0" class="input" />
-                </div>
-                <div>
-                    {$lang->cmd_widget_background_image_y} : <input type="text" name="background_y" value="0" class="input" />
-                </div>
-            </td>
-        </tr>
-        <tr>
-            <th colspan="3">
-                <span class="button black strong"><input type="submit" value="{$lang->cmd_save}" class="submit"/></span>
-            </th>
-        </tr>
-        </table>
-    </div>
-</form>
+<div id="tmpPageSizeLayer" class="layer x">
+	<form action="index.php">
+		<div class="table">
+			<table width="100%" border="1" cellspacing="0">
+				<col width="140" />
+				<col />
+				<col />
+				<tr>
+					<th>{$lang->cmd_widget_align}</th>
+					<td colspan="2">
+						<select name="widget_align">
+							<option value="left">{$lang->cmd_widget_align_left}</option>
+							<option value="right">{$lang->cmd_widget_align_right}</option>
+						</select>
+					</td>
+				</tr>
+				<tr>
+					<th class="line">{$lang->cmd_widget_size}</th>
+					<td colspan="2" class="line"><input type="text" name="width" class="input" value="" /> - <input type="text" class="input" name="height" value="" /></td>
+				</tr>
+				<tr>
+					<th rowspan="3" class="line">{$lang->cmd_widget_margin}</th>
+					<td colspan="2" class="line tCenter"><input type="text" name="margin_top" class="input" value="" />px</td>
+				</tr>
+				<tr>
+					<td><input type="text" name="margin_left" class="input" value="" />px</td>
+					<td class="tRight"><input type="text" name="margin_right" class="input" value="" />px</td>
+				</tr>
+				<tr>
+					<td colspan="2" class="tCenter"><input type="text" name="margin_bottom" class="input" value="" />px</td>
+				</tr>
+				<tr>
+					<th rowspan="3" class="line">{$lang->cmd_widget_padding}</th>
+					<td colspan="2" class="line tCenter"><input type="text" name="padding_top" class="input" value="" />px</td>
+				</tr>
+				<tr>
+					<td><input type="text" name="padding_left" class="input" value="" />px</td>
+					<td class="tRight"><input type="text" name="padding_right" class="input" value="" />px</td>
+				</tr>
+				<tr>
+					<td colspan="2" class="tCenter"><input type="text" name="padding_bottom" class="input" value="" />px</td>
+				</tr>
+				<tr>
+					<th rowspan="3" class="line">{$lang->cmd_widget_border}</th>
+					<td colspan="2" class="tCenter line">
+						<input type="text" name="border_top_thick" value="" class="small_input" />px
+						<select name="border_top_type">
+							<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" maxlength="6"/>
+					</td>
+				</tr>
+				<tr>
+					<td>
+						<input type="text" name="border_left_thick" value="" class="small_input" />px
+						<select name="border_left_type">
+							<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" maxlength="6"/>
+					</td>
+					<td class="tRight">
+						<input type="text" name="border_right_thick" value="" class="small_input" />px
+						<select name="border_right_type">
+							<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" maxlength="6"/>
+					</td>
+				</tr>
+				<tr>
+					<td colspan="2" class="tCenter">
+						<input type="text" name="border_bottom_thick" value="" class="small_input" />px
+						<select name="border_bottom_type">
+							<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" maxlength="6"/>
+					</td>
+				</tr>
+				<tr>
+					<th class="line">{$lang->cmd_widget_background_color}</th>
+					<td colspan="2" class="line"><input type="text" name="background_color" value="" class="input" /></td>
+				</tr>
+				<tr>
+					<th class="line">{$lang->cmd_widget_background_image_url}</th>
+					<td colspan="2" class="line">
+						<div><input type="text" name="background_image_url" value="" class="full_input"/></div>
+						<div>
+							<select name="background_repeat">
+								<option value="repeat">{$lang->cmd_widget_background_image_repeat}</option>
+								<option value="no-repeat">{$lang->cmd_widget_background_image_no_repeat}</option>
+								<option value="repeat-x">{$lang->cmd_widget_background_image_x_repeat}</option>
+								<option value="repeat-y">{$lang->cmd_widget_background_image_y_repeat}</option>
+							</select>
+						</div>
+						<div>
+							{$lang->cmd_widget_background_image_x} : <input type="text" name="background_x" value="0" class="input" />
+						</div>
+						<div>
+							{$lang->cmd_widget_background_image_y} : <input type="text" name="background_y" value="0" class="input" />
+						</div>
+					</td>
+				</tr>
+			</table>
+		</div>
+		<div class="btnArea">
+			<span class="btn"><input type="submit" value="{$lang->cmd_save}" /></span>
+		</div>
+	</form>
 </div>
diff --git a/modules/widget/tpl/widget_style_generate_code_in_page.html b/modules/widget/tpl/widget_style_generate_code_in_page.html
index d386c55de..8490bc904 100644
--- a/modules/widget/tpl/widget_style_generate_code_in_page.html
+++ b/modules/widget/tpl/widget_style_generate_code_in_page.html
@@ -1,111 +1,95 @@
-<!--%import("filter/style_generate_code_in_page.xml")-->
-<!--%import("js/widget_admin.js")-->
-<!--%import("css/widget.css")-->
-<!--%import("../../admin/tpl/css/admin.css")-->
-<!--%load_js_plugin("filebox")-->
-<!--%load_js_plugin("ui.colorpicker")-->
-
-<script type="text/javascript">
-    doAddWindowLoadEventLoader(getWidgetVars);
-</script>
-
-<div id="popHeader" class="wide">
-    <h3 class="xeAdmin">{$lang->widgetstyle}</h3>
-</div>
-
-<form action="{getUrl('')}" method="post" enctype="multipart/form-data" target="hidden_iframe" onsubmit="return procFilter(this, style_generate_code_in_page);" id="fo_widget">
-<input type="hidden" name="module_srl" value="{$module_srl}" />
-<input type="hidden" name="widget_sequence" value="" />
-<input type="hidden" name="style" value="" />
-<input type="hidden" name="widget_padding_left" value="" />
-<input type="hidden" name="widget_padding_right" value="" />
-<input type="hidden" name="widget_padding_top" value="" />
-<input type="hidden" name="widget_padding_bottom" value="" />
-<input type="hidden" name="module" value="widget" />
-<input type="hidden" name="act" value="" />
-<input type="hidden" name="widgetstyle" value="{$widgetstyle}" />
-<input type="hidden" name="selected_widget" value="{$selected_widget}" />
-<div id="popBody">
-
-    <a href="{getUrl('widgetstyle','none')}" class="widgetStyle"><img src="images/widgetstyle_none.gif" title="{$lang->notuse}" /></a>
-
-    <!--@foreach($widgetStyle_list as $key => $widgetStyle)-->
-        <!--@if($widgetStyle->preview)-->
-            <a href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle==$widgetstyle)-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /><span>{$widgetStyle->title}</span></a>
-        <!--@end-->
-    <!--@end-->
-    <div class="clear"></div>
-
-
-<!--@if($widgetstyle_info)-->
-    <h4 class="xeAdmin">{$widgetstyle_info->title} ver {$widgetstyle_info->version}</h4>
-    <table cellspacing="0" class="rowTable">
-        <tr>
-            <th scope="row"><div>{$lang->description}</div></th>
-            <td>{$widgetstyle_info->description}</td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->author}</div></th>
-            <td>
-            <!--@foreach($widgetstyle_info->author as $k => $author)-->
-                {$author->name} ({$author->homepage})
-            <!--@end-->
-            </td>
-        </tr>
-        <tr>
-            <th scope="row"><div>{$lang->regdate}</div></th>
-            <td>{zdate($widgetstyle_info->date,'Y-m-d')}</td>
-        </tr>
-        </table>
-
-        <h4 class="xeAdmin">{$lang->cmd_setup}</h4>
-        <table cellspacing="0" class="rowTable">
-        <!--@foreach($widgetstyle_info->extra_var as $id => $var)-->
-        <tr>
-            <th scope="row">
-                <div>
-                    {$var->name}
-                </div>
-            </th>
-            <td>
-                <!--@if($var->type == "text")-->
-                <input type="text" name="{$id}" id="{$id}" value="" class="inputTypeText w400 lang_code" />
-
-                <!--@elseif($var->type == "color")-->
-
-                <input type="text" name="{$id}" value="" class="inputTypeText color-indicator" />
-
-                <!--@elseif($var->type == "textarea")-->
-                <textarea name="{$id}" class="inputTypeTextArea w400"></textarea>
-
-                <!--@elseif($var->type == "select")-->
-                <select name="{$id}">
-                    <!--@foreach($var->options as $key => $val)-->
-                    <option value="{$key}">{$val}</option>
-                    <!--@end-->
-                </select>
-                <!--@elseif($var->type == "filebox")-->
-                    <div id="filebox_preview_{$id}" style="width:100px;height:100px;display:none" ></div>
-                    <input type="hidden" name="{$id}" value="" />
-                    <span class="button black"><button type="button" onclick="XE.filebox.open(jQuery('[name={$id}]', '#fo_widget').get(0), '{$var->filter}')">{$lang->cmd_select}</button></span>
-                    <span id="filebox_cancel_{$id}" class="button red" style="display:none" ><button type="button" onclick="XE.filebox.cancel('{$id}')">{$lang->cmd_delete}</button></span>
-                    <script type="text/javascript">//<![CDATA[
-                        XE.filebox.init('{$id}');
-                    //]]></script>
-
-
-                <!--@end-->
-                <p class="clear">{nl2br($var->description)}</p>
-            </td>
-        </tr>
-        <!--@end-->
-        </table>
-<!--@end-->
-
-</div>
-<div id="popFooter">
-    <span class="button black strong"><input type="submit" value="{$lang->cmd_setup}"  /></span>
-</div>
-</form>
-
-<iframe name="hidden_iframe" frameborder="0" style="display:none"></iframe>
+<load target="../../admin/tpl/js/admin.js" usecdn="true" />
+<load target="../../admin/tpl/css/admin.css" usecdn="true" />
+<load cond="$lang_type='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" />
+<load cond="$lang_type='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" />
+<load target="css/widget.css" usecdn="true" />
+<load target="js/generate_code.js" usecdn="true" />
+<!--%load_js_plugin("ui.colorpicker")-->
+
+<script type="text/javascript">
+	jQuery(document).ready(function(){
+		getWidgetVars();
+	});
+</script>
+
+<div class="x" style="padding: 0 10px;">
+	<h1 class="h1">{$lang->widgetstyle}</h1>
+
+	<form class="form" action="./" method="post" id="fo_widget">
+		<input type="hidden" name="module_srl" value="{$module_srl}" />
+		<input type="hidden" name="widget_sequence" value="" />
+		<input type="hidden" name="style" value="" />
+		<input type="hidden" name="widget_padding_left" value="" />
+		<input type="hidden" name="widget_padding_right" value="" />
+		<input type="hidden" name="widget_padding_top" value="" />
+		<input type="hidden" name="widget_padding_bottom" value="" />
+		<input type="hidden" name="module" value="widget" />
+		<input type="hidden" name="act" value="" />
+		<input type="hidden" name="widgetstyle" value="{$widgetstyle}" />
+		<input type="hidden" name="selected_widget" value="{$selected_widget}" />
+
+		<a href="{getUrl('widgetstyle','none')}" class="widgetStyle"><img src="images/widgetstyle_none.gif" title="{$lang->notuse}" /></a>
+		<a loop="$widgetStyle_list => $key, $widgetStyle" cond="$widgetStyle->preview" href="{getUrl('widgetstyle',$widgetStyle->widgetStyle)}" class="widgetStyle <!--@if($widgetStyle->widgetStyle==$widgetstyle)-->selected<!--@end-->"><img src="{getUrl()}{$widgetStyle->preview}" title="{$widgetStyle->title}" /><span>{$widgetStyle->title}</span></a>
+		<block cond="$widgetstyle_info">
+
+			<h2 class="h2">{$widgetstyle_info->title} ver {$widgetstyle_info->version}</h2>
+			<ul>
+				<li>
+					<p class="q">{$lang->description}</p>
+					<p class="a">{$widgetstyle_info->description}</p>
+				</li>
+				<li>
+					<p class="q">{$lang->author}</p>
+					<p class="a">
+						<block loop="$widgetstyle_info->author => $author">
+							{$author->name} ({$author->homepage})
+						</block>
+					</p>
+				</li>
+				<li>
+					<p class="q">{$lang->regdate}</p>
+					<p class="a">{zdate($widgetstyle_info->date,'Y-m-d')}</p>
+				</li>
+			</ul>
+
+			<block loop="$widgetstyle_info->extra_var => $id, $var">
+				{@$suggestion_id++}
+				<block cond="!$not_first && !$var->group"><ul></block>
+				<block cond="$group != $var->group">
+					<block cond="$not_first"></ul></block>
+					<h3 class="h3">{$var->group}</h3>
+					<ul>
+					{@$group = $var->group}
+				</block>
+				{@$not_first = true}
+				<li>
+					<p class="q">{$var->name}</p>
+					<p class="a">
+						<input cond="$var->type == 'text'" type="text" name="{$id}" />
+
+						<input cond="$var->type == 'color'" type="text" name="{$id}" class="color-indicator" />
+
+						<textarea cond="$var->type == 'textarea'" name="{$id}"></textarea>
+
+						<select cond="$var->type == 'select'" name="{$id}">
+							<option loop="$var->options => $key, $val" value="{$key}">{$val}</option>
+						</select>
+
+						<block cond="$var->type == 'filebox'">
+							<input type="hidden" name="{$id}" />
+							<a href="#modalFilebox" class="modalAnchor filebox">{$lang->cmd_select}</a>
+						</block>
+					</p>
+					<p class="desc">{$var->description}</p>
+				</li>
+			</block>
+			</ul>
+		</block>
+
+		<div class="btnArea">
+			<span class="btn small"><input type="submit" value="{$lang->cmd_setup}"  /></span>
+		</div>
+	</form>
+	<include target="widget_generate_code.filebox.html" />
+
+</div>
diff --git a/modules/widget/widget.admin.view.php b/modules/widget/widget.admin.view.php
index 6f0094101..9091db130 100644
--- a/modules/widget/widget.admin.view.php
+++ b/modules/widget/widget.admin.view.php
@@ -1,62 +1,81 @@
-<?php
-    /**
-     * @class  widgetAdminView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  widget 모듈의 admin view class
-     **/
-
-    class widgetAdminView extends widget {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 위젯 목록을 보여줌
-         **/
-        function dispWidgetAdminDownloadedList() {
-            // 위젯 목록을 세팅
-            $oWidgetModel = &getModel('widget');
-            $widget_list = $oWidgetModel->getDownloadedWidgetList();
-            Context::set('widget_list', $widget_list);
-
-            $this->setTemplateFile('downloaded_widget_list');
-
-			$security = new Security();
-			$security->encodeHTML('widget_list..', 'widget_list..author..');
-        }
-
-        /**
-         * @brief 내용 직접 입력 위젯 팝업창 내용을 꾸힘
-         **/
-        function dispWidgetAdminAddContent() {
-            $module_srl = Context::get('module_srl');
-            if(!$module_srl) return $this->stop("msg_invalid_request");
-
-            $document_srl = Context::get('document_srl');
-            $oDocumentModel = &getModel('document');
-            $oDocument = $oDocumentModel->getDocument($document_srl);
-            Context::set('oDocument', $oDocument);
-
-            $oModuleModel = &getModel('module');
-            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            Context::set('module_info', $module_info);
-
-            // 에디터 모듈의 getEditor를 호출하여 세팅
-            $oEditorModel = &getModel('editor');
-            $editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
-            Context::set('editor', $editor);
-
-			$security = new Security();
-			$security->encodeHTML('member_config..');
-
-            $this->setLayoutFile("popup_layout");
-            $this->setTemplateFile('add_content_widget');
-
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  widgetAdminView
+     * @author NHN (developers@xpressengine.com)
+     * @brief admin view class for widget modules
+     **/
+
+    class widgetAdminView extends widget {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Showing a list of widgets
+         **/
+        function dispWidgetAdminDownloadedList() {
+            // Set widget list
+            $oWidgetModel = &getModel('widget');
+            $widget_list = $oWidgetModel->getDownloadedWidgetList();
+
+			$security = new Security($widget_list);
+			$widget_list = $security->encodeHTML('..', '..author..');
+
+			foreach($widget_list as $no => $widget)
+			{
+				$widget_list[$no]->description = nl2br(trim($widget->description));
+			}
+
+            Context::set('widget_list', $widget_list);
+			Context::set('tCount', count($widget_list));
+
+            $this->setTemplateFile('downloaded_widget_list');
+
+			$security = new Security();
+			$security->encodeHTML('widget_list..', 'widget_list..author..');
+        }
+
+		function dispWidgetAdminGenerateCode()
+		{
+			$oView = &getView('widget');
+			Context::set('in_admin', true);
+			$this->setTemplateFile('widget_generate_code');
+			return $oView->dispWidgetGenerateCode();
+		}
+
+        /**
+         * @brief For information on direct entry widget popup kkuhim
+         **/
+        function dispWidgetAdminAddContent() {
+            $module_srl = Context::get('module_srl');
+            if(!$module_srl) return $this->stop("msg_invalid_request");
+
+            $document_srl = Context::get('document_srl');
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            Context::set('oDocument', $oDocument);
+
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'mid');
+            $module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            Context::set('module_info', $module_info);
+            // Editors settings of the module by calling getEditor
+            $oEditorModel = &getModel('editor');
+            $editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
+            Context::set('editor', $editor);
+
+			$security = new Security();
+			$security->encodeHTML('member_config..');
+
+			$this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile("default_layout");
+            $this->setTemplateFile('add_content_widget');
+
+        }
+
+    }
+?>
diff --git a/modules/widget/widget.class.php b/modules/widget/widget.class.php
index a5132ad61..5a64229a9 100644
--- a/modules/widget/widget.class.php
+++ b/modules/widget/widget.class.php
@@ -1,64 +1,56 @@
-<?php
-    /**
-     * @class  widget
-     * @author NHN (developers@xpressengine.com)
-     * @brief  widget 모듈의 high class
-     **/
-
-    class widget extends ModuleObject {
-
-        /**
-         * @brief 설치시 추가 작업이 필요할시 구현
-         **/
-        function moduleInstall() {
-            // widget 에서 사용할 cache디렉토리 생성
-            FileHandler::makeDir('./files/cache/widget');
-			FileHandler::makeDir('./files/cache/widget_cache');
-
-            // widget compile을 위한 display.after 트리거 추가
-            $oModuleController = &getController('module');
-            $oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
-
-            return new Object();
-        }
-
-        /**
-         * @brief 설치가 이상이 없는지 체크하는 method
-         **/
-        function checkUpdate() {
-            $oModuleModel = &getModel('module');
-
-            // widget compile을 위한 display.after 트리거 추가 (2009. 04. 14)
-            if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
-
-            return false;
-        }
-
-        /**
-         * @brief 업데이트 실행
-         **/
-        function moduleUpdate() {
-            $oModuleModel = &getModel('module');
-            $oModuleController = &getController('module');
-
-            // widget compile을 위한 display.after 트리거 추가 (2009. 04. 14)
-            if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
-                $oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
-            }
-
-            return new Object(0, 'success_updated');
-        }
-
-        /**
-         * @brief 캐시 파일 재생성
-         **/
-        function recompileCache() {
-            // widget 정보를 담은 캐시 파일 삭제
-            FileHandler::removeFilesInDir("./files/cache/widget");
-
-            // widget 생성 캐시 파일 삭제
-            FileHandler::removeFilesInDir("./files/cache/widget_cache");
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  widget
+     * @author NHN (developers@xpressengine.com)
+     * @brief widget module's high class
+     **/
+
+    class widget extends ModuleObject {
+
+        /**
+         * @brief Implement if additional tasks are necessary when installing
+         **/
+        function moduleInstall() {
+            // Create cache directory used by widget
+            FileHandler::makeDir('./files/cache/widget');
+			FileHandler::makeDir('./files/cache/widget_cache');
+            // Add this widget compile the trigger for the display.after
+            $oModuleController = &getController('module');
+            $oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
+
+            return new Object();
+        }
+
+        /**
+         * @brief a method to check if successfully installed
+         **/
+        function checkUpdate() {
+            $oModuleModel = &getModel('module');
+            // widget compile display.after trigger for further (04/14/2009)
+            if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+
+            return false;
+        }
+
+        /**
+         * @brief Execute update
+         **/
+        function moduleUpdate() {
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
+            // widget compile display.after trigger for further (04/14/2009)
+            if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
+                $oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
+            }
+
+            return new Object(0, 'success_updated');
+        }
+
+        /**
+         * @brief Re-generate the cache file
+         **/
+        function recompileCache() {
+        }
+
+    }
+?>
diff --git a/modules/widget/widget.controller.php b/modules/widget/widget.controller.php
index 16567be2e..e2cade4af 100644
--- a/modules/widget/widget.controller.php
+++ b/modules/widget/widget.controller.php
@@ -1,723 +1,678 @@
-<?php
-    /**
-     * @class  widgetController
-     * @author NHN (developers@xpressengine.com)
-     * @brief  widget 모듈의 Controller class
-     **/
-
-    class widgetController extends widget {
-
-        // 위젯을 결과물이 아닌 수정/삭제등을 하기 위한 곳에서 사용하기 위한 flag 
-        // layout_javascript_mode 는 모든 결과물까지 포함하여 javascript mode로 변환시킴
-        var $javascript_mode = false;
-        var $layout_javascript_mode = false;
-
-        // 위젯 캐시 파일이 생성되는 곳
-        var $cache_path = './files/cache/widget_cache/';
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 선택된 위젯 - 스킨의 컬러셋을 return
-         **/
-        function procWidgetGetColorsetList() {
-            $widget = Context::get('selected_widget');
-            $skin = Context::get('skin');
-
-            $path = sprintf('./widgets/%s/', $widget);
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($path, $skin);
-
-            for($i=0;$i<count($skin_info->colorset);$i++) {
-                $colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
-                $colorset_list[] = $colorset;
-            }
-
-            if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
-            $this->add('colorset_list', $colorsets);
-        }
-
-        /**
-         * @brief 위젯의 생성된 코드를 return
-         **/
-        function procWidgetGenerateCode() {
-            $widget = Context::get('selected_widget');
-            if(!$widget) return new Object(-1,'msg_invalid_request');
-            if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
-
-            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
-
-            $widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ',$attribute));
-
-            // 코드 출력
-            $this->add('widget_code', $widget_code);
-        }
-
-        /**
-         * @brief 페이지 수정시 위젯 코드의 생성 요청
-         **/
-        function procWidgetGenerateCodeInPage() {
-            $widget = Context::get('selected_widget');
-            if(!$widget) return new Object(-1,'msg_invalid_request');
-
-            if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
-
-            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
-
-            // 결과물을 구함
-            $widget_code = $this->execute($widget, $vars, true, false);
-
-            $this->add('widget_code', $widget_code);
-        }
-
-        /**
-         * @brief 위젯스타일에 이미지 업로드
-         **/
-        function procWidgetStyleExtraImageUpload(){
-            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
-
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('default_layout.html');
-            $this->setTemplatePath($this->module_path.'tpl');
-            $this->setTemplateFile("top_refresh.html");
-        }
-
-        /**
-         * @brief 컨텐츠 위젯 추가
-         **/
-        function procWidgetInsertDocument() {
-
-            // 변수 구함
-            $module_srl = Context::get('module_srl');
-            $document_srl = Context::get('document_srl');
-            $content = Context::get('content');
-            $editor_sequence = Context::get('editor_sequence');
-
-            $err = 0;
-            $oLayoutModel = &getModel('layout');
-            $layout_info = $oLayoutModel->getLayout($module_srl);
-            if(!$layout_info || $layout_info->type != 'faceoff') $err++;
-
-            // 대상 페이지 모듈 정보 구함
-            $oModuleModel = &getModel('module');
-            $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$page_info->module_srl || $page_info->module != 'page') $err++;
-
-            if($err > 1) return new Object(-1,'msg_invalid_request');
-
-            // 권한 체크
-            $is_logged = Context::get('is_logged');
-            $logged_info = Context::get('logged_info');
-            $user_group = $logged_info->group_list;
-            $is_admin = false;
-            if(count($user_group)&&count($page_info->grants['manager'])) {
-                $manager_group = $page_info->grants['manager'];
-                foreach($user_group as $group_srl => $group_info) {
-                    if(in_array($group_srl, $manager_group)) $is_admin = true;
-                }
-            }
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
-
-
-            // 글 입력
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-
-            $obj->module_srl = $module_srl;
-            $obj->content = $content;
-            $obj->document_srl = $document_srl;
-
-            $oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
-            if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
-                $output = $oDocumentController->updateDocument($oDocument, $obj);
-            } else {
-                $output = $oDocumentController->insertDocument($obj);
-                $obj->document_srl = $output->get('document_srl');
-            }
-
-            // 오류 발생시 멈춤
-            if(!$output->toBool()) return $output;
-
-            // 결과를 리턴
-            $this->add('document_srl', $obj->document_srl);
-        }
-
-        /**
-         * @brief 컨텐츠 위젯 복사
-         **/
-        function procWidgetCopyDocument() {
-            // 변수 구함
-            $document_srl = Context::get('document_srl');
-
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-            $oDocumentAdminController = &getAdminController('document');
-
-            $oDocument = $oDocumentModel->getDocument($document_srl, true);
-            if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
-            $module_srl = $oDocument->get('module_srl');
-
-            // 대상 페이지 모듈 정보 구함
-            $oModuleModel = &getModel('module');
-            $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
-
-            // 권한 체크
-            $is_logged = Context::get('is_logged');
-            $logged_info = Context::get('logged_info');
-            $user_group = $logged_info->group_list;
-            $is_admin = false;
-            if(count($user_group)&&count($page_info->grants['manager'])) {
-                $manager_group = $page_info->grants['manager'];
-                foreach($user_group as $group_srl => $group_info) {
-                    if(in_array($group_srl, $manager_group)) $is_admin = true;
-                }
-            }
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
-
-            $output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
-            if(!$output->toBool()) return $output;
-
-            // 결과를 리턴
-            $copied_srls = $output->get('copied_srls');
-            $this->add('document_srl', $copied_srls[$oDocument->get('document_srl')]);
-        }
-
-        /**
-         * @brief 위젯 삭제
-         **/
-        function procWidgetDeleteDocument() {
-            // 변수 구함
-            $document_srl = Context::get('document_srl');
-
-            $oDocumentModel = &getModel('document');
-            $oDocumentController = &getController('document');
-
-            $oDocument = $oDocumentModel->getDocument($document_srl, true);
-            if(!$oDocument->isExists()) return new Object();
-            $module_srl = $oDocument->get('module_srl');
-
-            // 대상 페이지 모듈 정보 구함
-            $oModuleModel = &getModel('module');
-            $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
-            if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
-
-            // 권한 체크
-            $is_logged = Context::get('is_logged');
-            $logged_info = Context::get('logged_info');
-            $user_group = $logged_info->group_list;
-            $is_admin = false;
-            if(count($user_group)&&count($page_info->grants['manager'])) {
-                $manager_group = $page_info->grants['manager'];
-                foreach($user_group as $group_srl => $group_info) {
-                    if(in_array($group_srl, $manager_group)) $is_admin = true;
-                }
-            }
-            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
-
-            $output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
-            if(!$output->toBool()) return $output;
-        }
-
-        /**
-         * @brief 위젯 코드를 Javascript로 수정/드래그등을 하기 위한 Javascript 수정 모드로 변환
-         **/
-        function setWidgetCodeInJavascriptMode() {
-            $this->layout_javascript_mode = true;
-        }
-
-        /**
-         * @brief 위젯 코드를 컴파일하여 내용을 출력하는 trigger
-         * display::before 에서 호출됨
-         **/
-        function triggerWidgetCompile(&$content) {
-            if(Context::getResponseMethod()!='HTML') return new Object();
-            $content = $this->transWidgetCode($content, $this->layout_javascript_mode);
-            return new Object();
-        }
-
-        /**
-         * @breif 특정 content의 위젯 태그들을 변환하여 return
-         **/
-        function transWidgetCode($content, $javascript_mode = false) {
-            // 사용자 정의 언어 변경
-            $oModuleController = &getController('module');
-            $oModuleController->replaceDefinedLangCode($content);
-
-            // 편집 정보 포함 여부 체크
-            $this->javascript_mode = $javascript_mode;
-
-            // 박스 위젯 코드 변경
-            $content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this,'transWidgetBox'), $content);
-
-            // 내용 위젯 코드 벼경
-            $content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content);
-
-            return $content;
-        }
-
-        /**
-         * @brief 위젯 코드를 실제 코드로 변경
-         **/
-        function transWidget($matches) {
-            $buff = trim($matches[0]);
-
-            $oXmlParser = new XmlParser();
-            $xml_doc = $oXmlParser->parse(trim($buff));
-
-            if($xml_doc->img) $vars = $xml_doc->img->attrs;
-            else $vars = $xml_doc->attrs;
-
-            $widget = $vars->widget;
-            if(!$widget) return $match[0];
-            unset($vars->widget);
-
-            return $this->execute($widget, $vars, $this->javascript_mode);
-        }
-
-        /**
-         * @brief 위젯 박스를 실제 코드로 변경
-         **/
-        function transWidgetBox($matches) {
-            $buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
-            $oXmlParser = new XmlParser();
-            $xml_doc = $oXmlParser->parse($buff);
-
-            $vars = $xml_doc->div->attrs;
-            $widget = $vars->widget;
-            if(!$widget) return $matches[0];
-            unset($vars->widget);
-
-            $vars->widgetbox_content = $matches[3];
-            return $this->execute($widget, $vars, $this->javascript_mode);
-        }
-
-        /**
-         * @brief 특정 content내의 위젯을 다시 생성
-         * 페이지모듈등에서 위젯 캐시파일 재생성시 사용
-         **/
-        function recompileWidget($content) {
-            // 언어 종류 가져옴
-            $lang_list = Context::get('lang_supported');
-
-            // 위젯 캐시 sequence 를 가져옴
-            preg_match_all('!<img([^\>]*)widget=([^\>]*?)\>!is', $content, $matches);
-
-            $oXmlParser = new XmlParser();
-
-            $cnt = count($matches[1]);
-            for($i=0;$i<$cnt;$i++) {
-                $buff = $matches[0][$i];
-                $xml_doc = $oXmlParser->parse(trim($buff));
-
-                $args = $xml_doc->img->attrs;
-                if(!$args) continue;
-
-                // 캐싱하지 않을 경우 패스
-                $widget = $args->widget;
-                $sequence = $args->widget_sequence;
-                $cache = $args->widget_cache;
-                if(!$sequence || !$cache) continue;
-
-                if(count($args)) {
-                    foreach($args as $k => $v) $args->{$k} = urldecode($v);
-                }
-
-                // 언어별로 위젯 캐시 파일이 있을 경우 재생성
-                foreach($lang_list as $lang_type => $val) {
-                    $cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
-                    if(!file_exists($cache_file)) continue;
-                    $this->getCache($widget, $args, $lang_type, true);
-                }
-            }
-        }
-
-        /**
-         * @brief 위젯 캐시 처리
-         **/
-        function getCache($widget, $args, $lang_type = null, $ignore_cache = false) {
-            // 지정된 언어가 없으면 현재 언어 지정
-            if(!$lang_type) $lang_type = Context::getLangType();
-
-            // widget, 캐시 번호와 캐시값이 설정되어 있는지 확인
-            $widget_sequence = $args->widget_sequence;
-            $widget_cache = $args->widget_cache;
-
-            /**
-             * 캐시 번호와 캐시 값이 아예 없으면 바로 데이터를 추출해서 리턴
-             **/
-            if(!$ignore_cache && (!$widget_cache || !$widget_sequence)) {
-                $oWidget = $this->getWidgetObject($widget);
-                if(!$oWidget || !method_exists($oWidget, 'proc')) return;
-                return $oWidget->proc($args);
-            }
-
-            /**
-             * 캐시 번호와 캐시값이 설정되어 있으면 캐시 파일을 불러오도록 함
-             **/
-            if(!is_dir($this->cache_path)) FileHandler::makeDir($this->cache_path);
-
-            // 캐시파일명을 구함
-            $cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $widget_sequence, $lang_type);
-
-            // 캐시 파일이 존재하면 해당 파일의 유효성 검사
-            if(!$ignore_cache && file_exists($cache_file)) {
-                $filemtime = filemtime($cache_file);
-
-                // 수정 시간을 비교해서 캐싱중이어야 하거나 widget.controller.php 파일보다 나중에 만들어 졌다면 캐시값을 return
-                if($filemtime + $widget_cache * 60 > 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 파일의 mtime 갱신하고 캐시 갱신
-            touch($cache_file);
-
-            $oWidget = $this->getWidgetObject($widget);
-            if(!$oWidget || !method_exists($oWidget,'proc')) return;
-
-            $widget_content = $oWidget->proc($args);
-            FileHandler::writeFile($cache_file, $widget_content);
-
-            return $widget_content;
-        }
-
-        /**
-         * @brief 위젯이름과 인자를 받아서 결과를 생성하고 결과 리턴
-         * 태그 사용 templateHandler에서 $this->execute()를 실행하는 코드로 대체하게 된다
-         *
-         * $javascript_mode가 true일 경우 페이지 수정시 위젯 핸들링을 위한 코드까지 포함함
-         **/
-        function execute($widget, $args, $javascript_mode = false, $escaped = true) {
-            // 디버그를 위한 위젯 실행 시간 저장
-            if(__DEBUG__==3) $start = getMicroTime();
-
-            // args값에서 urldecode를 해줌
-            $object_vars = get_object_vars($args);
-            if(count($object_vars)) {
-                foreach($object_vars as $key => $val) {
-                    if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
-                    if($escaped) $args->{$key} = utf8RawUrlDecode($val);
-                }
-            }
-
-            /**
-             * 위젯이 widgetContent/ widgetBox가 아니라면 내용을 구함
-             **/
-            $widget_content = '';
-            if($widget != 'widgetContent' && $widget != 'widgetBox') {
-                if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
-
-                // 위젯의 내용을 담을 변수
-                $widget_content = $this->getCache($widget, $args);
-            }
-
-            if($widget == 'widgetBox'){
-                $widgetbox_content = $args->widgetbox_content;
-            }
-
-            /**
-             * 관리자가 지정한 위젯의 style을 구함
-             **/
-
-            // 가끔 잘못된 코드인 background-image:url(none)이 들어 있을 수가 있는데 이럴 경우 none에 대한 url을 요청하므로 무조건 제거함
-            $style = preg_replace('/url\((.+)(\/?)none\)/is','', $args->style);
-
-            // 내부 여백을 둔 것을 구해서 style문으로 미리 변경해 놓음
-            $widget_padding_left = $args->widget_padding_left;
-            $widget_padding_right = $args->widget_padding_right;
-            $widget_padding_top = $args->widget_padding_top;
-            $widget_padding_bottom = $args->widget_padding_bottom;
-            $inner_style = sprintf("padding:%dpx %dpx %dpx %dpx !important; padding:none !important;", $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left);
-
-            /**
-             * 위젯 출력물을 구함
-             **/
-
-            $widget_content_header = '';
-            $widget_content_body = '';
-            $widget_content_footer = '';
-
-            // 일반 페이지 호출일 경우 지정된 스타일만 꾸면서 바로 return 함
-            if(!$javascript_mode) {
-                if($args->id) $args->id = ' id="'.$args->id.'" ';
-                switch($widget) {
-                    // 내용 직접 추가일 경우 
-                    case 'widgetContent' :
-                            if($args->document_srl) {
-                                $oDocumentModel = &getModel('document');
-                                $oDocument = $oDocumentModel->getDocument($args->document_srl);
-                                $body = $oDocument->getContent(false,false,false, false);
-                            } else {
-                                $body = base64_decode($args->body);
-                            }
-
-                            // 에디터컴포넌트 변경
-                            $oEditorController = &getController('editor');
-                            $body = $oEditorController->transComponent($body);
-
-                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s"><div style="%s">', $args->id, $style,  $inner_style);
-                            $widget_content_body = $body;
-                            $widget_content_footer = '</div></div>';
-
-                        break;
-
-                    // 위젯 박스일 경우
-                    case 'widgetBox' :
-                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s;"><div style="%s"><div>', $args->id, $style,  $inner_style);
-                            $widget_content_body = $widgetbox_content;
-
-                        break;
-
-                    // 일반 위젯일 경우
-                    default :
-                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s">',$args->id,$style);
-                            $widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style,$widget_content);
-                            $widget_content_footer = '</div>';
-                        break;
-                }
-
-            // 페이지 수정시에 호출되었을 경우 위젯 핸들링을 위한 코드 추가
-            } else {
-                switch($widget) {
-                    // 내용 직접 추가일 경우 
-                    case 'widgetContent' :
-                            if($args->document_srl) {
-                                $oDocumentModel = &getModel('document');
-                                $oDocument = $oDocumentModel->getDocument($args->document_srl);
-                                $body = $oDocument->getContent(false,false,false);
-                            } else {
-                                $body = base64_decode($args->body);
-                            }
-
-                            // args 정리
-                            $attribute = array();
-                            if($args) {
-                                foreach($args as $key => $val) {
-                                    if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
-                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
-                                }
-                            }
-
-                            $oWidgetController = &getController('widget');
-
-                            $widget_content_header = sprintf(
-                                '<div class="widgetOutput" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
-                                    '<div class="widgetResize"></div>'.
-                                    '<div class="widgetResizeLeft"></div>'.
-                                    '<div class="widgetBorder">'.
-                                        '<div style="%s">',$args->widgetstyle,
-                                $style,
-                                $args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
-                                $args->document_srl,
-                                implode(' ',$attribute),
-                                $inner_style);
-
-                            $widget_content_body = $body;
-                            $widget_content_footer = sprintf('</div><div class="clear"></div>'.
-                                    '</div>'.
-                                    '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
-                                '</div>',base64_encode($body));
-
-                        break;
-
-                    // 위젯 박스일 경우
-                    case 'widgetBox' :
-
-                            // args 정리
-                            $attribute = array();
-                            if($args) {
-                                foreach($args as $key => $val) {
-                                    if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
-                                    if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
-                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
-                                }
-                            }
-
-                            $widget_content_header = sprintf(
-                                '<div class="widgetOutput" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
-                                    '<div class="widgetBoxResize"></div>'.
-                                    '<div class="widgetBoxResizeLeft"></div>'.
-                                    '<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style);
-
-                            $widget_content_body = $widgetbox_content;
-
-                        break;
-
-                    // 일반 위젯일 경우
-                    default :
-                            // args 정리
-                            $attribute = array();
-                            if($args) {
-								$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
-                                foreach($args as $key => $val) {
-                                    if(in_array($key, $allowed_key)) continue;
-                                    if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
-                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
-                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
-                                }
-                            }
-
-                            $widget_content_header = sprintf('<div class="widgetOutput" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
-                                        '<div class="widgetResize"></div>'.
-                                        '<div class="widgetResizeLeft"></div>'.
-                                        '<div class="widgetBorder">',$args->widgetstyle,$style, 
-                                    $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left, 
-                                    $widget, implode(' ',$attribute));
-
-                            $widget_content_body = sprintf('<div style="%s">%s</div><div class="clear"></div>',$inner_style, $widget_content);
-
-                            $widget_content_footer = '</div></div>';
-
-                        break;
-                }
-            }
-
-
-            // 위젯 스타일을 컴파일 한다.
-            if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
-
-            $output = $widget_content_header . $widget_content_body . $widget_content_footer;
-
-            // 위젯 결과물 생성 시간을 debug 정보에 추가
-            if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
-
-            // 결과 return
-            return $output;
-        }
-
-        /**
-         * @brief 위젯 객체를 return
-         **/
-        function getWidgetObject($widget) {
-            if(!$GLOBALS['_xe_loaded_widgets_'][$widget]) {
-                // 일단 위젯의 위치를 찾음
-                $oWidgetModel = &getModel('widget');
-                $path = $oWidgetModel->getWidgetPath($widget);
-
-                // 위젯 클래스 파일을 찾고 없으면 에러 출력 (html output)
-                $class_file = sprintf('%s%s.class.php', $path, $widget);
-                if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
-
-                // 위젯 클래스를 include
-                require_once($class_file);
-            
-                // 객체 생성
-				$tmp_fn  = create_function('', "return new {$widget}();");
-				$oWidget = $tmp_fn();
-                if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
-
-                if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
-
-                $oWidget->widget_path = $path;
-
-                $GLOBALS['_xe_loaded_widgets_'][$widget] = $oWidget;
-            }
-            return $GLOBALS['_xe_loaded_widgets_'][$widget];
-        }
-
-
-        function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode){
-            if(!$widgetStyle) return $widget_content_body;
-
-            $oWidgetModel = &getModel('widget');
-
-            // 위젯 스타일의 extra_var를 가져와 묶는다
-            $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
-            if(!$widgetstyle_info) return $widget_content_body;
-
-            $widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
-            if(count($widgetstyle_extra_var_key['extra_var'])){
-                foreach($widgetstyle_extra_var_key['extra_var'] as $key => $val){
-                    $widgetstyle_extra_var->{$key} =  $args->{$key};
-                }
-            }
-            Context::set('widgetstyle_extra_var', $widgetstyle_extra_var);
-			// #18994272 오타를 수정했으나 하위 호환성을 위해 남겨둠 - deprecated
-            Context::set('widgetstyle_extar_var', $widgetstyle_extra_var);
-
-            if($javascript_mode && $widget=='widgetBox'){
-                Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
-            }else{
-                Context::set('widget_content', $widget_content_body);
-            }
-
-            // 컴파일
-            $widgetstyle_path = $oWidgetModel->getWidgetStylePath($widgetStyle);
-            $oTemplate = &TemplateHandler::getInstance();
-            $tpl = $oTemplate->compile($widgetstyle_path, 'widgetstyle');
-
-            return $tpl;
-        }
-
-        /**
-         * @brief request 변수와 위젯 정보를 통해 변수 정렬
-         **/
-        function arrangeWidgetVars($widget, $request_vars, &$vars) {
-            $oWidgetModel = &getModel('widget');
-            $widget_info = $oWidgetModel->getWidgetInfo($widget);
-
-            $widget = $vars->selected_widget;
-            $vars->widgetstyle = $request_vars->widgetstyle;
-
-            $vars->skin = trim($request_vars->skin);
-            $vars->colorset = trim($request_vars->colorset);
-            $vars->widget_sequence = (int)($request_vars->widget_sequence);
-            $vars->widget_cache = (int)($request_vars->widget_cache);
-            $vars->style = trim($request_vars->style);
-            $vars->widget_padding_left = trim($request_vars->widget_padding_left);
-            $vars->widget_padding_right = trim($request_vars->widget_padding_right);
-            $vars->widget_padding_top = trim($request_vars->widget_padding_top);
-            $vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
-            $vars->document_srl= trim($request_vars->document_srl);
-
-
-            if(count($widget_info->extra_var)) {
-                foreach($widget_info->extra_var as $key=>$val) {
-                    $vars->{$key} = trim($request_vars->{$key});
-                }
-            }
-
-            // 위젯 스타일이 있는 경우
-            if($request_vars->widgetstyle){
-                $widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
-                if(count($widgetStyle_info->extra_var)) {
-                    foreach($widgetStyle_info->extra_var as $key=>$val) {
-                        if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox'){
-                            $vars->{$key} = trim($request_vars->{$key});
-                        }
-                    }
-                }
-            }
-
-            if($vars->widget_sequence) {
-                $cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $vars->widget_sequence, Context::getLangType());
-                FileHandler::removeFile($cache_file);
-            }
-
-            if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
-
-            $attribute = array();
-            foreach($vars as $key => $val) {
-                if(!$val) {
-                    unset($vars->{$key});
-                    continue;
-                }
-                if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
-                $vars->{$key} = htmlspecialchars(Context::convertEncodingStr($val));
-                $attribute[] = sprintf('%s="%s"', $key, Context::convertEncodingStr($val));
-            }
-
-            return $attribute;
-        }
-    }
-?>
+<?php
+    /**
+     * @class  widgetController
+     * @author NHN (developers@xpressengine.com)
+     * @brief Controller class for widget modules
+     **/
+
+    class widgetController extends widget {
+
+        // The results are not widget modify/delete and where to use the flag for
+        // layout_javascript_mode include all the results into the javascript mode Sikkim
+        var $javascript_mode = false;
+        var $layout_javascript_mode = false;
+
+        // Where the cache files are created widget
+        var $cache_path = './files/cache/widget_cache/';
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Selected photos - the return of the skin-color three
+         **/
+        function procWidgetGetColorsetList() {
+            $widget = Context::get('selected_widget');
+            $skin = Context::get('skin');
+
+            $path = sprintf('./widgets/%s/', $widget);
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($path, $skin);
+
+            for($i=0;$i<count($skin_info->colorset);$i++) {
+                $colorset = sprintf('%s|@|%s', $skin_info->colorset[$i]->name, $skin_info->colorset[$i]->title);
+                $colorset_list[] = $colorset;
+            }
+
+            if(count($colorset_list)) $colorsets = implode("\n", $colorset_list);
+            $this->add('colorset_list', $colorsets);
+        }
+
+        /**
+         * @brief Return the generated code of the widget
+         **/
+        function procWidgetGenerateCode() {
+            $widget = Context::get('selected_widget');
+            if(!$widget) return new Object(-1,'msg_invalid_request');
+            if(!Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+
+            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
+
+            $widget_code = sprintf('<img class="zbxe_widget_output" widget="%s" %s />', $widget, implode(' ',$attribute));
+            // Code output
+            $this->add('widget_code', $widget_code);
+        }
+
+        /**
+         * @brief Edit page request for the creation of the widget code
+         **/
+        function procWidgetGenerateCodeInPage() {
+            $widget = Context::get('selected_widget');
+            if(!$widget) return new Object(-1,'msg_invalid_request');
+
+            if(!in_array($widget,array('widgetBox','widgetContent')) && !Context::get('skin')) return new Object(-1,Context::getLang('msg_widget_skin_is_null'));
+
+            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
+            // Wanted results
+            $widget_code = $this->execute($widget, $vars, true, false);
+
+            $this->add('widget_code', $widget_code);
+        }
+
+        /**
+         * @brief Upload widget styles
+         **/
+        function procWidgetStyleExtraImageUpload(){
+            $attribute = $this->arrangeWidgetVars($widget, Context::getRequestVars(), $vars);
+
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('default_layout.html');
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile("top_refresh.html");
+        }
+
+        /**
+         * @brief Add content widget
+         **/
+        function procWidgetInsertDocument() {
+            // Variable Wanted
+            $module_srl = Context::get('module_srl');
+            $document_srl = Context::get('document_srl');
+            $content = Context::get('content');
+            $editor_sequence = Context::get('editor_sequence');
+
+            $err = 0;
+            $oLayoutModel = &getModel('layout');
+            $layout_info = $oLayoutModel->getLayout($module_srl);
+            if(!$layout_info || $layout_info->type != 'faceoff') $err++;
+            // Destination Information Wanted page module
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module');
+            $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            if(!$page_info->module_srl || $page_info->module != 'page') $err++;
+
+            if($err > 1) return new Object(-1,'msg_invalid_request');
+            // Check permissions
+            $is_logged = Context::get('is_logged');
+            $logged_info = Context::get('logged_info');
+            $user_group = $logged_info->group_list;
+            $is_admin = false;
+            if(count($user_group)&&count($page_info->grants['manager'])) {
+                $manager_group = $page_info->grants['manager'];
+                foreach($user_group as $group_srl => $group_info) {
+                    if(in_array($group_srl, $manager_group)) $is_admin = true;
+                }
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+            // Enter post
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
+
+            $obj->module_srl = $module_srl;
+            $obj->content = $content;
+            $obj->document_srl = $document_srl;
+
+            $oDocument = $oDocumentModel->getDocument($obj->document_srl, true);
+            if($oDocument->isExists() && $oDocument->document_srl == $obj->document_srl) {
+                $output = $oDocumentController->updateDocument($oDocument, $obj);
+            } else {
+                $output = $oDocumentController->insertDocument($obj);
+                $obj->document_srl = $output->get('document_srl');
+            }
+            // Stop when an error occurs
+            if(!$output->toBool()) return $output;
+            // Return results
+            $this->add('document_srl', $obj->document_srl);
+        }
+
+        /**
+         * @brief Copy the content widget
+         **/
+        function procWidgetCopyDocument() {
+            // Variable Wanted
+            $document_srl = Context::get('document_srl');
+
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
+            $oDocumentAdminController = &getAdminController('document');
+
+            $oDocument = $oDocumentModel->getDocument($document_srl, true);
+            if(!$oDocument->isExists()) return new Object(-1,'msg_invalid_request');
+            $module_srl = $oDocument->get('module_srl');
+            // Destination Information Wanted page module
+            $oModuleModel = &getModel('module');
+			$columnList = array('module_srl', 'module');
+            $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl, $columnList);
+            if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+            // Check permissions
+            $is_logged = Context::get('is_logged');
+            $logged_info = Context::get('logged_info');
+            $user_group = $logged_info->group_list;
+            $is_admin = false;
+            if(count($user_group)&&count($page_info->grants['manager'])) {
+                $manager_group = $page_info->grants['manager'];
+                foreach($user_group as $group_srl => $group_info) {
+                    if(in_array($group_srl, $manager_group)) $is_admin = true;
+                }
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+
+            $output = $oDocumentAdminController->copyDocumentModule(array($oDocument->get('document_srl')), $oDocument->get('module_srl'),0);
+            if(!$output->toBool()) return $output;
+            // Return results
+            $copied_srls = $output->get('copied_srls');
+            $this->add('document_srl', $copied_srls[$oDocument->get('document_srl')]);
+        }
+
+        /**
+         * @brief Deleting widgets
+         **/
+        function procWidgetDeleteDocument() {
+            // Variable Wanted
+            $document_srl = Context::get('document_srl');
+
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
+
+            $oDocument = $oDocumentModel->getDocument($document_srl, true);
+            if(!$oDocument->isExists()) return new Object();
+            $module_srl = $oDocument->get('module_srl');
+            // Destination Information Wanted page module
+            $oModuleModel = &getModel('module');
+            $page_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
+            if(!$page_info->module_srl || $page_info->module != 'page') return new Object(-1,'msg_invalid_request');
+            // Check permissions
+            $is_logged = Context::get('is_logged');
+            $logged_info = Context::get('logged_info');
+            $user_group = $logged_info->group_list;
+            $is_admin = false;
+            if(count($user_group)&&count($page_info->grants['manager'])) {
+                $manager_group = $page_info->grants['manager'];
+                foreach($user_group as $group_srl => $group_info) {
+                    if(in_array($group_srl, $manager_group)) $is_admin = true;
+                }
+            }
+            if(!$is_admin && !$is_logged && $logged_info->is_admin != 'Y' && !$oModuleModel->isSiteAdmin($logged_info) && !(is_array($page_info->admin_id) && in_array($logged_infoi->user_id, $page_info->admin_id))) return new Object(-1,'msg_not_permitted');
+
+            $output = $oDocumentController->deleteDocument($oDocument->get('document_srl'), true);
+            if(!$output->toBool()) return $output;
+        }
+
+        /**
+         * @brief Modify the code in Javascript widget/Javascript edit mode for dragging and converted to
+         **/
+        function setWidgetCodeInJavascriptMode() {
+            $this->layout_javascript_mode = true;
+        }
+
+        /**
+         * @brief Widget code compiles and prints the information to trigger
+         * display:: before invoked in
+         **/
+        function triggerWidgetCompile(&$content) {
+            if(Context::getResponseMethod()!='HTML') return new Object();
+            $content = $this->transWidgetCode($content, $this->layout_javascript_mode);
+            return new Object();
+        }
+
+        /**
+         * @breif By converting the specific content of the widget tag return
+         **/
+        function transWidgetCode($content, $javascript_mode = false) {
+            // Changing user-defined language
+            $oModuleController = &getController('module');
+            $oModuleController->replaceDefinedLangCode($content);
+            // Check whether to include information about editing
+            $this->javascript_mode = $javascript_mode;
+            // Widget code box change
+            $content = preg_replace_callback('!<div([^\>]*)widget=([^\>]*?)\><div><div>((<img.*?>)*)!is', array($this,'transWidgetBox'), $content);
+            // Widget code information byeogyeong
+            $content = preg_replace_callback('!<img([^\>]*)widget=([^\>]*?)\>!is', array($this,'transWidget'), $content);
+
+            return $content;
+        }
+
+        /**
+         * @brief Widget code with the actual code changes
+         **/
+        function transWidget($matches) {
+            $buff = trim($matches[0]);
+
+            $oXmlParser = new XmlParser();
+            $xml_doc = $oXmlParser->parse(trim($buff));
+
+            if($xml_doc->img) $vars = $xml_doc->img->attrs;
+            else $vars = $xml_doc->attrs;
+
+            $widget = $vars->widget;
+            if(!$widget) return $match[0];
+            unset($vars->widget);
+
+            return $this->execute($widget, $vars, $this->javascript_mode);
+        }
+
+        /**
+         * @brief Widget box with the actual code changes
+         **/
+        function transWidgetBox($matches) {
+            $buff = preg_replace('/<div><div>(.*)$/i','</div>',$matches[0]);
+            $oXmlParser = new XmlParser();
+            $xml_doc = $oXmlParser->parse($buff);
+
+            $vars = $xml_doc->div->attrs;
+            $widget = $vars->widget;
+            if(!$widget) return $matches[0];
+            unset($vars->widget);
+
+            $vars->widgetbox_content = $matches[3];
+            return $this->execute($widget, $vars, $this->javascript_mode);
+        }
+
+        /**
+         * @brief Re-create specific content within a widget
+         * Widget on the page and create cache file in the module using
+         **/
+        function recompileWidget($content) {
+            // Language in bringing
+            $lang_list = Context::get('lang_supported');
+            // Bringing widget cache sequence
+            preg_match_all('!<img([^\>]*)widget=([^\>]*?)\>!is', $content, $matches);
+
+            $oXmlParser = new XmlParser();
+
+            $cnt = count($matches[1]);
+            for($i=0;$i<$cnt;$i++) {
+                $buff = $matches[0][$i];
+                $xml_doc = $oXmlParser->parse(trim($buff));
+
+                $args = $xml_doc->img->attrs;
+                if(!$args) continue;
+                // If you are not caching path
+                $widget = $args->widget;
+                $sequence = $args->widget_sequence;
+                $cache = $args->widget_cache;
+                if(!$sequence || !$cache) continue;
+
+                if(count($args)) {
+                    foreach($args as $k => $v) $args->{$k} = urldecode($v);
+                }
+                // If the cache file for each language widget regeneration
+                foreach($lang_list as $lang_type => $val) {
+                    $cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $sequence, $lang_type);
+                    if(!file_exists($cache_file)) continue;
+                    $this->getCache($widget, $args, $lang_type, true);
+                }
+            }
+        }
+
+        /**
+         * @brief Widget cache handling
+         **/
+        function getCache($widget, $args, $lang_type = null, $ignore_cache = false) {
+            // If the specified language specifies the current language
+            if(!$lang_type) $lang_type = Context::getLangType();
+            // widget, the cache number and cache values are set
+            $widget_sequence = $args->widget_sequence;
+            $widget_cache = $args->widget_cache;
+
+            /**
+             * Even if the cache number and value of the cache and return it to extract data
+             **/
+            if(!$ignore_cache && (!$widget_cache || !$widget_sequence)) {
+                $oWidget = $this->getWidgetObject($widget);
+                if(!$oWidget || !method_exists($oWidget, 'proc')) return;
+                return $oWidget->proc($args);
+            }
+
+            /**
+             * Cache number and cache values are set so that the cache file should call
+             **/
+            if(!is_dir($this->cache_path)) 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 > 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);
+            FileHandler::writeFile($cache_file, $widget_content);
+
+            return $widget_content;
+        }
+
+        /**
+         * @brief Widget name and argument and produce a result and Return the results
+         * Tags used in templateHandler $this-&gt; execute() will be replaced by the code running
+         *
+         * $Javascript_mode is true when editing your page by the code for handling Includes photos
+         **/
+        function execute($widget, $args, $javascript_mode = false, $escaped = true) {
+            // Save for debug run-time widget
+            if(__DEBUG__==3) $start = getMicroTime();
+            // urldecode the value of args haejum
+            $object_vars = get_object_vars($args);
+            if(count($object_vars)) {
+                foreach($object_vars as $key => $val) {
+                    if(in_array($key, array('widgetbox_content','body','class','style','widget_sequence','widget','widget_padding_left','widget_padding_top','widget_padding_bottom','widget_padding_right','widgetstyle','document_srl'))) continue;
+                    if($escaped) $args->{$key} = utf8RawUrlDecode($val);
+                }
+            }
+
+            /**
+             * Widgets widgetContent/widgetBox Wanted If you are not content
+             **/
+            $widget_content = '';
+            if($widget != 'widgetContent' && $widget != 'widgetBox') {
+                if(!is_dir(sprintf(_XE_PATH_.'widgets/%s/',$widget))) return;
+                // Hold the contents of the widget parameter
+                $widget_content = $this->getCache($widget, $args);
+            }
+
+            if($widget == 'widgetBox'){
+                $widgetbox_content = $args->widgetbox_content;
+            }
+
+            /**
+             * Wanted specified by the administrator of the widget style
+             **/
+            // Sometimes the wrong code, background-image: url (none) can be heard but none in this case, the request for the url so unconditionally Removed
+            $style = preg_replace('/url\((.+)(\/?)none\)/is','', $args->style);
+            // Find a style statement that based on the internal margin dropping pre-change
+            $widget_padding_left = $args->widget_padding_left;
+            $widget_padding_right = $args->widget_padding_right;
+            $widget_padding_top = $args->widget_padding_top;
+            $widget_padding_bottom = $args->widget_padding_bottom;
+            $inner_style = sprintf("padding:%dpx %dpx %dpx %dpx !important; padding:none !important;", $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left);
+
+            /**
+             * Wanted widget output
+             **/
+
+            $widget_content_header = '';
+            $widget_content_body = '';
+            $widget_content_footer = '';
+            // If general call is given on page styles should return immediately dreamin '
+            if(!$javascript_mode) {
+                if($args->id) $args->id = ' id="'.$args->id.'" ';
+                switch($widget) {
+                    // If a direct orthogonal addition information
+                    case 'widgetContent' :
+                            if($args->document_srl) {
+                                $oDocumentModel = &getModel('document');
+                                $oDocument = $oDocumentModel->getDocument($args->document_srl);
+                                $body = $oDocument->getContent(false,false,false, false);
+                            } else {
+                                $body = base64_decode($args->body);
+                            }
+                            // Change the editor component
+                            $oEditorController = &getController('editor');
+                            $body = $oEditorController->transComponent($body);
+
+                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s"><div style="%s">', $args->id, $style,  $inner_style);
+                            $widget_content_body = $body;
+                            $widget_content_footer = '</div></div>';
+
+                        break;
+                    // If the widget box; it could
+                    case 'widgetBox' :
+                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s;"><div style="%s"><div>', $args->id, $style,  $inner_style);
+                            $widget_content_body = $widgetbox_content;
+
+                        break;
+                    // If the General wijetil
+                    default :
+                            $widget_content_header = sprintf('<div %sstyle="overflow:hidden;%s">',$args->id,$style);
+                            $widget_content_body = sprintf('<div style="*zoom:1;%s">%s</div>', $inner_style,$widget_content);
+                            $widget_content_footer = '</div>';
+                        break;
+                }
+            // Edit page is called when a widget if you add the code for handling
+            } else {
+                switch($widget) {
+                    // If a direct orthogonal addition information
+                    case 'widgetContent' :
+                            if($args->document_srl) {
+                                $oDocumentModel = &getModel('document');
+                                $oDocument = $oDocumentModel->getDocument($args->document_srl);
+                                $body = $oDocument->getContent(false,false,false);
+                            } else {
+                                $body = base64_decode($args->body);
+                            }
+                            // by args
+                            $attribute = array();
+                            if($args) {
+                                foreach($args as $key => $val) {
+                                    if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
+                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
+                                }
+                            }
+
+                            $oWidgetController = &getController('widget');
+
+                            $widget_content_header = sprintf(
+                                '<div class="widgetOutput" widgetstyle="%s" style="%s" widget_padding_left="%s" widget_padding_right="%s" widget_padding_top="%s" widget_padding_bottom="%s" widget="widgetContent" document_srl="%d" %s>'.
+                                    '<div class="widgetResize"></div>'.
+                                    '<div class="widgetResizeLeft"></div>'.
+                                    '<div class="widgetBorder">'.
+                                        '<div style="%s">',$args->widgetstyle,
+                                $style,
+                                $args->widget_padding_left, $args->widget_padding_right, $args->widget_padding_top, $args->widget_padding_bottom,
+                                $args->document_srl,
+                                implode(' ',$attribute),
+                                $inner_style);
+
+                            $widget_content_body = $body;
+                            $widget_content_footer = sprintf('</div>'.
+                                    '</div>'.
+                                    '<div class="widgetContent" style="display:none;width:1px;height:1px;overflow:hidden;">%s</div>'.
+                                '</div>',base64_encode($body));
+
+                        break;
+                    // If the widget box; it could
+                    case 'widgetBox' :
+                            // by args
+                            $attribute = array();
+                            if($args) {
+                                foreach($args as $key => $val) {
+                                    if(in_array($key, array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget','widgetstyle','document_srl'))) continue;
+                                    if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
+                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
+                                }
+                            }
+
+                            $widget_content_header = sprintf(
+                                '<div class="widgetOutput" widgetstyle="%s" widget="widgetBox" style="%s;" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" %s >'.
+                                    '<div class="widgetBoxResize"></div>'.
+                                    '<div class="widgetBoxResizeLeft"></div>'.
+                                    '<div class="widgetBoxBorder"><div class="nullWidget" style="%s">',$args->widgetstyle,$style, $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,implode(' ',$attribute),$inner_style);
+
+                            $widget_content_body = $widgetbox_content;
+
+                        break;
+                    // If the General wijetil
+                    default :
+                            // by args
+                            $attribute = array();
+                            if($args) {
+								$allowed_key = array('class','style','widget_padding_top','widget_padding_right','widget_padding_bottom','widget_padding_left','widget');
+                                foreach($args as $key => $val) {
+                                    if(in_array($key, $allowed_key)) continue;
+                                    if(!is_numeric($val) && (!is_string($val) || strlen($val)==0)) continue;
+                                    if(strpos($val,'|@|')>0) $val = str_replace('|@|',',',$val);
+                                    $attribute[] = sprintf('%s="%s"', $key, str_replace('"','\"',$val));
+                                }
+                            }
+
+                            $widget_content_header = sprintf('<div class="widgetOutput" widgetstyle="%s" style="%s" widget_padding_top="%s" widget_padding_right="%s" widget_padding_bottom="%s" widget_padding_left="%s" widget="%s" %s >'.
+                                        '<div class="widgetResize"></div>'.
+                                        '<div class="widgetResizeLeft"></div>'.
+                                        '<div class="widgetBorder">',$args->widgetstyle,$style,
+                                    $widget_padding_top, $widget_padding_right, $widget_padding_bottom, $widget_padding_left,
+                                    $widget, implode(' ',$attribute));
+
+                            $widget_content_body = sprintf('<div style="%s">%s</div>',$inner_style, $widget_content);
+
+                            $widget_content_footer = '</div></div>';
+
+                        break;
+                }
+            }
+            // Compile the widget style.
+            if($args->widgetstyle) $widget_content_body = $this->compileWidgetStyle($args->widgetstyle,$widget, $widget_content_body, $args, $javascript_mode);
+
+            $output = $widget_content_header . $widget_content_body . $widget_content_footer;
+            // Debug widget creation time information added to the results
+            if(__DEBUG__==3) $GLOBALS['__widget_excute_elapsed__'] += getMicroTime() - $start;
+            // Return result
+            return $output;
+        }
+
+        /**
+         * @brief Return widget object
+         **/
+        function getWidgetObject($widget) {
+            if(!$GLOBALS['_xe_loaded_widgets_'][$widget]) {
+                // Finding the location of a widget
+                $oWidgetModel = &getModel('widget');
+                $path = $oWidgetModel->getWidgetPath($widget);
+                // If you do not find the class file error output widget (html output)
+                $class_file = sprintf('%s%s.class.php', $path, $widget);
+                if(!file_exists($class_file)) return sprintf(Context::getLang('msg_widget_is_not_exists'), $widget);
+                // Widget classes include
+                require_once($class_file);
+
+                // Creating Objects
+				$tmp_fn  = create_function('', "return new {$widget}();");
+				$oWidget = $tmp_fn();
+                if(!is_object($oWidget)) return sprintf(Context::getLang('msg_widget_object_is_null'), $widget);
+
+                if(!method_exists($oWidget, 'proc')) return sprintf(Context::getLang('msg_widget_proc_is_null'), $widget);
+
+                $oWidget->widget_path = $path;
+
+                $GLOBALS['_xe_loaded_widgets_'][$widget] = $oWidget;
+            }
+            return $GLOBALS['_xe_loaded_widgets_'][$widget];
+        }
+
+
+        function compileWidgetStyle($widgetStyle,$widget,$widget_content_body, $args, $javascript_mode){
+            if(!$widgetStyle) return $widget_content_body;
+
+            $oWidgetModel = &getModel('widget');
+            // Bring extra_var widget style tie
+            $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetStyle);
+            if(!$widgetstyle_info) return $widget_content_body;
+
+            $widgetstyle_extra_var_key = get_object_vars($widgetstyle_info);
+            if(count($widgetstyle_extra_var_key['extra_var'])){
+                foreach($widgetstyle_extra_var_key['extra_var'] as $key => $val){
+                    $widgetstyle_extra_var->{$key} =  $args->{$key};
+                }
+            }
+            Context::set('widgetstyle_extra_var', $widgetstyle_extra_var);
+			// #18994272 오타를 수정했으나 하위 호환성을 위해 남겨둠 - deprecated
+            Context::set('widgetstyle_extar_var', $widgetstyle_extra_var);
+
+            if($javascript_mode && $widget=='widgetBox'){
+                Context::set('widget_content', '<div class="widget_inner">'.$widget_content_body.'</div>');
+            }else{
+                Context::set('widget_content', $widget_content_body);
+            }
+            // Compilation
+            $widgetstyle_path = $oWidgetModel->getWidgetStylePath($widgetStyle);
+            $oTemplate = &TemplateHandler::getInstance();
+            $tpl = $oTemplate->compile($widgetstyle_path, 'widgetstyle');
+
+            return $tpl;
+        }
+
+        /**
+         * @brief request parameters and variables sort through the information widget
+         **/
+        function arrangeWidgetVars($widget, $request_vars, &$vars) {
+            $oWidgetModel = &getModel('widget');
+            $widget_info = $oWidgetModel->getWidgetInfo($widget);
+
+            $widget = $vars->selected_widget;
+            $vars->widgetstyle = $request_vars->widgetstyle;
+
+            $vars->skin = trim($request_vars->skin);
+            $vars->colorset = trim($request_vars->colorset);
+            $vars->widget_sequence = (int)($request_vars->widget_sequence);
+            $vars->widget_cache = (int)($request_vars->widget_cache);
+            $vars->style = trim($request_vars->style);
+            $vars->widget_padding_left = trim($request_vars->widget_padding_left);
+            $vars->widget_padding_right = trim($request_vars->widget_padding_right);
+            $vars->widget_padding_top = trim($request_vars->widget_padding_top);
+            $vars->widget_padding_bottom = trim($request_vars->widget_padding_bottom);
+            $vars->document_srl= trim($request_vars->document_srl);
+
+
+            if(count($widget_info->extra_var)) {
+                foreach($widget_info->extra_var as $key=>$val) {
+                    $vars->{$key} = trim($request_vars->{$key});
+                }
+            }
+            // If the widget style
+            if($request_vars->widgetstyle){
+                $widgetStyle_info = $oWidgetModel->getWidgetStyleInfo($request_vars->widgetstyle);
+                if(count($widgetStyle_info->extra_var)) {
+                    foreach($widgetStyle_info->extra_var as $key=>$val) {
+                        if($val->type =='color' || $val->type =='text' || $val->type =='select' || $val->type =='filebox'){
+                            $vars->{$key} = trim($request_vars->{$key});
+                        }
+                    }
+                }
+            }
+
+            if($vars->widget_sequence) {
+                $cache_file = sprintf('%s%d.%s.cache', $this->cache_path, $vars->widget_sequence, Context::getLangType());
+                FileHandler::removeFile($cache_file);
+            }
+
+            if($vars->widget_cache>0) $vars->widget_sequence = getNextSequence();
+
+            $attribute = array();
+            foreach($vars as $key => $val) {
+                if(!$val) {
+                    unset($vars->{$key});
+                    continue;
+                }
+                if(strpos($val,'|@|') > 0) $val = str_replace('|@|', ',', $val);
+                $vars->{$key} = htmlspecialchars(Context::convertEncodingStr($val));
+                $attribute[] = sprintf('%s="%s"', $key, Context::convertEncodingStr($val));
+            }
+
+            return $attribute;
+        }
+    }
+?>
diff --git a/modules/widget/widget.model.php b/modules/widget/widget.model.php
index 57a11131a..08a476407 100644
--- a/modules/widget/widget.model.php
+++ b/modules/widget/widget.model.php
@@ -1,403 +1,401 @@
-<?php
-    /**
-     * @class  widgetModel
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief  widget 모듈의 Model class
-     **/
-
-    class widgetModel extends widget {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-        }
-
-        /**
-         * @brief 위젯의 경로를 구함
-         **/
-        function getWidgetPath($widget_name) {
-            $path = sprintf('./widgets/%s/', $widget_name);
-            if(is_dir($path)) return $path;
-
-            return "";
-        }
-
-
-        /**
-         * @brief 위젯 스타일의 경로를 구함
-         **/
-        function getWidgetStylePath($widgetStyle_name) {
-            $path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
-            if(is_dir($path)) return $path;
-
-            return "";
-        }
-
-        /**
-         * @brief 위젯 스타일의 경로를 구함
-         **/
-        function getWidgetStyleTpl($widgetStyle_name) {
-            $path = $this->getWidgetStylePath($widgetStyle_name);
-            $tpl = sprintf('%swidgetstyle.html', $path);
-            return $tpl;
-        }
-
-        /**
-         * @brief 위젯의 종류와 정보를 구함
-         * 다운로드되어 있는 위젯의 종류 (생성과 다른 의미)
-         **/
-        function getDownloadedWidgetList() {
-            // 다운받은 위젯과 설치된 위젯의 목록을 구함
-            $searched_list = FileHandler::readDir('./widgets');
-            $searched_count = count($searched_list);
-            if(!$searched_count) return;
-            sort($searched_list);
-
-            // 찾아진 위젯 목록을 loop돌면서 필요한 정보를 간추려 return
-            for($i=0;$i<$searched_count;$i++) {
-                // 위젯의 이름
-                $widget = $searched_list[$i];
-
-                // 해당 위젯의 정보를 구함
-                $widget_info = $this->getWidgetInfo($widget);
-
-                $list[] = $widget_info;
-            }
-            return $list;
-        }
-
-        /**
-         * @brief 위젯의 종류와 정보를 구함
-         * 다운로드되어 있는 위젯의 종류 (생성과 다른 의미)
-         **/
-        function getDownloadedWidgetStyleList() {
-            // 다운받은 위젯과 설치된 위젯의 목록을 구함
-            $searched_list = FileHandler::readDir('./widgetstyles');
-            $searched_count = count($searched_list);
-            if(!$searched_count) return;
-            sort($searched_list);
-
-            // 찾아진 위젯 목록을 loop돌면서 필요한 정보를 간추려 return
-            for($i=0;$i<$searched_count;$i++) {
-                // 위젯의 이름
-                $widgetStyle = $searched_list[$i];
-
-                // 해당 위젯의 정보를 구함
-                $widgetStyle_info = $this->getWidgetStyleInfo($widgetStyle);
-
-                $list[] = $widgetStyle_info;
-            }
-            return $list;
-        }
-
-
-        /**
-         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
-         * 이것 역시 캐싱을 통해서 xml parsing 시간을 줄인다..
-         **/
-        function getWidgetInfo($widget) {
-            // 요청된 모듈의 경로를 구한다. 없으면 return
-            $widget_path = $this->getWidgetPath($widget);
-            if(!$widget_path) return;
-
-            // 현재 선택된 모듈의 스킨의 정보 xml 파일을 읽음
-            $xml_file = sprintf("%sconf/info.xml", $widget_path);
-            if(!file_exists($xml_file)) return;
-
-            // cache 파일을 비교하여 문제 없으면 include하고 $widget_info 변수를 return
-            $cache_file = sprintf('./files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
-
-
-            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
-                @include($cache_file);
-                return $widget_info;
-            }
-
-            // cache 파일이 없으면 xml parsing하고 변수화 한 후에 캐시 파일에 쓰고 변수 바로 return
-            $oXmlParser = new XmlParser();
-            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-            $xml_obj = $tmp_xml_obj->widget;
-            if(!$xml_obj) return;
-
-            $buff = '';
-
-            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
-                // 위젯의 제목, 버전
-                $buff .= sprintf('$widget_info->widget = "%s";', $widget);
-                $buff .= sprintf('$widget_info->path = "%s";', $widget_path);
-                $buff .= sprintf('$widget_info->title = "%s";', $xml_obj->title->body);
-                $buff .= sprintf('$widget_info->description = "%s";', $xml_obj->description->body);
-                $buff .= sprintf('$widget_info->version = "%s";', $xml_obj->version->body);
-                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $buff .= sprintf('$widget_info->date = "%s";', $date);
-                $buff .= sprintf('$widget_info->homepage = "%s";', $xml_obj->link->body);
-                $buff .= sprintf('$widget_info->license = "%s";', $xml_obj->license->body);
-                $buff .= sprintf('$widget_info->license_link = "%s";', $xml_obj->license->attrs->link);
-                $buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
-                $buff .= sprintf('$widget_info->widget_title = $widget_title;');
-
-                // 작성자 정보
-                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-                else $author_list = $xml_obj->author;
-
-                for($i=0; $i < count($author_list); $i++) {
-                    $buff .= sprintf('$widget_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
-                    $buff .= sprintf('$widget_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
-                    $buff .= sprintf('$widget_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
-                }
-
-                // history
-                if($xml_obj->history) {
-                    if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
-                    else $history_list = $xml_obj->history;
-
-                    for($i=0; $i < count($history_list); $i++) {
-                        sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                        $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                        $buff .= sprintf('$widget_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
-                        $buff .= sprintf('$widget_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
-                        $buff .= sprintf('$widget_info->history['.$i.']->date = "%s";', $date);
-
-                        if($history_list[$i]->author) {
-                            (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
-
-                            for($j=0; $j < count($obj->author_list); $j++) {
-                                $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
-                                $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
-                                $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
-                            }
-                        }
-
-                        if($history_list[$i]->log) {
-                            (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
-
-                            for($j=0; $j < count($obj->log_list); $j++) {
-                                $buff .= sprintf('$widget_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
-                                $buff .= sprintf('$widget_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
-                            }
-                        }
-                    }
-                }
-
-            } else {
-
-                // 위젯의 제목, 버전
-                $buff .= sprintf('$widget_info->widget = "%s";', $widget);
-                $buff .= sprintf('$widget_info->path = "%s";', $widget_path);
-                $buff .= sprintf('$widget_info->title = "%s";', $xml_obj->title->body);
-                $buff .= sprintf('$widget_info->description = "%s";', $xml_obj->author->description->body);
-                $buff .= sprintf('$widget_info->version = "%s";', $xml_obj->attrs->version);
-                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                $buff .= sprintf('$widget_info->date = "%s";', $date);
-                $buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
-                $buff .= sprintf('$widget_info->widget_title = $widget_title;');
-
-                // 작성자 정보
-                $buff .= sprintf('$widget_info->author[0]->name = "%s";', $xml_obj->author->name->body);
-                $buff .= sprintf('$widget_info->author[0]->email_address = "%s";', $xml_obj->author->attrs->email_address);
-                $buff .= sprintf('$widget_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
-            }
-
-
-            // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-            $extra_var_groups = $xml_obj->extra_vars->group;
-            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-            foreach($extra_var_groups as $group){
-                $extra_vars = $group->var;
-                if(!is_array($group->var)) $extra_vars = array($group->var);
-
-                if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
-                    $extra_var_count = count($extra_vars);
-
-                    $buff .= sprintf('$widget_info->extra_var_count = "%s";', $extra_var_count);
-                    for($i=0;$i<$extra_var_count;$i++) {
-                        unset($var);
-                        unset($options);
-                        $var = $extra_vars[$i];
-
-                        $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
-                        $name = $var->name->body?$var->name->body:$var->title->body;
-                        $type = $var->attrs->type?$var->attrs->type:$var->type->body;
-                        if($type =='filebox') $buff .= sprintf('$widget_info->extra_var->%s->filter = "%s";', $id, $var->type->attrs->filter);
-
-                        $buff .= sprintf('$widget_info->extra_var->%s->group = "%s";', $id, $group->title->body);
-                        $buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
-                        $buff .= sprintf('$widget_info->extra_var->%s->type = "%s";', $id, $type);
-                        $buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
-                        $buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
-
-                        $options = $var->options;
-                        if(!$options) continue;
-
-                        if(!is_array($options)) $options = array($options);
-                        $options_count = count($options);
-                        for($j=0;$j<$options_count;$j++) {
-                            $buff .= sprintf('$widget_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
-
-                            if($options[$j]->attrs->default && $options[$j]->attrs->default=='true'){
-                                $buff .= sprintf('$widget_info->extra_var->%s->default_options["%s"] = true;', $id, $options[$j]->value->body);
-                            }
-
-                            if($options[$j]->attrs->init && $options[$j]->attrs->init=='true'){
-                                $buff .= sprintf('$widget_info->extra_var->%s->init_options["%s"] = true;', $id, $options[$j]->value->body);
-                            }
-                        }
-
-                    }
-                }
-            }
-
-            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
-            FileHandler::writeFile($cache_file, $buff);
-
-            if(file_exists($cache_file)) @include($cache_file);
-            return $widget_info;
-        }
-
-
-
-        /**
-         * @brief 모듈의 conf/info.xml 을 읽어서 정보를 구함
-         * 이것 역시 캐싱을 통해서 xml parsing 시간을 줄인다..
-         **/
-        function getWidgetStyleInfo($widgetStyle) {
-
-            $widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
-            if(!$widgetStyle_path) return;
-            $xml_file = sprintf("%sskin.xml", $widgetStyle_path);
-            if(!file_exists($xml_file)) return;
-
-            // cache 파일을 비교하여 문제 없으면 include하고 $widgetStyle_info 변수를 return
-            $cache_file = sprintf('./files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
-
-            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
-                @include($cache_file);
-                return $widgetStyle_info;
-            }
-
-            // cache 파일이 없으면 xml parsing하고 변수화 한 후에 캐시 파일에 쓰고 변수 바로 return
-            $oXmlParser = new XmlParser();
-            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
-            $xml_obj = $tmp_xml_obj->widgetstyle;
-            if(!$xml_obj) return;
-
-            $buff = '';
-
-            // 위젯의 제목, 버전
-            $buff .= sprintf('$widgetStyle_info->widgetStyle = "%s";', $widgetStyle);
-            $buff .= sprintf('$widgetStyle_info->path = "%s";', $widgetStyle_path);
-            $buff .= sprintf('$widgetStyle_info->title = "%s";', $xml_obj->title->body);
-            $buff .= sprintf('$widgetStyle_info->description = "%s";', $xml_obj->description->body);
-            $buff .= sprintf('$widgetStyle_info->version = "%s";', $xml_obj->version->body);
-            sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-            $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-            $buff .= sprintf('$widgetStyle_info->date = "%s";', $date);
-            $buff .= sprintf('$widgetStyle_info->homepage = "%s";', $xml_obj->link->body);
-            $buff .= sprintf('$widgetStyle_info->license = "%s";', $xml_obj->license->body);
-            $buff .= sprintf('$widgetStyle_info->license_link = "%s";', $xml_obj->license->attrs->link);
-
-            // preview
-            if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
-            $preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
-            if(file_exists($preview_file)) $buff .= sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
-
-            // 작성자 정보
-            if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-            else $author_list = $xml_obj->author;
-
-            for($i=0; $i < count($author_list); $i++) {
-                $buff .= sprintf('$widgetStyle_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
-                $buff .= sprintf('$widgetStyle_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
-                $buff .= sprintf('$widgetStyle_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
-            }
-
-            // history
-            if($xml_obj->history) {
-                if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
-                else $history_list = $xml_obj->history;
-
-                for($i=0; $i < count($history_list); $i++) {
-                    sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
-                    $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
-                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
-                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
-                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->date = "%s";', $date);
-
-                    if($history_list[$i]->author) {
-                        (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
-
-                        for($j=0; $j < count($obj->author_list); $j++) {
-                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
-                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
-                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
-                        }
-                    }
-
-                    if($history_list[$i]->log) {
-                        (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
-
-                        for($j=0; $j < count($obj->log_list); $j++) {
-                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
-                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
-                        }
-                    }
-                }
-            }
-
-
-            // 추가 변수 (템플릿에서 사용할 제작자 정의 변수)
-            $extra_var_groups = $xml_obj->extra_vars->group;
-            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-            foreach($extra_var_groups as $group){
-                $extra_vars = $group->var;
-                if(!is_array($group->var)) $extra_vars = array($group->var);
-
-                if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
-                    $extra_var_count = count($extra_vars);
-
-                    $buff .= sprintf('$widgetStyle_info->extra_var_count = "%s";', $extra_var_count);
-                    for($i=0;$i<$extra_var_count;$i++) {
-                        unset($var);
-                        unset($options);
-                        $var = $extra_vars[$i];
-
-                        $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
-                        $name = $var->name->body?$var->name->body:$var->title->body;
-                        $type = $var->attrs->type?$var->attrs->type:$var->type->body;
-
-
-                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->group = "%s";', $id, $group->title->body);
-                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->name = "%s";', $id, $name);
-                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->type = "%s";', $id, $type);
-                        if($type =='filebox') $buff .= sprintf('$widgetStyle_info->extra_var->%s->filter = "%s";', $id, $var->attrs->filter);
-                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
-                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
-
-                        $options = $var->options;
-                        if(!$options) continue;
-
-                        if(!is_array($options)) $options = array($options);
-                        $options_count = count($options);
-                        for($j=0;$j<$options_count;$j++) {
-                            $buff .= sprintf('$widgetStyle_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
-                        }
-
-                    }
-                }
-            }
-
-            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
-            FileHandler::writeFile($cache_file, $buff);
-
-            if(file_exists($cache_file)) @include($cache_file);
-            return $widgetStyle_info;
-        }
-
-    }
-?>
+<?php
+    /**
+     * @class  widgetModel
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief Model class for widget modules
+     **/
+
+    class widgetModel extends widget {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+        }
+
+        /**
+         * @brief Wanted widget's path
+         **/
+        function getWidgetPath($widget_name) {
+            $path = sprintf('./widgets/%s/', $widget_name);
+            if(is_dir($path)) return $path;
+
+            return "";
+        }
+
+
+        /**
+         * @brief Wanted widget style path
+         **/
+        function getWidgetStylePath($widgetStyle_name) {
+            $path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
+            if(is_dir($path)) return $path;
+
+            return "";
+        }
+
+        /**
+         * @brief Wanted widget style path
+         **/
+        function getWidgetStyleTpl($widgetStyle_name) {
+            $path = $this->getWidgetStylePath($widgetStyle_name);
+            $tpl = sprintf('%swidgetstyle.html', $path);
+            return $tpl;
+        }
+
+        /**
+         * @brief Wanted photos of the type and information
+         * Download a widget with type (generation and other means)
+         **/
+        function getDownloadedWidgetList() {
+			$oAutoinstallModel = &getModel('autoinstall');
+
+            // 've Downloaded the widget and the widget's list of installed Wanted
+            $searched_list = FileHandler::readDir('./widgets');
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+            sort($searched_list);
+            // D which pertain to the list of widgets loop spins return statement review the information you need
+            for($i=0;$i<$searched_count;$i++) {
+                // The name of the widget
+                $widget = $searched_list[$i];
+                // Wanted information on the Widget
+                $widget_info = $this->getWidgetInfo($widget);
+
+				// get easyinstall remove url
+				$packageSrl = $oAutoinstallModel->getPackageSrlByPath($widget_info->path);
+				$widget_info->remove_url = $oAutoinstallModel->getRemoveUrlByPackageSrl($packageSrl);
+
+				// get easyinstall need update
+				$package = $oAutoinstallModel->getInstalledPackages($packageSrl);
+				$widget_info->need_update = $package[$packageSrl]->need_update;
+
+				// get easyinstall update url
+				if ($widget_info->need_update == 'Y')
+				{
+					$widget_info->update_url = $oAutoinstallModel->getUpdateUrlByPackageSrl($packageSrl);
+				}
+
+                $list[] = $widget_info;
+            }
+            return $list;
+        }
+
+        /**
+         * @brief Wanted photos of the type and information
+         * Download a widget with type (generation and other means)
+         **/
+        function getDownloadedWidgetStyleList() {
+            // 've Downloaded the widget and the widget's list of installed Wanted
+            $searched_list = FileHandler::readDir('./widgetstyles');
+            $searched_count = count($searched_list);
+            if(!$searched_count) return;
+            sort($searched_list);
+            // D which pertain to the list of widgets loop spins return statement review the information you need
+            for($i=0;$i<$searched_count;$i++) {
+                // The name of the widget
+                $widgetStyle = $searched_list[$i];
+                // Wanted information on the Widget
+                $widgetStyle_info = $this->getWidgetStyleInfo($widgetStyle);
+
+                $list[] = $widgetStyle_info;
+            }
+            return $list;
+        }
+
+
+        /**
+         * @brief Modules conf/info.xml wanted to read the information
+         * It uses caching to reduce time for xml parsing ..
+         **/
+        function getWidgetInfo($widget) {
+            // Get a path of the requested module. Return if not exists.
+            $widget_path = $this->getWidgetPath($widget);
+            if(!$widget_path) return;
+            // Read the xml file for module skin information
+            $xml_file = sprintf("%sconf/info.xml", $widget_path);
+            if(!file_exists($xml_file)) return;
+            // If the problem by comparing the cache file and include the return variable $widget_info
+            $cache_file = sprintf('./files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
+
+
+            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
+                @include($cache_file);
+                return $widget_info;
+            }
+            // If no cache file exists, parse the xml and then return the variable.
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            $xml_obj = $tmp_xml_obj->widget;
+            if(!$xml_obj) return;
+
+            $buff = '';
+
+            if($xml_obj->version && $xml_obj->attrs->version == '0.2') {
+                // Title of the widget, version
+                $buff .= sprintf('$widget_info->widget = "%s";', $widget);
+                $buff .= sprintf('$widget_info->path = "%s";', $widget_path);
+                $buff .= sprintf('$widget_info->title = "%s";', $xml_obj->title->body);
+                $buff .= sprintf('$widget_info->description = "%s";', $xml_obj->description->body);
+                $buff .= sprintf('$widget_info->version = "%s";', $xml_obj->version->body);
+                sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $buff .= sprintf('$widget_info->date = "%s";', $date);
+                $buff .= sprintf('$widget_info->homepage = "%s";', $xml_obj->link->body);
+                $buff .= sprintf('$widget_info->license = "%s";', $xml_obj->license->body);
+                $buff .= sprintf('$widget_info->license_link = "%s";', $xml_obj->license->attrs->link);
+                $buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
+                $buff .= sprintf('$widget_info->widget_title = $widget_title;');
+                // Author information
+                if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+                else $author_list = $xml_obj->author;
+
+                for($i=0; $i < count($author_list); $i++) {
+                    $buff .= sprintf('$widget_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
+                    $buff .= sprintf('$widget_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
+                    $buff .= sprintf('$widget_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
+                }
+
+                // history
+                if($xml_obj->history) {
+                    if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
+                    else $history_list = $xml_obj->history;
+
+                    for($i=0; $i < count($history_list); $i++) {
+                        sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                        $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                        $buff .= sprintf('$widget_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
+                        $buff .= sprintf('$widget_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
+                        $buff .= sprintf('$widget_info->history['.$i.']->date = "%s";', $date);
+
+                        if($history_list[$i]->author) {
+                            (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
+
+                            for($j=0; $j < count($obj->author_list); $j++) {
+                                $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
+                                $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
+                                $buff .= sprintf('$widget_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
+                            }
+                        }
+
+                        if($history_list[$i]->log) {
+                            (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
+
+                            for($j=0; $j < count($obj->log_list); $j++) {
+                                $buff .= sprintf('$widget_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
+                                $buff .= sprintf('$widget_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
+                            }
+                        }
+                    }
+                }
+
+            } else {
+                // Title of the widget, version
+                $buff .= sprintf('$widget_info->widget = "%s";', $widget);
+                $buff .= sprintf('$widget_info->path = "%s";', $widget_path);
+                $buff .= sprintf('$widget_info->title = "%s";', $xml_obj->title->body);
+                $buff .= sprintf('$widget_info->description = "%s";', $xml_obj->author->description->body);
+                $buff .= sprintf('$widget_info->version = "%s";', $xml_obj->attrs->version);
+                sscanf($xml_obj->author->attrs->date, '%d. %d. %d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                $buff .= sprintf('$widget_info->date = "%s";', $date);
+                $buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
+                $buff .= sprintf('$widget_info->widget_title = $widget_title;');
+                // Author information
+                $buff .= sprintf('$widget_info->author[0]->name = "%s";', $xml_obj->author->name->body);
+                $buff .= sprintf('$widget_info->author[0]->email_address = "%s";', $xml_obj->author->attrs->email_address);
+                $buff .= sprintf('$widget_info->author[0]->homepage = "%s";', $xml_obj->author->attrs->link);
+            }
+            // Extra vars (user defined variables to use in a template)
+            $extra_var_groups = $xml_obj->extra_vars->group;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
+                if(!is_array($group->var)) $extra_vars = array($group->var);
+
+                if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
+                    $extra_var_count = count($extra_vars);
+
+                    $buff .= sprintf('$widget_info->extra_var_count = "%s";', $extra_var_count);
+                    for($i=0;$i<$extra_var_count;$i++) {
+                        unset($var);
+                        unset($options);
+                        $var = $extra_vars[$i];
+
+                        $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
+                        $name = $var->name->body?$var->name->body:$var->title->body;
+                        $type = $var->attrs->type?$var->attrs->type:$var->type->body;
+                        if($type =='filebox') $buff .= sprintf('$widget_info->extra_var->%s->filter = "%s";', $id, $var->type->attrs->filter);
+
+                        $buff .= sprintf('$widget_info->extra_var->%s->group = "%s";', $id, $group->title->body);
+                        $buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
+                        $buff .= sprintf('$widget_info->extra_var->%s->type = "%s";', $id, $type);
+                        $buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
+                        $buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
+
+                        $options = $var->options;
+                        if(!$options) continue;
+
+                        if(!is_array($options)) $options = array($options);
+                        $options_count = count($options);
+                        for($j=0;$j<$options_count;$j++) {
+                            $buff .= sprintf('$widget_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
+
+                            if($options[$j]->attrs->default && $options[$j]->attrs->default=='true'){
+                                $buff .= sprintf('$widget_info->extra_var->%s->default_options["%s"] = true;', $id, $options[$j]->value->body);
+                            }
+
+                            if($options[$j]->attrs->init && $options[$j]->attrs->init=='true'){
+                                $buff .= sprintf('$widget_info->extra_var->%s->init_options["%s"] = true;', $id, $options[$j]->value->body);
+                            }
+                        }
+
+                    }
+                }
+            }
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
+            FileHandler::writeFile($cache_file, $buff);
+
+            if(file_exists($cache_file)) @include($cache_file);
+            return $widget_info;
+        }
+
+
+
+        /**
+         * @brief Modules conf/info.xml wanted to read the information
+         * It uses caching to reduce time for xml parsing ..
+         **/
+        function getWidgetStyleInfo($widgetStyle) {
+
+            $widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
+            if(!$widgetStyle_path) return;
+            $xml_file = sprintf("%sskin.xml", $widgetStyle_path);
+            if(!file_exists($xml_file)) return;
+            // If the problem by comparing the cache file and include the return variable $widgetStyle_info
+            $cache_file = sprintf('./files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
+
+            if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file)) {
+                @include($cache_file);
+                return $widgetStyle_info;
+            }
+            // If no cache file exists, parse the xml and then return the variable.
+            $oXmlParser = new XmlParser();
+            $tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
+            $xml_obj = $tmp_xml_obj->widgetstyle;
+            if(!$xml_obj) return;
+
+            $buff = '';
+            // Title of the widget, version
+            $buff .= sprintf('$widgetStyle_info->widgetStyle = "%s";', $widgetStyle);
+            $buff .= sprintf('$widgetStyle_info->path = "%s";', $widgetStyle_path);
+            $buff .= sprintf('$widgetStyle_info->title = "%s";', $xml_obj->title->body);
+            $buff .= sprintf('$widgetStyle_info->description = "%s";', $xml_obj->description->body);
+            $buff .= sprintf('$widgetStyle_info->version = "%s";', $xml_obj->version->body);
+            sscanf($xml_obj->date->body, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+            $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+            $buff .= sprintf('$widgetStyle_info->date = "%s";', $date);
+            $buff .= sprintf('$widgetStyle_info->homepage = "%s";', $xml_obj->link->body);
+            $buff .= sprintf('$widgetStyle_info->license = "%s";', $xml_obj->license->body);
+            $buff .= sprintf('$widgetStyle_info->license_link = "%s";', $xml_obj->license->attrs->link);
+
+            // preview
+            if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
+            $preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
+            if(file_exists($preview_file)) $buff .= sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
+            // Author information
+            if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+            else $author_list = $xml_obj->author;
+
+            for($i=0; $i < count($author_list); $i++) {
+                $buff .= sprintf('$widgetStyle_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
+                $buff .= sprintf('$widgetStyle_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
+                $buff .= sprintf('$widgetStyle_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
+            }
+
+            // history
+            if($xml_obj->history) {
+                if(!is_array($xml_obj->history)) $history_list[] = $xml_obj->history;
+                else $history_list = $xml_obj->history;
+
+                for($i=0; $i < count($history_list); $i++) {
+                    sscanf($history_list[$i]->attrs->date, '%d-%d-%d', $date_obj->y, $date_obj->m, $date_obj->d);
+                    $date = sprintf('%04d%02d%02d', $date_obj->y, $date_obj->m, $date_obj->d);
+                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->description = "%s";', $history_list[$i]->description->body);
+                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->version = "%s";', $history_list[$i]->attrs->version);
+                    $buff .= sprintf('$widgetStyle_info->history['.$i.']->date = "%s";', $date);
+
+                    if($history_list[$i]->author) {
+                        (!is_array($history_list[$i]->author)) ? $obj->author_list[] = $history_list[$i]->author : $obj->author_list = $history_list[$i]->author;
+
+                        for($j=0; $j < count($obj->author_list); $j++) {
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->name = "%s";', $obj->author_list[$j]->name->body);
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->email_address = "%s";', $obj->author_list[$j]->attrs->email_address);
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->author['.$j.']->homepage = "%s";', $obj->author_list[$j]->attrs->link);
+                        }
+                    }
+
+                    if($history_list[$i]->log) {
+                        (!is_array($history_list[$i]->log)) ? $obj->log_list[] = $history_list[$i]->log : $obj->log_list = $history_list[$i]->log;
+
+                        for($j=0; $j < count($obj->log_list); $j++) {
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->text = "%s";', $obj->log_list[$j]->body);
+                            $buff .= sprintf('$widgetStyle_info->history['.$i.']->logs['.$j.']->link = "%s";', $obj->log_list[$j]->attrs->link);
+                        }
+                    }
+                }
+            }
+            // Extra vars (user defined variables to use in a template)
+            $extra_var_groups = $xml_obj->extra_vars->group;
+            if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+            if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+            foreach($extra_var_groups as $group){
+                $extra_vars = $group->var;
+                if(!is_array($group->var)) $extra_vars = array($group->var);
+
+                if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name) {
+                    $extra_var_count = count($extra_vars);
+
+                    $buff .= sprintf('$widgetStyle_info->extra_var_count = "%s";', $extra_var_count);
+                    for($i=0;$i<$extra_var_count;$i++) {
+                        unset($var);
+                        unset($options);
+                        $var = $extra_vars[$i];
+
+                        $id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
+                        $name = $var->name->body?$var->name->body:$var->title->body;
+                        $type = $var->attrs->type?$var->attrs->type:$var->type->body;
+
+
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->group = "%s";', $id, $group->title->body);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->name = "%s";', $id, $name);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->type = "%s";', $id, $type);
+                        if($type =='filebox') $buff .= sprintf('$widgetStyle_info->extra_var->%s->filter = "%s";', $id, $var->attrs->filter);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
+                        $buff .= sprintf('$widgetStyle_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
+
+                        $options = $var->options;
+                        if(!$options) continue;
+
+                        if(!is_array($options)) $options = array($options);
+                        $options_count = count($options);
+                        for($j=0;$j<$options_count;$j++) {
+                            $buff .= sprintf('$widgetStyle_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
+                        }
+
+                    }
+                }
+            }
+
+            $buff = '<?php if(!defined("__ZBXE__")) exit(); '.$buff.' ?>';
+            FileHandler::writeFile($cache_file, $buff);
+
+            if(file_exists($cache_file)) @include($cache_file);
+            return $widgetStyle_info;
+        }
+
+    }
+?>
diff --git a/modules/widget/widget.view.php b/modules/widget/widget.view.php
index e3686dc55..574c73dd8 100644
--- a/modules/widget/widget.view.php
+++ b/modules/widget/widget.view.php
@@ -1,153 +1,138 @@
-<?php
-    /**
-     * @class  widgetView
-     * @author NHN (developers@xpressengine.com)
-     * @brief  widget 모듈의 View class
-     **/
-
-    class widgetView extends widget {
-
-        /**
-         * @brief 초기화
-         **/
-        function init() {
-            $this->setTemplatePath($this->module_path.'tpl');
-        }
-
-        /**
-         * @brief 위젯의 상세 정보(conf/info.xml)를 팝업 출력
-         **/
-        function dispWidgetInfo() {
-            // 위젯 스킨명이 있을 경우 위젯 스킨 상세 정보 함수로 출력
-            if(Context::get('skin')) return $this->dispWidgetSkinInfo();
-
-            // 선택된 위젯 정보를 구함
-            $oWidgetModel = &getModel('widget');
-            $widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
-            Context::set('widget_info', $widget_info);
-
-            // 위젯을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('widget_detail_info');
-        }
-
-        /**
-         * @brief 위젯 스킨의 상세 정보(skin.xml)를 팝업 출력
-         **/
-        function dispWidgetSkinInfo() {
-            $widget = Context::get('selected_widget');
-            $skin = Context::get('skin');
-
-            $path = sprintf('./widgets/%s/', $widget);
-
-            // 선택된 위젯 정보를 구함
-            $oModuleModel = &getModel('module');
-            $skin_info = $oModuleModel->loadSkinInfo($path, $skin);
-
-            Context::set('skin_info',$skin_info);
-
-            // 위젯을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('skin_info');
-        }
-
-        /**
-         * @brief 위젯의 코드 생성기
-         **/
-        function dispWidgetGenerateCode() {
-            // 선택된 위젯 정보를 구함
-            $oWidgetModel = &getModel('widget');
-
-            $widget_list = $oWidgetModel->getDownloadedWidgetList();
-            $selected_widget = Context::get('selected_widget');
-            if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
-
-            $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
-            Context::set('widget_info', $widget_info);
-            Context::set('widget_list', $widget_list);
-            Context::set('selected_widget', $selected_widget);
-
-            $oModuleModel = &getModel('module');
-
-            // 모듈 카테고리 목록을 구함
-            $module_categories = $oModuleModel->getModuleCategories();
-
-            // mid 목록을 가져옴
-            $site_module_info = Context::get('site_module_info');
-            $args->site_srl = $site_module_info->site_srl;
-            $mid_list = $oModuleModel->getMidList($args);
-
-            // 그룹 목록을 가져옴
-            $oMemberModel = &getModel('member');
-            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
-            Context::set('group_list', $group_list);
-
-            // module_category와 module의 조합
-            if($module_categories) {
-                foreach($mid_list as $module_srl => $module) {
-                    $module_categories[$module->module_category_srl]->list[$module_srl] = $module;
-                }
-            } else {
-                $module_categories[0]->list = $mid_list;
-            }
-
-            Context::set('mid_list',$module_categories);
-
-            // 메뉴 목록을 구함
-            $output = executeQueryArray('menu.getMenus');
-            Context::set('menu_list',$output->data);
-
-
-            // 스킨의 정보를 구함
-            $skin_list = $oModuleModel->getSkins($widget_info->path);
-            Context::set('skin_list', $skin_list);
-
-            // 위젯을 팝업으로 지정
-            $this->setLayoutFile('popup_layout');
-
-            // 템플릿 파일 지정
-            $this->setTemplateFile('widget_generate_code');
-        }
-
-        /**
-         * @brief 페이지 관리에서 사용될 코드 생성 팝업
-         **/
-        function dispWidgetGenerateCodeInPage() {
-            $oWidgetModel = &getModel('widget');
-            $widget_list = $oWidgetModel->getDownloadedWidgetList();
-            Context::set('widget_list',$widget_list);
-
-            // 선택된 위젯이 없을경우 첫 위젯으로
-            if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
-
-            $this->dispWidgetGenerateCode();
-            $this->setTemplateFile('widget_generate_code_in_page');
-        }
-
-        /**
-         * @brief 페이지 관리에서 사용될 위젯 스타일 코드 생성 팝업
-         **/
-        function dispWidgetStyleGenerateCodeInPage() {
-
-            // 위젯 스타일 목록
-            $oWidgetModel = &getModel('widget');
-            $widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-            Context::set('widgetStyle_list',$widgetStyle_list);
-
-            // 선택된 위젯 스타일 목록
-            $widgetstyle = Context::get('widgetstyle');
-            $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);
-            if($widgetstyle && $widgetstyle_info){
-                Context::set('widgetstyle_info',$widgetstyle_info);
-            }
-            
-            $this->dispWidgetGenerateCode();
-            $this->setLayoutFile('popup_layout');
-            $this->setTemplateFile('widget_style_generate_code_in_page');
-        }
-    }
-?>
+<?php
+    /**
+     * @class  widgetView
+     * @author NHN (developers@xpressengine.com)
+     * @brief View class of the widget modules
+     **/
+
+    class widgetView extends widget {
+
+        /**
+         * @brief Initialization
+         **/
+        function init() {
+            $this->setTemplatePath($this->module_path.'tpl');
+        }
+
+        /**
+         * @brief Details of the widget (conf/info.xml) a pop-out
+         **/
+        function dispWidgetInfo() {
+            // If people have skin widget widget output as a function of the skin More Details
+            if(Context::get('skin')) return $this->dispWidgetSkinInfo();
+            // Wanted widget is selected information
+            $oWidgetModel = &getModel('widget');
+            $widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
+            Context::set('widget_info', $widget_info);
+            // Specifies the widget to pop up
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('widget_detail_info');
+        }
+
+        /**
+         * @brief Widget details of the skin (skin.xml) a pop-out
+         **/
+        function dispWidgetSkinInfo() {
+            $widget = Context::get('selected_widget');
+            $skin = Context::get('skin');
+
+            $path = sprintf('./widgets/%s/', $widget);
+            // Wanted widget is selected information
+            $oModuleModel = &getModel('module');
+            $skin_info = $oModuleModel->loadSkinInfo($path, $skin);
+
+            Context::set('skin_info',$skin_info);
+            // Specifies the widget to pop up
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('skin_info');
+        }
+
+        /**
+         * @brief Widget's code generator
+         **/
+        function dispWidgetGenerateCode() {
+            // Wanted widget is selected information
+            $oWidgetModel = &getModel('widget');
+
+            $widget_list = $oWidgetModel->getDownloadedWidgetList();
+            $selected_widget = Context::get('selected_widget');
+            if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
+
+            $widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
+            Context::set('widget_info', $widget_info);
+            Context::set('widget_list', $widget_list);
+            Context::set('selected_widget', $selected_widget);
+
+            $oModuleModel = &getModel('module');
+            // Get a list of module categories
+            $module_categories = $oModuleModel->getModuleCategories();
+            // Get a mid list
+            $site_module_info = Context::get('site_module_info');
+            $args->site_srl = $site_module_info->site_srl;
+			$columnList = array('module_srl', 'module_category_srl', 'browser_title', 'mid');
+            $mid_list = $oModuleModel->getMidList($args, $columnList);
+
+            // Get a list of groups
+            $oMemberModel = &getModel('member');
+            $group_list = $oMemberModel->getGroups($site_module_info->site_srl);
+            Context::set('group_list', $group_list);
+            // module_category and module combination
+            if($module_categories) {
+                foreach($mid_list as $module_srl => $module) {
+                    $module_categories[$module->module_category_srl]->list[$module_srl] = $module;
+                }
+            } else {
+                $module_categories[0]->list = $mid_list;
+            }
+
+            Context::set('mid_list',$module_categories);
+            // Menu Get a list
+            $output = executeQueryArray('menu.getMenus');
+            Context::set('menu_list',$output->data);
+            // Wanted information on skin
+            $skin_list = $oModuleModel->getSkins($widget_info->path);
+            Context::set('skin_list', $skin_list);
+            // Specifies the widget to pop up
+            $this->setLayoutFile('popup_layout');
+            // Set a template file
+            $this->setTemplateFile('widget_generate_code');
+        }
+
+        /**
+         * @brief Managing pop-up pages used in the generated code
+         **/
+        function dispWidgetGenerateCodeInPage() {
+            $oWidgetModel = &getModel('widget');
+            $widget_list = $oWidgetModel->getDownloadedWidgetList();
+            Context::set('widget_list',$widget_list);
+            // When there is no widget is selected in the first widget
+            if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
+
+            $this->dispWidgetGenerateCode();
+			$this->setLayoutFile('default_layout');
+            $this->setTemplateFile('widget_generate_code_in_page');
+        }
+
+        /**
+         * @brief Create widget style code page used in the pop-up management
+         **/
+        function dispWidgetStyleGenerateCodeInPage() {
+            // Widget-style list
+            $oWidgetModel = &getModel('widget');
+            $widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
+            Context::set('widgetStyle_list',$widgetStyle_list);
+            // Selected list of widget styles
+            $widgetstyle = Context::get('widgetstyle');
+            $widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);
+            if($widgetstyle && $widgetstyle_info){
+                Context::set('widgetstyle_info',$widgetstyle_info);
+            }
+
+            $this->dispWidgetGenerateCode();
+            $this->setLayoutFile('default_layout');
+            $this->setTemplateFile('widget_style_generate_code_in_page');
+        }
+    }
+?>
diff --git a/tests/Bootstrap.php b/tests/Bootstrap.php
new file mode 100644
index 000000000..4e9aa95d1
--- /dev/null
+++ b/tests/Bootstrap.php
@@ -0,0 +1,24 @@
+<?php
+
+if(!defined('__DEBUG__')) define('__DEBUG__', 1);
+if(!defined('__XE__')) define('__XE__', true);
+if(!defined('__ZBXE__')) define('__ZBXE__', true);
+if(!defined('_XE_PATH_')) define('_XE_PATH_', realpath(dirname(__FILE__).'/../').'/');
+
+error_reporting(E_ALL & ~E_NOTICE);
+
+/**
+ * Print out the message
+ **/
+function _log($msg) {
+	$args = func_get_args();
+
+	foreach($args as $arg) {
+		fwrite(STDOUT, "\n");
+		fwrite(STDOUT, print_r($arg, true));
+	}
+		fwrite(STDOUT, "\n");
+}
+
+/* End of file Bootstrap.php */
+/* Location: ./tests/Bootstrap.php */
diff --git a/tests/FuncIncTest.class.php b/tests/FuncIncTest.class.php
new file mode 100644
index 000000000..bb49f66e9
--- /dev/null
+++ b/tests/FuncIncTest.class.php
@@ -0,0 +1,58 @@
+<?php
+
+define('__XE__', 1);
+define('_XE_PATH_', realpath(dirname(__FILE__).'/../'));
+require _XE_PATH_.'/config/func.inc.php';
+
+class FuncIncTest extends PHPUnit_Framework_TestCase
+{
+	static public function xssProvider()
+	{
+		return array(
+			// remove iframe
+			array(
+				'<div class="frame"><iframe src="path/to/file.html"></iframe><p><a href="#iframe">IFrame</a></p></div>',
+				'<div class="frame">&lt;iframe src="path/to/file.html">&lt;/iframe><p><a href="#iframe">IFrame</a></p></div>'
+			),
+			// expression
+			array(
+				'<div class="dummy" style="xss:expr/*XSS*/ession(alert(\'XSS\'))">',
+				'<div class="dummy">'
+			),
+			// no quotes and no semicolon - http://ha.ckers.org/xss.html
+			array(
+				'<img src=javascript:alert(\'xss\')>',
+				'<img>'
+			),
+			// embedded encoded tab to break up XSS - http://ha.ckers.org/xss.html
+			array(
+				'<IMG SRC="jav&#x09;ascript:alert(\'XSS\');">',
+				'<img>'
+			),
+			// issue 178
+			array(
+				"<img src=\"invalid\"\nonerror=\"alert(1)\" />",
+				'<img src="invalid" />'
+			),
+			// issue 534
+			array(
+				'<img src=\'as"df dummy=\'"1234\'" 4321\' asdf/*/>*/"  onerror="console.log(\'Yet another XSS\')">',
+				'<img src="as&quot;df dummy=" />*/"  onerror="console.log(\'Yet another XSS\')">'
+			),
+			// issue 602
+			array(
+				'<img alt="test" src="(http://static.naver.com/www/u/2010/0611/nmms_215646753.gif" onload="eval(String.fromCharCode(105,61,49,48,48,59,119,104,105,108,101, 40,105,62,48,41,97,108,101,114,116,40,40,105,45,45,41,43,39,48264,47564,32, 45908,32,53364,47533,54616,49464,50836,39,41,59));">',
+				'<img alt="test" src="(http://static.naver.com/www/u/2010/0611/nmms_215646753.gif">'
+			)
+		);
+	}
+
+	/**
+	 * @dataProvider xssProvider
+	 */
+	public function testXSS($source, $expected)
+	{
+		$result = removeHackTag($source);
+		$this->assertEquals($result, $expected);
+	}
+}
diff --git a/tests/classes/context/Context.mock.php b/tests/classes/context/Context.mock.php
new file mode 100644
index 000000000..7b92c994f
--- /dev/null
+++ b/tests/classes/context/Context.mock.php
@@ -0,0 +1,63 @@
+<?php
+
+if(!defined('FOLLOW_REQUEST_SSL')) define('FOLLOW_REQUEST_SSL',0);
+if(!defined('ENFORCE_SSL')) define('ENFORCE_SSL',1);
+if(!defined('RELEASE_SSL')) define('RELEASE_SSL',2);
+if(!defined('MOCK_CONTEXT')) define('MOCK_CONTEXT', 1);
+
+class Context
+{
+	public static $mock_vars = array();
+
+	public function gets() {
+		$args = func_get_args();
+		$output = new stdClass;
+
+		foreach($args as $name) {
+			$output->{$name} = Context::$mock_vars[$name];
+		}
+
+		return $output;
+	}
+
+	public function get($name) {
+		return array_key_exists($name, Context::$mock_vars)?Context::$mock_vars[$name]:'';
+	}
+
+	public function getRequestVars() {
+		return Context::$mock_vars;
+	}
+
+	public function set($name, $value) {
+		Context::$mock_vars[$name] = $value;
+	}
+
+	public function getLangType() {
+		return 'en';
+	}
+
+	public function getLang($str) {
+		return $str;
+	}
+
+	public function truncate() {
+		Context::$mock_vars = array();
+	}
+
+	public function getDBInfo() {
+		global $use_cdn;
+
+		$dbInfo = new stdClass;
+		$dbInfo->use_cdn = $use_cdn;
+
+		return $dbInfo;
+	}
+
+	public function getRequestUrl() {
+		global $request_url;
+		return $request_url;
+	}
+}
+
+/* End of file Context.mock.php */
+/* Location: ./tests/classes/context/Context.mock.php */
diff --git a/tests/classes/context/Context.test.php b/tests/classes/context/Context.test.php
deleted file mode 100644
index b8415a044..000000000
--- a/tests/classes/context/Context.test.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-    class TestOfContext extends UnitTestCase {
-        function testOK() {
-            $this->assertTrue(true);
-        }
-    }
-?>
diff --git a/tests/classes/context/ContextTest.php b/tests/classes/context/ContextTest.php
new file mode 100644
index 000000000..70a61226c
--- /dev/null
+++ b/tests/classes/context/ContextTest.php
@@ -0,0 +1,85 @@
+<?php
+
+if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php';
+
+require_once _XE_PATH_.'classes/context/Context.class.php'; 
+require_once _XE_PATH_.'classes/handler/Handler.class.php';
+require_once _XE_PATH_.'classes/frontendfile/FrontEndFileHandler.class.php';
+
+class ContextTest extends PHPUnit_Framework_TestCase
+{
+	/**
+	 * test whether the singleton works
+	 */
+	public function testGetInstance()
+	{
+		$this->assertInstanceOf('Context', Context::getInstance());
+		$this->assertSame(Context::getInstance(), Context::getInstance());
+	}
+
+	public function testSetGetVars()
+	{
+		$this->assertSame(Context::get('var1'), null);
+		Context::set('var1', 'val1');
+		$this->assertSame(Context::get('var1'), 'val1');
+
+		Context::set('var2', 'val2');
+		$this->assertSame(Context::get('var2'), 'val2');
+		Context::set('var3', 'val3');
+		$data = new stdClass;
+		$data->var1 = 'val1';
+		$data->var2 = 'val2';
+		$this->assertEquals(Context::gets('var1','var2'), $data);
+		$data->var3 = 'val3';
+		$this->assertEquals(Context::getAll(), $data);
+	}
+
+	public function testAddGetBodyClass()
+	{
+		$this->assertEquals(Context::getBodyClass(), '');
+		Context::addBodyClass('red');
+		$this->assertEquals(Context::getBodyClass(), ' class="red"');
+		Context::addBodyClass('green');
+		$this->assertEquals(Context::getBodyClass(), ' class="red green"');
+		Context::addBodyClass('blue');
+		$this->assertEquals(Context::getBodyClass(), ' class="red green blue"');
+
+		// remove duplicated class
+		Context::addBodyClass('red');
+		$this->assertEquals(Context::getBodyClass(), ' class="red green blue"');
+	}
+
+	public function testRequsetResponseMethod()
+	{
+		$this->assertEquals(Context::getRequestMethod(), 'GET');
+
+		$_SERVER['REQUEST_METHOD'] = 'POST';
+		Context::setRequestMethod();
+		$this->assertEquals(Context::getRequestMethod(), 'POST');
+
+		$GLOBALS['HTTP_RAW_POST_DATA'] = 'abcde';
+		Context::setRequestMethod();
+		$this->assertEquals(Context::getRequestMethod(), 'XMLRPC');
+
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+		Context::setRequestMethod();
+		$this->assertEquals(Context::getRequestMethod(), 'JSON');
+
+		Context::setRequestMethod('POST');
+		$this->assertEquals(Context::getRequestMethod(), 'POST');
+
+		$this->assertEquals(Context::getResponseMethod(), 'HTML');
+		Context::setRequestMethod('JSON');
+		$this->assertEquals(Context::getResponseMethod(), 'JSON');
+
+		Context::setResponseMethod('WRONG_TYPE');
+		$this->assertEquals(Context::getResponseMethod(), 'HTML');
+		Context::setResponseMethod('XMLRPC');
+		$this->assertEquals(Context::getResponseMethod(), 'XMLRPC');
+		Context::setResponseMethod('HTML');
+		$this->assertEquals(Context::getResponseMethod(), 'HTML');
+	}
+}
+
+/* End of file ContextTest.php */
+/* Location: ./tests/classes/context/ContextTest.php */
diff --git a/tests/classes/db/Helper.class.php b/tests/classes/db/Helper.class.php
new file mode 100644
index 000000000..597d52ac3
--- /dev/null
+++ b/tests/classes/db/Helper.class.php
@@ -0,0 +1,23 @@
+<?php 
+
+	class Helper {
+		static function cleanString($query){
+			$query = trim(preg_replace('/\s+/', ' ',$query));
+                        $query = preg_replace('/\t+/', '',$query);
+			$query = str_replace(" , ", ', ', $query);
+                        $query = str_replace(" ,", ',', $query);
+			$query = str_replace("( ", '(', $query);
+			$query = str_replace(" )", ')', $query);
+                        $query = str_replace(array("\r", "\r\n", "\n"), '*', $query);
+			$query = strtolower($query);		
+			return $query;	
+		}              
+                
+                static function getXmlObject($xml_file){
+			$xmlParser = XmlQueryParser::getInstance();
+			return $xmlParser->getXmlFileContent($xml_file);
+		}
+                            
+	}
+
+?>
\ No newline at end of file
diff --git a/tests/classes/db/QueryTester.class.php b/tests/classes/db/QueryTester.class.php
new file mode 100644
index 000000000..3fc911044
--- /dev/null
+++ b/tests/classes/db/QueryTester.class.php
@@ -0,0 +1,320 @@
+<?php 
+
+// Only supports queries inside modules for now
+
+	class QueryTester {
+
+		function QueryTester(){
+			
+		}
+		
+		function getQueryPath($type, $name, $query_name){
+			return _XE_PATH_ . $type ."/".$name."/queries/" . $query_name . ".xml";
+		}
+		
+		function getNewParserOutput($xml_file){
+			$newXmlQueryParser = new XmlQueryParser();
+			$xml_obj = $newXmlQueryParser->getXmlFileContent($xml_file);		
+			$parser = new QueryParser($xml_obj->query);
+			return $parser->toString();
+		}
+		
+		function getOldParserOutput($query_id, $xml_file){
+			$cache_file = _TEST_PATH_ . "cache/".$query_id.'.cache.php';
+			$parser = new OldXmlQueryParser();
+			$parser->parse($query_id, $xml_file, $cache_file);
+			$buff = FileHandler::readFile($cache_file);
+			return $buff;		
+		}
+		
+		function cleanOutputAndAddArgs($outputString, $argsString = ''){
+			$outputString = str_replace("<?php if(!defined('__ZBXE__')) exit();", "", $outputString);
+			$outputString = str_replace("?>", "", $outputString);
+			$outputString = $argsString . $outputString;			
+			return $outputString;
+		}
+		
+		function getXmlFileContent($xml_file){
+			return FileHandler::readFile($xml_file);			
+		}
+		
+		function printOutput($output){
+			if(is_object($output)) {
+				var_dump($output); return;
+			}
+			$output = htmlspecialchars($output);
+			
+			$output = preg_replace('/select/i', 'SELECT', $output);
+			$output = preg_replace('/from/i', '<br/>FROM', $output);
+			$output = preg_replace('/where/i', '<br/>WHERE', $output);			
+			$output = preg_replace('/group by/i', '<br/>GROUP BY', $output);
+			$output = preg_replace('/order by/i', '<br/>ORDER BY', $output);
+			
+			$output = str_replace("\n", "<br/>", $output);
+			
+			echo '<pre class=prettyprint>'
+					.$output
+				.'</pre>';	
+		}
+		
+		function getNewParserOutputString($xml_file, $argsString){
+			$outputString = '';
+			$outputString = $this->getNewParserOutput($xml_file);
+			$outputString = $this->cleanOutputAndAddArgs($outputString, $argsString);
+			return $outputString;			
+		}
+		
+		function getNewParserQuery($outputString){	
+			//echo $outputString;
+			//exit(0);
+			$output = eval($outputString);
+			if(is_a($output, 'Object'))
+				if(!$output->toBool()) return("Date incorecte! Query-ul nu a putut fi executat.");
+			$db = new DBCubrid();
+			if($output->getAction() == 'select')
+				return $db->getSelectSql($output);
+			else if($output->getAction() == 'insert')
+				return $db->getInsertSql($output);
+			else if($output->getAction() == 'update')
+				return $db->getUpdateSql($output);
+			else if($output->getAction() == 'delete')
+				return $db->getDeleteSql($output);
+		}
+		
+		function testNewParser($xml_file, $escape_char, $argsString, $show_output_string){
+			$outputString = $this->getNewParserOutputString($xml_file, $escape_char, $argsString);
+			$query = $this->getNewParserQuery($outputString);
+			
+			echo '<tr>';
+			if($show_output_string){
+				echo '<td>';
+				$this->printOutput($outputString);
+				echo '</td>';
+			}
+			
+			echo '<td>';
+			$this->printOutput($query);
+			echo '</td>';
+			echo '</tr>';			
+		}
+
+		function getOldParserOutputString($query_id, $xml_file, $argsString){
+			$outputString = $this->getOldParserOutput($query_id, $xml_file);
+			$outputString = $this->cleanOutputAndAddArgs($outputString, $argsString);
+			return $outputString;			
+		}
+		
+		function getOldParserQuery($outputString){
+			$output = eval($outputString);
+			if(is_a($output, 'Object'))
+				if(!$output->toBool()) exit("Date incorecte! Query-ul nu a putut fi executat.");
+			
+			/*	SQL Server
+			 * 
+			$db = new DBMssql(false);
+			if($output->action == "select")
+				return $db->_executeSelectAct($output);
+			else if($output->action == "insert")
+				return $db->_executeInsertAct($output);
+			else if($output->action == "delete")
+				return $db->_executeDeleteAct($output);				
+			else if($output->action == "update")
+				return $db->_executeUpdateAct($output);
+			*/		
+
+			/*
+			 * Mysql  
+			 */
+			$db = new DBMysql(false);
+			if($output->action == "select")
+				$db->_executeSelectAct($output);
+			else if($output->action == "insert")
+				$db->_executeInsertAct($output);
+			else if($output->action == "delete")
+				$db->_executeDeleteAct($output);				
+			else if($output->action == "update")
+				$db->_executeUpdateAct($output);				
+			return $db->getLatestQuery();
+		}
+		
+		function testOldParser($query_id, $xml_file, $argsString, $show_output_string){
+			$outputString = $this->getOldParserOutputString($query_id, $xml_file, $argsString);
+			$query = $this->getOldParserQuery($outputString);
+			
+			
+			echo '<tr>';
+			if($show_output_string){
+				echo '<td>';
+				$this->printOutput($outputString);
+				echo '</td>';
+			}
+			
+			echo '<td>';
+			$this->printOutput($query);
+			echo '</td>';
+			echo '</tr>';					
+		}
+		
+		function showXmlInputFile($xml_file){
+			echo '<tr colspan=2>';
+			echo '<td>';
+			$xml_file_content = $this->getXmlFileContent($xml_file);
+			$this->printOutput($xml_file_content);		
+			echo '</td></tr>';	
+		}	
+		
+		function test($query_id, $xml_file, $argsString, $show_output_string, $escape_char = '"'){
+			echo "<h3>$query_id</h3>";
+			echo '<table border=1 cellpadding=5 cellspacing=0 width=50%>';
+
+			$this->showXmlInputFile($xml_file);
+
+			$this->testNewParser($xml_file, $escape_char, $argsString, $show_output_string);
+			
+			//$this->testOldParser($query_id, $xml_file, $argsString, $show_output_string);
+			
+			echo '</table>';			
+		}
+			
+		function test_addon_getAddonInfo($show_output_string = false){
+			$argsString = '$args->addon = "captcha";';
+			$this->test("modules.addon.getAddonInfo"
+						, $this->getQueryPath("modules", "addon", "getAddonInfo")
+						, $argsString
+						, $show_output_string);
+		}
+		
+		function test_addon_getAddons($show_output_string = false){
+			$argsString = '';
+			$this->test("modules.addon.getAddons"
+						, $this->getQueryPath("modules", "addon", "getAddons")
+						, $argsString
+						, $show_output_string);
+		}
+				
+		function test_admin_getCommentCount($show_output_string = false){
+			$argsString = '';
+			$this->test("modules.admin.getCommentCount"
+						, $this->getQueryPath("modules", "admin", "getCommentCount")
+						, $argsString
+						, $show_output_string);			
+		}		
+		
+		function test_admin_getCommentDeclaredStatus($show_output_string = false){
+			$argsString = '$args->date = "20110411";';
+			$this->test("modules.admin.getCommentDeclaredStatus"
+						, $this->getQueryPath("modules", "admin", "getCommentDeclaredStatus")
+						, $argsString
+						, $show_output_string);						
+		}		
+
+		function test_module_getDefaultModules($show_output_string = false){
+			$argsString = '';
+			$this->test("modules.module.getDefaultModules"
+						, $this->getQueryPath("modules", "module", "getDefaultModules")
+						, $argsString
+						, $show_output_string);				
+		}
+		
+		function test_module_getModuleCategories($show_output_string = false){
+			$argsString = '';
+			$this->test("modules.module.getModuleCategories"
+						, $this->getQueryPath("modules", "module", "getModuleCategories")
+						, $argsString
+						, $show_output_string);				
+		}		
+		
+		function test_module_getNonuniqueDomains($show_output_string = false){
+			$argsString = '';
+			$this->test("modules.module.getNonuniqueDomains"
+						, $this->getQueryPath("modules", "module", "getNonuniqueDomains")
+						, $argsString
+						, $show_output_string);				
+		}		
+
+		function test_module_getAdminId($show_output_string = false){
+			$argsString = '$args->module_srl = 23;';
+			$this->test("modules.module.getAdminId"
+						, $this->getQueryPath("modules", "module", "getAdminId")
+						, $argsString
+						, $show_output_string);				
+		}			
+		function test_module_getSiteInfo($show_output_string = false){
+			$argsString = '$args->site_srl = 0;';
+			$this->test("modules.module.getSiteInfo"
+						, $this->getQueryPath("modules", "module", "getSiteInfo")
+						, $argsString
+						, $show_output_string);				
+		}
+		function test_module_insertModule($show_output_string = false){
+			$argsString = ' $args->module_category_srl = 0; 
+							$args->browser_title = "test";
+							$args->layout_srl = 0;
+							$args->mlayout_srl = 0;
+							$args->module = "page";
+							$args->mid = "test";
+							$args->site_srl = 0;
+							$args->module_srl = 47374;';
+			$this->test("modules.module.insertModule"
+						, $this->getQueryPath("modules", "module", "insertModule")
+						, $argsString
+						, $show_output_string);				
+		}
+		function test_module_updateModule($show_output_string = false){
+			$argsString = ' $args->module_category_srl = 0; 
+							$args->browser_title = "test";
+							$args->layout_srl = 0;
+							$args->mlayout_srl = 0;
+							$args->module = "page";
+							$args->mid = "test";
+							$args->use_mobile = "";
+							$args->site_srl = 0;
+							$args->module_srl = 47374;';
+			$this->test("modules.module.updateModule"
+						, $this->getQueryPath("modules", "module", "updateModule")
+						, $argsString
+						, $show_output_string);				
+		}
+		function test_admin_deleteActionForward($show_output_string = false){
+			$argsString = '$args->module = "page";
+							$args->type = "page";
+							$args->act = "tata";';
+			$this->test("modules.admin.deleteActionForward"
+						, $this->getQueryPath("modules", "module", "deleteActionForward")
+						, $argsString
+						, $show_output_string);			
+		}
+		
+		function test_member_getAutologin($show_output_string = false){
+			$argsString = '$args->autologin_key = 10;';
+			$this->test("modules.member.getAutologin"
+						, $this->getQueryPath("modules", "member", "getAutologin")
+						, $argsString
+						, $show_output_string);					
+		}
+		
+		function test_opage_getOpageList($show_output_string = false){
+			$argsString = '$args->s_title = "yuhuu";
+							$args->module = 12;';
+			$this->test("modules.opage.getOpageList"
+						, $this->getQueryPath("modules", "opage", "getOpageList")
+						, $argsString
+						, $show_output_string);					
+		}
+		function test_getPageList($show_output_string = false){
+			$argsString = '$args->sort_index = "module_srl";
+            $args->page_count = 10;
+            $args->s_module_category_srl = 0;
+			$args->s_mid = "test";
+			$args->s_browser_title = "caca";';
+
+			$this->test("modules.page.getPageList"
+						, $this->getQueryPath("modules", "page", "getPageList")
+						, $argsString
+						, $show_output_string);					
+		}
+		
+		
+
+	}
+?>
\ No newline at end of file
diff --git a/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php b/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php
new file mode 100644
index 000000000..2e5f317f7
--- /dev/null
+++ b/tests/classes/db/classes/db/queryparts/condition/ConditionWithArgumentTest.php
@@ -0,0 +1,92 @@
+<?php
+
+/**
+ * Test class for ConditionWithArgument.
+ */
+class ConditionWithArgumentTest extends CubridTest {
+
+     /**
+     * Checks equal operation
+     */
+    public function testConditionString_Equal_WithoutPipe_NumericValue() {
+        $member_srl_argument = new ConditionArgument('"member_srl"', 20, 'equal');
+
+        $tag = new ConditionWithArgument('"member_srl"', $member_srl_argument, 'equal', null);
+
+        $this->assertEquals(' "member_srl" = 20', $tag->toString());
+    }
+
+     /**
+     * Checks equal operation
+     */
+    public function testConditionString_Equal_WithPipe_NumericValue() {
+        $member_srl_argument = new ConditionArgument('"member_srl"', 20, 'equal');
+
+        $tag = new ConditionWithArgument('"member_srl"', $member_srl_argument, 'equal', 'and');
+
+        $this->assertEquals('and "member_srl" = 20', $tag->toString());
+    }
+
+     /**
+     * Checks condition returns nothing when argument is not valid
+     */
+    public function testConditionString_InvalidArgument() {
+        $member_srl_argument = new ConditionArgument('"member_srl"', null, 'equal');
+        $member_srl_argument->checkNotNull();
+
+        $tag = new ConditionWithArgument('"member_srl"', $member_srl_argument, 'equal', 'and');
+
+        $this->assertEquals('', $tag->toString());
+    }
+
+     /**
+     * Checks "in" operation
+     */
+    public function testConditionString_In_VarcharArray() {
+        $member_srl_argument = new ConditionArgument('"member_srl"', array('a', 'b', 'c'), 'in');
+        $member_srl_argument->createConditionValue();
+        $member_srl_argument->setColumnType('varchar');
+
+        $tag = new ConditionWithArgument('"member_srl"', $member_srl_argument, 'in');
+
+        $this->assertEquals(' "member_srl" in (\'a\',\'b\',\'c\')', $tag->toString());
+    }
+
+     /**
+     * Checks and operation
+     */
+    public function testConditionString_And() {
+        $tag = new ConditionWithoutArgument('"member_srl"', "20", 'and', null);
+
+        $this->assertEquals(' "member_srl" & 20', $tag->toString());
+    }
+
+     /**
+     * Checks or operation
+     */
+    public function testConditionString_Or() {
+        $tag = new ConditionWithoutArgument('"member_srl"', "20", 'or', null);
+
+        $this->assertEquals(' "member_srl" | 20', $tag->toString());
+    }
+
+     /**
+     * Checks xor operation
+     */
+    public function testConditionString_Xor() {
+        $tag = new ConditionWithoutArgument('"member_srl"', "20", 'xor', null);
+
+        $this->assertEquals(' "member_srl" ^ 20', $tag->toString());
+    }
+
+     /**
+     * Checks not operation
+     */
+    public function testConditionString_Not() {
+        $tag = new ConditionWithoutArgument('"member_srl"', "20", 'not', null);
+
+        $this->assertEquals(' "member_srl" ~ 20', $tag->toString());
+    }
+}
+
+?>
diff --git a/tests/classes/db/classes/db/queryparts/table/TableTest.php b/tests/classes/db/classes/db/queryparts/table/TableTest.php
new file mode 100644
index 000000000..df389a826
--- /dev/null
+++ b/tests/classes/db/classes/db/queryparts/table/TableTest.php
@@ -0,0 +1,42 @@
+<?php
+
+ /**
+ * Test class for Table.
+ */
+class TableTest extends CubridTest
+{
+    /**
+     * @var Table
+     */
+    protected $object;
+
+    protected function setUp()
+    {
+        $this->object = new Table('"xe_member"', '"m"');
+    }
+
+    protected function tearDown()
+    {
+    }
+
+    public function testToString()
+    {
+        $this->assertEquals('"xe_member" as "m"', $this->object->toString());
+    }
+
+    public function testGetName()
+    {
+        $this->assertEquals('"xe_member"', $this->object->getName());
+    }
+
+    public function testGetAlias()
+    {
+        $this->assertEquals('"m"', $this->object->getAlias());
+    }
+
+    public function testIsJoinTable()
+    {
+       $this->assertEquals(false, $this->object->isJoinTable());
+    }
+}
+?>
diff --git a/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php b/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php
new file mode 100644
index 000000000..905936df4
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/argument/ArgumentTest.php
@@ -0,0 +1,280 @@
+<?php
+
+/**
+ * Test class for Argument.
+ * Generated by PHPUnit on 2011-07-07 at 16:51:29.
+ */
+class ArgumentTest extends CubridTest {
+
+    public function testErrorMessageIsSent_NotNullCheck(){
+        global $lang;
+        include(_TEST_PATH_ . "classes/xml/xmlquery/argument/data/en.lang.php");
+        $page_argument = new Argument('page', $args->page);
+        $page_argument->checkNotNull();
+        $this->assertFalse($page_argument->isValid());
+        $this->assertEquals("Please input a value for page", $page_argument->getErrorMessage()->message);
+    }
+
+    public function testErrorMessageIsSent_MinLengthCheck(){
+        global $lang;
+        include(_TEST_PATH_ . "classes/xml/xmlquery/argument/data/en.lang.php");
+
+        $args->page = '123';
+        $page_argument = new Argument('page', $args->page);
+        $page_argument->checkMinLength(6);
+        $this->assertFalse($page_argument->isValid());
+        $this->assertEquals("Please align the text length of page", $page_argument->getErrorMessage()->message);
+    }
+
+    public function testErrorMessageIsSent_MaxLengthCheck(){
+        global $lang;
+        include(_TEST_PATH_ . "classes/xml/xmlquery/argument/data/en.lang.php");
+
+        $args->page = '123';
+        $page_argument = new Argument('page', $args->page);
+        $page_argument->checkMaxLength(2);
+        $this->assertFalse($page_argument->isValid());
+        $this->assertEquals("Please align the text length of page", $page_argument->getErrorMessage()->message);
+    }
+
+    /**
+     * @todo Implement testGetType().
+     */
+    public function testGetType() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSetColumnType().
+     */
+    public function testSetColumnType() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetName().
+     */
+    public function testGetName() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetValue().
+     */
+    public function testGetValue() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetUnescapedValue().
+     */
+    public function testGetUnescapedValue() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testToString().
+     */
+    public function testToString() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testEscapeValue().
+     */
+    public function testEscapeValue() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testIsValid().
+     */
+    public function testIsValid() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetErrorMessage().
+     */
+    public function testGetErrorMessage() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testEnsureDefaultValue().
+     */
+    public function testEnsureDefaultValue() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCheckFilter().
+     */
+    public function testCheckFilter() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCheckMaxLength().
+     */
+    public function testCheckMaxLength() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testCheckMinLength().
+     */
+    public function testCheckMinLength() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * Checks that argument is valid after a notnull check when value is not null
+     */
+    public function testCheckNotNullWhenNotNull() {
+        $member_srl_argument = new ConditionArgument('member_srl', 20, 'equal');
+        $member_srl_argument->checkNotNull();
+
+        $this->assertEquals(true, $member_srl_argument->isValid());
+    }
+
+    /**
+     * Checks that argument becomes invalid after a notnull check when value is null
+     */
+    public function testCheckNotNullWhenNull() {
+        $member_srl_argument = new ConditionArgument('member_srl', null, 'equal');
+        $member_srl_argument->checkNotNull();
+
+        $this->assertEquals(false, $member_srl_argument->isValid());
+    }
+
+    /**
+     * Checks that argument value stays the same when both user value and default value are given
+     */
+    public function testCheckDefaultValueWhenNotNull() {
+        $member_srl_argument = new ConditionArgument('member_srl', 20, 'equal');
+        $member_srl_argument->ensureDefaultValue(25);
+
+        $this->assertEquals(20, $member_srl_argument->getValue());
+    }
+
+    /**
+     * Checks that argument value gets set when user value is null and default value is specified
+     */
+    public function testCheckDefaultValueWhenNull() {
+        $member_srl_argument = new ConditionArgument('member_srl', null, 'equal');
+        $member_srl_argument->ensureDefaultValue(25);
+
+        $this->assertEquals(25, $member_srl_argument->getValue());
+    }
+
+     /**
+     * Checks like prefix operation
+     */
+    public function testCreateConditionValue_LikePrefix() {
+        $member_srl_argument = new ConditionArgument('"mid"', 'forum', 'like_prefix');
+        $member_srl_argument->createConditionValue();
+
+        $this->assertEquals('\'forum%\'', $member_srl_argument->getValue());
+    }
+
+     /**
+     * Checks like tail operation
+     */
+    public function testCreateConditionValue_LikeTail() {
+        $member_srl_argument = new ConditionArgument('"mid"', 'forum', 'like_tail');
+        $member_srl_argument->createConditionValue();
+
+        $this->assertEquals('\'%forum\'', $member_srl_argument->getValue());
+    }
+
+     /**
+     * Checks like operation
+     */
+    public function testCreateConditionValue_Like() {
+        $member_srl_argument = new ConditionArgument('"mid"', 'forum', 'like');
+        $member_srl_argument->createConditionValue();
+
+        $this->assertEquals('\'%forum%\'', $member_srl_argument->getValue());
+    }
+
+
+     /**
+     * Checks in operation
+     */
+    public function testCreateConditionValue_In_StringValues() {
+        $member_srl_argument = new ConditionArgument('"mid"', array('forum', 'board'), 'in');
+        $member_srl_argument->createConditionValue();
+        $member_srl_argument->setColumnType('varchar');
+
+        $this->assertEquals('(\'forum\',\'board\')', $member_srl_argument->getValue());
+    }
+
+     /**
+     * Checks in operation
+     */
+    public function testCreateConditionValue_In_NumericValues() {
+        $member_srl_argument = new ConditionArgument('"module_srl"', array(3, 21), 'in');
+        $member_srl_argument->setColumnType('number');
+        $member_srl_argument->createConditionValue();
+
+        $this->assertEquals('(3,21)', $member_srl_argument->getValue());
+    }
+
+    public function testEnsureDefaultValueWithEmptyString(){
+        $homepage_argument = new Argument('homepage', '');
+        $homepage_argument->ensureDefaultValue('');
+        $homepage_argument->checkFilter('homepage');
+        if(!$homepage_argument->isValid()) return $homepage_argument->getErrorMessage();
+        $homepage_argument->setColumnType('varchar');
+
+
+        $this->assertEquals('\'\'', $homepage_argument->getValue());
+    }
+
+    public function testDefaultValue() {
+        $default = new DefaultValue("var", '');
+        $this->assertEquals('\'\'', $default->toString());
+    }
+}
+
+?>
diff --git a/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php b/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php
new file mode 100644
index 000000000..17b43a3b5
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/argument/ConditionArgumentTest.php
@@ -0,0 +1,64 @@
+<?php
+
+/**
+ * Test class for ConditionArgument.
+ */
+class ConditionArgumentTest extends CubridTest {
+
+    function testIn(){
+        $args->document_srl = 1234;
+        $document_srl_argument = new ConditionArgument('document_srl', $args->document_srl, 'in');
+        $document_srl_argument->checkNotNull();
+        $document_srl_argument->createConditionValue();
+        if(!$document_srl_argument->isValid()) return $document_srl_argument->getErrorMessage();
+        $document_srl_argument->setColumnType('number');
+
+        $condition = new ConditionWithArgument('"extra_vars"."document_srl"',$document_srl_argument,"in", 'and');
+        $this->assertEquals('and "extra_vars"."document_srl" in (1234)', $condition->toString());
+    }
+
+    function testZeroValue(){
+        $args->site_srl = 0;
+        $site_srl_argument = new ConditionArgument('site_srl', $args->site_srl, 'equal');
+        $site_srl_argument->checkNotNull();
+        $site_srl_argument->createConditionValue();
+        if(!$site_srl_argument->isValid()) return $site_srl_argument->getErrorMessage();
+        $site_srl_argument->setColumnType('number');
+
+        $condition = new ConditionWithArgument('"sites"."site_srl"',$site_srl_argument,"equal");
+        $this->assertEquals(' "sites"."site_srl" = 0', $condition->toString());
+    }
+
+    /**
+     * @todo Implement testCreateConditionValue().
+     */
+    public function testCreateConditionValue() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testGetType().
+     */
+    public function testGetType() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+    /**
+     * @todo Implement testSetColumnType().
+     */
+    public function testSetColumnType() {
+        // Remove the following lines when you implement this test.
+        $this->markTestIncomplete(
+                'This test has not been implemented yet.'
+        );
+    }
+
+}
+
+?>
diff --git a/common/lang/en.lang.php b/tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php
similarity index 97%
rename from common/lang/en.lang.php
rename to tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php
index ab831a18d..0f4def84e 100644
--- a/common/lang/en.lang.php
+++ b/tests/classes/db/classes/xml/xmlquery/argument/data/en.lang.php
@@ -1,322 +1,322 @@
-<?php
-/**
- * @file   common/lang/en.lang.php
- * @author NHN (developers@xpressengine.com)
- * @brief  English Language Pack (Only basic words are included here)
- **/
-
-// words for action, which is basically used
-$lang->cmd_write = 'Write';
-$lang->cmd_reply = 'Reply';
-$lang->cmd_delete = 'Delete';
-$lang->cmd_modify = 'Modify';
-$lang->cmd_edit = 'Edit';
-$lang->cmd_view = 'View';
-$lang->cmd_view_all = 'View All';
-$lang->cmd_list = 'List';
-$lang->cmd_prev = 'Prev';
-$lang->cmd_next = 'Next';
-$lang->cmd_send_trackback = 'Send Trackback';
-$lang->cmd_registration = $lang->cmd_submit = 'Submit';
-$lang->cmd_comment_registration = 'Add Comment';
-$lang->cmd_insert = 'Insert';
-$lang->cmd_save = 'Save';
-$lang->cmd_load = 'Load';
-$lang->cmd_input = 'Input';
-$lang->cmd_search = 'Search';
-$lang->cmd_find = 'Find';
-$lang->cmd_replace = 'Replace';
-$lang->cmd_confirm = 'Confirm';
-$lang->cmd_cancel = 'Cancel';
-$lang->cmd_back = 'Go Back';
-$lang->cmd_vote = 'Recommend';
-$lang->cmd_vote_down = 'Criticize';
-$lang->cmd_declare = 'Accuse';
-$lang->cmd_cancel_declare = 'Cancel Accuse';
-$lang->cmd_declared_list = 'Accusations List';
-$lang->cmd_copy = 'Copy';
-$lang->cmd_move = 'Move';
-$lang->cmd_move_up = 'Up';
-$lang->cmd_move_down = 'Down';
-$lang->cmd_add_indent = 'Indent';
-$lang->cmd_remove_indent = 'Outdent';
-$lang->cmd_management = 'Manage';
-$lang->cmd_make = 'Create';
-$lang->cmd_select = 'Select';
-$lang->cmd_select_all = 'Select All';
-$lang->cmd_unselect_all = 'Deselect All';
-$lang->cmd_reverse_all = 'Reverse';
-$lang->cmd_close_all = 'Close All';
-$lang->cmd_open_all = 'Open All';
-$lang->cmd_reload = 'Reload';
-$lang->cmd_close = 'Close';
-$lang->cmd_open = 'Open';
-$lang->cmd_setup = 'Configure';
-$lang->cmd_addition_setup = 'Additional Setup';
-$lang->cmd_option = 'Option';
-$lang->cmd_apply = 'Apply';
-$lang->cmd_open_calendar = 'Select a Date';
-$lang->cmd_send = 'Send';
-$lang->cmd_print = 'Print';
-$lang->cmd_scrap = 'Scrap';
-$lang->cmd_preview = 'Preview';
-$lang->cmd_reset = 'Reset';
-$lang->cmd_remake_cache = "Re-create cache file";
-$lang->cmd_publish = "Publish";
-$lang->cmd_layout_setup = 'Configure layout';
-$lang->cmd_layout_edit = 'Edit layout';
-$lang->cmd_search_by_ipaddress = 'Search by IP Address';
-$lang->cmd_add_ip_to_spamfilter = 'Add IP to spamfilter';
-
-$lang->enable = 'Enable';
-$lang->disable = 'Disable';
-
-// Essential Words
-$lang->menu = 'Menu';
-$lang->no = 'No.';
-$lang->notice = 'Notice';
-$lang->secret = 'Secret';
-$lang->category = $lang->category_srl = 'Category';
-$lang->none_category = 'None category';
-$lang->none_image = 'Image does not exist';
-$lang->document_srl = 'Doc. No.';
-$lang->user_id = 'User ID';
-$lang->author = 'Developer';
-$lang->password = 'Password';
-$lang->password1 = 'Password';
-$lang->password2 = 'Retype Password';
-$lang->admin_id = 'Admin ID';
-$lang->writer = 'Author';
-$lang->user_name = 'User Name';
-$lang->nick_name = 'Nick Name';
-$lang->email_address = 'Email';
-$lang->homepage = 'Homepage';
-$lang->blog = 'Blog';
-$lang->birthday = 'Birthday';
-$lang->browser_title = 'Browser Title';
-$lang->title = 'Subject';
-$lang->title_content = 'Subject+Content';
-$lang->topic = 'Topic';
-$lang->replies = 'Reply';
-$lang->content = 'Content';
-$lang->document = 'Article';
-$lang->comment = 'Comment';
-$lang->description = 'Description';
-$lang->trackback = 'Trackback';
-$lang->tag = 'Tag';
-$lang->allow_comment = 'Allow Comments';
-$lang->lock_comment = 'Block Comments';
-$lang->allow_trackback = 'Allow Trackbacks';
-$lang->uploaded_file = 'Attachment';
-$lang->grant = 'Permission';
-$lang->target = 'Target';
-$lang->total = 'Total';
-$lang->total_count = 'Count Total';
-$lang->ipaddress = 'IP Address';
-$lang->path = 'Path';
-$lang->cart = 'Selected Item';
-$lang->friend = 'Friends';
-$lang->notify = 'Notification';
-$lang->order_target = 'Align Target';
-$lang->order_type = 'Sorting Type';
-$lang->order_asc = 'ascend';
-$lang->order_desc = 'descend';
-$lang->file = 'file';
-
-$lang->mid = 'Module Name';
-$lang->sid = 'Site Name';
-$lang->layout = 'Layout';
-$lang->mobile_layout = 'Mobile Layout';
-$lang->widget = 'Widget';
-$lang->module = 'Module';
-$lang->skin = 'Theme';
-$lang->mobile_skin = 'Mobile Theme';
-$lang->colorset = 'Colorset';
-$lang->extra_vars = 'Extra Vars';
-
-$lang->domain = "Domain Name";
-$lang->url = "URL";
-$lang->document_url = 'Article URL';
-$lang->trackback_url = 'Trackback URL';
-$lang->blog_name = 'Blog Title';
-$lang->excerpt = 'Quotation';
-
-$lang->document_count = 'Total Articles';
-$lang->page_count = 'Page Count';
-$lang->list_count = 'List Count';
-$lang->search_list_count = 'Search List Count';
-$lang->readed_count = 'Views';
-$lang->voted_count = 'Votes';
-$lang->comment_count = 'Comments';
-$lang->member_count = 'Member Count';
-$lang->date = 'Date';
-$lang->regdate = 'Registered Date';
-$lang->last_update = 'Last Update';
-$lang->last_post = 'Last Post';
-$lang->signup_date = 'Sign up Date';
-$lang->last_login = 'Last Sign in';
-$lang->first_page = 'First Page';
-$lang->last_page = 'Last Page';
-$lang->search_target = 'Target for Search';
-$lang->search_keyword = 'Keyword';
-$lang->is_default = 'Default';
-
-$lang->no_documents = 'No Articles';
-
-$lang->board_manager = 'Board Settings';
-$lang->member_manager = 'Member Settings';
-$lang->layout_manager = 'Layout Settings';
-
-$lang->use = 'Use';
-$lang->notuse = 'Not use';
-$lang->not_exists = "Doesn't exist";
-
-$lang->public = 'public';
-$lang->private = 'private';
-
-$lang->unit_sec = 'sec';
-$lang->unit_min = 'min';
-$lang->unit_hour = 'hr';
-$lang->unit_day = 'th';
-$lang->unit_month = 'month';
-$lang->unit_year = 'year';
-
-$lang->unit_week = array(
-	'Monday' => 'Monday',
-	'Tuesday' => 'Tuesday',
-	'Wednesday' => 'Wednesday',
-	'Thursday' => 'Thursday',
-	'Friday' => 'Friday',
-	'Saturday' => 'Saturday',
-	'Sunday' => 'Sunday',
-);
-
-$lang->unit_meridiem = array(
-	'am' => 'am',
-	'pm' => 'pm',
-	'AM' => 'AM',
-	'PM' => 'PM',
-);
-
-$lang->time_gap = array(
-	'min' => '%d minute ago',
-	'mins' => '%d minutes ago',
-	'hour' => '%d hour ago',
-	'hours' => '%d hours ago',
-);
-
-// Descriptions
-$lang->about_tag = 'You may submit multiple tags by inserting commas(,) between each tag';
-$lang->about_layout = 'Layouts decorate the appearance of your modules. you can configure them from Layout menu on the top';
-
-// Messages
-$lang->msg_call_server = 'Requesting to the server, please wait';
-$lang->msg_db_not_setted = 'DB configuration has not been set';
-$lang->msg_dbconnect_failed = "Error has occurred while connecting DB.\nPlease check DB information again";
-$lang->msg_invalid_queryid = 'Specified query ID value is invalid';
-$lang->msg_not_permitted = 'You do not have permission to access';
-$lang->msg_input_password = 'Please input the password';
-$lang->msg_invalid_document = 'Invalid Article Number';
-$lang->msg_invalid_request = 'Invalid Request';
-$lang->msg_invalid_password = 'Invalid Password';
-$lang->msg_error_occured = 'An error has occured';
-$lang->msg_not_founded = 'Target could not be found';
-$lang->msg_no_result = 'Nothing found';
-$lang->msg_fail_to_request_open = 'Fail to open your request';
-$lang->msg_invalid_format = 'Invalid Format';
-
-$lang->msg_not_permitted_act = 'You do not have permission to execute requested action';
-$lang->msg_module_does_not_exist = "Couldn't find the requested module.\nPlease contact the administrator.";
-$lang->msg_module_is_not_standalone = 'Requested module cannot be executed independently';
-$lang->msg_default_url_is_not_defined = 'Default URL is not defined';
-
-$lang->success_registed = 'Registered successfully';
-$lang->success_declared = 'Accused successfully';
-$lang->success_updated = 'Updated successfully';
-$lang->success_deleted = 'Deleted successfully';
-$lang->success_voted = 'Recommended successfully';
-$lang->success_blamed = 'Blamed successfully';
-$lang->success_moved = 'Moved successfully';
-$lang->success_sended = 'Sent successfully';
-$lang->success_reset = 'Reset successfully';
-$lang->success_leaved = 'All member data have been deleted completely.';
-$lang->success_saved = 'Saved successfully';
-
-$lang->fail_to_delete = 'Could not be deleted';
-$lang->fail_to_move = 'Could not be moved';
-
-$lang->failed_voted = 'Could not recommend';
-$lang->failed_blamed = 'Could not blame';
-$lang->failed_declared = 'Could not accuse';
-$lang->fail_to_delete_have_children = 'Please try again after removing replies first';
-
-$lang->confirm_submit = 'Are you sure to submit?';
-$lang->confirm_logout = 'Are you sure to logout?';
-$lang->confirm_vote = 'Are you sure to recommend?';
-$lang->confirm_delete = 'Are you sure to delete?';
-$lang->confirm_move = 'Are you sure to move?';
-$lang->confirm_reset = 'Are you sure to reset?';
-$lang->confirm_leave = 'Are you sure to leave?';
-$lang->confirm_update = 'Are you sure to update?';
-
-$lang->column_type = 'Column Type';
-$lang->column_type_list['text'] = 'one-line text';
-$lang->column_type_list['homepage'] = 'url';
-$lang->column_type_list['email_address'] = 'email';
-$lang->column_type_list['tel'] = 'phone number';
-$lang->column_type_list['textarea'] = 'multi-line textarea';
-$lang->column_type_list['checkbox'] = 'checkbox (multiple selection)';
-$lang->column_type_list['select'] = 'select box (single selection)';
-$lang->column_type_list['radio'] = 'radio button (radio)';
-$lang->column_type_list['kr_zip'] = 'zip code (Korean)';
-$lang->column_type_list['date'] = 'date (yyyy/mm/dd)';
-//$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
-$lang->column_name = 'Column Name';
-$lang->column_title = 'Column Title';
-$lang->default_value = 'Default Value';
-$lang->is_active = 'Active';
-$lang->is_required = 'Required Field';
-$lang->eid = 'Name of extra variable';
-
-// ftp-related
-$lang->ftp_form_title = 'FTP Account Information';
-$lang->ftp = 'FTP';
-$lang->ftp_host = 'FTP hostname';
-$lang->ftp_port = 'FTP port';
-$lang->about_ftp_password = 'FTP password will not be stored';
-$lang->cmd_check_ftp_connect = 'Check FTP Connection';
-$lang->about_ftp_info = "
-	FTP account information can be used in following cases. <br />
-	1. If safe_mode setting of PHP is on, XE will be installed using FTP.  <br />
-	2. Automatic updates might use FTP information. <br />
-	   This account info will be stored in files/config/ftp.config.php <br />
-	   After installation, you can modify or delete the account info at the administration page. <br />
-";
-
-$lang->msg_safe_mode_ftp_needed = "If safe_mode setting of PHP is on, you should input FTP account information to install XE.";
-$lang->msg_ftp_not_connected = "Connection to localhost via FTP failed. Please check the port number and if FTP service is available.";
-$lang->msg_ftp_invalid_auth_info = "Authentication failed. Please check the username and password.";
-$lang->msg_ftp_mkdir_fail = "Directory creation failed. Please check the permission of FTP account.";
-$lang->msg_ftp_chmod_fail = "Chmod failed. Please check the permission and configuration of FTP server.";
-$lang->msg_ftp_connect_success = "Connection and authentication to the FTP server succeeded.";
-
-$lang->ftp_path_title = 'FTP Path Information';
-$lang->msg_ftp_installed_realpath = 'Absolute Path of XE';
-$lang->msg_ftp_installed_ftp_realpath = 'Absolute FTP Path of XE';
-
-// Alert messages for Javascript using by XML filter
-$lang->filter->isnull = 'Please input a value for %s';
-$lang->filter->outofrange = 'Please align the text length of %s';
-$lang->filter->equalto = "The value of %s is invalid";
-$lang->filter->invalid_email = "The format of %s is invalid. ex) developers@xpressengine.com";
-$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "The format of %s is invalid.\\nAll values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet";
-$lang->filter->invalid_homepage = "The format of %s is invalid. ex) http://xpressengine.com/";
-$lang->filter->invalid_korean = "The format of %s is invalid. Please input Korean only";
-$lang->filter->invalid_korean_number = "The format of %s is invalid. Please input Korean or numbers";
-$lang->filter->invalid_alpha = "The format of %s is invalid. Please input alphabets only";
-$lang->filter->invalid_alpha_number = "The format of %s is invalid. Please input alphabets or numbers";
-$lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only";
-
-$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
-$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
+<?php
+/**
+ * @file   common/lang/en.lang.php
+ * @author NHN (developers@xpressengine.com)
+ * @brief  English Language Pack (Only basic words are included here)
+ **/
+
+// words for action, which is basically used
+$lang->cmd_write = 'Write';
+$lang->cmd_reply = 'Reply';
+$lang->cmd_delete = 'Delete';
+$lang->cmd_modify = 'Modify';
+$lang->cmd_edit = 'Edit';
+$lang->cmd_view = 'View';
+$lang->cmd_view_all = 'View All';
+$lang->cmd_list = 'List';
+$lang->cmd_prev = 'Prev';
+$lang->cmd_next = 'Next';
+$lang->cmd_send_trackback = 'Send Trackback';
+$lang->cmd_registration = $lang->cmd_submit = 'Submit';
+$lang->cmd_comment_registration = 'Add Comment';
+$lang->cmd_insert = 'Insert';
+$lang->cmd_save = 'Save';
+$lang->cmd_load = 'Load';
+$lang->cmd_input = 'Input';
+$lang->cmd_search = 'Search';
+$lang->cmd_find = 'Find';
+$lang->cmd_replace = 'Replace';
+$lang->cmd_confirm = 'Confirm';
+$lang->cmd_cancel = 'Cancel';
+$lang->cmd_back = 'Go Back';
+$lang->cmd_vote = 'Recommend';
+$lang->cmd_vote_down = 'Criticize';
+$lang->cmd_declare = 'Accuse';
+$lang->cmd_cancel_declare = 'Cancel Accuse';
+$lang->cmd_declared_list = 'Accusations List';
+$lang->cmd_copy = 'Copy';
+$lang->cmd_move = 'Move';
+$lang->cmd_move_up = 'Up';
+$lang->cmd_move_down = 'Down';
+$lang->cmd_add_indent = 'Indent';
+$lang->cmd_remove_indent = 'Outdent';
+$lang->cmd_management = 'Manage';
+$lang->cmd_make = 'Create';
+$lang->cmd_select = 'Select';
+$lang->cmd_select_all = 'Select All';
+$lang->cmd_unselect_all = 'Deselect All';
+$lang->cmd_reverse_all = 'Reverse';
+$lang->cmd_close_all = 'Close All';
+$lang->cmd_open_all = 'Open All';
+$lang->cmd_reload = 'Reload';
+$lang->cmd_close = 'Close';
+$lang->cmd_open = 'Open';
+$lang->cmd_setup = 'Configure';
+$lang->cmd_addition_setup = 'Additional Setup';
+$lang->cmd_option = 'Option';
+$lang->cmd_apply = 'Apply';
+$lang->cmd_open_calendar = 'Select a Date';
+$lang->cmd_send = 'Send';
+$lang->cmd_print = 'Print';
+$lang->cmd_scrap = 'Scrap';
+$lang->cmd_preview = 'Preview';
+$lang->cmd_reset = 'Reset';
+$lang->cmd_remake_cache = "Re-create cache file";
+$lang->cmd_publish = "Publish";
+$lang->cmd_layout_setup = 'Configure layout';
+$lang->cmd_layout_edit = 'Edit layout';
+$lang->cmd_search_by_ipaddress = 'Search by IP Address';
+$lang->cmd_add_ip_to_spamfilter = 'Add IP to spamfilter';
+
+$lang->enable = 'Enable';
+$lang->disable = 'Disable';
+
+// Essential Words
+$lang->menu = 'Menu';
+$lang->no = 'No.';
+$lang->notice = 'Notice';
+$lang->secret = 'Secret';
+$lang->category = $lang->category_srl = 'Category';
+$lang->none_category = 'None category';
+$lang->none_image = 'Image does not exist';
+$lang->document_srl = 'Doc. No.';
+$lang->user_id = 'User ID';
+$lang->author = 'Developer';
+$lang->password = 'Password';
+$lang->password1 = 'Password';
+$lang->password2 = 'Retype Password';
+$lang->admin_id = 'Admin ID';
+$lang->writer = 'Author';
+$lang->user_name = 'User Name';
+$lang->nick_name = 'Nick Name';
+$lang->email_address = 'Email';
+$lang->homepage = 'Homepage';
+$lang->blog = 'Blog';
+$lang->birthday = 'Birthday';
+$lang->browser_title = 'Browser Title';
+$lang->title = 'Subject';
+$lang->title_content = 'Subject+Content';
+$lang->topic = 'Topic';
+$lang->replies = 'Reply';
+$lang->content = 'Content';
+$lang->document = 'Article';
+$lang->comment = 'Comment';
+$lang->description = 'Description';
+$lang->trackback = 'Trackback';
+$lang->tag = 'Tag';
+$lang->allow_comment = 'Allow Comments';
+$lang->lock_comment = 'Block Comments';
+$lang->allow_trackback = 'Allow Trackbacks';
+$lang->uploaded_file = 'Attachment';
+$lang->grant = 'Permission';
+$lang->target = 'Target';
+$lang->total = 'Total';
+$lang->total_count = 'Count Total';
+$lang->ipaddress = 'IP Address';
+$lang->path = 'Path';
+$lang->cart = 'Selected Item';
+$lang->friend = 'Friends';
+$lang->notify = 'Notification';
+$lang->order_target = 'Align Target';
+$lang->order_type = 'Sorting Type';
+$lang->order_asc = 'ascend';
+$lang->order_desc = 'descend';
+$lang->file = 'file';
+
+$lang->mid = 'Module Name';
+$lang->sid = 'Site Name';
+$lang->layout = 'Layout';
+$lang->mobile_layout = 'Mobile Layout';
+$lang->widget = 'Widget';
+$lang->module = 'Module';
+$lang->skin = 'Theme';
+$lang->mobile_skin = 'Mobile Theme';
+$lang->colorset = 'Colorset';
+$lang->extra_vars = 'Extra Vars';
+
+$lang->domain = "Domain Name";
+$lang->url = "URL";
+$lang->document_url = 'Article URL';
+$lang->trackback_url = 'Trackback URL';
+$lang->blog_name = 'Blog Title';
+$lang->excerpt = 'Quotation';
+
+$lang->document_count = 'Total Articles';
+$lang->page_count = 'Page Count';
+$lang->list_count = 'List Count';
+$lang->search_list_count = 'Search List Count';
+$lang->readed_count = 'Views';
+$lang->voted_count = 'Votes';
+$lang->comment_count = 'Comments';
+$lang->member_count = 'Member Count';
+$lang->date = 'Date';
+$lang->regdate = 'Registered Date';
+$lang->last_update = 'Last Update';
+$lang->last_post = 'Last Post';
+$lang->signup_date = 'Sign up Date';
+$lang->last_login = 'Last Sign in';
+$lang->first_page = 'First Page';
+$lang->last_page = 'Last Page';
+$lang->search_target = 'Target for Search';
+$lang->search_keyword = 'Keyword';
+$lang->is_default = 'Default';
+
+$lang->no_documents = 'No Articles';
+
+$lang->board_manager = 'Board Settings';
+$lang->member_manager = 'Member Settings';
+$lang->layout_manager = 'Layout Settings';
+
+$lang->use = 'Use';
+$lang->notuse = 'Not use';
+$lang->not_exists = "Doesn't exist";
+
+$lang->public = 'public';
+$lang->private = 'private';
+
+$lang->unit_sec = 'sec';
+$lang->unit_min = 'min';
+$lang->unit_hour = 'hr';
+$lang->unit_day = 'th';
+$lang->unit_month = 'month';
+$lang->unit_year = 'year';
+
+$lang->unit_week = array(
+	'Monday' => 'Monday',
+	'Tuesday' => 'Tuesday',
+	'Wednesday' => 'Wednesday',
+	'Thursday' => 'Thursday',
+	'Friday' => 'Friday',
+	'Saturday' => 'Saturday',
+	'Sunday' => 'Sunday',
+);
+
+$lang->unit_meridiem = array(
+	'am' => 'am',
+	'pm' => 'pm',
+	'AM' => 'AM',
+	'PM' => 'PM',
+);
+
+$lang->time_gap = array(
+	'min' => '%d minute ago',
+	'mins' => '%d minutes ago',
+	'hour' => '%d hour ago',
+	'hours' => '%d hours ago',
+);
+
+// Descriptions
+$lang->about_tag = 'You may submit multiple tags by inserting commas(,) between each tag';
+$lang->about_layout = 'Layouts decorate the appearance of your modules. you can configure them from Layout menu on the top';
+
+// Messages
+$lang->msg_call_server = 'Requesting to the server, please wait';
+$lang->msg_db_not_setted = 'DB configuration has not been set';
+$lang->msg_dbconnect_failed = "Error has occurred while connecting DB.\nPlease check DB information again";
+$lang->msg_invalid_queryid = 'Specified query ID value is invalid';
+$lang->msg_not_permitted = 'You do not have permission to access';
+$lang->msg_input_password = 'Please input the password';
+$lang->msg_invalid_document = 'Invalid Article Number';
+$lang->msg_invalid_request = 'Invalid Request';
+$lang->msg_invalid_password = 'Invalid Password';
+$lang->msg_error_occured = 'An error has occured';
+$lang->msg_not_founded = 'Target could not be found';
+$lang->msg_no_result = 'Nothing found';
+$lang->msg_fail_to_request_open = 'Fail to open your request';
+$lang->msg_invalid_format = 'Invalid Format';
+
+$lang->msg_not_permitted_act = 'You do not have permission to execute requested action';
+$lang->msg_module_does_not_exist = "Couldn't find the requested module.\nPlease contact the administrator.";
+$lang->msg_module_is_not_standalone = 'Requested module cannot be executed independently';
+$lang->msg_default_url_is_not_defined = 'Default URL is not defined';
+
+$lang->success_registed = 'Registered successfully';
+$lang->success_declared = 'Accused successfully';
+$lang->success_updated = 'Updated successfully';
+$lang->success_deleted = 'Deleted successfully';
+$lang->success_voted = 'Recommended successfully';
+$lang->success_blamed = 'Blamed successfully';
+$lang->success_moved = 'Moved successfully';
+$lang->success_sended = 'Sent successfully';
+$lang->success_reset = 'Reset successfully';
+$lang->success_leaved = 'All member data have been deleted completely.';
+$lang->success_saved = 'Saved successfully';
+
+$lang->fail_to_delete = 'Could not be deleted';
+$lang->fail_to_move = 'Could not be moved';
+
+$lang->failed_voted = 'Could not recommend';
+$lang->failed_blamed = 'Could not blame';
+$lang->failed_declared = 'Could not accuse';
+$lang->fail_to_delete_have_children = 'Please try again after removing replies first';
+
+$lang->confirm_submit = 'Are you sure to submit?';
+$lang->confirm_logout = 'Are you sure to logout?';
+$lang->confirm_vote = 'Are you sure to recommend?';
+$lang->confirm_delete = 'Are you sure to delete?';
+$lang->confirm_move = 'Are you sure to move?';
+$lang->confirm_reset = 'Are you sure to reset?';
+$lang->confirm_leave = 'Are you sure to leave?';
+$lang->confirm_update = 'Are you sure to update?';
+
+$lang->column_type = 'Column Type';
+$lang->column_type_list['text'] = 'one-line text';
+$lang->column_type_list['homepage'] = 'url';
+$lang->column_type_list['email_address'] = 'email';
+$lang->column_type_list['tel'] = 'phone number';
+$lang->column_type_list['textarea'] = 'multi-line textarea';
+$lang->column_type_list['checkbox'] = 'checkbox (multiple selection)';
+$lang->column_type_list['select'] = 'select box (single selection)';
+$lang->column_type_list['radio'] = 'radio button (radio)';
+$lang->column_type_list['kr_zip'] = 'zip code (Korean)';
+$lang->column_type_list['date'] = 'date (yyyy/mm/dd)';
+//$lang->column_type_list['jp_zip'] = 'zip code (Japanese)';
+$lang->column_name = 'Column Name';
+$lang->column_title = 'Column Title';
+$lang->default_value = 'Default Value';
+$lang->is_active = 'Active';
+$lang->is_required = 'Required Field';
+$lang->eid = 'Name of extra variable';
+
+// ftp-related
+$lang->ftp_form_title = 'FTP Account Information';
+$lang->ftp = 'FTP';
+$lang->ftp_host = 'FTP hostname';
+$lang->ftp_port = 'FTP port';
+$lang->about_ftp_password = 'FTP password will not be stored';
+$lang->cmd_check_ftp_connect = 'Check FTP Connection';
+$lang->about_ftp_info = "
+	FTP account information can be used in following cases. <br />
+	1. If safe_mode setting of PHP is on, XE will be installed using FTP.  <br />
+	2. Automatic updates might use FTP information. <br />
+	   This account info will be stored in files/config/ftp.config.php <br />
+	   After installation, you can modify or delete the account info at the administration page. <br />
+";
+
+$lang->msg_safe_mode_ftp_needed = "If safe_mode setting of PHP is on, you should input FTP account information to install XE.";
+$lang->msg_ftp_not_connected = "Connection to localhost via FTP failed. Please check the port number and if FTP service is available.";
+$lang->msg_ftp_invalid_auth_info = "Authentication failed. Please check the username and password.";
+$lang->msg_ftp_mkdir_fail = "Directory creation failed. Please check the permission of FTP account.";
+$lang->msg_ftp_chmod_fail = "Chmod failed. Please check the permission and configuration of FTP server.";
+$lang->msg_ftp_connect_success = "Connection and authentication to the FTP server succeeded.";
+
+$lang->ftp_path_title = 'FTP Path Information';
+$lang->msg_ftp_installed_realpath = 'Absolute Path of XE';
+$lang->msg_ftp_installed_ftp_realpath = 'Absolute FTP Path of XE';
+
+// Alert messages for Javascript using by XML filter
+$lang->filter->isnull = 'Please input a value for %s';
+$lang->filter->outofrange = 'Please align the text length of %s';
+$lang->filter->equalto = "The value of %s is invalid";
+$lang->filter->invalid_email = "The format of %s is invalid. ex) developers@xpressengine.com";
+$lang->filter->invalid_user_id = $lang->filter->invalid_userid = "The format of %s is invalid.\\nAll values should consist of alphabets, numbers or underscore(_) and the first letter should be alphabet";
+$lang->filter->invalid_homepage = "The format of %s is invalid. ex) http://xpressengine.com/";
+$lang->filter->invalid_korean = "The format of %s is invalid. Please input Korean only";
+$lang->filter->invalid_korean_number = "The format of %s is invalid. Please input Korean or numbers";
+$lang->filter->invalid_alpha = "The format of %s is invalid. Please input alphabets only";
+$lang->filter->invalid_alpha_number = "The format of %s is invalid. Please input alphabets or numbers";
+$lang->filter->invalid_number = "The format of %s is invalid. Please input numbers only";
+
+$lang->security_warning_embed = "Due to security concern, administrators are not allowed to view embedded items.<BR /> To view them, please use another non-administrator ID.";
+$lang->msg_pc_to_mobile = '이 페이지는 모바일 보기가 있습니다. 모바일 보기로 이동하시겠습니까?';
 ?>
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php b/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php
new file mode 100644
index 000000000..5aed5baa4
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/queryargument/QueryArgumentTest.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * Test class for QueryArgument.
+ */
+class QueryArgumentTest extends CubridTest {
+
+    var $xmlPath = "data/";
+
+    function QueryArgumentTest(){
+        $this->xmlPath = str_replace('QueryArgumentTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+    }
+ }
+
+?>
diff --git a/tests/classes/db/classes/xml/xmlquery/queryargument/data/condition1.xml b/tests/classes/db/classes/xml/xmlquery/queryargument/data/condition1.xml
new file mode 100644
index 000000000..53decc580
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/queryargument/data/condition1.xml
@@ -0,0 +1 @@
+<condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/queryargument/data/index1.xml b/tests/classes/db/classes/xml/xmlquery/queryargument/data/index1.xml
new file mode 100644
index 000000000..6cbf9193a
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/queryargument/data/index1.xml
@@ -0,0 +1 @@
+<index var="sort_index" default="list_order" order="order_type" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php b/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php
new file mode 100644
index 000000000..02ce85348
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/condition/ConditionTagTest.php
@@ -0,0 +1,87 @@
+<?php
+
+/**
+ * Test class for ConditionTag.
+ */
+class ConditionTagTest extends CubridTest {
+
+    var $xmlPath = "data/";
+
+    function ConditionTagTest(){
+        $this->xmlPath = str_replace('ConditionTagTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+    }
+
+    /**
+     * Tests a simple <condition> tag:
+     * <condition operation="equal" column="user_id" var="user_id" />
+     */
+    function testConditionStringWithArgument(){
+            $xml_file = $this->xmlPath . "condition1.xml";
+            $xml_obj = Helper::getXmlObject($xml_file);
+            $tag = new ConditionTag($xml_obj->condition);
+            $arguments = $tag->getArguments();
+
+            $expected = "new ConditionWithArgument('\"user_id\"',\$" . $arguments[0]->getArgumentName() . "_argument,\"equal\")";
+            $actual = $tag->getConditionString();
+            $this->assertEquals($expected, $actual);
+
+
+            $this->assertEquals(1, count($arguments));
+    }
+
+    /**
+     * Tests a condition tag for joins - that uses no argument
+     * <condition operation="equal" column="comments.user_id" default="member.user_id" filter="userid" />
+     */
+    function testConditionStringWithoutArgument(){
+            $xml_file = $this->xmlPath . "condition3.xml";
+            $xml_obj = Helper::getXmlObject($xml_file);
+            $tag = new ConditionTag($xml_obj->condition);
+
+            $expected = "new ConditionWithoutArgument('\"comments\".\"user_id\"','\"member\".\"user_id\"',\"equal\")";
+            $actual = $tag->getConditionString();
+            $this->assertEquals($expected, $actual);
+
+            $arguments = $tag->getArguments();
+            $this->assertEquals(0, count($arguments));
+    }
+
+
+    /**
+     * Tests a <condition> tag with pipe:
+     * <condition operation="equal" column="type" var="type" notnull="notnull" pipe="and" />
+     */
+    function testConditionStringWithPipe(){
+            $xml_file = $this->xmlPath . "condition2.xml";
+            $xml_obj = Helper::getXmlObject($xml_file);
+            $tag = new ConditionTag($xml_obj->condition);
+            $arguments = $tag->getArguments();
+
+            $expected = "new ConditionWithArgument('\"type\"',\$" . $arguments[0]->getArgumentName() . "_argument,\"equal\", 'and')";
+            $actual = $tag->getConditionString();
+            $this->assertEquals($expected, $actual);
+
+
+            $this->assertEquals(1, count($arguments));
+    }
+
+    /**
+     * Tests that even if the column name is given in the var attribute, it knows it's just a name and not an argument
+     * <condition operation="equal" column="modules.module_srl" var="documents.module_srl" pipe="and" />
+     */
+    function testConditionStringWithoutArgumentAndDefaultValueInsideVar(){
+            $xml_file = $this->xmlPath . "condition4.xml";
+            $xml_obj = Helper::getXmlObject($xml_file);
+            $tag = new ConditionTag($xml_obj->condition);
+
+            $expected = "new ConditionWithoutArgument('\"modules\".\"module_srl\"','\"documents\".\"module_srl\"',\"equal\", 'and')";
+            $actual = $tag->getConditionString();
+            $this->assertEquals($expected, $actual);
+
+            $arguments = $tag->getArguments();
+            $this->assertEquals(0, count($arguments));
+    }
+
+}
+
+?>
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition1.xml b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition1.xml
new file mode 100644
index 000000000..274121640
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition1.xml
@@ -0,0 +1 @@
+<condition operation="equal" column="user_id" var="user_id" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition2.xml b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition2.xml
new file mode 100644
index 000000000..7ace26b8d
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition2.xml
@@ -0,0 +1 @@
+<condition operation="equal" column="type" var="type" notnull="notnull" pipe="and" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition3.xml b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition3.xml
new file mode 100644
index 000000000..538d81f3d
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition3.xml
@@ -0,0 +1 @@
+<condition operation="equal" column="comments.user_id" default="member.user_id" filter="userid" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition4.xml b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition4.xml
new file mode 100644
index 000000000..ac432b118
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/condition/data/condition4.xml
@@ -0,0 +1 @@
+<condition operation="equal" column="modules.module_srl" var="documents.module_srl" pipe="and" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php b/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php
new file mode 100644
index 000000000..860c44cc0
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/TableTagTest.php
@@ -0,0 +1,132 @@
+<?php
+         /**
+         * Test class for TableTag.
+         */
+	class TableTagTest extends CubridTest {
+
+                var $xmlPath = "data/";
+
+                function TableTagTest(){
+                    $this->xmlPath = str_replace('TableTagTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+                }
+
+                /**
+                 * Tests a simple <table> tag:
+                 * <table name="modules" />
+                 */
+		function testTableTagWithName(){
+			$xml_file = $this->xmlPath . "table_name.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+			$tag = new TableTag($xml_obj->table);
+
+                        $expected = "new Table('\"xe_modules\"', '\"modules\"')";
+                        $actual = $tag->getTableString();
+			$this->assertEquals($expected, $actual);
+		}
+
+                /**
+                 * Tests a <table> tag with name and alias
+                 * <table name="modules" alias="mod" />
+                 */
+		function testTableTagWithNameAndAlias(){
+			$xml_file = $this->xmlPath . "table_name_alias.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+
+			$tag = new TableTag($xml_obj->table);
+
+                        $expected = "new Table('\"xe_modules\"', '\"mod\"')";
+                        $actual = $tag->getTableString();
+			$this->assertEquals($expected, $actual);
+		}
+
+                /**
+                 * Tests a <table> tag used for joins
+                 * <table name="module_categories" alias="module_categories" type="left join">
+                 *       <conditions>
+                 *           <condition operation="equal" column="module_categories.module_category_srl" default="modules.module_category_srl" />
+                 *       </conditions>
+                 * </table>
+                 *
+                 */
+		function testTableTagWithJoinCondition(){
+			$xml_file = $this->xmlPath . "table_name_alias_type.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+
+			$tag = new TableTag($xml_obj->table);
+
+                        $actual = $tag->getTableString();
+
+                        $expected = 'new JoinTable(\'"xe_module_categories"\', \'"module_categories"\', "left join", array(
+                            new ConditionGroup(array(
+                            new ConditionWithoutArgument(\'"module_categories"."module_category_srl"\',\'"modules"."module_category_srl"\',"equal")
+                            ))
+                            ))';
+                        $actual = Helper::cleanString($actual);
+                        $expected = Helper::cleanString($expected);
+
+			$this->assertEquals($expected, $actual);
+		}
+
+                /**
+                 * If a table tag has the type attribute and condition children
+                 * it means it is meant to be used inside a join
+                 */
+                function testTagWithTypeIsJoinTable(){
+                    $xml_file = $this->xmlPath . "table_name_alias_type.xml";
+                    $xml_obj = Helper::getXmlObject($xml_file);
+
+                    $tag = new TableTag($xml_obj->table);
+
+                    $this->assertEquals(true, $tag->isJoinTable());
+                }
+
+                /**
+                 * Tests that a simple table tag is not a join table
+                 */
+                function testTagWithoutTypeIsNotJoinTable(){
+                    $xml_file = $this->xmlPath . "table_name_alias.xml";
+                    $xml_obj = Helper::getXmlObject($xml_file);
+
+                    $tag = new TableTag($xml_obj->table);
+
+                    $this->assertEquals(false, $tag->isJoinTable());
+                }
+
+                /**
+                 * If no alias is specified, test that table name is used
+                 */
+                function testTableAliasWhenAliasNotSpecified(){
+                    $xml_file = $this->xmlPath . "table_name.xml";
+                    $xml_obj = Helper::getXmlObject($xml_file);
+
+                    $tag = new TableTag($xml_obj->table);
+
+                    $this->assertEquals("modules", $tag->getTableAlias());
+                }
+
+                /**
+                 * If alias is specified, test that it is used
+                 */
+                function testTableAliasWhenAliasSpecified(){
+                    $xml_file = $this->xmlPath . "table_name_alias.xml";
+                    $xml_obj = Helper::getXmlObject($xml_file);
+
+                    $tag = new TableTag($xml_obj->table);
+
+                    $this->assertEquals("mod", $tag->getTableAlias());
+                }
+
+                /**
+                 * Table name propery should returned unescaped and unprefixed table name
+                 * (The one in the XML file)
+                 */
+                function testTableName(){
+                    $xml_file = $this->xmlPath . "table_name_alias.xml";
+                    $xml_obj = Helper::getXmlObject($xml_file);
+
+                    $tag = new TableTag($xml_obj->table);
+
+                    $this->assertEquals("modules", $tag->getTableName());
+                }
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php b/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php
new file mode 100644
index 000000000..4beadadb8
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/TablesTagTest.php
@@ -0,0 +1,112 @@
+<?php
+         /**
+         * Test class for TablesTag.
+         */
+	class TablesTagTest extends CubridTest {
+
+                var $xmlPath = "data/";
+
+                function TablesTagTest(){
+                    $this->xmlPath = str_replace('TablesTagTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+                }
+
+                /**
+                 * Tests a simple <tables> tag:
+                 * <tables>
+                 *     <table name="member" />
+                 * </tables>
+                 */
+		function testTablesTagWithOneTable(){
+			$xml_file = $this->xmlPath . "tables_one_table.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+			$tag = new TablesTag($xml_obj->tables);
+
+                        $expected = "array(new Table('\"xe_member\"', '\"member\"'))";
+                        $actual = $tag->toString();
+
+                        $this->_testCachedOutput($expected, $actual);
+		}
+
+                /**
+                 * Tests a simple <tables> tag:
+                 * <tables>
+                 *     <table name="member_group" alias="a" />
+                 *     <table name="member_group_member" alias="b" />
+                 * </tables>
+                 */
+		function testTablesTagWithTwoTablesNoJoin(){
+			$xml_file = $this->xmlPath . "tables_two_tables_no_join.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+			$tag = new TablesTag($xml_obj->tables);
+
+                        $expected = "array(
+                                        new Table('\"xe_member_group\"', '\"a\"')
+                                       ,new Table('\"xe_member_group_member\"', '\"b\"')
+                                    )";
+                        $actual = $tag->toString();
+
+                        $this->_testCachedOutput($expected, $actual);
+		}
+
+                /**
+                 * Tests a simple <tables> tag:
+                 * <tables>
+                 *      <table name="files" alias="files" />
+                 *      <table name="member" alias="member" type="left join">
+                 *          <conditions>
+                 *              <condition operation="equal" column="files.member_srl" default="member.member_srl" />
+                 *           </conditions>
+                 *       </table>
+                 * </tables>
+                 */
+		function testTablesTagWithTwoTablesWithJoin(){
+			$xml_file = $this->xmlPath . "tables_two_tables_with_join.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+			$tag = new TablesTag($xml_obj->tables);
+
+                        $expected = "array(
+                                        new Table('\"xe_files\"', '\"files\"')
+                                       ,new JoinTable('\"xe_member\"'
+                                                    , '\"member\"'
+                                                    , \"left join\"
+                                                    , array(
+                                                        new ConditionGroup(
+                                                            array(
+                                                                new ConditionWithoutArgument(
+                                                                    '\"files\".\"member_srl\"'
+                                                                    ,'\"member\".\"member_srl\"'
+                                                                    ,\"equal\"
+                                                                )
+                                                            )
+                                                         )
+                                                      )
+                                        )
+                                    )";
+                        $actual = $tag->toString();
+
+                        $this->_testCachedOutput($expected, $actual);
+		}
+
+                /**
+                 * Tests a simple <tables> tag:
+                 * <tables>
+                 *      <table name="files" alias="files" />
+                 *      <table name="member" alias="member" type="left join">
+                 *          <conditions>
+                 *              <condition operation="equal" column="files.member_srl" default="member.member_srl" />
+                 *           </conditions>
+                 *       </table>
+                 * </tables>
+                 */
+		function testGetTables(){
+			$xml_file = $this->xmlPath . "tables_two_tables_with_join.xml";
+			$xml_obj = Helper::getXmlObject($xml_file);
+			$tag = new TablesTag($xml_obj->tables);
+
+                        $tables = $tag->getTables();
+
+                        $this->assertEquals(2, count($tables));
+                        $this->assertTrue(is_a($tables[0], 'TableTag'));
+                        $this->assertTrue(is_a($tables[1], 'TableTag'));
+		}
+	}
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name.xml b/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name.xml
new file mode 100644
index 000000000..6525964f0
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name.xml
@@ -0,0 +1 @@
+<table name="modules" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name_alias.xml b/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name_alias.xml
new file mode 100644
index 000000000..8240d4652
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name_alias.xml
@@ -0,0 +1 @@
+<table name="modules" alias="mod" />
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name_alias_type.xml b/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name_alias_type.xml
new file mode 100644
index 000000000..6d8e7f1d5
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/data/table_name_alias_type.xml
@@ -0,0 +1,5 @@
+<table name="module_categories" alias="module_categories" type="left join">
+    <conditions>
+        <condition operation="equal" column="module_categories.module_category_srl" default="modules.module_category_srl" />
+    </conditions>
+</table>
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_one_table.xml b/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_one_table.xml
new file mode 100644
index 000000000..525df54be
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_one_table.xml
@@ -0,0 +1,3 @@
+<tables>
+    <table name="member" />
+</tables>
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_two_tables_no_join.xml b/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_two_tables_no_join.xml
new file mode 100644
index 000000000..cdedcb831
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_two_tables_no_join.xml
@@ -0,0 +1,4 @@
+<tables>
+    <table name="member_group" alias="a" />
+    <table name="member_group_member" alias="b" />
+</tables>
\ No newline at end of file
diff --git a/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_two_tables_with_join.xml b/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_two_tables_with_join.xml
new file mode 100644
index 000000000..fd8d8775e
--- /dev/null
+++ b/tests/classes/db/classes/xml/xmlquery/tags/table/data/tables_two_tables_with_join.xml
@@ -0,0 +1,8 @@
+<tables>
+    <table name="files" alias="files" />
+    <table name="member" alias="member" type="left join">
+        <conditions>
+            <condition operation="equal" column="files.member_srl" default="member.member_srl" />
+        </conditions>
+    </table>
+</tables>
\ No newline at end of file
diff --git a/tests/classes/db/config/config.inc.php b/tests/classes/db/config/config.inc.php
new file mode 100644
index 000000000..f2c8c8ee0
--- /dev/null
+++ b/tests/classes/db/config/config.inc.php
@@ -0,0 +1,61 @@
+<?php
+	error_reporting(E_ALL ^ E_NOTICE);
+	define('_XE_PATH_', str_replace('tests/classes/db/config/config.inc.php', '', str_replace('\\', '/', __FILE__)));
+	define('_TEST_PATH_', _XE_PATH_ . 'tests/classes/db/');
+
+	if(!defined('__DEBUG__')) define('__DEBUG__', 4);
+        define('__ZBXE__', true);
+        define('__XE__',   true);
+
+	require_once(_TEST_PATH_.'Helper.class.php');
+        require_once(_TEST_PATH_.'QueryTester.class.php');
+	require_once(_TEST_PATH_.'db/DBTest.php');
+        require_once(_TEST_PATH_.'db/CubridTest.php');
+        require_once(_TEST_PATH_.'db/CubridOnlineTest.php');
+        require_once(_TEST_PATH_.'db/MssqlTest.php');
+        require_once(_TEST_PATH_.'db/MssqlOnlineTest.php');
+        require_once(_TEST_PATH_.'db/MysqlTest.php');
+        require_once(_TEST_PATH_.'db/SqliteTest.php');
+
+        require_once(_XE_PATH_.'config/config.inc.php');
+	require_once(_XE_PATH_.'classes/xml/XmlQueryParser.150.class.php');
+
+	require_once(_XE_PATH_.'classes/db/DB.class.php');
+	require_once(_XE_PATH_.'classes/db/DBCubrid.class.php');
+	require_once(_XE_PATH_.'classes/db/DBMssql.class.php');
+        require_once(_XE_PATH_.'classes/db/DBMysql.class.php');
+        require_once(_TEST_PATH_.'db/MockDb.php');
+
+    require_once(_XE_PATH_.'classes/xml/xmlquery/DBParser.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/argument/Argument.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/argument/SortArgument.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/argument/ConditionArgument.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/DefaultValue.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/expression/Expression.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/expression/SelectExpression.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/expression/InsertExpression.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/expression/UpdateExpression.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/expression/UpdateExpressionWithoutArgument.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/table/Table.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/table/JoinTable.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/table/CubridTableWithHint.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/table/MysqlTableWithHint.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/table/MssqlTableWithHint.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/table/IndexHint.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/condition/ConditionGroup.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/condition/Condition.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/condition/ConditionWithArgument.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/condition/ConditionWithoutArgument.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/condition/ConditionSubquery.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/expression/StarExpression.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/order/OrderByColumn.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/limit/Limit.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/Query.class.php');
+    require_once(_XE_PATH_.'classes/db/queryparts/Subquery.class.php');
+
+    require_once(_XE_PATH_.'classes/xml/xmlquery/tags/table/TableTag.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/tags/table/HintTableTag.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/tags/condition/ConditionTag.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/QueryArgument.class.php');
+    require_once(_XE_PATH_.'classes/xml/xmlquery/queryargument/SortQueryArgument.class.php');
+?>
\ No newline at end of file
diff --git a/tests/classes/db/db/CubridOnlineTest.php b/tests/classes/db/db/CubridOnlineTest.php
new file mode 100644
index 000000000..8c368df4c
--- /dev/null
+++ b/tests/classes/db/db/CubridOnlineTest.php
@@ -0,0 +1,49 @@
+<?php
+
+    /**
+     * Base class for tests for CUBRID SQL syntax
+     */
+
+    class CubridOnlineTest extends PHPUnit_Framework_TestCase {
+
+        protected $backupGlobals = FALSE;
+        protected $backupStaticAttributes = FALSE;
+        protected $preserveGlobalState = FALSE;
+
+        /**
+         * Prepare runtime context - tell DB class that current DB is CUBRID
+         */
+        protected function setUp() {
+            $this->markTestSkipped();
+            $oContext = &Context::getInstance();
+
+            $db_info->master_db = array('db_type' => 'cubrid'
+                                                ,'db_port' => '33000'
+                                                ,'db_hostname' => '10.0.0.206'
+                                                ,'db_userid' => 'dba'
+                                                ,'db_password' => 'arniarules'
+                                                ,'db_database' => 'xe15QA'
+                                                ,'db_table_prefix' => 'xe_');
+            $db_info->slave_db = array(array('db_type' => 'cubrid'
+                                                ,'db_port' => '33000'
+                                                ,'db_hostname' => '10.0.0.206'
+                                                ,'db_userid' => 'dba'
+                                                ,'db_password' => 'arniarules'
+                                                ,'db_database' => 'xe15QA'
+                                                ,'db_table_prefix' => 'xe_'));
+            $oContext->setDbInfo($db_info);
+
+            // remove cache dir
+            FileHandler::removeDir( _XE_PATH_ . 'files/cache');
+
+            DB::getParser(true);
+        }
+
+        /**
+         * Free resources - reset static DB and QueryParser
+         */
+        protected function tearDown() {
+            unset($GLOBALS['__DB__']);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/CubridTest.php b/tests/classes/db/db/CubridTest.php
new file mode 100644
index 000000000..8e3752771
--- /dev/null
+++ b/tests/classes/db/db/CubridTest.php
@@ -0,0 +1,31 @@
+<?php
+
+    /**
+     * Base class for tests for CUBRID SQL syntax
+     */
+
+    class CubridTest extends DBTest {
+
+        /**
+         * Prepare runtime context - tell DB class that current DB is CUBRID
+         */
+        protected function setUp() {
+            $oContext = &Context::getInstance();
+
+            $db_info->master_db = array('db_type' => 'cubrid','db_table_prefix' => 'xe_');
+            $db_info->slave_db = array(array('db_type' => 'cubrid','db_table_prefix' => 'xe_'));
+
+            $oContext->setDbInfo($db_info);
+
+            $db = new MockDb();
+            $db->getParser(true);
+        }
+
+        /**
+         * Free resources - reset static DB and QueryParser
+         */
+        protected function tearDown() {
+            unset($GLOBALS['__DB__']);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/DBTest.php b/tests/classes/db/db/DBTest.php
new file mode 100644
index 000000000..c8e1a6b2c
--- /dev/null
+++ b/tests/classes/db/db/DBTest.php
@@ -0,0 +1,70 @@
+<?php
+
+class DBTest extends PHPUnit_Framework_TestCase {
+
+        function _testQuery($xml_file, $argsString, $expected, $methodName, $columnList = null){
+                echo PHP_EOL . ' ----------------------------------- ' .PHP_EOL;
+                echo $xml_file;
+                echo PHP_EOL . ' ----------------------------------- ' .PHP_EOL;
+
+                $tester = new QueryTester();
+                $outputString = $tester->getNewParserOutputString($xml_file, $argsString);
+                echo $outputString;
+                $output = eval($outputString);
+
+                if(!is_a($output, 'Query')){
+                        if(!$output->toBool()) $querySql = "Date incorecte! Query-ul nu a putut fi executat.";
+                }else {
+                        $db = &DB::getInstance();
+                        if($columnList) $output->setColumnList($columnList);
+                        $querySql = $db->{$methodName}($output);
+
+                        // Remove whitespaces, tabs and all
+                        $querySql = Helper::cleanString($querySql);
+                        $expected = Helper::cleanString($expected);
+                }
+                $this->assertEquals($expected, $querySql);
+        }
+
+        function _testPreparedQuery($xml_file, $argsString, $expected, $methodName, $expectedArgs = NULL){
+                echo PHP_EOL . ' ----------------------------------- ' .PHP_EOL;
+                echo $xml_file;
+                echo PHP_EOL . ' ----------------------------------- ' .PHP_EOL;
+
+                $tester = new QueryTester();
+                $outputString = $tester->getNewParserOutputString($xml_file, $argsString);
+                echo $outputString;
+                $output = eval($outputString);
+
+                if(!is_a($output, 'Query')){
+                        if(!$output->toBool()) $querySql = "Date incorecte! Query-ul nu a putut fi executat.";
+                }else {
+                        $db = &DB::getInstance();
+                        $querySql = $db->{$methodName}($output, false);
+                        $queryArguments = $output->getArguments();
+
+                        // Remove whitespaces, tabs and all
+                        $querySql = Helper::cleanString($querySql);
+                        $expected = Helper::cleanString($expected);
+                }
+
+                // Test
+                $this->assertEquals($expected, $querySql);
+
+                // Test query arguments
+                $argCount = count($expectedArgs);
+                for($i = 0; $i < $argCount; $i++){
+                    $this->assertEquals($expectedArgs[$i], $queryArguments[$i]->getEscapedValue());
+                }
+        }
+
+        function _testCachedOutput($expected, $actual){
+            $expected = Helper::cleanString($expected);
+            $actual = Helper::cleanString($actual);
+
+            $this->assertEquals($expected, $actual);
+
+        }
+    }
+
+?>
diff --git a/tests/classes/db/db/ExpressionParserTest.php b/tests/classes/db/db/ExpressionParserTest.php
new file mode 100644
index 000000000..c43bd1f13
--- /dev/null
+++ b/tests/classes/db/db/ExpressionParserTest.php
@@ -0,0 +1,109 @@
+<?php
+
+	class ExpressionParserTest extends PHPUnit_Framework_TestCase {
+		/* Escape char for:
+		 * CUBRID		""
+		 * MySql		``
+		 * SqlServer	[]
+		 */
+		var $dbLeftEscapeChar = '[';
+		var $dbRightEscapeChar = ']';
+
+		function _test($column_name, $alias, $expected){
+			$expressionParser = new DBParser($this->dbLeftEscapeChar,$this->dbRightEscapeChar);
+			$actual = $expressionParser->parseExpression($column_name);
+			if($alias) $actual .= " as $alias";
+			$this->assertEquals($expected, $actual);
+		}
+
+		function testStarExpressionIsNotEscaped(){
+			$this->_test("*", NULL, '*');
+		}
+
+		function testSimpleColumnNameGetsEscaped(){
+			$this->_test("member_srl", NULL
+						, $this->dbLeftEscapeChar.'member_srl'.$this->dbRightEscapeChar );
+		}
+
+		function testUnqualifiedAliasedColumnNameGetsEscaped(){
+			$this->_test("member_srl", "id"
+					   , $this->dbLeftEscapeChar.'member_srl'.$this->dbRightEscapeChar.' as id');
+		}
+
+		function testQualifiedColumnNameGetsEscaped(){
+			$this->_test("xe_members.member_srl", NULL
+					   , $this->dbLeftEscapeChar.'xe_members'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'member_srl'.$this->dbRightEscapeChar);
+		}
+
+		function testQualifiedAliasedColumnNameGetsEscaped(){
+			$this->_test("xe_members.member_srl","id"
+					 	,$this->dbLeftEscapeChar.'xe_members'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'member_srl'.$this->dbRightEscapeChar.' as id');
+		}
+
+		function testCountDoesntGetEscaped(){
+			$this->_test("count(*)", NULL, 'count(*)');
+		}
+
+		function testAliasedCountDoesntGetEscaped(){
+			$this->_test("count(*)", "count", 'count(*) as count');
+		}
+
+		function testUnqualifiedColumnExpressionWithOneParameterLessFunction(){
+			$this->_test("substring(regdate)", NULL
+			, 'substring('.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.')');
+		}
+
+		function testAliasedUnqualifiedColumnExpressionWithOneParameterLessFunction(){
+			$this->_test("substring(regdate)", "regdate"
+			, 'substring('.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.') as regdate');
+		}
+
+		function testQualifiedColumnExpressionWithOneParameterLessFunction(){
+			$this->_test("substring(xe_member.regdate)", NULL
+			, 'substring('.$this->dbLeftEscapeChar.'xe_member'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.')');
+		}
+
+		function testAliasedQualifiedColumnExpressionWithOneParameterLessFunction(){
+			$this->_test("substring(xe_member.regdate)", "regdate"
+			, 'substring('.$this->dbLeftEscapeChar.'xe_member'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.') as regdate');
+		}
+
+		function testUnqualifiedColumnExpressionWithTwoParameterLessFunctions(){
+			$this->_test("lpad(rpad(regdate))", NULL
+			, 'lpad(rpad('.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.'))');
+		}
+
+		function testAliasedUnqualifiedColumnExpressionWithTwoParameterLessFunctions(){
+			$this->_test("lpad(rpad(regdate))", "regdate"
+			, 'lpad(rpad('.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.')) as regdate');
+		}
+
+		function testQualifiedColumnExpressionWithTwoParameterLessFunctions(){
+			$this->_test("lpad(rpad(xe_member.regdate))", NULL
+			, 'lpad(rpad('.$this->dbLeftEscapeChar.'xe_member'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.'))');
+		}
+
+		function testAliasedQualifiedColumnExpressionWithTwoParameterLessFunctions(){
+			$this->_test("lpad(rpad(xe_member.regdate))", "regdate"
+			, 'lpad(rpad('.$this->dbLeftEscapeChar.'xe_member'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.')) as regdate');
+		}
+
+		function testColumnAddition(){
+			$this->_test("score1 + score2", "total"
+			, $this->dbLeftEscapeChar.'score1'.$this->dbRightEscapeChar.' + '.$this->dbLeftEscapeChar.'score2'.$this->dbRightEscapeChar.' as total');
+		}
+
+		function testMultipleParameterFunction(){
+			$this->_test("substring(regdate, 1, 8)", NULL
+			, 'substring('.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.', 1, 8)');
+			$this->_test("substring(regdate, 1, 8)", "regdate"
+			, 'substring('.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.', 1, 8) as regdate');
+			$this->_test("substring(xe_member.regdate, 1, 8)", NULL
+			, 'substring('.$this->dbLeftEscapeChar.'xe_member'.$this->dbRightEscapeChar.'.'.$this->dbLeftEscapeChar.'regdate'.$this->dbRightEscapeChar.', 1, 8)');
+		}
+
+		function testFunctionAddition(){
+			$this->_test("abs(score) + abs(totalscore)", NULL
+			, 'abs('.$this->dbLeftEscapeChar.'score'.$this->dbRightEscapeChar.') + abs('.$this->dbLeftEscapeChar.'totalscore'.$this->dbRightEscapeChar.')');
+		}
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/MockDb.php b/tests/classes/db/db/MockDb.php
new file mode 100644
index 000000000..bfdd6d3ef
--- /dev/null
+++ b/tests/classes/db/db/MockDb.php
@@ -0,0 +1,81 @@
+<?php
+
+    /**
+     * @brief Mock database base class
+     *
+     * Used to load mock classes instead of actual ones,
+     * so that connect methods can be skipped
+     */
+    class MockDb extends DB {
+
+        function &getParser($force = false){
+            static $dbParser = null;
+            if(!$dbParser || $force) {
+                $oDB = &MockDb::getInstance();
+                $dbParser = $oDB->getParser();
+                DB::getParser(true);
+            }
+
+            return $dbParser;
+        }
+
+        function &getInstance(){
+            $db_type = Context::getDBType();
+
+            if(!isset($GLOBALS['__DB__'])) $GLOBALS['__DB__'] = array();
+            if(!isset($GLOBALS['__DB__'][$db_type])) {
+                switch($db_type){
+                    case 'mssql' :
+                                    $GLOBALS['__DB__'][$db_type] = new MockDBMssql; break;
+                    case 'mysql' :
+                                    $GLOBALS['__DB__'][$db_type] = new MockDBMysql; break;
+                    case 'cubrid' :
+                                    $GLOBALS['__DB__'][$db_type] = new MockDBCubrid; break;
+                }
+            }
+
+            return $GLOBALS['__DB__'][$db_type];
+        }
+    }
+
+    /**
+     * @brief Mock up for MS SQL class
+     *
+     * Overrides default constructor in order to skip connect method
+     */
+    class MockDBMssql extends DBMssql {
+        function MockDBMssql(){
+            $this->_setDBInfo();
+        }
+    }
+
+    /**
+     * @brief Mock up for CUBRID class
+     *
+     * Overrides default constructor in order to skip connect method
+     */
+    class MockDBCubrid extends DBCubrid {
+        function MockDBCubrid(){
+            $this->_setDBInfo();
+        }
+    }
+
+    /**
+     * @brief Mock up for Mysql class
+     *
+     * Overri des default constructor in order to skip connect method.
+     */
+    class MockDBMysql extends DBMysql {
+        function MockDBMysql(){
+            $this->_setDBInfo();
+        }
+
+        /**
+         * Overrides mysql_real_escape_string, that returns null when no connection is present
+         */
+        function addQuotes($string){
+            return $string;
+        }
+    }
+
+?>
\ No newline at end of file
diff --git a/tests/classes/db/db/MssqlOnlineTest.php b/tests/classes/db/db/MssqlOnlineTest.php
new file mode 100644
index 000000000..54d9fa7a9
--- /dev/null
+++ b/tests/classes/db/db/MssqlOnlineTest.php
@@ -0,0 +1,49 @@
+<?php
+
+    /**
+     * Base class for tests for MSSQL SQL syntax
+     */
+
+    class MssqlOnlineTest extends PHPUnit_Framework_TestCase {
+
+        protected $backupGlobals = FALSE;
+        protected $backupStaticAttributes = FALSE;
+        protected $preserveGlobalState = FALSE;
+
+        /**
+         * Prepare runtime context - tell DB class that current DB is MSSQL
+         */
+        protected function setUp() {
+            $this->markTestSkipped();
+            $oContext = &Context::getInstance();
+
+            $db_info->master_db = array('db_type' => 'mssql'
+                                                ,'db_port' => '3306'
+                                                ,'db_hostname' => 'PHENOMII\SQL2008EXPRESS'
+                                                ,'db_userid' => 'dba'
+                                                ,'db_password' => 'arniarules'
+                                                ,'db_database' => 'xe-15-db'
+                                                ,'db_table_prefix' => 'xe_');
+            $db_info->slave_db = array(array('db_type' => 'mssql'
+                                                ,'db_port' => '3306'
+                                                ,'db_hostname' => 'PHENOMII\SQL2008EXPRESS'
+                                                ,'db_userid' => 'dba'
+                                                ,'db_password' => 'arniarules'
+                                                ,'db_database' => 'xe-15-db'
+                                                ,'db_table_prefix' => 'xe_'));
+            $oContext->setDbInfo($db_info);
+
+            // remove cache dir
+            FileHandler::removeDir( _XE_PATH_ . 'files/cache');
+
+            DB::getParser(true);
+        }
+
+        /**
+         * Free resources - reset static DB and QueryParser
+         */
+        protected function tearDown() {
+            unset($GLOBALS['__DB__']);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/MssqlTest.php b/tests/classes/db/db/MssqlTest.php
new file mode 100644
index 000000000..47149ee38
--- /dev/null
+++ b/tests/classes/db/db/MssqlTest.php
@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+    class MssqlTest extends DBTest {
+
+        protected function setUp() {
+            $oContext = &Context::getInstance();
+
+            $db_info->master_db = array('db_type' => 'mssql','db_table_prefix' => 'xe_');
+            $db_info->slave_db = array(array('db_type' => 'mssql','db_table_prefix' => 'xe_'));
+
+            $oContext->setDbInfo($db_info);
+
+            $db = new MockDb();
+            $db->getParser(true);
+        }
+
+        protected function tearDown() {
+            unset($GLOBALS['__DB__']);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/MysqlTest.php b/tests/classes/db/db/MysqlTest.php
new file mode 100644
index 000000000..d04c83ef6
--- /dev/null
+++ b/tests/classes/db/db/MysqlTest.php
@@ -0,0 +1,31 @@
+<?php
+
+    /**
+     * Base class for tests for Mysql SQL syntax
+     */
+
+    class MysqlTest extends DBTest {
+
+        /**
+         * Prepare runtime context - tell DB class that current DB is CUBRID
+         */
+        protected function setUp() {
+            $oContext = &Context::getInstance();
+
+            $db_info->master_db = array('db_type' => 'mysql','db_table_prefix' => 'xe_');
+            $db_info->slave_db = array(array('db_type' => 'mysql','db_table_prefix' => 'xe_'));
+
+            $oContext->setDbInfo($db_info);
+
+            $db = new MockDb();
+            $db->getParser(true);
+        }
+
+        /**
+         * Free resources - reset static DB and QueryParser
+         */
+        protected function tearDown() {
+            unset($GLOBALS['__DB__']);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/SqliteTest.php b/tests/classes/db/db/SqliteTest.php
new file mode 100644
index 000000000..edb62d647
--- /dev/null
+++ b/tests/classes/db/db/SqliteTest.php
@@ -0,0 +1,32 @@
+<?php
+
+    /**
+     * Base class for tests for Sqlite SQL syntax
+     *
+     * See syntax reference:
+     * http://www.sqlite.org/lang.html
+     */
+
+    class SqliteTest extends DBTest {
+
+        /**
+         * Prepare runtime context - tell DB class that current DB is CUBRID
+         */
+        protected function setUp() {
+            $oContext = &Context::getInstance();
+
+            $db_info->master_db = array('db_type' => 'sqlite3_pdo','db_table_prefix' => 'xe_');
+            $db_info->slave_db = array(array('db_type' => 'sqlite3_pdo','db_table_prefix' => 'xe_'));
+
+            $oContext->setDbInfo($db_info);
+            DB::getParser(true);
+        }
+
+        /**
+         * Free resources - reset static DB and QueryParser
+         */
+        protected function tearDown() {
+            unset($GLOBALS['__DB__']);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php b/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php
new file mode 100644
index 000000000..0a210462c
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridDeleteTest.php
@@ -0,0 +1,20 @@
+<?php
+
+        class CubridDeleteTest extends CubridTest {
+
+		function _test($xml_file, $argsString, $expected){
+                    $this->_testQuery($xml_file, $argsString, $expected,  'getDeleteSql');
+		}
+
+		function test_module_deleteActionForward(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/deleteActionForward.xml";
+			$argsString = '$args->module = "page";
+							$args->type = "page";
+							$args->act = "tata";';
+			$expected = 'delete "action_forward" from "xe_action_forward" as "action_forward"
+						where "module" = \'page\'
+							and "type" = \'page\'
+							and "act" = \'tata\'';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php b/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php
new file mode 100644
index 000000000..5133db710
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridIndexHintTest.php
@@ -0,0 +1,85 @@
+<?php
+
+    class CubridIndexHintTest extends CubridTest {
+        var $xmlPath = 'data/';
+
+        function CubridIndexHintTest(){
+            $this->xmlPath = str_replace('CubridIndexHintTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+        }
+
+        function _test($xml_file, $argsString, $expected){
+            var_dump($xml_file);
+            $this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql');
+        }
+
+        function testOneUseIndexHintAndOneTable(){
+                $xml_file = $this->xmlPath . "one_index_hint_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member" using index "member"."xe_idx_member_list_order"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+
+        function testTwoUseIndexHintsAndOneTable(){
+                $xml_file = $this->xmlPath . "two_index_hints_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member" using index "member"."xe_idx_member_list_order", "member"."xe_idx_member_srl"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testThreeUseIndexHintsAndTwoTables(){
+                $xml_file = $this->xmlPath . "three_index_hints_two_tables.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member", "xe_document" as "document"
+                    using index "member"."xe_idx_member_list_order", "member"."xe_idx_member_srl", "document"."xe_idx_document_srl"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testThreeUseIndexHintsAndTwoTablesCombined(){
+                $xml_file = $this->xmlPath . "three_index_hints_two_tables_combined.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member", "xe_document" as "document"
+                    using index "member"."xe_idx_member_list_order", "member"."xe_idx_member_srl"(+), "document"."xe_idx_document_srl"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testIgnoreIndexHintIsSkipped(){
+                $xml_file = $this->xmlPath . "ignore_index_hint.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testMysqlIndexHintIsSkipped(){
+                $xml_file = $this->xmlPath . "mysql_index_hint.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        /**
+         * If CUBRID database is used, indexes are created with prefix.
+         *
+         * e.g.: xe_indx_list_order
+         */
+        function testPrefixIsAddedToIndexName(){
+                $xml_file = $this->xmlPath . "one_index_hint_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member" using index "member"."xe_idx_member_list_order"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        /**
+         * Tests that index is added if "for" attribute is "ALL"
+         *
+         * example: <index_hint for="ALL"> ... </index_hint>
+         */
+        function testIndexHintForAll(){
+                $xml_file = $this->xmlPath . "index_hint_for_all.xml";
+                $argsString = '';
+                $expected = 'select * from "xe_member" as "member" using index "member"."xe_idx_member_list_order"';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+    }
+?>
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php b/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php
new file mode 100644
index 000000000..4f8437abf
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridInsertOnlineTest.php
@@ -0,0 +1,85 @@
+<?php
+
+	class CubridInsertOnlineTest extends CubridOnlineTest {
+
+              /**
+                 * Note: this test can fail when comaparing regdate from the $args with
+                 * regdate from the expected string - a few seconds difference
+                 */
+		function test_module_insertModule_escapeContent(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/insertModule.xml";
+
+                        $args->module_category_srl = 0;
+                        $args->browser_title = "test";
+                        $args->layout_srl = 0;
+                        $args->mlayout_srl = 0;
+                        $args->module = "page";
+                        $args->mid = "test";
+                        $args->site_srl = 0;
+                        $args->module_srl = 47374;
+                        $args->content = "hello \' moto";
+
+                        $output = executeQuery('module.insertModule', $args);
+
+                        $this->assertTrue(!$output->error, $output->message);
+		}
+
+                function test_document_insertDocument_defaultVarcharValue(){
+                    $args->module_srl = 102;
+                    $args->content = '<p>yuhuuuuu</p>';
+                    $args->document_srl = 9200;
+                    $args->is_secret = 'N';
+                    $args->allow_comment = 'N';
+                    $args->lock_comment = 'N';
+                    $args->allow_trackback = 'N';
+                    $args->notify_message = 'N';
+                    $args->ipaddress = '127.0.0.1';
+                    $args->extra_vars = 'N;';
+                    $args->readed_count = 0;
+                    $args->list_order = -9201;
+                    $args->update_order = -9201;
+                    $args->member_srl = 4;
+                    $args->user_id = 'admin';
+                    $args->user_name = 'admin';
+                    $args->nick_name = 'admin';
+                    $args->email_address = 'admin@admin.admin';
+                    $args->homepage = '';
+                    $args->title = 'yuhuu';
+                    $args->lang_code;
+                    $output = executeQuery('document.insertDocument', $args);
+
+                    $this->assertNotEquals(-225, $output->error);
+                    $this->assertNotEquals('Missing value for attribute "homepage" with the NOT NULL constraint.', $output->message);
+                }
+
+              function test_communication_addFriendGroup(){
+			$args->member_srl = 202;
+                        $args->title = "Grup";
+
+                        $output = executeQuery("communication.addFriendGroup", $args);
+                        $this->assertEquals(0, $output->error, $output->message);
+
+                }
+
+             function test_communication_addFriendGroup_NullId(){
+			$args->member_srl = 202;
+                        $args->title = "Grup";
+                        $args->friend_group_srl = trim(null);
+
+                        $output = executeQuery("communication.addFriendGroup", $args);
+                        $this->assertEquals(0, $output->error, $output->message);
+
+             }
+
+                protected function tearDown() {
+                    $db = &DB::getInstance();
+                    $db->_query("DELETE FROM xe_modules WHERE module_srl = 47374");
+                    $db->_query("DELETE FROM xe_documents WHERE document_srl = 9200");
+                    $db->_query("DELETE FROM xe_member_friend_group WHERE member_srl = 202");
+                    $db->close();
+
+                    parent::tearDown();
+                }
+
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php b/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php
new file mode 100644
index 000000000..96682c210
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridInsertTest.php
@@ -0,0 +1,127 @@
+<?php
+
+	class CubridInsertTest extends CubridTest {
+
+		function _test($xml_file, $argsString, $expected){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getInsertSql');
+		}
+
+
+                /**
+                 * Note: this test can fail when comaparing regdate from the $args with
+                 * regdate from the expected string - a few seconds difference
+                 */
+		function test_module_insertModule(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/insertModule.xml";
+			$argsString = ' $args->module_category_srl = 0;
+							$args->browser_title = "test";
+							$args->layout_srl = 0;
+							$args->mlayout_srl = 0;
+							$args->module = "page";
+							$args->mid = "test";
+							$args->site_srl = 0;
+							$args->module_srl = 47374;';
+			$expected = 'insert into "xe_modules"
+							("site_srl"
+							, "module_srl"
+							, "module_category_srl"
+							, "mid"
+							, "browser_title"
+							, "layout_srl"
+							, "module"
+							, "is_default"
+							, "open_rss"
+							, "regdate"
+							, "mlayout_srl"
+							, "use_mobile")
+							values
+							(0
+							, 47374
+							, 0
+							, \'test\'
+							, \'test\'
+							, 0
+							, \'page\'
+							, \'n\'
+							, \'y\'
+							, \''.date("YmdHis").'\'
+							, 0
+							, \'n\')';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+                function test_module_insertSiteTodayStatus(){
+			//\''.date("YmdHis").'\'
+			$xml_file = _XE_PATH_ . "modules/counter/queries/insertTodayStatus.xml";
+			$argsString = ' $args->regdate = 0;
+							$args->unique_visitor = 0;
+							$args->pageview = 0;';
+			$expected = 'insert into "xe_counter_status"
+						 	("regdate"
+							, "unique_visitor"
+							, "pageview")
+							values
+							('.date("YmdHis").'
+							, 0
+							, 0)';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_insertCounterLog(){
+			$xml_file = _XE_PATH_ . "modules/counter/queries/insertCounterLog.xml";
+			$argsString = ' $args->site_srl = 0;
+							$args->regdate = "20110607120619";
+							$args->ipaddress = "127.0.0.1";
+							$args->user_agent = "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Safari/534.24";';
+			$expected = 'insert into "xe_counter_log"
+ 						("site_srl", "regdate", "ipaddress", "user_agent")
+ 						VALUES (0, \'20110607120619\', \'127.0.0.1\', \'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Safari/534.24\')
+ 						';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_insertMember(){
+			$xml_file = _XE_PATH_ . "modules/member/queries/insertMember.xml";
+			$argsString = ' $args->member_srl = 203;
+							$args->user_id = "cacao";
+							$args->email_address = "teta@ar.ro";
+							$args->password = "23e5484cb88f3c07bcce2920a5e6a2a7";
+							$args->email_id = "teta";
+							$args->email_host = "ar.ro";
+							$args->user_name = "trident";
+							$args->nick_name = "aloha";
+							$args->homepage = "http://jkgjfk./ww";
+							$args->allow_mailing = "Y";
+							$args->allow_message = "Y";
+							$args->denied = "N";
+							$args->regdate = "20110607121952";
+							$args->change_password_date = "20110607121952";
+							$args->last_login = "20110607121952";
+							$args->is_admin = "N";
+							$args->extra_vars = "O:8:\"stdClass\":2:{s:4:\"body\";s:0:\"\";s:7:\"_filter\";s:6:\"insert\";}";
+							$args->list_order = -203;
+							';
+			$expected = 'INSERT INTO "xe_member"
+ 						("member_srl", "user_id", "email_address", "password", "email_id", "email_host", "user_name", "nick_name",
+  						"homepage", "allow_mailing", "allow_message", "denied", "regdate", "change_password_date",
+   						"last_login", "is_admin", "extra_vars", "list_order")
+ 						VALUES (203, \'cacao\', \'teta@ar.ro\', \'23e5484cb88f3c07bcce2920a5e6a2a7\', \'teta\', \'ar.ro\', \'trident\',
+ 						\'aloha\', \'http://jkgjfk./ww\', \'Y\', \'Y\', \'N\', \'20110607121952\', \'20110607121952\',
+ 						\'20110607121952\', \'N\', \'O:8:"stdClass":2:{s:4:"body";s:0:"";s:7:"_filter";s:6:"insert";}\', -203)';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_insertModuleExtraVars(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/insertModuleExtraVars.xml";
+			$argsString = ' $args->module_srl = 202;
+							$args->name = "_filter";
+							$args->value = "insert_page";
+							';
+			$expected = 'INSERT INTO "xe_module_extra_vars"
+ 						("module_srl", "name", "value")
+ 						VALUES (202, \'_filter\', \'insert_page\')
+ 						';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php b/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php
new file mode 100644
index 000000000..601d0f9b1
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridSelectOnlineTest.php
@@ -0,0 +1,76 @@
+<?php
+
+    class CubridSelectOnlineTest extends CubridOnlineTest {
+
+        function test_get_module_by_mid(){
+            $args->mid = 'test_4l8ci4vv0n';
+            $args->site_srl = 0;
+            $output = executeQuery('module.getMidInfo', $args);
+            $this->assertNotNull($output);
+            $this->assertNotNull($output->data, $output->message . PHP_EOL . $output->variables["_query"]);
+            $this->assertEquals($output->data->module_srl, 111);
+        }
+
+        /**
+         * Tests that when a column list is given, the query only selects those columns from the database
+         * insetad of retrieving all table columns (as specified in the xml query file)
+         */
+        function test_get_module_by_mid_columnList(){
+            $args->mid = 'test_4l8ci4vv0n';
+            $args->site_srl = 0;
+            $output = executeQuery('module.getMidInfo', $args, array('module_srl'));
+            $this->assertNotNull($output);
+            $this->assertNotNull($output->data, $output->message . PHP_EOL . $output->variables["_query"]);
+            $this->assertEquals($output->data->module_srl, 111);
+            $this->assertEquals($output->data->module, null);
+        }
+
+        function test_module_getInfo(){
+            $args->site_srl = 0;
+            $output = executeQuery('module.getSiteInfo', $args);
+            $this->assertTrue(is_a($output, 'Object'));
+            $this->assertEquals(0, $output->error, $output->message . PHP_EOL . $output->variables["_query"]);
+        }
+
+        function test_document_getDocumentList_pagination(){
+            $args->sort_index = 'list_order';
+            $args->order_type = 'asc';
+            $args->page = 1;
+            $args->list_count = 30;
+            $args->page_count = 10;
+            $args->s_member_srl = 4;
+
+            $output = executeQuery('document.getDocumentList', $args);
+            $this->assertEquals(0, $output->error, $output->message . PHP_EOL . $output->variables["_query"]);
+        }
+
+        function test_syndication_getDocumentList(){
+            $args->module_srl = NULL;
+            $args->exclude_module_srl = NULL;
+            $args->category_srl = NULL;
+            $args->sort_index = 'list_order';
+            $args->order_type = 'asc';
+            $args->page = 5;
+            $args->list_count = 30;
+            $args->page_count = 10;
+            $args->start_date = NULL;
+            $args->end_date = NULL;
+            $args->member_srl = NULL;
+            $output = executeQuery('document.getDocumentList', $args);
+
+            $this->assertTrue(is_int($output->page), $output->message . PHP_EOL . $output->variables["_query"]);
+        }
+
+        function test_member_getMemberList(){
+            $args->is_admin = '';
+            $args->is_denied = '';
+            $args->sort_index = "list_order";
+            $args->sort_order = 'asc';
+            $args->list_count = 40;
+            $args->page_count = 10;
+
+            $output = executeQuery('member.getMemberList', $args);
+            $this->assertEquals(0, $output->error, $output->message . PHP_EOL . $output->variables["_query"]);
+        }
+        }
+?>
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php b/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php
new file mode 100644
index 000000000..c5192733a
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridSelectTest.php
@@ -0,0 +1,396 @@
+<?php
+
+	class CubridSelectTest extends CubridTest {
+
+                function _test($xml_file, $argsString, $expected, $columnList = null){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql', $columnList);
+		}
+
+		function testSelectStar(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getAdminId.xml";
+			$argsString = '$args->module_srl = 10;';
+			$expected = 'SELECT * FROM "xe_module_admins" as "module_admins" , "xe_member" as "member" WHERE "module_srl" = 10 and "member"."member_srl" = "module_admins"."member_srl"';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function testRequiredParameter(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getAdminId.xml";
+			$argsString = '';
+			$expected = 'Date incorecte! Query-ul nu a putut fi executat.';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function testWithoutCategoriesTag(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getModuleCategories.xml";
+			$argsString = '';
+			$expected = 'SELECT * FROM "xe_module_categories" as "module_categories" ORDER BY "title" asc';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_getDefaultModules(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getDefaultModules.xml";
+			$argsString = '$args->site_srl = 0;';
+			$expected = 'SELECT "modules"."site_srl"
+							, "modules"."module"
+							, "modules"."mid"
+							, "modules"."browser_title"
+							, "module_categories"."title" as "category"
+							, "modules"."module_srl"
+						FROM "xe_modules" as "modules"
+							left join "xe_module_categories" as "module_categories"
+								on "module_categories"."module_category_srl" = "modules"."module_category_srl"
+						WHERE "modules"."site_srl" = 0
+						ORDER BY "modules"."module" asc, "module_categories"."title" asc, "modules"."mid" asc';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_getSiteInfo(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getSiteInfo.xml";
+			$argsString = '$args->site_srl = 0;';
+			$expected = 'SELECT "modules"."site_srl" as "module_site_srl"
+							, "modules"."module_srl" as "module_srl"
+							, "modules"."module" as "module"
+							, "modules"."module_category_srl" as "module_category_srl"
+							, "modules"."layout_srl" as "layout_srl"
+							, "modules"."mlayout_srl" as "mlayout_srl"
+							, "modules"."use_mobile" as "use_mobile"
+							, "modules"."menu_srl" as "menu_srl"
+							, "modules"."mid" as "mid"
+							, "modules"."skin" as "skin"
+							, "modules"."mskin" as "mskin"
+							, "modules"."browser_title" as "browser_title"
+							, "modules"."description" as "description"
+							, "modules"."is_default" as "is_default"
+							, "modules"."content" as "content"
+							, "modules"."mcontent" as "mcontent"
+							, "modules"."open_rss" as "open_rss"
+							, "modules"."header_text" as "header_text"
+							, "modules"."footer_text" as "footer_text"
+							, "modules"."regdate" as "regdate"
+							, "sites"."site_srl" as "site_srl"
+							, "sites"."domain" as "domain"
+							, "sites"."index_module_srl" as "index_module_srl"
+							, "sites"."default_language" as "default_language"
+						FROM "xe_sites" as "sites"
+							left join "xe_modules" as "modules" on  "modules"."module_srl" = "sites"."index_module_srl"
+						WHERE  "sites"."site_srl" = 0   ';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_addon_getAddonInfo(){
+			$xml_file = _XE_PATH_ . "modules/addon/queries/getAddonInfo.xml";
+			$argsString = '$args->addon = "captcha";';
+			$expected = 'SELECT *
+						FROM "xe_addons" as "addons"
+						WHERE  "addon" = \'captcha\' ';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_addon_getAddons(){
+			$xml_file = _XE_PATH_ . "modules/addon/queries/getAddons.xml";
+			$argsString = '';
+			$expected = 'SELECT *
+						FROM "xe_addons" as "addons"
+						ORDER BY "addon" asc';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_admin_getCommentCount(){
+			$xml_file = _XE_PATH_ . "modules/admin/queries/getCommentCount.xml";
+			$argsString = '';
+			$expected = 'SELECT count(*) as "count"
+						FROM "xe_comments" as "comments"';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_admin_getCommentDeclaredStatus(){
+			$xml_file = _XE_PATH_ . "modules/admin/queries/getCommentDeclaredStatus.xml";
+			$argsString = '$args->date = "20110411";';
+			$expected = 'SELECT substr("regdate",1,8) as "date", count(*) as "count"
+				FROM "xe_comment_declared_log" as "comment_declared_log"
+				WHERE  "regdate" >= \'20110411\'
+				GROUP BY substr("regdate",1,8)
+				ORDER BY substr("regdate",1,8) asc limit 2';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_member_getAutoLogin(){
+			$xml_file = _XE_PATH_ . "modules/member/queries/getAutoLogin.xml";
+			$argsString = '$args->autologin_key = 10;';
+			$expected = 'SELECT "member"."user_id" as "user_id"
+							, "member"."password" as "password"
+							, "member_autologin"."autologin_key" as "autologin_key"
+						FROM "xe_member" as "member" , "xe_member_autologin" as "member_autologin"
+						WHERE  "member_autologin"."autologin_key" = \'10\'
+							and "member"."member_srl" = "member_autologin"."member_srl"';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_opage_getOpageList(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/opage.getOpageList.xml";
+			$argsString = '$args->s_title = "yuhuu";
+							$args->module = \'opage\';';
+			$expected = 'SELECT *
+						FROM "xe_modules" as "modules"
+						WHERE  "module" = \'opage\' and ("title" like \'%yuhuu%\')
+						ORDER BY "module_srl" desc
+						LIMIT 0, 20';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_syndication_getGrantedModules(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getGrantedModules.xml";
+			$argsString = '$args->module_srl = 12;
+                                       $args->name = array(\'access\',\'view\',\'list\');';
+			$expected = 'select "module_srl"
+						 from "xe_module_grants" as "module_grants"
+						 where "name" in (\'access\',\'view\',\'list\')
+						 	and ("group_srl" >= 1
+						 			or "group_srl" = -1
+						 			or "group_srl" = -2)
+						 group by "module_srl"';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+                function test_document_getDocumentList(){
+                    $xml_file = _XE_PATH_ . "modules/document/queries/getDocumentList.xml";
+                    $argsString = '$args->sort_index = \'list_order\';
+                                    $args->order_type = \'asc\';
+                                    $args->page = 1;
+                                    $args->list_count = 30;
+                                    $args->page_count = 10;
+                                    $args->s_member_srl = 4;';
+                    $expected = 'select *
+                                    from "xe_documents" as "documents"
+                                    where ("member_srl" = 4)
+                                        and "list_order" <= 2100000000
+                                    order by "list_order" asc
+                                    limit 0, 30';
+                    $this->_test($xml_file, $argsString, $expected);
+
+
+                }
+
+                /**
+                 * Test column list
+                 */
+                function test_session_getSession(){
+                    $xml_file = _XE_PATH_ . "modules/session/queries/getSession.xml";
+                    $argsString = '$args->session_key = \'session_key\';';
+                    $columnList = array('session_key', 'cur_mid', 'val');
+
+                    $expected = 'select "session_key", "cur_mid", "val"
+                                 from "xe_session" as "session"
+                                 where "session_key" = \'session_key\'';
+
+                    $this->_test($xml_file, $argsString, $expected, $columnList);
+                }
+
+                function test_module_getModuleInfoByDocument(){
+                    $xml_file = _XE_PATH_ . "modules/module/queries/getModuleInfoByDocument.xml";
+                    $argsString = '$args->document_srl = 10;';
+                    $expected = 'SELECT "modules".*
+                        FROM "xe_modules" as "modules"
+                                , "xe_documents" as "documents"
+                        WHERE  "documents"."document_srl" = 10
+                                and "modules"."module_srl" = "documents"."module_srl"';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_member_getMemberList(){
+                    $xml_file = _XE_PATH_ . "modules/member/queries/getMemberList.xml";
+                    $argsString = '$args->is_admin = \'\';
+                                    $args->is_denied = \'\';
+                                    $args->sort_index = "list_order";
+                                    $args->sort_order = \'asc\';
+                                    $args->list_count = 40;
+                                    $args->page_count = 10;';
+                    $expected = 'select *
+                                    from "xe_member" as "member"
+                                    where "list_order" <= 2100000000
+                                 order by "list_order" asc
+                                 limit 0, 40';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                /**
+                 * Tests "not in" query condition
+                 * Query argument is a single value - not in (12)
+                 */
+                function test_module_getModules_Notin_Single_Value(){
+                    $xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getModules.xml";
+                    $argsString = '$args->except_module_srls = 12;';
+                    $expected = 'select "modules"."site_srl" as "site_srl"
+                                    , "modules"."module_srl" as "module_srl"
+                                    , "sites"."domain" as "domain"
+                                    , "modules"."mid" as "mid"
+                                    , "modules"."module" as "module"
+                                    , "modules"."browser_title" as "browser_title"
+                                    , "modules"."description" as "description"
+                                from "xe_sites" as "sites"
+                                    , "xe_modules" as "modules"
+                                        left join "xe_syndication_except_modules" as "except_modules"
+                                            on "modules"."module_srl" = "except_modules"."module_srl"
+                                where "modules"."module_srl" not in (12)
+                                    and "sites"."site_srl" = "modules"."site_srl"
+                                    and "except_modules"."module_srl" is null';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_module_getModules_Notin_Multiple_Value_String(){
+                    $xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getModules.xml";
+                    $argsString = '$args->except_module_srls = "12, 13, 14";';
+                    $expected = 'select "modules"."site_srl" as "site_srl"
+                                    , "modules"."module_srl" as "module_srl"
+                                    , "sites"."domain" as "domain"
+                                    , "modules"."mid" as "mid"
+                                    , "modules"."module" as "module"
+                                    , "modules"."browser_title" as "browser_title"
+                                    , "modules"."description" as "description"
+                                from "xe_sites" as "sites"
+                                    , "xe_modules" as "modules"
+                                        left join "xe_syndication_except_modules" as "except_modules"
+                                            on "modules"."module_srl" = "except_modules"."module_srl"
+                                where "modules"."module_srl" not in (12,13,14)
+                                    and "sites"."site_srl" = "modules"."site_srl"
+                                    and "except_modules"."module_srl" is null';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_module_getModules_Notin_Multiple_Value_Array(){
+                    $xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getModules.xml";
+                    $argsString = '$args->except_module_srls = array(12, 13, 14);';
+                    $expected = 'select "modules"."site_srl" as "site_srl"
+                                    , "modules"."module_srl" as "module_srl"
+                                    , "sites"."domain" as "domain"
+                                    , "modules"."mid" as "mid"
+                                    , "modules"."module" as "module"
+                                    , "modules"."browser_title" as "browser_title"
+                                    , "modules"."description" as "description"
+                                from "xe_sites" as "sites"
+                                    , "xe_modules" as "modules"
+                                        left join "xe_syndication_except_modules" as "except_modules"
+                                            on "modules"."module_srl" = "except_modules"."module_srl"
+                                where "modules"."module_srl" not in (12,13,14)
+                                    and "sites"."site_srl" = "modules"."site_srl"
+                                    and "except_modules"."module_srl" is null';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+               function test_module_getModules_In_Single_Value(){
+                    $xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getModules.xml";
+                    $argsString = '$args->module_srls = 12;';
+                    $expected = 'select "modules"."site_srl" as "site_srl"
+                                    , "modules"."module_srl" as "module_srl"
+                                    , "sites"."domain" as "domain"
+                                    , "modules"."mid" as "mid"
+                                    , "modules"."module" as "module"
+                                    , "modules"."browser_title" as "browser_title"
+                                    , "modules"."description" as "description"
+                                from "xe_sites" as "sites"
+                                    , "xe_modules" as "modules"
+                                        left join "xe_syndication_except_modules" as "except_modules"
+                                            on "modules"."module_srl" = "except_modules"."module_srl"
+                                where "modules"."module_srl" in (12)
+                                    and "sites"."site_srl" = "modules"."site_srl"
+                                    and "except_modules"."module_srl" is null';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_module_getModules_In_Multiple_Value_String(){
+                    $xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getModules.xml";
+                    $argsString = '$args->module_srls = "12, 13, 14";';
+                    $expected = 'select "modules"."site_srl" as "site_srl"
+                                    , "modules"."module_srl" as "module_srl"
+                                    , "sites"."domain" as "domain"
+                                    , "modules"."mid" as "mid"
+                                    , "modules"."module" as "module"
+                                    , "modules"."browser_title" as "browser_title"
+                                    , "modules"."description" as "description"
+                                from "xe_sites" as "sites"
+                                    , "xe_modules" as "modules"
+                                        left join "xe_syndication_except_modules" as "except_modules"
+                                            on "modules"."module_srl" = "except_modules"."module_srl"
+                                where "modules"."module_srl" in (12,13,14)
+                                    and "sites"."site_srl" = "modules"."site_srl"
+                                    and "except_modules"."module_srl" is null';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_module_getModules_In_Multiple_Value_Array(){
+                    $xml_file = _TEST_PATH_ . "db/xml_query/cubrid/data/syndication.getModules.xml";
+                    $argsString = '$args->module_srls = array(12, 13, 14);';
+                    $expected = 'select "modules"."site_srl" as "site_srl"
+                                    , "modules"."module_srl" as "module_srl"
+                                    , "sites"."domain" as "domain"
+                                    , "modules"."mid" as "mid"
+                                    , "modules"."module" as "module"
+                                    , "modules"."browser_title" as "browser_title"
+                                    , "modules"."description" as "description"
+                                from "xe_sites" as "sites"
+                                    , "xe_modules" as "modules"
+                                        left join "xe_syndication_except_modules" as "except_modules"
+                                            on "modules"."module_srl" = "except_modules"."module_srl"
+                                where "modules"."module_srl" in (12,13,14)
+                                    and "sites"."site_srl" = "modules"."site_srl"
+                                    and "except_modules"."module_srl" is null';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_module_getModuleSrlByMid_In_Multiple_Value_Array_Strings(){
+                    $xml_file = _XE_PATH_ . "modules/module/queries/getModuleSrlByMid.xml";
+                    $argsString = '$args->mid = "\'mid1\', \'mid2\'";';
+                    $expected = 'select "module_srl" from "xe_modules" as "modules" where "mid" in (\'mid1\',\'mid2\')';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+
+               function test_file_getFileList_In_Empty_Array_Value(){
+                    $xml_file = _XE_PATH_ . "modules/file/queries/getFileList.xml";
+                    $argsString = '$args->exclude_module_srl = 12; $args->s_module_srl = array(); ';
+                    $expected = 'select "files".*
+                                    from "xe_files" as "files"
+                                        left join "xe_member" as "member" on "files"."member_srl" = "member"."member_srl"
+                                    where "files"."module_srl" not in (12)
+                                    order by "files"."file_srl" desc
+                                    limit 0, 20';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+               function test_file_getFileList_Not_In_Empty_String_Value(){
+                    $xml_file = _XE_PATH_ . "modules/file/queries/getFileList.xml";
+                    $argsString = '$args->exclude_module_srl = ""; $args->s_module_srl = array(12); ';
+                    $expected = 'select "files".*
+                                    from "xe_files" as "files"
+                                        left join "xe_member" as "member" on "files"."member_srl" = "member"."member_srl"
+                                    where "files"."module_srl" in (12)
+                                    order by "files"."file_srl" desc
+                                    limit 0, 20';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_document_getDeclaredList_In_Query(){
+                    $xml_file = _XE_PATH_ . "modules/document/queries/getDeclaredList.xml";
+                    $argsString = "\$args->list_count = 30;
+                                    \$args->page_count = 10;
+                                    \$args->sort_index = 'document_declared.declared_count';
+                                    \$args->order_type = 'desc';";
+                    $expected = 'select * from "xe_documents" as "documents"
+                                    , "xe_document_declared" as "document_declared"
+                                    where "documents"."document_srl"
+                                        in ("document_declared"."document_srl")
+                                    order by "document_declared"."declared_count" desc
+                                    limit 0, 30';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_getExpiredSession_curdate(){
+                    $xml_file = _XE_PATH_ . "modules/session/queries/getExpiredSessions.xml";
+                    $argsString = '';
+                    $expected = 'select "session_key"
+                                        from "xe_session" as "session"
+                                        where "expired" <= \'' . date("YmdHis") . '\'';
+                    $this->_test($xml_file, $argsString, $expected);
+                }
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php b/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php
new file mode 100644
index 000000000..81fbcf5b1
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridSubqueryTest.php
@@ -0,0 +1,191 @@
+<?php
+
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+    class CubridSubqueryTest extends CubridTest {
+        var $xmlPath = 'data/';
+        
+        function CubridSubqueryTest(){
+            $this->xmlPath = str_replace('CubridSubqueryTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+        }
+        
+        function _test($xml_file, $argsString, $expected){
+            $this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql');
+        }
+        
+        function testSelectUncorrelated1(){
+                $xml_file = $this->xmlPath . "select_uncorrelated1.xml";
+                $argsString = '$args->user_id = 4;
+                                 ';
+                $expected = 'select "column_a" as "value_a"
+                            , (select max("column_b") as "count" 
+                               from "xe_table_b" as "table_b"
+                               ) as "value_b" 
+                             from "xe_table_a" as "table_a" 
+                             where "column_a" = 4';
+                $this->_test($xml_file, $argsString, $expected);
+        }        
+        
+        function testSelectUncorrelated2(){
+                $xml_file = $this->xmlPath . "select_uncorrelated2.xml";
+                $argsString = '$args->user_id = 4;
+                                $args->user_name = 7;
+                                ';
+                $expected = 'SELECT "column_a" as "value_a"
+                                    , "column_b" as "value_b"
+                                    , "column_c" as "value_c"
+                                    , (SELECT max("column_b") as "count"  
+                                       FROM "xe_table_b" as "table_b"   
+                                       WHERE  "column_ab" = 7) as "value_b"  
+                            FROM "xe_table_a" as "table_a"   
+                            WHERE "column_a" = 4';
+                $this->_test($xml_file, $argsString, $expected);
+        }      
+        
+        function testFromUncorrelated1(){
+                $xml_file = $this->xmlPath . "from_uncorrelated1.xml";
+                $argsString = '$args->user_id = 4;
+                                $args->user_name = 7;
+                                ';
+                $expected = 'select max("documentcountbymember"."count") as "maxcount" 
+                             from (
+                                            select "member_srl" as "member_srl"
+                                                            , count(*) as "count" 
+                                            from "xe_documents" as "documents" 
+                                            group by "member_srl"
+                                    ) as "documentcountbymember"';
+                $this->_test($xml_file, $argsString, $expected);
+        }  
+        
+//        function testFromUncorrelated2(){
+//                $xml_file = $this->xmlPath . "from_uncorrelated1.xml";
+//                $argsString = '$args->user_id = 4;
+//                                $args->user_name = 7;
+//                                ';
+//                $expected = 'select max("documentcountbymember"."count") as "maxcount" 
+//                             from (
+//                                            select "member_srl" as "member_srl"
+//                                                            , count(*) as "count" 
+//                                            from "xe_documents" as "documents" 
+//                                            group by "member_srl"
+//                                    ) as "documentcountbymember"';
+//                $this->_test($xml_file, $argsString, $expected);
+//        }             
+        
+        function testFromUncorrelated2(){
+                $xml_file = $this->xmlPath . "from_uncorrelated2.xml";
+                $argsString = '$args->member_srl = 4;
+                                $args->module_srl = 7;
+                                ';
+                $expected = 'select max("documentcountbymember"."count") as "maxcount" 
+                             from (
+                                            select "member_srl" as "member_srl"
+                                                            , count(*) as "count" 
+                                            from "xe_documents" as "documents" 
+                                            where "module_srl" = 7
+                                            group by "member_srl"
+                                    ) as "documentcountbymember"
+                             where "member_srl" = 4
+                ';
+                $this->_test($xml_file, $argsString, $expected);
+        }         
+        
+        function testSelectCorrelated1(){
+                $xml_file = $this->xmlPath . "select_correlated1.xml";
+                $argsString = '$args->user_id = 7;';
+                $expected = 'select *, 
+                            (select count(*) as "count" 
+                                from "xe_documents" as "documents" 
+                                where "documents"."user_id" = "member"."user_id"
+                             ) as "totaldocumentcount" 
+                            from "xe_member" as "member" 
+                            where "user_id" = \'7\'';
+                $this->_test($xml_file, $argsString, $expected);
+        }             
+
+        function testSelectCorrelated2(){
+                $xml_file = $this->xmlPath . "select_correlated2.xml";
+                $argsString = '$args->user_id = 7;
+                    $args->module_srl = 17;
+                    ';
+                $expected = 'select *, 
+                            (select count(*) as "count" 
+                                from "xe_documents" as "documents" 
+                                where "documents"."user_id" = "member"."user_id"
+                                    and "module_srl" = 17
+                             ) as "totaldocumentcount" 
+                            from "xe_member" as "member" 
+                            where "user_id" = \'7\'';
+                $this->_test($xml_file, $argsString, $expected);
+        }           
+        
+        function testWhereCorrelated1(){
+                $xml_file = $this->xmlPath . "where_correlated1.xml";
+                $argsString = '';
+                $expected = 'select * 
+                             from "xe_member" as "member" 
+                             where "regdate" = (
+                                                select max("regdate") as "maxregdate" 
+                                                from "xe_documents" as "documents"
+                                                where "documents"."user_id" = "member"."user_id"
+                                                )';
+                $this->_test($xml_file, $argsString, $expected);
+        }             
+        
+        function testWhereCorrelated2(){
+                $xml_file = $this->xmlPath . "where_correlated2.xml";
+                $argsString = '$args->module_srl = 12; $args->member_srl = 19;';
+                $expected = 'select * 
+                             from "xe_member" as "member" 
+                             where "member_srl" = 19  
+                                and "regdate" = (
+                                                select max("regdate") as "maxregdate" 
+                                                from "xe_documents" as "documents"
+                                                where "documents"."user_id" = "member"."user_id"
+                                                    and "module_srl" = 12
+                                                )         
+                                                ';
+                $this->_test($xml_file, $argsString, $expected);
+        }             
+        
+        function testFromCorrelated1(){
+                $xml_file = $this->xmlPath . "from_correlated1.xml";
+                $argsString = '';
+                $expected = 'select "m"."member_srl"
+                            , "m"."nickname"
+                            , "m"."regdate"
+                            , "a"."count" 
+                            from (
+                                select "member_srl" as "member_srl"
+                                        , count(*) as "count" 
+                                from "xe_documents" as "documents" 
+                                group by "member_srl"
+                               ) as "a" 
+                               left join "xe_member" as "m" on "m"."member" = "a"."member_srl"';
+                $this->_test($xml_file, $argsString, $expected);
+        }     
+        
+        function testFromCorrelated2(){
+                $xml_file = $this->xmlPath . "from_correlated2.xml";
+                $argsString = '$args->module_srl = 12; $args->count = 20;';
+                $expected = 'select "m"."member_srl"
+                            , "m"."nickname"
+                            , "m"."regdate"
+                            , "a"."count" 
+                            from (
+                                select "member_srl" as "member_srl"
+                                        , count(*) as "count" 
+                                from "xe_documents" as "documents" 
+                                where "module_srl" = 12
+                                group by "member_srl"
+                               ) as "a" 
+                               left join "xe_member" as "m" on "m"."member" = "a"."member_srl"
+                            where "a"."count" >= 20
+';
+                $this->_test($xml_file, $argsString, $expected);
+        }            
+    }
+?>
diff --git a/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php b/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php
new file mode 100644
index 000000000..a836ea8b4
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/CubridUpdateTest.php
@@ -0,0 +1,97 @@
+<?php
+
+	class CubridUpdateTest extends CubridTest {
+
+                function _test($xml_file, $argsString, $expected){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getUpdateSql');
+		}
+
+		function test_module_updateModule(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/updateModule.xml";
+			$argsString = ' $args->module_category_srl = 0;
+							$args->browser_title = "test";
+							$args->layout_srl = 0;
+							$args->mlayout_srl = 0;
+							$args->module = "page";
+							$args->mid = "test";
+							$args->use_mobile = "";
+							$args->site_srl = 0;
+							$args->module_srl = 47374;';
+                        $expected = 'update "xe_modules" as "modules"
+                                        set "module" = \'page\'
+                                            , "module_category_srl" = 0
+                                            , "layout_srl" = 0
+                                            , "mid" = \'test\'
+                                            , "browser_title" = \'test\'
+                                            , "description" = \'\'
+                                            , "is_default" = \'n\'
+                                            , "open_rss" = \'y\'
+                                            , "header_text" = \'\'
+                                            , "footer_text" = \'\'
+                                            , "mlayout_srl" = 0
+                                            , "use_mobile" = \'n\'
+                                    where "site_srl" = 0 and "module_srl" = 47374';
+//			$expected = 'UPDATE "xe_modules" as "modules"
+//						 SET "module" = \'page\'
+//						 	, "mid" = \'test\'
+//						 	, "browser_title" = \'test\'
+//						 	, "description" = \'\'
+//						 	, "is_default" = \'N\'
+//						 	, "open_rss" = \'Y\'
+//						 	, "header_text" = \'\'
+//						 	, "footer_text" = \'\'
+//						 	, "use_mobile" = \'n\'
+//						WHERE  "site_srl" = 0
+//						AND "module_srl" = 47374';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+		function test_member_updateLastLogin(){
+			$xml_file = _XE_PATH_ . "modules/member/queries/updateLastLogin.xml";
+			$argsString = ' $args->member_srl = 4;
+							$args->last_login = "20110607120549";';
+			$expected = 'UPDATE "xe_member" as "member" SET "member_srl" = 4, "last_login" = \'20110607120549\'  WHERE  "member_srl" = 4';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_updatePoint(){
+			$xml_file = _XE_PATH_ . "modules/point/queries/updatePoint.xml";
+			$argsString = ' $args->member_srl = 4;
+							$args->point = 105;';
+			$expected = 'UPDATE "xe_point" as "point" SET "point" = 105  WHERE  "member_srl" = 4';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_updateCounterUnique(){
+			$xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml";
+			$argsString = '$args->regdate = 20110607;
+							';
+			$expected = 'UPDATE "xe_counter_status" as "counter_status" SET "unique_visitor" = "unique_visitor" + 1,
+						"pageview" = "pageview" + 1  WHERE  "regdate" = 20110607 ';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_updateMenu(){
+			$xml_file = _XE_PATH_ . "modules/menu/queries/updateMenu.xml";
+			$argsString = '$args->menu_srl = 204;
+						$args->title = "test_menu";
+						';
+			$expected = 'UPDATE "xe_menu" as "menu" SET "title" = \'test_menu\'  WHERE  "menu_srl" = 204';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+
+		function test_menu_updateMenuItemNode(){
+			$xml_file = _XE_PATH_ . "modules/menu/queries/updateMenuItemNode.xml";
+			$argsString = '$args->parent_srl = 0;
+                            $args->menu_srl = 237423;
+                            $args->listorder = -8;
+                            $args->menu_item_srl = 237431;';
+			$expected = 'UPDATE "xe_menu_item" as "menu_item" SET "parent_srl" = 0, "listorder" = -8 WHERE  "menu_item_srl" = 237431';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+//	$queryTester->test_admin_deleteActionForward();
+//	$queryTester->test_module_insertModule();
+
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/from_correlated1.xml b/tests/classes/db/db/xml_query/cubrid/data/from_correlated1.xml
new file mode 100644
index 000000000..7c2c27143
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/from_correlated1.xml
@@ -0,0 +1,27 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table query="true" alias="a">
+        	<tables>
+        		<table name="documents" alias="documents" />
+        	</tables>
+        	<columns>
+        		<column name="member_srl" alias="member_srl" />
+        		<column name="count(*)" alias="count" />
+        	</columns>
+                <groups>
+                   <group column="member_srl" />
+                </groups>        		        	
+        </table>
+        <table name="member" alias="m" type="left join">
+            <conditions>
+                <condition operation="equal" column="m.member" default="a.member_srl" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="m.member_srl" />
+        <column name="m.nickname" />
+        <column name="m.regdate" />
+        <column name="a.count" />
+    </columns>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/from_correlated2.xml b/tests/classes/db/db/xml_query/cubrid/data/from_correlated2.xml
new file mode 100644
index 000000000..8dc162154
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/from_correlated2.xml
@@ -0,0 +1,33 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table query="true" alias="a">
+        	<tables>
+        		<table name="documents" alias="documents" />
+        	</tables>
+        	<columns>
+        		<column name="member_srl" alias="member_srl" />
+        		<column name="count(*)" alias="count" />
+        	</columns>
+                <conditions>
+                    <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" />
+                </conditions>        		        	                
+                <groups>
+                   <group column="member_srl" />
+                </groups>        		        	
+        </table>
+        <table name="member" alias="m" type="left join">
+            <conditions>
+                <condition operation="equal" column="m.member" default="a.member_srl" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="m.member_srl" />
+        <column name="m.nickname" />
+        <column name="m.regdate" />
+        <column name="a.count" />
+    </columns>
+    <conditions>
+        <condition operation="more" column="a.count" var="count" notnull="notnull" />
+    </conditions>        		        	                    
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/from_uncorrelated1.xml b/tests/classes/db/db/xml_query/cubrid/data/from_uncorrelated1.xml
new file mode 100644
index 000000000..ec83f3f36
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/from_uncorrelated1.xml
@@ -0,0 +1,19 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table query="true" alias="documentCountByMember">
+        	<tables>
+        		<table name="documents" alias="documents" />
+        	</tables>
+        	<columns>
+        		<column name="member_srl" alias="member_srl" />
+        		<column name="count(*)" alias="count" />
+        	</columns>
+		    <groups>
+		       <group column="member_srl" />
+		    </groups>        		        	
+        </table>
+    </tables>
+    <columns>
+        <column name="MAX(documentCountByMember.count)" alias="maxCount" />
+    </columns>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/from_uncorrelated2.xml b/tests/classes/db/db/xml_query/cubrid/data/from_uncorrelated2.xml
new file mode 100644
index 000000000..6431b3b90
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/from_uncorrelated2.xml
@@ -0,0 +1,25 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table query="true" alias="documentCountByMember">
+        	<tables>
+        		<table name="documents" alias="documents" />
+        	</tables>
+        	<columns>
+        		<column name="member_srl" alias="member_srl" />
+        		<column name="count(*)" alias="count" />
+        	</columns>
+                <conditions>
+                        <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" />
+                </conditions>     
+                <groups>
+                   <group column="member_srl" />
+                </groups>        		        	
+        </table>
+    </tables>
+    <columns>
+        <column name="MAX(documentCountByMember.count)" alias="maxCount" />
+    </columns>
+    <conditions>
+            <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" />
+    </conditions>         
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/ignore_index_hint.xml b/tests/classes/db/db/xml_query/cubrid/data/ignore_index_hint.xml
new file mode 100644
index 000000000..e911abce5
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/ignore_index_hint.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="CUBRID">
+        <index table="member" name="idx_member_list_order" type="IGNORE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/index_hint_for_all.xml b/tests/classes/db/db/xml_query/cubrid/data/index_hint_for_all.xml
new file mode 100644
index 000000000..b0784fa94
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/index_hint_for_all.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="ALL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/mysql_index_hint.xml b/tests/classes/db/db/xml_query/cubrid/data/mysql_index_hint.xml
new file mode 100644
index 000000000..702080eb5
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/mysql_index_hint.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MYSQL">
+        <index table="member" name="idx_member_list_order" type="IGNORE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/one_index_hint_one_table.xml b/tests/classes/db/db/xml_query/cubrid/data/one_index_hint_one_table.xml
new file mode 100644
index 000000000..070ed3697
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/one_index_hint_one_table.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="CUBRID">
+        <index table="member" name="idx_member_list_order" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/modules/opage/queries/getOpageList.xml b/tests/classes/db/db/xml_query/cubrid/data/opage.getOpageList.xml
similarity index 97%
rename from modules/opage/queries/getOpageList.xml
rename to tests/classes/db/db/xml_query/cubrid/data/opage.getOpageList.xml
index 1703e5d4d..2e7964335 100644
--- a/modules/opage/queries/getOpageList.xml
+++ b/tests/classes/db/db/xml_query/cubrid/data/opage.getOpageList.xml
@@ -1,24 +1,24 @@
-<query id="getOpageList" action="select">
-    <tables>
-        <table name="modules" />
-    </tables>
-    <columns>
-        <column name="*" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module" default="opage" />
-        <group pipe="and">
-            <condition operation="like" column="mid" var="s_mid" pipe="or" />
-            <condition operation="like" column="title" var="s_title" pipe="or" />
-            <condition operation="like" column="comment" var="s_comment" pipe="or" />
-            <condition operation="equal" column="module" var="s_module" pipe="or" />
-            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
-        </group>
-    </conditions>
-    <navigation>
-        <index var="sort_index" default="module_srl" order="desc" />
-        <list_count var="list_count" default="20" />
-        <page_count var="page_count" default="10" />
-        <page var="page" default="1" />
-    </navigation>
-</query>
+<query id="getOpageList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+        <group pipe="and">
+            <condition operation="like" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/tests/classes/db/db/xml_query/cubrid/data/select_correlated1.xml b/tests/classes/db/db/xml_query/cubrid/data/select_correlated1.xml
new file mode 100644
index 000000000..797d878e3
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/select_correlated1.xml
@@ -0,0 +1,22 @@
+<query id="getStatistics" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+        <query id="getMemberDocumentCount" alias="totalDocumentCount">
+        	<tables>
+        		<table name="documents" alias="documents" />
+        	</tables>
+        	<columns>
+        		<column name="count(*)" alias="count" />
+        	</columns>
+                <conditions>
+                    <condition operation="equal" column="documents.user_id" default="member.user_id" />
+                </conditions>        	
+        </query>
+    </columns>
+    <conditions>
+        <condition operation="equal" column="user_id" var="user_id" notnull="notnull" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/select_correlated2.xml b/tests/classes/db/db/xml_query/cubrid/data/select_correlated2.xml
new file mode 100644
index 000000000..85ab25308
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/select_correlated2.xml
@@ -0,0 +1,23 @@
+<query id="getStatistics" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+        <query id="getMemberDocumentCount" alias="totalDocumentCount">
+        	<tables>
+        		<table name="documents" alias="documents" />
+        	</tables>
+        	<columns>
+        		<column name="count(*)" alias="count" />
+        	</columns>
+                <conditions>
+                    <condition operation="equal" column="documents.user_id" default="member.user_id" />
+                    <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" pipe="and" />
+                </conditions>        	
+        </query>
+    </columns>
+    <conditions>
+        <condition operation="equal" column="user_id" var="user_id" notnull="notnull" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/select_uncorrelated1.xml b/tests/classes/db/db/xml_query/cubrid/data/select_uncorrelated1.xml
new file mode 100644
index 000000000..00e556e35
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/select_uncorrelated1.xml
@@ -0,0 +1,19 @@
+<query id="select_uncorrelated" action="select">
+    <tables>
+        <table name="table_a" />
+    </tables>
+    <columns>
+        <column name="column_a" alias="value_a" />
+        <query alias="value_b">
+        	<tables>
+        		<table name="table_b" />
+        	</tables>
+        	<columns>
+        		<column name="max(column_b)" alias="count" />
+        	</columns>
+        </query>
+    </columns>
+    <conditions>
+        <condition operation="equal" column="column_a" var="user_id" notnull="notnull" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/select_uncorrelated2.xml b/tests/classes/db/db/xml_query/cubrid/data/select_uncorrelated2.xml
new file mode 100644
index 000000000..a42294bcf
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/select_uncorrelated2.xml
@@ -0,0 +1,24 @@
+<query id="select_uncorrelated" action="select">
+    <tables>
+        <table name="table_a" />
+    </tables>
+    <columns>
+        <column name="column_a" alias="value_a" />
+        <column name="column_b" alias="value_b" />
+        <query alias="value_b">
+        	<tables>
+        		<table name="table_b" />
+        	</tables>
+        	<columns>
+        		<column name="max(column_b)" alias="count" />
+        	</columns>
+		    <conditions>
+		        <condition operation="equal" column="column_ab" var="user_name" notnull="notnull" />
+		    </conditions>        	
+        </query>
+        <column name="column_c" alias="value_c" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="column_a" var="user_id" notnull="notnull" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/modules/syndication/queries/getGrantedModules.xml b/tests/classes/db/db/xml_query/cubrid/data/syndication.getGrantedModules.xml
similarity index 97%
rename from modules/syndication/queries/getGrantedModules.xml
rename to tests/classes/db/db/xml_query/cubrid/data/syndication.getGrantedModules.xml
index c72bd0a8a..97d2b4ec9 100644
--- a/modules/syndication/queries/getGrantedModules.xml
+++ b/tests/classes/db/db/xml_query/cubrid/data/syndication.getGrantedModules.xml
@@ -1,19 +1,19 @@
-<query id="getGrantedModules" action="select">
-    <tables>
-        <table name="module_grants" />
-    </tables>
-    <columns>
-        <column name="module_srl" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" />
-        <group pipe="and">
-            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
-            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
-            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
-        </group>
-    </conditions>
-    <groups>
-        <group column="module_srl" />
-    </groups>
-</query>
+<query id="getGrantedModules" action="select">
+    <tables>
+        <table name="module_grants" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" />
+        <group pipe="and">
+            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
+            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
+            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
+        </group>
+    </conditions>
+    <groups>
+        <group column="module_srl" />
+    </groups>
+</query>
diff --git a/modules/syndication/queries/getModules.xml b/tests/classes/db/db/xml_query/cubrid/data/syndication.getModules.xml
similarity index 98%
rename from modules/syndication/queries/getModules.xml
rename to tests/classes/db/db/xml_query/cubrid/data/syndication.getModules.xml
index ecb397cf4..fbbe83ad9 100644
--- a/modules/syndication/queries/getModules.xml
+++ b/tests/classes/db/db/xml_query/cubrid/data/syndication.getModules.xml
@@ -1,26 +1,26 @@
-<query id="getModules" action="select">
-    <tables>
-        <table name="sites" />
-        <table name="modules" />
-        <table name="syndication_except_modules" alias="except_modules" type="left join">
-            <conditions>
-                <condition operation="equal" column="modules.module_srl" default="except_modules.module_srl" />
-            </conditions>
-        </table>
-    </tables>
-    <columns>
-        <column name="modules.site_srl" alias="site_srl" />
-        <column name="modules.module_srl" alias="module_srl" />
-        <column name="sites.domain" alias="domain" />
-        <column name="modules.mid" alias="mid" />
-        <column name="modules.module" alias="module" />
-        <column name="modules.browser_title" alias="browser_title" />
-        <column name="modules.description" alias="description" />
-    </columns>
-    <conditions>
-        <condition operation="in" column="modules.module_srl" var="module_srls" />
-        <condition operation="notin" column="modules.module_srl" var="except_module_srls" pipe="and" />
-        <condition operation="equal" column="sites.site_srl" default="modules.site_srl" notnull="notnull" pipe="and" />
-        <condition operation="null" column="except_modules.module_srl" default="1" pipe="and" />
-    </conditions>
-</query>
+<query id="getModules" action="select">
+    <tables>
+        <table name="sites" />
+        <table name="modules" />
+        <table name="syndication_except_modules" alias="except_modules" type="left join">
+            <conditions>
+                <condition operation="equal" column="modules.module_srl" default="except_modules.module_srl" />
+            </conditions>
+        </table>
+    </tables>
+    <columns>
+        <column name="modules.site_srl" alias="site_srl" />
+        <column name="modules.module_srl" alias="module_srl" />
+        <column name="sites.domain" alias="domain" />
+        <column name="modules.mid" alias="mid" />
+        <column name="modules.module" alias="module" />
+        <column name="modules.browser_title" alias="browser_title" />
+        <column name="modules.description" alias="description" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="modules.module_srl" var="module_srls" />
+        <condition operation="notin" column="modules.module_srl" var="except_module_srls" pipe="and" />
+        <condition operation="equal" column="sites.site_srl" default="modules.site_srl" notnull="notnull" pipe="and" />
+        <condition operation="null" column="except_modules.module_srl" default="1" pipe="and" />
+    </conditions>
+</query>
diff --git a/tests/classes/db/db/xml_query/cubrid/data/three_index_hints_two_tables.xml b/tests/classes/db/db/xml_query/cubrid/data/three_index_hints_two_tables.xml
new file mode 100644
index 000000000..6656d3b98
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/three_index_hints_two_tables.xml
@@ -0,0 +1,14 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+        <table name="document" alias="document" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="CUBRID">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="USE" />
+        <index table="document" name="idx_document_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/three_index_hints_two_tables_combined.xml b/tests/classes/db/db/xml_query/cubrid/data/three_index_hints_two_tables_combined.xml
new file mode 100644
index 000000000..f2ac06e76
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/three_index_hints_two_tables_combined.xml
@@ -0,0 +1,14 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+        <table name="document" alias="document" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="CUBRID">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="FORCE" />
+        <index table="document" name="idx_document_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/two_index_hints_one_table.xml b/tests/classes/db/db/xml_query/cubrid/data/two_index_hints_one_table.xml
new file mode 100644
index 000000000..832becd1b
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/two_index_hints_one_table.xml
@@ -0,0 +1,12 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="CUBRID">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/where_correlated1.xml b/tests/classes/db/db/xml_query/cubrid/data/where_correlated1.xml
new file mode 100644
index 000000000..f6115c71f
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/where_correlated1.xml
@@ -0,0 +1,21 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <query alias="documentMaxRegdate" operation="equal" column="regdate" notnull="notnull">
+                <tables>
+                        <table name="documents" alias="documents" />
+                </tables>
+                <columns>
+                        <column name="max(regdate)" alias="maxregdate" />
+                </columns>
+                <conditions>
+                    <condition operation="equal" column="documents.user_id" default="member.user_id" notnull="notnull" />
+                </conditions>        		        	
+        </query>
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/where_correlated2.xml b/tests/classes/db/db/xml_query/cubrid/data/where_correlated2.xml
new file mode 100644
index 000000000..2ab45461c
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/where_correlated2.xml
@@ -0,0 +1,23 @@
+<query id="getMemberInfo" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull"/>
+        <query alias="documentMaxRegdate" operation="equal" column="regdate" notnull="notnull" pipe="and" >
+                <tables>
+                        <table name="documents" alias="documents" />
+                </tables>
+                <columns>
+                        <column name="max(regdate)" alias="maxregdate" />
+                </columns>
+                <conditions>
+                    <condition operation="equal" column="documents.user_id" default="member.user_id" notnull="notnull" />
+                    <condition operation="equal" column="module_srl" var="module_srl" notnull="notnull" pipe="and" />
+                </conditions>        		        	
+        </query>
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/cubrid/data/where_uncorrelated1.xml b/tests/classes/db/db/xml_query/cubrid/data/where_uncorrelated1.xml
new file mode 100644
index 000000000..248b63ae9
--- /dev/null
+++ b/tests/classes/db/db/xml_query/cubrid/data/where_uncorrelated1.xml
@@ -0,0 +1,18 @@
+<query id="getMemberInfo" action="select">    
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <query operation="equal" column="regdate" alias="documentMaxRegdate">
+            <tables>
+                    <table name="documents" />
+            </tables>
+            <columns>
+                    <column name="max(regdate)" alias="maxregdate" />
+            </columns>
+        </query>
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php b/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php
new file mode 100644
index 000000000..b322cc974
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/MssqlIndexHintTest.php
@@ -0,0 +1,64 @@
+<?php
+
+    class MssqlIndexHintTest extends MssqlTest {
+        var $xmlPath = 'data/';
+
+        function MssqlIndexHintTest(){
+            $this->xmlPath = str_replace('MssqlIndexHintTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+        }
+
+        function _test($xml_file, $argsString, $expected){
+            $this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql');
+        }
+
+        function testOneUseIndexHintAndOneTable(){
+                $xml_file = $this->xmlPath . "one_index_hint_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from [xe_member] as [member] with(index([idx_member_list_order]))';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+
+        function testTwoUseIndexHintsAndOneTable(){
+                $xml_file = $this->xmlPath . "two_index_hints_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from [xe_member] as [member] with(index([idx_member_list_order]), index([idx_member_srl]))';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testThreeUseIndexHintsAndTwoTables(){
+                $xml_file = $this->xmlPath . "three_index_hints_two_tables.xml";
+                $argsString = '';
+                $expected = 'select * from [xe_member] as [member] with(index([idx_member_list_order]), index([idx_member_srl]))
+                    , [xe_document] as [document] with(index([idx_document_srl]))';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        /**
+         * Tests that index is added if "for" attribute is "ALL"
+         *
+         * example: <index_hint for="ALL"> ... </index_hint>
+         */
+        function testIndexHintForAll(){
+                $xml_file = $this->xmlPath . "index_hint_for_all.xml";
+                $argsString = '';
+                $expected = 'select * from [xe_member] as [member] with(index([idx_member_list_order]))';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+
+        function testIgnoreIndexHintIsSkipped(){
+                $xml_file = $this->xmlPath . "ignore_index_hint.xml";
+                $argsString = '';
+                $expected = 'select * from [xe_member] as [member]';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testMysqlIndexHintIsSkipped(){
+                $xml_file = $this->xmlPath . "mysql_index_hint.xml";
+                $argsString = '';
+                $expected = 'select * from [xe_member] as [member]';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+    }
+?>
diff --git a/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php b/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php
new file mode 100644
index 000000000..44867e38f
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/MssqlSelectOnlineTest.php
@@ -0,0 +1,11 @@
+<?php
+    class MssqlSelectOnlineTest extends MssqlOnlineTest {
+
+            function test_syndication_getGrantedModule(){
+                    $args->module_srl = 67;
+                    $output = executeQuery("syndication.getGrantedModule", $args);
+                    $this->assertEquals(0, $output->error, $output->error + ' ' + $output->message);
+            }
+    }
+
+?>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php b/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php
new file mode 100644
index 000000000..2b04c3106
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/MssqlSelectTest.php
@@ -0,0 +1,170 @@
+<?php
+
+	class MssqlSelectTest extends MssqlTest {
+
+		function _test($xml_file, $argsString, $expected, $expectedArgs = NULL){
+                    $this->_testPreparedQuery($xml_file, $argsString, $expected, 'getSelectSql', $expectedArgs);
+		}
+
+		function testSelectStar(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getAdminId.xml";
+			$argsString = '$args->module_srl = 10;';
+			$expected = 'SELECT * FROM [xe_module_admins] as [module_admins] , [xe_member] as [member] WHERE [module_srl] = ? and [member].[member_srl] = [module_admins].[member_srl]';
+			$this->_test($xml_file, $argsString, $expected, array(10));
+		}
+
+		function testRequiredParameter(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getAdminId.xml";
+			$argsString = '';
+			$expected = 'Date incorecte! Query-ul nu a putut fi executat.';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function testWithoutCategoriesTag(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getModuleCategories.xml";
+			$argsString = '';
+			$expected = 'SELECT * FROM [xe_module_categories] as [module_categories] ORDER BY [title] asc';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_module_getDefaultModules(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getDefaultModules.xml";
+			$argsString = '$args->site_srl = 0;';
+			$expected = 'SELECT [modules].[site_srl]
+							, [modules].[module]
+							, [modules].[mid]
+							, [modules].[browser_title]
+							, [module_categories].[title] as [category]
+							, [modules].[module_srl]
+						FROM [xe_modules] as [modules]
+							left join [xe_module_categories] as [module_categories]
+								on [module_categories].[module_category_srl] = [modules].[module_category_srl]
+						WHERE [modules].[site_srl] = ?
+						ORDER BY [modules].[module] asc, [module_categories].[title] asc, [modules].[mid] asc';
+			$this->_test($xml_file, $argsString, $expected, array(0));
+		}
+
+		function test_module_getSiteInfo(){
+			$xml_file = _XE_PATH_ . "modules/module/queries/getSiteInfo.xml";
+			$argsString = '$args->site_srl = 0;';
+			$expected = 'SELECT [modules].[site_srl] as [module_site_srl]
+							, [modules].[module_srl] as [module_srl]
+							, [modules].[module] as [module]
+							, [modules].[module_category_srl] as [module_category_srl]
+							, [modules].[layout_srl] as [layout_srl]
+							, [modules].[mlayout_srl] as [mlayout_srl]
+							, [modules].[use_mobile] as [use_mobile]
+							, [modules].[menu_srl] as [menu_srl]
+							, [modules].[mid] as [mid]
+							, [modules].[skin] as [skin]
+							, [modules].[mskin] as [mskin]
+							, [modules].[browser_title] as [browser_title]
+							, [modules].[description] as [description]
+							, [modules].[is_default] as [is_default]
+							, [modules].[content] as [content]
+							, [modules].[mcontent] as [mcontent]
+							, [modules].[open_rss] as [open_rss]
+							, [modules].[header_text] as [header_text]
+							, [modules].[footer_text] as [footer_text]
+							, [modules].[regdate] as [regdate]
+							, [sites].[site_srl] as [site_srl]
+							, [sites].[domain] as [domain]
+							, [sites].[index_module_srl] as [index_module_srl]
+							, [sites].[default_language] as [default_language]
+						FROM [xe_sites] as [sites]
+							left join [xe_modules] as [modules] on  [modules].[module_srl] = [sites].[index_module_srl]
+						WHERE  [sites].[site_srl] = ?   ';
+			$this->_test($xml_file, $argsString, $expected, array(0));
+		}
+
+		function test_addon_getAddonInfo(){
+			$xml_file = _XE_PATH_ . "modules/addon/queries/getAddonInfo.xml";
+			$argsString = '$args->addon = "captcha";';
+			$expected = 'SELECT *
+						FROM [xe_addons] as [addons]
+						WHERE  [addon] = ? ';
+			$this->_test($xml_file, $argsString, $expected, array("'captcha'"));
+		}
+
+		function test_addon_getAddons(){
+			$xml_file = _XE_PATH_ . "modules/addon/queries/getAddons.xml";
+			$argsString = '';
+			$expected = 'SELECT *
+						FROM [xe_addons] as [addons]
+						ORDER BY [addon] asc';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_admin_getCommentCount(){
+			$xml_file = _XE_PATH_ . "modules/admin/queries/getCommentCount.xml";
+			$argsString = '';
+			$expected = 'SELECT count(*) as [count]
+						FROM [xe_comments] as [comments]';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function test_admin_getCommentDeclaredStatus(){
+			$xml_file = _XE_PATH_ . "modules/admin/queries/getCommentDeclaredStatus.xml";
+			$argsString = '$args->date = "20110411";';
+			$expected = 'SELECT TOP 2 substr([regdate],1,8) as [date], count(*) as [count]
+				FROM [xe_comment_declared_log] as [comment_declared_log]
+				WHERE  [regdate] >= ?
+				GROUP BY substr([regdate],1,8)
+				ORDER BY substr([regdate],1,8) asc';
+			$this->_test($xml_file, $argsString, $expected, array("'20110411'"));
+		}
+
+		function test_member_getAutoLogin(){
+			$xml_file = _XE_PATH_ . "modules/member/queries/getAutoLogin.xml";
+			$argsString = '$args->autologin_key = 10;';
+			$expected = 'SELECT [member].[user_id] as [user_id]
+							, [member].[password] as [password]
+							, [member_autologin].[autologin_key] as [autologin_key]
+						FROM [xe_member] as [member] , [xe_member_autologin] as [member_autologin]
+						WHERE  [member_autologin].[autologin_key] = ?
+							and [member].[member_srl] = [member_autologin].[member_srl]';
+			$this->_test($xml_file, $argsString, $expected, array("'10'"));
+		}
+
+                /**
+                 * Query fails because XML is wrong - title column does not exist
+                 * in xe_modules. Maybe the developer ment "browser_title"
+                 */
+		function test_opage_getOpageList(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mssql/data/opage.getOpageList.xml";
+			$argsString = '$args->s_title = "yuhuu";
+					$args->module = \'opage\';';
+			$expected = 'SELECT TOP 20 *
+						FROM [xe_modules] as [modules]
+						WHERE  [module] = \'opage\' and ([title] like ?)
+						ORDER BY [module_srl] desc';
+			$this->_test($xml_file, $argsString, $expected, array("'%yuhuu%'"));
+		}
+
+                function test_module_getExtraVars(){
+                        $xml_file = _XE_PATH_ . "modules/module/queries/getModuleExtraVars.xml";
+			$argsString = '$args->module_srl = 25;';
+			$expected = 'SELECT *  FROM [xe_module_extra_vars] as [module_extra_vars] WHERE  [module_srl] in (?)';
+			$this->_test($xml_file, $argsString, $expected, array(array(25)));
+                }
+
+                function test_module_getModuleSites(){
+                        $xml_file = _XE_PATH_ . "modules/module/queries/getModuleSites.xml";
+                        $argsString = '$args->module_srls = "67, 65";';
+			$expected = 'SELECT [modules].[module_srl] as [module_srl], [sites].[domain] as [domain]  FROM [xe_modules] as [modules] , [xe_sites] as [sites]   WHERE  [modules].[module_srl] in (?,?) and [sites].[site_srl] = [modules].[site_srl]';
+			$this->_test($xml_file, $argsString, $expected, array(array(67, 65)));
+                }
+
+                function test_syndication_getGrantedModule(){
+                        $xml_file = _TEST_PATH_ . "db/xml_query/mssql/data/syndication.getGrantedModule.xml";
+			$argsString = '$args->module_srl = 67;';
+			$expected = 'select count(*) as [count]
+                                        from [xe_module_grants] as [module_grants]
+                                        where [module_srl] = ?
+                                            and [name] in (\'access\',\'view\',\'list\')
+                                            and ([group_srl] >= 1
+                                                    or [group_srl] = -1
+                                                    or [group_srl] = -2)';
+			$this->_test($xml_file, $argsString, $expected, array(67));
+                }
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php b/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php
new file mode 100644
index 000000000..bcd57fbb2
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/MssqlUpdateOnlineTest.php
@@ -0,0 +1,12 @@
+<?php
+    class MssqlUpdateOnlineTest extends MssqlOnlineTest {
+
+              function test_counter_updateCounterUnique(){
+			$args->regdate = 20110211;
+
+                        $output = executeQuery("counter.updateCounterUnique", $args);
+                        $this->assertEquals(0, $output->error, $output->error + ' ' + $output->message);
+                }
+    }
+
+?>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php b/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php
new file mode 100644
index 000000000..6e335cef3
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/MssqlUpdateTest.php
@@ -0,0 +1,16 @@
+<?php
+
+	class MssqlUpdateTest extends MssqlTest {
+
+		function _test($xml_file, $argsString, $expected, $expectedArgs = NULL){
+                    $this->_testPreparedQuery($xml_file, $argsString, $expected, 'getUpdateSql', $expectedArgs = NULL);
+		}
+
+                function test_counter_updateCounterUnique(){
+                        $xml_file = _XE_PATH_ . "modules/counter/queries/updateCounterUnique.xml";
+			$argsString = '$args->regdate = 25;';
+			$expected = 'UPDATE [xe_counter_status]  as [counter_status] SET [unique_visitor] = [unique_visitor] + ?, [pageview] = [pageview] + ?  WHERE  [regdate] = ?';
+			$this->_test($xml_file, $argsString, $expected, array("25", 1, 1));
+                }
+        }
+?>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/data/ignore_index_hint.xml b/tests/classes/db/db/xml_query/mssql/data/ignore_index_hint.xml
new file mode 100644
index 000000000..e17cfde49
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/ignore_index_hint.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MSSQL">
+        <index table="member" name="idx_member_list_order" type="IGNORE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/data/index_hint_for_all.xml b/tests/classes/db/db/xml_query/mssql/data/index_hint_for_all.xml
new file mode 100644
index 000000000..b0784fa94
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/index_hint_for_all.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="ALL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/data/mysql_index_hint.xml b/tests/classes/db/db/xml_query/mssql/data/mysql_index_hint.xml
new file mode 100644
index 000000000..702080eb5
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/mysql_index_hint.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MYSQL">
+        <index table="member" name="idx_member_list_order" type="IGNORE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/data/one_index_hint_one_table.xml b/tests/classes/db/db/xml_query/mssql/data/one_index_hint_one_table.xml
new file mode 100644
index 000000000..54b660823
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/one_index_hint_one_table.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MSSQL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/data/opage.getOpageList.xml b/tests/classes/db/db/xml_query/mssql/data/opage.getOpageList.xml
new file mode 100644
index 000000000..2e7964335
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/opage.getOpageList.xml
@@ -0,0 +1,24 @@
+<query id="getOpageList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+        <group pipe="and">
+            <condition operation="like" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/modules/syndication/queries/getGrantedModule.xml b/tests/classes/db/db/xml_query/mssql/data/syndication.getGrantedModule.xml
similarity index 97%
rename from modules/syndication/queries/getGrantedModule.xml
rename to tests/classes/db/db/xml_query/mssql/data/syndication.getGrantedModule.xml
index 4bb67c296..9a2f20e29 100644
--- a/modules/syndication/queries/getGrantedModule.xml
+++ b/tests/classes/db/db/xml_query/mssql/data/syndication.getGrantedModule.xml
@@ -1,17 +1,17 @@
-<query id="getGrantedModule" action="select">
-    <tables>
-        <table name="module_grants" />
-    </tables>
-    <columns>
-        <column name="count(*)" alias="count" />
-    </columns>
-    <conditions>
-        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
-        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" pipe="and" />
-        <group pipe="and">
-            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
-            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
-            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
-        </group>
-    </conditions>
-</query>
+<query id="getGrantedModule" action="select">
+    <tables>
+        <table name="module_grants" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" pipe="and" />
+        <group pipe="and">
+            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
+            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
+            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
+        </group>
+    </conditions>
+</query>
diff --git a/tests/classes/db/db/xml_query/mssql/data/three_index_hints_two_tables.xml b/tests/classes/db/db/xml_query/mssql/data/three_index_hints_two_tables.xml
new file mode 100644
index 000000000..f3a05c237
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/three_index_hints_two_tables.xml
@@ -0,0 +1,14 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+        <table name="document" alias="document" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MSSQL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="USE" />
+        <index table="document" name="idx_document_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mssql/data/two_index_hints_one_table.xml b/tests/classes/db/db/xml_query/mssql/data/two_index_hints_one_table.xml
new file mode 100644
index 000000000..def6aadab
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mssql/data/two_index_hints_one_table.xml
@@ -0,0 +1,12 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MSSQL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php b/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php
new file mode 100644
index 000000000..65d6bea3b
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/MysqlIndexHintTest.php
@@ -0,0 +1,58 @@
+<?php
+
+    class MysqlIndexHintTest extends MysqlTest {
+        var $xmlPath = 'data/';
+
+        function MysqlIndexHintTest(){
+            $this->xmlPath = str_replace('MysqlIndexHintTest.php', '', str_replace('\\', '/', __FILE__)) . $this->xmlPath;
+        }
+
+        function _test($xml_file, $argsString, $expected){
+            $this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql');
+        }
+
+        function testOneUseIndexHintAndOneTable(){
+                $xml_file = $this->xmlPath . "one_index_hint_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from `xe_member` as `member` use index (`idx_member_list_order`)';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+
+        function testTwoUseIndexHintsAndOneTable(){
+                $xml_file = $this->xmlPath . "two_index_hints_one_table.xml";
+                $argsString = '';
+                $expected = 'select * from `xe_member` as `member` use index (`idx_member_list_order`, `idx_member_srl`)';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testThreeUseIndexHintsAndTwoTables(){
+                $xml_file = $this->xmlPath . "three_index_hints_two_tables.xml";
+                $argsString = '';
+                $expected = 'select * from `xe_member` as `member` use index (`idx_member_list_order`, `idx_member_srl`)
+                    , `xe_document` as `document` use index (`idx_document_srl`)';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        function testThreeIndexHintsAndTwoTables_ForceAndIgnore(){
+                $xml_file = $this->xmlPath . "three_index_hints_two_tables_combined.xml";
+                $argsString = '';
+                $expected = 'select * from `xe_member` as `member` force index (`idx_member_list_order`, `idx_member_srl`)
+                    , `xe_document` as `document` ignore index (`idx_document_srl`)';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+        /**
+         * Tests that index is added if "for" attribute is "ALL"
+         *
+         * example: <index_hint for="ALL"> ... </index_hint>
+         */
+        function testIndexHintForAll(){
+                $xml_file = $this->xmlPath . "index_hint_for_all.xml";
+                $argsString = '';
+                $expected = 'select * from `xe_member` as `member` use index (`idx_member_list_order`)';
+                $this->_test($xml_file, $argsString, $expected);
+        }
+
+    }
+?>
diff --git a/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php b/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php
new file mode 100644
index 000000000..cd330b846
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/MysqlSelectTest.php
@@ -0,0 +1,210 @@
+<?php
+
+	class MysqlSelectTest extends MysqlTest {
+
+                function _test($xml_file, $argsString, $expected, $columnList = null){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getSelectSql', $columnList);
+		}
+
+                function testConditionWithVarAndColumnDefaultValue_WithoutArgument(){
+                        $xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/resource.getLatestItem.xml";
+			$argsString = '$args->item_srl = "";';
+			$expected = 'select `package`.`module_srl` as `module_srl`
+                                            , `package`.`status` as `status`
+                                            , `package`.`category_srl` as `category_srl`
+                                            , `package`.`member_srl` as `member_srl`
+                                            , `package`.`package_srl` as `package_srl`
+                                            , `package`.`path` as `path`
+                                            , `package`.`license` as `license`
+                                            , `package`.`title` as `title`
+                                            , `package`.`homepage` as `homepage`
+                                            , `package`.`description` as `package_description`
+                                            , `package`.`voter` as `package_voter`
+                                            , `package`.`voted` as `package_voted`
+                                            , `package`.`downloaded` as `package_downloaded`
+                                            , `package`.`regdate` as `package_regdate`
+                                            , `package`.`last_update` as `package_last_update`
+                                            , `member`.`nick_name` as `nick_name`
+                                            , `member`.`user_id` as `user_id`
+                                            , `item`.`item_srl` as `item_srl`
+                                            , `item`.`document_srl` as `document_srl`
+                                            , `item`.`file_srl` as `item_file_srl`
+                                            , `item`.`screenshot_url` as `item_screenshot_url`
+                                            , `item`.`version` as `item_version`
+                                            , `item`.`voter` as `item_voter`
+                                            , `item`.`voted` as `item_voted`
+                                            , `item`.`downloaded` as `item_downloaded`
+                                            , `item`.`regdate` as `item_regdate`
+                                     from `xe_resource_packages` as `package`
+                                        , `xe_member` as `member`
+                                        , `xe_resource_items` as `item`
+                                     where `package`.`member_srl` = `member`.`member_srl`
+                                        and `item`.`item_srl` = `package`.`latest_item_srl`';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+		function testConditionWithVarAndColumnDefaultValue_WithArgument(){
+                        $xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/resource.getLatestItem.xml";
+			$argsString = '$args->item_srl = "10";';
+			$expected = 'select `package`.`module_srl` as `module_srl`
+                                            , `package`.`status` as `status`
+                                            , `package`.`category_srl` as `category_srl`
+                                            , `package`.`member_srl` as `member_srl`
+                                            , `package`.`package_srl` as `package_srl`
+                                            , `package`.`path` as `path`
+                                            , `package`.`license` as `license`
+                                            , `package`.`title` as `title`
+                                            , `package`.`homepage` as `homepage`
+                                            , `package`.`description` as `package_description`
+                                            , `package`.`voter` as `package_voter`
+                                            , `package`.`voted` as `package_voted`
+                                            , `package`.`downloaded` as `package_downloaded`
+                                            , `package`.`regdate` as `package_regdate`
+                                            , `package`.`last_update` as `package_last_update`
+                                            , `member`.`nick_name` as `nick_name`
+                                            , `member`.`user_id` as `user_id`
+                                            , `item`.`item_srl` as `item_srl`
+                                            , `item`.`document_srl` as `document_srl`
+                                            , `item`.`file_srl` as `item_file_srl`
+                                            , `item`.`screenshot_url` as `item_screenshot_url`
+                                            , `item`.`version` as `item_version`
+                                            , `item`.`voter` as `item_voter`
+                                            , `item`.`voted` as `item_voted`
+                                            , `item`.`downloaded` as `item_downloaded`
+                                            , `item`.`regdate` as `item_regdate`
+                                     from `xe_resource_packages` as `package`
+                                        , `xe_member` as `member`
+                                        , `xe_resource_items` as `item`
+                                     where `package`.`member_srl` = `member`.`member_srl`
+                                        and `item`.`item_srl` = 10';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+                function testSubstring(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/substring.xml";
+			$argsString = '$args->var_start_mmdd = "1102"; ';
+			$expected = 'select * from `xe_member` as `member` where substr(`extra_vars_t1`.`value`,5,4) >= 1102';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function testResource_getLatestItemList(){
+                        $xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/resource.getLatestItemList.xml";
+			$argsString = '';
+			$expected = 'select `package`.`module_srl` as `module_srl`
+                                            , `package`.`status` as `status`
+                                            , `package`.`category_srl` as `category_srl`
+                                            , `package`.`member_srl` as `member_srl`
+                                            , `package`.`package_srl` as `package_srl`
+                                            , `package`.`path` as `path`
+                                            , `package`.`license` as `license`
+                                            , `package`.`title` as `title`
+                                            , `package`.`homepage` as `homepage`
+                                            , `package`.`description` as `package_description`
+                                            , `package`.`voter` as `package_voter`
+                                            , `package`.`voted` as `package_voted`
+                                            , `package`.`downloaded` as `package_downloaded`
+                                            , `package`.`regdate` as `package_regdate`
+                                            , `package`.`last_update` as `package_last_update`
+                                            , `member`.`nick_name` as `nick_name`
+                                            , `member`.`user_id` as `user_id`
+                                            , `item`.`item_srl` as `item_srl`
+                                            , `item`.`document_srl` as `item_document_srl`
+                                            , `item`.`file_srl` as `item_file_srl`
+                                            , `item`.`screenshot_url` as `item_screenshot_url`
+                                            , `item`.`version` as `item_version`
+                                            , `item`.`voter` as `item_voter`
+                                            , `item`.`voted` as `item_voted`
+                                            , `item`.`downloaded` as `item_downloaded`
+                                            , `item`.`regdate` as `item_regdate`
+                                            , `files`.`source_filename` as `source_filename`
+                                            , `files`.`sid` as `sid`
+                                       from `xe_resource_packages` as `package`
+                                            , `xe_member` as `member`
+                                            , `xe_resource_items` as `item`
+                                            , `xe_files` as `files`
+                                       where (`package`.`status` = \'accepted\'
+                                                and `package`.`member_srl` = `member`.`member_srl`
+                                                and `item`.`item_srl` = `package`.`latest_item_srl`
+                                                and `package`.`update_order` <= 0
+                                                and `files`.`file_srl` = `item`.`file_srl`)
+                                             and `package`.`update_order` <= 2100000000
+                                       order by `package`.`update_order` asc
+                                       limit 0, 20';
+			$this->_test($xml_file, $argsString, $expected);
+		}
+
+                function test_Syndication_getGrantedModules(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/syndication.getGrantedModules.xml";
+			$argsString = '';
+			$expected = 'select `module_srl`
+                                        from `xe_module_grants` as `module_grants`
+                                        where `name` in (\'access\',\'view\',\'list\')
+                                            and (`group_srl` >= 1 or `group_srl` = -1 or `group_srl` = -2) group by `module_srl`';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_Like_Clause(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/opage.getOpageList.like.xml";
+			$argsString = '$args->s_mid = "test";';
+			$expected = 'select *
+                                        from `xe_modules` as `modules`
+                                        where `module` = \'opage\'
+                                            and (`mid` like \'%test%\')
+                                        order by `module_srl` desc
+                                        limit 0, 20';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_NotLike_Clause(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/opage.getOpageList.notlike.xml";
+			$argsString = '$args->s_mid = "test";';
+			$expected = 'select *
+                                        from `xe_modules` as `modules`
+                                        where `module` = \'opage\'
+                                            and (`mid` not like \'%test%\')
+                                        order by `module_srl` desc
+                                        limit 0, 20';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_NotLikeTail_Clause(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/opage.getOpageList.notliketail.xml";
+			$argsString = '$args->s_mid = "test";';
+			$expected = 'select *
+                                        from `xe_modules` as `modules`
+                                        where `module` = \'opage\'
+                                            and (`mid` not like \'%test\')
+                                        order by `module_srl` desc
+                                        limit 0, 20';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_NotLikePrefix_Clause(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/opage.getOpageList.notlikeprefix.xml";
+			$argsString = '$args->s_mid = "test";';
+			$expected = 'select *
+                                        from `xe_modules` as `modules`
+                                        where `module` = \'opage\'
+                                            and (`mid` not like \'test%\')
+                                        order by `module_srl` desc
+                                        limit 0, 20';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_WidgetsNewestDocument_getNewestDocuments(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/widgets.newest_document.getNewestDocuments.xml";
+			$argsString = '$args->module_srl = "566036,3777868";';
+			$expected = 'select `modules`.`site_srl` as `site_srl`
+                                        , `modules`.`mid` as `mid`
+                                        , `documents`.*
+                                     from `xe_modules` as `modules`
+                                        , `xe_documents` as `documents`
+                                     where (
+                                        `documents`.`module_srl` in (566036,3777868)
+                                        and `modules`.`module_srl` = `documents`.`module_srl`)
+                                        and `documents`.`list_order` <= 2100000000
+                                     order by `documents`.`list_order` asc
+                                     limit 20';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php b/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php
new file mode 100644
index 000000000..f03c4e2ee
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/MysqlUpdateTest.php
@@ -0,0 +1,75 @@
+<?php
+
+        class MysqlUpdateTest extends MysqlTest {
+
+                function _test($xml_file, $argsString, $expected, $columnList = null){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getUpdateSql', $columnList);
+		}
+
+                function test_document_updateDocumentStatus(){
+                        $xml_file = _XE_PATH_ . "modules/document/queries/updateDocumentStatus.xml";
+			$argsString = '$args->is_secret = \'Y\';
+                                       $args->status = \'SECRET\';
+                        ';
+                        $expected = 'update `xe_documents` as `documents` set `status` = \'secret\' where `is_secret` = \'y\'';
+                        $this->_test($xml_file, $argsString, $expected);
+                }
+
+                /**
+                 * Issue 388 - Query cache error related table alias
+                 * http://code.google.com/p/xe-core/issues/detail?id=388
+                 */
+                function test_importer_updateDocumentSync(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/importer.updateDocumentSync.xml";
+			$argsString = '';
+			$expected = 'UPDATE `xe_documents` as `documents`, `xe_member` as `member`
+                            SET `documents`.`member_srl` = `member`.`member_srl`
+                            WHERE `documents`.`user_id` = `member`.`user_id`
+                        ';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_document_updateItemDownloadedCount(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/document.updateItemDownloadedCount.xml";
+			$argsString = '$args->module_srl = 10; $args->package_srl = 11; $args->item_srl = 12;';
+			$expected = 'update `xe_resource_items` as `resource_items`
+                                        set `downloaded` = `downloaded` + 1
+                                        where `module_srl` = 10
+                                            and `package_srl` = 11
+                                            and `item_srl` = 12
+                        ';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_menu_updateMenuItemListorder(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/mysql/data/menu.updateMenuItemListorder.xml";
+			$argsString = '$args->menu_srl = 10; $args->parent_srl = 11; $args->listorder = 12;';
+			$expected = 'update `xe_menu_item` as `menu_item`
+                                        set `listorder` = `listorder` - 1
+                                        where `menu_srl` = 10
+                                            and `parent_srl` = 11
+                                            and `listorder` <= 12';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_communication_setMessageReaded(){
+			$xml_file = _XE_PATH_ . "modules/communication/queries/setMessageReaded.xml";
+			$argsString = '$args->message_srl = 339321; $args->related_srl = 339321;';
+			$expected = 'update `xe_member_message` as `member_message`
+                                        set `readed` = \'y\'
+                                            , `readed_date` = \'' . date("YmdHis") . '\'
+                                        where `message_srl` = 339321 or `related_srl` = 339321';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+                function test_session_updateSession(){
+			$xml_file = _XE_PATH_ . "modules/session/queries/updateSession.xml";
+			$argsString = '$args->session_key = 339321; $args->val = "yuhuu";';
+			$expected = 'update `xe_session` as `session`
+                                        set `member_srl` = 0, `val` = \'yuhuu\'
+                                        , `ipaddress` = \''. $_SERVER['REMOTE_ADDR'] .'\'
+                                        , `last_update` = \'' . date("YmdHis") . '\'
+                                        where `session_key` = \'339321\'';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/document.updateItemDownloadedCount.xml b/tests/classes/db/db/xml_query/mysql/data/document.updateItemDownloadedCount.xml
new file mode 100644
index 000000000..bebb488a1
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/document.updateItemDownloadedCount.xml
@@ -0,0 +1,13 @@
+<query id="updateItemDownloadedCount" action="update">
+<tables>
+<table name="resource_items" />
+</tables>
+<columns>
+<column name="downloaded" default="plus(1)" notnull="notnull" />
+</columns>
+<conditions>
+<condition operation="equal" column="module_srl" var="module_srl" filter="number" notnull="notnull" />
+<condition operation="equal" column="package_srl" var="package_srl" filter="number" notnull="notnull" pipe="and" />
+<condition operation="equal" column="item_srl" var="item_srl" filter="number" notnull="notnull" pipe="and" />
+</conditions>
+</query>
diff --git a/tests/classes/db/db/xml_query/mysql/data/importer.updateDocumentSync.xml b/tests/classes/db/db/xml_query/mysql/data/importer.updateDocumentSync.xml
new file mode 100644
index 000000000..a3351ac5d
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/importer.updateDocumentSync.xml
@@ -0,0 +1,12 @@
+ <query id="updateDocumentSync" action="update">
+     <tables>
+         <table name="documents" alias="documents" />
+         <table name="member" alias="member" />
+     </tables>
+     <columns>
+         <column name="documents.member_srl" default="member.member_srl" filter="number" />
+     </columns>
+     <conditions>
+         <condition operation="equal" column="documents.user_id" default="member.user_id" />
+     </conditions>
+ </query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/index_hint_for_all.xml b/tests/classes/db/db/xml_query/mysql/data/index_hint_for_all.xml
new file mode 100644
index 000000000..b0784fa94
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/index_hint_for_all.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="ALL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/menu.updateMenuItemListorder.xml b/tests/classes/db/db/xml_query/mysql/data/menu.updateMenuItemListorder.xml
new file mode 100644
index 000000000..ced0e2640
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/menu.updateMenuItemListorder.xml
@@ -0,0 +1,13 @@
+<query id="updateMenuItemListorder" action="update">
+    <tables>
+        <table name="menu_item" />
+    </tables>
+    <columns>
+        <column name="listorder" default="minus(1)" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="menu_srl" var="menu_srl" filter="number" notnull="notnull" />
+        <condition operation="equal" column="parent_srl" var="parent_srl" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="less" column="listorder" var="listorder" filter="number" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/tests/classes/db/db/xml_query/mysql/data/one_index_hint_one_table.xml b/tests/classes/db/db/xml_query/mysql/data/one_index_hint_one_table.xml
new file mode 100644
index 000000000..c74defef5
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/one_index_hint_one_table.xml
@@ -0,0 +1,11 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MYSQL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.like.xml b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.like.xml
new file mode 100644
index 000000000..72c5cab1f
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.like.xml
@@ -0,0 +1,24 @@
+<query id="getOpageList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+        <group pipe="and">
+            <condition operation="like" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notlike.xml b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notlike.xml
new file mode 100644
index 000000000..133884d23
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notlike.xml
@@ -0,0 +1,24 @@
+<query id="getOpageList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+        <group pipe="and">
+            <condition operation="notlike" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notlikeprefix.xml b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notlikeprefix.xml
new file mode 100644
index 000000000..19c45efb1
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notlikeprefix.xml
@@ -0,0 +1,24 @@
+<query id="getOpageList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+        <group pipe="and">
+            <condition operation="notlike_prefix" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notliketail.xml b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notliketail.xml
new file mode 100644
index 000000000..c32023fee
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/opage.getOpageList.notliketail.xml
@@ -0,0 +1,24 @@
+<query id="getOpageList" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="module" default="opage" />
+        <group pipe="and">
+            <condition operation="notlike_tail" column="mid" var="s_mid" pipe="or" />
+            <condition operation="like" column="title" var="s_title" pipe="or" />
+            <condition operation="like" column="comment" var="s_comment" pipe="or" />
+            <condition operation="equal" column="module" var="s_module" pipe="or" />
+            <condition operation="equal" column="module_category_srl" var="s_module_category_srl" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="module_srl" order="desc" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/resource.getLatestItem.xml b/tests/classes/db/db/xml_query/mysql/data/resource.getLatestItem.xml
new file mode 100644
index 000000000..f6fa06e83
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/resource.getLatestItem.xml
@@ -0,0 +1,40 @@
+<query id="getLatestItem" action="select">
+    <tables>
+        <table name="resource_packages" alias="package" />
+        <table name="member" alias="member" />
+        <table name="resource_items" alias="item" />
+    </tables>
+    <columns>
+        <column name="package.module_srl" alias="module_srl"/>
+        <column name="package.status" alias="status"/>
+        <column name="package.category_srl" alias="category_srl"/>
+        <column name="package.member_srl" alias="member_srl"/>
+        <column name="package.package_srl" alias="package_srl"/>
+        <column name="package.path" alias="path"/>
+        <column name="package.license" alias="license"/>
+        <column name="package.title" alias="title"/>
+        <column name="package.homepage" alias="homepage"/>
+        <column name="package.description" alias="package_description"/>
+        <column name="package.voter" alias="package_voter"/>
+        <column name="package.voted" alias="package_voted"/>
+        <column name="package.downloaded" alias="package_downloaded"/>
+        <column name="package.regdate" alias="package_regdate"/>
+        <column name="package.last_update" alias="package_last_update"/>
+        <column name="member.nick_name" alias="nick_name" />
+        <column name="member.user_id" alias="user_id" />
+        <column name="item.item_srl" alias="item_srl" />
+        <column name="item.document_srl" alias="document_srl" />
+        <column name="item.file_srl" alias="item_file_srl" />
+        <column name="item.screenshot_url" alias="item_screenshot_url" />
+        <column name="item.version" alias="item_version" />
+        <column name="item.voter" alias="item_voter" />
+        <column name="item.voted" alias="item_voted" />
+        <column name="item.downloaded" alias="item_downloaded" />
+        <column name="item.regdate" alias="item_regdate" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="package.package_srl" var="package_srl" filter="number" />
+        <condition operation="equal" column="package.member_srl" default="member.member_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="item.item_srl" var="item_srl" default="package.latest_item_srl" filter="number" pipe="and" />
+    </conditions>
+</query>
diff --git a/tests/classes/db/db/xml_query/mysql/data/resource.getLatestItemList.xml b/tests/classes/db/db/xml_query/mysql/data/resource.getLatestItemList.xml
new file mode 100644
index 000000000..041e30694
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/resource.getLatestItemList.xml
@@ -0,0 +1,60 @@
+<query id="getLatestItemList" action="select">
+    <tables>
+        <table name="resource_packages" alias="package" />
+        <table name="member" alias="member" />
+        <table name="resource_items" alias="item" />
+        <table name="files" alias="files" />
+    </tables>
+    <columns>
+        <column name="package.module_srl" alias="module_srl"/>
+        <column name="package.status" alias="status"/>
+        <column name="package.category_srl" alias="category_srl"/>
+        <column name="package.member_srl" alias="member_srl"/>
+        <column name="package.package_srl" alias="package_srl"/>
+        <column name="package.path" alias="path"/>
+        <column name="package.license" alias="license"/>
+        <column name="package.title" alias="title"/>
+        <column name="package.homepage" alias="homepage"/>
+        <column name="package.description" alias="package_description"/>
+        <column name="package.voter" alias="package_voter"/>
+        <column name="package.voted" alias="package_voted"/>
+        <column name="package.downloaded" alias="package_downloaded"/>
+        <column name="package.regdate" alias="package_regdate"/>
+        <column name="package.last_update" alias="package_last_update"/>
+        <column name="member.nick_name" alias="nick_name" />
+        <column name="member.user_id" alias="user_id" />
+        <column name="item.item_srl" alias="item_srl" />
+        <column name="item.document_srl" alias="item_document_srl" />
+        <column name="item.file_srl" alias="item_file_srl" />
+        <column name="item.screenshot_url" alias="item_screenshot_url" />
+        <column name="item.version" alias="item_version" />
+        <column name="item.voter" alias="item_voter" />
+        <column name="item.voted" alias="item_voted" />
+        <column name="item.downloaded" alias="item_downloaded" />
+        <column name="item.regdate" alias="item_regdate" />
+        <column name="files.source_filename" alias="source_filename"/>
+        <column name="files.sid" alias="sid"/>
+    </columns>
+    <conditions>
+        <condition operation="equal" column="package.module_srl" var="module_srl" filter="number" />
+        <condition operation="equal" column="package.status" default="accepted" pipe="and" />
+        <condition operation="in" column="package.category_srl" var="category_srl" filter="number" pipe="and" />
+        <condition operation="more" column="package.category_srl" var="idx_category_srl" pipe="and" />
+        <condition operation="equal" column="package.member_srl" var="member_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="package.member_srl" default="member.member_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="item.item_srl" default="package.latest_item_srl" filter="number" pipe="and" />
+        <condition operation="less" column="package.update_order" default="0" filter="number" notnull="notnull" pipe="and" />
+        <condition operation="equal" column="files.file_srl" default="item.file_srl" filter="number" notnull="notnull" pipe="and" />
+        <group pipe="and">
+            <condition operation="like" column="package.title" var="search_keyword" pipe="or" />
+            <condition operation="like" column="package.path" var="search_keyword" pipe="or" />
+            <condition operation="like" column="package.description" var="search_keyword" pipe="or" />
+        </group>
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="package.update_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+        <page_count var="page_count" default="10" />
+        <page var="page" default="1" />
+    </navigation>
+</query>
diff --git a/tests/classes/db/db/xml_query/mysql/data/substring.xml b/tests/classes/db/db/xml_query/mysql/data/substring.xml
new file mode 100644
index 000000000..fef155bec
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/substring.xml
@@ -0,0 +1,11 @@
+<query id="substringTest" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="more"  column="substr(extra_vars_t1.value,5,4)" var="var_start_mmdd" notnull="notnull"  pipe="and" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/syndication.getGrantedModules.xml b/tests/classes/db/db/xml_query/mysql/data/syndication.getGrantedModules.xml
new file mode 100644
index 000000000..97d2b4ec9
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/syndication.getGrantedModules.xml
@@ -0,0 +1,19 @@
+<query id="getGrantedModules" action="select">
+    <tables>
+        <table name="module_grants" />
+    </tables>
+    <columns>
+        <column name="module_srl" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="name" default="'access','view','list'" notnull="notnull" />
+        <group pipe="and">
+            <condition operation="more" column="group_srl" default="1" notnull="notnull" />
+            <condition operation="equal" column="group_srl" default="-1" notnull="notnull" pipe="or" />
+            <condition operation="equal" column="group_srl" default="-2" notnull="notnull" pipe="or" />
+        </group>
+    </conditions>
+    <groups>
+        <group column="module_srl" />
+    </groups>
+</query>
diff --git a/tests/classes/db/db/xml_query/mysql/data/three_index_hints_two_tables.xml b/tests/classes/db/db/xml_query/mysql/data/three_index_hints_two_tables.xml
new file mode 100644
index 000000000..0c635583c
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/three_index_hints_two_tables.xml
@@ -0,0 +1,14 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+        <table name="document" alias="document" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MYSQL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="USE" />
+        <index table="document" name="idx_document_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/three_index_hints_two_tables_combined.xml b/tests/classes/db/db/xml_query/mysql/data/three_index_hints_two_tables_combined.xml
new file mode 100644
index 000000000..3981bebee
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/three_index_hints_two_tables_combined.xml
@@ -0,0 +1,14 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+        <table name="document" alias="document" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MYSQL">
+        <index table="member" name="idx_member_list_order" type="FORCE" />
+        <index table="member" name="idx_member_srl" type="FORCE" />
+        <index table="document" name="idx_document_srl" type="IGNORE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/two_index_hints_one_table.xml b/tests/classes/db/db/xml_query/mysql/data/two_index_hints_one_table.xml
new file mode 100644
index 000000000..9dec3a774
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/two_index_hints_one_table.xml
@@ -0,0 +1,12 @@
+<query id="index_hint" action="select">
+    <tables>
+        <table name="member" alias="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <index_hint for="MYSQL">
+        <index table="member" name="idx_member_list_order" type="USE" />
+        <index table="member" name="idx_member_srl" type="USE" />
+    </index_hint>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/mysql/data/widgets.newest_document.getNewestDocuments.xml b/tests/classes/db/db/xml_query/mysql/data/widgets.newest_document.getNewestDocuments.xml
new file mode 100644
index 000000000..b83244911
--- /dev/null
+++ b/tests/classes/db/db/xml_query/mysql/data/widgets.newest_document.getNewestDocuments.xml
@@ -0,0 +1,21 @@
+<query id="getNewestDocuments" action="select">
+    <tables>
+        <table name="modules" />
+        <table name="documents" />
+    </tables>
+    <columns>
+        <column name="modules.site_srl" alias="site_srl"/>
+        <column name="modules.mid" alias="mid"/>
+        <column name="documents.*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="modules.site_srl" var="site_srl" />
+	<condition operation="notin" column="documents.module_srl" default="0" pipe="and" />
+        <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" pipe="and" />
+        <condition operation="equal" column="modules.module_srl" default="documents.module_srl" filter="number" pipe="and" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="documents.list_order" order="order_type" />
+        <list_count var="list_count" default="20" />
+    </navigation>
+</query>
diff --git a/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php b/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php
new file mode 100644
index 000000000..0d5a1c7c8
--- /dev/null
+++ b/tests/classes/db/db/xml_query/sqlite/SqliteDeleteTest.php
@@ -0,0 +1,17 @@
+<?php
+
+	class SqliteDeleteTest extends SqliteTest {
+
+                function _test($xml_file, $argsString, $expected, $columnList = null){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getDeleteSql', $columnList);
+		}
+
+                function testDeleteIsGeneratedWithoutAlias(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/sqlite/data/module.deleteModuleConfig.xml";
+			$argsString = '$args->module = "comment"; $args->site_srl = 0; ';
+			$expected = 'delete from "xe_module_config"
+                                        where "module" = \'comment\' and "site_srl" = 0';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php b/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php
new file mode 100644
index 000000000..2df8e2911
--- /dev/null
+++ b/tests/classes/db/db/xml_query/sqlite/SqliteUpdateTest.php
@@ -0,0 +1,21 @@
+<?php
+
+	class SqliteUpdateTest extends SqliteTest {
+
+                function _test($xml_file, $argsString, $expected, $columnList = null){
+                    $this->_testQuery($xml_file, $argsString, $expected, 'getUpdateSql', $columnList);
+		}
+
+                function testUpdateIsGeneratedWithoutAlias(){
+			$xml_file = _TEST_PATH_ . "db/xml_query/sqlite/data/member.updateLastLogin.xml";
+			$argsString = '$args->member_srl = 4;
+                                       $args->last_login = \'20111014184010\';
+                            ';
+			$expected = 'UPDATE  "xe_member"
+                                        SET "member_srl" = 4
+                                            , "last_login" = \'20111014184010\'
+                                     WHERE "member_srl" = 4';
+			$this->_test($xml_file, $argsString, $expected);
+                }
+
+	}
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/sqlite/data/member.updateLastLogin.xml b/tests/classes/db/db/xml_query/sqlite/data/member.updateLastLogin.xml
new file mode 100644
index 000000000..3a8fde69d
--- /dev/null
+++ b/tests/classes/db/db/xml_query/sqlite/data/member.updateLastLogin.xml
@@ -0,0 +1,12 @@
+<query id="updateLastLogin" action="update">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="member_srl" var="member_srl" filter="number" notnull="notnull" />
+        <column name="last_login" var="last_login" notnull="notnull" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
+    </conditions>
+</query>
\ No newline at end of file
diff --git a/tests/classes/db/db/xml_query/sqlite/data/module.deleteModuleConfig.xml b/tests/classes/db/db/xml_query/sqlite/data/module.deleteModuleConfig.xml
new file mode 100644
index 000000000..bdc99660b
--- /dev/null
+++ b/tests/classes/db/db/xml_query/sqlite/data/module.deleteModuleConfig.xml
@@ -0,0 +1,9 @@
+<query id="deleteModuleConfig" action="delete">
+    <tables>
+        <table name="module_config" />
+    </tables>
+    <conditions>
+        <condition operation="equal" column="module" var="module" notnull="notnull" />
+        <condition operation="equal" column="site_srl" var="site_srl" notnull="notnull" pipe="and" />
+    </conditions>
+</query>
diff --git a/tests/classes/file/FileHandlerTest.php b/tests/classes/file/FileHandlerTest.php
new file mode 100644
index 000000000..fd56816a5
--- /dev/null
+++ b/tests/classes/file/FileHandlerTest.php
@@ -0,0 +1,80 @@
+<?php
+
+if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php';
+
+require_once _XE_PATH_.'classes/file/FileHandler.class.php'; 
+
+class FileHandlerTest extends PHPUnit_Framework_TestCase
+{
+	public function testGetRealPath()
+	{
+		$this->assertEquals(FileHandler::getRealPath(__FILE__), __FILE__);
+		$this->assertEquals(FileHandler::getRealPath('./tests/classes/file/FileHandlerTest.php'), __FILE__);
+	}
+
+	public function testFileMethods()
+	{
+		$mock  = dirname(__FILE__).'/mock.txt';
+		$mock2 = dirname(__FILE__).'/mock2.txt';
+		touch($mock);
+
+		// copy file
+		$this->assertTrue(is_readable($mock));
+		FileHandler::copyFile($mock, $mock2);
+		$this->assertTrue(is_readable($mock2));
+
+		// remove file
+		$this->assertTrue(FileHandler::removeFile($mock2));
+		$this->assertFalse(is_readable($mock2));
+		$this->assertFalse(FileHandler::removeFile($mock2));
+
+		// rename file
+		$this->assertTrue(FileHandler::rename($mock, $mock2));
+		$this->assertFalse(is_readable($mock));
+		$this->assertTrue(is_readable($mock2));
+		$this->assertFalse(FileHandler::rename($mock, $mock2));
+
+		// move file
+		$this->assertTrue(FileHandler::rename($mock2, $mock));
+		$this->assertTrue(is_readable($mock));
+		$this->assertFalse(is_readable($mock2));
+		$this->assertTrue(touch($mock2) && is_readable($mock2));
+		$this->assertTrue(FileHandler::moveFile($mock, $mock2));
+		$this->assertFalse(is_readable($mock));
+		$this->assertTrue(is_readable($mock2));
+
+		// remove file
+		$this->assertFalse(FileHandler::removeFile($mock));
+		$this->assertTrue(FileHandler::removeFile($mock2));
+		$this->assertFalse(is_readable($mock));
+		$this->assertFalse(is_readable($mock2));
+	}
+
+	public function testFileSize()
+	{
+		// file size
+		$this->assertEquals(FileHandler::filesize(0), '0Byte');
+		$this->assertEquals(FileHandler::filesize(1), '1Byte');
+		$this->assertEquals(FileHandler::filesize(386), '386Bytes');
+		$this->assertEquals(FileHandler::filesize(1023), '1023Bytes');
+		$this->assertEquals(FileHandler::filesize(1024), '1.0KB');
+		$this->assertEquals(FileHandler::filesize(2480), '2.4KB');
+		$this->assertEquals(FileHandler::filesize(1024*1024-1), '1024.0KB');
+		$this->assertEquals(FileHandler::filesize(1024*1024), '1.00MB');
+		$this->assertEquals(FileHandler::filesize(3*1024*1024+210*1024), '3.21MB');
+
+		// return bytes
+		$this->assertEquals(FileHandler::returnBytes('0B'), 0);
+		$this->assertEquals(FileHandler::returnBytes('1024B'), 1024);
+		$this->assertEquals(FileHandler::returnBytes('1K'), 1024);
+		$this->assertEquals(FileHandler::returnBytes('102.48K'), 1024*102.48);
+		$this->assertEquals(FileHandler::returnBytes('1M'), 1024*1024);
+		$this->assertEquals(FileHandler::returnBytes('1.12M'), 1024*1024*1.12);
+		$this->assertEquals(FileHandler::returnBytes('1023.99M'), 1024*1024*1023.99);
+		$this->assertEquals(FileHandler::returnBytes('1G'), 1024*1024*1024);
+		$this->assertEquals(FileHandler::returnBytes('12.02G'), 1024*1024*1024*12.02);
+	}
+}
+
+/* End of file FileHandlerTest.php */
+/* Location: ./tests/classes/file/FileHandlerTest.php */
diff --git a/tests/classes/frontendfile/FrontEndFileHandlerTest.php b/tests/classes/frontendfile/FrontEndFileHandlerTest.php
new file mode 100644
index 000000000..67cfde75a
--- /dev/null
+++ b/tests/classes/frontendfile/FrontEndFileHandlerTest.php
@@ -0,0 +1,224 @@
+<?php
+
+if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php';
+
+require_once _XE_PATH_.'classes/handler/Handler.class.php';
+require_once _XE_PATH_.'classes/frontendfile/FrontEndFileHandler.class.php';
+
+$_SERVER['SCRIPT_NAME'] = '/xe/index.php';
+
+class FrontEndFileHandlerTest extends PHPUnit_Framework_TestCase
+{
+	public function testHandler()
+	{
+		global $request_url, $use_cdn;
+
+		$request_url = 'http://test.com';
+		$use_cdn = 'Y';
+
+		$handler = new FrontEndFileHandler();
+
+		// js(head)
+		$handler->loadFile(array('./common/js/jquery.js'));
+		$handler->loadFile(array('./common/js/js_app.js'));
+		$handler->loadFile(array('./common/js/common.js'));
+		$handler->loadFile(array('./common/js/xml_handler.js'));
+		$handler->loadFile(array('./common/js/xml_js_filter.js'));
+		
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/js_app.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/common.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_handler.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_js_filter.js', 'targetie' => '');
+		$this->assertEquals($handler->getJsFileList(), $expected);
+
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		// js(body)
+		$handler->loadFile(array('./common/js/jquery.js', 'body'));
+		$handler->loadFile(array('./common/js/js_app.js', 'body'));
+		$handler->loadFile(array('./common/js/common.js', 'body'));
+		$handler->loadFile(array('./common/js/xml_handler.js', 'body'));
+		$handler->loadFile(array('./common/js/xml_js_filter.js', 'body'));
+		
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/js_app.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/common.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_handler.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_js_filter.js', 'targetie' => '');
+		$this->assertEquals($handler->getJsFileList('body'), $expected);
+
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		// css
+		$handler->loadFile(array('./common/css/xe.css'));
+		$handler->loadFile(array('./common/css/common.css'));
+		
+		$expected[] = array('file' => '/xe/common/css/xe.css', 'media' => 'all', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media' => 'all', 'targetie' => '');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		// order (duplicate)
+		$handler->loadFile(array('./common/js/jquery.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/js_app.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/common.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/jquery.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/js_app.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/common.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000));
+
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/js_app.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/common.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_handler.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_js_filter.js', 'targetie' => '');
+		$this->assertEquals($handler->getJsFileList(), $expected);
+
+		// order (redefine)
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+		$handler->loadFile(array('./common/js/jquery.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/js_app.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/common.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/jquery.js', 'head', '', 1));
+
+		$expected[] = array('file' => '/xe/common/js/js_app.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/common.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_handler.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_js_filter.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => '');
+		$this->assertEquals($handler->getJsFileList(), $expected);
+
+		// unload
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/js/jquery.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/js_app.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/common.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_handler.js', 'head', '', -100000));
+		$handler->loadFile(array('./common/js/xml_js_filter.js', 'head', '', -100000));
+		$handler->unloadFile('./common/js/jquery.js', '', 'all');
+
+		$expected[] = array('file' => '/xe/common/js/js_app.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/common.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_handler.js', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/js/xml_js_filter.js', 'targetie' => '');
+		$this->assertEquals($handler->getJsFileList(), $expected);
+
+		// target IE(js)
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/js/jquery.js', 'head', 'ie6'));
+		$handler->loadFile(array('./common/js/jquery.js', 'head', 'ie7'));
+		$handler->loadFile(array('./common/js/jquery.js', 'head', 'ie8'));
+
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => 'ie6');
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => 'ie7');
+		$expected[] = array('file' => '/xe/common/js/jquery.js', 'targetie' => 'ie8');
+		$this->assertEquals($handler->getJsFileList(), $expected);
+
+		// target IE(css)
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/css/common.css', null, 'ie6'));
+		$handler->loadFile(array('./common/css/common.css', null, 'ie7'));
+		$handler->loadFile(array('./common/css/common.css', null, 'ie8'));
+
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media'=>'all', 'targetie' => 'ie6');
+		$expected[] = array('file' => '/xe/common/css/common.css','media'=>'all',  'targetie' => 'ie7');
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media'=>'all', 'targetie' => 'ie8');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+		// media
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/css/common.css', 'all'));
+		$handler->loadFile(array('./common/css/common.css', 'screen'));
+		$handler->loadFile(array('./common/css/common.css', 'handled'));
+
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media'=>'all', 'targetie' => '');
+		$expected[] = array('file' => '/xe/common/css/common.css','media'=>'screen',  'targetie' => '');
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media'=>'handled', 'targetie' => '');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+		// CDN
+		unset($handler);
+		unset($expected);
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/css/common.css'), true, 'http://static.xpressengine.com/core/', 'v');
+
+		$expected[] = array('file' => 'http://static.xpressengine.com/core/v/common/css/common.css', 'media'=>'all', 'targetie' => '');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+		// CDN(no cdn setting)
+		unset($handler);
+		unset($expected);
+		$use_cdn = 'N';
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/css/common.css'), true, 'http://static.xpressengine.com/core/', 'v');
+
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media'=>'all', 'targetie' => '');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+		// CDN(use ssl)
+		unset($handler);
+		unset($expected);
+		$use_cdn = 'Y';
+		$request_url = 'https://test.com';
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('./common/css/common.css'), true, 'http://static.xpressengine.com/core/', 'v');
+
+		$expected[] = array('file' => '/xe/common/css/common.css', 'media'=>'all', 'targetie' => '');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+		// external file
+		unset($handler);
+		unset($expected);
+		$use_cdn = 'Y';
+		$request_url = 'http://test.com';
+		$handler = new FrontEndFileHandler();
+
+		$handler->loadFile(array('http://external.com/css/style2.css'));
+		$handler->loadFile(array('http://external.com/css/style.css'), true, 'http://static.xpressengine.com/core/', 'v');
+
+		$expected[] = array('file' => 'http://external.com/css/style2.css', 'media'=>'all', 'targetie' => '');
+		$expected[] = array('file' => 'http://external.com/css/style.css', 'media'=>'all', 'targetie' => '');
+		$this->assertEquals($handler->getCssFileList(), $expected);
+
+	}
+}
+
+if(!class_exists('Context'))
+{
+	require _XE_PATH_.'/tests/classes/context/Context.mock.php';
+}
+
+if(!function_exists('debugPrint'))
+{
+	function debugPrint(){}
+}
diff --git a/tests/classes/security/SecurityTest.php b/tests/classes/security/SecurityTest.php
new file mode 100644
index 000000000..cb865f3a4
--- /dev/null
+++ b/tests/classes/security/SecurityTest.php
@@ -0,0 +1,134 @@
+<?php
+
+if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php';
+
+require_once _XE_PATH_.'/classes/security/Security.class.php';
+
+error_reporting(E_ALL & ~E_NOTICE);
+
+class SecurityTest extends PHPUnit_Framework_TestCase
+{
+	protected function setUp()
+	{
+		/**
+		 * Setup mock data
+		 **/
+
+		// string
+		Context::set('content1', '<strong>Hello, world</strong>');
+		Context::set('content2', 'Wow, >_< !');
+
+		// object
+		$args = new stdClass;
+		$args->prop1 = 'Normal string';
+		$args->prop2 = 'He said, "Very nice!"';
+		$args->prop3 = '<strong>Strong</strong> Baby';
+		Context::set('object1', $args);
+
+		// array
+		$arr = array();
+		$arr[] = '<span class="first">F</span>irst';
+		$arr[] = '<u>S</u>econd';
+		$arr[] = '<b>T</b>hird';
+		Context::set('array1', $arr);
+
+		// associative array
+		$aarr = array();
+		$aarr['elem1'] = 'One <ins>1</ins>';
+		$aarr['elem2'] = 'Two <del>2</del>';
+		$aarr['elem3'] = 'Three <addr>3</addr>';
+		Context::set('array2', $aarr);
+	}
+
+	public function testEncodeHTML_DefaultContext()
+	{
+		$security  = new Security();
+
+		// normal string - one
+		$this->setUp();
+		$this->assertEquals('<strong>Hello, world</strong>', Context::get('content1'));
+		$security->encodeHTML('content1');
+		$this->assertEquals('&lt;strong&gt;Hello, world&lt;/strong&gt;', Context::get('content1'));
+
+		// normal string - two
+		$this->setUp();
+		$this->assertEquals('<strong>Hello, world</strong>', Context::get('content1'));
+		$this->assertEquals('Wow, >_< !', Context::get('content2'));
+		$security->encodeHTML('content1','content2');
+		$this->assertEquals('&lt;strong&gt;Hello, world&lt;/strong&gt;', Context::get('content1'));
+		$this->assertEquals('Wow, &gt;_&lt; !', Context::get('content2'));
+
+		// array
+		$this->assertEquals(Context::get('array1'), array('<span class="first">F</span>irst','<u>S</u>econd','<b>T</b>hird'));
+		$security->encodeHTML('array1'); // should ignore this
+		$this->assertEquals(Context::get('array1'), array('<span class="first">F</span>irst','<u>S</u>econd','<b>T</b>hird'));
+		$security->encodeHTML('array1.0'); // affect only first element
+		$this->assertEquals(Context::get('array1'), array('&lt;span class=&quot;first&quot;&gt;F&lt;/span&gt;irst','<u>S</u>econd','<b>T</b>hird'));
+		$security->encodeHTML('array1.2'); // affects only third element
+		$this->assertEquals(Context::get('array1'), array('&lt;span class=&quot;first&quot;&gt;F&lt;/span&gt;irst','<u>S</u>econd','&lt;b&gt;T&lt;/b&gt;hird'));
+		$this->setUp(); // reset;
+		$this->assertEquals(Context::get('array1'), array('<span class="first">F</span>irst','<u>S</u>econd','<b>T</b>hird'));
+		$security->encodeHTML('array1.'); // affects all items
+		$this->assertEquals(Context::get('array1'), array('&lt;span class=&quot;first&quot;&gt;F&lt;/span&gt;irst','&lt;u&gt;S&lt;/u&gt;econd','&lt;b&gt;T&lt;/b&gt;hird'));
+
+		// associated array
+		$this->assertEquals(Context::get('array2'), array('elem1'=>'One <ins>1</ins>','elem2'=>'Two <del>2</del>','elem3'=>'Three <addr>3</addr>'));
+		$security->encodeHTML('array2'); // should ignore this
+		$this->assertEquals(Context::get('array2'), array('elem1'=>'One <ins>1</ins>','elem2'=>'Two <del>2</del>','elem3'=>'Three <addr>3</addr>'));
+		$security->encodeHTML('array2.0'); // should ignore this
+		$this->assertEquals(Context::get('array2'), array('elem1'=>'One <ins>1</ins>','elem2'=>'Two <del>2</del>','elem3'=>'Three <addr>3</addr>'));
+		$security->encodeHTML('array2.elem2'); // affects only 'elem2'
+		$this->assertEquals(Context::get('array2'), array('elem1'=>'One <ins>1</ins>','elem2'=>'Two &lt;del&gt;2&lt;/del&gt;','elem3'=>'Three <addr>3</addr>'));
+		$this->setUp(); // reset;
+		$this->assertEquals(Context::get('array2'), array('elem1'=>'One <ins>1</ins>','elem2'=>'Two <del>2</del>','elem3'=>'Three <addr>3</addr>'));
+		$security->encodeHTML('array2.'); // affects all items
+		$this->assertEquals(Context::get('array2'), array('elem1'=>'One &lt;ins&gt;1&lt;/ins&gt;','elem2'=>'Two &lt;del&gt;2&lt;/del&gt;','elem3'=>'Three &lt;addr&gt;3&lt;/addr&gt;'));
+
+		// object
+		$obj = new stdClass;
+		$obj->prop1 = 'Normal string';
+		$obj->prop2 = 'He said, "Very nice!"';
+		$obj->prop3 = '<strong>Strong</strong> Baby';
+		$this->assertEquals(Context::get('object1'), $obj);
+		$security->encodeHTML('object1'); // should ignore this
+		$this->assertEquals(Context::get('object1'), $obj);
+		$security->encodeHTML('object1.0'); // should ignore this
+		$this->assertEquals(Context::get('object1'), $obj);
+		$security->encodeHTML('object1.prop1'); // affects only 'prop1' property - no changes
+		$this->assertEquals(Context::get('object1'), $obj);
+		$security->encodeHTML('object1.prop3'); // affects only 'prop3' property
+		$obj->prop3 = '&lt;strong&gt;Strong&lt;/strong&gt; Baby';
+		$this->assertEquals(Context::get('object1'), $obj);
+		$this->setUp(); // reset
+		$obj->prop3 = '<strong>Strong</strong> Baby';
+		$this->assertEquals(Context::get('object1'), $obj);
+		$security->encodeHTML('object1.'); // affects all properties
+		$obj->prop2 = 'He said, &quot;Very nice!&quot;';
+		$obj->prop3 = '&lt;strong&gt;Strong&lt;/strong&gt; Baby';
+		$this->assertEquals(Context::get('object1'), $obj);
+	}
+
+	public function testEncodeHTML_CustomContext()
+	{
+		$array = array('Hello', 'World', '<b>Bold</b> is not bald');
+
+		// array with no nested objects or arrays
+		$security = new Security($array);
+		$returned = $security->encodeHTML('.');
+		$this->assertEquals($returned, array('Hello', 'World', '&lt;b&gt;Bold&lt;/b&gt; is not bald'));
+
+		// associative array
+		$array = array('first'=>'Hello', 'second'=>'World', '3rd'=>'<b>Bold</b> is not bald');
+		$security = new Security($array);
+		$returned = $security->encodeHTML('first','3rd');
+		$this->assertEquals($returned, array('first'=>'Hello', 'second'=>'World', '3rd'=>'&lt;b&gt;Bold&lt;/b&gt; is not bald'));
+	}
+}
+
+if(!class_exists('Context'))
+{
+	require _XE_PATH_.'/tests/classes/context/Context.mock.php';
+}
+
+/* End of file SecurityTest.php */
+/* Location: ./tests/classes/security/SecurityTest.php */
diff --git a/tests/classes/template/TemplateHandlerTest.php b/tests/classes/template/TemplateHandlerTest.php
new file mode 100644
index 000000000..b039d7229
--- /dev/null
+++ b/tests/classes/template/TemplateHandlerTest.php
@@ -0,0 +1,257 @@
+<?php
+
+if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php';
+
+require_once _XE_PATH_.'classes/file/FileHandler.class.php';
+require_once _XE_PATH_.'classes/template/TemplateHandler.class.php';
+
+class TemplateHandlerTest extends PHPUnit_Framework_TestCase
+{
+	var $prefix = '<?php if(!defined("__XE__"))exit;?>';
+
+	static public function provider()
+	{
+		return array(
+			// pipe cond
+			array(
+				'<a href="#" class="active"|cond="$cond > 10">Link</a>',
+				'<a href="#"<?php if($__Context->cond > 10){ ?> class="active"<?php } ?>>Link</a>'
+			),
+			// cond
+			array(
+				'<a href="#">Link1</a><a href="#cond"><span cond="$cond">say, hello</span></a>',
+				'<a href="#">Link1</a><a href="#cond"><?php if($__Context->cond){ ?><span>say, hello</span><?php } ?></a>'
+			),
+			// cond
+			array(
+				'<a href="#">Link1</a><a href="#cond" cond="$v==$k">Link2</a>',
+				'<a href="#">Link1</a><?php if($__Context->v==$__Context->k){ ?><a href="#cond">Link2</a><?php } ?>'
+			),
+			// for loop
+			array(
+				'<ul><li loop="$i=0;$i<$len;$i++" class="sample"><a>Link</a></li></ul>',
+				'<ul><?php for($__Context->i=0;$__Context->i<$__Context->len;$__Context->i++){ ?><li class="sample"><a>Link</a></li><?php } ?></ul>'
+			),
+			// foreach loop
+			array(
+				'<ul><li loop="$arr=>$key,$val" class="sample"><a>Link</a><ul><li loop="$arr2=>$key2,$val2"></li></ul></li></ul>',
+				'<ul><?php if($__Context->arr&&count($__Context->arr))foreach($__Context->arr as $__Context->key=>$__Context->val){ ?><li class="sample"><a>Link</a><ul><?php if($__Context->arr2&&count($__Context->arr2))foreach($__Context->arr2 as $__Context->key2=>$__Context->val2){ ?><li></li><?php } ?></ul></li><?php } ?></ul>'
+			),
+			// while loop
+			array(
+				'<ul><li loop="$item=get_loop_item()" class="sample"><a>Link</a></li></ul>',
+				'<ul><?php while($__Context->item=get_loop_item()){ ?><li class="sample"><a>Link</a></li><?php } ?></ul>'
+			),
+			// <!--@if--> ~ <!--@end-->
+			array(
+				'<a>Link</a><!--@if($cond)--><strong>Hello, world</strong><!--@end--> <dummy />',
+				'<a>Link</a><?php if($__Context->cond){ ?><strong>Hello, world</strong><?php } ?> <dummy />'
+			),
+			// <!--@if--> ~ <!--@endif-->
+			array(
+				'<a>Link</a><!--@if($cond)--><strong>Hello, {$world}</strong><!--@endif--><dummy />',
+				'<a>Link</a><?php if($__Context->cond){ ?><strong>Hello, <?php echo $__Context->world ?></strong><?php } ?><dummy />'
+			),
+			// <!--@if--> ~ <!--@else--> ~ <!--@endif-->
+			array(
+				'<a>Link</a><!--@if($cond)--><strong>Hello, world</strong><!--@else--><em>Wow</em><!--@endif--><dummy />',
+				'<a>Link</a><?php if($__Context->cond){ ?><strong>Hello, world</strong><?php }else{ ?><em>Wow</em><?php } ?><dummy />'
+			),
+			// <!--@if--> ~ <!--@elseif--> ~ <!--@else--> ~ <!--@endif-->
+			array(
+				'<a>Link</a><!--@if($cond)--><strong>Hello, world</strong><!--@elseif($cond2)--><u>HaHa</u><!--@else--><em>Wow</em><!--@endif--><dummy />',
+				'<a>Link</a><?php if($__Context->cond){ ?><strong>Hello, world</strong><?php }elseif($__Context->cond2){ ?><u>HaHa</u><?php }else{ ?><em>Wow</em><?php } ?><dummy />'
+			),
+			// <!--@for--> ~ <!--@endfor-->
+			array(
+				'<!--@for($i=0;$i<$len;$i++)--><li>Repeat this</li><!--@endfor-->',
+				'<?php for($__Context->i=0;$__Context->i<$__Context->len;$__Context->i++){ ?><li>Repeat this</li><?php } ?>'
+			),
+			// <!--@foreach--> ~ <!--@endforeach-->
+			array(
+				'<!--@foreach($arr as $key=>$val)--><li>item{$key} : {$val}</li><!--@endfor-->',
+				'<?php if($__Context->arr&&count($__Context->arr))foreach($__Context->arr as $__Context->key=>$__Context->val){ ?><li>item<?php echo $__Context->key ?> : <?php echo $__Context->val ?></li><?php } ?>'
+			),
+			// <!--@while--> ~ <!--@endwhile-->
+			array(
+				'<!--@while($item=$list->getItem())--><a href="{$v->link}">{$v->text}</a><!--@endwhile-->',
+				'<?php while($__Context->item=$__Context->list->getItem()){ ?><a href="<?php echo $__Context->v->link ?>"><?php echo $__Context->v->text ?></a><?php } ?>'
+			),
+			// <!--@switch--> ~ <!--@case--> ~ <!--@break--> ~ <!--@default --> ~ <!--@endswitch-->
+			array(
+				'<dummy /><!--@switch($var)--> <!--@case("A")--> A<!--@break--> <!--@case(\'B\')-->B<!--@break--><!--@default-->C<!--@endswitch--><dummy />',
+				'<dummy /><?php switch($__Context->var){ ?><?php case "A": ?> A<?php break; ?><?php case \'B\': ?>B<?php break; ?><?php default : ?>C<?php } ?><dummy />'
+			),
+			// invalid block statement
+			array(
+				'<dummy /><!--@xe($var)--><dummy />',
+				'<dummy /><dummy />'
+			),
+			// {@ ...PHP_CODE...}
+			array(
+				'<before />{@$list_page = $page_no}<after />',
+				'<before /><?php $__Context->list_page = $__Context->page_no ?><after />'
+			),
+			// %load_js_plugin
+			array(
+				'<dummy /><!--%load_js_plugin("ui")--><dummy />',
+				'<dummy /><?php Context::loadJavascriptPlugin(\'ui\'); ?><dummy />'
+			),
+			// #include
+			array(
+				'<dummy /><!--#include("sample.html")--><div>This is another dummy</div>',
+				'<dummy /><?php $__tpl=TemplateHandler::getInstance();echo $__tpl->compile(\'tests/classes/template\',\'sample.html\') ?><div>This is another dummy</div>'
+			),
+			// <include target="file">
+			array(
+				'<dummy /><include target="../sample.html" /><div>This is another dummy</div>',
+				'<dummy /><?php $__tpl=TemplateHandler::getInstance();echo $__tpl->compile(\'tests/classes\',\'sample.html\') ?><div>This is another dummy</div>'
+			),
+			// <load target="../../../modules/page/lang/lang.xml">
+			array(
+				'<dummy /><load target="../../../modules/page/lang/lang.xml" /><dummy />',
+				'<dummy /><?php Context::loadLang(\'modules/page/lang\'); ?><dummy />'
+			),
+			// <load target="style.css">
+			array(
+				'<dummy /><load target="css/style.css" /><dummy />',
+				'<dummy /><!--#Meta:tests/classes/template/css/style.css--><?php $__tmp=array(\'tests/classes/template/css/style.css\',\'\',\'\',\'\');Context::loadFile($__tmp,\'\',\'\',\'\');unset($__tmp); ?><dummy />'
+			),
+			// <unload target="style.css">
+			array(
+				'<dummy /><unload target="css/style.css" /><dummy />',
+				'<dummy /><?php Context::unloadFile(\'tests/classes/template/css/style.css\',\'\',\'\'); ?><dummy />'
+			),
+			// <!--%import("../../../modules/page/tpl/filter/insert_config.xml")-->
+			array(
+				'<dummy /><!--%import("../../../modules/page/tpl/filter/insert_config.xml")--><dummy />',
+				'<dummy /><?php require_once(\'./classes/xml/XmlJsFilter.class.php\');$__xmlFilter=new XmlJsFilter(\'modules/page/tpl/filter\',\'insert_config.xml\');$__xmlFilter->compile(); ?><dummy />'
+			),
+			// <!--%import("../script.js",type="body")-->
+			array(
+				'<dummy /><!--%import("../script.js",type="body")--><dummy />',
+				'<dummy /><!--#Meta:tests/classes/script.js--><?php $__tmp=array(\'tests/classes/script.js\',\'body\',\'\',\'\');Context::loadFile($__tmp,\'\',\'\',\'\');unset($__tmp); ?><dummy />'
+			),
+			// <!--%unload("../script.js",type="body")-->
+			array(
+				'<dummy /><!--%unload("../script.js",type="body")--><dummy />',
+				'<dummy /><?php Context::unloadFile(\'tests/classes/script.js\',\'\'); ?><dummy />'
+			),
+			// comment
+			array(
+				'<dummy_before /><!--// this is a comment--><dummy_after />',
+				'<dummy_before /><dummy_after />'
+			),
+			// self-closing tag
+			array(
+				'<meta charset="utf-8" cond="$foo">',
+				'<?php if($__Context->foo){ ?><meta charset="utf-8"><?php } ?>'
+			),
+			// relative path1
+			array(
+				'<img src="http://naver.com/naver.gif"><input type="image" src="../local.gif" />',
+				'<img src="http://naver.com/naver.gif"><input type="image" src="/xe/tests/classes/local.gif" />'
+			),
+			// relative path2
+			array(
+				'<img src="http://naver.com/naver.gif"><input type="image" src="../../dir/local.gif" />',
+				'<img src="http://naver.com/naver.gif"><input type="image" src="/xe/tests/dir/local.gif" />'
+			),
+			// error case
+			array(
+				'<a href="{$layout_info->index_url}" cond="$layout_info->logo_image"><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /></a>',
+				'<?php if($__Context->layout_info->logo_image){ ?><a href="<?php echo $__Context->layout_info->index_url ?>"><img src="<?php echo $__Context->layout_info->logo_image ?>" alt="logo" border="0" class="iePngFix" /></a><?php } ?>'
+			),
+			// error case - ignore stylesheets
+			array(
+				'<style>body{background-color:black}</style>',
+				'<style>body{background-color:black}</style>'
+			),
+			// error case - ignore json
+			array(
+				'<script type="text/javascript">var json = {hello:"world"};</script>',
+				'<script type="text/javascript">var json = {hello:"world"};</script>'
+			),
+			// error case - inline javascript
+			array(
+				'<form onsubmit="jQuery(this).find(\'input\').each(function(){if(this.title==this.value)this.value=\'\';}); return procFilter(this, insert_comment)"></form>',
+				'<form onsubmit="jQuery(this).find(\'input\').each(function(){if(this.title==this.value)this.value=\'\';}); return procFilter(this, insert_comment)"><input type="hidden" name="error_return_url" value="<?php echo getRequestUriByServerEnviroment() ?>" /><input type="hidden" name="act" value="<?php echo $__Context->act ?>"><input type="hidden" name="mid" value="<?php echo $__Context->mid ?>"><input type="hidden" name="vid" value="<?php echo $__Context->vid ?>"></form>'
+			),
+			// issue 103
+			array(
+				'<load target="http://aaa.com/aaa.js" />',
+				'<!--#Meta:http://aaa.com/aaa.js--><?php $__tmp=array(\'http://aaa.com/aaa.js\',\'\',\'\',\'\');Context::loadFile($__tmp,\'\',\'\',\'\');unset($__tmp); ?>'
+			),
+			// issue 135
+			array(
+				'<block loop="$_m_list_all=>$key,$val"><p>{$key}</p><div>Loop block {$val}</div></block>',
+				'<?php if($__Context->_m_list_all&&count($__Context->_m_list_all))foreach($__Context->_m_list_all as $__Context->key=>$__Context->val){ ?><p><?php echo $__Context->key ?></p><div>Loop block <?php echo $__Context->val ?></div><?php } ?>'
+			),
+			// issue 136
+			array(
+				'<br cond="$var==\'foo\'" />bar',
+				'<?php if($__Context->var==\'foo\'){ ?><br /><?php } ?>bar'
+			),
+			// issue 188
+			array(
+				'<div cond="$ii < $nn" loop="$dummy => $k, $v">Hello, world!</div>',
+				'<?php if($__Context->ii < $__Context->nn){ ?><?php if($__Context->dummy&&count($__Context->dummy))foreach($__Context->dummy as $__Context->k=>$__Context->v){ ?><div>Hello, world!</div><?php }} ?>'
+			),
+			// issue 190
+			array(
+				'<div cond="!($i >= $n)" loop="$dummy => $k, $v">Hello, world!</div>',
+				'<?php if(!($__Context->i >= $__Context->n)){ ?><?php if($__Context->dummy&&count($__Context->dummy))foreach($__Context->dummy as $__Context->k=>$__Context->v){ ?><div>Hello, world!</div><?php }} ?>'
+			),
+			// issue 183
+			array(
+				'<table><thead><tr><th loop="$vvvls => $vvv">{$vvv}</th></tr></thead>'."\n".'<tbody><tr><td>C</td><td>D</td></tr></tbody></table>',
+				'<table><thead><tr><?php if($__Context->vvvls&&count($__Context->vvvls))foreach($__Context->vvvls as $__Context->vvv){ ?><th><?php echo $__Context->vvv ?></th><?php } ?></tr></thead>'."\n".'<tbody><tr><td>C</td><td>D</td></tr></tbody></table>'
+			),
+			// issue 512 - ignores <marquee>
+			array(
+				'<div class="topimgContex"><marquee direction="up" scrollamount="1" height="130" loop="infinity" behavior="lscro">{$lang->sl_show_topimgtext}</marquee></div>',
+				'<div class="topimgContex"><marquee direction="up" scrollamount="1" height="130" loop="infinity" behavior="lscro"><?php echo $__Context->lang->sl_show_topimgtext ?></marquee></div>'
+			),
+			// issue 584
+			array(
+				'<img cond="$oBodex->display_extra_images[\'mobile\'] && $arr_extra && $arr_extra->bodex->mobile" src="./images/common/mobile.gif" title="mobile" alt="mobile" />',
+				'<?php if($__Context->oBodex->display_extra_images[\'mobile\'] && $__Context->arr_extra && $__Context->arr_extra->bodex->mobile){ ?><img src="/xe/tests/classes/template/images/common/mobile.gif" title="mobile" alt="mobile" /><?php } ?>'
+			),
+			// issue 831
+			array(
+				"<li <!--@if(in_array(\$act, array(\n'dispNmsAdminGroupList',\n'dispNmsAdminInsertGroup',\n'dispNmsAdminGroupInfo',\n'dispNmsAdminDeleteGroup')))-->class=\"on\"<!--@endif-->>",
+				"<li <?php if(in_array(\$__Context->act, array(\n'dispNmsAdminGroupList',\n'dispNmsAdminInsertGroup',\n'dispNmsAdminGroupInfo',\n'dispNmsAdminDeleteGroup'))){ ?>class=\"on\"<?php } ?>>"
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider provider
+	 */
+	public function testParse($tpl, $expected)
+	{
+		$tmpl = TemplateHandler::getInstance();
+		$tmpl->init(dirname(__FILE__), 'sample.html');
+		$result = $tmpl->parse($tpl);
+
+		$this->assertEquals($result, $this->prefix.$expected);
+	}
+
+	public function testParse2()
+	{
+		$tmpl = TemplateHandler::getInstance();
+		$tmpl->init(dirname(__FILE__), 'no_file.html');
+
+		$result = $tmpl->parse();
+		$this->assertEquals($result, '');
+	}
+
+	public function testCompileDirect()
+	{
+		$tmpl = TemplateHandler::getInstance();
+		$result = $tmpl->compileDirect(dirname(__FILE__), 'sample.html');
+		$result = trim($result);
+
+ 		$this->assertEquals($result, $this->prefix.'<?php if($__Context->has_blog){ ?><a href="http://mygony.com">Taggon\'s blog</a><?php } ?>');
+	}
+}
diff --git a/tests/classes/template/css/style.css b/tests/classes/template/css/style.css
new file mode 100644
index 000000000..af6e2a583
--- /dev/null
+++ b/tests/classes/template/css/style.css
@@ -0,0 +1 @@
+/* only for test */
diff --git a/tests/classes/template/sample.html b/tests/classes/template/sample.html
new file mode 100644
index 000000000..949b441ba
--- /dev/null
+++ b/tests/classes/template/sample.html
@@ -0,0 +1 @@
+<a href="http://mygony.com" cond="$has_blog">Taggon's blog</a>
diff --git a/tests/classes/validator/ValidatorTest.php b/tests/classes/validator/ValidatorTest.php
new file mode 100644
index 000000000..af0aa861b
--- /dev/null
+++ b/tests/classes/validator/ValidatorTest.php
@@ -0,0 +1,181 @@
+<?php
+
+if(!defined('__XE__')) require dirname(__FILE__).'/../../Bootstrap.php';
+require_once _XE_PATH_.'classes/xml/XmlParser.class.php';
+require_once _XE_PATH_.'classes/handler/Handler.class.php';
+require_once _XE_PATH_.'classes/file/FileHandler.class.php';
+require_once _XE_PATH_.'classes/validator/Validator.class.php';
+
+class ValidatorTest extends PHPUnit_Framework_TestCase
+{
+	protected function setUp() {
+		global $lang;
+
+		$lang->filter = new stdClass;
+		$lang->filter->isnull = 'isnull';
+		$lang->filter->outofrange = 'outofrange';
+		$lang->filter->equalto = 'equalto';
+	}
+
+	public function testRequired() {
+		$vd = new Validator();
+		$vd->addFilter('userid', array('required'=>'true'));
+
+		// given data
+		$this->assertFalse( $vd->validate(array('no-userid'=>'hello')) );
+		$this->assertTrue( $vd->validate(array('userid'=>'myuserid')) );
+		$this->assertFalse( $vd->validate(array('userid'=>'')) );
+
+		// context data
+		$this->assertFalse( $vd->validate() );
+		Context::set('userid', '', true);
+		$this->assertFalse( $vd->validate() );
+		Context::set('userid', 'myuserid', true);
+		$this->assertTrue( $vd->validate() );
+		$vd->removeFilter('userid');
+		$this->assertTrue( $vd->validate() );
+	}
+
+	public function testNamePattern() {
+		$vd = new Validator();
+		$vd->addFilter('^user_', array('length'=>'5:'));
+
+		Context::set('user_123', 'abcd', true);
+		Context::set('user_456', '123', true);
+		$this->assertFalse( $vd->validate() );
+
+		Context::set('user_123', 'abcdefg', true);
+		$this->assertFalse( $vd->validate() );
+
+		Context::set('user_456', '123456', true);
+		$this->assertTrue( $vd->validate() );
+	}
+
+	public function testEqualTo() {
+		$vd = new Validator();
+		$vd->addFilter('pass1', array('equalto'=>'pass2'));
+
+		Context::set('pass1', 'MyPassword', true);
+		$this->assertFalse( $vd->validate() );
+		Context::set('pass2', 'WorngPassword', true);
+		$this->assertFalse( $vd->validate() );
+		Context::set('pass2', 'MyPassword', true);
+		$this->assertTrue( $vd->validate() );
+	}
+
+	public function testArrayTrim() {
+		$vd = new Validator();
+
+		$arr = array('red'=>'apple', 'yellow'=>'banana ', 'green'=>' papaya ');
+		$this->assertEquals($vd->arrayTrim($arr), array('red'=>'apple', 'yellow'=>'banana', 'green'=>'papaya'));
+		$this->assertEquals($vd->arrayTrim(' string '), 'string');
+	}
+
+	public function testDefault() {
+		$vd = new Validator();
+		$vd->addFilter('userid', array('default'=>'ididid'));
+
+		// given data
+		$arr = array('no-userid'=>'');
+		$vd->validate($arr);
+		$this->assertEquals( $arr, array('no-userid'=>'') );
+		
+		$arr = array('userid'=>'');
+		$vd->validate(&$arr); // pass-by-reference
+		$this->assertEquals( $arr, array('userid'=>'ididid') );
+
+		$arr = array('userid'=>'ownid');
+ 		$vd->validate(&$arr);
+ 		$this->assertEquals( $arr, array('userid'=>'ownid') );
+
+		if(defined('MOCK_CONTEXT')) {
+			Context::truncate();
+
+			// context data
+			$vd->validate();
+			$this->assertEquals( 'ididid', Context::get('userid') );
+
+		}
+
+		$vd->load(dirname(__FILE__).'/login.xml');
+
+		Context::set('userid', '', true);
+		$vd->validate();
+		$this->assertEquals( 'idididid', Context::get('userid') );
+	}
+
+	public function testLength() {
+		$vd = new Validator();
+
+		$vd->addFilter('field1', array('length'=>'3:'));
+		$this->assertFalse( $vd->validate(array('field1'=>'ab')) );
+		$this->assertTrue( $vd->validate(array('field1'=>'abc')) );
+		$this->assertTrue( $vd->validate(array('field1'=>'abcd')) );
+	}
+
+	public function testCustomRule() {
+	}
+
+	public function testCondition() {
+		$vd = new Validator();
+		$data = array('greeting1'=>'hello');
+
+		// No condition
+		$vd->addFilter('greeting1', array('required'=>'true'));
+		$this->assertTrue($vd->validate($data));
+
+		// Now greeting2 being mandatory if greeting1 is 'Hello'
+		$vd->addFilter('greeting2', array('if'=>array('test'=>'$greeting1 == "Hello"', 'attr'=>'required', 'value'=>'true')));
+
+		// Because greeting1 is 'hello', including lowercase 'h', greeting2 isn't required yet.
+		$this->assertTrue($vd->validate($data));
+
+		// Change the value of greeting1. Greeting2 is required now
+		$data['greeting1'] = 'Hello';
+		$this->assertFalse($vd->validate($data));
+
+		$data['greeting2'] = 'World';
+		$this->assertTrue($vd->validate($data));
+	}
+
+	public function testConditionXml() {
+
+		$vd = new Validator(dirname(__FILE__).'/condition.xml');
+		$data = array('greeting1'=>'hello');
+
+		$this->assertTrue($vd->validate($data));
+
+		// Change the value of greeting1. Greeting2 is required now
+		$data['greeting1'] = 'Hello';
+		$this->assertFalse($vd->validate($data));
+
+		$data['greeting2'] = 'World';
+		$this->assertTrue($vd->validate($data));
+
+		// javascript
+		$vd->setCacheDir(dirname(__FILE__));
+		$js = $vd->getJsPath();
+		$this->assertFileEquals($js, dirname(__FILE__).'/condition.en.js');
+	}
+
+	protected function tearDown()
+	{
+		// remove cache directory
+		$cache_dir = dirname(__FILE__).'/ruleset';
+		if(is_dir($cache_dir)) {
+			$files = (array)glob($cache_dir.'/*');
+			foreach($files as $file) {
+				unlink($file);
+			}
+			rmdir($cache_dir);
+		}
+	}
+}
+
+if(!class_exists('Context'))
+{
+	require _XE_PATH_.'tests/classes/context/Context.mock.php';
+}
+
+/* End of file ValidatorTest.php */
+/* Location: ./tests/classes/validator/ValidatorTest.php */
diff --git a/tests/classes/validator/condition.en.js b/tests/classes/validator/condition.en.js
new file mode 100644
index 000000000..dd24a54df
--- /dev/null
+++ b/tests/classes/validator/condition.en.js
@@ -0,0 +1,8 @@
+(function($,v){
+v=xe.getApp('validator')[0];if(!v)return;
+
+v.cast('ADD_FILTER',['condition', {'greeting1':{required:true},'greeting2':{'if':[{test:'$greeting1 == \'Hello\'', attr:'required', value:'true'}]}}]);
+v.cast('ADD_MESSAGE',['isnull','isnull']);
+v.cast('ADD_MESSAGE',['outofrange','outofrange']);
+v.cast('ADD_MESSAGE',['equalto','equalto']);
+})(jQuery);
\ No newline at end of file
diff --git a/tests/classes/validator/condition.xml b/tests/classes/validator/condition.xml
new file mode 100644
index 000000000..a1fcb91aa
--- /dev/null
+++ b/tests/classes/validator/condition.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+	<fields>
+		<field name="greeting1" required="true" />
+		<field name="greeting2">
+			<if test="$greeting1 == 'Hello'" attr="required" value="true" />
+		</field>
+	</fields>
+</ruleset>
diff --git a/tests/classes/validator/insertDocument.xml b/tests/classes/validator/insertDocument.xml
new file mode 100644
index 000000000..56d49d7d1
--- /dev/null
+++ b/tests/classes/validator/insertDocument.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset version="1.5.0">
+    <customrules>
+    </customrules>
+    <fields>
+      <field name="nick_name" length="1:20"/>
+      <field name="password" length="1:20"/>
+      <field name="email_address" rule="email" length=":250" />
+      <field name="homepage" rule="url" length=":250" />
+      <field name="title" required="true" length="1:250"/>
+      <field name="content" required="true"/>
+      <field name="category_srl" required="true" rule="number" default="0" />
+    </fields>
+</ruleset>
diff --git a/tests/classes/validator/login.xml b/tests/classes/validator/login.xml
new file mode 100644
index 000000000..db50002bf
--- /dev/null
+++ b/tests/classes/validator/login.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ruleset>
+	<fields>
+		<field name="userid" required="true" length="5:10" rule="userid" default="idididid" />
+		<field name="password" required="true" />
+	</fields>
+</ruleset>
diff --git a/tests/common/js/index.html b/tests/common/js/index.html
new file mode 100644
index 000000000..31d375efa
--- /dev/null
+++ b/tests/common/js/index.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8" />	
+	<link rel="stylesheet" href="qunit.css" type="text/css" />
+	<script type="text/javascript" src="../../../common/js/jquery.js"></script>
+	<script type="text/javascript" src="../../../common/js/common.js"></script>
+	<script type="text/javascript" src="../../../common/js/js_app.js"></script>
+	<script type="text/javascript" src="../../../common/js/xml_handler.js"></script>
+	<script type="text/javascript" src="../../../common/js/xml_js_filter.js"></script>
+	<script type="text/javascript" src="qunit.js"></script>
+	<script type="text/javascript" src="js_app.test.js"></script>
+	<script type="text/javascript" src="xml_js_filter.test.js"></script>
+</head>
+<body>
+<h1 id="qunit-header">Common JavaScript Test</h1>
+<h2 id="qunit-banner"></h2>
+<div id="qunit-testrunner-toolbar"></div>
+<h2 id="qunit-userAgent"></h2>
+<ol id="qunit-tests"></ol>
+<div id="qunit-fixture">
+	<!-- test markup -->
+	<div id="plugin-test"></div>
+	<form id="validator-test">
+		<fieldset>
+			<legend>Legend</legend>
+			<input type="hidden" name="ruleset" value="ruleset" />
+			<input type="text" name="user_1" value="" />
+			<input type="text" name="user_2" value="" />
+			<input type="text" name="user_3" value="" />
+			<input type="checkbox" name="chkbox1" value="" />
+			<input type="checkbox" name="chkbox1" value="" />
+		</fieldset>
+	</form>
+</div>
+
+</body>
+</html>
diff --git a/tests/common/js/js_app.test.js b/tests/common/js/js_app.test.js
new file mode 100644
index 000000000..896a05b44
--- /dev/null
+++ b/tests/common/js/js_app.test.js
@@ -0,0 +1,105 @@
+jQuery(function($){
+	module('JAF');
+
+	var App = xe.createApp('App', {
+		value : 1,
+		init : function() {
+			this.value = 2;
+		},
+		API_GET_VALUE : function(sender, params) {
+			return this.value;
+		},
+		API_SET_VALUE : function(sender, params) {
+			this.value = params[0];
+		}
+	});
+
+	var Plugin = xe.createPlugin('Plugin', {
+		API_BEFORE_GET_VALUE : function(sender, params) {
+			if (params[0]) return false;
+		},
+		API_BEFORE_SET_VALUE : function(sender, params) {
+			params[0] = params[0] * 3;
+		},
+		API_METHOD : function(sender, params) {
+			$('#plugin-test').html(params[0]);
+		}
+	});
+
+	test('Global object - xe', function(){
+		equal(xe.getName(), 'Core');
+		ok($.isFunction(xe.createApp), 'xe has createApp method');
+		ok($.isFunction(xe.createPlugin), 'xe has createPlugin method');
+		ok($.isFunction(xe.getApps), 'xe has getApps method');
+		ok($.isFunction(xe.getApp), 'xe has getApp method');
+		ok($.isFunction(xe.registerApp), 'xe has registerApp method');
+		ok($.isFunction(xe.unregisterApp), 'xe has unregisterApp method');
+		ok($.isFunction(xe.broadcast), 'xe has broadcast method');
+	});
+	test('App', function() {
+		var app1 = new App();
+
+		equal(app1.getName(), 'App', 'The app1 is an instance of App.');
+		ok(xe.getApp('App') == null, 'The app1 is NOT registered yet.');
+		
+		xe.registerApp(app1);
+
+		ok(xe.getApp('App')[0] === app1, 'The app1 is registered successfully.');
+		equal(app1.cast('GET_VALUE'), 2);
+
+		xe.unregisterApp(app1);
+
+		ok(xe.getApp('App') == null, 'The app1 is unregistered.');
+	});
+	test('Plugin', function() {
+		xe.registerApp(new App());
+
+		var plugin1 = new Plugin();
+
+		equal(plugin1.getName(), 'Plugin', 'The plugin1 is an instance of Plugin.');
+
+		var app1 = xe.getApp('App')[0];
+
+		app1.registerPlugin(plugin1);
+
+		ok(typeof app1.cast('GET_VALUE', [true]) == 'undefined', 'Stop GET_VALUE action');
+
+		var val = app1.cast('GET_VALUE');
+		equal(app1.cast('GET_VALUE'), val, 'Check current value');
+
+		app1.cast('SET_VALUE', [3]);
+		equal(app1.cast('GET_VALUE'), 9, 'Before hooker should change input value 3 into');
+
+		// original method
+		var obj = $('#plugin-test');
+		equal(obj.html(), '', 'There is no content');
+
+		app1.cast('METHOD', ['hello']);
+		equal(obj.html(), 'hello', 'The plugin set the content');
+
+		obj.hide();
+
+		xe.unregisterApp(app1);
+	});
+	test('Function : You can register a function as a message handler', function() {
+		xe.registerApp(new App());
+
+		function handler(sender, params) {
+			params[0] = params[0] + ', world!';
+		}
+
+		var app1 = xe.getApp('App')[0];
+		app1.registerPlugin(new Plugin());
+
+		var obj = $('#plugin-test');
+		app1.cast('METHOD', ['Hello']);
+		equal(obj.html(), 'Hello', 'The plugin set the content');
+
+		app1.registerHandler('BEFORE_METHOD', handler);
+		app1.cast('METHOD', ['Hello']);
+		equal(obj.html(), 'Hello, world!', 'The handler function changes a passed parameter.');
+
+		xe.unregisterApp(app1);
+	});
+
+});
diff --git a/tests/common/js/qunit.css b/tests/common/js/qunit.css
new file mode 100644
index 000000000..5da9cb48c
--- /dev/null
+++ b/tests/common/js/qunit.css
@@ -0,0 +1,228 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ * Pulled Live from Git Fri Sep  2 02:15:01 UTC 2011
+ * Last Commit: 7f292170fa1109f1355f3e96f8973c32fc553946
+ */
+
+/** Font Family and Sizes */
+
+#qunit-tests, #qunit-header, #qunit-banner, #qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult {
+	font-family: "Helvetica Neue Light", "HelveticaNeue-Light", "Helvetica Neue", Calibri, Helvetica, Arial, sans-serif;
+}
+
+#qunit-testrunner-toolbar, #qunit-userAgent, #qunit-testresult, #qunit-tests li { font-size: small; }
+#qunit-tests { font-size: smaller; }
+
+
+/** Resets */
+
+#qunit-tests, #qunit-tests ol, #qunit-header, #qunit-banner, #qunit-userAgent, #qunit-testresult {
+	margin: 0;
+	padding: 0;
+}
+
+
+/** Header */
+
+#qunit-header {
+	padding: 0.5em 0 0.5em 1em;
+
+	color: #8699a4;
+	background-color: #0d3349;
+
+	font-size: 1.5em;
+	line-height: 1em;
+	font-weight: normal;
+
+	border-radius: 15px 15px 0 0;
+	-moz-border-radius: 15px 15px 0 0;
+	-webkit-border-top-right-radius: 15px;
+	-webkit-border-top-left-radius: 15px;
+}
+
+#qunit-header a {
+	text-decoration: none;
+	color: #c2ccd1;
+}
+
+#qunit-header a:hover,
+#qunit-header a:focus {
+	color: #fff;
+}
+
+#qunit-banner {
+	height: 5px;
+}
+
+#qunit-testrunner-toolbar {
+	padding: 0.5em 0 0.5em 2em;
+	color: #5E740B;
+	background-color: #eee;
+}
+
+#qunit-userAgent {
+	padding: 0.5em 0 0.5em 2.5em;
+	background-color: #2b81af;
+	color: #fff;
+	text-shadow: rgba(0, 0, 0, 0.5) 2px 2px 1px;
+}
+
+
+/** Tests: Pass/Fail */
+
+#qunit-tests {
+	list-style-position: inside;
+}
+
+#qunit-tests li {
+	padding: 0.4em 0.5em 0.4em 2.5em;
+	border-bottom: 1px solid #fff;
+	list-style-position: inside;
+}
+
+#qunit-tests.hidepass li.pass, #qunit-tests.hidepass li.running  {
+	display: none;
+}
+
+#qunit-tests li strong {
+	cursor: pointer;
+}
+
+#qunit-tests li a {
+	padding: 0.5em;
+	color: #c2ccd1;
+	text-decoration: none;
+}
+#qunit-tests li a:hover,
+#qunit-tests li a:focus {
+	color: #000;
+}
+
+#qunit-tests ol {
+	margin-top: 0.5em;
+	padding: 0.5em;
+
+	background-color: #fff;
+
+	border-radius: 15px;
+	-moz-border-radius: 15px;
+	-webkit-border-radius: 15px;
+
+	box-shadow: inset 0px 2px 13px #999;
+	-moz-box-shadow: inset 0px 2px 13px #999;
+	-webkit-box-shadow: inset 0px 2px 13px #999;
+}
+
+#qunit-tests table {
+	border-collapse: collapse;
+	margin-top: .2em;
+}
+
+#qunit-tests th {
+	text-align: right;
+	vertical-align: top;
+	padding: 0 .5em 0 0;
+}
+
+#qunit-tests td {
+	vertical-align: top;
+}
+
+#qunit-tests pre {
+	margin: 0;
+	white-space: pre-wrap;
+	word-wrap: break-word;
+}
+
+#qunit-tests del {
+	background-color: #e0f2be;
+	color: #374e0c;
+	text-decoration: none;
+}
+
+#qunit-tests ins {
+	background-color: #ffcaca;
+	color: #500;
+	text-decoration: none;
+}
+
+/*** Test Counts */
+
+#qunit-tests b.counts                       { color: black; }
+#qunit-tests b.passed                       { color: #5E740B; }
+#qunit-tests b.failed                       { color: #710909; }
+
+#qunit-tests li li {
+	margin: 0.5em;
+	padding: 0.4em 0.5em 0.4em 0.5em;
+	background-color: #fff;
+	border-bottom: none;
+	list-style-position: inside;
+}
+
+/*** Passing Styles */
+
+#qunit-tests li li.pass {
+	color: #5E740B;
+	background-color: #fff;
+	border-left: 26px solid #C6E746;
+}
+
+#qunit-tests .pass                          { color: #528CE0; background-color: #D2E0E6; }
+#qunit-tests .pass .test-name               { color: #366097; }
+
+#qunit-tests .pass .test-actual,
+#qunit-tests .pass .test-expected           { color: #999999; }
+
+#qunit-banner.qunit-pass                    { background-color: #C6E746; }
+
+/*** Failing Styles */
+
+#qunit-tests li li.fail {
+	color: #710909;
+	background-color: #fff;
+	border-left: 26px solid #EE5757;
+	white-space: pre;
+}
+
+#qunit-tests > li:last-child {
+	border-radius: 0 0 15px 15px;
+	-moz-border-radius: 0 0 15px 15px;
+	-webkit-border-bottom-right-radius: 15px;
+	-webkit-border-bottom-left-radius: 15px;
+}
+
+#qunit-tests .fail                          { color: #000000; background-color: #EE5757; }
+#qunit-tests .fail .test-name,
+#qunit-tests .fail .module-name             { color: #000000; }
+
+#qunit-tests .fail .test-actual             { color: #EE5757; }
+#qunit-tests .fail .test-expected           { color: green;   }
+
+#qunit-banner.qunit-fail                    { background-color: #EE5757; }
+
+
+/** Result */
+
+#qunit-testresult {
+	padding: 0.5em 0.5em 0.5em 2.5em;
+
+	color: #2b81af;
+	background-color: #D2E0E6;
+
+	border-bottom: 1px solid white;
+}
+
+/** Fixture */
+
+#qunit-fixture {
+	position: absolute;
+	top: -10000px;
+	left: -10000px;
+}
diff --git a/tests/common/js/qunit.js b/tests/common/js/qunit.js
new file mode 100644
index 000000000..f8d2a6850
--- /dev/null
+++ b/tests/common/js/qunit.js
@@ -0,0 +1,1512 @@
+/**
+ * QUnit - A JavaScript Unit Testing Framework
+ *
+ * http://docs.jquery.com/QUnit
+ *
+ * Copyright (c) 2011 John Resig, Jörn Zaefferer
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * or GPL (GPL-LICENSE.txt) licenses.
+ * Pulled Live from Git Fri Sep  2 02:15:01 UTC 2011
+ * Last Commit: 7f292170fa1109f1355f3e96f8973c32fc553946
+ */
+
+(function(window) {
+
+var defined = {
+	setTimeout: typeof window.setTimeout !== "undefined",
+	sessionStorage: (function() {
+		try {
+			return !!sessionStorage.getItem;
+		} catch(e) {
+			return false;
+		}
+	})()
+};
+
+var testId = 0;
+
+var Test = function(name, testName, expected, testEnvironmentArg, async, callback) {
+	this.name = name;
+	this.testName = testName;
+	this.expected = expected;
+	this.testEnvironmentArg = testEnvironmentArg;
+	this.async = async;
+	this.callback = callback;
+	this.assertions = [];
+};
+Test.prototype = {
+	init: function() {
+		var tests = id("qunit-tests");
+		if (tests) {
+			var b = document.createElement("strong");
+				b.innerHTML = "Running " + this.name;
+			var li = document.createElement("li");
+				li.appendChild( b );
+				li.className = "running";
+				li.id = this.id = "test-output" + testId++;
+			tests.appendChild( li );
+		}
+	},
+	setup: function() {
+		if (this.module != config.previousModule) {
+			if ( config.previousModule ) {
+				QUnit.moduleDone( {
+					name: config.previousModule,
+					failed: config.moduleStats.bad,
+					passed: config.moduleStats.all - config.moduleStats.bad,
+					total: config.moduleStats.all
+				} );
+			}
+			config.previousModule = this.module;
+			config.moduleStats = { all: 0, bad: 0 };
+			QUnit.moduleStart( {
+				name: this.module
+			} );
+		}
+
+		config.current = this;
+		this.testEnvironment = extend({
+			setup: function() {},
+			teardown: function() {}
+		}, this.moduleTestEnvironment);
+		if (this.testEnvironmentArg) {
+			extend(this.testEnvironment, this.testEnvironmentArg);
+		}
+
+		QUnit.testStart( {
+			name: this.testName
+		} );
+
+		// allow utility functions to access the current test environment
+		// TODO why??
+		QUnit.current_testEnvironment = this.testEnvironment;
+
+		try {
+			if ( !config.pollution ) {
+				saveGlobal();
+			}
+
+			this.testEnvironment.setup.call(this.testEnvironment);
+		} catch(e) {
+			QUnit.ok( false, "Setup failed on " + this.testName + ": " + e.message );
+		}
+	},
+	run: function() {
+		if ( this.async ) {
+			QUnit.stop();
+		}
+
+		if ( config.notrycatch ) {
+			this.callback.call(this.testEnvironment);
+			return;
+		}
+		try {
+			this.callback.call(this.testEnvironment);
+		} catch(e) {
+			fail("Test " + this.testName + " died, exception and test follows", e, this.callback);
+			QUnit.ok( false, "Died on test #" + (this.assertions.length + 1) + ": " + e.message + " - " + QUnit.jsDump.parse(e) );
+			// else next test will carry the responsibility
+			saveGlobal();
+
+			// Restart the tests if they're blocking
+			if ( config.blocking ) {
+				start();
+			}
+		}
+	},
+	teardown: function() {
+		try {
+			this.testEnvironment.teardown.call(this.testEnvironment);
+			checkPollution();
+		} catch(e) {
+			QUnit.ok( false, "Teardown failed on " + this.testName + ": " + e.message );
+		}
+	},
+	finish: function() {
+		if ( this.expected && this.expected != this.assertions.length ) {
+			QUnit.ok( false, "Expected " + this.expected + " assertions, but " + this.assertions.length + " were run" );
+		}
+
+		var good = 0, bad = 0,
+			tests = id("qunit-tests");
+
+		config.stats.all += this.assertions.length;
+		config.moduleStats.all += this.assertions.length;
+
+		if ( tests ) {
+			var ol = document.createElement("ol");
+
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				var assertion = this.assertions[i];
+
+				var li = document.createElement("li");
+				li.className = assertion.result ? "pass" : "fail";
+				li.innerHTML = assertion.message || (assertion.result ? "okay" : "failed");
+				ol.appendChild( li );
+
+				if ( assertion.result ) {
+					good++;
+				} else {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+
+			// store result when possible
+			if ( QUnit.config.reorder && defined.sessionStorage ) {
+				if (bad) {
+					sessionStorage.setItem("qunit-" + this.module + "-" + this.testName, bad);
+				} else {
+					sessionStorage.removeItem("qunit-" + this.module + "-" + this.testName);
+				}
+			}
+
+			if (bad == 0) {
+				ol.style.display = "none";
+			}
+
+			var b = document.createElement("strong");
+			b.innerHTML = this.name + " <b class='counts'>(<b class='failed'>" + bad + "</b>, <b class='passed'>" + good + "</b>, " + this.assertions.length + ")</b>";
+
+			var a = document.createElement("a");
+			a.innerHTML = "Rerun";
+			a.href = QUnit.url({ filter: getText([b]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+
+			addEvent(b, "click", function() {
+				var next = b.nextSibling.nextSibling,
+					display = next.style.display;
+				next.style.display = display === "none" ? "block" : "none";
+			});
+
+			addEvent(b, "dblclick", function(e) {
+				var target = e && e.target ? e.target : window.event.srcElement;
+				if ( target.nodeName.toLowerCase() == "span" || target.nodeName.toLowerCase() == "b" ) {
+					target = target.parentNode;
+				}
+				if ( window.location && target.nodeName.toLowerCase() === "strong" ) {
+					window.location = QUnit.url({ filter: getText([target]).replace(/\([^)]+\)$/, "").replace(/(^\s*|\s*$)/g, "") });
+				}
+			});
+
+			var li = id(this.id);
+			li.className = bad ? "fail" : "pass";
+			li.removeChild( li.firstChild );
+			li.appendChild( b );
+			li.appendChild( a );
+			li.appendChild( ol );
+
+		} else {
+			for ( var i = 0; i < this.assertions.length; i++ ) {
+				if ( !this.assertions[i].result ) {
+					bad++;
+					config.stats.bad++;
+					config.moduleStats.bad++;
+				}
+			}
+		}
+
+		try {
+			QUnit.reset();
+		} catch(e) {
+			fail("reset() failed, following Test " + this.testName + ", exception and reset fn follows", e, QUnit.reset);
+		}
+
+		QUnit.testDone( {
+			name: this.testName,
+			failed: bad,
+			passed: this.assertions.length - bad,
+			total: this.assertions.length
+		} );
+	},
+
+	queue: function() {
+		var test = this;
+		synchronize(function() {
+			test.init();
+		});
+		function run() {
+			// each of these can by async
+			synchronize(function() {
+				test.setup();
+			});
+			synchronize(function() {
+				test.run();
+			});
+			synchronize(function() {
+				test.teardown();
+			});
+			synchronize(function() {
+				test.finish();
+			});
+		}
+		// defer when previous test run passed, if storage is available
+		var bad = QUnit.config.reorder && defined.sessionStorage && +sessionStorage.getItem("qunit-" + this.module + "-" + this.testName);
+		if (bad) {
+			run();
+		} else {
+			synchronize(run);
+		};
+	}
+
+};
+
+var QUnit = {
+
+	// call on start of module test to prepend name to all tests
+	module: function(name, testEnvironment) {
+		config.currentModule = name;
+		config.currentModuleTestEnviroment = testEnvironment;
+	},
+
+	asyncTest: function(testName, expected, callback) {
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = 0;
+		}
+
+		QUnit.test(testName, expected, callback, true);
+	},
+
+	test: function(testName, expected, callback, async) {
+		var name = '<span class="test-name">' + testName + '</span>', testEnvironmentArg;
+
+		if ( arguments.length === 2 ) {
+			callback = expected;
+			expected = null;
+		}
+		// is 2nd argument a testEnvironment?
+		if ( expected && typeof expected === 'object') {
+			testEnvironmentArg = expected;
+			expected = null;
+		}
+
+		if ( config.currentModule ) {
+			name = '<span class="module-name">' + config.currentModule + "</span>: " + name;
+		}
+
+		if ( !validTest(config.currentModule + ": " + testName) ) {
+			return;
+		}
+
+		var test = new Test(name, testName, expected, testEnvironmentArg, async, callback);
+		test.module = config.currentModule;
+		test.moduleTestEnvironment = config.currentModuleTestEnviroment;
+		test.queue();
+	},
+
+	/**
+	 * Specify the number of expected assertions to gurantee that failed test (no assertions are run at all) don't slip through.
+	 */
+	expect: function(asserts) {
+		config.current.expected = asserts;
+	},
+
+	/**
+	 * Asserts true.
+	 * @example ok( "asdfasdf".length > 5, "There must be at least 5 chars" );
+	 */
+	ok: function(a, msg) {
+		a = !!a;
+		var details = {
+			result: a,
+			message: msg
+		};
+		msg = escapeHtml(msg);
+		QUnit.log(details);
+		config.current.assertions.push({
+			result: a,
+			message: msg
+		});
+	},
+
+	/**
+	 * Checks that the first two arguments are equal, with an optional message.
+	 * Prints out both actual and expected values.
+	 *
+	 * Prefered to ok( actual == expected, message )
+	 *
+	 * @example equal( format("Received {0} bytes.", 2), "Received 2 bytes." );
+	 *
+	 * @param Object actual
+	 * @param Object expected
+	 * @param String message (optional)
+	 */
+	equal: function(actual, expected, message) {
+		QUnit.push(expected == actual, actual, expected, message);
+	},
+
+	notEqual: function(actual, expected, message) {
+		QUnit.push(expected != actual, actual, expected, message);
+	},
+
+	deepEqual: function(actual, expected, message) {
+		QUnit.push(QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	notDeepEqual: function(actual, expected, message) {
+		QUnit.push(!QUnit.equiv(actual, expected), actual, expected, message);
+	},
+
+	strictEqual: function(actual, expected, message) {
+		QUnit.push(expected === actual, actual, expected, message);
+	},
+
+	notStrictEqual: function(actual, expected, message) {
+		QUnit.push(expected !== actual, actual, expected, message);
+	},
+
+	raises: function(block, expected, message) {
+		var actual, ok = false;
+
+		if (typeof expected === 'string') {
+			message = expected;
+			expected = null;
+		}
+
+		try {
+			block();
+		} catch (e) {
+			actual = e;
+		}
+
+		if (actual) {
+			// we don't want to validate thrown error
+			if (!expected) {
+				ok = true;
+			// expected is a regexp
+			} else if (QUnit.objectType(expected) === "regexp") {
+				ok = expected.test(actual);
+			// expected is a constructor
+			} else if (actual instanceof expected) {
+				ok = true;
+			// expected is a validation function which returns true is validation passed
+			} else if (expected.call({}, actual) === true) {
+				ok = true;
+			}
+		}
+
+		QUnit.ok(ok, message);
+	},
+
+	start: function() {
+		config.semaphore--;
+		if (config.semaphore > 0) {
+			// don't start until equal number of stop-calls
+			return;
+		}
+		if (config.semaphore < 0) {
+			// ignore if start is called more often then stop
+			config.semaphore = 0;
+		}
+		// A slight delay, to avoid any current callbacks
+		if ( defined.setTimeout ) {
+			window.setTimeout(function() {
+				if (config.semaphore > 0) {
+					return;
+				}
+				if ( config.timeout ) {
+					clearTimeout(config.timeout);
+				}
+
+				config.blocking = false;
+				process();
+			}, 13);
+		} else {
+			config.blocking = false;
+			process();
+		}
+	},
+
+	stop: function(timeout) {
+		config.semaphore++;
+		config.blocking = true;
+
+		if ( timeout && defined.setTimeout ) {
+			clearTimeout(config.timeout);
+			config.timeout = window.setTimeout(function() {
+				QUnit.ok( false, "Test timed out" );
+				QUnit.start();
+			}, timeout);
+		}
+	}
+};
+
+// Backwards compatibility, deprecated
+QUnit.equals = QUnit.equal;
+QUnit.same = QUnit.deepEqual;
+
+// Maintain internal state
+var config = {
+	// The queue of tests to run
+	queue: [],
+
+	// block until document ready
+	blocking: true,
+
+	// when enabled, show only failing tests
+	// gets persisted through sessionStorage and can be changed in UI via checkbox
+	hidepassed: false,
+
+	// by default, run previously failed tests first
+	// very useful in combination with "Hide passed tests" checked
+	reorder: true,
+
+	// by default, modify document.title when suite is done
+	altertitle: true,
+
+	urlConfig: ['noglobals', 'notrycatch']
+};
+
+// Load paramaters
+(function() {
+	var location = window.location || { search: "", protocol: "file:" },
+		params = location.search.slice( 1 ).split( "&" ),
+		length = params.length,
+		urlParams = {},
+		current;
+
+	if ( params[ 0 ] ) {
+		for ( var i = 0; i < length; i++ ) {
+			current = params[ i ].split( "=" );
+			current[ 0 ] = decodeURIComponent( current[ 0 ] );
+			// allow just a key to turn on a flag, e.g., test.html?noglobals
+			current[ 1 ] = current[ 1 ] ? decodeURIComponent( current[ 1 ] ) : true;
+			urlParams[ current[ 0 ] ] = current[ 1 ];
+		}
+	}
+
+	QUnit.urlParams = urlParams;
+	config.filter = urlParams.filter;
+
+	// Figure out if we're running the tests from a server or not
+	QUnit.isLocal = !!(location.protocol === 'file:');
+})();
+
+// Expose the API as global variables, unless an 'exports'
+// object exists, in that case we assume we're in CommonJS
+if ( typeof exports === "undefined" || typeof require === "undefined" ) {
+	extend(window, QUnit);
+	window.QUnit = QUnit;
+} else {
+	extend(exports, QUnit);
+	exports.QUnit = QUnit;
+}
+
+// define these after exposing globals to keep them in these QUnit namespace only
+extend(QUnit, {
+	config: config,
+
+	// Initialize the configuration options
+	init: function() {
+		extend(config, {
+			stats: { all: 0, bad: 0 },
+			moduleStats: { all: 0, bad: 0 },
+			started: +new Date,
+			updateRate: 1000,
+			blocking: false,
+			autostart: true,
+			autorun: false,
+			filter: "",
+			queue: [],
+			semaphore: 0
+		});
+
+		var tests = id( "qunit-tests" ),
+			banner = id( "qunit-banner" ),
+			result = id( "qunit-testresult" );
+
+		if ( tests ) {
+			tests.innerHTML = "";
+		}
+
+		if ( banner ) {
+			banner.className = "";
+		}
+
+		if ( result ) {
+			result.parentNode.removeChild( result );
+		}
+
+		if ( tests ) {
+			result = document.createElement( "p" );
+			result.id = "qunit-testresult";
+			result.className = "result";
+			tests.parentNode.insertBefore( result, tests );
+			result.innerHTML = 'Running...<br/>&nbsp;';
+		}
+	},
+
+	/**
+	 * Resets the test setup. Useful for tests that modify the DOM.
+	 *
+	 * If jQuery is available, uses jQuery's html(), otherwise just innerHTML.
+	 */
+	reset: function() {
+		if ( window.jQuery ) {
+			jQuery( "#qunit-fixture" ).html( config.fixture );
+		} else {
+			var main = id( 'qunit-fixture' );
+			if ( main ) {
+				main.innerHTML = config.fixture;
+			}
+		}
+	},
+
+	/**
+	 * Trigger an event on an element.
+	 *
+	 * @example triggerEvent( document.body, "click" );
+	 *
+	 * @param DOMElement elem
+	 * @param String type
+	 */
+	triggerEvent: function( elem, type, event ) {
+		if ( document.createEvent ) {
+			event = document.createEvent("MouseEvents");
+			event.initMouseEvent(type, true, true, elem.ownerDocument.defaultView,
+				0, 0, 0, 0, 0, false, false, false, false, 0, null);
+			elem.dispatchEvent( event );
+
+		} else if ( elem.fireEvent ) {
+			elem.fireEvent("on"+type);
+		}
+	},
+
+	// Safe object type checking
+	is: function( type, obj ) {
+		return QUnit.objectType( obj ) == type;
+	},
+
+	objectType: function( obj ) {
+		if (typeof obj === "undefined") {
+				return "undefined";
+
+		// consider: typeof null === object
+		}
+		if (obj === null) {
+				return "null";
+		}
+
+		var type = Object.prototype.toString.call( obj )
+			.match(/^\[object\s(.*)\]$/)[1] || '';
+
+		switch (type) {
+				case 'Number':
+						if (isNaN(obj)) {
+								return "nan";
+						} else {
+								return "number";
+						}
+				case 'String':
+				case 'Boolean':
+				case 'Array':
+				case 'Date':
+				case 'RegExp':
+				case 'Function':
+						return type.toLowerCase();
+		}
+		if (typeof obj === "object") {
+				return "object";
+		}
+		return undefined;
+	},
+
+	push: function(result, actual, expected, message) {
+		var details = {
+			result: result,
+			message: message,
+			actual: actual,
+			expected: expected
+		};
+
+		message = escapeHtml(message) || (result ? "okay" : "failed");
+		message = '<span class="test-message">' + message + "</span>";
+		expected = escapeHtml(QUnit.jsDump.parse(expected));
+		actual = escapeHtml(QUnit.jsDump.parse(actual));
+		var output = message + '<table><tr class="test-expected"><th>Expected: </th><td><pre>' + expected + '</pre></td></tr>';
+		if (actual != expected) {
+			output += '<tr class="test-actual"><th>Result: </th><td><pre>' + actual + '</pre></td></tr>';
+			output += '<tr class="test-diff"><th>Diff: </th><td><pre>' + QUnit.diff(expected, actual) +'</pre></td></tr>';
+		}
+		if (!result) {
+			var source = sourceFromStacktrace();
+			if (source) {
+				details.source = source;
+				output += '<tr class="test-source"><th>Source: </th><td><pre>' + escapeHtml(source) + '</pre></td></tr>';
+			}
+		}
+		output += "</table>";
+
+		QUnit.log(details);
+
+		config.current.assertions.push({
+			result: !!result,
+			message: output
+		});
+	},
+
+	url: function( params ) {
+		params = extend( extend( {}, QUnit.urlParams ), params );
+		var querystring = "?",
+			key;
+		for ( key in params ) {
+			querystring += encodeURIComponent( key ) + "=" +
+				encodeURIComponent( params[ key ] ) + "&";
+		}
+		return window.location.pathname + querystring.slice( 0, -1 );
+	},
+
+	extend: extend,
+	id: id,
+	addEvent: addEvent,
+
+	// Logging callbacks; all receive a single argument with the listed properties
+	// run test/logs.html for any related changes
+	begin: function() {},
+	// done: { failed, passed, total, runtime }
+	done: function() {},
+	// log: { result, actual, expected, message }
+	log: function() {},
+	// testStart: { name }
+	testStart: function() {},
+	// testDone: { name, failed, passed, total }
+	testDone: function() {},
+	// moduleStart: { name }
+	moduleStart: function() {},
+	// moduleDone: { name, failed, passed, total }
+	moduleDone: function() {}
+});
+
+if ( typeof document === "undefined" || document.readyState === "complete" ) {
+	config.autorun = true;
+}
+
+QUnit.load = function() {
+	QUnit.begin({});
+
+	// Initialize the config, saving the execution queue
+	var oldconfig = extend({}, config);
+	QUnit.init();
+	extend(config, oldconfig);
+
+	config.blocking = false;
+
+	var urlConfigHtml = '', len = config.urlConfig.length;
+	for ( var i = 0, val; i < len, val = config.urlConfig[i]; i++ ) {
+		config[val] = QUnit.urlParams[val];
+		urlConfigHtml += '<label><input name="' + val + '" type="checkbox"' + ( config[val] ? ' checked="checked"' : '' ) + '>' + val + '</label>';
+	}
+
+	var userAgent = id("qunit-userAgent");
+	if ( userAgent ) {
+		userAgent.innerHTML = navigator.userAgent;
+	}
+	var banner = id("qunit-header");
+	if ( banner ) {
+		banner.innerHTML = '<a href="' + QUnit.url({ filter: undefined }) + '"> ' + banner.innerHTML + '</a> ' + urlConfigHtml;
+		addEvent( banner, "change", function( event ) {
+			var params = {};
+			params[ event.target.name ] = event.target.checked ? true : undefined;
+			window.location = QUnit.url( params );
+		});
+	}
+
+	var toolbar = id("qunit-testrunner-toolbar");
+	if ( toolbar ) {
+		var filter = document.createElement("input");
+		filter.type = "checkbox";
+		filter.id = "qunit-filter-pass";
+		addEvent( filter, "click", function() {
+			var ol = document.getElementById("qunit-tests");
+			if ( filter.checked ) {
+				ol.className = ol.className + " hidepass";
+			} else {
+				var tmp = " " + ol.className.replace( /[\n\t\r]/g, " " ) + " ";
+				ol.className = tmp.replace(/ hidepass /, " ");
+			}
+			if ( defined.sessionStorage ) {
+				if (filter.checked) {
+					sessionStorage.setItem("qunit-filter-passed-tests", "true");
+				} else {
+					sessionStorage.removeItem("qunit-filter-passed-tests");
+				}
+			}
+		});
+		if ( config.hidepassed || defined.sessionStorage && sessionStorage.getItem("qunit-filter-passed-tests") ) {
+			filter.checked = true;
+			var ol = document.getElementById("qunit-tests");
+			ol.className = ol.className + " hidepass";
+		}
+		toolbar.appendChild( filter );
+
+		var label = document.createElement("label");
+		label.setAttribute("for", "qunit-filter-pass");
+		label.innerHTML = "Hide passed tests";
+		toolbar.appendChild( label );
+	}
+
+	var main = id('qunit-fixture');
+	if ( main ) {
+		config.fixture = main.innerHTML;
+	}
+
+	if (config.autostart) {
+		QUnit.start();
+	}
+};
+
+addEvent(window, "load", QUnit.load);
+
+function done() {
+	config.autorun = true;
+
+	// Log the last module results
+	if ( config.currentModule ) {
+		QUnit.moduleDone( {
+			name: config.currentModule,
+			failed: config.moduleStats.bad,
+			passed: config.moduleStats.all - config.moduleStats.bad,
+			total: config.moduleStats.all
+		} );
+	}
+
+	var banner = id("qunit-banner"),
+		tests = id("qunit-tests"),
+		runtime = +new Date - config.started,
+		passed = config.stats.all - config.stats.bad,
+		html = [
+			'Tests completed in ',
+			runtime,
+			' milliseconds.<br/>',
+			'<span class="passed">',
+			passed,
+			'</span> tests of <span class="total">',
+			config.stats.all,
+			'</span> passed, <span class="failed">',
+			config.stats.bad,
+			'</span> failed.'
+		].join('');
+
+	if ( banner ) {
+		banner.className = (config.stats.bad ? "qunit-fail" : "qunit-pass");
+	}
+
+	if ( tests ) {
+		id( "qunit-testresult" ).innerHTML = html;
+	}
+
+	if ( config.altertitle && typeof document !== "undefined" && document.title ) {
+		// show ✖ for good, ✔ for bad suite result in title
+		// use escape sequences in case file gets loaded with non-utf-8-charset
+		document.title = [
+			(config.stats.bad ? "\u2716" : "\u2714"),
+			document.title.replace(/^[\u2714\u2716] /i, "")
+		].join(" ");
+	}
+
+	QUnit.done( {
+		failed: config.stats.bad,
+		passed: passed,
+		total: config.stats.all,
+		runtime: runtime
+	} );
+}
+
+function validTest( name ) {
+	var filter = config.filter,
+		run = false;
+
+	if ( !filter ) {
+		return true;
+	}
+
+	var not = filter.charAt( 0 ) === "!";
+	if ( not ) {
+		filter = filter.slice( 1 );
+	}
+
+	if ( name.indexOf( filter ) !== -1 ) {
+		return !not;
+	}
+
+	if ( not ) {
+		run = true;
+	}
+
+	return run;
+}
+
+// so far supports only Firefox, Chrome and Opera (buggy)
+// could be extended in the future to use something like https://github.com/csnover/TraceKit
+function sourceFromStacktrace() {
+	try {
+		throw new Error();
+	} catch ( e ) {
+		if (e.stacktrace) {
+			// Opera
+			return e.stacktrace.split("\n")[6];
+		} else if (e.stack) {
+			// Firefox, Chrome
+			return e.stack.split("\n")[4];
+		} else if (e.sourceURL) {
+			// Safari, PhantomJS
+			// TODO sourceURL points at the 'throw new Error' line above, useless
+			//return e.sourceURL + ":" + e.line;
+		}
+	}
+}
+
+function escapeHtml(s) {
+	if (!s) {
+		return "";
+	}
+	s = s + "";
+	return s.replace(/[\&"<>\\]/g, function(s) {
+		switch(s) {
+			case "&": return "&amp;";
+			case "\\": return "\\\\";
+			case '"': return '\"';
+			case "<": return "&lt;";
+			case ">": return "&gt;";
+			default: return s;
+		}
+	});
+}
+
+function synchronize( callback ) {
+	config.queue.push( callback );
+
+	if ( config.autorun && !config.blocking ) {
+		process();
+	}
+}
+
+function process() {
+	var start = (new Date()).getTime();
+
+	while ( config.queue.length && !config.blocking ) {
+		if ( config.updateRate <= 0 || (((new Date()).getTime() - start) < config.updateRate) ) {
+			config.queue.shift()();
+		} else {
+			window.setTimeout( process, 13 );
+			break;
+		}
+	}
+	if (!config.blocking && !config.queue.length) {
+		done();
+	}
+}
+
+function saveGlobal() {
+	config.pollution = [];
+
+	if ( config.noglobals ) {
+		for ( var key in window ) {
+			config.pollution.push( key );
+		}
+	}
+}
+
+function checkPollution( name ) {
+	var old = config.pollution;
+	saveGlobal();
+
+	var newGlobals = diff( config.pollution, old );
+	if ( newGlobals.length > 0 ) {
+		ok( false, "Introduced global variable(s): " + newGlobals.join(", ") );
+	}
+
+	var deletedGlobals = diff( old, config.pollution );
+	if ( deletedGlobals.length > 0 ) {
+		ok( false, "Deleted global variable(s): " + deletedGlobals.join(", ") );
+	}
+}
+
+// returns a new Array with the elements that are in a but not in b
+function diff( a, b ) {
+	var result = a.slice();
+	for ( var i = 0; i < result.length; i++ ) {
+		for ( var j = 0; j < b.length; j++ ) {
+			if ( result[i] === b[j] ) {
+				result.splice(i, 1);
+				i--;
+				break;
+			}
+		}
+	}
+	return result;
+}
+
+function fail(message, exception, callback) {
+	if ( typeof console !== "undefined" && console.error && console.warn ) {
+		console.error(message);
+		console.error(exception);
+		console.warn(callback.toString());
+
+	} else if ( window.opera && opera.postError ) {
+		opera.postError(message, exception, callback.toString);
+	}
+}
+
+function extend(a, b) {
+	for ( var prop in b ) {
+		if ( b[prop] === undefined ) {
+			delete a[prop];
+		} else {
+			a[prop] = b[prop];
+		}
+	}
+
+	return a;
+}
+
+function addEvent(elem, type, fn) {
+	if ( elem.addEventListener ) {
+		elem.addEventListener( type, fn, false );
+	} else if ( elem.attachEvent ) {
+		elem.attachEvent( "on" + type, fn );
+	} else {
+		fn();
+	}
+}
+
+function id(name) {
+	return !!(typeof document !== "undefined" && document && document.getElementById) &&
+		document.getElementById( name );
+}
+
+// Test for equality any JavaScript type.
+// Discussions and reference: http://philrathe.com/articles/equiv
+// Test suites: http://philrathe.com/tests/equiv
+// Author: Philippe Rathé <prathe@gmail.com>
+QUnit.equiv = function () {
+
+	var innerEquiv; // the real equiv function
+	var callers = []; // stack to decide between skip/abort functions
+	var parents = []; // stack to avoiding loops from circular referencing
+
+	// Call the o related callback with the given arguments.
+	function bindCallbacks(o, callbacks, args) {
+		var prop = QUnit.objectType(o);
+		if (prop) {
+			if (QUnit.objectType(callbacks[prop]) === "function") {
+				return callbacks[prop].apply(callbacks, args);
+			} else {
+				return callbacks[prop]; // or undefined
+			}
+		}
+	}
+
+	var callbacks = function () {
+
+		// for string, boolean, number and null
+		function useStrictEquality(b, a) {
+			if (b instanceof a.constructor || a instanceof b.constructor) {
+				// to catch short annotaion VS 'new' annotation of a
+				// declaration
+				// e.g. var i = 1;
+				// var j = new Number(1);
+				return a == b;
+			} else {
+				return a === b;
+			}
+		}
+
+		return {
+			"string" : useStrictEquality,
+			"boolean" : useStrictEquality,
+			"number" : useStrictEquality,
+			"null" : useStrictEquality,
+			"undefined" : useStrictEquality,
+
+			"nan" : function(b) {
+				return isNaN(b);
+			},
+
+			"date" : function(b, a) {
+				return QUnit.objectType(b) === "date"
+						&& a.valueOf() === b.valueOf();
+			},
+
+			"regexp" : function(b, a) {
+				return QUnit.objectType(b) === "regexp"
+						&& a.source === b.source && // the regex itself
+						a.global === b.global && // and its modifers
+													// (gmi) ...
+						a.ignoreCase === b.ignoreCase
+						&& a.multiline === b.multiline;
+			},
+
+			// - skip when the property is a method of an instance (OOP)
+			// - abort otherwise,
+			// initial === would have catch identical references anyway
+			"function" : function() {
+				var caller = callers[callers.length - 1];
+				return caller !== Object && typeof caller !== "undefined";
+			},
+
+			"array" : function(b, a) {
+				var i, j, loop;
+				var len;
+
+				// b could be an object literal here
+				if (!(QUnit.objectType(b) === "array")) {
+					return false;
+				}
+
+				len = a.length;
+				if (len !== b.length) { // safe and faster
+					return false;
+				}
+
+				// track reference to avoid circular references
+				parents.push(a);
+				for (i = 0; i < len; i++) {
+					loop = false;
+					for (j = 0; j < parents.length; j++) {
+						if (parents[j] === a[i]) {
+							loop = true;// dont rewalk array
+						}
+					}
+					if (!loop && !innerEquiv(a[i], b[i])) {
+						parents.pop();
+						return false;
+					}
+				}
+				parents.pop();
+				return true;
+			},
+
+			"object" : function(b, a) {
+				var i, j, loop;
+				var eq = true; // unless we can proove it
+				var aProperties = [], bProperties = []; // collection of
+														// strings
+
+				// comparing constructors is more strict than using
+				// instanceof
+				if (a.constructor !== b.constructor) {
+					return false;
+				}
+
+				// stack constructor before traversing properties
+				callers.push(a.constructor);
+				// track reference to avoid circular references
+				parents.push(a);
+
+				for (i in a) { // be strict: don't ensures hasOwnProperty
+								// and go deep
+					loop = false;
+					for (j = 0; j < parents.length; j++) {
+						if (parents[j] === a[i])
+							loop = true; // don't go down the same path
+											// twice
+					}
+					aProperties.push(i); // collect a's properties
+
+					if (!loop && !innerEquiv(a[i], b[i])) {
+						eq = false;
+						break;
+					}
+				}
+
+				callers.pop(); // unstack, we are done
+				parents.pop();
+
+				for (i in b) {
+					bProperties.push(i); // collect b's properties
+				}
+
+				// Ensures identical properties name
+				return eq
+						&& innerEquiv(aProperties.sort(), bProperties
+								.sort());
+			}
+		};
+	}();
+
+	innerEquiv = function() { // can take multiple arguments
+		var args = Array.prototype.slice.apply(arguments);
+		if (args.length < 2) {
+			return true; // end transition
+		}
+
+		return (function(a, b) {
+			if (a === b) {
+				return true; // catch the most you can
+			} else if (a === null || b === null || typeof a === "undefined"
+					|| typeof b === "undefined"
+					|| QUnit.objectType(a) !== QUnit.objectType(b)) {
+				return false; // don't lose time with error prone cases
+			} else {
+				return bindCallbacks(a, callbacks, [ b, a ]);
+			}
+
+			// apply transition with (1..n) arguments
+		})(args[0], args[1])
+				&& arguments.callee.apply(this, args.splice(1,
+						args.length - 1));
+	};
+
+	return innerEquiv;
+
+}();
+
+/**
+ * jsDump Copyright (c) 2008 Ariel Flesler - aflesler(at)gmail(dot)com |
+ * http://flesler.blogspot.com Licensed under BSD
+ * (http://www.opensource.org/licenses/bsd-license.php) Date: 5/15/2008
+ *
+ * @projectDescription Advanced and extensible data dumping for Javascript.
+ * @version 1.0.0
+ * @author Ariel Flesler
+ * @link {http://flesler.blogspot.com/2008/05/jsdump-pretty-dump-of-any-javascript.html}
+ */
+QUnit.jsDump = (function() {
+	function quote( str ) {
+		return '"' + str.toString().replace(/"/g, '\\"') + '"';
+	};
+	function literal( o ) {
+		return o + '';
+	};
+	function join( pre, arr, post ) {
+		var s = jsDump.separator(),
+			base = jsDump.indent(),
+			inner = jsDump.indent(1);
+		if ( arr.join )
+			arr = arr.join( ',' + s + inner );
+		if ( !arr )
+			return pre + post;
+		return [ pre, inner + arr, base + post ].join(s);
+	};
+	function array( arr, stack ) {
+		var i = arr.length, ret = Array(i);
+		this.up();
+		while ( i-- )
+			ret[i] = this.parse( arr[i] , undefined , stack);
+		this.down();
+		return join( '[', ret, ']' );
+	};
+
+	var reName = /^function (\w+)/;
+
+	var jsDump = {
+		parse:function( obj, type, stack ) { //type is used mostly internally, you can fix a (custom)type in advance
+			stack = stack || [ ];
+			var parser = this.parsers[ type || this.typeOf(obj) ];
+			type = typeof parser;
+			var inStack = inArray(obj, stack);
+			if (inStack != -1) {
+				return 'recursion('+(inStack - stack.length)+')';
+			}
+			//else
+			if (type == 'function')  {
+					stack.push(obj);
+					var res = parser.call( this, obj, stack );
+					stack.pop();
+					return res;
+			}
+			// else
+			return (type == 'string') ? parser : this.parsers.error;
+		},
+		typeOf:function( obj ) {
+			var type;
+			if ( obj === null ) {
+				type = "null";
+			} else if (typeof obj === "undefined") {
+				type = "undefined";
+			} else if (QUnit.is("RegExp", obj)) {
+				type = "regexp";
+			} else if (QUnit.is("Date", obj)) {
+				type = "date";
+			} else if (QUnit.is("Function", obj)) {
+				type = "function";
+			} else if (typeof obj.setInterval !== undefined && typeof obj.document !== "undefined" && typeof obj.nodeType === "undefined") {
+				type = "window";
+			} else if (obj.nodeType === 9) {
+				type = "document";
+			} else if (obj.nodeType) {
+				type = "node";
+			} else if (typeof obj === "object" && typeof obj.length === "number" && obj.length >= 0) {
+				type = "array";
+			} else {
+				type = typeof obj;
+			}
+			return type;
+		},
+		separator:function() {
+			return this.multiline ?	this.HTML ? '<br />' : '\n' : this.HTML ? '&nbsp;' : ' ';
+		},
+		indent:function( extra ) {// extra can be a number, shortcut for increasing-calling-decreasing
+			if ( !this.multiline )
+				return '';
+			var chr = this.indentChar;
+			if ( this.HTML )
+				chr = chr.replace(/\t/g,'   ').replace(/ /g,'&nbsp;');
+			return Array( this._depth_ + (extra||0) ).join(chr);
+		},
+		up:function( a ) {
+			this._depth_ += a || 1;
+		},
+		down:function( a ) {
+			this._depth_ -= a || 1;
+		},
+		setParser:function( name, parser ) {
+			this.parsers[name] = parser;
+		},
+		// The next 3 are exposed so you can use them
+		quote:quote,
+		literal:literal,
+		join:join,
+		//
+		_depth_: 1,
+		// This is the list of parsers, to modify them, use jsDump.setParser
+		parsers:{
+			window: '[Window]',
+			document: '[Document]',
+			error:'[ERROR]', //when no parser is found, shouldn't happen
+			unknown: '[Unknown]',
+			'null':'null',
+			'undefined':'undefined',
+			'function':function( fn ) {
+				var ret = 'function',
+					name = 'name' in fn ? fn.name : (reName.exec(fn)||[])[1];//functions never have name in IE
+				if ( name )
+					ret += ' ' + name;
+				ret += '(';
+
+				ret = [ ret, QUnit.jsDump.parse( fn, 'functionArgs' ), '){'].join('');
+				return join( ret, QUnit.jsDump.parse(fn,'functionCode'), '}' );
+			},
+			array: array,
+			nodelist: array,
+			arguments: array,
+			object:function( map, stack ) {
+				var ret = [ ];
+				QUnit.jsDump.up();
+				for ( var key in map ) {
+				    var val = map[key];
+					ret.push( QUnit.jsDump.parse(key,'key') + ': ' + QUnit.jsDump.parse(val, undefined, stack));
+                }
+				QUnit.jsDump.down();
+				return join( '{', ret, '}' );
+			},
+			node:function( node ) {
+				var open = QUnit.jsDump.HTML ? '&lt;' : '<',
+					close = QUnit.jsDump.HTML ? '&gt;' : '>';
+
+				var tag = node.nodeName.toLowerCase(),
+					ret = open + tag;
+
+				for ( var a in QUnit.jsDump.DOMAttrs ) {
+					var val = node[QUnit.jsDump.DOMAttrs[a]];
+					if ( val )
+						ret += ' ' + a + '=' + QUnit.jsDump.parse( val, 'attribute' );
+				}
+				return ret + close + open + '/' + tag + close;
+			},
+			functionArgs:function( fn ) {//function calls it internally, it's the arguments part of the function
+				var l = fn.length;
+				if ( !l ) return '';
+
+				var args = Array(l);
+				while ( l-- )
+					args[l] = String.fromCharCode(97+l);//97 is 'a'
+				return ' ' + args.join(', ') + ' ';
+			},
+			key:quote, //object calls it internally, the key part of an item in a map
+			functionCode:'[code]', //function calls it internally, it's the content of the function
+			attribute:quote, //node calls it internally, it's an html attribute value
+			string:quote,
+			date:quote,
+			regexp:literal, //regex
+			number:literal,
+			'boolean':literal
+		},
+		DOMAttrs:{//attributes to dump from nodes, name=>realName
+			id:'id',
+			name:'name',
+			'class':'className'
+		},
+		HTML:false,//if true, entities are escaped ( <, >, \t, space and \n )
+		indentChar:'  ',//indentation unit
+		multiline:true //if true, items in a collection, are separated by a \n, else just a space.
+	};
+
+	return jsDump;
+})();
+
+// from Sizzle.js
+function getText( elems ) {
+	var ret = "", elem;
+
+	for ( var i = 0; elems[i]; i++ ) {
+		elem = elems[i];
+
+		// Get the text from text nodes and CDATA nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 4 ) {
+			ret += elem.nodeValue;
+
+		// Traverse everything else, except comment nodes
+		} else if ( elem.nodeType !== 8 ) {
+			ret += getText( elem.childNodes );
+		}
+	}
+
+	return ret;
+};
+
+//from jquery.js
+function inArray( elem, array ) {
+	if ( array.indexOf ) {
+		return array.indexOf( elem );
+	}
+
+	for ( var i = 0, length = array.length; i < length; i++ ) {
+		if ( array[ i ] === elem ) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+/*
+ * Javascript Diff Algorithm
+ *  By John Resig (http://ejohn.org/)
+ *  Modified by Chu Alan "sprite"
+ *
+ * Released under the MIT license.
+ *
+ * More Info:
+ *  http://ejohn.org/projects/javascript-diff-algorithm/
+ *
+ * Usage: QUnit.diff(expected, actual)
+ *
+ * QUnit.diff("the quick brown fox jumped over", "the quick fox jumps over") == "the  quick <del>brown </del> fox <del>jumped </del><ins>jumps </ins> over"
+ */
+QUnit.diff = (function() {
+	function diff(o, n) {
+		var ns = {};
+		var os = {};
+
+		for (var i = 0; i < n.length; i++) {
+			if (ns[n[i]] == null)
+				ns[n[i]] = {
+					rows: [],
+					o: null
+				};
+			ns[n[i]].rows.push(i);
+		}
+
+		for (var i = 0; i < o.length; i++) {
+			if (os[o[i]] == null)
+				os[o[i]] = {
+					rows: [],
+					n: null
+				};
+			os[o[i]].rows.push(i);
+		}
+
+		for (var i in ns) {
+			if (ns[i].rows.length == 1 && typeof(os[i]) != "undefined" && os[i].rows.length == 1) {
+				n[ns[i].rows[0]] = {
+					text: n[ns[i].rows[0]],
+					row: os[i].rows[0]
+				};
+				o[os[i].rows[0]] = {
+					text: o[os[i].rows[0]],
+					row: ns[i].rows[0]
+				};
+			}
+		}
+
+		for (var i = 0; i < n.length - 1; i++) {
+			if (n[i].text != null && n[i + 1].text == null && n[i].row + 1 < o.length && o[n[i].row + 1].text == null &&
+			n[i + 1] == o[n[i].row + 1]) {
+				n[i + 1] = {
+					text: n[i + 1],
+					row: n[i].row + 1
+				};
+				o[n[i].row + 1] = {
+					text: o[n[i].row + 1],
+					row: i + 1
+				};
+			}
+		}
+
+		for (var i = n.length - 1; i > 0; i--) {
+			if (n[i].text != null && n[i - 1].text == null && n[i].row > 0 && o[n[i].row - 1].text == null &&
+			n[i - 1] == o[n[i].row - 1]) {
+				n[i - 1] = {
+					text: n[i - 1],
+					row: n[i].row - 1
+				};
+				o[n[i].row - 1] = {
+					text: o[n[i].row - 1],
+					row: i - 1
+				};
+			}
+		}
+
+		return {
+			o: o,
+			n: n
+		};
+	}
+
+	return function(o, n) {
+		o = o.replace(/\s+$/, '');
+		n = n.replace(/\s+$/, '');
+		var out = diff(o == "" ? [] : o.split(/\s+/), n == "" ? [] : n.split(/\s+/));
+
+		var str = "";
+
+		var oSpace = o.match(/\s+/g);
+		if (oSpace == null) {
+			oSpace = [" "];
+		}
+		else {
+			oSpace.push(" ");
+		}
+		var nSpace = n.match(/\s+/g);
+		if (nSpace == null) {
+			nSpace = [" "];
+		}
+		else {
+			nSpace.push(" ");
+		}
+
+		if (out.n.length == 0) {
+			for (var i = 0; i < out.o.length; i++) {
+				str += '<del>' + out.o[i] + oSpace[i] + "</del>";
+			}
+		}
+		else {
+			if (out.n[0].text == null) {
+				for (n = 0; n < out.o.length && out.o[n].text == null; n++) {
+					str += '<del>' + out.o[n] + oSpace[n] + "</del>";
+				}
+			}
+
+			for (var i = 0; i < out.n.length; i++) {
+				if (out.n[i].text == null) {
+					str += '<ins>' + out.n[i] + nSpace[i] + "</ins>";
+				}
+				else {
+					var pre = "";
+
+					for (n = out.n[i].row + 1; n < out.o.length && out.o[n].text == null; n++) {
+						pre += '<del>' + out.o[n] + oSpace[n] + "</del>";
+					}
+					str += " " + out.n[i].text + nSpace[i] + pre;
+				}
+			}
+		}
+
+		return str;
+	};
+})();
+
+})(this);
diff --git a/tests/common/js/xml_js_filter.test.js b/tests/common/js/xml_js_filter.test.js
new file mode 100644
index 000000000..3b38671ab
--- /dev/null
+++ b/tests/common/js/xml_js_filter.test.js
@@ -0,0 +1,52 @@
+jQuery(function($){
+	module('Validator');
+
+	var
+		v     = xe.getApp('validator')[0],
+		$form = $('#validator-test'),
+		form  = $form[0], elems = form.elements;
+
+	var Mute = xe.createPlugin('Mute', {
+		API_BEFORE_ALERT : function(){ return false }
+	});
+	v.registerPlugin(new Mute());
+
+	test('Basics', function(){
+		ok(v.run(form), 'Default return value is true');
+	});
+
+	test('attr : required?', function(){
+		form.reset();
+		form.ruleset.value = 'ruleset';
+
+		v.cast('ADD_FILTER', ['ruleset', {'user_1':{required:true}}]);
+		ok(!v.run(form), 'The required field should have some value. - test1');
+
+		elems.user_1.value = 'myname';
+		ok(v.run(form), 'The required field should have some value. - test2');
+	});
+
+	test('attr : name pattern', function(){
+		form.reset();
+		form.ruleset.value = 'ruleset';
+
+		v.cast(
+			'ADD_FILTER',
+			['ruleset',
+				{
+					'^user_':{required:true}
+				}
+			]
+		);
+
+		elems.user_1.value = 'value1';
+		ok(!v.run(form), 'This test should be failed. (only one of three fields has value)');
+
+		elems.user_2.value = 'value2';
+		ok(!v.run(form), 'not yet (2 of 3)');
+
+		elems.user_3.value = 'value3';
+		ok(v.run(form), 'ok! you should pass at this time. (3 of 3)');
+	});
+
+});
diff --git a/tests/index.php b/tests/index.php
deleted file mode 100644
index f2aff25f1..000000000
--- a/tests/index.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-    define('__ZBXE__', true);
-    require_once('../config/config.inc.php');
-
-    if(__ENABLE_PHPUNIT_TEST__!=1) exit();
-
-    require_once('simpletest/autorun.php');
-
-    class AllTests extends TestSuite {
-        function AllTests() {
-            $oContext = &Context::getInstance();
-            $oContext->init();
-
-            $this->TestSuite('Classes Test');
-            $this->addFile(dirname(__FILE__).'/classes/context/Context.test.php');
-
-            $this->TestSuite('Module Test');
-            $this->addFile(dirname(__FILE__).'/modules/module/module.test.php');
-            $this->addFile(dirname(__FILE__).'/modules/module/opage.test.php');
-        }
-    }
-
-?>
diff --git a/tests/modules/module/module.test.php b/tests/modules/module/module.test.php
deleted file mode 100644
index b72a6036c..000000000
--- a/tests/modules/module/module.test.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-    class LockTest extends UnitTestCase {
-        function testLock() {
-            $oController = &getController('module');
-            $this->assertNotNull($oController);
-            $output = $oController->lock('lockTest', 60);
-            $this->assertTrue($output->toBool());
-            $deadline = $output->get('deadline'); 
-            $output2 = $oController->lock('lockTest', 60);
-            $this->assertFalse($output2->toBool());
-            $output2 = $oController->unlock('lockTest', $deadline);
-            $this->assertTrue($output2->toBool());
-            $output2 = $oController->lock('lockTest', 60);
-            $this->assertTrue($output2->toBool());
-            $output2 = $oController->unlock('lockTest', $output2->get('deadline'));
-            $this->assertTrue($output2->toBool());
-        }
-    }
-?>
diff --git a/tests/modules/module/opage.test.php b/tests/modules/module/opage.test.php
deleted file mode 100644
index eb9282ff3..000000000
--- a/tests/modules/module/opage.test.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-    class opageTest extends UnitTestCase {
-        function testReplaceSrc() {
-            $oController = &getController('opage');
-            $this->assertNotNull($oController);
-
-            $path = 'http://domain.com/test_path/opage.php';
-
-            $content = 'src="images/foo.jpg"';
-            $expected_result = 'src="http://domain.com/test_path/images/foo.jpg"';
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            $content = 'src="/images/foo.jpg"';
-            $expected_result = 'src="http://domain.com/images/foo.jpg"';
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            $content = 'src="./images/foo.jpg"';
-            $expected_result = 'src="http://domain.com/test_path/images/foo.jpg"';
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            $content = 'src="../images/foo.jpg"';
-            $expected_result = 'src="http://domain.com/test_path/../images/foo.jpg"';
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            $content = 'url("./images/foo.jpg")';
-            $expected_result = 'url("http://domain.com/test_path/images/foo.jpg")';
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            /*
-             * 프로토콜
-             * http, https, ftp, telnet, mailto, mms
-             */
-            $content = 'href="https://domail.com/"';
-            $expected_result = $content;
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            $content = 'href="mailto:foo@domain.com"';
-            $expected_result = $content;
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            $content = 'href="mms://domain.com/bar.wmv"';
-            $expected_result = $content;
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-            // + 포트번호
-            $path = 'http://domain.com:123/test_path/opage.php';
-
-            $content = 'src="./images/foo.jpg"';
-            $expected_result = 'src="http://domain.com:123/test_path/images/foo.jpg"';
-            $result = $oController->replaceSrc($content, $path);
-            $this->assertEqual($expected_result, $result);
-
-        }
-    }
-?>
\ No newline at end of file
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
new file mode 100644
index 000000000..78ba16f54
--- /dev/null
+++ b/tests/phpunit.xml
@@ -0,0 +1,13 @@
+<phpunit bootstrap="./Bootstrap.php">
+	<testsuites>
+		<testsuite name="XE Core Test Suite">
+			<directory>.</directory>
+			<exclude>./classes/context/Context.mock.php</exclude>
+			<exclude>./classes/db/</exclude>
+		</testsuite>
+	</testsuites>
+	<logging>
+		<log type="junit" target="./logs/junit.xml" />
+		<log type="coverage-clover" target="./logs/clover.xml"/>
+	</logging>
+</phpunit>
diff --git a/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE b/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
deleted file mode 100644
index 8ac9cf2aa..000000000
--- a/tests/simpletest/HELP_MY_TESTS_DONT_WORK_ANYMORE
+++ /dev/null
@@ -1,348 +0,0 @@
-Simple Test interface changes
-=============================
-Because the SimpleTest tool set is still evolving it is likely that tests
-written with earlier versions will fail with the newest ones. The most
-dramatic changes are in the alpha releases. Here is a list of possible
-problems and their fixes...
-
-No method getRelativeUrls() or getAbsoluteUrls()
-------------------------------------------------
-These methods were always a bit weird anyway, and
-the new parsing of the base tag makes them more so.
-They have been replaced with getUrls() instead. If
-you want the old functionality then simply chop
-off the current domain from getUrl().
-
-Method setWildcard() removed in mocks
--------------------------------------
-Even setWildcard() has been removed in 1.0.1beta now.
-If you want to test explicitely for a '*' string, then
-simply pass in new IdenticalExpectation('*') instead.
-
-No method _getTest() on mocks
------------------------------
-This has finally been removed. It was a pretty esoteric
-flex point anyway. It was there to allow the mocks to
-work with other test tools, but no one does this.
-
-No method assertError(), assertNoErrors(), swallowErrors()
-----------------------------------------------------------
-These have been deprecated in 1.0.1beta in favour of
-expectError() and expectException(). assertNoErrors() is
-redundant if you use expectError() as failures are now reported
-immediately.
-
-No method TestCase::signal()
-----------------------------
-This has been deprecated in favour of triggering an error or
-throwing an exception. Deprecated as of 1.0.1beta.
-
-No method TestCase::sendMessage()
----------------------------------
-This has been deprecated as of 1.0.1beta.
-
-Failure to connect now emits failures
--------------------------------------
-It used to be that you would have to use the
-getTransferError() call on the web tester to see if
-there was a socket level error in a fetch. This check
-is now always carried out by the WebTestCase unless
-the fetch is prefaced with WebTestCase::ignoreErrors().
-The ignore directive only lasts for test case fetching
-action such as get() and click().
-
-No method SimpleTestOptions::ignore()
--------------------------------------
-This is deprecated in version 1.0.1beta and has been moved
-to SimpleTest::ignore() as that is more readable. In
-addition, parent classes are also ignored automatically.
-If you are using PHP5 you can skip this directive simply
-by marking your test case as abstract.
-
-No method assertCopy()
-----------------------
-This is deprecated in 1.0.1 in favour of assertClone().
-The assertClone() method is slightly different in that
-the objects must be identical, but without being a
-reference. It is thus not a strict inversion of
-assertReference().
-
-Constructor wildcard override has no effect in mocks
-----------------------------------------------------
-As of 1.0.1beta this is now set with setWildcard() instead
-of in the constructor.
-
-No methods setStubBaseClass()/getStubBaseClass()
-------------------------------------------------
-As mocks are now used instead of stubs, these methods
-stopped working and are now removed as of the 1.0.1beta
-release. The mock objects may be freely used instead.
-
-No method addPartialMockCode()
-------------------------------
-The ability to insert arbitrary partial mock code
-has been removed. This was a low value feature
-causing needless complications. It was removed
-in the 1.0.1beta release.
-
-No method setMockBaseClass()
-----------------------------
-The ability to change the mock base class has been
-scheduled for removal and is deprecated since the
-1.0.1beta version. This was a rarely used feature
-except as a workaround for PHP5 limitations. As
-these limitations are being resolved it's hoped
-that the bundled mocks can be used directly.
-
-No class Stub
--------------
-Server stubs are deprecated from 1.0.1 as the mocks now
-have exactly the same interface. Just use mock objects
-instead.
-
-No class SimpleTestOptions
---------------------------
-This was replced by the shorter SimpleTest in 1.0.1beta1
-and is since deprecated.
-
-No file simple_test.php
------------------------
-This was renamed test_case.php in 1.0.1beta to more accurately
-reflect it's purpose. This file should never be directly
-included in test suites though, as it's part of the
-underlying mechanics and has a tendency to be refactored.
-
-No class WantedPatternExpectation
----------------------------------
-This was deprecated in 1.0.1alpha in favour of the simpler
-name PatternExpectation.
-
-No class NoUnwantedPatternExpectation
--------------------------------------
-This was deprecated in 1.0.1alpha in favour of the simpler
-name NoPatternExpectation.
-
-No method assertNoUnwantedPattern()
------------------------------------
-This has been renamed to assertNoPattern() in 1.0.1alpha and
-the old form is deprecated.
-
-No method assertWantedPattern()
--------------------------------
-This has been renamed to assertPattern() in 1.0.1alpha and
-the old form is deprecated.
-
-No method assertExpectation()
------------------------------
-This was renamed as assert() in 1.0.1alpha and the old form
-has been deprecated.
-
-No class WildcardExpectation
-----------------------------
-This was a mostly internal class for the mock objects. It was
-renamed AnythingExpectation to bring it closer to JMock and
-NMock in version 1.0.1alpha.
-
-Missing UnitTestCase::assertErrorPattern()
-------------------------------------------
-This method is deprecated for version 1.0.1 onwards.
-This method has been subsumed by assertError() that can now
-take an expectation. Simply pass a PatternExpectation
-into assertError() to simulate the old behaviour.
-
-No HTML when matching page elements
------------------------------------
-This behaviour has been switched to using plain text as if it
-were seen by the user of the browser. This means that HTML tags
-are suppressed, entities are converted and whitespace is
-normalised. This should make it easier to match items in forms.
-Also images are replaced with their "alt" text so that they
-can be matched as well.
-
-No method SimpleRunner::_getTestCase()
---------------------------------------
-This was made public as getTestCase() in 1.0RC2.
-
-No method restartSession()
---------------------------
-This was renamed to restart() in the WebTestCase, SimpleBrowser
-and the underlying SimpleUserAgent in 1.0RC2. Because it was
-undocumented anyway, no attempt was made at backward
-compatibility.
-
-My custom test case ignored by tally()
---------------------------------------
-The _assertTrue method has had it's signature changed due to a bug
-in the PHP 5.0.1 release. You must now use getTest() from within
-that method to get the test case. Mock compatibility with other
-unit testers is now deprecated as of 1.0.1alpha as PEAR::PHPUnit2
-should soon have mock support of it's own.
-
-Broken code extending SimpleRunner
-----------------------------------
-This was replaced with SimpleScorer so that I could use the runner
-name in another class. This happened in RC1 development and there
-is no easy backward compatibility fix. The solution is simply to
-extend SimpleScorer instead.
-
-Missing method getBaseCookieValue()
------------------------------------
-This was renamed getCurrentCookieValue() in RC1.
-
-Missing files from the SimpleTest suite
----------------------------------------
-Versions of SimpleTest prior to Beta6 required a SIMPLE_TEST constant
-to point at the SimpleTest folder location before any of the toolset
-was loaded. This is no longer documented as it is now unnecessary
-for later versions. If you are using an earlier version you may
-need this constant. Consult the documentation that was bundled with
-the release that you are using or upgrade to Beta6 or later.
-
-No method SimpleBrowser::getCurrentUrl()
---------------------------------------
-This is replaced with the more versatile showRequest() for
-debugging. It only existed in this context for version Beta5.
-Later versions will have SimpleBrowser::getHistory() for tracking
-paths through pages. It is renamed as getUrl() since 1.0RC1.
-
-No method Stub::setStubBaseClass()
-----------------------------------
-This method has finally been removed in 1.0RC1. Use
-SimpleTestOptions::setStubBaseClass() instead.
-
-No class CommandLineReporter
-----------------------------
-This was renamed to TextReporter in Beta3 and the deprecated version
-was removed in 1.0RC1.
-
-No method requireReturn()
--------------------------
-This was deprecated in Beta3 and is now removed.
-
-No method expectCookie()
-------------------------
-This method was abruptly removed in Beta4 so as to simplify the internals
-until another mechanism can replace it. As a workaround it is necessary
-to assert that the cookie has changed by setting it before the page
-fetch and then assert the desired value.
-
-No method clickSubmitByFormId()
--------------------------------
-This method had an incorrect name as no button was involved. It was
-renamed to submitByFormId() in Beta4 and the old version deprecated.
-Now removed.
-
-No method paintStart() or paintEnd()
-------------------------------------
-You should only get this error if you have subclassed the lower level
-reporting and test runner machinery. These methods have been broken
-down into events for test methods, events for test cases and events
-for group tests. The new methods are...
-
-paintStart() --> paintMethodStart(), paintCaseStart(), paintGroupStart()
-paintEnd() --> paintMethodEnd(), paintCaseEnd(), paintGroupEnd()
-
-This change was made in Beta3, ironically to make it easier to subclass
-the inner machinery. Simply duplicating the code you had in the previous
-methods should provide a temporary fix.
-
-No class TestDisplay
---------------------
-This has been folded into SimpleReporter in Beta3 and is now deprecated.
-It was removed in RC1.
-
-No method WebTestCase::fetch()
-------------------------------
-This was renamed get() in Alpha8. It is removed in Beta3.
-
-No method submit()
-------------------
-This has been renamed clickSubmit() in Beta1. The old method was
-removed in Beta2.
-
-No method clearHistory()
-------------------------
-This method is deprecated in Beta2 and removed in RC1.
-
-No method getCallCount()
-------------------------
-This method has been deprecated since Beta1 and has now been
-removed. There are now more ways to set expectations on counts
-and so this method should be unecessery. Removed in RC1.
-
-Cannot find file *
-------------------
-The following public name changes have occoured...
-
-simple_html_test.php --> reporter.php
-simple_mock.php --> mock_objects.php
-simple_unit.php --> unit_tester.php
-simple_web.php --> web_tester.php
-
-The old names were deprecated in Alpha8 and removed in Beta1.
-
-No method attachObserver()
---------------------------
-Prior to the Alpha8 release the old internal observer pattern was
-gutted and replaced with a visitor. This is to trade flexibility of
-test case expansion against the ease of writing user interfaces.
-
-Code such as...
-
-$test = &new MyTestCase();
-$test->attachObserver(new TestHtmlDisplay());
-$test->run();
-
-...should be rewritten as...
-
-$test = &new MyTestCase();
-$test->run(new HtmlReporter());
-
-If you previously attached multiple observers then the workaround
-is to run the tests twice, once with each, until they can be combined.
-For one observer the old method is simulated in Alpha 8, but is
-removed in Beta1.
-
-No class TestHtmlDisplay
-------------------------
-This class has been renamed to HtmlReporter in Alpha8. It is supported,
-but deprecated in Beta1 and removed in Beta2. If you have subclassed
-the display for your own design, then you will have to extend this
-class (HtmlReporter) instead.
-
-If you have accessed the event queue by overriding the notify() method
-then I am afraid you are in big trouble :(. The reporter is now
-carried around the test suite by the runner classes and the methods
-called directly. In the unlikely event that this is a problem and
-you don't want to upgrade the test tool then simplest is to write your
-own runner class and invoke the tests with...
-
-$test->accept(new MyRunner(new MyReporter()));
-
-...rather than the run method. This should be easier to extend
-anyway and gives much more control. Even this method is overhauled
-in Beta3 where the runner class can be set within the test case. Really
-the best thing to do is to upgrade to this version as whatever you were
-trying to achieve before should now be very much easier.
-
-Missing set options method
---------------------------
-All test suite options are now in one class called SimpleTestOptions.
-This means that options are set differently...
-
-GroupTest::ignore() --> SimpleTestOptions::ignore()
-Mock::setMockBaseClass() --> SimpleTestOptions::setMockBaseClass()
-
-These changed in Alpha8 and the old versions are now removed in RC1.
-
-No method setExpected*()
-------------------------
-The mock expectations changed their names in Alpha4 and the old names
-ceased to be supported in Alpha8. The changes are...
-
-setExpectedArguments() --> expectArguments()
-setExpectedArgumentsSequence() --> expectArgumentsAt()
-setExpectedCallCount() --> expectCallCount()
-setMaximumCallCount() --> expectMaximumCallCount()
-
-The parameters remained the same.
diff --git a/tests/simpletest/LICENSE b/tests/simpletest/LICENSE
deleted file mode 100644
index 09f465ab7..000000000
--- a/tests/simpletest/LICENSE
+++ /dev/null
@@ -1,502 +0,0 @@
-		  GNU LESSER GENERAL PUBLIC LICENSE
-		       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-		  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-  
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-			    NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-           How to Apply These Terms to Your New Libraries
-
-  If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change.  You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of the
-ordinary General Public License).
-
-  To apply these terms, attach the following notices to the library.  It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the library's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 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
-    Lesser 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
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the
-  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
-
-  <signature of Ty Coon>, 1 April 1990
-  Ty Coon, President of Vice
-
-That's all there is to it!
diff --git a/tests/simpletest/README b/tests/simpletest/README
deleted file mode 100644
index c52e3f7ed..000000000
--- a/tests/simpletest/README
+++ /dev/null
@@ -1,108 +0,0 @@
-SimpleTest
-==========
-You probably got this package from...
-http://simpletest.sourceforge.net/projects/simpletest/
-
-If there is no licence agreement with this package please download
-a version from the location above. You must read and accept that
-licence to use this software. The file is titled simply LICENSE.
-
-What is it? It's a framework for unit testing, web site testing and
-mock objects for PHP 4.2.0+ (and PHP 5.0 to 5.3 without E_STRICT).
-
-If you have used JUnit, you will find this PHP unit testing version very
-similar. Also included is a mock objects and server stubs generator.
-The stubs can have return values set for different arguments, can have
-sequences set also by arguments and can return items by reference.
-The mocks inherit all of this functionality and can also have
-expectations set, again in sequences and for different arguments.
-
-A web tester similar in concept to JWebUnit is also included. There is no
-JavaScript or tables support, but forms, authentication, cookies and
-frames are handled.
-
-You can see a release schedule at http://www.lastcraft.com/overview.php
-which is also copied to the documentation folder with this release.
-A full PHPDocumenter API documentation exists at
-http://simpletest.sourceforge.net/.
-
-The user interface is minimal
-in the extreme, but a lot of information flows from the test suite.
-After version 1.0 we will release a better web UI, but we are leaving XUL
-and GTk versions to volunteers as everybody has their own opinion
-on a good GUI, and we don't want to discourage development by shipping
-one with the toolkit. YOucan download an Eclipse plug-in separately.
-
-You are looking at a second full release. The unit tests for SimpleTest
-itself can be run here...
-
-simpletest/test/unit_tests.php
-
-And tests involving live network connections as well are here...
-
-simpletest/test/all_tests.php
-
-The full tests will typically overrun the 8Mb limit often allowed
-to a PHP process. A workaround is to run the tests on the command
-with a custom php.ini file if you do not have access to your server
-version.
-
-You will have to edit the all_tests.php file if you are accesssing
-the internet through a proxy server. See the comments in all_tests.php
-for instructions.
-
-The full tests read some test data from the LastCraft site. If the site
-is down or has been modified for a later version then you will get
-spurious errors. A unit_tests.php failure on the other hand would be
-very serious. As far as we know we haven't yet managed to check in any
-unit test failures, so please correct us if you find one.
-
-Even if all of the tests run please verify that your existing test suites
-also function as expected. If they don't see the file...
-
-HELP_MY_TESTS_DONT_WORK_ANYMORE
-
-This contains information on interface changes. It also points out
-deprecated interfaces, so you should read this even if all of
-your current tests appear to run.
-
-There is a documentation folder which contains the core reference information
-in English and French, although this information is fairly basic.
-You can find a tutorial on...
-
-http://www.lastcraft.com/first_test_tutorial.php
-
-...to get you started and this material will eventually become included
-with the project documentation. A French translation exists at...
-
-http://www.onpk.net/index.php/2005/01/12/254-tutoriel-simpletest-decouvrir-les-tests-unitaires.
-
-If you download and use, and possibly even extend this tool, please let us
-know. Any feedback, even bad, is always welcome and we will work to get
-your suggestions into the next release. Ideally please send your
-comments to...
-
-simpletest-support@lists.sourceforge.net
-
-...so that others can read them too. We usually try to respond within 48
-hours.
-
-There is no change log except at Sourceforge. You can visit the
-release notes to see the completed TODO list after each cycle and also the
-status of any bugs, but if the bug is recent then it will be fixed in SVN only.
-The SVN check-ins always have all the tests passing and so SVN snapshots should
-be pretty usable, although the code may not look so good internally.
-
-Oh, yes. It is called "Simple" because it should be simple to
-use. We intend to add a complete set of tools for a test first
-and "test as you code" type of development. "Simple" does not
-mean "Lite" in this context.
-
-Thanks to everyone who has sent comments and offered suggestions. They
-really are invaluable, but sadly you are too many to mention in full.
-Thanks to all on the advanced PHP forum on SitePoint, especially Harry
-Feucks. Early adopters are always an inspiration.
-
-Marcus Baker, Jason Sweat, Travis Swicegood, Perrick Penet and Edward Z. Yang.
--- 
-marcus@lastcraft.com
diff --git a/tests/simpletest/VERSION b/tests/simpletest/VERSION
deleted file mode 100644
index 7f207341d..000000000
--- a/tests/simpletest/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.0.1
\ No newline at end of file
diff --git a/tests/simpletest/authentication.php b/tests/simpletest/authentication.php
deleted file mode 100644
index c56d11bbb..000000000
--- a/tests/simpletest/authentication.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: authentication.php 1720 2008-04-07 02:32:43Z lastcraft $
- */
-/**
- *  include http class
- */
-require_once(dirname(__FILE__) . '/http.php');
-
-/**
- *    Represents a single security realm's identity.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRealm {
-    var $_type;
-    var $_root;
-    var $_username;
-    var $_password;
-    
-    /**
-     *    Starts with the initial entry directory.
-     *    @param string $type      Authentication type for this
-     *                             realm. Only Basic authentication
-     *                             is currently supported.
-     *    @param SimpleUrl $url    Somewhere in realm.
-     *    @access public
-     */
-    function SimpleRealm($type, $url) {
-        $this->_type = $type;
-        $this->_root = $url->getBasePath();
-        $this->_username = false;
-        $this->_password = false;
-    }
-    
-    /**
-     *    Adds another location to the realm.
-     *    @param SimpleUrl $url    Somewhere in realm.
-     *    @access public
-     */
-    function stretch($url) {
-        $this->_root = $this->_getCommonPath($this->_root, $url->getPath());
-    }
-    
-    /**
-     *    Finds the common starting path.
-     *    @param string $first        Path to compare.
-     *    @param string $second       Path to compare.
-     *    @return string              Common directories.
-     *    @access private
-     */
-    function _getCommonPath($first, $second) {
-        $first = explode('/', $first);
-        $second = explode('/', $second);
-        for ($i = 0; $i < min(count($first), count($second)); $i++) {
-            if ($first[$i] != $second[$i]) {
-                return implode('/', array_slice($first, 0, $i)) . '/';
-            }
-        }
-        return implode('/', $first) . '/';
-    }
-    
-    /**
-     *    Sets the identity to try within this realm.
-     *    @param string $username    Username in authentication dialog.
-     *    @param string $username    Password in authentication dialog.
-     *    @access public
-     */
-    function setIdentity($username, $password) {
-        $this->_username = $username;
-        $this->_password = $password;
-    }
-    
-    /**
-     *    Accessor for current identity.
-     *    @return string        Last succesful username.
-     *    @access public
-     */
-    function getUsername() {
-        return $this->_username;
-    }
-    
-    /**
-     *    Accessor for current identity.
-     *    @return string        Last succesful password.
-     *    @access public
-     */
-    function getPassword() {
-        return $this->_password;
-    }
-    
-    /**
-     *    Test to see if the URL is within the directory
-     *    tree of the realm.
-     *    @param SimpleUrl $url    URL to test.
-     *    @return boolean          True if subpath.
-     *    @access public
-     */
-    function isWithin($url) {
-        if ($this->_isIn($this->_root, $url->getBasePath())) {
-            return true;
-        }
-        if ($this->_isIn($this->_root, $url->getBasePath() . $url->getPage() . '/')) {
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     *    Tests to see if one string is a substring of
-     *    another.
-     *    @param string $part        Small bit.
-     *    @param string $whole       Big bit.
-     *    @return boolean            True if the small bit is
-     *                               in the big bit.
-     *    @access private
-     */
-    function _isIn($part, $whole) {
-        return strpos($whole, $part) === 0;
-    }
-}
-
-/**
- *    Manages security realms.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAuthenticator {
-    var $_realms;
-    
-    /**
-     *    Clears the realms.
-     *    @access public
-     */
-    function SimpleAuthenticator() {
-        $this->restartSession();
-    }
-    
-    /**
-     *    Starts with no realms set up.
-     *    @access public
-     */
-    function restartSession() {
-        $this->_realms = array();
-    }
-    
-    /**
-     *    Adds a new realm centered the current URL.
-     *    Browsers vary wildly on their behaviour in this
-     *    regard. Mozilla ignores the realm and presents
-     *    only when challenged, wasting bandwidth. IE
-     *    just carries on presenting until a new challenge
-     *    occours. SimpleTest tries to follow the spirit of
-     *    the original standards committee and treats the
-     *    base URL as the root of a file tree shaped realm.
-     *    @param SimpleUrl $url    Base of realm.
-     *    @param string $type      Authentication type for this
-     *                             realm. Only Basic authentication
-     *                             is currently supported.
-     *    @param string $realm     Name of realm.
-     *    @access public
-     */
-    function addRealm($url, $type, $realm) {
-        $this->_realms[$url->getHost()][$realm] = new SimpleRealm($type, $url);
-    }
-    
-    /**
-     *    Sets the current identity to be presented
-     *    against that realm.
-     *    @param string $host        Server hosting realm.
-     *    @param string $realm       Name of realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @access public
-     */
-    function setIdentityForRealm($host, $realm, $username, $password) {
-        if (isset($this->_realms[$host][$realm])) {
-            $this->_realms[$host][$realm]->setIdentity($username, $password);
-        }
-    }
-    
-    /**
-     *    Finds the name of the realm by comparing URLs.
-     *    @param SimpleUrl $url        URL to test.
-     *    @return SimpleRealm          Name of realm.
-     *    @access private
-     */
-    function _findRealmFromUrl($url) {
-        if (! isset($this->_realms[$url->getHost()])) {
-            return false;
-        }
-        foreach ($this->_realms[$url->getHost()] as $name => $realm) {
-            if ($realm->isWithin($url)) {
-                return $realm;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Presents the appropriate headers for this location.
-     *    @param SimpleHttpRequest $request  Request to modify.
-     *    @param SimpleUrl $url              Base of realm.
-     *    @access public
-     */
-    function addHeaders(&$request, $url) {
-        if ($url->getUsername() && $url->getPassword()) {
-            $username = $url->getUsername();
-            $password = $url->getPassword();
-        } elseif ($realm = $this->_findRealmFromUrl($url)) {
-            $username = $realm->getUsername();
-            $password = $realm->getPassword();
-        } else {
-            return;
-        }
-        $this->addBasicHeaders($request, $username, $password);
-    }
-    
-    /**
-     *    Presents the appropriate headers for this
-     *    location for basic authentication.
-     *    @param SimpleHttpRequest $request  Request to modify.
-     *    @param string $username            Username for realm.
-     *    @param string $password            Password for realm.
-     *    @access public
-     *    @static
-     */
-    function addBasicHeaders(&$request, $username, $password) {
-        if ($username && $password) {
-            $request->addHeaderLine(
-                    'Authorization: Basic ' . base64_encode("$username:$password"));
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/autorun.php b/tests/simpletest/autorun.php
deleted file mode 100644
index 7d97d2d7f..000000000
--- a/tests/simpletest/autorun.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-/**
- *  Autorunner which runs all tests cases found in a file
- *  that includes this module.
- *  @package    SimpleTest
- *  @version    $Id: autorun.php 1721 2008-04-07 19:27:10Z lastcraft $
- */
-require_once dirname(__FILE__) . '/unit_tester.php';
-require_once dirname(__FILE__) . '/mock_objects.php';
-require_once dirname(__FILE__) . '/collector.php';
-require_once dirname(__FILE__) . '/default_reporter.php';
-
-$GLOBALS['SIMPLETEST_AUTORUNNER_INITIAL_CLASSES'] = get_declared_classes();
-register_shutdown_function('simpletest_autorun');
-
-/**
- *    Exit handler to run all recent test cases if no test has
- *    so far been run. Uses the DefaultReporter which can have
- *    it's output controlled with SimpleTest::prefer().
- */
-function simpletest_autorun() {
-    if (tests_have_run()) {
-        return;
-    }
-    $candidates = array_intersect(
-            capture_new_classes(),
-            classes_defined_in_initial_file());
-    $loader = new SimpleFileLoader();
-    $suite = $loader->createSuiteFromClasses(
-            basename(initial_file()),
-            $loader->selectRunnableTests($candidates));
-    $result = $suite->run(new DefaultReporter());
-    if (SimpleReporter::inCli()) {
-        exit($result ? 0 : 1);
-    }
-}
-
-/**
- *    Checks the current test context to see if a test has
- *    ever been run.
- *    @return boolean        True if tests have run.
- */
-function tests_have_run() {
-    if ($context = SimpleTest::getContext()) {
-        return (boolean)$context->getTest();
-    }
-    return false;
-}
-
-/**
- *    The first autorun file.
- *    @return string        Filename of first autorun script.
- */
-function initial_file() {
-    static $file = false;
-    if (! $file) {
-        $file = reset(get_included_files());
-    }
-    return $file;
-}
-
-/**
- *    Just the classes from the first autorun script. May
- *    get a few false positives, as it just does a regex based
- *    on following the word "class".
- *    @return array        List of all possible classes in first
- *                         autorun script.
- */
-function classes_defined_in_initial_file() {
-    if (preg_match_all('/\bclass\s+(\w+)/i', file_get_contents(initial_file()), $matches)) {
-        return array_map('strtolower', $matches[1]);
-    }
-    return array();
-}
-
-/**
- *    Every class since the first autorun include. This
- *    is safe enough if require_once() is alwyas used.
- *    @return array        Class names.
- */
-function capture_new_classes() {
-    global $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES;
-    return array_map('strtolower', array_diff(get_declared_classes(),
-                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES ?
-                            $SIMPLETEST_AUTORUNNER_INITIAL_CLASSES : array()));
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/browser.php b/tests/simpletest/browser.php
deleted file mode 100644
index e2a1fe1d6..000000000
--- a/tests/simpletest/browser.php
+++ /dev/null
@@ -1,1098 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: browser.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/selector.php');
-require_once(dirname(__FILE__) . '/frames.php');
-require_once(dirname(__FILE__) . '/user_agent.php');
-/**#@-*/
-
-if (!defined('DEFAULT_MAX_NESTED_FRAMES')) {
-    define('DEFAULT_MAX_NESTED_FRAMES', 3);
-}
-
-/**
- *    Browser history list.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBrowserHistory {
-    var $_sequence;
-    var $_position;
-
-    /**
-     *    Starts empty.
-     *    @access public
-     */
-    function SimpleBrowserHistory() {
-        $this->_sequence = array();
-        $this->_position = -1;
-    }
-
-    /**
-     *    Test for no entries yet.
-     *    @return boolean        True if empty.
-     *    @access private
-     */
-    function _isEmpty() {
-        return ($this->_position == -1);
-    }
-
-    /**
-     *    Test for being at the beginning.
-     *    @return boolean        True if first.
-     *    @access private
-     */
-    function _atBeginning() {
-        return ($this->_position == 0) && ! $this->_isEmpty();
-    }
-
-    /**
-     *    Test for being at the last entry.
-     *    @return boolean        True if last.
-     *    @access private
-     */
-    function _atEnd() {
-        return ($this->_position + 1 >= count($this->_sequence)) && ! $this->_isEmpty();
-    }
-
-    /**
-     *    Adds a successfully fetched page to the history.
-     *    @param SimpleUrl $url                 URL of fetch.
-     *    @param SimpleEncoding $parameters     Any post data with the fetch.
-     *    @access public
-     */
-    function recordEntry($url, $parameters) {
-        $this->_dropFuture();
-        array_push(
-                $this->_sequence,
-                array('url' => $url, 'parameters' => $parameters));
-        $this->_position++;
-    }
-
-    /**
-     *    Last fully qualified URL for current history
-     *    position.
-     *    @return SimpleUrl        URL for this position.
-     *    @access public
-     */
-    function getUrl() {
-        if ($this->_isEmpty()) {
-            return false;
-        }
-        return $this->_sequence[$this->_position]['url'];
-    }
-
-    /**
-     *    Parameters of last fetch from current history
-     *    position.
-     *    @return SimpleFormEncoding    Post parameters.
-     *    @access public
-     */
-    function getParameters() {
-        if ($this->_isEmpty()) {
-            return false;
-        }
-        return $this->_sequence[$this->_position]['parameters'];
-    }
-
-    /**
-     *    Step back one place in the history. Stops at
-     *    the first page.
-     *    @return boolean     True if any previous entries.
-     *    @access public
-     */
-    function back() {
-        if ($this->_isEmpty() || $this->_atBeginning()) {
-            return false;
-        }
-        $this->_position--;
-        return true;
-    }
-
-    /**
-     *    Step forward one place. If already at the
-     *    latest entry then nothing will happen.
-     *    @return boolean     True if any future entries.
-     *    @access public
-     */
-    function forward() {
-        if ($this->_isEmpty() || $this->_atEnd()) {
-            return false;
-        }
-        $this->_position++;
-        return true;
-    }
-
-    /**
-     *    Ditches all future entries beyond the current
-     *    point.
-     *    @access private
-     */
-    function _dropFuture() {
-        if ($this->_isEmpty()) {
-            return;
-        }
-        while (! $this->_atEnd()) {
-            array_pop($this->_sequence);
-        }
-    }
-}
-
-/**
- *    Simulated web browser. This is an aggregate of
- *    the user agent, the HTML parsing, request history
- *    and the last header set.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBrowser {
-    var $_user_agent;
-    var $_page;
-    var $_history;
-    var $_ignore_frames;
-    var $_maximum_nested_frames;
-
-    /**
-     *    Starts with a fresh browser with no
-     *    cookie or any other state information. The
-     *    exception is that a default proxy will be
-     *    set up if specified in the options.
-     *    @access public
-     */
-    function SimpleBrowser() {
-        $this->_user_agent = &$this->_createUserAgent();
-        $this->_user_agent->useProxy(
-                SimpleTest::getDefaultProxy(),
-                SimpleTest::getDefaultProxyUsername(),
-                SimpleTest::getDefaultProxyPassword());
-        $this->_page = &new SimplePage();
-        $this->_history = &$this->_createHistory();
-        $this->_ignore_frames = false;
-        $this->_maximum_nested_frames = DEFAULT_MAX_NESTED_FRAMES;
-    }
-
-    /**
-     *    Creates the underlying user agent.
-     *    @return SimpleFetcher    Content fetcher.
-     *    @access protected
-     */
-    function &_createUserAgent() {
-        $user_agent = &new SimpleUserAgent();
-        return $user_agent;
-    }
-
-    /**
-     *    Creates a new empty history list.
-     *    @return SimpleBrowserHistory    New list.
-     *    @access protected
-     */
-    function &_createHistory() {
-        $history = &new SimpleBrowserHistory();
-        return $history;
-    }
-
-    /**
-     *    Disables frames support. Frames will not be fetched
-     *    and the frameset page will be used instead.
-     *    @access public
-     */
-    function ignoreFrames() {
-        $this->_ignore_frames = true;
-    }
-
-    /**
-     *    Enables frames support. Frames will be fetched from
-     *    now on.
-     *    @access public
-     */
-    function useFrames() {
-        $this->_ignore_frames = false;
-    }
-    
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->_user_agent->ignoreCookies();
-    }
-    
-    /**
-     *    Switches back on the cookie sending and recieving.
-     *    @access public
-     */
-    function useCookies() {
-        $this->_user_agent->useCookies();
-    }
-
-    /**
-     *    Parses the raw content into a page. Will load further
-     *    frame pages unless frames are disabled.
-     *    @param SimpleHttpResponse $response    Response from fetch.
-     *    @param integer $depth                  Nested frameset depth.
-     *    @return SimplePage                     Parsed HTML.
-     *    @access private
-     */
-    function &_parse($response, $depth = 0) {
-        $page = &$this->_buildPage($response);
-        if ($this->_ignore_frames || ! $page->hasFrames() || ($depth > $this->_maximum_nested_frames)) {
-            return $page;
-        }
-        $frameset = &new SimpleFrameset($page);
-        foreach ($page->getFrameset() as $key => $url) {
-            $frame = &$this->_fetch($url, new SimpleGetEncoding(), $depth + 1);
-            $frameset->addFrame($frame, $key);
-        }
-        return $frameset;
-    }
-    
-    /**
-     *    Assembles the parsing machinery and actually parses
-     *    a single page. Frees all of the builder memory and so
-     *    unjams the PHP memory management.
-     *    @param SimpleHttpResponse $response    Response from fetch.
-     *    @return SimplePage                     Parsed top level page.
-     *    @access protected
-     */
-    function &_buildPage($response) {
-        $builder = &new SimplePageBuilder();
-        $page = &$builder->parse($response);
-        $builder->free();
-        unset($builder);
-        return $page;
-    }
-
-    /**
-     *    Fetches a page. Jointly recursive with the _parse()
-     *    method as it descends a frameset.
-     *    @param string/SimpleUrl $url          Target to fetch.
-     *    @param SimpleEncoding $encoding       GET/POST parameters.
-     *    @param integer $depth                 Nested frameset depth protection.
-     *    @return SimplePage                    Parsed page.
-     *    @access private
-     */
-    function &_fetch($url, $encoding, $depth = 0) {
-        $response = &$this->_user_agent->fetchResponse($url, $encoding);
-        if ($response->isError()) {
-            $page = &new SimplePage($response);
-        } else {
-            $page = &$this->_parse($response, $depth);
-        }
-        return $page;
-    }
-
-    /**
-     *    Fetches a page or a single frame if that is the current
-     *    focus.
-     *    @param SimpleUrl $url                   Target to fetch.
-     *    @param SimpleEncoding $parameters       GET/POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    function _load($url, $parameters) {
-        $frame = $url->getTarget();
-        if (! $frame || ! $this->_page->hasFrames() || (strtolower($frame) == '_top')) {
-            return $this->_loadPage($url, $parameters);
-        }
-        return $this->_loadFrame(array($frame), $url, $parameters);
-    }
-
-    /**
-     *    Fetches a page and makes it the current page/frame.
-     *    @param string/SimpleUrl $url            Target to fetch as string.
-     *    @param SimplePostEncoding $parameters   POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    function _loadPage($url, $parameters) {
-        $this->_page = &$this->_fetch($url, $parameters);
-        $this->_history->recordEntry(
-                $this->_page->getUrl(),
-                $this->_page->getRequestData());
-        return $this->_page->getRaw();
-    }
-
-    /**
-     *    Fetches a frame into the existing frameset replacing the
-     *    original.
-     *    @param array $frames                    List of names to drill down.
-     *    @param string/SimpleUrl $url            Target to fetch as string.
-     *    @param SimpleFormEncoding $parameters   POST parameters.
-     *    @return string                          Raw content of page.
-     *    @access private
-     */
-    function _loadFrame($frames, $url, $parameters) {
-        $page = &$this->_fetch($url, $parameters);
-        $this->_page->setFrame($frames, $page);
-        return $page->getRaw();
-    }
-
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened.
-     *    @param string/integer $date   Time when session restarted.
-     *                                  If omitted then all persistent
-     *                                  cookies are kept.
-     *    @access public
-     */
-    function restart($date = false) {
-        $this->_user_agent->restart($date);
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->_user_agent->addHeader($header);
-    }
-
-    /**
-     *    Ages the cookies by the specified time.
-     *    @param integer $interval    Amount in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->_user_agent->ageCookies($interval);
-    }
-
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name       Cookie key.
-     *    @param string $value      Value of cookie.
-     *    @param string $host       Host upon which the cookie is valid.
-     *    @param string $path       Cookie path if not host wide.
-     *    @param string $expiry     Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->_user_agent->setCookie($name, $value, $host, $path, $expiry);
-    }
-
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        return $this->_user_agent->getCookieValue($host, $path, $name);
-    }
-
-    /**
-     *    Reads the current cookies for the current URL.
-     *    @param string $name   Key of cookie to find.
-     *    @return string        Null if there is no current URL, false
-     *                          if the cookie is not set.
-     *    @access public
-     */
-    function getCurrentCookieValue($name) {
-        return $this->_user_agent->getBaseCookieValue($name, $this->_page->getUrl());
-    }
-
-    /**
-     *    Sets the maximum number of redirects before
-     *    a page will be loaded anyway.
-     *    @param integer $max        Most hops allowed.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        $this->_user_agent->setMaximumRedirects($max);
-    }
-
-    /**
-     *    Sets the maximum number of nesting of framed pages
-     *    within a framed page to prevent loops.
-     *    @param integer $max        Highest depth allowed.
-     *    @access public
-     */
-    function setMaximumNestedFrames($max) {
-        $this->_maximum_nested_frames = $max;
-    }
-
-    /**
-     *    Sets the socket timeout for opening a connection.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->_user_agent->setConnectionTimeout($timeout);
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $this->_user_agent->useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    Fetches the page content with a HEAD request.
-     *    Will affect cookies, but will not change the base URL.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleHeadEncoding $parameters  Additional parameters for
-     *                                                HEAD request.
-     *    @return boolean                             True if successful.
-     *    @access public
-     */
-    function head($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        $response = &$this->_user_agent->fetchResponse($url, new SimpleHeadEncoding($parameters));
-        return ! $response->isError();
-    }
-
-    /**
-     *    Fetches the page content with a simple GET request.
-     *    @param string/SimpleUrl $url                Target to fetch.
-     *    @param hash/SimpleFormEncoding $parameters  Additional parameters for
-     *                                                GET request.
-     *    @return string                              Content of page or false.
-     *    @access public
-     */
-    function get($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->_load($url, new SimpleGetEncoding($parameters));
-    }
-
-    /**
-     *    Fetches the page content with a POST request.
-     *    @param string/SimpleUrl $url                Target to fetch as string.
-     *    @param hash/SimpleFormEncoding $parameters  POST parameters.
-     *    @return string                              Content of page.
-     *    @access public
-     */
-    function post($url, $parameters = false) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        if ($this->getUrl()) {
-            $url = $url->makeAbsolute($this->getUrl());
-        }
-        return $this->_load($url, new SimplePostEncoding($parameters));
-    }
-
-    /**
-     *    Equivalent to hitting the retry button on the
-     *    browser. Will attempt to repeat the page fetch. If
-     *    there is no history to repeat it will give false.
-     *    @return string/boolean   Content if fetch succeeded
-     *                             else false.
-     *    @access public
-     */
-    function retry() {
-        $frames = $this->_page->getFrameFocus();
-        if (count($frames) > 0) {
-            $this->_loadFrame(
-                    $frames,
-                    $this->_page->getUrl(),
-                    $this->_page->getRequestData());
-            return $this->_page->getRaw();
-        }
-        if ($url = $this->_history->getUrl()) {
-            $this->_page = &$this->_fetch($url, $this->_history->getParameters());
-            return $this->_page->getRaw();
-        }
-        return false;
-    }
-
-    /**
-     *    Equivalent to hitting the back button on the
-     *    browser. The browser history is unchanged on
-     *    failure. The page content is refetched as there
-     *    is no concept of content caching in SimpleTest.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded
-     *    @access public
-     */
-    function back() {
-        if (! $this->_history->back()) {
-            return false;
-        }
-        $content = $this->retry();
-        if (! $content) {
-            $this->_history->forward();
-        }
-        return $content;
-    }
-
-    /**
-     *    Equivalent to hitting the forward button on the
-     *    browser. The browser history is unchanged on
-     *    failure. The page content is refetched as there
-     *    is no concept of content caching in SimpleTest.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded
-     *    @access public
-     */
-    function forward() {
-        if (! $this->_history->forward()) {
-            return false;
-        }
-        $content = $this->retry();
-        if (! $content) {
-            $this->_history->back();
-        }
-        return $content;
-    }
-
-    /**
-     *    Retries a request after setting the authentication
-     *    for the current realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @return boolean            True if successful fetch. Note
-     *                               that authentication may still have
-     *                               failed.
-     *    @access public
-     */
-    function authenticate($username, $password) {
-        if (! $this->_page->getRealm()) {
-            return false;
-        }
-        $url = $this->_page->getUrl();
-        if (! $url) {
-            return false;
-        }
-        $this->_user_agent->setIdentity(
-                $url->getHost(),
-                $this->_page->getRealm(),
-                $username,
-                $password);
-        return $this->retry();
-    }
-
-    /**
-     *    Accessor for a breakdown of the frameset.
-     *    @return array   Hash tree of frames by name
-     *                    or index if no name.
-     *    @access public
-     */
-    function getFrames() {
-        return $this->_page->getFrames();
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus.
-     *    @return integer/string/boolean    Label if any, otherwise
-     *                                      the position in the frameset
-     *                                      or false if none.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return $this->_page->getFrameFocus();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return $this->_page->setFrameFocusByIndex($choice);
-    }
-
-    /**
-     *    Sets the focus by name.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return $this->_page->setFrameFocus($name);
-    }
-
-    /**
-     *    Clears the frame focus. All frames will be searched
-     *    for content.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        return $this->_page->clearFrameFocus();
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->_page->getTransportError();
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        return $this->_page->getMimeType();
-    }
-
-    /**
-     *    Accessor for last response code.
-     *    @return integer    Last HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        return $this->_page->getResponseCode();
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        return $this->_page->getAuthentication();
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        return $this->_page->getRealm();
-    }
-
-    /**
-     *    Accessor for current URL of page or frame if
-     *    focused.
-     *    @return string    Location of current page or frame as
-     *                      a string.
-     */
-    function getUrl() {
-        $url = $this->_page->getUrl();
-        return $url ? $url->asString() : false;
-    }
-
-    /**
-     *    Accessor for base URL of page if set via BASE tag
-     *    @return string    base URL
-     */
-    function getBaseUrl() {
-        $url = $this->_page->getBaseUrl();
-        return $url ? $url->asString() : false;
-    }
-
-    /**
-     *    Accessor for raw bytes sent down the wire.
-     *    @return string      Original text sent.
-     *    @access public
-     */
-    function getRequest() {
-        return $this->_page->getRequest();
-    }
-
-    /**
-     *    Accessor for raw header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getHeaders() {
-        return $this->_page->getHeaders();
-    }
-
-    /**
-     *    Accessor for raw page information.
-     *    @return string      Original text content of web page.
-     *    @access public
-     */
-    function getContent() {
-        return $this->_page->getRaw();
-    }
-
-    /**
-     *    Accessor for plain text version of the page.
-     *    @return string      Normalised text representation.
-     *    @access public
-     */
-    function getContentAsText() {
-        return $this->_page->getText();
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        return $this->_page->getTitle();
-    }
-
-    /**
-     *    Accessor for a list of all links in current page.
-     *    @return array   List of urls with scheme of
-     *                    http or https and hostname.
-     *    @access public
-     */
-    function getUrls() {
-        return $this->_page->getUrls();
-    }
-
-    /**
-     *    Sets all form fields with that name.
-     *    @param string $label   Name or label of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setField($label, $value, $position=false) {
-        return $this->_page->setField(new SimpleByLabelOrName($label), $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that name. Will use label if
-     *    one is available (not yet implemented).
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldByName($name, $value, $position=false) {
-        return $this->_page->setField(new SimpleByName($name), $value, $position);
-    }
-
-    /**
-     *    Sets all form fields with that id attribute.
-     *    @param string/integer $id   Id of field in forms.
-     *    @param string $value        New value of field.
-     *    @return boolean             True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldById($id, $value) {
-        return $this->_page->setField(new SimpleById($id), $value);
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    Finds the first match.
-     *    @param string $label       Field label.
-     *    @return string/boolean     A value if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getField($label) {
-        return $this->_page->getField(new SimpleByLabelOrName($label));
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    Finds the first match.
-     *    @param string $name        Field name.
-     *    @return string/boolean     A string if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getFieldByName($name) {
-        return $this->_page->getField(new SimpleByName($name));
-    }
-
-    /**
-     *    Accessor for a form element value within the page.
-     *    @param string/integer $id  Id of field in forms.
-     *    @return string/boolean     A string if the field is
-     *                               present, false if unchecked
-     *                               and null if missing.
-     *    @access public
-     */
-    function getFieldById($id) {
-        return $this->_page->getField(new SimpleById($id));
-    }
-
-    /**
-     *    Clicks the submit button by label. The owning
-     *    form will be submitted by this.
-     *    @param string $label    Button label. An unlabeled
-     *                            button can be triggered by 'Submit'.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmit($label = 'Submit', $additional = false) {
-        if (! ($form = &$this->_page->getFormBySubmit(new SimpleByLabel($label)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitButton(new SimpleByLabel($label), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit button by name attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $name     Button name.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmitByName($name, $additional = false) {
-        if (! ($form = &$this->_page->getFormBySubmit(new SimpleByName($name)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitButton(new SimpleByName($name), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit button by ID attribute of the button
-     *    itself. The owning form will be submitted by this.
-     *    @param string $id       Button ID.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickSubmitById($id, $additional = false) {
-        if (! ($form = &$this->_page->getFormBySubmit(new SimpleById($id)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitButton(new SimpleById($id), $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-    
-    /**
-     *    Tests to see if a submit button exists with this
-     *    label.
-     *    @param string $label    Button label.
-     *    @return boolean         True if present.
-     *    @access public
-     */
-    function isSubmit($label) {
-        return (boolean)$this->_page->getFormBySubmit(new SimpleByLabel($label));
-    }
-
-    /**
-     *    Clicks the submit image by some kind of label. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $label    ID attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickImage($label, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = &$this->_page->getFormByImage(new SimpleByLabel($label)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitImage(new SimpleByLabel($label), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit image by the name. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $name     Name attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form data.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = &$this->_page->getFormByImage(new SimpleByName($name)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitImage(new SimpleByName($name), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Clicks the submit image by ID attribute. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param integer/string $id    ID attribute of button.
-     *    @param integer $x            X-coordinate of imaginary click.
-     *    @param integer $y            Y-coordinate of imaginary click.
-     *    @param hash $additional      Additional form data.
-     *    @return string/boolean       Page on success.
-     *    @access public
-     */
-    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-        if (! ($form = &$this->_page->getFormByImage(new SimpleById($id)))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submitImage(new SimpleById($id), $x, $y, $additional));
-        return ($success ? $this->getContent() : $success);
-    }
-    
-    /**
-     *    Tests to see if an image exists with this
-     *    title or alt text.
-     *    @param string $label    Image text.
-     *    @return boolean         True if present.
-     *    @access public
-     */
-    function isImage($label) {
-        return (boolean)$this->_page->getFormByImage(new SimpleByLabel($label));
-    }
-
-    /**
-     *    Submits a form by the ID.
-     *    @param string $id       The form ID. No submit button value
-     *                            will be sent.
-     *    @return string/boolean  Page on success.
-     *    @access public
-     */
-    function submitFormById($id) {
-        if (! ($form = &$this->_page->getFormById($id))) {
-            return false;
-        }
-        $success = $this->_load(
-                $form->getAction(),
-                $form->submit());
-        return ($success ? $this->getContent() : $success);
-    }
-
-    /**
-     *    Finds a URL by label. Will find the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. The match ignores case and
-     *    white space issues.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return string/boolean   URL on success.
-     *    @access public
-     */
-    function getLink($label, $index = 0) {
-        $urls = $this->_page->getUrlsByLabel($label);
-        if (count($urls) == 0) {
-            return false;
-        }
-        if (count($urls) < $index + 1) {
-            return false;
-        }
-        return $urls[$index];
-    }
-
-    /**
-     *    Follows a link by label. Will click the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. The match ignores case and
-     *    white space issues.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return string/boolean   Page on success.
-     *    @access public
-     */
-    function clickLink($label, $index = 0) {
-        $url = $this->getLink($label, $index);
-        if ($url === false) {
-            return false;
-        }
-        $this->_load($url, new SimpleGetEncoding());
-        return $this->getContent();
-    }
-    
-    /**
-     *    Finds a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return string/boolean   URL on success.
-     *    @access public
-     */
-    function getLinkById($id) {
-        return $this->_page->getUrlById($id);
-    }
-
-    /**
-     *    Follows a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return string/boolean   Page on success.
-     *    @access public
-     */
-    function clickLinkById($id) {
-        if (! ($url = $this->getLinkById($id))) {
-            return false;
-        }
-        $this->_load($url, new SimpleGetEncoding());
-        return $this->getContent();
-    }
-
-    /**
-     *    Clicks a visible text item. Will first try buttons,
-     *    then links and then images.
-     *    @param string $label        Visible text or alt text.
-     *    @return string/boolean      Raw page or false.
-     *    @access public
-     */
-    function click($label) {
-        $raw = $this->clickSubmit($label);
-        if (! $raw) {
-            $raw = $this->clickLink($label);
-        }
-        if (! $raw) {
-            $raw = $this->clickImage($label);
-        }
-        return $raw;
-    }
-
-    /**
-     *    Tests to see if a click target exists.
-     *    @param string $label    Visible text or alt text.
-     *    @return boolean         True if target present.
-     *    @access public
-     */
-    function isClickable($label) {
-        return $this->isSubmit($label) || ($this->getLink($label) !== false) || $this->isImage($label);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/collector.php b/tests/simpletest/collector.php
deleted file mode 100644
index 5b8255d39..000000000
--- a/tests/simpletest/collector.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * This file contains the following classes: {@link SimpleCollector},
- * {@link SimplePatternCollector}.
- *
- * @author Travis Swicegood <development@domain51.com>
- * @package SimpleTest
- * @subpackage UnitTester
- * @version $Id: collector.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**
- * The basic collector for {@link GroupTest}
- *
- * @see collect(), GroupTest::collect()
- * @package SimpleTest
- * @subpackage UnitTester
- */
-class SimpleCollector {
-
-    /**
-     * Strips off any kind of slash at the end so as to normalise the path.
-     * @param string $path    Path to normalise.
-     * @return string         Path without trailing slash.
-     */
-    function _removeTrailingSlash($path) {
-        if (substr($path, -1) == DIRECTORY_SEPARATOR) {
-            return substr($path, 0, -1);
-        } elseif (substr($path, -1) == '/') {
-            return substr($path, 0, -1);
-        } else {
-            return $path;
-        }
-    }
-
-    /**
-     * Scans the directory and adds what it can.
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @see _attemptToAdd()
-     */
-    function collect(&$test, $path) {
-        $path = $this->_removeTrailingSlash($path);
-        if ($handle = opendir($path)) {
-            while (($entry = readdir($handle)) !== false) {
-                if ($this->_isHidden($entry)) {
-                    continue;
-                }
-                $this->_handle($test, $path . DIRECTORY_SEPARATOR . $entry);
-            }
-            closedir($handle);
-        }
-    }
-
-    /**
-     * This method determines what should be done with a given file and adds
-     * it via {@link GroupTest::addTestFile()} if necessary.
-     *
-     * This method should be overriden to provide custom matching criteria,
-     * such as pattern matching, recursive matching, etc.  For an example, see
-     * {@link SimplePatternCollector::_handle()}.
-     *
-     * @param object $test      Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $filename  A filename as generated by {@link collect()}
-     * @see collect()
-     * @access protected
-     */
-    function _handle(&$test, $file) {
-        if (is_dir($file)) {
-            return;
-        }
-        $test->addTestFile($file);
-    }
-    
-    /**
-     *  Tests for hidden files so as to skip them. Currently
-     *  only tests for Unix hidden files.
-     *  @param string $filename        Plain filename.
-     *  @return boolean                True if hidden file.
-     *  @access private
-     */
-    function _isHidden($filename) {
-        return strncmp($filename, '.', 1) == 0;
-    }
-}
-
-/**
- * An extension to {@link SimpleCollector} that only adds files matching a
- * given pattern.
- *
- * @package SimpleTest
- * @subpackage UnitTester
- * @see SimpleCollector
- */
-class SimplePatternCollector extends SimpleCollector {
-    var $_pattern;
-
-    /**
-     *
-     * @param string $pattern   Perl compatible regex to test name against
-     *  See {@link http://us4.php.net/manual/en/reference.pcre.pattern.syntax.php PHP's PCRE}
-     *  for full documentation of valid pattern.s
-     */
-    function SimplePatternCollector($pattern = '/php$/i') {
-        $this->_pattern = $pattern;
-    }
-
-    /**
-     * Attempts to add files that match a given pattern.
-     *
-     * @see SimpleCollector::_handle()
-     * @param object $test    Group test with {@link GroupTest::addTestFile()} method.
-     * @param string $path    Directory to scan.
-     * @access protected
-     */
-    function _handle(&$test, $filename) {
-        if (preg_match($this->_pattern, $filename)) {
-            parent::_handle($test, $filename);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/compatibility.php b/tests/simpletest/compatibility.php
deleted file mode 100644
index 4e0f78a4b..000000000
--- a/tests/simpletest/compatibility.php
+++ /dev/null
@@ -1,173 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @version    $Id: compatibility.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**
- *  Static methods for compatibility between different
- *  PHP versions.
- *  @package    SimpleTest
- */
-class SimpleTestCompatibility {
-    
-    /**
-     *    Creates a copy whether in PHP5 or PHP4.
-     *    @param object $object     Thing to copy.
-     *    @return object            A copy.
-     *    @access public
-     *    @static
-     */
-    function copy($object) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            eval('$copy = clone $object;');
-            return $copy;
-        }
-        return $object;
-    }
-    
-    /**
-     *    Identity test. Drops back to equality + types for PHP5
-     *    objects as the === operator counts as the
-     *    stronger reference constraint.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if identical.
-     *    @access public
-     *    @static
-     */
-    function isIdentical($first, $second) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            return SimpleTestCompatibility::_isIdenticalType($first, $second);
-        }
-        if ($first != $second) {
-            return false;
-        }
-        return ($first === $second);
-    }
-    
-    /**
-     *    Recursive type test.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if same type.
-     *    @access private
-     *    @static
-     */
-    function _isIdenticalType($first, $second) {
-        if (gettype($first) != gettype($second)) {
-            return false;
-        }
-        if (is_object($first) && is_object($second)) {
-            if (get_class($first) != get_class($second)) {
-                return false;
-            }
-            return SimpleTestCompatibility::_isArrayOfIdenticalTypes(
-                    get_object_vars($first),
-                    get_object_vars($second));
-        }
-        if (is_array($first) && is_array($second)) {
-            return SimpleTestCompatibility::_isArrayOfIdenticalTypes($first, $second);
-        }
-        if ($first !== $second) {
-            return false;
-        }
-        return true;
-    }
-    
-    /**
-     *    Recursive type test for each element of an array.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if identical.
-     *    @access private
-     *    @static
-     */
-    function _isArrayOfIdenticalTypes($first, $second) {
-        if (array_keys($first) != array_keys($second)) {
-            return false;
-        }
-        foreach (array_keys($first) as $key) {
-            $is_identical = SimpleTestCompatibility::_isIdenticalType(
-                    $first[$key],
-                    $second[$key]);
-            if (! $is_identical) {
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    /**
-     *    Test for two variables being aliases.
-     *    @param mixed $first    Test subject.
-     *    @param mixed $second   Comparison object.
-     *    @return boolean        True if same.
-     *    @access public
-     *    @static
-     */
-    function isReference(&$first, &$second) {
-        if (version_compare(phpversion(), '5', '>=') && is_object($first)) {
-            return ($first === $second);
-        }
-        if (is_object($first) && is_object($second)) {
-            $id = uniqid("test");
-            $first->$id = true;
-            $is_ref = isset($second->$id);
-            unset($first->$id);
-            return $is_ref;
-        }
-        $temp = $first;
-        $first = uniqid("test");
-        $is_ref = ($first === $second);
-        $first = $temp;
-        return $is_ref;
-    }
-    
-    /**
-     *    Test to see if an object is a member of a
-     *    class hiearchy.
-     *    @param object $object    Object to test.
-     *    @param string $class     Root name of hiearchy.
-     *    @return boolean         True if class in hiearchy.
-     *    @access public
-     *    @static
-     */
-    function isA($object, $class) {
-        if (version_compare(phpversion(), '5') >= 0) {
-            if (! class_exists($class, false)) {
-                if (function_exists('interface_exists')) {
-                    if (! interface_exists($class, false))  {
-                        return false;
-                    }
-                }
-            }
-            eval("\$is_a = \$object instanceof $class;");
-            return $is_a;
-        }
-        if (function_exists('is_a')) {
-            return is_a($object, $class);
-        }
-        return ((strtolower($class) == get_class($object))
-                or (is_subclass_of($object, $class)));
-    }
-    
-    /**
-     *    Sets a socket timeout for each chunk.
-     *    @param resource $handle    Socket handle.
-     *    @param integer $timeout    Limit in seconds.
-     *    @access public
-     *    @static
-     */
-    function setTimeout($handle, $timeout) {
-        if (function_exists('stream_set_timeout')) {
-            stream_set_timeout($handle, $timeout, 0);
-        } elseif (function_exists('socket_set_timeout')) {
-            socket_set_timeout($handle, $timeout, 0);
-        } elseif (function_exists('set_socket_timeout')) {
-            set_socket_timeout($handle, $timeout, 0);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/cookies.php b/tests/simpletest/cookies.php
deleted file mode 100644
index ed1c025d2..000000000
--- a/tests/simpletest/cookies.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: cookies.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/url.php');
-/**#@-*/
-
-/**
- *    Cookie data holder. Cookie rules are full of pretty
- *    arbitary stuff. I have used...
- *    http://wp.netscape.com/newsref/std/cookie_spec.html
- *    http://www.cookiecentral.com/faq/
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCookie {
-    var $_host;
-    var $_name;
-    var $_value;
-    var $_path;
-    var $_expiry;
-    var $_is_secure;
-    
-    /**
-     *    Constructor. Sets the stored values.
-     *    @param string $name            Cookie key.
-     *    @param string $value           Value of cookie.
-     *    @param string $path            Cookie path if not host wide.
-     *    @param string $expiry          Expiry date as string.
-     *    @param boolean $is_secure      Currently ignored.
-     */
-    function SimpleCookie($name, $value = false, $path = false, $expiry = false, $is_secure = false) {
-        $this->_host = false;
-        $this->_name = $name;
-        $this->_value = $value;
-        $this->_path = ($path ? $this->_fixPath($path) : "/");
-        $this->_expiry = false;
-        if (is_string($expiry)) {
-            $this->_expiry = strtotime($expiry);
-        } elseif (is_integer($expiry)) {
-            $this->_expiry = $expiry;
-        }
-        $this->_is_secure = $is_secure;
-    }
-    
-    /**
-     *    Sets the host. The cookie rules determine
-     *    that the first two parts are taken for
-     *    certain TLDs and three for others. If the
-     *    new host does not match these rules then the
-     *    call will fail.
-     *    @param string $host       New hostname.
-     *    @return boolean           True if hostname is valid.
-     *    @access public
-     */
-    function setHost($host) {
-        if ($host = $this->_truncateHost($host)) {
-            $this->_host = $host;
-            return true;
-        }
-        return false;
-    }
-    
-    /**
-     *    Accessor for the truncated host to which this
-     *    cookie applies.
-     *    @return string       Truncated hostname.
-     *    @access public
-     */
-    function getHost() {
-        return $this->_host;
-    }
-    
-    /**
-     *    Test for a cookie being valid for a host name.
-     *    @param string $host    Host to test against.
-     *    @return boolean        True if the cookie would be valid
-     *                           here.
-     */
-    function isValidHost($host) {
-        return ($this->_truncateHost($host) === $this->getHost());
-    }
-    
-    /**
-     *    Extracts just the domain part that determines a
-     *    cookie's host validity.
-     *    @param string $host    Host name to truncate.
-     *    @return string        Domain or false on a bad host.
-     *    @access private
-     */
-    function _truncateHost($host) {
-        $tlds = SimpleUrl::getAllTopLevelDomains();
-        if (preg_match('/[a-z\-]+\.(' . $tlds . ')$/i', $host, $matches)) {
-            return $matches[0];
-        } elseif (preg_match('/[a-z\-]+\.[a-z\-]+\.[a-z\-]+$/i', $host, $matches)) {
-            return $matches[0];
-        }
-        return false;
-    }
-    
-    /**
-     *    Accessor for name.
-     *    @return string       Cookie key.
-     *    @access public
-     */
-    function getName() {
-        return $this->_name;
-    }
-    
-    /**
-     *    Accessor for value. A deleted cookie will
-     *    have an empty string for this.
-     *    @return string       Cookie value.
-     *    @access public
-     */
-    function getValue() {
-        return $this->_value;
-    }
-    
-    /**
-     *    Accessor for path.
-     *    @return string       Valid cookie path.
-     *    @access public
-     */
-    function getPath() {
-        return $this->_path;
-    }
-    
-    /**
-     *    Tests a path to see if the cookie applies
-     *    there. The test path must be longer or
-     *    equal to the cookie path.
-     *    @param string $path       Path to test against.
-     *    @return boolean           True if cookie valid here.
-     *    @access public
-     */
-    function isValidPath($path) {
-        return (strncmp(
-                $this->_fixPath($path),
-                $this->getPath(),
-                strlen($this->getPath())) == 0);
-    }
-    
-    /**
-     *    Accessor for expiry.
-     *    @return string       Expiry string.
-     *    @access public
-     */
-    function getExpiry() {
-        if (! $this->_expiry) {
-            return false;
-        }
-        return gmdate("D, d M Y H:i:s", $this->_expiry) . " GMT";
-    }
-    
-    /**
-     *    Test to see if cookie is expired against
-     *    the cookie format time or timestamp.
-     *    Will give true for a session cookie.
-     *    @param integer/string $now  Time to test against. Result
-     *                                will be false if this time
-     *                                is later than the cookie expiry.
-     *                                Can be either a timestamp integer
-     *                                or a cookie format date.
-     *    @access public
-     */
-    function isExpired($now) {
-        if (! $this->_expiry) {
-            return true;
-        }
-        if (is_string($now)) {
-            $now = strtotime($now);
-        }
-        return ($this->_expiry < $now);
-    }
-    
-    /**
-     *    Ages the cookie by the specified number of
-     *    seconds.
-     *    @param integer $interval   In seconds.
-     *    @public
-     */
-    function agePrematurely($interval) {
-        if ($this->_expiry) {
-            $this->_expiry -= $interval;
-        }
-    }
-    
-    /**
-     *    Accessor for the secure flag.
-     *    @return boolean       True if cookie needs SSL.
-     *    @access public
-     */
-    function isSecure() {
-        return $this->_is_secure;
-    }
-    
-    /**
-     *    Adds a trailing and leading slash to the path
-     *    if missing.
-     *    @param string $path            Path to fix.
-     *    @access private
-     */
-    function _fixPath($path) {
-        if (substr($path, 0, 1) != '/') {
-            $path = '/' . $path;
-        }
-        if (substr($path, -1, 1) != '/') {
-            $path .= '/';
-        }
-        return $path;
-    }
-}
-
-/**
- *    Repository for cookies. This stuff is a
- *    tiny bit browser dependent.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCookieJar {
-    var $_cookies;
-    
-    /**
-     *    Constructor. Jar starts empty.
-     *    @access public
-     */
-    function SimpleCookieJar() {
-        $this->_cookies = array();
-    }
-    
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened.
-     *    @param string/integer $now   Time to test expiry against.
-     *    @access public
-     */
-    function restartSession($date = false) {
-        $surviving_cookies = array();
-        for ($i = 0; $i < count($this->_cookies); $i++) {
-            if (! $this->_cookies[$i]->getValue()) {
-                continue;
-            }
-            if (! $this->_cookies[$i]->getExpiry()) {
-                continue;
-            }
-            if ($date && $this->_cookies[$i]->isExpired($date)) {
-                continue;
-            }
-            $surviving_cookies[] = $this->_cookies[$i];
-        }
-        $this->_cookies = $surviving_cookies;
-    }
-    
-    /**
-     *    Ages all cookies in the cookie jar.
-     *    @param integer $interval     The old session is moved
-     *                                 into the past by this number
-     *                                 of seconds. Cookies now over
-     *                                 age will be removed.
-     *    @access public
-     */
-    function agePrematurely($interval) {
-        for ($i = 0; $i < count($this->_cookies); $i++) {
-            $this->_cookies[$i]->agePrematurely($interval);
-        }
-    }
-    
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name       Cookie key.
-     *    @param string $value      Value of cookie.
-     *    @param string $host       Host upon which the cookie is valid.
-     *    @param string $path       Cookie path if not host wide.
-     *    @param string $expiry     Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $cookie = new SimpleCookie($name, $value, $path, $expiry);
-        if ($host) {
-            $cookie->setHost($host);
-        }
-        $this->_cookies[$this->_findFirstMatch($cookie)] = $cookie;
-    }
-    
-    /**
-     *    Finds a matching cookie to write over or the
-     *    first empty slot if none.
-     *    @param SimpleCookie $cookie    Cookie to write into jar.
-     *    @return integer                Available slot.
-     *    @access private
-     */
-    function _findFirstMatch($cookie) {
-        for ($i = 0; $i < count($this->_cookies); $i++) {
-            $is_match = $this->_isMatch(
-                    $cookie,
-                    $this->_cookies[$i]->getHost(),
-                    $this->_cookies[$i]->getPath(),
-                    $this->_cookies[$i]->getName());
-            if ($is_match) {
-                return $i;
-            }
-        }
-        return count($this->_cookies);
-    }
-    
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies. Looks for the longest path that
-     *    matches.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        $longest_path = '';
-        foreach ($this->_cookies as $cookie) {
-            if ($this->_isMatch($cookie, $host, $path, $name)) {
-                if (strlen($cookie->getPath()) > strlen($longest_path)) {
-                    $value = $cookie->getValue();
-                    $longest_path = $cookie->getPath();
-                }
-            }
-        }
-        return (isset($value) ? $value : false);
-    }
-    
-    /**
-     *    Tests cookie for matching against search
-     *    criteria.
-     *    @param SimpleTest $cookie    Cookie to test.
-     *    @param string $host          Host must match.
-     *    @param string $path          Cookie path must be shorter than
-     *                                 this path.
-     *    @param string $name          Name must match.
-     *    @return boolean              True if matched.
-     *    @access private
-     */
-    function _isMatch($cookie, $host, $path, $name) {
-        if ($cookie->getName() != $name) {
-            return false;
-        }
-        if ($host && $cookie->getHost() && ! $cookie->isValidHost($host)) {
-            return false;
-        }
-        if (! $cookie->isValidPath($path)) {
-            return false;
-        }
-        return true;
-    }
-    
-    /**
-     *    Uses a URL to sift relevant cookies by host and
-     *    path. Results are list of strings of form "name=value".
-     *    @param SimpleUrl $url       Url to select by.
-     *    @return array               Valid name and value pairs.
-     *    @access public
-     */
-    function selectAsPairs($url) {
-        $pairs = array();
-        foreach ($this->_cookies as $cookie) {
-            if ($this->_isMatch($cookie, $url->getHost(), $url->getPath(), $cookie->getName())) {
-                $pairs[] = $cookie->getName() . '=' . $cookie->getValue();
-            }
-        }
-        return $pairs;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/default_reporter.php b/tests/simpletest/default_reporter.php
deleted file mode 100644
index bd4c6a190..000000000
--- a/tests/simpletest/default_reporter.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- *  Optional include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: default_reporter.php 1704 2008-03-25 00:47:04Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/reporter.php');
-require_once(dirname(__FILE__) . '/xml.php');
-/**#@-*/
-
-/**
- *    Parser for command line arguments. Extracts
- *    the a specific test to run and engages XML
- *    reporting when necessary.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleCommandLineParser {
-    var $_to_property = array(
-            'case' => '_case', 'c' => '_case',
-            'test' => '_test', 't' => '_test',
-            'xml' => '_xml', 'x' => '_xml');
-    var $_case = '';
-    var $_test = '';
-    var $_xml = false;
-    var $_no_skips = false;
-    
-    /**
-     *    Parses raw command line arguments into object properties.
-     *    @param string $arguments        Raw commend line arguments.
-     */
-    function SimpleCommandLineParser($arguments) {
-        if (! is_array($arguments)) {
-            return;
-        }
-        foreach ($arguments as $i => $argument) {
-            if (preg_match('/^--?(test|case|t|c)=(.+)$/', $argument, $matches)) {
-                $property = $this->_to_property[$matches[1]];
-                $this->$property = $matches[2];
-            } elseif (preg_match('/^--?(test|case|t|c)$/', $argument, $matches)) {
-                $property = $this->_to_property[$matches[1]];
-                if (isset($arguments[$i + 1])) {
-                    $this->$property = $arguments[$i + 1];
-                }
-            } elseif (preg_match('/^--?(xml|x)$/', $argument)) {
-                $this->_xml = true;
-            } elseif (preg_match('/^--?(no-skip|no-skips|s)$/', $argument)) {
-                $this->_no_skips = true;
-            }
-        }
-    }
-    
-    /**
-     *    Run only this test.
-     *    @return string        Test name to run.
-     *    @access public
-     */
-    function getTest() {
-        return $this->_test;
-    }
-    
-    /**
-     *    Run only this test suite.
-     *    @return string        Test class name to run.
-     *    @access public
-     */
-    function getTestCase() {
-        return $this->_case;
-    }
-    
-    /**
-     *    Output should be XML or not.
-     *    @return boolean        True if XML desired.
-     *    @access public
-     */
-    function isXml() {
-        return $this->_xml;
-    }
-    
-    /**
-     *    Output should suppress skip messages.
-     *    @return boolean        True for no skips.
-     *    @access public
-     */
-    function noSkips() {
-        return $this->_no_skips;
-    }
-}
-
-/**
- *    The default reporter used by SimpleTest's autorun
- *    feature. The actual reporters used are dependency
- *    injected and can be overridden.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class DefaultReporter extends SimpleReporterDecorator {
-    
-    /**
-     *  Assembles the appopriate reporter for the environment.
-     */
-    function DefaultReporter() {
-        if (SimpleReporter::inCli()) {
-            global $argv;
-            $parser = new SimpleCommandLineParser($argv);
-            $interfaces = $parser->isXml() ? array('XmlReporter') : array('TextReporter');
-            $reporter = &new SelectiveReporter(
-                    SimpleTest::preferred($interfaces),
-                    $parser->getTestCase(),
-                    $parser->getTest());
-            if ($parser->noSkips()) {
-                $reporter = &new NoSkipsReporter($reporter);
-            }
-        } else {
-            $reporter = &new SelectiveReporter(
-                    SimpleTest::preferred('HtmlReporter'),
-                    @$_GET['c'],
-                    @$_GET['t']);
-            if (@$_GET['skips'] == 'no' || @$_GET['show-skips'] == 'no') {
-                $reporter = &new NoSkipsReporter($reporter);
-            }
-        }
-        $this->SimpleReporterDecorator($reporter);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/detached.php b/tests/simpletest/detached.php
deleted file mode 100644
index e323d8cd5..000000000
--- a/tests/simpletest/detached.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: detached.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/xml.php');
-require_once(dirname(__FILE__) . '/shell_tester.php');
-/**#@-*/
-
-/**
- *    Runs an XML formated test in a separate process.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class DetachedTestCase {
-    var $_command;
-    var $_dry_command;
-    var $_size;
-
-    /**
-     *    Sets the location of the remote test.
-     *    @param string $command       Test script.
-     *    @param string $dry_command   Script for dry run.
-     *    @access public
-     */
-    function DetachedTestCase($command, $dry_command = false) {
-        $this->_command = $command;
-        $this->_dry_command = $dry_command ? $dry_command : $command;
-        $this->_size = false;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string       Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_command;
-    }
-
-    /**
-     *    Runs the top level test for this class. Currently
-     *    reads the data as a single chunk. I'll fix this
-     *    once I have added iteration to the browser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @returns boolean                   True if no failures.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $shell = &new SimpleShell();
-        $shell->execute($this->_command);
-        $parser = &$this->_createParser($reporter);
-        if (! $parser->parse($shell->getOutput())) {
-            trigger_error('Cannot parse incoming XML from [' . $this->_command . ']');
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Accessor for the number of subtests.
-     *    @return integer       Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        if ($this->_size === false) {
-            $shell = &new SimpleShell();
-            $shell->execute($this->_dry_command);
-            $reporter = &new SimpleReporter();
-            $parser = &$this->_createParser($reporter);
-            if (! $parser->parse($shell->getOutput())) {
-                trigger_error('Cannot parse incoming XML from [' . $this->_dry_command . ']');
-                return false;
-            }
-            $this->_size = $reporter->getTestCaseCount();
-        }
-        return $this->_size;
-    }
-
-    /**
-     *    Creates the XML parser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @return SimpleTestXmlListener      XML reader.
-     *    @access protected
-     */
-    function &_createParser(&$reporter) {
-        return new SimpleTestXmlParser($reporter);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/dumper.php b/tests/simpletest/dumper.php
deleted file mode 100644
index 2d75985c0..000000000
--- a/tests/simpletest/dumper.php
+++ /dev/null
@@ -1,360 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: dumper.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-/**
- * does type matter
- */
-if (! defined('TYPE_MATTERS')) {
-    define('TYPE_MATTERS', true);
-}
-
-/**
- *    Displays variables as text and does diffs.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleDumper {
-    
-    /**
-     *    Renders a variable in a shorter form than print_r().
-     *    @param mixed $value      Variable to render as a string.
-     *    @return string           Human readable string form.
-     *    @access public
-     */
-    function describeValue($value) {
-        $type = $this->getType($value);
-        switch($type) {
-            case "Null":
-                return "NULL";
-            case "Boolean":
-                return "Boolean: " . ($value ? "true" : "false");
-            case "Array":
-                return "Array: " . count($value) . " items";
-            case "Object":
-                return "Object: of " . get_class($value);
-            case "String":
-                return "String: " . $this->clipString($value, 200);
-            default:
-                return "$type: $value";
-        }
-        return "Unknown";
-    }
-    
-    /**
-     *    Gets the string representation of a type.
-     *    @param mixed $value    Variable to check against.
-     *    @return string         Type.
-     *    @access public
-     */
-    function getType($value) {
-        if (! isset($value)) {
-            return "Null";
-        } elseif (is_bool($value)) {
-            return "Boolean";
-        } elseif (is_string($value)) {
-            return "String";
-        } elseif (is_integer($value)) {
-            return "Integer";
-        } elseif (is_float($value)) {
-            return "Float";
-        } elseif (is_array($value)) {
-            return "Array";
-        } elseif (is_resource($value)) {
-            return "Resource";
-        } elseif (is_object($value)) {
-            return "Object";
-        }
-        return "Unknown";
-    }
-
-    /**
-     *    Creates a human readable description of the
-     *    difference between two variables. Uses a
-     *    dynamic call.
-     *    @param mixed $first        First variable.
-     *    @param mixed $second       Value to compare with.
-     *    @param boolean $identical  If true then type anomolies count.
-     *    @return string             Description of difference.
-     *    @access public
-     */
-    function describeDifference($first, $second, $identical = false) {
-        if ($identical) {
-            if (! $this->_isTypeMatch($first, $second)) {
-                return "with type mismatch as [" . $this->describeValue($first) .
-                    "] does not match [" . $this->describeValue($second) . "]";
-            }
-        }
-        $type = $this->getType($first);
-        if ($type == "Unknown") {
-            return "with unknown type";
-        }
-        $method = '_describe' . $type . 'Difference';
-        return $this->$method($first, $second, $identical);
-    }
-    
-    /**
-     *    Tests to see if types match.
-     *    @param mixed $first        First variable.
-     *    @param mixed $second       Value to compare with.
-     *    @return boolean            True if matches.
-     *    @access private
-     */
-    function _isTypeMatch($first, $second) {
-        return ($this->getType($first) == $this->getType($second));
-    }
-
-    /**
-     *    Clips a string to a maximum length.
-     *    @param string $value         String to truncate.
-     *    @param integer $size         Minimum string size to show.
-     *    @param integer $position     Centre of string section.
-     *    @return string               Shortened version.
-     *    @access public
-     */
-    function clipString($value, $size, $position = 0) {
-        $length = strlen($value);
-        if ($length <= $size) {
-            return $value;
-        }
-        $position = min($position, $length);
-        $start = ($size/2 > $position ? 0 : $position - $size/2);
-        if ($start + $size > $length) {
-            $start = $length - $size;
-        }
-        $value = substr($value, $start, $size);
-        return ($start > 0 ? "..." : "") . $value . ($start + $size < $length ? "..." : "");
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between two variables. The minimal
-     *    version.
-     *    @param null $first          First value.
-     *    @param mixed $second        Value to compare with.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeGenericDifference($first, $second) {
-        return "as [" . $this->describeValue($first) .
-                "] does not match [" .
-                $this->describeValue($second) . "]";
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between a null and another variable.
-     *    @param null $first          First null.
-     *    @param mixed $second        Null to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeNullDifference($first, $second, $identical) {
-        return $this->_describeGenericDifference($first, $second);
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between a boolean and another variable.
-     *    @param boolean $first       First boolean.
-     *    @param mixed $second        Boolean to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeBooleanDifference($first, $second, $identical) {
-        return $this->_describeGenericDifference($first, $second);
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between a string and another variable.
-     *    @param string $first        First string.
-     *    @param mixed $second        String to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeStringDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        $position = $this->_stringDiffersAt($first, $second);
-        $message = "at character $position";
-        $message .= " with [" .
-                $this->clipString($first, 200, $position) . "] and [" .
-                $this->clipString($second, 200, $position) . "]";
-        return $message;
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between an integer and another variable.
-     *    @param integer $first       First number.
-     *    @param mixed $second        Number to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeIntegerDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        return "because [" . $this->describeValue($first) .
-                "] differs from [" .
-                $this->describeValue($second) . "] by " .
-                abs($first - $second);
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between two floating point numbers.
-     *    @param float $first         First float.
-     *    @param mixed $second        Float to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeFloatDifference($first, $second, $identical) {
-        if (is_object($second) || is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        return "because [" . $this->describeValue($first) .
-                "] differs from [" .
-                $this->describeValue($second) . "] by " .
-                abs($first - $second);
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between two arrays.
-     *    @param array $first         First array.
-     *    @param mixed $second        Array to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeArrayDifference($first, $second, $identical) {
-        if (! is_array($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        if (! $this->_isMatchingKeys($first, $second, $identical)) {
-            return "as key list [" .
-                    implode(", ", array_keys($first)) . "] does not match key list [" .
-                    implode(", ", array_keys($second)) . "]";
-        }
-        foreach (array_keys($first) as $key) {
-            if ($identical && ($first[$key] === $second[$key])) {
-                continue;
-            }
-            if (! $identical && ($first[$key] == $second[$key])) {
-                continue;
-            }
-            return "with member [$key] " . $this->describeDifference(
-                    $first[$key],
-                    $second[$key],
-                    $identical);
-        }
-        return "";
-    }
-    
-    /**
-     *    Compares two arrays to see if their key lists match.
-     *    For an identical match, the ordering and types of the keys
-     *    is significant.
-     *    @param array $first         First array.
-     *    @param array $second        Array to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return boolean             True if matching.
-     *    @access private
-     */
-    function _isMatchingKeys($first, $second, $identical) {
-        $first_keys = array_keys($first);
-        $second_keys = array_keys($second);
-        if ($identical) {
-            return ($first_keys === $second_keys);
-        }
-        sort($first_keys);
-        sort($second_keys);
-        return ($first_keys == $second_keys);
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between a resource and another variable.
-     *    @param resource $first       First resource.
-     *    @param mixed $second         Resource to compare with.
-     *    @param boolean $identical    If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeResourceDifference($first, $second, $identical) {
-        return $this->_describeGenericDifference($first, $second);
-    }
-    
-    /**
-     *    Creates a human readable description of the
-     *    difference between two objects.
-     *    @param object $first        First object.
-     *    @param mixed $second        Object to compare with.
-     *    @param boolean $identical   If true then type anomolies count.
-     *    @return string              Human readable description.
-     *    @access private
-     */
-    function _describeObjectDifference($first, $second, $identical) {
-        if (! is_object($second)) {
-            return $this->_describeGenericDifference($first, $second);
-        }
-        return $this->_describeArrayDifference(
-                get_object_vars($first),
-                get_object_vars($second),
-                $identical);
-    }
-    
-    /**
-     *    Find the first character position that differs
-     *    in two strings by binary chop.
-     *    @param string $first        First string.
-     *    @param string $second       String to compare with.
-     *    @return integer             Position of first differing
-     *                                character.
-     *    @access private
-     */
-    function _stringDiffersAt($first, $second) {
-        if (! $first || ! $second) {
-            return 0;
-        }
-        if (strlen($first) < strlen($second)) {
-            list($first, $second) = array($second, $first);
-        }
-        $position = 0;
-        $step = strlen($first);
-        while ($step > 1) {
-            $step = (integer)(($step + 1) / 2);
-            if (strncmp($first, $second, $position + $step) == 0) {
-                $position += $step;
-            }
-        }
-        return $position;
-    }
-    
-    /**
-     *    Sends a formatted dump of a variable to a string.
-     *    @param mixed $variable    Variable to display.
-     *    @return string            Output from print_r().
-     *    @access public
-     *    @static
-     */
-    function dump($variable) {
-        ob_start();
-        print_r($variable);
-        $formatted = ob_get_contents();
-        ob_end_clean();
-        return $formatted;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/eclipse.php b/tests/simpletest/eclipse.php
deleted file mode 100644
index 0f1a4fcb2..000000000
--- a/tests/simpletest/eclipse.php
+++ /dev/null
@@ -1,307 +0,0 @@
-<?php
-/**
- *  base include file for eclipse plugin  
- *  @package    SimpleTest
- *  @subpackage Eclipse
- *  @version    $Id: eclipse.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-/**#@+
- * simpletest include files
- */
-include_once 'unit_tester.php';
-include_once 'test_case.php';
-include_once 'invoker.php';
-include_once 'socket.php';
-include_once 'mock_objects.php';
-/**#@-*/
-
-/**
- *  base reported class for eclipse plugin  
- *  @package    SimpleTest
- *  @subpackage Eclipse
- */
-class EclipseReporter extends SimpleScorer {
-    
-    /**
-     *    Reporter to be run inside of Eclipse interface.
-     *    @param object $listener   Eclipse listener (?).
-     *    @param boolean $cc        Whether to include test coverage.
-     */
-    function EclipseReporter(&$listener, $cc=false){
-        $this->_listener = &$listener;
-        $this->SimpleScorer();
-        $this->_case = "";
-        $this->_group = "";
-        $this->_method = "";
-        $this->_cc = $cc;
-        $this->_error = false;
-        $this->_fail = false;
-    }
-    
-    /**
-     *    Means to display human readable object comparisons.
-     *    @return SimpleDumper        Visual comparer.
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-    
-    /**
-     *    Localhost connection from Eclipse.
-     *    @param integer $port      Port to connect to Eclipse.
-     *    @param string $host       Normally localhost.
-     *    @return SimpleSocket      Connection to Eclipse.
-     */
-    function &createListener($port, $host="127.0.0.1"){
-        $tmplistener = &new SimpleSocket($host, $port, 5);
-        return $tmplistener;
-    }
-    
-    /**
-     *    Wraps the test in an output buffer.
-     *    @param SimpleInvoker $invoker     Current test runner.
-     *    @return EclipseInvoker            Decorator with output buffering.
-     *    @access public
-     */
-    function &createInvoker(&$invoker){
-        $eclinvoker = &new EclipseInvoker($invoker, $this->_listener);
-        return $eclinvoker;
-    }
-    
-    /**
-     *    C style escaping.
-     *    @param string $raw    String with backslashes, quotes and whitespace.
-     *    @return string        Replaced with C backslashed tokens.
-     */
-    function escapeVal($raw){
-        $needle = array("\\","\"","/","\b","\f","\n","\r","\t");
-        $replace = array('\\\\','\"','\/','\b','\f','\n','\r','\t');
-        return str_replace($needle, $replace, $raw);
-    }
-    
-    /**
-     *    Stash the first passing item. Clicking the test
-     *    item goes to first pass.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintPass($message){
-        if (! $this->_pass){
-            $this->_message = $this->escapeVal($message);
-        }
-        $this->_pass = true;
-    }
-    
-    /**
-     *    Stash the first failing item. Clicking the test
-     *    item goes to first fail.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintFail($message){
-        //only get the first failure or error
-        if (! $this->_fail && ! $this->_error){
-            $this->_fail = true;
-            $this->_message = $this->escapeVal($message);
-            $this->_listener->write('{status:"fail",message:"'.$this->_message.'",group:"'.$this->_group.'",case:"'.$this->_case.'",method:"'.$this->_method.'"}');
-        }
-    }
-    
-    /**
-     *    Stash the first error. Clicking the test
-     *    item goes to first error.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintError($message){
-        if (! $this->_fail && ! $this->_error){
-            $this->_error = true;
-            $this->_message = $this->escapeVal($message);
-            $this->_listener->write('{status:"error",message:"'.$this->_message.'",group:"'.$this->_group.'",case:"'.$this->_case.'",method:"'.$this->_method.'"}');
-        }
-    }
-    
-    
-    /**
-     *    Stash the first exception. Clicking the test
-     *    item goes to first message.
-     *    @param string $message    Test message, but we only wnat the first.
-     *    @access public
-     */
-    function paintException($exception){
-        if (! $this->_fail && ! $this->_error){
-            $this->_error = true;
-            $message = 'Unexpected exception of type[' . get_class($exception) .
-                    '] with message [' . $exception->getMessage() . '] in [' .
-                    $exception->getFile() .' line '. $exception->getLine() . ']';
-            $this->_message = $this->escapeVal($message);
-            $this->_listener->write(
-                    '{status:"error",message:"' . $this->_message . '",group:"' .
-                    $this->_group . '",case:"' . $this->_case . '",method:"' . $this->_method
-                    . '"}');
-        }
-    }
-    
-
-    /**
-     *    We don't display any special header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-    }
-
-    /**
-     *    We don't display any special footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-    }
-    
-    /**
-     *    Paints nothing at the start of a test method, but stash
-     *    the method name for later.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($method) {
-        $this->_pass = false;
-        $this->_fail = false;
-        $this->_error = false;
-        $this->_method = $this->escapeVal($method);
-    }
-        
-    /**
-     *    Only send one message if the test passes, after that
-     *    suppress the message.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintMethodEnd($method){   
-        if ($this->_fail || $this->_error || ! $this->_pass){
-        } else {
-            $this->_listener->write(
-                        '{status:"pass",message:"' . $this->_message . '",group:"' .
-                        $this->_group . '",case:"' . $this->_case . '",method:"' .
-                        $this->_method . '"}');
-        }
-    }
-    
-    /**
-     *    Stashes the test case name for the later failure message.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($case){
-        $this->_case = $this->escapeVal($case);
-    }
-    
-    /**
-     *    Drops the name.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($case){
-        $this->_case = "";
-    }
-    
-    /**
-     *    Stashes the name of the test suite. Starts test coverage
-     *    if enabled.
-     *    @param string $group     Name of test or other label.
-     *    @param integer $size     Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($group, $size){
-        $this->_group = $this->escapeVal($group);
-        if ($this->_cc){
-            if (extension_loaded('xdebug')){
-                xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE); 
-            }
-        }
-    }
-
-    /**
-     *    Paints coverage report if enabled.
-     *    @param string $group     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($group){
-        $this->_group = "";
-        $cc = "";
-        if ($this->_cc){
-            if (extension_loaded('xdebug')){
-                $arrfiles = xdebug_get_code_coverage();
-                xdebug_stop_code_coverage();
-                $thisdir = dirname(__FILE__);
-                $thisdirlen = strlen($thisdir);
-                foreach ($arrfiles as $index=>$file){
-                    if (substr($index, 0, $thisdirlen)===$thisdir){
-                        continue;
-                    }
-                    $lcnt = 0;
-                    $ccnt = 0;
-                    foreach ($file as $line){
-                        if ($line == -2){
-                            continue;
-                        }
-                        $lcnt++;
-                        if ($line==1){
-                            $ccnt++;
-                        }
-                    }
-                    if ($lcnt > 0){
-                        $cc .= round(($ccnt/$lcnt) * 100, 2) . '%';
-                    }else{
-                        $cc .= "0.00%";
-                    }
-                    $cc.= "\t". $index . "\n";
-                }
-            }
-        }
-        $this->_listener->write('{status:"coverage",message:"' .
-                                EclipseReporter::escapeVal($cc) . '"}');
-    }
-}
-
-/**
- *  Invoker decorator for Eclipse. Captures output until
- *  the end of the test.  
- *  @package    SimpleTest
- *  @subpackage Eclipse
- */
-class EclipseInvoker extends SimpleInvokerDecorator{
-    function EclipseInvoker(&$invoker, &$listener) {
-        $this->_listener = &$listener;
-        $this->SimpleInvokerDecorator($invoker);
-    }
-    
-    /**
-     *    Starts output buffering.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method){
-        ob_start();
-        $this->_invoker->before($method);
-    }
-
-    /**
-     *    Stops output buffering and send the captured output
-     *    to the listener.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->_invoker->after($method);
-        $output = ob_get_contents();
-        ob_end_clean();
-        if ($output !== ""){
-            $result = $this->_listener->write('{status:"info",message:"' .
-                                              EclipseReporter::escapeVal($output) . '"}');
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/encoding.php b/tests/simpletest/encoding.php
deleted file mode 100644
index 112fe3304..000000000
--- a/tests/simpletest/encoding.php
+++ /dev/null
@@ -1,552 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: encoding.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-    
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/socket.php');
-/**#@-*/
-
-/**
- *    Single post parameter.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEncodedPair {
-    var $_key;
-    var $_value;
-    
-    /**
-     *    Stashes the data for rendering later.
-     *    @param string $key       Form element name.
-     *    @param string $value     Data to send.
-     */
-    function SimpleEncodedPair($key, $value) {
-        $this->_key = $key;
-        $this->_value = $value;
-    }
-    
-    /**
-     *    The pair as a single string.
-     *    @return string        Encoded pair.
-     *    @access public
-     */
-    function asRequest() {
-        return urlencode($this->_key) . '=' . urlencode($this->_value);
-    }
-    
-    /**
-     *    The MIME part as a string.
-     *    @return string        MIME part encoding.
-     *    @access public
-     */
-    function asMime() {
-        $part = 'Content-Disposition: form-data; ';
-        $part .= "name=\"" . $this->_key . "\"\r\n";
-        $part .= "\r\n" . $this->_value;
-        return $part;
-    }
-    
-    /**
-     *    Is this the value we are looking for?
-     *    @param string $key    Identifier.
-     *    @return boolean       True if matched.
-     *    @access public
-     */
-    function isKey($key) {
-        return $key == $this->_key;
-    }
-    
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Identifier.
-     *    @access public
-     */
-    function getKey() {
-        return $this->_key;
-    }
-    
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Content.
-     *    @access public
-     */
-    function getValue() {
-        return $this->_value;
-    }
-}
-
-/**
- *    Single post parameter.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAttachment {
-    var $_key;
-    var $_content;
-    var $_filename;
-    
-    /**
-     *    Stashes the data for rendering later.
-     *    @param string $key          Key to add value to.
-     *    @param string $content      Raw data.
-     *    @param hash $filename       Original filename.
-     */
-    function SimpleAttachment($key, $content, $filename) {
-        $this->_key = $key;
-        $this->_content = $content;
-        $this->_filename = $filename;
-    }
-    
-    /**
-     *    The pair as a single string.
-     *    @return string        Encoded pair.
-     *    @access public
-     */
-    function asRequest() {
-        return '';
-    }
-    
-    /**
-     *    The MIME part as a string.
-     *    @return string        MIME part encoding.
-     *    @access public
-     */
-    function asMime() {
-        $part = 'Content-Disposition: form-data; ';
-        $part .= 'name="' . $this->_key . '"; ';
-        $part .= 'filename="' . $this->_filename . '"';
-        $part .= "\r\nContent-Type: " . $this->_deduceMimeType();
-        $part .= "\r\n\r\n" . $this->_content;
-        return $part;
-    }
-    
-    /**
-     *    Attempts to figure out the MIME type from the
-     *    file extension and the content.
-     *    @return string        MIME type.
-     *    @access private
-     */
-    function _deduceMimeType() {
-        if ($this->_isOnlyAscii($this->_content)) {
-            return 'text/plain';
-        }
-        return 'application/octet-stream';
-    }
-    
-    /**
-     *    Tests each character is in the range 0-127.
-     *    @param string $ascii    String to test.
-     *    @access private
-     */
-    function _isOnlyAscii($ascii) {
-        for ($i = 0, $length = strlen($ascii); $i < $length; $i++) {
-            if (ord($ascii[$i]) > 127) {
-                return false;
-            }
-        }
-        return true;
-    }
-    
-    /**
-     *    Is this the value we are looking for?
-     *    @param string $key    Identifier.
-     *    @return boolean       True if matched.
-     *    @access public
-     */
-    function isKey($key) {
-        return $key == $this->_key;
-    }
-    
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Identifier.
-     *    @access public
-     */
-    function getKey() {
-        return $this->_key;
-    }
-    
-    /**
-     *    Is this the value we are looking for?
-     *    @return string       Content.
-     *    @access public
-     */
-    function getValue() {
-        return $this->_filename;
-    }
-}
-
-/**
- *    Bundle of GET/POST parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleEncoding {
-    var $_request;
-    
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleEncoding($query = false) {
-        if (! $query) {
-            $query = array();
-        }
-        $this->clear();
-        $this->merge($query);
-    }
-    
-    /**
-     *    Empties the request of parameters.
-     *    @access public
-     */
-    function clear() {
-        $this->_request = array();
-    }
-    
-    /**
-     *    Adds a parameter to the query.
-     *    @param string $key            Key to add value to.
-     *    @param string/array $value    New data.
-     *    @access public
-     */
-    function add($key, $value) {
-        if ($value === false) {
-            return;
-        }
-        if (is_array($value)) {
-            foreach ($value as $item) {
-                $this->_addPair($key, $item);
-            }
-        } else {
-            $this->_addPair($key, $value);
-        }
-    }
-    
-    /**
-     *    Adds a new value into the request.
-     *    @param string $key            Key to add value to.
-     *    @param string/array $value    New data.
-     *    @access private
-     */
-    function _addPair($key, $value) {
-        $this->_request[] = new SimpleEncodedPair($key, $value);
-    }
-    
-    /**
-     *    Adds a MIME part to the query. Does nothing for a
-     *    form encoded packet.
-     *    @param string $key          Key to add value to.
-     *    @param string $content      Raw data.
-     *    @param hash $filename       Original filename.
-     *    @access public
-     */
-    function attach($key, $content, $filename) {
-        $this->_request[] = new SimpleAttachment($key, $content, $filename);
-    }
-    
-    /**
-     *    Adds a set of parameters to this query.
-     *    @param array/SimpleQueryString $query  Multiple values are
-     *                                           as lists on a single key.
-     *    @access public
-     */
-    function merge($query) {
-        if (is_object($query)) {
-            $this->_request = array_merge($this->_request, $query->getAll());
-        } elseif (is_array($query)) {
-            foreach ($query as $key => $value) {
-                $this->add($key, $value);
-            }
-        }
-    }
-    
-    /**
-     *    Accessor for single value.
-     *    @return string/array    False if missing, string
-     *                            if present and array if
-     *                            multiple entries.
-     *    @access public
-     */
-    function getValue($key) {
-        $values = array();
-        foreach ($this->_request as $pair) {
-            if ($pair->isKey($key)) {
-                $values[] = $pair->getValue();
-            }
-        }
-        if (count($values) == 0) {
-            return false;
-        } elseif (count($values) == 1) {
-            return $values[0];
-        } else {
-            return $values;
-        }
-    }
-    
-    /**
-     *    Accessor for listing of pairs.
-     *    @return array        All pair objects.
-     *    @access public
-     */
-    function getAll() {
-        return $this->_request;
-    }
-    
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part.
-     *    @return string        Part of URL.
-     *    @access protected
-     */
-    function _encode() {
-        $statements = array();
-        foreach ($this->_request as $pair) {
-            if ($statement = $pair->asRequest()) {
-                $statements[] = $statement;
-            }
-        }
-        return implode('&', $statements);
-    }
-}
-
-/**
- *    Bundle of GET parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleGetEncoding extends SimpleEncoding {
-    
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleGetEncoding($query = false) {
-        $this->SimpleEncoding($query);
-    }
-    
-    /**
-     *    HTTP request method.
-     *    @return string        Always GET.
-     *    @access public
-     */
-    function getMethod() {
-        return 'GET';
-    }
-    
-    /**
-     *    Writes no extra headers.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-    }
-    
-    /**
-     *    No data is sent to the socket as the data is encoded into
-     *    the URL.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-    }
-    
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part for attaching to a URL.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function asUrlRequest() {
-        return $this->_encode();
-    }
-}
-
-/**
- *    Bundle of URL parameters for a HEAD request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHeadEncoding extends SimpleGetEncoding {
-    
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleHeadEncoding($query = false) {
-        $this->SimpleGetEncoding($query);
-    }
-    
-    /**
-     *    HTTP request method.
-     *    @return string        Always HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return 'HEAD';
-    }
-}
-
-/**
- *    Bundle of POST parameters. Can include
- *    repeated parameters.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePostEncoding extends SimpleEncoding {
-    
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimplePostEncoding($query = false) {
-        if (is_array($query) and $this->hasMoreThanOneLevel($query)) {
-            $query = $this->rewriteArrayWithMultipleLevels($query);
-        }
-        $this->SimpleEncoding($query);
-    }
-    
-    function hasMoreThanOneLevel($query) {
-        foreach ($query as $key => $value) {
-            if (is_array($value)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function rewriteArrayWithMultipleLevels($query) {
-        $query_ = array();
-        foreach ($query as $key => $value) {
-            if (is_array($value)) {
-                foreach ($value as $sub_key => $sub_value) {
-                    $query_[$key."[".$sub_key."]"] = $sub_value;
-                }
-            } else {
-                $query_[$key] = $value;
-            }
-        }
-        if ($this->hasMoreThanOneLevel($query_)) {
-            $query_ = $this->rewriteArrayWithMultipleLevels($query_);
-        }
-        
-        return $query_;
-    }
-    
-    
-    /**
-     *    HTTP request method.
-     *    @return string        Always POST.
-     *    @access public
-     */
-    function getMethod() {
-        return 'POST';
-    }
-    
-    /**
-     *    Dispatches the form headers down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-        $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
-        $socket->write("Content-Type: application/x-www-form-urlencoded\r\n");
-    }
-    
-    /**
-     *    Dispatches the form data down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-        $socket->write($this->_encode());
-    }
-    
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part for attaching to a URL.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function asUrlRequest() {
-        return '';
-    }
-}
-
-/**
- *    Bundle of POST parameters in the multipart
- *    format. Can include file uploads.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleMultipartEncoding extends SimplePostEncoding {
-    var $_boundary;
-    
-    /**
-     *    Starts empty.
-     *    @param array $query       Hash of parameters.
-     *                              Multiple values are
-     *                              as lists on a single key.
-     *    @access public
-     */
-    function SimpleMultipartEncoding($query = false, $boundary = false) {
-        $this->SimplePostEncoding($query);
-        $this->_boundary = ($boundary === false ? uniqid('st') : $boundary);
-    }
-    
-    /**
-     *    Dispatches the form headers down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeHeadersTo(&$socket) {
-        $socket->write("Content-Length: " . (integer)strlen($this->_encode()) . "\r\n");
-        $socket->write("Content-Type: multipart/form-data, boundary=" . $this->_boundary . "\r\n");
-    }
-    
-    /**
-     *    Dispatches the form data down the socket.
-     *    @param SimpleSocket $socket        Socket to write to.
-     *    @access public
-     */
-    function writeTo(&$socket) {
-        $socket->write($this->_encode());
-    }
-    
-    /**
-     *    Renders the query string as a URL encoded
-     *    request part.
-     *    @return string        Part of URL.
-     *    @access public
-     */
-    function _encode() {
-        $stream = '';
-        foreach ($this->_request as $pair) {
-            $stream .= "--" . $this->_boundary . "\r\n";
-            $stream .= $pair->asMime() . "\r\n";
-        }
-        $stream .= "--" . $this->_boundary . "--\r\n";
-        return $stream;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/errors.php b/tests/simpletest/errors.php
deleted file mode 100644
index 5a0788511..000000000
--- a/tests/simpletest/errors.php
+++ /dev/null
@@ -1,288 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: errors.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**
- * @ignore - PHP5 compatibility fix.
- */
-if (! defined('E_STRICT')) {
-    define('E_STRICT', 2048);
-}
-
-/**#@+
- * Includes SimpleTest files.
- */
-require_once dirname(__FILE__) . '/invoker.php';
-require_once dirname(__FILE__) . '/test_case.php';
-require_once dirname(__FILE__) . '/expectation.php';
-/**#@-*/
-
-/**
- *    Extension that traps errors into an error queue.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleErrorTrappingInvoker extends SimpleInvokerDecorator {
-
-    /**
-     *    Stores the invoker to wrap.
-     *    @param SimpleInvoker $invoker  Test method runner.
-     */
-    function SimpleErrorTrappingInvoker(&$invoker) {
-        $this->SimpleInvokerDecorator($invoker);
-    }
-
-    /**
-     *    Invokes a test method and dispatches any
-     *    untrapped errors. Called back from
-     *    the visiting runner.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $queue = &$this->_createErrorQueue();
-        set_error_handler('SimpleTestErrorHandler');
-        parent::invoke($method);
-        restore_error_handler();
-        $queue->tally();
-    }
-    
-    /**
-     *    Wires up the error queue for a single test.
-     *    @return SimpleErrorQueue    Queue connected to the test.
-     *    @access private
-     */
-    function &_createErrorQueue() {
-        $context = &SimpleTest::getContext();
-        $test = &$this->getTestCase();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->setTestCase($test);
-        return $queue;
-    }
-}
-
-/**
- *    Error queue used to record trapped
- *    errors.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleErrorQueue {
-    var $_queue;
-    var $_expectation_queue;
-    var $_test;
-    var $_using_expect_style = false;
-
-    /**
-     *    Starts with an empty queue.
-     */
-    function SimpleErrorQueue() {
-        $this->clear();
-    }
-
-    /**
-     *    Discards the contents of the error queue.
-     *    @access public
-     */
-    function clear() {
-        $this->_queue = array();
-        $this->_expectation_queue = array();
-    }
-
-    /**
-     *    Sets the currently running test case.
-     *    @param SimpleTestCase $test    Test case to send messages to.
-     *    @access public
-     */
-    function setTestCase(&$test) {
-        $this->_test = &$test;
-    }
-
-    /**
-     *    Sets up an expectation of an error. If this is
-     *    not fulfilled at the end of the test, a failure
-     *    will occour. If the error does happen, then this
-     *    will cancel it out and send a pass message.
-     *    @param SimpleExpectation $expected    Expected error match.
-     *    @param string $message                Message to display.
-     *    @access public
-     */
-    function expectError($expected, $message) {
-        $this->_using_expect_style = true;
-        array_push($this->_expectation_queue, array($expected, $message));
-    }
-
-    /**
-     *    Adds an error to the front of the queue.
-     *    @param integer $severity       PHP error code.
-     *    @param string $content         Text of error.
-     *    @param string $filename        File error occoured in.
-     *    @param integer $line           Line number of error.
-     *    @access public
-     */
-    function add($severity, $content, $filename, $line) {
-        $content = str_replace('%', '%%', $content);
-        if ($this->_using_expect_style) {
-            $this->_testLatestError($severity, $content, $filename, $line);
-        } else {
-            array_push(
-                    $this->_queue,
-                    array($severity, $content, $filename, $line));
-        }
-    }
-    
-    /**
-     *    Any errors still in the queue are sent to the test
-     *    case. Any unfulfilled expectations trigger failures.
-     *    @access public
-     */
-    function tally() {
-        while (list($severity, $message, $file, $line) = $this->extract()) {
-            $severity = $this->getSeverityAsString($severity);
-            $this->_test->error($severity, $message, $file, $line);
-        }
-        while (list($expected, $message) = $this->_extractExpectation()) {
-            $this->_test->assert($expected, false, "%s -> Expected error not caught");
-        }
-    }
-
-    /**
-     *    Tests the error against the most recent expected
-     *    error.
-     *    @param integer $severity       PHP error code.
-     *    @param string $content         Text of error.
-     *    @param string $filename        File error occoured in.
-     *    @param integer $line           Line number of error.
-     *    @access private
-     */
-    function _testLatestError($severity, $content, $filename, $line) {
-        if ($expectation = $this->_extractExpectation()) {
-            list($expected, $message) = $expectation;
-            $this->_test->assert($expected, $content, sprintf(
-                    $message,
-                    "%s -> PHP error [$content] severity [" .
-                            $this->getSeverityAsString($severity) .
-                            "] in [$filename] line [$line]"));
-        } else {
-            $this->_test->error($severity, $content, $filename, $line);
-        }
-    }
-
-    /**
-     *    Pulls the earliest error from the queue.
-     *    @return  mixed    False if none, or a list of error
-     *                      information. Elements are: severity
-     *                      as the PHP error code, the error message,
-     *                      the file with the error, the line number
-     *                      and a list of PHP super global arrays.
-     *    @access public
-     */
-    function extract() {
-        if (count($this->_queue)) {
-            return array_shift($this->_queue);
-        }
-        return false;
-    }
-
-    /**
-     *    Pulls the earliest expectation from the queue.
-     *    @return     SimpleExpectation    False if none.
-     *    @access private
-     */
-    function _extractExpectation() {
-        if (count($this->_expectation_queue)) {
-            return array_shift($this->_expectation_queue);
-        }
-        return false;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoErrors($message) {
-        return $this->_test->assert(
-                new TrueExpectation(),
-                count($this->_queue) == 0,
-                sprintf($message, 'Should be no errors'));
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertError($expected, $message) {
-        if (count($this->_queue) == 0) {
-            $this->_test->fail(sprintf($message, 'Expected error not found'));
-            return false;
-        }
-        list($severity, $content, $file, $line) = $this->extract();
-        $severity = $this->getSeverityAsString($severity);
-        return $this->_test->assert(
-                $expected,
-                $content,
-                sprintf($message, "Expected PHP error [$content] severity [$severity] in [$file] line [$line]"));
-    }
-
-    /**
-     *    Converts an error code into it's string
-     *    representation.
-     *    @param $severity  PHP integer error code.
-     *    @return           String version of error code.
-     *    @access public
-     *    @static
-     */
-    function getSeverityAsString($severity) {
-        static $map = array(
-                E_STRICT => 'E_STRICT',
-                E_ERROR => 'E_ERROR',
-                E_WARNING => 'E_WARNING',
-                E_PARSE => 'E_PARSE',
-                E_NOTICE => 'E_NOTICE',
-                E_CORE_ERROR => 'E_CORE_ERROR',
-                E_CORE_WARNING => 'E_CORE_WARNING',
-                E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-                E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-                E_USER_ERROR => 'E_USER_ERROR',
-                E_USER_WARNING => 'E_USER_WARNING',
-                E_USER_NOTICE => 'E_USER_NOTICE');
-        if (defined('E_RECOVERABLE_ERROR')) {
-            $map[E_RECOVERABLE_ERROR] = 'E_RECOVERABLE_ERROR';
-        }
-        if (defined('E_DEPRECATED')) {
-            $map[E_DEPRECATED] = 'E_DEPRECATED';
-        }
-        return $map[$severity];
-    }
-}
-
-/**
- *    Error handler that simply stashes any errors into the global
- *    error queue. Simulates the existing behaviour with respect to
- *    logging errors, but this feature may be removed in future.
- *    @param $severity        PHP error code.
- *    @param $message         Text of error.
- *    @param $filename        File error occoured in.
- *    @param $line            Line number of error.
- *    @param $super_globals   Hash of PHP super global arrays.
- *    @static
- *    @access public
- */
-function SimpleTestErrorHandler($severity, $message, $filename = null, $line = null, $super_globals = null, $mask = null) {
-    $severity = $severity & error_reporting();
-    if ($severity) {
-        restore_error_handler();
-        if (ini_get('log_errors')) {
-            $label = SimpleErrorQueue::getSeverityAsString($severity);
-            error_log("$label: $message in $filename on line $line");
-        }
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->add($severity, $message, $filename, $line);
-        set_error_handler('SimpleTestErrorHandler');
-    }
-    return true;
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/exceptions.php b/tests/simpletest/exceptions.php
deleted file mode 100644
index c19a04e3a..000000000
--- a/tests/simpletest/exceptions.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: exceptions.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- * Include required SimpleTest files 
- */
-require_once dirname(__FILE__) . '/invoker.php';
-require_once dirname(__FILE__) . '/expectation.php';
-/**#@-*/
-
-/**
- *    Extension that traps exceptions and turns them into
- *    an error message. PHP5 only.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleExceptionTrappingInvoker extends SimpleInvokerDecorator {
-
-    /**
-     *    Stores the invoker to be wrapped.
-     *    @param SimpleInvoker $invoker   Test method runner.
-     */
-    function SimpleExceptionTrappingInvoker($invoker) {
-        $this->SimpleInvokerDecorator($invoker);
-    }
-
-    /**
-     *    Invokes a test method whilst trapping expected
-     *    exceptions. Any left over unthrown exceptions
-     *    are then reported as failures.
-     *    @param string $method    Test method to call.
-     */
-    function invoke($method) {
-        $trap = SimpleTest::getContext()->get('SimpleExceptionTrap');
-        $trap->clear();
-        try {
-            $has_thrown = false;
-            parent::invoke($method);
-        } catch (Exception $exception) {
-            $has_thrown = true;
-            if (! $trap->isExpected($this->getTestCase(), $exception)) {
-                $this->getTestCase()->exception($exception);
-            }
-            $trap->clear();
-        }
-        if ($message = $trap->getOutstanding()) {
-            $this->getTestCase()->fail($message);
-        }
-        if ($has_thrown) {
-            try {
-                parent::getTestCase()->tearDown();
-            } catch (Exception $e) { }
-        }
-    }
-}
-
-/**
- *    Tests exceptions either by type or the exact
- *    exception. This could be improved to accept
- *    a pattern expectation to test the error
- *    message, but that will have to come later.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ExceptionExpectation extends SimpleExpectation {
-    private $expected;
-
-    /**
-     *    Sets up the conditions to test against.
-     *    If the expected value is a string, then
-     *    it will act as a test of the class name.
-     *    An exception as the comparison will
-     *    trigger an identical match. Writing this
-     *    down now makes it look doubly dumb. I hope
-     *    come up with a better scheme later.
-     *    @param mixed $expected   A class name or an actual
-     *                             exception to compare with.
-     *    @param string $message   Message to display.
-     */
-    function __construct($expected, $message = '%s') {
-        $this->expected = $expected;
-        parent::__construct($message);
-    }
-
-    /**
-     *    Carry out the test.
-     *    @param Exception $compare    Value to check.
-     *    @return boolean              True if matched.
-     */
-    function test($compare) {
-        if (is_string($this->expected)) {
-            return ($compare instanceof $this->expected);
-        }
-        if (get_class($compare) != get_class($this->expected)) {
-            return false;
-        }
-        return $compare->getMessage() == $this->expected->getMessage();
-    }
-
-    /**
-     *    Create the message to display describing the test.
-     *    @param Exception $compare     Exception to match.
-     *    @return string                Final message.
-     */
-    function testMessage($compare) {
-        if (is_string($this->expected)) {
-            return "Exception [" . $this->describeException($compare) .
-                    "] should be type [" . $this->expected . "]";
-        }
-        return "Exception [" . $this->describeException($compare) .
-                "] should match [" .
-                $this->describeException($this->expected) . "]";
-    }
-
-    /**
-     *    Summary of an Exception object.
-     *    @param Exception $compare     Exception to describe.
-     *    @return string                Text description.
-     */
-    protected function describeException($exception) {
-        return get_class($exception) . ": " . $exception->getMessage();
-    }
-}
-
-/**
- *    Stores expected exceptions for when they
- *    get thrown. Saves the irritating try...catch
- *    block.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleExceptionTrap {
-    private $expected;
-    private $message;
-
-    /**
-     *    Clears down the queue ready for action.
-     */
-    function __construct() {
-        $this->clear();
-    }
-
-    /**
-     *    Sets up an expectation of an exception.
-     *    This has the effect of intercepting an
-     *    exception that matches.
-     *    @param SimpleExpectation $expected    Expected exception to match.
-     *    @param string $message                Message to display.
-     *    @access public
-     */
-    function expectException($expected = false, $message = '%s') {
-        if ($expected === false) {
-            $expected = new AnythingExpectation();
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new ExceptionExpectation($expected);
-        }
-        $this->expected = $expected;
-        $this->message = $message;
-    }
-
-    /**
-     *    Compares the expected exception with any
-     *    in the queue. Issues a pass or fail and
-     *    returns the state of the test.
-     *    @param SimpleTestCase $test    Test case to send messages to.
-     *    @param Exception $exception    Exception to compare.
-     *    @return boolean                False on no match.
-     */
-    function isExpected($test, $exception) {
-        if ($this->expected) {
-            return $test->assert($this->expected, $exception, $this->message);
-        }
-        return false;
-    }
-
-    /**
-     *    Tests for any left over exception.
-     *    @return string/false     The failure message or false if none.
-     */
-    function getOutstanding() {
-        return sprintf($this->message, 'Failed to trap exception');
-    }
-
-    /**
-     *    Discards the contents of the error queue.
-     */
-    function clear() {
-        $this->expected = false;
-        $this->message = false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/expectation.php b/tests/simpletest/expectation.php
deleted file mode 100644
index 194afd5c7..000000000
--- a/tests/simpletest/expectation.php
+++ /dev/null
@@ -1,895 +0,0 @@
-<?php
-/**
- *    base include file for SimpleTest
- *    @package    SimpleTest
- *    @subpackage    UnitTester
- *    @version    $Id: expectation.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *    include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Assertion that can display failure information.
- *    Also includes various helper methods.
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @abstract
- */
-class SimpleExpectation {
-    var $_dumper = false;
-    var $_message;
-
-    /**
-     *    Creates a dumper for displaying values and sets
-     *    the test message.
-     *    @param string $message    Customised message on failure.
-     */
-    function SimpleExpectation($message = '%s') {
-        $this->_message = $message;
-    }
-
-    /**
-     *    Tests the expectation. True if correct.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     *    @abstract
-     */
-    function test($compare) {
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     *    @abstract
-     */
-    function testMessage($compare) {
-    }
-
-    /**
-     *    Overlays the generated message onto the stored user
-     *    message. An additional message can be interjected.
-     *    @param mixed $compare        Comparison value.
-     *    @param SimpleDumper $dumper  For formatting the results.
-     *    @return string               Description of success
-     *                                 or failure.
-     *    @access public
-     */
-    function overlayMessage($compare, $dumper) {
-        $this->_dumper = $dumper;
-        return sprintf($this->_message, $this->testMessage($compare));
-    }
-
-    /**
-     *    Accessor for the dumper.
-     *    @return SimpleDumper    Current value dumper.
-     *    @access protected
-     */
-    function &_getDumper() {
-        if (! $this->_dumper) {
-            $dumper = &new SimpleDumper();
-            return $dumper;
-        }
-        return $this->_dumper;
-    }
-
-    /**
-     *    Test to see if a value is an expectation object.
-     *    A useful utility method.
-     *    @param mixed $expectation    Hopefully an Epectation
-     *                                 class.
-     *    @return boolean              True if descended from
-     *                                 this class.
-     *    @access public
-     *    @static
-     */
-    function isExpectation($expectation) {
-        return is_object($expectation) &&
-                SimpleTestCompatibility::isA($expectation, 'SimpleExpectation');
-    }
-}
-
-/**
- *    A wildcard expectation always matches.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class AnythingExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation. Always true.
-     *    @param mixed $compare  Ignored.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function test($compare) {
-        return true;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Anything always matches [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that never matches.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class FailedExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation. Always false.
-     *    @param mixed $compare  Ignored.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function test($compare) {
-        return false;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Failed expectation never matches [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that passes on boolean true.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class TrueExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation.
-     *    @param mixed $compare  Should be true.
-     *    @return boolean        True on match.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)$compare;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Expected true, got [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    An expectation that passes on boolean false.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class FalseExpectation extends SimpleExpectation {
-
-    /**
-     *    Tests the expectation.
-     *    @param mixed $compare  Should be false.
-     *    @return boolean        True on match.
-     *    @access public
-     */
-    function test($compare) {
-        return ! (boolean)$compare;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return 'Expected false, got [' . $dumper->describeValue($compare) . ']';
-    }
-}
-
-/**
- *    Test for equality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class EqualExpectation extends SimpleExpectation {
-    var $_value;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value        Test value to match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function EqualExpectation($value, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_value = $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (($this->_value == $compare) && ($compare == $this->_value));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return "Equal expectation [" . $this->_dumper->describeValue($this->_value) . "]";
-        } else {
-            return "Equal expectation fails " .
-                    $this->_dumper->describeDifference($this->_value, $compare);
-        }
-    }
-
-    /**
-     *    Accessor for comparison value.
-     *    @return mixed       Held value to compare with.
-     *    @access protected
-     */
-    function _getValue() {
-        return $this->_value;
-    }
-}
-
-/**
- *    Test for inequality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NotEqualExpectation extends EqualExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value       Test value to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NotEqualExpectation($value, $message = '%s') {
-        $this->EqualExpectation($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it differs from the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if ($this->test($compare)) {
-            return "Not equal expectation passes " .
-                    $dumper->describeDifference($this->_getValue(), $compare);
-        } else {
-            return "Not equal expectation fails [" .
-                    $dumper->describeValue($this->_getValue()) .
-                    "] matches";
-        }
-    }
-}
-
-/**
- *    Test for being within a range.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class WithinMarginExpectation extends SimpleExpectation {
-    var $_upper;
-    var $_lower;
-
-    /**
-     *    Sets the value to compare against and the fuzziness of
-     *    the match. Used for comparing floating point values.
-     *    @param mixed $value        Test value to match.
-     *    @param mixed $margin       Fuzziness of match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function WithinMarginExpectation($value, $margin, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_upper = $value + $margin;
-        $this->_lower = $value - $margin;
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (($compare <= $this->_upper) && ($compare >= $this->_lower));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->_withinMessage($compare);
-        } else {
-            return $this->_outsideMessage($compare);
-        }
-    }
-
-    /**
-     *    Creates a the message for being within the range.
-     *    @param mixed $compare        Value being tested.
-     *    @access private
-     */
-    function _withinMessage($compare) {
-        return "Within expectation [" . $this->_dumper->describeValue($this->_lower) . "] and [" .
-                $this->_dumper->describeValue($this->_upper) . "]";
-    }
-
-    /**
-     *    Creates a the message for being within the range.
-     *    @param mixed $compare        Value being tested.
-     *    @access private
-     */
-    function _outsideMessage($compare) {
-        if ($compare > $this->_upper) {
-            return "Outside expectation " .
-                    $this->_dumper->describeDifference($compare, $this->_upper);
-        } else {
-            return "Outside expectation " .
-                    $this->_dumper->describeDifference($compare, $this->_lower);
-        }
-    }
-}
-
-/**
- *    Test for being outside of a range.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class OutsideMarginExpectation extends WithinMarginExpectation {
-
-    /**
-     *    Sets the value to compare against and the fuzziness of
-     *    the match. Used for comparing floating point values.
-     *    @param mixed $value        Test value to not match.
-     *    @param mixed $margin       Fuzziness of match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function OutsideMarginExpectation($value, $margin, $message = '%s') {
-        $this->WithinMarginExpectation($value, $margin, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it matches the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if (! $this->test($compare)) {
-            return $this->_withinMessage($compare);
-        } else {
-            return $this->_outsideMessage($compare);
-        }
-    }
-}
-
-/**
- *    Test for reference.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ReferenceExpectation extends SimpleExpectation {
-    var $_value;
-
-    /**
-     *    Sets the reference value to compare against.
-     *    @param mixed $value       Test reference to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function ReferenceExpectation(&$value, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_value =& $value;
-    }
-
-    /**
-     *    Tests the expectation. True if it exactly
-     *    references the held value.
-     *    @param mixed $compare        Comparison reference.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test(&$compare) {
-        return SimpleTestCompatibility::isReference($this->_value, $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return "Reference expectation [" . $this->_dumper->describeValue($this->_value) . "]";
-        } else {
-            return "Reference expectation fails " .
-                    $this->_dumper->describeDifference($this->_value, $compare);
-        }
-    }
-
-    function _getValue() {
-        return $this->_value;
-    }
-}
-
-/**
- *    Test for identity.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class IdenticalExpectation extends EqualExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value       Test value to match.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function IdenticalExpectation($value, $message = '%s') {
-        $this->EqualExpectation($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it exactly
-     *    matches the held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return SimpleTestCompatibility::isIdentical($this->_getValue(), $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if ($this->test($compare)) {
-            return "Identical expectation [" . $dumper->describeValue($this->_getValue()) . "]";
-        } else {
-            return "Identical expectation [" . $dumper->describeValue($this->_getValue()) .
-                    "] fails with [" .
-                    $dumper->describeValue($compare) . "] " .
-                    $dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
-        }
-    }
-}
-
-/**
- *    Test for non-identity.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NotIdenticalExpectation extends IdenticalExpectation {
-
-    /**
-     *    Sets the value to compare against.
-     *    @param mixed $value        Test value to match.
-     *    @param string $message     Customised message on failure.
-     *    @access public
-     */
-    function NotIdenticalExpectation($value, $message = '%s') {
-        $this->IdenticalExpectation($value, $message);
-    }
-
-    /**
-     *    Tests the expectation. True if it differs from the
-     *    held value.
-     *    @param mixed $compare        Comparison value.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if ($this->test($compare)) {
-            return "Not identical expectation passes " .
-                    $dumper->describeDifference($this->_getValue(), $compare, TYPE_MATTERS);
-        } else {
-            return "Not identical expectation [" . $dumper->describeValue($this->_getValue()) . "] matches";
-        }
-    }
-}
-
-/**
- *    Test for a pattern using Perl regex rules.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class PatternExpectation extends SimpleExpectation {
-    var $_pattern;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $pattern    Pattern to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function PatternExpectation($pattern, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_pattern = $pattern;
-    }
-
-    /**
-     *    Accessor for the pattern.
-     *    @return string       Perl regex as string.
-     *    @access protected
-     */
-    function _getPattern() {
-        return $this->_pattern;
-    }
-
-    /**
-     *    Tests the expectation. True if the Perl regex
-     *    matches the comparison value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)preg_match($this->_getPattern(), $compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->_describePatternMatch($this->_getPattern(), $compare);
-        } else {
-            $dumper = &$this->_getDumper();
-            return "Pattern [" . $this->_getPattern() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        }
-    }
-
-    /**
-     *    Describes a pattern match including the string
-     *    found and it's position.
-     *    @param string $pattern        Regex to match against.
-     *    @param string $subject        Subject to search.
-     *    @access protected
-     */
-    function _describePatternMatch($pattern, $subject) {
-        preg_match($pattern, $subject, $matches);
-        $position = strpos($subject, $matches[0]);
-        $dumper = $this->_getDumper();
-        return "Pattern [$pattern] detected at character [$position] in [" .
-                $dumper->describeValue($subject) . "] as [" .
-                $matches[0] . "] in region [" .
-                $dumper->clipString($subject, 100, $position) . "]";
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @deprecated
- */
-class WantedPatternExpectation extends PatternExpectation {
-}
-
-/**
- *    Fail if a pattern is detected within the
- *    comparison.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoPatternExpectation extends PatternExpectation {
-
-    /**
-     *    Sets the reject pattern
-     *    @param string $pattern    Pattern to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NoPatternExpectation($pattern, $message = '%s') {
-        $this->PatternExpectation($pattern, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the Perl regex
-     *    matches the comparison value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param string $compare      Comparison value.
-     *    @return string              Description of success
-     *                                or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            $dumper = &$this->_getDumper();
-            return "Pattern [" . $this->_getPattern() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        } else {
-            return $this->_describePatternMatch($this->_getPattern(), $compare);
-        }
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage UnitTester
- *      @deprecated
- */
-class UnwantedPatternExpectation extends NoPatternExpectation {
-}
-
-/**
- *    Tests either type or class name if it's an object.
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class IsAExpectation extends SimpleExpectation {
-    var $_type;
-
-    /**
-     *    Sets the type to compare with.
-     *    @param string $type       Type or class name.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function IsAExpectation($type, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_type = $type;
-    }
-
-    /**
-     *    Accessor for type to check against.
-     *    @return string    Type or class name.
-     *    @access protected
-     */
-    function _getType() {
-        return $this->_type;
-    }
-
-    /**
-     *    Tests the expectation. True if the type or
-     *    class matches the string value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        if (is_object($compare)) {
-            return SimpleTestCompatibility::isA($compare, $this->_type);
-        } else {
-            return (strtolower(gettype($compare)) == $this->_canonicalType($this->_type));
-        }
-    }
-
-    /**
-     *    Coerces type name into a gettype() match.
-     *    @param string $type        User type.
-     *    @return string             Simpler type.
-     *    @access private
-     */
-    function _canonicalType($type) {
-        $type = strtolower($type);
-        $map = array(
-                'bool' => 'boolean',
-                'float' => 'double',
-                'real' => 'double',
-                'int' => 'integer');
-        if (isset($map[$type])) {
-            $type = $map[$type];
-        }
-        return $type;
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return "Value [" . $dumper->describeValue($compare) .
-                "] should be type [" . $this->_type . "]";
-    }
-}
-
-/**
- *    Tests either type or class name if it's an object.
- *    Will succeed if the type does not match.
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class NotAExpectation extends IsAExpectation {
-    var $_type;
-
-    /**
-     *    Sets the type to compare with.
-     *    @param string $type       Type or class name.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NotAExpectation($type, $message = '%s') {
-        $this->IsAExpectation($type, $message);
-    }
-
-    /**
-     *    Tests the expectation. False if the type or
-     *    class matches the string value.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if different.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        return "Value [" . $dumper->describeValue($compare) .
-                "] should not be type [" . $this->_getType() . "]";
-    }
-}
-
-/**
- *    Tests for existance of a method in an object
- *      @package SimpleTest
- *      @subpackage UnitTester
- */
-class MethodExistsExpectation extends SimpleExpectation {
-    var $_method;
-
-    /**
-     *    Sets the value to compare against.
-     *    @param string $method     Method to check.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     *    @return void
-     */
-    function MethodExistsExpectation($method, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_method = &$method;
-    }
-
-    /**
-     *    Tests the expectation. True if the method exists in the test object.
-     *    @param string $compare        Comparison method name.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (boolean)(is_object($compare) && method_exists($compare, $this->_method));
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if (! is_object($compare)) {
-            return 'No method on non-object [' . $dumper->describeValue($compare) . ']';
-        }
-        $method = $this->_method;
-        return "Object [" . $dumper->describeValue($compare) .
-                "] should contain method [$method]";
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/extensions/pear_test_case.php b/tests/simpletest/extensions/pear_test_case.php
deleted file mode 100644
index f5e5a7b85..000000000
--- a/tests/simpletest/extensions/pear_test_case.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php
-    /**
-     *	adapter for SimpleTest to use PEAR PHPUnit test cases
-     *	@package	SimpleTest
-     *	@subpackage Extensions
-     *	@version	$Id: pear_test_case.php 1388 2006-11-10 20:59:59Z lastcraft $
-     */
-    
-    /**#@+
-     * include SimpleTest files
-     */
-    require_once(dirname(__FILE__) . '/../dumper.php');
-    require_once(dirname(__FILE__) . '/../compatibility.php');
-    require_once(dirname(__FILE__) . '/../test_case.php');
-    require_once(dirname(__FILE__) . '/../expectation.php');
-	/**#@-*/
-   
-    /**
-     *    Adapter for PEAR PHPUnit test case to allow
-     *    legacy PEAR test cases to be used with SimpleTest.
-     *    @package      SimpleTest
-     *    @subpackage   Extensions
-     */
-    class PHPUnit_TestCase extends SimpleTestCase {
-        var $_loosely_typed;
-        
-        /**
-         *    Constructor. Sets the test name.
-         *    @param $label        Test name to display.
-         *    @public
-         */
-        function PHPUnit_TestCase($label = false) {
-            $this->SimpleTestCase($label);
-            $this->_loosely_typed = false;
-        }
-        
-        /**
-         *    Will test straight equality if set to loose
-         *    typing, or identity if not.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEquals($first, $second, $message = "%s", $delta = 0) {
-            if ($this->_loosely_typed) {
-                $expectation = &new EqualExpectation($first);
-            } else {
-                $expectation = &new IdenticalExpectation($first);
-            }
-            $this->assert($expectation, $second, $message);
-        }
-        
-        /**
-         *    Passes if the value tested is not null.
-         *    @param $value          Value to test against.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNotNull($value, $message = "%s") {
-            parent::assert(new TrueExpectation(), isset($value), $message);
-        }
-        
-        /**
-         *    Passes if the value tested is null.
-         *    @param $value          Value to test against.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNull($value, $message = "%s") {
-            parent::assert(new TrueExpectation(), !isset($value), $message);
-        }
-        
-        /**
-         *    In PHP5 the identity test tests for the same
-         *    object. This is a reference test in PHP4.
-         *    @param $first          First object handle.
-         *    @param $second         Hopefully the same handle.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertSame(&$first, &$second, $message = "%s") {
-            $dumper = &new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should reference the same object");
-            return $this->assert(
-					new TrueExpectation(),
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
-        
-        /**
-         *    In PHP5 the identity test tests for the same
-         *    object. This is a reference test in PHP4.
-         *    @param $first          First object handle.
-         *    @param $second         Hopefully a different handle.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertNotSame(&$first, &$second, $message = "%s") {
-            $dumper = &new SimpleDumper();
-            $message = sprintf(
-                    $message,
-                    "[" . $dumper->describeValue($first) .
-                            "] and [" . $dumper->describeValue($second) .
-                            "] should not be the same object");
-            return $this->assert(
-					new falseExpectation(),
-                    SimpleTestCompatibility::isReference($first, $second),
-                    $message);
-        }
-        
-        /**
-         *    Sends pass if the test condition resolves true,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test true.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertTrue($condition, $message = "%s") {
-            parent::assert(new TrueExpectation(), $condition, $message);
-        }
-        
-        /**
-         *    Sends pass if the test condition resolves false,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test false.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertFalse($condition, $message = "%s") {
-            parent::assert(new FalseExpectation(), $condition, $message);
-        }
-        
-        /**
-         *    Tests a regex match. Needs refactoring.
-         *    @param $pattern        Regex to match.
-         *    @param $subject        String to search in.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertRegExp($pattern, $subject, $message = "%s") {
-            $this->assert(new PatternExpectation($pattern), $subject, $message);
-        }
-        
-        /**
-         *    Tests the type of a value.
-         *    @param $value          Value to take type of.
-         *    @param $type           Hoped for type.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertType($value, $type, $message = "%s") {
-            parent::assert(new TrueExpectation(), gettype($value) == strtolower($type), $message);
-        }
-        
-        /**
-         *    Sets equality operation to act as a simple equal
-         *    comparison only, allowing a broader range of
-         *    matches.
-         *    @param $loosely_typed     True for broader comparison.
-         *    @public
-         */
-        function setLooselyTyped($loosely_typed) {
-            $this->_loosely_typed = $loosely_typed;
-        }
-
-        /**
-         *    For progress indication during
-         *    a test amongst other things.
-         *    @return            Usually one.
-         *    @public
-         */
-        function countTestCases() {
-            return $this->getSize();
-        }
-        
-        /**
-         *    Accessor for name, normally just the class
-         *    name.
-         *    @public
-         */
-        function getName() {
-            return $this->getLabel();
-        }
-        
-        /**
-         *    Does nothing. For compatibility only.
-         *    @param $name        Dummy
-         *    @public
-         */
-        function setName($name) {
-        }
-    }
-?>
diff --git a/tests/simpletest/extensions/phpunit_test_case.php b/tests/simpletest/extensions/phpunit_test_case.php
deleted file mode 100644
index e038a4967..000000000
--- a/tests/simpletest/extensions/phpunit_test_case.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-    /**
-     *	adapter for SimpleTest to use PHPUnit test cases
-     *	@package	SimpleTest
-     *	@subpackage Extensions
-     *	@version	$Id: phpunit_test_case.php 1530 2007-06-04 23:35:45Z lastcraft $
-     */
-    
-    /**#@+
-     * include SimpleTest files
-     */
-    require_once(dirname(__FILE__) . '/../unit_tester.php');
-    require_once(dirname(__FILE__) . '/../expectation.php');
-    /**#@-*/
-    
-    /**
-     *    Adapter for sourceforge PHPUnit test case to allow
-     *    legacy test cases to be used with SimpleTest.
-     *    @package		SimpleTest
-     *    @subpackage	Extensions
-     */
-    class TestCase extends SimpleTestCase {
-        
-        /**
-         *    Constructor. Sets the test name.
-         *    @param $label        Test name to display.
-         *    @public
-         */
-        function TestCase($label = false) {
-            $this->SimpleTestCase($label);
-        }
-        
-        /**
-         *    Sends pass if the test condition resolves true,
-         *    a fail otherwise.
-         *    @param $condition      Condition to test true.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assert($condition, $message = false) {
-            parent::assert(new TrueExpectation(), $condition, $message);
-        }
-        
-        /**
-         *    Will test straight equality if set to loose
-         *    typing, or identity if not.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEquals($first, $second, $message = false) {
-            parent::assert(new EqualExpectation($first), $second, $message);
-        }
-        
-        /**
-         *    Simple string equality.
-         *    @param $first          First value.
-         *    @param $second         Comparison value.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertEqualsMultilineStrings($first, $second, $message = false) {
-            parent::assert(new EqualExpectation($first), $second, $message);
-        }                             
-        
-        /**
-         *    Tests a regex match.
-         *    @param $pattern        Regex to match.
-         *    @param $subject        String to search in.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function assertRegexp($pattern, $subject, $message = false) {
-            parent::assert(new PatternExpectation($pattern), $subject, $message);
-        }
-        
-        /**
-         *    Sends an error which we interpret as a fail
-         *    with a different message for compatibility.
-         *    @param $message        Message to display.
-         *    @public
-         */
-        function error($message) {
-            parent::fail("Error triggered [$message]");
-        }
-         
-        /**
-         *    Accessor for name.
-         *    @public
-         */
-       function name() {
-            return $this->getLabel();
-        }
-    }
-?>
diff --git a/tests/simpletest/extensions/testdox.php b/tests/simpletest/extensions/testdox.php
deleted file mode 100644
index 7db7c872c..000000000
--- a/tests/simpletest/extensions/testdox.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-class TestDoxReporter extends SimpleReporter
-{
-    var $_test_case_pattern = '/^TestOf(.*)$/';
-
-    function TestDoxReporter($test_case_pattern = '/^TestOf(.*)$/') {
-        parent::SimpleScorer();
-        $this->_test_case_pattern = empty($test_case_pattern) ? '/^(.*)$/' : $test_case_pattern;
-    }
-
-    function paintCaseStart($test_name) {
-        preg_match($this->_test_case_pattern, $test_name, $matches);
-        if (!empty($matches[1])) {
-            echo $matches[1] . "\n";
-        } else {
-            echo $test_name . "\n";
-        }
-    }
-
-    function paintCaseEnd() {
-        echo "\n";
-    }
-
-    function paintMethodStart($test_name) {
-        if (!preg_match('/^test(.*)$/i', $test_name, $matches)) {
-            return;
-        }
-        $test_name = $matches[1];
-
-        $test_name = preg_replace('/([A-Z])([A-Z])/', '$1 $2', $test_name);
-        echo '- ' . strtolower(preg_replace('/([a-zA-Z])([A-Z0-9])/', '$1 $2', $test_name));
-    }
-
-    function paintMethodEnd() {
-        echo "\n";
-    }
-
-    function paintFail() {
-        echo " [FAILED]";
-    }
-}
diff --git a/tests/simpletest/extensions/testdox/test.php b/tests/simpletest/extensions/testdox/test.php
deleted file mode 100644
index 82c5b7da8..000000000
--- a/tests/simpletest/extensions/testdox/test.php
+++ /dev/null
@@ -1,108 +0,0 @@
-<?php
-// $Id: test.php 1641 2008-01-22 20:13:52Z pp11 $
-require_once dirname(__FILE__) . '/../../autorun.php';
-require_once dirname(__FILE__) . '/../testdox.php';
-
-// uncomment to see test dox in action
-//SimpleTest::prefer(new TestDoxReporter());
-
-class TestOfTestDoxReporter extends UnitTestCase
-{
-    function testIsAnInstanceOfSimpleScorerAndReporter() {
-        $dox = new TestDoxReporter();
-        $this->assertIsA($dox, 'SimpleScorer');
-        $this->assertIsA($dox, 'SimpleReporter');
-    }
-
-    function testOutputsNameOfTestCase() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintCaseStart('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertWantedPattern('/^TestDoxReporter/', $buffer);
-    }
-
-    function testOutputOfTestCaseNameFilteredByConstructParameter() {
-        $dox = new TestDoxReporter('/^(.*)Test$/');
-        ob_start();
-        $dox->paintCaseStart('SomeGreatWidgetTest');
-        $buffer = ob_get_clean();
-        $this->assertWantedPattern('/^SomeGreatWidget/', $buffer);
-    }
-
-    function testIfTest_case_patternIsEmptyAssumeEverythingMatches() {
-        $dox = new TestDoxReporter('');
-        ob_start();
-        $dox->paintCaseStart('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertWantedPattern('/^TestOfTestDoxReporter/', $buffer);
-    }
-
-    function testEmptyLineInsertedWhenCaseEnds() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintCaseEnd('TestOfTestDoxReporter');
-        $buffer = ob_get_clean();
-        $this->assertEqual("\n", $buffer);
-    }
-
-    function testPaintsTestMethodInTestDoxFormat() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('testSomeGreatTestCase');
-        $buffer = ob_get_clean();
-        $this->assertEqual("- some great test case", $buffer);
-        unset($buffer);
-
-        $random = rand(100, 200);
-        ob_start();
-        $dox->paintMethodStart("testRandomNumberIs{$random}");
-        $buffer = ob_get_clean();
-        $this->assertEqual("- random number is {$random}", $buffer);
-    }
-
-    function testDoesNotOutputAnythingOnNoneTestMethods() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('nonMatchingMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual('', $buffer);
-    }
-
-    function testPaintMethodAddLineBreak() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodEnd('someMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual("\n", $buffer);
-        $this->assertNoErrors();
-    }
-
-    function testProperlySpacesSingleLettersInMethodName() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('testAVerySimpleAgainAVerySimpleMethod');
-        $buffer = ob_get_clean();
-        $this->assertEqual('- a very simple again a very simple method', $buffer);
-    }
-
-    function testOnFailureThisPrintsFailureNotice() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintFail();
-        $buffer = ob_get_clean();
-        $this->assertEqual(' [FAILED]', $buffer);
-    }
-
-    function testWhenMatchingMethodNamesTestPrefixIsCaseInsensitive() {
-        $dox = new TestDoxReporter();
-        ob_start();
-        $dox->paintMethodStart('TESTSupportsAllUppercaseTestPrefixEvenThoughIDoNotKnowWhyYouWouldDoThat');
-        $buffer = ob_get_clean();
-        $this->assertEqual(
-            '- supports all uppercase test prefix even though i do not know why you would do that',
-            $buffer
-        );
-    }
-}
-
diff --git a/tests/simpletest/form.php b/tests/simpletest/form.php
deleted file mode 100644
index cbef6636d..000000000
--- a/tests/simpletest/form.php
+++ /dev/null
@@ -1,355 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: form.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-    
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/selector.php');
-/**#@-*/
-
-/**
- *    Form tag class to hold widget values.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleForm {
-    var $_method;
-    var $_action;
-    var $_encoding;
-    var $_default_target;
-    var $_id;
-    var $_buttons;
-    var $_images;
-    var $_widgets;
-    var $_radios;
-    var $_checkboxes;
-    
-    /**
-     *    Starts with no held controls/widgets.
-     *    @param SimpleTag $tag        Form tag to read.
-     *    @param SimplePage $page      Holding page.
-     */
-    function SimpleForm($tag, &$page) {
-        $this->_method = $tag->getAttribute('method');
-        $this->_action = $this->_createAction($tag->getAttribute('action'), $page);
-        $this->_encoding = $this->_setEncodingClass($tag);
-        $this->_default_target = false;
-        $this->_id = $tag->getAttribute('id');
-        $this->_buttons = array();
-        $this->_images = array();
-        $this->_widgets = array();
-        $this->_radios = array();
-        $this->_checkboxes = array();
-    }
-    
-    /**
-     *    Creates the request packet to be sent by the form.
-     *    @param SimpleTag $tag        Form tag to read.
-     *    @return string               Packet class.
-     *    @access private
-     */
-    function _setEncodingClass($tag) {
-        if (strtolower($tag->getAttribute('method')) == 'post') {
-            if (strtolower($tag->getAttribute('enctype')) == 'multipart/form-data') {
-                return 'SimpleMultipartEncoding';
-            }
-            return 'SimplePostEncoding';
-        }
-        return 'SimpleGetEncoding';
-    }
-    
-    /**
-     *    Sets the frame target within a frameset.
-     *    @param string $frame        Name of frame.
-     *    @access public
-     */
-    function setDefaultTarget($frame) {
-        $this->_default_target = $frame;
-    }
-    
-    /**
-     *    Accessor for method of form submission.
-     *    @return string           Either get or post.
-     *    @access public
-     */
-    function getMethod() {
-        return ($this->_method ? strtolower($this->_method) : 'get');
-    }
-    
-    /**
-     *    Combined action attribute with current location
-     *    to get an absolute form target.
-     *    @param string $action    Action attribute from form tag.
-     *    @param SimpleUrl $base   Page location.
-     *    @return SimpleUrl        Absolute form target.
-     */
-    function _createAction($action, &$page) {
-        if (($action === '') || ($action === false)) {
-            return $page->expandUrl($page->getUrl());
-        }
-        return $page->expandUrl(new SimpleUrl($action));;
-    }
-    
-    /**
-     *    Absolute URL of the target.
-     *    @return SimpleUrl           URL target.
-     *    @access public
-     */
-    function getAction() {
-        $url = $this->_action;
-        if ($this->_default_target && ! $url->getTarget()) {
-            $url->setTarget($this->_default_target);
-        }
-        return $url;
-    }
-    
-    /**
-     *    Creates the encoding for the current values in the
-     *    form.
-     *    @return SimpleFormEncoding    Request to submit.
-     *    @access private
-     */
-    function _encode() {
-        $class = $this->_encoding;
-        $encoding = new $class();
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            $this->_widgets[$i]->write($encoding);
-        }
-        return $encoding;
-    }
-            
-    /**
-     *    ID field of form for unique identification.
-     *    @return string           Unique tag ID.
-     *    @access public
-     */
-    function getId() {
-        return $this->_id;
-    }
-    
-    /**
-     *    Adds a tag contents to the form.
-     *    @param SimpleWidget $tag        Input tag to add.
-     *    @access public
-     */
-    function addWidget(&$tag) {
-        if (strtolower($tag->getAttribute('type')) == 'submit') {
-            $this->_buttons[] = &$tag;
-        } elseif (strtolower($tag->getAttribute('type')) == 'image') {
-            $this->_images[] = &$tag;
-        } elseif ($tag->getName()) {
-            $this->_setWidget($tag);
-        }
-    }
-    
-    /**
-     *    Sets the widget into the form, grouping radio
-     *    buttons if any.
-     *    @param SimpleWidget $tag   Incoming form control.
-     *    @access private
-     */
-    function _setWidget(&$tag) {
-        if (strtolower($tag->getAttribute('type')) == 'radio') {
-            $this->_addRadioButton($tag);
-        } elseif (strtolower($tag->getAttribute('type')) == 'checkbox') {
-            $this->_addCheckbox($tag);
-        } else {
-            $this->_widgets[] = &$tag;
-        }
-    }
-    
-    /**
-     *    Adds a radio button, building a group if necessary.
-     *    @param SimpleRadioButtonTag $tag   Incoming form control.
-     *    @access private
-     */
-    function _addRadioButton(&$tag) {
-        if (! isset($this->_radios[$tag->getName()])) {
-            $this->_widgets[] = &new SimpleRadioGroup();
-            $this->_radios[$tag->getName()] = count($this->_widgets) - 1;
-        }
-        $this->_widgets[$this->_radios[$tag->getName()]]->addWidget($tag);
-    }
-    
-    /**
-     *    Adds a checkbox, making it a group on a repeated name.
-     *    @param SimpleCheckboxTag $tag   Incoming form control.
-     *    @access private
-     */
-    function _addCheckbox(&$tag) {
-        if (! isset($this->_checkboxes[$tag->getName()])) {
-            $this->_widgets[] = &$tag;
-            $this->_checkboxes[$tag->getName()] = count($this->_widgets) - 1;
-        } else {
-            $index = $this->_checkboxes[$tag->getName()];
-            if (! SimpleTestCompatibility::isA($this->_widgets[$index], 'SimpleCheckboxGroup')) {
-                $previous = &$this->_widgets[$index];
-                $this->_widgets[$index] = &new SimpleCheckboxGroup();
-                $this->_widgets[$index]->addWidget($previous);
-            }
-            $this->_widgets[$index]->addWidget($tag);
-        }
-    }
-    
-    /**
-     *    Extracts current value from form.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return string/array              Value(s) as string or null
-     *                                      if not set.
-     *    @access public
-     */
-    function getValue($selector) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->_widgets[$i])) {
-                return $this->_widgets[$i]->getValue();
-            }
-        }
-        foreach ($this->_buttons as $button) {
-            if ($selector->isMatch($button)) {
-                return $button->getValue();
-            }
-        }
-        return null;
-    }
-    
-    /**
-     *    Sets a widget value within the form.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param string $value              Value to input into the widget.
-     *    @return boolean                   True if value is legal, false
-     *                                      otherwise. If the field is not
-     *                                      present, nothing will be set.
-     *    @access public
-     */
-    function setField($selector, $value, $position=false) {
-        $success = false;
-        $_position = 0;
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->_widgets[$i])) {
-                $_position++;
-                if ($position === false or $_position === (int)$position) {
-                    if ($this->_widgets[$i]->setValue($value)) {
-                        $success = true;
-                    }
-                }
-            }
-        }
-        return $success;
-    }
-    
-    /**
-     *    Used by the page object to set widgets labels to
-     *    external label tags.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @access public
-     */
-    function attachLabelBySelector($selector, $label) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($selector->isMatch($this->_widgets[$i])) {
-                if (method_exists($this->_widgets[$i], 'setLabel')) {
-                    $this->_widgets[$i]->setLabel($label);
-                    return;
-                }
-            }
-        }
-    }
-    
-    /**
-     *    Test to see if a form has a submit button.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return boolean                   True if present.
-     *    @access public
-     */
-    function hasSubmit($selector) {
-        foreach ($this->_buttons as $button) {
-            if ($selector->isMatch($button)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Test to see if a form has an image control.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @return boolean                   True if present.
-     *    @access public
-     */
-    function hasImage($selector) {
-        foreach ($this->_images as $image) {
-            if ($selector->isMatch($image)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Gets the submit values for a selected button.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param hash $additional           Additional data for the form.
-     *    @return SimpleEncoding            Submitted values or false
-     *                                      if there is no such button
-     *                                      in the form.
-     *    @access public
-     */
-    function submitButton($selector, $additional = false) {
-        $additional = $additional ? $additional : array();
-        foreach ($this->_buttons as $button) {
-            if ($selector->isMatch($button)) {
-                $encoding = $this->_encode();
-                $button->write($encoding);
-                if ($additional) {
-                    $encoding->merge($additional);
-                }
-                return $encoding;           
-            }
-        }
-        return false;
-    }
-        
-    /**
-     *    Gets the submit values for an image.
-     *    @param SimpleSelector $selector   Criteria to apply.
-     *    @param integer $x                 X-coordinate of click.
-     *    @param integer $y                 Y-coordinate of click.
-     *    @param hash $additional           Additional data for the form.
-     *    @return SimpleEncoding            Submitted values or false
-     *                                      if there is no such button in the
-     *                                      form.
-     *    @access public
-     */
-    function submitImage($selector, $x, $y, $additional = false) {
-        $additional = $additional ? $additional : array();
-        foreach ($this->_images as $image) {
-            if ($selector->isMatch($image)) {
-                $encoding = $this->_encode();
-                $image->write($encoding, $x, $y);
-                if ($additional) {
-                    $encoding->merge($additional);
-                }
-                return $encoding;           
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Simply submits the form without the submit button
-     *    value. Used when there is only one button or it
-     *    is unimportant.
-     *    @return hash           Submitted values.
-     *    @access public
-     */
-    function submit() {
-        return $this->_encode();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/frames.php b/tests/simpletest/frames.php
deleted file mode 100644
index ec098df9e..000000000
--- a/tests/simpletest/frames.php
+++ /dev/null
@@ -1,596 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: frames.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/user_agent.php');
-/**#@-*/
-
-/**
- *    A composite page. Wraps a frameset page and
- *    adds subframes. The original page will be
- *    mostly ignored. Implements the SimplePage
- *    interface so as to be interchangeable.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFrameset {
-    var $_frameset;
-    var $_frames;
-    var $_focus;
-    var $_names;
-
-    /**
-     *    Stashes the frameset page. Will make use of the
-     *    browser to fetch the sub frames recursively.
-     *    @param SimplePage $page        Frameset page.
-     */
-    function SimpleFrameset(&$page) {
-        $this->_frameset = &$page;
-        $this->_frames = array();
-        $this->_focus = false;
-        $this->_names = array();
-    }
-
-    /**
-     *    Adds a parsed page to the frameset.
-     *    @param SimplePage $page    Frame page.
-     *    @param string $name        Name of frame in frameset.
-     *    @access public
-     */
-    function addFrame(&$page, $name = false) {
-        $this->_frames[] = &$page;
-        if ($name) {
-            $this->_names[$name] = count($this->_frames) - 1;
-        }
-    }
-
-    /**
-     *    Replaces existing frame with another. If the
-     *    frame is nested, then the call is passed down
-     *    one level.
-     *    @param array $path        Path of frame in frameset.
-     *    @param SimplePage $page   Frame source.
-     *    @access public
-     */
-    function setFrame($path, &$page) {
-        $name = array_shift($path);
-        if (isset($this->_names[$name])) {
-            $index = $this->_names[$name];
-        } else {
-            $index = $name - 1;
-        }
-        if (count($path) == 0) {
-            $this->_frames[$index] = &$page;
-            return;
-        }
-        $this->_frames[$index]->setFrame($path, $page);
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus. Will have the nested
-     *    frame focus if any.
-     *    @return array     Labels or indexes of nested frames.
-     *    @access public
-     */
-    function getFrameFocus() {
-        if ($this->_focus === false) {
-            return array();
-        }
-        return array_merge(
-                array($this->_getPublicNameFromIndex($this->_focus)),
-                $this->_frames[$this->_focus]->getFrameFocus());
-    }
-
-    /**
-     *    Turns an internal array index into the frames list
-     *    into a public name, or if none, then a one offset
-     *    index.
-     *    @param integer $subject    Internal index.
-     *    @return integer/string     Public name.
-     *    @access private
-     */
-    function _getPublicNameFromIndex($subject) {
-        foreach ($this->_names as $name => $index) {
-            if ($subject == $index) {
-                return $name;
-            }
-        }
-        return $subject + 1;
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    If already focused and the target frame also has frames,
-     *    then the nested frame will be focused.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        if (is_integer($this->_focus)) {
-            if ($this->_frames[$this->_focus]->hasFrames()) {
-                return $this->_frames[$this->_focus]->setFrameFocusByIndex($choice);
-            }
-        }
-        if (($choice < 1) || ($choice > count($this->_frames))) {
-            return false;
-        }
-        $this->_focus = $choice - 1;
-        return true;
-    }
-
-    /**
-     *    Sets the focus by name. If already focused and the
-     *    target frame also has frames, then the nested frame
-     *    will be focused.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        if (is_integer($this->_focus)) {
-            if ($this->_frames[$this->_focus]->hasFrames()) {
-                return $this->_frames[$this->_focus]->setFrameFocus($name);
-            }
-        }
-        if (in_array($name, array_keys($this->_names))) {
-            $this->_focus = $this->_names[$name];
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     *    Clears the frame focus.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        $this->_focus = false;
-        $this->_clearNestedFramesFocus();
-    }
-
-    /**
-     *    Clears the frame focus for any nested frames.
-     *    @access private
-     */
-    function _clearNestedFramesFocus() {
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $this->_frames[$i]->clearFrameFocus();
-        }
-    }
-
-    /**
-     *    Test for the presence of a frameset.
-     *    @return boolean        Always true.
-     *    @access public
-     */
-    function hasFrames() {
-        return true;
-    }
-
-    /**
-     *    Accessor for frames information.
-     *    @return array/string      Recursive hash of frame URL strings.
-     *                              The key is either a numerical
-     *                              index or the name attribute.
-     *    @access public
-     */
-    function getFrames() {
-        $report = array();
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $report[$this->_getPublicNameFromIndex($i)] =
-                    $this->_frames[$i]->getFrames();
-        }
-        return $report;
-    }
-
-    /**
-     *    Accessor for raw text of either all the pages or
-     *    the frame in focus.
-     *    @return string        Raw unparsed content.
-     *    @access public
-     */
-    function getRaw() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRaw();
-        }
-        $raw = '';
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $raw .= $this->_frames[$i]->getRaw();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for plain text of either all the pages or
-     *    the frame in focus.
-     *    @return string        Plain text content.
-     *    @access public
-     */
-    function getText() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getText();
-        }
-        $raw = '';
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $raw .= ' ' . $this->_frames[$i]->getText();
-        }
-        return trim($raw);
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getTransportError();
-        }
-        return $this->_frameset->getTransportError();
-    }
-
-    /**
-     *    Request method used to fetch this frame.
-     *    @return string      GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getMethod();
-        }
-        return $this->_frameset->getMethod();
-    }
-
-    /**
-     *    Original resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        if (is_integer($this->_focus)) {
-            $url = $this->_frames[$this->_focus]->getUrl();
-            $url->setTarget($this->_getPublicNameFromIndex($this->_focus));
-        } else {
-            $url = $this->_frameset->getUrl();
-        }
-        return $url;
-    }
-
-    /**
-     *    Page base URL.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getBaseUrl() {
-        if (is_integer($this->_focus)) {
-            $url = $this->_frames[$this->_focus]->getBaseUrl();
-        } else {
-            $url = $this->_frameset->getBaseUrl();
-        }
-        return $url;
-    }
-
-    /**
-     *    Expands expandomatic URLs into fully qualified
-     *    URLs for the frameset page.
-     *    @param SimpleUrl $url        Relative URL.
-     *    @return SimpleUrl            Absolute URL.
-     *    @access public
-     */
-    function expandUrl($url) {
-        return $this->_frameset->expandUrl($url);
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRequestData();
-        }
-        return $this->_frameset->getRequestData();
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getMimeType();
-        }
-        return $this->_frameset->getMimeType();
-    }
-
-    /**
-     *    Accessor for last response code.
-     *    @return integer    Last HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getResponseCode();
-        }
-        return $this->_frameset->getResponseCode();
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getAuthentication();
-        }
-        return $this->_frameset->getAuthentication();
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRealm();
-        }
-        return $this->_frameset->getRealm();
-    }
-
-    /**
-     *    Accessor for outgoing header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getRequest() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getRequest();
-        }
-        return $this->_frameset->getRequest();
-    }
-
-    /**
-     *    Accessor for raw header information.
-     *    @return string      Header block.
-     *    @access public
-     */
-    function getHeaders() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getHeaders();
-        }
-        return $this->_frameset->getHeaders();
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        return $this->_frameset->getTitle();
-    }
-
-    /**
-     *    Accessor for a list of all fixed links.
-     *    @return array   List of urls as strings.
-     *    @access public
-     */
-    function getUrls() {
-        if (is_integer($this->_focus)) {
-            return $this->_frames[$this->_focus]->getUrls();
-        }
-        $urls = array();
-        foreach ($this->_frames as $frame) {
-            $urls = array_merge($urls, $frame->getUrls());
-        }
-        return array_values(array_unique($urls));
-    }
-
-    /**
-     *    Accessor for URLs by the link label. Label will match
-     *    regardess of whitespace issues and case.
-     *    @param string $label    Text of link.
-     *    @return array           List of links with that label.
-     *    @access public
-     */
-    function getUrlsByLabel($label) {
-        if (is_integer($this->_focus)) {
-            return $this->_tagUrlsWithFrame(
-                    $this->_frames[$this->_focus]->getUrlsByLabel($label),
-                    $this->_focus);
-        }
-        $urls = array();
-        foreach ($this->_frames as $index => $frame) {
-            $urls = array_merge(
-                    $urls,
-                    $this->_tagUrlsWithFrame(
-                                $frame->getUrlsByLabel($label),
-                                $index));
-        }
-        return $urls;
-    }
-
-    /**
-     *    Accessor for a URL by the id attribute. If in a frameset
-     *    then the first link found with that ID attribute is
-     *    returned only. Focus on a frame if you want one from
-     *    a specific part of the frameset.
-     *    @param string $id       Id attribute of link.
-     *    @return string          URL with that id.
-     *    @access public
-     */
-    function getUrlById($id) {
-        foreach ($this->_frames as $index => $frame) {
-            if ($url = $frame->getUrlById($id)) {
-                if (! $url->gettarget()) {
-                    $url->setTarget($this->_getPublicNameFromIndex($index));
-                }
-                return $url;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Attaches the intended frame index to a list of URLs.
-     *    @param array $urls        List of SimpleUrls.
-     *    @param string $frame      Name of frame or index.
-     *    @return array             List of tagged URLs.
-     *    @access private
-     */
-    function _tagUrlsWithFrame($urls, $frame) {
-        $tagged = array();
-        foreach ($urls as $url) {
-            if (! $url->getTarget()) {
-                $url->setTarget($this->_getPublicNameFromIndex($frame));
-            }
-            $tagged[] = $url;
-        }
-        return $tagged;
-    }
-
-    /**
-     *    Finds a held form by button label. Will only
-     *    search correctly built forms.
-     *    @param SimpleSelector $selector       Button finder.
-     *    @return SimpleForm                    Form object containing
-     *                                          the button.
-     *    @access public
-     */
-    function &getFormBySubmit($selector) {
-        $form = &$this->_findForm('getFormBySubmit', $selector);
-        return $form;
-    }
-
-    /**
-     *    Finds a held form by image using a selector.
-     *    Will only search correctly built forms. The first
-     *    form found either within the focused frame, or
-     *    across frames, will be the one returned.
-     *    @param SimpleSelector $selector  Image finder.
-     *    @return SimpleForm               Form object containing
-     *                                     the image.
-     *    @access public
-     */
-    function &getFormByImage($selector) {
-        $form = &$this->_findForm('getFormByImage', $selector);
-        return $form;
-    }
-
-    /**
-     *    Finds a held form by the form ID. A way of
-     *    identifying a specific form when we have control
-     *    of the HTML code. The first form found
-     *    either within the focused frame, or across frames,
-     *    will be the one returned.
-     *    @param string $id     Form label.
-     *    @return SimpleForm    Form object containing the matching ID.
-     *    @access public
-     */
-    function &getFormById($id) {
-        $form = &$this->_findForm('getFormById', $id);
-        return $form;
-    }
-
-    /**
-        *    General form finder. Will search all the frames or
-        *    just the one in focus.
-        *    @param string $method    Method to use to find in a page.
-        *    @param string $attribute Label, name or ID.
-        *    @return SimpleForm    Form object containing the matching ID.
-        *    @access private
-        */
-    function &_findForm($method, $attribute) {
-        if (is_integer($this->_focus)) {
-            $form = &$this->_findFormInFrame(
-                    $this->_frames[$this->_focus],
-                    $this->_focus,
-                    $method,
-                    $attribute);
-            return $form;
-        }
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $form = &$this->_findFormInFrame(
-                    $this->_frames[$i],
-                    $i,
-                    $method,
-                    $attribute);
-            if ($form) {
-                return $form;
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a form in a page using a form finding method. Will
-     *    also tag the form with the frame name it belongs in.
-     *    @param SimplePage $page  Page content of frame.
-     *    @param integer $index    Internal frame representation.
-     *    @param string $method    Method to use to find in a page.
-     *    @param string $attribute Label, name or ID.
-     *    @return SimpleForm       Form object containing the matching ID.
-     *    @access private
-     */
-    function &_findFormInFrame(&$page, $index, $method, $attribute) {
-        $form = &$this->_frames[$index]->$method($attribute);
-        if (isset($form)) {
-            $form->setDefaultTarget($this->_getPublicNameFromIndex($index));
-        }
-        return $form;
-    }
-
-    /**
-     *    Sets a field on each form in which the field is
-     *    available.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @param string $value               Value to set field to.
-     *    @return boolean                    True if value is valid.
-     *    @access public
-     */
-    function setField($selector, $value) {
-        if (is_integer($this->_focus)) {
-            $this->_frames[$this->_focus]->setField($selector, $value);
-        } else {
-            for ($i = 0; $i < count($this->_frames); $i++) {
-                $this->_frames[$i]->setField($selector, $value);
-            }
-        }
-    }
-
-    /**
-     *    Accessor for a form element value within a page.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @return string/boolean             A string if the field is
-     *                                       present, false if unchecked
-     *                                       and null if missing.
-     *    @access public
-     */
-    function getField($selector) {
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $value = $this->_frames[$i]->getField($selector);
-            if (isset($value)) {
-                return $value;
-            }
-        }
-        return null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/http.php b/tests/simpletest/http.php
deleted file mode 100644
index e6c6e89da..000000000
--- a/tests/simpletest/http.php
+++ /dev/null
@@ -1,624 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: http.php 1722 2008-04-07 19:30:56Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/socket.php');
-require_once(dirname(__FILE__) . '/cookies.php');
-require_once(dirname(__FILE__) . '/url.php');
-/**#@-*/
-
-/**
- *    Creates HTTP headers for the end point of
- *    a HTTP request.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRoute {
-    var $_url;
-    
-    /**
-     *    Sets the target URL.
-     *    @param SimpleUrl $url   URL as object.
-     *    @access public
-     */
-    function SimpleRoute($url) {
-        $this->_url = $url;
-    }
-    
-    /**
-     *    Resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access protected
-     */
-    function getUrl() {
-        return $this->_url;
-    }
-    
-    /**
-     *    Creates the first line which is the actual request.
-     *    @param string $method   HTTP request method, usually GET.
-     *    @return string          Request line content.
-     *    @access protected
-     */
-    function _getRequestLine($method) {
-        return $method . ' ' . $this->_url->getPath() .
-                $this->_url->getEncodedRequest() . ' HTTP/1.0';
-    }
-    
-    /**
-     *    Creates the host part of the request.
-     *    @return string          Host line content.
-     *    @access protected
-     */
-    function _getHostLine() {
-        $line = 'Host: ' . $this->_url->getHost();
-        if ($this->_url->getPort()) {
-            $line .= ':' . $this->_url->getPort();
-        }
-        return $line;
-    }
-    
-    /**
-     *    Opens a socket to the route.
-     *    @param string $method      HTTP request method, usually GET.
-     *    @param integer $timeout    Connection timeout.
-     *    @return SimpleSocket       New socket.
-     *    @access public
-     */
-    function &createConnection($method, $timeout) {
-        $default_port = ('https' == $this->_url->getScheme()) ? 443 : 80;
-        $socket = &$this->_createSocket(
-                $this->_url->getScheme() ? $this->_url->getScheme() : 'http',
-                $this->_url->getHost(),
-                $this->_url->getPort() ? $this->_url->getPort() : $default_port,
-                $timeout);
-        if (! $socket->isError()) {
-            $socket->write($this->_getRequestLine($method) . "\r\n");
-            $socket->write($this->_getHostLine() . "\r\n");
-            $socket->write("Connection: close\r\n");
-        }
-        return $socket;
-    }
-    
-    /**
-     *    Factory for socket.
-     *    @param string $scheme                   Protocol to use.
-     *    @param string $host                     Hostname to connect to.
-     *    @param integer $port                    Remote port.
-     *    @param integer $timeout                 Connection timeout.
-     *    @return SimpleSocket/SimpleSecureSocket New socket.
-     *    @access protected
-     */
-    function &_createSocket($scheme, $host, $port, $timeout) {
-        if (in_array($scheme, array('https'))) {
-            $socket = &new SimpleSecureSocket($host, $port, $timeout);
-        } else {
-            $socket = &new SimpleSocket($host, $port, $timeout);
-        }
-        return $socket;
-    }
-}
-
-/**
- *    Creates HTTP headers for the end point of
- *    a HTTP request via a proxy server.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleProxyRoute extends SimpleRoute {
-    var $_proxy;
-    var $_username;
-    var $_password;
-    
-    /**
-     *    Stashes the proxy address.
-     *    @param SimpleUrl $url     URL as object.
-     *    @param string $proxy      Proxy URL.
-     *    @param string $username   Username for autentication.
-     *    @param string $password   Password for autentication.
-     *    @access public
-     */
-    function SimpleProxyRoute($url, $proxy, $username = false, $password = false) {
-        $this->SimpleRoute($url);
-        $this->_proxy = $proxy;
-        $this->_username = $username;
-        $this->_password = $password;
-    }
-    
-    /**
-     *    Creates the first line which is the actual request.
-     *    @param string $method   HTTP request method, usually GET.
-     *    @param SimpleUrl $url   URL as object.
-     *    @return string          Request line content.
-     *    @access protected
-     */
-    function _getRequestLine($method) {
-        $url = $this->getUrl();
-        $scheme = $url->getScheme() ? $url->getScheme() : 'http';
-        $port = $url->getPort() ? ':' . $url->getPort() : '';
-        return $method . ' ' . $scheme . '://' . $url->getHost() . $port .
-                $url->getPath() . $url->getEncodedRequest() . ' HTTP/1.0';
-    }
-    
-    /**
-     *    Creates the host part of the request.
-     *    @param SimpleUrl $url   URL as object.
-     *    @return string          Host line content.
-     *    @access protected
-     */
-    function _getHostLine() {
-        $host = 'Host: ' . $this->_proxy->getHost();
-        $port = $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080;
-        return "$host:$port";
-    }
-    
-    /**
-     *    Opens a socket to the route.
-     *    @param string $method       HTTP request method, usually GET.
-     *    @param integer $timeout     Connection timeout.
-     *    @return SimpleSocket        New socket.
-     *    @access public
-     */
-    function &createConnection($method, $timeout) {
-        $socket = &$this->_createSocket(
-                $this->_proxy->getScheme() ? $this->_proxy->getScheme() : 'http',
-                $this->_proxy->getHost(),
-                $this->_proxy->getPort() ? $this->_proxy->getPort() : 8080,
-                $timeout);
-        if ($socket->isError()) {
-            return $socket;
-        }
-        $socket->write($this->_getRequestLine($method) . "\r\n");
-        $socket->write($this->_getHostLine() . "\r\n");
-        if ($this->_username && $this->_password) {
-            $socket->write('Proxy-Authorization: Basic ' .
-                    base64_encode($this->_username . ':' . $this->_password) .
-                    "\r\n");
-        }
-        $socket->write("Connection: close\r\n");
-        return $socket;
-    }
-}
-
-/**
- *    HTTP request for a web page. Factory for
- *    HttpResponse object.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpRequest {
-    var $_route;
-    var $_encoding;
-    var $_headers;
-    var $_cookies;
-    
-    /**
-     *    Builds the socket request from the different pieces.
-     *    These include proxy information, URL, cookies, headers,
-     *    request method and choice of encoding.
-     *    @param SimpleRoute $route              Request route.
-     *    @param SimpleFormEncoding $encoding    Content to send with
-     *                                           request.
-     *    @access public
-     */
-    function SimpleHttpRequest(&$route, $encoding) {
-        $this->_route = &$route;
-        $this->_encoding = $encoding;
-        $this->_headers = array();
-        $this->_cookies = array();
-    }
-    
-    /**
-     *    Dispatches the content to the route's socket.
-     *    @param integer $timeout      Connection timeout.
-     *    @return SimpleHttpResponse   A response which may only have
-     *                                 an error, but hopefully has a
-     *                                 complete web page.
-     *    @access public
-     */
-    function &fetch($timeout) {
-        $socket = &$this->_route->createConnection($this->_encoding->getMethod(), $timeout);
-        if (! $socket->isError()) {
-            $this->_dispatchRequest($socket, $this->_encoding);
-        }
-        $response = &$this->_createResponse($socket);
-        return $response;
-    }
-    
-    /**
-     *    Sends the headers.
-     *    @param SimpleSocket $socket           Open socket.
-     *    @param string $method                 HTTP request method,
-     *                                          usually GET.
-     *    @param SimpleFormEncoding $encoding   Content to send with request.
-     *    @access private
-     */
-    function _dispatchRequest(&$socket, $encoding) {
-        foreach ($this->_headers as $header_line) {
-            $socket->write($header_line . "\r\n");
-        }
-        if (count($this->_cookies) > 0) {
-            $socket->write("Cookie: " . implode(";", $this->_cookies) . "\r\n");
-        }
-        $encoding->writeHeadersTo($socket);
-        $socket->write("\r\n");
-        $encoding->writeTo($socket);
-    }
-    
-    /**
-     *    Adds a header line to the request.
-     *    @param string $header_line    Text of full header line.
-     *    @access public
-     */
-    function addHeaderLine($header_line) {
-        $this->_headers[] = $header_line;
-    }
-    
-    /**
-     *    Reads all the relevant cookies from the
-     *    cookie jar.
-     *    @param SimpleCookieJar $jar     Jar to read
-     *    @param SimpleUrl $url           Url to use for scope.
-     *    @access public
-     */
-    function readCookiesFromJar($jar, $url) {
-        $this->_cookies = $jar->selectAsPairs($url);
-    }
-    
-    /**
-     *    Wraps the socket in a response parser.
-     *    @param SimpleSocket $socket   Responding socket.
-     *    @return SimpleHttpResponse    Parsed response object.
-     *    @access protected
-     */
-    function &_createResponse(&$socket) {
-        $response = &new SimpleHttpResponse(
-                $socket,
-                $this->_route->getUrl(),
-                $this->_encoding);
-        return $response;
-    }
-}
-
-/**
- *    Collection of header lines in the response.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpHeaders {
-    var $_raw_headers;
-    var $_response_code;
-    var $_http_version;
-    var $_mime_type;
-    var $_location;
-    var $_cookies;
-    var $_authentication;
-    var $_realm;
-    
-    /**
-     *    Parses the incoming header block.
-     *    @param string $headers     Header block.
-     *    @access public
-     */
-    function SimpleHttpHeaders($headers) {
-        $this->_raw_headers = $headers;
-        $this->_response_code = false;
-        $this->_http_version = false;
-        $this->_mime_type = '';
-        $this->_location = false;
-        $this->_cookies = array();
-        $this->_authentication = false;
-        $this->_realm = false;
-        foreach (split("\r\n", $headers) as $header_line) {
-            $this->_parseHeaderLine($header_line);
-        }
-    }
-    
-    /**
-     *    Accessor for parsed HTTP protocol version.
-     *    @return integer           HTTP error code.
-     *    @access public
-     */
-    function getHttpVersion() {
-        return $this->_http_version;
-    }
-    
-    /**
-     *    Accessor for raw header block.
-     *    @return string        All headers as raw string.
-     *    @access public
-     */
-    function getRaw() {
-        return $this->_raw_headers;
-    }
-    
-    /**
-     *    Accessor for parsed HTTP error code.
-     *    @return integer           HTTP error code.
-     *    @access public
-     */
-    function getResponseCode() {
-        return (integer)$this->_response_code;
-    }
-    
-    /**
-     *    Returns the redirected URL or false if
-     *    no redirection.
-     *    @return string      URL or false for none.
-     *    @access public
-     */
-    function getLocation() {
-        return $this->_location;
-    }
-    
-    /**
-     *    Test to see if the response is a valid redirect.
-     *    @return boolean       True if valid redirect.
-     *    @access public
-     */
-    function isRedirect() {
-        return in_array($this->_response_code, array(301, 302, 303, 307)) &&
-                (boolean)$this->getLocation();
-    }
-    
-    /**
-     *    Test to see if the response is an authentication
-     *    challenge.
-     *    @return boolean       True if challenge.
-     *    @access public
-     */
-    function isChallenge() {
-        return ($this->_response_code == 401) &&
-                (boolean)$this->_authentication &&
-                (boolean)$this->_realm;
-    }
-    
-    /**
-     *    Accessor for MIME type header information.
-     *    @return string           MIME type.
-     *    @access public
-     */
-    function getMimeType() {
-        return $this->_mime_type;
-    }
-    
-    /**
-     *    Accessor for authentication type.
-     *    @return string        Type.
-     *    @access public
-     */
-    function getAuthentication() {
-        return $this->_authentication;
-    }
-    
-    /**
-     *    Accessor for security realm.
-     *    @return string        Realm.
-     *    @access public
-     */
-    function getRealm() {
-        return $this->_realm;
-    }
-    
-    /**
-     *    Writes new cookies to the cookie jar.
-     *    @param SimpleCookieJar $jar   Jar to write to.
-     *    @param SimpleUrl $url         Host and path to write under.
-     *    @access public
-     */
-    function writeCookiesToJar(&$jar, $url) {
-        foreach ($this->_cookies as $cookie) {
-            $jar->setCookie(
-                    $cookie->getName(),
-                    $cookie->getValue(),
-                    $url->getHost(),
-                    $cookie->getPath(),
-                    $cookie->getExpiry());
-        }
-    }
-
-    /**
-     *    Called on each header line to accumulate the held
-     *    data within the class.
-     *    @param string $header_line        One line of header.
-     *    @access protected
-     */
-    function _parseHeaderLine($header_line) {
-        if (preg_match('/HTTP\/(\d+\.\d+)\s+(\d+)/i', $header_line, $matches)) {
-            $this->_http_version = $matches[1];
-            $this->_response_code = $matches[2];
-        }
-        if (preg_match('/Content-type:\s*(.*)/i', $header_line, $matches)) {
-            $this->_mime_type = trim($matches[1]);
-        }
-        if (preg_match('/Location:\s*(.*)/i', $header_line, $matches)) {
-            $this->_location = trim($matches[1]);
-        }
-        if (preg_match('/Set-cookie:(.*)/i', $header_line, $matches)) {
-            $this->_cookies[] = $this->_parseCookie($matches[1]);
-        }
-        if (preg_match('/WWW-Authenticate:\s+(\S+)\s+realm=\"(.*?)\"/i', $header_line, $matches)) {
-            $this->_authentication = $matches[1];
-            $this->_realm = trim($matches[2]);
-        }
-    }
-    
-    /**
-     *    Parse the Set-cookie content.
-     *    @param string $cookie_line    Text after "Set-cookie:"
-     *    @return SimpleCookie          New cookie object.
-     *    @access private
-     */
-    function _parseCookie($cookie_line) {
-        $parts = split(";", $cookie_line);
-        $cookie = array();
-        preg_match('/\s*(.*?)\s*=(.*)/', array_shift($parts), $cookie);
-        foreach ($parts as $part) {
-            if (preg_match('/\s*(.*?)\s*=(.*)/', $part, $matches)) {
-                $cookie[$matches[1]] = trim($matches[2]);
-            }
-        }
-        return new SimpleCookie(
-                $cookie[1],
-                trim($cookie[2]),
-                isset($cookie["path"]) ? $cookie["path"] : "",
-                isset($cookie["expires"]) ? $cookie["expires"] : false);
-    }
-}
-
-/**
- *    Basic HTTP response.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHttpResponse extends SimpleStickyError {
-    var $_url;
-    var $_encoding;
-    var $_sent;
-    var $_content;
-    var $_headers;
-    
-    /**
-     *    Constructor. Reads and parses the incoming
-     *    content and headers.
-     *    @param SimpleSocket $socket   Network connection to fetch
-     *                                  response text from.
-     *    @param SimpleUrl $url         Resource name.
-     *    @param mixed $encoding        Record of content sent.
-     *    @access public
-     */
-    function SimpleHttpResponse(&$socket, $url, $encoding) {
-        $this->SimpleStickyError();
-        $this->_url = $url;
-        $this->_encoding = $encoding;
-        $this->_sent = $socket->getSent();
-        $this->_content = false;
-        $raw = $this->_readAll($socket);
-        if ($socket->isError()) {
-            $this->_setError('Error reading socket [' . $socket->getError() . ']');
-            return;
-        }
-        $this->_parse($raw);
-    }
-    
-    /**
-     *    Splits up the headers and the rest of the content.
-     *    @param string $raw    Content to parse.
-     *    @access private
-     */
-    function _parse($raw) {
-        if (! $raw) {
-            $this->_setError('Nothing fetched');
-            $this->_headers = &new SimpleHttpHeaders('');
-        } elseif (! strstr($raw, "\r\n\r\n")) {
-            $this->_setError('Could not split headers from content');
-            $this->_headers = &new SimpleHttpHeaders($raw);
-        } else {
-            list($headers, $this->_content) = split("\r\n\r\n", $raw, 2);
-            $this->_headers = &new SimpleHttpHeaders($headers);
-        }
-    }
-    
-    /**
-     *    Original request method.
-     *    @return string        GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return $this->_encoding->getMethod();
-    }
-    
-    /**
-     *    Resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->_url;
-    }
-    
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        return $this->_encoding;
-    }
-    
-    /**
-     *    Raw request that was sent down the wire.
-     *    @return string        Bytes actually sent.
-     *    @access public
-     */
-    function getSent() {
-        return $this->_sent;
-    }
-    
-    /**
-     *    Accessor for the content after the last
-     *    header line.
-     *    @return string           All content.
-     *    @access public
-     */
-    function getContent() {
-        return $this->_content;
-    }
-    
-    /**
-     *    Accessor for header block. The response is the
-     *    combination of this and the content.
-     *    @return SimpleHeaders        Wrapped header block.
-     *    @access public
-     */
-    function getHeaders() {
-        return $this->_headers;
-    }
-    
-    /**
-     *    Accessor for any new cookies.
-     *    @return array       List of new cookies.
-     *    @access public
-     */
-    function getNewCookies() {
-        return $this->_headers->getNewCookies();
-    }
-    
-    /**
-     *    Reads the whole of the socket output into a
-     *    single string.
-     *    @param SimpleSocket $socket  Unread socket.
-     *    @return string               Raw output if successful
-     *                                 else false.
-     *    @access private
-     */
-    function _readAll(&$socket) {
-        $all = '';
-        while (! $this->_isLastPacket($next = $socket->read())) {
-            $all .= $next;
-        }
-        return $all;
-    }
-    
-    /**
-     *    Test to see if the packet from the socket is the
-     *    last one.
-     *    @param string $packet    Chunk to interpret.
-     *    @return boolean          True if empty or EOF.
-     *    @access private
-     */
-    function _isLastPacket($packet) {
-        if (is_string($packet)) {
-            return $packet === '';
-        }
-        return ! $packet;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/invoker.php b/tests/simpletest/invoker.php
deleted file mode 100644
index e2730013e..000000000
--- a/tests/simpletest/invoker.php
+++ /dev/null
@@ -1,139 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: invoker.php 1722 2008-04-07 19:30:56Z lastcraft $
- */
-
-/**#@+
- * Includes SimpleTest files and defined the root constant
- * for dependent libraries.
- */
-require_once(dirname(__FILE__) . '/errors.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-if (! defined('SIMPLE_TEST')) {
-    define('SIMPLE_TEST', dirname(__FILE__) . '/');
-}
-/**#@-*/
-
-/**
- *    This is called by the class runner to run a
- *    single test method. Will also run the setUp()
- *    and tearDown() methods.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleInvoker {
-    var $_test_case;
-
-    /**
-     *    Stashes the test case for later.
-     *    @param SimpleTestCase $test_case  Test case to run.
-     */
-    function SimpleInvoker(&$test_case) {
-        $this->_test_case = &$test_case;
-    }
-
-    /**
-     *    Accessor for test case being run.
-     *    @return SimpleTestCase    Test case.
-     *    @access public
-     */
-    function &getTestCase() {
-        return $this->_test_case;
-    }
-
-    /**
-     *    Runs test level set up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method) {
-        $this->_test_case->before($method);
-    }
-
-    /**
-     *    Invokes a test method and buffered with setUp()
-     *    and tearDown() calls.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $this->_test_case->setUp();
-        $this->_test_case->$method();
-        $this->_test_case->tearDown();
-    }
-
-    /**
-     *    Runs test level clean up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->_test_case->after($method);
-    }
-}
-
-/**
- *    Do nothing decorator. Just passes the invocation
- *    straight through.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleInvokerDecorator {
-    var $_invoker;
-
-    /**
-     *    Stores the invoker to wrap.
-     *    @param SimpleInvoker $invoker  Test method runner.
-     */
-    function SimpleInvokerDecorator(&$invoker) {
-        $this->_invoker = &$invoker;
-    }
-
-    /**
-     *    Accessor for test case being run.
-     *    @return SimpleTestCase    Test case.
-     *    @access public
-     */
-    function &getTestCase() {
-        return $this->_invoker->getTestCase();
-    }
-
-    /**
-     *    Runs test level set up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function before($method) {
-        $this->_invoker->before($method);
-    }
-
-    /**
-     *    Invokes a test method and buffered with setUp()
-     *    and tearDown() calls.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function invoke($method) {
-        $this->_invoker->invoke($method);
-    }
-
-    /**
-     *    Runs test level clean up. Used for changing
-     *    the mechanics of base test cases.
-     *    @param string $method    Test method to call.
-     *    @access public
-     */
-    function after($method) {
-        $this->_invoker->after($method);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/mock_objects.php b/tests/simpletest/mock_objects.php
deleted file mode 100644
index 5ef15751d..000000000
--- a/tests/simpletest/mock_objects.php
+++ /dev/null
@@ -1,1581 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: mock_objects.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/simpletest.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-if (version_compare(phpversion(), '5') >= 0) {
-    require_once(dirname(__FILE__) . '/reflection_php5.php');
-} else {
-    require_once(dirname(__FILE__) . '/reflection_php4.php');
-}
-/**#@-*/
-
-/**
- * Default character simpletest will substitute for any value
- */
-if (! defined('MOCK_ANYTHING')) {
-    define('MOCK_ANYTHING', '*');
-}
-
-/**
- *    Parameter comparison assertion.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class ParametersExpectation extends SimpleExpectation {
-    var $_expected;
-
-    /**
-     *    Sets the expected parameter list.
-     *    @param array $parameters  Array of parameters including
-     *                              those that are wildcarded.
-     *                              If the value is not an array
-     *                              then it is considered to match any.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function ParametersExpectation($expected = false, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_expected = $expected;
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param array $parameters     Comparison values.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($parameters) {
-        if (! is_array($this->_expected)) {
-            return true;
-        }
-        if (count($this->_expected) != count($parameters)) {
-            return false;
-        }
-        for ($i = 0; $i < count($this->_expected); $i++) {
-            if (! $this->_testParameter($parameters[$i], $this->_expected[$i])) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Tests an individual parameter.
-     *    @param mixed $parameter    Value to test.
-     *    @param mixed $expected     Comparison value.
-     *    @return boolean            True if expectation
-     *                               fulfilled.
-     *    @access private
-     */
-    function _testParameter($parameter, $expected) {
-        $comparison = $this->_coerceToExpectation($expected);
-        return $comparison->test($parameter);
-    }
-
-    /**
-     *    Returns a human readable test message.
-     *    @param array $comparison   Incoming parameter list.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($parameters) {
-        if ($this->test($parameters)) {
-            return "Expectation of " . count($this->_expected) .
-                    " arguments of [" . $this->_renderArguments($this->_expected) .
-                    "] is correct";
-        } else {
-            return $this->_describeDifference($this->_expected, $parameters);
-        }
-    }
-
-    /**
-     *    Message to display if expectation differs from
-     *    the parameters actually received.
-     *    @param array $expected      Expected parameters as list.
-     *    @param array $parameters    Actual parameters received.
-     *    @return string              Description of difference.
-     *    @access private
-     */
-    function _describeDifference($expected, $parameters) {
-        if (count($expected) != count($parameters)) {
-            return "Expected " . count($expected) .
-                    " arguments of [" . $this->_renderArguments($expected) .
-                    "] but got " . count($parameters) .
-                    " arguments of [" . $this->_renderArguments($parameters) . "]";
-        }
-        $messages = array();
-        for ($i = 0; $i < count($expected); $i++) {
-            $comparison = $this->_coerceToExpectation($expected[$i]);
-            if (! $comparison->test($parameters[$i])) {
-                $messages[] = "parameter " . ($i + 1) . " with [" .
-                        $comparison->overlayMessage($parameters[$i], $this->_getDumper()) . "]";
-            }
-        }
-        return "Parameter expectation differs at " . implode(" and ", $messages);
-    }
-
-    /**
-     *    Creates an identical expectation if the
-     *    object/value is not already some type
-     *    of expectation.
-     *    @param mixed $expected      Expected value.
-     *    @return SimpleExpectation   Expectation object.
-     *    @access private
-     */
-    function _coerceToExpectation($expected) {
-        if (SimpleExpectation::isExpectation($expected)) {
-            return $expected;
-        }
-        return new IdenticalExpectation($expected);
-    }
-
-    /**
-     *    Renders the argument list as a string for
-     *    messages.
-     *    @param array $args    Incoming arguments.
-     *    @return string        Simple description of type and value.
-     *    @access private
-     */
-    function _renderArguments($args) {
-        $descriptions = array();
-        if (is_array($args)) {
-            foreach ($args as $arg) {
-                $dumper = &new SimpleDumper();
-                $descriptions[] = $dumper->describeValue($arg);
-            }
-        }
-        return implode(', ', $descriptions);
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *  @package    SimpleTest
- *  @subpackage MockObjects
- */
-class CallCountExpectation extends SimpleExpectation {
-    var $_method;
-    var $_count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Expected number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function CallCountExpectation($method, $count, $message = '%s') {
-        $this->_method = $method;
-        $this->_count = $count;
-        $this->SimpleExpectation($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if expected.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_count == $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     *    @access public
-     */
-    function testMessage($compare) {
-        return 'Expected call count for [' . $this->_method .
-                '] was [' . $this->_count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *  @package    SimpleTest
- *  @subpackage MockObjects
- */
-class MinimumCallCountExpectation extends SimpleExpectation {
-    var $_method;
-    var $_count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Minimum number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function MinimumCallCountExpectation($method, $count, $message = '%s') {
-        $this->_method = $method;
-        $this->_count = $count;
-        $this->SimpleExpectation($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if enough.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_count <= $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     *    @access public
-     */
-    function testMessage($compare) {
-        return 'Minimum call count for [' . $this->_method .
-                '] was [' . $this->_count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Confirms that the number of calls on a method is as expected.
- *    @package      SimpleTest
- *    @subpackage   MockObjects
- */
-class MaximumCallCountExpectation extends SimpleExpectation {
-    var $_method;
-    var $_count;
-
-    /**
-     *    Stashes the method and expected count for later
-     *    reporting.
-     *    @param string $method    Name of method to confirm against.
-     *    @param integer $count    Minimum number of calls.
-     *    @param string $message   Custom error message.
-     */
-    function MaximumCallCountExpectation($method, $count, $message = '%s') {
-        $this->_method = $method;
-        $this->_count = $count;
-        $this->SimpleExpectation($message);
-    }
-
-    /**
-     *    Tests the assertion. True if correct.
-     *    @param integer $compare     Measured call count.
-     *    @return boolean             True if not over.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_count >= $compare);
-    }
-
-    /**
-     *    Reports the comparison.
-     *    @param integer $compare     Measured call count.
-     *    @return string              Message to show.
-     *    @access public
-     */
-    function testMessage($compare) {
-        return 'Maximum call count for [' . $this->_method .
-                '] was [' . $this->_count .
-                '] got [' . $compare . ']';
-    }
-}
-
-/**
- *    Retrieves method actions by searching the
- *    parameter lists until an expected match is found.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleSignatureMap {
-    var $_map;
-
-    /**
-     *    Creates an empty call map.
-     *    @access public
-     */
-    function SimpleSignatureMap() {
-        $this->_map = array();
-    }
-
-    /**
-     *    Stashes a reference against a method call.
-     *    @param array $parameters    Array of arguments (including wildcards).
-     *    @param mixed $action        Reference placed in the map.
-     *    @access public
-     */
-    function add($parameters, &$action) {
-        $place = count($this->_map);
-        $this->_map[$place] = array();
-        $this->_map[$place]['params'] = new ParametersExpectation($parameters);
-        $this->_map[$place]['content'] = &$action;
-    }
-
-    /**
-     *    Searches the call list for a matching parameter
-     *    set. Returned by reference.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return object              Object held in the first matching
-     *                                slot, otherwise null.
-     *    @access public
-     */
-    function &findFirstAction($parameters) {
-        $slot = $this->_findFirstSlot($parameters);
-        if (isset($slot) && isset($slot['content'])) {
-            return $slot['content'];
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Searches the call list for a matching parameter
-     *    set. True if successful.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return boolean             True if a match is present.
-     *    @access public
-     */
-    function isMatch($parameters) {
-        return ($this->_findFirstSlot($parameters) != null);
-    }
-    
-    /**
-     *    Compares the incoming parameters with the
-     *    internal expectation. Uses the incoming $test
-     *    to dispatch the test message.
-     *    @param SimpleTestCase $test   Test to dispatch to.
-     *    @param array $parameters      The actual calling arguments.
-     *    @param string $message        The message to overlay.
-     *    @access public
-     */
-    function test(&$test, $parameters, $message) {
-    }
-
-    /**
-     *    Searches the map for a matching item.
-     *    @param array $parameters    Parameters to search by
-     *                                without wildcards.
-     *    @return array               Reference to slot or null.
-     *    @access private
-     */
-    function &_findFirstSlot($parameters) {
-        $count = count($this->_map);
-        for ($i = 0; $i < $count; $i++) {
-            if ($this->_map[$i]["params"]->test($parameters)) {
-                return $this->_map[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-}
-
-/**
- *    Allows setting of actions against call signatures either
- *    at a specific time, or always. Specific time settings
- *    trump lasting ones, otherwise the most recently added
- *    will mask an earlier match.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleCallSchedule {
-    var $_wildcard = MOCK_ANYTHING;
-    var $_always;
-    var $_at;
-    
-    /**
-     *    Sets up an empty response schedule.
-     *    Creates an empty call map.
-     */
-    function SimpleCallSchedule() {
-        $this->_always = array();
-        $this->_at = array();
-    }
-    
-    /**
-     *    Stores an action against a signature that
-     *    will always fire unless masked by a time
-     *    specific one.
-     *    @param string $method        Method name.
-     *    @param array $args           Calling parameters.
-     *    @param SimpleAction $action  Actually simpleByValue, etc.
-     *    @access public
-     */
-    function register($method, $args, &$action) {
-        $args = $this->_replaceWildcards($args);
-        $method = strtolower($method);
-        if (! isset($this->_always[$method])) {
-            $this->_always[$method] = new SimpleSignatureMap();
-        }
-        $this->_always[$method]->add($args, $action);
-    }
-    
-    /**
-     *    Stores an action against a signature that
-     *    will fire at a specific time in the future.
-     *    @param integer $step         delay of calls to this method,
-     *                                 0 is next.
-     *    @param string $method        Method name.
-     *    @param array $args           Calling parameters.
-     *    @param SimpleAction $action  Actually SimpleByValue, etc.
-     *    @access public
-     */
-    function registerAt($step, $method, $args, &$action) {
-        $args = $this->_replaceWildcards($args);
-        $method = strtolower($method);
-        if (! isset($this->_at[$method])) {
-            $this->_at[$method] = array();
-        }
-        if (! isset($this->_at[$method][$step])) {
-            $this->_at[$method][$step] = new SimpleSignatureMap();
-        }
-        $this->_at[$method][$step]->add($args, $action);
-    }
-    
-    function expectArguments($method, $args, $message) {
-        $args = $this->_replaceWildcards($args);
-        $message .= Mock::getExpectationLine();
-        $this->_expected_args[strtolower($method)] =
-                new ParametersExpectation($args, $message);
-
-    }
-    
-    /**
-     *    Actually carry out the action stored previously,
-     *    if the parameters match.
-     *    @param integer $step      Time of call.
-     *    @param string $method     Method name.
-     *    @param array $args        The parameters making up the
-     *                              rest of the call.
-     *    @return mixed             The result of the action.
-     *    @access public.
-     */
-    function &respond($step, $method, $args) {
-        $method = strtolower($method);
-        if (isset($this->_at[$method][$step])) {
-            if ($this->_at[$method][$step]->isMatch($args)) {
-                $action = &$this->_at[$method][$step]->findFirstAction($args);
-                if (isset($action)) {
-                    return $action->act();
-                }
-            }
-        }
-        if (isset($this->_always[$method])) {
-            $action = &$this->_always[$method]->findFirstAction($args);
-            if (isset($action)) {
-                return $action->act();
-            }
-        }
-        $null = null;
-        return $null;
-    }
-    
-    /**
-     *    Replaces wildcard matches with wildcard
-     *    expectations in the argument list.
-     *    @param array $args      Raw argument list.
-     *    @return array           Argument list with
-     *                            expectations.
-     *    @access private
-     */
-    function _replaceWildcards($args) {
-        if ($args === false) {
-            return false;
-        }
-        for ($i = 0; $i < count($args); $i++) {
-            if ($args[$i] === $this->_wildcard) {
-                $args[$i] = new AnythingExpectation();
-            }
-        }
-        return $args;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a reference for returning later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleByReference {
-    var $_reference;
-    
-    /**
-     *    Stashes it for later.
-     *    @param mixed $reference     Actual PHP4 style reference.
-     *    @access public
-     */
-    function SimpleByReference(&$reference) {
-        $this->_reference = &$reference;
-    }
-    
-    /**
-     *    Returns the reference stored earlier.
-     *    @return mixed    Whatever was stashed.
-     *    @access public
-     */
-    function &act() {
-        return $this->_reference;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes a value for returning later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleByValue {
-    var $_value;
-    
-    /**
-     *    Stashes it for later.
-     *    @param mixed $value     You need to clone objects
-     *                            if you want copy semantics
-     *                            for these.
-     *    @access public
-     */
-    function SimpleByValue($value) {
-        $this->_value = $value;
-    }
-    
-    /**
-     *    Returns the value stored earlier.
-     *    @return mixed    Whatever was stashed.
-     *    @access public
-     */
-    function &act() {
-        $dummy = $this->_value;
-        return $dummy;
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes an exception for throwing later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleThrower {
-    var $_exception;
-    
-    /**
-     *    Stashes it for later.
-     *    @param Exception $exception    The exception object to throw.
-     *    @access public
-     */
-    function SimpleThrower($exception) {
-        $this->_exception = $exception;
-    }
-    
-    /**
-     *    Throws the exceptins stashed earlier.
-     *    @access public
-     */
-    function act() {
-        eval('throw $this->_exception;');
-    }
-}
-
-/**
- *    A type of SimpleMethodAction.
- *    Stashes an error for emitting later.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleErrorThrower {
-    var $_error;
-    var $_severity;
-    
-    /**
-     *    Stashes an error to throw later.
-     *    @param string $error      Error message.
-     *    @param integer $severity  PHP error constant, e.g E_USER_ERROR.
-     *    @access public
-     */
-    function SimpleErrorThrower($error, $severity) {
-        $this->_error = $error;
-        $this->_severity = $severity;
-    }
-    
-    /**
-     *    Triggers the stashed error.
-     *    @return null        The usual PHP4.4 shenanigans are needed here.
-     *    @access public
-     */
-    function &act() {
-        trigger_error($this->_error, $this->_severity);
-        $null = null;
-        return $null;
-    }
-}
-
-/**
- *    A base class or delegate that extends an
- *    empty collection of methods that can have their
- *    return values set and expectations made of the
- *    calls upon them. The mock will assert the
- *    expectations against it's attached test case in
- *    addition to the server stub behaviour or returning
- *    preprogrammed responses.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class SimpleMock {
-    var $_actions;
-    var $_wildcard = MOCK_ANYTHING;
-    var $_is_strict = true;
-    var $_call_counts;
-    var $_expected_counts;
-    var $_max_counts;
-    var $_expected_args;
-    var $_expected_args_at;
-
-    /**
-     *    Creates an empty action list and expectation list.
-     *    All call counts are set to zero.
-     *    @access public
-     */
-    function SimpleMock() {
-        $this->_actions = &new SimpleCallSchedule();
-        $this->_expectations = &new SimpleCallSchedule();
-        $this->_call_counts = array();
-        $this->_expected_counts = array();
-        $this->_max_counts = array();
-        $this->_expected_args = array();
-        $this->_expected_args_at = array();
-        $test = &$this->_getCurrentTestCase();
-        $test->tell($this);
-    }
-    
-    /**
-     *    Disables a name check when setting expectations.
-     *    This hack is needed for the partial mocks.
-     *    @access public
-     */
-    function disableExpectationNameChecks() {
-        $this->_is_strict = false;
-    }
-
-    /**
-     *    Finds currently running test.
-     *    @return SimpeTestCase    Current test case.
-     *    @access protected
-     */
-    function &_getCurrentTestCase() {
-        $context = &SimpleTest::getContext();
-        return $context->getTest();
-    }
-
-    /**
-     *    Die if bad arguments array is passed.
-     *    @param mixed $args     The arguments value to be checked.
-     *    @param string $task    Description of task attempt.
-     *    @return boolean        Valid arguments
-     *    @access private
-     */
-    function _checkArgumentsIsArray($args, $task) {
-        if (! is_array($args)) {
-            trigger_error(
-                "Cannot $task as \$args parameter is not an array",
-                E_USER_ERROR);
-        }
-    }
-
-    /**
-     *    Triggers a PHP error if the method is not part
-     *    of this object.
-     *    @param string $method        Name of method.
-     *    @param string $task          Description of task attempt.
-     *    @access protected
-     */
-    function _dieOnNoMethod($method, $task) {
-        if ($this->_is_strict && ! method_exists($this, $method)) {
-            trigger_error(
-                    "Cannot $task as no ${method}() in class " . get_class($this),
-                    E_USER_ERROR);
-        }
-    }
-
-    /**
-     *    Replaces wildcard matches with wildcard
-     *    expectations in the argument list.
-     *    @param array $args      Raw argument list.
-     *    @return array           Argument list with
-     *                            expectations.
-     *    @access private
-     */
-    function _replaceWildcards($args) {
-        if ($args === false) {
-            return false;
-        }
-        for ($i = 0; $i < count($args); $i++) {
-            if ($args[$i] === $this->_wildcard) {
-                $args[$i] = new AnythingExpectation();
-            }
-        }
-        return $args;
-    }
-
-    /**
-     *    Adds one to the call count of a method.
-     *    @param string $method        Method called.
-     *    @param array $args           Arguments as an array.
-     *    @access protected
-     */
-    function _addCall($method, $args) {
-        if (! isset($this->_call_counts[$method])) {
-            $this->_call_counts[$method] = 0;
-        }
-        $this->_call_counts[$method]++;
-    }
-
-    /**
-     *    Fetches the call count of a method so far.
-     *    @param string $method        Method name called.
-     *    @return integer              Number of calls so far.
-     *    @access public
-     */
-    function getCallCount($method) {
-        $this->_dieOnNoMethod($method, "get call count");
-        $method = strtolower($method);
-        if (! isset($this->_call_counts[$method])) {
-            return 0;
-        }
-        return $this->_call_counts[$method];
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value for all calls to this method.
-     *    @param string $method       Method name.
-     *    @param mixed $value         Result of call passed by value.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     *    @access public
-     */
-    function setReturnValue($method, $value, $args = false) {
-        $this->_dieOnNoMethod($method, "set return value");
-        $this->_actions->register($method, $args, new SimpleByValue($value));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value only when the required call count
-     *    is reached.
-     *    @param integer $timing   Number of calls in the future
-     *                             to which the result applies. If
-     *                             not set then all calls will return
-     *                             the value.
-     *    @param string $method    Method name.
-     *    @param mixed $value      Result of call passed by value.
-     *    @param array $args       List of parameters to match
-     *                             including wildcards.
-     *    @access public
-     */
-    function setReturnValueAt($timing, $method, $value, $args = false) {
-        $this->_dieOnNoMethod($method, "set return value sequence");
-        $this->_actions->registerAt($timing, $method, $args, new SimpleByValue($value));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by reference for all calls.
-     *    @param string $method       Method name.
-     *    @param mixed $reference     Result of the call will be this object.
-     *    @param array $args          List of parameters to match
-     *                                including wildcards.
-     *    @access public
-     */
-    function setReturnReference($method, &$reference, $args = false) {
-        $this->_dieOnNoMethod($method, "set return reference");
-        $this->_actions->register($method, $args, new SimpleByReference($reference));
-    }
-
-    /**
-     *    Sets a return for a parameter list that will
-     *    be passed by value only when the required call count
-     *    is reached.
-     *    @param integer $timing    Number of calls in the future
-     *                              to which the result applies. If
-     *                              not set then all calls will return
-     *                              the value.
-     *    @param string $method     Method name.
-     *    @param mixed $reference   Result of the call will be this object.
-     *    @param array $args        List of parameters to match
-     *                              including wildcards.
-     *    @access public
-     */
-    function setReturnReferenceAt($timing, $method, &$reference, $args = false) {
-        $this->_dieOnNoMethod($method, "set return reference sequence");
-        $this->_actions->registerAt($timing, $method, $args, new SimpleByReference($reference));
-    }
-
-    /**
-     *    Sets up an expected call with a set of
-     *    expected parameters in that call. All
-     *    calls will be compared to these expectations
-     *    regardless of when the call is made.
-     *    @param string $method        Method call to test.
-     *    @param array $args           Expected parameters for the call
-     *                                 including wildcards.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expect($method, $args, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set expected arguments');
-        $this->_checkArgumentsIsArray($args, 'set expected arguments');
-        $this->_expectations->expectArguments($method, $args, $message);
-        $args = $this->_replaceWildcards($args);
-        $message .= Mock::getExpectationLine();
-        $this->_expected_args[strtolower($method)] =
-                new ParametersExpectation($args, $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function expectArguments($method, $args, $message = '%s') {
-        return $this->expect($method, $args, $message);
-    }
-
-    /**
-     *    Sets up an expected call with a set of
-     *    expected parameters in that call. The
-     *    expected call count will be adjusted if it
-     *    is set too low to reach this call.
-     *    @param integer $timing    Number of calls in the future at
-     *                              which to test. Next call is 0.
-     *    @param string $method     Method call to test.
-     *    @param array $args        Expected parameters for the call
-     *                              including wildcards.
-     *    @param string $message    Overridden message.
-     *    @access public
-     */
-    function expectAt($timing, $method, $args, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set expected arguments at time');
-        $this->_checkArgumentsIsArray($args, 'set expected arguments at time');
-        $args = $this->_replaceWildcards($args);
-        if (! isset($this->_expected_args_at[$timing])) {
-            $this->_expected_args_at[$timing] = array();
-        }
-        $method = strtolower($method);
-        $message .= Mock::getExpectationLine();
-        $this->_expected_args_at[$timing][$method] =
-                new ParametersExpectation($args, $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function expectArgumentsAt($timing, $method, $args, $message = '%s') {
-        return $this->expectAt($timing, $method, $args, $message);
-    }
-
-    /**
-     *    Sets an expectation for the number of times
-     *    a method will be called. The tally method
-     *    is used to check this.
-     *    @param string $method        Method call to test.
-     *    @param integer $count        Number of times it should
-     *                                 have been called at tally.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expectCallCount($method, $count, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set expected call count');
-        $message .= Mock::getExpectationLine();
-        $this->_expected_counts[strtolower($method)] =
-                new CallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Sets the number of times a method may be called
-     *    before a test failure is triggered.
-     *    @param string $method        Method call to test.
-     *    @param integer $count        Most number of times it should
-     *                                 have been called.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expectMaximumCallCount($method, $count, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set maximum call count');
-        $message .= Mock::getExpectationLine();
-        $this->_max_counts[strtolower($method)] =
-                new MaximumCallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Sets the number of times to call a method to prevent
-     *    a failure on the tally.
-     *    @param string $method      Method call to test.
-     *    @param integer $count      Least number of times it should
-     *                               have been called.
-     *    @param string $message     Overridden message.
-     *    @access public
-     */
-    function expectMinimumCallCount($method, $count, $message = '%s') {
-        $this->_dieOnNoMethod($method, 'set minimum call count');
-        $message .= Mock::getExpectationLine();
-        $this->_expected_counts[strtolower($method)] =
-                new MinimumCallCountExpectation($method, $count, $message);
-    }
-
-    /**
-     *    Convenience method for barring a method
-     *    call.
-     *    @param string $method        Method call to ban.
-     *    @param string $message       Overridden message.
-     *    @access public
-     */
-    function expectNever($method, $message = '%s') {
-        $this->expectMaximumCallCount($method, 0, $message);
-    }
-
-    /**
-     *    Convenience method for a single method
-     *    call.
-     *    @param string $method     Method call to track.
-     *    @param array $args        Expected argument list or
-     *                              false for any arguments.
-     *    @param string $message    Overridden message.
-     *    @access public
-     */
-    function expectOnce($method, $args = false, $message = '%s') {
-        $this->expectCallCount($method, 1, $message);
-        if ($args !== false) {
-            $this->expect($method, $args, $message);
-        }
-    }
-
-    /**
-     *    Convenience method for requiring a method
-     *    call.
-     *    @param string $method       Method call to track.
-     *    @param array $args          Expected argument list or
-     *                                false for any arguments.
-     *    @param string $message      Overridden message.
-     *    @access public
-     */
-    function expectAtLeastOnce($method, $args = false, $message = '%s') {
-        $this->expectMinimumCallCount($method, 1, $message);
-        if ($args !== false) {
-            $this->expect($method, $args, $message);
-        }
-    }
-    
-    /**
-     *    Sets up a trigger to throw an exception upon the
-     *    method call.
-     *    @param string $method     Method name to throw on.
-     */
-    function throwOn($method, $exception = false, $args = false) {
-        $this->_dieOnNoMethod($method, "throw on");
-        $this->_actions->register($method, $args,
-                new SimpleThrower($exception ? $exception : new Exception()));
-    }
-    
-    /**
-     *    Sets up a trigger to throw an exception upon the
-     *    method call.
-     */
-    function throwAt($timing, $method, $exception = false, $args = false) {
-        $this->_dieOnNoMethod($method, "throw at");
-        $this->_actions->registerAt($timing, $method, $args,
-                new SimpleThrower($exception ? $exception : new Exception()));
-    }
-    
-    /**
-     *    Sets up a trigger to throw an error upon the
-     *    method call.
-     */
-    function errorOn($method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
-        $this->_dieOnNoMethod($method, "error on");
-        $this->_actions->register($method, $args, new SimpleErrorThrower($error, $severity));
-    }
-    
-    /**
-     *    Sets up a trigger to throw an error upon the
-     *    method call.
-     */
-    function errorAt($timing, $method, $error = 'A mock error', $args = false, $severity = E_USER_ERROR) {
-        $this->_dieOnNoMethod($method, "error at");
-        $this->_actions->registerAt($timing, $method, $args, new SimpleErrorThrower($error, $severity));
-    }
-
-    /**
-     *    @deprecated
-     */
-    function tally() {
-    }
-
-    /**
-     *    Receives event from unit test that the current
-     *    test method has finished. Totals up the call
-     *    counts and triggers a test assertion if a test
-     *    is present for expected call counts.
-     *    @param string $test_method      Current method name.
-     *    @param SimpleTestCase $test     Test to send message to.
-     *    @access public
-     */
-    function atTestEnd($test_method, &$test) {
-        foreach ($this->_expected_counts as $method => $expectation) {
-            $test->assert($expectation, $this->getCallCount($method));
-        }
-        foreach ($this->_max_counts as $method => $expectation) {
-            if ($expectation->test($this->getCallCount($method))) {
-                $test->assert($expectation, $this->getCallCount($method));
-            }
-        }
-    }
-
-    /**
-     *    Returns the expected value for the method name
-     *    and checks expectations. Will generate any
-     *    test assertions as a result of expectations
-     *    if there is a test present.
-     *    @param string $method       Name of method to simulate.
-     *    @param array $args          Arguments as an array.
-     *    @return mixed               Stored return.
-     *    @access private
-     */
-    function &_invoke($method, $args) {
-        $method = strtolower($method);
-        $step = $this->getCallCount($method);
-        $this->_addCall($method, $args);
-        $this->_checkExpectations($method, $args, $step);
-        $result = &$this->_emulateCall($method, $args, $step);
-        return $result;
-    }
-    
-    /**
-     *    Finds the return value matching the incoming
-     *    arguments. If there is no matching value found
-     *    then an error is triggered.
-     *    @param string $method      Method name.
-     *    @param array $args         Calling arguments.
-     *    @param integer $step       Current position in the
-     *                               call history.
-     *    @return mixed              Stored return or other action.
-     *    @access protected
-     */
-    function &_emulateCall($method, $args, $step) {
-        return $this->_actions->respond($step, $method, $args);
-    }
-
-    /**
-     *    Tests the arguments against expectations.
-     *    @param string $method        Method to check.
-     *    @param array $args           Argument list to match.
-     *    @param integer $timing       The position of this call
-     *                                 in the call history.
-     *    @access private
-     */
-    function _checkExpectations($method, $args, $timing) {
-        $test = &$this->_getCurrentTestCase();
-        if (isset($this->_max_counts[$method])) {
-            if (! $this->_max_counts[$method]->test($timing + 1)) {
-                $test->assert($this->_max_counts[$method], $timing + 1);
-            }
-        }
-        if (isset($this->_expected_args_at[$timing][$method])) {
-            $test->assert(
-                    $this->_expected_args_at[$timing][$method],
-                    $args,
-                    "Mock method [$method] at [$timing] -> %s");
-        } elseif (isset($this->_expected_args[$method])) {
-            $test->assert(
-                    $this->_expected_args[$method],
-                    $args,
-                    "Mock method [$method] -> %s");
-        }
-    }
-}
-
-/**
- *    Static methods only service class for code generation of
- *    mock objects.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class Mock {
-
-    /**
-     *    Factory for mock object classes.
-     *    @access public
-     */
-    function Mock() {
-        trigger_error('Mock factory methods are static.');
-    }
-
-    /**
-     *    Clones a class' interface and creates a mock version
-     *    that can have return values and expectations set.
-     *    @param string $class         Class to clone.
-     *    @param string $mock_class    New class name. Default is
-     *                                 the old name with "Mock"
-     *                                 prepended.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in the cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     *    @static
-     *    @access public
-     */
-    function generate($class, $mock_class = false, $methods = false) {
-        $generator = new MockGenerator($class, $mock_class);
-        return $generator->generateSubclass($methods);
-    }
-
-    /**
-     *    Generates a version of a class with selected
-     *    methods mocked only. Inherits the old class
-     *    and chains the mock methods of an aggregated
-     *    mock object.
-     *    @param string $class            Class to clone.
-     *    @param string $mock_class       New class name.
-     *    @param array $methods           Methods to be overridden
-     *                                    with mock versions.
-     *    @static
-     *    @access public
-     */
-    function generatePartial($class, $mock_class, $methods) {
-        $generator = new MockGenerator($class, $mock_class);
-        return $generator->generatePartial($methods);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @access public
-     *    @static
-     */
-    function getExpectationLine() {
-        $trace = new SimpleStackTrace(array('expect'));
-        return $trace->traceMethod();
-    }
-}
-
-/**
- *    @package  SimpleTest
- *    @subpackage   MockObjects
- *    @deprecated
- */
-class Stub extends Mock {
-}
-
-/**
- *    Service class for code generation of mock objects.
- *    @package SimpleTest
- *    @subpackage MockObjects
- */
-class MockGenerator {
-    var $_class;
-    var $_mock_class;
-    var $_mock_base;
-    var $_reflection;
-
-    /**
-     *    Builds initial reflection object.
-     *    @param string $class        Class to be mocked.
-     *    @param string $mock_class   New class with identical interface,
-     *                                but no behaviour.
-     */
-    function MockGenerator($class, $mock_class) {
-        $this->_class = $class;
-        $this->_mock_class = $mock_class;
-        if (! $this->_mock_class) {
-            $this->_mock_class = 'Mock' . $this->_class;
-        }
-        $this->_mock_base = SimpleTest::getMockBaseClass();
-        $this->_reflection = new SimpleReflection($this->_class);
-    }
-
-    /**
-     *    Clones a class' interface and creates a mock version
-     *    that can have return values and expectations set.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in th cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     *    @access public
-     */
-    function generate($methods) {
-        if (! $this->_reflection->classOrInterfaceExists()) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->_mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            return false;
-        }
-        $code = $this->_createClassCode($methods ? $methods : array());
-        return eval("$code return \$code;");
-    }
-    
-    /**
-     *    Subclasses a class and overrides every method with a mock one
-     *    that can have return values and expectations set. Chains
-     *    to an aggregated SimpleMock.
-     *    @param array $methods        Additional methods to add beyond
-     *                                 those in the cloned class. Use this
-     *                                 to emulate the dynamic addition of
-     *                                 methods in the cloned class or when
-     *                                 the class hasn't been written yet.
-     *    @access public
-     */
-    function generateSubclass($methods) {
-        if (! $this->_reflection->classOrInterfaceExists()) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->_mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            return false;
-        }
-        if ($this->_reflection->isInterface() || $this->_reflection->hasFinal()) {
-            $code = $this->_createClassCode($methods ? $methods : array());
-            return eval("$code return \$code;");
-        } else {
-            $code = $this->_createSubclassCode($methods ? $methods : array());
-            return eval("$code return \$code;");
-        }
-    }
-
-    /**
-     *    Generates a version of a class with selected
-     *    methods mocked only. Inherits the old class
-     *    and chains the mock methods of an aggregated
-     *    mock object.
-     *    @param array $methods           Methods to be overridden
-     *                                    with mock versions.
-     *    @access public
-     */
-    function generatePartial($methods) {
-        if (! $this->_reflection->classExists($this->_class)) {
-            return false;
-        }
-        $mock_reflection = new SimpleReflection($this->_mock_class);
-        if ($mock_reflection->classExistsSansAutoload()) {
-            trigger_error('Partial mock class [' . $this->_mock_class . '] already exists');
-            return false;
-        }
-        $code = $this->_extendClassCode($methods);
-        return eval("$code return \$code;");
-    }
-
-    /**
-     *    The new mock class code as a string.
-     *    @param array $methods          Additional methods.
-     *    @return string                 Code for new mock class.
-     *    @access private
-     */
-    function _createClassCode($methods) {
-        $implements = '';
-        $interfaces = $this->_reflection->getInterfaces();
-        if (function_exists('spl_classes')) {
-            $interfaces = array_diff($interfaces, array('Traversable'));
-        }
-        if (count($interfaces) > 0) {
-            $implements = 'implements ' . implode(', ', $interfaces);
-        }
-        $code = "class " . $this->_mock_class . " extends " . $this->_mock_base . " $implements {\n";
-        $code .= "    function " . $this->_mock_class . "() {\n";
-        $code .= "        \$this->" . $this->_mock_base . "();\n";
-        $code .= "    }\n";
-        if (in_array('__construct', $this->_reflection->getMethods())) {
-            $code .= "    " . $this->_reflection->getSignature('__construct') . " {\n";
-            $code .= "        \$this->" . $this->_mock_base . "();\n";
-            $code .= "    }\n";
-        }
-        $code .= $this->_createHandlerCode($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    The new mock class code as a string. The mock will
-     *    be a subclass of the original mocked class.
-     *    @param array $methods          Additional methods.
-     *    @return string                 Code for new mock class.
-     *    @access private
-     */
-    function _createSubclassCode($methods) {
-        $code  = "class " . $this->_mock_class . " extends " . $this->_class . " {\n";
-        $code .= "    var \$_mock;\n";
-        $code .= $this->_addMethodList(array_merge($methods, $this->_reflection->getMethods()));
-        $code .= "\n";
-        $code .= "    function " . $this->_mock_class . "() {\n";
-        $code .= "        \$this->_mock = &new " . $this->_mock_base . "();\n";
-        $code .= "        \$this->_mock->disableExpectationNameChecks();\n";
-        $code .= "    }\n";
-        $code .= $this->_chainMockReturns();
-        $code .= $this->_chainMockExpectations();
-        $code .= $this->_chainThrowMethods();
-        $code .= $this->_overrideMethods($this->_reflection->getMethods());
-        $code .= $this->_createNewMethodCode($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    The extension class code as a string. The class
-     *    composites a mock object and chains mocked methods
-     *    to it.
-     *    @param array  $methods       Mocked methods.
-     *    @return string               Code for a new class.
-     *    @access private
-     */
-    function _extendClassCode($methods) {
-        $code  = "class " . $this->_mock_class . " extends " . $this->_class . " {\n";
-        $code .= "    var \$_mock;\n";
-        $code .= $this->_addMethodList($methods);
-        $code .= "\n";
-        $code .= "    function " . $this->_mock_class . "() {\n";
-        $code .= "        \$this->_mock = &new " . $this->_mock_base . "();\n";
-        $code .= "        \$this->_mock->disableExpectationNameChecks();\n";
-        $code .= "    }\n";
-        $code .= $this->_chainMockReturns();
-        $code .= $this->_chainMockExpectations();
-        $code .= $this->_chainThrowMethods();
-        $code .= $this->_overrideMethods($methods);
-        $code .= "}\n";
-        return $code;
-    }
-
-    /**
-     *    Creates code within a class to generate replaced
-     *    methods. All methods call the _invoke() handler
-     *    with the method name and the arguments in an
-     *    array.
-     *    @param array $methods    Additional methods.
-     *    @access private
-     */
-    function _createHandlerCode($methods) {
-        $code = '';
-        $methods = array_merge($methods, $this->_reflection->getMethods());
-        foreach ($methods as $method) {
-            if ($this->_isConstructor($method)) {
-                continue;
-            }
-            $mock_reflection = new SimpleReflection($this->_mock_base);
-            if (in_array($method, $mock_reflection->getMethods())) {
-                continue;
-            }
-            $code .= "    " . $this->_reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->_invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-
-    /**
-     *    Creates code within a class to generate a new
-     *    methods. All methods call the _invoke() handler
-     *    on the internal mock with the method name and
-     *    the arguments in an array.
-     *    @param array $methods    Additional methods.
-     *    @access private
-     */
-    function _createNewMethodCode($methods) {
-        $code = '';
-        foreach ($methods as $method) {
-            if ($this->_isConstructor($method)) {
-                continue;
-            }
-            $mock_reflection = new SimpleReflection($this->_mock_base);
-            if (in_array($method, $mock_reflection->getMethods())) {
-                continue;
-            }
-            $code .= "    " . $this->_reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->_mock->_invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-
-    /**
-     *    Tests to see if a special PHP method is about to
-     *    be stubbed by mistake.
-     *    @param string $method    Method name.
-     *    @return boolean          True if special.
-     *    @access private
-     */
-    function _isConstructor($method) {
-        return in_array(
-                strtolower($method),
-                array('__construct', '__destruct'));
-    }
-
-    /**
-     *    Creates a list of mocked methods for error checking.
-     *    @param array $methods       Mocked methods.
-     *    @return string              Code for a method list.
-     *    @access private
-     */
-    function _addMethodList($methods) {
-        return "    var \$_mocked_methods = array('" .
-                implode("', '", array_map('strtolower', $methods)) .
-                "');\n";
-    }
-
-    /**
-     *    Creates code to abandon the expectation if not mocked.
-     *    @param string $alias       Parameter name of method name.
-     *    @return string             Code for bail out.
-     *    @access private
-     */
-    function _bailOutIfNotMocked($alias) {
-        $code  = "        if (! in_array(strtolower($alias), \$this->_mocked_methods)) {\n";
-        $code .= "            trigger_error(\"Method [$alias] is not mocked\");\n";
-        $code .= "            \$null = null;\n";
-        $code .= "            return \$null;\n";
-        $code .= "        }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code for chaining to the composited
-     *    mock object.
-     *    @return string           Code for mock set up.
-     *    @access private
-     */
-    function _chainMockReturns() {
-        $code  = "    function setReturnValue(\$method, \$value, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnValue(\$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnValueAt(\$timing, \$method, \$value, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnValueAt(\$timing, \$method, \$value, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnReference(\$method, &\$ref, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnReference(\$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function setReturnReferenceAt(\$timing, \$method, &\$ref, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->setReturnReferenceAt(\$timing, \$method, \$ref, \$args);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code for chaining to an aggregated
-     *    mock object.
-     *    @return string                 Code for expectations.
-     *    @access private
-     */
-    function _chainMockExpectations() {
-        $code  = "    function expect(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expect(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectArguments(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectArguments(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectArgumentsAt(\$timing, \$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectArgumentsAt(\$timing, \$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectArgumentsAt(\$timing, \$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectCallCount(\$method, \$count) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectMaximumCallCount(\$method, \$count, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectMaximumCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectMinimumCallCount(\$method, \$count, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectMinimumCallCount(\$method, \$count, \$msg = '%s');\n";
-        $code .= "    }\n";
-        $code .= "    function expectNever(\$method) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectNever(\$method);\n";
-        $code .= "    }\n";
-        $code .= "    function expectOnce(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectOnce(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function expectAtLeastOnce(\$method, \$args = false, \$msg = '%s') {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->expectAtLeastOnce(\$method, \$args, \$msg);\n";
-        $code .= "    }\n";
-        $code .= "    function tally() {\n";
-        $code .= "    }\n";
-        return $code;
-    }
-    
-    /**
-     *    Adds code for chaining the throw methods.
-     *    @return string           Code for chains.
-     *    @access private
-     */
-    function _chainThrowMethods() {
-        $code  = "    function throwOn(\$method, \$exception = false, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->throwOn(\$method, \$exception, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function throwAt(\$timing, \$method, \$exception = false, \$args = false) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->throwAt(\$timing, \$method, \$exception, \$args);\n";
-        $code .= "    }\n";
-        $code .= "    function errorOn(\$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->errorOn(\$method, \$error, \$args, \$severity);\n";
-        $code .= "    }\n";
-        $code .= "    function errorAt(\$timing, \$method, \$error = 'A mock error', \$args = false, \$severity = E_USER_ERROR) {\n";
-        $code .= $this->_bailOutIfNotMocked("\$method");
-        $code .= "        \$this->_mock->errorAt(\$timing, \$method, \$error, \$args, \$severity);\n";
-        $code .= "    }\n";
-        return $code;
-    }
-
-    /**
-     *    Creates source code to override a list of methods
-     *    with mock versions.
-     *    @param array $methods    Methods to be overridden
-     *                             with mock versions.
-     *    @return string           Code for overridden chains.
-     *    @access private
-     */
-    function _overrideMethods($methods) {
-        $code = "";
-        foreach ($methods as $method) {
-            if ($this->_isConstructor($method)) {
-                continue;
-            }
-            $code .= "    " . $this->_reflection->getSignature($method) . " {\n";
-            $code .= "        \$args = func_get_args();\n";
-            $code .= "        \$result = &\$this->_mock->_invoke(\"$method\", \$args);\n";
-            $code .= "        return \$result;\n";
-            $code .= "    }\n";
-        }
-        return $code;
-    }
-}
-?>
diff --git a/tests/simpletest/page.php b/tests/simpletest/page.php
deleted file mode 100644
index 08e5649dc..000000000
--- a/tests/simpletest/page.php
+++ /dev/null
@@ -1,983 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: page.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**#@+
-    *   include other SimpleTest class files
-    */
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/parser.php');
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/form.php');
-require_once(dirname(__FILE__) . '/selector.php');
-/**#@-*/
-
-/**
- *    Creates tags and widgets given HTML tag
- *    attributes.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTagBuilder {
-
-    /**
-     *    Factory for the tag objects. Creates the
-     *    appropriate tag object for the incoming tag name
-     *    and attributes.
-     *    @param string $name        HTML tag name.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access public
-     */
-    function createTag($name, $attributes) {
-        static $map = array(
-                'a' => 'SimpleAnchorTag',
-                'title' => 'SimpleTitleTag',
-                'base' => 'SimpleBaseTag',
-                'button' => 'SimpleButtonTag',
-                'textarea' => 'SimpleTextAreaTag',
-                'option' => 'SimpleOptionTag',
-                'label' => 'SimpleLabelTag',
-                'form' => 'SimpleFormTag',
-                'frame' => 'SimpleFrameTag');
-        $attributes = $this->_keysToLowerCase($attributes);
-        if (array_key_exists($name, $map)) {
-            $tag_class = $map[$name];
-            return new $tag_class($attributes);
-        } elseif ($name == 'select') {
-            return $this->_createSelectionTag($attributes);
-        } elseif ($name == 'input') {
-            return $this->_createInputTag($attributes);
-        }
-        return new SimpleTag($name, $attributes);
-    }
-
-    /**
-     *    Factory for selection fields.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access protected
-     */
-    function _createSelectionTag($attributes) {
-        if (isset($attributes['multiple'])) {
-            return new MultipleSelectionTag($attributes);
-        }
-        return new SimpleSelectionTag($attributes);
-    }
-
-    /**
-     *    Factory for input tags.
-     *    @param hash $attributes    Element attributes.
-     *    @return SimpleTag          Tag object.
-     *    @access protected
-     */
-    function _createInputTag($attributes) {
-        if (! isset($attributes['type'])) {
-            return new SimpleTextTag($attributes);
-        }
-        $type = strtolower(trim($attributes['type']));
-        $map = array(
-                'submit' => 'SimpleSubmitTag',
-                'image' => 'SimpleImageSubmitTag',
-                'checkbox' => 'SimpleCheckboxTag',
-                'radio' => 'SimpleRadioButtonTag',
-                'text' => 'SimpleTextTag',
-                'hidden' => 'SimpleTextTag',
-                'password' => 'SimpleTextTag',
-                'file' => 'SimpleUploadTag');
-        if (array_key_exists($type, $map)) {
-            $tag_class = $map[$type];
-            return new $tag_class($attributes);
-        }
-        return false;
-    }
-
-    /**
-     *    Make the keys lower case for case insensitive look-ups.
-     *    @param hash $map   Hash to convert.
-     *    @return hash       Unchanged values, but keys lower case.
-     *    @access private
-     */
-    function _keysToLowerCase($map) {
-        $lower = array();
-        foreach ($map as $key => $value) {
-            $lower[strtolower($key)] = $value;
-        }
-        return $lower;
-    }
-}
-
-/**
- *    SAX event handler. Maintains a list of
- *    open tags and dispatches them as they close.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePageBuilder extends SimpleSaxListener {
-    var $_tags;
-    var $_page;
-    var $_private_content_tag;
-
-    /**
-     *    Sets the builder up empty.
-     *    @access public
-     */
-    function SimplePageBuilder() {
-        $this->SimpleSaxListener();
-    }
-    
-    /**
-     *    Frees up any references so as to allow the PHP garbage
-     *    collection from unset() to work.
-     *    @access public
-     */
-    function free() {
-        unset($this->_tags);
-        unset($this->_page);
-        unset($this->_private_content_tags);
-    }
-
-    /**
-     *    Reads the raw content and send events
-     *    into the page to be built.
-     *    @param $response SimpleHttpResponse  Fetched response.
-     *    @return SimplePage                   Newly parsed page.
-     *    @access public
-     */
-    function &parse($response) {
-        $this->_tags = array();
-        $this->_page = &$this->_createPage($response);
-        $parser = &$this->_createParser($this);
-        $parser->parse($response->getContent());
-        $this->_page->acceptPageEnd();
-        return $this->_page;
-    }
-
-    /**
-     *    Creates an empty page.
-     *    @return SimplePage        New unparsed page.
-     *    @access protected
-     */
-    function &_createPage($response) {
-        $page = &new SimplePage($response);
-        return $page;
-    }
-
-    /**
-     *    Creates the parser used with the builder.
-     *    @param $listener SimpleSaxListener   Target of parser.
-     *    @return SimpleSaxParser              Parser to generate
-     *                                         events for the builder.
-     *    @access protected
-     */
-    function &_createParser(&$listener) {
-        $parser = &new SimpleHtmlSaxParser($listener);
-        return $parser;
-    }
-    
-    /**
-     *    Start of element event. Opens a new tag.
-     *    @param string $name         Element name.
-     *    @param hash $attributes     Attributes without content
-     *                                are marked as true.
-     *    @return boolean             False on parse error.
-     *    @access public
-     */
-    function startElement($name, $attributes) {
-        $factory = &new SimpleTagBuilder();
-        $tag = $factory->createTag($name, $attributes);
-        if (! $tag) {
-            return true;
-        }
-        if ($tag->getTagName() == 'label') {
-            $this->_page->acceptLabelStart($tag);
-            $this->_openTag($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'form') {
-            $this->_page->acceptFormStart($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'frameset') {
-            $this->_page->acceptFramesetStart($tag);
-            return true;
-        }
-        if ($tag->getTagName() == 'frame') {
-            $this->_page->acceptFrame($tag);
-            return true;
-        }
-        if ($tag->isPrivateContent() && ! isset($this->_private_content_tag)) {
-            $this->_private_content_tag = &$tag;
-        }
-        if ($tag->expectEndTag()) {
-            $this->_openTag($tag);
-            return true;
-        }
-        $this->_page->acceptTag($tag);
-        return true;
-    }
-
-    /**
-     *    End of element event.
-     *    @param string $name        Element name.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function endElement($name) {
-        if ($name == 'label') {
-            $this->_page->acceptLabelEnd();
-            return true;
-        }
-        if ($name == 'form') {
-            $this->_page->acceptFormEnd();
-            return true;
-        }
-        if ($name == 'frameset') {
-            $this->_page->acceptFramesetEnd();
-            return true;
-        }
-        if ($this->_hasNamedTagOnOpenTagStack($name)) {
-            $tag = array_pop($this->_tags[$name]);
-            if ($tag->isPrivateContent() && $this->_private_content_tag->getTagName() == $name) {
-                unset($this->_private_content_tag);
-            }
-            $this->_addContentTagToOpenTags($tag);
-            $this->_page->acceptTag($tag);
-            return true;
-        }
-        return true;
-    }
-
-    /**
-     *    Test to see if there are any open tags awaiting
-     *    closure that match the tag name.
-     *    @param string $name        Element name.
-     *    @return boolean            True if any are still open.
-     *    @access private
-     */
-    function _hasNamedTagOnOpenTagStack($name) {
-        return isset($this->_tags[$name]) && (count($this->_tags[$name]) > 0);
-    }
-
-    /**
-     *    Unparsed, but relevant data. The data is added
-     *    to every open tag.
-     *    @param string $text        May include unparsed tags.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function addContent($text) {
-        if (isset($this->_private_content_tag)) {
-            $this->_private_content_tag->addContent($text);
-        } else {
-            $this->_addContentToAllOpenTags($text);
-        }
-        return true;
-    }
-
-    /**
-     *    Any content fills all currently open tags unless it
-     *    is part of an option tag.
-     *    @param string $text        May include unparsed tags.
-     *    @access private
-     */
-    function _addContentToAllOpenTags($text) {
-        foreach (array_keys($this->_tags) as $name) {
-            for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
-                $this->_tags[$name][$i]->addContent($text);
-            }
-        }
-    }
-
-    /**
-     *    Parsed data in tag form. The parsed tag is added
-     *    to every open tag. Used for adding options to select
-     *    fields only.
-     *    @param SimpleTag $tag        Option tags only.
-     *    @access private
-     */
-    function _addContentTagToOpenTags(&$tag) {
-        if ($tag->getTagName() != 'option') {
-            return;
-        }
-        foreach (array_keys($this->_tags) as $name) {
-            for ($i = 0, $count = count($this->_tags[$name]); $i < $count; $i++) {
-                $this->_tags[$name][$i]->addTag($tag);
-            }
-        }
-    }
-
-    /**
-     *    Opens a tag for receiving content. Multiple tags
-     *    will be receiving input at the same time.
-     *    @param SimpleTag $tag        New content tag.
-     *    @access private
-     */
-    function _openTag(&$tag) {
-        $name = $tag->getTagName();
-        if (! in_array($name, array_keys($this->_tags))) {
-            $this->_tags[$name] = array();
-        }
-        $this->_tags[$name][] = &$tag;
-    }
-}
-
-/**
- *    A wrapper for a web page.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimplePage {
-    var $_links;
-    var $_title;
-    var $_last_widget;
-    var $_label;
-    var $_left_over_labels;
-    var $_open_forms;
-    var $_complete_forms;
-    var $_frameset;
-    var $_frames;
-    var $_frameset_nesting_level;
-    var $_transport_error;
-    var $_raw;
-    var $_text;
-    var $_sent;
-    var $_headers;
-    var $_method;
-    var $_url;
-    var $_base = false;
-    var $_request_data;
-
-    /**
-     *    Parses a page ready to access it's contents.
-     *    @param SimpleHttpResponse $response     Result of HTTP fetch.
-     *    @access public
-     */
-    function SimplePage($response = false) {
-        $this->_links = array();
-        $this->_title = false;
-        $this->_left_over_labels = array();
-        $this->_open_forms = array();
-        $this->_complete_forms = array();
-        $this->_frameset = false;
-        $this->_frames = array();
-        $this->_frameset_nesting_level = 0;
-        $this->_text = false;
-        if ($response) {
-            $this->_extractResponse($response);
-        } else {
-            $this->_noResponse();
-        }
-    }
-
-    /**
-     *    Extracts all of the response information.
-     *    @param SimpleHttpResponse $response    Response being parsed.
-     *    @access private
-     */
-    function _extractResponse($response) {
-        $this->_transport_error = $response->getError();
-        $this->_raw = $response->getContent();
-        $this->_sent = $response->getSent();
-        $this->_headers = $response->getHeaders();
-        $this->_method = $response->getMethod();
-        $this->_url = $response->getUrl();
-        $this->_request_data = $response->getRequestData();
-    }
-
-    /**
-     *    Sets up a missing response.
-     *    @access private
-     */
-    function _noResponse() {
-        $this->_transport_error = 'No page fetched yet';
-        $this->_raw = false;
-        $this->_sent = false;
-        $this->_headers = false;
-        $this->_method = 'GET';
-        $this->_url = false;
-        $this->_request_data = false;
-    }
-
-    /**
-     *    Original request as bytes sent down the wire.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequest() {
-        return $this->_sent;
-    }
-
-    /**
-     *    Accessor for raw text of page.
-     *    @return string        Raw unparsed content.
-     *    @access public
-     */
-    function getRaw() {
-        return $this->_raw;
-    }
-
-    /**
-     *    Accessor for plain text of page as a text browser
-     *    would see it.
-     *    @return string        Plain text of page.
-     *    @access public
-     */
-    function getText() {
-        if (! $this->_text) {
-            $this->_text = SimpleHtmlSaxParser::normalise($this->_raw);
-        }
-        return $this->_text;
-    }
-
-    /**
-     *    Accessor for raw headers of page.
-     *    @return string       Header block as text.
-     *    @access public
-     */
-    function getHeaders() {
-        if ($this->_headers) {
-            return $this->_headers->getRaw();
-        }
-        return false;
-    }
-
-    /**
-     *    Original request method.
-     *    @return string        GET, POST or HEAD.
-     *    @access public
-     */
-    function getMethod() {
-        return $this->_method;
-    }
-
-    /**
-     *    Original resource name.
-     *    @return SimpleUrl        Current url.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->_url;
-    }
-
-    /**
-     *    Base URL if set via BASE tag page url otherwise
-     *    @return SimpleUrl        Base url.
-     *    @access public
-     */
-    function getBaseUrl() {
-        return $this->_base;
-    }
-
-    /**
-     *    Original request data.
-     *    @return mixed              Sent content.
-     *    @access public
-     */
-    function getRequestData() {
-        return $this->_request_data;
-    }
-
-    /**
-     *    Accessor for last error.
-     *    @return string        Error from last response.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->_transport_error;
-    }
-
-    /**
-     *    Accessor for current MIME type.
-     *    @return string    MIME type as string; e.g. 'text/html'
-     *    @access public
-     */
-    function getMimeType() {
-        if ($this->_headers) {
-            return $this->_headers->getMimeType();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for HTTP response code.
-     *    @return integer    HTTP response code received.
-     *    @access public
-     */
-    function getResponseCode() {
-        if ($this->_headers) {
-            return $this->_headers->getResponseCode();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for last Authentication type. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Description of challenge type.
-     *    @access public
-     */
-    function getAuthentication() {
-        if ($this->_headers) {
-            return $this->_headers->getAuthentication();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for last Authentication realm. Only valid
-     *    straight after a challenge (401).
-     *    @return string    Name of security realm.
-     *    @access public
-     */
-    function getRealm() {
-        if ($this->_headers) {
-            return $this->_headers->getRealm();
-        }
-        return false;
-    }
-
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false as no frames.
-     *    @return array    Always empty.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return array();
-    }
-
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           Always false.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return false;
-    }
-
-    /**
-     *    Sets the focus by name. Always fails for a leaf page.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        False as no frames.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return false;
-    }
-
-    /**
-     *    Clears the frame focus. Does nothing for a leaf page.
-     *    @access public
-     */
-    function clearFrameFocus() {
-    }
-
-    /**
-     *    Adds a tag to the page.
-     *    @param SimpleTag $tag        Tag to accept.
-     *    @access public
-     */
-    function acceptTag(&$tag) {
-        if ($tag->getTagName() == "a") {
-            $this->_addLink($tag);
-        } elseif ($tag->getTagName() == "base") {
-            $this->_setBase($tag);
-        } elseif ($tag->getTagName() == "title") {
-            $this->_setTitle($tag);
-        } elseif ($this->_isFormElement($tag->getTagName())) {
-            for ($i = 0; $i < count($this->_open_forms); $i++) {
-                $this->_open_forms[$i]->addWidget($tag);
-            }
-            $this->_last_widget = &$tag;
-        }
-    }
-
-    /**
-     *    Opens a label for a described widget.
-     *    @param SimpleFormTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptLabelStart(&$tag) {
-        $this->_label = &$tag;
-        unset($this->_last_widget);
-    }
-
-    /**
-     *    Closes the most recently opened label.
-     *    @access public
-     */
-    function acceptLabelEnd() {
-        if (isset($this->_label)) {
-            if (isset($this->_last_widget)) {
-                $this->_last_widget->setLabel($this->_label->getText());
-                unset($this->_last_widget);
-            } else {
-                $this->_left_over_labels[] = SimpleTestCompatibility::copy($this->_label);
-            }
-            unset($this->_label);
-        }
-    }
-
-    /**
-     *    Tests to see if a tag is a possible form
-     *    element.
-     *    @param string $name     HTML element name.
-     *    @return boolean         True if form element.
-     *    @access private
-     */
-    function _isFormElement($name) {
-        return in_array($name, array('input', 'button', 'textarea', 'select'));
-    }
-
-    /**
-     *    Opens a form. New widgets go here.
-     *    @param SimpleFormTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptFormStart(&$tag) {
-        $this->_open_forms[] = &new SimpleForm($tag, $this);
-    }
-
-    /**
-     *    Closes the most recently opened form.
-     *    @access public
-     */
-    function acceptFormEnd() {
-        if (count($this->_open_forms)) {
-            $this->_complete_forms[] = array_pop($this->_open_forms);
-        }
-    }
-
-    /**
-     *    Opens a frameset. A frameset may contain nested
-     *    frameset tags.
-     *    @param SimpleFramesetTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptFramesetStart(&$tag) {
-        if (! $this->_isLoadingFrames()) {
-            $this->_frameset = &$tag;
-        }
-        $this->_frameset_nesting_level++;
-    }
-
-    /**
-     *    Closes the most recently opened frameset.
-     *    @access public
-     */
-    function acceptFramesetEnd() {
-        if ($this->_isLoadingFrames()) {
-            $this->_frameset_nesting_level--;
-        }
-    }
-
-    /**
-     *    Takes a single frame tag and stashes it in
-     *    the current frame set.
-     *    @param SimpleFrameTag $tag      Tag to accept.
-     *    @access public
-     */
-    function acceptFrame(&$tag) {
-        if ($this->_isLoadingFrames()) {
-            if ($tag->getAttribute('src')) {
-                $this->_frames[] = &$tag;
-            }
-        }
-    }
-
-    /**
-     *    Test to see if in the middle of reading
-     *    a frameset.
-     *    @return boolean        True if inframeset.
-     *    @access private
-     */
-    function _isLoadingFrames() {
-        if (! $this->_frameset) {
-            return false;
-        }
-        return ($this->_frameset_nesting_level > 0);
-    }
-
-    /**
-     *    Test to see if link is an absolute one.
-     *    @param string $url     Url to test.
-     *    @return boolean        True if absolute.
-     *    @access protected
-     */
-    function _linkIsAbsolute($url) {
-        $parsed = new SimpleUrl($url);
-        return (boolean)($parsed->getScheme() && $parsed->getHost());
-    }
-
-    /**
-     *    Adds a link to the page.
-     *    @param SimpleAnchorTag $tag      Link to accept.
-     *    @access protected
-     */
-    function _addLink($tag) {
-        $this->_links[] = $tag;
-    }
-
-    /**
-     *    Marker for end of complete page. Any work in
-     *    progress can now be closed.
-     *    @access public
-     */
-    function acceptPageEnd() {
-        while (count($this->_open_forms)) {
-            $this->_complete_forms[] = array_pop($this->_open_forms);
-        }
-        foreach ($this->_left_over_labels as $label) {
-            for ($i = 0, $count = count($this->_complete_forms); $i < $count; $i++) {
-                $this->_complete_forms[$i]->attachLabelBySelector(
-                        new SimpleById($label->getFor()),
-                        $label->getText());
-            }
-        }
-    }
-
-    /**
-     *    Test for the presence of a frameset.
-     *    @return boolean        True if frameset.
-     *    @access public
-     */
-    function hasFrames() {
-        return (boolean)$this->_frameset;
-    }
-
-    /**
-     *    Accessor for frame name and source URL for every frame that
-     *    will need to be loaded. Immediate children only.
-     *    @return boolean/array     False if no frameset or
-     *                              otherwise a hash of frame URLs.
-     *                              The key is either a numerical
-     *                              base one index or the name attribute.
-     *    @access public
-     */
-    function getFrameset() {
-        if (! $this->_frameset) {
-            return false;
-        }
-        $urls = array();
-        for ($i = 0; $i < count($this->_frames); $i++) {
-            $name = $this->_frames[$i]->getAttribute('name');
-            $url = new SimpleUrl($this->_frames[$i]->getAttribute('src'));
-            $urls[$name ? $name : $i + 1] = $this->expandUrl($url);
-        }
-        return $urls;
-    }
-
-    /**
-     *    Fetches a list of loaded frames.
-     *    @return array/string    Just the URL for a single page.
-     *    @access public
-     */
-    function getFrames() {
-        $url = $this->expandUrl($this->getUrl());
-        return $url->asString();
-    }
-
-    /**
-     *    Accessor for a list of all links.
-     *    @return array   List of urls with scheme of
-     *                    http or https and hostname.
-     *    @access public
-     */
-    function getUrls() {
-        $all = array();
-        foreach ($this->_links as $link) {
-            $url = $this->_getUrlFromLink($link);
-            $all[] = $url->asString();
-        }
-        return $all;
-    }
-
-    /**
-     *    Accessor for URLs by the link label. Label will match
-     *    regardess of whitespace issues and case.
-     *    @param string $label    Text of link.
-     *    @return array           List of links with that label.
-     *    @access public
-     */
-    function getUrlsByLabel($label) {
-        $matches = array();
-        foreach ($this->_links as $link) {
-            if ($link->getText() == $label) {
-                $matches[] = $this->_getUrlFromLink($link);
-            }
-        }
-        return $matches;
-    }
-
-    /**
-     *    Accessor for a URL by the id attribute.
-     *    @param string $id       Id attribute of link.
-     *    @return SimpleUrl       URL with that id of false if none.
-     *    @access public
-     */
-    function getUrlById($id) {
-        foreach ($this->_links as $link) {
-            if ($link->getAttribute('id') === (string)$id) {
-                return $this->_getUrlFromLink($link);
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Converts a link tag into a target URL.
-     *    @param SimpleAnchor $link    Parsed link.
-     *    @return SimpleUrl            URL with frame target if any.
-     *    @access private
-     */
-    function _getUrlFromLink($link) {
-        $url = $this->expandUrl($link->getHref());
-        if ($link->getAttribute('target')) {
-            $url->setTarget($link->getAttribute('target'));
-        }
-        return $url;
-    }
-
-    /**
-     *    Expands expandomatic URLs into fully qualified
-     *    URLs.
-     *    @param SimpleUrl $url        Relative URL.
-     *    @return SimpleUrl            Absolute URL.
-     *    @access public
-     */
-    function expandUrl($url) {
-        if (! is_object($url)) {
-            $url = new SimpleUrl($url);
-        }
-        $location = $this->getBaseUrl() ? $this->getBaseUrl() : new SimpleUrl();
-        return $url->makeAbsolute($location->makeAbsolute($this->getUrl()));
-    }
-
-    /**
-     *    Sets the base url for the page.
-     *    @param SimpleTag $tag    Base URL for page.
-     *    @access protected
-     */
-    function _setBase(&$tag) {
-        $url = $tag->getAttribute('href');
-        $this->_base = new SimpleUrl($url);
-    }
-
-    /**
-     *    Sets the title tag contents.
-     *    @param SimpleTitleTag $tag    Title of page.
-     *    @access protected
-     */
-    function _setTitle(&$tag) {
-        $this->_title = &$tag;
-    }
-
-    /**
-     *    Accessor for parsed title.
-     *    @return string     Title or false if no title is present.
-     *    @access public
-     */
-    function getTitle() {
-        if ($this->_title) {
-            return $this->_title->getText();
-        }
-        return false;
-    }
-
-    /**
-     *    Finds a held form by button label. Will only
-     *    search correctly built forms.
-     *    @param SimpleSelector $selector       Button finder.
-     *    @return SimpleForm                    Form object containing
-     *                                          the button.
-     *    @access public
-     */
-    function &getFormBySubmit($selector) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->hasSubmit($selector)) {
-                return $this->_complete_forms[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a held form by image using a selector.
-     *    Will only search correctly built forms.
-     *    @param SimpleSelector $selector  Image finder.
-     *    @return SimpleForm               Form object containing
-     *                                     the image.
-     *    @access public
-     */
-    function &getFormByImage($selector) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->hasImage($selector)) {
-                return $this->_complete_forms[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Finds a held form by the form ID. A way of
-     *    identifying a specific form when we have control
-     *    of the HTML code.
-     *    @param string $id     Form label.
-     *    @return SimpleForm    Form object containing the matching ID.
-     *    @access public
-     */
-    function &getFormById($id) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->getId() == $id) {
-                return $this->_complete_forms[$i];
-            }
-        }
-        $null = null;
-        return $null;
-    }
-
-    /**
-     *    Sets a field on each form in which the field is
-     *    available.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @param string $value               Value to set field to.
-     *    @return boolean                    True if value is valid.
-     *    @access public
-     */
-    function setField($selector, $value, $position=false) {
-        $is_set = false;
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            if ($this->_complete_forms[$i]->setField($selector, $value, $position)) {
-                $is_set = true;
-            }
-        }
-        return $is_set;
-    }
-
-    /**
-     *    Accessor for a form element value within a page.
-     *    @param SimpleSelector $selector    Field finder.
-     *    @return string/boolean             A string if the field is
-     *                                       present, false if unchecked
-     *                                       and null if missing.
-     *    @access public
-     */
-    function getField($selector) {
-        for ($i = 0; $i < count($this->_complete_forms); $i++) {
-            $value = $this->_complete_forms[$i]->getValue($selector);
-            if (isset($value)) {
-                return $value;
-            }
-        }
-        return null;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/parser.php b/tests/simpletest/parser.php
deleted file mode 100644
index 3f3b37b83..000000000
--- a/tests/simpletest/parser.php
+++ /dev/null
@@ -1,764 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: parser.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * Lexer mode stack constants
- */
-foreach (array('LEXER_ENTER', 'LEXER_MATCHED',
-                'LEXER_UNMATCHED', 'LEXER_EXIT',
-                'LEXER_SPECIAL') as $i => $constant) {
-    if (! defined($constant)) {
-        define($constant, $i + 1);
-    }
-}
-/**#@-*/
-
-/**
- *    Compounded regular expression. Any of
- *    the contained patterns could match and
- *    when one does, it's label is returned.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class ParallelRegex {
-    var $_patterns;
-    var $_labels;
-    var $_regex;
-    var $_case;
-    
-    /**
-     *    Constructor. Starts with no patterns.
-     *    @param boolean $case    True for case sensitive, false
-     *                            for insensitive.
-     *    @access public
-     */
-    function ParallelRegex($case) {
-        $this->_case = $case;
-        $this->_patterns = array();
-        $this->_labels = array();
-        $this->_regex = null;
-    }
-    
-    /**
-     *    Adds a pattern with an optional label.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $label        Label of regex to be returned
-     *                                on a match.
-     *    @access public
-     */
-    function addPattern($pattern, $label = true) {
-        $count = count($this->_patterns);
-        $this->_patterns[$count] = $pattern;
-        $this->_labels[$count] = $label;
-        $this->_regex = null;
-    }
-    
-    /**
-     *    Attempts to match all patterns at once against
-     *    a string.
-     *    @param string $subject      String to match against.
-     *    @param string $match        First matched portion of
-     *                                subject.
-     *    @return boolean             True on success.
-     *    @access public
-     */
-    function match($subject, &$match) {
-        if (count($this->_patterns) == 0) {
-            return false;
-        }
-        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
-            $match = '';
-            return false;
-        }
-        $match = $matches[0];
-        for ($i = 1; $i < count($matches); $i++) {
-            if ($matches[$i]) {
-                return $this->_labels[$i - 1];
-            }
-        }
-        return true;
-    }
-    
-    /**
-     *    Compounds the patterns into a single
-     *    regular expression separated with the
-     *    "or" operator. Caches the regex.
-     *    Will automatically escape (, ) and / tokens.
-     *    @param array $patterns    List of patterns in order.
-     *    @access private
-     */
-    function _getCompoundedRegex() {
-        if ($this->_regex == null) {
-            for ($i = 0, $count = count($this->_patterns); $i < $count; $i++) {
-                $this->_patterns[$i] = '(' . str_replace(
-                        array('/', '(', ')'),
-                        array('\/', '\(', '\)'),
-                        $this->_patterns[$i]) . ')';
-            }
-            $this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
-        }
-        return $this->_regex;
-    }
-    
-    /**
-     *    Accessor for perl regex mode flags to use.
-     *    @return string       Perl regex flags.
-     *    @access private
-     */
-    function _getPerlMatchingFlags() {
-        return ($this->_case ? "msS" : "msSi");
-    }
-}
-
-/**
- *    States for a stack machine.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleStateStack {
-    var $_stack;
-    
-    /**
-     *    Constructor. Starts in named state.
-     *    @param string $start        Starting state name.
-     *    @access public
-     */
-    function SimpleStateStack($start) {
-        $this->_stack = array($start);
-    }
-    
-    /**
-     *    Accessor for current state.
-     *    @return string       State.
-     *    @access public
-     */
-    function getCurrent() {
-        return $this->_stack[count($this->_stack) - 1];
-    }
-    
-    /**
-     *    Adds a state to the stack and sets it
-     *    to be the current state.
-     *    @param string $state        New state.
-     *    @access public
-     */
-    function enter($state) {
-        array_push($this->_stack, $state);
-    }
-    
-    /**
-     *    Leaves the current state and reverts
-     *    to the previous one.
-     *    @return boolean    False if we drop off
-     *                       the bottom of the list.
-     *    @access public
-     */
-    function leave() {
-        if (count($this->_stack) == 1) {
-            return false;
-        }
-        array_pop($this->_stack);
-        return true;
-    }
-}
-
-/**
- *    Accepts text and breaks it into tokens.
- *    Some optimisation to make the sure the
- *    content is only scanned by the PHP regex
- *    parser once. Lexer modes must not start
- *    with leading underscores.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleLexer {
-    var $_regexes;
-    var $_parser;
-    var $_mode;
-    var $_mode_handlers;
-    var $_case;
-    
-    /**
-     *    Sets up the lexer in case insensitive matching
-     *    by default.
-     *    @param SimpleSaxParser $parser  Handling strategy by
-     *                                    reference.
-     *    @param string $start            Starting handler.
-     *    @param boolean $case            True for case sensitive.
-     *    @access public
-     */
-    function SimpleLexer(&$parser, $start = "accept", $case = false) {
-        $this->_case = $case;
-        $this->_regexes = array();
-        $this->_parser = &$parser;
-        $this->_mode = &new SimpleStateStack($start);
-        $this->_mode_handlers = array($start => $start);
-    }
-    
-    /**
-     *    Adds a token search pattern for a particular
-     *    parsing mode. The pattern does not change the
-     *    current mode.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @access public
-     */
-    function addPattern($pattern, $mode = "accept") {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern);
-        if (! isset($this->_mode_handlers[$mode])) {
-            $this->_mode_handlers[$mode] = $mode;
-        }
-    }
-    
-    /**
-     *    Adds a pattern that will enter a new parsing
-     *    mode. Useful for entering parenthesis, strings,
-     *    tags, etc.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @param string $new_mode     Change parsing to this new
-     *                                nested mode.
-     *    @access public
-     */
-    function addEntryPattern($pattern, $mode, $new_mode) {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern, $new_mode);
-        if (! isset($this->_mode_handlers[$new_mode])) {
-            $this->_mode_handlers[$new_mode] = $new_mode;
-        }
-    }
-    
-    /**
-     *    Adds a pattern that will exit the current mode
-     *    and re-enter the previous one.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Mode to leave.
-     *    @access public
-     */
-    function addExitPattern($pattern, $mode) {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern, "__exit");
-        if (! isset($this->_mode_handlers[$mode])) {
-            $this->_mode_handlers[$mode] = $mode;
-        }
-    }
-    
-    /**
-     *    Adds a pattern that has a special mode. Acts as an entry
-     *    and exit pattern in one go, effectively calling a special
-     *    parser handler for this token only.
-     *    @param string $pattern      Perl style regex, but ( and )
-     *                                lose the usual meaning.
-     *    @param string $mode         Should only apply this
-     *                                pattern when dealing with
-     *                                this type of input.
-     *    @param string $special      Use this mode for this one token.
-     *    @access public
-     */
-    function addSpecialPattern($pattern, $mode, $special) {
-        if (! isset($this->_regexes[$mode])) {
-            $this->_regexes[$mode] = new ParallelRegex($this->_case);
-        }
-        $this->_regexes[$mode]->addPattern($pattern, "_$special");
-        if (! isset($this->_mode_handlers[$special])) {
-            $this->_mode_handlers[$special] = $special;
-        }
-    }
-    
-    /**
-     *    Adds a mapping from a mode to another handler.
-     *    @param string $mode        Mode to be remapped.
-     *    @param string $handler     New target handler.
-     *    @access public
-     */
-    function mapHandler($mode, $handler) {
-        $this->_mode_handlers[$mode] = $handler;
-    }
-    
-    /**
-     *    Splits the page text into tokens. Will fail
-     *    if the handlers report an error or if no
-     *    content is consumed. If successful then each
-     *    unparsed and parsed token invokes a call to the
-     *    held listener.
-     *    @param string $raw        Raw HTML text.
-     *    @return boolean           True on success, else false.
-     *    @access public
-     */
-    function parse($raw) {
-        if (! isset($this->_parser)) {
-            return false;
-        }
-        $length = strlen($raw);
-        while (is_array($parsed = $this->_reduce($raw))) {
-            list($raw, $unmatched, $matched, $mode) = $parsed;
-            if (! $this->_dispatchTokens($unmatched, $matched, $mode)) {
-                return false;
-            }
-            if ($raw === '') {
-                return true;
-            }
-            if (strlen($raw) == $length) {
-                return false;
-            }
-            $length = strlen($raw);
-        }
-        if (! $parsed) {
-            return false;
-        }
-        return $this->_invokeParser($raw, LEXER_UNMATCHED);
-    }
-    
-    /**
-     *    Sends the matched token and any leading unmatched
-     *    text to the parser changing the lexer to a new
-     *    mode if one is listed.
-     *    @param string $unmatched    Unmatched leading portion.
-     *    @param string $matched      Actual token match.
-     *    @param string $mode         Mode after match. A boolean
-     *                                false mode causes no change.
-     *    @return boolean             False if there was any error
-     *                                from the parser.
-     *    @access private
-     */
-    function _dispatchTokens($unmatched, $matched, $mode = false) {
-        if (! $this->_invokeParser($unmatched, LEXER_UNMATCHED)) {
-            return false;
-        }
-        if (is_bool($mode)) {
-            return $this->_invokeParser($matched, LEXER_MATCHED);
-        }
-        if ($this->_isModeEnd($mode)) {
-            if (! $this->_invokeParser($matched, LEXER_EXIT)) {
-                return false;
-            }
-            return $this->_mode->leave();
-        }
-        if ($this->_isSpecialMode($mode)) {
-            $this->_mode->enter($this->_decodeSpecial($mode));
-            if (! $this->_invokeParser($matched, LEXER_SPECIAL)) {
-                return false;
-            }
-            return $this->_mode->leave();
-        }
-        $this->_mode->enter($mode);
-        return $this->_invokeParser($matched, LEXER_ENTER);
-    }
-    
-    /**
-     *    Tests to see if the new mode is actually to leave
-     *    the current mode and pop an item from the matching
-     *    mode stack.
-     *    @param string $mode    Mode to test.
-     *    @return boolean        True if this is the exit mode.
-     *    @access private
-     */
-    function _isModeEnd($mode) {
-        return ($mode === "__exit");
-    }
-    
-    /**
-     *    Test to see if the mode is one where this mode
-     *    is entered for this token only and automatically
-     *    leaves immediately afterwoods.
-     *    @param string $mode    Mode to test.
-     *    @return boolean        True if this is the exit mode.
-     *    @access private
-     */
-    function _isSpecialMode($mode) {
-        return (strncmp($mode, "_", 1) == 0);
-    }
-    
-    /**
-     *    Strips the magic underscore marking single token
-     *    modes.
-     *    @param string $mode    Mode to decode.
-     *    @return string         Underlying mode name.
-     *    @access private
-     */
-    function _decodeSpecial($mode) {
-        return substr($mode, 1);
-    }
-    
-    /**
-     *    Calls the parser method named after the current
-     *    mode. Empty content will be ignored. The lexer
-     *    has a parser handler for each mode in the lexer.
-     *    @param string $content        Text parsed.
-     *    @param boolean $is_match      Token is recognised rather
-     *                                  than unparsed data.
-     *    @access private
-     */
-    function _invokeParser($content, $is_match) {
-        if (($content === '') || ($content === false)) {
-            return true;
-        }
-        $handler = $this->_mode_handlers[$this->_mode->getCurrent()];
-        return $this->_parser->$handler($content, $is_match);
-    }
-    
-    /**
-     *    Tries to match a chunk of text and if successful
-     *    removes the recognised chunk and any leading
-     *    unparsed data. Empty strings will not be matched.
-     *    @param string $raw         The subject to parse. This is the
-     *                               content that will be eaten.
-     *    @return array/boolean      Three item list of unparsed
-     *                               content followed by the
-     *                               recognised token and finally the
-     *                               action the parser is to take.
-     *                               True if no match, false if there
-     *                               is a parsing error.
-     *    @access private
-     */
-    function _reduce($raw) {
-        if ($action = $this->_regexes[$this->_mode->getCurrent()]->match($raw, $match)) {
-            $unparsed_character_count = strpos($raw, $match);
-            $unparsed = substr($raw, 0, $unparsed_character_count);
-            $raw = substr($raw, $unparsed_character_count + strlen($match));
-            return array($raw, $unparsed, $match, $action);
-        }
-        return true;
-    }
-}
-
-/**
- *    Breaks HTML into SAX events.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHtmlLexer extends SimpleLexer {
-    
-    /**
-     *    Sets up the lexer with case insensitive matching
-     *    and adds the HTML handlers.
-     *    @param SimpleSaxParser $parser  Handling strategy by
-     *                                    reference.
-     *    @access public
-     */
-    function SimpleHtmlLexer(&$parser) {
-        $this->SimpleLexer($parser, 'text');
-        $this->mapHandler('text', 'acceptTextToken');
-        $this->_addSkipping();
-        foreach ($this->_getParsedTags() as $tag) {
-            $this->_addTag($tag);
-        }
-        $this->_addInTagTokens();
-    }
-    
-    /**
-     *    List of parsed tags. Others are ignored.
-     *    @return array        List of searched for tags.
-     *    @access private
-     */
-    function _getParsedTags() {
-        return array('a', 'base', 'title', 'form', 'input', 'button', 'textarea', 'select',
-                'option', 'frameset', 'frame', 'label');
-    }
-    
-    /**
-     *    The lexer has to skip certain sections such
-     *    as server code, client code and styles.
-     *    @access private
-     */
-    function _addSkipping() {
-        $this->mapHandler('css', 'ignore');
-        $this->addEntryPattern('<style', 'text', 'css');
-        $this->addExitPattern('</style>', 'css');
-        $this->mapHandler('js', 'ignore');
-        $this->addEntryPattern('<script', 'text', 'js');
-        $this->addExitPattern('</script>', 'js');
-        $this->mapHandler('comment', 'ignore');
-        $this->addEntryPattern('<!--', 'text', 'comment');
-        $this->addExitPattern('-->', 'comment');
-    }
-    
-    /**
-     *    Pattern matches to start and end a tag.
-     *    @param string $tag          Name of tag to scan for.
-     *    @access private
-     */
-    function _addTag($tag) {
-        $this->addSpecialPattern("</$tag>", 'text', 'acceptEndToken');
-        $this->addEntryPattern("<$tag", 'text', 'tag');
-    }
-    
-    /**
-     *    Pattern matches to parse the inside of a tag
-     *    including the attributes and their quoting.
-     *    @access private
-     */
-    function _addInTagTokens() {
-        $this->mapHandler('tag', 'acceptStartToken');
-        $this->addSpecialPattern('\s+', 'tag', 'ignore');
-        $this->_addAttributeTokens();
-        $this->addExitPattern('/>', 'tag');
-        $this->addExitPattern('>', 'tag');
-    }
-    
-    /**
-     *    Matches attributes that are either single quoted,
-     *    double quoted or unquoted.
-     *    @access private
-     */
-    function _addAttributeTokens() {
-        $this->mapHandler('dq_attribute', 'acceptAttributeToken');
-        $this->addEntryPattern('=\s*"', 'tag', 'dq_attribute');
-        $this->addPattern("\\\\\"", 'dq_attribute');
-        $this->addExitPattern('"', 'dq_attribute');
-        $this->mapHandler('sq_attribute', 'acceptAttributeToken');
-        $this->addEntryPattern("=\s*'", 'tag', 'sq_attribute');
-        $this->addPattern("\\\\'", 'sq_attribute');
-        $this->addExitPattern("'", 'sq_attribute');
-        $this->mapHandler('uq_attribute', 'acceptAttributeToken');
-        $this->addSpecialPattern('=\s*[^>\s]*', 'tag', 'uq_attribute');
-    }
-}
-
-/**
- *    Converts HTML tokens into selected SAX events.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleHtmlSaxParser {
-    var $_lexer;
-    var $_listener;
-    var $_tag;
-    var $_attributes;
-    var $_current_attribute;
-    
-    /**
-     *    Sets the listener.
-     *    @param SimpleSaxListener $listener    SAX event handler.
-     *    @access public
-     */
-    function SimpleHtmlSaxParser(&$listener) {
-        $this->_listener = &$listener;
-        $this->_lexer = &$this->createLexer($this);
-        $this->_tag = '';
-        $this->_attributes = array();
-        $this->_current_attribute = '';
-    }
-    
-    /**
-     *    Runs the content through the lexer which
-     *    should call back to the acceptors.
-     *    @param string $raw      Page text to parse.
-     *    @return boolean         False if parse error.
-     *    @access public
-     */
-    function parse($raw) {
-        return $this->_lexer->parse($raw);
-    }
-    
-    /**
-     *    Sets up the matching lexer. Starts in 'text' mode.
-     *    @param SimpleSaxParser $parser    Event generator, usually $self.
-     *    @return SimpleLexer               Lexer suitable for this parser.
-     *    @access public
-     *    @static
-     */
-    function &createLexer(&$parser) {
-        $lexer = &new SimpleHtmlLexer($parser);
-        return $lexer;
-    }
-    
-    /**
-     *    Accepts a token from the tag mode. If the
-     *    starting element completes then the element
-     *    is dispatched and the current attributes
-     *    set back to empty. The element or attribute
-     *    name is converted to lower case.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptStartToken($token, $event) {
-        if ($event == LEXER_ENTER) {
-            $this->_tag = strtolower(substr($token, 1));
-            return true;
-        }
-        if ($event == LEXER_EXIT) {
-            $success = $this->_listener->startElement(
-                    $this->_tag,
-                    $this->_attributes);
-            $this->_tag = '';
-            $this->_attributes = array();
-            return $success;
-        }
-        if ($token != '=') {
-            $this->_current_attribute = strtolower(SimpleHtmlSaxParser::decodeHtml($token));
-            $this->_attributes[$this->_current_attribute] = '';
-        }
-        return true;
-    }
-    
-    /**
-     *    Accepts a token from the end tag mode.
-     *    The element name is converted to lower case.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptEndToken($token, $event) {
-        if (! preg_match('/<\/(.*)>/', $token, $matches)) {
-            return false;
-        }
-        return $this->_listener->endElement(strtolower($matches[1]));
-    }
-    
-    /**
-     *    Part of the tag data.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptAttributeToken($token, $event) {
-        if ($this->_current_attribute) {
-            if ($event == LEXER_UNMATCHED) {
-                $this->_attributes[$this->_current_attribute] .=
-                        SimpleHtmlSaxParser::decodeHtml($token);
-            }
-            if ($event == LEXER_SPECIAL) {
-                $this->_attributes[$this->_current_attribute] .=
-                        preg_replace('/^=\s*/' , '', SimpleHtmlSaxParser::decodeHtml($token));
-            }
-        }
-        return true;
-    }
-    
-    /**
-     *    A character entity.
-     *    @param string $token    Incoming characters.
-     *    @param integer $event   Lexer event type.
-     *    @return boolean         False if parse error.
-     *    @access public
-     */
-    function acceptEntityToken($token, $event) {
-    }
-    
-    /**
-     *    Character data between tags regarded as
-     *    important.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function acceptTextToken($token, $event) {
-        return $this->_listener->addContent($token);
-    }
-    
-    /**
-     *    Incoming data to be ignored.
-     *    @param string $token     Incoming characters.
-     *    @param integer $event    Lexer event type.
-     *    @return boolean          False if parse error.
-     *    @access public
-     */
-    function ignore($token, $event) {
-        return true;
-    }
-    
-    /**
-     *    Decodes any HTML entities.
-     *    @param string $html    Incoming HTML.
-     *    @return string         Outgoing plain text.
-     *    @access public
-     *    @static
-     */
-    function decodeHtml($html) {
-        return html_entity_decode($html, ENT_QUOTES);
-    }
-    
-    /**
-     *    Turns HTML into text browser visible text. Images
-     *    are converted to their alt text and tags are supressed.
-     *    Entities are converted to their visible representation.
-     *    @param string $html        HTML to convert.
-     *    @return string             Plain text.
-     *    @access public
-     *    @static
-     */
-    function normalise($html) {
-        $text = preg_replace('|<!--.*?-->|', '', $html);
-        $text = preg_replace('|<script[^>]*>.*?</script>|', '', $text);
-        $text = preg_replace('|<img[^>]*alt\s*=\s*"([^"]*)"[^>]*>|', ' \1 ', $text);
-        $text = preg_replace('|<img[^>]*alt\s*=\s*\'([^\']*)\'[^>]*>|', ' \1 ', $text);
-        $text = preg_replace('|<img[^>]*alt\s*=\s*([a-zA-Z_]+)[^>]*>|', ' \1 ', $text);
-        $text = preg_replace('|<[^>]*>|', '', $text);
-        $text = SimpleHtmlSaxParser::decodeHtml($text);
-        $text = preg_replace('|\s+|', ' ', $text);
-        return trim(trim($text), "\xA0");        // TODO: The \xAO is a &nbsp;. Add a test for this.
-    }
-}
-
-/**
- *    SAX event handler.
- *    @package SimpleTest
- *    @subpackage WebTester
- *    @abstract
- */
-class SimpleSaxListener {
-    
-    /**
-     *    Sets the document to write to.
-     *    @access public
-     */
-    function SimpleSaxListener() {
-    }
-    
-    /**
-     *    Start of element event.
-     *    @param string $name        Element name.
-     *    @param hash $attributes    Name value pairs.
-     *                               Attributes without content
-     *                               are marked as true.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function startElement($name, $attributes) {
-    }
-    
-    /**
-     *    End of element event.
-     *    @param string $name        Element name.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function endElement($name) {
-    }
-    
-    /**
-     *    Unparsed, but relevant data.
-     *    @param string $text        May include unparsed tags.
-     *    @return boolean            False on parse error.
-     *    @access public
-     */
-    function addContent($text) {
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/reflection_php4.php b/tests/simpletest/reflection_php4.php
deleted file mode 100644
index 6c93915af..000000000
--- a/tests/simpletest/reflection_php4.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reflection_php4.php 1672 2008-03-02 04:47:34Z edwardzyang $
- */
-
-/**
- *  Version specific reflection API.
- *  @package SimpleTest
- *  @subpackage UnitTester
- *  @ignore duplicate with reflection_php5.php
- */
-class SimpleReflection {
-    var $_interface;
-
-    /**
-     *    Stashes the class/interface.
-     *    @param string $interface    Class or interface
-     *                                to inspect.
-     */
-    function SimpleReflection($interface) {
-        $this->_interface = $interface;
-    }
-
-    /**
-     *    Checks that a class has been declared.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExists() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExistsSansAutoload() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Checks that a class or interface has been
-     *    declared.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExists() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExistsSansAutoload() {
-        return class_exists($this->_interface);
-    }
-
-    /**
-     *    Gets the list of methods on a class or
-     *    interface.
-     *    @returns array          List of method names.
-     *    @access public
-     */
-    function getMethods() {
-        return get_class_methods($this->_interface);
-    }
-
-    /**
-     *    Gets the list of interfaces from a class. If the
-     *    class name is actually an interface then just that
-     *    interface is returned.
-     *    @returns array          List of interfaces.
-     *    @access public
-     */
-    function getInterfaces() {
-        return array();
-    }
-
-    /**
-     *    Finds the parent class name.
-     *    @returns string      Parent class name.
-     *    @access public
-     */
-    function getParent() {
-        return strtolower(get_parent_class($this->_interface));
-    }
-
-    /**
-     *    Determines if the class is abstract, which for PHP 4
-     *    will never be the case.
-     *    @returns boolean      True if abstract.
-     *    @access public
-     */
-    function isAbstract() {
-        return false;
-    }
-
-    /**
-     *    Determines if the the entity is an interface, which for PHP 4
-     *    will never be the case.
-     *    @returns boolean      True if interface.
-     *    @access public
-     */
-    function isInterface() {
-        return false;
-    }
-        
-    /**
-     *    Scans for final methods, but as it's PHP 4 there
-     *    aren't any.
-     *    @returns boolean   True if the class has a final method.
-     *    @access public
-     */
-    function hasFinal() {
-        return false;
-    }
-
-    /**
-     *    Gets the source code matching the declaration
-     *    of a method.
-     *    @param string $method       Method name.
-     *    @access public
-     */
-    function getSignature($method) {
-        return "function &$method()";
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/reflection_php5.php b/tests/simpletest/reflection_php5.php
deleted file mode 100644
index 8383bccd3..000000000
--- a/tests/simpletest/reflection_php5.php
+++ /dev/null
@@ -1,380 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reflection_php5.php 1683 2008-03-05 21:57:08Z lastcraft $
- */
-
-/**
- *    Version specific reflection API.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReflection {
-    var $_interface;
-
-    /**
-     *    Stashes the class/interface.
-     *    @param string $interface    Class or interface
-     *                                to inspect.
-     */
-    function SimpleReflection($interface) {
-        $this->_interface = $interface;
-    }
-
-    /**
-     *    Checks that a class has been declared. Versions
-     *    before PHP5.0.2 need a check that it's not really
-     *    an interface.
-     *    @return boolean            True if defined.
-     *    @access public
-     */
-    function classExists() {
-        if (! class_exists($this->_interface)) {
-            return false;
-        }
-        $reflection = new ReflectionClass($this->_interface);
-        return ! $reflection->isInterface();
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classExistsSansAutoload() {
-        return class_exists($this->_interface, false);
-    }
-
-    /**
-     *    Checks that a class or interface has been
-     *    declared.
-     *    @return boolean            True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExists() {
-        return $this->_classOrInterfaceExistsWithAutoload($this->_interface, true);
-    }
-
-    /**
-     *    Needed to kill the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @return boolean        True if defined.
-     *    @access public
-     */
-    function classOrInterfaceExistsSansAutoload() {
-        return $this->_classOrInterfaceExistsWithAutoload($this->_interface, false);
-    }
-
-    /**
-     *    Needed to select the autoload feature in PHP5
-     *    for classes created dynamically.
-     *    @param string $interface       Class or interface name.
-     *    @param boolean $autoload       True totriggerautoload.
-     *    @return boolean                True if interface defined.
-     *    @access private
-     */
-    function _classOrInterfaceExistsWithAutoload($interface, $autoload) {
-        if (function_exists('interface_exists')) {
-            if (interface_exists($this->_interface, $autoload)) {
-                return true;
-            }
-        }
-        return class_exists($this->_interface, $autoload);
-    }
-
-    /**
-     *    Gets the list of methods on a class or
-     *    interface.
-     *    @returns array              List of method names.
-     *    @access public
-     */
-    function getMethods() {
-        return array_unique(get_class_methods($this->_interface));
-    }
-
-    /**
-     *    Gets the list of interfaces from a class. If the
-     *    class name is actually an interface then just that
-     *    interface is returned.
-     *    @returns array          List of interfaces.
-     *    @access public
-     */
-    function getInterfaces() {
-        $reflection = new ReflectionClass($this->_interface);
-        if ($reflection->isInterface()) {
-            return array($this->_interface);
-        }
-        return $this->_onlyParents($reflection->getInterfaces());
-    }
-
-    /**
-     *    Gets the list of methods for the implemented
-     *    interfaces only.
-     *    @returns array      List of enforced method signatures.
-     *    @access public
-     */
-    function getInterfaceMethods() {
-        $methods = array();
-        foreach ($this->getInterfaces() as $interface) {
-            $methods = array_merge($methods, get_class_methods($interface));
-        }
-        return array_unique($methods);
-    }
-
-    /**
-     *    Checks to see if the method signature has to be tightly
-     *    specified.
-     *    @param string $method        Method name.
-     *    @returns boolean             True if enforced.
-     *    @access private
-     */
-    function _isInterfaceMethod($method) {
-        return in_array($method, $this->getInterfaceMethods());
-    }
-
-    /**
-     *    Finds the parent class name.
-     *    @returns string      Parent class name.
-     *    @access public
-     */
-    function getParent() {
-        $reflection = new ReflectionClass($this->_interface);
-        $parent = $reflection->getParentClass();
-        if ($parent) {
-            return $parent->getName();
-        }
-        return false;
-    }
-
-    /**
-     *    Trivially determines if the class is abstract.
-     *    @returns boolean      True if abstract.
-     *    @access public
-     */
-    function isAbstract() {
-        $reflection = new ReflectionClass($this->_interface);
-        return $reflection->isAbstract();
-    }
-
-    /**
-     *    Trivially determines if the class is an interface.
-     *    @returns boolean      True if interface.
-     *    @access public
-     */
-    function isInterface() {
-        $reflection = new ReflectionClass($this->_interface);
-        return $reflection->isInterface();
-    }
-
-    /**
-     *    Scans for final methods, as they screw up inherited
-     *    mocks by not allowing you to override them.
-     *    @returns boolean   True if the class has a final method.
-     *    @access public
-     */
-    function hasFinal() {
-        $reflection = new ReflectionClass($this->_interface);
-        foreach ($reflection->getMethods() as $method) {
-            if ($method->isFinal()) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Whittles a list of interfaces down to only the
-     *    necessary top level parents.
-     *    @param array $interfaces     Reflection API interfaces
-     *                                 to reduce.
-     *    @returns array               List of parent interface names.
-     *    @access private
-     */
-    function _onlyParents($interfaces) {
-        $parents = array();
-        $blacklist = array();
-        foreach ($interfaces as $interface) {
-            foreach($interfaces as $possible_parent) {
-                if ($interface->getName() == $possible_parent->getName()) {
-                    continue;
-                }
-                if ($interface->isSubClassOf($possible_parent)) {
-                    $blacklist[$possible_parent->getName()] = true;
-                }
-            }
-            if (!isset($blacklist[$interface->getName()])) {
-                $parents[] = $interface->getName();
-            }
-        }
-        return $parents;
-    }
-
-    /**
-     * Checks whether a method is abstract or not.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is abstract, else false
-     * @access  private
-     */
-    function _isAbstractMethod($name) {
-        $interface = new ReflectionClass($this->_interface);
-        if (! $interface->hasMethod($name)) {
-            return false;
-        }
-        return $interface->getMethod($name)->isAbstract();
-    }
-
-    /**
-     * Checks whether a method is the constructor.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is the constructor
-     * @access  private
-     */
-    function _isConstructor($name) {
-        return ($name == '__construct') || ($name == $this->_interface);
-    }
-
-    /**
-     * Checks whether a method is abstract in all parents or not.
-     * @param   string   $name  Method name.
-     * @return  bool            true if method is abstract in parent, else false
-     * @access  private
-     */
-    function _isAbstractMethodInParents($name) {
-        $interface = new ReflectionClass($this->_interface);
-        $parent = $interface->getParentClass();
-        while($parent) {
-            if (! $parent->hasMethod($name)) {
-                return false;
-            }
-            if ($parent->getMethod($name)->isAbstract()) {
-                return true;
-            }
-            $parent = $parent->getParentClass();
-        }
-        return false;
-    }
-
-    /**
-     * Checks whether a method is static or not.
-     * @param   string  $name   Method name
-     * @return  bool            true if method is static, else false
-     * @access  private
-     */
-    function _isStaticMethod($name) {
-        $interface = new ReflectionClass($this->_interface);
-        if (! $interface->hasMethod($name)) {
-            return false;
-        }
-        return $interface->getMethod($name)->isStatic();
-    }
-
-    /**
-     *    Writes the source code matching the declaration
-     *    of a method.
-     *    @param string $name    Method name.
-     *    @return string         Method signature up to last
-     *                           bracket.
-     *    @access public
-     */
-    function getSignature($name) {
-        if ($name == '__set') {
-            return 'function __set($key, $value)';
-        }
-        if ($name == '__call') {
-            return 'function __call($method, $arguments)';
-        }
-        if (version_compare(phpversion(), '5.1.0', '>=')) {
-            if (in_array($name, array('__get', '__isset', $name == '__unset'))) {
-                return "function {$name}(\$key)";
-            }
-        }
-        if ($name == '__toString') {
-            return "function $name()";
-        }
-        if ($this->_isInterfaceMethod($name) ||
-                $this->_isAbstractMethod($name) ||
-                $this->_isAbstractMethodInParents($name) ||
-                $this->_isStaticMethod($name)) {
-            return $this->_getFullSignature($name);
-        }
-        return "function $name()";
-    }
-
-    /**
-     *    For a signature specified in an interface, full
-     *    details must be replicated to be a valid implementation.
-     *    @param string $name    Method name.
-     *    @return string         Method signature up to last
-     *                           bracket.
-     *    @access private
-     */
-    function _getFullSignature($name) {
-        $interface = new ReflectionClass($this->_interface);
-        $method = $interface->getMethod($name);
-        $reference = $method->returnsReference() ? '&' : '';
-        $static = $method->isStatic() ? 'static ' : '';
-        return "{$static}function $reference$name(" .
-                implode(', ', $this->_getParameterSignatures($method)) .
-                ")";
-    }
-
-    /**
-     *    Gets the source code for each parameter.
-     *    @param ReflectionMethod $method   Method object from
-     *                                      reflection API
-     *    @return array                     List of strings, each
-     *                                      a snippet of code.
-     *    @access private
-     */
-    function _getParameterSignatures($method) {
-        $signatures = array();
-        foreach ($method->getParameters() as $parameter) {
-            $signature = '';
-            $type = $parameter->getClass();
-            if (is_null($type) && version_compare(phpversion(), '5.1.0', '>=') && $parameter->isArray()) {
-                $signature .= 'array ';
-            } elseif (!is_null($type)) {
-                $signature .= $type->getName() . ' ';
-            }
-            if ($parameter->isPassedByReference()) {
-                $signature .= '&';
-            }
-            $signature .= '$' . $this->_suppressSpurious($parameter->getName());
-            if ($this->_isOptional($parameter)) {
-                $signature .= ' = null';
-            }
-            $signatures[] = $signature;
-        }
-        return $signatures;
-    }
-
-    /**
-     *    The SPL library has problems with the
-     *    Reflection library. In particular, you can
-     *    get extra characters in parameter names :(.
-     *    @param string $name    Parameter name.
-     *    @return string         Cleaner name.
-     *    @access private
-     */
-    function _suppressSpurious($name) {
-        return str_replace(array('[', ']', ' '), '', $name);
-    }
-
-    /**
-     *    Test of a reflection parameter being optional
-     *    that works with early versions of PHP5.
-     *    @param reflectionParameter $parameter    Is this optional.
-     *    @return boolean                          True if optional.
-     *    @access private
-     */
-    function _isOptional($parameter) {
-        if (method_exists($parameter, 'isOptional')) {
-            return $parameter->isOptional();
-        }
-        return false;
-    }
-}
-?>
diff --git a/tests/simpletest/remote.php b/tests/simpletest/remote.php
deleted file mode 100644
index 8889ed7bf..000000000
--- a/tests/simpletest/remote.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: remote.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/browser.php');
-require_once(dirname(__FILE__) . '/xml.php');
-require_once(dirname(__FILE__) . '/test_case.php');
-/**#@-*/
-
-/**
- *    Runs an XML formated test on a remote server.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class RemoteTestCase {
-    var $_url;
-    var $_dry_url;
-    var $_size;
-    
-    /**
-     *    Sets the location of the remote test.
-     *    @param string $url       Test location.
-     *    @param string $dry_url   Location for dry run.
-     *    @access public
-     */
-    function RemoteTestCase($url, $dry_url = false) {
-        $this->_url = $url;
-        $this->_dry_url = $dry_url ? $dry_url : $url;
-        $this->_size = false;
-    }
-    
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_url;
-    }
-
-    /**
-     *    Runs the top level test for this class. Currently
-     *    reads the data as a single chunk. I'll fix this
-     *    once I have added iteration to the browser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @returns boolean                   True if no failures.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $browser = &$this->_createBrowser();
-        $xml = $browser->get($this->_url);
-        if (! $xml) {
-            trigger_error('Cannot read remote test URL [' . $this->_url . ']');
-            return false;
-        }
-        $parser = &$this->_createParser($reporter);
-        if (! $parser->parse($xml)) {
-            trigger_error('Cannot parse incoming XML from [' . $this->_url . ']');
-            return false;
-        }
-        return true;
-    }
-    
-    /**
-     *    Creates a new web browser object for fetching
-     *    the XML report.
-     *    @return SimpleBrowser           New browser.
-     *    @access protected
-     */
-    function &_createBrowser() {
-        $browser = &new SimpleBrowser();
-        return $browser;
-    }
-    
-    /**
-     *    Creates the XML parser.
-     *    @param SimpleReporter $reporter    Target of test results.
-     *    @return SimpleTestXmlListener      XML reader.
-     *    @access protected
-     */
-    function &_createParser(&$reporter) {
-        $parser = &new SimpleTestXmlParser($reporter);
-        return $parser;
-    }
-    
-    /**
-     *    Accessor for the number of subtests.
-     *    @return integer           Number of test cases.
-     *    @access public
-     */
-    function getSize() {
-        if ($this->_size === false) {
-            $browser = &$this->_createBrowser();
-            $xml = $browser->get($this->_dry_url);
-            if (! $xml) {
-                trigger_error('Cannot read remote test URL [' . $this->_dry_url . ']');
-                return false;
-            }
-            $reporter = &new SimpleReporter();
-            $parser = &$this->_createParser($reporter);
-            if (! $parser->parse($xml)) {
-                trigger_error('Cannot parse incoming XML from [' . $this->_dry_url . ']');
-                return false;
-            }
-            $this->_size = $reporter->getTestCaseCount();
-        }
-        return $this->_size;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/reporter.php b/tests/simpletest/reporter.php
deleted file mode 100644
index a13eff8cf..000000000
--- a/tests/simpletest/reporter.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: reporter.php 1702 2008-03-25 00:08:04Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-/**#@-*/
-
-/**
- *    Sample minimal test displayer. Generates only
- *    failure messages and a pass count.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class HtmlReporter extends SimpleReporter {
-    var $_character_set;
-
-    /**
-     *    Does nothing yet. The first output will
-     *    be sent on the first test start. For use
-     *    by a web browser.
-     *    @access public
-     */
-    function HtmlReporter($character_set = 'ISO-8859-1') {
-        $this->SimpleReporter();
-        $this->_character_set = $character_set;
-    }
-
-    /**
-     *    Paints the top of the web page setting the
-     *    title to the name of the starting test.
-     *    @param string $test_name      Name class of test.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-        $this->sendNoCacheHeaders();
-        print "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">";
-        print "<html>\n<head>\n<title>$test_name</title>\n";
-        print "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" .
-                $this->_character_set . "\">\n";
-        print "<style type=\"text/css\">\n";
-        print $this->_getCss() . "\n";
-        print "</style>\n";
-        print "</head>\n<body>\n";
-        print "<h1>$test_name</h1>\n";
-        flush();
-    }
-
-    /**
-     *    Send the headers necessary to ensure the page is
-     *    reloaded on every request. Otherwise you could be
-     *    scratching your head over out of date test data.
-     *    @access public
-     *    @static
-     */
-    function sendNoCacheHeaders() {
-        if (! headers_sent()) {
-            header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-            header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-            header("Cache-Control: no-store, no-cache, must-revalidate");
-            header("Cache-Control: post-check=0, pre-check=0", false);
-            header("Pragma: no-cache");
-        }
-    }
-
-    /**
-     *    Paints the CSS. Add additional styles here.
-     *    @return string            CSS code as text.
-     *    @access protected
-     */
-    function _getCss() {
-        return ".fail { background-color: inherit; color: red; }" .
-                ".pass { background-color: inherit; color: green; }" .
-                " pre { background-color: lightgray; color: inherit; }";
-    }
-
-    /**
-     *    Paints the end of the test with a summary of
-     *    the passes and failures.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-        $colour = ($this->getFailCount() + $this->getExceptionCount() > 0 ? "red" : "green");
-        print "<div style=\"";
-        print "padding: 8px; margin-top: 1em; background-color: $colour; color: white;";
-        print "\">";
-        print $this->getTestCaseProgress() . "/" . $this->getTestCaseCount();
-        print " test cases complete:\n";
-        print "<strong>" . $this->getPassCount() . "</strong> passes, ";
-        print "<strong>" . $this->getFailCount() . "</strong> fails and ";
-        print "<strong>" . $this->getExceptionCount() . "</strong> exceptions.";
-        print "</div>\n";
-        print "</body>\n</html>\n";
-    }
-
-    /**
-     *    Paints the test failure with a breadcrumbs
-     *    trail of the nesting test suites below the
-     *    top level test.
-     *    @param string $message    Failure message displayed in
-     *                              the context of the other tests.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print "<span class=\"fail\">Fail</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . $this->_htmlEntities($message) . "<br />\n";
-    }
-
-    /**
-     *    Paints a PHP error.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print "<span class=\"fail\">Exception</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
-    }
-
-    /**
-     *    Paints a PHP exception.
-     *    @param Exception $exception        Exception to display.
-     *    @access public
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        print "<span class=\"fail\">Exception</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print " -&gt; <strong>" . $this->_htmlEntities($message) . "</strong><br />\n";
-    }
-    
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print "<span class=\"pass\">Skipped</span>: ";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print implode(" -&gt; ", $breadcrumb);
-        print " -&gt; " . $this->_htmlEntities($message) . "<br />\n";
-    }
-
-    /**
-     *    Paints formatted text such as dumped variables.
-     *    @param string $message        Text to show.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        print '<pre>' . $this->_htmlEntities($message) . '</pre>';
-    }
-
-    /**
-     *    Character set adjusted entity conversion.
-     *    @param string $message    Plain text or Unicode message.
-     *    @return string            Browser readable message.
-     *    @access protected
-     */
-    function _htmlEntities($message) {
-        return htmlentities($message, ENT_COMPAT, $this->_character_set);
-    }
-}
-
-/**
- *    Sample minimal test displayer. Generates only
- *    failure messages and a pass count. For command
- *    line use. I've tried to make it look like JUnit,
- *    but I wanted to output the errors as they arrived
- *    which meant dropping the dots.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class TextReporter extends SimpleReporter {
-
-    /**
-     *    Does nothing yet. The first output will
-     *    be sent on the first test start.
-     *    @access public
-     */
-    function TextReporter() {
-        $this->SimpleReporter();
-    }
-
-    /**
-     *    Paints the title only.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintHeader($test_name) {
-        if (! SimpleReporter::inCli()) {
-            header('Content-type: text/plain');
-        }
-        print "$test_name\n";
-        flush();
-    }
-
-    /**
-     *    Paints the end of the test with a summary of
-     *    the passes and failures.
-     *    @param string $test_name        Name class of test.
-     *    @access public
-     */
-    function paintFooter($test_name) {
-        if ($this->getFailCount() + $this->getExceptionCount() == 0) {
-            print "OK\n";
-        } else {
-            print "FAILURES!!!\n";
-        }
-        print "Test cases run: " . $this->getTestCaseProgress() .
-                "/" . $this->getTestCaseCount() .
-                ", Passes: " . $this->getPassCount() .
-                ", Failures: " . $this->getFailCount() .
-                ", Exceptions: " . $this->getExceptionCount() . "\n";
-    }
-
-    /**
-     *    Paints the test failure as a stack trace.
-     *    @param string $message    Failure message displayed in
-     *                              the context of the other tests.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print $this->getFailCount() . ") $message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Paints a PHP error or exception.
-     *    @param string $message        Message to be shown.
-     *    @access public
-     *    @abstract
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-
-    /**
-     *    Paints a PHP error or exception.
-     *    @param Exception $exception      Exception to describe.
-     *    @access public
-     *    @abstract
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print "Exception " . $this->getExceptionCount() . "!\n$message\n";
-        $breadcrumb = $this->getTestList();
-        array_shift($breadcrumb);
-        print "\tin " . implode("\n\tin ", array_reverse($breadcrumb));
-        print "\n";
-    }
-    
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print "Skip: $message\n";
-    }
-
-    /**
-     *    Paints formatted text such as dumped variables.
-     *    @param string $message        Text to show.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        print "$message\n";
-        flush();
-    }
-}
-
-/**
- *    Runs just a single test group, a single case or
- *    even a single test within that case.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SelectiveReporter extends SimpleReporterDecorator {
-    var $_just_this_case = false;
-    var $_just_this_test = false;
-    var $_on;
-    
-    /**
-     *    Selects the test case or group to be run,
-     *    and optionally a specific test.
-     *    @param SimpleScorer $reporter    Reporter to receive events.
-     *    @param string $just_this_case    Only this case or group will run.
-     *    @param string $just_this_test    Only this test method will run.
-     */
-    function SelectiveReporter(&$reporter, $just_this_case = false, $just_this_test = false) {
-        if (isset($just_this_case) && $just_this_case) {
-            $this->_just_this_case = strtolower($just_this_case);
-            $this->_off();
-        } else {
-            $this->_on();
-        }
-        if (isset($just_this_test) && $just_this_test) {
-            $this->_just_this_test = strtolower($just_this_test);
-        }
-        $this->SimpleReporterDecorator($reporter);
-    }
-
-    /**
-     *    Compares criteria to actual the case/group name.
-     *    @param string $test_case    The incoming test.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    function _matchesTestCase($test_case) {
-        return $this->_just_this_case == strtolower($test_case);
-    }
-
-    /**
-     *    Compares criteria to actual the test name. If no
-     *    name was specified at the beginning, then all tests
-     *    can run.
-     *    @param string $method       The incoming test method.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    function _shouldRunTest($test_case, $method) {
-        if ($this->_isOn() || $this->_matchesTestCase($test_case)) {
-            if ($this->_just_this_test) {
-                return $this->_just_this_test == strtolower($method);
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Switch on testing for the group or subgroup.
-     *    @access private
-     */
-    function _on() {
-        $this->_on = true;
-    }
-    
-    /**
-     *    Switch off testing for the group or subgroup.
-     *    @access private
-     */
-    function _off() {
-        $this->_on = false;
-    }
-    
-    /**
-     *    Is this group actually being tested?
-     *    @return boolean     True if the current test group is active.
-     *    @access private
-     */
-    function _isOn() {
-        return $this->_on;
-    }
-
-    /**
-     *    Veto everything that doesn't match the method wanted.
-     *    @param string $test_case       Name of test case.
-     *    @param string $method          Name of test method.
-     *    @return boolean                True if test should be run.
-     *    @access public
-     */
-    function shouldInvoke($test_case, $method) {
-        if ($this->_shouldRunTest($test_case, $method)) {
-            return $this->_reporter->shouldInvoke($test_case, $method);
-        }
-        return false;
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_case     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_case, $size) {
-        if ($this->_just_this_case && $this->_matchesTestCase($test_case)) {
-            $this->_on();
-        }
-        $this->_reporter->paintGroupStart($test_case, $size);
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_case     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_case) {
-        $this->_reporter->paintGroupEnd($test_case);
-        if ($this->_just_this_case && $this->_matchesTestCase($test_case)) {
-            $this->_off();
-        }
-    }
-}
-
-/**
- *    Suppresses skip messages.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoSkipsReporter extends SimpleReporterDecorator {
-    
-    /**
-     *    Does nothing.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) { }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/scorer.php b/tests/simpletest/scorer.php
deleted file mode 100644
index cc1331b89..000000000
--- a/tests/simpletest/scorer.php
+++ /dev/null
@@ -1,863 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: scorer.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+*/
-require_once(dirname(__FILE__) . '/invoker.php');
-/**#@-*/
-
-/**
- *    Can receive test events and display them. Display
- *    is achieved by making display methods available
- *    and visiting the incoming event.
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @abstract
- */
-class SimpleScorer {
-    var $_passes;
-    var $_fails;
-    var $_exceptions;
-    var $_is_dry_run;
-
-    /**
-     *    Starts the test run with no results.
-     *    @access public
-     */
-    function SimpleScorer() {
-        $this->_passes = 0;
-        $this->_fails = 0;
-        $this->_exceptions = 0;
-        $this->_is_dry_run = false;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        $this->_is_dry_run = $is_dry;
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        return ! $this->_is_dry_run;
-    }
-
-    /**
-     *    Can wrap the invoker in preperation for running
-     *    a test.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function &createInvoker(&$invoker) {
-        return $invoker;
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    Used for command line tools.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        if ($this->_exceptions + $this->_fails > 0) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-    }
-
-    /**
-     *    Increments the pass count.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        $this->_passes++;
-    }
-
-    /**
-     *    Increments the fail count.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        $this->_fails++;
-    }
-
-    /**
-     *    Deals with PHP 4 throwing an error.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        $this->_exceptions++;
-    }
-
-    /**
-     *    Deals with PHP 5 throwing an exception.
-     *    @param Exception $exception    The actual exception thrown.
-     *    @access public
-     */
-    function paintException($exception) {
-        $this->_exceptions++;
-    }
-    
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-    }
-
-    /**
-     *    Accessor for the number of passes so far.
-     *    @return integer       Number of passes.
-     *    @access public
-     */
-    function getPassCount() {
-        return $this->_passes;
-    }
-
-    /**
-     *    Accessor for the number of fails so far.
-     *    @return integer       Number of fails.
-     *    @access public
-     */
-    function getFailCount() {
-        return $this->_fails;
-    }
-
-    /**
-     *    Accessor for the number of untrapped errors
-     *    so far.
-     *    @return integer       Number of exceptions.
-     *    @access public
-     */
-    function getExceptionCount() {
-        return $this->_exceptions;
-    }
-
-    /**
-     *    Paints a simple supplementary message.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-    }
-
-    /**
-     *    Paints a formatted ASCII message such as a
-     *    variable dump.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-    }
-
-    /**
-     *    By default just ignores user generated events.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-    }
-}
-
-/**
- *    Recipient of generated test messages that can display
- *    page footers and headers. Also keeps track of the
- *    test nesting. This is the main base class on which
- *    to build the finished test (page based) displays.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReporter extends SimpleScorer {
-    var $_test_stack;
-    var $_size;
-    var $_progress;
-
-    /**
-     *    Starts the display with no results in.
-     *    @access public
-     */
-    function SimpleReporter() {
-        $this->SimpleScorer();
-        $this->_test_stack = array();
-        $this->_size = null;
-        $this->_progress = 0;
-    }
-    
-    /**
-     *    Gets the formatter for variables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Paints the start of a group test. Will also paint
-     *    the page header and footer if this is the
-     *    first test. Will stash the size if the first
-     *    start.
-     *    @param string $test_name   Name of test that is starting.
-     *    @param integer $size       Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        if (! isset($this->_size)) {
-            $this->_size = $size;
-        }
-        if (count($this->_test_stack) == 0) {
-            $this->paintHeader($test_name);
-        }
-        $this->_test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a group test. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @param integer $progress   Number of test cases ending.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        array_pop($this->_test_stack);
-        if (count($this->_test_stack) == 0) {
-            $this->paintFooter($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test case. Will also paint
-     *    the page header and footer if this is the
-     *    first test. Will stash the size if the first
-     *    start.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        if (! isset($this->_size)) {
-            $this->_size = 1;
-        }
-        if (count($this->_test_stack) == 0) {
-            $this->paintHeader($test_name);
-        }
-        $this->_test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a test case. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        $this->_progress++;
-        array_pop($this->_test_stack);
-        if (count($this->_test_stack) == 0) {
-            $this->paintFooter($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        $this->_test_stack[] = $test_name;
-    }
-
-    /**
-     *    Paints the end of a test method. Will paint the page
-     *    footer if the stack of tests has unwound.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        array_pop($this->_test_stack);
-    }
-
-    /**
-     *    Paints the test document header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     *    @abstract
-     */
-    function paintHeader($test_name) {
-    }
-
-    /**
-     *    Paints the test document footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     *    @abstract
-     */
-    function paintFooter($test_name) {
-    }
-
-    /**
-     *    Accessor for internal test stack. For
-     *    subclasses that need to see the whole test
-     *    history for display purposes.
-     *    @return array     List of methods in nesting order.
-     *    @access public
-     */
-    function getTestList() {
-        return $this->_test_stack;
-    }
-
-    /**
-     *    Accessor for total test size in number
-     *    of test cases. Null until the first
-     *    test is started.
-     *    @return integer   Total number of cases at start.
-     *    @access public
-     */
-    function getTestCaseCount() {
-        return $this->_size;
-    }
-
-    /**
-     *    Accessor for the number of test cases
-     *    completed so far.
-     *    @return integer   Number of ended cases.
-     *    @access public
-     */
-    function getTestCaseProgress() {
-        return $this->_progress;
-    }
-
-    /**
-     *    Static check for running in the comand line.
-     *    @return boolean        True if CLI.
-     *    @access public
-     *    @static
-     */
-    function inCli() {
-        return php_sapi_name() == 'cli';
-    }
-}
-
-/**
- *    For modifying the behaviour of the visual reporters.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleReporterDecorator {
-    var $_reporter;
-
-    /**
-     *    Mediates between the reporter and the test case.
-     *    @param SimpleScorer $reporter       Reporter to receive events.
-     */
-    function SimpleReporterDecorator(&$reporter) {
-        $this->_reporter = &$reporter;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        $this->_reporter->makeDry($is_dry);
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    Used for command line tools.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        return $this->_reporter->getStatus();
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @return boolean                True if test should be run.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        return $this->_reporter->shouldInvoke($test_case_name, $method);
-    }
-
-    /**
-     *    Can wrap the invoker in preperation for running
-     *    a test.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function &createInvoker(&$invoker) {
-        return $this->_reporter->createInvoker($invoker);
-    }
-    
-    /**
-     *    Gets the formatter for variables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return $this->_reporter->getDumper();
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        $this->_reporter->paintGroupStart($test_name, $size);
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        $this->_reporter->paintGroupEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        $this->_reporter->paintCaseStart($test_name);
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        $this->_reporter->paintCaseEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        $this->_reporter->paintMethodStart($test_name);
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        $this->_reporter->paintMethodEnd($test_name);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        $this->_reporter->paintPass($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        $this->_reporter->paintFail($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        $this->_reporter->paintError($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param Exception $exception        Exception to show.
-     *    @access public
-     */
-    function paintException($exception) {
-        $this->_reporter->paintException($exception);
-    }
-    
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        $this->_reporter->paintSkip($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        $this->_reporter->paintMessage($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        $this->_reporter->paintFormattedMessage($message);
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @return boolean            Should return false if this
-     *                               type of signal should fail the
-     *                               test suite.
-     *    @access public
-     */
-    function paintSignal($type, &$payload) {
-        $this->_reporter->paintSignal($type, $payload);
-    }
-}
-
-/**
- *    For sending messages to multiple reporters at
- *    the same time.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class MultipleReporter {
-    var $_reporters = array();
-
-    /**
-     *    Adds a reporter to the subscriber list.
-     *    @param SimpleScorer $reporter     Reporter to receive events.
-     *    @access public
-     */
-    function attachReporter(&$reporter) {
-        $this->_reporters[] = &$reporter;
-    }
-
-    /**
-     *    Signals that the next evaluation will be a dry
-     *    run. That is, the structure events will be
-     *    recorded, but no tests will be run.
-     *    @param boolean $is_dry        Dry run if true.
-     *    @access public
-     */
-    function makeDry($is_dry = true) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->makeDry($is_dry);
-        }
-    }
-
-    /**
-     *    Accessor for current status. Will be false
-     *    if there have been any failures or exceptions.
-     *    If any reporter reports a failure, the whole
-     *    suite fails.
-     *    @return boolean        True if no failures.
-     *    @access public
-     */
-    function getStatus() {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            if (! $this->_reporters[$i]->getStatus()) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    The reporter has a veto on what should be run.
-     *    It requires all reporters to want to run the method.
-     *    @param string $test_case_name  name of test case.
-     *    @param string $method          Name of test method.
-     *    @access public
-     */
-    function shouldInvoke($test_case_name, $method) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            if (! $this->_reporters[$i]->shouldInvoke($test_case_name, $method)) {
-                return false;
-            }
-        }
-        return true;
-    }
-
-    /**
-     *    Every reporter gets a chance to wrap the invoker.
-     *    @param SimpleInvoker $invoker   Individual test runner.
-     *    @return SimpleInvoker           Wrapped test runner.
-     *    @access public
-     */
-    function &createInvoker(&$invoker) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $invoker = &$this->_reporters[$i]->createInvoker($invoker);
-        }
-        return $invoker;
-    }
-    
-    /**
-     *    Gets the formatter for variables and other small
-     *    generic data items.
-     *    @return SimpleDumper          Formatter.
-     *    @access public
-     */
-    function getDumper() {
-        return new SimpleDumper();
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @param integer $size         Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintGroupStart($test_name, $size);
-        }
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintGroupEnd($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintCaseStart($test_name);
-        }
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintCaseEnd($test_name);
-        }
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintMethodStart($test_name);
-        }
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name     Name of test or other label.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintMethodEnd($test_name);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintPass($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintPass($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Message is ignored.
-     *    @access public
-     */
-    function paintFail($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintFail($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message    Text of error formatted by
-     *                              the test case.
-     *    @access public
-     */
-    function paintError($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintError($message);
-        }
-    }
-    
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param Exception $exception    Exception to display.
-     *    @access public
-     */
-    function paintException($exception) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintException($exception);
-        }
-    }
-
-    /**
-     *    Prints the message for skipping tests.
-     *    @param string $message    Text of skip condition.
-     *    @access public
-     */
-    function paintSkip($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintSkip($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintMessage($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintFormattedMessage($message);
-        }
-    }
-
-    /**
-     *    Chains to the wrapped reporter.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @return boolean            Should return false if this
-     *                               type of signal should fail the
-     *                               test suite.
-     *    @access public
-     */
-    function paintSignal($type, &$payload) {
-        for ($i = 0; $i < count($this->_reporters); $i++) {
-            $this->_reporters[$i]->paintSignal($type, $payload);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/selector.php b/tests/simpletest/selector.php
deleted file mode 100644
index de044b85a..000000000
--- a/tests/simpletest/selector.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: selector.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/tag.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by name attribute.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByName {
-    var $_name;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $name     Name attribute to match.
-     */
-    function SimpleByName($name) {
-        $this->_name = $name;
-    }
-
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     *    Compares with name attribute of widget.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        return ($widget->getName() == $this->_name);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by visible label or alt text.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByLabel {
-    var $_label;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $label     Visible text to match.
-     */
-    function SimpleByLabel($label) {
-        $this->_label = $label;
-    }
-
-    /**
-     *    Comparison. Compares visible text of widget or
-     *    related label.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        if (! method_exists($widget, 'isLabel')) {
-            return false;
-        }
-        return $widget->isLabel($this->_label);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches dy id attribute.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleById {
-    var $_id;
-
-    /**
-     *    Stashes the name for later comparison.
-     *    @param string $id     ID atribute to match.
-     */
-    function SimpleById($id) {
-        $this->_id = $id;
-    }
-
-    /**
-     *    Comparison. Compares id attribute of widget.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        return $widget->isId($this->_id);
-    }
-}
-
-/**
- *    Used to extract form elements for testing against.
- *    Searches by visible label, name or alt text.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleByLabelOrName {
-    var $_label;
-
-    /**
-     *    Stashes the name/label for later comparison.
-     *    @param string $label     Visible text to match.
-     */
-    function SimpleByLabelOrName($label) {
-        $this->_label = $label;
-    }
-
-    /**
-     *    Comparison. Compares visible text of widget or
-     *    related label or name.
-     *    @param SimpleWidget $widget    Control to compare.
-     *    @access public
-     */
-    function isMatch($widget) {
-        if (method_exists($widget, 'isLabel')) {
-            if ($widget->isLabel($this->_label)) {
-                return true;
-            }
-        }
-        return ($widget->getName() == $this->_label);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/shell_tester.php b/tests/simpletest/shell_tester.php
deleted file mode 100644
index 7b98869ec..000000000
--- a/tests/simpletest/shell_tester.php
+++ /dev/null
@@ -1,333 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: shell_tester.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-/**#@-*/
-
-/**
- *    Wrapper for exec() functionality.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleShell {
-    var $_output;
-
-    /**
-     *    Executes the shell comand and stashes the output.
-     *    @access public
-     */
-    function SimpleShell() {
-        $this->_output = false;
-    }
-
-    /**
-     *    Actually runs the command. Does not trap the
-     *    error stream output as this need PHP 4.3+.
-     *    @param string $command    The actual command line
-     *                              to run.
-     *    @return integer           Exit code.
-     *    @access public
-     */
-    function execute($command) {
-        $this->_output = false;
-        exec($command, $this->_output, $ret);
-        return $ret;
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return string        Output as text.
-     *    @access public
-     */
-    function getOutput() {
-        return implode("\n", $this->_output);
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return array         Output as array of lines.
-     *    @access public
-     */
-    function getOutputAsList() {
-        return $this->_output;
-    }
-}
-
-/**
- *    Test case for testing of command line scripts and
- *    utilities. Usually scripts that are external to the
- *    PHP code, but support it in some way.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class ShellTestCase extends SimpleTestCase {
-    var $_current_shell;
-    var $_last_status;
-    var $_last_command;
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function ShellTestCase($label = false) {
-        $this->SimpleTestCase($label);
-        $this->_current_shell = &$this->_createShell();
-        $this->_last_status = false;
-        $this->_last_command = '';
-    }
-
-    /**
-     *    Executes a command and buffers the results.
-     *    @param string $command     Command to run.
-     *    @return boolean            True if zero exit code.
-     *    @access public
-     */
-    function execute($command) {
-        $shell = &$this->_getShell();
-        $this->_last_status = $shell->execute($command);
-        $this->_last_command = $command;
-        return ($this->_last_status === 0);
-    }
-
-    /**
-     *    Dumps the output of the last command.
-     *    @access public
-     */
-    function dumpOutput() {
-        $this->dump($this->getOutput());
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return string        Output as text.
-     *    @access public
-     */
-    function getOutput() {
-        $shell = &$this->_getShell();
-        return $shell->getOutput();
-    }
-
-    /**
-     *    Accessor for the last output.
-     *    @return array         Output as array of lines.
-     *    @access public
-     */
-    function getOutputAsList() {
-        $shell = &$this->_getShell();
-        return $shell->getOutputAsList();
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = "%s") {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = "%s") {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Tests the last status code from the shell.
-     *    @param integer $status   Expected status of last
-     *                             command.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertExitCode($status, $message = "%s") {
-        $message = sprintf($message, "Expected status code of [$status] from [" .
-                $this->_last_command . "], but got [" .
-                $this->_last_status . "]");
-        return $this->assertTrue($status === $this->_last_status, $message);
-    }
-
-    /**
-     *    Attempt to exactly match the combined STDERR and
-     *    STDOUT output.
-     *    @param string $expected  Expected output.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertOutput($expected, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new EqualExpectation($expected),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    Scans the output for a Perl regex. If found
-     *    anywhere it passes, else it fails.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertOutputPattern($pattern, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    If a Perl regex is found anywhere in the current
-     *    output then a failure is generated, else a pass.
-     *    @param string $pattern    Regex to search for.
-     *    @param $message           Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoOutputPattern($pattern, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $shell->getOutput(),
-                $message);
-    }
-
-    /**
-     *    File existence check.
-     *    @param string $path      Full filename and path.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertFileExists($path, $message = "%s") {
-        $message = sprintf($message, "File [$path] should exist");
-        return $this->assertTrue(file_exists($path), $message);
-    }
-
-    /**
-     *    File non-existence check.
-     *    @param string $path      Full filename and path.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertFileNotExists($path, $message = "%s") {
-        $message = sprintf($message, "File [$path] should not exist");
-        return $this->assertFalse(file_exists($path), $message);
-    }
-
-    /**
-     *    Scans a file for a Perl regex. If found
-     *    anywhere it passes, else it fails.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $path       Full filename and path.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertFilePattern($pattern, $path, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new PatternExpectation($pattern),
-                implode('', file($path)),
-                $message);
-    }
-
-    /**
-     *    If a Perl regex is found anywhere in the named
-     *    file then a failure is generated, else a pass.
-     *    @param string $pattern    Regex to search for.
-     *    @param string $path       Full filename and path.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoFilePattern($pattern, $path, $message = "%s") {
-        $shell = &$this->_getShell();
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                implode('', file($path)),
-                $message);
-    }
-
-    /**
-     *    Accessor for current shell. Used for testing the
-     *    the tester itself.
-     *    @return Shell        Current shell.
-     *    @access protected
-     */
-    function &_getShell() {
-        return $this->_current_shell;
-    }
-
-    /**
-     *    Factory for the shell to run the command on.
-     *    @return Shell        New shell object.
-     *    @access protected
-     */
-    function &_createShell() {
-        $shell = &new SimpleShell();
-        return $shell;
-    }
-}
-?>
diff --git a/tests/simpletest/simpletest.php b/tests/simpletest/simpletest.php
deleted file mode 100644
index bab2c1a6a..000000000
--- a/tests/simpletest/simpletest.php
+++ /dev/null
@@ -1,478 +0,0 @@
-<?php
-/**
- *  Global state for SimpleTest and kicker script in future versions.
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: simpletest.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-if (version_compare(phpversion(), '5') >= 0) {
-    require_once(dirname(__FILE__) . '/reflection_php5.php');
-} else {
-    require_once(dirname(__FILE__) . '/reflection_php4.php');
-}
-require_once(dirname(__FILE__) . '/default_reporter.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Registry and test context. Includes a few
- *    global options that I'm slowly getting rid of.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleTest {
-
-    /**
-     *    Reads the SimpleTest version from the release file.
-     *    @return string        Version string.
-     *    @static
-     *    @access public
-     */
-    function getVersion() {
-        $content = file(dirname(__FILE__) . '/VERSION');
-        return trim($content[0]);
-    }
-
-    /**
-     *    Sets the name of a test case to ignore, usually
-     *    because the class is an abstract case that should
-     *    not be run. Once PHP4 is dropped this will disappear
-     *    as a public method and "abstract" will rule.
-     *    @param string $class        Add a class to ignore.
-     *    @static
-     *    @access public
-     */
-    function ignore($class) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['IgnoreList'][strtolower($class)] = true;
-    }
-
-    /**
-     *    Scans the now complete ignore list, and adds
-     *    all parent classes to the list. If a class
-     *    is not a runnable test case, then it's parents
-     *    wouldn't be either. This is syntactic sugar
-     *    to cut down on ommissions of ignore()'s or
-     *    missing abstract declarations. This cannot
-     *    be done whilst loading classes wiithout forcing
-     *    a particular order on the class declarations and
-     *    the ignore() calls. It's just nice to have the ignore()
-     *    calls at the top of the file before the actual declarations.
-     *    @param array $classes     Class names of interest.
-     *    @static
-     *    @access public
-     */
-    function ignoreParentsIfIgnored($classes) {
-        $registry = &SimpleTest::_getRegistry();
-        foreach ($classes as $class) {
-            if (SimpleTest::isIgnored($class)) {
-                $reflection = new SimpleReflection($class);
-                if ($parent = $reflection->getParent()) {
-                    SimpleTest::ignore($parent);
-                }
-            }
-        }
-    }
-
-    /**
-     *   Puts the object to the global pool of 'preferred' objects
-     *   which can be retrieved with SimpleTest :: preferred() method.
-     *   Instances of the same class are overwritten.
-     *   @param object $object      Preferred object
-     *   @static
-     *   @access public
-     *   @see preferred()
-     */
-    function prefer(&$object) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['Preferred'][] = &$object;
-    }
-
-    /**
-     *   Retrieves 'preferred' objects from global pool. Class filter
-     *   can be applied in order to retrieve the object of the specific
-     *   class
-     *   @param array|string $classes       Allowed classes or interfaces.
-     *   @static
-     *   @access public
-     *   @return array|object|null
-     *   @see prefer()
-     */
-    function &preferred($classes) {
-        if (! is_array($classes)) {
-            $classes = array($classes);
-        }
-        $registry = &SimpleTest::_getRegistry();
-        for ($i = count($registry['Preferred']) - 1; $i >= 0; $i--) {
-            foreach ($classes as $class) {
-                if (SimpleTestCompatibility::isA($registry['Preferred'][$i], $class)) {
-                    return $registry['Preferred'][$i];
-                }
-            }
-        }
-        return null;
-    }
-
-    /**
-     *    Test to see if a test case is in the ignore
-     *    list. Quite obviously the ignore list should
-     *    be a separate object and will be one day.
-     *    This method is internal to SimpleTest. Don't
-     *    use it.
-     *    @param string $class        Class name to test.
-     *    @return boolean             True if should not be run.
-     *    @access public
-     *    @static
-     */
-    function isIgnored($class) {
-        $registry = &SimpleTest::_getRegistry();
-        return isset($registry['IgnoreList'][strtolower($class)]);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function setMockBaseClass($mock_base) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['MockBaseClass'] = $mock_base;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getMockBaseClass() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['MockBaseClass'];
-    }
-
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set host
-     *    to false to disable. This will take effect
-     *    if there are no other proxy settings.
-     *    @param string $proxy     Proxy host as URL.
-     *    @param string $username  Proxy username for authentication.
-     *    @param string $password  Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $registry = &SimpleTest::_getRegistry();
-        $registry['DefaultProxy'] = $proxy;
-        $registry['DefaultProxyUsername'] = $username;
-        $registry['DefaultProxyPassword'] = $password;
-    }
-
-    /**
-     *    Accessor for default proxy host.
-     *    @return string       Proxy URL.
-     *    @access public
-     */
-    function getDefaultProxy() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['DefaultProxy'];
-    }
-
-    /**
-     *    Accessor for default proxy username.
-     *    @return string    Proxy username for authentication.
-     *    @access public
-     */
-    function getDefaultProxyUsername() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['DefaultProxyUsername'];
-    }
-
-    /**
-     *    Accessor for default proxy password.
-     *    @return string    Proxy password for authentication.
-     *    @access public
-     */
-    function getDefaultProxyPassword() {
-        $registry = &SimpleTest::_getRegistry();
-        return $registry['DefaultProxyPassword'];
-    }
-
-    /**
-     *    Accessor for global registry of options.
-     *    @return hash           All stored values.
-     *    @access private
-     *    @static
-     */
-    function &_getRegistry() {
-        static $registry = false;
-        if (! $registry) {
-            $registry = SimpleTest::_getDefaults();
-        }
-        return $registry;
-    }
-
-    /**
-     *    Accessor for the context of the current
-     *    test run.
-     *    @return SimpleTestContext    Current test run.
-     *    @access public
-     *    @static
-     */
-    function &getContext() {
-        static $context = false;
-        if (! $context) {
-            $context = new SimpleTestContext();
-        }
-        return $context;
-    }
-
-    /**
-     *    Constant default values.
-     *    @return hash       All registry defaults.
-     *    @access private
-     *    @static
-     */
-    function _getDefaults() {
-        return array(
-                'StubBaseClass' => 'SimpleStub',
-                'MockBaseClass' => 'SimpleMock',
-                'IgnoreList' => array(),
-                'DefaultProxy' => false,
-                'DefaultProxyUsername' => false,
-                'DefaultProxyPassword' => false,
-                'Preferred' => array(new HtmlReporter(), new TextReporter(), new XmlReporter()));
-    }
-}
-
-/**
- *    Container for all components for a specific
- *    test run. Makes things like error queues
- *    available to PHP event handlers, and also
- *    gets around some nasty reference issues in
- *    the mocks.
- *    @package  SimpleTest
- */
-class SimpleTestContext {
-    var $_test;
-    var $_reporter;
-    var $_resources;
-
-    /**
-     *    Clears down the current context.
-     *    @access public
-     */
-    function clear() {
-        $this->_resources = array();
-    }
-
-    /**
-     *    Sets the current test case instance. This
-     *    global instance can be used by the mock objects
-     *    to send message to the test cases.
-     *    @param SimpleTestCase $test        Test case to register.
-     *    @access public
-     */
-    function setTest(&$test) {
-        $this->clear();
-        $this->_test = &$test;
-    }
-
-    /**
-     *    Accessor for currently running test case.
-     *    @return SimpleTestCase    Current test.
-     *    @access public
-     */
-    function &getTest() {
-        return $this->_test;
-    }
-
-    /**
-     *    Sets the current reporter. This
-     *    global instance can be used by the mock objects
-     *    to send messages.
-     *    @param SimpleReporter $reporter     Reporter to register.
-     *    @access public
-     */
-    function setReporter(&$reporter) {
-        $this->clear();
-        $this->_reporter = &$reporter;
-    }
-
-    /**
-     *    Accessor for current reporter.
-     *    @return SimpleReporter    Current reporter.
-     *    @access public
-     */
-    function &getReporter() {
-        return $this->_reporter;
-    }
-
-    /**
-     *    Accessor for the Singleton resource.
-     *    @return object       Global resource.
-     *    @access public
-     *    @static
-     */
-    function &get($resource) {
-        if (! isset($this->_resources[$resource])) {
-            $this->_resources[$resource] = &new $resource();
-        }
-        return $this->_resources[$resource];
-    }
-}
-
-/**
- *    Interrogates the stack trace to recover the
- *    failure point.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleStackTrace {
-    var $_prefixes;
-
-    /**
-     *    Stashes the list of target prefixes.
-     *    @param array $prefixes      List of method prefixes
-     *                                to search for.
-     */
-    function SimpleStackTrace($prefixes) {
-        $this->_prefixes = $prefixes;
-    }
-
-    /**
-     *    Extracts the last method name that was not within
-     *    Simpletest itself. Captures a stack trace if none given.
-     *    @param array $stack      List of stack frames.
-     *    @return string           Snippet of test report with line
-     *                             number and file.
-     *    @access public
-     */
-    function traceMethod($stack = false) {
-        $stack = $stack ? $stack : $this->_captureTrace();
-        foreach ($stack as $frame) {
-            if ($this->_frameLiesWithinSimpleTestFolder($frame)) {
-                continue;
-            }
-            if ($this->_frameMatchesPrefix($frame)) {
-                return ' at [' . $frame['file'] . ' line ' . $frame['line'] . ']';
-            }
-        }
-        return '';
-    }
-
-    /**
-     *    Test to see if error is generated by SimpleTest itself.
-     *    @param array $frame     PHP stack frame.
-     *    @return boolean         True if a SimpleTest file.
-     *    @access private
-     */
-    function _frameLiesWithinSimpleTestFolder($frame) {
-        if (isset($frame['file'])) {
-            $path = substr(SIMPLE_TEST, 0, -1);
-            if (strpos($frame['file'], $path) === 0) {
-                if (dirname($frame['file']) == $path) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Tries to determine if the method call is an assert, etc.
-     *    @param array $frame     PHP stack frame.
-     *    @return boolean         True if matches a target.
-     *    @access private
-     */
-    function _frameMatchesPrefix($frame) {
-        foreach ($this->_prefixes as $prefix) {
-            if (strncmp($frame['function'], $prefix, strlen($prefix)) == 0) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     *    Grabs a current stack trace.
-     *    @return array        Fulle trace.
-     *    @access private
-     */
-    function _captureTrace() {
-        if (function_exists('debug_backtrace')) {
-            return array_reverse(debug_backtrace());
-        }
-        return array();
-    }
-}
-
-/**
- *    @package SimpleTest
- *    @subpackage UnitTester
- *    @deprecated
- */
-class SimpleTestOptions extends SimpleTest {
-
-    /**
-     *    @deprecated
-     */
-    function getVersion() {
-        return Simpletest::getVersion();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function ignore($class) {
-        return Simpletest::ignore($class);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function isIgnored($class) {
-        return Simpletest::isIgnored($class);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function setMockBaseClass($mock_base) {
-        return Simpletest::setMockBaseClass($mock_base);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getMockBaseClass() {
-        return Simpletest::getMockBaseClass();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        return Simpletest::useProxy($proxy, $username, $password);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getDefaultProxy() {
-        return Simpletest::getDefaultProxy();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getDefaultProxyUsername() {
-        return Simpletest::getDefaultProxyUsername();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function getDefaultProxyPassword() {
-        return Simpletest::getDefaultProxyPassword();
-    }
-}
-?>
diff --git a/tests/simpletest/socket.php b/tests/simpletest/socket.php
deleted file mode 100644
index 3ad5a9ff4..000000000
--- a/tests/simpletest/socket.php
+++ /dev/null
@@ -1,216 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage MockObjects
- *  @version    $Id: socket.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/compatibility.php');
-/**#@-*/
-
-/**
- *    Stashes an error for later. Useful for constructors
- *    until PHP gets exceptions.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleStickyError {
-    var $_error = 'Constructor not chained';
-
-    /**
-     *    Sets the error to empty.
-     *    @access public
-     */
-    function SimpleStickyError() {
-        $this->_clearError();
-    }
-
-    /**
-     *    Test for an outstanding error.
-     *    @return boolean           True if there is an error.
-     *    @access public
-     */
-    function isError() {
-        return ($this->_error != '');
-    }
-
-    /**
-     *    Accessor for an outstanding error.
-     *    @return string     Empty string if no error otherwise
-     *                       the error message.
-     *    @access public
-     */
-    function getError() {
-        return $this->_error;
-    }
-
-    /**
-     *    Sets the internal error.
-     *    @param string       Error message to stash.
-     *    @access protected
-     */
-    function _setError($error) {
-        $this->_error = $error;
-    }
-
-    /**
-     *    Resets the error state to no error.
-     *    @access protected
-     */
-    function _clearError() {
-        $this->_setError('');
-    }
-}
-
-/**
- *    Wrapper for TCP/IP socket.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSocket extends SimpleStickyError {
-    var $_handle;
-    var $_is_open = false;
-    var $_sent = '';
-    var $lock_size;
-
-    /**
-     *    Opens a socket for reading and writing.
-     *    @param string $host          Hostname to send request to.
-     *    @param integer $port         Port on remote machine to open.
-     *    @param integer $timeout      Connection timeout in seconds.
-     *    @param integer $block_size   Size of chunk to read.
-     *    @access public
-     */
-    function SimpleSocket($host, $port, $timeout, $block_size = 255) {
-        $this->SimpleStickyError();
-        if (! ($this->_handle = $this->_openSocket($host, $port, $error_number, $error, $timeout))) {
-            $this->_setError("Cannot open [$host:$port] with [$error] within [$timeout] seconds");
-            return;
-        }
-        $this->_is_open = true;
-        $this->_block_size = $block_size;
-        SimpleTestCompatibility::setTimeout($this->_handle, $timeout);
-    }
-
-    /**
-     *    Writes some data to the socket and saves alocal copy.
-     *    @param string $message       String to send to socket.
-     *    @return boolean              True if successful.
-     *    @access public
-     */
-    function write($message) {
-        if ($this->isError() || ! $this->isOpen()) {
-            return false;
-        }
-        $count = fwrite($this->_handle, $message);
-        if (! $count) {
-            if ($count === false) {
-                $this->_setError('Cannot write to socket');
-                $this->close();
-            }
-            return false;
-        }
-        fflush($this->_handle);
-        $this->_sent .= $message;
-        return true;
-    }
-
-    /**
-     *    Reads data from the socket. The error suppresion
-     *    is a workaround for PHP4 always throwing a warning
-     *    with a secure socket.
-     *    @return integer/boolean           Incoming bytes. False
-     *                                     on error.
-     *    @access public
-     */
-    function read() {
-        if ($this->isError() || ! $this->isOpen()) {
-            return false;
-        }
-        $raw = @fread($this->_handle, $this->_block_size);
-        if ($raw === false) {
-            $this->_setError('Cannot read from socket');
-            $this->close();
-        }
-        return $raw;
-    }
-
-    /**
-     *    Accessor for socket open state.
-     *    @return boolean           True if open.
-     *    @access public
-     */
-    function isOpen() {
-        return $this->_is_open;
-    }
-
-    /**
-     *    Closes the socket preventing further reads.
-     *    Cannot be reopened once closed.
-     *    @return boolean           True if successful.
-     *    @access public
-     */
-    function close() {
-        $this->_is_open = false;
-        return fclose($this->_handle);
-    }
-
-    /**
-     *    Accessor for content so far.
-     *    @return string        Bytes sent only.
-     *    @access public
-     */
-    function getSent() {
-        return $this->_sent;
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param string $host          Host to connect to.
-     *    @param integer $port         Port on host.
-     *    @param integer $error_number Recipient of error code.
-     *    @param string $error         Recipoent of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    function _openSocket($host, $port, &$error_number, &$error, $timeout) {
-        return @fsockopen($host, $port, $error_number, $error, $timeout);
-    }
-}
-
-/**
- *    Wrapper for TCP/IP socket over TLS.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSecureSocket extends SimpleSocket {
-
-    /**
-     *    Opens a secure socket for reading and writing.
-     *    @param string $host      Hostname to send request to.
-     *    @param integer $port     Port on remote machine to open.
-     *    @param integer $timeout  Connection timeout in seconds.
-     *    @access public
-     */
-    function SimpleSecureSocket($host, $port, $timeout) {
-        $this->SimpleSocket($host, $port, $timeout);
-    }
-
-    /**
-     *    Actually opens the low level socket.
-     *    @param string $host          Host to connect to.
-     *    @param integer $port         Port on host.
-     *    @param integer $error_number Recipient of error code.
-     *    @param string $error         Recipient of error message.
-     *    @param integer $timeout      Maximum time to wait for connection.
-     *    @access protected
-     */
-    function _openSocket($host, $port, &$error_number, &$error, $timeout) {
-        return parent::_openSocket("tls://$host", $port, $error_number, $error, $timeout);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/tag.php b/tests/simpletest/tag.php
deleted file mode 100644
index 7bccae205..000000000
--- a/tests/simpletest/tag.php
+++ /dev/null
@@ -1,1418 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: tag.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-    
-/**#@+
- * include SimpleTest files
- */
-require_once(dirname(__FILE__) . '/parser.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    HTML or XML tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTag {
-    var $_name;
-    var $_attributes;
-    var $_content;
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param string $name        Tag name.
-     *    @param hash $attributes    Attribute names and
-     *                               string values. Note that
-     *                               the keys must have been
-     *                               converted to lower case.
-     */
-    function SimpleTag($name, $attributes) {
-        $this->_name = strtolower(trim($name));
-        $this->_attributes = $attributes;
-        $this->_content = '';
-    }
-    
-    /**
-     *    Check to see if the tag can have both start and
-     *    end tags with content in between.
-     *    @return boolean        True if content allowed.
-     *    @access public
-     */
-    function expectEndTag() {
-        return true;
-    }
-    
-    /**
-     *    The current tag should not swallow all content for
-     *    itself as it's searchable page content. Private
-     *    content tags are usually widgets that contain default
-     *    values.
-     *    @return boolean        False as content is available
-     *                           to other tags by default.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return false;
-    }
-
-    /**
-     *    Appends string content to the current content.
-     *    @param string $content        Additional text.
-     *    @access public
-     */
-    function addContent($content) {
-        $this->_content .= (string)$content;
-    }
-    
-    /**
-     *    Adds an enclosed tag to the content.
-     *    @param SimpleTag $tag    New tag.
-     *    @access public
-     */
-    function addTag(&$tag) {
-    }
-    
-    /**
-     *    Accessor for tag name.
-     *    @return string       Name of tag.
-     *    @access public
-     */
-    function getTagName() {
-        return $this->_name;
-    }
-    
-    /**
-     *    List of legal child elements.
-     *    @return array        List of element names.
-     *    @access public
-     */
-    function getChildElements() {
-        return array();
-    }
-    
-    /**
-     *    Accessor for an attribute.
-     *    @param string $label    Attribute name.
-     *    @return string          Attribute value.
-     *    @access public
-     */
-    function getAttribute($label) {
-        $label = strtolower($label);
-        if (! isset($this->_attributes[$label])) {
-            return false;
-        }
-        return (string)$this->_attributes[$label];
-    }
-    
-    /**
-     *    Sets an attribute.
-     *    @param string $label    Attribute name.
-     *    @return string $value   New attribute value.
-     *    @access protected
-     */
-    function _setAttribute($label, $value) {
-        $this->_attributes[strtolower($label)] = $value;
-    }
-    
-    /**
-     *    Accessor for the whole content so far.
-     *    @return string       Content as big raw string.
-     *    @access public
-     */
-    function getContent() {
-        return $this->_content;
-    }
-    
-    /**
-     *    Accessor for content reduced to visible text. Acts
-     *    like a text mode browser, normalising space and
-     *    reducing images to their alt text.
-     *    @return string       Content as plain text.
-     *    @access public
-     */
-    function getText() {
-        return SimpleHtmlSaxParser::normalise($this->_content);
-    }
-    
-    /**
-     *    Test to see if id attribute matches.
-     *    @param string $id        ID to test against.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isId($id) {
-        return ($this->getAttribute('id') == $id);
-    }
-}
-
-/**
- *    Base url.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleBaseTag extends SimpleTag {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleBaseTag($attributes) {
-        $this->SimpleTag('base', $attributes);
-    }
-
-    /**
-     *    Base tag is not a block tag.
-     *    @return boolean       false
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-}
-
-/**
- *    Page title.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTitleTag extends SimpleTag {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleTitleTag($attributes) {
-        $this->SimpleTag('title', $attributes);
-    }
-}
-
-/**
- *    Link.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleAnchorTag extends SimpleTag {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleAnchorTag($attributes) {
-        $this->SimpleTag('a', $attributes);
-    }
-    
-    /**
-     *    Accessor for URL as string.
-     *    @return string    Coerced as string.
-     *    @access public
-     */
-    function getHref() {
-        $url = $this->getAttribute('href');
-        if (is_bool($url)) {
-            $url = '';
-        }
-        return $url;
-    }
-}
-
-/**
- *    Form element.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleWidget extends SimpleTag {
-    var $_value;
-    var $_label;
-    var $_is_set;
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param string $name        Tag name.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleWidget($name, $attributes) {
-        $this->SimpleTag($name, $attributes);
-        $this->_value = false;
-        $this->_label = false;
-        $this->_is_set = false;
-    }
-    
-    /**
-     *    Accessor for name submitted as the key in
-     *    GET/POST variables hash.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getName() {
-        return $this->getAttribute('name');
-    }
-    
-    /**
-     *    Accessor for default value parsed with the tag.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        return $this->getAttribute('value');
-    }
-    
-    /**
-     *    Accessor for currently set value or default if
-     *    none.
-     *    @return string      Value set by form or default
-     *                        if none.
-     *    @access public
-     */
-    function getValue() {
-        if (! $this->_is_set) {
-            return $this->getDefault();
-        }
-        return $this->_value;
-    }
-    
-    /**
-     *    Sets the current form element value.
-     *    @param string $value       New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        $this->_value = $value;
-        $this->_is_set = true;
-        return true;
-    }
-    
-    /**
-     *    Resets the form element value back to the
-     *    default.
-     *    @access public
-     */
-    function resetValue() {
-        $this->_is_set = false;
-    }
-    
-    /**
-     *    Allows setting of a label externally, say by a
-     *    label tag.
-     *    @param string $label    Label to attach.
-     *    @access public
-     */
-    function setLabel($label) {
-        $this->_label = trim($label);
-    }
-    
-    /**
-     *    Reads external or internal label.
-     *    @param string $label    Label to test.
-     *    @return boolean         True is match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return $this->_label == trim($label);
-    }
-    
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write(&$encoding) {
-        if ($this->getName()) {
-            $encoding->add($this->getName(), $this->getValue());
-        }
-    }
-}
-
-/**
- *    Text, password and hidden field.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTextTag extends SimpleWidget {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleTextTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', '');
-        }
-    }
-    
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-    
-    /**
-     *    Sets the current form element value. Cannot
-     *    change the value of a hidden field.
-     *    @param string $value       New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($this->getAttribute('type') == 'hidden') {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-}
-
-/**
- *    Submit button as input tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSubmitTag extends SimpleWidget {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleSubmitTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', 'Submit');
-        }
-    }
-    
-    /**
-     *    Tag contains no end element.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-    
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-    
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->getValue();
-    }
-    
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-}
-    
-/**
- *    Image button as input tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleImageSubmitTag extends SimpleWidget {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleImageSubmitTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-    }
-    
-    /**
-     *    Tag contains no end element.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-    
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-    
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        if ($this->getAttribute('title')) {
-            return $this->getAttribute('title');
-        }
-        return $this->getAttribute('alt');
-    }
-    
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-    
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @param integer $x                  X coordinate of click.
-     *    @param integer $y                  Y coordinate of click.
-     *    @access public
-     */
-    function write(&$encoding, $x, $y) {
-        if ($this->getName()) {
-            $encoding->add($this->getName() . '.x', $x);
-            $encoding->add($this->getName() . '.y', $y);
-        } else {
-            $encoding->add('x', $x);
-            $encoding->add('y', $y);
-        }
-    }
-}
-    
-/**
- *    Submit button as button tag.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleButtonTag extends SimpleWidget {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    Defaults are very browser dependent.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleButtonTag($attributes) {
-        $this->SimpleWidget('button', $attributes);
-    }
-    
-    /**
-     *    Check to see if the tag can have both start and
-     *    end tags with content in between.
-     *    @return boolean        True if content allowed.
-     *    @access public
-     */
-    function expectEndTag() {
-        return true;
-    }
-    
-    /**
-     *    Disables the setting of the button value.
-     *    @param string $value       Ignored.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-    
-    /**
-     *    Value of browser visible text.
-     *    @return string        Visible label.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->getContent();
-    }
-    
-    /**
-     *    Test for a label match when searching.
-     *    @param string $label     Label to test.
-     *    @return boolean          True on match.
-     *    @access public
-     */
-    function isLabel($label) {
-        return trim($label) == trim($this->getLabel());
-    }
-}
-
-/**
- *    Content tag for text area.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTextAreaTag extends SimpleWidget {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleTextAreaTag($attributes) {
-        $this->SimpleWidget('textarea', $attributes);
-    }
-    
-    /**
-     *    Accessor for starting value.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        return $this->_wrap(SimpleHtmlSaxParser::decodeHtml($this->getContent()));
-    }
-    
-    /**
-     *    Applies word wrapping if needed.
-     *    @param string $value      New value.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return parent::setValue($this->_wrap($value));
-    }
-    
-    /**
-     *    Test to see if text should be wrapped.
-     *    @return boolean        True if wrapping on.
-     *    @access private
-     */
-    function _wrapIsEnabled() {
-        if ($this->getAttribute('cols')) {
-            $wrap = $this->getAttribute('wrap');
-            if (($wrap == 'physical') || ($wrap == 'hard')) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Performs the formatting that is peculiar to
-     *    this tag. There is strange behaviour in this
-     *    one, including stripping a leading new line.
-     *    Go figure. I am using Firefox as a guide.
-     *    @param string $text    Text to wrap.
-     *    @return string         Text wrapped with carriage
-     *                           returns and line feeds
-     *    @access private
-     */
-    function _wrap($text) {
-        $text = str_replace("\r\r\n", "\r\n", str_replace("\n", "\r\n", $text));
-        $text = str_replace("\r\n\n", "\r\n", str_replace("\r", "\r\n", $text));
-        if (strncmp($text, "\r\n", strlen("\r\n")) == 0) {
-            $text = substr($text, strlen("\r\n"));
-        }
-        if ($this->_wrapIsEnabled()) {
-            return wordwrap(
-                    $text,
-                    (integer)$this->getAttribute('cols'),
-                    "\r\n");
-        }
-        return $text;
-    }
-    
-    /**
-     *    The content of textarea is not part of the page.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return true;
-    }
-}
-
-/**
- *    File upload widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUploadTag extends SimpleWidget {
-    
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleUploadTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-    }
-    
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-    
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write(&$encoding) {
-        if (! file_exists($this->getValue())) {
-            return;
-        }
-        $encoding->attach(
-                $this->getName(),
-                implode('', file($this->getValue())),
-                basename($this->getValue()));
-    }
-}
-
-/**
- *    Drop down widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleSelectionTag extends SimpleWidget {
-    var $_options;
-    var $_choice;
-    
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleSelectionTag($attributes) {
-        $this->SimpleWidget('select', $attributes);
-        $this->_options = array();
-        $this->_choice = false;
-    }
-    
-    /**
-     *    Adds an option tag to a selection field.
-     *    @param SimpleOptionTag $tag     New option.
-     *    @access public
-     */
-    function addTag(&$tag) {
-        if ($tag->getTagName() == 'option') {
-            $this->_options[] = &$tag;
-        }
-    }
-    
-    /**
-     *    Text within the selection element is ignored.
-     *    @param string $content        Ignored.
-     *    @access public
-     */
-    function addContent($content) {
-    }
-    
-    /**
-     *    Scans options for defaults. If none, then
-     *    the first option is selected.
-     *    @return string        Selected field.
-     *    @access public
-     */
-    function getDefault() {
-        for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-            if ($this->_options[$i]->getAttribute('selected') !== false) {
-                return $this->_options[$i]->getDefault();
-            }
-        }
-        if ($count > 0) {
-            return $this->_options[0]->getDefault();
-        }
-        return '';
-    }
-    
-    /**
-     *    Can only set allowed values.
-     *    @param string $value       New choice.
-     *    @return boolean            True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-            if ($this->_options[$i]->isValue($value)) {
-                $this->_choice = $i;
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Accessor for current selection value.
-     *    @return string      Value attribute or
-     *                        content of opton.
-     *    @access public
-     */
-    function getValue() {
-        if ($this->_choice === false) {
-            return $this->getDefault();
-        }
-        return $this->_options[$this->_choice]->getValue();
-    }
-}
-
-/**
- *    Drop down widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class MultipleSelectionTag extends SimpleWidget {
-    var $_options;
-    var $_values;
-    
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function MultipleSelectionTag($attributes) {
-        $this->SimpleWidget('select', $attributes);
-        $this->_options = array();
-        $this->_values = false;
-    }
-    
-    /**
-     *    Adds an option tag to a selection field.
-     *    @param SimpleOptionTag $tag     New option.
-     *    @access public
-     */
-    function addTag(&$tag) {
-        if ($tag->getTagName() == 'option') {
-            $this->_options[] = &$tag;
-        }
-    }
-    
-    /**
-     *    Text within the selection element is ignored.
-     *    @param string $content        Ignored.
-     *    @access public
-     */
-    function addContent($content) {
-    }
-    
-    /**
-     *    Scans options for defaults to populate the
-     *    value array().
-     *    @return array        Selected fields.
-     *    @access public
-     */
-    function getDefault() {
-        $default = array();
-        for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-            if ($this->_options[$i]->getAttribute('selected') !== false) {
-                $default[] = $this->_options[$i]->getDefault();
-            }
-        }
-        return $default;
-    }
-    
-    /**
-     *    Can only set allowed values. Any illegal value
-     *    will result in a failure, but all correct values
-     *    will be set.
-     *    @param array $desired      New choices.
-     *    @return boolean            True if all allowed.
-     *    @access public
-     */
-    function setValue($desired) {
-        $achieved = array();
-        foreach ($desired as $value) {
-            $success = false;
-            for ($i = 0, $count = count($this->_options); $i < $count; $i++) {
-                if ($this->_options[$i]->isValue($value)) {
-                    $achieved[] = $this->_options[$i]->getValue();
-                    $success = true;
-                    break;
-                }
-            }
-            if (! $success) {
-                return false;
-            }
-        }
-        $this->_values = $achieved;
-        return true;
-    }
-    
-    /**
-     *    Accessor for current selection value.
-     *    @return array      List of currently set options.
-     *    @access public
-     */
-    function getValue() {
-        if ($this->_values === false) {
-            return $this->getDefault();
-        }
-        return $this->_values;
-    }
-}
-
-/**
- *    Option for selection field.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleOptionTag extends SimpleWidget {
-    
-    /**
-     *    Stashes the attributes.
-     */
-    function SimpleOptionTag($attributes) {
-        $this->SimpleWidget('option', $attributes);
-    }
-    
-    /**
-     *    Does nothing.
-     *    @param string $value      Ignored.
-     *    @return boolean           Not allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        return false;
-    }
-    
-    /**
-     *    Test to see if a value matches the option.
-     *    @param string $compare    Value to compare with.
-     *    @return boolean           True if possible match.
-     *    @access public
-     */
-    function isValue($compare) {
-        $compare = trim($compare);
-        if (trim($this->getValue()) == $compare) {
-            return true;
-        }
-        return trim($this->getContent()) == $compare;
-    }
-    
-    /**
-     *    Accessor for starting value. Will be set to
-     *    the option label if no value exists.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('value') === false) {
-            return $this->getContent();
-        }
-        return $this->getAttribute('value');
-    }
-    
-    /**
-     *    The content of options is not part of the page.
-     *    @return boolean        True.
-     *    @access public
-     */
-    function isPrivateContent() {
-        return true;
-    }
-}
-
-/**
- *    Radio button.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRadioButtonTag extends SimpleWidget {
-    
-    /**
-     *    Stashes the attributes.
-     *    @param array $attributes        Hash of attributes.
-     */
-    function SimpleRadioButtonTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', 'on');
-        }
-    }
-    
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-    
-    /**
-     *    The only allowed value sn the one in the
-     *    "value" attribute.
-     *    @param string $value      New value.
-     *    @return boolean           True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($value === false) {
-            return parent::setValue($value);
-        }
-        if ($value != $this->getAttribute('value')) {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-    
-    /**
-     *    Accessor for starting value.
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('checked') !== false) {
-            return $this->getAttribute('value');
-        }
-        return false;
-    }
-}
-
-/**
- *    Checkbox widget.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCheckboxTag extends SimpleWidget {
-    
-    /**
-     *    Starts with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleCheckboxTag($attributes) {
-        $this->SimpleWidget('input', $attributes);
-        if ($this->getAttribute('value') === false) {
-            $this->_setAttribute('value', 'on');
-        }
-    }
-    
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-    
-    /**
-     *    The only allowed value in the one in the
-     *    "value" attribute. The default for this
-     *    attribute is "on". If this widget is set to
-     *    true, then the usual value will be taken.
-     *    @param string $value      New value.
-     *    @return boolean           True if allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if ($value === false) {
-            return parent::setValue($value);
-        }
-        if ($value === true) {
-            return parent::setValue($this->getAttribute('value'));
-        }
-        if ($value != $this->getAttribute('value')) {
-            return false;
-        }
-        return parent::setValue($value);
-    }
-    
-    /**
-     *    Accessor for starting value. The default
-     *    value is "on".
-     *    @return string        Parsed value.
-     *    @access public
-     */
-    function getDefault() {
-        if ($this->getAttribute('checked') !== false) {
-            return $this->getAttribute('value');
-        }
-        return false;
-    }
-}
-
-/**
- *    A group of multiple widgets with some shared behaviour.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleTagGroup {
-    var $_widgets = array();
-
-    /**
-     *    Adds a tag to the group.
-     *    @param SimpleWidget $widget
-     *    @access public
-     */
-    function addWidget(&$widget) {
-        $this->_widgets[] = &$widget;
-    }
-    
-    /**
-     *    Accessor to widget set.
-     *    @return array        All widgets.
-     *    @access protected
-     */
-    function &_getWidgets() {
-        return $this->_widgets;
-    }
-
-    /**
-     *    Accessor for an attribute.
-     *    @param string $label    Attribute name.
-     *    @return boolean         Always false.
-     *    @access public
-     */
-    function getAttribute($label) {
-        return false;
-    }
-    
-    /**
-     *    Fetches the name for the widget from the first
-     *    member.
-     *    @return string        Name of widget.
-     *    @access public
-     */
-    function getName() {
-        if (count($this->_widgets) > 0) {
-            return $this->_widgets[0]->getName();
-        }
-    }
-    
-    /**
-     *    Scans the widgets for one with the appropriate
-     *    ID field.
-     *    @param string $id        ID value to try.
-     *    @return boolean          True if matched.
-     *    @access public
-     */
-    function isId($id) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($this->_widgets[$i]->isId($id)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Scans the widgets for one with the appropriate
-     *    attached label.
-     *    @param string $label     Attached label to try.
-     *    @return boolean          True if matched.
-     *    @access public
-     */
-    function isLabel($label) {
-        for ($i = 0, $count = count($this->_widgets); $i < $count; $i++) {
-            if ($this->_widgets[$i]->isLabel($label)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Dispatches the value into the form encoded packet.
-     *    @param SimpleEncoding $encoding    Form packet.
-     *    @access public
-     */
-    function write(&$encoding) {
-        $encoding->add($this->getName(), $this->getValue());
-    }
-}
-
-/**
- *    A group of tags with the same name within a form.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleCheckboxGroup extends SimpleTagGroup {
-    
-    /**
-     *    Accessor for current selected widget or false
-     *    if none.
-     *    @return string/array     Widget values or false if none.
-     *    @access public
-     */
-    function getValue() {
-        $values = array();
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getValue() !== false) {
-                $values[] = $widgets[$i]->getValue();
-            }
-        }
-        return $this->_coerceValues($values);
-    }
-    
-    /**
-     *    Accessor for starting value that is active.
-     *    @return string/array      Widget values or false if none.
-     *    @access public
-     */
-    function getDefault() {
-        $values = array();
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getDefault() !== false) {
-                $values[] = $widgets[$i]->getDefault();
-            }
-        }
-        return $this->_coerceValues($values);
-    }
-    
-    /**
-     *    Accessor for current set values.
-     *    @param string/array/boolean $values   Either a single string, a
-     *                                          hash or false for nothing set.
-     *    @return boolean                       True if all values can be set.
-     *    @access public
-     */
-    function setValue($values) {
-        $values = $this->_makeArray($values);
-        if (! $this->_valuesArePossible($values)) {
-            return false;
-        }
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            $possible = $widgets[$i]->getAttribute('value');
-            if (in_array($widgets[$i]->getAttribute('value'), $values)) {
-                $widgets[$i]->setValue($possible);
-            } else {
-                $widgets[$i]->setValue(false);
-            }
-        }
-        return true;
-    }
-    
-    /**
-     *    Tests to see if a possible value set is legal.
-     *    @param string/array/boolean $values   Either a single string, a
-     *                                          hash or false for nothing set.
-     *    @return boolean                       False if trying to set a
-     *                                          missing value.
-     *    @access private
-     */
-    function _valuesArePossible($values) {
-        $matches = array();
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            $possible = $widgets[$i]->getAttribute('value');
-            if (in_array($possible, $values)) {
-                $matches[] = $possible;
-            }
-        }
-        return ($values == $matches);
-    }
-    
-    /**
-     *    Converts the output to an appropriate format. This means
-     *    that no values is false, a single value is just that
-     *    value and only two or more are contained in an array.
-     *    @param array $values           List of values of widgets.
-     *    @return string/array/boolean   Expected format for a tag.
-     *    @access private
-     */
-    function _coerceValues($values) {
-        if (count($values) == 0) {
-            return false;
-        } elseif (count($values) == 1) {
-            return $values[0];
-        } else {
-            return $values;
-        }
-    }
-    
-    /**
-     *    Converts false or string into array. The opposite of
-     *    the coercian method.
-     *    @param string/array/boolean $value  A single item is converted
-     *                                        to a one item list. False
-     *                                        gives an empty list.
-     *    @return array                       List of values, possibly empty.
-     *    @access private
-     */
-    function _makeArray($value) {
-        if ($value === false) {
-            return array();
-        }
-        if (is_string($value)) {
-            return array($value);
-        }
-        return $value;
-    }
-}
-
-/**
- *    A group of tags with the same name within a form.
- *    Used for radio buttons.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleRadioGroup extends SimpleTagGroup {
-    
-    /**
-     *    Each tag is tried in turn until one is
-     *    successfully set. The others will be
-     *    unchecked if successful.
-     *    @param string $value      New value.
-     *    @return boolean           True if any allowed.
-     *    @access public
-     */
-    function setValue($value) {
-        if (! $this->_valueIsPossible($value)) {
-            return false;
-        }
-        $index = false;
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if (! $widgets[$i]->setValue($value)) {
-                $widgets[$i]->setValue(false);
-            }
-        }
-        return true;
-    }
-    
-    /**
-     *    Tests to see if a value is allowed.
-     *    @param string    Attempted value.
-     *    @return boolean  True if a valid value.
-     *    @access private
-     */
-    function _valueIsPossible($value) {
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getAttribute('value') == $value) {
-                return true;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Accessor for current selected widget or false
-     *    if none.
-     *    @return string/boolean   Value attribute or
-     *                             content of opton.
-     *    @access public
-     */
-    function getValue() {
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getValue() !== false) {
-                return $widgets[$i]->getValue();
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Accessor for starting value that is active.
-     *    @return string/boolean      Value of first checked
-     *                                widget or false if none.
-     *    @access public
-     */
-    function getDefault() {
-        $widgets = &$this->_getWidgets();
-        for ($i = 0, $count = count($widgets); $i < $count; $i++) {
-            if ($widgets[$i]->getDefault() !== false) {
-                return $widgets[$i]->getDefault();
-            }
-        }
-        return false;
-    }
-}
-
-/**
- *    Tag to keep track of labels.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleLabelTag extends SimpleTag {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleLabelTag($attributes) {
-        $this->SimpleTag('label', $attributes);
-    }
-    
-    /**
-     *    Access for the ID to attach the label to.
-     *    @return string        For attribute.
-     *    @access public
-     */
-    function getFor() {
-        return $this->getAttribute('for');
-    }
-}
-
-/**
- *    Tag to aid parsing the form.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFormTag extends SimpleTag {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleFormTag($attributes) {
-        $this->SimpleTag('form', $attributes);
-    }
-}
-
-/**
- *    Tag to aid parsing the frames in a page.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleFrameTag extends SimpleTag {
-    
-    /**
-     *    Starts with a named tag with attributes only.
-     *    @param hash $attributes    Attribute names and
-     *                               string values.
-     */
-    function SimpleFrameTag($attributes) {
-        $this->SimpleTag('frame', $attributes);
-    }
-    
-    /**
-     *    Tag contains no content.
-     *    @return boolean        False.
-     *    @access public
-     */
-    function expectEndTag() {
-        return false;
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/acceptance_test.php b/tests/simpletest/test/acceptance_test.php
deleted file mode 100644
index 9dbb5a35a..000000000
--- a/tests/simpletest/test/acceptance_test.php
+++ /dev/null
@@ -1,1633 +0,0 @@
-<?php
-// $Id: acceptance_test.php 1700 2008-03-24 16:17:48Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../compatibility.php');
-require_once(dirname(__FILE__) . '/../browser.php');
-require_once(dirname(__FILE__) . '/../web_tester.php');
-require_once(dirname(__FILE__) . '/../unit_tester.php');
-
-class SimpleTestAcceptanceTest extends WebTestCase {
-    function samples() {
-        return 'http://www.lastcraft.com/test/';
-    }
-}
-
-class TestOfLiveBrowser extends UnitTestCase {
-    function samples() {
-        return SimpleTestAcceptanceTest::samples();
-    }
-
-    function testGet() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $this->assertTrue($browser->get($this->samples() . 'network_confirm.php'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/', $browser->getContent());
-        $this->assertEqual($browser->getTitle(), 'Simple test target file');
-        $this->assertEqual($browser->getResponseCode(), 200);
-        $this->assertEqual($browser->getMimeType(), 'text/html');
-    }
-    
-    function testPost() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $this->assertTrue($browser->post($this->samples() . 'network_confirm.php'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
-    }
-    
-    function testAbsoluteLinkFollowing() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLink('Absolute'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-    
-    function testRelativeEncodedeLinkFollowing() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLink("m�rc�l kiek'eboe"));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-    
-    function testRelativeLinkFollowing() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLink('Relative'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-    
-    function testUnifiedClickLinkClicking() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->click('Relative'));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-    
-    function testIdLinkFollowing() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($browser->clickLinkById(1));
-        $this->assertPattern('/target for the SimpleTest/', $browser->getContent());
-    }
-    
-    function testCookieReading() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'set_cookies.php');
-        $this->assertEqual($browser->getCurrentCookieValue('session_cookie'), 'A');
-        $this->assertEqual($browser->getCurrentCookieValue('short_cookie'), 'B');
-        $this->assertEqual($browser->getCurrentCookieValue('day_cookie'), 'C');
-    }
-    
-    function testSimpleSubmit() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'form.html');
-        $this->assertTrue($browser->clickSubmit('Go!'));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/', $browser->getContent());
-        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
-    }
-    
-    function testUnifiedClickCanSubmit() {
-        $browser = &new SimpleBrowser();
-        $browser->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-        $browser->get($this->samples() . 'form.html');
-        $this->assertTrue($browser->click('Go!'));
-        $this->assertPattern('/go=\[Go!\]/', $browser->getContent());
-    }
-}
-
-class TestRadioFields extends SimpleTestAcceptanceTest {
-	function testSetFieldAsInteger() {
-		$this->get($this->samples() . 'form_with_radio_buttons.html');
-		$this->assertTrue($this->setField('tested_field', 2));
-		$this->clickSubmitByName('send');
-		$this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
-	}
-
-	function testSetFieldAsString() {
-		$this->get($this->samples() . 'form_with_radio_buttons.html');
-		$this->assertTrue($this->setField('tested_field', '2'));
-		$this->clickSubmitByName('send');
-		$this->assertEqual($this->getUrl(), $this->samples() . 'form_with_radio_buttons.html?tested_field=2&send=click+me');
-	}
-}
-
-class TestOfLiveFetching extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
- 
-	function testFormWithArrayBasedInputs() {
-		$this->get($this->samples() . 'form_with_array_based_inputs.php');
-		$this->setField('value[]', '3', '1');
-		$this->setField('value[]', '4', '2');
-		$this->clickSubmit('Go');
-        $this->assertPattern('/QUERY_STRING : value%5B%5D=3&value%5B%5D=4&submit=Go/');
-	}
-
-	function testFormWithQuotedValues() {
-		$this->get($this->samples() . 'form_with_quoted_values.php');
-		$this->assertField('a', 'default');
-		$this->assertFieldById('text_field', 'default');
-		$this->clickSubmit('Go');
-        $this->assertPattern('/a=default&submit=Go/');
-	}
-
-    function testGet() {
-        $this->assertTrue($this->get($this->samples() . 'network_confirm.php'));
-        $this->assertEqual($this->getUrl(), $this->samples() . 'network_confirm.php');
-        $this->assertText('target for the SimpleTest');
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertTitle('Simple test target file');
-        $this->assertTitle(new PatternExpectation('/target file/'));
-        $this->assertResponse(200);
-        $this->assertMime('text/html');
-        $this->assertHeader('connection', 'close');
-        $this->assertHeader('connection', new PatternExpectation('/los/'));
-    }
-    
-    function testSlowGet() {
-        $this->assertTrue($this->get($this->samples() . 'slow_page.php'));
-    }
-    
-    function testTimedOutGet() {
-        $this->setConnectionTimeout(1);
-        $this->ignoreErrors();
-        $this->assertFalse($this->get($this->samples() . 'slow_page.php'));
-    }
-    
-    function testPost() {
-        $this->assertTrue($this->post($this->samples() . 'network_confirm.php'));
-        $this->assertText('target for the SimpleTest');
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-    }
-    
-    function testGetWithData() {
-        $this->get($this->samples() . 'network_confirm.php', array("a" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-    
-    function testPostWithData() {
-        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-
-    function testPostWithRecursiveData() {
-        $this->post($this->samples() . 'network_confirm.php', array("a" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a[aa]" => "aaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa]]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a[aa][aaa]" => "aaaa"));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa=[aaaa]]]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => "aaa")));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa]]');
-
-        $this->post($this->samples() . 'network_confirm.php', array("a" => array("aa" => array("aaa" => "aaaa"))));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aa=[aaa=[aaaa]]]');
-    }
-
-    function testRelativeGet() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->get('network_confirm.php'));
-        $this->assertText('target for the SimpleTest');
-    }
-    
-    function testRelativePost() {
-        $this->post($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->post('network_confirm.php'));
-        $this->assertText('target for the SimpleTest');
-    }
-}
-
-class TestOfLinkFollowing extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testLinkAssertions() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertLink('Absolute', $this->samples() . 'network_confirm.php');
-        $this->assertLink('Absolute', new PatternExpectation('/confirm/'));
-        $this->assertClickable('Absolute');
-    }
-    
-    function testAbsoluteLinkFollowing() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->clickLink('Absolute'));
-        $this->assertText('target for the SimpleTest');
-    }
-    
-    function testRelativeLinkFollowing() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertTrue($this->clickLink('Relative'));
-        $this->assertText('target for the SimpleTest');
-    }
-    
-    function testLinkIdFollowing() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->assertLinkById(1);
-        $this->assertTrue($this->clickLinkById(1));
-        $this->assertText('target for the SimpleTest');
-    }
-    
-    function testAbsoluteUrlBehavesAbsolutely() {
-        $this->get($this->samples() . 'link_confirm.php');
-        $this->get('http://www.lastcraft.com');
-        $this->assertText('No guarantee of quality is given or even intended');
-    }
-    
-    function testRelativeUrlRespectsBaseTag() {
-        $this->get($this->samples() . 'base_tag/base_link.html');
-        $this->click('Back to test pages');
-        $this->assertTitle('Simple test target file');
-    }
-}
-
-class TestOfLivePageLinkingWithMinimalLinks extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testClickToExplicitelyNamedSelfReturns() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->assertEqual($this->getUrl(), $this->samples() . 'front_controller_style/a_page.php');
-        $this->assertTitle('Simple test page with links');
-        $this->assertLink('Self');
-        $this->clickLink('Self');
-        $this->assertTitle('Simple test page with links');
-    }
-    
-    function testClickToMissingPageReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('No page');
-        $this->assertTitle('Simple test page with links');
-        $this->assertText('[action=no_page]');
-    }
-    
-    function testClickToBareActionReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Bare action');
-        $this->assertTitle('Simple test page with links');
-        $this->assertText('[action=]');
-    }
-    
-    function testClickToSingleQuestionMarkReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Empty query');
-        $this->assertTitle('Simple test page with links');
-    }
-    
-    function testClickToEmptyStringReturnsToSamePage() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Empty link');
-        $this->assertTitle('Simple test page with links');
-    }
-    
-    function testClickToSingleDotGoesToCurrentDirectory() {
-        $this->get($this->samples() . 'front_controller_style/a_page.php');
-        $this->clickLink('Current directory');
-        $this->assertTitle(
-                'Simple test front controller',
-                '%s -> index.php needs to be set as a default web server home page');
-    }
-    
-    function testClickBackADirectoryLevel() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Down one');
-        $this->assertPattern('|Index of .*?/test|i');
-    }
-}
-
-class TestOfLiveFrontControllerEmulation extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testJumpToNamedPage() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->assertText('Simple test front controller');
-        $this->clickLink('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=index]');
-    }
-    
-    function testJumpToUnnamedPage() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('No page');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=no_page]');
-    }
-    
-    function testJumpToUnnamedPageWithBareParameter() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Bare action');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=]');
-    }
-    
-    function testJumpToUnnamedPageWithEmptyQuery() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Empty query');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-    }
-    
-    function testJumpToUnnamedPageWithEmptyLink() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Empty link');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-    }
-    
-    function testJumpBackADirectoryLevel() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickLink('Down one');
-        $this->assertPattern('|Index of .*?/test|');
-    }
-    
-    function testSubmitToNamedPage() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->assertText('Simple test front controller');
-        $this->clickSubmit('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=Index]');
-    }
-    
-    function testSubmitToSameDirectory() {
-        $this->get($this->samples() . 'front_controller_style/index.php');
-        $this->clickSubmit('Same directory');
-        $this->assertResponse(200);
-        $this->assertText('[action=Same+directory]');
-    }
-    
-    function testSubmitToEmptyAction() {
-        $this->get($this->samples() . 'front_controller_style/index.php');
-        $this->clickSubmit('Empty action');
-        $this->assertResponse(200);
-        $this->assertText('[action=Empty+action]');
-    }
-    
-    function testSubmitToNoAction() {
-        $this->get($this->samples() . 'front_controller_style/index.php');
-        $this->clickSubmit('No action');
-        $this->assertResponse(200);
-        $this->assertText('[action=No+action]');
-    }
-    
-    function testSubmitBackADirectoryLevel() {
-        $this->get($this->samples() . 'front_controller_style/');
-        $this->clickSubmit('Down one');
-        $this->assertPattern('|Index of .*?/test|');
-    }
-    
-    function testSubmitToNamedPageWithMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/?a=A');
-        $this->assertText('Simple test front controller');
-        $this->clickSubmit('Index post');
-        $this->assertText('action=[Index post]');
-        $this->assertNoText('[a=A]');
-    }
-    
-    function testSubmitToSameDirectoryMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
-        $this->clickSubmit('Same directory post');
-        $this->assertText('action=[Same directory post]');
-        $this->assertNoText('[a=A]');
-    }
-    
-    function testSubmitToEmptyActionMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
-        $this->clickSubmit('Empty action post');
-        $this->assertText('action=[Empty action post]');
-        $this->assertText('[a=A]');
-    }
-    
-    function testSubmitToNoActionMixedPostAndGet() {
-        $this->get($this->samples() . 'front_controller_style/index.php?a=A');
-        $this->clickSubmit('No action post');
-        $this->assertText('action=[No action post]');
-        $this->assertText('[a=A]');
-    }
-}
-
-class TestOfLiveHeaders extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testConfirmingHeaderExistence() {
-        $this->get('http://www.lastcraft.com/');
-        $this->assertHeader('content-type');
-        $this->assertHeader('content-type', 'text/html');
-        $this->assertHeaderPattern('content-type', '/HTML/i');
-        $this->assertNoHeader('WWW-Authenticate');
-    }
-}
- 
-class TestOfLiveRedirects extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testNoRedirects() {
-        $this->setMaximumRedirects(0);
-        $this->get($this->samples() . 'redirect.php');
-        $this->assertTitle('Redirection test');
-    }
-    
-    function testRedirects() {
-        $this->setMaximumRedirects(1);
-        $this->get($this->samples() . 'redirect.php');
-        $this->assertTitle('Simple test target file');
-    }
-    
-    function testRedirectLosesGetData() {
-        $this->get($this->samples() . 'redirect.php', array('a' => 'aaa'));
-        $this->assertNoText('a=[aaa]');
-    }
-    
-    function testRedirectKeepsExtraRequestDataOfItsOwn() {
-        $this->get($this->samples() . 'redirect.php');
-        $this->assertText('r=[rrr]');
-    }
-    
-    function testRedirectLosesPostData() {
-        $this->post($this->samples() . 'redirect.php', array('a' => 'aaa'));
-        $this->assertTitle('Simple test target file');
-        $this->assertNoText('a=[aaa]');
-    }
-    
-    function testRedirectWithBaseUrlChange() {
-        $this->get($this->samples() . 'base_change_redirect.php');
-        $this->assertTitle('Simple test target file in folder');
-        $this->get($this->samples() . 'path/base_change_redirect.php');
-        $this->assertTitle('Simple test target file');
-    }
-    
-    function testRedirectWithDoubleBaseUrlChange() {
-        $this->get($this->samples() . 'double_base_change_redirect.php');
-        $this->assertTitle('Simple test target file');
-    }
-}
-
-class TestOfLiveCookies extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function here() {
-        return new SimpleUrl($this->samples());
-    }
-    
-    function thisHost() {
-        $here = $this->here();
-        return $here->getHost();
-    }
-    
-    function thisPath() {
-        $here = $this->here();
-        return $here->getPath();
-    }
-    
-    function testCookieSettingAndAssertions() {
-        $this->setCookie('a', 'Test cookie a');
-        $this->setCookie('b', 'Test cookie b', $this->thisHost());
-        $this->setCookie('c', 'Test cookie c', $this->thisHost(), $this->thisPath());
-        $this->get($this->samples() . 'network_confirm.php');
-        $this->assertText('Test cookie a');
-        $this->assertText('Test cookie b');
-        $this->assertText('Test cookie c');
-        $this->assertCookie('a');
-        $this->assertCookie('b', 'Test cookie b');
-        $this->assertTrue($this->getCookie('c') == 'Test cookie c');
-    }
-    
-    function testNoCookieSetWhenCookiesDisabled() {
-        $this->setCookie('a', 'Test cookie a');
-        $this->ignoreCookies();
-        $this->get($this->samples() . 'network_confirm.php');
-        $this->assertNoText('Test cookie a');
-    }
-    
-    function testCookieReading() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertCookie('session_cookie', 'A');
-        $this->assertCookie('short_cookie', 'B');
-        $this->assertCookie('day_cookie', 'C');
-    }
-     
-    function testNoCookieReadingWhenCookiesDisabled() {
-        $this->ignoreCookies();
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertNoCookie('session_cookie');
-        $this->assertNoCookie('short_cookie');
-        $this->assertNoCookie('day_cookie');
-    }
-   
-    function testCookiePatternAssertions() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertCookie('session_cookie', new PatternExpectation('/a/i'));
-    }
-    
-    function testTemporaryCookieExpiry() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->restart();
-        $this->assertNoCookie('session_cookie');
-        $this->assertCookie('day_cookie', 'C');
-    }
-    
-    function testTimedCookieExpiryWith100SecondMargin() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->ageCookies(3600);
-        $this->restart(time() + 100);
-        $this->assertNoCookie('session_cookie');
-        $this->assertNoCookie('hour_cookie');
-        $this->assertCookie('day_cookie', 'C');
-    }
-    
-    function testNoClockOverDriftBy100Seconds() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->restart(time() + 200);
-        $this->assertNoCookie(
-                'short_cookie',
-                '%s -> Please check your computer clock setting if you are not using NTP');
-    }
-    
-    function testNoClockUnderDriftBy100Seconds() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->restart(time() + 0);
-        $this->assertCookie(
-                'short_cookie',
-                'B',
-                '%s -> Please check your computer clock setting if you are not using NTP');
-    }
-    
-    function testCookiePath() {
-        $this->get($this->samples() . 'set_cookies.php');
-        $this->assertNoCookie('path_cookie', 'D');
-        $this->get('./path/show_cookies.php');
-        $this->assertPattern('/path_cookie/');
-        $this->assertCookie('path_cookie', 'D');
-    }
-}
-
-class LiveTestOfForms extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testSimpleSubmit() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('go=[Go!]');
-    }
-    
-    function testDefaultFormValues() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertFieldByName('a', '');
-        $this->assertFieldByName('b', 'Default text');
-        $this->assertFieldByName('c', '');
-        $this->assertFieldByName('d', 'd1');
-        $this->assertFieldByName('e', false);
-        $this->assertFieldByName('f', 'on');
-        $this->assertFieldByName('g', 'g3');
-        $this->assertFieldByName('h', 2);
-        $this->assertFieldByName('go', 'Go!');
-        $this->assertClickable('Go!');
-        $this->assertSubmit('Go!');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('go=[Go!]');
-        $this->assertText('a=[]');
-        $this->assertText('b=[Default text]');
-        $this->assertText('c=[]');
-        $this->assertText('d=[d1]');
-        $this->assertNoText('e=[');
-        $this->assertText('f=[on]');
-        $this->assertText('g=[g3]');
-    }
-    
-    function testFormSubmissionByButtonLabel() {
-        $this->get($this->samples() . 'form.html');
-        $this->setFieldByName('a', 'aaa');
-        $this->setFieldByName('b', 'bbb');
-        $this->setFieldByName('c', 'ccc');
-        $this->setFieldByName('d', 'D2');
-        $this->setFieldByName('e', 'on');
-        $this->setFieldByName('f', false);
-        $this->setFieldByName('g', 'g2');
-        $this->setFieldByName('h', 1);
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-    }
-    
-    function testAdditionalFormValues() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmit('Go!', array('add' => 'A')));
-        $this->assertText('go=[Go!]');
-        $this->assertText('add=[A]');
-    }
-    
-    function testFormSubmissionByName() {
-        $this->get($this->samples() . 'form.html');
-        $this->setFieldByName('a', 'A');
-        $this->assertTrue($this->clickSubmitByName('go'));
-        $this->assertText('a=[A]');
-    }
-    
-    function testFormSubmissionByNameAndAdditionalParameters() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmitByName('go', array('add' => 'A')));
-        $this->assertText('go=[Go!]');
-        $this->assertText('add=[A]');
-    }
-    
-    function testFormSubmissionBySubmitButtonLabeledSubmit() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmitByName('test'));
-        $this->assertText('test=[Submit]');
-    }
-    
-    function testFormSubmissionWithIds() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertFieldById(1, '');
-        $this->assertFieldById(2, 'Default text');
-        $this->assertFieldById(3, '');
-        $this->assertFieldById(4, 'd1');
-        $this->assertFieldById(5, false);
-        $this->assertFieldById(6, 'on');
-        $this->assertFieldById(8, 'g3');
-        $this->assertFieldById(11, 2);
-        $this->setFieldById(1, 'aaa');
-        $this->setFieldById(2, 'bbb');
-        $this->setFieldById(3, 'ccc');
-        $this->setFieldById(4, 'D2');
-        $this->setFieldById(5, 'on');
-        $this->setFieldById(6, false);
-        $this->setFieldById(8, 'g2');
-        $this->setFieldById(11, 'H1');
-        $this->assertTrue($this->clickSubmitById(99));
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-        $this->assertText('h=[1]');
-        $this->assertText('go=[Go!]');
-    }
-    
-    function testFormSubmissionWithLabels() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertField('Text A', '');
-        $this->assertField('Text B', 'Default text');
-        $this->assertField('Text area C', '');
-        $this->assertField('Selection D', 'd1');
-        $this->assertField('Checkbox E', false);
-        $this->assertField('Checkbox F', 'on');
-        $this->assertField('3', 'g3');
-        $this->assertField('Selection H', 2);
-        $this->setField('Text A', 'aaa');
-        $this->setField('Text B', 'bbb');
-        $this->setField('Text area C', 'ccc');
-        $this->setField('Selection D', 'D2');
-        $this->setField('Checkbox E', 'on');
-        $this->setField('Checkbox F', false);
-        $this->setField('2', 'g2');
-        $this->setField('Selection H', 'H1');
-        $this->clickSubmit('Go!');
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-        $this->assertText('h=[1]');
-        $this->assertText('go=[Go!]');
-    }
-    
-    function testSettingCheckboxWithBooleanTrueSetsUnderlyingValue() {
-        $this->get($this->samples() . 'form.html');
-        $this->setField('Checkbox E', true);
-        $this->assertField('Checkbox E', 'on');
-        $this->clickSubmit('Go!');
-        $this->assertText('e=[on]');
-    }
-    
-    function testFormSubmissionWithMixedPostAndGet() {
-        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
-        $this->setField('Text A', 'Hello');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[Hello]');
-        $this->assertText('x=[X]');
-        $this->assertText('y=[Y]');
-    }
-    
-    function testFormSubmissionWithMixedPostAndEncodedGet() {
-        $this->get($this->samples() . 'form_with_mixed_post_and_get.html');
-        $this->setField('Text B', 'Hello');
-        $this->assertTrue($this->clickSubmit('Go encoded!'));
-        $this->assertText('b=[Hello]');
-        $this->assertText('x=[X]');
-        $this->assertText('y=[Y]');
-    }
-    
-    function testFormSubmissionWithoutAction() {
-        $this->get($this->samples() . 'form_without_action.php?test=test');
-        $this->assertText('_GET : [test]');
-        $this->assertTrue($this->clickSubmit('Submit Post With Empty Action'));
-        $this->assertText('_GET : [test]');
-        $this->assertText('_POST : [test]');
-    }
-
-    function testImageSubmissionByLabel() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertImage('Image go!');
-        $this->assertTrue($this->clickImage('Image go!', 10, 12));
-        $this->assertText('go_x=[10]');
-        $this->assertText('go_y=[12]');
-    }
-    
-    function testImageSubmissionByLabelWithAdditionalParameters() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickImage('Image go!', 10, 12, array('add' => 'A')));
-        $this->assertText('add=[A]');
-    }
-    
-    function testImageSubmissionByName() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickImageByName('go', 10, 12));
-        $this->assertText('go_x=[10]');
-        $this->assertText('go_y=[12]');
-    }
-    
-    function testImageSubmissionById() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickImageById(97, 10, 12));
-        $this->assertText('go_x=[10]');
-        $this->assertText('go_y=[12]');
-    }
-    
-    function testButtonSubmissionByLabel() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->clickSubmit('Button go!', 10, 12));
-        $this->assertPattern('/go=\[ButtonGo\]/s');
-    }
-    
-    function testNamelessSubmitSendsNoValue() {
-        $this->get($this->samples() . 'form_with_unnamed_submit.html');
-        $this->click('Go!');
-        $this->assertNoText('Go!');
-        $this->assertNoText('submit');
-    }
-    
-    function testNamelessImageSendsXAndYValues() {
-        $this->get($this->samples() . 'form_with_unnamed_submit.html');
-        $this->clickImage('Image go!', 4, 5);
-        $this->assertNoText('ImageGo');
-        $this->assertText('x=[4]');
-        $this->assertText('y=[5]');
-    }
-    
-    function testNamelessButtonSendsNoValue() {
-        $this->get($this->samples() . 'form_with_unnamed_submit.html');
-        $this->click('Button Go!');
-        $this->assertNoText('ButtonGo');
-    }
-    
-    function testSelfSubmit() {
-        $this->get($this->samples() . 'self_form.php');
-        $this->assertNoText('[Submitted]');
-        $this->assertNoText('[Wrong form]');
-        $this->assertTrue($this->clickSubmit());
-        $this->assertText('[Submitted]');
-        $this->assertNoText('[Wrong form]');
-        $this->assertTitle('Test of form self submission');
-    }
-    
-    function testSelfSubmitWithParameters() {
-        $this->get($this->samples() . 'self_form.php');
-        $this->setFieldByName('visible', 'Resent');
-        $this->assertTrue($this->clickSubmit());
-        $this->assertText('[Resent]');
-    }
-    
-    function testSettingOfBlankOption() {
-        $this->get($this->samples() . 'form.html');
-        $this->assertTrue($this->setFieldByName('d', ''));
-        $this->clickSubmit('Go!');
-        $this->assertText('d=[]');
-    }
-    
-    function testAssertingFieldValueWithPattern() {
-        $this->get($this->samples() . 'form.html');
-        $this->setField('c', 'A very long string');
-        $this->assertField('c', new PatternExpectation('/very long/'));
-    }
-    
-    function testSendingMultipartFormDataEncodedForm() {
-        $this->get($this->samples() . 'form_data_encoded_form.html');
-        $this->assertField('Text A', '');
-        $this->assertField('Text B', 'Default text');
-        $this->assertField('Text area C', '');
-        $this->assertField('Selection D', 'd1');
-        $this->assertField('Checkbox E', false);
-        $this->assertField('Checkbox F', 'on');
-        $this->assertField('3', 'g3');
-        $this->assertField('Selection H', 2);
-        $this->setField('Text A', 'aaa');
-        $this->setField('Text B', 'bbb');
-        $this->setField('Text area C', 'ccc');
-        $this->setField('Selection D', 'D2');
-        $this->setField('Checkbox E', 'on');
-        $this->setField('Checkbox F', false);
-        $this->setField('2', 'g2');
-        $this->setField('Selection H', 'H1');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[aaa]');
-        $this->assertText('b=[bbb]');
-        $this->assertText('c=[ccc]');
-        $this->assertText('d=[d2]');
-        $this->assertText('e=[on]');
-        $this->assertNoText('f=[');
-        $this->assertText('g=[g2]');
-        $this->assertText('h=[1]');
-        $this->assertText('go=[Go!]');
-    }
-    
-    function testSettingVariousBlanksInFields() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->assertField('Text A', '');
-        $this->setField('Text A', '0');
-        $this->assertField('Text A', '0');
-        $this->assertField('Text area B', '');
-        $this->setField('Text area B', '0');
-        $this->assertField('Text area B', '0');
-        $this->assertField('Text area C', "                ");
-        $this->assertField('Selection D', '');
-        $this->setField('Selection D', 'D2');
-        $this->assertField('Selection D', 'D2');
-        $this->setField('Selection D', 'D3');
-        $this->assertField('Selection D', '0');
-        $this->setField('Selection D', 'D4');
-        $this->assertField('Selection D', '?');
-        $this->assertField('Checkbox E', '');
-        $this->assertField('Checkbox F', 'on');
-        $this->assertField('Checkbox G', '0');
-        $this->assertField('Checkbox H', '?');
-        $this->assertFieldByName('i', 'on');
-        $this->setFieldByName('i', '');
-        $this->assertFieldByName('i', '');
-        $this->setFieldByName('i', '0');
-        $this->assertFieldByName('i', '0');
-        $this->setFieldByName('i', '?');
-        $this->assertFieldByName('i', '?');
-    }
-    
-    function testSubmissionOfBlankFields() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Text A', '');
-        $this->setField('Text area B', '');
-        $this->setFieldByName('i', '');
-        $this->click('Go!');
-        $this->assertText('a=[]');
-        $this->assertText('b=[]');
-        $this->assertPattern('/c=\[                \]/');
-        $this->assertText('d=[]');
-        $this->assertText('e=[]');
-        $this->assertText('i=[]');
-    }
-    
-    function testSubmissionOfEmptyValues() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Selection D', 'D2');
-        $this->click('Go!');
-        $this->assertText('a=[]');
-        $this->assertText('b=[]');
-        $this->assertText('d=[D2]');
-        $this->assertText('f=[on]');
-        $this->assertText('i=[on]');
-    }
-    
-    function testSubmissionOfZeroes() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Text A', '0');
-        $this->setField('Text area B', '0');
-        $this->setField('Selection D', 'D3');
-        $this->setFieldByName('i', '0');
-        $this->click('Go!');
-        $this->assertText('a=[0]');
-        $this->assertText('b=[0]');
-        $this->assertText('d=[0]');
-        $this->assertText('g=[0]');
-        $this->assertText('i=[0]');
-    }
-    
-    function testSubmissionOfQuestionMarks() {
-        $this->get($this->samples() . 'form_with_false_defaults.html');
-        $this->setField('Text A', '?');
-        $this->setField('Text area B', '?');
-        $this->setField('Selection D', 'D4');
-        $this->setFieldByName('i', '?');
-        $this->click('Go!');
-        $this->assertText('a=[?]');
-        $this->assertText('b=[?]');
-        $this->assertText('d=[?]');
-        $this->assertText('h=[?]');
-        $this->assertText('i=[?]');
-    }
-
-    function testSubmissionOfHtmlEncodedValues() {
-        $this->get($this->samples() . 'form_with_tricky_defaults.html');
-        $this->assertField('Text A', '&\'"<>');
-        $this->assertField('Text B', '"');
-        $this->assertField('Text area C', '&\'"<>');
-        $this->assertField('Selection D', "'");
-        $this->assertField('Checkbox E', '&\'"<>');
-        $this->assertField('Checkbox F', false);
-        $this->assertFieldByname('i', "'");
-        $this->click('Go!');
-        $this->assertText('a=[&\'"<>, "]');
-        $this->assertText('c=[&\'"<>]');
-        $this->assertText("d=[']");
-        $this->assertText('e=[&\'"<>]');
-        $this->assertText("i=[']");
-    }
-    
-    function testFormActionRespectsBaseTag() {
-        $this->get($this->samples() . 'base_tag/form.html');
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('go=[Go!]');
-        $this->assertText('a=[]');
-    }
-}
-
-class TestOfLiveMultiValueWidgets extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testDefaultFormValueSubmission() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->assertFieldByName('a', array('a2', 'a3'));
-        $this->assertFieldByName('b', array('b2', 'b3'));
-        $this->assertFieldByName('c[]', array('c2', 'c3'));
-        $this->assertFieldByName('d', array('2', '3'));
-        $this->assertFieldByName('e', array('2', '3'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a2, a3]');
-        $this->assertText('b=[b2, b3]');
-        $this->assertText('c=[c2, c3]');
-        $this->assertText('d=[2, 3]');
-        $this->assertText('e=[2, 3]');
-    }
-    
-    function testSubmittingMultipleValues() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->setFieldByName('a', array('a1', 'a4'));
-        $this->assertFieldByName('a', array('a1', 'a4'));
-        $this->assertFieldByName('a', array('a4', 'a1'));
-        $this->setFieldByName('b', array('b1', 'b4'));
-        $this->assertFieldByName('b', array('b1', 'b4'));
-        $this->setFieldByName('c[]', array('c1', 'c4'));
-        $this->assertField('c[]', array('c1', 'c4'));
-        $this->setFieldByName('d', array('1', '4'));
-        $this->assertField('d', array('1', '4'));
-        $this->setFieldByName('e', array('e1', 'e4'));
-        $this->assertField('e', array('1', '4'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a1, a4]');
-        $this->assertText('b=[b1, b4]');
-        $this->assertText('c=[c1, c4]');
-        $this->assertText('d=[1, 4]');
-        $this->assertText('e=[1, 4]');
-    }
-    
-    function testSettingByOptionValue() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->setFieldByName('d', array('1', '4'));
-        $this->assertField('d', array('1', '4'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('d=[1, 4]');
-    }
-      
-    function testSubmittingMultipleValuesByLabel() {
-        $this->get($this->samples() . 'multiple_widget_form.html');
-        $this->setField('Multiple selection A', array('a1', 'a4'));
-        $this->assertField('Multiple selection A', array('a1', 'a4'));
-        $this->assertField('Multiple selection A', array('a4', 'a1'));
-        $this->setField('multiple selection C', array('c1', 'c4'));
-        $this->assertField('multiple selection C', array('c1', 'c4'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a1, a4]');
-        $this->assertText('c=[c1, c4]');
-    }
-  
-    function testSavantStyleHiddenFieldDefaults() {
-        $this->get($this->samples() . 'savant_style_form.html');
-        $this->assertFieldByName('a', array('a0'));
-        $this->assertFieldByName('b', array('b0'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a0]');
-        $this->assertText('b=[b0]');
-    }
-    
-    function testSavantStyleHiddenDefaultsAreOverridden() {
-        $this->get($this->samples() . 'savant_style_form.html');
-        $this->assertTrue($this->setFieldByName('a', array('a1')));
-        $this->assertTrue($this->setFieldByName('b', 'b1'));
-        $this->assertTrue($this->clickSubmit('Go!'));
-        $this->assertText('a=[a1]');
-        $this->assertText('b=[b1]');
-    }
-    
-    function testSavantStyleFormSettingById() {
-        $this->get($this->samples() . 'savant_style_form.html');
-        $this->assertFieldById(1, array('a0'));
-        $this->assertFieldById(4, array('b0'));
-        $this->assertTrue($this->setFieldById(2, 'a1'));
-        $this->assertTrue($this->setFieldById(5, 'b1'));
-        $this->assertTrue($this->clickSubmitById(99));
-        $this->assertText('a=[a1]');
-        $this->assertText('b=[b1]');
-    }
-}
-
-class TestOfFileUploads extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-
-    function testSingleFileUpload() {
-        $this->get($this->samples() . 'upload_form.html');
-        $this->assertTrue($this->setField('Content:',
-                dirname(__FILE__) . '/support/upload_sample.txt'));
-        $this->assertField('Content:', dirname(__FILE__) . '/support/upload_sample.txt');
-        $this->click('Go!');
-        $this->assertText('Sample for testing file upload');
-    }
-    
-    function testMultipleFileUpload() {
-        $this->get($this->samples() . 'upload_form.html');
-        $this->assertTrue($this->setField('Content:',
-                dirname(__FILE__) . '/support/upload_sample.txt'));
-        $this->assertTrue($this->setField('Supplemental:',
-                dirname(__FILE__) . '/support/supplementary_upload_sample.txt'));
-        $this->assertField('Supplemental:',
-                dirname(__FILE__) . '/support/supplementary_upload_sample.txt');
-        $this->click('Go!');
-        $this->assertText('Sample for testing file upload');
-        $this->assertText('Some more text content');
-    }
-    
-    function testBinaryFileUpload() {
-        $this->get($this->samples() . 'upload_form.html');
-        $this->assertTrue($this->setField('Content:',
-                dirname(__FILE__) . '/support/latin1_sample'));
-        $this->click('Go!');
-        $this->assertText(
-                implode('', file(dirname(__FILE__) . '/support/latin1_sample')));
-    }
-}
-
-class TestOfLiveHistoryNavigation extends SimpleTestAcceptanceTest {        
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testRetry() {
-        $this->get($this->samples() . 'cookie_based_counter.php');
-        $this->assertPattern('/count: 1/i');
-        $this->retry();
-        $this->assertPattern('/count: 2/i');
-        $this->retry();
-        $this->assertPattern('/count: 3/i');
-    }
-    
-    function testOfBackButton() {
-        $this->get($this->samples() . '1.html');
-        $this->clickLink('2');
-        $this->assertTitle('2');
-        $this->assertTrue($this->back());
-        $this->assertTitle('1');
-        $this->assertTrue($this->forward());
-        $this->assertTitle('2');
-        $this->assertFalse($this->forward());
-    }
-    
-    function testGetRetryResubmitsData() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'network_confirm.php?a=aaa'));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-    
-    function testGetRetryResubmitsExtraData() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'network_confirm.php',
-                array('a' => 'aaa')));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-    
-    function testPostRetryResubmitsData() {
-        $this->assertTrue($this->post(
-                $this->samples() . 'network_confirm.php',
-                array('a' => 'aaa')));
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>POST<\/dd>/');
-        $this->assertText('a=[aaa]');
-    }
-    
-    function testGetRetryResubmitsRepeatedData() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'network_confirm.php?a=1&a=2'));
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[1, 2]');
-        $this->retry();
-        $this->assertPattern('/Request method.*?<dd>GET<\/dd>/');
-        $this->assertText('a=[1, 2]');
-    }
-}
-
-class TestOfLiveAuthentication extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testChallengeFromProtectedPage() {
-        $this->get($this->samples() . 'protected/');
-        $this->assertResponse(401);
-        $this->assertAuthentication('Basic');
-        $this->assertRealm('SimpleTest basic authentication');
-        $this->assertRealm(new PatternExpectation('/simpletest/i'));
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->retry();
-        $this->assertResponse(200);
-    }
-    
-    function testTrailingSlashImpliedWithinRealm() {
-        $this->get($this->samples() . 'protected/');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->get($this->samples() . 'protected');
-        $this->assertResponse(200);
-    }
-    
-    function testTrailingSlashImpliedSettingRealm() {
-        $this->get($this->samples() . 'protected');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->get($this->samples() . 'protected/');
-        $this->assertResponse(200);
-    }
-    
-    function testEncodedAuthenticationFetchesPage() {
-        $this->get('http://test:secret@www.lastcraft.com/test/protected/');
-        $this->assertResponse(200);
-    }
-
-    function testEncodedAuthenticationFetchesPageAfterTrailingSlashRedirect() {
-        $this->get('http://test:secret@www.lastcraft.com/test/protected');
-        $this->assertResponse(200);
-    }
-
-    function testRealmExtendsToWholeDirectory() {
-        $this->get($this->samples() . 'protected/1.html');
-        $this->authenticate('test', 'secret');
-        $this->clickLink('2');
-        $this->assertResponse(200);
-        $this->clickLink('3');
-        $this->assertResponse(200);
-    }
-    
-    function testRedirectKeepsAuthentication() {
-        $this->get($this->samples() . 'protected/local_redirect.php');
-        $this->authenticate('test', 'secret');
-        $this->assertTitle('Simple test target file');
-    }
-    
-    function testRedirectKeepsEncodedAuthentication() {
-        $this->get('http://test:secret@www.lastcraft.com/test/protected/local_redirect.php');
-        $this->assertResponse(200);
-        $this->assertTitle('Simple test target file');
-    }
-    
-    function testSessionRestartLosesAuthentication() {
-        $this->get($this->samples() . 'protected/');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->restart();
-        $this->get($this->samples() . 'protected/');
-        $this->assertResponse(401);
-    }
-}
-
-class TestOfLoadingFrames extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testNoFramesContentWhenFramesDisabled() {
-        $this->ignoreFrames();
-        $this->get($this->samples() . 'one_page_frameset.html');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->assertText('This content is for no frames only');
-    }
-    
-    function testPatternMatchCanReadTheOnlyFrame() {
-        $this->get($this->samples() . 'one_page_frameset.html');
-        $this->assertText('A target for the SimpleTest test suite');
-        $this->assertNoText('This content is for no frames only');
-    }
-    
-    function testMessyFramesetResponsesByName() {
-        $this->assertTrue($this->get(
-                $this->samples() . 'messy_frameset.html'));
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        
-        $this->assertTrue($this->setFrameFocus('Front controller'));
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        
-        $this->assertTrue($this->setFrameFocus('One'));
-        $this->assertResponse(200);
-        $this->assertLink('2');
-        
-        $this->assertTrue($this->setFrameFocus('Frame links'));
-        $this->assertResponse(200);
-        $this->assertLink('Set one to 2');
-        
-        $this->assertTrue($this->setFrameFocus('Counter'));
-        $this->assertResponse(200);
-        $this->assertText('Count: 1');
-        
-        $this->assertTrue($this->setFrameFocus('Redirected'));
-        $this->assertResponse(200);
-        $this->assertText('r=rrr');
-        
-        $this->assertTrue($this->setFrameFocus('Protected'));
-        $this->assertResponse(401);
-        
-        $this->assertTrue($this->setFrameFocus('Protected redirect'));
-        $this->assertResponse(401);
-        
-        $this->assertTrue($this->setFrameFocusByIndex(1));
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        
-        $this->assertTrue($this->setFrameFocusByIndex(2));
-        $this->assertResponse(200);
-        $this->assertLink('2');
-        
-        $this->assertTrue($this->setFrameFocusByIndex(3));
-        $this->assertResponse(200);
-        $this->assertLink('Set one to 2');
-        
-        $this->assertTrue($this->setFrameFocusByIndex(4));
-        $this->assertResponse(200);
-        $this->assertText('Count: 1');
-        
-        $this->assertTrue($this->setFrameFocusByIndex(5));
-        $this->assertResponse(200);
-        $this->assertText('r=rrr');
-        
-        $this->assertTrue($this->setFrameFocusByIndex(6));
-        $this->assertResponse(401);
-        
-        $this->assertTrue($this->setFrameFocusByIndex(7));
-    }
-    
-    function testReloadingFramesetPage() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertText('Count: 1');
-        $this->retry();
-        $this->assertText('Count: 2');
-        $this->retry();
-        $this->assertText('Count: 3');
-    }
-    
-    function testReloadingSingleFrameWithCookieCounter() {
-        $this->get($this->samples() . 'counting_frameset.html');
-        $this->setFrameFocus('a');
-        $this->assertText('Count: 1');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 2');
-        
-        $this->setFrameFocus('a');
-        $this->retry();
-        $this->assertText('Count: 3');
-        $this->retry();
-        $this->assertText('Count: 4');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 2');
-    }
-    
-    function testReloadingFrameWhenUnfocusedReloadsWholeFrameset() {
-        $this->get($this->samples() . 'counting_frameset.html');
-        $this->setFrameFocus('a');
-        $this->assertText('Count: 1');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 2');
-        
-        $this->clearFrameFocus('a');
-        $this->retry();
-        
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->setFrameFocus('a');
-        $this->assertText('Count: 3');
-        $this->setFrameFocus('b');
-        $this->assertText('Count: 4');
-    }
-    
-    function testClickingNormalLinkReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('2');
-        $this->assertLink('3');
-        $this->assertText('Simple test front controller');
-    }
-    
-    function testJumpToNamedPageReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertPattern('/Simple test front controller/');
-        $this->clickLink('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=index]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testJumpToUnnamedPageReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('No page');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=no_page]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testJumpToUnnamedPageWithBareParameterReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Bare action');
-        $this->assertResponse(200);
-        $this->assertText('Simple test front controller');
-        $this->assertText('[action=]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testJumpToUnnamedPageWithEmptyQueryReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Empty query');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-        $this->assertPattern('/Count: 1/');
-    }
-    
-    function testJumpToUnnamedPageWithEmptyLinkReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Empty link');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertPattern('/raw get data.*?\[\].*?get data/si');
-        $this->assertPattern('/Count: 1/');
-    }
-    
-    function testJumpBackADirectoryLevelReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Down one');
-        $this->assertPattern('/index of .*\/test/i');
-        $this->assertPattern('/Count: 1/');
-    }
-    
-    function testSubmitToNamedPageReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertPattern('/Simple test front controller/');
-        $this->clickSubmit('Index');
-        $this->assertResponse(200);
-        $this->assertText('[action=Index]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testSubmitToSameDirectoryReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('Same directory');
-        $this->assertResponse(200);
-        $this->assertText('[action=Same+directory]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testSubmitToEmptyActionReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('Empty action');
-        $this->assertResponse(200);
-        $this->assertText('[action=Empty+action]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testSubmitToNoActionReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('No action');
-        $this->assertResponse(200);
-        $this->assertText('[action=No+action]');
-        $this->assertText('Count: 1');
-    }
-    
-    function testSubmitBackADirectoryLevelReplacesJustThatFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickSubmit('Down one');
-        $this->assertPattern('/index of .*\/test/i');
-        $this->assertPattern('/Count: 1/');
-    }
-    
-    function testTopLinkExitsFrameset() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->clickLink('Exit the frameset');
-        $this->assertTitle('Simple test target file');
-    }
-    
-    function testLinkInOnePageCanLoadAnother() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->assertNoLink('3');
-        $this->clickLink('Set one to 2');
-        $this->assertLink('3');
-        $this->assertNoLink('2');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-    }
-    
-    function testFrameWithRelativeLinksRespectsBaseTagForThatPage() {
-        $this->get($this->samples() . 'base_tag/frameset.html');
-        $this->click('Back to test pages');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->assertText('A target for the SimpleTest test suite');
-    }
-    
-    function testRelativeLinkInFrameIsNotAffectedByFramesetBaseTag() {
-        $this->get($this->samples() . 'base_tag/frameset_with_base_tag.html');
-        $this->assertText('This is page 1');
-        $this->click('To page 2');
-        $this->assertTitle('Frameset for testing of SimpleTest');
-        $this->assertText('This is page 2');
-    }
-}
-
-class TestOfFrameAuthentication extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testUnauthenticatedFrameSendsChallenge() {
-        $this->get($this->samples() . 'protected/');
-        $this->setFrameFocus('Protected');
-        $this->assertAuthentication('Basic');
-        $this->assertRealm('SimpleTest basic authentication');
-        $this->assertResponse(401);
-    }
-    
-    function testCanReadFrameFromAlreadyAuthenticatedRealm() {
-        $this->get($this->samples() . 'protected/');
-        $this->authenticate('test', 'secret');
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->setFrameFocus('Protected');
-        $this->assertResponse(200);
-        $this->assertText('A target for the SimpleTest test suite');
-    }
-    
-    function testCanAuthenticateFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->setFrameFocus('Protected');
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->assertText('A target for the SimpleTest test suite');
-        $this->clearFrameFocus();
-        $this->assertText('Count: 1');
-    }
-    
-    function testCanAuthenticateRedirectedFrame() {
-        $this->get($this->samples() . 'messy_frameset.html');
-        $this->setFrameFocus('Protected redirect');
-        $this->assertResponse(401);
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->assertText('A target for the SimpleTest test suite');
-        $this->clearFrameFocus();
-        $this->assertText('Count: 1');
-    }
-}
-
-class TestOfNestedFrames extends SimpleTestAcceptanceTest {
-    function setUp() {
-        $this->addHeader('User-Agent: SimpleTest ' . SimpleTest::getVersion());
-    }
-    
-    function testCanNavigateToSpecificContent() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->assertTitle('Nested frameset for testing of SimpleTest');
-        
-        $this->assertPattern('/This is frame A/');
-        $this->assertPattern('/This is frame B/');
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertLink('2');
-        $this->assertLink('Set one to 2');
-        $this->assertPattern('/Count: 1/');
-        $this->assertPattern('/r=rrr/');
-        
-        $this->setFrameFocus('pair');
-        $this->assertPattern('/This is frame A/');
-        $this->assertPattern('/This is frame B/');
-        $this->assertNoPattern('/Simple test front controller/');
-        $this->assertNoLink('2');
-        
-        $this->setFrameFocus('aaa');
-        $this->assertPattern('/This is frame A/');
-        $this->assertNoPattern('/This is frame B/');
-        
-        $this->clearFrameFocus();
-        $this->assertResponse(200);
-        $this->setFrameFocus('messy');
-        $this->assertResponse(200);
-        $this->setFrameFocus('Front controller');
-        $this->assertResponse(200);
-        $this->assertPattern('/Simple test front controller/');
-        $this->assertNoLink('2');
-    }
-    
-    function testReloadingFramesetPage() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->assertPattern('/Count: 1/');
-        $this->retry();
-        $this->assertPattern('/Count: 2/');
-        $this->retry();
-        $this->assertPattern('/Count: 3/');
-    }
-    
-    function testRetryingNestedPageOnlyRetriesThatSet() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->assertPattern('/Count: 1/');
-        $this->setFrameFocus('messy');
-        $this->retry();
-        $this->assertPattern('/Count: 2/');
-        $this->setFrameFocus('Counter');
-        $this->retry();
-        $this->assertPattern('/Count: 3/');
-        
-        $this->clearFrameFocus();
-        $this->setFrameFocus('messy');
-        $this->setFrameFocus('Front controller');
-        $this->retry();
-        
-        $this->clearFrameFocus();
-        $this->assertPattern('/Count: 3/');
-    }
-    
-    function testAuthenticatingNestedPage() {
-        $this->get($this->samples() . 'nested_frameset.html');
-        $this->setFrameFocus('messy');
-        $this->setFrameFocus('Protected');
-        $this->assertAuthentication('Basic');
-        $this->assertRealm('SimpleTest basic authentication');
-        $this->assertResponse(401);
-        
-        $this->authenticate('test', 'secret');
-        $this->assertResponse(200);
-        $this->assertPattern('/A target for the SimpleTest test suite/');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/adapter_test.php b/tests/simpletest/test/adapter_test.php
deleted file mode 100644
index f4564ea87..000000000
--- a/tests/simpletest/test/adapter_test.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-// $Id: adapter_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
-require_once(dirname(__FILE__) . '/../extensions/phpunit_test_case.php');
-
-class SameTestClass {
-}
-
-class TestOfPearAdapter extends PHPUnit_TestCase {
-    
-    function testBoolean() {
-        $this->assertTrue(true, "PEAR true");
-        $this->assertFalse(false, "PEAR false");
-    }
-    
-    function testName() {
-        $this->assertTrue($this->getName() == get_class($this));
-    }
-    
-    function testPass() {
-        $this->pass("PEAR pass");
-    }
-    
-    function testNulls() {
-        $value = null;
-        $this->assertNull($value, "PEAR null");
-        $value = 0;
-        $this->assertNotNull($value, "PEAR not null");
-    }
-    
-    function testType() {
-        $this->assertType("Hello", "string", "PEAR type");
-    }
-    
-    function testEquals() {
-        $this->assertEquals(12, 12, "PEAR identity");
-        $this->setLooselyTyped(true);
-        $this->assertEquals("12", 12, "PEAR equality");
-    }
-    
-    function testSame() {
-        $same = &new SameTestClass();
-        $this->assertSame($same, $same, "PEAR same");
-    }
-    
-    function testRegExp() {
-        $this->assertRegExp('/hello/', "A big hello from me", "PEAR regex");
-    }
-}
-
-class TestOfPhpUnitAdapter extends TestCase {
-    function TestOfPhpUnitAdapter() {
-        $this->TestCase('TestOfPhpUnitAdapter');
-    }
-    
-    function testBoolean() {
-        $this->assert(true, 'PHP Unit true');
-    }
-    
-    function testName() {
-        $this->assert($this->name() == 'TestOfPhpUnitAdapter');
-    }
-    
-    function testEquals() {
-        $this->assertEquals(12, 12, 'PHP Unit equality');
-    }
-    
-    function testMultilineEquals() {
-        $this->assertEquals("a\nb\n", "a\nb\n", 'PHP Unit equality');
-    }
-    
-    function testRegExp() {
-        $this->assertRegexp('/hello/', 'A big hello from me', 'PHPUnit regex');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/all_tests.php b/tests/simpletest/test/all_tests.php
deleted file mode 100644
index 99ce9451e..000000000
--- a/tests/simpletest/test/all_tests.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class AllTests extends TestSuite {
-    function AllTests() {
-        $this->TestSuite('All tests for SimpleTest ' . SimpleTest::getVersion());
-        $this->addFile(dirname(__FILE__) . '/unit_tests.php');
-        $this->addFile(dirname(__FILE__) . '/shell_test.php');
-        $this->addFile(dirname(__FILE__) . '/live_test.php');
-        $this->addFile(dirname(__FILE__) . '/acceptance_test.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/authentication_test.php b/tests/simpletest/test/authentication_test.php
deleted file mode 100644
index 8573eddc8..000000000
--- a/tests/simpletest/test/authentication_test.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-// $Id: authentication_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../authentication.php');
-require_once(dirname(__FILE__) . '/../http.php');
-Mock::generate('SimpleHttpRequest');
-
-class TestOfRealm extends UnitTestCase {
-    
-    function testWithinSameUrl() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/hello.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/hello.html')));
-    }
-    
-    function testInsideWithLongerUrl() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/hello.html')));
-    }
-    
-    function testBelowRootIsOutside() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/more/hello.html')));
-    }
-    
-    function testOldNetscapeDefinitionIsOutside() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/pathmore/hello.html')));
-    }
-    
-    function testInsideWithMissingTrailingSlash() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path')));
-    }
-    
-    function testDifferentPageNameStillInside() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/hello.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/goodbye.html')));
-    }
-    
-    function testNewUrlInSameDirectoryDoesNotChangeRealm() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/hello.html'));
-        $realm->stretch(new SimpleUrl('http://www.here.com/path/goodbye.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/index.html')));
-    }
-    
-    function testNewUrlMakesRealmTheCommonPath() {
-        $realm = &new SimpleRealm(
-                'Basic',
-                new SimpleUrl('http://www.here.com/path/here/hello.html'));
-        $realm->stretch(new SimpleUrl('http://www.here.com/path/there/goodbye.html'));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/here/index.html')));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/there/index.html')));
-        $this->assertTrue($realm->isWithin(
-                new SimpleUrl('http://www.here.com/path/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/paths/index.html')));
-        $this->assertFalse($realm->isWithin(
-                new SimpleUrl('http://www.here.com/pathindex.html')));
-    }
-}
-
-class TestOfAuthenticator extends UnitTestCase {
-    
-    function testNoRealms() {
-        $request = &new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &new SimpleAuthenticator();
-        $authenticator->addHeaders($request, new SimpleUrl('http://here.com/'));
-    }
-    
-    function &createSingleRealm() {
-        $authenticator = &new SimpleAuthenticator();
-        $authenticator->addRealm(
-                new SimpleUrl('http://www.here.com/path/hello.html'),
-                'Basic',
-                'Sanctuary');
-        $authenticator->setIdentityForRealm('www.here.com', 'Sanctuary', 'test', 'secret');
-        return $authenticator;
-    }
-    
-    function testOutsideRealm() {
-        $request = &new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://www.here.com/hello.html'));
-    }
-    
-    function testWithinRealm() {
-        $request = &new MockSimpleHttpRequest();
-        $request->expectOnce('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://www.here.com/path/more/hello.html'));
-    }
-    
-    function testRestartingClearsRealm() {
-        $request = &new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->restartSession();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://www.here.com/hello.html'));
-    }
-    
-    function testDifferentHostIsOutsideRealm() {
-        $request = &new MockSimpleHttpRequest();
-        $request->expectNever('addHeaderLine');
-        $authenticator = &$this->createSingleRealm();
-        $authenticator->addHeaders(
-                $request,
-                new SimpleUrl('http://here.com/path/hello.html'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/autorun_test.php b/tests/simpletest/test/autorun_test.php
deleted file mode 100644
index 76c919d6c..000000000
--- a/tests/simpletest/test/autorun_test.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/support/test1.php');
-
-class LoadIfIncludedTestCase extends UnitTestCase {
-    function test_load_if_included() {
-	    $tests = new GroupTest();
-        $tests->addFile(dirname(__FILE__) . '/support/test1.php');
-        $this->assertEqual($tests->getSize(), 1);
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/bad_test_suite.php b/tests/simpletest/test/bad_test_suite.php
deleted file mode 100644
index b426013be..000000000
--- a/tests/simpletest/test/bad_test_suite.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class BadTestCases extends TestSuite {
-    function BadTestCases() {
-        $this->TestSuite('Two bad test cases');
-        $this->addFile(dirname(__FILE__) . '/support/empty_test_file.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/browser_test.php b/tests/simpletest/test/browser_test.php
deleted file mode 100644
index 18faee8f2..000000000
--- a/tests/simpletest/test/browser_test.php
+++ /dev/null
@@ -1,779 +0,0 @@
-<?php
-// $Id: browser_test.php 1624 2008-01-01 15:00:43Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../browser.php');
-require_once(dirname(__FILE__) . '/../user_agent.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-
-Mock::generate('SimpleHttpResponse');
-Mock::generate('SimplePage');
-Mock::generate('SimpleForm');
-Mock::generate('SimpleUserAgent');
-Mock::generatePartial(
-        'SimpleBrowser',
-        'MockParseSimpleBrowser',
-        array('_createUserAgent', '_parse'));
-Mock::generatePartial(
-        'SimpleBrowser',
-        'MockUserAgentSimpleBrowser',
-        array('_createUserAgent'));
-
-class TestOfHistory extends UnitTestCase {
-
-    function testEmptyHistoryHasFalseContents() {
-        $history = &new SimpleBrowserHistory();
-        $this->assertIdentical($history->getUrl(), false);
-        $this->assertIdentical($history->getParameters(), false);
-    }
-
-    function testCannotMoveInEmptyHistory() {
-        $history = &new SimpleBrowserHistory();
-        $this->assertFalse($history->back());
-        $this->assertFalse($history->forward());
-    }
-
-    function testCurrentTargetAccessors() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.here.com/'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.here.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testSecondEntryAccessors() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
-        $this->assertIdentical(
-                $history->getParameters(),
-                new SimplePostEncoding(array('a' => 1)));
-    }
-
-    function testGoingBackwards() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $this->assertTrue($history->back());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testGoingBackwardsOffBeginning() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $this->assertFalse($history->back());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testGoingForwardsOffEnd() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $this->assertFalse($history->forward());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testGoingBackwardsAndForwards() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $this->assertTrue($history->back());
-        $this->assertTrue($history->forward());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.second.com/'));
-        $this->assertIdentical(
-                $history->getParameters(),
-                new SimplePostEncoding(array('a' => 1)));
-    }
-
-    function testNewEntryReplacesNextOne() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimplePostEncoding(array('a' => 1)));
-        $history->back();
-        $history->recordEntry(
-                new SimpleUrl('http://www.third.com/'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.third.com/'));
-        $this->assertIdentical($history->getParameters(), new SimpleGetEncoding());
-    }
-
-    function testNewEntryDropsFutureEntries() {
-        $history = &new SimpleBrowserHistory();
-        $history->recordEntry(
-                new SimpleUrl('http://www.first.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.second.com/'),
-                new SimpleGetEncoding());
-        $history->recordEntry(
-                new SimpleUrl('http://www.third.com/'),
-                new SimpleGetEncoding());
-        $history->back();
-        $history->back();
-        $history->recordEntry(
-                new SimpleUrl('http://www.fourth.com/'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.fourth.com/'));
-        $this->assertFalse($history->forward());
-        $history->back();
-        $this->assertIdentical($history->getUrl(), new SimpleUrl('http://www.first.com/'));
-        $this->assertFalse($history->back());
-    }
-}
-
-class TestOfParsedPageAccess extends UnitTestCase {
-
-    function &loadPage(&$page) {
-        $response = &new MockSimpleHttpResponse($this);
-
-        $agent = &new MockSimpleUserAgent($this);
-        $agent->setReturnReference('fetchResponse', $response);
-
-        $browser = &new MockParseSimpleBrowser($this);
-        $browser->setReturnReference('_createUserAgent', $agent);
-        $browser->setReturnReference('_parse', $page);
-        $browser->SimpleBrowser();
-
-        $browser->get('http://this.com/page.html');
-        return $browser;
-    }
-
-    function testAccessorsWhenNoPage() {
-        $agent = &new MockSimpleUserAgent($this);
-
-        $browser = &new MockParseSimpleBrowser($this);
-        $browser->setReturnReference('_createUserAgent', $agent);
-        $browser->SimpleBrowser();
-
-        $this->assertEqual($browser->getContent(), '');
-    }
-
-    function testParse() {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getRequest', "GET here.html\r\n\r\n");
-        $page->setReturnValue('getRaw', 'Raw HTML');
-        $page->setReturnValue('getTitle', 'Here');
-        $page->setReturnValue('getFrameFocus', 'Frame');
-        $page->setReturnValue('getMimeType', 'text/html');
-        $page->setReturnValue('getResponseCode', 200);
-        $page->setReturnValue('getAuthentication', 'Basic');
-        $page->setReturnValue('getRealm', 'Somewhere');
-        $page->setReturnValue('getTransportError', 'Ouch!');
-
-        $browser = &$this->loadPage($page);
-
-        $this->assertEqual($browser->getRequest(), "GET here.html\r\n\r\n");
-        $this->assertEqual($browser->getContent(), 'Raw HTML');
-        $this->assertEqual($browser->getTitle(), 'Here');
-        $this->assertEqual($browser->getFrameFocus(), 'Frame');
-        $this->assertIdentical($browser->getResponseCode(), 200);
-        $this->assertEqual($browser->getMimeType(), 'text/html');
-        $this->assertEqual($browser->getAuthentication(), 'Basic');
-        $this->assertEqual($browser->getRealm(), 'Somewhere');
-        $this->assertEqual($browser->getTransportError(), 'Ouch!');
-    }
-
-    function testLinkAffirmationWhenPresent() {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array('http://www.nowhere.com'));
-        $page->expectOnce('getUrlsByLabel', array('a link label'));
-        $browser = &$this->loadPage($page);
-        $this->assertIdentical($browser->getLink('a link label'), 'http://www.nowhere.com');
-    }
-
-    function testLinkAffirmationByIdWhenPresent() {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlById', 'a_page.com', array(99));
-        $page->setReturnValue('getUrlById', false, array('*'));
-        $browser = &$this->loadPage($page);
-        $this->assertIdentical($browser->getLinkById(99), 'a_page.com');
-        $this->assertFalse($browser->getLinkById(98));
-    }
-
-    function testSettingFieldIsPassedToPage() {
-        $page = &new MockSimplePage();
-        $page->expectOnce('setField', array(new SimpleByLabelOrName('key'), 'Value', false));
-        $page->setReturnValue('getField', 'Value');
-        $browser = &$this->loadPage($page);
-        $this->assertEqual($browser->getField('key'), 'Value');
-        $browser->setField('key', 'Value');
-    }
-}
-
-class TestOfBrowserNavigation extends UnitTestCase {
-
-    function &createBrowser(&$agent, &$page) {
-        $browser = &new MockParseSimpleBrowser();
-        $browser->setReturnReference('_createUserAgent', $agent);
-        $browser->setReturnReference('_parse', $page);
-        $browser->SimpleBrowser();
-        return $browser;
-    }
-
-    function testClickLinkRequestsPage() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(
-                0,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
-        $agent->expectArgumentsAt(
-                1,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/new.html'), new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array(new SimpleUrl('http://this.com/new.html')));
-        $page->expectOnce('getUrlsByLabel', array('New'));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLink('New'));
-    }
-
-    function testClickLinkWithUnknownFrameStillRequestsWholePage() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(
-                0,
-                'fetchResponse',
-                array(new SimpleUrl('http://this.com/page.html'), new SimpleGetEncoding()));
-        $target = new SimpleUrl('http://this.com/new.html');
-        $target->setTarget('missing');
-        $agent->expectArgumentsAt(
-                1,
-                'fetchResponse',
-                array($target, new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $parsed_url = new SimpleUrl('http://this.com/new.html');
-        $parsed_url->setTarget('missing');
-
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array($parsed_url));
-        $page->setReturnValue('hasFrames', false);
-        $page->expectOnce('getUrlsByLabel', array('New'));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLink('New'));
-    }
-
-    function testClickingMissingLinkFails() {
-        $agent = &new MockSimpleUserAgent($this);
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlsByLabel', array());
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $this->assertTrue($browser->get('http://this.com/page.html'));
-        $this->assertFalse($browser->clickLink('New'));
-    }
-
-    function testClickIndexedLink() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(
-                1,
-                'fetchResponse',
-                array(new SimpleUrl('1.html'), new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $page = &new MockSimplePage();
-        $page->setReturnValue(
-                'getUrlsByLabel',
-                array(new SimpleUrl('0.html'), new SimpleUrl('1.html')));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLink('New', 1));
-    }
-
-    function testClinkLinkById() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(1, 'fetchResponse', array(
-                new SimpleUrl('http://this.com/link.html'),
-                new SimpleGetEncoding()));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlById', new SimpleUrl('http://this.com/link.html'));
-        $page->expectOnce('getUrlById', array(2));
-        $page->setReturnValue('getRaw', 'A page');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickLinkById(2));
-    }
-
-    function testClickingMissingLinkIdFails() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrlById', false);
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertFalse($browser->clickLink(0));
-    }
-
-    function testSubmitFormByLabel() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(1, 'fetchResponse', array(
-                new SimpleUrl('http://this.com/handler.html'),
-                new SimplePostEncoding(array('a' => 'A'))));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitButton', array(new SimpleByLabel('Go'), false));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Go')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmit('Go'));
-    }
-
-    function testDefaultSubmitFormByLabel() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(1,  'fetchResponse', array(
-                new SimpleUrl('http://this.com/page.html'),
-                new SimpleGetEncoding(array('a' => 'A'))));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/page.html'));
-        $form->setReturnValue('getMethod', 'get');
-        $form->setReturnValue('submitButton', new SimpleGetEncoding(array('a' => 'A')));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleByLabel('Submit')));
-        $page->setReturnValue('getRaw', 'stuff');
-        $page->setReturnValue('getUrl', new SimpleUrl('http://this.com/page.html'));
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmit());
-    }
-
-    function testSubmitFormByName() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleByName('me')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmitByName('me'));
-    }
-
-    function testSubmitFormById() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitButton', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitButton', array(new SimpleById(99), false));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormBySubmit', $form);
-        $page->expectOnce('getFormBySubmit', array(new SimpleById(99)));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickSubmitById(99));
-    }
-
-    function testSubmitFormByImageLabel() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitImage', array(new SimpleByLabel('Go!'), 10, 11, false));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormByImage', $form);
-        $page->expectOnce('getFormByImage', array(new SimpleByLabel('Go!')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickImage('Go!', 10, 11));
-    }
-
-    function testSubmitFormByImageName() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitImage', array(new SimpleByName('a'), 10, 11, false));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormByImage', $form);
-        $page->expectOnce('getFormByImage', array(new SimpleByName('a')));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickImageByName('a', 10, 11));
-    }
-
-    function testSubmitFormByImageId() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submitImage', new SimplePostEncoding(array('a' => 'A')));
-        $form->expectOnce('submitImage', array(new SimpleById(99), 10, 11, false));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormByImage', $form);
-        $page->expectOnce('getFormByImage', array(new SimpleById(99)));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->clickImageById(99, 10, 11));
-    }
-
-    function testSubmitFormByFormId() {
-        $agent = &new MockSimpleUserAgent();
-        $agent->setReturnReference('fetchResponse', new MockSimpleHttpResponse());
-        $agent->expectArgumentsAt(1, 'fetchResponse', array(
-                new SimpleUrl('http://this.com/handler.html'),
-                new SimplePostEncoding(array('a' => 'A'))));
-        $agent->expectCallCount('fetchResponse', 2);
-
-        $form = &new MockSimpleForm();
-        $form->setReturnValue('getAction', new SimpleUrl('http://this.com/handler.html'));
-        $form->setReturnValue('getMethod', 'post');
-        $form->setReturnValue('submit', new SimplePostEncoding(array('a' => 'A')));
-
-        $page = &new MockSimplePage();
-        $page->setReturnReference('getFormById', $form);
-        $page->expectOnce('getFormById', array(33));
-        $page->setReturnValue('getRaw', 'stuff');
-
-        $browser = &$this->createBrowser($agent, $page);
-        $browser->get('http://this.com/page.html');
-        $this->assertTrue($browser->submitFormById(33));
-    }
-}
-
-class TestOfBrowserFrames extends UnitTestCase {
-
-    function &createBrowser(&$agent) {
-        $browser = &new MockUserAgentSimpleBrowser();
-        $browser->setReturnReference('_createUserAgent', $agent);
-        $browser->SimpleBrowser();
-        return $browser;
-    }
-
-    function &createUserAgent($pages) {
-        $agent = &new MockSimpleUserAgent();
-        foreach ($pages as $url => $raw) {
-            $url = new SimpleUrl($url);
-            $response = &new MockSimpleHttpResponse();
-            $response->setReturnValue('getUrl', $url);
-            $response->setReturnValue('getContent', $raw);
-            $agent->setReturnReference('fetchResponse', $response, array($url, '*'));
-        }
-        return $agent;
-    }
-
-    function testSimplePageHasNoFrames() {
-        $browser = &$this->createBrowser($this->createUserAgent(
-                array('http://site.with.no.frames/' => 'A non-framed page')));
-        $this->assertEqual(
-                $browser->get('http://site.with.no.frames/'),
-                'A non-framed page');
-        $this->assertIdentical($browser->getFrames(), 'http://site.with.no.frames/');
-    }
-
-    function testFramesetWithNoFrames() {
-        $browser = &$this->createBrowser($this->createUserAgent(
-                array('http://site.with.no.frames/' => '<frameset></frameset>')));
-        $this->assertEqual($browser->get('http://site.with.no.frames/'), '');
-        $this->assertIdentical($browser->getFrames(), array());
-    }
-
-    function testFramesetWithSingleFrame() {
-        $frameset = '<frameset><frame name="a" src="frame.html"></frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.one.frame/' => $frameset,
-                'http://site.with.one.frame/frame.html' => 'A frame')));
-        $this->assertEqual($browser->get('http://site.with.one.frame/'), 'A frame');
-        $this->assertIdentical(
-                $browser->getFrames(),
-                array('a' => 'http://site.with.one.frame/frame.html'));
-    }
-
-    function testTitleTakenFromFramesetPage() {
-        $frameset = '<title>Frameset title</title>' .
-                '<frameset><frame name="a" src="frame.html"></frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.one.frame/' => $frameset,
-                'http://site.with.one.frame/frame.html' => '<title>Page title</title>')));
-        $browser->get('http://site.with.one.frame/');
-        $this->assertEqual($browser->getTitle(), 'Frameset title');
-    }
-
-    function testFramesetWithSingleUnnamedFrame() {
-        $frameset = '<frameset><frame src="frame.html"></frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.one.frame/' => $frameset,
-                'http://site.with.one.frame/frame.html' => 'One frame')));
-        $this->assertEqual(
-                $browser->get('http://site.with.one.frame/'),
-                'One frame');
-        $this->assertIdentical(
-                $browser->getFrames(),
-                array(1 => 'http://site.with.one.frame/frame.html'));
-    }
-
-    function testFramesetWithMultipleFrames() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame name="b" src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame')));
-        $this->assertEqual(
-                $browser->get('http://site.with.frames/'),
-                'A frameB frameC frame');
-        $this->assertIdentical($browser->getFrames(), array(
-                'a' => 'http://site.with.frames/frame_a.html',
-                'b' => 'http://site.with.frames/frame_b.html',
-                'c' => 'http://site.with.frames/frame_c.html'));
-    }
-
-    function testFrameFocusByName() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame name="b" src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame')));
-        $browser->get('http://site.with.frames/');
-        $browser->setFrameFocus('a');
-        $this->assertEqual($browser->getContent(), 'A frame');
-        $browser->setFrameFocus('b');
-        $this->assertEqual($browser->getContent(), 'B frame');
-        $browser->setFrameFocus('c');
-        $this->assertEqual($browser->getContent(), 'C frame');
-    }
-
-    function testFramesetWithSomeNamedFrames() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '<frame src="frame_d.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame',
-                'http://site.with.frames/frame_d.html' => 'D frame')));
-        $this->assertEqual(
-                $browser->get('http://site.with.frames/'),
-                'A frameB frameC frameD frame');
-        $this->assertIdentical($browser->getFrames(), array(
-                'a' => 'http://site.with.frames/frame_a.html',
-                2 => 'http://site.with.frames/frame_b.html',
-                'c' => 'http://site.with.frames/frame_c.html',
-                4 => 'http://site.with.frames/frame_d.html'));
-    }
-
-    function testFrameFocusWithMixedNamesAndIndexes() {
-        $frameset = '<frameset>' .
-                '<frame name="a" src="frame_a.html">' .
-                '<frame src="frame_b.html">' .
-                '<frame name="c" src="frame_c.html">' .
-                '<frame src="frame_d.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.frames/' => $frameset,
-                'http://site.with.frames/frame_a.html' => 'A frame',
-                'http://site.with.frames/frame_b.html' => 'B frame',
-                'http://site.with.frames/frame_c.html' => 'C frame',
-                'http://site.with.frames/frame_d.html' => 'D frame')));
-        $browser->get('http://site.with.frames/');
-        $browser->setFrameFocus('a');
-        $this->assertEqual($browser->getContent(), 'A frame');
-        $browser->setFrameFocus(2);
-        $this->assertEqual($browser->getContent(), 'B frame');
-        $browser->setFrameFocus('c');
-        $this->assertEqual($browser->getContent(), 'C frame');
-        $browser->setFrameFocus(4);
-        $this->assertEqual($browser->getContent(), 'D frame');
-        $browser->clearFrameFocus();
-        $this->assertEqual($browser->getContent(), 'A frameB frameC frameD frame');
-    }
-
-    function testNestedFrameset() {
-        $inner = '<frameset>' .
-                '<frame name="page" src="page.html">' .
-                '</frameset>';
-        $outer = '<frameset>' .
-                '<frame name="inner" src="inner.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.nested.frame/' => $outer,
-                'http://site.with.nested.frame/inner.html' => $inner,
-                'http://site.with.nested.frame/page.html' => 'The page')));
-        $this->assertEqual(
-                $browser->get('http://site.with.nested.frame/'),
-                'The page');
-        $this->assertIdentical($browser->getFrames(), array(
-                'inner' => array(
-                        'page' => 'http://site.with.nested.frame/page.html')));
-    }
-
-    function testCanNavigateToNestedFrame() {
-        $inner = '<frameset>' .
-                '<frame name="one" src="one.html">' .
-                '<frame name="two" src="two.html">' .
-                '</frameset>';
-        $outer = '<frameset>' .
-                '<frame name="inner" src="inner.html">' .
-                '<frame name="three" src="three.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.nested.frames/' => $outer,
-                'http://site.with.nested.frames/inner.html' => $inner,
-                'http://site.with.nested.frames/one.html' => 'Page one',
-                'http://site.with.nested.frames/two.html' => 'Page two',
-                'http://site.with.nested.frames/three.html' => 'Page three')));
-
-        $browser->get('http://site.with.nested.frames/');
-        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
-
-        $this->assertTrue($browser->setFrameFocus('inner'));
-        $this->assertEqual($browser->getFrameFocus(), array('inner'));
-        $this->assertTrue($browser->setFrameFocus('one'));
-        $this->assertEqual($browser->getFrameFocus(), array('inner', 'one'));
-        $this->assertEqual($browser->getContent(), 'Page one');
-
-        $this->assertTrue($browser->setFrameFocus('two'));
-        $this->assertEqual($browser->getFrameFocus(), array('inner', 'two'));
-        $this->assertEqual($browser->getContent(), 'Page two');
-
-        $browser->clearFrameFocus();
-        $this->assertTrue($browser->setFrameFocus('three'));
-        $this->assertEqual($browser->getFrameFocus(), array('three'));
-        $this->assertEqual($browser->getContent(), 'Page three');
-
-        $this->assertTrue($browser->setFrameFocus('inner'));
-        $this->assertEqual($browser->getContent(), 'Page onePage two');
-    }
-
-    function testCanNavigateToNestedFrameByIndex() {
-        $inner = '<frameset>' .
-                '<frame src="one.html">' .
-                '<frame src="two.html">' .
-                '</frameset>';
-        $outer = '<frameset>' .
-                '<frame src="inner.html">' .
-                '<frame src="three.html">' .
-                '</frameset>';
-        $browser = &$this->createBrowser($this->createUserAgent(array(
-                'http://site.with.nested.frames/' => $outer,
-                'http://site.with.nested.frames/inner.html' => $inner,
-                'http://site.with.nested.frames/one.html' => 'Page one',
-                'http://site.with.nested.frames/two.html' => 'Page two',
-                'http://site.with.nested.frames/three.html' => 'Page three')));
-
-        $browser->get('http://site.with.nested.frames/');
-        $this->assertEqual($browser->getContent(), 'Page onePage twoPage three');
-
-        $this->assertTrue($browser->setFrameFocusByIndex(1));
-        $this->assertEqual($browser->getFrameFocus(), array(1));
-        $this->assertTrue($browser->setFrameFocusByIndex(1));
-        $this->assertEqual($browser->getFrameFocus(), array(1, 1));
-        $this->assertEqual($browser->getContent(), 'Page one');
-
-        $this->assertTrue($browser->setFrameFocusByIndex(2));
-        $this->assertEqual($browser->getFrameFocus(), array(1, 2));
-        $this->assertEqual($browser->getContent(), 'Page two');
-
-        $browser->clearFrameFocus();
-        $this->assertTrue($browser->setFrameFocusByIndex(2));
-        $this->assertEqual($browser->getFrameFocus(), array(2));
-        $this->assertEqual($browser->getContent(), 'Page three');
-
-        $this->assertTrue($browser->setFrameFocusByIndex(1));
-        $this->assertEqual($browser->getContent(), 'Page onePage two');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/collector_test.php b/tests/simpletest/test/collector_test.php
deleted file mode 100644
index 803974c73..000000000
--- a/tests/simpletest/test/collector_test.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-// $Id: collector_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../collector.php');
-SimpleTest::ignore('MockTestSuite');
-Mock::generate('TestSuite');
-
-class PathEqualExpectation extends EqualExpectation {
-	function PathEqualExpectation($value, $message = '%s') {
-    	$this->EqualExpectation(str_replace("\\", '/', $value), $message);
-	}
-
-    function test($compare) {
-        return parent::test(str_replace("\\", '/', $compare));
-    }
-}
-
-class TestOfCollector extends UnitTestCase {
-
-    function testCollectionIsAddedToGroup() {
-        $suite = &new MockTestSuite();
-        $suite->expectMinimumCallCount('addTestFile', 2);
-        $suite->expectArguments(
-                'addTestFile',
-                array(new PatternExpectation('/collectable\\.(1|2)$/')));
-        $collector = &new SimpleCollector();
-        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
-    }
-}
-
-class TestOfPatternCollector extends UnitTestCase {
-
-    function testAddingEverythingToGroup() {
-        $suite = &new MockTestSuite();
-        $suite->expectCallCount('addTestFile', 2);
-        $suite->expectArguments(
-                'addTestFile',
-                array(new PatternExpectation('/collectable\\.(1|2)$/')));
-        $collector = &new SimplePatternCollector('/.*/');
-        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
-    }
-
-    function testOnlyMatchedFilesAreAddedToGroup() {
-        $suite = &new MockTestSuite();
-        $suite->expectOnce('addTestFile', array(new PathEqualExpectation(
-        		dirname(__FILE__) . '/support/collector/collectable.1')));
-        $collector = &new SimplePatternCollector('/1$/');
-        $collector->collect($suite, dirname(__FILE__) . '/support/collector/');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/command_line_test.php b/tests/simpletest/test/command_line_test.php
deleted file mode 100644
index 5baabff33..000000000
--- a/tests/simpletest/test/command_line_test.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../default_reporter.php');
-
-class TestOfCommandLineParsing extends UnitTestCase {
-    
-    function testDefaultsToEmptyStringToMeanNullToTheSelectiveReporter() {
-        $parser = new SimpleCommandLineParser(array());
-        $this->assertIdentical($parser->getTest(), '');
-        $this->assertIdentical($parser->getTestCase(), '');
-    }
-    
-    function testNotXmlByDefault() {
-        $parser = new SimpleCommandLineParser(array());
-        $this->assertFalse($parser->isXml());
-    }
-    
-    function testCanDetectRequestForXml() {
-        $parser = new SimpleCommandLineParser(array('--xml'));
-        $this->assertTrue($parser->isXml());
-    }
-    
-    function testCanReadAssignmentSyntax() {
-        $parser = new SimpleCommandLineParser(array('--test=myTest'));
-        $this->assertEqual($parser->getTest(), 'myTest');
-    }
-    
-    function testCanReadFollowOnSyntax() {
-        $parser = new SimpleCommandLineParser(array('--test', 'myTest'));
-        $this->assertEqual($parser->getTest(), 'myTest');
-    }
-    
-    function testCanReadShortForms() {
-        $parser = new SimpleCommandLineParser(array('-t', 'myTest', '-c', 'MyClass', '-x'));
-        $this->assertEqual($parser->getTest(), 'myTest');
-        $this->assertEqual($parser->getTestCase(), 'MyClass');
-        $this->assertTrue($parser->isXml());
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/compatibility_test.php b/tests/simpletest/test/compatibility_test.php
deleted file mode 100644
index ea48f8396..000000000
--- a/tests/simpletest/test/compatibility_test.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-// $Id: compatibility_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../compatibility.php');
-
-class ComparisonClass {
-}
-
-class ComparisonSubclass extends ComparisonClass {
-}
-
-if (version_compare(phpversion(), '5') >= 0) {
-    eval('interface ComparisonInterface { }');
-    eval('class ComparisonClassWithInterface implements ComparisonInterface { }');
-}
-
-class TestOfCompatibility extends UnitTestCase {
-    
-    function testIsA() {
-        $this->assertTrue(SimpleTestCompatibility::isA(
-                new ComparisonClass(),
-                'ComparisonClass'));
-        $this->assertFalse(SimpleTestCompatibility::isA(
-                new ComparisonClass(),
-                'ComparisonSubclass'));
-        $this->assertTrue(SimpleTestCompatibility::isA(
-                new ComparisonSubclass(),
-                'ComparisonClass'));
-    }
-    
-    function testIdentityOfNumericStrings() {
-        $numericString1 = "123";
-        $numericString2 = "00123";
-        $this->assertNotIdentical($numericString1, $numericString2);
-    }
-    
-    function testIdentityOfObjects() {
-        $object1 = new ComparisonClass();
-        $object2 = new ComparisonClass();
-        $this->assertIdentical($object1, $object2);
-    }
-    
-    function testReferences () {
-        $thing = "Hello";
-        $thing_reference = &$thing;
-        $thing_copy = $thing;
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $thing,
-                $thing));
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $thing,
-                $thing_reference));
-        $this->assertFalse(SimpleTestCompatibility::isReference(
-                $thing,
-                $thing_copy));
-    }
-    
-    function testObjectReferences () {
-        $object = &new ComparisonClass();
-        $object_reference = &$object;
-        $object_copy = new ComparisonClass();
-        $object_assignment = $object;
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $object,
-                $object));
-        $this->assertTrue(SimpleTestCompatibility::isReference(
-                $object,
-                $object_reference));
-        $this->assertFalse(SimpleTestCompatibility::isReference(
-                $object,
-                $object_copy));
-        if (version_compare(phpversion(), '5', '>=')) {
-            $this->assertTrue(SimpleTestCompatibility::isReference(
-                    $object,
-                    $object_assignment));
-        } else {
-            $this->assertFalse(SimpleTestCompatibility::isReference(
-                    $object,
-                    $object_assignment));
-        }
-    }
-    
-    function testInteraceComparison() {
-        if (version_compare(phpversion(), '5', '<')) {
-            return;
-        }
-        
-        $object = new ComparisonClassWithInterface();
-        $this->assertFalse(SimpleTestCompatibility::isA(
-                new ComparisonClass(),
-                'ComparisonInterface'));
-        $this->assertTrue(SimpleTestCompatibility::isA(
-                new ComparisonClassWithInterface(),
-                'ComparisonInterface'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/cookies_test.php b/tests/simpletest/test/cookies_test.php
deleted file mode 100644
index 0b49e43bf..000000000
--- a/tests/simpletest/test/cookies_test.php
+++ /dev/null
@@ -1,227 +0,0 @@
-<?php
-// $Id: cookies_test.php 1506 2007-05-07 00:58:03Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../cookies.php');
-
-class TestOfCookie extends UnitTestCase {
-    
-    function testCookieDefaults() {
-        $cookie = new SimpleCookie("name");
-        $this->assertFalse($cookie->getValue());
-        $this->assertEqual($cookie->getPath(), "/");
-        $this->assertIdentical($cookie->getHost(), false);
-        $this->assertFalse($cookie->getExpiry());
-        $this->assertFalse($cookie->isSecure());
-    }
-    
-    function testCookieAccessors() {
-        $cookie = new SimpleCookie(
-                "name",
-                "value",
-                "/path",
-                "Mon, 18 Nov 2002 15:50:29 GMT",
-                true);
-        $this->assertEqual($cookie->getName(), "name");
-        $this->assertEqual($cookie->getValue(), "value");
-        $this->assertEqual($cookie->getPath(), "/path/");
-        $this->assertEqual($cookie->getExpiry(), "Mon, 18 Nov 2002 15:50:29 GMT");
-        $this->assertTrue($cookie->isSecure());
-    }
-    
-    function testFullHostname() {
-        $cookie = new SimpleCookie("name");
-        $this->assertTrue($cookie->setHost("host.name.here"));
-        $this->assertEqual($cookie->getHost(), "host.name.here");
-        $this->assertTrue($cookie->setHost("host.com"));
-        $this->assertEqual($cookie->getHost(), "host.com");
-    }
-    
-    function testHostTruncation() {
-        $cookie = new SimpleCookie("name");
-        $cookie->setHost("this.host.name.here");
-        $this->assertEqual($cookie->getHost(), "host.name.here");
-        $cookie->setHost("this.host.com");
-        $this->assertEqual($cookie->getHost(), "host.com");
-        $this->assertTrue($cookie->setHost("dashes.in-host.com"));
-        $this->assertEqual($cookie->getHost(), "in-host.com");
-    }
-    
-    function testBadHosts() {
-        $cookie = new SimpleCookie("name");
-        $this->assertFalse($cookie->setHost("gibberish"));
-        $this->assertFalse($cookie->setHost("host.here"));
-        $this->assertFalse($cookie->setHost("host..com"));
-        $this->assertFalse($cookie->setHost("..."));
-        $this->assertFalse($cookie->setHost("host.com."));
-    }
-    
-    function testHostValidity() {
-        $cookie = new SimpleCookie("name");
-        $cookie->setHost("this.host.name.here");
-        $this->assertTrue($cookie->isValidHost("host.name.here"));
-        $this->assertTrue($cookie->isValidHost("that.host.name.here"));
-        $this->assertFalse($cookie->isValidHost("bad.host"));
-        $this->assertFalse($cookie->isValidHost("nearly.name.here"));
-    }
-    
-    function testPathValidity() {
-        $cookie = new SimpleCookie("name", "value", "/path");
-        $this->assertFalse($cookie->isValidPath("/"));
-        $this->assertTrue($cookie->isValidPath("/path/"));
-        $this->assertTrue($cookie->isValidPath("/path/more"));
-    }
-    
-    function testSessionExpiring() {
-        $cookie = new SimpleCookie("name", "value", "/path");
-        $this->assertTrue($cookie->isExpired(0));
-    }
-    
-    function testTimestampExpiry() {
-        $cookie = new SimpleCookie("name", "value", "/path", 456);
-        $this->assertFalse($cookie->isExpired(0));
-        $this->assertTrue($cookie->isExpired(457));
-        $this->assertFalse($cookie->isExpired(455));
-    }
-    
-    function testDateExpiry() {
-        $cookie = new SimpleCookie(
-                "name",
-                "value",
-                "/path",
-                "Mon, 18 Nov 2002 15:50:29 GMT");
-        $this->assertTrue($cookie->isExpired("Mon, 18 Nov 2002 15:50:30 GMT"));
-        $this->assertFalse($cookie->isExpired("Mon, 18 Nov 2002 15:50:28 GMT"));
-    }
-    
-    function testAging() {
-        $cookie = new SimpleCookie("name", "value", "/path", 200);
-        $cookie->agePrematurely(199);
-        $this->assertFalse($cookie->isExpired(0));
-        $cookie->agePrematurely(2);
-        $this->assertTrue($cookie->isExpired(0));
-    }
-}
-
-class TestOfCookieJar extends UnitTestCase {
-    
-    function testAddCookie() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie("a", "A");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
-    }
-    
-    function testHostFilter() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', 'my-host.com');
-        $jar->setCookie('b', 'B', 'another-host.com');
-        $jar->setCookie('c', 'C');
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com')),
-                array('a=A', 'c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('another-host.com')),
-                array('b=B', 'c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('www.another-host.com')),
-                array('b=B', 'c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('new-host.org')),
-                array('c=C'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('/')),
-                array('a=A', 'b=B', 'c=C'));
-    }
-    
-    function testPathFilter() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/path/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/elsewhere')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/here')), array('a=A'));
-    }
-    
-    function testPathFilterDeeply() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/path/more_path/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/pa')), array());
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/more_path/and_more')), array('a=A'));
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/path/not_here/')), array());
-    }
-    
-    function testMultipleCookieWithDifferentPathsButSameName() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/');
-        $jar->setCookie('a', '123', false, '/path/here/');
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('/')),
-                array('a=abc'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/')),
-                array('a=abc'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/')),
-                array('a=abc'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here')),
-                array('a=abc', 'a=123'));
-        $this->assertEqual(
-                $jar->selectAsPairs(new SimpleUrl('my-host.com/path/here/there')),
-                array('a=abc', 'a=123'));
-    }
-    
-    function testOverwrite() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/');
-        $jar->setCookie('a', 'cde', false, '/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=cde'));
-    }
-    
-    function testClearSessionCookies() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/');
-        $jar->restartSession();
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-    
-    function testExpiryFilterByDate() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
-        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
-        $jar->restartSession("Wed, 25-Dec-02 04:24:21 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-    
-    function testExpiryFilterByAgeing() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A', false, '/', 'Wed, 25-Dec-02 04:24:20 GMT');
-        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=A'));
-        $jar->agePrematurely(2);
-        $jar->restartSession("Wed, 25-Dec-02 04:24:19 GMT");
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-    
-    function testCookieClearing() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/');
-        $jar->setCookie('a', '', false, '/');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a='));
-    }
-    
-    function testCookieClearByLoweringDate() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'abc', false, '/', 'Wed, 25-Dec-02 04:24:21 GMT');
-        $jar->setCookie('a', 'def', false, '/', 'Wed, 25-Dec-02 04:24:19 GMT');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array('a=def'));
-        $jar->restartSession('Wed, 25-Dec-02 04:24:20 GMT');
-        $this->assertEqual($jar->selectAsPairs(new SimpleUrl('/')), array());
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/detached_test.php b/tests/simpletest/test/detached_test.php
deleted file mode 100644
index 06db8280b..000000000
--- a/tests/simpletest/test/detached_test.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-// $Id: detached_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once('../detached.php');
-require_once('../reporter.php');
-
-// The following URL will depend on your own installation.
-$command = 'php ' . dirname(__FILE__) . '/visual_test.php xml';
-
-$test = &new TestSuite('Remote tests');
-$test->addTestCase(new DetachedTestCase($command));
-if (SimpleReporter::inCli()) {
-    exit ($test->run(new TextReporter()) ? 0 : 1);
-}
-$test->run(new HtmlReporter());
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/dumper_test.php b/tests/simpletest/test/dumper_test.php
deleted file mode 100644
index 789047de9..000000000
--- a/tests/simpletest/test/dumper_test.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-// $Id: dumper_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class DumperDummy {
-}
-
-class TestOfTextFormatting extends UnitTestCase {
-    
-    function testClipping() {
-        $dumper = new SimpleDumper();
-        $this->assertEqual(
-                $dumper->clipString("Hello", 6),
-                "Hello",
-                "Hello, 6->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello", 5),
-                "Hello",
-                "Hello, 5->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 3),
-                "Hel...",
-                "Hello world, 3->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 6, 3),
-                "Hello ...",
-                "Hello world, 6, 3->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 3, 6),
-                "...o w...",
-                "Hello world, 3, 6->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 4, 11),
-                "...orld",
-                "Hello world, 4, 11->%s");
-        $this->assertEqual(
-                $dumper->clipString("Hello world", 4, 12),
-                "...orld",
-                "Hello world, 4, 12->%s");
-    }
-    
-    function testDescribeNull() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/null/i', $dumper->describeValue(null));
-    }
-    
-    function testDescribeBoolean() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/boolean/i', $dumper->describeValue(true));
-        $this->assertPattern('/true/i', $dumper->describeValue(true));
-        $this->assertPattern('/false/i', $dumper->describeValue(false));
-    }
-    
-    function testDescribeString() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/string/i', $dumper->describeValue('Hello'));
-        $this->assertPattern('/Hello/', $dumper->describeValue('Hello'));
-    }
-    
-    function testDescribeInteger() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/integer/i', $dumper->describeValue(35));
-        $this->assertPattern('/35/', $dumper->describeValue(35));
-    }
-    
-    function testDescribeFloat() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/float/i', $dumper->describeValue(0.99));
-        $this->assertPattern('/0\.99/', $dumper->describeValue(0.99));
-    }
-    
-    function testDescribeArray() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern('/array/i', $dumper->describeValue(array(1, 4)));
-        $this->assertPattern('/2/i', $dumper->describeValue(array(1, 4)));
-    }
-    
-    function testDescribeObject() {
-        $dumper = new SimpleDumper();
-        $this->assertPattern(
-                '/object/i',
-                $dumper->describeValue(new DumperDummy()));
-        $this->assertPattern(
-                '/DumperDummy/i',
-                $dumper->describeValue(new DumperDummy()));
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/eclipse_test.php b/tests/simpletest/test/eclipse_test.php
deleted file mode 100644
index 0f1bf4bd4..000000000
--- a/tests/simpletest/test/eclipse_test.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-// $Id: eclipse_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-
-//To run this from the eclipse plugin...you need to make sure that the 
-//SimpleTest path in the preferences is the same as the location of the 
-//eclipse.php file below otherwise you end up with two "different" eclipse.php 
-//files included and that does not work...
-
-include_once(dirname(__FILE__) . '/../eclipse.php');
-Mock::generate('SimpleSocket');
-
-class TestOfEclipse extends UnitTestCase {
-	
-	function testPass() {
-		$listener = &new MockSimpleSocket();
-		
-		$fullpath = realpath(dirname(__FILE__).'/support/test1.php');
-		$testpath = EclipseReporter::escapeVal($fullpath);
-		$expected = "{status:\"pass\",message:\"pass1 at [$testpath line 4]\",group:\"$testpath\",case:\"test1\",method:\"test_pass\"}";
-		//this should work...but it doesn't so the next line and the last line are the hacks
-		//$listener->expectOnce('write',array($expected));
-		$listener->setReturnValue('write',-1);
-		
-		$pathparts = pathinfo($fullpath);
-		$filename = $pathparts['basename'];
-		$test= &new TestSuite($filename);
-		$test->addTestFile($fullpath);
-		$test->run(new EclipseReporter(&$listener));
-		$this->assertEqual($expected,$listener->output);
-	}
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/encoding_test.php b/tests/simpletest/test/encoding_test.php
deleted file mode 100644
index 95031fb0f..000000000
--- a/tests/simpletest/test/encoding_test.php
+++ /dev/null
@@ -1,213 +0,0 @@
-<?php
-// $Id: encoding_test.php 1571 2007-09-07 17:14:32Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../url.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-
-Mock::generate('SimpleSocket');
-
-class TestOfEncodedParts extends UnitTestCase {
-    
-    function testFormEncodedAsKeyEqualsValue() {
-        $pair = new SimpleEncodedPair('a', 'A');
-        $this->assertEqual($pair->asRequest(), 'a=A');
-    }
-    
-    function testMimeEncodedAsHeadersAndContent() {
-        $pair = new SimpleEncodedPair('a', 'A');
-        $this->assertEqual(
-                $pair->asMime(),
-                "Content-Disposition: form-data; name=\"a\"\r\n\r\nA");
-    }
-    
-    function testAttachmentEncodedAsHeadersWithDispositionAndContent() {
-        $part = new SimpleAttachment('a', 'A', 'aaa.txt');
-        $this->assertEqual(
-                $part->asMime(),
-                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
-                        "Content-Type: text/plain\r\n\r\nA");
-    }
-}
-
-class TestOfEncoding extends UnitTestCase {
-    var $_content_so_far;
-    
-    function write($content) {
-        $this->_content_so_far .= $content;
-    }
-    
-    function clear() {
-        $this->_content_so_far = '';
-    }
-    
-    function assertWritten($encoding, $content, $message = '%s') {
-        $this->clear();
-        $encoding->writeTo($this);
-        $this->assertIdentical($this->_content_so_far, $content, $message);
-    }
-    
-    function testGetEmpty() {
-        $encoding = &new SimpleGetEncoding();
-        $this->assertIdentical($encoding->getValue('a'), false);
-        $this->assertIdentical($encoding->asUrlRequest(), '');
-    }
-    
-    function testPostEmpty() {
-        $encoding = &new SimplePostEncoding();
-        $this->assertIdentical($encoding->getValue('a'), false);
-        $this->assertWritten($encoding, '');
-    }
-    
-    function testPrefilled() {
-        $encoding = &new SimplePostEncoding(array('a' => 'aaa'));
-        $this->assertIdentical($encoding->getValue('a'), 'aaa');
-        $this->assertWritten($encoding, 'a=aaa');
-    }
-    
-    function testPrefilledWithTwoLevels() {
-        $query = array('a' => array('aa' => 'aaa'));
-        $encoding = &new SimplePostEncoding($query);
-        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
-        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa]' => 'aaa'));
-        $this->assertIdentical($encoding->getValue('a[aa]'), 'aaa');
-        $this->assertWritten($encoding, 'a%5Baa%5D=aaa');
-    }
-    
-    function testPrefilledWithThreeLevels() {
-        $query = array('a' => array('aa' => array('aaa' => 'aaaa')));
-        $encoding = &new SimplePostEncoding($query);
-        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
-        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[aa][aaa]' => 'aaaa'));
-        $this->assertIdentical($encoding->getValue('a[aa][aaa]'), 'aaaa');
-        $this->assertWritten($encoding, 'a%5Baa%5D%5Baaa%5D=aaaa');
-    }
-    
-    function testPrefilledWithObject() {
-        $encoding = &new SimplePostEncoding(new SimpleEncoding(array('a' => 'aaa')));
-        $this->assertIdentical($encoding->getValue('a'), 'aaa');
-        $this->assertWritten($encoding, 'a=aaa');
-    }
-    
-    function testMultiplePrefilled() {
-        $query = array('a' => array('a1', 'a2'));
-        $encoding = &new SimplePostEncoding($query);
-        $this->assertTrue($encoding->hasMoreThanOneLevel($query));
-        $this->assertEqual($encoding->rewriteArrayWithMultipleLevels($query), array('a[0]' => 'a1', 'a[1]' => 'a2'));
-        $this->assertIdentical($encoding->getValue('a[0]'), 'a1');
-        $this->assertIdentical($encoding->getValue('a[1]'), 'a2');
-        $this->assertWritten($encoding, 'a%5B0%5D=a1&a%5B1%5D=a2');
-    }
-    
-    function testSingleParameter() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', 'Hello');
-        $this->assertEqual($encoding->getValue('a'), 'Hello');
-        $this->assertWritten($encoding, 'a=Hello');
-    }
-    
-    function testFalseParameter() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', false);
-        $this->assertEqual($encoding->getValue('a'), false);
-        $this->assertWritten($encoding, '');
-    }
-    
-    function testUrlEncoding() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', 'Hello there!');
-        $this->assertWritten($encoding, 'a=Hello+there%21');
-    }
-    
-    function testUrlEncodingOfKey() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a!', 'Hello');
-        $this->assertWritten($encoding, 'a%21=Hello');
-    }
-    
-    function testMultipleParameter() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', 'Hello');
-        $encoding->add('b', 'Goodbye');
-        $this->assertWritten($encoding, 'a=Hello&b=Goodbye');
-    }
-    
-    function testEmptyParameters() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', '');
-        $encoding->add('b', '');
-        $this->assertWritten($encoding, 'a=&b=');
-    }
-    
-    function testRepeatedParameter() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', 'Hello');
-        $encoding->add('a', 'Goodbye');
-        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
-        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
-    }
-    
-    function testAddingLists() {
-        $encoding = &new SimplePostEncoding();
-        $encoding->add('a', array('Hello', 'Goodbye'));
-        $this->assertIdentical($encoding->getValue('a'), array('Hello', 'Goodbye'));
-        $this->assertWritten($encoding, 'a=Hello&a=Goodbye');
-    }
-    
-    function testMergeInHash() {
-        $encoding = &new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
-        $encoding->merge(array('a' => 'A2'));
-        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
-        $this->assertIdentical($encoding->getValue('b'), 'B');
-    }
-    
-    function testMergeInObject() {
-        $encoding = &new SimpleGetEncoding(array('a' => 'A1', 'b' => 'B'));
-        $encoding->merge(new SimpleEncoding(array('a' => 'A2')));
-        $this->assertIdentical($encoding->getValue('a'), array('A1', 'A2'));
-        $this->assertIdentical($encoding->getValue('b'), 'B');
-    }
-    
-    function testPrefilledMultipart() {
-        $encoding = &new SimpleMultipartEncoding(array('a' => 'aaa'), 'boundary');
-        $this->assertIdentical($encoding->getValue('a'), 'aaa');
-        $this->assertwritten($encoding,
-                "--boundary\r\n" .
-                "Content-Disposition: form-data; name=\"a\"\r\n" .
-                "\r\n" .
-                "aaa\r\n" .
-                "--boundary--\r\n");
-    }
-    
-    function testAttachment() {
-        $encoding = &new SimpleMultipartEncoding(array(), 'boundary');
-        $encoding->attach('a', 'aaa', 'aaa.txt');
-        $this->assertIdentical($encoding->getValue('a'), 'aaa.txt');
-        $this->assertwritten($encoding,
-                "--boundary\r\n" .
-                "Content-Disposition: form-data; name=\"a\"; filename=\"aaa.txt\"\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "\r\n" .
-                "aaa\r\n" .
-                "--boundary--\r\n");
-    }
-}
-
-class TestOfFormHeaders extends UnitTestCase {
-    
-    function testEmptyEncodingWritesZeroContentLength() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("Content-Length: 0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
-        $encoding = &new SimplePostEncoding();
-        $encoding->writeHeadersTo($socket);
-    }
-    
-    function testEmptyMultipartEncodingWritesEndBoundaryContentLength() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("Content-Length: 14\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Content-Type: multipart/form-data, boundary=boundary\r\n"));
-        $encoding = &new SimpleMultipartEncoding(array(), 'boundary');
-        $encoding->writeHeadersTo($socket);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/errors_test.php b/tests/simpletest/test/errors_test.php
deleted file mode 100644
index 7db8769a2..000000000
--- a/tests/simpletest/test/errors_test.php
+++ /dev/null
@@ -1,300 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../errors.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../test_case.php');
-Mock::generate('SimpleTestCase');
-Mock::generate('SimpleExpectation');
-SimpleTest::ignore('MockSimpleTestCase');
-
-class TestOfErrorQueue extends UnitTestCase {
-
-    function setUp() {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->clear();
-    }
-
-    function tearDown() {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->clear();
-    }
-
-    function testOrder() {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->add(1024, 'Ouch', 'here.php', 100);
-        $queue->add(512, 'Yuk', 'there.php', 101);
-        $this->assertEqual(
-                $queue->extract(),
-                array(1024, 'Ouch', 'here.php', 100));
-        $this->assertEqual(
-                $queue->extract(),
-                array(512, 'Yuk', 'there.php', 101));
-        $this->assertFalse($queue->extract());
-    }
-
-    function testAssertNoErrorsGivesTrueWhenNoErrors() {
-        $test = &new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                new IdenticalExpectation(new TrueExpectation()),
-                true,
-                'Should be no errors'));
-        $test->setReturnValue('assert', true);
-        $queue = &new SimpleErrorQueue();
-        $queue->setTestCase($test);
-        $this->assertTrue($queue->assertNoErrors('%s'));
-    }
-
-    function testAssertNoErrorsIssuesFailWhenErrors() {
-        $test = &new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                new IdenticalExpectation(new TrueExpectation()),
-                false,
-                'Should be no errors'));
-        $test->setReturnValue('assert', false);
-        $queue = &new SimpleErrorQueue();
-        $queue->setTestCase($test);
-        $queue->add(1024, 'Ouch', 'here.php', 100);
-        $this->assertFalse($queue->assertNoErrors('%s'));
-    }
-
-    function testAssertErrorFailsWhenNoError() {
-        $test = &new MockSimpleTestCase();
-        $test->expectOnce('fail', array('Expected error not found'));
-        $test->setReturnValue('assert', false);
-        $queue = &new SimpleErrorQueue();
-        $queue->setTestCase($test);
-        $this->assertFalse($queue->assertError(false, '%s'));
-    }
-
-    function testAssertErrorFailsWhenErrorDoesntMatchTheExpectation() {
-        $test = &new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                new IdenticalExpectation(new FailedExpectation()),
-                'B',
-                'Expected PHP error [B] severity [E_USER_NOTICE] in [b.php] line [100]'));
-        $test->setReturnValue('assert', false);
-        $queue = &new SimpleErrorQueue();
-        $queue->setTestCase($test);
-        $queue->add(1024, 'B', 'b.php', 100);
-        $this->assertFalse($queue->assertError(new FailedExpectation(), '%s'));
-    }
-
-    function testExpectationMatchCancelsIncomingError() {
-        $test = &new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                new IdenticalExpectation(new AnythingExpectation()),
-                'B',
-                'a message'));
-        $test->setReturnValue('assert', true);
-        $test->expectNever('error');
-        $queue = &new SimpleErrorQueue();
-        $queue->setTestCase($test);
-        $queue->expectError(new AnythingExpectation(), 'a message');
-        $queue->add(1024, 'B', 'b.php', 100);
-    }
-}
-
-class TestOfErrorTrap extends UnitTestCase {
-    var $_old;
-
-    function setUp() {
-        $this->_old = error_reporting(E_ALL);
-        set_error_handler('SimpleTestErrorHandler');
-    }
-
-    function tearDown() {
-        restore_error_handler();
-        error_reporting($this->_old);
-    }
-
-    function testQueueStartsEmpty() {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $this->assertFalse($queue->extract());
-    }
-
-    function testTrappedErrorPlacedInQueue() {
-        trigger_error('Ouch!');
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        list($severity, $message, $file, $line) = $queue->extract();
-        $this->assertEqual($message, 'Ouch!');
-        $this->assertEqual($file, __FILE__);
-        $this->assertFalse($queue->extract());
-    }
-
-    function testErrorsAreSwallowedByMatchingExpectation() {
-        $this->expectError('Ouch!');
-        trigger_error('Ouch!');
-    }
-
-    function testErrorsAreSwallowedInOrder() {
-        $this->expectError('a');
-        $this->expectError('b');
-        trigger_error('a');
-        trigger_error('b');
-    }
-
-    function testAnyErrorCanBeSwallowed() {
-        $this->expectError();
-        trigger_error('Ouch!');
-    }
-
-    function testErrorCanBeSwallowedByPatternMatching() {
-        $this->expectError(new PatternExpectation('/ouch/i'));
-        trigger_error('Ouch!');
-    }
-
-    function testErrorWithPercentsPassesWithNoSprintfError() {
-        $this->expectError("%");
-        trigger_error('%');
-    }
-}
-
-class TestOfErrors extends UnitTestCase {
-    var $_old;
-
-    function setUp() {
-        $this->_old = error_reporting(E_ALL);
-    }
-
-    function tearDown() {
-        error_reporting($this->_old);
-    }
-
-    function testDefaultWhenAllReported() {
-        error_reporting(E_ALL);
-        trigger_error('Ouch!');
-        $this->assertError('Ouch!');
-    }
-
-    function testNoticeWhenReported() {
-        error_reporting(E_ALL);
-        trigger_error('Ouch!', E_USER_NOTICE);
-        $this->assertError('Ouch!');
-    }
-
-    function testWarningWhenReported() {
-        error_reporting(E_ALL);
-        trigger_error('Ouch!', E_USER_WARNING);
-        $this->assertError('Ouch!');
-    }
-
-    function testErrorWhenReported() {
-        error_reporting(E_ALL);
-        trigger_error('Ouch!', E_USER_ERROR);
-        $this->assertError('Ouch!');
-    }
-
-    function testNoNoticeWhenNotReported() {
-        error_reporting(0);
-        trigger_error('Ouch!', E_USER_NOTICE);
-    }
-
-    function testNoWarningWhenNotReported() {
-        error_reporting(0);
-        trigger_error('Ouch!', E_USER_WARNING);
-    }
-
-    function testNoticeSuppressedWhenReported() {
-        error_reporting(E_ALL);
-        @trigger_error('Ouch!', E_USER_NOTICE);
-    }
-
-    function testWarningSuppressedWhenReported() {
-        error_reporting(E_ALL);
-        @trigger_error('Ouch!', E_USER_WARNING);
-    }
-
-    function testErrorWithPercentsReportedWithNoSprintfError() {
-        trigger_error('%');
-        $this->assertError('%');
-    }
-}
-
-class TestOfPHP52RecoverableErrors extends UnitTestCase {
-    function skip() {
-        $this->skipIf(
-                version_compare(phpversion(), '5.2', '<'),
-                'E_RECOVERABLE_ERROR not tested for PHP below 5.2');
-    }
-
-    function testError() {
-        eval('
-            class RecoverableErrorTestingStub {
-                function ouch(RecoverableErrorTestingStub $obj) {
-                }
-            }
-        ');
-
-        $stub = new RecoverableErrorTestingStub();
-        $this->expectError(new PatternExpectation('/must be an instance of RecoverableErrorTestingStub/i'));
-        $stub->ouch(new stdClass());
-    }
-}
-
-class TestOfErrorsExcludingPHP52AndAbove extends UnitTestCase {
-    function skip() {
-        $this->skipIf(
-                version_compare(phpversion(), '5.2', '>='),
-                'E_USER_ERROR not tested for PHP 5.2 and above');
-    }
-
-    function testNoErrorWhenNotReported() {
-        error_reporting(0);
-        trigger_error('Ouch!', E_USER_ERROR);
-    }
-
-    function testErrorSuppressedWhenReported() {
-        error_reporting(E_ALL);
-        @trigger_error('Ouch!', E_USER_ERROR);
-    }
-}
-
-SimpleTest::ignore('TestOfNotEnoughErrors');
-/**
- * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
- * to verify that it fails as expected.
- *
- * @ignore
- */
-class TestOfNotEnoughErrors extends UnitTestCase {
-    function testExpectTwoErrorsThrowOne() {
-        $this->expectError('Error 1');
-        trigger_error('Error 1');
-        $this->expectError('Error 2');
-    }
-}
-
-SimpleTest::ignore('TestOfLeftOverErrors');
-/**
- * This test is ignored as it is used by {@link TestRunnerForLeftOverAndNotEnoughErrors}
- * to verify that it fails as expected.
- *
- * @ignore
- */
-class TestOfLeftOverErrors extends UnitTestCase {
-    function testExpectOneErrorGetTwo() {
-        $this->expectError('Error 1');
-        trigger_error('Error 1');
-        trigger_error('Error 2');
-    }
-}
-
-class TestRunnerForLeftOverAndNotEnoughErrors extends UnitTestCase {
-    function testRunLeftOverErrorsTestCase() {
-        $test = new TestOfLeftOverErrors();
-        $this->assertFalse($test->run(new SimpleReporter()));
-    }
-
-    function testRunNotEnoughErrors() {
-        $test = new TestOfNotEnoughErrors();
-        $this->assertFalse($test->run(new SimpleReporter()));
-    }
-}
-
-// TODO: Add stacked error handler test
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/exceptions_test.php b/tests/simpletest/test/exceptions_test.php
deleted file mode 100644
index 9cc35c590..000000000
--- a/tests/simpletest/test/exceptions_test.php
+++ /dev/null
@@ -1,153 +0,0 @@
-<?php
-// $Id: exceptions_test.php 1618 2007-12-29 22:52:30Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../exceptions.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../test_case.php');
-Mock::generate('SimpleTestCase');
-Mock::generate('SimpleExpectation');
-
-class MyTestException extends Exception {}
-class HigherTestException extends MyTestException {}
-class OtherTestException extends Exception {}
-
-class TestOfExceptionExpectation extends UnitTestCase {
-
-    function testExceptionClassAsStringWillMatchExceptionsRootedOnThatClass() {
-        $expectation = new ExceptionExpectation('MyTestException');
-        $this->assertTrue($expectation->test(new MyTestException()));
-        $this->assertTrue($expectation->test(new HigherTestException()));
-        $this->assertFalse($expectation->test(new OtherTestException()));
-    }
-
-    function testMatchesClassAndMessageWhenExceptionExpected() {
-        $expectation = new ExceptionExpectation(new MyTestException('Hello'));
-        $this->assertTrue($expectation->test(new MyTestException('Hello')));
-        $this->assertFalse($expectation->test(new HigherTestException('Hello')));
-        $this->assertFalse($expectation->test(new OtherTestException('Hello')));
-        $this->assertFalse($expectation->test(new MyTestException('Goodbye')));
-        $this->assertFalse($expectation->test(new MyTestException()));
-    }
-
-    function testMessagelessExceptionMatchesOnlyOnClass() {
-        $expectation = new ExceptionExpectation(new MyTestException());
-        $this->assertTrue($expectation->test(new MyTestException()));
-        $this->assertFalse($expectation->test(new HigherTestException()));
-    }
-}
-
-class TestOfExceptionTrap extends UnitTestCase {
-
-    function testNoExceptionsInQueueMeansNoTestMessages() {
-        $test = new MockSimpleTestCase();
-        $test->expectNever('assert');
-        $queue = new SimpleExceptionTrap();
-        $this->assertFalse($queue->isExpected($test, new Exception()));
-    }
-
-    function testMatchingExceptionGivesTrue() {
-        $expectation = new MockSimpleExpectation();
-        $expectation->setReturnValue('test', true);
-        $test = new MockSimpleTestCase();
-        $test->setReturnValue('assert', true);
-        $queue = new SimpleExceptionTrap();
-        $queue->expectException($expectation, 'message');
-        $this->assertTrue($queue->isExpected($test, new Exception()));
-    }
-
-    function testMatchingExceptionTriggersAssertion() {
-        $test = new MockSimpleTestCase();
-        $test->expectOnce('assert', array(
-                '*',
-                new ExceptionExpectation(new Exception()),
-                'message'));
-        $queue = new SimpleExceptionTrap();
-        $queue->expectException(new ExceptionExpectation(new Exception()), 'message');
-        $queue->isExpected($test, new Exception());
-    }
-}
-
-class TestOfCatchingExceptions extends UnitTestCase {
-
-    function testCanCatchAnyExpectedException() {
-        $this->expectException();
-        throw new Exception();
-    }
-
-    function testCanMatchExceptionByClass() {
-        $this->expectException('MyTestException');
-        throw new HigherTestException();
-    }
-
-    function testCanMatchExceptionExactly() {
-        $this->expectException(new Exception('Ouch'));
-        throw new Exception('Ouch');
-    }
-
-    function testLastListedExceptionIsTheOneThatCounts() {
-        $this->expectException('OtherTestException');
-        $this->expectException('MyTestException');
-        throw new HigherTestException();
-    }
-}
-
-class TestOfCallingTearDownAfterExceptions extends UnitTestCase {
-    private $debri = 0;
-    
-    function tearDown() {
-        $this->debri--;
-    }
-
-    function testLeaveSomeDebri() { 
-        $this->debri++;
-        $this->expectException();
-        throw new Exception(__FUNCTION__);
-    }
-
-	function testDebriWasRemovedOnce() {
-        $this->assertEqual($this->debri, 0);
-	}
-}
-
-class TestOfExceptionThrownInSetUpDoesNotRunTestBody extends UnitTestCase {
-
-	function setUp() {
-        $this->expectException();
-        throw new Exception();
-	}
-	
-	function testShouldNotBeRun() {
-        $this->fail('This test body should not be run');
-	}
-
-	function testShouldNotBeRunEither() {
-        $this->fail('This test body should not be run either');
-	}
-}
-
-class TestOfExpectExceptionWithSetUp extends UnitTestCase {
-
-	function setUp() {
-        $this->expectException();
-	}
-	
-	function testThisExceptionShouldBeCaught() {
-        throw new Exception();
-	}
-
-	function testJustThrowingMyTestException() {
-        throw new MyTestException();
-	}
-}
-
-class TestOfThrowingExceptionsInTearDown extends UnitTestCase {
-    
-    function tearDown() {
-        throw new Exception();
-    }
-    
-    function testDoesntFatal() {
-        $this->expectException();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/expectation_test.php b/tests/simpletest/test/expectation_test.php
deleted file mode 100644
index 8f4fc3878..000000000
--- a/tests/simpletest/test/expectation_test.php
+++ /dev/null
@@ -1,245 +0,0 @@
-<?php
-// $Id: expectation_test.php 1539 2007-06-09 08:35:54Z pachanga $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-
-class TestOfEquality extends UnitTestCase {
-
-    function testBoolean() {
-        $is_true = &new EqualExpectation(true);
-        $this->assertTrue($is_true->test(true));
-        $this->assertFalse($is_true->test(false));
-    }
-
-    function testStringMatch() {
-        $hello = &new EqualExpectation("Hello");
-        $this->assertTrue($hello->test("Hello"));
-        $this->assertFalse($hello->test("Goodbye"));
-    }
-
-    function testInteger() {
-        $fifteen = &new EqualExpectation(15);
-        $this->assertTrue($fifteen->test(15));
-        $this->assertFalse($fifteen->test(14));
-    }
-
-    function testFloat() {
-        $pi = &new EqualExpectation(3.14);
-        $this->assertTrue($pi->test(3.14));
-        $this->assertFalse($pi->test(3.15));
-    }
-
-    function testArray() {
-        $colours = &new EqualExpectation(array("r", "g", "b"));
-        $this->assertTrue($colours->test(array("r", "g", "b")));
-        $this->assertFalse($colours->test(array("g", "b", "r")));
-    }
-
-    function testHash() {
-        $is_blue = &new EqualExpectation(array("r" => 0, "g" => 0, "b" => 255));
-        $this->assertTrue($is_blue->test(array("r" => 0, "g" => 0, "b" => 255)));
-        $this->assertFalse($is_blue->test(array("r" => 0, "g" => 255, "b" => 0)));
-    }
-
-    function testHashWithOutOfOrderKeysShouldStillMatch() {
-        $any_order = &new EqualExpectation(array('a' => 1, 'b' => 2));
-        $this->assertTrue($any_order->test(array('b' => 2, 'a' => 1)));
-    }
-}
-
-class TestOfWithin extends UnitTestCase {
-
-    function testWithinFloatingPointMargin() {
-        $within = new WithinMarginExpectation(1.0, 0.2);
-        $this->assertFalse($within->test(0.7));
-        $this->assertTrue($within->test(0.8));
-        $this->assertTrue($within->test(0.9));
-        $this->assertTrue($within->test(1.1));
-        $this->assertTrue($within->test(1.2));
-        $this->assertFalse($within->test(1.3));
-    }
-
-    function testOutsideFloatingPointMargin() {
-        $within = new OutsideMarginExpectation(1.0, 0.2);
-        $this->assertTrue($within->test(0.7));
-        $this->assertFalse($within->test(0.8));
-        $this->assertFalse($within->test(1.2));
-        $this->assertTrue($within->test(1.3));
-    }
-}
-
-class TestOfInequality extends UnitTestCase {
-
-    function testStringMismatch() {
-        $not_hello = &new NotEqualExpectation("Hello");
-        $this->assertTrue($not_hello->test("Goodbye"));
-        $this->assertFalse($not_hello->test("Hello"));
-    }
-}
-
-class RecursiveNasty {
-    var $_me;
-
-    function RecursiveNasty() {
-        $this->_me = $this;
-    }
-}
-
-class TestOfIdentity extends UnitTestCase {
-
-    function testType() {
-        $string = &new IdenticalExpectation("37");
-        $this->assertTrue($string->test("37"));
-        $this->assertFalse($string->test(37));
-        $this->assertFalse($string->test("38"));
-    }
-
-    function _testNastyPhp5Bug() {
-        $this->assertFalse(new RecursiveNasty() != new RecursiveNasty());
-    }
-
-    function _testReallyHorribleRecursiveStructure() {
-        $hopeful = &new IdenticalExpectation(new RecursiveNasty());
-        $this->assertTrue($hopeful->test(new RecursiveNasty()));
-    }
-}
-
-class DummyReferencedObject{}
-
-class TestOfReference extends UnitTestCase {
-
-    function testReference() {
-        $foo = "foo";
-        $ref =& $foo;
-        $not_ref = $foo;
-        $bar = "bar";
-
-        $expect = &new ReferenceExpectation($foo);
-        $this->assertTrue($expect->test($ref));
-        $this->assertFalse($expect->test($not_ref));
-        $this->assertFalse($expect->test($bar));
-    }
-
-    function testObjectsReferencesDualityForPhp5AndPhp4() {
-        $dummy = new DummyReferencedObject();
-        $ref =& $dummy;
-        $not_ref = $dummy;
-
-        $hopeful = &new ReferenceExpectation($dummy);
-        $this->assertTrue($hopeful->test($ref));
-
-        if (version_compare(phpversion(), '5') >= 0) {
-            $this->assertTrue($hopeful->test($not_ref));
-        } else {
-            $this->assertFalse($hopeful->test($not_ref));
-        }
-    }
-
-    function testReallyHorribleRecursiveStructure() {
-        $nasty = new RecursiveNasty();
-        $ref =& $nasty;
-        $hopeful = &new ReferenceExpectation($nasty);
-        $this->assertTrue($hopeful->test($ref));
-    }
-}
-
-class TestOfNonIdentity extends UnitTestCase {
-
-    function testType() {
-        $string = &new NotIdenticalExpectation("37");
-        $this->assertTrue($string->test("38"));
-        $this->assertTrue($string->test(37));
-        $this->assertFalse($string->test("37"));
-    }
-}
-
-class TestOfPatterns extends UnitTestCase {
-
-    function testWanted() {
-        $pattern = &new PatternExpectation('/hello/i');
-        $this->assertTrue($pattern->test("Hello world"));
-        $this->assertFalse($pattern->test("Goodbye world"));
-    }
-
-    function testUnwanted() {
-        $pattern = &new NoPatternExpectation('/hello/i');
-        $this->assertFalse($pattern->test("Hello world"));
-        $this->assertTrue($pattern->test("Goodbye world"));
-    }
-}
-
-class ExpectedMethodTarget {
-    function hasThisMethod() {}
-}
-
-class TestOfMethodExistence extends UnitTestCase {
-
-    function testHasMethod() {
-        $instance = &new ExpectedMethodTarget();
-        $expectation = &new MethodExistsExpectation('hasThisMethod');
-        $this->assertTrue($expectation->test($instance));
-        $expectation = &new MethodExistsExpectation('doesNotHaveThisMethod');
-        $this->assertFalse($expectation->test($instance));
-    }
-}
-
-class TestOfIsA extends UnitTestCase {
-
-    function testString() {
-        $expectation = &new IsAExpectation('string');
-        $this->assertTrue($expectation->test('Hello'));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testBoolean() {
-        $expectation = &new IsAExpectation('boolean');
-        $this->assertTrue($expectation->test(true));
-        $this->assertFalse($expectation->test(1));
-    }
-
-    function testBool() {
-        $expectation = &new IsAExpectation('bool');
-        $this->assertTrue($expectation->test(true));
-        $this->assertFalse($expectation->test(1));
-    }
-
-    function testDouble() {
-        $expectation = &new IsAExpectation('double');
-        $this->assertTrue($expectation->test(5.0));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testFloat() {
-        $expectation = &new IsAExpectation('float');
-        $this->assertTrue($expectation->test(5.0));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testReal() {
-        $expectation = &new IsAExpectation('real');
-        $this->assertTrue($expectation->test(5.0));
-        $this->assertFalse($expectation->test(5));
-    }
-
-    function testInteger() {
-        $expectation = &new IsAExpectation('integer');
-        $this->assertTrue($expectation->test(5));
-        $this->assertFalse($expectation->test(5.0));
-    }
-
-    function testInt() {
-        $expectation = &new IsAExpectation('int');
-        $this->assertTrue($expectation->test(5));
-        $this->assertFalse($expectation->test(5.0));
-    }
-}
-
-class TestOfNotA extends UnitTestCase {
-
-    function testString() {
-        $expectation = &new NotAExpectation('string');
-        $this->assertFalse($expectation->test('Hello'));
-        $this->assertTrue($expectation->test(5));
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/form_test.php b/tests/simpletest/test/form_test.php
deleted file mode 100644
index bdc6f67d2..000000000
--- a/tests/simpletest/test/form_test.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-// $Id: form_test.php 1624 2008-01-01 15:00:43Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../url.php');
-require_once(dirname(__FILE__) . '/../form.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-Mock::generate('SimplePage');
-
-class TestOfForm extends UnitTestCase {
-    
-    function &page($url, $action = false) {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getUrl', new SimpleUrl($url));
-        $page->setReturnValue('expandUrl', new SimpleUrl($url));
-        return $page;
-    }
-    
-    function testFormAttributes() {
-        $tag = &new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php', 'id' => '33'));
-        $form = &new SimpleForm($tag, $this->page('http://host/a/index.html'));
-        $this->assertEqual($form->getMethod(), 'get');
-        $this->assertIdentical($form->getId(), '33');
-        $this->assertNull($form->getValue(new SimpleByName('a')));
-    }
-    
-    function testAction() {
-        $page = &new MockSimplePage();
-        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
-        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
-        $tag = &new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
-        $form = &new SimpleForm($tag, $page);
-        $this->assertEqual($form->getAction(), new SimpleUrl('http://host/here.php'));
-    }
-    
-    function testEmptyAction() {
-        $tag = &new SimpleFormTag(array('method' => 'GET', 'action' => '', 'id' => '33'));
-        $form = &new SimpleForm($tag, $this->page('http://host/a/index.html'));
-        $this->assertEqual(
-                $form->getAction(),
-                new SimpleUrl('http://host/a/index.html'));
-    }
-    
-    function testMissingAction() {
-        $tag = &new SimpleFormTag(array('method' => 'GET'));
-        $form = &new SimpleForm($tag, $this->page('http://host/a/index.html'));
-        $this->assertEqual(
-                $form->getAction(),
-                new SimpleUrl('http://host/a/index.html'));
-    }
-    
-    function testRootAction() {
-        $page = &new MockSimplePage();
-        $page->expectOnce('expandUrl', array(new SimpleUrl('/')));
-        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/'));
-        $tag = &new SimpleFormTag(array('method' => 'GET', 'action' => '/'));
-        $form = &new SimpleForm($tag, $page);
-        $this->assertEqual(
-                $form->getAction(),
-                new SimpleUrl('http://host/'));
-    }
-    
-    function testDefaultFrameTargetOnForm() {
-        $page = &new MockSimplePage();
-        $page->expectOnce('expandUrl', array(new SimpleUrl('here.php')));
-        $page->setReturnValue('expandUrl', new SimpleUrl('http://host/here.php'));
-        $tag = &new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php'));
-        $form = &new SimpleForm($tag, $page);
-        $form->setDefaultTarget('frame');
-        $expected = new SimpleUrl('http://host/here.php');
-        $expected->setTarget('frame');
-        $this->assertEqual($form->getAction(), $expected);
-    }
-    
-    function testTextWidget() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleTextTag(
-                array('name' => 'me', 'type' => 'text', 'value' => 'Myself')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Myself');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'Not me'));
-        $this->assertFalse($form->setField(new SimpleByName('not_present'), 'Not me'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'Not me');
-        $this->assertNull($form->getValue(new SimpleByName('not_present')));
-    }
-    
-    function testTextWidgetById() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleTextTag(
-                array('name' => 'me', 'type' => 'text', 'value' => 'Myself', 'id' => 50)));
-        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Myself');
-        $this->assertTrue($form->setField(new SimpleById(50), 'Not me'));
-        $this->assertIdentical($form->getValue(new SimpleById(50)), 'Not me');
-    }
-    
-    function testTextWidgetByLabel() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $widget = &new SimpleTextTag(array('name' => 'me', 'type' => 'text', 'value' => 'a'));
-        $form->addWidget($widget);
-        $widget->setLabel('thing');
-        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'a');
-        $this->assertTrue($form->setField(new SimpleByLabel('thing'), 'b'));
-        $this->assertIdentical($form->getValue(new SimpleByLabel('thing')), 'b');
-    }
-    
-    function testSubmitEmpty() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $this->assertIdentical($form->submit(), new SimpleGetEncoding());
-    }
-    
-    function testSubmitButton() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!', 'id' => '9')));
-        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
-        $this->assertEqual($form->getValue(new SimpleByName('go')), 'Go!');
-        $this->assertEqual($form->getValue(new SimpleById(9)), 'Go!');
-        $this->assertEqual(
-                $form->submitButton(new SimpleByName('go')),
-                new SimpleGetEncoding(array('go' => 'Go!')));            
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Go!')),
-                new SimpleGetEncoding(array('go' => 'Go!')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleById(9)),
-                new SimpleGetEncoding(array('go' => 'Go!')));            
-    }
-    
-    function testSubmitWithAdditionalParameters() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'go', 'value' => 'Go!')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Go!'), array('a' => 'A')),
-                new SimpleGetEncoding(array('go' => 'Go!', 'a' => 'A')));            
-    }
-    
-    function testSubmitButtonWithLabelOfSubmit() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'test', 'value' => 'Submit')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByName('test')),
-                new SimpleGetEncoding(array('test' => 'Submit')));            
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Submit')),
-                new SimpleGetEncoding(array('test' => 'Submit')));            
-    }
-    
-    function testSubmitButtonWithWhitespacePaddedLabelOfSubmit() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $form->addWidget(new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 'test', 'value' => ' Submit ')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Submit')),
-                new SimpleGetEncoding(array('test' => ' Submit ')));            
-    }
-    
-    function testImageSubmitButton() {
-        $form = &new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
-        $form->addWidget(new SimpleImageSubmitTag(array(
-                'type' => 'image',
-                'src' => 'source.jpg',
-                'name' => 'go',
-                'alt' => 'Go!',
-                'id' => '9')));
-        $this->assertTrue($form->hasImage(new SimpleByLabel('Go!')));
-        $this->assertEqual(
-                $form->submitImage(new SimpleByLabel('Go!'), 100, 101),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
-        $this->assertTrue($form->hasImage(new SimpleByName('go')));
-        $this->assertEqual(
-                $form->submitImage(new SimpleByName('go'), 100, 101),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
-        $this->assertTrue($form->hasImage(new SimpleById(9)));
-        $this->assertEqual(
-                $form->submitImage(new SimpleById(9), 100, 101),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101)));
-    }
-    
-    function testImageSubmitButtonWithAdditionalData() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleImageSubmitTag(array(
-                'type' => 'image',
-                'src' => 'source.jpg',
-                'name' => 'go',
-                'alt' => 'Go!')));
-        $this->assertEqual(
-                $form->submitImage(new SimpleByLabel('Go!'), 100, 101, array('a' => 'A')),
-                new SimpleGetEncoding(array('go.x' => 100, 'go.y' => 101, 'a' => 'A')));
-    }
-    
-    function testButtonTag() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('http://host'));
-        $widget = &new SimpleButtonTag(
-                array('type' => 'submit', 'name' => 'go', 'value' => 'Go', 'id' => '9'));
-        $widget->addContent('Go!');
-        $form->addWidget($widget);
-        $this->assertTrue($form->hasSubmit(new SimpleByName('go')));
-        $this->assertTrue($form->hasSubmit(new SimpleByLabel('Go!')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByName('go')),
-                new SimpleGetEncoding(array('go' => 'Go')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Go!')),
-                new SimpleGetEncoding(array('go' => 'Go')));
-        $this->assertEqual(
-                $form->submitButton(new SimpleById(9)),
-                new SimpleGetEncoding(array('go' => 'Go')));
-    }
-    
-    function testMultipleFieldsWithSameNameSubmitted() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $input = &new SimpleTextTag(array('name' => 'elements[]', 'value' => '1'));
-        $form->addWidget($input);
-        $input = &new SimpleTextTag(array('name' => 'elements[]', 'value' => '2'));
-        $form->addWidget($input);
-        $form->setField(new SimpleByLabelOrName('elements[]'), '3', 1);
-        $form->setField(new SimpleByLabelOrName('elements[]'), '4', 2);
-		$submit = $form->submit();
-        $this->assertEqual(count($submit->_request), 2);
-        $this->assertIdentical($submit->_request[0], new SimpleEncodedPair('elements[]', '3'));
-        $this->assertIdentical($submit->_request[1], new SimpleEncodedPair('elements[]', '4'));
-    }
-    
-    function testSingleSelectFieldSubmitted() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $select = &new SimpleSelectionTag(array('name' => 'a'));
-        $select->addTag(new SimpleOptionTag(
-                array('value' => 'aaa', 'selected' => '')));
-        $form->addWidget($select);
-        $this->assertIdentical(
-                $form->submit(),
-                new SimpleGetEncoding(array('a' => 'aaa')));
-    }
-    
-    function testSingleSelectFieldSubmittedWithPost() {
-        $form = &new SimpleForm(new SimpleFormTag(array('method' => 'post')), $this->page('htp://host'));
-        $select = &new SimpleSelectionTag(array('name' => 'a'));
-        $select->addTag(new SimpleOptionTag(
-                array('value' => 'aaa', 'selected' => '')));
-        $form->addWidget($select);
-        $this->assertIdentical(
-                $form->submit(),
-                new SimplePostEncoding(array('a' => 'aaa')));
-    }
-    
-    function testUnchecked() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'me', 'type' => 'checkbox')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'on'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
-        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'on');
-    }
-    
-    function testChecked() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'checkbox', 'checked' => '')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertTrue($form->setField(new SimpleByName('me'), false));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), false);
-    }
-    
-    function testSingleUncheckedRadioButton() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertEqual($form->getValue(new SimpleByName('me')), 'a');
-    }
-    
-    function testSingleCheckedRadioButton() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio', 'checked' => '')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertFalse($form->setField(new SimpleByName('me'), 'other'));
-    }
-    
-    function testUncheckedRadioButtons() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'b', 'type' => 'radio')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), false);
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'b'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
-        $this->assertFalse($form->setField(new SimpleByName('me'), 'c'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
-    }
-    
-    function testCheckedRadioButtons() {
-        $form = &new SimpleForm(new SimpleFormTag(array()), $this->page('htp://host'));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'a', 'type' => 'radio')));
-        $form->addWidget(new SimpleRadioButtonTag(
-                array('name' => 'me', 'value' => 'b', 'type' => 'radio', 'checked' => '')));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'b');
-        $this->assertTrue($form->setField(new SimpleByName('me'), 'a'));
-        $this->assertIdentical($form->getValue(new SimpleByName('me')), 'a');
-    }
-    
-    function testMultipleFieldsWithSameKey() {
-        $form = &new SimpleForm(new SimpleFormTag(array()),  $this->page('htp://host'));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'a', 'type' => 'checkbox', 'value' => 'me')));
-        $form->addWidget(new SimpleCheckboxTag(
-                array('name' => 'a', 'type' => 'checkbox', 'value' => 'you')));
-        $this->assertIdentical($form->getValue(new SimpleByName('a')), false);
-        $this->assertTrue($form->setField(new SimpleByName('a'), 'me'));
-        $this->assertIdentical($form->getValue(new SimpleByName('a')), 'me');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/frames_test.php b/tests/simpletest/test/frames_test.php
deleted file mode 100644
index 160eebc1b..000000000
--- a/tests/simpletest/test/frames_test.php
+++ /dev/null
@@ -1,549 +0,0 @@
-<?php
-// $Id: frames_test.php 1555 2007-07-14 02:04:34Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../tag.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../frames.php');
-Mock::generate('SimplePage');
-Mock::generate('SimpleForm');
-
-class TestOfFrameset extends UnitTestCase {
-
-    function testTitleReadFromFramesetPage() {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getTitle', 'This page');
-        $frameset = &new SimpleFrameset($page);
-        $this->assertEqual($frameset->getTitle(), 'This page');
-    }
-
-    function TestHeadersReadFromFramesetByDefault() {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getHeaders', 'Header: content');
-        $page->setReturnValue('getMimeType', 'text/xml');
-        $page->setReturnValue('getResponseCode', 401);
-        $page->setReturnValue('getTransportError', 'Could not parse headers');
-        $page->setReturnValue('getAuthentication', 'Basic');
-        $page->setReturnValue('getRealm', 'Safe place');
-
-        $frameset = &new SimpleFrameset($page);
-
-        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
-        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
-        $this->assertIdentical($frameset->getResponseCode(), 401);
-        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
-        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
-        $this->assertIdentical($frameset->getRealm(), 'Safe place');
-    }
-
-    function testEmptyFramesetHasNoContent() {
-        $page = &new MockSimplePage();
-        $page->setReturnValue('getRaw', 'This content');
-        $frameset = &new SimpleFrameset($page);
-        $this->assertEqual($frameset->getRaw(), '');
-    }
-
-    function testRawContentIsFromOnlyFrame() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame = &new MockSimplePage();
-        $frame->setReturnValue('getRaw', 'Stuff');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-        $this->assertEqual($frameset->getRaw(), 'Stuff');
-    }
-
-    function testRawContentIsFromAllFrames() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
-    }
-
-    function testTextContentIsFromOnlyFrame() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getText');
-
-        $frame = &new MockSimplePage();
-        $frame->setReturnValue('getText', 'Stuff');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-        $this->assertEqual($frameset->getText(), 'Stuff');
-    }
-
-    function testTextContentIsFromAllFrames() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getText');
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getText', 'Stuff1');
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getText', 'Stuff2');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $this->assertEqual($frameset->getText(), 'Stuff1 Stuff2');
-    }
-
-    function testFieldFoundIsFirstInFramelist() {
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getField', null);
-        $frame1->expectOnce('getField', array(new SimpleByName('a')));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getField', 'A');
-        $frame2->expectOnce('getField', array(new SimpleByName('a')));
-
-        $frame3 = &new MockSimplePage();
-        $frame3->expectNever('getField');
-
-        $page = &new MockSimplePage();
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $frameset->addFrame($frame3);
-        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'A');
-    }
-
-    function testFrameReplacementByIndex() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->setFrame(array(1), $frame2);
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-    }
-
-    function testFrameReplacementByName() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1, 'a');
-        $frameset->setFrame(array('a'), $frame2);
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-    }
-}
-
-class TestOfFrameNavigation extends UnitTestCase {
-
-    function testStartsWithoutFrameFocus() {
-        $page = &new MockSimplePage();
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-        $this->assertFalse($frameset->getFrameFocus());
-    }
-
-    function testCanFocusOnSingleFrame() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getRaw');
-
-        $frame = &new MockSimplePage();
-        $frame->setReturnValue('getFrameFocus', array());
-        $frame->setReturnValue('getRaw', 'Stuff');
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame);
-
-        $this->assertFalse($frameset->setFrameFocusByIndex(0));
-        $this->assertTrue($frameset->setFrameFocusByIndex(1));
-        $this->assertEqual($frameset->getRaw(), 'Stuff');
-        $this->assertFalse($frameset->setFrameFocusByIndex(2));
-        $this->assertIdentical($frameset->getFrameFocus(), array(1));
-    }
-
-    function testContentComesFromFrameInFocus() {
-        $page = &new MockSimplePage();
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-        $frame1->setReturnValue('getFrameFocus', array());
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-        $frame2->setReturnValue('getFrameFocus', array());
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-
-        $this->assertTrue($frameset->setFrameFocusByIndex(1));
-        $this->assertEqual($frameset->getFrameFocus(), array(1));
-        $this->assertEqual($frameset->getRaw(), 'Stuff1');
-
-        $this->assertTrue($frameset->setFrameFocusByIndex(2));
-        $this->assertEqual($frameset->getFrameFocus(), array(2));
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-
-        $this->assertFalse($frameset->setFrameFocusByIndex(3));
-        $this->assertEqual($frameset->getFrameFocus(), array(2));
-
-        $frameset->clearFrameFocus();
-        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
-    }
-
-    function testCanFocusByName() {
-        $page = &new MockSimplePage();
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getRaw', 'Stuff1');
-        $frame1->setReturnValue('getFrameFocus', array());
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getRaw', 'Stuff2');
-        $frame2->setReturnValue('getFrameFocus', array());
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-
-        $this->assertTrue($frameset->setFrameFocus('A'));
-        $this->assertEqual($frameset->getFrameFocus(), array('A'));
-        $this->assertEqual($frameset->getRaw(), 'Stuff1');
-
-        $this->assertTrue($frameset->setFrameFocusByIndex(2));
-        $this->assertEqual($frameset->getFrameFocus(), array('B'));
-        $this->assertEqual($frameset->getRaw(), 'Stuff2');
-
-        $this->assertFalse($frameset->setFrameFocus('z'));
-
-        $frameset->clearFrameFocus();
-        $this->assertEqual($frameset->getRaw(), 'Stuff1Stuff2');
-    }
-}
-
-class TestOfFramesetPageInterface extends UnitTestCase {
-    var $_page_interface;
-    var $_frameset_interface;
-
-    function TestOfFramesetPageInterface() {
-        $this->UnitTestCase();
-        $this->_page_interface = $this->_getPageMethods();
-        $this->_frameset_interface = $this->_getFramesetMethods();
-    }
-
-    function assertListInAnyOrder($list, $expected) {
-        sort($list);
-        sort($expected);
-        $this->assertEqual($list, $expected);
-    }
-
-    function _getPageMethods() {
-        $methods = array();
-        foreach (get_class_methods('SimplePage') as $method) {
-            if (strtolower($method) == strtolower('SimplePage')) {
-                continue;
-            }
-            if (strtolower($method) == strtolower('getFrameset')) {
-                continue;
-            }
-            if (strncmp($method, '_', 1) == 0) {
-                continue;
-            }
-            if (strncmp($method, 'accept', 6) == 0) {
-                continue;
-            }
-            $methods[] = $method;
-        }
-        return $methods;
-    }
-
-    function _getFramesetMethods() {
-        $methods = array();
-        foreach (get_class_methods('SimpleFrameset') as $method) {
-            if (strtolower($method) == strtolower('SimpleFrameset')) {
-                continue;
-            }
-            if (strncmp($method, '_', 1) == 0) {
-                continue;
-            }
-            if (strncmp($method, 'add', 3) == 0) {
-                continue;
-            }
-            $methods[] = $method;
-        }
-        return $methods;
-    }
-
-    function testFramsetHasPageInterface() {
-        $difference = array();
-        foreach ($this->_page_interface as $method) {
-            if (! in_array($method, $this->_frameset_interface)) {
-                $this->fail("No [$method] in Frameset class");
-                return;
-            }
-        }
-        $this->pass('Frameset covers Page interface');
-    }
-
-    function testHeadersReadFromFrameIfInFocus() {
-        $frame = &new MockSimplePage();
-        $frame->setReturnValue('getUrl', new SimpleUrl('http://localhost/stuff'));
-
-        $frame->setReturnValue('getRequest', 'POST stuff');
-        $frame->setReturnValue('getMethod', 'POST');
-        $frame->setReturnValue('getRequestData', array('a' => 'A'));
-        $frame->setReturnValue('getHeaders', 'Header: content');
-        $frame->setReturnValue('getMimeType', 'text/xml');
-        $frame->setReturnValue('getResponseCode', 401);
-        $frame->setReturnValue('getTransportError', 'Could not parse headers');
-        $frame->setReturnValue('getAuthentication', 'Basic');
-        $frame->setReturnValue('getRealm', 'Safe place');
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame);
-        $frameset->setFrameFocusByIndex(1);
-
-        $url = new SimpleUrl('http://localhost/stuff');
-        $url->setTarget(1);
-        $this->assertIdentical($frameset->getUrl(), $url);
-
-        $this->assertIdentical($frameset->getRequest(), 'POST stuff');
-        $this->assertIdentical($frameset->getMethod(), 'POST');
-        $this->assertIdentical($frameset->getRequestData(), array('a' => 'A'));
-        $this->assertIdentical($frameset->getHeaders(), 'Header: content');
-        $this->assertIdentical($frameset->getMimeType(), 'text/xml');
-        $this->assertIdentical($frameset->getResponseCode(), 401);
-        $this->assertIdentical($frameset->getTransportError(), 'Could not parse headers');
-        $this->assertIdentical($frameset->getAuthentication(), 'Basic');
-        $this->assertIdentical($frameset->getRealm(), 'Safe place');
-    }
-
-    function testUrlsComeFromBothFrames() {
-        $page = &new MockSimplePage();
-        $page->expectNever('getUrls');
-
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue(
-                'getUrls',
-                array('http://www.lastcraft.com/', 'http://myserver/'));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue(
-                'getUrls',
-                array('http://www.lastcraft.com/', 'http://test/'));
-
-        $frameset = &new SimpleFrameset($page);
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-        $this->assertListInAnyOrder(
-                $frameset->getUrls(),
-                array('http://www.lastcraft.com/', 'http://myserver/', 'http://test/'));
-    }
-
-    function testLabelledUrlsComeFromBothFrames() {
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue(
-                'getUrlsByLabel',
-                array(new SimpleUrl('goodbye.php')),
-                array('a'));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue(
-                'getUrlsByLabel',
-                array(new SimpleUrl('hello.php')),
-                array('a'));
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2, 'Two');
-
-        $expected1 = new SimpleUrl('goodbye.php');
-        $expected1->setTarget(1);
-        $expected2 = new SimpleUrl('hello.php');
-        $expected2->setTarget('Two');
-        $this->assertEqual(
-                $frameset->getUrlsByLabel('a'),
-                array($expected1, $expected2));
-    }
-
-    function testUrlByIdComesFromFirstFrameToRespond() {
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getUrlById', new SimpleUrl('four.php'), array(4));
-        $frame1->setReturnValue('getUrlById', false, array(5));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->setReturnValue('getUrlById', false, array(4));
-        $frame2->setReturnValue('getUrlById', new SimpleUrl('five.php'), array(5));
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1);
-        $frameset->addFrame($frame2);
-
-        $four = new SimpleUrl('four.php');
-        $four->setTarget(1);
-        $this->assertEqual($frameset->getUrlById(4), $four);
-        $five = new SimpleUrl('five.php');
-        $five->setTarget(2);
-        $this->assertEqual($frameset->getUrlById(5), $five);
-    }
-
-    function testReadUrlsFromFrameInFocus() {
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getUrls', array('a'));
-        $frame1->setReturnValue('getUrlsByLabel', array(new SimpleUrl('l')));
-        $frame1->setReturnValue('getUrlById', new SimpleUrl('i'));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->expectNever('getUrls');
-        $frame2->expectNever('getUrlsByLabel');
-        $frame2->expectNever('getUrlById');
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setFrameFocus('A');
-
-        $this->assertIdentical($frameset->getUrls(), array('a'));
-        $expected = new SimpleUrl('l');
-        $expected->setTarget('A');
-        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($expected));
-        $expected = new SimpleUrl('i');
-        $expected->setTarget('A');
-        $this->assertIdentical($frameset->getUrlById(99), $expected);
-    }
-
-    function testReadFrameTaggedUrlsFromFrameInFocus() {
-        $frame = &new MockSimplePage();
-
-        $by_label = new SimpleUrl('l');
-        $by_label->setTarget('L');
-        $frame->setReturnValue('getUrlsByLabel', array($by_label));
-
-        $by_id = new SimpleUrl('i');
-        $by_id->setTarget('I');
-        $frame->setReturnValue('getUrlById', $by_id);
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame, 'A');
-        $frameset->setFrameFocus('A');
-
-        $this->assertIdentical($frameset->getUrlsByLabel('label'), array($by_label));
-        $this->assertIdentical($frameset->getUrlById(99), $by_id);
-    }
-
-    function testFindingFormsById() {
-        $frame = &new MockSimplePage();
-        $form = &new MockSimpleForm();
-        $frame->setReturnReference('getFormById', $form, array('a'));
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame(new MockSimplePage(), 'A');
-        $frameset->addFrame($frame, 'B');
-        $this->assertReference($frameset->getFormById('a'), $form);
-
-        $frameset->setFrameFocus('A');
-        $this->assertNull($frameset->getFormById('a'));
-
-        $frameset->setFrameFocus('B');
-        $this->assertReference($frameset->getFormById('a'), $form);
-    }
-
-    function testFindingFormsBySubmit() {
-        $frame = &new MockSimplePage();
-        $form = &new MockSimpleForm();
-        $frame->setReturnReference(
-                'getFormBySubmit',
-                $form,
-                array(new SimpleByLabel('a')));
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame(new MockSimplePage(), 'A');
-        $frameset->addFrame($frame, 'B');
-        $this->assertReference($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
-
-        $frameset->setFrameFocus('A');
-        $this->assertNull($frameset->getFormBySubmit(new SimpleByLabel('a')));
-
-        $frameset->setFrameFocus('B');
-        $this->assertReference($frameset->getFormBySubmit(new SimpleByLabel('a')), $form);
-    }
-
-    function testFindingFormsByImage() {
-        $frame = &new MockSimplePage();
-        $form = &new MockSimpleForm();
-        $frame->setReturnReference(
-                'getFormByImage',
-                $form,
-                array(new SimpleByLabel('a')));
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame(new MockSimplePage(), 'A');
-        $frameset->addFrame($frame, 'B');
-        $this->assertReference($frameset->getFormByImage(new SimpleByLabel('a')), $form);
-
-        $frameset->setFrameFocus('A');
-        $this->assertNull($frameset->getFormByImage(new SimpleByLabel('a')));
-
-        $frameset->setFrameFocus('B');
-        $this->assertReference($frameset->getFormByImage(new SimpleByLabel('a')), $form);
-    }
-
-    function testSettingAllFrameFieldsWhenNoFrameFocus() {
-        $frame1 = &new MockSimplePage();
-        $frame1->expectOnce('setField', array(new SimpleById(22), 'A'));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->expectOnce('setField', array(new SimpleById(22), 'A'));
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setField(new SimpleById(22), 'A');
-    }
-
-    function testOnlySettingFieldFromFocusedFrame() {
-        $frame1 = &new MockSimplePage();
-        $frame1->expectOnce('setField', array(new SimpleByLabelOrName('a'), 'A'));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->expectNever('setField');
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setFrameFocus('A');
-        $frameset->setField(new SimpleByLabelOrName('a'), 'A');
-    }
-
-    function testOnlyGettingFieldFromFocusedFrame() {
-        $frame1 = &new MockSimplePage();
-        $frame1->setReturnValue('getField', 'f', array(new SimpleByName('a')));
-
-        $frame2 = &new MockSimplePage();
-        $frame2->expectNever('getField');
-
-        $frameset = &new SimpleFrameset(new MockSimplePage());
-        $frameset->addFrame($frame1, 'A');
-        $frameset->addFrame($frame2, 'B');
-        $frameset->setFrameFocus('A');
-        $this->assertIdentical($frameset->getField(new SimpleByName('a')), 'f');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/http_test.php b/tests/simpletest/test/http_test.php
deleted file mode 100644
index d249850c8..000000000
--- a/tests/simpletest/test/http_test.php
+++ /dev/null
@@ -1,427 +0,0 @@
-<?php
-// $Id: http_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-require_once(dirname(__FILE__) . '/../cookies.php');
-Mock::generate('SimpleSocket');
-Mock::generate('SimpleCookieJar');
-Mock::generate('SimpleRoute');
-Mock::generatePartial('SimpleRoute', 'PartialSimpleRoute', array('_createSocket'));
-Mock::generatePartial(
-        'SimpleProxyRoute',
-        'PartialSimpleProxyRoute',
-        array('_createSocket'));
-
-class TestOfDirectRoute extends UnitTestCase {
-    
-    function testDefaultGetRequest() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: a.valid.host\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleRoute(new SimpleUrl('http://a.valid.host/here.html'));
-        
-        $this->assertReference($route->createConnection('GET', 15), $socket);
-    }
-    
-    function testDefaultPostRequest() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("POST /here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: a.valid.host\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleRoute(new SimpleUrl('http://a.valid.host/here.html'));
-        
-        $route->createConnection('POST', 15);
-    }
-    
-    function testGetWithPort() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET /here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: a.valid.host:81\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleRoute(new SimpleUrl('http://a.valid.host:81/here.html'));
-        
-        $route->createConnection('GET', 15);
-    }
-    
-    function testGetWithParameters() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET /here.html?a=1&b=2 HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: a.valid.host\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleRoute(new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'));
-        
-        $route->createConnection('GET', 15);
-    }
-}
-
-class TestOfProxyRoute extends UnitTestCase {
-    
-    function testDefaultGet() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleProxyRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleProxyRoute(
-                new SimpleUrl('http://a.valid.host/here.html'),
-                new SimpleUrl('http://my-proxy'));
-        $route->createConnection('GET', 15);
-    }
-    
-    function testDefaultPost() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("POST http://a.valid.host/here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleProxyRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleProxyRoute(
-                new SimpleUrl('http://a.valid.host/here.html'),
-                new SimpleUrl('http://my-proxy'));
-        $route->createConnection('POST', 15);
-    }
-    
-    function testGetWithPort() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET http://a.valid.host:81/here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: my-proxy:8081\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleProxyRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleProxyRoute(
-                new SimpleUrl('http://a.valid.host:81/here.html'),
-                new SimpleUrl('http://my-proxy:8081'));
-        $route->createConnection('GET', 15);
-    }
-    
-    function testGetWithParameters() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET http://a.valid.host/here.html?a=1&b=2 HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 3);
-        
-        $route = &new PartialSimpleProxyRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleProxyRoute(
-                new SimpleUrl('http://a.valid.host/here.html?a=1&b=2'),
-                new SimpleUrl('http://my-proxy'));
-        $route->createConnection('GET', 15);
-    }
-    
-    function testGetWithAuthentication() {
-        $encoded = base64_encode('Me:Secret');
-
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("GET http://a.valid.host/here.html HTTP/1.0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Host: my-proxy:8080\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("Proxy-Authorization: Basic $encoded\r\n"));
-        $socket->expectArgumentsAt(3, 'write', array("Connection: close\r\n"));
-        $socket->expectCallCount('write', 4);
-        
-        $route = &new PartialSimpleProxyRoute();
-        $route->setReturnReference('_createSocket', $socket);
-        $route->SimpleProxyRoute(
-                new SimpleUrl('http://a.valid.host/here.html'),
-                new SimpleUrl('http://my-proxy'),
-                'Me',
-                'Secret');
-        $route->createConnection('GET', 15);
-    }
-}
-
-class TestOfHttpRequest extends UnitTestCase {
-    
-    function testReadingBadConnection() {
-        $socket = &new MockSimpleSocket();
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        
-        $request = &new SimpleHttpRequest($route, new SimpleGetEncoding());
-        $reponse = &$request->fetch(15);
-        $this->assertTrue($reponse->isError());
-    }
-    
-    function testReadingGoodConnection() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectOnce('write', array("\r\n"));
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        $route->expectArguments('createConnection', array('GET', 15));
-        
-        $request = &new SimpleHttpRequest($route, new SimpleGetEncoding());
-        $this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-    }
-    
-    function testWritingAdditionalHeaders() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("My: stuff\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("\r\n"));
-        $socket->expectCallCount('write', 2);
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        
-        $request = &new SimpleHttpRequest($route, new SimpleGetEncoding());
-        $request->addHeaderLine('My: stuff');
-        $request->fetch(15);
-    }
-    
-    function testCookieWriting() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("Cookie: a=A\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("\r\n"));
-        $socket->expectCallCount('write', 2);
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A');
-        
-        $request = &new SimpleHttpRequest($route, new SimpleGetEncoding());
-        $request->readCookiesFromJar($jar, new SimpleUrl('/'));
-        $this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-    }
-    
-    function testMultipleCookieWriting() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("Cookie: a=A;b=B\r\n"));
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A');
-        $jar->setCookie('b', 'B');
-        
-        $request = &new SimpleHttpRequest($route, new SimpleGetEncoding());
-        $request->readCookiesFromJar($jar, new SimpleUrl('/'));
-        $request->fetch(15);
-    }
-}
-
-class TestOfHttpPostRequest extends UnitTestCase {
-    
-    function testReadingBadConnectionCausesErrorBecauseOfDeadSocket() {
-        $socket = &new MockSimpleSocket();
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        
-        $request = &new SimpleHttpRequest($route, new SimplePostEncoding());
-        $reponse = &$request->fetch(15);
-        $this->assertTrue($reponse->isError());
-    }
-    
-    function testReadingGoodConnection() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("Content-Length: 0\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("\r\n"));
-        $socket->expectArgumentsAt(3, 'write', array(""));
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        $route->expectArguments('createConnection', array('POST', 15));
-        
-        $request = &new SimpleHttpRequest($route, new SimplePostEncoding());
-        $this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-    }
-    
-    function testContentHeadersCalculated() {
-        $socket = &new MockSimpleSocket();
-        $socket->expectArgumentsAt(0, 'write', array("Content-Length: 3\r\n"));
-        $socket->expectArgumentsAt(1, 'write', array("Content-Type: application/x-www-form-urlencoded\r\n"));
-        $socket->expectArgumentsAt(2, 'write', array("\r\n"));
-        $socket->expectArgumentsAt(3, 'write', array("a=A"));
-        
-        $route = &new MockSimpleRoute();
-        $route->setReturnReference('createConnection', $socket);
-        $route->expectArguments('createConnection', array('POST', 15));
-        
-        $request = &new SimpleHttpRequest(
-                $route,
-                new SimplePostEncoding(array('a' => 'A')));
-        $this->assertIsA($request->fetch(15), 'SimpleHttpResponse');
-    }
-}
-    
-class TestOfHttpHeaders extends UnitTestCase {
-    
-    function testParseBasicHeaders() {
-        $headers = new SimpleHttpHeaders(
-                "HTTP/1.1 200 OK\r\n" .
-                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
-                "Connection: close");
-        $this->assertIdentical($headers->getHttpVersion(), "1.1");
-        $this->assertIdentical($headers->getResponseCode(), 200);
-        $this->assertEqual($headers->getMimeType(), "text/plain");
-    }
-    
-    function testNonStandardResponseHeader() {
-        $headers = new SimpleHttpHeaders(
-                "HTTP/1.1 302 (HTTP-Version SP Status-Code CRLF)\r\n" .
-                "Connection: close");
-        $this->assertIdentical($headers->getResponseCode(), 302);
-    }
-    
-    function testCanParseMultipleCookies() {
-        $jar = &new MockSimpleCookieJar();
-        $jar->expectAt(0, 'setCookie', array('a', 'aaa', 'host', '/here/', 'Wed, 25 Dec 2002 04:24:20 GMT'));
-        $jar->expectAt(1, 'setCookie', array('b', 'bbb', 'host', '/', false));
-
-        $headers = new SimpleHttpHeaders(
-                "HTTP/1.1 200 OK\r\n" .
-                "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\n" .
-                "Set-Cookie: a=aaa; expires=Wed, 25-Dec-02 04:24:20 GMT; path=/here/\r\n" .
-                "Set-Cookie: b=bbb\r\n" .
-                "Connection: close");
-        $headers->writeCookiesToJar($jar, new SimpleUrl('http://host'));
-    }
-    
-    function testCanRecogniseRedirect() {
-        $headers = new SimpleHttpHeaders("HTTP/1.1 301 OK\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Content-Length: 0\r\n" .
-                "Location: http://www.somewhere-else.com/\r\n" .
-                "Connection: close");
-        $this->assertIdentical($headers->getResponseCode(), 301);
-        $this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
-        $this->assertTrue($headers->isRedirect());
-    }
-    
-    function testCanParseChallenge() {
-        $headers = new SimpleHttpHeaders("HTTP/1.1 401 Authorization required\r\n" .
-                "Content-Type: text/plain\r\n" .
-                "Connection: close\r\n" .
-                "WWW-Authenticate: Basic realm=\"Somewhere\"");
-        $this->assertEqual($headers->getAuthentication(), 'Basic');
-        $this->assertEqual($headers->getRealm(), 'Somewhere');
-        $this->assertTrue($headers->isChallenge());
-    }
-}
-
-class TestOfHttpResponse extends UnitTestCase {
-    
-    function testBadRequest() {
-        $socket = &new MockSimpleSocket();
-        $socket->setReturnValue('getSent', '');
-
-        $response = &new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-        $this->assertTrue($response->isError());
-        $this->assertPattern('/Nothing fetched/', $response->getError());
-        $this->assertIdentical($response->getContent(), false);
-        $this->assertIdentical($response->getSent(), '');
-    }
-    
-    function testBadSocketDuringResponse() {
-        $socket = &new MockSimpleSocket();
-        $socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
-        $socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
-        $socket->setReturnValue("read", "");
-        $socket->setReturnValue('getSent', 'HTTP/1.1 ...');
-
-        $response = &new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-        $this->assertTrue($response->isError());
-        $this->assertEqual($response->getContent(), '');
-        $this->assertEqual($response->getSent(), 'HTTP/1.1 ...');
-    }
-    
-    function testIncompleteHeader() {
-        $socket = &new MockSimpleSocket();
-        $socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\n");
-        $socket->setReturnValueAt(1, "read", "Date: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
-        $socket->setReturnValueAt(2, "read", "Content-Type: text/plain\r\n");
-        $socket->setReturnValue("read", "");
-        
-        $response = &new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-        $this->assertTrue($response->isError());
-        $this->assertEqual($response->getContent(), "");
-    }
-    
-    function testParseOfResponseHeadersWhenChunked() {
-        $socket = &new MockSimpleSocket();
-        $socket->setReturnValueAt(0, "read", "HTTP/1.1 200 OK\r\nDate: Mon, 18 Nov 2002 15:50:29 GMT\r\n");
-        $socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
-        $socket->setReturnValueAt(2, "read", "Server: Apache/1.3.24 (Win32) PHP/4.2.3\r\nConne");
-        $socket->setReturnValueAt(3, "read", "ction: close\r\n\r\nthis is a test file\n");
-        $socket->setReturnValueAt(4, "read", "with two lines in it\n");
-        $socket->setReturnValue("read", "");
-        
-        $response = &new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-        $this->assertFalse($response->isError());
-        $this->assertEqual(
-                $response->getContent(),
-                "this is a test file\nwith two lines in it\n");
-        $headers = $response->getHeaders();
-        $this->assertIdentical($headers->getHttpVersion(), "1.1");
-        $this->assertIdentical($headers->getResponseCode(), 200);
-        $this->assertEqual($headers->getMimeType(), "text/plain");
-        $this->assertFalse($headers->isRedirect());
-        $this->assertFalse($headers->getLocation());
-    }
-    
-    function testRedirect() {
-        $socket = &new MockSimpleSocket();
-        $socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
-        $socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
-        $socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com/\r\n");
-        $socket->setReturnValueAt(3, "read", "Connection: close\r\n");
-        $socket->setReturnValueAt(4, "read", "\r\n");
-        $socket->setReturnValue("read", "");
-        
-        $response = &new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-        $headers = $response->getHeaders();
-        $this->assertTrue($headers->isRedirect());
-        $this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com/");
-    }
-    
-    function testRedirectWithPort() {
-        $socket = &new MockSimpleSocket();
-        $socket->setReturnValueAt(0, "read", "HTTP/1.1 301 OK\r\n");
-        $socket->setReturnValueAt(1, "read", "Content-Type: text/plain\r\n");
-        $socket->setReturnValueAt(2, "read", "Location: http://www.somewhere-else.com:80/\r\n");
-        $socket->setReturnValueAt(3, "read", "Connection: close\r\n");
-        $socket->setReturnValueAt(4, "read", "\r\n");
-        $socket->setReturnValue("read", "");
-        
-        $response = &new SimpleHttpResponse($socket, new SimpleUrl('here'), new SimpleGetEncoding());
-        $headers = $response->getHeaders();
-        $this->assertTrue($headers->isRedirect());
-        $this->assertEqual($headers->getLocation(), "http://www.somewhere-else.com:80/");
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/interfaces_test.php b/tests/simpletest/test/interfaces_test.php
deleted file mode 100644
index b6980edb1..000000000
--- a/tests/simpletest/test/interfaces_test.php
+++ /dev/null
@@ -1,137 +0,0 @@
-<?php
-// $Id: interfaces_test.php 1699 2008-03-24 16:01:29Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-if (function_exists('spl_classes')) {
-    include(dirname(__FILE__) . '/support/spl_examples.php');
-}
-
-interface DummyInterface {
-    function aMethod();
-    function anotherMethod($a);
-    function &referenceMethod(&$a);
-}
-
-Mock::generate('DummyInterface');
-Mock::generatePartial('DummyInterface', 'PartialDummyInterface', array());
-
-class TestOfMockInterfaces extends UnitTestCase {
-
-    function testCanMockAnInterface() {
-        $mock = new MockDummyInterface();
-        $this->assertIsA($mock, 'SimpleMock');
-        $this->assertIsA($mock, 'MockDummyInterface');
-        $this->assertTrue(method_exists($mock, 'aMethod'));
-        $this->assertTrue(method_exists($mock, 'anotherMethod'));
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testMockedInterfaceExpectsParameters() {
-        $mock = new MockDummyInterface();
-        $mock->anotherMethod();
-        $this->assertError();
-    }
-
-    function testCannotPartiallyMockAnInterface() {
-        $this->assertFalse(class_exists('PartialDummyInterface'));
-    }
-}
-
-class TestOfSpl extends UnitTestCase {
-    
-    function skip() {
-        $this->skipUnless(function_exists('spl_classes'), 'No SPL module loaded');
-    }
-
-    function testCanMockAllSplClasses() {
-        if (! function_exists('spl_classes')) {
-            return;
-        }
-        foreach(spl_classes() as $class) {
-            if ($class == 'SplHeap') {
-                continue;
-            }
-            $mock_class = "Mock$class";
-            Mock::generate($class);
-            $this->assertIsA(new $mock_class(), $mock_class);
-        }
-    }
-
-    function testExtensionOfCommonSplClasses() {
-        Mock::generate('IteratorImplementation');
-        $this->assertIsA(
-                new IteratorImplementation(),
-                'IteratorImplementation');
-        Mock::generate('IteratorAggregateImplementation');
-        $this->assertIsA(
-                new IteratorAggregateImplementation(),
-                'IteratorAggregateImplementation');
-   }
-}
-
-class WithHint {
-    function hinted(DummyInterface $object) { }
-}
-
-class ImplementsDummy implements DummyInterface {
-    function aMethod() { }
-    function anotherMethod($a) { }
-    function &referenceMethod(&$a) { }
-    function extraMethod($a = false) { }
-}
-Mock::generate('ImplementsDummy');
-
-class TestOfImplementations extends UnitTestCase {
-
-    function testMockedInterfaceCanPassThroughTypeHint() {
-        $mock = new MockDummyInterface();
-        $hinter = new WithHint();
-        $hinter->hinted($mock);
-    }
-
-    function testImplementedInterfacesAreCarried() {
-        $mock = new MockImplementsDummy();
-        $hinter = new WithHint();
-        $hinter->hinted($mock);
-    }
-    
-    function testNoSpuriousWarningsWhenSkippingDefaultedParameter() {
-        $mock = new MockImplementsDummy();
-        $mock->extraMethod();
-    }
-}
-
-interface SampleClassWithConstruct {
-    function __construct($something);
-}
-
-class TestOfInterfaceMocksWithConstruct extends UnitTestCase {
-    function testBasicConstructOfAnInterface() {
-        Mock::generate('SampleClassWithConstruct');
-        $this->assertNoErrors();
-    }
-}
-
-interface SampleInterfaceWithHintInSignature {
-    function method(array $hinted);
-}
-
-class TestOfInterfaceMocksWithHintInSignature extends UnitTestCase {
-    function testBasicConstructOfAnInterfaceWithHintInSignature() {
-        Mock::generate('SampleInterfaceWithHintInSignature');
-        $this->assertNoErrors();
-        $mock = new MockSampleInterfaceWithHintInSignature();
-        $this->assertIsA($mock, 'SampleInterfaceWithHintInSignature');
-    }
-}
-
-interface SampleInterfaceWithClone {
-    function __clone();
-}
-
-class TestOfSampleInterfaceWithClone extends UnitTestCase {
-    function testCanMockWithoutErrors() {
-        Mock::generate('SampleInterfaceWithClone');
-        $this->assertNoErrors();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/live_test.php b/tests/simpletest/test/live_test.php
deleted file mode 100644
index b294030e1..000000000
--- a/tests/simpletest/test/live_test.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-// $Id: live_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../compatibility.php');
-
-if (SimpleTest::getDefaultProxy()) {
-    SimpleTest::ignore('LiveHttpTestCase');
-}
-
-class LiveHttpTestCase extends UnitTestCase {
-
-    function testBadSocket() {
-        $socket = &new SimpleSocket('bad_url', 111, 5);
-        $this->assertTrue($socket->isError());
-        $this->assertPattern(
-                '/Cannot open \\[bad_url:111\\] with \\[/',
-                $socket->getError());
-        $this->assertFalse($socket->isOpen());
-        $this->assertFalse($socket->write('A message'));
-    }
-    
-    function testSocketClosure() {
-        $socket = &new SimpleSocket('www.lastcraft.com', 80, 15, 8);
-        $this->assertTrue($socket->isOpen());
-        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
-        $socket->write("Host: www.lastcraft.com\r\n");
-        $socket->write("Connection: close\r\n\r\n");
-        $this->assertEqual($socket->read(), "HTTP/1.1");
-        $socket->close();
-        $this->assertIdentical($socket->read(), false);
-    }
-    
-    function testRecordOfSentCharacters() {
-        $socket = &new SimpleSocket('www.lastcraft.com', 80, 15);
-        $this->assertTrue($socket->write("GET /test/network_confirm.php HTTP/1.0\r\n"));
-        $socket->write("Host: www.lastcraft.com\r\n");
-        $socket->write("Connection: close\r\n\r\n");
-        $socket->close();
-        $this->assertEqual($socket->getSent(),
-                "GET /test/network_confirm.php HTTP/1.0\r\n" .
-                "Host: www.lastcraft.com\r\n" .
-                "Connection: close\r\n\r\n");
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/mock_objects_test.php b/tests/simpletest/test/mock_objects_test.php
deleted file mode 100644
index a208ff727..000000000
--- a/tests/simpletest/test/mock_objects_test.php
+++ /dev/null
@@ -1,994 +0,0 @@
-<?php
-// $Id: mock_objects_test.php 1700 2008-03-24 16:17:48Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../mock_objects.php');
-
-class TestOfAnythingExpectation extends UnitTestCase {
-
-    function testSimpleInteger() {
-        $expectation = new AnythingExpectation();
-        $this->assertTrue($expectation->test(33));
-        $this->assertTrue($expectation->test(false));
-        $this->assertTrue($expectation->test(null));
-    }
-}
-
-class TestOfParametersExpectation extends UnitTestCase {
-
-    function testEmptyMatch() {
-        $expectation = new ParametersExpectation(array());
-        $this->assertTrue($expectation->test(array()));
-        $this->assertFalse($expectation->test(array(33)));
-    }
-
-    function testSingleMatch() {
-        $expectation = new ParametersExpectation(array(0));
-        $this->assertFalse($expectation->test(array(1)));
-        $this->assertTrue($expectation->test(array(0)));
-    }
-
-    function testAnyMatch() {
-        $expectation = new ParametersExpectation(false);
-        $this->assertTrue($expectation->test(array()));
-        $this->assertTrue($expectation->test(array(1, 2)));
-    }
-
-    function testMissingParameter() {
-        $expectation = new ParametersExpectation(array(0));
-        $this->assertFalse($expectation->test(array()));
-    }
-
-    function testNullParameter() {
-        $expectation = new ParametersExpectation(array(null));
-        $this->assertTrue($expectation->test(array(null)));
-        $this->assertFalse($expectation->test(array()));
-    }
-
-    function testAnythingExpectations() {
-        $expectation = new ParametersExpectation(array(new AnythingExpectation()));
-        $this->assertFalse($expectation->test(array()));
-        $this->assertIdentical($expectation->test(array(null)), true);
-        $this->assertIdentical($expectation->test(array(13)), true);
-    }
-
-    function testOtherExpectations() {
-        $expectation = new ParametersExpectation(
-                array(new PatternExpectation('/hello/i')));
-        $this->assertFalse($expectation->test(array('Goodbye')));
-        $this->assertTrue($expectation->test(array('hello')));
-        $this->assertTrue($expectation->test(array('Hello')));
-    }
-
-    function testIdentityOnly() {
-        $expectation = new ParametersExpectation(array("0"));
-        $this->assertFalse($expectation->test(array(0)));
-        $this->assertTrue($expectation->test(array("0")));
-    }
-
-    function testLongList() {
-        $expectation = new ParametersExpectation(
-                array("0", 0, new AnythingExpectation(), false));
-        $this->assertTrue($expectation->test(array("0", 0, 37, false)));
-        $this->assertFalse($expectation->test(array("0", 0, 37, true)));
-        $this->assertFalse($expectation->test(array("0", 0, 37)));
-    }
-}
-
-class TestOfSimpleSignatureMap extends UnitTestCase {
-
-    function testEmpty() {
-        $map = new SimpleSignatureMap();
-        $this->assertFalse($map->isMatch("any", array()));
-        $this->assertNull($map->findFirstAction("any", array()));
-    }
-
-    function testExactReference() {
-        $map = new SimpleSignatureMap();
-        $ref = "Fred";
-        $map->add(array(0), $ref);
-        $this->assertEqual($map->findFirstAction(array(0)), "Fred");
-        $ref2 = &$map->findFirstAction(array(0));
-        $this->assertReference($ref2, $ref);
-    }
-    
-    function testDifferentCallSignaturesCanHaveDifferentReferences() {
-        $map = new SimpleSignatureMap();
-        $fred = 'Fred';
-        $jim = 'jim';
-        $map->add(array(0), $fred);
-        $map->add(array('0'), $jim);
-        $this->assertReference($fred, $map->findFirstAction(array(0)));
-        $this->assertReference($jim, $map->findFirstAction(array('0')));
-    }
-
-    function testWildcard() {
-        $fred = 'Fred';
-        $map = new SimpleSignatureMap();
-        $map->add(array(new AnythingExpectation(), 1, 3), $fred);
-        $this->assertTrue($map->isMatch(array(2, 1, 3)));
-        $this->assertReference($map->findFirstAction(array(2, 1, 3)), $fred);
-    }
-
-    function testAllWildcard() {
-        $fred = 'Fred';
-        $map = new SimpleSignatureMap();
-        $this->assertFalse($map->isMatch(array(2, 1, 3)));
-        $map->add('', $fred);
-        $this->assertTrue($map->isMatch(array(2, 1, 3)));
-        $this->assertReference($map->findFirstAction(array(2, 1, 3)), $fred);
-    }
-
-    function testOrdering() {
-        $map = new SimpleSignatureMap();
-        $map->add(array(1, 2), new SimpleByValue("1, 2"));
-        $map->add(array(1, 3), new SimpleByValue("1, 3"));
-        $map->add(array(1), new SimpleByValue("1"));
-        $map->add(array(1, 4), new SimpleByValue("1, 4"));
-        $map->add(array(new AnythingExpectation()), new SimpleByValue("Any"));
-        $map->add(array(2), new SimpleByValue("2"));
-        $map->add("", new SimpleByValue("Default"));
-        $map->add(array(), new SimpleByValue("None"));
-        $this->assertEqual($map->findFirstAction(array(1, 2)), new SimpleByValue("1, 2"));
-        $this->assertEqual($map->findFirstAction(array(1, 3)), new SimpleByValue("1, 3"));
-        $this->assertEqual($map->findFirstAction(array(1, 4)), new SimpleByValue("1, 4"));
-        $this->assertEqual($map->findFirstAction(array(1)), new SimpleByValue("1"));
-        $this->assertEqual($map->findFirstAction(array(2)), new SimpleByValue("Any"));
-        $this->assertEqual($map->findFirstAction(array(3)), new SimpleByValue("Any"));
-        $this->assertEqual($map->findFirstAction(array()), new SimpleByValue("Default"));
-    }
-}
-
-class TestOfCallSchedule extends UnitTestCase {
-    function testCanBeSetToAlwaysReturnTheSameReference() {
-        $a = 5;
-        $schedule = &new SimpleCallSchedule();
-        $schedule->register('aMethod', false, new SimpleByReference($a));
-        $this->assertReference($schedule->respond(0, 'aMethod', array()), $a);
-        $this->assertReference($schedule->respond(1, 'aMethod', array()), $a);
-    }
-
-    function testSpecificSignaturesOverrideTheAlwaysCase() {
-        $any = 'any';
-        $one = 'two';
-        $schedule = &new SimpleCallSchedule();
-        $schedule->register('aMethod', array(1), new SimpleByReference($one));
-        $schedule->register('aMethod', false, new SimpleByReference($any));
-        $this->assertReference($schedule->respond(0, 'aMethod', array(2)), $any);
-        $this->assertReference($schedule->respond(0, 'aMethod', array(1)), $one);
-    }
-    
-    function testReturnsCanBeSetOverTime() {
-        $one = 'one';
-        $two = 'two';
-        $schedule = &new SimpleCallSchedule();
-        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
-        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
-        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
-        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
-    }
-    
-    function testReturnsOverTimecanBeAlteredByTheArguments() {
-        $one = '1';
-        $two = '2';
-        $two_a = '2a';
-        $schedule = &new SimpleCallSchedule();
-        $schedule->registerAt(0, 'aMethod', false, new SimpleByReference($one));
-        $schedule->registerAt(1, 'aMethod', array('a'), new SimpleByReference($two_a));
-        $schedule->registerAt(1, 'aMethod', false, new SimpleByReference($two));
-        $this->assertReference($schedule->respond(0, 'aMethod', array()), $one);
-        $this->assertReference($schedule->respond(1, 'aMethod', array()), $two);
-        $this->assertReference($schedule->respond(1, 'aMethod', array('a')), $two_a);
-    }
-    
-    function testCanReturnByValue() {
-        $a = 5;
-        $schedule = &new SimpleCallSchedule();
-        $schedule->register('aMethod', false, new SimpleByValue($a));
-        $this->assertClone($schedule->respond(0, 'aMethod', array()), $a);
-    }
-    
-    function testCanThrowException() {
-        if (version_compare(phpversion(), '5', '>=')) {
-            $schedule = &new SimpleCallSchedule();
-            $schedule->register('aMethod', false, new SimpleThrower(new Exception('Ouch')));
-            $this->expectException(new Exception('Ouch'));
-            $schedule->respond(0, 'aMethod', array());
-        }
-    }
-    
-    function testCanEmitError() {
-        $schedule = &new SimpleCallSchedule();
-        $schedule->register('aMethod', false, new SimpleErrorThrower('Ouch', E_USER_WARNING));
-        $this->expectError('Ouch');
-        $schedule->respond(0, 'aMethod', array());
-    }
-}
-
-class Dummy {
-    function Dummy() {
-    }
-
-    function aMethod() {
-        return true;
-    }
-
-    function anotherMethod() {
-        return true;
-    }
-}
-Mock::generate('Dummy');
-Mock::generate('Dummy', 'AnotherMockDummy');
-Mock::generate('Dummy', 'MockDummyWithExtraMethods', array('extraMethod'));
-
-class TestOfMockGeneration extends UnitTestCase {
-
-    function testCloning() {
-        $mock = &new MockDummy();
-        $this->assertTrue(method_exists($mock, "aMethod"));
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testCloningWithExtraMethod() {
-        $mock = &new MockDummyWithExtraMethods();
-        $this->assertTrue(method_exists($mock, "extraMethod"));
-    }
-
-    function testCloningWithChosenClassName() {
-        $mock = &new AnotherMockDummy();
-        $this->assertTrue(method_exists($mock, "aMethod"));
-    }
-}
-
-class TestOfMockReturns extends UnitTestCase {
-
-    function testDefaultReturn() {
-        $mock = &new MockDummy();
-        $mock->setReturnValue("aMethod", "aaa");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-    }
-
-    function testParameteredReturn() {
-        $mock = &new MockDummy();
-        $mock->setReturnValue('aMethod', 'aaa', array(1, 2, 3));
-        $this->assertNull($mock->aMethod());
-        $this->assertIdentical($mock->aMethod(1, 2, 3), 'aaa');
-    }
-
-    function testReferenceReturned() {
-        $mock = &new MockDummy();
-        $object = new Dummy();
-        $mock->setReturnReference('aMethod', $object, array(1, 2, 3));
-        $this->assertReference($zref = &$mock->aMethod(1, 2, 3), $object);
-    }
-
-    function testPatternMatchReturn() {
-        $mock = &new MockDummy();
-        $mock->setReturnValue(
-                "aMethod",
-                "aaa",
-                array(new PatternExpectation('/hello/i')));
-        $this->assertIdentical($mock->aMethod('Hello'), "aaa");
-        $this->assertNull($mock->aMethod('Goodbye'));
-    }
-
-    function testMultipleMethods() {
-        $mock = &new MockDummy();
-        $mock->setReturnValue("aMethod", 100, array(1));
-        $mock->setReturnValue("aMethod", 200, array(2));
-        $mock->setReturnValue("anotherMethod", 10, array(1));
-        $mock->setReturnValue("anotherMethod", 20, array(2));
-        $this->assertIdentical($mock->aMethod(1), 100);
-        $this->assertIdentical($mock->anotherMethod(1), 10);
-        $this->assertIdentical($mock->aMethod(2), 200);
-        $this->assertIdentical($mock->anotherMethod(2), 20);
-    }
-
-    function testReturnSequence() {
-        $mock = &new MockDummy();
-        $mock->setReturnValueAt(0, "aMethod", "aaa");
-        $mock->setReturnValueAt(1, "aMethod", "bbb");
-        $mock->setReturnValueAt(3, "aMethod", "ddd");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-        $this->assertIdentical($mock->aMethod(), "bbb");
-        $this->assertNull($mock->aMethod());
-        $this->assertIdentical($mock->aMethod(), "ddd");
-    }
-
-    function testReturnReferenceSequence() {
-        $mock = &new MockDummy();
-        $object = new Dummy();
-        $mock->setReturnReferenceAt(1, "aMethod", $object);
-        $this->assertNull($mock->aMethod());
-        $this->assertReference($zref =& $mock->aMethod(), $object);
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testComplicatedReturnSequence() {
-        $mock = &new MockDummy();
-        $object = new Dummy();
-        $mock->setReturnValueAt(1, "aMethod", "aaa", array("a"));
-        $mock->setReturnValueAt(1, "aMethod", "bbb");
-        $mock->setReturnReferenceAt(2, "aMethod", $object, array('*', 2));
-        $mock->setReturnValueAt(2, "aMethod", "value", array('*', 3));
-        $mock->setReturnValue("aMethod", 3, array(3));
-        $this->assertNull($mock->aMethod());
-        $this->assertEqual($mock->aMethod("a"), "aaa");
-        $this->assertReference($zref =& $mock->aMethod(1, 2), $object);
-        $this->assertEqual($mock->aMethod(3), 3);
-        $this->assertNull($mock->aMethod());
-    }
-
-    function testMultipleMethodSequences() {
-        $mock = &new MockDummy();
-        $mock->setReturnValueAt(0, "aMethod", "aaa");
-        $mock->setReturnValueAt(1, "aMethod", "bbb");
-        $mock->setReturnValueAt(0, "anotherMethod", "ccc");
-        $mock->setReturnValueAt(1, "anotherMethod", "ddd");
-        $this->assertIdentical($mock->aMethod(), "aaa");
-        $this->assertIdentical($mock->anotherMethod(), "ccc");
-        $this->assertIdentical($mock->aMethod(), "bbb");
-        $this->assertIdentical($mock->anotherMethod(), "ddd");
-    }
-
-    function testSequenceFallback() {
-        $mock = &new MockDummy();
-        $mock->setReturnValueAt(0, "aMethod", "aaa", array('a'));
-        $mock->setReturnValueAt(1, "aMethod", "bbb", array('a'));
-        $mock->setReturnValue("aMethod", "AAA");
-        $this->assertIdentical($mock->aMethod('a'), "aaa");
-        $this->assertIdentical($mock->aMethod('b'), "AAA");
-    }
-
-    function testMethodInterference() {
-        $mock = &new MockDummy();
-        $mock->setReturnValueAt(0, "anotherMethod", "aaa");
-        $mock->setReturnValue("aMethod", "AAA");
-        $this->assertIdentical($mock->aMethod(), "AAA");
-        $this->assertIdentical($mock->anotherMethod(), "aaa");
-    }
-}
-
-class TestOfMockExpectationsThatPass extends UnitTestCase {
-
-    function testAnyArgument() {
-        $mock = &new MockDummy();
-        $mock->expect('aMethod', array('*'));
-        $mock->aMethod(1);
-        $mock->aMethod('hello');
-    }
-
-    function testAnyTwoArguments() {
-        $mock = &new MockDummy();
-        $mock->expect('aMethod', array('*', '*'));
-        $mock->aMethod(1, 2);
-    }
-
-    function testSpecificArgument() {
-        $mock = &new MockDummy();
-        $mock->expect('aMethod', array(1));
-        $mock->aMethod(1);
-    }
-
-    function testExpectation() {
-        $mock = &new MockDummy();
-        $mock->expect('aMethod', array(new IsAExpectation('Dummy')));
-        $mock->aMethod(new Dummy());
-    }
-
-    function testArgumentsInSequence() {
-        $mock = &new MockDummy();
-        $mock->expectAt(0, 'aMethod', array(1, 2));
-        $mock->expectAt(1, 'aMethod', array(3, 4));
-        $mock->aMethod(1, 2);
-        $mock->aMethod(3, 4);
-    }
-
-    function testAtLeastOnceSatisfiedByOneCall() {
-        $mock = &new MockDummy();
-        $mock->expectAtLeastOnce('aMethod');
-        $mock->aMethod();
-    }
-
-    function testAtLeastOnceSatisfiedByTwoCalls() {
-        $mock = &new MockDummy();
-        $mock->expectAtLeastOnce('aMethod');
-        $mock->aMethod();
-        $mock->aMethod();
-    }
-
-    function testOnceSatisfiedByOneCall() {
-        $mock = &new MockDummy();
-        $mock->expectOnce('aMethod');
-        $mock->aMethod();
-    }
-
-    function testMinimumCallsSatisfiedByEnoughCalls() {
-        $mock = &new MockDummy();
-        $mock->expectMinimumCallCount('aMethod', 1);
-        $mock->aMethod();
-    }
-
-    function testMinimumCallsSatisfiedByTooManyCalls() {
-        $mock = &new MockDummy();
-        $mock->expectMinimumCallCount('aMethod', 3);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->aMethod();
-    }
-
-    function testMaximumCallsSatisfiedByEnoughCalls() {
-        $mock = &new MockDummy();
-        $mock->expectMaximumCallCount('aMethod', 1);
-        $mock->aMethod();
-    }
-
-    function testMaximumCallsSatisfiedByNoCalls() {
-        $mock = &new MockDummy();
-        $mock->expectMaximumCallCount('aMethod', 1);
-    }
-}
-
-class MockWithInjectedTestCase extends SimpleMock {
-    function &_getCurrentTestCase() {
-        $context = &SimpleTest::getContext();
-        $test = &$context->getTest();
-        return $test->getMockedTest();
-    }
-}
-SimpleTest::setMockBaseClass('MockWithInjectedTestCase');
-Mock::generate('Dummy', 'MockDummyWithInjectedTestCase');
-SimpleTest::setMockBaseClass('SimpleMock');
-Mock::generate('SimpleTestCase');
-
-class LikeExpectation extends IdenticalExpectation {
-    function LikeExpectation($expectation) {
-        $expectation->_message = '';
-        $this->IdenticalExpectation($expectation);
-    }
-
-    function test($compare) {
-        $compare->_message = '';
-        return parent::test($compare);
-    }
-
-    function testMessage($compare) {
-        $compare->_message = '';
-        return parent::testMessage($compare);
-    }
-}
-
-class TestOfMockExpectations extends UnitTestCase {
-    var $test;
-
-    function setUp() {
-        $this->test = &new MockSimpleTestCase();
-    }
-
-    function &getMockedTest() {
-        return $this->test;
-    }
-
-    function testSettingExpectationOnNonMethodThrowsError() {
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectMaximumCallCount('aMissingMethod', 2);
-        $this->assertError();
-    }
-
-    function testMaxCallsDetectsOverrun() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MaximumCallCountExpectation('aMethod', 2)),
-                3));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectMaximumCallCount('aMethod', 2);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testTallyOnMaxCallsSendsPassOnUnderrun() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MaximumCallCountExpectation('aMethod', 2)),
-                2));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectMaximumCallCount("aMethod", 2);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testExpectNeverDetectsOverrun() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MaximumCallCountExpectation('aMethod', 0)),
-                1));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectNever('aMethod');
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testTallyOnExpectNeverStillSendsPassOnUnderrun() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MaximumCallCountExpectation('aMethod', 0)),
-                0));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectNever('aMethod');
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testMinCalls() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MinimumCallCountExpectation('aMethod', 2)),
-                2));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectMinimumCallCount('aMethod', 2);
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testFailedNever() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MaximumCallCountExpectation('aMethod', 0)),
-                1));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectNever('aMethod');
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testUnderOnce() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new CallCountExpectation('aMethod', 1)),
-                0));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectOnce('aMethod');
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testOverOnce() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new CallCountExpectation('aMethod', 1)),
-                2));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectOnce('aMethod');
-        $mock->aMethod();
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testUnderAtLeastOnce() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new MinimumCallCountExpectation('aMethod', 1)),
-                0));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectAtLeastOnce("aMethod");
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testZeroArguments() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new ParametersExpectation(array())),
-                array(),
-                '*'));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expect("aMethod", array());
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testExpectedArguments() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new ParametersExpectation(array(1, 2, 3))),
-                array(1, 2, 3),
-                '*'));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expect('aMethod', array(1, 2, 3));
-        $mock->aMethod(1, 2, 3);
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testFailedArguments() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new ParametersExpectation(array('this'))),
-                array('that'),
-                '*'));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expect('aMethod', array('this'));
-        $mock->aMethod('that');
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testWildcardsAreTranslatedToAnythingExpectations() {
-        $this->test->expectOnce('assert', array(
-                new LikeExpectation(new ParametersExpectation(array(
-                            new AnythingExpectation(), 123, new AnythingExpectation()))),
-                array(100, 123, 101),
-                '*'));
-        $mock = &new MockDummyWithInjectedTestCase($this);
-        $mock->expect("aMethod", array('*', 123, '*'));
-        $mock->aMethod(100, 123, 101);
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testSpecificPassingSequence() {
-        $this->test->expectAt(0, 'assert', array(
-                new LikeExpectation(new ParametersExpectation(array(1, 2, 3))),
-                array(1, 2, 3),
-                '*'));
-        $this->test->expectAt(1, 'assert', array(
-                new LikeExpectation(new ParametersExpectation(array('Hello'))),
-                array('Hello'),
-                '*'));
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expectAt(1, 'aMethod', array(1, 2, 3));
-        $mock->expectAt(2, 'aMethod', array('Hello'));
-        $mock->aMethod();
-        $mock->aMethod(1, 2, 3);
-        $mock->aMethod('Hello');
-        $mock->aMethod();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-    }
-
-    function testNonArrayForExpectedParametersGivesError() {
-        $mock = &new MockDummyWithInjectedTestCase();
-        $mock->expect("aMethod", "foo");
-        $this->assertErrorPattern('/\$args.*not an array/i');
-        $mock->aMethod();
-        $mock->tally();
-        $mock->_mock->atTestEnd('testSomething', $this->test);
-   }
-}
-
-class TestOfMockComparisons extends UnitTestCase {
-
-    function testEqualComparisonOfMocksDoesNotCrash() {
-        $expectation = &new EqualExpectation(new MockDummy());
-        $this->assertTrue($expectation->test(new MockDummy(), true));
-    }
-
-    function testIdenticalComparisonOfMocksDoesNotCrash() {
-        $expectation = &new IdenticalExpectation(new MockDummy());
-        $this->assertTrue($expectation->test(new MockDummy()));
-    }
-}
-
-class ClassWithSpecialMethods {
-    function __get($name) { }
-    function __set($name, $value) { }
-    function __isset($name) { }
-    function __unset($name) { }
-    function __call($method, $arguments) { }
-    function __toString() { }
-}
-Mock::generate('ClassWithSpecialMethods');
-
-class TestOfSpecialMethods extends UnitTestCase {
-    function skip() {
-        $this->skipIf(version_compare(phpversion(), '5', '<='), 'Overloading not tested unless PHP 5+');
-    }
-
-    function testCanMockTheThingAtAll() {
-        $mock = new MockClassWithSpecialMethods();
-    }
-
-    function testReturnFromSpecialAccessor() {
-        $mock = &new MockClassWithSpecialMethods();
-        $mock->setReturnValue('__get', '1st Return', array('first'));
-        $mock->setReturnValue('__get', '2nd Return', array('second'));
-        $this->assertEqual($mock->first, '1st Return');
-        $this->assertEqual($mock->second, '2nd Return');
-    }
-
-    function testcanExpectTheSettingOfValue() {
-        $mock = &new MockClassWithSpecialMethods();
-        $mock->expectOnce('__set', array('a', 'A'));
-        $mock->a = 'A';
-    }
-
-    function testCanSimulateAnOverloadmethod() {
-        $mock = &new MockClassWithSpecialMethods();
-        $mock->expectOnce('__call', array('amOverloaded', array('A')));
-        $mock->setReturnValue('__call', 'aaa');
-        $this->assertIdentical($mock->amOverloaded('A'), 'aaa');
-    }
-
-    function testCanEmulateIsset() {
-        $mock = &new MockClassWithSpecialMethods();
-        $mock->setReturnValue('__isset', true);
-        $this->assertIdentical(isset($mock->a), true);
-    }
-
-    function testCanExpectUnset() {
-        $mock = &new MockClassWithSpecialMethods();
-        $mock->expectOnce('__unset', array('a'));
-        unset($mock->a);
-    }
-
-    function testToStringMagic() {
-        $mock = &new MockClassWithSpecialMethods();
-        $mock->expectOnce('__toString');
-        $mock->setReturnValue('__toString', 'AAA');
-        ob_start();
-        print $mock;
-        $output = ob_get_contents();
-        ob_end_clean();
-        $this->assertEqual($output, 'AAA');
-    }
-}
-
-if (version_compare(phpversion(), '5', '>=')) {
-    $class  = 'class WithStaticMethod { ';
-    $class .= '    static function aStaticMethod() { } ';
-    $class .= '}';
-    eval($class);
-}
-Mock::generate('WithStaticMethod');
-
-class TestOfMockingClassesWithStaticMethods extends UnitTestCase {
-    function skip() {
-        $this->skipUnless(version_compare(phpversion(), '5', '>='), 'Static methods not tested unless PHP 5+');
-    }
-    
-    function testStaticMethodIsMockedAsStatic() {
-        $mock = new WithStaticMethod();
-        $reflection = new ReflectionClass($mock);
-        $method = $reflection->getMethod('aStaticMethod');
-        $this->assertTrue($method->isStatic());
-    }
-}
-
-if (version_compare(phpversion(), '5', '>=')) {
-    class MockTestException extends Exception { }
-}
-
-class TestOfThrowingExceptionsFromMocks extends UnitTestCase {
-    function skip() {
-        $this->skipUnless(version_compare(phpversion(), '5', '>='), 'Exception throwing not tested unless PHP 5+');
-    }
-
-    function testCanThrowOnMethodCall() {
-        $mock = new MockDummy();
-        $mock->throwOn('aMethod');
-        $this->expectException();
-        $mock->aMethod();
-    }
-
-    function testCanThrowSpecificExceptionOnMethodCall() {
-        $mock = new MockDummy();
-        $mock->throwOn('aMethod', new MockTestException());
-        $this->expectException();
-        $mock->aMethod();
-    }
-    
-    function testThrowsOnlyWhenCallSignatureMatches() {
-        $mock = new MockDummy();
-        $mock->throwOn('aMethod', new MockTestException(), array(3));
-        $mock->aMethod(1);
-        $mock->aMethod(2);
-        $this->expectException();
-        $mock->aMethod(3);
-    }
-    
-    function testCanThrowOnParticularInvocation() {
-        $mock = new MockDummy();
-        $mock->throwAt(2, 'aMethod', new MockTestException());
-        $mock->aMethod();
-        $mock->aMethod();
-        $this->expectException();
-        $mock->aMethod();
-    }
-}
-
-class TestOfThrowingErrorsFromMocks extends UnitTestCase {
-    
-    function testCanGenerateErrorFromMethodCall() {
-        $mock = new MockDummy();
-        $mock->errorOn('aMethod', 'Ouch!');
-        $this->expectError('Ouch!');
-        $mock->aMethod();
-    }
-    
-    function testGeneratesErrorOnlyWhenCallSignatureMatches() {
-        $mock = new MockDummy();
-        $mock->errorOn('aMethod', 'Ouch!', array(3));
-        $mock->aMethod(1);
-        $mock->aMethod(2);
-        $this->expectError();
-        $mock->aMethod(3);
-    }
-    
-    function testCanGenerateErrorOnParticularInvocation() {
-        $mock = new MockDummy();
-        $mock->errorAt(2, 'aMethod', 'Ouch!');
-        $mock->aMethod();
-        $mock->aMethod();
-        $this->expectError();
-        $mock->aMethod();
-    }
-}
-
-Mock::generatePartial('Dummy', 'TestDummy', array('anotherMethod'));
-
-class TestOfPartialMocks extends UnitTestCase {
-
-    function testMethodReplacementWithNoBehaviourReturnsNull() {
-        $mock = &new TestDummy();
-        $this->assertEqual($mock->aMethod(99), 99);
-        $this->assertNull($mock->anotherMethod());
-    }
-
-    function testSettingReturns() {
-        $mock = &new TestDummy();
-        $mock->setReturnValue('anotherMethod', 33, array(3));
-        $mock->setReturnValue('anotherMethod', 22);
-        $mock->setReturnValueAt(2, 'anotherMethod', 44, array(3));
-        $this->assertEqual($mock->anotherMethod(), 22);
-        $this->assertEqual($mock->anotherMethod(3), 33);
-        $this->assertEqual($mock->anotherMethod(3), 44);
-    }
-
-    function testReferences() {
-        $mock = &new TestDummy();
-        $object = new Dummy();
-        $mock->setReturnReferenceAt(0, 'anotherMethod', $object, array(3));
-        $this->assertReference($zref =& $mock->anotherMethod(3), $object);
-    }
-
-    function testExpectations() {
-        $mock = &new TestDummy();
-        $mock->expectCallCount('anotherMethod', 2);
-        $mock->expect('anotherMethod', array(77));
-        $mock->expectAt(1, 'anotherMethod', array(66));
-        $mock->anotherMethod(77);
-        $mock->anotherMethod(66);
-    }
-
-    function testSettingExpectationOnMissingMethodThrowsError() {
-        $mock = &new TestDummy();
-        $mock->expectCallCount('aMissingMethod', 2);
-        $this->assertError();
-    }
-}
-
-class ConstructorSuperClass {
-    function ConstructorSuperClass() { }
-}
-
-class ConstructorSubClass extends ConstructorSuperClass {
-}
-
-class TestOfPHP4StyleSuperClassConstruct extends UnitTestCase {
-    /*
-     * This addresses issue #1231401.  Without the fix in place, this will
-     * generate a fatal PHP error.
-     */
-    function testBasicConstruct() {
-        Mock::generate('ConstructorSubClass');
-        $mock = &new MockConstructorSubClass();
-        $this->assertIsA($mock, 'ConstructorSubClass');
-        $this->assertTrue(method_exists($mock, 'ConstructorSuperClass'));
-    }
-}
-
-class TestOfPHP5StaticMethodMocking extends UnitTestCase {
-    function skip() {
-        $this->skipIf(version_compare(phpversion(), '5', '<='), 'Static methods not tested unless PHP 5+');
-    }
-
-    function testCanCreateAMockObjectWithStaticMethodsWithoutError() {
-        eval('
-            class SimpleObjectContainingStaticMethod {
-                static function someStatic() { }
-            }
-        ');
-
-        Mock::generate('SimpleObjectContainingStaticMethod');
-        $this->assertNoErrors();
-    }
-}
-
-class TestOfPHP5AbstractMethodMocking extends UnitTestCase {
-    function skip() {
-        $this->skipIf(version_compare(phpversion(), '5', '<='), 'Abstract class/methods not tested unless PHP 5+');
-    }
-
-    function testCanCreateAMockObjectFromAnAbstractWithProperFunctionDeclarations() {
-        eval('
-             abstract class SimpleAbstractClassContainingAbstractMethods {
-                abstract function anAbstract();
-                abstract function anAbstractWithParameter($foo);
-                abstract function anAbstractWithMultipleParameters($foo, $bar);
-            }
-        ');
-
-        Mock::generate('SimpleAbstractClassContainingAbstractMethods');
-        $this->assertNoErrors();
-
-        $this->assertTrue(
-            method_exists(
-                'MockSimpleAbstractClassContainingAbstractMethods',
-                'anAbstract'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                'MockSimpleAbstractClassContainingAbstractMethods',
-                'anAbstractWithParameter'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                'MockSimpleAbstractClassContainingAbstractMethods',
-                'anAbstractWithMultipleParameters'
-            )
-        );
-    }
-
-    function testMethodsDefinedAsAbstractInParentShouldHaveFullSignature() {
-        eval('
-             abstract class SimpleParentAbstractClassContainingAbstractMethods {
-                abstract function anAbstract();
-                abstract function anAbstractWithParameter($foo);
-                abstract function anAbstractWithMultipleParameters($foo, $bar);
-            }
-
-             class SimpleChildAbstractClassContainingAbstractMethods extends SimpleParentAbstractClassContainingAbstractMethods {
-                function anAbstract(){}
-                function anAbstractWithParameter($foo){}
-                function anAbstractWithMultipleParameters($foo, $bar){}
-            }
-
-            class EvenDeeperEmptyChildClass extends SimpleChildAbstractClassContainingAbstractMethods {}
-        ');
-
-        Mock::generate('SimpleChildAbstractClassContainingAbstractMethods');
-        $this->assertNoErrors();
-
-        $this->assertTrue(
-            method_exists(
-                'MockSimpleChildAbstractClassContainingAbstractMethods',
-                'anAbstract'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                'MockSimpleChildAbstractClassContainingAbstractMethods',
-                'anAbstractWithParameter'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                'MockSimpleChildAbstractClassContainingAbstractMethods',
-                'anAbstractWithMultipleParameters'
-            )
-        );
-        
-        Mock::generate('EvenDeeperEmptyChildClass');
-        $this->assertNoErrors();
-
-        $this->assertTrue(
-            method_exists(
-                'MockEvenDeeperEmptyChildClass',
-                'anAbstract'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                'MockEvenDeeperEmptyChildClass',
-                'anAbstractWithParameter'
-            )
-        );
-        $this->assertTrue(
-            method_exists(
-                'MockEvenDeeperEmptyChildClass',
-                'anAbstractWithMultipleParameters'
-            )
-        );
-    }
-}
-
-?>
diff --git a/tests/simpletest/test/page_test.php b/tests/simpletest/test/page_test.php
deleted file mode 100644
index 76e6a515b..000000000
--- a/tests/simpletest/test/page_test.php
+++ /dev/null
@@ -1,903 +0,0 @@
-<?php
-// $Id: page_test.php 1559 2007-07-16 18:13:24Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../expectation.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../page.php');
-require_once(dirname(__FILE__) . '/../parser.php');
-Mock::generate('SimpleHtmlSaxParser');
-Mock::generate('SimplePage');
-Mock::generate('SimpleHttpResponse');
-Mock::generate('SimpleHttpHeaders');
-Mock::generate('SimplePageBuilder');
-Mock::generatePartial(
-        'SimplePageBuilder',
-        'PartialSimplePageBuilder',
-        array('_createPage', '_createParser'));
-
-class TestOfPageBuilder extends UnitTestCase {
-
-    function testLink() {
-        $tag = &new SimpleAnchorTag(array('href' => 'http://somewhere'));
-        $tag->addContent('Label');
-
-        $page = &new MockSimplePage();
-        $page->expectArguments('acceptTag', array($tag));
-        $page->expectCallCount('acceptTag', 1);
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', new MockSimpleHtmlSaxParser());
-        $builder->SimplePageBuilder();
-
-        $builder->parse(new MockSimpleHttpResponse());
-        $this->assertTrue($builder->startElement(
-                'a',
-                array('href' => 'http://somewhere')));
-        $this->assertTrue($builder->addContent('Label'));
-        $this->assertTrue($builder->endElement('a'));
-    }
-
-    function testLinkWithId() {
-        $tag = &new SimpleAnchorTag(array("href" => "http://somewhere", "id" => "44"));
-        $tag->addContent("Label");
-
-        $page = &new MockSimplePage();
-        $page->expectArguments("acceptTag", array($tag));
-        $page->expectCallCount("acceptTag", 1);
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', new MockSimpleHtmlSaxParser());
-        $builder->SimplePageBuilder();
-
-        $builder->parse(new MockSimpleHttpResponse());
-        $this->assertTrue($builder->startElement(
-                "a",
-                array("href" => "http://somewhere", "id" => "44")));
-        $this->assertTrue($builder->addContent("Label"));
-        $this->assertTrue($builder->endElement("a"));
-    }
-
-    function testLinkExtraction() {
-        $tag = &new SimpleAnchorTag(array("href" => "http://somewhere"));
-        $tag->addContent("Label");
-
-        $page = &new MockSimplePage();
-        $page->expectArguments("acceptTag", array($tag));
-        $page->expectCallCount("acceptTag", 1);
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', new MockSimpleHtmlSaxParser());
-        $builder->SimplePageBuilder();
-
-        $builder->parse(new MockSimpleHttpResponse());
-        $this->assertTrue($builder->addContent("Starting stuff"));
-        $this->assertTrue($builder->startElement(
-                "a",
-                array("href" => "http://somewhere")));
-        $this->assertTrue($builder->addContent("Label"));
-        $this->assertTrue($builder->endElement("a"));
-        $this->assertTrue($builder->addContent("Trailing stuff"));
-    }
-
-    function testMultipleLinks() {
-        $a1 = new SimpleAnchorTag(array("href" => "http://somewhere"));
-        $a1->addContent("1");
-
-        $a2 = new SimpleAnchorTag(array("href" => "http://elsewhere"));
-        $a2->addContent("2");
-
-        $page = &new MockSimplePage();
-        $page->expectArgumentsAt(0, "acceptTag", array($a1));
-        $page->expectArgumentsAt(1, "acceptTag", array($a2));
-        $page->expectCallCount("acceptTag", 2);
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', new MockSimpleHtmlSaxParser());
-        $builder->SimplePageBuilder();
-
-        $builder->parse(new MockSimpleHttpResponse());
-        $builder->startElement("a", array("href" => "http://somewhere"));
-        $builder->addContent("1");
-        $builder->endElement("a");
-        $builder->addContent("Padding");
-        $builder->startElement("a", array("href" => "http://elsewhere"));
-        $builder->addContent("2");
-        $builder->endElement("a");
-    }
-
-    function testTitle() {
-        $tag = &new SimpleTitleTag(array());
-        $tag->addContent("HereThere");
-
-        $page = &new MockSimplePage();
-        $page->expectArguments("acceptTag", array($tag));
-        $page->expectCallCount("acceptTag", 1);
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', new MockSimpleHtmlSaxParser());
-        $builder->SimplePageBuilder();
-
-        $builder->parse(new MockSimpleHttpResponse());
-        $builder->startElement("title", array());
-        $builder->addContent("Here");
-        $builder->addContent("There");
-        $builder->endElement("title");
-    }
-
-    function testForm() {
-        $page = &new MockSimplePage();
-        $page->expectOnce("acceptFormStart", array(new SimpleFormTag(array())));
-        $page->expectOnce("acceptFormEnd", array());
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', new MockSimpleHtmlSaxParser());
-        $builder->SimplePageBuilder();
-
-        $builder->parse(new MockSimpleHttpResponse());
-        $builder->startElement("form", array());
-        $builder->addContent("Stuff");
-        $builder->endElement("form");
-    }
-}
-
-class TestOfPageParsing extends UnitTestCase {
-
-    function testParseMechanics() {
-        $parser = &new MockSimpleHtmlSaxParser();
-        $parser->expectOnce('parse', array('stuff'));
-
-        $page = &new MockSimplePage();
-        $page->expectOnce('acceptPageEnd');
-
-        $builder = &new PartialSimplePageBuilder();
-        $builder->setReturnReference('_createPage', $page);
-        $builder->setReturnReference('_createParser', $parser);
-        $builder->SimplePageBuilder();
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', 'stuff');
-        $builder->parse($response);
-    }
-}
-
-class TestOfPageInterface extends UnitTestCase {
-
-    function testInterfaceOnEmptyPage() {
-        $page = &new SimplePage();
-        $this->assertEqual($page->getTransportError(), 'No page fetched yet');
-        $this->assertIdentical($page->getRaw(), false);
-        $this->assertIdentical($page->getHeaders(), false);
-        $this->assertIdentical($page->getMimeType(), false);
-        $this->assertIdentical($page->getResponseCode(), false);
-        $this->assertIdentical($page->getAuthentication(), false);
-        $this->assertIdentical($page->getRealm(), false);
-        $this->assertFalse($page->hasFrames());
-        $this->assertIdentical($page->getUrls(), array());
-        $this->assertIdentical($page->getTitle(), false);
-    }
-}
-
-class TestOfPageHeaders extends UnitTestCase {
-
-    function testUrlAccessor() {
-        $headers = &new MockSimpleHttpHeaders();
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-        $response->setReturnValue('getMethod', 'POST');
-        $response->setReturnValue('getUrl', new SimpleUrl('here'));
-        $response->setReturnValue('getRequestData', array('a' => 'A'));
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getMethod(), 'POST');
-        $this->assertEqual($page->getUrl(), new SimpleUrl('here'));
-        $this->assertEqual($page->getRequestData(), array('a' => 'A'));
-    }
-
-    function testTransportError() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getError', 'Ouch');
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getTransportError(), 'Ouch');
-    }
-
-    function testHeadersAccessor() {
-        $headers = &new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getRaw', 'My: Headers');
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getHeaders(), 'My: Headers');
-    }
-
-    function testMimeAccessor() {
-        $headers = &new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getMimeType', 'text/html');
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getMimeType(), 'text/html');
-    }
-
-    function testResponseAccessor() {
-        $headers = &new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getResponseCode', 301);
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = &new SimplePage($response);
-        $this->assertIdentical($page->getResponseCode(), 301);
-    }
-
-    function testAuthenticationAccessors() {
-        $headers = &new MockSimpleHttpHeaders();
-        $headers->setReturnValue('getAuthentication', 'Basic');
-        $headers->setReturnValue('getRealm', 'Secret stuff');
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getHeaders', $headers);
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getAuthentication(), 'Basic');
-        $this->assertEqual($page->getRealm(), 'Secret stuff');
-    }
-}
-
-class TestOfHtmlPage extends UnitTestCase {
-
-    function testRawAccessor() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', 'Raw HTML');
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getRaw(), 'Raw HTML');
-    }
-
-    function testTextAccessor() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', '<b>Some</b> &quot;messy&quot; HTML');
-
-        $page = &new SimplePage($response);
-        $this->assertEqual($page->getText(), 'Some "messy" HTML');
-    }
-
-    function testNoLinks() {
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $this->assertIdentical($page->getUrls(), array());
-        $this->assertIdentical($page->getUrlsByLabel('Label'), array());
-    }
-
-    function testAddAbsoluteLink() {
-        $link = &new SimpleAnchorTag(array('href' => 'http://somewhere.com'));
-        $link->addContent('Label');
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $page->AcceptTag($link);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://somewhere.com')));
-    }
-
-    function testAddStrictRelativeLink() {
-        $link = &new SimpleAnchorTag(array('href' => './somewhere.php'));
-        $link->addContent('Label');
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-        $page = &new SimplePage($response);
-        $page->AcceptTag($link);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testAddBareRelativeLink() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-        $page = &new SimplePage($response);
-        $page->AcceptTag(new SimpleAnchorTag(array('href' => 'somewhere.php')));
-        $this->assertIdentical($page->getUrls(), array('http://host/somewhere.php'));
-    }
-
-    function testAddRelativeLinkWithBaseTag() {
-        $link = &new SimpleAnchorTag(array('href' => 'somewhere.php'));
-        $link->addContent('Label');
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-        $page = &new SimplePage($response);
-        $page->AcceptTag($link);        
-        $base = &new SimpleBaseTag(array('href' => 'www.lastcraft.com/stuff/'));
-        $page->AcceptTag($base);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('www.lastcraft.com/stuff/somewhere.php')));
-    }
-
-    function testAddAbsoluteLinkWithBaseTag() {
-        $link = &new SimpleAnchorTag(array('href' => 'http://here.com/somewhere.php'));
-        $link->addContent('Label');
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-        $page = &new SimplePage($response);
-        $page->AcceptTag($link);        
-        $base = &new SimpleBaseTag(array('href' => 'www.lastcraft.com/stuff/'));
-        $page->AcceptTag($base);
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://here.com/somewhere.php')));
-    }
-
-    function testLinkIds() {
-        $link = &new SimpleAnchorTag(array('href' => './somewhere.php', 'id' => 33));
-        $link->addContent('Label');
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &new SimplePage($response);
-        $page->AcceptTag($link);
-
-        $this->assertEqual(
-                $page->getUrlsByLabel('Label'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-        $this->assertFalse($page->getUrlById(0));
-        $this->assertEqual(
-                $page->getUrlById(33),
-                new SimpleUrl('http://host/somewhere.php'));
-    }
-
-    function testFindLinkWithNormalisation() {
-        $link = &new SimpleAnchorTag(array('href' => './somewhere.php', 'id' => 33));
-        $link->addContent(' <em>Long &amp; thin</em> ');
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &new SimplePage($response);
-        $page->AcceptTag($link);
-
-        $this->assertEqual(
-                $page->getUrlsByLabel('Long & thin'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testFindLinkWithImage() {
-        $link = &new SimpleAnchorTag(array('href' => './somewhere.php', 'id' => 33));
-        $link->addContent('<img src="pic.jpg" alt="&lt;A picture&gt;">');
-
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &new SimplePage($response);
-        $page->AcceptTag($link);
-
-        $this->assertEqual(
-                $page->getUrlsByLabel('<A picture>'),
-                array(new SimpleUrl('http://host/somewhere.php')));
-    }
-
-    function testTitleSetting() {
-        $title = &new SimpleTitleTag(array());
-        $title->addContent('Title');
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $page->AcceptTag($title);
-        $this->assertEqual($page->getTitle(), 'Title');
-    }
-
-    function testFramesetAbsence() {
-        $url = new SimpleUrl('here');
-        $response = new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', $url);
-        $page = &new SimplePage($response);
-        $this->assertFalse($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), false);
-    }
-
-    function testHasEmptyFrameset() {
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $page->acceptFramesetStart(new SimpleTag('frameset', array()));
-        $page->acceptFramesetEnd();
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array());
-    }
-
-    function testFramesInPage() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://here'));
-
-        $page = &new SimplePage($response);
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '1.html')));
-        $page->acceptFramesetStart(new SimpleTag('frameset', array()));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '2.html')));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '3.html')));
-        $page->acceptFramesetEnd();
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '4.html')));
-
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array(
-                1 => new SimpleUrl('http://here/2.html'),
-                2 => new SimpleUrl('http://here/3.html')));
-    }
-
-    function testNamedFramesInPage() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://here'));
-
-        $page = &new SimplePage($response);
-        $page->acceptFramesetStart(new SimpleTag('frameset', array()));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '1.html')));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '2.html', 'name' => 'A')));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '3.html', 'name' => 'B')));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '4.html')));
-        $page->acceptFramesetEnd();
-
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array(
-                1 => new SimpleUrl('http://here/1.html'),
-                'A' => new SimpleUrl('http://here/2.html'),
-                'B' => new SimpleUrl('http://here/3.html'),
-                4 => new SimpleUrl('http://here/4.html')));
-    }
-    
-    function testRelativeFramesRespectBaseTag() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getUrl', new SimpleUrl('http://here.com/'));
-        $page = &new SimplePage($response);
-
-        $base = &new SimpleBaseTag(array('href' => 'https://there.com/stuff/'));
-        $page->AcceptTag($base);
-
-        $page->acceptFramesetStart(new SimpleTag('frameset', array()));
-        $page->acceptFrame(new SimpleFrameTag(array('src' => '1.html')));
-        $page->acceptFramesetEnd();
-        $this->assertIdentical(
-                $page->getFrameset(),
-                array(1 => new SimpleUrl('https://there.com/stuff/1.html')));
-    }
-}
-
-class TestOfFormsCreatedFromEventStream extends UnitTestCase {
-
-    function testFormCanBeSubmitted() {
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $page->acceptFormStart(
-                new SimpleFormTag(array('method' => 'GET', 'action' => 'here.php')));
-        $page->AcceptTag(
-                new SimpleSubmitTag(array('type' => 'submit', 'name' => 's')));
-        $page->acceptFormEnd();
-        $form = &$page->getFormBySubmit(new SimpleByLabel('Submit'));
-        $this->assertEqual(
-                $form->submitButton(new SimpleByLabel('Submit')),
-                new SimpleGetEncoding(array('s' => 'Submit')));
-    }
-
-    function testInputFieldCanBeReadBack() {
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $page->acceptFormStart(
-                new SimpleFormTag(array("method" => "GET", "action" => "here.php")));
-        $page->AcceptTag(
-                new SimpleTextTag(array("type" => "text", "name" => "a", "value" => "A")));
-        $page->AcceptTag(
-                new SimpleSubmitTag(array("type" => "submit", "name" => "s")));
-        $page->acceptFormEnd();
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
-    }
-
-    function testInputFieldCanBeReadBackByLabel() {
-        $label = &new SimpleLabelTag(array());
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $page->acceptFormStart(
-                new SimpleFormTag(array("method" => "GET", "action" => "here.php")));
-        $page->acceptLabelStart($label);
-        $label->addContent('l');
-        $page->AcceptTag(
-                new SimpleTextTag(array("type" => "text", "name" => "a", "value" => "A")));
-        $page->acceptLabelEnd();
-        $page->AcceptTag(
-                new SimpleSubmitTag(array("type" => "submit", "name" => "s")));
-        $page->acceptFormEnd();
-        $this->assertEqual($page->getField(new SimpleByLabel('l')), 'A');
-    }
-}
-
-class TestOfPageScraping extends UnitTestCase {
-
-    function &parse($response) {
-        $builder = &new SimplePageBuilder();
-        $page = &$builder->parse($response);
-        return $page;
-    }
-
-    function testEmptyPage() {
-        $page = &new SimplePage(new MockSimpleHttpResponse());
-        $this->assertIdentical($page->getUrls(), array());
-        $this->assertIdentical($page->getTitle(), false);
-    }
-
-    function testUninterestingPage() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', '<html><body><p>Stuff</p></body></html>');
-        $page = &$this->parse($response);
-        $this->assertIdentical($page->getUrls(), array());
-    }
-
-    function testLinksPage() {
-        $raw = '<html>';
-        $raw .= '<a href="there.html">There</a>';
-        $raw .= '<a href="http://there.com/that.html" id="0">That page</a>';
-        $raw .= '</html>';
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', $raw);
-        $response->setReturnValue('getUrl', new SimpleUrl('http://www.here.com/a/index.html'));
-
-        $page = &$this->parse($response);
-        $this->assertIdentical(
-                $page->getUrls(),
-                array('http://www.here.com/a/there.html', 'http://there.com/that.html'));
-        $this->assertIdentical(
-                $page->getUrlsByLabel('There'),
-                array(new SimpleUrl('http://www.here.com/a/there.html')));
-        $this->assertEqual(
-                $page->getUrlById('0'),
-                new SimpleUrl('http://there.com/that.html'));
-    }
-
-    function testTitle() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', '<html><head><title>Me</title></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getTitle(), 'Me');
-    }
-
-    function testNastyTitle() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><head><Title> <b>Me&amp;Me </TITLE></b></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getTitle(), "Me&Me");
-    }
-
-    function testCompleteForm() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<input type="text" name="here" value="Hello">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
-    }
-
-    function testUnclosedForm() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<input type="text" name="here" value="Hello">' .
-                '</head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByName('here')), "Hello");
-    }
-
-    function testEmptyFrameset() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><frameset></frameset></html>');
-        $page = &$this->parse($response);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array());
-    }
-
-    function testSingleFrame() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><frameset><frame src="a.html"></frameset></html>');
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &$this->parse($response);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical(
-                $page->getFrameset(),
-                array(1 => new SimpleUrl('http://host/a.html')));
-    }
-
-    function testSingleFrameInNestedFrameset() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><frameset><frameset>' .
-                '<frame src="a.html">' .
-                '</frameset></frameset></html>');
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &$this->parse($response);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical(
-                $page->getFrameset(),
-                array(1 => new SimpleUrl('http://host/a.html')));
-    }
-
-    function testFrameWithNoSource() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><frameset><frame></frameset></html>');
-        $page = &$this->parse($response);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array());
-    }
-
-    function testFramesCollectedWithNestedFramesetTags() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><frameset>' .
-                '<frame src="a.html">' .
-                '<frameset><frame src="b.html"></frameset>' .
-                '<frame src="c.html">' .
-                '</frameset></html>');
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &$this->parse($response);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array(
-                1 => new SimpleUrl('http://host/a.html'),
-                2 => new SimpleUrl('http://host/b.html'),
-                3 => new SimpleUrl('http://host/c.html')));
-    }
-
-    function testNamedFrames() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><frameset>' .
-                '<frame src="a.html">' .
-                '<frame name="_one" src="b.html">' .
-                '<frame src="c.html">' .
-                '<frame src="d.html" name="_two">' .
-                '</frameset></html>');
-        $response->setReturnValue('getUrl', new SimpleUrl('http://host/'));
-
-        $page = &$this->parse($response);
-        $this->assertTrue($page->hasFrames());
-        $this->assertIdentical($page->getFrameset(), array(
-                1 => new SimpleUrl('http://host/a.html'),
-                '_one' => new SimpleUrl('http://host/b.html'),
-                3 => new SimpleUrl('http://host/c.html'),
-                '_two' => new SimpleUrl('http://host/d.html')));
-    }
-
-    function testFindFormByLabel() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><head><form><input type="submit"></form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('submit')));
-        $this->assertNull($page->getFormBySubmit(new SimpleByName('submit')));
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByLabel('Submit')),
-                'SimpleForm');
-    }
-
-    function testConfirmSubmitAttributesAreCaseSensitive() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><head><FORM><INPUT TYPE="SUBMIT" NAME="S" VALUE="S"></FORM></head></html>');
-        $page = &$this->parse($response);
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByName('S')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByLabel('S')),
-                'SimpleForm');
-    }
-
-    function testFindFormByImage() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<input type="image" id=100 alt="Label" name="me">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertIsA(
-                $page->getFormByImage(new SimpleByLabel('Label')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormByImage(new SimpleByName('me')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormByImage(new SimpleById(100)),
-                'SimpleForm');
-    }
-
-    function testFindFormByButtonTag() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<button type="submit" name="b" value="B">BBB</button>' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('b')));
-        $this->assertNull($page->getFormBySubmit(new SimpleByLabel('B')));
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByName('b')),
-                'SimpleForm');
-        $this->assertIsA(
-                $page->getFormBySubmit(new SimpleByLabel('BBB')),
-                'SimpleForm');
-    }
-
-    function testFindFormById() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue(
-                'getContent',
-                '<html><head><form id="55"><input type="submit"></form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertNull($page->getFormById(54));
-        $this->assertIsA($page->getFormById(55), 'SimpleForm');
-    }
-
-    function testReadingTextField() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<input type="text" name="a">' .
-                '<input type="text" name="b" value="bbb" id=3>' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertNull($page->getField(new SimpleByName('missing')));
-        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
-        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
-    }
-
-    function testReadingTextFieldIsCaseInsensitive() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><FORM>' .
-                '<INPUT TYPE="TEXT" NAME="a">' .
-                '<INPUT TYPE="TEXT" NAME="b" VALUE="bbb" id=3>' .
-                '</FORM></head></html>');
-        $page = &$this->parse($response);
-        $this->assertNull($page->getField(new SimpleByName('missing')));
-        $this->assertIdentical($page->getField(new SimpleByName('a')), '');
-        $this->assertIdentical($page->getField(new SimpleByName('b')), 'bbb');
-    }
-
-    function testSettingTextField() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<input type="text" name="a">' .
-                '<input type="text" name="b" id=3>' .
-                '<input type="submit">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
-        $this->assertTrue($page->setField(new SimpleById(3), 'bbb'));
-        $this->assertEqual($page->getField(new SimpleBYId(3)), 'bbb');
-        $this->assertFalse($page->setField(new SimpleByName('z'), 'zzz'));
-        $this->assertNull($page->getField(new SimpleByName('z')));
-    }
-
-    function testSettingTextFieldByEnclosingLabel() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<label>Stuff' .
-                '<input type="text" name="a" value="A">' .
-                '</label>' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
-    }
-
-    function testGettingTextFieldByEnclosingLabelWithConflictingOtherFields() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<label>Stuff' .
-                '<input type="text" name="a" value="A">' .
-                '</label>' .
-                '<input type="text" name="b" value="B">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'A');
-        $this->assertEqual($page->getField(new SimpleByName('b')), 'B');
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-    }
-
-    function testSettingTextFieldByExternalLabel() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<label for="aaa">Stuff</label>' .
-                '<input id="aaa" type="text" name="a" value="A">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'aaa');
-    }
-
-    function testReadingTextArea() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<textarea name="a">aaa</textarea>' .
-                '<input type="submit">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
-    }
-
-    function testSettingTextArea() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<textarea name="a">aaa</textarea>' .
-                '<input type="submit">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'AAA'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'AAA');
-    }
-
-    function testSettingSelectionField() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<select name="a">' .
-                '<option>aaa</option>' .
-                '<option selected>bbb</option>' .
-                '</select>' .
-                '<input type="submit">' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'bbb');
-        $this->assertFalse($page->setField(new SimpleByName('a'), 'ccc'));
-        $this->assertTrue($page->setField(new SimpleByName('a'), 'aaa'));
-        $this->assertEqual($page->getField(new SimpleByName('a')), 'aaa');
-    }
-
-    function testSettingSelectionFieldByEnclosingLabel() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<label>Stuff' .
-                '<select name="a"><option selected>A</option><option>B</option></select>' .
-                '</label>' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'A');
-        $this->assertTrue($page->setField(new SimpleByLabel('Stuff'), 'B'));
-        $this->assertEqual($page->getField(new SimpleByLabel('Stuff')), 'B');
-    }
-
-    function testSettingRadioButtonByEnclosingLabel() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent',
-                '<html><head><form>' .
-                '<label>A<input type="radio" name="r" value="a" checked></label>' .
-                '<label>B<input type="radio" name="r" value="b"></label>' .
-                '</form></head></html>');
-        $page = &$this->parse($response);
-        $this->assertEqual($page->getField(new SimpleByLabel('A')), 'a');
-        $this->assertTrue($page->setField(new SimpleBylabel('B'), 'b'));
-        $this->assertEqual($page->getField(new SimpleByLabel('B')), 'b');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/parse_error_test.php b/tests/simpletest/test/parse_error_test.php
deleted file mode 100644
index c3ffb3d42..000000000
--- a/tests/simpletest/test/parse_error_test.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-// $Id: parse_error_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once('../unit_tester.php');
-require_once('../reporter.php');
-
-$test = &new TestSuite('This should fail');
-$test->addFile('test_with_parse_error.php');
-$test->run(new HtmlReporter());
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/parser_test.php b/tests/simpletest/test/parser_test.php
deleted file mode 100644
index 83268d9e1..000000000
--- a/tests/simpletest/test/parser_test.php
+++ /dev/null
@@ -1,551 +0,0 @@
-<?php
-// $Id: parser_test.php 1608 2007-12-27 09:03:07Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../parser.php');
-Mock::generate('SimpleHtmlSaxParser');
-Mock::generate('SimpleSaxListener');
-
-class TestOfParallelRegex extends UnitTestCase {
-    
-    function testNoPatterns() {
-        $regex = &new ParallelRegex(false);
-        $this->assertFalse($regex->match("Hello", $match));
-        $this->assertEqual($match, "");
-    }
-    
-    function testNoSubject() {
-        $regex = &new ParallelRegex(false);
-        $regex->addPattern(".*");
-        $this->assertTrue($regex->match("", $match));
-        $this->assertEqual($match, "");
-    }
-    
-    function testMatchAll() {
-        $regex = &new ParallelRegex(false);
-        $regex->addPattern(".*");
-        $this->assertTrue($regex->match("Hello", $match));
-        $this->assertEqual($match, "Hello");
-    }
-    
-    function testCaseSensitive() {
-        $regex = &new ParallelRegex(true);
-        $regex->addPattern("abc");
-        $this->assertTrue($regex->match("abcdef", $match));
-        $this->assertEqual($match, "abc");
-        $this->assertTrue($regex->match("AAABCabcdef", $match));
-        $this->assertEqual($match, "abc");
-    }
-    
-    function testCaseInsensitive() {
-        $regex = &new ParallelRegex(false);
-        $regex->addPattern("abc");
-        $this->assertTrue($regex->match("abcdef", $match));
-        $this->assertEqual($match, "abc");
-        $this->assertTrue($regex->match("AAABCabcdef", $match));
-        $this->assertEqual($match, "ABC");
-    }
-    
-    function testMatchMultiple() {
-        $regex = &new ParallelRegex(true);
-        $regex->addPattern("abc");
-        $regex->addPattern("ABC");
-        $this->assertTrue($regex->match("abcdef", $match));
-        $this->assertEqual($match, "abc");
-        $this->assertTrue($regex->match("AAABCabcdef", $match));
-        $this->assertEqual($match, "ABC");
-        $this->assertFalse($regex->match("Hello", $match));
-    }
-    
-    function testPatternLabels() {
-        $regex = &new ParallelRegex(false);
-        $regex->addPattern("abc", "letter");
-        $regex->addPattern("123", "number");
-        $this->assertIdentical($regex->match("abcdef", $match), "letter");
-        $this->assertEqual($match, "abc");
-        $this->assertIdentical($regex->match("0123456789", $match), "number");
-        $this->assertEqual($match, "123");
-    }
-}
-
-class TestOfStateStack extends UnitTestCase {
-    
-    function testStartState() {
-        $stack = &new SimpleStateStack("one");
-        $this->assertEqual($stack->getCurrent(), "one");
-    }
-    
-    function testExhaustion() {
-        $stack = &new SimpleStateStack("one");
-        $this->assertFalse($stack->leave());
-    }
-    
-    function testStateMoves() {
-        $stack = &new SimpleStateStack("one");
-        $stack->enter("two");
-        $this->assertEqual($stack->getCurrent(), "two");
-        $stack->enter("three");
-        $this->assertEqual($stack->getCurrent(), "three");
-        $this->assertTrue($stack->leave());
-        $this->assertEqual($stack->getCurrent(), "two");
-        $stack->enter("third");
-        $this->assertEqual($stack->getCurrent(), "third");
-        $this->assertTrue($stack->leave());
-        $this->assertTrue($stack->leave());
-        $this->assertEqual($stack->getCurrent(), "one");
-    }
-}
-
-class TestParser {
-    
-    function accept() {
-    }
-    
-    function a() {
-    }
-    
-    function b() {
-    }
-}
-Mock::generate('TestParser');
-
-class TestOfLexer extends UnitTestCase {
-    
-    function testEmptyPage() {
-        $handler = &new MockTestParser();
-        $handler->expectNever("accept");
-        $handler->setReturnValue("accept", true);
-        $handler->expectNever("accept");
-        $handler->setReturnValue("accept", true);
-        $lexer = &new SimpleLexer($handler);
-        $lexer->addPattern("a+");
-        $this->assertTrue($lexer->parse(""));
-    }
-    
-    function testSinglePattern() {
-        $handler = &new MockTestParser();
-        $handler->expectArgumentsAt(0, "accept", array("aaa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "accept", array("x", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(2, "accept", array("a", LEXER_MATCHED));
-        $handler->expectArgumentsAt(3, "accept", array("yyy", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(4, "accept", array("a", LEXER_MATCHED));
-        $handler->expectArgumentsAt(5, "accept", array("x", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(6, "accept", array("aaa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(7, "accept", array("z", LEXER_UNMATCHED));
-        $handler->expectCallCount("accept", 8);
-        $handler->setReturnValue("accept", true);
-        $lexer = &new SimpleLexer($handler);
-        $lexer->addPattern("a+");
-        $this->assertTrue($lexer->parse("aaaxayyyaxaaaz"));
-    }
-    
-    function testMultiplePattern() {
-        $handler = &new MockTestParser();
-        $target = array("a", "b", "a", "bb", "x", "b", "a", "xxxxxx", "a", "x");
-        for ($i = 0; $i < count($target); $i++) {
-            $handler->expectArgumentsAt($i, "accept", array($target[$i], '*'));
-        }
-        $handler->expectCallCount("accept", count($target));
-        $handler->setReturnValue("accept", true);
-        $lexer = &new SimpleLexer($handler);
-        $lexer->addPattern("a+");
-        $lexer->addPattern("b+");
-        $this->assertTrue($lexer->parse("ababbxbaxxxxxxax"));
-    }
-}
-
-class TestOfLexerModes extends UnitTestCase {
-    
-    function testIsolatedPattern() {
-        $handler = &new MockTestParser();
-        $handler->expectArgumentsAt(0, "a", array("a", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(2, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(3, "a", array("bxb", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(4, "a", array("aaa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(5, "a", array("x", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(6, "a", array("aaaa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(7, "a", array("x", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 8);
-        $handler->setReturnValue("a", true);
-        $lexer = &new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addPattern("b+", "b");
-        $this->assertTrue($lexer->parse("abaabxbaaaxaaaax"));
-    }
-    
-    function testModeChange() {
-        $handler = &new MockTestParser();
-        $handler->expectArgumentsAt(0, "a", array("a", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(2, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(3, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(4, "a", array("aaa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(0, "b", array(":", LEXER_ENTER));
-        $handler->expectArgumentsAt(1, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(2, "b", array("b", LEXER_MATCHED));
-        $handler->expectArgumentsAt(3, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(4, "b", array("bb", LEXER_MATCHED));
-        $handler->expectArgumentsAt(5, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(6, "b", array("bbb", LEXER_MATCHED));
-        $handler->expectArgumentsAt(7, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 5);
-        $handler->expectCallCount("b", 8);
-        $handler->setReturnValue("a", true);
-        $handler->setReturnValue("b", true);
-        $lexer = &new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addEntryPattern(":", "a", "b");
-        $lexer->addPattern("b+", "b");
-        $this->assertTrue($lexer->parse("abaabaaa:ababbabbba"));
-    }
-    
-    function testNesting() {
-        $handler = &new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->setReturnValue("b", true);
-        $handler->expectArgumentsAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(2, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(3, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(0, "b", array("(", LEXER_ENTER));
-        $handler->expectArgumentsAt(1, "b", array("bb", LEXER_MATCHED));
-        $handler->expectArgumentsAt(2, "b", array("a", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(3, "b", array("bb", LEXER_MATCHED));
-        $handler->expectArgumentsAt(4, "b", array(")", LEXER_EXIT));
-        $handler->expectArgumentsAt(4, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(5, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 6);
-        $handler->expectCallCount("b", 5);
-        $lexer = &new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addEntryPattern("(", "a", "b");
-        $lexer->addPattern("b+", "b");
-        $lexer->addExitPattern(")", "b");
-        $this->assertTrue($lexer->parse("aabaab(bbabb)aab"));
-    }
-    
-    function testSingular() {
-        $handler = &new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->setReturnValue("b", true);
-        $handler->expectArgumentsAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(2, "a", array("xx", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(3, "a", array("xx", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(0, "b", array("b", LEXER_SPECIAL));
-        $handler->expectArgumentsAt(1, "b", array("bbb", LEXER_SPECIAL));
-        $handler->expectCallCount("a", 4);
-        $handler->expectCallCount("b", 2);
-        $lexer = &new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addSpecialPattern("b+", "a", "b");
-        $this->assertTrue($lexer->parse("aabaaxxbbbxx"));
-    }
-    
-    function testUnwindTooFar() {
-        $handler = &new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->expectArgumentsAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "a", array(")", LEXER_EXIT));
-        $handler->expectCallCount("a", 2);
-        $lexer = &new SimpleLexer($handler, "a");
-        $lexer->addPattern("a+", "a");
-        $lexer->addExitPattern(")", "a");
-        $this->assertFalse($lexer->parse("aa)aa"));
-    }
-}
-
-class TestOfLexerHandlers extends UnitTestCase {
-    
-    function testModeMapping() {
-        $handler = &new MockTestParser();
-        $handler->setReturnValue("a", true);
-        $handler->expectArgumentsAt(0, "a", array("aa", LEXER_MATCHED));
-        $handler->expectArgumentsAt(1, "a", array("(", LEXER_ENTER));
-        $handler->expectArgumentsAt(2, "a", array("bb", LEXER_MATCHED));
-        $handler->expectArgumentsAt(3, "a", array("a", LEXER_UNMATCHED));
-        $handler->expectArgumentsAt(4, "a", array("bb", LEXER_MATCHED));
-        $handler->expectArgumentsAt(5, "a", array(")", LEXER_EXIT));
-        $handler->expectArgumentsAt(6, "a", array("b", LEXER_UNMATCHED));
-        $handler->expectCallCount("a", 7);
-        $lexer = &new SimpleLexer($handler, "mode_a");
-        $lexer->addPattern("a+", "mode_a");
-        $lexer->addEntryPattern("(", "mode_a", "mode_b");
-        $lexer->addPattern("b+", "mode_b");
-        $lexer->addExitPattern(")", "mode_b");
-        $lexer->mapHandler("mode_a", "a");
-        $lexer->mapHandler("mode_b", "a");
-        $this->assertTrue($lexer->parse("aa(bbabb)b"));
-    }
-}
-
-class TestOfSimpleHtmlLexer extends UnitTestCase {
-    
-    function &createParser() {
-        $parser = &new MockSimpleHtmlSaxParser();
-        $parser->setReturnValue('acceptStartToken', true);
-        $parser->setReturnValue('acceptEndToken', true);
-        $parser->setReturnValue('acceptAttributeToken', true);
-        $parser->setReturnValue('acceptEntityToken', true);
-        $parser->setReturnValue('acceptTextToken', true);
-        $parser->setReturnValue('ignore', true);
-        return $parser;
-    }
-    
-    function testNoContent() {
-        $parser = &$this->createParser();
-        $parser->expectNever('acceptStartToken');
-        $parser->expectNever('acceptEndToken');
-        $parser->expectNever('acceptAttributeToken');
-        $parser->expectNever('acceptEntityToken');
-        $parser->expectNever('acceptTextToken');
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse(''));
-    }
-    
-    function testUninteresting() {
-        $parser = &$this->createParser();
-        $parser->expectOnce('acceptTextToken', array('<html></html>', '*'));
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse('<html></html>'));
-    }
-    
-    function testSkipCss() {
-        $parser = &$this->createParser();
-        $parser->expectNever('acceptTextToken');
-        $parser->expectAtLeastOnce('ignore');
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse("<style>Lot's of styles</style>"));
-    }
-    
-    function testSkipJavaScript() {
-        $parser = &$this->createParser();
-        $parser->expectNever('acceptTextToken');
-        $parser->expectAtLeastOnce('ignore');
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse("<SCRIPT>Javascript code {';:^%^%�$'@\"*(}</SCRIPT>"));
-    }
-    
-    function testSkipHtmlComments() {
-        $parser = &$this->createParser();
-        $parser->expectNever('acceptTextToken');
-        $parser->expectAtLeastOnce('ignore');
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse("<!-- <title>title</title><style>styles</style> -->"));
-    }
-    
-    function testTagWithNoAttributes() {
-        $parser = &$this->createParser();
-        $parser->expectAt(0, 'acceptStartToken', array('<title', '*'));
-        $parser->expectAt(1, 'acceptStartToken', array('>', '*'));
-        $parser->expectCallCount('acceptStartToken', 2);
-        $parser->expectOnce('acceptTextToken', array('Hello', '*'));
-        $parser->expectOnce('acceptEndToken', array('</title>', '*'));
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse('<title>Hello</title>'));
-    }
-    
-    function testTagWithAttributes() {
-        $parser = &$this->createParser();
-        $parser->expectOnce('acceptTextToken', array('label', '*'));
-        $parser->expectAt(0, 'acceptStartToken', array('<a', '*'));
-        $parser->expectAt(1, 'acceptStartToken', array('href', '*'));
-        $parser->expectAt(2, 'acceptStartToken', array('>', '*'));
-        $parser->expectCallCount('acceptStartToken', 3);
-        $parser->expectAt(0, 'acceptAttributeToken', array('= "', '*'));
-        $parser->expectAt(1, 'acceptAttributeToken', array('here.html', '*'));
-        $parser->expectAt(2, 'acceptAttributeToken', array('"', '*'));
-        $parser->expectCallCount('acceptAttributeToken', 3);
-        $parser->expectOnce('acceptEndToken', array('</a>', '*'));
-        $lexer = &new SimpleHtmlLexer($parser);
-        $this->assertTrue($lexer->parse('<a href = "here.html">label</a>'));
-    }
-}
-
-class TestOfHtmlSaxParser extends UnitTestCase {
-    
-    function &createListener() {
-        $listener = &new MockSimpleSaxListener();
-        $listener->setReturnValue('startElement', true);
-        $listener->setReturnValue('addContent', true);
-        $listener->setReturnValue('endElement', true);
-        return $listener;
-    }
-    
-    function testFramesetTag() {
-        $listener = &$this->createListener();
-        $listener->expectOnce('startElement', array('frameset', array()));
-        $listener->expectOnce('addContent', array('Frames'));
-        $listener->expectOnce('endElement', array('frameset'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<frameset>Frames</frameset>'));
-    }
-    
-    function testTagWithUnquotedAttributes() {
-        $listener = &$this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('input', array('name' => 'a.b.c', 'value' => 'd')));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<input name=a.b.c value = d>'));
-    }
-    
-    function testTagInsideContent() {
-        $listener = &$this->createListener();
-        $listener->expectOnce('startElement', array('a', array()));
-        $listener->expectAt(0, 'addContent', array('<html>'));
-        $listener->expectAt(1, 'addContent', array('</html>'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<html><a></a></html>'));
-    }
-    
-    function testTagWithInternalContent() {
-        $listener = &$this->createListener();
-        $listener->expectOnce('startElement', array('a', array()));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<a>label</a>'));
-    }
-    
-    function testLinkAddress() {
-        $listener = &$this->createListener();
-        $listener->expectOnce('startElement', array('a', array('href' => 'here.html')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse("<a href = 'here.html'>label</a>"));
-    }
-    
-    function testEncodedAttribute() {
-        $listener = &$this->createListener();
-        $listener->expectOnce('startElement', array('a', array('href' => 'here&there.html')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse("<a href = 'here&amp;there.html'>label</a>"));
-    }
-    
-    function testTagWithId() {
-        $listener = &$this->createListener();
-        $listener->expectOnce('startElement', array('a', array('id' => '0')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<a id="0">label</a>'));
-    }
-     
-    function testTagWithEmptyAttributes() {
-        $listener = &$this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('option', array('value' => '', 'selected' => '')));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('option'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<option value="" selected>label</option>'));
-    }
-   
-    function testComplexTagWithLotsOfCaseVariations() {
-        $listener = &$this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('a', array('href' => 'here.html', 'style' => "'cool'")));
-        $listener->expectOnce('addContent', array('label'));
-        $listener->expectOnce('endElement', array('a'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<A HREF = \'here.html\' Style="\'cool\'">label</A>'));
-    }
-    
-    function testXhtmlSelfClosingTag() {
-        $listener = &$this->createListener();
-        $listener->expectOnce(
-                'startElement',
-                array('input', array('type' => 'submit', 'name' => 'N', 'value' => 'V')));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse('<input type="submit" name="N" value="V" />'));
-    }
-    
-    function testNestedFrameInFrameset() {
-        $listener = &$this->createListener();
-        $listener->expectAt(0, 'startElement', array('frameset', array()));
-        $listener->expectAt(1, 'startElement', array('frame', array('src' => 'frame.html')));
-        $listener->expectCallCount('startElement', 2);
-        $listener->expectOnce('addContent', array('<noframes>Hello</noframes>'));
-        $listener->expectOnce('endElement', array('frameset'));
-        $parser = &new SimpleHtmlSaxParser($listener);
-        $this->assertTrue($parser->parse(
-                '<frameset><frame src="frame.html"><noframes>Hello</noframes></frameset>'));
-    }
-}
-
-class TestOfTextExtraction extends UnitTestCase {
-    
-	function testImageSuppressionWhileKeepingParagraphsAndAltText() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<img src="foo.png" /><p>some text</p><img src="bar.png" alt="bar" />'),
-                'some text bar');
-		
-	}
-
-    function testSpaceNormalisation() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise("\nOne\tTwo   \nThree\t"),
-                'One Two Three');
-    }
-    
-    function testMultilinesCommentSuppression() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<!--\n Hello \n-->'),
-                '');
-    }
-    
-    function testCommentSuppression() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<!--Hello-->'),
-                '');
-    }
-    
-    function testJavascriptSuppression() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<script attribute="test">\nHello\n</script>'),
-                '');
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<script attribute="test">Hello</script>'),
-                '');
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<script>Hello</script>'),
-                '');
-    }
-    
-    function testTagSuppression() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<b>Hello</b>'),
-                'Hello');
-    }
-    
-    function testAdjoiningTagSuppression() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<b>Hello</b><em>Goodbye</em>'),
-                'HelloGoodbye');
-    }
-    
-    function testExtractImageAltTextWithDifferentQuotes() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<img alt="One"><img alt=\'Two\'><img alt=Three>'),
-                'One Two Three');
-    }
-    
-    function testExtractImageAltTextMultipleTimes() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('<img alt="One"><img alt="Two"><img alt="Three">'),
-                'One Two Three');
-    }
-    
-    function testHtmlEntityTranslation() {
-        $this->assertEqual(
-                SimpleHtmlSaxParser::normalise('&lt;&gt;&quot;&amp;&#039;'),
-                '<>"&\'');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/reflection_php4_test.php b/tests/simpletest/test/reflection_php4_test.php
deleted file mode 100644
index 8ee211b96..000000000
--- a/tests/simpletest/test/reflection_php4_test.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-// $Id: reflection_php4_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class AnyOldThing {
-    function aMethod() {
-    }
-}
-
-class AnyOldChildThing extends AnyOldThing { }
-
-class TestOfReflection extends UnitTestCase {
-
-    function testClassExistence() {
-        $reflection = new SimpleReflection('AnyOldThing');
-        $this->assertTrue($reflection->classOrInterfaceExists());
-        $this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
-    }
-
-    function testClassNonExistence() {
-        $reflection = new SimpleReflection('UnknownThing');
-        $this->assertFalse($reflection->classOrInterfaceExists());
-        $this->assertFalse($reflection->classOrInterfaceExistsSansAutoload());
-    }
-
-    function testDetectionOfInterfacesAlwaysFalse() {
-        $reflection = new SimpleReflection('AnyOldThing');
-        $this->assertFalse($reflection->isAbstract());
-        $this->assertFalse($reflection->isInterface());
-    }
-
-    function testFindingParentClass() {
-        $reflection = new SimpleReflection('AnyOldChildThing');
-        $this->assertEqual(strtolower($reflection->getParent()), 'anyoldthing');
-    }
-
-    function testMethodsListFromClass() {
-        $reflection = new SimpleReflection('AnyOldThing');
-        $methods = $reflection->getMethods();
-        $this->assertEqualIgnoringCase($methods[0], 'aMethod');
-    }
-
-    function testNoInterfacesForPHP4() {
-        $reflection = new SimpleReflection('AnyOldThing');
-        $this->assertEqual(
-                $reflection->getInterfaces(),
-                array());
-    }
-
-    function testMostGeneralPossibleSignature() {
-        $reflection = new SimpleReflection('AnyOldThing');
-        $this->assertEqualIgnoringCase(
-                $reflection->getSignature('aMethod'),
-                'function &aMethod()');
-    }
-
-    function assertEqualIgnoringCase($a, $b) {
-        return $this->assertEqual(strtolower($a), strtolower($b));
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/reflection_php5_test.php b/tests/simpletest/test/reflection_php5_test.php
deleted file mode 100644
index 3bfc6e85b..000000000
--- a/tests/simpletest/test/reflection_php5_test.php
+++ /dev/null
@@ -1,271 +0,0 @@
-<?php
-// $Id: reflection_php5_test.php 1541 2007-06-10 02:27:59Z tswicegood $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../reflection_php5.php');
-
-class AnyOldLeafClass {
-	function aMethod() { }
-}
-
-abstract class AnyOldClass {
-	function aMethod() { }
-}
-
-class AnyOldLeafClassWithAFinal {
-	final function aMethod() { }
-}
-
-interface AnyOldInterface {
-	function aMethod();
-}
-
-interface AnyOldArgumentInterface {
-	function aMethod(AnyOldInterface $argument);
-}
-
-interface AnyDescendentInterface extends AnyOldInterface {
-}
-
-class AnyOldImplementation implements AnyOldInterface {
-	function aMethod() { }
-	function extraMethod() { }
-}
-
-abstract class AnyAbstractImplementation implements AnyOldInterface {
-}
-
-abstract class AnotherOldAbstractClass {
-    protected abstract function aMethod(AnyOldInterface $argument);
-}
-
-class AnyOldSubclass extends AnyOldImplementation { }
-
-class AnyOldArgumentClass {
-	function aMethod($argument) { }
-}
-
-class AnyOldArgumentImplementation implements AnyOldArgumentInterface {
-	function aMethod(AnyOldInterface $argument) { }
-}
-
-class AnyOldTypeHintedClass implements AnyOldArgumentInterface {
-	function aMethod(AnyOldInterface $argument) { }
-}
-
-class AnyDescendentImplementation implements AnyDescendentInterface {
-	function aMethod() { }
-}
-
-class AnyOldOverloadedClass {
-	function __isset($key) { }
-	function __unset($key) { }
-}
-
-class AnyOldClassWithStaticMethods {
-	static function aStatic() { }
-	static function aStaticWithParameters($arg1, $arg2) { }
-}
-
-abstract class AnyOldAbstractClassWithAbstractMethods {
-    abstract function anAbstract();
-    abstract function anAbstractWithParameter($foo);
-    abstract function anAbstractWithMultipleParameters($foo, $bar);
-}
-
-class TestOfReflection extends UnitTestCase {
-
-	function testClassExistence() {
-		$reflection = new SimpleReflection('AnyOldLeafClass');
-		$this->assertTrue($reflection->classOrInterfaceExists());
-		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
-		$this->assertFalse($reflection->isAbstract());
-		$this->assertFalse($reflection->isInterface());
-	}
-
-	function testClassNonExistence() {
-		$reflection = new SimpleReflection('UnknownThing');
-		$this->assertFalse($reflection->classOrInterfaceExists());
-		$this->assertFalse($reflection->classOrInterfaceExistsSansAutoload());
-	}
-
-	function testDetectionOfAbstractClass() {
-		$reflection = new SimpleReflection('AnyOldClass');
-		$this->assertTrue($reflection->isAbstract());
-	}
-
-	function testDetectionOfFinalMethods() {
-		$reflection = new SimpleReflection('AnyOldClass');
-		$this->assertFalse($reflection->hasFinal());
-		$reflection = new SimpleReflection('AnyOldLeafClassWithAFinal');
-		$this->assertTrue($reflection->hasFinal());
-	}
-
-	function testFindingParentClass() {
-		$reflection = new SimpleReflection('AnyOldSubclass');
-		$this->assertEqual($reflection->getParent(), 'AnyOldImplementation');
-	}
-
-	function testInterfaceExistence() {
-		$reflection = new SimpleReflection('AnyOldInterface');
-		$this->assertTrue($reflection->classOrInterfaceExists());
-		$this->assertTrue($reflection->classOrInterfaceExistsSansAutoload());
-		$this->assertTrue($reflection->isInterface());
-	}
-
-	function testMethodsListFromClass() {
-		$reflection = new SimpleReflection('AnyOldClass');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-	}
-
-	function testMethodsListFromInterface() {
-		$reflection = new SimpleReflection('AnyOldInterface');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
-	}
-
-	function testMethodsComeFromDescendentInterfacesASWell() {
-		$reflection = new SimpleReflection('AnyDescendentInterface');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-	}
-	
-	function testCanSeparateInterfaceMethodsFromOthers() {
-		$reflection = new SimpleReflection('AnyOldImplementation');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod', 'extraMethod'));
-		$this->assertIdentical($reflection->getInterfaceMethods(), array('aMethod'));
-	}
-
-	function testMethodsComeFromDescendentInterfacesInAbstractClass() {
-		$reflection = new SimpleReflection('AnyAbstractImplementation');
-		$this->assertIdentical($reflection->getMethods(), array('aMethod'));
-	}
-
-	function testInterfaceHasOnlyItselfToImplement() {
-		$reflection = new SimpleReflection('AnyOldInterface');
-		$this->assertEqual(
-				$reflection->getInterfaces(),
-				array('AnyOldInterface'));
-	}
-
-	function testInterfacesListedForClass() {
-		$reflection = new SimpleReflection('AnyOldImplementation');
-		$this->assertEqual(
-				$reflection->getInterfaces(),
-				array('AnyOldInterface'));
-	}
-
-	function testInterfacesListedForSubclass() {
-		$reflection = new SimpleReflection('AnyOldSubclass');
-		$this->assertEqual(
-				$reflection->getInterfaces(),
-				array('AnyOldInterface'));
-	}
-
-	function testNoParameterCreationWhenNoInterface() {
-		$reflection = new SimpleReflection('AnyOldArgumentClass');
-		$function = $reflection->getSignature('aMethod');
-		if (version_compare(phpversion(), '5.0.2', '<=')) {
-			$this->assertEqual('function amethod()', strtolower($function));
-		} else {
-			$this->assertEqual('function aMethod()', $function);
-		}
-	}
-
-	function testParameterCreationWithoutTypeHinting() {
-		$reflection = new SimpleReflection('AnyOldArgumentImplementation');
-		$function = $reflection->getSignature('aMethod');
-		if (version_compare(phpversion(), '5.0.2', '<=')) {
-			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
-		} else {
-			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
-		}
-	}
-
-	function testParameterCreationForTypeHinting() {
-		$reflection = new SimpleReflection('AnyOldTypeHintedClass');
-		$function = $reflection->getSignature('aMethod');
-		if (version_compare(phpversion(), '5.0.2', '<=')) {
-			$this->assertEqual('function amethod(AnyOldInterface $argument)', $function);
-		} else {
-			$this->assertEqual('function aMethod(AnyOldInterface $argument)', $function);
-		}
-	}
-
-	function testIssetFunctionSignature() {
-		$reflection = new SimpleReflection('AnyOldOverloadedClass');
-		$function = $reflection->getSignature('__isset');
-		if (version_compare(phpversion(), '5.1.0', '>=')) {
-			$this->assertEqual('function __isset($key)', $function);
-		} else {
-			$this->assertEqual('function __isset()', $function);
-		}
-	}
-	
-	function testUnsetFunctionSignature() {
-		$reflection = new SimpleReflection('AnyOldOverloadedClass');
-		$function = $reflection->getSignature('__unset');
-		if (version_compare(phpversion(), '5.1.0', '>=')) {
-			$this->assertEqual('function __unset($key)', $function);
-		} else {
-			$this->assertEqual('function __unset()', $function);
-		}
-	}
-
-	function testProperlyReflectsTheFinalInterfaceWhenObjectImplementsAnExtendedInterface() {
-		$reflection = new SimpleReflection('AnyDescendentImplementation');
-		$interfaces = $reflection->getInterfaces();
-		$this->assertEqual(1, count($interfaces));
-		$this->assertEqual('AnyDescendentInterface', array_shift($interfaces));
-	}
-	
-	function testCreatingSignatureForAbstractMethod() {
-	    $reflection = new SimpleReflection('AnotherOldAbstractClass');
-	    $this->assertEqual($reflection->getSignature('aMethod'), 'function aMethod(AnyOldInterface $argument)');
-	}
-	
-	function testCanProperlyGenerateStaticMethodSignatures() {
-		$reflection = new SimpleReflection('AnyOldClassWithStaticMethods');
-		$this->assertEqual('static function aStatic()', $reflection->getSignature('aStatic'));
-		$this->assertEqual(
-			'static function aStaticWithParameters($arg1, $arg2)',
-			$reflection->getSignature('aStaticWithParameters')
-		);
-	}
-}
-
-class TestOfReflectionWithTypeHints extends UnitTestCase {
-	function skip() {
-		$this->skipIf(version_compare(phpversion(), '5.1.0', '<'), 'Reflection with type hints only tested for PHP 5.1.0 and above');
-	}
-
-	function testParameterCreationForTypeHintingWithArray() {
-		eval('interface AnyOldArrayTypeHintedInterface {
-				  function amethod(array $argument);
-			  } 
-			  class AnyOldArrayTypeHintedClass implements AnyOldArrayTypeHintedInterface {
-				  function amethod(array $argument) {}
-			  }');
-		$reflection = new SimpleReflection('AnyOldArrayTypeHintedClass');
-		$function = $reflection->getSignature('amethod');
-		$this->assertEqual('function amethod(array $argument)', $function);
-	}
-}
-
-class TestOfAbstractsWithAbstractMethods extends UnitTestCase {
-    function testCanProperlyGenerateAbstractMethods() {
-        $reflection = new SimpleReflection('AnyOldAbstractClassWithAbstractMethods');
-        $this->assertEqual(
-            'function anAbstract()',
-            $reflection->getSignature('anAbstract')
-        );
-        $this->assertEqual(
-            'function anAbstractWithParameter($foo)',
-            $reflection->getSignature('anAbstractWithParameter')
-        );
-        $this->assertEqual(
-            'function anAbstractWithMultipleParameters($foo, $bar)',
-            $reflection->getSignature('anAbstractWithMultipleParameters')
-        );
-    }
-}
-
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/remote_test.php b/tests/simpletest/test/remote_test.php
deleted file mode 100644
index efcccaf05..000000000
--- a/tests/simpletest/test/remote_test.php
+++ /dev/null
@@ -1,20 +0,0 @@
-<?php
-// $Id: remote_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once('../remote.php');
-require_once('../reporter.php');
-
-// The following URL will depend on your own installation.
-if (isset($_SERVER['SCRIPT_URI'])) {
-    $base_uri = $_SERVER['SCRIPT_URI'];
-} elseif (isset($_SERVER['HTTP_HOST']) && isset($_SERVER['PHP_SELF'])) {
-    $base_uri = 'http://'. $_SERVER['HTTP_HOST'] . $_SERVER['PHP_SELF'];
-};
-$test_url = str_replace('remote_test.php', 'visual_test.php', $base_uri);
-
-$test = &new TestSuite('Remote tests');
-$test->addTestCase(new RemoteTestCase($test_url . '?xml=yes', $test_url . '?xml=yes&dry=yes'));
-if (SimpleReporter::inCli()) {
-    exit ($test->run(new TextReporter()) ? 0 : 1);
-}
-$test->run(new HtmlReporter());
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/shell_test.php b/tests/simpletest/test/shell_test.php
deleted file mode 100644
index 6199272a1..000000000
--- a/tests/simpletest/test/shell_test.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-// $Id: shell_test.php 1529 2007-06-04 18:33:09Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../shell_tester.php');
-
-class TestOfShell extends UnitTestCase {
-    
-    function testEcho() {
-        $shell = &new SimpleShell();
-        $this->assertIdentical($shell->execute('echo Hello'), 0);
-        $this->assertPattern('/Hello/', $shell->getOutput());
-    }
-    
-    function testBadCommand() {
-        $shell = &new SimpleShell();
-        $this->assertNotEqual($ret = $shell->execute('blurgh! 2>&1'), 0);
-    }
-}
-
-class TestOfShellTesterAndShell extends ShellTestCase {
-    
-    function testEcho() {
-        $this->assertTrue($this->execute('echo Hello'));
-        $this->assertExitCode(0);
-        $this->assertoutput('Hello');
-    }
-    
-    function testFileExistence() {
-        $this->assertFileExists(dirname(__FILE__) . '/all_tests.php');
-        $this->assertFileNotExists('wibble');
-    }
-    
-    function testFilePatterns() {
-        $this->assertFilePattern('/all[_ ]tests/i', dirname(__FILE__) . '/all_tests.php');
-        $this->assertNoFilePattern('/sputnik/i', dirname(__FILE__) . '/all_tests.php');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/shell_tester_test.php b/tests/simpletest/test/shell_tester_test.php
deleted file mode 100644
index e536dcebd..000000000
--- a/tests/simpletest/test/shell_tester_test.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-// $Id: shell_tester_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../shell_tester.php');
-Mock::generate('SimpleShell');
-
-class TestOfShellTestCase extends ShellTestCase {
-    var $_mock_shell = false;
-    
-    function &_getShell() {
-        return $this->_mock_shell;
-    }
-    
-    function testGenericEquality() {
-        $this->assertEqual('a', 'a');
-        $this->assertNotEqual('a', 'A');
-    }
-    
-    function testExitCode() {
-        $this->_mock_shell = &new MockSimpleShell();
-        $this->_mock_shell->setReturnValue('execute', 0);
-        $this->_mock_shell->expectOnce('execute', array('ls'));
-        $this->assertTrue($this->execute('ls'));
-        $this->assertExitCode(0);
-    }
-    
-    function testOutput() {
-        $this->_mock_shell = &new MockSimpleShell();
-        $this->_mock_shell->setReturnValue('execute', 0);
-        $this->_mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
-        $this->assertOutput("Line 1\nLine 2\n");
-    }
-    
-    function testOutputPatterns() {
-        $this->_mock_shell = &new MockSimpleShell();
-        $this->_mock_shell->setReturnValue('execute', 0);
-        $this->_mock_shell->setReturnValue('getOutput', "Line 1\nLine 2\n");
-        $this->assertOutputPattern('/line/i');
-        $this->assertNoOutputPattern('/line 2/');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/simpletest_test.php b/tests/simpletest/test/simpletest_test.php
deleted file mode 100644
index bf98d9748..000000000
--- a/tests/simpletest/test/simpletest_test.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-// $Id: simpletest_test.php 1505 2007-04-30 23:39:59Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../simpletest.php');
-
-SimpleTest::ignore('ShouldNeverBeRunEither');
-
-class ShouldNeverBeRun extends UnitTestCase {
-    function testWithNoChanceOfSuccess() {
-        $this->fail('Should be ignored');
-    }
-}
-
-class ShouldNeverBeRunEither extends ShouldNeverBeRun { }
-
-class TestOfStackTrace extends UnitTestCase {
-
-    function testCanFindAssertInTrace() {
-        $trace = new SimpleStackTrace(array('assert'));
-        $this->assertEqual(
-                $trace->traceMethod(array(array(
-                        'file' => '/my_test.php',
-                        'line' => 24,
-                        'function' => 'assertSomething'))),
-                ' at [/my_test.php line 24]');
-    }
-}
-
-class DummyResource { }
-
-class TestOfContext extends UnitTestCase {
-
-    function testCurrentContextIsUnique() {
-        $this->assertReference(
-                SimpleTest::getContext(),
-                SimpleTest::getContext());
-    }
-
-    function testContextHoldsCurrentTestCase() {
-        $context = &SimpleTest::getContext();
-        $this->assertReference($this, $context->getTest());
-    }
-
-    function testResourceIsSingleInstanceWithContext() {
-        $context = &new SimpleTestContext();
-        $this->assertReference(
-                $context->get('DummyResource'),
-                $context->get('DummyResource'));
-    }
-
-    function testClearingContextResetsResources() {
-        $context = &new SimpleTestContext();
-        $resource = &$context->get('DummyResource');
-        $context->clear();
-        $this->assertClone($resource, $context->get('DummyResource'));
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/socket_test.php b/tests/simpletest/test/socket_test.php
deleted file mode 100644
index ce25be7d3..000000000
--- a/tests/simpletest/test/socket_test.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-// $Id: socket_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../socket.php');
-Mock::generate('SimpleSocket');
-
-class TestOfSimpleStickyError extends UnitTestCase {
-    
-    function testSettingError() {
-        $error = new SimpleStickyError();
-        $this->assertFalse($error->isError());
-        $error->_setError('Ouch');
-        $this->assertTrue($error->isError());
-        $this->assertEqual($error->getError(), 'Ouch');
-    }
-    
-    function testClearingError() {
-        $error = new SimpleStickyError();
-        $error->_setError('Ouch');
-        $this->assertTrue($error->isError());
-        $error->_clearError();
-        $this->assertFalse($error->isError());
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/support/collector/collectable.1 b/tests/simpletest/test/support/collector/collectable.1
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/simpletest/test/support/collector/collectable.2 b/tests/simpletest/test/support/collector/collectable.2
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tests/simpletest/test/support/empty_test_file.php b/tests/simpletest/test/support/empty_test_file.php
deleted file mode 100644
index 31e3f7bed..000000000
--- a/tests/simpletest/test/support/empty_test_file.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-require_once(dirname(__FILE__) . '/../../autorun.php');
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/support/latin1_sample b/tests/simpletest/test/support/latin1_sample
deleted file mode 100644
index 190352577..000000000
--- a/tests/simpletest/test/support/latin1_sample
+++ /dev/null
@@ -1 +0,0 @@
-�������@�����櫻��
\ No newline at end of file
diff --git a/tests/simpletest/test/support/spl_examples.php b/tests/simpletest/test/support/spl_examples.php
deleted file mode 100644
index 45add356c..000000000
--- a/tests/simpletest/test/support/spl_examples.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-    // $Id: spl_examples.php 1262 2006-02-05 19:35:31Z lastcraft $
-
-    class IteratorImplementation implements Iterator {
-        function current() { }
-        function next() { }
-        function key() { }
-        function valid() { }
-        function rewind() { }
-    }
-
-    class IteratorAggregateImplementation implements IteratorAggregate {
-        function getIterator() { }
-    }
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/support/supplementary_upload_sample.txt b/tests/simpletest/test/support/supplementary_upload_sample.txt
deleted file mode 100644
index d8aa9e810..000000000
--- a/tests/simpletest/test/support/supplementary_upload_sample.txt
+++ /dev/null
@@ -1 +0,0 @@
-Some more text content
\ No newline at end of file
diff --git a/tests/simpletest/test/support/test1.php b/tests/simpletest/test/support/test1.php
deleted file mode 100644
index b414586d6..000000000
--- a/tests/simpletest/test/support/test1.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-class test1 extends UnitTestCase {
-	function test_pass(){
-		$this->assertEqual(3,1+2, "pass1");
-	}
-}
-?>
diff --git a/tests/simpletest/test/support/upload_sample.txt b/tests/simpletest/test/support/upload_sample.txt
deleted file mode 100644
index ec98d7c5e..000000000
--- a/tests/simpletest/test/support/upload_sample.txt
+++ /dev/null
@@ -1 +0,0 @@
-Sample for testing file upload
\ No newline at end of file
diff --git a/tests/simpletest/test/tag_test.php b/tests/simpletest/test/tag_test.php
deleted file mode 100644
index f81df64ea..000000000
--- a/tests/simpletest/test/tag_test.php
+++ /dev/null
@@ -1,554 +0,0 @@
-<?php
-// $Id: tag_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../tag.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-Mock::generate('SimpleMultipartEncoding');
-
-class TestOfTag extends UnitTestCase {
-    
-    function testStartValuesWithoutAdditionalContent() {
-        $tag = new SimpleTitleTag(array('a' => '1', 'b' => ''));
-        $this->assertEqual($tag->getTagName(), 'title');
-        $this->assertIdentical($tag->getAttribute('a'), '1');
-        $this->assertIdentical($tag->getAttribute('b'), '');
-        $this->assertIdentical($tag->getAttribute('c'), false);
-        $this->assertIdentical($tag->getContent(), '');
-    }
-    
-    function testTitleContent() {
-        $tag = &new SimpleTitleTag(array());
-        $this->assertTrue($tag->expectEndTag());
-        $tag->addContent('Hello');
-        $tag->addContent('World');
-        $this->assertEqual($tag->getText(), 'HelloWorld');
-    }
-    
-    function testMessyTitleContent() {
-        $tag = &new SimpleTitleTag(array());
-        $this->assertTrue($tag->expectEndTag());
-        $tag->addContent('<b>Hello</b>');
-        $tag->addContent('<em>World</em>');
-        $this->assertEqual($tag->getText(), 'HelloWorld');
-    }
-    
-    function testTagWithNoEnd() {
-        $tag = &new SimpleTextTag(array());
-        $this->assertFalse($tag->expectEndTag());
-    }
-    
-    function testAnchorHref() {
-        $tag = &new SimpleAnchorTag(array('href' => 'http://here/'));
-        $this->assertEqual($tag->getHref(), 'http://here/');
-        
-        $tag = &new SimpleAnchorTag(array('href' => ''));
-        $this->assertIdentical($tag->getAttribute('href'), '');
-        $this->assertIdentical($tag->getHref(), '');
-        
-        $tag = &new SimpleAnchorTag(array());
-        $this->assertIdentical($tag->getAttribute('href'), false);
-        $this->assertIdentical($tag->getHref(), '');
-    }
-    
-    function testIsIdMatchesIdAttribute() {
-        $tag = &new SimpleAnchorTag(array('href' => 'http://here/', 'id' => 7));
-        $this->assertIdentical($tag->getAttribute('id'), '7');
-        $this->assertTrue($tag->isId(7));
-    }
-}
-
-class TestOfWidget extends UnitTestCase {
-    
-    function testTextEmptyDefault() {
-        $tag = &new SimpleTextTag(array('type' => 'text'));
-        $this->assertIdentical($tag->getDefault(), '');
-        $this->assertIdentical($tag->getValue(), '');
-    }
-    
-    function testSettingOfExternalLabel() {
-        $tag = &new SimpleTextTag(array('type' => 'text'));
-        $tag->setLabel('it');
-        $this->assertTrue($tag->isLabel('it'));
-    }
-    
-    function testTextDefault() {
-        $tag = &new SimpleTextTag(array('value' => 'aaa'));
-        $this->assertEqual($tag->getDefault(), 'aaa');
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testSettingTextValue() {
-        $tag = &new SimpleTextTag(array('value' => 'aaa'));
-        $tag->setValue('bbb');
-        $this->assertEqual($tag->getValue(), 'bbb');
-        $tag->resetValue();
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testFailToSetHiddenValue() {
-        $tag = &new SimpleTextTag(array('value' => 'aaa', 'type' => 'hidden'));
-        $this->assertFalse($tag->setValue('bbb'));
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testSubmitDefaults() {
-        $tag = &new SimpleSubmitTag(array('type' => 'submit'));
-        $this->assertIdentical($tag->getName(), false);
-        $this->assertEqual($tag->getValue(), 'Submit');
-        $this->assertFalse($tag->setValue('Cannot set this'));
-        $this->assertEqual($tag->getValue(), 'Submit');
-        $this->assertEqual($tag->getLabel(), 'Submit');
-        
-        $encoding = &new MockSimpleMultipartEncoding();
-        $encoding->expectNever('add');
-        $tag->write($encoding);
-    }
-    
-    function testPopulatedSubmit() {
-        $tag = &new SimpleSubmitTag(
-                array('type' => 'submit', 'name' => 's', 'value' => 'Ok!'));
-        $this->assertEqual($tag->getName(), 's');
-        $this->assertEqual($tag->getValue(), 'Ok!');
-        $this->assertEqual($tag->getLabel(), 'Ok!');
-        
-        $encoding = &new MockSimpleMultipartEncoding();
-        $encoding->expectOnce('add', array('s', 'Ok!'));
-        $tag->write($encoding);
-    }
-    
-    function testImageSubmit() {
-        $tag = &new SimpleImageSubmitTag(
-                array('type' => 'image', 'name' => 's', 'alt' => 'Label'));
-        $this->assertEqual($tag->getName(), 's');
-        $this->assertEqual($tag->getLabel(), 'Label');
-        
-        $encoding = &new MockSimpleMultipartEncoding();
-        $encoding->expectAt(0, 'add', array('s.x', 20));
-        $encoding->expectAt(1, 'add', array('s.y', 30));
-        $tag->write($encoding, 20, 30);
-    }
-    
-    function testImageSubmitTitlePreferredOverAltForLabel() {
-        $tag = &new SimpleImageSubmitTag(
-                array('type' => 'image', 'name' => 's', 'alt' => 'Label', 'title' => 'Title'));
-        $this->assertEqual($tag->getLabel(), 'Title');
-    }
-    
-    function testButton() {
-        $tag = &new SimpleButtonTag(
-                array('type' => 'submit', 'name' => 's', 'value' => 'do'));
-        $tag->addContent('I am a button');
-        $this->assertEqual($tag->getName(), 's');
-        $this->assertEqual($tag->getValue(), 'do');
-        $this->assertEqual($tag->getLabel(), 'I am a button');
-
-        $encoding = &new MockSimpleMultipartEncoding();
-        $encoding->expectOnce('add', array('s', 'do'));
-        $tag->write($encoding);
-    }
-}
-
-class TestOfTextArea extends UnitTestCase {
-    
-    function testDefault() {
-        $tag = &new SimpleTextAreaTag(array('name' => 'a'));
-        $tag->addContent('Some text');
-        $this->assertEqual($tag->getName(), 'a');
-        $this->assertEqual($tag->getDefault(), 'Some text');
-    }
-    
-    function testWrapping() {
-        $tag = &new SimpleTextAreaTag(array('cols' => '10', 'wrap' => 'physical'));
-        $tag->addContent("Lot's of text that should be wrapped");
-        $this->assertEqual(
-                $tag->getDefault(),
-                "Lot's of\r\ntext that\r\nshould be\r\nwrapped");
-        $tag->setValue("New long text\r\nwith two lines");
-        $this->assertEqual(
-                $tag->getValue(),
-                "New long\r\ntext\r\nwith two\r\nlines");
-    }
-    
-    function testWrappingRemovesLeadingcariageReturn() {
-        $tag = &new SimpleTextAreaTag(array('cols' => '20', 'wrap' => 'physical'));
-        $tag->addContent("\rStuff");
-        $this->assertEqual($tag->getDefault(), 'Stuff');
-        $tag->setValue("\nNew stuff\n");
-        $this->assertEqual($tag->getValue(), "New stuff\r\n");
-    }
-    
-    function testBreaksAreNewlineAndCarriageReturn() {
-        $tag = &new SimpleTextAreaTag(array('cols' => '10'));
-        $tag->addContent("Some\nText\rwith\r\nbreaks");
-        $this->assertEqual($tag->getValue(), "Some\r\nText\r\nwith\r\nbreaks");
-    }
-}
-
-class TestOfCheckbox extends UnitTestCase {
-    
-    function testCanSetCheckboxToNamedValueWithBooleanTrue() {
-        $tag = &new SimpleCheckboxTag(array('name' => 'a', 'value' => 'A'));
-        $this->assertEqual($tag->getValue(), false);
-        $tag->setValue(true);
-        $this->assertIdentical($tag->getValue(), 'A');
-    }
-}
-
-class TestOfSelection extends UnitTestCase {
-    
-    function testEmpty() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $this->assertIdentical($tag->getValue(), '');
-    }
-    
-    function testSingle() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $option = &new SimpleOptionTag(array());
-        $option->addContent('AAA');
-        $tag->addTag($option);
-        $this->assertEqual($tag->getValue(), 'AAA');
-    }
-    
-    function testSingleDefault() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $option = &new SimpleOptionTag(array('selected' => ''));
-        $option->addContent('AAA');
-        $tag->addTag($option);
-        $this->assertEqual($tag->getValue(), 'AAA');
-    }
-    
-    function testSingleMappedDefault() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $option = &new SimpleOptionTag(array('selected' => '', 'value' => 'aaa'));
-        $option->addContent('AAA');
-        $tag->addTag($option);
-        $this->assertEqual($tag->getValue(), 'aaa');
-    }
-    
-    function testStartsWithDefault() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $a = &new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = &new SimpleOptionTag(array());
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $this->assertEqual($tag->getValue(), 'BBB');
-    }
-    
-    function testSettingOption() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $a = &new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = &new SimpleOptionTag(array());
-        $c->addContent('CCC');
-        $tag->setValue('AAA');
-        $this->assertEqual($tag->getValue(), 'AAA');
-    }
-    
-    function testSettingMappedOption() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $a = &new SimpleOptionTag(array('value' => 'aaa'));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('value' => 'bbb', 'selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = &new SimpleOptionTag(array('value' => 'ccc'));
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $tag->setValue('AAA');
-        $this->assertEqual($tag->getValue(), 'aaa');
-        $tag->setValue('ccc');
-        $this->assertEqual($tag->getValue(), 'ccc');
-    }
-    
-    function testSelectionDespiteSpuriousWhitespace() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $a = &new SimpleOptionTag(array());
-        $a->addContent(' AAA ');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('selected' => ''));
-        $b->addContent(' BBB ');
-        $tag->addTag($b);
-        $c = &new SimpleOptionTag(array());
-        $c->addContent(' CCC ');
-        $tag->addTag($c);
-        $this->assertEqual($tag->getValue(), ' BBB ');
-        $tag->setValue('AAA');
-        $this->assertEqual($tag->getValue(), ' AAA ');
-    }
-    
-    function testFailToSetIllegalOption() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $a = &new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = &new SimpleOptionTag(array());
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $this->assertFalse($tag->setValue('Not present'));
-        $this->assertEqual($tag->getValue(), 'BBB');
-    }
-    
-    function testNastyOptionValuesThatLookLikeFalse() {
-        $tag = &new SimpleSelectionTag(array('name' => 'a'));
-        $a = &new SimpleOptionTag(array('value' => '1'));
-        $a->addContent('One');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('value' => '0'));
-        $b->addContent('Zero');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getValue(), '1');
-        $tag->setValue('Zero');
-        $this->assertIdentical($tag->getValue(), '0');
-    }
-    
-    function testBlankOption() {
-        $tag = &new SimpleSelectionTag(array('name' => 'A'));
-        $a = &new SimpleOptionTag(array());
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array());
-        $b->addContent('b');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getValue(), '');
-        $tag->setValue('b');
-        $this->assertIdentical($tag->getValue(), 'b');
-        $tag->setValue('');
-        $this->assertIdentical($tag->getValue(), '');
-    }
-    
-    function testMultipleDefaultWithNoSelections() {
-        $tag = &new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = &new SimpleOptionTag(array());
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array());
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getDefault(), array());
-        $this->assertIdentical($tag->getValue(), array());
-    }
-    
-    function testMultipleDefaultWithSelections() {
-        $tag = &new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = &new SimpleOptionTag(array('selected' => ''));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array('selected' => ''));
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $this->assertIdentical($tag->getDefault(), array('AAA', 'BBB'));
-        $this->assertIdentical($tag->getValue(), array('AAA', 'BBB'));
-    }
-    
-    function testSettingMultiple() {
-        $tag = &new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = &new SimpleOptionTag(array('selected' => ''));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array());
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $c = &new SimpleOptionTag(array('selected' => '', 'value' => 'ccc'));
-        $c->addContent('CCC');
-        $tag->addTag($c);
-        $this->assertIdentical($tag->getDefault(), array('AAA', 'ccc'));
-        $this->assertTrue($tag->setValue(array('BBB', 'ccc')));
-        $this->assertIdentical($tag->getValue(), array('BBB', 'ccc'));
-        $this->assertTrue($tag->setValue(array()));
-        $this->assertIdentical($tag->getValue(), array());
-    }
-    
-    function testFailToSetIllegalOptionsInMultiple() {
-        $tag = &new MultipleSelectionTag(array('name' => 'a', 'multiple' => ''));
-        $a = &new SimpleOptionTag(array('selected' => ''));
-        $a->addContent('AAA');
-        $tag->addTag($a);
-        $b = &new SimpleOptionTag(array());
-        $b->addContent('BBB');
-        $tag->addTag($b);
-        $this->assertFalse($tag->setValue(array('CCC')));
-        $this->assertTrue($tag->setValue(array('AAA', 'BBB')));
-        $this->assertFalse($tag->setValue(array('AAA', 'CCC')));
-    }
-}
-
-class TestOfRadioGroup extends UnitTestCase {
-    
-    function testEmptyGroup() {
-        $group = &new SimpleRadioGroup();
-        $this->assertIdentical($group->getDefault(), false);
-        $this->assertIdentical($group->getValue(), false);
-        $this->assertFalse($group->setValue('a'));
-    }
-    
-    function testReadingSingleButtonGroup() {
-        $group = &new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), 'A');
-        $this->assertIdentical($group->getValue(), 'A');
-    }
-    
-    function testReadingMultipleButtonGroup() {
-        $group = &new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A')));
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), 'B');
-        $this->assertIdentical($group->getValue(), 'B');
-    }
-    
-    function testFailToSetUnlistedValue() {
-        $group = &new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(array('value' => 'z')));
-        $this->assertFalse($group->setValue('a'));
-        $this->assertIdentical($group->getValue(), false);
-    }
-    
-    function testSettingNewValueClearsTheOldOne() {
-        $group = &new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A')));
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertTrue($group->setValue('A'));
-        $this->assertIdentical($group->getValue(), 'A');
-    }
-    
-    function testIsIdMatchesAnyWidgetInSet() {
-        $group = &new SimpleRadioGroup();
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'A', 'id' => 'i1')));
-        $group->addWidget(new SimpleRadioButtonTag(
-                array('value' => 'B', 'id' => 'i2')));
-        $this->assertFalse($group->isId('i0'));
-        $this->assertTrue($group->isId('i1'));
-        $this->assertTrue($group->isId('i2'));
-    }
-    
-    function testIsLabelMatchesAnyWidgetInSet() {
-        $group = &new SimpleRadioGroup();
-        $button1 = &new SimpleRadioButtonTag(array('value' => 'A'));
-        $button1->setLabel('one');
-        $group->addWidget($button1);
-        $button2 = &new SimpleRadioButtonTag(array('value' => 'B'));
-        $button2->setLabel('two');
-        $group->addWidget($button2);
-        $this->assertFalse($group->isLabel('three'));
-        $this->assertTrue($group->isLabel('one'));
-        $this->assertTrue($group->isLabel('two'));
-    }
-}
-
-class TestOfTagGroup extends UnitTestCase {
-    
-    function testReadingMultipleCheckboxGroup() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), 'B');
-        $this->assertIdentical($group->getValue(), 'B');
-    }
-    
-    function testReadingMultipleUncheckedItems() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));            
-        $this->assertIdentical($group->getDefault(), false);
-        $this->assertIdentical($group->getValue(), false);
-    }
-    
-    function testReadingMultipleCheckedItems() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(
-                array('value' => 'A', 'checked' => '')));
-        $group->addWidget(new SimpleCheckboxTag(
-                array('value' => 'B', 'checked' => '')));
-        $this->assertIdentical($group->getDefault(), array('A', 'B'));
-        $this->assertIdentical($group->getValue(), array('A', 'B'));
-    }
-    
-    function testSettingSingleValue() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
-        $this->assertTrue($group->setValue('A'));
-        $this->assertIdentical($group->getValue(), 'A');
-        $this->assertTrue($group->setValue('B'));
-        $this->assertIdentical($group->getValue(), 'B');
-    }
-    
-    function testSettingMultipleValues() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
-        $this->assertTrue($group->setValue(array('A', 'B')));
-        $this->assertIdentical($group->getValue(), array('A', 'B'));
-    }
-    
-    function testSettingNoValue() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('value' => 'B')));
-        $this->assertTrue($group->setValue(false));
-        $this->assertIdentical($group->getValue(), false);
-    }
-    
-    function testIsIdMatchesAnyIdInSet() {
-        $group = &new SimpleCheckboxGroup();
-        $group->addWidget(new SimpleCheckboxTag(array('id' => 1, 'value' => 'A')));
-        $group->addWidget(new SimpleCheckboxTag(array('id' => 2, 'value' => 'B')));
-        $this->assertFalse($group->isId(0));
-        $this->assertTrue($group->isId(1));
-        $this->assertTrue($group->isId(2));
-    }
-}
-
-class TestOfUploadWidget extends UnitTestCase {
-    
-    function testValueIsFilePath() {
-        $upload = &new SimpleUploadTag(array('name' => 'a'));
-        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
-        $this->assertEqual($upload->getValue(), dirname(__FILE__) . '/support/upload_sample.txt');
-    }
-    
-    function testSubmitsFileContents() {
-        $encoding = &new MockSimpleMultipartEncoding();
-        $encoding->expectOnce('attach', array(
-                'a',
-                'Sample for testing file upload',
-                'upload_sample.txt'));
-        $upload = &new SimpleUploadTag(array('name' => 'a'));
-        $upload->setValue(dirname(__FILE__) . '/support/upload_sample.txt');
-        $upload->write($encoding);
-    }
-}
-
-class TestOfLabelTag extends UnitTestCase {
-    
-    function testLabelShouldHaveAnEndTag() {
-        $label = &new SimpleLabelTag(array());
-        $this->assertTrue($label->expectEndTag());
-    }
-    
-    function testContentIsTextOnly() {
-        $label = &new SimpleLabelTag(array());
-        $label->addContent('Here <tag>are</tag> words');
-        $this->assertEqual($label->getText(), 'Here are words');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/test_with_parse_error.php b/tests/simpletest/test/test_with_parse_error.php
deleted file mode 100644
index ca0238b48..000000000
--- a/tests/simpletest/test/test_with_parse_error.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-    // $Id: test_with_parse_error.php 901 2005-01-24 00:32:14Z lastcraft $
-
-    class TestCaseWithParseError extends UnitTestCase {
-        //wibble
-    }
-
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/unit_tester_test.php b/tests/simpletest/test/unit_tester_test.php
deleted file mode 100644
index 5fe78fe91..000000000
--- a/tests/simpletest/test/unit_tester_test.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-// $Id: unit_tester_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-
-class ReferenceForTesting {
-}
-
-class TestOfUnitTester extends UnitTestCase {
-    
-    function testAssertTrueReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertTrue(true));
-    }
-    
-    function testAssertFalseReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertFalse(false));
-    }
-    
-    function testAssertEqualReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertEqual(5, 5));
-    }
-    
-    function testAssertIdenticalReturnsAssertionAsBoolean() {
-        $this->assertTrue($this->assertIdentical(5, 5));
-    }
-    
-    function testCoreAssertionsDoNotThrowErrors() {
-        $this->assertIsA($this, 'UnitTestCase');
-        $this->assertNotA($this, 'WebTestCase');
-    }
-    
-    function testReferenceAssertionOnObjects() {
-        $a = &new ReferenceForTesting();
-        $b = &$a;
-        $this->assertReference($a, $b);
-    }
-    
-    function testReferenceAssertionOnScalars() {
-        $a = 25;
-        $b = &$a;
-        $this->assertReference($a, $b);
-    }
-    
-    function testCloneOnObjects() {
-        $a = &new ReferenceForTesting();
-        $b = &new ReferenceForTesting();
-        $this->assertClone($a, $b);
-    }
-    
-    function testCloneOnScalars() {
-        $a = 25;
-        $b = 25;
-        $this->assertClone($a, $b);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/unit_tests.php b/tests/simpletest/test/unit_tests.php
deleted file mode 100644
index 04dbc46ca..000000000
--- a/tests/simpletest/test/unit_tests.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-// $Id: unit_tests.php 1661 2008-02-26 21:04:31Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../unit_tester.php');
-require_once(dirname(__FILE__) . '/../shell_tester.php');
-require_once(dirname(__FILE__) . '/../mock_objects.php');
-require_once(dirname(__FILE__) . '/../web_tester.php');
-require_once(dirname(__FILE__) . '/../extensions/pear_test_case.php');
-require_once(dirname(__FILE__) . '/../extensions/phpunit_test_case.php');
-
-class UnitTests extends TestSuite {
-    function UnitTests() {
-        $this->TestSuite('Unit tests');
-        $path = dirname(__FILE__);
-        $this->addFile($path . '/errors_test.php');
-        if (version_compare(phpversion(), '5') >= 0) {
-            $this->addFile($path . '/exceptions_test.php');
-        }
-        $this->addFile($path . '/autorun_test.php');
-        $this->addFile($path . '/compatibility_test.php');
-        $this->addFile($path . '/simpletest_test.php');
-        $this->addFile($path . '/dumper_test.php');
-        $this->addFile($path . '/expectation_test.php');
-        $this->addFile($path . '/unit_tester_test.php');
-        if (version_compare(phpversion(), '5', '>=')) {
-            $this->addFile($path . '/reflection_php5_test.php');
-        } else {
-            $this->addFile($path . '/reflection_php4_test.php');
-        }
-        $this->addFile($path . '/mock_objects_test.php');
-        if (version_compare(phpversion(), '5', '>=')) {
-            $this->addFile($path . '/interfaces_test.php');
-        }
-        $this->addFile($path . '/collector_test.php');
-        $this->addFile($path . '/adapter_test.php');
-        $this->addFile($path . '/socket_test.php');
-        $this->addFile($path . '/encoding_test.php');
-        $this->addFile($path . '/url_test.php');
-        $this->addFile($path . '/cookies_test.php');
-        $this->addFile($path . '/http_test.php');
-        $this->addFile($path . '/authentication_test.php');
-        $this->addFile($path . '/user_agent_test.php');
-        $this->addFile($path . '/parser_test.php');
-        $this->addFile($path . '/tag_test.php');
-        $this->addFile($path . '/form_test.php');
-        $this->addFile($path . '/page_test.php');
-        $this->addFile($path . '/frames_test.php');
-        $this->addFile($path . '/browser_test.php');
-        $this->addFile($path . '/web_tester_test.php');
-        $this->addFile($path . '/shell_tester_test.php');
-        $this->addFile($path . '/xml_test.php');
-        $this->addFile($path . '/../extensions/testdox/test.php');
-    }
-}
-?>
diff --git a/tests/simpletest/test/url_test.php b/tests/simpletest/test/url_test.php
deleted file mode 100644
index 550717038..000000000
--- a/tests/simpletest/test/url_test.php
+++ /dev/null
@@ -1,443 +0,0 @@
-<?php
-// $Id: url_test.php 1598 2007-12-24 10:44:09Z pp11 $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../url.php');
-
-class TestOfUrl extends UnitTestCase {
-    
-    function testDefaultUrl() {
-        $url = new SimpleUrl('');
-        $this->assertEqual($url->getScheme(), '');
-        $this->assertEqual($url->getHost(), '');
-        $this->assertEqual($url->getScheme('http'), 'http');
-        $this->assertEqual($url->getHost('localhost'), 'localhost');
-        $this->assertEqual($url->getPath(), '');
-    }
-    
-    function testBasicParsing() {
-        $url = new SimpleUrl('https://www.lastcraft.com/test/');
-        $this->assertEqual($url->getScheme(), 'https');
-        $this->assertEqual($url->getHost(), 'www.lastcraft.com');
-        $this->assertEqual($url->getPath(), '/test/');
-    }
-    
-    function testRelativeUrls() {
-        $url = new SimpleUrl('../somewhere.php');
-        $this->assertEqual($url->getScheme(), false);
-        $this->assertEqual($url->getHost(), false);
-        $this->assertEqual($url->getPath(), '../somewhere.php');
-    }
-    
-    function testParseBareParameter() {
-        $url = new SimpleUrl('?a');
-        $this->assertEqual($url->getPath(), '');
-        $this->assertEqual($url->getEncodedRequest(), '?a');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
-    }
-    
-    function testParseEmptyParameter() {
-        $url = new SimpleUrl('?a=');
-        $this->assertEqual($url->getPath(), '');
-        $this->assertEqual($url->getEncodedRequest(), '?a=');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=&x=X');
-    }
-    
-    function testParseParameterPair() {
-        $url = new SimpleUrl('?a=A');
-        $this->assertEqual($url->getPath(), '');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&x=X');
-    }
-    
-    function testParseMultipleParameters() {
-        $url = new SimpleUrl('?a=A&b=B');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&x=X');
-    }
-    
-    function testParsingParameterMixture() {
-        $url = new SimpleUrl('?a=A&b=&c');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
-        $url->addRequestParameter('x', 'X');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c=&x=X');
-    }
-    
-    function testAddParametersFromScratch() {
-        $url = new SimpleUrl('');
-        $url->addRequestParameter('a', 'A');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A');
-        $url->addRequestParameter('b', 'B');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B');
-        $url->addRequestParameter('a', 'aaa');
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=B&a=aaa');
-    }
-    
-    function testClearingParameters() {
-        $url = new SimpleUrl('');
-        $url->addRequestParameter('a', 'A');
-        $url->clearRequest();
-        $this->assertIdentical($url->getEncodedRequest(), '');
-    }
-    
-    function testEncodingParameters() {
-        $url = new SimpleUrl('');
-        $url->addRequestParameter('a', '?!"\'#~@[]{}:;<>,./|�$%^&*()_+-=');
-        $this->assertIdentical(
-                $request = $url->getEncodedRequest(),
-                '?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%A3%24%25%5E%26%2A%28%29_%2B-%3D');
-    }
-    
-    function testDecodingParameters() {            
-        $url = new SimpleUrl('?a=%3F%21%22%27%23%7E%40%5B%5D%7B%7D%3A%3B%3C%3E%2C.%2F%7C%A3%24%25%5E%26%2A%28%29_%2B-%3D');
-        $this->assertEqual(
-                $url->getEncodedRequest(),
-                '?a=' . urlencode('?!"\'#~@[]{}:;<>,./|�$%^&*()_+-='));
-    }
-    
-    function testUrlInQueryDoesNotConfuseParsing() {
-        $url = new SimpleUrl('wibble/login.php?url=http://www.google.com/moo/');
-        $this->assertFalse($url->getScheme());
-        $this->assertFalse($url->getHost());
-        $this->assertEqual($url->getPath(), 'wibble/login.php');
-        $this->assertEqual($url->getEncodedRequest(), '?url=http://www.google.com/moo/');
-    }
-    
-    function testSettingCordinates() {
-        $url = new SimpleUrl('');
-        $url->setCoordinates('32', '45');
-        $this->assertIdentical($url->getX(), 32);
-        $this->assertIdentical($url->getY(), 45);
-        $this->assertEqual($url->getEncodedRequest(), '');
-    }
-    
-    function testParseCordinates() {
-        $url = new SimpleUrl('?32,45');
-        $this->assertIdentical($url->getX(), 32);
-        $this->assertIdentical($url->getY(), 45);
-    }
-    
-    function testClearingCordinates() {
-        $url = new SimpleUrl('?32,45');
-        $url->setCoordinates();
-        $this->assertIdentical($url->getX(), false);
-        $this->assertIdentical($url->getY(), false);
-    }
-    
-    function testParsingParameterCordinateMixture() {
-        $url = new SimpleUrl('?a=A&b=&c?32,45');
-        $this->assertIdentical($url->getX(), 32);
-        $this->assertIdentical($url->getY(), 45);
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c');
-    }
-    
-    function testParsingParameterWithBadCordinates() {
-        $url = new SimpleUrl('?a=A&b=&c?32');
-        $this->assertIdentical($url->getX(), false);
-        $this->assertIdentical($url->getY(), false);
-        $this->assertEqual($url->getEncodedRequest(), '?a=A&b=&c?32');
-    }
-    
-    function testPageSplitting() {
-        $url = new SimpleUrl('./here/../there/somewhere.php');
-        $this->assertEqual($url->getPath(), './here/../there/somewhere.php');
-        $this->assertEqual($url->getPage(), 'somewhere.php');
-        $this->assertEqual($url->getBasePath(), './here/../there/');
-    }
-    
-    function testAbsolutePathPageSplitting() {
-        $url = new SimpleUrl("http://host.com/here/there/somewhere.php");
-        $this->assertEqual($url->getPath(), "/here/there/somewhere.php");
-        $this->assertEqual($url->getPage(), "somewhere.php");
-        $this->assertEqual($url->getBasePath(), "/here/there/");
-    }
-    
-    function testSplittingUrlWithNoPageGivesEmptyPage() {
-        $url = new SimpleUrl('/here/there/');
-        $this->assertEqual($url->getPath(), '/here/there/');
-        $this->assertEqual($url->getPage(), '');
-        $this->assertEqual($url->getBasePath(), '/here/there/');
-    }
-    
-    function testPathNormalisation() {
-        $this->assertEqual(
-                SimpleUrl::normalisePath('https://host.com/I/am/here/../there/somewhere.php'),
-                'https://host.com/I/am/there/somewhere.php');
-    }
-
-    // regression test for #1535407
-    function testPathNormalisationWithSinglePeriod() {
-        $this->assertEqual(
-            SimpleUrl::normalisePath('https://host.com/I/am/here/./../there/somewhere.php'),
-            'https://host.com/I/am/there/somewhere.php');
-    }
-    
-    // regression test for #1852413
-    function testHostnameExtractedFromUContainingAtSign() {
-        $url = new SimpleUrl("http://localhost/name@example.com");
-        $this->assertEqual($url->getScheme(), "http");
-        $this->assertEqual($url->getUsername(), "");
-        $this->assertEqual($url->getPassword(), "");
-        $this->assertEqual($url->getHost(), "localhost");
-        $this->assertEqual($url->getPath(), "/name@example.com");
-    }
-
-    function testHostnameInLocalhost() {
-        $url = new SimpleUrl("http://localhost/name/example.com");
-        $this->assertEqual($url->getScheme(), "http");
-        $this->assertEqual($url->getUsername(), "");
-        $this->assertEqual($url->getPassword(), "");
-        $this->assertEqual($url->getHost(), "localhost");
-        $this->assertEqual($url->getPath(), "/name/example.com");
-    }
-
-    function testUsernameAndPasswordAreUrlDecoded() {
-        $url = new SimpleUrl('http://' . urlencode('test@test') .
-                ':' . urlencode('$!�@*&%') . '@www.lastcraft.com');
-        $this->assertEqual($url->getUsername(), 'test@test');
-        $this->assertEqual($url->getPassword(), '$!�@*&%');
-    }
-    
-    function testBlitz() {
-        $this->assertUrl(
-                "https://username:password@www.somewhere.com:243/this/that/here.php?a=1&b=2#anchor",
-                array("https", "username", "password", "www.somewhere.com", 243, "/this/that/here.php", "com", "?a=1&b=2", "anchor"),
-                array("a" => "1", "b" => "2"));
-        $this->assertUrl(
-                "username:password@www.somewhere.com/this/that/here.php?a=1",
-                array(false, "username", "password", "www.somewhere.com", false, "/this/that/here.php", "com", "?a=1", false),
-                array("a" => "1"));
-        $this->assertUrl(
-                "username:password@somewhere.com:243?1,2",
-                array(false, "username", "password", "somewhere.com", 243, "/", "com", "", false),
-                array(),
-                array(1, 2));
-        $this->assertUrl(
-                "https://www.somewhere.com",
-                array("https", false, false, "www.somewhere.com", false, "/", "com", "", false));
-        $this->assertUrl(
-                "username@www.somewhere.com:243#anchor",
-                array(false, "username", false, "www.somewhere.com", 243, "/", "com", "", "anchor"));
-        $this->assertUrl(
-                "/this/that/here.php?a=1&b=2?3,4",
-                array(false, false, false, false, false, "/this/that/here.php", false, "?a=1&b=2", false),
-                array("a" => "1", "b" => "2"),
-                array(3, 4));
-        $this->assertUrl(
-                "username@/here.php?a=1&b=2",
-                array(false, "username", false, false, false, "/here.php", false, "?a=1&b=2", false),
-                array("a" => "1", "b" => "2"));
-    }
-    
-    function testAmbiguousHosts() {
-        $this->assertUrl(
-                "tigger",
-                array(false, false, false, false, false, "tigger", false, "", false));
-        $this->assertUrl(
-                "/tigger",
-                array(false, false, false, false, false, "/tigger", false, "", false));
-        $this->assertUrl(
-                "//tigger",
-                array(false, false, false, "tigger", false, "/", false, "", false));
-        $this->assertUrl(
-                "//tigger/",
-                array(false, false, false, "tigger", false, "/", false, "", false));
-        $this->assertUrl(
-                "tigger.com",
-                array(false, false, false, "tigger.com", false, "/", "com", "", false));
-        $this->assertUrl(
-                "me.net/tigger",
-                array(false, false, false, "me.net", false, "/tigger", "net", "", false));
-    }
-    
-    function testAsString() {
-        $this->assertPreserved('https://www.here.com');
-        $this->assertPreserved('http://me:secret@www.here.com');
-        $this->assertPreserved('http://here/there');
-        $this->assertPreserved('http://here/there?a=A&b=B');
-        $this->assertPreserved('http://here/there?a=1&a=2');
-        $this->assertPreserved('http://here/there?a=1&a=2?9,8');
-        $this->assertPreserved('http://host?a=1&a=2');
-        $this->assertPreserved('http://host#stuff');
-        $this->assertPreserved('http://me:secret@www.here.com/a/b/c/here.html?a=A?7,6');
-        $this->assertPreserved('http://www.here.com/?a=A__b=B');
-    }
-    
-    function assertUrl($raw, $parts, $params = false, $coords = false) {
-        if (! is_array($params)) {
-            $params = array();
-        }
-        $url = new SimpleUrl($raw);
-        $this->assertIdentical($url->getScheme(), $parts[0], "[$raw] scheme -> %s");
-        $this->assertIdentical($url->getUsername(), $parts[1], "[$raw] username -> %s");
-        $this->assertIdentical($url->getPassword(), $parts[2], "[$raw] password -> %s");
-        $this->assertIdentical($url->getHost(), $parts[3], "[$raw] host -> %s");
-        $this->assertIdentical($url->getPort(), $parts[4], "[$raw] port -> %s");
-        $this->assertIdentical($url->getPath(), $parts[5], "[$raw] path -> %s");
-        $this->assertIdentical($url->getTld(), $parts[6], "[$raw] tld -> %s");
-        $this->assertIdentical($url->getEncodedRequest(), $parts[7], "[$raw] encoded -> %s");
-        $this->assertIdentical($url->getFragment(), $parts[8], "[$raw] fragment -> %s");
-        if ($coords) {
-            $this->assertIdentical($url->getX(), $coords[0], "[$raw] x -> %s");
-            $this->assertIdentical($url->getY(), $coords[1], "[$raw] y -> %s");
-        }
-    }
-    
-    function testUrlWithTwoSlashesInPath() {
-        $url = new SimpleUrl('/article/categoryedit/insert//');
-        $this->assertEqual($url->getPath(), '/article/categoryedit/insert//');
-    }
-    
-    function assertPreserved($string) {
-        $url = new SimpleUrl($string);
-        $this->assertEqual($url->asString(), $string);
-    }
-}
-
-class TestOfAbsoluteUrls extends UnitTestCase {
-    
-	function testDirectoriesAfterFilename() {
-		$string = '../../index.php/foo/bar';
-		$url = new SimpleUrl($string);
-		$this->assertEqual($url->asString(), $string);
-		
-		$absolute = $url->makeAbsolute('http://www.domain.com/some/path/');
-		$this->assertEqual($absolute->asString(), 'http://www.domain.com/index.php/foo/bar');
-	}
-
-    function testMakingAbsolute() {
-        $url = new SimpleUrl('../there/somewhere.php');
-        $this->assertEqual($url->getPath(), '../there/somewhere.php');
-        $absolute = $url->makeAbsolute('https://host.com:1234/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'https');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPort(), 1234);
-        $this->assertEqual($absolute->getPath(), '/I/am/there/somewhere.php');
-    }
-    
-    function testMakingAnEmptyUrlAbsolute() {
-        $url = new SimpleUrl('');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/page.html');
-    }
-    
-    function testMakingAnEmptyUrlAbsoluteWithMissingPageName() {
-        $url = new SimpleUrl('');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/');
-    }
-    
-    function testMakingAShortQueryUrlAbsolute() {
-        $url = new SimpleUrl('?a#b');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/');
-        $this->assertEqual($absolute->getEncodedRequest(), '?a');
-        $this->assertEqual($absolute->getFragment(), 'b');
-    }
-    
-    function testMakingADirectoryUrlAbsolute() {
-        $url = new SimpleUrl('hello/');
-        $this->assertEqual($url->getPath(), 'hello/');
-        $this->assertEqual($url->getBasePath(), 'hello/');
-        $this->assertEqual($url->getPage(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/hello/');
-    }
-    
-    function testMakingARootUrlAbsolute() {
-        $url = new SimpleUrl('/');
-        $this->assertEqual($url->getPath(), '/');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getPath(), '/');
-    }
-    
-    function testMakingARootPageUrlAbsolute() {
-        $url = new SimpleUrl('/here.html');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/page.html');
-        $this->assertEqual($absolute->getPath(), '/here.html');
-    }
-    
-    function testCarryAuthenticationFromRootPage() {
-        $url = new SimpleUrl('here.html');
-        $absolute = $url->makeAbsolute('http://test:secret@host.com/');
-        $this->assertEqual($absolute->getPath(), '/here.html');
-        $this->assertEqual($absolute->getUsername(), 'test');
-        $this->assertEqual($absolute->getPassword(), 'secret');
-    }
-    
-    function testMakingCoordinateUrlAbsolute() {
-        $url = new SimpleUrl('?1,2');
-        $this->assertEqual($url->getPath(), '');
-        $absolute = $url->makeAbsolute('http://host.com/I/am/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'host.com');
-        $this->assertEqual($absolute->getPath(), '/I/am/here/');
-        $this->assertEqual($absolute->getX(), 1);
-        $this->assertEqual($absolute->getY(), 2);
-    }
-    
-    function testMakingAbsoluteAppendedPath() {
-        $url = new SimpleUrl('./there/somewhere.php');
-        $absolute = $url->makeAbsolute('https://host.com/here/');
-        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
-    }
-    
-    function testMakingAbsoluteBadlyFormedAppendedPath() {
-        $url = new SimpleUrl('there/somewhere.php');
-        $absolute = $url->makeAbsolute('https://host.com/here/');
-        $this->assertEqual($absolute->getPath(), '/here/there/somewhere.php');
-    }
-    
-    function testMakingAbsoluteHasNoEffectWhenAlreadyAbsolute() {
-        $url = new SimpleUrl('https://test:secret@www.lastcraft.com:321/stuff/?a=1#f');
-        $absolute = $url->makeAbsolute('http://host.com/here/');
-        $this->assertEqual($absolute->getScheme(), 'https');
-        $this->assertEqual($absolute->getUsername(), 'test');
-        $this->assertEqual($absolute->getPassword(), 'secret');
-        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
-        $this->assertEqual($absolute->getPort(), 321);
-        $this->assertEqual($absolute->getPath(), '/stuff/');
-        $this->assertEqual($absolute->getEncodedRequest(), '?a=1');
-        $this->assertEqual($absolute->getFragment(), 'f');
-    }
-    
-    function testMakingAbsoluteCarriesAuthenticationWhenAlreadyAbsolute() {
-        $url = new SimpleUrl('https://www.lastcraft.com');
-        $absolute = $url->makeAbsolute('http://test:secret@host.com/here/');
-        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
-        $this->assertEqual($absolute->getUsername(), 'test');
-        $this->assertEqual($absolute->getPassword(), 'secret');
-    }
-    
-    function testMakingHostOnlyAbsoluteDoesNotCarryAnyOtherInformation() {
-        $url = new SimpleUrl('http://www.lastcraft.com');
-        $absolute = $url->makeAbsolute('https://host.com:81/here/');
-        $this->assertEqual($absolute->getScheme(), 'http');
-        $this->assertEqual($absolute->getHost(), 'www.lastcraft.com');
-        $this->assertIdentical($absolute->getPort(), false);
-        $this->assertEqual($absolute->getPath(), '/');
-    }
-}
-
-class TestOfFrameUrl extends UnitTestCase {
-    
-    function testTargetAttachment() {
-        $url = new SimpleUrl('http://www.site.com/home.html');
-        $this->assertIdentical($url->getTarget(), false);
-        $url->setTarget('A frame');
-        $this->assertIdentical($url->getTarget(), 'A frame');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/user_agent_test.php b/tests/simpletest/test/user_agent_test.php
deleted file mode 100644
index 657c7e155..000000000
--- a/tests/simpletest/test/user_agent_test.php
+++ /dev/null
@@ -1,358 +0,0 @@
-<?php
-// $Id: user_agent_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../user_agent.php');
-require_once(dirname(__FILE__) . '/../authentication.php');
-require_once(dirname(__FILE__) . '/../http.php');
-require_once(dirname(__FILE__) . '/../encoding.php');
-Mock::generate('SimpleHttpRequest');
-Mock::generate('SimpleHttpResponse');
-Mock::generate('SimpleHttpHeaders');
-Mock::generatePartial('SimpleUserAgent', 'MockRequestUserAgent', array('_createHttpRequest'));
-
-class TestOfFetchingUrlParameters extends UnitTestCase {
-    
-    function setUp() {
-        $this->_headers = &new MockSimpleHttpHeaders();
-        
-        $this->_response = &new MockSimpleHttpResponse();
-        $this->_response->setReturnValue('isError', false);
-        $this->_response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
-        
-        $this->_request = &new MockSimpleHttpRequest();
-        $this->_request->setReturnReference('fetch', $this->_response);
-    }
-    
-    function testGetRequestWithoutIncidentGivesNoErrors() {
-        $url = new SimpleUrl('http://test:secret@this.com/page.html');
-        $url->addRequestParameters(array('a' => 'A', 'b' => 'B'));
-        
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReference('_createHttpRequest', $this->_request);
-        $agent->SimpleUserAgent();
-        
-        $response = &$agent->fetchResponse(
-                new SimpleUrl('http://test:secret@this.com/page.html'),
-                new SimpleGetEncoding(array('a' => 'A', 'b' => 'B')));
-        $this->assertFalse($response->isError());
-    }
-}
-
-class TestOfAdditionalHeaders extends UnitTestCase {
-    
-    function testAdditionalHeaderAddedToRequest() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
-        
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        $request->expectOnce(
-                'addHeaderLine',
-                array('User-Agent: SimpleTest'));
-        
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReference('_createHttpRequest', $request);
-        $agent->SimpleUserAgent();
-        $agent->addHeader('User-Agent: SimpleTest');
-        $response = &$agent->fetchResponse(new SimpleUrl('http://this.host/'), new SimpleGetEncoding());
-    }
-}
-
-class TestOfBrowserCookies extends UnitTestCase {
-
-    function &_createStandardResponse() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue("isError", false);
-        $response->setReturnValue("getContent", "stuff");
-        $response->setReturnReference("getHeaders", new MockSimpleHttpHeaders());
-        return $response;
-    }
-    
-    function &_createCookieSite($header_lines) {
-        $headers = &new SimpleHttpHeaders($header_lines);
-        
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue("isError", false);
-        $response->setReturnReference("getHeaders", $headers);
-        $response->setReturnValue("getContent", "stuff");
-        
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference("fetch", $response);
-        return $request;
-    }
-    
-    function &_createMockedRequestUserAgent(&$request) {
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReference('_createHttpRequest', $request);
-        $agent->SimpleUserAgent();
-        return $agent;
-    }
-    
-    function testCookieJarIsSentToRequest() {
-        $jar = new SimpleCookieJar();
-        $jar->setCookie('a', 'A');
-        
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $this->_createStandardResponse());
-        $request->expectOnce('readCookiesFromJar', array($jar, '*'));
-        
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        $agent->setCookie('a', 'A');
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-    }
-      
-    function testNoCookieJarIsSentToRequestWhenCookiesAreDisabled() {
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $this->_createStandardResponse());
-        $request->expectNever('readCookiesFromJar');
-        
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        $agent->setCookie('a', 'A');
-        $agent->ignoreCookies();
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-    }
-  
-    function testReadingNewCookie() {
-        $request = &$this->_createCookieSite('Set-cookie: a=AAAA');
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
-    }
-  
-    function testIgnoringNewCookieWhenCookiesDisabled() {
-        $request = &$this->_createCookieSite('Set-cookie: a=AAAA');
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        $agent->ignoreCookies();
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertIdentical($agent->getCookieValue("this.com", "this/path/", "a"), false);
-    }
-   
-    function testOverwriteCookieThatAlreadyExists() {
-        $request = &$this->_createCookieSite('Set-cookie: a=AAAA');
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        $agent->setCookie('a', 'A');
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertEqual($agent->getCookieValue("this.com", "this/path/", "a"), "AAAA");
-    }
-   
-    function testClearCookieBySettingExpiry() {
-        $request = &$this->_createCookieSite('Set-cookie: a=b');
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        
-        $agent->setCookie("a", "A", "this/path/", "Wed, 25-Dec-02 04:24:21 GMT");
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                "b");
-        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                false);
-    }
-    
-    function testAgeingAndClearing() {
-        $request = &$this->_createCookieSite('Set-cookie: a=A; expires=Wed, 25-Dec-02 04:24:21 GMT; path=/this/path');
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                "A");
-        $agent->ageCookies(2);
-        $agent->restart("Wed, 25-Dec-02 04:24:20 GMT");
-        $this->assertIdentical(
-                $agent->getCookieValue("this.com", "this/path/", "a"),
-                false);
-    }
-    
-    function testReadingIncomingAndSettingNewCookies() {
-        $request = &$this->_createCookieSite('Set-cookie: a=AAA');
-        $agent = &$this->_createMockedRequestUserAgent($request);
-        
-        $this->assertNull($agent->getBaseCookieValue("a", false));
-        $agent->fetchResponse(
-                new SimpleUrl('http://this.com/this/path/page.html'),
-                new SimpleGetEncoding());
-        $agent->setCookie("b", "BBB", "this.com", "this/path/");
-        $this->assertEqual(
-                $agent->getBaseCookieValue("a", new SimpleUrl('http://this.com/this/path/page.html')),
-                "AAA");
-        $this->assertEqual(
-                $agent->getBaseCookieValue("b", new SimpleUrl('http://this.com/this/path/page.html')),
-                "BBB");
-    }
-}
-
-class TestOfHttpRedirects extends UnitTestCase {
-    
-    function &createRedirect($content, $redirect) {
-        $headers = &new MockSimpleHttpHeaders();
-        $headers->setReturnValue('isRedirect', (boolean)$redirect);
-        $headers->setReturnValue('getLocation', $redirect);
-        
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('getContent', $content);
-        $response->setReturnReference('getHeaders', $headers);
-        
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        return $request;
-    }
-    
-    function testDisabledRedirects() {
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReference(
-                '_createHttpRequest',
-                $this->createRedirect('stuff', 'there.html'));
-        $agent->expectOnce('_createHttpRequest');
-        $agent->SimpleUserAgent();
-        
-        $agent->setMaximumRedirects(0);
-        $response = &$agent->fetchResponse(new SimpleUrl('here.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'stuff');
-    }
-    
-    function testSingleRedirect() {
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReferenceAt(
-                0,
-                '_createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->setReturnReferenceAt(
-                1,
-                '_createHttpRequest',
-                $this->createRedirect('second', 'three.html'));
-        $agent->expectCallCount('_createHttpRequest', 2);
-        $agent->SimpleUserAgent();
-        
-        $agent->setMaximumRedirects(1);
-        $response = &$agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'second');
-    }
-    
-    function testDoubleRedirect() {
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReferenceAt(
-                0,
-                '_createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->setReturnReferenceAt(
-                1,
-                '_createHttpRequest',
-                $this->createRedirect('second', 'three.html'));
-        $agent->setReturnReferenceAt(
-                2,
-                '_createHttpRequest',
-                $this->createRedirect('third', 'four.html'));
-        $agent->expectCallCount('_createHttpRequest', 3);
-        $agent->SimpleUserAgent();
-        
-        $agent->setMaximumRedirects(2);
-        $response = &$agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'third');
-    }
-    
-    function testSuccessAfterRedirect() {
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReferenceAt(
-                0,
-                '_createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->setReturnReferenceAt(
-                1,
-                '_createHttpRequest',
-                $this->createRedirect('second', false));
-        $agent->setReturnReferenceAt(
-                2,
-                '_createHttpRequest',
-                $this->createRedirect('third', 'four.html'));
-        $agent->expectCallCount('_createHttpRequest', 2);
-        $agent->SimpleUserAgent();
-        
-        $agent->setMaximumRedirects(2);
-        $response = &$agent->fetchResponse(new SimpleUrl('one.html'), new SimpleGetEncoding());
-        $this->assertEqual($response->getContent(), 'second');
-    }
-    
-    function testRedirectChangesPostToGet() {
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReferenceAt(
-                0,
-                '_createHttpRequest',
-                $this->createRedirect('first', 'two.html'));
-        $agent->expectArgumentsAt(0, '_createHttpRequest', array('*', new IsAExpectation('SimplePostEncoding')));
-        $agent->setReturnReferenceAt(
-                1,
-                '_createHttpRequest',
-                $this->createRedirect('second', 'three.html'));
-        $agent->expectArgumentsAt(1, '_createHttpRequest', array('*', new IsAExpectation('SimpleGetEncoding')));
-        $agent->expectCallCount('_createHttpRequest', 2);
-        $agent->SimpleUserAgent();
-        $agent->setMaximumRedirects(1);
-        $response = &$agent->fetchResponse(new SimpleUrl('one.html'), new SimplePostEncoding());
-    }
-}
-
-class TestOfBadHosts extends UnitTestCase {
-    
-    function &_createSimulatedBadHost() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnValue('isError', true);
-        $response->setReturnValue('getError', 'Bad socket');
-        $response->setReturnValue('getContent', false);
-        
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        return $request;
-    }
-    
-    function testUntestedHost() {
-        $request = &$this->_createSimulatedBadHost();
-        
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReference('_createHttpRequest', $request);
-        $agent->SimpleUserAgent();
-        
-        $response = &$agent->fetchResponse(
-                new SimpleUrl('http://this.host/this/path/page.html'),
-                new SimpleGetEncoding());
-        $this->assertTrue($response->isError());
-    }
-}
-
-class TestOfAuthorisation extends UnitTestCase {
-    
-    function testAuthenticateHeaderAdded() {
-        $response = &new MockSimpleHttpResponse();
-        $response->setReturnReference('getHeaders', new MockSimpleHttpHeaders());
-        
-        $request = &new MockSimpleHttpRequest();
-        $request->setReturnReference('fetch', $response);
-        $request->expectOnce(
-                'addHeaderLine',
-                array('Authorization: Basic ' . base64_encode('test:secret')));
-        
-        $agent = &new MockRequestUserAgent();
-        $agent->setReturnReference('_createHttpRequest', $request);
-        $agent->SimpleUserAgent();
-        $response = &$agent->fetchResponse(
-                new SimpleUrl('http://test:secret@this.host'),
-                new SimpleGetEncoding());
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/visual_test.php b/tests/simpletest/test/visual_test.php
deleted file mode 100644
index 13781bb65..000000000
--- a/tests/simpletest/test/visual_test.php
+++ /dev/null
@@ -1,495 +0,0 @@
-<?php
-    // $Id: visual_test.php 1547 2007-07-04 00:42:05Z lastcraft $
-
-    // NOTE:
-    // Some of these tests are designed to fail! Do not be alarmed.
-    //                         ----------------
-
-    // The following tests are a bit hacky. Whilst Kent Beck tried to
-    // build a unit tester with a unit tester, I am not that brave.
-    // Instead I have just hacked together odd test scripts until
-    // I have enough of a tester to procede more formally.
-    //
-    // The proper tests start in all_tests.php
-    require_once('../unit_tester.php');
-    require_once('../shell_tester.php');
-    require_once('../mock_objects.php');
-    require_once('../reporter.php');
-    require_once('../xml.php');
-
-    class TestDisplayClass {
-        var $_a;
-
-        function TestDisplayClass($a) {
-            $this->_a = $a;
-        }
-    }
-
-    class PassingUnitTestCaseOutput extends UnitTestCase {
-
-        function testOfResults() {
-            $this->pass('Pass');
-        }
-
-        function testTrue() {
-            $this->assertTrue(true);
-        }
-
-        function testFalse() {
-            $this->assertFalse(false);
-        }
-
-        function testExpectation() {
-            $expectation = &new EqualExpectation(25, 'My expectation message: %s');
-            $this->assert($expectation, 25, 'My assert message : %s');
-        }
-
-        function testNull() {
-            $this->assertNull(null, "%s -> Pass");
-            $this->assertNotNull(false, "%s -> Pass");
-        }
-
-        function testType() {
-            $this->assertIsA("hello", "string", "%s -> Pass");
-            $this->assertIsA($this, "PassingUnitTestCaseOutput", "%s -> Pass");
-            $this->assertIsA($this, "UnitTestCase", "%s -> Pass");
-        }
-
-        function testTypeEquality() {
-            $this->assertEqual("0", 0, "%s -> Pass");
-        }
-
-        function testNullEquality() {
-            $this->assertNotEqual(null, 1, "%s -> Pass");
-            $this->assertNotEqual(1, null, "%s -> Pass");
-        }
-
-        function testIntegerEquality() {
-            $this->assertNotEqual(1, 2, "%s -> Pass");
-        }
-
-        function testStringEquality() {
-            $this->assertEqual("a", "a", "%s -> Pass");
-            $this->assertNotEqual("aa", "ab", "%s -> Pass");
-        }
-
-        function testHashEquality() {
-            $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> Pass");
-        }
-
-        function testWithin() {
-            $this->assertWithinMargin(5, 5.4, 0.5, "%s -> Pass");
-        }
-
-        function testOutside() {
-            $this->assertOutsideMargin(5, 5.6, 0.5, "%s -> Pass");
-        }
-
-        function testStringIdentity() {
-            $a = "fred";
-            $b = $a;
-            $this->assertIdentical($a, $b, "%s -> Pass");
-        }
-
-        function testTypeIdentity() {
-            $a = "0";
-            $b = 0;
-            $this->assertNotIdentical($a, $b, "%s -> Pass");
-        }
-
-        function testNullIdentity() {
-            $this->assertNotIdentical(null, 1, "%s -> Pass");
-            $this->assertNotIdentical(1, null, "%s -> Pass");
-        }
-
-        function testHashIdentity() {
-        }
-
-        function testObjectEquality() {
-            $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Pass");
-            $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Pass");
-        }
-
-        function testObjectIndentity() {
-            $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Pass");
-            $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Pass");
-        }
-
-        function testReference() {
-            $a = "fred";
-            $b = &$a;
-            $this->assertReference($a, $b, "%s -> Pass");
-        }
-
-        function testCloneOnDifferentObjects() {
-            $a = "fred";
-            $b = $a;
-            $c = "Hello";
-            $this->assertClone($a, $b, "%s -> Pass");
-        }
-
-        function testPatterns() {
-            $this->assertPattern('/hello/i', "Hello there", "%s -> Pass");
-            $this->assertNoPattern('/hello/', "Hello there", "%s -> Pass");
-        }
-
-        function testLongStrings() {
-            $text = "";
-            for ($i = 0; $i < 10; $i++) {
-                $text .= "0123456789";
-            }
-            $this->assertEqual($text, $text);
-        }
-    }
-
-    class FailingUnitTestCaseOutput extends UnitTestCase {
-
-        function testOfResults() {
-            $this->fail('Fail');        // Fail.
-        }
-
-        function testTrue() {
-            $this->assertTrue(false);        // Fail.
-        }
-
-        function testFalse() {
-            $this->assertFalse(true);        // Fail.
-        }
-
-        function testExpectation() {
-            $expectation = &new EqualExpectation(25, 'My expectation message: %s');
-            $this->assert($expectation, 24, 'My assert message : %s');        // Fail.
-        }
-
-        function testNull() {
-            $this->assertNull(false, "%s -> Fail");        // Fail.
-            $this->assertNotNull(null, "%s -> Fail");        // Fail.
-        }
-
-        function testType() {
-            $this->assertIsA(14, "string", "%s -> Fail");        // Fail.
-            $this->assertIsA(14, "TestOfUnitTestCaseOutput", "%s -> Fail");        // Fail.
-            $this->assertIsA($this, "TestReporter", "%s -> Fail");        // Fail.
-        }
-
-        function testTypeEquality() {
-            $this->assertNotEqual("0", 0, "%s -> Fail");        // Fail.
-        }
-
-        function testNullEquality() {
-            $this->assertEqual(null, 1, "%s -> Fail");        // Fail.
-            $this->assertEqual(1, null, "%s -> Fail");        // Fail.
-        }
-
-        function testIntegerEquality() {
-            $this->assertEqual(1, 2, "%s -> Fail");        // Fail.
-        }
-
-        function testStringEquality() {
-            $this->assertNotEqual("a", "a", "%s -> Fail");    // Fail.
-            $this->assertEqual("aa", "ab", "%s -> Fail");        // Fail.
-        }
-
-        function testHashEquality() {
-            $this->assertEqual(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "Z"), "%s -> Fail");
-        }
-
-        function testWithin() {
-            $this->assertWithinMargin(5, 5.6, 0.5, "%s -> Fail");   // Fail.
-        }
-
-        function testOutside() {
-            $this->assertOutsideMargin(5, 5.4, 0.5, "%s -> Fail");   // Fail.
-        }
-
-        function testStringIdentity() {
-            $a = "fred";
-            $b = $a;
-            $this->assertNotIdentical($a, $b, "%s -> Fail");       // Fail.
-        }
-
-        function testTypeIdentity() {
-            $a = "0";
-            $b = 0;
-            $this->assertIdentical($a, $b, "%s -> Fail");        // Fail.
-        }
-
-        function testNullIdentity() {
-            $this->assertIdentical(null, 1, "%s -> Fail");        // Fail.
-            $this->assertIdentical(1, null, "%s -> Fail");        // Fail.
-        }
-
-        function testHashIdentity() {
-            $this->assertIdentical(array("a" => "A", "b" => "B"), array("b" => "B", "a" => "A"), "%s -> fail");        // Fail.
-        }
-
-        function testObjectEquality() {
-            $this->assertNotEqual(new TestDisplayClass(4), new TestDisplayClass(4), "%s -> Fail");    // Fail.
-            $this->assertEqual(new TestDisplayClass(4), new TestDisplayClass(5), "%s -> Fail");        // Fail.
-        }
-
-        function testObjectIndentity() {
-            $this->assertNotIdentical(new TestDisplayClass(false), new TestDisplayClass(false), "%s -> Fail");    // Fail.
-            $this->assertIdentical(new TestDisplayClass(false), new TestDisplayClass(0), "%s -> Fail");        // Fail.
-        }
-
-        function testReference() {
-            $a = "fred";
-            $b = &$a;
-            $this->assertClone($a, $b, "%s -> Fail");        // Fail.
-        }
-
-        function testCloneOnDifferentObjects() {
-            $a = "fred";
-            $b = $a;
-            $c = "Hello";
-            $this->assertClone($a, $c, "%s -> Fail");        // Fail.
-        }
-
-        function testPatterns() {
-            $this->assertPattern('/hello/', "Hello there", "%s -> Fail");            // Fail.
-            $this->assertNoPattern('/hello/i', "Hello there", "%s -> Fail");      // Fail.
-        }
-
-        function testLongStrings() {
-            $text = "";
-            for ($i = 0; $i < 10; $i++) {
-                $text .= "0123456789";
-            }
-            $this->assertEqual($text . $text, $text . "a" . $text);        // Fail.
-        }
-	}
-
-    class Dummy {
-        function Dummy() {
-        }
-
-        function a() {
-        }
-    }
-    Mock::generate('Dummy');
-
-    class TestOfMockObjectsOutput extends UnitTestCase {
-
-        function testCallCounts() {
-            $dummy = &new MockDummy();
-            $dummy->expectCallCount('a', 1, 'My message: %s');
-            $dummy->a();
-            $dummy->a();
-        }
-
-        function testMinimumCallCounts() {
-            $dummy = &new MockDummy();
-            $dummy->expectMinimumCallCount('a', 2, 'My message: %s');
-            $dummy->a();
-            $dummy->a();
-        }
-
-        function testEmptyMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array());
-            $dummy->a();
-            $dummy->a(null);        // Fail.
-        }
-
-        function testEmptyMatchingWithCustomMessage() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(), 'My expectation message: %s');
-            $dummy->a();
-            $dummy->a(null);        // Fail.
-        }
-
-        function testNullMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(null));
-            $dummy->a(null);
-            $dummy->a();        // Fail.
-        }
-
-        function testBooleanMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(true, false));
-            $dummy->a(true, false);
-            $dummy->a(true, true);        // Fail.
-        }
-
-        function testIntegerMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(32, 33));
-            $dummy->a(32, 33);
-            $dummy->a(32, 34);        // Fail.
-        }
-
-        function testFloatMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(3.2, 3.3));
-            $dummy->a(3.2, 3.3);
-            $dummy->a(3.2, 3.4);        // Fail.
-        }
-
-        function testStringMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array('32', '33'));
-            $dummy->a('32', '33');
-            $dummy->a('32', '34');        // Fail.
-        }
-
-        function testEmptyMatchingWithCustomExpectationMessage() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments(
-                    'a',
-                    array(new EqualExpectation('A', 'My part expectation message: %s')),
-                    'My expectation message: %s');
-            $dummy->a('A');
-            $dummy->a('B');        // Fail.
-        }
-
-        function testArrayMatching() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(array(32), array(33)));
-            $dummy->a(array(32), array(33));
-            $dummy->a(array(32), array('33'));        // Fail.
-        }
-
-        function testObjectMatching() {
-            $a = new Dummy();
-            $a->a = 'a';
-            $b = new Dummy();
-            $b->b = 'b';
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array($a, $b));
-            $dummy->a($a, $b);
-            $dummy->a($a, $a);        // Fail.
-        }
-
-        function testBigList() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array(false, 0, 1, 1.0));
-            $dummy->a(false, 0, 1, 1.0);
-            $dummy->a(true, false, 2, 2.0);        // Fail.
-        }
-    }
-
-    class TestOfPastBugs extends UnitTestCase {
-
-        function testMixedTypes() {
-            $this->assertEqual(array(), null, "%s -> Pass");
-            $this->assertIdentical(array(), null, "%s -> Fail");    // Fail.
-        }
-
-        function testMockWildcards() {
-            $dummy = &new MockDummy();
-            $dummy->expectArguments('a', array('*', array(33)));
-            $dummy->a(array(32), array(33));
-            $dummy->a(array(32), array('33'));        // Fail.
-        }
-    }
-
-    class TestOfVisualShell extends ShellTestCase {
-
-        function testDump() {
-            $this->execute('ls');
-            $this->dumpOutput();
-            $this->execute('dir');
-            $this->dumpOutput();
-        }
-
-        function testDumpOfList() {
-            $this->execute('ls');
-            $this->dump($this->getOutputAsList());
-        }
-    }
-
-    class PassesAsWellReporter extends HtmlReporter {
-
-        function _getCss() {
-            return parent::_getCss() . ' .pass { color: darkgreen; }';
-        }
-
-        function paintPass($message) {
-            parent::paintPass($message);
-            print "<span class=\"pass\">Pass</span>: ";
-            $breadcrumb = $this->getTestList();
-            array_shift($breadcrumb);
-            print implode(" -&gt; ", $breadcrumb);
-            print " -&gt; " . htmlentities($message) . "<br />\n";
-        }
-
-        function paintSignal($type, &$payload) {
-            print "<span class=\"fail\">$type</span>: ";
-            $breadcrumb = $this->getTestList();
-            array_shift($breadcrumb);
-            print implode(" -&gt; ", $breadcrumb);
-            print " -&gt; " . htmlentities(serialize($payload)) . "<br />\n";
-        }
-    }
-    
-    class TestOfSkippingNoMatterWhat extends UnitTestCase {
-        function skip() {
-            $this->skipIf(true, 'Always skipped -> %s');
-        }
-        
-        function testFail() {
-            $this->fail('This really shouldn\'t have happened');
-        }
-    }
-    
-    class TestOfSkippingOrElse extends UnitTestCase {
-        function skip() {
-            $this->skipUnless(false, 'Always skipped -> %s');
-        }
-        
-        function testFail() {
-            $this->fail('This really shouldn\'t have happened');
-        }
-    }
-    
-    class TestOfSkippingTwiceOver extends UnitTestCase {
-        function skip() {
-            $this->skipIf(true, 'First reason -> %s');
-            $this->skipIf(true, 'Second reason -> %s');
-        }
-        
-        function testFail() {
-            $this->fail('This really shouldn\'t have happened');
-        }
-    }
-    
-    class TestThatShouldNotBeSkipped extends UnitTestCase {
-        function skip() {
-            $this->skipIf(false);
-            $this->skipUnless(true);
-        }
-        
-        function testFail() {
-            $this->fail('We should see this message');
-        }
-        
-        function testPass() {
-            $this->pass('We should see this message');
-        }
-    }
-
-    $test = &new TestSuite('Visual test with 46 passes, 47 fails and 0 exceptions');
-    $test->addTestCase(new PassingUnitTestCaseOutput());
-    $test->addTestCase(new FailingUnitTestCaseOutput());
-    $test->addTestCase(new TestOfMockObjectsOutput());
-    $test->addTestCase(new TestOfPastBugs());
-    $test->addTestCase(new TestOfVisualShell());
-    $test->addTestCase(new TestOfSkippingNoMatterWhat());
-    $test->addTestCase(new TestOfSkippingOrElse());
-    $test->addTestCase(new TestOfSkippingTwiceOver());
-    $test->addTestCase(new TestThatShouldNotBeSkipped());
-
-    if (isset($_GET['xml']) || in_array('xml', (isset($argv) ? $argv : array()))) {
-        $reporter = &new XmlReporter();
-    } elseif (TextReporter::inCli()) {
-        $reporter = &new TextReporter();
-    } else {
-        $reporter = &new PassesAsWellReporter();
-    }
-    if (isset($_GET['dry']) || in_array('dry', (isset($argv) ? $argv : array()))) {
-        $reporter->makeDry();
-    }
-    exit ($test->run($reporter) ? 0 : 1);
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/web_tester_test.php b/tests/simpletest/test/web_tester_test.php
deleted file mode 100644
index 01f7d3c8c..000000000
--- a/tests/simpletest/test/web_tester_test.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php
-// $Id: web_tester_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../web_tester.php');
-
-class TestOfFieldExpectation extends UnitTestCase {
-    
-    function testStringMatchingIsCaseSensitive() {
-        $expectation = new FieldExpectation('a');
-        $this->assertTrue($expectation->test('a'));
-        $this->assertTrue($expectation->test(array('a')));
-        $this->assertFalse($expectation->test('A'));
-    }
-    
-    function testMatchesInteger() {
-        $expectation = new FieldExpectation('1');
-        $this->assertTrue($expectation->test('1'));
-        $this->assertTrue($expectation->test(1));
-        $this->assertTrue($expectation->test(array('1')));
-        $this->assertTrue($expectation->test(array(1)));
-    }
-    
-    function testNonStringFailsExpectation() {
-        $expectation = new FieldExpectation('a');
-        $this->assertFalse($expectation->test(null));
-    }
-    
-    function testUnsetFieldCanBeTestedFor() {
-        $expectation = new FieldExpectation(false);
-        $this->assertTrue($expectation->test(false));
-    }
-    
-    function testMultipleValuesCanBeInAnyOrder() {
-        $expectation = new FieldExpectation(array('a', 'b'));
-        $this->assertTrue($expectation->test(array('a', 'b')));
-        $this->assertTrue($expectation->test(array('b', 'a')));
-        $this->assertFalse($expectation->test(array('a', 'a')));            
-        $this->assertFalse($expectation->test('a'));            
-    }
-    
-    function testSingleItemCanBeArrayOrString() {
-        $expectation = new FieldExpectation(array('a'));
-        $this->assertTrue($expectation->test(array('a')));
-        $this->assertTrue($expectation->test('a'));
-    }
-}
-
-class TestOfHeaderExpectations extends UnitTestCase {
-    
-    function testExpectingOnlyTheHeaderName() {
-        $expectation = new HttpHeaderExpectation('a');
-        $this->assertIdentical($expectation->test(false), false);
-        $this->assertIdentical($expectation->test('a: A'), true);
-        $this->assertIdentical($expectation->test('A: A'), true);
-        $this->assertIdentical($expectation->test('a: B'), true);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-    }
-    
-    function testHeaderValueAsWell() {
-        $expectation = new HttpHeaderExpectation('a', 'A');
-        $this->assertIdentical($expectation->test(false), false);
-        $this->assertIdentical($expectation->test('a: A'), true);
-        $this->assertIdentical($expectation->test('A: A'), true);
-        $this->assertIdentical($expectation->test('A: a'), false);
-        $this->assertIdentical($expectation->test('a: B'), false);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-        $this->assertIdentical($expectation->test(' a : AB '), false);
-    }
-    
-    function testHeaderValueWithColons() {
-        $expectation = new HttpHeaderExpectation('a', 'A:B:C');
-        $this->assertIdentical($expectation->test('a: A'), false);
-        $this->assertIdentical($expectation->test('a: A:B'), false);
-        $this->assertIdentical($expectation->test('a: A:B:C'), true);
-        $this->assertIdentical($expectation->test('a: A:B:C:D'), false);
-    }
-    
-    function testMultilineSearch() {
-        $expectation = new HttpHeaderExpectation('a', 'A');
-        $this->assertIdentical($expectation->test("aa: A\r\nb: B\r\nc: C"), false);
-        $this->assertIdentical($expectation->test("aa: A\r\na: A\r\nb: B"), true);
-    }
-    
-    function testMultilineSearchWithPadding() {
-        $expectation = new HttpHeaderExpectation('a', ' A ');
-        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), false);
-        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), true);
-    }
-    
-    function testPatternMatching() {
-        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/'));
-        $this->assertIdentical($expectation->test('a: A'), true);
-        $this->assertIdentical($expectation->test('A: A'), true);
-        $this->assertIdentical($expectation->test('A: a'), false);
-        $this->assertIdentical($expectation->test('a: B'), false);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-        $this->assertIdentical($expectation->test(' a : AB '), true);
-    }
-    
-    function testCaseInsensitivePatternMatching() {
-        $expectation = new HttpHeaderExpectation('a', new PatternExpectation('/A/i'));
-        $this->assertIdentical($expectation->test('a: a'), true);
-        $this->assertIdentical($expectation->test('a: B'), false);
-        $this->assertIdentical($expectation->test(' a : A '), true);
-        $this->assertIdentical($expectation->test(' a : BAB '), true);
-        $this->assertIdentical($expectation->test(' a : bab '), true);
-    }
-    
-    function testUnwantedHeader() {
-        $expectation = new NoHttpHeaderExpectation('a');
-        $this->assertIdentical($expectation->test(''), true);
-        $this->assertIdentical($expectation->test('stuff'), true);
-        $this->assertIdentical($expectation->test('b: B'), true);
-        $this->assertIdentical($expectation->test('a: A'), false);
-        $this->assertIdentical($expectation->test('A: A'), false);
-    }
-    
-    function testMultilineUnwantedSearch() {
-        $expectation = new NoHttpHeaderExpectation('a');
-        $this->assertIdentical($expectation->test("aa:A\r\nb:B\r\nc:C"), true);
-        $this->assertIdentical($expectation->test("aa:A\r\na:A\r\nb:B"), false);
-    }
-    
-    function testLocationHeaderSplitsCorrectly() {
-        $expectation = new HttpHeaderExpectation('Location', 'http://here/');
-        $this->assertIdentical($expectation->test('Location: http://here/'), true);
-    }
-}
-
-class TestOfTextExpectations extends UnitTestCase {
-    
-    function testMatchingSubString() {
-        $expectation = new TextExpectation('wanted');
-        $this->assertIdentical($expectation->test(''), false);
-        $this->assertIdentical($expectation->test('Wanted'), false);
-        $this->assertIdentical($expectation->test('wanted'), true);
-        $this->assertIdentical($expectation->test('the wanted text is here'), true);
-    }
-    
-    function testNotMatchingSubString() {
-        $expectation = new NoTextExpectation('wanted');
-        $this->assertIdentical($expectation->test(''), true);
-        $this->assertIdentical($expectation->test('Wanted'), true);
-        $this->assertIdentical($expectation->test('wanted'), false);
-        $this->assertIdentical($expectation->test('the wanted text is here'), false);
-    }
-}
-
-class TestOfGenericAssertionsInWebTester extends WebTestCase {
-    
-    function testEquality() {
-        $this->assertEqual('a', 'a');
-        $this->assertNotEqual('a', 'A');
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test/xml_test.php b/tests/simpletest/test/xml_test.php
deleted file mode 100644
index 91985b5d5..000000000
--- a/tests/simpletest/test/xml_test.php
+++ /dev/null
@@ -1,187 +0,0 @@
-<?php
-// $Id: xml_test.php 1509 2007-05-08 22:11:49Z lastcraft $
-require_once(dirname(__FILE__) . '/../autorun.php');
-require_once(dirname(__FILE__) . '/../xml.php');
-Mock::generate('SimpleScorer');
-
-if (! function_exists('xml_parser_create')) {
-    SimpleTest::ignore('TestOfXmlStructureParsing');
-    SimpleTest::ignore('TestOfXmlResultsParsing');
-}
-
-class TestOfNestingTags extends UnitTestCase {
-    function testGroupSize() {
-        $nesting = new NestingGroupTag(array('SIZE' => 2));
-        $this->assertEqual($nesting->getSize(), 2);
-    }
-}
-
-class TestOfXmlStructureParsing extends UnitTestCase {
-    function testValidXml() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectNever('paintGroupStart');
-        $listener->expectNever('paintGroupEnd');
-        $listener->expectNever('paintCaseStart');
-        $listener->expectNever('paintCaseEnd');
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->assertTrue($parser->parse("<?xml version=\"1.0\"?>\n"));
-        $this->assertTrue($parser->parse("<run>\n"));
-        $this->assertTrue($parser->parse("</run>\n"));
-    }
-
-    function testEmptyGroup() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintGroupStart', array('a_group', 7));
-        $listener->expectOnce('paintGroupEnd', array('a_group'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
-        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
-        $this->assertTrue($parser->parse("</group>\n"));
-        $parser->parse("</run>\n");
-    }
-
-    function testEmptyCase() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintCaseStart', array('a_case'));
-        $listener->expectOnce('paintCaseEnd', array('a_case'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $this->assertTrue($parser->parse("<case>\n"));
-        $this->assertTrue($parser->parse("<name>a_case</name>\n"));
-        $this->assertTrue($parser->parse("</case>\n"));
-        $parser->parse("</run>\n");
-    }
-
-    function testEmptyMethod() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintCaseStart', array('a_case'));
-        $listener->expectOnce('paintCaseEnd', array('a_case'));
-        $listener->expectOnce('paintMethodStart', array('a_method'));
-        $listener->expectOnce('paintMethodEnd', array('a_method'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $parser->parse("<case>\n");
-        $parser->parse("<name>a_case</name>\n");
-        $this->assertTrue($parser->parse("<test>\n"));
-        $this->assertTrue($parser->parse("<name>a_method</name>\n"));
-        $this->assertTrue($parser->parse("</test>\n"));
-        $parser->parse("</case>\n");
-        $parser->parse("</run>\n");
-    }
-
-    function testNestedGroup() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectArgumentsAt(0, 'paintGroupStart', array('a_group', 7));
-        $listener->expectArgumentsAt(1, 'paintGroupStart', array('b_group', 3));
-        $listener->expectCallCount('paintGroupStart', 2);
-        $listener->expectArgumentsAt(0, 'paintGroupEnd', array('b_group'));
-        $listener->expectArgumentsAt(1, 'paintGroupEnd', array('a_group'));
-        $listener->expectCallCount('paintGroupEnd', 2);
-
-        $parser = &new SimpleTestXmlParser($listener);
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-
-        $this->assertTrue($parser->parse("<group size=\"7\">\n"));
-        $this->assertTrue($parser->parse("<name>a_group</name>\n"));
-        $this->assertTrue($parser->parse("<group size=\"3\">\n"));
-        $this->assertTrue($parser->parse("<name>b_group</name>\n"));
-        $this->assertTrue($parser->parse("</group>\n"));
-        $this->assertTrue($parser->parse("</group>\n"));
-        $parser->parse("</run>\n");
-    }
-}
-
-class AnyOldSignal {
-    var $stuff = true;
-}
-
-class TestOfXmlResultsParsing extends UnitTestCase {
-
-    function sendValidStart(&$parser) {
-        $parser->parse("<?xml version=\"1.0\"?>\n");
-        $parser->parse("<run>\n");
-        $parser->parse("<case>\n");
-        $parser->parse("<name>a_case</name>\n");
-        $parser->parse("<test>\n");
-        $parser->parse("<name>a_method</name>\n");
-    }
-
-    function sendValidEnd(&$parser) {
-        $parser->parse("</test>\n");
-        $parser->parse("</case>\n");
-        $parser->parse("</run>\n");
-    }
-
-    function testPass() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintPass', array('a_message'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<pass>a_message</pass>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testFail() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintFail', array('a_message'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<fail>a_message</fail>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testException() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintError', array('a_message'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<exception>a_message</exception>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testSkip() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintSkip', array('a_message'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<skip>a_message</skip>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testSignal() {
-        $signal = new AnyOldSignal();
-        $signal->stuff = "Hello";
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintSignal', array('a_signal', $signal));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse(
-                "<signal type=\"a_signal\"><![CDATA[" .
-                serialize($signal) . "]]></signal>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testMessage() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintMessage', array('a_message'));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<message>a_message</message>\n"));
-        $this->sendValidEnd($parser);
-    }
-
-    function testFormattedMessage() {
-        $listener = &new MockSimpleScorer();
-        $listener->expectOnce('paintFormattedMessage', array("\na\tmessage\n"));
-        $parser = &new SimpleTestXmlParser($listener);
-        $this->sendValidStart($parser);
-        $this->assertTrue($parser->parse("<formatted><![CDATA[\na\tmessage\n]]></formatted>\n"));
-        $this->sendValidEnd($parser);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/test_case.php b/tests/simpletest/test_case.php
deleted file mode 100644
index e5b229833..000000000
--- a/tests/simpletest/test_case.php
+++ /dev/null
@@ -1,708 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: test_case.php 1726 2008-04-08 01:20:10Z lastcraft $
- */
-
-/**#@+
- * Includes SimpleTest files and defined the root constant
- * for dependent libraries.
- */
-require_once(dirname(__FILE__) . '/invoker.php');
-require_once(dirname(__FILE__) . '/errors.php');
-require_once(dirname(__FILE__) . '/compatibility.php');
-require_once(dirname(__FILE__) . '/scorer.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-require_once(dirname(__FILE__) . '/simpletest.php');
-if (version_compare(phpversion(), '5') >= 0) {
-    require_once(dirname(__FILE__) . '/exceptions.php');
-    require_once(dirname(__FILE__) . '/reflection_php5.php');
-} else {
-    require_once(dirname(__FILE__) . '/reflection_php4.php');
-}
-if (! defined('SIMPLE_TEST')) {
-    /**
-     * @ignore
-     */
-    define('SIMPLE_TEST', dirname(__FILE__) . DIRECTORY_SEPARATOR);
-}
-/**#@-*/
-
-/**
- *    Basic test case. This is the smallest unit of a test
- *    suite. It searches for
- *    all methods that start with the the string "test" and
- *    runs them. Working test cases extend this class.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class SimpleTestCase {
-    var $_label = false;
-    var $_reporter;
-    var $_observers;
-    var $_should_skip = false;
-
-    /**
-     *    Sets up the test with no display.
-     *    @param string $label    If no test name is given then
-     *                            the class name is used.
-     *    @access public
-     */
-    function SimpleTestCase($label = false) {
-        if ($label) {
-            $this->_label = $label;
-        }
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_label ? $this->_label : get_class($this);
-    }
-
-    /**
-     *    This is a placeholder for skipping tests. In this
-     *    method you place skipIf() and skipUnless() calls to
-     *    set the skipping state.
-     *    @access public
-     */
-    function skip() {
-    }
-
-    /**
-     *    Will issue a message to the reporter and tell the test
-     *    case to skip if the incoming flag is true.
-     *    @param string $should_skip    Condition causing the tests to be skipped.
-     *    @param string $message        Text of skip condition.
-     *    @access public
-     */
-    function skipIf($should_skip, $message = '%s') {
-        if ($should_skip && ! $this->_should_skip) {
-            $this->_should_skip = true;
-            $message = sprintf($message, 'Skipping [' . get_class($this) . ']');
-            $this->_reporter->paintSkip($message . $this->getAssertionLine());
-        }
-    }
-
-    /**
-     *    Will issue a message to the reporter and tell the test
-     *    case to skip if the incoming flag is false.
-     *    @param string $shouldnt_skip  Condition causing the tests to be run.
-     *    @param string $message        Text of skip condition.
-     *    @access public
-     */
-    function skipUnless($shouldnt_skip, $message = false) {
-        $this->skipIf(! $shouldnt_skip, $message);
-    }
-
-    /**
-     *    Used to invoke the single tests.
-     *    @return SimpleInvoker        Individual test runner.
-     *    @access public
-     */
-    function &createInvoker() {
-        $invoker = &new SimpleErrorTrappingInvoker(new SimpleInvoker($this));
-        if (version_compare(phpversion(), '5') >= 0) {
-            $invoker = &new SimpleExceptionTrappingInvoker($invoker);
-        }
-        return $invoker;
-    }
-
-    /**
-     *    Uses reflection to run every method within itself
-     *    starting with the string "test" unless a method
-     *    is specified.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @return boolean                    True if all tests passed.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $context = &SimpleTest::getContext();
-        $context->setTest($this);
-        $context->setReporter($reporter);
-        $this->_reporter = &$reporter;
-        $started = false;
-        foreach ($this->getTests() as $method) {
-            if ($reporter->shouldInvoke($this->getLabel(), $method)) {
-                $this->skip();
-                if ($this->_should_skip) {
-                    break;
-                }
-                if (! $started) {
-                    $reporter->paintCaseStart($this->getLabel());
-                    $started = true;
-                }
-                $invoker = &$this->_reporter->createInvoker($this->createInvoker());
-                $invoker->before($method);
-                $invoker->invoke($method);
-                $invoker->after($method);
-            }
-        }
-        if ($started) {
-            $reporter->paintCaseEnd($this->getLabel());
-        }
-        unset($this->_reporter);
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Gets a list of test names. Normally that will
-     *    be all internal methods that start with the
-     *    name "test". This method should be overridden
-     *    if you want a different rule.
-     *    @return array        List of test names.
-     *    @access public
-     */
-    function getTests() {
-        $methods = array();
-        foreach (get_class_methods(get_class($this)) as $method) {
-            if ($this->_isTest($method)) {
-                $methods[] = $method;
-            }
-        }
-        return $methods;
-    }
-
-    /**
-     *    Tests to see if the method is a test that should
-     *    be run. Currently any method that starts with 'test'
-     *    is a candidate unless it is the constructor.
-     *    @param string $method        Method name to try.
-     *    @return boolean              True if test method.
-     *    @access protected
-     */
-    function _isTest($method) {
-        if (strtolower(substr($method, 0, 4)) == 'test') {
-            return ! SimpleTestCompatibility::isA($this, strtolower($method));
-        }
-        return false;
-    }
-
-    /**
-     *    Announces the start of the test.
-     *    @param string $method    Test method just started.
-     *    @access public
-     */
-    function before($method) {
-        $this->_reporter->paintMethodStart($method);
-        $this->_observers = array();
-    }
-
-    /**
-     *    Sets up unit test wide variables at the start
-     *    of each test method. To be overridden in
-     *    actual user test cases.
-     *    @access public
-     */
-    function setUp() {
-    }
-
-    /**
-     *    Clears the data set in the setUp() method call.
-     *    To be overridden by the user in actual user test cases.
-     *    @access public
-     */
-    function tearDown() {
-    }
-
-    /**
-     *    Announces the end of the test. Includes private clean up.
-     *    @param string $method    Test method just finished.
-     *    @access public
-     */
-    function after($method) {
-        for ($i = 0; $i < count($this->_observers); $i++) {
-            $this->_observers[$i]->atTestEnd($method, $this);
-        }
-        $this->_reporter->paintMethodEnd($method);
-    }
-
-    /**
-     *    Sets up an observer for the test end.
-     *    @param object $observer    Must have atTestEnd()
-     *                               method.
-     *    @access public
-     */
-    function tell(&$observer) {
-        $this->_observers[] = &$observer;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function pass($message = "Pass") {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintPass(
-                $message . $this->getAssertionLine());
-        return true;
-    }
-
-    /**
-     *    Sends a fail event with a message.
-     *    @param string $message        Message to send.
-     *    @access public
-     */
-    function fail($message = "Fail") {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintFail(
-                $message . $this->getAssertionLine());
-        return false;
-    }
-
-    /**
-     *    Formats a PHP error and dispatches it to the
-     *    reporter.
-     *    @param integer $severity  PHP error code.
-     *    @param string $message    Text of error.
-     *    @param string $file       File error occoured in.
-     *    @param integer $line      Line number of error.
-     *    @access public
-     */
-    function error($severity, $message, $file, $line) {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintError(
-                "Unexpected PHP error [$message] severity [$severity] in [$file line $line]");
-    }
-
-    /**
-     *    Formats an exception and dispatches it to the
-     *    reporter.
-     *    @param Exception $exception    Object thrown.
-     *    @access public
-     */
-    function exception($exception) {
-        $this->_reporter->paintException($exception);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function signal($type, &$payload) {
-        if (! isset($this->_reporter)) {
-            trigger_error('Can only make assertions within test methods');
-        }
-        $this->_reporter->paintSignal($type, $payload);
-    }
-
-    /**
-     *    Runs an expectation directly, for extending the
-     *    tests with new expectation classes.
-     *    @param SimpleExpectation $expectation  Expectation subclass.
-     *    @param mixed $compare               Value to compare.
-     *    @param string $message                 Message to display.
-     *    @return boolean                        True on pass
-     *    @access public
-     */
-    function assert(&$expectation, $compare, $message = '%s') {
-        if ($expectation->test($compare)) {
-            return $this->pass(sprintf(
-                    $message,
-                    $expectation->overlayMessage($compare, $this->_reporter->getDumper())));
-        } else {
-            return $this->fail(sprintf(
-                    $message,
-                    $expectation->overlayMessage($compare, $this->_reporter->getDumper())));
-        }
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertExpectation(&$expectation, $compare, $message = '%s') {
-        return $this->assert($expectation, $compare, $message);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @return string           Line number of first assert*
-     *                             method embedded in format string.
-     *    @access public
-     */
-    function getAssertionLine() {
-        $trace = new SimpleStackTrace(array('assert', 'expect', 'pass', 'fail', 'skip'));
-        return $trace->traceMethod();
-    }
-
-    /**
-     *    Sends a formatted dump of a variable to the
-     *    test suite for those emergency debugging
-     *    situations.
-     *    @param mixed $variable    Variable to display.
-     *    @param string $message    Message to display.
-     *    @return mixed             The original variable.
-     *    @access public
-     */
-    function dump($variable, $message = false) {
-        $dumper = $this->_reporter->getDumper();
-        $formatted = $dumper->dump($variable);
-        if ($message) {
-            $formatted = $message . "\n" . $formatted;
-        }
-        $this->_reporter->paintFormattedMessage($formatted);
-        return $variable;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function sendMessage($message) {
-        $this->_reporter->PaintMessage($message);
-    }
-
-    /**
-     *    Accessor for the number of subtests including myelf.
-     *    @return integer           Number of test cases.
-     *    @access public
-     *    @static
-     */
-    function getSize() {
-        return 1;
-    }
-}
-
-/**
- *  Helps to extract test cases automatically from a file.
- */
-class SimpleFileLoader {
-
-    /**
-     *    Builds a test suite from a library of test cases.
-     *    The new suite is composed into this one.
-     *    @param string $test_file        File name of library with
-     *                                    test case classes.
-     *    @return TestSuite               The new test suite.
-     *    @access public
-     */
-    function &load($test_file) {
-        $existing_classes = get_declared_classes();
-        $existing_globals = get_defined_vars();
-        include_once($test_file);
-        $new_globals = get_defined_vars();
-        $this->_makeFileVariablesGlobal($existing_globals, $new_globals);
-        $new_classes = array_diff(get_declared_classes(), $existing_classes);
-        if (empty($new_classes)) {
-            $new_classes = $this->_scrapeClassesFromFile($test_file);
-        }
-        $classes = $this->selectRunnableTests($new_classes);
-        $suite = &$this->createSuiteFromClasses($test_file, $classes);
-        return $suite;
-    }
-    
-    /**
-     *    Imports new variables into the global namespace.
-     *    @param hash $existing   Variables before the file was loaded.
-     *    @param hash $new        Variables after the file was loaded.
-     *    @access private
-     */
-    function _makeFileVariablesGlobal($existing, $new) {
-        $globals = array_diff(array_keys($new), array_keys($existing));
-        foreach ($globals as $global) {
-            $_GLOBALS[$global] = $new[$global];
-        }
-    }
-    
-    /**
-     *    Lookup classnames from file contents, in case the
-     *    file may have been included before.
-     *    Note: This is probably too clever by half. Figuring this
-     *    out after a failed test case is going to be tricky for us,
-     *    never mind the user. A test case should not be included
-     *    twice anyway.
-     *    @param string $test_file        File name with classes.
-     *    @access private
-     */
-    function _scrapeClassesFromFile($test_file) {
-        preg_match_all('~^\s*class\s+(\w+)(\s+(extends|implements)\s+\w+)*\s*\{~mi',
-                        file_get_contents($test_file),
-                        $matches );
-        return $matches[1];
-    }
-
-    /**
-     *    Calculates the incoming test cases. Skips abstract
-     *    and ignored classes.
-     *    @param array $candidates   Candidate classes.
-     *    @return array              New classes which are test
-     *                               cases that shouldn't be ignored.
-     *    @access public
-     */
-    function selectRunnableTests($candidates) {
-        $classes = array();
-        foreach ($candidates as $class) {
-            if (TestSuite::getBaseTestCase($class)) {
-                $reflection = new SimpleReflection($class);
-                if ($reflection->isAbstract()) {
-                    SimpleTest::ignore($class);
-                } else {
-                    $classes[] = $class;
-                }
-            }
-        }
-        return $classes;
-    }
-
-    /**
-     *    Builds a test suite from a class list.
-     *    @param string $title       Title of new group.
-     *    @param array $classes      Test classes.
-     *    @return TestSuite          Group loaded with the new
-     *                               test cases.
-     *    @access public
-     */
-    function &createSuiteFromClasses($title, $classes) {
-        if (count($classes) == 0) {
-            $suite = &new BadTestSuite($title, "No runnable test cases in [$title]");
-            return $suite;
-        }
-        SimpleTest::ignoreParentsIfIgnored($classes);
-        $suite = &new TestSuite($title);
-        foreach ($classes as $class) {
-            if (! SimpleTest::isIgnored($class)) {
-                $suite->addTestClass($class);
-            }
-        }
-        return $suite;
-    }
-}
-
-/**
- *    This is a composite test class for combining
- *    test cases and other RunnableTest classes into
- *    a group test.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class TestSuite {
-    var $_label;
-    var $_test_cases;
-
-    /**
-     *    Sets the name of the test suite.
-     *    @param string $label    Name sent at the start and end
-     *                            of the test.
-     *    @access public
-     */
-    function TestSuite($label = false) {
-        $this->_label = $label;
-        $this->_test_cases = array();
-    }
-
-    /**
-     *    Accessor for the test name for subclasses. If the suite
-     *    wraps a single test case the label defaults to the name of that test.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        if (! $this->_label) {
-            return ($this->getSize() == 1) ?
-                    get_class($this->_test_cases[0]) : get_class($this);
-        } else {
-            return $this->_label;
-        }
-    }
-
-    /**
-     *    @deprecated
-     */
-    function addTestCase(&$test_case) {
-        $this->_test_cases[] = &$test_case;
-    }
-
-    /**
-     *    @deprecated
-     */
-    function addTestClass($class) {
-        if (TestSuite::getBaseTestCase($class) == 'testsuite') {
-            $this->_test_cases[] = &new $class();
-        } else {
-            $this->_test_cases[] = $class;
-        }
-    }
-
-    /**
-     *    Adds a test into the suite by instance or class. The class will
-     *    be instantiated if it's a test suite.
-     *    @param SimpleTestCase $test_case  Suite or individual test
-     *                                      case implementing the
-     *                                      runnable test interface.
-     *    @access public
-     */
-    function add(&$test_case) {
-        if (! is_string($test_case)) {
-            $this->_test_cases[] = &$test_case;
-        } elseif (TestSuite::getBaseTestCase($class) == 'testsuite') {
-            $this->_test_cases[] = &new $class();
-        } else {
-            $this->_test_cases[] = $class;
-        }
-    }
-
-    /**
-     *    @deprecated
-     */
-    function addTestFile($test_file) {
-        $this->addFile($test_file);
-    }
-
-    /**
-     *    Builds a test suite from a library of test cases.
-     *    The new suite is composed into this one.
-     *    @param string $test_file        File name of library with
-     *                                    test case classes.
-     *    @access public
-     */
-    function addFile($test_file) {
-        $extractor = new SimpleFileLoader();
-        $this->add($extractor->load($test_file));
-    }
-
-    /**
-     *    Delegates to a visiting collector to add test
-     *    files.
-     *    @param string $path                  Path to scan from.
-     *    @param SimpleCollector $collector    Directory scanner.
-     *    @access public
-     */
-    function collect($path, &$collector) {
-        $collector->collect($this, $path);
-    }
-
-    /**
-     *    Invokes run() on all of the held test cases, instantiating
-     *    them if necessary.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-        for ($i = 0, $count = count($this->_test_cases); $i < $count; $i++) {
-            if (is_string($this->_test_cases[$i])) {
-                $class = $this->_test_cases[$i];
-                $test = &new $class();
-                $test->run($reporter);
-                unset($test);
-            } else {
-                $this->_test_cases[$i]->run($reporter);
-            }
-        }
-        $reporter->paintGroupEnd($this->getLabel());
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Number of contained test cases.
-     *    @return integer     Total count of cases in the group.
-     *    @access public
-     */
-    function getSize() {
-        $count = 0;
-        foreach ($this->_test_cases as $case) {
-            if (is_string($case)) {
-                if (! SimpleTest::isIgnored($case)) {
-                    $count++;
-                }
-            } else {
-                $count += $case->getSize();
-            }
-        }
-        return $count;
-    }
-
-    /**
-     *    Test to see if a class is derived from the
-     *    SimpleTestCase class.
-     *    @param string $class     Class name.
-     *    @access public
-     *    @static
-     */
-    function getBaseTestCase($class) {
-        while ($class = get_parent_class($class)) {
-            $class = strtolower($class);
-            if ($class == 'simpletestcase' || $class == 'testsuite') {
-                return $class;
-            }
-        }
-        return false;
-    }
-}
-
-/**
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- *    @deprecated
- */
-class GroupTest extends TestSuite { }
-
-/**
- *    This is a failing group test for when a test suite hasn't
- *    loaded properly.
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- */
-class BadTestSuite {
-    var $_label;
-    var $_error;
-
-    /**
-     *    Sets the name of the test suite and error message.
-     *    @param string $label    Name sent at the start and end
-     *                            of the test.
-     *    @access public
-     */
-    function BadTestSuite($label, $error) {
-        $this->_label = $label;
-        $this->_error = $error;
-    }
-
-    /**
-     *    Accessor for the test name for subclasses.
-     *    @return string           Name of the test.
-     *    @access public
-     */
-    function getLabel() {
-        return $this->_label;
-    }
-
-    /**
-     *    Sends a single error to the reporter.
-     *    @param SimpleReporter $reporter    Current test reporter.
-     *    @access public
-     */
-    function run(&$reporter) {
-        $reporter->paintGroupStart($this->getLabel(), $this->getSize());
-        $reporter->paintFail('Bad TestSuite [' . $this->getLabel() .
-                '] with error [' . $this->_error . ']');
-        $reporter->paintGroupEnd($this->getLabel());
-        return $reporter->getStatus();
-    }
-
-    /**
-     *    Number of contained test cases. Always zero.
-     *    @return integer     Total count of cases in the group.
-     *    @access public
-     */
-    function getSize() {
-        return 0;
-    }
-}
-
-/**
- *    @package      SimpleTest
- *    @subpackage   UnitTester
- *    @deprecated
- */
-class BadGroupTest extends BadTestSuite { }
-?>
diff --git a/tests/simpletest/unit_tester.php b/tests/simpletest/unit_tester.php
deleted file mode 100644
index 8bb757d4e..000000000
--- a/tests/simpletest/unit_tester.php
+++ /dev/null
@@ -1,420 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: unit_tester.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-require_once(dirname(__FILE__) . '/dumper.php');
-/**#@-*/
-
-/**
- *    Standard unit test class for day to day testing
- *    of PHP code XP style. Adds some useful standard
- *    assertions.
- *    @package  SimpleTest
- *    @subpackage   UnitTester
- */
-class UnitTestCase extends SimpleTestCase {
-
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function UnitTestCase($label = false) {
-        if (! $label) {
-            $label = get_class($this);
-        }
-        $this->SimpleTestCase($label);
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true if the value is null.
-     *    @param null $value       Supposedly null value.
-     *    @param string $message   Message to display.
-     *    @return boolean                        True on pass
-     *    @access public
-     */
-    function assertNull($value, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($value) . '] should be null');
-        return $this->assertTrue(! isset($value), $message);
-    }
-
-    /**
-     *    Will be true if the value is set.
-     *    @param mixed $value           Supposedly set value.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass.
-     *    @access public
-     */
-    function assertNotNull($value, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($value) . '] should not be null');
-        return $this->assertTrue(isset($value), $message);
-    }
-
-    /**
-     *    Type and class test. Will pass if class
-     *    matches the type name or is a subclass or
-     *    if not an object, but the type is correct.
-     *    @param mixed $object         Object to test.
-     *    @param string $type          Type name as string.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass.
-     *    @access public
-     */
-    function assertIsA($object, $type, $message = '%s') {
-        return $this->assert(
-                new IsAExpectation($type),
-                $object,
-                $message);
-    }
-
-    /**
-     *    Type and class mismatch test. Will pass if class
-     *    name or underling type does not match the one
-     *    specified.
-     *    @param mixed $object         Object to test.
-     *    @param string $type          Type name as string.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass.
-     *    @access public
-     */
-    function assertNotA($object, $type, $message = '%s') {
-        return $this->assert(
-                new NotAExpectation($type),
-                $object,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the if the first parameter
-     *    is near enough to the second by the margin.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param mixed $margin         Fuzziness of match.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertWithinMargin($first, $second, $margin, $message = '%s') {
-        return $this->assert(
-                new WithinMarginExpectation($first, $margin),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters differ
-     *    by more than the margin.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param mixed $margin         Fuzziness of match.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertOutsideMargin($first, $second, $margin, $message = '%s') {
-        return $this->assert(
-                new OutsideMarginExpectation($first, $margin),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value and same type. Otherwise a fail.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertIdentical($first, $second, $message = '%s') {
-        return $this->assert(
-                new IdenticalExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the different value or different type.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotIdentical($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotIdenticalExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to the same object. Fail otherwise.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertReference(&$first, &$second, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should reference the same object');
-        return $this->assertTrue(
-                SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if both parameters refer
-     *    to different objects. Fail otherwise. The objects
-     *    have to be identical though.
-     *    @param mixed $first           Object reference to check.
-     *    @param mixed $second          Hopefully not the same object.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertClone(&$first, &$second, $message = '%s') {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                '[' . $dumper->describeValue($first) .
-                        '] and [' . $dumper->describeValue($second) .
-                        '] should not be the same object');
-        $identical = &new IdenticalExpectation($first);
-        return $this->assertTrue(
-                $identical->test($second) &&
-                        ! SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertCopy(&$first, &$second, $message = "%s") {
-        $dumper = &new SimpleDumper();
-        $message = sprintf(
-                $message,
-                "[" . $dumper->describeValue($first) .
-                        "] and [" . $dumper->describeValue($second) .
-                        "] should not be the same object");
-        return $this->assertFalse(
-                SimpleTestCompatibility::isReference($first, $second),
-                $message);
-    }
-
-    /**
-     *    Will trigger a pass if the Perl regex pattern
-     *    is found in the subject. Fail otherwise.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $subject    String to search in.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertPattern($pattern, $subject, $message = '%s') {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $subject,
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertWantedPattern($pattern, $subject, $message = '%s') {
-        return $this->assertPattern($pattern, $subject, $message);
-    }
-
-    /**
-     *    Will trigger a pass if the perl regex pattern
-     *    is not present in subject. Fail if found.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $subject    String to search in.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertNoPattern($pattern, $subject, $message = '%s') {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $subject,
-                $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedPattern($pattern, $subject, $message = '%s') {
-        return $this->assertNoPattern($pattern, $subject, $message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function swallowErrors() {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->clear();
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertNoErrors($message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        return $queue->assertNoErrors($message);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertError($expected = false, $message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        return $queue->assertError($this->_coerceExpectation($expected), $message);
-    }
-
-    /**
-     *    Prepares for an error. If the error mismatches it
-     *    passes through, otherwise it is swallowed. Any
-     *    left over errors trigger failures.
-     *    @param SimpleExpectation/string $expected   The error to match.
-     *    @param string $message                      Message on failure.
-     *    @access public
-     */
-    function expectError($expected = false, $message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleErrorQueue');
-        $queue->expectError($this->_coerceExpectation($expected), $message);
-    }
-
-    /**
-     *    Prepares for an exception. If the error mismatches it
-     *    passes through, otherwise it is swallowed. Any
-     *    left over errors trigger failures.
-     *    @param SimpleExpectation/Exception $expected  The error to match.
-     *    @param string $message                        Message on failure.
-     *    @access public
-     */
-    function expectException($expected = false, $message = '%s') {
-        $context = &SimpleTest::getContext();
-        $queue = &$context->get('SimpleExceptionTrap');
-        // :HACK: Directly substituting in seems to cause a segfault with
-        // Zend Optimizer on some systems
-        $line = $this->getAssertionLine();
-        $queue->expectException($expected, $message . $line);
-    }
-
-    /**
-     *    Creates an equality expectation if the
-     *    object/value is not already some type
-     *    of expectation.
-     *    @param mixed $expected      Expected value.
-     *    @return SimpleExpectation   Expectation object.
-     *    @access private
-     */
-    function _coerceExpectation($expected) {
-        if ($expected == false) {
-            return new TrueExpectation();
-        }
-        if (SimpleTestCompatibility::isA($expected, 'SimpleExpectation')) {
-            return $expected;
-        }
-        return new EqualExpectation(
-                is_string($expected) ? str_replace('%', '%%', $expected) : $expected);
-    }
-
-    /**
-     *    @deprecated
-     */
-    function assertErrorPattern($pattern, $message = '%s') {
-        return $this->assertError(new PatternExpectation($pattern), $message);
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/url.php b/tests/simpletest/url.php
deleted file mode 100644
index 0ea220409..000000000
--- a/tests/simpletest/url.php
+++ /dev/null
@@ -1,528 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: url.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/encoding.php');
-/**#@-*/
-
-/**
- *    URL parser to replace parse_url() PHP function which
- *    got broken in PHP 4.3.0. Adds some browser specific
- *    functionality such as expandomatics.
- *    Guesses a bit trying to separate the host from
- *    the path and tries to keep a raw, possibly unparsable,
- *    request string as long as possible.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUrl {
-    var $_scheme;
-    var $_username;
-    var $_password;
-    var $_host;
-    var $_port;
-    var $_path;
-    var $_request;
-    var $_fragment;
-    var $_x;
-    var $_y;
-    var $_target;
-    var $_raw = false;
-    
-    /**
-     *    Constructor. Parses URL into sections.
-     *    @param string $url        Incoming URL.
-     *    @access public
-     */
-    function SimpleUrl($url = '') {
-        list($x, $y) = $this->_chompCoordinates($url);
-        $this->setCoordinates($x, $y);
-        $this->_scheme = $this->_chompScheme($url);
-        list($this->_username, $this->_password) = $this->_chompLogin($url);
-        $this->_host = $this->_chompHost($url);
-        $this->_port = false;
-        if (preg_match('/(.*?):(.*)/', $this->_host, $host_parts)) {
-            $this->_host = $host_parts[1];
-            $this->_port = (integer)$host_parts[2];
-        }
-        $this->_path = $this->_chompPath($url);
-        $this->_request = $this->_parseRequest($this->_chompRequest($url));
-        $this->_fragment = (strncmp($url, "#", 1) == 0 ? substr($url, 1) : false);
-        $this->_target = false;
-    }
-    
-    /**
-     *    Extracts the X, Y coordinate pair from an image map.
-     *    @param string $url   URL so far. The coordinates will be
-     *                         removed.
-     *    @return array        X, Y as a pair of integers.
-     *    @access private
-     */
-    function _chompCoordinates(&$url) {
-        if (preg_match('/(.*)\?(\d+),(\d+)$/', $url, $matches)) {
-            $url = $matches[1];
-            return array((integer)$matches[2], (integer)$matches[3]);
-        }
-        return array(false, false);
-    }
-    
-    /**
-     *    Extracts the scheme part of an incoming URL.
-     *    @param string $url   URL so far. The scheme will be
-     *                         removed.
-     *    @return string       Scheme part or false.
-     *    @access private
-     */
-    function _chompScheme(&$url) {
-        if (preg_match('/^([^\/:]*):(\/\/)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return $matches[1];
-        }
-        return false;
-    }
-    
-    /**
-     *    Extracts the username and password from the
-     *    incoming URL. The // prefix will be reattached
-     *    to the URL after the doublet is extracted.
-     *    @param string $url    URL so far. The username and
-     *                          password are removed.
-     *    @return array         Two item list of username and
-     *                          password. Will urldecode() them.
-     *    @access private
-     */
-    function _chompLogin(&$url) {
-        $prefix = '';
-        if (preg_match('/^(\/\/)(.*)/', $url, $matches)) {
-            $prefix = $matches[1];
-            $url = $matches[2];
-        }
-        if (preg_match('/^([^\/]*)@(.*)/', $url, $matches)) {
-            $url = $prefix . $matches[2];
-            $parts = split(":", $matches[1]);
-            return array(
-                    urldecode($parts[0]),
-                    isset($parts[1]) ? urldecode($parts[1]) : false);
-        }
-        $url = $prefix . $url;
-        return array(false, false);
-    }
-    
-    /**
-     *    Extracts the host part of an incoming URL.
-     *    Includes the port number part. Will extract
-     *    the host if it starts with // or it has
-     *    a top level domain or it has at least two
-     *    dots.
-     *    @param string $url    URL so far. The host will be
-     *                          removed.
-     *    @return string        Host part guess or false.
-     *    @access private
-     */
-    function _chompHost(&$url) {
-        if (preg_match('/^(\/\/)(.*?)(\/.*|\?.*|#.*|$)/', $url, $matches)) {
-            $url = $matches[3];
-            return $matches[2];
-        }
-        if (preg_match('/(.*?)(\.\.\/|\.\/|\/|\?|#|$)(.*)/', $url, $matches)) {
-            $tlds = SimpleUrl::getAllTopLevelDomains();
-            if (preg_match('/[a-z0-9\-]+\.(' . $tlds . ')/i', $matches[1])) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            } elseif (preg_match('/[a-z0-9\-]+\.[a-z0-9\-]+\.[a-z0-9\-]+/i', $matches[1])) {
-                $url = $matches[2] . $matches[3];
-                return $matches[1];
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Extracts the path information from the incoming
-     *    URL. Strips this path from the URL.
-     *    @param string $url     URL so far. The host will be
-     *                           removed.
-     *    @return string         Path part or '/'.
-     *    @access private
-     */
-    function _chompPath(&$url) {
-        if (preg_match('/(.*?)(\?|#|$)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return ($matches[1] ? $matches[1] : '');
-        }
-        return '';
-    }
-    
-    /**
-     *    Strips off the request data.
-     *    @param string $url  URL so far. The request will be
-     *                        removed.
-     *    @return string      Raw request part.
-     *    @access private
-     */
-    function _chompRequest(&$url) {
-        if (preg_match('/\?(.*?)(#|$)(.*)/', $url, $matches)) {
-            $url = $matches[2] . $matches[3];
-            return $matches[1];
-        }
-        return '';
-    }
-        
-    /**
-     *    Breaks the request down into an object.
-     *    @param string $raw           Raw request.
-     *    @return SimpleFormEncoding    Parsed data.
-     *    @access private
-     */
-    function _parseRequest($raw) {
-        $this->_raw = $raw;
-        $request = new SimpleGetEncoding();
-        foreach (split("&", $raw) as $pair) {
-            if (preg_match('/(.*?)=(.*)/', $pair, $matches)) {
-                $request->add($matches[1], urldecode($matches[2]));
-            } elseif ($pair) {
-                $request->add($pair, '');
-            }
-        }
-        return $request;
-    }
-    
-    /**
-     *    Accessor for protocol part.
-     *    @param string $default    Value to use if not present.
-     *    @return string            Scheme name, e.g "http".
-     *    @access public
-     */
-    function getScheme($default = false) {
-        return $this->_scheme ? $this->_scheme : $default;
-    }
-    
-    /**
-     *    Accessor for user name.
-     *    @return string    Username preceding host.
-     *    @access public
-     */
-    function getUsername() {
-        return $this->_username;
-    }
-    
-    /**
-     *    Accessor for password.
-     *    @return string    Password preceding host.
-     *    @access public
-     */
-    function getPassword() {
-        return $this->_password;
-    }
-    
-    /**
-     *    Accessor for hostname and port.
-     *    @param string $default    Value to use if not present.
-     *    @return string            Hostname only.
-     *    @access public
-     */
-    function getHost($default = false) {
-        return $this->_host ? $this->_host : $default;
-    }
-    
-    /**
-     *    Accessor for top level domain.
-     *    @return string       Last part of host.
-     *    @access public
-     */
-    function getTld() {
-        $path_parts = pathinfo($this->getHost());
-        return (isset($path_parts['extension']) ? $path_parts['extension'] : false);
-    }
-    
-    /**
-     *    Accessor for port number.
-     *    @return integer    TCP/IP port number.
-     *    @access public
-     */
-    function getPort() {
-        return $this->_port;
-    }        
-            
-    /**
-     *    Accessor for path.
-     *    @return string    Full path including leading slash if implied.
-     *    @access public
-     */
-    function getPath() {
-        if (! $this->_path && $this->_host) {
-            return '/';
-        }
-        return $this->_path;
-    }
-    
-    /**
-     *    Accessor for page if any. This may be a
-     *    directory name if ambiguious.
-     *    @return            Page name.
-     *    @access public
-     */
-    function getPage() {
-        if (! preg_match('/([^\/]*?)$/', $this->getPath(), $matches)) {
-            return false;
-        }
-        return $matches[1];
-    }
-    
-    /**
-     *    Gets the path to the page.
-     *    @return string       Path less the page.
-     *    @access public
-     */
-    function getBasePath() {
-        if (! preg_match('/(.*\/)[^\/]*?$/', $this->getPath(), $matches)) {
-            return false;
-        }
-        return $matches[1];
-    }
-    
-    /**
-     *    Accessor for fragment at end of URL after the "#".
-     *    @return string    Part after "#".
-     *    @access public
-     */
-    function getFragment() {
-        return $this->_fragment;
-    }
-    
-    /**
-     *    Sets image coordinates. Set to false to clear
-     *    them.
-     *    @param integer $x    Horizontal position.
-     *    @param integer $y    Vertical position.
-     *    @access public
-     */
-    function setCoordinates($x = false, $y = false) {
-        if (($x === false) || ($y === false)) {
-            $this->_x = $this->_y = false;
-            return;
-        }
-        $this->_x = (integer)$x;
-        $this->_y = (integer)$y;
-    }
-    
-    /**
-     *    Accessor for horizontal image coordinate.
-     *    @return integer        X value.
-     *    @access public
-     */
-    function getX() {
-        return $this->_x;
-    }
-        
-    /**
-     *    Accessor for vertical image coordinate.
-     *    @return integer        Y value.
-     *    @access public
-     */
-    function getY() {
-        return $this->_y;
-    }
-    
-    /**
-     *    Accessor for current request parameters
-     *    in URL string form. Will return teh original request
-     *    if at all possible even if it doesn't make much
-     *    sense.
-     *    @return string   Form is string "?a=1&b=2", etc.
-     *    @access public
-     */
-    function getEncodedRequest() {
-        if ($this->_raw) {
-            $encoded = $this->_raw;
-        } else {
-            $encoded = $this->_request->asUrlRequest();
-        }
-        if ($encoded) {
-            return '?' . preg_replace('/^\?/', '', $encoded);
-        }
-        return '';
-    }
-    
-    /**
-     *    Adds an additional parameter to the request.
-     *    @param string $key            Name of parameter.
-     *    @param string $value          Value as string.
-     *    @access public
-     */
-    function addRequestParameter($key, $value) {
-        $this->_raw = false;
-        $this->_request->add($key, $value);
-    }
-    
-    /**
-     *    Adds additional parameters to the request.
-     *    @param hash/SimpleFormEncoding $parameters   Additional
-     *                                                parameters.
-     *    @access public
-     */
-    function addRequestParameters($parameters) {
-        $this->_raw = false;
-        $this->_request->merge($parameters);
-    }
-    
-    /**
-     *    Clears down all parameters.
-     *    @access public
-     */
-    function clearRequest() {
-        $this->_raw = false;
-        $this->_request = &new SimpleGetEncoding();
-    }
-    
-    /**
-     *    Gets the frame target if present. Although
-     *    not strictly part of the URL specification it
-     *    acts as similarily to the browser.
-     *    @return boolean/string    Frame name or false if none.
-     *    @access public
-     */
-    function getTarget() {
-        return $this->_target;
-    }
-    
-    /**
-     *    Attaches a frame target.
-     *    @param string $frame        Name of frame.
-     *    @access public
-     */
-    function setTarget($frame) {
-        $this->_raw = false;
-        $this->_target = $frame;
-    }
-    
-    /**
-     *    Renders the URL back into a string.
-     *    @return string        URL in canonical form.
-     *    @access public
-     */
-    function asString() {
-        $path = $this->_path;
-        $scheme = $identity = $host = $encoded = $fragment = '';
-        if ($this->_username && $this->_password) {
-            $identity = $this->_username . ':' . $this->_password . '@';
-        }
-        if ($this->getHost()) {
-            $scheme = $this->getScheme() ? $this->getScheme() : 'http';
-            $scheme .= "://";
-            $host = $this->getHost();
-        }
-        if (substr($this->_path, 0, 1) == '/') {
-            $path = $this->normalisePath($this->_path);
-        }
-        $encoded = $this->getEncodedRequest();
-        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-        return "$scheme$identity$host$path$encoded$fragment$coords";
-    }
-    
-    /**
-     *    Replaces unknown sections to turn a relative
-     *    URL into an absolute one. The base URL can
-     *    be either a string or a SimpleUrl object.
-     *    @param string/SimpleUrl $base       Base URL.
-     *    @access public
-     */
-    function makeAbsolute($base) {
-        if (! is_object($base)) {
-            $base = new SimpleUrl($base);
-        }
-        if ($this->getHost()) {
-            $scheme = $this->getScheme();
-            $host = $this->getHost();
-            $port = $this->getPort() ? ':' . $this->getPort() : '';
-            $identity = $this->getIdentity() ? $this->getIdentity() . '@' : '';
-            if (! $identity) {
-                $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-            }
-        } else {
-            $scheme = $base->getScheme();
-            $host = $base->getHost();
-            $port = $base->getPort() ? ':' . $base->getPort() : '';
-            $identity = $base->getIdentity() ? $base->getIdentity() . '@' : '';
-        }
-        $path = $this->normalisePath($this->_extractAbsolutePath($base));
-        $encoded = $this->getEncodedRequest();
-        $fragment = $this->getFragment() ? '#'. $this->getFragment() : '';
-        $coords = $this->getX() === false ? '' : '?' . $this->getX() . ',' . $this->getY();
-        return new SimpleUrl("$scheme://$identity$host$port$path$encoded$fragment$coords");
-    }
-    
-    /**
-     *    Replaces unknown sections of the path with base parts
-     *    to return a complete absolute one.
-     *    @param string/SimpleUrl $base       Base URL.
-     *    @param string                       Absolute path.
-     *    @access private
-     */
-    function _extractAbsolutePath($base) {
-        if ($this->getHost()) {
-            return $this->_path;
-        }
-        if (! $this->_isRelativePath($this->_path)) {
-            return $this->_path;
-        }
-        if ($this->_path) {
-            return $base->getBasePath() . $this->_path;
-        }
-        return $base->getPath();
-    }
-    
-    /**
-     *    Simple test to see if a path part is relative.
-     *    @param string $path        Path to test.
-     *    @return boolean            True if starts with a "/".
-     *    @access private
-     */
-    function _isRelativePath($path) {
-        return (substr($path, 0, 1) != '/');
-    }
-    
-    /**
-     *    Extracts the username and password for use in rendering
-     *    a URL.
-     *    @return string/boolean    Form of username:password or false.
-     *    @access public
-     */
-    function getIdentity() {
-        if ($this->_username && $this->_password) {
-            return $this->_username . ':' . $this->_password;
-        }
-        return false;
-    }
-    
-    /**
-     *    Replaces . and .. sections of the path.
-     *    @param string $path    Unoptimised path.
-     *    @return string         Path with dots removed if possible.
-     *    @access public
-     */
-    function normalisePath($path) {
-        $path = preg_replace('|/\./|', '/', $path);
-        return preg_replace('|/[^/]+/\.\./|', '/', $path);
-    }
-    
-    /**
-     *    A pipe seperated list of all TLDs that result in two part
-     *    domain names.
-     *    @return string        Pipe separated list.
-     *    @access public
-     *    @static
-     */
-    function getAllTopLevelDomains() {
-        return 'com|edu|net|org|gov|mil|int|biz|info|name|pro|aero|coop|museum';
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/user_agent.php b/tests/simpletest/user_agent.php
deleted file mode 100644
index b3f6f057e..000000000
--- a/tests/simpletest/user_agent.php
+++ /dev/null
@@ -1,332 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: user_agent.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/cookies.php');
-require_once(dirname(__FILE__) . '/http.php');
-require_once(dirname(__FILE__) . '/encoding.php');
-require_once(dirname(__FILE__) . '/authentication.php');
-/**#@-*/
-
-if (! defined('DEFAULT_MAX_REDIRECTS')) {
-    define('DEFAULT_MAX_REDIRECTS', 3);
-}
-if (! defined('DEFAULT_CONNECTION_TIMEOUT')) {
-    define('DEFAULT_CONNECTION_TIMEOUT', 15);
-}
-
-/**
- *    Fetches web pages whilst keeping track of
- *    cookies and authentication.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class SimpleUserAgent {
-    var $_cookie_jar;
-    var $_cookies_enabled = true;
-    var $_authenticator;
-    var $_max_redirects = DEFAULT_MAX_REDIRECTS;
-    var $_proxy = false;
-    var $_proxy_username = false;
-    var $_proxy_password = false;
-    var $_connection_timeout = DEFAULT_CONNECTION_TIMEOUT;
-    var $_additional_headers = array();
-    
-    /**
-     *    Starts with no cookies, realms or proxies.
-     *    @access public
-     */
-    function SimpleUserAgent() {
-        $this->_cookie_jar = &new SimpleCookieJar();
-        $this->_authenticator = &new SimpleAuthenticator();
-    }
-    
-    /**
-     *    Removes expired and temporary cookies as if
-     *    the browser was closed and re-opened. Authorisation
-     *    has to be obtained again as well.
-     *    @param string/integer $date   Time when session restarted.
-     *                                  If omitted then all persistent
-     *                                  cookies are kept.
-     *    @access public
-     */
-    function restart($date = false) {
-        $this->_cookie_jar->restartSession($date);
-        $this->_authenticator->restartSession();
-    }
-    
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->_additional_headers[] = $header;
-    }
-    
-    /**
-     *    Ages the cookies by the specified time.
-     *    @param integer $interval    Amount in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->_cookie_jar->agePrematurely($interval);
-    }
-    
-    /**
-     *    Sets an additional cookie. If a cookie has
-     *    the same name and path it is replaced.
-     *    @param string $name            Cookie key.
-     *    @param string $value           Value of cookie.
-     *    @param string $host            Host upon which the cookie is valid.
-     *    @param string $path            Cookie path if not host wide.
-     *    @param string $expiry          Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->_cookie_jar->setCookie($name, $value, $host, $path, $expiry);
-    }
-    
-    /**
-     *    Reads the most specific cookie value from the
-     *    browser cookies.
-     *    @param string $host        Host to search.
-     *    @param string $path        Applicable path.
-     *    @param string $name        Name of cookie to read.
-     *    @return string             False if not present, else the
-     *                               value as a string.
-     *    @access public
-     */
-    function getCookieValue($host, $path, $name) {
-        return $this->_cookie_jar->getCookieValue($host, $path, $name);
-    }
-    
-    /**
-     *    Reads the current cookies within the base URL.
-     *    @param string $name     Key of cookie to find.
-     *    @param SimpleUrl $base  Base URL to search from.
-     *    @return string/boolean  Null if there is no base URL, false
-     *                            if the cookie is not set.
-     *    @access public
-     */
-    function getBaseCookieValue($name, $base) {
-        if (! $base) {
-            return null;
-        }
-        return $this->getCookieValue($base->getHost(), $base->getPath(), $name);
-    }
-    
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->_cookies_enabled = false;
-    }
-    
-    /**
-     *    Switches back on the cookie sending and recieving.
-     *    @access public
-     */
-    function useCookies() {
-        $this->_cookies_enabled = true;
-    }
-    
-    /**
-     *    Sets the socket timeout for opening a connection.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->_connection_timeout = $timeout;
-    }
-    
-    /**
-     *    Sets the maximum number of redirects before
-     *    a page will be loaded anyway.
-     *    @param integer $max        Most hops allowed.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        $this->_max_redirects = $max;
-    }
-    
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username, $password) {
-        if (! $proxy) {
-            $this->_proxy = false;
-            return;
-        }
-        if ((strncmp($proxy, 'http://', 7) != 0) && (strncmp($proxy, 'https://', 8) != 0)) {
-            $proxy = 'http://'. $proxy;
-        }
-        $this->_proxy = &new SimpleUrl($proxy);
-        $this->_proxy_username = $username;
-        $this->_proxy_password = $password;
-    }
-    
-    /**
-     *    Test to see if the redirect limit is passed.
-     *    @param integer $redirects        Count so far.
-     *    @return boolean                  True if over.
-     *    @access private
-     */
-    function _isTooManyRedirects($redirects) {
-        return ($redirects > $this->_max_redirects);
-    }
-    
-    /**
-     *    Sets the identity for the current realm.
-     *    @param string $host        Host to which realm applies.
-     *    @param string $realm       Full name of realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @access public
-     */
-    function setIdentity($host, $realm, $username, $password) {
-        $this->_authenticator->setIdentityForRealm($host, $realm, $username, $password);
-    }
-    
-    /**
-     *    Fetches a URL as a response object. Will keep trying if redirected.
-     *    It will also collect authentication realm information.
-     *    @param string/SimpleUrl $url      Target to fetch.
-     *    @param SimpleEncoding $encoding   Additional parameters for request.
-     *    @return SimpleHttpResponse        Hopefully the target page.
-     *    @access public
-     */
-    function &fetchResponse($url, $encoding) {
-        if ($encoding->getMethod() != 'POST') {
-            $url->addRequestParameters($encoding);
-            $encoding->clear();
-        }
-        $response = &$this->_fetchWhileRedirected($url, $encoding);
-        if ($headers = $response->getHeaders()) {
-            if ($headers->isChallenge()) {
-                $this->_authenticator->addRealm(
-                        $url,
-                        $headers->getAuthentication(),
-                        $headers->getRealm());
-            }
-        }
-        return $response;
-    }
-    
-    /**
-     *    Fetches the page until no longer redirected or
-     *    until the redirect limit runs out.
-     *    @param SimpleUrl $url                  Target to fetch.
-     *    @param SimpelFormEncoding $encoding    Additional parameters for request.
-     *    @return SimpleHttpResponse             Hopefully the target page.
-     *    @access private
-     */
-    function &_fetchWhileRedirected($url, $encoding) {
-        $redirects = 0;
-        do {
-            $response = &$this->_fetch($url, $encoding);
-            if ($response->isError()) {
-                return $response;
-            }
-            $headers = $response->getHeaders();
-            $location = new SimpleUrl($headers->getLocation());
-            $url = $location->makeAbsolute($url);
-            if ($this->_cookies_enabled) {
-                $headers->writeCookiesToJar($this->_cookie_jar, $url);
-            }
-            if (! $headers->isRedirect()) {
-                break;
-            }
-            $encoding = new SimpleGetEncoding();
-        } while (! $this->_isTooManyRedirects(++$redirects));
-        return $response;
-    }
-    
-    /**
-     *    Actually make the web request.
-     *    @param SimpleUrl $url                   Target to fetch.
-     *    @param SimpleFormEncoding $encoding     Additional parameters for request.
-     *    @return SimpleHttpResponse              Headers and hopefully content.
-     *    @access protected
-     */
-    function &_fetch($url, $encoding) {
-        $request = &$this->_createRequest($url, $encoding);
-        $response = &$request->fetch($this->_connection_timeout);
-        return $response;
-    }
-    
-    /**
-     *    Creates a full page request.
-     *    @param SimpleUrl $url                 Target to fetch as url object.
-     *    @param SimpleFormEncoding $encoding   POST/GET parameters.
-     *    @return SimpleHttpRequest             New request.
-     *    @access private
-     */
-    function &_createRequest($url, $encoding) {
-        $request = &$this->_createHttpRequest($url, $encoding);
-        $this->_addAdditionalHeaders($request);
-        if ($this->_cookies_enabled) {
-            $request->readCookiesFromJar($this->_cookie_jar, $url);
-        }
-        $this->_authenticator->addHeaders($request, $url);
-        return $request;
-    }
-    
-    /**
-     *    Builds the appropriate HTTP request object.
-     *    @param SimpleUrl $url                  Target to fetch as url object.
-     *    @param SimpleFormEncoding $parameters  POST/GET parameters.
-     *    @return SimpleHttpRequest              New request object.
-     *    @access protected
-     */
-    function &_createHttpRequest($url, $encoding) {
-        $request = &new SimpleHttpRequest($this->_createRoute($url), $encoding);
-        return $request;
-    }
-    
-    /**
-     *    Sets up either a direct route or via a proxy.
-     *    @param SimpleUrl $url   Target to fetch as url object.
-     *    @return SimpleRoute     Route to take to fetch URL.
-     *    @access protected
-     */
-    function &_createRoute($url) {
-        if ($this->_proxy) {
-            $route = &new SimpleProxyRoute(
-                    $url,
-                    $this->_proxy,
-                    $this->_proxy_username,
-                    $this->_proxy_password);
-        } else {
-            $route = &new SimpleRoute($url);
-        }
-        return $route;
-    }
-    
-    /**
-     *    Adds additional manual headers.
-     *    @param SimpleHttpRequest $request    Outgoing request.
-     *    @access private
-     */
-    function _addAdditionalHeaders(&$request) {
-        foreach ($this->_additional_headers as $header) {
-            $request->addHeaderLine($header);
-        }
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/web_tester.php b/tests/simpletest/web_tester.php
deleted file mode 100644
index 40b161291..000000000
--- a/tests/simpletest/web_tester.php
+++ /dev/null
@@ -1,1541 +0,0 @@
-<?php
-/**
- *  Base include file for SimpleTest.
- *  @package    SimpleTest
- *  @subpackage WebTester
- *  @version    $Id: web_tester.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/test_case.php');
-require_once(dirname(__FILE__) . '/browser.php');
-require_once(dirname(__FILE__) . '/page.php');
-require_once(dirname(__FILE__) . '/expectation.php');
-/**#@-*/
-
-/**
- *    Test for an HTML widget value match.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class FieldExpectation extends SimpleExpectation {
-    var $_value;
-    
-    /**
-     *    Sets the field value to compare against.
-     *    @param mixed $value     Test value to match. Can be an
-     *                            expectation for say pattern matching.
-     *    @param string $message  Optiona message override. Can use %s as
-     *                            a placeholder for the original message.
-     *    @access public
-     */
-    function FieldExpectation($value, $message = '%s') {
-        $this->SimpleExpectation($message);
-        if (is_array($value)) {
-            sort($value);
-        }
-        $this->_value = $value;
-    }
-    
-    /**
-     *    Tests the expectation. True if it matches
-     *    a string value or an array value in any order.
-     *    @param mixed $compare        Comparison value. False for
-     *                                 an unset field.
-     *    @return boolean              True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        if ($this->_value === false) {
-            return ($compare === false);
-        }
-        if ($this->_isSingle($this->_value)) {
-            return $this->_testSingle($compare);
-        }
-        if (is_array($this->_value)) {
-            return $this->_testMultiple($compare);
-        }
-        return false;
-    }
-    
-    /**
-     *    Tests for valid field comparisons with a single option.
-     *    @param mixed $value       Value to type check.
-     *    @return boolean           True if integer, string or float.
-     *    @access private
-     */
-    function _isSingle($value) {
-        return is_string($value) || is_integer($value) || is_float($value);
-    }
-    
-    /**
-     *    String comparison for simple field with a single option.
-     *    @param mixed $compare    String to test against.
-     *    @returns boolean         True if matching.
-     *    @access private
-     */
-    function _testSingle($compare) {
-        if (is_array($compare) && count($compare) == 1) {
-            $compare = $compare[0];
-        }
-        if (! $this->_isSingle($compare)) {
-            return false;
-        }
-        return ($this->_value == $compare);
-    }
-    
-    /**
-     *    List comparison for multivalue field.
-     *    @param mixed $compare    List in any order to test against.
-     *    @returns boolean         True if matching.
-     *    @access private
-     */
-    function _testMultiple($compare) {
-        if (is_string($compare)) {
-            $compare = array($compare);
-        }
-        if (! is_array($compare)) {
-            return false;
-        }
-        sort($compare);
-        return ($this->_value === $compare);
-    }
-    
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $dumper = &$this->_getDumper();
-        if (is_array($compare)) {
-            sort($compare);
-        }
-        if ($this->test($compare)) {
-            return "Field expectation [" . $dumper->describeValue($this->_value) . "]";
-        } else {
-            return "Field expectation [" . $dumper->describeValue($this->_value) .
-                    "] fails with [" .
-                    $dumper->describeValue($compare) . "] " .
-                    $dumper->describeDifference($this->_value, $compare);
-        }
-    }
-}
-
-/**
- *    Test for a specific HTTP header within a header block.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class HttpHeaderExpectation extends SimpleExpectation {
-    var $_expected_header;
-    var $_expected_value;
-    
-    /**
-     *    Sets the field and value to compare against.
-     *    @param string $header   Case insenstive trimmed header name.
-     *    @param mixed $value     Optional value to compare. If not
-     *                            given then any value will match. If
-     *                            an expectation object then that will
-     *                            be used instead.
-     *    @param string $message  Optiona message override. Can use %s as
-     *                            a placeholder for the original message.
-     */
-    function HttpHeaderExpectation($header, $value = false, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_expected_header = $this->_normaliseHeader($header);
-        $this->_expected_value = $value;
-    }
-    
-    /**
-     *    Accessor for aggregated object.
-     *    @return mixed        Expectation set in constructor.
-     *    @access protected
-     */
-    function _getExpectation() {
-        return $this->_expected_value;
-    }
-    
-    /**
-     *    Removes whitespace at ends and case variations.
-     *    @param string $header    Name of header.
-     *    @param string            Trimmed and lowecased header
-     *                             name.
-     *    @access private
-     */
-    function _normaliseHeader($header) {
-        return strtolower(trim($header));
-    }
-    
-    /**
-     *    Tests the expectation. True if it matches
-     *    a string value or an array value in any order.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return boolean         True if header present.
-     *    @access public
-     */
-    function test($compare) {
-        return is_string($this->_findHeader($compare));
-    }
-    
-    /**
-     *    Searches the incoming result. Will extract the matching
-     *    line as text.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return string          Matching header line.
-     *    @access protected
-     */
-    function _findHeader($compare) {
-        $lines = split("\r\n", $compare);
-        foreach ($lines as $line) {
-            if ($this->_testHeaderLine($line)) {
-                return $line;
-            }
-        }
-        return false;
-    }
-    
-    /**
-     *    Compares a single header line against the expectation.
-     *    @param string $line      A single line to compare.
-     *    @return boolean          True if matched.
-     *    @access private
-     */
-    function _testHeaderLine($line) {
-        if (count($parsed = split(':', $line, 2)) < 2) {
-            return false;
-        }
-        list($header, $value) = $parsed;
-        if ($this->_normaliseHeader($header) != $this->_expected_header) {
-            return false;
-        }
-        return $this->_testHeaderValue($value, $this->_expected_value);
-    }
-    
-    /**
-     *    Tests the value part of the header.
-     *    @param string $value        Value to test.
-     *    @param mixed $expected      Value to test against.
-     *    @return boolean             True if matched.
-     *    @access protected
-     */
-    function _testHeaderValue($value, $expected) {
-        if ($expected === false) {
-            return true;
-        }
-        if (SimpleExpectation::isExpectation($expected)) {
-            return $expected->test(trim($value));
-        }
-        return (trim($value) == trim($expected));
-    }
-    
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Raw header block to search.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if (SimpleExpectation::isExpectation($this->_expected_value)) {
-            $message = $this->_expected_value->overlayMessage($compare, $this->_getDumper());
-        } else {
-            $message = $this->_expected_header .
-                    ($this->_expected_value ? ': ' . $this->_expected_value : '');
-        }
-        if (is_string($line = $this->_findHeader($compare))) {
-            return "Searching for header [$message] found [$line]";
-        } else {
-            return "Failed to find header [$message]";
-        }
-    }
-}
-    
-/**
- *    Test for a specific HTTP header within a header block that
- *    should not be found.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class NoHttpHeaderExpectation extends HttpHeaderExpectation {
-    var $_expected_header;
-    var $_expected_value;
-    
-    /**
-     *    Sets the field and value to compare against.
-     *    @param string $unwanted   Case insenstive trimmed header name.
-     *    @param string $message    Optiona message override. Can use %s as
-     *                              a placeholder for the original message.
-     */
-    function NoHttpHeaderExpectation($unwanted, $message = '%s') {
-        $this->HttpHeaderExpectation($unwanted, false, $message);
-    }
-    
-    /**
-     *    Tests that the unwanted header is not found.
-     *    @param mixed $compare   Raw header block to search.
-     *    @return boolean         True if header present.
-     *    @access public
-     */
-    function test($compare) {
-        return ($this->_findHeader($compare) === false);
-    }
-    
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Raw header block to search.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        $expectation = $this->_getExpectation();
-        if (is_string($line = $this->_findHeader($compare))) {
-            return "Found unwanted header [$expectation] with [$line]";
-        } else {
-            return "Did not find unwanted header [$expectation]";
-        }
-    }
-}
-
-/**
- *    Test for a text substring.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class TextExpectation extends SimpleExpectation {
-    var $_substring;
-    
-    /**
-     *    Sets the value to compare against.
-     *    @param string $substring  Text to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function TextExpectation($substring, $message = '%s') {
-        $this->SimpleExpectation($message);
-        $this->_substring = $substring;
-    }
-    
-    /**
-     *    Accessor for the substring.
-     *    @return string       Text to match.
-     *    @access protected
-     */
-    function _getSubstring() {
-        return $this->_substring;
-    }
-    
-    /**
-     *    Tests the expectation. True if the text contains the
-     *    substring.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return (strpos($compare, $this->_substring) !== false);
-    }
-    
-    /**
-     *    Returns a human readable test message.
-     *    @param mixed $compare      Comparison value.
-     *    @return string             Description of success
-     *                               or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            return $this->_describeTextMatch($this->_getSubstring(), $compare);
-        } else {
-            $dumper = &$this->_getDumper();
-            return "Text [" . $this->_getSubstring() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        }
-    }
-    
-    /**
-     *    Describes a pattern match including the string
-     *    found and it's position.
-     *    @param string $substring      Text to search for.
-     *    @param string $subject        Subject to search.
-     *    @access protected
-     */
-    function _describeTextMatch($substring, $subject) {
-        $position = strpos($subject, $substring);
-        $dumper = &$this->_getDumper();
-        return "Text [$substring] detected at character [$position] in [" .
-                $dumper->describeValue($subject) . "] in region [" .
-                $dumper->clipString($subject, 100, $position) . "]";
-    }
-}
-
-/**
- *    Fail if a substring is detected within the
- *    comparison text.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NoTextExpectation extends TextExpectation {
-    
-    /**
-     *    Sets the reject pattern
-     *    @param string $substring  Text to search for.
-     *    @param string $message    Customised message on failure.
-     *    @access public
-     */
-    function NoTextExpectation($substring, $message = '%s') {
-        $this->TextExpectation($substring, $message);
-    }
-    
-    /**
-     *    Tests the expectation. False if the substring appears
-     *    in the text.
-     *    @param string $compare        Comparison value.
-     *    @return boolean               True if correct.
-     *    @access public
-     */
-    function test($compare) {
-        return ! parent::test($compare);
-    }
-    
-    /**
-     *    Returns a human readable test message.
-     *    @param string $compare      Comparison value.
-     *    @return string              Description of success
-     *                                or failure.
-     *    @access public
-     */
-    function testMessage($compare) {
-        if ($this->test($compare)) {
-            $dumper = &$this->_getDumper();
-            return "Text [" . $this->_getSubstring() .
-                    "] not detected in [" .
-                    $dumper->describeValue($compare) . "]";
-        } else {
-            return $this->_describeTextMatch($this->_getSubstring(), $compare);
-        }
-    }
-}
-
-/**
- *    Test case for testing of web pages. Allows
- *    fetching of pages, parsing of HTML and
- *    submitting forms.
- *    @package SimpleTest
- *    @subpackage WebTester
- */
-class WebTestCase extends SimpleTestCase {
-    var $_browser;
-    var $_ignore_errors = false;
-    
-    /**
-     *    Creates an empty test case. Should be subclassed
-     *    with test methods for a functional test case.
-     *    @param string $label     Name of test case. Will use
-     *                             the class name if none specified.
-     *    @access public
-     */
-    function WebTestCase($label = false) {
-        $this->SimpleTestCase($label);
-    }
-    
-    /**
-     *    Announces the start of the test.
-     *    @param string $method    Test method just started.
-     *    @access public
-     */
-    function before($method) {
-        parent::before($method);
-        $this->setBrowser($this->createBrowser());
-    }
-
-    /**
-     *    Announces the end of the test. Includes private clean up.
-     *    @param string $method    Test method just finished.
-     *    @access public
-     */
-    function after($method) {
-        $this->unsetBrowser();
-        parent::after($method);
-    }
-    
-    /**
-     *    Gets a current browser reference for setting
-     *    special expectations or for detailed
-     *    examination of page fetches.
-     *    @return SimpleBrowser     Current test browser object.
-     *    @access public
-     */
-    function &getBrowser() {
-        return $this->_browser;
-    }
-    
-    /**
-     *    Gets a current browser reference for setting
-     *    special expectations or for detailed
-     *    examination of page fetches.
-     *    @param SimpleBrowser $browser    New test browser object.
-     *    @access public
-     */
-    function setBrowser(&$browser) {
-        return $this->_browser = &$browser;
-    }
-        
-    /**
-     *    Clears the current browser reference to help the
-     *    PHP garbage collector.
-     *    @access public
-     */
-    function unsetBrowser() {
-        unset($this->_browser);
-    }
-    
-    /**
-     *    Creates a new default web browser object.
-     *    Will be cleared at the end of the test method.
-     *    @return TestBrowser           New browser.
-     *    @access public
-     */
-    function &createBrowser() {
-        $browser = &new SimpleBrowser();
-        return $browser;
-    }
-    
-    /**
-     *    Gets the last response error.
-     *    @return string    Last low level HTTP error.
-     *    @access public
-     */
-    function getTransportError() {
-        return $this->_browser->getTransportError();
-    }
-        
-    /**
-     *    Accessor for the currently selected URL.
-     *    @return string        Current location or false if
-     *                          no page yet fetched.
-     *    @access public
-     */
-    function getUrl() {
-        return $this->_browser->getUrl();
-    }
-    
-    /**
-     *    Dumps the current request for debugging.
-     *    @access public
-     */
-    function showRequest() {
-        $this->dump($this->_browser->getRequest());
-    }
-    
-    /**
-     *    Dumps the current HTTP headers for debugging.
-     *    @access public
-     */
-    function showHeaders() {
-        $this->dump($this->_browser->getHeaders());
-    }
-    
-    /**
-     *    Dumps the current HTML source for debugging.
-     *    @access public
-     */
-    function showSource() {
-        $this->dump($this->_browser->getContent());
-    }
-    
-    /**
-     *    Dumps the visible text only for debugging.
-     *    @access public
-     */
-    function showText() {
-        $this->dump(wordwrap($this->_browser->getContentAsText(), 80));
-    }
-    
-    /**
-     *    Simulates the closing and reopening of the browser.
-     *    Temporary cookies will be discarded and timed
-     *    cookies will be expired if later than the
-     *    specified time.
-     *    @param string/integer $date Time when session restarted.
-     *                                If ommitted then all persistent
-     *                                cookies are kept. Time is either
-     *                                Cookie format string or timestamp.
-     *    @access public
-     */
-    function restart($date = false) {
-        if ($date === false) {
-            $date = time();
-        }
-        $this->_browser->restart($date);
-    }
-    
-    /**
-     *    Moves cookie expiry times back into the past.
-     *    Useful for testing timeouts and expiries.
-     *    @param integer $interval    Amount to age in seconds.
-     *    @access public
-     */
-    function ageCookies($interval) {
-        $this->_browser->ageCookies($interval);
-    }
-    
-    /**
-     *    Disables frames support. Frames will not be fetched
-     *    and the frameset page will be used instead.
-     *    @access public
-     */
-    function ignoreFrames() {
-        $this->_browser->ignoreFrames();
-    }
-    
-    /**
-     *    Switches off cookie sending and recieving.
-     *    @access public
-     */
-    function ignoreCookies() {
-        $this->_browser->ignoreCookies();
-    }
-    
-    /**
-     *    Skips errors for the next request only. You might
-     *    want to confirm that a page is unreachable for
-     *    example.
-     *    @access public
-     */
-    function ignoreErrors() {
-        $this->_ignore_errors = true;
-    }
-    
-    /**
-     *    Issues a fail if there is a transport error anywhere
-     *    in the current frameset. Only one such error is
-     *    reported.
-     *    @param string/boolean $result   HTML or failure.
-     *    @return string/boolean $result  Passes through result.
-     *    @access private
-     */
-    function _failOnError($result) {
-        if (! $this->_ignore_errors) {
-            if ($error = $this->_browser->getTransportError()) {
-                $this->fail($error);
-            }
-        }
-        $this->_ignore_errors = false;
-        return $result;
-    }
-
-    /**
-     *    Adds a header to every fetch.
-     *    @param string $header       Header line to add to every
-     *                                request until cleared.
-     *    @access public
-     */
-    function addHeader($header) {
-        $this->_browser->addHeader($header);
-    }
-    
-    /**
-     *    Sets the maximum number of redirects before
-     *    the web page is loaded regardless.
-     *    @param integer $max        Maximum hops.
-     *    @access public
-     */
-    function setMaximumRedirects($max) {
-        if (! $this->_browser) {
-            trigger_error(
-                    'Can only set maximum redirects in a test method, setUp() or tearDown()');
-        }
-        $this->_browser->setMaximumRedirects($max);
-    }
-    
-    /**
-     *    Sets the socket timeout for opening a connection and
-     *    receiving at least one byte of information.
-     *    @param integer $timeout      Maximum time in seconds.
-     *    @access public
-     */
-    function setConnectionTimeout($timeout) {
-        $this->_browser->setConnectionTimeout($timeout);
-    }
-    
-    /**
-     *    Sets proxy to use on all requests for when
-     *    testing from behind a firewall. Set URL
-     *    to false to disable.
-     *    @param string $proxy        Proxy URL.
-     *    @param string $username     Proxy username for authentication.
-     *    @param string $password     Proxy password for authentication.
-     *    @access public
-     */
-    function useProxy($proxy, $username = false, $password = false) {
-        $this->_browser->useProxy($proxy, $username, $password);
-    }
-    
-    /**
-     *    Fetches a page into the page buffer. If
-     *    there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function get($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->get($url, $parameters));
-    }
-    
-    /**
-     *    Fetches a page by POST into the page buffer.
-     *    If there is no base for the URL then the
-     *    current base URL is used. After the fetch
-     *    the base URL reflects the new location.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean/string      Raw page on success.
-     *    @access public
-     */
-    function post($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->post($url, $parameters));
-    }
-    
-    /**
-     *    Does a HTTP HEAD fetch, fetching only the page
-     *    headers. The current base URL is unchanged by this.
-     *    @param string $url          URL to fetch.
-     *    @param hash $parameters     Optional additional GET data.
-     *    @return boolean             True on success.
-     *    @access public
-     */
-    function head($url, $parameters = false) {
-        return $this->_failOnError($this->_browser->head($url, $parameters));
-    }
-    
-    /**
-     *    Equivalent to hitting the retry button on the
-     *    browser. Will attempt to repeat the page fetch.
-     *    @return boolean     True if fetch succeeded.
-     *    @access public
-     */
-    function retry() {
-        return $this->_failOnError($this->_browser->retry());
-    }
-    
-    /**
-     *    Equivalent to hitting the back button on the
-     *    browser.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded.
-     *    @access public
-     */
-    function back() {
-        return $this->_failOnError($this->_browser->back());
-    }
-    
-    /**
-     *    Equivalent to hitting the forward button on the
-     *    browser.
-     *    @return boolean     True if history entry and
-     *                        fetch succeeded.
-     *    @access public
-     */
-    function forward() {
-        return $this->_failOnError($this->_browser->forward());
-    }
-    
-    /**
-     *    Retries a request after setting the authentication
-     *    for the current realm.
-     *    @param string $username    Username for realm.
-     *    @param string $password    Password for realm.
-     *    @return boolean/string     HTML on successful fetch. Note
-     *                               that authentication may still have
-     *                               failed.
-     *    @access public
-     */
-    function authenticate($username, $password) {
-        return $this->_failOnError(
-                $this->_browser->authenticate($username, $password));
-    }
-    
-    /**
-     *    Gets the cookie value for the current browser context.
-     *    @param string $name          Name of cookie.
-     *    @return string               Value of cookie or false if unset.
-     *    @access public
-     */
-    function getCookie($name) {
-        return $this->_browser->getCurrentCookieValue($name);
-    }
-    
-    /**
-     *    Sets a cookie in the current browser.
-     *    @param string $name          Name of cookie.
-     *    @param string $value         Cookie value.
-     *    @param string $host          Host upon which the cookie is valid.
-     *    @param string $path          Cookie path if not host wide.
-     *    @param string $expiry        Expiry date.
-     *    @access public
-     */
-    function setCookie($name, $value, $host = false, $path = '/', $expiry = false) {
-        $this->_browser->setCookie($name, $value, $host, $path, $expiry);
-    }
-    
-    /**
-     *    Accessor for current frame focus. Will be
-     *    false if no frame has focus.
-     *    @return integer/string/boolean    Label if any, otherwise
-     *                                      the position in the frameset
-     *                                      or false if none.
-     *    @access public
-     */
-    function getFrameFocus() {
-        return $this->_browser->getFrameFocus();
-    }
-    
-    /**
-     *    Sets the focus by index. The integer index starts from 1.
-     *    @param integer $choice    Chosen frame.
-     *    @return boolean           True if frame exists.
-     *    @access public
-     */
-    function setFrameFocusByIndex($choice) {
-        return $this->_browser->setFrameFocusByIndex($choice);
-    }
-    
-    /**
-     *    Sets the focus by name.
-     *    @param string $name    Chosen frame.
-     *    @return boolean        True if frame exists.
-     *    @access public
-     */
-    function setFrameFocus($name) {
-        return $this->_browser->setFrameFocus($name);
-    }
-    
-    /**
-     *    Clears the frame focus. All frames will be searched
-     *    for content.
-     *    @access public
-     */
-    function clearFrameFocus() {
-        return $this->_browser->clearFrameFocus();
-    }
-    
-    /**
-     *    Clicks a visible text item. Will first try buttons,
-     *    then links and then images.
-     *    @param string $label        Visible text or alt text.
-     *    @return string/boolean      Raw page or false.
-     *    @access public
-     */
-    function click($label) {
-        return $this->_failOnError($this->_browser->click($label));
-    }
-    
-    /**
-     *    Checks for a click target.
-     *    @param string $label        Visible text or alt text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */    
-    function assertClickable($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->isClickable($label),
-                sprintf($message, "Click target [$label] should exist"));
-    }
-    
-    /**
-     *    Clicks the submit button by label. The owning
-     *    form will be submitted by this.
-     *    @param string $label    Button label. An unlabeled
-     *                            button can be triggered by 'Submit'.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success, else false.
-     *    @access public
-     */
-    function clickSubmit($label = 'Submit', $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickSubmit($label, $additional));
-    }
-    
-    /**
-     *    Clicks the submit button by name attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $name     Name attribute of button.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickSubmitByName($name, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickSubmitByName($name, $additional));
-    }
-    
-    /**
-     *    Clicks the submit button by ID attribute. The owning
-     *    form will be submitted by this.
-     *    @param string $id       ID attribute of button.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickSubmitById($id, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickSubmitById($id, $additional));
-    }
-    
-    /**
-     *    Checks for a valid button label.
-     *    @param string $label        Visible text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */    
-    function assertSubmit($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->isSubmit($label),
-                sprintf($message, "Submit button [$label] should exist"));
-    }
-    
-    /**
-     *    Clicks the submit image by some kind of label. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $label    Alt attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickImage($label, $x = 1, $y = 1, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickImage($label, $x, $y, $additional));
-    }
-    
-    /**
-     *    Clicks the submit image by the name. Usually
-     *    the alt tag or the nearest equivalent. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param string $name     Name attribute of button.
-     *    @param integer $x       X-coordinate of imaginary click.
-     *    @param integer $y       Y-coordinate of imaginary click.
-     *    @param hash $additional Additional form values.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function clickImageByName($name, $x = 1, $y = 1, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickImageByName($name, $x, $y, $additional));
-    }
-    
-    /**
-     *    Clicks the submit image by ID attribute. The owning
-     *    form will be submitted by this. Clicking outside of
-     *    the boundary of the coordinates will result in
-     *    a failure.
-     *    @param integer/string $id   ID attribute of button.
-     *    @param integer $x           X-coordinate of imaginary click.
-     *    @param integer $y           Y-coordinate of imaginary click.
-     *    @param hash $additional     Additional form values.
-     *    @return boolean/string      Page on success.
-     *    @access public
-     */
-    function clickImageById($id, $x = 1, $y = 1, $additional = false) {
-        return $this->_failOnError(
-                $this->_browser->clickImageById($id, $x, $y, $additional));
-    }
-    
-    /**
-     *    Checks for a valid image with atht alt text or title.
-     *    @param string $label        Visible text.
-     *    @return boolean             True if click target.
-     *    @access public
-     */    
-    function assertImage($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->isImage($label),
-                sprintf($message, "Image with text [$label] should exist"));
-    }
-    
-    /**
-     *    Submits a form by the ID.
-     *    @param string $id       Form ID. No button information
-     *                            is submitted this way.
-     *    @return boolean/string  Page on success.
-     *    @access public
-     */
-    function submitFormById($id) {
-        return $this->_failOnError($this->_browser->submitFormById($id));
-    }
-    
-    /**
-     *    Follows a link by name. Will click the first link
-     *    found with this link text by default, or a later
-     *    one if an index is given. Match is case insensitive
-     *    with normalised space.
-     *    @param string $label     Text between the anchor tags.
-     *    @param integer $index    Link position counting from zero.
-     *    @return boolean/string   Page on success.
-     *    @access public
-     */
-    function clickLink($label, $index = 0) {
-        return $this->_failOnError($this->_browser->clickLink($label, $index));
-    }
-    
-    /**
-     *    Follows a link by id attribute.
-     *    @param string $id        ID attribute value.
-     *    @return boolean/string   Page on success.
-     *    @access public
-     */
-    function clickLinkById($id) {
-        return $this->_failOnError($this->_browser->clickLinkById($id));
-    }
-    
-    /**
-     *    Tests for the presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string $label     Text between the anchor tags.
-     *    @param mixed $expected   Expected URL or expectation object.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link present.
-     *    @access public
-     */
-    function assertLink($label, $expected = true, $message = '%s') {
-        $url = $this->_browser->getLink($label);
-        if ($expected === true || ($expected !== true && $url === false)) {
-            return $this->assertTrue($url !== false, sprintf($message, "Link [$label] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new IdenticalExpectation($expected);
-        }
-        return $this->assert($expected, $url->asString(), sprintf($message, "Link [$label] should match"));
-    }
-
-    /**
-     *    Tests for the non-presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string/integer $label    Text between the anchor tags
-     *                                    or ID attribute.
-     *    @param string $message          Message to display. Default
-     *                                    can be embedded with %s.
-     *    @return boolean                 True if link missing.
-     *    @access public
-     */
-    function assertNoLink($label, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->getLink($label) === false,
-                sprintf($message, "Link [$label] should not exist"));
-    }
-    
-    /**
-     *    Tests for the presence of a link id attribute.
-     *    @param string $id        Id attribute value.
-     *    @param mixed $expected   Expected URL or expectation object.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link present.
-     *    @access public
-     */
-    function assertLinkById($id, $expected = true, $message = '%s') {
-        $url = $this->_browser->getLinkById($id);
-        if ($expected === true) {
-            return $this->assertTrue($url !== false, sprintf($message, "Link ID [$id] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new IdenticalExpectation($expected);
-        }
-        return $this->assert($expected, $url->asString(), sprintf($message, "Link ID [$id] should match"));
-    }
-
-    /**
-     *    Tests for the non-presence of a link label. Match is
-     *    case insensitive with normalised space.
-     *    @param string $id        Id attribute value.
-     *    @param string $message   Message to display. Default
-     *                             can be embedded with %s.
-     *    @return boolean          True if link missing.
-     *    @access public
-     */
-    function assertNoLinkById($id, $message = '%s') {
-        return $this->assertTrue(
-                $this->_browser->getLinkById($id) === false,
-                sprintf($message, "Link ID [$id] should not exist"));
-    }
-    
-    /**
-     *    Sets all form fields with that label, or name if there
-     *    is no label attached.
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setField($label, $value, $position=false) {
-        return $this->_browser->setField($label, $value, $position);
-    }
-    
-    /**
-     *    Sets all form fields with that name.
-     *    @param string $name    Name of field in forms.
-     *    @param string $value   New value of field.
-     *    @return boolean        True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldByName($name, $value, $position=false) {
-        return $this->_browser->setFieldByName($name, $value, $position);
-    }
-        
-    /**
-     *    Sets all form fields with that id.
-     *    @param string/integer $id   Id of field in forms.
-     *    @param string $value        New value of field.
-     *    @return boolean             True if field exists, otherwise false.
-     *    @access public
-     */
-    function setFieldById($id, $value) {
-        return $this->_browser->setFieldById($id, $value);
-    }
-    
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form will always
-     *    fail. If no value is given then only the existence
-     *    of the field is checked.
-     *    @param string $name       Name of field in forms.
-     *    @param mixed $expected    Expected string/array value or
-     *                              false for unset fields.
-     *    @param string $message    Message to display. Default
-     *                              can be embedded with %s.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertField($label, $expected = true, $message = '%s') {
-        $value = $this->_browser->getField($label);
-        return $this->_assertFieldValue($label, $value, $expected, $message);
-    }
-    
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form element will always
-     *    fail. If no value is given then only the existence
-     *    of the field is checked.
-     *    @param string $name       Name of field in forms.
-     *    @param mixed $expected    Expected string/array value or
-     *                              false for unset fields.
-     *    @param string $message    Message to display. Default
-     *                              can be embedded with %s.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertFieldByName($name, $expected = true, $message = '%s') {
-        $value = $this->_browser->getFieldByName($name);
-        return $this->_assertFieldValue($name, $value, $expected, $message);
-    }
-        
-    /**
-     *    Confirms that the form element is currently set
-     *    to the expected value. A missing form will always
-     *    fail. If no ID is given then only the existence
-     *    of the field is checked.
-     *    @param string/integer $id  Name of field in forms.
-     *    @param mixed $expected     Expected string/array value or
-     *                               false for unset fields.
-     *    @param string $message     Message to display. Default
-     *                               can be embedded with %s.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertFieldById($id, $expected = true, $message = '%s') {
-        $value = $this->_browser->getFieldById($id);
-        return $this->_assertFieldValue($id, $value, $expected, $message);
-    }
-    
-    /**
-     *    Tests the field value against the expectation.
-     *    @param string $identifier      Name, ID or label.
-     *    @param mixed $value            Current field value.
-     *    @param mixed $expected         Expected value to match.
-     *    @param string $message         Failure message.
-     *    @return boolean                True if pass
-     *    @access protected
-     */
-    function _assertFieldValue($identifier, $value, $expected, $message) {
-        if ($expected === true) {
-            return $this->assertTrue(
-                    isset($value),
-                    sprintf($message, "Field [$identifier] should exist"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $identifier = str_replace('%', '%%', $identifier);
-            $expected = new FieldExpectation(
-                    $expected,
-                    "Field [$identifier] should match with [%s]");
-        }
-        return $this->assert($expected, $value, $message);
-    }
-    
-    /**
-     *    Checks the response code against a list
-     *    of possible values.
-     *    @param array $responses    Possible responses for a pass.
-     *    @param string $message     Message to display. Default
-     *                               can be embedded with %s.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertResponse($responses, $message = '%s') {
-        $responses = (is_array($responses) ? $responses : array($responses));
-        $code = $this->_browser->getResponseCode();
-        $message = sprintf($message, "Expecting response in [" .
-                implode(", ", $responses) . "] got [$code]");
-        return $this->assertTrue(in_array($code, $responses), $message);
-    }
-    
-    /**
-     *    Checks the mime type against a list
-     *    of possible values.
-     *    @param array $types      Possible mime types for a pass.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertMime($types, $message = '%s') {
-        $types = (is_array($types) ? $types : array($types));
-        $type = $this->_browser->getMimeType();
-        $message = sprintf($message, "Expecting mime type in [" .
-                implode(", ", $types) . "] got [$type]");
-        return $this->assertTrue(in_array($type, $types), $message);
-    }
-    
-    /**
-     *    Attempt to match the authentication type within
-     *    the security realm we are currently matching.
-     *    @param string $authentication   Usually basic.
-     *    @param string $message          Message to display.
-     *    @return boolean                 True if pass.
-     *    @access public
-     */
-    function assertAuthentication($authentication = false, $message = '%s') {
-        if (! $authentication) {
-            $message = sprintf($message, "Expected any authentication type, got [" .
-                    $this->_browser->getAuthentication() . "]");
-            return $this->assertTrue(
-                    $this->_browser->getAuthentication(),
-                    $message);
-        } else {
-            $message = sprintf($message, "Expected authentication [$authentication] got [" .
-                    $this->_browser->getAuthentication() . "]");
-            return $this->assertTrue(
-                    strtolower($this->_browser->getAuthentication()) == strtolower($authentication),
-                    $message);
-        }
-    }
-    
-    /**
-     *    Checks that no authentication is necessary to view
-     *    the desired page.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertNoAuthentication($message = '%s') {
-        $message = sprintf($message, "Expected no authentication type, got [" .
-                $this->_browser->getAuthentication() . "]");
-        return $this->assertFalse($this->_browser->getAuthentication(), $message);
-    }
-    
-    /**
-     *    Attempts to match the current security realm.
-     *    @param string $realm     Name of security realm.
-     *    @param string $message   Message to display.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertRealm($realm, $message = '%s') {
-        if (! SimpleExpectation::isExpectation($realm)) {
-            $realm = new EqualExpectation($realm);
-        }
-        return $this->assert(
-                $realm,
-                $this->_browser->getRealm(),
-                "Expected realm -> $message");
-    }
-    
-    /**
-     *    Checks each header line for the required value. If no
-     *    value is given then only an existence check is made.
-     *    @param string $header    Case insensitive header name.
-     *    @param mixed $value      Case sensitive trimmed string to
-     *                             match against. An expectation object
-     *                             can be used for pattern matching.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertHeader($header, $value = false, $message = '%s') {
-        return $this->assert(
-                new HttpHeaderExpectation($header, $value),
-                $this->_browser->getHeaders(),
-                $message);
-    }
-        
-    /**
-     *    @deprecated
-     */
-    function assertHeaderPattern($header, $pattern, $message = '%s') {
-        return $this->assert(
-                new HttpHeaderExpectation($header, new PatternExpectation($pattern)),
-                $this->_browser->getHeaders(),
-                $message);
-    }
-
-    /**
-     *    Confirms that the header type has not been received.
-     *    Only the landing page is checked. If you want to check
-     *    redirect pages, then you should limit redirects so
-     *    as to capture the page you want.
-     *    @param string $header    Case insensitive header name.
-     *    @return boolean          True if pass.
-     *    @access public
-     */
-    function assertNoHeader($header, $message = '%s') {
-        return $this->assert(
-                new NoHttpHeaderExpectation($header),
-                $this->_browser->getHeaders(),
-                $message);
-    }
-        
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedHeader($header, $message = '%s') {
-        return $this->assertNoHeader($header, $message);
-    }
-    
-    /**
-     *    Tests the text between the title tags.
-     *    @param string/SimpleExpectation $title    Expected title.
-     *    @param string $message                    Message to display.
-     *    @return boolean                           True if pass.
-     *    @access public
-     */
-    function assertTitle($title = false, $message = '%s') {
-        if (! SimpleExpectation::isExpectation($title)) {
-            $title = new EqualExpectation($title);
-        }
-        return $this->assert($title, $this->_browser->getTitle(), $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the text is found in the plain
-     *    text form of the page.
-     *    @param string $text       Text to look for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertText($text, $message = '%s') {
-        return $this->assert(
-                new TextExpectation($text),
-                $this->_browser->getContentAsText(),
-                $message);
-    }
-    
-    /**
-     *    @deprecated
-     */
-    function assertWantedText($text, $message = '%s') {
-        return $this->assertText($text, $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the text is not found in the plain
-     *    text form of the page.
-     *    @param string $text       Text to look for.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoText($text, $message = '%s') {
-        return $this->assert(
-                new NoTextExpectation($text),
-                $this->_browser->getContentAsText(),
-                $message);
-    }
-    
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedText($text, $message = '%s') {
-        return $this->assertNoText($text, $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the Perl regex pattern
-     *    is found in the raw content.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertPattern($pattern, $message = '%s') {
-        return $this->assert(
-                new PatternExpectation($pattern),
-                $this->_browser->getContent(),
-                $message);
-    }
-    
-    /**
-     *    @deprecated
-     */
-    function assertWantedPattern($pattern, $message = '%s') {
-        return $this->assertPattern($pattern, $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the perl regex pattern
-     *    is not present in raw content.
-     *    @param string $pattern    Perl regex to look for including
-     *                              the regex delimiters.
-     *    @param string $message    Message to display.
-     *    @return boolean           True if pass.
-     *    @access public
-     */
-    function assertNoPattern($pattern, $message = '%s') {
-        return $this->assert(
-                new NoPatternExpectation($pattern),
-                $this->_browser->getContent(),
-                $message);
-    }
-    
-    /**
-     *    @deprecated
-     */
-    function assertNoUnwantedPattern($pattern, $message = '%s') {
-        return $this->assertNoPattern($pattern, $message);
-    }
-    
-    /**
-     *    Checks that a cookie is set for the current page
-     *    and optionally checks the value.
-     *    @param string $name        Name of cookie to test.
-     *    @param string $expected    Expected value as a string or
-     *                               false if any value will do.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertCookie($name, $expected = false, $message = '%s') {
-        $value = $this->getCookie($name);
-        if (! $expected) {
-            return $this->assertTrue(
-                    $value,
-                    sprintf($message, "Expecting cookie [$name]"));
-        }
-        if (! SimpleExpectation::isExpectation($expected)) {
-            $expected = new EqualExpectation($expected);
-        }
-        return $this->assert($expected, $value, "Expecting cookie [$name] -> $message");
-    }
-    
-    /**
-     *    Checks that no cookie is present or that it has
-     *    been successfully cleared.
-     *    @param string $name        Name of cookie to test.
-     *    @param string $message     Message to display.
-     *    @return boolean            True if pass.
-     *    @access public
-     */
-    function assertNoCookie($name, $message = '%s') {
-        return $this->assertTrue(
-                $this->getCookie($name) === false,
-                sprintf($message, "Not expecting cookie [$name]"));
-    }
-
-    /**
-     *    Called from within the test methods to register
-     *    passes and failures.
-     *    @param boolean $result    Pass on true.
-     *    @param string $message    Message to display describing
-     *                              the test state.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertTrue($result, $message = false) {
-        return $this->assert(new TrueExpectation(), $result, $message);
-    }
-
-    /**
-     *    Will be true on false and vice versa. False
-     *    is the PHP definition of false, so that null,
-     *    empty strings, zero and an empty array all count
-     *    as false.
-     *    @param boolean $result    Pass on false.
-     *    @param string $message    Message to display.
-     *    @return boolean           True on pass
-     *    @access public
-     */
-    function assertFalse($result, $message = '%s') {
-        return $this->assert(new FalseExpectation(), $result, $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    the same value only. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first          Value to compare.
-     *    @param mixed $second         Value to compare.
-     *    @param string $message       Message to display.
-     *    @return boolean              True on pass
-     *    @access public
-     */
-    function assertEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new EqualExpectation($first),
-                $second,
-                $message);
-    }
-    
-    /**
-     *    Will trigger a pass if the two parameters have
-     *    a different value. Otherwise a fail. This
-     *    is for testing hand extracted text, etc.
-     *    @param mixed $first           Value to compare.
-     *    @param mixed $second          Value to compare.
-     *    @param string $message        Message to display.
-     *    @return boolean               True on pass
-     *    @access public
-     */
-    function assertNotEqual($first, $second, $message = '%s') {
-        return $this->assert(
-                new NotEqualExpectation($first),
-                $second,
-                $message);
-    }
-
-    /**
-     *    Uses a stack trace to find the line of an assertion.
-     *    @return string           Line number of first assert*
-     *                             method embedded in format string.
-     *    @access public
-     */
-    function getAssertionLine() {
-        $trace = new SimpleStackTrace(array('assert', 'click', 'pass', 'fail'));
-        return $trace->traceMethod();
-    }
-}
-?>
\ No newline at end of file
diff --git a/tests/simpletest/xml.php b/tests/simpletest/xml.php
deleted file mode 100644
index 1666cb930..000000000
--- a/tests/simpletest/xml.php
+++ /dev/null
@@ -1,647 +0,0 @@
-<?php
-/**
- *  base include file for SimpleTest
- *  @package    SimpleTest
- *  @subpackage UnitTester
- *  @version    $Id: xml.php 1723 2008-04-08 00:34:10Z lastcraft $
- */
-
-/**#@+
- *  include other SimpleTest class files
- */
-require_once(dirname(__FILE__) . '/scorer.php');
-/**#@-*/
-
-/**
- *    Creates the XML needed for remote communication
- *    by SimpleTest.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class XmlReporter extends SimpleReporter {
-    var $_indent;
-    var $_namespace;
-
-    /**
-     *    Sets up indentation and namespace.
-     *    @param string $namespace        Namespace to add to each tag.
-     *    @param string $indent           Indenting to add on each nesting.
-     *    @access public
-     */
-    function XmlReporter($namespace = false, $indent = '  ') {
-        $this->SimpleReporter();
-        $this->_namespace = ($namespace ? $namespace . ':' : '');
-        $this->_indent = $indent;
-    }
-
-    /**
-     *    Calculates the pretty printing indent level
-     *    from the current level of nesting.
-     *    @param integer $offset  Extra indenting level.
-     *    @return string          Leading space.
-     *    @access protected
-     */
-    function _getIndent($offset = 0) {
-        return str_repeat(
-                $this->_indent,
-                count($this->getTestList()) + $offset);
-    }
-
-    /**
-     *    Converts character string to parsed XML
-     *    entities string.
-     *    @param string text        Unparsed character data.
-     *    @return string            Parsed character data.
-     *    @access public
-     */
-    function toParsedXml($text) {
-        return str_replace(
-                array('&', '<', '>', '"', '\''),
-                array('&amp;', '&lt;', '&gt;', '&quot;', '&apos;'),
-                $text);
-    }
-
-    /**
-     *    Paints the start of a group test.
-     *    @param string $test_name   Name of test that is starting.
-     *    @param integer $size       Number of test cases starting.
-     *    @access public
-     */
-    function paintGroupStart($test_name, $size) {
-        parent::paintGroupStart($test_name, $size);
-        print $this->_getIndent();
-        print "<" . $this->_namespace . "group size=\"$size\">\n";
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->_namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a group test.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintGroupEnd($test_name) {
-        print $this->_getIndent();
-        print "</" . $this->_namespace . "group>\n";
-        parent::paintGroupEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test case.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintCaseStart($test_name) {
-        parent::paintCaseStart($test_name);
-        print $this->_getIndent();
-        print "<" . $this->_namespace . "case>\n";
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->_namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a test case.
-     *    @param string $test_name   Name of test that is ending.
-     *    @access public
-     */
-    function paintCaseEnd($test_name) {
-        print $this->_getIndent();
-        print "</" . $this->_namespace . "case>\n";
-        parent::paintCaseEnd($test_name);
-    }
-
-    /**
-     *    Paints the start of a test method.
-     *    @param string $test_name   Name of test that is starting.
-     *    @access public
-     */
-    function paintMethodStart($test_name) {
-        parent::paintMethodStart($test_name);
-        print $this->_getIndent();
-        print "<" . $this->_namespace . "test>\n";
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "name>" .
-                $this->toParsedXml($test_name) .
-                "</" . $this->_namespace . "name>\n";
-    }
-
-    /**
-     *    Paints the end of a test method.
-     *    @param string $test_name   Name of test that is ending.
-     *    @param integer $progress   Number of test cases ending.
-     *    @access public
-     */
-    function paintMethodEnd($test_name) {
-        print $this->_getIndent();
-        print "</" . $this->_namespace . "test>\n";
-        parent::paintMethodEnd($test_name);
-    }
-
-    /**
-     *    Paints pass as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintPass($message) {
-        parent::paintPass($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "pass>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "pass>\n";
-    }
-
-    /**
-     *    Paints failure as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintFail($message) {
-        parent::paintFail($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "fail>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "fail>\n";
-    }
-
-    /**
-     *    Paints error as XML.
-     *    @param string $message        Message to encode.
-     *    @access public
-     */
-    function paintError($message) {
-        parent::paintError($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "exception>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "exception>\n";
-    }
-
-    /**
-     *    Paints exception as XML.
-     *    @param Exception $exception    Exception to encode.
-     *    @access public
-     */
-    function paintException($exception) {
-        parent::paintException($exception);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "exception>";
-        $message = 'Unexpected exception of type [' . get_class($exception) .
-                '] with message ['. $exception->getMessage() .
-                '] in ['. $exception->getFile() .
-                ' line ' . $exception->getLine() . ']';
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "exception>\n";
-    }
-
-    /**
-     *    Paints the skipping message and tag.
-     *    @param string $message        Text to display in skip tag.
-     *    @access public
-     */
-    function paintSkip($message) {
-        parent::paintSkip($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "skip>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "skip>\n";
-    }
-
-    /**
-     *    Paints a simple supplementary message.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintMessage($message) {
-        parent::paintMessage($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "message>";
-        print $this->toParsedXml($message);
-        print "</" . $this->_namespace . "message>\n";
-    }
-
-    /**
-     *    Paints a formatted ASCII message such as a
-     *    variable dump.
-     *    @param string $message        Text to display.
-     *    @access public
-     */
-    function paintFormattedMessage($message) {
-        parent::paintFormattedMessage($message);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "formatted>";
-        print "<![CDATA[$message]]>";
-        print "</" . $this->_namespace . "formatted>\n";
-    }
-
-    /**
-     *    Serialises the event object.
-     *    @param string $type        Event type as text.
-     *    @param mixed $payload      Message or object.
-     *    @access public
-     */
-    function paintSignal($type, $payload) {
-        parent::paintSignal($type, $payload);
-        print $this->_getIndent(1);
-        print "<" . $this->_namespace . "signal type=\"$type\">";
-        print "<![CDATA[" . serialize($payload) . "]]>";
-        print "</" . $this->_namespace . "signal>\n";
-    }
-
-    /**
-     *    Paints the test document header.
-     *    @param string $test_name     First test top level
-     *                                 to start.
-     *    @access public
-     *    @abstract
-     */
-    function paintHeader($test_name) {
-        if (! SimpleReporter::inCli()) {
-            header('Content-type: text/xml');
-        }
-        print "<?xml version=\"1.0\"";
-        if ($this->_namespace) {
-            print " xmlns:" . $this->_namespace .
-                    "=\"www.lastcraft.com/SimpleTest/Beta3/Report\"";
-        }
-        print "?>\n";
-        print "<" . $this->_namespace . "run>\n";
-    }
-
-    /**
-     *    Paints the test document footer.
-     *    @param string $test_name        The top level test.
-     *    @access public
-     *    @abstract
-     */
-    function paintFooter($test_name) {
-        print "</" . $this->_namespace . "run>\n";
-    }
-}
-
-/**
- *    Accumulator for incoming tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingXmlTag {
-    var $_name;
-    var $_attributes;
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingXmlTag($attributes) {
-        $this->_name = false;
-        $this->_attributes = $attributes;
-    }
-
-    /**
-     *    Sets the test case/method name.
-     *    @param string $name        Name of test.
-     *    @access public
-     */
-    function setName($name) {
-        $this->_name = $name;
-    }
-
-    /**
-     *    Accessor for name.
-     *    @return string        Name of test.
-     *    @access public
-     */
-    function getName() {
-        return $this->_name;
-    }
-
-    /**
-     *    Accessor for attributes.
-     *    @return hash        All attributes.
-     *    @access protected
-     */
-    function _getAttributes() {
-        return $this->_attributes;
-    }
-}
-
-/**
- *    Accumulator for incoming method tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingMethodTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingMethodTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintMethodStart($this->getName());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintMethodEnd($this->getName());
-    }
-}
-
-/**
- *    Accumulator for incoming case tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingCaseTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingCaseTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintCaseStart($this->getName());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintCaseEnd($this->getName());
-    }
-}
-
-/**
- *    Accumulator for incoming group tag. Holds the
- *    incoming test structure information for
- *    later dispatch to the reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class NestingGroupTag extends NestingXmlTag {
-
-    /**
-     *    Sets the basic test information except
-     *    the name.
-     *    @param hash $attributes   Name value pairs.
-     *    @access public
-     */
-    function NestingGroupTag($attributes) {
-        $this->NestingXmlTag($attributes);
-    }
-
-    /**
-     *    Signals the appropriate start event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintStart(&$listener) {
-        $listener->paintGroupStart($this->getName(), $this->getSize());
-    }
-
-    /**
-     *    Signals the appropriate end event on the
-     *    listener.
-     *    @param SimpleReporter $listener    Target for events.
-     *    @access public
-     */
-    function paintEnd(&$listener) {
-        $listener->paintGroupEnd($this->getName());
-    }
-
-    /**
-     *    The size in the attributes.
-     *    @return integer     Value of size attribute or zero.
-     *    @access public
-     */
-    function getSize() {
-        $attributes = $this->_getAttributes();
-        if (isset($attributes['SIZE'])) {
-            return (integer)$attributes['SIZE'];
-        }
-        return 0;
-    }
-}
-
-/**
- *    Parser for importing the output of the XmlReporter.
- *    Dispatches that output to another reporter.
- *    @package SimpleTest
- *    @subpackage UnitTester
- */
-class SimpleTestXmlParser {
-    var $_listener;
-    var $_expat;
-    var $_tag_stack;
-    var $_in_content_tag;
-    var $_content;
-    var $_attributes;
-
-    /**
-     *    Loads a listener with the SimpleReporter
-     *    interface.
-     *    @param SimpleReporter $listener   Listener of tag events.
-     *    @access public
-     */
-    function SimpleTestXmlParser(&$listener) {
-        $this->_listener = &$listener;
-        $this->_expat = &$this->_createParser();
-        $this->_tag_stack = array();
-        $this->_in_content_tag = false;
-        $this->_content = '';
-        $this->_attributes = array();
-    }
-
-    /**
-     *    Parses a block of XML sending the results to
-     *    the listener.
-     *    @param string $chunk        Block of text to read.
-     *    @return boolean             True if valid XML.
-     *    @access public
-     */
-    function parse($chunk) {
-        if (! xml_parse($this->_expat, $chunk)) {
-            trigger_error('XML parse error with ' .
-                    xml_error_string(xml_get_error_code($this->_expat)));
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     *    Sets up expat as the XML parser.
-     *    @return resource        Expat handle.
-     *    @access protected
-     */
-    function &_createParser() {
-        $expat = xml_parser_create();
-        xml_set_object($expat, $this);
-        xml_set_element_handler($expat, '_startElement', '_endElement');
-        xml_set_character_data_handler($expat, '_addContent');
-        xml_set_default_handler($expat, '_default');
-        return $expat;
-    }
-
-    /**
-     *    Opens a new test nesting level.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             to start.
-     *    @access private
-     */
-    function _pushNestingTag($nested) {
-        array_unshift($this->_tag_stack, $nested);
-    }
-
-    /**
-     *    Accessor for current test structure tag.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             being parsed.
-     *    @access private
-     */
-    function &_getCurrentNestingTag() {
-        return $this->_tag_stack[0];
-    }
-
-    /**
-     *    Ends a nesting tag.
-     *    @return NestedXmlTag     The group, case or method tag
-     *                             just finished.
-     *    @access private
-     */
-    function _popNestingTag() {
-        return array_shift($this->_tag_stack);
-    }
-
-    /**
-     *    Test if tag is a leaf node with only text content.
-     *    @param string $tag        XML tag name.
-     *    @return @boolean          True if leaf, false if nesting.
-     *    @private
-     */
-    function _isLeaf($tag) {
-        return in_array($tag, array(
-                'NAME', 'PASS', 'FAIL', 'EXCEPTION', 'SKIP', 'MESSAGE', 'FORMATTED', 'SIGNAL'));
-    }
-
-    /**
-     *    Handler for start of event element.
-     *    @param resource $expat     Parser handle.
-     *    @param string $tag         Element name.
-     *    @param hash $attributes    Name value pairs.
-     *                               Attributes without content
-     *                               are marked as true.
-     *    @access protected
-     */
-    function _startElement($expat, $tag, $attributes) {
-        $this->_attributes = $attributes;
-        if ($tag == 'GROUP') {
-            $this->_pushNestingTag(new NestingGroupTag($attributes));
-        } elseif ($tag == 'CASE') {
-            $this->_pushNestingTag(new NestingCaseTag($attributes));
-        } elseif ($tag == 'TEST') {
-            $this->_pushNestingTag(new NestingMethodTag($attributes));
-        } elseif ($this->_isLeaf($tag)) {
-            $this->_in_content_tag = true;
-            $this->_content = '';
-        }
-    }
-
-    /**
-     *    End of element event.
-     *    @param resource $expat     Parser handle.
-     *    @param string $tag         Element name.
-     *    @access protected
-     */
-    function _endElement($expat, $tag) {
-        $this->_in_content_tag = false;
-        if (in_array($tag, array('GROUP', 'CASE', 'TEST'))) {
-            $nesting_tag = $this->_popNestingTag();
-            $nesting_tag->paintEnd($this->_listener);
-        } elseif ($tag == 'NAME') {
-            $nesting_tag = &$this->_getCurrentNestingTag();
-            $nesting_tag->setName($this->_content);
-            $nesting_tag->paintStart($this->_listener);
-        } elseif ($tag == 'PASS') {
-            $this->_listener->paintPass($this->_content);
-        } elseif ($tag == 'FAIL') {
-            $this->_listener->paintFail($this->_content);
-        } elseif ($tag == 'EXCEPTION') {
-            $this->_listener->paintError($this->_content);
-        } elseif ($tag == 'SKIP') {
-            $this->_listener->paintSkip($this->_content);
-        } elseif ($tag == 'SIGNAL') {
-            $this->_listener->paintSignal(
-                    $this->_attributes['TYPE'],
-                    unserialize($this->_content));
-        } elseif ($tag == 'MESSAGE') {
-            $this->_listener->paintMessage($this->_content);
-        } elseif ($tag == 'FORMATTED') {
-            $this->_listener->paintFormattedMessage($this->_content);
-        }
-    }
-
-    /**
-     *    Content between start and end elements.
-     *    @param resource $expat     Parser handle.
-     *    @param string $text        Usually output messages.
-     *    @access protected
-     */
-    function _addContent($expat, $text) {
-        if ($this->_in_content_tag) {
-            $this->_content .= $text;
-        }
-        return true;
-    }
-
-    /**
-     *    XML and Doctype handler. Discards all such content.
-     *    @param resource $expat     Parser handle.
-     *    @param string $default     Text of default content.
-     *    @access protected
-     */
-    function _default($expat, $default) {
-    }
-}
-?>
diff --git a/themes/xe_default/conf/info.xml b/themes/xe_default/conf/info.xml
new file mode 100644
index 000000000..400ab6510
--- /dev/null
+++ b/themes/xe_default/conf/info.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<theme>
+	<version>0.1</version>
+	<title xml:lang="ko">XE 기본 테마</title>
+	<title xml:lang="en">XE Default Theme</title>
+	<date>2011-07-26</date>
+	<publisher email_address="developers@xpressengine.com" link="http://www.xpressengine.com">
+		<name xml:lang="ko">NHN</name>
+		<name xml:lang="en">NHN</name>
+	</publisher>
+	<description xml:lang="ko">XE가 제공하는 기본 테마입니다.</description>
+	<description xml:lang="en">The basic theme is provided by XE.</description>
+	<layout>
+			<directory path="./layouts/xe_official" />
+	</layout>
+	<skinInfos>
+		<skinInfo>
+			<directory path="./modules/page/skins/default" />
+		</skinInfo>
+		<skinInfo>
+			<directory path="./modules/board/skins/xe_v3_default" />
+		</skinInfo>
+		<skinInfo>
+			<directory path="./modules/member/skins/default" />
+		</skinInfo>
+		<skinInfo>
+			<directory path="./modules/message/skins/default" />
+		</skinInfo>
+	</skinInfos>
+</theme>
diff --git a/themes/xe_default/thumbnail.png b/themes/xe_default/thumbnail.png
new file mode 100644
index 000000000..c2fbad20b
Binary files /dev/null and b/themes/xe_default/thumbnail.png differ
diff --git a/themes/xe_greystone/conf/info.xml b/themes/xe_greystone/conf/info.xml
new file mode 100644
index 000000000..731ed47f0
--- /dev/null
+++ b/themes/xe_greystone/conf/info.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<theme>
+	<version>0.1</version>
+	<title xml:lang="ko">XE 그레이스톤 테마</title>
+	<title xml:lang="en">XE Greystone Theme</title>
+	<title xml:lang="zh-CN">XE灰石系主题</title>
+	<date>2011-07-26</date>
+	<publisher email_address="developers@xpressengine.com" link="http://www.xpressengine.com">
+		<name xml:lang="ko">NHN</name>
+		<name xml:lang="en">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+	</publisher>
+	<description xml:lang="ko">그레이스톤 테마는 심플한 레이아웃으로 산뜻한 느낌을 줍니다.</description>
+	<description xml:lang="en">The XE greystone theme utlizes a simple layout, enables the site more concise.</description>
+	<description xml:lang="zh-CN">XE灰石系主题体现了简单大方的特点，使网站更加清晰.</description>
+	<layout>
+			<directory path="./themes/xe_greystone/layouts/xe_greystone" />
+	</layout>
+	<skinInfos>
+		<skinInfo>
+			<directory path="./themes/xe_greystone/modules/message" />
+		</skinInfo>
+	</skinInfos>
+</theme>
diff --git a/themes/xe_greystone/layouts/xe_greystone/conf/info.xml b/themes/xe_greystone/layouts/xe_greystone/conf/info.xml
new file mode 100644
index 000000000..65dc3bffa
--- /dev/null
+++ b/themes/xe_greystone/layouts/xe_greystone/conf/info.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE 그레이 스톤 레이아웃</title>
+    <title xml:lang="jp">XE Greystone Layout</title>
+    <title xml:lang="en">XE Greystone Layout</title>
+    <title xml:lang="ge">XE Greystone Layout</title>
+    <title xml:lang="ru">XE Greystone Layout</title>
+    <title xml:lang="es">XE Greystone Layout</title>
+    <title xml:lang="zh-CN">XE 灰石色系布局</title>
+    <title xml:lang="zh-TW">XE 灰石色系布局</title>
+    <title xml:lang="vi">XE Greystone Layout</title>
+    <description xml:lang="ko">
+        그레이 컬러로 포인트를 주어 어디에나 어울리는 스타일로 디자인.  
+        Author : NHN
+    </description>
+    <description xml:lang="jp">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="en">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="ge">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="ru">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="es">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="zh-CN">
+        布局采用了现在比较流行的灰白色系，页面简洁，布局清晰，符合人们的审美观点。
+        Author : NHN
+    </description>
+    <description xml:lang="zh-TW">
+        布局采用了现在比较流行的灰白色系，页面简洁，布局清晰，符合人们的审美观点。
+        Author : NHN
+    </description>
+	<description xml:lang="vi">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance.  
+        Author : NHN
+    </description>
+    <version>0.1</version>
+    <date>2011-06-20</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+	<name xml:lang="vi">NHN</name>
+    </author>
+
+    <extra_vars>
+		<var name="logo_text" type="text">
+			<title xml:lang="ko">로고 글자</title>
+			<title xml:lang="en">Logo text</title>
+			<title xml:lang="zh-CN">站点标题</title>
+			<title xml:lang="zh-TW">Logo文字</title>
+			<title xml:lang="jp">ロゴ用テキスト</title>
+			<description xml:lang="ko">좌측 상단의 로고 부분에 글자를 지정할 수 있습니다. 로고 이미지가 있으면 로고 이미지의 caption으로 표시됩니다.</description>
+			<description xml:lang="en">You can set the Logo text shown in the top-left part of this layout. If there exists Logo image, this text will be a caption of the image.</description>
+			<description xml:lang="zh-CN">将显示在您的站点左侧头部，如你已上传lOGO图片，此标题将变成LOGO图片的caption。</description>
+			<description xml:lang="zh-TW">將顯示在虛擬網站的左上方，如果有上傳過Logo圖片，將會以圖片顯示。</description>
+			<description xml:lang="jp">左上段のロゴ部分に表示する文章を指定します。ロゴイメージがある場合は、ロゴイメージのキャプションとして表示します。</description>
+		</var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+	    	<title xml:lang="vi">Hình Logo</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージをお勧めします。。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
+	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 23px.)</description>
+        </var>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+	    	<title xml:lang="vi">URL Trang chủ</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
+             </var>
+        <var name="background_image" type="image">
+            <title xml:lang="ko">배경 이미지</title>
+            <title xml:lang="jp">背景イメージ</title>
+            <title xml:lang="zh-CN">背景图片</title>
+            <title xml:lang="zh-TW">背景圖片</title>
+            <title xml:lang="en">Background Image</title>
+            <title xml:lang="ge">Hintergrundbild</title>
+            <title xml:lang="ru">Фоновое изображение</title>
+            <title xml:lang="es">Imagen de fondo</title>
+	    	<title xml:lang="vi">Hình nền</title>
+            <description xml:lang="ko">배경 이미지를 사용하시려면 등록해주세요.</description>
+            <description xml:lang="jp">背景イメージを使う場合は、登録して下さい。</description>
+            <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
+            <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
+            <description xml:lang="en">Please input if you want to use background image.</description>
+            <description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
+            <description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
+            <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
+	    <description xml:lang="vi">Hãy nhập hình nền nếu bạn muốn sử dụng.</description>
+        </var>
+    </extra_vars>
+
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段用メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+	    	<title xml:lang="vi">Menu trên</title>
+        </menu>
+		<menu name="bottom_menu" maxdepth="1">
+            <title xml:lang="ko">하단 메뉴 </title>
+            <title xml:lang="jp">下段用メニュー</title>
+            <title xml:lang="zh-CN">底部菜单</title>
+            <title xml:lang="zh-TW">底部選單</title>
+            <title xml:lang="en">Bottom menu</title>
+            <title xml:lang="ge">Bottom-Menü</title>
+            <title xml:lang="ru">Внизу меню</title>
+            <title xml:lang="es">Menú Inferior </title>
+	    	<title xml:lang="vi">Menu dưới</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/themes/xe_greystone/layouts/xe_greystone/css/default.css b/themes/xe_greystone/layouts/xe_greystone/css/default.css
new file mode 100644
index 000000000..9919fb227
--- /dev/null
+++ b/themes/xe_greystone/layouts/xe_greystone/css/default.css
@@ -0,0 +1,101 @@
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+body { margin:0;padding:0; font-size:.75em;}
+.iePngFix {behavior:url(../js/iePngFix.htc)}
+/* Default Skin - Start */
+#selectLang{margin:0;padding:0}
+#gnb{margin:0;padding:0}
+#lnb{margin:0;padding:0}
+#lnb ul{margin:0;padding:0}
+.lnb_global li.active a{font-weight:bold;color:#fff;}
+/* Site Layout - Body Wrap */
+body{background:#fff url(../images/default/bg_body.gif) repeat-x 0 0;font-family:Arial}
+#bodyWrap{position:relative;width:947px;margin:0 auto}
+/* Site Layout - Header */
+#header{position:relative;width:947px;height:120px;margin-bottom:10px; z-index:100}
+#header h1{position:absolute;top:17px;left:0;margin:0;padding:0; font-size:20px; color:#302f2f}
+#header h1 img{vertical-align:middle}
+#language{position:absolute;top:18px;right:0;z-index:200;margin:0;font-family:Arial, Helvetica, sans-serif}
+#language dt{float:left;margin:2px 8px 0 0;color:#3f4140}
+#language dd{float:left;position:relative;width:79px;height:16px;margin:0;border:1px solid #939393;background:#a7a7a7;line-height:16px}
+#language dd a{display:block;padding:0 0 0 6px;background:url(../images/default/ico_arw.gif) no-repeat 98% 50%;color:#fff;font-size:12px;text-decoration:none}
+#language ul{display:none;position:absolute;top:15px;left:-1px;width:79px;border:1px solid #939393;border-bottom:0;background:#cfcfcf}
+#language ul li{border-bottom:1px solid #939393;list-style:none;}
+#language ul li a{display:block;background:none;color:#fff;font:11px Tahoma;text-align:left;text-decoration:none; padding:2px 0 2px 6px}
+#language ul li a:hover{ background:#a7a7a7}
+.btn_login{position:absolute;top:16px;right:159px}
+#it_search_form{position:absolute;top:50px;right:15px}
+#it_search_form .input{width:120px;height:17px;border:1px solid #bc4032;color:#888;font-size:.9em}
+#it_search_form .submit_button{visibility:hidden;width:1px;height:1px}
+.gnb{position:absolute;top:85px;left:0;height:37px;height:37px;margin:0;padding:0;white-space:nowrap;}
+.gnb ul{margin:0;padding:0}
+.gnb ul li{float:left;position:relative;height:37px;padding-right:2px;padding-right:2px;background:url(../images/default/bgGnbVr.gif) no-repeat 100% 50%;line-height:37px;list-style:none}
+.gnb ul li.on a,
+.gnb ul li a:hover{background:url(../images/default/bg_gnb.gif) repeat-x 0 0;color:#fff;font-weight:bold}
+.gnb ul li a{display:block;padding:0 33px;color:#3f4140;font-size:14px;font-weight:bold;text-decoration:none}
+.gnb ul li .sub{position:absolute;top:36px;left:0;z-index:300;margin:0;padding:0;border:1px solid #adb1c6;background:#fff; z-index:500;display:none}
+.gnb ul li .sub li{clear:both;height:33px;margin:0;padding:0;background:none;line-height:33px;text-align:center;*zoom:1}
+.gnb ul li .sub li a{background:none;color:#9fa09f;}
+.gnb ul li .sub li a:hover,
+.gnb ul li .sub li a.subon{background:url(../images/default/bg_gnb2.gif) repeat-x; color:#fff!important;text-decoration:none}
+.gnb li.last{ background:none}
+
+#isSearch{padding:19px 0 15px 21px;border:1px solid #fff;background:#f3f4f4;border-radius:5px 5px 0 0}
+#isSearch .searchOrder{display:none}
+#isSearch .checked{display:block;position:absolute;top:0;left:0;width:64px;height:14px;padding:5px 0 0 5px;background:url(../images/default/bgSearchTerm.gif) no-repeat;color:#fff;font:11px '돋움', Dotum, '굴림', Gulim, AppleGothic, Sans-serif;line-height:normal;text-align:left}
+*:first-child+html #isSearch .checked{top:1px}
+#isSearch ul{display:none;position:absolute;top:18px;left:0;padding:2px 0 3px;border:1px solid #919898;background:#536c6d;text-align:left}
+#isSearch ul li{width:67px;height:18px;list-style:none}
+#isSearch ul li input{display:none}
+#isSearch ul li label{display:block;width:63px;height:15px;padding:4px 0 0 4px;color:#fff;font:11px '돋움', Dotum, '굴림', Gulim, AppleGothic, Sans-serif}
+#isSearch ul li label.on{background:#455a5b}
+#isSearch ul li label:hover,
+#isSearch ul li label:focus{background:#455a5b}
+#isSearch .inputText{width:130px;height:23px;padding:0 10px 0 20px;border:1px solid #c9c7c7;background:#fff url(../images/default/ico_search.gif) no-repeat 6px 50%;line-height:23px;zoom:1;border-radius:4px}
+#isSearch .searchOrder{display:none}
+#isSearch .inputText:hover,
+#isSearch .inputText:focus{}
+*:first-child+html body#default #isSearch .inputText{position:relative;top:-1px}
+#isSearch .submit{_position:relative;_top:-1px;vertical-align:middle}
+*:first-child+html body#default #isSearch .submit{position:relative;top:-1px}
+/* Site Layout - Content Body */
+#contentBody{position:relative;width:947px;padding-bottom:30px;*zoom:1}
+#contentBody:after{display:block;clear:both;content:''}
+/* Site Layout - Column Left */
+#columnLeft{float:right;position:relative;top:-80px;z-index:100;width:213px}
+#columnLeft .mask{display:block;clear:both;width:201px;height:5px;background:#fff}
+/* Site Layout - Column Right */
+#columnRight{float:left;width:718px; overflow:hidden}
+#columnRight:after{display:block;clear:both;content:''}
+#visualArea{position:relative;left:-15px;width:770px;height:200px;margin-right:-15px;margin-bottom:2.5em;background:#f5f5f5}
+#content{overflow:hidden;width:100%}
+#columnLeft .info{overflow:hidden;margin-bottom:10px;width:211px;padding:0;border:1px solid #c9c9c9;background:#fff;zoom:1;border-radius:5px}
+#columnLeft .info .search{margin:0;padding:0;width:211px;height:61px;overflow:hidden;}
+#columnLeft .lnb_global{background:none}
+#columnLeft .lnb_global h2{margin:0;height:28px;background:url(../images/default/bg_lnb.gif) no-repeat}
+#columnLeft .lnb_global h2 a{margin:0;padding-left:22px;color:#fff;font-size:14px;line-height:28px;text-decoration:none}
+#columnLeft .lnb_global .list{margin:0;padding:0 0 14px;border:1px solid #d4d4d4}
+#columnLeft .lnb_global .list li{margin:0;padding:0;line-height:22px;list-style:none}
+#columnLeft .lnb_global .list li ul{ margin:0; padding:0}
+#columnLeft .lnb_global .list li ul li{ padding:0 0 0 15px;}
+#columnLeft .lnb_global .list li a{display:block;padding-left:22px;color:#3a3a3a;text-decoration:none;*zoom:1;border-bottom:1px solid #fff;border-top:1px solid #fff;}
+#columnLeft .lnb_global .list li a:hover,
+#columnLeft .lnb_global .list li.on{border-bottom:1px solid #d4d4d4;border-top:1px solid #d4d4d4;background:#eaeaea url(../images/default/ico_are.gif) no-repeat 98% 50%;}
+
+/* sitemap */
+.sitemap{margin:0 0 28px 0; overflow:hidden; clear:both}
+.sitemap ul{padding:0; margin:0}
+.sitemap li{ list-style:none;padding:0 28px 0 0; width:190px; display:inline-block;*display:inline;*zoom:1; vertical-align:top; overflow:hidden;  margin:0 28px 20px 0 ; border-right:1px solid #d2d2d2; white-space:nowrap}
+.sitemap li.last{ border-right:0; margin:0; padding:0}
+.sitemap .list{ margin:0; padding:0}
+.sitemap .list dt{ font-weight:bold; font-size:14px; margin:0 0 19px; 0}
+.sitemap .list dt a{ color:#3a3a3a; text-decoration:none}
+.sitemap .list dd{ margin:0; padding:0; background:url(../images/default/bu_v1.gif) no-repeat 0 50%; padding-left:10px; line-height:20px;}
+.sitemap .list dd a{ color:#3a3a3a; text-decoration:none}
+
+/* Site Layout - Footer */
+#footer{clear:both;margin:0;padding:11px 0 46px;border-top:1px solid #dbdbdb;text-align:left}
+#footer li.first-child{background:none}
+#footer li a{color:#999;font:.9em '돋움', Dotum, '굴림', Gulim, AppleGothic, Sans-serif}
+#footer address{color:#9fa09f;font-style:normal}
+#footer address strong{margin-left:4px}
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/Thumbs.db b/themes/xe_greystone/layouts/xe_greystone/images/Thumbs.db
new file mode 100644
index 000000000..16cf0e57b
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/Thumbs.db differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/Thumbs.db b/themes/xe_greystone/layouts/xe_greystone/images/black/Thumbs.db
new file mode 100644
index 000000000..0e9de2862
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/Thumbs.db differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgBody.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgBody.gif
new file mode 100644
index 000000000..caedbbf85
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgBody.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgContentBody.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgContentBody.gif
new file mode 100644
index 000000000..d60d2593d
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgContentBody.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgGnbOn.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgGnbOn.gif
new file mode 100644
index 000000000..265b43dd7
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgGnbOn.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgGnbVr.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgGnbVr.gif
new file mode 100644
index 000000000..a4225744b
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgGnbVr.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgHeader.jpg b/themes/xe_greystone/layouts/xe_greystone/images/black/bgHeader.jpg
new file mode 100644
index 000000000..911fb24ba
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgHeader.jpg differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgLnbOff.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgLnbOff.gif
new file mode 100644
index 000000000..46414ff68
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgLnbOff.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearch.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearch.gif
new file mode 100644
index 000000000..693382a03
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearch.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearchOn.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearchOn.gif
new file mode 100644
index 000000000..67dce8d9a
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearchOn.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearchTerm.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearchTerm.gif
new file mode 100644
index 000000000..7811700f0
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bgSearchTerm.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bulletD0.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bulletD0.gif
new file mode 100644
index 000000000..e8e17d4c6
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bulletD0.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bulletFF1A00.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bulletFF1A00.gif
new file mode 100644
index 000000000..4026f2521
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bulletFF1A00.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/bulletLnb.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/bulletLnb.gif
new file mode 100644
index 000000000..6674d3765
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/bulletLnb.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/buttonLang.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/buttonLang.gif
new file mode 100644
index 000000000..317e15833
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/buttonLang.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/buttonSearch.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/buttonSearch.gif
new file mode 100644
index 000000000..38abbd359
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/buttonSearch.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/lineNotice.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/lineNotice.gif
new file mode 100644
index 000000000..fa69fd4ba
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/lineNotice.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/black/vrType1.gif b/themes/xe_greystone/layouts/xe_greystone/images/black/vrType1.gif
new file mode 100644
index 000000000..65772afee
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/black/vrType1.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/blank.gif b/themes/xe_greystone/layouts/xe_greystone/images/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/blank.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bgContentBody.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bgContentBody.gif
new file mode 100644
index 000000000..b2cc35fc0
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bgContentBody.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bgGnbVr.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bgGnbVr.gif
new file mode 100644
index 000000000..dabddcca6
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bgGnbVr.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bgLnbOff.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bgLnbOff.gif
new file mode 100644
index 000000000..64e2f9f57
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bgLnbOff.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bg_body.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_body.gif
new file mode 100644
index 000000000..a06834971
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_body.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bg_gnb.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_gnb.gif
new file mode 100644
index 000000000..9a023bcef
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_gnb.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bg_gnb2.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_gnb2.gif
new file mode 100644
index 000000000..1e8e34db3
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_gnb2.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bg_lnb.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_lnb.gif
new file mode 100644
index 000000000..783dec72c
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bg_lnb.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/bu_v1.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/bu_v1.gif
new file mode 100644
index 000000000..6a54d9d4e
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/bu_v1.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/buttonLogin.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/buttonLogin.gif
new file mode 100644
index 000000000..9942ce259
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/buttonLogin.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/ico_are.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/ico_are.gif
new file mode 100644
index 000000000..6fffc6b43
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/ico_are.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/ico_arw.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/ico_arw.gif
new file mode 100644
index 000000000..42e722de6
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/ico_arw.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/default/ico_search.gif b/themes/xe_greystone/layouts/xe_greystone/images/default/ico_search.gif
new file mode 100644
index 000000000..9a42bae7d
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/default/ico_search.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/powerdByXE.gif b/themes/xe_greystone/layouts/xe_greystone/images/powerdByXE.gif
new file mode 100644
index 000000000..5ff3ef414
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/powerdByXE.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/Thumbs.db b/themes/xe_greystone/layouts/xe_greystone/images/white/Thumbs.db
new file mode 100644
index 000000000..f515aee8b
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/Thumbs.db differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgContentBody.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgContentBody.gif
new file mode 100644
index 000000000..b2cc35fc0
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgContentBody.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgGnbOn.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgGnbOn.gif
new file mode 100644
index 000000000..265b43dd7
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgGnbOn.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgGnbVr.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgGnbVr.gif
new file mode 100644
index 000000000..c7408fd43
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgGnbVr.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgHeader.png b/themes/xe_greystone/layouts/xe_greystone/images/white/bgHeader.png
new file mode 100644
index 000000000..54c6e49fc
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgHeader.png differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgLnbOff.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgLnbOff.gif
new file mode 100644
index 000000000..64e2f9f57
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgLnbOff.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearch.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearch.gif
new file mode 100644
index 000000000..865872df3
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearch.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearchOn.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearchOn.gif
new file mode 100644
index 000000000..612f9613e
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearchOn.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearchTerm.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearchTerm.gif
new file mode 100644
index 000000000..cc5dafe14
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bgSearchTerm.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bulletD0.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bulletD0.gif
new file mode 100644
index 000000000..e8e17d4c6
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bulletD0.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bulletFF1A00.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bulletFF1A00.gif
new file mode 100644
index 000000000..4026f2521
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bulletFF1A00.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/bulletLnb.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/bulletLnb.gif
new file mode 100644
index 000000000..6674d3765
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/bulletLnb.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/buttonLang.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/buttonLang.gif
new file mode 100644
index 000000000..e598c8a0c
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/buttonLang.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/buttonSearch.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/buttonSearch.gif
new file mode 100644
index 000000000..095b983e4
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/buttonSearch.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/lineNotice.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/lineNotice.gif
new file mode 100644
index 000000000..f3dfab9a0
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/lineNotice.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/images/white/vrType1.gif b/themes/xe_greystone/layouts/xe_greystone/images/white/vrType1.gif
new file mode 100644
index 000000000..e3766aa3b
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/images/white/vrType1.gif differ
diff --git a/themes/xe_greystone/layouts/xe_greystone/info.xml b/themes/xe_greystone/layouts/xe_greystone/info.xml
new file mode 100644
index 000000000..65dc3bffa
--- /dev/null
+++ b/themes/xe_greystone/layouts/xe_greystone/info.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE 그레이 스톤 레이아웃</title>
+    <title xml:lang="jp">XE Greystone Layout</title>
+    <title xml:lang="en">XE Greystone Layout</title>
+    <title xml:lang="ge">XE Greystone Layout</title>
+    <title xml:lang="ru">XE Greystone Layout</title>
+    <title xml:lang="es">XE Greystone Layout</title>
+    <title xml:lang="zh-CN">XE 灰石色系布局</title>
+    <title xml:lang="zh-TW">XE 灰石色系布局</title>
+    <title xml:lang="vi">XE Greystone Layout</title>
+    <description xml:lang="ko">
+        그레이 컬러로 포인트를 주어 어디에나 어울리는 스타일로 디자인.  
+        Author : NHN
+    </description>
+    <description xml:lang="jp">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="en">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="ge">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="ru">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="es">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance. 
+        Author : NHN
+    </description>
+    <description xml:lang="zh-CN">
+        布局采用了现在比较流行的灰白色系，页面简洁，布局清晰，符合人们的审美观点。
+        Author : NHN
+    </description>
+    <description xml:lang="zh-TW">
+        布局采用了现在比较流行的灰白色系，页面简洁，布局清晰，符合人们的审美观点。
+        Author : NHN
+    </description>
+	<description xml:lang="vi">
+        This layout utilzes a pretty grey-white style, with the concise layout and appearance.  
+        Author : NHN
+    </description>
+    <version>0.1</version>
+    <date>2011-06-20</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+	<name xml:lang="vi">NHN</name>
+    </author>
+
+    <extra_vars>
+		<var name="logo_text" type="text">
+			<title xml:lang="ko">로고 글자</title>
+			<title xml:lang="en">Logo text</title>
+			<title xml:lang="zh-CN">站点标题</title>
+			<title xml:lang="zh-TW">Logo文字</title>
+			<title xml:lang="jp">ロゴ用テキスト</title>
+			<description xml:lang="ko">좌측 상단의 로고 부분에 글자를 지정할 수 있습니다. 로고 이미지가 있으면 로고 이미지의 caption으로 표시됩니다.</description>
+			<description xml:lang="en">You can set the Logo text shown in the top-left part of this layout. If there exists Logo image, this text will be a caption of the image.</description>
+			<description xml:lang="zh-CN">将显示在您的站点左侧头部，如你已上传lOGO图片，此标题将变成LOGO图片的caption。</description>
+			<description xml:lang="zh-TW">將顯示在虛擬網站的左上方，如果有上傳過Logo圖片，將會以圖片顯示。</description>
+			<description xml:lang="jp">左上段のロゴ部分に表示する文章を指定します。ロゴイメージがある場合は、ロゴイメージのキャプションとして表示します。</description>
+		</var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+	    	<title xml:lang="vi">Hình Logo</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージをお勧めします。。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
+	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 23px.)</description>
+        </var>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+	    	<title xml:lang="vi">URL Trang chủ</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
+             </var>
+        <var name="background_image" type="image">
+            <title xml:lang="ko">배경 이미지</title>
+            <title xml:lang="jp">背景イメージ</title>
+            <title xml:lang="zh-CN">背景图片</title>
+            <title xml:lang="zh-TW">背景圖片</title>
+            <title xml:lang="en">Background Image</title>
+            <title xml:lang="ge">Hintergrundbild</title>
+            <title xml:lang="ru">Фоновое изображение</title>
+            <title xml:lang="es">Imagen de fondo</title>
+	    	<title xml:lang="vi">Hình nền</title>
+            <description xml:lang="ko">배경 이미지를 사용하시려면 등록해주세요.</description>
+            <description xml:lang="jp">背景イメージを使う場合は、登録して下さい。</description>
+            <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
+            <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
+            <description xml:lang="en">Please input if you want to use background image.</description>
+            <description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
+            <description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
+            <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
+	    <description xml:lang="vi">Hãy nhập hình nền nếu bạn muốn sử dụng.</description>
+        </var>
+    </extra_vars>
+
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段用メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+	    	<title xml:lang="vi">Menu trên</title>
+        </menu>
+		<menu name="bottom_menu" maxdepth="1">
+            <title xml:lang="ko">하단 메뉴 </title>
+            <title xml:lang="jp">下段用メニュー</title>
+            <title xml:lang="zh-CN">底部菜单</title>
+            <title xml:lang="zh-TW">底部選單</title>
+            <title xml:lang="en">Bottom menu</title>
+            <title xml:lang="ge">Bottom-Menü</title>
+            <title xml:lang="ru">Внизу меню</title>
+            <title xml:lang="es">Menú Inferior </title>
+	    	<title xml:lang="vi">Menu dưới</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/themes/xe_greystone/layouts/xe_greystone/js/blank.gif b/themes/xe_greystone/layouts/xe_greystone/js/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/js/blank.gif differ
diff --git a/common/js/iePngFix.htc b/themes/xe_greystone/layouts/xe_greystone/js/iePngFix.htc
similarity index 94%
rename from common/js/iePngFix.htc
rename to themes/xe_greystone/layouts/xe_greystone/js/iePngFix.htc
index ebf0d949d..1129d3898 100644
--- a/common/js/iePngFix.htc
+++ b/themes/xe_greystone/layouts/xe_greystone/js/iePngFix.htc
@@ -13,7 +13,7 @@ IEPNGFix.data = IEPNGFix.data || {};
 
 // This must be a path to a blank image, relative to the HTML document(s).
 // In production use I suggest '/images/blank.gif' or similar. That's all!
-IEPNGFix.blankImg = request_uri+'common/tpl/images/blank.gif';
+IEPNGFix.blankImg = 'layouts/xe_greystone/js/blank.gif';
 
 
 IEPNGFix.fix = function(elm, src, t) {
diff --git a/themes/xe_greystone/layouts/xe_greystone/js/xe_global.js b/themes/xe_greystone/layouts/xe_greystone/js/xe_global.js
new file mode 100644
index 000000000..7d1f7750c
--- /dev/null
+++ b/themes/xe_greystone/layouts/xe_greystone/js/xe_global.js
@@ -0,0 +1,67 @@
+jQuery(function($){
+    // Global Navigation Bar
+    var gMenu = $('#header>div.gnb');
+    var gItem = gMenu.find('>ul>li');
+    var ggItem = gMenu.find('>ul>li>ul>li');
+    var lastEvent = null;
+    gItem.find('>ul').hide();
+
+	if(gItem.last().attr('class')!="on m1")
+		gItem.last().attr('class','last');
+
+	gItem.filter(':first').addClass('first');
+	ggItem.mouseover(function(){
+		old_class = $(this).parent('ul').parent('li').attr('class');
+		$(this).parent('ul').parent('li').attr('class','on m1');
+		$(this).mouseleave(function(){
+			if(old_class !="on m1" && old_class !="on m1 first")
+				$(this).parent('ul').parent('li').attr('class','');
+		});
+	});
+
+
+    function gMenuToggle(){
+        var t = $(this);
+        if (t.next('ul').is(':hidden') || t.next('ul').length == 0) {
+            gItem.find('>ul').hide();
+            gItem.find('a').removeClass('hover');
+            t.next('ul').show();
+            t.addClass('hover');            
+        };
+
+		var max = 0;
+		t.next('ul').find('li').each(function(){
+			a_width = $(this).find('a').width();
+			$(this).find('a').height('33px');
+		});
+
+		
+
+
+		if(t.next('ul').width()){
+			if(t.next('ul').width()< t.parent().width()){
+				t.next('ul').width(t.parent().width());
+				t.next('ul').find('li').width(t.parent().width());
+				t.next('ul').find('li').css('text-align','left');
+			}else{
+				t.next('ul').find('li').width(t.next('ul').width());
+				t.next('ul').find('li').css('text-align','left');
+			}
+		}
+		return false;
+    };
+    function gMenuOut(){
+        gItem.find('ul').hide();
+        gItem.find('a').removeClass('hover');
+    };
+    gItem.find('>a').mouseover(gMenuToggle).focus(gMenuToggle);
+    gItem.mouseleave(gMenuOut);
+
+	var maxHeight = 0;
+	$('div.sitemap>ul>li').each(function(i){
+		if($(this).height() > maxHeight)
+			maxHeight = $(this).height();
+	});
+	$('div.sitemap>ul>li').height(maxHeight);
+
+});
\ No newline at end of file
diff --git a/themes/xe_greystone/layouts/xe_greystone/js/xe_official.js b/themes/xe_greystone/layouts/xe_greystone/js/xe_official.js
new file mode 100644
index 000000000..bf49ce705
--- /dev/null
+++ b/themes/xe_greystone/layouts/xe_greystone/js/xe_official.js
@@ -0,0 +1,36 @@
+// Hide And Show Toggle
+var cc=0
+function hideShow(id) {
+    if (cc==0) {
+        cc=1
+        document.getElementById(id).style.display="none";
+    } else {
+        cc=0
+        document.getElementById(id).style.display="block";
+    }
+}
+
+// Show And Hide Toggle
+var cc=0
+function showHide(id) {
+    if (cc==0) {
+        cc=1
+        document.getElementById(id).style.display="block";
+    } else {
+        cc=0
+        document.getElementById(id).style.display="none";
+    }
+}
+
+// Local Navigation Toggle
+function lnbToggle(id) {
+	for(num=1; num<=3; num++) document.getElementById('D3MG'+num).style.display='none'; //D4MG1~D4MG3 까지 숨긴 다음
+	document.getElementById(id).style.display='block'; //해당 ID만 보임
+}
+
+// IS
+function chkIsKind(key, value) {
+    showHide('selectOrder');
+    xGetElementById('search_target'+key).checked = true;
+    xInnerHtml('search_target_label', value);
+}
diff --git a/themes/xe_greystone/layouts/xe_greystone/layout.html b/themes/xe_greystone/layouts/xe_greystone/layout.html
new file mode 100644
index 000000000..7cd2bbb82
--- /dev/null
+++ b/themes/xe_greystone/layouts/xe_greystone/layout.html
@@ -0,0 +1,104 @@
+<!--// js 파일 import -->
+<!--%import("js/xe_global.js")-->
+<!--%import("js/xe_official.js")-->
+
+<!--// 레이아웃과 연동될 css 파일 import -->
+<!--%import("css/default.css")-->
+
+
+<!--@if($layout_info->background_image)-->
+<style type="text/css">
+    body {  background:#FFFFFF url({getUrl()}{$layout_info->background_image}) repeat-x left top; }
+</style>
+<!--@end-->
+
+<!--@if(!$layout_info->colorset)-->
+    {@$layout_info->colorset = "default"}
+<!--@end-->
+<div id="bodyWrap">
+        <dl id="language">
+		<dt>Language</dt>
+		<dd><a href="#selectLang" onclick="showHide('selectLang');return false;">{$lang_supported[$lang_type]}</a>
+            <ul id="selectLang">
+			<!--@foreach($lang_supported as $key => $val)--><!--@if($key!= $lang_type)-->
+			<li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
+			<!--@end--><!--@end-->
+            </ul>
+		</dd>
+        </dl>
+    <div id="header">
+        <h1><!--@if($layout_info->logo_image)--><a href="{$layout_info->index_url}"><img src="{$layout_info->logo_image}" alt="{$layout_info->logo_text}"|cond="$layout_info->logo_text" alt="logo"|cond="!$layout_info->logo_text" border="0" class="iePngFix" /></a><!--@else-->{$layout_info->logo_text}<!--@end--></h1>
+
+        <!-- GNB -->
+        <div class="gnb">
+		<ul>
+		<li loop="$main_menu->list=>$key1,$val1" class="on m1"|cond="$val1['selected']"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a>
+			<ul class="sub" cond="$val1['list']">
+				<li loop="$val1['list']=>$key2,$val2"><a href="{$val2['href']}" class="subon"|cond="$val2['selected']" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a></li>
+			</ul>
+		</li>
+        </ul>
+		</div>
+    </div>
+    <div id="contentBody">
+        <div id="columnLeft">
+			<div class="info">
+			<div class="search">
+		    <form action="{getUrl()}" method="post" id="isSearch">
+            <!--@if($vid)-->
+            <input type="hidden" name="vid" value="{$vid}" />
+            <!--@end-->
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="act" value="IS" />
+            <input type="hidden" name="search_target" value="title_content" />
+            <input name="is_keyword" type="text" class="inputText" title="keyword" />
+            </form>
+			</div>
+
+            <img src="./images/blank.gif" class="zbxe_widget_output" widget="login_info" skin="xe_global" colorset="{$layout_info->colorset}" />
+			</div>
+			<div class="lnb_global">
+				<h2 loop="$main_menu->list=>$key1,$val1" cond="$val1['selected']"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a></h2>
+				<ul class="list" loop="$main_menu->list=>$key1,$val1" cond="$val1['selected'] && $val1['list']">
+					<li loop="$val1['list']=>$key2,$val2" class="active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a>
+						<ul cond="$val2['list']">
+							<li loop="$val2['list']=>$key3,$val3" class="active"|cond="$val3['selected']"><a href="{$val3['href']}" target="_blank"|cond="$val3['open_window']=='Y'">{$val3['link']}</a></li>
+						</ul>
+					</li>
+				</ul>
+			</div>
+
+        </div>
+        <div id="columnRight">
+            <!-- 컨텐츠 시작 -->
+            {$content}
+        </div>
+    </div>
+
+	{@ $index = 1;}
+	<div class="sitemap">
+		<ul>
+		<!--@foreach($bottom_menu->list as $key => $val)-->
+        <!--@if($val['link'])-->
+			<li <!--@if($index%4 == 0)-->class="last"<!--@end-->>
+			<dl class="list">
+			<dt><a href="{$val['href']}"<!--@if($val['open_window']=='Y')--> onclick="window.open(this.href);return false;"<!--@end-->>{$val['text']}</a></dt>
+			<!--@if($val['list'])-->
+				 <!--@foreach($val['list'] as $k => $v)-->
+                        <!--@if($val['link'])-->
+						<dd><a href="{$v['href']}"<!--@if($v['open_window']=='Y')--> onclick="window.open(this.href);return false;"<!--@end-->>{$v['text']}</a></dd>
+						<!--@end-->
+                 <!--@end-->
+			<!--@end-->
+			</dl>
+			</li>
+		{@ $index++;}
+		<!--@end-->
+		<!--@end-->
+		</ul>
+	</div>
+	
+    <div id="footer">
+            <address>Powered&nbsp;by<strong>XE</strong></address>
+    </div>
+</div>
diff --git a/themes/xe_greystone/layouts/xe_greystone/thumbnail.png b/themes/xe_greystone/layouts/xe_greystone/thumbnail.png
new file mode 100644
index 000000000..e2e78006f
Binary files /dev/null and b/themes/xe_greystone/layouts/xe_greystone/thumbnail.png differ
diff --git a/themes/xe_greystone/modules/message/filter/login.xml b/themes/xe_greystone/modules/message/filter/login.xml
new file mode 100644
index 000000000..c0c7e870c
--- /dev/null
+++ b/themes/xe_greystone/modules/message/filter/login.xml
@@ -0,0 +1,8 @@
+<filter name="message_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id" />
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response />
+</filter>
diff --git a/themes/xe_greystone/modules/message/filter/logout.xml b/themes/xe_greystone/modules/message/filter/logout.xml
new file mode 100644
index 000000000..8005776d3
--- /dev/null
+++ b/themes/xe_greystone/modules/message/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="widget_logout" module="member" act="procMemberLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/themes/xe_greystone/modules/message/filter/openid_login.xml b/themes/xe_greystone/modules/message/filter/openid_login.xml
new file mode 100644
index 000000000..a924c15d8
--- /dev/null
+++ b/themes/xe_greystone/modules/message/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeMessageOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_greystone/modules/message/images/Thumbs.db b/themes/xe_greystone/modules/message/images/Thumbs.db
new file mode 100644
index 000000000..064b4960a
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/Thumbs.db differ
diff --git a/themes/xe_greystone/modules/message/images/bg_box_c.gif b/themes/xe_greystone/modules/message/images/bg_box_c.gif
new file mode 100644
index 000000000..56816636d
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/bg_box_c.gif differ
diff --git a/themes/xe_greystone/modules/message/images/bg_box_f.gif b/themes/xe_greystone/modules/message/images/bg_box_f.gif
new file mode 100644
index 000000000..b32135e0f
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/bg_box_f.gif differ
diff --git a/themes/xe_greystone/modules/message/images/bg_box_top.gif b/themes/xe_greystone/modules/message/images/bg_box_top.gif
new file mode 100644
index 000000000..36c5ee3d0
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/bg_box_top.gif differ
diff --git a/themes/xe_greystone/modules/message/images/bg_gLogin.gif b/themes/xe_greystone/modules/message/images/bg_gLogin.gif
new file mode 100644
index 000000000..fc90e9f35
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/bg_gLogin.gif differ
diff --git a/themes/xe_greystone/modules/message/images/bg_logOut.gif b/themes/xe_greystone/modules/message/images/bg_logOut.gif
new file mode 100644
index 000000000..8d2cbd017
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/bg_logOut.gif differ
diff --git a/themes/xe_greystone/modules/message/images/buttonAction.gif b/themes/xe_greystone/modules/message/images/buttonAction.gif
new file mode 100644
index 000000000..9a7d0db2d
Binary files /dev/null and b/themes/xe_greystone/modules/message/images/buttonAction.gif differ
diff --git a/modules/member/skins/default/img/openid_login_bg.gif b/themes/xe_greystone/modules/message/images/openid_login_bg.gif
similarity index 100%
rename from modules/member/skins/default/img/openid_login_bg.gif
rename to themes/xe_greystone/modules/message/images/openid_login_bg.gif
diff --git a/themes/xe_greystone/modules/message/message.css b/themes/xe_greystone/modules/message/message.css
new file mode 100644
index 000000000..20a86842d
--- /dev/null
+++ b/themes/xe_greystone/modules/message/message.css
@@ -0,0 +1,40 @@
+@charset "utf-8";
+/* NHN | dece24@nhncorp.com */
+#loginAccess{ position:relative; width:333px; margin:30px auto;  font-size:12px; font-family:Tahoma; line-height:normal; background:url(./images/bg_gLogin.gif) no-repeat 0 0}
+#loginAccess form{ margin:0; padding:0;}
+#loginAccess fieldset{ border:0; margin:0; padding:0;}
+#loginAccess h1{font-size:12px; color:#3f4140; margin:0; font-weight:normal; padding:27px 0 18px 18px}
+#loginAccess ul{ margin:0; padding:0; list-style:none;}
+#loginAccess .mLogin{ display:none;}
+#loginAccess .idpw{ margin:0 41px 15px 36px;}
+#loginAccess .oid{ margin:0 28px 20px 28px;}
+#loginAccess .idpw li{ margin:0 0 5px 0;}
+#loginAccess .inputText{ font-size:12px; color:#c4c4c4; font-weight:bold; border:1px solid #c5c5c5}
+#loginAccess .idpw .inputText{ width:243px; padding:2px 0 2px 7px;}
+#loginAccess .oid .inputText{ width:252px; padding:8px 0 0 35px;}
+#loginAccess .inputCheck{ width:13px; height:13px; margin:0; padding:0; vertical-align:middle;}
+#loginAccess label{ vertical-align: middle; color:#3a3a3a}
+#loginAccess #warning{ display:none; margin:0 0 20px 0;}
+#loginAccess #warning.open{ display:block;}
+#loginAccess #warning p{ margin:0; color:#fafafa}
+#loginAccess .buttonArea{ position:relative; margin:0 50px 0 39px; padding:0; color:#767676; *zoom:1;}
+#loginAccess .buttonArea .keeping{ position:relative; margin:0 0 20px 0; height:32px; line-height:32px;}
+#loginAccess #gLogin .buttonArea .buttonAccount{ position:absolute; top:0; right:0;}
+#loginAccess #oLogin .buttonArea{ text-align:center; margin-bottom:20px;}
+#loginAccess .buttonAccount,
+#loginAccess .buttonAccount a,
+#loginAccess .buttonAccount input{ position:relative; display:inline-block; margin:0; padding:0; overflow:visible; height:32px; line-height:32px; font-size:12px; font-weight:bold; color:#ffffff; vertical-align:middle; cursor:pointer; border:0; text-decoration:none !important; background: url(./images/buttonAction.gif) no-repeat;font-family:Arial}
+#loginAccess .buttonAccount{ margin:0 4px 0 0; background-position:left top;}
+#loginAccess .buttonAccount a,
+#loginAccess .buttonAccount input{ left:14px; background-position:right top; *vertical-align:top; padding:0 30px 0 15px;}
+#loginAccess .help{ position:relative; padding:22px 0 44px 0;text-align:center; background:url(images/bg_help.gif) no-repeat}
+#loginAccess .help li{ display:inline; border-left:1px solid #ababab; padding:0 0 0 7px; margin:0 4px 0 0; line-height:1;}
+#loginAccess .help li.first{ border:0; padding:0;}
+#loginAccess .help a{ text-decoration:none; color:#828282;}
+#loginAccess .help a:hover,
+#loginAccess .help a:active,
+#loginAccess .help a:focus{ text-decoration:underline;}
+#loginAccess .logOut{ text-align:left;padding:0 0 20px 55px; background:url(images/line_logOut.gif) no-repeat 0 100%;}
+.gLogin #gLogin,
+.oLogin #oLogin{ display:block;}
+.logOut_h{padding:27px 0 23px 63px!important}
\ No newline at end of file
diff --git a/themes/xe_greystone/modules/message/message.js b/themes/xe_greystone/modules/message/message.js
new file mode 100644
index 000000000..8523b8ec3
--- /dev/null
+++ b/themes/xe_greystone/modules/message/message.js
@@ -0,0 +1,38 @@
+/* 로그인 후 */
+function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeMessageOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+function doLogin(o,filter){
+	jQuery('input.inputText',o).each(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
+	});
+	procFilter(o,filter);
+	initLoginTitleMsg();
+	return false;
+}
+
+
+function initLoginTitleMsg(){
+	jQuery('.gLogin, .mLogin').find('input.inputText').focus(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
+	}).blur(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.val()=='') t.val(t.attr('title'));
+	}).focus().blur();
+}
+
+jQuery(function(){
+	initLoginTitleMsg();
+});
+
+
diff --git a/themes/xe_greystone/modules/message/skin.xml b/themes/xe_greystone/modules/message/skin.xml
new file mode 100644
index 000000000..a5477f57f
--- /dev/null
+++ b/themes/xe_greystone/modules/message/skin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 그레이스톤 메세지(Message)모듈 스킨</title>
+    <title xml:lang="en">XE Greystone Message Skin</title>
+    <title xml:lang="zh-CN">XE灰石系信息皮肤</title>
+
+    <description xml:lang="ko">
+        그레이스톤 테마에 어울리는 메세지 모듈 스킨.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+        The XE greystone skin for message module. 
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+        XE 灰石系信息模块皮肤。
+        NHN (developers@xpressengine.com)
+    </description>
+  
+    <version>0.1</version>
+    <date>2011-09-26</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">default</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="zh-CN">默认</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/themes/xe_greystone/modules/message/system_message.html b/themes/xe_greystone/modules/message/system_message.html
new file mode 100644
index 000000000..44a0a54a1
--- /dev/null
+++ b/themes/xe_greystone/modules/message/system_message.html
@@ -0,0 +1,65 @@
+<!--%import("message.css")-->
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+
+<div id="loginAccess" class="gLogin">
+	<!--@if(!$is_logged)--><h1>{$system_message}</h1><!--@else--><h1 class="logOut_h">{$system_message}</h1><!--@end-->
+	<!--@if(!$is_logged)-->
+    <!--%import("../../../../common/js/jquery.js")-->
+	<!--%import("./filter/login.xml")-->
+	<!--%import("./filter/openid_login.xml")-->
+	<!--%import("./message.js")-->
+	<div class="mLogin" id="gLogin">
+		<form action="./" method="post" ruleset="@login" id="gForm">
+			<input type="hidden" name="act" value="procMemberLogin" />
+			<fieldset>
+				<ul class="idpw">
+					<li><input type="text" name="user_id" id="uid" value="" class="inputText" title="{$lang->user_id}" /></li>
+					<li><input type="password" name="password" id="upw" value="" class="inputText" title="{$lang->password}" /></li>
+				</ul>
+				<div class="buttonArea">
+					<p class="keeping">
+						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />						
+						<label for="keepid">{$lang->keep_signed}</label>
+					</p>
+					<div id="warning" class="">
+						<p>{$lang->about_keep_warning}</p>
+					</div>
+					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
+				</div>
+			</fieldset>
+		</form>
+		<ul class="help">
+			<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
+			<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
+			<!--@if($member_config->enable_openid=='Y')-->
+			<li><a href="#oLogin" onclick="jQuery('#loginAccess').removeClass('gLogin'); jQuery('#loginAccess').addClass('oLogin'); return false;">Open ID</a></li>
+			<!--@end-->
+		</ul>
+	</div>
+	
+	<!-- OpenID -->
+	<!--@if($member_config->enable_openid=='Y')-->
+	<div class="mLogin" id="oLogin">
+		<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm">
+			<fieldset>
+					<div class="oid">
+						<input type="text" name="openid" class="inputText" title="Open ID" value="" />
+					</div>
+					<div class="buttonArea">
+					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
+				</div>
+			</fieldset>
+		</form>
+		<div class="help"><a href="#gLogin" onclick="jQuery('#loginAccess').removeClass('oLogin'); jQuery('#loginAccess').addClass('gLogin'); return false;">{$lang->cmd_common_id}</a></div>
+	</div>
+	<!--@end-->
+	<!--@end-->
+	<!--@if($is_logged)-->
+	<div class="logOut">
+		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
+	</div>
+	<!--@end-->
+</div>
diff --git a/themes/xe_greystone/modules/message/thumbnail.png b/themes/xe_greystone/modules/message/thumbnail.png
new file mode 100644
index 000000000..6d5c105de
Binary files /dev/null and b/themes/xe_greystone/modules/message/thumbnail.png differ
diff --git a/themes/xe_greystone/thumbnail.png b/themes/xe_greystone/thumbnail.png
new file mode 100644
index 000000000..e2e78006f
Binary files /dev/null and b/themes/xe_greystone/thumbnail.png differ
diff --git a/themes/xe_sapphire/conf/info.xml b/themes/xe_sapphire/conf/info.xml
new file mode 100644
index 000000000..7632c02b7
--- /dev/null
+++ b/themes/xe_sapphire/conf/info.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<theme>
+	<version>0.1</version>
+	<title xml:lang="ko">XE Sapphire 테마</title>
+	<title xml:lang="en">XE Sapphire theme</title>
+	<title xml:lang="zh-CN">XE蓝宝石系主题</title>
+	<date>2011-07-26</date>
+	<publisher email_address="developers@xpressengine.com" link="http://www.xpressengine.com">
+		<name xml:lang="ko">NHN</name>
+		<name xml:lang="en">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+	</publisher>
+	<description xml:lang="ko">간단하고 실용적인 스타일에 중점을 둔 푸른색 계열의 디자인</description>
+	<description xml:lang="en">The XE Sapphire theme employs a concise and clear layout, make the site easy to read.</description>
+	<description xml:lang="zh-CN">XE蓝宝石系主题体现了简单实用的风格，主色调以蓝色为主，是页面更加清新.</description>
+	<layout>
+			<directory path="./themes/xe_sapphire/layouts/xe_sapphire" />
+	</layout>
+	<skinInfos>
+		<skinInfo>
+			<directory path="./themes/xe_sapphire/modules/message" />
+		</skinInfo>
+	</skinInfos>
+</theme>
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/conf/info.xml b/themes/xe_sapphire/layouts/xe_sapphire/conf/info.xml
new file mode 100644
index 000000000..b9a7e630c
--- /dev/null
+++ b/themes/xe_sapphire/layouts/xe_sapphire/conf/info.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE Sapphire 레이아웃</title>
+    <title xml:lang="jp">XE Sapphire Layout</title>
+    <title xml:lang="en">XE Sapphire Layout</title>
+    <title xml:lang="ge">XE Sapphire Layout</title>
+    <title xml:lang="ru">XE Sapphire Layout</title>
+    <title xml:lang="es">XE Sapphire Layout</title>
+    <title xml:lang="zh-CN">蓝色经典</title>
+    <title xml:lang="zh-TW">蓝色经典</title>
+    <title xml:lang="vi">XE Sapphire Layout</title>
+    <description xml:lang="ko">
+        그린과 화이트를 사용하여 깨끗하고 심플한 스타일.
+        Author : NHN
+    </description>
+    <description xml:lang="jp">
+        This layout employs a Sapphire style, with the concise appearance, outstanding the page content.
+        Author : NHN
+    </description>
+    <description xml:lang="en">
+        This layout employs a Sapphire style, with the concise appearance, outstanding the page content.
+        Author : NHN
+    </description>
+    <description xml:lang="ge">
+        This layout employs a Sapphire style, with the concise appearance, outstanding the page content.
+        Author : NHN
+    </description>
+    <description xml:lang="ru">
+        This layout employs a Sapphire style, with the concise appearance, outstanding the page content.
+        Author : NHN
+    </description>
+    <description xml:lang="es">
+        This layout employs a Sapphire style, with the concise appearance, outstanding the page content.
+        Author : NHN
+    </description>
+    <description xml:lang="zh-CN">
+        布局采用了宝石蓝和白色，页面简洁 ，细节完善，风格简约，注重内容的表现。
+        Author : NHN
+    </description>
+    <description xml:lang="zh-TW">
+        布局采用了宝石蓝和白色，页面简洁 ，细节完善，风格简约，注重内容的表现。
+        Author : NHN
+    </description>
+	<description xml:lang="vi">
+        This layout employs a Sapphire style, with the concise appearance, outstanding the page content.
+        Author : NHN
+    </description>
+    <version>0.1</version>
+    <date>2011-06-28</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+	<name xml:lang="vi">NHN</name>
+    </author>
+
+    <extra_vars>
+		<var name="logo_text" type="text">
+			<title xml:lang="ko">로고 글자</title>
+			<title xml:lang="en">Logo text</title>
+			<title xml:lang="zh-CN">站点标题</title>
+			<title xml:lang="zh-TW">Logo文字</title>
+			<title xml:lang="jp">ロゴ用テキスト</title>
+			<description xml:lang="ko">좌측 상단의 로고 부분에 글자를 지정할 수 있습니다. 로고 이미지가 있으면 로고 이미지의 caption으로 표시됩니다.</description>
+			<description xml:lang="en">You can set the Logo text shown in the top-left part of this layout. If there exists Logo image, this text will be a caption of the image.</description>
+			<description xml:lang="zh-CN">将显示在您的站点左侧头部，如你已上传lOGO图片，此标题将变成LOGO图片的caption。</description>
+			<description xml:lang="zh-TW">將顯示在虛擬網站的左上方，如果有上傳過Logo圖片，將會以圖片顯示。</description>
+			<description xml:lang="jp">左上段のロゴ部分に表示する文章を指定します。ロゴイメージがある場合は、ロゴイメージのキャプションとして表示します。</description>
+		</var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+	    	<title xml:lang="vi">Hình Logo</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージをお勧めします。。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
+	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 23px.)</description>
+        </var>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+	    	<title xml:lang="vi">URL Trang chủ</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
+             </var>
+        <var name="background_image" type="image">
+            <title xml:lang="ko">배경 이미지</title>
+            <title xml:lang="jp">背景イメージ</title>
+            <title xml:lang="zh-CN">背景图片</title>
+            <title xml:lang="zh-TW">背景圖片</title>
+            <title xml:lang="en">Background Image</title>
+            <title xml:lang="ge">Hintergrundbild</title>
+            <title xml:lang="ru">Фоновое изображение</title>
+            <title xml:lang="es">Imagen de fondo</title>
+	    	<title xml:lang="vi">Hình nền</title>
+            <description xml:lang="ko">배경 이미지를 사용하시려면 등록해주세요.</description>
+            <description xml:lang="jp">背景イメージを使う場合は、登録して下さい。</description>
+            <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
+            <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
+            <description xml:lang="en">Please input if you want to use background image.</description>
+            <description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
+            <description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
+            <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
+	    <description xml:lang="vi">Hãy nhập hình nền nếu bạn muốn sử dụng.</description>
+        </var>
+    </extra_vars>
+
+    <menus>
+        <menu name="main_menu" maxdepth="3" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段用メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+	    	<title xml:lang="vi">Menu trên</title>
+        </menu>
+		<menu name="bottom_menu" maxdepth="1">
+            <title xml:lang="ko">하단 메뉴 </title>
+            <title xml:lang="jp">下段用メニュー</title>
+            <title xml:lang="zh-CN">底部菜单</title>
+            <title xml:lang="zh-TW">底部選單</title>
+            <title xml:lang="en">Bottom menu</title>
+            <title xml:lang="ge">Bottom-Menü</title>
+            <title xml:lang="ru">Внизу меню</title>
+            <title xml:lang="es">Menú Inferior </title>
+	    	<title xml:lang="vi">Menu dưới</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/css/default.css b/themes/xe_sapphire/layouts/xe_sapphire/css/default.css
new file mode 100644
index 000000000..c27ff13fc
--- /dev/null
+++ b/themes/xe_sapphire/layouts/xe_sapphire/css/default.css
@@ -0,0 +1,106 @@
+@charset "utf-8";
+/* NHN (developers@xpressengine.com) */
+body { margin:0;padding:0; font-size:.75em;}
+.iePngFix { behavior:url(../js/iePngFix.htc); }
+/* Default Skin - Start */
+#selectLang{display:none;margin:0;padding:0}
+#gnb{margin:0;padding:0}
+#lnb_Global{margin:0;padding:0}
+#lnb_Global ul{margin:0;padding:0}
+.lnb_Global li.active a{font-weight:bold;color:#fff;}
+/* Site Layout - Body Wrap */
+body{background:#fafafa url(../images/default/bg_body.gif) repeat-x 0 0;font-family:Arial}
+#bodyWrap{position:relative;width:960px;margin:0 auto}
+/* Site Layout - Header */
+#header{position:relative;z-index:100;width:960px;height:105px;margin-bottom:10px}
+#header h1{position:absolute;top:17px;left:0;margin:0;padding:0;color:#282727;font-size:20px}
+#header h1 img{margin-right:10px;vertical-align:middle}
+#header .top_area{float:right;width:289px;height:30px;background:url(../images/default/bg_top_area.gif) repeat-x;line-height:30px}
+#language{display:inline;float:left;position:relative;z-index:200;margin:-1px 0 0 5px;font-family:Arial, Helvetica, sans-serif}
+#language dt{float:left;margin-right:5px;padding:0 9px 0 0;background:url(../images/default/line_language.gif) no-repeat 100% 12px;color:#fff}
+#language dd{float:left;position:relative;width:69px;margin:0 3px 0 0}
+#language dd a{display:block;padding:0 0 0 2px;background:url(../images/default/ico_arw.gif) no-repeat 95% 50%;color:#fff;font-size:12px;text-decoration:none}
+#language ul{position:absolute;top:30px;left:-1px;z-index:300;width:69px;background:#020202;border-radius:0 0 5px 5px; padding:0 0 5px 0}
+#language ul li{height:18px;line-height:18px;list-style:none}
+#language ul li a{display:block;padding-left:5px;background:none;color:#fff;font:11px Tahoma;text-align:left;text-decoration:none;height:18px;line-height:18px;}
+#language ul li a:hover{ background:#6c6c6c}
+#header .search{float:left}
+#it_search_form{position:absolute;top:50px;right:15px}
+#it_search_form .input{width:120px;height:17px;border:1px solid #bc4032;color:#888;font-size:.9em}
+#it_search_form .submit_button{visibility:hidden;width:1px;height:1px}
+/* gnb */
+.gnb{position:absolute;top:71px;left:0;width:960px;height:34px;height:37px;height:37px;margin:0;padding:0;background:url(../images/default/bg_gnb.gif) no-repeat 0 0;white-space:nowrap}
+.gnb ul{margin:0;padding:0}
+.gnb ul li{float:left;position:relative;height:34px;padding-left:2px;background:url(../images/default/bgGnbVr.gif) no-repeat 0 50%;line-height:34px;list-style:none}
+.gnb ul li.home{ padding-left:0; background:none}
+.gnb ul li.home_on{background:url(../images/default/bg_gnb_home.gif) no-repeat 0 0; padding-left:0}
+.gnb ul li.home_on a:hover{background:none}
+.gnb ul li.home a:hover{background:url(../images/default/bg_gnb_home.gif) no-repeat 0 0;}
+.gnb ul li.on a,
+.gnb ul li a:hover{background:url(../images/default/bg_gnb4.gif) repeat-x;color:#3f4140;font-weight:bold}
+.gnb ul li a{display:block;padding:0 33px;color:#3f4140;font-size:14px;font-weight:bold;text-decoration:none}
+.gnb ul li .sub{display:none;position:absolute;top:33px;left:0;z-index:300;margin:0;padding:0;border:1px solid #bbb;background:#fff;border-radius:0 0 5px 5px}
+.gnb ul li .sub li{clear:both;height:31px;margin:0;padding:0;background:none;line-height:33px;text-align:center;*zoom:1}
+.gnb ul li .sub li a{background:none;color:#9fa09f; height:31px;line-height:31px}
+.gnb ul li .sub li a:hover,
+.gnb ul li .sub li a.subon{background:url(../images/default/bg_gnb3.gif) repeat-x;color:#fff!important;text-decoration:none}
+.gnb li.last{}
+#isSearch{}
+#isSearch .searchOrder{display:none}
+#isSearch .checked{display:block;position:absolute;top:0;left:0;width:64px;height:14px;padding:5px 0 0 5px;background:url(../images/default/bgSearchTerm.gif) no-repeat;color:#fff;font:11px '돋움', Dotum, '굴림', Gulim, AppleGothic, Sans-serif;line-height:normal;text-align:left}
+*:first-child+html #isSearch .checked{top:1px}
+#isSearch ul{display:none;position:absolute;top:18px;left:0;padding:2px 0 3px;border:1px solid #919898;background:#536c6d;text-align:left}
+#isSearch ul li{width:67px;height:18px;list-style:none}
+#isSearch ul li input{display:none}
+#isSearch ul li label{display:block;width:63px;height:15px;padding:4px 0 0 4px;color:#fff;font:11px '돋움', Dotum, '굴림', Gulim, AppleGothic, Sans-serif}
+#isSearch ul li label.on{background:#455a5b}
+#isSearch ul li label:hover,
+#isSearch ul li label:focus{background:#455a5b}
+#isSearch .inputText{width:110px;height:15px;margin-top:5px;*margin-top:4px;padding-left:20px;border:1px solid #c9c7c7;background:#f1f1f1 url(../images/default/ico_search.gif) no-repeat 5px 2px;line-height:15px;zoom:1;border-radius:4px}
+#isSearch .searchOrder{display:none}
+#isSearch .inputText:hover,
+#isSearch .inputText:focus{}
+*:first-child+html body#default #isSearch .inputText{position:relative;top:-1px}
+#isSearch .submit{_position:relative;_top:-1px;vertical-align:middle}
+*:first-child+html body#default #isSearch .submit{position:relative;top:-1px}
+/* Site Layout - Content Body */
+#contentBody{ overflow:hidden;position:relative;width:960px;margin-top:32px;margin-bottom:72px;background:url(../images/default/bg_contentBody.gif) repeat-y;*zoom:1}
+#contentBody:after{display:block;clear:both;content:''}
+/* Site Layout - Column Left */
+#columnLeft{float:left;width:195px;}
+#columnLeft .mask{display:block;clear:both;width:201px;height:5px;background:#fff}
+/* Site Layout - Column Right */
+#columnRight{float:right;width:730px; overflow:hidden}
+#columnRight:after{display:block;clear:both;content:''}
+#visualArea{position:relative;left:-15px;width:770px;height:200px;margin-right:-15px;margin-bottom:2.5em;background:#f5f5f5}
+#content{overflow:hidden;width:100%}
+#columnLeft .info{padding:0;overflow:hidden;margin-bottom:10px;width:195px;background:#fff;zoom:1}
+#columnLeft .info .search{margin:0;padding:0}
+#columnLeft .lnb_Global{overflow:hidden;border:1px solid #d4d4d4}
+#columnLeft .lnb_Global h2{margin:0;background:#e5e4e4 url(../images/default/ico_arw2.gif) no-repeat 92% 6px}
+#columnLeft .lnb_Global h2 a{margin:0;padding-left:22px;color:#546d82;font-size:14px;line-height:28px;text-decoration:none}
+#columnLeft .lnb_Global .list{margin:0;padding:12px 0}
+#columnLeft .lnb_Global .list li{margin:0;padding:0;line-height:22px;list-style:none;}
+#columnLeft .lnb_Global .list li a{display:block;padding-left:22px;color:#3a3a3a;text-decoration:none;*zoom:1;border-bottom:1px solid #fafafa;border-top:1px solid #fafafa;}
+#columnLeft .lnb_Global .list li a:hover,
+#columnLeft .lnb_Global .list li.on{border-bottom:1px solid #d4d4d4;border-top:1px solid #d4d4d4;background:#e5e4e4 url(../images/default/ico_arw2.gif) no-repeat 92% 5px}
+#columnLeft .lnb_Global .list li ul{ padding:0; margin:0}
+#columnLeft .lnb_Global .list li ul li{ padding-left:15px}
+
+/* sitemap */
+.sitemap{margin:0 0 28px 0; overflow:hidden; clear:both}
+.sitemap ul{padding:0; margin:0}
+.sitemap li{ list-style:none;padding:0 28px 0 0; width:190px; display:inline-block;*display:inline;*zoom:1; vertical-align:top; overflow:hidden;  margin:0 28px 20px 0 ; border-right:1px solid #d2d2d2}
+.sitemap li.last{ border-right:0; margin:0; padding:0}
+.sitemap .list{margin:0;padding:0}
+.sitemap .list dt{ font-weight:bold; font-size:14px; margin-bottom:19px;}
+.sitemap .list dt a{ color:#3a3a3a; text-decoration:none}
+.sitemap .list dd{ margin:0; padding:0; background:url(../images/default/bu_v1.gif) no-repeat 0 50%; padding-left:10px; line-height:20px}
+.sitemap .list dd a{ color:#3a3a3a; text-decoration:none}
+
+/* Site Layout - Footer */
+#footer{clear:both;margin:0;padding:11px 0 46px;border-top:1px solid #dbdbdb;text-align:left}
+#footer li.first-child{background:none}
+#footer li a{color:#999;font:.9em '돋움', Dotum, '굴림', Gulim, AppleGothic, Sans-serif}
+#footer address{color:#9fa09f;font-style:normal}
+#footer address strong{margin-left:4px}
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bgGnbVr.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bgGnbVr.gif
new file mode 100644
index 000000000..dabddcca6
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bgGnbVr.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_body.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_body.gif
new file mode 100644
index 000000000..afde10660
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_body.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_contentBody.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_contentBody.gif
new file mode 100644
index 000000000..ab3920045
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_contentBody.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb.gif
new file mode 100644
index 000000000..6515e71d0
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb2.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb2.gif
new file mode 100644
index 000000000..7445c7ce5
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb2.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb3.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb3.gif
new file mode 100644
index 000000000..9df59a4a3
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb3.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb4.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb4.gif
new file mode 100644
index 000000000..b23a89610
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb4.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb_home.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb_home.gif
new file mode 100644
index 000000000..d010e3d59
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_gnb_home.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_hd.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_hd.gif
new file mode 100644
index 000000000..05d7f364a
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_hd.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_login.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_login.gif
new file mode 100644
index 000000000..4cee2bd4c
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_login.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_top_area.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_top_area.gif
new file mode 100644
index 000000000..05d7f364a
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bg_top_area.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/btn_login2.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/btn_login2.gif
new file mode 100644
index 000000000..6f7c41488
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/btn_login2.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/bu_v1.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bu_v1.gif
new file mode 100644
index 000000000..6a54d9d4e
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/bu_v1.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_arw.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_arw.gif
new file mode 100644
index 000000000..8734cf029
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_arw.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_arw2.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_arw2.gif
new file mode 100644
index 000000000..0c1bd9ade
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_arw2.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_search.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_search.gif
new file mode 100644
index 000000000..5354fb00a
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ico_search.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/line_language.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/line_language.gif
new file mode 100644
index 000000000..6e705ed4c
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/line_language.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/images/default/ling_top_area.gif b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ling_top_area.gif
new file mode 100644
index 000000000..bc92ff621
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/images/default/ling_top_area.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/js/blank.gif b/themes/xe_sapphire/layouts/xe_sapphire/js/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/js/blank.gif differ
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/js/iePngFix.htc b/themes/xe_sapphire/layouts/xe_sapphire/js/iePngFix.htc
new file mode 100644
index 000000000..730005da6
--- /dev/null
+++ b/themes/xe_sapphire/layouts/xe_sapphire/js/iePngFix.htc
@@ -0,0 +1,187 @@
+<public:component>
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v2.0 Alpha
+// (c) 2004-2008 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+var IEPNGFix = window.IEPNGFix || {};
+IEPNGFix.data = IEPNGFix.data || {};
+
+
+// This must be a path to a blank image, relative to the HTML document(s).
+// In production use I suggest '/images/blank.gif' or similar. That's all!
+IEPNGFix.blankImg = 'layouts/xe_sapphire/js/blank.gif';
+
+
+IEPNGFix.fix = function(elm, src, t) {
+	// Applies an image 'src' to an element 'elm' using the DirectX filter.
+	// If 'src' is null, filter is disabled.
+	// Disables the 'hook' to prevent infinite recursion on setting BG/src.
+	// 't' = type, where background tile = 0, background = 1, IMG SRC = 2.
+
+	var h = this.hook.enabled;
+	this.hook.enabled = 0;
+
+	var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+		src = (src || '').replace(/\(/g, '%28').replace(/\)/g, '%29');
+
+	if (
+		src && !(/IMG|INPUT/.test(elm.nodeName) && (t != 2)) &&
+		elm.currentStyle.width == 'auto' && elm.currentStyle.height == 'auto'
+	) {
+		elm.style.width = elm.offsetWidth + 'px';
+		elm.style.height = elm.clientHeight + 'px';
+		if (elm.currentStyle.display == 'inline') {
+			elm.style.display = 'inline-block';
+		}
+	}
+
+	if (t == 1) {
+		elm.style.backgroundImage = 'url("' + this.blankImg + '")';
+	}
+	if (t == 2) {
+		elm.src = this.blankImg;
+	}
+
+	if (elm.filters[f]) {
+		elm.filters[f].enabled = src ? true : false;
+		if (src) {
+			elm.filters[f].src = src;
+		}
+	} else if (src) {
+		elm.style.filter = 'progid:' + f + '(src="' + src +
+			'",sizingMethod="' + (t == 2 ? 'scale' : 'crop') + '")';
+	}
+
+	this.hook.enabled = h;
+};
+
+
+IEPNGFix.process = function(elm, init) {
+	// Checks the onpropertychange event (on first 'init' run, a fake event)
+	// and calls the filter-applying-functions.
+
+	if (
+		!/MSIE (5\.5|6)/.test(navigator.userAgent) ||
+		typeof elm.filters == 'unknown'
+	) {
+		return;
+	}
+	if (!this.data[elm.uniqueID]) {
+		this.data[elm.uniqueID] = {
+			className: ''
+		};
+	}
+	var data = this.data[elm.uniqueID],
+		evt = init ? { propertyName: 'src,backgroundImage' } : event,
+		isSrc = /src/.test(evt.propertyName),
+		isBg = /backgroundImage/.test(evt.propertyName),
+		isPos = /width|height|background(Pos|Rep)/.test(evt.propertyName),
+		isClass = !init && ((elm.className != data.className) &&
+			(elm.className || data.className));
+	if (!(isSrc || isBg || isPos || isClass)) {
+		return;
+	}
+	data.className = elm.className;
+	var blank = this.blankImg.match(/([^\/]+)$/)[1],
+		eS = elm.style,
+		eCS = elm.currentStyle;
+
+	// Required for Whatever:hover - erase set BG if className changes.
+	if (
+		isClass && (eS.backgroundImage.indexOf('url(') == -1 ||
+		eS.backgroundImage.indexOf(blank) > -1)
+	) {
+		return setTimeout(function() {
+			eS.backgroundImage = '';
+		}, 0);
+	}
+
+	// Foregrounds.
+	if (isSrc && elm.src &&  { IMG: 1, INPUT: 1 }[elm.nodeName]) {
+		if ((/\.png/i).test(elm.src)) {
+			this.fix(elm, elm.src, 2);
+		} else if (elm.src.indexOf(blank) == -1) {
+			this.fix(elm, '');
+		}
+	}
+
+	// Backgrounds.
+	var bgSrc = eCS.backgroundImage || eS.backgroundImage;
+	if ((bgSrc + elm.src).indexOf(blank) == -1) {
+		var bgPNG = bgSrc.match(/url[("']+(.*\.png[^\)"']*)[\)"']/i);
+		if (bgPNG) {
+			if (this.tileBG && !{ IMG: 1, INPUT: 1 }[elm.nodeName]) {
+				this.tileBG(elm, bgPNG[1]);
+				this.fix(elm, '', 1);
+			} else {
+				if (data.tiles && data.tiles.src) {
+					this.tileBG(elm, '');
+				}
+				this.fix(elm, bgPNG[1], 1);
+				this.childFix(elm);
+			}
+		} else {
+			if (data.tiles && data.tiles.src) {
+				this.tileBG(elm, '');
+			}
+			this.fix(elm, '');
+		}
+	} else if ((isPos || isClass) && data.tiles && data.tiles.src) {
+		this.tileBG(elm, data.tiles.src);
+	}
+
+	if (init) {
+		this.hook.enabled = 1;
+		elm.attachEvent('onpropertychange', this.hook);
+	}
+};
+
+
+IEPNGFix.childFix = function(elm) {
+	// "hasLayout" fix for unclickable children inside PNG backgrounds.
+	var tags = [
+			'a',
+			'input',
+			'select',
+			'textarea',
+			'button',
+			'iframe',
+			'object'
+		],
+		t = tags.length,
+		tFix = [];
+	while (t--) {
+		var pFix = elm.all.tags(tags[t]),
+			e = pFix.length;
+		while (e--) {
+			tFix.push(pFix[e]);
+		}
+	}
+	t = tFix.length;
+	if (t && (/relative|absolute/i).test(elm.currentStyle.position)) {
+		alert('IEPNGFix: Unclickable children of element:' +
+			'\n\n<' + elm.nodeName + (elm.id && ' id=' + elm.id) + '>');
+	}
+	while (t--) {
+		if (!(/relative|absolute/i).test(tFix[t].currentStyle.position)) {
+			tFix[t].style.position = 'relative';
+		}
+	}
+};
+
+
+IEPNGFix.hook = function() {
+	if (IEPNGFix.hook.enabled) {
+		IEPNGFix.process(element, 0);
+	}
+};
+
+
+IEPNGFix.process(element, 1);
+
+</script>
+</public:component>
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/js/xe_global.js b/themes/xe_sapphire/layouts/xe_sapphire/js/xe_global.js
new file mode 100644
index 000000000..3a802e335
--- /dev/null
+++ b/themes/xe_sapphire/layouts/xe_sapphire/js/xe_global.js
@@ -0,0 +1,66 @@
+jQuery(function($){
+    // Global Navigation Bar
+    var gMenu = $('#header>div.gnb');
+    var gItem = gMenu.find('>ul>li');
+    var ggItem = gMenu.find('>ul>li>ul>li');
+    var lastEvent = null;
+    gItem.find('>ul').hide();
+
+	if(gItem.last().attr('class') != "on m1")
+		gItem.last().attr('class','last');
+
+	if(gItem.first().attr('class') != "home_on"){
+		gItem.first().attr('class','home');
+	}
+
+	ggItem.mouseover(function(){
+		old_class = $(this).parent('ul').parent('li').attr('class');
+		if(old_class == "home first" || old_class =="home" || old_class == "home_on first" || old_class == "home_on")
+			$(this).parent('ul').parent('li').attr('class','home_on');
+		else
+			$(this).parent('ul').parent('li').attr('class','on m1');
+
+		$(this).mouseleave(function(){
+			if(old_class == "home first" || old_class =="home" || old_class == "home_on first" || old_class == "home_on" )
+				$(this).parent('ul').parent('li').attr('class',old_class);
+			else if(old_class !="on m1" && old_class !="on m1 first")
+				$(this).parent('ul').parent('li').attr('class','');
+		});
+	});
+
+	gItem.filter(':first').addClass('first');
+    function gMenuToggle(){
+        var t = $(this);
+        if (t.next('ul').is(':hidden') || t.next('ul').length == 0) {
+            gItem.find('>ul').hide();
+            gItem.find('a').removeClass('hover');
+            t.next('ul').show();
+            t.addClass('hover');            
+        };
+
+		if(t.next('ul').width()){
+			if(t.next('ul').width()< t.parent().width()){
+				t.next('ul').width(t.parent().width());
+				t.next('ul').find('li').width(t.parent().width());
+				t.next('ul').find('li').css('text-align','left');
+			}else{
+				t.next('ul').find('li').width(t.next('ul').width());
+				t.next('ul').find('li').css('text-align','left');
+			}
+		}
+		return false;
+    };
+    function gMenuOut(){
+        gItem.find('ul').hide();
+        gItem.find('a').removeClass('hover');
+    };
+    gItem.find('>a').mouseover(gMenuToggle).focus(gMenuToggle);
+    gItem.mouseleave(gMenuOut);
+
+	var maxHeight = 0;
+	$('div.sitemap>ul>li').each(function(i){
+		if($(this).height() > maxHeight)
+			maxHeight = $(this).height();
+	});
+	$('div.sitemap>ul>li').height(maxHeight);
+});
\ No newline at end of file
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/js/xe_official.js b/themes/xe_sapphire/layouts/xe_sapphire/js/xe_official.js
new file mode 100644
index 000000000..bf49ce705
--- /dev/null
+++ b/themes/xe_sapphire/layouts/xe_sapphire/js/xe_official.js
@@ -0,0 +1,36 @@
+// Hide And Show Toggle
+var cc=0
+function hideShow(id) {
+    if (cc==0) {
+        cc=1
+        document.getElementById(id).style.display="none";
+    } else {
+        cc=0
+        document.getElementById(id).style.display="block";
+    }
+}
+
+// Show And Hide Toggle
+var cc=0
+function showHide(id) {
+    if (cc==0) {
+        cc=1
+        document.getElementById(id).style.display="block";
+    } else {
+        cc=0
+        document.getElementById(id).style.display="none";
+    }
+}
+
+// Local Navigation Toggle
+function lnbToggle(id) {
+	for(num=1; num<=3; num++) document.getElementById('D3MG'+num).style.display='none'; //D4MG1~D4MG3 까지 숨긴 다음
+	document.getElementById(id).style.display='block'; //해당 ID만 보임
+}
+
+// IS
+function chkIsKind(key, value) {
+    showHide('selectOrder');
+    xGetElementById('search_target'+key).checked = true;
+    xInnerHtml('search_target_label', value);
+}
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/layout.html b/themes/xe_sapphire/layouts/xe_sapphire/layout.html
new file mode 100644
index 000000000..aa83902e7
--- /dev/null
+++ b/themes/xe_sapphire/layouts/xe_sapphire/layout.html
@@ -0,0 +1,104 @@
+<!--// js 파일 import -->
+<!--%import("js/xe_global.js")-->
+<!--%import("js/xe_official.js")-->
+<!--// 레이아웃과 연동될 css 파일 import -->
+<!--%import("css/default.css")-->
+<!--@if($layout_info->background_image)-->
+<style type="text/css">
+    body {  background:#FFFFFF url({getUrl()}{$layout_info->background_image}) repeat-x left top; }
+</style>
+<!--@end-->
+<!--@if(!$layout_info->colorset)-->
+    {@$layout_info->colorset = "default"}
+<!--@end-->
+<div id="bodyWrap">
+    <div id="header">
+        <h1><a href="{$layout_info->index_url}"><!--@if($layout_info->logo_image)--><img src="{$layout_info->logo_image}" alt="{$layout_info->logo_text}"|cond="$layout_info->logo_text" alt="logo"|cond="!$layout_info->logo_text" border="0" class="iePngFix" /><!--@elseif($layout_info->logo_text)-->{$layout_info->logo_text}<!--@else-->Global XE<!--@end--></a></h1>
+		<!-- top_area -->
+		<div class="top_area">
+        <dl id="language">
+		<dt>Language</dt>
+		<dd><a href="#selectLang" onclick="showHide('selectLang');return false;">{$lang_supported[$lang_type]}</a>
+            <ul id="selectLang">
+			<!--@foreach($lang_supported as $key => $val)--><!--@if($key!= $lang_type)-->
+			<li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
+			<!--@end--><!--@end-->
+            </ul>
+		</dd>
+        </dl>
+		<div class="search">
+		    <form action="{getUrl()}" method="post" id="isSearch">
+            <!--@if($vid)-->
+            <input type="hidden" name="vid" value="{$vid}" />
+            <!--@end-->
+            <input type="hidden" name="mid" value="{$mid}" />
+            <input type="hidden" name="act" value="IS" />
+            <input type="hidden" name="search_target" value="title_content" />
+            <input name="is_keyword" type="text" class="inputText" title="keyword" />
+            </form>
+		</div>
+		</div>
+        <div class="gnb">
+			<ul>
+			{@ $index = 0;}
+			<li loop="$main_menu->list=>$key1,$val1" class="on m1"|cond="$val1['selected']&&$index!=0" class="home_on"|cond="$val1['selected']&&$index==0" class="home"|cond="!$val1['selected']&&$index==0"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a>
+				<ul class="sub" cond="$val1['list']">
+					<li loop="$val1['list']=>$key2,$val2"><a href="{$val2['href']}" class="subon"|cond="$val2['selected']"  target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a></li>
+				</ul>
+				{@ $index ++;}
+			</li>
+			</ul>
+		</div>
+       </div>
+    <div id="contentBody">
+        <div id="columnLeft">
+			<div class="info">
+            <!-- 로그인 위젯 -->
+            <img src="./images/blank.gif" class="zbxe_widget_output" widget="login_info" skin="xe_globalTwo" colorset="{$layout_info->colorset}" />
+			</div>
+			<!--@if($main_menu->list)-->
+			<div class="lnb_Global">
+				<h2 loop="$main_menu->list=>$key1,$val1" cond="$val1['selected']"><a href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'">{$val1['link']}</a></h2>
+				<ul class="list" loop="$main_menu->list=>$key1,$val1" cond="$val1['selected'] && $val1['list']">
+					<li loop="$val1['list']=>$key2,$val2" class="active"|cond="$val2['selected']"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a>
+						<ul cond="$val2['list']">
+							<li loop="$val2['list']=>$key3,$val3" class="active"|cond="$val3['selected']"><a href="{$val3['href']}" target="_blank"|cond="$val3['open_window']=='Y'">{$val3['link']}</a></li>
+						</ul>
+					</li>
+				</ul>
+			</div>
+			<!--@end-->
+        </div>
+        <div id="columnRight">
+            <!-- 컨텐츠 시작 -->
+            {$content}
+        </div>
+    </div>
+	
+	{@ $index = 1;}
+	<div class="sitemap">
+		<ul>
+		<!--@foreach($bottom_menu->list as $key => $val)-->
+        <!--@if($val['link'])-->
+			<li <!--@if($index%4 == 0)-->class="last"<!--@end-->>
+			<dl class="list">
+			<dt><a href="{$val['href']}"<!--@if($val['open_window']=='Y')--> onclick="window.open(this.href);return false;"<!--@end-->>{$val['text']}</a></dt>
+			<!--@if($val['list'])-->
+				 <!--@foreach($val['list'] as $k => $v)-->
+                        <!--@if($val['link'])-->
+						<dd><a href="{$v['href']}"<!--@if($v['open_window']=='Y')--> onclick="window.open(this.href);return false;"<!--@end-->>{$v['text']}</a></dd>
+						<!--@end-->
+                 <!--@end-->
+			<!--@end-->
+			</dl>
+			</li>
+		{@ $index++;}
+		<!--@end-->
+		<!--@end-->
+		</ul>
+	</div>
+
+    <div id="footer">
+            <address>Powered&nbsp;by<strong>XE</strong></address>
+    </div>
+</div>
\ No newline at end of file
diff --git a/themes/xe_sapphire/layouts/xe_sapphire/thumbnail.png b/themes/xe_sapphire/layouts/xe_sapphire/thumbnail.png
new file mode 100644
index 000000000..e29e7529e
Binary files /dev/null and b/themes/xe_sapphire/layouts/xe_sapphire/thumbnail.png differ
diff --git a/themes/xe_sapphire/modules/message/filter/login.xml b/themes/xe_sapphire/modules/message/filter/login.xml
new file mode 100644
index 000000000..c0c7e870c
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/filter/login.xml
@@ -0,0 +1,8 @@
+<filter name="message_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id" />
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response />
+</filter>
diff --git a/themes/xe_sapphire/modules/message/filter/logout.xml b/themes/xe_sapphire/modules/message/filter/logout.xml
new file mode 100644
index 000000000..8005776d3
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="widget_logout" module="member" act="procMemberLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/themes/xe_sapphire/modules/message/filter/openid_login.xml b/themes/xe_sapphire/modules/message/filter/openid_login.xml
new file mode 100644
index 000000000..a924c15d8
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeMessageOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_sapphire/modules/message/images/Thumbs.db b/themes/xe_sapphire/modules/message/images/Thumbs.db
new file mode 100644
index 000000000..064b4960a
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/Thumbs.db differ
diff --git a/themes/xe_sapphire/modules/message/images/bg_box_c.gif b/themes/xe_sapphire/modules/message/images/bg_box_c.gif
new file mode 100644
index 000000000..56816636d
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/bg_box_c.gif differ
diff --git a/themes/xe_sapphire/modules/message/images/bg_box_f.gif b/themes/xe_sapphire/modules/message/images/bg_box_f.gif
new file mode 100644
index 000000000..b32135e0f
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/bg_box_f.gif differ
diff --git a/themes/xe_sapphire/modules/message/images/bg_box_top.gif b/themes/xe_sapphire/modules/message/images/bg_box_top.gif
new file mode 100644
index 000000000..36c5ee3d0
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/bg_box_top.gif differ
diff --git a/themes/xe_sapphire/modules/message/images/bg_gLogin.gif b/themes/xe_sapphire/modules/message/images/bg_gLogin.gif
new file mode 100644
index 000000000..fc90e9f35
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/bg_gLogin.gif differ
diff --git a/themes/xe_sapphire/modules/message/images/bg_logOut.gif b/themes/xe_sapphire/modules/message/images/bg_logOut.gif
new file mode 100644
index 000000000..8d2cbd017
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/bg_logOut.gif differ
diff --git a/themes/xe_sapphire/modules/message/images/buttonAction.gif b/themes/xe_sapphire/modules/message/images/buttonAction.gif
new file mode 100644
index 000000000..9a7d0db2d
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/buttonAction.gif differ
diff --git a/themes/xe_sapphire/modules/message/images/openid_login_bg.gif b/themes/xe_sapphire/modules/message/images/openid_login_bg.gif
new file mode 100644
index 000000000..cde836c89
Binary files /dev/null and b/themes/xe_sapphire/modules/message/images/openid_login_bg.gif differ
diff --git a/themes/xe_sapphire/modules/message/message.css b/themes/xe_sapphire/modules/message/message.css
new file mode 100644
index 000000000..20a86842d
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/message.css
@@ -0,0 +1,40 @@
+@charset "utf-8";
+/* NHN | dece24@nhncorp.com */
+#loginAccess{ position:relative; width:333px; margin:30px auto;  font-size:12px; font-family:Tahoma; line-height:normal; background:url(./images/bg_gLogin.gif) no-repeat 0 0}
+#loginAccess form{ margin:0; padding:0;}
+#loginAccess fieldset{ border:0; margin:0; padding:0;}
+#loginAccess h1{font-size:12px; color:#3f4140; margin:0; font-weight:normal; padding:27px 0 18px 18px}
+#loginAccess ul{ margin:0; padding:0; list-style:none;}
+#loginAccess .mLogin{ display:none;}
+#loginAccess .idpw{ margin:0 41px 15px 36px;}
+#loginAccess .oid{ margin:0 28px 20px 28px;}
+#loginAccess .idpw li{ margin:0 0 5px 0;}
+#loginAccess .inputText{ font-size:12px; color:#c4c4c4; font-weight:bold; border:1px solid #c5c5c5}
+#loginAccess .idpw .inputText{ width:243px; padding:2px 0 2px 7px;}
+#loginAccess .oid .inputText{ width:252px; padding:8px 0 0 35px;}
+#loginAccess .inputCheck{ width:13px; height:13px; margin:0; padding:0; vertical-align:middle;}
+#loginAccess label{ vertical-align: middle; color:#3a3a3a}
+#loginAccess #warning{ display:none; margin:0 0 20px 0;}
+#loginAccess #warning.open{ display:block;}
+#loginAccess #warning p{ margin:0; color:#fafafa}
+#loginAccess .buttonArea{ position:relative; margin:0 50px 0 39px; padding:0; color:#767676; *zoom:1;}
+#loginAccess .buttonArea .keeping{ position:relative; margin:0 0 20px 0; height:32px; line-height:32px;}
+#loginAccess #gLogin .buttonArea .buttonAccount{ position:absolute; top:0; right:0;}
+#loginAccess #oLogin .buttonArea{ text-align:center; margin-bottom:20px;}
+#loginAccess .buttonAccount,
+#loginAccess .buttonAccount a,
+#loginAccess .buttonAccount input{ position:relative; display:inline-block; margin:0; padding:0; overflow:visible; height:32px; line-height:32px; font-size:12px; font-weight:bold; color:#ffffff; vertical-align:middle; cursor:pointer; border:0; text-decoration:none !important; background: url(./images/buttonAction.gif) no-repeat;font-family:Arial}
+#loginAccess .buttonAccount{ margin:0 4px 0 0; background-position:left top;}
+#loginAccess .buttonAccount a,
+#loginAccess .buttonAccount input{ left:14px; background-position:right top; *vertical-align:top; padding:0 30px 0 15px;}
+#loginAccess .help{ position:relative; padding:22px 0 44px 0;text-align:center; background:url(images/bg_help.gif) no-repeat}
+#loginAccess .help li{ display:inline; border-left:1px solid #ababab; padding:0 0 0 7px; margin:0 4px 0 0; line-height:1;}
+#loginAccess .help li.first{ border:0; padding:0;}
+#loginAccess .help a{ text-decoration:none; color:#828282;}
+#loginAccess .help a:hover,
+#loginAccess .help a:active,
+#loginAccess .help a:focus{ text-decoration:underline;}
+#loginAccess .logOut{ text-align:left;padding:0 0 20px 55px; background:url(images/line_logOut.gif) no-repeat 0 100%;}
+.gLogin #gLogin,
+.oLogin #oLogin{ display:block;}
+.logOut_h{padding:27px 0 23px 63px!important}
\ No newline at end of file
diff --git a/themes/xe_sapphire/modules/message/message.js b/themes/xe_sapphire/modules/message/message.js
new file mode 100644
index 000000000..8523b8ec3
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/message.js
@@ -0,0 +1,38 @@
+/* 로그인 후 */
+function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeMessageOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+function doLogin(o,filter){
+	jQuery('input.inputText',o).each(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
+	});
+	procFilter(o,filter);
+	initLoginTitleMsg();
+	return false;
+}
+
+
+function initLoginTitleMsg(){
+	jQuery('.gLogin, .mLogin').find('input.inputText').focus(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
+	}).blur(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.val()=='') t.val(t.attr('title'));
+	}).focus().blur();
+}
+
+jQuery(function(){
+	initLoginTitleMsg();
+});
+
+
diff --git a/themes/xe_sapphire/modules/message/skin.xml b/themes/xe_sapphire/modules/message/skin.xml
new file mode 100644
index 000000000..a5477f57f
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/skin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 그레이스톤 메세지(Message)모듈 스킨</title>
+    <title xml:lang="en">XE Greystone Message Skin</title>
+    <title xml:lang="zh-CN">XE灰石系信息皮肤</title>
+
+    <description xml:lang="ko">
+        그레이스톤 테마에 어울리는 메세지 모듈 스킨.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+        The XE greystone skin for message module. 
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+        XE 灰石系信息模块皮肤。
+        NHN (developers@xpressengine.com)
+    </description>
+  
+    <version>0.1</version>
+    <date>2011-09-26</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">default</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="zh-CN">默认</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/themes/xe_sapphire/modules/message/system_message.html b/themes/xe_sapphire/modules/message/system_message.html
new file mode 100644
index 000000000..44a0a54a1
--- /dev/null
+++ b/themes/xe_sapphire/modules/message/system_message.html
@@ -0,0 +1,65 @@
+<!--%import("message.css")-->
+
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+
+<div id="loginAccess" class="gLogin">
+	<!--@if(!$is_logged)--><h1>{$system_message}</h1><!--@else--><h1 class="logOut_h">{$system_message}</h1><!--@end-->
+	<!--@if(!$is_logged)-->
+    <!--%import("../../../../common/js/jquery.js")-->
+	<!--%import("./filter/login.xml")-->
+	<!--%import("./filter/openid_login.xml")-->
+	<!--%import("./message.js")-->
+	<div class="mLogin" id="gLogin">
+		<form action="./" method="post" ruleset="@login" id="gForm">
+			<input type="hidden" name="act" value="procMemberLogin" />
+			<fieldset>
+				<ul class="idpw">
+					<li><input type="text" name="user_id" id="uid" value="" class="inputText" title="{$lang->user_id}" /></li>
+					<li><input type="password" name="password" id="upw" value="" class="inputText" title="{$lang->password}" /></li>
+				</ul>
+				<div class="buttonArea">
+					<p class="keeping">
+						<input type="checkbox" name="keep_signed" id="keepid" class="inputCheck" value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />						
+						<label for="keepid">{$lang->keep_signed}</label>
+					</p>
+					<div id="warning" class="">
+						<p>{$lang->about_keep_warning}</p>
+					</div>
+					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
+				</div>
+			</fieldset>
+		</form>
+		<ul class="help">
+			<li class="first"><a href="{getUrl('','act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a></li>
+			<li><a href="{getUrl('','act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a></li>
+			<!--@if($member_config->enable_openid=='Y')-->
+			<li><a href="#oLogin" onclick="jQuery('#loginAccess').removeClass('gLogin'); jQuery('#loginAccess').addClass('oLogin'); return false;">Open ID</a></li>
+			<!--@end-->
+		</ul>
+	</div>
+	
+	<!-- OpenID -->
+	<!--@if($member_config->enable_openid=='Y')-->
+	<div class="mLogin" id="oLogin">
+		<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm">
+			<fieldset>
+					<div class="oid">
+						<input type="text" name="openid" class="inputText" title="Open ID" value="" />
+					</div>
+					<div class="buttonArea">
+					<span class="buttonAccount"><input type="submit" value="{$lang->cmd_login}" /></span>
+				</div>
+			</fieldset>
+		</form>
+		<div class="help"><a href="#gLogin" onclick="jQuery('#loginAccess').removeClass('oLogin'); jQuery('#loginAccess').addClass('gLogin'); return false;">{$lang->cmd_common_id}</a></div>
+	</div>
+	<!--@end-->
+	<!--@end-->
+	<!--@if($is_logged)-->
+	<div class="logOut">
+		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
+	</div>
+	<!--@end-->
+</div>
diff --git a/themes/xe_sapphire/modules/message/thumbnail.png b/themes/xe_sapphire/modules/message/thumbnail.png
new file mode 100644
index 000000000..6d5c105de
Binary files /dev/null and b/themes/xe_sapphire/modules/message/thumbnail.png differ
diff --git a/themes/xe_sapphire/thumbnail.png b/themes/xe_sapphire/thumbnail.png
new file mode 100644
index 000000000..e29e7529e
Binary files /dev/null and b/themes/xe_sapphire/thumbnail.png differ
diff --git a/themes/xe_solid_enterprise/conf/info.xml b/themes/xe_solid_enterprise/conf/info.xml
new file mode 100644
index 000000000..71bd7f931
--- /dev/null
+++ b/themes/xe_solid_enterprise/conf/info.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<theme>
+	<version>0.1</version>
+	<title xml:lang="ko">XE Solid Enterprise Theme</title>
+	<title xml:lang="en">XE Solid Enterprise Theme</title>
+	<title xml:lang="zh-CN">XE 标准企业主题</title>
+	<date>2011-09-26</date>
+	<publisher email_address="developers@xpressengine.com" link="http://www.xpressengine.com">
+		<name xml:lang="ko">NHN</name>
+		<name xml:lang="en">NHN</name>
+		<name xml:lang="zh-CN">NHN</name>
+	</publisher>
+	<description xml:lang="ko">XE 기본 기업용 테마는 심플하고 실용적인 특점을 살리고 있으며 어두운 파랑과 화이트가 사용되었습니다. 배너슬라이드 기능이 탑재되었으며 효율적으로 사용이 가능하며, 뚜렷한 정보제공에 치우치고 있습니다.</description>
+	<description xml:lang="en">THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents.</description>
+	<description xml:lang="zh-CN"> XE标准企业主题继承了XE网站简洁，实用的特点，色调以深蓝色和白色为主，提供显示广告栏功能，易于用户浏览，方便用户更快速的查找所需要的信息.</description>
+	<layout>
+			<directory path="./themes/xe_solid_enterprise/layouts/xe_solid_enterprise" />
+	</layout>
+	<skinInfos>
+		<skinInfo>
+			<directory path="./themes/xe_solid_enterprise/modules/communication" />
+		</skinInfo>
+		<skinInfo>
+			<directory path="./themes/xe_solid_enterprise/modules/member" />
+		</skinInfo>
+		<skinInfo>
+			<directory path="./themes/xe_solid_enterprise/modules/message" />
+		</skinInfo>
+	</skinInfos>
+</theme>
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/conf/info.xml b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/conf/info.xml
new file mode 100644
index 000000000..3c7cfae92
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/conf/info.xml
@@ -0,0 +1,312 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<layout version="0.2">
+    <title xml:lang="ko">XE 기업용 레이아웃</title>
+    <title xml:lang="jp">XE Solid Enterprise Layout</title>
+    <title xml:lang="en">XE Solid Enterprise Layout</title>
+    <title xml:lang="ge">XE Solid Enterprise Layout</title>
+    <title xml:lang="ru">XE Solid Enterprise Layout</title>
+    <title xml:lang="es">XE Solid Enterprise Layout</title>
+    <title xml:lang="zh-CN">XE标准企业布局</title>
+    <title xml:lang="zh-TW">XE Solid Enterprise Layout</title>
+    <title xml:lang="vi">XE Solid Enterprise Layout</title>
+    <title xml:lang="tr">XE Solid Enterprise Layout</title>
+    <description xml:lang="ko">
+        XE 기업용 레이아웃은 XE의 심플하고 실용적인 특점을 살리고 있으며 어두운 파랑과 화이트가 사용되었습니다. 배너슬라이드 기능이 탑재되었으며 효율적으로 사용이 가능하며, 뚜렷한 정보제공에 치우치고 있습니다.
+		제작: developers
+    </description>
+    <description xml:lang="jp">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+    <description xml:lang="en">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+    <description xml:lang="ge">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+    <description xml:lang="ru">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+    <description xml:lang="es">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+    <description xml:lang="zh-CN">
+        XE标准企业布局继承了XE网站简洁，实用的特点，色调以深蓝色和白色为主，提供显示广告栏功能，易于用户浏览，方便用户更快速的查找所需要的信息。
+        作者: developers
+    </description>
+    <description xml:lang="zh-TW">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+	<description xml:lang="vi">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>
+	<description xml:lang="tr">
+        THE XE Solid Enterprise Layout inherits the concise and functional style from other XE sites, it utilizes dark blue and white as the main color, provides a banner displaying function, make the enterprise user esay to read and search the site contents. 
+        Author : developers
+    </description>    
+    <version>1.0</version>
+    <date>2011-08-26</date>
+    <link>http://www.xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="ge">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+		<name xml:lang="vi">NHN</name>
+		<name xml:lang="tr">NHN</name>
+    </author>
+
+    <extra_vars>
+        <var name="colorset" type="select">
+            <title xml:lang="ko">컬러셋</title>
+            <title xml:lang="jp">カラーセット</title>
+            <title xml:lang="zh-CN">颜色</title>
+            <title xml:lang="zh-TW">顏色設定</title>
+            <title xml:lang="en">Colorset</title>
+            <title xml:lang="ge">Colorset</title>
+            <title xml:lang="ru">Colorset</title>
+            <title xml:lang="es">Set de colores</title>
+	   		<title xml:lang="vi">Màu sắc</title>
+	   		<title xml:lang="tr">Renk ayarı</title>
+            <description xml:lang="ko">원하시는 컬러셋을 선택해주세요.</description>
+            <description xml:lang="jp">希望するカラーセットを選択して下さい。</description>
+            <description xml:lang="zh-CN">请选择颜色。</description>
+            <description xml:lang="zh-TW">請選擇顏色。</description>
+            <description xml:lang="en">Please select a colorset you want.</description>
+            <description xml:lang="ge">Bitte wählen Sie ein colorset Sie wollen.</description>
+            <description xml:lang="ru">Выберите colorset хотите.</description>
+            <description xml:lang="es">Seleccione set de colores que desea.</description>
+	    <description xml:lang="vi">Hãy chọn màu sắc bạn muốn.</description>
+	    <description xml:lang="tr">Lütfen kullanmak istediğiniz renk ayarını seçiniz.</description>
+            <options value="default">
+                <title xml:lang="ko">기본</title>
+                <title xml:lang="jp">デフォルト</title>
+                <title xml:lang="en">Basic</title>
+                <title xml:lang="ge">Basic</title>
+                <title xml:lang="ru">Базовые</title>
+                <title xml:lang="es">Básico</title>
+                <title xml:lang="zh-CN">默认</title>
+                <title xml:lang="zh-TW">預設</title>
+				<title xml:lang="vi">Cơ bản</title>
+				<title xml:lang="tr">Temel</title>
+            </options>
+        </var>
+        <var name="logo_image" type="image">
+            <title xml:lang="ko">로고 이미지</title>
+            <title xml:lang="jp">ロゴイメージ</title>
+            <title xml:lang="zh-CN">LOGO图片</title>
+            <title xml:lang="zh-TW">Logo圖片</title>
+            <title xml:lang="en">Logo image</title>
+            <title xml:lang="ge">Logobildes</title>
+            <title xml:lang="ru">Изображения логотипа</title>
+            <title xml:lang="es">Imagen del logotipo</title>
+	    	<title xml:lang="vi">Hình Logo</title>
+            <title xml:lang="tr">Logo resmi</title>
+            <description xml:lang="ko">레이아웃의 상단에 표시될 로고 이미지를 입력하세요. (세로길이가 23px인 투명이미지가 가장 어울립니다)</description>
+            <description xml:lang="jp">レイアウトの上段に表示されるロゴイメージを入力して下さい。 (縦幅が23pxである透明イメージをお勧めします。。)</description>
+            <description xml:lang="zh-CN">请输入显示在布局顶部的LOGO图片(高度为23px的透明图片为适)。</description>
+            <description xml:lang="zh-TW">請輸入要顯示在版面上端的 Logo 圖片。(適當高度為23px的透明圖片。)</description>
+            <description xml:lang="en">Please input a logo image which will be displayed on the top of layout. (Transparent image with height of 23px is recommended.)</description>
+            <description xml:lang="ge">Bitte geben Sie ein Logo das Bild wird auf dem oberen Layout. (Transparent Bild mit einer Höhe von 23px wird empfohlen).</description>
+            <description xml:lang="ru">Введите логотип изображение, которое будет отображаться в верхней части формы. (Прозрачный изображение с высотой 23px рекомендуется.)</description>
+            <description xml:lang="es">Ingresar una imagen para logotipo. ( Se recomienda una imagen de fondo transparente con una altura de 23px.</description>
+	    	<description xml:lang="vi">Hãy chọn Logo hiển thị phía trên cùng của giao diện. (Đề nghị: Hình ảnh có nền trong suốt và kích thước 23px.)</description>
+            <description xml:lang="tr">Lütfen yerleşim düzeninin üst kısmında görüntülenecek bir resim girişi yapınız. (23px uzunluğunda net bir resim seçmeniz önerilir)</description>
+        </var>
+        <var name="logo_image_alt" type="text">
+            <title xml:lang="ko">로고 이미지 alt</title>
+            <title xml:lang="jp">ロゴイメージ alt</title>
+            <title xml:lang="zh-CN">LOGO图片 alt</title>
+            <title xml:lang="zh-TW">Logo圖片 alt</title>
+            <title xml:lang="en">Logo image alt</title>
+            <title xml:lang="ge">Logobildes alt</title>
+            <title xml:lang="ru">Изображения логотипа alt</title>
+            <title xml:lang="es">Imagen del logotipo alt</title>
+	    	<title xml:lang="vi">Hình Logo alt</title>
+            <title xml:lang="tr">Logo resmi alt</title>
+			<description xml:lang="ko">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="jp">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="zh-CN">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="zh-TW">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="en">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="ge">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="ru">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="es">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="vi">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+			<description xml:lang="tr">로고 이미지의 alt 텍스트. 로고 이미지를 표시하지 않는 경우 대체 텍스트를 표시합니다.</description>
+        </var>
+        <var name="index_url" type="text">
+            <title xml:lang="ko">홈 페이지 URL</title>
+            <title xml:lang="jp">ホームページURL</title>
+            <title xml:lang="zh-CN">主页地址</title>
+            <title xml:lang="zh-TW">主頁網址</title>
+            <title xml:lang="en">Homepage URL</title>
+            <title xml:lang="ge">Homepage URL</title>
+            <title xml:lang="ru">Домашняя страница URL</title>
+            <title xml:lang="es">URL de la página web</title>
+	    	<title xml:lang="vi">URL Trang chủ</title>
+	    	<title xml:lang="tr">Anasayfa URL'si</title>
+            <description xml:lang="ko">로고를 클릭시에 이동할 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="jp">ロゴをクリックした時に移動するホームページのURLを入力して下さい。</description>
+            <description xml:lang="zh-CN">点击网站LOGO时要移动的页面URL。</description>
+            <description xml:lang="zh-TW">請輸入當用戶按了網站 Logo 後，要前往的頁面網址。</description>
+            <description xml:lang="en">Please input the URL to redirect when user clicks the logo</description>
+            <description xml:lang="ge">Bitte geben Sie die URL umzuleiten, wenn Benutzer klickt das Logo</description>
+            <description xml:lang="ru">Пожалуйста, введите URL для перенаправления, когда пользователь нажимает логотип</description>
+            <description xml:lang="es">Ingresar el URL de la página web para redireccionar al pulsar el logotipo</description>
+	    	<description xml:lang="vi">Hãy nhập địa chỉ bạn muốn chuyển đến khi bấm vào Logo</description>
+            <description xml:lang="tr">Lütfen kullanıcılar resme tıkladıkları zaman yönlendirilecekleri bir URL giriniz.</description>
+        </var>
+        <var name="background_image" type="image">
+            <title xml:lang="ko">배경 이미지</title>
+            <title xml:lang="jp">背景イメージ</title>
+            <title xml:lang="zh-CN">背景图片</title>
+            <title xml:lang="zh-TW">背景圖片</title>
+            <title xml:lang="en">Background Image</title>
+            <title xml:lang="ge">Hintergrundbild</title>
+            <title xml:lang="ru">Фоновое изображение</title>
+            <title xml:lang="es">Imagen de fondo</title>
+	    	<title xml:lang="vi">Hình nền</title>
+	    	<title xml:lang="tr">Arkaplan Resmi</title>
+            <description xml:lang="ko">배경 이미지를 사용하시려면 등록해주세요.</description>
+            <description xml:lang="jp">背景イメージを使う場合は、登録して下さい。</description>
+            <description xml:lang="zh-CN">要想使用背景图片请在这里上传。</description>
+            <description xml:lang="zh-TW">請在這裡上傳想要使用的背景圖片。</description>
+            <description xml:lang="en">Please input if you want to use background image.</description>
+            <description xml:lang="ge">Bitte geben Sie, wenn Sie verwenden wollen Hintergrundbild.</description>
+            <description xml:lang="ru">Введите, если вы хотите использовать фоновое изображение.</description>
+            <description xml:lang="es">Ingresar imagen de fondo si desea usar.</description>
+	        <description xml:lang="vi">Hãy nhập hình nền nếu bạn muốn sử dụng.</description>
+	        <description xml:lang="tr">Eğer arkaplan resmi kullanmak istiyorsanız, lütfen resim girişi yapınız.</description>
+        </var>
+		<var name="use_banner" type="select" default="demo">
+			<title xml:lang="ko">배너 슬라이드 사용하기</title>
+			<title xml:lang="en">Use Banner</title>
+			<title xml:lang="zh-CN">使用广告牌</title>
+			<description xml:lang="ko">레이아웃에 배너를 보여주는 방법을 선택합니다.</description>
+            <description xml:lang="en">Decide to display a Banner on the layout or not.</description>
+            <description xml:lang="zh-CN">选择是否在布局上显示广告牌。</description>
+			<options value="demo">
+				<title xml:lang="ko">내장</title>
+				<title xml:lang="en">Demo</title>
+				<title xml:lang="zh-CN">默认</title>
+			</options>
+			<options value="custom">
+				<title xml:lang="ko">업로드</title>
+				<title xml:lang="en">Custom</title>
+				<title xml:lang="zh-CN">自定义</title>
+			</options>
+			<options value="no">
+				<title xml:lang="ko">사용하지 않음</title>
+				<title xml:lang="en">Non-display</title>
+				<title xml:lang="zh-CN">不显示</title>
+			</options>
+		</var>
+        <var name="banner_image_1" type="image">
+            <title xml:lang="ko">배너 이미지 #1</title>
+            <title xml:lang="en">Banner Image#1</title>
+            <title xml:lang="zh-CN">广告牌图片#1</title>
+            <description xml:lang="ko">첫번째 배너 이미지를 업로드해 주세요.(958px * 396px 이미지가 가장 어울립니다)</description>
+            <description xml:lang="en">Please upload the banner image #1 (width: 958px, height: 396px).</description>
+            <description xml:lang="zh-CN">请上传广告牌图片#1(图片大小958px * 396px为适)。</description>
+        </var>
+		<var name="url_image_1" type="text">
+            <title xml:lang="ko">이미지#1 링크</title>
+            <title xml:lang="en">URL Image#1</title>
+            <title xml:lang="zh-CN">图片#1链接</title>
+            <description xml:lang="ko">첫번째 이미지 링크를 클릭시에 이동할 (http://를 포함한) 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="en">Please input the URL for image #1 (start with http://).</description>
+            <description xml:lang="zh-CN">请输入图片#1的链接 (以http://开头)。</description>
+		</var>
+        <var name="banner_image_2" type="image">
+            <title xml:lang="ko">배너 이미지 #2</title>
+            <title xml:lang="en">Banner Image#2</title>
+            <title xml:lang="zh-CN">广告牌图片#2</title>
+            <description xml:lang="ko">두번째 배너 이미지를 업로드해 주세요.(958px * 396px 이미지가 가장 어울립니다)</description>
+            <description xml:lang="en">Please upload the banner image #2 (width: 958px, height: 396px).</description>
+            <description xml:lang="zh-CN">请上传广告牌图片#2(图片大小958px * 396px为适)。</description>
+        </var>
+		<var name="url_image_2" type="text">
+            <title xml:lang="ko">이미지#2 링크</title>
+            <title xml:lang="en">URL Image#2</title>
+            <title xml:lang="zh-CN">图片#2链接</title>
+            <description xml:lang="ko">두번째 이미지 링크를 클릭시에 이동할 (http://를 포함한) 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="en">Please input the URL for image #2 (start with http://).</description>
+            <description xml:lang="zh-CN">请输入图片#2的链接 (以http://开头)。</description>
+		</var>
+        <var name="banner_image_3" type="image">
+            <title xml:lang="ko">배너 이미지 #3</title>
+            <title xml:lang="en">Banner Image#3</title>
+            <title xml:lang="zh-CN">广告牌图片#3</title>
+            <description xml:lang="ko">세번째 배너 이미지를 업로드해 주세요.(958px * 396px 이미지가 가장 어울립니다)</description>
+            <description xml:lang="en">Please upload the banner image #3 (width: 958px, height: 396px).</description>
+            <description xml:lang="zh-CN">请上传广告牌图片#3(图片大小958px * 396px为适)。</description>
+        </var>
+		<var name="url_image_3" type="text">
+            <title xml:lang="ko">이미지#3 링크</title>
+            <title xml:lang="en">URL Image#3</title>
+            <title xml:lang="zh-CN">图片#3链接</title>
+            <description xml:lang="ko">세번째 이미지 링크를 클릭시에 이동할 (http://를 포함한) 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="en">Please input the URL for image #3 (start with http://).</description>
+            <description xml:lang="zh-CN">请输入图片#3的链接 (以http://开头)。</description>
+		</var>
+        <var name="banner_image_4" type="image">
+            <title xml:lang="ko">배너 이미지 #4</title>
+            <title xml:lang="en">Banner Image#4</title>
+            <title xml:lang="zh-CN">广告牌图片#4</title>
+            <description xml:lang="ko">네번째 배너 이미지를 업로드해 주세요.(958px * 396px 이미지가 가장 어울립니다)</description>
+            <description xml:lang="en">Please upload the banner image #4 (width: 958px, height: 396px).</description>
+            <description xml:lang="zh-CN">请上传广告牌图片#4(图片大小958px * 396px为适)。</description>
+        </var>
+		<var name="url_image_4" type="text">
+            <title xml:lang="ko">이미지#4 링크</title>
+            <title xml:lang="en">URL Image#4</title>
+            <title xml:lang="zh-CN">图片#4链接</title>
+            <description xml:lang="ko">네번째 이미지 링크를 클릭시에 이동할 (http://를 포함한) 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="en">Please input the URL for image #4 (start with http://).</description>
+            <description xml:lang="zh-CN">请输入图片#4的链接 (以http://开头)。</description>
+		</var>
+        <var name="banner_image_5" type="image">
+            <title xml:lang="ko">배너 이미지 #5</title>
+            <title xml:lang="en">Banner Image#5</title>
+            <title xml:lang="zh-CN">广告牌图片#5</title>
+            <description xml:lang="ko">다섯번째 배너 이미지를 업로드해 주세요.(958px * 396px 이미지가 가장 어울립니다)</description>
+            <description xml:lang="en">Please upload the banner image #5 (width: 958px, height: 396px).</description>
+            <description xml:lang="zh-CN">请上传广告牌图片#5(图片大小958px * 396px为适)。</description>
+        </var>
+		<var name="url_image_5" type="text">
+            <title xml:lang="ko">이미지#5 링크</title>
+            <title xml:lang="en">URL Image#5</title>
+            <title xml:lang="zh-CN">图片#5链接</title>
+            <description xml:lang="ko">다섯번째 이미지 링크를 클릭시에 이동할 (http://를 포함한) 홈 페이지 URL을 입력해 주세요.</description>
+            <description xml:lang="en">Please input the URL for image #5 (start with http://).</description>
+            <description xml:lang="zh-CN">请输入图片#5的链接 (以http://开头)。</description>
+		</var>
+    </extra_vars>
+
+    <menus>
+        <menu name="main_menu" maxdepth="2" default="true">
+            <title xml:lang="ko">상단 메뉴</title>
+            <title xml:lang="jp">上段用メニュー</title>
+            <title xml:lang="zh-CN">主菜单</title>
+            <title xml:lang="zh-TW">主選單</title>
+            <title xml:lang="en">Top menu</title>
+            <title xml:lang="ge">Top Menü</title>
+            <title xml:lang="ru">Верхнее меню</title>
+            <title xml:lang="es">Menú Principal</title>
+	    	<title xml:lang="vi">Menu trên</title>
+            <title xml:lang="tr">Ana Menü</title>
+        </menu>
+    </menus>
+</layout>
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/banner.css b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/banner.css
new file mode 100644
index 000000000..1a301a876
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/banner.css
@@ -0,0 +1,54 @@
+@charset "utf-8";
+.xeBanner { position:relative; z-index:100;}
+.xeBanner .section{ position:static; height:100%;width:100%; padding-top:1px; margin:0 !important; }
+.xeBanner.v1 #v1,
+.xeBanner.v2 #v2,
+.xeBanner.v3 #v3{ display:block;}
+.xeBanner #v1{ background-position:0 0;}
+/*.xeBanner #v2{ background-position:0 -347px;}
+.xeBanner #v3{ background-position:0 -694px;}*/
+.xeBanner .section h2,
+.xeBanner .section p{ position:relative; margin:0; z-index:-1; line-height:1.2;}
+.xeBanner .section a{ position:absolute; height:22px; top:160px; left:15px; font-size:11px; padding:0 8px; overflow:hidden; text-decoration:none;}
+.xeBanner .section a span{ position:relative; top:-22px;}
+
+ul.pagination				{width:75px;height:10px;margin:0 auto !important;text-align:center !important;}
+ul.pagination li 			{float:left;list-style:none;width:10px;height:10px;margin-right:5px;background:url(../images/slide_page_off.gif) no-repeat top left;}
+ul.pagination li.current	{background:url(../images/slide_page_on.gif) no-repeat top left;}
+ul.pagination a				{text-decoration:none;outline:none;ie-dummy: expression(this.hideFocus=true);}
+
+/* slide_widget */
+.slide_widget				{position:relative;}
+.slide_widget .mask			{position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden;}
+.slide_widget ul			{margin:0;}
+.slide_widget li			{float:left;list-style:none;}
+
+
+/* slide_widget */
+#slide_widget				{width:100%;height:446px; position:relative;background:url(../images/slide_box_bg.gif) repeat-x top left;}
+#slide_widget .mask			{width:958px;height:418px;position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden;}
+#slide_widget ul			{margin:0; padding:0;}
+#slide_widget li			{float:left;list-style:none;}
+ul.imgSet					{height:418px;position:absolute;left:width:100%;top:0;}
+.imgSet li					{width:958px;height:420px;float:left;}
+.imgSet div.item			{position:relative;z-index:50;}
+.imgSet li p				{position:absolute;x:0;y:0;z-index:20;margin:0;}
+.slides_container div.shadow		{position:absolute;left:0;margin-top:-105px;z-index:10;}
+.slides_container .section 	img{position:relative;z-index:50;}
+
+
+ul.paging					{width:75px;height:10px;margin:0 auto !important;text-align:center;}
+.paging	li					{width:10px;height:10px;margin-right:5px;}
+.paging li.on				{background:url(../images/slide_page_on.gif) no-repeat top left;}
+.paging li.off				{background:url(../images/slide_page_off.gif) no-repeat top left;}
+.paging	li span				{visibility:hidden;}
+.paging	a					{text-decoration:none;}
+
+#shadow						{left: 15px;margin-top: -105px;position: absolute;z-index: -10;}
+
+.slide_widget .mask			{width:958px !important;}
+#slides,.slides_container,.slides_container div {width:958px !important;height:431px !important;display:block;}
+
+.buttonBox					{z-index:201}
+.section div				{z-index:200}
+.slide_widget ul			{position:relative;bottom:18px;z-index:150;}
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/style.css b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/style.css
new file mode 100644
index 000000000..407a84146
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/css/style.css
@@ -0,0 +1,78 @@
+@charset "utf-8";
+/* CSS Document */
+
+body {font-size: 12px;font-family:sans-serif; margin: 0; padding: 0;}
+img{border:none;}
+.iePngFix {behavior:url(../js/iePngFix.htc)}
+/* head */
+#wrap						{width:100%;}
+#wrap .top					{width:100%;height:73px;z-index:300;background:url(../images/header_bg.gif) repeat-x top left;}
+#wrap .header				{width:960px;height:73px;margin:0 auto;position:relative; z-index:150;}
+.header .logo				{margin-top:15px;float:left;}
+.header ul					{margin:0;padding:0;}
+.header li					{list-style:none;}
+
+#wrap .main					{width:100%;z-index:200;}
+.main .container			{width:960px;position:relative;padding-top:50px;margin:0 auto 30px auto;_margin-bottom:50px;overflow:hidden;}
+#wrap .slide_banner			{width:100%;height:446px;background:url(../images/slide_box_bg.gif) repeat-x top left; padding-top:15px;}
+.container .search_box_layout		{position:absolute;top:10px;right:0px;}
+.search_box_layout .inputBox		{width:218px;height:29px;background:url(../images/search_box_bg.gif) no-repeat top left;}
+.search_box_layout .inputBox .inputTypeText	{width:175px;float:left;background:none;;outline:none;border:0 none;padding-left:10px;margin-top:3px;}
+.search_box_layout .inputBox .is_submit		{width:15px;height:14px;float:right;margin-top:6px;margin-right:10px;}
+
+
+/* GNB */
+.header .gnb				{position:absolute;top:36px; left:220px;z-index:300;}
+.gnb li.m1					{width:109px;height:35px;float:left;position:relative;}
+.gnb li.m_on				{background:url(../images/gnb_m1_on_n.gif) no-repeat top left;}
+
+.gnb a						{font-family:Arial, Helvetica, sans-serif;font-weight:bold;outline:none;ie-dummy: expression(this.hideFocus=true);}
+.gnb li.m1 a.m1_a			{color:#FFF;font-size:14px;line-height:14px;text-decoration:none;
+display:block;width:109px;height:35px;cursor:pointer;}
+
+.gnb li.m_on a.m1_a			{color:#0f0f0f !important;}
+.gnb li.m1 span.m1_span		{display:block;width:109px;height:25px;text-align:center;padding-top:10px;}
+.gnb .lnb					{margin:0;padding:1px 0 0 0;background:url(../images/lnb_bg.gif) no-repeat top left;}
+.gnb .sub					{width:106px;position:absolute;left:2px;z-index:1000; display:none;}
+.gnb .lnb .s1				{width:106px;height:32px;background: url(../images/lnb_bg.gif) no-repeat top left;}
+.gnb .lnb .s1 a				{width:106px;height:24px;padding-top:8px;font-size:12px;text-align:center;color:#5e5e60;display:block;font-weight:bold;text-decoration:none;}
+.gnb .lnb .s1 a:hover		{color:white;background:url(../images/lnb_bg_on.gif) no-repeat 1px 0;}
+.gnb .lnb .s1 a.a_on		{color:white;background:url(../images/lnb_bg_on.gif) no-repeat 1px 0;}
+.gnb .bottom			{width:106px;height:3px;background:url(../images/lnb_bg.gif) no-repeat bottom left;}
+.gnb .bottom span			{width:0;height:0;background:#000;}
+
+
+
+/* slide_widget */
+#slide_widget				{width:100%;height:446px; position:relative;background:url(../images/slide_box_bg.gif) repeat-x top left;}
+#slide_widget .mask			{width:958px;height:446px;position:relative;z-index:80;margin:0 auto;padding:0;overflow:hidden;}
+#slide_widget ul			{margin:0; padding:0;}
+#slide_widget li			{float:left;list-style:none;}
+ul.imgSet					{height:418px;position:absolute;left:width:100%;top:0;}
+.imgSet li					{width:958px;height:420px;float:left;}
+.imgSet div.item			{position:relative;z-index:50;}
+.imgSet li p				{position:absolute;x:0;y:0;z-index:20;margin:0;}
+.imgSet li div.shadow		{position:absolute;left:15px;top:323px;z-index:10;}
+
+ul.paging					{width:75px;height:10px;margin:0 auto !important;text-align:center;}
+.paging	li					{width:10px;height:10px;margin-right:5px;}
+.paging li.on 				{background:url(../images/slide_page_on.gif) no-repeat top left;}
+.paging li.off				{background:url(../images/slide_page_off.gif) no-repeat top left;}
+.paging	li span				{visibility:hidden;}
+.paging	a					{text-decoration:none;}
+
+
+
+.footer						{width:960px;margin:0 auto;border-top:#dbdbdb solid 1px;position:relative;font-family:Tahoma, Geneva, sans-serif; }
+.footer .footer_p			{color:#9fa09f;margin:12px auto;}
+
+#selectLang					{position:absolute;top:-1px;right:0;margin:0;}
+#selectLang dt				{float:left;padding:4px 11px 0 0;font-family:"Times New Roman", Times, serif;font-size:12px;color:#aaabad;}
+#selectLang dd				{float:left;margin:0;}
+#selectLang .langBtn		{width:61px;height:20px; cursor:pointer;padding-top:7px;padding-left:7px;color:#5a5a5a;text-decoration:none;font-size:11px;line-height:11px;background:url(../images/btn_language.gif) no-repeat top left;}
+#selectLang .langSet		{display:none;width:68px;padding:3px 0 0 0;margin:0;position:absolute;bottom:27px;_bottom:26px;z-index:500;background:url(../images/language_ul_top.png) no-repeat top left;}
+#selectLang ul li			{list-style:none;border-right:#bdbaba solid 1px;border-left:#bdbaba solid 1px; background:#f0f0f0;}
+#selectLang ul li a			{height:12px;padding:6px 0 6px 7px;display:block;}
+#selectLang li.on			{border:#c3c3c3 solid 1px;background:#d7d7d7;}
+#selectLang li.on a			{height:12px;padding:5px 0 5px 7px;}
+#selectLang li a			{color:#5a5a5a;text-decoration:none;font-size:11px;line-height:11px;vertical-align:text-top;}
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/Thumbs.db b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/Thumbs.db
new file mode 100644
index 000000000..ebd67e3da
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/Thumbs.db differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/back_slide_img_1.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/back_slide_img_1.jpg
new file mode 100644
index 000000000..055882360
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/back_slide_img_1.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_language.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_language.gif
new file mode 100644
index 000000000..6f22116b6
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_language.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_signin.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_signin.gif
new file mode 100644
index 000000000..046f4b447
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_signin.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_signout.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_signout.gif
new file mode 100644
index 000000000..96e5e72dd
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/btn_signout.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg1.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg1.jpg
new file mode 100644
index 000000000..5ffd66b51
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg1.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg2.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg2.jpg
new file mode 100644
index 000000000..48cff6513
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg2.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg3.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg3.jpg
new file mode 100644
index 000000000..a84daa19a
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg3.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg4.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg4.jpg
new file mode 100644
index 000000000..64fcb3449
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg4.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg5.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg5.jpg
new file mode 100644
index 000000000..36522c213
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg5.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/gnb_m1_on.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/gnb_m1_on.gif
new file mode 100644
index 000000000..40a4d11cd
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/gnb_m1_on.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/gnb_m1_on_n.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/gnb_m1_on_n.gif
new file mode 100644
index 000000000..e4842b81e
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/gnb_m1_on_n.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/header_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/header_bg.gif
new file mode 100644
index 000000000..009c6d1f3
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/header_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_add.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_add.gif
new file mode 100644
index 000000000..42520c97f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_add.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_article.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_article.gif
new file mode 100644
index 000000000..023b63d2f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_article.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_at.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_at.gif
new file mode 100644
index 000000000..9e8a96f8a
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_at.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_book.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_book.gif
new file mode 100644
index 000000000..9f5a8708b
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_book.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_check.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_check.gif
new file mode 100644
index 000000000..7973f929d
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_check.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_friends.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_friends.gif
new file mode 100644
index 000000000..7fae3300a
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_friends.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_graph.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_graph.gif
new file mode 100644
index 000000000..fb4202dcc
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_graph.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_help.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_help.gif
new file mode 100644
index 000000000..4f9903d1f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_help.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_mbinfo.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_mbinfo.gif
new file mode 100644
index 000000000..17b71fd1b
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_mbinfo.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_message.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_message.gif
new file mode 100644
index 000000000..1e7897dea
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_message.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_money.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_money.gif
new file mode 100644
index 000000000..ac400c442
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_money.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_note.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_note.gif
new file mode 100644
index 000000000..2f45c58c0
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_note.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_search.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_search.gif
new file mode 100644
index 000000000..7e5645242
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_search.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_tool.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_tool.gif
new file mode 100644
index 000000000..8c1835d22
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_tool.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_write.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_write.gif
new file mode 100644
index 000000000..03afbfc70
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_write.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_written.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_written.gif
new file mode 100644
index 000000000..6e5fba5da
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/icon_written.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lang_vr.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lang_vr.gif
new file mode 100644
index 000000000..9fc88beb9
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lang_vr.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/language_ul_top.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/language_ul_top.gif
new file mode 100644
index 000000000..08b65a258
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/language_ul_top.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/language_ul_top.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/language_ul_top.png
new file mode 100644
index 000000000..337e72c3c
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/language_ul_top.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg.gif
new file mode 100644
index 000000000..bcf40c8b9
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg.png
new file mode 100644
index 000000000..9b94fb114
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg_on.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg_on.gif
new file mode 100644
index 000000000..5596a6667
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/lnb_bg_on.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/loading.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/loading.gif
new file mode 100644
index 000000000..cccb0fc9f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/loading.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/logo.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/logo.png
new file mode 100644
index 000000000..18936d32c
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/logo.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_bg_tail.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_bg_tail.png
new file mode 100644
index 000000000..cd80e9a86
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_bg_tail.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_bg_tt.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_bg_tt.gif
new file mode 100644
index 000000000..42311c84f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_bg_tt.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_body_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_body_bg.gif
new file mode 100644
index 000000000..b1c9e6478
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/minfo_body_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/search_box_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/search_box_bg.gif
new file mode 100644
index 000000000..d1b37598f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/search_box_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tail.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tail.png
new file mode 100644
index 000000000..eb65ce349
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tail.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tt.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tt.gif
new file mode 100644
index 000000000..c42aab119
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tt.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tt.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tt.png
new file mode 100644
index 000000000..859dfab7d
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_bg_tt.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_body_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_body_bg.gif
new file mode 100644
index 000000000..052afedac
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_body_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_input.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_input.gif
new file mode 100644
index 000000000..77ac26511
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_input.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_key_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_key_bg.gif
new file mode 100644
index 000000000..941b1ce56
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_key_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_win_hr.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_win_hr.gif
new file mode 100644
index 000000000..1f852123b
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/signin_win_hr.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_box_bg.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_box_bg.gif
new file mode 100644
index 000000000..fd45af5ba
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_box_bg.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_1.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_1.jpg
new file mode 100644
index 000000000..60bb6524f
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_1.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_2.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_2.jpg
new file mode 100644
index 000000000..9965cc3e5
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_2.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_3.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_3.jpg
new file mode 100644
index 000000000..c950f531a
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_3.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_4.jpg b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_4.jpg
new file mode 100644
index 000000000..c953e67eb
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_img_4.jpg differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_page_off.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_page_off.gif
new file mode 100644
index 000000000..e6ab95a54
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_page_off.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_page_on.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_page_on.gif
new file mode 100644
index 000000000..446508e85
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_page_on.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_shadow.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_shadow.png
new file mode 100644
index 000000000..865d5c26b
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/slide_shadow.png differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/blank.gif b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/blank.gif differ
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/iePngFix.htc b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/iePngFix.htc
new file mode 100644
index 000000000..69c77e50c
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/iePngFix.htc
@@ -0,0 +1,187 @@
+<public:component>
+<script type="text/javascript">
+
+// IE5.5+ PNG Alpha Fix v2.0 Alpha
+// (c) 2004-2008 Angus Turnbull http://www.twinhelix.com
+
+// This is licensed under the GNU LGPL, version 2.1 or later.
+// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
+
+var IEPNGFix = window.IEPNGFix || {};
+IEPNGFix.data = IEPNGFix.data || {};
+
+
+// This must be a path to a blank image, relative to the HTML document(s).
+// In production use I suggest '/images/blank.gif' or similar. That's all!
+IEPNGFix.blankImg = 'layouts/xe_solid_enterprise/js/blank.gif';
+
+
+IEPNGFix.fix = function(elm, src, t) {
+	// Applies an image 'src' to an element 'elm' using the DirectX filter.
+	// If 'src' is null, filter is disabled.
+	// Disables the 'hook' to prevent infinite recursion on setting BG/src.
+	// 't' = type, where background tile = 0, background = 1, IMG SRC = 2.
+
+	var h = this.hook.enabled;
+	this.hook.enabled = 0;
+
+	var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
+		src = (src || '').replace(/\(/g, '%28').replace(/\)/g, '%29');
+
+	if (
+		src && !(/IMG|INPUT/.test(elm.nodeName) && (t != 2)) &&
+		elm.currentStyle.width == 'auto' && elm.currentStyle.height == 'auto'
+	) {
+		elm.style.width = elm.offsetWidth + 'px';
+		elm.style.height = elm.clientHeight + 'px';
+		if (elm.currentStyle.display == 'inline') {
+			elm.style.display = 'inline-block';
+		}
+	}
+
+	if (t == 1) {
+		elm.style.backgroundImage = 'url("' + this.blankImg + '")';
+	}
+	if (t == 2) {
+		elm.src = this.blankImg;
+	}
+
+	if (elm.filters[f]) {
+		elm.filters[f].enabled = src ? true : false;
+		if (src) {
+			elm.filters[f].src = src;
+		}
+	} else if (src) {
+		elm.style.filter = 'progid:' + f + '(src="' + src +
+			'",sizingMethod="' + (t == 2 ? 'scale' : 'crop') + '")';
+	}
+
+	this.hook.enabled = h;
+};
+
+
+IEPNGFix.process = function(elm, init) {
+	// Checks the onpropertychange event (on first 'init' run, a fake event)
+	// and calls the filter-applying-functions.
+
+	if (
+		!/MSIE (5\.5|6)/.test(navigator.userAgent) ||
+		typeof elm.filters == 'unknown'
+	) {
+		return;
+	}
+	if (!this.data[elm.uniqueID]) {
+		this.data[elm.uniqueID] = {
+			className: ''
+		};
+	}
+	var data = this.data[elm.uniqueID],
+		evt = init ? { propertyName: 'src,backgroundImage' } : event,
+		isSrc = /src/.test(evt.propertyName),
+		isBg = /backgroundImage/.test(evt.propertyName),
+		isPos = /width|height|background(Pos|Rep)/.test(evt.propertyName),
+		isClass = !init && ((elm.className != data.className) &&
+			(elm.className || data.className));
+	if (!(isSrc || isBg || isPos || isClass)) {
+		return;
+	}
+	data.className = elm.className;
+	var blank = this.blankImg.match(/([^\/]+)$/)[1],
+		eS = elm.style,
+		eCS = elm.currentStyle;
+
+	// Required for Whatever:hover - erase set BG if className changes.
+	if (
+		isClass && (eS.backgroundImage.indexOf('url(') == -1 ||
+		eS.backgroundImage.indexOf(blank) > -1)
+	) {
+		return setTimeout(function() {
+			eS.backgroundImage = '';
+		}, 0);
+	}
+
+	// Foregrounds.
+	if (isSrc && elm.src &&  { IMG: 1, INPUT: 1 }[elm.nodeName]) {
+		if ((/\.png/i).test(elm.src)) {
+			this.fix(elm, elm.src, 2);
+		} else if (elm.src.indexOf(blank) == -1) {
+			this.fix(elm, '');
+		}
+	}
+
+	// Backgrounds.
+	var bgSrc = eCS.backgroundImage || eS.backgroundImage;
+	if ((bgSrc + elm.src).indexOf(blank) == -1) {
+		var bgPNG = bgSrc.match(/url[("']+(.*\.png[^\)"']*)[\)"']/i);
+		if (bgPNG) {
+			if (this.tileBG && !{ IMG: 1, INPUT: 1 }[elm.nodeName]) {
+				this.tileBG(elm, bgPNG[1]);
+				this.fix(elm, '', 1);
+			} else {
+				if (data.tiles && data.tiles.src) {
+					this.tileBG(elm, '');
+				}
+				this.fix(elm, bgPNG[1], 1);
+				this.childFix(elm);
+			}
+		} else {
+			if (data.tiles && data.tiles.src) {
+				this.tileBG(elm, '');
+			}
+			this.fix(elm, '');
+		}
+	} else if ((isPos || isClass) && data.tiles && data.tiles.src) {
+		this.tileBG(elm, data.tiles.src);
+	}
+
+	if (init) {
+		this.hook.enabled = 1;
+		elm.attachEvent('onpropertychange', this.hook);
+	}
+};
+
+
+IEPNGFix.childFix = function(elm) {
+	// "hasLayout" fix for unclickable children inside PNG backgrounds.
+	var tags = [
+			'a',
+			'input',
+			'select',
+			'textarea',
+			'button',
+			'iframe',
+			'object'
+		],
+		t = tags.length,
+		tFix = [];
+	while (t--) {
+		var pFix = elm.all.tags(tags[t]),
+			e = pFix.length;
+		while (e--) {
+			tFix.push(pFix[e]);
+		}
+	}
+	t = tFix.length;
+	if (t && (/relative|absolute/i).test(elm.currentStyle.position)) {
+		alert('IEPNGFix: Unclickable children of element:' +
+			'\n\n<' + elm.nodeName + (elm.id && ' id=' + elm.id) + '>');
+	}
+	while (t--) {
+		if (!(/relative|absolute/i).test(tFix[t].currentStyle.position)) {
+			tFix[t].style.position = 'relative';
+		}
+	}
+};
+
+
+IEPNGFix.hook = function() {
+	if (IEPNGFix.hook.enabled) {
+		IEPNGFix.process(element, 0);
+	}
+};
+
+
+IEPNGFix.process(element, 1);
+
+</script>
+</public:component>
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/jquery.min.js b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/jquery.min.js
new file mode 100644
index 000000000..6437874c6
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/jquery.min.js
@@ -0,0 +1,16 @@
+/*!
+ * jQuery JavaScript Library v1.5.1
+ * http://jquery.com/
+ *
+ * Copyright 2011, John Resig
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * Includes Sizzle.js
+ * http://sizzlejs.com/
+ * Copyright 2011, The Dojo Foundation
+ * Released under the MIT, BSD, and GPL Licenses.
+ *
+ * Date: Wed Feb 23 13:55:29 2011 -0500
+ */
+(function(a,b){function cg(a){return d.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}function cd(a){if(!bZ[a]){var b=d("<"+a+">").appendTo("body"),c=b.css("display");b.remove();if(c==="none"||c==="")c="block";bZ[a]=c}return bZ[a]}function cc(a,b){var c={};d.each(cb.concat.apply([],cb.slice(0,b)),function(){c[this]=a});return c}function bY(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function bX(){try{return new a.XMLHttpRequest}catch(b){}}function bW(){d(a).unload(function(){for(var a in bU)bU[a](0,1)})}function bQ(a,c){a.dataFilter&&(c=a.dataFilter(c,a.dataType));var e=a.dataTypes,f={},g,h,i=e.length,j,k=e[0],l,m,n,o,p;for(g=1;g<i;g++){if(g===1)for(h in a.converters)typeof h==="string"&&(f[h.toLowerCase()]=a.converters[h]);l=k,k=e[g];if(k==="*")k=l;else if(l!=="*"&&l!==k){m=l+" "+k,n=f[m]||f["* "+k];if(!n){p=b;for(o in f){j=o.split(" ");if(j[0]===l||j[0]==="*"){p=f[j[1]+" "+k];if(p){o=f[o],o===!0?n=p:p===!0&&(n=o);break}}}}!n&&!p&&d.error("No conversion from "+m.replace(" "," to ")),n!==!0&&(c=n?n(c):p(o(c)))}}return c}function bP(a,c,d){var e=a.contents,f=a.dataTypes,g=a.responseFields,h,i,j,k;for(i in g)i in d&&(c[g[i]]=d[i]);while(f[0]==="*")f.shift(),h===b&&(h=a.mimeType||c.getResponseHeader("content-type"));if(h)for(i in e)if(e[i]&&e[i].test(h)){f.unshift(i);break}if(f[0]in d)j=f[0];else{for(i in d){if(!f[0]||a.converters[i+" "+f[0]]){j=i;break}k||(k=i)}j=j||k}if(j){j!==f[0]&&f.unshift(j);return d[j]}}function bO(a,b,c,e){if(d.isArray(b)&&b.length)d.each(b,function(b,f){c||bq.test(a)?e(a,f):bO(a+"["+(typeof f==="object"||d.isArray(f)?b:"")+"]",f,c,e)});else if(c||b==null||typeof b!=="object")e(a,b);else if(d.isArray(b)||d.isEmptyObject(b))e(a,"");else for(var f in b)bO(a+"["+f+"]",b[f],c,e)}function bN(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h=a[f],i=0,j=h?h.length:0,k=a===bH,l;for(;i<j&&(k||!l);i++)l=h[i](c,d,e),typeof l==="string"&&(!k||g[l]?l=b:(c.dataTypes.unshift(l),l=bN(a,c,d,e,l,g)));(k||!l)&&!g["*"]&&(l=bN(a,c,d,e,"*",g));return l}function bM(a){return function(b,c){typeof b!=="string"&&(c=b,b="*");if(d.isFunction(c)){var e=b.toLowerCase().split(bB),f=0,g=e.length,h,i,j;for(;f<g;f++)h=e[f],j=/^\+/.test(h),j&&(h=h.substr(1)||"*"),i=a[h]=a[h]||[],i[j?"unshift":"push"](c)}}}function bo(a,b,c){var e=b==="width"?bi:bj,f=b==="width"?a.offsetWidth:a.offsetHeight;if(c==="border")return f;d.each(e,function(){c||(f-=parseFloat(d.css(a,"padding"+this))||0),c==="margin"?f+=parseFloat(d.css(a,"margin"+this))||0:f-=parseFloat(d.css(a,"border"+this+"Width"))||0});return f}function ba(a,b){b.src?d.ajax({url:b.src,async:!1,dataType:"script"}):d.globalEval(b.text||b.textContent||b.innerHTML||""),b.parentNode&&b.parentNode.removeChild(b)}function _(a){return"getElementsByTagName"in a?a.getElementsByTagName("*"):"querySelectorAll"in a?a.querySelectorAll("*"):[]}function $(a,b){if(b.nodeType===1){var c=b.nodeName.toLowerCase();b.clearAttributes(),b.mergeAttributes(a);if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(d.expando)}}function Z(a,b){if(b.nodeType===1&&d.hasData(a)){var c=d.expando,e=d.data(a),f=d.data(b,e);if(e=e[c]){var g=e.events;f=f[c]=d.extend({},e);if(g){delete f.handle,f.events={};for(var h in g)for(var i=0,j=g[h].length;i<j;i++)d.event.add(b,h+(g[h][i].namespace?".":"")+g[h][i].namespace,g[h][i],g[h][i].data)}}}}function Y(a,b){return d.nodeName(a,"table")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function O(a,b,c){if(d.isFunction(b))return d.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return d.grep(a,function(a,d){return a===b===c});if(typeof b==="string"){var e=d.grep(a,function(a){return a.nodeType===1});if(J.test(b))return d.filter(b,e,!c);b=d.filter(b,e)}return d.grep(a,function(a,e){return d.inArray(a,b)>=0===c})}function N(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function F(a,b){return(a&&a!=="*"?a+".":"")+b.replace(r,"`").replace(s,"&")}function E(a){var b,c,e,f,g,h,i,j,k,l,m,n,o,q=[],r=[],s=d._data(this,"events");if(a.liveFired!==this&&s&&s.live&&!a.target.disabled&&(!a.button||a.type!=="click")){a.namespace&&(n=new RegExp("(^|\\.)"+a.namespace.split(".").join("\\.(?:.*\\.)?")+"(\\.|$)")),a.liveFired=this;var t=s.live.slice(0);for(i=0;i<t.length;i++)g=t[i],g.origType.replace(p,"")===a.type?r.push(g.selector):t.splice(i--,1);f=d(a.target).closest(r,a.currentTarget);for(j=0,k=f.length;j<k;j++){m=f[j];for(i=0;i<t.length;i++){g=t[i];if(m.selector===g.selector&&(!n||n.test(g.namespace))&&!m.elem.disabled){h=m.elem,e=null;if(g.preType==="mouseenter"||g.preType==="mouseleave")a.type=g.preType,e=d(a.relatedTarget).closest(g.selector)[0];(!e||e!==h)&&q.push({elem:h,handleObj:g,level:m.level})}}}for(j=0,k=q.length;j<k;j++){f=q[j];if(c&&f.level>c)break;a.currentTarget=f.elem,a.data=f.handleObj.data,a.handleObj=f.handleObj,o=f.handleObj.origHandler.apply(f.elem,arguments);if(o===!1||a.isPropagationStopped()){c=f.level,o===!1&&(b=!1);if(a.isImmediatePropagationStopped())break}}return b}}function C(a,c,e){var f=d.extend({},e[0]);f.type=a,f.originalEvent={},f.liveFired=b,d.event.handle.call(c,f),f.isDefaultPrevented()&&e[0].preventDefault()}function w(){return!0}function v(){return!1}function g(a){for(var b in a)if(b!=="toJSON")return!1;return!0}function f(a,c,f){if(f===b&&a.nodeType===1){f=a.getAttribute("data-"+c);if(typeof f==="string"){try{f=f==="true"?!0:f==="false"?!1:f==="null"?null:d.isNaN(f)?e.test(f)?d.parseJSON(f):f:parseFloat(f)}catch(g){}d.data(a,c,f)}else f=b}return f}var c=a.document,d=function(){function I(){if(!d.isReady){try{c.documentElement.doScroll("left")}catch(a){setTimeout(I,1);return}d.ready()}}var d=function(a,b){return new d.fn.init(a,b,g)},e=a.jQuery,f=a.$,g,h=/^(?:[^<]*(<[\w\W]+>)[^>]*$|#([\w\-]+)$)/,i=/\S/,j=/^\s+/,k=/\s+$/,l=/\d/,m=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,n=/^[\],:{}\s]*$/,o=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,p=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,q=/(?:^|:|,)(?:\s*\[)+/g,r=/(webkit)[ \/]([\w.]+)/,s=/(opera)(?:.*version)?[ \/]([\w.]+)/,t=/(msie) ([\w.]+)/,u=/(mozilla)(?:.*? rv:([\w.]+))?/,v=navigator.userAgent,w,x=!1,y,z="then done fail isResolved isRejected promise".split(" "),A,B=Object.prototype.toString,C=Object.prototype.hasOwnProperty,D=Array.prototype.push,E=Array.prototype.slice,F=String.prototype.trim,G=Array.prototype.indexOf,H={};d.fn=d.prototype={constructor:d,init:function(a,e,f){var g,i,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!e&&c.body){this.context=c,this[0]=c.body,this.selector="body",this.length=1;return this}if(typeof a==="string"){g=h.exec(a);if(!g||!g[1]&&e)return!e||e.jquery?(e||f).find(a):this.constructor(e).find(a);if(g[1]){e=e instanceof d?e[0]:e,k=e?e.ownerDocument||e:c,j=m.exec(a),j?d.isPlainObject(e)?(a=[c.createElement(j[1])],d.fn.attr.call(a,e,!0)):a=[k.createElement(j[1])]:(j=d.buildFragment([g[1]],[k]),a=(j.cacheable?d.clone(j.fragment):j.fragment).childNodes);return d.merge(this,a)}i=c.getElementById(g[2]);if(i&&i.parentNode){if(i.id!==g[2])return f.find(a);this.length=1,this[0]=i}this.context=c,this.selector=a;return this}if(d.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return d.makeArray(a,this)},selector:"",jquery:"1.5.1",length:0,size:function(){return this.length},toArray:function(){return E.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var e=this.constructor();d.isArray(a)?D.apply(e,a):d.merge(e,a),e.prevObject=this,e.context=this.context,b==="find"?e.selector=this.selector+(this.selector?" ":"")+c:b&&(e.selector=this.selector+"."+b+"("+c+")");return e},each:function(a,b){return d.each(this,a,b)},ready:function(a){d.bindReady(),y.done(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(E.apply(this,arguments),"slice",E.call(arguments).join(","))},map:function(a){return this.pushStack(d.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:D,sort:[].sort,splice:[].splice},d.fn.init.prototype=d.fn,d.extend=d.fn.extend=function(){var a,c,e,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i==="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!=="object"&&!d.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j<k;j++)if((a=arguments[j])!=null)for(c in a){e=i[c],f=a[c];if(i===f)continue;l&&f&&(d.isPlainObject(f)||(g=d.isArray(f)))?(g?(g=!1,h=e&&d.isArray(e)?e:[]):h=e&&d.isPlainObject(e)?e:{},i[c]=d.extend(l,h,f)):f!==b&&(i[c]=f)}return i},d.extend({noConflict:function(b){a.$=f,b&&(a.jQuery=e);return d},isReady:!1,readyWait:1,ready:function(a){a===!0&&d.readyWait--;if(!d.readyWait||a!==!0&&!d.isReady){if(!c.body)return setTimeout(d.ready,1);d.isReady=!0;if(a!==!0&&--d.readyWait>0)return;y.resolveWith(c,[d]),d.fn.trigger&&d(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!x){x=!0;if(c.readyState==="complete")return setTimeout(d.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",A,!1),a.addEventListener("load",d.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",A),a.attachEvent("onload",d.ready);var b=!1;try{b=a.frameElement==null}catch(e){}c.documentElement.doScroll&&b&&I()}}},isFunction:function(a){return d.type(a)==="function"},isArray:Array.isArray||function(a){return d.type(a)==="array"},isWindow:function(a){return a&&typeof a==="object"&&"setInterval"in a},isNaN:function(a){return a==null||!l.test(a)||isNaN(a)},type:function(a){return a==null?String(a):H[B.call(a)]||"object"},isPlainObject:function(a){if(!a||d.type(a)!=="object"||a.nodeType||d.isWindow(a))return!1;if(a.constructor&&!C.call(a,"constructor")&&!C.call(a.constructor.prototype,"isPrototypeOf"))return!1;var c;for(c in a){}return c===b||C.call(a,c)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!=="string"||!b)return null;b=d.trim(b);if(n.test(b.replace(o,"@").replace(p,"]").replace(q,"")))return a.JSON&&a.JSON.parse?a.JSON.parse(b):(new Function("return "+b))();d.error("Invalid JSON: "+b)},parseXML:function(b,c,e){a.DOMParser?(e=new DOMParser,c=e.parseFromString(b,"text/xml")):(c=new ActiveXObject("Microsoft.XMLDOM"),c.async="false",c.loadXML(b)),e=c.documentElement,(!e||!e.nodeName||e.nodeName==="parsererror")&&d.error("Invalid XML: "+b);return c},noop:function(){},globalEval:function(a){if(a&&i.test(a)){var b=c.head||c.getElementsByTagName("head")[0]||c.documentElement,e=c.createElement("script");d.support.scriptEval()?e.appendChild(c.createTextNode(a)):e.text=a,b.insertBefore(e,b.firstChild),b.removeChild(e)}},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,e){var f,g=0,h=a.length,i=h===b||d.isFunction(a);if(e){if(i){for(f in a)if(c.apply(a[f],e)===!1)break}else for(;g<h;)if(c.apply(a[g++],e)===!1)break}else if(i){for(f in a)if(c.call(a[f],f,a[f])===!1)break}else for(var j=a[0];g<h&&c.call(j,g,j)!==!1;j=a[++g]){}return a},trim:F?function(a){return a==null?"":F.call(a)}:function(a){return a==null?"":(a+"").replace(j,"").replace(k,"")},makeArray:function(a,b){var c=b||[];if(a!=null){var e=d.type(a);a.length==null||e==="string"||e==="function"||e==="regexp"||d.isWindow(a)?D.call(c,a):d.merge(c,a)}return c},inArray:function(a,b){if(b.indexOf)return b.indexOf(a);for(var c=0,d=b.length;c<d;c++)if(b[c]===a)return c;return-1},merge:function(a,c){var d=a.length,e=0;if(typeof c.length==="number")for(var f=c.length;e<f;e++)a[d++]=c[e];else while(c[e]!==b)a[d++]=c[e++];a.length=d;return a},grep:function(a,b,c){var d=[],e;c=!!c;for(var f=0,g=a.length;f<g;f++)e=!!b(a[f],f),c!==e&&d.push(a[f]);return d},map:function(a,b,c){var d=[],e;for(var f=0,g=a.length;f<g;f++)e=b(a[f],f,c),e!=null&&(d[d.length]=e);return d.concat.apply([],d)},guid:1,proxy:function(a,c,e){arguments.length===2&&(typeof c==="string"?(e=a,a=e[c],c=b):c&&!d.isFunction(c)&&(e=c,c=b)),!c&&a&&(c=function(){return a.apply(e||this,arguments)}),a&&(c.guid=a.guid=a.guid||c.guid||d.guid++);return c},access:function(a,c,e,f,g,h){var i=a.length;if(typeof c==="object"){for(var j in c)d.access(a,j,c[j],f,g,e);return a}if(e!==b){f=!h&&f&&d.isFunction(e);for(var k=0;k<i;k++)g(a[k],c,f?e.call(a[k],k,g(a[k],c)):e,h);return a}return i?g(a[0],c):b},now:function(){return(new Date).getTime()},_Deferred:function(){var a=[],b,c,e,f={done:function(){if(!e){var c=arguments,g,h,i,j,k;b&&(k=b,b=0);for(g=0,h=c.length;g<h;g++)i=c[g],j=d.type(i),j==="array"?f.done.apply(f,i):j==="function"&&a.push(i);k&&f.resolveWith(k[0],k[1])}return this},resolveWith:function(d,f){if(!e&&!b&&!c){c=1;try{while(a[0])a.shift().apply(d,f)}catch(g){throw g}finally{b=[d,f],c=0}}return this},resolve:function(){f.resolveWith(d.isFunction(this.promise)?this.promise():this,arguments);return this},isResolved:function(){return c||b},cancel:function(){e=1,a=[];return this}};return f},Deferred:function(a){var b=d._Deferred(),c=d._Deferred(),e;d.extend(b,{then:function(a,c){b.done(a).fail(c);return this},fail:c.done,rejectWith:c.resolveWith,reject:c.resolve,isRejected:c.isResolved,promise:function(a){if(a==null){if(e)return e;e=a={}}var c=z.length;while(c--)a[z[c]]=b[z[c]];return a}}),b.done(c.cancel).fail(b.cancel),delete b.cancel,a&&a.call(b,b);return b},when:function(a){var b=arguments.length,c=b<=1&&a&&d.isFunction(a.promise)?a:d.Deferred(),e=c.promise();if(b>1){var f=E.call(arguments,0),g=b,h=function(a){return function(b){f[a]=arguments.length>1?E.call(arguments,0):b,--g||c.resolveWith(e,f)}};while(b--)a=f[b],a&&d.isFunction(a.promise)?a.promise().then(h(b),c.reject):--g;g||c.resolveWith(e,f)}else c!==a&&c.resolve(a);return e},uaMatch:function(a){a=a.toLowerCase();var b=r.exec(a)||s.exec(a)||t.exec(a)||a.indexOf("compatible")<0&&u.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},sub:function(){function a(b,c){return new a.fn.init(b,c)}d.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.subclass=this.subclass,a.fn.init=function b(b,c){c&&c instanceof d&&!(c instanceof a)&&(c=a(c));return d.fn.init.call(this,b,c,e)},a.fn.init.prototype=a.fn;var e=a(c);return a},browser:{}}),y=d._Deferred(),d.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){H["[object "+b+"]"]=b.toLowerCase()}),w=d.uaMatch(v),w.browser&&(d.browser[w.browser]=!0,d.browser.version=w.version),d.browser.webkit&&(d.browser.safari=!0),G&&(d.inArray=function(a,b){return G.call(b,a)}),i.test(" ")&&(j=/^[\s\xA0]+/,k=/[\s\xA0]+$/),g=d(c),c.addEventListener?A=function(){c.removeEventListener("DOMContentLoaded",A,!1),d.ready()}:c.attachEvent&&(A=function(){c.readyState==="complete"&&(c.detachEvent("onreadystatechange",A),d.ready())});return d}();(function(){d.support={};var b=c.createElement("div");b.style.display="none",b.innerHTML="   <link/><table></table><a href='/a' style='color:red;float:left;opacity:.55;'>a</a><input type='checkbox'/>";var e=b.getElementsByTagName("*"),f=b.getElementsByTagName("a")[0],g=c.createElement("select"),h=g.appendChild(c.createElement("option")),i=b.getElementsByTagName("input")[0];if(e&&e.length&&f){d.support={leadingWhitespace:b.firstChild.nodeType===3,tbody:!b.getElementsByTagName("tbody").length,htmlSerialize:!!b.getElementsByTagName("link").length,style:/red/.test(f.getAttribute("style")),hrefNormalized:f.getAttribute("href")==="/a",opacity:/^0.55$/.test(f.style.opacity),cssFloat:!!f.style.cssFloat,checkOn:i.value==="on",optSelected:h.selected,deleteExpando:!0,optDisabled:!1,checkClone:!1,noCloneEvent:!0,noCloneChecked:!0,boxModel:null,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableHiddenOffsets:!0},i.checked=!0,d.support.noCloneChecked=i.cloneNode(!0).checked,g.disabled=!0,d.support.optDisabled=!h.disabled;var j=null;d.support.scriptEval=function(){if(j===null){var b=c.documentElement,e=c.createElement("script"),f="script"+d.now();try{e.appendChild(c.createTextNode("window."+f+"=1;"))}catch(g){}b.insertBefore(e,b.firstChild),a[f]?(j=!0,delete a[f]):j=!1,b.removeChild(e),b=e=f=null}return j};try{delete b.test}catch(k){d.support.deleteExpando=!1}!b.addEventListener&&b.attachEvent&&b.fireEvent&&(b.attachEvent("onclick",function l(){d.support.noCloneEvent=!1,b.detachEvent("onclick",l)}),b.cloneNode(!0).fireEvent("onclick")),b=c.createElement("div"),b.innerHTML="<input type='radio' name='radiotest' checked='checked'/>";var m=c.createDocumentFragment();m.appendChild(b.firstChild),d.support.checkClone=m.cloneNode(!0).cloneNode(!0).lastChild.checked,d(function(){var a=c.createElement("div"),b=c.getElementsByTagName("body")[0];if(b){a.style.width=a.style.paddingLeft="1px",b.appendChild(a),d.boxModel=d.support.boxModel=a.offsetWidth===2,"zoom"in a.style&&(a.style.display="inline",a.style.zoom=1,d.support.inlineBlockNeedsLayout=a.offsetWidth===2,a.style.display="",a.innerHTML="<div style='width:4px;'></div>",d.support.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="<table><tr><td style='padding:0;border:0;display:none'></td><td>t</td></tr></table>";var e=a.getElementsByTagName("td");d.support.reliableHiddenOffsets=e[0].offsetHeight===0,e[0].style.display="",e[1].style.display="none",d.support.reliableHiddenOffsets=d.support.reliableHiddenOffsets&&e[0].offsetHeight===0,a.innerHTML="",b.removeChild(a).style.display="none",a=e=null}});var n=function(a){var b=c.createElement("div");a="on"+a;if(!b.attachEvent)return!0;var d=a in b;d||(b.setAttribute(a,"return;"),d=typeof b[a]==="function"),b=null;return d};d.support.submitBubbles=n("submit"),d.support.changeBubbles=n("change"),b=e=f=null}})();var e=/^(?:\{.*\}|\[.*\])$/;d.extend({cache:{},uuid:0,expando:"jQuery"+(d.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?d.cache[a[d.expando]]:a[d.expando];return!!a&&!g(a)},data:function(a,c,e,f){if(d.acceptData(a)){var g=d.expando,h=typeof c==="string",i,j=a.nodeType,k=j?d.cache:a,l=j?a[d.expando]:a[d.expando]&&d.expando;if((!l||f&&l&&!k[l][g])&&h&&e===b)return;l||(j?a[d.expando]=l=++d.uuid:l=d.expando),k[l]||(k[l]={},j||(k[l].toJSON=d.noop));if(typeof c==="object"||typeof c==="function")f?k[l][g]=d.extend(k[l][g],c):k[l]=d.extend(k[l],c);i=k[l],f&&(i[g]||(i[g]={}),i=i[g]),e!==b&&(i[c]=e);if(c==="events"&&!i[c])return i[g]&&i[g].events;return h?i[c]:i}},removeData:function(b,c,e){if(d.acceptData(b)){var f=d.expando,h=b.nodeType,i=h?d.cache:b,j=h?b[d.expando]:d.expando;if(!i[j])return;if(c){var k=e?i[j][f]:i[j];if(k){delete k[c];if(!g(k))return}}if(e){delete i[j][f];if(!g(i[j]))return}var l=i[j][f];d.support.deleteExpando||i!=a?delete i[j]:i[j]=null,l?(i[j]={},h||(i[j].toJSON=d.noop),i[j][f]=l):h&&(d.support.deleteExpando?delete b[d.expando]:b.removeAttribute?b.removeAttribute(d.expando):b[d.expando]=null)}},_data:function(a,b,c){return d.data(a,b,c,!0)},acceptData:function(a){if(a.nodeName){var b=d.noData[a.nodeName.toLowerCase()];if(b)return b!==!0&&a.getAttribute("classid")===b}return!0}}),d.fn.extend({data:function(a,c){var e=null;if(typeof a==="undefined"){if(this.length){e=d.data(this[0]);if(this[0].nodeType===1){var g=this[0].attributes,h;for(var i=0,j=g.length;i<j;i++)h=g[i].name,h.indexOf("data-")===0&&(h=h.substr(5),f(this[0],h,e[h]))}}return e}if(typeof a==="object")return this.each(function(){d.data(this,a)});var k=a.split(".");k[1]=k[1]?"."+k[1]:"";if(c===b){e=this.triggerHandler("getData"+k[1]+"!",[k[0]]),e===b&&this.length&&(e=d.data(this[0],a),e=f(this[0],a,e));return e===b&&k[1]?this.data(k[0]):e}return this.each(function(){var b=d(this),e=[k[0],c];b.triggerHandler("setData"+k[1]+"!",e),d.data(this,a,c),b.triggerHandler("changeData"+k[1]+"!",e)})},removeData:function(a){return this.each(function(){d.removeData(this,a)})}}),d.extend({queue:function(a,b,c){if(a){b=(b||"fx")+"queue";var e=d._data(a,b);if(!c)return e||[];!e||d.isArray(c)?e=d._data(a,b,d.makeArray(c)):e.push(c);return e}},dequeue:function(a,b){b=b||"fx";var c=d.queue(a,b),e=c.shift();e==="inprogress"&&(e=c.shift()),e&&(b==="fx"&&c.unshift("inprogress"),e.call(a,function(){d.dequeue(a,b)})),c.length||d.removeData(a,b+"queue",!0)}}),d.fn.extend({queue:function(a,c){typeof a!=="string"&&(c=a,a="fx");if(c===b)return d.queue(this[0],a);return this.each(function(b){var e=d.queue(this,a,c);a==="fx"&&e[0]!=="inprogress"&&d.dequeue(this,a)})},dequeue:function(a){return this.each(function(){d.dequeue(this,a)})},delay:function(a,b){a=d.fx?d.fx.speeds[a]||a:a,b=b||"fx";return this.queue(b,function(){var c=this;setTimeout(function(){d.dequeue(c,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var h=/[\n\t\r]/g,i=/\s+/,j=/\r/g,k=/^(?:href|src|style)$/,l=/^(?:button|input)$/i,m=/^(?:button|input|object|select|textarea)$/i,n=/^a(?:rea)?$/i,o=/^(?:radio|checkbox)$/i;d.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"},d.fn.extend({attr:function(a,b){return d.access(this,a,b,!0,d.attr)},removeAttr:function(a,b){return this.each(function(){d.attr(this,a,""),this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.addClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"){var b=(a||"").split(i);for(var c=0,e=this.length;c<e;c++){var f=this[c];if(f.nodeType===1)if(f.className){var g=" "+f.className+" ",h=f.className;for(var j=0,k=b.length;j<k;j++)g.indexOf(" "+b[j]+" ")<0&&(h+=" "+b[j]);f.className=d.trim(h)}else f.className=a}}return this},removeClass:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.removeClass(a.call(this,b,c.attr("class")))});if(a&&typeof a==="string"||a===b){var c=(a||"").split(i);for(var e=0,f=this.length;e<f;e++){var g=this[e];if(g.nodeType===1&&g.className)if(a){var j=(" "+g.className+" ").replace(h," ");for(var k=0,l=c.length;k<l;k++)j=j.replace(" "+c[k]+" "," ");g.className=d.trim(j)}else g.className=""}}return this},toggleClass:function(a,b){var c=typeof a,e=typeof b==="boolean";if(d.isFunction(a))return this.each(function(c){var e=d(this);e.toggleClass(a.call(this,c,e.attr("class"),b),b)});return this.each(function(){if(c==="string"){var f,g=0,h=d(this),j=b,k=a.split(i);while(f=k[g++])j=e?j:!h.hasClass(f),h[j?"addClass":"removeClass"](f)}else if(c==="undefined"||c==="boolean")this.className&&d._data(this,"__className__",this.className),this.className=this.className||a===!1?"":d._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ";for(var c=0,d=this.length;c<d;c++)if((" "+this[c].className+" ").replace(h," ").indexOf(b)>-1)return!0;return!1},val:function(a){if(!arguments.length){var c=this[0];if(c){if(d.nodeName(c,"option")){var e=c.attributes.value;return!e||e.specified?c.value:c.text}if(d.nodeName(c,"select")){var f=c.selectedIndex,g=[],h=c.options,i=c.type==="select-one";if(f<0)return null;for(var k=i?f:0,l=i?f+1:h.length;k<l;k++){var m=h[k];if(m.selected&&(d.support.optDisabled?!m.disabled:m.getAttribute("disabled")===null)&&(!m.parentNode.disabled||!d.nodeName(m.parentNode,"optgroup"))){a=d(m).val();if(i)return a;g.push(a)}}if(i&&!g.length&&h.length)return d(h[f]).val();return g}if(o.test(c.type)&&!d.support.checkOn)return c.getAttribute("value")===null?"on":c.value;return(c.value||"").replace(j,"")}return b}var n=d.isFunction(a);return this.each(function(b){var c=d(this),e=a;if(this.nodeType===1){n&&(e=a.call(this,b,c.val())),e==null?e="":typeof e==="number"?e+="":d.isArray(e)&&(e=d.map(e,function(a){return a==null?"":a+""}));if(d.isArray(e)&&o.test(this.type))this.checked=d.inArray(c.val(),e)>=0;else if(d.nodeName(this,"select")){var f=d.makeArray(e);d("option",this).each(function(){this.selected=d.inArray(d(this).val(),f)>=0}),f.length||(this.selectedIndex=-1)}else this.value=e}})}}),d.extend({attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,e,f){if(!a||a.nodeType===3||a.nodeType===8||a.nodeType===2)return b;if(f&&c in d.attrFn)return d(a)[c](e);var g=a.nodeType!==1||!d.isXMLDoc(a),h=e!==b;c=g&&d.props[c]||c;if(a.nodeType===1){var i=k.test(c);if(c==="selected"&&!d.support.optSelected){var j=a.parentNode;j&&(j.selectedIndex,j.parentNode&&j.parentNode.selectedIndex)}if((c in a||a[c]!==b)&&g&&!i){h&&(c==="type"&&l.test(a.nodeName)&&a.parentNode&&d.error("type property can't be changed"),e===null?a.nodeType===1&&a.removeAttribute(c):a[c]=e);if(d.nodeName(a,"form")&&a.getAttributeNode(c))return a.getAttributeNode(c).nodeValue;if(c==="tabIndex"){var o=a.getAttributeNode("tabIndex");return o&&o.specified?o.value:m.test(a.nodeName)||n.test(a.nodeName)&&a.href?0:b}return a[c]}if(!d.support.style&&g&&c==="style"){h&&(a.style.cssText=""+e);return a.style.cssText}h&&a.setAttribute(c,""+e);if(!a.attributes[c]&&(a.hasAttribute&&!a.hasAttribute(c)))return b;var p=!d.support.hrefNormalized&&g&&i?a.getAttribute(c,2):a.getAttribute(c);return p===null?b:p}h&&(a[c]=e);return a[c]}});var p=/\.(.*)$/,q=/^(?:textarea|input|select)$/i,r=/\./g,s=/ /g,t=/[^\w\s.|`]/g,u=function(a){return a.replace(t,"\\$&")};d.event={add:function(c,e,f,g){if(c.nodeType!==3&&c.nodeType!==8){try{d.isWindow(c)&&(c!==a&&!c.frameElement)&&(c=a)}catch(h){}if(f===!1)f=v;else if(!f)return;var i,j;f.handler&&(i=f,f=i.handler),f.guid||(f.guid=d.guid++);var k=d._data(c);if(!k)return;var l=k.events,m=k.handle;l||(k.events=l={}),m||(k.handle=m=function(){return typeof d!=="undefined"&&!d.event.triggered?d.event.handle.apply(m.elem,arguments):b}),m.elem=c,e=e.split(" ");var n,o=0,p;while(n=e[o++]){j=i?d.extend({},i):{handler:f,data:g},n.indexOf(".")>-1?(p=n.split("."),n=p.shift(),j.namespace=p.slice(0).sort().join(".")):(p=[],j.namespace=""),j.type=n,j.guid||(j.guid=f.guid);var q=l[n],r=d.event.special[n]||{};if(!q){q=l[n]=[];if(!r.setup||r.setup.call(c,g,p,m)===!1)c.addEventListener?c.addEventListener(n,m,!1):c.attachEvent&&c.attachEvent("on"+n,m)}r.add&&(r.add.call(c,j),j.handler.guid||(j.handler.guid=f.guid)),q.push(j),d.event.global[n]=!0}c=null}},global:{},remove:function(a,c,e,f){if(a.nodeType!==3&&a.nodeType!==8){e===!1&&(e=v);var g,h,i,j,k=0,l,m,n,o,p,q,r,s=d.hasData(a)&&d._data(a),t=s&&s.events;if(!s||!t)return;c&&c.type&&(e=c.handler,c=c.type);if(!c||typeof c==="string"&&c.charAt(0)==="."){c=c||"";for(h in t)d.event.remove(a,h+c);return}c=c.split(" ");while(h=c[k++]){r=h,q=null,l=h.indexOf(".")<0,m=[],l||(m=h.split("."),h=m.shift(),n=new RegExp("(^|\\.)"+d.map(m.slice(0).sort(),u).join("\\.(?:.*\\.)?")+"(\\.|$)")),p=t[h];if(!p)continue;if(!e){for(j=0;j<p.length;j++){q=p[j];if(l||n.test(q.namespace))d.event.remove(a,r,q.handler,j),p.splice(j--,1)}continue}o=d.event.special[h]||{};for(j=f||0;j<p.length;j++){q=p[j];if(e.guid===q.guid){if(l||n.test(q.namespace))f==null&&p.splice(j--,1),o.remove&&o.remove.call(a,q);if(f!=null)break}}if(p.length===0||f!=null&&p.length===1)(!o.teardown||o.teardown.call(a,m)===!1)&&d.removeEvent(a,h,s.handle),g=null,delete t[h]}if(d.isEmptyObject(t)){var w=s.handle;w&&(w.elem=null),delete s.events,delete s.handle,d.isEmptyObject(s)&&d.removeData(a,b,!0)}}},trigger:function(a,c,e){var f=a.type||a,g=arguments[3];if(!g){a=typeof a==="object"?a[d.expando]?a:d.extend(d.Event(f),a):d.Event(f),f.indexOf("!")>=0&&(a.type=f=f.slice(0,-1),a.exclusive=!0),e||(a.stopPropagation(),d.event.global[f]&&d.each(d.cache,function(){var b=d.expando,e=this[b];e&&e.events&&e.events[f]&&d.event.trigger(a,c,e.handle.elem)}));if(!e||e.nodeType===3||e.nodeType===8)return b;a.result=b,a.target=e,c=d.makeArray(c),c.unshift(a)}a.currentTarget=e;var h=d._data(e,"handle");h&&h.apply(e,c);var i=e.parentNode||e.ownerDocument;try{e&&e.nodeName&&d.noData[e.nodeName.toLowerCase()]||e["on"+f]&&e["on"+f].apply(e,c)===!1&&(a.result=!1,a.preventDefault())}catch(j){}if(!a.isPropagationStopped()&&i)d.event.trigger(a,c,i,!0);else if(!a.isDefaultPrevented()){var k,l=a.target,m=f.replace(p,""),n=d.nodeName(l,"a")&&m==="click",o=d.event.special[m]||{};if((!o._default||o._default.call(e,a)===!1)&&!n&&!(l&&l.nodeName&&d.noData[l.nodeName.toLowerCase()])){try{l[m]&&(k=l["on"+m],k&&(l["on"+m]=null),d.event.triggered=!0,l[m]())}catch(q){}k&&(l["on"+m]=k),d.event.triggered=!1}}},handle:function(c){var e,f,g,h,i,j=[],k=d.makeArray(arguments);c=k[0]=d.event.fix(c||a.event),c.currentTarget=this,e=c.type.indexOf(".")<0&&!c.exclusive,e||(g=c.type.split("."),c.type=g.shift(),j=g.slice(0).sort(),h=new RegExp("(^|\\.)"+j.join("\\.(?:.*\\.)?")+"(\\.|$)")),c.namespace=c.namespace||j.join("."),i=d._data(this,"events"),f=(i||{})[c.type];if(i&&f){f=f.slice(0);for(var l=0,m=f.length;l<m;l++){var n=f[l];if(e||h.test(n.namespace)){c.handler=n.handler,c.data=n.data,c.handleObj=n;var o=n.handler.apply(this,k);o!==b&&(c.result=o,o===!1&&(c.preventDefault(),c.stopPropagation()));if(c.isImmediatePropagationStopped())break}}}return c.result},props:"altKey attrChange attrName bubbles button cancelable charCode clientX clientY ctrlKey currentTarget data detail eventPhase fromElement handler keyCode layerX layerY metaKey newValue offsetX offsetY pageX pageY prevValue relatedNode relatedTarget screenX screenY shiftKey srcElement target toElement view wheelDelta which".split(" "),fix:function(a){if(a[d.expando])return a;var e=a;a=d.Event(e);for(var f=this.props.length,g;f;)g=this.props[--f],a[g]=e[g];a.target||(a.target=a.srcElement||c),a.target.nodeType===3&&(a.target=a.target.parentNode),!a.relatedTarget&&a.fromElement&&(a.relatedTarget=a.fromElement===a.target?a.toElement:a.fromElement);if(a.pageX==null&&a.clientX!=null){var h=c.documentElement,i=c.body;a.pageX=a.clientX+(h&&h.scrollLeft||i&&i.scrollLeft||0)-(h&&h.clientLeft||i&&i.clientLeft||0),a.pageY=a.clientY+(h&&h.scrollTop||i&&i.scrollTop||0)-(h&&h.clientTop||i&&i.clientTop||0)}a.which==null&&(a.charCode!=null||a.keyCode!=null)&&(a.which=a.charCode!=null?a.charCode:a.keyCode),!a.metaKey&&a.ctrlKey&&(a.metaKey=a.ctrlKey),!a.which&&a.button!==b&&(a.which=a.button&1?1:a.button&2?3:a.button&4?2:0);return a},guid:1e8,proxy:d.proxy,special:{ready:{setup:d.bindReady,teardown:d.noop},live:{add:function(a){d.event.add(this,F(a.origType,a.selector),d.extend({},a,{handler:E,guid:a.handler.guid}))},remove:function(a){d.event.remove(this,F(a.origType,a.selector),a)}},beforeunload:{setup:function(a,b,c){d.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}}},d.removeEvent=c.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){a.detachEvent&&a.detachEvent("on"+b,c)},d.Event=function(a){if(!this.preventDefault)return new d.Event(a);a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?w:v):this.type=a,this.timeStamp=d.now(),this[d.expando]=!0},d.Event.prototype={preventDefault:function(){this.isDefaultPrevented=w;var a=this.originalEvent;a&&(a.preventDefault?a.preventDefault():a.returnValue=!1)},stopPropagation:function(){this.isPropagationStopped=w;var a=this.originalEvent;a&&(a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0)},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=w,this.stopPropagation()},isDefaultPrevented:v,isPropagationStopped:v,isImmediatePropagationStopped:v};var x=function(a){var b=a.relatedTarget;try{if(b!==c&&!b.parentNode)return;while(b&&b!==this)b=b.parentNode;b!==this&&(a.type=a.data,d.event.handle.apply(this,arguments))}catch(e){}},y=function(a){a.type=a.data,d.event.handle.apply(this,arguments)};d.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){d.event.special[a]={setup:function(c){d.event.add(this,b,c&&c.selector?y:x,a)},teardown:function(a){d.event.remove(this,b,a&&a.selector?y:x)}}}),d.support.submitBubbles||(d.event.special.submit={setup:function(a,b){if(this.nodeName&&this.nodeName.toLowerCase()!=="form")d.event.add(this,"click.specialSubmit",function(a){var b=a.target,c=b.type;(c==="submit"||c==="image")&&d(b).closest("form").length&&C("submit",this,arguments)}),d.event.add(this,"keypress.specialSubmit",function(a){var b=a.target,c=b.type;(c==="text"||c==="password")&&d(b).closest("form").length&&a.keyCode===13&&C("submit",this,arguments)});else return!1},teardown:function(a){d.event.remove(this,".specialSubmit")}});if(!d.support.changeBubbles){var z,A=function(a){var b=a.type,c=a.value;b==="radio"||b==="checkbox"?c=a.checked:b==="select-multiple"?c=a.selectedIndex>-1?d.map(a.options,function(a){return a.selected}).join("-"):"":a.nodeName.toLowerCase()==="select"&&(c=a.selectedIndex);return c},B=function B(a){var c=a.target,e,f;if(q.test(c.nodeName)&&!c.readOnly){e=d._data(c,"_change_data"),f=A(c),(a.type!=="focusout"||c.type!=="radio")&&d._data(c,"_change_data",f);if(e===b||f===e)return;if(e!=null||f)a.type="change",a.liveFired=b,d.event.trigger(a,arguments[1],c)}};d.event.special.change={filters:{focusout:B,beforedeactivate:B,click:function(a){var b=a.target,c=b.type;(c==="radio"||c==="checkbox"||b.nodeName.toLowerCase()==="select")&&B.call(this,a)},keydown:function(a){var b=a.target,c=b.type;(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(c==="checkbox"||c==="radio")||c==="select-multiple")&&B.call(this,a)},beforeactivate:function(a){var b=a.target;d._data(b,"_change_data",A(b))}},setup:function(a,b){if(this.type==="file")return!1;for(var c in z)d.event.add(this,c+".specialChange",z[c]);return q.test(this.nodeName)},teardown:function(a){d.event.remove(this,".specialChange");return q.test(this.nodeName)}},z=d.event.special.change.filters,z.focus=z.beforeactivate}c.addEventListener&&d.each({focus:"focusin",blur:"focusout"},function(a,b){function c(a){a=d.event.fix(a),a.type=b;return d.event.handle.call(this,a)}d.event.special[b]={setup:function(){this.addEventListener(a,c,!0)},teardown:function(){this.removeEventListener(a,c,!0)}}}),d.each(["bind","one"],function(a,c){d.fn[c]=function(a,e,f){if(typeof a==="object"){for(var g in a)this[c](g,e,a[g],f);return this}if(d.isFunction(e)||e===!1)f=e,e=b;var h=c==="one"?d.proxy(f,function(a){d(this).unbind(a,h);return f.apply(this,arguments)}):f;if(a==="unload"&&c!=="one")this.one(a,e,f);else for(var i=0,j=this.length;i<j;i++)d.event.add(this[i],a,h,e);return this}}),d.fn.extend({unbind:function(a,b){if(typeof a!=="object"||a.preventDefault)for(var e=0,f=this.length;e<f;e++)d.event.remove(this[e],a,b);else for(var c in a)this.unbind(c,a[c]);return this},delegate:function(a,b,c,d){return this.live(b,c,d,a)},undelegate:function(a,b,c){return arguments.length===0?this.unbind("live"):this.die(b,null,c,a)},trigger:function(a,b){return this.each(function(){d.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0]){var c=d.Event(a);c.preventDefault(),c.stopPropagation(),d.event.trigger(c,b,this[0]);return c.result}},toggle:function(a){var b=arguments,c=1;while(c<b.length)d.proxy(a,b[c++]);return this.click(d.proxy(a,function(e){var f=(d._data(this,"lastToggle"+a.guid)||0)%c;d._data(this,"lastToggle"+a.guid,f+1),e.preventDefault();return b[f].apply(this,arguments)||!1}))},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}});var D={focus:"focusin",blur:"focusout",mouseenter:"mouseover",mouseleave:"mouseout"};d.each(["live","die"],function(a,c){d.fn[c]=function(a,e,f,g){var h,i=0,j,k,l,m=g||this.selector,n=g?this:d(this.context);if(typeof a==="object"&&!a.preventDefault){for(var o in a)n[c](o,e,a[o],m);return this}d.isFunction(e)&&(f=e,e=b),a=(a||"").split(" ");while((h=a[i++])!=null){j=p.exec(h),k="",j&&(k=j[0],h=h.replace(p,""));if(h==="hover"){a.push("mouseenter"+k,"mouseleave"+k);continue}l=h,h==="focus"||h==="blur"?(a.push(D[h]+k),h=h+k):h=(D[h]||h)+k;if(c==="live")for(var q=0,r=n.length;q<r;q++)d.event.add(n[q],"live."+F(h,m),{data:e,selector:m,handler:f,origType:h,origHandler:f,preType:l});else n.unbind("live."+F(h,m),f)}return this}}),d.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error".split(" "),function(a,b){d.fn[b]=function(a,c){c==null&&(c=a,a=null);return arguments.length>0?this.bind(b,a,c):this.trigger(b)},d.attrFn&&(d.attrFn[b]=!0)}),function(){function u(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}if(i.nodeType===1){f||(i.sizcache=c,i.sizset=g);if(typeof b!=="string"){if(i===b){j=!0;break}}else if(k.filter(b,[i]).length>0){j=i;break}}i=i[a]}d[g]=j}}}function t(a,b,c,d,e,f){for(var g=0,h=d.length;g<h;g++){var i=d[g];if(i){var j=!1;i=i[a];while(i){if(i.sizcache===c){j=d[i.sizset];break}i.nodeType===1&&!f&&(i.sizcache=c,i.sizset=g);if(i.nodeName.toLowerCase()===b){j=i;break}i=i[a]}d[g]=j}}}var a=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^\[\]]*\]|['"][^'"]*['"]|[^\[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,e=0,f=Object.prototype.toString,g=!1,h=!0,i=/\\/g,j=/\W/;[0,0].sort(function(){h=!1;return 0});var k=function(b,d,e,g){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!=="string")return e;var i,j,n,o,q,r,s,t,u=!0,w=k.isXML(d),x=[],y=b;do{a.exec(""),i=a.exec(y);if(i){y=i[3],x.push(i[1]);if(i[2]){o=i[3];break}}}while(i);if(x.length>1&&m.exec(b))if(x.length===2&&l.relative[x[0]])j=v(x[0]+x[1],d);else{j=l.relative[x[0]]?[d]:k(x.shift(),d);while(x.length)b=x.shift(),l.relative[b]&&(b+=x.shift()),j=v(b,j)}else{!g&&x.length>1&&d.nodeType===9&&!w&&l.match.ID.test(x[0])&&!l.match.ID.test(x[x.length-1])&&(q=k.find(x.shift(),d,w),d=q.expr?k.filter(q.expr,q.set)[0]:q.set[0]);if(d){q=g?{expr:x.pop(),set:p(g)}:k.find(x.pop(),x.length===1&&(x[0]==="~"||x[0]==="+")&&d.parentNode?d.parentNode:d,w),j=q.expr?k.filter(q.expr,q.set):q.set,x.length>0?n=p(j):u=!1;while(x.length)r=x.pop(),s=r,l.relative[r]?s=x.pop():r="",s==null&&(s=d),l.relative[r](n,s,w)}else n=x=[]}n||(n=j),n||k.error(r||b);if(f.call(n)==="[object Array]")if(u)if(d&&d.nodeType===1)for(t=0;n[t]!=null;t++)n[t]&&(n[t]===!0||n[t].nodeType===1&&k.contains(d,n[t]))&&e.push(j[t]);else for(t=0;n[t]!=null;t++)n[t]&&n[t].nodeType===1&&e.push(j[t]);else e.push.apply(e,n);else p(n,e);o&&(k(o,h,e,g),k.uniqueSort(e));return e};k.uniqueSort=function(a){if(r){g=h,a.sort(r);if(g)for(var b=1;b<a.length;b++)a[b]===a[b-1]&&a.splice(b--,1)}return a},k.matches=function(a,b){return k(a,null,null,b)},k.matchesSelector=function(a,b){return k(b,null,null,[a]).length>0},k.find=function(a,b,c){var d;if(!a)return[];for(var e=0,f=l.order.length;e<f;e++){var g,h=l.order[e];if(g=l.leftMatch[h].exec(a)){var j=g[1];g.splice(1,1);if(j.substr(j.length-1)!=="\\"){g[1]=(g[1]||"").replace(i,""),d=l.find[h](g,b,c);if(d!=null){a=a.replace(l.match[h],"");break}}}}d||(d=typeof b.getElementsByTagName!=="undefined"?b.getElementsByTagName("*"):[]);return{set:d,expr:a}},k.filter=function(a,c,d,e){var f,g,h=a,i=[],j=c,m=c&&c[0]&&k.isXML(c[0]);while(a&&c.length){for(var n in l.filter)if((f=l.leftMatch[n].exec(a))!=null&&f[2]){var o,p,q=l.filter[n],r=f[1];g=!1,f.splice(1,1);if(r.substr(r.length-1)==="\\")continue;j===i&&(i=[]);if(l.preFilter[n]){f=l.preFilter[n](f,j,d,i,e,m);if(f){if(f===!0)continue}else g=o=!0}if(f)for(var s=0;(p=j[s])!=null;s++)if(p){o=q(p,f,s,j);var t=e^!!o;d&&o!=null?t?g=!0:j[s]=!1:t&&(i.push(p),g=!0)}if(o!==b){d||(j=i),a=a.replace(l.match[n],"");if(!g)return[];break}}if(a===h)if(g==null)k.error(a);else break;h=a}return j},k.error=function(a){throw"Syntax error, unrecognized expression: "+a};var l=k.selectors={order:["ID","NAME","TAG"],match:{ID:/#((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,CLASS:/\.((?:[\w\u00c0-\uFFFF\-]|\\.)+)/,NAME:/\[name=['"]*((?:[\w\u00c0-\uFFFF\-]|\\.)+)['"]*\]/,ATTR:/\[\s*((?:[\w\u00c0-\uFFFF\-]|\\.)+)\s*(?:(\S?=)\s*(?:(['"])(.*?)\3|(#?(?:[\w\u00c0-\uFFFF\-]|\\.)*)|)|)\s*\]/,TAG:/^((?:[\w\u00c0-\uFFFF\*\-]|\\.)+)/,CHILD:/:(only|nth|last|first)-child(?:\(\s*(even|odd|(?:[+\-]?\d+|(?:[+\-]?\d*)?n\s*(?:[+\-]\s*\d+)?))\s*\))?/,POS:/:(nth|eq|gt|lt|first|last|even|odd)(?:\((\d*)\))?(?=[^\-]|$)/,PSEUDO:/:((?:[\w\u00c0-\uFFFF\-]|\\.)+)(?:\((['"]?)((?:\([^\)]+\)|[^\(\)]*)+)\2\))?/},leftMatch:{},attrMap:{"class":"className","for":"htmlFor"},attrHandle:{href:function(a){return a.getAttribute("href")},type:function(a){return a.getAttribute("type")}},relative:{"+":function(a,b){var c=typeof b==="string",d=c&&!j.test(b),e=c&&!d;d&&(b=b.toLowerCase());for(var f=0,g=a.length,h;f<g;f++)if(h=a[f]){while((h=h.previousSibling)&&h.nodeType!==1){}a[f]=e||h&&h.nodeName.toLowerCase()===b?h||!1:h===b}e&&k.filter(b,a,!0)},">":function(a,b){var c,d=typeof b==="string",e=0,f=a.length;if(d&&!j.test(b)){b=b.toLowerCase();for(;e<f;e++){c=a[e];if(c){var g=c.parentNode;a[e]=g.nodeName.toLowerCase()===b?g:!1}}}else{for(;e<f;e++)c=a[e],c&&(a[e]=d?c.parentNode:c.parentNode===b);d&&k.filter(b,a,!0)}},"":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("parentNode",b,f,a,d,c)},"~":function(a,b,c){var d,f=e++,g=u;typeof b==="string"&&!j.test(b)&&(b=b.toLowerCase(),d=b,g=t),g("previousSibling",b,f,a,d,c)}},find:{ID:function(a,b,c){if(typeof b.getElementById!=="undefined"&&!c){var d=b.getElementById(a[1]);return d&&d.parentNode?[d]:[]}},NAME:function(a,b){if(typeof b.getElementsByName!=="undefined"){var c=[],d=b.getElementsByName(a[1]);for(var e=0,f=d.length;e<f;e++)d[e].getAttribute("name")===a[1]&&c.push(d[e]);return c.length===0?null:c}},TAG:function(a,b){if(typeof b.getElementsByTagName!=="undefined")return b.getElementsByTagName(a[1])}},preFilter:{CLASS:function(a,b,c,d,e,f){a=" "+a[1].replace(i,"")+" ";if(f)return a;for(var g=0,h;(h=b[g])!=null;g++)h&&(e^(h.className&&(" "+h.className+" ").replace(/[\t\n\r]/g," ").indexOf(a)>=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(i,"")},TAG:function(a,b){return a[1].replace(i,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||k.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&k.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(i,"");!f&&l.attrMap[g]&&(a[1]=l.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(i,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=k(b[3],null,null,c);else{var g=k.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(l.match.POS.test(b[0])||l.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!k(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){return"text"===a.getAttribute("type")},radio:function(a){return"radio"===a.type},checkbox:function(a){return"checkbox"===a.type},file:function(a){return"file"===a.type},password:function(a){return"password"===a.type},submit:function(a){return"submit"===a.type},image:function(a){return"image"===a.type},reset:function(a){return"reset"===a.type},button:function(a){return"button"===a.type||a.nodeName.toLowerCase()==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return b<c[3]-0},gt:function(a,b,c){return b>c[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=l.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||k.getText([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h<i;h++)if(g[h]===a)return!1;return!0}k.error(e)},CHILD:function(a,b){var c=b[1],d=a;switch(c){case"only":case"first":while(d=d.previousSibling)if(d.nodeType===1)return!1;if(c==="first")return!0;d=a;case"last":while(d=d.nextSibling)if(d.nodeType===1)return!1;return!0;case"nth":var e=b[2],f=b[3];if(e===1&&f===0)return!0;var g=b[0],h=a.parentNode;if(h&&(h.sizcache!==g||!a.nodeIndex)){var i=0;for(d=h.firstChild;d;d=d.nextSibling)d.nodeType===1&&(d.nodeIndex=++i);h.sizcache=g}var j=a.nodeIndex-f;return e===0?j===0:j%e===0&&j/e>=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=l.attrHandle[c]?l.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=l.setFilters[e];if(f)return f(a,c,b,d)}}},m=l.match.POS,n=function(a,b){return"\\"+(b-0+1)};for(var o in l.match)l.match[o]=new RegExp(l.match[o].source+/(?![^\[]*\])(?![^\(]*\))/.source),l.leftMatch[o]=new RegExp(/(^(?:.|\r|\n)*?)/.source+l.match[o].source.replace(/\\(\d+)/g,n));var p=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(q){p=function(a,b){var c=0,d=b||[];if(f.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length==="number")for(var e=a.length;c<e;c++)d.push(a[c]);else for(;a[c];c++)d.push(a[c]);return d}}var r,s;c.documentElement.compareDocumentPosition?r=function(a,b){if(a===b){g=!0;return 0}if(!a.compareDocumentPosition||!b.compareDocumentPosition)return a.compareDocumentPosition?-1:1;return a.compareDocumentPosition(b)&4?-1:1}:(r=function(a,b){var c,d,e=[],f=[],h=a.parentNode,i=b.parentNode,j=h;if(a===b){g=!0;return 0}if(h===i)return s(a,b);if(!h)return-1;if(!i)return 1;while(j)e.unshift(j),j=j.parentNode;j=i;while(j)f.unshift(j),j=j.parentNode;c=e.length,d=f.length;for(var k=0;k<c&&k<d;k++)if(e[k]!==f[k])return s(e[k],f[k]);return k===c?s(a,f[k],-1):s(e[k],b,1)},s=function(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}),k.getText=function(a){var b="",c;for(var d=0;a[d];d++)c=a[d],c.nodeType===3||c.nodeType===4?b+=c.nodeValue:c.nodeType!==8&&(b+=k.getText(c.childNodes));return b},function(){var a=c.createElement("div"),d="script"+(new Date).getTime(),e=c.documentElement;a.innerHTML="<a name='"+d+"'/>",e.insertBefore(a,e.firstChild),c.getElementById(d)&&(l.find.ID=function(a,c,d){if(typeof c.getElementById!=="undefined"&&!d){var e=c.getElementById(a[1]);return e?e.id===a[1]||typeof e.getAttributeNode!=="undefined"&&e.getAttributeNode("id").nodeValue===a[1]?[e]:b:[]}},l.filter.ID=function(a,b){var c=typeof a.getAttributeNode!=="undefined"&&a.getAttributeNode("id");return a.nodeType===1&&c&&c.nodeValue===b}),e.removeChild(a),e=a=null}(),function(){var a=c.createElement("div");a.appendChild(c.createComment("")),a.getElementsByTagName("*").length>0&&(l.find.TAG=function(a,b){var c=b.getElementsByTagName(a[1]);if(a[1]==="*"){var d=[];for(var e=0;c[e];e++)c[e].nodeType===1&&d.push(c[e]);c=d}return c}),a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!=="undefined"&&a.firstChild.getAttribute("href")!=="#"&&(l.attrHandle.href=function(a){return a.getAttribute("href",2)}),a=null}(),c.querySelectorAll&&function(){var a=k,b=c.createElement("div"),d="__sizzle__";b.innerHTML="<p class='TEST'></p>";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){k=function(b,e,f,g){e=e||c;if(!g&&!k.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return p(e.getElementsByTagName(b),f);if(h[2]&&l.find.CLASS&&e.getElementsByClassName)return p(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return p([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return p([],f);if(i.id===h[3])return p([i],f)}try{return p(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var m=e,n=e.getAttribute("id"),o=n||d,q=e.parentNode,r=/^\s*[+~]/.test(b);n?o=o.replace(/'/g,"\\$&"):e.setAttribute("id",o),r&&q&&(e=e.parentNode);try{if(!r||q)return p(e.querySelectorAll("[id='"+o+"'] "+b),f)}catch(s){}finally{n||m.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)k[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector,d=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(e){d=!0}b&&(k.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!k.isXML(a))try{if(d||!l.match.PSEUDO.test(c)&&!/!=/.test(c))return b.call(a,c)}catch(e){}return k(c,null,null,[a]).length>0})}(),function(){var a=c.createElement("div");a.innerHTML="<div class='test e'></div><div class='test'></div>";if(a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;l.order.splice(1,0,"CLASS"),l.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!=="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?k.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?k.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:k.contains=function(){return!1},k.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var v=function(a,b){var c,d=[],e="",f=b.nodeType?[b]:b;while(c=l.match.PSEUDO.exec(a))e+=c[0],a=a.replace(l.match.PSEUDO,"");a=l.relative[a]?a+"*":a;for(var g=0,h=f.length;g<h;g++)k(a,f[g],d);return k.filter(e,d)};d.find=k,d.expr=k.selectors,d.expr[":"]=d.expr.filters,d.unique=k.uniqueSort,d.text=k.getText,d.isXMLDoc=k.isXML,d.contains=k.contains}();var G=/Until$/,H=/^(?:parents|prevUntil|prevAll)/,I=/,/,J=/^.[^:#\[\.,]*$/,K=Array.prototype.slice,L=d.expr.match.POS,M={children:!0,contents:!0,next:!0,prev:!0};d.fn.extend({find:function(a){var b=this.pushStack("","find",a),c=0;for(var e=0,f=this.length;e<f;e++){c=b.length,d.find(a,this[e],b);if(e>0)for(var g=c;g<b.length;g++)for(var h=0;h<c;h++)if(b[h]===b[g]){b.splice(g--,1);break}}return b},has:function(a){var b=d(a);return this.filter(function(){for(var a=0,c=b.length;a<c;a++)if(d.contains(this,b[a]))return!0})},not:function(a){return this.pushStack(O(this,a,!1),"not",a)},filter:function(a){return this.pushStack(O(this,a,!0),"filter",a)},is:function(a){return!!a&&d.filter(a,this).length>0},closest:function(a,b){var c=[],e,f,g=this[0];if(d.isArray(a)){var h,i,j={},k=1;if(g&&a.length){for(e=0,f=a.length;e<f;e++)i=a[e],j[i]||(j[i]=d.expr.match.POS.test(i)?d(i,b||this.context):i);while(g&&g.ownerDocument&&g!==b){for(i in j)h=j[i],(h.jquery?h.index(g)>-1:d(g).is(h))&&c.push({selector:i,elem:g,level:k});g=g.parentNode,k++}}return c}var l=L.test(a)?d(a,b||this.context):null;for(e=0,f=this.length;e<f;e++){g=this[e];while(g){if(l?l.index(g)>-1:d.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b)break}}c=c.length>1?d.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a||typeof a==="string")return d.inArray(this[0],a?d(a):this.parent().children());return d.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a==="string"?d(a,b):d.makeArray(a),e=d.merge(this.get(),c);return this.pushStack(N(c[0])||N(e[0])?e:d.unique(e))},andSelf:function(){return this.add(this.prevObject)}}),d.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return d.dir(a,"parentNode")},parentsUntil:function(a,b,c){return d.dir(a,"parentNode",c)},next:function(a){return d.nth(a,2,"nextSibling")},prev:function(a){return d.nth(a,2,"previousSibling")},nextAll:function(a){return d.dir(a,"nextSibling")},prevAll:function(a){return d.dir(a,"previousSibling")},nextUntil:function(a,b,c){return d.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return d.dir(a,"previousSibling",c)},siblings:function(a){return d.sibling(a.parentNode.firstChild,a)},children:function(a){return d.sibling(a.firstChild)},contents:function(a){return d.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:d.makeArray(a.childNodes)}},function(a,b){d.fn[a]=function(c,e){var f=d.map(this,b,c),g=K.call(arguments);G.test(a)||(e=c),e&&typeof e==="string"&&(f=d.filter(e,f)),f=this.length>1&&!M[a]?d.unique(f):f,(this.length>1||I.test(e))&&H.test(a)&&(f=f.reverse());return this.pushStack(f,a,g.join(","))}}),d.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?d.find.matchesSelector(b[0],a)?[b[0]]:[]:d.find.matches(a,b)},dir:function(a,c,e){var f=[],g=a[c];while(g&&g.nodeType!==9&&(e===b||g.nodeType!==1||!d(g).is(e)))g.nodeType===1&&f.push(g),g=g[c];return f},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var P=/ jQuery\d+="(?:\d+|null)"/g,Q=/^\s+/,R=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,S=/<([\w:]+)/,T=/<tbody/i,U=/<|&#?\w+;/,V=/<(?:script|object|embed|option|style)/i,W=/checked\s*(?:[^=]|=\s*.checked.)/i,X={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]};X.optgroup=X.option,X.tbody=X.tfoot=X.colgroup=X.caption=X.thead,X.th=X.td,d.support.htmlSerialize||(X._default=[1,"div<div>","</div>"]),d.fn.extend({text:function(a){if(d.isFunction(a))return this.each(function(b){var c=d(this);c.text(a.call(this,b,c.text()))});if(typeof a!=="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return d.text(this)},wrapAll:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapAll(a.call(this,b))});if(this[0]){var b=d(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(d.isFunction(a))return this.each(function(b){d(this).wrapInner(a.call(this,b))});return this.each(function(){var b=d(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){d(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){d.nodeName(this,"body")||d(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=d(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,d(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,e;(e=this[c])!=null;c++)if(!a||d.filter(a,[e]).length)!b&&e.nodeType===1&&(d.cleanData(e.getElementsByTagName("*")),d.cleanData([e])),e.parentNode&&e.parentNode.removeChild(e);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&d.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return d.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(P,""):null;if(typeof a!=="string"||V.test(a)||!d.support.leadingWhitespace&&Q.test(a)||X[(S.exec(a)||["",""])[1].toLowerCase()])d.isFunction(a)?this.each(function(b){var c=d(this);c.html(a.call(this,b,c.html()))}):this.empty().append(a);else{a=a.replace(R,"<$1></$2>");try{for(var c=0,e=this.length;c<e;c++)this[c].nodeType===1&&(d.cleanData(this[c].getElementsByTagName("*")),this[c].innerHTML=a)}catch(f){this.empty().append(a)}}return this},replaceWith:function(a){if(this[0]&&this[0].parentNode){if(d.isFunction(a))return this.each(function(b){var c=d(this),e=c.html();c.replaceWith(a.call(this,b,e))});typeof a!=="string"&&(a=d(a).detach());return this.each(function(){var b=this.nextSibling,c=this.parentNode;d(this).remove(),b?d(b).before(a):d(c).append(a)})}return this.pushStack(d(d.isFunction(a)?a():a),"replaceWith",a)},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,e){var f,g,h,i,j=a[0],k=[];if(!d.support.checkClone&&arguments.length===3&&typeof j==="string"&&W.test(j))return this.each(function(){d(this).domManip(a,c,e,!0)});if(d.isFunction(j))return this.each(function(f){var g=d(this);a[0]=j.call(this,f,c?g.html():b),g.domManip(a,c,e)});if(this[0]){i=j&&j.parentNode,d.support.parentNode&&i&&i.nodeType===11&&i.childNodes.length===this.length?f={fragment:i}:f=d.buildFragment(a,this,k),h=f.fragment,h.childNodes.length===1?g=h=h.firstChild:g=h.firstChild;if(g){c=c&&d.nodeName(g,"tr");for(var l=0,m=this.length,n=m-1;l<m;l++)e.call(c?Y(this[l],g):this[l],f.cacheable||m>1&&l<n?d.clone(h,!0,!0):h)}k.length&&d.each(k,ba)}return this}}),d.buildFragment=function(a,b,e){var f,g,h,i=b&&b[0]?b[0].ownerDocument||b[0]:c;a.length===1&&typeof a[0]==="string"&&a[0].length<512&&i===c&&a[0].charAt(0)==="<"&&!V.test(a[0])&&(d.support.checkClone||!W.test(a[0]))&&(g=!0,h=d.fragments[a[0]],h&&(h!==1&&(f=h))),f||(f=i.createDocumentFragment(),d.clean(a,i,f,e)),g&&(d.fragments[a[0]]=h?f:1);return{fragment:f,cacheable:g}},d.fragments={},d.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){d.fn[a]=function(c){var e=[],f=d(c),g=this.length===1&&this[0].parentNode;if(g&&g.nodeType===11&&g.childNodes.length===1&&f.length===1){f[b](this[0]);return this}for(var h=0,i=f.length;h<i;h++){var j=(h>0?this.clone(!0):this).get();d(f[h])[b](j),e=e.concat(j)}return this.pushStack(e,a,f.selector)}}),d.extend({clone:function(a,b,c){var e=a.cloneNode(!0),f,g,h;if((!d.support.noCloneEvent||!d.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!d.isXMLDoc(a)){$(a,e),f=_(a),g=_(e);for(h=0;f[h];++h)$(f[h],g[h])}if(b){Z(a,e);if(c){f=_(a),g=_(e);for(h=0;f[h];++h)Z(f[h],g[h])}}return e},clean:function(a,b,e,f){b=b||c,typeof b.createElement==="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var g=[];for(var h=0,i;(i=a[h])!=null;h++){typeof i==="number"&&(i+="");if(!i)continue;if(typeof i!=="string"||U.test(i)){if(typeof i==="string"){i=i.replace(R,"<$1></$2>");var j=(S.exec(i)||["",""])[1].toLowerCase(),k=X[j]||X._default,l=k[0],m=b.createElement("div");m.innerHTML=k[1]+i+k[2];while(l--)m=m.lastChild;if(!d.support.tbody){var n=T.test(i),o=j==="table"&&!n?m.firstChild&&m.firstChild.childNodes:k[1]==="<table>"&&!n?m.childNodes:[];for(var p=o.length-1;p>=0;--p)d.nodeName(o[p],"tbody")&&!o[p].childNodes.length&&o[p].parentNode.removeChild(o[p])}!d.support.leadingWhitespace&&Q.test(i)&&m.insertBefore(b.createTextNode(Q.exec(i)[0]),m.firstChild),i=m.childNodes}}else i=b.createTextNode(i);i.nodeType?g.push(i):g=d.merge(g,i)}if(e)for(h=0;g[h];h++)!f||!d.nodeName(g[h],"script")||g[h].type&&g[h].type.toLowerCase()!=="text/javascript"?(g[h].nodeType===1&&g.splice.apply(g,[h+1,0].concat(d.makeArray(g[h].getElementsByTagName("script")))),e.appendChild(g[h])):f.push(g[h].parentNode?g[h].parentNode.removeChild(g[h]):g[h]);return g},cleanData:function(a){var b,c,e=d.cache,f=d.expando,g=d.event.special,h=d.support.deleteExpando;for(var i=0,j;(j=a[i])!=null;i++){if(j.nodeName&&d.noData[j.nodeName.toLowerCase()])continue;c=j[d.expando];if(c){b=e[c]&&e[c][f];if(b&&b.events){for(var k in b.events)g[k]?d.event.remove(j,k):d.removeEvent(j,k,b.handle);b.handle&&(b.handle.elem=null)}h?delete j[d.expando]:j.removeAttribute&&j.removeAttribute(d.expando),delete e[c]}}}});var bb=/alpha\([^)]*\)/i,bc=/opacity=([^)]*)/,bd=/-([a-z])/ig,be=/([A-Z])/g,bf=/^-?\d+(?:px)?$/i,bg=/^-?\d/,bh={position:"absolute",visibility:"hidden",display:"block"},bi=["Left","Right"],bj=["Top","Bottom"],bk,bl,bm,bn=function(a,b){return b.toUpperCase()};d.fn.css=function(a,c){if(arguments.length===2&&c===b)return this;return d.access(this,a,c,!0,function(a,c,e){return e!==b?d.style(a,c,e):d.css(a,c)})},d.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bk(a,"opacity","opacity");return c===""?"1":c}return a.style.opacity}}},cssNumber:{zIndex:!0,fontWeight:!0,opacity:!0,zoom:!0,lineHeight:!0},cssProps:{"float":d.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,e,f){if(a&&a.nodeType!==3&&a.nodeType!==8&&a.style){var g,h=d.camelCase(c),i=a.style,j=d.cssHooks[h];c=d.cssProps[h]||h;if(e===b){if(j&&"get"in j&&(g=j.get(a,!1,f))!==b)return g;return i[c]}if(typeof e==="number"&&isNaN(e)||e==null)return;typeof e==="number"&&!d.cssNumber[h]&&(e+="px");if(!j||!("set"in j)||(e=j.set(a,e))!==b)try{i[c]=e}catch(k){}}},css:function(a,c,e){var f,g=d.camelCase(c),h=d.cssHooks[g];c=d.cssProps[g]||g;if(h&&"get"in h&&(f=h.get(a,!0,e))!==b)return f;if(bk)return bk(a,c,g)},swap:function(a,b,c){var d={};for(var e in b)d[e]=a.style[e],a.style[e]=b[e];c.call(a);for(e in b)a.style[e]=d[e]},camelCase:function(a){return a.replace(bd,bn)}}),d.curCSS=d.css,d.each(["height","width"],function(a,b){d.cssHooks[b]={get:function(a,c,e){var f;if(c){a.offsetWidth!==0?f=bo(a,b,e):d.swap(a,bh,function(){f=bo(a,b,e)});if(f<=0){f=bk(a,b,b),f==="0px"&&bm&&(f=bm(a,b,b));if(f!=null)return f===""||f==="auto"?"0px":f}if(f<0||f==null){f=a.style[b];return f===""||f==="auto"?"0px":f}return typeof f==="string"?f:f+"px"}},set:function(a,b){if(!bf.test(b))return b;b=parseFloat(b);if(b>=0)return b+"px"}}}),d.support.opacity||(d.cssHooks.opacity={get:function(a,b){return bc.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style;c.zoom=1;var e=d.isNaN(b)?"":"alpha(opacity="+b*100+")",f=c.filter||"";c.filter=bb.test(f)?f.replace(bb,e):c.filter+" "+e}}),c.defaultView&&c.defaultView.getComputedStyle&&(bl=function(a,c,e){var f,g,h;e=e.replace(be,"-$1").toLowerCase();if(!(g=a.ownerDocument.defaultView))return b;if(h=g.getComputedStyle(a,null))f=h.getPropertyValue(e),f===""&&!d.contains(a.ownerDocument.documentElement,a)&&(f=d.style(a,e));return f}),c.documentElement.currentStyle&&(bm=function(a,b){var c,d=a.currentStyle&&a.currentStyle[b],e=a.runtimeStyle&&a.runtimeStyle[b],f=a.style;!bf.test(d)&&bg.test(d)&&(c=f.left,e&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":d||0,d=f.pixelLeft+"px",f.left=c,e&&(a.runtimeStyle.left=e));return d===""?"auto":d}),bk=bl||bm,d.expr&&d.expr.filters&&(d.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!d.support.reliableHiddenOffsets&&(a.style.display||d.css(a,"display"))==="none"},d.expr.filters.visible=function(a){return!d.expr.filters.hidden(a)});var bp=/%20/g,bq=/\[\]$/,br=/\r?\n/g,bs=/#.*$/,bt=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bu=/^(?:color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bv=/(?:^file|^widget|\-extension):$/,bw=/^(?:GET|HEAD)$/,bx=/^\/\//,by=/\?/,bz=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,bA=/^(?:select|textarea)/i,bB=/\s+/,bC=/([?&])_=[^&]*/,bD=/(^|\-)([a-z])/g,bE=function(a,b,c){return b+c.toUpperCase()},bF=/^([\w\+\.\-]+:)\/\/([^\/?#:]*)(?::(\d+))?/,bG=d.fn.load,bH={},bI={},bJ,bK;try{bJ=c.location.href}catch(bL){bJ=c.createElement("a"),bJ.href="",bJ=bJ.href}bK=bF.exec(bJ.toLowerCase()),d.fn.extend({load:function(a,c,e){if(typeof a!=="string"&&bG)return bG.apply(this,arguments);if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var g=a.slice(f,a.length);a=a.slice(0,f)}var h="GET";c&&(d.isFunction(c)?(e=c,c=b):typeof c==="object"&&(c=d.param(c,d.ajaxSettings.traditional),h="POST"));var i=this;d.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?d("<div>").append(c.replace(bz,"")).find(g):c)),e&&i.each(e,[c,b,a])}});return this},serialize:function(){return d.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?d.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bA.test(this.nodeName)||bu.test(this.type))}).map(function(a,b){var c=d(this).val();return c==null?null:d.isArray(c)?d.map(c,function(a,c){return{name:b.name,value:a.replace(br,"\r\n")}}):{name:b.name,value:c.replace(br,"\r\n")}}).get()}}),d.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){d.fn[b]=function(a){return this.bind(b,a)}}),d.each(["get","post"],function(a,c){d[c]=function(a,e,f,g){d.isFunction(e)&&(g=g||f,f=e,e=b);return d.ajax({type:c,url:a,data:e,success:f,dataType:g})}}),d.extend({getScript:function(a,c){return d.get(a,b,c,"script")},getJSON:function(a,b,c){return d.get(a,b,c,"json")},ajaxSetup:function(a,b){b?d.extend(!0,a,d.ajaxSettings,b):(b=a,a=d.extend(!0,d.ajaxSettings,b));for(var c in {context:1,url:1})c in b?a[c]=b[c]:c in d.ajaxSettings&&(a[c]=d.ajaxSettings[c]);return a},ajaxSettings:{url:bJ,isLocal:bv.test(bK[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":"*/*"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":d.parseJSON,"text xml":d.parseXML}},ajaxPrefilter:bM(bH),ajaxTransport:bM(bI),ajax:function(a,c){function v(a,c,l,n){if(r!==2){r=2,p&&clearTimeout(p),o=b,m=n||"",u.readyState=a?4:0;var q,t,v,w=l?bP(e,u,l):b,x,y;if(a>=200&&a<300||a===304){if(e.ifModified){if(x=u.getResponseHeader("Last-Modified"))d.lastModified[k]=x;if(y=u.getResponseHeader("Etag"))d.etag[k]=y}if(a===304)c="notmodified",q=!0;else try{t=bQ(e,w),c="success",q=!0}catch(z){c="parsererror",v=z}}else{v=c;if(!c||a)c="error",a<0&&(a=0)}u.status=a,u.statusText=c,q?h.resolveWith(f,[t,c,u]):h.rejectWith(f,[u,c,v]),u.statusCode(j),j=b,s&&g.trigger("ajax"+(q?"Success":"Error"),[u,e,q?t:v]),i.resolveWith(f,[u,c]),s&&(g.trigger("ajaxComplete",[u,e]),--d.active||d.event.trigger("ajaxStop"))}}typeof a==="object"&&(c=a,a=b),c=c||{};var e=d.ajaxSetup({},c),f=e.context||e,g=f!==e&&(f.nodeType||f instanceof d)?d(f):d.event,h=d.Deferred(),i=d._Deferred(),j=e.statusCode||{},k,l={},m,n,o,p,q,r=0,s,t,u={readyState:0,setRequestHeader:function(a,b){r||(l[a.toLowerCase().replace(bD,bE)]=b);return this},getAllResponseHeaders:function(){return r===2?m:null},getResponseHeader:function(a){var c;if(r===2){if(!n){n={};while(c=bt.exec(m))n[c[1].toLowerCase()]=c[2]}c=n[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){r||(e.mimeType=a);return this},abort:function(a){a=a||"abort",o&&o.abort(a),v(0,a);return this}};h.promise(u),u.success=u.done,u.error=u.fail,u.complete=i.done,u.statusCode=function(a){if(a){var b;if(r<2)for(b in a)j[b]=[j[b],a[b]];else b=a[u.status],u.then(b,b)}return this},e.url=((a||e.url)+"").replace(bs,"").replace(bx,bK[1]+"//"),e.dataTypes=d.trim(e.dataType||"*").toLowerCase().split(bB),e.crossDomain||(q=bF.exec(e.url.toLowerCase()),e.crossDomain=q&&(q[1]!=bK[1]||q[2]!=bK[2]||(q[3]||(q[1]==="http:"?80:443))!=(bK[3]||(bK[1]==="http:"?80:443)))),e.data&&e.processData&&typeof e.data!=="string"&&(e.data=d.param(e.data,e.traditional)),bN(bH,e,c,u);if(r===2)return!1;s=e.global,e.type=e.type.toUpperCase(),e.hasContent=!bw.test(e.type),s&&d.active++===0&&d.event.trigger("ajaxStart");if(!e.hasContent){e.data&&(e.url+=(by.test(e.url)?"&":"?")+e.data),k=e.url;if(e.cache===!1){var w=d.now(),x=e.url.replace(bC,"$1_="+w);e.url=x+(x===e.url?(by.test(e.url)?"&":"?")+"_="+w:"")}}if(e.data&&e.hasContent&&e.contentType!==!1||c.contentType)l["Content-Type"]=e.contentType;e.ifModified&&(k=k||e.url,d.lastModified[k]&&(l["If-Modified-Since"]=d.lastModified[k]),d.etag[k]&&(l["If-None-Match"]=d.etag[k])),l.Accept=e.dataTypes[0]&&e.accepts[e.dataTypes[0]]?e.accepts[e.dataTypes[0]]+(e.dataTypes[0]!=="*"?", */*; q=0.01":""):e.accepts["*"];for(t in e.headers)u.setRequestHeader(t,e.headers[t]);if(e.beforeSend&&(e.beforeSend.call(f,u,e)===!1||r===2)){u.abort();return!1}for(t in {success:1,error:1,complete:1})u[t](e[t]);o=bN(bI,e,c,u);if(o){u.readyState=1,s&&g.trigger("ajaxSend",[u,e]),e.async&&e.timeout>0&&(p=setTimeout(function(){u.abort("timeout")},e.timeout));try{r=1,o.send(l,v)}catch(y){status<2?v(-1,y):d.error(y)}}else v(-1,"No Transport");return u},param:function(a,c){var e=[],f=function(a,b){b=d.isFunction(b)?b():b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=d.ajaxSettings.traditional);if(d.isArray(a)||a.jquery&&!d.isPlainObject(a))d.each(a,function(){f(this.name,this.value)});else for(var g in a)bO(g,a[g],c,f);return e.join("&").replace(bp,"+")}}),d.extend({active:0,lastModified:{},etag:{}});var bR=d.now(),bS=/(\=)\?(&|$)|()\?\?()/i;d.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return d.expando+"_"+bR++}}),d.ajaxPrefilter("json jsonp",function(b,c,e){var f=typeof b.data==="string";if(b.dataTypes[0]==="jsonp"||c.jsonpCallback||c.jsonp!=null||b.jsonp!==!1&&(bS.test(b.url)||f&&bS.test(b.data))){var g,h=b.jsonpCallback=d.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2",m=function(){a[h]=i,g&&d.isFunction(i)&&a[h](g[0])};b.jsonp!==!1&&(j=j.replace(bS,l),b.url===j&&(f&&(k=k.replace(bS,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},e.then(m,m),b.converters["script json"]=function(){g||d.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),d.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){d.globalEval(a);return a}}}),d.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),d.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var bT=d.now(),bU,bV;d.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&bX()||bY()}:bX,bV=d.ajaxSettings.xhr(),d.support.ajax=!!bV,d.support.cors=bV&&"withCredentials"in bV,bV=b,d.support.ajax&&d.ajaxTransport(function(a){if(!a.crossDomain||d.support.cors){var c;return{send:function(e,f){var g=a.xhr(),h,i;a.username?g.open(a.type,a.url,a.async,a.username,a.password):g.open(a.type,a.url,a.async);if(a.xhrFields)for(i in a.xhrFields)g[i]=a.xhrFields[i];a.mimeType&&g.overrideMimeType&&g.overrideMimeType(a.mimeType),(!a.crossDomain||a.hasContent)&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(i in e)g.setRequestHeader(i,e[i])}catch(j){}g.send(a.hasContent&&a.data||null),c=function(e,i){var j,k,l,m,n;try{if(c&&(i||g.readyState===4)){c=b,h&&(g.onreadystatechange=d.noop,delete bU[h]);if(i)g.readyState!==4&&g.abort();else{j=g.status,l=g.getAllResponseHeaders(),m={},n=g.responseXML,n&&n.documentElement&&(m.xml=n),m.text=g.responseText;try{k=g.statusText}catch(o){k=""}j||!a.isLocal||a.crossDomain?j===1223&&(j=204):j=m.text?200:404}}}catch(p){i||f(-1,p)}m&&f(j,k,m,l)},a.async&&g.readyState!==4?(bU||(bU={},bW()),h=bT++,g.onreadystatechange=bU[h]=c):c()},abort:function(){c&&c(0,1)}}}});var bZ={},b$=/^(?:toggle|show|hide)$/,b_=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,ca,cb=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];d.fn.extend({show:function(a,b,c){var e,f;if(a||a===0)return this.animate(cc("show",3),a,b,c);for(var g=0,h=this.length;g<h;g++)e=this[g],f=e.style.display,!d._data(e,"olddisplay")&&f==="none"&&(f=e.style.display=""),f===""&&d.css(e,"display")==="none"&&d._data(e,"olddisplay",cd(e.nodeName));for(g=0;g<h;g++){e=this[g],f=e.style.display;if(f===""||f==="none")e.style.display=d._data(e,"olddisplay")||""}return this},hide:function(a,b,c){if(a||a===0)return this.animate(cc("hide",3),a,b,c);for(var e=0,f=this.length;e<f;e++){var g=d.css(this[e],"display");g!=="none"&&!d._data(this[e],"olddisplay")&&d._data(this[e],"olddisplay",g)}for(e=0;e<f;e++)this[e].style.display="none";return this},_toggle:d.fn.toggle,toggle:function(a,b,c){var e=typeof a==="boolean";d.isFunction(a)&&d.isFunction(b)?this._toggle.apply(this,arguments):a==null||e?this.each(function(){var b=e?a:d(this).is(":hidden");d(this)[b?"show":"hide"]()}):this.animate(cc("toggle",3),a,b,c);return this},fadeTo:function(a,b,c,d){return this.filter(":hidden").css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,e){var f=d.speed(b,c,e);if(d.isEmptyObject(a))return this.each(f.complete);return this[f.queue===!1?"each":"queue"](function(){var b=d.extend({},f),c,e=this.nodeType===1,g=e&&d(this).is(":hidden"),h=this;for(c in a){var i=d.camelCase(c);c!==i&&(a[i]=a[c],delete a[c],c=i);if(a[c]==="hide"&&g||a[c]==="show"&&!g)return b.complete.call(this);if(e&&(c==="height"||c==="width")){b.overflow=[this.style.overflow,this.style.overflowX,this.style.overflowY];if(d.css(this,"display")==="inline"&&d.css(this,"float")==="none")if(d.support.inlineBlockNeedsLayout){var j=cd(this.nodeName);j==="inline"?this.style.display="inline-block":(this.style.display="inline",this.style.zoom=1)}else this.style.display="inline-block"}d.isArray(a[c])&&((b.specialEasing=b.specialEasing||{})[c]=a[c][1],a[c]=a[c][0])}b.overflow!=null&&(this.style.overflow="hidden"),b.curAnim=d.extend({},a),d.each(a,function(c,e){var f=new d.fx(h,b,c);if(b$.test(e))f[e==="toggle"?g?"show":"hide":e](a);else{var i=b_.exec(e),j=f.cur();if(i){var k=parseFloat(i[2]),l=i[3]||(d.cssNumber[c]?"":"px");l!=="px"&&(d.style(h,c,(k||1)+l),j=(k||1)/f.cur()*j,d.style(h,c,j+l)),i[1]&&(k=(i[1]==="-="?-1:1)*k+j),f.custom(j,k,l)}else f.custom(j,e,"")}});return!0})},stop:function(a,b){var c=d.timers;a&&this.queue([]),this.each(function(){for(var a=c.length-1;a>=0;a--)c[a].elem===this&&(b&&c[a](!0),c.splice(a,1))}),b||this.dequeue();return this}}),d.each({slideDown:cc("show",1),slideUp:cc("hide",1),slideToggle:cc("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){d.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),d.extend({speed:function(a,b,c){var e=a&&typeof a==="object"?d.extend({},a):{complete:c||!c&&b||d.isFunction(a)&&a,duration:a,easing:c&&b||b&&!d.isFunction(b)&&b};e.duration=d.fx.off?0:typeof e.duration==="number"?e.duration:e.duration in d.fx.speeds?d.fx.speeds[e.duration]:d.fx.speeds._default,e.old=e.complete,e.complete=function(){e.queue!==!1&&d(this).dequeue(),d.isFunction(e.old)&&e.old.call(this)};return e},easing:{linear:function(a,b,c,d){return c+d*a},swing:function(a,b,c,d){return(-Math.cos(a*Math.PI)/2+.5)*d+c}},timers:[],fx:function(a,b,c){this.options=b,this.elem=a,this.prop=c,b.orig||(b.orig={})}}),d.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this),(d.fx.step[this.prop]||d.fx.step._default)(this)},cur:function(){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];var a,b=d.css(this.elem,this.prop);return isNaN(a=parseFloat(b))?!b||b==="auto"?0:b:a},custom:function(a,b,c){function g(a){return e.step(a)}var e=this,f=d.fx;this.startTime=d.now(),this.start=a,this.end=b,this.unit=c||this.unit||(d.cssNumber[this.prop]?"":"px"),this.now=this.start,this.pos=this.state=0,g.elem=this.elem,g()&&d.timers.push(g)&&!ca&&(ca=setInterval(f.tick,f.interval))},show:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.show=!0,this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur()),d(this.elem).show()},hide:function(){this.options.orig[this.prop]=d.style(this.elem,this.prop),this.options.hide=!0,this.custom(this.cur(),0)},step:function(a){var b=d.now(),c=!0;if(a||b>=this.options.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),this.options.curAnim[this.prop]=!0;for(var e in this.options.curAnim)this.options.curAnim[e]!==!0&&(c=!1);if(c){if(this.options.overflow!=null&&!d.support.shrinkWrapBlocks){var f=this.elem,g=this.options;d.each(["","X","Y"],function(a,b){f.style["overflow"+b]=g.overflow[a]})}this.options.hide&&d(this.elem).hide();if(this.options.hide||this.options.show)for(var h in this.options.curAnim)d.style(this.elem,h,this.options.orig[h]);this.options.complete.call(this.elem)}return!1}var i=b-this.startTime;this.state=i/this.options.duration;var j=this.options.specialEasing&&this.options.specialEasing[this.prop],k=this.options.easing||(d.easing.swing?"swing":"linear");this.pos=d.easing[j||k](this.state,i,0,1,this.options.duration),this.now=this.start+(this.end-this.start)*this.pos,this.update();return!0}},d.extend(d.fx,{tick:function(){var a=d.timers;for(var b=0;b<a.length;b++)a[b]()||a.splice(b--,1);a.length||d.fx.stop()},interval:13,stop:function(){clearInterval(ca),ca=null},speeds:{slow:600,fast:200,_default:400},step:{opacity:function(a){d.style(a.elem,"opacity",a.now)},_default:function(a){a.elem.style&&a.elem.style[a.prop]!=null?a.elem.style[a.prop]=(a.prop==="width"||a.prop==="height"?Math.max(0,a.now):a.now)+a.unit:a.elem[a.prop]=a.now}}}),d.expr&&d.expr.filters&&(d.expr.filters.animated=function(a){return d.grep(d.timers,function(b){return a===b.elem}).length});var ce=/^t(?:able|d|h)$/i,cf=/^(?:body|html)$/i;"getBoundingClientRect"in c.documentElement?d.fn.offset=function(a){var b=this[0],c;if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);try{c=b.getBoundingClientRect()}catch(e){}var f=b.ownerDocument,g=f.documentElement;if(!c||!d.contains(g,b))return c?{top:c.top,left:c.left}:{top:0,left:0};var h=f.body,i=cg(f),j=g.clientTop||h.clientTop||0,k=g.clientLeft||h.clientLeft||0,l=i.pageYOffset||d.support.boxModel&&g.scrollTop||h.scrollTop,m=i.pageXOffset||d.support.boxModel&&g.scrollLeft||h.scrollLeft,n=c.top+l-j,o=c.left+m-k;return{top:n,left:o}}:d.fn.offset=function(a){var b=this[0];if(a)return this.each(function(b){d.offset.setOffset(this,a,b)});if(!b||!b.ownerDocument)return null;if(b===b.ownerDocument.body)return d.offset.bodyOffset(b);d.offset.initialize();var c,e=b.offsetParent,f=b,g=b.ownerDocument,h=g.documentElement,i=g.body,j=g.defaultView,k=j?j.getComputedStyle(b,null):b.currentStyle,l=b.offsetTop,m=b.offsetLeft;while((b=b.parentNode)&&b!==i&&b!==h){if(d.offset.supportsFixedPosition&&k.position==="fixed")break;c=j?j.getComputedStyle(b,null):b.currentStyle,l-=b.scrollTop,m-=b.scrollLeft,b===e&&(l+=b.offsetTop,m+=b.offsetLeft,d.offset.doesNotAddBorder&&(!d.offset.doesAddBorderForTableAndCells||!ce.test(b.nodeName))&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),f=e,e=b.offsetParent),d.offset.subtractsBorderForOverflowNotVisible&&c.overflow!=="visible"&&(l+=parseFloat(c.borderTopWidth)||0,m+=parseFloat(c.borderLeftWidth)||0),k=c}if(k.position==="relative"||k.position==="static")l+=i.offsetTop,m+=i.offsetLeft;d.offset.supportsFixedPosition&&k.position==="fixed"&&(l+=Math.max(h.scrollTop,i.scrollTop),m+=Math.max(h.scrollLeft,i.scrollLeft));return{top:l,left:m}},d.offset={initialize:function(){var a=c.body,b=c.createElement("div"),e,f,g,h,i=parseFloat(d.css(a,"marginTop"))||0,j="<div style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;'><div></div></div><table style='position:absolute;top:0;left:0;margin:0;border:5px solid #000;padding:0;width:1px;height:1px;' cellpadding='0' cellspacing='0'><tr><td></td></tr></table>";d.extend(b.style,{position:"absolute",top:0,left:0,margin:0,border:0,width:"1px",height:"1px",visibility:"hidden"}),b.innerHTML=j,a.insertBefore(b,a.firstChild),e=b.firstChild,f=e.firstChild,h=e.nextSibling.firstChild.firstChild,this.doesNotAddBorder=f.offsetTop!==5,this.doesAddBorderForTableAndCells=h.offsetTop===5,f.style.position="fixed",f.style.top="20px",this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15,f.style.position=f.style.top="",e.style.overflow="hidden",e.style.position="relative",this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5,this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==i,a.removeChild(b),a=b=e=f=g=h=null,d.offset.initialize=d.noop},bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;d.offset.initialize(),d.offset.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(d.css(a,"marginTop"))||0,c+=parseFloat(d.css(a,"marginLeft"))||0);return{top:b,left:c}},setOffset:function(a,b,c){var e=d.css(a,"position");e==="static"&&(a.style.position="relative");var f=d(a),g=f.offset(),h=d.css(a,"top"),i=d.css(a,"left"),j=e==="absolute"&&d.inArray("auto",[h,i])>-1,k={},l={},m,n;j&&(l=f.position()),m=j?l.top:parseInt(h,10)||0,n=j?l.left:parseInt(i,10)||0,d.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):f.css(k)}},d.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),e=cf.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(d.css(a,"marginTop"))||0,c.left-=parseFloat(d.css(a,"marginLeft"))||0,e.top+=parseFloat(d.css(b[0],"borderTopWidth"))||0,e.left+=parseFloat(d.css(b[0],"borderLeftWidth"))||0;return{top:c.top-e.top,left:c.left-e.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&(!cf.test(a.nodeName)&&d.css(a,"position")==="static"))a=a.offsetParent;return a})}}),d.each(["Left","Top"],function(a,c){var e="scroll"+c;d.fn[e]=function(c){var f=this[0],g;if(!f)return null;if(c!==b)return this.each(function(){g=cg(this),g?g.scrollTo(a?d(g).scrollLeft():c,a?c:d(g).scrollTop()):this[e]=c});g=cg(f);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:d.support.boxModel&&g.document.documentElement[e]||g.document.body[e]:f[e]}}),d.each(["Height","Width"],function(a,c){var e=c.toLowerCase();d.fn["inner"+c]=function(){return this[0]?parseFloat(d.css(this[0],e,"padding")):null},d.fn["outer"+c]=function(a){return this[0]?parseFloat(d.css(this[0],e,a?"margin":"border")):null},d.fn[e]=function(a){var f=this[0];if(!f)return a==null?null:this;if(d.isFunction(a))return this.each(function(b){var c=d(this);c[e](a.call(this,b,c[e]()))});if(d.isWindow(f)){var g=f.document.documentElement["client"+c];return f.document.compatMode==="CSS1Compat"&&g||f.document.body["client"+c]||g}if(f.nodeType===9)return Math.max(f.documentElement["client"+c],f.body["scroll"+c],f.documentElement["scroll"+c],f.body["offset"+c],f.documentElement["offset"+c]);if(a===b){var h=d.css(f,e),i=parseFloat(h);return d.isNaN(i)?h:i}return this.css(e,typeof a==="string"?a:a+"px")}}),a.jQuery=a.$=d})(window);
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/script.js b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/script.js
new file mode 100644
index 000000000..e66f4ffb6
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/script.js
@@ -0,0 +1,63 @@
+
+jQuery(function($){
+// Global Navigation Bar
+	var gnb = $('.header>ul.gnb');
+	var gnbItem = gnb.find('>li.m1');
+	var subItem = gnb.find('>li.m1>div.sub');
+	var lastEvent = null;
+	subItem.hide();
+	
+	function gnbToggle(){
+		var t = $(this);
+		gnbItem.removeClass('m_on');
+		t.parent('li.m1').addClass('m_on');
+		if (t.next('div.sub').is(':hidden') || t.next('div.sub').length == 0) {
+			gnbItem.find('div.sub').hide();
+			gnbItem.find('a').removeClass('m_on');
+			t.next('div.sub').show();
+			t.next('div.sub').find('a').attr('class','');
+			t.parent('li.m1').addClass('m_on');
+		}; 
+	};
+	function gnbOut(){
+		gnbItem.find('>div.sub').hide();
+		$(this).removeClass('m_on');
+	};
+
+	gnbItem.find('>a.m1_a').mouseover(gnbToggle);
+	gnbItem.mouseleave(gnbOut);
+
+	gnbItem.find('>a.m1_a').focus(function() {
+		var t = $(this);
+		gnbItem.removeClass('m_on');
+		if (t.next('div.sub').is(':hidden') || t.next('div.sub').length == 0) {
+			gnbItem.find('div.sub').hide();
+			gnbItem.find('a').removeClass('m_on');
+			t.next('div.sub').show();
+			t.next('div.sub').find('a').attr('class','');
+			t.parent('li.m1').addClass('m_on');
+		}; 
+		t.parent('li.m1').addClass('m_on');
+	});
+
+	gnbItem.find('>a.m1_a').next('div.sub').find('a').focus(function() {
+		var t = $(this);
+		t.attr('class','a_on');
+
+	});
+
+// Select Language
+	var langBtn = $('dl#selectLang>dd>div.langBtn');
+	var langSet = $('dl#selectLang>dd>ul.langSet');
+	langBtn.click(function(){
+		//alert('Hi there');
+		langBtn.next('ul.langSet').toggle();
+	});
+	langSet.find('>li').hover(
+		function(){$(this).addClass('on')},
+		function(){$(this).removeClass('on')}
+	);
+		
+		
+
+});
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/slides.min.jquery.js b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/slides.min.jquery.js
new file mode 100644
index 000000000..bf3da85c0
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/slides.min.jquery.js
@@ -0,0 +1,19 @@
+/*
+* Slides, A Slideshow Plugin for jQuery
+* Intructions: http://slidesjs.com
+* By: Nathan Searles, http://nathansearles.com
+* Version: 1.1.8
+* Updated: June 1st, 2011
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/(function(A){A.fn.slides=function(B){B=A.extend({},A.fn.slides.option,B);return this.each(function(){A("."+B.container,A(this)).children().wrapAll('<div class="slides_control"/>');var V=A(this),J=A(".slides_control",V),Z=J.children().size(),Q=J.children().outerWidth(),M=J.children().outerHeight(),D=B.start-1,L=B.effect.indexOf(",")<0?B.effect:B.effect.replace(" ","").split(",")[0],S=B.effect.indexOf(",")<0?L:B.effect.replace(" ","").split(",")[1],O=0,N=0,C=0,P=0,U,H,I,X,W,T,K,F;function E(c,b,a){if(!H&&U){H=true;B.animationStart(P+1);switch(c){case"next":N=P;O=P+1;O=Z===O?0:O;X=Q*2;c=-Q*2;P=O;break;case"prev":N=P;O=P-1;O=O===-1?Z-1:O;X=0;c=0;P=O;break;case"pagination":O=parseInt(a,10);N=A("."+B.paginationClass+" li."+B.currentClass+" a",V).attr("href").match("[^#/]+$");if(O>N){X=Q*2;c=-Q*2;}else{X=0;c=0;}P=O;break;}if(b==="fade"){if(B.crossfade){J.children(":eq("+O+")",V).css({zIndex:10}).fadeIn(B.fadeSpeed,B.fadeEasing,function(){if(B.autoHeight){J.animate({height:J.children(":eq("+O+")",V).outerHeight()},B.autoHeightSpeed,function(){J.children(":eq("+N+")",V).css({display:"none",zIndex:0});J.children(":eq("+O+")",V).css({zIndex:0});B.animationComplete(O+1);H=false;});}else{J.children(":eq("+N+")",V).css({display:"none",zIndex:0});J.children(":eq("+O+")",V).css({zIndex:0});B.animationComplete(O+1);H=false;}});}else{J.children(":eq("+N+")",V).fadeOut(B.fadeSpeed,B.fadeEasing,function(){if(B.autoHeight){J.animate({height:J.children(":eq("+O+")",V).outerHeight()},B.autoHeightSpeed,function(){J.children(":eq("+O+")",V).fadeIn(B.fadeSpeed,B.fadeEasing);});}else{J.children(":eq("+O+")",V).fadeIn(B.fadeSpeed,B.fadeEasing,function(){if(A.browser.msie){A(this).get(0).style.removeAttribute("filter");}});}B.animationComplete(O+1);H=false;});}}else{J.children(":eq("+O+")").css({left:X,display:"block"});if(B.autoHeight){J.animate({left:c,height:J.children(":eq("+O+")").outerHeight()},B.slideSpeed,B.slideEasing,function(){J.css({left:-Q});J.children(":eq("+O+")").css({left:Q,zIndex:5});J.children(":eq("+N+")").css({left:Q,display:"none",zIndex:0});B.animationComplete(O+1);H=false;});}else{J.animate({left:c},B.slideSpeed,B.slideEasing,function(){J.css({left:-Q});J.children(":eq("+O+")").css({left:Q,zIndex:5});J.children(":eq("+N+")").css({left:Q,display:"none",zIndex:0});B.animationComplete(O+1);H=false;});}}if(B.pagination){A("."+B.paginationClass+" li."+B.currentClass,V).removeClass(B.currentClass);A("."+B.paginationClass+" li:eq("+O+")",V).addClass(B.currentClass);}}}function R(){clearInterval(V.data("interval"));}function G(){if(B.pause){clearTimeout(V.data("pause"));clearInterval(V.data("interval"));K=setTimeout(function(){clearTimeout(V.data("pause"));F=setInterval(function(){E("next",L);},B.play);V.data("interval",F);},B.pause);V.data("pause",K);}else{R();}}if(Z<2){return ;}if(D<0){D=0;}if(D>Z){D=Z-1;}if(B.start){P=D;}if(B.randomize){J.randomize();}A("."+B.container,V).css({overflow:"hidden",position:"relative"});J.children().css({position:"absolute",top:0,left:J.children().outerWidth(),zIndex:0,display:"none"});J.css({position:"relative",width:(Q*3),height:M,left:-Q});A("."+B.container,V).css({display:"block"});if(B.autoHeight){J.children().css({height:"auto"});J.animate({height:J.children(":eq("+D+")").outerHeight()},B.autoHeightSpeed);}if(B.preload&&J.find("img:eq("+D+")").length){A("."+B.container,V).css({background:"url("+B.preloadImage+") no-repeat 50% 50%"});var Y=J.find("img:eq("+D+")").attr("src")+"?"+(new Date()).getTime();if(A("img",V).parent().attr("class")!="slides_control"){T=J.children(":eq(0)")[0].tagName.toLowerCase();}else{T=J.find("img:eq("+D+")");}J.find("img:eq("+D+")").attr("src",Y).load(function(){J.find(T+":eq("+D+")").fadeIn(B.fadeSpeed,B.fadeEasing,function(){A(this).css({zIndex:5});A("."+B.container,V).css({background:""});U=true;B.slidesLoaded();});});}else{J.children(":eq("+D+")").fadeIn(B.fadeSpeed,B.fadeEasing,function(){U=true;B.slidesLoaded();});}if(B.bigTarget){J.children().css({cursor:"pointer"});J.children().click(function(){E("next",L);return false;});}if(B.hoverPause&&B.play){J.bind("mouseover",function(){R();});J.bind("mouseleave",function(){G();});}if(B.generateNextPrev){A("."+B.container,V).after('<a href="#" class="'+B.prev+'">Prev</a>');A("."+B.prev,V).after('<a href="#" class="'+B.next+'">Next</a>');}A("."+B.next,V).click(function(a){a.preventDefault();if(B.play){G();}E("next",L);});A("."+B.prev,V).click(function(a){a.preventDefault();if(B.play){G();}E("prev",L);});if(B.generatePagination){if(B.prependPagination){V.prepend("<ul class="+B.paginationClass+"></ul>");}else{V.append("<ul class="+B.paginationClass+"></ul>");}J.children().each(function(){A("."+B.paginationClass,V).append('<li><a href="#'+C+'">'+(C+1)+"</a></li>");C++;});}else{A("."+B.paginationClass+" li a",V).each(function(){A(this).attr("href","#"+C);C++;});}A("."+B.paginationClass+" li:eq("+D+")",V).addClass(B.currentClass);A("."+B.paginationClass+" li a",V).click(function(){if(B.play){G();}I=A(this).attr("href").match("[^#/]+$");if(P!=I){E("pagination",S,I);}return false;});A("a.link",V).click(function(){if(B.play){G();}I=A(this).attr("href").match("[^#/]+$")-1;if(P!=I){E("pagination",S,I);}return false;});if(B.play){F=setInterval(function(){E("next",L);},B.play);V.data("interval",F);}});};A.fn.slides.option={preload:false,preloadImage:"/common/img/loading.gif",container:"slides_container",generateNextPrev:false,next:"next",prev:"prev",pagination:true,generatePagination:true,prependPagination:false,paginationClass:"pagination",currentClass:"current",fadeSpeed:350,fadeEasing:"",slideSpeed:350,slideEasing:"",start:1,effect:"slide",crossfade:false,randomize:false,play:0,pause:0,hoverPause:false,autoHeight:false,autoHeightSpeed:350,bigTarget:false,animationStart:function(){},animationComplete:function(){},slidesLoaded:function(){}};A.fn.randomize=function(C){function B(){return(Math.round(Math.random())-0.5);}return(A(this).each(function(){var F=A(this);var E=F.children();var D=E.length;if(D>1){E.hide();var G=[];for(i=0;i<D;i++){G[G.length]=i;}G=G.sort(B);A.each(G,function(I,H){var K=E.eq(H);var J=K.clone(true);J.show().appendTo(F);if(C!==undefined){C(K,J);}K.remove();});}}));};})(jQuery);
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/xe_official.js b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/xe_official.js
new file mode 100644
index 000000000..fa07e21f5
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/js/xe_official.js
@@ -0,0 +1,7 @@
+jQuery(function($){
+	// Language Select
+	$('.language>.toggle').click(function(){
+		$('.selectLang').toggle();
+	});
+    
+});
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html
new file mode 100644
index 000000000..4542dd1be
--- /dev/null
+++ b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/layout.html
@@ -0,0 +1,166 @@
+<load target="js/script.js" />
+<load target="js/slides.min.jquery.js" />
+<load target="css/style.css" />
+<load target="css/banner.css" />
+
+<!--@if(!$layout_info->use_banner)-->
+	{@ $layout_info->use_banner = 'demo';}
+<!--@end-->
+<div id="wrap">
+<div class="top">
+    <div class="header">
+    	<div class="logo">
+			<a href="{$layout_info->index_url}" cond="$layout_info->logo_image"><img src="{$layout_info->logo_image}" class="iePngFix" alt="LOGO" title="LOGO" /></a>
+			<a href="{$layout_info->index_url}" cond="!$layout_info->logo_image">{$layout_info->logo_image_alt}</a>
+		</div>
+		<ul class="gnb">
+        	<!--<li class="m1 m_on">-->
+			<li loop="$main_menu->list=>$key1,$val1" class="m1">
+				<a class="m1_a" href="{$val1['href']}" target="_blank"|cond="$val1['open_window']=='Y'"><span class="m1_span">{$val1['link']}</span></a>
+				<div class="sub" cond="$val1['list']">
+					<ul class="lnb">
+						<li loop="$val1['list']=>$key2,$val2" class="s1"><a href="{$val2['href']}" target="_blank"|cond="$val2['open_window']=='Y'">{$val2['link']}</a></li>
+					</ul>
+					<div class="bottom"><span></span></div>
+				</div>
+			</li>
+        </ul><!-- //gnb -->
+		<img class="zbxe_widget_output" widget="login_info" skin="xe_solid_enterprise_login" colorset="default" />
+
+    </div><!-- //header -->
+</div><!-- //top -->
+
+<div class="main">
+	<!--@if($layout_info->use_banner == 'custom')-->
+		{@ $hasImage = 0;}
+		<!--@if($layout_info->banner_image_1 || $layout_info->banner_image_2 || $layout_info->banner_image_3 || $layout_info->banner_image_4 || $layout_info->banner_image_5)-->
+			{@ $hasImage = 1;}
+		<!--@end-->
+	<!--@end-->
+
+	<!--@if($layout_info->use_banner == 'demo' || ($layout_info->use_banner == 'custom' && $hasImage == 1) )-->
+		<!--@if($act != 'dispMemberInfo' && $act != 'dispMemberScrappedDocument' && $act != 'dispMemberSavedDocument' && $act != 'dispMemberOwnDocument' && $act != 'dispCommunicationFriend' && $act != 'dispCommunicationMessages' && $act != 'dispMemberSignUpForm' && $act != 'dispMemberFindAccount' && $act != 'dispMemberResendAuthMail' )-->
+			<div class="slide_banner" style="display:none">
+				<div class="slide_widget">
+					<div class="mask">
+						<div id="slides" class="slides">
+							<div class="slides_container">
+								<!--@if($layout_info->use_banner == 'demo')-->
+									<!--@for($i=1; $i<=3; $i++)-->
+										{@ $banner_image_src = './themes/xe_solid_enterprise/layouts/xe_solid_enterprise/images/defaultImg'.$i.'.jpg';}
+										<div>
+											<div class="section section">
+												<div>
+													<a href="http://www.xpressengine.com"><img src="{$banner_image_src}" width='958px' height='396px'/></a>
+												</div>
+											</div>
+										</div>
+									<!--@end-->
+								<!--@end-->
+
+								<!--@if($layout_info->use_banner == 'custom')-->
+									<!--@for($i=1; $i<6; $i++)-->
+										{@
+										   $banner_image_src = null;
+										   $banner_image_url = 'http://www.xpressengine.com';
+										}
+										<!--@if($i==1 && $layout_info->banner_image_1)-->
+											{@ $banner_image_src = $layout_info->banner_image_1;
+											   $banner_image_url = $layout_info->url_image_1;}
+										<!--@elseif($i==2 && $layout_info->banner_image_2)-->
+											{@ $banner_image_src = $layout_info->banner_image_2;
+											   $banner_image_url = $layout_info->url_image_2;}
+										<!--@elseif($i==3 && $layout_info->banner_image_3)-->
+											{@ $banner_image_src = $layout_info->banner_image_3;
+											   $banner_image_url = $layout_info->url_image_3;}
+										<!--@elseif($i==4 && $layout_info->banner_image_4)-->
+											{@ $banner_image_src = $layout_info->banner_image_4;
+											   $banner_image_url = $layout_info->url_image_4;}
+										<!--@elseif($i==5 && $layout_info->banner_image_5)-->
+											{@ $banner_image_src = $layout_info->banner_image_5;
+											   $banner_image_url = $layout_info->url_image_5;}
+										<!--@end-->
+										<!--@if($banner_image_src)-->
+											<div>
+												<div class="section section">
+													<div>
+														<a href="{$banner_image_url}"><img src="{$banner_image_src}" width='958px' height='396px'/></a>
+													</div>
+												</div>
+											</div>
+										<!--@end-->
+								<!--@end-->
+							<!--@end-->
+							</div>
+						</div>
+						<div id="shadow" class="shadow" style="height:99px!important;display:none">
+							<img src="./images/slide_shadow.png" height="99" width="927" alt="" class="iePngFix" />
+						</div>
+					</div>
+				</div>
+			</div>
+		<!--@end-->
+	<!--@end-->
+    <div class="container">
+		<div class="search_box_layout">
+			<form action="{getUrl()}" method="get">
+			<input type="hidden" name="vid" value="{$vid}" />
+			<input type="hidden" name="mid" value="{$mid}" />
+			<input type="hidden" name="act" value="IS" />
+			<div class="inputBox">
+				<input type="text" name="is_keyword" class="inputTypeText" value="{$is_keyword}" />
+				<input type="image" src="images/icon_search.gif" class="is_submit" value="{$lang->cmd_search}" />
+			</div>
+			</form>
+		</div><!-- //search_box -->
+    	{$content}
+    </div><!-- //container -->
+</div><!-- //main -->
+
+<div class="footer">
+	<p class="footer_p">Powered by <span class="fwB">XE</span></p>
+    <dl id="selectLang">
+    	<dt>language</dt>
+        <dd>
+        	<div class="langBtn" title="{$lang_type}">{$lang_supported[$lang_type]}</div>
+            <ul class="langSet">
+				<li loop="$lang_supported=>$key,$val" cond="$key!= $lang_type">
+				<a onclick="doChangeLangType('{$key}');return false;" href="#">{$val}</a>
+				</li>
+			</ul>
+        </dd>
+    </dl>
+</div><!-- //tail -->
+</div><!-- //#wrap -->
+
+<script type="text/javascript">
+jQuery(function($){
+	$('#slides').slides({
+		preload: true,
+		generateNextPrev: false,
+		play: 5000,
+		slideSpeed:1000,
+		paginationClass: "pagination",
+		pause:1,
+		hoverPause: true
+	});
+
+	$(".pagination").addClass('pagination');
+	$('ul.pagination li a').html('&nbsp;&nbsp;');
+
+	if($.browser.msie&&($.browser.version == "6.0")&&!$.support.style){
+		var width = $('ul.pagination').width()+30;
+		$('ul.pagination').width(width);
+		$('div#shadow').css('margin-top','-120px');
+		if('{$act}' == 'IS'){
+			$('div#shadow').css('margin-top','-150px');
+			$('.slide_widget').find('ul').css('bottom','33px');
+		}
+	}
+	if('{$act}' == 'IS')
+		$('.slide_widget').find('ul').css('bottom','33px');
+
+	$('div.slide_banner').show();
+	$('#shadow').show();
+});
+</script>
diff --git a/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/thumbnail.png b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/thumbnail.png
new file mode 100644
index 000000000..481ee4427
Binary files /dev/null and b/themes/xe_solid_enterprise/layouts/xe_solid_enterprise/thumbnail.png differ
diff --git a/themes/xe_solid_enterprise/modules/communication/add_friend.html b/themes/xe_solid_enterprise/modules/communication/add_friend.html
new file mode 100644
index 000000000..70f1ac9a1
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/add_friend.html
@@ -0,0 +1,36 @@
+<!--%import("filter/add_friend.xml")-->
+<!--%import("js/communication.js")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_add_friend}</h3>
+</div>
+
+<form action="./" method="get" onsubmit="return procFilter(this, add_friend)">
+<input type="hidden" name="target_srl" value="{$target_info->member_srl}" />
+
+<div id="popBody">
+
+        <table cellspacing="0" class="rowTable">
+        <tr>
+            <th><div>{$lang->nick_name}</div></th>
+            <td><div class="member_{$target_info->member_srl}">{$target_info->nick_name}</div></td>
+        </tr>
+        <tr>
+            <th><div>{$lang->friend_group}</div></th>
+            <td colspan="2">
+                <select name="friend_group_srl" class="fl">
+                    <option value="">{$lang->default_friend_group}</option>
+                    <!--@foreach($friend_group_list as $key => $val)-->
+                    <option value="{$val->friend_group_srl}">{$val->title}</option>
+                    <!--@end-->
+                </select> <a href="{getUrl('act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_add_friend_group}</span></a></span>
+            </td>
+        </tr>
+        </table>
+</div>
+
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_add_friend}" /></span>
+</div>
+
+</form>
diff --git a/themes/xe_solid_enterprise/modules/communication/add_friend_group.html b/themes/xe_solid_enterprise/modules/communication/add_friend_group.html
new file mode 100644
index 000000000..8283a8740
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/add_friend_group.html
@@ -0,0 +1,30 @@
+<!--%import("filter/add_friend_group.xml")-->
+<!--%import("js/communication.js")-->
+
+<div id="popHeader">
+    <h3 class="xeAdmin">
+        <!--@if($friend_group->friend_group_srl)-->
+            {$lang->cmd_rename_friend_group}
+        <!--@else-->
+            {$lang->cmd_add_friend_group}
+        <!--@end-->
+    </h3>
+</div>
+<form action="./" method="get" onsubmit="return procFilter(this, add_friend_group)">
+<input type="hidden" name="friend_group_srl" value="{$friend_group->friend_group_srl}" />
+
+<div id="popBody">
+
+        <div class="text">
+            <p>{$lang->msg_insert_group_name}</p>
+            <input name="title" type="text" class="inputTypeText" value="{htmlspecialchars($friend_group->title)}"/>
+        </div>
+</div>
+<div id="popFooter">
+    <!--@if($friend_group->friend_group_srl)-->
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_modify}" /></span>
+    <!--@else-->
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_insert}" /></span>
+    <!--@end-->
+</div>
+</form>
diff --git a/themes/xe_solid_enterprise/modules/communication/common_footer.html b/themes/xe_solid_enterprise/modules/communication/common_footer.html
new file mode 100644
index 000000000..04f5b8449
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/common_footer.html
@@ -0,0 +1 @@
+</div>
diff --git a/themes/xe_solid_enterprise/modules/communication/common_header.html b/themes/xe_solid_enterprise/modules/communication/common_header.html
new file mode 100644
index 000000000..a3357c384
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/common_header.html
@@ -0,0 +1,17 @@
+<!--%import("js/communication.js")-->
+<!--%import("css/style.css")-->
+
+
+<div id="communicationModule">
+
+    <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
+    <ul class="localNavigation">
+		<li class="mLeft"><img src="images/title_bg_left.gif" width="3" height="31" alt="" /></li>
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+
+		<li class="item <!--@if($key == $act)-->l_on<!--@end-->"><!--@if($key == $act)--><span class="l_on_left"></span><!--@end--><a href="{getUrl('act',$key)}">{Context::getLang($val)}</a></li>
+        <!--@end-->
+		
+        <li class="mRight"><img src="images/title_bg_right.gif" width="5" height="31" alt="" /></li>
+    </ul>
+    <!--@end-->
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/modules/communication/css/style.css b/themes/xe_solid_enterprise/modules/communication/css/style.css
new file mode 100644
index 000000000..aee82cb1b
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/css/style.css
@@ -0,0 +1,151 @@
+@charset "utf-8";
+/* CSS Document */
+#communicationModule							{font-family:Arial, Helvetica, sans-serif;}
+
+#communicationModule caption{ font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
+/* Button */
+a.grayBtn								{display:inline-block;height:29px;padding-left:4px; background:url(../images/btn_gray_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+a.grayBtn span							{display:inline-block;height:24px;padding:5px 14px 0 11px;white-space:nowrap;color:#FFF;font-weight:bold;background:url(../images/btn_gray_right.gif) no-repeat top right;}
+a.whiteBtn								{display:inline-block;height:29px;padding-left:4px; background:url(../images/btn_white_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+a.whiteBtn span							{display:inline-block;height:24px;padding:5px 14px 0 11px;white-space:nowrap;color:#808080;font-weight:bold;background:url(../images/btn_white_right.gif) no-repeat top right;}
+span.whiteBtn							{display:inline-block;height:27px;padding-left:4px; vertical-align:middle; _vertical-align:baseline; white-space:nowrap; background:url(../images/btn_white_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+span.whiteBtn input						{display:inline-block;height:29px;white-space:nowrap;color:#808080;font-weight:bold;background:url(../images/btn_white_right.gif) no-repeat top right;cursor:pointer; border:0 none; top;font-size:12px;font-family:Arial, Helvetica, sans-serif; vertical-align:middle; text-align: line-height:11px;}
+span.grayBtn							{display:inline-block;height:27px;padding-left:4px; vertical-align:middle; _vertical-align:baseline; white-space:nowrap; background:url(../images/btn_gray_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+span.grayBtn input						{display:inline-block;padding:0 12px 0 7px;height:26px;white-space:nowrap;color:#808080;font-weight:bold;background:url(../images/btn_gray_right.gif) no-repeat top right;cursor:pointer; border:0 none; top;font-size:12px;font-family:Arial, Helvetica, sans-serif; vertical-align:middle;color:#FFF; text-align: line-height:11px;}
+
+.localNavigation						{width:100%;height:31px;margin:0;padding:1px 0 0 0;background: url(../images/title_bg_repeat.gif) repeat-x top left;}
+.localNavigation li						{float:left;list-style:none;}
+.localNavigation .mLeft					{width:3px;height:31px;margin-top:-1px;float:left;}
+.localNavigation .mRight				{width:5px;height:31px;margin-top:-1px;float:right;}
+.localNavigation .item					{height:24px; margin:0;background:url(../images/title_item_vr.gif) no-repeat top right;}
+.localNavigation .item a				{display:inline-block;height:19px;padding:5px 16px 0 14px;outline:none;font-family:Arial, Helvetica, sans-serif;color:#5a5a5a;text-decoration:none;}
+.localNavigation .l_on					{background:none;margin-left:-2px;margin-top:1px;}
+.localNavigation .l_on .l_on_left		{display:block;width:3px;height:24px;float:left;background:url(../images/title_on_left.gif) no-repeat top left;}
+.localNavigation .l_on a				{ color:#FFF;_margin-left:-3px;background:url(../images/title_on_right.gif) no-repeat top right;}
+.localNavigation .l_last				{background:none;}
+
+
+#communicationModule h3.pTitle					{height:23px;margin:10px 0 5px 0;padding:5px 0 0 10px;color:#3f3f3f; font-size:12px;font-family:Arial, Helvetica, sans-serif;}
+#communicationModule h3.pTitle1				{height:23px;margin:20px 0 12px 0;padding:8px 0 0 37px;border-bottom:#9b989a solid 1px;color:#3f3f3f; background:url(../images/icon_member_info.gif) no-repeat 13px 6px; font-size:12px;font-family:Arial, Helvetica, sans-serif;}
+#communicationModule h3.pTitle6				{height:23px;margin:20px 0 12px 0;padding:8px 0 0 37px;border-bottom:#9b989a solid 1px;color:#3f3f3f; background:url(../images/icon_message.gif) no-repeat 13px 6px; font-size:12px;font-family:Arial, Helvetica, sans-serif;}
+#communicationModule h3.pTitle7				{height:23px;margin:20px 0 12px 0;padding:8px 0 0 37px;border-bottom:#9b989a solid 1px;color:#3f3f3f; background:url(../images/icon_message.gif) no-repeat 13px 6px; font-size:12px;font-family:Arial, Helvetica, sans-serif;}
+
+#communicationModule .rowTable					{width:100%; border-bottom:#c3c1c2 solid 1px;}
+.rowTable th							{border-bottom:#E5E5E5 solid 1px;vertical-align:top;padding:13px 11px;;text-align:left;}
+.rowTable th div						{white-space:nowrap;color:#5a5a5a;}
+.rowTable td							{width:100%; padding:13px 10px 13px 25px;border-bottom:#E5E5E5 solid 1px;color:#000000;}
+.rowTable td input.txt					{border:#C1C1C1 solid 1px;height:20px;}
+
+#communicationModule .col_table				{width:100%;border-bottom:#c9c7c8 solid 1px;}
+.col_table tr							{height:27px;}
+.col_table thead tr						{height:25px;background:url(../images/coltable_head_bg.gif) repeat-x top left;}
+.col_table thead th						{height:25px;background:url(../images/coltable_head_bg.gif) repeat-x top left;}
+.col_table .chk							{background:transparent url(../images/coltable_head_left.gif) no-repeat top left;}
+.col_table input						{margin:0;padding:0;}
+.col_table th,
+.col_table td							{text-align:left;padding-left:20px;}
+.col_table th.button_col					{text-align:right;padding:5px 0;}
+.col_table .subject						{text-align:left;padding-left:20px;}
+.col_table .subject a					{text-decoration:none;color:#333;font-weight:bold;}
+.col_table .subject em					{font-size:10px;font-style:italic;}
+.col_table .subject em.red				{color:#C00;}
+.col_table .subject em.green			{color:#390;}
+.col_table .subject input				{margin-right:10px;vertical-align:text-bottom;}
+.col_table th.th_right					{text-align:center;padding:0;background-color:transparent; background:url(../images/coltable_head_right.gif) no-repeat top right;}
+.col_table th.th_tc,
+.col_table td.td_tc						{text-align:center; padding:0;}
+.col_table .savedContent				{padding:10px;}
+.col_table .doc_title					{padding:7px 5px 0 0;}
+.col_table .doc_title a					{text-decoration:none;color:#333;font-weight:bold;}
+.col_table th.button					{padding:6px 0 10px 0;border-top:#EEE solid 1px;}
+.msg_table tbody tr						{height:30px;}
+#communicationModule .find_account				{padding-left:11px;height:482px;background:url(../images/find_bg_left.png) no-repeat top left;}
+#communicationModule p.tDesc					{margin:0 0 10px 0;padding:0;}
+#communicationModule .findTable				{width:100%; height:482px; background:url(../images/find_bg_right.png) no-repeat top right;}
+.findTable th							{padding:9px 18px 9px 40px;text-align:left;background:none;}
+.findTable td							{padding:9px 18px 9px 40px;background:none;}
+.findTable .btnLine						{height:30px;}
+.findTable .sLine						{height:40px;}
+.findTable .mLine						{height:50px;}
+.findTable .bLine						{text-align:center;}
+.findTable .tInput						{width:185px;height:17px;font-size:12px;border:#CECECE solid 1px;}
+.btn_bar_r								{text-align:right;margin:16px 0;}
+.btn_bar_l								{text-align:left;}
+
+.signPanel								{width:318px; height:191px; margin:10px auto; background:#093 url(../images/login_panel_bg.gif) no-repeat top left;}
+.signPanel .left						{width:192px;height:138px;padding:18px 0 0 23px; _padding-top:28px;_height:128px;float:left;}
+.signPanel .right						{width:100px;height:111px;padding-top:45px;float:right;}
+.signPanel .left .tInBox				{width:185px;height:18px;padding:0 0 0 4px;background:url(../images/signPanel_input_bg.gif) no-repeat top left;}
+.signPanel .left .tInBox img			{padding-top:3px;}
+.signPanel .left .tInBox input			{width:160px;padding-left:5px;height:18px;border:0 none;background:none;}
+.signPanel .left label					{display:block;margin:10px 0 3px 0;}
+.signPanel .left label input			{margin:0 7px 0 0;padding:0;}
+.signPanel .left .lb_chk				{margin-top:10px;_margin:0;padding:0;}
+.signPanel .bottom_bar					{width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px;}
+.signPanel .bottom_bar a				{dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575;}
+.signPanel .bottom_bar a.vr				{padding-right:10px;border-right:#a8a8a8 solid 1px;}
+
+
+
+
+#communicationModule p { margin:3px 0 0 0; padding:0;}
+#dummy_check_nick_name { color:red; margin:3px 0 0 0; padding:0; }
+#communicationModule .require { color:red; font-size:10px; font-family:tahoma; font-weight:bold; margin-left:5px; }
+#communicationModule .publicItem { margin:5px 0 0 0; padding:0; color:#aaa; }
+#communicationModule .publicItem input { padding:0; margin: 0; }
+
+#communicationModule caption{ font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
+
+#communicationModule td.openids div { float:left; margin-right:10px; margin-bottom:10px; }
+#communicationModule td.openids div a { color:#AAA; text-decoration:none;}
+#communicationModule .openid_user_id { background: url(../img/openid_login_bg.gif) left no-repeat; background-color: #ffffff; background-position: 0 50%; padding:3px 3px 3px 18px; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; line-height:1em; vertical-align:middle; color:#666666; width:200px;}
+#communicationModule .insertOpenID { clear:both; margin-top:10px; }
+#communicationModule .savedContent { margin-top:10px; border:1px solid #EEE; padding:10px; }
+
+#communicationModule .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
+#communicationModule .pagination *{ margin:0; padding:0;}
+#communicationModule .pagination img{ border:0;}
+#communicationModule .pagination a,
+#communicationModule .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+#communicationModule .pagination a:hover,
+#communicationModule .pagination a:active,
+#communicationModule .pagination a:focus{ background-color:#f4f4f4 !important; }
+#communicationModule .pagination strong{ color:#ff6600 !important;}
+#communicationModule .pagination a.prev,
+#communicationModule .pagination a.prevEnd,
+#communicationModule .pagination a.next,
+#communicationModule .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+#communicationModule .pagination.a1 a,
+#communicationModule .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+#communicationModule .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../img/arrowPrevA1.gif) no-repeat left center; }
+#communicationModule .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../img/arrowPrevEndA1.gif) no-repeat left center; }
+#communicationModule .pagination.a1 a.next{ padding-right:10px; background:#fff url(../img/arrowNextA1.gif) no-repeat right center; }
+#communicationModule .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../img/arrowNextEndA1.gif) no-repeat right center; }
+
+#communicationModule .regdate { font-size:10px; font-family:tahoma; color:#AAA; }
+#communicationModule .readed_date  { font-size:10px; font-family:tahoma; color:#888; letter-spacing:-1px;}
+
+
+#communicationModule .xeGroups { position:relative; }
+#communicationModule .xeMessages select ,
+#communicationModule .xeGroups select { margin:0; padding:0; vertical-align:middle; }
+#communicationModule .setupGroup	{ position:absolute; right:0; top:0;}
+#communicationModule .setupMessage	{float:right;margin-top:7px;}
+
+#communicationModule .jumpMenu { margin-bottom:5px; text-align:right; }
+
+#communicationModule .xeMessages .msg_title		{width:100%;height:25px;padding-top:3px;margin-top:10px;float:left;font-weight:bold;text-align:center;border:#E2E2E2 solid 1px;background:#F2F2F2;}
+#communicationModule .xeMessages .msg_meta		{width:100%;float:left;height:26px;padding-top:9px;border-bottom:#F2F2F2 solid 1px;}
+#communicationModule .xeMessages .msg_meta span	{padding:0 5px;}
+#communicationModule .xeMessages .msg_message	{width:100%;float:left;padding:10px;min-height:100px;height:auto !important;height:100px;}
+#communicationModule .xeMessages .msg_view_btns	{width:100%;float:left;text-align:center;padding:9px 9px 0 9px;}
+
+
+#communicationModule .isTab				{margin:10px 0 0 0;padding-left:0;float:left;}
+#communicationModule .isTab	li			{padding:0 10px;border-right:#d8d8d8 solid 1px;float:left;list-style:none;}
+#communicationModule .isTab	li.last		{border:none;}
+#communicationModule .isTab	li a		{text-decoration:none;color:#7b7b7b;}
+#communicationModule .isTab	li.on a		{color:#595c72;}
+
+#fo_message_list .msg_table				{width:100%;float:left;margin-top:10px;}
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/add_friend.xml b/themes/xe_solid_enterprise/modules/communication/filter/add_friend.xml
new file mode 100644
index 000000000..b1ec11d0d
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/add_friend.xml
@@ -0,0 +1,9 @@
+<filter name="add_friend" module="communication" act="procCommunicationAddFriend" confirm_msg_code="confirm_submit">
+    <form />
+    <parameter />
+    <response callback_func="completeAddFriend">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="member_srl" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/add_friend_group.xml b/themes/xe_solid_enterprise/modules/communication/filter/add_friend_group.xml
new file mode 100644
index 000000000..cadf2644f
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/add_friend_group.xml
@@ -0,0 +1,10 @@
+<filter name="add_friend_group" module="communication" act="procCommunicationAddFriendGroup" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="title" required="true" minlength="1" maxlength="240" />
+    </form>
+    <parameter />
+    <response callback_func="completeAddFriendGroup">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/delete_checked_friend.xml b/themes/xe_solid_enterprise/modules/communication/filter/delete_checked_friend.xml
new file mode 100644
index 000000000..4d1466994
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/delete_checked_friend.xml
@@ -0,0 +1 @@
+<filter name="delete_checked_friend" module="communication" act="procCommunicationDeleteFriend" confirm_msg_code="confirm_delete" />
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/delete_checked_message.xml b/themes/xe_solid_enterprise/modules/communication/filter/delete_checked_message.xml
new file mode 100644
index 000000000..1d21f33c8
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/delete_checked_message.xml
@@ -0,0 +1 @@
+<filter name="delete_checked_message" module="communication" act="procCommunicationDeleteMessages" confirm_msg_code="confirm_delete" />
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/delete_friend_group.xml b/themes/xe_solid_enterprise/modules/communication/filter/delete_friend_group.xml
new file mode 100644
index 000000000..5d269abaa
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/delete_friend_group.xml
@@ -0,0 +1 @@
+<filter name="delete_friend_group" module="communication" act="procCommunicationDeleteFriendGroup" confirm_msg_code="confirm_delete" />
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/move_friend.xml b/themes/xe_solid_enterprise/modules/communication/filter/move_friend.xml
new file mode 100644
index 000000000..8b1eef8cd
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/move_friend.xml
@@ -0,0 +1 @@
+<filter name="move_friend" module="communication" act="procCommunicationMoveFriend" confirm_msg_code="confirm_move" />
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/send_message.xml b/themes/xe_solid_enterprise/modules/communication/filter/send_message.xml
new file mode 100644
index 000000000..418965112
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/send_message.xml
@@ -0,0 +1,12 @@
+<filter name="send_message" module="communication" act="procCommunicationSendMessage" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="title" required="true" minlength="1" maxlength="240" />
+        <node target="content" required="true" minlength="1" />
+    </form>
+    <parameter />
+    <response callback_func="completeSendMessage">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="redirect_url" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/communication/filter/update_allow_message.xml b/themes/xe_solid_enterprise/modules/communication/filter/update_allow_message.xml
new file mode 100644
index 000000000..d005b43f5
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/filter/update_allow_message.xml
@@ -0,0 +1,5 @@
+<filter name="update_allow_message" module="communication" act="procCommunicationUpdateAllowMessage">
+    <form />
+    <parameter />
+    <response />
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/communication/friends.html b/themes/xe_solid_enterprise/modules/communication/friends.html
new file mode 100644
index 000000000..b4b08f00a
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/friends.html
@@ -0,0 +1,100 @@
+<!--#include("./common_header.html")-->
+
+<!--%import("filter/delete_checked_friend.xml")-->
+<!--%import("filter/delete_friend_group.xml")-->
+<!--%import("filter/move_friend.xml")-->
+
+<div class="xeGroups">
+
+    <h3 class="pTitle1">{$member_title = $lang->cmd_view_friend } ({$total_count})</h3>
+
+    <form id="fo_friend_list" action="./" method="get" onsubmit="return procFilter(this, delete_checked_friend)">
+
+        <div class="setupGroup">
+            <select name="friend_group_list" id="friend_group_list">
+                <!--@foreach($friend_group_list as $key => $val)-->
+                <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+                <!--@end-->
+            </select>
+            <a href="#" onclick="doRenameFriendGroup();return false;" class="button small blue"><span>{$lang->cmd_modify}</span></a>
+            <a href="#" onclick="doDeleteFriendGroup();return false;" class="button small red"><span>{$lang->cmd_delete}</span></a>
+            <a href="{getUrl('','module','communication','act','dispCommunicationAddFriendGroup')}" onclick="popopen(this.href);return false;" class="button small black strong"><span>{$lang->cmd_add_friend_group}</span></a>
+        </div>
+
+        <div class="jumpMenu">
+            <select name="jumpMenu" id="jumpMenu">
+                <option value="">{$lang->default_friend_group}</option>
+                <!--@foreach($friend_group_list as $key => $val)-->
+                <option value="{$val->friend_group_srl}" <!--@if($val->friend_group_srl == $friend_group_srl)-->selected="selected"<!--@end--> >{$val->title}</option>
+                <!--@end-->
+            </select><a href="#" onclick="doJumpFriendGroup(); return false;" class="small button"><span>{$lang->cmd_move}</span></a>
+        </div>
+
+
+		<table class="col_table" cellpadding="0" cellspacing="0">
+			<colgroup>
+				<col width="30%" />
+				<col width="" />
+				<col width="40%" />
+			</colgroup>
+			<thead>
+				<tr>
+				<th scope="col" class="chk">{$lang->friend_group}</th>
+				<th scope="col" class="subject"><div><input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('friend_srl_list', { wrap:'fo_friend_list' }); return false;" /> {$lang->nick_name}<div></th>
+				<th scope="col" class="th_right w300"><div>{$lang->regdate}<div></th>
+				</tr>
+			</thead>
+			<tbody>
+
+
+
+
+            <!--@foreach($friend_list as $no => $val)-->
+			<tr>
+			<td>{$val->group_title?$val->group_title:"&nbsp;"}</td>
+			<td class="subject"><input type="checkbox" name="friend_srl_list" value="{$val->friend_srl}" /><span class="member_{$val->target_srl}">{$val->nick_name}</span></td>
+			<td class="td_tc"><span class="regdate">{zdate($val->regdate,"Y-m-d")}</span></td>
+			</tr>
+            <!--@end-->
+            <tr>
+                <th class="button_col" colspan="3">
+                    <select name="target_friend_group_srl">
+                        <!--@foreach($friend_group_list as $key => $val)-->
+                        <option value="{$val->friend_group_srl}">{$val->title}</option>
+                        <!--@end-->
+                    </select>
+                    <a href="#" onclick="doMoveFriend();return false;" class="small button blue"><span>{$lang->cmd_move}</span></a>
+                    <span class="small button red"><input type="submit" value="{$lang->cmd_delete}" /></span>
+                    <a href="{getUrl('act','','message_type','','friend_gruop_srl','')}" class="small button"><span>{$lang->cmd_back}</span></a>
+                </th>
+            </tr>
+			</tbody>
+		</table>
+
+
+
+        <!-- 페이지 네비게이션 -->
+        <div class="pagination a1">
+            <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a>
+            <!--@while($page_no = $page_navigation->getNextPage())-->
+                <!--@if($page == $page_no)-->
+                    <strong>{$page_no}</strong>
+                <!--@else-->
+                    <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+                <!--@end-->
+            <!--@end-->
+            <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
+        </div>
+
+
+    </form>
+
+
+    <!-- 그룹 삭제를 위한 빈 form -->
+    <form action="./" method="get" id="for_delete_group">
+        <input type="hidden" name="friend_group_srl" value="" />
+    </form>
+</div>
+
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/communication/images/Thumbs.db b/themes/xe_solid_enterprise/modules/communication/images/Thumbs.db
new file mode 100644
index 000000000..6b3b12963
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/Thumbs.db differ
diff --git a/modules/admin/tpl/img/arrowNextA1.gif b/themes/xe_solid_enterprise/modules/communication/images/arrowNextA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowNextA1.gif
rename to themes/xe_solid_enterprise/modules/communication/images/arrowNextA1.gif
diff --git a/modules/admin/tpl/img/arrowNextEndA1.gif b/themes/xe_solid_enterprise/modules/communication/images/arrowNextEndA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowNextEndA1.gif
rename to themes/xe_solid_enterprise/modules/communication/images/arrowNextEndA1.gif
diff --git a/modules/admin/tpl/img/arrowPrevA1.gif b/themes/xe_solid_enterprise/modules/communication/images/arrowPrevA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowPrevA1.gif
rename to themes/xe_solid_enterprise/modules/communication/images/arrowPrevA1.gif
diff --git a/modules/admin/tpl/img/arrowPrevEndA1.gif b/themes/xe_solid_enterprise/modules/communication/images/arrowPrevEndA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowPrevEndA1.gif
rename to themes/xe_solid_enterprise/modules/communication/images/arrowPrevEndA1.gif
diff --git a/modules/admin/tpl/img/bgTab.gif b/themes/xe_solid_enterprise/modules/communication/images/bgTab.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/bgTab.gif
rename to themes/xe_solid_enterprise/modules/communication/images/bgTab.gif
diff --git a/themes/xe_solid_enterprise/modules/communication/images/btn_gray_left.gif b/themes/xe_solid_enterprise/modules/communication/images/btn_gray_left.gif
new file mode 100644
index 000000000..5550ef6c5
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/btn_gray_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/btn_gray_right.gif b/themes/xe_solid_enterprise/modules/communication/images/btn_gray_right.gif
new file mode 100644
index 000000000..59df48db5
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/btn_gray_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/btn_signin.gif b/themes/xe_solid_enterprise/modules/communication/images/btn_signin.gif
new file mode 100644
index 000000000..6caa56958
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/btn_signin.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/btn_white_left.gif b/themes/xe_solid_enterprise/modules/communication/images/btn_white_left.gif
new file mode 100644
index 000000000..356071c77
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/btn_white_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/btn_white_right.gif b/themes/xe_solid_enterprise/modules/communication/images/btn_white_right.gif
new file mode 100644
index 000000000..6f66d52ea
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/btn_white_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/bullet_input_id.gif b/themes/xe_solid_enterprise/modules/communication/images/bullet_input_id.gif
new file mode 100644
index 000000000..6963cf9e7
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/bullet_input_id.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/bullet_input_pw.gif b/themes/xe_solid_enterprise/modules/communication/images/bullet_input_pw.gif
new file mode 100644
index 000000000..8058f42ae
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/bullet_input_pw.gif differ
diff --git a/modules/admin/tpl/img/buttonClose.gif b/themes/xe_solid_enterprise/modules/communication/images/buttonClose.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/buttonClose.gif
rename to themes/xe_solid_enterprise/modules/communication/images/buttonClose.gif
diff --git a/themes/xe_solid_enterprise/modules/communication/images/coltable_head_bg.gif b/themes/xe_solid_enterprise/modules/communication/images/coltable_head_bg.gif
new file mode 100644
index 000000000..8fb567f73
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/coltable_head_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/coltable_head_left.gif b/themes/xe_solid_enterprise/modules/communication/images/coltable_head_left.gif
new file mode 100644
index 000000000..1b2f15b2f
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/coltable_head_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/coltable_head_right.gif b/themes/xe_solid_enterprise/modules/communication/images/coltable_head_right.gif
new file mode 100644
index 000000000..efd797aee
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/coltable_head_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_bl.gif b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_bl.gif
new file mode 100644
index 000000000..07a5dbe1c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_bl.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_br.gif b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_br.gif
new file mode 100644
index 000000000..f05b10cd2
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_br.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_tl.gif b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_tl.gif
new file mode 100644
index 000000000..a88bcf0c1
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_tl.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_tr.gif b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_tr.gif
new file mode 100644
index 000000000..a02257f9e
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/findTable_9slice_tr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/find_account_bg.jpg b/themes/xe_solid_enterprise/modules/communication/images/find_account_bg.jpg
new file mode 100644
index 000000000..fde837531
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/find_account_bg.jpg differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/find_bg_left.gif b/themes/xe_solid_enterprise/modules/communication/images/find_bg_left.gif
new file mode 100644
index 000000000..8543738b9
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/find_bg_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/find_bg_left.png b/themes/xe_solid_enterprise/modules/communication/images/find_bg_left.png
new file mode 100644
index 000000000..e3f604357
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/find_bg_left.png differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/find_bg_repeat.gif b/themes/xe_solid_enterprise/modules/communication/images/find_bg_repeat.gif
new file mode 100644
index 000000000..49abd68cd
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/find_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/find_bg_right.gif b/themes/xe_solid_enterprise/modules/communication/images/find_bg_right.gif
new file mode 100644
index 000000000..dfed4dbe2
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/find_bg_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/find_bg_right.png b/themes/xe_solid_enterprise/modules/communication/images/find_bg_right.png
new file mode 100644
index 000000000..83faa292c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/find_bg_right.png differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/h2_signin.gif b/themes/xe_solid_enterprise/modules/communication/images/h2_signin.gif
new file mode 100644
index 000000000..fcbea21e6
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/h2_signin.gif differ
diff --git a/modules/admin/tpl/img/iconH2.gif b/themes/xe_solid_enterprise/modules/communication/images/iconH2.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/iconH2.gif
rename to themes/xe_solid_enterprise/modules/communication/images/iconH2.gif
diff --git a/modules/admin/tpl/img/iconH3.gif b/themes/xe_solid_enterprise/modules/communication/images/iconH3.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/iconH3.gif
rename to themes/xe_solid_enterprise/modules/communication/images/iconH3.gif
diff --git a/themes/xe_solid_enterprise/modules/communication/images/icon_member_info.gif b/themes/xe_solid_enterprise/modules/communication/images/icon_member_info.gif
new file mode 100644
index 000000000..0d34860ef
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/icon_member_info.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/icon_message.gif b/themes/xe_solid_enterprise/modules/communication/images/icon_message.gif
new file mode 100644
index 000000000..86e08d494
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/icon_message.gif differ
diff --git a/modules/admin/tpl/img/lineVrText.gif b/themes/xe_solid_enterprise/modules/communication/images/lineVrText.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/lineVrText.gif
rename to themes/xe_solid_enterprise/modules/communication/images/lineVrText.gif
diff --git a/themes/xe_solid_enterprise/modules/communication/images/login_panel_bg.gif b/themes/xe_solid_enterprise/modules/communication/images/login_panel_bg.gif
new file mode 100644
index 000000000..dd4bdcce8
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/login_panel_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/signPanel_input_bg.gif b/themes/xe_solid_enterprise/modules/communication/images/signPanel_input_bg.gif
new file mode 100644
index 000000000..cd97a9dca
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/signPanel_input_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/title_bg_left.gif b/themes/xe_solid_enterprise/modules/communication/images/title_bg_left.gif
new file mode 100644
index 000000000..c39c2d156
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/title_bg_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/title_bg_repeat.gif b/themes/xe_solid_enterprise/modules/communication/images/title_bg_repeat.gif
new file mode 100644
index 000000000..d4b3668ba
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/title_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/title_bg_right.gif b/themes/xe_solid_enterprise/modules/communication/images/title_bg_right.gif
new file mode 100644
index 000000000..365203360
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/title_bg_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/title_item_vr.gif b/themes/xe_solid_enterprise/modules/communication/images/title_item_vr.gif
new file mode 100644
index 000000000..ee5485b2c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/title_item_vr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/title_on_left.gif b/themes/xe_solid_enterprise/modules/communication/images/title_on_left.gif
new file mode 100644
index 000000000..e54f5187d
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/title_on_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/title_on_right.gif b/themes/xe_solid_enterprise/modules/communication/images/title_on_right.gif
new file mode 100644
index 000000000..58c03997f
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/title_on_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/images/topbar_vr.gif b/themes/xe_solid_enterprise/modules/communication/images/topbar_vr.gif
new file mode 100644
index 000000000..47c3619af
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/images/topbar_vr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/communication/js/communication.js b/themes/xe_solid_enterprise/modules/communication/js/communication.js
new file mode 100644
index 000000000..ae2ddd45a
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/js/communication.js
@@ -0,0 +1,99 @@
+/* message type list style */
+jQuery(function($){
+	$('ul.isTab > li:last').addClass('last');
+});
+
+
+
+/* 쪽지 발송 */
+function completeSendMessage(ret_obj) {
+    alert(ret_obj['message']);
+    window.close();
+}
+
+function doSendMessage(member_srl, message_srl) {
+    if(typeof(message_srl)=='undefined') message_srl = 0;
+    var url = request_uri.setQuery('module','communication').setQuery('act','dispCommunicationSendMessage').setQuery('receiver_srl',member_srl).setQuery('message_srl',message_srl);
+    popopen(url, 'sendMessage');
+}
+
+/* 개별 쪽지 삭제 */
+function doDeleteMessage(message_srl) {
+    if(!message_srl) return;
+
+    var params = new Array();
+    params['message_srl'] = message_srl;
+    exec_xml('communication', 'procCommunicationDeleteMessage', params, completeDeleteMessage);
+}
+
+function completeDeleteMessage(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = current_url.setQuery('message_srl','');
+}
+
+/* 개별 쪽지 보관 */
+function doStoreMessage(message_srl) {
+    if(!message_srl) return;
+
+    var params = new Array();
+    params['message_srl'] = message_srl;
+    exec_xml('communication', 'procCommunicationStoreMessage', params, completeStoreMessage);
+}
+
+function completeStoreMessage(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = current_url.setQuery('message_srl','');
+}
+
+/* 친구 추가 후 */
+function completeAddFriend(ret_obj) {
+    alert(ret_obj['message']);
+    var member_srl = ret_obj['member_srl'];
+    if(opener && opener.loaded_member_menu_list) {
+        opener.loaded_member_menu_list[ret_obj['member_srl']] = '';
+    }
+    window.close();
+}
+
+/* 친구 그룹 추가 후 */
+function completeAddFriendGroup(ret_obj) {
+    alert(ret_obj['message']);
+    if(opener) opener.location.href = opener.location.href;
+    window.close();
+}
+
+/* 친구 그룹 삭제 */
+function doDeleteFriendGroup() {
+    var friend_group_srl = jQuery('#friend_group_list option:selected').val();
+    if(!friend_group_srl) return;
+
+    var fo_obj = jQuery('#for_delete_group').get(0);
+    fo_obj.friend_group_srl.value = friend_group_srl;
+
+    procFilter(fo_obj, delete_friend_group);
+}
+
+function completeDeleteFriendGroup(ret_obj) {
+    alert(ret_obj['message']);
+    location.href = current_url.setQuery('friend_group_srl','');
+}
+
+/* 친구 그룹의 이름 변경 */
+function doRenameFriendGroup() {
+    var friend_group_srl = jQuery('#friend_group_list option:selected').val();
+    if(!friend_group_srl) return;
+
+    popopen("./?module=communication&act=dispCommunicationAddFriendGroup&friend_group_srl="+friend_group_srl);
+}
+
+/* 친구 그룹 이동 */
+function doMoveFriend() {
+    var fo_obj = jQuery('#fo_friend_list').get(0);
+    procFilter(fo_obj, move_friend);
+}
+
+/* 친구 그룹 선택 */
+function doJumpFriendGroup() {
+    var sel_val = jQuery('#jumpMenu option:selected').val();
+    location.href = current_url.setQuery('friend_group_srl', sel_val);
+}
diff --git a/themes/xe_solid_enterprise/modules/communication/messages.html b/themes/xe_solid_enterprise/modules/communication/messages.html
new file mode 100644
index 000000000..b0f319954
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/messages.html
@@ -0,0 +1,117 @@
+<!--#include("./common_header.html")-->
+<!--%import("filter/delete_checked_message.xml")-->
+<!--%import("filter/update_allow_message.xml")-->
+
+
+<h3 class="pTitle7">Message Box</h3>
+<div class="xeMessages">
+   
+	<ul class="isTab">
+		<li loop="$lang->message_box => $key,$val" class="on"|cond="$key==$message_type"><a href="{getUrl(message_type,$key,message_srl,0)}">{$val}</a></li>
+	</ul>
+ 
+	<form action="./" method="POST" onsubmit="return procFilter(this, update_allow_message)" class="setupMessage">
+        <select name="allow_message">
+            <!--@foreach($lang->allow_message_type as $key => $val)-->
+            <option value="{$key}" <!--@if($logged_info->allow_message == $key)-->selected="selected"<!--@end-->>{$val}</option>
+            <!--@end-->
+        </select>
+        <span class="button"><input type="submit" value="{$lang->cmd_save}"></span>
+    </form>
+
+
+<!--@if($message)-->
+
+<div class="msg_title">{$message->title}</div>
+<div class="msg_meta">
+	<span class="member_{$message->member_srl}">{$message->nick_name}</span>
+    <span class="regdate">{zdate($message->regdate, "Y.m.d H:i:s")}</span>
+</div>
+<div class="msg_message" >
+{$message->content}
+</div>
+<div class="msg_view_btns">
+	<!--@if($message->message_type != "S" && $message->member_srl != $logged_info->member_srl)-->
+	<a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="grayBtn"><span>{$lang->cmd_reply_message}</span></a>
+	<!--@end-->
+	<!--@if($message->message_type == "R")-->
+	<a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="grayBtn"><span>{$lang->cmd_store}</span></a>
+	<!--@end-->
+	<a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="whiteBtn"><span>{$lang->cmd_delete}</span></a>
+</div>
+<!--@end-->
+
+
+<form action="./" method="get" onsubmit="return procFilter(this, delete_checked_message)" id="fo_message_list">
+<input type="hidden" name="message_type" value="{$message_type}" />
+
+
+<table class="col_table msg_table" cellpadding="0" cellspacing="0">
+	<colgroup>
+		<col width="50" />
+		<col />
+		<col width="150" />
+		<col width="150" />
+	</colgroup>
+	<thead>
+    	<tr>
+    	<th scope="col" class="chk"><div>
+                <input name="check_all" type="checkbox" onclick="XE.checkboxToggleAll('message_srl_list', { wrap:'fo_message_list' }); return false;" />
+               
+            </div>
+		</th>
+        <th scope="col" class="subject"><div class="member_{$val->member_srl}"> {$lang->title}</div></th>
+        <th scope="col" class="th_tc"><div>
+                <!--@if($message_type == "S")-->
+                    {$lang->receiver}
+                <!--@else-->
+                    {$lang->sender}
+                <!--@end-->
+            </div>
+		</th>
+        <th scope="col" class="th_right"><div>{$lang->regdate}</div></th>
+        </tr>
+    </thead>
+    <tbody>
+        <!--@foreach($message_list as $no => $val)-->
+    	<tr>
+    	<td><input name="message_srl_list" type="checkbox" value="{$val->message_srl}" /></td>
+        <td class="subject">
+		<!--@if($val->readed=='Y')-->
+			<a href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a>
+		<!--@else-->
+			<span style="font-weight:bold"><a href="{getUrl('message_srl',$val->message_srl)}">{$val->title}</a></span>
+		<!--@end-->
+		</td>
+        <td class="member_{$val->member_srl} td_tc"><div class="member_{$val->member_srl}">{$val->nick_name}</div></td>
+        <td class="td_tc">
+                    <div class="regdate">{zdate($val->regdate,"Y-m-d")}</div>
+                    <!--@if($val->readed=="Y")--><div class="readed_date">{zdate($val->readed_date,"Y-m-d H:i:s")}</div><!--@end--></td>
+        </tr>
+		<!--@end-->
+		<tr>
+			<th colspan="4" class="button_col">
+				<span class="grayBtn"><input type="submit" value="{$lang->cmd_delete}" /></span>
+			</th>
+		</tr>
+    </tbody>
+</table>
+
+</form>
+
+
+    <!-- 페이지 네비게이션 -->
+    <div class="pagination a1">
+        <a href="{getUrl('page','','document_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+        <!--@while($page_no = $page_navigation->getNextPage())-->
+            <!--@if($page == $page_no)-->
+                <strong>{$page_no}</strong> 
+            <!--@else-->
+                <a href="{getUrl('page',$page_no,'document_srl','')}">{$page_no}</a>
+            <!--@end-->
+        <!--@end-->
+        <a href="{getUrl('page',$page_navigation->last_page,'document_srl','')}" class="nextEnd">{$lang->last_page}</a>
+    </div>
+</div>
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/communication/new_message.html b/themes/xe_solid_enterprise/modules/communication/new_message.html
new file mode 100644
index 000000000..90a7de5ce
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/new_message.html
@@ -0,0 +1,39 @@
+<!--%import("js/communication.js")-->
+<!--@if($message)-->
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->message_received}</h3>
+</div>
+
+<div id="popBody">
+
+    <table cellspacing="0" class="rowTable">
+    <!--@if($message->member_srl != $logged_info->member_srl)-->
+    <tr>
+        <th><div>{$lang->sender}</div></th>
+        <td><div class="member_{$message->member_srl}">{$message->nick_name}</div></td>
+    </tr>
+    <!--@end-->
+    <tr>
+        <th><div>{$lang->title}</div></th>
+        <td>{htmlspecialchars($message->title)}</td>
+    </tr>
+    <tr>
+        <td colspan="2">{$message->content}</td>
+    </tr>
+    </table>
+</div>
+
+<div id="popFooter">
+    <a href="#" onclick="location.href=location.href;return false;" class="button black strong"><span>{$lang->cmd_next}</span></a>
+    <!--@if($message->member_srl != $logged_info->member_srl)-->
+        <a href="#" onclick="doSendMessage('{$message->sender_srl}','{$message->message_srl}');return false;" class="button"><span>{$lang->cmd_reply_message}</span></a>
+    <!--@end-->
+    <a href="#" onclick="doStoreMessage('{$message->message_srl}');return false;" class="button blue"><span>{$lang->cmd_store}</span></a>
+    <a href="#" onclick="doDeleteMessage('{$message->message_srl}');return false;" class="button red"><span>{$lang->cmd_delete}</span></a>
+</div>
+
+<!--@else-->
+<script type="text/javascript">
+    window.close();
+</script>
+<!--@end-->
diff --git a/themes/xe_solid_enterprise/modules/communication/send_message.html b/themes/xe_solid_enterprise/modules/communication/send_message.html
new file mode 100644
index 000000000..7e9c0402d
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/send_message.html
@@ -0,0 +1,41 @@
+<!--%import("filter/send_message.xml")-->
+<!--%import("js/communication.js")-->
+
+<div id="popHeader" class="wide">
+    <h3 class="xeAdmin">{$lang->cmd_send_message}</h3>
+</div>
+
+<form action="./" method="get" onsubmit="return procFilter(this, send_message)">
+<input type="hidden" name="content" value="{htmlspecialchars($source_message->content)}" />
+<input type="hidden" name="receiver_srl" value="{$receiver_info->member_srl}" />
+
+<div id="popBody">
+
+    <table cellspacing="0" class="rowTable">
+    <tr>
+        <th><div><label for="textfield1">{$lang->receiver}</label></div></th>
+        <td><div class="member_{$receiver_info->member_srl}">{$receiver_info->nick_name}</div></td>
+    </tr>
+    <tr>
+        <th><div>{$lang->title}</div></th>
+        <td><input type="text" name="title" id="message_title" class="inputTypeText w300" value="{$source_message->title}"/></td>
+    </tr>
+    <tr>
+        <th><div>{$lang->cmd_option}</div></th>
+        <td><input type="checkbox" value="Y" name="send_mail"  /> {$lang->cmd_send_mail}</td>
+    </tr>
+    </table>
+
+    {$editor}
+
+</div>
+
+<div id="popFooter">
+    <span class="button black strong"><input type="submit" value="{$lang->cmd_send_message}" class="editor_button" accesskey="s" /></span>
+</div>
+
+</form>
+
+<script type="text/javascript">
+    xAddEventListener(window, 'load', function() { xGetElementById("message_title").focus(); });
+</script>
diff --git a/themes/xe_solid_enterprise/modules/communication/skin.xml b/themes/xe_solid_enterprise/modules/communication/skin.xml
new file mode 100644
index 000000000..ffe45377f
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/communication/skin.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기업용 커뮤니케이션 모듈 스킨</title>
+    <title xml:lang="zh-CN">XE标准企业交流皮肤</title>
+    <title xml:lang="jp">XE Solid Enterprise Communication Skin</title>
+    <title xml:lang="en">XE Solid Enterprise Communication Skin</title>
+    <title xml:lang="vi">XE Solid Enterprise Communication Skin</title>
+    <title xml:lang="es">XE Solid Enterprise Communication Skin</title>
+    <title xml:lang="ru">XE Solid Enterprise Communication Skin</title>
+    <title xml:lang="zh-TW">XE Solid Enterprise Communication Skin</title>
+    <title xml:lang="tr">XE Solid Enterprise Communication Skin</title>
+    <description xml:lang="ko">
+		XE 기업용 레이아웃과 조합하여 쓰이도록 되어있으며 심플하고 실용적인 스킨으로서 쪽지와 기타 정보의 조회를 쉽게 할수 있습니다.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+		皮肤采用了简洁而实用的布局，使用户更加方便地查看短信箱以及其他交流信息。
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="jp">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="vi">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="es">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="ru">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-TW">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="tr">
+		The skin utilizes a concise layout to make the user easy to read the messages and other communication contents.
+        NHN (developers@xpressengine.com)
+    </description>
+    <version>0.1</version>
+    <date>2008-05-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white" src="screenshot/white.gif">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="es">Por defecto</title>
+            <title xml:lang="ru">умолчанию</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">varsayılan</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/themes/xe_solid_enterprise/modules/communication/thumbnail.png b/themes/xe_solid_enterprise/modules/communication/thumbnail.png
new file mode 100644
index 000000000..ec9be4287
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/communication/thumbnail.png differ
diff --git a/themes/xe_solid_enterprise/modules/member/common_footer.html b/themes/xe_solid_enterprise/modules/member/common_footer.html
new file mode 100644
index 000000000..04f5b8449
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/common_footer.html
@@ -0,0 +1 @@
+</div>
diff --git a/themes/xe_solid_enterprise/modules/member/common_header.html b/themes/xe_solid_enterprise/modules/member/common_header.html
new file mode 100644
index 000000000..955f677d7
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/common_header.html
@@ -0,0 +1,16 @@
+<!--%import("js/member.js")-->
+<!--%import("css/style.css")-->
+
+<div id="memberModule">
+
+    <!--@if($is_logged && $logged_info->menu_list && (!$member_srl || $member_srl == $logged_info->member_srl) )-->
+    <ul class="localNavigation">
+		<li class="mLeft"><img src="images/title_bg_left.gif" width="3" height="31" alt="" /></li>
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+
+		<li class="item <!--@if($key == $act)-->l_on<!--@end-->"><!--@if($key == $act)--><span class="l_on_left"></span><!--@end--><a href="{getUrl('act',$key)}">{Context::getLang($val)}</a></li>
+        <!--@end-->
+		
+        <li class="mRight"><img src="images/title_bg_right.gif" width="5" height="31" alt="" /></li>
+    </ul>
+    <!--@end-->
\ No newline at end of file
diff --git a/themes/xe_solid_enterprise/modules/member/confirm_member_account_mail.html b/themes/xe_solid_enterprise/modules/member/confirm_member_account_mail.html
new file mode 100644
index 000000000..ba12e647b
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/confirm_member_account_mail.html
@@ -0,0 +1,12 @@
+{$lang->msg_confirm_account_info}<br />
+<hr noshade="noshade" />
+<ul>
+    <li>Site : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
+    <li>{$lang->user_id} : {$member_info->user_id}</li>
+    <li>{$lang->user_name} : {$member_info->user_name}</li>
+    <li>{$lang->nick_name} : {$member_info->nick_name}</li>
+    <li>{$lang->email_address} : {$member_info->email_address}</li>
+</ul>
+<hr noshade="noshade" />
+{$lang->msg_confirm_account_comment}<br />
+<a href="{$auth_url}">{$auth_url}</a>
diff --git a/themes/xe_solid_enterprise/modules/member/css/style.css b/themes/xe_solid_enterprise/modules/member/css/style.css
new file mode 100644
index 000000000..df9f77127
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/css/style.css
@@ -0,0 +1,131 @@
+@charset "utf-8";
+
+/* CSS Document */
+#memberModule							{font-family:Arial, Helvetica, sans-serif;}
+.fr										{float:right;}
+#memberModule caption{ padding-bottom:5px;font-size:11px; font-family:Tahoma; color:#888; text-align:left;}
+/* Button */
+a.grayBtn								{display:inline-block;height:29px;padding-left:4px; _margin-top:2px;_vertical-align:middle;background:url(../images/btn_gray_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+a.grayBtn span							{display:inline-block;height:24px;padding:5px 14px 0 11px;_padding-top:7px;white-space:nowrap;color:#FFF;font-weight:bold;background:url(../images/btn_gray_right.gif) no-repeat top right;}
+a.whiteBtn								{display:inline-block;height:29px;padding-left:4px; _margin-top:2px;_vertical-align:middle;background:url(../images/btn_white_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+a.whiteBtn span							{display:inline-block;height:24px;padding:5px 14px 0 11px;_padding-top:7px;white-space:nowrap;color:#808080;font-weight:bold;background:url(../images/btn_white_right.gif) no-repeat top right;}
+span.grayBtn							{display:inline-block;_margin-top:1px !important;height:27px;_padding-top:-3px;padding-left:4px; vertical-align:middle; _vertical-align:baseline; white-space:nowrap; background:url(../images/btn_gray_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+span.grayBtn input						{display:inline-block;margin:0;;padding:0 12px 0 7px;height:26px;white-space:nowrap;color:#808080;font-weight:bold;background:url(../images/btn_gray_right.gif) no-repeat top right;cursor:pointer; border:0 none;font-size:12px;font-family:Arial, Helvetica, sans-serif; vertical-align:middle;color:#FFF; text-align: line-height:11px;}
+span.whiteBtn							{display:inline-block;_margin-top:1px !important;height:27px;_padding-top:-3px;padding-left:4px; vertical-align:middle; _vertical-align:baseline; white-space:nowrap; background:url(../images/btn_white_left.gif) no-repeat top left; text-decoration:none;cursor:pointer;}
+span.whiteBtn input						{display:inline-block;margin:0;;padding:0 12px 0 7px;height:26px;white-space:nowrap;color:#808080;font-weight:bold;background:url(../images/btn_white_right.gif) no-repeat top right;cursor:pointer; border:0 none;font-size:12px;font-family:Arial, Helvetica, sans-serif; vertical-align:middle;color:#FFF; text-align: line-height:11px;}
+
+
+
+
+
+
+.localNavigation						{width:100%;height:31px;margin:0;padding:1px 0 0 0;background: url(../images/title_bg_repeat.gif) repeat-x top left;}
+.localNavigation li						{float:left;list-style:none;}
+.localNavigation .mLeft					{width:4px;height:31px;margin-top:-1px;float:left;}
+.localNavigation .mRight				{width:5px;height:31px;margin-top:-1px;float:right;}
+.localNavigation .item					{height:24px; margin:0;background:url(../images/title_item_vr.gif) no-repeat top right;}
+.localNavigation .item a				{display:inline-block;height:19px;padding:5px 16px 0 14px;outline:none; font-family:Arial, Helvetica, sans-serif;color:#5a5a5a;text-decoration:none;}
+.localNavigation .l_on					{background:none;margin-left:-2px;margin-top:1px;}
+.localNavigation .l_on .l_on_left		{display:block;width:3px;height:24px;float:left;background:url(../images/title_on_left.gif) no-repeat top left;}
+.localNavigation .l_on a				{ color:#FFF;_margin-left:-3px;background:url(../images/title_on_right.gif) no-repeat top right;}
+.localNavigation .l_last				{background:none;}
+
+
+#memberModule h3.pTitle					{height:23px;margin:0 0 5px 0;padding:0 0 0 10px;color:#3f3f3f; font-size:12px;font-family:Arial, Helvetica, sans-serif;}
+#memberModule h3.pTitle1				{height:23px;margin:20px 0 12px 0;padding:8px 0 0 37px;border-bottom:#9b989a solid 1px;color:#3f3f3f; background:url(../images/icon_member_info.gif) no-repeat 13px 6px; font-size:12px;font-family:Arial, Helvetica, sans-serif;}
+#memberModule h3.pTitle2				{}
+#memberModule h3.pTitle3				{}
+#memberModule .gap1						{margin-bottom:10px;}
+#memberModule .rowTable					{width:100%; border-bottom:#c3c1c2 solid 1px;}
+.rowTable th							{border-bottom:#E5E5E5 solid 1px;vertical-align:top;padding:13px 11px;;text-align:left;width: 10%;}
+.rowTable th div						{white-space:nowrap;color:#5a5a5a;}
+.rowTable td							{width:100%; padding:13px 10px 13px 25px;border-bottom:#E5E5E5 solid 1px;color:#000000;}
+.rowTable td input.txt					{border:#C1C1C1 solid 1px;height:20px;}
+
+#memberModule .col_table				{width:100%;border-bottom:#c9c7c8 solid 1px;}
+.col_table tr							{height:27px;}
+.col_table thead tr						{height:25px;background:url(../images/coltable_head_bg.gif) repeat-x top left;}
+.col_table thead th						{height:25px;background:url(../images/coltable_head_bg.gif) repeat-x top left;}
+.col_table .chk						{background:transparent url(../images/coltable_head_left.gif) no-repeat top left;}
+.col_table input						{margin:0;padding:0;}
+.col_table td							{text-align:center;}
+.col_table .subject						{text-align:left;padding-left:20px;}
+.col_table .subject a					{text-decoration:none;color:#333;font-weight:bold;}
+.col_table .subject em					{font-size:10px;font-style:italic;}
+.col_table .subject em.red				{color:#C00;}
+.col_table .subject em.green			{color:#390;}
+.col_table .l_date						{padding-left:20px;text-align:left;}
+.col_table th.th_right					{background-color:transparent; background:url(../images/coltable_head_right.gif) no-repeat top right;}
+.col_table .savedContent				{padding:10px;}
+.col_table .doc_title					{}
+.col_table .doc_title a					{text-decoration:none;color:#333;font-weight:bold;}
+.col_table th.button_col					{padding:6px 0 8px 0;border-top:#EEE solid 1px;}
+
+#memberModule h3.signup_head			{color:#3c3d41;word-spacing:2px;letter-spacing:-1px;}
+#memberModule .signupTable				{width:958px;background:url(../images/table_bg_repeat.gif) repeat-y top left;}
+.signupTable caption					{width:958px;padding:0 !important;border:0 none;margin:0;height:12px;background:url(../images/table_bg_top.gif) no-repeat top left;}
+.signupTable caption span				{visibility:hidden;}
+.signupTable th							{vertical-align:top;}
+.signupTable th	div						{text-align:left;padding-left:45px;}
+.signupTable .title	div					{height:20px;padding-top:10px;text-align:center;}
+.signupTable th.button_col					{height:90px;text-align:center;background:url(../images/table_bg_bottom.gif) no-repeat top left;}
+.signupTable td input.iText				{width:200px;border:#C1C1C1 solid 1px;height:20px;}
+#memberModule .signupTable em.require		{ color:red; margin-left:5px; }
+.signupTable .wide p					{margin:10px 0 15px 0;}
+.signupTable td							{padding:10px 0;}
+.signupTable tr.agreement				{}
+.signupTable th.agreement				{padding:5px 20px;}
+.signupTable th.agreement p				{text-align:justify;font-weight:normal;margin:0;}
+.signupTable th.agreement div.agreementButton	{margin:10px 0;}
+.signupTable .btnbar_vat				{height:70px !important;vertical-align:top;padding-top:20px;}
+.signupTable .btnbar_vat span.button	{margin-top:20px;}
+
+#memberModule .find_account				{padding-left:11px;height:482px;background:url(../images/find_bg_left.png) no-repeat top left;}
+#memberModule p.tDesc					{margin:0 0 10px 0;padding:0;}
+#memberModule .findTable				{width:100%; height:482px; background:url(../images/find_bg_right.png) no-repeat top right;}
+.findTable th							{padding:9px 18px 9px 40px;text-align:left;background:none;vertical-align:top;}
+.findTable td							{padding:9px 18px 9px 40px;background:none;}
+.findTable .btnLine	td					{height:30px;padding-bottom:20px !important;}
+.findTable .sLine						{height:40px;}
+.findTable .mLine						{height:50px;}
+.findTable .bLine						{text-align:center;}
+.findTable .tInput						{width:185px;height:17px;font-size:12px;border:#CECECE solid 1px;}
+.btn_bar_r								{text-align:right;margin:16px 0;}
+.btn_bar_l								{text-align:left;}
+
+
+.signPanel								{width:318px; height:191px; margin:10px auto; background:#093 url(../images/login_panel_bg.gif) no-repeat top left;}
+.signPanel .left						{width:192px;height:138px;padding:18px 0 0 23px; _padding-top:28px;_height:128px;float:left;}
+.signPanel .right						{width:100px;height:111px;padding-top:45px;float:right;}
+.signPanel .left .tInBox				{width:185px;height:18px;padding:0 0 0 4px;background:url(../images/signPanel_input_bg.gif) no-repeat top left;}
+.signPanel .left .tInBox img			{padding-top:3px;}
+.signPanel .left .tInBox input			{width:160px;padding-left:5px;height:18px;border:0 none;background:none;}
+.signPanel .left label					{display:block;margin:10px 0 3px 0;}
+.signPanel .left label input			{margin:0 7px 0 0;padding:0;}
+.signPanel .left .lb_chk				{margin-top:10px;_margin:0;padding:0;}
+.signPanel .bottom_bar					{width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px;}
+.signPanel .bottom_bar a				{dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575;}
+.signPanel .bottom_bar a.vr				{padding-right:10px;border-right:#a8a8a8 solid 1px;}
+
+
+
+#memberModule .pagination{ padding:15px 0; margin:0; text-align:center; clear:both; }
+#memberModule .pagination *{ margin:0; padding:0;}
+#memberModule .pagination img{ border:0;}
+#memberModule .pagination a,
+#memberModule .pagination strong{ position:relative; display:inline-block; text-decoration:none; line-height:normal; color:#333; font-family:Tahoma, Sans-serif; vertical-align:middle;}
+#memberModule .pagination a:hover,
+#memberModule .pagination a:active,
+#memberModule .pagination a:focus{ background-color:#f4f4f4 !important; }
+#memberModule .pagination strong{ color:#ff6600 !important;}
+#memberModule .pagination a.prev,
+#memberModule .pagination a.prevEnd,
+#memberModule .pagination a.next,
+#memberModule .pagination a.nextEnd{ font-weight:normal !important; border:none !important; margin:0 !important; white-space:nowrap; }
+
+#memberModule .pagination.a1 a,
+#memberModule .pagination.a1 strong{ margin:0 -4px; padding:1px 10px 1px 8px; border:none; border-left:1px solid #ccc; border-right:1px solid #ddd; font-weight:bold; font-size:12px; background:#fff;}
+#memberModule .pagination.a1 a.prev{ padding-left:10px; background:#fff url(../images/arrowPrevA1.gif) no-repeat left center; }
+#memberModule .pagination.a1 a.prevEnd{ padding-left:15px; background:#fff url(../images/arrowPrevEndA1.gif) no-repeat left center; }
+#memberModule .pagination.a1 a.next{ padding-right:10px; background:#fff url(../images/arrowNextA1.gif) no-repeat right center; }
+#memberModule .pagination.a1 a.nextEnd{ padding-right:15px; background:#fff url(../images/arrowNextEndA1.gif) no-repeat right center; }
diff --git a/themes/xe_solid_enterprise/modules/member/document_list.html b/themes/xe_solid_enterprise/modules/member/document_list.html
new file mode 100644
index 000000000..7d8e40879
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/document_list.html
@@ -0,0 +1,73 @@
+<!--#include("./common_header.html")-->
+
+<h3 class="pTitle1">{$member_title = $lang->cmd_view_own_document }</h3>
+
+<!-- code -->
+<!-- 모듈 선택 -->
+<div class="fr gap1">
+    <a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="small button green"><span>{$lang->cmd_find_module}</span></a>
+    <!--@if($selected_module_srl)--><a href="{getUrl('selected_module_srl','')}" class="small button red"><span>{$lang->cmd_cancel}</span></a><!--@end-->
+</div>
+
+<table class="col_table" cellpadding="0" cellspacing="0">
+<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+	<colgroup>
+		<col width="70" />
+		<col width="" />
+		<col width="100" />
+		<col width="100" />
+		<col width="150" />
+	</colgroup>
+	<thead>
+    	<tr>
+    	<th scope="col" class="chk">{$lang->no}</th>
+        <th scope="col" class="subject"><div>{$lang->title}</div></th>
+        <th scope="col">{$lang->readed_count}</th>
+        <th scope="col">{$lang->voted_count}</th>
+        <th scope="col" class="th_right">{$lang->date}</th>
+        </tr>
+    </thead>
+    <tbody>
+		<!--@foreach($document_list as $no => $oDocument)-->
+    	<tr>
+    	<td>{$no}</td>
+        <td class="subject">
+			<a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false;">{$oDocument->getTitleText()}</a>
+            <!--@if($oDocument->getCommentCount())-->
+                <em class="red">[{$oDocument->getCommentCount()}]</em>
+            <!--@end-->
+
+            <!--@if($oDocument->getTrackbackCount())-->
+                <em class="green">[{$oDocument->getTrackbackCount()}]</em>
+            <!--@end--></td>
+
+        <td>{$oDocument->get('readed_count')}</td>
+        <td>{$oDocument->get('voted_count')}</td>
+        <td>{$oDocument->getRegdate("Y-m-d")}</td>
+        </tr>
+    <!--@end-->
+    <tr>
+        <th class="button_col" colspan="5">
+            <a href="{getUrl('act','','selected_module_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </tbody>
+</table>
+
+
+<!-- //code -->
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination a1">
+    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+</div>
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/filter/add_openid_to_member.xml b/themes/xe_solid_enterprise/modules/member/filter/add_openid_to_member.xml
new file mode 100644
index 000000000..a7670efa3
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/add_openid_to_member.xml
@@ -0,0 +1,12 @@
+<filter name="add_openid_to_member" module="member" act="procMemberAddOpenIDToMember">
+    <form>
+        <node target="openid" required="true" minlength="2" maxlength="80" />
+    </form>
+    <parameter>
+        <param name="openid" target="openid" />
+    </parameter>
+    <response callback_func="completeModify">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/delete_image_mark.xml b/themes/xe_solid_enterprise/modules/member/filter/delete_image_mark.xml
new file mode 100644
index 000000000..95ae69d58
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/delete_image_mark.xml
@@ -0,0 +1,2 @@
+<filter name="delete_image_mark" module="member" act="procMemberDeleteImageMark" confirm_msg_code="confirm_delete" />
+
diff --git a/themes/xe_solid_enterprise/modules/member/filter/delete_image_name.xml b/themes/xe_solid_enterprise/modules/member/filter/delete_image_name.xml
new file mode 100644
index 000000000..70efc0365
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/delete_image_name.xml
@@ -0,0 +1 @@
+<filter name="delete_image_name" module="member" act="procMemberDeleteImageName" confirm_msg_code="confirm_delete" />
diff --git a/themes/xe_solid_enterprise/modules/member/filter/delete_openid_from_member.xml b/themes/xe_solid_enterprise/modules/member/filter/delete_openid_from_member.xml
new file mode 100644
index 000000000..7505cb124
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/delete_openid_from_member.xml
@@ -0,0 +1,12 @@
+<filter name="delete_openid_from_member" module="member" act="procMemberDeleteOpenIDFromMember">
+    <form>
+        <node target="openid_to_delete" required="true" minlength="2" maxlength="80" />
+    </form>
+    <parameter>
+        <param name="openid_to_delete" target="openid_to_delete" />
+    </parameter>
+    <response callback_func="completeModify">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/delete_profile_image.xml b/themes/xe_solid_enterprise/modules/member/filter/delete_profile_image.xml
new file mode 100644
index 000000000..ac3a1a059
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/delete_profile_image.xml
@@ -0,0 +1 @@
+<filter name="delete_profile_image" module="member" act="procMemberDeleteProfileImage" confirm_msg_code="confirm_delete" />
diff --git a/themes/xe_solid_enterprise/modules/member/filter/find_member_account.xml b/themes/xe_solid_enterprise/modules/member/filter/find_member_account.xml
new file mode 100644
index 000000000..be9c99cbb
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/find_member_account.xml
@@ -0,0 +1,10 @@
+<filter name="find_member_account" module="member" act="procMemberFindAccount">
+    <form>
+        <node target="email_address" required="true" minlength="2" maxlength="255" filter="email" />
+    </form>
+    <parameter />
+    <response callback_func="completeFindMemberAccount">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/find_member_account_by_question.xml b/themes/xe_solid_enterprise/modules/member/filter/find_member_account_by_question.xml
new file mode 100644
index 000000000..5ee5c194d
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/find_member_account_by_question.xml
@@ -0,0 +1,14 @@
+<filter name="find_member_account_by_question" module="member" act="procMemberFindAccountByQuestion">
+    <form>
+        <node target="user_id" required="true" />
+		<node target="email_address" required="true" minlength="2" maxlength="255" filter="email" />
+		<node target="find_account_question" required="true" />
+		<node target="find_account_answer" required="true" maxlength="250" />
+    </form>
+    <parameter />
+    <response callback_func="completeFindMemberAccountByQuestion">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="user_id" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/leave_member.xml b/themes/xe_solid_enterprise/modules/member/filter/leave_member.xml
new file mode 100644
index 000000000..18eb8287d
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/leave_member.xml
@@ -0,0 +1,12 @@
+<filter name="leave_member" module="member" act="procMemberLeave" confirm_msg_code="confirm_leave">
+    <form>
+        <node target="password" required="true" maxlength="20" />
+    </form>
+    <parameter>
+        <param name="password" target="password" />
+    </parameter>
+    <response callback_func="completeLeave">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/login.xml b/themes/xe_solid_enterprise/modules/member/filter/login.xml
new file mode 100644
index 000000000..13d3e2836
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/login.xml
@@ -0,0 +1,11 @@
+<filter name="login" module="member" act="procMemberLogin">
+    <form>
+        <node target="user_id" required="true" filter="user_id" />
+        <node target="password" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/logout.xml b/themes/xe_solid_enterprise/modules/member/filter/logout.xml
new file mode 100644
index 000000000..3dacc54e3
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="logout" module="member" act="procMemberLogout">
+    <form />
+    <response callback_func="completeLogout">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/modify_info.xml b/themes/xe_solid_enterprise/modules/member/filter/modify_info.xml
new file mode 100644
index 000000000..673a243fb
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/modify_info.xml
@@ -0,0 +1,26 @@
+<filter name="modify_info" module="member" act="procMemberModifyInfo" extend_filter="member.getJoinFormList" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="user_name" required="true" minlength="2" maxlength="40" />
+        <node target="nick_name" required="true" minlength="2" maxlength="40" />
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
+		<node target="find_account_question" required="true" />
+		<node target="find_account_answer" required="true" maxlength="250" />
+    </form>
+    <parameter>
+        <param name="accept_agreement" target="accept_agreement" />
+        <param name="user_name" target="user_name" />
+        <param name="nick_name" target="nick_name" />
+        <param name="nick_name" target="nick_name" />
+        <param name="find_account_question" target="find_account_question" />
+        <param name="find_account_answer" target="find_account_answer" />
+        <param name="blog" target="blog" />
+        <param name="birthday" target="birthday" />
+        <param name="allow_mailing" target="allow_mailing" />
+        <param name="email_address" target="email_address" />
+        <param name="signature" target="signature" />
+    </parameter>
+    <response callback_func="completeModify">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/modify_password.xml b/themes/xe_solid_enterprise/modules/member/filter/modify_password.xml
new file mode 100644
index 000000000..242a7f9cc
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/modify_password.xml
@@ -0,0 +1,15 @@
+<filter name="modify_password" module="member" act="procMemberModifyPassword" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="current_password" required="true" minlength="1" maxlength="50" />
+        <node target="password1" required="true" minlength="6" maxlength="20" />
+        <node target="password2" required="true" minlength="6" maxlength="20" equalto="password1" />
+    </form>
+    <parameter>
+        <param name="current_password" target="current_password" />
+        <param name="password" target="password1" />
+    </parameter>
+    <response callback_func="completeModify">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/openid_leave_member.xml b/themes/xe_solid_enterprise/modules/member/filter/openid_leave_member.xml
new file mode 100644
index 000000000..1f6f00a35
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/openid_leave_member.xml
@@ -0,0 +1,8 @@
+<filter name="openid_leave_member" module="member" act="procMemberOpenIDLeave" confirm_msg_code="confirm_leave">
+    <form />
+    <parameter />
+    <response callback_func="completeLeave">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/openid_login.xml b/themes/xe_solid_enterprise/modules/member/filter/openid_login.xml
new file mode 100644
index 000000000..2557ca8ee
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/openid_login.xml
@@ -0,0 +1,11 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+        <node target="referer_url" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/resend_auth_mail.xml b/themes/xe_solid_enterprise/modules/member/filter/resend_auth_mail.xml
new file mode 100644
index 000000000..7dcadbc4d
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/resend_auth_mail.xml
@@ -0,0 +1,10 @@
+<filter name="resend_auth_mail" module="member" act="procMemberResendAuthMail">
+    <form>
+        <node target="email_address" required="true" filter="email_address" />
+    </form>
+    <parameter />
+    <response callback_func="completeResendAuthMail">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/signup.xml b/themes/xe_solid_enterprise/modules/member/filter/signup.xml
new file mode 100644
index 000000000..7b2e01811
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/signup.xml
@@ -0,0 +1,32 @@
+<filter name="signup" module="member" act="procMemberInsert" extend_filter="member.getJoinFormList" confirm_msg_code="confirm_submit">
+    <form>
+        <node target="user_id" required="true" minlength="3" maxlength="20" filter="userid" />
+        <node target="password1" required="true" minlength="6" maxlength="20" />
+        <node target="password2" required="true" minlength="6" maxlength="20" equalto="password1" />
+        <node target="user_name" required="true" minlength="2" maxlength="40" />
+        <node target="nick_name" required="true" minlength="2" maxlength="40" />
+        <node target="email_address" required="true" minlength="1" maxlength="200" filter="email" />
+		<node target="find_account_question" required="true" />
+		<node target="find_account_answer" required="true" maxlength="250" />
+    </form>
+    <parameter>
+        <param name="accept_agreement" target="accept_agreement" />
+        <param name="member_srl" target="member_srl" />
+        <param name="user_id" target="user_id" />
+        <param name="password" target="password1" />
+        <param name="user_name" target="user_name" />
+        <param name="nick_name" target="nick_name" />
+        <param name="find_account_question" target="find_account_question" />
+        <param name="find_account_answer" target="find_account_answer" />
+        <param name="homepage" target="homepage" />
+        <param name="blog" target="blog" />
+        <param name="birthday" target="birthday" />
+        <param name="allow_mailing" target="allow_mailing" />
+        <param name="email_address" target="email_address" />
+    </parameter>
+    <response callback_func="completeInsert">
+        <tag name="error" />
+        <tag name="message" />
+        <tag name="redirect_url" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/filter/update_allow_message.xml b/themes/xe_solid_enterprise/modules/member/filter/update_allow_message.xml
new file mode 100644
index 000000000..c28e9c32d
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/filter/update_allow_message.xml
@@ -0,0 +1,5 @@
+<filter name="update_allow_message" module="member" act="procMemberUpdateAllowMessage">
+    <form />
+    <parameter />
+    <response />
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/member/find_member_account.html b/themes/xe_solid_enterprise/modules/member/find_member_account.html
new file mode 100644
index 000000000..476fd6215
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/find_member_account.html
@@ -0,0 +1,68 @@
+<!--#include("./common_header.html")-->
+<!--%import("filter/find_member_account.xml")-->
+<!--%import("filter/find_member_account_by_question.xml")-->
+<h3 class="pTitle">{$lang->cmd_find_member_account}</h3>
+<div class="find_account">
+
+<table cellpadding="0" cellspacing="0" class="findTable">
+	<colgroup>
+    	<col width="180" />
+        <col width="" />
+    </colgroup>
+	<tbody>
+		<form action="./" method="get" onsubmit="return procFilter(this, find_member_account)">
+		<input type="hidden" name="mid" value="{$mid}" />
+		<input type="hidden" name="document_srl" value="{$document_srl}" />
+		<input type="hidden" name="page" value="{$page}" />
+
+        <tr class="bLine"><td colspan="2"></td></tr>
+    	<tr class="mLine">
+        	<th class=""><div>{$lang->email_address}</div></th>
+            <td class=""><input type="email" name="email_address" class="tInput" /><p>{$lang->about_find_member_account}</p></td>
+        </tr>
+        <tr class="btnLine">
+            <th></th>
+            <td><span class="grayBtn"><input type="submit" accesskey="s" value="{$lang->cmd_find_member_account}" /></span></td>
+        </tr>
+        <tr class="bLine"><td colspan="2"></td></tr>
+		</form>
+
+		<form action="./" method="get" onsubmit="return procFilter(this, find_member_account_by_question)">
+		<input type="hidden" name="mid" value="{$mid}" />
+		<input type="hidden" name="document_srl" value="{$document_srl}" />
+		<input type="hidden" name="page" value="{$page}" />
+
+
+        <tr class="sLine">
+        	<th><div>{$lang->user_id}</div></th>
+            <td><input type="text" name="user_id" class="tInput" /></td>
+        </tr>
+        <tr class="sLine">
+        	<th><div>{$lang->email_address}</div></th>
+            <td><input type="text" name="email_address" class="tInput" /></td>
+        </tr>
+        <tr class="mLine">
+        	<th><div>{$lang->find_account_question}</div></th>
+            <td>
+				<select name="find_account_question">
+				<!--@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><br /><br />
+            	<input type="text" name="find_account_answer" value=""  /><br />
+                <p>{$lang->about_find_account_question}</p>
+                
+            </td>
+        </tr>
+        <tr class="btnLine">
+        	<th></th>
+            <td class=""><span class="grayBtn"><input type="submit" value="{$lang->cmd_get_temp_password}" accesskey="s" /></td>
+        </tr>
+        <tr class="bLine"><td colspan="2"></td></tr>
+    </tbody>
+</table>
+</form>
+</div><!-- //find_account -->
+
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/find_member_account_mail.html b/themes/xe_solid_enterprise/modules/member/find_member_account_mail.html
new file mode 100644
index 000000000..ca9bed876
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/find_member_account_mail.html
@@ -0,0 +1,13 @@
+{$lang->msg_find_account_info}<br />
+<hr noshade="noshade" />
+<ul>
+    <li>Site : <a href="{getUrl()}" target="_blank">{getUrl()}</a></li>
+    <li>{$lang->user_id} : {$member_info->user_id}</li>
+    <li>{$lang->user_name} : {$member_info->user_name}</li>
+    <li>{$lang->nick_name} :  {$member_info->nick_name}</li>
+    <li>{$lang->email_address} : {$member_info->email_address}</li>
+    <li>{$lang->password} : <span style="color:red">{$auth_args->new_password}</span></li>
+</ul>
+<hr noshade="noshade" />
+{$lang->msg_find_account_comment}<br />
+<a href="{$find_url}">{$find_url}</a>
diff --git a/themes/xe_solid_enterprise/modules/member/find_temp_password.html b/themes/xe_solid_enterprise/modules/member/find_temp_password.html
new file mode 100644
index 000000000..876a45f43
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/find_temp_password.html
@@ -0,0 +1,8 @@
+<!--#include("./common_header.html")-->
+
+<h3>{$lang->cmd_find_member_account}</h3>
+<p class="summary">{$lang->about_find_member_account}</p>
+
+{$temp_password}
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/images/Thumbs.db b/themes/xe_solid_enterprise/modules/member/images/Thumbs.db
new file mode 100644
index 000000000..d9bb0b585
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/Thumbs.db differ
diff --git a/modules/member/skins/default/img/arrowNextA1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowNextA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/member/skins/default/img/arrowNextA1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowNextA1.gif
diff --git a/modules/admin/tpl/img/arrowNextB1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowNextB1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowNextB1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowNextB1.gif
diff --git a/modules/admin/tpl/img/arrowNextC1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowNextC1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowNextC1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowNextC1.gif
diff --git a/modules/member/skins/default/img/arrowNextEndA1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowNextEndA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/member/skins/default/img/arrowNextEndA1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowNextEndA1.gif
diff --git a/modules/member/skins/default/img/arrowPrevA1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowPrevA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/member/skins/default/img/arrowPrevA1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowPrevA1.gif
diff --git a/modules/admin/tpl/img/arrowPrevB1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowPrevB1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowPrevB1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowPrevB1.gif
diff --git a/modules/admin/tpl/img/arrowPrevC1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowPrevC1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/admin/tpl/img/arrowPrevC1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowPrevC1.gif
diff --git a/modules/member/skins/default/img/arrowPrevEndA1.gif b/themes/xe_solid_enterprise/modules/member/images/arrowPrevEndA1.gif
old mode 100755
new mode 100644
similarity index 100%
rename from modules/member/skins/default/img/arrowPrevEndA1.gif
rename to themes/xe_solid_enterprise/modules/member/images/arrowPrevEndA1.gif
diff --git a/themes/xe_solid_enterprise/modules/member/images/btn_gray_left.gif b/themes/xe_solid_enterprise/modules/member/images/btn_gray_left.gif
new file mode 100644
index 000000000..5550ef6c5
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/btn_gray_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/btn_gray_right.gif b/themes/xe_solid_enterprise/modules/member/images/btn_gray_right.gif
new file mode 100644
index 000000000..59df48db5
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/btn_gray_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/btn_signin.gif b/themes/xe_solid_enterprise/modules/member/images/btn_signin.gif
new file mode 100644
index 000000000..6caa56958
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/btn_signin.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/btn_white_left.gif b/themes/xe_solid_enterprise/modules/member/images/btn_white_left.gif
new file mode 100644
index 000000000..356071c77
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/btn_white_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/btn_white_right.gif b/themes/xe_solid_enterprise/modules/member/images/btn_white_right.gif
new file mode 100644
index 000000000..6f66d52ea
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/btn_white_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/bullet_input_id.gif b/themes/xe_solid_enterprise/modules/member/images/bullet_input_id.gif
new file mode 100644
index 000000000..6963cf9e7
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/bullet_input_id.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/bullet_input_pw.gif b/themes/xe_solid_enterprise/modules/member/images/bullet_input_pw.gif
new file mode 100644
index 000000000..8058f42ae
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/bullet_input_pw.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/coltable_head_bg.gif b/themes/xe_solid_enterprise/modules/member/images/coltable_head_bg.gif
new file mode 100644
index 000000000..8fb567f73
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/coltable_head_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/coltable_head_left.gif b/themes/xe_solid_enterprise/modules/member/images/coltable_head_left.gif
new file mode 100644
index 000000000..1b2f15b2f
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/coltable_head_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/coltable_head_right.gif b/themes/xe_solid_enterprise/modules/member/images/coltable_head_right.gif
new file mode 100644
index 000000000..92ce65248
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/coltable_head_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_bl.gif b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_bl.gif
new file mode 100644
index 000000000..07a5dbe1c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_bl.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_br.gif b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_br.gif
new file mode 100644
index 000000000..f05b10cd2
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_br.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_tl.gif b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_tl.gif
new file mode 100644
index 000000000..a88bcf0c1
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_tl.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_tr.gif b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_tr.gif
new file mode 100644
index 000000000..a02257f9e
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/findTable_9slice_tr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/find_account_bg.jpg b/themes/xe_solid_enterprise/modules/member/images/find_account_bg.jpg
new file mode 100644
index 000000000..fde837531
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/find_account_bg.jpg differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/find_bg_left.gif b/themes/xe_solid_enterprise/modules/member/images/find_bg_left.gif
new file mode 100644
index 000000000..8543738b9
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/find_bg_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/find_bg_left.png b/themes/xe_solid_enterprise/modules/member/images/find_bg_left.png
new file mode 100644
index 000000000..e3f604357
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/find_bg_left.png differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/find_bg_repeat.gif b/themes/xe_solid_enterprise/modules/member/images/find_bg_repeat.gif
new file mode 100644
index 000000000..49abd68cd
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/find_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/find_bg_right.gif b/themes/xe_solid_enterprise/modules/member/images/find_bg_right.gif
new file mode 100644
index 000000000..dfed4dbe2
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/find_bg_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/find_bg_right.png b/themes/xe_solid_enterprise/modules/member/images/find_bg_right.png
new file mode 100644
index 000000000..83faa292c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/find_bg_right.png differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/h2_signin.gif b/themes/xe_solid_enterprise/modules/member/images/h2_signin.gif
new file mode 100644
index 000000000..fcbea21e6
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/h2_signin.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/icon_member_info.gif b/themes/xe_solid_enterprise/modules/member/images/icon_member_info.gif
new file mode 100644
index 000000000..0d34860ef
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/icon_member_info.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/icon_message.gif b/themes/xe_solid_enterprise/modules/member/images/icon_message.gif
new file mode 100644
index 000000000..86e08d494
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/icon_message.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/login_panel_bg.gif b/themes/xe_solid_enterprise/modules/member/images/login_panel_bg.gif
new file mode 100644
index 000000000..dd4bdcce8
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/login_panel_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/signPanel_input_bg.gif b/themes/xe_solid_enterprise/modules/member/images/signPanel_input_bg.gif
new file mode 100644
index 000000000..cd97a9dca
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/signPanel_input_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/signup_head.gif b/themes/xe_solid_enterprise/modules/member/images/signup_head.gif
new file mode 100644
index 000000000..704379ad7
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/signup_head.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/table_bg_bottom.gif b/themes/xe_solid_enterprise/modules/member/images/table_bg_bottom.gif
new file mode 100644
index 000000000..76cc5e89c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/table_bg_bottom.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/table_bg_repeat.gif b/themes/xe_solid_enterprise/modules/member/images/table_bg_repeat.gif
new file mode 100644
index 000000000..11dea9297
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/table_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/table_bg_top.gif b/themes/xe_solid_enterprise/modules/member/images/table_bg_top.gif
new file mode 100644
index 000000000..aa84f4050
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/table_bg_top.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/title_bg_left.gif b/themes/xe_solid_enterprise/modules/member/images/title_bg_left.gif
new file mode 100644
index 000000000..c39c2d156
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/title_bg_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/title_bg_repeat.gif b/themes/xe_solid_enterprise/modules/member/images/title_bg_repeat.gif
new file mode 100644
index 000000000..d4b3668ba
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/title_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/title_bg_right.gif b/themes/xe_solid_enterprise/modules/member/images/title_bg_right.gif
new file mode 100644
index 000000000..365203360
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/title_bg_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/title_item_vr.gif b/themes/xe_solid_enterprise/modules/member/images/title_item_vr.gif
new file mode 100644
index 000000000..ee5485b2c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/title_item_vr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/title_on_left.gif b/themes/xe_solid_enterprise/modules/member/images/title_on_left.gif
new file mode 100644
index 000000000..e54f5187d
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/title_on_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/title_on_right.gif b/themes/xe_solid_enterprise/modules/member/images/title_on_right.gif
new file mode 100644
index 000000000..58c03997f
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/title_on_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/images/topbar_vr.gif b/themes/xe_solid_enterprise/modules/member/images/topbar_vr.gif
new file mode 100644
index 000000000..47c3619af
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/images/topbar_vr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/member/js/member.js b/themes/xe_solid_enterprise/modules/member/js/member.js
new file mode 100644
index 000000000..1b2ff9176
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/js/member.js
@@ -0,0 +1,170 @@
+/* 사용자 추가 */
+function completeInsert(ret_obj, response_tags, args, fo_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+    var redirect_url = ret_obj['redirect_url'];
+
+    alert(message);
+
+    if(current_url.getQuery('popup')==1) {
+        if(typeof(opener)!='undefined') opener.location.reload();
+        window.close();
+    } else {
+        if(redirect_url) location.href = redirect_url;
+        else location.href = current_url.setQuery('act','');
+    }
+}
+
+/* 정보 수정 */
+function completeModify(ret_obj, response_tags, args, fo_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    alert(message);
+
+    location.href = current_url.setQuery('act','dispMemberInfo');
+}
+
+/* 회원 탈퇴 */
+function completeLeave(ret_obj, response_tags, args, fo_obj) {
+    var error = ret_obj['error'];
+    var message = ret_obj['message'];
+
+    alert(message);
+
+    location.href = current_url.setQuery('act','');
+}
+
+/* 이미지 업로드 */
+function _doUploadImage(fo_obj, act) {
+    fo_obj.act.value = act;
+    fo_obj.submit();
+}
+
+/* 프로필 이미지/ 이미지 이름/마크 등록 */
+function doUploadProfileImage() {
+    var fo_obj = xGetElementById("fo_insert_member");
+    if(!fo_obj.profile_image.value) return;
+    _doUploadImage(fo_obj, 'procMemberInsertProfileImage');
+}
+function doUploadImageName() {
+    var fo_obj = xGetElementById("fo_insert_member");
+    if(!fo_obj.image_name.value) return;
+    _doUploadImage(fo_obj, 'procMemberInsertImageName');
+}
+
+function doUploadImageMark() {
+    var fo_obj = xGetElementById("fo_insert_member");
+    if(!fo_obj.image_mark.value) return;
+    _doUploadImage(fo_obj, 'procMemberInsertImageMark');
+}
+
+/* 로그인 영역에 포커스 */
+function doFocusUserId(fo_id) {
+    if(xScrollTop()) return;
+    var fo_obj = xGetElementById(fo_id);
+    if(fo_obj.user_id) {
+        try{
+            fo_obj.user_id.focus();
+        } catch(e) {};
+    }
+}
+
+/* 로그인 후 */
+function completeLogin(ret_obj, response_tags, params, fo_obj) {
+    if(fo_obj.remember_user_id && fo_obj.remember_user_id.checked) {
+        var expire = new Date();
+        expire.setTime(expire.getTime()+ (7000 * 24 * 3600000));
+        xSetCookie('user_id', fo_obj.user_id.value, expire);
+    }
+
+    var url =  current_url.setQuery('act','');
+    location.href = current_url.setQuery('act','');
+}
+
+/* 로그아웃 후 */
+function completeLogout(ret_obj) {
+    location.href = current_url.setQuery('act','');
+}
+
+/* 오픈아이디 로그인 후 */
+function completeOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+/* 인증 메일 재발송 후 */
+function completeResendAuthMail(ret_obj, response_tags) {
+	var error = ret_obj['error'];
+    var message =  ret_obj['message'];
+
+    if(message) alert(message);
+	if(error != 0) alert(error);
+}
+
+/* 프로필 이미지/이미지 이름, 마크 삭제 */
+function doDeleteProfileImage(member_srl) {
+        var fo_obj = xGetElementById("fo_insert_member");
+        fo_obj.member_srl.value = member_srl;
+        procFilter(fo_obj, delete_profile_image);
+}
+
+function doDeleteImageName(member_srl) {
+        var fo_obj = xGetElementById("fo_insert_member");
+        fo_obj.member_srl.value = member_srl;
+        procFilter(fo_obj, delete_image_name);
+}
+
+function doDeleteImageMark(member_srl) {
+        var fo_obj = xGetElementById("fo_insert_member");
+        fo_obj.member_srl.value = member_srl;
+        procFilter(fo_obj, delete_image_mark);
+}
+
+/* 스크랩 삭제 */
+function doDeleteScrap(document_srl) {
+    var params = new Array();
+    params['document_srl'] = document_srl;
+    exec_xml('member', 'procMemberDeleteScrap', params, function() { location.reload(); });
+}
+
+/* 비밀번호 찾기 후 */
+function completeFindMemberAccount(ret_obj, response_tags) {
+    alert(ret_obj['message']);
+}
+
+/* 임시 비밀번호 생성 */
+function completeFindMemberAccountByQuestion(ret_obj, response_tags) {
+    if(ret_obj['error'] != 0){
+		alert(ret_obj['message']);
+	}else{
+		location.href = current_url.setQuery('act','dispMemberGetTempPassword').setQuery('user_id',ret_obj['user_id']);
+	}
+}
+
+/* 저장글 삭제 */
+function doDeleteSavedDocument(document_srl, confirm_message) {
+    if(!confirm(confirm_message)) return false;
+
+    var params = new Array();
+    params['document_srl'] = document_srl;
+    exec_xml('member', 'procMemberDeleteSavedDocument', params, function() { location.reload(); });
+}
+
+function insertSelectedModule(id, module_srl, mid, browser_title) {
+    location.href = current_url.setQuery('selected_module_srl',module_srl);
+}
+
+/* 오픈아이디 연결 */
+function doAddOpenIDToMember() {
+    var fo_obj = xGetElementById("fo_insert_member");
+    procFilter(fo_obj, add_openid_to_member);
+}
+
+/* 오픈아이디 연결 해제 */
+function doDeleteOpenIDFromMember(openid) {
+    var fo_obj = xGetElementById("fo_insert_member");
+    fo_obj.openid_to_delete.value = openid;
+    procFilter(fo_obj, delete_openid_from_member);
+}
+
diff --git a/themes/xe_solid_enterprise/modules/member/js/signup_check.js b/themes/xe_solid_enterprise/modules/member/js/signup_check.js
new file mode 100644
index 000000000..77116ddb4
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/js/signup_check.js
@@ -0,0 +1,52 @@
+/**
+ * @brief 회원 가입시나 정보 수정시 각 항목의 중복 검사등을 하는 기능을 구현
+ * @author NHN (developer@xpressengine.com)
+ **/
+
+// 입력이 시작된 것과 입력후 정해진 시간동안 내용이 변하였을 경우 서버에 ajax로 체크를 하기 위한 변수 설정
+var memberCheckObj = { target:null, value:null }
+
+// domready시에 특정 필드들에 대해 이벤트를 걸어 놓음
+jQuery(document).ready(memberSetEvent);
+
+function memberSetEvent() {
+	jQuery('#fo_insert_member :input')
+		.filter('[name=user_id],[name=nick_name],[name=email_address]')
+		.blur(memberCheckValue);
+}
+
+
+// 실제 서버에 특정 필드의 value check를 요청하고 이상이 있으면 메세지를 뿌려주는 함수
+function memberCheckValue(event) {
+	var field  = event.target;
+	var _name  = field.name;
+	var _value = field.value;
+	if(!_name || !_value) return;
+
+	var params = {name:_name, value:_value};
+	var response_tags = ['error','message'];
+
+	exec_xml('member','procMemberCheckValue', params, completeMemberCheckValue, response_tags, field);
+}
+
+// 서버에서 응답이 올 경우 이상이 있으면 메세지를 출력
+function completeMemberCheckValue(ret_obj, response_tags, field) {
+	var _id   = 'dummy_check'+field.name;
+	var dummy = jQuery('#'+_id);
+   
+    if(ret_obj['message']=='success') {
+        dummy.html('').hide();
+        return;
+    }
+
+	if (!dummy.length) {
+		dummy = jQuery('<div class="checkValue" />').attr('id', _id).appendTo(field.parentNode);
+	}
+
+	dummy.html(ret_obj['message']).show();
+}
+
+// 결과 메세지를 정리하는 함수
+function removeMemberCheckValueOutput(dummy, obj) {
+    dummy.style.display = "none";
+}
diff --git a/themes/xe_solid_enterprise/modules/member/leave_form.html b/themes/xe_solid_enterprise/modules/member/leave_form.html
new file mode 100644
index 000000000..d8e77b073
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/leave_form.html
@@ -0,0 +1,28 @@
+<!--#include("./common_header.html")-->
+
+<!--%import("filter/leave_member.xml")-->
+
+    <h3>{$member_title = $lang->msg_leave_member}</h3>
+    <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, leave_member)">
+    <input type="hidden" name="mid" value="{$mid}" />
+    <input type="hidden" name="document_srl" value="{$document_srl}" />
+    <input type="hidden" name="page" value="{$page}" />
+
+    <table cellspacing="0" class="rowTable" title="{$lang->msg_leave_member}">
+    <tr>
+        <th scope="row"><div>{$lang->user_id}</div></th>
+        <td class="wide">{$member_info->user_id}</td>
+    </tr>
+    <tr>
+        <th scope="row"><div><label for="cpw">{$lang->password}</label></div></th>
+        <td><input type="password" name="password" id="cpw" class="txt" /></td>
+    </tr>
+    <tr>
+        <th class="button_col" colspan="2">
+            <span class="grayBtn"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </table>
+</form>
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/login_form.html b/themes/xe_solid_enterprise/modules/member/login_form.html
new file mode 100644
index 000000000..a86975ee6
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/login_form.html
@@ -0,0 +1,69 @@
+<!--#include("./common_header.html")-->
+<!--%import("filter/login.xml")-->
+<!--%import("filter/openid_login.xml")-->
+
+<script type="text/javascript">
+    var keep_signed_msg = "{$lang->about_keep_signed}";
+    xAddEventListener(window, "load", function() { doFocusUserId('fo_member_login'); });
+</script>
+
+<!-- XE 로그인 폼 -->
+<div class="memberSmallBox">
+
+    <div class="header">{$lang->cmd_login}</div>
+
+	<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+		<p>{$XE_VALIDATOR_MESSAGE}</p>
+	</div>
+    <form ruleset="@login" action="./" method="post" id="fo_member_login">
+	<input type="hidden" name="success_return_url" value="{getUrl('act', '')}" />
+        <fieldset class="login">
+            <dl>
+                <dt><label for="uid">{$lang->user_id}</label></dt>
+                <dd><input type="text" name="user_id" id="uid" value="" class="iText w140" /></dd>
+                <dt><label for="upw">{$lang->password}</label></dt>
+                <dd><input type="password" name="password" id="upw" value="" class="iText w140" /></dd>
+            </dl>
+
+            <p class="keep">
+                <input type="checkbox" name="keep_signed" id="keepid_opt" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);"/>
+                <label for="keepid_opt">{$lang->keep_signed}</label>
+            </p>
+			
+			<div class="buttonArea">
+				<span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span>
+			</div>
+
+        </fieldset>
+    </form>
+
+    <div class="help tCenter">
+        <a href="{getUrl('act','dispMemberFindAccount')}"><span>{$lang->cmd_find_member_account}</span></a> |
+        <a href="{getUrl('act','dispMemberSignUpForm')}"><span>{$lang->cmd_signup}</span></a>
+    </div>
+</div>
+
+<!--@if($member_config->enable_openid=='Y')-->
+<!-- OpenID 로그인 폼 -->
+<div class="memberSmallBox">
+
+    <div class="header">{$lang->openid}</div>
+
+    <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)">
+        <fieldset class="login">
+            <dl>
+                <dt><label for="open_uid">{$lang->user_id}</label></dt>
+                <dd><input type="text" name="openid" id="open_uid" value="" class="openid_user_id" /></dd>
+            </dl>
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_login}" /></span>
+
+        </fieldset>
+        <input type="hidden" name="referer_url" value="{$referer_url}" />
+    </form>
+
+    <div class="help tLeft">{$lang->about_openid}</div>
+
+</div>
+<!--@end-->
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/logout.html b/themes/xe_solid_enterprise/modules/member/logout.html
new file mode 100644
index 000000000..fa070c3ac
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/logout.html
@@ -0,0 +1,22 @@
+<!--#include("./common_header.html")-->
+<!--%import("filter/logout.xml")-->
+
+<form action="./" method="get" onsubmit="return procFilter(this, logout)">
+<input type="hidden" name="mid" value="{$mid}" />
+
+    <h3>{$lang->cmd_logout}</h3>
+
+    <table class="crossTable">
+    <tr>
+        <th class="title">{$lang->confirm_logout}</th>
+    </tr>
+    <tr>
+        <th class="button_col">
+            <span class="button black strong"><input type="submit" value="{$lang->cmd_logout}" /></span>
+            <a href="{getUrl('act','','member_srl','')}" class="button"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </table>
+
+</form>
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/member_info.html b/themes/xe_solid_enterprise/modules/member/member_info.html
new file mode 100644
index 000000000..e0c5ffdd2
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/member_info.html
@@ -0,0 +1,75 @@
+<!--#include("./common_header.html")-->
+
+<h3 class="pTitle1">{$lang->cmd_view_member_info}</h3>
+    <table cellspacing="0" cellpadding="0" class="rowTable">
+			<!--@foreach($member_config->signupForm as $no=>$formInfo)-->
+			<!--@if($formInfo->isUse && ($formInfo->name != 'password' && $formInfo->name != 'find_account_question'))-->
+			<!--@if($formInfo->isDefaultForm)-->
+	{@$title = $formInfo->title}
+	{@$value = $memberInfo[$formInfo->name]}
+				<!--@if($formInfo->name == 'profile_image' && $memberInfo['profile_image'])-->
+	{@$target = $memberInfo['profile_image']}
+	{@$value = '<img src="'.$target->src.'" />'}
+				<!--@elseif($formInfo->name == 'image_name' && $memberInfo['image_name'])-->
+	{@$target = $memberInfo['image_name']}
+	{@$value = '<img src="'.$target->src.'" />'}
+				<!--@elseif($formInfo->name == 'image_mark' && $memberInfo['image_mark'])-->
+	{@$target = $memberInfo['image_mark']}
+	{@$value = '<img src="'.$target->src.'" />'}
+				<!--@end-->
+			<!--@else-->
+	{@$title = $extend_form_list[$formInfo->member_join_form_srl]->column_title}
+	{@$orgValue = $extend_form_list[$formInfo->member_join_form_srl]->value}
+			<!--@if($formInfo->type=='tel')-->
+				{@$value = htmlspecialchars($orgValue[0])}
+					<!--@if($orgValue[1])-->-<!--@end-->
+				{@$value .= htmlspecialchars($orgValue[1])}
+					<!--@if($orgValue[2])-->-<!--@end-->
+				{@$value .= htmlspecialchars($orgValue[2])}
+			<!--@elseif($formInfo->type=='kr_zip')-->
+				{@$value = htmlspecialchars($orgValue[0])}<!--@if($orgValue[1]&&$orgValue[0])--><br /><!--@end-->{@$value .= htmlspecialchars($orgValue[1])}
+			<!--@elseif($formInfo->type=='checkbox' && is_array($orgValue))-->
+				{@$value = htmlspecialchars(implode(", ",$orgValue))}
+			<!--@elseif($formInfo->type=='date')-->
+				{@$value = zdate($orgValue, "Y-m-d")}
+			<!--@else-->
+				{@$value = nl2br(htmlspecialchars($orgValue))}
+			<!--@end-->
+		<!--@end-->
+
+		<tr>
+			<th scope="row" >{$title} <em cond="$formInfo->required || $formInfo->mustRequired">*</em></th>
+			<td class="text">{$value}</td>
+		</tr>
+		<!--@end-->
+		<!--@end-->
+
+		<tr>
+			<th scope="row">{$lang->group}</th>
+			<td class="text">{implode(', ', $memberInfo['group_list'])}</td>
+		</tr>
+		<tr>
+			<th>{$lang->signup_date}</th>
+			<td>{zdate($memberInfo[regdate],"Y-m-d")}</td>
+		</tr>
+		<!--@if($memberInfo[member_srl] == $logged_info->member_srl || $logged_info->is_admin == 'Y' )-->
+		<tr>
+			<th>{$lang->last_login}</th>
+			<td>{zdate($memberInfo[last_login],"Y-m-d")}</td>
+		</tr>
+		<!--@end-->
+</table>
+<div class="btn_bar_r">
+	<!--@if($memberInfo['member_srl'] == $logged_info->member_srl)-->
+	<a href="{getUrl('act','dispMemberModifyInfo','member_srl','')}" class="grayBtn"><span>{$lang->cmd_modify_member_info}</span></a>
+		<!--@if($logged_info->is_openid)-->
+			<a href="{getUrl('act','dispMemberOpenIDLeave','member_srl','')}" class="grayBtn"><span>{$lang->cmd_leave}</span></a>
+		<!--@else-->
+			<a href="{getUrl('act','dispMemberModifyPassword','member_srl','')}" class="grayBtn"><span>{$lang->cmd_modify_member_password}</span></a>
+			<a href="{getUrl('act','dispMemberLeave','member_srl','')}" class="grayBtn"><span>{$lang->cmd_leave}</span></a>
+		<!--@end-->
+	<!--@end-->
+	<a href="{getUrl('act','','member_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+</div><!-- //btn_bar_r -->
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/modify_info.html b/themes/xe_solid_enterprise/modules/member/modify_info.html
new file mode 100644
index 000000000..e666d1387
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/modify_info.html
@@ -0,0 +1,77 @@
+<include target="./common_header.html" />
+<load target="./js/signup_check.js" />
+<!--// datepicker javascript plugin load -->
+<!--%load_js_plugin("ui")-->
+<!--%load_js_plugin("ui.datepicker")-->
+
+<h3 class="pTitle">{$lang->msg_update_member}</h3>
+<script type="text/javascript" >
+	xe.lang.deleteProfileImage = '{$lang->msg_delete_extend_form}';
+	xe.lang.deleteImageMark = '{$lang->msg_delete_extend_form}';
+	xe.lang.deleteImageName = '{$lang->msg_delete_extend_form}';
+</script>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+
+<form ruleset="@insertMember" id="fo_insert_member" class="form" action="{getUrl()}" method="post" enctype="multipart/form-data">
+    <input type="hidden" name="act" value="procMemberModifyInfo" />
+    <input type="hidden" name="module" value="member" />
+    <input type="hidden" name="member_srl" value="{$member_info->member_srl}" />
+    <input type="hidden" name="signature" value="{htmlspecialchars($member_info->signature)}" />
+    <input type="hidden" name="page" value="{$page}" />
+
+    <table cellspacing="0" class="rowTable">
+    <tr><th colspan="2" class="title"><div>{$lang->member_default_info}</div></th></tr>
+    <tr>
+        <th><div>{$identifierForm->title} *</div></th>
+        <td class="wide">
+			{$identifierForm->name}
+			<input type="hidden" name="{$identifierForm->name}" value="{$identifierForm->value}" />
+		</td>
+    </tr>
+    <tr loop="$formTags=>$formTag">
+        <th><div>{$formTag->title}</div></th>
+        <td>
+			<div class="a" cond="$formTag->name != 'signature'">{$formTag->inputTag}</div>
+			<div class="a" cond="$formTag->name =='signature'">{$editor}</div>
+		</td>
+    </tr>
+    <tr>
+        <th><div>{$lang->allow_mailing}</div></th>
+        <td>
+			<input type="checkbox" name="allow_mailing" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'" /> <p>{$lang->about_allow_mailing}</p>
+		</td>
+    </tr>
+    <tr>
+        <th><div>{$lang->allow_message}</div></th>
+        <td>
+			<block loop="$lang->allow_message_type=>$key,$val">
+				<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+			</block>
+		</td>
+    </tr>
+    <tr>
+        <th class="button_col" colspan="2">
+            <span class="grayBtn"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="whiteBtn"><span>{$lang->cmd_cancel}</span></a>
+        </th>
+    </tr>
+    </table>
+</form>
+<script type="text/javascript">
+(function($){
+    $(function(){
+        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', dateFormat:'yy-mm-dd', onSelect:function(){
+
+            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
+        };
+        $.extend(option,$.datepicker.regional['{$lang_type}']);
+        $(".inputDate").datepicker(option);
+		$(".dateRemover").click(function() {
+			$(this).prevAll('input').val('');
+			return false;});
+    });
+})(jQuery);
+</script>
+<include target="./common_footer.html" />
diff --git a/themes/xe_solid_enterprise/modules/member/modify_password.html b/themes/xe_solid_enterprise/modules/member/modify_password.html
new file mode 100644
index 000000000..3b4f7cdad
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/modify_password.html
@@ -0,0 +1,39 @@
+<!--#include("./common_header.html")-->
+<!--%import("filter/modify_password.xml")-->
+    <h3 class="pTitle2">{$member_title = $lang->cmd_modify_member_password}</h3>
+    <form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, modify_password)">
+    <input type="hidden" name="mid" value="{$mid}" />
+    <input type="hidden" name="document_srl" value="{$document_srl}" />
+    <input type="hidden" name="page" value="{$page}" />
+
+    <table cellspacing="0" class="rowTable" title="{$lang->cmd_modify_member_password}">
+    <tr>
+        <th scope="row"><div>{$lang->user_id}</div></th>
+        <td class="wide">{$member_info->user_id}</td>
+    </tr>
+    <tr>
+        <th scope="row"><div><label for="cpw">{$lang->current_password}</label></div></th>
+        <td><input type="password" name="current_password" id="cpw" class="iText" /></td>
+    </tr>
+    <tr>
+        <th scope="row"><div><label for="npw1">{$lang->password1}</label>
+		<br /><br /><br />
+		<label for="npw2">{$lang->password2}</label></div></th>
+        <td>
+            <input type="password" name="password1" id="npw1" class="txt" />
+            <br /><br />
+            <input type="password" name="password2" id="npw2" class="txt" />
+            <br />
+            <p>{$lang->about_password}</p>
+        </td>
+    </tr>
+    <tr>
+        <th class="button_col" colspan="2">
+            <span class="grayBtn"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </table>
+
+    </form>
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/openid_leave_form.html b/themes/xe_solid_enterprise/modules/member/openid_leave_form.html
new file mode 100644
index 000000000..9743eddcc
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/openid_leave_form.html
@@ -0,0 +1,28 @@
+<!--#include("./common_header.html")-->
+<!--%import("filter/openid_leave_member.xml")-->
+
+<h3 class="pTitle2">{$member_title = $lang->msg_leave_member}</h3>
+
+<form id="fo_insert_member" action="./" method="get" onsubmit="return procFilter(this, openid_leave_member)">
+<input type="hidden" name="mid" value="{$mid}" />
+<input type="hidden" name="document_srl" value="{$document_srl}" />
+<input type="hidden" name="page" value="{$page}" />
+
+    <table cellspacing="0" class="rowTable" title="$lang->msg_leave_member}">
+    <tr>
+        <th><div>{$lang->user_id}</div></th>
+        <td class="wide">
+            {$member_info->user_id}
+            <p>{$lang->about_openid_leave}</p>
+        </td>
+    </tr>
+    <tr>
+        <th class="button_col" colspan="2">
+            <span class="grayBtn"><input type="submit" value="{$lang->cmd_leave}" accesskey="s" /></span>
+            <a href="{getUrl('act','dispMemberInfo','member_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+        </th>
+    </tr>
+    </table>
+
+</form>
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/resend_auth_mail.html b/themes/xe_solid_enterprise/modules/member/resend_auth_mail.html
new file mode 100644
index 000000000..8f3b44676
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/resend_auth_mail.html
@@ -0,0 +1,24 @@
+<!--%import("filter/resend_auth_mail.xml")-->
+<!--%import("css/style.css")-->
+<!--%import("js/member.js")-->
+
+<div id="memberModule">
+<form action="./" method="post" onsubmit="return procFilter(this, resend_auth_mail)">
+    <h3 class="pTitle">{$lang->cmd_resend_auth_mail}</h3>
+    <table cellspacing="0" class="signupTable">
+	<caption><span>{$lang->cmd_resend_auth_mail}</span></caption>
+
+        <tr>
+            <th scope="row" class="w200">{$lang->email_address}</th>
+            <td><input type="text" name="email_address" value="" class="iText" />
+				<p class="cap_iText">{$lang->about_resend_auth_mail}</p>
+			</td>
+        </tr>
+        <tr class="btnbar_vat">
+            <th colspan="2" class="button_col"><span class="button black"><input type="submit" value="{$lang->cmd_resend_auth_mail}" /></span></th>
+        </tr>
+    
+    </table>
+
+</form>
+</div>
diff --git a/themes/xe_solid_enterprise/modules/member/saved_list.html b/themes/xe_solid_enterprise/modules/member/saved_list.html
new file mode 100644
index 000000000..f90001b89
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/saved_list.html
@@ -0,0 +1,49 @@
+<!--#include("./common_header.html")-->
+
+<h3 class="pTitle1">{$member_title = $lang->cmd_view_saved_document}</h3>
+
+<table class="col_table" cellpadding="0" cellspacing="0">
+<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+<colgroup>
+	<col width="120" />
+	<col width="" />
+	<col width="70" />
+</colgroup>
+	<thead>
+    	<tr>
+    	<th scope="col" class="chk l_date w150">{$lang->date}</th>
+        <th scope="col" class="subject">{$lang->title}</th>
+        <th scope="col" class="th_right w150">{$lang->cmd_delete}</th>
+        </tr>
+    </thead>
+    <tbody>
+		<!--@foreach($document_list as $no => $val)-->
+    	<tr>
+    	<td class="l_date">{$val->getRegdate("Y-m-d H:i:s")}</td>
+        <td class="subject"><div class="doc_title"><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); return false;">{$val->getTitle()}</a></div>
+            <div id="saved_document_{$val->document_srl}" class="savedContent" style="display:none;">{$val->getContent(false)}</div></td>
+        <td><a href="#" onclick="doDeleteSavedDocument('{$val->document_srl}','{$lang->confirm_delete}'); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+        </tr>
+	    <!--@end-->
+        <th colspan="3" class="button_col">
+            <a href="{getUrl('act','','selected_module_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+        </th>
+
+    </tbody>
+</table>
+
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination a1">
+    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+</div>
+
+<!--#include("./common_footer.html")-->
diff --git a/modules/member/skins/default/saved_list_popup.html b/themes/xe_solid_enterprise/modules/member/saved_list_popup.html
similarity index 97%
rename from modules/member/skins/default/saved_list_popup.html
rename to themes/xe_solid_enterprise/modules/member/saved_list_popup.html
index 7743f6cd3..e791907ed 100644
--- a/modules/member/skins/default/saved_list_popup.html
+++ b/themes/xe_solid_enterprise/modules/member/saved_list_popup.html
@@ -1,49 +1,49 @@
-<!--%import("css/default.css")-->
-
-<div id="memberModule">
-
-    <div id="popHeader" class="wide">
-        <h3 class="xeAdmin">{$lang->cmd_view_saved_document}</h3>
-    </div>
-
-    <div id="popBody">
-        <div id="memberModule">
-            <!-- 목록 -->
-            <table cellspacing="0" class="colTable">
-            <caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
-            <thead>
-                <tr>
-                    <th class="title"><div>{$lang->date}</div></th>
-                    <th class="title"><div>{$lang->title}</div></th>
-                    <th class="title"><div>{$lang->cmd_select}</div></th>
-                </tr>
-            </thead>
-            <tbody>
-                <!--@foreach($document_list as $no => $val)-->
-                <tr>
-                    <td class="nowrap">{$val->getRegdate("Y-m-d H:i:s")}</td>
-                    <td class="wide">
-                        <div><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); setFixedPopupSize(); return false;">{$val->getTitle()}</a></div>
-                        <div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;">{$val->getContent(false)}</div>
-                    </td>
-                    <td><a href="#" onclick="doDocumentSelect('{$val->document_srl}'); return false;" class="buttonSet buttonActive"><span>{$lang->cmd_select}</span></a></td>
-                </tr>
-                <!--@end-->
-            </tbody>
-            </table>
-
-            <!-- 페이지 네비게이션 -->
-            <div class="pagination a1">
-                <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
-                <!--@while($page_no = $page_navigation->getNextPage())-->
-                    <!--@if($page == $page_no)-->
-                        <strong>{$page_no}</strong> 
-                    <!--@else-->
-                        <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
-                    <!--@end-->
-                <!--@end-->
-                <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
-            </div>
-        </div>
-    </div>
-</div>
+<!--%import("css/default.css")-->
+
+<div id="memberModule">
+
+    <div id="popHeader" class="wide">
+        <h3 class="xeAdmin">{$lang->cmd_view_saved_document}</h3>
+    </div>
+
+    <div id="popBody">
+        <div id="memberModule">
+            <!-- 목록 -->
+            <table cellspacing="0" class="colTable">
+            <caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+            <thead>
+                <tr>
+                    <th class="title"><div>{$lang->date}</div></th>
+                    <th class="title"><div>{$lang->title}</div></th>
+                    <th class="title"><div>{$lang->cmd_select}</div></th>
+                </tr>
+            </thead>
+            <tbody>
+                <!--@foreach($document_list as $no => $val)-->
+                <tr>
+                    <td class="nowrap">{$val->getRegdate("Y-m-d H:i:s")}</td>
+                    <td class="wide">
+                        <div><a href="#" onclick="jQuery('#saved_document_{$val->document_srl}').toggle(); setFixedPopupSize(); return false;">{$val->getTitle()}</a></div>
+                        <div id="saved_document_{$val->document_srl}" class="saved_content" style="display:none;">{$val->getContent(false)}</div>
+                    </td>
+                    <td><a href="#" onclick="doDocumentSelect('{$val->document_srl}'); return false;" class="buttonSet buttonActive"><span>{$lang->cmd_select}</span></a></td>
+                </tr>
+                <!--@end-->
+            </tbody>
+            </table>
+
+            <!-- 페이지 네비게이션 -->
+            <div class="pagination a1">
+                <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+                <!--@while($page_no = $page_navigation->getNextPage())-->
+                    <!--@if($page == $page_no)-->
+                        <strong>{$page_no}</strong> 
+                    <!--@else-->
+                        <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+                    <!--@end-->
+                <!--@end-->
+                <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/themes/xe_solid_enterprise/modules/member/scrapped_list.html b/themes/xe_solid_enterprise/modules/member/scrapped_list.html
new file mode 100644
index 000000000..5bfc9e3ac
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/scrapped_list.html
@@ -0,0 +1,56 @@
+<!--#include("./common_header.html")-->
+
+<h3 class="pTitle1">{$member_title = $lang->cmd_view_scrapped_document}</h3>
+
+
+<table class="col_table" cellpadding="0" cellspacing="0">
+<caption>Total : {number_format($total_count)}, Page {number_format($page)}/{number_format($total_page)}</caption>
+<colgroup>
+	<col width="40" />
+	<col width="" />
+	<col width="100" />
+	<col width="150" />
+	<col width="70" />
+</colgroup>
+	<thead>
+    	<tr>
+    	<th scope="col" class="chk">{$lang->no}</th>
+        <th scope="col" class="subject"><div>{$lang->title}</div></th>
+        <th scope="col">{$lang->writer}</th>
+        <th scope="col">{$lang->date}</th>
+        <th scope="col" class="th_right">{$lang->cmd_delete}</th>
+        </tr>
+    </thead>
+    <tbody>
+		<!--@foreach($document_list as $no => $val)-->
+    	<tr>
+			<td>{$no}</td>
+			<td class="subject"><a href="{getUrl('','document_srl',$val->document_srl)}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->title)}</a></td>
+			<td><div class="member_{$val->target_member_srl}">{$val->nick_name}</div></td>
+			<td>{zdate($val->regdate, "Y-m-d H:i")}</td>
+			<td><a href="#" onclick="doDeleteScrap({$val->document_srl}); return false;" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a></td>
+        </tr>
+		<!--@end-->
+		<tr>
+			<th class="button_col" colspan="5">
+				<a href="{getUrl('act','','selected_module_srl','')}" class="whiteBtn"><span>{$lang->cmd_back}</span></a>
+			</th>
+		</tr>
+    </tbody>
+</table>
+
+
+<!-- 페이지 네비게이션 -->
+<div class="pagination a1">
+    <a href="{getUrl('page','','module_srl','')}" class="prevEnd">{$lang->first_page}</a> 
+    <!--@while($page_no = $page_navigation->getNextPage())-->
+        <!--@if($page == $page_no)-->
+            <strong>{$page_no}</strong> 
+        <!--@else-->
+            <a href="{getUrl('page',$page_no,'module_srl','')}">{$page_no}</a> 
+        <!--@end-->
+    <!--@end-->
+    <a href="{getUrl('page',$page_navigation->last_page,'module_srl','')}" class="nextEnd">{$lang->last_page}</a>
+</div>
+
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/signup_form.html b/themes/xe_solid_enterprise/modules/member/signup_form.html
new file mode 100644
index 000000000..f853a81fa
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/signup_form.html
@@ -0,0 +1,93 @@
+<!--%import("../../tpl/js/signup_check.js")-->
+<!--%import("filter/signup.xml")-->
+
+<!--// datepicker javascript plugin load -->
+<!--%load_js_plugin("ui")-->
+<!--%load_js_plugin("ui.datepicker")-->
+
+<!--#include("./common_header.html")-->
+
+    <h3 class="pTitle">{$lang->cmd_signup}</h3>
+
+	<form ruleset="@insertMember" id="fo_insert_member" class="form" action="./" method="post" enctype="multipart/form-data">
+    <input type="hidden" name="act" value="procMemberInsert" />
+    <table cellspacing="0" class="signupTable">
+	<caption><span>Sign Up</span></caption>
+    <tr>
+        <th colspan="2" class="title"><div>{$lang->member_default_info}</div></th>
+    </tr>
+    <!--@if(!$is_logged && $member_config->agreement)-->
+	<tr class="agreement">
+		<th colspan="2" class="agreement">
+			{$member_config->agreement}
+			<div class="agreementButton">
+				<input type="checkbox" name="accept_agreement" value="Y" id="accept_agree" />
+				<label for="accept_agree">{$lang->about_accept_agreement}</label>
+			</div>
+		</th>
+	</tr>
+    <!--@end-->
+    <tr>
+        <th><div> {$identifierForm->title}<em class="require">*</em></div></th>
+        <td class="wide">
+        	<input type="text" name="{$identifierForm->name}" value="{$identifierForm->value}" /> <p>{$lang->about_user_id}</p> </td>
+    </tr>
+    <tr>
+        <th><div> {$lang->password}<em class="require">*</em></div></th>
+        <td><input type="password" name="password" value="" class="iText"/><p>{$lang->about_password}</p></td>
+    </tr>
+    <tr>
+        <th><div> {$lang->password2}<em class="require">*</em></div></th>
+        <td><input type="password" name="password2" value="" class="iText"/></td>
+    </tr>
+	<tr loop="$formTags=>$formTag">
+		<th><div>{$formTag->title}</div></th>
+		<td cond="$formTag->name != 'signature'">{$formTag->inputTag}</td>
+		<td cond="$formTag->name =='signature'">{$editor}</td>
+	</tr>
+    <tr>
+        <th><div>{$lang->allow_mailing}</div></th>
+		<td>
+			<input type="radio" name="allow_mailing" id="mailingYes" value="Y" checked="checked"|cond="$member_info->allow_mailing == 'Y'"> <label for="mailingYes">{$lang->cmd_yes}</label>
+			<input type="radio" name="allow_mailing" id="mailingNo" value="N" checked="checked"|cond="$member_info->allow_mailing != 'Y'" > <label for="mailingNo">{$lang->cmd_no}</label>
+		</td>
+    </tr>
+    <tr>
+        <th><div>{$lang->allow_message}</div></th>
+		<td>
+			<block loop="$lang->allow_message_type=>$key,$val">
+				<input type="radio" name="allow_message" value="{$key}" checked="checked"|cond="$member_info->allow_message == $key" id="allow_{$key}" /> <label for="allow_{$key}">{$val}</label>
+			</block>
+		</td>
+    </tr>
+    <tr cond="class_exists('AddonCaptcha') && $oCaptcha && $oCaptcha->addon_info->apply_signup=='apply'">
+        <th><div>{$lang->captcha}</div></th>
+		<td>
+			{$oCaptcha->inlineDisplay()}
+		</td>
+    </tr>
+    <tr>
+        <th class="button_col" colspan="2">
+            <span class="grayBtn"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+            <a href="{getUrl('act','','member_srl','')}" class="whiteBtn"><span>{$lang->cmd_cancel}</span></a>
+        </th>
+    </tr>
+    </table>
+</form>
+
+<script type="text/javascript">
+(function($){
+    $(function(){
+        var option = { changeMonth: true, changeYear: true, gotoCurrent: false,yearRange:'-100:+10', onSelect:function(){
+
+            $(this).prev('input[type="hidden"]').val(this.value.replace(/-/g,""))}
+        };
+        $.extend(option,$.datepicker.regional['{$lang_type}']);
+        $(".inputDate").datepicker(option);
+		$(".dateRemover").click(function() {
+			$(this).parent().prevAll('input').val('');
+			return false;});
+    });
+})(jQuery);
+</script>
+<!--#include("./common_footer.html")-->
diff --git a/themes/xe_solid_enterprise/modules/member/skin.xml b/themes/xe_solid_enterprise/modules/member/skin.xml
new file mode 100644
index 000000000..81d2c76fb
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/member/skin.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기업용 회원정보 모듈 스킨</title>
+    <title xml:lang="zh-CN">XE标准企业会员信息皮肤</title>
+    <title xml:lang="jp">XE Solid Enterprise Member Skin</title>
+    <title xml:lang="en">XE Solid Enterprise Member Skin</title>
+    <title xml:lang="vi">XE Solid Enterprise Member Skin</title>	
+    <title xml:lang="es">XE Solid Enterprise Member Skin</title>
+    <title xml:lang="ru">XE Solid Enterprise Member Skin</title>
+    <title xml:lang="zh-TW">XE Solid Enterprise Member Skin</title>
+    <title xml:lang="tr">XE Solid Enterprise Member Skin</title>
+    <description xml:lang="ko">
+        XE 기업용 레이아웃과 조합하여 쓰이도록 되어있으며 회원 및 기타정보 조회를 쉽게 할수 있습니다.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+        皮肤继承了XE标准企业布局的风格，使用户更加方便地查看会员或其它相关信息。
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="jp">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="vi">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="es">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="ru">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-TW">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="tr">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to view the relevant information conveniently.
+        NHN (developers@xpressengine.com)
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">기본</title>
+			<title xml:lang="en">White</title>
+			<title xml:lang="zh-CN">白色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/themes/xe_solid_enterprise/modules/member/thumbnail.png b/themes/xe_solid_enterprise/modules/member/thumbnail.png
new file mode 100644
index 000000000..a32dff0e4
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/member/thumbnail.png differ
diff --git a/themes/xe_solid_enterprise/modules/message/filter/login.xml b/themes/xe_solid_enterprise/modules/message/filter/login.xml
new file mode 100644
index 000000000..c0c7e870c
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/filter/login.xml
@@ -0,0 +1,8 @@
+<filter name="message_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id" />
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response />
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/message/filter/logout.xml b/themes/xe_solid_enterprise/modules/message/filter/logout.xml
new file mode 100644
index 000000000..8005776d3
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="widget_logout" module="member" act="procMemberLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/message/filter/openid_login.xml b/themes/xe_solid_enterprise/modules/message/filter/openid_login.xml
new file mode 100644
index 000000000..a924c15d8
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeMessageOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/themes/xe_solid_enterprise/modules/message/images/Thumbs.db b/themes/xe_solid_enterprise/modules/message/images/Thumbs.db
new file mode 100644
index 000000000..4e71ed533
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/Thumbs.db differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/arrowNextA1.gif b/themes/xe_solid_enterprise/modules/message/images/arrowNextA1.gif
new file mode 100644
index 000000000..15c36291e
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/arrowNextA1.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/arrowNextEndA1.gif b/themes/xe_solid_enterprise/modules/message/images/arrowNextEndA1.gif
new file mode 100644
index 000000000..837b81fdd
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/arrowNextEndA1.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/arrowPrevA1.gif b/themes/xe_solid_enterprise/modules/message/images/arrowPrevA1.gif
new file mode 100644
index 000000000..d83dce4bf
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/arrowPrevA1.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/arrowPrevEndA1.gif b/themes/xe_solid_enterprise/modules/message/images/arrowPrevEndA1.gif
new file mode 100644
index 000000000..a5f0ec709
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/arrowPrevEndA1.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/btn_gray_left.gif b/themes/xe_solid_enterprise/modules/message/images/btn_gray_left.gif
new file mode 100644
index 000000000..5550ef6c5
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/btn_gray_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/btn_gray_right.gif b/themes/xe_solid_enterprise/modules/message/images/btn_gray_right.gif
new file mode 100644
index 000000000..59df48db5
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/btn_gray_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/btn_signin.gif b/themes/xe_solid_enterprise/modules/message/images/btn_signin.gif
new file mode 100644
index 000000000..6caa56958
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/btn_signin.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/btn_white_left.gif b/themes/xe_solid_enterprise/modules/message/images/btn_white_left.gif
new file mode 100644
index 000000000..356071c77
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/btn_white_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/btn_white_right.gif b/themes/xe_solid_enterprise/modules/message/images/btn_white_right.gif
new file mode 100644
index 000000000..6f66d52ea
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/btn_white_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/bullet_input_id.gif b/themes/xe_solid_enterprise/modules/message/images/bullet_input_id.gif
new file mode 100644
index 000000000..6963cf9e7
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/bullet_input_id.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/bullet_input_pw.gif b/themes/xe_solid_enterprise/modules/message/images/bullet_input_pw.gif
new file mode 100644
index 000000000..8058f42ae
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/bullet_input_pw.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/buttonAction.gif b/themes/xe_solid_enterprise/modules/message/images/buttonAction.gif
new file mode 100644
index 000000000..d10473101
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/buttonAction.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/coltable_head_bg.gif b/themes/xe_solid_enterprise/modules/message/images/coltable_head_bg.gif
new file mode 100644
index 000000000..8fb567f73
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/coltable_head_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/coltable_head_left.gif b/themes/xe_solid_enterprise/modules/message/images/coltable_head_left.gif
new file mode 100644
index 000000000..a68183f52
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/coltable_head_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/coltable_head_right.gif b/themes/xe_solid_enterprise/modules/message/images/coltable_head_right.gif
new file mode 100644
index 000000000..92ce65248
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/coltable_head_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_bl.gif b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_bl.gif
new file mode 100644
index 000000000..07a5dbe1c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_bl.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_br.gif b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_br.gif
new file mode 100644
index 000000000..f05b10cd2
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_br.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_tl.gif b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_tl.gif
new file mode 100644
index 000000000..a88bcf0c1
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_tl.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_tr.gif b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_tr.gif
new file mode 100644
index 000000000..a02257f9e
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/findTable_9slice_tr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/find_account_bg.jpg b/themes/xe_solid_enterprise/modules/message/images/find_account_bg.jpg
new file mode 100644
index 000000000..fde837531
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/find_account_bg.jpg differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/find_bg_left.gif b/themes/xe_solid_enterprise/modules/message/images/find_bg_left.gif
new file mode 100644
index 000000000..8543738b9
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/find_bg_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/find_bg_left.png b/themes/xe_solid_enterprise/modules/message/images/find_bg_left.png
new file mode 100644
index 000000000..e3f604357
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/find_bg_left.png differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/find_bg_repeat.gif b/themes/xe_solid_enterprise/modules/message/images/find_bg_repeat.gif
new file mode 100644
index 000000000..49abd68cd
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/find_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/find_bg_right.gif b/themes/xe_solid_enterprise/modules/message/images/find_bg_right.gif
new file mode 100644
index 000000000..dfed4dbe2
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/find_bg_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/find_bg_right.png b/themes/xe_solid_enterprise/modules/message/images/find_bg_right.png
new file mode 100644
index 000000000..83faa292c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/find_bg_right.png differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/h2_signin.gif b/themes/xe_solid_enterprise/modules/message/images/h2_signin.gif
new file mode 100644
index 000000000..fcbea21e6
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/h2_signin.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/icon_member_info.gif b/themes/xe_solid_enterprise/modules/message/images/icon_member_info.gif
new file mode 100644
index 000000000..0d34860ef
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/icon_member_info.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/icon_message.gif b/themes/xe_solid_enterprise/modules/message/images/icon_message.gif
new file mode 100644
index 000000000..86e08d494
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/icon_message.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/login_panel_bg.gif b/themes/xe_solid_enterprise/modules/message/images/login_panel_bg.gif
new file mode 100644
index 000000000..dd4bdcce8
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/login_panel_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/openid_login_bg.gif b/themes/xe_solid_enterprise/modules/message/images/openid_login_bg.gif
new file mode 100644
index 000000000..cde836c89
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/openid_login_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/signPanel_input_bg.gif b/themes/xe_solid_enterprise/modules/message/images/signPanel_input_bg.gif
new file mode 100644
index 000000000..cd97a9dca
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/signPanel_input_bg.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/signin_title.gif b/themes/xe_solid_enterprise/modules/message/images/signin_title.gif
new file mode 100644
index 000000000..535f1f94b
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/signin_title.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/title_bg_left.gif b/themes/xe_solid_enterprise/modules/message/images/title_bg_left.gif
new file mode 100644
index 000000000..c39c2d156
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/title_bg_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/title_bg_repeat.gif b/themes/xe_solid_enterprise/modules/message/images/title_bg_repeat.gif
new file mode 100644
index 000000000..d4b3668ba
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/title_bg_repeat.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/title_bg_right.gif b/themes/xe_solid_enterprise/modules/message/images/title_bg_right.gif
new file mode 100644
index 000000000..365203360
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/title_bg_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/title_item_vr.gif b/themes/xe_solid_enterprise/modules/message/images/title_item_vr.gif
new file mode 100644
index 000000000..ee5485b2c
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/title_item_vr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/title_on_left.gif b/themes/xe_solid_enterprise/modules/message/images/title_on_left.gif
new file mode 100644
index 000000000..e54f5187d
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/title_on_left.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/title_on_right.gif b/themes/xe_solid_enterprise/modules/message/images/title_on_right.gif
new file mode 100644
index 000000000..58c03997f
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/title_on_right.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/images/topbar_vr.gif b/themes/xe_solid_enterprise/modules/message/images/topbar_vr.gif
new file mode 100644
index 000000000..47c3619af
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/images/topbar_vr.gif differ
diff --git a/themes/xe_solid_enterprise/modules/message/message.css b/themes/xe_solid_enterprise/modules/message/message.css
new file mode 100644
index 000000000..cb0e96609
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/message.css
@@ -0,0 +1,30 @@
+@charset "utf-8";
+
+.sys_message							{width:318px;text-align:left;margin:20px auto 2px auto;font-weight:bold;font-size:14px;color:#555;}
+fieldset								{margin:0;padding:0;border:0 none;}
+.signPanel								{width:318px; height:191px; margin:10px auto; background: url(images/login_panel_bg.gif) no-repeat top left;}
+.signPanel .left						{width:192px;height:138px;padding:18px 0 0 23px; _padding-top:28px;_height:128px;float:left;}
+.signPanel .right						{width:100px;height:111px;padding-top:45px;float:right;}
+.signPanel .left .tInBox				{width:185px;height:18px;padding:0 0 0 4px;background:url(images/signPanel_input_bg.gif) no-repeat top left;}
+.signPanel .left .tInBox img			{padding-top:3px;}
+.signPanel .left .tInBox input			{width:160px;padding-left:5px;height:18px;border:0 none;background:none;font-size:12px;}
+.signPanel .left label					{display:block;margin:10px 0 1px 0;font-size: 0.75em;}
+.signPanel .left label input			{margin:0 7px 0 0;padding:0;vertical-align: middle;}
+.signPanel .left .lb_chk				{margin-top:15px;_margin:0;padding:0;}
+.signPanel .bottom_bar					{width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px;}
+.signPanel .bottom_bar a				{dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575;}
+.signPanel .bottom_bar a.vr				{padding-right:10px;border-right:#a8a8a8 solid 1px;}
+
+.oSignPanel .openLeft					{width:192px;height:126px;padding:30px 0 0 12px;float:left;}
+.oSignPanel .openLeft .tInBox			{width:185px;height:18px;padding:0 0 0 4px;margin-top:30px;background:url(images/signPanel_input_bg.gif) no-repeat top left;}
+.oSignPanel .openLeft .tInBox img		{padding-top:3px;}
+.oSignPanel .openLeft .tInBox input		{width:160px;padding-left:5px;height:18px;border:0 none;background:none;}
+.oSignPanel .openLeft label				{display:block;margin:10px 0 3px 0;}
+.oSignPanel .openLeft label input		{margin:0 7px 0 0;padding:0;}
+.oSignPanel .openLeft .lb_chk			{margin-top:10px;_margin:0;padding:0;}
+
+.oSignPanel 							{width:318px; height:191px; margin:10px auto; background: url(images/login_panel_bg.gif) no-repeat top left;}
+.oSignPanel  .right						{width:100px;height:111px;padding-top:45px;float:right;}
+.oSignPanel  .bottom_bar				{width:245px;text-align:center;padding:9px 0 0 73px;float:left;border-top:#e1e1e1 solid 1px;}
+.oSignPanel  .bottom_bar a				{dispaly:block;padding-left:10px;float:left;text-decoration:none;color:#757575;}
+.oSignPanel  .bottom_bar a.vr			{padding-right:10px;border-right:#a8a8a8 solid 1px;}
diff --git a/themes/xe_solid_enterprise/modules/message/message.js b/themes/xe_solid_enterprise/modules/message/message.js
new file mode 100644
index 000000000..8523b8ec3
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/message.js
@@ -0,0 +1,38 @@
+/* 로그인 후 */
+function completeMessageLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeMessageOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+function doLogin(o,filter){
+	jQuery('input.inputText',o).each(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title') == t.val()) t.val('');
+	});
+	procFilter(o,filter);
+	initLoginTitleMsg();
+	return false;
+}
+
+
+function initLoginTitleMsg(){
+	jQuery('.gLogin, .mLogin').find('input.inputText').focus(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.attr('title')==t.val()) t.val('');
+	}).blur(function(){
+		var t = jQuery(this);
+		if(t.attr('title').length>0 && t.val()=='') t.val(t.attr('title'));
+	}).focus().blur();
+}
+
+jQuery(function(){
+	initLoginTitleMsg();
+});
+
+
diff --git a/themes/xe_solid_enterprise/modules/message/skin.xml b/themes/xe_solid_enterprise/modules/message/skin.xml
new file mode 100644
index 000000000..6a7090667
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/skin.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기업 테마 메세지 모듈 스킨n</title>
+    <title xml:lang="en">XE Solid Enterprise Message Skin</title>
+    <title xml:lang="zh-CN">XE标准企业信息皮肤</title>
+
+    <description xml:lang="ko">
+        The XE Solid Enterprise skin for message module.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="en">
+        The XE Solid Enterprise skin for message module.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">
+        XE标准企业信息模块皮肤。
+        NHN (developers@xpressengine.com)
+    </description>
+
+    <version>0.1</version>
+    <date>2011-09-26</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">default</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="zh-CN">默认</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/themes/xe_solid_enterprise/modules/message/system_message.html b/themes/xe_solid_enterprise/modules/message/system_message.html
new file mode 100644
index 000000000..dfd88385f
--- /dev/null
+++ b/themes/xe_solid_enterprise/modules/message/system_message.html
@@ -0,0 +1,64 @@
+<!--%import("message.css")-->
+
+<div id="loginAccess" class="gLogin">
+
+	<h3 class="sys_message">{$system_message}</h3>
+	<!--@if(!$is_logged)-->
+    <!--%import("../../../../common/js/jquery.js")-->
+	<!--%import("./filter/login.xml")-->
+	<!--%import("./filter/openid_login.xml")-->
+	<!--%import("./message.js")-->
+	<div class="mLogin" id="gLogin">
+		<form action="./" method="post" ruleset="@login" id="gForm">
+		<input type="hidden" name="act" value="procMemberLogin" />
+		<fieldset>
+		<div class="signPanel">
+			<div class="left">
+				<label for="">{$lang->user_id}</label>    	
+				<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" id="uid" name="user_id" title="{$lang->user_id}" /></div>
+				<label for="">{$lang->password}</label>
+				<div class="tInBox"><img src="images/bullet_input_pw.gif" width="10" height="12" alt="" /><input type="password" id="upw" name="password" title="{$lang->password}" /></div>
+				<label class="lb_chk"><input type="checkbox" name="keep_signed" id="keepid"  value="Y" onclick="jQuery('#warning')[(jQuery('#keepid:checked').size()>0?'addClass':'removeClass')]('open');" />{$lang->keep_signed}</label>
+			</div><!-- //left -->
+			<div class="right">
+				<input type="image" src="images/btn_signin.gif" width="70px" height="65px"/>
+			</div>
+			<div class="bottom_bar">
+				<a href="{getUrl('','act','dispMemberFindAccount')}" class="vr">{$lang->cmd_find_member_account}</a>
+				<a href="{getUrl('','act','dispMemberSignUpForm')}" >{$lang->cmd_signup}</a>
+				
+				<!--@if($member_config->enable_openid=='Y')-->
+				<a href="#oLogin" onclick="jQuery('#loginAccess').removeClass('gLogin'); jQuery('#loginAccess').addClass('oLogin'); return false;">Open ID</a>
+				<!--@end-->
+			</div>
+		</div><!-- //signPanel -->
+		</fieldset>
+		</form>
+		
+		
+	</div>
+	
+	<!-- OpenID -->
+	<!--@if($member_config->enable_openid=='Y')-->
+	<div class="oSignPanel" id="oLogin">
+		<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return doLogin(this, openid_login)" id="oForm">
+			<fieldset>	
+				<div class="openLeft">
+				<div class="tInBox"><img src="images/bullet_input_id.gif" width="10" height="12" alt="" /><input type="text" name="openid" class="inputText" title="Open ID" value="" /></div>
+				</div>
+				<div class="right">
+					
+				<input type="image" src="images/btn_signin.gif" width="70px" height="65px"/>
+				</div>
+			</fieldset>
+		</form>
+		<div class="help"><a href="#gLogin" onclick="jQuery('#loginAccess').removeClass('oLogin'); jQuery('#loginAccess').addClass('gLogin'); return false;">{$lang->cmd_common_id}</a></div>
+	</div>
+	<!--@end-->
+	<!--@end-->
+	<!--@if($is_logged)-->
+	<div class="logOut">
+		<span class="buttonAccount"><a href="{getUrl('act','dispMemberLogout','module','')}">{$lang->cmd_logout}</a></span>
+	</div>
+	<!--@end-->
+</div>
diff --git a/themes/xe_solid_enterprise/modules/message/thumbnail.png b/themes/xe_solid_enterprise/modules/message/thumbnail.png
new file mode 100644
index 000000000..595cb3b25
Binary files /dev/null and b/themes/xe_solid_enterprise/modules/message/thumbnail.png differ
diff --git a/themes/xe_solid_enterprise/thumbnail.png b/themes/xe_solid_enterprise/thumbnail.png
new file mode 100644
index 000000000..481ee4427
Binary files /dev/null and b/themes/xe_solid_enterprise/thumbnail.png differ
diff --git a/tools/minify/cssmin/cssmin.php b/tools/minify/cssmin/cssmin.php
new file mode 100644
index 000000000..05dc25697
--- /dev/null
+++ b/tools/minify/cssmin/cssmin.php
@@ -0,0 +1,4906 @@
+<?php
+/**
+ * CssMin - A (simple) css minifier with benefits
+ * 
+ * --
+ * Copyright (c) 2011 Joe Scylla <joe.scylla@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * --
+ * 
+ * @package		CssMin
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+/**
+ * Abstract definition of a CSS token class.
+ * 
+ * Every token has to extend this class.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssToken
+	{
+	/**
+	 * Returns the token as string.
+	 * 
+	 * @return string
+	 */
+	abstract public function __toString();
+	}
+
+/**
+ * Abstract definition of a for a ruleset start token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssRulesetStartToken extends aCssToken
+	{
+	
+	}
+
+/**
+ * Abstract definition of a for ruleset end token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssRulesetEndToken extends aCssToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "}";
+		}
+	}
+
+/**
+ * Abstract definition of a parser plugin.
+ * 
+ * Every parser plugin have to extend this class. A parser plugin contains the logic to parse one or aspects of a 
+ * stylesheet.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssParserPlugin
+	{
+	/**
+	 * Plugin configuration.
+	 * 
+	 * @var array
+	 */
+	protected $configuration = array();
+	/**
+	 * The CssParser of the plugin.
+	 * 
+	 * @var CssParser
+	 */
+	protected $parser = null;
+	/**
+	 * Plugin buffer.
+	 * 
+	 * @var string
+	 */
+	protected $buffer = "";
+	/**
+	 * Constructor.
+	 * 
+	 * @param CssParser $parser The CssParser object of this plugin.
+	 * @param array $configuration Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssParser $parser, array $configuration = null)
+		{
+		$this->configuration	= $configuration;
+		$this->parser			= $parser;
+		}
+	/**
+	 * Returns the array of chars triggering the parser plugin.
+	 * 
+	 * @return array
+	 */
+	abstract public function getTriggerChars();
+	/**
+	 * Returns the array of states triggering the parser plugin or FALSE if every state will trigger the parser plugin.
+	 * 
+	 * @return array
+	 */
+	abstract public function getTriggerStates();
+	/**
+	 * Parser routine of the plugin.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	abstract public function parse($index, $char, $previousChar, $state);
+	}
+
+/**
+ * Abstract definition of a minifier plugin class. 
+ * 
+ * Minifier plugin process the parsed tokens one by one to apply changes to the token. Every minifier plugin has to 
+ * extend this class.
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssMinifierPlugin
+	{
+	/**
+	 * Plugin configuration.
+	 * 
+	 * @var array
+	 */
+	protected $configuration = array();
+	/**
+	 * The CssMinifier of the plugin.
+	 * 
+	 * @var CssMinifier
+	 */
+	protected $minifier = null;
+	/**
+	 * Constructor.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @param array $configuration Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier, array $configuration = array())
+		{
+		$this->configuration	= $configuration;
+		$this->minifier			= $minifier;
+		}
+	/**
+	 * Apply the plugin to the token.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	abstract public function apply(aCssToken &$token);
+	/**
+	 * --
+	 * 
+	 * @return array
+	 */
+	abstract public function getTriggerTokens();
+	}
+
+/**
+ * Abstract definition of a minifier filter class. 
+ * 
+ * Minifier filters allows a pre-processing of the parsed token to add, edit or delete tokens. Every minifier filter
+ * has to extend this class.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssMinifierFilter
+	{
+	/**
+	 * Filter configuration.
+	 * 
+	 * @var array
+	 */
+	protected $configuration = array();
+	/**
+	 * The CssMinifier of the filter.
+	 * 
+	 * @var CssMinifier
+	 */
+	protected $minifier = null;
+	/**
+	 * Constructor.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @param array $configuration Filter configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier, array $configuration = array())
+		{
+		$this->configuration	= $configuration;
+		$this->minifier			= $minifier;
+		}
+	/**
+	 * Filter the tokens.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	abstract public function apply(array &$tokens);
+	}
+
+/**
+ * Abstract formatter definition.
+ * 
+ * Every formatter have to extend this class.
+ * 
+ * @package		CssMin/Formatter
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssFormatter
+	{
+	/**
+	 * Indent string.
+	 * 
+	 * @var string
+	 */
+	protected $indent = "    ";
+	/**
+	 * Declaration padding.
+	 * 
+	 * @var integer
+	 */
+	protected $padding = 0;
+	/**
+	 * Tokens.
+	 * 
+	 * @var array
+	 */
+	protected $tokens = array();
+	/**
+	 * Constructor.
+	 * 
+	 * @param array $tokens Array of CssToken
+	 * @param string $indent Indent string [optional]
+	 * @param integer $padding Declaration value padding [optional]
+	 */
+	public function __construct(array $tokens, $indent = null, $padding = null)
+		{
+		$this->tokens	= $tokens;
+		$this->indent	= !is_null($indent) ? $indent : $this->indent;
+		$this->padding	= !is_null($padding) ? $padding : $this->padding;
+		}
+	/**
+	 * Returns the array of aCssToken as formatted string.
+	 * 
+	 * @return string
+	 */
+	abstract public function __toString();
+	}
+
+/**
+ * Abstract definition of a ruleset declaration token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssDeclarationToken extends aCssToken
+	{
+	/**
+	 * Is the declaration flagged as important?
+	 * 
+	 * @var boolean
+	 */
+	public $IsImportant = false;
+	/**
+	 * Is the declaration flagged as last one of the ruleset?
+	 * 
+	 * @var boolean
+	 */
+	public $IsLast = false;
+	/**
+	 * Property name of the declaration.
+	 * 
+	 * @var string
+	 */
+	public $Property = "";
+	/**
+	 * Value of the declaration.
+	 * 
+	 * @var string
+	 */
+	public $Value = "";
+	/**
+	 * Set the properties of the @font-face declaration. 
+	 * 
+	 * @param string $property Property of the declaration
+	 * @param string $value Value of the declaration
+	 * @param boolean $isImportant Is the !important flag is set?
+	 * @param boolean $IsLast Is the declaration the last one of the block?
+	 * @return void
+	 */
+	public function __construct($property, $value, $isImportant = false, $isLast = false)
+		{
+		$this->Property		= $property;
+		$this->Value		= $value;
+		$this->IsImportant	= $isImportant;
+		$this->IsLast		= $isLast;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return $this->Property . ":" . $this->Value . ($this->IsImportant ? " !important" : "") . ($this->IsLast ? "" : ";");
+		}
+	}
+
+/**
+ * Abstract definition of a for at-rule block start token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssAtBlockStartToken extends aCssToken
+	{
+	
+	}
+
+/**
+ * Abstract definition of a for at-rule block end token.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+abstract class aCssAtBlockEndToken extends aCssToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "}";
+		}
+	}
+
+/**
+ * {@link aCssFromatter Formatter} returning the CSS source in {@link http://goo.gl/etzLs Whitesmiths indent style}.
+ * 
+ * @package		CssMin/Formatter
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssWhitesmithsFormatter extends aCssFormatter
+	{
+	/**
+	 * Implements {@link aCssFormatter::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		$r				= array();
+		$level			= 0;
+		for ($i = 0, $l = count($this->tokens); $i < $l; $i++)
+			{
+			$token		= $this->tokens[$i];
+			$class		= get_class($token);
+			$indent 	= str_repeat($this->indent, $level);
+			if ($class === "CssCommentToken")
+				{
+				$lines = array_map("trim", explode("\n", $token->Comment));
+				for ($ii = 0, $ll = count($lines); $ii < $ll; $ii++)
+					{
+					$r[] = $indent . (substr($lines[$ii], 0, 1) == "*" ? " " : "") . $lines[$ii];
+					}
+				}
+			elseif ($class === "CssAtCharsetToken")
+				{
+				$r[] = $indent . "@charset " . $token->Charset . ";";
+				}
+			elseif ($class === "CssAtFontFaceStartToken")
+				{
+				$r[] = $indent . "@font-face";
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtImportToken")
+				{
+				$r[] = $indent . "@import " . $token->Import . " " . implode(", ", $token->MediaTypes) . ";";
+				}
+			elseif ($class === "CssAtKeyframesStartToken")
+				{
+				$r[] = $indent . "@keyframes \"" . $token->Name . "\"";
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtMediaStartToken")
+				{
+				$r[] = $indent . "@media " . implode(", ", $token->MediaTypes);
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtPageStartToken")
+				{
+				$r[] = $indent . "@page";
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssAtVariablesStartToken")
+				{
+				$r[] = $indent . "@variables " . implode(", ", $token->MediaTypes);
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken")
+				{
+				$r[] = $indent . implode(", ", $token->Selectors);
+				$r[] = $this->indent . $indent . "{";
+				$level++;
+				}
+			elseif ($class == "CssAtFontFaceDeclarationToken"
+				|| $class === "CssAtKeyframesRulesetDeclarationToken"
+				|| $class === "CssAtPageDeclarationToken"
+				|| $class == "CssAtVariablesDeclarationToken"
+				|| $class === "CssRulesetDeclarationToken"
+				)
+				{
+				$declaration = $indent . $token->Property . ": ";
+				if ($this->padding)
+					{
+					$declaration = str_pad($declaration, $this->padding, " ", STR_PAD_RIGHT);
+					}
+				$r[] = $declaration . $token->Value . ($token->IsImportant ? " !important" : "") . ";";
+				}
+			elseif ($class === "CssAtFontFaceEndToken"
+				|| $class === "CssAtMediaEndToken"
+				|| $class === "CssAtKeyframesEndToken"
+				|| $class === "CssAtKeyframesRulesetEndToken"
+				|| $class === "CssAtPageEndToken"
+				|| $class === "CssAtVariablesEndToken"
+				|| $class === "CssRulesetEndToken"
+				)
+				{
+				$r[] = $indent . "}";
+				$level--;
+				}
+			}
+		return implode("\n", $r);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will process var-statement and sets the declaration value to the variable value. 
+ * 
+ * This plugin only apply the variable values. The variable values itself will get parsed by the
+ * {@link CssVariablesMinifierFilter}.
+ * 
+ * Example:
+ * <code>
+ * @variables
+ * 		{
+ * 		defaultColor: black;
+ * 		}
+ * color: var(defaultColor);
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:black;
+ * </code>
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssVariablesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching a value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/var\((.+)\)/iSU";
+	/**
+	 * Parsed variables.
+	 * 
+	 * @var array
+	 */
+	private $variables = null;
+	/**
+	 * Returns the variables.
+	 * 
+	 * @return array
+	 */
+	public function getVariables()
+		{
+		return $this->variables;
+		}
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (stripos($token->Value, "var") !== false && preg_match_all($this->reMatch, $token->Value, $m))
+			{
+			$mediaTypes	= $token->MediaTypes;
+			if (!in_array("all", $mediaTypes))
+				{
+				$mediaTypes[] = "all";
+				}
+			for ($i = 0, $l = count($m[0]); $i < $l; $i++)
+				{
+				$variable	= trim($m[1][$i]);
+				foreach ($mediaTypes as $mediaType)
+					{
+					if (isset($this->variables[$mediaType], $this->variables[$mediaType][$variable]))
+						{
+						// Variable value found => set the declaration value to the variable value and return
+						$token->Value = str_replace($m[0][$i], $this->variables[$mediaType][$variable], $token->Value);
+						continue 2;
+						}
+					}
+				// If no value was found trigger an error and replace the token with a CssNullToken
+				trigger_error(new CssError(__METHOD__ . ": No value found for variable <code>" . $variable . "</code> in media types <code>" . implode(", ", $mediaTypes) . "</code>", (string) $token), E_USER_WARNING);
+				$token = new CssNullToken();
+				return true;
+				}
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	/**
+	 * Sets the variables.
+	 * 
+	 * @param array $variables Variables to set
+	 * @return void
+	 */
+	public function setVariables(array $variables)
+		{
+		$this->variables = $variables;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will parse the variable declarations out of @variables at-rule 
+ * blocks. The variables will get store in the {@link CssVariablesMinifierPlugin} that will apply the variables to 
+ * declaration.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssVariablesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$variables			= array();
+		$defaultMediaTypes	= array("all");
+		$mediaTypes			= array();
+		$remove				= array();
+		for($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			// @variables at-rule block found
+			if (get_class($tokens[$i]) === "CssAtVariablesStartToken")
+				{
+				$remove[] = $i;
+				$mediaTypes = (count($tokens[$i]->MediaTypes) == 0 ? $defaultMediaTypes : $tokens[$i]->MediaTypes);
+				foreach ($mediaTypes as $mediaType)
+					{
+					if (!isset($variables[$mediaType]))
+						{
+						$variables[$mediaType] = array();
+						}
+					}
+				// Read the variable declaration tokens
+				for($i = $i; $i < $l; $i++)
+					{
+					// Found a variable declaration => read the variable values
+					if (get_class($tokens[$i]) === "CssAtVariablesDeclarationToken")
+						{
+						foreach ($mediaTypes as $mediaType)
+							{
+							$variables[$mediaType][$tokens[$i]->Property] = $tokens[$i]->Value;
+							}
+						$remove[] = $i;
+						}
+					// Found the variables end token => break;
+					elseif (get_class($tokens[$i]) === "CssAtVariablesEndToken")
+						{
+						$remove[] = $i;
+						break;
+						}
+					}
+				}
+			}
+		// Remove the complete @variables at-rule block
+		foreach ($remove as $i)
+			{
+			$tokens[$i] = null;
+			}
+		if (!($plugin = $this->minifier->getPlugin("CssVariablesMinifierPlugin")))
+			{
+			trigger_error(new CssError(__METHOD__ . ": The plugin <code>CssVariablesMinifierPlugin</code> was not found but is required for <code>" . __CLASS__ . "</code>"), E_USER_WARNING);
+			}
+		else
+			{
+			$plugin->setVariables($variables);
+			}
+		return count($remove);
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for preserve parsing url() values.
+ * 
+ * This plugin return no {@link aCssToken CssToken} but ensures that url() values will get parsed properly.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssUrlParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("(", ")");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of string
+		if ($char === "(" && strtolower(substr($this->parser->getSource(), $index - 3, 4)) === "url(" && $state !== "T_URL")
+			{
+			$this->parser->pushState("T_URL");
+			$this->parser->setExclusive(__CLASS__);
+			}
+		// Escaped LF in url => remove escape backslash and LF
+		elseif ($char === "\n" && $previousChar === "\\" && $state === "T_URL")
+			{
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -2));
+			}
+		// Parse error: Unescaped LF in string literal
+		elseif ($char === "\n" && $previousChar !== "\\" && $state === "T_URL")
+			{
+			$line = $this->parser->getBuffer();
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -1) . ")"); // Replace the LF with the url string delimiter
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			trigger_error(new CssError(__METHOD__ . ": Unterminated string literal", $line . "_"), E_USER_WARNING);
+			}
+		// End of string
+		elseif ($char === ")" && $state === "T_URL")
+			{
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for preserve parsing string values.
+ * 
+ * This plugin return no {@link aCssToken CssToken} but ensures that string values will get parsed properly.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssStringParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Current string delimiter char.
+	 * 
+	 * @var string
+	 */
+	private $delimiterChar = null;
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("\"", "'", "\n");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of string
+		if (($char === "\"" || $char === "'") && $state !== "T_STRING")
+			{
+			$this->delimiterChar = $char;
+			$this->parser->pushState("T_STRING");
+			$this->parser->setExclusive(__CLASS__);
+			}
+		// Escaped LF in string => remove escape backslash and LF
+		elseif ($char === "\n" && $previousChar === "\\" && $state === "T_STRING")
+			{
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -2));
+			}
+		// Parse error: Unescaped LF in string literal
+		elseif ($char === "\n" && $previousChar !== "\\" && $state === "T_STRING")
+			{
+			$line = $this->parser->getBuffer();
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			$this->parser->setBuffer(substr($this->parser->getBuffer(), 0, -1) . $this->delimiterChar); // Replace the LF with the current string char
+			trigger_error(new CssError(__METHOD__ . ": Unterminated string literal", $line . "_"), E_USER_WARNING);
+			$this->delimiterChar = null;
+			}
+		// End of string
+		elseif ($char === $this->delimiterChar && $state === "T_STRING")
+			{
+			// If the Previous char is a escape char count the amount of the previous escape chars. If the amount of 
+			// escape chars is uneven do not end the string
+			if ($previousChar == "\\")
+				{
+				$source	= $this->parser->getSource();
+				$c		= 1;
+				$i		= $index - 2;
+				while (substr($source, $i, 1) === "\\")
+					{
+					$c++; $i--;
+					}
+				if ($c % 2)
+					{
+					return false;
+					}
+				}
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			$this->delimiterChar = null;
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a ruleset.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRulesetStartToken extends aCssRulesetStartToken
+	{
+	/**
+	 * Array of selectors.
+	 * 
+	 * @var array
+	 */
+	public $Selectors = array();
+	/**
+	 * Set the properties of a ruleset token.
+	 * 
+	 * @param array $selectors Selectors of the ruleset 
+	 * @return void
+	 */
+	public function __construct(array $selectors = array())
+		{
+		$this->Selectors = $selectors;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return implode(",", $this->Selectors) . "{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing ruleset block with including declarations.
+ * 
+ * Found rulesets will add a {@link CssRulesetStartToken} and {@link CssRulesetEndToken} to the 
+ * parser; including declarations as {@link CssRulesetDeclarationToken}.
+ *
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRulesetParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array(",", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_MEDIA", "T_RULESET::SELECTORS", "T_RULESET", "T_RULESET_DECLARATION");
+		}
+	/**
+	 * Selectors.
+	 * 
+	 * @var array
+	 */
+	private $selectors = array();
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of Ruleset and selectors
+		if ($char === "," && ($state === "T_DOCUMENT" || $state === "T_AT_MEDIA" || $state === "T_RULESET::SELECTORS"))
+			{
+			if ($state !== "T_RULESET::SELECTORS")
+				{
+				$this->parser->pushState("T_RULESET::SELECTORS");
+				}
+			$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+			}
+		// End of selectors and start of declarations
+		elseif ($char === "{" && ($state === "T_DOCUMENT" || $state === "T_AT_MEDIA" || $state === "T_RULESET::SELECTORS"))
+			{
+			if ($this->parser->getBuffer() !== "")
+				{
+				$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+				if ($state == "T_RULESET::SELECTORS")
+					{
+					$this->parser->popState();
+					}
+				$this->parser->pushState("T_RULESET");
+				$this->parser->appendToken(new CssRulesetStartToken($this->selectors));
+				$this->selectors = array();
+				}
+			}
+		// Start of declaration
+		elseif ($char === ":" && $state === "T_RULESET")
+			{
+			$this->parser->pushState("T_RULESET_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":;", true);
+			}
+		// Unterminated ruleset declaration
+		elseif ($char === ":" && $state === "T_RULESET_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if (preg_match('/[_\*]?filter$/', $this->buffer))
+				{
+				return false;
+				}
+			trigger_error(new CssError(__METHOD__ . ": Unterminated declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"), E_USER_WARNING);
+			}
+		// End of declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_RULESET_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssRulesetDeclarationToken($this->buffer, $value, $this->parser->getMediaTypes(), $isImportant));
+			// Declaration ends with a right curly brace; so we have to end the ruleset
+			if ($char === "}")
+				{
+				$this->parser->appendToken(new CssRulesetEndToken());
+				$this->parser->popState();
+				}
+			$this->buffer = "";
+			}
+		// End of ruleset
+		elseif ($char === "}" && $state === "T_RULESET")
+			{
+			$this->parser->popState();
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssRulesetEndToken());
+			$this->buffer = "";
+			$this->selectors = array();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ *  This {@link aCssToken CSS token} represents the end of a ruleset.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRulesetEndToken extends aCssRulesetEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a ruleset declaration.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRulesetDeclarationToken extends aCssDeclarationToken
+	{
+	/**
+	 * Media types of the declaration.
+	 * 
+	 * @var array
+	 */
+	public $MediaTypes = array("all");
+	/**
+	 * Set the properties of a ddocument- or at-rule @media level declaration. 
+	 * 
+	 * @param string $property Property of the declaration
+	 * @param string $value Value of the declaration
+	 * @param mixed $mediaTypes Media types of the declaration
+	 * @param boolean $isImportant Is the !important flag is set
+	 * @param boolean $isLast Is the declaration the last one of the ruleset
+	 * @return void
+	 */
+	public function __construct($property, $value, $mediaTypes = null, $isImportant = false, $isLast = false)
+		{
+		parent::__construct($property, $value, $isImportant, $isLast);
+		$this->MediaTypes	= $mediaTypes ? $mediaTypes : array("all");
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} sets the IsLast property of any last declaration in a ruleset, 
+ * @font-face at-rule or @page at-rule block. If the property IsLast is TRUE the decrations will get stringified 
+ * without tailing semicolon.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRemoveLastDelarationSemiColonMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			$current	= get_class($tokens[$i]);
+			$next		= isset($tokens[$i+1]) ? get_class($tokens[$i+1]) : false;
+			if (($current === "CssRulesetDeclarationToken" && $next === "CssRulesetEndToken") ||
+				($current === "CssAtFontFaceDeclarationToken" && $next === "CssAtFontFaceEndToken") || 
+				($current === "CssAtPageDeclarationToken" && $next === "CssAtPageEndToken"))
+				{
+				$tokens[$i]->IsLast = true;
+				}
+			}
+		return 0;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will remove any empty rulesets (including @keyframes at-rule block 
+ * rulesets).
+ *
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRemoveEmptyRulesetsMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			$current	= get_class($tokens[$i]);
+			$next		= isset($tokens[$i + 1]) ? get_class($tokens[$i + 1]) : false;
+			if (($current === "CssRulesetStartToken" && $next === "CssRulesetEndToken") ||
+				($current === "CssAtKeyframesRulesetStartToken" && $next === "CssAtKeyframesRulesetEndToken" && !array_intersect(array("from", "0%", "to", "100%"), array_map("strtolower", $tokens[$i]->Selectors)))
+				)
+				{
+				$tokens[$i]		= null;
+				$tokens[$i + 1]	= null;
+				$i++;
+				$r = $r + 2;
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will remove any empty @font-face, @keyframes, @media and @page 
+ * at-rule blocks.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRemoveEmptyAtBlocksMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			$current	= get_class($tokens[$i]);
+			$next		= isset($tokens[$i + 1]) ? get_class($tokens[$i + 1]) : false;
+			if (($current === "CssAtFontFaceStartToken" && $next === "CssAtFontFaceEndToken") ||
+				($current === "CssAtKeyframesStartToken" && $next === "CssAtKeyframesEndToken") ||
+				($current === "CssAtPageStartToken" && $next === "CssAtPageEndToken") ||
+				($current === "CssAtMediaStartToken" && $next === "CssAtMediaEndToken"))
+				{
+				$tokens[$i]		= null;
+				$tokens[$i + 1]	= null;
+				$i++;
+				$r = $r + 2;
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will remove any comments from the array of parsed tokens.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssRemoveCommentsMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssCommentToken")
+				{
+				$tokens[$i] = null;
+				$r++;
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * CSS Parser.
+ * 
+ * @package		CssMin/Parser
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssParser
+	{
+	/**
+	 * Parse buffer.
+	 * 
+	 * @var string
+	 */
+	private $buffer = "";
+	/**
+	 * {@link aCssParserPlugin Plugins}.
+	 * 
+	 * @var array
+	 */
+	private $plugins = array();
+	/**
+	 * Source to parse.
+	 * 
+	 * @var string
+	 */
+	private $source = "";
+	/**
+	 * Current state.
+	 * 
+	 * @var integer
+	 */
+	private $state = "T_DOCUMENT";
+	/**
+	 * Exclusive state.
+	 * 
+	 * @var string
+	 */
+	private $stateExclusive = false;
+	/**
+	 * Media types state.
+	 * 
+	 * @var mixed
+	 */
+	private $stateMediaTypes = false;
+	/**
+	 * State stack.
+	 * 
+	 * @var array
+	 */
+	private $states = array("T_DOCUMENT");
+	/**
+	 * Parsed tokens.
+	 * 
+	 * @var array
+	 */
+	private $tokens = array();
+	/**
+	 * Constructer.
+	 * 
+	 *  Create instances of the used {@link aCssParserPlugin plugins}.
+	 * 
+	 * @param string $source CSS source [optional]
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct($source = null, array $plugins = null)
+		{
+		$plugins = array_merge(array
+			(
+			"Comment"		=> true,
+			"String"		=> true,
+			"Url"			=> true,
+			"Expression"	=> true,
+			"Ruleset"		=> true,
+			"AtCharset"		=> true,
+			"AtFontFace"	=> true,
+			"AtImport"		=> true,
+			"AtKeyframes"	=> true,
+			"AtMedia"		=> true,
+			"AtPage"		=> true,
+			"AtVariables"	=> true
+			), is_array($plugins) ? $plugins : array());
+		// Create plugin instances
+		foreach ($plugins as $name => $config)
+			{
+			if ($config !== false)
+				{
+				$class	= "Css" . $name . "ParserPlugin";
+				$config = is_array($config) ? $config : array();
+				if (class_exists($class))
+					{
+					$this->plugins[] = new $class($this, $config);
+					}
+				else
+					{
+					trigger_error(new CssError(__METHOD__ . ": The plugin <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found"), E_USER_WARNING);
+					}
+				}
+			}
+		if (!is_null($source))
+			{
+			$this->parse($source);
+			}
+		}
+	/**
+	 * Append a token to the array of tokens.
+	 * 
+	 * @param aCssToken $token Token to append
+	 * @return void
+	 */
+	public function appendToken(aCssToken $token)
+		{
+		$this->tokens[] = $token;
+		}
+	/**
+	 * Clears the current buffer.
+	 * 
+	 * @return void
+	 */
+	public function clearBuffer()
+		{
+		$this->buffer = "";
+		}
+	/**
+	 * Returns and clear the current buffer.
+	 * 
+	 * @param string $trim Chars to use to trim the returned buffer
+	 * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
+	 * @return string
+	 */
+	public function getAndClearBuffer($trim = "", $tolower = false)
+		{
+		$r = $this->getBuffer($trim, $tolower);
+		$this->buffer = "";
+		return $r;
+		}
+	/**
+	 * Returns the current buffer.
+	 * 
+	 * @param string $trim Chars to use to trim the returned buffer
+	 * @param boolean $tolower if TRUE the returned buffer will get converted to lower case
+	 * @return string
+	 */
+	public function getBuffer($trim = "", $tolower = false)
+		{
+		$r = $this->buffer;
+		if ($trim)
+			{
+			$r = trim($r, " \t\n\r\0\x0B" . $trim);
+			}
+		if ($tolower)
+			{
+			$r = strtolower($r);
+			}
+		return $r;
+		}
+	/**
+	 * Returns the current media types state.
+	 * 
+	 * @return array
+	 */	
+	public function getMediaTypes()
+		{
+		return $this->stateMediaTypes;
+		}
+	/**
+	 * Returns the CSS source.
+	 * 
+	 * @return string
+	 */
+	public function getSource()
+		{
+		return $this->source;
+		}
+	/**
+	 * Returns the current state.
+	 * 
+	 * @return integer The current state
+	 */
+	public function getState()
+		{
+		return $this->state;
+		}
+	/**
+	 * Returns a plugin by class name.
+	 * 
+	 * @param string $name Class name of the plugin 
+	 * @return aCssParserPlugin
+	 */
+	public function getPlugin($class)
+		{
+		static $index = null;
+		if (is_null($index))
+			{
+			$index = array();
+			for ($i = 0, $l = count($this->plugins); $i < $l; $i++)
+				{
+				$index[get_class($this->plugins[$i])] = $i;
+				}
+			}
+		return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
+		}
+	/**
+	 * Returns the parsed tokens.
+	 * 
+	 * @return array
+	 */
+	public function getTokens()
+		{
+		return $this->tokens;
+		}
+	/**
+	 * Returns if the current state equals the passed state.
+	 * 
+	 * @param integer $state State to compare with the current state
+	 * @return boolean TRUE is the state equals to the passed state; FALSE if not
+	 */
+	public function isState($state)
+		{
+		return ($this->state == $state);
+		}
+	/**
+	 * Parse the CSS source and return a array with parsed tokens.
+	 * 
+	 * @param string $source CSS source
+	 * @return array Array with tokens
+	 */
+	public function parse($source)
+		{
+		// Reset
+		$this->source = "";
+		$this->tokens = array();
+		// Create a global and plugin lookup table for trigger chars; set array of plugins as local variable and create 
+		// several helper variables for plugin handling
+		$globalTriggerChars		= "";
+		$plugins				= $this->plugins;
+		$pluginCount			= count($plugins);
+		$pluginIndex			= array();
+		$pluginTriggerStates	= array();
+		$pluginTriggerChars		= array();
+		for ($i = 0, $l = count($plugins); $i < $l; $i++)
+			{
+			$tPluginClassName				= get_class($plugins[$i]);
+			$pluginTriggerChars[$i]			= implode("", $plugins[$i]->getTriggerChars());
+			$tPluginTriggerStates			= $plugins[$i]->getTriggerStates();
+			$pluginTriggerStates[$i]		= $tPluginTriggerStates === false ? false : "|" . implode("|", $tPluginTriggerStates) . "|";
+			$pluginIndex[$tPluginClassName]	= $i;
+			for ($ii = 0, $ll = strlen($pluginTriggerChars[$i]); $ii < $ll; $ii++)
+				{
+				$c = substr($pluginTriggerChars[$i], $ii, 1);
+				if (strpos($globalTriggerChars, $c) === false)
+					{
+					$globalTriggerChars .= $c;
+					}
+				}
+			}
+		// Normalise line endings
+		$source			= str_replace("\r\n", "\n", $source);	// Windows to Unix line endings
+		$source			= str_replace("\r", "\n", $source);		// Mac to Unix line endings
+		$this->source	= $source;
+		// Variables
+		$buffer			= &$this->buffer;
+		$exclusive		= &$this->stateExclusive;
+		$state			= &$this->state;
+		$c = $p 		= null;
+		// --
+		for ($i = 0, $l = strlen($source); $i < $l; $i++)
+			{
+			// Set the current Char
+			$c = $source[$i]; // Is faster than: $c = substr($source, $i, 1);
+			// Filter double whitespace characters
+			if (($c === " " || $c === "\t" || $c === "\n") && ($p === " " || $p === "\t" || $p === "\n") && $this->stateExclusive === false)
+				{
+				continue;
+				}
+			$buffer .= $c;
+			// Extended processing only if the current char is a global trigger char
+			if (strpos($globalTriggerChars, $c) !== false)
+				{
+				// Exclusive state is set; process with the exclusive plugin 
+				if ($exclusive)
+					{
+					$tPluginIndex = $pluginIndex[$exclusive];
+					if (strpos($pluginTriggerChars[$tPluginIndex], $c) !== false && ($pluginTriggerStates[$tPluginIndex] === false || strpos($pluginTriggerStates[$tPluginIndex], $state) !== false))
+						{
+						$r = $plugins[$tPluginIndex]->parse($i, $c, $p, $state);
+						// Return value is TRUE => continue with next char
+						if ($r === true)
+							{
+							continue;
+							}
+						// Return value is numeric => set new index and continue with next char
+						elseif ($r !== false && $r != $i)
+							{
+							$i = $r;
+							continue;
+							}
+						}
+					}
+				// Else iterate through the plugins
+				else
+					{
+					$triggerState = "|" . $state . "|";
+					for ($ii = 0, $ll = $pluginCount; $ii < $ll; $ii++)
+						{
+						// Only process if the current char is one of the plugin trigger chars
+						if (strpos($pluginTriggerChars[$ii], $c) !== false && ($pluginTriggerStates[$ii] === false || strpos($pluginTriggerStates[$ii], $triggerState) !== false))
+							{
+							// Process with the plugin
+							$r = $plugins[$ii]->parse($i, $c, $p, $state);
+							// Return value is TRUE => break the plugin loop and and continue with next char
+							if ($r === true)
+								{
+								break;
+								}
+							// Return value is numeric => set new index, break the plugin loop and and continue with next char
+							elseif ($r !== false && $r != $i)
+								{
+								$i = $r;
+								break;
+								}
+							}
+						}
+					}
+				}
+			$p = $c; // Set the parent char
+			}
+		return $this->tokens;
+		}
+	/**
+	 * Remove the last state of the state stack and return the removed stack value.
+	 * 
+	 * @return integer Removed state value
+	 */
+	public function popState()
+		{
+		$r = array_pop($this->states);
+		$this->state = $this->states[count($this->states) - 1];
+		return $r;
+		}
+	/**
+	 * Adds a new state onto the state stack.
+	 * 
+	 * @param integer $state State to add onto the state stack.
+	 * @return integer The index of the added state in the state stacks
+	 */
+	public function pushState($state)
+		{
+		$r = array_push($this->states, $state);
+		$this->state = $this->states[count($this->states) - 1];
+		return $r;
+		}
+	/**
+	 * Sets/restores the buffer.
+	 * 
+	 * @param string $buffer Buffer to set
+	 * @return void
+	 */	
+	public function setBuffer($buffer)
+		{
+		$this->buffer = $buffer;
+		}
+	/**
+	 * Set the exclusive state.
+	 * 
+	 * @param string $exclusive Exclusive state
+	 * @return void
+	 */	
+	public function setExclusive($exclusive)
+		{
+		$this->stateExclusive = $exclusive; 
+		}
+	/**
+	 * Set the media types state.
+	 * 
+	 * @param array $mediaTypes Media types state
+	 * @return void
+	 */	
+	public function setMediaTypes(array $mediaTypes)
+		{
+		$this->stateMediaTypes = $mediaTypes; 
+		}
+	/**
+	 * Sets the current state in the state stack; equals to {@link CssParser::popState()} + {@link CssParser::pushState()}.
+	 * 
+	 * @param integer $state State to set
+	 * @return integer
+	 */
+	public function setState($state)
+		{
+		$r = array_pop($this->states);
+		array_push($this->states, $state);
+		$this->state = $this->states[count($this->states) - 1];
+		return $r;
+		}
+	/**
+	 * Removes the exclusive state.
+	 * 
+	 * @return void
+	 */
+	public function unsetExclusive()
+		{
+		$this->stateExclusive = false;
+		}
+	/**
+	 * Removes the media types state.
+	 * 
+	 * @return void
+	 */
+	public function unsetMediaTypes()
+		{
+		$this->stateMediaTypes = false;
+		}
+	}
+
+/**
+ * {@link aCssFromatter Formatter} returning the CSS source in {@link http://goo.gl/j4XdU OTBS indent style} (The One True Brace Style).
+ * 
+ * @package		CssMin/Formatter
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssOtbsFormatter extends aCssFormatter
+	{
+	/**
+	 * Implements {@link aCssFormatter::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		$r				= array();
+		$level			= 0;
+		for ($i = 0, $l = count($this->tokens); $i < $l; $i++)
+			{
+			$token		= $this->tokens[$i];
+			$class		= get_class($token);
+			$indent 	= str_repeat($this->indent, $level);
+			if ($class === "CssCommentToken")
+				{
+				$lines = array_map("trim", explode("\n", $token->Comment));
+				for ($ii = 0, $ll = count($lines); $ii < $ll; $ii++)
+					{
+					$r[] = $indent . (substr($lines[$ii], 0, 1) == "*" ? " " : "") . $lines[$ii];
+					}
+				}
+			elseif ($class === "CssAtCharsetToken")
+				{
+				$r[] = $indent . "@charset " . $token->Charset . ";";
+				}
+			elseif ($class === "CssAtFontFaceStartToken")
+				{
+				$r[] = $indent . "@font-face {";
+				$level++;
+				}
+			elseif ($class === "CssAtImportToken")
+				{
+				$r[] = $indent . "@import " . $token->Import . " " . implode(", ", $token->MediaTypes) . ";";
+				}
+			elseif ($class === "CssAtKeyframesStartToken")
+				{
+				$r[] = $indent . "@keyframes \"" . $token->Name . "\" {";
+				$level++;
+				}
+			elseif ($class === "CssAtMediaStartToken")
+				{
+				$r[] = $indent . "@media " . implode(", ", $token->MediaTypes) . " {";
+				$level++;
+				}
+			elseif ($class === "CssAtPageStartToken")
+				{
+				$r[] = $indent . "@page {";
+				$level++;
+				}
+			elseif ($class === "CssAtVariablesStartToken")
+				{
+				$r[] = $indent . "@variables " . implode(", ", $token->MediaTypes) . " {";
+				$level++;
+				}
+			elseif ($class === "CssRulesetStartToken" || $class === "CssAtKeyframesRulesetStartToken")
+				{
+				$r[] = $indent . implode(", ", $token->Selectors) . " {";
+				$level++;
+				}
+			elseif ($class == "CssAtFontFaceDeclarationToken"
+				|| $class === "CssAtKeyframesRulesetDeclarationToken"
+				|| $class === "CssAtPageDeclarationToken"
+				|| $class == "CssAtVariablesDeclarationToken"
+				|| $class === "CssRulesetDeclarationToken"
+				)
+				{
+				$declaration = $indent . $token->Property . ": ";
+				if ($this->padding)
+					{
+					$declaration = str_pad($declaration, $this->padding, " ", STR_PAD_RIGHT);
+					}
+				$r[] = $declaration . $token->Value . ($token->IsImportant ? " !important" : "") . ";";
+				}
+			elseif ($class === "CssAtFontFaceEndToken"
+				|| $class === "CssAtMediaEndToken"
+				|| $class === "CssAtKeyframesEndToken"
+				|| $class === "CssAtKeyframesRulesetEndToken"
+				|| $class === "CssAtPageEndToken"
+				|| $class === "CssAtVariablesEndToken"
+				|| $class === "CssRulesetEndToken"
+				)
+				{
+				$level--;
+				$r[] = str_repeat($indent, $level) . "}";
+				}
+			}
+		return implode("\n", $r);
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} is a utility token that extends {@link aNullToken} and returns only a empty string.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssNullToken extends aCssToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+ * CSS Minifier.
+ * 
+ * @package		CssMin/Minifier
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssMinifier
+	{
+	/**
+	 * {@link aCssMinifierFilter Filters}.
+	 *  
+	 * @var array
+	 */
+	private $filters = array();
+	/**
+	 * {@link aCssMinifierPlugin Plugins}.
+	 * 
+	 * @var array
+	 */
+	private $plugins = array();
+	/**
+	 * Minified source.
+	 * 
+	 * @var string
+	 */
+	private $minified = "";
+	/**
+	 * Constructer.
+	 * 
+	 * Creates instances of {@link aCssMinifierFilter filters} and {@link aCssMinifierPlugin plugins}.
+	 * 
+	 * @param string $source CSS source [optional]
+	 * @param array $filters Filter configuration [optional]
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct($source = null, array $filters = null, array $plugins = null)
+		{
+		$filters = array_merge(array
+			(
+			"ImportImports"					=> false,
+			"RemoveComments"				=> true, 
+			"RemoveEmptyRulesets"			=> true,
+			"RemoveEmptyAtBlocks"			=> true,
+			"ConvertLevel3Properties"		=> false,
+			"ConvertLevel3AtKeyframes"		=> false,
+			"Variables"						=> true,
+			"RemoveLastDelarationSemiColon"	=> true
+			), is_array($filters) ? $filters : array());
+		$plugins = array_merge(array
+			(
+			"Variables"						=> true,
+			"ConvertFontWeight"				=> false,
+			"ConvertHslColors"				=> false,
+			"ConvertRgbColors"				=> false,
+			"ConvertNamedColors"			=> false,
+			"CompressColorValues"			=> false,
+			"CompressUnitValues"			=> false,
+			"CompressExpressionValues"		=> false
+			), is_array($plugins) ? $plugins : array());
+		// Filters
+		foreach ($filters as $name => $config)
+			{
+			if ($config !== false)
+				{
+				$class	= "Css" . $name . "MinifierFilter";
+				$config = is_array($config) ? $config : array();
+				if (class_exists($class))
+					{
+					$this->filters[] = new $class($this, $config);
+					}
+				else
+					{
+					trigger_error(new CssError(__METHOD__ . ": The filter <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found"), E_USER_WARNING);
+					}
+				}
+			}
+		// Plugins
+		foreach ($plugins as $name => $config)
+			{
+			if ($config !== false)
+				{
+				$class	= "Css" . $name . "MinifierPlugin";
+				$config = is_array($config) ? $config : array();
+				if (class_exists($class))
+					{
+					$this->plugins[] = new $class($this, $config);
+					}
+				else
+					{
+					trigger_error(new CssError(__METHOD__ . ": The plugin <code>" . $name . "</code> with the class name <code>" . $class . "</code> was not found"), E_USER_WARNING);
+					}
+				}
+			}
+		// --
+		if (!is_null($source))
+			{
+			$this->minify($source);
+			}
+		}
+	/**
+	 * Returns the minified Source.
+	 * 
+	 * @return string
+	 */
+	public function getMinified()
+		{
+		return $this->minified;
+		}
+	/**
+	 * Returns a plugin by class name.
+	 * 
+	 * @param string $name Class name of the plugin
+	 * @return aCssMinifierPlugin
+	 */
+	public function getPlugin($class)
+		{
+		static $index = null;
+		if (is_null($index))
+			{
+			$index = array();
+			for ($i = 0, $l = count($this->plugins); $i < $l; $i++)
+				{
+				$index[get_class($this->plugins[$i])] = $i;
+				}
+			}
+		return isset($index[$class]) ? $this->plugins[$index[$class]] : false;
+		}
+	/**
+	 * Minifies the CSS source.
+	 * 
+	 * @param string $source CSS source
+	 * @return string
+	 */
+	public function minify($source)
+		{
+		// Variables
+		$r						= "";
+		$parser					= new CssParser($source);
+		$tokens					= $parser->getTokens();
+		$filters 				= $this->filters;
+		$filterCount			= count($this->filters);
+		$plugins				= $this->plugins;
+		$pluginCount			= count($plugins);
+		$pluginIndex			= array();
+		$pluginTriggerTokens	= array();
+		$globalTriggerTokens	= array();
+		for ($i = 0, $l = count($plugins); $i < $l; $i++)
+			{
+			$tPluginClassName				= get_class($plugins[$i]);
+			$pluginTriggerTokens[$i]		= $plugins[$i]->getTriggerTokens();
+			foreach ($pluginTriggerTokens[$i] as $v)
+				{
+				if (!in_array($v, $globalTriggerTokens))
+					{
+					$globalTriggerTokens[] = $v;
+					}
+				}
+			$pluginTriggerTokens[$i] = "|" . implode("|", $pluginTriggerTokens[$i]) . "|";
+			$pluginIndex[$tPluginClassName]	= $i;
+			}
+		$globalTriggerTokens = "|" . implode("|", $globalTriggerTokens) . "|";
+		/*
+		 * Apply filters
+		 */
+		for($i = 0; $i < $filterCount; $i++)
+			{
+			// Apply the filter; if the return value is larger than 0...
+			if ($filters[$i]->apply($tokens) > 0)
+				{
+				// ...then filter null values and rebuild the token array
+				$tokens = array_values(array_filter($tokens));
+				}
+			}
+		$tokenCount = count($tokens);
+		/*
+		 * Apply plugins
+		 */
+		for($i = 0; $i < $tokenCount; $i++)
+			{
+			$triggerToken = "|" . get_class($tokens[$i]) . "|";
+			if (strpos($globalTriggerTokens, $triggerToken) !== false)
+				{
+				for($ii = 0; $ii < $pluginCount; $ii++)
+					{
+					if (strpos($pluginTriggerTokens[$ii], $triggerToken) !== false || $pluginTriggerTokens[$ii] === false)
+						{
+						// Apply the plugin; if the return value is TRUE continue to the next token
+						if ($plugins[$ii]->apply($tokens[$i]) === true)
+							{
+							continue 2;
+							}
+						}
+					}
+				}
+			}
+		// Stringify the tokens
+		for($i = 0; $i < $tokenCount; $i++)
+			{
+			$r .= (string) $tokens[$i];
+			}
+		$this->minified = $r;
+		return $r;
+		}
+	}
+
+/**
+ * CssMin - A (simple) css minifier with benefits
+ * 
+ * --
+ * Copyright (c) 2011 Joe Scylla <joe.scylla@gmail.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ * --
+ * 
+ * @package		CssMin
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssMin
+	{
+	/**
+	 * Index of classes
+	 * 
+	 * @var array
+	 */
+	private static $classIndex = array();
+	/**
+	 * @link http://goo.gl/JrW54 Autoload} function of CssMin.
+	 * 
+	 * @param string $class Name of the class
+	 * @return void
+	 */
+	public static function autoload($class)
+		{
+		if (isset(self::$classIndex[$class]))
+			{
+			require(self::$classIndex[$class]);
+			}
+		}
+	/**
+	 * Create a build version of CssMin.
+	 * 
+	 * @param string $target Path including file name were the build version should be saved [optional]
+	 * @return string Minifed build version
+	 */
+	public static function build($target = "")
+		{
+		$files		= array();
+		$source		= "";
+		$comment	= "";
+		// Get all source files
+		$paths = array(dirname(__FILE__));
+		while (list($i, $path) = each($paths))
+			{
+			foreach (glob($path . "*", GLOB_MARK | GLOB_ONLYDIR | GLOB_NOSORT) as $subDirectory)
+				{
+				$paths[] = $subDirectory;
+				}
+			foreach (glob($path . "*.php", 0) as $file)
+				{
+				$files[basename($file)] = $file;
+				}
+			}
+		krsort($files);
+		// Read the content of the source files and extract the main comment block
+		foreach ($files as $file)
+			{
+			if (basename($file) == "CssMin.php")
+				{
+				$comment = file_get_contents($file);;
+				preg_match("/\/\*.+\*\//sU", $comment, $m);
+				$comment = $m[0];
+				}
+			$source .= file_get_contents($file);
+			}
+		// Remove php delimiters
+		$source	= str_replace(array("", ""), "", $source);
+		// Add php delimiters and the main comment and save the file
+		$source = "\n" . $comment . $source . "";
+		if ($target && file_put_contents($target, $source) === false)
+			{
+			return false;
+			}
+		return $source;
+		}
+	/**
+	 * Initialises CssMin.
+	 * 
+	 * @return void
+	 */
+	public static function initialise()
+		{
+		// Create the class index for autoloading or including
+		$paths = array(dirname(__FILE__));
+		while (list($i, $path) = each($paths))
+			{
+			foreach (glob($path . "*", GLOB_MARK | GLOB_ONLYDIR | GLOB_NOSORT) as $subDirectory)
+				{
+				$paths[] = $subDirectory;
+				}
+			foreach (glob($path . "*.php", 0) as $file)
+				{
+				$class = substr(basename($file), 0, -4);
+				self::$classIndex[$class] = $file;
+				}
+			}
+		krsort(self::$classIndex);
+		// Only use autoloading if spl_autoload_register() is available and no __autoload() is defined (because 
+		// __autoload() breaks if spl_autoload_register() is used. 
+		if (function_exists("spl_autoload_register") && !is_callable("__autoload"))
+			{
+			spl_autoload_register(array(__CLASS__, "autoload"));
+			}
+		// Otherwise include all class files
+		else
+			{
+			foreach (self::$classIndex as $class => $file)
+				{
+				if (!class_exists($class))
+					{
+					require_once($file);
+					}
+				}
+			}
+		}
+	/**
+	 * Minifies CSS source.
+	 * 
+	 * @param string $source CSS source
+	 * @param array $filters Filter configuration [optional]
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return string Minified CSS
+	 */
+	public static function minify($source, array $filters = null, array $plugins = null)
+		{
+		$minifier = new CssMinifier($source, $filters, $plugins);
+		return $minifier->getMinified();
+		}
+	/**
+	 * Parse the CSS source.
+	 * 
+	 * @param string $source CSS source
+	 * @param array $plugins Plugin configuration [optional]
+	 * @return array Array of aCssToken
+	 */
+	public static function parse($source, array $plugins = null)
+		{
+		$parser = new CssParser($source, $plugins);
+		return $parser->getTokens();
+		}
+	}
+// Initialises CssMin
+CssMin::initialise();
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} import external css files defined with the @import at-rule into the 
+ * current stylesheet. 
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssImportImportsMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Array with already imported external stylesheets.
+	 * 
+	 * @var array
+	 */
+	private $imported = array();
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		if (!isset($this->configuration["BasePath"]) || !is_dir($this->configuration["BasePath"]))
+			{
+			trigger_error(new CssError(__METHOD__ . ": Base path <code>" . ($this->configuration["BasePath"] ? $this->configuration["BasePath"] : "null"). "</code> is not a directory"), E_USER_WARNING);
+			return 0;
+			}
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssAtImportToken")
+				{
+				$import = $this->configuration["BasePath"] . "/" . $tokens[$i]->Import;
+				// Import file was not found/is not a file
+				if (!is_file($import))
+					{
+					trigger_error(new CssError(__METHOD__ . ": Import file <code>" . $import. "</code> was not found.", (string) $tokens[$i]), E_USER_WARNING);
+					}
+				// Import file already imported; remove this @import at-rule to prevent recursions
+				elseif (in_array($import, $this->imported))
+					{
+					trigger_error(new CssError(__METHOD__ . ": Import file <code>" . $import. "</code> was already imported.", (string) $tokens[$i]), E_USER_WARNING);
+					$tokens[$i] = null;
+					}
+				else
+					{
+					$this->imported[] = $import;
+					$parser = new CssParser(file_get_contents($import));
+					$import = $parser->getTokens();
+					// The @import at-rule has media types defined requiring special handling
+					if (count($tokens[$i]->MediaTypes) > 0 && !(count($tokens[$i]->MediaTypes) == 1 && $tokens[$i]->MediaTypes[0] == "all"))
+						{
+						$blocks = array();
+						/*
+						 * Filter or set media types of @import at-rule or remove the @import at-rule if no media type is matching the parent @import at-rule
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtImportToken")
+								{
+								// @import at-rule defines no media type or only the "all" media type; set the media types to the one defined in the parent @import at-rule
+								if (count($import[$ii]->MediaTypes) == 0 || (count($import[$ii]->MediaTypes) == 1 && $import[$ii]->MediaTypes[0] == "all"))
+									{
+									$import[$ii]->MediaTypes = $tokens[$i]->MediaTypes;
+									}
+								// @import at-rule defineds one or more media types; filter out media types not matching with the  parent @import at-rule
+								elseif (count($import[$ii]->MediaTypes > 0))
+									{
+									foreach ($import[$ii]->MediaTypes as $index => $mediaType)
+										{
+										if (!in_array($mediaType, $tokens[$i]->MediaTypes))
+											{
+											unset($import[$ii]->MediaTypes[$index]);
+											}
+										}
+									$import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
+									// If there are no media types left in the @import at-rule remove the @import at-rule
+									if (count($import[$ii]->MediaTypes) == 0)
+										{
+										$import[$ii] = null;
+										}
+									}
+								}
+							}
+						/*
+						 * Remove media types of @media at-rule block not defined in the @import at-rule
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtMediaStartToken")
+								{
+								foreach ($import[$ii]->MediaTypes as $index => $mediaType)
+									{
+									if (!in_array($mediaType, $tokens[$i]->MediaTypes))
+										{
+										unset($import[$ii]->MediaTypes[$index]);
+										}
+									$import[$ii]->MediaTypes = array_values($import[$ii]->MediaTypes);
+									}
+								}
+							}
+						/*
+						 * If no media types left of the @media at-rule block remove the complete block
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtMediaStartToken")
+								{
+								if (count($import[$ii]->MediaTypes) === 0)
+									{
+									for ($iii = $ii; $iii < $ll; $iii++)
+										{
+										if (get_class($import[$iii]) === "CssAtMediaEndToken")
+											{
+											break;
+											}
+										}
+									if (get_class($import[$iii]) === "CssAtMediaEndToken")
+										{
+										array_splice($import, $ii, $iii - $ii + 1, array());
+										$ll = count($import);
+										}
+									}
+								}
+							}
+						/*
+						 * If the media types of the @media at-rule equals the media types defined in the @import 
+						 * at-rule remove the CssAtMediaStartToken and CssAtMediaEndToken token
+						 */ 
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							if (get_class($import[$ii]) === "CssAtMediaStartToken" && count(array_diff($tokens[$i]->MediaTypes, $import[$ii]->MediaTypes)) === 0)
+								{
+								for ($iii = $ii; $iii < $ll; $iii++)
+									{
+									if (get_class($import[$iii]) == "CssAtMediaEndToken")
+										{
+										break;
+										}
+									}
+								if (get_class($import[$iii]) == "CssAtMediaEndToken")
+									{
+									unset($import[$ii]);
+									unset($import[$iii]);
+									$import = array_values($import);
+									$ll = count($import);
+									}
+								}
+							}
+						/**
+						 * Extract CssAtImportToken and CssAtCharsetToken tokens
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							$class = get_class($import[$ii]);
+							if ($class === "CssAtImportToken" || $class === "CssAtCharsetToken")
+								{
+								$blocks = array_merge($blocks, array_splice($import, $ii, 1, array()));
+								$ll = count($import);
+								}
+							}
+						/*
+						 * Extract the @font-face, @media and @page at-rule block
+						 */
+						for($ii = 0, $ll = count($import); $ii < $ll; $ii++)
+							{
+							$class = get_class($import[$ii]);
+							if ($class === "CssAtFontFaceStartToken" || $class === "CssAtMediaStartToken" || $class === "CssAtPageStartToken" || $class === "CssAtVariablesStartToken")
+								{
+								for ($iii = $ii; $iii < $ll; $iii++)
+									{
+									$class = get_class($import[$iii]);
+									if ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken")
+										{
+										break;
+										}
+									}
+								$class = get_class($import[$iii]);
+								if (isset($import[$iii]) && ($class === "CssAtFontFaceEndToken" || $class === "CssAtMediaEndToken" || $class === "CssAtPageEndToken" || $class === "CssAtVariablesEndToken"))
+									{
+									$blocks = array_merge($blocks, array_splice($import, $ii, $iii - $ii + 1, array()));
+									$ll = count($import);
+									}
+								}
+							}
+						// Create the import array with extracted tokens and the rulesets wrapped into a @media at-rule block
+						$import = array_merge($blocks, array(new CssAtMediaStartToken($tokens[$i]->MediaTypes)), $import, array(new CssAtMediaEndToken()));
+						}
+					// Insert the imported tokens
+					array_splice($tokens, $i, 1, $import);
+					// Modify parameters of the for-loop
+					$i--;
+					$l = count($tokens);
+					}
+				}
+			}
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for preserve parsing expression() declaration values.
+ * 
+ * This plugin return no {@link aCssToken CssToken} but ensures that expression() declaration values will get parsed 
+ * properly.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssExpressionParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Count of left braces.
+	 * 
+	 * @var integer
+	 */
+	private $leftBraces = 0;
+	/**
+	 * Count of right braces.
+	 * 
+	 * @var integer
+	 */
+	private $rightBraces = 0;
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("(", ")", ";", "}");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of expression
+		if ($char === "(" && strtolower(substr($this->parser->getSource(), $index - 10, 11)) === "expression(" && $state !== "T_EXPRESSION")
+			{
+			$this->parser->pushState("T_EXPRESSION");
+			$this->leftBraces++;
+			}
+		// Count left braces
+		elseif ($char === "(" && $state === "T_EXPRESSION")
+			{
+			$this->leftBraces++;
+			}
+		// Count right braces
+		elseif ($char === ")" && $state === "T_EXPRESSION")
+			{
+			$this->rightBraces++;
+			}
+		// Possible end of expression; if left and right braces are equal the expressen ends
+		elseif (($char === ";" || $char === "}") && $state === "T_EXPRESSION" && $this->leftBraces === $this->rightBraces)
+			{
+			$this->leftBraces = $this->rightBraces = 0;
+			$this->parser->popState();
+			return $index - 1;
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * CSS Error.
+ * 
+ * @package		CssMin
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssError
+	{
+	/**
+	 * Error message.
+	 * 
+	 * @var string
+	 */
+	public $Message = "";
+	/**
+	 * Source.
+	 * 
+	 * @var string
+	 */
+	public $Source = "";
+	/**
+	 * Constructor triggering the error.
+	 * 
+	 * @param string $message Error message
+	 * @param string $source Corresponding line [optional]
+	 * @return void
+	 */
+	public function __construct($message, $source = "")
+		{
+		$this->Message	= $message;
+		$this->Source	= $source;
+		}
+	/**
+	 * Returns the error as formatted string.
+	 * 
+	 * @return string
+	 */	
+	public function __toString()
+		{
+		return $this->Message . ($this->Source ? ":<p><code>" . $this->Source . "</code></p>": "");
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert a color value in rgb notation to hexadecimal notation.
+ * 
+ * Example:
+ * <code>
+ * color: rgb(200,60%,5);
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#c89905;
+ * </code>
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssConvertRgbColorsMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/rgb\s*\(\s*([0-9%]+)\s*,\s*([0-9%]+)\s*,\s*([0-9%]+)\s*\)/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (stripos($token->Value, "hsl") !== false && preg_match($this->reMatch, $token->Value, $m))
+			{
+			for ($i = 1, $l = count($m); $i < $l; $i++)
+				{
+				if (strpos("%", $m[$i]) !== false)
+					{
+					$m[$i] = substr($m[$i], 0, -1);
+					$m[$i] = (int) (256 * ($m[$i] / 100));
+					}
+				$m[$i] = str_pad(dechex($m[$i]),  2, "0", STR_PAD_LEFT);
+				}
+			$token->Value = str_replace($m[0], "#" . $m[1] . $m[2] . $m[3], $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert named color values to hexadecimal notation.
+ * 
+ * Example:
+ * <code>
+ * color: black;
+ * border: 1px solid indigo;
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#000;
+ * border:1px solid #4b0082;
+ * </code>
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssConvertNamedColorsMinifierPlugin extends aCssMinifierPlugin
+	{
+	
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = null;
+	/**
+	 * Regular expression replacing the value.
+	 * 
+	 * @var string
+	 */
+	private $reReplace = "\"\${1}\" . \$this->transformation[strtolower(\"\${2}\")] . \"\${3}\"";
+	/**
+	 * Transformation table used by the {@link CssConvertNamedColorsMinifierPlugin::$reReplace replace regular expression}.
+	 * 
+	 * @var array
+	 */
+	private $transformation = array
+		( 
+		"aliceblue"						=> "#f0f8ff",
+		"antiquewhite"					=> "#faebd7",
+		"aqua"							=> "#0ff",
+		"aquamarine"					=> "#7fffd4",
+		"azure"							=> "#f0ffff",
+		"beige"							=> "#f5f5dc",
+		"black"							=> "#000",
+		"blue"							=> "#00f",
+		"blueviolet"					=> "#8a2be2",
+		"brown"							=> "#a52a2a",
+		"burlywood"						=> "#deb887",
+		"cadetblue"						=> "#5f9ea0",
+		"chartreuse"					=> "#7fff00",
+		"chocolate"						=> "#d2691e",
+		"coral"							=> "#ff7f50",
+		"cornflowerblue"				=> "#6495ed",
+		"cornsilk"						=> "#fff8dc",
+		"crimson"						=> "#dc143c",
+		"darkblue"						=> "#00008b",
+		"darkcyan"						=> "#008b8b",
+		"darkgoldenrod"					=> "#b8860b",
+		"darkgray"						=> "#a9a9a9",
+		"darkgreen"						=> "#006400",
+		"darkkhaki"						=> "#bdb76b",
+		"darkmagenta"					=> "#8b008b",
+		"darkolivegreen"				=> "#556b2f",
+		"darkorange"					=> "#ff8c00",
+		"darkorchid"					=> "#9932cc",
+		"darkred"						=> "#8b0000",
+		"darksalmon"					=> "#e9967a",
+		"darkseagreen"					=> "#8fbc8f",
+		"darkslateblue"					=> "#483d8b",
+		"darkslategray"					=> "#2f4f4f",
+		"darkturquoise"					=> "#00ced1",
+		"darkviolet"					=> "#9400d3",
+		"deeppink"						=> "#ff1493",
+		"deepskyblue"					=> "#00bfff",
+		"dimgray"						=> "#696969",
+		"dodgerblue"					=> "#1e90ff",
+		"firebrick"						=> "#b22222",
+		"floralwhite"					=> "#fffaf0",
+		"forestgreen"					=> "#228b22",
+		"fuchsia"						=> "#f0f",
+		"gainsboro"						=> "#dcdcdc",
+		"ghostwhite"					=> "#f8f8ff",
+		"gold"							=> "#ffd700",
+		"goldenrod"						=> "#daa520",
+		"gray"							=> "#808080",
+		"green"							=> "#008000",
+		"greenyellow"					=> "#adff2f",
+		"honeydew"						=> "#f0fff0",
+		"hotpink"						=> "#ff69b4",
+		"indianred"						=> "#cd5c5c",
+		"indigo"						=> "#4b0082",
+		"ivory"							=> "#fffff0",
+		"khaki"							=> "#f0e68c",
+		"lavender"						=> "#e6e6fa",
+		"lavenderblush"					=> "#fff0f5",
+		"lawngreen"						=> "#7cfc00",
+		"lemonchiffon"					=> "#fffacd",
+		"lightblue"						=> "#add8e6",
+		"lightcoral"					=> "#f08080",
+		"lightcyan"						=> "#e0ffff",
+		"lightgoldenrodyellow"			=> "#fafad2",
+		"lightgreen"					=> "#90ee90",
+		"lightgrey"						=> "#d3d3d3",
+		"lightpink"						=> "#ffb6c1",
+		"lightsalmon"					=> "#ffa07a",
+		"lightseagreen"					=> "#20b2aa",
+		"lightskyblue"					=> "#87cefa",
+		"lightslategray"				=> "#789",
+		"lightsteelblue"				=> "#b0c4de",
+		"lightyellow"					=> "#ffffe0",
+		"lime"							=> "#0f0",
+		"limegreen"						=> "#32cd32",
+		"linen"							=> "#faf0e6",
+		"maroon"						=> "#800000",
+		"mediumaquamarine"				=> "#66cdaa",
+		"mediumblue"					=> "#0000cd",
+		"mediumorchid"					=> "#ba55d3",
+		"mediumpurple"					=> "#9370db",
+		"mediumseagreen"				=> "#3cb371",
+		"mediumslateblue"				=> "#7b68ee",
+		"mediumspringgreen"				=> "#00fa9a",
+		"mediumturquoise"				=> "#48d1cc",
+		"mediumvioletred"				=> "#c71585",
+		"midnightblue"					=> "#191970",
+		"mintcream"						=> "#f5fffa",
+		"mistyrose"						=> "#ffe4e1",
+		"moccasin"						=> "#ffe4b5",
+		"navajowhite"					=> "#ffdead",
+		"navy"							=> "#000080",
+		"oldlace"						=> "#fdf5e6",
+		"olive"							=> "#808000",
+		"olivedrab"						=> "#6b8e23",
+		"orange"						=> "#ffa500",
+		"orangered"						=> "#ff4500",
+		"orchid"						=> "#da70d6",
+		"palegoldenrod"					=> "#eee8aa",
+		"palegreen"						=> "#98fb98",
+		"paleturquoise"					=> "#afeeee",
+		"palevioletred"					=> "#db7093",
+		"papayawhip"					=> "#ffefd5",
+		"peachpuff"						=> "#ffdab9",
+		"peru"							=> "#cd853f",
+		"pink"							=> "#ffc0cb",
+		"plum"							=> "#dda0dd",
+		"powderblue"					=> "#b0e0e6",
+		"purple"						=> "#800080",
+		"red"							=> "#f00",
+		"rosybrown"						=> "#bc8f8f",
+		"royalblue"						=> "#4169e1",
+		"saddlebrown"					=> "#8b4513",
+		"salmon"						=> "#fa8072",
+		"sandybrown"					=> "#f4a460",
+		"seagreen"						=> "#2e8b57",
+		"seashell"						=> "#fff5ee",
+		"sienna"						=> "#a0522d",
+		"silver"						=> "#c0c0c0",
+		"skyblue"						=> "#87ceeb",
+		"slateblue"						=> "#6a5acd",
+		"slategray"						=> "#708090",
+		"snow"							=> "#fffafa",
+		"springgreen"					=> "#00ff7f",
+		"steelblue"						=> "#4682b4",
+		"tan"							=> "#d2b48c",
+		"teal"							=> "#008080",
+		"thistle"						=> "#d8bfd8",
+		"tomato"						=> "#ff6347",
+		"turquoise"						=> "#40e0d0",
+		"violet"						=> "#ee82ee",
+		"wheat"							=> "#f5deb3",
+		"white"							=> "#fff",
+		"whitesmoke"					=> "#f5f5f5",
+		"yellow"						=> "#ff0",
+		"yellowgreen"					=> "#9acd32"
+		);
+	/**
+	 * Overwrites {@link aCssMinifierPlugin::__construct()}.
+	 * 
+	 * The constructor will create the {@link CssConvertNamedColorsMinifierPlugin::$reReplace replace regular expression}
+	 * based on the {@link CssConvertNamedColorsMinifierPlugin::$transformation transformation table}.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @param array $configuration Plugin configuration [optional]
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier, array $configuration = array())
+		{
+		$this->reMatch = "/(^|\s)+(" . implode("|", array_keys($this->transformation)) . ")(\s|$)+/eiS";
+		parent::__construct($minifier, $configuration);
+		}
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		$lcValue = strtolower($token->Value);
+		// Declaration value equals a value in the transformation table => simple replace
+		if (isset($this->transformation[$lcValue]))
+			{
+			$token->Value = $this->transformation[$lcValue];
+			}
+		// Declaration value contains a value in the transformation table => regular expression replace
+		elseif (preg_match($this->reMatch, $token->Value))
+			{
+			$token->Value = preg_replace($this->reMatch, $this->reReplace, $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} triggers on CSS Level 3 properties and will add declaration tokens
+ * with browser-specific properties.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssConvertLevel3PropertiesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Css property transformations table. Used to convert CSS3 and proprietary properties to the browser-specific 
+	 * counterparts.
+	 * 
+	 * @var array
+	 */
+	private $transformations = array
+		(
+		// Property						Array(Mozilla, Webkit, Opera, Internet Explorer); NULL values are placeholders and will get ignored
+		"animation"						=> array(null, "-webkit-animation", null, null),
+		"animation-delay"				=> array(null, "-webkit-animation-delay", null, null),
+		"animation-direction" 			=> array(null, "-webkit-animation-direction", null, null),
+		"animation-duration"			=> array(null, "-webkit-animation-duration", null, null),
+		"animation-fill-mode"			=> array(null, "-webkit-animation-fill-mode", null, null),
+		"animation-iteration-count"		=> array(null, "-webkit-animation-iteration-count", null, null),
+		"animation-name"				=> array(null, "-webkit-animation-name", null, null),
+		"animation-play-state"			=> array(null, "-webkit-animation-play-state", null, null),
+		"animation-timing-function"		=> array(null, "-webkit-animation-timing-function", null, null),
+		"appearance"					=> array("-moz-appearance", "-webkit-appearance", null, null),
+		"backface-visibility"			=> array(null, "-webkit-backface-visibility", null, null),
+		"background-clip"				=> array(null, "-webkit-background-clip", null, null),
+		"background-composite"			=> array(null, "-webkit-background-composite", null, null),
+		"background-inline-policy"		=> array("-moz-background-inline-policy", null, null, null),
+		"background-origin"				=> array(null, "-webkit-background-origin", null, null),
+		"background-position-x"			=> array(null, null, null, "-ms-background-position-x"),
+		"background-position-y"			=> array(null, null, null, "-ms-background-position-y"),
+		"background-size"				=> array(null, "-webkit-background-size", null, null),
+		"behavior"						=> array(null, null, null, "-ms-behavior"),
+		"binding"						=> array("-moz-binding", null, null, null),
+		"border-after"					=> array(null, "-webkit-border-after", null, null),
+		"border-after-color"			=> array(null, "-webkit-border-after-color", null, null),
+		"border-after-style"			=> array(null, "-webkit-border-after-style", null, null),
+		"border-after-width"			=> array(null, "-webkit-border-after-width", null, null),
+		"border-before"					=> array(null, "-webkit-border-before", null, null),
+		"border-before-color"			=> array(null, "-webkit-border-before-color", null, null),
+		"border-before-style"			=> array(null, "-webkit-border-before-style", null, null),
+		"border-before-width"			=> array(null, "-webkit-border-before-width", null, null),
+		"border-border-bottom-colors"	=> array("-moz-border-bottom-colors", null, null, null),
+		"border-bottom-left-radius"		=> array("-moz-border-radius-bottomleft", "-webkit-border-bottom-left-radius", null, null),
+		"border-bottom-right-radius"	=> array("-moz-border-radius-bottomright", "-webkit-border-bottom-right-radius", null, null),
+		"border-end"					=> array("-moz-border-end", "-webkit-border-end", null, null),
+		"border-end-color"				=> array("-moz-border-end-color", "-webkit-border-end-color", null, null),
+		"border-end-style"				=> array("-moz-border-end-style", "-webkit-border-end-style", null, null),
+		"border-end-width"				=> array("-moz-border-end-width", "-webkit-border-end-width", null, null),
+		"border-fit"					=> array(null, "-webkit-border-fit", null, null),
+		"border-horizontal-spacing"		=> array(null, "-webkit-border-horizontal-spacing", null, null),
+		"border-image"					=> array("-moz-border-image", "-webkit-border-image", null, null),
+		"border-left-colors"			=> array("-moz-border-left-colors", null, null, null),
+		"border-radius"					=> array("-moz-border-radius", "-webkit-border-radius", null, null),
+		"border-border-right-colors"	=> array("-moz-border-right-colors", null, null, null),
+		"border-start"					=> array("-moz-border-start", "-webkit-border-start", null, null),
+		"border-start-color"			=> array("-moz-border-start-color", "-webkit-border-start-color", null, null),
+		"border-start-style"			=> array("-moz-border-start-style", "-webkit-border-start-style", null, null),
+		"border-start-width"			=> array("-moz-border-start-width", "-webkit-border-start-width", null, null),
+		"border-top-colors"				=> array("-moz-border-top-colors", null, null, null),
+		"border-top-left-radius"		=> array("-moz-border-radius-topleft", "-webkit-border-top-left-radius", null, null),
+		"border-top-right-radius"		=> array("-moz-border-radius-topright", "-webkit-border-top-right-radius", null, null),
+		"border-vertical-spacing"		=> array(null, "-webkit-border-vertical-spacing", null, null),
+		"box-align"						=> array("-moz-box-align", "-webkit-box-align", null, null),
+		"box-direction"					=> array("-moz-box-direction", "-webkit-box-direction", null, null),
+		"box-flex"						=> array("-moz-box-flex", "-webkit-box-flex", null, null),
+		"box-flex-group"				=> array(null, "-webkit-box-flex-group", null, null),
+		"box-flex-lines"				=> array(null, "-webkit-box-flex-lines", null, null),
+		"box-ordinal-group"				=> array("-moz-box-ordinal-group", "-webkit-box-ordinal-group", null, null),
+		"box-orient"					=> array("-moz-box-orient", "-webkit-box-orient", null, null),
+		"box-pack"						=> array("-moz-box-pack", "-webkit-box-pack", null, null),
+		"box-reflect"					=> array(null, "-webkit-box-reflect", null, null),
+		"box-shadow"					=> array("-moz-box-shadow", "-webkit-box-shadow", null, null),
+		"box-sizing"					=> array("-moz-box-sizing", null, null, null),
+		"color-correction"				=> array(null, "-webkit-color-correction", null, null),
+		"column-break-after"			=> array(null, "-webkit-column-break-after", null, null),
+		"column-break-before"			=> array(null, "-webkit-column-break-before", null, null),
+		"column-break-inside"			=> array(null, "-webkit-column-break-inside", null, null),
+		"column-count"					=> array("-moz-column-count", "-webkit-column-count", null, null),
+		"column-gap"					=> array("-moz-column-gap", "-webkit-column-gap", null, null),
+		"column-rule"					=> array("-moz-column-rule", "-webkit-column-rule", null, null),
+		"column-rule-color"				=> array("-moz-column-rule-color", "-webkit-column-rule-color", null, null),
+		"column-rule-style"				=> array("-moz-column-rule-style", "-webkit-column-rule-style", null, null),
+		"column-rule-width"				=> array("-moz-column-rule-width", "-webkit-column-rule-width", null, null),
+		"column-span"					=> array(null, "-webkit-column-span", null, null),
+		"column-width"					=> array("-moz-column-width", "-webkit-column-width", null, null),
+		"columns"						=> array(null, "-webkit-columns", null, null),
+		"filter"						=> array(__CLASS__, "filter"),
+		"float-edge"					=> array("-moz-float-edge", null, null, null),
+		"font-feature-settings"			=> array("-moz-font-feature-settings", null, null, null),
+		"font-language-override"		=> array("-moz-font-language-override", null, null, null),
+		"font-size-delta"				=> array(null, "-webkit-font-size-delta", null, null),
+		"font-smoothing"				=> array(null, "-webkit-font-smoothing", null, null),
+		"force-broken-image-icon"		=> array("-moz-force-broken-image-icon", null, null, null),
+		"highlight"						=> array(null, "-webkit-highlight", null, null),
+		"hyphenate-character"			=> array(null, "-webkit-hyphenate-character", null, null),
+		"hyphenate-locale"				=> array(null, "-webkit-hyphenate-locale", null, null),
+		"hyphens"						=> array(null, "-webkit-hyphens", null, null),
+		"force-broken-image-icon"		=> array("-moz-image-region", null, null, null),
+		"ime-mode"						=> array(null, null, null, "-ms-ime-mode"),
+		"interpolation-mode"			=> array(null, null, null, "-ms-interpolation-mode"),
+		"layout-flow"					=> array(null, null, null, "-ms-layout-flow"),
+		"layout-grid"					=> array(null, null, null, "-ms-layout-grid"),
+		"layout-grid-char"				=> array(null, null, null, "-ms-layout-grid-char"),
+		"layout-grid-line"				=> array(null, null, null, "-ms-layout-grid-line"),
+		"layout-grid-mode"				=> array(null, null, null, "-ms-layout-grid-mode"),
+		"layout-grid-type"				=> array(null, null, null, "-ms-layout-grid-type"),
+		"line-break"					=> array(null, "-webkit-line-break", null, "-ms-line-break"),
+		"line-clamp"					=> array(null, "-webkit-line-clamp", null, null),
+		"line-grid-mode"				=> array(null, null, null, "-ms-line-grid-mode"),
+		"logical-height"				=> array(null, "-webkit-logical-height", null, null),
+		"logical-width"					=> array(null, "-webkit-logical-width", null, null),
+		"margin-after"					=> array(null, "-webkit-margin-after", null, null),
+		"margin-after-collapse"			=> array(null, "-webkit-margin-after-collapse", null, null),
+		"margin-before"					=> array(null, "-webkit-margin-before", null, null),
+		"margin-before-collapse"		=> array(null, "-webkit-margin-before-collapse", null, null),
+		"margin-bottom-collapse"		=> array(null, "-webkit-margin-bottom-collapse", null, null),
+		"margin-collapse"				=> array(null, "-webkit-margin-collapse", null, null),
+		"margin-end"					=> array("-moz-margin-end", "-webkit-margin-end", null, null),
+		"margin-start"					=> array("-moz-margin-start", "-webkit-margin-start", null, null),
+		"margin-top-collapse"			=> array(null, "-webkit-margin-top-collapse", null, null),
+		"marquee "						=> array(null, "-webkit-marquee", null, null),
+		"marquee-direction"				=> array(null, "-webkit-marquee-direction", null, null),
+		"marquee-increment"				=> array(null, "-webkit-marquee-increment", null, null),
+		"marquee-repetition"			=> array(null, "-webkit-marquee-repetition", null, null),
+		"marquee-speed"					=> array(null, "-webkit-marquee-speed", null, null),
+		"marquee-style"					=> array(null, "-webkit-marquee-style", null, null),
+		"mask"							=> array(null, "-webkit-mask", null, null),
+		"mask-attachment"				=> array(null, "-webkit-mask-attachment", null, null),
+		"mask-box-image"				=> array(null, "-webkit-mask-box-image", null, null),
+		"mask-clip"						=> array(null, "-webkit-mask-clip", null, null),
+		"mask-composite"				=> array(null, "-webkit-mask-composite", null, null),
+		"mask-image"					=> array(null, "-webkit-mask-image", null, null),
+		"mask-origin"					=> array(null, "-webkit-mask-origin", null, null),
+		"mask-position"					=> array(null, "-webkit-mask-position", null, null),
+		"mask-position-x"				=> array(null, "-webkit-mask-position-x", null, null),
+		"mask-position-y"				=> array(null, "-webkit-mask-position-y", null, null),
+		"mask-repeat"					=> array(null, "-webkit-mask-repeat", null, null),
+		"mask-repeat-x"					=> array(null, "-webkit-mask-repeat-x", null, null),
+		"mask-repeat-y"					=> array(null, "-webkit-mask-repeat-y", null, null),
+		"mask-size"						=> array(null, "-webkit-mask-size", null, null),
+		"match-nearest-mail-blockquote-color" => array(null, "-webkit-match-nearest-mail-blockquote-color", null, null),
+		"max-logical-height"			=> array(null, "-webkit-max-logical-height", null, null),
+		"max-logical-width"				=> array(null, "-webkit-max-logical-width", null, null),
+		"min-logical-height"			=> array(null, "-webkit-min-logical-height", null, null),
+		"min-logical-width"				=> array(null, "-webkit-min-logical-width", null, null),
+		"object-fit"					=> array(null, null, "-o-object-fit", null),
+		"object-position"				=> array(null, null, "-o-object-position", null),
+		"opacity"						=> array(__CLASS__, "opacity"),
+		"outline-radius"				=> array("-moz-outline-radius", null, null, null),
+		"outline-bottom-left-radius"	=> array("-moz-outline-radius-bottomleft", null, null, null),
+		"outline-bottom-right-radius"	=> array("-moz-outline-radius-bottomright", null, null, null),
+		"outline-top-left-radius"		=> array("-moz-outline-radius-topleft", null, null, null),
+		"outline-top-right-radius"		=> array("-moz-outline-radius-topright", null, null, null),
+		"padding-after"					=> array(null, "-webkit-padding-after", null, null),
+		"padding-before"				=> array(null, "-webkit-padding-before", null, null),
+		"padding-end"					=> array("-moz-padding-end", "-webkit-padding-end", null, null),
+		"padding-start"					=> array("-moz-padding-start", "-webkit-padding-start", null, null),
+		"perspective"					=> array(null, "-webkit-perspective", null, null),
+		"perspective-origin"			=> array(null, "-webkit-perspective-origin", null, null),
+		"perspective-origin-x"			=> array(null, "-webkit-perspective-origin-x", null, null),
+		"perspective-origin-y"			=> array(null, "-webkit-perspective-origin-y", null, null),
+		"rtl-ordering"					=> array(null, "-webkit-rtl-ordering", null, null),
+		"scrollbar-3dlight-color"		=> array(null, null, null, "-ms-scrollbar-3dlight-color"),
+		"scrollbar-arrow-color"			=> array(null, null, null, "-ms-scrollbar-arrow-color"),
+		"scrollbar-base-color"			=> array(null, null, null, "-ms-scrollbar-base-color"),
+		"scrollbar-darkshadow-color"	=> array(null, null, null, "-ms-scrollbar-darkshadow-color"),
+		"scrollbar-face-color"			=> array(null, null, null, "-ms-scrollbar-face-color"),
+		"scrollbar-highlight-color"		=> array(null, null, null, "-ms-scrollbar-highlight-color"),
+		"scrollbar-shadow-color"		=> array(null, null, null, "-ms-scrollbar-shadow-color"),
+		"scrollbar-track-color"			=> array(null, null, null, "-ms-scrollbar-track-color"),
+		"stack-sizing"					=> array("-moz-stack-sizing", null, null, null),
+		"svg-shadow"					=> array(null, "-webkit-svg-shadow", null, null),
+		"tab-size"						=> array("-moz-tab-size", null, "-o-tab-size", null),
+		"table-baseline"				=> array(null, null, "-o-table-baseline", null),
+		"text-align-last"				=> array(null, null, null, "-ms-text-align-last"),
+		"text-autospace"				=> array(null, null, null, "-ms-text-autospace"),
+		"text-combine"					=> array(null, "-webkit-text-combine", null, null),
+		"text-decorations-in-effect"	=> array(null, "-webkit-text-decorations-in-effect", null, null),
+		"text-emphasis"					=> array(null, "-webkit-text-emphasis", null, null),
+		"text-emphasis-color"			=> array(null, "-webkit-text-emphasis-color", null, null),
+		"text-emphasis-position"		=> array(null, "-webkit-text-emphasis-position", null, null),
+		"text-emphasis-style"			=> array(null, "-webkit-text-emphasis-style", null, null),
+		"text-fill-color"				=> array(null, "-webkit-text-fill-color", null, null),
+		"text-justify"					=> array(null, null, null, "-ms-text-justify"),
+		"text-kashida-space"			=> array(null, null, null, "-ms-text-kashida-space"),
+		"text-overflow"					=> array(null, null, "-o-text-overflow", "-ms-text-overflow"),
+		"text-security"					=> array(null, "-webkit-text-security", null, null),
+		"text-size-adjust"				=> array(null, "-webkit-text-size-adjust", null, "-ms-text-size-adjust"),
+		"text-stroke"					=> array(null, "-webkit-text-stroke", null, null),
+		"text-stroke-color"				=> array(null, "-webkit-text-stroke-color", null, null),
+		"text-stroke-width"				=> array(null, "-webkit-text-stroke-width", null, null),
+		"text-underline-position"		=> array(null, null, null, "-ms-text-underline-position"),
+		"transform"						=> array("-moz-transform", "-webkit-transform", "-o-transform", null),
+		"transform-origin"				=> array("-moz-transform-origin", "-webkit-transform-origin", "-o-transform-origin", null),
+		"transform-origin-x"			=> array(null, "-webkit-transform-origin-x", null, null),
+		"transform-origin-y"			=> array(null, "-webkit-transform-origin-y", null, null),
+		"transform-origin-z"			=> array(null, "-webkit-transform-origin-z", null, null),
+		"transform-style"				=> array(null, "-webkit-transform-style", null, null),
+		"transition"					=> array("-moz-transition", "-webkit-transition", "-o-transition", null),
+		"transition-delay"				=> array("-moz-transition-delay", "-webkit-transition-delay", "-o-transition-delay", null),
+		"transition-duration"			=> array("-moz-transition-duration", "-webkit-transition-duration", "-o-transition-duration", null),
+		"transition-property"			=> array("-moz-transition-property", "-webkit-transition-property", "-o-transition-property", null),
+		"transition-timing-function"	=> array("-moz-transition-timing-function", "-webkit-transition-timing-function", "-o-transition-timing-function", null),
+		"user-drag"						=> array(null, "-webkit-user-drag", null, null),
+		"user-focus"					=> array("-moz-user-focus", null, null, null),
+		"user-input"					=> array("-moz-user-input", null, null, null),
+		"user-modify"					=> array("-moz-user-modify", "-webkit-user-modify", null, null),
+		"user-select"					=> array("-moz-user-select", "-webkit-user-select", null, null),
+		"white-space"					=> array(__CLASS__, "whiteSpace"),
+		"window-shadow"					=> array("-moz-window-shadow", null, null, null),
+		"word-break"					=> array(null, null, null, "-ms-word-break"),
+		"word-wrap"						=> array(null, null, null, "-ms-word-wrap"),
+		"writing-mode"					=> array(null, "-webkit-writing-mode", null, "-ms-writing-mode"),
+		"zoom"							=> array(null, null, null, "-ms-zoom")
+		);
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		$transformations = &$this->transformations;
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssRulesetDeclarationToken")
+				{
+				$tProperty = $tokens[$i]->Property;
+				if (isset($transformations[$tProperty]))
+					{
+					$result = array();
+					if (is_callable($transformations[$tProperty]))
+						{
+						$result = call_user_func_array($transformations[$tProperty], array($tokens[$i]));
+						if (!is_array($result) && is_object($result))
+							{
+							$result = array($result);
+							}
+						}
+					else
+						{
+						$tValue			= $tokens[$i]->Value;
+						$tMediaTypes	= $tokens[$i]->MediaTypes;
+						foreach ($transformations[$tProperty] as $property)
+							{
+							if ($property !== null)
+								{
+								$result[] = new CssRulesetDeclarationToken($property, $tValue, $tMediaTypes);
+								}
+							}
+						}
+					if (count($result) > 0)
+						{
+						array_splice($tokens, $i + 1, 0, $result);
+						$i += count($result);
+						$l += count($result);
+						}
+					}
+				}
+			}
+		return $r;
+		}
+	/**
+	 * Transforms the Internet Explorer specific declaration property "filter" to Internet Explorer 8+ compatible 
+	 * declaratiopn property "-ms-filter". 
+	 * 
+	 * @param aCssToken $token
+	 * @return array
+	 */
+	private static function filter($token)
+		{
+		$r = array
+			(
+			new CssRulesetDeclarationToken("-ms-filter", "\"" . $token->Value . "\"", $token->MediaTypes),
+			);
+		return $r;
+		}
+	/**
+	 * Transforms "opacity: {value}" into browser specific counterparts.
+	 * 
+	 * @param aCssToken $token
+	 * @return array
+	 */
+	private static function opacity($token)
+		{
+		// Calculate the value for Internet Explorer filter statement
+		$ieValue = (int) ((float) $token->Value * 100);
+		$r = array
+			(
+			// Internet Explorer >= 8
+			new CssRulesetDeclarationToken("-ms-filter", "\"alpha(opacity=" . $ieValue . ")\"", $token->MediaTypes),
+			// Internet Explorer >= 4 <= 7
+			new CssRulesetDeclarationToken("filter", "alpha(opacity=" . $ieValue . ")", $token->MediaTypes),
+			new CssRulesetDeclarationToken("zoom", "1", $token->MediaTypes)
+			);
+		return $r;
+		}
+	/**
+	 * Transforms "white-space: pre-wrap" into browser specific counterparts.
+	 * 
+	 * @param aCssToken $token
+	 * @return array
+	 */
+	private static function whiteSpace($token)
+		{
+		if (strtolower($token->Value) === "pre-wrap")
+			{
+			$r = array
+				(
+				// Firefox < 3
+				new CssRulesetDeclarationToken("white-space", "-moz-pre-wrap", $token->MediaTypes),
+				// Webkit
+				new CssRulesetDeclarationToken("white-space", "-webkit-pre-wrap", $token->MediaTypes),
+				// Opera >= 4 <= 6
+				new CssRulesetDeclarationToken("white-space", "-pre-wrap", $token->MediaTypes),
+				// Opera >= 7
+				new CssRulesetDeclarationToken("white-space", "-o-pre-wrap", $token->MediaTypes),
+				// Internet Explorer >= 5.5
+				new CssRulesetDeclarationToken("word-wrap", "break-word", $token->MediaTypes)
+				);
+			return $r;
+			}
+		else
+			{
+			return array();
+			}
+		}
+	}
+
+/**
+ * This {@link aCssMinifierFilter minifier filter} will convert @keyframes at-rule block to browser specific counterparts.
+ * 
+ * @package		CssMin/Minifier/Filters
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssConvertLevel3AtKeyframesMinifierFilter extends aCssMinifierFilter
+	{
+	/**
+	 * Implements {@link aCssMinifierFilter::filter()}.
+	 * 
+	 * @param array $tokens Array of objects of type aCssToken
+	 * @return integer Count of added, changed or removed tokens; a return value large than 0 will rebuild the array
+	 */
+	public function apply(array &$tokens)
+		{
+		$r = 0;
+		$transformations = array("-webkit-keyframes");
+		for ($i = 0, $l = count($tokens); $i < $l; $i++)
+			{
+			if (get_class($tokens[$i]) === "CssAtKeyframesStartToken")
+				{
+				for ($ii = $i; $ii < $l; $ii++)
+					{
+					if (get_class($tokens[$ii]) === "CssAtKeyframesEndToken")
+						{
+						break;
+						}
+					}
+				if (get_class($tokens[$ii]) === "CssAtKeyframesEndToken")
+					{
+					$add	= array();
+					$source	= array();
+					for ($iii = $i; $iii <= $ii; $iii++)
+						{
+						$source[] = clone($tokens[$iii]);
+						}
+					foreach ($transformations as $transformation)
+						{
+						$t = $source;
+						$t[0]->AtRuleName = $transformation;
+						$add = array_merge($add, $t);
+						}
+					if (isset($this->configuration["RemoveSource"]) && $this->configuration["RemoveSource"] === true)
+						{
+						array_splice($tokens, $i, $ii - $i, $add);
+						}
+					else
+						{
+						array_splice($tokens, $ii + 1, 0, $add);
+						}
+					$l = count($tokens);
+					$i = $ii + count($add);
+					$r += count($add);
+					}
+				}
+			}
+		return $r;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert a color value in hsl notation to hexadecimal notation.
+ * 
+ * Example:
+ * <code>
+ * color: hsl(232,36%,48%);
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#4e5aa7;
+ * </code>
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssConvertHslColorsMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/^hsl\s*\(\s*([0-9]+)\s*,\s*([0-9]+)\s*%\s*,\s*([0-9]+)\s*%\s*\)/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (stripos($token->Value, "hsl") !== false && preg_match($this->reMatch, $token->Value, $m))
+			{
+			$token->Value = str_replace($m[0], $this->hsl2hex($m[1], $m[2], $m[3]), $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	/**
+	 * Convert a HSL value to hexadecimal notation.
+	 * 
+	 * Based on: {@link http://www.easyrgb.com/index.php?X=MATH&H=19#text19}.
+	 * 
+	 * @param integer $hue Hue
+	 * @param integer $saturation Saturation
+	 * @param integer $lightness Lightnesss
+	 * @return string
+	 */
+	private function hsl2hex($hue, $saturation, $lightness)
+		{
+		$hue		= $hue / 360;
+		$saturation	= $saturation / 100;
+		$lightness	= $lightness / 100;
+		if ($saturation == 0)
+			{
+			$red	= $lightness * 255;
+			$green	= $lightness * 255;
+			$blue	= $lightness * 255;
+			}
+		else
+			{
+			if ($lightness < 0.5 )
+				{
+				$v2 = $lightness * (1 + $saturation);
+				}
+			else
+				{
+				$v2 = ($lightness + $saturation) - ($saturation * $lightness);
+				}
+			$v1		= 2 * $lightness - $v2;
+			$red	= 255 * self::hue2rgb($v1, $v2, $hue + (1 / 3));
+			$green	= 255 * self::hue2rgb($v1, $v2, $hue);
+			$blue	= 255 * self::hue2rgb($v1, $v2, $hue - (1 / 3));
+			}
+		return "#" . str_pad(dechex(round($red)), 2, "0", STR_PAD_LEFT) . str_pad(dechex(round($green)), 2, "0", STR_PAD_LEFT) . str_pad(dechex(round($blue)), 2, "0", STR_PAD_LEFT);
+		}
+	/**
+	 * Apply hue to a rgb color value.
+	 * 
+	 * @param integer $v1 Value 1
+	 * @param integer $v2 Value 2
+	 * @param integer $hue Hue
+	 * @return integer
+	 */
+	private function hue2rgb($v1, $v2, $hue)
+		{
+		if ($hue < 0)
+			{
+			$hue += 1;
+			}
+		if ($hue > 1)
+			{
+			$hue -= 1;
+			}
+		if ((6 * $hue) < 1)
+			{
+			return ($v1 + ($v2 - $v1) * 6 * $hue);
+			}
+		if ((2 * $hue) < 1)
+			{
+			return ($v2);
+			}
+		if ((3 * $hue) < 2)
+			{
+			return ($v1 + ($v2 - $v1) * (( 2 / 3) - $hue) * 6);
+			}
+		return $v1;
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert the font-weight values normal and bold to their numeric notation.
+ * 
+ * Example:
+ * <code>
+ * font-weight: normal;
+ * font: bold 11px monospace;
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * font-weight:400;
+ * font:700 11px monospace;
+ * </code>
+ *
+ * @package		CssMin/Minifier/Pluginsn
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssConvertFontWeightMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Array of included declaration properties this plugin will process; others declaration properties will get
+	 * ignored. 
+	 * 
+	 * @var array
+	 */
+	private $include = array
+		(
+		"font",
+		"font-weight"
+		);
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = null;
+	/**
+	 * Regular expression replace the value.
+	 * 
+	 * @var string
+	 */
+	private $reReplace = "\"\${1}\" . \$this->transformation[\"\${2}\"] . \"\${3}\"";
+	/**
+	 * Transformation table used by the {@link CssConvertFontWeightMinifierPlugin::$reReplace replace regular expression}.
+	 * 
+	 * @var array
+	 */
+	private $transformation = array
+		(
+		"normal"	=> "400",
+ 		"bold"		=> "700"
+		);
+	/**
+	 * Overwrites {@link aCssMinifierPlugin::__construct()}.
+	 * 
+	 * The constructor will create the {@link CssConvertFontWeightMinifierPlugin::$reReplace replace regular expression}
+	 * based on the {@link CssConvertFontWeightMinifierPlugin::$transformation transformation table}.
+	 * 
+	 * @param CssMinifier $minifier The CssMinifier object of this plugin.
+	 * @return void
+	 */
+	public function __construct(CssMinifier $minifier)
+		{
+		$this->reMatch = "/(^|\s)+(" . implode("|", array_keys($this->transformation)). ")(\s|$)+/eiS";
+		parent::__construct($minifier);
+		}
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (in_array($token->Property, $this->include) && preg_match($this->reMatch, $token->Value, $m))
+			{
+			$token->Value = preg_replace($this->reMatch, $this->reReplace, $token->Value);
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will compress several unit values to their short notations. Examples:
+ * 
+ * <code>
+ * padding: 0.5em;
+ * border: 0px;
+ * margin: 0 0 0 0;
+ * </code>
+ * 
+ * Will get compressed to:
+ * 
+ * <code>
+ * padding:.5px;
+ * border:0;
+ * margin:0;
+ * </code>
+ * 
+ * --
+ *
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssCompressUnitValuesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression used for matching and replacing unit values.
+	 * 
+	 * @var array
+	 */
+	private $re = array
+		(
+		"/(^| |-)0\.([0-9]+?)(0+)?(%|em|ex|px|in|cm|mm|pt|pc)/iS" => "\${1}.\${2}\${4}",
+		"/(^| )-?(\.?)0(%|em|ex|px|in|cm|mm|pt|pc)/iS" => "\${1}0",
+		"/^(0 0 0 0)|(0 0 0)|(0 0)$/iS" => "0"
+		);
+	/**
+	 * Regular expression matching the value.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/(^| |-)0\.([0-9]+?)(0+)?(%|em|ex|px|in|cm|mm|pt|pc)|(^| )-?(\.?)0(%|em|ex|px|in|cm|mm|pt|pc)|^(0 0 0 0)|(0 0 0)|(0 0)$/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (preg_match($this->reMatch, $token->Value))
+			{
+			foreach ($this->re as $reMatch => $reReplace)
+				{
+				$token->Value = preg_replace($reMatch, $reReplace, $token->Value);
+				}
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} compress the content of expresssion() declaration values.
+ * 
+ * For compression of expressions {@link https://github.com/rgrove/jsmin-php/ JSMin} will get used. JSMin have to be 
+ * already included or loadable via {@link http://goo.gl/JrW54 PHP autoloading}. 
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssCompressExpressionValuesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (class_exists("JSMin") && stripos($token->Value, "expression(") !== false)
+			{
+			$value	= $token->Value;
+			$value	= substr($token->Value, stripos($token->Value, "expression(") + 10);
+			$value	= trim(JSMin::minify($value));
+			$token->Value = "expression(" . $value . ")";
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssMinifierPlugin} will convert hexadecimal color value with 6 chars to their 3 char hexadecimal 
+ * notation (if possible). 
+ * 
+ * Example:
+ * <code>
+ * color: #aabbcc;
+ * </code>
+ * 
+ * Will get converted to:
+ * <code>
+ * color:#abc;
+ * </code>
+ * 
+ * @package		CssMin/Minifier/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssCompressColorValuesMinifierPlugin extends aCssMinifierPlugin
+	{
+	/**
+	 * Regular expression matching 6 char hexadecimal color values.
+	 * 
+	 * @var string
+	 */
+	private $reMatch = "/\#([0-9a-f]{6})/iS";
+	/**
+	 * Implements {@link aCssMinifierPlugin::minify()}.
+	 * 
+	 * @param aCssToken $token Token to process
+	 * @return boolean Return TRUE to break the processing of this token; FALSE to continue
+	 */
+	public function apply(aCssToken &$token)
+		{
+		if (strpos($token->Value, "#") !== false && preg_match($this->reMatch, $token->Value, $m))
+			{
+			$value = strtolower($m[1]);
+			if ($value[0] == $value[1] && $value[2] == $value[3] && $value[4] == $value[5])
+				{
+				$token->Value = str_replace($m[0], "#" . $value[0] . $value[2] . $value[4], $token->Value);
+				}
+			}
+		return false;
+		}
+	/**
+	 * Implements {@link aMinifierPlugin::getTriggerTokens()}
+	 * 
+	 * @return array
+	 */
+	public function getTriggerTokens()
+		{
+		return array
+			(
+			"CssAtFontFaceDeclarationToken",
+			"CssAtPageDeclarationToken",
+			"CssRulesetDeclarationToken"
+			);
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a CSS comment.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssCommentToken extends aCssToken
+	{
+	/**
+	 * Comment as Text.
+	 * 
+	 * @var string
+	 */
+	public $Comment = "";
+	/**
+	 * Set the properties of a comment token.
+	 * 
+	 * @param string $comment Comment including comment delimiters 
+	 * @return void
+	 */
+	public function __construct($comment)
+		{
+		$this->Comment = $comment;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return $this->Comment;
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing comments.
+ * 
+ * Adds a {@link CssCommentToken} to the parser if a comment was found.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssCommentParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("*", "/");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return false;
+		}
+	/**
+	 * Stored buffer for restore.
+	 * 
+	 * @var string
+	 */
+	private $restoreBuffer = "";
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "*" && $previousChar === "/" && $state !== "T_COMMENT")
+			{
+			$this->parser->pushState("T_COMMENT");
+			$this->parser->setExclusive(__CLASS__);
+			$this->restoreBuffer = substr($this->parser->getAndClearBuffer(), 0, -2);
+			}
+		elseif ($char === "/" && $previousChar === "*" && $state === "T_COMMENT")
+			{
+			$this->parser->popState();
+			$this->parser->unsetExclusive();
+			$this->parser->appendToken(new CssCommentToken("/*" . $this->parser->getAndClearBuffer()));
+			$this->parser->setBuffer($this->restoreBuffer);
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @variables at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtVariablesStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Media types of the @variables at-rule block.
+	 * 
+	 * @var array
+	 */
+	public $MediaTypes = array();
+	/**
+	 * Set the properties of a @variables at-rule token.
+	 * 
+	 * @param array $mediaTypes Media types
+	 * @return void
+	 */
+	public function __construct($mediaTypes = null)
+		{
+		$this->MediaTypes = $mediaTypes ? $mediaTypes : array("all");
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @variables at-rule block with including declarations.
+ * 
+ * Found @variables at-rule blocks will add a {@link CssAtVariablesStartToken} and {@link CssAtVariablesEndToken} to the 
+ * parser; including declarations as {@link CssAtVariablesDeclarationToken}.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtVariablesParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_VARIABLES::PREPARE", "T_AT_VARIABLES", "T_AT_VARIABLES_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @variables at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 10)) === "@variables")
+			{
+			$this->parser->pushState("T_AT_VARIABLES::PREPARE");
+			$this->parser->clearBuffer();
+			return $index + 10;
+			}
+		// Start of @variables declarations
+		elseif ($char === "{" && $state === "T_AT_VARIABLES::PREPARE")
+			{
+			$this->parser->setState("T_AT_VARIABLES");
+			$mediaTypes = array_filter(array_map("trim", explode(",", $this->parser->getAndClearBuffer("{"))));
+			$this->parser->appendToken(new CssAtVariablesStartToken($mediaTypes));
+			}
+		// Start of @variables declaration
+		if ($char === ":" && $state === "T_AT_VARIABLES")
+			{
+			$this->buffer = $this->parser->getAndClearBuffer(":");
+			$this->parser->pushState("T_AT_VARIABLES_DECLARATION");
+			}
+		// Unterminated @variables declaration
+		elseif ($char === ":" && $state === "T_AT_VARIABLES_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			trigger_error(new CssError(__METHOD__ . ": Unterminated @variables declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"), E_USER_WARNING);
+			}
+		// End of @variables declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_AT_VARIABLES_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtVariablesDeclarationToken($this->buffer, $value, $isImportant));
+			$this->buffer = "";
+			}
+		// End of @variables at-rule block
+		elseif ($char === "}" && $state === "T_AT_VARIABLES")
+			{
+			$this->parser->popState();
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtVariablesEndToken());
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @variables at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtVariablesEndToken extends aCssAtBlockEndToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a declaration of a @variables at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtVariablesDeclarationToken extends aCssDeclarationToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "";
+		}
+	}
+
+/**
+* This {@link aCssToken CSS token} represents the start of a @page at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtPageStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Selector.
+	 * 
+	 * @var string
+	 */
+	public $Selector = "";
+	/**
+	 * Sets the properties of the @page at-rule.
+	 * 
+	 * @param string $selector Selector
+	 * @return void
+	 */
+	public function __construct($selector = "")
+		{
+		$this->Selector = $selector;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@page" . ($this->Selector ? " " . $this->Selector : "") . "{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @page at-rule block with including declarations.
+ * 
+ * Found @page at-rule blocks will add a {@link CssAtPageStartToken} and {@link CssAtPageEndToken} to the 
+ * parser; including declarations as {@link CssAtPageDeclarationToken}.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtPageParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_PAGE::SELECTOR", "T_AT_PAGE", "T_AT_PAGE_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @page at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 5)) === "@page")
+			{
+			$this->parser->pushState("T_AT_PAGE::SELECTOR");
+			$this->parser->clearBuffer();
+			return $index + 5;
+			}
+		// Start of @page declarations
+		elseif ($char === "{" && $state === "T_AT_PAGE::SELECTOR")
+			{
+			$selector = $this->parser->getAndClearBuffer("{");
+			$this->parser->setState("T_AT_PAGE");
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtPageStartToken($selector));
+			}
+		// Start of @page declaration
+		elseif ($char === ":" && $state === "T_AT_PAGE")
+			{
+			$this->parser->pushState("T_AT_PAGE_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":", true);
+			}
+		// Unterminated @font-face declaration
+		elseif ($char === ":" && $state === "T_AT_PAGE_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			trigger_error(new CssError(__METHOD__ . ": Unterminated @page declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"), E_USER_WARNING);
+			}
+		// End of @page declaration
+		elseif (($char === ";" || $char === "}") && $state == "T_AT_PAGE_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) == "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtPageDeclarationToken($this->buffer, $value, $isImportant));
+			// --
+			if ($char === "}")
+				{
+				$this->parser->popState();
+				$this->parser->appendToken(new CssAtPageEndToken());
+				}
+			$this->buffer = "";
+			}
+		// End of @page at-rule block
+		elseif ($char === "}" && $state === "T_AT_PAGE")
+			{
+			$this->parser->popState();
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtPageEndToken());
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @page at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtPageEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a declaration of a @page at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtPageDeclarationToken extends aCssDeclarationToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @media at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtMediaStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Sets the properties of the @media at-rule.
+	 * 
+	 * @param array $mediaTypes Media types
+	 * @return void
+	 */
+	public function __construct(array $mediaTypes = array())
+		{
+		$this->MediaTypes = $mediaTypes;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@media " . implode(",", $this->MediaTypes) . "{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @media at-rule block.
+ * 
+ * Found @media at-rule blocks will add a {@link CssAtMediaStartToken} and {@link CssAtMediaEndToken} to the parser. 
+ * This plugin will also set the the current media types using {@link CssParser::setMediaTypes()} and
+ * {@link CssParser::unsetMediaTypes()}.
+ *
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtMediaParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_MEDIA::PREPARE", "T_AT_MEDIA");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 6)) === "@media")
+			{
+			$this->parser->pushState("T_AT_MEDIA::PREPARE");
+			$this->parser->clearBuffer();
+			return $index + 6;
+			}
+		elseif ($char === "{" && $state === "T_AT_MEDIA::PREPARE")
+			{
+			$mediaTypes = array_filter(array_map("trim", explode(",", $this->parser->getAndClearBuffer("{"))));
+			$this->parser->setMediaTypes($mediaTypes);
+			$this->parser->setState("T_AT_MEDIA");
+			$this->parser->appendToken(new CssAtMediaStartToken($mediaTypes));
+			}
+		elseif ($char === "}" && $state === "T_AT_MEDIA")
+			{
+			$this->parser->appendToken(new CssAtMediaEndToken());
+			$this->parser->clearBuffer();
+			$this->parser->unsetMediaTypes();
+			$this->parser->popState();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @media at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtMediaEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @keyframes at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtKeyframesStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Name of the at-rule.
+	 * 
+	 * @var string
+	 */
+	public $AtRuleName = "keyframes";
+	/**
+	 * Name
+	 * 
+	 * @var string
+	 */
+	public $Name = "";
+	/**
+	 * Sets the properties of the @page at-rule.
+	 * 
+	 * @param string $selector Selector
+	 * @return void
+	 */
+	public function __construct($name)
+		{
+		$this->Name = $name;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@" . $this->AtRuleName . " \"" . $this->Name . "\"{";
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a ruleset of a @keyframes at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtKeyframesRulesetStartToken extends aCssRulesetStartToken
+	{
+	/**
+	 * Array of selectors.
+	 * 
+	 * @var array
+	 */
+	public $Selectors = array();
+	/**
+	 * Set the properties of a ruleset token.
+	 * 
+	 * @param array $selectors Selectors of the ruleset 
+	 * @return void
+	 */
+	public function __construct(array $selectors = array())
+		{
+		$this->Selectors = $selectors;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return implode(",", $this->Selectors) . "{";
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a ruleset of a @keyframes at-rule block.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtKeyframesRulesetEndToken extends aCssRulesetEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a ruleset declaration of a @keyframes at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtKeyframesRulesetDeclarationToken extends aCssDeclarationToken
+	{
+	
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @keyframes at-rule blocks, rulesets and declarations.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtKeyframesParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Selectors.
+	 * 
+	 * @var array
+	 */
+	private $selectors = array();
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ",", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_KEYFRAMES::NAME", "T_AT_KEYFRAMES", "T_AT_KEYFRAMES_RULESETS", "T_AT_KEYFRAMES_RULESET", "T_AT_KEYFRAMES_RULESET_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @keyframes at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 10)) === "@keyframes")
+			{
+			$this->parser->pushState("T_AT_KEYFRAMES::NAME");
+			$this->parser->clearBuffer();
+			return $index + 10;
+			}
+		// Start of @keyframes rulesets
+		elseif ($char === "{" && $state === "T_AT_KEYFRAMES::NAME")
+			{
+			$name = $this->parser->getAndClearBuffer("{\"'");
+			$this->parser->setState("T_AT_KEYFRAMES_RULESETS");
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtKeyframesStartToken($name));
+			}
+		// Start of @keyframe ruleset and selectors
+		if ($char === "," && $state === "T_AT_KEYFRAMES_RULESETS")
+			{
+			$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+			}
+		// Start of a @keyframes ruleset
+		elseif ($char === "{" && $state === "T_AT_KEYFRAMES_RULESETS")
+			{
+			if ($this->parser->getBuffer() !== "")
+				{
+				$this->selectors[] = $this->parser->getAndClearBuffer(",{");
+				$this->parser->pushState("T_AT_KEYFRAMES_RULESET");
+				$this->parser->appendToken(new CssAtKeyframesRulesetStartToken($this->selectors));
+				$this->selectors = array();
+				}
+			}
+		// Start of @keyframes ruleset declaration
+		elseif ($char === ":" && $state === "T_AT_KEYFRAMES_RULESET")
+			{
+			$this->parser->pushState("T_AT_KEYFRAMES_RULESET_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":;", true);
+			}
+		// Unterminated @keyframes ruleset declaration
+		elseif ($char === ":" && $state === "T_AT_KEYFRAMES_RULESET_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			trigger_error(new CssError(__METHOD__ . ": Unterminated @keyframes ruleset declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"), E_USER_WARNING);
+			}
+		// End of declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_AT_KEYFRAMES_RULESET_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtKeyframesRulesetDeclarationToken($this->buffer, $value, $isImportant));
+			// Declaration ends with a right curly brace; so we have to end the ruleset
+			if ($char === "}")
+				{
+				$this->parser->appendToken(new CssAtKeyframesRulesetEndToken());
+				$this->parser->popState();
+				}
+			$this->buffer = "";
+			}
+		// End of @keyframes ruleset
+		elseif ($char === "}" && $state === "T_AT_KEYFRAMES_RULESET")
+			{
+			$this->parser->clearBuffer();
+			
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtKeyframesRulesetEndToken());
+			}
+		// End of @keyframes rulesets
+		elseif ($char === "}" && $state === "T_AT_KEYFRAMES_RULESETS")
+			{
+			$this->parser->clearBuffer();
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtKeyframesEndToken());
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @keyframes at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtKeyframesEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a @import at-rule.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0.b1 (2001-02-22)
+ */
+class CssAtImportToken extends aCssToken
+	{
+	/**
+	 * Import path of the @import at-rule.
+	 * 
+	 * @var string
+	 */
+	public $Import = "";
+	/**
+	 * Media types of the @import at-rule.
+	 * 
+	 * @var array
+	 */
+	public $MediaTypes = array();
+	/**
+	 * Set the properties of a @import at-rule token.
+	 * 
+	 * @param string $import Import path
+	 * @param array $mediaTypes Media types
+	 * @return void
+	 */
+	public function __construct($import, $mediaTypes)
+		{
+		$this->Import		= $import;
+		$this->MediaTypes	= $mediaTypes ? $mediaTypes : array();
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@import \"" . $this->Import . "\"" . (count($this->MediaTypes) > 0 ? " "  . implode(",", $this->MediaTypes) : ""). ";";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @import at-rule.
+ * 
+ * If a @import at-rule was found this plugin will add a {@link CssAtImportToken} to the parser.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtImportParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", ";", ",", "\n");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_IMPORT");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 7)) === "@import")
+			{
+			$this->parser->pushState("T_AT_IMPORT");
+			$this->parser->clearBuffer();
+			return $index + 7;
+			}
+		elseif (($char === ";" || $char === "\n") && $state === "T_AT_IMPORT")
+			{
+			$this->buffer = $this->parser->getAndClearBuffer(";");
+			$pos = false;
+			foreach (array(")", "\"", "'") as $needle)
+				{
+				if (($pos = strrpos($this->buffer, $needle)) !== false)
+					{
+					break;
+					}
+				}
+			$import = substr($this->buffer, 0, $pos + 1);
+			if (stripos($import, "url(") === 0)
+				{
+				$import = substr($import, 4, -1);
+				}
+			$import = trim($import, " \t\n\r\0\x0B'\"");
+			$mediaTypes = array_filter(array_map("trim", explode(",", trim(substr($this->buffer, $pos + 1), " \t\n\r\0\x0B{"))));
+			if ($pos)
+				{
+				$this->parser->appendToken(new CssAtImportToken($import, $mediaTypes));
+				}
+			else
+				{
+				trigger_error(new CssError(__METHOD__ . ": Invalid @import at-rule syntax", $this->parser->buffer), E_USER_WARNING);
+				}
+			$this->parser->popState();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the start of a @font-face at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtFontFaceStartToken extends aCssAtBlockStartToken
+	{
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@font-face{";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @font-face at-rule block with including declarations.
+ * 
+ * Found @font-face at-rule blocks will add a {@link CssAtFontFaceStartToken} and {@link CssAtFontFaceEndToken} to the 
+ * parser; including declarations as {@link CssAtFontFaceDeclarationToken}.
+ * 
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtFontFaceParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", "{", "}", ":", ";");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_FONT_FACE::PREPARE", "T_AT_FONT_FACE", "T_AT_FONT_FACE_DECLARATION");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		// Start of @font-face at-rule block
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 10)) === "@font-face")
+			{
+			$this->parser->pushState("T_AT_FONT_FACE::PREPARE");
+			$this->parser->clearBuffer();
+			return $index + 10;
+			}
+		// Start of @font-face declarations
+		elseif ($char === "{" && $state === "T_AT_FONT_FACE::PREPARE")
+			{
+			$this->parser->setState("T_AT_FONT_FACE");
+			$this->parser->clearBuffer();
+			$this->parser->appendToken(new CssAtFontFaceStartToken());
+			}
+		// Start of @font-face declaration
+		elseif ($char === ":" && $state === "T_AT_FONT_FACE")
+			{
+			$this->parser->pushState("T_AT_FONT_FACE_DECLARATION");
+			$this->buffer = $this->parser->getAndClearBuffer(":", true);
+			}
+		// Unterminated @font-face declaration
+		elseif ($char === ":" && $state === "T_AT_FONT_FACE_DECLARATION")
+			{
+			// Ignore Internet Explorer filter declarations
+			if ($this->buffer === "filter")
+				{
+				return false;
+				}
+			trigger_error(new CssError(__METHOD__ . ": Unterminated @font-face declaration", $this->buffer . ":" . $this->parser->getBuffer() . "_"), E_USER_WARNING);
+			}
+		// End of @font-face declaration
+		elseif (($char === ";" || $char === "}") && $state === "T_AT_FONT_FACE_DECLARATION")
+			{
+			$value = $this->parser->getAndClearBuffer(";}");
+			if (strtolower(substr($value, -10, 10)) === "!important")
+				{
+				$value = trim(substr($value, 0, -10));
+				$isImportant = true;
+				}
+			else
+				{
+				$isImportant = false;
+				}
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtFontFaceDeclarationToken($this->buffer, $value, $isImportant));
+			$this->buffer = "";
+			// --
+			if ($char === "}")
+				{
+				$this->parser->appendToken(new CssAtFontFaceEndToken());
+				$this->parser->popState();
+				}
+			}
+		// End of @font-face at-rule block
+		elseif ($char === "}" && $state === "T_AT_FONT_FACE")
+			{
+			$this->parser->appendToken(new CssAtFontFaceEndToken());
+			$this->parser->clearBuffer();
+			$this->parser->popState();
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents the end of a @font-face at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtFontFaceEndToken extends aCssAtBlockEndToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a declaration of a @font-face at-rule block.
+ *
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtFontFaceDeclarationToken extends aCssDeclarationToken
+	{
+	
+	}
+
+/**
+ * This {@link aCssToken CSS token} represents a @charset at-rule.
+ * 
+ * @package		CssMin/Tokens
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtCharsetToken extends aCssToken
+	{
+	/**
+	 * Charset of the @charset at-rule.
+	 * 
+	 * @var string
+	 */
+	public $Charset = "";
+	/**
+	 * Set the properties of @charset at-rule token. 
+	 * 
+	 * @param string $charset Charset of the @charset at-rule token
+	 * @return void
+	 */
+	public function __construct($charset)
+		{
+		$this->Charset = $charset;
+		}
+	/**
+	 * Implements {@link aCssToken::__toString()}.
+	 * 
+	 * @return string
+	 */
+	public function __toString()
+		{
+		return "@charset " . $this->Charset . ";";
+		}
+	}
+
+/**
+ * {@link aCssParserPlugin Parser plugin} for parsing @charset at-rule.
+ * 
+ * If a @charset at-rule was found this plugin will add a {@link CssAtCharsetToken} to the parser.
+ *
+ * @package		CssMin/Parser/Plugins
+ * @link		http://code.google.com/p/cssmin/
+ * @author		Joe Scylla <joe.scylla@gmail.com>
+ * @copyright	2008 - 2011 Joe Scylla <joe.scylla@gmail.com>
+ * @license		http://opensource.org/licenses/mit-license.php MIT License
+ * @version		3.0.0
+ */
+class CssAtCharsetParserPlugin extends aCssParserPlugin
+	{
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerChars()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerChars()
+		{
+		return array("@", ";", "\n");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::getTriggerStates()}.
+	 * 
+	 * @return array
+	 */
+	public function getTriggerStates()
+		{
+		return array("T_DOCUMENT", "T_AT_CHARSET");
+		}
+	/**
+	 * Implements {@link aCssParserPlugin::parse()}.
+	 * 
+	 * @param integer $index Current index
+	 * @param string $char Current char
+	 * @param string $previousChar Previous char
+	 * @return mixed TRUE will break the processing; FALSE continue with the next plugin; integer set a new index and break the processing
+	 */
+	public function parse($index, $char, $previousChar, $state)
+		{
+		if ($char === "@" && $state === "T_DOCUMENT" && strtolower(substr($this->parser->getSource(), $index, 8)) === "@charset")
+			{
+			$this->parser->pushState("T_AT_CHARSET");
+			$this->parser->clearBuffer();
+			return $index + 8;
+			}
+		elseif (($char === ";" || $char === "\n") && $state === "T_AT_CHARSET")
+			{
+			$charset = $this->parser->getAndClearBuffer(";");
+			$this->parser->popState();
+			$this->parser->appendToken(new CssAtCharsetToken($charset));
+			}
+		else
+			{
+			return false;
+			}
+		return true;
+		}
+	}
+?>
diff --git a/tools/minify/jsminplus/changelog.txt b/tools/minify/jsminplus/changelog.txt
new file mode 100644
index 000000000..3e76d9770
--- /dev/null
+++ b/tools/minify/jsminplus/changelog.txt
@@ -0,0 +1,62 @@
+================================================================================
+JSMin+
+================================================================================
+A javascript minification tool written in PHP
+by Tweakers.net / Tino Zijdel <crisp@tweakers.net>
+
+Weblog: http://crisp.tweakblogs.net/blog/cat/716
+
+License: MPL 1.1/GPL 2.0/LGPL 2.1 (see sourcecode)
+
+================================================================================
+VERSION HISTORY
+================================================================================
+17-05-2009 - version 1.3
+
+- Fixed loop-constructs and if with empty body
+- Fixed hook:colon precedence issues (https://bugzilla.mozilla.org/show_bug.cgi?id=492445)
+- Combine concats of strings with same quotestyle
+- Combine var-statements
+
+--------------------------------------------------------------------------------
+18-04-2009 - version 1.2
+
+- Fixed crash in PHP 5.2.9 when matching large comments or strings
+  (due to PCRE backtracking bug)
+- Don't add curly braces around statements for a CASE label
+- Always put statements for IF between curly braces when followed by an ELSE
+- Save some more bytes by omitting the space between RETURN and the return
+  expression in certain cases
+
+--------------------------------------------------------------------------------
+12-04-2009 - version 1.1
+
+- Improved tokenizer performance by reading smaller chunks for matching
+- Bugfix: jumplabels for break/continue statements were not written to output
+- Improved stringmatching: cases like '\' and '<newline>' now throw unterminated
+  string literal error
+- Fixed linenumber offset bug caused by JScript conditional compilation blocks
+- nest() always calls Statement() so no need to use call_user_func() with a parm
+
+--------------------------------------------------------------------------------
+09-04-2009 - version 1.0
+
+Initial version
+
+================================================================================
+KNOWN ISSUES
+================================================================================
+
+- JScript conditional compilation support is incomplete
+
+================================================================================
+DOWNLOAD LOCATION
+================================================================================
+
+Latest version:
+version 1.3 : http://files.tweakers.net/jsminplus/jsminplus.zip
+
+Previous versions:
+version 1.2 : http://files.tweakers.net/jsminplus/jsminplus-1.2.zip
+version 1.1 : http://files.tweakers.net/jsminplus/jsminplus-1.1.zip
+version 1.0 : http://files.tweakers.net/jsminplus/jsminplus-1.0.zip
diff --git a/tools/minify/jsminplus/jsminplus.php b/tools/minify/jsminplus/jsminplus.php
new file mode 100644
index 000000000..4afa43adc
--- /dev/null
+++ b/tools/minify/jsminplus/jsminplus.php
@@ -0,0 +1,1980 @@
+<?php
+
+/**
+ * JSMinPlus version 1.3
+ *
+ * Minifies a javascript file using a javascript parser
+ *
+ * This implements a PHP port of Brendan Eich's Narcissus open source javascript engine (in javascript)
+ * References: http://en.wikipedia.org/wiki/Narcissus_(JavaScript_engine)
+ * Narcissus sourcecode: http://mxr.mozilla.org/mozilla/source/js/narcissus/
+ * JSMinPlus weblog: http://crisp.tweakblogs.net/blog/cat/716
+ *
+ * Tino Zijdel <crisp@tweakers.net>
+ *
+ * Usage: $minified = JSMinPlus::minify($script [, $filename])
+ *
+ * Versionlog (see also changelog.txt):
+ * 17-05-2009 - fixed hook:colon precedence, fixed empty body in loop and if-constructs
+ * 18-04-2009 - fixed crashbug in PHP 5.2.9 and several other bugfixes
+ * 12-04-2009 - some small bugfixes and performance improvements
+ * 09-04-2009 - initial open sourced version 1.0
+ *
+ * Latest version of this script: http://files.tweakers.net/jsminplus/jsminplus.zip
+ *
+ */
+
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Narcissus JavaScript engine.
+ *
+ * The Initial Developer of the Original Code is
+ * Brendan Eich <brendan@mozilla.org>.
+ * Portions created by the Initial Developer are Copyright (C) 2004
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s): Tino Zijdel <crisp@tweakers.net>
+ * PHP port, modifications and minifier routine are (C) 2009
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+define('TOKEN_END', 1);
+define('TOKEN_NUMBER', 2);
+define('TOKEN_IDENTIFIER', 3);
+define('TOKEN_STRING', 4);
+define('TOKEN_REGEXP', 5);
+define('TOKEN_NEWLINE', 6);
+define('TOKEN_CONDCOMMENT_START', 7);
+define('TOKEN_CONDCOMMENT_END', 8);
+
+define('JS_SCRIPT', 100);
+define('JS_BLOCK', 101);
+define('JS_LABEL', 102);
+define('JS_FOR_IN', 103);
+define('JS_CALL', 104);
+define('JS_NEW_WITH_ARGS', 105);
+define('JS_INDEX', 106);
+define('JS_ARRAY_INIT', 107);
+define('JS_OBJECT_INIT', 108);
+define('JS_PROPERTY_INIT', 109);
+define('JS_GETTER', 110);
+define('JS_SETTER', 111);
+define('JS_GROUP', 112);
+define('JS_LIST', 113);
+
+define('DECLARED_FORM', 0);
+define('EXPRESSED_FORM', 1);
+define('STATEMENT_FORM', 2);
+
+class JSMinPlus
+{
+	private $parser;
+	private $reserved = array(
+		'break', 'case', 'catch', 'continue', 'default', 'delete', 'do',
+		'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof',
+		'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var',
+		'void', 'while', 'with',
+		// Words reserved for future use
+		'abstract', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
+		'double', 'enum', 'export', 'extends', 'final', 'float', 'goto',
+		'implements', 'import', 'int', 'interface', 'long', 'native',
+		'package', 'private', 'protected', 'public', 'short', 'static',
+		'super', 'synchronized', 'throws', 'transient', 'volatile',
+		// These are not reserved, but should be taken into account
+		// in isValidIdentifier (See jslint source code)
+		'arguments', 'eval', 'true', 'false', 'Infinity', 'NaN', 'null', 'undefined'
+	);
+
+	private function __construct()
+	{
+		$this->parser = new JSParser();
+	}
+
+	public static function minify($js, $filename='')
+	{
+		static $instance;
+
+		// this is a singleton
+		if(!$instance)
+			$instance = new JSMinPlus();
+
+		return $instance->min($js, $filename);
+	}
+
+	private function min($js, $filename)
+	{
+		try
+		{
+			$n = $this->parser->parse($js, $filename, 1);
+			return $this->parseTree($n);
+		}
+		catch(Exception $e)
+		{
+			echo $e->getMessage() . "\n";
+		}
+
+		return false;
+	}
+
+	private function parseTree($n, $noBlockGrouping = false)
+	{
+		$s = '';
+
+		switch ($n->type)
+		{
+			case KEYWORD_FUNCTION:
+				$s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
+				$params = $n->params;
+				for ($i = 0, $j = count($params); $i < $j; $i++)
+					$s .= ($i ? ',' : '') . $params[$i];
+				$s .= '){' . $this->parseTree($n->body, true) . '}';
+			break;
+
+			case JS_SCRIPT:
+				// we do nothing with funDecls or varDecls
+				$noBlockGrouping = true;
+			// FALL THROUGH
+
+			case JS_BLOCK:
+				$childs = $n->treeNodes;
+				$lastType = 0;
+				for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++)
+				{
+					$type = $childs[$i]->type;
+					$t = $this->parseTree($childs[$i]);
+					if (strlen($t))
+					{
+						if ($c)
+						{
+							$s = rtrim($s, ';');
+
+							if ($type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM)
+							{
+								// put declared functions on a new line
+								$s .= "\n";
+							}
+							elseif ($type == KEYWORD_VAR && $type == $lastType)
+							{
+								// mutiple var-statements can go into one
+								$t = ',' . substr($t, 4);
+							}
+							else
+							{
+								// add terminator
+								$s .= ';';
+							}
+						}
+
+						$s .= $t;
+
+						$c++;
+						$lastType = $type;
+					}
+				}
+
+				if ($c > 1 && !$noBlockGrouping)
+				{
+					$s = '{' . $s . '}';
+				}
+			break;
+
+			case KEYWORD_IF:
+				$s = 'if(' . $this->parseTree($n->condition) . ')';
+				$thenPart = $this->parseTree($n->thenPart);
+				$elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
+
+				// empty if-statement
+				if ($thenPart == '')
+					$thenPart = ';';
+
+				if ($elsePart)
+				{
+					// be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
+					if ($thenPart != ';' && $thenPart[0] != '{')
+						$thenPart = '{' . $thenPart . '}';
+
+					$s .= $thenPart . 'else';
+
+					// we could check for more, but that hardly ever applies so go for performance
+					if ($elsePart[0] != '{')
+						$s .= ' ';
+
+					$s .= $elsePart;
+				}
+				else
+				{
+					$s .= $thenPart;
+				}
+			break;
+
+			case KEYWORD_SWITCH:
+				$s = 'switch(' . $this->parseTree($n->discriminant) . '){';
+				$cases = $n->cases;
+				for ($i = 0, $j = count($cases); $i < $j; $i++)
+				{
+					$case = $cases[$i];
+					if ($case->type == KEYWORD_CASE)
+						$s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
+					else
+						$s .= 'default:';
+
+					$statement = $this->parseTree($case->statements, true);
+					if ($statement)
+					{
+						$s .= $statement;
+						// no terminator for last statement
+						if ($i + 1 < $j)
+							$s .= ';';
+					}
+				}
+				$s .= '}';
+			break;
+
+			case KEYWORD_FOR:
+				$s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
+					. ';' . ($n->condition ? $this->parseTree($n->condition) : '')
+					. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
+
+				$body  = $this->parseTree($n->body);
+				if ($body == '')
+					$body = ';';
+
+				$s .= $body;
+			break;
+
+			case KEYWORD_WHILE:
+				$s = 'while(' . $this->parseTree($n->condition) . ')';
+
+				$body  = $this->parseTree($n->body);
+				if ($body == '')
+					$body = ';';
+
+				$s .= $body;
+			break;
+
+			case JS_FOR_IN:
+				$s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
+
+				$body  = $this->parseTree($n->body);
+				if ($body == '')
+					$body = ';';
+
+				$s .= $body;
+			break;
+
+			case KEYWORD_DO:
+				$s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
+			break;
+
+			case KEYWORD_BREAK:
+			case KEYWORD_CONTINUE:
+				$s = $n->value . ($n->label ? ' ' . $n->label : '');
+			break;
+
+			case KEYWORD_TRY:
+				$s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
+				$catchClauses = $n->catchClauses;
+				for ($i = 0, $j = count($catchClauses); $i < $j; $i++)
+				{
+					$t = $catchClauses[$i];
+					$s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
+				}
+				if ($n->finallyBlock)
+					$s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+			break;
+
+			case KEYWORD_THROW:
+				$s = 'throw ' . $this->parseTree($n->exception);
+			break;
+
+			case KEYWORD_RETURN:
+				$s = 'return';
+				if ($n->value)
+				{
+					$t = $this->parseTree($n->value);
+					if (strlen($t))
+					{
+						if (	$t[0] != '(' && $t[0] != '[' && $t[0] != '{' &&
+							$t[0] != '"' && $t[0] != "'" && $t[0] != '/'
+						)
+							$s .= ' ';
+
+						$s .= $t;
+					}
+				}
+			break;
+
+			case KEYWORD_WITH:
+				$s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
+			break;
+
+			case KEYWORD_VAR:
+			case KEYWORD_CONST:
+				$s = $n->value . ' ';
+				$childs = $n->treeNodes;
+				for ($i = 0, $j = count($childs); $i < $j; $i++)
+				{
+					$t = $childs[$i];
+					$s .= ($i ? ',' : '') . $t->name;
+					$u = $t->initializer;
+					if ($u)
+						$s .= '=' . $this->parseTree($u);
+				}
+			break;
+
+			case KEYWORD_DEBUGGER:
+				throw new Exception('NOT IMPLEMENTED: DEBUGGER');
+			break;
+
+			case TOKEN_CONDCOMMENT_START:
+			case TOKEN_CONDCOMMENT_END:
+				$s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
+				$childs = $n->treeNodes;
+				for ($i = 0, $j = count($childs); $i < $j; $i++)
+					$s .= $this->parseTree($childs[$i]);
+			break;
+
+			case OP_SEMICOLON:
+				if ($expression = $n->expression)
+					$s = $this->parseTree($expression);
+			break;
+
+			case JS_LABEL:
+				$s = $n->label . ':' . $this->parseTree($n->statement);
+			break;
+
+			case OP_COMMA:
+				$childs = $n->treeNodes;
+				for ($i = 0, $j = count($childs); $i < $j; $i++)
+					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+			break;
+
+			case OP_ASSIGN:
+				$s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
+			break;
+
+			case OP_HOOK:
+				$s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
+			break;
+
+			case OP_OR: case OP_AND:
+			case OP_BITWISE_OR: case OP_BITWISE_XOR: case OP_BITWISE_AND:
+			case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
+			case OP_LT: case OP_LE: case OP_GE: case OP_GT:
+			case OP_LSH: case OP_RSH: case OP_URSH:
+			case OP_MUL: case OP_DIV: case OP_MOD:
+				$s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
+			break;
+
+			case OP_PLUS:
+			case OP_MINUS:
+				$left = $this->parseTree($n->treeNodes[0]);
+				$right = $this->parseTree($n->treeNodes[1]);
+
+				switch ($n->treeNodes[1]->type)
+				{
+					case OP_PLUS:
+					case OP_MINUS:
+					case OP_INCREMENT:
+					case OP_DECREMENT:
+					case OP_UNARY_PLUS:
+					case OP_UNARY_MINUS:
+						$s = $left . $n->type . ' ' . $right;
+					break;
+
+					case TOKEN_STRING:
+						//combine concatted strings with same quotestyle
+						if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
+						{
+							$s = substr($left, 0, -1) . substr($right, 1);
+							break;
+						}
+					// FALL THROUGH
+
+					default:
+						$s = $left . $n->type . $right;
+				}
+			break;
+
+			case KEYWORD_IN:
+				$s = $this->parseTree($n->treeNodes[0]) . ' in ' . $this->parseTree($n->treeNodes[1]);
+			break;
+
+			case KEYWORD_INSTANCEOF:
+				$s = $this->parseTree($n->treeNodes[0]) . ' instanceof ' . $this->parseTree($n->treeNodes[1]);
+			break;
+
+			case KEYWORD_DELETE:
+				$s = 'delete ' . $this->parseTree($n->treeNodes[0]);
+			break;
+
+			case KEYWORD_VOID:
+				$s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
+			break;
+
+			case KEYWORD_TYPEOF:
+				$s = 'typeof ' . $this->parseTree($n->treeNodes[0]);
+			break;
+
+			case OP_NOT:
+			case OP_BITWISE_NOT:
+			case OP_UNARY_PLUS:
+			case OP_UNARY_MINUS:
+				$s = $n->value . $this->parseTree($n->treeNodes[0]);
+			break;
+
+			case OP_INCREMENT:
+			case OP_DECREMENT:
+				if ($n->postfix)
+					$s = $this->parseTree($n->treeNodes[0]) . $n->value;
+				else
+					$s = $n->value . $this->parseTree($n->treeNodes[0]);
+			break;
+
+			case OP_DOT:
+				$s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
+			break;
+
+			case JS_INDEX:
+				$s = $this->parseTree($n->treeNodes[0]);
+				// See if we can replace named index with a dot saving 3 bytes
+				if (	$n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
+					$n->treeNodes[1]->type == TOKEN_STRING &&
+					$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
+				)
+					$s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
+				else
+					$s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+			break;
+
+			case JS_LIST:
+				$childs = $n->treeNodes;
+				for ($i = 0, $j = count($childs); $i < $j; $i++)
+					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+			break;
+
+			case JS_CALL:
+				$s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
+			break;
+
+			case KEYWORD_NEW:
+			case JS_NEW_WITH_ARGS:
+				$s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
+			break;
+
+			case JS_ARRAY_INIT:
+				$s = '[';
+				$childs = $n->treeNodes;
+				for ($i = 0, $j = count($childs); $i < $j; $i++)
+				{
+					$s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+				}
+				$s .= ']';
+			break;
+
+			case JS_OBJECT_INIT:
+				$s = '{';
+				$childs = $n->treeNodes;
+				for ($i = 0, $j = count($childs); $i < $j; $i++)
+				{
+					$t = $childs[$i];
+					if ($i)
+						$s .= ',';
+					if ($t->type == JS_PROPERTY_INIT)
+					{
+						// Ditch the quotes when the index is a valid identifier
+						if (	$t->treeNodes[0]->type == TOKEN_STRING &&
+							$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
+						)
+							$s .= substr($t->treeNodes[0]->value, 1, -1);
+						else
+							$s .= $t->treeNodes[0]->value;
+
+						$s .= ':' . $this->parseTree($t->treeNodes[1]);
+					}
+					else
+					{
+						$s .= $t->type == JS_GETTER ? 'get' : 'set';
+						$s .= ' ' . $t->name . '(';
+						$params = $t->params;
+						for ($i = 0, $j = count($params); $i < $j; $i++)
+							$s .= ($i ? ',' : '') . $params[$i];
+						$s .= '){' . $this->parseTree($t->body, true) . '}';
+					}
+				}
+				$s .= '}';
+			break;
+
+			case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
+			case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
+				$s = $n->value;
+			break;
+
+			case JS_GROUP:
+				$s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
+			break;
+
+			default:
+				throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
+		}
+
+		return $s;
+	}
+
+	private function isValidIdentifier($string)
+	{
+		return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
+	}
+}
+
+class JSParser
+{
+	private $t;
+
+	private $opPrecedence = array(
+		';' => 0,
+		',' => 1,
+		'=' => 2, '?' => 2, ':' => 2,
+		// The above all have to have the same precedence, see bug 330975
+		'||' => 4,
+		'&&' => 5,
+		'|' => 6,
+		'^' => 7,
+		'&' => 8,
+		'==' => 9, '!=' => 9, '===' => 9, '!==' => 9,
+		'<' => 10, '<=' => 10, '>=' => 10, '>' => 10, 'in' => 10, 'instanceof' => 10,
+		'<<' => 11, '>>' => 11, '>>>' => 11,
+		'+' => 12, '-' => 12,
+		'*' => 13, '/' => 13, '%' => 13,
+		'delete' => 14, 'void' => 14, 'typeof' => 14,
+		'!' => 14, '~' => 14, 'U+' => 14, 'U-' => 14,
+		'++' => 15, '--' => 15,
+		'new' => 16,
+		'.' => 17,
+		JS_NEW_WITH_ARGS => 0, JS_INDEX => 0, JS_CALL => 0,
+		JS_ARRAY_INIT => 0, JS_OBJECT_INIT => 0, JS_GROUP => 0
+	);
+
+	private $opArity = array(
+		',' => -2,
+		'=' => 2,
+		'?' => 3,
+		'||' => 2,
+		'&&' => 2,
+		'|' => 2,
+		'^' => 2,
+		'&' => 2,
+		'==' => 2, '!=' => 2, '===' => 2, '!==' => 2,
+		'<' => 2, '<=' => 2, '>=' => 2, '>' => 2, 'in' => 2, 'instanceof' => 2,
+		'<<' => 2, '>>' => 2, '>>>' => 2,
+		'+' => 2, '-' => 2,
+		'*' => 2, '/' => 2, '%' => 2,
+		'delete' => 1, 'void' => 1, 'typeof' => 1,
+		'!' => 1, '~' => 1, 'U+' => 1, 'U-' => 1,
+		'++' => 1, '--' => 1,
+		'new' => 1,
+		'.' => 2,
+		JS_NEW_WITH_ARGS => 2, JS_INDEX => 2, JS_CALL => 2,
+		JS_ARRAY_INIT => 1, JS_OBJECT_INIT => 1, JS_GROUP => 1,
+		TOKEN_CONDCOMMENT_START => 1, TOKEN_CONDCOMMENT_END => 1
+	);
+
+	public function __construct()
+	{
+		$this->t = new JSTokenizer();
+	}
+
+	public function parse($s, $f, $l)
+	{
+		// initialize tokenizer
+		$this->t->init($s, $f, $l);
+
+		$x = new JSCompilerContext(false);
+		$n = $this->Script($x);
+		if (!$this->t->isDone())
+			throw $this->t->newSyntaxError('Syntax error');
+
+		return $n;
+	}
+
+	private function Script($x)
+	{
+		$n = $this->Statements($x);
+		$n->type = JS_SCRIPT;
+		$n->funDecls = $x->funDecls;
+		$n->varDecls = $x->varDecls;
+
+		return $n;
+	}
+
+	private function Statements($x)
+	{
+		$n = new JSNode($this->t, JS_BLOCK);
+		array_push($x->stmtStack, $n);
+
+		while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY)
+			$n->addNode($this->Statement($x));
+
+		array_pop($x->stmtStack);
+
+		return $n;
+	}
+
+	private function Block($x)
+	{
+		$this->t->mustMatch(OP_LEFT_CURLY);
+		$n = $this->Statements($x);
+		$this->t->mustMatch(OP_RIGHT_CURLY);
+
+		return $n;
+	}
+
+	private function Statement($x)
+	{
+		$tt = $this->t->get();
+		$n2 = null;
+
+		// Cases for statements ending in a right curly return early, avoiding the
+		// common semicolon insertion magic after this switch.
+		switch ($tt)
+		{
+			case KEYWORD_FUNCTION:
+				return $this->FunctionDefinition(
+					$x,
+					true,
+					count($x->stmtStack) > 1 ? STATEMENT_FORM : DECLARED_FORM
+				);
+			break;
+
+			case OP_LEFT_CURLY:
+				$n = $this->Statements($x);
+				$this->t->mustMatch(OP_RIGHT_CURLY);
+			return $n;
+
+			case KEYWORD_IF:
+				$n = new JSNode($this->t);
+				$n->condition = $this->ParenExpression($x);
+				array_push($x->stmtStack, $n);
+				$n->thenPart = $this->Statement($x);
+				$n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null;
+				array_pop($x->stmtStack);
+			return $n;
+
+			case KEYWORD_SWITCH:
+				$n = new JSNode($this->t);
+				$this->t->mustMatch(OP_LEFT_PAREN);
+				$n->discriminant = $this->Expression($x);
+				$this->t->mustMatch(OP_RIGHT_PAREN);
+				$n->cases = array();
+				$n->defaultIndex = -1;
+
+				array_push($x->stmtStack, $n);
+
+				$this->t->mustMatch(OP_LEFT_CURLY);
+
+				while (($tt = $this->t->get()) != OP_RIGHT_CURLY)
+				{
+					switch ($tt)
+					{
+						case KEYWORD_DEFAULT:
+							if ($n->defaultIndex >= 0)
+								throw $this->t->newSyntaxError('More than one switch default');
+							// FALL THROUGH
+						case KEYWORD_CASE:
+							$n2 = new JSNode($this->t);
+							if ($tt == KEYWORD_DEFAULT)
+								$n->defaultIndex = count($n->cases);
+							else
+								$n2->caseLabel = $this->Expression($x, OP_COLON);
+								break;
+						default:
+							throw $this->t->newSyntaxError('Invalid switch case');
+					}
+
+					$this->t->mustMatch(OP_COLON);
+					$n2->statements = new JSNode($this->t, JS_BLOCK);
+					while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY)
+						$n2->statements->addNode($this->Statement($x));
+
+					array_push($n->cases, $n2);
+				}
+
+				array_pop($x->stmtStack);
+			return $n;
+
+			case KEYWORD_FOR:
+				$n = new JSNode($this->t);
+				$n->isLoop = true;
+				$this->t->mustMatch(OP_LEFT_PAREN);
+
+				if (($tt = $this->t->peek()) != OP_SEMICOLON)
+				{
+					$x->inForLoopInit = true;
+					if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST)
+					{
+						$this->t->get();
+						$n2 = $this->Variables($x);
+					}
+					else
+					{
+						$n2 = $this->Expression($x);
+					}
+					$x->inForLoopInit = false;
+				}
+
+				if ($n2 && $this->t->match(KEYWORD_IN))
+				{
+					$n->type = JS_FOR_IN;
+					if ($n2->type == KEYWORD_VAR)
+					{
+						if (count($n2->treeNodes) != 1)
+						{
+							throw $this->t->SyntaxError(
+								'Invalid for..in left-hand side',
+								$this->t->filename,
+								$n2->lineno
+							);
+						}
+
+						// NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
+						$n->iterator = $n2->treeNodes[0];
+						$n->varDecl = $n2;
+					}
+					else
+					{
+						$n->iterator = $n2;
+						$n->varDecl = null;
+					}
+
+					$n->object = $this->Expression($x);
+				}
+				else
+				{
+					$n->setup = $n2 ? $n2 : null;
+					$this->t->mustMatch(OP_SEMICOLON);
+					$n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x);
+					$this->t->mustMatch(OP_SEMICOLON);
+					$n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x);
+				}
+
+				$this->t->mustMatch(OP_RIGHT_PAREN);
+				$n->body = $this->nest($x, $n);
+			return $n;
+
+			case KEYWORD_WHILE:
+			        $n = new JSNode($this->t);
+			        $n->isLoop = true;
+			        $n->condition = $this->ParenExpression($x);
+			        $n->body = $this->nest($x, $n);
+			return $n;
+
+			case KEYWORD_DO:
+				$n = new JSNode($this->t);
+				$n->isLoop = true;
+				$n->body = $this->nest($x, $n, KEYWORD_WHILE);
+				$n->condition = $this->ParenExpression($x);
+				if (!$x->ecmaStrictMode)
+				{
+					// <script language="JavaScript"> (without version hints) may need
+					// automatic semicolon insertion without a newline after do-while.
+					// See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
+					$this->t->match(OP_SEMICOLON);
+					return $n;
+				}
+			break;
+
+			case KEYWORD_BREAK:
+			case KEYWORD_CONTINUE:
+				$n = new JSNode($this->t);
+
+				if ($this->t->peekOnSameLine() == TOKEN_IDENTIFIER)
+				{
+					$this->t->get();
+					$n->label = $this->t->currentToken()->value;
+				}
+
+				$ss = $x->stmtStack;
+				$i = count($ss);
+				$label = $n->label;
+				if ($label)
+				{
+					do
+					{
+						if (--$i < 0)
+							throw $this->t->newSyntaxError('Label not found');
+					}
+					while ($ss[$i]->label != $label);
+				}
+				else
+				{
+					do
+					{
+						if (--$i < 0)
+							throw $this->t->newSyntaxError('Invalid ' . $tt);
+					}
+					while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
+				}
+
+				$n->target = $ss[$i];
+			break;
+
+			case KEYWORD_TRY:
+				$n = new JSNode($this->t);
+				$n->tryBlock = $this->Block($x);
+				$n->catchClauses = array();
+
+				while ($this->t->match(KEYWORD_CATCH))
+				{
+					$n2 = new JSNode($this->t);
+					$this->t->mustMatch(OP_LEFT_PAREN);
+					$n2->varName = $this->t->mustMatch(TOKEN_IDENTIFIER)->value;
+
+					if ($this->t->match(KEYWORD_IF))
+					{
+						if ($x->ecmaStrictMode)
+							throw $this->t->newSyntaxError('Illegal catch guard');
+
+						if (count($n->catchClauses) && !end($n->catchClauses)->guard)
+							throw $this->t->newSyntaxError('Guarded catch after unguarded');
+
+						$n2->guard = $this->Expression($x);
+					}
+					else
+					{
+						$n2->guard = null;
+					}
+
+					$this->t->mustMatch(OP_RIGHT_PAREN);
+					$n2->block = $this->Block($x);
+					array_push($n->catchClauses, $n2);
+				}
+
+				if ($this->t->match(KEYWORD_FINALLY))
+					$n->finallyBlock = $this->Block($x);
+
+				if (!count($n->catchClauses) && !$n->finallyBlock)
+					throw $this->t->newSyntaxError('Invalid try statement');
+			return $n;
+
+			case KEYWORD_CATCH:
+			case KEYWORD_FINALLY:
+				throw $this->t->newSyntaxError($tt + ' without preceding try');
+
+			case KEYWORD_THROW:
+				$n = new JSNode($this->t);
+				$n->exception = $this->Expression($x);
+			break;
+
+			case KEYWORD_RETURN:
+				if (!$x->inFunction)
+					throw $this->t->newSyntaxError('Invalid return');
+
+				$n = new JSNode($this->t);
+				$tt = $this->t->peekOnSameLine();
+				if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
+					$n->value = $this->Expression($x);
+				else
+					$n->value = null;
+			break;
+
+			case KEYWORD_WITH:
+				$n = new JSNode($this->t);
+				$n->object = $this->ParenExpression($x);
+				$n->body = $this->nest($x, $n);
+			return $n;
+
+			case KEYWORD_VAR:
+			case KEYWORD_CONST:
+			        $n = $this->Variables($x);
+			break;
+
+			case TOKEN_CONDCOMMENT_START:
+			case TOKEN_CONDCOMMENT_END:
+				$n = new JSNode($this->t);
+			return $n;
+
+			case KEYWORD_DEBUGGER:
+				$n = new JSNode($this->t);
+			break;
+
+			case TOKEN_NEWLINE:
+			case OP_SEMICOLON:
+				$n = new JSNode($this->t, OP_SEMICOLON);
+				$n->expression = null;
+			return $n;
+
+			default:
+				if ($tt == TOKEN_IDENTIFIER)
+				{
+					$this->t->scanOperand = false;
+					$tt = $this->t->peek();
+					$this->t->scanOperand = true;
+					if ($tt == OP_COLON)
+					{
+						$label = $this->t->currentToken()->value;
+						$ss = $x->stmtStack;
+						for ($i = count($ss) - 1; $i >= 0; --$i)
+						{
+							if ($ss[$i]->label == $label)
+								throw $this->t->newSyntaxError('Duplicate label');
+						}
+
+						$this->t->get();
+						$n = new JSNode($this->t, JS_LABEL);
+						$n->label = $label;
+						$n->statement = $this->nest($x, $n);
+
+						return $n;
+					}
+				}
+
+				$n = new JSNode($this->t, OP_SEMICOLON);
+				$this->t->unget();
+				$n->expression = $this->Expression($x);
+				$n->end = $n->expression->end;
+			break;
+		}
+
+		if ($this->t->lineno == $this->t->currentToken()->lineno)
+		{
+			$tt = $this->t->peekOnSameLine();
+			if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
+				throw $this->t->newSyntaxError('Missing ; before statement');
+		}
+
+		$this->t->match(OP_SEMICOLON);
+
+		return $n;
+	}
+
+	private function FunctionDefinition($x, $requireName, $functionForm)
+	{
+		$f = new JSNode($this->t);
+
+		if ($f->type != KEYWORD_FUNCTION)
+			$f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
+
+		if ($this->t->match(TOKEN_IDENTIFIER))
+			$f->name = $this->t->currentToken()->value;
+		elseif ($requireName)
+			throw $this->t->newSyntaxError('Missing function identifier');
+
+		$this->t->mustMatch(OP_LEFT_PAREN);
+			$f->params = array();
+
+		while (($tt = $this->t->get()) != OP_RIGHT_PAREN)
+		{
+			if ($tt != TOKEN_IDENTIFIER)
+				throw $this->t->newSyntaxError('Missing formal parameter');
+
+			array_push($f->params, $this->t->currentToken()->value);
+
+			if ($this->t->peek() != OP_RIGHT_PAREN)
+				$this->t->mustMatch(OP_COMMA);
+		}
+
+		$this->t->mustMatch(OP_LEFT_CURLY);
+
+		$x2 = new JSCompilerContext(true);
+		$f->body = $this->Script($x2);
+
+		$this->t->mustMatch(OP_RIGHT_CURLY);
+		$f->end = $this->t->currentToken()->end;
+
+		$f->functionForm = $functionForm;
+		if ($functionForm == DECLARED_FORM)
+			array_push($x->funDecls, $f);
+
+		return $f;
+	}
+
+	private function Variables($x)
+	{
+		$n = new JSNode($this->t);
+
+		do
+		{
+			$this->t->mustMatch(TOKEN_IDENTIFIER);
+
+			$n2 = new JSNode($this->t);
+			$n2->name = $n2->value;
+
+			if ($this->t->match(OP_ASSIGN))
+			{
+				if ($this->t->currentToken()->assignOp)
+					throw $this->t->newSyntaxError('Invalid variable initialization');
+
+				$n2->initializer = $this->Expression($x, OP_COMMA);
+			}
+
+			$n2->readOnly = $n->type == KEYWORD_CONST;
+
+			$n->addNode($n2);
+			array_push($x->varDecls, $n2);
+		}
+		while ($this->t->match(OP_COMMA));
+
+		return $n;
+	}
+
+	private function Expression($x, $stop=false)
+	{
+		$operators = array();
+		$operands = array();
+		$n = false;
+
+		$bl = $x->bracketLevel;
+		$cl = $x->curlyLevel;
+		$pl = $x->parenLevel;
+		$hl = $x->hookLevel;
+
+		while (($tt = $this->t->get()) != TOKEN_END)
+		{
+			if ($tt == $stop &&
+				$x->bracketLevel == $bl &&
+				$x->curlyLevel == $cl &&
+				$x->parenLevel == $pl &&
+				$x->hookLevel == $hl
+			)
+			{
+				// Stop only if tt matches the optional stop parameter, and that
+				// token is not quoted by some kind of bracket.
+				break;
+			}
+
+			switch ($tt)
+			{
+				case OP_SEMICOLON:
+					// NB: cannot be empty, Statement handled that.
+					break 2;
+
+				case OP_HOOK:
+					if ($this->t->scanOperand)
+						break 2;
+
+					while (	!empty($operators) &&
+						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
+					)
+						$this->reduce($operators, $operands);
+
+					array_push($operators, new JSNode($this->t));
+
+					++$x->hookLevel;
+					$this->t->scanOperand = true;
+					$n = $this->Expression($x);
+
+					if (!$this->t->match(OP_COLON))
+						break 2;
+
+					--$x->hookLevel;
+					array_push($operands, $n);
+				break;
+
+				case OP_COLON:
+					if ($x->hookLevel)
+						break 2;
+
+					throw $this->t->newSyntaxError('Invalid label');
+				break;
+
+				case OP_ASSIGN:
+					if ($this->t->scanOperand)
+						break 2;
+
+					// Use >, not >=, for right-associative ASSIGN
+					while (	!empty($operators) &&
+						$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
+					)
+						$this->reduce($operators, $operands);
+
+					array_push($operators, new JSNode($this->t));
+					end($operands)->assignOp = $this->t->currentToken()->assignOp;
+					$this->t->scanOperand = true;
+				break;
+
+				case KEYWORD_IN:
+					// An in operator should not be parsed if we're parsing the head of
+					// a for (...) loop, unless it is in the then part of a conditional
+					// expression, or parenthesized somehow.
+					if ($x->inForLoopInit && !$x->hookLevel &&
+						!$x->bracketLevel && !$x->curlyLevel &&
+						!$x->parenLevel
+					)
+						break 2;
+				// FALL THROUGH
+				case OP_COMMA:
+					// A comma operator should not be parsed if we're parsing the then part
+					// of a conditional expression unless it's parenthesized somehow.
+					if ($tt == OP_COMMA && $x->hookLevel &&
+						!$x->bracketLevel && !$x->curlyLevel &&
+						!$x->parenLevel
+					)
+						break 2;
+				// Treat comma as left-associative so reduce can fold left-heavy
+				// COMMA trees into a single array.
+				// FALL THROUGH
+				case OP_OR:
+				case OP_AND:
+				case OP_BITWISE_OR:
+				case OP_BITWISE_XOR:
+				case OP_BITWISE_AND:
+				case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
+				case OP_LT: case OP_LE: case OP_GE: case OP_GT:
+				case KEYWORD_INSTANCEOF:
+				case OP_LSH: case OP_RSH: case OP_URSH:
+				case OP_PLUS: case OP_MINUS:
+				case OP_MUL: case OP_DIV: case OP_MOD:
+				case OP_DOT:
+					if ($this->t->scanOperand)
+						break 2;
+
+					while (	!empty($operators) &&
+						$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
+					)
+						$this->reduce($operators, $operands);
+
+					if ($tt == OP_DOT)
+					{
+						$this->t->mustMatch(TOKEN_IDENTIFIER);
+						array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
+					}
+					else
+					{
+						array_push($operators, new JSNode($this->t));
+						$this->t->scanOperand = true;
+					}
+				break;
+
+				case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF:
+				case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS:
+				case KEYWORD_NEW:
+					if (!$this->t->scanOperand)
+						break 2;
+
+					array_push($operators, new JSNode($this->t));
+				break;
+
+				case OP_INCREMENT: case OP_DECREMENT:
+					if ($this->t->scanOperand)
+					{
+						array_push($operators, new JSNode($this->t));  // prefix increment or decrement
+					}
+					else
+					{
+						// Don't cross a line boundary for postfix {in,de}crement.
+						$t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
+						if ($t && $t->lineno != $this->t->lineno)
+							break 2;
+
+						if (!empty($operators))
+						{
+							// Use >, not >=, so postfix has higher precedence than prefix.
+							while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt])
+								$this->reduce($operators, $operands);
+						}
+
+						$n = new JSNode($this->t, $tt, array_pop($operands));
+						$n->postfix = true;
+						array_push($operands, $n);
+					}
+				break;
+
+				case KEYWORD_FUNCTION:
+					if (!$this->t->scanOperand)
+						break 2;
+
+					array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
+					$this->t->scanOperand = false;
+				break;
+
+				case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
+				case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
+					if (!$this->t->scanOperand)
+						break 2;
+
+					array_push($operands, new JSNode($this->t));
+					$this->t->scanOperand = false;
+				break;
+
+				case TOKEN_CONDCOMMENT_START:
+				case TOKEN_CONDCOMMENT_END:
+					if ($this->t->scanOperand)
+						array_push($operators, new JSNode($this->t));
+					else
+						array_push($operands, new JSNode($this->t));
+				break;
+
+				case OP_LEFT_BRACKET:
+					if ($this->t->scanOperand)
+					{
+						// Array initialiser.  Parse using recursive descent, as the
+						// sub-grammar here is not an operator grammar.
+						$n = new JSNode($this->t, JS_ARRAY_INIT);
+						while (($tt = $this->t->peek()) != OP_RIGHT_BRACKET)
+						{
+							if ($tt == OP_COMMA)
+							{
+								$this->t->get();
+								$n->addNode(null);
+								continue;
+							}
+
+							$n->addNode($this->Expression($x, OP_COMMA));
+							if (!$this->t->match(OP_COMMA))
+								break;
+						}
+
+						$this->t->mustMatch(OP_RIGHT_BRACKET);
+						array_push($operands, $n);
+						$this->t->scanOperand = false;
+					}
+					else
+					{
+						// Property indexing operator.
+						array_push($operators, new JSNode($this->t, JS_INDEX));
+						$this->t->scanOperand = true;
+						++$x->bracketLevel;
+					}
+				break;
+
+				case OP_RIGHT_BRACKET:
+					if ($this->t->scanOperand || $x->bracketLevel == $bl)
+						break 2;
+
+					while ($this->reduce($operators, $operands)->type != JS_INDEX)
+						continue;
+
+					--$x->bracketLevel;
+				break;
+
+				case OP_LEFT_CURLY:
+					if (!$this->t->scanOperand)
+						break 2;
+
+					// Object initialiser.  As for array initialisers (see above),
+					// parse using recursive descent.
+					++$x->curlyLevel;
+					$n = new JSNode($this->t, JS_OBJECT_INIT);
+					while (!$this->t->match(OP_RIGHT_CURLY))
+					{
+						do
+						{
+							$tt = $this->t->get();
+							$tv = $this->t->currentToken()->value;
+							if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER)
+							{
+								if ($x->ecmaStrictMode)
+									throw $this->t->newSyntaxError('Illegal property accessor');
+
+								$n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
+							}
+							else
+							{
+								switch ($tt)
+								{
+									case TOKEN_IDENTIFIER:
+									case TOKEN_NUMBER:
+									case TOKEN_STRING:
+										$id = new JSNode($this->t);
+									break;
+
+									case OP_RIGHT_CURLY:
+										if ($x->ecmaStrictMode)
+											throw $this->t->newSyntaxError('Illegal trailing ,');
+									break 3;
+
+									default:
+										throw $this->t->newSyntaxError('Invalid property name');
+								}
+
+								$this->t->mustMatch(OP_COLON);
+								$n->addNode(new JSNode($this->t, JS_PROPERTY_INIT, $id, $this->Expression($x, OP_COMMA)));
+							}
+						}
+						while ($this->t->match(OP_COMMA));
+
+						$this->t->mustMatch(OP_RIGHT_CURLY);
+						break;
+					}
+
+					array_push($operands, $n);
+					$this->t->scanOperand = false;
+					--$x->curlyLevel;
+				break;
+
+				case OP_RIGHT_CURLY:
+					if (!$this->t->scanOperand && $x->curlyLevel != $cl)
+						throw new Exception('PANIC: right curly botch');
+				break 2;
+
+				case OP_LEFT_PAREN:
+					if ($this->t->scanOperand)
+					{
+						array_push($operators, new JSNode($this->t, JS_GROUP));
+					}
+					else
+					{
+						while (	!empty($operators) &&
+							$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
+						)
+							$this->reduce($operators, $operands);
+
+						// Handle () now, to regularize the n-ary case for n > 0.
+						// We must set scanOperand in case there are arguments and
+						// the first one is a regexp or unary+/-.
+						$n = end($operators);
+						$this->t->scanOperand = true;
+						if ($this->t->match(OP_RIGHT_PAREN))
+						{
+							if ($n && $n->type == KEYWORD_NEW)
+							{
+								array_pop($operators);
+								$n->addNode(array_pop($operands));
+							}
+							else
+							{
+								$n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
+							}
+
+							array_push($operands, $n);
+							$this->t->scanOperand = false;
+							break;
+						}
+
+						if ($n && $n->type == KEYWORD_NEW)
+							$n->type = JS_NEW_WITH_ARGS;
+						else
+							array_push($operators, new JSNode($this->t, JS_CALL));
+					}
+
+					++$x->parenLevel;
+				break;
+
+				case OP_RIGHT_PAREN:
+					if ($this->t->scanOperand || $x->parenLevel == $pl)
+						break 2;
+
+					while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
+						$tt != JS_CALL && $tt != JS_NEW_WITH_ARGS
+					)
+					{
+						continue;
+					}
+
+					if ($tt != JS_GROUP)
+					{
+						$n = end($operands);
+						if ($n->treeNodes[1]->type != OP_COMMA)
+							$n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
+						else
+							$n->treeNodes[1]->type = JS_LIST;
+					}
+
+					--$x->parenLevel;
+				break;
+
+				// Automatic semicolon insertion means we may scan across a newline
+				// and into the beginning of another statement.  If so, break out of
+				// the while loop and let the t.scanOperand logic handle errors.
+				default:
+					break 2;
+			}
+		}
+
+		if ($x->hookLevel != $hl)
+			throw $this->t->newSyntaxError('Missing : in conditional expression');
+
+		if ($x->parenLevel != $pl)
+			throw $this->t->newSyntaxError('Missing ) in parenthetical');
+
+		if ($x->bracketLevel != $bl)
+			throw $this->t->newSyntaxError('Missing ] in index expression');
+
+		if ($this->t->scanOperand)
+			throw $this->t->newSyntaxError('Missing operand');
+
+		// Resume default mode, scanning for operands, not operators.
+		$this->t->scanOperand = true;
+		$this->t->unget();
+
+		while (count($operators))
+			$this->reduce($operators, $operands);
+
+		return array_pop($operands);
+	}
+
+	private function ParenExpression($x)
+	{
+		$this->t->mustMatch(OP_LEFT_PAREN);
+		$n = $this->Expression($x);
+		$this->t->mustMatch(OP_RIGHT_PAREN);
+
+		return $n;
+	}
+
+	// Statement stack and nested statement handler.
+	private function nest($x, $node, $end = false)
+	{
+		array_push($x->stmtStack, $node);
+		$n = $this->statement($x);
+		array_pop($x->stmtStack);
+
+		if ($end)
+			$this->t->mustMatch($end);
+
+		return $n;
+	}
+
+	private function reduce(&$operators, &$operands)
+	{
+		$n = array_pop($operators);
+		$op = $n->type;
+		$arity = $this->opArity[$op];
+		$c = count($operands);
+		if ($arity == -2)
+		{
+			// Flatten left-associative trees
+			if ($c >= 2)
+			{
+				$left = $operands[$c - 2];
+				if ($left->type == $op)
+				{
+					$right = array_pop($operands);
+					$left->addNode($right);
+					return $left;
+				}
+			}
+			$arity = 2;
+		}
+
+		// Always use push to add operands to n, to update start and end
+		$a = array_splice($operands, $c - $arity);
+		for ($i = 0; $i < $arity; $i++)
+			$n->addNode($a[$i]);
+
+		// Include closing bracket or postfix operator in [start,end]
+		$te = $this->t->currentToken()->end;
+		if ($n->end < $te)
+			$n->end = $te;
+
+		array_push($operands, $n);
+
+		return $n;
+	}
+}
+
+class JSCompilerContext
+{
+	public $inFunction = false;
+	public $inForLoopInit = false;
+	public $ecmaStrictMode = false;
+	public $bracketLevel = 0;
+	public $curlyLevel = 0;
+	public $parenLevel = 0;
+	public $hookLevel = 0;
+
+	public $stmtStack = array();
+	public $funDecls = array();
+	public $varDecls = array();
+
+	public function __construct($inFunction)
+	{
+		$this->inFunction = $inFunction;
+	}
+}
+
+class JSNode
+{
+	private $type;
+	private $value;
+	private $lineno;
+	private $start;
+	private $end;
+
+	public $treeNodes = array();
+	public $funDecls = array();
+	public $varDecls = array();
+
+	public function __construct($t, $type=0)
+	{
+		if ($token = $t->currentToken())
+		{
+			$this->type = $type ? $type : $token->type;
+			$this->value = $token->value;
+			$this->lineno = $token->lineno;
+			$this->start = $token->start;
+			$this->end = $token->end;
+		}
+		else
+		{
+			$this->type = $type;
+			$this->lineno = $t->lineno;
+		}
+
+		if (($numargs = func_num_args()) > 2)
+		{
+			$args = func_get_args();;
+			for ($i = 2; $i < $numargs; $i++)
+				$this->addNode($args[$i]);
+		}
+	}
+
+	// we don't want to bloat our object with all kind of specific properties, so we use overloading
+	public function __set($name, $value)
+	{
+		$this->$name = $value;
+	}
+
+	public function __get($name)
+	{
+		if (isset($this->$name))
+			return $this->$name;
+
+		return null;
+	}
+
+	public function addNode($node)
+	{
+		if ($node !== null)
+		{
+			if ($node->start < $this->start)
+				$this->start = $node->start;
+			if ($this->end < $node->end)
+				$this->end = $node->end;
+		}
+
+		$this->treeNodes[] = $node;
+	}
+}
+
+class JSTokenizer
+{
+	private $cursor = 0;
+	private $source;
+
+	public $tokens = array();
+	public $tokenIndex = 0;
+	public $lookahead = 0;
+	public $scanNewlines = false;
+	public $scanOperand = true;
+
+	public $filename;
+	public $lineno;
+
+	private $keywords = array(
+		'break',
+		'case', 'catch', 'const', 'continue',
+		'debugger', 'default', 'delete', 'do',
+		'else', 'enum',
+		'false', 'finally', 'for', 'function',
+		'if', 'in', 'instanceof',
+		'new', 'null',
+		'return',
+		'switch',
+		'this', 'throw', 'true', 'try', 'typeof',
+		'var', 'void',
+		'while', 'with'
+	);
+
+	private $opTypeNames = array(
+		';'	=> 'SEMICOLON',
+		','	=> 'COMMA',
+		'?'	=> 'HOOK',
+		':'	=> 'COLON',
+		'||'	=> 'OR',
+		'&&'	=> 'AND',
+		'|'	=> 'BITWISE_OR',
+		'^'	=> 'BITWISE_XOR',
+		'&'	=> 'BITWISE_AND',
+		'==='	=> 'STRICT_EQ',
+		'=='	=> 'EQ',
+		'='	=> 'ASSIGN',
+		'!=='	=> 'STRICT_NE',
+		'!='	=> 'NE',
+		'<<'	=> 'LSH',
+		'<='	=> 'LE',
+		'<'	=> 'LT',
+		'>>>'	=> 'URSH',
+		'>>'	=> 'RSH',
+		'>='	=> 'GE',
+		'>'	=> 'GT',
+		'++'	=> 'INCREMENT',
+		'--'	=> 'DECREMENT',
+		'+'	=> 'PLUS',
+		'-'	=> 'MINUS',
+		'*'	=> 'MUL',
+		'/'	=> 'DIV',
+		'%'	=> 'MOD',
+		'!'	=> 'NOT',
+		'~'	=> 'BITWISE_NOT',
+		'.'	=> 'DOT',
+		'['	=> 'LEFT_BRACKET',
+		']'	=> 'RIGHT_BRACKET',
+		'{'	=> 'LEFT_CURLY',
+		'}'	=> 'RIGHT_CURLY',
+		'('	=> 'LEFT_PAREN',
+		')'	=> 'RIGHT_PAREN',
+		'@*/'	=> 'CONDCOMMENT_END'
+	);
+
+	private $assignOps = array('|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%');
+	private $opRegExp;
+
+	public function __construct()
+	{
+		$this->opRegExp = '#^(' . implode('|', array_map('preg_quote', array_keys($this->opTypeNames))) . ')#';
+
+		// this is quite a hidden yet convenient place to create the defines for operators and keywords
+		foreach ($this->opTypeNames as $operand => $name)
+			define('OP_' . $name, $operand);
+
+		define('OP_UNARY_PLUS', 'U+');
+		define('OP_UNARY_MINUS', 'U-');
+
+		foreach ($this->keywords as $keyword)
+			define('KEYWORD_' . strtoupper($keyword), $keyword);
+	}
+
+	public function init($source, $filename = '', $lineno = 1)
+	{
+		$this->source = $source;
+		$this->filename = $filename ? $filename : '[inline]';
+		$this->lineno = $lineno;
+
+		$this->cursor = 0;
+		$this->tokens = array();
+		$this->tokenIndex = 0;
+		$this->lookahead = 0;
+		$this->scanNewlines = false;
+		$this->scanOperand = true;
+	}
+
+	public function getInput($chunksize)
+	{
+		if ($chunksize)
+			return substr($this->source, $this->cursor, $chunksize);
+
+		return substr($this->source, $this->cursor);
+	}
+
+	public function isDone()
+	{
+		return $this->peek() == TOKEN_END;
+	}
+
+	public function match($tt)
+	{
+		return $this->get() == $tt || $this->unget();
+	}
+
+	public function mustMatch($tt)
+	{
+	        if (!$this->match($tt))
+			throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+
+		return $this->currentToken();
+	}
+
+	public function peek()
+	{
+		if ($this->lookahead)
+		{
+			$next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
+			if ($this->scanNewlines && $next->lineno != $this->lineno)
+				$tt = TOKEN_NEWLINE;
+			else
+				$tt = $next->type;
+		}
+		else
+		{
+			$tt = $this->get();
+			$this->unget();
+		}
+
+		return $tt;
+	}
+
+	public function peekOnSameLine()
+	{
+		$this->scanNewlines = true;
+		$tt = $this->peek();
+		$this->scanNewlines = false;
+
+		return $tt;
+	}
+
+	public function currentToken()
+	{
+		if (!empty($this->tokens))
+			return $this->tokens[$this->tokenIndex];
+	}
+
+	public function get($chunksize = 1000)
+	{
+		while($this->lookahead)
+		{
+			$this->lookahead--;
+			$this->tokenIndex = ($this->tokenIndex + 1) & 3;
+			$token = $this->tokens[$this->tokenIndex];
+			if ($token->type != TOKEN_NEWLINE || $this->scanNewlines)
+				return $token->type;
+		}
+
+		$conditional_comment = false;
+
+		// strip whitespace and comments
+		while(true)
+		{
+			$input = $this->getInput($chunksize);
+
+			// whitespace handling; gobble up \r as well (effectively we don't have support for MAC newlines!)
+			$re = $this->scanNewlines ? '/^[ \r\t]+/' : '/^\s+/';
+			if (preg_match($re, $input, $match))
+			{
+				$spaces = $match[0];
+				$spacelen = strlen($spaces);
+				$this->cursor += $spacelen;
+				if (!$this->scanNewlines)
+					$this->lineno += substr_count($spaces, "\n");
+
+				if ($spacelen == $chunksize)
+					continue; // complete chunk contained whitespace
+
+				$input = $this->getInput($chunksize);
+				if ($input == '' || $input[0] != '/')
+					break;
+			}
+
+			// Comments
+			if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match))
+			{
+				if (!$chunksize)
+					break;
+
+				// retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
+				$chunksize = null;
+				continue;
+			}
+
+			// check if this is a conditional (JScript) comment
+			if (!empty($match[1]))
+			{
+				$match[0] = '/*' . $match[1];
+				$conditional_comment = true;
+				break;
+			}
+			else
+			{
+				$this->cursor += strlen($match[0]);
+				$this->lineno += substr_count($match[0], "\n");
+			}
+		}
+
+		if ($input == '')
+		{
+			$tt = TOKEN_END;
+			$match = array('');
+		}
+		elseif ($conditional_comment)
+		{
+			$tt = TOKEN_CONDCOMMENT_START;
+		}
+		else
+		{
+			switch ($input[0])
+			{
+				case '0': case '1': case '2': case '3': case '4':
+				case '5': case '6': case '7': case '8': case '9':
+					if (preg_match('/^\d+\.\d*(?:[eE][-+]?\d+)?|^\d+(?:\.\d*)?[eE][-+]?\d+/', $input, $match))
+					{
+						$tt = TOKEN_NUMBER;
+					}
+					else if (preg_match('/^0[xX][\da-fA-F]+|^0[0-7]*|^\d+/', $input, $match))
+					{
+						// this should always match because of \d+
+						$tt = TOKEN_NUMBER;
+					}
+				break;
+
+				case '"':
+				case "'":
+					if (preg_match('/^"(?:\\\\(?:.|\r?\n)|[^\\\\"\r\n]+)*"|^\'(?:\\\\(?:.|\r?\n)|[^\\\\\'\r\n]+)*\'/', $input, $match))
+					{
+						$tt = TOKEN_STRING;
+					}
+					else
+					{
+						if ($chunksize)
+							return $this->get(null); // retry with a full chunk fetch
+
+						throw $this->newSyntaxError('Unterminated string literal');
+					}
+				break;
+
+				case '/':
+					if ($this->scanOperand && preg_match('/^\/((?:\\\\.|\[(?:\\\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/', $input, $match))
+					{
+						$tt = TOKEN_REGEXP;
+						break;
+					}
+				// FALL THROUGH
+
+				case '|':
+				case '^':
+				case '&':
+				case '<':
+				case '>':
+				case '+':
+				case '-':
+				case '*':
+				case '%':
+				case '=':
+				case '!':
+					// should always match
+					preg_match($this->opRegExp, $input, $match);
+					$op = $match[0];
+					if (in_array($op, $this->assignOps) && $input[strlen($op)] == '=')
+					{
+						$tt = OP_ASSIGN;
+						$match[0] .= '=';
+					}
+					else
+					{
+						$tt = $op;
+						if ($this->scanOperand)
+						{
+							if ($op == OP_PLUS)
+								$tt = OP_UNARY_PLUS;
+							elseif ($op == OP_MINUS)
+								$tt = OP_UNARY_MINUS;
+						}
+						$op = null;
+					}
+				break;
+
+				case '.':
+					if (preg_match('/^\.\d+(?:[eE][-+]?\d+)?/', $input, $match))
+					{
+						$tt = TOKEN_NUMBER;
+						break;
+					}
+				// FALL THROUGH
+
+				case ';':
+				case ',':
+				case '?':
+				case ':':
+				case '~':
+				case '[':
+				case ']':
+				case '{':
+				case '}':
+				case '(':
+				case ')':
+					// these are all single
+					$match = array($input[0]);
+					$tt = $input[0];
+				break;
+
+				case '@':
+					// check end of conditional comment
+					if (substr($input, 0, 3) == '@*/')
+					{
+						$match = array('@*/');
+						$tt = TOKEN_CONDCOMMENT_END;
+					}
+					else
+						throw $this->newSyntaxError('Illegal token');
+				break;
+
+				case "\n":
+					if ($this->scanNewlines)
+					{
+						$match = array("\n");
+						$tt = TOKEN_NEWLINE;
+					}
+					else
+						throw $this->newSyntaxError('Illegal token');
+				break;
+
+				default:
+					// FIXME: add support for unicode and unicode escape sequence \uHHHH
+					if (preg_match('/^[$\w]+/', $input, $match))
+					{
+						$tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
+					}
+					else
+						throw $this->newSyntaxError('Illegal token');
+			}
+		}
+
+		$this->tokenIndex = ($this->tokenIndex + 1) & 3;
+
+		if (!isset($this->tokens[$this->tokenIndex]))
+			$this->tokens[$this->tokenIndex] = new JSToken();
+
+		$token = $this->tokens[$this->tokenIndex];
+		$token->type = $tt;
+
+		if ($tt == OP_ASSIGN)
+			$token->assignOp = $op;
+
+		$token->start = $this->cursor;
+
+		$token->value = $match[0];
+		$this->cursor += strlen($match[0]);
+
+		$token->end = $this->cursor;
+		$token->lineno = $this->lineno;
+
+		return $tt;
+	}
+
+	public function unget()
+	{
+		if (++$this->lookahead == 4)
+			throw $this->newSyntaxError('PANIC: too much lookahead!');
+
+		$this->tokenIndex = ($this->tokenIndex - 1) & 3;
+	}
+
+	public function newSyntaxError($m)
+	{
+		return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
+	}
+}
+
+class JSToken
+{
+	public $type;
+	public $value;
+	public $start;
+	public $end;
+	public $lineno;
+	public $assignOp;
+}
+
+?>
\ No newline at end of file
diff --git a/tools/minify/minify.php b/tools/minify/minify.php
new file mode 100644
index 000000000..a27f1ffef
--- /dev/null
+++ b/tools/minify/minify.php
@@ -0,0 +1,197 @@
+<?php
+/**
+ * Minify
+ * This script comnbines multiple JavaScript or CSS files with minifying.
+ * PHP 5.3.0 or above version is required.
+ *
+ * Usage : php minify.php [TARGET_DIR ...]
+ * TARGET_DIR use the current working directory as a default path.
+ *
+ * @author NHN(developer@xpressengine.com)
+ */
+
+if(version_compare(PHP_VERSION, '5.3.0', '<')) {
+	echo "PHP 5.3.0 or above version is required.";
+	exit(1);
+}
+
+function main() {
+	$argv = $_SERVER['argv'];
+	$argc = $_SERVER['argc'];
+
+	// get target directories
+	if($argc < 1) exit;
+	elseif($argc < 2) $dirs = array($_SERVER['PWD']);
+	else $dirs = array_slice($argv, 1);
+
+	$dirs = array_map('realpath', $dirs);
+	$dirs = array_map('add_dirsep', $dirs);
+
+	array_walk($dirs, 'execute');
+}
+
+// add directory separator
+function add_dirsep($path) {
+	if(substr($path,-1) != DIRECTORY_SEPARATOR) $path .= DIRECTORY_SEPARATOR;
+	return $path;
+}
+
+function execute($dir) {
+	echo "Processing : {$dir}\n";
+
+	// parse config file if it exists
+	echo "  Finding predefined configuration file...";
+	$config = read_config($dir);
+	echo " Done\n";
+
+	// merge
+	foreach($config['merge'] as $target=>$files) {
+		merge($files, $target, $dir);
+	}
+
+	// files to skip
+	$files_to_skip = $config['skip'];
+	foreach($files_to_skip as $idx=>$file) {
+		if($file) $files_to_skip[$idx] = realpath($dir.trim($file));
+	}
+
+	echo "  Minifying JavaScript files...";
+	$js_files = get_target_files('js', $dir, $files_to_skip);
+
+	if(count($js_files) && !class_exists('JSMinPlus')) {
+		require dirname(__FILE__).'/jsminplus/jsminplus.php';
+	}
+	foreach($js_files as $file) {
+		if(!is_readable($file)) continue;
+
+		$target  = preg_replace('@\.js$@', '.min.js', $file);
+		$content = file_get_contents($file);
+
+		// save copyright to preserve it
+		if(preg_match('@^[ \t]*(/\*\*.+?\*/)@s', $content, $matches)) {
+			$copyright = $matches[1]."\n";
+		} else {
+			$copyright = '';
+		}
+
+		if($config['use_closure_compiler']) {
+			$content = closure_compile($content);
+			if(!$content) {
+				echo "   CANNOT compile the js file with closure compiler.\n";
+				echo "   Trying again with JSMinPlus.\n";
+				$content = JSMinPlus::minify($content);
+			}
+		} else {
+			$content = JSMinPlus::minify($content);
+		}
+
+		file_put_contents($target, $copyright.$content);
+
+		echo '.';
+	}
+	echo " Done\n";
+
+	echo "  Minifying CSS files...";
+	$css_files = get_target_files('css', $dir, $files_to_skip);
+
+	if(count($css_files) && !class_exists('CssMin')) {
+		require dirname(__FILE__).'/cssmin/cssmin.php';
+	}
+
+	foreach($css_files as $file) {
+		if(!is_readable($file)) continue;
+
+		$target  = preg_replace('@\.css$@', '.min.css', $file);
+		$content = file_get_contents($file);
+
+		file_put_contents($target, $copyright.CssMin::minify($content, $option));
+		echo '.';
+	}
+	echo " Done\n";
+}
+
+function read_config($dir) {
+	$default = array('option'=>array(), 'skip'=>array(), 'merge'=>array());
+	$file    = $dir.'minify.ini';
+
+	if(!is_readable($file)) return $default;
+
+	$config_str = file_get_contents($file);
+	$config_str = preg_replace_callback('/(\[(?:skip|merge *>> *.+?)\])([\s\S]+?)(?=\[|$)/', 'transform_config_str', $config_str);
+
+	$config = parse_ini_string($config_str, 1);
+	if($config === false) return $default;
+
+	if(is_array($config['skip'])) $config['skip'] = array_keys($config['skip']);
+
+	foreach($config as $section=>$value) {
+		if(preg_match('/merge *>> *(.+)/', $section, $match)) {
+			if(!is_array($config['merge'])) $config['merge'] = array();
+			$config['merge'][trim($match[1])] = array_keys($value);
+
+			unset($config[$section]);
+		}
+	}
+
+	if(is_array($config['option'])) $config = array_merge($config['option'], $config);
+	$config = array_merge($default, $config);
+
+	return $config;
+}
+
+function transform_config_str($matches) {
+	if(!$matches[2]) return $matches[0];
+	$values = preg_replace('/$/m', '=', trim($matches[2]));
+
+	return "{$matches[1]}\n{$values}\n\n";
+}
+
+function merge($files, $target, $base_dir) {
+	if(!is_array($files)) return false;
+
+	$body   = '';
+	$is_css = !!preg_match('/\.css$/', $target);
+
+	foreach($files as $file) {
+		$file = $base_dir.trim($file);
+		if(!is_readable($file)) continue;
+
+		$content = trim(file_get_contents($file));
+		if($is_css && $body) $content = preg_replace('/^@.+?;/m', '', $content);
+		if($content) $body .= $content."\n";
+	}
+
+	if ($body) {
+		$file_count = count($files);
+		echo "  Merging {$file_count} files to create {$target} file...";
+		file_put_contents($base_dir.$target, $body);
+		echo " Done\n";
+	}
+}
+
+function get_target_files($ext, $dir, $files_to_skip) {
+	$files = glob("{$dir}*.{$ext}");
+	$skips = glob("{$dir}*.min.{$ext}");
+	$skips = array_merge($skips, $files_to_skip);
+	$files = array_diff($files, $skips);
+
+	return $files;
+}
+
+function closure_compile($content) {
+	require_once dirname(__FILE__).'/../../classes/httprequest/XEHttpRequest.class.php';
+
+	$req = new XEHttpRequest('closure-compiler.appspot.com', 80);
+	$ret = $req->send('/compile', 'POST', 5, array(
+		'output_info'   => 'compiled_code',
+		'output_format' => 'text',
+		'compilation_level' => 'SIMPLE_OPTIMIZATIONS',
+		'js_code' => $content
+	));
+
+	return $ret->body;
+}
+
+// run main function
+error_reporting(E_ALL & ~E_NOTICE);
+main();
diff --git a/widgets/content/conf/info.xml b/widgets/content/conf/info.xml
index e2033718f..248a8b0ff 100644
--- a/widgets/content/conf/info.xml
+++ b/widgets/content/conf/info.xml
@@ -1,877 +1,877 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget version="0.2">
-    <title xml:lang="ko">Content 위젯</title>
-    <title xml:lang="en">Content</title>
-    <title xml:lang="vi">Nội dung</title>
-    <title xml:lang="ru">Содержание</title>
-    <title xml:lang="zh-CN">全局内容控件</title>
-    <title xml:lang="zh-TW">內容</title>
-    <title xml:lang="jp">コンテンツウィジェット</title>
-    <title xml:lang="tr">İçerik</title>
-    <description xml:lang="ko">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
-    <description xml:lang="en">This widget displays Content such as articles, comments, or attached files.</description>
-    <description xml:lang="vi">Widget này sẽ hiển thị những bài viết, bình luận, File đính kèm.</description>
-    <description xml:lang="ru">This widget displays Content such as articles, comments, or attached files.</description>
-    <description xml:lang="zh-CN">以各种样式显示主题，评论，附件等站内内容的全局控件。</description>
-    <description xml:lang="zh-TW">這個 Widget 可輸出討論板、評論，附加檔案等內容。</description>
-    <description xml:lang="jp">掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。</description>
-    <description xml:lang="tr">Bu görsel bileşen yazılar, yorumlar ve ekli dosyalar gibi içerikleri görüntüler.</description>
-    <version>0.1</version>
-    <date>2009-03-16</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <extra_vars>
-        <group>
-            <title xml:lang="ko">추출 대상</title>
-            <var id="content_type" type="select">
-                <name xml:lang="ko">추출대상</name>
-                <name xml:lang="en">Target</name>
-                <name xml:lang="ru">Target</name>
-                <name xml:lang="vi">Khu vực</name>
-                <name xml:lang="zh-CN">对象</name>
-                <name xml:lang="zh-TW">目標</name>
-                <name xml:lang="jp">抽出対象</name>
-                <name xml:lang="tr">Hedef</name>
-                <options>
-                    <value>document</value>
-                    <name xml:lang="ko">게시물</name>
-                    <name xml:lang="en">Article</name>
-                    <name xml:lang="ru">Article</name>
-                    <name xml:lang="vi">Bài viết</name>
-                    <name xml:lang="zh-CN">主题</name>
-                    <name xml:lang="zh-TW">主題</name>
-                    <name xml:lang="jp">書き込み</name>
-                    <name xml:lang="tr">Yazı</name>
-                </options>
-                <options>
-                    <value>comment</value>
-                    <name xml:lang="ko">댓글</name>
-                    <name xml:lang="en">Comment</name>
-                    <name xml:lang="vi">Bình luận</name>
-                    <name xml:lang="ru">Comment</name>
-                    <name xml:lang="zh-CN">评论</name>
-                    <name xml:lang="zh-TW">評論</name>
-                    <name xml:lang="jp">コメント</name>
-                    <name xml:lang="tr">Yorum</name>
-                </options>
-                <options>
-                    <value>image</value>
-                    <name xml:lang="ko">첨부이미지</name>
-                    <name xml:lang="en">Attached Image</name>
-                    <name xml:lang="vi">Hình đính kèm</name>
-                    <name xml:lang="ru">Attached Image</name>
-                    <name xml:lang="zh-CN">图片</name>
-                    <name xml:lang="zh-TW">圖片</name>
-                    <name xml:lang="jp">添付イメージ</name>
-                    <name xml:lang="tr">Ekli Görüntü</name>
-                </options>
-                <options>
-                    <value>trackback</value>
-                    <name xml:lang="ko">트랙백</name>
-                    <name xml:lang="en">Trackback</name>
-                    <name xml:lang="vi">Liên kết Web</name>
-                    <name xml:lang="ru">Trackback</name>
-                    <name xml:lang="zh-CN">引用</name>
-                    <name xml:lang="zh-TW">引用</name>
-                    <name xml:lang="jp">トラックバック</name>
-                    <name xml:lang="tr">Geri İzleme</name>
-                </options>
-                <options>
-                    <value>rss</value>
-                    <name xml:lang="ko">피드 (RSS/ATOM)</name>
-                    <name xml:lang="en">Feed (RSS/ATOM)</name>
-                    <name xml:lang="vi">Feed (RSS/ATOM)</name>
-                    <name xml:lang="ru">Feed (RSS/ATOM)</name>
-                    <name xml:lang="zh-CN">Feed (RSS/ATOM)</name>
-                    <name xml:lang="zh-TW">Feed (RSS/ATOM)</name>
-                    <name xml:lang="jp">Feed (RSS/ATOM)</name>
-                    <name xml:lang="tr">Feed (RSS/ATOM)</name>
-                </options>
-            </var>
-            <var id="module_srls">
-                <type>module_srl_list</type>
-                <name xml:lang="ko">대상 모듈</name>
-                <name xml:lang="zh-CN">对象模块</name>
-                <name xml:lang="jp">モジュール</name>
-                <name xml:lang="en">Target Module</name>
-                <name xml:lang="vi">Chèn Module</name>
-                <name xml:lang="es">Módulo Objetivo</name>
-                <name xml:lang="ru">Модуль назначения</name>
-                <name xml:lang="zh-TW">目標模組</name>
-                <name xml:lang="tr">Hedef Modül</name>
-                <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-                <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
-                <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
-                <description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
-                <description xml:lang="vi">Những bài viết sẽ được phân loại và hiển thị khi có bài mới gửi trong những Module đã chọn.</description>
-                <description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
-                <description xml:lang="ru">Записи будут отсортированы в выбранном модуле</description>
-                <description xml:lang="zh-TW">把所選擇的模組作為目標。</description>
-                <description xml:lang="tr">Sıralanacak hedef yazılar seçili modüle gönderilenlerdir.</description>
-            </var>
-            <var id="list_type">
-                <type>select</type>
-                <name xml:lang="ko">내용형태</name>
-                <name xml:lang="en">Content Type</name>
-                <name xml:lang="vi">Kiểu hiển thị</name>
-                <name xml:lang="ru">Content Type</name>
-                <name xml:lang="zh-CN">内容样式</name>
-                <name xml:lang="zh-TW">內容樣式</name>
-                <name xml:lang="jp">内容のタイプ</name>
-                <name xml:lang="tr">İçerik Türü</name>
-                <options>
-                    <value>normal</value>
-                    <name xml:lang="ko">제목</name>
-                    <name xml:lang="en">Title</name>
-                    <name xml:lang="vi">Tiêu đề</name>
-                    <name xml:lang="ru">Title</name>
-                    <name xml:lang="zh-CN">标题</name>
-                    <name xml:lang="zh-TW">標題</name>
-                    <name xml:lang="jp">タイトル</name>
-                    <name xml:lang="tr">Başlık</name>
-                </options>
-                <options>
-                    <value>image_title</value>
-                    <name xml:lang="ko">이미지+제목</name>
-                    <name xml:lang="en">Image+Title</name>
-                    <name xml:lang="vi">Hình ảnh+Tiêu đề</name>
-                    <name xml:lang="ru">Image+Title</name>
-                    <name xml:lang="zh-CN">图片+标题</name>
-                    <name xml:lang="zh-TW">圖片+標題</name>
-                    <name xml:lang="jp">画像+タイトル</name>
-                    <name xml:lang="tr">Resim+Başlık</name>
-                </options>
-                <options>
-                    <value>image_title_content</value>
-                    <name xml:lang="ko">이미지+제목+내용</name>
-                    <name xml:lang="en">Image+Title+Content</name>
-                    <name xml:lang="vi">Hình ảnh+Tiêu đề+Nội dung</name>
-                    <name xml:lang="ru">Image+Title+Content</name>
-                    <name xml:lang="zh-CN">图片+标题+内容</name>
-                    <name xml:lang="zh-TW">圖片+標題+內容</name>
-                    <name xml:lang="jp">画像+タイトル+内容</name>
-                    <name xml:lang="tr">Resim+Başlık+İçerik</name>
-                </options>
-                <options>
-                    <value>gallery</value>
-                    <name xml:lang="ko">갤러리</name>
-                    <name xml:lang="en">Gallery</name>
-                    <name xml:lang="vi">Slide Show</name>
-                    <name xml:lang="ru">Gallery</name>
-                    <name xml:lang="zh-CN">相册</name>
-                    <name xml:lang="zh-TW">相簿</name>
-                    <name xml:lang="jp">ギャラリー</name>
-                    <name xml:lang="tr">Galeri</name>
-                </options>
-            </var>
-            <var id="tab_type">
-                <type>select</type>
-                <name xml:lang="ko">탭형태</name>
-                <name xml:lang="en">Tab Type</name>
-                <name xml:lang="vi">Kiểu Tab</name>
-                <name xml:lang="ru">Tab Type</name>
-                <name xml:lang="zh-CN">选项卡样式</name>
-                <name xml:lang="zh-TW">分頁樣式</name>
-                <name xml:lang="jp">タブのスタイル</name>
-                <name xml:lang="tr">Sekme Türü</name>
-                <options>
-                    <value>none</value>
-                    <name xml:lang="ko">없음</name>
-                    <name xml:lang="en">None</name>
-                    <name xml:lang="vi">Không</name>
-                    <name xml:lang="ru">None</name>
-                    <name xml:lang="zh-CN">无</name>
-                    <name xml:lang="zh-TW">無</name>
-                    <name xml:lang="jp">なし</name>
-                    <name xml:lang="tr">Hiçbiri</name>
-                </options>
-                <options>
-                    <value>tab_top</value>
-                    <name xml:lang="ko">상단 탭형</name>
-                    <name xml:lang="en">Upper Tab Type</name>
-                    <name xml:lang="vi">Kiểu Tab trên</name>
-                    <name xml:lang="ru">Upper Tab Type</name>
-                    <name xml:lang="zh-CN">顶端选项卡</name>
-                    <name xml:lang="zh-TW">頂端分頁</name>
-                    <name xml:lang="jp">上段配置型タブ</name>
-                    <name xml:lang="tr">Üst Sekme Türü</name>
-                </options>
-                <options>
-                    <value>tab_left</value>
-                    <name xml:lang="ko">왼쪽 탭형</name>
-                    <name xml:lang="en">Left Tab Type</name>
-                    <name xml:lang="vi">Kiểu Tab trái</name>
-                    <name xml:lang="ru">Left Tab Type</name>
-                    <name xml:lang="zh-CN">左侧选项卡</name>
-                    <name xml:lang="zh-TW">左側分頁</name>
-                    <name xml:lang="jp">左側の配置型タブ</name>
-                    <name xml:lang="tr">Sol Sekme Türü</name>
-                </options>
-            </var>
-            <var id="markup_type" type="select">
-                <name xml:lang="ko">HTML 출력 방식</name>
-                <name xml:lang="jp">HTML表示タイプ</name>
-                <name xml:lang="zh-CN">HTML 출력 방식</name>
-                <name xml:lang="en">HTML Display Type</name>
-                <name xml:lang="vi">Hiển thị kiểu HTML</name>
-                <name xml:lang="ru">Тип отображения HTML</name>
-                <name xml:lang="zh-TW">HTML 樣式選擇</name>
-                <name xml:lang="tr">HTML Ekran Tipi</name>
-                <description xml:lang="ko">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
-                <description xml:lang="jp">TABLE(表)タグとUL(リスト型)タグを選択して表示します。(デフォールトはTABLE)</description>
-                <description xml:lang="zh-CN">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
-                <description xml:lang="en">You can choose TABLE tag or UL tag to display. (default is TABLE)</description>
-                <description xml:lang="vi">Bạn có thể chọn Table Tag hay UL Tag để hiển thị. (Mặc định là Table)</description>
-                <description xml:lang="ru">You can choose TABLE tag or UL tag to display. (default is TABLE)</description>
-                <description xml:lang="zh-TW">可選擇 TABLE(表格) 或 UL(列表) 樣式。(預設是 TABLE 樣式)</description>
-                <description xml:lang="tr">Görüntülemek için Tablo etiketini veya UL etiketini seçebilirsiniz. (varsayılan değer Tablo etiketidir)</description>
-                <options>
-                    <value>table</value>
-                    <name xml:lang="ko">Table</name>
-                    <name xml:lang="jp">Table</name>
-                    <name xml:lang="zh-CN">Table</name>
-                    <name xml:lang="en">Table</name>
-                    <name xml:lang="vi">Table</name>
-                    <name xml:lang="ru">Таблица</name>
-                    <name xml:lang="zh-TW">Table</name>
-                    <name xml:lang="tr">Tablo</name>
-                </options>
-                <options>
-                    <value>list</value>
-                    <name xml:lang="ko">UL (list)</name>
-                    <name xml:lang="jp">UL (list)</name>
-                    <name xml:lang="zh-CN">UL (list)</name>
-                    <name xml:lang="en">UL (list)</name>
-                    <name xml:lang="vi">UL (Danh sách)</name>
-                    <name xml:lang="ru">UL (list)</name>
-                    <name xml:lang="zh-TW">UL (list)</name>
-                    <name xml:lang="tr">UL (list)</name>
-                </options>
-            </var>
-            <var id="list_count" type="text">
-                <name xml:lang="ko">목록수</name>
-                <name xml:lang="zh-CN">目录数</name>
-                <name xml:lang="jp">リスト数</name>
-                <name xml:lang="en">Number of Lists</name>
-                <name xml:lang="vi">Số bài hiển thị</name>
-                <name xml:lang="es">Número de la lista</name>
-                <name xml:lang="ru">Число списка</name>
-                <name xml:lang="zh-TW">目錄數</name>
-                <name xml:lang="tr">Liste Sayısı</name>
-                <description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
-                <description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
-                <description xml:lang="jp">出力するリスト数を指定します（デフォルト5個）。</description>
-                <description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
-                <description xml:lang="vi">Bạn có thể đặt số bài hiển thị. (Mặc định là 5)</description>
-                <description xml:lang="es">Usted puede definir el número de los documentos a mostrar. (predefinido: 5)</description>
-                <description xml:lang="ru">Вы можете выбрать число списка (стандарт: 5)</description>
-                <description xml:lang="zh-TW">設置要顯示的目錄數。(預設是5個)</description>
-                <description xml:lang="tr">Görüntülenecek yazıların sayısını ayarlayabilirsiniz. (varsayılan değer 5'tir)</description>
-            </var>
-            <var id="cols_list_count" type="text">
-                <name xml:lang="ko">가로 이미지 수</name>
-                <name xml:lang="jp">横並びイメージ数</name>
-                <name xml:lang="zh-CN">横向图片数</name>
-                <name xml:lang="en">Number of Images</name>
-                <name xml:lang="vi">Số hình</name>
-                <name xml:lang="es">Número de imágenes</name>
-                <name xml:lang="ru">Число изображений по горизонтали</name>
-                <name xml:lang="zh-TW">橫向圖片數</name>
-                <name xml:lang="tr">Resim Sayısı</name>
-                <description xml:lang="ko">출력될 가로 이미지의 수를 정하실 수 있습니다. (기본 5개)</description>
-                <description xml:lang="jp">表示する横並びのイメージ数を指定します（デフォルト5個）。</description>
-                <description xml:lang="zh-CN">可以指定要显示的横向图片个数。(默认为5个)</description>
-                <description xml:lang="en">You can set the number of images to display. (5 as default)</description>
-                <description xml:lang="vi">Bạnc ó thể đặt số hình ảnh sẽ hiển thị. (Mặc định là 5 hình)</description>
-                <description xml:lang="es">Usted puede definir el múmero de imágenes a mostrar. (predefinido: 5)</description>
-                <description xml:lang="ru">Вы можете установить число изображений по горизонтали (стандарт: 5)</description>
-                <description xml:lang="zh-TW">指定要顯示的橫向圖片數。(預設是5個)</description>
-                <description xml:lang="tr">Görüntülenecek resimlerin sayısını ayarlayabilirsiniz. (Varsayılan değer 5'tir.)</description>
-            </var>
-            <var id="page_count" type="select">
-                <name xml:lang="ko">페이지 수</name>
-                <name xml:lang="en">Page</name>
-                <name xml:lang="zh-CN">分页</name>
-                <name xml:lang="zh-TW">頁數</name>
-                <name xml:lang="ru">Число страниц</name>
-                <name xml:lang="vi">Trang</name>
-                <name xml:lang="jp">ページ数</name>
-                <name xml:lang="tr">Sayfa</name>
-                <options>
-                    <value>1</value>
-                    <name xml:lang="ko">1</name>
-                    <name xml:lang="en">1</name>
-                    <name xml:lang="zh-CN">1</name>
-                    <name xml:lang="zh-TW">1</name>
-                    <name xml:lang="ru">1</name>
-                    <name xml:lang="vi">1</name>
-                    <name xml:lang="jp">1</name>
-                    <name xml:lang="tr">1</name>
-                </options>
-                <options>
-                    <value>2</value>
-                    <name xml:lang="ko">2</name>
-                    <name xml:lang="en">2</name>
-                    <name xml:lang="zh-CN">2</name>
-                    <name xml:lang="zh-TW">2</name>
-                    <name xml:lang="ru">2</name>
-                    <name xml:lang="vi">2</name>
-                    <name xml:lang="jp">2</name>
-                    <name xml:lang="tr">2</name>
-                </options>
-                <options>
-                    <value>3</value>
-                    <name xml:lang="ko">3</name>
-                    <name xml:lang="en">3</name>
-                    <name xml:lang="zh-CN">3</name>
-                    <name xml:lang="zh-TW">3</name>
-                    <name xml:lang="ru">3</name>
-                    <name xml:lang="vi">3</name>
-                    <name xml:lang="jp">3</name>
-                    <name xml:lang="tr">3</name>
-                </options>
-                <description xml:lang="ko">페이지수 2이상일 경우 이전/다음 버튼이 나타납니다.</description>
-                <description xml:lang="en">Prev/Next buttons will appear when there are more than 2 pages.</description>
-                <description xml:lang="zh-CN">分页数在2以上时，将会出现上一页/下一页按钮。</description>
-                <description xml:lang="zh-TW">頁數在2以上時，會出現上一頁/下一頁按鈕。</description>
-                <description xml:lang="ru">Prev/Next buttons will appear when there are more than 2 pages.</description>
-                <description xml:lang="vi">Nút bấm "Trang trước/Trang sau" sẽ xuất hiện khi có từ 2 trang trở lên.</description>
-                <description xml:lang="jp">ページ数が2枚以上の場合、前へ/次へのボタンが現れます。</description>
-                <description xml:lang="tr">Önceki/Sonraki düğmeleri sayfa sayısı 2den  daha fazla olunca belirir.</description>
-            </var>
-            <var id="subject_cut_size" type="text">
-                <name xml:lang="ko">제목 글자수</name>
-                <name xml:lang="jp">タイトルの文字数</name>
-                <name xml:lang="zh-CN">标题字数</name>
-                <name xml:lang="en">Length of Subject</name>
-                <name xml:lang="vi">Độ dài tiêu đề</name>
-                <name xml:lang="es">Número de letras del título</name>
-                <name xml:lang="ru">Длина темы</name>
-                <name xml:lang="zh-TW">標題字數</name>
-                <name xml:lang="tr">Konu Uzunluğu</name>
-                <description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
-                <description xml:lang="jp">タイトルの文字数を設定します（「0」または空欄の場合は、文字数を制限しません）。</description>
-                <description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
-                <description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
-                <description xml:lang="vi">Có thể tăng thêm chiều dài của tiêu đề. (Đặt là 0 hoặc để trống nếu không giới hạn tiêu đề).</description>
-                <description xml:lang="es">El largo del título puede ser asignado. (valor 0 o en blanco no restringe el largo)</description>
-                <description xml:lang="ru">Длина темы может быть установлена. (0 или пустое значение не будут ограничивать длину)</description>
-                <description xml:lang="zh-TW">可設置標題的字數。(0或留白為不限制)</description>
-                <description xml:lang="tr">Konu uzunluğu belirlenebilir. (0 veya boşluk değeri uzunluğu sınırlandırmaz)</description>
-            </var>
-            <var id="content_cut_size" type="text">
-                <name xml:lang="ko">내용 글자수</name>
-                <name xml:lang="en">Length of Content</name>
-                <name xml:lang="vi">Độ dài nội dung</name>
-                <name xml:lang="jp">内容の文字数</name>
-                <name xml:lang="zh-CN">内容摘要字数</name>
-                <name xml:lang="zh-TW">內容字數</name>
-                <name xml:lang="tr">İçerik Uzunluğu</name>
-            </var>
-        </group>
-
-        <group>
-            <title xml:lang="ko">목록 상세 설정</title>
-            <var id="option_view" type="select-multi-order">
-                <name xml:lang="ko">표시항목 및 순서</name>
-                <name xml:lang="en">Display Target and Order</name>
-                <name xml:lang="vi">Hiển thị khu vực và thứ tự</name>
-                <name xml:lang="zh-CN">显示项及顺序</name>
-                <name xml:lang="zh-TW">顯示項目順序</name>
-                <name xml:lang="jp">表示項目、および順番</name>
-                <name xml:lang="tr">Gösterim Hedefi ve Dizilimi</name>
-                <options default="false" init="true">
-                    <value>title</value>
-                    <name xml:lang="ko">제목</name>
-                    <name xml:lang="en">Title</name>
-                    <name xml:lang="vi">Tiêu đề</name>
-                    <name xml:lang="ru">Title</name>
-                    <name xml:lang="zh-CN">标题</name>
-                    <name xml:lang="zh-TW">標題</name>
-                    <name xml:lang="jp">タイトル</name>
-                    <name xml:lang="tr">Başlık</name>
-                </options>
-                <options>
-                    <value>thumbnail</value>
-                    <name xml:lang="ko">섬네일</name>
-                    <name xml:lang="en">Thumbnail</name>
-                    <name xml:lang="vi">Hình nhỏ</name>
-                    <name xml:lang="ru">Thumbnail</name>
-                    <name xml:lang="zh-CN">缩略图</name>
-                    <name xml:lang="zh-TW">縮圖</name>
-                    <name xml:lang="jp">サムネール</name>
-                    <name xml:lang="tr">Küçük Resim</name>
-                </options>
-                <options init="true">
-                    <value>regdate</value>
-                    <name xml:lang="ko">등록일</name>
-                    <name xml:lang="en">Regdate</name>
-                    <name xml:lang="vi">Ngày gửi</name>
-                    <name xml:lang="ru">Regdate</name>
-                    <name xml:lang="zh-CN">发布日期</name>
-                    <name xml:lang="zh-TW">發表日期</name>
-                    <name xml:lang="jp">登録日</name>
-                    <name xml:lang="tr">Kayıt Zamanı</name>
-                </options>
-                <options init="true">
-                    <value>nickname</value>
-                    <name xml:lang="ko">글쓴이</name>
-                    <name xml:lang="en">Author</name>
-                    <name xml:lang="vi">Người gửi</name>
-                    <name xml:lang="ru">Author</name>
-                    <name xml:lang="zh-CN">发布者</name>
-                    <name xml:lang="zh-TW">作者</name>
-                    <name xml:lang="jp">登録者</name>
-                    <name xml:lang="tr">Yazar</name>
-                </options>
-                <options>
-                    <value>content</value>
-                    <name xml:lang="ko">내용</name>
-                    <name xml:lang="en">Content</name>
-                    <name xml:lang="ru">Content</name>
-                    <name xml:lang="vi">Nội dung</name>
-                    <name xml:lang="zh-CN">内容</name>
-                    <name xml:lang="zh-TW">內容</name>
-                    <name xml:lang="jp">内容</name>
-                    <name xml:lang="tr">İçerik</name>
-                </options>
-            </var>
-
-            <var id="show_browser_title" type="select">
-                <name xml:lang="ko">게시판 이름 표시</name>
-                <name xml:lang="en">Display Article Name</name>
-                <name xml:lang="vi">Tên bài viết</name>
-                <name xml:lang="ru">Display Article Name</name>
-                <name xml:lang="zh-CN">显示版面名称</name>
-                <name xml:lang="zh-TW">討論板名稱</name>
-                <name xml:lang="jp">掲示板名の表示</name>
-                <name xml:lang="tr">Makale İsmini Görüntüle</name>
-                <options>
-                    <value>Y</value>
-                    <name xml:lang="ko">출력</name>
-                    <name xml:lang="en">Display</name>
-                    <name xml:lang="vi">Hiển thị</name>
-                    <name xml:lang="ru">Display</name>
-                    <name xml:lang="zh-CN">显示</name>
-                    <name xml:lang="zh-TW">顯示</name>
-                    <name xml:lang="jp">表示</name>
-                    <name xml:lang="tr">Görüntüle</name>
-                </options>
-                <options>
-                    <value>N</value>
-                    <name xml:lang="ko">출력하지 않음</name>
-                    <name xml:lang="en">No Display</name>
-                    <name xml:lang="vi">Không hiển thị</name>
-                    <name xml:lang="ru">No Display</name>
-                    <name xml:lang="zh-CN">不显示</name>
-                    <name xml:lang="zh-TW">不顯示</name>
-                    <name xml:lang="jp">表示しない</name>
-                    <name xml:lang="tr">Görüntüleme</name>
-                </options>
-            </var>
-
-            <var id="show_comment_count" type="select">
-                <name xml:lang="ko">댓글수 표시</name>
-                <name xml:lang="en">Comment Count</name>
-                <name xml:lang="vi">Số bình luận</name>
-                <name xml:lang="ru">Comment Count</name>
-                <name xml:lang="zh-CN">显示评论数</name>
-                <name xml:lang="zh-TW">評論數</name>
-                <name xml:lang="jp">コメント数</name>
-                <name xml:lang="tr">Yorum Sayısı</name>
-                <options>
-                    <value>Y</value>
-                    <name xml:lang="ko">출력</name>
-                    <name xml:lang="en">Display</name>
-                    <name xml:lang="vi">Hiển thị</name>
-                    <name xml:lang="ru">Display</name>
-                    <name xml:lang="zh-CN">显示</name>
-                    <name xml:lang="zh-TW">顯示</name>
-                    <name xml:lang="jp">表示</name>
-                    <name xml:lang="tr">Görüntüle</name>
-                </options>
-                <options>
-                    <value>N</value>
-                    <name xml:lang="ko">출력하지 않음</name>
-                    <name xml:lang="en">No Display</name>
-                    <name xml:lang="vi">Không hiển thị</name>
-                    <name xml:lang="ru">No Display</name>
-                    <name xml:lang="zh-CN">不显示</name>
-                    <name xml:lang="zh-TW">不顯示</name>
-                    <name xml:lang="jp">表示しない</name>
-                    <name xml:lang="tr">Görüntüleme</name>
-                </options>
-            </var>
-
-            <var id="show_trackback_count" type="select">
-                <name xml:lang="ko">엮인글수 표시</name>
-                <name xml:lang="en">Trackback</name>
-                <name xml:lang="vi">Liên kết Web</name>
-                <name xml:lang="ru">Trackback</name>
-                <name xml:lang="zh-CN">显示引用数</name>
-                <name xml:lang="zh-TW">引用數</name>
-                <name xml:lang="jp">トラックバック数の表示</name>
-                <name xml:lang="tr">Geri İzlenim</name>
-                <options>
-                    <value>Y</value>
-                    <name xml:lang="ko">출력</name>
-                    <name xml:lang="en">Display</name>
-                    <name xml:lang="vi">Hiển thị</name>
-                    <name xml:lang="ru">Display</name>
-                    <name xml:lang="zh-CN">显示</name>
-                    <name xml:lang="zh-TW">顯示</name>
-                    <name xml:lang="jp">表示</name>
-                    <name xml:lang="tr">Görüntüle</name>
-                </options>
-                <options>
-                    <value>N</value>
-                    <name xml:lang="ko">출력하지 않음</name>
-                    <name xml:lang="en">No Display</name>
-                    <name xml:lang="vi">Không hiển thị</name>
-                    <name xml:lang="ru">No Display</name>
-                    <name xml:lang="zh-CN">不显示</name>
-                    <name xml:lang="zh-TW">不顯示</name>
-                    <name xml:lang="jp">表示しない</name>
-                    <name xml:lang="tr">Görüntüleme</name>
-                </options>
-            </var>
-            <var id="show_category" type="select">
-                <name xml:lang="ko">분류 표시</name>
-                <name xml:lang="en">Category</name>
-                <name xml:lang="vi">Thể loại</name>
-                <name xml:lang="ru">Категория</name>
-                <name xml:lang="zh-CN">显示分类</name>
-                <name xml:lang="zh-TW">分類</name>
-                <name xml:lang="jp">カテゴリ表示</name>
-                <name xml:lang="tr">Kategori</name>
-                <options>
-                    <value>Y</value>
-                    <name xml:lang="ko">출력</name>
-                    <name xml:lang="en">Display</name>
-                    <name xml:lang="vi">Hiển thị</name>
-                    <name xml:lang="ru">Display</name>
-                    <name xml:lang="zh-CN">显示</name>
-                    <name xml:lang="zh-TW">顯示</name>
-                    <name xml:lang="jp">表示</name>
-                    <name xml:lang="tr">Görüntüle</name>
-                </options>
-                <options>
-                    <value>N</value>
-                    <name xml:lang="ko">출력하지 않음</name>
-                    <name xml:lang="en">No Display</name>
-                    <name xml:lang="vi">Không hiển thị</name>
-                    <name xml:lang="ru">No Display</name>
-                    <name xml:lang="zh-CN">不显示</name>
-                    <name xml:lang="zh-TW">不顯示</name>
-                    <name xml:lang="jp">表示しない</name>
-                    <name xml:lang="tr">Görüntüleme</name>
-                </options>
-            </var>
-            <var id="show_icon" type="select">
-                <name xml:lang="ko">아이콘 표시</name>
-                <name xml:lang="en">Icon</name>
-                <name xml:lang="vi">Icon</name>
-                <name xml:lang="ru">Иконка</name>
-                <name xml:lang="zh-CN">显示图标</name>
-                <name xml:lang="zh-TW">圖示</name>
-                <name xml:lang="jp">アイコン表示</name>
-                <name xml:lang="tr">Simge</name>
-                <options>
-                    <value>Y</value>
-                    <name xml:lang="ko">출력</name>
-                    <name xml:lang="en">Display</name>
-                    <name xml:lang="vi">Hiển thị</name>
-                    <name xml:lang="ru">Display</name>
-                    <name xml:lang="zh-CN">显示</name>
-                    <name xml:lang="zh-TW">顯示</name>
-                    <name xml:lang="jp">表示</name>
-                    <name xml:lang="tr">Görüntüle</name>
-                </options>
-                <options>
-                    <value>N</value>
-                    <name xml:lang="ko">출력하지 않음</name>
-                    <name xml:lang="en">No Display</name>
-                    <name xml:lang="vi">Không hiển thị</name>
-                    <name xml:lang="ru">No Display</name>
-                    <name xml:lang="zh-CN">不显示</name>
-                    <name xml:lang="zh-TW">不顯示</name>
-                    <name xml:lang="jp">表示しない</name>
-                    <name xml:lang="tr">Görüntüleme</name>
-                </options>
-            </var>
-            <var id="duration_new" type="text">
-                <name xml:lang="ko">new 표시 시간 (hours)</name>
-                <name xml:lang="zh-CN">new图标显示时间(hours)</name>
-                <name xml:lang="jp">Newの表示時間 (Hours)</name>
-                <name xml:lang="en">Duration of indication for new item</name>
-                <name xml:lang="vi">Chỉ định thời gian</name>
-                <name xml:lang="ru">Длительность индикации для новых объектов</name>
-                <name xml:lang="zh-TW">new圖案顯示時間(hours)</name>
-                <name xml:lang="tr">Yeni öğe için gösterim süresi</name>
-                <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. (시간 단위)</description>
-                <description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
-                <description xml:lang="jp">新しく登録された書き込みに対して「New」の表示時間を指定します（時間単位）。</description>
-                <description xml:lang="en">You may set the duration of indication for fresh item. (unit is hour)</description>
-                <description xml:lang="vi">Bạn có thể chỉ định thời gian cho làm mới. (Đơn vị tính bằng giờ)</description>
-                <description xml:lang="ru">Вы можете установить длительность индикации для нового объекта. (единица - час)</description>
-                <description xml:lang="zh-TW">可設置最新主題的 new 圖案顯示時間。</description>
-                <description xml:lang="tr">Yeni öğe için gösterim süresini ayarlayabilirsiniz. (birim olarak saat kullanılır)</description>
-            </var>
-        </group>
-
-        <group>
-        <title xml:lang="ko">정렬</title>
-            <var id="order_target" type="select">
-                <name xml:lang="ko">정렬 대상</name>
-                <name xml:lang="zh-CN">排序对象</name>
-                <name xml:lang="jp">ソート対象</name>
-                <name xml:lang="en">Target to be sorted</name>
-                <name xml:lang="vi">Phân loại</name>
-                <name xml:lang="es">Objetivo para ser ordenados</name>
-                <name xml:lang="ru">Предмет для сортировки</name>
-                <name xml:lang="zh-TW">排列順序</name>
-                <name xml:lang="tr">Sıralanacak Hedef</name>
-                <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
-                <description xml:lang="zh-CN">可以按照指定的顺序进行排序。</description>
-                <description xml:lang="jp">登録順、または変更順にソートします。</description>
-                <description xml:lang="en">The list of newewst articles may be sorted by submitted order or modified order.</description>
-                <description xml:lang="vi">Danh sách bài viết mới nhất có thể được được phân loại bởi danh sách đã gửi hay đã sửa.</description>
-                <description xml:lang="es">La lista de los documentos recientes pueden ser ordenados en el orden del agregado o en el de modificados.</description>
-                <description xml:lang="ru">Список последних статей может быть отсортирован по дате размещения или изменения.</description>
-                <description xml:lang="zh-TW">按照指定的順序進行排列。</description>
-                <description xml:lang="tr">En yeni yazıların listesi, teslim edilme sırasına veya değişiklik sırasına göre sıralanabilir.</description>
-                <options>
-                    <value>list_order</value>
-                    <name xml:lang="ko">최신 등록순</name>
-                    <name xml:lang="zh-CN">最新发表顺</name>
-                    <name xml:lang="jp">最新登録順</name>
-                    <name xml:lang="en">Newest Submitted Order</name>
-                    <name xml:lang="vi">Bài mới gửi</name>
-                    <name xml:lang="es">Orden de agregados recientemente</name>
-                    <name xml:lang="ru">Порядок последних записей</name>
-                    <name xml:lang="zh-TW">最新發表</name>
-                    <name xml:lang="tr">En yeni gönderim sırası</name>
-                </options>
-                <options>
-                    <value>update_order</value>
-                    <name xml:lang="ko">최근 변경순</name>
-                    <name xml:lang="zh-CN">最新修改顺</name>
-                    <name xml:lang="jp">最新変更順</name>
-                    <name xml:lang="en">Newest Modified Order</name>
-                    <name xml:lang="vi">Bài mới sửa</name>
-                    <name xml:lang="es">Orden de modificados recientemente</name>
-                    <name xml:lang="ru">Порядок последних измененных записей</name>
-                    <name xml:lang="zh-TW">最新修改</name>
-                    <name xml:lang="tr">En yeni değiştirilme sırası</name>
-                </options>
-            </var>
-            <var id="order_type" type="select">
-                <name xml:lang="ko">정렬 방법</name>
-                <name xml:lang="zh-CN">排序方式</name>
-                <name xml:lang="jp">ソートタイプ</name>
-                <name xml:lang="en">Sorting Type</name>
-                <name xml:lang="vi">Kiểu sắp xếp</name>
-                <name xml:lang="es">Tipo de ordenamiento</name>
-                <name xml:lang="ru">Тип сортировки</name>
-                <name xml:lang="zh-TW">排列方式</name>
-                 <name xml:lang="tr">Sıralama Tipi</name>
-                <description xml:lang="ko">정렬대상을 내림차순 또는 올림차순으로 정렬할 수 있습니다.</description>
-                <description xml:lang="zh-CN">对其排序对象可进行升序/降序方式排序。</description>
-                <description xml:lang="jp">ソートタイプを、降順、または昇順に設定します。</description>
-                <description xml:lang="en">You can sort target articles by ascending or descending order.</description>
-                <description xml:lang="vi">Bạn có thể phân loại bài viết theo kiểu tăng hay giảm.</description>
-                <description xml:lang="es">Usted puede ordenar los documentos en orden acendente o en orden descendente.</description>
-                <description xml:lang="ru">Вы можете сортировать статьи в порядке возрастания или убывания.</description>
-                <description xml:lang="zh-TW">可選擇升冪/降冪的方式對所選目標進行排列。</description>
-                <description xml:lang="tr">Hedef yazıları artan veya azalan sırasına göre sıralayabilirsiniz.</description>
-                <options>
-                    <value>desc</value>
-                    <name xml:lang="ko">내림차순</name>
-                    <name xml:lang="zh-CN">降序</name>
-                    <name xml:lang="jp">降順</name>
-                    <name xml:lang="en">Descending order</name>
-                    <name xml:lang="vi">Giảm dần</name>
-                    <name xml:lang="es">Orden Descendente</name>
-                    <name xml:lang="ru">По убыванию</name>
-                    <name xml:lang="zh-TW">降冪</name>
-                    <name xml:lang="tr">Azalan sıra</name>
-                </options>
-                <options>
-                    <value>asc</value>
-                    <name xml:lang="ko">올림차순</name>
-                    <name xml:lang="zh-CN">升序</name>
-                    <name xml:lang="jp">昇順</name>
-                    <name xml:lang="en">Ascending order</name>
-                    <name xml:lang="vi">Tăng dần</name>
-                    <name xml:lang="es">Orden Acendente</name>
-                    <name xml:lang="ru">По возрастанию</name>
-                    <name xml:lang="zh-TW">升冪</name>
-                    <name xml:lang="tr">Artan sıra</name>
-                </options>
-            </var>
-        </group>
-
-        <group>
-        <title xml:lang="ko">썸네일</title>
-
-            <var id="thumbnail_type" type="select">
-                <name xml:lang="ko">썸네일 생성 방법</name>
-                <name xml:lang="jp">サムネール生成方法</name>
-                <name xml:lang="zh-CN">缩略图生成方式</name>
-                <name xml:lang="en">Thumbnail Type</name>
-                <name xml:lang="vi">Hình nhỏ</name>
-                <name xml:lang="ru">Тип миниатюры</name>
-                <name xml:lang="zh-TW">縮圖建立方式</name>
-                <name xml:lang="tr">Küçük resim türü</name>
-                <description xml:lang="ko">썸네일 생성 방법을 선택할 수 있습니다. (crop : 꽉 채우기, ratio : 비율 맞추기)</description>
-                <description xml:lang="jp">サムネールの生成方法を選択します(Crop : 刈り込み, Ratio : 比率)。</description>
-                <description xml:lang="zh-CN">可以选择缩略图生成方式。 (crop : 裁减, ratio : 比例)</description>
-                <description xml:lang="en">Thumbnail Type may be set here.</description>
-                <description xml:lang="vi">Có thể đặt kiểu hình nhỏ tại đây.</description>
-                <description xml:lang="ru">Тип миниатюры может быть установлен здесь.</description>
-                <description xml:lang="zh-TW">可選擇縮圖建立方式。(crop : 裁減, ratio : 比例)</description>
-                <description xml:lang="tr">Küçük resim türünü burada ayarlayabilirsiniz.</description>
-                <options>
-                    <value>crop</value>
-                    <name xml:lang="ko">Crop (채우기)</name>
-                    <name xml:lang="jp">Crop (刈り込み)</name>
-                    <name xml:lang="zh-CN">Crop (裁减)</name>
-                    <name xml:lang="en">Crop</name>
-                    <name xml:lang="vi">Hình cắt</name>
-                    <name xml:lang="ru">Crop (Обрезание)</name>
-                    <name xml:lang="zh-TW">Crop (裁減)</name>
-                    <name xml:lang="tr">Kırp</name>
-                </options>
-                <options>
-                    <value>ratio</value>
-                    <name xml:lang="ko">Ratio (비율 맞추기)</name>
-                    <name xml:lang="jp">Ratio (比率)</name>
-                    <name xml:lang="zh-CN">Ratio (比例)</name>
-                    <name xml:lang="en">Ratio</name>
-                    <name xml:lang="vi">Tỉ lệ</name>
-                    <name xml:lang="ru">Ratio (Отношение)</name>
-                    <name xml:lang="zh-TW">Ratio (比例)</name>
-                    <name xml:lang="tr">Oran</name>
-                </options>
-            </var>
-            <var id="thumbnail_width" type="text">
-                <name xml:lang="ko">이미지 가로크기</name>
-                <name xml:lang="jp">イメージ横幅サイズ</name>
-                <name xml:lang="zh-CN">宽度</name>
-                <name xml:lang="en">Width of Image</name>
-                <name xml:lang="vi">Độ rộng</name>
-                <name xml:lang="es">Ancho de la imagen</name>
-                <name xml:lang="ru">Ширина изображения</name>
-                <name xml:lang="zh-TW">圖片寬度</name>
-                <name xml:lang="tr">Resim Genişliği</name>
-                <description xml:lang="ko">출력될 이미지의 가로크기를 정하실 수 있습니다. (기본 100)</description>
-                <description xml:lang="jp">表示するイメージの横幅サイズを指定します（デフォルト100）。</description>
-                <description xml:lang="zh-CN">可以指定要显示的图片宽度。(默认为100)</description>
-                <description xml:lang="en">You can set the width of image. (100 as default)</description>
-                <description xml:lang="vi">Bạn có thể đặt độ rộng của hình. (Mặc định là 100px)</description>
-                <description xml:lang="es">Usted puede definir el ancho de la imagen. (predefinido:100px)</description>
-                <description xml:lang="ru">Вы можете установить ширину изображения(стандарт: 100px)</description>
-                <description xml:lang="zh-TW">指定顯示的圖片寬度。(預設是100)</description>
-                <description xml:lang="tr">Resim genişliğini ayarlayabilirsiniz. (Varsayılan değer 100'dür.)</description>
-            </var>
-            <var id="thumbnail_height" type="text">
-                <name xml:lang="ko">이미지 세로크기</name>
-                <name xml:lang="jp">イメージ縦幅サイズ</name>
-                <name xml:lang="zh-CN">高度</name>
-                <name xml:lang="en">Height of Image</name>
-                <name xml:lang="vi">Độ cao</name>
-                <name xml:lang="ru">Высота изображения</name>
-                <name xml:lang="zh-TW">圖片高度</name>
-                <name xml:lang="tr">Resim Yüksekliği</name>
-                <description xml:lang="ko">이미지의 세로 크기를 지정할 수 있습니다. (기본 75)</description>
-                <description xml:lang="jp">イメージの縦幅サイズを指定します（デフォルト 75px）</description>
-                <description xml:lang="zh-CN">可以指定图片高度。(默认为75px)</description>
-                <description xml:lang="en">You can set the height of image. (75 as default)</description>
-                <description xml:lang="vi">Bạn có thể đặt độ cao của hình. (Mặc định là 75px)</description>
-                <description xml:lang="ru">Вы можете установить высоту изображения (стандарт: 75px)</description>
-                <description xml:lang="zh-TW">指定圖片高度。(預設是75px)</description>
-                <description xml:lang="tr">Resim yüksekliğini ayarlayabilirsiniz. (varsayılan değer 75'tir)</description>
-            </var>
-        </group>
-
-        <group>
-        <title xml:lang="ko">RSS 설정</title>
-            <var id="rss_url0" type="text">
-                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-                <description xml:lang="ko">피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다.
-                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-                <description xml:lang="en">Feed address will be registered only in case of required document type.
-                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-                <description xml:lang="zh-CN">请输入RSS格式地址。
-                (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-                <description xml:lang="vi">Chỉ hỗ trợ những định dạng được dăng kí. (RSS 2.0 RSS 1.0 ATOM 1.0).</description>
-                <description xml:lang="ru">Feed(RSS/ATOM) URL может быть зарегистрирован только в случае предлагаемом типе документа
-                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-                <description xml:lang="jp">RSS URLはタイプが RSSの時だけ登録出来ます。
-                (サポートする文書形式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-                <description xml:lang="zh-TW">請輸入 RSS 位址。
-                (支援檔案格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-                <description xml:lang="tr">Besleme adresi sadece gerekli belge türü halinde kaydedilecek.
-                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-            </var>
-            <var id="rss_url1" type="text">
-                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-            </var>
-            <var id="rss_url2" type="text">
-                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-            </var>
-            <var id="rss_url3" type="text">
-                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-            </var>
-            <var id="rss_url4" type="text">
-                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-            </var>
-        </group>
-    </extra_vars>
-</widget>
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">Content 위젯</title>
+    <title xml:lang="en">Content</title>
+    <title xml:lang="vi">Nội dung</title>
+    <title xml:lang="ru">Содержание</title>
+    <title xml:lang="zh-CN">全局内容控件</title>
+    <title xml:lang="zh-TW">內容</title>
+    <title xml:lang="jp">コンテンツウィジェット</title>
+    <title xml:lang="tr">İçerik</title>
+    <description xml:lang="ko">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
+    <description xml:lang="en">This widget displays Content such as articles, comments, or attached files.</description>
+    <description xml:lang="vi">Widget này sẽ hiển thị những bài viết, bình luận, File đính kèm.</description>
+    <description xml:lang="ru">This widget displays Content such as articles, comments, or attached files.</description>
+    <description xml:lang="zh-CN">以各种样式显示主题，评论，附件等站内内容的全局控件。</description>
+    <description xml:lang="zh-TW">這個 Widget 可輸出討論板、評論，附加檔案等內容。</description>
+    <description xml:lang="jp">掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。</description>
+    <description xml:lang="tr">Bu görsel bileşen yazılar, yorumlar ve ekli dosyalar gibi içerikleri görüntüler.</description>
+    <version>0.1</version>
+    <date>2009-03-16</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <extra_vars>
+        <group>
+            <title xml:lang="ko">추출 대상</title>
+            <var id="content_type" type="select">
+                <name xml:lang="ko">추출대상</name>
+                <name xml:lang="en">Target</name>
+                <name xml:lang="ru">Target</name>
+                <name xml:lang="vi">Khu vực</name>
+                <name xml:lang="zh-CN">对象</name>
+                <name xml:lang="zh-TW">目標</name>
+                <name xml:lang="jp">抽出対象</name>
+                <name xml:lang="tr">Hedef</name>
+                <options>
+                    <value>document</value>
+                    <name xml:lang="ko">게시물</name>
+                    <name xml:lang="en">Article</name>
+                    <name xml:lang="ru">Article</name>
+                    <name xml:lang="vi">Bài viết</name>
+                    <name xml:lang="zh-CN">主题</name>
+                    <name xml:lang="zh-TW">主題</name>
+                    <name xml:lang="jp">書き込み</name>
+                    <name xml:lang="tr">Yazı</name>
+                </options>
+                <options>
+                    <value>comment</value>
+                    <name xml:lang="ko">댓글</name>
+                    <name xml:lang="en">Comment</name>
+                    <name xml:lang="vi">Bình luận</name>
+                    <name xml:lang="ru">Comment</name>
+                    <name xml:lang="zh-CN">评论</name>
+                    <name xml:lang="zh-TW">評論</name>
+                    <name xml:lang="jp">コメント</name>
+                    <name xml:lang="tr">Yorum</name>
+                </options>
+                <options>
+                    <value>image</value>
+                    <name xml:lang="ko">첨부이미지</name>
+                    <name xml:lang="en">Attached Image</name>
+                    <name xml:lang="vi">Hình đính kèm</name>
+                    <name xml:lang="ru">Attached Image</name>
+                    <name xml:lang="zh-CN">图片</name>
+                    <name xml:lang="zh-TW">圖片</name>
+                    <name xml:lang="jp">添付イメージ</name>
+                    <name xml:lang="tr">Ekli Görüntü</name>
+                </options>
+                <options>
+                    <value>trackback</value>
+                    <name xml:lang="ko">트랙백</name>
+                    <name xml:lang="en">Trackback</name>
+                    <name xml:lang="vi">Liên kết Web</name>
+                    <name xml:lang="ru">Trackback</name>
+                    <name xml:lang="zh-CN">引用</name>
+                    <name xml:lang="zh-TW">引用</name>
+                    <name xml:lang="jp">トラックバック</name>
+                    <name xml:lang="tr">Geri İzleme</name>
+                </options>
+                <options>
+                    <value>rss</value>
+                    <name xml:lang="ko">피드 (RSS/ATOM)</name>
+                    <name xml:lang="en">Feed (RSS/ATOM)</name>
+                    <name xml:lang="vi">Feed (RSS/ATOM)</name>
+                    <name xml:lang="ru">Feed (RSS/ATOM)</name>
+                    <name xml:lang="zh-CN">Feed (RSS/ATOM)</name>
+                    <name xml:lang="zh-TW">Feed (RSS/ATOM)</name>
+                    <name xml:lang="jp">Feed (RSS/ATOM)</name>
+                    <name xml:lang="tr">Feed (RSS/ATOM)</name>
+                </options>
+            </var>
+            <var id="module_srls">
+                <type>module_srl_list</type>
+                <name xml:lang="ko">대상 모듈</name>
+                <name xml:lang="zh-CN">对象模块</name>
+                <name xml:lang="jp">モジュール</name>
+                <name xml:lang="en">Target Module</name>
+                <name xml:lang="vi">Chèn Module</name>
+                <name xml:lang="es">Módulo Objetivo</name>
+                <name xml:lang="ru">Модуль назначения</name>
+                <name xml:lang="zh-TW">目標模組</name>
+                <name xml:lang="tr">Hedef Modül</name>
+                <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
+                <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
+                <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
+                <description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
+                <description xml:lang="vi">Những bài viết sẽ được phân loại và hiển thị khi có bài mới gửi trong những Module đã chọn.</description>
+                <description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
+                <description xml:lang="ru">Записи будут отсортированы в выбранном модуле</description>
+                <description xml:lang="zh-TW">把所選擇的模組作為目標。</description>
+                <description xml:lang="tr">Sıralanacak hedef yazılar seçili modüle gönderilenlerdir.</description>
+            </var>
+            <var id="list_type">
+                <type>select</type>
+                <name xml:lang="ko">내용형태</name>
+                <name xml:lang="en">Content Type</name>
+                <name xml:lang="vi">Kiểu hiển thị</name>
+                <name xml:lang="ru">Content Type</name>
+                <name xml:lang="zh-CN">内容样式</name>
+                <name xml:lang="zh-TW">內容樣式</name>
+                <name xml:lang="jp">内容のタイプ</name>
+                <name xml:lang="tr">İçerik Türü</name>
+                <options>
+                    <value>normal</value>
+                    <name xml:lang="ko">제목</name>
+                    <name xml:lang="en">Title</name>
+                    <name xml:lang="vi">Tiêu đề</name>
+                    <name xml:lang="ru">Title</name>
+                    <name xml:lang="zh-CN">标题</name>
+                    <name xml:lang="zh-TW">標題</name>
+                    <name xml:lang="jp">タイトル</name>
+                    <name xml:lang="tr">Başlık</name>
+                </options>
+                <options>
+                    <value>image_title</value>
+                    <name xml:lang="ko">이미지+제목</name>
+                    <name xml:lang="en">Image+Title</name>
+                    <name xml:lang="vi">Hình ảnh+Tiêu đề</name>
+                    <name xml:lang="ru">Image+Title</name>
+                    <name xml:lang="zh-CN">图片+标题</name>
+                    <name xml:lang="zh-TW">圖片+標題</name>
+                    <name xml:lang="jp">画像+タイトル</name>
+                    <name xml:lang="tr">Resim+Başlık</name>
+                </options>
+                <options>
+                    <value>image_title_content</value>
+                    <name xml:lang="ko">이미지+제목+내용</name>
+                    <name xml:lang="en">Image+Title+Content</name>
+                    <name xml:lang="vi">Hình ảnh+Tiêu đề+Nội dung</name>
+                    <name xml:lang="ru">Image+Title+Content</name>
+                    <name xml:lang="zh-CN">图片+标题+内容</name>
+                    <name xml:lang="zh-TW">圖片+標題+內容</name>
+                    <name xml:lang="jp">画像+タイトル+内容</name>
+                    <name xml:lang="tr">Resim+Başlık+İçerik</name>
+                </options>
+                <options>
+                    <value>gallery</value>
+                    <name xml:lang="ko">갤러리</name>
+                    <name xml:lang="en">Gallery</name>
+                    <name xml:lang="vi">Slide Show</name>
+                    <name xml:lang="ru">Gallery</name>
+                    <name xml:lang="zh-CN">相册</name>
+                    <name xml:lang="zh-TW">相簿</name>
+                    <name xml:lang="jp">ギャラリー</name>
+                    <name xml:lang="tr">Galeri</name>
+                </options>
+            </var>
+            <var id="tab_type">
+                <type>select</type>
+                <name xml:lang="ko">탭형태</name>
+                <name xml:lang="en">Tab Type</name>
+                <name xml:lang="vi">Kiểu Tab</name>
+                <name xml:lang="ru">Tab Type</name>
+                <name xml:lang="zh-CN">选项卡样式</name>
+                <name xml:lang="zh-TW">分頁樣式</name>
+                <name xml:lang="jp">タブのスタイル</name>
+                <name xml:lang="tr">Sekme Türü</name>
+                <options>
+                    <value>none</value>
+                    <name xml:lang="ko">없음</name>
+                    <name xml:lang="en">None</name>
+                    <name xml:lang="vi">Không</name>
+                    <name xml:lang="ru">None</name>
+                    <name xml:lang="zh-CN">无</name>
+                    <name xml:lang="zh-TW">無</name>
+                    <name xml:lang="jp">なし</name>
+                    <name xml:lang="tr">Hiçbiri</name>
+                </options>
+                <options>
+                    <value>tab_top</value>
+                    <name xml:lang="ko">상단 탭형</name>
+                    <name xml:lang="en">Upper Tab Type</name>
+                    <name xml:lang="vi">Kiểu Tab trên</name>
+                    <name xml:lang="ru">Upper Tab Type</name>
+                    <name xml:lang="zh-CN">顶端选项卡</name>
+                    <name xml:lang="zh-TW">頂端分頁</name>
+                    <name xml:lang="jp">上段配置型タブ</name>
+                    <name xml:lang="tr">Üst Sekme Türü</name>
+                </options>
+                <options>
+                    <value>tab_left</value>
+                    <name xml:lang="ko">왼쪽 탭형</name>
+                    <name xml:lang="en">Left Tab Type</name>
+                    <name xml:lang="vi">Kiểu Tab trái</name>
+                    <name xml:lang="ru">Left Tab Type</name>
+                    <name xml:lang="zh-CN">左侧选项卡</name>
+                    <name xml:lang="zh-TW">左側分頁</name>
+                    <name xml:lang="jp">左側の配置型タブ</name>
+                    <name xml:lang="tr">Sol Sekme Türü</name>
+                </options>
+            </var>
+            <var id="markup_type" type="select">
+                <name xml:lang="ko">HTML 출력 방식</name>
+                <name xml:lang="jp">HTML表示タイプ</name>
+                <name xml:lang="zh-CN">HTML 출력 방식</name>
+                <name xml:lang="en">HTML Display Type</name>
+                <name xml:lang="vi">Hiển thị kiểu HTML</name>
+                <name xml:lang="ru">Тип отображения HTML</name>
+                <name xml:lang="zh-TW">HTML 樣式選擇</name>
+                <name xml:lang="tr">HTML Ekran Tipi</name>
+                <description xml:lang="ko">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
+                <description xml:lang="jp">TABLE(表)タグとUL(リスト型)タグを選択して表示します。(デフォールトはTABLE)</description>
+                <description xml:lang="zh-CN">TABLE(표)태그와 UL(목록형) 태그를 선택하여 출력하게 할 수 있습니다. (기본은 TABLE입니다)</description>
+                <description xml:lang="en">You can choose TABLE tag or UL tag to display. (default is TABLE)</description>
+                <description xml:lang="vi">Bạn có thể chọn Table Tag hay UL Tag để hiển thị. (Mặc định là Table)</description>
+                <description xml:lang="ru">You can choose TABLE tag or UL tag to display. (default is TABLE)</description>
+                <description xml:lang="zh-TW">可選擇 TABLE(表格) 或 UL(列表) 樣式。(預設是 TABLE 樣式)</description>
+                <description xml:lang="tr">Görüntülemek için Tablo etiketini veya UL etiketini seçebilirsiniz. (varsayılan değer Tablo etiketidir)</description>
+                <options>
+                    <value>table</value>
+                    <name xml:lang="ko">Table</name>
+                    <name xml:lang="jp">Table</name>
+                    <name xml:lang="zh-CN">Table</name>
+                    <name xml:lang="en">Table</name>
+                    <name xml:lang="vi">Table</name>
+                    <name xml:lang="ru">Таблица</name>
+                    <name xml:lang="zh-TW">Table</name>
+                    <name xml:lang="tr">Tablo</name>
+                </options>
+                <options>
+                    <value>list</value>
+                    <name xml:lang="ko">UL (list)</name>
+                    <name xml:lang="jp">UL (list)</name>
+                    <name xml:lang="zh-CN">UL (list)</name>
+                    <name xml:lang="en">UL (list)</name>
+                    <name xml:lang="vi">UL (Danh sách)</name>
+                    <name xml:lang="ru">UL (list)</name>
+                    <name xml:lang="zh-TW">UL (list)</name>
+                    <name xml:lang="tr">UL (list)</name>
+                </options>
+            </var>
+            <var id="list_count" type="text">
+                <name xml:lang="ko">목록수</name>
+                <name xml:lang="zh-CN">目录数</name>
+                <name xml:lang="jp">リスト数</name>
+                <name xml:lang="en">Number of Lists</name>
+                <name xml:lang="vi">Số bài hiển thị</name>
+                <name xml:lang="es">Número de la lista</name>
+                <name xml:lang="ru">Число списка</name>
+                <name xml:lang="zh-TW">目錄數</name>
+                <name xml:lang="tr">Liste Sayısı</name>
+                <description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
+                <description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
+                <description xml:lang="jp">出力するリスト数を指定します（デフォルト5個）。</description>
+                <description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
+                <description xml:lang="vi">Bạn có thể đặt số bài hiển thị. (Mặc định là 5)</description>
+                <description xml:lang="es">Usted puede definir el número de los documentos a mostrar. (predefinido: 5)</description>
+                <description xml:lang="ru">Вы можете выбрать число списка (стандарт: 5)</description>
+                <description xml:lang="zh-TW">設置要顯示的目錄數。(預設是5個)</description>
+                <description xml:lang="tr">Görüntülenecek yazıların sayısını ayarlayabilirsiniz. (varsayılan değer 5'tir)</description>
+            </var>
+            <var id="cols_list_count" type="text">
+                <name xml:lang="ko">가로 이미지 수</name>
+                <name xml:lang="jp">横並びイメージ数</name>
+                <name xml:lang="zh-CN">横向图片数</name>
+                <name xml:lang="en">Number of Images</name>
+                <name xml:lang="vi">Số hình</name>
+                <name xml:lang="es">Número de imágenes</name>
+                <name xml:lang="ru">Число изображений по горизонтали</name>
+                <name xml:lang="zh-TW">橫向圖片數</name>
+                <name xml:lang="tr">Resim Sayısı</name>
+                <description xml:lang="ko">출력될 가로 이미지의 수를 정하실 수 있습니다. (기본 5개)</description>
+                <description xml:lang="jp">表示する横並びのイメージ数を指定します（デフォルト5個）。</description>
+                <description xml:lang="zh-CN">可以指定要显示的横向图片个数。(默认为5个)</description>
+                <description xml:lang="en">You can set the number of images to display. (5 as default)</description>
+                <description xml:lang="vi">Bạnc ó thể đặt số hình ảnh sẽ hiển thị. (Mặc định là 5 hình)</description>
+                <description xml:lang="es">Usted puede definir el múmero de imágenes a mostrar. (predefinido: 5)</description>
+                <description xml:lang="ru">Вы можете установить число изображений по горизонтали (стандарт: 5)</description>
+                <description xml:lang="zh-TW">指定要顯示的橫向圖片數。(預設是5個)</description>
+                <description xml:lang="tr">Görüntülenecek resimlerin sayısını ayarlayabilirsiniz. (Varsayılan değer 5'tir.)</description>
+            </var>
+            <var id="page_count" type="select">
+                <name xml:lang="ko">페이지 수</name>
+                <name xml:lang="en">Page</name>
+                <name xml:lang="zh-CN">分页</name>
+                <name xml:lang="zh-TW">頁數</name>
+                <name xml:lang="ru">Число страниц</name>
+                <name xml:lang="vi">Trang</name>
+                <name xml:lang="jp">ページ数</name>
+                <name xml:lang="tr">Sayfa</name>
+                <options>
+                    <value>1</value>
+                    <name xml:lang="ko">1</name>
+                    <name xml:lang="en">1</name>
+                    <name xml:lang="zh-CN">1</name>
+                    <name xml:lang="zh-TW">1</name>
+                    <name xml:lang="ru">1</name>
+                    <name xml:lang="vi">1</name>
+                    <name xml:lang="jp">1</name>
+                    <name xml:lang="tr">1</name>
+                </options>
+                <options>
+                    <value>2</value>
+                    <name xml:lang="ko">2</name>
+                    <name xml:lang="en">2</name>
+                    <name xml:lang="zh-CN">2</name>
+                    <name xml:lang="zh-TW">2</name>
+                    <name xml:lang="ru">2</name>
+                    <name xml:lang="vi">2</name>
+                    <name xml:lang="jp">2</name>
+                    <name xml:lang="tr">2</name>
+                </options>
+                <options>
+                    <value>3</value>
+                    <name xml:lang="ko">3</name>
+                    <name xml:lang="en">3</name>
+                    <name xml:lang="zh-CN">3</name>
+                    <name xml:lang="zh-TW">3</name>
+                    <name xml:lang="ru">3</name>
+                    <name xml:lang="vi">3</name>
+                    <name xml:lang="jp">3</name>
+                    <name xml:lang="tr">3</name>
+                </options>
+                <description xml:lang="ko">페이지수 2이상일 경우 이전/다음 버튼이 나타납니다.</description>
+                <description xml:lang="en">Prev/Next buttons will appear when there are more than 2 pages.</description>
+                <description xml:lang="zh-CN">分页数在2以上时，将会出现上一页/下一页按钮。</description>
+                <description xml:lang="zh-TW">頁數在2以上時，會出現上一頁/下一頁按鈕。</description>
+                <description xml:lang="ru">Prev/Next buttons will appear when there are more than 2 pages.</description>
+                <description xml:lang="vi">Nút bấm "Trang trước/Trang sau" sẽ xuất hiện khi có từ 2 trang trở lên.</description>
+                <description xml:lang="jp">ページ数が2枚以上の場合、前へ/次へのボタンが現れます。</description>
+                <description xml:lang="tr">Önceki/Sonraki düğmeleri sayfa sayısı 2den  daha fazla olunca belirir.</description>
+            </var>
+            <var id="subject_cut_size" type="text">
+                <name xml:lang="ko">제목 글자수</name>
+                <name xml:lang="jp">タイトルの文字数</name>
+                <name xml:lang="zh-CN">标题字数</name>
+                <name xml:lang="en">Length of Subject</name>
+                <name xml:lang="vi">Độ dài tiêu đề</name>
+                <name xml:lang="es">Número de letras del título</name>
+                <name xml:lang="ru">Длина темы</name>
+                <name xml:lang="zh-TW">標題字數</name>
+                <name xml:lang="tr">Konu Uzunluğu</name>
+                <description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
+                <description xml:lang="jp">タイトルの文字数を設定します（「0」または空欄の場合は、文字数を制限しません）。</description>
+                <description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
+                <description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
+                <description xml:lang="vi">Có thể tăng thêm chiều dài của tiêu đề. (Đặt là 0 hoặc để trống nếu không giới hạn tiêu đề).</description>
+                <description xml:lang="es">El largo del título puede ser asignado. (valor 0 o en blanco no restringe el largo)</description>
+                <description xml:lang="ru">Длина темы может быть установлена. (0 или пустое значение не будут ограничивать длину)</description>
+                <description xml:lang="zh-TW">可設置標題的字數。(0或留白為不限制)</description>
+                <description xml:lang="tr">Konu uzunluğu belirlenebilir. (0 veya boşluk değeri uzunluğu sınırlandırmaz)</description>
+            </var>
+            <var id="content_cut_size" type="text">
+                <name xml:lang="ko">내용 글자수</name>
+                <name xml:lang="en">Length of Content</name>
+                <name xml:lang="vi">Độ dài nội dung</name>
+                <name xml:lang="jp">内容の文字数</name>
+                <name xml:lang="zh-CN">内容摘要字数</name>
+                <name xml:lang="zh-TW">內容字數</name>
+                <name xml:lang="tr">İçerik Uzunluğu</name>
+            </var>
+        </group>
+
+        <group>
+            <title xml:lang="ko">목록 상세 설정</title>
+            <var id="option_view" type="select-multi-order">
+                <name xml:lang="ko">표시항목 및 순서</name>
+                <name xml:lang="en">Display Target and Order</name>
+                <name xml:lang="vi">Hiển thị khu vực và thứ tự</name>
+                <name xml:lang="zh-CN">显示项及顺序</name>
+                <name xml:lang="zh-TW">顯示項目順序</name>
+                <name xml:lang="jp">表示項目、および順番</name>
+                <name xml:lang="tr">Gösterim Hedefi ve Dizilimi</name>
+                <options default="false" init="true">
+                    <value>title</value>
+                    <name xml:lang="ko">제목</name>
+                    <name xml:lang="en">Title</name>
+                    <name xml:lang="vi">Tiêu đề</name>
+                    <name xml:lang="ru">Title</name>
+                    <name xml:lang="zh-CN">标题</name>
+                    <name xml:lang="zh-TW">標題</name>
+                    <name xml:lang="jp">タイトル</name>
+                    <name xml:lang="tr">Başlık</name>
+                </options>
+                <options>
+                    <value>thumbnail</value>
+                    <name xml:lang="ko">섬네일</name>
+                    <name xml:lang="en">Thumbnail</name>
+                    <name xml:lang="vi">Hình nhỏ</name>
+                    <name xml:lang="ru">Thumbnail</name>
+                    <name xml:lang="zh-CN">缩略图</name>
+                    <name xml:lang="zh-TW">縮圖</name>
+                    <name xml:lang="jp">サムネール</name>
+                    <name xml:lang="tr">Küçük Resim</name>
+                </options>
+                <options init="true">
+                    <value>regdate</value>
+                    <name xml:lang="ko">등록일</name>
+                    <name xml:lang="en">Regdate</name>
+                    <name xml:lang="vi">Ngày gửi</name>
+                    <name xml:lang="ru">Regdate</name>
+                    <name xml:lang="zh-CN">发布日期</name>
+                    <name xml:lang="zh-TW">發表日期</name>
+                    <name xml:lang="jp">登録日</name>
+                    <name xml:lang="tr">Kayıt Zamanı</name>
+                </options>
+                <options init="true">
+                    <value>nickname</value>
+                    <name xml:lang="ko">글쓴이</name>
+                    <name xml:lang="en">Author</name>
+                    <name xml:lang="vi">Người gửi</name>
+                    <name xml:lang="ru">Author</name>
+                    <name xml:lang="zh-CN">发布者</name>
+                    <name xml:lang="zh-TW">作者</name>
+                    <name xml:lang="jp">登録者</name>
+                    <name xml:lang="tr">Yazar</name>
+                </options>
+                <options>
+                    <value>content</value>
+                    <name xml:lang="ko">내용</name>
+                    <name xml:lang="en">Content</name>
+                    <name xml:lang="ru">Content</name>
+                    <name xml:lang="vi">Nội dung</name>
+                    <name xml:lang="zh-CN">内容</name>
+                    <name xml:lang="zh-TW">內容</name>
+                    <name xml:lang="jp">内容</name>
+                    <name xml:lang="tr">İçerik</name>
+                </options>
+            </var>
+
+            <var id="show_browser_title" type="select">
+                <name xml:lang="ko">게시판 이름 표시</name>
+                <name xml:lang="en">Display Article Name</name>
+                <name xml:lang="vi">Tên bài viết</name>
+                <name xml:lang="ru">Display Article Name</name>
+                <name xml:lang="zh-CN">显示版面名称</name>
+                <name xml:lang="zh-TW">討論板名稱</name>
+                <name xml:lang="jp">掲示板名の表示</name>
+                <name xml:lang="tr">Makale İsmini Görüntüle</name>
+                <options>
+                    <value>Y</value>
+                    <name xml:lang="ko">출력</name>
+                    <name xml:lang="en">Display</name>
+                    <name xml:lang="vi">Hiển thị</name>
+                    <name xml:lang="ru">Display</name>
+                    <name xml:lang="zh-CN">显示</name>
+                    <name xml:lang="zh-TW">顯示</name>
+                    <name xml:lang="jp">表示</name>
+                    <name xml:lang="tr">Görüntüle</name>
+                </options>
+                <options>
+                    <value>N</value>
+                    <name xml:lang="ko">출력하지 않음</name>
+                    <name xml:lang="en">No Display</name>
+                    <name xml:lang="vi">Không hiển thị</name>
+                    <name xml:lang="ru">No Display</name>
+                    <name xml:lang="zh-CN">不显示</name>
+                    <name xml:lang="zh-TW">不顯示</name>
+                    <name xml:lang="jp">表示しない</name>
+                    <name xml:lang="tr">Görüntüleme</name>
+                </options>
+            </var>
+
+            <var id="show_comment_count" type="select">
+                <name xml:lang="ko">댓글수 표시</name>
+                <name xml:lang="en">Comment Count</name>
+                <name xml:lang="vi">Số bình luận</name>
+                <name xml:lang="ru">Comment Count</name>
+                <name xml:lang="zh-CN">显示评论数</name>
+                <name xml:lang="zh-TW">評論數</name>
+                <name xml:lang="jp">コメント数</name>
+                <name xml:lang="tr">Yorum Sayısı</name>
+                <options>
+                    <value>Y</value>
+                    <name xml:lang="ko">출력</name>
+                    <name xml:lang="en">Display</name>
+                    <name xml:lang="vi">Hiển thị</name>
+                    <name xml:lang="ru">Display</name>
+                    <name xml:lang="zh-CN">显示</name>
+                    <name xml:lang="zh-TW">顯示</name>
+                    <name xml:lang="jp">表示</name>
+                    <name xml:lang="tr">Görüntüle</name>
+                </options>
+                <options>
+                    <value>N</value>
+                    <name xml:lang="ko">출력하지 않음</name>
+                    <name xml:lang="en">No Display</name>
+                    <name xml:lang="vi">Không hiển thị</name>
+                    <name xml:lang="ru">No Display</name>
+                    <name xml:lang="zh-CN">不显示</name>
+                    <name xml:lang="zh-TW">不顯示</name>
+                    <name xml:lang="jp">表示しない</name>
+                    <name xml:lang="tr">Görüntüleme</name>
+                </options>
+            </var>
+
+            <var id="show_trackback_count" type="select">
+                <name xml:lang="ko">엮인글수 표시</name>
+                <name xml:lang="en">Trackback</name>
+                <name xml:lang="vi">Liên kết Web</name>
+                <name xml:lang="ru">Trackback</name>
+                <name xml:lang="zh-CN">显示引用数</name>
+                <name xml:lang="zh-TW">引用數</name>
+                <name xml:lang="jp">トラックバック数の表示</name>
+                <name xml:lang="tr">Geri İzlenim</name>
+                <options>
+                    <value>Y</value>
+                    <name xml:lang="ko">출력</name>
+                    <name xml:lang="en">Display</name>
+                    <name xml:lang="vi">Hiển thị</name>
+                    <name xml:lang="ru">Display</name>
+                    <name xml:lang="zh-CN">显示</name>
+                    <name xml:lang="zh-TW">顯示</name>
+                    <name xml:lang="jp">表示</name>
+                    <name xml:lang="tr">Görüntüle</name>
+                </options>
+                <options>
+                    <value>N</value>
+                    <name xml:lang="ko">출력하지 않음</name>
+                    <name xml:lang="en">No Display</name>
+                    <name xml:lang="vi">Không hiển thị</name>
+                    <name xml:lang="ru">No Display</name>
+                    <name xml:lang="zh-CN">不显示</name>
+                    <name xml:lang="zh-TW">不顯示</name>
+                    <name xml:lang="jp">表示しない</name>
+                    <name xml:lang="tr">Görüntüleme</name>
+                </options>
+            </var>
+            <var id="show_category" type="select">
+                <name xml:lang="ko">분류 표시</name>
+                <name xml:lang="en">Category</name>
+                <name xml:lang="vi">Thể loại</name>
+                <name xml:lang="ru">Категория</name>
+                <name xml:lang="zh-CN">显示分类</name>
+                <name xml:lang="zh-TW">分類</name>
+                <name xml:lang="jp">カテゴリ表示</name>
+                <name xml:lang="tr">Kategori</name>
+                <options>
+                    <value>Y</value>
+                    <name xml:lang="ko">출력</name>
+                    <name xml:lang="en">Display</name>
+                    <name xml:lang="vi">Hiển thị</name>
+                    <name xml:lang="ru">Display</name>
+                    <name xml:lang="zh-CN">显示</name>
+                    <name xml:lang="zh-TW">顯示</name>
+                    <name xml:lang="jp">表示</name>
+                    <name xml:lang="tr">Görüntüle</name>
+                </options>
+                <options>
+                    <value>N</value>
+                    <name xml:lang="ko">출력하지 않음</name>
+                    <name xml:lang="en">No Display</name>
+                    <name xml:lang="vi">Không hiển thị</name>
+                    <name xml:lang="ru">No Display</name>
+                    <name xml:lang="zh-CN">不显示</name>
+                    <name xml:lang="zh-TW">不顯示</name>
+                    <name xml:lang="jp">表示しない</name>
+                    <name xml:lang="tr">Görüntüleme</name>
+                </options>
+            </var>
+            <var id="show_icon" type="select">
+                <name xml:lang="ko">아이콘 표시</name>
+                <name xml:lang="en">Icon</name>
+                <name xml:lang="vi">Icon</name>
+                <name xml:lang="ru">Иконка</name>
+                <name xml:lang="zh-CN">显示图标</name>
+                <name xml:lang="zh-TW">圖示</name>
+                <name xml:lang="jp">アイコン表示</name>
+                <name xml:lang="tr">Simge</name>
+                <options>
+                    <value>Y</value>
+                    <name xml:lang="ko">출력</name>
+                    <name xml:lang="en">Display</name>
+                    <name xml:lang="vi">Hiển thị</name>
+                    <name xml:lang="ru">Display</name>
+                    <name xml:lang="zh-CN">显示</name>
+                    <name xml:lang="zh-TW">顯示</name>
+                    <name xml:lang="jp">表示</name>
+                    <name xml:lang="tr">Görüntüle</name>
+                </options>
+                <options>
+                    <value>N</value>
+                    <name xml:lang="ko">출력하지 않음</name>
+                    <name xml:lang="en">No Display</name>
+                    <name xml:lang="vi">Không hiển thị</name>
+                    <name xml:lang="ru">No Display</name>
+                    <name xml:lang="zh-CN">不显示</name>
+                    <name xml:lang="zh-TW">不顯示</name>
+                    <name xml:lang="jp">表示しない</name>
+                    <name xml:lang="tr">Görüntüleme</name>
+                </options>
+            </var>
+            <var id="duration_new" type="text">
+                <name xml:lang="ko">new 표시 시간 (hours)</name>
+                <name xml:lang="zh-CN">new图标显示时间(hours)</name>
+                <name xml:lang="jp">Newの表示時間 (Hours)</name>
+                <name xml:lang="en">Duration of indication for new item in hours</name>
+                <name xml:lang="vi">Chỉ định thời gian</name>
+                <name xml:lang="ru">Длительность индикации для новых объектов</name>
+                <name xml:lang="zh-TW">new圖案顯示時間(hours)</name>
+                <name xml:lang="tr">Yeni öğe için gösterim süresi</name>
+                <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. (시간 단위)</description>
+                <description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
+                <description xml:lang="jp">新しく登録された書き込みに対して「New」の表示時間を指定します（時間単位）。</description>
+                <description xml:lang="en">You may set the duration of indication for fresh item. (unit is hour)</description>
+                <description xml:lang="vi">Bạn có thể chỉ định thời gian cho làm mới. (Đơn vị tính bằng giờ)</description>
+                <description xml:lang="ru">Вы можете установить длительность индикации для нового объекта. (единица - час)</description>
+                <description xml:lang="zh-TW">可設置最新主題的 new 圖案顯示時間。</description>
+                <description xml:lang="tr">Yeni öğe için gösterim süresini ayarlayabilirsiniz. (birim olarak saat kullanılır)</description>
+            </var>
+        </group>
+
+        <group>
+        <title xml:lang="ko">정렬</title>
+            <var id="order_target" type="select">
+                <name xml:lang="ko">정렬 대상</name>
+                <name xml:lang="zh-CN">排序对象</name>
+                <name xml:lang="jp">ソート対象</name>
+                <name xml:lang="en">Target to be sorted</name>
+                <name xml:lang="vi">Phân loại</name>
+                <name xml:lang="es">Objetivo para ser ordenados</name>
+                <name xml:lang="ru">Предмет для сортировки</name>
+                <name xml:lang="zh-TW">排列順序</name>
+                <name xml:lang="tr">Sıralanacak Hedef</name>
+                <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
+                <description xml:lang="zh-CN">可以按照指定的顺序进行排序。</description>
+                <description xml:lang="jp">登録順、または変更順にソートします。</description>
+                <description xml:lang="en">The list of newewst articles may be sorted by submitted order or modified order.</description>
+                <description xml:lang="vi">Danh sách bài viết mới nhất có thể được được phân loại bởi danh sách đã gửi hay đã sửa.</description>
+                <description xml:lang="es">La lista de los documentos recientes pueden ser ordenados en el orden del agregado o en el de modificados.</description>
+                <description xml:lang="ru">Список последних статей может быть отсортирован по дате размещения или изменения.</description>
+                <description xml:lang="zh-TW">按照指定的順序進行排列。</description>
+                <description xml:lang="tr">En yeni yazıların listesi, teslim edilme sırasına veya değişiklik sırasına göre sıralanabilir.</description>
+                <options>
+                    <value>list_order</value>
+                    <name xml:lang="ko">최신 등록순</name>
+                    <name xml:lang="zh-CN">最新发表顺</name>
+                    <name xml:lang="jp">最新登録順</name>
+                    <name xml:lang="en">Newest Submitted Order</name>
+                    <name xml:lang="vi">Bài mới gửi</name>
+                    <name xml:lang="es">Orden de agregados recientemente</name>
+                    <name xml:lang="ru">Порядок последних записей</name>
+                    <name xml:lang="zh-TW">最新發表</name>
+                    <name xml:lang="tr">En yeni gönderim sırası</name>
+                </options>
+                <options>
+                    <value>update_order</value>
+                    <name xml:lang="ko">최근 변경순</name>
+                    <name xml:lang="zh-CN">最新修改顺</name>
+                    <name xml:lang="jp">最新変更順</name>
+                    <name xml:lang="en">Newest Modified Order</name>
+                    <name xml:lang="vi">Bài mới sửa</name>
+                    <name xml:lang="es">Orden de modificados recientemente</name>
+                    <name xml:lang="ru">Порядок последних измененных записей</name>
+                    <name xml:lang="zh-TW">最新修改</name>
+                    <name xml:lang="tr">En yeni değiştirilme sırası</name>
+                </options>
+            </var>
+            <var id="order_type" type="select">
+                <name xml:lang="ko">정렬 방법</name>
+                <name xml:lang="zh-CN">排序方式</name>
+                <name xml:lang="jp">ソートタイプ</name>
+                <name xml:lang="en">Sorting Type</name>
+                <name xml:lang="vi">Kiểu sắp xếp</name>
+                <name xml:lang="es">Tipo de ordenamiento</name>
+                <name xml:lang="ru">Тип сортировки</name>
+                <name xml:lang="zh-TW">排列方式</name>
+                 <name xml:lang="tr">Sıralama Tipi</name>
+                <description xml:lang="ko">정렬대상을 내림차순 또는 올림차순으로 정렬할 수 있습니다.</description>
+                <description xml:lang="zh-CN">对其排序对象可进行升序/降序方式排序。</description>
+                <description xml:lang="jp">ソートタイプを、降順、または昇順に設定します。</description>
+                <description xml:lang="en">You can sort target articles in ascending or descending order.</description>
+                <description xml:lang="vi">Bạn có thể phân loại bài viết theo kiểu tăng hay giảm.</description>
+                <description xml:lang="es">Usted puede ordenar los documentos en orden acendente o en orden descendente.</description>
+                <description xml:lang="ru">Вы можете сортировать статьи в порядке возрастания или убывания.</description>
+                <description xml:lang="zh-TW">可選擇升冪/降冪的方式對所選目標進行排列。</description>
+                <description xml:lang="tr">Hedef yazıları artan veya azalan sırasına göre sıralayabilirsiniz.</description>
+                <options>
+                    <value>desc</value>
+                    <name xml:lang="ko">내림차순</name>
+                    <name xml:lang="zh-CN">降序</name>
+                    <name xml:lang="jp">降順</name>
+                    <name xml:lang="en">Descending order</name>
+                    <name xml:lang="vi">Giảm dần</name>
+                    <name xml:lang="es">Orden Descendente</name>
+                    <name xml:lang="ru">По убыванию</name>
+                    <name xml:lang="zh-TW">降冪</name>
+                    <name xml:lang="tr">Azalan sıra</name>
+                </options>
+                <options>
+                    <value>asc</value>
+                    <name xml:lang="ko">올림차순</name>
+                    <name xml:lang="zh-CN">升序</name>
+                    <name xml:lang="jp">昇順</name>
+                    <name xml:lang="en">Ascending order</name>
+                    <name xml:lang="vi">Tăng dần</name>
+                    <name xml:lang="es">Orden Acendente</name>
+                    <name xml:lang="ru">По возрастанию</name>
+                    <name xml:lang="zh-TW">升冪</name>
+                    <name xml:lang="tr">Artan sıra</name>
+                </options>
+            </var>
+        </group>
+
+        <group>
+        <title xml:lang="ko">썸네일</title>
+
+            <var id="thumbnail_type" type="select">
+                <name xml:lang="ko">썸네일 생성 방법</name>
+                <name xml:lang="jp">サムネール生成方法</name>
+                <name xml:lang="zh-CN">缩略图生成方式</name>
+                <name xml:lang="en">Thumbnail Type</name>
+                <name xml:lang="vi">Hình nhỏ</name>
+                <name xml:lang="ru">Тип миниатюры</name>
+                <name xml:lang="zh-TW">縮圖建立方式</name>
+                <name xml:lang="tr">Küçük resim türü</name>
+                <description xml:lang="ko">썸네일 생성 방법을 선택할 수 있습니다. (crop : 꽉 채우기, ratio : 비율 맞추기)</description>
+                <description xml:lang="jp">サムネールの生成方法を選択します(Crop : 刈り込み, Ratio : 比率)。</description>
+                <description xml:lang="zh-CN">可以选择缩略图生成方式。 (crop : 裁减, ratio : 比例)</description>
+                <description xml:lang="en">Thumbnail Type may be set here.</description>
+                <description xml:lang="vi">Có thể đặt kiểu hình nhỏ tại đây.</description>
+                <description xml:lang="ru">Тип миниатюры может быть установлен здесь.</description>
+                <description xml:lang="zh-TW">可選擇縮圖建立方式。(crop : 裁減, ratio : 比例)</description>
+                <description xml:lang="tr">Küçük resim türünü burada ayarlayabilirsiniz.</description>
+                <options>
+                    <value>crop</value>
+                    <name xml:lang="ko">Crop (채우기)</name>
+                    <name xml:lang="jp">Crop (刈り込み)</name>
+                    <name xml:lang="zh-CN">Crop (裁减)</name>
+                    <name xml:lang="en">Crop</name>
+                    <name xml:lang="vi">Hình cắt</name>
+                    <name xml:lang="ru">Crop (Обрезание)</name>
+                    <name xml:lang="zh-TW">Crop (裁減)</name>
+                    <name xml:lang="tr">Kırp</name>
+                </options>
+                <options>
+                    <value>ratio</value>
+                    <name xml:lang="ko">Ratio (비율 맞추기)</name>
+                    <name xml:lang="jp">Ratio (比率)</name>
+                    <name xml:lang="zh-CN">Ratio (比例)</name>
+                    <name xml:lang="en">Ratio</name>
+                    <name xml:lang="vi">Tỉ lệ</name>
+                    <name xml:lang="ru">Ratio (Отношение)</name>
+                    <name xml:lang="zh-TW">Ratio (比例)</name>
+                    <name xml:lang="tr">Oran</name>
+                </options>
+            </var>
+            <var id="thumbnail_width" type="text">
+                <name xml:lang="ko">이미지 가로크기</name>
+                <name xml:lang="jp">イメージ横幅サイズ</name>
+                <name xml:lang="zh-CN">宽度</name>
+                <name xml:lang="en">Width of Image</name>
+                <name xml:lang="vi">Độ rộng</name>
+                <name xml:lang="es">Ancho de la imagen</name>
+                <name xml:lang="ru">Ширина изображения</name>
+                <name xml:lang="zh-TW">圖片寬度</name>
+                <name xml:lang="tr">Resim Genişliği</name>
+                <description xml:lang="ko">출력될 이미지의 가로크기를 정하실 수 있습니다. (기본 100)</description>
+                <description xml:lang="jp">表示するイメージの横幅サイズを指定します（デフォルト100）。</description>
+                <description xml:lang="zh-CN">可以指定要显示的图片宽度。(默认为100)</description>
+                <description xml:lang="en">You can set the width of image. (100 as default)</description>
+                <description xml:lang="vi">Bạn có thể đặt độ rộng của hình. (Mặc định là 100px)</description>
+                <description xml:lang="es">Usted puede definir el ancho de la imagen. (predefinido:100px)</description>
+                <description xml:lang="ru">Вы можете установить ширину изображения(стандарт: 100px)</description>
+                <description xml:lang="zh-TW">指定顯示的圖片寬度。(預設是100)</description>
+                <description xml:lang="tr">Resim genişliğini ayarlayabilirsiniz. (Varsayılan değer 100'dür.)</description>
+            </var>
+            <var id="thumbnail_height" type="text">
+                <name xml:lang="ko">이미지 세로크기</name>
+                <name xml:lang="jp">イメージ縦幅サイズ</name>
+                <name xml:lang="zh-CN">高度</name>
+                <name xml:lang="en">Height of Image</name>
+                <name xml:lang="vi">Độ cao</name>
+                <name xml:lang="ru">Высота изображения</name>
+                <name xml:lang="zh-TW">圖片高度</name>
+                <name xml:lang="tr">Resim Yüksekliği</name>
+                <description xml:lang="ko">이미지의 세로 크기를 지정할 수 있습니다. (기본 75)</description>
+                <description xml:lang="jp">イメージの縦幅サイズを指定します（デフォルト 75px）</description>
+                <description xml:lang="zh-CN">可以指定图片高度。(默认为75px)</description>
+                <description xml:lang="en">You can set the height of image. (75 as default)</description>
+                <description xml:lang="vi">Bạn có thể đặt độ cao của hình. (Mặc định là 75px)</description>
+                <description xml:lang="ru">Вы можете установить высоту изображения (стандарт: 75px)</description>
+                <description xml:lang="zh-TW">指定圖片高度。(預設是75px)</description>
+                <description xml:lang="tr">Resim yüksekliğini ayarlayabilirsiniz. (varsayılan değer 75'tir)</description>
+            </var>
+        </group>
+
+        <group>
+        <title xml:lang="ko">RSS 설정</title>
+            <var id="rss_url0" type="text">
+                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="en">Feed (RSS/ATOM) URL</name>
+                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+                <description xml:lang="ko">피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다.
+                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+                <description xml:lang="en">Feed address will be registered only in case of required document type.
+                (Supported document type : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+                <description xml:lang="zh-CN">请输入RSS格式地址。
+                (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+                <description xml:lang="vi">Chỉ hỗ trợ những định dạng được dăng kí. (RSS 2.0 RSS 1.0 ATOM 1.0).</description>
+                <description xml:lang="ru">Feed(RSS/ATOM) URL может быть зарегистрирован только в случае предлагаемом типе документа
+                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+                <description xml:lang="jp">RSS URLはタイプが RSSの時だけ登録出来ます。
+                (サポートする文書形式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+                <description xml:lang="zh-TW">請輸入 RSS 位址。
+                (支援檔案格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+                <description xml:lang="tr">Besleme adresi sadece gerekli belge türü halinde kaydedilecek.
+                (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+            </var>
+            <var id="rss_url1" type="text">
+                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="en">Feed (RSS/ATOM) URL</name>
+                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+            </var>
+            <var id="rss_url2" type="text">
+                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="en">Feed (RSS/ATOM) URL</name>
+                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+            </var>
+            <var id="rss_url3" type="text">
+                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="en">Feed (RSS/ATOM) URL</name>
+                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+            </var>
+            <var id="rss_url4" type="text">
+                <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+                <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="en">Feed (RSS/ATOM) URL</name>
+                <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+                <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+            </var>
+        </group>
+    </extra_vars>
+</widget>
diff --git a/widgets/content/content.class.php b/widgets/content/content.class.php
index aef1d20a5..a2879e76c 100644
--- a/widgets/content/content.class.php
+++ b/widgets/content/content.class.php
@@ -2,79 +2,63 @@
     /**
      * @class content
      * @author NHN (developers@xpressengine.com)
-     * @brief content를 출력하는 위젯
+     * @brief widget to display content
      * @version 0.1
      **/
 
     class content extends WidgetHandler {
 
         /**
-         * @brief 위젯의 실행 부분
+         * @brief Widget handler
          *
-         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
-         * 결과를 만든후 print가 아니라 return 해주어야 한다
+         * Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
+         * After generating the result, do not print but return it.
          **/
 
         function proc($args) {
-            // 정렬 대상
+            // Targets to sort
             if(!in_array($args->order_target, array('list_order','update_order'))) $args->order_target = 'list_order';
-
-            // 정렬 순서
+            // Sort order
             if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = 'asc';
-
-            // 페이지 수
+            // Pages
             $args->page_count = (int)$args->page_count;
             if(!$args->page_count) $args->page_count = 1;
-
-            // 출력된 목록 수
+            // The number of displayed lists
             $args->list_count = (int)$args->list_count;
             if(!$args->list_count) $args->list_count = 5;
-
-            // 섬네일 컬럼 수
+            // The number of thumbnail columns
             $args->cols_list_count = (int)$args->cols_list_count;
             if(!$args->cols_list_count) $args->cols_list_count = 5;
-
-            // 제목 길이 자르기
+            // Cut the length of the title
             if(!$args->subject_cut_size) $args->subject_cut_size = 0;
-
-            // 내용 길이 자르기
+            // Cut the length of contents
             if(!$args->content_cut_size) $args->content_cut_size = 100;
-
-            // 최근 글 표시 시간
+            // Display time of the latest post
             if(!$args->duration_new) $args->duration_new = 12;
-
-            // 섬네일 생성 방법
+            // How to create thumbnails
             if(!$args->thumbnail_type) $args->thumbnail_type = 'crop';
-
-            // 섬네일 가로 크기
+            // Horizontal size of thumbnails
             if(!$args->thumbnail_width) $args->thumbnail_width = 100;
-
-            // 섬네일 세로 크기
+            // Vertical size of thumbnails
             if(!$args->thumbnail_height) $args->thumbnail_height = 75;
-
-            // 보기 옵션
+            // Viewing options
             $args->option_view_arr = explode(',',$args->option_view);
-
-            // markup 옵션
+            // markup options
             if(!$args->markup_type) $args->markup_type = 'table';
-
-            // 내부적으로 쓰이는 변수 설정
+            // Set variables used internally
             $oModuleModel = &getModel('module');
             $module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
             $site_module_info = Context::get('site_module_info');
-
-            // rss 인 경우 URL정리
+            // List URLs if a type is RSS
             if($args->content_type == 'rss'){
                 $args->rss_urls = array();
                 $rss_urls = array_unique(array($args->rss_url0,$args->rss_url1,$args->rss_url2,$args->rss_url3,$args->rss_url4));
                 for($i=0,$c=count($rss_urls);$i<$c;$i++) {
                     if($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
                 }
-
-            // rss가 아닌 XE모듈일 경우 모듈 번호 정리 후 모듈 정보 구함
+            // Get module information after listing module_srls if the module is not RSS
             } else {
-
-                // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
+                // Apply to all modules in the site if a target module is not specified
                 if(!$args->module_srls){
                     unset($obj);
                     $obj->site_srl = (int)$site_module_info->site_srl;
@@ -89,7 +73,7 @@
                     }
 
                     $args->modules_info = $oModuleModel->getMidList($obj);
-                // 대상 모듈이 선택되어 있으면 해당 모듈만 추출
+                // Apply to the module only if a target module is specified
                 } else {
                     $obj->module_srls = $args->module_srls;
                     $output = executeQueryArray('widgets.content.getMids', $obj);
@@ -107,16 +91,15 @@
                         }
                     }
                 }
-
-                // 아무런 모듈도 검색되지 않았다면 종료
+                // Exit if no module is found
                 if(!count($args->modules_info)) return Context::get('msg_not_founded');
                 $args->module_srl = implode(',',$module_srls);
             }
 
             /**
-             * 컨텐츠 추출, 게시글/댓글/엮인글/RSS등 다양한 요소가 있어서 각 method를 따로 만듬
+             * Method is separately made because content extraction, articles, comments, trackbacks, RSS and other elements exist
              **/
-            // tab 형태
+            // tab type
             if($args->tab_type == 'none' || $args->tab_type == '') {
                 switch($args->content_type){
                     case 'comment':
@@ -135,7 +118,7 @@
                             $content_items = $this->_getDocumentItems($args);
                         break;
                 }
-            // tab 형태가 아닐 경우
+            // If not a tab type
             } else {
                 $content_items = array();
 
@@ -175,15 +158,14 @@
         }
 
         /**
-         * @brief 댓글 목록을 추출하여 contentItem으로 return
+         * @brief Get a list of comments and return contentItem
          **/
         function _getCommentItems($args) {
-            // CommentModel::getCommentList()를 이용하기 위한 변수 정리
+            // List variables to use CommentModel::getCommentList()
             $obj->module_srl = $args->module_srl;
             $obj->sort_index = $args->order_target;
             $obj->list_count = $args->list_count * $args->page_count;
-
-            // comment 모듈의 model 객체를 받아서 getCommentList() method를 실행
+            // Get model object of the comment module and execute getCommentList() method
             $oCommentModel = &getModel('comment');
             $output = $oCommentModel->getNewestCommentList($obj);
 
@@ -214,10 +196,9 @@
         }
 
         function _getDocumentItems($args){
-            // document 모듈의 model 객체를 받아서 결과를 객체화 시킴
+            // Get model object from the document module
             $oDocumentModel = &getModel('document');
-
-            // 분류 구함
+            // Get categories
             $obj->module_srl = $args->module_srl;
             $output = executeQueryArray('widgets.content.getCategories',$obj);
             if($output->toBool() && $output->data) {
@@ -225,17 +206,16 @@
                     $category_lists[$val->module_srl][$val->category_srl] = $val;
                 }
             }
-
-            // 글 목록을 구함
+            // Get a list of documents
             $obj->module_srl = $args->module_srl;
             $obj->category_srl = $args->category_srl;
             $obj->sort_index = $args->order_target;
             $obj->order_type = $args->order_type=="desc"?"asc":"desc";
             $obj->list_count = $args->list_count * $args->page_count;
+			$obj->statusList = array('PUBLIC');
             $output = executeQueryArray('widgets.content.getNewestDocuments', $obj);
             if(!$output->toBool() || !$output->data) return;
-
-            // 결과가 있으면 각 문서 객체화를 시킴
+            // If the result exists, make each document as an object
             $content_items = array();
             $first_thumbnail_idx = -1;
             if(count($output->data)) {
@@ -280,16 +260,14 @@
             $obj->module_srls = $obj->module_srl = $args->module_srl;
             $obj->direct_download = 'Y';
             $obj->isvalid = 'Y';
-
-            // 분류 구함
+            // Get categories
             $output = executeQueryArray('widgets.content.getCategories',$obj);
             if($output->toBool() && $output->data) {
                 foreach($output->data as $key => $val) {
                     $category_lists[$val->module_srl][$val->category_srl] = $val;
                 }
             }
-
-            // 정해진 모듈에서 문서별 파일 목록을 구함
+            // Get a file list in each document on the module
             $obj->list_count = $args->list_count * $args->page_count;
             $files_output = executeQueryArray("file.getOneFileInDocument", $obj);
             $files_count = count($files_output->data);
@@ -342,8 +320,7 @@
                     $content_items[] = $content_item;
                 }
             }
-
-            // 탭 형태가 아닐 경우
+            // If it is not a tab type
             if($args->tab_type == 'none' || $args->tab_type == ''){
                 $items = array();
                 foreach($content_items as $key => $val){
@@ -357,8 +334,7 @@
                 if($args->order_type =='asc') ksort($items);
                 else krsort($items);
                 $content_items = array_slice(array_values($items),0,$args->list_count*$args->page_count);
-
-            // 탭 형태
+            // Tab Type
             } else {
                 foreach($content_items as $key=> $content_item_list){
                     $items = array();
@@ -396,34 +372,27 @@
         function _getSummary($content, $str_size = 50)
         {
             $content = preg_replace('!(<br[\s]*/{0,1}>[\s]*)+!is', ' ', $content);
-
-            // </p>, </div>, </li> 등의 태그를 공백 문자로 치환
+            // Replace tags such as </p> , </div> , </li> and others to a whitespace
             $content = str_replace(array('</p>', '</div>', '</li>'), ' ', $content);
-
-            // 태그 제거
+            // Remove Tag
             $content = preg_replace('!<([^>]*?)>!is','', $content);
-
-            // < , > , " 를 치환
+            // Replace tags to <, >, " and whitespace
             $content = str_replace(array('&lt;','&gt;','&quot;','&nbsp;'), array('<','>','"',' '), $content);
-
-            // 연속된 공백문자 삭제
+            // Delete  a series of whitespaces
             $content = preg_replace('/ ( +)/is', ' ', $content);
-
-            // 문자열을 자름
+            // Truncate string
             $content = trim(cut_str($content, $str_size, $tail));
-
-            // >, <, "를 다시 복구
+            // Replace back <, >, " to the original tags
             $content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
-
-            // 영문이 연결될 경우 개행이 안 되는 문제를 해결
+            // Fixed to a newline bug for consecutive sets of English letters
             $content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$content);
             return $content; 
         }
 
 
        /**
-         * @brief rss 주소로 부터 내용을 받아오는 함수
-         * tistory 의 경우 원본 주소가 location 헤더를 뿜는다. (내용은 없음)이를 해결하기 위한 수정 - rss_reader 위젯과 방식 동일
+         * @brief function to receive contents from rss url
+         * For Tistory blog in Korea, the original RSS url has location header without contents. Fixed to work as same as rss_reader widget.
          **/
         function requestFeedContents($rss_url) {
             $rss_url = str_replace('&amp;','&',Context::convertEncodingStr($rss_url));
@@ -431,7 +400,7 @@
         }
 
         function _getRssItems($args){
-            // 날짜 형태
+            // Date Format
             $DATE_FORMAT = $args->date_format ? $args->date_format : "Y-m-d H:i:s";
 
             $buff = $this->requestFeedContents($args->rss_url);
@@ -477,7 +446,7 @@
                     $content_items[] = $content_item;
                 }
             } elseif($xml_doc->{'rdf:rdf'}) {
-                // rss1.0 지원 (Xml이 대소문자를 구분해야 하는데 XE의 XML파서가 전부 소문자로 바꾸는 바람에 생긴 case) by misol
+                // rss1.0 supported (XE's XML is case-insensitive because XML parser converts all to small letters. Fixed by misol
                 $rss->title = $xml_doc->{'rdf:rdf'}->channel->title->body;
                 $rss->link = $xml_doc->{'rdf:rdf'}->channel->link->body;
 
@@ -511,7 +480,7 @@
                     $content_items[] = $content_item;
                 }
             } elseif($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom') {
-                // Atom 1.0 spec 지원 by misol
+                // Atom 1.0 spec supported by misol
                 $rss->title = $xml_doc->feed->title->body;
                 $links = $xml_doc->feed->link;
                 if(is_array($links)) {
@@ -582,7 +551,7 @@
         }
 
         function _getTrackbackItems($args){
-            // 분류 구함
+            // Get categories
             $output = executeQueryArray('widgets.content.getCategories',$obj);
             if($output->toBool() && $output->data) {
                 foreach($output->data as $key => $val) {
@@ -593,15 +562,12 @@
             $obj->module_srl = $args->module_srl;
             $obj->sort_index = $args->order_target;
             $obj->list_count = $args->list_count * $args->page_count;
-
-            // trackback 모듈의 model 객체를 받아서 getTrackbackList() method를 실행
+            // Get model object from the trackback module and execute getTrackbackList() method
             $oTrackbackModel = &getModel('trackback');
             $output = $oTrackbackModel->getNewestTrackbackList($obj);
-
-            // 오류가 생기면 그냥 무시
+            // If an error occurs, just ignore it.
             if(!$output->toBool() || !$output->data) return;
-
-            // 결과가 있으면 각 문서 객체화를 시킴
+            // If the result exists, make each document as an object
             $content_items = array();
             foreach($output->data as $key => $item) {
                 $domain = $args->module_srls_info[$item->module_srl]->domain;
@@ -626,8 +592,7 @@
 
         function _compile($args,$content_items){
             $oTemplate = &TemplateHandler::getInstance();
-
-            // 위젯에 넘기기 위한 변수 설정
+            // Set variables for widget
             $widget_info->modules_info = $args->modules_info;
             $widget_info->option_view_arr = $args->option_view_arr;
             $widget_info->list_count = $args->list_count;
@@ -652,8 +617,7 @@
             $widget_info->tab_type = $args->tab_type;
 
             $widget_info->markup_type = $args->markup_type;
-
-            // 탭형태일경우 탭에 대한 정보를 정리하고 module_srl로 되어 있는 key값을 index로 변경
+            // If it is a tab type, list up tab items and change key value(module_srl) to index 
             if($args->tab_type != 'none' && $args->tab_type) {
                 $tab = array();
                 foreach($args->mid_lists as $module_srl => $mid){
@@ -732,8 +696,7 @@
         function setNickName($nick_name){
             $this->add('nick_name',$nick_name);
         }
-
-        // 글 작성자의 홈페이지 주소를 저장 by misol
+        // Save author's homepage url. By misol
         function setAuthorSite($site_url){
             $this->add('author_site',$site_url);
         }
diff --git a/widgets/content/queries/getNewestDocuments.xml b/widgets/content/queries/getNewestDocuments.xml
index 3169de1fd..576dab125 100644
--- a/widgets/content/queries/getNewestDocuments.xml
+++ b/widgets/content/queries/getNewestDocuments.xml
@@ -6,9 +6,9 @@
         <column name="*" />
     </columns>
     <conditions>
-		<condition operation="notin" column="documents.module_srl" pipe="and" />
         <condition operation="in" column="documents.module_srl" var="module_srl" filter="number" notnull="notnull" pipe="and" />
 		<condition operation="equal" column="documents.category_srl" var="category_srl" pipe="and" />
+		<condition operation="in" column="status" var="statusList" pipe="and" />
     </conditions>
     <navigation>
         <index var="sort_index" default="documents.list_order" order="order_type" />
diff --git a/widgets/content/skins/default/js/content_widget.js b/widgets/content/skins/default/js/content_widget.js
index 7ee235764..3387cd8ec 100644
--- a/widgets/content/skins/default/js/content_widget.js
+++ b/widgets/content/skins/default/js/content_widget.js
@@ -1,59 +1,59 @@
-function content_widget_next(obj,list_per_page){
-    var page = 1;
-    if(obj.is('table')) {
-        var list = jQuery('>tbody>tr',obj);
-    } else if(obj.is('ul')) {
-        var list = jQuery('>li',obj);
-    }
-
-    var total_page = parseInt((list.size()-1) / list_per_page,10)+1;
-    list.each(function(i){
-        if(jQuery(this).css('display') !='none'){
-            page = parseInt((i+1)/list_per_page,10)+1;
-            return false;
-        }
-    });
-    if(total_page <= page) return;
-    list.each(function(i){
-        if( (page* list_per_page) <= i && ((page+1) * list_per_page) > i){
-            jQuery(this).show();
-        }else{
-            jQuery(this).hide();
-        }
-    });
-}
-
-function content_widget_prev(obj,list_per_page){
-    var page = 1;
-    if(obj.is('table')){
-        var list = jQuery('>tbody>tr',obj);
-    }else if(obj.is('ul')){
-        var list = jQuery('>li',obj);
-    }
-
-    var total_page = parseInt((list.size()-1) / list_per_page,10)+1;
-    list.each(function(i){
-        if(jQuery(this).css('display') !='none'){
-            page = parseInt((i+1)/list_per_page,10)+1;
-            return false;
-        }
-    });
-
-    if(page <= 1) return;
-    list.each(function(i){
-        if( ((page-2)* list_per_page)<= i && ((page-1) * list_per_page) > i){
-            jQuery(this).show();
-        }else{
-            jQuery(this).hide();
-        }
-    });
-}
-
-function content_widget_tab_show(tab,list,i){
-    tab.parents('ul.widgetTab').children('li.active').removeClass('active');
-    tab.parent('li').addClass('active');
-    jQuery('>dd',list).each(function(j){
-            if(j==i) jQuery(this).addClass('open');
-            else jQuery(this).removeClass('open');
-            });
-}
+function content_widget_next(obj,list_per_page){
+    var page = 1;
+    if(obj.is('table')) {
+        var list = jQuery('>tbody>tr',obj);
+    } else if(obj.is('ul')) {
+        var list = jQuery('>li',obj);
+    }
+
+    var total_page = parseInt((list.size()-1) / list_per_page,10)+1;
+    list.each(function(i){
+        if(jQuery(this).css('display') !='none'){
+            page = parseInt((i+1)/list_per_page,10)+1;
+            return false;
+        }
+    });
+    if(total_page <= page) return;
+    list.each(function(i){
+        if( (page* list_per_page) <= i && ((page+1) * list_per_page) > i){
+            jQuery(this).show();
+        }else{
+            jQuery(this).hide();
+        }
+    });
+}
+
+function content_widget_prev(obj,list_per_page){
+    var page = 1;
+    if(obj.is('table')){
+        var list = jQuery('>tbody>tr',obj);
+    }else if(obj.is('ul')){
+        var list = jQuery('>li',obj);
+    }
+
+    var total_page = parseInt((list.size()-1) / list_per_page,10)+1;
+    list.each(function(i){
+        if(jQuery(this).css('display') !='none'){
+            page = parseInt((i+1)/list_per_page,10)+1;
+            return false;
+        }
+    });
+
+    if(page <= 1) return;
+    list.each(function(i){
+        if( ((page-2)* list_per_page)<= i && ((page-1) * list_per_page) > i){
+            jQuery(this).show();
+        }else{
+            jQuery(this).hide();
+        }
+    });
+}
+
+function content_widget_tab_show(tab,list,i){
+    tab.parents('ul.widgetTab').children('li.active').removeClass('active');
+    tab.parent('li').addClass('active');
+    jQuery('>dd',list).each(function(j){
+            if(j==i) jQuery(this).addClass('open');
+            else jQuery(this).removeClass('open');
+            });
+}
diff --git a/widgets/content/skins/default/skin.xml b/widgets/content/skins/default/skin.xml
index a71d84558..3203e762e 100644
--- a/widgets/content/skins/default/skin.xml
+++ b/widgets/content/skins/default/skin.xml
@@ -1,69 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">Content 위젯 기본 스킨</title>
-    <title xml:lang="vi">Skin mặc định Widget Nội dung</title>
-    <title xml:lang="zh-CN">全局内容控件默认皮肤</title>
-    <title xml:lang="zh-TW">内容預設面板</title>
-    <title xml:lang="jp">コンテンツウィジェットのデフォルトスキン</title>
-    <title xml:lang="tr">Genel içerik durumunda varsayılan dış görünüm.</title>
-    <description xml:lang="ko">Content 위젯 기본 스킨 입니다.
-    NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="vi">Skin mặc định Widget Nội dung.
-    NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="zh-CN">全局内容控件默认皮肤。
-    NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="zh-TW">内容預設面板。
-    NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="jp">コンテンツウィジェットのデフォルトスキン
-    NHN (developers@xpressengine.com)
-    </description>
-    <description xml:lang="tr">Genel içerik durumunda varsayılan dış görünüm.
-    NHN (developers@xpressengine.com)
-    </description>
-    <version>0.1</version>
-    <date>2009-02-10</date>
-    <link>http://xpressengine.com/</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="white">
-            <title xml:lang="ko">흰색 바탕용</title>
-            <title xml:lang="jp">白い背景用</title>
-            <title xml:lang="zh-CN">白色背景</title>
-            <title xml:lang="en">White Background</title>
-            <title xml:lang="vi">Nền sáng</title>
-            <title xml:lang="zh-TW">白色背景</title>
-            <title xml:lang="tr">Beyaz Arkaplan</title>
-        </color>
-        <color name="black">
-            <title xml:lang="ko">어두운 바탕용</title>
-            <title xml:lang="jp">暗い背景用</title>
-            <title xml:lang="zh-CN">暗色背景</title>
-            <title xml:lang="en">Dark Background</title>
-            <title xml:lang="vi">Nền tối</title>
-            <title xml:lang="zh-TW">黑色背景</title>
-            <title xml:lang="tr">Siyah Arkaplan</title>
-        </color>
-        <color name="layout">
-            <title xml:lang="ko">레이아웃에 맞춤</title>
-            <title xml:lang="jp">レイアウトに合わせる</title>
-            <title xml:lang="zh-CN">随布局</title>
-            <title xml:lang="en">레이아웃에 맞춤</title>
-            <title xml:lang="zh-TW">隨版面</title>
-            <title xml:lang="tr">Yerleşim Düzeni</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">Content 위젯 기본 스킨</title>
+    <title xml:lang="vi">Skin mặc định Widget Nội dung</title>
+    <title xml:lang="zh-CN">全局内容控件默认皮肤</title>
+    <title xml:lang="zh-TW">内容預設面板</title>
+    <title xml:lang="jp">コンテンツウィジェットのデフォルトスキン</title>
+    <title xml:lang="tr">Genel içerik durumunda varsayılan dış görünüm.</title>
+    <description xml:lang="ko">Content 위젯 기본 스킨 입니다.
+    NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="vi">Skin mặc định Widget Nội dung.
+    NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-CN">全局内容控件默认皮肤。
+    NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="zh-TW">内容預設面板。
+    NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="jp">コンテンツウィジェットのデフォルトスキン
+    NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="tr">Genel içerik durumunda varsayılan dış görünüm.
+    NHN (developers@xpressengine.com)
+    </description>
+    <version>0.1</version>
+    <date>2009-02-10</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">흰색 바탕용</title>
+            <title xml:lang="jp">白い背景用</title>
+            <title xml:lang="zh-CN">白色背景</title>
+            <title xml:lang="en">White Background</title>
+            <title xml:lang="vi">Nền sáng</title>
+            <title xml:lang="zh-TW">白色背景</title>
+            <title xml:lang="tr">Beyaz Arkaplan</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">어두운 바탕용</title>
+            <title xml:lang="jp">暗い背景用</title>
+            <title xml:lang="zh-CN">暗色背景</title>
+            <title xml:lang="en">Dark Background</title>
+            <title xml:lang="vi">Nền tối</title>
+            <title xml:lang="zh-TW">黑色背景</title>
+            <title xml:lang="tr">Siyah Arkaplan</title>
+        </color>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">Custom Layout</title>
+            <title xml:lang="zh-TW">隨版面</title>
+            <title xml:lang="tr">Yerleşim Düzeni</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/counter_status/conf/info.xml b/widgets/counter_status/conf/info.xml
index feb01494f..e366aeeb0 100644
--- a/widgets/counter_status/conf/info.xml
+++ b/widgets/counter_status/conf/info.xml
@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget version="0.2">
-    <title xml:lang="ko">기본 카운터 위젯</title>
-    <title xml:lang="jp">デフォルト接続カウンター</title>
-    <title xml:lang="en">Counter</title>
-    <title xml:lang="es">Widget de Contador Básico</title>
-    <title xml:lang="zh-CN">计数器</title>
-    <title xml:lang="ru">Базовый виджет счетчика</title>
-    <title xml:lang="zh-TW">計數器</title>
-    <title xml:lang="vi">Counter</title>
-    <title xml:lang="tr">Sayaç</title>
-    <description xml:lang="ko">
-        기본 카운터 모듈을 이용하여 전체, 어제, 오늘의 접속현황을 표시합니다.
-        counter모듈이 설치되어 있어야 하고 counter 애드온이 켜져 있어야 합니다.
-    </description>
-    <description xml:lang="jp">
-        デフォルトの接続カウンターモジュールを利用して、トータル、昨日、今日の接続状況を表示します。
-        カウンター（counter）モジュールがインストールされていて、
-        接続カウンター（counter）アドオンが「使用」に設定されていなければなりません。
-    </description>
-    <description xml:lang="en">
-        This widget displays the number of people who have visited yesterday and today by using the basic counter module.
-        It will also display the total count.
-        To get this, the counter module should be installed and the counter add-on should be turned on.
-    </description>
-    <description xml:lang="es">
-        Este widget de contador básico muestra los números de las personas visitadas en el día de ayer, hoy, y el total.
-        Debe instalar el módulo del contador y debe activar el addon del contador.
-    </description>
-    <description xml:lang="zh-CN">
-        利用访问统计模块显示总访问量以及昨天，今日的访问统计流量。
-        要想使用此组件必须先安装访问统计模块且得激活访问统计插件。
-    </description>
-    <description xml:lang="ru">
-        Этот виджет отображает количество посетителей за вчера и сегодня, используя базовый модуль счетчика.
-        Он также отображает полное число визитов.
-        Для работы, модуль счетчика должен быть установлен и аддон счетчика должен быть включен.
-    </description>
-    <description xml:lang="zh-TW">
-        利用訪問統計模組顯示總訪問量與昨天、今日的訪問統計量。
-        想要使用此組件，必須先安裝訪問統計模組並啟動元件。
-    </description>
-    <description xml:lang="vi">
-        Widget này sẽ hiển thị số người đã truy cập hôm qua và hôm nay bằng cách sử dụng Counter Module cơ bản.
-        Nó cũng thể hiẹn tổng số người đã truy cập.
-        Đê làm việc này bạn phải cài đặt Counter Module và kích hoạt Counter Addon.
-    </description>
-    <description xml:lang="tr">
-        Bu görsel bileşen, temel sayaç modülünü kullanarak, dün ve bugün sayfanızı ziyaret eden kişi sayısını gösterir.
-        Ayrıca toplam sayıyı da görüntüler.
-        Bu özelliği edinmek için, sayaç modülü kurulmalı ve sayaç eklentileri etkin hale getirilmelidir.
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-	<name xml:lang="vi">NHN</name>
-	<name xml:lang="tr">NHN</name>
-    </author>
-</widget>
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">기본 카운터 위젯</title>
+    <title xml:lang="jp">デフォルト接続カウンター</title>
+    <title xml:lang="en">Counter Widget</title>
+    <title xml:lang="es">Widget de Contador Básico</title>
+    <title xml:lang="zh-CN">计数器</title>
+    <title xml:lang="ru">Базовый виджет счетчика</title>
+    <title xml:lang="zh-TW">計數器</title>
+    <title xml:lang="vi">Counter</title>
+    <title xml:lang="tr">Sayaç</title>
+    <description xml:lang="ko">
+        기본 카운터 모듈을 이용하여 전체, 어제, 오늘의 접속현황을 표시합니다.
+        counter모듈이 설치되어 있어야 하고 counter 애드온이 켜져 있어야 합니다.
+    </description>
+    <description xml:lang="jp">
+        デフォルトの接続カウンターモジュールを利用して、トータル、昨日、今日の接続状況を表示します。
+        カウンター（counter）モジュールがインストールされていて、
+        接続カウンター（counter）アドオンが「使用」に設定されていなければなりません。
+    </description>
+    <description xml:lang="en">
+        This widget displays the number of people who have visited yesterday and today by using the basic counter module.
+        It will also display the total count.
+        To get this, the counter module should be installed and the counter add-on should be turned on.
+    </description>
+    <description xml:lang="es">
+        Este widget de contador básico muestra los números de las personas visitadas en el día de ayer, hoy, y el total.
+        Debe instalar el módulo del contador y debe activar el addon del contador.
+    </description>
+    <description xml:lang="zh-CN">
+        利用访问统计模块显示总访问量以及昨天，今日的访问统计流量。
+        要想使用此组件必须先安装访问统计模块且得激活访问统计插件。
+    </description>
+    <description xml:lang="ru">
+        Этот виджет отображает количество посетителей за вчера и сегодня, используя базовый модуль счетчика.
+        Он также отображает полное число визитов.
+        Для работы, модуль счетчика должен быть установлен и аддон счетчика должен быть включен.
+    </description>
+    <description xml:lang="zh-TW">
+        利用訪問統計模組顯示總訪問量與昨天、今日的訪問統計量。
+        想要使用此組件，必須先安裝訪問統計模組並啟動元件。
+    </description>
+    <description xml:lang="vi">
+        Widget này sẽ hiển thị số người đã truy cập hôm qua và hôm nay bằng cách sử dụng Counter Module cơ bản.
+        Nó cũng thể hiẹn tổng số người đã truy cập.
+        Đê làm việc này bạn phải cài đặt Counter Module và kích hoạt Counter Addon.
+    </description>
+    <description xml:lang="tr">
+        Bu görsel bileşen, temel sayaç modülünü kullanarak, dün ve bugün sayfanızı ziyaret eden kişi sayısını gösterir.
+        Ayrıca toplam sayıyı da görüntüler.
+        Bu özelliği edinmek için, sayaç modülü kurulmalı ve sayaç eklentileri etkin hale getirilmelidir.
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+	<name xml:lang="vi">NHN</name>
+	<name xml:lang="tr">NHN</name>
+    </author>
+</widget>
diff --git a/widgets/counter_status/counter_status.class.php b/widgets/counter_status/counter_status.class.php
index 16c09c71a..4792ff718 100644
--- a/widgets/counter_status/counter_status.class.php
+++ b/widgets/counter_status/counter_status.class.php
@@ -1,40 +1,37 @@
-<?php
-    /**
-     * @class counter_status
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief counter 모듈의 데이터를 이용하여 counter 현황을 출력
-     **/
-
-    class counter_status extends WidgetHandler {
-
-        /**
-         * @brief 위젯의 실행 부분
-         * ./widgets/위젯/conf/info.xml에 선언한 extra_vars를 args로 받는다
-         * 결과를 만든후 print가 아니라 return 해주어야 한다
-         **/
-        function proc($args) {
-            // 전체, 어제, 오늘 접속 현황을 가져옴
-            $oCounterModel = &getModel('counter');
-
-            $site_module_info = Context::get('site_module_info');
-            $output = $oCounterModel->getStatus(array('00000000', date('Ymd', time()-60*60*24), date('Ymd')), $site_module_info->site_srl);
-            foreach($output as $key => $val) {
-                if(!$key) Context::set('total_counter', $val);
-                elseif($key == date("Ymd")) Context::set('today_counter', $val);
-                else Context::set('yesterday_counter', $val);
-            }
-
-            // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
-            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
-            Context::set('colorset', $args->colorset);
-
-            // 템플릿 파일을 지정
-            $tpl_file = 'counter_status';
-
-            // 템플릿 컴파일
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-    }
-?>
+<?php
+    /**
+     * @class counter_status
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief Display counter status by using data in the counter module
+     **/
+
+    class counter_status extends WidgetHandler {
+
+        /**
+         * @brief Widget execution
+         * Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
+         * After generating the result, do not print but return it.
+         **/
+        function proc($args) {
+            // Get status of the accumulated, yesterday's, today's counts
+            $oCounterModel = &getModel('counter');
+
+            $site_module_info = Context::get('site_module_info');
+            $output = $oCounterModel->getStatus(array('00000000', date('Ymd', time()-60*60*24), date('Ymd')), $site_module_info->site_srl);
+            foreach($output as $key => $val) {
+                if(!$key) Context::set('total_counter', $val);
+                elseif($key == date("Ymd")) Context::set('today_counter', $val);
+                else Context::set('yesterday_counter', $val);
+            }
+            // Set a path of the template skin (values of skin, colorset settings)
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            Context::set('colorset', $args->colorset);
+            // Specify a template file
+            $tpl_file = 'counter_status';
+            // Compile a template
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+    }
+?>
diff --git a/widgets/counter_status/skins/default/counter_status.html b/widgets/counter_status/skins/default/counter_status.html
index 585dad454..0a5a48044 100644
--- a/widgets/counter_status/skins/default/counter_status.html
+++ b/widgets/counter_status/skins/default/counter_status.html
@@ -1,14 +1,11 @@
-<!--@if($colorset == "black" || $colorset == "white")-->
-    <!--%import("./css/widget.css")-->
-<!--@end-->
-
-<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
-    <dl class="widgetCounter">
-        <dt>{$lang->today} :</dt>
-        <dd>{number_format($today_counter->unique_visitor)}</dd>
-        <dt>{$lang->yesterday} :</dt>
-        <dd>{number_format($yesterday_counter->unique_visitor)}</dd>
-        <dt>{$lang->total} :</dt>
-        <dd>{number_format($total_counter->unique_visitor)}</dd>
-    </dl>
-</div>
+<load target="./css/widget.css" />
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <dl class="widgetCounter">
+        <dt>{$lang->today}:</dt>
+        <dd>{number_format($today_counter->unique_visitor)}</dd>
+        <dt>{$lang->yesterday}:</dt>
+        <dd>{number_format($yesterday_counter->unique_visitor)}</dd>
+        <dt>{$lang->total}:</dt>
+        <dd>{number_format($total_counter->unique_visitor)}</dd>
+    </dl>
+</div>
diff --git a/widgets/counter_status/skins/default/css/widget.css b/widgets/counter_status/skins/default/css/widget.css
index b3dcaf6ba..0a8865301 100644
--- a/widgets/counter_status/skins/default/css/widget.css
+++ b/widgets/counter_status/skins/default/css/widget.css
@@ -1,18 +1,6 @@
 @charset "utf-8";
-
-/* widgetCounter */
-.widgetCounter{ font-size:12px; margin:0;}
-.widgetCounter dt,
-.widgetCounter dd{ height:18px;}
-.widgetCounter dt{ float:left; clear:left;}
-.widgetCounter dd{ font-size:11px; font-family:Tahoma;}
-.widgetCounter dt{ color:#333;}
-.widgetCounter dd{ color:#888;}
-
-.widgetContainer.black .widgetCounter{ font-size:12px; margin:0;}
-.widgetContainer.black .widgetCounter dt,
-.widgetContainer.black .widgetCounter dd{ height:18px;}
-.widgetContainer.black .widgetCounter dt{ float:left; clear:left;}
-.widgetContainer.black .widgetCounter dd{ font-size:11px; font-family:Tahoma;}
-.widgetContainer.black .widgetCounter dt{ color:#999;}
-.widgetContainer.black .widgetCounter dd{ color:#888;}
+/* Widget Counter */
+.widgetCounter{font-size:12px;margin:0;line-height:1.4;color:#333}
+.widgetCounter:after{content:"";display:block;clear:both}
+.widgetCounter dt{float:left;clear:left;margin:0 4px 0 0}
+.widgetCounter dd{margin:0}
diff --git a/widgets/counter_status/skins/default/skin.xml b/widgets/counter_status/skins/default/skin.xml
index cd6be7d8b..e542baabf 100644
--- a/widgets/counter_status/skins/default/skin.xml
+++ b/widgets/counter_status/skins/default/skin.xml
@@ -1,60 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">접속자 현황 출력 기본 스킨 </title>
-    <title xml:lang="jp">接続統計表示のデフォルトスキン</title>
-    <title xml:lang="zh-CN">计数器默认皮肤</title>
-    <title xml:lang="en">Default Counter Skin </title>
-    <title xml:lang="vi">Skin Counter mặc định</title>
-    <title xml:lang="zh-TW">計數器預設面板</title>
-    <title xml:lang="tr">Varsayılan Sayaç Dış Görünümü </title>
-    <description xml:lang="ko">counter_status 의 기본 스킨</description>
-    <description xml:lang="jp">接続統計（counter_status）のデフォルトスキン</description>
-    <description xml:lang="zh-CN">计数器默认皮肤。</description>
-    <description xml:lang="en">Default skin of counter_status</description>
-    <description xml:lang="vi">Skin mặc định hiển thị trạng thái của Counter.</description>
-    <description xml:lang="zh-TW">計數器預設面板。</description>
-    <description xml:lang="tr"> counter_status Varsayılan Dış Görünümü</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <link>http://xpressengine.com/</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="layout">
-            <title xml:lang="ko">레이아웃에 맞춤</title>
-            <title xml:lang="jp">レイアウトに合わせる</title>
-            <title xml:lang="zh-CN">随布局</title>
-            <title xml:lang="en">레이아웃에 맞춤</title>
-            <title xml:lang="vi">Tùy chỉnh giao diện</title>
-            <title xml:lang="zh-TW">隨版面</title>
-            <title xml:lang="tr">Yerleşim Düzeni</title>
-        </color>
-        <color name="white">
-            <title xml:lang="ko">하얀색(기본)</title>
-            <title xml:lang="jp">白（デフォルト）</title>
-            <title xml:lang="zh-CN">白色（默认）</title>
-            <title xml:lang="en">White (default)</title>
-            <title xml:lang="vi">White (Mặc định)</title>
-            <title xml:lang="zh-TW">白色(預設)</title>
-            <title xml:lang="tr">Beyaz (varsayılan)</title>
-        </color>
-        <color name="black">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="vi">Black</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-            <title xml:lang="tr">Siyah</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">기본 카운터 스킨 </title>
+    <title xml:lang="jp">接続統計表示のデフォルトスキン</title>
+    <title xml:lang="zh-CN">计数器默认皮肤</title>
+    <title xml:lang="en">Default Counter Skin </title>
+    <title xml:lang="vi">Skin Counter mặc định</title>
+    <title xml:lang="zh-TW">計數器預設面板</title>
+    <title xml:lang="tr">Varsayılan Sayaç Dış Görünümü </title>
+    <description xml:lang="ko">counter_status 의 기본 스킨</description>
+    <description xml:lang="jp">接続統計（counter_status）のデフォルトスキン</description>
+    <description xml:lang="zh-CN">计数器默认皮肤。</description>
+    <description xml:lang="en">Default skin of counter_status</description>
+    <description xml:lang="vi">Skin mặc định hiển thị trạng thái của Counter.</description>
+    <description xml:lang="zh-TW">計數器預設面板。</description>
+    <description xml:lang="tr"> counter_status Varsayılan Dış Görünümü</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <link>http://xpressengine.com/</link>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+</skin>
diff --git a/widgets/language_select/conf/info.xml b/widgets/language_select/conf/info.xml
index 382dbc44b..dee0e528f 100644
--- a/widgets/language_select/conf/info.xml
+++ b/widgets/language_select/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget version="0.2">
-    <title xml:lang="ko">언어 선택</title>
-    <title xml:lang="jp">言語選択</title>
-    <title xml:lang="zh-CN">多国语言切换</title>
-    <title xml:lang="en">Language</title>
-    <title xml:lang="vi">Ngôn ngữ</title>
-    <title xml:lang="es">Selcción del Idioma</title>
-    <title xml:lang="ru">Выбор языка</title>
-    <title xml:lang="zh-TW">語言選擇</title>
-    <title xml:lang="tr">Dil</title>
-    <description xml:lang="ko">사용자의 접속언어를 변경할 수 있는 select폼을 출력합니다.</description>
-    <description xml:lang="jp">言語を変更することが出来るセレクト（select）フォームを表示します。</description>
-    <description xml:lang="zh-CN">可以实现多国语言相互切换。</description>
-    <description xml:lang="en">This widget displays a select form for change of users' language.</description>
-    <description xml:lang="vi">Widget này sẽ hiển thị ngôn ngữ cho người dùng lựa chọn.</description>
-    <description xml:lang="es">Este widget muestra la forma de cambiar el idioma del usuario.</description>
-    <description xml:lang="ru">Этот виджет отображает форму для выбора пользовательского языка.</description>
-    <description xml:lang="zh-TW">可選擇其他語言。</description>
-    <description xml:lang="tr">Bu görsel bileşen, kullanıcı dili değişikliğindeki mevcut şekli görüntüler.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-</widget>
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">언어 선택</title>
+    <title xml:lang="jp">言語選択</title>
+    <title xml:lang="zh-CN">多国语言切换</title>
+    <title xml:lang="en">Language</title>
+    <title xml:lang="vi">Ngôn ngữ</title>
+    <title xml:lang="es">Selcción del Idioma</title>
+    <title xml:lang="ru">Выбор языка</title>
+    <title xml:lang="zh-TW">語言選擇</title>
+    <title xml:lang="tr">Dil</title>
+    <description xml:lang="ko">사용자의 접속언어를 변경할 수 있는 select폼을 출력합니다.</description>
+    <description xml:lang="jp">言語を変更することが出来るセレクト（select）フォームを表示します。</description>
+    <description xml:lang="zh-CN">可以实现多国语言相互切换。</description>
+    <description xml:lang="en">This widget displays a select form for change of users' language.</description>
+    <description xml:lang="vi">Widget này sẽ hiển thị ngôn ngữ cho người dùng lựa chọn.</description>
+    <description xml:lang="es">Este widget muestra la forma de cambiar el idioma del usuario.</description>
+    <description xml:lang="ru">Этот виджет отображает форму для выбора пользовательского языка.</description>
+    <description xml:lang="zh-TW">可選擇其他語言。</description>
+    <description xml:lang="tr">Bu görsel bileşen, kullanıcı dili değişikliğindeki mevcut şekli görüntüler.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+</widget>
diff --git a/widgets/language_select/language_select.class.php b/widgets/language_select/language_select.class.php
index 68aeaf04d..04c73a077 100644
--- a/widgets/language_select/language_select.class.php
+++ b/widgets/language_select/language_select.class.php
@@ -1,29 +1,29 @@
-<?php
-    /**
-     * @class language_select 
-     * @author NHN (developers@xpressengine.com)
-     * @brief 언어선택기
-     * @version 0.1
-     **/
-
-    class language_select extends WidgetHandler {
-
-        /**
-         * @brief 위젯의 실행 부분
-         *
-         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
-         * 결과를 만든후 print가 아니라 return 해주어야 한다
-         **/
-        function proc($args) {
-            // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
-            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
-            $tpl_file = 'language_select';
-			
-			Context::set('colorset', $args->colorset);
-
-            // 템플릿 컴파일
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-    }
-?>
+<?php
+    /**
+     * @class language_select 
+     * @author NHN (developers@xpressengine.com)
+     * @brief Language selector
+     * @version 0.1
+     **/
+
+    class language_select extends WidgetHandler {
+
+        /**
+         * @brief Widget execution
+         *
+         * Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
+         * After generating the result, do not print but return it.
+         **/
+        function proc($args) {
+            // Set a path of the template skin (values of skin, colorset settings)
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            $tpl_file = 'language_select';
+			
+			Context::set('colorset', $args->colorset);
+
+            // Compile a template
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+    }
+?>
diff --git a/widgets/language_select/skins/default/js/language_select.js b/widgets/language_select/skins/default/js/language_select.js
index 93ef94d98..1d9c715a3 100644
--- a/widgets/language_select/skins/default/js/language_select.js
+++ b/widgets/language_select/skins/default/js/language_select.js
@@ -1,18 +1,18 @@
-jQuery(function(){
-    jQuery('.language_selector','div.widgetLanguage').click(function(){
-        var c = jQuery(this).parent();
-        var langList = c.next('ul.langList');
-        langList.toggle();
-
-        jQuery(this).parents('[id^=ex_]:first').css('overflow','').css('position','relative').css('zoom','1');
-
-        if(langList.css('top')){
-            if(jQuery('body').height() <= c.offset().top + langList.height()) {
-                langList.css('top',-(langList.height()+17));
-            }else{
-                langList.css('top','26px');
-            }
-        }
-        return false;
-    });
+jQuery(function(){
+    jQuery('.language_selector','div.widgetLanguage').click(function(){
+        var c = jQuery(this).parent();
+        var langList = c.next('ul.langList');
+        langList.toggle();
+
+        jQuery(this).parents('[id^=ex_]:first').css('overflow','').css('position','relative').css('zoom','1');
+
+        if(langList.css('top')){
+            if(jQuery('body').height() <= c.offset().top + langList.height()) {
+                langList.css('top',-(langList.height()+17));
+            }else{
+                langList.css('top','26px');
+            }
+        }
+        return false;
+    });
 });
\ No newline at end of file
diff --git a/widgets/language_select/skins/default/language_select.html b/widgets/language_select/skins/default/language_select.html
index e23e997d1..871486674 100644
--- a/widgets/language_select/skins/default/language_select.html
+++ b/widgets/language_select/skins/default/language_select.html
@@ -1,18 +1,18 @@
-<!--%import("./js/language_select.js")-->
-<!--@if($colorset == "black" || $colorset == "white")-->
-    <!--%import("./css/widget.css")-->
-<!--@end-->
-
-<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
-    <div class="widgetLanguage">
-        <p><a href="#" class="cafeXeA language_selector">Language:{$lang_supported[$lang_type]}</a></p>
-        <ul class="langList" style="right: 3px;">
-            <!-- class="" | class="open" -->
-            <!--@foreach($lang_supported as $key => $val)-->
-            <!--@if($key != $lang_type)-->
-            <li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
-            <!--@end-->
-            <!--@end-->
-        </ul>
-    </div>
-</div>
+<!--%import("./js/language_select.js")-->
+<!--@if($colorset == "black" || $colorset == "white")-->
+    <!--%import("./css/widget.css")-->
+<!--@end-->
+
+<div class="widgetContainer<!--@if($colorset=="black")--> black<!--@end-->">
+    <div class="widgetLanguage">
+        <p><a href="#" class="cafeXeA language_selector">Language:{$lang_supported[$lang_type]}</a></p>
+        <ul class="langList" style="right: 3px;">
+            <!-- class="" | class="open" -->
+            <!--@foreach($lang_supported as $key => $val)-->
+            <!--@if($key != $lang_type)-->
+            <li><a href="#" onclick="doChangeLangType('{$key}');return false;">{$val}</a></li>
+            <!--@end-->
+            <!--@end-->
+        </ul>
+    </div>
+</div>
diff --git a/widgets/language_select/skins/default/skin.xml b/widgets/language_select/skins/default/skin.xml
index bee5ebb42..243f8aae9 100644
--- a/widgets/language_select/skins/default/skin.xml
+++ b/widgets/language_select/skins/default/skin.xml
@@ -1,60 +1,60 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">언어 출력</title>
-    <title xml:lang="jp">言語選択</title>
-    <title xml:lang="zh-CN">多国语言切换</title>
-    <title xml:lang="en">Display Language</title>
-    <title xml:lang="vi">Hiển thị ngôn ngữ</title>
-    <title xml:lang="zh-TW">語言選擇</title>
-    <title xml:lang="tr">Dili Görüntüle</title>
-    <description xml:lang="ko">스킨 기능이 없습니다</description>
-    <description xml:lang="jp">スキン機能がありません。</description>
-    <description xml:lang="zh-CN">不支持皮肤。</description>
-    <description xml:lang="en">There is no skin function</description>
-    <description xml:lang="vi">Đây không phải chức năng của Skin</description>
-    <description xml:lang="zh-TW">不支援面板。</description>
-    <description xml:lang="tr">Dış görünüm özelliği yok.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <link>http://xpressengine.com/</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="layout">
-            <title xml:lang="ko">레이아웃에 맞춤</title>
-            <title xml:lang="jp">レイアウトに合わせる</title>
-            <title xml:lang="zh-CN">随布局</title>
-            <title xml:lang="en">레이아웃에 맞춤</title>
-            <title xml:lang="vi">Tùy chỉnh giao diện</title>
-            <title xml:lang="zh-TW">隨版面</title>
-            <title xml:lang="tr">Yerleşim Düzeni</title>
-        </color>
-        <color name="white">
-            <title xml:lang="ko">하얀색(기본)</title>
-            <title xml:lang="jp">白（デフォルト）</title>
-            <title xml:lang="zh-CN">白色（默认）</title>
-            <title xml:lang="en">White (default)</title>
-            <title xml:lang="vi">White (Mặc định)</title>
-            <title xml:lang="zh-TW">白色(預設)</title>
-            <title xml:lang="tr">Beyaz (varsayılan)</title>
-        </color>
-        <color name="black">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="vi">Black</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-            <title xml:lang="tr">Siyah</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">언어 출력</title>
+    <title xml:lang="jp">言語選択</title>
+    <title xml:lang="zh-CN">多国语言切换</title>
+    <title xml:lang="en">Display Language</title>
+    <title xml:lang="vi">Hiển thị ngôn ngữ</title>
+    <title xml:lang="zh-TW">語言選擇</title>
+    <title xml:lang="tr">Dili Görüntüle</title>
+    <description xml:lang="ko">스킨 기능이 없습니다</description>
+    <description xml:lang="jp">スキン機能がありません。</description>
+    <description xml:lang="zh-CN">不支持皮肤。</description>
+    <description xml:lang="en">There are no skin functions</description>
+    <description xml:lang="vi">Đây không phải chức năng của Skin</description>
+    <description xml:lang="zh-TW">不支援面板。</description>
+    <description xml:lang="tr">Dış görünüm özelliği yok.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">Custom Layout</title>
+            <title xml:lang="vi">Tùy chỉnh giao diện</title>
+            <title xml:lang="zh-TW">隨版面</title>
+            <title xml:lang="tr">Yerleşim Düzeni</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="vi">White (Mặc định)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+            <title xml:lang="tr">Beyaz (varsayılan)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="vi">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+            <title xml:lang="tr">Siyah</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/login_info/conf/info.xml b/widgets/login_info/conf/info.xml
index 9e485910f..22f7105e8 100644
--- a/widgets/login_info/conf/info.xml
+++ b/widgets/login_info/conf/info.xml
@@ -1,36 +1,36 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget version="0.2">
-    <title xml:lang="ko">로그인 정보 출력</title>
-    <title xml:lang="zh-CN">登陆表单</title>
-    <title xml:lang="jp">ログイン情報表示</title>
-    <title xml:lang="en">Login Info</title>
-    <title xml:lang="vi">Thông tin đăng nhập</title>
-    <title xml:lang="es">Muestra la información de la conección</title>
-    <title xml:lang="ru">Отображение информации при входе на сайт</title>
-    <title xml:lang="zh-TW">登入資料</title>
-    <title xml:lang="tr">Giriş Bilgileri</title>
-    <description xml:lang="ko">로그인 폼이나 로그인 정보를 출력합니다</description>
-    <description xml:lang="zh-CN">显示登陆表单或登陆信息。</description>
-    <description xml:lang="jp">ログインフォームまたはログイン情報を表示します。</description>
-    <description xml:lang="en">This widget displays login form or login info.</description>
-    <description xml:lang="vi">Widget này hiển thị bảng đăng nhập hay thông tin đăng kí.</description>
-    <description xml:lang="es">Este widget muestra la forma de la conección y la información de la conección.</description>
-    <description xml:lang="ru">Этот виджет отображает форму логина или информацию входа.</description>
-    <description xml:lang="zh-TW">可顯示登入表格或登入資料。</description>
-    <description xml:lang="tr">Bu görsel bileşen giriş şeklini veya giriş bilgilerini görüntüler.</description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-    <extra_vars />
-</widget>
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">로그인 정보 출력</title>
+    <title xml:lang="zh-CN">登陆表单</title>
+    <title xml:lang="jp">ログイン情報表示</title>
+    <title xml:lang="en">Login Info</title>
+    <title xml:lang="vi">Thông tin đăng nhập</title>
+    <title xml:lang="es">Muestra la información de la conección</title>
+    <title xml:lang="ru">Отображение информации при входе на сайт</title>
+    <title xml:lang="zh-TW">登入資料</title>
+    <title xml:lang="tr">Giriş Bilgileri</title>
+    <description xml:lang="ko">로그인 폼이나 로그인 정보를 출력합니다</description>
+    <description xml:lang="zh-CN">显示登陆表单或登陆信息。</description>
+    <description xml:lang="jp">ログインフォームまたはログイン情報を表示します。</description>
+    <description xml:lang="en">This widget displays login form or login info.</description>
+    <description xml:lang="vi">Widget này hiển thị bảng đăng nhập hay thông tin đăng kí.</description>
+    <description xml:lang="es">Este widget muestra la forma de la conección y la información de la conección.</description>
+    <description xml:lang="ru">Этот виджет отображает форму логина или информацию входа.</description>
+    <description xml:lang="zh-TW">可顯示登入表格或登入資料。</description>
+    <description xml:lang="tr">Bu görsel bileşen giriş şeklini veya giriş bilgilerini görüntüler.</description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+    <extra_vars />
+</widget>
diff --git a/widgets/login_info/login_info.class.php b/widgets/login_info/login_info.class.php
index af9d52858..9cea711d5 100644
--- a/widgets/login_info/login_info.class.php
+++ b/widgets/login_info/login_info.class.php
@@ -1,46 +1,46 @@
-<?php
-    /**
-     * @class login_info
-     * @author NHN (developers@xpressengine.com)
-     * @version 0.1
-     * @brief 로그인 폼을 출력하는 위젯
-     *
-     * $logged_info를 이용하며 이는 미리 설정되어 있음
-     **/
-
-    class login_info extends WidgetHandler {
-
-        /**
-         * @brief 위젯의 실행 부분
-         * ./widgets/위젯/conf/info.xml에 선언한 extra_vars를 args로 받는다
-         * 결과를 만든후 print가 아니라 return 해주어야 한다
-         **/
-        function proc($args) {
-            // 템플릿의 스킨 경로를 지정 (skin, colorset에 따른 값을 설정)
-            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
-            Context::set('colorset', $args->colorset);
-
-            // 템플릿 파일을 지정
-            if(Context::get('is_logged')) $tpl_file = 'login_info';
-            else $tpl_file = 'login_form';
-
-            // 회원 관리 정보를 받음
-            $oModuleModel = &getModel('module');
-            $this->member_config = $oModuleModel->getModuleConfig('member');
-            Context::set('member_config', $this->member_config);
-
-            // ssl 사용시 현재 https접속상태인지에 대한 flag및 https url 생성
-            $ssl_mode = false;
-            if($this->member_config->enable_ssl == 'Y') {
-                if(preg_match('/^https:\/\//i',Context::getRequestUri())) $ssl_mode = true;
-            }
-            Context::set('ssl_mode',$ssl_mode);
-
-            // 템플릿 컴파일
-            $oTemplate = &TemplateHandler::getInstance();
-            return $oTemplate->compile($tpl_path, $tpl_file);
-        }
-
-
-    }
-?>
+<?php
+    /**
+     * @class login_info
+     * @author NHN (developers@xpressengine.com)
+     * @version 0.1
+     * @brief Widget to display log-in form
+     *
+     * $Pre-configured by using $logged_info
+     **/
+
+    class login_info extends WidgetHandler {
+
+        /**
+         * @brief Widget execution
+         * Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
+         * After generating the result, do not print but return it.
+         **/
+        function proc($args) {
+            // Set a path of the template skin (values of skin, colorset settings)
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            Context::set('colorset', $args->colorset);
+            // Specify a template file
+            if(Context::get('is_logged')) $tpl_file = 'login_info';
+            else $tpl_file = 'login_form';
+            // Get the member configuration
+            $oModuleModel = &getModel('module');
+            $this->member_config = $oModuleModel->getModuleConfig('member');
+            Context::set('member_config', $this->member_config);
+
+            // Set a flag to check if the https connection is made when using SSL and create https url 
+            $ssl_mode = false;
+			$useSsl = Context::getSslStatus();
+            if($useSsl != 'none')
+			{
+                if(preg_match('/^https:\/\//i', Context::getRequestUri())) $ssl_mode = true;
+            }
+            Context::set('ssl_mode',$ssl_mode);
+
+            // Compile a template
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
+
+    }
+?>
diff --git a/widgets/login_info/skins/xe_global/css/black.css b/widgets/login_info/skins/xe_global/css/black.css
new file mode 100644
index 000000000..6d3a3a2de
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/css/black.css
@@ -0,0 +1,51 @@
+.login_black { margin:0; padding:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; }
+*:first-child+html body#black .login_black { padding-top:2px;}
+.login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+.login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;}
+.login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;}
+.login_black form .idpw { float:left; width:110px;}
+.login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
+.login_black form .login { float:right;}
+
+.login_black form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+.login_black form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.login_black form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.login_black form p.noneSSL a { color:#BF6801; text-decoration:none; }
+.login_black form p.SSL a { color:#9CAC74; text-decoration:none; }
+
+.login_black form p.save { margin:0; clear:both; padding:.3em 0;}
+.login_black form p.save input { vertical-align:middle; _margin:-3px;}
+*:first-child+html body#black .login_black form p input { margin:-3px; }
+.login_black form p.save label { font:.9em; color:#818181;}
+.login_black form ul.help { margin:0; border-top:1px solid #515151; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none;}
+.login_black form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/black/vrType1.gif) no-repeat left center;}
+.login_black form ul.help li.first-child { background:none; padding-left:0;}
+.login_black form ul.help li a { color:#818181; font:.9em; white-space:nowrap; text-decoration:none;}
+.login_black form ul.help li a:hover { text-decoration:underline;}
+.login_black form ul.help li.first-child a { color:#cbcbcb;}
+.login_black form .userName { margin:0; position:relative; width:172px; overflow:hidden; border-bottom:1px solid #515151; padding:0 0 6px 0; margin-top:-5px;}
+.login_black form .userName strong { color:#cbcbcb; padding:4px 0 0 2px; font:bold .9em Tahoma;}
+.login_black form .userName a { position:relative; right:0px; }
+.login_black form .userName img { border:none; }
+.login_black form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
+.login_black form ul.userMenu li { list-style:none; color:#cbcbcb; list-style:none;padding-left:10px; background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;}
+.login_black form ul.userMenu li a { color:#cbcbcb;text-decoration:none;}
+.login_black form ul.userMenu li a:hover {text-decoration:underline;}
+.login_black form p.latestLogin { margin:0; color:#818181; font:.9em;}
+.login_black form p.latestLogin span { font:1em Tahoma;}
+
+img.login_mask { width:201px; height:5px; background:#3d3d3d; display:block;}
+
+.openid_login_black { padding:0; margin:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block;}
+*:first-child+html body#black .openid_login_black { padding-top:2px;}
+.openid_login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+.openid_login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;}
+.openid_login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;}
+.openid_login_black form .idpw { float:left;}
+.openid_login_black form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
+.openid_login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
+.openid_login_black form .login { float:right;}
+.openid_login_black form p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
+.openid_login_black form p.save input { vertical-align:middle; _margin:-3px;}
+*:first-child+html body .openid_login_black form p input { margin:-3px; }
+.openid_login_black form p.save label { font:.9em; color:#818181;}
diff --git a/widgets/login_info/skins/xe_global/css/default.css b/widgets/login_info/skins/xe_global/css/default.css
new file mode 100644
index 000000000..35c5e7c81
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/css/default.css
@@ -0,0 +1,54 @@
+.login_default { margin:0; padding:0; border:none; position:relative; _padding-top:2px; display:block;}
+*:first-child+html body .login_default { padding-top:2px;}
+.login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+form .login_default { position:relative;  padding:25px 0 24px 0; width:161px; margin:0 auto}
+.login_default h2{ margin:0; font-size:14px; margin-bottom:8px;}
+form .login_default .idpwWrap { overflow:hidden; clear:both;}
+form .login_default .idpw { float:left;}
+form .login_default .idpw input { border:1px solid #c9c9c9; color:#282828; width:149px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; margin-bottom:6px;}
+form .login_default .login_mod{margin:14px 0 6px 0; padding:0}
+
+form .login_default p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+form .login_default p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+form .login_default p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+form .login_default p.noneSSL a { color:#BF6801; text-decoration:none; }
+form .login_default p.SSL a { color:#9CAC74; text-decoration:none; }
+
+form .login_default p.save { margin:0; clear:both; padding:0;}
+form .login_default p.save input { vertical-align:middle; margin:0;_margin:-3px;}
+*:first-child+html body form .login_default p input { margin:-3px; }
+form .login_default p.save label { font:.9em; color:#999999;}
+form .login_default ul.help { margin:0;overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none; }
+form .login_default ul.help li { display:block; padding:0 3px 0 0; background:url(../images/default/bu_v1.gif) no-repeat 0 50%;  }
+form .login_default ul.help li.first-child { padding-left:0; margin-bottom:3px; }
+form .login_default ul.help li a {color:#54564b; font:.9em; white-space:nowrap; text-decoration:none; padding-left:9px; }
+form .login_default ul.help li.first-child a { color:#54564b; text-decoration:none;}
+form .login_default ul.help li a:hover { text-decoration:underline; }
+form .login_default .userName { position:relative;overflow:hidden; padding:0 0 6px 0; margin-top:-5px; *zoom:1}
+form .login_default .userName strong { color:#282828; margin:7px 0 0 2px; font:bold .9em Tahoma; display:inline-block}
+form .login_default .userName a { position:relative; right:0px;}
+form .login_default .userName img { border:none; }
+form .login_default .userName .u_name{display:inline-block;width:100px;float:left;}
+form .login_default .userName .u_name div{display:inline-block;}
+form .login_default .userName .sign_btn{float:right;}
+form .login_default ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; margin-top:10px;}
+form .login_default ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/default/bu_v1.gif) no-repeat left 7px;margin-bottom:5px;}
+form .login_default ul.userMenu li a { color:#54564b; text-decoration:none;}
+form .login_default ul.userMenu li a:hover { text-decoration:underline;}
+form .login_default p.latestLogin { margin:0; color:#999999; font:.9em;}
+form .login_default p.latestLogin span { font:1em Tahoma;}
+
+img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
+.openid_login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
+*:first-child+html body .openid_login_default { padding-top:2px;}
+.openid_login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+form .openid_login_default { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
+form .openid_login_default .idpwWrap { overflow:hidden; clear:both; width:172px;}
+form .openid_login_default .idpw { float:left;}
+form .openid_login_default .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
+form .openid_login_default .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
+form .openid_login_default .login { float:right;}
+form .openid_login_default p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
+form .openid_login_default p.save input { vertical-align:middle; _margin:-3px;}
+*:first-child+html body form .openid_login_default p input { margin:-3px; }
+form .openid_login_default p.save label { font:.9em; color:#999999;}
diff --git a/widgets/login_info/skins/xe_global/css/white.css b/widgets/login_info/skins/xe_global/css/white.css
new file mode 100644
index 000000000..bf964980c
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/css/white.css
@@ -0,0 +1,48 @@
+.login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;}
+*:first-child+html body#white .login_white { padding-top:2px;}
+.login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+.login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; overflow:hidden;}
+.login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;}
+.login_white form .idpw { float:left; width:110px;}
+.login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
+.login_white form .login { float:right;}
+
+.login_white form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+.login_white form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.login_white form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.login_white form p.noneSSL a { color:#BF6801; text-decoration:none; }
+.login_white form p.SSL a { color:#9CAC74; text-decoration:none; }
+
+.login_white form p.save { margin:0; clear:both; padding:.3em 0;}
+.login_white form p.save input { vertical-align:middle; _margin:-3px;}
+*:first-child+html body#white .login_white form p input { margin:-3px; }
+.login_white form p.save label { font:.9em; color:#999999;}
+.login_white form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none;}
+.login_white form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/white/vrType1.gif) no-repeat left center;}
+.login_white form ul.help li.first-child { background:none; padding-left:0;}
+.login_white form ul.help li a { color:#999999; font:.9em; white-space:nowrap; text-decoration:none; }
+.login_white form ul.help li a:hover { text-decoration:underline; }
+.login_white form ul.help li.first-child a { color:#54564b;}
+.login_white form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;}
+.login_white form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;}
+.login_white form .userName a { position:relative; right:0px; }
+.login_white form .userName img { border:none; }
+.login_white form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
+.login_white form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;}
+.login_white form ul.userMenu li a { color:#54564b; text-decoration:none; }
+.login_white form ul.userMenu li a:hover { text-decoration:underline; }
+.login_white form p.latestLogin { margin:0; color:#999999; font:.9em;}
+.login_white form p.latestLogin span { font:1em Tahoma;}
+
+img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
+.openid_login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
+*:first-child+html body .openid_login_white { padding-top:2px;}
+.openid_login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+.openid_login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
+.openid_login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;}
+.openid_login_white form .idpw { float:left;}
+.openid_login_white form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
+.openid_login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
+.openid_login_white form .login { float:right;}
+.openid_login_white form p.save { margin:0; padding: 0; }
+.openid_login_white form p.save label { font:.9em; color:#999999;}
diff --git a/widgets/login_info/skins/xe_global/filter/login.xml b/widgets/login_info/skins/xe_global/filter/login.xml
new file mode 100644
index 000000000..9ef770464
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/filter/login.xml
@@ -0,0 +1,11 @@
+<filter name="widget_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id" />
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response callback_func="completeLogin">
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_global/filter/logout.xml b/widgets/login_info/skins/xe_global/filter/logout.xml
new file mode 100644
index 000000000..8005776d3
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="widget_logout" module="member" act="procMemberLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_global/filter/openid_login.xml b/widgets/login_info/skins/xe_global/filter/openid_login.xml
new file mode 100644
index 000000000..bf0ce028c
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_global/images/Thumbs.db b/widgets/login_info/skins/xe_global/images/Thumbs.db
new file mode 100644
index 000000000..bca18c0a3
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/Thumbs.db differ
diff --git a/widgets/login_info/skins/xe_global/images/black/Thumbs.db b/widgets/login_info/skins/xe_global/images/black/Thumbs.db
new file mode 100644
index 000000000..5c2f3627f
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/black/Thumbs.db differ
diff --git a/widgets/login_info/skins/xe_global/images/black/bulletFF1A00.gif b/widgets/login_info/skins/xe_global/images/black/bulletFF1A00.gif
new file mode 100644
index 000000000..4026f2521
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/black/bulletFF1A00.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/black/buttonLogin.gif b/widgets/login_info/skins/xe_global/images/black/buttonLogin.gif
new file mode 100644
index 000000000..a95725fdb
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/black/buttonLogin.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/black/buttonLogout.gif b/widgets/login_info/skins/xe_global/images/black/buttonLogout.gif
new file mode 100644
index 000000000..3516fa18a
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/black/buttonLogout.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/black/vrType1.gif b/widgets/login_info/skins/xe_global/images/black/vrType1.gif
new file mode 100644
index 000000000..65772afee
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/black/vrType1.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/blank.gif b/widgets/login_info/skins/xe_global/images/blank.gif
new file mode 100644
index 000000000..35d42e808
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/blank.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/default/Thumbs.db b/widgets/login_info/skins/xe_global/images/default/Thumbs.db
new file mode 100644
index 000000000..0a337d514
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/default/Thumbs.db differ
diff --git a/widgets/login_info/skins/xe_global/images/default/bu_v1.gif b/widgets/login_info/skins/xe_global/images/default/bu_v1.gif
new file mode 100644
index 000000000..6a54d9d4e
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/default/bu_v1.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/default/buttonLogin.gif b/widgets/login_info/skins/xe_global/images/default/buttonLogin.gif
new file mode 100644
index 000000000..9942ce259
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/default/buttonLogin.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/default/buttonLogout.gif b/widgets/login_info/skins/xe_global/images/default/buttonLogout.gif
new file mode 100644
index 000000000..5ba6ac617
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/default/buttonLogout.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/none_ssl.png b/widgets/login_info/skins/xe_global/images/none_ssl.png
new file mode 100644
index 000000000..b7561bfc4
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/none_ssl.png differ
diff --git a/widgets/login_info/skins/xe_global/images/openid_login_bg.gif b/widgets/login_info/skins/xe_global/images/openid_login_bg.gif
new file mode 100644
index 000000000..cde836c89
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/openid_login_bg.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/ssl.png b/widgets/login_info/skins/xe_global/images/ssl.png
new file mode 100644
index 000000000..330eb4e67
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/ssl.png differ
diff --git a/widgets/login_info/skins/xe_global/images/white/Thumbs.db b/widgets/login_info/skins/xe_global/images/white/Thumbs.db
new file mode 100644
index 000000000..7b529450b
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/white/Thumbs.db differ
diff --git a/widgets/login_info/skins/xe_global/images/white/bulletFF1A00.gif b/widgets/login_info/skins/xe_global/images/white/bulletFF1A00.gif
new file mode 100644
index 000000000..4026f2521
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/white/bulletFF1A00.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/white/buttonLogin.gif b/widgets/login_info/skins/xe_global/images/white/buttonLogin.gif
new file mode 100644
index 000000000..b7513ba4b
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/white/buttonLogin.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/white/buttonLogout.gif b/widgets/login_info/skins/xe_global/images/white/buttonLogout.gif
new file mode 100644
index 000000000..fb0365084
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/white/buttonLogout.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/white/powerdByZeroboard.gif b/widgets/login_info/skins/xe_global/images/white/powerdByZeroboard.gif
new file mode 100644
index 000000000..8be15c8f4
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/white/powerdByZeroboard.gif differ
diff --git a/widgets/login_info/skins/xe_global/images/white/vrType1.gif b/widgets/login_info/skins/xe_global/images/white/vrType1.gif
new file mode 100644
index 000000000..e3766aa3b
Binary files /dev/null and b/widgets/login_info/skins/xe_global/images/white/vrType1.gif differ
diff --git a/widgets/login_info/skins/xe_global/js/login.js b/widgets/login_info/skins/xe_global/js/login.js
new file mode 100644
index 000000000..7e44a5637
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/js/login.js
@@ -0,0 +1,36 @@
+/* 로그인 영역에 포커스 */
+function doFocusUserId(fo_id) {
+    if(xScrollTop()) return;
+    var fo_obj = xGetElementById(fo_id);
+    if(fo_obj.user_id) {
+        try{
+            fo_obj.user_id.focus();
+        } catch(e) {};
+    }
+}
+
+/* 로그인 후 */
+function completeLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+/* 오픈 아이디 폼 변환 */
+function toggleLoginForm(obj) {
+    if(xGetElementById('login').style.display != "none") {
+        xGetElementById('login').style.display = "none";
+        xGetElementById('openid_login').style.display = "block";
+        xGetElementById('use_open_id_2').checked = true;
+    } else {
+        xGetElementById('openid_login').style.display = "none";
+        xGetElementById('login').style.display = "block";
+        xGetElementById('use_open_id').checked = false;
+        xGetElementById('use_open_id_2').checked = false;
+    }
+}
diff --git a/widgets/login_info/skins/xe_global/login_form.html b/widgets/login_info/skins/xe_global/login_form.html
new file mode 100644
index 000000000..9c646861a
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/login_form.html
@@ -0,0 +1,75 @@
+<!--// colorset의 값에 따라 css 파일을 import 한다 -->
+<!--@if($colorset=="black")-->
+    <!--%import("css/black.css")-->
+<!--@elseif($colorset=="white")-->
+    <!--%import("css/white.css")-->
+<!--@else-->
+    <!--%import("css/default.css")-->
+<!--@end-->
+
+<!--%import("./filter/login.xml")-->
+<!--%import("./filter/openid_login.xml")-->
+<!--%import("./js/login.js")-->
+
+<script type="text/javascript">
+    var keep_signed_msg = "{$lang->about_keep_signed}";
+    xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
+</script>
+
+<form action="./" method="post" ruleset="@login" id="fo_login_widget">
+<fieldset id="login" class="login_{$colorset}">
+<legend>{$lang->cmd_login}</legend>
+	<h2>Login</h2>
+	<input type="hidden" name="act" value="procMemberLogin" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+    <div class="idpwWrap">
+        <div class="idpw">
+            <input name="user_id" type="text" title="user id" />
+            <input name="password" type="password" title="password" />
+        </div>
+		<p class="save">
+        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
+        <label for="keepid">{$lang->keep_signed}</label>
+
+        <!--@if($member_config->enable_openid=='Y')-->
+        <br />
+        <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
+        <label for="use_open_id">Open ID</label>
+        <!--@end-->
+		</p>
+        <p class="login_mod"><input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" /></p>
+    </div>
+    <p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
+        <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
+    </p>
+    <ul class="help">
+        <li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+        <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
+        <li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
+    </ul>
+</fieldset>
+</form> 
+
+<!-- OpenID -->
+<!--@if($member_config->enable_openid=='Y')-->
+<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
+	<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
+	<legend>{$lang->cmd_login}</legend>
+      <div class="idpwWrap">
+        <div class="idpw">
+          <p>{$lang->openid}</p>
+          <input type="text" name="openid" class="openid_user_id" />
+        </div>
+        <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
+      </div>
+      <p class="save">
+          <input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>
+          <label for="use_open_id_2">Open ID</label>
+      </p>
+	</fieldset>
+  </form>
+<!--@end-->
+
+<script type="text/javascript">
+  xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
+</script>
diff --git a/widgets/login_info/skins/xe_global/login_info.html b/widgets/login_info/skins/xe_global/login_info.html
new file mode 100644
index 000000000..f49cabf56
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/login_info.html
@@ -0,0 +1,31 @@
+<!--// colorset의 값에 따라 css 파일을 import 한다 -->
+<!--@if($colorset=="black")-->
+    <!--%import("css/black.css")-->
+<!--@elseif($colorset=="white")-->
+    <!--%import("css/white.css")-->
+<!--@else-->
+    <!--%import("css/default.css")-->
+<!--@end-->
+
+<!--%import("./filter/logout.xml")-->
+
+<form action="" method="post">
+<fieldset id="login" class="login_{$colorset}">
+<legend>{$lang->cmd_login}</legend>
+
+    <div class="userName">
+        <div class="fl u_name"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>
+        <div class="fr sign_btn"><a href="{getUrl('act','dispMemberLogout')}"><img src="./images/{$colorset}/buttonLogout.gif" alt="{$lang->cmd_logout}" width="58" height="22" /></a></div>
+    </div>
+    <ul class="userMenu">
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
+        <!--@end-->
+
+        <!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
+        <li><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>
+        <!--@end-->
+    </ul>
+    <p class="latestLogin">{$lang->last_login}<br /><span>{zDate($logged_info->last_login, "Y-m-d H:i")}</span></p>
+</fieldset>
+</form>
diff --git a/widgets/login_info/skins/xe_global/skin.xml b/widgets/login_info/skins/xe_global/skin.xml
new file mode 100644
index 000000000..8ebbdf666
--- /dev/null
+++ b/widgets/login_info/skins/xe_global/skin.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 그레이 스톤 로그인 위젯 스킨</title>
+    <title xml:lang="jp">XE Login Info Widget Global Skin</title>
+    <title xml:lang="zh-CN">XE Login Info Widget Global Skin</title>
+    <title xml:lang="en">XE Login Info Widget Global Skin</title>
+    <title xml:lang="zh-TW">XE Login Info Widget Global Skin</title>
+    <description xml:lang="ko">XE Login Info Widget Global Skin.</description>
+    <description xml:lang="jp">XE Login Info Widget Global Skin.</description>
+    <description xml:lang="zh-CN">XE灰石系登录皮肤</description>
+    <description xml:lang="en">XE Login Info Widget Global Skin.</description>
+    <description xml:lang="zh-TW">XE Login Info Widget Global Skin.</description>
+    <version>0.1</version>
+    <date>2011-06-20</date>
+    <link>http://www.xpressengine.com</link>
+
+    <author email_address="developer@xpressengine.com" link="http://www.xpressengine.com">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">레이아웃에 맞춤</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/login_info/skins/xe_global/thumbnail.png b/widgets/login_info/skins/xe_global/thumbnail.png
new file mode 100644
index 000000000..1be100487
Binary files /dev/null and b/widgets/login_info/skins/xe_global/thumbnail.png differ
diff --git a/widgets/login_info/skins/xe_globalTwo/css/default.css b/widgets/login_info/skins/xe_globalTwo/css/default.css
new file mode 100644
index 000000000..7be8233e6
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/css/default.css
@@ -0,0 +1,53 @@
+form.fo_login_widget { margin:0; padding:0; border:none; position:relative; _padding-top:2px; display:block; background:url(../images/default/bg_login.gif) no-repeat; width:195px; height:264px;}
+*:first-child+html body .login_default { padding-top:2px;}
+.login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+.login_default { position:relative; width:161px; margin:0 auto; padding-top:24px;border:none}
+.login_default h2{ margin:0; font-size:14px; margin-bottom:8px;}
+.login_default .idpwWrap { overflow:hidden; clear:both;}
+.login_default .idpw { float:left;}
+.login_default .idpw input { border:1px solid #c9c9c9; color:#8f8f8f; width:133px; background:#fbfbfb; padding:4px 8px; margin-bottom:2px; font:.9em Tahoma; margin-bottom:6px;}
+.login_default .login_mod{margin:14px 0 6px 0; padding:0; text-align:center}
+
+.login_default p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
+.login_default p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
+.login_default p.SSL { background:url("../images/ssl.png") no-repeat left top; }
+.login_default p.noneSSL a { color:#BF6801; text-decoration:none; }
+.login_default p.SSL a { color:#9CAC74; text-decoration:none; }
+
+.login_default p.save { margin:0; clear:both; padding:0;}
+.login_default p.save input { vertical-align:middle; margin:0;_margin:-3px;}
+*:first-child+html body .login_default p input { margin:-3px; }
+.login_default p.save label { font:.9em; color:#999999;}
+.login_default ul.help { margin:0;overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none; }
+.login_default ul.help li { display:block; padding:0 3px 0 0; background:url(../images/default/bu_v1.gif) no-repeat 0 50%;  }
+.login_default ul.help li.first-child { padding-left:0}
+.login_default ul.help li a {color:#54564b; font:.9em; white-space:nowrap; text-decoration:none; padding-left:9px; }
+.login_default ul.help li.first-child a { color:#54564b; text-decoration:none;}
+.login_default ul.help li a:hover { text-decoration:underline; }
+.login_default .userName { position:relative;overflow:hidden; padding:0 0 6px 0; margin-top:-5px; *zoom:1}
+.login_default .userName strong { color:#282828; margin:7px 0 0 2px; font:bold .9em Tahoma; display:inline-block}
+.login_default .userName a { position:relative; right:0px;}
+.login_default .userName img { border:none; }
+.login_default .userName div.u_name{width:100px;float:left;}
+.login_default .userName div.sign_btn{width:58px;float:right;}
+.login_default ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; margin-top:10px;}
+.login_default ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/default/bu_v1.gif) no-repeat left 4px;  margin-bottom:5px;}
+.login_default ul.userMenu li a { color:#54564b; text-decoration:none;}
+.login_default ul.userMenu li a:hover { text-decoration:underline;}
+.login_default p.latestLogin { margin:0; color:#999999; font:.9em;}
+.login_default p.latestLogin span { font:1em Tahoma;}
+
+img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
+.openid_login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
+*:first-child+html body .openid_login_default { padding-top:2px;}
+.openid_login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
+.openid_login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
+.openid_login_default form .idpwWrap { overflow:hidden; clear:both; width:172px;}
+.openid_login_default form .idpw { float:left;}
+.openid_login_default form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
+.openid_login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
+.openid_login_default form .login { float:right;}
+.openid_login_default form p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
+.openid_login_default form p.save input { vertical-align:middle; _margin:-3px;}
+*:first-child+html body .openid_login_default form p input { margin:-3px; }
+.openid_login_default form p.save label { font:.9em; color:#999999;}
diff --git a/widgets/login_info/skins/xe_globalTwo/filter/login.xml b/widgets/login_info/skins/xe_globalTwo/filter/login.xml
new file mode 100644
index 000000000..9ef770464
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/filter/login.xml
@@ -0,0 +1,11 @@
+<filter name="widget_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id" />
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response callback_func="completeLogin">
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_globalTwo/filter/logout.xml b/widgets/login_info/skins/xe_globalTwo/filter/logout.xml
new file mode 100644
index 000000000..8005776d3
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="widget_logout" module="member" act="procMemberLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_globalTwo/filter/openid_login.xml b/widgets/login_info/skins/xe_globalTwo/filter/openid_login.xml
new file mode 100644
index 000000000..bf0ce028c
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_globalTwo/images/default/Thumbs.db b/widgets/login_info/skins/xe_globalTwo/images/default/Thumbs.db
new file mode 100644
index 000000000..1e21d3fc1
Binary files /dev/null and b/widgets/login_info/skins/xe_globalTwo/images/default/Thumbs.db differ
diff --git a/widgets/login_info/skins/xe_globalTwo/images/default/bg_login.gif b/widgets/login_info/skins/xe_globalTwo/images/default/bg_login.gif
new file mode 100644
index 000000000..4cee2bd4c
Binary files /dev/null and b/widgets/login_info/skins/xe_globalTwo/images/default/bg_login.gif differ
diff --git a/widgets/login_info/skins/xe_globalTwo/images/default/bu_v1.gif b/widgets/login_info/skins/xe_globalTwo/images/default/bu_v1.gif
new file mode 100644
index 000000000..6a54d9d4e
Binary files /dev/null and b/widgets/login_info/skins/xe_globalTwo/images/default/bu_v1.gif differ
diff --git a/widgets/login_info/skins/xe_globalTwo/images/default/buttonLogin.gif b/widgets/login_info/skins/xe_globalTwo/images/default/buttonLogin.gif
new file mode 100644
index 000000000..bbcf26d3f
Binary files /dev/null and b/widgets/login_info/skins/xe_globalTwo/images/default/buttonLogin.gif differ
diff --git a/widgets/login_info/skins/xe_globalTwo/images/default/buttonLogout.gif b/widgets/login_info/skins/xe_globalTwo/images/default/buttonLogout.gif
new file mode 100644
index 000000000..40109aca8
Binary files /dev/null and b/widgets/login_info/skins/xe_globalTwo/images/default/buttonLogout.gif differ
diff --git a/widgets/login_info/skins/xe_globalTwo/js/login.js b/widgets/login_info/skins/xe_globalTwo/js/login.js
new file mode 100644
index 000000000..7e44a5637
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/js/login.js
@@ -0,0 +1,36 @@
+/* 로그인 영역에 포커스 */
+function doFocusUserId(fo_id) {
+    if(xScrollTop()) return;
+    var fo_obj = xGetElementById(fo_id);
+    if(fo_obj.user_id) {
+        try{
+            fo_obj.user_id.focus();
+        } catch(e) {};
+    }
+}
+
+/* 로그인 후 */
+function completeLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
+
+/* 오픈아이디 로그인 후 */
+function completeOpenIDLogin(ret_obj, response_tags) {
+    var redirect_url =  ret_obj['redirect_url'];
+    location.href = redirect_url;
+}
+
+/* 오픈 아이디 폼 변환 */
+function toggleLoginForm(obj) {
+    if(xGetElementById('login').style.display != "none") {
+        xGetElementById('login').style.display = "none";
+        xGetElementById('openid_login').style.display = "block";
+        xGetElementById('use_open_id_2').checked = true;
+    } else {
+        xGetElementById('openid_login').style.display = "none";
+        xGetElementById('login').style.display = "block";
+        xGetElementById('use_open_id').checked = false;
+        xGetElementById('use_open_id_2').checked = false;
+    }
+}
diff --git a/widgets/login_info/skins/xe_globalTwo/login_form.html b/widgets/login_info/skins/xe_globalTwo/login_form.html
new file mode 100644
index 000000000..ea220ef4d
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/login_form.html
@@ -0,0 +1,76 @@
+<!--// colorset의 값에 따라 css 파일을 import 한다 -->
+<!--@if($colorset=="black")-->
+    <!--%import("css/black.css")-->
+<!--@elseif($colorset=="white")-->
+    <!--%import("css/white.css")-->
+<!--@else-->
+    <!--%import("css/default.css")-->
+<!--@end-->
+
+<!--%import("./filter/login.xml")-->
+<!--%import("./filter/openid_login.xml")-->
+<!--%import("./js/login.js")-->
+
+<script type="text/javascript">
+    var keep_signed_msg = "{$lang->about_keep_signed}";
+    xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
+</script>
+
+
+<form action="./" method="post" ruleset="@login" id="fo_login_widget" class="fo_login_widget">
+	<fieldset id="login" class="login_{$colorset}">
+	<legend>{$lang->cmd_login}</legend>
+	<input type="hidden" name="act" value="procMemberLogin" />
+	<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+	<h2>Login</h2>
+    <div class="idpwWrap">
+        <div class="idpw">
+            <input name="user_id" type="text" title="user id" />
+            <input name="password" type="password" title="password" />
+        </div>
+		<p class="save">
+        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
+        <label for="keepid">{$lang->keep_signed}</label>
+
+        <!--@if($member_config->enable_openid=='Y')-->
+        <br />
+        <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
+        <label for="use_open_id">Open ID</label>
+        <!--@end-->
+		</p>
+        <p class="login_mod"><input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" /></p>
+    </div>
+    <p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
+        <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
+    </p>
+    <ul class="help">
+        <li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+        <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
+        <li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
+    </ul>
+	</fieldset>
+</form> 
+
+<!-- OpenID -->
+<!--@if($member_config->enable_openid=='Y')-->
+<form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
+<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
+<legend>{$lang->cmd_login}</legend>
+      <div class="idpwWrap">
+        <div class="idpw">
+          <p>{$lang->openid}</p>
+          <input type="text" name="openid" class="openid_user_id" />
+        </div>
+        <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
+      </div>
+      <p class="save">
+          <input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>
+          <label for="use_open_id_2">Open ID</label>
+      </p>
+</fieldset>
+</form>
+<!--@end-->
+
+<script type="text/javascript">
+  xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
+</script>
diff --git a/widgets/login_info/skins/xe_globalTwo/login_info.html b/widgets/login_info/skins/xe_globalTwo/login_info.html
new file mode 100644
index 000000000..57e104dff
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/login_info.html
@@ -0,0 +1,31 @@
+<!--// colorset의 값에 따라 css 파일을 import 한다 -->
+<!--@if($colorset=="black")-->
+    <!--%import("css/black.css")-->
+<!--@elseif($colorset=="white")-->
+    <!--%import("css/white.css")-->
+<!--@else-->
+    <!--%import("css/default.css")-->
+<!--@end-->
+
+<!--%import("./filter/logout.xml")-->
+
+<form action="" method="post" class="fo_login_widget">
+<fieldset id="login" class="login_{$colorset}">
+<legend>{$lang->cmd_login}</legend>
+
+    <div class="userName">
+        <div class="fl u_name"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>
+        <div class="fr sign_btn"><a href="{getUrl('act','dispMemberLogout')}"><img src="./images/{$colorset}/buttonLogout.gif" alt="{$lang->cmd_logout}" width="58" height="22" /></a></div>
+    </div>
+    <ul class="userMenu">
+        <!--@foreach($logged_info->menu_list as $key => $val)-->
+        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
+        <!--@end-->
+
+        <!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
+        <li><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>
+        <!--@end-->
+    </ul>
+    <p class="latestLogin">{$lang->last_login}<br /><span>{zDate($logged_info->last_login, "Y-m-d H:i")}</span></p>
+</fieldset>
+</form>
diff --git a/widgets/login_info/skins/xe_globalTwo/skin.xml b/widgets/login_info/skins/xe_globalTwo/skin.xml
new file mode 100644
index 000000000..11a426612
--- /dev/null
+++ b/widgets/login_info/skins/xe_globalTwo/skin.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE Sapphire 로그인 위젯 스킨</title>
+    <title xml:lang="jp">XE Sapphire Login Info Widget Skin</title>
+    <title xml:lang="zh-CN">XE Sapphire 登录皮肤</title>
+    <title xml:lang="en">XE Sapphire Login Info Widget Skin</title>
+    <title xml:lang="zh-TW">XE Sapphire Login Info Widget Skin</title>
+    <description xml:lang="ko">XE Sapphire 로그인 위젯 스킨</description>
+    <description xml:lang="jp">XE Sapphire Login Info Widget Skin.</description>
+    <description xml:lang="zh-CN">XE Sapphire 登录皮肤</description>
+    <description xml:lang="en">XE Sapphire Login Info Widget Skin.</description>
+    <description xml:lang="zh-TW">XE Sapphire Login Info Widget Skin.</description>
+    <version>0.1</version>
+    <date>2011-06-20</date>
+    <link>http://www.xpressengine.com</link>
+
+    <author email_address="developer@xpressengine.com" link="http://www.xpressengine.com">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="layout">
+            <title xml:lang="ko">레이아웃에 맞춤</title>
+            <title xml:lang="jp">レイアウトに合わせる</title>
+            <title xml:lang="zh-CN">随布局</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="zh-TW">隨版面</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（默认）</title>
+            <title xml:lang="en">White (default)</title>
+            <title xml:lang="zh-TW">白色(預設)</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/login_info/skins/xe_globalTwo/thumbnail.png b/widgets/login_info/skins/xe_globalTwo/thumbnail.png
new file mode 100644
index 000000000..f9ed87497
Binary files /dev/null and b/widgets/login_info/skins/xe_globalTwo/thumbnail.png differ
diff --git a/widgets/login_info/skins/xe_official/css/black.css b/widgets/login_info/skins/xe_official/css/black.css
index 6d3a3a2de..87cb8ffdf 100644
--- a/widgets/login_info/skins/xe_official/css/black.css
+++ b/widgets/login_info/skins/xe_official/css/black.css
@@ -1,51 +1,31 @@
-.login_black { margin:0; padding:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block; }
-*:first-child+html body#black .login_black { padding-top:2px;}
-.login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
-.login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;}
-.login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;}
-.login_black form .idpw { float:left; width:110px;}
-.login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
-.login_black form .login { float:right;}
-
-.login_black form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
-.login_black form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
-.login_black form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
-.login_black form p.noneSSL a { color:#BF6801; text-decoration:none; }
-.login_black form p.SSL a { color:#9CAC74; text-decoration:none; }
-
-.login_black form p.save { margin:0; clear:both; padding:.3em 0;}
-.login_black form p.save input { vertical-align:middle; _margin:-3px;}
-*:first-child+html body#black .login_black form p input { margin:-3px; }
-.login_black form p.save label { font:.9em; color:#818181;}
-.login_black form ul.help { margin:0; border-top:1px solid #515151; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none;}
-.login_black form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/black/vrType1.gif) no-repeat left center;}
-.login_black form ul.help li.first-child { background:none; padding-left:0;}
-.login_black form ul.help li a { color:#818181; font:.9em; white-space:nowrap; text-decoration:none;}
-.login_black form ul.help li a:hover { text-decoration:underline;}
-.login_black form ul.help li.first-child a { color:#cbcbcb;}
-.login_black form .userName { margin:0; position:relative; width:172px; overflow:hidden; border-bottom:1px solid #515151; padding:0 0 6px 0; margin-top:-5px;}
-.login_black form .userName strong { color:#cbcbcb; padding:4px 0 0 2px; font:bold .9em Tahoma;}
-.login_black form .userName a { position:relative; right:0px; }
-.login_black form .userName img { border:none; }
-.login_black form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
-.login_black form ul.userMenu li { list-style:none; color:#cbcbcb; list-style:none;padding-left:10px; background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;}
-.login_black form ul.userMenu li a { color:#cbcbcb;text-decoration:none;}
-.login_black form ul.userMenu li a:hover {text-decoration:underline;}
-.login_black form p.latestLogin { margin:0; color:#818181; font:.9em;}
-.login_black form p.latestLogin span { font:1em Tahoma;}
-
-img.login_mask { width:201px; height:5px; background:#3d3d3d; display:block;}
-
-.openid_login_black { padding:0; margin:0; border:2px solid #515151; width:196px; position:relative; _padding-top:2px; display:block;}
-*:first-child+html body#black .openid_login_black { padding-top:2px;}
-.openid_login_black legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
-.openid_login_black form { position:relative; border:1px solid #6b6b6b; padding:11px 11px 7px 11px; width:172px;}
-.openid_login_black form .idpwWrap { overflow:hidden; clear:both; width:172px;}
-.openid_login_black form .idpw { float:left;}
-.openid_login_black form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
-.openid_login_black form .idpw input { border:1px solid #6b6b6b; color:#cbcbcb; width:105px; background:#515151; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
-.openid_login_black form .login { float:right;}
-.openid_login_black form p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
-.openid_login_black form p.save input { vertical-align:middle; _margin:-3px;}
-*:first-child+html body .openid_login_black form p input { margin:-3px; }
-.openid_login_black form p.save label { font:.9em; color:#818181;}
+.login_black{margin:0;padding:0;border:2px solid #515151;width:196px;position:relative;_padding-top:2px;display:block;font-size:12px }
+.login_black fieldset{position:relative;border:1px solid #6b6b6b;padding:11px 11px 7px 11px;width:172px;margin:0}
+.login_black fieldset .idpwWrap{overflow:hidden;clear:both;width:172px}
+.login_black fieldset .idpw{float:left;width:110px}
+.login_black fieldset .idpw input{border:1px solid #6b6b6b;color:#cbcbcb;width:105px;background:#515151;padding:1px 5px;margin-bottom:2px;font:.9em Tahoma}
+.login_black fieldset .login{float:right}
+.login_black fieldset p.securitySignIn{clear:both;padding:0 0 0 18px;margin:4px 0 0 0}
+.login_black fieldset p.noneSSL{background:url("../images/none_ssl.png") no-repeat left top}
+.login_black fieldset p.SSL{background:url("../images/ssl.png") no-repeat left top}
+.login_black fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
+.login_black fieldset p.SSL a{color:#9CAC74;text-decoration:none}
+.login_black fieldset p.keep{margin:5px 0;clear:both;padding:0}
+.login_black fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0}
+.login_black fieldset p.keep label{font:.9em;color:#818181}
+.login_black fieldset p.keep_msg{color:#818181}
+.login_black fieldset ul.help{margin:0;border-top:1px solid #515151;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}
+.login_black fieldset ul.help li{list-style:none;float:left;display:block;padding:0}
+.login_black fieldset ul.help li.first-child{background:none;padding-left:0}
+.login_black fieldset ul.help li a{color:#818181;font:.9em;white-space:nowrap;text-decoration:none}
+.login_black fieldset ul.help li a:hover{text-decoration:underline}
+.login_black fieldset ul.help li.first-child a{color:#cbcbcb}
+.login_black fieldset .userName{margin:0;position:relative;width:172px;overflow:hidden;border-bottom:1px solid #515151;padding:0 0 6px 0;margin-top:-5px}
+.login_black fieldset .userName strong{color:#cbcbcb;padding:4px 0 0 2px;font:bold .9em Tahoma}
+.login_black fieldset .userName a{position:relative;right:0px}
+.login_black fieldset .userName img{border:none}
+.login_black fieldset ul.userMenu{margin:0;position:relative;padding:0 0 6px 4px;overflow:hidden;margin-top:10px}
+.login_black fieldset ul.userMenu li{list-style:none;color:#cbcbcb;list-style:none;padding-left:10px;background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px;margin-bottom:5px}
+.login_black fieldset ul.userMenu li a{color:#cbcbcb;text-decoration:none}
+.login_black fieldset ul.userMenu li a:hover{text-decoration:underline}
+.login_black fieldset p.latestLogin{margin:5px 0;color:#818181;font:.9em}
+.login_black fieldset p.latestLogin span{font:1em Tahoma}
diff --git a/widgets/login_info/skins/xe_official/css/default.css b/widgets/login_info/skins/xe_official/css/default.css
index b8cfe31c9..3b6306be5 100644
--- a/widgets/login_info/skins/xe_official/css/default.css
+++ b/widgets/login_info/skins/xe_official/css/default.css
@@ -1,50 +1,31 @@
-.login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;}
-*:first-child+html body .login_default { padding-top:2px;}
-.login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
-.login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px;}
-.login_default form .idpwWrap { overflow:hidden; clear:both; width:172px;}
-.login_default form .idpw { float:left; width:110px; }
-.login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
-.login_default form .login { float:right;}
-
-.login_default form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
-.login_default form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
-.login_default form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
-.login_default form p.noneSSL a { color:#BF6801; text-decoration:none; }
-.login_default form p.SSL a { color:#9CAC74; text-decoration:none; }
-
-.login_default form p.save { margin:0; clear:both; padding:.3em 0;}
-.login_default form p.save input { vertical-align:middle; _margin:-3px;}
-*:first-child+html body .login_default form p input { margin:-3px; }
-.login_default form p.save label { font:.9em; color:#999999;}
-.login_default form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none; }
-.login_default form ul.help li { display:block; padding:0 3px 0 0; }
-.login_default form ul.help li.first-child { background:none; padding-left:0; margin-bottom:3px; }
-.login_default form ul.help li a { color:#54564b; font:.9em; white-space:nowrap; text-decoration:none; }
-.login_default form ul.help li.first-child a { color:#54564b; text-decoration:none;}
-.login_default form ul.help li a:hover { text-decoration:underline; }
-.login_default form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;}
-.login_default form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;}
-.login_default form .userName a { position:relative; right:0px; }
-.login_default form .userName img { border:none; }
-.login_default form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; margin-top:10px;}
-.login_default form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/default/bulletFF1A00.gif) no-repeat left 4px;  margin-bottom:5px;}
-.login_default form ul.userMenu li a { color:#54564b; text-decoration:none;}
-.login_default form ul.userMenu li a:hover { text-decoration:underline;}
-.login_default form p.latestLogin { margin:0; color:#999999; font:.9em;}
-.login_default form p.latestLogin span { font:1em Tahoma;}
-
-img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
-.openid_login_default { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
-*:first-child+html body .openid_login_default { padding-top:2px;}
-.openid_login_default legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
-.openid_login_default form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
-.openid_login_default form .idpwWrap { overflow:hidden; clear:both; width:172px;}
-.openid_login_default form .idpw { float:left;}
-.openid_login_default form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
-.openid_login_default form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
-.openid_login_default form .login { float:right;}
-.openid_login_default form p.save { margin:0; padding:0; clear:both; padding:.3em 0;}
-.openid_login_default form p.save input { vertical-align:middle; _margin:-3px;}
-*:first-child+html body .openid_login_default form p input { margin:-3px; }
-.openid_login_default form p.save label { font:.9em; color:#999999;}
+.login_default{margin:0;padding:0;border:2px solid #d9d9d9;width:196px;position:relative;_padding-top:2px;display:block;font-size:12px}
+.login_default fieldset{position:relative;border:1px solid #cacaca;padding:11px 11px 7px 11px;width:172px;margin:0}
+.login_default fieldset .idpwWrap{overflow:hidden;clear:both;width:172px}
+.login_default fieldset .idpw{float:left;width:117px}
+.login_default fieldset .idpw input{border:1px solid #c9c9c9;color:#282828;width:105px;background:#fbfbfb;padding:1px 5px;margin:0 0 4px 0;font:.9em Tahoma}
+.login_default fieldset .login{float:right}
+.login_default fieldset p.securitySignIn{clear:both;padding:0 0 0 18px;margin:4px 0 0 0}
+.login_default fieldset p.noneSSL{background:url("../images/none_ssl.png") no-repeat left top}
+.login_default fieldset p.SSL{background:url("../images/ssl.png") no-repeat left top}
+.login_default fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
+.login_default fieldset p.SSL a{color:#9CAC74;text-decoration:none}
+.login_default fieldset p.keep{margin:1px 0 5px 0;padding:0}
+.login_default fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0;padding:0}
+.login_default fieldset p.keep label{font:.9em;color:#666;vertical-align:middle}
+.login_default fieldset p.keep_msg{color:#666}
+.login_default fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none;clear:both}
+.login_default fieldset ul.help li{display:block;padding:0 3px 0 0}
+.login_default fieldset ul.help li.first-child{background:none;padding-left:0;margin-bottom:3px}
+.login_default fieldset ul.help li a{color:#54564b;font:.9em;white-space:nowrap;text-decoration:none}
+.login_default fieldset ul.help li.first-child a{color:#54564b;text-decoration:none}
+.login_default fieldset ul.help li a:hover{text-decoration:underline}
+.login_default fieldset .userName{position:relative;width:172px;overflow:hidden;border-bottom:1px solid #e4e4e4;padding:0 0 6px 0;margin-top:-5px}
+.login_default fieldset .userName strong{color:#282828;padding:4px 0 0 2px;font:bold .9em Tahoma}
+.login_default fieldset .userName a{position:relative;right:0px}
+.login_default fieldset .userName img{border:none}
+.login_default fieldset ul.userMenu{margin:0;position:relative;padding:0;margin-top:10px}
+.login_default fieldset ul.userMenu li{list-style:none;margin-bottom:5px}
+.login_default fieldset ul.userMenu li a{color:#54564b;text-decoration:none}
+.login_default fieldset ul.userMenu li a:hover{text-decoration:underline}
+.login_default fieldset p.latestLogin{margin:5px 0;color:#666}
+.login_default fieldset p.latestLogin span{font:1em Tahoma}
diff --git a/widgets/login_info/skins/xe_official/css/white.css b/widgets/login_info/skins/xe_official/css/white.css
index bf964980c..e7539c898 100644
--- a/widgets/login_info/skins/xe_official/css/white.css
+++ b/widgets/login_info/skins/xe_official/css/white.css
@@ -1,48 +1,31 @@
-.login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block;}
-*:first-child+html body#white .login_white { padding-top:2px;}
-.login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
-.login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; overflow:hidden;}
-.login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;}
-.login_white form .idpw { float:left; width:110px;}
-.login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma;}
-.login_white form .login { float:right;}
-
-.login_white form p.securitySignIn { clear:both; padding:0 0 0 18px; margin:4px 0 0 0; }
-.login_white form p.noneSSL { background:url("../images/none_ssl.png") no-repeat left top; }
-.login_white form p.SSL { background:url("../images/ssl.png") no-repeat left top; }
-.login_white form p.noneSSL a { color:#BF6801; text-decoration:none; }
-.login_white form p.SSL a { color:#9CAC74; text-decoration:none; }
-
-.login_white form p.save { margin:0; clear:both; padding:.3em 0;}
-.login_white form p.save input { vertical-align:middle; _margin:-3px;}
-*:first-child+html body#white .login_white form p input { margin:-3px; }
-.login_white form p.save label { font:.9em; color:#999999;}
-.login_white form ul.help { margin:0; border-top:1px solid #e4e4e4; overflow:hidden; padding:.5em 0 0 0; white-space:nowrap; list-style:none;}
-.login_white form ul.help li { list-style:none; float:left; display:block; padding:0 3px 0 7px; background:url(../images/white/vrType1.gif) no-repeat left center;}
-.login_white form ul.help li.first-child { background:none; padding-left:0;}
-.login_white form ul.help li a { color:#999999; font:.9em; white-space:nowrap; text-decoration:none; }
-.login_white form ul.help li a:hover { text-decoration:underline; }
-.login_white form ul.help li.first-child a { color:#54564b;}
-.login_white form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;}
-.login_white form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;}
-.login_white form .userName a { position:relative; right:0px; }
-.login_white form .userName img { border:none; }
-.login_white form ul.userMenu { margin:0; position:relative; padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
-.login_white form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px; margin-bottom:5px;}
-.login_white form ul.userMenu li a { color:#54564b; text-decoration:none; }
-.login_white form ul.userMenu li a:hover { text-decoration:underline; }
-.login_white form p.latestLogin { margin:0; color:#999999; font:.9em;}
-.login_white form p.latestLogin span { font:1em Tahoma;}
-
-img.login_mask { width:201px; height:5px; background:#ffffff; display:block;}
-.openid_login_white { margin:0; padding:0; border:2px solid #d9d9d9; width:196px; position:relative; _padding-top:2px; display:block; }
-*:first-child+html body .openid_login_white { padding-top:2px;}
-.openid_login_white legend { display:none; width:0; height:0; overflow:hidden; font-size:0;}
-.openid_login_white form { position:relative; border:1px solid #cacaca; padding:11px 11px 7px 11px; width:172px; }
-.openid_login_white form .idpwWrap { overflow:hidden; clear:both; width:172px;}
-.openid_login_white form .idpw { float:left;}
-.openid_login_white form .idpw p { margin:0; padding:0; margin-bottom:5px; background: url(../images/openid_login_bg.gif) left no-repeat; padding-left:18px; font-size:.9em Tahoma;color:#999999}
-.openid_login_white form .idpw input { border:1px solid #c9c9c9; color:#282828; width:105px; background:#fbfbfb; padding:1px 5px; margin-bottom:2px; font:.9em Tahoma; }
-.openid_login_white form .login { float:right;}
-.openid_login_white form p.save { margin:0; padding: 0; }
-.openid_login_white form p.save label { font:.9em; color:#999999;}
+.login_white{margin:0;padding:0;border:2px solid #d9d9d9;width:196px;position:relative;_padding-top:2px;display:block;font-size:12px}
+.login_white fieldset{position:relative;border:1px solid #cacaca;padding:11px 11px 7px 11px;width:172px;overflow:hidden;margin:0}
+.login_white fieldset .idpwWrap{overflow:hidden;clear:both;width:172px}
+.login_white fieldset .idpw{float:left;width:110px}
+.login_white fieldset .idpw input{border:1px solid #c9c9c9;color:#282828;width:105px;background:#fbfbfb;padding:1px 5px;margin-bottom:2px;font:.9em Tahoma}
+.login_white fieldset .login{float:right}
+.login_white fieldset p.securitySignIn{clear:both;padding:0 0 0 18px;margin:4px 0 0 0}
+.login_white fieldset p.noneSSL{background:url("../images/none_ssl.png") no-repeat left top}
+.login_white fieldset p.SSL{background:url("../images/ssl.png") no-repeat left top}
+.login_white fieldset p.noneSSL a{color:#BF6801;text-decoration:none}
+.login_white fieldset p.SSL a{color:#9CAC74;text-decoration:none}
+.login_white fieldset p.keep{margin:5px 0;clear:both;padding:0}
+.login_white fieldset p.keep input{vertical-align:middle;width:13px;height:13px;margin:0 }
+.login_white fieldset p.keep label{font:.9em;color:#666}
+.login_white fieldset p.keep_msg{color:#666}
+.login_white fieldset ul.help{margin:0;border-top:1px solid #e4e4e4;overflow:hidden;padding:.5em 0 0 0;white-space:nowrap;list-style:none}
+.login_white fieldset ul.help li{list-style:none;float:left;display:block;padding:0 3px 0 7px;background:url(../images/white/vrType1.gif) no-repeat left center}
+.login_white fieldset ul.help li.first-child{background:none;padding-left:0}
+.login_white fieldset ul.help li a{color:#666;font:.9em;white-space:nowrap;text-decoration:none}
+.login_white fieldset ul.help li a:hover{text-decoration:underline}
+.login_white fieldset ul.help li.first-child a{color:#54564b}
+.login_white fieldset .userName{position:relative;width:172px;overflow:hidden;border-bottom:1px solid #e4e4e4;padding:0 0 6px 0;margin-top:-5px}
+.login_white fieldset .userName strong{color:#282828;padding:4px 0 0 2px;font:bold .9em Tahoma}
+.login_white fieldset .userName a{position:relative;right:0px}
+.login_white fieldset .userName img{border:none}
+.login_white fieldset ul.userMenu{margin:0;position:relative;padding:0 0 6px 4px;overflow:hidden;margin-top:10px}
+.login_white fieldset ul.userMenu li{list-style:none;padding-left:10px;background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px;margin-bottom:5px}
+.login_white fieldset ul.userMenu li a{color:#54564b;text-decoration:none}
+.login_white fieldset ul.userMenu li a:hover{text-decoration:underline}
+.login_white fieldset p.latestLogin{margin:5px 0;color:#666;font:.9em}
+.login_white fieldset p.latestLogin span{font:1em Tahoma}
diff --git a/widgets/login_info/skins/xe_official/js/login.js b/widgets/login_info/skins/xe_official/js/login.js
index 7e44a5637..3b695c810 100644
--- a/widgets/login_info/skins/xe_official/js/login.js
+++ b/widgets/login_info/skins/xe_official/js/login.js
@@ -1,36 +1,25 @@
-/* 로그인 영역에 포커스 */
-function doFocusUserId(fo_id) {
-    if(xScrollTop()) return;
-    var fo_obj = xGetElementById(fo_id);
-    if(fo_obj.user_id) {
-        try{
-            fo_obj.user_id.focus();
-        } catch(e) {};
-    }
-}
-
-/* 로그인 후 */
+/* After Login */
 function completeLogin(ret_obj, response_tags, params, fo_obj) {
     var url =  current_url.setQuery('act','');
     location.href = url;
 }
 
-/* 오픈아이디 로그인 후 */
-function completeOpenIDLogin(ret_obj, response_tags) {
-    var redirect_url =  ret_obj['redirect_url'];
-    location.href = redirect_url;
-}
+jQuery(function($){
+	// keep signed?
+	var keep_msg = $('.keep_msg');
+	keep_msg.hide();
+	$('#keep_signed').change(function(){
+		if($(this).is(':checked')){
+			keep_msg.slideDown(200);
+		} else {
+			keep_msg.slideUp(200);
+		}
+	});
 
-/* 오픈 아이디 폼 변환 */
-function toggleLoginForm(obj) {
-    if(xGetElementById('login').style.display != "none") {
-        xGetElementById('login').style.display = "none";
-        xGetElementById('openid_login').style.display = "block";
-        xGetElementById('use_open_id_2').checked = true;
-    } else {
-        xGetElementById('openid_login').style.display = "none";
-        xGetElementById('login').style.display = "block";
-        xGetElementById('use_open_id').checked = false;
-        xGetElementById('use_open_id_2').checked = false;
-    }
-}
+	// focus userid input box
+	if (!$(document).scrollTop()) {
+		try {
+			$('#fo_login_widget > input[name=user_id]').focus();
+		} catch(e){};
+	}
+});
diff --git a/widgets/login_info/skins/xe_official/login_form.html b/widgets/login_info/skins/xe_official/login_form.html
index e6e49db8b..de1e866d3 100644
--- a/widgets/login_info/skins/xe_official/login_form.html
+++ b/widgets/login_info/skins/xe_official/login_form.html
@@ -11,65 +11,32 @@
 <!--%import("./filter/openid_login.xml")-->
 <!--%import("./js/login.js")-->
 
-<script type="text/javascript">
-    var keep_signed_msg = "{$lang->about_keep_signed}";
-    xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
-</script>
-
-<fieldset id="login" class="login_{$colorset}">
-<legend>{$lang->cmd_login}</legend>
-<form action="./" method="post" onsubmit="return procFilter(this, widget_login)" id="fo_login_widget">
-
-    <div class="idpwWrap">
-        <div class="idpw">
-            <input name="user_id" type="text" title="user id" />
-            <input name="password" type="password" title="password" />
-        </div>
-        <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
-    </div>
-    <!--@if($member_config->enable_ssl=='Y')-->
-    <p class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
-        <a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
-    </p>
-    <!--@end-->
-    <p class="save">
-        <input type="checkbox" name="keep_signed" id="keepid" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />
-        <label for="keepid">{$lang->keep_signed}</label>
-
-        <!--@if($member_config->enable_openid=='Y')-->
-        <br />
-        <input name="use_open_id" id="use_open_id" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;" />
-        <label for="use_open_id">Open ID</label>
-        <!--@end-->
-    </p>
-    <ul class="help">
-        <li class="first-child"><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
-        <li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
-        <li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
-    </ul>
+<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
+	<p>{$XE_VALIDATOR_MESSAGE}</p>
+</div>
+<form id="fo_login_widget" action="./" method="post" ruleset="@login" class="login_{$colorset}">
+	<fieldset>
+		<input type="hidden" name="act" value="procMemberLogin" />
+		<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+		<div class="idpwWrap">
+			<div class="idpw">
+				<input name="user_id" type="text" title="user id" />
+				<input name="password" type="password" title="password" />
+				<p class="keep">
+					<input type="checkbox" name="keep_signed" id="keep_signed" value="Y" />
+					<label for="keep_signed">{$lang->keep_signed}</label>
+				</p>
+			</div>
+			<input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
+		</div>
+		<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
+			<button type="button" class="text" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</button>
+		</p>
+		<p class="keep_msg">{$lang->about_keep_warning}</p>
+		<ul class="help">
+			<li><a href="{getUrl('act','dispMemberSignUpForm')}">{$lang->cmd_signup}</a></li>
+			<li><a href="{getUrl('act','dispMemberFindAccount')}">{$lang->cmd_find_member_account}</a></li>
+			<li><a href="{getUrl('act','dispMemberResendAuthMail')}">{$lang->cmd_resend_auth_mail}</a></li>
+		</ul>
+	</fieldset>
 </form> 
-</fieldset>
-
-<!-- OpenID -->
-<!--@if($member_config->enable_openid=='Y')-->
-<fieldset id="openid_login" class="openid_login_{$colorset}" style="display:none;">
-<legend>{$lang->cmd_login}</legend>
-  <form action="{getUrl('module','member','act','procMemberOpenIDLogin')}" method="post" onsubmit="return procFilter(this, openid_login)" >
-      <div class="idpwWrap">
-        <div class="idpw">
-          <p>{$lang->openid}</p>
-          <input type="text" name="openid" class="openid_user_id" />
-        </div>
-        <input type="image" src="./images/{$colorset}/buttonLogin.gif" alt="login" class="login" />
-      </div>
-      <p class="save">
-          <input name="use_open_id" id="use_open_id_2" type="checkbox" value="Y" onclick="toggleLoginForm(this); return false;"/>
-          <label for="use_open_id_2">Open ID</label>
-      </p>
-  </form>
-</fieldset>
-<!--@end-->
-
-<script type="text/javascript">
-  xAddEventListener(window, "load", function(){ doFocusUserId("fo_login_widget"); });
-</script>
diff --git a/widgets/login_info/skins/xe_official/login_info.html b/widgets/login_info/skins/xe_official/login_info.html
index 0705bf99b..f0915bc6b 100644
--- a/widgets/login_info/skins/xe_official/login_info.html
+++ b/widgets/login_info/skins/xe_official/login_info.html
@@ -1,31 +1,17 @@
-<!--// colorset의 값에 따라 css 파일을 import 한다 -->
-<!--@if($colorset=="black")-->
-    <!--%import("css/black.css")-->
-<!--@elseif($colorset=="white")-->
-    <!--%import("css/white.css")-->
-<!--@else-->
-    <!--%import("css/default.css")-->
-<!--@end-->
-
-<!--%import("./filter/logout.xml")-->
-
-<fieldset id="login" class="login_{$colorset}">
-<legend>{$lang->cmd_login}</legend>
-<form action="" method="post">
-
-    <div class="userName">
-        <div class="fl"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>
-        <div class="fr"><a href="{getUrl('act','dispMemberLogout')}"><img src="./images/{$colorset}/buttonLogout.gif" alt="{$lang->cmd_logout}" width="47" height="18" /></a></div>
-    </div>
-    <ul class="userMenu">
-        <!--@foreach($logged_info->menu_list as $key => $val)-->
-        <li><a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
-        <!--@end-->
-
-        <!--@if($logged_info->is_admin=="Y" && !$site_module_info->site_srl)-->
-        <li><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>
-        <!--@end-->
-    </ul>
-    <p class="latestLogin">{$lang->last_login}<br /><span>{zDate($logged_info->last_login, "Y-m-d H:i")}</span></p>
+<load cond="$colorset=='black'" target="css/black.css" />
+<load cond="$colorset=='white'" target="css/white.css" />
+<load cond="$colorset!='black|white'" target="css/default.css" />
+<load target="./filter/logout.xml" />
+<form action="" method="post" class="login_{$colorset}">
+	<fieldset>
+		<div class="userName">
+			<a href="#popup_menu_area" class="member_{$logged_info->member_srl}">{$logged_info->nick_name}</a>
+			<a href="{getUrl('act','dispMemberLogout')}">Log out</a>
+			<p class="latestLogin">{$lang->last_login}: {zDate($logged_info->last_login, "Y-m-d")}</p>
+		</div>
+		<ul class="userMenu">
+			<li loop="$logged_info->menu_list => $key,$val"><a href="{getUrl('', 'act',$key, 'mid', $mid, 'vid', $vid)}">{Context::getLang($val)}</a></li>
+			<li cond="$logged_info->is_admin=='Y' && !$site_module_info->site_srl"><a href="{getUrl('','module','admin')}">{$lang->cmd_management}</a></li>
+		</ul>
+	</fieldset>
 </form>
-</fieldset>
diff --git a/widgets/login_info/skins/xe_official/skin.xml b/widgets/login_info/skins/xe_official/skin.xml
index 1a358ea91..4607e4514 100644
--- a/widgets/login_info/skins/xe_official/skin.xml
+++ b/widgets/login_info/skins/xe_official/skin.xml
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">XE 공식 로그인 정보 출력</title>
-    <title xml:lang="jp">XE公式 ログイン情報表示</title>
-    <title xml:lang="en">Display XE Official Login Info</title>
-    <title xml:lang="vi">Skin hiển thị thông tin đăng nhập</title>
-    <title xml:lang="zh-CN">XE 官方网站登陆表单皮肤</title>
-    <title xml:lang="zh-TW">XE 官方網站登入面板</title>
-    <title xml:lang="tr">XE Resmi Giriş Bilgilerini Görüntüle.</title>
-    <description xml:lang="ko">
-        XE 공식 레이아웃에 적합한 로그인 정보 출력 위젯입니다.
-		제작 : NHN
-    </description>
-    <description xml:lang="jp">
-        XE公式レイアウトに適したログイン情報表示用のウィジェットです。
-		제작 : NHN
-    </description>
-    <description xml:lang="en">
-        This is a suitable login info display widget for XE Official layout.
-		제작 : NHN
-    </description>
-    <description xml:lang="vi">
-        Widget hiển thị thông tin đăng nhập với giao diện chính thức của XE.
-		제작 : NHN
-    </description>
-    <description xml:lang="zh-CN">
-        适合XE 官房网站布局的登陆表单控件。
-		제작 : NHN
-    </description>
-    <description xml:lang="zh-TW">
-        適合XE 官方網站登入面板。
-		제작 : NHN
-    </description>
-    <description xml:lang="tr">
-        Bu görsel bileşen, XE Resmi yerleşim düzeni için uygun giriş bilgisidir.
-		제작 : NHN
-    </description>
-    <version>0.1</version>
-    <date>2007-02-28</date>
-    <link>http://xpressengine.com/</link>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <colorset>
-        <color name="default">
-            <title xml:lang="ko">기본</title>
-            <title xml:lang="jp">デフォルト</title>
-            <title xml:lang="zh-CN">默认</title>
-            <title xml:lang="en">default</title>
-            <title xml:lang="vi">Mặc định</title>
-            <title xml:lang="zh-TW">預設</title>
-            <title xml:lang="tr">Varsayılan</title>
-        </color>
-        <color name="white">
-            <title xml:lang="ko">하얀색</title>
-            <title xml:lang="jp">白</title>
-            <title xml:lang="en">white</title>
-            <title xml:lang="vi">White</title>
-            <title xml:lang="zh-CN">白色</title>
-            <title xml:lang="zh-TW">白色</title>
-            <title xml:lang="tr">Beyaz</title>
-        </color>
-        <color name="black">
-            <title xml:lang="ko">검은색</title>
-            <title xml:lang="jp">黒</title>
-            <title xml:lang="en">Black</title>
-            <title xml:lang="vi">Black</title>
-            <title xml:lang="zh-CN">黑色</title>
-            <title xml:lang="zh-TW">黑色</title>
-            <title xml:lang="tr">Siyah</title>
-        </color>
-    </colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 공식 로그인 정보 출력</title>
+    <title xml:lang="jp">XE公式 ログイン情報表示</title>
+    <title xml:lang="en">Display XE Official Login Info</title>
+    <title xml:lang="vi">Skin hiển thị thông tin đăng nhập</title>
+    <title xml:lang="zh-CN">XE 官方网站登陆表单皮肤</title>
+    <title xml:lang="zh-TW">XE 官方網站登入面板</title>
+    <title xml:lang="tr">XE Resmi Giriş Bilgilerini Görüntüle.</title>
+    <description xml:lang="ko">
+        XE 공식 레이아웃에 적합한 로그인 정보 출력 위젯입니다.
+		제작 : NHN
+    </description>
+    <description xml:lang="jp">
+        XE公式レイアウトに適したログイン情報表示用のウィジェットです。
+		제작 : NHN
+    </description>
+    <description xml:lang="en">
+        This widget displays the login information for the Official layout of XE.
+		제작 : NHN
+    </description>
+    <description xml:lang="vi">
+        Widget hiển thị thông tin đăng nhập với giao diện chính thức của XE.
+		제작 : NHN
+    </description>
+    <description xml:lang="zh-CN">
+        适合XE 官房网站布局的登陆表单控件。
+		제작 : NHN
+    </description>
+    <description xml:lang="zh-TW">
+        適合XE 官方網站登入面板。
+		제작 : NHN
+    </description>
+    <description xml:lang="tr">
+        Bu görsel bileşen, XE Resmi yerleşim düzeni için uygun giriş bilgisidir.
+		제작 : NHN
+    </description>
+    <version>0.1</version>
+    <date>2007-02-28</date>
+    <link>http://xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="default">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">Varsayılan</title>
+        </color>
+        <color name="white">
+            <title xml:lang="ko">하얀색</title>
+            <title xml:lang="jp">白</title>
+            <title xml:lang="en">white</title>
+            <title xml:lang="vi">White</title>
+            <title xml:lang="zh-CN">白色</title>
+            <title xml:lang="zh-TW">白色</title>
+            <title xml:lang="tr">Beyaz</title>
+        </color>
+        <color name="black">
+            <title xml:lang="ko">검은색</title>
+            <title xml:lang="jp">黒</title>
+            <title xml:lang="en">Black</title>
+            <title xml:lang="vi">Black</title>
+            <title xml:lang="zh-CN">黑色</title>
+            <title xml:lang="zh-TW">黑色</title>
+            <title xml:lang="tr">Siyah</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css b/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css
new file mode 100644
index 000000000..c8312051f
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/css/style.css
@@ -0,0 +1,54 @@
+@charset "utf-8";
+/* CSS Document */
+
+#login							{border:none;margin:0;padding:0;font-family:Arial,Helvetica,sans-serif;}
+#login legend					{display:none;font-size:0;height:0;overflow:hidden;width:0;}
+#sign_box						{position:absolute;right:0;top:40px;z-index:100;}
+#sign_box div.txt				{display:inline-block;padding-right:27px;position:absolute;text-align:right;top:0;right:0;z-index:140;cursor:pointer;}
+#sign_box div.txt span.label	{display:inline-block;padding-left:10px;white-space:nowrap;}
+#sign_box .sign_state1			{color:#d3d3d3;height:31px;background:url(../images/signin_key_right_off.gif) no-repeat top right;}
+#sign_box .sign_state2			{color:#d3d3d3;height:30px;background:url(../images/signin_key_right_on.gif) no-repeat top right;}
+
+#sign_box .sign_state1 span.label		{color:#d3d3d3;padding-top:8px;height:23px;background:url(../images/signin_key_left_off.gif) no-repeat top left;}
+#sign_box .sign_state2 span.label		{color:#d3d3d3;padding-top:8px;height:22px;background:url(../images/signin_key_left_on.gif) no-repeat top left;}
+
+
+#sign_box .signin_window	{display:none;width:219px;position:absolute;right:0px;top:29px;z-index:120;}
+.signin_window .head			{line-height:0;font-size:0;display:block;float:left;width:219px;height:1px;background:url(../images/signin_bg_tt.gif) no-repeat top left;}
+.signin_window .tail	{display:block;line-height:0;font-size:0;float:left;width:219px;height:3px;}
+
+.signin_window div.body		{width:219px;padding-top:11px;float:left;background:url(../images/signin_body_bg.gif) repeat-y top left;}
+.signin_window .mb_input_box	{width:195px;height:76px;margin:0 auto;background:url(../images/signin_win_hr.gif) no-repeat bottom left;}
+.signin_window .m_left		{width:144px;float:left;}
+.signin_window .m_right		{width:51px;float:left;}
+.signin_window .input_text	{width:133px;height:21px;padding:0 2px ;margin-bottom:6px;float:left;background:url(../images/signin_input.gif) no-repeat scroll top left;}
+.signin_window .input_text input	{width:132px;height:17px;margin:0;padding:0;background:none;color:#D3D3D3;font-size:12px;}
+.signin_window .input_text		{position:relative;}
+.signin_window .input_text img	{position:absolute;top:4px;left:4px;}
+.signin_window .input_text input	{position:absolute;width:115px;outline:none;top:2px;left:15px;}
+.sign_check					{margin:0;padding:0;}
+.signin_window input		{border:none;margin:0;padding:0;}
+.signin_window .btnbar		{width:195px;height:23px; padding-top:7px;margin:0 auto;}
+.signin_window .btnbar a.in	{display:block;margin-right:14px;}
+.signin_window .m_left label	{color:#ebf8ff;font-size:12px;}
+.signin_window .m_left label input		{margin-right:6px;vertical-align: middle;}
+/* 196px; signin_input.gif */
+#sign_box .mbInfo_window 			{display:none;width:172px;position:absolute;right:0px;top:29px;z-index:50;}
+.mbInfo_window .head				{line-height:0;font-size:0;display:block;float:left;width:172px;height:1px;background:url(../images/minfo_bg_tt.gif) no-repeat top left;}
+.mbInfo_window div.body				{width:172px;padding-top:11px;float:left;background:url(../images/minfo_body_bg.gif) repeat-y top left;}
+.mbInfo_window div.body ul			{width:143px;margin:0 auto;padding-bottom:4px;background:url(../images/signin_win_hr.gif) no-repeat bottom left;}
+.mbInfo_window li					{height:23px;padding-left:19px;}
+.mbInfo_window li a					{text-decoration:none;color:#929292;}
+.mbInfo_window div.body .btnbar		{width:143px;margin:0 auto;padding:10px 0 8px 0;}
+.mbInfo_window .btnbar p			{width:75px;margin:0 7px 0 0;float:left;font-size:11px;color:#7e7e7e; font-family:Arial, Helvetica, sans-serif;}
+.mbInfo_window .btnbar a			{float:right;}
+.icon_img		{width:16px; height:16px;} 
+.mbInfo_window .tail				{width:172px;height:3px;float:left;}
+
+.mbInfo_window li.i1					{background:url(../images/icon_write.gif) no-repeat 1px 0;}
+.mbInfo_window li.i2					{background:url(../images/icon_add.gif) no-repeat top left;}
+.mbInfo_window li.i3					{background:url(../images/icon_check.gif) no-repeat top left;}
+.mbInfo_window li.i4					{background:url(../images/icon_article.gif) no-repeat top left;}
+.mbInfo_window li.i5					{background:url(../images/icon_friends.gif) no-repeat top left;}
+.mbInfo_window li.i6					{background:url(../images/icon_message.gif) no-repeat top left;}
+.mbInfo_window li.i7					{background:url(../images/icon_tool.gif) no-repeat top left;}
\ No newline at end of file
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/filter/login.xml b/widgets/login_info/skins/xe_solid_enterprise_login/filter/login.xml
new file mode 100644
index 000000000..9ef770464
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/filter/login.xml
@@ -0,0 +1,11 @@
+<filter name="widget_login" module="member" act="procMemberLogin">
+  <form>
+    <node target="user_id" required="true" filter="user_id" />
+    <node target="password" required="true" />
+  </form>
+  <parameter />
+  <response callback_func="completeLogin">
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/filter/logout.xml b/widgets/login_info/skins/xe_solid_enterprise_login/filter/logout.xml
new file mode 100644
index 000000000..8005776d3
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/filter/logout.xml
@@ -0,0 +1,7 @@
+<filter name="widget_logout" module="member" act="procMemberLogout">
+  <form />
+  <response>
+    <tag name="error" />
+    <tag name="message" />
+  </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/filter/openid_login.xml b/widgets/login_info/skins/xe_solid_enterprise_login/filter/openid_login.xml
new file mode 100644
index 000000000..bf0ce028c
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/filter/openid_login.xml
@@ -0,0 +1,10 @@
+<filter name="openid_login" module="member" act="procMemberOpenIDLogin">
+    <form>
+        <node target="openid" required="true" />
+    </form>
+    <parameter />
+    <response callback_func="completeOpenIDLogin">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/Thumbs.db b/widgets/login_info/skins/xe_solid_enterprise_login/images/Thumbs.db
new file mode 100644
index 000000000..c21783bf6
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/Thumbs.db differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/btn_signin.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/btn_signin.gif
new file mode 100644
index 000000000..046f4b447
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/btn_signin.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/btn_signout.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/btn_signout.gif
new file mode 100644
index 000000000..96e5e72dd
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/btn_signout.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/bullet_input_id.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/bullet_input_id.gif
new file mode 100644
index 000000000..8cd965ce5
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/bullet_input_id.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/bullet_input_pw.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/bullet_input_pw.gif
new file mode 100644
index 000000000..102429273
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/bullet_input_pw.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_add.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_add.gif
new file mode 100644
index 000000000..42520c97f
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_add.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_article.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_article.gif
new file mode 100644
index 000000000..023b63d2f
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_article.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_at.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_at.gif
new file mode 100644
index 000000000..9e8a96f8a
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_at.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_book.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_book.gif
new file mode 100644
index 000000000..9f5a8708b
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_book.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_check.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_check.gif
new file mode 100644
index 000000000..7973f929d
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_check.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_friends.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_friends.gif
new file mode 100644
index 000000000..7fae3300a
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_friends.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_graph.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_graph.gif
new file mode 100644
index 000000000..fb4202dcc
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_graph.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_help.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_help.gif
new file mode 100644
index 000000000..4f9903d1f
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_help.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_mbinfo.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_mbinfo.gif
new file mode 100644
index 000000000..17b71fd1b
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_mbinfo.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_message.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_message.gif
new file mode 100644
index 000000000..1e7897dea
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_message.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_money.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_money.gif
new file mode 100644
index 000000000..ac400c442
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_money.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_note.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_note.gif
new file mode 100644
index 000000000..2f45c58c0
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_note.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_tool.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_tool.gif
new file mode 100644
index 000000000..8c1835d22
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_tool.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_write.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_write.gif
new file mode 100644
index 000000000..03afbfc70
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_write.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_written.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_written.gif
new file mode 100644
index 000000000..6e5fba5da
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/icon_written.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_bg_tail.png b/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_bg_tail.png
new file mode 100644
index 000000000..cd80e9a86
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_bg_tail.png differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_bg_tt.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_bg_tt.gif
new file mode 100644
index 000000000..e0092c140
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_bg_tt.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_body_bg.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_body_bg.gif
new file mode 100644
index 000000000..b1c9e6478
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/minfo_body_bg.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tail.png b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tail.png
new file mode 100644
index 000000000..eb65ce349
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tail.png differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tt.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tt.gif
new file mode 100644
index 000000000..652c7678c
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tt.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tt.png b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tt.png
new file mode 100644
index 000000000..859dfab7d
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_bg_tt.png differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_body_bg.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_body_bg.gif
new file mode 100644
index 000000000..052afedac
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_body_bg.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_input.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_input.gif
new file mode 100644
index 000000000..77ac26511
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_input.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_bg.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_bg.gif
new file mode 100644
index 000000000..941b1ce56
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_bg.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left.gif
new file mode 100644
index 000000000..ff8e7f3b1
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left_off.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left_off.gif
new file mode 100644
index 000000000..be9663460
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left_off.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left_on.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left_on.gif
new file mode 100644
index 000000000..4c134a5a4
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_left_on.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right.gif
new file mode 100644
index 000000000..369640433
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right_off.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right_off.gif
new file mode 100644
index 000000000..ee62e52bc
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right_off.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right_on.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right_on.gif
new file mode 100644
index 000000000..b12de1f43
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_key_right_on.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_win_hr.gif b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_win_hr.gif
new file mode 100644
index 000000000..1f852123b
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/images/signin_win_hr.gif differ
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/js/login.js b/widgets/login_info/skins/xe_solid_enterprise_login/js/login.js
new file mode 100644
index 000000000..0e32680ef
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/js/login.js
@@ -0,0 +1,21 @@
+jQuery(function($){	
+
+//SignIn Window Control
+	var sign_box = $('div#sign_box');
+	var trigger = sign_box.find('>div.txt');
+	trigger.click(function(){
+			if(trigger.hasClass('sign_state1')){
+				trigger.removeClass('sign_state1').addClass('sign_state2');	
+			}else{
+				trigger.removeClass('sign_state2').addClass('sign_state1');
+			}
+			sign_box.find('>div.signin_window').slideToggle('fast');
+			sign_box.find('>div.mbInfo_window').slideToggle('fast');
+		});
+
+	
+});
+function completeLogin(ret_obj, response_tags, params, fo_obj) {
+    var url =  current_url.setQuery('act','');
+    location.href = url;
+}
\ No newline at end of file
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
new file mode 100644
index 000000000..0d2cb72ec
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_form.html
@@ -0,0 +1,47 @@
+<!--%import("css/style.css")-->
+
+
+<!--%import("./filter/login.xml")-->
+<!--%import("./js/login.js")-->
+<script type="text/javascript">
+//<![CDATA[
+var keep_signed_msg = "{$lang->about_keep_signed}";
+//]]>
+
+</script>
+
+<form action="./" method="post" ruleset="@login" id="fo_login_widget">
+<fieldset id="login">
+<legend>{$lang->cmd_login}</legend>
+<input type="hidden" name="act" value="procMemberLogin" />
+<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
+<div id="sign_box">
+	<div class="txt sign_state1"><span class="label">Sign in</span></div>
+	<div class="signin_window" style="display:none;">
+		<span class="head"></span>
+		<div class="body">
+			<div class="mb_input_box">
+				<div class="m_left">
+					<div class="input_text mb_id"><img src="images/bullet_input_id.gif" alt="" title="" /><input name="user_id" type="text" title="user id" /></div>
+					<div class="input_text mb_pw"><img src="images/bullet_input_pw.gif" alt="" title="" /><input name="password"type="password" title="password" /></div>
+					<label><input  type="checkbox" name="keep_signed" id="keepid" class="sign_check" value="Y" onclick="if(this.checked) return confirm(keep_signed_msg);" />{$lang->keep_signed}</label>
+					
+					<p cond="$ssl_mode" class="securitySignIn <!--@if($ssl_mode)-->SSL<!--@else-->noneSSL<!--@end-->">
+						<a href="#" onclick="toggleSecuritySignIn(); return false;">{$lang->security_sign_in}</a>
+					</p>
+				</div>
+				<div class="m_right">
+					<input class="sign_submit" type="image" src="images/btn_signin.gif" width="51" height="46" />
+				</div>
+			</div>
+			<div class="btnbar">
+				<a href="{getUrl('act','dispMemberSignUpForm')}"><img src="images/icon_book.gif" alt="" title="{$lang->cmd_signup}"/></a>
+				<a href="{getUrl('act','dispMemberFindAccount')}"><img src="images/icon_at.gif" alt="" title="{$lang->cmd_find_member_account}"/></a>
+				<a href="{getUrl('act','dispMemberResendAuthMail')}"><img src="images/icon_help.gif" alt="" title="{$lang->cmd_resend_auth_mail}"/></a>
+			</div>
+		</div><!-- //body -->
+		<span class="tail"><img src="images/signin_bg_tail.png" width="219" height="3" alt="" class="iePngFix" /></span>
+	</div><!-- //signin_window -->
+</div>
+</fieldset>
+</form>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html b/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
new file mode 100644
index 000000000..8af0d1fd1
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/login_info.html
@@ -0,0 +1,33 @@
+<!--%import("css/style.css")-->
+<!--%import("./filter/logout.xml")-->
+<!--%import("./js/login.js")-->
+
+<form action="" method="post">
+<fieldset id="login" class="login_{$colorset}">
+<legend>{$lang->cmd_login}</legend>
+<div id="sign_box">
+    <div class="txt sign_state1"><span class="label">{$logged_info->nick_name}</span></div>
+	<div class="mbInfo_window" style="overflow:hidden;">
+		<span class="head"></span>
+		<div class="body" style="z-index:1000">
+			<ul>
+				{@ $i = 1;}
+				<!--@foreach($logged_info->menu_list as $key => $val)-->
+				<li class="i{$i}">
+
+				<a href="{getUrl('act',$key,'member_srl','','page','')}">{Context::getLang($val)}</a></li>
+				{@ $i++;}
+				<!--@end-->
+				<li class="i7"><a href="{getUrl('','module','admin')}" onclick="window.open(this.href);return false;">{$lang->cmd_management}</a></li>
+			</ul>
+			<div class="btnbar">
+				<p>{$lang->last_login}<br />{zDate($logged_info->last_login, "Y-m-d")}</p>
+				<a href="{getUrl('act','dispMemberLogout')}"><img src="images/btn_signout.gif" alt="{$lang->cmd_logout}"/></a>
+			</div>
+			<iframe class="T_iframe" border=0 style="top:0px;left:0px;width:219px;height:400px;z-index:-1;position:absolute;"></iframe>
+		</div><!-- //body -->
+		<span class="tail"><img src="images/minfo_bg_tail.png" width="172" height="3" alt="" class="iePngFix" /></span>
+	</div><!-- //mbInfo_window -->
+</div><!-- //sign_box -->
+</fieldset>
+</form>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml b/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml
new file mode 100644
index 000000000..8a52b7dcf
--- /dev/null
+++ b/widgets/login_info/skins/xe_solid_enterprise_login/skin.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">XE 기업용 로그인 스킨</title>
+    <title xml:lang="jp">XE Solid Enterprise Login Skin</title>
+    <title xml:lang="en">XE Solid Enterprise Login Skin</title>
+    <title xml:lang="vi">XE Solid Enterprise Login Skin</title>
+    <title xml:lang="zh-CN">XE标准企业会员登录皮肤</title>
+    <title xml:lang="zh-TW">XE Solid Enterprise Login Skin</title>
+    <title xml:lang="tr">XE Solid Enterprise Login Skin</title>
+    <description xml:lang="ko">
+		XE 기업용 레이아웃과 조합하여 쓰이도록 디자인 된 로그인 위젯스킨입니다.
+        NHN (developers@xpressengine.com)
+    </description>
+    <description xml:lang="jp">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently.
+		Author : developer
+    </description>
+    <description xml:lang="en">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently.
+		Author : developer
+    </description>
+    <description xml:lang="vi">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently.
+		Author : developer
+    </description>
+    <description xml:lang="zh-CN">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently.
+		Author : developer
+    </description>
+    <description xml:lang="zh-TW">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently.
+		Author : developer
+    </description>
+    <description xml:lang="tr">
+        The Skin inherits the style from the XE Solid Enterprise layout, the users are able to login the site conveniently.
+		Author : developer
+    </description>
+    <version>0.1</version>
+    <date>2011-8-26</date>
+    <link>http://www.xpressengine.com/</link>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <colorset>
+        <color name="default">
+            <title xml:lang="ko">기본</title>
+            <title xml:lang="jp">デフォルト</title>
+            <title xml:lang="zh-CN">默认</title>
+            <title xml:lang="en">default</title>
+            <title xml:lang="vi">Mặc định</title>
+            <title xml:lang="zh-TW">預設</title>
+            <title xml:lang="tr">Varsayılan</title>
+        </color>
+    </colorset>
+</skin>
diff --git a/widgets/login_info/skins/xe_solid_enterprise_login/thumbnail.png b/widgets/login_info/skins/xe_solid_enterprise_login/thumbnail.png
new file mode 100644
index 000000000..8ec45e1b2
Binary files /dev/null and b/widgets/login_info/skins/xe_solid_enterprise_login/thumbnail.png differ
diff --git a/widgets/mcontent/conf/info.xml b/widgets/mcontent/conf/info.xml
index fde00f7fb..ba1873af6 100644
--- a/widgets/mcontent/conf/info.xml
+++ b/widgets/mcontent/conf/info.xml
@@ -1,543 +1,543 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget version="0.2">
-    <title xml:lang="ko">모바일 콘텐츠 위젯</title>
-    <title xml:lang="en">Mobile Content Widget</title>
-    <title xml:lang="vi">Nội dung</title>
-    <title xml:lang="zh-CN">全局内容控件</title>
-    <title xml:lang="zh-TW">內容</title>
-    <title xml:lang="jp">コンテンツウィジェット</title>
-    <title xml:lang="tr">Mobil İçerik Görsel Bileşeni</title>
-    <description xml:lang="ko">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
-    <description xml:lang="en">This widget displays Content such as articles, comments, or attached files.</description>
-	<description xml:lang="vi">Widget này sẽ hiển thị những bài viết, bình luận, File đính kèm.</description>
-    <description xml:lang="zh-CN">以各种样式显示主题，评论，附件等站内内容的全局控件。</description>
-    <description xml:lang="zh-TW">這個 Widget 可輸出討論板、評論，附加檔案等內容。</description>
-    <description xml:lang="jp">掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。</description>
-    <description xml:lang="tr">Bu görsel bileşen, yazılar, yorumlar ve ekli dosyalar gibi İçerikleri görüntüler.</description>
-    <version>0.1</version>
-    <date>2009-03-16</date>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="en">NHN</name>
-        <name xml:lang="vi">NHN</name>
-        <name xml:lang="es">NHN</name>
-        <name xml:lang="ru">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <extra_vars>
-        <var id="content_type">
-            <type>select</type>
-                <name xml:lang="ko">추출대상</name>
-                <name xml:lang="en">Target</name>
-                <name xml:lang="vi">Khu vực</name>
-                <name xml:lang="zh-CN">对象</name>
-                <name xml:lang="zh-TW">目標</name>
-                <name xml:lang="jp">抽出対象</name>
-                <name xml:lang="tr">Hedef</name>
-            <options>
-                <value>document</value>
-                <name xml:lang="ko">게시물</name>
-                <name xml:lang="en">Article</name>
-                <name xml:lang="vi">Bài viết</name>
-                <name xml:lang="zh-CN">主题</name>
-				<name xml:lang="zh-TW">主題</name>
-                <name xml:lang="jp">書き込み</name>
-                <name xml:lang="tr">Yazı</name>
-            </options>
-            <options>
-                <value>comment</value>
-                <name xml:lang="ko">댓글</name>
-                <name xml:lang="en">Comment</name>
-                <name xml:lang="vi">Bình luận</name>
-                <name xml:lang="zh-CN">评论</name>
-				<name xml:lang="zh-TW">評論</name>
-                <name xml:lang="jp">コメント</name>
-                <name xml:lang="tr">Yorum</name>
-            </options>
-            <options>
-                <value>image</value>
-                <name xml:lang="ko">첨부이미지</name>
-                <name xml:lang="en">Attached Image</name>
-                <name xml:lang="vi">Hình đính kèm</name>
-                <name xml:lang="zh-CN">图片</name>
-				<name xml:lang="zh-TW">圖片</name>
-                <name xml:lang="jp">添付イメージ</name>
-                <name xml:lang="tr">Ekli Resim</name>
-            </options>
-            <options>
-                <value>trackback</value>
-                <name xml:lang="ko">트랙백</name>
-                <name xml:lang="en">Trackback</name>
-                <name xml:lang="vi">Liên kết Web</name>
-                <name xml:lang="zh-CN">引用</name>
-				<name xml:lang="zh-TW">引用</name>
-                <name xml:lang="jp">トラックバック</name>
-                <name xml:lang="tr">Geri izleme</name>
-            </options>
-            <options>
-                <value>rss</value>
-                <name xml:lang="ko">피드 (RSS/ATOM)</name>
-                <name xml:lang="en">Feed (RSS/ATOM)</name>
-                <name xml:lang="vi">Feed (RSS/ATOM)</name>
-                <name xml:lang="zh-CN">Feed (RSS/ATOM)</name>
-				<name xml:lang="zh-TW">Feed (RSS/ATOM)</name>
-                <name xml:lang="jp">Feed (RSS/ATOM)</name>
-                <name xml:lang="tr">Feed (RSS/ATOM)</name>
-            </options>
-        </var>
-        <var id="list_type">
-            <type>select</type>
-            <name xml:lang="ko">내용형태</name>
-            <name xml:lang="en">Content Type</name>
-            <name xml:lang="vi">Kiểu hiển thị</name>
-            <name xml:lang="zh-CN">内容样式</name>
-            <name xml:lang="zh-TW">內容樣式</name>
-            <name xml:lang="jp">内容のタイプ</name>
-            <name xml:lang="tr">İçerik Şekli</name>
-            <options>
-                <value>normal</value>
-                <name xml:lang="ko">제목</name>
-                <name xml:lang="en">Title</name>
-                <name xml:lang="vi">Tiêu đề</name>
-                <name xml:lang="zh-CN">标题</name>
-                <name xml:lang="zh-TW">標題</name>
-                <name xml:lang="jp">タイトル</name>
-                <name xml:lang="tr">Başlık</name>
-            </options>
-            <options>
-                <value>image_title</value>
-                <name xml:lang="ko">이미지+제목</name>
-                <name xml:lang="enko">Image+Title</name>
-                <name xml:lang="vi">Hình ảnh+Tiêu đề</name>
-                <name xml:lang="zh-CN">图片+标题</name>
-                <name xml:lang="zh-TW">圖片+標題</name>
-                <name xml:lang="jp">画像+タイトル</name>
-                <name xml:lang="tr">Resim+Başlık</name>
-            </options>
-            <options>
-                <value>image_title_content</value>
-                <name xml:lang="ko">이미지+제목+내용</name>
-                <name xml:lang="en">Image+Title+Content</name>
-                <name xml:lang="vi">Hình ảnh+Tiêu đề+Nội dung</name>
-                <name xml:lang="zh-CN">图片+标题+内容</name>
-                <name xml:lang="zh-TW">圖片+標題+內容</name>
-                <name xml:lang="jp">画像+タイトル+内容</name>
-                <name xml:lang="tr">Resim+Başlık+İçerik</name>
-            </options>
-        </var>
-        <var id="option_view">
-            <type>select-multi-order</type>
-            <name xml:lang="ko">표시항목</name>
-            <name xml:lang="en">Display Target &amp; Order</name>
-            <name xml:lang="vi">Hiển thị khu vực và thứ tự</name>
-            <name xml:lang="zh-CN">显示项及顺序</name>
-            <name xml:lang="zh-TW">顯示項目順序</name>
-            <name xml:lang="jp">表示項目、および順番</name>
-            <name xml:lang="tr">Hedef Gösterim &amp; Sırası</name>
-            <options default="false" init="true">
-                <value>title</value>
-                <name xml:lang="ko">제목</name>
-                <name xml:lang="en">Title</name>
-                <name xml:lang="vi">Tiêu đề</name>
-                <name xml:lang="zh-CN">标题</name>
-                <name xml:lang="zh-TW">標題</name>
-                <name xml:lang="jp">タイトル</name>
-                <name xml:lang="tr">Başlık</name>
-            </options>
-            <options>
-                <value>thumbnail</value>
-                <name xml:lang="ko">섬네일</name>
-                <name xml:lang="en">Thumbnail</name>
-                <name xml:lang="vi">Hình nhỏ</name>
-                <name xml:lang="zh-CN">缩略图</name>
-                <name xml:lang="zh-TW">縮圖</name>
-                <name xml:lang="jp">サムネール</name>
-                <name xml:lang="tr">Küçük Resim</name>
-            </options>
-            <options init="true">
-                <value>regdate</value>
-                <name xml:lang="ko">등록일</name>
-                <name xml:lang="en">Regdate</name>
-                <name xml:lang="vi">Ngày gửi</name>
-                <name xml:lang="zh-CN">发布日期</name>
-                <name xml:lang="zh-TW">發表日期</name>
-                <name xml:lang="jp">登録日</name>
-                <name xml:lang="tr">Kayıt Tarihi</name>
-            </options>
-            <options init="true">
-                <value>nickname</value>
-                <name xml:lang="ko">글쓴이</name>
-                <name xml:lang="en">Author</name>
-                <name xml:lang="vi">Người gửi</name>
-                <name xml:lang="zh-CN">发布者</name>
-                <name xml:lang="zh-TW">作者</name>
-                <name xml:lang="jp">登録者</name>
-                <name xml:lang="tr">Yazar</name>
-            </options>
-            <options>
-                <value>content</value>
-                <name xml:lang="ko">내용</name>
-                <name xml:lang="en">Content</name>
-                <name xml:lang="vi">Nội dung</name>
-                <name xml:lang="zh-CN">内容</name>
-                <name xml:lang="zh-TW">內容</name>
-                <name xml:lang="jp">内容</name>
-                <name xml:lang="tr">İçerik</name>
-            </options>
-        </var>
-        <var id="show_browser_title">
-            <type>select</type>
-            <name xml:lang="ko">게시판 이름 표시</name>
-            <name xml:lang="en">Display Article Name</name>
-            <name xml:lang="vi">Tên bài viết</name>
-            <name xml:lang="zh-CN">显示版面名称</name>
-            <name xml:lang="zh-TW">討論板名稱</name>
-            <name xml:lang="jp">掲示板名の表示</name>
-            <name xml:lang="tr">Makale İsmini Görüntüle</name>
-            <options>
-                <value>Y</value>
-                <name xml:lang="ko">출력</name>
-                <name xml:lang="en">Display</name>
-                <name xml:lang="vi">Hiển thị</name>
-                <name xml:lang="zh-CN">显示</name>
-                <name xml:lang="zh-TW">顯示</name>
-                <name xml:lang="jp">表示</name>
-                <name xml:lang="tr">Görüntüle</name>
-            </options>
-            <options>
-                <value>N</value>
-                <name xml:lang="ko">출력하지 않음</name>
-                <name xml:lang="en">No Display</name>
-                <name xml:lang="vi">Không hiển thị</name>
-                <name xml:lang="zh-CN">不显示</name>
-                <name xml:lang="zh-TW">不顯示</name>
-                <name xml:lang="jp">表示しない</name>
-                <name xml:lang="tr">Görüntüleme</name>
-            </options>
-        </var>
-        <var id="show_comment_count">
-            <type>select</type>
-            <name xml:lang="ko">댓글수 표시</name>
-            <name xml:lang="en">Comment Count</name>
-            <name xml:lang="vi">Số bình luận</name>
-            <name xml:lang="zh-CN">显示评论数</name>
-            <name xml:lang="zh-TW">評論數</name>
-            <name xml:lang="jp">コメント数</name>
-            <name xml:lang="tr">Yorum Sayısı</name>
-            <options>
-                <value>Y</value>
-                <name xml:lang="ko">출력</name>
-                <name xml:lang="en">Display</name>
-                <name xml:lang="vi">Hiển thị</name>
-                <name xml:lang="zh-CN">显示</name>
-                <name xml:lang="zh-TW">顯示</name>
-                <name xml:lang="jp">表示</name>
-                <name xml:lang="tr">Görüntüle</name>
-            </options>
-            <options>
-                <value>N</value>
-                <name xml:lang="ko">출력하지 않음</name>
-                <name xml:lang="en">No Display</name>
-                <name xml:lang="vi">Không hiển thị</name>
-                <name xml:lang="zh-CN">不显示</name>
-                <name xml:lang="zh-TW">不顯示</name>
-                <name xml:lang="jp">表示しない</name>
-                <name xml:lang="tr">Görüntüleme</name>
-            </options>
-        </var>
-        <var id="show_trackback_count">
-            <type>select</type>
-            <name xml:lang="ko">엮인글수 표시</name>
-            <name xml:lang="en">Trackback</name>
-            <name xml:lang="vi">Liên kết Web</name>
-            <name xml:lang="zh-CN">显示引用数</name>
-            <name xml:lang="zh-TW">引用數</name>
-            <name xml:lang="jp">トラックバック数の表示</name>
-            <name xml:lang="tr">Geri izleme</name>
-            <options>
-                <value>Y</value>
-                <name xml:lang="ko">출력</name>
-                <name xml:lang="en">Display</name>
-                <name xml:lang="vi">Hiển thị</name>
-                <name xml:lang="zh-CN">显示</name>
-                <name xml:lang="zh-TW">顯示</name>
-                <name xml:lang="jp">表示</name>
-                <name xml:lang="tr">Görüntüle</name>
-            </options>
-            <options>
-                <value>N</value>
-                <name xml:lang="ko">출력하지 않음</name>
-                <name xml:lang="en">No Display</name>
-                <name xml:lang="vi">Không hiển thị</name>
-                <name xml:lang="zh-CN">不显示</name>
-                <name xml:lang="zh-TW">不顯示</name>
-                <name xml:lang="jp">表示しない</name>
-                <name xml:lang="tr">Görüntüleme</name>
-            </options>
-        </var>
-        <var id="show_category">
-            <type>select</type>
-            <name xml:lang="ko">분류 표시</name>
-            <name xml:lang="en">Category</name>
-            <name xml:lang="vi">Thể loại</name>
-            <name xml:lang="zh-CN">显示分类</name>
-            <name xml:lang="zh-TW">分類</name>
-            <name xml:lang="jp">カテゴリ表示</name>
-            <name xml:lang="tr">Kategori</name>
-            <options>
-                <value>Y</value>
-                <name xml:lang="ko">출력</name>
-                <name xml:lang="en">Display</name>
-                <name xml:lang="vi">Hiển thị</name>
-                <name xml:lang="zh-CN">显示</name>
-                <name xml:lang="zh-TW">顯示</name>
-                <name xml:lang="jp">表示</name>
-                <name xml:lang="tr">Görüntüle</name>
-            </options>
-            <options>
-                <value>N</value>
-                <name xml:lang="ko">출력하지 않음</name>
-                <name xml:lang="en">No Display</name>
-                <name xml:lang="vi">Không hiển thị</name>
-                <name xml:lang="zh-CN">不显示</name>
-                <name xml:lang="zh-TW">不顯示</name>
-                <name xml:lang="jp">表示しない</name>
-                <name xml:lang="tr">Görüntüleme</name>
-            </options>
-        </var>
-        <var id="order_target">
-            <type>select</type>
-            <name xml:lang="ko">정렬 대상</name>
-            <name xml:lang="zh-CN">排序对象</name>
-            <name xml:lang="jp">ソート対象</name>
-            <name xml:lang="en">Target to be sorted</name>
-            <name xml:lang="vi">Phân loại</name>
-            <name xml:lang="es">Objetivo para ser ordenados</name>
-            <name xml:lang="ru">Назначение для сортировки</name>
-            <name xml:lang="zh-TW">排列順序</name>
-            <name xml:lang="tr">Sıralanacak Hedef</name>
-            <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
-            <description xml:lang="zh-CN">可以按照指定的顺序进行排序。</description>
-            <description xml:lang="jp">登録順、または変更順にソートします。</description>
-            <description xml:lang="en">The list of newewst articles may be sorted by submitted order or modified order.</description>
-            <description xml:lang="vi">Danh sách bài viết mới nhất có thể được được phân loại bởi danh sách đã gửi hay đã sửa.</description>
-            <description xml:lang="es">La lista de los documentos recientes pueden ser ordenados en el orden del agregado o en el de modificados.</description>
-            <description xml:lang="ru">Список последних статей может быть отсортирован по дате размещения или изменения.</description>
-            <description xml:lang="zh-TW">按照指定的順序進行排列。</description>
-            <description xml:lang="tr">En yeni makale listesi, gönderilme sırasına veya değiştirilme sırasına göre sıralanabilir.</description>
-            <options>
-                <value>list_order</value>
-                <name xml:lang="ko">최신 등록순</name>
-                <name xml:lang="zh-CN">最新发表顺</name>
-                <name xml:lang="jp">最新登録順</name>
-                <name xml:lang="en">Newest Submitted Order</name>
-                <name xml:lang="vi">Bài mới gửi</name>
-                <name xml:lang="es">Orden de agregados recientemente</name>
-                <name xml:lang="ru">Порядок размещенных статей</name>
-                <name xml:lang="zh-TW">最新發表</name>
-                <name xml:lang="tr">En Son Gönderim Sırası</name>
-            </options>
-            <options>
-                <value>update_order</value>
-                <name xml:lang="ko">최근 변경순</name>
-                <name xml:lang="zh-CN">最新修改顺</name>
-                <name xml:lang="jp">最新変更順</name>
-                <name xml:lang="en">Newest Modified Order</name>
-                <name xml:lang="vi">Bài mới sửa</name>
-                <name xml:lang="es">Orden de modificados recientemente</name>
-                <name xml:lang="ru">Порядок измененных статей</name>
-                <name xml:lang="zh-TW">最新修改</name>
-                <name xml:lang="tr">En Son Değiştirilme Sırası</name>
-            </options>
-        </var>
-        <var id="order_type">
-            <type>select</type>
-            <name xml:lang="ko">정렬 방법</name>
-            <name xml:lang="zh-CN">排序方式</name>
-            <name xml:lang="jp">ソートタイプ</name>
-            <name xml:lang="en">Sorting Type</name>
-            <name xml:lang="vi">Kiểu sắp xếp</name>
-            <name xml:lang="es">Tipo de ordenamiento</name>
-            <name xml:lang="ru">Тип сортировки</name>
-            <name xml:lang="zh-TW">排列方式</name>
-            <name xml:lang="tr">Sıralama Şekli</name>
-            <description xml:lang="ko">정렬대상을 내림차순 또는 올림차순으로 정렬할 수 있습니다.</description>
-            <description xml:lang="zh-CN">对其排序对象可进行升序/降序方式排序。</description>
-            <description xml:lang="jp">ソートタイプを、降順、または昇順に設定します。</description>
-            <description xml:lang="en">You can sort target articles by ascending or descending order.</description>
-            <description xml:lang="vi">Bạn có thể phân loại bài viết theo kiểu tăng hay giảm.</description>
-            <description xml:lang="es">Usted puede ordenar los documentos en orden acendente o en orden descendente.</description>
-            <description xml:lang="ru">Вы можете сортировать статьи в порядке возрастания или убывания.</description>
-            <description xml:lang="zh-TW">可選擇升冪/降冪的方式對所選目標進行排列。</description>
-            <description xml:lang="tr">Hedef yazıları, azalan veya artan sıraya göre sıralayabilirsiniz.</description>
-            <options>
-                <value>desc</value>
-                <name xml:lang="ko">내림차순</name>
-                <name xml:lang="zh-CN">降序</name>
-                <name xml:lang="jp">降順</name>
-                <name xml:lang="en">Descending order</name>
-                <name xml:lang="vi">Giảm dần</name>
-                <name xml:lang="es">Orden Descendente</name>
-                <name xml:lang="ru">По убыванию</name>
-                <name xml:lang="zh-TW">降冪</name>
-                <name xml:lang="tr">Azalan Sıra</name>
-            </options>
-            <options>
-                <value>asc</value>
-                <name xml:lang="ko">올림차순</name>
-                <name xml:lang="zh-CN">升序</name>
-                <name xml:lang="jp">昇順</name>
-                <name xml:lang="en">Ascending order</name>
-                <name xml:lang="vi">Tăng dần</name>
-                <name xml:lang="es">Orden Acendente</name>
-                <name xml:lang="ru">По возрастанию</name>
-                <name xml:lang="zh-TW">升冪</name>
-                <name xml:lang="tr">Artan Sıra</name>
-            </options>
-        </var>
-        <var id="list_count">
-            <type>text</type>
-            <name xml:lang="ko">목록수</name>
-            <name xml:lang="zh-CN">目录数</name>
-            <name xml:lang="jp">リスト数</name>
-            <name xml:lang="en">The number of list</name>
-            <name xml:lang="vi">Số bài hiển thị</name>
-            <name xml:lang="es">Número de la lista</name>
-            <name xml:lang="ru">Число списка</name>
-            <name xml:lang="zh-TW">目錄數</name>
-            <name xml:lang="tr">Liste Sayısı</name>
-            <description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
-            <description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
-            <description xml:lang="jp">出力するリスト数を指定します（デフォルト5個）。</description>
-            <description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
-            <description xml:lang="vi">Bạn có thể đặt số bài hiển thị. (Mặc định là 5)</description>
-            <description xml:lang="es">Usted puede definir el número de los documentos a mostrar. (predefinido: 5)</description>
-            <description xml:lang="ru">Вы можете выбрать число списка статей для отображения. (стандарт: 5)</description>
-            <description xml:lang="zh-TW">設置要顯示的目錄數。(預設是5個)</description>
-            <description xml:lang="tr">Görüntülenecek makalelerin sayısını belirleyebilirsiniz. (varsayılan değer 5'tir)</description>
-        </var>
-        <var id="subject_cut_size">
-            <type>text</type>
-            <name xml:lang="ko">제목 글자수</name>
-            <name xml:lang="jp">タイトルの文字数</name>
-            <name xml:lang="zh-CN">标题字数</name>
-            <name xml:lang="en">Length of Subject</name>
-            <name xml:lang="vi">Độ dài tiêu đề</name>
-            <name xml:lang="es">Número de letras del título</name>
-            <name xml:lang="ru">Длина темы</name>
-            <name xml:lang="zh-TW">標題字數</name>
-            <name xml:lang="tr">Konu Uzunluğu</name>
-            <description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
-            <description xml:lang="jp">タイトルの文字数を設定します（「0」または空欄の場合は、文字数を制限しません）。</description>
-            <description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
-            <description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
-            <description xml:lang="vi">Có thể tăng thêm chiều dài của tiêu đề. (Đặt là 0 hoặc để trống nếu không giới hạn tiêu đề).</description>
-            <description xml:lang="es">El largo del título puede ser asignado. (valor 0 o en blanco no restringe el largo)</description>
-            <description xml:lang="ru">Длина темы может быть присвоена. (0 или пустое значение не будут ограничивать длину)</description>
-            <description xml:lang="zh-TW">可設置標題的字數。(0或留白為不限制)</description>
-            <description xml:lang="tr">Konu uzunluğu belirlenebilir. (0 değeri veya boş bırakmak, uzunluğu sınırlandırmaz.)</description>
-        </var>
-        <var id="content_cut_size">
-            <type>text</type>
-            <name xml:lang="ko">내용 글자수</name>
-		    <name xml:lang="en">Content Length</name>
-            <name xml:lang="vi">Độ dài nội dung</name>
-            <name xml:lang="jp">内容の文字数</name>
-		    <name xml:lang="zh-CN">内容摘要字数</name>
-		    <name xml:lang="zh-TW">內容字數</name>
-		    <name xml:lang="tr">İçerik Uzunluğu</name>
-        </var>
-        <var id="module_srls">
-            <type>module_srl_list</type>
-            <name xml:lang="ko">대상 모듈</name>
-            <name xml:lang="zh-CN">对象模块</name>
-            <name xml:lang="jp">モジュール</name>
-            <name xml:lang="en">Target Module</name>
-            <name xml:lang="vi">Chèn Module</name>
-            <name xml:lang="es">Módulo Objetivo</name>
-            <name xml:lang="ru">Модуль назначения</name>
-            <name xml:lang="zh-TW">目標模組</name>
-            <name xml:lang="tr">Hedef Modül</name>
-            <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
-            <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
-            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
-            <description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
-            <description xml:lang="vi">Những bài viết sẽ được phân loại và hiển thị khi có bài mới gửi trong những Module đã chọn.</description>
-            <description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
-            <description xml:lang="ru">Статьи назначения для сортировки будут теми, что были размещены в выбранном модуле.</description>
-            <description xml:lang="zh-TW">把所選擇的模組作為目標。</description>
-            <description xml:lang="tr">Sıralanacak hedef makaleler, seçili modüle gönderilenlerdir.</description>
-        </var>
-        <var id="rss_url0">
-            <type>text</type>
-            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-            <description xml:lang="ko">피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다.
-            (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-	    	<description xml:lang="zh-CN">请输入RSS格式地址。
-            (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-            <description xml:lang="vi">Chỉ hỗ trợ những định dạng được dăng kí. (RSS 2.0 RSS 1.0 ATOM 1.0).</description>
-            <description xml:lang="jp">RSS URLはタイプが RSSの時だけ登録出来ます。
-            (サポートする文書形式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-            <description xml:lang="zh-TW">請輸入 RSS 位址。
-            (支援檔案格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-            <description xml:lang="tr">Lütfen RSS biçiminin adresini giriniz.
-            (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
-        </var>
-        <var id="rss_url1">
-            <type>text</type>
-            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-        </var>
-        <var id="rss_url2">
-            <type>text</type>
-            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-        </var>
-        <var id="rss_url3">
-            <type>text</type>
-            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-        </var>
-        <var id="rss_url4">
-            <type>text</type>
-            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
-            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
-            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
-        </var>
-    </extra_vars>
-</widget>
+<?xml version="1.0" encoding="UTF-8"?>
+<widget version="0.2">
+    <title xml:lang="ko">모바일 콘텐츠 위젯</title>
+    <title xml:lang="en">Mobile Content Widget</title>
+    <title xml:lang="vi">Nội dung</title>
+    <title xml:lang="zh-CN">全局内容控件</title>
+    <title xml:lang="zh-TW">內容</title>
+    <title xml:lang="jp">コンテンツウィジェット</title>
+    <title xml:lang="tr">Mobil İçerik Görsel Bileşeni</title>
+    <description xml:lang="ko">게시판, 코멘트, 첨부파일 등 Content를 출력하는 위젯입니다.</description>
+    <description xml:lang="en">This widget displays Content such as articles, comments, or attached files.</description>
+	<description xml:lang="vi">Widget này sẽ hiển thị những bài viết, bình luận, File đính kèm.</description>
+    <description xml:lang="zh-CN">以各种样式显示主题，评论，附件等站内内容的全局控件。</description>
+    <description xml:lang="zh-TW">這個 Widget 可輸出討論板、評論，附加檔案等內容。</description>
+    <description xml:lang="jp">掲示板の書き込み、コメント、添付ファイルなどコンテンツを出力するウィジェットです。</description>
+    <description xml:lang="tr">Bu görsel bileşen, yazılar, yorumlar ve ekli dosyalar gibi İçerikleri görüntüler.</description>
+    <version>0.1</version>
+    <date>2009-03-16</date>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="en">NHN</name>
+        <name xml:lang="vi">NHN</name>
+        <name xml:lang="es">NHN</name>
+        <name xml:lang="ru">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <extra_vars>
+        <var id="content_type">
+            <type>select</type>
+                <name xml:lang="ko">추출대상</name>
+                <name xml:lang="en">Target</name>
+                <name xml:lang="vi">Khu vực</name>
+                <name xml:lang="zh-CN">对象</name>
+                <name xml:lang="zh-TW">目標</name>
+                <name xml:lang="jp">抽出対象</name>
+                <name xml:lang="tr">Hedef</name>
+            <options>
+                <value>document</value>
+                <name xml:lang="ko">게시물</name>
+                <name xml:lang="en">Article</name>
+                <name xml:lang="vi">Bài viết</name>
+                <name xml:lang="zh-CN">主题</name>
+				<name xml:lang="zh-TW">主題</name>
+                <name xml:lang="jp">書き込み</name>
+                <name xml:lang="tr">Yazı</name>
+            </options>
+            <options>
+                <value>comment</value>
+                <name xml:lang="ko">댓글</name>
+                <name xml:lang="en">Comment</name>
+                <name xml:lang="vi">Bình luận</name>
+                <name xml:lang="zh-CN">评论</name>
+				<name xml:lang="zh-TW">評論</name>
+                <name xml:lang="jp">コメント</name>
+                <name xml:lang="tr">Yorum</name>
+            </options>
+            <options>
+                <value>image</value>
+                <name xml:lang="ko">첨부이미지</name>
+                <name xml:lang="en">Attached Image</name>
+                <name xml:lang="vi">Hình đính kèm</name>
+                <name xml:lang="zh-CN">图片</name>
+				<name xml:lang="zh-TW">圖片</name>
+                <name xml:lang="jp">添付イメージ</name>
+                <name xml:lang="tr">Ekli Resim</name>
+            </options>
+            <options>
+                <value>trackback</value>
+                <name xml:lang="ko">트랙백</name>
+                <name xml:lang="en">Trackback</name>
+                <name xml:lang="vi">Liên kết Web</name>
+                <name xml:lang="zh-CN">引用</name>
+				<name xml:lang="zh-TW">引用</name>
+                <name xml:lang="jp">トラックバック</name>
+                <name xml:lang="tr">Geri izleme</name>
+            </options>
+            <options>
+                <value>rss</value>
+                <name xml:lang="ko">피드 (RSS/ATOM)</name>
+                <name xml:lang="en">Feed (RSS/ATOM)</name>
+                <name xml:lang="vi">Feed (RSS/ATOM)</name>
+                <name xml:lang="zh-CN">Feed (RSS/ATOM)</name>
+				<name xml:lang="zh-TW">Feed (RSS/ATOM)</name>
+                <name xml:lang="jp">Feed (RSS/ATOM)</name>
+                <name xml:lang="tr">Feed (RSS/ATOM)</name>
+            </options>
+        </var>
+        <var id="list_type">
+            <type>select</type>
+            <name xml:lang="ko">내용형태</name>
+            <name xml:lang="en">Content Type</name>
+            <name xml:lang="vi">Kiểu hiển thị</name>
+            <name xml:lang="zh-CN">内容样式</name>
+            <name xml:lang="zh-TW">內容樣式</name>
+            <name xml:lang="jp">内容のタイプ</name>
+            <name xml:lang="tr">İçerik Şekli</name>
+            <options>
+                <value>normal</value>
+                <name xml:lang="ko">제목</name>
+                <name xml:lang="en">Title</name>
+                <name xml:lang="vi">Tiêu đề</name>
+                <name xml:lang="zh-CN">标题</name>
+                <name xml:lang="zh-TW">標題</name>
+                <name xml:lang="jp">タイトル</name>
+                <name xml:lang="tr">Başlık</name>
+            </options>
+            <options>
+                <value>image_title</value>
+                <name xml:lang="ko">이미지+제목</name>
+                <name xml:lang="enko">Image+Title</name>
+                <name xml:lang="vi">Hình ảnh+Tiêu đề</name>
+                <name xml:lang="zh-CN">图片+标题</name>
+                <name xml:lang="zh-TW">圖片+標題</name>
+                <name xml:lang="jp">画像+タイトル</name>
+                <name xml:lang="tr">Resim+Başlık</name>
+            </options>
+            <options>
+                <value>image_title_content</value>
+                <name xml:lang="ko">이미지+제목+내용</name>
+                <name xml:lang="en">Image+Title+Content</name>
+                <name xml:lang="vi">Hình ảnh+Tiêu đề+Nội dung</name>
+                <name xml:lang="zh-CN">图片+标题+内容</name>
+                <name xml:lang="zh-TW">圖片+標題+內容</name>
+                <name xml:lang="jp">画像+タイトル+内容</name>
+                <name xml:lang="tr">Resim+Başlık+İçerik</name>
+            </options>
+        </var>
+        <var id="option_view">
+            <type>select-multi-order</type>
+            <name xml:lang="ko">표시항목</name>
+            <name xml:lang="en">Display Target &amp; Order</name>
+            <name xml:lang="vi">Hiển thị khu vực và thứ tự</name>
+            <name xml:lang="zh-CN">显示项及顺序</name>
+            <name xml:lang="zh-TW">顯示項目順序</name>
+            <name xml:lang="jp">表示項目、および順番</name>
+            <name xml:lang="tr">Hedef Gösterim &amp; Sırası</name>
+            <options default="false" init="true">
+                <value>title</value>
+                <name xml:lang="ko">제목</name>
+                <name xml:lang="en">Title</name>
+                <name xml:lang="vi">Tiêu đề</name>
+                <name xml:lang="zh-CN">标题</name>
+                <name xml:lang="zh-TW">標題</name>
+                <name xml:lang="jp">タイトル</name>
+                <name xml:lang="tr">Başlık</name>
+            </options>
+            <options>
+                <value>thumbnail</value>
+                <name xml:lang="ko">섬네일</name>
+                <name xml:lang="en">Thumbnail</name>
+                <name xml:lang="vi">Hình nhỏ</name>
+                <name xml:lang="zh-CN">缩略图</name>
+                <name xml:lang="zh-TW">縮圖</name>
+                <name xml:lang="jp">サムネール</name>
+                <name xml:lang="tr">Küçük Resim</name>
+            </options>
+            <options init="true">
+                <value>regdate</value>
+                <name xml:lang="ko">등록일</name>
+                <name xml:lang="en">Regdate</name>
+                <name xml:lang="vi">Ngày gửi</name>
+                <name xml:lang="zh-CN">发布日期</name>
+                <name xml:lang="zh-TW">發表日期</name>
+                <name xml:lang="jp">登録日</name>
+                <name xml:lang="tr">Kayıt Tarihi</name>
+            </options>
+            <options init="true">
+                <value>nickname</value>
+                <name xml:lang="ko">글쓴이</name>
+                <name xml:lang="en">Author</name>
+                <name xml:lang="vi">Người gửi</name>
+                <name xml:lang="zh-CN">发布者</name>
+                <name xml:lang="zh-TW">作者</name>
+                <name xml:lang="jp">登録者</name>
+                <name xml:lang="tr">Yazar</name>
+            </options>
+            <options>
+                <value>content</value>
+                <name xml:lang="ko">내용</name>
+                <name xml:lang="en">Content</name>
+                <name xml:lang="vi">Nội dung</name>
+                <name xml:lang="zh-CN">内容</name>
+                <name xml:lang="zh-TW">內容</name>
+                <name xml:lang="jp">内容</name>
+                <name xml:lang="tr">İçerik</name>
+            </options>
+        </var>
+        <var id="show_browser_title">
+            <type>select</type>
+            <name xml:lang="ko">게시판 이름 표시</name>
+            <name xml:lang="en">Display Article Name</name>
+            <name xml:lang="vi">Tên bài viết</name>
+            <name xml:lang="zh-CN">显示版面名称</name>
+            <name xml:lang="zh-TW">討論板名稱</name>
+            <name xml:lang="jp">掲示板名の表示</name>
+            <name xml:lang="tr">Makale İsmini Görüntüle</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">Display</name>
+                <name xml:lang="vi">Hiển thị</name>
+                <name xml:lang="zh-CN">显示</name>
+                <name xml:lang="zh-TW">顯示</name>
+                <name xml:lang="jp">表示</name>
+                <name xml:lang="tr">Görüntüle</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">No Display</name>
+                <name xml:lang="vi">Không hiển thị</name>
+                <name xml:lang="zh-CN">不显示</name>
+                <name xml:lang="zh-TW">不顯示</name>
+                <name xml:lang="jp">表示しない</name>
+                <name xml:lang="tr">Görüntüleme</name>
+            </options>
+        </var>
+        <var id="show_comment_count">
+            <type>select</type>
+            <name xml:lang="ko">댓글수 표시</name>
+            <name xml:lang="en">Comment Count</name>
+            <name xml:lang="vi">Số bình luận</name>
+            <name xml:lang="zh-CN">显示评论数</name>
+            <name xml:lang="zh-TW">評論數</name>
+            <name xml:lang="jp">コメント数</name>
+            <name xml:lang="tr">Yorum Sayısı</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">Display</name>
+                <name xml:lang="vi">Hiển thị</name>
+                <name xml:lang="zh-CN">显示</name>
+                <name xml:lang="zh-TW">顯示</name>
+                <name xml:lang="jp">表示</name>
+                <name xml:lang="tr">Görüntüle</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">No Display</name>
+                <name xml:lang="vi">Không hiển thị</name>
+                <name xml:lang="zh-CN">不显示</name>
+                <name xml:lang="zh-TW">不顯示</name>
+                <name xml:lang="jp">表示しない</name>
+                <name xml:lang="tr">Görüntüleme</name>
+            </options>
+        </var>
+        <var id="show_trackback_count">
+            <type>select</type>
+            <name xml:lang="ko">엮인글수 표시</name>
+            <name xml:lang="en">Trackback</name>
+            <name xml:lang="vi">Liên kết Web</name>
+            <name xml:lang="zh-CN">显示引用数</name>
+            <name xml:lang="zh-TW">引用數</name>
+            <name xml:lang="jp">トラックバック数の表示</name>
+            <name xml:lang="tr">Geri izleme</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">Display</name>
+                <name xml:lang="vi">Hiển thị</name>
+                <name xml:lang="zh-CN">显示</name>
+                <name xml:lang="zh-TW">顯示</name>
+                <name xml:lang="jp">表示</name>
+                <name xml:lang="tr">Görüntüle</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">No Display</name>
+                <name xml:lang="vi">Không hiển thị</name>
+                <name xml:lang="zh-CN">不显示</name>
+                <name xml:lang="zh-TW">不顯示</name>
+                <name xml:lang="jp">表示しない</name>
+                <name xml:lang="tr">Görüntüleme</name>
+            </options>
+        </var>
+        <var id="show_category">
+            <type>select</type>
+            <name xml:lang="ko">분류 표시</name>
+            <name xml:lang="en">Category</name>
+            <name xml:lang="vi">Thể loại</name>
+            <name xml:lang="zh-CN">显示分类</name>
+            <name xml:lang="zh-TW">分類</name>
+            <name xml:lang="jp">カテゴリ表示</name>
+            <name xml:lang="tr">Kategori</name>
+            <options>
+                <value>Y</value>
+                <name xml:lang="ko">출력</name>
+                <name xml:lang="en">Display</name>
+                <name xml:lang="vi">Hiển thị</name>
+                <name xml:lang="zh-CN">显示</name>
+                <name xml:lang="zh-TW">顯示</name>
+                <name xml:lang="jp">表示</name>
+                <name xml:lang="tr">Görüntüle</name>
+            </options>
+            <options>
+                <value>N</value>
+                <name xml:lang="ko">출력하지 않음</name>
+                <name xml:lang="en">No Display</name>
+                <name xml:lang="vi">Không hiển thị</name>
+                <name xml:lang="zh-CN">不显示</name>
+                <name xml:lang="zh-TW">不顯示</name>
+                <name xml:lang="jp">表示しない</name>
+                <name xml:lang="tr">Görüntüleme</name>
+            </options>
+        </var>
+        <var id="order_target">
+            <type>select</type>
+            <name xml:lang="ko">정렬 대상</name>
+            <name xml:lang="zh-CN">排序对象</name>
+            <name xml:lang="jp">ソート対象</name>
+            <name xml:lang="en">Target to be sorted</name>
+            <name xml:lang="vi">Phân loại</name>
+            <name xml:lang="es">Objetivo para ser ordenados</name>
+            <name xml:lang="ru">Назначение для сортировки</name>
+            <name xml:lang="zh-TW">排列順序</name>
+            <name xml:lang="tr">Sıralanacak Hedef</name>
+            <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
+            <description xml:lang="zh-CN">可以按照指定的顺序进行排序。</description>
+            <description xml:lang="jp">登録順、または変更順にソートします。</description>
+            <description xml:lang="en">The list of newewst articles may be sorted by submitted order or modified order.</description>
+            <description xml:lang="vi">Danh sách bài viết mới nhất có thể được được phân loại bởi danh sách đã gửi hay đã sửa.</description>
+            <description xml:lang="es">La lista de los documentos recientes pueden ser ordenados en el orden del agregado o en el de modificados.</description>
+            <description xml:lang="ru">Список последних статей может быть отсортирован по дате размещения или изменения.</description>
+            <description xml:lang="zh-TW">按照指定的順序進行排列。</description>
+            <description xml:lang="tr">En yeni makale listesi, gönderilme sırasına veya değiştirilme sırasına göre sıralanabilir.</description>
+            <options>
+                <value>list_order</value>
+                <name xml:lang="ko">최신 등록순</name>
+                <name xml:lang="zh-CN">最新发表顺</name>
+                <name xml:lang="jp">最新登録順</name>
+                <name xml:lang="en">Newest Submitted Order</name>
+                <name xml:lang="vi">Bài mới gửi</name>
+                <name xml:lang="es">Orden de agregados recientemente</name>
+                <name xml:lang="ru">Порядок размещенных статей</name>
+                <name xml:lang="zh-TW">最新發表</name>
+                <name xml:lang="tr">En Son Gönderim Sırası</name>
+            </options>
+            <options>
+                <value>update_order</value>
+                <name xml:lang="ko">최근 변경순</name>
+                <name xml:lang="zh-CN">最新修改顺</name>
+                <name xml:lang="jp">最新変更順</name>
+                <name xml:lang="en">Newest Modified Order</name>
+                <name xml:lang="vi">Bài mới sửa</name>
+                <name xml:lang="es">Orden de modificados recientemente</name>
+                <name xml:lang="ru">Порядок измененных статей</name>
+                <name xml:lang="zh-TW">最新修改</name>
+                <name xml:lang="tr">En Son Değiştirilme Sırası</name>
+            </options>
+        </var>
+        <var id="order_type">
+            <type>select</type>
+            <name xml:lang="ko">정렬 방법</name>
+            <name xml:lang="zh-CN">排序方式</name>
+            <name xml:lang="jp">ソートタイプ</name>
+            <name xml:lang="en">Sorting Type</name>
+            <name xml:lang="vi">Kiểu sắp xếp</name>
+            <name xml:lang="es">Tipo de ordenamiento</name>
+            <name xml:lang="ru">Тип сортировки</name>
+            <name xml:lang="zh-TW">排列方式</name>
+            <name xml:lang="tr">Sıralama Şekli</name>
+            <description xml:lang="ko">정렬대상을 내림차순 또는 올림차순으로 정렬할 수 있습니다.</description>
+            <description xml:lang="zh-CN">对其排序对象可进行升序/降序方式排序。</description>
+            <description xml:lang="jp">ソートタイプを、降順、または昇順に設定します。</description>
+            <description xml:lang="en">You can sort target articles by ascending or descending order.</description>
+            <description xml:lang="vi">Bạn có thể phân loại bài viết theo kiểu tăng hay giảm.</description>
+            <description xml:lang="es">Usted puede ordenar los documentos en orden acendente o en orden descendente.</description>
+            <description xml:lang="ru">Вы можете сортировать статьи в порядке возрастания или убывания.</description>
+            <description xml:lang="zh-TW">可選擇升冪/降冪的方式對所選目標進行排列。</description>
+            <description xml:lang="tr">Hedef yazıları, azalan veya artan sıraya göre sıralayabilirsiniz.</description>
+            <options>
+                <value>desc</value>
+                <name xml:lang="ko">내림차순</name>
+                <name xml:lang="zh-CN">降序</name>
+                <name xml:lang="jp">降順</name>
+                <name xml:lang="en">Descending order</name>
+                <name xml:lang="vi">Giảm dần</name>
+                <name xml:lang="es">Orden Descendente</name>
+                <name xml:lang="ru">По убыванию</name>
+                <name xml:lang="zh-TW">降冪</name>
+                <name xml:lang="tr">Azalan Sıra</name>
+            </options>
+            <options>
+                <value>asc</value>
+                <name xml:lang="ko">올림차순</name>
+                <name xml:lang="zh-CN">升序</name>
+                <name xml:lang="jp">昇順</name>
+                <name xml:lang="en">Ascending order</name>
+                <name xml:lang="vi">Tăng dần</name>
+                <name xml:lang="es">Orden Acendente</name>
+                <name xml:lang="ru">По возрастанию</name>
+                <name xml:lang="zh-TW">升冪</name>
+                <name xml:lang="tr">Artan Sıra</name>
+            </options>
+        </var>
+        <var id="list_count">
+            <type>text</type>
+            <name xml:lang="ko">목록수</name>
+            <name xml:lang="zh-CN">目录数</name>
+            <name xml:lang="jp">リスト数</name>
+            <name xml:lang="en">The number of list</name>
+            <name xml:lang="vi">Số bài hiển thị</name>
+            <name xml:lang="es">Número de la lista</name>
+            <name xml:lang="ru">Число списка</name>
+            <name xml:lang="zh-TW">目錄數</name>
+            <name xml:lang="tr">Liste Sayısı</name>
+            <description xml:lang="ko">출력될 목록의 수를 정하실 수 있습니다. (기본 5개)</description>
+            <description xml:lang="zh-CN">可设置要显示的目录数。 (默认为5个)</description>
+            <description xml:lang="jp">出力するリスト数を指定します（デフォルト5個）。</description>
+            <description xml:lang="en">You can set the number of articles to be displayed. (default is 5)</description>
+            <description xml:lang="vi">Bạn có thể đặt số bài hiển thị. (Mặc định là 5)</description>
+            <description xml:lang="es">Usted puede definir el número de los documentos a mostrar. (predefinido: 5)</description>
+            <description xml:lang="ru">Вы можете выбрать число списка статей для отображения. (стандарт: 5)</description>
+            <description xml:lang="zh-TW">設置要顯示的目錄數。(預設是5個)</description>
+            <description xml:lang="tr">Görüntülenecek makalelerin sayısını belirleyebilirsiniz. (varsayılan değer 5'tir)</description>
+        </var>
+        <var id="subject_cut_size">
+            <type>text</type>
+            <name xml:lang="ko">제목 글자수</name>
+            <name xml:lang="jp">タイトルの文字数</name>
+            <name xml:lang="zh-CN">标题字数</name>
+            <name xml:lang="en">Length of Subject</name>
+            <name xml:lang="vi">Độ dài tiêu đề</name>
+            <name xml:lang="es">Número de letras del título</name>
+            <name xml:lang="ru">Длина темы</name>
+            <name xml:lang="zh-TW">標題字數</name>
+            <name xml:lang="tr">Konu Uzunluğu</name>
+            <description xml:lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
+            <description xml:lang="jp">タイトルの文字数を設定します（「0」または空欄の場合は、文字数を制限しません）。</description>
+            <description xml:lang="zh-CN">可以设置标题的字数。(0或留空为不限)</description>
+            <description xml:lang="en">Length of Subject can be assigned. (0 or blank value will not restrict the length)</description>
+            <description xml:lang="vi">Có thể tăng thêm chiều dài của tiêu đề. (Đặt là 0 hoặc để trống nếu không giới hạn tiêu đề).</description>
+            <description xml:lang="es">El largo del título puede ser asignado. (valor 0 o en blanco no restringe el largo)</description>
+            <description xml:lang="ru">Длина темы может быть присвоена. (0 или пустое значение не будут ограничивать длину)</description>
+            <description xml:lang="zh-TW">可設置標題的字數。(0或留白為不限制)</description>
+            <description xml:lang="tr">Konu uzunluğu belirlenebilir. (0 değeri veya boş bırakmak, uzunluğu sınırlandırmaz.)</description>
+        </var>
+        <var id="content_cut_size">
+            <type>text</type>
+            <name xml:lang="ko">내용 글자수</name>
+		    <name xml:lang="en">Content Length</name>
+            <name xml:lang="vi">Độ dài nội dung</name>
+            <name xml:lang="jp">内容の文字数</name>
+		    <name xml:lang="zh-CN">内容摘要字数</name>
+		    <name xml:lang="zh-TW">內容字數</name>
+		    <name xml:lang="tr">İçerik Uzunluğu</name>
+        </var>
+        <var id="module_srls">
+            <type>module_srl_list</type>
+            <name xml:lang="ko">대상 모듈</name>
+            <name xml:lang="zh-CN">对象模块</name>
+            <name xml:lang="jp">モジュール</name>
+            <name xml:lang="en">Target Module</name>
+            <name xml:lang="vi">Chèn Module</name>
+            <name xml:lang="es">Módulo Objetivo</name>
+            <name xml:lang="ru">Модуль назначения</name>
+            <name xml:lang="zh-TW">目標模組</name>
+            <name xml:lang="tr">Hedef Modül</name>
+            <description xml:lang="ko">선택하신 모듈에 등록된 글을 대상으로 합니다.</description>
+            <description xml:lang="jp">チェックされたモジュールに登録されたコンテンツ（書き込み）を対象とします。</description>
+            <description xml:lang="zh-CN">将把所选模块当中的主题作为对象。</description>
+            <description xml:lang="en">The target articles to be sorted will be the ones submitted in the selected module.</description>
+            <description xml:lang="vi">Những bài viết sẽ được phân loại và hiển thị khi có bài mới gửi trong những Module đã chọn.</description>
+            <description xml:lang="es">El objetivo de los documentos agregados serán los del módulo selccionado.</description>
+            <description xml:lang="ru">Статьи назначения для сортировки будут теми, что были размещены в выбранном модуле.</description>
+            <description xml:lang="zh-TW">把所選擇的模組作為目標。</description>
+            <description xml:lang="tr">Sıralanacak hedef makaleler, seçili modüle gönderilenlerdir.</description>
+        </var>
+        <var id="rss_url0">
+            <type>text</type>
+            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+            <description xml:lang="ko">피드 주소는 타입이 지원하는 문서 형식일 경우에만 등록 됩니다.
+            (지원 문서 형식 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+	    	<description xml:lang="zh-CN">请输入RSS格式地址。
+            (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+            <description xml:lang="vi">Chỉ hỗ trợ những định dạng được dăng kí. (RSS 2.0 RSS 1.0 ATOM 1.0).</description>
+            <description xml:lang="jp">RSS URLはタイプが RSSの時だけ登録出来ます。
+            (サポートする文書形式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+            <description xml:lang="zh-TW">請輸入 RSS 位址。
+            (支援檔案格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+            <description xml:lang="tr">Lütfen RSS biçiminin adresini giriniz.
+            (支持文档格式 : RSS 2.0, RSS 1.0, ATOM 1.0)</description>
+        </var>
+        <var id="rss_url1">
+            <type>text</type>
+            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+        </var>
+        <var id="rss_url2">
+            <type>text</type>
+            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+        </var>
+        <var id="rss_url3">
+            <type>text</type>
+            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+        </var>
+        <var id="rss_url4">
+            <type>text</type>
+            <name xml:lang="ko">피드(RSS/ATOM) 주소</name>
+            <name xml:lang="jp">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-CN">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="en">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="vi">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="ru">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="zh-TW">Feed(RSS/ATOM) URL</name>
+            <name xml:lang="tr">Feed(RSS/ATOM) URL</name>
+        </var>
+    </extra_vars>
+</widget>
diff --git a/widgets/mcontent/mcontent.class.php b/widgets/mcontent/mcontent.class.php
index b3e0cef73..df5e38da9 100644
--- a/widgets/mcontent/mcontent.class.php
+++ b/widgets/mcontent/mcontent.class.php
@@ -1,748 +1,720 @@
-<?php
-    /**
-     * @class mcontent
-     * @author NHN (developers@xpressengine.com)
-     * @brief mcontent를 출력하는 위젯
-     * @version 0.1
-     **/
-
-    class mcontent extends WidgetHandler {
-
-        /**
-         * @brief 위젯의 실행 부분
-         *
-         * ./widgets/위젯/conf/info.xml 에 선언한 extra_vars를 args로 받는다
-         * 결과를 만든후 print가 아니라 return 해주어야 한다
-         **/
-
-        function proc($args) {
-            // 정렬 대상
-            if(!in_array($args->order_target, array('list_order','update_order'))) $args->order_target = 'list_order';
-
-            // 정렬 순서
-            if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = 'asc';
-
-            // 출력된 목록 수
-            $args->list_count = (int)$args->list_count;
-            if(!$args->list_count) $args->list_count = 5;
-
-            // 제목 길이 자르기
-            if(!$args->subject_cut_size) $args->subject_cut_size = 0;
-
-            // 내용 길이 자르기
-            if(!$args->content_cut_size) $args->content_cut_size = 100;
-
-            // 보기 옵션
-            $args->option_view_arr = explode(',',$args->option_view);
-
-            // markup 옵션
-            if(!$args->markup_type) $args->markup_type = 'list';
-
-            // 내부적으로 쓰이는 변수 설정
-            $oModuleModel = &getModel('module');
-            $module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
-            $site_module_info = Context::get('site_module_info');
-
-            // rss 인 경우 URL정리
-            if($args->content_type == 'rss'){
-                $args->rss_urls = array();
-                $rss_urls = array_unique(array($args->rss_url0,$args->rss_url1,$args->rss_url2,$args->rss_url3,$args->rss_url4));
-                for($i=0,$c=count($rss_urls);$i<$c;$i++) {
-                    if($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
-                }
-
-            // rss가 아닌 XE모듈일 경우 모듈 번호 정리 후 모듈 정보 구함
-            } else {
-
-                // 대상 모듈이 선택되어 있지 않으면 해당 사이트의 전체 모듈을 대상으로 함
-                if(!$args->module_srls){
-                    unset($obj);
-                    $obj->site_srl = (int)$site_module_info->site_srl;
-                    $output = executeQueryArray('widgets.content.getMids', $obj);
-                    if($output->data) {
-                        foreach($output->data as $key => $val) {
-                            $args->modules_info[$val->mid] = $val;
-                            $args->module_srls_info[$val->module_srl] = $val;
-                            $args->mid_lists[$val->module_srl] = $val->mid;
-                            $module_srls[] = $val->module_srl;
-                        }
-                    }
-
-                    $args->modules_info = $oModuleModel->getMidList($obj);
-                // 대상 모듈이 선택되어 있으면 해당 모듈만 추출
-                } else {
-                    $obj->module_srls = $args->module_srls;
-                    $output = executeQueryArray('widgets.content.getMids', $obj);
-                    if($output->data) {
-                        foreach($output->data as $key => $val) {
-                            $args->modules_info[$val->mid] = $val;
-                            $args->module_srls_info[$val->module_srl] = $val;
-                            $module_srls[] = $val->module_srl;
-                        }
-                        $idx = explode(',',$args->module_srls);
-                        for($i=0,$c=count($idx);$i<$c;$i++) {
-                            $srl = $idx[$i];
-                            if(!$args->module_srls_info[$srl]) continue;
-                            $args->mid_lists[$srl] = $args->module_srls_info[$srl]->mid;
-                        }
-                    }
-                }
-
-                // 아무런 모듈도 검색되지 않았다면 종료
-                if(!count($args->modules_info)) return Context::get('msg_not_founded');
-                $args->module_srl = implode(',',$module_srls);
-            }
-
-            /**
-             * 컨텐츠 추출, 게시글/댓글/엮인글/RSS등 다양한 요소가 있어서 각 method를 따로 만듬
-             **/
-            // tab 형태
-            if($args->tab_type == 'none' || $args->tab_type == '') {
-                switch($args->content_type){
-                    case 'comment':
-                            $content_items = $this->_getCommentItems($args);
-                        break;
-                    case 'image':
-                            $content_items = $this->_getImageItems($args);
-                        break;
-                    case 'rss':
-                            $content_items = $this->getRssItems($args);
-                        break;
-                    case 'trackback':
-                            $content_items = $this->_getTrackbackItems($args);
-                        break;
-                    default:
-                            $content_items = $this->_getDocumentItems($args);
-                        break;
-                }
-            // tab 형태가 아닐 경우
-            } else {
-                $content_items = array();
-
-                switch($args->content_type){
-                    case 'comment':
-                            foreach($args->mid_lists as $module_srl => $mid){
-                                $args->module_srl = $module_srl;
-                                $content_items[$module_srl] = $this->_getCommentItems($args);
-                            }
-                        break;
-                    case 'image':
-                            foreach($args->mid_lists as $module_srl => $mid){
-                                $args->module_srl = $module_srl;
-                                $content_items[$module_srl] = $this->_getImageItems($args);
-                            }
-                        break;
-                    case 'rss':
-                            $content_items = $this->getRssItems($args);
-                        break;
-                    case 'trackback':
-                            foreach($args->mid_lists as $module_srl => $mid){
-                                $args->module_srl = $module_srl;
-                                $content_items[$module_srl] = $this->_getTrackbackItems($args);
-                            }
-                        break;
-                    default:
-                            foreach($args->mid_lists as $module_srl => $mid){
-                                $args->module_srl = $module_srl;
-                                $content_items[$module_srl] = $this->_getDocumentItems($args);
-                            }
-                        break;
-                }
-            }
-
-            $output = $this->_compile($args,$content_items);
-            return $output;
-        }
-
-        /**
-         * @brief 댓글 목록을 추출하여 mcontentItem으로 return
-         **/
-        function _getCommentItems($args) {
-            // CommentModel::getCommentList()를 이용하기 위한 변수 정리
-            $obj->module_srl = $args->module_srl;
-            $obj->sort_index = $args->order_target;
-            $obj->list_count = $args->list_count;
-
-            // comment 모듈의 model 객체를 받아서 getCommentList() method를 실행
-            $oCommentModel = &getModel('comment');
-            $output = $oCommentModel->getNewestCommentList($obj);
-
-            $content_items = array();
-
-            if(!count($output)) return;
-
-            foreach($output as $key => $oComment) {
-                $attribute = $oComment->getObjectVars();
-                $title = $oComment->getSummary($args->content_cut_size);
-                $thumbnail = $oComment->getThumbnail();
-                $url = sprintf("%s#comment_%s",getUrl('','document_srl',$oComment->get('document_srl')),$oComment->get('comment_srl'));
-
-                $attribute->mid = $args->mid_lists[$attribute->module_srl];
-                $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
-                $domain = $args->module_srls_info[$attribute->module_srl]->domain;
-
-                $content_item = new mcontentItem($browser_title);
-                $content_item->adds($attribute);
-                $content_item->setTitle($title);
-                $content_item->setThumbnail($thumbnail);
-                $content_item->setLink($url);
-                $content_item->setDomain($domain);
-                $content_item->add('mid', $args->mid_lists[$attribute->module_srl]);
-                $content_items[] = $content_item;
-            }
-            return $content_items;
-        }
-
-        function _getDocumentItems($args){
-            // document 모듈의 model 객체를 받아서 결과를 객체화 시킴
-            $oDocumentModel = &getModel('document');
-
-            // 분류 구함
-            $obj->module_srl = $args->module_srl;
-            $output = executeQueryArray('widgets.content.getCategories',$obj);
-            if($output->toBool() && $output->data) {
-                foreach($output->data as $key => $val) {
-                    $category_lists[$val->module_srl][$val->category_srl] = $val;
-                }
-            }
-
-            // 글 목록을 구함
-            $obj->module_srl = $args->module_srl;
-            $obj->sort_index = $args->order_target;
-            $obj->order_type = $args->order_type=="desc"?"asc":"desc";
-            $obj->list_count = $args->list_count;
-            $output = executeQueryArray('widgets.content.getNewestDocuments', $obj);
-            if(!$output->toBool() || !$output->data) return;
-
-            // 결과가 있으면 각 문서 객체화를 시킴
-            $content_items = array();
-            $first_thumbnail_idx = -1;
-            if(count($output->data)) {
-                foreach($output->data as $key => $attribute) {
-                    $oDocument = new documentItem();
-                    $oDocument->setAttribute($attribute, false);
-                    $GLOBALS['XE_DOCUMENT_LIST'][$oDocument->document_srl] = $oDocument;
-                    $document_srls[] = $oDocument->document_srl;
-                }
-                $oDocumentModel->setToAllDocumentExtraVars();
-
-                for($i=0,$c=count($document_srls);$i<$c;$i++) {
-                    $oDocument = $GLOBALS['XE_DOCUMENT_LIST'][$document_srls[$i]];
-                    $document_srl = $oDocument->document_srl;
-                    $module_srl = $oDocument->get('module_srl');
-                    $category_srl = $oDocument->get('category_srl');
-                    $thumbnail = $oDocument->getThumbnail();
-                    $content_item = new mcontentItem( $args->module_srls_info[$module_srl]->browser_title );
-                    $content_item->adds($oDocument->getObjectVars());
-                    $content_item->setTitle($oDocument->getTitle());
-                    $content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
-                    $content_item->setDomain( $args->module_srls_info[$module_srl]->domain );
-                    $content_item->setContent($oDocument->getSummary($args->content_cut_size));
-                    $content_item->setLink( getSiteUrl($domain,'','document_srl',$document_srl) );
-                    $content_item->setThumbnail($thumbnail);
-                    $content_item->add('mid', $args->mid_lists[$module_srl]);
-                    if($first_thumbnail_idx==-1 && $thumbnail) $first_thumbnail_idx = $i;
-                    $content_items[] = $content_item;
-                }
-
-                $content_items[0]->setFirstThumbnailIdx($first_thumbnail_idx);
-            }
-            return $content_items;
-        }
-
-        function _getImageItems($args) {
-            $oDocumentModel = &getModel('document');
-
-            $obj->module_srls = $obj->module_srl = $args->module_srl;
-            $obj->direct_download = 'Y';
-            $obj->isvalid = 'Y';
-
-            // 분류 구함
-            $output = executeQueryArray('widgets.content.getCategories',$obj);
-            if($output->toBool() && $output->data) {
-                foreach($output->data as $key => $val) {
-                    $category_lists[$val->module_srl][$val->category_srl] = $val;
-                }
-            }
-
-            // 정해진 모듈에서 문서별 파일 목록을 구함
-            $obj->list_count = $args->list_count;
-            $files_output = executeQueryArray("file.getOneFileInDocument", $obj);
-            $files_count = count($files_output->data);
-            if(!$files_count) return;
-
-            $content_items = array();
-
-            for($i=0;$i<$files_count;$i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
-
-            $tmp_document_list = $oDocumentModel->getDocuments($document_srl_list);
-
-            if(!count($tmp_document_list)) return;
-
-            foreach($tmp_document_list as $oDocument){
-                $attribute = $oDocument->getObjectVars();
-                $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
-                $domain = $args->module_srls_info[$attribute->module_srl]->domain;
-                $category = $category_lists[$attribute->module_srl]->text;
-                $content = $oDocument->getSummary($args->content_cut_size);
-                $url = sprintf("%s#%s",$oDocument->getPermanentUrl() ,$oDocument->getCommentCount());
-                $thumbnail = $oDocument->getThumbnail();
-                $content_item = new mcontentItem($browser_title);
-                $content_item->adds($attribute);
-                $content_item->setCategory($category);
-                $content_item->setContent($content);
-                $content_item->setLink($url);
-                $content_item->setThumbnail($thumbnail);
-                $content_item->setExtraImages($extra_images);
-                $content_item->setDomain($domain);
-                $content_item->add('mid', $args->mid_lists[$attribute->module_srl]);
-                $content_items[] = $content_item;
-            }
-
-            return $content_items;
-        }
-
-        function getRssItems($args){
-
-            $content_items = array();
-            $args->mid_lists = array();
-
-            foreach($args->rss_urls as $key => $rss){
-                $args->rss_url = $rss;
-                $content_item = $this->_getRssItems($args);
-                if(count($content_item) > 0){
-                    $browser_title = $content_item[0]->getBrowserTitle();
-                    $args->mid_lists[] = $browser_title;
-                    $content_items[] = $content_item;
-                }
-            }
-
-            if($args->tab_type == 'none' || $args->tab_type == ''){
-                $items = array();
-                foreach($content_items as $key => $val){
-                    foreach($val as $k => $v){
-                        $date = $v->get('regdate');
-                        $i=0;
-                        while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
-                        $items[sprintf('%s%02d',$date,$i)] = $v;
-                    }
-                }
-                if($args->order_type =='asc') ksort($items);
-                else krsort($items);
-                $content_items = array_slice(array_values($items),0,$args->list_count);
-            } return $content_items;
-        }
-
-        function _getRssBody($value) {
-            if(!$value || is_string($value)) return $value;
-            if(is_object($value)) $value = get_object_vars($value);
-            $body = null;
-            if(!count($value)) return;
-            foreach($value as $key => $val) {
-                if($key == 'body') {
-                    $body = $val;
-                    continue;
-                }
-                if(is_object($val)||is_array($val)) $body = $this->_getRssBody($val);
-                if($body !== null) return $body;
-            }
-            return $body;
-        }
-
-        function _getSummary($content, $str_size = 50)
-        {
-            $content = preg_replace('!(<br[\s]*/{0,1}>[\s]*)+!is', ' ', $content);
-
-            // </p>, </div>, </li> 등의 태그를 공백 문자로 치환
-            $content = str_replace(array('</p>', '</div>', '</li>'), ' ', $content);
-
-            // 태그 제거
-            $content = preg_replace('!<([^>]*?)>!is','', $content);
-
-            // < , > , " 를 치환
-            $content = str_replace(array('&lt;','&gt;','&quot;','&nbsp;'), array('<','>','"',' '), $content);
-
-            // 연속된 공백문자 삭제
-            $content = preg_replace('/ ( +)/is', ' ', $content);
-
-            // 문자열을 자름
-            $content = trim(cut_str($content, $str_size, $tail));
-
-            // >, <, "를 다시 복구
-            $content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
-
-            // 영문이 연결될 경우 개행이 안 되는 문제를 해결
-            $content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$content);
-            return $content; 
-        }
-
-
-       /**
-         * @brief rss 주소로 부터 내용을 받아오는 함수
-         * tistory 의 경우 원본 주소가 location 헤더를 뿜는다. (내용은 없음)이를 해결하기 위한 수정 - rss_reader 위젯과 방식 동일
-         **/
-        function requestFeedContents($rss_url) {
-            $rss_url = str_replace('&amp;','&',Context::convertEncodingStr($rss_url));
-            return FileHandler::getRemoteResource($rss_url, null, 3, 'GET', 'application/xml');
-        }
-
-        function _getRssItems($args){
-            // 날짜 형태
-            $DATE_FORMAT = $args->date_format ? $args->date_format : "Y-m-d H:i:s";
-
-            $buff = $this->requestFeedContents($args->rss_url);
-
-            $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
-            if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = Context::convertEncodingStr($buff);
-
-            $buff = preg_replace("/<\?xml.*\?>/i", "", $buff);
-
-            $oXmlParser = new XmlParser();
-            $xml_doc = $oXmlParser->parse($buff);
-            if($xml_doc->rss) {
-                $rss->title = $xml_doc->rss->channel->title->body;
-                $rss->link = $xml_doc->rss->channel->link->body;
-
-                $items = $xml_doc->rss->channel->item;
-
-                if(!$items) return;
-                if($items && !is_array($items)) $items = array($items);
-
-                $content_items = array();
-
-                foreach ($items as $key => $value) {
-                    if($key >= $args->list_count) break;
-                    unset($item);
-
-                    foreach($value as $key2 => $value2) {
-                        if(is_array($value2)) $value2 = array_shift($value2);
-                        $item->{$key2} = $this->_getRssBody($value2);
-                    }
-
-                    $content_item = new mcontentItem($rss->title);
-                    $content_item->setContentsLink($rss->link);
-                    $content_item->setTitle($item->title);
-                    $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
-                    //$content_item->setCategory($item->category);
-                    $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
-                    $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
-                    $content_item->setLink($item->link);
-                    $date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
-                    $content_item->setRegdate($date);
-
-                    $content_items[] = $content_item;
-                }
-            } elseif($xml_doc->{'rdf:rdf'}) {
-                // rss1.0 지원 (Xml이 대소문자를 구분해야 하는데 XE의 XML파서가 전부 소문자로 바꾸는 바람에 생긴 case) by misol
-                $rss->title = $xml_doc->{'rdf:rdf'}->channel->title->body;
-                $rss->link = $xml_doc->{'rdf:rdf'}->channel->link->body;
-
-                $items = $xml_doc->{'rdf:rdf'}->item;
-
-                if(!$items) return;
-                if($items && !is_array($items)) $items = array($items);
-
-                $content_items = array();
-
-                foreach ($items as $key => $value) {
-                    if($key >= $args->list_count) break;
-                    unset($item);
-
-                    foreach($value as $key2 => $value2) {
-                        if(is_array($value2)) $value2 = array_shift($value2);
-                        $item->{$key2} = $this->_getRssBody($value2);
-                    }
-
-                    $content_item = new mcontentItem($rss->title);
-                    $content_item->setContentsLink($rss->link);
-                    $content_item->setTitle($item->title);
-                    $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
-                    //$content_item->setCategory($item->category);
-                    $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
-                    $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
-                    $content_item->setLink($item->link);
-                    $date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
-                    $content_item->setRegdate($date);
-
-                    $content_items[] = $content_item;
-                }
-            } elseif($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom') {
-                // Atom 1.0 spec 지원 by misol
-                $rss->title = $xml_doc->feed->title->body;
-                $links = $xml_doc->feed->link;
-                if(is_array($links)) {
-                    foreach ($links as $value) {
-                        if($value->attrs->rel == 'alternate') {
-                            $rss->link = $value->attrs->href;
-                            break;
-                        }
-                    }
-                }
-                elseif($links->attrs->rel == 'alternate') $rss->link = $links->attrs->href;
-
-                $items = $xml_doc->feed->entry;
-
-                if(!$items) return;
-                if($items && !is_array($items)) $items = array($items);
-
-                $content_items = array();
-
-                foreach ($items as $key => $value) {
-                    if($key >= $args->list_count) break;
-                    unset($item);
-
-                    foreach($value as $key2 => $value2) {
-                        if(is_array($value2)) $value2 = array_shift($value2);
-                        $item->{$key2} = $this->_getRssBody($value2);
-                    }
-
-                    $content_item = new mcontentItem($rss->title);
-                    $links = $value->link;
-                    if(is_array($links)) {
-                        foreach ($links as $val) {
-                            if($val->attrs->rel == 'alternate') {
-                                $item->link = $val->attrs->href;
-                                break;
-                            }
-                        }
-                    }
-                    elseif($links->attrs->rel == 'alternate') $item->link = $links->attrs->href;
-
-                    $content_item->setContentsLink($rss->link);
-                    if($item->title) {
-                        if(!preg_match("/html/i", $value->title->attrs->type)) $item->title = $value->title->body;
-                    }
-                    $content_item->setTitle($item->title);
-                    $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
-                    $content_item->setAuthorSite($value->author->uri->body);
-                    //$content_item->setCategory($item->category);
-                    $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->content);
-                    if($item->description) {
-                        if(!preg_match("/html/i", $value->content->attrs->type)) $item->description = htmlspecialchars($item->description);
-                    }
-                    if(!$item->description) {
-                        $item->description = $item->summary;
-                        if($item->description) {
-                            if(!preg_match("/html/i", $value->summary->attrs->type)) $item->description = htmlspecialchars($item->description);
-                        }
-                    }
-                    $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
-                    $content_item->setLink($item->link);
-                    $date = date('YmdHis', strtotime(max($item->published,$item->updated,$item->{'dc:date'})));
-                    $content_item->setRegdate($date);
-
-                    $content_items[] = $content_item;
-                }
-            }
-            return $content_items;
-        }
-
-        function _getTrackbackItems($args){
-            // 분류 구함
-            $output = executeQueryArray('widgets.content.getCategories',$obj);
-            if($output->toBool() && $output->data) {
-                foreach($output->data as $key => $val) {
-                    $category_lists[$val->module_srl][$val->category_srl] = $val;
-                }
-            }
-
-            $obj->module_srl = $args->module_srl;
-            $obj->sort_index = $args->order_target;
-            $obj->list_count = $args->list_count;
-
-            // trackback 모듈의 model 객체를 받아서 getTrackbackList() method를 실행
-            $oTrackbackModel = &getModel('trackback');
-            $output = $oTrackbackModel->getNewestTrackbackList($obj);
-
-            // 오류가 생기면 그냥 무시
-            if(!$output->toBool() || !$output->data) return;
-
-            // 결과가 있으면 각 문서 객체화를 시킴
-            $content_items = array();
-            foreach($output->data as $key => $item) {
-                $domain = $args->module_srls_info[$item->module_srl]->domain;
-                $category = $category_lists[$item->module_srl]->text;
-                $url = getSiteUrl($domain,'','document_srl',$item->document_srl);
-                $browser_title = $args->module_srls_info[$item->module_srl]->browser_title;
-
-                $content_item = new mcontentItem($browser_title);
-                $content_item->adds($item);
-                $content_item->setTitle($item->title);
-                $content_item->setCategory($category);
-                $content_item->setNickName($item->blog_name);
-                $content_item->setContent($item->excerpt);  ///<<
-                $content_item->setDomain($domain);  ///<<
-                $content_item->setLink($url);
-                $content_item->add('mid', $args->mid_lists[$item->module_srl]);
-                $content_item->setRegdate($item->regdate);
-                $content_items[] = $content_item;
-            }
-            return $content_items;
-        }
-
-        function _compile($args,$content_items){
-            $oTemplate = &TemplateHandler::getInstance();
-
-            // 위젯에 넘기기 위한 변수 설정
-            $widget_info->modules_info = $args->modules_info;
-            $widget_info->option_view_arr = $args->option_view_arr;
-            $widget_info->list_count = $args->list_count;
-            $widget_info->subject_cut_size = $args->subject_cut_size;
-            $widget_info->content_cut_size = $args->content_cut_size;
-
-            $widget_info->thumbnail_type = $args->thumbnail_type;
-            $widget_info->thumbnail_width = $args->thumbnail_width;
-            $widget_info->thumbnail_height = $args->thumbnail_height;
-            $widget_info->mid_lists = $args->mid_lists;
-
-            $widget_info->show_browser_title = $args->show_browser_title;
-            $widget_info->show_category = $args->show_category;
-            $widget_info->show_comment_count = $args->show_comment_count;
-            $widget_info->show_trackback_count = $args->show_trackback_count;
-            $widget_info->show_icon = $args->show_icon;
-
-            $widget_info->list_type = $args->list_type;
-            $widget_info->tab_type = $args->tab_type;
-
-            $widget_info->markup_type = $args->markup_type;
-            $widget_info->content_items = $content_items;
-            
-            unset($args->option_view_arr);
-            unset($args->modules_info);
-
-            Context::set('colorset', $args->colorset);
-            Context::set('widget_info', $widget_info);
-
-            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
-            return $oTemplate->compile($tpl_path, "content");
-        }
-    }
-
-    class mcontentItem extends Object {
-
-        var $browser_title = null;
-        var $has_first_thumbnail_idx = false;
-        var $first_thumbnail_idx = null;
-        var $contents_link = null;
-        var $domain = null;
-
-        function mcontentItem($browser_title=''){
-            $this->browser_title = $browser_title;
-        }
-        function setContentsLink($link){
-            $this->contents_link = $link;
-        }
-        function setFirstThumbnailIdx($first_thumbnail_idx){
-            if(is_null($this->first_thumbnail) && $first_thumbnail_idx>-1) {
-                $this->has_first_thumbnail_idx = true;
-                $this->first_thumbnail_idx= $first_thumbnail_idx;
-            }
-        }
-        function setExtraImages($extra_images){
-            $this->add('extra_images',$extra_images);
-        }
-        function setDomain($domain) {
-            static $default_domain = null;
-            if(!$domain) {
-                if(is_null($default_domain)) $default_domain = Context::getDefaultUrl();
-                $domain = $default_domain;
-            }
-            $this->domain = $domain;
-        }
-        function setLink($url){
-            $this->add('url',$url);
-        }
-        function setTitle($title){
-            $this->add('title',$title);
-        }
-
-        function setThumbnail($thumbnail){
-            $this->add('thumbnail',$thumbnail);
-        }
-        function setContent($content){
-            $this->add('content',$content);
-        }
-        function setRegdate($regdate){
-            $this->add('regdate',$regdate);
-        }
-        function setNickName($nick_name){
-            $this->add('nick_name',$nick_name);
-        }
-
-        // 글 작성자의 홈페이지 주소를 저장 by misol
-        function setAuthorSite($site_url){
-            $this->add('author_site',$site_url);
-        }
-        function setCategory($category){
-            $this->add('category',$category);
-        }
-        function getBrowserTitle(){
-            return $this->browser_title;
-        }
-        function getDomain() {
-            return $this->domain;
-        }
-        function getContentsLink(){
-            return $this->contents_link;
-        }
-
-        function getFirstThumbnailIdx(){
-            return $this->first_thumbnail_idx;
-        }
-
-        function getLink(){
-            return $this->get('url');
-        }
-        function getModuleSrl(){
-            return $this->get('module_srl');
-        }
-        function getTitle($cut_size = 0, $tail='...'){
-            $title = strip_tags($this->get('title'));
-
-            if($cut_size) $title = cut_str($title, $cut_size, $tail);
-
-            $attrs = array();
-            if($this->get('title_bold') == 'Y') $attrs[] = 'font-weight:bold';
-            if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = 'color:#'.$this->get('title_color');
-
-            if(count($attrs)) $title = sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), htmlspecialchars($title));
-
-            return $title;
-        }
-        function getContent(){
-            return $this->get('content');
-        }
-        function getCategory(){
-            return $this->get('category');
-        }
-        function getNickName(){
-            return $this->get('nick_name');
-        }
-        function getAuthorSite(){
-            return $this->get('author_site');
-        }
-        function getCommentCount(){
-            $comment_count = $this->get('comment_count');
-            return $comment_count>0 ? $comment_count : '';
-        }
-        function getTrackbackCount(){
-            $trackback_count = $this->get('trackback_count');
-            return $trackback_count>0 ? $trackback_count : '';
-        }
-        function getRegdate($format = 'Y.m.d H:i:s') {
-            return zdate($this->get('regdate'), $format);
-        }
-        function printExtraImages() {
-            return $this->get('extra_images');
-        }
-        function haveFirstThumbnail() {
-            return $this->has_first_thumbnail_idx;
-        }
-        function getThumbnail(){
-            return $this->get('thumbnail');
-        }
-        function getMemberSrl() {
-            return $this->get('member_srl');
-        }
-    }
-?>
+<?php
+    /**
+     * @class mcontent
+     * @author NHN (developers@xpressengine.com)
+     * @brief widget to display mcontent
+     * @version 0.1
+     **/
+
+    class mcontent extends WidgetHandler {
+
+        /**
+         * @brief Widget execution
+         *
+         * Get extra_vars declared in ./widgets/widget/conf/info.xml as arguments
+         * After generating the result, do not print but return it.
+         **/
+
+        function proc($args) {
+            // Targets to sort
+            if(!in_array($args->order_target, array('list_order','update_order'))) $args->order_target = 'list_order';
+            // Sort order
+            if(!in_array($args->order_type, array('asc','desc'))) $args->order_type = 'asc';
+            // The number of displayed lists
+            $args->list_count = (int)$args->list_count;
+            if(!$args->list_count) $args->list_count = 5;
+            // Cut the length of the title
+            if(!$args->subject_cut_size) $args->subject_cut_size = 0;
+            // Cut the length of contents
+            if(!$args->content_cut_size) $args->content_cut_size = 100;
+            // Viewing options
+            $args->option_view_arr = explode(',',$args->option_view);
+            // markup options
+            if(!$args->markup_type) $args->markup_type = 'list';
+            // Set variables for internal use
+            $oModuleModel = &getModel('module');
+            $module_srls = $args->modules_info = $args->module_srls_info = $args->mid_lists = array();
+            $site_module_info = Context::get('site_module_info');
+            // List URLs if a type is RSS
+            if($args->content_type == 'rss'){
+                $args->rss_urls = array();
+                $rss_urls = array_unique(array($args->rss_url0,$args->rss_url1,$args->rss_url2,$args->rss_url3,$args->rss_url4));
+                for($i=0,$c=count($rss_urls);$i<$c;$i++) {
+                    if($rss_urls[$i]) $args->rss_urls[] = $rss_urls[$i];
+                }
+            // Get module information after listing module_srls if the module is not RSS
+            } else {
+                // Apply to all modules in the site if a target module is not specified
+                if(!$args->module_srls){
+                    unset($obj);
+                    $obj->site_srl = (int)$site_module_info->site_srl;
+                    $output = executeQueryArray('widgets.content.getMids', $obj);
+                    if($output->data) {
+                        foreach($output->data as $key => $val) {
+                            $args->modules_info[$val->mid] = $val;
+                            $args->module_srls_info[$val->module_srl] = $val;
+                            $args->mid_lists[$val->module_srl] = $val->mid;
+                            $module_srls[] = $val->module_srl;
+                        }
+                    }
+
+                    $args->modules_info = $oModuleModel->getMidList($obj);
+                // Apply to the module only if a target module is specified
+                } else {
+                    $obj->module_srls = $args->module_srls;
+                    $output = executeQueryArray('widgets.content.getMids', $obj);
+                    if($output->data) {
+                        foreach($output->data as $key => $val) {
+                            $args->modules_info[$val->mid] = $val;
+                            $args->module_srls_info[$val->module_srl] = $val;
+                            $module_srls[] = $val->module_srl;
+                        }
+                        $idx = explode(',',$args->module_srls);
+                        for($i=0,$c=count($idx);$i<$c;$i++) {
+                            $srl = $idx[$i];
+                            if(!$args->module_srls_info[$srl]) continue;
+                            $args->mid_lists[$srl] = $args->module_srls_info[$srl]->mid;
+                        }
+                    }
+                }
+                // Exit if no module is found
+                if(!count($args->modules_info)) return Context::get('msg_not_founded');
+                $args->module_srl = implode(',',$module_srls);
+            }
+
+            /**
+             * Method is separately made because content extraction, articles, comments, trackbacks, RSS and other elements exist
+             **/
+            // tab mode
+            if($args->tab_type == 'none' || $args->tab_type == '') {
+                switch($args->content_type){
+                    case 'comment':
+                            $content_items = $this->_getCommentItems($args);
+                        break;
+                    case 'image':
+                            $content_items = $this->_getImageItems($args);
+                        break;
+                    case 'rss':
+                            $content_items = $this->getRssItems($args);
+                        break;
+                    case 'trackback':
+                            $content_items = $this->_getTrackbackItems($args);
+                        break;
+                    default:
+                            $content_items = $this->_getDocumentItems($args);
+                        break;
+                }
+            // If not a tab type
+            } else {
+                $content_items = array();
+
+                switch($args->content_type){
+                    case 'comment':
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getCommentItems($args);
+                            }
+                        break;
+                    case 'image':
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getImageItems($args);
+                            }
+                        break;
+                    case 'rss':
+                            $content_items = $this->getRssItems($args);
+                        break;
+                    case 'trackback':
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getTrackbackItems($args);
+                            }
+                        break;
+                    default:
+                            foreach($args->mid_lists as $module_srl => $mid){
+                                $args->module_srl = $module_srl;
+                                $content_items[$module_srl] = $this->_getDocumentItems($args);
+                            }
+                        break;
+                }
+            }
+
+            $output = $this->_compile($args,$content_items);
+            return $output;
+        }
+
+        /**
+         * @brief Return to the list of comments extracted mcontentItem
+         **/
+        function _getCommentItems($args) {
+            // CommentModel:: getCommentList() to take advantage of the variable order
+            $obj->module_srl = $args->module_srl;
+            $obj->sort_index = $args->order_target;
+            $obj->list_count = $args->list_count;
+            // Get model object of the comment module getCommentList() method runs
+            $oCommentModel = &getModel('comment');
+            $output = $oCommentModel->getNewestCommentList($obj);
+
+            $content_items = array();
+
+            if(!count($output)) return;
+
+            foreach($output as $key => $oComment) {
+                $attribute = $oComment->getObjectVars();
+                $title = $oComment->getSummary($args->content_cut_size);
+                $thumbnail = $oComment->getThumbnail();
+                $url = sprintf("%s#comment_%s",getUrl('','document_srl',$oComment->get('document_srl')),$oComment->get('comment_srl'));
+
+                $attribute->mid = $args->mid_lists[$attribute->module_srl];
+                $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
+                $domain = $args->module_srls_info[$attribute->module_srl]->domain;
+
+                $content_item = new mcontentItem($browser_title);
+                $content_item->adds($attribute);
+                $content_item->setTitle($title);
+                $content_item->setThumbnail($thumbnail);
+                $content_item->setLink($url);
+                $content_item->setDomain($domain);
+                $content_item->add('mid', $args->mid_lists[$attribute->module_srl]);
+                $content_items[] = $content_item;
+            }
+            return $content_items;
+        }
+
+        function _getDocumentItems($args){
+            // Get model object of the document module and make the result as an object
+            $oDocumentModel = &getModel('document');
+            // Get categories
+            $obj->module_srl = $args->module_srl;
+            $output = executeQueryArray('widgets.content.getCategories',$obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    $category_lists[$val->module_srl][$val->category_srl] = $val;
+                }
+            }
+            // Get a list of documents
+            $obj->module_srl = $args->module_srl;
+            $obj->sort_index = $args->order_target;
+            $obj->order_type = $args->order_type=="desc"?"asc":"desc";
+            $obj->list_count = $args->list_count;
+			$obj->statusList = array('PUBLIC');
+            $output = executeQueryArray('widgets.content.getNewestDocuments', $obj);
+            if(!$output->toBool() || !$output->data) return;
+            // If the result exists, make each document as an object
+            $content_items = array();
+            $first_thumbnail_idx = -1;
+            if(count($output->data)) {
+                foreach($output->data as $key => $attribute) {
+                    $oDocument = new documentItem();
+                    $oDocument->setAttribute($attribute, false);
+                    $GLOBALS['XE_DOCUMENT_LIST'][$oDocument->document_srl] = $oDocument;
+                    $document_srls[] = $oDocument->document_srl;
+                }
+                $oDocumentModel->setToAllDocumentExtraVars();
+
+                for($i=0,$c=count($document_srls);$i<$c;$i++) {
+                    $oDocument = $GLOBALS['XE_DOCUMENT_LIST'][$document_srls[$i]];
+                    $document_srl = $oDocument->document_srl;
+                    $module_srl = $oDocument->get('module_srl');
+                    $category_srl = $oDocument->get('category_srl');
+                    $thumbnail = $oDocument->getThumbnail();
+                    $content_item = new mcontentItem( $args->module_srls_info[$module_srl]->browser_title );
+                    $content_item->adds($oDocument->getObjectVars());
+                    $content_item->setTitle($oDocument->getTitle());
+                    $content_item->setCategory( $category_lists[$module_srl][$category_srl]->title );
+                    $content_item->setDomain( $args->module_srls_info[$module_srl]->domain );
+                    $content_item->setContent($oDocument->getSummary($args->content_cut_size));
+                    $content_item->setLink( getSiteUrl($domain,'','document_srl',$document_srl) );
+                    $content_item->setThumbnail($thumbnail);
+                    $content_item->add('mid', $args->mid_lists[$module_srl]);
+                    if($first_thumbnail_idx==-1 && $thumbnail) $first_thumbnail_idx = $i;
+                    $content_items[] = $content_item;
+                }
+
+                $content_items[0]->setFirstThumbnailIdx($first_thumbnail_idx);
+            }
+            return $content_items;
+        }
+
+        function _getImageItems($args) {
+            $oDocumentModel = &getModel('document');
+
+            $obj->module_srls = $obj->module_srl = $args->module_srl;
+            $obj->direct_download = 'Y';
+            $obj->isvalid = 'Y';
+            // Get categories
+            $output = executeQueryArray('widgets.content.getCategories',$obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    $category_lists[$val->module_srl][$val->category_srl] = $val;
+                }
+            }
+            // Get a file list in each document on the module
+            $obj->list_count = $args->list_count;
+            $files_output = executeQueryArray("file.getOneFileInDocument", $obj);
+            $files_count = count($files_output->data);
+            if(!$files_count) return;
+
+            $content_items = array();
+
+            for($i=0;$i<$files_count;$i++) $document_srl_list[] = $files_output->data[$i]->document_srl;
+
+            $tmp_document_list = $oDocumentModel->getDocuments($document_srl_list);
+
+            if(!count($tmp_document_list)) return;
+
+            foreach($tmp_document_list as $oDocument){
+                $attribute = $oDocument->getObjectVars();
+                $browser_title = $args->module_srls_info[$attribute->module_srl]->browser_title;
+                $domain = $args->module_srls_info[$attribute->module_srl]->domain;
+                $category = $category_lists[$attribute->module_srl]->text;
+                $content = $oDocument->getSummary($args->content_cut_size);
+                $url = sprintf("%s#%s",$oDocument->getPermanentUrl() ,$oDocument->getCommentCount());
+                $thumbnail = $oDocument->getThumbnail();
+                $content_item = new mcontentItem($browser_title);
+                $content_item->adds($attribute);
+                $content_item->setCategory($category);
+                $content_item->setContent($content);
+                $content_item->setLink($url);
+                $content_item->setThumbnail($thumbnail);
+                $content_item->setExtraImages($extra_images);
+                $content_item->setDomain($domain);
+                $content_item->add('mid', $args->mid_lists[$attribute->module_srl]);
+                $content_items[] = $content_item;
+            }
+
+            return $content_items;
+        }
+
+        function getRssItems($args){
+
+            $content_items = array();
+            $args->mid_lists = array();
+
+            foreach($args->rss_urls as $key => $rss){
+                $args->rss_url = $rss;
+                $content_item = $this->_getRssItems($args);
+                if(count($content_item) > 0){
+                    $browser_title = $content_item[0]->getBrowserTitle();
+                    $args->mid_lists[] = $browser_title;
+                    $content_items[] = $content_item;
+                }
+            }
+
+            if($args->tab_type == 'none' || $args->tab_type == ''){
+                $items = array();
+                foreach($content_items as $key => $val){
+                    foreach($val as $k => $v){
+                        $date = $v->get('regdate');
+                        $i=0;
+                        while(array_key_exists(sprintf('%s%02d',$date,$i), $items)) $i++;
+                        $items[sprintf('%s%02d',$date,$i)] = $v;
+                    }
+                }
+                if($args->order_type =='asc') ksort($items);
+                else krsort($items);
+                $content_items = array_slice(array_values($items),0,$args->list_count);
+            } return $content_items;
+        }
+
+        function _getRssBody($value) {
+            if(!$value || is_string($value)) return $value;
+            if(is_object($value)) $value = get_object_vars($value);
+            $body = null;
+            if(!count($value)) return;
+            foreach($value as $key => $val) {
+                if($key == 'body') {
+                    $body = $val;
+                    continue;
+                }
+                if(is_object($val)||is_array($val)) $body = $this->_getRssBody($val);
+                if($body !== null) return $body;
+            }
+            return $body;
+        }
+
+        function _getSummary($content, $str_size = 50)
+        {
+            $content = preg_replace('!(<br[\s]*/{0,1}>[\s]*)+!is', ' ', $content);
+            // Replace tags such as </p> , </div> , </li> and others to a whitespace
+            $content = str_replace(array('</p>', '</div>', '</li>'), ' ', $content);
+            // Remove Tag
+            $content = preg_replace('!<([^>]*?)>!is','', $content);
+            // Replace tags to < , > , " 
+            $content = str_replace(array('&lt;','&gt;','&quot;','&nbsp;'), array('<','>','"',' '), $content);
+            // Delete a series of whitespaces
+            $content = preg_replace('/ ( +)/is', ' ', $content);
+            // Truncate string
+            $content = trim(cut_str($content, $str_size, $tail));
+            // Replace back < , > , "  to theoriginal tags
+            $content = str_replace(array('<','>','"'),array('&lt;','&gt;','&quot;'), $content);
+            // Fixed a newline bug on a set of consecutive English letters 
+            $content = preg_replace('/([a-z0-9\+:\/\.\~,\|\!\@\#\$\%\^\&\*\(\)\_]){20}/is',"$0-",$content);
+            return $content; 
+        }
+
+
+       /**
+         * @brief function to receive contents from rss url
+         * For Tistory blog in Korea, the original RSS url has location header without contents. Fixed to work as same as rss_reader widget.
+         **/
+        function requestFeedContents($rss_url) {
+            $rss_url = str_replace('&amp;','&',Context::convertEncodingStr($rss_url));
+            return FileHandler::getRemoteResource($rss_url, null, 3, 'GET', 'application/xml');
+        }
+
+        function _getRssItems($args){
+            // Date Format
+            $DATE_FORMAT = $args->date_format ? $args->date_format : "Y-m-d H:i:s";
+
+            $buff = $this->requestFeedContents($args->rss_url);
+
+            $encoding = preg_match("/<\?xml.*encoding=\"(.+)\".*\?>/i", $buff, $matches);
+            if($encoding && !preg_match("/UTF-8/i", $matches[1])) $buff = Context::convertEncodingStr($buff);
+
+            $buff = preg_replace("/<\?xml.*\?>/i", "", $buff);
+
+            $oXmlParser = new XmlParser();
+            $xml_doc = $oXmlParser->parse($buff);
+            if($xml_doc->rss) {
+                $rss->title = $xml_doc->rss->channel->title->body;
+                $rss->link = $xml_doc->rss->channel->link->body;
+
+                $items = $xml_doc->rss->channel->item;
+
+                if(!$items) return;
+                if($items && !is_array($items)) $items = array($items);
+
+                $content_items = array();
+
+                foreach ($items as $key => $value) {
+                    if($key >= $args->list_count) break;
+                    unset($item);
+
+                    foreach($value as $key2 => $value2) {
+                        if(is_array($value2)) $value2 = array_shift($value2);
+                        $item->{$key2} = $this->_getRssBody($value2);
+                    }
+
+                    $content_item = new mcontentItem($rss->title);
+                    $content_item->setContentsLink($rss->link);
+                    $content_item->setTitle($item->title);
+                    $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+                    //$content_item->setCategory($item->category);
+                    $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
+                    $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
+                    $content_item->setLink($item->link);
+                    $date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
+                    $content_item->setRegdate($date);
+
+                    $content_items[] = $content_item;
+                }
+            } elseif($xml_doc->{'rdf:rdf'}) {
+                // rss1.0 supported (XE's XML is case-insensitive because XML parser converts all to small letters) Fixed by misol
+                $rss->title = $xml_doc->{'rdf:rdf'}->channel->title->body;
+                $rss->link = $xml_doc->{'rdf:rdf'}->channel->link->body;
+
+                $items = $xml_doc->{'rdf:rdf'}->item;
+
+                if(!$items) return;
+                if($items && !is_array($items)) $items = array($items);
+
+                $content_items = array();
+
+                foreach ($items as $key => $value) {
+                    if($key >= $args->list_count) break;
+                    unset($item);
+
+                    foreach($value as $key2 => $value2) {
+                        if(is_array($value2)) $value2 = array_shift($value2);
+                        $item->{$key2} = $this->_getRssBody($value2);
+                    }
+
+                    $content_item = new mcontentItem($rss->title);
+                    $content_item->setContentsLink($rss->link);
+                    $content_item->setTitle($item->title);
+                    $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+                    //$content_item->setCategory($item->category);
+                    $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->description);
+                    $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
+                    $content_item->setLink($item->link);
+                    $date = date('YmdHis', strtotime(max($item->pubdate,$item->pubDate,$item->{'dc:date'})));
+                    $content_item->setRegdate($date);
+
+                    $content_items[] = $content_item;
+                }
+            } elseif($xml_doc->feed && $xml_doc->feed->attrs->xmlns == 'http://www.w3.org/2005/Atom') {
+                // Atom 1.0 spec supported by misol
+                $rss->title = $xml_doc->feed->title->body;
+                $links = $xml_doc->feed->link;
+                if(is_array($links)) {
+                    foreach ($links as $value) {
+                        if($value->attrs->rel == 'alternate') {
+                            $rss->link = $value->attrs->href;
+                            break;
+                        }
+                    }
+                }
+                elseif($links->attrs->rel == 'alternate') $rss->link = $links->attrs->href;
+
+                $items = $xml_doc->feed->entry;
+
+                if(!$items) return;
+                if($items && !is_array($items)) $items = array($items);
+
+                $content_items = array();
+
+                foreach ($items as $key => $value) {
+                    if($key >= $args->list_count) break;
+                    unset($item);
+
+                    foreach($value as $key2 => $value2) {
+                        if(is_array($value2)) $value2 = array_shift($value2);
+                        $item->{$key2} = $this->_getRssBody($value2);
+                    }
+
+                    $content_item = new mcontentItem($rss->title);
+                    $links = $value->link;
+                    if(is_array($links)) {
+                        foreach ($links as $val) {
+                            if($val->attrs->rel == 'alternate') {
+                                $item->link = $val->attrs->href;
+                                break;
+                            }
+                        }
+                    }
+                    elseif($links->attrs->rel == 'alternate') $item->link = $links->attrs->href;
+
+                    $content_item->setContentsLink($rss->link);
+                    if($item->title) {
+                        if(!preg_match("/html/i", $value->title->attrs->type)) $item->title = $value->title->body;
+                    }
+                    $content_item->setTitle($item->title);
+                    $content_item->setNickName(max($item->author,$item->{'dc:creator'}));
+                    $content_item->setAuthorSite($value->author->uri->body);
+                    //$content_item->setCategory($item->category);
+                    $item->description = preg_replace('!<a href=!is','<a onclick="window.open(this.href);return false" href=', $item->content);
+                    if($item->description) {
+                        if(!preg_match("/html/i", $value->content->attrs->type)) $item->description = htmlspecialchars($item->description);
+                    }
+                    if(!$item->description) {
+                        $item->description = $item->summary;
+                        if($item->description) {
+                            if(!preg_match("/html/i", $value->summary->attrs->type)) $item->description = htmlspecialchars($item->description);
+                        }
+                    }
+                    $content_item->setContent($this->_getSummary($item->description, $args->content_cut_size));
+                    $content_item->setLink($item->link);
+                    $date = date('YmdHis', strtotime(max($item->published,$item->updated,$item->{'dc:date'})));
+                    $content_item->setRegdate($date);
+
+                    $content_items[] = $content_item;
+                }
+            }
+            return $content_items;
+        }
+
+        function _getTrackbackItems($args){
+            // Get categories
+            $output = executeQueryArray('widgets.content.getCategories',$obj);
+            if($output->toBool() && $output->data) {
+                foreach($output->data as $key => $val) {
+                    $category_lists[$val->module_srl][$val->category_srl] = $val;
+                }
+            }
+
+            $obj->module_srl = $args->module_srl;
+            $obj->sort_index = $args->order_target;
+            $obj->list_count = $args->list_count;
+            // Get model object from the trackback module and execute getTrackbackList() method
+            $oTrackbackModel = &getModel('trackback');
+            $output = $oTrackbackModel->getNewestTrackbackList($obj);
+            // If an error occurs, just ignore it.
+            if(!$output->toBool() || !$output->data) return;
+            // If the result exists, make each document as an object
+            $content_items = array();
+            foreach($output->data as $key => $item) {
+                $domain = $args->module_srls_info[$item->module_srl]->domain;
+                $category = $category_lists[$item->module_srl]->text;
+                $url = getSiteUrl($domain,'','document_srl',$item->document_srl);
+                $browser_title = $args->module_srls_info[$item->module_srl]->browser_title;
+
+                $content_item = new mcontentItem($browser_title);
+                $content_item->adds($item);
+                $content_item->setTitle($item->title);
+                $content_item->setCategory($category);
+                $content_item->setNickName($item->blog_name);
+                $content_item->setContent($item->excerpt);  ///<<
+                $content_item->setDomain($domain);  ///<<
+                $content_item->setLink($url);
+                $content_item->add('mid', $args->mid_lists[$item->module_srl]);
+                $content_item->setRegdate($item->regdate);
+                $content_items[] = $content_item;
+            }
+            return $content_items;
+        }
+
+        function _compile($args,$content_items){
+            $oTemplate = &TemplateHandler::getInstance();
+            // Set variables for widget
+            $widget_info->modules_info = $args->modules_info;
+            $widget_info->option_view_arr = $args->option_view_arr;
+            $widget_info->list_count = $args->list_count;
+            $widget_info->subject_cut_size = $args->subject_cut_size;
+            $widget_info->content_cut_size = $args->content_cut_size;
+
+            $widget_info->thumbnail_type = $args->thumbnail_type;
+            $widget_info->thumbnail_width = $args->thumbnail_width;
+            $widget_info->thumbnail_height = $args->thumbnail_height;
+            $widget_info->mid_lists = $args->mid_lists;
+
+            $widget_info->show_browser_title = $args->show_browser_title;
+            $widget_info->show_category = $args->show_category;
+            $widget_info->show_comment_count = $args->show_comment_count;
+            $widget_info->show_trackback_count = $args->show_trackback_count;
+            $widget_info->show_icon = $args->show_icon;
+
+            $widget_info->list_type = $args->list_type;
+            $widget_info->tab_type = $args->tab_type;
+
+            $widget_info->markup_type = $args->markup_type;
+            $widget_info->content_items = $content_items;
+            
+            unset($args->option_view_arr);
+            unset($args->modules_info);
+
+            Context::set('colorset', $args->colorset);
+            Context::set('widget_info', $widget_info);
+
+            $tpl_path = sprintf('%sskins/%s', $this->widget_path, $args->skin);
+            return $oTemplate->compile($tpl_path, "content");
+        }
+    }
+
+    class mcontentItem extends Object {
+
+        var $browser_title = null;
+        var $has_first_thumbnail_idx = false;
+        var $first_thumbnail_idx = null;
+        var $contents_link = null;
+        var $domain = null;
+
+        function mcontentItem($browser_title=''){
+            $this->browser_title = $browser_title;
+        }
+        function setContentsLink($link){
+            $this->contents_link = $link;
+        }
+        function setFirstThumbnailIdx($first_thumbnail_idx){
+            if(is_null($this->first_thumbnail) && $first_thumbnail_idx>-1) {
+                $this->has_first_thumbnail_idx = true;
+                $this->first_thumbnail_idx= $first_thumbnail_idx;
+            }
+        }
+        function setExtraImages($extra_images){
+            $this->add('extra_images',$extra_images);
+        }
+        function setDomain($domain) {
+            static $default_domain = null;
+            if(!$domain) {
+                if(is_null($default_domain)) $default_domain = Context::getDefaultUrl();
+                $domain = $default_domain;
+            }
+            $this->domain = $domain;
+        }
+        function setLink($url){
+            $this->add('url',$url);
+        }
+        function setTitle($title){
+            $this->add('title',$title);
+        }
+
+        function setThumbnail($thumbnail){
+            $this->add('thumbnail',$thumbnail);
+        }
+        function setContent($content){
+            $this->add('content',$content);
+        }
+        function setRegdate($regdate){
+            $this->add('regdate',$regdate);
+        }
+        function setNickName($nick_name){
+            $this->add('nick_name',$nick_name);
+        }
+        // Save author's homepage url by misol
+        function setAuthorSite($site_url){
+            $this->add('author_site',$site_url);
+        }
+        function setCategory($category){
+            $this->add('category',$category);
+        }
+        function getBrowserTitle(){
+            return $this->browser_title;
+        }
+        function getDomain() {
+            return $this->domain;
+        }
+        function getContentsLink(){
+            return $this->contents_link;
+        }
+
+        function getFirstThumbnailIdx(){
+            return $this->first_thumbnail_idx;
+        }
+
+        function getLink(){
+            return $this->get('url');
+        }
+        function getModuleSrl(){
+            return $this->get('module_srl');
+        }
+        function getTitle($cut_size = 0, $tail='...'){
+            $title = strip_tags($this->get('title'));
+
+            if($cut_size) $title = cut_str($title, $cut_size, $tail);
+
+            $attrs = array();
+            if($this->get('title_bold') == 'Y') $attrs[] = 'font-weight:bold';
+            if($this->get('title_color') && $this->get('title_color') != 'N') $attrs[] = 'color:#'.$this->get('title_color');
+
+            if(count($attrs)) $title = sprintf("<span style=\"%s\">%s</span>", implode(';', $attrs), htmlspecialchars($title));
+
+            return $title;
+        }
+        function getContent(){
+            return $this->get('content');
+        }
+        function getCategory(){
+            return $this->get('category');
+        }
+        function getNickName(){
+            return $this->get('nick_name');
+        }
+        function getAuthorSite(){
+            return $this->get('author_site');
+        }
+        function getCommentCount(){
+            $comment_count = $this->get('comment_count');
+            return $comment_count>0 ? $comment_count : '';
+        }
+        function getTrackbackCount(){
+            $trackback_count = $this->get('trackback_count');
+            return $trackback_count>0 ? $trackback_count : '';
+        }
+        function getRegdate($format = 'Y.m.d H:i:s') {
+            return zdate($this->get('regdate'), $format);
+        }
+        function printExtraImages() {
+            return $this->get('extra_images');
+        }
+        function haveFirstThumbnail() {
+            return $this->has_first_thumbnail_idx;
+        }
+        function getThumbnail(){
+            return $this->get('thumbnail');
+        }
+        function getMemberSrl() {
+            return $this->get('member_srl');
+        }
+    }
+?>
diff --git a/widgets/mcontent/skins/default/content.html b/widgets/mcontent/skins/default/content.html
index 0094232a9..33c079b98 100644
--- a/widgets/mcontent/skins/default/content.html
+++ b/widgets/mcontent/skins/default/content.html
@@ -1,11 +1,8 @@
-<!--%import("mcontent.css")-->
-<!--%unload("../../../../common/css/default.css")-->
-<!--%unload("../../../../common/css/button.css")-->
-
-<!--@if($widget_info->list_type == "image_title")-->
-	<!--#include("./image_title.html")-->
-<!--@elseif($widget_info->list_type == "image_title_content")-->
-	<!--#include("./image_title_content.html")-->
-<!--@else-->
-	<!--#include("./normal.html")-->
-<!--@end-->
+<!--%import("mcontent.css")-->
+<!--@if($widget_info->list_type == "image_title")-->
+	<!--#include("./image_title.html")-->
+<!--@elseif($widget_info->list_type == "image_title_content")-->
+	<!--#include("./image_title_content.html")-->
+<!--@else-->
+	<!--#include("./normal.html")-->
+<!--@end-->
diff --git a/widgets/mcontent/skins/default/image_title.html b/widgets/mcontent/skins/default/image_title.html
index 912d4d40b..89d9c9796 100644
--- a/widgets/mcontent/skins/default/image_title.html
+++ b/widgets/mcontent/skins/default/image_title.html
@@ -1,51 +1,51 @@
-<!--@if($widget_info->modules_info && count($widget_info->modules_info)==1)-->
-{@$__module_info=$widget_info->modules_info;}
-{@$__module_info=array_pop($__module_info);}
-<div class="hx h2">
-	<h2>{$__module_info->browser_title}</h2>
-</div>
-<!--@end-->
-
-<ul class="lt">
-<!--@foreach($widget_info->content_items as $key => $item)-->
-	<li>
-		<a href="{$item->getLink()}">
-			<!--@if($item->getThumbnail())-->
-				<img src="{$item->getThumbnail()}" alt="" class="th" />
-			<!--@else-->
-				<span class="th">No Image</span>
-			<!--@end-->
-			
-			<!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
-				<!--@if($widget_info->option_view_arr[$j]=='title')-->
-				<span class="title">
-					<!--@if(!$__module_info && $widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
-					{$item->getBrowserTitle()} &rsaquo;
-					<!--@end-->
-					
-					<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
-					{$item->getCategory()} &rsaquo;
-					<!--@end-->
-					
-					<strong>{$item->getTitle($widget_info->subject_cut_size)}</strong>
-					
-					<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
-					<em title="Replies">[{$item->getCommentCount()}]</em>
-					<!--@end-->
-					
-					<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
-					<em title="Trackbacks">[{$item->getTrackbackCount()}]</em>
-					<!--@end-->
-				</span>
-	
-				<!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
-				<span class="auth">
-					<strong>{$item->getNickName()}</strong>
-					<span class="time">{$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}</span>
-				</span>
-				<!--@end-->
-			<!--@end-->
-		</a>
-	</li>
-<!--@end-->
-</ul>
+<!--@if($widget_info->modules_info && count($widget_info->modules_info)==1)-->
+{@$__module_info=$widget_info->modules_info;}
+{@$__module_info=array_pop($__module_info);}
+<div class="hx h2">
+	<h2>{$__module_info->browser_title}</h2>
+</div>
+<!--@end-->
+
+<ul class="lt">
+<!--@foreach($widget_info->content_items as $key => $item)-->
+	<li>
+		<a href="{$item->getLink()}">
+			<!--@if($item->getThumbnail())-->
+				<img src="{$item->getThumbnail()}" alt="" class="th" />
+			<!--@else-->
+				<span class="th">No Image</span>
+			<!--@end-->
+			
+			<!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
+				<!--@if($widget_info->option_view_arr[$j]=='title')-->
+				<span class="title">
+					<!--@if(!$__module_info && $widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+					{$item->getBrowserTitle()} &rsaquo;
+					<!--@end-->
+					
+					<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
+					{$item->getCategory()} &rsaquo;
+					<!--@end-->
+					
+					<strong>{$item->getTitle($widget_info->subject_cut_size)}</strong>
+					
+					<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
+					<em title="Replies">[{$item->getCommentCount()}]</em>
+					<!--@end-->
+					
+					<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+					<em title="Trackbacks">[{$item->getTrackbackCount()}]</em>
+					<!--@end-->
+				</span>
+	
+				<!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
+				<span class="auth">
+					<strong>{$item->getNickName()}</strong>
+					<span class="time">{$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}</span>
+				</span>
+				<!--@end-->
+			<!--@end-->
+		</a>
+	</li>
+<!--@end-->
+</ul>
diff --git a/widgets/mcontent/skins/default/image_title_content.html b/widgets/mcontent/skins/default/image_title_content.html
index ccd49c4a1..fc3135293 100644
--- a/widgets/mcontent/skins/default/image_title_content.html
+++ b/widgets/mcontent/skins/default/image_title_content.html
@@ -1,54 +1,54 @@
-<!--@if($widget_info->modules_info && count($widget_info->modules_info)==1)-->
-{@$__module_info=$widget_info->modules_info;}
-{@$__module_info=array_pop($__module_info);}
-<div class="hx h2">
-	<h2>{$__module_info->browser_title}</h2>
-</div>
-<!--@end-->
-
-<ul class="lt">
-<!--@foreach($widget_info->content_items as $key => $item)-->
-	<li>
-		<a href="{$item->getLink()}">
-			<!--@if($item->getThumbnail())-->
-				<img src="{$item->getThumbnail()}" alt="" class="th" />
-			<!--@else-->
-				<span class="th">No Image</span>
-			<!--@end-->
-			
-			<!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
-				<!--@if($widget_info->option_view_arr[$j]=='title')-->
-				<span class="title">
-					<!--@if(!$__module_info && $widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
-					{$item->getBrowserTitle()} &rsaquo;
-					<!--@end-->
-					
-					<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
-					{$item->getCategory()} &rsaquo;
-					<!--@end-->
-					
-					<strong>{$item->getTitle($widget_info->subject_cut_size)}</strong>
-					
-					<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
-					<em title="Replies">[{$item->getCommentCount()}]</em>
-					<!--@end-->
-					
-					<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
-					<em title="Trackbacks">[{$item->getTrackbackCount()}]</em>
-					<!--@end-->
-				</span>
-	
-				<!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
-				<span class="auth">
-					<strong>{$item->getNickName()}</strong>
-					<span class="time">{$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}</span>
-				</span>
-				
-				<!--@else if($widget_info->option_view_arr[$j]=='content')-->
-				<span class="text">{$item->getContent()}</span>
-				<!--@end-->
-			<!--@end-->
-		</a>
-	</li>
-<!--@end-->
-</ul>
+<!--@if($widget_info->modules_info && count($widget_info->modules_info)==1)-->
+{@$__module_info=$widget_info->modules_info;}
+{@$__module_info=array_pop($__module_info);}
+<div class="hx h2">
+	<h2>{$__module_info->browser_title}</h2>
+</div>
+<!--@end-->
+
+<ul class="lt">
+<!--@foreach($widget_info->content_items as $key => $item)-->
+	<li>
+		<a href="{$item->getLink()}">
+			<!--@if($item->getThumbnail())-->
+				<img src="{$item->getThumbnail()}" alt="" class="th" />
+			<!--@else-->
+				<span class="th">No Image</span>
+			<!--@end-->
+			
+			<!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
+				<!--@if($widget_info->option_view_arr[$j]=='title')-->
+				<span class="title">
+					<!--@if(!$__module_info && $widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+					{$item->getBrowserTitle()} &rsaquo;
+					<!--@end-->
+					
+					<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
+					{$item->getCategory()} &rsaquo;
+					<!--@end-->
+					
+					<strong>{$item->getTitle($widget_info->subject_cut_size)}</strong>
+					
+					<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
+					<em title="Replies">[{$item->getCommentCount()}]</em>
+					<!--@end-->
+					
+					<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+					<em title="Trackbacks">[{$item->getTrackbackCount()}]</em>
+					<!--@end-->
+				</span>
+	
+				<!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
+				<span class="auth">
+					<strong>{$item->getNickName()}</strong>
+					<span class="time">{$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}</span>
+				</span>
+				
+				<!--@else if($widget_info->option_view_arr[$j]=='content')-->
+				<span class="text">{$item->getContent()}</span>
+				<!--@end-->
+			<!--@end-->
+		</a>
+	</li>
+<!--@end-->
+</ul>
diff --git a/widgets/mcontent/skins/default/mcontent.css b/widgets/mcontent/skins/default/mcontent.css
index 984e7f05b..52ddeceaf 100644
--- a/widgets/mcontent/skins/default/mcontent.css
+++ b/widgets/mcontent/skins/default/mcontent.css
@@ -1,24 +1,24 @@
-@charset "utf-8"; 
-/* Mobile XE (/widgets/mcontent/skins/default/) */
-/* Hx */
-.hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
-.hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
-.hx.h2{background:#e5e5e5}
-.hx.h2 em{font-size:12px;color:#6352d2}
-.hx.h3{background:#868686;color:#fff}
-.hx.h3 em{font-size:12px}
-.hx h2, .hx h3{margin:0 10px 0 0;display:inline}
-.hx h2{font-size:16px;line-height:1.4}
-.hx h3{font-size:14px}
-/* List */
-.lt{margin:0;padding:0;list-style:none;background:#f8f8f8;font-size:14px}
-.lt li{border-bottom:1px solid #ccc8be}
-.lt a{display:block;text-decoration:none;color:#000;padding:10px;*zoom:1}
-.lt a:after{content:"";display:block;clear:both}
-.lt .th{float:left;margin:0 10px 5px 0;border:1px solid #ccc;background:#666;color:#fff;text-align:center;line-height:80px;width:80px;height:80px;font-size:14px}
-.lt .title{display:block;margin:0 0 5px 0}
-.lt .title strong{font-size:14px;font-weight:bold}
-.lt .title em{font-size:12px;color:#333;color:#6352d2}
-.lt .text{display:block; color:#666;margin:0 0 5px 0}
-.lt .auth{display:block;font-size:12px}
-.lt .auth .time{padding:0 5px;border-left:1px solid #bfbfbf}
+@charset "utf-8"; 
+/* Mobile XE (/widgets/mcontent/skins/default/) */
+/* Hx */
+.hx{position:relative;border-bottom:1px solid #ccc8be;padding:8px 10px;margin:0}
+.hx:after{content:"";margin:0 -10px;position:relative;top:10px;display:block;clear:both;height:1px;background:#fff}
+.hx.h2{background:#e5e5e5}
+.hx.h2 em{font-size:12px;color:#6352d2}
+.hx.h3{background:#868686;color:#fff}
+.hx.h3 em{font-size:12px}
+.hx h2, .hx h3{margin:0 10px 0 0;display:inline}
+.hx h2{font-size:16px;line-height:1.4}
+.hx h3{font-size:14px}
+/* List */
+.lt{margin:0;padding:0;list-style:none;background:#f8f8f8;font-size:14px}
+.lt li{border-bottom:1px solid #ccc8be}
+.lt a{display:block;text-decoration:none;color:#000;padding:10px;*zoom:1}
+.lt a:after{content:"";display:block;clear:both}
+.lt .th{float:left;margin:0 10px 5px 0;border:1px solid #ccc;background:#666;color:#fff;text-align:center;line-height:80px;width:80px;height:80px;font-size:14px}
+.lt .title{display:block;margin:0 0 5px 0}
+.lt .title strong{font-size:14px;font-weight:bold}
+.lt .title em{font-size:12px;color:#333;color:#6352d2}
+.lt .text{display:block; color:#666;margin:0 0 5px 0}
+.lt .auth{display:block;font-size:12px}
+.lt .auth .time{padding:0 5px;border-left:1px solid #bfbfbf}
diff --git a/widgets/mcontent/skins/default/normal.html b/widgets/mcontent/skins/default/normal.html
index 758c0c9f3..bd48d45b2 100644
--- a/widgets/mcontent/skins/default/normal.html
+++ b/widgets/mcontent/skins/default/normal.html
@@ -1,45 +1,45 @@
-<!--@if($widget_info->modules_info && count($widget_info->modules_info)==1)-->
-{@$__module_info=$widget_info->modules_info;}
-{@$__module_info=array_pop($__module_info);}
-<div class="hx h2">
-	<h2>{$__module_info->browser_title}</h2>
-</div>
-<!--@end-->
-
-<ul class="lt">
-<!--@foreach($widget_info->content_items as $key => $item)-->
-	<li>
-		<a href="{$item->getLink()}">
-			<!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
-				<!--@if($widget_info->option_view_arr[$j]=='title')-->
-				<span class="title">
-					<!--@if(!$__module_info && $widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
-					{$item->getBrowserTitle()} &rsaquo;
-					<!--@end-->
-					
-					<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
-					{$item->getCategory()} &rsaquo;
-					<!--@end-->
-					
-					<strong>{$item->getTitle($widget_info->subject_cut_size)}</strong>
-					
-					<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
-					<em title="Replies">[{$item->getCommentCount()}]</em>
-					<!--@end-->
-					
-					<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
-					<em title="Trackbacks">[{$item->getTrackbackCount()}]</em>
-					<!--@end-->
-				</span>
-	
-				<!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
-				<span class="auth">
-					<strong>{$item->getNickName()}</strong>
-					<span class="time">{$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}</span>
-				</span>
-				<!--@end-->
-			<!--@end-->
-		</a>
-	</li>
-<!--@end-->
-</ul>
+<!--@if($widget_info->modules_info && count($widget_info->modules_info)==1)-->
+{@$__module_info=$widget_info->modules_info;}
+{@$__module_info=array_pop($__module_info);}
+<div class="hx h2">
+	<h2>{$__module_info->browser_title}</h2>
+</div>
+<!--@end-->
+
+<ul class="lt">
+<!--@foreach($widget_info->content_items as $key => $item)-->
+	<li>
+		<a href="{$item->getLink()}">
+			<!--@for($j=0,$c=count($widget_info->option_view_arr);$j<$c;$j++)-->
+				<!--@if($widget_info->option_view_arr[$j]=='title')-->
+				<span class="title">
+					<!--@if(!$__module_info && $widget_info->show_browser_title=='Y' && $item->getBrowserTitle())-->
+					{$item->getBrowserTitle()} &rsaquo;
+					<!--@end-->
+					
+					<!--@if($widget_info->show_category=='Y' && $item->getCategory())-->
+					{$item->getCategory()} &rsaquo;
+					<!--@end-->
+					
+					<strong>{$item->getTitle($widget_info->subject_cut_size)}</strong>
+					
+					<!--@if($widget_info->show_comment_count=='Y' && $item->getCommentCount())-->
+					<em title="Replies">[{$item->getCommentCount()}]</em>
+					<!--@end-->
+					
+					<!--@if($widget_info->show_trackback_count=='Y' && $item->getTrackbackCount())-->
+					<em title="Trackbacks">[{$item->getTrackbackCount()}]</em>
+					<!--@end-->
+				</span>
+	
+				<!--@else if($widget_info->option_view_arr[$j]=='nickname')-->
+				<span class="auth">
+					<strong>{$item->getNickName()}</strong>
+					<span class="time">{$item->getRegdate("Y-m-d")} {$item->getRegdate("H:i")}</span>
+				</span>
+				<!--@end-->
+			<!--@end-->
+		</a>
+	</li>
+<!--@end-->
+</ul>
diff --git a/widgets/mcontent/skins/default/skin.xml b/widgets/mcontent/skins/default/skin.xml
index 884091020..9ae1565cb 100644
--- a/widgets/mcontent/skins/default/skin.xml
+++ b/widgets/mcontent/skins/default/skin.xml
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<skin version="0.2">
-    <title xml:lang="ko">모바일 콘텐츠 위젯 스킨</title>
-    <title xml:lang="zh-TW">內容預設面板</title>
-    <title xml:lang="tr">Tercihler</title>
-    <description xml:lang="ko">모바일 콘텐츠 전용 심플한 스킨 입니다.</description>
-    <description xml:lang="zh-TW">簡單面板</description>
-    <description xml:lang="tr">簡單面板</description>
-    <version>0.1</version>
-    <date>2009-08-20</date>
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-    <colorset>
-        <color name="white">
-            <title xml:lang="ko">흰색 바탕용</title>
-            <title xml:lang="zh-TW">白色</title>
-            <title xml:lang="tr">Beyaz</title>
-        </color>
-	</colorset>
-</skin>
+<?xml version="1.0" encoding="UTF-8"?>
+<skin version="0.2">
+    <title xml:lang="ko">모바일 콘텐츠 위젯 스킨</title>
+    <title xml:lang="zh-TW">內容預設面板</title>
+    <title xml:lang="tr">Tercihler</title>
+    <description xml:lang="ko">모바일 콘텐츠 전용 심플한 스킨 입니다.</description>
+    <description xml:lang="zh-TW">簡單面板</description>
+    <description xml:lang="tr">簡單面板</description>
+    <version>0.1</version>
+    <date>2009-08-20</date>
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+    <colorset>
+        <color name="white">
+            <title xml:lang="ko">흰색 바탕용</title>
+            <title xml:lang="zh-TW">白色</title>
+            <title xml:lang="tr">Beyaz</title>
+        </color>
+	</colorset>
+</skin>
diff --git a/widgetstyles/simple/skin.xml b/widgetstyles/simple/skin.xml
index d5ca0500a..a6a65b847 100644
--- a/widgetstyles/simple/skin.xml
+++ b/widgetstyles/simple/skin.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widgetstyle>
-    <title xml:lang="ko">심플 스트롱</title>
-    <title xml:lang="zh-CN">简易细线控件样式</title>
-    <title xml:lang="en">Simple line</title>
-    <title xml:lang="vi">Dòng đơn giản</title>
-    <title xml:lang="zh-TW">簡單樣式</title>
-    <title xml:lang="jp">シンプルストロング</title>
-    <title xml:lang="tr">Basit Sıra</title>
-    <description xml:lang="ko">선 하나만으로 꾸며진 위젯스타일 입니다.</description>
-    <description xml:lang="zh-CN">简易细线控件样式。</description>
-    <description xml:lang="en">A widget style decorated with one simple line.</description>
-    <description xml:lang="vi">Widget được trang trí với một dòng đơn giản.</description>
-    <description xml:lang="zh-TW">簡單的 Widget 線條樣式。</description>
-    <description xml:lang="jp">線一つだけのウィジェットスタイルです。</description>
-    <description xml:lang="tr">Tek bir basit sırayla düzenlenmiş görsel bileşen şekli.</description>
-    <version>0.1</version>
-    <date>2009-02-03</date>
-    <preview>preview.gif</preview>
-
-    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
-        <name xml:lang="ko">NHN</name>
-        <name xml:lang="en">NHN</name>
-		<name xml:lang="vi">NHN</name>
-        <name xml:lang="zh-CN">NHN</name>
-        <name xml:lang="zh-TW">NHN</name>
-        <name xml:lang="jp">NHN</name>
-        <name xml:lang="tr">NHN</name>
-    </author>
-
-    <extra_vars>
-        <var name="ws_colorset" type="select">
-            <title xml:lang="ko">컬러셋</title>
-            <title xml:lang="en">Colorset</title>
-	    <title xml:lang="vi">Tạo màu</title>
-            <title xml:lang="zh-CN">颜色</title>
-            <title xml:lang="zh-TW">顏色</title>
-            <title xml:lang="jp">カラーセット</title>
-            <title xml:lang="tr">Renk ayarı</title>
-            <description xml:lang="ko">컬러셋을 지정해주세요</description>
-            <description xml:lang="en">Choose colorset</description>
-	    <description xml:lang="vi">Lựa chọn màu sắc</description>
-            <description xml:lang="zh-CN">请指定适当的颜色。</description>
-            <description xml:lang="zh-TW">請選擇顏色。</description>
-            <description xml:lang="jp">カラーセットを指定して下さい。</description>
-            <description xml:lang="tr">Renk ayarını seç.</description>
-            <options>
-                <name xml:lang="ko">하얀색</name>
-                <name xml:lang="en">White</name>
-		<name xml:lang="vi">White</name>
-                <name xml:lang="zh-CN">白色</name>
-                <name xml:lang="zh-TW">白色</name>
-                <name xml:lang="jp">白</name>
-                <name xml:lang="tr">Beyaz</name>
-                <value>white</value>
-            </options>
-            <options>
-                <name xml:lang="ko">검은색</name>
-                <name xml:lang="en">Black</name>
-		<name xml:lang="vi">Black</name>
-                <name xml:lang="zh-CN">黑色</name>
-                <name xml:lang="zh-TW">黑色</name>
-                <name xml:lang="jp">黒</name>
-                <name xml:lang="tr">Siyah</name>
-                <value>black</value>
-            </options>
-        </var>
-        <var name="ws_title" type="text">
-            <name xml:lang="ko">제목</name>
-            <name xml:lang="en">Title</name>
-	    <name xml:lang="vi">Tiêu đề</name>
-            <name xml:lang="zh-CN">栏目名</name>
-            <name xml:lang="zh-TW">標題</name>
-            <name xml:lang="jp">タイトル</name>
-            <name xml:lang="tr">Başlık</name>
-            <description xml:lang="ko">제목 텍스트</description>
-            <description xml:lang="en">Title text</description>
-	    <description xml:lang="vi">Chữ của tiêu đề</description>
-            <description xml:lang="zh-CN">请输入栏目名。</description>
-            <description xml:lang="zh-TW">請輸入標題。</description>
-            <description xml:lang="jp">「タイトル」のテキスト</description>
-            <description xml:lang="tr">Başlık Metni</description>
-        </var>
-        <var name="ws_more_url" type="text">
-            <name xml:lang="ko">더보기 URL</name>
-            <name xml:lang="en">more URL</name>
-	    <name xml:lang="vi">URL của Xem thêm</name>
-            <name xml:lang="zh-CN">查看更多(链接)</name>
-            <name xml:lang="zh-TW">more URL</name>
-            <name xml:lang="jp">「もっと見る」URL</name>
-            <name xml:lang="tr">Daha fazla URL</name>
-            <description xml:lang="ko">http:// 포함한 URL를 등록합니다.</description>
-	    <description xml:lang="zh-CN">请输入包含http://的URL地址。</description>
-	    <description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
-            <description xml:lang="en">Destination of a link 'more'. Register an URL including http://</description>
-	    <description xml:lang="vi">Địa chỉ trang sẽ chuyển đến khi bấm vào Xem thêm (Bao gồm cả http://)</description>
-            <description xml:lang="jp">「http://」を含んだURLを登録します。</description>
-            <description xml:lang="tr">Bağlantı hedefi 'daha fazlası'.  http:// içeren bir URL girişi yapınız.</description>
-        </var>
-        <var name="ws_more_text" type="text">
-            <name xml:lang="ko">더보기 텍스트</name>
-            <name xml:lang="en">more Text</name>
-	    	<name xml:lang="vi">Chữ của Xem thêm</name>
-            <name xml:lang="zh-CN">查看更多(文本)</name>
-            <name xml:lang="zh-TW">more TEXT</name>
-            <name xml:lang="jp">「もっと見る」テキスト</name>
-            <name xml:lang="tr">Daha fazla metin</name>
-            <description xml:lang="ko">더보기 텍스트</description>
-            <description xml:lang="en">Text for a link 'more'</description>
-            <description xml:lang="zh-CN">文本格式的"查看更多"。</description>
-		    <description xml:lang="vi">Có thể dùng những từ khác thay cho từ Xem thêm</description>
-            <description xml:lang="zh-TW">純文字格式。</description>
-            <description xml:lang="jp">「もっと見る」テキスト</description>
-            <description xml:lang="tr">Bağlantı için metin 'daha fazlası'</description>
-       </var>
-    </extra_vars>
-</widgetstyle>
+<?xml version="1.0" encoding="UTF-8"?>
+<widgetstyle>
+    <title xml:lang="ko">심플 스트롱</title>
+    <title xml:lang="zh-CN">简易细线控件样式</title>
+    <title xml:lang="en">Simple line</title>
+    <title xml:lang="vi">Dòng đơn giản</title>
+    <title xml:lang="zh-TW">簡單樣式</title>
+    <title xml:lang="jp">シンプルストロング</title>
+    <title xml:lang="tr">Basit Sıra</title>
+    <description xml:lang="ko">선 하나만으로 꾸며진 위젯스타일 입니다.</description>
+    <description xml:lang="zh-CN">简易细线控件样式。</description>
+    <description xml:lang="en">A widget style decorated with one simple line.</description>
+    <description xml:lang="vi">Widget được trang trí với một dòng đơn giản.</description>
+    <description xml:lang="zh-TW">簡單的 Widget 線條樣式。</description>
+    <description xml:lang="jp">線一つだけのウィジェットスタイルです。</description>
+    <description xml:lang="tr">Tek bir basit sırayla düzenlenmiş görsel bileşen şekli.</description>
+    <version>0.1</version>
+    <date>2009-02-03</date>
+    <preview>preview.gif</preview>
+
+    <author email_address="developers@xpressengine.com" link="http://xpressengine.com/">
+        <name xml:lang="ko">NHN</name>
+        <name xml:lang="en">NHN</name>
+		<name xml:lang="vi">NHN</name>
+        <name xml:lang="zh-CN">NHN</name>
+        <name xml:lang="zh-TW">NHN</name>
+        <name xml:lang="jp">NHN</name>
+        <name xml:lang="tr">NHN</name>
+    </author>
+
+    <extra_vars>
+        <var name="ws_colorset" type="select">
+            <title xml:lang="ko">컬러셋</title>
+            <title xml:lang="en">Colorset</title>
+	    <title xml:lang="vi">Tạo màu</title>
+            <title xml:lang="zh-CN">颜色</title>
+            <title xml:lang="zh-TW">顏色</title>
+            <title xml:lang="jp">カラーセット</title>
+            <title xml:lang="tr">Renk ayarı</title>
+            <description xml:lang="ko">컬러셋을 지정해주세요</description>
+            <description xml:lang="en">Choose colorset</description>
+	    <description xml:lang="vi">Lựa chọn màu sắc</description>
+            <description xml:lang="zh-CN">请指定适当的颜色。</description>
+            <description xml:lang="zh-TW">請選擇顏色。</description>
+            <description xml:lang="jp">カラーセットを指定して下さい。</description>
+            <description xml:lang="tr">Renk ayarını seç.</description>
+            <options>
+                <name xml:lang="ko">하얀색</name>
+                <name xml:lang="en">White</name>
+		<name xml:lang="vi">White</name>
+                <name xml:lang="zh-CN">白色</name>
+                <name xml:lang="zh-TW">白色</name>
+                <name xml:lang="jp">白</name>
+                <name xml:lang="tr">Beyaz</name>
+                <value>white</value>
+            </options>
+            <options>
+                <name xml:lang="ko">검은색</name>
+                <name xml:lang="en">Black</name>
+		<name xml:lang="vi">Black</name>
+                <name xml:lang="zh-CN">黑色</name>
+                <name xml:lang="zh-TW">黑色</name>
+                <name xml:lang="jp">黒</name>
+                <name xml:lang="tr">Siyah</name>
+                <value>black</value>
+            </options>
+        </var>
+        <var name="ws_title" type="text">
+            <name xml:lang="ko">제목</name>
+            <name xml:lang="en">Title</name>
+	    <name xml:lang="vi">Tiêu đề</name>
+            <name xml:lang="zh-CN">栏目名</name>
+            <name xml:lang="zh-TW">標題</name>
+            <name xml:lang="jp">タイトル</name>
+            <name xml:lang="tr">Başlık</name>
+            <description xml:lang="ko">제목 텍스트</description>
+            <description xml:lang="en">Title text</description>
+	    <description xml:lang="vi">Chữ của tiêu đề</description>
+            <description xml:lang="zh-CN">请输入栏目名。</description>
+            <description xml:lang="zh-TW">請輸入標題。</description>
+            <description xml:lang="jp">「タイトル」のテキスト</description>
+            <description xml:lang="tr">Başlık Metni</description>
+        </var>
+        <var name="ws_more_url" type="text">
+            <name xml:lang="ko">더보기 URL</name>
+            <name xml:lang="en">more URL</name>
+	    <name xml:lang="vi">URL của Xem thêm</name>
+            <name xml:lang="zh-CN">查看更多(链接)</name>
+            <name xml:lang="zh-TW">more URL</name>
+            <name xml:lang="jp">「もっと見る」URL</name>
+            <name xml:lang="tr">Daha fazla URL</name>
+            <description xml:lang="ko">http:// 포함한 URL를 등록합니다.</description>
+	    <description xml:lang="zh-CN">请输入包含http://的URL地址。</description>
+	    <description xml:lang="zh-TW">請輸入http://以外的URL網址。</description>
+            <description xml:lang="en">Destination of a 'more' link. Register a URL including http://</description>
+	    <description xml:lang="vi">Địa chỉ trang sẽ chuyển đến khi bấm vào Xem thêm (Bao gồm cả http://)</description>
+            <description xml:lang="jp">「http://」を含んだURLを登録します。</description>
+            <description xml:lang="tr">Bağlantı hedefi 'daha fazlası'.  http:// içeren bir URL girişi yapınız.</description>
+        </var>
+        <var name="ws_more_text" type="text">
+            <name xml:lang="ko">더보기 텍스트</name>
+            <name xml:lang="en">more Text</name>
+	    	<name xml:lang="vi">Chữ của Xem thêm</name>
+            <name xml:lang="zh-CN">查看更多(文本)</name>
+            <name xml:lang="zh-TW">more TEXT</name>
+            <name xml:lang="jp">「もっと見る」テキスト</name>
+            <name xml:lang="tr">Daha fazla metin</name>
+            <description xml:lang="ko">더보기 텍스트</description>
+            <description xml:lang="en">Text for a 'more' link</description>
+            <description xml:lang="zh-CN">文本格式的"查看更多"。</description>
+		    <description xml:lang="vi">Có thể dùng những từ khác thay cho từ Xem thêm</description>
+            <description xml:lang="zh-TW">純文字格式。</description>
+            <description xml:lang="jp">「もっと見る」テキスト</description>
+            <description xml:lang="tr">Bağlantı için metin 'daha fazlası'</description>
+       </var>
+    </extra_vars>
+</widgetstyle>
diff --git a/widgetstyles/simple/widgetstyle.html b/widgetstyles/simple/widgetstyle.html
index 09adf06e1..2a8ed67f0 100644
--- a/widgetstyles/simple/widgetstyle.html
+++ b/widgetstyles/simple/widgetstyle.html
@@ -1,23 +1,23 @@
-<!--@if($widgetstyle_extra_var->ws_colorset == "black")-->
-    {@ $_wsClassName = "black"}
-<!--@elseif($widgetstyle_extra_var->ws_colorset == "white")-->
-    {@ $_wsClassName = "white"}
-<!--@else-->
-    {@ $_wsClassName = $layout_info->colorset}
-<!--@end-->
-
-<!--%import("style.css")-->
-{@ $ws_more_url = trim($widgetstyle_extra_var->ws_more_url); }
-
-<div class="simpleWidgetStyle {$_wsClassName}">
-    <h2>{$widgetstyle_extra_var->ws_title}</h2>
-        <!--@if($ws_more_url)-->
-            <!--@if(strtolower(substr($ws_more_url,0,4))=='http')-->
-                <a href="{$ws_more_url}" class="widgetMoreLink">
-            <!--@else-->
-                <a href="http://{$ws_more_url}" class="widgetMoreLink">
-            <!--@end-->
-            {$widgetstyle_extra_var->ws_more_text}</a>
-        <!--@end-->
-    {$widget_content}
-</div>
+<!--@if($widgetstyle_extra_var->ws_colorset == "black")-->
+    {@ $_wsClassName = "black"}
+<!--@elseif($widgetstyle_extra_var->ws_colorset == "white")-->
+    {@ $_wsClassName = "white"}
+<!--@else-->
+    {@ $_wsClassName = $layout_info->colorset}
+<!--@end-->
+
+<!--%import("style.css")-->
+{@ $ws_more_url = trim($widgetstyle_extra_var->ws_more_url); }
+
+<div class="simpleWidgetStyle {$_wsClassName}">
+    <h2>{$widgetstyle_extra_var->ws_title}</h2>
+        <!--@if($ws_more_url)-->
+            <!--@if(strtolower(substr($ws_more_url,0,4))=='http')-->
+                <a href="{$ws_more_url}" class="widgetMoreLink">
+            <!--@else-->
+                <a href="http://{$ws_more_url}" class="widgetMoreLink">
+            <!--@end-->
+            {$widgetstyle_extra_var->ws_more_text}</a>
+        <!--@end-->
+    {$widget_content}
+</div>